diff --git a/Makefile.am b/Makefile.am index 7165f466e6..ea975d1a06 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,9 +11,9 @@ else tools_dir = tools endif -SUBDIRS = po $(libgc_dir) mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm +SUBDIRS = mk po $(libgc_dir) mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm # Keep in sync with SUBDIRS -DIST_SUBDIRS = m4 po $(libgc_dir) mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm +DIST_SUBDIRS = m4 mk po $(libgc_dir) mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm all: update_submodules diff --git a/Makefile.in b/Makefile.in index 41a6250323..c6edb2fed3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -254,26 +254,17 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDKX11 = @GDKX11@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GINT_TO_POINTER = @GINT_TO_POINTER@ GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUC_NORETURN = @GNUC_NORETURN@ GNUC_PRETTY = @GNUC_PRETTY@ GNUC_UNUSED = @GNUC_UNUSED@ -GPOINTER_TO_INT = @GPOINTER_TO_INT@ -GPOINTER_TO_UINT = @GPOINTER_TO_UINT@ GREP = @GREP@ GSIZE = @GSIZE@ GSIZE_FORMAT = @GSIZE_FORMAT@ +GSSIZE = @GSSIZE@ GTKX11 = @GTKX11@ -GUINT_TO_POINTER = @GUINT_TO_POINTER@ -G_GINT32_FORMAT = @G_GINT32_FORMAT@ -G_GINT64_FORMAT = @G_GINT64_FORMAT@ -G_GUINT32_FORMAT = @G_GUINT32_FORMAT@ -G_GUINT64_FORMAT = @G_GUINT64_FORMAT@ -G_HAVE_ISO_VARARGS = @G_HAVE_ISO_VARARGS@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_NINJA = @HAVE_NINJA@ @@ -447,9 +438,9 @@ MONOTOUCH_SUBDIRS = $(libgc_dir) mono # Some tools might not build when cross-compiling @CROSS_COMPILING_TRUE@tools_dir = -SUBDIRS = po $(libgc_dir) mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm +SUBDIRS = mk po $(libgc_dir) mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm # Keep in sync with SUBDIRS -DIST_SUBDIRS = m4 po $(libgc_dir) mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm +DIST_SUBDIRS = m4 mk po $(libgc_dir) mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm SUBMODULE_ERROR = 'Could not recursively update all git submodules. You may experience compilation problems if some submodules are out of date' EXTRA_DIST = \ README.md \ diff --git a/README.md b/README.md index 33d7ae9502..959520b20e 100644 --- a/README.md +++ b/README.md @@ -241,12 +241,12 @@ Disables the inclusion of a Boehm garbage collector. * This defaults to `included`. -* `--with-cooperative-gc` +* `--enable-cooperative-suspend` * If you pass this flag the Mono runtime is configured to only use the cooperative mode of the garbage collector. If you do not pass this flag, then you can control at runtime the use of the - cooperative GC mode by setting the `MONO_ENABLE_COOP` flag. + cooperative GC mode by setting the `MONO_ENABLE_COOP_SUSPEND` flag. * `--with-tls=__thread,pthread` diff --git a/acceptance-tests/Makefile.am b/acceptance-tests/Makefile.am index 135e6968e6..95ad60584c 100644 --- a/acceptance-tests/Makefile.am +++ b/acceptance-tests/Makefile.am @@ -5,7 +5,7 @@ CORECLR_PATH=$(ACCEPTANCE_TESTS_PATH)/coreclr MSTESTSUITE_PATH=$(ACCEPTANCE_TESTS_PATH)/ms-test-suite CLEANFILES = *.dll *.exe *.mdb -EXTRA_DIST=README.md SUBMODULES.json versions.mk roslyn.mk coreclr.mk ms-test-suite.mk +EXTRA_DIST=README.md SUBMODULES.json versions.mk profiler-stress.mk roslyn.mk coreclr.mk ms-test-suite.mk CLASS=$(mcs_topdir)/class/lib/$(DEFAULT_PROFILE) TOOLS_CLASS=$(mcs_topdir)/class/lib/build diff --git a/acceptance-tests/Makefile.in.REMOVED.git-id b/acceptance-tests/Makefile.in.REMOVED.git-id index bb5fd4b4d5..e21510ded0 100644 --- a/acceptance-tests/Makefile.in.REMOVED.git-id +++ b/acceptance-tests/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -9b9b777791cf346eab05c49479d7f54faae5e82e \ No newline at end of file +547201804efe0b3764dea8e1818b1aa0728bd1dc \ No newline at end of file diff --git a/acceptance-tests/SUBMODULES.json b/acceptance-tests/SUBMODULES.json index 2d8ac86e40..106bd8f81e 100644 --- a/acceptance-tests/SUBMODULES.json +++ b/acceptance-tests/SUBMODULES.json @@ -2,7 +2,7 @@ { "name": "roslyn", "url": "git://github.com/mono/roslyn.git", - "rev": "1d9895045041925490038c5df0d8f947d8dcbd7f", + "rev": "380eec412868464a132cdcd3a45ef457fab6e060", "remote-branch": "origin/mono-testing", "branch": "mono-testing", "directory": "roslyn" @@ -10,7 +10,7 @@ { "name": "coreclr", "url": "git://github.com/mono/coreclr.git", - "rev": "83d8279997d8ce4ad344ff9b937b2d13d074dcaa", + "rev": "aa62c0382ae79562293f3ea1a94ef0f16f80f498", "remote-branch": "origin/mono", "branch": "mono", "directory": "coreclr" diff --git a/acceptance-tests/coreclr.mk.REMOVED.git-id b/acceptance-tests/coreclr.mk.REMOVED.git-id index 24fc4e461e..5d17985546 100644 --- a/acceptance-tests/coreclr.mk.REMOVED.git-id +++ b/acceptance-tests/coreclr.mk.REMOVED.git-id @@ -1 +1 @@ -8ee906d13b88beee5805c9fd4e7e8fbfd7e7063d \ No newline at end of file +df7c4e44217ae3f66ca522f7795d474bcb95050d \ No newline at end of file diff --git a/autogen.sh b/autogen.sh index 7c58e09215..f9c20ca0d7 100755 --- a/autogen.sh +++ b/autogen.sh @@ -89,9 +89,11 @@ if test x$NOCONFIGURE = x && test -z "$*"; then echo fi +am_opt="--add-missing --copy --gnu -Wno-portability -Wno-obsolete" + case $CC in xlc ) - am_opt=--include-deps;; + am_opt="$am_opt --include-deps";; esac @@ -142,8 +144,8 @@ if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then autoheader || { echo "**Error**: autoheader failed."; exit 1; } fi -echo "Running automake --gnu $am_opt ..." -automake --add-missing --gnu -Wno-portability -Wno-obsolete $am_opt || +echo "Running automake $am_opt ..." +automake $am_opt || { echo "**Error**: automake failed."; exit 1; } echo "Running autoconf ..." autoconf || { echo "**Error**: autoconf failed."; exit 1; } diff --git a/config.h.in b/config.h.in index e67584da40..cf3e3e7c37 100644 --- a/config.h.in +++ b/config.h.in @@ -6,6 +6,9 @@ /* Whether Android NDK unified headers are used */ #undef ANDROID_UNIFIED_HEADERS +/* bind with unsigned addrlen */ +#undef BIND_ADDRLEN_UNSIGNED + /* GC description */ #undef DEFAULT_GC_NAME @@ -27,6 +30,9 @@ /* Disable runtime debugging support */ #undef DISABLE_DEBUG +/* Disable Soft Debugger Agent. */ +#undef DISABLE_DEBUGGER_AGENT + /* Disable System.Decimal support */ #undef DISABLE_DECIMAL @@ -110,9 +116,6 @@ /* Disable SIMD intrinsics related optimizations. */ #undef DISABLE_SIMD -/* Disable Soft Debugger Agent. */ -#undef DISABLE_SOFT_DEBUG - /* Disable advanced SSA JIT optimizations */ #undef DISABLE_SSA @@ -137,12 +140,18 @@ /* Enable thread checked build */ #undef ENABLE_CHECKED_BUILD_THREAD +/* Enable cooperative stop-the-world garbage collection. */ +#undef ENABLE_COOP_SUSPEND + /* Enable DTrace probes */ #undef ENABLE_DTRACE /* Extension module enabled */ #undef ENABLE_EXTENSION_MODULE +/* Enable hybrid suspend for GC stop-the-world */ +#undef ENABLE_HYBRID_SUSPEND + /* Icall export enabled */ #undef ENABLE_ICALL_EXPORT @@ -158,6 +167,12 @@ /* Runtime support code for llvm enabled */ #undef ENABLE_LLVM_RUNTIME +/* Enable runtime support for Monodroid (Xamarin.Android) */ +#undef ENABLE_MONODROID + +/* Enable runtime support for Monotouch (Xamarin.iOS and Xamarin.Mac) */ +#undef ENABLE_MONOTOUCH + /* Overridable allocator support enabled */ #undef ENABLE_OVERRIDABLE_ALLOCATORS @@ -167,7 +182,7 @@ /* GLIBC has CPU_COUNT macro in sched.h */ #undef GLIBC_HAS_CPU_COUNT -/* Define to 1 if you have the `accept4' function. */ +/* accept4 */ #undef HAVE_ACCEPT4 /* Have access */ @@ -189,6 +204,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_ANDROID_VERSIONING_H +/* arc4random */ +#undef HAVE_ARC4RANDOM + /* ARM v5 */ #undef HAVE_ARMV5 @@ -237,6 +255,9 @@ /* Define to 1 if you have the `clock_nanosleep' function. */ #undef HAVE_CLOCK_NANOSLEEP +/* CLOCK_REALTIME */ +#undef HAVE_CLOCK_REALTIME + /* Define to 1 if you have the header file. */ #undef HAVE_COMMONCRYPTO_COMMONDIGEST_H @@ -249,6 +270,12 @@ /* Define to 1 if you have the `confstr' function. */ #undef HAVE_CONFSTR +/* Define to 1 if you have the header file. */ +#undef HAVE_COPYFILE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_CRT_EXTERNS_H + /* Have /dev/random */ #undef HAVE_CRYPT_RNG @@ -293,6 +320,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DIRENT_H +/* struct dirent.d_namlen */ +#undef HAVE_DIRENT_NAME_LEN + /* Define to 1 if you have the `dladdr' function. */ #undef HAVE_DLADDR @@ -305,6 +335,9 @@ /* dlopen-based dynamic loader available */ #undef HAVE_DL_LOADER +/* ECHO */ +#undef HAVE_ECHO + /* Define to 1 if you have the header file. */ #undef HAVE_ELF_H @@ -317,7 +350,7 @@ /* Define to 1 if you have the `endusershell' function. */ #undef HAVE_ENDUSERSHELL -/* epoll supported */ +/* epoll_create1 */ #undef HAVE_EPOLL /* Define to 1 if you have the `epoll_ctl' function. */ @@ -335,6 +368,12 @@ /* Define to 1 if you have the `execvp' function. */ #undef HAVE_EXECVP +/* fcopyfile */ +#undef HAVE_FCOPYFILE + +/* struct fd_set.fds_bits */ +#undef HAVE_FDS_BITS + /* Define to 1 if you have the `fgetgrent' function. */ #undef HAVE_FGETGRENT @@ -344,6 +383,9 @@ /* Define to 1 if you have the `finite' function. */ #undef HAVE_FINITE +/* struct flock64 */ +#undef HAVE_FLOCK64 + /* Define to 1 if you have the `fork' function. */ #undef HAVE_FORK @@ -359,6 +401,9 @@ /* Define to 1 if you have the `fstatvfs' function. */ #undef HAVE_FSTATVFS +/* ftruncate64 */ +#undef HAVE_FTRUNCATE64 + /* Define to 1 if you have the `futimens' function. */ #undef HAVE_FUTIMENS @@ -368,9 +413,12 @@ /* Have getaddrinfo */ #undef HAVE_GETADDRINFO -/* Define to 1 if you have the `getdomainname' function. */ +/* getdomainname */ #undef HAVE_GETDOMAINNAME +/* getdomainname with size_t namelen */ +#undef HAVE_GETDOMAINNAME_SIZET + /* Define to 1 if you have the `getentropy' function. */ #undef HAVE_GETENTROPY @@ -407,12 +455,21 @@ /* Define to 1 if you have the `getlogin_r' function. */ #undef HAVE_GETLOGIN_R +/* getmntinfo */ +#undef HAVE_GETMNTINFO + /* Have getnameinfo */ #undef HAVE_GETNAMEINFO +/* getnameinfo with signed flags */ +#undef HAVE_GETNAMEINFO_SIGNED_FLAGS + /* Define to 1 if you have the header file. */ #undef HAVE_GETOPT_H +/* getpeereid */ +#undef HAVE_GETPEEREID + /* Define to 1 if you have the `getpriority' function. */ #undef HAVE_GETPRIORITY @@ -440,9 +497,15 @@ /* Define to 1 if you have the `getrusage' function. */ #undef HAVE_GETRUSAGE +/* char* strerror(int errnum, char *buf, size_t buflen) */ +#undef HAVE_GNU_STRERROR_R + /* Define to 1 if you have the header file. */ #undef HAVE_GRP_H +/* ICANON */ +#undef HAVE_ICANON + /* Define to 1 if you have the header file. */ #undef HAVE_ICONV_H @@ -461,9 +524,30 @@ /* Have inet_pton */ #undef HAVE_INET_PTON +/* HAVE_INOTIFY */ +#undef HAVE_INOTIFY + +/* inotify_add_watch */ +#undef HAVE_INOTIFY_ADD_WATCH + +/* inotify_init */ +#undef HAVE_INOTIFY_INIT + +/* inotify_rm_watch */ +#undef HAVE_INOTIFY_RM_WATCH + /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H +/* IN_EXCL_UNLINK */ +#undef HAVE_IN_EXCL_UNLINK + +/* struct in_pktinfo */ +#undef HAVE_IN_PKTINFO + +/* ioctl */ +#undef HAVE_IOCTL + /* Have IPPROTO_IP */ #undef HAVE_IPPROTO_IP @@ -482,6 +566,9 @@ /* Have IP_DONTFRAGMENT */ #undef HAVE_IP_DONTFRAGMENT +/* struct ip_mreqn */ +#undef HAVE_IP_MREQN + /* Have IP_MTU_DISCOVER */ #undef HAVE_IP_MTU_DISCOVER @@ -500,7 +587,7 @@ /* Define to 1 if you have the `kill' function. */ #undef HAVE_KILL -/* Define to 1 if you have the `kqueue' function. */ +/* kqueue */ #undef HAVE_KQUEUE /* Have __thread keyword */ @@ -518,6 +605,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LINK_H +/* linux/in.h */ +#undef HAVE_LINUX_IN_H + /* Define to 1 if you have the header file. */ #undef HAVE_LINUX_MAGIC_H @@ -542,6 +632,9 @@ /* Define to 1 if you have the `lockf' function. */ #undef HAVE_LOCKF +/* lseek64 */ +#undef HAVE_LSEEK64 + /* Define to 1 if you have the `lutimes' function. */ #undef HAVE_LUTIMES @@ -551,6 +644,9 @@ /* mach_absolute_time */ #undef HAVE_MACH_ABSOLUTE_TIME +/* mach_timebase_info */ +#undef HAVE_MACH_TIMEBASE_INFO + /* Define to 1 if you have the `madvise' function. */ #undef HAVE_MADVISE @@ -569,9 +665,15 @@ /* Define to 1 if you have the `mkstemp' function. */ #undef HAVE_MKSTEMP +/* mkstemps */ +#undef HAVE_MKSTEMPS + /* Define to 1 if you have the `mmap' function. */ #undef HAVE_MMAP +/* mmap64 */ +#undef HAVE_MMAP64 + /* Moving collector */ #undef HAVE_MOVING_COLLECTOR @@ -593,21 +695,30 @@ /* Define to 1 if you have the header file. */ #undef HAVE_NET_IF_H +/* _NSGetEnviron */ +#undef HAVE_NSGETENVIRON + /* No GC support. */ #undef HAVE_NULL_GC /* Define to 1 if you have the header file. */ #undef HAVE_PATHCONF_H +/* pipe2 */ +#undef HAVE_PIPE2 + /* Define to 1 if you have the `poll' function. */ #undef HAVE_POLL /* Define to 1 if you have the header file. */ #undef HAVE_POLL_H -/* Define to 1 if you have the `posix_fadvise' function. */ +/* posix_fadvise */ #undef HAVE_POSIX_FADVISE +/* posix_fadvise64 */ +#undef HAVE_POSIX_FADVISE64 + /* Define to 1 if you have the `posix_fallocate' function. */ #undef HAVE_POSIX_FALLOCATE @@ -620,6 +731,9 @@ /* Define to 1 if you have the `preadv' function. */ #undef HAVE_PREADV +/* struct fd_set.__fds_bits */ +#undef HAVE_PRIVATE_FDS_BITS + /* Define to 1 if you have the `psignal' function. */ #undef HAVE_PSIGNAL @@ -669,6 +783,9 @@ /* Define to 1 if you have the `pwritev' function. */ #undef HAVE_PWRITEV +/* readdir_r */ +#undef HAVE_READDIR_R + /* Define to 1 if you have the `readlinkat' function. */ #undef HAVE_READLINKAT @@ -684,13 +801,16 @@ /* Define to 1 if you have the `rewinddir' function. */ #undef HAVE_REWINDDIR -/* Define to 1 if you have the `sched_getaffinity' function. */ +/* struct rt_msghdr */ +#undef HAVE_RT_MSGHDR + +/* sched_getaffinity */ #undef HAVE_SCHED_GETAFFINITY /* Define to 1 if you have the `sched_getcpu' function. */ #undef HAVE_SCHED_GETCPU -/* Define to 1 if you have the `sched_setaffinity' function. */ +/* sched_setaffinity */ #undef HAVE_SCHED_SETAFFINITY /* Define to 1 if you have the `seekdir' function. */ @@ -702,6 +822,12 @@ /* Define to 1 if you have the `sendfile' function. */ #undef HAVE_SENDFILE +/* sendfile with 4 arguments */ +#undef HAVE_SENDFILE_4 + +/* sendfile with 6 arguments */ +#undef HAVE_SENDFILE_6 + /* Define to 1 if you have the `setdomainname' function. */ #undef HAVE_SETDOMAINNAME @@ -735,6 +861,9 @@ /* Define to 1 if you have the `shm_open' function. */ #undef HAVE_SHM_OPEN +/* shm_open that works well enough with mmap */ +#undef HAVE_SHM_OPEN_THAT_WORKS_WELL_ENOUGH_WITH_MMAP + /* Define to 1 if you have the `sigaction' function. */ #undef HAVE_SIGACTION @@ -768,12 +897,33 @@ /* Have SOL_TCP */ #undef HAVE_SOL_TCP -/* Define to 1 if you have the `statfs' function. */ +/* stat64 */ +#undef HAVE_STAT64 + +/* struct statfs */ #undef HAVE_STATFS +/* struct statfs.f_fstypename */ +#undef HAVE_STATFS_FSTYPENAME + /* Define to 1 if you have the `statvfs' function. */ #undef HAVE_STATVFS +/* struct statvfs.f_fstypename */ +#undef HAVE_STATVFS_FSTYPENAME + +/* struct stat.st_birthtime */ +#undef HAVE_STAT_BIRTHTIME + +/* struct stat.st_atimensec */ +#undef HAVE_STAT_NSEC + +/* struct stat.st_atim */ +#undef HAVE_STAT_TIM + +/* struct stat.st_atimespec */ +#undef HAVE_STAT_TIMESPEC + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H @@ -786,6 +936,9 @@ /* Define to 1 if you have the `stpcpy' function. */ #undef HAVE_STPCPY +/* strcpy_s */ +#undef HAVE_STRCPY_S + /* Define to 1 if you have the `strerror_r' function. */ #undef HAVE_STRERROR_R @@ -885,6 +1038,9 @@ /* Define to 1 if the system has the type `struct utimbuf'. */ #undef HAVE_STRUCT_UTIMBUF +/* HAVE_SUPPORT_FOR_DUAL_MODE_IPV4_PACKET_INFO */ +#undef HAVE_SUPPORT_FOR_DUAL_MODE_IPV4_PACKET_INFO + /* Define to 1 if the system has the type `suseconds_t'. */ #undef HAVE_SUSECONDS_T @@ -903,6 +1059,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_AUXV_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_CDEFS_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_ENDIAN_H @@ -1017,6 +1176,24 @@ /* Have system zlib */ #undef HAVE_SYS_ZLIB +/* tcgetattr */ +#undef HAVE_TCGETATTR + +/* HAVE_TCP_FSM_H */ +#undef HAVE_TCP_FSM_H + +/* TCPSTATE enum in netinet/tcp.h */ +#undef HAVE_TCP_H_TCPSTATE_ENUM + +/* tcp/var.h */ +#undef HAVE_TCP_VAR_H + +/* TCSANOW */ +#undef HAVE_TCSANOW + +/* tcsetattr */ +#undef HAVE_TCSETATTR + /* Define to 1 if you have the `telldir' function. */ #undef HAVE_TELLDIR @@ -1029,6 +1206,9 @@ /* Have timezone variable */ #undef HAVE_TIMEZONE +/* TIOCGWINSZ */ +#undef HAVE_TIOCGWINSZ + /* tls_model available */ #undef HAVE_TLS_MODEL_ATTR @@ -1044,6 +1224,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UCONTEXT_H +/* uname */ +#undef HAVE_UNAME + /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H @@ -1137,6 +1320,18 @@ /* ... */ #undef HOST_X86 +/* inotify_rm_watch with unsigned wd */ +#undef INOTIFY_RM_WATCH_WD_UNSIGNED + +/* struct ipv6_mreq with unsigned ipv6mr_interface */ +#undef IPV6MR_INTERFACE_UNSIGNED + +/* kevent with void *data */ +#undef KEVENT_HAS_VOID_UDATA + +/* kevent with int parameters */ +#undef KEVENT_REQUIRES_INT_PARAMS + /* Enable lazy gc thread creation by the embedding host. */ #undef LAZY_GC_THREAD_CREATION @@ -1224,6 +1419,9 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* getpriority with int who */ +#undef PRIORITY_REQUIRES_INT_WHO + /* pthread is a pointer */ #undef PTHREAD_POINTER_ID @@ -1314,9 +1512,6 @@ /* ... */ #undef TARGET_XBOX360 -/* Enable cooperative stop-the-world garbage collection. */ -#undef USE_COOP_GC - /* ... */ #undef USE_GCC_ATOMIC_OPS diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 8bc05c33b5..a0b0d622c3 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -c92971f6e89bc3394876a540d68dc9dc1ca02f20 \ No newline at end of file +369066153d8f1fda862fe393670faf729a16ef20 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index d2d7144aaa..1591ccf01f 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -0f61be4caba74251aaffb252e3a1ad805758b642 \ No newline at end of file +e37aae08ddb44567609b0dbdcce5a75817b1f613 \ No newline at end of file diff --git a/data/Makefile.in b/data/Makefile.in index 5d6265b909..31f2a470b4 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -277,26 +277,17 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDKX11 = @GDKX11@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GINT_TO_POINTER = @GINT_TO_POINTER@ GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUC_NORETURN = @GNUC_NORETURN@ GNUC_PRETTY = @GNUC_PRETTY@ GNUC_UNUSED = @GNUC_UNUSED@ -GPOINTER_TO_INT = @GPOINTER_TO_INT@ -GPOINTER_TO_UINT = @GPOINTER_TO_UINT@ GREP = @GREP@ GSIZE = @GSIZE@ GSIZE_FORMAT = @GSIZE_FORMAT@ +GSSIZE = @GSSIZE@ GTKX11 = @GTKX11@ -GUINT_TO_POINTER = @GUINT_TO_POINTER@ -G_GINT32_FORMAT = @G_GINT32_FORMAT@ -G_GINT64_FORMAT = @G_GINT64_FORMAT@ -G_GUINT32_FORMAT = @G_GUINT32_FORMAT@ -G_GUINT64_FORMAT = @G_GUINT64_FORMAT@ -G_HAVE_ISO_VARARGS = @G_HAVE_ISO_VARARGS@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_NINJA = @HAVE_NINJA@ diff --git a/data/config.in b/data/config.in index 36aa4c9085..dbef498893 100644 --- a/data/config.in +++ b/data/config.in @@ -11,6 +11,7 @@ + @@ -40,5 +41,4 @@ - diff --git a/data/net_2_0/Browsers/Makefile.in b/data/net_2_0/Browsers/Makefile.in index 60195d109e..0c81dd9c1c 100644 --- a/data/net_2_0/Browsers/Makefile.in +++ b/data/net_2_0/Browsers/Makefile.in @@ -199,26 +199,17 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDKX11 = @GDKX11@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GINT_TO_POINTER = @GINT_TO_POINTER@ GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUC_NORETURN = @GNUC_NORETURN@ GNUC_PRETTY = @GNUC_PRETTY@ GNUC_UNUSED = @GNUC_UNUSED@ -GPOINTER_TO_INT = @GPOINTER_TO_INT@ -GPOINTER_TO_UINT = @GPOINTER_TO_UINT@ GREP = @GREP@ GSIZE = @GSIZE@ GSIZE_FORMAT = @GSIZE_FORMAT@ +GSSIZE = @GSSIZE@ GTKX11 = @GTKX11@ -GUINT_TO_POINTER = @GUINT_TO_POINTER@ -G_GINT32_FORMAT = @G_GINT32_FORMAT@ -G_GINT64_FORMAT = @G_GINT64_FORMAT@ -G_GUINT32_FORMAT = @G_GUINT32_FORMAT@ -G_GUINT64_FORMAT = @G_GUINT64_FORMAT@ -G_HAVE_ISO_VARARGS = @G_HAVE_ISO_VARARGS@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_NINJA = @HAVE_NINJA@ diff --git a/data/net_2_0/Makefile.in b/data/net_2_0/Makefile.in index af1192159c..38d1e5e006 100644 --- a/data/net_2_0/Makefile.in +++ b/data/net_2_0/Makefile.in @@ -259,26 +259,17 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDKX11 = @GDKX11@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GINT_TO_POINTER = @GINT_TO_POINTER@ GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUC_NORETURN = @GNUC_NORETURN@ GNUC_PRETTY = @GNUC_PRETTY@ GNUC_UNUSED = @GNUC_UNUSED@ -GPOINTER_TO_INT = @GPOINTER_TO_INT@ -GPOINTER_TO_UINT = @GPOINTER_TO_UINT@ GREP = @GREP@ GSIZE = @GSIZE@ GSIZE_FORMAT = @GSIZE_FORMAT@ +GSSIZE = @GSSIZE@ GTKX11 = @GTKX11@ -GUINT_TO_POINTER = @GUINT_TO_POINTER@ -G_GINT32_FORMAT = @G_GINT32_FORMAT@ -G_GINT64_FORMAT = @G_GINT64_FORMAT@ -G_GUINT32_FORMAT = @G_GUINT32_FORMAT@ -G_GUINT64_FORMAT = @G_GUINT64_FORMAT@ -G_HAVE_ISO_VARARGS = @G_HAVE_ISO_VARARGS@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_NINJA = @HAVE_NINJA@ diff --git a/data/net_4_0/Browsers/Makefile.in b/data/net_4_0/Browsers/Makefile.in index ca08c91695..4814279bc1 100644 --- a/data/net_4_0/Browsers/Makefile.in +++ b/data/net_4_0/Browsers/Makefile.in @@ -199,26 +199,17 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDKX11 = @GDKX11@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GINT_TO_POINTER = @GINT_TO_POINTER@ GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUC_NORETURN = @GNUC_NORETURN@ GNUC_PRETTY = @GNUC_PRETTY@ GNUC_UNUSED = @GNUC_UNUSED@ -GPOINTER_TO_INT = @GPOINTER_TO_INT@ -GPOINTER_TO_UINT = @GPOINTER_TO_UINT@ GREP = @GREP@ GSIZE = @GSIZE@ GSIZE_FORMAT = @GSIZE_FORMAT@ +GSSIZE = @GSSIZE@ GTKX11 = @GTKX11@ -GUINT_TO_POINTER = @GUINT_TO_POINTER@ -G_GINT32_FORMAT = @G_GINT32_FORMAT@ -G_GINT64_FORMAT = @G_GINT64_FORMAT@ -G_GUINT32_FORMAT = @G_GUINT32_FORMAT@ -G_GUINT64_FORMAT = @G_GUINT64_FORMAT@ -G_HAVE_ISO_VARARGS = @G_HAVE_ISO_VARARGS@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_NINJA = @HAVE_NINJA@ diff --git a/data/net_4_0/Makefile.in b/data/net_4_0/Makefile.in index ee39452793..32fa985f6f 100644 --- a/data/net_4_0/Makefile.in +++ b/data/net_4_0/Makefile.in @@ -259,26 +259,17 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDKX11 = @GDKX11@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GINT_TO_POINTER = @GINT_TO_POINTER@ GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUC_NORETURN = @GNUC_NORETURN@ GNUC_PRETTY = @GNUC_PRETTY@ GNUC_UNUSED = @GNUC_UNUSED@ -GPOINTER_TO_INT = @GPOINTER_TO_INT@ -GPOINTER_TO_UINT = @GPOINTER_TO_UINT@ GREP = @GREP@ GSIZE = @GSIZE@ GSIZE_FORMAT = @GSIZE_FORMAT@ +GSSIZE = @GSSIZE@ GTKX11 = @GTKX11@ -GUINT_TO_POINTER = @GUINT_TO_POINTER@ -G_GINT32_FORMAT = @G_GINT32_FORMAT@ -G_GINT64_FORMAT = @G_GINT64_FORMAT@ -G_GUINT32_FORMAT = @G_GUINT32_FORMAT@ -G_GUINT64_FORMAT = @G_GUINT64_FORMAT@ -G_HAVE_ISO_VARARGS = @G_HAVE_ISO_VARARGS@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_NINJA = @HAVE_NINJA@ diff --git a/data/net_4_5/Browsers/Makefile.in b/data/net_4_5/Browsers/Makefile.in index 232064bb09..dc9c769341 100644 --- a/data/net_4_5/Browsers/Makefile.in +++ b/data/net_4_5/Browsers/Makefile.in @@ -199,26 +199,17 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDKX11 = @GDKX11@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GINT_TO_POINTER = @GINT_TO_POINTER@ GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUC_NORETURN = @GNUC_NORETURN@ GNUC_PRETTY = @GNUC_PRETTY@ GNUC_UNUSED = @GNUC_UNUSED@ -GPOINTER_TO_INT = @GPOINTER_TO_INT@ -GPOINTER_TO_UINT = @GPOINTER_TO_UINT@ GREP = @GREP@ GSIZE = @GSIZE@ GSIZE_FORMAT = @GSIZE_FORMAT@ +GSSIZE = @GSSIZE@ GTKX11 = @GTKX11@ -GUINT_TO_POINTER = @GUINT_TO_POINTER@ -G_GINT32_FORMAT = @G_GINT32_FORMAT@ -G_GINT64_FORMAT = @G_GINT64_FORMAT@ -G_GUINT32_FORMAT = @G_GUINT32_FORMAT@ -G_GUINT64_FORMAT = @G_GUINT64_FORMAT@ -G_HAVE_ISO_VARARGS = @G_HAVE_ISO_VARARGS@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_NINJA = @HAVE_NINJA@ diff --git a/data/net_4_5/Makefile.in b/data/net_4_5/Makefile.in index 374a7d6489..8e8b1660aa 100644 --- a/data/net_4_5/Makefile.in +++ b/data/net_4_5/Makefile.in @@ -259,26 +259,17 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDKX11 = @GDKX11@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GINT_TO_POINTER = @GINT_TO_POINTER@ GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUC_NORETURN = @GNUC_NORETURN@ GNUC_PRETTY = @GNUC_PRETTY@ GNUC_UNUSED = @GNUC_UNUSED@ -GPOINTER_TO_INT = @GPOINTER_TO_INT@ -GPOINTER_TO_UINT = @GPOINTER_TO_UINT@ GREP = @GREP@ GSIZE = @GSIZE@ GSIZE_FORMAT = @GSIZE_FORMAT@ +GSSIZE = @GSSIZE@ GTKX11 = @GTKX11@ -GUINT_TO_POINTER = @GUINT_TO_POINTER@ -G_GINT32_FORMAT = @G_GINT32_FORMAT@ -G_GINT64_FORMAT = @G_GINT64_FORMAT@ -G_GUINT32_FORMAT = @G_GUINT32_FORMAT@ -G_GUINT64_FORMAT = @G_GUINT64_FORMAT@ -G_HAVE_ISO_VARARGS = @G_HAVE_ISO_VARARGS@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_NINJA = @HAVE_NINJA@ diff --git a/docs/Makefile.in b/docs/Makefile.in index 99553dbe54..574409882e 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -199,26 +199,17 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDKX11 = @GDKX11@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GINT_TO_POINTER = @GINT_TO_POINTER@ GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUC_NORETURN = @GNUC_NORETURN@ GNUC_PRETTY = @GNUC_PRETTY@ GNUC_UNUSED = @GNUC_UNUSED@ -GPOINTER_TO_INT = @GPOINTER_TO_INT@ -GPOINTER_TO_UINT = @GPOINTER_TO_UINT@ GREP = @GREP@ GSIZE = @GSIZE@ GSIZE_FORMAT = @GSIZE_FORMAT@ +GSSIZE = @GSSIZE@ GTKX11 = @GTKX11@ -GUINT_TO_POINTER = @GUINT_TO_POINTER@ -G_GINT32_FORMAT = @G_GINT32_FORMAT@ -G_GINT64_FORMAT = @G_GINT64_FORMAT@ -G_GUINT32_FORMAT = @G_GUINT32_FORMAT@ -G_GUINT64_FORMAT = @G_GUINT64_FORMAT@ -G_HAVE_ISO_VARARGS = @G_HAVE_ISO_VARARGS@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_NINJA = @HAVE_NINJA@ diff --git a/docs/deploy/mono-api-assembly.html b/docs/deploy/mono-api-assembly.html index eb38d3faa9..855961bc6e 100644 --- a/docs/deploy/mono-api-assembly.html +++ b/docs/deploy/mono-api-assembly.html @@ -779,16 +779,20 @@ mono_assembly_getrootdir (void)
Syntax
-
void -mono_assembly_get_assemblyref (MonoImage *image, int index, MonoAssemblyName *aname) +
gboolean +mono_assembly_get_assemblyref_checked (MonoImage *image, int index, MonoAssemblyName *aname, MonoError *error)

Parameters
-
image pointer to the MonoImage to extract the information from.
index index to the assembly reference in the image.
aname pointer to a MonoAssemblyName that will hold the returned value.
Description
+
image pointer to the MonoImage to extract the information from.
index index to the assembly reference in the image.
aname pointer to a MonoAssemblyName that will hold the returned value.
error set on error
Return value
+
TRUE on success, otherwise sets error and returns FALSE +
+
Description

- Fills out the aname with the assembly name of the index assembly reference in image.

+ Fills out the aname with the assembly name of the index assembly reference in image. +

diff --git a/docs/deploy/mono-api-exc.html b/docs/deploy/mono-api-exc.html index 4f007a6d7b..5390655f49 100644 --- a/docs/deploy/mono-api-exc.html +++ b/docs/deploy/mono-api-exc.html @@ -519,7 +519,7 @@ mono_get_exception_argument_out_of_range (const char *arg)
Syntax
MonoException* -mono_get_exception_arithmetic () +mono_get_exception_arithmetic (void)

@@ -540,7 +540,7 @@ mono_get_exception_arithmetic ()

Syntax
MonoException* -mono_get_exception_array_type_mismatch () +mono_get_exception_array_type_mismatch (void)

@@ -629,7 +629,7 @@ mono_get_exception_class (void)

Syntax
MonoException* -mono_get_exception_divide_by_zero () +mono_get_exception_divide_by_zero (void)

@@ -824,7 +824,7 @@ mono_get_exception_not_implemented (const char *msg)

Syntax
MonoException* -mono_get_exception_null_reference () +mono_get_exception_null_reference (void)

@@ -845,7 +845,7 @@ mono_get_exception_null_reference ()

Syntax
MonoException* -mono_get_exception_overflow () +mono_get_exception_overflow (void)

@@ -972,7 +972,8 @@ mono_get_exception_thread_abort ()

Syntax
-
MonoException* +
MONO_RT_EXTERNAL_ONLY +MonoException * mono_get_exception_thread_state (const char *msg)
diff --git a/external/api-snapshot/profiles/monodroid/Facades/System.Memory.cs b/external/api-snapshot/profiles/monodroid/Facades/System.Memory.cs index aa8f28c0e2..7661799898 100644 --- a/external/api-snapshot/profiles/monodroid/Facades/System.Memory.cs +++ b/external/api-snapshot/profiles/monodroid/Facades/System.Memory.cs @@ -15,12 +15,23 @@ [assembly:System.Runtime.CompilerServices.CompilationRelaxationsAttribute(8)] [assembly:System.Runtime.CompilerServices.RuntimeCompatibilityAttribute(WrapNonExceptionThrows=true)] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.Binary.BinaryPrimitives))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.BuffersExtensions))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.IBufferWriter<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.IMemoryOwner<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.IPinnable))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.MemoryHandle))] -[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.OperationStatus))] -[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.StandardFormat))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.MemoryManager<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.MemoryPool<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.ReadOnlySequence<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.ReadOnlySequenceSegment<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.Text.Base64))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.Text.Utf8Formatter))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.Text.Utf8Parser))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Memory<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MemoryExtensions))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ReadOnlyMemory<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ReadOnlySpan<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.MemoryMarshal))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.SequenceMarshal))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.SequencePosition))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Span<>))] diff --git a/external/api-snapshot/profiles/monodroid/Facades/System.Runtime.Extensions.cs b/external/api-snapshot/profiles/monodroid/Facades/System.Runtime.Extensions.cs index 9e447cba50..1e8af5be42 100644 --- a/external/api-snapshot/profiles/monodroid/Facades/System.Runtime.Extensions.cs +++ b/external/api-snapshot/profiles/monodroid/Facades/System.Runtime.Extensions.cs @@ -20,6 +20,7 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Environment))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.Path))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Math))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MathF))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MidpointRounding))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.WebUtility))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Progress<>))] diff --git a/external/api-snapshot/profiles/monodroid/Mono.Data.Sqlite.cs b/external/api-snapshot/profiles/monodroid/Mono.Data.Sqlite.cs index 621246354d..129f223a23 100644 --- a/external/api-snapshot/profiles/monodroid/Mono.Data.Sqlite.cs +++ b/external/api-snapshot/profiles/monodroid/Mono.Data.Sqlite.cs @@ -55,7 +55,6 @@ namespace Mono.Data.Sqlite Collation = 2, Scalar = 0, } - [System.ComponentModel.DesignerAttribute("SQLite.Designer.SqliteCommandDesigner, SQLite.Designer, Version=1.0.36.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139")] [System.ComponentModel.ToolboxItemAttribute(true)] public sealed partial class SqliteCommand : System.Data.Common.DbCommand, System.ICloneable { @@ -285,7 +284,6 @@ namespace Mono.Data.Sqlite public static string UTF8ToString(System.IntPtr nativestring, int nativestringlen) { throw null; } } [System.ComponentModel.DefaultEventAttribute("RowUpdated")] - [System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.Data.VS.SqlDataAdapterDesigner, Microsoft.VSDesigner, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] [System.ComponentModel.ToolboxItemAttribute("SQLite.Designer.SqliteDataAdapterToolboxItem, SQLite.Designer, Version=1.0.36.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139")] public sealed partial class SqliteDataAdapter : System.Data.Common.DbDataAdapter { diff --git a/external/api-snapshot/profiles/monodroid/Mono.Data.Tds.cs b/external/api-snapshot/profiles/monodroid/Mono.Data.Tds.cs index 685916a0fc..9c2db292d2 100644 --- a/external/api-snapshot/profiles/monodroid/Mono.Data.Tds.cs +++ b/external/api-snapshot/profiles/monodroid/Mono.Data.Tds.cs @@ -353,31 +353,31 @@ namespace Mono.Data.Tds.Protocol public partial class TdsDataColumn { public TdsDataColumn() { } - public System.Nullable AllowDBNull { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string BaseCatalogName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string BaseColumnName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string BaseSchemaName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string BaseServerName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string BaseTableName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ColumnName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable ColumnOrdinal { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable ColumnSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable ColumnType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string DataTypeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsAliased { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsAutoIncrement { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsExpression { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsHidden { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsIdentity { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsReadOnly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsRowVersion { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsUnique { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Nullable AllowDBNull { get { throw null; } set { } } + public string BaseCatalogName { get { throw null; } set { } } + public string BaseColumnName { get { throw null; } set { } } + public string BaseSchemaName { get { throw null; } set { } } + public string BaseServerName { get { throw null; } set { } } + public string BaseTableName { get { throw null; } set { } } + public string ColumnName { get { throw null; } set { } } + public System.Nullable ColumnOrdinal { get { throw null; } set { } } + public System.Nullable ColumnSize { get { throw null; } set { } } + public System.Nullable ColumnType { get { throw null; } set { } } + public string DataTypeName { get { throw null; } set { } } + public System.Nullable IsAliased { get { throw null; } set { } } + public System.Nullable IsAutoIncrement { get { throw null; } set { } } + public System.Nullable IsExpression { get { throw null; } set { } } + public System.Nullable IsHidden { get { throw null; } set { } } + public System.Nullable IsIdentity { get { throw null; } set { } } + public System.Nullable IsKey { get { throw null; } set { } } + public System.Nullable IsReadOnly { get { throw null; } set { } } + public System.Nullable IsRowVersion { get { throw null; } set { } } + public System.Nullable IsUnique { get { throw null; } set { } } public object this[string key] { get { throw null; } set { } } - public System.Nullable LCID { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable NumericPrecision { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable NumericScale { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable SortOrder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Nullable LCID { get { throw null; } set { } } + public System.Nullable NumericPrecision { get { throw null; } set { } } + public System.Nullable NumericScale { get { throw null; } set { } } + public System.Nullable SortOrder { get { throw null; } set { } } } public partial class TdsDataColumnCollection : System.Collections.IEnumerable { diff --git a/external/api-snapshot/profiles/monodroid/Mono.Posix.cs.REMOVED.git-id b/external/api-snapshot/profiles/monodroid/Mono.Posix.cs.REMOVED.git-id index 6262ff35cc..54eb1e582b 100644 --- a/external/api-snapshot/profiles/monodroid/Mono.Posix.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monodroid/Mono.Posix.cs.REMOVED.git-id @@ -1 +1 @@ -66c66b4ae6312bd590aaacdf00a6ced316e2a771 \ No newline at end of file +fbbfb809e669cd28915a2ce441880c2bc7d5fad4 \ No newline at end of file diff --git a/external/api-snapshot/profiles/monodroid/Mono.Security.cs.REMOVED.git-id b/external/api-snapshot/profiles/monodroid/Mono.Security.cs.REMOVED.git-id index 9788d86db7..6338ee5121 100644 --- a/external/api-snapshot/profiles/monodroid/Mono.Security.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monodroid/Mono.Security.cs.REMOVED.git-id @@ -1 +1 @@ -4cbdad36c815f26594178021e5b6cd0260d3b577 \ No newline at end of file +2f2bde5da90b7df3ecff4d17577694dc843f3c0a \ No newline at end of file diff --git a/external/api-snapshot/profiles/monodroid/System.ComponentModel.Composition.cs b/external/api-snapshot/profiles/monodroid/System.ComponentModel.Composition.cs index b694e88564..1a66391270 100644 --- a/external/api-snapshot/profiles/monodroid/System.ComponentModel.Composition.cs +++ b/external/api-snapshot/profiles/monodroid/System.ComponentModel.Composition.cs @@ -16,6 +16,7 @@ [assembly:System.Resources.NeutralResourcesLanguageAttribute("en-US")] [assembly:System.Resources.SatelliteContractVersionAttribute("2.0.5.0")] [assembly:System.Runtime.CompilerServices.CompilationRelaxationsAttribute(8)] +[assembly:System.Runtime.CompilerServices.InternalsVisibleToAttribute("net_4_x_System.ComponentModel.Composition_xunit-test, PublicKey=002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df")] [assembly:System.Runtime.CompilerServices.RuntimeCompatibilityAttribute(WrapNonExceptionThrows=true)] [assembly:System.Runtime.InteropServices.ComVisibleAttribute(false)] [assembly:System.Security.AllowPartiallyTrustedCallersAttribute] @@ -125,8 +126,8 @@ namespace System.ComponentModel.Composition public ExportAttribute(string contractName) { } public ExportAttribute(string contractName, System.Type contractType) { } public ExportAttribute(System.Type contractType) { } - public string ContractName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Type ContractType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string ContractName { get { throw null; } } + public System.Type ContractType { get { throw null; } } } public partial class ExportFactory { @@ -149,9 +150,9 @@ namespace System.ComponentModel.Composition public sealed partial class ExportMetadataAttribute : System.Attribute { public ExportMetadataAttribute(string name, object value) { } - public bool IsMultiple { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsMultiple { get { throw null; } set { } } + public string Name { get { throw null; } } + public object Value { get { throw null; } } } public partial interface ICompositionService { @@ -164,12 +165,12 @@ namespace System.ComponentModel.Composition public ImportAttribute(string contractName) { } public ImportAttribute(string contractName, System.Type contractType) { } public ImportAttribute(System.Type contractType) { } - public bool AllowDefault { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool AllowRecomposition { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ContractName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Type ContractType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.ComponentModel.Composition.CreationPolicy RequiredCreationPolicy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.ComponentModel.Composition.ImportSource Source { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool AllowDefault { get { throw null; } set { } } + public bool AllowRecomposition { get { throw null; } set { } } + public string ContractName { get { throw null; } } + public System.Type ContractType { get { throw null; } } + public System.ComponentModel.Composition.CreationPolicy RequiredCreationPolicy { get { throw null; } set { } } + public System.ComponentModel.Composition.ImportSource Source { get { throw null; } set { } } } [System.Diagnostics.DebuggerDisplayAttribute("{Message}")] [System.Diagnostics.DebuggerTypeProxyAttribute("System.ComponentModel.Composition.ImportCardinalityMismatchExceptionDebuggerProxy")] @@ -194,11 +195,11 @@ namespace System.ComponentModel.Composition public ImportManyAttribute(string contractName) { } public ImportManyAttribute(string contractName, System.Type contractType) { } public ImportManyAttribute(System.Type contractType) { } - public bool AllowRecomposition { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ContractName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Type ContractType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.ComponentModel.Composition.CreationPolicy RequiredCreationPolicy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.ComponentModel.Composition.ImportSource Source { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool AllowRecomposition { get { throw null; } set { } } + public string ContractName { get { throw null; } } + public System.Type ContractType { get { throw null; } } + public System.ComponentModel.Composition.CreationPolicy RequiredCreationPolicy { get { throw null; } set { } } + public System.ComponentModel.Composition.ImportSource Source { get { throw null; } set { } } } public enum ImportSource { @@ -227,20 +228,20 @@ namespace System.ComponentModel.Composition public sealed partial class MetadataViewImplementationAttribute : System.Attribute { public MetadataViewImplementationAttribute(System.Type implementationType) { } - public System.Type ImplementationType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Type ImplementationType { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), AllowMultiple=false, Inherited=false)] public sealed partial class PartCreationPolicyAttribute : System.Attribute { public PartCreationPolicyAttribute(System.ComponentModel.Composition.CreationPolicy creationPolicy) { } - public System.ComponentModel.Composition.CreationPolicy CreationPolicy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ComponentModel.Composition.CreationPolicy CreationPolicy { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), AllowMultiple=true, Inherited=false)] public sealed partial class PartMetadataAttribute : System.Attribute { public PartMetadataAttribute(string name, object value) { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } + public object Value { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), AllowMultiple=false, Inherited=false)] public sealed partial class PartNotDiscoverableAttribute : System.Attribute @@ -337,7 +338,7 @@ namespace System.ComponentModel.Composition.Hosting { public ComposablePartCatalogChangeEventArgs(System.Collections.Generic.IEnumerable addedDefinitions, System.Collections.Generic.IEnumerable removedDefinitions, System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition) { } public System.Collections.Generic.IEnumerable AddedDefinitions { get { throw null; } } - public System.ComponentModel.Composition.Hosting.AtomicComposition AtomicComposition { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ComponentModel.Composition.Hosting.AtomicComposition AtomicComposition { get { throw null; } } public System.Collections.Generic.IEnumerable RemovedDefinitions { get { throw null; } } } public partial class ComposablePartExportProvider : System.ComponentModel.Composition.Hosting.ExportProvider, System.IDisposable @@ -479,7 +480,7 @@ namespace System.ComponentModel.Composition.Hosting { public ExportsChangeEventArgs(System.Collections.Generic.IEnumerable addedExports, System.Collections.Generic.IEnumerable removedExports, System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition) { } public System.Collections.Generic.IEnumerable AddedExports { get { throw null; } } - public System.ComponentModel.Composition.Hosting.AtomicComposition AtomicComposition { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ComponentModel.Composition.Hosting.AtomicComposition AtomicComposition { get { throw null; } } public System.Collections.Generic.IEnumerable ChangedContractNames { get { throw null; } } public System.Collections.Generic.IEnumerable RemovedExports { get { throw null; } } } diff --git a/external/api-snapshot/profiles/monodroid/System.ComponentModel.DataAnnotations.cs b/external/api-snapshot/profiles/monodroid/System.ComponentModel.DataAnnotations.cs index 0d2d3dafb7..de2d407629 100644 --- a/external/api-snapshot/profiles/monodroid/System.ComponentModel.DataAnnotations.cs +++ b/external/api-snapshot/profiles/monodroid/System.ComponentModel.DataAnnotations.cs @@ -42,14 +42,14 @@ namespace System.ComponentModel.DataAnnotations public sealed partial class BindableTypeAttribute : System.Attribute { public BindableTypeAttribute() { } - public bool IsBindable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool IsBindable { get { throw null; } set { } } } [System.AttributeUsageAttribute((System.AttributeTargets)(128), AllowMultiple=false)] public partial class CompareAttribute : System.ComponentModel.DataAnnotations.ValidationAttribute { public CompareAttribute(string otherProperty) { } - public string OtherProperty { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string OtherPropertyDisplayName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string OtherProperty { get { throw null; } } + public string OtherPropertyDisplayName { get { throw null; } } public override bool RequiresValidationContext { get { throw null; } } public override string FormatErrorMessage(string name) { throw null; } protected override System.ComponentModel.DataAnnotations.ValidationResult IsValid(object value, System.ComponentModel.DataAnnotations.ValidationContext validationContext) { throw null; } @@ -100,9 +100,9 @@ namespace System.ComponentModel.DataAnnotations { public DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType dataType) { } public DataTypeAttribute(string customDataType) { } - public string CustomDataType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.ComponentModel.DataAnnotations.DataType DataType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.ComponentModel.DataAnnotations.DisplayFormatAttribute DisplayFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public string CustomDataType { get { throw null; } } + public System.ComponentModel.DataAnnotations.DataType DataType { get { throw null; } } + public System.ComponentModel.DataAnnotations.DisplayFormatAttribute DisplayFormat { get { throw null; } protected set { } } public virtual string GetDataTypeName() { throw null; } public override bool IsValid(object value) { throw null; } } @@ -134,26 +134,26 @@ namespace System.ComponentModel.DataAnnotations public DisplayColumnAttribute(string displayColumn) { } public DisplayColumnAttribute(string displayColumn, string sortColumn) { } public DisplayColumnAttribute(string displayColumn, string sortColumn, bool sortDescending) { } - public string DisplayColumn { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string SortColumn { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool SortDescending { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string DisplayColumn { get { throw null; } } + public string SortColumn { get { throw null; } } + public bool SortDescending { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(384), AllowMultiple=false)] public partial class DisplayFormatAttribute : System.Attribute { public DisplayFormatAttribute() { } - public bool ApplyFormatInEditMode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool ConvertEmptyStringToNull { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string DataFormatString { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool HtmlEncode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string NullDisplayText { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool ApplyFormatInEditMode { get { throw null; } set { } } + public bool ConvertEmptyStringToNull { get { throw null; } set { } } + public string DataFormatString { get { throw null; } set { } } + public bool HtmlEncode { get { throw null; } set { } } + public string NullDisplayText { get { throw null; } set { } } } [System.AttributeUsageAttribute((System.AttributeTargets)(384), AllowMultiple=false, Inherited=true)] public sealed partial class EditableAttribute : System.Attribute { public EditableAttribute(bool allowEdit) { } - public bool AllowEdit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool AllowInitialValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool AllowEdit { get { throw null; } } + public bool AllowInitialValue { get { throw null; } set { } } } [System.AttributeUsageAttribute((System.AttributeTargets)(2432), AllowMultiple=false)] public sealed partial class EmailAddressAttribute : System.ComponentModel.DataAnnotations.DataTypeAttribute @@ -165,7 +165,7 @@ namespace System.ComponentModel.DataAnnotations public sealed partial class EnumDataTypeAttribute : System.ComponentModel.DataAnnotations.DataTypeAttribute { public EnumDataTypeAttribute(System.Type enumType) : base (default(System.ComponentModel.DataAnnotations.DataType)) { } - public System.Type EnumType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Type EnumType { get { throw null; } } public override bool IsValid(object value) { throw null; } } [System.AttributeUsageAttribute((System.AttributeTargets)(2432), AllowMultiple=false)] @@ -203,7 +203,7 @@ namespace System.ComponentModel.DataAnnotations { public MaxLengthAttribute() { } public MaxLengthAttribute(int length) { } - public int Length { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int Length { get { throw null; } } public override string FormatErrorMessage(string name) { throw null; } public override bool IsValid(object value) { throw null; } } @@ -217,7 +217,7 @@ namespace System.ComponentModel.DataAnnotations public partial class MinLengthAttribute : System.ComponentModel.DataAnnotations.ValidationAttribute { public MinLengthAttribute(int length) { } - public int Length { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int Length { get { throw null; } } public override string FormatErrorMessage(string name) { throw null; } public override bool IsValid(object value) { throw null; } } @@ -233,9 +233,9 @@ namespace System.ComponentModel.DataAnnotations public RangeAttribute(double minimum, double maximum) { } public RangeAttribute(int minimum, int maximum) { } public RangeAttribute(System.Type type, string minimum, string maximum) { } - public object Maximum { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public object Minimum { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Type OperandType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public object Maximum { get { throw null; } } + public object Minimum { get { throw null; } } + public System.Type OperandType { get { throw null; } } public override string FormatErrorMessage(string name) { throw null; } public override bool IsValid(object value) { throw null; } } @@ -244,7 +244,7 @@ namespace System.ComponentModel.DataAnnotations { public RegularExpressionAttribute(string pattern) { } public int MatchTimeoutInMilliseconds { get { throw null; } set { } } - public string Pattern { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Pattern { get { throw null; } } public override string FormatErrorMessage(string name) { throw null; } public override bool IsValid(object value) { throw null; } } @@ -252,27 +252,27 @@ namespace System.ComponentModel.DataAnnotations public partial class RequiredAttribute : System.ComponentModel.DataAnnotations.ValidationAttribute { public RequiredAttribute() { } - public bool AllowEmptyStrings { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool AllowEmptyStrings { get { throw null; } set { } } public override bool IsValid(object value) { throw null; } } [System.AttributeUsageAttribute((System.AttributeTargets)(384), AllowMultiple=false)] public partial class ScaffoldColumnAttribute : System.Attribute { public ScaffoldColumnAttribute(bool scaffold) { } - public bool Scaffold { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool Scaffold { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), AllowMultiple=false)] public partial class ScaffoldTableAttribute : System.Attribute { public ScaffoldTableAttribute(bool scaffold) { } - public bool Scaffold { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool Scaffold { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(2432), AllowMultiple=false)] public partial class StringLengthAttribute : System.ComponentModel.DataAnnotations.ValidationAttribute { public StringLengthAttribute(int maximumLength) { } - public int MaximumLength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int MinimumLength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int MaximumLength { get { throw null; } } + public int MinimumLength { get { throw null; } set { } } public override string FormatErrorMessage(string name) { throw null; } public override bool IsValid(object value) { throw null; } } @@ -340,9 +340,9 @@ namespace System.ComponentModel.DataAnnotations public ValidationException(string message) { } public ValidationException(string errorMessage, System.ComponentModel.DataAnnotations.ValidationAttribute validatingAttribute, object value) { } public ValidationException(string message, System.Exception innerException) { } - public System.ComponentModel.DataAnnotations.ValidationAttribute ValidationAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ComponentModel.DataAnnotations.ValidationAttribute ValidationAttribute { get { throw null; } } public System.ComponentModel.DataAnnotations.ValidationResult ValidationResult { get { throw null; } } - public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public object Value { get { throw null; } } } public partial class ValidationResult { @@ -386,7 +386,7 @@ namespace System.ComponentModel.DataAnnotations.Schema public partial class DatabaseGeneratedAttribute : System.Attribute { public DatabaseGeneratedAttribute(System.ComponentModel.DataAnnotations.Schema.DatabaseGeneratedOption databaseGeneratedOption) { } - public System.ComponentModel.DataAnnotations.Schema.DatabaseGeneratedOption DatabaseGeneratedOption { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ComponentModel.DataAnnotations.Schema.DatabaseGeneratedOption DatabaseGeneratedOption { get { throw null; } } } public enum DatabaseGeneratedOption { diff --git a/external/api-snapshot/profiles/monodroid/System.Core.cs.REMOVED.git-id b/external/api-snapshot/profiles/monodroid/System.Core.cs.REMOVED.git-id index 273b4ad62d..8801d6e90b 100644 --- a/external/api-snapshot/profiles/monodroid/System.Core.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monodroid/System.Core.cs.REMOVED.git-id @@ -1 +1 @@ -9353b66f78db9388051dacdf077cea687c85e6ad \ No newline at end of file +f33b8a63fa46172d23817d0bcc706d25a6ddd781 \ No newline at end of file diff --git a/external/api-snapshot/profiles/monodroid/System.Data.cs.REMOVED.git-id b/external/api-snapshot/profiles/monodroid/System.Data.cs.REMOVED.git-id index dffd8fb6ca..b2f4394a95 100644 --- a/external/api-snapshot/profiles/monodroid/System.Data.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monodroid/System.Data.cs.REMOVED.git-id @@ -1 +1 @@ -274af052eceb5c59cf4900049c94a24b6978bf0e \ No newline at end of file +e7966ea302c46f6d09a52da2209dd99e2df1d8ca \ No newline at end of file diff --git a/external/api-snapshot/profiles/monodroid/System.Json.cs b/external/api-snapshot/profiles/monodroid/System.Json.cs index d9146446d2..56a5e3b454 100644 --- a/external/api-snapshot/profiles/monodroid/System.Json.cs +++ b/external/api-snapshot/profiles/monodroid/System.Json.cs @@ -80,12 +80,16 @@ namespace System.Json public JsonPrimitive(short value) { } public JsonPrimitive(int value) { } public JsonPrimitive(long value) { } + [System.CLSCompliantAttribute(false)] public JsonPrimitive(sbyte value) { } public JsonPrimitive(float value) { } public JsonPrimitive(string value) { } public JsonPrimitive(System.TimeSpan value) { } + [System.CLSCompliantAttribute(false)] public JsonPrimitive(ushort value) { } + [System.CLSCompliantAttribute(false)] public JsonPrimitive(uint value) { } + [System.CLSCompliantAttribute(false)] public JsonPrimitive(ulong value) { } public JsonPrimitive(System.Uri value) { } public override System.Json.JsonType JsonType { get { throw null; } } @@ -131,20 +135,28 @@ namespace System.Json public static implicit operator short (System.Json.JsonValue value) { throw null; } public static implicit operator int (System.Json.JsonValue value) { throw null; } public static implicit operator long (System.Json.JsonValue value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator sbyte (System.Json.JsonValue value) { throw null; } public static implicit operator float (System.Json.JsonValue value) { throw null; } public static implicit operator string (System.Json.JsonValue value) { throw null; } public static implicit operator System.TimeSpan (System.Json.JsonValue value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator ushort (System.Json.JsonValue value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator uint (System.Json.JsonValue value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator ulong (System.Json.JsonValue value) { throw null; } public static implicit operator System.Uri (System.Json.JsonValue value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator System.Json.JsonValue (sbyte value) { throw null; } public static implicit operator System.Json.JsonValue (float value) { throw null; } public static implicit operator System.Json.JsonValue (string value) { throw null; } public static implicit operator System.Json.JsonValue (System.TimeSpan value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator System.Json.JsonValue (ushort value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator System.Json.JsonValue (uint value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator System.Json.JsonValue (ulong value) { throw null; } public static implicit operator System.Json.JsonValue (System.Uri value) { throw null; } public static System.Json.JsonValue Parse(string jsonString) { throw null; } diff --git a/external/api-snapshot/profiles/monodroid/System.Net.Http.cs b/external/api-snapshot/profiles/monodroid/System.Net.Http.cs index c29201fb67..4722f0b62b 100644 --- a/external/api-snapshot/profiles/monodroid/System.Net.Http.cs +++ b/external/api-snapshot/profiles/monodroid/System.Net.Http.cs @@ -184,7 +184,7 @@ namespace System.Net.Http public HttpRequestMessage() { } public HttpRequestMessage(System.Net.Http.HttpMethod method, string requestUri) { } public HttpRequestMessage(System.Net.Http.HttpMethod method, System.Uri requestUri) { } - public System.Net.Http.HttpContent Content { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Net.Http.HttpContent Content { get { throw null; } set { } } public System.Net.Http.Headers.HttpRequestHeaders Headers { get { throw null; } } public System.Net.Http.HttpMethod Method { get { throw null; } set { } } public System.Collections.Generic.IDictionary Properties { get { throw null; } } @@ -198,11 +198,11 @@ namespace System.Net.Http { public HttpResponseMessage() { } public HttpResponseMessage(System.Net.HttpStatusCode statusCode) { } - public System.Net.Http.HttpContent Content { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Net.Http.HttpContent Content { get { throw null; } set { } } public System.Net.Http.Headers.HttpResponseHeaders Headers { get { throw null; } } public bool IsSuccessStatusCode { get { throw null; } } public string ReasonPhrase { get { throw null; } set { } } - public System.Net.Http.HttpRequestMessage RequestMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Net.Http.HttpRequestMessage RequestMessage { get { throw null; } set { } } public System.Net.HttpStatusCode StatusCode { get { throw null; } set { } } public System.Version Version { get { throw null; } set { } } public void Dispose() { } @@ -260,8 +260,8 @@ namespace System.Net.Http.Headers { public AuthenticationHeaderValue(string scheme) { } public AuthenticationHeaderValue(string scheme, string parameter) { } - public string Parameter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Scheme { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Parameter { get { throw null; } } + public string Scheme { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.AuthenticationHeaderValue Parse(string input) { throw null; } @@ -273,21 +273,21 @@ namespace System.Net.Http.Headers { public CacheControlHeaderValue() { } public System.Collections.Generic.ICollection Extensions { get { throw null; } } - public System.Nullable MaxAge { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool MaxStale { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable MaxStaleLimit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable MinFresh { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool MustRevalidate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool NoCache { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Nullable MaxAge { get { throw null; } set { } } + public bool MaxStale { get { throw null; } set { } } + public System.Nullable MaxStaleLimit { get { throw null; } set { } } + public System.Nullable MinFresh { get { throw null; } set { } } + public bool MustRevalidate { get { throw null; } set { } } + public bool NoCache { get { throw null; } set { } } public System.Collections.Generic.ICollection NoCacheHeaders { get { throw null; } } - public bool NoStore { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool NoTransform { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool OnlyIfCached { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool Private { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool NoStore { get { throw null; } set { } } + public bool NoTransform { get { throw null; } set { } } + public bool OnlyIfCached { get { throw null; } set { } } + public bool Private { get { throw null; } set { } } public System.Collections.Generic.ICollection PrivateHeaders { get { throw null; } } - public bool ProxyRevalidate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool Public { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable SharedMaxAge { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool ProxyRevalidate { get { throw null; } set { } } + public bool Public { get { throw null; } set { } } + public System.Nullable SharedMaxAge { get { throw null; } set { } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.CacheControlHeaderValue Parse(string input) { throw null; } @@ -320,11 +320,11 @@ namespace System.Net.Http.Headers public ContentRangeHeaderValue(long length) { } public ContentRangeHeaderValue(long from, long to) { } public ContentRangeHeaderValue(long from, long to, long length) { } - public System.Nullable From { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Nullable From { get { throw null; } } public bool HasLength { get { throw null; } } public bool HasRange { get { throw null; } } - public System.Nullable Length { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Nullable To { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Nullable Length { get { throw null; } } + public System.Nullable To { get { throw null; } } public string Unit { get { throw null; } set { } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } @@ -338,8 +338,8 @@ namespace System.Net.Http.Headers public EntityTagHeaderValue(string tag) { } public EntityTagHeaderValue(string tag, bool isWeak) { } public static System.Net.Http.Headers.EntityTagHeaderValue Any { get { throw null; } } - public bool IsWeak { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Tag { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsWeak { get { throw null; } } + public string Tag { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.EntityTagHeaderValue Parse(string input) { throw null; } @@ -480,7 +480,7 @@ namespace System.Net.Http.Headers protected internal NameValueHeaderValue(System.Net.Http.Headers.NameValueHeaderValue source) { } public NameValueHeaderValue(string name) { } public NameValueHeaderValue(string name, string value) { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } public string Value { get { throw null; } set { } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } @@ -506,8 +506,8 @@ namespace System.Net.Http.Headers { public ProductHeaderValue(string name) { } public ProductHeaderValue(string name, string version) { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Version { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } + public string Version { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.ProductHeaderValue Parse(string input) { throw null; } @@ -520,8 +520,8 @@ namespace System.Net.Http.Headers public ProductInfoHeaderValue(System.Net.Http.Headers.ProductHeaderValue product) { } public ProductInfoHeaderValue(string comment) { } public ProductInfoHeaderValue(string productName, string productVersion) { } - public string Comment { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Net.Http.Headers.ProductHeaderValue Product { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Comment { get { throw null; } } + public System.Net.Http.Headers.ProductHeaderValue Product { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.ProductInfoHeaderValue Parse(string input) { throw null; } @@ -534,8 +534,8 @@ namespace System.Net.Http.Headers public RangeConditionHeaderValue(System.DateTimeOffset date) { } public RangeConditionHeaderValue(System.Net.Http.Headers.EntityTagHeaderValue entityTag) { } public RangeConditionHeaderValue(string entityTag) { } - public System.Nullable Date { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Net.Http.Headers.EntityTagHeaderValue EntityTag { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Nullable Date { get { throw null; } } + public System.Net.Http.Headers.EntityTagHeaderValue EntityTag { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.RangeConditionHeaderValue Parse(string input) { throw null; } @@ -559,8 +559,8 @@ namespace System.Net.Http.Headers public partial class RangeItemHeaderValue : System.ICloneable { public RangeItemHeaderValue(System.Nullable from, System.Nullable to) { } - public System.Nullable From { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Nullable To { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Nullable From { get { throw null; } } + public System.Nullable To { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } object System.ICloneable.Clone() { throw null; } @@ -570,8 +570,8 @@ namespace System.Net.Http.Headers { public RetryConditionHeaderValue(System.DateTimeOffset date) { } public RetryConditionHeaderValue(System.TimeSpan delta) { } - public System.Nullable Date { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Nullable Delta { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Nullable Date { get { throw null; } } + public System.Nullable Delta { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.RetryConditionHeaderValue Parse(string input) { throw null; } @@ -583,8 +583,8 @@ namespace System.Net.Http.Headers { public StringWithQualityHeaderValue(string value) { } public StringWithQualityHeaderValue(string value, double quality) { } - public System.Nullable Quality { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Nullable Quality { get { throw null; } } + public string Value { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.StringWithQualityHeaderValue Parse(string input) { throw null; } @@ -618,10 +618,10 @@ namespace System.Net.Http.Headers public ViaHeaderValue(string protocolVersion, string receivedBy) { } public ViaHeaderValue(string protocolVersion, string receivedBy, string protocolName) { } public ViaHeaderValue(string protocolVersion, string receivedBy, string protocolName, string comment) { } - public string Comment { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ProtocolName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ProtocolVersion { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ReceivedBy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Comment { get { throw null; } } + public string ProtocolName { get { throw null; } } + public string ProtocolVersion { get { throw null; } } + public string ReceivedBy { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.ViaHeaderValue Parse(string input) { throw null; } @@ -633,10 +633,10 @@ namespace System.Net.Http.Headers { public WarningHeaderValue(int code, string agent, string text) { } public WarningHeaderValue(int code, string agent, string text, System.DateTimeOffset date) { } - public string Agent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int Code { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Nullable Date { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Text { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Agent { get { throw null; } } + public int Code { get { throw null; } } + public System.Nullable Date { get { throw null; } } + public string Text { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.WarningHeaderValue Parse(string input) { throw null; } diff --git a/external/api-snapshot/profiles/monodroid/System.Numerics.Vectors.cs b/external/api-snapshot/profiles/monodroid/System.Numerics.Vectors.cs index 506356b682..de8c478aaf 100644 --- a/external/api-snapshot/profiles/monodroid/System.Numerics.Vectors.cs +++ b/external/api-snapshot/profiles/monodroid/System.Numerics.Vectors.cs @@ -24,162 +24,8 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Matrix4x4))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Plane))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Quaternion))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Vector))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Vector2))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Vector3))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Vector4))] -namespace System.Numerics -{ - public static partial class Vector - { - public static bool IsHardwareAccelerated { get { throw null; } } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Abs(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Add(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector AndNot(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector AsVectorByte(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector AsVectorDouble(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector AsVectorInt16(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector AsVectorInt32(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector AsVectorInt64(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector AsVectorSByte(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector AsVectorSingle(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector AsVectorUInt16(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector AsVectorUInt32(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector AsVectorUInt64(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector BitwiseAnd(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector BitwiseOr(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector ConditionalSelect(System.Numerics.Vector condition, System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector ConditionalSelect(System.Numerics.Vector condition, System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector ConditionalSelect(System.Numerics.Vector condition, System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - public static System.Numerics.Vector ConvertToDouble(System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector ConvertToDouble(System.Numerics.Vector value) { throw null; } - public static System.Numerics.Vector ConvertToInt32(System.Numerics.Vector value) { throw null; } - public static System.Numerics.Vector ConvertToInt64(System.Numerics.Vector value) { throw null; } - public static System.Numerics.Vector ConvertToSingle(System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector ConvertToSingle(System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector ConvertToUInt32(System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector ConvertToUInt64(System.Numerics.Vector value) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Divide(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static T Dot(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Equals(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Equals(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Equals(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Equals(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool EqualsAll(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool EqualsAny(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Equals(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool GreaterThanAll(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool GreaterThanAny(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool GreaterThanOrEqualAll(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool GreaterThanOrEqualAny(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThan(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool LessThanAll(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool LessThanAny(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool LessThanOrEqualAll(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool LessThanOrEqualAny(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThan(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Max(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Min(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Multiply(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Multiply(System.Numerics.Vector left, T right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Multiply(T left, System.Numerics.Vector right) where T : struct { throw null; } - public static System.Numerics.Vector Narrow(System.Numerics.Vector low, System.Numerics.Vector high) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector Narrow(System.Numerics.Vector low, System.Numerics.Vector high) { throw null; } - public static System.Numerics.Vector Narrow(System.Numerics.Vector low, System.Numerics.Vector high) { throw null; } - public static System.Numerics.Vector Narrow(System.Numerics.Vector low, System.Numerics.Vector high) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector Narrow(System.Numerics.Vector low, System.Numerics.Vector high) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector Narrow(System.Numerics.Vector low, System.Numerics.Vector high) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector Narrow(System.Numerics.Vector low, System.Numerics.Vector high) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Negate(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector OnesComplement(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector SquareRoot(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Subtract(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.CLSCompliantAttribute(false)] - public static void Widen(System.Numerics.Vector source, out System.Numerics.Vector low, out System.Numerics.Vector high) { low = default(System.Numerics.Vector); high = default(System.Numerics.Vector); } - public static void Widen(System.Numerics.Vector source, out System.Numerics.Vector low, out System.Numerics.Vector high) { low = default(System.Numerics.Vector); high = default(System.Numerics.Vector); } - public static void Widen(System.Numerics.Vector source, out System.Numerics.Vector low, out System.Numerics.Vector high) { low = default(System.Numerics.Vector); high = default(System.Numerics.Vector); } - [System.CLSCompliantAttribute(false)] - public static void Widen(System.Numerics.Vector source, out System.Numerics.Vector low, out System.Numerics.Vector high) { low = default(System.Numerics.Vector); high = default(System.Numerics.Vector); } - public static void Widen(System.Numerics.Vector source, out System.Numerics.Vector low, out System.Numerics.Vector high) { low = default(System.Numerics.Vector); high = default(System.Numerics.Vector); } - [System.CLSCompliantAttribute(false)] - public static void Widen(System.Numerics.Vector source, out System.Numerics.Vector low, out System.Numerics.Vector high) { low = default(System.Numerics.Vector); high = default(System.Numerics.Vector); } - [System.CLSCompliantAttribute(false)] - public static void Widen(System.Numerics.Vector source, out System.Numerics.Vector low, out System.Numerics.Vector high) { low = default(System.Numerics.Vector); high = default(System.Numerics.Vector); } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Xor(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public partial struct Vector : System.IEquatable>, System.IFormattable where T : struct - { - public Vector(T value) { throw null;} - public Vector(T[] values) { throw null;} - public Vector(T[] values, int index) { throw null;} - public static int Count { get { throw null; } } - public T this[int index] { get { throw null; } } - public static System.Numerics.Vector One { get { throw null; } } - public static System.Numerics.Vector Zero { get { throw null; } } - public void CopyTo(T[] destination) { } - public void CopyTo(T[] destination, int startIndex) { } - public bool Equals(System.Numerics.Vector other) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public override bool Equals(object obj) { throw null; } - public override int GetHashCode() { throw null; } - public static System.Numerics.Vector operator +(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static System.Numerics.Vector operator &(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static System.Numerics.Vector operator |(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static System.Numerics.Vector operator /(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool operator ==(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static System.Numerics.Vector operator ^(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool operator !=(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static System.Numerics.Vector operator *(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static System.Numerics.Vector operator *(System.Numerics.Vector value, T factor) { throw null; } - public static System.Numerics.Vector operator *(T factor, System.Numerics.Vector value) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector operator ~(System.Numerics.Vector value) { throw null; } - public static System.Numerics.Vector operator -(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static System.Numerics.Vector operator -(System.Numerics.Vector value) { throw null; } - public override string ToString() { throw null; } - public string ToString(string format) { throw null; } - public string ToString(string format, System.IFormatProvider formatProvider) { throw null; } - } -} +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Vector<>))] diff --git a/external/api-snapshot/profiles/monodroid/System.Runtime.CompilerServices.Unsafe.cs b/external/api-snapshot/profiles/monodroid/System.Runtime.CompilerServices.Unsafe.cs index 70b70ea055..5e8d07e76d 100644 --- a/external/api-snapshot/profiles/monodroid/System.Runtime.CompilerServices.Unsafe.cs +++ b/external/api-snapshot/profiles/monodroid/System.Runtime.CompilerServices.Unsafe.cs @@ -30,6 +30,8 @@ namespace System.Runtime.CompilerServices [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public unsafe static void InitBlock(void* startAddress, byte value, uint byteCount) { } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static void InitBlockUnaligned(ref byte startAddress, byte value, uint byteCount) { } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public unsafe static void InitBlockUnaligned(void* startAddress, byte value, uint byteCount) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool IsAddressGreaterThan(ref T left, ref T right) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool IsAddressLessThan(ref T left, ref T right) { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static T ReadUnaligned(ref byte source) { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public unsafe static T ReadUnaligned(void* source) { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public unsafe static T Read(void* source) { throw null; } diff --git a/external/api-snapshot/profiles/monodroid/System.Runtime.Serialization.cs b/external/api-snapshot/profiles/monodroid/System.Runtime.Serialization.cs index 994c1d3524..6b17febfec 100644 --- a/external/api-snapshot/profiles/monodroid/System.Runtime.Serialization.cs +++ b/external/api-snapshot/profiles/monodroid/System.Runtime.Serialization.cs @@ -107,15 +107,15 @@ namespace System.Runtime.Serialization public partial class DataContractSerializerSettings { public DataContractSerializerSettings() { } - public System.Runtime.Serialization.DataContractResolver DataContractResolver { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Runtime.Serialization.IDataContractSurrogate DataContractSurrogate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IgnoreExtensionDataObject { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IEnumerable KnownTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Runtime.Serialization.DataContractResolver DataContractResolver { get { throw null; } set { } } + public System.Runtime.Serialization.IDataContractSurrogate DataContractSurrogate { get { throw null; } set { } } + public bool IgnoreExtensionDataObject { get { throw null; } set { } } + public System.Collections.Generic.IEnumerable KnownTypes { get { throw null; } set { } } public int MaxItemsInObjectGraph { get { throw null; } set { } } - public bool PreserveObjectReferences { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Xml.XmlDictionaryString RootName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Xml.XmlDictionaryString RootNamespace { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SerializeReadOnlyTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool PreserveObjectReferences { get { throw null; } set { } } + public System.Xml.XmlDictionaryString RootName { get { throw null; } set { } } + public System.Xml.XmlDictionaryString RootNamespace { get { throw null; } set { } } + public bool SerializeReadOnlyTypes { get { throw null; } set { } } } [System.AttributeUsageAttribute((System.AttributeTargets)(384), Inherited=false, AllowMultiple=false)] public sealed partial class DataMemberAttribute : System.Attribute @@ -320,15 +320,15 @@ namespace System.Runtime.Serialization.Json public partial class DataContractJsonSerializerSettings { public DataContractJsonSerializerSettings() { } - public System.Runtime.Serialization.IDataContractSurrogate DataContractSurrogate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Runtime.Serialization.DateTimeFormat DateTimeFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Runtime.Serialization.EmitTypeInformation EmitTypeInformation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IgnoreExtensionDataObject { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IEnumerable KnownTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Runtime.Serialization.IDataContractSurrogate DataContractSurrogate { get { throw null; } set { } } + public System.Runtime.Serialization.DateTimeFormat DateTimeFormat { get { throw null; } set { } } + public System.Runtime.Serialization.EmitTypeInformation EmitTypeInformation { get { throw null; } set { } } + public bool IgnoreExtensionDataObject { get { throw null; } set { } } + public System.Collections.Generic.IEnumerable KnownTypes { get { throw null; } set { } } public int MaxItemsInObjectGraph { get { throw null; } set { } } - public string RootName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SerializeReadOnlyTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool UseSimpleDictionaryFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string RootName { get { throw null; } set { } } + public bool SerializeReadOnlyTypes { get { throw null; } set { } } + public bool UseSimpleDictionaryFormat { get { throw null; } set { } } } [System.Runtime.CompilerServices.TypeForwardedFromAttribute("System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")] public partial interface IXmlJsonReaderInitializer diff --git a/external/api-snapshot/profiles/monodroid/System.ServiceModel.Web.cs b/external/api-snapshot/profiles/monodroid/System.ServiceModel.Web.cs index ecb76b7790..05cb7be0cc 100644 --- a/external/api-snapshot/profiles/monodroid/System.ServiceModel.Web.cs +++ b/external/api-snapshot/profiles/monodroid/System.ServiceModel.Web.cs @@ -62,8 +62,8 @@ namespace System public UriTemplate(string template, bool ignoreTrailingSlash) { } public UriTemplate(string template, bool ignoreTrailingSlash, System.Collections.Generic.IDictionary additionalDefaults) { } public UriTemplate(string template, System.Collections.Generic.IDictionary additionalDefaults) { } - public System.Collections.Generic.IDictionary Defaults { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool IgnoreTrailingSlash { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IDictionary Defaults { get { throw null; } } + public bool IgnoreTrailingSlash { get { throw null; } } public System.Collections.ObjectModel.ReadOnlyCollection PathSegmentVariableNames { get { throw null; } } public System.Collections.ObjectModel.ReadOnlyCollection QueryValueVariableNames { get { throw null; } } public System.Uri BindByName(System.Uri baseAddress, System.Collections.Generic.IDictionary parameters) { throw null; } @@ -145,7 +145,7 @@ namespace System.ServiceModel { public WebHttpSecurity() { } public System.ServiceModel.WebHttpSecurityMode Mode { get { throw null; } set { } } - public System.ServiceModel.HttpTransportSecurity Transport { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.ServiceModel.HttpTransportSecurity Transport { get { throw null; } set { } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(2))] public bool ShouldSerializeMode() { throw null; } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(2))] @@ -190,7 +190,7 @@ namespace System.ServiceModel.Channels [System.MonoTODOAttribute] public int MaxWritePoolSize { get { throw null; } set { } } public override System.ServiceModel.Channels.MessageVersion MessageVersion { get { throw null; } set { } } - public System.Xml.XmlDictionaryReaderQuotas ReaderQuotas { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Xml.XmlDictionaryReaderQuotas ReaderQuotas { get { throw null; } } public System.Text.Encoding WriteEncoding { get { throw null; } set { } } public override System.ServiceModel.Channels.IChannelFactory BuildChannelFactory(System.ServiceModel.Channels.BindingContext context) { throw null; } public override System.ServiceModel.Channels.BindingElement Clone() { throw null; } @@ -203,12 +203,12 @@ namespace System.ServiceModel.Description public partial class WebHttpBehavior : System.ServiceModel.Description.IEndpointBehavior { public WebHttpBehavior() { } - public virtual bool AutomaticFormatSelectionEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.ServiceModel.Web.WebMessageBodyStyle DefaultBodyStyle { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.ServiceModel.Web.WebMessageFormat DefaultOutgoingRequestFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.ServiceModel.Web.WebMessageFormat DefaultOutgoingResponseFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual bool FaultExceptionEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual bool HelpEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual bool AutomaticFormatSelectionEnabled { get { throw null; } set { } } + public virtual System.ServiceModel.Web.WebMessageBodyStyle DefaultBodyStyle { get { throw null; } set { } } + public virtual System.ServiceModel.Web.WebMessageFormat DefaultOutgoingRequestFormat { get { throw null; } set { } } + public virtual System.ServiceModel.Web.WebMessageFormat DefaultOutgoingResponseFormat { get { throw null; } set { } } + public virtual bool FaultExceptionEnabled { get { throw null; } set { } } + public virtual bool HelpEnabled { get { throw null; } set { } } public virtual void AddBindingParameters(System.ServiceModel.Description.ServiceEndpoint endpoint, System.ServiceModel.Channels.BindingParameterCollection bindingParameters) { } [System.MonoTODOAttribute] protected virtual void AddClientErrorInspector(System.ServiceModel.Description.ServiceEndpoint endpoint, System.ServiceModel.Dispatcher.ClientRuntime clientRuntime) { } @@ -256,17 +256,17 @@ namespace System.ServiceModel.Web public partial class OutgoingWebRequestContext { internal OutgoingWebRequestContext() { } - public string Accept { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public long ContentLength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ContentType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Net.WebHeaderCollection Headers { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string IfMatch { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string IfModifiedSince { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string IfNoneMatch { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string IfUnmodifiedSince { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Method { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SuppressEntityBody { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string UserAgent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Accept { get { throw null; } set { } } + public long ContentLength { get { throw null; } set { } } + public string ContentType { get { throw null; } set { } } + public System.Net.WebHeaderCollection Headers { get { throw null; } } + public string IfMatch { get { throw null; } set { } } + public string IfModifiedSince { get { throw null; } set { } } + public string IfNoneMatch { get { throw null; } set { } } + public string IfUnmodifiedSince { get { throw null; } set { } } + public string Method { get { throw null; } set { } } + public bool SuppressEntityBody { get { throw null; } set { } } + public string UserAgent { get { throw null; } set { } } } public partial class WebChannelFactory : System.ServiceModel.ChannelFactory { diff --git a/external/api-snapshot/profiles/monodroid/System.ServiceModel.cs.REMOVED.git-id b/external/api-snapshot/profiles/monodroid/System.ServiceModel.cs.REMOVED.git-id index 0b5824b15f..189e87c972 100644 --- a/external/api-snapshot/profiles/monodroid/System.ServiceModel.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monodroid/System.ServiceModel.cs.REMOVED.git-id @@ -1 +1 @@ -66d416bcfc3bd2125a8426cd800870dffd952e57 \ No newline at end of file +fdbaba096bec0ae20215f815e316f483b0560f77 \ No newline at end of file diff --git a/external/api-snapshot/profiles/monodroid/System.Xml.Linq.cs b/external/api-snapshot/profiles/monodroid/System.Xml.Linq.cs index 868f4c41af..ca51e398f3 100644 --- a/external/api-snapshot/profiles/monodroid/System.Xml.Linq.cs +++ b/external/api-snapshot/profiles/monodroid/System.Xml.Linq.cs @@ -18,6 +18,7 @@ [assembly:System.Runtime.CompilerServices.CompilationRelaxationsAttribute((System.Runtime.CompilerServices.CompilationRelaxations)(8))] [assembly:System.Runtime.CompilerServices.RuntimeCompatibilityAttribute(WrapNonExceptionThrows=true)] [assembly:System.Runtime.InteropServices.ComVisibleAttribute(false)] +[assembly:System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.RequestMinimum, SkipVerification=true)] namespace System.Xml.Linq { public static partial class Extensions @@ -62,7 +63,6 @@ namespace System.Xml.Linq None = 0, OmitDuplicateNamespaces = 2, } - [System.ComponentModel.TypeDescriptionProviderAttribute("MS.Internal.Xml.Linq.ComponentModel.XTypeDescriptionProvider")] public partial class XAttribute : System.Xml.Linq.XObject { public XAttribute(System.Xml.Linq.XAttribute other) { } @@ -134,6 +134,7 @@ namespace System.Xml.Linq public XCData(System.Xml.Linq.XCData other) : base (default(string)) { } public override System.Xml.XmlNodeType NodeType { get { throw null; } } public override void WriteTo(System.Xml.XmlWriter writer) { } + public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } public partial class XComment : System.Xml.Linq.XNode { @@ -142,6 +143,7 @@ namespace System.Xml.Linq public override System.Xml.XmlNodeType NodeType { get { throw null; } } public string Value { get { throw null; } set { } } public override void WriteTo(System.Xml.XmlWriter writer) { } + public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } public abstract partial class XContainer : System.Xml.Linq.XNode { @@ -191,6 +193,9 @@ namespace System.Xml.Linq public static System.Xml.Linq.XDocument Load(string uri, System.Xml.Linq.LoadOptions options) { throw null; } public static System.Xml.Linq.XDocument Load(System.Xml.XmlReader reader) { throw null; } public static System.Xml.Linq.XDocument Load(System.Xml.XmlReader reader, System.Xml.Linq.LoadOptions options) { throw null; } + public static System.Threading.Tasks.Task LoadAsync(System.IO.Stream stream, System.Xml.Linq.LoadOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public static System.Threading.Tasks.Task LoadAsync(System.IO.TextReader textReader, System.Xml.Linq.LoadOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public static System.Threading.Tasks.Task LoadAsync(System.Xml.XmlReader reader, System.Xml.Linq.LoadOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } public static System.Xml.Linq.XDocument Parse(string text) { throw null; } public static System.Xml.Linq.XDocument Parse(string text, System.Xml.Linq.LoadOptions options) { throw null; } public void Save(System.IO.Stream stream) { } @@ -200,7 +205,11 @@ namespace System.Xml.Linq public void Save(string fileName) { } public void Save(string fileName, System.Xml.Linq.SaveOptions options) { } public void Save(System.Xml.XmlWriter writer) { } + public System.Threading.Tasks.Task SaveAsync(System.IO.Stream stream, System.Xml.Linq.SaveOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.Task SaveAsync(System.IO.TextWriter textWriter, System.Xml.Linq.SaveOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.Task SaveAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } public override void WriteTo(System.Xml.XmlWriter writer) { } + public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } public partial class XDocumentType : System.Xml.Linq.XNode { @@ -212,8 +221,8 @@ namespace System.Xml.Linq public string PublicId { get { throw null; } set { } } public string SystemId { get { throw null; } set { } } public override void WriteTo(System.Xml.XmlWriter writer) { } + public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } - [System.ComponentModel.TypeDescriptionProviderAttribute("MS.Internal.Xml.Linq.ComponentModel.XTypeDescriptionProvider")] [System.Xml.Serialization.XmlSchemaProviderAttribute(null, IsAny=true)] public partial class XElement : System.Xml.Linq.XContainer, System.Xml.Serialization.IXmlSerializable { @@ -250,6 +259,9 @@ namespace System.Xml.Linq public static System.Xml.Linq.XElement Load(string uri, System.Xml.Linq.LoadOptions options) { throw null; } public static System.Xml.Linq.XElement Load(System.Xml.XmlReader reader) { throw null; } public static System.Xml.Linq.XElement Load(System.Xml.XmlReader reader, System.Xml.Linq.LoadOptions options) { throw null; } + public static System.Threading.Tasks.Task LoadAsync(System.IO.Stream stream, System.Xml.Linq.LoadOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public static System.Threading.Tasks.Task LoadAsync(System.IO.TextReader textReader, System.Xml.Linq.LoadOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public static System.Threading.Tasks.Task LoadAsync(System.Xml.XmlReader reader, System.Xml.Linq.LoadOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } [System.CLSCompliantAttribute(false)] public static explicit operator bool (System.Xml.Linq.XElement element) { throw null; } [System.CLSCompliantAttribute(false)] @@ -315,6 +327,9 @@ namespace System.Xml.Linq public void Save(string fileName) { } public void Save(string fileName, System.Xml.Linq.SaveOptions options) { } public void Save(System.Xml.XmlWriter writer) { } + public System.Threading.Tasks.Task SaveAsync(System.IO.Stream stream, System.Xml.Linq.SaveOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.Task SaveAsync(System.IO.TextWriter textWriter, System.Xml.Linq.SaveOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.Task SaveAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } public void SetAttributeValue(System.Xml.Linq.XName name, object value) { } public void SetElementValue(System.Xml.Linq.XName name, object value) { } public void SetValue(object value) { } @@ -322,6 +337,7 @@ namespace System.Xml.Linq void System.Xml.Serialization.IXmlSerializable.ReadXml(System.Xml.XmlReader reader) { } void System.Xml.Serialization.IXmlSerializable.WriteXml(System.Xml.XmlWriter writer) { } public override void WriteTo(System.Xml.XmlWriter writer) { } + public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } [System.SerializableAttribute] public sealed partial class XName : System.IEquatable, System.Runtime.Serialization.ISerializable @@ -339,7 +355,6 @@ namespace System.Xml.Linq public static implicit operator System.Xml.Linq.XName (string expandedName) { throw null; } public static bool operator !=(System.Xml.Linq.XName left, System.Xml.Linq.XName right) { throw null; } bool System.IEquatable.Equals(System.Xml.Linq.XName other) { throw null; } - [System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.LinkDemand, Flags=(System.Security.Permissions.SecurityPermissionFlag)(128))] void System.Runtime.Serialization.ISerializable.GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } public override string ToString() { throw null; } } @@ -387,12 +402,14 @@ namespace System.Xml.Linq public System.Collections.Generic.IEnumerable NodesAfterSelf() { throw null; } public System.Collections.Generic.IEnumerable NodesBeforeSelf() { throw null; } public static System.Xml.Linq.XNode ReadFrom(System.Xml.XmlReader reader) { throw null; } + public static System.Threading.Tasks.Task ReadFromAsync(System.Xml.XmlReader reader, System.Threading.CancellationToken cancellationToken) { throw null; } public void Remove() { } public void ReplaceWith(object content) { } public void ReplaceWith(params object[] content) { } public override string ToString() { throw null; } public string ToString(System.Xml.Linq.SaveOptions options) { throw null; } public abstract void WriteTo(System.Xml.XmlWriter writer); + public abstract System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken); } public sealed partial class XNodeDocumentOrderComparer : System.Collections.Generic.IComparer, System.Collections.IComparer { @@ -452,6 +469,7 @@ namespace System.Xml.Linq public override System.Xml.XmlNodeType NodeType { get { throw null; } } public string Target { get { throw null; } set { } } public override void WriteTo(System.Xml.XmlWriter writer) { } + public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } public partial class XStreamingElement { @@ -479,6 +497,7 @@ namespace System.Xml.Linq public override System.Xml.XmlNodeType NodeType { get { throw null; } } public string Value { get { throw null; } set { } } public override void WriteTo(System.Xml.XmlWriter writer) { } + public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } } namespace System.Xml.Schema diff --git a/external/api-snapshot/profiles/monodroid/System.cs.REMOVED.git-id b/external/api-snapshot/profiles/monodroid/System.cs.REMOVED.git-id index 80bd8eb1ce..f86f8b9be0 100644 --- a/external/api-snapshot/profiles/monodroid/System.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monodroid/System.cs.REMOVED.git-id @@ -1 +1 @@ -65e4560d5595dc280c9096fe0d5f437aa2fdb1fe \ No newline at end of file +d343eb5458c68903df629e9b5279a611131d5dc2 \ No newline at end of file diff --git a/external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id b/external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id index 3c1c8ac6c1..825cf38d62 100644 --- a/external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id @@ -1 +1 @@ -68e9da8935703ec351b96ccea7fbf64a5cbea145 \ No newline at end of file +ad3837793c1a54bb1919f1b8685ba5e3c39c301b \ No newline at end of file diff --git a/external/api-snapshot/profiles/monotouch/Facades/System.Memory.cs b/external/api-snapshot/profiles/monotouch/Facades/System.Memory.cs index aa8f28c0e2..7661799898 100644 --- a/external/api-snapshot/profiles/monotouch/Facades/System.Memory.cs +++ b/external/api-snapshot/profiles/monotouch/Facades/System.Memory.cs @@ -15,12 +15,23 @@ [assembly:System.Runtime.CompilerServices.CompilationRelaxationsAttribute(8)] [assembly:System.Runtime.CompilerServices.RuntimeCompatibilityAttribute(WrapNonExceptionThrows=true)] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.Binary.BinaryPrimitives))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.BuffersExtensions))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.IBufferWriter<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.IMemoryOwner<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.IPinnable))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.MemoryHandle))] -[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.OperationStatus))] -[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.StandardFormat))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.MemoryManager<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.MemoryPool<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.ReadOnlySequence<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.ReadOnlySequenceSegment<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.Text.Base64))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.Text.Utf8Formatter))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.Text.Utf8Parser))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Memory<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MemoryExtensions))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ReadOnlyMemory<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ReadOnlySpan<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.MemoryMarshal))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.SequenceMarshal))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.SequencePosition))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Span<>))] diff --git a/external/api-snapshot/profiles/monotouch/Facades/System.Runtime.Extensions.cs b/external/api-snapshot/profiles/monotouch/Facades/System.Runtime.Extensions.cs index 9e447cba50..1e8af5be42 100644 --- a/external/api-snapshot/profiles/monotouch/Facades/System.Runtime.Extensions.cs +++ b/external/api-snapshot/profiles/monotouch/Facades/System.Runtime.Extensions.cs @@ -20,6 +20,7 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Environment))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.Path))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Math))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MathF))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MidpointRounding))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.WebUtility))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Progress<>))] diff --git a/external/api-snapshot/profiles/monotouch/Mono.Data.Sqlite.cs b/external/api-snapshot/profiles/monotouch/Mono.Data.Sqlite.cs index 621246354d..129f223a23 100644 --- a/external/api-snapshot/profiles/monotouch/Mono.Data.Sqlite.cs +++ b/external/api-snapshot/profiles/monotouch/Mono.Data.Sqlite.cs @@ -55,7 +55,6 @@ namespace Mono.Data.Sqlite Collation = 2, Scalar = 0, } - [System.ComponentModel.DesignerAttribute("SQLite.Designer.SqliteCommandDesigner, SQLite.Designer, Version=1.0.36.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139")] [System.ComponentModel.ToolboxItemAttribute(true)] public sealed partial class SqliteCommand : System.Data.Common.DbCommand, System.ICloneable { @@ -285,7 +284,6 @@ namespace Mono.Data.Sqlite public static string UTF8ToString(System.IntPtr nativestring, int nativestringlen) { throw null; } } [System.ComponentModel.DefaultEventAttribute("RowUpdated")] - [System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.Data.VS.SqlDataAdapterDesigner, Microsoft.VSDesigner, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] [System.ComponentModel.ToolboxItemAttribute("SQLite.Designer.SqliteDataAdapterToolboxItem, SQLite.Designer, Version=1.0.36.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139")] public sealed partial class SqliteDataAdapter : System.Data.Common.DbDataAdapter { diff --git a/external/api-snapshot/profiles/monotouch/Mono.Data.Tds.cs b/external/api-snapshot/profiles/monotouch/Mono.Data.Tds.cs index 685916a0fc..9c2db292d2 100644 --- a/external/api-snapshot/profiles/monotouch/Mono.Data.Tds.cs +++ b/external/api-snapshot/profiles/monotouch/Mono.Data.Tds.cs @@ -353,31 +353,31 @@ namespace Mono.Data.Tds.Protocol public partial class TdsDataColumn { public TdsDataColumn() { } - public System.Nullable AllowDBNull { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string BaseCatalogName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string BaseColumnName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string BaseSchemaName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string BaseServerName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string BaseTableName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ColumnName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable ColumnOrdinal { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable ColumnSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable ColumnType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string DataTypeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsAliased { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsAutoIncrement { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsExpression { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsHidden { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsIdentity { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsReadOnly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsRowVersion { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsUnique { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Nullable AllowDBNull { get { throw null; } set { } } + public string BaseCatalogName { get { throw null; } set { } } + public string BaseColumnName { get { throw null; } set { } } + public string BaseSchemaName { get { throw null; } set { } } + public string BaseServerName { get { throw null; } set { } } + public string BaseTableName { get { throw null; } set { } } + public string ColumnName { get { throw null; } set { } } + public System.Nullable ColumnOrdinal { get { throw null; } set { } } + public System.Nullable ColumnSize { get { throw null; } set { } } + public System.Nullable ColumnType { get { throw null; } set { } } + public string DataTypeName { get { throw null; } set { } } + public System.Nullable IsAliased { get { throw null; } set { } } + public System.Nullable IsAutoIncrement { get { throw null; } set { } } + public System.Nullable IsExpression { get { throw null; } set { } } + public System.Nullable IsHidden { get { throw null; } set { } } + public System.Nullable IsIdentity { get { throw null; } set { } } + public System.Nullable IsKey { get { throw null; } set { } } + public System.Nullable IsReadOnly { get { throw null; } set { } } + public System.Nullable IsRowVersion { get { throw null; } set { } } + public System.Nullable IsUnique { get { throw null; } set { } } public object this[string key] { get { throw null; } set { } } - public System.Nullable LCID { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable NumericPrecision { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable NumericScale { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable SortOrder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Nullable LCID { get { throw null; } set { } } + public System.Nullable NumericPrecision { get { throw null; } set { } } + public System.Nullable NumericScale { get { throw null; } set { } } + public System.Nullable SortOrder { get { throw null; } set { } } } public partial class TdsDataColumnCollection : System.Collections.IEnumerable { diff --git a/external/api-snapshot/profiles/monotouch/Mono.Security.cs.REMOVED.git-id b/external/api-snapshot/profiles/monotouch/Mono.Security.cs.REMOVED.git-id index 33985b2979..1692a423ee 100644 --- a/external/api-snapshot/profiles/monotouch/Mono.Security.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monotouch/Mono.Security.cs.REMOVED.git-id @@ -1 +1 @@ -30dc0073df0cdcdfd6decf332a591436408260b6 \ No newline at end of file +f8e2479a9b722839fbc164007824cf045a0ea038 \ No newline at end of file diff --git a/external/api-snapshot/profiles/monotouch/Mono.Simd.cs.REMOVED.git-id b/external/api-snapshot/profiles/monotouch/Mono.Simd.cs.REMOVED.git-id index e624c4c236..b8a5505edd 100644 --- a/external/api-snapshot/profiles/monotouch/Mono.Simd.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monotouch/Mono.Simd.cs.REMOVED.git-id @@ -1 +1 @@ -9a502baba32818dbb12420f31d3d6e443bb8edd7 \ No newline at end of file +e7d047f509f67a91a1064674c1f80fa161a55a1f \ No newline at end of file diff --git a/external/api-snapshot/profiles/monotouch/System.ComponentModel.Composition.cs b/external/api-snapshot/profiles/monotouch/System.ComponentModel.Composition.cs index b694e88564..1a66391270 100644 --- a/external/api-snapshot/profiles/monotouch/System.ComponentModel.Composition.cs +++ b/external/api-snapshot/profiles/monotouch/System.ComponentModel.Composition.cs @@ -16,6 +16,7 @@ [assembly:System.Resources.NeutralResourcesLanguageAttribute("en-US")] [assembly:System.Resources.SatelliteContractVersionAttribute("2.0.5.0")] [assembly:System.Runtime.CompilerServices.CompilationRelaxationsAttribute(8)] +[assembly:System.Runtime.CompilerServices.InternalsVisibleToAttribute("net_4_x_System.ComponentModel.Composition_xunit-test, PublicKey=002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df")] [assembly:System.Runtime.CompilerServices.RuntimeCompatibilityAttribute(WrapNonExceptionThrows=true)] [assembly:System.Runtime.InteropServices.ComVisibleAttribute(false)] [assembly:System.Security.AllowPartiallyTrustedCallersAttribute] @@ -125,8 +126,8 @@ namespace System.ComponentModel.Composition public ExportAttribute(string contractName) { } public ExportAttribute(string contractName, System.Type contractType) { } public ExportAttribute(System.Type contractType) { } - public string ContractName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Type ContractType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string ContractName { get { throw null; } } + public System.Type ContractType { get { throw null; } } } public partial class ExportFactory { @@ -149,9 +150,9 @@ namespace System.ComponentModel.Composition public sealed partial class ExportMetadataAttribute : System.Attribute { public ExportMetadataAttribute(string name, object value) { } - public bool IsMultiple { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsMultiple { get { throw null; } set { } } + public string Name { get { throw null; } } + public object Value { get { throw null; } } } public partial interface ICompositionService { @@ -164,12 +165,12 @@ namespace System.ComponentModel.Composition public ImportAttribute(string contractName) { } public ImportAttribute(string contractName, System.Type contractType) { } public ImportAttribute(System.Type contractType) { } - public bool AllowDefault { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool AllowRecomposition { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ContractName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Type ContractType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.ComponentModel.Composition.CreationPolicy RequiredCreationPolicy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.ComponentModel.Composition.ImportSource Source { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool AllowDefault { get { throw null; } set { } } + public bool AllowRecomposition { get { throw null; } set { } } + public string ContractName { get { throw null; } } + public System.Type ContractType { get { throw null; } } + public System.ComponentModel.Composition.CreationPolicy RequiredCreationPolicy { get { throw null; } set { } } + public System.ComponentModel.Composition.ImportSource Source { get { throw null; } set { } } } [System.Diagnostics.DebuggerDisplayAttribute("{Message}")] [System.Diagnostics.DebuggerTypeProxyAttribute("System.ComponentModel.Composition.ImportCardinalityMismatchExceptionDebuggerProxy")] @@ -194,11 +195,11 @@ namespace System.ComponentModel.Composition public ImportManyAttribute(string contractName) { } public ImportManyAttribute(string contractName, System.Type contractType) { } public ImportManyAttribute(System.Type contractType) { } - public bool AllowRecomposition { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ContractName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Type ContractType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.ComponentModel.Composition.CreationPolicy RequiredCreationPolicy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.ComponentModel.Composition.ImportSource Source { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool AllowRecomposition { get { throw null; } set { } } + public string ContractName { get { throw null; } } + public System.Type ContractType { get { throw null; } } + public System.ComponentModel.Composition.CreationPolicy RequiredCreationPolicy { get { throw null; } set { } } + public System.ComponentModel.Composition.ImportSource Source { get { throw null; } set { } } } public enum ImportSource { @@ -227,20 +228,20 @@ namespace System.ComponentModel.Composition public sealed partial class MetadataViewImplementationAttribute : System.Attribute { public MetadataViewImplementationAttribute(System.Type implementationType) { } - public System.Type ImplementationType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Type ImplementationType { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), AllowMultiple=false, Inherited=false)] public sealed partial class PartCreationPolicyAttribute : System.Attribute { public PartCreationPolicyAttribute(System.ComponentModel.Composition.CreationPolicy creationPolicy) { } - public System.ComponentModel.Composition.CreationPolicy CreationPolicy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ComponentModel.Composition.CreationPolicy CreationPolicy { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), AllowMultiple=true, Inherited=false)] public sealed partial class PartMetadataAttribute : System.Attribute { public PartMetadataAttribute(string name, object value) { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } + public object Value { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), AllowMultiple=false, Inherited=false)] public sealed partial class PartNotDiscoverableAttribute : System.Attribute @@ -337,7 +338,7 @@ namespace System.ComponentModel.Composition.Hosting { public ComposablePartCatalogChangeEventArgs(System.Collections.Generic.IEnumerable addedDefinitions, System.Collections.Generic.IEnumerable removedDefinitions, System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition) { } public System.Collections.Generic.IEnumerable AddedDefinitions { get { throw null; } } - public System.ComponentModel.Composition.Hosting.AtomicComposition AtomicComposition { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ComponentModel.Composition.Hosting.AtomicComposition AtomicComposition { get { throw null; } } public System.Collections.Generic.IEnumerable RemovedDefinitions { get { throw null; } } } public partial class ComposablePartExportProvider : System.ComponentModel.Composition.Hosting.ExportProvider, System.IDisposable @@ -479,7 +480,7 @@ namespace System.ComponentModel.Composition.Hosting { public ExportsChangeEventArgs(System.Collections.Generic.IEnumerable addedExports, System.Collections.Generic.IEnumerable removedExports, System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition) { } public System.Collections.Generic.IEnumerable AddedExports { get { throw null; } } - public System.ComponentModel.Composition.Hosting.AtomicComposition AtomicComposition { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ComponentModel.Composition.Hosting.AtomicComposition AtomicComposition { get { throw null; } } public System.Collections.Generic.IEnumerable ChangedContractNames { get { throw null; } } public System.Collections.Generic.IEnumerable RemovedExports { get { throw null; } } } diff --git a/external/api-snapshot/profiles/monotouch/System.ComponentModel.DataAnnotations.cs b/external/api-snapshot/profiles/monotouch/System.ComponentModel.DataAnnotations.cs index 0d2d3dafb7..de2d407629 100644 --- a/external/api-snapshot/profiles/monotouch/System.ComponentModel.DataAnnotations.cs +++ b/external/api-snapshot/profiles/monotouch/System.ComponentModel.DataAnnotations.cs @@ -42,14 +42,14 @@ namespace System.ComponentModel.DataAnnotations public sealed partial class BindableTypeAttribute : System.Attribute { public BindableTypeAttribute() { } - public bool IsBindable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool IsBindable { get { throw null; } set { } } } [System.AttributeUsageAttribute((System.AttributeTargets)(128), AllowMultiple=false)] public partial class CompareAttribute : System.ComponentModel.DataAnnotations.ValidationAttribute { public CompareAttribute(string otherProperty) { } - public string OtherProperty { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string OtherPropertyDisplayName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string OtherProperty { get { throw null; } } + public string OtherPropertyDisplayName { get { throw null; } } public override bool RequiresValidationContext { get { throw null; } } public override string FormatErrorMessage(string name) { throw null; } protected override System.ComponentModel.DataAnnotations.ValidationResult IsValid(object value, System.ComponentModel.DataAnnotations.ValidationContext validationContext) { throw null; } @@ -100,9 +100,9 @@ namespace System.ComponentModel.DataAnnotations { public DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType dataType) { } public DataTypeAttribute(string customDataType) { } - public string CustomDataType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.ComponentModel.DataAnnotations.DataType DataType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.ComponentModel.DataAnnotations.DisplayFormatAttribute DisplayFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public string CustomDataType { get { throw null; } } + public System.ComponentModel.DataAnnotations.DataType DataType { get { throw null; } } + public System.ComponentModel.DataAnnotations.DisplayFormatAttribute DisplayFormat { get { throw null; } protected set { } } public virtual string GetDataTypeName() { throw null; } public override bool IsValid(object value) { throw null; } } @@ -134,26 +134,26 @@ namespace System.ComponentModel.DataAnnotations public DisplayColumnAttribute(string displayColumn) { } public DisplayColumnAttribute(string displayColumn, string sortColumn) { } public DisplayColumnAttribute(string displayColumn, string sortColumn, bool sortDescending) { } - public string DisplayColumn { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string SortColumn { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool SortDescending { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string DisplayColumn { get { throw null; } } + public string SortColumn { get { throw null; } } + public bool SortDescending { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(384), AllowMultiple=false)] public partial class DisplayFormatAttribute : System.Attribute { public DisplayFormatAttribute() { } - public bool ApplyFormatInEditMode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool ConvertEmptyStringToNull { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string DataFormatString { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool HtmlEncode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string NullDisplayText { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool ApplyFormatInEditMode { get { throw null; } set { } } + public bool ConvertEmptyStringToNull { get { throw null; } set { } } + public string DataFormatString { get { throw null; } set { } } + public bool HtmlEncode { get { throw null; } set { } } + public string NullDisplayText { get { throw null; } set { } } } [System.AttributeUsageAttribute((System.AttributeTargets)(384), AllowMultiple=false, Inherited=true)] public sealed partial class EditableAttribute : System.Attribute { public EditableAttribute(bool allowEdit) { } - public bool AllowEdit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool AllowInitialValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool AllowEdit { get { throw null; } } + public bool AllowInitialValue { get { throw null; } set { } } } [System.AttributeUsageAttribute((System.AttributeTargets)(2432), AllowMultiple=false)] public sealed partial class EmailAddressAttribute : System.ComponentModel.DataAnnotations.DataTypeAttribute @@ -165,7 +165,7 @@ namespace System.ComponentModel.DataAnnotations public sealed partial class EnumDataTypeAttribute : System.ComponentModel.DataAnnotations.DataTypeAttribute { public EnumDataTypeAttribute(System.Type enumType) : base (default(System.ComponentModel.DataAnnotations.DataType)) { } - public System.Type EnumType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Type EnumType { get { throw null; } } public override bool IsValid(object value) { throw null; } } [System.AttributeUsageAttribute((System.AttributeTargets)(2432), AllowMultiple=false)] @@ -203,7 +203,7 @@ namespace System.ComponentModel.DataAnnotations { public MaxLengthAttribute() { } public MaxLengthAttribute(int length) { } - public int Length { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int Length { get { throw null; } } public override string FormatErrorMessage(string name) { throw null; } public override bool IsValid(object value) { throw null; } } @@ -217,7 +217,7 @@ namespace System.ComponentModel.DataAnnotations public partial class MinLengthAttribute : System.ComponentModel.DataAnnotations.ValidationAttribute { public MinLengthAttribute(int length) { } - public int Length { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int Length { get { throw null; } } public override string FormatErrorMessage(string name) { throw null; } public override bool IsValid(object value) { throw null; } } @@ -233,9 +233,9 @@ namespace System.ComponentModel.DataAnnotations public RangeAttribute(double minimum, double maximum) { } public RangeAttribute(int minimum, int maximum) { } public RangeAttribute(System.Type type, string minimum, string maximum) { } - public object Maximum { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public object Minimum { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Type OperandType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public object Maximum { get { throw null; } } + public object Minimum { get { throw null; } } + public System.Type OperandType { get { throw null; } } public override string FormatErrorMessage(string name) { throw null; } public override bool IsValid(object value) { throw null; } } @@ -244,7 +244,7 @@ namespace System.ComponentModel.DataAnnotations { public RegularExpressionAttribute(string pattern) { } public int MatchTimeoutInMilliseconds { get { throw null; } set { } } - public string Pattern { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Pattern { get { throw null; } } public override string FormatErrorMessage(string name) { throw null; } public override bool IsValid(object value) { throw null; } } @@ -252,27 +252,27 @@ namespace System.ComponentModel.DataAnnotations public partial class RequiredAttribute : System.ComponentModel.DataAnnotations.ValidationAttribute { public RequiredAttribute() { } - public bool AllowEmptyStrings { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool AllowEmptyStrings { get { throw null; } set { } } public override bool IsValid(object value) { throw null; } } [System.AttributeUsageAttribute((System.AttributeTargets)(384), AllowMultiple=false)] public partial class ScaffoldColumnAttribute : System.Attribute { public ScaffoldColumnAttribute(bool scaffold) { } - public bool Scaffold { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool Scaffold { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), AllowMultiple=false)] public partial class ScaffoldTableAttribute : System.Attribute { public ScaffoldTableAttribute(bool scaffold) { } - public bool Scaffold { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool Scaffold { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(2432), AllowMultiple=false)] public partial class StringLengthAttribute : System.ComponentModel.DataAnnotations.ValidationAttribute { public StringLengthAttribute(int maximumLength) { } - public int MaximumLength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int MinimumLength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int MaximumLength { get { throw null; } } + public int MinimumLength { get { throw null; } set { } } public override string FormatErrorMessage(string name) { throw null; } public override bool IsValid(object value) { throw null; } } @@ -340,9 +340,9 @@ namespace System.ComponentModel.DataAnnotations public ValidationException(string message) { } public ValidationException(string errorMessage, System.ComponentModel.DataAnnotations.ValidationAttribute validatingAttribute, object value) { } public ValidationException(string message, System.Exception innerException) { } - public System.ComponentModel.DataAnnotations.ValidationAttribute ValidationAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ComponentModel.DataAnnotations.ValidationAttribute ValidationAttribute { get { throw null; } } public System.ComponentModel.DataAnnotations.ValidationResult ValidationResult { get { throw null; } } - public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public object Value { get { throw null; } } } public partial class ValidationResult { @@ -386,7 +386,7 @@ namespace System.ComponentModel.DataAnnotations.Schema public partial class DatabaseGeneratedAttribute : System.Attribute { public DatabaseGeneratedAttribute(System.ComponentModel.DataAnnotations.Schema.DatabaseGeneratedOption databaseGeneratedOption) { } - public System.ComponentModel.DataAnnotations.Schema.DatabaseGeneratedOption DatabaseGeneratedOption { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ComponentModel.DataAnnotations.Schema.DatabaseGeneratedOption DatabaseGeneratedOption { get { throw null; } } } public enum DatabaseGeneratedOption { diff --git a/external/api-snapshot/profiles/monotouch/System.Core.cs.REMOVED.git-id b/external/api-snapshot/profiles/monotouch/System.Core.cs.REMOVED.git-id index c134c940e1..3043039609 100644 --- a/external/api-snapshot/profiles/monotouch/System.Core.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monotouch/System.Core.cs.REMOVED.git-id @@ -1 +1 @@ -6f17a1037233b0ccc170bec511e7bf1dee5f7faf \ No newline at end of file +bb9c7fdf6eb89a2c779160dc32d18fefd86adae4 \ No newline at end of file diff --git a/external/api-snapshot/profiles/monotouch/System.Data.cs.REMOVED.git-id b/external/api-snapshot/profiles/monotouch/System.Data.cs.REMOVED.git-id index dffd8fb6ca..b2f4394a95 100644 --- a/external/api-snapshot/profiles/monotouch/System.Data.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monotouch/System.Data.cs.REMOVED.git-id @@ -1 +1 @@ -274af052eceb5c59cf4900049c94a24b6978bf0e \ No newline at end of file +e7966ea302c46f6d09a52da2209dd99e2df1d8ca \ No newline at end of file diff --git a/external/api-snapshot/profiles/monotouch/System.Json.cs b/external/api-snapshot/profiles/monotouch/System.Json.cs index d9146446d2..56a5e3b454 100644 --- a/external/api-snapshot/profiles/monotouch/System.Json.cs +++ b/external/api-snapshot/profiles/monotouch/System.Json.cs @@ -80,12 +80,16 @@ namespace System.Json public JsonPrimitive(short value) { } public JsonPrimitive(int value) { } public JsonPrimitive(long value) { } + [System.CLSCompliantAttribute(false)] public JsonPrimitive(sbyte value) { } public JsonPrimitive(float value) { } public JsonPrimitive(string value) { } public JsonPrimitive(System.TimeSpan value) { } + [System.CLSCompliantAttribute(false)] public JsonPrimitive(ushort value) { } + [System.CLSCompliantAttribute(false)] public JsonPrimitive(uint value) { } + [System.CLSCompliantAttribute(false)] public JsonPrimitive(ulong value) { } public JsonPrimitive(System.Uri value) { } public override System.Json.JsonType JsonType { get { throw null; } } @@ -131,20 +135,28 @@ namespace System.Json public static implicit operator short (System.Json.JsonValue value) { throw null; } public static implicit operator int (System.Json.JsonValue value) { throw null; } public static implicit operator long (System.Json.JsonValue value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator sbyte (System.Json.JsonValue value) { throw null; } public static implicit operator float (System.Json.JsonValue value) { throw null; } public static implicit operator string (System.Json.JsonValue value) { throw null; } public static implicit operator System.TimeSpan (System.Json.JsonValue value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator ushort (System.Json.JsonValue value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator uint (System.Json.JsonValue value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator ulong (System.Json.JsonValue value) { throw null; } public static implicit operator System.Uri (System.Json.JsonValue value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator System.Json.JsonValue (sbyte value) { throw null; } public static implicit operator System.Json.JsonValue (float value) { throw null; } public static implicit operator System.Json.JsonValue (string value) { throw null; } public static implicit operator System.Json.JsonValue (System.TimeSpan value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator System.Json.JsonValue (ushort value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator System.Json.JsonValue (uint value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator System.Json.JsonValue (ulong value) { throw null; } public static implicit operator System.Json.JsonValue (System.Uri value) { throw null; } public static System.Json.JsonValue Parse(string jsonString) { throw null; } diff --git a/external/api-snapshot/profiles/monotouch/System.Net.Http.cs b/external/api-snapshot/profiles/monotouch/System.Net.Http.cs index c29201fb67..4722f0b62b 100644 --- a/external/api-snapshot/profiles/monotouch/System.Net.Http.cs +++ b/external/api-snapshot/profiles/monotouch/System.Net.Http.cs @@ -184,7 +184,7 @@ namespace System.Net.Http public HttpRequestMessage() { } public HttpRequestMessage(System.Net.Http.HttpMethod method, string requestUri) { } public HttpRequestMessage(System.Net.Http.HttpMethod method, System.Uri requestUri) { } - public System.Net.Http.HttpContent Content { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Net.Http.HttpContent Content { get { throw null; } set { } } public System.Net.Http.Headers.HttpRequestHeaders Headers { get { throw null; } } public System.Net.Http.HttpMethod Method { get { throw null; } set { } } public System.Collections.Generic.IDictionary Properties { get { throw null; } } @@ -198,11 +198,11 @@ namespace System.Net.Http { public HttpResponseMessage() { } public HttpResponseMessage(System.Net.HttpStatusCode statusCode) { } - public System.Net.Http.HttpContent Content { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Net.Http.HttpContent Content { get { throw null; } set { } } public System.Net.Http.Headers.HttpResponseHeaders Headers { get { throw null; } } public bool IsSuccessStatusCode { get { throw null; } } public string ReasonPhrase { get { throw null; } set { } } - public System.Net.Http.HttpRequestMessage RequestMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Net.Http.HttpRequestMessage RequestMessage { get { throw null; } set { } } public System.Net.HttpStatusCode StatusCode { get { throw null; } set { } } public System.Version Version { get { throw null; } set { } } public void Dispose() { } @@ -260,8 +260,8 @@ namespace System.Net.Http.Headers { public AuthenticationHeaderValue(string scheme) { } public AuthenticationHeaderValue(string scheme, string parameter) { } - public string Parameter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Scheme { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Parameter { get { throw null; } } + public string Scheme { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.AuthenticationHeaderValue Parse(string input) { throw null; } @@ -273,21 +273,21 @@ namespace System.Net.Http.Headers { public CacheControlHeaderValue() { } public System.Collections.Generic.ICollection Extensions { get { throw null; } } - public System.Nullable MaxAge { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool MaxStale { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable MaxStaleLimit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable MinFresh { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool MustRevalidate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool NoCache { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Nullable MaxAge { get { throw null; } set { } } + public bool MaxStale { get { throw null; } set { } } + public System.Nullable MaxStaleLimit { get { throw null; } set { } } + public System.Nullable MinFresh { get { throw null; } set { } } + public bool MustRevalidate { get { throw null; } set { } } + public bool NoCache { get { throw null; } set { } } public System.Collections.Generic.ICollection NoCacheHeaders { get { throw null; } } - public bool NoStore { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool NoTransform { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool OnlyIfCached { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool Private { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool NoStore { get { throw null; } set { } } + public bool NoTransform { get { throw null; } set { } } + public bool OnlyIfCached { get { throw null; } set { } } + public bool Private { get { throw null; } set { } } public System.Collections.Generic.ICollection PrivateHeaders { get { throw null; } } - public bool ProxyRevalidate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool Public { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable SharedMaxAge { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool ProxyRevalidate { get { throw null; } set { } } + public bool Public { get { throw null; } set { } } + public System.Nullable SharedMaxAge { get { throw null; } set { } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.CacheControlHeaderValue Parse(string input) { throw null; } @@ -320,11 +320,11 @@ namespace System.Net.Http.Headers public ContentRangeHeaderValue(long length) { } public ContentRangeHeaderValue(long from, long to) { } public ContentRangeHeaderValue(long from, long to, long length) { } - public System.Nullable From { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Nullable From { get { throw null; } } public bool HasLength { get { throw null; } } public bool HasRange { get { throw null; } } - public System.Nullable Length { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Nullable To { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Nullable Length { get { throw null; } } + public System.Nullable To { get { throw null; } } public string Unit { get { throw null; } set { } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } @@ -338,8 +338,8 @@ namespace System.Net.Http.Headers public EntityTagHeaderValue(string tag) { } public EntityTagHeaderValue(string tag, bool isWeak) { } public static System.Net.Http.Headers.EntityTagHeaderValue Any { get { throw null; } } - public bool IsWeak { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Tag { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsWeak { get { throw null; } } + public string Tag { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.EntityTagHeaderValue Parse(string input) { throw null; } @@ -480,7 +480,7 @@ namespace System.Net.Http.Headers protected internal NameValueHeaderValue(System.Net.Http.Headers.NameValueHeaderValue source) { } public NameValueHeaderValue(string name) { } public NameValueHeaderValue(string name, string value) { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } public string Value { get { throw null; } set { } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } @@ -506,8 +506,8 @@ namespace System.Net.Http.Headers { public ProductHeaderValue(string name) { } public ProductHeaderValue(string name, string version) { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Version { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } + public string Version { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.ProductHeaderValue Parse(string input) { throw null; } @@ -520,8 +520,8 @@ namespace System.Net.Http.Headers public ProductInfoHeaderValue(System.Net.Http.Headers.ProductHeaderValue product) { } public ProductInfoHeaderValue(string comment) { } public ProductInfoHeaderValue(string productName, string productVersion) { } - public string Comment { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Net.Http.Headers.ProductHeaderValue Product { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Comment { get { throw null; } } + public System.Net.Http.Headers.ProductHeaderValue Product { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.ProductInfoHeaderValue Parse(string input) { throw null; } @@ -534,8 +534,8 @@ namespace System.Net.Http.Headers public RangeConditionHeaderValue(System.DateTimeOffset date) { } public RangeConditionHeaderValue(System.Net.Http.Headers.EntityTagHeaderValue entityTag) { } public RangeConditionHeaderValue(string entityTag) { } - public System.Nullable Date { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Net.Http.Headers.EntityTagHeaderValue EntityTag { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Nullable Date { get { throw null; } } + public System.Net.Http.Headers.EntityTagHeaderValue EntityTag { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.RangeConditionHeaderValue Parse(string input) { throw null; } @@ -559,8 +559,8 @@ namespace System.Net.Http.Headers public partial class RangeItemHeaderValue : System.ICloneable { public RangeItemHeaderValue(System.Nullable from, System.Nullable to) { } - public System.Nullable From { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Nullable To { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Nullable From { get { throw null; } } + public System.Nullable To { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } object System.ICloneable.Clone() { throw null; } @@ -570,8 +570,8 @@ namespace System.Net.Http.Headers { public RetryConditionHeaderValue(System.DateTimeOffset date) { } public RetryConditionHeaderValue(System.TimeSpan delta) { } - public System.Nullable Date { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Nullable Delta { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Nullable Date { get { throw null; } } + public System.Nullable Delta { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.RetryConditionHeaderValue Parse(string input) { throw null; } @@ -583,8 +583,8 @@ namespace System.Net.Http.Headers { public StringWithQualityHeaderValue(string value) { } public StringWithQualityHeaderValue(string value, double quality) { } - public System.Nullable Quality { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Nullable Quality { get { throw null; } } + public string Value { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.StringWithQualityHeaderValue Parse(string input) { throw null; } @@ -618,10 +618,10 @@ namespace System.Net.Http.Headers public ViaHeaderValue(string protocolVersion, string receivedBy) { } public ViaHeaderValue(string protocolVersion, string receivedBy, string protocolName) { } public ViaHeaderValue(string protocolVersion, string receivedBy, string protocolName, string comment) { } - public string Comment { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ProtocolName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ProtocolVersion { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ReceivedBy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Comment { get { throw null; } } + public string ProtocolName { get { throw null; } } + public string ProtocolVersion { get { throw null; } } + public string ReceivedBy { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.ViaHeaderValue Parse(string input) { throw null; } @@ -633,10 +633,10 @@ namespace System.Net.Http.Headers { public WarningHeaderValue(int code, string agent, string text) { } public WarningHeaderValue(int code, string agent, string text, System.DateTimeOffset date) { } - public string Agent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int Code { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Nullable Date { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Text { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Agent { get { throw null; } } + public int Code { get { throw null; } } + public System.Nullable Date { get { throw null; } } + public string Text { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.WarningHeaderValue Parse(string input) { throw null; } diff --git a/external/api-snapshot/profiles/monotouch/System.Numerics.Vectors.cs b/external/api-snapshot/profiles/monotouch/System.Numerics.Vectors.cs index 506356b682..de8c478aaf 100644 --- a/external/api-snapshot/profiles/monotouch/System.Numerics.Vectors.cs +++ b/external/api-snapshot/profiles/monotouch/System.Numerics.Vectors.cs @@ -24,162 +24,8 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Matrix4x4))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Plane))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Quaternion))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Vector))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Vector2))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Vector3))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Vector4))] -namespace System.Numerics -{ - public static partial class Vector - { - public static bool IsHardwareAccelerated { get { throw null; } } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Abs(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Add(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector AndNot(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector AsVectorByte(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector AsVectorDouble(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector AsVectorInt16(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector AsVectorInt32(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector AsVectorInt64(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector AsVectorSByte(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector AsVectorSingle(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector AsVectorUInt16(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector AsVectorUInt32(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector AsVectorUInt64(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector BitwiseAnd(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector BitwiseOr(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector ConditionalSelect(System.Numerics.Vector condition, System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector ConditionalSelect(System.Numerics.Vector condition, System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector ConditionalSelect(System.Numerics.Vector condition, System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - public static System.Numerics.Vector ConvertToDouble(System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector ConvertToDouble(System.Numerics.Vector value) { throw null; } - public static System.Numerics.Vector ConvertToInt32(System.Numerics.Vector value) { throw null; } - public static System.Numerics.Vector ConvertToInt64(System.Numerics.Vector value) { throw null; } - public static System.Numerics.Vector ConvertToSingle(System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector ConvertToSingle(System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector ConvertToUInt32(System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector ConvertToUInt64(System.Numerics.Vector value) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Divide(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static T Dot(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Equals(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Equals(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Equals(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Equals(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool EqualsAll(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool EqualsAny(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Equals(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool GreaterThanAll(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool GreaterThanAny(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool GreaterThanOrEqualAll(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool GreaterThanOrEqualAny(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThan(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool LessThanAll(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool LessThanAny(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool LessThanOrEqualAll(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool LessThanOrEqualAny(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThan(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Max(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Min(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Multiply(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Multiply(System.Numerics.Vector left, T right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Multiply(T left, System.Numerics.Vector right) where T : struct { throw null; } - public static System.Numerics.Vector Narrow(System.Numerics.Vector low, System.Numerics.Vector high) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector Narrow(System.Numerics.Vector low, System.Numerics.Vector high) { throw null; } - public static System.Numerics.Vector Narrow(System.Numerics.Vector low, System.Numerics.Vector high) { throw null; } - public static System.Numerics.Vector Narrow(System.Numerics.Vector low, System.Numerics.Vector high) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector Narrow(System.Numerics.Vector low, System.Numerics.Vector high) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector Narrow(System.Numerics.Vector low, System.Numerics.Vector high) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector Narrow(System.Numerics.Vector low, System.Numerics.Vector high) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Negate(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector OnesComplement(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector SquareRoot(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Subtract(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.CLSCompliantAttribute(false)] - public static void Widen(System.Numerics.Vector source, out System.Numerics.Vector low, out System.Numerics.Vector high) { low = default(System.Numerics.Vector); high = default(System.Numerics.Vector); } - public static void Widen(System.Numerics.Vector source, out System.Numerics.Vector low, out System.Numerics.Vector high) { low = default(System.Numerics.Vector); high = default(System.Numerics.Vector); } - public static void Widen(System.Numerics.Vector source, out System.Numerics.Vector low, out System.Numerics.Vector high) { low = default(System.Numerics.Vector); high = default(System.Numerics.Vector); } - [System.CLSCompliantAttribute(false)] - public static void Widen(System.Numerics.Vector source, out System.Numerics.Vector low, out System.Numerics.Vector high) { low = default(System.Numerics.Vector); high = default(System.Numerics.Vector); } - public static void Widen(System.Numerics.Vector source, out System.Numerics.Vector low, out System.Numerics.Vector high) { low = default(System.Numerics.Vector); high = default(System.Numerics.Vector); } - [System.CLSCompliantAttribute(false)] - public static void Widen(System.Numerics.Vector source, out System.Numerics.Vector low, out System.Numerics.Vector high) { low = default(System.Numerics.Vector); high = default(System.Numerics.Vector); } - [System.CLSCompliantAttribute(false)] - public static void Widen(System.Numerics.Vector source, out System.Numerics.Vector low, out System.Numerics.Vector high) { low = default(System.Numerics.Vector); high = default(System.Numerics.Vector); } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Xor(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public partial struct Vector : System.IEquatable>, System.IFormattable where T : struct - { - public Vector(T value) { throw null;} - public Vector(T[] values) { throw null;} - public Vector(T[] values, int index) { throw null;} - public static int Count { get { throw null; } } - public T this[int index] { get { throw null; } } - public static System.Numerics.Vector One { get { throw null; } } - public static System.Numerics.Vector Zero { get { throw null; } } - public void CopyTo(T[] destination) { } - public void CopyTo(T[] destination, int startIndex) { } - public bool Equals(System.Numerics.Vector other) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public override bool Equals(object obj) { throw null; } - public override int GetHashCode() { throw null; } - public static System.Numerics.Vector operator +(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static System.Numerics.Vector operator &(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static System.Numerics.Vector operator |(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static System.Numerics.Vector operator /(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool operator ==(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static System.Numerics.Vector operator ^(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool operator !=(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static System.Numerics.Vector operator *(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static System.Numerics.Vector operator *(System.Numerics.Vector value, T factor) { throw null; } - public static System.Numerics.Vector operator *(T factor, System.Numerics.Vector value) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector operator ~(System.Numerics.Vector value) { throw null; } - public static System.Numerics.Vector operator -(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static System.Numerics.Vector operator -(System.Numerics.Vector value) { throw null; } - public override string ToString() { throw null; } - public string ToString(string format) { throw null; } - public string ToString(string format, System.IFormatProvider formatProvider) { throw null; } - } -} +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Vector<>))] diff --git a/external/api-snapshot/profiles/monotouch/System.Runtime.CompilerServices.Unsafe.cs b/external/api-snapshot/profiles/monotouch/System.Runtime.CompilerServices.Unsafe.cs index 70b70ea055..5e8d07e76d 100644 --- a/external/api-snapshot/profiles/monotouch/System.Runtime.CompilerServices.Unsafe.cs +++ b/external/api-snapshot/profiles/monotouch/System.Runtime.CompilerServices.Unsafe.cs @@ -30,6 +30,8 @@ namespace System.Runtime.CompilerServices [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public unsafe static void InitBlock(void* startAddress, byte value, uint byteCount) { } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static void InitBlockUnaligned(ref byte startAddress, byte value, uint byteCount) { } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public unsafe static void InitBlockUnaligned(void* startAddress, byte value, uint byteCount) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool IsAddressGreaterThan(ref T left, ref T right) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool IsAddressLessThan(ref T left, ref T right) { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static T ReadUnaligned(ref byte source) { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public unsafe static T ReadUnaligned(void* source) { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public unsafe static T Read(void* source) { throw null; } diff --git a/external/api-snapshot/profiles/monotouch/System.Runtime.Serialization.cs b/external/api-snapshot/profiles/monotouch/System.Runtime.Serialization.cs index 994c1d3524..6b17febfec 100644 --- a/external/api-snapshot/profiles/monotouch/System.Runtime.Serialization.cs +++ b/external/api-snapshot/profiles/monotouch/System.Runtime.Serialization.cs @@ -107,15 +107,15 @@ namespace System.Runtime.Serialization public partial class DataContractSerializerSettings { public DataContractSerializerSettings() { } - public System.Runtime.Serialization.DataContractResolver DataContractResolver { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Runtime.Serialization.IDataContractSurrogate DataContractSurrogate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IgnoreExtensionDataObject { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IEnumerable KnownTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Runtime.Serialization.DataContractResolver DataContractResolver { get { throw null; } set { } } + public System.Runtime.Serialization.IDataContractSurrogate DataContractSurrogate { get { throw null; } set { } } + public bool IgnoreExtensionDataObject { get { throw null; } set { } } + public System.Collections.Generic.IEnumerable KnownTypes { get { throw null; } set { } } public int MaxItemsInObjectGraph { get { throw null; } set { } } - public bool PreserveObjectReferences { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Xml.XmlDictionaryString RootName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Xml.XmlDictionaryString RootNamespace { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SerializeReadOnlyTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool PreserveObjectReferences { get { throw null; } set { } } + public System.Xml.XmlDictionaryString RootName { get { throw null; } set { } } + public System.Xml.XmlDictionaryString RootNamespace { get { throw null; } set { } } + public bool SerializeReadOnlyTypes { get { throw null; } set { } } } [System.AttributeUsageAttribute((System.AttributeTargets)(384), Inherited=false, AllowMultiple=false)] public sealed partial class DataMemberAttribute : System.Attribute @@ -320,15 +320,15 @@ namespace System.Runtime.Serialization.Json public partial class DataContractJsonSerializerSettings { public DataContractJsonSerializerSettings() { } - public System.Runtime.Serialization.IDataContractSurrogate DataContractSurrogate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Runtime.Serialization.DateTimeFormat DateTimeFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Runtime.Serialization.EmitTypeInformation EmitTypeInformation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IgnoreExtensionDataObject { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IEnumerable KnownTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Runtime.Serialization.IDataContractSurrogate DataContractSurrogate { get { throw null; } set { } } + public System.Runtime.Serialization.DateTimeFormat DateTimeFormat { get { throw null; } set { } } + public System.Runtime.Serialization.EmitTypeInformation EmitTypeInformation { get { throw null; } set { } } + public bool IgnoreExtensionDataObject { get { throw null; } set { } } + public System.Collections.Generic.IEnumerable KnownTypes { get { throw null; } set { } } public int MaxItemsInObjectGraph { get { throw null; } set { } } - public string RootName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SerializeReadOnlyTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool UseSimpleDictionaryFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string RootName { get { throw null; } set { } } + public bool SerializeReadOnlyTypes { get { throw null; } set { } } + public bool UseSimpleDictionaryFormat { get { throw null; } set { } } } [System.Runtime.CompilerServices.TypeForwardedFromAttribute("System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")] public partial interface IXmlJsonReaderInitializer diff --git a/external/api-snapshot/profiles/monotouch/System.ServiceModel.Web.cs b/external/api-snapshot/profiles/monotouch/System.ServiceModel.Web.cs index ecb76b7790..05cb7be0cc 100644 --- a/external/api-snapshot/profiles/monotouch/System.ServiceModel.Web.cs +++ b/external/api-snapshot/profiles/monotouch/System.ServiceModel.Web.cs @@ -62,8 +62,8 @@ namespace System public UriTemplate(string template, bool ignoreTrailingSlash) { } public UriTemplate(string template, bool ignoreTrailingSlash, System.Collections.Generic.IDictionary additionalDefaults) { } public UriTemplate(string template, System.Collections.Generic.IDictionary additionalDefaults) { } - public System.Collections.Generic.IDictionary Defaults { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool IgnoreTrailingSlash { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IDictionary Defaults { get { throw null; } } + public bool IgnoreTrailingSlash { get { throw null; } } public System.Collections.ObjectModel.ReadOnlyCollection PathSegmentVariableNames { get { throw null; } } public System.Collections.ObjectModel.ReadOnlyCollection QueryValueVariableNames { get { throw null; } } public System.Uri BindByName(System.Uri baseAddress, System.Collections.Generic.IDictionary parameters) { throw null; } @@ -145,7 +145,7 @@ namespace System.ServiceModel { public WebHttpSecurity() { } public System.ServiceModel.WebHttpSecurityMode Mode { get { throw null; } set { } } - public System.ServiceModel.HttpTransportSecurity Transport { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.ServiceModel.HttpTransportSecurity Transport { get { throw null; } set { } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(2))] public bool ShouldSerializeMode() { throw null; } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(2))] @@ -190,7 +190,7 @@ namespace System.ServiceModel.Channels [System.MonoTODOAttribute] public int MaxWritePoolSize { get { throw null; } set { } } public override System.ServiceModel.Channels.MessageVersion MessageVersion { get { throw null; } set { } } - public System.Xml.XmlDictionaryReaderQuotas ReaderQuotas { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Xml.XmlDictionaryReaderQuotas ReaderQuotas { get { throw null; } } public System.Text.Encoding WriteEncoding { get { throw null; } set { } } public override System.ServiceModel.Channels.IChannelFactory BuildChannelFactory(System.ServiceModel.Channels.BindingContext context) { throw null; } public override System.ServiceModel.Channels.BindingElement Clone() { throw null; } @@ -203,12 +203,12 @@ namespace System.ServiceModel.Description public partial class WebHttpBehavior : System.ServiceModel.Description.IEndpointBehavior { public WebHttpBehavior() { } - public virtual bool AutomaticFormatSelectionEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.ServiceModel.Web.WebMessageBodyStyle DefaultBodyStyle { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.ServiceModel.Web.WebMessageFormat DefaultOutgoingRequestFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.ServiceModel.Web.WebMessageFormat DefaultOutgoingResponseFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual bool FaultExceptionEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual bool HelpEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual bool AutomaticFormatSelectionEnabled { get { throw null; } set { } } + public virtual System.ServiceModel.Web.WebMessageBodyStyle DefaultBodyStyle { get { throw null; } set { } } + public virtual System.ServiceModel.Web.WebMessageFormat DefaultOutgoingRequestFormat { get { throw null; } set { } } + public virtual System.ServiceModel.Web.WebMessageFormat DefaultOutgoingResponseFormat { get { throw null; } set { } } + public virtual bool FaultExceptionEnabled { get { throw null; } set { } } + public virtual bool HelpEnabled { get { throw null; } set { } } public virtual void AddBindingParameters(System.ServiceModel.Description.ServiceEndpoint endpoint, System.ServiceModel.Channels.BindingParameterCollection bindingParameters) { } [System.MonoTODOAttribute] protected virtual void AddClientErrorInspector(System.ServiceModel.Description.ServiceEndpoint endpoint, System.ServiceModel.Dispatcher.ClientRuntime clientRuntime) { } @@ -256,17 +256,17 @@ namespace System.ServiceModel.Web public partial class OutgoingWebRequestContext { internal OutgoingWebRequestContext() { } - public string Accept { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public long ContentLength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ContentType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Net.WebHeaderCollection Headers { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string IfMatch { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string IfModifiedSince { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string IfNoneMatch { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string IfUnmodifiedSince { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Method { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SuppressEntityBody { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string UserAgent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Accept { get { throw null; } set { } } + public long ContentLength { get { throw null; } set { } } + public string ContentType { get { throw null; } set { } } + public System.Net.WebHeaderCollection Headers { get { throw null; } } + public string IfMatch { get { throw null; } set { } } + public string IfModifiedSince { get { throw null; } set { } } + public string IfNoneMatch { get { throw null; } set { } } + public string IfUnmodifiedSince { get { throw null; } set { } } + public string Method { get { throw null; } set { } } + public bool SuppressEntityBody { get { throw null; } set { } } + public string UserAgent { get { throw null; } set { } } } public partial class WebChannelFactory : System.ServiceModel.ChannelFactory { diff --git a/external/api-snapshot/profiles/monotouch/System.ServiceModel.cs.REMOVED.git-id b/external/api-snapshot/profiles/monotouch/System.ServiceModel.cs.REMOVED.git-id index e9bac08d3a..aa6763d456 100644 --- a/external/api-snapshot/profiles/monotouch/System.ServiceModel.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monotouch/System.ServiceModel.cs.REMOVED.git-id @@ -1 +1 @@ -4639747a38fb98da0aa66e6cdb71601b53660790 \ No newline at end of file +7f4bd88d08376ff5e225bb16fc63563555843a56 \ No newline at end of file diff --git a/external/api-snapshot/profiles/monotouch/System.Xml.Linq.cs b/external/api-snapshot/profiles/monotouch/System.Xml.Linq.cs index 868f4c41af..ca51e398f3 100644 --- a/external/api-snapshot/profiles/monotouch/System.Xml.Linq.cs +++ b/external/api-snapshot/profiles/monotouch/System.Xml.Linq.cs @@ -18,6 +18,7 @@ [assembly:System.Runtime.CompilerServices.CompilationRelaxationsAttribute((System.Runtime.CompilerServices.CompilationRelaxations)(8))] [assembly:System.Runtime.CompilerServices.RuntimeCompatibilityAttribute(WrapNonExceptionThrows=true)] [assembly:System.Runtime.InteropServices.ComVisibleAttribute(false)] +[assembly:System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.RequestMinimum, SkipVerification=true)] namespace System.Xml.Linq { public static partial class Extensions @@ -62,7 +63,6 @@ namespace System.Xml.Linq None = 0, OmitDuplicateNamespaces = 2, } - [System.ComponentModel.TypeDescriptionProviderAttribute("MS.Internal.Xml.Linq.ComponentModel.XTypeDescriptionProvider")] public partial class XAttribute : System.Xml.Linq.XObject { public XAttribute(System.Xml.Linq.XAttribute other) { } @@ -134,6 +134,7 @@ namespace System.Xml.Linq public XCData(System.Xml.Linq.XCData other) : base (default(string)) { } public override System.Xml.XmlNodeType NodeType { get { throw null; } } public override void WriteTo(System.Xml.XmlWriter writer) { } + public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } public partial class XComment : System.Xml.Linq.XNode { @@ -142,6 +143,7 @@ namespace System.Xml.Linq public override System.Xml.XmlNodeType NodeType { get { throw null; } } public string Value { get { throw null; } set { } } public override void WriteTo(System.Xml.XmlWriter writer) { } + public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } public abstract partial class XContainer : System.Xml.Linq.XNode { @@ -191,6 +193,9 @@ namespace System.Xml.Linq public static System.Xml.Linq.XDocument Load(string uri, System.Xml.Linq.LoadOptions options) { throw null; } public static System.Xml.Linq.XDocument Load(System.Xml.XmlReader reader) { throw null; } public static System.Xml.Linq.XDocument Load(System.Xml.XmlReader reader, System.Xml.Linq.LoadOptions options) { throw null; } + public static System.Threading.Tasks.Task LoadAsync(System.IO.Stream stream, System.Xml.Linq.LoadOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public static System.Threading.Tasks.Task LoadAsync(System.IO.TextReader textReader, System.Xml.Linq.LoadOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public static System.Threading.Tasks.Task LoadAsync(System.Xml.XmlReader reader, System.Xml.Linq.LoadOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } public static System.Xml.Linq.XDocument Parse(string text) { throw null; } public static System.Xml.Linq.XDocument Parse(string text, System.Xml.Linq.LoadOptions options) { throw null; } public void Save(System.IO.Stream stream) { } @@ -200,7 +205,11 @@ namespace System.Xml.Linq public void Save(string fileName) { } public void Save(string fileName, System.Xml.Linq.SaveOptions options) { } public void Save(System.Xml.XmlWriter writer) { } + public System.Threading.Tasks.Task SaveAsync(System.IO.Stream stream, System.Xml.Linq.SaveOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.Task SaveAsync(System.IO.TextWriter textWriter, System.Xml.Linq.SaveOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.Task SaveAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } public override void WriteTo(System.Xml.XmlWriter writer) { } + public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } public partial class XDocumentType : System.Xml.Linq.XNode { @@ -212,8 +221,8 @@ namespace System.Xml.Linq public string PublicId { get { throw null; } set { } } public string SystemId { get { throw null; } set { } } public override void WriteTo(System.Xml.XmlWriter writer) { } + public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } - [System.ComponentModel.TypeDescriptionProviderAttribute("MS.Internal.Xml.Linq.ComponentModel.XTypeDescriptionProvider")] [System.Xml.Serialization.XmlSchemaProviderAttribute(null, IsAny=true)] public partial class XElement : System.Xml.Linq.XContainer, System.Xml.Serialization.IXmlSerializable { @@ -250,6 +259,9 @@ namespace System.Xml.Linq public static System.Xml.Linq.XElement Load(string uri, System.Xml.Linq.LoadOptions options) { throw null; } public static System.Xml.Linq.XElement Load(System.Xml.XmlReader reader) { throw null; } public static System.Xml.Linq.XElement Load(System.Xml.XmlReader reader, System.Xml.Linq.LoadOptions options) { throw null; } + public static System.Threading.Tasks.Task LoadAsync(System.IO.Stream stream, System.Xml.Linq.LoadOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public static System.Threading.Tasks.Task LoadAsync(System.IO.TextReader textReader, System.Xml.Linq.LoadOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public static System.Threading.Tasks.Task LoadAsync(System.Xml.XmlReader reader, System.Xml.Linq.LoadOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } [System.CLSCompliantAttribute(false)] public static explicit operator bool (System.Xml.Linq.XElement element) { throw null; } [System.CLSCompliantAttribute(false)] @@ -315,6 +327,9 @@ namespace System.Xml.Linq public void Save(string fileName) { } public void Save(string fileName, System.Xml.Linq.SaveOptions options) { } public void Save(System.Xml.XmlWriter writer) { } + public System.Threading.Tasks.Task SaveAsync(System.IO.Stream stream, System.Xml.Linq.SaveOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.Task SaveAsync(System.IO.TextWriter textWriter, System.Xml.Linq.SaveOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.Task SaveAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } public void SetAttributeValue(System.Xml.Linq.XName name, object value) { } public void SetElementValue(System.Xml.Linq.XName name, object value) { } public void SetValue(object value) { } @@ -322,6 +337,7 @@ namespace System.Xml.Linq void System.Xml.Serialization.IXmlSerializable.ReadXml(System.Xml.XmlReader reader) { } void System.Xml.Serialization.IXmlSerializable.WriteXml(System.Xml.XmlWriter writer) { } public override void WriteTo(System.Xml.XmlWriter writer) { } + public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } [System.SerializableAttribute] public sealed partial class XName : System.IEquatable, System.Runtime.Serialization.ISerializable @@ -339,7 +355,6 @@ namespace System.Xml.Linq public static implicit operator System.Xml.Linq.XName (string expandedName) { throw null; } public static bool operator !=(System.Xml.Linq.XName left, System.Xml.Linq.XName right) { throw null; } bool System.IEquatable.Equals(System.Xml.Linq.XName other) { throw null; } - [System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.LinkDemand, Flags=(System.Security.Permissions.SecurityPermissionFlag)(128))] void System.Runtime.Serialization.ISerializable.GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } public override string ToString() { throw null; } } @@ -387,12 +402,14 @@ namespace System.Xml.Linq public System.Collections.Generic.IEnumerable NodesAfterSelf() { throw null; } public System.Collections.Generic.IEnumerable NodesBeforeSelf() { throw null; } public static System.Xml.Linq.XNode ReadFrom(System.Xml.XmlReader reader) { throw null; } + public static System.Threading.Tasks.Task ReadFromAsync(System.Xml.XmlReader reader, System.Threading.CancellationToken cancellationToken) { throw null; } public void Remove() { } public void ReplaceWith(object content) { } public void ReplaceWith(params object[] content) { } public override string ToString() { throw null; } public string ToString(System.Xml.Linq.SaveOptions options) { throw null; } public abstract void WriteTo(System.Xml.XmlWriter writer); + public abstract System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken); } public sealed partial class XNodeDocumentOrderComparer : System.Collections.Generic.IComparer, System.Collections.IComparer { @@ -452,6 +469,7 @@ namespace System.Xml.Linq public override System.Xml.XmlNodeType NodeType { get { throw null; } } public string Target { get { throw null; } set { } } public override void WriteTo(System.Xml.XmlWriter writer) { } + public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } public partial class XStreamingElement { @@ -479,6 +497,7 @@ namespace System.Xml.Linq public override System.Xml.XmlNodeType NodeType { get { throw null; } } public string Value { get { throw null; } set { } } public override void WriteTo(System.Xml.XmlWriter writer) { } + public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } } namespace System.Xml.Schema diff --git a/external/api-snapshot/profiles/monotouch/System.cs.REMOVED.git-id b/external/api-snapshot/profiles/monotouch/System.cs.REMOVED.git-id index 9c5e7f9feb..05bba2c7af 100644 --- a/external/api-snapshot/profiles/monotouch/System.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monotouch/System.cs.REMOVED.git-id @@ -1 +1 @@ -50cb212eb3f264ae44f1b9f3cf5ba18bef8efb99 \ No newline at end of file +6d22abfe2dc75d6f7256dacb8678da98e4396465 \ No newline at end of file diff --git a/external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id b/external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id index bda40e779a..327657ffcb 100644 --- a/external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id @@ -1 +1 @@ -4c8868b66fe131f296aea7f8a4a8b8ae85d864fd \ No newline at end of file +24297e223be1a2ddc160f0b3bdaf01a0b73f3739 \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/Facades/System.Runtime.Extensions.cs b/external/api-snapshot/profiles/net_4_x/Facades/System.Runtime.Extensions.cs index 9e447cba50..d3a1a07fc2 100644 --- a/external/api-snapshot/profiles/net_4_x/Facades/System.Runtime.Extensions.cs +++ b/external/api-snapshot/profiles/net_4_x/Facades/System.Runtime.Extensions.cs @@ -14,16 +14,67 @@ [assembly:System.Reflection.AssemblyTitleAttribute("System.Runtime.Extensions")] [assembly:System.Runtime.CompilerServices.CompilationRelaxationsAttribute(8)] [assembly:System.Runtime.CompilerServices.RuntimeCompatibilityAttribute(WrapNonExceptionThrows=true)] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.AppDomain))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.AppDomainUnloadedException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ApplicationId))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.AssemblyLoadEventArgs))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.AssemblyLoadEventHandler))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Base64FormattingOptions))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.BitConverter))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.CannotUnloadAppDomainException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.CodeDom.Compiler.IndentedTextWriter))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Collections.ArrayList))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Collections.Comparer))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Collections.Hashtable))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Collections.IHashCodeProvider))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ContextBoundObject))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ContextMarshalException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ContextStaticAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Convert))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Stopwatch))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Environment))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.EnvironmentVariableTarget))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.GlobalizationExtensions))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.BinaryReader))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.BinaryWriter))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.BufferedStream))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.EndOfStreamException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.InvalidDataException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.MemoryStream))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.Path))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.StreamReader))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.StreamWriter))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.StringReader))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.StringWriter))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.TextReader))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.TextWriter))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.LoaderOptimization))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.LoaderOptimizationAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Math))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MathF))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MidpointRounding))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.WebUtility))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.OperatingSystem))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.PlatformID))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Progress<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Random))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.AssemblyNameProxy))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ResolveEventHandler))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Versioning.ComponentGuaranteesAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Versioning.ComponentGuaranteesOptions))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Versioning.FrameworkName))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Versioning.ResourceConsumptionAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Versioning.ResourceExposureAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Versioning.ResourceScope))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Versioning.VersioningHelper))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.IPermission))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.ISecurityEncodable))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Permissions.CodeAccessSecurityAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Permissions.SecurityAction))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Permissions.SecurityAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Permissions.SecurityPermissionAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Permissions.SecurityPermissionFlag))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.SecurityElement))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.StringComparer))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.StringNormalizationExtensions))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.UriBuilder))] diff --git a/external/api-snapshot/profiles/net_4_x/Facades/System.Runtime.cs b/external/api-snapshot/profiles/net_4_x/Facades/System.Runtime.cs index c8fd703379..02de0ad365 100644 --- a/external/api-snapshot/profiles/net_4_x/Facades/System.Runtime.cs +++ b/external/api-snapshot/profiles/net_4_x/Facades/System.Runtime.cs @@ -22,10 +22,17 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(float))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(int))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(long))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(Microsoft.Win32.SafeHandles.CriticalHandleMinusOneIsInvalid))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(Microsoft.Win32.SafeHandles.CriticalHandleZeroOrMinusOneIsInvalid))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(Microsoft.Win32.SafeHandles.SafeFileHandle))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(Microsoft.Win32.SafeHandles.SafeHandleMinusOneIsInvalid))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(Microsoft.Win32.SafeHandles.SafeHandleZeroOrMinusOneIsInvalid))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(Microsoft.Win32.SafeHandles.SafeWaitHandle))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(object))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(sbyte))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(short))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(string))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.AccessViolationException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Action))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Action<,,,,,,,,,,,,,,,>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Action<,,,,,,,,,,,,,,>))] @@ -44,6 +51,9 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Action<,>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Action<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Activator))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.AggregateException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.AppContext))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ApplicationException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ArgumentException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ArgumentNullException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ArgumentOutOfRangeException))] @@ -57,6 +67,11 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.AttributeUsageAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.BadImageFormatException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffer))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.IMemoryOwner<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.IPinnable))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.MemoryHandle))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.MemoryManager<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.CharEnumerator))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.CLSCompliantAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Collections.DictionaryEntry))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Collections.Generic.ICollection<>))] @@ -71,6 +86,7 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Collections.Generic.IReadOnlyList<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Collections.Generic.ISet<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Collections.Generic.KeyNotFoundException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Collections.Generic.KeyValuePair))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Collections.Generic.KeyValuePair<,>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Collections.ICollection))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Collections.IComparer))] @@ -88,23 +104,32 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ComponentModel.DefaultValueAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ComponentModel.EditorBrowsableAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ComponentModel.EditorBrowsableState))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Configuration.Assemblies.AssemblyHashAlgorithm))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Configuration.Assemblies.AssemblyVersionCompatibility))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Converter<,>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.DateTime))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.DateTimeKind))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.DateTimeOffset))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.DayOfWeek))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.DBNull))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Delegate))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.ConditionalAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.DebuggableAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.DivideByZeroException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.DuplicateWaitObjectException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.EntryPointNotFoundException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Enum))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.EventArgs))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.EventHandler))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.EventHandler<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Exception))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ExecutionEngineException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.FieldAccessException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.FileStyleUriParser))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.FlagsAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.FormatException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.FormattableString))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.FtpStyleUriParser))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Func<,,,,,,,,,,,,,,,,>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Func<,,,,,,,,,,,,,,,>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Func<,,,,,,,,,,,,,,>))] @@ -124,11 +149,54 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Func<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.GC))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.GCCollectionMode))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.GCNotificationStatus))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.GenericUriParser))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.GenericUriParserOptions))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.Calendar))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.CalendarAlgorithmType))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.CalendarWeekRule))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.CharUnicodeInfo))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.ChineseLunisolarCalendar))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.CompareInfo))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.CompareOptions))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.CultureInfo))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.CultureNotFoundException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.CultureTypes))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.DateTimeFormatInfo))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.DateTimeStyles))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.DaylightTime))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.DigitShapes))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.EastAsianLunisolarCalendar))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.GregorianCalendar))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.GregorianCalendarTypes))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.HebrewCalendar))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.HijriCalendar))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.IdnMapping))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.JapaneseCalendar))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.JapaneseLunisolarCalendar))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.JulianCalendar))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.KoreanCalendar))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.KoreanLunisolarCalendar))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.NumberFormatInfo))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.NumberStyles))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.PersianCalendar))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.RegionInfo))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.SortKey))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.SortVersion))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.StringInfo))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.TaiwanCalendar))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.TaiwanLunisolarCalendar))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.TextElementEnumerator))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.TextInfo))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.ThaiBuddhistCalendar))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.TimeSpanStyles))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.UmAlQuraCalendar))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Globalization.UnicodeCategory))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.GopherStyleUriParser))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Guid))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.HttpStyleUriParser))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IAsyncResult))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ICloneable))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IComparable))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IComparable<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IConvertible))] @@ -139,28 +207,47 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IFormattable))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IndexOutOfRangeException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.InsufficientExecutionStackException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.InsufficientMemoryException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IntPtr))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.InvalidCastException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.InvalidOperationException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.InvalidProgramException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.InvalidTimeZoneException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.DirectoryNotFoundException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.FileAccess))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.FileLoadException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.FileMode))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.FileNotFoundException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.FileOptions))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.FileShare))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.FileStream))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.IOException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.PathTooLongException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.SeekOrigin))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.Stream))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IObservable<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IObserver<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IProgress<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Lazy<,>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Lazy<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.LdapStyleUriParser))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MarshalByRefObject))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MemberAccessException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Memory<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MethodAccessException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MidpointRounding))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MissingFieldException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MissingMemberException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MissingMethodException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ModuleHandle))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MTAThreadAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MulticastDelegate))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MulticastNotSupportedException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.NetPipeStyleUriParser))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.NetTcpStyleUriParser))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.NewsStyleUriParser))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.NonSerializedAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.NotFiniteNumberException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.NotImplementedException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.NotSupportedException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Nullable))] @@ -174,8 +261,14 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.PlatformNotSupportedException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Predicate<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.RankException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ReadOnlyMemory<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ReadOnlySpan<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.AmbiguousMatchException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.Assembly))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.AssemblyAlgorithmIdAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.AssemblyCompanyAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.AssemblyConfigurationAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.AssemblyContentType))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.AssemblyCopyrightAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.AssemblyCultureAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.AssemblyDefaultAliasAttribute))] @@ -187,78 +280,249 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.AssemblyKeyFileAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.AssemblyKeyNameAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.AssemblyMetadataAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.AssemblyName))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.AssemblyNameFlags))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.AssemblyProductAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.AssemblySignatureKeyAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.AssemblyTitleAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.AssemblyTrademarkAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.AssemblyVersionAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.Binder))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.BindingFlags))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.CallingConventions))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.ConstructorInfo))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.CustomAttributeData))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.CustomAttributeExtensions))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.CustomAttributeFormatException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.CustomAttributeNamedArgument))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.CustomAttributeTypedArgument))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.DefaultMemberAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.EventAttributes))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.EventInfo))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.ExceptionHandlingClause))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.ExceptionHandlingClauseOptions))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.FieldAttributes))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.FieldInfo))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.GenericParameterAttributes))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.ICustomAttributeProvider))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.ImageFileMachine))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.InterfaceMapping))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.IntrospectionExtensions))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.InvalidFilterCriteriaException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.IReflect))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.IReflectableType))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.LocalVariableInfo))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.ManifestResourceInfo))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.MemberFilter))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.MemberInfo))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.MemberTypes))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.MethodAttributes))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.MethodBase))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.MethodBody))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.MethodImplAttributes))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.MethodInfo))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.Missing))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.Module))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.ModuleResolveEventHandler))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.ObfuscateAssemblyAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.ObfuscationAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.ParameterAttributes))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.ParameterInfo))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.ParameterModifier))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.Pointer))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.PortableExecutableKinds))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.ProcessorArchitecture))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.PropertyAttributes))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.PropertyInfo))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.ReflectionContext))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.ReflectionTypeLoadException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.ResourceAttributes))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.ResourceLocation))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.StrongNameKeyPair))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.TargetException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.TargetInvocationException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.TargetParameterCountException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.TypeAttributes))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.TypeDelegator))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.TypeFilter))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.TypeInfo))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ResolveEventArgs))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.AccessedThroughPropertyAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.AsyncMethodBuilderAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.AsyncStateMachineAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.CallerFilePathAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.CallerLineNumberAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.CallerMemberNameAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.CompilationRelaxations))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.CompilationRelaxationsAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.CompilerGeneratedAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.CompilerGlobalScopeAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ConditionalWeakTable<,>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ConfiguredTaskAwaitable))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ConfiguredTaskAwaitable<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.CustomConstantAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.DateTimeConstantAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.DecimalConstantAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.DefaultDependencyAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.DependencyAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.DisablePrivateReflectionAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.DiscardableAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ExtensionAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.FixedAddressValueTypeAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.FixedBufferAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.FormattableStringFactory))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.IAsyncStateMachine))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ICriticalNotifyCompletion))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.IndexerNameAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.INotifyCompletion))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.InternalsVisibleToAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.IsByRefLikeAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.IsConst))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.IsReadOnlyAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.IStrongBox))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.IsVolatile))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.IteratorStateMachineAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ITuple))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.LoadHint))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.MethodCodeType))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.MethodImplAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.MethodImplOptions))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ReferenceAssemblyAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.RuntimeCompatibilityAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.RuntimeFeature))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.RuntimeHelpers))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.RuntimeWrappedException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.SpecialNameAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.StateMachineAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.StringFreezingAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.StrongBox<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.SuppressIldasmAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.TaskAwaiter))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.TaskAwaiter<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.TupleElementNamesAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.TypeForwardedFromAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.TypeForwardedToAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.UnsafeValueTypeAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ValueTaskAwaiter))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ValueTaskAwaiter<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.YieldAwaitable))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.ConstrainedExecution.Cer))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.ConstrainedExecution.Consistency))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.ConstrainedExecution.CriticalFinalizerObject))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.ConstrainedExecution.ReliabilityContractAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.ExceptionServices.ExceptionDispatchInfo))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.ExceptionServices.FirstChanceExceptionEventArgs))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.ExceptionServices.HandleProcessCorruptedStateExceptionsAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.GCLargeObjectHeapCompactionMode))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.GCLatencyMode))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.GCSettings))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.CharSet))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.ComVisibleAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.CriticalHandle))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.ExternalException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.FieldOffsetAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.GCHandle))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.GCHandleType))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.InAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.LayoutKind))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.OutAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.SafeHandle))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.StructLayoutAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.MemoryFailPoint))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.IDeserializationCallback))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.IFormatterConverter))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.IObjectReference))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.ISafeSerializationData))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.ISerializable))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.OnDeserializedAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.OnDeserializingAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.OnSerializedAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.OnSerializingAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.OptionalFieldAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.SafeSerializationEventArgs))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.SerializationEntry))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.SerializationException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.SerializationInfo))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.SerializationInfoEnumerator))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.StreamingContext))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.StreamingContextStates))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Versioning.TargetFrameworkAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.RuntimeArgumentHandle))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.RuntimeFieldHandle))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.RuntimeMethodHandle))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.RuntimeTypeHandle))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.AllowPartiallyTrustedCallersAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.CryptographicException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.PartialTrustVisibilityLevel))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.SecurityCriticalAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.SecurityCriticalScope))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.SecurityException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.SecurityRulesAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.SecurityRuleSet))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.SecuritySafeCriticalAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.SecurityTransparentAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.SecurityTreatAsSafeAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.SuppressUnmanagedCodeSecurityAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.UnverifiableCodeAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.VerificationException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.SerializableAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Span<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.StackOverflowException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.STAThreadAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.StringComparison))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.StringSplitOptions))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.SystemException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Text.Decoder))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Text.DecoderExceptionFallback))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Text.DecoderExceptionFallbackBuffer))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Text.DecoderFallback))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Text.DecoderFallbackBuffer))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Text.DecoderFallbackException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Text.DecoderReplacementFallback))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Text.DecoderReplacementFallbackBuffer))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Text.Encoder))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Text.EncoderExceptionFallback))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Text.EncoderExceptionFallbackBuffer))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Text.EncoderFallback))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Text.EncoderFallbackBuffer))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Text.EncoderFallbackException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Text.EncoderReplacementFallback))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Text.EncoderReplacementFallbackBuffer))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Text.Encoding))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Text.EncodingInfo))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Text.EncodingProvider))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Text.NormalizationForm))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Text.StringBuilder))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.CancellationToken))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.CancellationTokenRegistration))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.LazyThreadSafetyMode))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Sources.IValueTaskSource))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Sources.IValueTaskSource<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Sources.ValueTaskSourceStatus))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Task))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Task<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.TaskContinuationOptions))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.TaskCreationOptions))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.TaskFactory))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.TaskFactory<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.TaskScheduler))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.TaskStatus))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.UnobservedTaskExceptionEventArgs))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.ValueTask))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.ValueTask<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Timeout))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.WaitHandle))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ThreadStaticAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.TimeoutException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.TimeSpan))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.TimeZone))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.TimeZoneInfo))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.TimeZoneNotFoundException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Tuple))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Tuple<,,,,,,,>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Tuple<,,,,,,>))] @@ -268,19 +532,35 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Tuple<,,>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Tuple<,>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Tuple<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.TupleExtensions))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Type))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.TypeAccessException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.TypeCode))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.TypedReference))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.TypeInitializationException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.TypeLoadException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.TypeUnloadedException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.UIntPtr))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.UnauthorizedAccessException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.UnhandledExceptionEventArgs))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.UnhandledExceptionEventHandler))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Uri))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.UriComponents))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.UriFormat))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.UriFormatException))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.UriHostNameType))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.UriKind))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.UriParser))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.UriPartial))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ValueTuple))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ValueTuple<,,,,,,,>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ValueTuple<,,,,,,>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ValueTuple<,,,,,>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ValueTuple<,,,,>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ValueTuple<,,,>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ValueTuple<,,>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ValueTuple<,>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ValueTuple<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ValueType))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Version))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.WeakReference))] diff --git a/external/api-snapshot/profiles/net_4_x/Microsoft.Build.Engine.cs b/external/api-snapshot/profiles/net_4_x/Microsoft.Build.Engine.cs index e60e1d2f5b..701121f3b8 100644 --- a/external/api-snapshot/profiles/net_4_x/Microsoft.Build.Engine.cs +++ b/external/api-snapshot/profiles/net_4_x/Microsoft.Build.Engine.cs @@ -179,7 +179,7 @@ namespace Microsoft.Build.BuildEngine public Microsoft.Build.BuildEngine.BuildPropertyGroup GlobalProperties { get { throw null; } set { } } public bool IsBuilding { get { throw null; } } public bool OnlyLogCriticalEvents { get { throw null; } set { } } - public Microsoft.Build.BuildEngine.ToolsetCollection Toolsets { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.Build.BuildEngine.ToolsetCollection Toolsets { get { throw null; } } public static System.Version Version { get { throw null; } } [System.MonoTODOAttribute] public bool BuildProject(Microsoft.Build.BuildEngine.Project project) { throw null; } @@ -295,7 +295,7 @@ namespace Microsoft.Build.BuildEngine public string SchemaFile { get { throw null; } set { } } public Microsoft.Build.BuildEngine.TargetCollection Targets { get { throw null; } } public System.DateTime TimeOfLastDirty { get { throw null; } } - public string ToolsVersion { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string ToolsVersion { get { throw null; } } public Microsoft.Build.BuildEngine.UsingTaskCollection UsingTasks { get { throw null; } } [System.MonoTODOAttribute] public string Xml { get { throw null; } } @@ -411,9 +411,9 @@ namespace Microsoft.Build.BuildEngine { public Toolset(string toolsVersion, string toolsPath) { } public Toolset(string toolsVersion, string toolsPath, Microsoft.Build.BuildEngine.BuildPropertyGroup buildProperties) { } - public Microsoft.Build.BuildEngine.BuildPropertyGroup BuildProperties { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ToolsPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ToolsVersion { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.Build.BuildEngine.BuildPropertyGroup BuildProperties { get { throw null; } } + public string ToolsPath { get { throw null; } } + public string ToolsVersion { get { throw null; } } } public partial class ToolsetCollection : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.IEnumerable { diff --git a/external/api-snapshot/profiles/net_4_x/Microsoft.Build.Framework.cs b/external/api-snapshot/profiles/net_4_x/Microsoft.Build.Framework.cs index 0a67cbfecd..30df20f56f 100644 --- a/external/api-snapshot/profiles/net_4_x/Microsoft.Build.Framework.cs +++ b/external/api-snapshot/profiles/net_4_x/Microsoft.Build.Framework.cs @@ -73,12 +73,12 @@ namespace Microsoft.Build.Framework public BuildEventContext(int nodeId, int targetId, int projectContextId, int taskId) { } public BuildEventContext(int nodeId, int projectInstanceId, int projectContextId, int targetId, int taskId) { } public BuildEventContext(int submissionId, int nodeId, int projectInstanceId, int projectContextId, int targetId, int taskId) { } - public int NodeId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int ProjectContextId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int ProjectInstanceId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int SubmissionId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int TargetId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int TaskId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int NodeId { get { throw null; } } + public int ProjectContextId { get { throw null; } } + public int ProjectInstanceId { get { throw null; } } + public int SubmissionId { get { throw null; } } + public int TargetId { get { throw null; } } + public int TaskId { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static bool operator ==(Microsoft.Build.Framework.BuildEventContext left, Microsoft.Build.Framework.BuildEventContext right) { throw null; } @@ -407,10 +407,10 @@ namespace Microsoft.Build.Framework public partial class TaskPropertyInfo { public TaskPropertyInfo(string name, System.Type typeOfParameter, bool output, bool required) { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool Output { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Type PropertyType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool Required { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } + public bool Output { get { throw null; } } + public System.Type PropertyType { get { throw null; } } + public bool Required { get { throw null; } } } [System.SerializableAttribute] public partial class TaskStartedEventArgs : Microsoft.Build.Framework.BuildStatusEventArgs diff --git a/external/api-snapshot/profiles/net_4_x/Microsoft.Build.Tasks.v4.0.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/Microsoft.Build.Tasks.v4.0.cs.REMOVED.git-id index 42517fda64..954b41a4f2 100644 --- a/external/api-snapshot/profiles/net_4_x/Microsoft.Build.Tasks.v4.0.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/Microsoft.Build.Tasks.v4.0.cs.REMOVED.git-id @@ -1 +1 @@ -92d94a10a69896063517a6aca3b99820a7aa7526 \ No newline at end of file +ba35dd71af3caf801d29af628d1a0a1cdef55795 \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/Microsoft.Build.Utilities.v4.0.cs b/external/api-snapshot/profiles/net_4_x/Microsoft.Build.Utilities.v4.0.cs index 65dfeeac33..3ff1250239 100644 --- a/external/api-snapshot/profiles/net_4_x/Microsoft.Build.Utilities.v4.0.cs +++ b/external/api-snapshot/profiles/net_4_x/Microsoft.Build.Utilities.v4.0.cs @@ -199,17 +199,17 @@ namespace Microsoft.Build.Utilities protected ToolTask(System.Resources.ResourceManager taskResources) { } protected ToolTask(System.Resources.ResourceManager taskResources, string helpKeywordPrefix) { } protected virtual System.Collections.Specialized.StringDictionary EnvironmentOverride { get { throw null; } } - public string[] EnvironmentVariables { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string[] EnvironmentVariables { get { throw null; } set { } } [Microsoft.Build.Framework.OutputAttribute] public int ExitCode { get { throw null; } } protected virtual bool HasLoggedErrors { get { throw null; } } - public bool LogStandardErrorAsError { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool LogStandardErrorAsError { get { throw null; } set { } } protected virtual System.Text.Encoding ResponseFileEncoding { get { throw null; } } protected virtual System.Text.Encoding StandardErrorEncoding { get { throw null; } } protected Microsoft.Build.Framework.MessageImportance StandardErrorImportanceToUse { get { throw null; } } protected virtual Microsoft.Build.Framework.MessageImportance StandardErrorLoggingImportance { get { throw null; } } protected virtual System.Text.Encoding StandardOutputEncoding { get { throw null; } } - public string StandardOutputImportance { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string StandardOutputImportance { get { throw null; } set { } } protected Microsoft.Build.Framework.MessageImportance StandardOutputImportanceToUse { get { throw null; } } protected virtual Microsoft.Build.Framework.MessageImportance StandardOutputLoggingImportance { get { throw null; } } public virtual int Timeout { get { throw null; } set { } } @@ -217,7 +217,7 @@ namespace Microsoft.Build.Utilities public virtual string ToolExe { get { throw null; } set { } } protected abstract string ToolName { get; } public string ToolPath { get { throw null; } set { } } - public bool YieldDuringToolExecution { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool YieldDuringToolExecution { get { throw null; } set { } } [System.MonoTODOAttribute] protected virtual bool CallHostObjectToExecute() { throw null; } public virtual void Cancel() { } diff --git a/external/api-snapshot/profiles/net_4_x/Microsoft.Build.cs b/external/api-snapshot/profiles/net_4_x/Microsoft.Build.cs new file mode 100644 index 0000000000..aa610bae4d --- /dev/null +++ b/external/api-snapshot/profiles/net_4_x/Microsoft.Build.cs @@ -0,0 +1,1214 @@ +// 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. + +[assembly:System.Reflection.AssemblyVersionAttribute("4.0.0.0")] +[assembly:System.CLSCompliantAttribute(true)] +[assembly:System.Diagnostics.DebuggableAttribute((System.Diagnostics.DebuggableAttribute.DebuggingModes)(2))] +[assembly:System.Reflection.AssemblyCompanyAttribute("Mono development team")] +[assembly:System.Reflection.AssemblyCopyrightAttribute("(c) Various Mono authors")] +[assembly:System.Reflection.AssemblyDefaultAliasAttribute("Microsoft.Build.dll")] +[assembly:System.Reflection.AssemblyDescriptionAttribute("Microsoft.Build.dll")] +[assembly:System.Reflection.AssemblyFileVersionAttribute("4.6.57.0")] +[assembly:System.Reflection.AssemblyInformationalVersionAttribute("4.6.57.0")] +[assembly:System.Reflection.AssemblyProductAttribute("Mono Common Language Infrastructure")] +[assembly:System.Reflection.AssemblyTitleAttribute("Microsoft.Build.dll")] +[assembly:System.Resources.NeutralResourcesLanguageAttribute("en-US")] +[assembly:System.Resources.SatelliteContractVersionAttribute("4.0.0.0")] +[assembly:System.Runtime.CompilerServices.CompilationRelaxationsAttribute((System.Runtime.CompilerServices.CompilationRelaxations)(8))] +[assembly:System.Runtime.CompilerServices.RuntimeCompatibilityAttribute(WrapNonExceptionThrows=true)] +[assembly:System.Runtime.InteropServices.ComVisibleAttribute(false)] +namespace Microsoft.Build.Construction +{ + [System.SerializableAttribute] + public abstract partial class ElementLocation + { + protected ElementLocation() { } + public abstract int Column { get; } + public abstract string File { get; } + public abstract int Line { get; } + public string LocationString { get { throw null; } } + public override bool Equals(object obj) { throw null; } + public override int GetHashCode() { throw null; } + } + [System.Diagnostics.DebuggerDisplayAttribute("ProjectChooseElement (#Children={Count} HasOtherwise={OtherwiseElement != null})")] + public partial class ProjectChooseElement : Microsoft.Build.Construction.ProjectElementContainer + { + internal ProjectChooseElement() { } + public override string Condition { get { throw null; } set { } } + public Microsoft.Build.Construction.ProjectOtherwiseElement OtherwiseElement { get { throw null; } } + public System.Collections.Generic.ICollection WhenElements { get { throw null; } } + } + public abstract partial class ProjectElement + { + internal ProjectElement() { } + public System.Collections.Generic.IEnumerable AllParents { get { throw null; } } + public virtual string Condition { get { throw null; } set { } } + public Microsoft.Build.Construction.ElementLocation ConditionLocation { get { throw null; } } + public Microsoft.Build.Construction.ProjectRootElement ContainingProject { get { throw null; } } + public string Label { get { throw null; } set { } } + public Microsoft.Build.Construction.ElementLocation LabelLocation { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation Location { get { throw null; } } + public Microsoft.Build.Construction.ProjectElement NextSibling { get { throw null; } } + public Microsoft.Build.Construction.ProjectElementContainer Parent { get { throw null; } } + public Microsoft.Build.Construction.ProjectElement PreviousSibling { get { throw null; } } + } + public abstract partial class ProjectElementContainer : Microsoft.Build.Construction.ProjectElement + { + internal ProjectElementContainer() { } + public System.Collections.Generic.IEnumerable AllChildren { get { throw null; } } + public System.Collections.Generic.ICollection Children { get { throw null; } } + public System.Collections.Generic.ICollection ChildrenReversed { get { throw null; } } + public int Count { get { throw null; } } + public Microsoft.Build.Construction.ProjectElement FirstChild { get { throw null; } } + public Microsoft.Build.Construction.ProjectElement LastChild { get { throw null; } } + public void AppendChild(Microsoft.Build.Construction.ProjectElement child) { } + public void InsertAfterChild(Microsoft.Build.Construction.ProjectElement child, Microsoft.Build.Construction.ProjectElement reference) { } + public void InsertBeforeChild(Microsoft.Build.Construction.ProjectElement child, Microsoft.Build.Construction.ProjectElement reference) { } + public void PrependChild(Microsoft.Build.Construction.ProjectElement child) { } + public void RemoveAllChildren() { } + public void RemoveChild(Microsoft.Build.Construction.ProjectElement child) { } + } + public partial class ProjectExtensionsElement : Microsoft.Build.Construction.ProjectElement + { + internal ProjectExtensionsElement() { } + public override string Condition { get { throw null; } set { } } + public string Content { get { throw null; } set { } } + public string this[string name] { get { throw null; } set { } } + } + [System.Diagnostics.DebuggerDisplayAttribute("Project={Project} Condition={Condition}")] + public partial class ProjectImportElement : Microsoft.Build.Construction.ProjectElement + { + internal ProjectImportElement() { } + public string Project { get { throw null; } set { } } + } + [System.Diagnostics.DebuggerDisplayAttribute("#Imports={Count} Condition={Condition} Label={Label}")] + public partial class ProjectImportGroupElement : Microsoft.Build.Construction.ProjectElementContainer + { + internal ProjectImportGroupElement() { } + public System.Collections.Generic.ICollection Imports { get { throw null; } } + public Microsoft.Build.Construction.ProjectImportElement AddImport(string project) { throw null; } + } + [System.Diagnostics.DebuggerDisplayAttribute("{ItemType} #Metadata={Count} Condition={Condition}")] + public partial class ProjectItemDefinitionElement : Microsoft.Build.Construction.ProjectElementContainer + { + internal ProjectItemDefinitionElement() { } + public string ItemType { get { throw null; } } + public System.Collections.Generic.ICollection Metadata { get { throw null; } } + public Microsoft.Build.Construction.ProjectMetadataElement AddMetadata(string name, string unevaluatedValue) { throw null; } + } + [System.Diagnostics.DebuggerDisplayAttribute("#ItemDefinitions={Count} Condition={Condition} Label={Label}")] + public partial class ProjectItemDefinitionGroupElement : Microsoft.Build.Construction.ProjectElementContainer + { + internal ProjectItemDefinitionGroupElement() { } + public System.Collections.Generic.ICollection ItemDefinitions { get { throw null; } } + public Microsoft.Build.Construction.ProjectItemDefinitionElement AddItemDefinition(string itemType) { throw null; } + } + [System.Diagnostics.DebuggerDisplayAttribute("{ItemType} Include={Include} Exclude={Exclude} #Metadata={Count} Condition={Condition}")] + public partial class ProjectItemElement : Microsoft.Build.Construction.ProjectElementContainer + { + internal ProjectItemElement() { } + public string Exclude { get { throw null; } set { } } + public Microsoft.Build.Construction.ElementLocation ExcludeLocation { get { throw null; } } + public bool HasMetadata { get { throw null; } } + public string Include { get { throw null; } set { } } + public Microsoft.Build.Construction.ElementLocation IncludeLocation { get { throw null; } } + public string ItemType { get { throw null; } set { } } + public string KeepDuplicates { get { throw null; } set { } } + public Microsoft.Build.Construction.ElementLocation KeepDuplicatesLocation { get { throw null; } } + public string KeepMetadata { get { throw null; } set { } } + public System.Collections.Generic.ICollection Metadata { get { throw null; } } + public string Remove { get { throw null; } set { } } + public Microsoft.Build.Construction.ElementLocation RemoveLocation { get { throw null; } } + public string RemoveMetadata { get { throw null; } set { } } + public Microsoft.Build.Construction.ElementLocation RemoveMetadataLocation { get { throw null; } } + public Microsoft.Build.Construction.ProjectMetadataElement AddMetadata(string name, string unevaluatedValue) { throw null; } + } + [System.Diagnostics.DebuggerDisplayAttribute("#Items={Count} Condition={Condition} Label={Label}")] + public partial class ProjectItemGroupElement : Microsoft.Build.Construction.ProjectElementContainer + { + internal ProjectItemGroupElement() { } + public System.Collections.Generic.ICollection Items { get { throw null; } } + public Microsoft.Build.Construction.ProjectItemElement AddItem(string itemType, string include) { throw null; } + public Microsoft.Build.Construction.ProjectItemElement AddItem(string itemType, string include, System.Collections.Generic.IEnumerable> metadata) { throw null; } + } + [System.Diagnostics.DebuggerDisplayAttribute("{Name} Value={Value} Condition={Condition}")] + public partial class ProjectMetadataElement : Microsoft.Build.Construction.ProjectElement + { + internal ProjectMetadataElement() { } + public string Name { get { throw null; } set { } } + public string Value { get { throw null; } set { } } + } + [System.Diagnostics.DebuggerDisplayAttribute("ExecuteTargets={ExecuteTargets}")] + public partial class ProjectOnErrorElement : Microsoft.Build.Construction.ProjectElement + { + internal ProjectOnErrorElement() { } + public string ExecuteTargetsAttribute { get { throw null; } set { } } + public Microsoft.Build.Construction.ElementLocation ExecuteTargetsAttributeLocation { get { throw null; } set { } } + } + [System.Diagnostics.DebuggerDisplayAttribute("#Children={Count}")] + public partial class ProjectOtherwiseElement : Microsoft.Build.Construction.ProjectElementContainer + { + internal ProjectOtherwiseElement() { } + public System.Collections.Generic.ICollection ChooseElements { get { throw null; } } + public override string Condition { get { throw null; } set { } } + public System.Collections.Generic.ICollection ItemGroups { get { throw null; } } + public System.Collections.Generic.ICollection PropertyGroups { get { throw null; } } + } + [System.Diagnostics.DebuggerDisplayAttribute("Name={Name} TaskParameter={TaskParameter} ItemName={ItemName} PropertyName={PropertyName} Condition={Condition}")] + public partial class ProjectOutputElement : Microsoft.Build.Construction.ProjectElement + { + internal ProjectOutputElement() { } + public bool IsOutputItem { get { throw null; } } + public bool IsOutputProperty { get { throw null; } } + public string ItemType { get { throw null; } set { } } + public string PropertyName { get { throw null; } set { } } + public string TaskParameter { get { throw null; } set { } } + public Microsoft.Build.Construction.ElementLocation TaskParameterLocation { get { throw null; } set { } } + } + [System.Diagnostics.DebuggerDisplayAttribute("{Name} Value={Value} Condition={Condition}")] + public partial class ProjectPropertyElement : Microsoft.Build.Construction.ProjectElement + { + internal ProjectPropertyElement() { } + public string Name { get { throw null; } set { } } + public string Value { get { throw null; } set { } } + } + [System.Diagnostics.DebuggerDisplayAttribute("#Properties={Count} Condition={Condition} Label={Label}")] + public partial class ProjectPropertyGroupElement : Microsoft.Build.Construction.ProjectElementContainer + { + internal ProjectPropertyGroupElement() { } + public System.Collections.Generic.ICollection Properties { get { throw null; } } + public System.Collections.Generic.ICollection PropertiesReversed { get { throw null; } } + public Microsoft.Build.Construction.ProjectPropertyElement AddProperty(string name, string unevaluatedValue) { throw null; } + public Microsoft.Build.Construction.ProjectPropertyElement SetProperty(string name, string unevaluatedValue) { throw null; } + } + [System.Diagnostics.DebuggerDisplayAttribute("{FullPath} #Children={Count} DefaultTargets={DefaultTargets} ToolsVersion={ToolsVersion} InitialTargets={InitialTargets}")] + public partial class ProjectRootElement : Microsoft.Build.Construction.ProjectElementContainer + { + internal ProjectRootElement() { } + public System.Collections.Generic.ICollection ChooseElements { get { throw null; } } + public override string Condition { get { throw null; } set { } } + public string DefaultTargets { get { throw null; } set { } } + public string DirectoryPath { get { throw null; } set { } } + public System.Text.Encoding Encoding { get { throw null; } } + public string FullPath { get { throw null; } set { } } + public bool HasUnsavedChanges { get { throw null; } } + public System.Collections.Generic.ICollection ImportGroups { get { throw null; } } + public System.Collections.Generic.ICollection ImportGroupsReversed { get { throw null; } } + public System.Collections.Generic.ICollection Imports { get { throw null; } } + public string InitialTargets { get { throw null; } set { } } + public System.Collections.Generic.ICollection ItemDefinitionGroups { get { throw null; } } + public System.Collections.Generic.ICollection ItemDefinitionGroupsReversed { get { throw null; } } + public System.Collections.Generic.ICollection ItemDefinitions { get { throw null; } } + public System.Collections.Generic.ICollection ItemGroups { get { throw null; } } + public System.Collections.Generic.ICollection ItemGroupsReversed { get { throw null; } } + public System.Collections.Generic.ICollection Items { get { throw null; } } + public System.DateTime LastWriteTimeWhenRead { get { throw null; } } + public System.Collections.Generic.ICollection Properties { get { throw null; } } + public System.Collections.Generic.ICollection PropertyGroups { get { throw null; } } + public System.Collections.Generic.ICollection PropertyGroupsReversed { get { throw null; } } + public string RawXml { get { throw null; } } + public System.Collections.Generic.ICollection Targets { get { throw null; } } + public System.DateTime TimeLastChanged { get { throw null; } } + public string ToolsVersion { get { throw null; } set { } } + public System.Collections.Generic.ICollection UsingTasks { get { throw null; } } + public int Version { get { throw null; } } + public Microsoft.Build.Construction.ProjectImportElement AddImport(string project) { throw null; } + public Microsoft.Build.Construction.ProjectImportGroupElement AddImportGroup() { throw null; } + public Microsoft.Build.Construction.ProjectItemElement AddItem(string itemType, string include) { throw null; } + public Microsoft.Build.Construction.ProjectItemElement AddItem(string itemType, string include, System.Collections.Generic.IEnumerable> metadata) { throw null; } + public Microsoft.Build.Construction.ProjectItemDefinitionElement AddItemDefinition(string itemType) { throw null; } + public Microsoft.Build.Construction.ProjectItemDefinitionGroupElement AddItemDefinitionGroup() { throw null; } + public Microsoft.Build.Construction.ProjectItemGroupElement AddItemGroup() { throw null; } + public Microsoft.Build.Construction.ProjectPropertyElement AddProperty(string name, string value) { throw null; } + public Microsoft.Build.Construction.ProjectPropertyGroupElement AddPropertyGroup() { throw null; } + public Microsoft.Build.Construction.ProjectTargetElement AddTarget(string name) { throw null; } + public Microsoft.Build.Construction.ProjectUsingTaskElement AddUsingTask(string name, string assemblyFile, string assemblyName) { throw null; } + public static Microsoft.Build.Construction.ProjectRootElement Create() { throw null; } + public static Microsoft.Build.Construction.ProjectRootElement Create(Microsoft.Build.Evaluation.ProjectCollection projectCollection) { throw null; } + public static Microsoft.Build.Construction.ProjectRootElement Create(string path) { throw null; } + public static Microsoft.Build.Construction.ProjectRootElement Create(string path, Microsoft.Build.Evaluation.ProjectCollection projectCollection) { throw null; } + public static Microsoft.Build.Construction.ProjectRootElement Create(System.Xml.XmlReader xmlReader) { throw null; } + public static Microsoft.Build.Construction.ProjectRootElement Create(System.Xml.XmlReader xmlReader, Microsoft.Build.Evaluation.ProjectCollection projectCollection) { throw null; } + public Microsoft.Build.Construction.ProjectChooseElement CreateChooseElement() { throw null; } + public Microsoft.Build.Construction.ProjectImportElement CreateImportElement(string project) { throw null; } + public Microsoft.Build.Construction.ProjectImportGroupElement CreateImportGroupElement() { throw null; } + public Microsoft.Build.Construction.ProjectItemDefinitionElement CreateItemDefinitionElement(string itemType) { throw null; } + public Microsoft.Build.Construction.ProjectItemDefinitionGroupElement CreateItemDefinitionGroupElement() { throw null; } + public Microsoft.Build.Construction.ProjectItemElement CreateItemElement(string itemType) { throw null; } + public Microsoft.Build.Construction.ProjectItemElement CreateItemElement(string itemType, string include) { throw null; } + public Microsoft.Build.Construction.ProjectItemGroupElement CreateItemGroupElement() { throw null; } + public Microsoft.Build.Construction.ProjectMetadataElement CreateMetadataElement(string name) { throw null; } + public Microsoft.Build.Construction.ProjectMetadataElement CreateMetadataElement(string name, string unevaluatedValue) { throw null; } + public Microsoft.Build.Construction.ProjectOnErrorElement CreateOnErrorElement(string executeTargets) { throw null; } + public Microsoft.Build.Construction.ProjectOtherwiseElement CreateOtherwiseElement() { throw null; } + public Microsoft.Build.Construction.ProjectOutputElement CreateOutputElement(string taskParameter, string itemType, string propertyName) { throw null; } + public Microsoft.Build.Construction.ProjectExtensionsElement CreateProjectExtensionsElement() { throw null; } + public Microsoft.Build.Construction.ProjectPropertyElement CreatePropertyElement(string name) { throw null; } + public Microsoft.Build.Construction.ProjectPropertyGroupElement CreatePropertyGroupElement() { throw null; } + public Microsoft.Build.Construction.ProjectTargetElement CreateTargetElement(string name) { throw null; } + public Microsoft.Build.Construction.ProjectTaskElement CreateTaskElement(string name) { throw null; } + public Microsoft.Build.Construction.ProjectUsingTaskBodyElement CreateUsingTaskBodyElement(string evaluate, string body) { throw null; } + public Microsoft.Build.Construction.ProjectUsingTaskElement CreateUsingTaskElement(string taskName, string assemblyFile, string assemblyName) { throw null; } + public Microsoft.Build.Construction.ProjectUsingTaskParameterElement CreateUsingTaskParameterElement(string name, string output, string required, string parameterType) { throw null; } + public Microsoft.Build.Construction.UsingTaskParameterGroupElement CreateUsingTaskParameterGroupElement() { throw null; } + public Microsoft.Build.Construction.ProjectWhenElement CreateWhenElement(string condition) { throw null; } + public static Microsoft.Build.Construction.ProjectRootElement Open(string path) { throw null; } + public static Microsoft.Build.Construction.ProjectRootElement Open(string path, Microsoft.Build.Evaluation.ProjectCollection projectCollection) { throw null; } + public void Save() { } + public void Save(System.IO.TextWriter writer) { } + public void Save(string path) { } + public void Save(string path, System.Text.Encoding encoding) { } + public void Save(System.Text.Encoding saveEncoding) { } + public static Microsoft.Build.Construction.ProjectRootElement TryOpen(string path) { throw null; } + public static Microsoft.Build.Construction.ProjectRootElement TryOpen(string path, Microsoft.Build.Evaluation.ProjectCollection projectCollection) { throw null; } + } + [System.Diagnostics.DebuggerDisplayAttribute("Name={Name} #Children={Count} Condition={Condition}")] + public partial class ProjectTargetElement : Microsoft.Build.Construction.ProjectElementContainer + { + internal ProjectTargetElement() { } + public string AfterTargets { get { throw null; } set { } } + public Microsoft.Build.Construction.ElementLocation AfterTargetsLocation { get { throw null; } } + public string BeforeTargets { get { throw null; } set { } } + public Microsoft.Build.Construction.ElementLocation BeforeTargetsLocation { get { throw null; } } + public string DependsOnTargets { get { throw null; } set { } } + public Microsoft.Build.Construction.ElementLocation DependsOnTargetsLocation { get { throw null; } } + public string Inputs { get { throw null; } set { } } + public Microsoft.Build.Construction.ElementLocation InputsLocation { get { throw null; } } + public System.Collections.Generic.ICollection ItemGroups { get { throw null; } } + public string KeepDuplicateOutputs { get { throw null; } set { } } + public Microsoft.Build.Construction.ElementLocation KeepDuplicateOutputsLocation { get { throw null; } } + public string Name { get { throw null; } set { } } + public Microsoft.Build.Construction.ElementLocation NameLocation { get { throw null; } } + public System.Collections.Generic.ICollection OnErrors { get { throw null; } } + public string Outputs { get { throw null; } set { } } + public Microsoft.Build.Construction.ElementLocation OutputsLocation { get { throw null; } } + public System.Collections.Generic.ICollection PropertyGroups { get { throw null; } } + public string Returns { get { throw null; } set { } } + public Microsoft.Build.Construction.ElementLocation ReturnsLocation { get { throw null; } } + public System.Collections.Generic.ICollection Tasks { get { throw null; } } + public Microsoft.Build.Construction.ProjectItemGroupElement AddItemGroup() { throw null; } + public Microsoft.Build.Construction.ProjectPropertyGroupElement AddPropertyGroup() { throw null; } + public Microsoft.Build.Construction.ProjectTaskElement AddTask(string taskName) { throw null; } + } + [System.Diagnostics.DebuggerDisplayAttribute("{Name} Condition={Condition} ContinueOnError={ContinueOnError} #Outputs={Count}")] + public partial class ProjectTaskElement : Microsoft.Build.Construction.ProjectElementContainer + { + internal ProjectTaskElement() { } + public string ContinueOnError { get { throw null; } set { } } + public Microsoft.Build.Construction.ElementLocation ContinueOnErrorLocation { get { throw null; } set { } } + public string ExecuteTargets { get { throw null; } set { } } + public Microsoft.Build.Construction.ElementLocation ExecuteTargetsLocation { get { throw null; } set { } } + public string MSBuildArchitecture { get { throw null; } set { } } + public Microsoft.Build.Construction.ElementLocation MSBuildArchitectureLocation { get { throw null; } set { } } + public string MSBuildRuntime { get { throw null; } set { } } + public Microsoft.Build.Construction.ElementLocation MSBuildRuntimeLocation { get { throw null; } set { } } + public string Name { get { throw null; } } + public System.Collections.Generic.ICollection Outputs { get { throw null; } } + public System.Collections.Generic.IDictionary Parameters { get { throw null; } } + public Microsoft.Build.Construction.ProjectOutputElement AddOutputItem(string taskParameter, string itemType) { throw null; } + public Microsoft.Build.Construction.ProjectOutputElement AddOutputItem(string taskParameter, string itemType, string condition) { throw null; } + public Microsoft.Build.Construction.ProjectOutputElement AddOutputProperty(string taskParameter, string propertyName) { throw null; } + public Microsoft.Build.Construction.ProjectOutputElement AddOutputProperty(string taskParameter, string propertyName, string condition) { throw null; } + public string GetParameter(string name) { throw null; } + public void RemoveAllParameters() { } + public void RemoveParameter(string name) { } + public void SetParameter(string name, string unevaluatedValue) { } + } + [System.Diagnostics.DebuggerDisplayAttribute("Evaluate={Evaluate} TaskBody={TaskBody}")] + public partial class ProjectUsingTaskBodyElement : Microsoft.Build.Construction.ProjectElement + { + internal ProjectUsingTaskBodyElement() { } + public override string Condition { get { throw null; } set { } } + public string Evaluate { get { throw null; } set { } } + public string TaskBody { get { throw null; } set { } } + } + [System.Diagnostics.DebuggerDisplayAttribute("TaskName={TaskName} AssemblyName={AssemblyName} AssemblyFile={AssemblyFile} Condition={Condition} Runtime={RequiredRuntime} Platform={RequiredPlatform}")] + public partial class ProjectUsingTaskElement : Microsoft.Build.Construction.ProjectElementContainer + { + internal ProjectUsingTaskElement() { } + public string AssemblyFile { get { throw null; } set { } } + public string AssemblyName { get { throw null; } set { } } + public Microsoft.Build.Construction.UsingTaskParameterGroupElement ParameterGroup { get { throw null; } } + public Microsoft.Build.Construction.ProjectUsingTaskBodyElement TaskBody { get { throw null; } } + public string TaskFactory { get { throw null; } set { } } + public string TaskName { get { throw null; } set { } } + public Microsoft.Build.Construction.UsingTaskParameterGroupElement AddParameterGroup() { throw null; } + public Microsoft.Build.Construction.ProjectUsingTaskBodyElement AddUsingTaskBody(string evaluate, string taskBody) { throw null; } + } + [System.Diagnostics.DebuggerDisplayAttribute("Name={Name} ParameterType={ParameterType} Output={Output}")] + public partial class ProjectUsingTaskParameterElement : Microsoft.Build.Construction.ProjectElement + { + internal ProjectUsingTaskParameterElement() { } + public override string Condition { get { throw null; } set { } } + public string Name { get { throw null; } set { } } + public string Output { get { throw null; } set { } } + public string ParameterType { get { throw null; } set { } } + public string Required { get { throw null; } set { } } + } + [System.Diagnostics.DebuggerDisplayAttribute("#Children={Count} Condition={Condition}")] + public partial class ProjectWhenElement : Microsoft.Build.Construction.ProjectElementContainer + { + internal ProjectWhenElement() { } + public System.Collections.Generic.ICollection ChooseElements { get { throw null; } } + public System.Collections.Generic.ICollection ItemGroups { get { throw null; } } + public System.Collections.Generic.ICollection PropertyGroups { get { throw null; } } + } + [System.Diagnostics.DebuggerDisplayAttribute("#Parameters={Count}")] + public partial class UsingTaskParameterGroupElement : Microsoft.Build.Construction.ProjectElementContainer + { + internal UsingTaskParameterGroupElement() { } + public override string Condition { get { throw null; } set { } } + public System.Collections.Generic.ICollection Parameters { get { throw null; } } + public Microsoft.Build.Construction.ProjectUsingTaskParameterElement AddParameter(string name) { throw null; } + public Microsoft.Build.Construction.ProjectUsingTaskParameterElement AddParameter(string name, string output, string required, string parameterType) { throw null; } + } +} +namespace Microsoft.Build.Evaluation +{ + [System.Diagnostics.DebuggerDisplayAttribute("{FullPath} EffectiveToolsVersion={ToolsVersion} #GlobalProperties={data.globalProperties.Count} #Properties={data.Properties.Count} #ItemTypes={data.ItemTypes.Count} #ItemDefinitions={data.ItemDefinitions.Count} #Items={data.Items.Count} #Targets={data.Targets.Count}")] + public partial class Project + { + public Project(Microsoft.Build.Construction.ProjectRootElement xml) { } + public Project(Microsoft.Build.Construction.ProjectRootElement xml, System.Collections.Generic.IDictionary globalProperties, string toolsVersion) { } + public Project(Microsoft.Build.Construction.ProjectRootElement xml, System.Collections.Generic.IDictionary globalProperties, string toolsVersion, Microsoft.Build.Evaluation.ProjectCollection projectCollection) { } + public Project(Microsoft.Build.Construction.ProjectRootElement xml, System.Collections.Generic.IDictionary globalProperties, string toolsVersion, Microsoft.Build.Evaluation.ProjectCollection projectCollection, Microsoft.Build.Evaluation.ProjectLoadSettings loadSettings) { } + public Project(string projectFile) { } + public Project(string projectFile, System.Collections.Generic.IDictionary globalProperties, string toolsVersion) { } + public Project(string projectFile, System.Collections.Generic.IDictionary globalProperties, string toolsVersion, Microsoft.Build.Evaluation.ProjectCollection projectCollection) { } + public Project(string projectFile, System.Collections.Generic.IDictionary globalProperties, string toolsVersion, Microsoft.Build.Evaluation.ProjectCollection projectCollection, Microsoft.Build.Evaluation.ProjectLoadSettings loadSettings) { } + public Project(System.Xml.XmlReader xmlReader) { } + public Project(System.Xml.XmlReader xmlReader, System.Collections.Generic.IDictionary globalProperties, string toolsVersion) { } + public Project(System.Xml.XmlReader xmlReader, System.Collections.Generic.IDictionary globalProperties, string toolsVersion, Microsoft.Build.Evaluation.ProjectCollection projectCollection) { } + public Project(System.Xml.XmlReader xmlReader, System.Collections.Generic.IDictionary globalProperties, string toolsVersion, Microsoft.Build.Evaluation.ProjectCollection projectCollection, Microsoft.Build.Evaluation.ProjectLoadSettings loadSettings) { } + public System.Collections.Generic.ICollection AllEvaluatedItemDefinitionMetadata { get { throw null; } } + public System.Collections.Generic.ICollection AllEvaluatedItems { get { throw null; } } + public System.Collections.Generic.ICollection AllEvaluatedProperties { get { throw null; } } + public System.Collections.Generic.IDictionary> ConditionedProperties { get { throw null; } } + public string DirectoryPath { get { throw null; } } + public bool DisableMarkDirty { get { throw null; } set { } } + public int EvaluationCounter { get { throw null; } } + public string FullPath { get { throw null; } set { } } + public System.Collections.Generic.IDictionary GlobalProperties { get { throw null; } } + public System.Collections.Generic.IList Imports { get { throw null; } } + public System.Collections.Generic.IList ImportsIncludingDuplicates { get { throw null; } } + public bool IsBuildEnabled { get { throw null; } } + public bool IsDirty { get { throw null; } } + public System.Collections.Generic.IDictionary ItemDefinitions { get { throw null; } } + [System.MonoTODOAttribute("should be different from AllEvaluatedItems")] + public System.Collections.Generic.ICollection Items { get { throw null; } } + public System.Collections.Generic.ICollection ItemsIgnoringCondition { get { throw null; } } + public System.Collections.Generic.ICollection ItemTypes { get { throw null; } } + public Microsoft.Build.Evaluation.ProjectCollection ProjectCollection { get { throw null; } } + [System.MonoTODOAttribute("should be different from AllEvaluatedProperties")] + public System.Collections.Generic.ICollection Properties { get { throw null; } } + public bool SkipEvaluation { get { throw null; } set { } } + public System.Collections.Generic.IDictionary Targets { get { throw null; } } + public string ToolsVersion { get { throw null; } } + public Microsoft.Build.Construction.ProjectRootElement Xml { get { throw null; } } + public System.Collections.Generic.IList AddItem(string itemType, string unevaluatedInclude) { throw null; } + public System.Collections.Generic.IList AddItem(string itemType, string unevaluatedInclude, System.Collections.Generic.IEnumerable> metadata) { throw null; } + public System.Collections.Generic.IList AddItemFast(string itemType, string unevaluatedInclude) { throw null; } + public System.Collections.Generic.IList AddItemFast(string itemType, string unevaluatedInclude, System.Collections.Generic.IEnumerable> metadata) { throw null; } + public bool Build() { throw null; } + public bool Build(Microsoft.Build.Framework.ILogger logger) { throw null; } + public bool Build(System.Collections.Generic.IEnumerable loggers) { throw null; } + public bool Build(System.Collections.Generic.IEnumerable loggers, System.Collections.Generic.IEnumerable remoteLoggers) { throw null; } + public bool Build(string target) { throw null; } + public bool Build(string target, System.Collections.Generic.IEnumerable loggers) { throw null; } + public bool Build(string target, System.Collections.Generic.IEnumerable loggers, System.Collections.Generic.IEnumerable remoteLoggers) { throw null; } + public bool Build(string[] targets) { throw null; } + public bool Build(string[] targets, System.Collections.Generic.IEnumerable loggers) { throw null; } + public bool Build(string[] targets, System.Collections.Generic.IEnumerable loggers, System.Collections.Generic.IEnumerable remoteLoggers) { throw null; } + public Microsoft.Build.Execution.ProjectInstance CreateProjectInstance() { throw null; } + public string ExpandString(string unexpandedValue) { throw null; } + public static string GetEvaluatedItemIncludeEscaped(Microsoft.Build.Evaluation.ProjectItem item) { throw null; } + public static string GetEvaluatedItemIncludeEscaped(Microsoft.Build.Evaluation.ProjectItemDefinition item) { throw null; } + public System.Collections.Generic.ICollection GetItems(string itemType) { throw null; } + public System.Collections.Generic.ICollection GetItemsByEvaluatedInclude(string evaluatedInclude) { throw null; } + public System.Collections.Generic.ICollection GetItemsIgnoringCondition(string itemType) { throw null; } + public System.Collections.Generic.IEnumerable GetLogicalProject() { throw null; } + public static string GetMetadataValueEscaped(Microsoft.Build.Evaluation.ProjectItem item, string name) { throw null; } + public static string GetMetadataValueEscaped(Microsoft.Build.Evaluation.ProjectItemDefinition item, string name) { throw null; } + public static string GetMetadataValueEscaped(Microsoft.Build.Evaluation.ProjectMetadata metadatum) { throw null; } + public Microsoft.Build.Evaluation.ProjectProperty GetProperty(string name) { throw null; } + public string GetPropertyValue(string name) { throw null; } + public static string GetPropertyValueEscaped(Microsoft.Build.Evaluation.ProjectProperty property) { throw null; } + public void MarkDirty() { } + public void ReevaluateIfNecessary() { } + public bool RemoveGlobalProperty(string name) { throw null; } + public bool RemoveItem(Microsoft.Build.Evaluation.ProjectItem item) { throw null; } + public void RemoveItems(System.Collections.Generic.IEnumerable items) { } + public bool RemoveProperty(Microsoft.Build.Evaluation.ProjectProperty property) { throw null; } + public void Save() { } + public void Save(System.IO.TextWriter writer) { } + public void Save(string path) { } + public void Save(string path, System.Text.Encoding encoding) { } + public void Save(System.Text.Encoding encoding) { } + public void SaveLogicalProject(System.IO.TextWriter writer) { } + public bool SetGlobalProperty(string name, string escapedValue) { throw null; } + public Microsoft.Build.Evaluation.ProjectProperty SetProperty(string name, string unevaluatedValue) { throw null; } + } + public partial class ProjectChangedEventArgs : System.EventArgs + { + internal ProjectChangedEventArgs() { } + public Microsoft.Build.Evaluation.Project Project { get { throw null; } } + } + public partial class ProjectCollection : System.IDisposable + { + public ProjectCollection() { } + public ProjectCollection(Microsoft.Build.Evaluation.ToolsetDefinitionLocations toolsetLocations) { } + public ProjectCollection(System.Collections.Generic.IDictionary globalProperties) { } + public ProjectCollection(System.Collections.Generic.IDictionary globalProperties, System.Collections.Generic.IEnumerable loggers, Microsoft.Build.Evaluation.ToolsetDefinitionLocations toolsetDefinitionLocations) { } + public ProjectCollection(System.Collections.Generic.IDictionary globalProperties, System.Collections.Generic.IEnumerable loggers, System.Collections.Generic.IEnumerable remoteLoggers, Microsoft.Build.Evaluation.ToolsetDefinitionLocations toolsetDefinitionLocations, int maxNodeCount, bool onlyLogCriticalEvents) { } + public int Count { get { throw null; } } + public string DefaultToolsVersion { get { throw null; } set { } } + [System.MonoTODOAttribute] + public bool DisableMarkDirty { get { throw null; } set { } } + public static Microsoft.Build.Evaluation.ProjectCollection GlobalProjectCollection { get { throw null; } } + public System.Collections.Generic.IDictionary GlobalProperties { get { throw null; } } + [System.MonoTODOAttribute] + public Microsoft.Build.Execution.HostServices HostServices { get { throw null; } set { } } + [System.MonoTODOAttribute] + public bool IsBuildEnabled { get { throw null; } set { } } + public System.Collections.Generic.ICollection LoadedProjects { get { throw null; } } + public System.Collections.Generic.ICollection Loggers { get { throw null; } } + [System.MonoTODOAttribute] + public bool OnlyLogCriticalEvents { get { throw null; } set { } } + [System.MonoTODOAttribute] + public bool SkipEvaluation { get { throw null; } set { } } + public Microsoft.Build.Evaluation.ToolsetDefinitionLocations ToolsetLocations { get { throw null; } } + public System.Collections.Generic.ICollection Toolsets { get { throw null; } } + public static System.Version Version { get { throw null; } } + [System.MonoTODOAttribute("not fired yet")] + public event Microsoft.Build.Evaluation.ProjectCollection.ProjectAddedEventHandler ProjectAdded { add { } remove { } } + [System.MonoTODOAttribute("not fired yet")] + public event System.EventHandler ProjectChanged { add { } remove { } } + [System.MonoTODOAttribute("not fired yet")] + public event System.EventHandler ProjectCollectionChanged { add { } remove { } } + [System.MonoTODOAttribute("not fired yet")] + public event System.EventHandler ProjectXmlChanged { add { } remove { } } + public void AddProject(Microsoft.Build.Evaluation.Project project) { } + [System.MonoTODOAttribute("not verified at all")] + public void AddToolset(Microsoft.Build.Evaluation.Toolset toolset) { } + public void Dispose() { } + protected virtual void Dispose(bool disposing) { } + public static string Escape(string unescapedString) { throw null; } + public System.Collections.Generic.ICollection GetLoadedProjects(string fullPath) { throw null; } + public Microsoft.Build.Evaluation.Toolset GetToolset(string toolsVersion) { throw null; } + public Microsoft.Build.Evaluation.Project LoadProject(string fileName) { throw null; } + public Microsoft.Build.Evaluation.Project LoadProject(string fileName, System.Collections.Generic.IDictionary globalProperties, string toolsVersion) { throw null; } + public Microsoft.Build.Evaluation.Project LoadProject(string fileName, string toolsVersion) { throw null; } + public Microsoft.Build.Evaluation.Project LoadProject(System.Xml.XmlReader xmlReader) { throw null; } + public Microsoft.Build.Evaluation.Project LoadProject(System.Xml.XmlReader xmlReader, System.Collections.Generic.IDictionary globalProperties, string toolsVersion) { throw null; } + public Microsoft.Build.Evaluation.Project LoadProject(System.Xml.XmlReader xmlReader, string toolsVersion) { throw null; } + public void RegisterLogger(Microsoft.Build.Framework.ILogger logger) { } + public void RegisterLoggers(System.Collections.Generic.IEnumerable loggers) { } + [System.MonoTODOAttribute("not verified at all")] + public void RemoveAllToolsets() { } + public static string Unescape(string escapedString) { throw null; } + public void UnloadAllProjects() { } + [System.MonoTODOAttribute("Not verified at all")] + public void UnloadProject(Microsoft.Build.Construction.ProjectRootElement projectRootElement) { } + [System.MonoTODOAttribute("Not verified at all")] + public void UnloadProject(Microsoft.Build.Evaluation.Project project) { } + public delegate void ProjectAddedEventHandler(object sender, Microsoft.Build.Evaluation.ProjectCollection.ProjectAddedToProjectCollectionEventArgs e); + public partial class ProjectAddedToProjectCollectionEventArgs : System.EventArgs + { + public ProjectAddedToProjectCollectionEventArgs(Microsoft.Build.Construction.ProjectRootElement element) { } + public Microsoft.Build.Construction.ProjectRootElement ProjectRootElement { get { throw null; } } + } + } + public partial class ProjectCollectionChangedEventArgs : System.EventArgs + { + public ProjectCollectionChangedEventArgs(Microsoft.Build.Evaluation.ProjectCollectionChangedState state) { } + public Microsoft.Build.Evaluation.ProjectCollectionChangedState State { get { throw null; } } + } + public enum ProjectCollectionChangedState + { + DefaultToolsVersion = 0, + DisableMarkDirty = 1, + GlobalProperties = 2, + HostServices = 3, + IsBuildEnabled = 4, + Loggers = 5, + OnlyLogCriticalEvents = 6, + SkipEvaluation = 7, + Toolsets = 8, + } + [System.Diagnostics.DebuggerDisplayAttribute("{ItemType}={EvaluatedInclude} [{UnevaluatedInclude}] #DirectMetadata={DirectMetadataCount}")] + public partial class ProjectItem + { + internal ProjectItem() { } + public System.Collections.Generic.IEnumerable DirectMetadata { get { throw null; } } + public int DirectMetadataCount { get { throw null; } } + public string EvaluatedInclude { get { throw null; } } + public bool IsImported { get { throw null; } } + public string ItemType { get { throw null; } set { } } + public System.Collections.Generic.ICollection Metadata { get { throw null; } } + public int MetadataCount { get { throw null; } } + public Microsoft.Build.Evaluation.Project Project { get { throw null; } } + public string UnevaluatedInclude { get { throw null; } set { } } + public Microsoft.Build.Construction.ProjectItemElement Xml { get { throw null; } } + public Microsoft.Build.Evaluation.ProjectMetadata GetMetadata(string name) { throw null; } + public string GetMetadataValue(string name) { throw null; } + public bool HasMetadata(string name) { throw null; } + public bool RemoveMetadata(string name) { throw null; } + public void Rename(string name) { } + public Microsoft.Build.Evaluation.ProjectMetadata SetMetadataValue(string name, string unevaluatedValue) { throw null; } + } + public partial class ProjectItemDefinition + { + internal ProjectItemDefinition() { } + public string ItemType { get { throw null; } } + public System.Collections.Generic.IEnumerable Metadata { get { throw null; } } + public int MetadataCount { get { throw null; } } + public Microsoft.Build.Evaluation.Project Project { get { throw null; } } + } + [System.FlagsAttribute] + public enum ProjectLoadSettings + { + Default = 0, + IgnoreMissingImports = 1, + RecordDuplicateButNotCircularImports = 2, + RejectCircularImports = 4, + } + public partial class ProjectMetadata + { + internal ProjectMetadata() { } + public string EvaluatedValue { get { throw null; } } + public bool IsImported { get { throw null; } } + public string ItemType { get { throw null; } } + public string Name { get { throw null; } } + public Microsoft.Build.Evaluation.ProjectMetadata Predecessor { get { throw null; } } + public Microsoft.Build.Evaluation.Project Project { get { throw null; } } + public string UnevaluatedValue { get { throw null; } } + public Microsoft.Build.Construction.ProjectMetadataElement Xml { get { throw null; } } + } + public abstract partial class ProjectProperty + { + internal ProjectProperty() { } + public string EvaluatedValue { get { throw null; } } + public abstract bool IsEnvironmentProperty { get; } + public abstract bool IsGlobalProperty { get; } + [System.MonoTODOAttribute] + public abstract bool IsImported { get; } + public abstract bool IsReservedProperty { get; } + public abstract string Name { get; } + public abstract Microsoft.Build.Evaluation.ProjectProperty Predecessor { get; } + public Microsoft.Build.Evaluation.Project Project { get { throw null; } } + public abstract string UnevaluatedValue { get; set; } + public abstract Microsoft.Build.Construction.ProjectPropertyElement Xml { get; } + } + public partial class ProjectXmlChangedEventArgs : System.EventArgs + { + internal ProjectXmlChangedEventArgs() { } + public Microsoft.Build.Construction.ProjectRootElement ProjectXml { get { throw null; } } + public string Reason { get { throw null; } } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + public partial struct ResolvedImport + { + public Microsoft.Build.Construction.ProjectRootElement ImportedProject { get { throw null; } } + public Microsoft.Build.Construction.ProjectImportElement ImportingElement { get { throw null; } } + public bool IsImported { get { throw null; } } + } + public partial class SubToolset + { + internal SubToolset() { } + public System.Collections.Generic.IDictionary Properties { get { throw null; } } + public string SubToolsetVersion { get { throw null; } } + } + public partial class Toolset + { + public Toolset(string toolsVersion, string toolsPath, Microsoft.Build.Evaluation.ProjectCollection projectCollection, string msbuildOverrideTasksPath) { } + public Toolset(string toolsVersion, string toolsPath, System.Collections.Generic.IDictionary buildProperties, Microsoft.Build.Evaluation.ProjectCollection projectCollection, System.Collections.Generic.IDictionary subToolsets, string msbuildOverrideTasksPath) { } + public Toolset(string toolsVersion, string toolsPath, System.Collections.Generic.IDictionary buildProperties, Microsoft.Build.Evaluation.ProjectCollection projectCollection, string msbuildOverrideTasksPath) { } + public string DefaultSubToolsetVersion { get { throw null; } } + public System.Collections.Generic.IDictionary Properties { get { throw null; } } + public System.Collections.Generic.IDictionary SubToolsets { get { throw null; } } + public string ToolsPath { get { throw null; } } + public string ToolsVersion { get { throw null; } } + } + [System.FlagsAttribute] + public enum ToolsetDefinitionLocations + { + ConfigurationFile = 1, + None = 0, + Registry = 2, + } +} +namespace Microsoft.Build.Exceptions +{ + public partial class BuildAbortedException : System.Exception + { + public BuildAbortedException() { } + protected BuildAbortedException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } + public BuildAbortedException(string message) { } + public BuildAbortedException(string message, System.Exception innerException) { } + public string ErrorCode { get { throw null; } } + public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } + } + public partial class InternalLoggerException : System.Exception + { + public InternalLoggerException() { } + public InternalLoggerException(string message) { } + public InternalLoggerException(string message, System.Exception innerException) { } + public Microsoft.Build.Framework.BuildEventArgs BuildEventArgs { get { throw null; } } + public string ErrorCode { get { throw null; } } + public string HelpKeyword { get { throw null; } } + public bool InitializationException { get { throw null; } } + public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } + } + [System.SerializableAttribute] + public sealed partial class InvalidProjectFileException : System.Exception + { + public InvalidProjectFileException() { } + public InvalidProjectFileException(string message) { } + public InvalidProjectFileException(string message, System.Exception innerException) { } + public InvalidProjectFileException(string projectFile, int lineNumber, int columnNumber, int endLineNumber, int endColumnNumber, string message, string errorSubcategory, string errorCode, string helpKeyword) { } + public string BaseMessage { get { throw null; } } + public int ColumnNumber { get { throw null; } } + public int EndColumnNumber { get { throw null; } } + public int EndLineNumber { get { throw null; } } + public string ErrorCode { get { throw null; } } + public string ErrorSubcategory { get { throw null; } } + public bool HasBeenLogged { get { throw null; } } + public string HelpKeyword { get { throw null; } } + public int LineNumber { get { throw null; } } + public override string Message { get { throw null; } } + public string ProjectFile { get { throw null; } } + public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } + } + public partial class InvalidToolsetDefinitionException : System.Exception + { + public InvalidToolsetDefinitionException() { } + protected InvalidToolsetDefinitionException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } + public InvalidToolsetDefinitionException(string message) { } + public InvalidToolsetDefinitionException(string message, System.Exception innerException) { } + public string ErrorCode { get { throw null; } } + public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } + } +} +namespace Microsoft.Build.Execution +{ + public partial class BuildManager + { + public BuildManager() { } + public BuildManager(string hostName) { } + public static Microsoft.Build.Execution.BuildManager DefaultBuildManager { get { throw null; } } + public void BeginBuild(Microsoft.Build.Execution.BuildParameters parameters) { } + public Microsoft.Build.Execution.BuildResult Build(Microsoft.Build.Execution.BuildParameters parameters, Microsoft.Build.Execution.BuildRequestData requestData) { throw null; } + public Microsoft.Build.Execution.BuildResult BuildRequest(Microsoft.Build.Execution.BuildRequestData requestData) { throw null; } + public void CancelAllSubmissions() { } + public void Dispose() { } + public void EndBuild() { } + ~BuildManager() { } + public Microsoft.Build.Execution.ProjectInstance GetProjectInstanceForBuild(Microsoft.Build.Evaluation.Project project) { throw null; } + public Microsoft.Build.Execution.BuildSubmission PendBuildRequest(Microsoft.Build.Execution.BuildRequestData requestData) { throw null; } + public void ResetCaches() { } + } + public partial class BuildParameters + { + public BuildParameters() { } + public BuildParameters(Microsoft.Build.Evaluation.ProjectCollection projectCollection) { } + [System.MonoTODOAttribute] + public System.Threading.ThreadPriority BuildThreadPriority { get { throw null; } set { } } + [System.MonoTODOAttribute] + public System.Globalization.CultureInfo Culture { get { throw null; } set { } } + public string DefaultToolsVersion { get { throw null; } set { } } + [System.MonoTODOAttribute] + public bool DetailedSummary { get { throw null; } set { } } + public bool EnableNodeReuse { get { throw null; } set { } } + [System.MonoTODOAttribute] + public System.Collections.Generic.IDictionary EnvironmentProperties { get { throw null; } } + [System.MonoTODOAttribute] + public System.Collections.Generic.IEnumerable ForwardingLoggers { get { throw null; } set { } } + [System.MonoTODOAttribute] + public System.Collections.Generic.IDictionary GlobalProperties { get { throw null; } set { } } + public Microsoft.Build.Execution.HostServices HostServices { get { throw null; } set { } } + [System.MonoTODOAttribute] + public bool LegacyThreadingSemantics { get { throw null; } set { } } + [System.MonoTODOAttribute] + public System.Collections.Generic.IEnumerable Loggers { get { throw null; } set { } } + [System.MonoTODOAttribute] + public int MaxNodeCount { get { throw null; } set { } } + [System.MonoTODOAttribute] + public int MemoryUseLimit { get { throw null; } set { } } + [System.MonoTODOAttribute] + public string NodeExeLocation { get { throw null; } set { } } + [System.MonoTODOAttribute] + public bool OnlyLogCriticalEvents { get { throw null; } set { } } + [System.MonoTODOAttribute] + public bool ResetCaches { get { throw null; } set { } } + [System.MonoTODOAttribute] + public bool SaveOperatingEnvironment { get { throw null; } set { } } + [System.MonoTODOAttribute] + public Microsoft.Build.Evaluation.ToolsetDefinitionLocations ToolsetDefinitionLocations { get { throw null; } set { } } + [System.MonoTODOAttribute] + public System.Collections.Generic.ICollection Toolsets { get { throw null; } } + [System.MonoTODOAttribute] + public System.Globalization.CultureInfo UICulture { get { throw null; } set { } } + [System.MonoTODOAttribute] + public bool UseSynchronousLogging { get { throw null; } set { } } + public Microsoft.Build.Execution.BuildParameters Clone() { throw null; } + public Microsoft.Build.Evaluation.Toolset GetToolset(string toolsVersion) { throw null; } + } + public partial class BuildRequestData + { + public BuildRequestData(Microsoft.Build.Execution.ProjectInstance projectInstance, string[] targetsToBuild) { } + public BuildRequestData(Microsoft.Build.Execution.ProjectInstance projectInstance, string[] targetsToBuild, Microsoft.Build.Execution.HostServices hostServices) { } + public BuildRequestData(Microsoft.Build.Execution.ProjectInstance projectInstance, string[] targetsToBuild, Microsoft.Build.Execution.HostServices hostServices, Microsoft.Build.Execution.BuildRequestDataFlags flags) { } + public BuildRequestData(string projectFullPath, System.Collections.Generic.IDictionary globalProperties, string toolsVersion, string[] targetsToBuild, Microsoft.Build.Execution.HostServices hostServices) { } + public BuildRequestData(string projectFullPath, System.Collections.Generic.IDictionary globalProperties, string toolsVersion, string[] targetsToBuild, Microsoft.Build.Execution.HostServices hostServices, Microsoft.Build.Execution.BuildRequestDataFlags flags) { } + public string ExplicitlySpecifiedToolsVersion { get { throw null; } } + [System.MonoTODOAttribute("unused")] + public Microsoft.Build.Execution.BuildRequestDataFlags Flags { get { throw null; } } + [System.MonoTODOAttribute("unused")] + public Microsoft.Build.Execution.HostServices HostServices { get { throw null; } } + public string ProjectFullPath { get { throw null; } } + [System.MonoTODOAttribute("unused")] + public Microsoft.Build.Execution.ProjectInstance ProjectInstance { get { throw null; } } + [System.MonoTODOAttribute] + public System.Collections.Generic.IEnumerable PropertiesToTransfer { get { throw null; } } + [System.MonoTODOAttribute] + public System.Collections.Generic.ICollection TargetNames { get { throw null; } } + } + [System.FlagsAttribute] + public enum BuildRequestDataFlags + { + None = 0, + ReplaceExistingProjectInstance = 1, + } + public partial class BuildResult + { + public BuildResult() { } + public bool CircularDependency { get { throw null; } } + public int ConfigurationId { get { throw null; } } + public System.Exception Exception { get { throw null; } set { } } + public int GlobalRequestId { get { throw null; } } + public Microsoft.Build.Execution.ITargetResult this[string target] { get { throw null; } } + public int NodeRequestId { get { throw null; } } + public Microsoft.Build.Execution.BuildResultCode OverallResult { get { throw null; } } + public int ParentGlobalRequestId { get { throw null; } } + public System.Collections.Generic.IDictionary ResultsByTarget { get { throw null; } } + public int SubmissionId { get { throw null; } } + public void AddResultsForTarget(string target, Microsoft.Build.Execution.TargetResult result) { } + public bool HasResultsForTarget(string target) { throw null; } + public void MergeResults(Microsoft.Build.Execution.BuildResult results) { } + } + public enum BuildResultCode + { + Failure = 1, + Success = 0, + } + public partial class BuildSubmission + { + internal BuildSubmission() { } + public object AsyncContext { get { throw null; } } + public Microsoft.Build.Execution.BuildManager BuildManager { get { throw null; } } + public Microsoft.Build.Execution.BuildResult BuildResult { get { throw null; } set { } } + public bool IsCompleted { get { throw null; } } + public int SubmissionId { get { throw null; } } + public System.Threading.WaitHandle WaitHandle { get { throw null; } } + public Microsoft.Build.Execution.BuildResult Execute() { throw null; } + public void ExecuteAsync(Microsoft.Build.Execution.BuildSubmissionCompleteCallback callback, object context) { } + } + public delegate void BuildSubmissionCompleteCallback(Microsoft.Build.Execution.BuildSubmission submission); + public partial class HostServices + { + public HostServices() { } + public Microsoft.Build.Framework.ITaskHost GetHostObject(string projectFile, string targetName, string taskName) { throw null; } + public Microsoft.Build.Execution.NodeAffinity GetNodeAffinity(string projectFile) { throw null; } + public void OnRenameProject(string oldFullPath, string newFullPath) { } + public void RegisterHostObject(string projectFile, string targetName, string taskName, Microsoft.Build.Framework.ITaskHost hostObject) { } + public void SetNodeAffinity(string projectFile, Microsoft.Build.Execution.NodeAffinity nodeAffinity) { } + public void UnregisterProject(string projectFullPath) { } + } + public partial interface ITargetResult + { + System.Exception Exception { get; } + Microsoft.Build.Framework.ITaskItem[] Items { get; } + Microsoft.Build.Execution.TargetResultCode ResultCode { get; } + } + public enum NodeAffinity + { + Any = 2, + InProc = 0, + OutOfProc = 1, + } + public partial class ProjectInstance + { + public ProjectInstance(Microsoft.Build.Construction.ProjectRootElement xml) { } + public ProjectInstance(Microsoft.Build.Construction.ProjectRootElement xml, System.Collections.Generic.IDictionary globalProperties, string toolsVersion, Microsoft.Build.Evaluation.ProjectCollection projectCollection) { } + public ProjectInstance(string projectFile) { } + public ProjectInstance(string projectFile, System.Collections.Generic.IDictionary globalProperties, string toolsVersion) { } + public ProjectInstance(string projectFile, System.Collections.Generic.IDictionary globalProperties, string toolsVersion, Microsoft.Build.Evaluation.ProjectCollection projectCollection) { } + public System.Collections.Generic.List DefaultTargets { get { throw null; } } + public string Directory { get { throw null; } } + public string FullPath { get { throw null; } } + public System.Collections.Generic.IDictionary GlobalProperties { get { throw null; } } + public System.Collections.Generic.List InitialTargets { get { throw null; } } + public bool IsImmutable { get { throw null; } } + public System.Collections.Generic.IDictionary ItemDefinitions { get { throw null; } } + public System.Collections.Generic.ICollection Items { get { throw null; } } + public System.Collections.Generic.ICollection ItemTypes { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation ProjectFileLocation { get { throw null; } } + public System.Collections.Generic.ICollection Properties { get { throw null; } } + public System.Collections.Generic.IDictionary Targets { get { throw null; } } + public string ToolsVersion { get { throw null; } } + public Microsoft.Build.Execution.ProjectItemInstance AddItem(string itemType, string evaluatedInclude) { throw null; } + public Microsoft.Build.Execution.ProjectItemInstance AddItem(string itemType, string evaluatedInclude, System.Collections.Generic.IEnumerable> metadata) { throw null; } + public bool Build() { throw null; } + public bool Build(System.Collections.Generic.IEnumerable loggers) { throw null; } + public bool Build(System.Collections.Generic.IEnumerable loggers, System.Collections.Generic.IEnumerable remoteLoggers) { throw null; } + public bool Build(string target, System.Collections.Generic.IEnumerable loggers) { throw null; } + public bool Build(string target, System.Collections.Generic.IEnumerable loggers, System.Collections.Generic.IEnumerable remoteLoggers) { throw null; } + public bool Build(string[] targets, System.Collections.Generic.IEnumerable loggers) { throw null; } + public bool Build(string[] targets, System.Collections.Generic.IEnumerable loggers, out System.Collections.Generic.IDictionary targetOutputs) { targetOutputs = default(System.Collections.Generic.IDictionary); throw null; } + public bool Build(string[] targets, System.Collections.Generic.IEnumerable loggers, System.Collections.Generic.IEnumerable remoteLoggers) { throw null; } + public bool Build(string[] targets, System.Collections.Generic.IEnumerable loggers, System.Collections.Generic.IEnumerable remoteLoggers, out System.Collections.Generic.IDictionary targetOutputs) { targetOutputs = default(System.Collections.Generic.IDictionary); throw null; } + public Microsoft.Build.Execution.ProjectInstance DeepCopy() { throw null; } + public Microsoft.Build.Execution.ProjectInstance DeepCopy(bool isImmutable) { throw null; } + public bool EvaluateCondition(string condition) { throw null; } + public string ExpandString(string unexpandedValue) { throw null; } + public static string GetEvaluatedItemIncludeEscaped(Microsoft.Build.Execution.ProjectItemDefinitionInstance item) { throw null; } + public static string GetEvaluatedItemIncludeEscaped(Microsoft.Build.Execution.ProjectItemInstance item) { throw null; } + public System.Collections.Generic.ICollection GetItems(string itemType) { throw null; } + public System.Collections.Generic.IEnumerable GetItemsByItemTypeAndEvaluatedInclude(string itemType, string evaluatedInclude) { throw null; } + public static string GetMetadataValueEscaped(Microsoft.Build.Execution.ProjectItemDefinitionInstance item, string name) { throw null; } + public static string GetMetadataValueEscaped(Microsoft.Build.Execution.ProjectItemInstance item, string name) { throw null; } + public static string GetMetadataValueEscaped(Microsoft.Build.Execution.ProjectMetadataInstance metadatum) { throw null; } + public Microsoft.Build.Execution.ProjectPropertyInstance GetProperty(string name) { throw null; } + public string GetPropertyValue(string name) { throw null; } + public static string GetPropertyValueEscaped(Microsoft.Build.Execution.ProjectPropertyInstance property) { throw null; } + public bool RemoveItem(Microsoft.Build.Execution.ProjectItemInstance item) { throw null; } + public bool RemoveProperty(string name) { throw null; } + public Microsoft.Build.Execution.ProjectPropertyInstance SetProperty(string name, string evaluatedValue) { throw null; } + public Microsoft.Build.Construction.ProjectRootElement ToProjectRootElement() { throw null; } + public void UpdateStateFrom(Microsoft.Build.Execution.ProjectInstance projectState) { } + } + public partial class ProjectItemDefinitionInstance + { + internal ProjectItemDefinitionInstance() { } + public string ItemType { get { throw null; } } + public System.Collections.Generic.ICollection Metadata { get { throw null; } } + public int MetadataCount { get { throw null; } } + public System.Collections.Generic.IEnumerable MetadataNames { get { throw null; } } + } + public sealed partial class ProjectItemGroupTaskInstance : Microsoft.Build.Execution.ProjectTargetInstanceChild + { + internal ProjectItemGroupTaskInstance() { } + public override string Condition { get { throw null; } } + public override Microsoft.Build.Construction.ElementLocation ConditionLocation { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation ExecuteTargetsLocation { get { throw null; } } + public System.Collections.Generic.ICollection Items { get { throw null; } } + public override Microsoft.Build.Construction.ElementLocation Location { get { throw null; } } + } + public partial class ProjectItemGroupTaskItemInstance + { + internal ProjectItemGroupTaskItemInstance() { } + public string Condition { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation ConditionLocation { get { throw null; } } + public string Exclude { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation ExcludeLocation { get { throw null; } } + public string Include { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation IncludeLocation { get { throw null; } } + public string ItemType { get { throw null; } } + public string KeepDuplicates { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation KeepDuplicatesLocation { get { throw null; } } + public string KeepMetadata { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation KeepMetadataLocation { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation Location { get { throw null; } } + public System.Collections.Generic.ICollection Metadata { get { throw null; } } + public string Remove { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation RemoveLocation { get { throw null; } } + public string RemoveMetadata { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation RemoveMetadataLocation { get { throw null; } } + } + public sealed partial class ProjectItemGroupTaskMetadataInstance + { + internal ProjectItemGroupTaskMetadataInstance() { } + public string Condition { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation ConditionLocation { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation Location { get { throw null; } } + public string Name { get { throw null; } } + public string Value { get { throw null; } } + } + public partial class ProjectItemInstance : Microsoft.Build.Framework.ITaskItem, Microsoft.Build.Framework.ITaskItem2 + { + internal ProjectItemInstance() { } + public int DirectMetadataCount { get { throw null; } } + public string EvaluatedInclude { get { throw null; } set { } } + public string ItemType { get { throw null; } } + public System.Collections.Generic.IEnumerable Metadata { get { throw null; } } + public int MetadataCount { get { throw null; } } + public System.Collections.Generic.ICollection MetadataNames { get { throw null; } } + string Microsoft.Build.Framework.ITaskItem.ItemSpec { get { throw null; } set { } } + int Microsoft.Build.Framework.ITaskItem.MetadataCount { get { throw null; } } + System.Collections.ICollection Microsoft.Build.Framework.ITaskItem.MetadataNames { get { throw null; } } + string Microsoft.Build.Framework.ITaskItem2.EvaluatedIncludeEscaped { get { throw null; } set { } } + public Microsoft.Build.Execution.ProjectInstance Project { get { throw null; } } + public Microsoft.Build.Execution.ProjectMetadataInstance GetMetadata(string name) { throw null; } + public string GetMetadataValue(string name) { throw null; } + public bool HasMetadata(string name) { throw null; } + System.Collections.IDictionary Microsoft.Build.Framework.ITaskItem.CloneCustomMetadata() { throw null; } + void Microsoft.Build.Framework.ITaskItem.CopyMetadataTo(Microsoft.Build.Framework.ITaskItem destinationItem) { } + string Microsoft.Build.Framework.ITaskItem.GetMetadata(string metadataName) { throw null; } + void Microsoft.Build.Framework.ITaskItem.RemoveMetadata(string metadataName) { } + void Microsoft.Build.Framework.ITaskItem.SetMetadata(string metadataName, string metadataValue) { } + System.Collections.IDictionary Microsoft.Build.Framework.ITaskItem2.CloneCustomMetadataEscaped() { throw null; } + string Microsoft.Build.Framework.ITaskItem2.GetMetadataValueEscaped(string metadataName) { throw null; } + void Microsoft.Build.Framework.ITaskItem2.SetMetadataValueLiteral(string metadataName, string metadataValue) { } + public void RemoveMetadata(string metadataName) { } + public void SetMetadata(System.Collections.Generic.IEnumerable> metadataDictionary) { } + public Microsoft.Build.Execution.ProjectMetadataInstance SetMetadata(string name, string evaluatedValue) { throw null; } + } + public partial class ProjectMetadataInstance + { + internal ProjectMetadataInstance() { } + public string EvaluatedValue { get { throw null; } } + public string Name { get { throw null; } } + public Microsoft.Build.Execution.ProjectMetadataInstance DeepClone() { throw null; } + public override string ToString() { throw null; } + } + public partial class ProjectOnErrorInstance : Microsoft.Build.Execution.ProjectTargetInstanceChild + { + internal ProjectOnErrorInstance() { } + public override string Condition { get { throw null; } } + public override Microsoft.Build.Construction.ElementLocation ConditionLocation { get { throw null; } } + public string ExecuteTargets { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation ExecuteTargetsLocation { get { throw null; } } + public override Microsoft.Build.Construction.ElementLocation Location { get { throw null; } } + } + public sealed partial class ProjectPropertyGroupTaskInstance : Microsoft.Build.Execution.ProjectTargetInstanceChild + { + internal ProjectPropertyGroupTaskInstance() { } + public override string Condition { get { throw null; } } + public override Microsoft.Build.Construction.ElementLocation ConditionLocation { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation ExecuteTargetsLocation { get { throw null; } } + public override Microsoft.Build.Construction.ElementLocation Location { get { throw null; } } + public System.Collections.Generic.ICollection Properties { get { throw null; } } + } + public partial class ProjectPropertyGroupTaskPropertyInstance + { + internal ProjectPropertyGroupTaskPropertyInstance() { } + public string Condition { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation ConditionLocation { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation Location { get { throw null; } } + public string Name { get { throw null; } } + public string Value { get { throw null; } } + } + public partial class ProjectPropertyInstance + { + internal ProjectPropertyInstance() { } + public string EvaluatedValue { get { throw null; } set { } } + public virtual bool IsImmutable { get { throw null; } } + public string Name { get { throw null; } } + public override string ToString() { throw null; } + } + public sealed partial class ProjectTargetInstance + { + internal ProjectTargetInstance() { } + public Microsoft.Build.Construction.ElementLocation AfterTargetsLocation { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation BeforeTargetsLocation { get { throw null; } } + public System.Collections.Generic.IList Children { get { throw null; } } + public string Condition { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation ConditionLocation { get { throw null; } } + public string DependsOnTargets { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation DependsOnTargetsLocation { get { throw null; } } + public string FullPath { get { throw null; } } + public string Inputs { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation InputsLocation { get { throw null; } } + public string KeepDuplicateOutputs { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation KeepDuplicateOutputsLocation { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation Location { get { throw null; } } + public string Name { get { throw null; } } + public System.Collections.Generic.IList OnErrorChildren { get { throw null; } } + public string Outputs { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation OutputsLocation { get { throw null; } } + public string Returns { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation ReturnsLocation { get { throw null; } } + public System.Collections.Generic.ICollection Tasks { get { throw null; } } + } + public abstract partial class ProjectTargetInstanceChild + { + protected ProjectTargetInstanceChild() { } + public abstract string Condition { get; } + public abstract Microsoft.Build.Construction.ElementLocation ConditionLocation { get; } + public string FullPath { get { throw null; } } + public abstract Microsoft.Build.Construction.ElementLocation Location { get; } + } + public sealed partial class ProjectTaskInstance : Microsoft.Build.Execution.ProjectTargetInstanceChild + { + internal ProjectTaskInstance() { } + public override string Condition { get { throw null; } } + public override Microsoft.Build.Construction.ElementLocation ConditionLocation { get { throw null; } } + public string ContinueOnError { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation ContinueOnErrorLocation { get { throw null; } } + public override Microsoft.Build.Construction.ElementLocation Location { get { throw null; } } + public string MSBuildArchitecture { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation MSBuildArchitectureLocation { get { throw null; } } + public string MSBuildRuntime { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation MSBuildRuntimeLocation { get { throw null; } } + public string Name { get { throw null; } } + public System.Collections.Generic.IList Outputs { get { throw null; } } + public System.Collections.Generic.IDictionary Parameters { get { throw null; } } + } + public abstract partial class ProjectTaskInstanceChild + { + protected ProjectTaskInstanceChild() { } + public abstract string Condition { get; } + public abstract Microsoft.Build.Construction.ElementLocation ConditionLocation { get; } + public abstract Microsoft.Build.Construction.ElementLocation Location { get; } + public abstract Microsoft.Build.Construction.ElementLocation TaskParameterLocation { get; } + } + public partial class ProjectTaskOutputItemInstance : Microsoft.Build.Execution.ProjectTaskInstanceChild + { + internal ProjectTaskOutputItemInstance() { } + public override string Condition { get { throw null; } } + public override Microsoft.Build.Construction.ElementLocation ConditionLocation { get { throw null; } } + public string ItemType { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation ItemTypeLocation { get { throw null; } } + public override Microsoft.Build.Construction.ElementLocation Location { get { throw null; } } + public string TaskParameter { get { throw null; } } + public override Microsoft.Build.Construction.ElementLocation TaskParameterLocation { get { throw null; } } + } + public partial class ProjectTaskOutputPropertyInstance : Microsoft.Build.Execution.ProjectTaskInstanceChild + { + internal ProjectTaskOutputPropertyInstance() { } + public override string Condition { get { throw null; } } + public override Microsoft.Build.Construction.ElementLocation ConditionLocation { get { throw null; } } + public override Microsoft.Build.Construction.ElementLocation Location { get { throw null; } } + public string PropertyName { get { throw null; } } + public Microsoft.Build.Construction.ElementLocation PropertyNameLocation { get { throw null; } } + public string TaskParameter { get { throw null; } } + public override Microsoft.Build.Construction.ElementLocation TaskParameterLocation { get { throw null; } } + } + public partial class TargetResult : Microsoft.Build.Execution.ITargetResult + { + internal TargetResult() { } + public System.Exception Exception { get { throw null; } } + public Microsoft.Build.Framework.ITaskItem[] Items { get { throw null; } } + public Microsoft.Build.Execution.TargetResultCode ResultCode { get { throw null; } } + } + public enum TargetResultCode : byte + { + Failure = (byte)2, + Skipped = (byte)0, + Success = (byte)1, + } +} +namespace Microsoft.Build.Internal +{ + public enum NodeEngineShutdownReason + { + BuildComplete = 0, + BuildCompleteReuse = 1, + ConnectionFailed = 2, + Error = 3, + } + public partial class OutOfProcNode + { + public OutOfProcNode() { } + public Microsoft.Build.Internal.NodeEngineShutdownReason Run(out System.Exception shutdownException) { shutdownException = default(System.Exception); throw null; } + } +} +namespace Microsoft.Build.Logging +{ + public delegate void ColorResetter(); + public delegate void ColorSetter(System.ConsoleColor color); + public partial class ConfigurableForwardingLogger : Microsoft.Build.Framework.IForwardingLogger, Microsoft.Build.Framework.ILogger, Microsoft.Build.Framework.INodeLogger + { + public ConfigurableForwardingLogger() { } + public Microsoft.Build.Framework.IEventRedirector BuildEventRedirector { get { throw null; } set { } } + public int NodeId { get { throw null; } set { } } + public string Parameters { get { throw null; } set { } } + public Microsoft.Build.Framework.LoggerVerbosity Verbosity { get { throw null; } set { } } + public void Initialize(Microsoft.Build.Framework.IEventSource eventSource) { } + public void Initialize(Microsoft.Build.Framework.IEventSource eventSource, int nodeCount) { } + public void Shutdown() { } + } + public partial class ConsoleLogger : Microsoft.Build.Framework.ILogger + { + public ConsoleLogger() { } + public ConsoleLogger(Microsoft.Build.Framework.LoggerVerbosity verbosity) { } + public ConsoleLogger(Microsoft.Build.Framework.LoggerVerbosity verbosity, Microsoft.Build.Logging.WriteHandler write, Microsoft.Build.Logging.ColorSetter colorSet, Microsoft.Build.Logging.ColorResetter colorReset) { } + public string Parameters { get { throw null; } set { } } + public bool ShowSummary { get { throw null; } set { } } + public bool SkipProjectStartedText { get { throw null; } set { } } + public Microsoft.Build.Framework.LoggerVerbosity Verbosity { get { throw null; } set { } } + protected Microsoft.Build.Logging.WriteHandler WriteHandler { get { throw null; } set { } } + public void ApplyParameter(string parameterName, string parameterValue) { } + public void BuildFinishedHandler(object sender, Microsoft.Build.Framework.BuildFinishedEventArgs e) { } + public void BuildStartedHandler(object sender, Microsoft.Build.Framework.BuildStartedEventArgs e) { } + [System.MonoTODOAttribute] + public void CustomEventHandler(object sender, Microsoft.Build.Framework.CustomBuildEventArgs e) { } + public void ErrorHandler(object sender, Microsoft.Build.Framework.BuildErrorEventArgs e) { } + public virtual void Initialize(Microsoft.Build.Framework.IEventSource eventSource) { } + public void MessageHandler(object sender, Microsoft.Build.Framework.BuildMessageEventArgs e) { } + public void ProjectFinishedHandler(object sender, Microsoft.Build.Framework.ProjectFinishedEventArgs e) { } + public void ProjectStartedHandler(object sender, Microsoft.Build.Framework.ProjectStartedEventArgs e) { } + public virtual void Shutdown() { } + public void TargetFinishedHandler(object sender, Microsoft.Build.Framework.TargetFinishedEventArgs e) { } + public void TargetStartedHandler(object sender, Microsoft.Build.Framework.TargetStartedEventArgs e) { } + public void TaskFinishedHandler(object sender, Microsoft.Build.Framework.TaskFinishedEventArgs e) { } + public void TaskStartedHandler(object sender, Microsoft.Build.Framework.TaskStartedEventArgs e) { } + public void WarningHandler(object sender, Microsoft.Build.Framework.BuildWarningEventArgs e) { } + } + public partial class FileLogger : Microsoft.Build.Logging.ConsoleLogger + { + public FileLogger() { } + public override void Initialize(Microsoft.Build.Framework.IEventSource eventSource) { } + public override void Shutdown() { } + } + public partial class ForwardingLoggerRecord + { + public ForwardingLoggerRecord(Microsoft.Build.Framework.ILogger centralLogger, Microsoft.Build.Logging.LoggerDescription forwardingLoggerDescription) { } + public Microsoft.Build.Framework.ILogger CentralLogger { get { throw null; } } + public Microsoft.Build.Logging.LoggerDescription ForwardingLoggerDescription { get { throw null; } } + } + public partial class LoggerDescription + { + public LoggerDescription(string loggerClassName, string loggerAssemblyName, string loggerAssemblyFile, string loggerSwitchParameters, Microsoft.Build.Framework.LoggerVerbosity verbosity) { } + public string LoggerSwitchParameters { get { throw null; } } + public Microsoft.Build.Framework.LoggerVerbosity Verbosity { get { throw null; } } + public Microsoft.Build.Framework.ILogger CreateLogger() { throw null; } + } + public delegate void WriteHandler(string message); +} +namespace System +{ + [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)] + internal partial class MonoDocumentationNoteAttribute : System.MonoTODOAttribute + { + public MonoDocumentationNoteAttribute(string comment) { } + } + [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)] + internal partial class MonoExtensionAttribute : System.MonoTODOAttribute + { + public MonoExtensionAttribute(string comment) { } + } + [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)] + internal partial class MonoInternalNoteAttribute : System.MonoTODOAttribute + { + public MonoInternalNoteAttribute(string comment) { } + } + [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)] + internal partial class MonoLimitationAttribute : System.MonoTODOAttribute + { + public MonoLimitationAttribute(string comment) { } + } + [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)] + internal partial class MonoNotSupportedAttribute : System.MonoTODOAttribute + { + public MonoNotSupportedAttribute(string comment) { } + } + [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)] + internal partial class MonoTODOAttribute : System.Attribute + { + public MonoTODOAttribute() { } + public MonoTODOAttribute(string comment) { } + public string Comment { get { throw null; } } + } +} diff --git a/external/api-snapshot/profiles/net_4_x/Microsoft.Build.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/Microsoft.Build.cs.REMOVED.git-id deleted file mode 100644 index 2655bc3c63..0000000000 --- a/external/api-snapshot/profiles/net_4_x/Microsoft.Build.cs.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -59dd58db6d32179b8b80fe3b0b5eaf73faab635b \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/Mono.Cairo.cs b/external/api-snapshot/profiles/net_4_x/Mono.Cairo.cs index eec88a4a6c..3240b6ffd0 100644 --- a/external/api-snapshot/profiles/net_4_x/Mono.Cairo.cs +++ b/external/api-snapshot/profiles/net_4_x/Mono.Cairo.cs @@ -182,6 +182,20 @@ namespace Cairo public void UserToDevice(ref double x, ref double y) { } public void UserToDeviceDistance(ref double dx, ref double dy) { } } + public partial class Device : System.IDisposable + { + protected Device() { } + protected Device(System.IntPtr ptr) { } + protected Device(System.IntPtr handle, bool owner) { } + public System.IntPtr Handle { get { throw null; } } + public string Status { get { throw null; } } + public Cairo.Status Acquire() { throw null; } + public void Dispose() { } + protected virtual void Dispose(bool disposing) { } + ~Device() { } + public void Release() { } + public void SetThreadAware(bool value) { } + } public partial class DirectFBSurface : Cairo.Surface { public DirectFBSurface(System.IntPtr dfb, System.IntPtr dfb_surface) { } @@ -193,6 +207,10 @@ namespace Cairo public double Dx { get { throw null; } set { } } public double Dy { get { throw null; } set { } } } + public partial class EGLDevice : Cairo.Device + { + public EGLDevice(System.IntPtr dpy, System.IntPtr gl_ctx) { } + } [System.SerializableAttribute] public enum Extend { @@ -301,6 +319,21 @@ namespace Cairo { public GlitzSurface(System.IntPtr glitz_surface) { } } + public partial class GLSurface : Cairo.Surface + { + public GLSurface(Cairo.Device device, Cairo.Content content, uint tex, int width, int height) { } + public GLSurface(Cairo.EGLDevice device, System.IntPtr eglSurf, int width, int height) { } + public GLSurface(Cairo.GLXDevice device, System.IntPtr window, int width, int height) { } + public GLSurface(Cairo.WGLDevice device, System.IntPtr hdc, int width, int height) { } + public GLSurface(System.IntPtr ptr, bool own) { } + public void SwapBuffers() { } + } + public partial class GLXDevice : Cairo.Device + { + public GLXDevice(System.IntPtr dpy, System.IntPtr gl_ctx) { } + public System.IntPtr Context { get { throw null; } } + public System.IntPtr Display { get { throw null; } } + } [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] public partial struct Glyph { @@ -667,15 +700,28 @@ namespace Cairo { BeOS = 8, DirectFB = 9, + Drm = 19, + GL = 18, Glitz = 5, Image = 0, + OS2 = 11, Pdf = 1, PS = 2, + Qt = 15, Quartz = 6, + QuartzImage = 13, + Recording = 16, + Script = 14, + Skia = 22, + SubSurface = 23, Svg = 10, + Tee = 20, + VG = 17, Win32 = 7, + Win32Printing = 12, Xcb = 4, Xlib = 3, + Xml = 21, } public partial class SvgSurface : Cairo.Surface { @@ -702,6 +748,11 @@ namespace Cairo public static bool operator ==(Cairo.TextExtents extents, Cairo.TextExtents other) { throw null; } public static bool operator !=(Cairo.TextExtents extents, Cairo.TextExtents other) { throw null; } } + public partial class WGLDevice : Cairo.Device + { + public WGLDevice(System.IntPtr hglrc) { } + public System.IntPtr Context { get { throw null; } } + } public partial class Win32Surface : Cairo.Surface { public Win32Surface(System.IntPtr hdc) { } diff --git a/external/api-snapshot/profiles/net_4_x/Mono.CodeContracts.cs b/external/api-snapshot/profiles/net_4_x/Mono.CodeContracts.cs index fbc2d65163..c93395b744 100644 --- a/external/api-snapshot/profiles/net_4_x/Mono.CodeContracts.cs +++ b/external/api-snapshot/profiles/net_4_x/Mono.CodeContracts.cs @@ -24,19 +24,19 @@ namespace Mono.CodeContracts.Rewrite { public AssemblyRef(Mono.CodeContracts.Rewrite.AssemblyRef.TwoStreams streams) { throw null;} public AssemblyRef(string filename) { throw null;} - public string Filename { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Filename { get { throw null; } } public bool IsFilename { get { throw null; } } public bool IsSet { get { throw null; } } public bool IsStream { get { throw null; } } - public Mono.CodeContracts.Rewrite.AssemblyRef.TwoStreams Streams { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Mono.CodeContracts.Rewrite.AssemblyRef.TwoStreams Streams { get { throw null; } } public static implicit operator Mono.CodeContracts.Rewrite.AssemblyRef (System.IO.Stream stream) { throw null; } public static implicit operator Mono.CodeContracts.Rewrite.AssemblyRef (string filename) { throw null; } [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] public partial struct TwoStreams { public TwoStreams(System.IO.Stream assembly, System.IO.Stream symbols) { throw null;} - public System.IO.Stream Assembly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.IO.Stream Symbols { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.IO.Stream Assembly { get { throw null; } } + public System.IO.Stream Symbols { get { throw null; } } } } public partial class Rewriter @@ -47,15 +47,15 @@ namespace Mono.CodeContracts.Rewrite public partial class RewriterOptions { public RewriterOptions() { } - public Mono.CodeContracts.Rewrite.AssemblyRef Assembly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool BreakIntoDebugger { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool Debug { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ForceAssemblyRename { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int Level { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Mono.CodeContracts.Rewrite.AssemblyRef OutputFile { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool Rewrite { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool ThrowOnFailure { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool WritePdbFile { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Mono.CodeContracts.Rewrite.AssemblyRef Assembly { get { throw null; } set { } } + public bool BreakIntoDebugger { get { throw null; } set { } } + public bool Debug { get { throw null; } set { } } + public string ForceAssemblyRename { get { throw null; } set { } } + public int Level { get { throw null; } set { } } + public Mono.CodeContracts.Rewrite.AssemblyRef OutputFile { get { throw null; } set { } } + public bool Rewrite { get { throw null; } set { } } + public bool ThrowOnFailure { get { throw null; } set { } } + public bool WritePdbFile { get { throw null; } set { } } } public partial class RewriterResults { @@ -76,9 +76,9 @@ namespace Mono.CodeContracts.Static public partial class CheckOptions { public CheckOptions() { } - public string Assembly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Method { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool ShowDebug { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Assembly { get { throw null; } set { } } + public string Method { get { throw null; } set { } } + public bool ShowDebug { get { throw null; } set { } } } public partial class CheckResults { @@ -206,9 +206,9 @@ namespace Mono.CodeContracts.Static.Analysis.Numerical public bool IsFinite { get { throw null; } } public bool IsSinglePoint { get { throw null; } } public abstract bool IsTop { get; } - public TNumeric LowerBound { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public TNumeric LowerBound { get { throw null; } protected set { } } public abstract TInterval Top { get; } - public TNumeric UpperBound { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public TNumeric UpperBound { get { throw null; } protected set { } } public abstract TInterval Clone(); public abstract void Dump(System.IO.TextWriter tw); public abstract TInterval ImmutableVersion(); @@ -411,7 +411,7 @@ namespace Mono.CodeContracts.Static.DataStructures.Patricia public LeafNode(int key, T value) { } public override int Count { get { throw null; } } public override int Key { get { throw null; } } - public T Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public T Value { get { throw null; } } public override Mono.CodeContracts.Static.DataStructures.IImmutableIntMap Add(int key, T value) { throw null; } protected internal override void AppendToBuilder(System.Text.StringBuilder sb) { } public override bool Contains(int key) { throw null; } @@ -426,7 +426,7 @@ namespace Mono.CodeContracts.Static.DataStructures.Patricia public abstract partial class PatriciaTrieNode : Mono.CodeContracts.Static.DataStructures.IImmutableIntMap { protected PatriciaTrieNode() { } - public T Any { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public T Any { get { throw null; } } public abstract int Count { get; } public T this[int key] { get { throw null; } } public abstract int Key { get; } diff --git a/external/api-snapshot/profiles/net_4_x/Mono.Configuration.Crypto.cs b/external/api-snapshot/profiles/net_4_x/Mono.Configuration.Crypto.cs index 459efc9e2f..5ec9d55c79 100644 --- a/external/api-snapshot/profiles/net_4_x/Mono.Configuration.Crypto.cs +++ b/external/api-snapshot/profiles/net_4_x/Mono.Configuration.Crypto.cs @@ -32,11 +32,11 @@ namespace Mono.Configuration.Crypto public Key(string file, bool machineStore) { } public Key(string containerName, string keyValue, bool machineStore) { } public Key(string containerName, uint keySize, bool machineStore) { } - public string ContainerName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IsValid { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string KeyValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string ContainerName { get { throw null; } set { } } + public bool IsValid { get { throw null; } } + public string KeyValue { get { throw null; } set { } } public bool Local { get { throw null; } } - public int ProviderType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int ProviderType { get { throw null; } set { } } public void Save() { } } public partial class KeyContainer : System.Collections.Generic.IEnumerable, System.Collections.IEnumerable @@ -44,8 +44,8 @@ namespace Mono.Configuration.Crypto public KeyContainer(string name, bool machineStore) { } public int Count { get { throw null; } } public Mono.Configuration.Crypto.Key this[int index] { get { throw null; } } - public bool Local { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool Local { get { throw null; } set { } } + public string Name { get { throw null; } set { } } public void Add(Mono.Configuration.Crypto.Key key) { } public System.Collections.Generic.IEnumerator GetEnumerator() { throw null; } public static void RemoveFromDisk(string containerName, bool machineStore) { } diff --git a/external/api-snapshot/profiles/net_4_x/Mono.Data.Tds.cs b/external/api-snapshot/profiles/net_4_x/Mono.Data.Tds.cs index 38c6020e47..2afa56b86d 100644 --- a/external/api-snapshot/profiles/net_4_x/Mono.Data.Tds.cs +++ b/external/api-snapshot/profiles/net_4_x/Mono.Data.Tds.cs @@ -353,31 +353,31 @@ namespace Mono.Data.Tds.Protocol public partial class TdsDataColumn { public TdsDataColumn() { } - public System.Nullable AllowDBNull { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string BaseCatalogName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string BaseColumnName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string BaseSchemaName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string BaseServerName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string BaseTableName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ColumnName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable ColumnOrdinal { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable ColumnSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable ColumnType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string DataTypeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsAliased { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsAutoIncrement { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsExpression { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsHidden { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsIdentity { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsReadOnly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsRowVersion { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable IsUnique { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Nullable AllowDBNull { get { throw null; } set { } } + public string BaseCatalogName { get { throw null; } set { } } + public string BaseColumnName { get { throw null; } set { } } + public string BaseSchemaName { get { throw null; } set { } } + public string BaseServerName { get { throw null; } set { } } + public string BaseTableName { get { throw null; } set { } } + public string ColumnName { get { throw null; } set { } } + public System.Nullable ColumnOrdinal { get { throw null; } set { } } + public System.Nullable ColumnSize { get { throw null; } set { } } + public System.Nullable ColumnType { get { throw null; } set { } } + public string DataTypeName { get { throw null; } set { } } + public System.Nullable IsAliased { get { throw null; } set { } } + public System.Nullable IsAutoIncrement { get { throw null; } set { } } + public System.Nullable IsExpression { get { throw null; } set { } } + public System.Nullable IsHidden { get { throw null; } set { } } + public System.Nullable IsIdentity { get { throw null; } set { } } + public System.Nullable IsKey { get { throw null; } set { } } + public System.Nullable IsReadOnly { get { throw null; } set { } } + public System.Nullable IsRowVersion { get { throw null; } set { } } + public System.Nullable IsUnique { get { throw null; } set { } } public object this[string key] { get { throw null; } set { } } - public System.Nullable LCID { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable NumericPrecision { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable NumericScale { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable SortOrder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Nullable LCID { get { throw null; } set { } } + public System.Nullable NumericPrecision { get { throw null; } set { } } + public System.Nullable NumericScale { get { throw null; } set { } } + public System.Nullable SortOrder { get { throw null; } set { } } } public partial class TdsDataColumnCollection : System.Collections.IEnumerable { diff --git a/external/api-snapshot/profiles/net_4_x/Mono.Debugger.Soft.cs b/external/api-snapshot/profiles/net_4_x/Mono.Debugger.Soft.cs index aa4b283d16..4b9d69698c 100644 --- a/external/api-snapshot/profiles/net_4_x/Mono.Debugger.Soft.cs +++ b/external/api-snapshot/profiles/net_4_x/Mono.Debugger.Soft.cs @@ -92,7 +92,7 @@ namespace Mono.Debugger.Soft public partial class CommandException : System.Exception { internal CommandException() { } - public Mono.Debugger.Soft.ErrorCode ErrorCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Mono.Debugger.Soft.ErrorCode ErrorCode { get { throw null; } set { } } } public abstract partial class Connection { @@ -154,7 +154,7 @@ namespace Mono.Debugger.Soft public partial class ErrorHandlerEventArgs : System.EventArgs { public ErrorHandlerEventArgs() { } - public Mono.Debugger.Soft.ErrorCode ErrorCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Mono.Debugger.Soft.ErrorCode ErrorCode { get { throw null; } set { } } } public abstract partial class Event { @@ -260,13 +260,13 @@ namespace Mono.Debugger.Soft public partial class ILExceptionHandler { internal ILExceptionHandler() { } - public Mono.Debugger.Soft.TypeMirror CatchType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int FilterOffset { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int HandlerLength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int HandlerOffset { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Mono.Debugger.Soft.ILExceptionHandlerType HandlerType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int TryLength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int TryOffset { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Mono.Debugger.Soft.TypeMirror CatchType { get { throw null; } } + public int FilterOffset { get { throw null; } } + public int HandlerLength { get { throw null; } } + public int HandlerOffset { get { throw null; } } + public Mono.Debugger.Soft.ILExceptionHandlerType HandlerType { get { throw null; } } + public int TryLength { get { throw null; } } + public int TryOffset { get { throw null; } } } public enum ILExceptionHandlerType { @@ -318,9 +318,9 @@ namespace Mono.Debugger.Soft public partial class InvokeResult { public InvokeResult() { } - public Mono.Debugger.Soft.Value[] OutArgs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Mono.Debugger.Soft.Value OutThis { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Mono.Debugger.Soft.Value Result { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Mono.Debugger.Soft.Value[] OutArgs { get { throw null; } set { } } + public Mono.Debugger.Soft.Value OutThis { get { throw null; } set { } } + public Mono.Debugger.Soft.Value Result { get { throw null; } set { } } } public partial interface ITargetProcess { @@ -335,10 +335,10 @@ namespace Mono.Debugger.Soft public partial class LaunchOptions { public LaunchOptions() { } - public string AgentArgs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Mono.Debugger.Soft.LaunchOptions.ProcessLauncher CustomProcessLauncher { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Mono.Debugger.Soft.LaunchOptions.TargetProcessLauncher CustomTargetProcessLauncher { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool Valgrind { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string AgentArgs { get { throw null; } set { } } + public Mono.Debugger.Soft.LaunchOptions.ProcessLauncher CustomProcessLauncher { get { throw null; } set { } } + public Mono.Debugger.Soft.LaunchOptions.TargetProcessLauncher CustomTargetProcessLauncher { get { throw null; } set { } } + public bool Valgrind { get { throw null; } set { } } public delegate System.Diagnostics.Process ProcessLauncher(System.Diagnostics.ProcessStartInfo info); public delegate Mono.Debugger.Soft.ITargetProcess TargetProcessLauncher(System.Diagnostics.ProcessStartInfo info); } @@ -637,7 +637,7 @@ namespace Mono.Debugger.Soft public long Id { get { throw null; } } public bool IsThreadPoolThread { get { throw null; } } public string Name { get { throw null; } } - public static bool NativeTransitions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public static bool NativeTransitions { get { throw null; } set { } } public long ThreadId { get { throw null; } } public System.Threading.ThreadState ThreadState { get { throw null; } } public long TID { get { throw null; } } @@ -779,9 +779,9 @@ namespace Mono.Debugger.Soft public partial class VersionInfo { public VersionInfo() { } - public int MajorVersion { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int MinorVersion { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string VMVersion { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int MajorVersion { get { throw null; } set { } } + public int MinorVersion { get { throw null; } set { } } + public string VMVersion { get { throw null; } set { } } public bool AtLeast(int major, int minor) { throw null; } } public partial class VirtualMachine : Mono.Debugger.Soft.Mirror @@ -790,8 +790,8 @@ namespace Mono.Debugger.Soft public System.Net.EndPoint EndPoint { get { throw null; } } public System.Diagnostics.Process Process { get { throw null; } } public Mono.Debugger.Soft.AppDomainMirror RootDomain { get { throw null; } } - public System.IO.StreamReader StandardError { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.IO.StreamReader StandardOutput { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.IO.StreamReader StandardError { get { throw null; } set { } } + public System.IO.StreamReader StandardOutput { get { throw null; } set { } } public Mono.Debugger.Soft.ITargetProcess TargetProcess { get { throw null; } } public Mono.Debugger.Soft.VersionInfo Version { get { throw null; } } public void ClearAllBreakpoints() { } diff --git a/external/api-snapshot/profiles/net_4_x/Mono.Options.cs b/external/api-snapshot/profiles/net_4_x/Mono.Options.cs index fd85635dc1..6666ca25c0 100644 --- a/external/api-snapshot/profiles/net_4_x/Mono.Options.cs +++ b/external/api-snapshot/profiles/net_4_x/Mono.Options.cs @@ -24,11 +24,11 @@ namespace Mono.Options public partial class Command { public Command(string name, string help=null) { } - public Mono.Options.CommandSet CommandSet { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Help { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Mono.Options.OptionSet Options { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Action> Run { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Mono.Options.CommandSet CommandSet { get { throw null; } } + public string Help { get { throw null; } } + public string Name { get { throw null; } } + public Mono.Options.OptionSet Options { get { throw null; } set { } } + public System.Action> Run { get { throw null; } set { } } public virtual int Invoke(System.Collections.Generic.IEnumerable arguments) { throw null; } } public partial class CommandSet : System.Collections.ObjectModel.KeyedCollection @@ -41,6 +41,7 @@ namespace Mono.Options public string Suite { get { throw null; } } public Mono.Options.CommandSet Add(Mono.Options.ArgumentSource source) { throw null; } public new Mono.Options.CommandSet Add(Mono.Options.Command value) { throw null; } + public Mono.Options.CommandSet Add(Mono.Options.CommandSet nestedCommands) { throw null; } public Mono.Options.CommandSet Add(Mono.Options.Option option) { throw null; } public Mono.Options.CommandSet Add(string header) { throw null; } public Mono.Options.CommandSet Add(string prototype, Mono.Options.OptionAction action) { throw null; } diff --git a/external/api-snapshot/profiles/net_4_x/Mono.Posix.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/Mono.Posix.cs.REMOVED.git-id index 49829a057c..b605a6d722 100644 --- a/external/api-snapshot/profiles/net_4_x/Mono.Posix.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/Mono.Posix.cs.REMOVED.git-id @@ -1 +1 @@ -1df39a6740bc365cdec5fce79b14d2f38c052d7b \ No newline at end of file +3169e3059de281e81ea22ce799f14e198de9786d \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/Mono.Security.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/Mono.Security.cs.REMOVED.git-id index 31f3f3050c..e61930e386 100644 --- a/external/api-snapshot/profiles/net_4_x/Mono.Security.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/Mono.Security.cs.REMOVED.git-id @@ -1 +1 @@ -2a7b307a76964853a50a6a0cf6c3c726c7c7a9b5 \ No newline at end of file +aadf37417262dbc531ebe4d61911af9c4e971552 \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/Mono.Simd.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/Mono.Simd.cs.REMOVED.git-id index c223a85570..ab03a2ef00 100644 --- a/external/api-snapshot/profiles/net_4_x/Mono.Simd.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/Mono.Simd.cs.REMOVED.git-id @@ -1 +1 @@ -960ef2962c133140198041301e478556c9856434 \ No newline at end of file +a85365c49551ba1452d880d1e70256a8038cb4ef \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/Mono.XBuild.Tasks.cs b/external/api-snapshot/profiles/net_4_x/Mono.XBuild.Tasks.cs index ac7c992470..9efe7d00ca 100644 --- a/external/api-snapshot/profiles/net_4_x/Mono.XBuild.Tasks.cs +++ b/external/api-snapshot/profiles/net_4_x/Mono.XBuild.Tasks.cs @@ -55,9 +55,9 @@ namespace Mono.PkgConfig public string PublicKeyToken; public string Version; public PackageAssemblyInfo() { } - public string File { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string File { get { throw null; } set { } } public string FullName { get { throw null; } } - public Mono.PkgConfig.LibraryPackageInfo ParentPackage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Mono.PkgConfig.LibraryPackageInfo ParentPackage { get { throw null; } set { } } public void Update(System.Reflection.AssemblyName aname) { } public void UpdateFromFile(string file) { } } diff --git a/external/api-snapshot/profiles/net_4_x/PEAPI.cs b/external/api-snapshot/profiles/net_4_x/PEAPI.cs index 3b491ec2ba..c4592bdb7a 100644 --- a/external/api-snapshot/profiles/net_4_x/PEAPI.cs +++ b/external/api-snapshot/profiles/net_4_x/PEAPI.cs @@ -23,7 +23,7 @@ namespace PEAPI public partial class ArrayConstant : PEAPI.DataConstant { public ArrayConstant(PEAPI.DataConstant[] dVals) { } - public System.Nullable ExplicitSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Nullable ExplicitSize { get { throw null; } set { } } } public enum AssemAttr { diff --git a/external/api-snapshot/profiles/net_4_x/System.ComponentModel.Composition.cs b/external/api-snapshot/profiles/net_4_x/System.ComponentModel.Composition.cs index cfd46a6b92..4b6b13bec9 100644 --- a/external/api-snapshot/profiles/net_4_x/System.ComponentModel.Composition.cs +++ b/external/api-snapshot/profiles/net_4_x/System.ComponentModel.Composition.cs @@ -16,6 +16,7 @@ [assembly:System.Resources.NeutralResourcesLanguageAttribute("en-US")] [assembly:System.Resources.SatelliteContractVersionAttribute("4.0.0.0")] [assembly:System.Runtime.CompilerServices.CompilationRelaxationsAttribute(8)] +[assembly:System.Runtime.CompilerServices.InternalsVisibleToAttribute("net_4_x_System.ComponentModel.Composition_xunit-test, PublicKey=002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df")] [assembly:System.Runtime.CompilerServices.RuntimeCompatibilityAttribute(WrapNonExceptionThrows=true)] [assembly:System.Runtime.InteropServices.ComVisibleAttribute(false)] [assembly:System.Security.AllowPartiallyTrustedCallersAttribute] @@ -125,8 +126,8 @@ namespace System.ComponentModel.Composition public ExportAttribute(string contractName) { } public ExportAttribute(string contractName, System.Type contractType) { } public ExportAttribute(System.Type contractType) { } - public string ContractName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Type ContractType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string ContractName { get { throw null; } } + public System.Type ContractType { get { throw null; } } } public partial class ExportFactory { @@ -149,9 +150,9 @@ namespace System.ComponentModel.Composition public sealed partial class ExportMetadataAttribute : System.Attribute { public ExportMetadataAttribute(string name, object value) { } - public bool IsMultiple { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsMultiple { get { throw null; } set { } } + public string Name { get { throw null; } } + public object Value { get { throw null; } } } public partial interface ICompositionService { @@ -164,12 +165,12 @@ namespace System.ComponentModel.Composition public ImportAttribute(string contractName) { } public ImportAttribute(string contractName, System.Type contractType) { } public ImportAttribute(System.Type contractType) { } - public bool AllowDefault { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool AllowRecomposition { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ContractName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Type ContractType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.ComponentModel.Composition.CreationPolicy RequiredCreationPolicy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.ComponentModel.Composition.ImportSource Source { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool AllowDefault { get { throw null; } set { } } + public bool AllowRecomposition { get { throw null; } set { } } + public string ContractName { get { throw null; } } + public System.Type ContractType { get { throw null; } } + public System.ComponentModel.Composition.CreationPolicy RequiredCreationPolicy { get { throw null; } set { } } + public System.ComponentModel.Composition.ImportSource Source { get { throw null; } set { } } } [System.Diagnostics.DebuggerDisplayAttribute("{Message}")] [System.Diagnostics.DebuggerTypeProxyAttribute("System.ComponentModel.Composition.ImportCardinalityMismatchExceptionDebuggerProxy")] @@ -194,11 +195,11 @@ namespace System.ComponentModel.Composition public ImportManyAttribute(string contractName) { } public ImportManyAttribute(string contractName, System.Type contractType) { } public ImportManyAttribute(System.Type contractType) { } - public bool AllowRecomposition { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ContractName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Type ContractType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.ComponentModel.Composition.CreationPolicy RequiredCreationPolicy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.ComponentModel.Composition.ImportSource Source { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool AllowRecomposition { get { throw null; } set { } } + public string ContractName { get { throw null; } } + public System.Type ContractType { get { throw null; } } + public System.ComponentModel.Composition.CreationPolicy RequiredCreationPolicy { get { throw null; } set { } } + public System.ComponentModel.Composition.ImportSource Source { get { throw null; } set { } } } public enum ImportSource { @@ -227,20 +228,20 @@ namespace System.ComponentModel.Composition public sealed partial class MetadataViewImplementationAttribute : System.Attribute { public MetadataViewImplementationAttribute(System.Type implementationType) { } - public System.Type ImplementationType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Type ImplementationType { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), AllowMultiple=false, Inherited=false)] public sealed partial class PartCreationPolicyAttribute : System.Attribute { public PartCreationPolicyAttribute(System.ComponentModel.Composition.CreationPolicy creationPolicy) { } - public System.ComponentModel.Composition.CreationPolicy CreationPolicy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ComponentModel.Composition.CreationPolicy CreationPolicy { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), AllowMultiple=true, Inherited=false)] public sealed partial class PartMetadataAttribute : System.Attribute { public PartMetadataAttribute(string name, object value) { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } + public object Value { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), AllowMultiple=false, Inherited=false)] public sealed partial class PartNotDiscoverableAttribute : System.Attribute @@ -337,7 +338,7 @@ namespace System.ComponentModel.Composition.Hosting { public ComposablePartCatalogChangeEventArgs(System.Collections.Generic.IEnumerable addedDefinitions, System.Collections.Generic.IEnumerable removedDefinitions, System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition) { } public System.Collections.Generic.IEnumerable AddedDefinitions { get { throw null; } } - public System.ComponentModel.Composition.Hosting.AtomicComposition AtomicComposition { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ComponentModel.Composition.Hosting.AtomicComposition AtomicComposition { get { throw null; } } public System.Collections.Generic.IEnumerable RemovedDefinitions { get { throw null; } } } public partial class ComposablePartExportProvider : System.ComponentModel.Composition.Hosting.ExportProvider, System.IDisposable @@ -479,7 +480,7 @@ namespace System.ComponentModel.Composition.Hosting { public ExportsChangeEventArgs(System.Collections.Generic.IEnumerable addedExports, System.Collections.Generic.IEnumerable removedExports, System.ComponentModel.Composition.Hosting.AtomicComposition atomicComposition) { } public System.Collections.Generic.IEnumerable AddedExports { get { throw null; } } - public System.ComponentModel.Composition.Hosting.AtomicComposition AtomicComposition { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ComponentModel.Composition.Hosting.AtomicComposition AtomicComposition { get { throw null; } } public System.Collections.Generic.IEnumerable ChangedContractNames { get { throw null; } } public System.Collections.Generic.IEnumerable RemovedExports { get { throw null; } } } diff --git a/external/api-snapshot/profiles/net_4_x/System.ComponentModel.DataAnnotations.cs b/external/api-snapshot/profiles/net_4_x/System.ComponentModel.DataAnnotations.cs index ee86bbd808..ac094c979d 100644 --- a/external/api-snapshot/profiles/net_4_x/System.ComponentModel.DataAnnotations.cs +++ b/external/api-snapshot/profiles/net_4_x/System.ComponentModel.DataAnnotations.cs @@ -42,14 +42,14 @@ namespace System.ComponentModel.DataAnnotations public sealed partial class BindableTypeAttribute : System.Attribute { public BindableTypeAttribute() { } - public bool IsBindable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool IsBindable { get { throw null; } set { } } } [System.AttributeUsageAttribute((System.AttributeTargets)(128), AllowMultiple=false)] public partial class CompareAttribute : System.ComponentModel.DataAnnotations.ValidationAttribute { public CompareAttribute(string otherProperty) { } - public string OtherProperty { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string OtherPropertyDisplayName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string OtherProperty { get { throw null; } } + public string OtherPropertyDisplayName { get { throw null; } } public override bool RequiresValidationContext { get { throw null; } } public override string FormatErrorMessage(string name) { throw null; } protected override System.ComponentModel.DataAnnotations.ValidationResult IsValid(object value, System.ComponentModel.DataAnnotations.ValidationContext validationContext) { throw null; } @@ -100,9 +100,9 @@ namespace System.ComponentModel.DataAnnotations { public DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType dataType) { } public DataTypeAttribute(string customDataType) { } - public string CustomDataType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.ComponentModel.DataAnnotations.DataType DataType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.ComponentModel.DataAnnotations.DisplayFormatAttribute DisplayFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public string CustomDataType { get { throw null; } } + public System.ComponentModel.DataAnnotations.DataType DataType { get { throw null; } } + public System.ComponentModel.DataAnnotations.DisplayFormatAttribute DisplayFormat { get { throw null; } protected set { } } public virtual string GetDataTypeName() { throw null; } public override bool IsValid(object value) { throw null; } } @@ -134,26 +134,26 @@ namespace System.ComponentModel.DataAnnotations public DisplayColumnAttribute(string displayColumn) { } public DisplayColumnAttribute(string displayColumn, string sortColumn) { } public DisplayColumnAttribute(string displayColumn, string sortColumn, bool sortDescending) { } - public string DisplayColumn { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string SortColumn { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool SortDescending { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string DisplayColumn { get { throw null; } } + public string SortColumn { get { throw null; } } + public bool SortDescending { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(384), AllowMultiple=false)] public partial class DisplayFormatAttribute : System.Attribute { public DisplayFormatAttribute() { } - public bool ApplyFormatInEditMode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool ConvertEmptyStringToNull { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string DataFormatString { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool HtmlEncode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string NullDisplayText { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool ApplyFormatInEditMode { get { throw null; } set { } } + public bool ConvertEmptyStringToNull { get { throw null; } set { } } + public string DataFormatString { get { throw null; } set { } } + public bool HtmlEncode { get { throw null; } set { } } + public string NullDisplayText { get { throw null; } set { } } } [System.AttributeUsageAttribute((System.AttributeTargets)(384), AllowMultiple=false, Inherited=true)] public sealed partial class EditableAttribute : System.Attribute { public EditableAttribute(bool allowEdit) { } - public bool AllowEdit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool AllowInitialValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool AllowEdit { get { throw null; } } + public bool AllowInitialValue { get { throw null; } set { } } } [System.AttributeUsageAttribute((System.AttributeTargets)(2432), AllowMultiple=false)] public sealed partial class EmailAddressAttribute : System.ComponentModel.DataAnnotations.DataTypeAttribute @@ -165,7 +165,7 @@ namespace System.ComponentModel.DataAnnotations public sealed partial class EnumDataTypeAttribute : System.ComponentModel.DataAnnotations.DataTypeAttribute { public EnumDataTypeAttribute(System.Type enumType) : base (default(System.ComponentModel.DataAnnotations.DataType)) { } - public System.Type EnumType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Type EnumType { get { throw null; } } public override bool IsValid(object value) { throw null; } } [System.AttributeUsageAttribute((System.AttributeTargets)(2432), AllowMultiple=false)] @@ -203,7 +203,7 @@ namespace System.ComponentModel.DataAnnotations { public MaxLengthAttribute() { } public MaxLengthAttribute(int length) { } - public int Length { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int Length { get { throw null; } } public override string FormatErrorMessage(string name) { throw null; } public override bool IsValid(object value) { throw null; } } @@ -217,7 +217,7 @@ namespace System.ComponentModel.DataAnnotations public partial class MinLengthAttribute : System.ComponentModel.DataAnnotations.ValidationAttribute { public MinLengthAttribute(int length) { } - public int Length { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int Length { get { throw null; } } public override string FormatErrorMessage(string name) { throw null; } public override bool IsValid(object value) { throw null; } } @@ -233,9 +233,9 @@ namespace System.ComponentModel.DataAnnotations public RangeAttribute(double minimum, double maximum) { } public RangeAttribute(int minimum, int maximum) { } public RangeAttribute(System.Type type, string minimum, string maximum) { } - public object Maximum { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public object Minimum { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Type OperandType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public object Maximum { get { throw null; } } + public object Minimum { get { throw null; } } + public System.Type OperandType { get { throw null; } } public override string FormatErrorMessage(string name) { throw null; } public override bool IsValid(object value) { throw null; } } @@ -244,7 +244,7 @@ namespace System.ComponentModel.DataAnnotations { public RegularExpressionAttribute(string pattern) { } public int MatchTimeoutInMilliseconds { get { throw null; } set { } } - public string Pattern { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Pattern { get { throw null; } } public override string FormatErrorMessage(string name) { throw null; } public override bool IsValid(object value) { throw null; } } @@ -252,27 +252,27 @@ namespace System.ComponentModel.DataAnnotations public partial class RequiredAttribute : System.ComponentModel.DataAnnotations.ValidationAttribute { public RequiredAttribute() { } - public bool AllowEmptyStrings { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool AllowEmptyStrings { get { throw null; } set { } } public override bool IsValid(object value) { throw null; } } [System.AttributeUsageAttribute((System.AttributeTargets)(384), AllowMultiple=false)] public partial class ScaffoldColumnAttribute : System.Attribute { public ScaffoldColumnAttribute(bool scaffold) { } - public bool Scaffold { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool Scaffold { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), AllowMultiple=false)] public partial class ScaffoldTableAttribute : System.Attribute { public ScaffoldTableAttribute(bool scaffold) { } - public bool Scaffold { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool Scaffold { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(2432), AllowMultiple=false)] public partial class StringLengthAttribute : System.ComponentModel.DataAnnotations.ValidationAttribute { public StringLengthAttribute(int maximumLength) { } - public int MaximumLength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int MinimumLength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int MaximumLength { get { throw null; } } + public int MinimumLength { get { throw null; } set { } } public override string FormatErrorMessage(string name) { throw null; } public override bool IsValid(object value) { throw null; } } @@ -340,9 +340,9 @@ namespace System.ComponentModel.DataAnnotations public ValidationException(string message) { } public ValidationException(string errorMessage, System.ComponentModel.DataAnnotations.ValidationAttribute validatingAttribute, object value) { } public ValidationException(string message, System.Exception innerException) { } - public System.ComponentModel.DataAnnotations.ValidationAttribute ValidationAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ComponentModel.DataAnnotations.ValidationAttribute ValidationAttribute { get { throw null; } } public System.ComponentModel.DataAnnotations.ValidationResult ValidationResult { get { throw null; } } - public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public object Value { get { throw null; } } } public partial class ValidationResult { @@ -386,7 +386,7 @@ namespace System.ComponentModel.DataAnnotations.Schema public partial class DatabaseGeneratedAttribute : System.Attribute { public DatabaseGeneratedAttribute(System.ComponentModel.DataAnnotations.Schema.DatabaseGeneratedOption databaseGeneratedOption) { } - public System.ComponentModel.DataAnnotations.Schema.DatabaseGeneratedOption DatabaseGeneratedOption { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ComponentModel.DataAnnotations.Schema.DatabaseGeneratedOption DatabaseGeneratedOption { get { throw null; } } } public enum DatabaseGeneratedOption { diff --git a/external/api-snapshot/profiles/net_4_x/System.Core.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/System.Core.cs.REMOVED.git-id index cd82736726..7a64292bbd 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Core.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/System.Core.cs.REMOVED.git-id @@ -1 +1 @@ -5df2d7b09fea3948f8c715a83c9f842b202b3049 \ No newline at end of file +bd9b258d4f490e816dcc032678ba657bef5084bb \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/System.Data.Entity.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/System.Data.Entity.cs.REMOVED.git-id index 72c808d9ce..5912001a7b 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Data.Entity.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/System.Data.Entity.cs.REMOVED.git-id @@ -1 +1 @@ -54cd3557ef440ce1985bad67547086e94713c17d \ No newline at end of file +473e0a1c2e03ad9b02606af5f0b8552dc1467d6e \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/System.Data.Linq.cs b/external/api-snapshot/profiles/net_4_x/System.Data.Linq.cs index 49df21028b..0bea5f906f 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Data.Linq.cs +++ b/external/api-snapshot/profiles/net_4_x/System.Data.Linq.cs @@ -160,9 +160,9 @@ namespace System.Data.Linq public sealed partial class ChangeSet { internal ChangeSet() { } - public System.Collections.Generic.IList Deletes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Collections.Generic.IList Inserts { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Collections.Generic.IList Updates { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IList Deletes { get { throw null; } } + public System.Collections.Generic.IList Inserts { get { throw null; } } + public System.Collections.Generic.IList Updates { get { throw null; } } public override string ToString() { throw null; } } public sealed partial class CompiledQuery @@ -195,8 +195,8 @@ namespace System.Data.Linq public System.Data.Common.DbConnection Connection { get { throw null; } } public bool DeferredLoadingEnabled { get { throw null; } set { } } public System.Data.Linq.DataLoadOptions LoadOptions { get { throw null; } set { } } - public System.IO.TextWriter Log { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Data.Linq.Mapping.MetaModel Mapping { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.IO.TextWriter Log { get { throw null; } set { } } + public System.Data.Linq.Mapping.MetaModel Mapping { get { throw null; } } public bool ObjectTrackingEnabled { get { throw null; } set { } } public bool QueryCacheEnabled { get { throw null; } set { } } public System.Data.Common.DbTransaction Transaction { get { throw null; } set { } } @@ -415,7 +415,7 @@ namespace System.Data.Linq public sealed partial class Table : System.Collections.Generic.IEnumerable, System.Collections.IEnumerable, System.ComponentModel.IListSource, System.Data.Linq.ITable, System.Linq.IQueryable, System.Linq.IQueryable, System.Linq.IQueryProvider where TEntity : class { internal Table() { } - public System.Data.Linq.DataContext Context { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Data.Linq.DataContext Context { get { throw null; } } public bool IsReadOnly { get { throw null; } } bool System.ComponentModel.IListSource.ContainsListCollection { get { throw null; } } System.Type System.Linq.IQueryable.ElementType { get { throw null; } } @@ -463,12 +463,12 @@ namespace System.Data.Linq.Mapping public sealed partial class AssociationAttribute : System.Data.Linq.Mapping.DataAttribute { public AssociationAttribute() { } - public bool DeleteOnNull { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string DeleteRule { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IsForeignKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IsUnique { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string OtherKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ThisKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool DeleteOnNull { get { throw null; } set { } } + public string DeleteRule { get { throw null; } set { } } + public bool IsForeignKey { get { throw null; } set { } } + public bool IsUnique { get { throw null; } set { } } + public string OtherKey { get { throw null; } set { } } + public string ThisKey { get { throw null; } set { } } } public sealed partial class AttributeMappingSource : System.Data.Linq.Mapping.MappingSource { @@ -487,42 +487,42 @@ namespace System.Data.Linq.Mapping public sealed partial class ColumnAttribute : System.Data.Linq.Mapping.DataAttribute { public ColumnAttribute() { } - public System.Data.Linq.Mapping.AutoSync AutoSync { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool CanBeNull { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string DbType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Expression { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IsDbGenerated { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IsDiscriminator { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IsPrimaryKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IsVersion { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Data.Linq.Mapping.UpdateCheck UpdateCheck { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Data.Linq.Mapping.AutoSync AutoSync { get { throw null; } set { } } + public bool CanBeNull { get { throw null; } set { } } + public string DbType { get { throw null; } set { } } + public string Expression { get { throw null; } set { } } + public bool IsDbGenerated { get { throw null; } set { } } + public bool IsDiscriminator { get { throw null; } set { } } + public bool IsPrimaryKey { get { throw null; } set { } } + public bool IsVersion { get { throw null; } set { } } + public System.Data.Linq.Mapping.UpdateCheck UpdateCheck { get { throw null; } set { } } } public abstract partial class DataAttribute : System.Attribute { protected DataAttribute() { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Storage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Name { get { throw null; } set { } } + public string Storage { get { throw null; } set { } } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), AllowMultiple=false)] public sealed partial class DatabaseAttribute : System.Attribute { public DatabaseAttribute() { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Name { get { throw null; } set { } } } [System.AttributeUsageAttribute((System.AttributeTargets)(64), AllowMultiple=false)] public sealed partial class FunctionAttribute : System.Attribute { public FunctionAttribute() { } - public bool IsComposable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool IsComposable { get { throw null; } set { } } + public string Name { get { throw null; } set { } } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), AllowMultiple=true, Inherited=false)] public sealed partial class InheritanceMappingAttribute : System.Attribute { public InheritanceMappingAttribute() { } - public object Code { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IsDefault { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Type Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public object Code { get { throw null; } set { } } + public bool IsDefault { get { throw null; } set { } } + public System.Type Type { get { throw null; } set { } } } public abstract partial class MappingSource { @@ -682,8 +682,8 @@ namespace System.Data.Linq.Mapping public sealed partial class ParameterAttribute : System.Attribute { public ParameterAttribute() { } - public string DbType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string DbType { get { throw null; } set { } } + public string Name { get { throw null; } set { } } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), AllowMultiple=false)] public sealed partial class ProviderAttribute : System.Attribute @@ -702,7 +702,7 @@ namespace System.Data.Linq.Mapping public sealed partial class TableAttribute : System.Attribute { public TableAttribute() { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Name { get { throw null; } set { } } } public enum UpdateCheck { diff --git a/external/api-snapshot/profiles/net_4_x/System.Data.Services.cs b/external/api-snapshot/profiles/net_4_x/System.Data.Services.cs index 725bed21e0..fd74b1551f 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Data.Services.cs +++ b/external/api-snapshot/profiles/net_4_x/System.Data.Services.cs @@ -65,10 +65,10 @@ namespace System.Data.Services public sealed partial class DataServiceBehavior { public DataServiceBehavior() { } - public bool AcceptCountRequests { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool AcceptProjectionRequests { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool InvokeInterceptorsOnLinkDelete { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Data.Services.Common.DataServiceProtocolVersion MaxProtocolVersion { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool AcceptCountRequests { get { throw null; } set { } } + public bool AcceptProjectionRequests { get { throw null; } set { } } + public bool InvokeInterceptorsOnLinkDelete { get { throw null; } set { } } + public System.Data.Services.Common.DataServiceProtocolVersion MaxProtocolVersion { get { throw null; } set { } } } public sealed partial class DataServiceConfiguration : System.Data.Services.IDataServiceConfiguration { @@ -98,9 +98,9 @@ namespace System.Data.Services protected DataServiceException(System.Runtime.Serialization.SerializationInfo serializationInfo, System.Runtime.Serialization.StreamingContext streamingContext) { } public DataServiceException(string message) { } public DataServiceException(string message, System.Exception innerException) { } - public string ErrorCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string MessageLanguage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int StatusCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string ErrorCode { get { throw null; } } + public string MessageLanguage { get { throw null; } } + public int StatusCode { get { throw null; } } [System.Security.SecurityCriticalAttribute] public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } } @@ -143,7 +143,7 @@ namespace System.Data.Services public partial class DataService : System.Data.Services.IRequestHandler { public DataService() { } - protected T CurrentDataSource { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + protected T CurrentDataSource { get { throw null; } } public System.Data.Services.DataServiceProcessingPipeline ProcessingPipeline { get { throw null; } } public void AttachHost(System.Data.Services.IDataServiceHost host) { } protected virtual T CreateDataSource() { throw null; } @@ -178,10 +178,10 @@ namespace System.Data.Services { public ExpandSegment(string name, System.Linq.Expressions.Expression filter) { } public System.Data.Services.Providers.ResourceProperty ExpandedProperty { get { throw null; } } - public System.Linq.Expressions.Expression Filter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Linq.Expressions.Expression Filter { get { throw null; } } public bool HasFilter { get { throw null; } } public int MaxResultsExpected { get { throw null; } } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } public static bool PathHasFilter(System.Collections.Generic.IEnumerable path) { throw null; } } public partial class ExpandSegmentCollection : System.Collections.Generic.List @@ -193,11 +193,11 @@ namespace System.Data.Services public partial class HandleExceptionArgs { public HandleExceptionArgs() { } - public System.Exception Exception { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ResponseContentType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int ResponseStatusCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool ResponseWritten { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool UseVerboseErrors { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Exception Exception { get { throw null; } set { } } + public string ResponseContentType { get { throw null; } } + public int ResponseStatusCode { get { throw null; } } + public bool ResponseWritten { get { throw null; } } + public bool UseVerboseErrors { get { throw null; } set { } } } public partial interface IDataServiceConfiguration { @@ -282,15 +282,15 @@ namespace System.Data.Services public sealed partial class MimeTypeAttribute : System.Attribute { public MimeTypeAttribute(string memberName, string mimeType) { } - public string MemberName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string MimeType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string MemberName { get { throw null; } } + public string MimeType { get { throw null; } } } public sealed partial class ProcessRequestArgs { public ProcessRequestArgs() { } - public bool IsBatchOperation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Data.Services.DataServiceOperationContext OperationContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Uri RequestUri { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsBatchOperation { get { throw null; } } + public System.Data.Services.DataServiceOperationContext OperationContext { get { throw null; } } + public System.Uri RequestUri { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(64), AllowMultiple=true, Inherited=true)] public sealed partial class QueryInterceptorAttribute : System.Attribute @@ -338,150 +338,150 @@ namespace System.Data.Services.Internal public sealed partial class ExpandedWrapper : System.Data.Services.Internal.ExpandedWrapper { public ExpandedWrapper() { } - public TProperty0 ProjectedProperty0 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty1 ProjectedProperty1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty2 ProjectedProperty2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty3 ProjectedProperty3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty4 ProjectedProperty4 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty5 ProjectedProperty5 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty6 ProjectedProperty6 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty7 ProjectedProperty7 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty8 ProjectedProperty8 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public TProperty0 ProjectedProperty0 { get { throw null; } set { } } + public TProperty1 ProjectedProperty1 { get { throw null; } set { } } + public TProperty2 ProjectedProperty2 { get { throw null; } set { } } + public TProperty3 ProjectedProperty3 { get { throw null; } set { } } + public TProperty4 ProjectedProperty4 { get { throw null; } set { } } + public TProperty5 ProjectedProperty5 { get { throw null; } set { } } + public TProperty6 ProjectedProperty6 { get { throw null; } set { } } + public TProperty7 ProjectedProperty7 { get { throw null; } set { } } + public TProperty8 ProjectedProperty8 { get { throw null; } set { } } protected override object InternalGetExpandedPropertyValue(int nameIndex) { throw null; } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public sealed partial class ExpandedWrapper : System.Data.Services.Internal.ExpandedWrapper { public ExpandedWrapper() { } - public TProperty0 ProjectedProperty0 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty1 ProjectedProperty1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty2 ProjectedProperty2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty3 ProjectedProperty3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty4 ProjectedProperty4 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty5 ProjectedProperty5 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty6 ProjectedProperty6 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty7 ProjectedProperty7 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty8 ProjectedProperty8 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty9 ProjectedProperty9 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public TProperty0 ProjectedProperty0 { get { throw null; } set { } } + public TProperty1 ProjectedProperty1 { get { throw null; } set { } } + public TProperty2 ProjectedProperty2 { get { throw null; } set { } } + public TProperty3 ProjectedProperty3 { get { throw null; } set { } } + public TProperty4 ProjectedProperty4 { get { throw null; } set { } } + public TProperty5 ProjectedProperty5 { get { throw null; } set { } } + public TProperty6 ProjectedProperty6 { get { throw null; } set { } } + public TProperty7 ProjectedProperty7 { get { throw null; } set { } } + public TProperty8 ProjectedProperty8 { get { throw null; } set { } } + public TProperty9 ProjectedProperty9 { get { throw null; } set { } } protected override object InternalGetExpandedPropertyValue(int nameIndex) { throw null; } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public sealed partial class ExpandedWrapper : System.Data.Services.Internal.ExpandedWrapper { public ExpandedWrapper() { } - public TProperty0 ProjectedProperty0 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty1 ProjectedProperty1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty10 ProjectedProperty10 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty2 ProjectedProperty2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty3 ProjectedProperty3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty4 ProjectedProperty4 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty5 ProjectedProperty5 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty6 ProjectedProperty6 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty7 ProjectedProperty7 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty8 ProjectedProperty8 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty9 ProjectedProperty9 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public TProperty0 ProjectedProperty0 { get { throw null; } set { } } + public TProperty1 ProjectedProperty1 { get { throw null; } set { } } + public TProperty10 ProjectedProperty10 { get { throw null; } set { } } + public TProperty2 ProjectedProperty2 { get { throw null; } set { } } + public TProperty3 ProjectedProperty3 { get { throw null; } set { } } + public TProperty4 ProjectedProperty4 { get { throw null; } set { } } + public TProperty5 ProjectedProperty5 { get { throw null; } set { } } + public TProperty6 ProjectedProperty6 { get { throw null; } set { } } + public TProperty7 ProjectedProperty7 { get { throw null; } set { } } + public TProperty8 ProjectedProperty8 { get { throw null; } set { } } + public TProperty9 ProjectedProperty9 { get { throw null; } set { } } protected override object InternalGetExpandedPropertyValue(int nameIndex) { throw null; } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public sealed partial class ExpandedWrapper : System.Data.Services.Internal.ExpandedWrapper { public ExpandedWrapper() { } - public TProperty0 ProjectedProperty0 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty1 ProjectedProperty1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty10 ProjectedProperty10 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty11 ProjectedProperty11 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty2 ProjectedProperty2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty3 ProjectedProperty3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty4 ProjectedProperty4 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty5 ProjectedProperty5 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty6 ProjectedProperty6 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty7 ProjectedProperty7 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty8 ProjectedProperty8 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty9 ProjectedProperty9 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public TProperty0 ProjectedProperty0 { get { throw null; } set { } } + public TProperty1 ProjectedProperty1 { get { throw null; } set { } } + public TProperty10 ProjectedProperty10 { get { throw null; } set { } } + public TProperty11 ProjectedProperty11 { get { throw null; } set { } } + public TProperty2 ProjectedProperty2 { get { throw null; } set { } } + public TProperty3 ProjectedProperty3 { get { throw null; } set { } } + public TProperty4 ProjectedProperty4 { get { throw null; } set { } } + public TProperty5 ProjectedProperty5 { get { throw null; } set { } } + public TProperty6 ProjectedProperty6 { get { throw null; } set { } } + public TProperty7 ProjectedProperty7 { get { throw null; } set { } } + public TProperty8 ProjectedProperty8 { get { throw null; } set { } } + public TProperty9 ProjectedProperty9 { get { throw null; } set { } } protected override object InternalGetExpandedPropertyValue(int nameIndex) { throw null; } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public sealed partial class ExpandedWrapper : System.Data.Services.Internal.ExpandedWrapper { public ExpandedWrapper() { } - public TProperty0 ProjectedProperty0 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public TProperty0 ProjectedProperty0 { get { throw null; } set { } } protected override object InternalGetExpandedPropertyValue(int nameIndex) { throw null; } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public sealed partial class ExpandedWrapper : System.Data.Services.Internal.ExpandedWrapper { public ExpandedWrapper() { } - public TProperty0 ProjectedProperty0 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty1 ProjectedProperty1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public TProperty0 ProjectedProperty0 { get { throw null; } set { } } + public TProperty1 ProjectedProperty1 { get { throw null; } set { } } protected override object InternalGetExpandedPropertyValue(int nameIndex) { throw null; } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public sealed partial class ExpandedWrapper : System.Data.Services.Internal.ExpandedWrapper { public ExpandedWrapper() { } - public TProperty0 ProjectedProperty0 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty1 ProjectedProperty1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty2 ProjectedProperty2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public TProperty0 ProjectedProperty0 { get { throw null; } set { } } + public TProperty1 ProjectedProperty1 { get { throw null; } set { } } + public TProperty2 ProjectedProperty2 { get { throw null; } set { } } protected override object InternalGetExpandedPropertyValue(int nameIndex) { throw null; } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public sealed partial class ExpandedWrapper : System.Data.Services.Internal.ExpandedWrapper { public ExpandedWrapper() { } - public TProperty0 ProjectedProperty0 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty1 ProjectedProperty1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty2 ProjectedProperty2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty3 ProjectedProperty3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public TProperty0 ProjectedProperty0 { get { throw null; } set { } } + public TProperty1 ProjectedProperty1 { get { throw null; } set { } } + public TProperty2 ProjectedProperty2 { get { throw null; } set { } } + public TProperty3 ProjectedProperty3 { get { throw null; } set { } } protected override object InternalGetExpandedPropertyValue(int nameIndex) { throw null; } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public sealed partial class ExpandedWrapper : System.Data.Services.Internal.ExpandedWrapper { public ExpandedWrapper() { } - public TProperty0 ProjectedProperty0 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty1 ProjectedProperty1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty2 ProjectedProperty2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty3 ProjectedProperty3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty4 ProjectedProperty4 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public TProperty0 ProjectedProperty0 { get { throw null; } set { } } + public TProperty1 ProjectedProperty1 { get { throw null; } set { } } + public TProperty2 ProjectedProperty2 { get { throw null; } set { } } + public TProperty3 ProjectedProperty3 { get { throw null; } set { } } + public TProperty4 ProjectedProperty4 { get { throw null; } set { } } protected override object InternalGetExpandedPropertyValue(int nameIndex) { throw null; } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public sealed partial class ExpandedWrapper : System.Data.Services.Internal.ExpandedWrapper { public ExpandedWrapper() { } - public TProperty0 ProjectedProperty0 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty1 ProjectedProperty1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty2 ProjectedProperty2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty3 ProjectedProperty3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty4 ProjectedProperty4 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty5 ProjectedProperty5 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public TProperty0 ProjectedProperty0 { get { throw null; } set { } } + public TProperty1 ProjectedProperty1 { get { throw null; } set { } } + public TProperty2 ProjectedProperty2 { get { throw null; } set { } } + public TProperty3 ProjectedProperty3 { get { throw null; } set { } } + public TProperty4 ProjectedProperty4 { get { throw null; } set { } } + public TProperty5 ProjectedProperty5 { get { throw null; } set { } } protected override object InternalGetExpandedPropertyValue(int nameIndex) { throw null; } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public sealed partial class ExpandedWrapper : System.Data.Services.Internal.ExpandedWrapper { public ExpandedWrapper() { } - public TProperty0 ProjectedProperty0 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty1 ProjectedProperty1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty2 ProjectedProperty2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty3 ProjectedProperty3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty4 ProjectedProperty4 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty5 ProjectedProperty5 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty6 ProjectedProperty6 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public TProperty0 ProjectedProperty0 { get { throw null; } set { } } + public TProperty1 ProjectedProperty1 { get { throw null; } set { } } + public TProperty2 ProjectedProperty2 { get { throw null; } set { } } + public TProperty3 ProjectedProperty3 { get { throw null; } set { } } + public TProperty4 ProjectedProperty4 { get { throw null; } set { } } + public TProperty5 ProjectedProperty5 { get { throw null; } set { } } + public TProperty6 ProjectedProperty6 { get { throw null; } set { } } protected override object InternalGetExpandedPropertyValue(int nameIndex) { throw null; } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public sealed partial class ExpandedWrapper : System.Data.Services.Internal.ExpandedWrapper { public ExpandedWrapper() { } - public TProperty0 ProjectedProperty0 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty1 ProjectedProperty1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty2 ProjectedProperty2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty3 ProjectedProperty3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty4 ProjectedProperty4 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty5 ProjectedProperty5 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty6 ProjectedProperty6 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public TProperty7 ProjectedProperty7 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public TProperty0 ProjectedProperty0 { get { throw null; } set { } } + public TProperty1 ProjectedProperty1 { get { throw null; } set { } } + public TProperty2 ProjectedProperty2 { get { throw null; } set { } } + public TProperty3 ProjectedProperty3 { get { throw null; } set { } } + public TProperty4 ProjectedProperty4 { get { throw null; } set { } } + public TProperty5 ProjectedProperty5 { get { throw null; } set { } } + public TProperty6 ProjectedProperty6 { get { throw null; } set { } } + public TProperty7 ProjectedProperty7 { get { throw null; } set { } } protected override object InternalGetExpandedPropertyValue(int nameIndex) { throw null; } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] @@ -504,99 +504,99 @@ namespace System.Data.Services.Internal public sealed partial class ProjectedWrapper1 : System.Data.Services.Internal.ProjectedWrapper { public ProjectedWrapper1() { } - public object ProjectedProperty0 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public object ProjectedProperty0 { get { throw null; } set { } } protected override object InternalGetProjectedPropertyValue(int propertyIndex) { throw null; } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public sealed partial class ProjectedWrapper2 : System.Data.Services.Internal.ProjectedWrapper { public ProjectedWrapper2() { } - public object ProjectedProperty0 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public object ProjectedProperty0 { get { throw null; } set { } } + public object ProjectedProperty1 { get { throw null; } set { } } protected override object InternalGetProjectedPropertyValue(int propertyIndex) { throw null; } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public sealed partial class ProjectedWrapper3 : System.Data.Services.Internal.ProjectedWrapper { public ProjectedWrapper3() { } - public object ProjectedProperty0 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public object ProjectedProperty0 { get { throw null; } set { } } + public object ProjectedProperty1 { get { throw null; } set { } } + public object ProjectedProperty2 { get { throw null; } set { } } protected override object InternalGetProjectedPropertyValue(int propertyIndex) { throw null; } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public sealed partial class ProjectedWrapper4 : System.Data.Services.Internal.ProjectedWrapper { public ProjectedWrapper4() { } - public object ProjectedProperty0 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public object ProjectedProperty0 { get { throw null; } set { } } + public object ProjectedProperty1 { get { throw null; } set { } } + public object ProjectedProperty2 { get { throw null; } set { } } + public object ProjectedProperty3 { get { throw null; } set { } } protected override object InternalGetProjectedPropertyValue(int propertyIndex) { throw null; } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public sealed partial class ProjectedWrapper5 : System.Data.Services.Internal.ProjectedWrapper { public ProjectedWrapper5() { } - public object ProjectedProperty0 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty4 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public object ProjectedProperty0 { get { throw null; } set { } } + public object ProjectedProperty1 { get { throw null; } set { } } + public object ProjectedProperty2 { get { throw null; } set { } } + public object ProjectedProperty3 { get { throw null; } set { } } + public object ProjectedProperty4 { get { throw null; } set { } } protected override object InternalGetProjectedPropertyValue(int propertyIndex) { throw null; } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public sealed partial class ProjectedWrapper6 : System.Data.Services.Internal.ProjectedWrapper { public ProjectedWrapper6() { } - public object ProjectedProperty0 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty4 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty5 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public object ProjectedProperty0 { get { throw null; } set { } } + public object ProjectedProperty1 { get { throw null; } set { } } + public object ProjectedProperty2 { get { throw null; } set { } } + public object ProjectedProperty3 { get { throw null; } set { } } + public object ProjectedProperty4 { get { throw null; } set { } } + public object ProjectedProperty5 { get { throw null; } set { } } protected override object InternalGetProjectedPropertyValue(int propertyIndex) { throw null; } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public sealed partial class ProjectedWrapper7 : System.Data.Services.Internal.ProjectedWrapper { public ProjectedWrapper7() { } - public object ProjectedProperty0 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty4 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty5 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty6 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public object ProjectedProperty0 { get { throw null; } set { } } + public object ProjectedProperty1 { get { throw null; } set { } } + public object ProjectedProperty2 { get { throw null; } set { } } + public object ProjectedProperty3 { get { throw null; } set { } } + public object ProjectedProperty4 { get { throw null; } set { } } + public object ProjectedProperty5 { get { throw null; } set { } } + public object ProjectedProperty6 { get { throw null; } set { } } protected override object InternalGetProjectedPropertyValue(int propertyIndex) { throw null; } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public sealed partial class ProjectedWrapper8 : System.Data.Services.Internal.ProjectedWrapper { public ProjectedWrapper8() { } - public object ProjectedProperty0 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty4 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty5 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty6 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty7 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public object ProjectedProperty0 { get { throw null; } set { } } + public object ProjectedProperty1 { get { throw null; } set { } } + public object ProjectedProperty2 { get { throw null; } set { } } + public object ProjectedProperty3 { get { throw null; } set { } } + public object ProjectedProperty4 { get { throw null; } set { } } + public object ProjectedProperty5 { get { throw null; } set { } } + public object ProjectedProperty6 { get { throw null; } set { } } + public object ProjectedProperty7 { get { throw null; } set { } } protected override object InternalGetProjectedPropertyValue(int propertyIndex) { throw null; } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public partial class ProjectedWrapperMany : System.Data.Services.Internal.ProjectedWrapper { public ProjectedWrapperMany() { } - public System.Data.Services.Internal.ProjectedWrapperMany Next { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty0 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty4 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty5 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty6 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object ProjectedProperty7 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Data.Services.Internal.ProjectedWrapperMany Next { get { throw null; } set { } } + public object ProjectedProperty0 { get { throw null; } set { } } + public object ProjectedProperty1 { get { throw null; } set { } } + public object ProjectedProperty2 { get { throw null; } set { } } + public object ProjectedProperty3 { get { throw null; } set { } } + public object ProjectedProperty4 { get { throw null; } set { } } + public object ProjectedProperty5 { get { throw null; } set { } } + public object ProjectedProperty6 { get { throw null; } set { } } + public object ProjectedProperty7 { get { throw null; } set { } } protected override object InternalGetProjectedPropertyValue(int propertyIndex) { throw null; } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] @@ -729,11 +729,11 @@ namespace System.Data.Services.Providers public ResourceProperty(string name, System.Data.Services.Providers.ResourcePropertyKind kind, System.Data.Services.Providers.ResourceType propertyResourceType) { } public bool CanReflectOnInstanceTypeProperty { get { throw null; } set { } } public object CustomState { get { throw null; } set { } } - public bool IsReadOnly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Data.Services.Providers.ResourcePropertyKind Kind { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsReadOnly { get { throw null; } } + public System.Data.Services.Providers.ResourcePropertyKind Kind { get { throw null; } } public string MimeType { get { throw null; } set { } } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Data.Services.Providers.ResourceType ResourceType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } + public System.Data.Services.Providers.ResourceType ResourceType { get { throw null; } } public void SetReadOnly() { } } [System.FlagsAttribute] @@ -750,32 +750,32 @@ namespace System.Data.Services.Providers public partial class ResourceSet { public ResourceSet(string name, System.Data.Services.Providers.ResourceType elementType) { } - public object CustomState { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IsReadOnly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Data.Services.Providers.ResourceType ResourceType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public object CustomState { get { throw null; } set { } } + public bool IsReadOnly { get { throw null; } } + public string Name { get { throw null; } } + public System.Data.Services.Providers.ResourceType ResourceType { get { throw null; } } public void SetReadOnly() { } } [System.Diagnostics.DebuggerDisplayAttribute("{Name}: {InstanceType}, {ResourceTypeKind}")] public partial class ResourceType { public ResourceType(System.Type instanceType, System.Data.Services.Providers.ResourceTypeKind resourceTypeKind, System.Data.Services.Providers.ResourceType baseType, string namespaceName, string name, bool isAbstract) { } - public System.Data.Services.Providers.ResourceType BaseType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool CanReflectOnInstanceType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Data.Services.Providers.ResourceType BaseType { get { throw null; } } + public bool CanReflectOnInstanceType { get { throw null; } set { } } public object CustomState { get { throw null; } set { } } public System.Collections.ObjectModel.ReadOnlyCollection ETagProperties { get { throw null; } } - public string FullName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Type InstanceType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool IsAbstract { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string FullName { get { throw null; } } + public System.Type InstanceType { get { throw null; } } + public bool IsAbstract { get { throw null; } } public bool IsMediaLinkEntry { get { throw null; } set { } } public bool IsOpenType { get { throw null; } set { } } - public bool IsReadOnly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsReadOnly { get { throw null; } } public System.Collections.ObjectModel.ReadOnlyCollection KeyProperties { get { throw null; } } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } public string Namespace { get { throw null; } } public System.Collections.ObjectModel.ReadOnlyCollection Properties { get { throw null; } } public System.Collections.ObjectModel.ReadOnlyCollection PropertiesDeclaredOnThisType { get { throw null; } } - public System.Data.Services.Providers.ResourceTypeKind ResourceTypeKind { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Data.Services.Providers.ResourceTypeKind ResourceTypeKind { get { throw null; } } public void AddEntityPropertyMappingAttribute(System.Data.Services.Common.EntityPropertyMappingAttribute attribute) { } public void AddProperty(System.Data.Services.Providers.ResourceProperty property) { } public static System.Data.Services.Providers.ResourceType GetPrimitiveResourceType(System.Type type) { throw null; } @@ -792,7 +792,7 @@ namespace System.Data.Services.Providers public partial class ServiceOperation { public ServiceOperation(string name, System.Data.Services.Providers.ServiceOperationResultKind resultKind, System.Data.Services.Providers.ResourceType resultType, System.Data.Services.Providers.ResourceSet resultSet, string method, System.Collections.Generic.IEnumerable parameters) { } - public object CustomState { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public object CustomState { get { throw null; } set { } } public bool IsReadOnly { get { throw null; } } public string Method { get { throw null; } } public string MimeType { get { throw null; } set { } } @@ -807,10 +807,10 @@ namespace System.Data.Services.Providers public partial class ServiceOperationParameter { public ServiceOperationParameter(string name, System.Data.Services.Providers.ResourceType parameterType) { } - public object CustomState { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IsReadOnly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Data.Services.Providers.ResourceType ParameterType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public object CustomState { get { throw null; } set { } } + public bool IsReadOnly { get { throw null; } } + public string Name { get { throw null; } } + public System.Data.Services.Providers.ResourceType ParameterType { get { throw null; } } public void SetReadOnly() { } } public enum ServiceOperationResultKind diff --git a/external/api-snapshot/profiles/net_4_x/System.Data.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/System.Data.cs.REMOVED.git-id index 09176d3468..216ae04ccd 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Data.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/System.Data.cs.REMOVED.git-id @@ -1 +1 @@ -5e5914acc31e1bb832c5e1d9c94cb8d7fd4de4bc \ No newline at end of file +9e1130497674ca6fddbb0f93ec9e34908ec8a5d0 \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/System.Design.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/System.Design.cs.REMOVED.git-id index 8635302b1b..98be5c7eb3 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Design.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/System.Design.cs.REMOVED.git-id @@ -1 +1 @@ -dcf5fb58e8b97d3ebb70d575e3f41a6cddf3863f \ No newline at end of file +819208aec4081230fd518017f42a1bf9a7b1b984 \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/System.DirectoryServices.Protocols.cs b/external/api-snapshot/profiles/net_4_x/System.DirectoryServices.Protocols.cs index 0c882f6656..b7427b0834 100644 --- a/external/api-snapshot/profiles/net_4_x/System.DirectoryServices.Protocols.cs +++ b/external/api-snapshot/profiles/net_4_x/System.DirectoryServices.Protocols.cs @@ -62,8 +62,8 @@ namespace System.DirectoryServices.Protocols public AddRequest() { } public AddRequest(string distinguishedName, params System.DirectoryServices.Protocols.DirectoryAttribute[] attributes) { } public AddRequest(string distinguishedName, string objectClass) { } - public System.DirectoryServices.Protocols.DirectoryAttributeCollection Attributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string DistinguishedName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.DirectoryServices.Protocols.DirectoryAttributeCollection Attributes { get { throw null; } } + public string DistinguishedName { get { throw null; } set { } } protected override System.Xml.XmlElement ToXmlNode(System.Xml.XmlDocument doc) { throw null; } } public partial class AddResponse : System.DirectoryServices.Protocols.DirectoryResponse @@ -74,7 +74,7 @@ namespace System.DirectoryServices.Protocols { public AsqRequestControl() : base (default(string), default(byte[]), default(bool), default(bool)) { } public AsqRequestControl(string attributeName) : base (default(string), default(byte[]), default(bool), default(bool)) { } - public string AttributeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string AttributeName { get { throw null; } set { } } [System.MonoTODOAttribute] public override byte[] GetValue() { throw null; } } @@ -82,7 +82,7 @@ namespace System.DirectoryServices.Protocols public partial class AsqResponseControl : System.DirectoryServices.Protocols.DirectoryControl { internal AsqResponseControl() : base (default(string), default(byte[]), default(bool), default(bool)) { } - public System.DirectoryServices.Protocols.ResultCode Result { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.DirectoryServices.Protocols.ResultCode Result { get { throw null; } } } public enum AuthType { @@ -121,8 +121,8 @@ namespace System.DirectoryServices.Protocols public CompareRequest(string distinguishedName, string attributeName, byte[] value) { } public CompareRequest(string distinguishedName, string attributeName, string value) { } public CompareRequest(string distinguishedName, string attributeName, System.Uri value) { } - public System.DirectoryServices.Protocols.DirectoryAttribute Assertion { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string DistinguishedName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.DirectoryServices.Protocols.DirectoryAttribute Assertion { get { throw null; } } + public string DistinguishedName { get { throw null; } set { } } [System.MonoTODOAttribute] protected override System.Xml.XmlElement ToXmlNode(System.Xml.XmlDocument doc) { throw null; } } @@ -134,7 +134,7 @@ namespace System.DirectoryServices.Protocols { public CrossDomainMoveControl() : base (default(string), default(byte[]), default(bool), default(bool)) { } public CrossDomainMoveControl(string targetDomainController) : base (default(string), default(byte[]), default(bool), default(bool)) { } - public string TargetDomainController { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string TargetDomainController { get { throw null; } set { } } [System.MonoTODOAttribute] public override byte[] GetValue() { throw null; } } @@ -142,7 +142,7 @@ namespace System.DirectoryServices.Protocols { public DeleteRequest() { } public DeleteRequest(string distinguishedName) { } - public string DistinguishedName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string DistinguishedName { get { throw null; } set { } } [System.MonoTODOAttribute] protected override System.Xml.XmlElement ToXmlNode(System.Xml.XmlDocument doc) { throw null; } } @@ -167,7 +167,7 @@ namespace System.DirectoryServices.Protocols public DirectoryAttribute(string name, string value) { } public DirectoryAttribute(string name, System.Uri value) { } public object this[int index] { get { throw null; } set { } } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Name { get { throw null; } set { } } [System.MonoTODOAttribute] public int Add(byte[] value) { throw null; } [System.MonoTODOAttribute] @@ -214,7 +214,7 @@ namespace System.DirectoryServices.Protocols public partial class DirectoryAttributeModification : System.DirectoryServices.Protocols.DirectoryAttribute { public DirectoryAttributeModification() { } - public System.DirectoryServices.Protocols.DirectoryAttributeOperation Operation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.DirectoryServices.Protocols.DirectoryAttributeOperation Operation { get { throw null; } set { } } } public partial class DirectoryAttributeModificationCollection : System.Collections.CollectionBase { @@ -247,16 +247,16 @@ namespace System.DirectoryServices.Protocols [System.MonoTODOAttribute] public virtual System.DirectoryServices.Protocols.DirectoryIdentifier Directory { get { throw null; } } [System.MonoTODOAttribute] - public virtual System.TimeSpan Timeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual System.TimeSpan Timeout { get { throw null; } set { } } [System.DirectoryServices.DirectoryServicesPermissionAttribute(System.Security.Permissions.SecurityAction.LinkDemand, Unrestricted=true)] public abstract System.DirectoryServices.Protocols.DirectoryResponse SendRequest(System.DirectoryServices.Protocols.DirectoryRequest request); } public partial class DirectoryControl { public DirectoryControl(string type, byte[] value, bool isCritical, bool serverSide) { } - public bool IsCritical { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool ServerSide { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsCritical { get { throw null; } set { } } + public bool ServerSide { get { throw null; } set { } } + public string Type { get { throw null; } } [System.MonoTODOAttribute] public virtual byte[] GetValue() { throw null; } } @@ -307,7 +307,7 @@ namespace System.DirectoryServices.Protocols protected DirectoryOperationException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } public DirectoryOperationException(string message) { } public DirectoryOperationException(string message, System.Exception inner) { } - public System.DirectoryServices.Protocols.DirectoryResponse Response { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.DirectoryServices.Protocols.DirectoryResponse Response { get { throw null; } } [System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.Demand, SerializationFormatter=true)] public override void GetObjectData(System.Runtime.Serialization.SerializationInfo serializationInfo, System.Runtime.Serialization.StreamingContext streamingContext) { } } @@ -315,8 +315,8 @@ namespace System.DirectoryServices.Protocols public abstract partial class DirectoryRequest : System.DirectoryServices.Protocols.DirectoryOperation { internal DirectoryRequest() { } - public System.DirectoryServices.Protocols.DirectoryControlCollection Controls { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string RequestId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.DirectoryServices.Protocols.DirectoryControlCollection Controls { get { throw null; } } + public string RequestId { get { throw null; } set { } } protected abstract System.Xml.XmlElement ToXmlNode(System.Xml.XmlDocument doc); } [System.MonoTODOAttribute] @@ -345,18 +345,18 @@ namespace System.DirectoryServices.Protocols public DirSyncRequestControl(byte[] cookie) : base (default(string), default(byte[]), default(bool), default(bool)) { } public DirSyncRequestControl(byte[] cookie, System.DirectoryServices.Protocols.DirectorySynchronizationOptions option) : base (default(string), default(byte[]), default(bool), default(bool)) { } public DirSyncRequestControl(byte[] cookie, System.DirectoryServices.Protocols.DirectorySynchronizationOptions option, int attributeCount) : base (default(string), default(byte[]), default(bool), default(bool)) { } - public int AttributeCount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public byte[] Cookie { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.DirectoryServices.Protocols.DirectorySynchronizationOptions Option { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int AttributeCount { get { throw null; } set { } } + public byte[] Cookie { get { throw null; } set { } } + public System.DirectoryServices.Protocols.DirectorySynchronizationOptions Option { get { throw null; } set { } } public override byte[] GetValue() { throw null; } } [System.MonoTODOAttribute] public partial class DirSyncResponseControl : System.DirectoryServices.Protocols.DirectoryControl { internal DirSyncResponseControl() : base (default(string), default(byte[]), default(bool), default(bool)) { } - public byte[] Cookie { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool MoreData { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int ResultSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public byte[] Cookie { get { throw null; } } + public bool MoreData { get { throw null; } } + public int ResultSize { get { throw null; } } } public partial class DomainScopeControl : System.DirectoryServices.Protocols.DirectoryControl { @@ -366,7 +366,7 @@ namespace System.DirectoryServices.Protocols { public DsmlAuthRequest() { } public DsmlAuthRequest(string principal) { } - public string Principal { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Principal { get { throw null; } set { } } [System.MonoTODOAttribute] protected override System.Xml.XmlElement ToXmlNode(System.Xml.XmlDocument doc) { throw null; } } @@ -377,7 +377,7 @@ namespace System.DirectoryServices.Protocols public partial class DsmlDirectoryIdentifier : System.DirectoryServices.Protocols.DirectoryIdentifier { public DsmlDirectoryIdentifier(System.Uri serverUri) { } - public System.Uri ServerUri { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Uri ServerUri { get { throw null; } } } public abstract partial class DsmlDocument { @@ -420,14 +420,14 @@ namespace System.DirectoryServices.Protocols { internal DsmlRequestDocument() { } public int Count { get { throw null; } } - public System.DirectoryServices.Protocols.DsmlDocumentProcessing DocumentProcessing { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.DirectoryServices.Protocols.DsmlErrorProcessing ErrorProcessing { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.DirectoryServices.Protocols.DsmlDocumentProcessing DocumentProcessing { get { throw null; } set { } } + public System.DirectoryServices.Protocols.DsmlErrorProcessing ErrorProcessing { get { throw null; } set { } } protected bool IsFixedSize { get { throw null; } } protected bool IsReadOnly { get { throw null; } } protected bool IsSynchronized { get { throw null; } } public System.DirectoryServices.Protocols.DirectoryRequest this[int index] { get { throw null; } set { } } - public string RequestId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.DirectoryServices.Protocols.DsmlResponseOrder ResponseOrder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string RequestId { get { throw null; } set { } } + public System.DirectoryServices.Protocols.DsmlResponseOrder ResponseOrder { get { throw null; } set { } } protected object SyncRoot { get { throw null; } } int System.Collections.ICollection.Count { get { throw null; } } bool System.Collections.ICollection.IsSynchronized { get { throw null; } } @@ -459,20 +459,20 @@ namespace System.DirectoryServices.Protocols { public DsmlResponseDocument() { } public int Count { get { throw null; } } - public System.DirectoryServices.Protocols.DsmlDocumentProcessing DocumentProcessing { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.DirectoryServices.Protocols.DsmlErrorProcessing ErrorProcessing { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.DirectoryServices.Protocols.DsmlDocumentProcessing DocumentProcessing { get { throw null; } set { } } + public System.DirectoryServices.Protocols.DsmlErrorProcessing ErrorProcessing { get { throw null; } set { } } [System.MonoTODOAttribute] - public bool IsErrorResponse { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsErrorResponse { get { throw null; } } protected bool IsFixedSize { get { throw null; } } [System.MonoTODOAttribute] - public bool IsOperationError { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsOperationError { get { throw null; } } protected bool IsReadOnly { get { throw null; } } protected bool IsSynchronized { get { throw null; } } public System.DirectoryServices.Protocols.DirectoryResponse this[int index] { get { throw null; } set { } } [System.MonoTODOAttribute] - public string RequestId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ResponseId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.DirectoryServices.Protocols.DsmlResponseOrder ResponseOrder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string RequestId { get { throw null; } } + public string ResponseId { get { throw null; } set { } } + public System.DirectoryServices.Protocols.DsmlResponseOrder ResponseOrder { get { throw null; } set { } } protected object SyncRoot { get { throw null; } } int System.Collections.ICollection.Count { get { throw null; } } bool System.Collections.ICollection.IsSynchronized { get { throw null; } } @@ -499,7 +499,7 @@ namespace System.DirectoryServices.Protocols { protected DsmlSoapConnection() { } public abstract string SessionId { get; } - public System.Xml.XmlNode SoapRequestHeader { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Xml.XmlNode SoapRequestHeader { get { throw null; } set { } } [System.DirectoryServices.DirectoryServicesPermissionAttribute(System.Security.Permissions.SecurityAction.LinkDemand, Unrestricted=true)] public abstract void BeginSession(); [System.DirectoryServices.DirectoryServicesPermissionAttribute(System.Security.Permissions.SecurityAction.LinkDemand, Unrestricted=true)] @@ -511,11 +511,11 @@ namespace System.DirectoryServices.Protocols public DsmlSoapHttpConnection(System.DirectoryServices.Protocols.DsmlDirectoryIdentifier identifier, System.Net.NetworkCredential credential) { } public DsmlSoapHttpConnection(System.DirectoryServices.Protocols.DsmlDirectoryIdentifier identifier, System.Net.NetworkCredential credential, System.DirectoryServices.Protocols.AuthType authType) { } public DsmlSoapHttpConnection(System.Uri uri) { } - public System.DirectoryServices.Protocols.AuthType AuthType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.DirectoryServices.Protocols.AuthType AuthType { get { throw null; } set { } } [System.MonoTODOAttribute] public override string SessionId { get { throw null; } } - public string SoapActionHeader { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public override System.TimeSpan Timeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string SoapActionHeader { get { throw null; } set { } } + public override System.TimeSpan Timeout { get { throw null; } set { } } [System.DirectoryServices.DirectoryServicesPermissionAttribute(System.Security.Permissions.SecurityAction.LinkDemand, Unrestricted=true)] public void Abort(System.IAsyncResult asyncResult) { } [System.Net.NetworkInformation.NetworkInformationPermissionAttribute(System.Security.Permissions.SecurityAction.Assert, Unrestricted=true)] @@ -557,7 +557,7 @@ namespace System.DirectoryServices.Protocols protected ErrorResponseException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } public ErrorResponseException(string message) { } public ErrorResponseException(string message, System.Exception inner) { } - public System.DirectoryServices.Protocols.DsmlErrorResponse Response { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.DirectoryServices.Protocols.DsmlErrorResponse Response { get { throw null; } } [System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.Demand, SerializationFormatter=true)] public override void GetObjectData(System.Runtime.Serialization.SerializationInfo serializationInfo, System.Runtime.Serialization.StreamingContext streamingContext) { } } @@ -565,7 +565,7 @@ namespace System.DirectoryServices.Protocols { public ExtendedDNControl() : base (default(string), default(byte[]), default(bool), default(bool)) { } public ExtendedDNControl(System.DirectoryServices.Protocols.ExtendedDNFlag flag) : base (default(string), default(byte[]), default(bool), default(bool)) { } - public System.DirectoryServices.Protocols.ExtendedDNFlag Flag { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.DirectoryServices.Protocols.ExtendedDNFlag Flag { get { throw null; } set { } } [System.MonoTODOAttribute] public override byte[] GetValue() { throw null; } } @@ -579,8 +579,8 @@ namespace System.DirectoryServices.Protocols public ExtendedRequest() { } public ExtendedRequest(string requestName) { } public ExtendedRequest(string requestName, byte[] requestValue) { } - public string RequestName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public byte[] RequestValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string RequestName { get { throw null; } set { } } + public byte[] RequestValue { get { throw null; } set { } } [System.MonoTODOAttribute] protected override System.Xml.XmlElement ToXmlNode(System.Xml.XmlDocument doc) { throw null; } } @@ -588,9 +588,9 @@ namespace System.DirectoryServices.Protocols { internal ExtendedResponse() { } [System.MonoTODOAttribute] - public string ResponseName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string ResponseName { get { throw null; } } [System.MonoTODOAttribute] - public byte[] ResponseValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public byte[] ResponseValue { get { throw null; } } } public partial class LazyCommitControl : System.DirectoryServices.Protocols.DirectoryControl { @@ -603,13 +603,13 @@ namespace System.DirectoryServices.Protocols public LdapConnection(System.DirectoryServices.Protocols.LdapDirectoryIdentifier identifier, System.Net.NetworkCredential credential) { } public LdapConnection(System.DirectoryServices.Protocols.LdapDirectoryIdentifier identifier, System.Net.NetworkCredential credential, System.DirectoryServices.Protocols.AuthType authType) { } public LdapConnection(string server) { } - public System.DirectoryServices.Protocols.AuthType AuthType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool AutoBind { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.DirectoryServices.Protocols.AuthType AuthType { get { throw null; } set { } } + public bool AutoBind { get { throw null; } set { } } [System.MonoTODOAttribute] public override System.Net.NetworkCredential Credential { set { } } [System.MonoTODOAttribute] public System.DirectoryServices.Protocols.LdapSessionOptions SessionOptions { get { throw null; } } - public override System.TimeSpan Timeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public override System.TimeSpan Timeout { get { throw null; } set { } } [System.DirectoryServices.DirectoryServicesPermissionAttribute(System.Security.Permissions.SecurityAction.LinkDemand, Unrestricted=true)] public void Abort(System.IAsyncResult asyncResult) { } [System.DirectoryServices.DirectoryServicesPermissionAttribute(System.Security.Permissions.SecurityAction.LinkDemand, Unrestricted=true)] @@ -638,10 +638,10 @@ namespace System.DirectoryServices.Protocols public LdapDirectoryIdentifier(string server, int portNumber, bool fullyQualifiedDnsHostName, bool connectionless) { } public LdapDirectoryIdentifier(string[] servers, bool fullyQualifiedDnsHostName, bool connectionless) { } public LdapDirectoryIdentifier(string[] servers, int portNumber, bool fullyQualifiedDnsHostName, bool connectionless) { } - public bool Connectionless { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool FullyQualifiedDnsHostName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int PortNumber { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string[] Servers { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool Connectionless { get { throw null; } } + public bool FullyQualifiedDnsHostName { get { throw null; } } + public int PortNumber { get { throw null; } } + public string[] Servers { get { throw null; } } } [System.SerializableAttribute] public partial class LdapException : System.DirectoryServices.Protocols.DirectoryException, System.Runtime.Serialization.ISerializable @@ -655,9 +655,9 @@ namespace System.DirectoryServices.Protocols protected LdapException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } public LdapException(string message) { } public LdapException(string message, System.Exception inner) { } - public int ErrorCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.DirectoryServices.Protocols.PartialResultsCollection PartialResults { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ServerErrorMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int ErrorCode { get { throw null; } } + public System.DirectoryServices.Protocols.PartialResultsCollection PartialResults { get { throw null; } } + public string ServerErrorMessage { get { throw null; } } [System.MonoTODOAttribute] [System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.Demand, SerializationFormatter=true)] public override void GetObjectData(System.Runtime.Serialization.SerializationInfo serializationInfo, System.Runtime.Serialization.StreamingContext streamingContext) { } @@ -665,33 +665,33 @@ namespace System.DirectoryServices.Protocols public partial class LdapSessionOptions { internal LdapSessionOptions() { } - public bool AutoReconnect { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string DomainName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string HostName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool AutoReconnect { get { throw null; } set { } } + public string DomainName { get { throw null; } set { } } + public string HostName { get { throw null; } set { } } [System.MonoTODOAttribute] - public bool HostReachable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.DirectoryServices.Protocols.LocatorFlags LocatorFlag { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.TimeSpan PingKeepAliveTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int PingLimit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.TimeSpan PingWaitTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int ProtocolVersion { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.DirectoryServices.Protocols.QueryClientCertificateCallback QueryClientCertificate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.DirectoryServices.Protocols.ReferralCallback ReferralCallback { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.DirectoryServices.Protocols.ReferralChasingOptions ReferralChasing { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int ReferralHopLimit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool RootDseCache { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string SaslMethod { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool Sealing { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SecureSocketLayer { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool HostReachable { get { throw null; } } + public System.DirectoryServices.Protocols.LocatorFlags LocatorFlag { get { throw null; } set { } } + public System.TimeSpan PingKeepAliveTimeout { get { throw null; } set { } } + public int PingLimit { get { throw null; } set { } } + public System.TimeSpan PingWaitTimeout { get { throw null; } set { } } + public int ProtocolVersion { get { throw null; } set { } } + public System.DirectoryServices.Protocols.QueryClientCertificateCallback QueryClientCertificate { get { throw null; } set { } } + public System.DirectoryServices.Protocols.ReferralCallback ReferralCallback { get { throw null; } set { } } + public System.DirectoryServices.Protocols.ReferralChasingOptions ReferralChasing { get { throw null; } set { } } + public int ReferralHopLimit { get { throw null; } set { } } + public bool RootDseCache { get { throw null; } set { } } + public string SaslMethod { get { throw null; } set { } } + public bool Sealing { get { throw null; } set { } } + public bool SecureSocketLayer { get { throw null; } set { } } [System.MonoTODOAttribute] - public object SecurityContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.TimeSpan SendTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool Signing { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public object SecurityContext { get { throw null; } } + public System.TimeSpan SendTimeout { get { throw null; } set { } } + public bool Signing { get { throw null; } set { } } [System.MonoTODOAttribute] - public System.DirectoryServices.Protocols.SecurityPackageContextConnectionInformation SslInformation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int SspiFlag { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool TcpKeepAlive { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.DirectoryServices.Protocols.VerifyServerCertificateCallback VerifyServerCertificate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.DirectoryServices.Protocols.SecurityPackageContextConnectionInformation SslInformation { get { throw null; } } + public int SspiFlag { get { throw null; } set { } } + public bool TcpKeepAlive { get { throw null; } set { } } + public System.DirectoryServices.Protocols.VerifyServerCertificateCallback VerifyServerCertificate { get { throw null; } set { } } [System.MonoTODOAttribute] public void FastConcurrentBind() { } [System.MonoTODOAttribute] @@ -724,10 +724,10 @@ namespace System.DirectoryServices.Protocols { public ModifyDNRequest() { } public ModifyDNRequest(string distinguishedName, string newParentDistinguishedName, string newName) { } - public bool DeleteOldRdn { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string DistinguishedName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string NewName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string NewParentDistinguishedName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool DeleteOldRdn { get { throw null; } set { } } + public string DistinguishedName { get { throw null; } set { } } + public string NewName { get { throw null; } set { } } + public string NewParentDistinguishedName { get { throw null; } set { } } [System.MonoTODOAttribute] protected override System.Xml.XmlElement ToXmlNode(System.Xml.XmlDocument doc) { throw null; } } @@ -741,8 +741,8 @@ namespace System.DirectoryServices.Protocols public ModifyRequest() { } public ModifyRequest(string distinguishedName, params System.DirectoryServices.Protocols.DirectoryAttributeModification[] modifications) { } public ModifyRequest(string distinguishedName, System.DirectoryServices.Protocols.DirectoryAttributeOperation operation, string attributeName, params object[] values) { } - public string DistinguishedName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.DirectoryServices.Protocols.DirectoryAttributeModificationCollection Modifications { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string DistinguishedName { get { throw null; } set { } } + public System.DirectoryServices.Protocols.DirectoryAttributeModificationCollection Modifications { get { throw null; } } protected override System.Xml.XmlElement ToXmlNode(System.Xml.XmlDocument doc) { throw null; } } public partial class ModifyResponse : System.DirectoryServices.Protocols.DirectoryResponse @@ -755,17 +755,17 @@ namespace System.DirectoryServices.Protocols public PageResultRequestControl() : base (default(string), default(byte[]), default(bool), default(bool)) { } public PageResultRequestControl(byte[] cookie) : base (default(string), default(byte[]), default(bool), default(bool)) { } public PageResultRequestControl(int pageSize) : base (default(string), default(byte[]), default(bool), default(bool)) { } - public byte[] Cookie { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int PageSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public byte[] Cookie { get { throw null; } set { } } + public int PageSize { get { throw null; } set { } } [System.MonoTODOAttribute] public override byte[] GetValue() { throw null; } } public partial class PageResultResponseControl : System.DirectoryServices.Protocols.DirectoryControl { internal PageResultResponseControl() : base (default(string), default(byte[]), default(bool), default(bool)) { } - public byte[] Cookie { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public byte[] Cookie { get { throw null; } set { } } [System.MonoTODOAttribute] - public int TotalCount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int TotalCount { get { throw null; } } } public enum PartialResultProcessing { @@ -791,16 +791,16 @@ namespace System.DirectoryServices.Protocols { public QuotaControl() : base (default(string), default(byte[]), default(bool), default(bool)) { } public QuotaControl(System.Security.Principal.SecurityIdentifier querySid) : base (default(string), default(byte[]), default(bool), default(bool)) { } - public System.Security.Principal.SecurityIdentifier QuerySid { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Security.Principal.SecurityIdentifier QuerySid { get { throw null; } set { } } [System.MonoTODOAttribute] public override byte[] GetValue() { throw null; } } public sealed partial class ReferralCallback { public ReferralCallback() { } - public System.DirectoryServices.Protocols.DereferenceConnectionCallback DereferenceConnection { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.DirectoryServices.Protocols.NotifyOfNewConnectionCallback NotifyNewConnection { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.DirectoryServices.Protocols.QueryForConnectionCallback QueryForConnection { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.DirectoryServices.Protocols.DereferenceConnectionCallback DereferenceConnection { get { throw null; } set { } } + public System.DirectoryServices.Protocols.NotifyOfNewConnectionCallback NotifyNewConnection { get { throw null; } set { } } + public System.DirectoryServices.Protocols.QueryForConnectionCallback QueryForConnection { get { throw null; } set { } } } [System.FlagsAttribute] public enum ReferralChasingOptions @@ -865,7 +865,7 @@ namespace System.DirectoryServices.Protocols { public SearchOptionsControl() : base (default(string), default(byte[]), default(bool), default(bool)) { } public SearchOptionsControl(System.DirectoryServices.Protocols.SearchOption flags) : base (default(string), default(byte[]), default(bool), default(bool)) { } - public System.DirectoryServices.Protocols.SearchOption SearchOption { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.DirectoryServices.Protocols.SearchOption SearchOption { get { throw null; } set { } } [System.MonoTODOAttribute] public override byte[] GetValue() { throw null; } } @@ -877,14 +877,14 @@ namespace System.DirectoryServices.Protocols public SearchRequest(string distinguishedName, string ldapFilter, System.DirectoryServices.Protocols.SearchScope searchScope, params string[] attributeList) { } [System.MonoTODOAttribute] public SearchRequest(string distinguishedName, System.Xml.XmlDocument filter, System.DirectoryServices.Protocols.SearchScope searchScope, params string[] attributeList) { } - public System.DirectoryServices.Protocols.DereferenceAlias Aliases { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Specialized.StringCollection Attributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string DistinguishedName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object Filter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.DirectoryServices.Protocols.SearchScope Scope { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int SizeLimit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.TimeSpan TimeLimit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool TypesOnly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.DirectoryServices.Protocols.DereferenceAlias Aliases { get { throw null; } set { } } + public System.Collections.Specialized.StringCollection Attributes { get { throw null; } } + public string DistinguishedName { get { throw null; } set { } } + public object Filter { get { throw null; } set { } } + public System.DirectoryServices.Protocols.SearchScope Scope { get { throw null; } set { } } + public int SizeLimit { get { throw null; } set { } } + public System.TimeSpan TimeLimit { get { throw null; } set { } } + public bool TypesOnly { get { throw null; } set { } } [System.MonoTODOAttribute] protected override System.Xml.XmlElement ToXmlNode(System.Xml.XmlDocument doc) { throw null; } } @@ -895,13 +895,13 @@ namespace System.DirectoryServices.Protocols [System.MonoTODOAttribute] public override System.DirectoryServices.Protocols.DirectoryControl[] Controls { get { throw null; } } [System.MonoTODOAttribute] - public System.DirectoryServices.Protocols.SearchResultEntryCollection Entries { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.DirectoryServices.Protocols.SearchResultEntryCollection Entries { get { throw null; } } [System.MonoTODOAttribute] public override string ErrorMessage { get { throw null; } } [System.MonoTODOAttribute] public override string MatchedDN { get { throw null; } } [System.MonoTODOAttribute] - public System.DirectoryServices.Protocols.SearchResultReferenceCollection References { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.DirectoryServices.Protocols.SearchResultReferenceCollection References { get { throw null; } } [System.MonoTODOAttribute] public override System.Uri[] Referral { get { throw null; } } [System.MonoTODOAttribute] @@ -921,11 +921,11 @@ namespace System.DirectoryServices.Protocols { internal SearchResultEntry() { } [System.MonoTODOAttribute] - public System.DirectoryServices.Protocols.SearchResultAttributeCollection Attributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.DirectoryServices.Protocols.SearchResultAttributeCollection Attributes { get { throw null; } } [System.MonoTODOAttribute] - public System.DirectoryServices.Protocols.DirectoryControl[] Controls { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.DirectoryServices.Protocols.DirectoryControl[] Controls { get { throw null; } } [System.MonoTODOAttribute] - public string DistinguishedName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string DistinguishedName { get { throw null; } } } [System.MonoTODOAttribute] public partial class SearchResultEntryCollection : System.Collections.ReadOnlyCollectionBase @@ -940,8 +940,8 @@ namespace System.DirectoryServices.Protocols public partial class SearchResultReference { internal SearchResultReference() { } - public System.DirectoryServices.Protocols.DirectoryControl[] Controls { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Uri[] Reference { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.DirectoryServices.Protocols.DirectoryControl[] Controls { get { throw null; } } + public System.Uri[] Reference { get { throw null; } } } [System.MonoTODOAttribute] public partial class SearchResultReferenceCollection : System.Collections.ReadOnlyCollectionBase @@ -964,7 +964,7 @@ namespace System.DirectoryServices.Protocols public SecurityDescriptorFlagControl() : base (default(string), default(byte[]), default(bool), default(bool)) { } [System.MonoTODOAttribute] public SecurityDescriptorFlagControl(System.DirectoryServices.Protocols.SecurityMasks masks) : base (default(string), default(byte[]), default(bool), default(bool)) { } - public System.DirectoryServices.Protocols.SecurityMasks SecurityMasks { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.DirectoryServices.Protocols.SecurityMasks SecurityMasks { get { throw null; } set { } } [System.MonoTODOAttribute] public override byte[] GetValue() { throw null; } } @@ -981,13 +981,13 @@ namespace System.DirectoryServices.Protocols public partial class SecurityPackageContextConnectionInformation { internal SecurityPackageContextConnectionInformation() { } - public System.Security.Authentication.CipherAlgorithmType AlgorithmIdentifier { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int CipherStrength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int ExchangeStrength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Security.Authentication.HashAlgorithmType Hash { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int HashStrength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int KeyExchangeAlgorithm { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.DirectoryServices.Protocols.SecurityProtocol Protocol { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Security.Authentication.CipherAlgorithmType AlgorithmIdentifier { get { throw null; } } + public int CipherStrength { get { throw null; } } + public int ExchangeStrength { get { throw null; } } + public System.Security.Authentication.HashAlgorithmType Hash { get { throw null; } } + public int HashStrength { get { throw null; } } + public int KeyExchangeAlgorithm { get { throw null; } } + public System.DirectoryServices.Protocols.SecurityProtocol Protocol { get { throw null; } } } public enum SecurityProtocol { @@ -1009,9 +1009,9 @@ namespace System.DirectoryServices.Protocols { public SortKey() { } public SortKey(string attributeName, string matchingRule, bool reverseOrder) { } - public string AttributeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string MatchingRule { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool ReverseOrder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string AttributeName { get { throw null; } set { } } + public string MatchingRule { get { throw null; } set { } } + public bool ReverseOrder { get { throw null; } set { } } } public partial class SortRequestControl : System.DirectoryServices.Protocols.DirectoryControl { @@ -1021,7 +1021,7 @@ namespace System.DirectoryServices.Protocols public SortRequestControl(string attributeName, bool reverseOrder) : base (default(string), default(byte[]), default(bool), default(bool)) { } [System.MonoTODOAttribute] public SortRequestControl(string attributeName, string matchingRule, bool reverseOrder) : base (default(string), default(byte[]), default(bool), default(bool)) { } - public System.DirectoryServices.Protocols.SortKey[] SortKeys { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.DirectoryServices.Protocols.SortKey[] SortKeys { get { throw null; } set { } } [System.MonoTODOAttribute] public override byte[] GetValue() { throw null; } } @@ -1029,9 +1029,9 @@ namespace System.DirectoryServices.Protocols { internal SortResponseControl() : base (default(string), default(byte[]), default(bool), default(bool)) { } [System.MonoTODOAttribute] - public string AttributeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string AttributeName { get { throw null; } } [System.MonoTODOAttribute] - public System.DirectoryServices.Protocols.ResultCode Result { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.DirectoryServices.Protocols.ResultCode Result { get { throw null; } } } [System.SerializableAttribute] public partial class TlsOperationException : System.DirectoryServices.Protocols.DirectoryOperationException @@ -1056,8 +1056,8 @@ namespace System.DirectoryServices.Protocols public VerifyNameControl() : base (default(string), default(byte[]), default(bool), default(bool)) { } public VerifyNameControl(string serverName) : base (default(string), default(byte[]), default(bool), default(bool)) { } public VerifyNameControl(string serverName, int flag) : base (default(string), default(byte[]), default(bool), default(bool)) { } - public int Flag { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ServerName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int Flag { get { throw null; } set { } } + public string ServerName { get { throw null; } set { } } [System.MonoTODOAttribute] public override byte[] GetValue() { throw null; } } @@ -1070,12 +1070,12 @@ namespace System.DirectoryServices.Protocols public VlvRequestControl(int beforeCount, int afterCount, byte[] target) : base (default(string), default(byte[]), default(bool), default(bool)) { } public VlvRequestControl(int beforeCount, int afterCount, int offset) : base (default(string), default(byte[]), default(bool), default(bool)) { } public VlvRequestControl(int beforeCount, int afterCount, string target) : base (default(string), default(byte[]), default(bool), default(bool)) { } - public int AfterCount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int BeforeCount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public byte[] ContextId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int EstimateCount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int Offset { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public byte[] Target { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int AfterCount { get { throw null; } set { } } + public int BeforeCount { get { throw null; } set { } } + public byte[] ContextId { get { throw null; } set { } } + public int EstimateCount { get { throw null; } set { } } + public int Offset { get { throw null; } set { } } + public byte[] Target { get { throw null; } set { } } [System.MonoTODOAttribute] public override byte[] GetValue() { throw null; } } @@ -1083,12 +1083,12 @@ namespace System.DirectoryServices.Protocols { internal VlvResponseControl() : base (default(string), default(byte[]), default(bool), default(bool)) { } [System.MonoTODOAttribute] - public int ContentCount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int ContentCount { get { throw null; } } [System.MonoTODOAttribute] - public byte[] ContextId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public byte[] ContextId { get { throw null; } } [System.MonoTODOAttribute] - public System.DirectoryServices.Protocols.ResultCode Result { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.DirectoryServices.Protocols.ResultCode Result { get { throw null; } } [System.MonoTODOAttribute] - public int TargetPosition { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int TargetPosition { get { throw null; } } } } diff --git a/external/api-snapshot/profiles/net_4_x/System.Drawing.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/System.Drawing.cs.REMOVED.git-id index a0c5cce6c2..74b8283e3e 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Drawing.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/System.Drawing.cs.REMOVED.git-id @@ -1 +1 @@ -234aaf94d293014332715fe43d020e87b2c24a7c \ No newline at end of file +0be0635da28f7a80c39ead15950a870149eadd40 \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/System.IdentityModel.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/System.IdentityModel.cs.REMOVED.git-id index 80281a8d71..e55298120e 100644 --- a/external/api-snapshot/profiles/net_4_x/System.IdentityModel.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/System.IdentityModel.cs.REMOVED.git-id @@ -1 +1 @@ -cefe014693e6872e6d6ba53b8e957d63e3ae7f59 \ No newline at end of file +15f0240450884df4aba4cdd40a8ba20c8fd642b3 \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/System.Json.cs b/external/api-snapshot/profiles/net_4_x/System.Json.cs index 58d43c7e65..a636d4971c 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Json.cs +++ b/external/api-snapshot/profiles/net_4_x/System.Json.cs @@ -80,12 +80,16 @@ namespace System.Json public JsonPrimitive(short value) { } public JsonPrimitive(int value) { } public JsonPrimitive(long value) { } + [System.CLSCompliantAttribute(false)] public JsonPrimitive(sbyte value) { } public JsonPrimitive(float value) { } public JsonPrimitive(string value) { } public JsonPrimitive(System.TimeSpan value) { } + [System.CLSCompliantAttribute(false)] public JsonPrimitive(ushort value) { } + [System.CLSCompliantAttribute(false)] public JsonPrimitive(uint value) { } + [System.CLSCompliantAttribute(false)] public JsonPrimitive(ulong value) { } public JsonPrimitive(System.Uri value) { } public override System.Json.JsonType JsonType { get { throw null; } } @@ -131,20 +135,28 @@ namespace System.Json public static implicit operator short (System.Json.JsonValue value) { throw null; } public static implicit operator int (System.Json.JsonValue value) { throw null; } public static implicit operator long (System.Json.JsonValue value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator sbyte (System.Json.JsonValue value) { throw null; } public static implicit operator float (System.Json.JsonValue value) { throw null; } public static implicit operator string (System.Json.JsonValue value) { throw null; } public static implicit operator System.TimeSpan (System.Json.JsonValue value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator ushort (System.Json.JsonValue value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator uint (System.Json.JsonValue value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator ulong (System.Json.JsonValue value) { throw null; } public static implicit operator System.Uri (System.Json.JsonValue value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator System.Json.JsonValue (sbyte value) { throw null; } public static implicit operator System.Json.JsonValue (float value) { throw null; } public static implicit operator System.Json.JsonValue (string value) { throw null; } public static implicit operator System.Json.JsonValue (System.TimeSpan value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator System.Json.JsonValue (ushort value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator System.Json.JsonValue (uint value) { throw null; } + [System.CLSCompliantAttribute(false)] public static implicit operator System.Json.JsonValue (ulong value) { throw null; } public static implicit operator System.Json.JsonValue (System.Uri value) { throw null; } public static System.Json.JsonValue Parse(string jsonString) { throw null; } diff --git a/external/api-snapshot/profiles/net_4_x/System.Net.Http.Formatting.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/System.Net.Http.Formatting.cs.REMOVED.git-id index 580ad6c787..aabde2e5ea 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Net.Http.Formatting.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/System.Net.Http.Formatting.cs.REMOVED.git-id @@ -1 +1 @@ -b78f515b1914b7cba596f8334777522582d40538 \ No newline at end of file +9ae093889626929dd079402b5ab98aa54255b6af \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/System.Net.Http.cs b/external/api-snapshot/profiles/net_4_x/System.Net.Http.cs index b88013aae2..ae638e0719 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Net.Http.cs +++ b/external/api-snapshot/profiles/net_4_x/System.Net.Http.cs @@ -184,7 +184,7 @@ namespace System.Net.Http public HttpRequestMessage() { } public HttpRequestMessage(System.Net.Http.HttpMethod method, string requestUri) { } public HttpRequestMessage(System.Net.Http.HttpMethod method, System.Uri requestUri) { } - public System.Net.Http.HttpContent Content { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Net.Http.HttpContent Content { get { throw null; } set { } } public System.Net.Http.Headers.HttpRequestHeaders Headers { get { throw null; } } public System.Net.Http.HttpMethod Method { get { throw null; } set { } } public System.Collections.Generic.IDictionary Properties { get { throw null; } } @@ -198,11 +198,11 @@ namespace System.Net.Http { public HttpResponseMessage() { } public HttpResponseMessage(System.Net.HttpStatusCode statusCode) { } - public System.Net.Http.HttpContent Content { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Net.Http.HttpContent Content { get { throw null; } set { } } public System.Net.Http.Headers.HttpResponseHeaders Headers { get { throw null; } } public bool IsSuccessStatusCode { get { throw null; } } public string ReasonPhrase { get { throw null; } set { } } - public System.Net.Http.HttpRequestMessage RequestMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Net.Http.HttpRequestMessage RequestMessage { get { throw null; } set { } } public System.Net.HttpStatusCode StatusCode { get { throw null; } set { } } public System.Version Version { get { throw null; } set { } } public void Dispose() { } @@ -260,8 +260,8 @@ namespace System.Net.Http.Headers { public AuthenticationHeaderValue(string scheme) { } public AuthenticationHeaderValue(string scheme, string parameter) { } - public string Parameter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Scheme { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Parameter { get { throw null; } } + public string Scheme { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.AuthenticationHeaderValue Parse(string input) { throw null; } @@ -273,21 +273,21 @@ namespace System.Net.Http.Headers { public CacheControlHeaderValue() { } public System.Collections.Generic.ICollection Extensions { get { throw null; } } - public System.Nullable MaxAge { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool MaxStale { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable MaxStaleLimit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable MinFresh { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool MustRevalidate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool NoCache { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Nullable MaxAge { get { throw null; } set { } } + public bool MaxStale { get { throw null; } set { } } + public System.Nullable MaxStaleLimit { get { throw null; } set { } } + public System.Nullable MinFresh { get { throw null; } set { } } + public bool MustRevalidate { get { throw null; } set { } } + public bool NoCache { get { throw null; } set { } } public System.Collections.Generic.ICollection NoCacheHeaders { get { throw null; } } - public bool NoStore { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool NoTransform { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool OnlyIfCached { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool Private { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool NoStore { get { throw null; } set { } } + public bool NoTransform { get { throw null; } set { } } + public bool OnlyIfCached { get { throw null; } set { } } + public bool Private { get { throw null; } set { } } public System.Collections.Generic.ICollection PrivateHeaders { get { throw null; } } - public bool ProxyRevalidate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool Public { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Nullable SharedMaxAge { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool ProxyRevalidate { get { throw null; } set { } } + public bool Public { get { throw null; } set { } } + public System.Nullable SharedMaxAge { get { throw null; } set { } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.CacheControlHeaderValue Parse(string input) { throw null; } @@ -320,11 +320,11 @@ namespace System.Net.Http.Headers public ContentRangeHeaderValue(long length) { } public ContentRangeHeaderValue(long from, long to) { } public ContentRangeHeaderValue(long from, long to, long length) { } - public System.Nullable From { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Nullable From { get { throw null; } } public bool HasLength { get { throw null; } } public bool HasRange { get { throw null; } } - public System.Nullable Length { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Nullable To { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Nullable Length { get { throw null; } } + public System.Nullable To { get { throw null; } } public string Unit { get { throw null; } set { } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } @@ -338,8 +338,8 @@ namespace System.Net.Http.Headers public EntityTagHeaderValue(string tag) { } public EntityTagHeaderValue(string tag, bool isWeak) { } public static System.Net.Http.Headers.EntityTagHeaderValue Any { get { throw null; } } - public bool IsWeak { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Tag { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsWeak { get { throw null; } } + public string Tag { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.EntityTagHeaderValue Parse(string input) { throw null; } @@ -480,7 +480,7 @@ namespace System.Net.Http.Headers protected internal NameValueHeaderValue(System.Net.Http.Headers.NameValueHeaderValue source) { } public NameValueHeaderValue(string name) { } public NameValueHeaderValue(string name, string value) { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } public string Value { get { throw null; } set { } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } @@ -506,8 +506,8 @@ namespace System.Net.Http.Headers { public ProductHeaderValue(string name) { } public ProductHeaderValue(string name, string version) { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Version { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } + public string Version { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.ProductHeaderValue Parse(string input) { throw null; } @@ -520,8 +520,8 @@ namespace System.Net.Http.Headers public ProductInfoHeaderValue(System.Net.Http.Headers.ProductHeaderValue product) { } public ProductInfoHeaderValue(string comment) { } public ProductInfoHeaderValue(string productName, string productVersion) { } - public string Comment { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Net.Http.Headers.ProductHeaderValue Product { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Comment { get { throw null; } } + public System.Net.Http.Headers.ProductHeaderValue Product { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.ProductInfoHeaderValue Parse(string input) { throw null; } @@ -534,8 +534,8 @@ namespace System.Net.Http.Headers public RangeConditionHeaderValue(System.DateTimeOffset date) { } public RangeConditionHeaderValue(System.Net.Http.Headers.EntityTagHeaderValue entityTag) { } public RangeConditionHeaderValue(string entityTag) { } - public System.Nullable Date { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Net.Http.Headers.EntityTagHeaderValue EntityTag { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Nullable Date { get { throw null; } } + public System.Net.Http.Headers.EntityTagHeaderValue EntityTag { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.RangeConditionHeaderValue Parse(string input) { throw null; } @@ -559,8 +559,8 @@ namespace System.Net.Http.Headers public partial class RangeItemHeaderValue : System.ICloneable { public RangeItemHeaderValue(System.Nullable from, System.Nullable to) { } - public System.Nullable From { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Nullable To { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Nullable From { get { throw null; } } + public System.Nullable To { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } object System.ICloneable.Clone() { throw null; } @@ -570,8 +570,8 @@ namespace System.Net.Http.Headers { public RetryConditionHeaderValue(System.DateTimeOffset date) { } public RetryConditionHeaderValue(System.TimeSpan delta) { } - public System.Nullable Date { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Nullable Delta { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Nullable Date { get { throw null; } } + public System.Nullable Delta { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.RetryConditionHeaderValue Parse(string input) { throw null; } @@ -583,8 +583,8 @@ namespace System.Net.Http.Headers { public StringWithQualityHeaderValue(string value) { } public StringWithQualityHeaderValue(string value, double quality) { } - public System.Nullable Quality { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Nullable Quality { get { throw null; } } + public string Value { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.StringWithQualityHeaderValue Parse(string input) { throw null; } @@ -618,10 +618,10 @@ namespace System.Net.Http.Headers public ViaHeaderValue(string protocolVersion, string receivedBy) { } public ViaHeaderValue(string protocolVersion, string receivedBy, string protocolName) { } public ViaHeaderValue(string protocolVersion, string receivedBy, string protocolName, string comment) { } - public string Comment { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ProtocolName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ProtocolVersion { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ReceivedBy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Comment { get { throw null; } } + public string ProtocolName { get { throw null; } } + public string ProtocolVersion { get { throw null; } } + public string ReceivedBy { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.ViaHeaderValue Parse(string input) { throw null; } @@ -633,10 +633,10 @@ namespace System.Net.Http.Headers { public WarningHeaderValue(int code, string agent, string text) { } public WarningHeaderValue(int code, string agent, string text, System.DateTimeOffset date) { } - public string Agent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int Code { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Nullable Date { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Text { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Agent { get { throw null; } } + public int Code { get { throw null; } } + public System.Nullable Date { get { throw null; } } + public string Text { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static System.Net.Http.Headers.WarningHeaderValue Parse(string input) { throw null; } diff --git a/external/api-snapshot/profiles/net_4_x/System.Numerics.Vectors.cs b/external/api-snapshot/profiles/net_4_x/System.Numerics.Vectors.cs index e86e636a64..1207cb4acc 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Numerics.Vectors.cs +++ b/external/api-snapshot/profiles/net_4_x/System.Numerics.Vectors.cs @@ -24,162 +24,8 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Matrix4x4))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Plane))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Quaternion))] +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Vector))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Vector2))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Vector3))] [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Vector4))] -namespace System.Numerics -{ - public static partial class Vector - { - public static bool IsHardwareAccelerated { get { throw null; } } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Abs(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Add(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector AndNot(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector AsVectorByte(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector AsVectorDouble(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector AsVectorInt16(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector AsVectorInt32(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector AsVectorInt64(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector AsVectorSByte(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector AsVectorSingle(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector AsVectorUInt16(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector AsVectorUInt32(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector AsVectorUInt64(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector BitwiseAnd(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector BitwiseOr(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector ConditionalSelect(System.Numerics.Vector condition, System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector ConditionalSelect(System.Numerics.Vector condition, System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector ConditionalSelect(System.Numerics.Vector condition, System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - public static System.Numerics.Vector ConvertToDouble(System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector ConvertToDouble(System.Numerics.Vector value) { throw null; } - public static System.Numerics.Vector ConvertToInt32(System.Numerics.Vector value) { throw null; } - public static System.Numerics.Vector ConvertToInt64(System.Numerics.Vector value) { throw null; } - public static System.Numerics.Vector ConvertToSingle(System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector ConvertToSingle(System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector ConvertToUInt32(System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector ConvertToUInt64(System.Numerics.Vector value) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Divide(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static T Dot(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Equals(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Equals(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Equals(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Equals(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool EqualsAll(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool EqualsAny(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Equals(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool GreaterThanAll(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool GreaterThanAny(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool GreaterThanOrEqualAll(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool GreaterThanOrEqualAny(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector GreaterThan(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThan(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool LessThanAll(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool LessThanAny(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool LessThanOrEqualAll(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool LessThanOrEqualAny(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThanOrEqual(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector LessThan(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Max(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Min(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Multiply(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Multiply(System.Numerics.Vector left, T right) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Multiply(T left, System.Numerics.Vector right) where T : struct { throw null; } - public static System.Numerics.Vector Narrow(System.Numerics.Vector low, System.Numerics.Vector high) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector Narrow(System.Numerics.Vector low, System.Numerics.Vector high) { throw null; } - public static System.Numerics.Vector Narrow(System.Numerics.Vector low, System.Numerics.Vector high) { throw null; } - public static System.Numerics.Vector Narrow(System.Numerics.Vector low, System.Numerics.Vector high) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector Narrow(System.Numerics.Vector low, System.Numerics.Vector high) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector Narrow(System.Numerics.Vector low, System.Numerics.Vector high) { throw null; } - [System.CLSCompliantAttribute(false)] - public static System.Numerics.Vector Narrow(System.Numerics.Vector low, System.Numerics.Vector high) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Negate(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector OnesComplement(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector SquareRoot(System.Numerics.Vector value) where T : struct { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Subtract(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - [System.CLSCompliantAttribute(false)] - public static void Widen(System.Numerics.Vector source, out System.Numerics.Vector low, out System.Numerics.Vector high) { low = default(System.Numerics.Vector); high = default(System.Numerics.Vector); } - public static void Widen(System.Numerics.Vector source, out System.Numerics.Vector low, out System.Numerics.Vector high) { low = default(System.Numerics.Vector); high = default(System.Numerics.Vector); } - public static void Widen(System.Numerics.Vector source, out System.Numerics.Vector low, out System.Numerics.Vector high) { low = default(System.Numerics.Vector); high = default(System.Numerics.Vector); } - [System.CLSCompliantAttribute(false)] - public static void Widen(System.Numerics.Vector source, out System.Numerics.Vector low, out System.Numerics.Vector high) { low = default(System.Numerics.Vector); high = default(System.Numerics.Vector); } - public static void Widen(System.Numerics.Vector source, out System.Numerics.Vector low, out System.Numerics.Vector high) { low = default(System.Numerics.Vector); high = default(System.Numerics.Vector); } - [System.CLSCompliantAttribute(false)] - public static void Widen(System.Numerics.Vector source, out System.Numerics.Vector low, out System.Numerics.Vector high) { low = default(System.Numerics.Vector); high = default(System.Numerics.Vector); } - [System.CLSCompliantAttribute(false)] - public static void Widen(System.Numerics.Vector source, out System.Numerics.Vector low, out System.Numerics.Vector high) { low = default(System.Numerics.Vector); high = default(System.Numerics.Vector); } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector Xor(System.Numerics.Vector left, System.Numerics.Vector right) where T : struct { throw null; } - } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public partial struct Vector : System.IEquatable>, System.IFormattable where T : struct - { - public Vector(T value) { throw null;} - public Vector(T[] values) { throw null;} - public Vector(T[] values, int index) { throw null;} - public static int Count { get { throw null; } } - public T this[int index] { get { throw null; } } - public static System.Numerics.Vector One { get { throw null; } } - public static System.Numerics.Vector Zero { get { throw null; } } - public void CopyTo(T[] destination) { } - public void CopyTo(T[] destination, int startIndex) { } - public bool Equals(System.Numerics.Vector other) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public override bool Equals(object obj) { throw null; } - public override int GetHashCode() { throw null; } - public static System.Numerics.Vector operator +(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static System.Numerics.Vector operator &(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static System.Numerics.Vector operator |(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static System.Numerics.Vector operator /(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool operator ==(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static System.Numerics.Vector operator ^(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - [System.CLSCompliantAttribute(false)] - public static explicit operator System.Numerics.Vector (System.Numerics.Vector value) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool operator !=(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static System.Numerics.Vector operator *(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static System.Numerics.Vector operator *(System.Numerics.Vector value, T factor) { throw null; } - public static System.Numerics.Vector operator *(T factor, System.Numerics.Vector value) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.Numerics.Vector operator ~(System.Numerics.Vector value) { throw null; } - public static System.Numerics.Vector operator -(System.Numerics.Vector left, System.Numerics.Vector right) { throw null; } - public static System.Numerics.Vector operator -(System.Numerics.Vector value) { throw null; } - public override string ToString() { throw null; } - public string ToString(string format) { throw null; } - public string ToString(string format, System.IFormatProvider formatProvider) { throw null; } - } -} +[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Numerics.Vector<>))] diff --git a/external/api-snapshot/profiles/net_4_x/System.Reactive.Core.cs b/external/api-snapshot/profiles/net_4_x/System.Reactive.Core.cs index 203107a91a..1010b412b8 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Reactive.Core.cs +++ b/external/api-snapshot/profiles/net_4_x/System.Reactive.Core.cs @@ -470,7 +470,7 @@ namespace System.Reactive.PlatformServices { public SystemClockChangedEventArgs() { } public SystemClockChangedEventArgs(System.DateTimeOffset oldTime, System.DateTimeOffset newTime) { } - public System.DateTimeOffset NewTime { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.DateTimeOffset OldTime { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.DateTimeOffset NewTime { get { throw null; } } + public System.DateTimeOffset OldTime { get { throw null; } } } } diff --git a/external/api-snapshot/profiles/net_4_x/System.Reactive.Linq.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/System.Reactive.Linq.cs.REMOVED.git-id index 3a9adfc91a..77a46c64b8 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Reactive.Linq.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/System.Reactive.Linq.cs.REMOVED.git-id @@ -1 +1 @@ -dbcff3b136057e84ca39ad293c06a9ceefcee79e \ No newline at end of file +b64f5caa985b751e340df107104c2549b68f5dba \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/System.Reactive.Providers.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/System.Reactive.Providers.cs.REMOVED.git-id index 15c73e3bcd..68431daf17 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Reactive.Providers.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/System.Reactive.Providers.cs.REMOVED.git-id @@ -1 +1 @@ -3f81d1e4ac493f8dab5e1371ae278671c79fd047 \ No newline at end of file +8ef33ca842abc8a25d9edb9ba36ab11c875cb8fa \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/System.Runtime.Caching.cs b/external/api-snapshot/profiles/net_4_x/System.Runtime.Caching.cs index 03530b72bd..aeb79117c0 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Runtime.Caching.cs +++ b/external/api-snapshot/profiles/net_4_x/System.Runtime.Caching.cs @@ -96,9 +96,9 @@ namespace System.Runtime.Caching public CacheItem(string key) { } public CacheItem(string key, object value) { } public CacheItem(string key, object value, string regionName) { } - public string Key { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string RegionName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Key { get { throw null; } set { } } + public string RegionName { get { throw null; } set { } } + public object Value { get { throw null; } set { } } } public partial class CacheItemPolicy { diff --git a/external/api-snapshot/profiles/net_4_x/System.Runtime.CompilerServices.Unsafe.cs b/external/api-snapshot/profiles/net_4_x/System.Runtime.CompilerServices.Unsafe.cs index 70b70ea055..5e8d07e76d 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Runtime.CompilerServices.Unsafe.cs +++ b/external/api-snapshot/profiles/net_4_x/System.Runtime.CompilerServices.Unsafe.cs @@ -30,6 +30,8 @@ namespace System.Runtime.CompilerServices [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public unsafe static void InitBlock(void* startAddress, byte value, uint byteCount) { } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static void InitBlockUnaligned(ref byte startAddress, byte value, uint byteCount) { } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public unsafe static void InitBlockUnaligned(void* startAddress, byte value, uint byteCount) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool IsAddressGreaterThan(ref T left, ref T right) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool IsAddressLessThan(ref T left, ref T right) { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static T ReadUnaligned(ref byte source) { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public unsafe static T ReadUnaligned(void* source) { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public unsafe static T Read(void* source) { throw null; } diff --git a/external/api-snapshot/profiles/net_4_x/System.Runtime.DurableInstancing.cs b/external/api-snapshot/profiles/net_4_x/System.Runtime.DurableInstancing.cs index 2aec9eec42..05556a0ffd 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Runtime.DurableInstancing.cs +++ b/external/api-snapshot/profiles/net_4_x/System.Runtime.DurableInstancing.cs @@ -170,7 +170,7 @@ namespace System.Runtime.DurableInstancing public sealed partial class InstanceHandle { internal InstanceHandle() { } - public bool IsValid { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsValid { get { throw null; } } public void Free() { } } [System.SerializableAttribute] @@ -193,7 +193,7 @@ namespace System.Runtime.DurableInstancing public static System.Runtime.DurableInstancing.InstanceKey InvalidKey { get { throw null; } } public bool IsValid { get { throw null; } } public System.Collections.Generic.IDictionary Metadata { get { throw null; } } - public System.Guid Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Guid Value { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } } @@ -208,8 +208,8 @@ namespace System.Runtime.DurableInstancing public InstanceKeyCollisionException(System.Xml.Linq.XName commandName, System.Guid instanceId, System.Runtime.DurableInstancing.InstanceKey instanceKey, System.Guid conflictingInstanceId) { } public InstanceKeyCollisionException(System.Xml.Linq.XName commandName, System.Guid instanceId, System.Runtime.DurableInstancing.InstanceKey instanceKey, System.Guid conflictingInstanceId, System.Exception innerException) { } public InstanceKeyCollisionException(System.Xml.Linq.XName commandName, System.Guid instanceId, System.Runtime.DurableInstancing.InstanceKey instanceKey, System.Guid conflictingInstanceId, string message, System.Exception innerException) { } - public System.Guid ConflictingInstanceId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Runtime.DurableInstancing.InstanceKey InstanceKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Guid ConflictingInstanceId { get { throw null; } } + public System.Runtime.DurableInstancing.InstanceKey InstanceKey { get { throw null; } } [System.Security.SecurityCriticalAttribute] public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } } @@ -224,7 +224,7 @@ namespace System.Runtime.DurableInstancing public InstanceKeyCompleteException(System.Xml.Linq.XName commandName, System.Guid instanceId, System.Runtime.DurableInstancing.InstanceKey instanceKey, string message, System.Exception innerException) { } public InstanceKeyCompleteException(System.Xml.Linq.XName commandName, System.Runtime.DurableInstancing.InstanceKey instanceKey) { } public InstanceKeyCompleteException(System.Xml.Linq.XName commandName, System.Runtime.DurableInstancing.InstanceKey instanceKey, System.Exception innerException) { } - public System.Runtime.DurableInstancing.InstanceKey InstanceKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Runtime.DurableInstancing.InstanceKey InstanceKey { get { throw null; } } [System.Security.SecurityCriticalAttribute] public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } } @@ -239,7 +239,7 @@ namespace System.Runtime.DurableInstancing public InstanceKeyNotReadyException(System.Xml.Linq.XName commandName, System.Guid instanceId, System.Runtime.DurableInstancing.InstanceKey instanceKey, string message, System.Exception innerException) { } public InstanceKeyNotReadyException(System.Xml.Linq.XName commandName, System.Runtime.DurableInstancing.InstanceKey instanceKey) { } public InstanceKeyNotReadyException(System.Xml.Linq.XName commandName, System.Runtime.DurableInstancing.InstanceKey instanceKey, System.Exception innerException) { } - public System.Runtime.DurableInstancing.InstanceKey InstanceKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Runtime.DurableInstancing.InstanceKey InstanceKey { get { throw null; } } [System.Security.SecurityCriticalAttribute] public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } } @@ -252,10 +252,10 @@ namespace System.Runtime.DurableInstancing public sealed partial class InstanceKeyView { internal InstanceKeyView() { } - public System.Guid InstanceKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Guid InstanceKey { get { throw null; } } public System.Collections.Generic.IDictionary InstanceKeyMetadata { get { throw null; } } - public System.Runtime.DurableInstancing.InstanceValueConsistency InstanceKeyMetadataConsistency { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Runtime.DurableInstancing.InstanceKeyState InstanceKeyState { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Runtime.DurableInstancing.InstanceValueConsistency InstanceKeyMetadataConsistency { get { throw null; } } + public System.Runtime.DurableInstancing.InstanceKeyState InstanceKeyState { get { throw null; } } } [System.SerializableAttribute] public partial class InstanceLockedException : System.Runtime.DurableInstancing.InstancePersistenceCommandException @@ -271,8 +271,8 @@ namespace System.Runtime.DurableInstancing public InstanceLockedException(System.Xml.Linq.XName commandName, System.Guid instanceId, System.Guid instanceOwnerId, System.Collections.Generic.IDictionary serializableInstanceOwnerMetadata, System.Exception innerException) { } public InstanceLockedException(System.Xml.Linq.XName commandName, System.Guid instanceId, System.Guid instanceOwnerId, System.Collections.Generic.IDictionary serializableInstanceOwnerMetadata, string message, System.Exception innerException) { } public InstanceLockedException(System.Xml.Linq.XName commandName, System.Guid instanceId, string message, System.Exception innerException) { } - public System.Guid InstanceOwnerId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Collections.Generic.IDictionary SerializableInstanceOwnerMetadata { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Guid InstanceOwnerId { get { throw null; } } + public System.Collections.Generic.IDictionary SerializableInstanceOwnerMetadata { get { throw null; } } [System.Security.SecurityCriticalAttribute] public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } } @@ -293,7 +293,7 @@ namespace System.Runtime.DurableInstancing public InstanceLockQueryResult() { } public InstanceLockQueryResult(System.Collections.Generic.IDictionary instanceOwnerIds) { } public InstanceLockQueryResult(System.Guid instanceId, System.Guid instanceOwnerId) { } - public System.Collections.Generic.IDictionary InstanceOwnerIds { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IDictionary InstanceOwnerIds { get { throw null; } } } [System.SerializableAttribute] public partial class InstanceNotReadyException : System.Runtime.DurableInstancing.InstancePersistenceCommandException @@ -310,7 +310,7 @@ namespace System.Runtime.DurableInstancing public sealed partial class InstanceOwner { internal InstanceOwner() { } - public System.Guid InstanceOwnerId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Guid InstanceOwnerId { get { throw null; } } } [System.SerializableAttribute] public partial class InstanceOwnerException : System.Runtime.DurableInstancing.InstancePersistenceException @@ -323,7 +323,7 @@ namespace System.Runtime.DurableInstancing public InstanceOwnerException(System.Xml.Linq.XName commandName, System.Guid instanceOwnerId) { } public InstanceOwnerException(System.Xml.Linq.XName commandName, System.Guid instanceOwnerId, System.Exception innerException) { } public InstanceOwnerException(System.Xml.Linq.XName commandName, System.Guid instanceOwnerId, string message, System.Exception innerException) { } - public System.Guid InstanceOwnerId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Guid InstanceOwnerId { get { throw null; } } [System.Security.SecurityCriticalAttribute] public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } } @@ -332,14 +332,14 @@ namespace System.Runtime.DurableInstancing public InstanceOwnerQueryResult() { } public InstanceOwnerQueryResult(System.Collections.Generic.IDictionary> instanceOwners) { } public InstanceOwnerQueryResult(System.Guid instanceOwnerId, System.Collections.Generic.IDictionary metadata) { } - public System.Collections.Generic.IDictionary> InstanceOwners { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IDictionary> InstanceOwners { get { throw null; } } } public abstract partial class InstancePersistenceCommand { protected InstancePersistenceCommand(System.Xml.Linq.XName name) { } protected internal virtual bool AutomaticallyAcquiringLock { get { throw null; } } protected internal virtual bool IsTransactionEnlistmentOptional { get { throw null; } } - public System.Xml.Linq.XName Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Xml.Linq.XName Name { get { throw null; } } protected internal virtual void Validate(System.Runtime.DurableInstancing.InstanceView view) { } } [System.SerializableAttribute] @@ -356,16 +356,16 @@ namespace System.Runtime.DurableInstancing public InstancePersistenceCommandException(System.Xml.Linq.XName commandName, System.Guid instanceId, System.Exception innerException) { } public InstancePersistenceCommandException(System.Xml.Linq.XName commandName, System.Guid instanceId, string message, System.Exception innerException) { } public InstancePersistenceCommandException(System.Xml.Linq.XName commandName, string message, System.Exception innerException) { } - public System.Guid InstanceId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Guid InstanceId { get { throw null; } } [System.Security.SecurityCriticalAttribute] public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } } public sealed partial class InstancePersistenceContext { internal InstancePersistenceContext() { } - public System.Runtime.DurableInstancing.InstanceHandle InstanceHandle { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Runtime.DurableInstancing.InstanceHandle InstanceHandle { get { throw null; } } public long InstanceVersion { get { throw null; } } - public System.Runtime.DurableInstancing.InstanceView InstanceView { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Runtime.DurableInstancing.InstanceView InstanceView { get { throw null; } } public System.Guid LockToken { get { throw null; } } public object UserContext { get { throw null; } } public void AssociatedInstanceKey(System.Guid key) { } @@ -397,7 +397,7 @@ namespace System.Runtime.DurableInstancing public abstract partial class InstancePersistenceEvent : System.IEquatable { internal InstancePersistenceEvent() { } - public System.Xml.Linq.XName Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Xml.Linq.XName Name { get { throw null; } } public override bool Equals(object obj) { throw null; } public bool Equals(System.Runtime.DurableInstancing.InstancePersistenceEvent persistenceEvent) { throw null; } public override int GetHashCode() { throw null; } @@ -421,7 +421,7 @@ namespace System.Runtime.DurableInstancing public InstancePersistenceException(System.Xml.Linq.XName commandName, System.Exception innerException) { } public InstancePersistenceException(System.Xml.Linq.XName commandName, string message) { } public InstancePersistenceException(System.Xml.Linq.XName commandName, string message, System.Exception innerException) { } - public System.Xml.Linq.XName CommandName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Xml.Linq.XName CommandName { get { throw null; } } [System.Security.SecurityCriticalAttribute] public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } } @@ -435,7 +435,7 @@ namespace System.Runtime.DurableInstancing public abstract partial class InstanceStore { protected InstanceStore() { } - public System.Runtime.DurableInstancing.InstanceOwner DefaultInstanceOwner { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Runtime.DurableInstancing.InstanceOwner DefaultInstanceOwner { get { throw null; } set { } } public System.IAsyncResult BeginExecute(System.Runtime.DurableInstancing.InstanceHandle handle, System.Runtime.DurableInstancing.InstancePersistenceCommand command, System.TimeSpan timeout, System.AsyncCallback callback, object state) { throw null; } protected internal virtual System.IAsyncResult BeginTryCommand(System.Runtime.DurableInstancing.InstancePersistenceContext context, System.Runtime.DurableInstancing.InstancePersistenceCommand command, System.TimeSpan timeout, System.AsyncCallback callback, object state) { throw null; } public System.IAsyncResult BeginWaitForEvents(System.Runtime.DurableInstancing.InstanceHandle handle, System.TimeSpan timeout, System.AsyncCallback callback, object state) { throw null; } @@ -467,8 +467,8 @@ namespace System.Runtime.DurableInstancing public InstanceValue(object value, System.Runtime.DurableInstancing.InstanceValueOptions options) { } public static System.Runtime.DurableInstancing.InstanceValue DeletedValue { get { throw null; } } public bool IsDeletedValue { get { throw null; } } - public System.Runtime.DurableInstancing.InstanceValueOptions Options { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Runtime.DurableInstancing.InstanceValueOptions Options { get { throw null; } } + public object Value { get { throw null; } } } [System.FlagsAttribute] public enum InstanceValueConsistency @@ -492,18 +492,18 @@ namespace System.Runtime.DurableInstancing { internal InstanceView() { } public System.Collections.Generic.IDictionary InstanceData { get { throw null; } } - public System.Runtime.DurableInstancing.InstanceValueConsistency InstanceDataConsistency { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Guid InstanceId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Runtime.DurableInstancing.InstanceValueConsistency InstanceDataConsistency { get { throw null; } } + public System.Guid InstanceId { get { throw null; } } public System.Collections.Generic.IDictionary InstanceKeys { get { throw null; } } - public System.Runtime.DurableInstancing.InstanceValueConsistency InstanceKeysConsistency { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Runtime.DurableInstancing.InstanceValueConsistency InstanceKeysConsistency { get { throw null; } } public System.Collections.Generic.IDictionary InstanceMetadata { get { throw null; } } - public System.Runtime.DurableInstancing.InstanceValueConsistency InstanceMetadataConsistency { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Runtime.DurableInstancing.InstanceOwner InstanceOwner { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Runtime.DurableInstancing.InstanceValueConsistency InstanceMetadataConsistency { get { throw null; } } + public System.Runtime.DurableInstancing.InstanceOwner InstanceOwner { get { throw null; } } public System.Collections.Generic.IDictionary InstanceOwnerMetadata { get { throw null; } } - public System.Runtime.DurableInstancing.InstanceValueConsistency InstanceOwnerMetadataConsistency { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Runtime.DurableInstancing.InstanceState InstanceState { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Runtime.DurableInstancing.InstanceValueConsistency InstanceOwnerMetadataConsistency { get { throw null; } } + public System.Runtime.DurableInstancing.InstanceState InstanceState { get { throw null; } } public System.Collections.ObjectModel.ReadOnlyCollection InstanceStoreQueryResults { get { throw null; } } - public bool IsBoundToInstance { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsBoundToInstance { get { throw null; } } public bool IsBoundToInstanceOwner { get { throw null; } } public bool IsBoundToLock { get { throw null; } } } diff --git a/external/api-snapshot/profiles/net_4_x/System.Runtime.Serialization.cs b/external/api-snapshot/profiles/net_4_x/System.Runtime.Serialization.cs index 131f8efadd..1168980973 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Runtime.Serialization.cs +++ b/external/api-snapshot/profiles/net_4_x/System.Runtime.Serialization.cs @@ -110,15 +110,15 @@ namespace System.Runtime.Serialization public partial class DataContractSerializerSettings { public DataContractSerializerSettings() { } - public System.Runtime.Serialization.DataContractResolver DataContractResolver { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Runtime.Serialization.IDataContractSurrogate DataContractSurrogate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IgnoreExtensionDataObject { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IEnumerable KnownTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Runtime.Serialization.DataContractResolver DataContractResolver { get { throw null; } set { } } + public System.Runtime.Serialization.IDataContractSurrogate DataContractSurrogate { get { throw null; } set { } } + public bool IgnoreExtensionDataObject { get { throw null; } set { } } + public System.Collections.Generic.IEnumerable KnownTypes { get { throw null; } set { } } public int MaxItemsInObjectGraph { get { throw null; } set { } } - public bool PreserveObjectReferences { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Xml.XmlDictionaryString RootName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Xml.XmlDictionaryString RootNamespace { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SerializeReadOnlyTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool PreserveObjectReferences { get { throw null; } set { } } + public System.Xml.XmlDictionaryString RootName { get { throw null; } set { } } + public System.Xml.XmlDictionaryString RootNamespace { get { throw null; } set { } } + public bool SerializeReadOnlyTypes { get { throw null; } set { } } } [System.AttributeUsageAttribute((System.AttributeTargets)(384), Inherited=false, AllowMultiple=false)] public sealed partial class DataMemberAttribute : System.Attribute @@ -470,15 +470,15 @@ namespace System.Runtime.Serialization.Json public partial class DataContractJsonSerializerSettings { public DataContractJsonSerializerSettings() { } - public System.Runtime.Serialization.IDataContractSurrogate DataContractSurrogate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Runtime.Serialization.DateTimeFormat DateTimeFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Runtime.Serialization.EmitTypeInformation EmitTypeInformation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IgnoreExtensionDataObject { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IEnumerable KnownTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Runtime.Serialization.IDataContractSurrogate DataContractSurrogate { get { throw null; } set { } } + public System.Runtime.Serialization.DateTimeFormat DateTimeFormat { get { throw null; } set { } } + public System.Runtime.Serialization.EmitTypeInformation EmitTypeInformation { get { throw null; } set { } } + public bool IgnoreExtensionDataObject { get { throw null; } set { } } + public System.Collections.Generic.IEnumerable KnownTypes { get { throw null; } set { } } public int MaxItemsInObjectGraph { get { throw null; } set { } } - public string RootName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SerializeReadOnlyTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool UseSimpleDictionaryFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string RootName { get { throw null; } set { } } + public bool SerializeReadOnlyTypes { get { throw null; } set { } } + public bool UseSimpleDictionaryFormat { get { throw null; } set { } } } [System.Runtime.CompilerServices.TypeForwardedFromAttribute("System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")] public partial interface IXmlJsonReaderInitializer diff --git a/external/api-snapshot/profiles/net_4_x/System.ServiceModel.Activation.cs b/external/api-snapshot/profiles/net_4_x/System.ServiceModel.Activation.cs index ddf33fae2d..2e26686b8d 100644 --- a/external/api-snapshot/profiles/net_4_x/System.ServiceModel.Activation.cs +++ b/external/api-snapshot/profiles/net_4_x/System.ServiceModel.Activation.cs @@ -59,7 +59,7 @@ namespace System.ServiceModel [System.Runtime.CompilerServices.TypeForwardedFromAttribute("System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] public static partial class ServiceHostingEnvironment { - public static bool AspNetCompatibilityEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public static bool AspNetCompatibilityEnabled { get { throw null; } } public static void EnsureServiceAvailable(string virtualPath) { } } } diff --git a/external/api-snapshot/profiles/net_4_x/System.ServiceModel.Discovery.cs b/external/api-snapshot/profiles/net_4_x/System.ServiceModel.Discovery.cs index dadbf4321c..dcf60bdfc8 100644 --- a/external/api-snapshot/profiles/net_4_x/System.ServiceModel.Discovery.cs +++ b/external/api-snapshot/profiles/net_4_x/System.ServiceModel.Discovery.cs @@ -30,7 +30,7 @@ namespace System.ServiceModel.Discovery public System.ServiceModel.Description.ClientCredentials ClientCredentials { get { throw null; } } public System.ServiceModel.Description.ServiceEndpoint Endpoint { get { throw null; } } public System.ServiceModel.IClientChannel InnerChannel { get { throw null; } } - public System.ServiceModel.Discovery.DiscoveryMessageSequenceGenerator MessageSequenceGenerator { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.ServiceModel.Discovery.DiscoveryMessageSequenceGenerator MessageSequenceGenerator { get { throw null; } set { } } System.ServiceModel.CommunicationState System.ServiceModel.ICommunicationObject.State { get { throw null; } } public event System.EventHandler AnnounceOfflineCompleted { add { } remove { } } public event System.EventHandler AnnounceOnlineCompleted { add { } remove { } } @@ -70,14 +70,14 @@ namespace System.ServiceModel.Discovery public AnnouncementEndpoint(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress address) : base (default(System.ServiceModel.Description.ContractDescription)) { } public AnnouncementEndpoint(System.ServiceModel.Discovery.DiscoveryVersion discoveryVersion) : base (default(System.ServiceModel.Description.ContractDescription)) { } public AnnouncementEndpoint(System.ServiceModel.Discovery.DiscoveryVersion discoveryVersion, System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress address) : base (default(System.ServiceModel.Description.ContractDescription)) { } - public System.ServiceModel.Discovery.DiscoveryVersion DiscoveryVersion { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.TimeSpan MaxAnnouncementDelay { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.ServiceModel.Discovery.DiscoveryVersion DiscoveryVersion { get { throw null; } } + public System.TimeSpan MaxAnnouncementDelay { get { throw null; } set { } } } public partial class AnnouncementEventArgs : System.EventArgs { internal AnnouncementEventArgs() { } - public System.ServiceModel.Discovery.EndpointDiscoveryMetadata EndpointDiscoveryMetadata { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.ServiceModel.Discovery.DiscoveryMessageSequence MessageSequence { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ServiceModel.Discovery.EndpointDiscoveryMetadata EndpointDiscoveryMetadata { get { throw null; } } + public System.ServiceModel.Discovery.DiscoveryMessageSequence MessageSequence { get { throw null; } } } [System.ServiceModel.ServiceBehaviorAttribute(InstanceContextMode=(System.ServiceModel.InstanceContextMode)(2), ConcurrencyMode=(System.ServiceModel.ConcurrencyMode)(2))] public partial class AnnouncementService @@ -137,8 +137,8 @@ namespace System.ServiceModel.Discovery public static readonly System.ServiceModel.EndpointAddress DiscoveryEndpointAddress; public DiscoveryClientBindingElement() { } public DiscoveryClientBindingElement(System.ServiceModel.Discovery.DiscoveryEndpointProvider discoveryEndpointProvider, System.ServiceModel.Discovery.FindCriteria findCriteria) { } - public System.ServiceModel.Discovery.DiscoveryEndpointProvider DiscoveryEndpointProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.ServiceModel.Discovery.FindCriteria FindCriteria { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.ServiceModel.Discovery.DiscoveryEndpointProvider DiscoveryEndpointProvider { get { throw null; } set { } } + public System.ServiceModel.Discovery.FindCriteria FindCriteria { get { throw null; } set { } } public override System.ServiceModel.Channels.IChannelFactory BuildChannelFactory(System.ServiceModel.Channels.BindingContext context) { throw null; } public override System.ServiceModel.Channels.IChannelListener BuildChannelListener(System.ServiceModel.Channels.BindingContext context) { throw null; } public override bool CanBuildChannelFactory(System.ServiceModel.Channels.BindingContext context) { throw null; } @@ -152,9 +152,9 @@ namespace System.ServiceModel.Discovery public DiscoveryEndpoint(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress endpointAddress) : base (default(System.ServiceModel.Description.ContractDescription)) { } public DiscoveryEndpoint(System.ServiceModel.Discovery.DiscoveryVersion discoveryVersion, System.ServiceModel.Discovery.ServiceDiscoveryMode discoveryMode) : base (default(System.ServiceModel.Description.ContractDescription)) { } public DiscoveryEndpoint(System.ServiceModel.Discovery.DiscoveryVersion discoveryVersion, System.ServiceModel.Discovery.ServiceDiscoveryMode discoveryMode, System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress endpointAddress) : base (default(System.ServiceModel.Description.ContractDescription)) { } - public System.ServiceModel.Discovery.ServiceDiscoveryMode DiscoveryMode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.ServiceModel.Discovery.DiscoveryVersion DiscoveryVersion { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.TimeSpan MaxResponseDelay { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.ServiceModel.Discovery.ServiceDiscoveryMode DiscoveryMode { get { throw null; } } + public System.ServiceModel.Discovery.DiscoveryVersion DiscoveryVersion { get { throw null; } } + public System.TimeSpan MaxResponseDelay { get { throw null; } set { } } } public abstract partial class DiscoveryEndpointProvider { @@ -164,9 +164,9 @@ namespace System.ServiceModel.Discovery public partial class DiscoveryMessageSequence : System.IComparable, System.IEquatable { internal DiscoveryMessageSequence() { } - public long InstanceId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public long MessageNumber { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Uri SequenceId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public long InstanceId { get { throw null; } } + public long MessageNumber { get { throw null; } } + public System.Uri SequenceId { get { throw null; } } public bool CanCompareTo(System.ServiceModel.Discovery.DiscoveryMessageSequence other) { throw null; } public int CompareTo(System.ServiceModel.Discovery.DiscoveryMessageSequence other) { throw null; } public override bool Equals(object obj) { throw null; } @@ -224,7 +224,7 @@ namespace System.ServiceModel.Discovery public abstract partial class DiscoveryServiceExtension : System.ServiceModel.IExtension { protected DiscoveryServiceExtension() { } - public System.Collections.ObjectModel.ReadOnlyCollection PublishedEndpoints { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.ObjectModel.ReadOnlyCollection PublishedEndpoints { get { throw null; } } protected abstract System.ServiceModel.Discovery.DiscoveryService GetDiscoveryService(); void System.ServiceModel.IExtension.Attach(System.ServiceModel.ServiceHostBase owner) { } void System.ServiceModel.IExtension.Detach(System.ServiceModel.ServiceHostBase owner) { } @@ -232,10 +232,10 @@ namespace System.ServiceModel.Discovery public sealed partial class DiscoveryVersion { internal DiscoveryVersion() { } - public System.Uri AdhocAddress { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.ServiceModel.Channels.MessageVersion MessageVersion { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Namespace { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Uri AdhocAddress { get { throw null; } } + public System.ServiceModel.Channels.MessageVersion MessageVersion { get { throw null; } } + public string Name { get { throw null; } } + public string Namespace { get { throw null; } } public static System.ServiceModel.Discovery.DiscoveryVersion WSDiscovery11 { get { throw null; } } public static System.ServiceModel.Discovery.DiscoveryVersion WSDiscoveryApril2005 { get { throw null; } } public static System.ServiceModel.Discovery.DiscoveryVersion WSDiscoveryCD1 { get { throw null; } } @@ -245,16 +245,16 @@ namespace System.ServiceModel.Discovery public partial class DynamicEndpoint : System.ServiceModel.Description.ServiceEndpoint { public DynamicEndpoint(System.ServiceModel.Description.ContractDescription contract, System.ServiceModel.Channels.Binding binding) : base (default(System.ServiceModel.Description.ContractDescription)) { } - public System.ServiceModel.Discovery.DiscoveryEndpointProvider DiscoveryEndpointProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.ServiceModel.Discovery.FindCriteria FindCriteria { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.ServiceModel.Discovery.DiscoveryEndpointProvider DiscoveryEndpointProvider { get { throw null; } set { } } + public System.ServiceModel.Discovery.FindCriteria FindCriteria { get { throw null; } set { } } } public partial class EndpointDiscoveryBehavior : System.ServiceModel.Description.IEndpointBehavior { public EndpointDiscoveryBehavior() { } - public System.Collections.ObjectModel.Collection ContractTypeNames { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool Enabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.ObjectModel.Collection Extensions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Collections.ObjectModel.Collection Scopes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.ObjectModel.Collection ContractTypeNames { get { throw null; } } + public bool Enabled { get { throw null; } set { } } + public System.Collections.ObjectModel.Collection Extensions { get { throw null; } } + public System.Collections.ObjectModel.Collection Scopes { get { throw null; } } void System.ServiceModel.Description.IEndpointBehavior.AddBindingParameters(System.ServiceModel.Description.ServiceEndpoint endpoint, System.ServiceModel.Channels.BindingParameterCollection bindingParameters) { } void System.ServiceModel.Description.IEndpointBehavior.ApplyClientBehavior(System.ServiceModel.Description.ServiceEndpoint endpoint, System.ServiceModel.Dispatcher.ClientRuntime clientRuntime) { } void System.ServiceModel.Description.IEndpointBehavior.ApplyDispatchBehavior(System.ServiceModel.Description.ServiceEndpoint endpoint, System.ServiceModel.Dispatcher.EndpointDispatcher endpointDispatcher) { } @@ -263,19 +263,19 @@ namespace System.ServiceModel.Discovery public partial class EndpointDiscoveryMetadata { public EndpointDiscoveryMetadata() { } - public System.ServiceModel.EndpointAddress Address { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.ObjectModel.Collection ContractTypeNames { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Collections.ObjectModel.Collection Extensions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Collections.ObjectModel.Collection ListenUris { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Collections.ObjectModel.Collection Scopes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int Version { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.ServiceModel.EndpointAddress Address { get { throw null; } set { } } + public System.Collections.ObjectModel.Collection ContractTypeNames { get { throw null; } } + public System.Collections.ObjectModel.Collection Extensions { get { throw null; } } + public System.Collections.ObjectModel.Collection ListenUris { get { throw null; } } + public System.Collections.ObjectModel.Collection Scopes { get { throw null; } } + public int Version { get { throw null; } set { } } public static System.ServiceModel.Discovery.EndpointDiscoveryMetadata FromServiceEndpoint(System.ServiceModel.Description.ServiceEndpoint endpoint) { throw null; } public static System.ServiceModel.Discovery.EndpointDiscoveryMetadata FromServiceEndpoint(System.ServiceModel.Description.ServiceEndpoint endpoint, System.ServiceModel.Dispatcher.EndpointDispatcher endpointDispatcher) { throw null; } } public partial class FindCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { internal FindCompletedEventArgs() : base (default(System.Exception), default(bool), default(object)) { } - public System.ServiceModel.Discovery.FindResponse Result { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ServiceModel.Discovery.FindResponse Result { get { throw null; } } } public partial class FindCriteria { @@ -286,12 +286,12 @@ namespace System.ServiceModel.Discovery public static readonly System.Uri ScopeMatchByUuid; public FindCriteria() { } public FindCriteria(System.Type contractType) { } - public System.Collections.ObjectModel.Collection ContractTypeNames { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.TimeSpan Duration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.ObjectModel.Collection Extensions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int MaxResults { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Uri ScopeMatchBy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.ObjectModel.Collection Scopes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.ObjectModel.Collection ContractTypeNames { get { throw null; } } + public System.TimeSpan Duration { get { throw null; } set { } } + public System.Collections.ObjectModel.Collection Extensions { get { throw null; } } + public int MaxResults { get { throw null; } set { } } + public System.Uri ScopeMatchBy { get { throw null; } set { } } + public System.Collections.ObjectModel.Collection Scopes { get { throw null; } } public static System.ServiceModel.Discovery.FindCriteria CreateMetadataExchangeEndpointCriteria() { throw null; } public static System.ServiceModel.Discovery.FindCriteria CreateMetadataExchangeEndpointCriteria(System.Collections.Generic.IEnumerable contractTypeNames) { throw null; } public static System.ServiceModel.Discovery.FindCriteria CreateMetadataExchangeEndpointCriteria(System.Type contractType) { throw null; } @@ -301,46 +301,46 @@ namespace System.ServiceModel.Discovery public partial class FindProgressChangedEventArgs : System.ComponentModel.ProgressChangedEventArgs { internal FindProgressChangedEventArgs() : base (default(int), default(object)) { } - public System.ServiceModel.Discovery.EndpointDiscoveryMetadata EndpointDiscoveryMetadata { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.ServiceModel.Discovery.DiscoveryMessageSequence MessageSequence { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ServiceModel.Discovery.EndpointDiscoveryMetadata EndpointDiscoveryMetadata { get { throw null; } } + public System.ServiceModel.Discovery.DiscoveryMessageSequence MessageSequence { get { throw null; } } } public partial class FindRequestContext { protected FindRequestContext(System.ServiceModel.Discovery.FindCriteria criteria) { } - public System.ServiceModel.Discovery.FindCriteria Criteria { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ServiceModel.Discovery.FindCriteria Criteria { get { throw null; } } public void AddMatchingEndpoint(System.ServiceModel.Discovery.EndpointDiscoveryMetadata matchingEndpoint) { } protected virtual void OnAddMatchingEndpoint(System.ServiceModel.Discovery.EndpointDiscoveryMetadata matchingEndpoint) { } } public partial class FindResponse { internal FindResponse() { } - public System.Collections.ObjectModel.Collection Endpoints { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.ObjectModel.Collection Endpoints { get { throw null; } } [System.MonoTODOAttribute] public System.ServiceModel.Discovery.DiscoveryMessageSequence GetMessageSequence(System.ServiceModel.Discovery.EndpointDiscoveryMetadata endpointDiscoveryMetadata) { throw null; } } public partial class ResolveCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { internal ResolveCompletedEventArgs() : base (default(System.Exception), default(bool), default(object)) { } - public System.ServiceModel.Discovery.ResolveResponse Result { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ServiceModel.Discovery.ResolveResponse Result { get { throw null; } } } public partial class ResolveCriteria { public ResolveCriteria() { } public ResolveCriteria(System.ServiceModel.EndpointAddress address) { } - public System.ServiceModel.EndpointAddress Address { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.TimeSpan Duration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.ObjectModel.Collection Extensions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ServiceModel.EndpointAddress Address { get { throw null; } set { } } + public System.TimeSpan Duration { get { throw null; } set { } } + public System.Collections.ObjectModel.Collection Extensions { get { throw null; } } } public partial class ResolveResponse { internal ResolveResponse() { } - public System.ServiceModel.Discovery.EndpointDiscoveryMetadata EndpointDiscoveryMetadata { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.ServiceModel.Discovery.DiscoveryMessageSequence MessageSequence { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.ServiceModel.Discovery.EndpointDiscoveryMetadata EndpointDiscoveryMetadata { get { throw null; } } + public System.ServiceModel.Discovery.DiscoveryMessageSequence MessageSequence { get { throw null; } } } public partial class ServiceDiscoveryBehavior : System.ServiceModel.Description.IServiceBehavior { public ServiceDiscoveryBehavior() { } - public System.Collections.ObjectModel.Collection AnnouncementEndpoints { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.ObjectModel.Collection AnnouncementEndpoints { get { throw null; } } void System.ServiceModel.Description.IServiceBehavior.AddBindingParameters(System.ServiceModel.Description.ServiceDescription serviceDescription, System.ServiceModel.ServiceHostBase serviceHostBase, System.Collections.ObjectModel.Collection endpoints, System.ServiceModel.Channels.BindingParameterCollection bindingParameters) { } void System.ServiceModel.Description.IServiceBehavior.ApplyDispatchBehavior(System.ServiceModel.Description.ServiceDescription serviceDescription, System.ServiceModel.ServiceHostBase serviceHostBase) { } void System.ServiceModel.Description.IServiceBehavior.Validate(System.ServiceModel.Description.ServiceDescription serviceDescription, System.ServiceModel.ServiceHostBase serviceHostBase) { } @@ -360,8 +360,8 @@ namespace System.ServiceModel.Discovery public UdpAnnouncementEndpoint(System.ServiceModel.Discovery.DiscoveryVersion discoveryVersion, System.Uri multicastAddress) { } public UdpAnnouncementEndpoint(string multicastAddress) { } public UdpAnnouncementEndpoint(System.Uri multicastAddress) { } - public System.Uri MulticastAddress { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.ServiceModel.Discovery.UdpTransportSettings TransportSettings { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Uri MulticastAddress { get { throw null; } set { } } + public System.ServiceModel.Discovery.UdpTransportSettings TransportSettings { get { throw null; } } } public partial class UdpDiscoveryEndpoint : System.ServiceModel.Discovery.DiscoveryEndpoint { @@ -373,21 +373,21 @@ namespace System.ServiceModel.Discovery public UdpDiscoveryEndpoint(System.ServiceModel.Discovery.DiscoveryVersion discoveryVersion, System.Uri multicastAddress) { } public UdpDiscoveryEndpoint(string multicastAddress) { } public UdpDiscoveryEndpoint(System.Uri multicastAddress) { } - public System.Uri MulticastAddress { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.ServiceModel.Discovery.UdpTransportSettings TransportSettings { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Uri MulticastAddress { get { throw null; } set { } } + public System.ServiceModel.Discovery.UdpTransportSettings TransportSettings { get { throw null; } } } public partial class UdpTransportSettings { internal UdpTransportSettings() { } - public int DuplicateMessageHistoryLength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public long MaxBufferPoolSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int MaxMulticastRetransmitCount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int MaxPendingMessageCount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public long MaxReceivedMessageSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int MaxUnicastRetransmitCount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string MulticastInterfaceId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int SocketReceiveBufferSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int TimeToLive { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int DuplicateMessageHistoryLength { get { throw null; } set { } } + public long MaxBufferPoolSize { get { throw null; } set { } } + public int MaxMulticastRetransmitCount { get { throw null; } set { } } + public int MaxPendingMessageCount { get { throw null; } set { } } + public long MaxReceivedMessageSize { get { throw null; } set { } } + public int MaxUnicastRetransmitCount { get { throw null; } set { } } + public string MulticastInterfaceId { get { throw null; } set { } } + public int SocketReceiveBufferSize { get { throw null; } set { } } + public int TimeToLive { get { throw null; } set { } } } } namespace System.ServiceModel.Discovery.Configuration diff --git a/external/api-snapshot/profiles/net_4_x/System.ServiceModel.Routing.cs b/external/api-snapshot/profiles/net_4_x/System.ServiceModel.Routing.cs index 890b46b4f2..f2943d9247 100644 --- a/external/api-snapshot/profiles/net_4_x/System.ServiceModel.Routing.cs +++ b/external/api-snapshot/profiles/net_4_x/System.ServiceModel.Routing.cs @@ -114,9 +114,9 @@ namespace System.ServiceModel.Routing { public RoutingConfiguration() { } public RoutingConfiguration(System.ServiceModel.Dispatcher.MessageFilterTable> filterTable, bool routeOnHeadersOnly) { } - public System.ServiceModel.Dispatcher.MessageFilterTable> FilterTable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool RouteOnHeadersOnly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SoapProcessingEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.ServiceModel.Dispatcher.MessageFilterTable> FilterTable { get { throw null; } } + public bool RouteOnHeadersOnly { get { throw null; } set { } } + public bool SoapProcessingEnabled { get { throw null; } set { } } } public sealed partial class RoutingExtension : System.ServiceModel.IExtension { @@ -141,7 +141,7 @@ namespace System.ServiceModel.Routing public partial class SoapProcessingBehavior : System.ServiceModel.Description.IEndpointBehavior { public SoapProcessingBehavior() { } - public bool ProcessMessages { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool ProcessMessages { get { throw null; } set { } } public void AddBindingParameters(System.ServiceModel.Description.ServiceEndpoint endpoint, System.ServiceModel.Channels.BindingParameterCollection bindingParameters) { } public void ApplyClientBehavior(System.ServiceModel.Description.ServiceEndpoint endpoint, System.ServiceModel.Dispatcher.ClientRuntime clientRuntime) { } public void ApplyDispatchBehavior(System.ServiceModel.Description.ServiceEndpoint endpoint, System.ServiceModel.Dispatcher.EndpointDispatcher endpointDispatcher) { } diff --git a/external/api-snapshot/profiles/net_4_x/System.ServiceModel.Web.cs b/external/api-snapshot/profiles/net_4_x/System.ServiceModel.Web.cs index 6b1dd0c719..e9d1488603 100644 --- a/external/api-snapshot/profiles/net_4_x/System.ServiceModel.Web.cs +++ b/external/api-snapshot/profiles/net_4_x/System.ServiceModel.Web.cs @@ -33,7 +33,7 @@ namespace System.ServiceModel public bool BypassProxyOnLocal { get { throw null; } set { } } public System.ServiceModel.Channels.WebContentTypeMapper ContentTypeMapper { get { throw null; } set { } } [System.MonoTODOAttribute] - public bool CrossDomainScriptAccessEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool CrossDomainScriptAccessEnabled { get { throw null; } set { } } public System.ServiceModel.EnvelopeVersion EnvelopeVersion { get { throw null; } } [System.ComponentModel.DefaultValueAttribute((System.ServiceModel.HostNameComparisonMode)(0))] public System.ServiceModel.HostNameComparisonMode HostNameComparisonMode { get { throw null; } set { } } @@ -66,7 +66,7 @@ namespace System.ServiceModel { public WebHttpSecurity() { } public System.ServiceModel.WebHttpSecurityMode Mode { get { throw null; } set { } } - public System.ServiceModel.HttpTransportSecurity Transport { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.ServiceModel.HttpTransportSecurity Transport { get { throw null; } set { } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(2))] public bool ShouldSerializeMode() { throw null; } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(2))] @@ -124,7 +124,7 @@ namespace System.ServiceModel.Channels [System.MonoTODOAttribute] public int MaxWritePoolSize { get { throw null; } set { } } public override System.ServiceModel.Channels.MessageVersion MessageVersion { get { throw null; } set { } } - public System.Xml.XmlDictionaryReaderQuotas ReaderQuotas { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Xml.XmlDictionaryReaderQuotas ReaderQuotas { get { throw null; } } public System.Text.Encoding WriteEncoding { get { throw null; } set { } } public override System.ServiceModel.Channels.IChannelFactory BuildChannelFactory(System.ServiceModel.Channels.BindingContext context) { throw null; } public override System.ServiceModel.Channels.IChannelListener BuildChannelListener(System.ServiceModel.Channels.BindingContext context) { throw null; } @@ -320,12 +320,12 @@ namespace System.ServiceModel.Description public partial class WebHttpBehavior : System.ServiceModel.Description.IEndpointBehavior { public WebHttpBehavior() { } - public virtual bool AutomaticFormatSelectionEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.ServiceModel.Web.WebMessageBodyStyle DefaultBodyStyle { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.ServiceModel.Web.WebMessageFormat DefaultOutgoingRequestFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.ServiceModel.Web.WebMessageFormat DefaultOutgoingResponseFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual bool FaultExceptionEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual bool HelpEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual bool AutomaticFormatSelectionEnabled { get { throw null; } set { } } + public virtual System.ServiceModel.Web.WebMessageBodyStyle DefaultBodyStyle { get { throw null; } set { } } + public virtual System.ServiceModel.Web.WebMessageFormat DefaultOutgoingRequestFormat { get { throw null; } set { } } + public virtual System.ServiceModel.Web.WebMessageFormat DefaultOutgoingResponseFormat { get { throw null; } set { } } + public virtual bool FaultExceptionEnabled { get { throw null; } set { } } + public virtual bool HelpEnabled { get { throw null; } set { } } public virtual void AddBindingParameters(System.ServiceModel.Description.ServiceEndpoint endpoint, System.ServiceModel.Channels.BindingParameterCollection bindingParameters) { } [System.MonoTODOAttribute] protected virtual void AddClientErrorInspector(System.ServiceModel.Description.ServiceEndpoint endpoint, System.ServiceModel.Dispatcher.ClientRuntime clientRuntime) { } @@ -357,9 +357,9 @@ namespace System.ServiceModel.Description public sealed partial class WebScriptEnablingBehavior : System.ServiceModel.Description.WebHttpBehavior { public WebScriptEnablingBehavior() { } - public override System.ServiceModel.Web.WebMessageBodyStyle DefaultBodyStyle { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public override System.ServiceModel.Web.WebMessageFormat DefaultOutgoingRequestFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public override System.ServiceModel.Web.WebMessageFormat DefaultOutgoingResponseFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public override System.ServiceModel.Web.WebMessageBodyStyle DefaultBodyStyle { get { throw null; } set { } } + public override System.ServiceModel.Web.WebMessageFormat DefaultOutgoingRequestFormat { get { throw null; } set { } } + public override System.ServiceModel.Web.WebMessageFormat DefaultOutgoingResponseFormat { get { throw null; } set { } } [System.MonoTODOAttribute] protected override void AddClientErrorInspector(System.ServiceModel.Description.ServiceEndpoint endpoint, System.ServiceModel.Dispatcher.ClientRuntime clientRuntime) { } [System.MonoTODOAttribute] @@ -446,17 +446,17 @@ namespace System.ServiceModel.Web public partial class OutgoingWebRequestContext { internal OutgoingWebRequestContext() { } - public string Accept { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public long ContentLength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ContentType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Net.WebHeaderCollection Headers { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string IfMatch { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string IfModifiedSince { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string IfNoneMatch { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string IfUnmodifiedSince { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Method { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SuppressEntityBody { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string UserAgent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Accept { get { throw null; } set { } } + public long ContentLength { get { throw null; } set { } } + public string ContentType { get { throw null; } set { } } + public System.Net.WebHeaderCollection Headers { get { throw null; } } + public string IfMatch { get { throw null; } set { } } + public string IfModifiedSince { get { throw null; } set { } } + public string IfNoneMatch { get { throw null; } set { } } + public string IfUnmodifiedSince { get { throw null; } set { } } + public string Method { get { throw null; } set { } } + public bool SuppressEntityBody { get { throw null; } set { } } + public string UserAgent { get { throw null; } set { } } } public partial class OutgoingWebResponseContext { diff --git a/external/api-snapshot/profiles/net_4_x/System.ServiceModel.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/System.ServiceModel.cs.REMOVED.git-id index a27170f743..8462e84d4d 100644 --- a/external/api-snapshot/profiles/net_4_x/System.ServiceModel.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/System.ServiceModel.cs.REMOVED.git-id @@ -1 +1 @@ -b55591aadca2cd6118105d99f75b0cd2df89b0ea \ No newline at end of file +8995d01e1ab9782fe94c11ccbcc28faec0f9899c \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/System.ServiceProcess.cs b/external/api-snapshot/profiles/net_4_x/System.ServiceProcess.cs index e06ae61393..a1c3ca595a 100644 --- a/external/api-snapshot/profiles/net_4_x/System.ServiceProcess.cs +++ b/external/api-snapshot/profiles/net_4_x/System.ServiceProcess.cs @@ -99,7 +99,7 @@ namespace System.ServiceProcess [System.ComponentModel.DesignerSerializationVisibilityAttribute((System.ComponentModel.DesignerSerializationVisibility)(0))] public virtual System.Diagnostics.EventLog EventLog { get { throw null; } } [System.Runtime.InteropServices.ComVisibleAttribute(false)] - public int ExitCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int ExitCode { get { throw null; } set { } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(2))] [System.MonoTODOAttribute] protected System.IntPtr ServiceHandle { get { throw null; } } diff --git a/external/api-snapshot/profiles/net_4_x/System.Threading.Tasks.Dataflow.cs b/external/api-snapshot/profiles/net_4_x/System.Threading.Tasks.Dataflow.cs index 5988d34d53..3ce4e4d239 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Threading.Tasks.Dataflow.cs +++ b/external/api-snapshot/profiles/net_4_x/System.Threading.Tasks.Dataflow.cs @@ -207,6 +207,7 @@ namespace System.Threading.Tasks.Dataflow public DataflowBlockOptions() { } public int BoundedCapacity { get { throw null; } set { } } public System.Threading.CancellationToken CancellationToken { get { throw null; } set { } } + public bool EnsureOrdered { get { throw null; } set { } } public int MaxMessagesPerTask { get { throw null; } set { } } public string NameFormat { get { throw null; } set { } } public System.Threading.Tasks.TaskScheduler TaskScheduler { get { throw null; } set { } } @@ -220,6 +221,7 @@ namespace System.Threading.Tasks.Dataflow public bool PropagateCompletion { get { throw null; } set { } } } [System.Diagnostics.DebuggerDisplayAttribute("Id = {Id}")] + [System.Runtime.CompilerServices.IsReadOnlyAttribute] [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] public partial struct DataflowMessageHeader : System.IEquatable { diff --git a/external/api-snapshot/profiles/net_4_x/System.Web.DynamicData.cs b/external/api-snapshot/profiles/net_4_x/System.Web.DynamicData.cs index 6122e296d3..e775ff1cf5 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Web.DynamicData.cs +++ b/external/api-snapshot/profiles/net_4_x/System.Web.DynamicData.cs @@ -62,8 +62,8 @@ namespace System.Web.DynamicData public partial class ContextConfiguration { public ContextConfiguration() { } - public System.Func MetadataProviderFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool ScaffoldAllTables { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Func MetadataProviderFactory { get { throw null; } set { } } + public bool ScaffoldAllTables { get { throw null; } set { } } } [System.Drawing.ToolboxBitmapAttribute(typeof(System.Web.DynamicData.DynamicControl), "DynamicControl.ico")] [System.Web.AspNetHostingPermissionAttribute(System.Security.Permissions.SecurityAction.InheritanceDemand, Level=(System.Web.AspNetHostingPermissionLevel)(200))] @@ -76,7 +76,7 @@ namespace System.Web.DynamicData [System.ComponentModel.DefaultValueAttribute(false)] public bool ApplyFormatInEditMode { get { throw null; } set { } } [System.ComponentModel.BrowsableAttribute(false)] - public System.Web.DynamicData.MetaColumn Column { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Web.DynamicData.MetaColumn Column { get { throw null; } set { } } [System.ComponentModel.CategoryAttribute("Behavior")] [System.ComponentModel.DefaultValueAttribute(false)] public bool ConvertEmptyStringToNull { get { throw null; } set { } } @@ -84,7 +84,7 @@ namespace System.Web.DynamicData [System.ComponentModel.DefaultValueAttribute("")] [System.MonoTODOAttribute] [System.Web.UI.CssClassPropertyAttribute] - public virtual string CssClass { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual string CssClass { get { throw null; } set { } } [System.ComponentModel.CategoryAttribute("Data")] [System.ComponentModel.DefaultValueAttribute("")] public string DataField { get { throw null; } set { } } @@ -93,12 +93,12 @@ namespace System.Web.DynamicData public string DataFormatString { get { throw null; } set { } } [System.ComponentModel.BrowsableAttribute(false)] [System.MonoTODOAttribute] - public System.Web.UI.Control FieldTemplate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Web.UI.Control FieldTemplate { get { throw null; } } [System.ComponentModel.CategoryAttribute("Behavior")] [System.ComponentModel.DefaultValueAttribute(true)] public bool HtmlEncode { get { throw null; } set { } } [System.MonoTODOAttribute] - public System.Web.UI.WebControls.DataBoundControlMode Mode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Web.UI.WebControls.DataBoundControlMode Mode { get { throw null; } set { } } [System.ComponentModel.CategoryAttribute("Behavior")] [System.ComponentModel.DefaultValueAttribute("")] public string NullDisplayText { get { throw null; } set { } } @@ -111,7 +111,7 @@ namespace System.Web.DynamicData [System.ComponentModel.CategoryAttribute("Behavior")] [System.ComponentModel.DefaultValueAttribute("")] [System.Web.UI.ThemeableAttribute(false)] - public virtual string ValidationGroup { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual string ValidationGroup { get { throw null; } set { } } public string GetAttribute(string key) { throw null; } protected override void OnInit(System.EventArgs e) { } protected override void Render(System.Web.UI.HtmlTextWriter writer) { } @@ -126,7 +126,7 @@ namespace System.Web.DynamicData [System.MonoTODOAttribute] public DynamicControlParameter(string controlId) { } [System.MonoTODOAttribute] - public string ControlId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string ControlId { get { throw null; } set { } } [System.MonoTODOAttribute] protected override object Evaluate(System.Web.HttpContext context, System.Web.UI.Control control) { throw null; } [System.MonoTODOAttribute] @@ -162,7 +162,7 @@ namespace System.Web.DynamicData public partial class DynamicDataManager : System.Web.UI.Control { public DynamicDataManager() { } - public bool AutoLoadForeignKeys { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool AutoLoadForeignKeys { get { throw null; } set { } } [System.ComponentModel.BrowsableAttribute(false)] public override bool Visible { get { throw null; } set { } } protected override void OnLoad(System.EventArgs e) { } @@ -174,11 +174,11 @@ namespace System.Web.DynamicData public partial class DynamicDataRoute : System.Web.Routing.Route { public DynamicDataRoute(string url) : base (default(string), default(System.Web.Routing.IRouteHandler)) { } - public string Action { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Web.DynamicData.MetaModel Model { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Action { get { throw null; } set { } } + public System.Web.DynamicData.MetaModel Model { get { throw null; } set { } } public new System.Web.DynamicData.DynamicDataRouteHandler RouteHandler { get { throw null; } set { } } - public string Table { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ViewName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Table { get { throw null; } set { } } + public string ViewName { get { throw null; } set { } } public string GetActionFromRouteData(System.Web.Routing.RouteData routeData) { throw null; } public override System.Web.Routing.RouteData GetRouteData(System.Web.HttpContextBase httpContext) { throw null; } public System.Web.DynamicData.MetaTable GetTableFromRouteData(System.Web.Routing.RouteData routeData) { throw null; } @@ -189,7 +189,7 @@ namespace System.Web.DynamicData public partial class DynamicDataRouteHandler : System.Web.Routing.IRouteHandler { public DynamicDataRouteHandler() { } - public System.Web.DynamicData.MetaModel Model { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Web.DynamicData.MetaModel Model { get { throw null; } } [System.MonoTODOAttribute("Needs a working test")] public virtual System.Web.IHttpHandler CreateHandler(System.Web.DynamicData.DynamicDataRoute route, System.Web.DynamicData.MetaTable table, string action) { throw null; } protected virtual string GetCustomPageVirtualPath(System.Web.DynamicData.MetaTable table, string viewName) { throw null; } @@ -204,13 +204,13 @@ namespace System.Web.DynamicData public partial class DynamicField : System.Web.UI.WebControls.DataControlField, System.Web.DynamicData.IFieldFormattingOptions, System.Web.UI.IAttributeAccessor { public DynamicField() { } - public bool ApplyFormatInEditMode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool ConvertEmptyStringToNull { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool ApplyFormatInEditMode { get { throw null; } set { } } + public bool ConvertEmptyStringToNull { get { throw null; } set { } } public virtual string DataField { get { throw null; } set { } } - public string DataFormatString { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string DataFormatString { get { throw null; } set { } } public override string HeaderText { get { throw null; } set { } } - public bool HtmlEncode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string NullDisplayText { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool HtmlEncode { get { throw null; } set { } } + public string NullDisplayText { get { throw null; } set { } } public override string SortExpression { get { throw null; } set { } } public virtual string UIHint { get { throw null; } set { } } [System.MonoTODOAttribute] @@ -241,11 +241,11 @@ namespace System.Web.DynamicData public DynamicValidator() { } [System.ComponentModel.BrowsableAttribute(false)] [System.Web.UI.ThemeableAttribute(false)] - public System.Web.DynamicData.MetaColumn Column { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Web.DynamicData.MetaColumn Column { get { throw null; } set { } } [System.ComponentModel.BrowsableAttribute(false)] [System.Web.UI.ThemeableAttribute(false)] public string ColumnName { get { throw null; } } - protected virtual System.Exception ValidationException { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + protected virtual System.Exception ValidationException { get { throw null; } set { } } protected override bool ControlPropertiesValid() { throw null; } [System.MonoTODOAttribute] protected override bool EvaluateIsValid() { throw null; } @@ -258,7 +258,7 @@ namespace System.Web.DynamicData public partial class FieldTemplateFactory : System.Web.DynamicData.IFieldTemplateFactory { public FieldTemplateFactory() { } - public System.Web.DynamicData.MetaModel Model { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Web.DynamicData.MetaModel Model { get { throw null; } } public string TemplateFolderVirtualPath { get { throw null; } set { } } public virtual string BuildVirtualPath(string templateName, System.Web.DynamicData.MetaColumn column, System.Web.UI.WebControls.DataBoundControlMode mode) { throw null; } public virtual System.Web.DynamicData.IFieldTemplate CreateFieldTemplate(System.Web.DynamicData.MetaColumn column, System.Web.UI.WebControls.DataBoundControlMode mode, string uiHint) { throw null; } @@ -276,20 +276,20 @@ namespace System.Web.DynamicData protected string ChildrenPath { get { throw null; } } public System.Web.DynamicData.MetaColumn Column { get { throw null; } } [System.MonoTODOAttribute] - public virtual System.Web.UI.Control DataControl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public virtual System.Web.UI.Control DataControl { get { throw null; } } [System.MonoTODOAttribute] - public virtual object FieldValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual object FieldValue { get { throw null; } set { } } [System.MonoTODOAttribute] - public virtual string FieldValueEditString { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public virtual string FieldValueEditString { get { throw null; } } [System.MonoTODOAttribute] - public virtual string FieldValueString { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public virtual string FieldValueString { get { throw null; } } [System.MonoTODOAttribute] public System.Web.DynamicData.MetaForeignKeyColumn ForeignKeyColumn { get { throw null; } } [System.MonoTODOAttribute] protected string ForeignKeyPath { get { throw null; } } [System.MonoTODOAttribute] - public System.Web.DynamicData.IFieldFormattingOptions FormattingOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Web.DynamicData.IFieldTemplateHost Host { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Web.DynamicData.IFieldFormattingOptions FormattingOptions { get { throw null; } } + public System.Web.DynamicData.IFieldTemplateHost Host { get { throw null; } } [System.MonoTODOAttribute] public System.ComponentModel.AttributeCollection MetadataAttributes { get { throw null; } } [System.MonoTODOAttribute] @@ -336,22 +336,22 @@ namespace System.Web.DynamicData [System.ComponentModel.DefaultValueAttribute(null)] [System.MonoTODOAttribute] [System.Web.UI.ThemeableAttribute(false)] - public string ContextTypeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string ContextTypeName { get { throw null; } set { } } [System.ComponentModel.CategoryAttribute("Behavior")] [System.ComponentModel.DefaultValueAttribute("DynamicFilter")] [System.MonoTODOAttribute] [System.Web.UI.IDReferencePropertyAttribute(typeof(System.Web.DynamicData.FilterUserControlBase))] [System.Web.UI.ThemeableAttribute(false)] - public string DynamicFilterContainerId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string DynamicFilterContainerId { get { throw null; } set { } } [System.MonoTODOAttribute] - public System.Web.DynamicData.MetaTable Table { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Web.DynamicData.MetaTable Table { get { throw null; } } [System.ComponentModel.CategoryAttribute("Data")] [System.ComponentModel.DefaultValueAttribute(null)] [System.MonoTODOAttribute] [System.Web.UI.ThemeableAttribute(false)] - public string TableName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string TableName { get { throw null; } set { } } [System.MonoTODOAttribute] - public override bool Visible { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public override bool Visible { get { throw null; } set { } } [System.MonoTODOAttribute] public override void DataBind() { } [System.MonoTODOAttribute] @@ -371,23 +371,23 @@ namespace System.Web.DynamicData { public FilterUserControlBase() { } [System.MonoTODOAttribute] - public System.Web.DynamicData.MetaColumn Column { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Web.DynamicData.MetaColumn Column { get { throw null; } } [System.MonoTODOAttribute] - public string ContextTypeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string ContextTypeName { get { throw null; } set { } } [System.MonoTODOAttribute] - public string DataField { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string DataField { get { throw null; } set { } } [System.MonoTODOAttribute] - public string InitialValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string InitialValue { get { throw null; } } [System.MonoTODOAttribute] - public virtual System.Web.UI.WebControls.DataKey SelectedDataKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public virtual System.Web.UI.WebControls.DataKey SelectedDataKey { get { throw null; } } [System.MonoTODOAttribute] - public virtual string SelectedValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public virtual string SelectedValue { get { throw null; } } [System.MonoTODOAttribute] System.Web.DynamicData.MetaColumn System.Web.DynamicData.IControlParameterTarget.FilteredColumn { get { throw null; } } [System.MonoTODOAttribute] System.Web.DynamicData.MetaTable System.Web.DynamicData.IControlParameterTarget.Table { get { throw null; } } [System.MonoTODOAttribute] - public string TableName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string TableName { get { throw null; } set { } } [System.MonoTODOAttribute] public void PopulateListControl(System.Web.UI.WebControls.ListControl listControl) { } [System.MonoTODOAttribute] @@ -445,9 +445,9 @@ namespace System.Web.DynamicData { internal MetaChildrenColumn() { } [System.MonoTODOAttribute] - public System.Web.DynamicData.MetaTable ChildTable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Web.DynamicData.MetaTable ChildTable { get { throw null; } } [System.MonoTODOAttribute] - public System.Web.DynamicData.MetaColumn ColumnInOtherTable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Web.DynamicData.MetaColumn ColumnInOtherTable { get { throw null; } } [System.MonoTODOAttribute] public string GetChildrenListPath(object row) { throw null; } [System.MonoTODOAttribute] @@ -470,28 +470,28 @@ namespace System.Web.DynamicData public string Description { get { throw null; } } public string DisplayName { get { throw null; } } public System.Reflection.PropertyInfo EntityTypeProperty { get { throw null; } } - public bool HtmlEncode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool IsBinaryData { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool HtmlEncode { get { throw null; } } + public bool IsBinaryData { get { throw null; } } public bool IsCustomProperty { get { throw null; } } - public bool IsFloatingPoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsFloatingPoint { get { throw null; } } public bool IsForeignKeyComponent { get { throw null; } } public bool IsGenerated { get { throw null; } } - public bool IsInteger { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool IsLongString { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsInteger { get { throw null; } } + public bool IsLongString { get { throw null; } } public bool IsPrimaryKey { get { throw null; } } public bool IsReadOnly { get { throw null; } } public bool IsRequired { get { throw null; } } - public bool IsString { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsString { get { throw null; } } public int MaxLength { get { throw null; } } - public System.Web.DynamicData.MetaModel Model { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Web.DynamicData.MetaModel Model { get { throw null; } } public string Name { get { throw null; } } public string NullDisplayText { get { throw null; } } - public System.Web.DynamicData.ModelProviders.ColumnProvider Provider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Web.DynamicData.ModelProviders.ColumnProvider Provider { get { throw null; } } public string RequiredErrorMessage { get { throw null; } } public bool Scaffold { get { throw null; } set { } } public string SortExpression { get { throw null; } } - public System.Web.DynamicData.MetaTable Table { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.TypeCode TypeCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Web.DynamicData.MetaTable Table { get { throw null; } } + public System.TypeCode TypeCode { get { throw null; } } public string UIHint { get { throw null; } } public override string ToString() { throw null; } } @@ -501,11 +501,11 @@ namespace System.Web.DynamicData { internal MetaForeignKeyColumn() { } [System.MonoTODOAttribute] - public System.Collections.ObjectModel.ReadOnlyCollection ForeignKeyNames { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.ObjectModel.ReadOnlyCollection ForeignKeyNames { get { throw null; } } [System.MonoTODOAttribute] - public bool IsPrimaryKeyInThisTable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsPrimaryKeyInThisTable { get { throw null; } } [System.MonoTODOAttribute] - public System.Web.DynamicData.MetaTable ParentTable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Web.DynamicData.MetaTable ParentTable { get { throw null; } } [System.MonoTODOAttribute] public void ExtractForeignKey(System.Collections.IDictionary dictionary, string value) { } [System.MonoTODOAttribute] @@ -526,9 +526,9 @@ namespace System.Web.DynamicData public MetaModel() { } public static System.Web.DynamicData.MetaModel Default { get { throw null; } } public string DynamicDataFolderVirtualPath { get { throw null; } set { } } - public System.Web.DynamicData.IFieldTemplateFactory FieldTemplateFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.ObjectModel.ReadOnlyCollection Tables { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Collections.Generic.List VisibleTables { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Web.DynamicData.IFieldTemplateFactory FieldTemplateFactory { get { throw null; } set { } } + public System.Collections.ObjectModel.ReadOnlyCollection Tables { get { throw null; } } + public System.Collections.Generic.List VisibleTables { get { throw null; } } public string GetActionPath(string tableName, string action, object row) { throw null; } public static System.Web.DynamicData.MetaModel GetModel(System.Type contextType) { throw null; } public System.Web.DynamicData.MetaTable GetTable(string uniqueTableName) { throw null; } @@ -549,21 +549,21 @@ namespace System.Web.DynamicData { internal MetaTable() { } public System.ComponentModel.AttributeCollection Attributes { get { throw null; } } - public System.Collections.ObjectModel.ReadOnlyCollection Columns { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.ObjectModel.ReadOnlyCollection Columns { get { throw null; } } public string DataContextPropertyName { get { throw null; } } - public System.Type DataContextType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Type DataContextType { get { throw null; } } public System.Web.DynamicData.MetaColumn DisplayColumn { get { throw null; } } public string DisplayName { get { throw null; } } public System.Type EntityType { get { throw null; } } - public string ForeignKeyColumnsNames { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool HasPrimaryKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool IsReadOnly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string ForeignKeyColumnsNames { get { throw null; } } + public bool HasPrimaryKey { get { throw null; } } + public bool IsReadOnly { get { throw null; } } public string ListActionPath { get { throw null; } } public System.Web.DynamicData.MetaModel Model { get { throw null; } } public string Name { get { throw null; } } - public System.Collections.ObjectModel.ReadOnlyCollection PrimaryKeyColumns { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Web.DynamicData.ModelProviders.TableProvider Provider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool Scaffold { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.ObjectModel.ReadOnlyCollection PrimaryKeyColumns { get { throw null; } } + public System.Web.DynamicData.ModelProviders.TableProvider Provider { get { throw null; } } + public bool Scaffold { get { throw null; } } public System.Web.DynamicData.MetaColumn SortColumn { get { throw null; } } public bool SortDescending { get { throw null; } } public object CreateContext() { throw null; } @@ -596,7 +596,7 @@ namespace System.Web.DynamicData public sealed partial class TableNameAttribute : System.Attribute { public TableNameAttribute(string name) { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } } } namespace System.Web.DynamicData.ModelProviders @@ -614,17 +614,17 @@ namespace System.Web.DynamicData.ModelProviders { protected AssociationProvider() { } [System.MonoTODOAttribute] - public virtual System.Web.DynamicData.ModelProviders.AssociationDirection Direction { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public virtual System.Web.DynamicData.ModelProviders.AssociationDirection Direction { get { throw null; } protected set { } } [System.MonoTODOAttribute] - public virtual System.Collections.ObjectModel.ReadOnlyCollection ForeignKeyNames { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public virtual System.Collections.ObjectModel.ReadOnlyCollection ForeignKeyNames { get { throw null; } protected set { } } [System.MonoTODOAttribute] - public virtual System.Web.DynamicData.ModelProviders.ColumnProvider FromColumn { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public virtual System.Web.DynamicData.ModelProviders.ColumnProvider FromColumn { get { throw null; } protected set { } } [System.MonoTODOAttribute] - public virtual bool IsPrimaryKeyInThisTable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public virtual bool IsPrimaryKeyInThisTable { get { throw null; } protected set { } } [System.MonoTODOAttribute] - public virtual System.Web.DynamicData.ModelProviders.ColumnProvider ToColumn { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public virtual System.Web.DynamicData.ModelProviders.ColumnProvider ToColumn { get { throw null; } protected set { } } [System.MonoTODOAttribute] - public virtual System.Web.DynamicData.ModelProviders.TableProvider ToTable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public virtual System.Web.DynamicData.ModelProviders.TableProvider ToTable { get { throw null; } protected set { } } [System.MonoTODOAttribute] public virtual string GetSortExpression(System.Web.DynamicData.ModelProviders.ColumnProvider sortColumn) { throw null; } } @@ -634,29 +634,29 @@ namespace System.Web.DynamicData.ModelProviders { protected ColumnProvider(System.Web.DynamicData.ModelProviders.TableProvider table) { } [System.MonoTODOAttribute] - public virtual System.Web.DynamicData.ModelProviders.AssociationProvider Association { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public virtual System.Web.DynamicData.ModelProviders.AssociationProvider Association { get { throw null; } protected set { } } [System.MonoTODOAttribute] - public virtual System.Type ColumnType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public virtual System.Type ColumnType { get { throw null; } protected set { } } [System.MonoTODOAttribute] - public virtual System.Reflection.PropertyInfo EntityTypeProperty { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public virtual System.Reflection.PropertyInfo EntityTypeProperty { get { throw null; } protected set { } } [System.MonoTODOAttribute] - public virtual bool IsCustomProperty { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public virtual bool IsCustomProperty { get { throw null; } protected set { } } [System.MonoTODOAttribute] - public virtual bool IsForeignKeyComponent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public virtual bool IsForeignKeyComponent { get { throw null; } protected set { } } [System.MonoTODOAttribute] - public virtual bool IsGenerated { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public virtual bool IsGenerated { get { throw null; } protected set { } } [System.MonoTODOAttribute] - public virtual bool IsPrimaryKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public virtual bool IsPrimaryKey { get { throw null; } protected set { } } [System.MonoTODOAttribute] - public virtual bool IsSortable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public virtual bool IsSortable { get { throw null; } protected set { } } [System.MonoTODOAttribute] - public virtual int MaxLength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public virtual int MaxLength { get { throw null; } protected set { } } [System.MonoTODOAttribute] - public virtual string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public virtual string Name { get { throw null; } protected set { } } [System.MonoTODOAttribute] - public virtual bool Nullable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public virtual bool Nullable { get { throw null; } protected set { } } [System.MonoTODOAttribute] - public System.Web.DynamicData.ModelProviders.TableProvider Table { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Web.DynamicData.ModelProviders.TableProvider Table { get { throw null; } } [System.MonoTODOAttribute] public override string ToString() { throw null; } } @@ -666,7 +666,7 @@ namespace System.Web.DynamicData.ModelProviders { protected DataModelProvider() { } [System.MonoTODOAttribute] - public virtual System.Type ContextType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public virtual System.Type ContextType { get { throw null; } protected set { } } public abstract System.Collections.ObjectModel.ReadOnlyCollection Tables { get; } public abstract object CreateContext(); } @@ -676,9 +676,9 @@ namespace System.Web.DynamicData.ModelProviders { protected TableProvider(System.Web.DynamicData.ModelProviders.DataModelProvider model) { } public abstract System.Collections.ObjectModel.ReadOnlyCollection Columns { get; } - public System.Web.DynamicData.ModelProviders.DataModelProvider DataModel { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public virtual System.Type EntityType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } - public virtual string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public System.Web.DynamicData.ModelProviders.DataModelProvider DataModel { get { throw null; } } + public virtual System.Type EntityType { get { throw null; } protected set { } } + public virtual string Name { get { throw null; } protected set { } } public virtual object EvaluateForeignKey(object row, string foreignKeyName) { throw null; } public abstract System.Linq.IQueryable GetQuery(object context); public override string ToString() { throw null; } diff --git a/external/api-snapshot/profiles/net_4_x/System.Web.Extensions.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/System.Web.Extensions.cs.REMOVED.git-id index 321e9b02ec..224a8630dc 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Web.Extensions.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/System.Web.Extensions.cs.REMOVED.git-id @@ -1 +1 @@ -2e91f199c8b29d95d22195afa8a6c42d50dca28a \ No newline at end of file +0d7e3c2944f1ed7e7f5586a9e06e03531271539d \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/System.Web.Http.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/System.Web.Http.cs.REMOVED.git-id index 36cf2324a2..4f6344b7c3 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Web.Http.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/System.Web.Http.cs.REMOVED.git-id @@ -1 +1 @@ -767a1059ce2e0738379f683a9df246c593acb440 \ No newline at end of file +aecda23b26b53bc4cf577f9e653e05921cc4d195 \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/System.Web.Mvc.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/System.Web.Mvc.cs.REMOVED.git-id index e4fc0aed96..f7ec0e376b 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Web.Mvc.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/System.Web.Mvc.cs.REMOVED.git-id @@ -1 +1 @@ -90cdbfbf6587c2b103e858f8d1de297e0afa9de7 \ No newline at end of file +12d93c509ae6ffd3f445221b6a94f50994d3afe8 \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/System.Web.Razor.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/System.Web.Razor.cs.REMOVED.git-id index f8bf8589fe..276720e8df 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Web.Razor.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/System.Web.Razor.cs.REMOVED.git-id @@ -1 +1 @@ -a7fd2ab489828c9a45d193c7b287318019b6fe12 \ No newline at end of file +d6342ac6bbdf7a680aa32a91e55f926119cf3d7d \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/System.Web.WebPages.Razor.cs b/external/api-snapshot/profiles/net_4_x/System.Web.WebPages.Razor.cs index 0a4e407392..de90edaf08 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Web.WebPages.Razor.cs +++ b/external/api-snapshot/profiles/net_4_x/System.Web.WebPages.Razor.cs @@ -28,8 +28,8 @@ namespace System.Web.WebPages.Razor public partial class CompilingPathEventArgs : System.EventArgs { public CompilingPathEventArgs(string virtualPath, System.Web.WebPages.Razor.WebPageRazorHost host) { } - public System.Web.WebPages.Razor.WebPageRazorHost Host { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string VirtualPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Web.WebPages.Razor.WebPageRazorHost Host { get { throw null; } set { } } + public string VirtualPath { get { throw null; } } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public static partial class PreApplicationStartCode @@ -69,12 +69,12 @@ namespace System.Web.WebPages.Razor public override System.Web.Razor.RazorCodeLanguage CodeLanguage { get { throw null; } protected set { } } public override string DefaultBaseClass { get { throw null; } set { } } public override string DefaultClassName { get { throw null; } set { } } - public bool DefaultDebugCompilation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string DefaultPageBaseClass { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool DefaultDebugCompilation { get { throw null; } set { } } + public string DefaultPageBaseClass { get { throw null; } set { } } public override string InstrumentedSourceFilePath { get { throw null; } set { } } public bool IsSpecialPage { get { throw null; } } public string PhysicalPath { get { throw null; } set { } } - public string VirtualPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string VirtualPath { get { throw null; } } public static void AddGlobalImport(string ns) { } public override System.Web.Razor.Parser.ParserBase CreateMarkupParser() { throw null; } protected virtual string GetClassName(string virtualPath) { throw null; } diff --git a/external/api-snapshot/profiles/net_4_x/System.Web.WebPages.cs b/external/api-snapshot/profiles/net_4_x/System.Web.WebPages.cs index 26998bd907..290e8ba9a2 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Web.WebPages.cs +++ b/external/api-snapshot/profiles/net_4_x/System.Web.WebPages.cs @@ -46,11 +46,11 @@ namespace System.Web.Helpers } public static partial class AntiForgeryConfig { - public static System.Web.Helpers.IAntiForgeryAdditionalDataProvider AdditionalDataProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public static System.Web.Helpers.IAntiForgeryAdditionalDataProvider AdditionalDataProvider { get { throw null; } set { } } public static string CookieName { get { throw null; } set { } } - public static bool RequireSsl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public static bool RequireSsl { get { throw null; } set { } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] - public static bool SuppressIdentityHeuristicChecks { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public static bool SuppressIdentityHeuristicChecks { get { throw null; } set { } } public static string UniqueClaimTypeIdentifier { get { throw null; } set { } } } public partial interface IAntiForgeryAdditionalDataProvider @@ -112,7 +112,7 @@ namespace System.Web.Mvc public partial class ModelClientValidationRule { public ModelClientValidationRule() { } - public string ErrorMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string ErrorMessage { get { throw null; } set { } } public System.Collections.Generic.IDictionary ValidationParameters { get { throw null; } } public string ValidationType { get { throw null; } set { } } } @@ -125,10 +125,10 @@ namespace System.Web.Mvc public partial class TagBuilder { public TagBuilder(string tagName) { } - public System.Collections.Generic.IDictionary Attributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IDictionary Attributes { get { throw null; } } public string IdAttributeDotReplacement { get { throw null; } set { } } public string InnerHtml { get { throw null; } set { } } - public string TagName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string TagName { get { throw null; } } public void AddCssClass(string value) { } public static string CreateSanitizedId(string originalId) { throw null; } public static string CreateSanitizedId(string originalId, string invalidCharReplacement) { throw null; } @@ -167,10 +167,10 @@ namespace System.Web.WebPages public static readonly string CacheKeyPrefix; public static readonly string StartPageVirtualPath; protected ApplicationStartPage() { } - public System.Web.HttpApplication Application { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Web.HttpApplication Application { get { throw null; } } public override System.Web.HttpContextBase Context { get { throw null; } } - public static System.Web.HtmlString Markup { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.IO.TextWriter Output { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public static System.Web.HtmlString Markup { get { throw null; } } + public System.IO.TextWriter Output { get { throw null; } } public override string VirtualPath { get { throw null; } set { } } protected internal override System.IO.TextWriter GetOutputWriter() { throw null; } public override void Write(object value) { } @@ -180,9 +180,9 @@ namespace System.Web.WebPages public partial class AttributeValue { public AttributeValue(System.Web.WebPages.Instrumentation.PositionTagged prefix, System.Web.WebPages.Instrumentation.PositionTagged value, bool literal) { } - public bool Literal { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Web.WebPages.Instrumentation.PositionTagged Prefix { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Web.WebPages.Instrumentation.PositionTagged Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool Literal { get { throw null; } } + public System.Web.WebPages.Instrumentation.PositionTagged Prefix { get { throw null; } } + public System.Web.WebPages.Instrumentation.PositionTagged Value { get { throw null; } } public static System.Web.WebPages.AttributeValue FromTuple(System.Tuple, System.Tuple, bool> value) { throw null; } public static System.Web.WebPages.AttributeValue FromTuple(System.Tuple, System.Tuple, bool> value) { throw null; } public static implicit operator System.Web.WebPages.AttributeValue (System.Tuple, System.Tuple, bool> value) { throw null; } @@ -225,7 +225,7 @@ namespace System.Web.WebPages { public DefaultDisplayMode() { } public DefaultDisplayMode(string suffix) { } - public System.Func ContextCondition { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Func ContextCondition { get { throw null; } set { } } public virtual string DisplayModeId { get { throw null; } } public bool CanHandleContext(System.Web.HttpContextBase httpContext) { throw null; } public virtual System.Web.WebPages.DisplayInfo GetDisplayInfo(System.Web.HttpContextBase httpContext, string virtualPath, System.Func virtualPathExists) { throw null; } @@ -234,8 +234,8 @@ namespace System.Web.WebPages public partial class DisplayInfo { public DisplayInfo(string filePath, System.Web.WebPages.IDisplayMode displayMode) { } - public System.Web.WebPages.IDisplayMode DisplayMode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string FilePath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Web.WebPages.IDisplayMode DisplayMode { get { throw null; } } + public string FilePath { get { throw null; } } } public sealed partial class DisplayModeProvider { @@ -244,7 +244,7 @@ namespace System.Web.WebPages public static readonly string MobileDisplayModeId; public static System.Web.WebPages.DisplayModeProvider Instance { get { throw null; } } public System.Collections.Generic.IList Modes { get { throw null; } } - public bool RequireConsistentDisplayMode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool RequireConsistentDisplayMode { get { throw null; } set { } } public System.Collections.Generic.IEnumerable GetAvailableDisplayModesForContext(System.Web.HttpContextBase httpContext, System.Web.WebPages.IDisplayMode currentDisplayMode) { throw null; } public System.Web.WebPages.DisplayInfo GetDisplayInfoForVirtualPath(string virtualPath, System.Web.HttpContextBase httpContext, System.Func virtualPathExists, System.Web.WebPages.IDisplayMode currentDisplayMode) { throw null; } } @@ -256,7 +256,7 @@ namespace System.Web.WebPages public static System.Web.Caching.Cache Cache { get { throw null; } } public static System.Web.HttpContextBase Context { get { throw null; } } public static System.Web.WebPages.WebPageRenderingBase CurrentPage { get { throw null; } } - protected static string HelperVirtualPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + protected static string HelperVirtualPath { get { throw null; } set { } } public static System.Web.WebPages.Html.HtmlHelper Html { get { throw null; } } public static bool IsAjax { get { throw null; } } public static bool IsPost { get { throw null; } } @@ -323,7 +323,7 @@ namespace System.Web.WebPages public sealed partial class PageVirtualPathAttribute : System.Attribute { public PageVirtualPathAttribute(string virtualPath) { } - public string VirtualPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string VirtualPath { get { throw null; } } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public static partial class PreApplicationStartCode @@ -356,7 +356,7 @@ namespace System.Web.WebPages public abstract partial class StartPage : System.Web.WebPages.WebPageRenderingBase { protected StartPage() { } - public System.Web.WebPages.WebPageRenderingBase ChildPage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Web.WebPages.WebPageRenderingBase ChildPage { get { throw null; } set { } } public override System.Web.HttpContextBase Context { get { throw null; } set { } } public override string Layout { get { throw null; } set { } } public override dynamic Page { get { throw null; } } @@ -447,7 +447,7 @@ namespace System.Web.WebPages { protected WebPage() { } public override System.Web.HttpContextBase Context { get { throw null; } set { } } - public System.Web.WebPages.Html.HtmlHelper Html { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Web.WebPages.Html.HtmlHelper Html { get { throw null; } } public dynamic Model { get { throw null; } } public System.Web.WebPages.Html.ModelStateDictionary ModelState { get { throw null; } } public System.Web.WebPages.ValidationHelper Validation { get { throw null; } } @@ -459,7 +459,7 @@ namespace System.Web.WebPages public abstract partial class WebPageBase : System.Web.WebPages.WebPageRenderingBase { protected WebPageBase() { } - public override string Layout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public override string Layout { get { throw null; } set { } } public System.IO.TextWriter Output { get { throw null; } } public System.Collections.Generic.Stack OutputStack { get { throw null; } } public override dynamic Page { get { throw null; } } @@ -488,8 +488,8 @@ namespace System.Web.WebPages public WebPageContext() { } public WebPageContext(System.Web.HttpContextBase context, System.Web.WebPages.WebPageRenderingBase page, object model) { } public static System.Web.WebPages.WebPageContext Current { get { throw null; } } - public object Model { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Web.WebPages.WebPageRenderingBase Page { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public object Model { get { throw null; } } + public System.Web.WebPages.WebPageRenderingBase Page { get { throw null; } } public System.Collections.Generic.IDictionary PageData { get { throw null; } } } public abstract partial class WebPageExecutingBase @@ -497,8 +497,8 @@ namespace System.Web.WebPages protected WebPageExecutingBase() { } public virtual dynamic App { get { throw null; } } public virtual System.Web.HttpApplicationStateBase AppState { get { throw null; } } - public virtual System.Web.HttpContextBase Context { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual string VirtualPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual System.Web.HttpContextBase Context { get { throw null; } set { } } + public virtual string VirtualPath { get { throw null; } set { } } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public virtual System.Web.WebPages.IVirtualPathFactory VirtualPathFactory { get { throw null; } set { } } protected internal void BeginContext(int startPosition, int length, bool isLiteral) { } @@ -528,7 +528,7 @@ namespace System.Web.WebPages { public static readonly string WebPagesVersionHeaderName; public WebPageHttpHandler(System.Web.WebPages.WebPage webPage) { } - public static bool DisableWebPagesResponseHeader { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public static bool DisableWebPagesResponseHeader { get { throw null; } set { } } public virtual bool IsReusable { get { throw null; } } public static System.Web.IHttpHandler CreateFromVirtualPath(string virtualPath) { throw null; } public static System.Collections.ObjectModel.ReadOnlyCollection GetRegisteredExtensions() { throw null; } @@ -545,7 +545,7 @@ namespace System.Web.WebPages public virtual bool IsPost { get { throw null; } } public abstract string Layout { get; set; } public abstract dynamic Page { get; } - public System.Web.WebPages.WebPageContext PageContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Web.WebPages.WebPageContext PageContext { get { throw null; } } public abstract System.Collections.Generic.IDictionary PageData { get; } public System.Web.Profile.ProfileBase Profile { get { throw null; } } public virtual System.Web.HttpRequestBase Request { get { throw null; } } @@ -656,7 +656,7 @@ namespace System.Web.WebPages.Html { public ModelState() { } public System.Collections.Generic.IList Errors { get { throw null; } } - public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public object Value { get { throw null; } set { } } } public partial class ModelStateDictionary : System.Collections.Generic.ICollection>, System.Collections.Generic.IDictionary, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable { @@ -689,9 +689,9 @@ namespace System.Web.WebPages.Html { public SelectListItem() { } public SelectListItem(System.Web.WebPages.Html.SelectListItem item) { } - public bool Selected { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Text { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool Selected { get { throw null; } set { } } + public string Text { get { throw null; } set { } } + public string Value { get { throw null; } set { } } } } namespace System.Web.WebPages.Instrumentation @@ -707,8 +707,8 @@ namespace System.Web.WebPages.Instrumentation public partial class PositionTagged { public PositionTagged(T value, int offset) { } - public int Position { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public T Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int Position { get { throw null; } } + public T Value { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } public static bool operator ==(System.Web.WebPages.Instrumentation.PositionTagged left, System.Web.WebPages.Instrumentation.PositionTagged right) { throw null; } @@ -723,7 +723,7 @@ namespace System.Web.WebPages.Scope public partial class AspNetRequestScopeStorageProvider : System.Web.WebPages.Scope.IScopeStorageProvider { public AspNetRequestScopeStorageProvider() { } - public System.Collections.Generic.IDictionary ApplicationScope { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IDictionary ApplicationScope { get { throw null; } } public System.Collections.Generic.IDictionary CurrentScope { get { throw null; } set { } } public System.Collections.Generic.IDictionary GlobalScope { get { throw null; } } public System.Collections.Generic.IDictionary RequestScope { get { throw null; } } diff --git a/external/api-snapshot/profiles/net_4_x/System.Web.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/System.Web.cs.REMOVED.git-id index 1fcc8a58c1..966773df18 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Web.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/System.Web.cs.REMOVED.git-id @@ -1 +1 @@ -85b4fe7cb23ce5f6389688c19d60bad3e4db8485 \ No newline at end of file +c78071c817216de32cb0de1b93f37d724c3fa647 \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/System.Windows.Forms.DataVisualization.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/System.Windows.Forms.DataVisualization.cs.REMOVED.git-id index 816940be6f..380a90afd4 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Windows.Forms.DataVisualization.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/System.Windows.Forms.DataVisualization.cs.REMOVED.git-id @@ -1 +1 @@ -65b1ef66dd01e30246a569dc039cc50364fd6fe5 \ No newline at end of file +a59825a8121ba15dcdd97bb696e7445bbc95f488 \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/System.Xaml.cs b/external/api-snapshot/profiles/net_4_x/System.Xaml.cs index 703de4053d..b89f1a3cc5 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Xaml.cs +++ b/external/api-snapshot/profiles/net_4_x/System.Xaml.cs @@ -77,7 +77,7 @@ namespace System.Windows.Markup [System.ComponentModel.DesignerSerializationVisibilityAttribute((System.ComponentModel.DesignerSerializationVisibility)(2))] public System.Collections.IList Items { get { throw null; } } [System.Windows.Markup.ConstructorArgumentAttribute("arrayType")] - public System.Type Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Type Type { get { throw null; } set { } } public void AddChild(object value) { } public void AddText(string text) { } public override object ProvideValue(System.IServiceProvider serviceProvider) { throw null; } @@ -87,7 +87,7 @@ namespace System.Windows.Markup public sealed partial class ConstructorArgumentAttribute : System.Attribute { public ConstructorArgumentAttribute(string argumentName) { } - public string ArgumentName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string ArgumentName { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), AllowMultiple=false, Inherited=true)] [System.Runtime.CompilerServices.TypeForwardedFromAttribute("WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")] @@ -95,14 +95,14 @@ namespace System.Windows.Markup { public ContentPropertyAttribute() { } public ContentPropertyAttribute(string name) { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), AllowMultiple=true, Inherited=true)] [System.Runtime.CompilerServices.TypeForwardedFromAttribute("WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")] public sealed partial class ContentWrapperAttribute : System.Attribute { public ContentWrapperAttribute(System.Type contentWrapper) { } - public System.Type ContentWrapper { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Type ContentWrapper { get { throw null; } } public override object TypeId { get { throw null; } } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } @@ -121,7 +121,7 @@ namespace System.Windows.Markup public sealed partial class DependsOnAttribute : System.Attribute { public DependsOnAttribute(string name) { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } public override object TypeId { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), AllowMultiple=false, Inherited=true)] @@ -129,7 +129,7 @@ namespace System.Windows.Markup public sealed partial class DictionaryKeyPropertyAttribute : System.Attribute { public DictionaryKeyPropertyAttribute(string name) { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } } [System.Runtime.CompilerServices.TypeForwardedFromAttribute("WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")] public partial interface IComponentConnector @@ -187,8 +187,8 @@ namespace System.Windows.Markup [System.ObsoleteAttribute("Unused. Use MarkupExtensionReturnTypeAttribute(Type) or XamlSetMarkupExtensionAttribute.")] public MarkupExtensionReturnTypeAttribute(System.Type returnType, System.Type expressionType) { } [System.ObsoleteAttribute("Unused. Use XamlSetMarkupExtensionAttribute functionality instead.")] - public System.Type ExpressionType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Type ReturnType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Type ExpressionType { get { throw null; } } + public System.Type ReturnType { get { throw null; } } } public abstract partial class MemberDefinition { @@ -209,8 +209,8 @@ namespace System.Windows.Markup { public NameScopePropertyAttribute(string name) { } public NameScopePropertyAttribute(string name, System.Type type) { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Type Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } + public System.Type Type { get { throw null; } } } [System.Runtime.CompilerServices.TypeForwardedFromAttribute("PresentationFramework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")] [System.Windows.Markup.MarkupExtensionReturnTypeAttribute(typeof(object))] @@ -224,10 +224,10 @@ namespace System.Windows.Markup public PropertyDefinition() { } public System.Collections.Generic.IList Attributes { get { throw null; } } [System.ComponentModel.DefaultValueAttribute("public")] - public string Modifier { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Modifier { get { throw null; } set { } } public override string Name { get { throw null; } set { } } [System.ComponentModel.TypeConverterAttribute(typeof(System.Xaml.Schema.XamlTypeTypeConverter))] - public System.Xaml.XamlType Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Xaml.XamlType Type { get { throw null; } set { } } } [System.Windows.Markup.ContentPropertyAttribute("Name")] public partial class Reference : System.Windows.Markup.MarkupExtension @@ -235,7 +235,7 @@ namespace System.Windows.Markup public Reference() { } public Reference(string name) { } [System.Windows.Markup.ConstructorArgumentAttribute("name")] - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Name { get { throw null; } set { } } public override object ProvideValue(System.IServiceProvider serviceProvider) { throw null; } } [System.AttributeUsageAttribute((System.AttributeTargets)(1))] @@ -243,14 +243,14 @@ namespace System.Windows.Markup public sealed partial class RootNamespaceAttribute : System.Attribute { public RootNamespaceAttribute(string nameSpace) { } - public string Namespace { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Namespace { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(4))] [System.Runtime.CompilerServices.TypeForwardedFromAttribute("WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")] public sealed partial class RuntimeNamePropertyAttribute : System.Attribute { public RuntimeNamePropertyAttribute(string name) { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } } [System.ComponentModel.TypeConverterAttribute("System.Windows.Markup.StaticExtensionConverter")] [System.Runtime.CompilerServices.TypeForwardedFromAttribute("PresentationFramework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")] @@ -260,9 +260,9 @@ namespace System.Windows.Markup public StaticExtension() { } public StaticExtension(string member) { } [System.Windows.Markup.ConstructorArgumentAttribute("member")] - public string Member { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Member { get { throw null; } set { } } [System.ComponentModel.DefaultValueAttribute(null)] - public System.Type MemberType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Type MemberType { get { throw null; } set { } } public override object ProvideValue(System.IServiceProvider serviceProvider) { throw null; } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), AllowMultiple=false, Inherited=true)] @@ -281,9 +281,9 @@ namespace System.Windows.Markup public TypeExtension(System.Type type) { } [System.ComponentModel.DefaultValueAttribute(null)] [System.Windows.Markup.ConstructorArgumentAttribute("type")] - public System.Type Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Type Type { get { throw null; } set { } } [System.ComponentModel.DesignerSerializationVisibilityAttribute((System.ComponentModel.DesignerSerializationVisibility)(0))] - public string TypeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string TypeName { get { throw null; } set { } } public override object ProvideValue(System.IServiceProvider serviceProvider) { throw null; } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), AllowMultiple=false)] @@ -291,13 +291,13 @@ namespace System.Windows.Markup public sealed partial class UidPropertyAttribute : System.Attribute { public UidPropertyAttribute(string name) { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), AllowMultiple=false, Inherited=true)] public sealed partial class UsableDuringInitializationAttribute : System.Attribute { public UsableDuringInitializationAttribute(bool usable) { } - public bool Usable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool Usable { get { throw null; } } } [System.Runtime.CompilerServices.TypeForwardedFromAttribute("WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")] public abstract partial class ValueSerializer @@ -326,44 +326,44 @@ namespace System.Windows.Markup { public XamlDeferLoadAttribute(string loaderType, string contentType) { } public XamlDeferLoadAttribute(System.Type loaderType, System.Type contentType) { } - public System.Type ContentType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ContentTypeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Type LoaderType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string LoaderTypeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Type ContentType { get { throw null; } } + public string ContentTypeName { get { throw null; } } + public System.Type LoaderType { get { throw null; } } + public string LoaderTypeName { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), Inherited=true, AllowMultiple=false)] public sealed partial class XamlSetMarkupExtensionAttribute : System.Attribute { public XamlSetMarkupExtensionAttribute(string xamlSetMarkupExtensionHandler) { } - public string XamlSetMarkupExtensionHandler { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string XamlSetMarkupExtensionHandler { get { throw null; } } } public partial class XamlSetMarkupExtensionEventArgs : System.Windows.Markup.XamlSetValueEventArgs { public XamlSetMarkupExtensionEventArgs(System.Xaml.XamlMember member, System.Windows.Markup.MarkupExtension value, System.IServiceProvider serviceProvider) : base (default(System.Xaml.XamlMember), default(object)) { } - public System.Windows.Markup.MarkupExtension MarkupExtension { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.IServiceProvider ServiceProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Windows.Markup.MarkupExtension MarkupExtension { get { throw null; } } + public System.IServiceProvider ServiceProvider { get { throw null; } } public override void CallBase() { } } [System.AttributeUsageAttribute((System.AttributeTargets)(4), Inherited=true, AllowMultiple=false)] public sealed partial class XamlSetTypeConverterAttribute : System.Attribute { public XamlSetTypeConverterAttribute(string xamlSetTypeConverterHandler) { } - public string XamlSetTypeConverterHandler { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string XamlSetTypeConverterHandler { get { throw null; } } } public partial class XamlSetTypeConverterEventArgs : System.Windows.Markup.XamlSetValueEventArgs { public XamlSetTypeConverterEventArgs(System.Xaml.XamlMember member, System.ComponentModel.TypeConverter typeConverter, object value, System.ComponentModel.ITypeDescriptorContext serviceProvider, System.Globalization.CultureInfo cultureInfo) : base (default(System.Xaml.XamlMember), default(object)) { } - public System.Globalization.CultureInfo CultureInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.ComponentModel.ITypeDescriptorContext ServiceProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.ComponentModel.TypeConverter TypeConverter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Globalization.CultureInfo CultureInfo { get { throw null; } } + public System.ComponentModel.ITypeDescriptorContext ServiceProvider { get { throw null; } } + public System.ComponentModel.TypeConverter TypeConverter { get { throw null; } } public override void CallBase() { } } public partial class XamlSetValueEventArgs : System.EventArgs { public XamlSetValueEventArgs(System.Xaml.XamlMember member, object value) { } - public bool Handled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Xaml.XamlMember Member { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool Handled { get { throw null; } set { } } + public System.Xaml.XamlMember Member { get { throw null; } } + public object Value { get { throw null; } } public virtual void CallBase() { } } [System.Windows.Markup.ContentPropertyAttribute("Text")] @@ -378,32 +378,32 @@ namespace System.Windows.Markup public sealed partial class XmlLangPropertyAttribute : System.Attribute { public XmlLangPropertyAttribute(string name) { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(1), AllowMultiple=true)] [System.Runtime.CompilerServices.TypeForwardedFromAttribute("WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")] public sealed partial class XmlnsCompatibleWithAttribute : System.Attribute { public XmlnsCompatibleWithAttribute(string oldNamespace, string newNamespace) { } - public string NewNamespace { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string OldNamespace { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string NewNamespace { get { throw null; } } + public string OldNamespace { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(1), AllowMultiple=true)] [System.Runtime.CompilerServices.TypeForwardedFromAttribute("WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")] public sealed partial class XmlnsDefinitionAttribute : System.Attribute { public XmlnsDefinitionAttribute(string xmlNamespace, string clrNamespace) { } - public string AssemblyName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ClrNamespace { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string XmlNamespace { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string AssemblyName { get { throw null; } set { } } + public string ClrNamespace { get { throw null; } } + public string XmlNamespace { get { throw null; } } } [System.AttributeUsageAttribute((System.AttributeTargets)(1), AllowMultiple=true)] [System.Runtime.CompilerServices.TypeForwardedFromAttribute("WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")] public sealed partial class XmlnsPrefixAttribute : System.Attribute { public XmlnsPrefixAttribute(string xmlNamespace, string prefix) { } - public string Prefix { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string XmlNamespace { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Prefix { get { throw null; } } + public string XmlNamespace { get { throw null; } } } } namespace System.Xaml @@ -411,14 +411,14 @@ namespace System.Xaml public partial class AmbientPropertyValue { public AmbientPropertyValue(System.Xaml.XamlMember property, object value) { } - public System.Xaml.XamlMember RetrievedProperty { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Xaml.XamlMember RetrievedProperty { get { throw null; } } + public object Value { get { throw null; } } } public partial class AttachableMemberIdentifier : System.IEquatable { public AttachableMemberIdentifier(System.Type declaringType, string memberName) { } - public System.Type DeclaringType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string MemberName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Type DeclaringType { get { throw null; } } + public string MemberName { get { throw null; } } public override bool Equals(object obj) { throw null; } public bool Equals(System.Xaml.AttachableMemberIdentifier other) { throw null; } public override int GetHashCode() { throw null; } @@ -510,8 +510,8 @@ namespace System.Xaml public partial class NamespaceDeclaration { public NamespaceDeclaration(string ns, string prefix) { } - public string Namespace { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Prefix { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Namespace { get { throw null; } } + public string Prefix { get { throw null; } } } public partial class XamlBackgroundReader : System.Xaml.XamlReader, System.Xaml.IXamlLineInfo { @@ -542,7 +542,7 @@ namespace System.Xaml { public XamlDirective(System.Collections.Generic.IEnumerable xamlNamespaces, string name, System.Xaml.XamlType xamlType, System.Xaml.Schema.XamlValueConverter typeConverter, System.Xaml.Schema.AllowedMemberLocations allowedLocation) : base (default(System.Reflection.EventInfo), default(System.Xaml.XamlSchemaContext)) { } public XamlDirective(string xamlNamespace, string name) : base (default(System.Reflection.EventInfo), default(System.Xaml.XamlSchemaContext)) { } - public System.Xaml.Schema.AllowedMemberLocations AllowedLocation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Xaml.Schema.AllowedMemberLocations AllowedLocation { get { throw null; } } public override int GetHashCode() { throw null; } public override System.Collections.Generic.IList GetXamlNamespaces() { throw null; } protected sealed override System.Reflection.ICustomAttributeProvider LookupCustomAttributeProvider() { throw null; } @@ -572,8 +572,8 @@ namespace System.Xaml public XamlDuplicateMemberException(string message) { } public XamlDuplicateMemberException(string message, System.Exception innerException) { } public XamlDuplicateMemberException(System.Xaml.XamlMember member, System.Xaml.XamlType type) { } - public System.Xaml.XamlMember DuplicateMember { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Xaml.XamlType ParentType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Xaml.XamlMember DuplicateMember { get { throw null; } set { } } + public System.Xaml.XamlType ParentType { get { throw null; } set { } } public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } } [System.SerializableAttribute] @@ -584,8 +584,8 @@ namespace System.Xaml public XamlException(string message) { } public XamlException(string message, System.Exception innerException) { } public XamlException(string message, System.Exception innerException, int lineNumber, int linePosition) { } - public int LineNumber { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected internal set { } } - public int LinePosition { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected internal set { } } + public int LineNumber { get { throw null; } protected internal set { } } + public int LinePosition { get { throw null; } protected internal set { } } public override string Message { get { throw null; } } public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } } @@ -601,54 +601,54 @@ namespace System.Xaml { public const string Xaml2006Namespace = "http://schemas.microsoft.com/winfx/2006/xaml"; public const string Xml1998Namespace = "http://www.w3.org/XML/1998/namespace"; - public static System.Collections.ObjectModel.ReadOnlyCollection AllDirectives { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Collections.ObjectModel.ReadOnlyCollection AllTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective Arguments { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlType Array { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective AsyncRecords { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective Base { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlType Boolean { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlType Byte { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlType Char { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective Class { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective ClassAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective ClassModifier { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective Code { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective ConnectionId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlType Decimal { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlType Double { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective FactoryMethod { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective FieldModifier { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective Initialization { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlType Int16 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlType Int32 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlType Int64 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective Items { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective Key { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective Lang { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlType Member { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective Members { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlType Null { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlType Object { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective PositionalParameters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlType Property { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlType Reference { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective Shared { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlType Single { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective Space { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlType Static { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlType String { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective Subclass { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective SynchronousMode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlType TimeSpan { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlType Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective TypeArguments { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective Uid { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlDirective UnknownContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static System.Xaml.XamlType Uri { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public static System.Collections.ObjectModel.ReadOnlyCollection AllDirectives { get { throw null; } } + public static System.Collections.ObjectModel.ReadOnlyCollection AllTypes { get { throw null; } } + public static System.Xaml.XamlDirective Arguments { get { throw null; } } + public static System.Xaml.XamlType Array { get { throw null; } } + public static System.Xaml.XamlDirective AsyncRecords { get { throw null; } } + public static System.Xaml.XamlDirective Base { get { throw null; } } + public static System.Xaml.XamlType Boolean { get { throw null; } } + public static System.Xaml.XamlType Byte { get { throw null; } } + public static System.Xaml.XamlType Char { get { throw null; } } + public static System.Xaml.XamlDirective Class { get { throw null; } } + public static System.Xaml.XamlDirective ClassAttributes { get { throw null; } } + public static System.Xaml.XamlDirective ClassModifier { get { throw null; } } + public static System.Xaml.XamlDirective Code { get { throw null; } } + public static System.Xaml.XamlDirective ConnectionId { get { throw null; } } + public static System.Xaml.XamlType Decimal { get { throw null; } } + public static System.Xaml.XamlType Double { get { throw null; } } + public static System.Xaml.XamlDirective FactoryMethod { get { throw null; } } + public static System.Xaml.XamlDirective FieldModifier { get { throw null; } } + public static System.Xaml.XamlDirective Initialization { get { throw null; } } + public static System.Xaml.XamlType Int16 { get { throw null; } } + public static System.Xaml.XamlType Int32 { get { throw null; } } + public static System.Xaml.XamlType Int64 { get { throw null; } } + public static System.Xaml.XamlDirective Items { get { throw null; } } + public static System.Xaml.XamlDirective Key { get { throw null; } } + public static System.Xaml.XamlDirective Lang { get { throw null; } } + public static System.Xaml.XamlType Member { get { throw null; } } + public static System.Xaml.XamlDirective Members { get { throw null; } } + public static System.Xaml.XamlDirective Name { get { throw null; } } + public static System.Xaml.XamlType Null { get { throw null; } } + public static System.Xaml.XamlType Object { get { throw null; } } + public static System.Xaml.XamlDirective PositionalParameters { get { throw null; } } + public static System.Xaml.XamlType Property { get { throw null; } } + public static System.Xaml.XamlType Reference { get { throw null; } } + public static System.Xaml.XamlDirective Shared { get { throw null; } } + public static System.Xaml.XamlType Single { get { throw null; } } + public static System.Xaml.XamlDirective Space { get { throw null; } } + public static System.Xaml.XamlType Static { get { throw null; } } + public static System.Xaml.XamlType String { get { throw null; } } + public static System.Xaml.XamlDirective Subclass { get { throw null; } } + public static System.Xaml.XamlDirective SynchronousMode { get { throw null; } } + public static System.Xaml.XamlType TimeSpan { get { throw null; } } + public static System.Xaml.XamlType Type { get { throw null; } } + public static System.Xaml.XamlDirective TypeArguments { get { throw null; } } + public static System.Xaml.XamlDirective Uid { get { throw null; } } + public static System.Xaml.XamlDirective UnknownContent { get { throw null; } } + public static System.Xaml.XamlType Uri { get { throw null; } } public static System.Collections.Generic.IList XamlNamespaces { get { throw null; } } - public static System.Xaml.XamlType XData { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public static System.Xaml.XamlType XData { get { throw null; } } public static System.Collections.Generic.IList XmlNamespaces { get { throw null; } } } public partial class XamlMember : System.IEquatable @@ -662,7 +662,7 @@ namespace System.Xaml public XamlMember(string attachableEventName, System.Reflection.MethodInfo adder, System.Xaml.XamlSchemaContext schemaContext) { } public XamlMember(string attachableEventName, System.Reflection.MethodInfo adder, System.Xaml.XamlSchemaContext schemaContext, System.Xaml.Schema.XamlMemberInvoker invoker) { } public XamlMember(string name, System.Xaml.XamlType declaringType, bool isAttachable) { } - public System.Xaml.XamlType DeclaringType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Xaml.XamlType DeclaringType { get { throw null; } } public System.Xaml.Schema.XamlValueConverter DeferringLoader { get { throw null; } } public System.Collections.Generic.IList DependsOn { get { throw null; } } public System.Xaml.Schema.XamlMemberInvoker Invoker { get { throw null; } } @@ -676,7 +676,7 @@ namespace System.Xaml public bool IsUnknown { get { throw null; } } public bool IsWriteOnly { get { throw null; } } public bool IsWritePublic { get { throw null; } } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } public string PreferredXamlNamespace { get { throw null; } } public System.ComponentModel.DesignerSerializationVisibility SerializationVisibility { get { throw null; } } public System.Xaml.XamlType TargetType { get { throw null; } } @@ -728,21 +728,21 @@ namespace System.Xaml public System.Xaml.XamlReader Reader { get { throw null; } } public System.Xaml.XamlWriter Writer { get { throw null; } } } - public enum XamlNodeType + public enum XamlNodeType : byte { - EndMember = 5, - EndObject = 3, - GetObject = 2, - NamespaceDeclaration = 7, - None = 0, - StartMember = 4, - StartObject = 1, - Value = 6, + EndMember = (byte)5, + EndObject = (byte)3, + GetObject = (byte)2, + NamespaceDeclaration = (byte)7, + None = (byte)0, + StartMember = (byte)4, + StartObject = (byte)1, + Value = (byte)6, } public partial class XamlObjectEventArgs : System.EventArgs { public XamlObjectEventArgs(object instance) { } - public object Instance { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public object Instance { get { throw null; } } } public partial class XamlObjectReader : System.Xaml.XamlReader { @@ -771,7 +771,7 @@ namespace System.Xaml public partial class XamlObjectReaderSettings : System.Xaml.XamlReaderSettings { public XamlObjectReaderSettings() { } - public bool RequireExplicitContentVisibility { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool RequireExplicitContentVisibility { get { throw null; } set { } } } public partial class XamlObjectWriter : System.Xaml.XamlWriter, System.Xaml.IXamlLineInfoConsumer { @@ -810,23 +810,23 @@ namespace System.Xaml public XamlObjectWriterSettings() { } public XamlObjectWriterSettings(System.Xaml.XamlObjectWriterSettings settings) { } [System.MonoTODOAttribute("Ignored")] - public System.Xaml.Permissions.XamlAccessLevel AccessLevel { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.EventHandler AfterBeginInitHandler { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.EventHandler AfterEndInitHandler { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.EventHandler AfterPropertiesHandler { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.EventHandler BeforePropertiesHandler { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Windows.Markup.INameScope ExternalNameScope { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Xaml.Permissions.XamlAccessLevel AccessLevel { get { throw null; } set { } } + public System.EventHandler AfterBeginInitHandler { get { throw null; } set { } } + public System.EventHandler AfterEndInitHandler { get { throw null; } set { } } + public System.EventHandler AfterPropertiesHandler { get { throw null; } set { } } + public System.EventHandler BeforePropertiesHandler { get { throw null; } set { } } + public System.Windows.Markup.INameScope ExternalNameScope { get { throw null; } set { } } [System.MonoTODOAttribute("Ignored")] - public bool IgnoreCanConvert { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool IgnoreCanConvert { get { throw null; } set { } } [System.MonoTODOAttribute("Ignored")] - public bool PreferUnconvertedDictionaryKeys { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool RegisterNamesOnExternalNamescope { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object RootObjectInstance { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool PreferUnconvertedDictionaryKeys { get { throw null; } set { } } + public bool RegisterNamesOnExternalNamescope { get { throw null; } set { } } + public object RootObjectInstance { get { throw null; } set { } } [System.MonoTODOAttribute("Ignored")] - public bool SkipDuplicatePropertyCheck { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool SkipDuplicatePropertyCheck { get { throw null; } set { } } [System.MonoTODOAttribute("Ignored")] - public bool SkipProvideValueOnRoot { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.EventHandler XamlSetValueHandler { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool SkipProvideValueOnRoot { get { throw null; } set { } } + public System.EventHandler XamlSetValueHandler { get { throw null; } set { } } } [System.SerializableAttribute] public partial class XamlParseException : System.Xaml.XamlException @@ -839,7 +839,7 @@ namespace System.Xaml public abstract partial class XamlReader : System.IDisposable { protected XamlReader() { } - protected bool IsDisposed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + protected bool IsDisposed { get { throw null; } } public abstract bool IsEof { get; } public abstract System.Xaml.XamlMember Member { get; } public abstract System.Xaml.NamespaceDeclaration Namespace { get; } @@ -858,12 +858,12 @@ namespace System.Xaml { public XamlReaderSettings() { } public XamlReaderSettings(System.Xaml.XamlReaderSettings settings) { } - public bool AllowProtectedMembersOnRoot { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Uri BaseUri { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IgnoreUidsOnPropertyElements { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Reflection.Assembly LocalAssembly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool ProvideLineInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool ValuesMustBeString { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool AllowProtectedMembersOnRoot { get { throw null; } set { } } + public System.Uri BaseUri { get { throw null; } set { } } + public bool IgnoreUidsOnPropertyElements { get { throw null; } set { } } + public System.Reflection.Assembly LocalAssembly { get { throw null; } set { } } + public bool ProvideLineInfo { get { throw null; } set { } } + public bool ValuesMustBeString { get { throw null; } set { } } } public partial class XamlSchemaContext { @@ -871,9 +871,9 @@ namespace System.Xaml public XamlSchemaContext(System.Collections.Generic.IEnumerable referenceAssemblies) { } public XamlSchemaContext(System.Collections.Generic.IEnumerable referenceAssemblies, System.Xaml.XamlSchemaContextSettings settings) { } public XamlSchemaContext(System.Xaml.XamlSchemaContextSettings settings) { } - public bool FullyQualifyAssemblyNamesInClrNamespaces { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool FullyQualifyAssemblyNamesInClrNamespaces { get { throw null; } } public System.Collections.Generic.IList ReferenceAssemblies { get { throw null; } } - public bool SupportMarkupExtensionsWithDuplicateArity { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool SupportMarkupExtensionsWithDuplicateArity { get { throw null; } } ~XamlSchemaContext() { } public virtual System.Collections.Generic.IEnumerable GetAllXamlNamespaces() { throw null; } public virtual System.Collections.Generic.ICollection GetAllXamlTypes(string xamlNamespace) { throw null; } @@ -890,8 +890,8 @@ namespace System.Xaml { public XamlSchemaContextSettings() { } public XamlSchemaContextSettings(System.Xaml.XamlSchemaContextSettings settings) { } - public bool FullyQualifyAssemblyNamesInClrNamespaces { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SupportMarkupExtensionsWithDuplicateArity { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool FullyQualifyAssemblyNamesInClrNamespaces { get { throw null; } set { } } + public bool SupportMarkupExtensionsWithDuplicateArity { get { throw null; } set { } } } [System.SerializableAttribute] public partial class XamlSchemaException : System.Xaml.XamlException @@ -949,11 +949,11 @@ namespace System.Xaml public System.Xaml.XamlType ItemType { get { throw null; } } public System.Xaml.XamlType KeyType { get { throw null; } } public System.Xaml.XamlType MarkupExtensionReturnType { get { throw null; } } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string PreferredXamlNamespace { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Xaml.XamlSchemaContext SchemaContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } } + public string PreferredXamlNamespace { get { throw null; } } + public System.Xaml.XamlSchemaContext SchemaContext { get { throw null; } } public bool TrimSurroundingWhitespace { get { throw null; } } - public System.Collections.Generic.IList TypeArguments { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IList TypeArguments { get { throw null; } } public System.Xaml.Schema.XamlValueConverter TypeConverter { get { throw null; } } public System.Type UnderlyingType { get { throw null; } } public System.Xaml.Schema.XamlValueConverter ValueSerializer { get { throw null; } } @@ -1009,7 +1009,7 @@ namespace System.Xaml public abstract partial class XamlWriter : System.IDisposable { protected XamlWriter() { } - protected bool IsDisposed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + protected bool IsDisposed { get { throw null; } } public abstract System.Xaml.XamlSchemaContext SchemaContext { get; } public void Close() { } protected virtual void Dispose(bool disposing) { } @@ -1062,10 +1062,10 @@ namespace System.Xaml { public XamlXmlReaderSettings() { } public XamlXmlReaderSettings(System.Xaml.XamlXmlReaderSettings settings) { } - public bool CloseInput { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SkipXmlCompatibilityProcessing { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string XmlLang { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool XmlSpacePreserve { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool CloseInput { get { throw null; } set { } } + public bool SkipXmlCompatibilityProcessing { get { throw null; } set { } } + public string XmlLang { get { throw null; } set { } } + public bool XmlSpacePreserve { get { throw null; } set { } } } public partial class XamlXmlWriter : System.Xaml.XamlWriter { @@ -1098,8 +1098,8 @@ namespace System.Xaml public partial class XamlXmlWriterSettings : System.Xaml.XamlWriterSettings { public XamlXmlWriterSettings() { } - public bool AssumeValidInput { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool CloseOutput { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool AssumeValidInput { get { throw null; } set { } } + public bool CloseOutput { get { throw null; } set { } } public System.Xaml.XamlXmlWriterSettings Copy() { throw null; } } } @@ -1109,8 +1109,8 @@ namespace System.Xaml.Permissions public partial class XamlAccessLevel { internal XamlAccessLevel() { } - public System.Reflection.AssemblyName AssemblyAccessToAssemblyName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string PrivateAccessToTypeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Reflection.AssemblyName AssemblyAccessToAssemblyName { get { throw null; } } + public string PrivateAccessToTypeName { get { throw null; } } public static System.Xaml.Permissions.XamlAccessLevel AssemblyAccessTo(System.Reflection.Assembly assembly) { throw null; } public static System.Xaml.Permissions.XamlAccessLevel AssemblyAccessTo(System.Reflection.AssemblyName assemblyName) { throw null; } public static System.Xaml.Permissions.XamlAccessLevel PrivateAccessTo(string assemblyQualifiedTypeName) { throw null; } @@ -1122,7 +1122,7 @@ namespace System.Xaml.Permissions public XamlLoadPermission(System.Collections.Generic.IEnumerable allowedAccess) { } public XamlLoadPermission(System.Security.Permissions.PermissionState state) { } public XamlLoadPermission(System.Xaml.Permissions.XamlAccessLevel allowedAccess) { } - public System.Collections.Generic.IList AllowedAccess { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IList AllowedAccess { get { throw null; } } public override System.Security.IPermission Copy() { throw null; } public override void FromXml(System.Security.SecurityElement elem) { } public bool Includes(System.Xaml.Permissions.XamlAccessLevel requestedAccess) { throw null; } @@ -1149,12 +1149,12 @@ namespace System.Xaml.Schema False = 2, True = 1, } - public enum XamlCollectionKind + public enum XamlCollectionKind : byte { - Array = 3, - Collection = 1, - Dictionary = 2, - None = 0, + Array = (byte)3, + Collection = (byte)1, + Dictionary = (byte)2, + None = (byte)0, } public partial class XamlMemberInvoker { @@ -1187,9 +1187,9 @@ namespace System.Xaml.Schema public XamlTypeName(string xamlNamespace, string name) { } public XamlTypeName(string xamlNamespace, string name, System.Collections.Generic.IEnumerable typeArguments) { } public XamlTypeName(System.Xaml.XamlType xamlType) { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Namespace { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IList TypeArguments { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { get { throw null; } set { } } + public string Namespace { get { throw null; } set { } } + public System.Collections.Generic.IList TypeArguments { get { throw null; } } public static System.Xaml.Schema.XamlTypeName Parse(string typeName, System.Xaml.IXamlNamespaceResolver namespaceResolver) { throw null; } public static System.Collections.Generic.IList ParseList(string typeNameList, System.Xaml.IXamlNamespaceResolver namespaceResolver) { throw null; } public override string ToString() { throw null; } @@ -1211,9 +1211,9 @@ namespace System.Xaml.Schema public XamlValueConverter(System.Type converterType, System.Xaml.XamlType targetType) { } public XamlValueConverter(System.Type converterType, System.Xaml.XamlType targetType, string name) { } public TConverterBase ConverterInstance { get { throw null; } } - public System.Type ConverterType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Xaml.XamlType TargetType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Type ConverterType { get { throw null; } } + public string Name { get { throw null; } } + public System.Xaml.XamlType TargetType { get { throw null; } } protected virtual TConverterBase CreateInstance() { throw null; } public override bool Equals(object obj) { throw null; } public bool Equals(System.Xaml.Schema.XamlValueConverter other) { throw null; } diff --git a/external/api-snapshot/profiles/net_4_x/System.Xml.Linq.cs b/external/api-snapshot/profiles/net_4_x/System.Xml.Linq.cs index 4e0470ddc3..9bbe110fb2 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Xml.Linq.cs +++ b/external/api-snapshot/profiles/net_4_x/System.Xml.Linq.cs @@ -19,6 +19,7 @@ [assembly:System.Runtime.CompilerServices.RuntimeCompatibilityAttribute(WrapNonExceptionThrows=true)] [assembly:System.Runtime.InteropServices.ComVisibleAttribute(false)] [assembly:System.Security.AllowPartiallyTrustedCallersAttribute] +[assembly:System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.RequestMinimum, SkipVerification=true)] namespace System.Xml.Linq { public static partial class Extensions @@ -63,7 +64,6 @@ namespace System.Xml.Linq None = 0, OmitDuplicateNamespaces = 2, } - [System.ComponentModel.TypeDescriptionProviderAttribute("MS.Internal.Xml.Linq.ComponentModel.XTypeDescriptionProvider")] public partial class XAttribute : System.Xml.Linq.XObject { public XAttribute(System.Xml.Linq.XAttribute other) { } @@ -135,6 +135,7 @@ namespace System.Xml.Linq public XCData(System.Xml.Linq.XCData other) : base (default(string)) { } public override System.Xml.XmlNodeType NodeType { get { throw null; } } public override void WriteTo(System.Xml.XmlWriter writer) { } + public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } public partial class XComment : System.Xml.Linq.XNode { @@ -143,6 +144,7 @@ namespace System.Xml.Linq public override System.Xml.XmlNodeType NodeType { get { throw null; } } public string Value { get { throw null; } set { } } public override void WriteTo(System.Xml.XmlWriter writer) { } + public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } public abstract partial class XContainer : System.Xml.Linq.XNode { @@ -192,6 +194,9 @@ namespace System.Xml.Linq public static System.Xml.Linq.XDocument Load(string uri, System.Xml.Linq.LoadOptions options) { throw null; } public static System.Xml.Linq.XDocument Load(System.Xml.XmlReader reader) { throw null; } public static System.Xml.Linq.XDocument Load(System.Xml.XmlReader reader, System.Xml.Linq.LoadOptions options) { throw null; } + public static System.Threading.Tasks.Task LoadAsync(System.IO.Stream stream, System.Xml.Linq.LoadOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public static System.Threading.Tasks.Task LoadAsync(System.IO.TextReader textReader, System.Xml.Linq.LoadOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public static System.Threading.Tasks.Task LoadAsync(System.Xml.XmlReader reader, System.Xml.Linq.LoadOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } public static System.Xml.Linq.XDocument Parse(string text) { throw null; } public static System.Xml.Linq.XDocument Parse(string text, System.Xml.Linq.LoadOptions options) { throw null; } public void Save(System.IO.Stream stream) { } @@ -201,7 +206,11 @@ namespace System.Xml.Linq public void Save(string fileName) { } public void Save(string fileName, System.Xml.Linq.SaveOptions options) { } public void Save(System.Xml.XmlWriter writer) { } + public System.Threading.Tasks.Task SaveAsync(System.IO.Stream stream, System.Xml.Linq.SaveOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.Task SaveAsync(System.IO.TextWriter textWriter, System.Xml.Linq.SaveOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.Task SaveAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } public override void WriteTo(System.Xml.XmlWriter writer) { } + public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } public partial class XDocumentType : System.Xml.Linq.XNode { @@ -213,8 +222,8 @@ namespace System.Xml.Linq public string PublicId { get { throw null; } set { } } public string SystemId { get { throw null; } set { } } public override void WriteTo(System.Xml.XmlWriter writer) { } + public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } - [System.ComponentModel.TypeDescriptionProviderAttribute("MS.Internal.Xml.Linq.ComponentModel.XTypeDescriptionProvider")] [System.Xml.Serialization.XmlSchemaProviderAttribute(null, IsAny=true)] public partial class XElement : System.Xml.Linq.XContainer, System.Xml.Serialization.IXmlSerializable { @@ -251,6 +260,9 @@ namespace System.Xml.Linq public static System.Xml.Linq.XElement Load(string uri, System.Xml.Linq.LoadOptions options) { throw null; } public static System.Xml.Linq.XElement Load(System.Xml.XmlReader reader) { throw null; } public static System.Xml.Linq.XElement Load(System.Xml.XmlReader reader, System.Xml.Linq.LoadOptions options) { throw null; } + public static System.Threading.Tasks.Task LoadAsync(System.IO.Stream stream, System.Xml.Linq.LoadOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public static System.Threading.Tasks.Task LoadAsync(System.IO.TextReader textReader, System.Xml.Linq.LoadOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public static System.Threading.Tasks.Task LoadAsync(System.Xml.XmlReader reader, System.Xml.Linq.LoadOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } [System.CLSCompliantAttribute(false)] public static explicit operator bool (System.Xml.Linq.XElement element) { throw null; } [System.CLSCompliantAttribute(false)] @@ -316,6 +328,9 @@ namespace System.Xml.Linq public void Save(string fileName) { } public void Save(string fileName, System.Xml.Linq.SaveOptions options) { } public void Save(System.Xml.XmlWriter writer) { } + public System.Threading.Tasks.Task SaveAsync(System.IO.Stream stream, System.Xml.Linq.SaveOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.Task SaveAsync(System.IO.TextWriter textWriter, System.Xml.Linq.SaveOptions options, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.Task SaveAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } public void SetAttributeValue(System.Xml.Linq.XName name, object value) { } public void SetElementValue(System.Xml.Linq.XName name, object value) { } public void SetValue(object value) { } @@ -323,6 +338,7 @@ namespace System.Xml.Linq void System.Xml.Serialization.IXmlSerializable.ReadXml(System.Xml.XmlReader reader) { } void System.Xml.Serialization.IXmlSerializable.WriteXml(System.Xml.XmlWriter writer) { } public override void WriteTo(System.Xml.XmlWriter writer) { } + public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } [System.SerializableAttribute] public sealed partial class XName : System.IEquatable, System.Runtime.Serialization.ISerializable @@ -340,7 +356,6 @@ namespace System.Xml.Linq public static implicit operator System.Xml.Linq.XName (string expandedName) { throw null; } public static bool operator !=(System.Xml.Linq.XName left, System.Xml.Linq.XName right) { throw null; } bool System.IEquatable.Equals(System.Xml.Linq.XName other) { throw null; } - [System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.LinkDemand, Flags=(System.Security.Permissions.SecurityPermissionFlag)(128))] void System.Runtime.Serialization.ISerializable.GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } public override string ToString() { throw null; } } @@ -388,12 +403,14 @@ namespace System.Xml.Linq public System.Collections.Generic.IEnumerable NodesAfterSelf() { throw null; } public System.Collections.Generic.IEnumerable NodesBeforeSelf() { throw null; } public static System.Xml.Linq.XNode ReadFrom(System.Xml.XmlReader reader) { throw null; } + public static System.Threading.Tasks.Task ReadFromAsync(System.Xml.XmlReader reader, System.Threading.CancellationToken cancellationToken) { throw null; } public void Remove() { } public void ReplaceWith(object content) { } public void ReplaceWith(params object[] content) { } public override string ToString() { throw null; } public string ToString(System.Xml.Linq.SaveOptions options) { throw null; } public abstract void WriteTo(System.Xml.XmlWriter writer); + public abstract System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken); } public sealed partial class XNodeDocumentOrderComparer : System.Collections.Generic.IComparer, System.Collections.IComparer { @@ -453,6 +470,7 @@ namespace System.Xml.Linq public override System.Xml.XmlNodeType NodeType { get { throw null; } } public string Target { get { throw null; } set { } } public override void WriteTo(System.Xml.XmlWriter writer) { } + public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } public partial class XStreamingElement { @@ -480,6 +498,7 @@ namespace System.Xml.Linq public override System.Xml.XmlNodeType NodeType { get { throw null; } } public string Value { get { throw null; } set { } } public override void WriteTo(System.Xml.XmlWriter writer) { } + public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } } namespace System.Xml.Schema diff --git a/external/api-snapshot/profiles/net_4_x/System.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/System.cs.REMOVED.git-id index 2b23900b47..d0eba433dc 100644 --- a/external/api-snapshot/profiles/net_4_x/System.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/System.cs.REMOVED.git-id @@ -1 +1 @@ -06d56d3a31822e894d57eb3351139516b39799de \ No newline at end of file +0e31ba5d23e56d9bf294bc2cb75621d58d6ee1ab \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/WebMatrix.Data.cs b/external/api-snapshot/profiles/net_4_x/WebMatrix.Data.cs index 32ace55926..7aef8acb7e 100644 --- a/external/api-snapshot/profiles/net_4_x/WebMatrix.Data.cs +++ b/external/api-snapshot/profiles/net_4_x/WebMatrix.Data.cs @@ -11,7 +11,7 @@ namespace WebMatrix.Data public partial class ConnectionEventArgs : System.EventArgs { public ConnectionEventArgs(System.Data.Common.DbConnection connection) { } - public System.Data.Common.DbConnection Connection { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Data.Common.DbConnection Connection { get { throw null; } } } public partial class Database : System.IDisposable { @@ -33,7 +33,7 @@ namespace WebMatrix.Data public sealed partial class DynamicRecord : System.Dynamic.DynamicObject, System.ComponentModel.ICustomTypeDescriptor { internal DynamicRecord() { } - public System.Collections.Generic.IList Columns { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IList Columns { get { throw null; } } public object this[int index] { get { throw null; } } public object this[string name] { get { throw null; } } public override System.Collections.Generic.IEnumerable GetDynamicMemberNames() { throw null; } diff --git a/external/api-snapshot/profiles/net_4_x/WindowsBase.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/WindowsBase.cs.REMOVED.git-id index ddaeb95dbb..7d5c91a014 100644 --- a/external/api-snapshot/profiles/net_4_x/WindowsBase.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/WindowsBase.cs.REMOVED.git-id @@ -1 +1 @@ -7c4cab057dea7cdd1c29ca8ff2e80edeecc65e49 \ No newline at end of file +1436e3f0bd51e046a7d7d95ff067cbf1d916109d \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/monodoc.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/monodoc.cs.REMOVED.git-id index da05d5dfc6..5ab2ee03c1 100644 --- a/external/api-snapshot/profiles/net_4_x/monodoc.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/monodoc.cs.REMOVED.git-id @@ -1 +1 @@ -d6b01b1e07d586eb49b606dc623fe821e6511315 \ No newline at end of file +b965e0c787be80bacc2c3d3b3f0c94ca019c8897 \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id index 4b8a0445e8..393cae410f 100644 --- a/external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id @@ -1 +1 @@ -43bab23ba317a77d77755935069083d3560b770d \ No newline at end of file +6181969e24280652542eb81a3986d47fe16200f0 \ No newline at end of file diff --git a/external/binary-reference-assemblies/Makefile b/external/binary-reference-assemblies/Makefile index e770c98833..65f1461b74 100644 --- a/external/binary-reference-assemblies/Makefile +++ b/external/binary-reference-assemblies/Makefile @@ -11,8 +11,8 @@ all: $(MAKE) -C v4.7 $(MAKE) -C v4.7.1 $(MAKE) -C mono - $(MAKE) -C build/monotouch clean - $(MAKE) -C build/monodroid clean + $(MAKE) -C build/monotouch + $(MAKE) -C build/monodroid clean: $(MAKE) -C v2.0 clean diff --git a/external/binary-reference-assemblies/mono/System.Net.Http.Formatting.dll b/external/binary-reference-assemblies/mono/System.Net.Http.Formatting.dll index 6eb847d522..f5fc44b8c0 100644 Binary files a/external/binary-reference-assemblies/mono/System.Net.Http.Formatting.dll and b/external/binary-reference-assemblies/mono/System.Net.Http.Formatting.dll differ diff --git a/external/binary-reference-assemblies/src/mono/System.Net.Http.Formatting.cs b/external/binary-reference-assemblies/src/mono/System.Net.Http.Formatting.cs new file mode 100644 index 0000000000..57c0447710 --- /dev/null +++ b/external/binary-reference-assemblies/src/mono/System.Net.Http.Formatting.cs @@ -0,0 +1,351 @@ +// 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. + +[assembly:System.Reflection.AssemblyVersionAttribute("4.0.0.0")] +[assembly:System.CLSCompliantAttribute(true)] +[assembly:System.Diagnostics.DebuggableAttribute((System.Diagnostics.DebuggableAttribute.DebuggingModes)(2))] +[assembly:System.Reflection.AssemblyCompanyAttribute("Microsoft Corporation")] +[assembly:System.Reflection.AssemblyConfigurationAttribute("")] +[assembly:System.Reflection.AssemblyCopyrightAttribute("© Microsoft Corporation. All rights reserved.")] +[assembly:System.Reflection.AssemblyDescriptionAttribute("")] +[assembly:System.Reflection.AssemblyFileVersionAttribute("4.0.0.0")] +[assembly:System.Reflection.AssemblyProductAttribute("Microsoft ASP.NET MVC")] +[assembly:System.Reflection.AssemblyTitleAttribute("System.Net.Http.Formatting")] +[assembly:System.Reflection.AssemblyTrademarkAttribute("")] +[assembly:System.Resources.NeutralResourcesLanguageAttribute("en-US")] +[assembly:System.Runtime.CompilerServices.CompilationRelaxationsAttribute(8)] +[assembly:System.Runtime.CompilerServices.ReferenceAssemblyAttribute] +[assembly:System.Runtime.CompilerServices.RuntimeCompatibilityAttribute(WrapNonExceptionThrows=true)] +[assembly:System.Runtime.InteropServices.ComVisibleAttribute(false)] +[assembly:System.Runtime.InteropServices.GuidAttribute("7fa1ae84-36e2-46b6-812c-c985a8e65e9a")] +[assembly:System.Security.SecurityTransparentAttribute] +namespace System.Net.Http +{ + [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] + public static partial class HttpClientExtensions + { + public static System.Threading.Tasks.Task PostAsJsonAsync(this System.Net.Http.HttpClient client, string requestUri, T value) { throw null; } + public static System.Threading.Tasks.Task PostAsJsonAsync(this System.Net.Http.HttpClient client, string requestUri, T value, System.Threading.CancellationToken cancellationToken) { throw null; } + public static System.Threading.Tasks.Task PostAsXmlAsync(this System.Net.Http.HttpClient client, string requestUri, T value) { throw null; } + public static System.Threading.Tasks.Task PostAsXmlAsync(this System.Net.Http.HttpClient client, string requestUri, T value, System.Threading.CancellationToken cancellationToken) { throw null; } + public static System.Threading.Tasks.Task PostAsync(this System.Net.Http.HttpClient client, string requestUri, T value, System.Net.Http.Formatting.MediaTypeFormatter formatter) { throw null; } + public static System.Threading.Tasks.Task PostAsync(this System.Net.Http.HttpClient client, string requestUri, T value, System.Net.Http.Formatting.MediaTypeFormatter formatter, string mediaType) { throw null; } + public static System.Threading.Tasks.Task PostAsync(this System.Net.Http.HttpClient client, string requestUri, T value, System.Net.Http.Formatting.MediaTypeFormatter formatter, string mediaType, System.Threading.CancellationToken cancellationToken) { throw null; } + public static System.Threading.Tasks.Task PostAsync(this System.Net.Http.HttpClient client, string requestUri, T value, System.Net.Http.Formatting.MediaTypeFormatter formatter, System.Threading.CancellationToken cancellationToken) { throw null; } + public static System.Threading.Tasks.Task PutAsJsonAsync(this System.Net.Http.HttpClient client, string requestUri, T value) { throw null; } + public static System.Threading.Tasks.Task PutAsJsonAsync(this System.Net.Http.HttpClient client, string requestUri, T value, System.Threading.CancellationToken cancellationToken) { throw null; } + public static System.Threading.Tasks.Task PutAsXmlAsync(this System.Net.Http.HttpClient client, string requestUri, T value) { throw null; } + public static System.Threading.Tasks.Task PutAsXmlAsync(this System.Net.Http.HttpClient client, string requestUri, T value, System.Threading.CancellationToken cancellationToken) { throw null; } + public static System.Threading.Tasks.Task PutAsync(this System.Net.Http.HttpClient client, string requestUri, T value, System.Net.Http.Formatting.MediaTypeFormatter formatter) { throw null; } + public static System.Threading.Tasks.Task PutAsync(this System.Net.Http.HttpClient client, string requestUri, T value, System.Net.Http.Formatting.MediaTypeFormatter formatter, string mediaType) { throw null; } + public static System.Threading.Tasks.Task PutAsync(this System.Net.Http.HttpClient client, string requestUri, T value, System.Net.Http.Formatting.MediaTypeFormatter formatter, string mediaType, System.Threading.CancellationToken cancellationToken) { throw null; } + public static System.Threading.Tasks.Task PutAsync(this System.Net.Http.HttpClient client, string requestUri, T value, System.Net.Http.Formatting.MediaTypeFormatter formatter, System.Threading.CancellationToken cancellationToken) { throw null; } + } + [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] + public static partial class HttpContentCollectionExtensions + { + public static System.Collections.Generic.IEnumerable FindAllContentType(this System.Collections.Generic.IEnumerable contents, System.Net.Http.Headers.MediaTypeHeaderValue contentType) { throw null; } + public static System.Collections.Generic.IEnumerable FindAllContentType(this System.Collections.Generic.IEnumerable contents, string contentType) { throw null; } + public static System.Net.Http.HttpContent FirstDispositionName(this System.Collections.Generic.IEnumerable contents, string dispositionName) { throw null; } + public static System.Net.Http.HttpContent FirstDispositionNameOrDefault(this System.Collections.Generic.IEnumerable contents, string dispositionName) { throw null; } + public static System.Net.Http.HttpContent FirstDispositionType(this System.Collections.Generic.IEnumerable contents, string dispositionType) { throw null; } + public static System.Net.Http.HttpContent FirstDispositionTypeOrDefault(this System.Collections.Generic.IEnumerable contents, string dispositionType) { throw null; } + public static System.Net.Http.HttpContent FirstStart(this System.Collections.Generic.IEnumerable contents, string start) { throw null; } + public static System.Net.Http.HttpContent FirstStartOrDefault(this System.Collections.Generic.IEnumerable contents, string start) { throw null; } + } + [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] + public static partial class HttpContentExtensions + { + public static System.Threading.Tasks.Task ReadAsAsync(this System.Net.Http.HttpContent content, System.Type type) { throw null; } + public static System.Threading.Tasks.Task ReadAsAsync(this System.Net.Http.HttpContent content, System.Type type, System.Collections.Generic.IEnumerable formatters) { throw null; } + public static System.Threading.Tasks.Task ReadAsAsync(this System.Net.Http.HttpContent content, System.Type type, System.Collections.Generic.IEnumerable formatters, System.Net.Http.Formatting.IFormatterLogger formatterLogger) { throw null; } + public static System.Threading.Tasks.Task ReadAsAsync(this System.Net.Http.HttpContent content) { throw null; } + public static System.Threading.Tasks.Task ReadAsAsync(this System.Net.Http.HttpContent content, System.Collections.Generic.IEnumerable formatters) { throw null; } + public static System.Threading.Tasks.Task ReadAsAsync(this System.Net.Http.HttpContent content, System.Collections.Generic.IEnumerable formatters, System.Net.Http.Formatting.IFormatterLogger formatterLogger) { throw null; } + } + [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] + public static partial class HttpContentMessageExtensions + { + public static bool IsHttpRequestMessageContent(this System.Net.Http.HttpContent content) { throw null; } + public static bool IsHttpResponseMessageContent(this System.Net.Http.HttpContent content) { throw null; } + public static System.Threading.Tasks.Task ReadAsHttpRequestMessageAsync(this System.Net.Http.HttpContent content) { throw null; } + public static System.Threading.Tasks.Task ReadAsHttpRequestMessageAsync(this System.Net.Http.HttpContent content, string uriScheme) { throw null; } + public static System.Threading.Tasks.Task ReadAsHttpRequestMessageAsync(this System.Net.Http.HttpContent content, string uriScheme, int bufferSize) { throw null; } + public static System.Threading.Tasks.Task ReadAsHttpResponseMessageAsync(this System.Net.Http.HttpContent content) { throw null; } + public static System.Threading.Tasks.Task ReadAsHttpResponseMessageAsync(this System.Net.Http.HttpContent content, int bufferSize) { throw null; } + } + [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] + public static partial class HttpContentMultipartExtensions + { + public static bool IsMimeMultipartContent(this System.Net.Http.HttpContent content) { throw null; } + public static bool IsMimeMultipartContent(this System.Net.Http.HttpContent content, string subtype) { throw null; } + public static System.Threading.Tasks.Task> ReadAsMultipartAsync(this System.Net.Http.HttpContent content) { throw null; } + public static System.Threading.Tasks.Task> ReadAsMultipartAsync(this System.Net.Http.HttpContent content, System.Net.Http.IMultipartStreamProvider streamProvider) { throw null; } + public static System.Threading.Tasks.Task> ReadAsMultipartAsync(this System.Net.Http.HttpContent content, System.Net.Http.IMultipartStreamProvider streamProvider, int bufferSize) { throw null; } + } + public partial class HttpMessageContent : System.Net.Http.HttpContent + { + public HttpMessageContent(System.Net.Http.HttpRequestMessage httpRequest) { } + public HttpMessageContent(System.Net.Http.HttpResponseMessage httpResponse) { } + public System.Net.Http.HttpRequestMessage HttpRequestMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Net.Http.HttpResponseMessage HttpResponseMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + protected override void Dispose(bool disposing) { } + protected override System.Threading.Tasks.Task SerializeToStreamAsync(System.IO.Stream stream, System.Net.TransportContext context) { throw null; } + protected override bool TryComputeLength(out long length) { length = default(long); throw null; } + } + [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] + public static partial class HttpRequestHeadersExtensions + { + public static System.Collections.ObjectModel.Collection GetCookies(this System.Net.Http.Headers.HttpRequestHeaders headers) { throw null; } + } + [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] + public static partial class HttpRequestMessageExtensions + { + public static System.Net.Http.HttpResponseMessage CreateResponse(this System.Net.Http.HttpRequestMessage request) { throw null; } + public static System.Net.Http.HttpResponseMessage CreateResponse(this System.Net.Http.HttpRequestMessage request, System.Net.HttpStatusCode statusCode) { throw null; } + } + [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] + public static partial class HttpResponseHeadersExtensions + { + public static void AddCookies(this System.Net.Http.Headers.HttpResponseHeaders headers, System.Collections.Generic.IEnumerable cookies) { } + } + public partial interface IMultipartStreamProvider + { + System.IO.Stream GetStream(System.Net.Http.Headers.HttpContentHeaders headers); + } + public partial class MultipartFileStreamProvider : System.Net.Http.IMultipartStreamProvider + { + public MultipartFileStreamProvider(string rootPath) { } + public MultipartFileStreamProvider(string rootPath, int bufferSize) { } + public System.Collections.ObjectModel.Collection BodyPartFileNames { get { throw null; } } + public virtual string GetLocalFileName(System.Net.Http.Headers.HttpContentHeaders headers) { throw null; } + public virtual System.IO.Stream GetStream(System.Net.Http.Headers.HttpContentHeaders headers) { throw null; } + } + public partial class MultipartFormDataStreamProvider : System.Net.Http.IMultipartStreamProvider + { + public MultipartFormDataStreamProvider(string rootPath) { } + public MultipartFormDataStreamProvider(string rootPath, int bufferSize) { } + public System.Collections.Generic.IDictionary BodyPartFileNames { get { throw null; } } + public virtual string GetLocalFileName(System.Net.Http.Headers.HttpContentHeaders headers) { throw null; } + public virtual System.IO.Stream GetStream(System.Net.Http.Headers.HttpContentHeaders headers) { throw null; } + } + public partial class ObjectContent : System.Net.Http.HttpContent + { + public ObjectContent(System.Type type, object value, System.Net.Http.Formatting.MediaTypeFormatter formatter) { } + public ObjectContent(System.Type type, object value, System.Net.Http.Formatting.MediaTypeFormatter formatter, string mediaType) { } + public System.Net.Http.Formatting.MediaTypeFormatter Formatter { get { throw null; } } + public System.Type ObjectType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public object Value { get { throw null; } set { } } + protected override System.Threading.Tasks.Task SerializeToStreamAsync(System.IO.Stream stream, System.Net.TransportContext context) { throw null; } + protected override bool TryComputeLength(out long length) { length = default(long); throw null; } + } + public partial class ObjectContent : System.Net.Http.ObjectContent + { + public ObjectContent(T value, System.Net.Http.Formatting.MediaTypeFormatter formatter) : base (default(System.Type), default(object), default(System.Net.Http.Formatting.MediaTypeFormatter)) { } + public ObjectContent(T value, System.Net.Http.Formatting.MediaTypeFormatter formatter, string mediaType) : base (default(System.Type), default(object), default(System.Net.Http.Formatting.MediaTypeFormatter)) { } + } + [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] + public static partial class UriExtensions + { + public static System.Collections.Specialized.NameValueCollection ParseQueryString(this System.Uri address) { throw null; } + public static bool TryReadQueryAs(this System.Uri address, System.Type type, out object value) { value = default(object); throw null; } + public static bool TryReadQueryAs(this System.Uri address, out T value) { value = default(T); throw null; } + } +} +namespace System.Net.Http.Formatting +{ + public abstract partial class BufferedMediaTypeFormatter : System.Net.Http.Formatting.MediaTypeFormatter + { + protected BufferedMediaTypeFormatter() { } + public int BufferSize { get { throw null; } set { } } + public virtual object ReadFromStream(System.Type type, System.IO.Stream stream, System.Net.Http.Headers.HttpContentHeaders contentHeaders, System.Net.Http.Formatting.IFormatterLogger formatterLogger) { throw null; } + public sealed override System.Threading.Tasks.Task ReadFromStreamAsync(System.Type type, System.IO.Stream stream, System.Net.Http.Headers.HttpContentHeaders contentHeaders, System.Net.Http.Formatting.IFormatterLogger formatterLogger) { throw null; } + public virtual void WriteToStream(System.Type type, object value, System.IO.Stream stream, System.Net.Http.Headers.HttpContentHeaders contentHeaders) { } + public sealed override System.Threading.Tasks.Task WriteToStreamAsync(System.Type type, object value, System.IO.Stream stream, System.Net.Http.Headers.HttpContentHeaders contentHeaders, System.Net.TransportContext transportContext) { throw null; } + } + public partial class ContentNegotiationResult + { + public ContentNegotiationResult(System.Net.Http.Formatting.MediaTypeFormatter formatter, System.Net.Http.Headers.MediaTypeHeaderValue mediaType) { } + public System.Net.Http.Formatting.MediaTypeFormatter Formatter { get { throw null; } set { } } + public System.Net.Http.Headers.MediaTypeHeaderValue MediaType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + public partial class DefaultContentNegotiator : System.Net.Http.Formatting.IContentNegotiator + { + public DefaultContentNegotiator() { } + public virtual System.Net.Http.Formatting.ContentNegotiationResult Negotiate(System.Type type, System.Net.Http.HttpRequestMessage request, System.Collections.Generic.IEnumerable formatters) { throw null; } + } + public sealed partial class DelegatingEnumerable : System.Collections.Generic.IEnumerable, System.Collections.IEnumerable + { + public DelegatingEnumerable() { } + public DelegatingEnumerable(System.Collections.Generic.IEnumerable source) { } + public void Add(object item) { } + public System.Collections.Generic.IEnumerator GetEnumerator() { throw null; } + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } + } + public partial class FormDataCollection : System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + { + public FormDataCollection(System.Collections.Generic.IEnumerable> pairs) { } + public FormDataCollection(string query) { } + public FormDataCollection(System.Uri uri) { } + public string Get(string key) { throw null; } + public System.Collections.Generic.IEnumerator> GetEnumerator() { throw null; } + public string[] GetValues(string key) { throw null; } + public System.Collections.Specialized.NameValueCollection ReadAsNameValueCollection() { throw null; } + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } + } + public partial class FormUrlEncodedMediaTypeFormatter : System.Net.Http.Formatting.MediaTypeFormatter + { + public FormUrlEncodedMediaTypeFormatter() { } + public static System.Net.Http.Headers.MediaTypeHeaderValue DefaultMediaType { get { throw null; } } + public int MaxDepth { get { throw null; } set { } } + public int ReadBufferSize { get { throw null; } set { } } + public override bool CanReadType(System.Type type) { throw null; } + public override bool CanWriteType(System.Type type) { throw null; } + public override System.Threading.Tasks.Task ReadFromStreamAsync(System.Type type, System.IO.Stream stream, System.Net.Http.Headers.HttpContentHeaders contentHeaders, System.Net.Http.Formatting.IFormatterLogger formatterLogger) { throw null; } + } + public partial interface IContentNegotiator + { + System.Net.Http.Formatting.ContentNegotiationResult Negotiate(System.Type type, System.Net.Http.HttpRequestMessage request, System.Collections.Generic.IEnumerable formatters); + } + public partial interface IFormatterLogger + { + void LogError(string errorPath, string errorMessage); + } + public partial interface IRequiredMemberSelector + { + bool IsRequiredMember(System.Reflection.MemberInfo member); + } + public partial class JsonMediaTypeFormatter : System.Net.Http.Formatting.MediaTypeFormatter + { + public JsonMediaTypeFormatter() { } + public static System.Net.Http.Headers.MediaTypeHeaderValue DefaultMediaType { get { throw null; } } + public bool Indent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int MaxDepth { get { throw null; } set { } } + public bool UseDataContractJsonSerializer { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public override bool CanReadType(System.Type type) { throw null; } + public override bool CanWriteType(System.Type type) { throw null; } + public override System.Threading.Tasks.Task ReadFromStreamAsync(System.Type type, System.IO.Stream stream, System.Net.Http.Headers.HttpContentHeaders contentHeaders, System.Net.Http.Formatting.IFormatterLogger formatterLogger) { throw null; } + public override System.Threading.Tasks.Task WriteToStreamAsync(System.Type type, object value, System.IO.Stream stream, System.Net.Http.Headers.HttpContentHeaders contentHeaders, System.Net.TransportContext transportContext) { throw null; } + } + public partial class MediaRangeMapping : System.Net.Http.Formatting.MediaTypeMapping + { + public MediaRangeMapping(System.Net.Http.Headers.MediaTypeHeaderValue mediaRange, System.Net.Http.Headers.MediaTypeHeaderValue mediaType) : base (default(System.Net.Http.Headers.MediaTypeHeaderValue)) { } + public MediaRangeMapping(string mediaRange, string mediaType) : base (default(System.Net.Http.Headers.MediaTypeHeaderValue)) { } + public System.Net.Http.Headers.MediaTypeHeaderValue MediaRange { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public override double TryMatchMediaType(System.Net.Http.HttpRequestMessage request) { throw null; } + } + public abstract partial class MediaTypeFormatter + { + protected MediaTypeFormatter() { } + public static int MaxHttpCollectionKeys { get { throw null; } set { } } + public System.Collections.ObjectModel.Collection MediaTypeMappings { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Net.Http.Formatting.IRequiredMemberSelector RequiredMemberSelector { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Collections.ObjectModel.Collection SupportedEncodings { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.ObjectModel.Collection SupportedMediaTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public abstract bool CanReadType(System.Type type); + public abstract bool CanWriteType(System.Type type); + protected internal static object GetDefaultValueForType(System.Type type) { throw null; } + public virtual System.Net.Http.Formatting.MediaTypeFormatter GetPerRequestFormatterInstance(System.Type type, System.Net.Http.HttpRequestMessage request, System.Net.Http.Headers.MediaTypeHeaderValue mediaType) { throw null; } + public virtual System.Threading.Tasks.Task ReadFromStreamAsync(System.Type type, System.IO.Stream stream, System.Net.Http.Headers.HttpContentHeaders contentHeaders, System.Net.Http.Formatting.IFormatterLogger formatterLogger) { throw null; } + protected System.Text.Encoding SelectCharacterEncoding(System.Net.Http.Headers.HttpContentHeaders contentHeaders) { throw null; } + public virtual void SetDefaultContentHeaders(System.Type type, System.Net.Http.Headers.HttpContentHeaders headers, string mediaType) { } + public virtual System.Threading.Tasks.Task WriteToStreamAsync(System.Type type, object value, System.IO.Stream stream, System.Net.Http.Headers.HttpContentHeaders contentHeaders, System.Net.TransportContext transportContext) { throw null; } + } + public partial class MediaTypeFormatterCollection : System.Collections.ObjectModel.Collection + { + public MediaTypeFormatterCollection() { } + public MediaTypeFormatterCollection(System.Collections.Generic.IEnumerable formatters) { } + public System.Net.Http.Formatting.FormUrlEncodedMediaTypeFormatter FormUrlEncodedFormatter { get { throw null; } } + public System.Net.Http.Formatting.JsonMediaTypeFormatter JsonFormatter { get { throw null; } } + public System.Net.Http.Formatting.XmlMediaTypeFormatter XmlFormatter { get { throw null; } } + public System.Net.Http.Formatting.MediaTypeFormatter FindReader(System.Type type, System.Net.Http.Headers.MediaTypeHeaderValue mediaType) { throw null; } + public System.Net.Http.Formatting.MediaTypeFormatter FindWriter(System.Type type, System.Net.Http.Headers.MediaTypeHeaderValue mediaType) { throw null; } + public static bool IsTypeExcludedFromValidation(System.Type type) { throw null; } + } + [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] + public static partial class MediaTypeFormatterExtensions + { + public static void AddMediaRangeMapping(this System.Net.Http.Formatting.MediaTypeFormatter formatter, System.Net.Http.Headers.MediaTypeHeaderValue mediaRange, System.Net.Http.Headers.MediaTypeHeaderValue mediaType) { } + public static void AddMediaRangeMapping(this System.Net.Http.Formatting.MediaTypeFormatter formatter, string mediaRange, string mediaType) { } + public static void AddQueryStringMapping(this System.Net.Http.Formatting.MediaTypeFormatter formatter, string queryStringParameterName, string queryStringParameterValue, System.Net.Http.Headers.MediaTypeHeaderValue mediaType) { } + public static void AddQueryStringMapping(this System.Net.Http.Formatting.MediaTypeFormatter formatter, string queryStringParameterName, string queryStringParameterValue, string mediaType) { } + public static void AddRequestHeaderMapping(this System.Net.Http.Formatting.MediaTypeFormatter formatter, string headerName, string headerValue, System.StringComparison valueComparison, bool isValueSubstring, System.Net.Http.Headers.MediaTypeHeaderValue mediaType) { } + public static void AddRequestHeaderMapping(this System.Net.Http.Formatting.MediaTypeFormatter formatter, string headerName, string headerValue, System.StringComparison valueComparison, bool isValueSubstring, string mediaType) { } + } + public abstract partial class MediaTypeMapping + { + protected MediaTypeMapping(System.Net.Http.Headers.MediaTypeHeaderValue mediaType) { } + protected MediaTypeMapping(string mediaType) { } + public System.Net.Http.Headers.MediaTypeHeaderValue MediaType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public abstract double TryMatchMediaType(System.Net.Http.HttpRequestMessage request); + } + public partial class QueryStringMapping : System.Net.Http.Formatting.MediaTypeMapping + { + public QueryStringMapping(string queryStringParameterName, string queryStringParameterValue, System.Net.Http.Headers.MediaTypeHeaderValue mediaType) : base (default(System.Net.Http.Headers.MediaTypeHeaderValue)) { } + public QueryStringMapping(string queryStringParameterName, string queryStringParameterValue, string mediaType) : base (default(System.Net.Http.Headers.MediaTypeHeaderValue)) { } + public string QueryStringParameterName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string QueryStringParameterValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public override double TryMatchMediaType(System.Net.Http.HttpRequestMessage request) { throw null; } + } + public partial class RequestHeaderMapping : System.Net.Http.Formatting.MediaTypeMapping + { + public RequestHeaderMapping(string headerName, string headerValue, System.StringComparison valueComparison, bool isValueSubstring, System.Net.Http.Headers.MediaTypeHeaderValue mediaType) : base (default(System.Net.Http.Headers.MediaTypeHeaderValue)) { } + public RequestHeaderMapping(string headerName, string headerValue, System.StringComparison valueComparison, bool isValueSubstring, string mediaType) : base (default(System.Net.Http.Headers.MediaTypeHeaderValue)) { } + public string HeaderName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string HeaderValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.StringComparison HeaderValueComparison { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsValueSubstring { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public override double TryMatchMediaType(System.Net.Http.HttpRequestMessage request) { throw null; } + } + public partial class XmlMediaTypeFormatter : System.Net.Http.Formatting.MediaTypeFormatter + { + public XmlMediaTypeFormatter() { } + public static System.Net.Http.Headers.MediaTypeHeaderValue DefaultMediaType { get { throw null; } } + public bool Indent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int MaxDepth { get { throw null; } set { } } + [System.ComponentModel.DefaultValueAttribute(false)] + public bool UseXmlSerializer { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public override bool CanReadType(System.Type type) { throw null; } + public override bool CanWriteType(System.Type type) { throw null; } + public override System.Threading.Tasks.Task ReadFromStreamAsync(System.Type type, System.IO.Stream stream, System.Net.Http.Headers.HttpContentHeaders contentHeaders, System.Net.Http.Formatting.IFormatterLogger formatterLogger) { throw null; } + public bool RemoveSerializer(System.Type type) { throw null; } + public void SetSerializer(System.Type type, System.Runtime.Serialization.XmlObjectSerializer serializer) { } + public void SetSerializer(System.Type type, System.Xml.Serialization.XmlSerializer serializer) { } + public void SetSerializer(System.Runtime.Serialization.XmlObjectSerializer serializer) { } + public void SetSerializer(System.Xml.Serialization.XmlSerializer serializer) { } + public override System.Threading.Tasks.Task WriteToStreamAsync(System.Type type, object value, System.IO.Stream stream, System.Net.Http.Headers.HttpContentHeaders contentHeaders, System.Net.TransportContext transportContext) { throw null; } + } +} +namespace System.Net.Http.Headers +{ + public partial class CookieHeaderValue : System.ICloneable + { + protected CookieHeaderValue() { } + public CookieHeaderValue(string name, System.Collections.Specialized.NameValueCollection values) { } + public CookieHeaderValue(string name, string value) { } + public System.Collections.ObjectModel.Collection Cookies { get { throw null; } } + public string Domain { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Nullable Expires { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool HttpOnly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Net.Http.Headers.CookieState this[string name] { get { throw null; } } + public System.Nullable MaxAge { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Path { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool Secure { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public object Clone() { throw null; } + public override string ToString() { throw null; } + public static bool TryParse(string input, out System.Net.Http.Headers.CookieHeaderValue parsedValue) { parsedValue = default(System.Net.Http.Headers.CookieHeaderValue); throw null; } + } + public partial class CookieState : System.ICloneable + { + public CookieState(string name) { } + public CookieState(string name, System.Collections.Specialized.NameValueCollection values) { } + public CookieState(string name, string value) { } + public string this[string name] { get { throw null; } set { } } + public string Name { get { throw null; } set { } } + public string Value { get { throw null; } set { } } + public System.Collections.Specialized.NameValueCollection Values { get { throw null; } } + public object Clone() { throw null; } + public override string ToString() { throw null; } + } +} diff --git a/external/binary-reference-assemblies/src/mono/System.Net.Http.Formatting.cs.REMOVED.git-id b/external/binary-reference-assemblies/src/mono/System.Net.Http.Formatting.cs.REMOVED.git-id deleted file mode 100644 index 5938b25ab4..0000000000 --- a/external/binary-reference-assemblies/src/mono/System.Net.Http.Formatting.cs.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -d3866494fd815e8c32a5b02a4ade6c57c2607d8c \ No newline at end of file diff --git a/external/boringssl/crypto/ec/ec.c b/external/boringssl/crypto/ec/ec.c index 8f3fa6e13a..32f9e48fe7 100644 --- a/external/boringssl/crypto/ec/ec.c +++ b/external/boringssl/crypto/ec/ec.c @@ -223,7 +223,7 @@ static const struct curve_data P521 = { /* MSan appears to have a bug that causes code to be miscompiled in opt mode. * While that is being looked at, don't run the uint128_t code under MSan. */ #if defined(OPENSSL_64_BIT) && !defined(OPENSSL_WINDOWS) && \ - !defined(MEMORY_SANITIZER) + !defined(MEMORY_SANITIZER) && __BYTE_ORDER__ != __ORDER_BIG_ENDIAN__ #define BORINGSSL_USE_INT128_CODE #endif diff --git a/external/corefx/.editorconfig b/external/corefx/.editorconfig index c050ae10ea..437275b271 100644 --- a/external/corefx/.editorconfig +++ b/external/corefx/.editorconfig @@ -23,14 +23,14 @@ csharp_new_line_before_catch = true csharp_new_line_before_finally = true csharp_new_line_before_members_in_object_initializers = true csharp_new_line_before_members_in_anonymous_types = true -csharp_new_line_within_query_expression_clauses = true +csharp_new_line_between_query_expression_clauses = true # Indentation preferences csharp_indent_block_contents = true csharp_indent_braces = false csharp_indent_case_contents = true csharp_indent_switch_labels = true -csharp_indent_labels = flush_left +csharp_indent_labels = one_less_than_current # avoid this. unless absolutely necessary dotnet_style_qualification_for_field = false:suggestion diff --git a/external/corefx/.gitignore b/external/corefx/.gitignore index 4882fe708b..d95d659d0a 100644 --- a/external/corefx/.gitignore +++ b/external/corefx/.gitignore @@ -26,6 +26,12 @@ bld/ msbuild.log msbuild.err msbuild.wrn +msbuild.binlog +.deps/ +.dirstamp +.libs/ +*.lo +*.o # Cross building rootfs cross/rootfs/ diff --git a/external/corefx/BuildToolsVersion.txt b/external/corefx/BuildToolsVersion.txt index 889d549558..aa4bd21bee 100644 --- a/external/corefx/BuildToolsVersion.txt +++ b/external/corefx/BuildToolsVersion.txt @@ -1 +1 @@ -2.1.0-prerelease-02419-02 +2.1.0-rc1-02804-05 diff --git a/external/corefx/Documentation/building/unix-instructions.md b/external/corefx/Documentation/building/unix-instructions.md index 83e4befec1..be1e23da98 100644 --- a/external/corefx/Documentation/building/unix-instructions.md +++ b/external/corefx/Documentation/building/unix-instructions.md @@ -56,6 +56,10 @@ Ubuntu 16.10 and Ubuntu 17.04 will require libicu57. `sudo apt-get install libunwind8 libicu55 curl` +Ubuntu 18 will also need compatibility OpenSSL 1.0.x + +`sudo apt-get install libunwind8 libicu60 libssl1.0-dev curl` + In addition to the above packages, the runtime versions of the packages listed in the native section should also be installed (this happens automatically on most systems when you install the development packages). @@ -102,6 +106,25 @@ ln -s /usr/local/opt/openssl/lib/pkgconfig/libssl.pc /usr/local/lib/pkgconfig/ ln -s /usr/local/opt/openssl/lib/pkgconfig/openssl.pc /usr/local/lib/pkgconfig/ ``` +Alternatively, to avoid modifying /usr/local/ you can invoke cmake with the `OPENSSL_ROOT_DIR` env var set. The value to be passed in the directory where openssl is installed. Use `brew info openssl` to determine it. For example: + +``` +$brew info openssl +openssl: stable 1.0.2l (bottled) [keg-only] +SSL/TLS cryptography library +https://openssl.org/ +/usr/local/Cellar/openssl/1.0.1f (1,229 files, 10.8MB) + Poured from bottle on 2014-01-20 at 19:25:30 +/usr/local/Cellar/openssl/1.0.1g (1,229 files, 10.6MB) + Poured from bottle on 2014-04-07 at 11:26:41 +``` + +With the above example, we'd pick the latest version `1.0.1g` and invoke cmake like the following: + +``` +OPENSSL_ROOT_DIR="/usr/local/Cellar/openssl/1.0.1g cmake +``` + ### Known Issues If you see errors along the lines of `SendFailure (Error writing headers)` you may need to import trusted root certificates: diff --git a/external/corefx/Documentation/coding-guidelines/adding-api-guidelines.md b/external/corefx/Documentation/coding-guidelines/adding-api-guidelines.md index f2d0695842..6db1ad0909 100644 --- a/external/corefx/Documentation/coding-guidelines/adding-api-guidelines.md +++ b/external/corefx/Documentation/coding-guidelines/adding-api-guidelines.md @@ -137,4 +137,4 @@ where you removed types in order to maintain back-compat. - Remove old build configurations - The older build configurations will automatically be harvested from the last stable packages and thus can be removed. - Remove import statements - If not referencing any pre-netstandard stable packages the [imports of dotnet5.x](https://github.com/dotnet/corefx/blob/master/src/System.Diagnostics.Process/src/project.json#L28) are no longer needed and can be removed. We should also remove any dead target frameworks sections. -- Remove all non-conditionsed `` properties from csproj's as it should be defined in library\dir.props. +- Remove all non-conditioned `` properties from csproj's as it should be defined in library\dir.props. diff --git a/external/corefx/Documentation/coding-guidelines/breaking-change-rules.md b/external/corefx/Documentation/coding-guidelines/breaking-change-rules.md index 5d7409c3b9..618e9516d3 100644 --- a/external/corefx/Documentation/coding-guidelines/breaking-change-rules.md +++ b/external/corefx/Documentation/coding-guidelines/breaking-change-rules.md @@ -49,11 +49,12 @@ Breaking Change Rules > For example, `CultureInfo.GetCultureInfo(String)` used to throw `ArgumentException` in .NET Framework 3.5. In .NET Framework 4.0, this was changed to throw `CultureNotFoundException` which derives from `ArgumentException`, and therefore is an acceptable change. * Throwing a more specific exception than `NotSupportedException`, `NotImplementedException`, `NullReferenceException` or an exception that is considered unrecoverable -> Unrecoverable exceptions should not be getting caught and will be dealt with on a broad level by a high-level catch-all handler. Therefore, users are not expected to have code that catches these explicit exceptions. The list of unrecoverable exceptions are: - * `StackOverflowException` - * `SEHException` - * `ExecutionEngineException` - * `AccessViolationException` +> Unrecoverable exceptions should not be getting caught and will be dealt with on a broad level by a high-level catch-all handler. Therefore, users are not expected to have code that catches these explicit exceptions. The unrecoverable exceptions are: +> +> * `StackOverflowException` +> * `SEHException` +> * `ExecutionEngineException` +> * `AccessViolationException` * Throwing a new exception that only applies to a code-path which can only be observed with new parameter values, or state (that couldn't hit by existing code targeting the previous version) @@ -131,6 +132,8 @@ Breaking Change Rules * Moving a type from one assembly into another assembly > The old assembly must be marked with `TypeForwardedToAttribute` pointing to the new location +* Changing a `struct` type to a `readonly struct` type + ✗ **Disallowed** * Adding the `sealed` or `abstract` keyword to a type when there _are accessible_ (public or protected) constructors @@ -143,6 +146,10 @@ Breaking Change Rules * Changing the namespace or name of a type +* Changing a `readonly struct` type to a `struct` type + +* Changing a `struct` type to a `ref struct` type and vice versa + ### Members ✓ **Allowed** * Adding an abstract member to a public type when there are _no accessible_ (`public` or `protected`) constructors, or the type is `sealed` @@ -158,6 +165,8 @@ Breaking Change Rules * Introducing or removing an override > Make note, that introducing an override might cause previous consumers to skip over the override when calling `base`. +* Change from `ref readonly` return to `ref` return (except for virtual methods or interfaces) + ✗ **Disallowed** * Adding an member to an interface @@ -180,6 +189,10 @@ successfully bind to that overload, if simply passing an `int` value. However, i * Adding `virtual` to a member > While this change would often work without breaking too many scenarios because C# compiler tends to emit `callvirt` IL instructions to call non-virtual methods (`callvirt` performs a null check, while a normal `call` won't), we can't rely on it. C# is not the only language we target and the C# compiler increasingly tries to optimize `callvirt` to a normal `call` whenever the target method is non-virtual and the `this` is provably not null (such as a method accessed through the `?.` null propagation operator). Making a method virtual would mean that consumer code would often end up calling it non-virtually. +* Change from `ref` return to `ref readonly` return + +* Change from `ref readonly` return to `ref` return on a virtual method or interface + * Adding or removing `static` keyword from a member ### Signatures @@ -199,7 +212,7 @@ successfully bind to that overload, if simply passing an `int` value. However, i * Removing `params` from a parameter -* Adding or removing `out` or `ref` keywords from a parameter +* Adding or removing `in`, `out`, or `ref` keywords from a parameter * Renaming a parameter (including case) > This is considered breaking for two reasons: diff --git a/external/corefx/Documentation/coding-guidelines/coding-style.md b/external/corefx/Documentation/coding-guidelines/coding-style.md index e91ee3e367..b4ee76bdcd 100644 --- a/external/corefx/Documentation/coding-guidelines/coding-style.md +++ b/external/corefx/Documentation/coding-guidelines/coding-style.md @@ -9,10 +9,10 @@ The general rule we follow is "use Visual Studio defaults". 1. We use [Allman style](http://en.wikipedia.org/wiki/Indent_style#Allman_style) braces, where each brace begins on a new line. A single line statement block can go without braces but the block must be properly indented on its own line and it must not be nested in other statement blocks that use braces (See issue [381](https://github.com/dotnet/corefx/issues/381) for examples). 2. We use four spaces of indentation (no tabs). -3. We use `_camelCase` for internal and private fields and use `readonly` where possible. Prefix instance fields with `_`, static fields with `s_` and thread static fields with `t_`. When used on static fields, `readonly` should come after `static` (i.e. `static readonly` not `readonly static`). +3. We use `_camelCase` for internal and private fields and use `readonly` where possible. Prefix instance fields with `_`, static fields with `s_` and thread static fields with `t_`. When used on static fields, `readonly` should come after `static` (e.g. `static readonly` not `readonly static`). 4. We avoid `this.` unless absolutely necessary. -5. We always specify the visibility, even if it's the default (i.e. - `private string _foo` not `string _foo`). Visibility should be the first modifier (i.e. +5. We always specify the visibility, even if it's the default (e.g. + `private string _foo` not `string _foo`). Visibility should be the first modifier (e.g. `public abstract` not `abstract public`). 6. Namespace imports should be specified at the top of the file, *outside* of `namespace` declarations and should be sorted alphabetically. @@ -23,12 +23,13 @@ The general rule we follow is "use Visual Studio defaults". Consider enabling "View White Space (Ctrl+E, S)" if using Visual Studio, to aid detection. 9. If a file happens to differ in style from these guidelines (e.g. private members are named `m_member` rather than `_member`), the existing style in that file takes precedence. -10. We only use `var` when it's obvious what the variable type is (i.e. `var stream = new FileStream(...)` not `var stream = OpenStandardInput()`). -11. We use language keywords instead of BCL types (i.e. `int, string, float` instead of `Int32, String, Single`, etc) for both type references as well as method calls (i.e. `int.Parse` instead of `Int32.Parse`). See issue [391](https://github.com/dotnet/corefx/issues/391) for examples. +10. We only use `var` when it's obvious what the variable type is (e.g. `var stream = new FileStream(...)` not `var stream = OpenStandardInput()`). +11. We use language keywords instead of BCL types (e.g. `int, string, float` instead of `Int32, String, Single`, etc) for both type references as well as method calls (e.g. `int.Parse` instead of `Int32.Parse`). See issue [391](https://github.com/dotnet/corefx/issues/391) for examples. 12. We use PascalCasing to name all our constant local variables and fields. The only exception is for interop code where the constant value should exactly match the name and value of the code you are calling via interop. 13. We use ```nameof(...)``` instead of ```"..."``` whenever possible and relevant. 14. Fields should be specified at the top within type declarations. 15. When including non-ASCII characters in the source code use Unicode escape sequences (\uXXXX) instead of literal characters. Literal non-ASCII characters occasionally get garbled by a tool or editor. +16. When using labels (for goto), indent the label one less than the current indentation. We have provided a Visual Studio 2013 vssettings file (`corefx.vssettings`) at the root of the corefx repository, enabling C# auto-formatting conforming to the above guidelines. Note that rules 7 and 8 are not covered by the vssettings, since these are not rules currently supported by VS formatting. diff --git a/external/corefx/Documentation/debugging/unix-instructions.md b/external/corefx/Documentation/debugging/unix-instructions.md index 3bb0f6f810..ccfa345848 100644 --- a/external/corefx/Documentation/debugging/unix-instructions.md +++ b/external/corefx/Documentation/debugging/unix-instructions.md @@ -65,13 +65,16 @@ lldb-3.9 -O "settings set target.exec-search-paths /home/parallels/Downloads/Sys - Install [Visual Studio Code](https://code.visualstudio.com/) - Install the [C# Extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.csharp) -- Open the folder containing the source you want to debug in VS Code +- Open the folder containing the source you want to debug in VS Code - i.e., if you are debugging a test failure in System.Net.Sockets, open `corefx/src/System.Net.Sockets` - Open the debug window: `ctrl-shift-D` or click on the button on the left - Click the gear button at the top to create a launch configuration, select `.NET Core` from the selection dropdown - In the `.NET Core Launch (console)` configuration do the following - delete the `preLaunchTask` property - - set `program` to the full path to corerun in the test directory - - set `cwd` to the test directory + - set `program` to the full path to `dotnet` in the bin directory. + - something like `corefx/bin/testhost/netcoreapp-Linux-{Configuration}-{Architecture}`, plus the full path to your corefx directory. + - set `cwd` to the test bin directory. + - using the System.Net.Sockets example, it should be something like `corefx/bin/tests/System.Net.Sockets.Tests/netcoreapp-Linux-{Configuration}-{Architecture}`, plus the full path to your corefx directory. - set `args` to the command line arguments to pass to the test - something like: `[ "xunit.console.netcore.exe", ".dll", "-notrait", .... ]` + - to run a specific test, you can append something like: `[ "method", "System.Net.Sockets.Tests.{ClassName}.{TestMethodName}", ...]` - Set a breakpoint and launch the debugger, inspecting variables and call stacks will now work diff --git a/external/corefx/Documentation/debugging/windows-instructions.md b/external/corefx/Documentation/debugging/windows-instructions.md index 45943cc1e5..b6957df65a 100644 --- a/external/corefx/Documentation/debugging/windows-instructions.md +++ b/external/corefx/Documentation/debugging/windows-instructions.md @@ -127,7 +127,7 @@ Logs are going to be placed in %SYSTEMDRIVE%\sockets.etl. ### Using PerfView -1. Install [PerfView](http://www.microsoft.com/en-us/download/details.aspx?id=28567) +1. Install [PerfView](https://github.com/Microsoft/perfview/blob/master/documentation/Downloading.md) 2. Run PerfView as Administrator 3. Press Alt+C to collect events 4. Disable all other collection parameters diff --git a/external/corefx/Documentation/project-docs/benchmarking.md b/external/corefx/Documentation/project-docs/benchmarking.md index 6a691829c8..71ae524696 100644 --- a/external/corefx/Documentation/project-docs/benchmarking.md +++ b/external/corefx/Documentation/project-docs/benchmarking.md @@ -4,7 +4,7 @@ We recommend using [BenchmarkDotNet](https://github.com/dotnet/BenchmarkDotNet) ``` - + ``` @@ -22,52 +22,151 @@ For the sake of this tutorial we won't modify the `PATH` variable and instead al The shared framework is a set of assemblies that are packed into a `netcoreapp` Nuget package which is used when you set your `TargetFramework` to `netcoreappX.X`. You can either decide to use your local self-compiled shared framework package or use the one which is bundled with the .NET Core 2.1 SDK. -## Alternative 1 - Using the shared framework from the .NET Core 2.1 SDK -Follow the instructions described here https://github.com/dotnet/corefx/blob/master/Documentation/project-docs/dogfooding.md#advanced-scenario---using-a-nightly-build-of-microsoftnetcoreapp and skip the last part which calls the `dotnet.exe` to run the application. +# Benchmarking local CoreFX builds -Add a benchmark class, configure it either with a manual configuration or by attributing it and pass the class type to the BenchmarkRunner: +Since `0.10.13` BenchmarkDotNet knows [how to](./dogfooding.md#more-advanced-scenario---using-your-local-corefx-build) build a self-contained app against local CoreFX build. You just need to provide it the version you would like to benchmark and path to the folder with NuGet packages. -```csharp -[MemoryDiagnoser] -// ... -public class Benchmark +**Important:** BenchmarkDotNet will generate the right `.csproj` file for the self-contained app. It's going to reference the `.csproj` file of the project which defines benchmarks. It's going to work even if your project is not self-contained app targeting local CoreFX build. So you can just create a new solution with console app in Visual Studio, install BenchmarkDotNet and it's going to do the right thing for you. + +**Hint:** If you are curious to know what BDN does internally you just need to apply `[KeepBenchmarkFiles]` attribute to your class or set `KeepBenchmarkFiles = true` in your config file. After runing the benchmarks you can find the auto-generated files in `%pathToBenchmarkApp\bin\Release\$TFM\` folder. + +```cs +class Program { - // Benchmark code ... -} - -public class Program -{ - public static void Main() - { - BenchmarkRunner.Run(); - } + static void Main(string[] args) + => BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly) + .Run(args, DefaultConfig.Instance.With( + Job.ShortRun.With( + CustomCoreClrToolchain.CreateForLocalCoreFxBuild( + @"C:\Projects\forks\corefx\bin\packages\Release", + "4.5.0-preview2-26313-0")))); } ``` -## Alternative 2 - Using your self-compiled shared framework -Follow the instructions described here https://github.com/dotnet/corefx/blob/master/Documentation/project-docs/dogfooding.md#more-advanced-scenario---using-your-local-corefx-build and skip the last part which calls the `dotnet.exe` to run the application. -Make sure to build your local corefx repository in RELEASE mode `.\build -release`! You currently need to have a self-contained application to inject your local shared framework package. +**Warning:** BDN is going to restore the NuGet packages and install them in your `.nuget` folder. Please keep in mind that [you either have to remove them](./dogfooding.md#3---consuming-subsequent-code-changes-by-overwriting-the-binary-alternative-1) or [increase the version number](./dogfooding.md#3---consuming-subsequent-code-changes-by-overwriting-the-binary-alternative-2) after making some code changes and rebuilding the repo. **Otherwise, you are going to benchmark the same code over and over again**. -Currently there is no straightforward way to run your BenchmarkDotNet application in a dedicated process, therefore we are using the InProcess switch `[InProcess]`: +As an alternative to rebuilding entire CoreFX to regenerate the NuGet packages, you can provide the list of files that need to be copied to the published self-contained app. The files should be the dlls which you are trying to optimize. You can even define two jobs, one for the state before your local changes and one with the changes: -```csharp -[InProcess] -public class Benchmark +```cs +static void Main(string[] args) + => BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly) + .Run(args, DefaultConfig.Instance + .With(Job.ShortRun + .With(CustomCoreClrToolchain.CreateForLocalCoreFxBuild( + pathToNuGetFolder: @"C:\Projects\forks\corefx\bin\packages\Release", + privateCoreFxNetCoreAppVersion: "4.5.0-preview2-26313-0", + displayName: "before")) + .AsBaseline() + .WithId("before")) + .With(Job.ShortRun + .With(CustomCoreClrToolchain.CreateForLocalCoreFxBuild( + pathToNuGetFolder: @"C:\Projects\forks\corefx\bin\packages\Release", + privateCoreFxNetCoreAppVersion: "4.5.0-preview2-26313-0", + displayName: "after", + filesToCopy: new [] { + @"c:\Projects\forks\corefx\bin\AnyOS.AnyCPU.Release\System.Text.RegularExpressions\netcoreapp\System.Text.RegularExpressions.dll" + })) + .WithId("after")) + .KeepBenchmarkFiles()); +``` + +Once you run the benchmarks with such a config it should be clear if you have improved the performance or not (like in the example below): + +| Method | Job | Toolchain | IsBaseline | Mean | Error | StdDev | Scaled | ScaledSD | +|------- |------- |---------- |----------- |----------:|---------:|----------:|-------:|---------:| +| Sample | after | after | Default | 35.077 us | 3.363 us | 0.1900 us | 8.64 | 0.15 | +| Sample | before | before | True | 4.060 us | 1.465 us | 0.0828 us | 1.00 | 0.00 | + +# Benchmarking nightly CoreFX builds + +Since `0.10.13` BenchmarkDotNet knows [how to](./dogfooding.md#advanced-scenario---using-a-nightly-build-of-microsoftnetcoreap) build a self-contained app against nightly CoreFX build. You just need to provide it the version you would like to benchmark. You don't need to provide url to MyGet feed, the default value is "https://dotnet.myget.org/F/dotnet-core/api/v3/index.json". + +```cs +static void Main(string[] args) + => BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly) + .Run(args, DefaultConfig.Instance + .With(Job.ShortRun + .With(CustomCoreClrToolchain.CreateForNightlyCoreFxBuild("4.5.0-preview2-26215-01")))); +``` + +**Hint:** If you would like to compare the performance of different CoreFX versions, you just need to define multiple jobs, each using it's own toolchain. + +```cs +DefaultConfig.Instance + .With(Job.Default.With(CustomCoreClrToolchain.CreateForNightlyCoreFxBuild("4.5.0-preview2-26214-01", displayName: "before my change"))); + .With(Job.Default.With(CustomCoreClrToolchain.CreateForNightlyCoreFxBuild("4.5.0-preview2-26215-01", displayName: "after my change"))); +``` + +# Benchmarking ANY CoreCLR and CoreFX builds + +BenchmarkDotNet allows you to benchmark **ANY** CoreCLR and CoreFX builds. It just generates the right `.csproj` file with appropriate dependencies and `NuGet.config` file with the right feeds. + +Example: + +``` +public class LocalCoreClrConfig : ManualConfig { - // Benchmark code ... -} + public LocalCoreClrConfig() + { + Add(Job.ShortRun.With( + new CustomCoreClrToolchain( + "local builds", + coreClrNuGetFeed: @"C:\Projects\forks\coreclr\bin\Product\Windows_NT.x64.Release\.nuget\pkg", + coreClrVersion: "2.1.0-preview2-26313-0", + coreFxNuGetFeed: @"C:\Projects\forks\corefx\bin\packages\Release", + coreFxVersion: "4.5.0-preview2-26313-0") + )); -public class Program -{ - public static void Main() - { - BenchmarkRunner.Run(); - } + Add(Job.ShortRun.With( + new CustomCoreClrToolchain( + "local coreclr myget corefx", + coreClrNuGetFeed: @"C:\Projects\forks\coreclr\bin\Product\Windows_NT.x64.Release\.nuget\pkg", + coreClrVersion: "2.1.0-preview2-26313-0", + coreFxNuGetFeed: "https://dotnet.myget.org/F/dotnet-core/api/v3/index.json", + coreFxVersion: "4.5.0-preview2-26215-01") + )); + + Add(Job.ShortRun.With( + new CustomCoreClrToolchain( + "myget coreclr local corefx", + coreClrNuGetFeed: "https://dotnet.myget.org/F/dotnet-core/api/v3/index.json", + coreClrVersion: "2.1.0-preview2-26214-07", + coreFxNuGetFeed: @"C:\Projects\forks\corefx\bin\packages\Release", + coreFxVersion: "4.5.0-preview2-26313-0") + )); + + Add(Job.ShortRun.With( + new CustomCoreClrToolchain( + "myget builds", + coreClrNuGetFeed: "https://dotnet.myget.org/F/dotnet-core/api/v3/index.json", + coreClrVersion: "2.1.0-preview2-26214-07", + coreFxNuGetFeed: "https://dotnet.myget.org/F/dotnet-core/api/v3/index.json", + coreFxVersion: "4.5.0-preview2-26215-01") + )); + + // the rest of the config.. + } } ``` +The output is going to contain exact CoreCLR and CoreFX versions used: + +``` +BenchmarkDotNet=v0.10.12.20180215-develop, OS=Windows 10 Redstone 3 [1709, Fall Creators Update] (10.0.16299.192) +Intel Core i7-3687U CPU 2.10GHz (Ivy Bridge), 1 CPU, 4 logical cores and 2 physical cores +Frequency=2533308 Hz, Resolution=394.7408 ns, Timer=TSC +.NET Core SDK=2.1.300-preview2-008162 + [Host] : .NET Core 2.0.5 (CoreCLR 4.6.26020.03, CoreFX 4.6.26018.01), 64bit RyuJIT + Job-DHYYZE : .NET Core ? (CoreCLR 4.6.26313.0, CoreFX 4.6.26313.0), 64bit RyuJIT + Job-VGTPFY : .NET Core ? (CoreCLR 4.6.26313.0, CoreFX 4.6.26215.01), 64bit RyuJIT + Job-IYZFNW : .NET Core ? (CoreCLR 4.6.26214.07, CoreFX 4.6.26215.01), 64bit RyuJIT + Job-CTQFFQ : .NET Core ? (CoreCLR 4.6.26214.07, CoreFX 4.6.26313.0), 64bit RyuJIT +``` + +**Warning:** To fully understand the results you need to know what optimizations (PGO, CrossGen) were applied to given build. Usually, CoreCLR installed with the .NET Core SDK will be fully optimized and the fastest. On Windows, you can use the [disassembly diagnoser](http://adamsitnik.com/Disassembly-Diagnoser/) to check the produced assembly code. + # Benchmark multiple or custom .NET Core 2.x SDKs -Follow the instructions described here https://github.com/dotnet/corefx/blob/master/Documentation/project-docs/dogfooding.md#advanced-scenario---using-a-nightly-build-of-microsoftnetcoreapp and skip the last part which calls the `dotnet.exe` to run the application. +Follow the instructions described [here](./dogfooding.md#advanced-scenario---using-a-nightly-build-of-microsoftnetcoreapp) and skip the last part which calls the `dotnet.exe` to run the application. Whenever you want to benchmark an application simultaneously with one or multiple different .NET Core run time framework versions, you want to create a manual BenchmarkDotNet configuration file. Add the desired amount of Jobs and `NetCoreAppSettings` to specify the `targetFrameworkMoniker`, `runtimeFrameworkVersion` and `customDotNetCliPath`: diff --git a/external/corefx/Documentation/project-docs/developer-guide.md b/external/corefx/Documentation/project-docs/developer-guide.md index 4d440859ba..64ba711eea 100644 --- a/external/corefx/Documentation/project-docs/developer-guide.md +++ b/external/corefx/Documentation/project-docs/developer-guide.md @@ -252,6 +252,13 @@ There may be multiple projects in some directories so you may need to specify th Tests participate in the incremental build. This means that if tests have already been run, and inputs to the incremental build have not changed, rerunning the tests target will not execute the test runner again. To force re-executing tests in this situation, use `/p:ForceRunTests=true`. +#### Running a single test on the command line + +To quickly run or debug a single test from the command line, set the XunitMethodName property (found in Tools\tests.targets) to the full method name (including namespace), e.g.: +```cmd +msbuild /t:RebuildAndTest /p:XunitMethodName={FullyQualifiedNamespace}.{ClassName}.{MethodName} +``` + #### Running tests in a different target framework Each test project can potentially have multiple build configurations. There are some tests that might be OS-specific, or might be testing an API that is available only on some target frameworks, so the `BuildConfigurations` property specifies the valid configurations. By default we will build and run only the default build configuration which is `netcoreapp`. The rest of the configurations will need to be built and ran by specifying the configuration options. diff --git a/external/corefx/Documentation/project-docs/dogfooding.md b/external/corefx/Documentation/project-docs/dogfooding.md index 9199f86de6..60e1f1f8bf 100644 --- a/external/corefx/Documentation/project-docs/dogfooding.md +++ b/external/corefx/Documentation/project-docs/dogfooding.md @@ -14,26 +14,26 @@ this experience. Make sure to consult this document often. 3. Reminder: if you are using a local copy of the dotnet CLI, take care that when you type `dotnet` you do not inadvertently pick up a different copy that you may have in your path. On Windows, for example, if you use a Developer Command Prompt, a global copy may be in the path, so use the fully qualified path to your local `dotnet`. If you receive an error "The current .NET SDK does not support targeting .NET Core 2.1." then you may be executing an older `dotnet`. -After setting up dotnet you can verify you are using the newer version by executing `dotnet --info` -- the version should be greater than 2.2.0-* (dotnet CLI is currently numbered 2.2.0-* not 2.1.0-* ). Here is an example output at the time of writing: +After setting up dotnet you can verify you are using the newer version by executing `dotnet --info` -- the version should be greater than `2.1.300-*` (dotnet CLI for .NET Core 2.1 is currently numbered `2.1.300-*`). Here is an example output at the time of writing: ``` >dotnet.exe --info -.NET Command Line Tools (2.2.0-preview1-007460) +.NET Command Line Tools (2.1.300-preview2-008171) Product Information: - Version: 2.2.0-preview1-007460 - Commit SHA-1 hash: 173cc035e4 + Version: 2.1.300-preview2-008171 + Commit SHA-1 hash: fbc76ea5f6 Runtime Environment: OS Name: Windows OS Version: 10.0.16299 OS Platform: Windows RID: win10-x64 - Base Path: F:\dotnet\sdk\2.2.0-preview1-007460\ + Base Path: F:\dotnet\sdk\2.1.300-preview2-008171\ Microsoft .NET Core Shared Framework Host - Version : 2.1.0-preview1-25825-07 - Build : 4c165c13bd390adf66f9af30a088d634d3f37a9d + Version : 2.1.0-preview2-26209-04 + Build : 5df6e9b7ab674a461b2a7f01ac87fb6e0ca06666 ``` 4. Our nightly builds are uploaded to MyGet, not NuGet - so ensure the .NET Core MyGet feed is in your nuget configuration in case you need other packages from .NET Core that aren't included in the download. For example, on Windows you could edit `%userprofile%\appdata\roaming\nuget\nuget.config` or on Linux edit `~/.nuget/NuGet/NuGet.Config` to add this line: diff --git a/external/corefx/Documentation/project-docs/issue-guide.md b/external/corefx/Documentation/project-docs/issue-guide.md index bf9b2d2b92..008222056b 100644 --- a/external/corefx/Documentation/project-docs/issue-guide.md +++ b/external/corefx/Documentation/project-docs/issue-guide.md @@ -42,7 +42,7 @@ Areas are tracked by labels area-* (e.g. area-System.Collections). Each area | Area | Owners / experts | Description | |-----------------------------------------------------------------------------------------------|------------------|-------------| -| [area-Infrastructure](https://github.com/dotnet/corefx/labels/area-Infrastructure) | [@weshaggard](https://github.com/weshaggard), [@ericstj](https://github.com/ericstj) |Covers:
  • Packaging
  • Build and test infra for CoreFX repo
  • VS integration

| +| [area-Infrastructure](https://github.com/dotnet/corefx/labels/area-Infrastructure) | [@weshaggard](https://github.com/weshaggard), [@ericstj](https://github.com/ericstj) | Covers:
  • Packaging
  • Build and test infra for CoreFX repo
  • VS integration

| | [area-Meta](https://github.com/dotnet/corefx/labels/area-Meta) | [@tarekgh](https://github.com/tarekgh) | Issues without clear association to any specific API/contract, e.g.
  • new contract proposals
  • cross-cutting code/test pattern changes (e.g. FxCop failures)
  • project-wide docs

| | [area-Serialization](https://github.com/dotnet/corefx/labels/area-Serialization) | [@huanwu](https://github.com/huanwu), [@zhenlan](https://github.com/zhenlan) | Packages:
  • System.Runtime.Serialization.Xml
  • System.Runtime.Serialization.Json
  • System.Private.DataContractSerialization
  • System.Xml.XmlSerializer
Excluded:
  • System.Runtime.Serialization.Formatters
| | **System contract assemblies** | | | @@ -55,27 +55,28 @@ Areas are tracked by labels area-* (e.g. area-System.Collections). Each area | [System.Composition](https://github.com/dotnet/corefx/labels/area-System.Composition) | **[@maryamariyan](https://github.com/maryamariyan)**, [@ViktorHofer](https://github.com/ViktorHofer) | | | [System.Configuration](https://github.com/dotnet/corefx/labels/area-System.Configuration) | [@maryamariyan](https://github.com/maryamariyan) | | | [System.Console](https://github.com/dotnet/corefx/labels/area-System.Console) | **[@joperezr](https://github.com/joperezr)**, [@ianhays](https://github.com/ianhays) | | -| [System.Data](https://github.com/dotnet/corefx/labels/area-System.Data) | [@saurabh500](https://github.com/saurabh500), [@corivera](https://github.com/corivera) | | -| [System.Data.SqlClient](https://github.com/dotnet/corefx/labels/area-System.Data.SqlClient) | [@saurabh500](https://github.com/saurabh500), [@corivera](https://github.com/corivera) | | +| [System.Data](https://github.com/dotnet/corefx/labels/area-System.Data) | **[@divega](https://github.com/divega)**, [@ajcvickers](https://github.com/ajcvickers), [@keeratsingh](https://github.com/keeratsingh), [@afsanehr](https://github.com/afsanehr), [@david-engel](https://github.com/david-engel) | | +| [System.Data.SqlClient](https://github.com/dotnet/corefx/labels/area-System.Data.SqlClient) | **[@keeratsingh](https://github.com/keeratsingh)**, [@afsanehr](https://github.com/afsanehr), [@david-engel](https://github.com/david-engel) | | | [System.Diagnostics](https://github.com/dotnet/corefx/labels/area-System.Diagnostics) | **[@joperezr](https://github.com/joperezr)**, [@wtgodbe](https://github.com/wtgodbe) |
  • System.Diagnostics.EventLog [@Anipik](https://github.com/Anipik)
| | [System.Diagnostics.Process](https://github.com/dotnet/corefx/labels/area-System.Diagnostics.Process) | **[@joperezr](https://github.com/joperezr)**, [@wtgodbe](https://github.com/wtgodbe) | | -| [System.Diagnostics.Tracing](https://github.com/dotnet/corefx/labels/area-System.Diagnostics.Tracing) | [@brianrob](https://github.com/brianrob), [@vancem](https://github.com/vancem), [@valenis](https://github.com/valenis)| Packages:
  • System.Diagnostics.DiagnosticSource
  • System.Diagnostics.PerformanceCounter - [@adiaaida](https://github.com/adiaaida)
  • System.Diagnostics.Tracing
  • System.Diagnostics.TraceSource

| -| [System.DirectoryServices](https://github.com/dotnet/corefx/labels/area-System.DirectoryServices) | [@tquerec](https://github.com/tquerec) | | +| [System.Diagnostics.Tracing](https://github.com/dotnet/corefx/labels/area-System.Diagnostics.Tracing) | [@brianrob](https://github.com/brianrob), [@vancem](https://github.com/vancem), [@valenis](https://github.com/valenis) | Packages:
  • System.Diagnostics.DiagnosticSource
  • System.Diagnostics.PerformanceCounter - [@adiaaida](https://github.com/adiaaida)
  • System.Diagnostics.Tracing
  • System.Diagnostics.TraceSource

| +| [System.DirectoryServices](https://github.com/dotnet/corefx/labels/area-System.DirectoryServices) | [@tquerec](https://github.com/tquerec), [@josephisenhour](https://github.com/josephisenhour), [@bongiovimatthew-microsoft](https://github.com/bongiovimatthew-microsoft) | | | [System.Drawing](https://github.com/dotnet/corefx/labels/area-System.Drawing) | [@safern](https://github.com/safern) | | | [System.Dynamic.Runtime](https://github.com/dotnet/corefx/labels/area-System.Dynamic.Runtime) | [@VSadov](https://github.com/VSadov), [@OmarTawfik](https://github.com/OmarTawfik) | | | [System.Globalization](https://github.com/dotnet/corefx/labels/area-System.Globalization) | **[@krwq](https://github.com/krwq)**, [@tarekgh](https://github.com/tarekgh) | | | [System.IO](https://github.com/dotnet/corefx/labels/area-System.IO) | **[@JeremyKuhne](https://github.com/JeremyKuhne)**, [@pjanotti](https://github.com/pjanotti) | | | [System.IO.Compression](https://github.com/dotnet/corefx/labels/area-System.IO.Compression) | **[@ViktorHofer](https://github.com/ViktorHofer)**, [@ianhays](https://github.com/ianhays) | | +| [System.IO.Pipelines](https://github.com/dotnet/corefx/labels/area-System.IO.Pipelines) | **[@pakrym](https://github.com/pakrym)**, [@davidfowl](https://github.com/davidfowl) | | | [System.Linq](https://github.com/dotnet/corefx/labels/area-System.Linq) | [@VSadov](https://github.com/VSadov), [@OmarTawfik](https://github.com/OmarTawfik) | | | [System.Linq.Expressions](https://github.com/dotnet/corefx/labels/area-System.Linq.Expressions) | [@VSadov](https://github.com/VSadov), [@OmarTawfik](https://github.com/OmarTawfik) | | | [System.Linq.Parallel](https://github.com/dotnet/corefx/labels/area-System.Linq.Parallel) | **[@tarekgh](https://github.com/tarekgh)**, [@kouvel](https://github.com/kouvel) | | | [System.Management](https://github.com/dotnet/corefx/labels/area-System.Management) | **[@Anipik](https://github.com/Anipik)**, [@pjanotti](https://github.com/pjanotti) | WMI | -| [System.Memory](https://github.com/dotnet/corefx/labels/area-System.Memory) | [@KrzysztofCwalina](https://github.com/KrzysztofCwalina), [@ahsonkhan](https://github.com/ahsonkhan) | | -| [System.Net](https://github.com/dotnet/corefx/labels/area-System.Net) | [@davidsh](https://github.com/davidsh), [@Priya91](https://github.com/Priya91), [@wfurt](https://github.com/wfurt) | Included:
  • System.Uri
| -| [System.Net.Http](https://github.com/dotnet/corefx/labels/area-System.Net.Http) | [@davidsh](https://github.com/davidsh), [@Priya91](https://github.com/Priya91), [@wfurt](https://github.com/wfurt) | | -| [System.Net.Http.ManagedHandler](https://github.com/dotnet/corefx/labels/area-System.Net.Http.ManagedHandler) | [@geoffkizer](https://github.com/geoffkizer), [@Priya91](https://github.com/Priya91), [@wfurt](https://github.com/wfurt), [@davidsh](https://github.com/davidsh) | | -| [System.Net.Security](https://github.com/dotnet/corefx/labels/area-System.Net.Security) | [@davidsh](https://github.com/davidsh), [@Priya91](https://github.com/Priya91), [@wfurt](https://github.com/wfurt) | | -| [System.Net.Sockets](https://github.com/dotnet/corefx/labels/area-System.Net.Sockets) | [@davidsh](https://github.com/davidsh), [@Priya91](https://github.com/Priya91), [@wfurt](https://github.com/wfurt) | | +| [System.Memory](https://github.com/dotnet/corefx/labels/area-System.Memory) | **[@ahsonkhan](https://github.com/ahsonkhan)**, [@KrzysztofCwalina](https://github.com/KrzysztofCwalina) | | +| [System.Net](https://github.com/dotnet/corefx/labels/area-System.Net) | [@davidsh](https://github.com/davidsh), [@wfurt](https://github.com/wfurt), [@caesar1995](https://github.com/caesar1995), [@rmkerr](https://github.com/rmkerr), [@karelz](https://github.com/karelz) | Included:
  • System.Uri
| +| [System.Net.Http](https://github.com/dotnet/corefx/labels/area-System.Net.Http) | [@davidsh](https://github.com/davidsh), [@wfurt](https://github.com/wfurt), [@caesar1995](https://github.com/caesar1995), [@rmkerr](https://github.com/rmkerr), [@karelz](https://github.com/karelz) | | +| [System.Net.Http.SocketsHttpHandler](https://github.com/dotnet/corefx/labels/area-System.Net.Http.SocketsHttpHandler) | [@geoffkizer](https://github.com/geoffkizer), [@wfurt](https://github.com/wfurt), [@davidsh](https://github.com/davidsh), [@karelz](https://github.com/karelz) | | +| [System.Net.Security](https://github.com/dotnet/corefx/labels/area-System.Net.Security) | [@davidsh](https://github.com/davidsh), [@wfurt](https://github.com/wfurt), [@caesar1995](https://github.com/caesar1995), [@rmkerr](https://github.com/rmkerr), [@karelz](https://github.com/karelz) | | +| [System.Net.Sockets](https://github.com/dotnet/corefx/labels/area-System.Net.Sockets) | [@davidsh](https://github.com/davidsh), [@wfurt](https://github.com/wfurt), [@caesar1995](https://github.com/caesar1995), [@rmkerr](https://github.com/rmkerr), [@karelz](https://github.com/karelz) | | | [System.Numerics](https://github.com/dotnet/corefx/labels/area-System.Numerics) | [@eerhardt](https://github.com/eerhardt), [@ViktorHofer](https://github.com/ViktorHofer) | | | [System.Reflection](https://github.com/dotnet/corefx/labels/area-System.Reflection) | [@AtsushiKan](https://github.com/AtsushiKan) | | | [System.Reflection.Emit](https://github.com/dotnet/corefx/labels/area-System.Reflection.Emit) | [@AtsushiKan](https://github.com/AtsushiKan) | | @@ -87,23 +88,32 @@ Areas are tracked by labels area-* (e.g. area-System.Collections). Each area | [System.Runtime.Extensions](https://github.com/dotnet/corefx/labels/area-System.Runtime.Extensions) | **[@joperezr](https://github.com/joperezr)**, [@AlexGhiondea](https://github.com/AlexGhiondea) | | | [System.Runtime.InteropServices](https://github.com/dotnet/corefx/labels/area-System.Runtime.InteropServices) | [@luqunl](https://github.com/luqunl), [@shrah](https://github.com/shrah) | Excluded:
  • System.Runtime.InteropServices.RuntimeInfo
| | [System.Runtime.Intrinsics](https://github.com/dotnet/corefx/labels/area-System.Runtime.Intrinsics) | [@eerhardt](https://github.com/eerhardt), [@CarolEidt](https://github.com/CarolEidt), [@RussKeldorph](https://github.com/RussKeldorph) | | -| [System.Security](https://github.com/dotnet/corefx/labels/area-System.Security) | [@bartonjs](https://github.com/bartonjs), [@ianhays](https://github.com/ianhays) | | +| [System.Security](https://github.com/dotnet/corefx/labels/area-System.Security) | **[@bartonjs](https://github.com/bartonjs)**, [@GrabYourPitchforks](https://github.com/GrabYourPitchforks) | | | System.ServiceModel | N/A | [dotnet/wcf](https://github.com/dotnet/wcf) (except System.ServiceModel.Syndication) | | [System.ServiceModel.Syndication](https://github.com/dotnet/corefx/labels/area-System.ServiceModel.Syndication) | [@huanwu](https://github.com/huanwu), [@zhenlan](https://github.com/zhenlan) | | | [System.ServiceProcess](https://github.com/dotnet/corefx/labels/area-System.ServiceProcess) | **[@maryamariyan](https://github.com/maryamariyan)**, [@Anipik](https://github.com/Anipik) | | -| [System.Text.Encoding](https://github.com/dotnet/corefx/labels/area-System.Text.Encoding) | **[@krwq](https://github.com/krwq)**, [@tarekgh](https://github.com/tarekgh) | Included:
  • System.Text.Encoding**s**.Web
| -| [System.Text.RegularExpressions](https://github.com/dotnet/corefx/labels/area-System.Text.RegularExpressions) | **[@ViktorHofer](https://github.com/ViktorHofer)**, [@Priya91](https://github.com/Priya91) | | +| [System.Text.Encoding](https://github.com/dotnet/corefx/labels/area-System.Text.Encoding) | **[@krwq](https://github.com/krwq)**, [@tarekgh](https://github.com/tarekgh) | | +| [System.Text.Encodings.Web](https://github.com/dotnet/corefx/labels/area-System.Text.Encodings.Web) | **[@GrabYourPitchforks](https://github.com/GrabYourPitchforks)**, [@krwq](https://github.com/krwq), [@tarekgh](https://github.com/tarekgh) | | +| [System.Text.RegularExpressions](https://github.com/dotnet/corefx/labels/area-System.Text.RegularExpressions) | [@ViktorHofer](https://github.com/ViktorHofer) | | | [System.Threading](https://github.com/dotnet/corefx/labels/area-System.Threading) | **[@kouvel](https://github.com/kouvel)**| | +| [System.Threading.Channels](https://github.com/dotnet/corefx/labels/area-System.Threading.Channels) | **[@tarekgh](https://github.com/tarekgh)**| | +| [System.Threading.Tasks](https://github.com/dotnet/corefx/labels/area-System.Threading.Tasks) | **[@tarekgh](https://github.com/tarekgh)**| | | [System.Transactions](https://github.com/dotnet/corefx/labels/area-System.Transactions) | [@jimcarley](https://github.com/jimcarley), [@qizhanMS](https://github.com/qizhanMS), [@dmetzgar](https://github.com/dmetzgar) | | | [System.Xml](https://github.com/dotnet/corefx/labels/area-System.Xml) | **[@krwq](https://github.com/krwq)**, [@pjanotti](https://github.com/pjanotti) | | | **Microsoft contract assemblies** | | | | [Microsoft.CSharp](https://github.com/dotnet/corefx/labels/area-Microsoft.CSharp) | [@VSadov](https://github.com/VSadov), [@OmarTawfik](https://github.com/OmarTawfik) | | | [Microsoft.VisualBasic](https://github.com/dotnet/corefx/labels/area-Microsoft.VisualBasic) | [@VSadov](https://github.com/VSadov), [@OmarTawfik](https://github.com/OmarTawfik) | | -| [Microsoft.Win32](https://github.com/dotnet/corefx/labels/area-Microsoft.Win32) | **[@maryamariyan](https://github.com/maryamariyan)**, , [@Anipik](https://github.com/Anipik) | | +| [Microsoft.Win32](https://github.com/dotnet/corefx/labels/area-Microsoft.Win32) | **[@maryamariyan](https://github.com/maryamariyan)**, [@Anipik](https://github.com/Anipik) | | Note: Area triage will apply the new scheme (issue types and assignee) throughout 2016. +### Community Partner Experts + +| Area | Owners / experts | Description | +|-------------|------------------|-------------| +| Tizen | [@alpencolt](https://github.com/alpencolt), [@gbalykov](https://github.com/gbalykov) | For issues around Tizen CI and build issues | + ### Triage rules - simplified 1. Each issue has exactly one **area-*** label diff --git a/external/corefx/Documentation/project-docs/performance-tests.md b/external/corefx/Documentation/project-docs/performance-tests.md index 9780f9d22a..2dfcf0f697 100644 --- a/external/corefx/Documentation/project-docs/performance-tests.md +++ b/external/corefx/Documentation/project-docs/performance-tests.md @@ -1,49 +1,31 @@ -Performance Tests +Performance Tests ====================== This document contains instructions for building, running, and adding Performance tests. -Requirements --------------------- -### Windows -To run performance tests on Windows, .NET portable v5.0 is required. This library is included in [the Visual Studio Community 2015 download](https://www.visualstudio.com/products/visual-studio-community-vs). To get the correct packages during installation, follow these steps after opening the installer: -1. Select "Custom Installation" if no installation is present, or "Modify" otherwise -2. Check the "Universal Windows App Development Tools" box under the "Windows and Web Development" menu -3. Install -### Linux -Performance tests on Linux require all of the same steps as they do for regular xunit tests - see the linux instructions [here](https://github.com/dotnet/corefx/blob/master/Documentation/building/unix-instructions.md). Once you can have a directory on your Linux machine with a working corerun and xunit.console.netcore.exe (as well as the test dll containing your perf tests!), you only need to run the following command: - -`dnu commands install Microsoft.DotNet.xunit.performance.runner.dnx 1.0.0-alpha-build0021 -f https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json` - -Be careful that your mscorlib, libcoreclr, and test dlls were compiled using the "/p:Configuration=Release" property. Otherwise you may get skewed results. - -Running the tests +Building and Running Tests ----------- -### Windows -Performance test files (if present) are stored within a library's ```tests/Performance``` directory and contain test methods that are all marked with a perf-specific *Benchmark* attribute. The performance tests will only be run if the ```performance``` property is set to ```true```. +Performance test files (if present) are stored within a library's ```tests/Performance``` directory and contain test methods that are all marked with a perf-specific *Benchmark* attribute. -Before running the performance tests you must run ```build -release``` from the root folder. +**Step # 1:** Prior to running performance tests, a full build from the repo root must be completed: ```build -release``` -To build and run the tests using msbuild for a project, run ```msbuild /t:BuildAndTest /p:Performance=true /p:ConfigurationGroup=Release /p:TargetOS=Windows_NT``` from the Performance directory with Admin privileges. If the v5.0 assemblies aren't installed on your system, an error will be raised and no tests will be run. +**Step # 2:** Change directory to the performance tests directory: ```cd path/to/library/tests/Performance``` -Note: Because build.cmd runs tests concurrently, it's not recommended that you execute the perf tests using it. +**Step # 3:** Build and run the tests: + - Windows (using admin command shell): ```msbuild /t:BuildAndTest /p:Performance=true /p:ConfigurationGroup=Release /p:TargetOS=Windows_NT``` + - Linux: ```/Tools/msbuild.sh /t:BuildAndTest /p:Performance=true /p:ConfigurationGroup=Release /p:TargetOS=Linux``` -results will be in: corefx/bin/tests/Windows_NT.AnyCPU.Release/TESTNAME/netcoreapp1.0 -### Linux -From your tests directory, run: -``` -xunit.performance System.Collections.Tests.dll -trait Benchmark=true -verbose -runner ./xunit.console.netcore.exe -runnerhost ./corerun -runid System.Collections.Tests.dll-Linux -outdir results -``` +**Note: Because build-tests.cmd/sh runs tests concurrently, do not use it for executing performance tests.** -This will run the perf tests for System.Collections.Tests.dll and output the results in results/System.Collections.Tests.dll-Linux.xml and results/System.Collections.Tests.dll-Linux.csv +The results files will be dropped in corefx/bin/tests/FLAVOR/TESTLIBRARY/TARGETFRAMEWORK. The console output will also specify the location of these files. -Adding new Performance tests +Adding New Performance Tests ----------- -Performance tests for CoreFX are built on top of xunit and [the Microsoft xunit-performance runner](https://github.com/Microsoft/xunit-performance/). +Performance tests for CoreFX are built on top of xunit and [the Microsoft xunit-performance framework](https://github.com/Microsoft/xunit-performance/). -For the time being, perf tests should reside within their own "Performance" folder within the tests directory of a library (e.g. [corefx/src/System.IO.FileSystem/tests/Performance](https://github.com/dotnet/corefx/tree/master/src/System.IO.FileSystem/tests/Performance) contains perf tests for FileSystem). +Performance tests should reside within their own "Performance" folder within the tests directory of a library (e.g. [corefx/src/System.IO.FileSystem/tests/Performance](https://github.com/dotnet/corefx/tree/master/src/System.IO.FileSystem/tests/Performance) contains perf tests for FileSystem). -Start by adding the following lines to the tests csproj: +It's easiest to copy and modify an existing example like the one above. Notice that you'll need these lines in the tests csproj: ``` @@ -54,19 +36,12 @@ Start by adding the following lines to the tests csproj: - + true - + ``` (Replace Dictionary/List with whatever class you’re testing.) -Next, the project.json for the tests directory also needs to import the xunit libraries: - -``` - "Microsoft.DotNet.xunit.performance": "1.0.0-*", - "xunit": "2.1.0", - "xunit.netcore.extensions": "1.0.0-prerelease-*" -``` Once that’s all done, you can actually add tests to the file. Writing Test Cases diff --git a/external/corefx/Documentation/project-docs/writing-tests.md b/external/corefx/Documentation/project-docs/writing-tests.md index 31f07e34f1..dcb036ad60 100644 --- a/external/corefx/Documentation/project-docs/writing-tests.md +++ b/external/corefx/Documentation/project-docs/writing-tests.md @@ -8,7 +8,7 @@ In a variety of situations, it's useful to run some code in another process. So - Being able to verify that things don't depend on state that's been configured previously, e.g. that some code you're calling doesn't require that some previous related code ran (e.g. that you can deserialize some state without it having previously been serialized in the same process) - Being able to test cross-process support for various things, e.g. cross-process synchronization, cross-process memory-mapped files, that file locking works correctly cross-process, cross-process communication via stdin/stdout/stderr, etc. -To achieve, this we use `RemoteInvoke` which is defined in `RemoteExecutorTestBase.cs`. It passes information about a static method to be executed and the arguments to be passed to it out to a spawned process that invokes the method. Lambdas / anonymous methods may be used, but they must not close over any state (including `this`); accidentally closing over state will likely result in strange errors. For additional information see https://github.com/dotnet/corefx/blob/master/src/Common/tests/System/Diagnostics/RemoteExecutorTestBase.cs and https://xunit.github.io/docs/running-tests-in-parallel.html +To achieve, this we use `RemoteInvoke` which is defined in `RemoteExecutorTestBase.cs`. It passes information about a static method to be executed and the arguments to be passed to it out to a spawned process that invokes the method. Lambdas / anonymous methods may be used, but they must not close over any state (including `this`); accidentally closing over state will likely result in strange errors. For additional information see https://github.com/dotnet/corefx/blob/master/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.cs and https://xunit.github.io/docs/running-tests-in-parallel.html Example (skipping additional usings): ```cs diff --git a/external/corefx/DotnetCLIVersion.txt b/external/corefx/DotnetCLIVersion.txt index 227cea2156..319992f48c 100644 --- a/external/corefx/DotnetCLIVersion.txt +++ b/external/corefx/DotnetCLIVersion.txt @@ -1 +1 @@ -2.0.0 +2.1.300-rc1-008673 \ No newline at end of file diff --git a/external/corefx/Packaging.props b/external/corefx/Packaging.props index bffa5713dd..b54ccad190 100644 --- a/external/corefx/Packaging.props +++ b/external/corefx/Packaging.props @@ -1,14 +1,19 @@ - preview1 + false + $(PackageVersionStamp) + rtm + true + false + true + $(ProjectDir)pkg/descriptions.json $(ProjectDir)LICENSE.TXT $(ProjectDir)THIRD-PARTY-NOTICES.TXT $(ProjectDir)pkg/Microsoft.NETCore.Platforms/runtime.json https://go.microsoft.com/fwlink/?LinkID=799421 https://dot.net - - $(ToolsDir)net46/ + $(BuildToolsTaskDir) https://github.com/dotnet/corefx/blob/master/LICENSE.TXT $(Platform) @@ -16,7 +21,7 @@ $(MSBuildThisFileDirectory)src/Native/pkg Microsoft.Private.Intellisense - 2.0.0-preview3-25426-1 + 2.0.0-preview3-26209-0 $(PackagesDir)$(XmlDocPackage.ToLowerInvariant())/$(XmlDocPackageVersion)/xmldocs/netcoreapp $(BinDir)docs diff --git a/external/corefx/buildpipeline/DotNet-CoreFx-Trusted-Linux-Crossbuild.json b/external/corefx/buildpipeline/DotNet-CoreFx-Trusted-Linux-Crossbuild.json index 8822a96405..032c3fd655 100644 --- a/external/corefx/buildpipeline/DotNet-CoreFx-Trusted-Linux-Crossbuild.json +++ b/external/corefx/buildpipeline/DotNet-CoreFx-Trusted-Linux-Crossbuild.json @@ -1,5 +1,26 @@ { "build": [ + { + "environment": {}, + "enabled": true, + "continueOnError": true, + "displayName": "run begin.sh", + "timeoutInMinutes": 0, + "alwaysRun": true, + "task": { + "id": "10f1f9a1-74b0-47ab-87bf-e3c9c68e8b0d", + "versionSpec": "0.*", + "definitionType": "task" + }, + "inputs": { + "type": "InlineScript", + "scriptPath": "", + "args": "", + "cwd": "", + "failOnStandardError": "false", + "script": "if [ -f \"$AGENTTOOLSPATH/begin.sh\" ]; then echo \"$AGENTTOOLSPATH/begin.sh script found. Executing...\"; $AGENTTOOLSPATH/begin.sh ; else echo \"$AGENTTOOLSPATH/begin.sh script does not exist. Moving on.\" ; fi" + } + }, { "environment": {}, "enabled": true, @@ -7,7 +28,7 @@ "alwaysRun": false, "displayName": "Change permissions to agent folder for cleanup steps", "timeoutInMinutes": 0, - "refName": "Task1", + "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -16,18 +37,18 @@ "inputs": { "filename": "sudo", "arguments": "chmod 777 -R .", - "workingFolder": "$(Agent.WorkFolder)", + "workingFolder": "", "failOnStandardError": "false" } }, { "environment": {}, "enabled": true, - "continueOnError": false, + "continueOnError": true, "alwaysRun": false, "displayName": "Delete files from $(PB_GitDirectory)", "timeoutInMinutes": 0, - "refName": "Task2", + "condition": "succeeded()", "task": { "id": "b7e8b412-0437-4065-9371-edc5881de25b", "versionSpec": "1.*", @@ -43,9 +64,8 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "git clone", + "displayName": "Local git clone", "timeoutInMinutes": 0, - "refName": "Task3", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -63,9 +83,8 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "git checkout", + "displayName": "Local git checkout", "timeoutInMinutes": 0, - "refName": "Task4", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -83,9 +102,9 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Initialize tools", + "displayName": "Local initialize tools", "timeoutInMinutes": 0, - "refName": "Task5", + "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -94,7 +113,7 @@ "inputs": { "filename": "$(PB_GitDirectory)/init-tools.sh", "arguments": "", - "workingFolder": "$(PB_GitDirectory)", + "workingFolder": "", "failOnStandardError": "false" } }, @@ -103,9 +122,9 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Initialize Docker", + "displayName": "Local initialize Docker", "timeoutInMinutes": 0, - "refName": "Task6", + "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -123,9 +142,9 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Generate Version Assets", + "displayName": "Docker git clone", "timeoutInMinutes": 0, - "refName": "Task7", + "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -133,7 +152,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/build-managed.sh -OfficialBuildId=$(OfficialBuildId) -- /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true", + "arguments": "run --rm $(PB_DockerCommonRunArgs) git clone $(PB_VsoCorefxGitUrl) $(PB_DockerVolumeName)", "workingFolder": "", "failOnStandardError": "false" } @@ -143,9 +162,9 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Run sync.sh", + "displayName": "Docker git checkout", "timeoutInMinutes": 0, - "refName": "Task8", + "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -153,7 +172,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/sync.sh $(PB_SyncArguments)", + "arguments": "run --rm $(PB_DockerCommonRunArgs) git checkout $(SourceVersion)", "workingFolder": "", "failOnStandardError": "false" } @@ -163,9 +182,8 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Run build.sh", + "displayName": "Docker generate version assets", "timeoutInMinutes": 0, - "refName": "Task9", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -173,7 +191,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run -e ROOTFS_DIR $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/build.sh -OfficialBuildId=$(OfficialBuildId) $(PB_BuildArguments)", + "arguments": "run --rm $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/build-managed.sh -OfficialBuildId=$(OfficialBuildId) -- /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true", "workingFolder": "", "failOnStandardError": "false" } @@ -183,9 +201,8 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Run publish-packages.sh", + "displayName": "Docker run sync.sh", "timeoutInMinutes": 0, - "refName": "Task10", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -193,7 +210,83 @@ }, "inputs": { "filename": "docker", - "arguments": "run $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/publish-packages.sh -AzureAccount=$(PB_CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_Label) -verbose -- /p:OverwriteOnPublish=false", + "arguments": "run --rm $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/sync.sh $(PB_SyncArguments)", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "environment": {}, + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Docker run build-native.sh", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "docker", + "arguments": "run --rm -e ROOTFS_DIR=$(ROOTFS_DIR) $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/build-native.sh -OfficialBuildId=$(OfficialBuildId) $(PB_BuildNativeArguments)", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "environment": {}, + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Docker run build-managed.sh", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "docker", + "arguments": "run --rm -e ROOTFS_DIR=$(ROOTFS_DIR) $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/build-managed.sh -OfficialBuildId=$(OfficialBuildId) $(PB_BuildManagedArguments)", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "environment": {}, + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Docker run build-packages.sh", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "docker", + "arguments": "run --rm -e ROOTFS_DIR=$(ROOTFS_DIR) $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/build-packages.sh -OfficialBuildId=$(OfficialBuildId) $(PB_BuildPackagesArguments)", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "environment": {}, + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Docker run publish-packages.sh", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "docker", + "arguments": "run --rm $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/publish-packages.sh -AzureAccount=$(PB_CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_Label) -verbose -- /p:OverwriteOnPublish=false", "workingFolder": "", "failOnStandardError": "false" } @@ -203,22 +296,19 @@ "enabled": true, "continueOnError": true, "alwaysRun": true, - "displayName": "Copy Files to: $(Build.StagingDirectory)\\BuildLogs", + "displayName": "Local copy logs out of container", "timeoutInMinutes": 0, "condition": "succeededOrFailed()", - "refName": "CopyFiles1", "task": { - "id": "5bfb729a-a7c8-4a78-a7c3-8d717bb7c13c", - "versionSpec": "2.*", + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", "definitionType": "task" }, "inputs": { - "SourceFolder": "$(PB_GitDirectory)", - "Contents": "*.log", - "TargetFolder": "$(Build.StagingDirectory)\\BuildLogs", - "CleanTargetFolder": "false", - "OverWrite": "false", - "flattenFolders": "false" + "filename": "docker", + "arguments": "run --rm -v $(Build.StagingDirectory):/docker_logs $(PB_DockerCommonRunArgs) find . -type f -name *.log -exec cp {} --target-directory=/docker_logs ;", + "workingFolder": "", + "failOnStandardError": "false" } }, { @@ -226,17 +316,16 @@ "enabled": true, "continueOnError": true, "alwaysRun": true, - "displayName": "Publish Artifact: BuildLogs", + "displayName": "Local publish artifact: BuildLogs", "timeoutInMinutes": 0, "condition": "succeededOrFailed()", - "refName": "PublishBuildArtifacts2", "task": { "id": "2ff763a7-ce83-4e1f-bc89-0ae63477cebe", "versionSpec": "1.*", "definitionType": "task" }, "inputs": { - "PathtoPublish": "$(Build.StagingDirectory)\\BuildLogs", + "PathtoPublish": "$(Build.StagingDirectory)", "ArtifactName": "BuildLogs", "ArtifactType": "Container", "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)", @@ -249,10 +338,9 @@ "enabled": true, "continueOnError": true, "alwaysRun": false, - "displayName": "Cleanup Docker", + "displayName": "Local cleanup Docker", "timeoutInMinutes": 0, "condition": "always()", - "refName": "Task12", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -269,21 +357,21 @@ "environment": {}, "enabled": true, "continueOnError": true, - "alwaysRun": false, - "displayName": "Cleanup VSTS Agent", + "displayName": "run end.sh", "timeoutInMinutes": 0, - "condition": "always()", - "refName": "Task13", + "alwaysRun": true, "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", + "id": "10f1f9a1-74b0-47ab-87bf-e3c9c68e8b0d", + "versionSpec": "0.*", "definitionType": "task" }, "inputs": { - "filename": "$(PB_GitDirectory)/Tools/msbuild.sh", - "arguments": "cleanupagent.proj /p:AgentDirectory=$(Agent.HomeDirectory) /p:DoClean=$(PB_CleanAgent)", - "workingFolder": "$(Build.SourcesDirectory)/corefx/Tools/scripts/vstsagent/", - "failOnStandardError": "false" + "type": "InlineScript", + "scriptPath": "", + "args": "", + "cwd": "", + "failOnStandardError": "false", + "script": "if [ -f \"$AGENTTOOLSPATH/end.sh\" ]; then echo \"$AGENTTOOLSPATH/end.sh script found. Executing...\"; $AGENTTOOLSPATH/end.sh ; else echo \"$AGENTTOOLSPATH/end.sh script does not exist. Moving on.\" ; fi" } } ], @@ -308,15 +396,6 @@ "assignToRequestor": "true", "additionalFields": "{}" } - }, - { - "enabled": false, - "definition": { - "id": "57578776-4c22-4526-aeb0-86b6da17ee9c" - }, - "inputs": { - "additionalFields": "{}" - } } ], "variables": { @@ -333,9 +412,22 @@ "PB_Architecture": { "value": "arm" }, + "PB_AssetRootUrl": { + "value": "", + "isSecret": true + }, "PB_BuildArguments": { "value": "-BuildArch=$(PB_Architecture)" }, + "PB_BuildManagedArguments": { + "value": "$(PB_BuildArguments)" + }, + "PB_BuildNativeArguments": { + "value": "$(PB_BuildArguments)" + }, + "PB_BuildPackagesArguments": { + "value": "$(PB_BuildArguments)" + }, "PB_CleanAgent": { "value": "true" }, @@ -346,13 +438,13 @@ "value": "Release" }, "PB_DockerCommonRunArgs": { - "value": "--rm --name $(PB_DockerContainerName) -v \"$(PB_GitDirectory):$(PB_DockerVolumeName)\" -w=\"$(PB_DockerVolumeName)\" -e \"PACKAGEVERSIONPROPSURL=$(PB_PackageVersionPropsUrl)\" $(PB_DockerImageName)" + "value": "--name $(PB_DockerContainerName) -v \"$(PB_DockerContainerName):$(PB_DockerVolumeName)\" -w=\"$(PB_DockerVolumeName)\" -e \"PACKAGEVERSIONPROPSURL=$(PB_PackageVersionPropsUrl)\" $(PB_DockerImageName)" }, "PB_DockerContainerName": { "value": "corefx-cross-$(Build.BuildId)" }, "PB_DockerCopyDest": { - "value": "$(Build.BinariesDirectory)/docker_repo" + "value": "$(Build.StagingDirectory)" }, "PB_DockerImageName": { "value": "$(PB_DockerRepository):$(PB_DockerTag)" @@ -373,11 +465,24 @@ "PB_Label": { "value": "$(Build.BuildNumber)" }, + "PB_PackageVersionPropsUrl": { + "value": "", + "isSecret": true + }, + "PB_RestoreSource": { + "value": "", + "isSecret": true + }, + "PB_SyncArguments": { + "value": "-p -- /p:ArchGroup=$(PB_Architecture)", + "allowOverride": true + }, "PB_VsoAccountName": { "value": "dn-bot" }, "PB_VsoCorefxGitUrl": { - "value": "https://$(PB_VsoAccountName):$(VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/$(PB_VsoRepositoryName)/" + "value": "https://$(PB_VsoAccountName):$(VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/$(PB_VsoRepositoryName)/", + "isSecret": true }, "PB_VsoRepositoryName": { "value": "DotNet-CoreFX-Trusted" @@ -400,16 +505,6 @@ "VsoPassword": { "value": null, "isSecret": true - }, - "PB_SyncArguments": { - "value": "-p -- /p:ArchGroup=$(PB_Architecture)", - "allowOverride": true - }, - "PB_PackageVersionPropsUrl": { - "value": "" - }, - "PB_AssetRootUrl": { - "value": "" } }, "demands": [ @@ -441,8 +536,8 @@ "reportBuildStatus": "true", "fetchDepth": "0", "gitLfsSupport": "false", - "skipSyncSource": "false", - "cleanOptions": "0", + "skipSyncSource": "true", + "cleanOptions": "3", "checkoutNestedSubmodules": "false", "labelSourcesFormat": "$(build.buildNumber)" }, @@ -458,8 +553,14 @@ "quality": "definition", "drafts": [], "queue": { + "_links": { + "self": { + "href": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/36" + } + }, "id": 36, "name": "DotNet-Build", + "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/36", "pool": { "id": 39, "name": "DotNet-Build" @@ -473,10 +574,10 @@ "project": { "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee", "name": "DevDiv", - "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ", + "description": "Visual Studio and DevDiv team project for git source code repositories. Work items for Visual Studio and most active DevDiv products are in this account.", "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", "state": "wellFormed", - "revision": 418098432, + "revision": 418099111, "visibility": "organization" } -} \ No newline at end of file +} diff --git a/external/corefx/buildpipeline/DotNet-CoreFx-Trusted-Linux.json b/external/corefx/buildpipeline/DotNet-CoreFx-Trusted-Linux.json index 43e45cfc8a..f3ae7e29f0 100644 --- a/external/corefx/buildpipeline/DotNet-CoreFx-Trusted-Linux.json +++ b/external/corefx/buildpipeline/DotNet-CoreFx-Trusted-Linux.json @@ -1,5 +1,26 @@ { "build": [ + { + "environment": {}, + "enabled": true, + "continueOnError": true, + "displayName": "run begin.sh", + "timeoutInMinutes": 0, + "alwaysRun": true, + "task": { + "id": "10f1f9a1-74b0-47ab-87bf-e3c9c68e8b0d", + "versionSpec": "0.*", + "definitionType": "task" + }, + "inputs": { + "type": "InlineScript", + "scriptPath": "", + "args": "", + "cwd": "", + "failOnStandardError": "false", + "script": "if [ -f \"$AGENTTOOLSPATH/begin.sh\" ]; then echo \"$AGENTTOOLSPATH/begin.sh script found. Executing...\"; $AGENTTOOLSPATH/begin.sh ; else echo \"$AGENTTOOLSPATH/begin.sh script does not exist. Moving on.\" ; fi" + } + }, { "environment": {}, "enabled": true, @@ -7,7 +28,7 @@ "alwaysRun": false, "displayName": "Change permissions to agent folder for cleanup steps", "timeoutInMinutes": 0, - "refName": "Task1", + "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -16,7 +37,7 @@ "inputs": { "filename": "sudo", "arguments": "chmod 777 -R .", - "workingFolder": "$(Agent.WorkFolder)", + "workingFolder": "", "failOnStandardError": "false" } }, @@ -27,7 +48,7 @@ "alwaysRun": false, "displayName": "Delete files from $(PB_GitDirectory)", "timeoutInMinutes": 0, - "refName": "Task2", + "condition": "succeeded()", "task": { "id": "b7e8b412-0437-4065-9371-edc5881de25b", "versionSpec": "1.*", @@ -43,9 +64,8 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "git clone", + "displayName": "Local git clone", "timeoutInMinutes": 0, - "refName": "Task3", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -63,9 +83,8 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "git checkout", + "displayName": "Local git checkout", "timeoutInMinutes": 0, - "refName": "Task4", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -83,38 +102,15 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Create host machine tools sandbox", + "displayName": "Local initialize tools", "timeoutInMinutes": 0, - "refName": "Task5", - "task": { - "id": "5bfb729a-a7c8-4a78-a7c3-8d717bb7c13c", - "versionSpec": "2.*", - "definitionType": "task" - }, - "inputs": { - "SourceFolder": "$(PB_GitDirectory)", - "Contents": "init-tools.sh\nBuildToolsVersion.txt\nDotnetCLIVersion.txt\ninit-tools.msbuild\ndependencies.props", - "TargetFolder": "$(DockerHost_Sandbox)", - "CleanTargetFolder": "false", - "OverWrite": "false", - "flattenFolders": "false" - } - }, - { - "environment": {}, - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Initialize tools in sandbox for host machine", - "timeoutInMinutes": 0, - "refName": "Task5", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", "definitionType": "task" }, "inputs": { - "filename": "$(DockerHost_Sandbox)/init-tools.sh", + "filename": "$(PB_GitDirectory)/init-tools.sh", "arguments": "", "workingFolder": "", "failOnStandardError": "false" @@ -125,16 +121,15 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Initialize Docker", + "displayName": "Local initialize Docker", "timeoutInMinutes": 0, - "refName": "Task6", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", "definitionType": "task" }, "inputs": { - "filename": "$(DockerHost_ToolsDirectory)/scripts/docker/init-docker.sh", + "filename": "$(PB_GitDirectory)/Tools/scripts/docker/init-docker.sh", "arguments": "$(PB_DockerImageName)", "workingFolder": "", "failOnStandardError": "false" @@ -145,17 +140,17 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Generate version assets", + "displayName": "Docker git clone", "timeoutInMinutes": 0, - "refName": "Task7", + "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", "definitionType": "task" }, "inputs": { - "filename": "docker", - "arguments": "run $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/build-managed.sh -OfficialBuildId=$(OfficialBuildId) -- /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true", + "filename": "docker ", + "arguments": "run --rm $(PB_DockerCommonRunArgs) git clone $(PB_VsoCorefxGitUrl) $(PB_DockerVolumeName)", "workingFolder": "", "failOnStandardError": "false" } @@ -165,9 +160,9 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Run sync", + "displayName": "Docker git checkout", "timeoutInMinutes": 0, - "refName": "Task8", + "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -175,7 +170,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/sync.sh $(PB_SyncArguments)", + "arguments": "run --rm $(PB_DockerCommonRunArgs) git checkout $(SourceVersion)", "workingFolder": "", "failOnStandardError": "false" } @@ -185,9 +180,8 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Run build.sh", + "displayName": "Docker generate version assets", "timeoutInMinutes": 0, - "refName": "Task9", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -195,7 +189,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/build.sh -OfficialBuildId=$(OfficialBuildId) $(PB_BuildArguments)", + "arguments": "run --rm $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/build-managed.sh -OfficialBuildId=$(OfficialBuildId) -- /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true", "workingFolder": "", "failOnStandardError": "false" } @@ -205,10 +199,47 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Build tests", + "displayName": "Docker run sync", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "docker", + "arguments": "run --rm $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/sync.sh $(PB_SyncArguments)", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "environment": {}, + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Docker run build.sh", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "docker", + "arguments": "run --rm $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/build.sh -OfficialBuildId=$(OfficialBuildId) $(PB_BuildArguments)", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "environment": {}, + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Docker build tests", "timeoutInMinutes": 0, "condition": "and(succeeded(), ne(variables.PB_SkipTests, 'true'), ne(variables.PB_SkipTestBuild, 'true'))", - "refName": "Task10", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -216,7 +247,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/build-tests.sh $(PB_BuildTestsArguments)", + "arguments": "run --rm $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/build-tests.sh $(PB_BuildTestsArguments)", "workingFolder": "", "failOnStandardError": "false" } @@ -226,10 +257,9 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Create Helix Test Jobs", + "displayName": "Docker create helix test jobs", "timeoutInMinutes": 0, "condition": "and(succeeded(), ne(variables.PB_SkipTests, 'true'), ne(variables.PB_EnableCloudTest, 'false'))", - "refName": "Task11", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -237,7 +267,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/Tools/msbuild.sh $(PB_DockerVolumeName)/src/upload-tests.proj $(PB_CreateHelixArguments) /p:\"CloudDropAccountName=$(PB_CloudDropAccountName)\" /p:\"CloudResultsAccountName=$(PB_CloudResultsAccountName)\" /p:\"CloudDropAccessToken=$(CloudDropAccessToken)\" /p:\"CloudResultsAccessToken=$(PB_CloudResultsAccessToken)\" /p:\"HelixApiAccessKey=$(HelixApiAccessKey)\" /p:HelixApiEndpoint=$(PB_HelixApiEndPoint) /p:\"Branch=$(SourceBranch)\" /p:TargetQueues=$(PB_TargetQueue) /p:\"OfficialBuildId=$(OfficialBuildId)\"", + "arguments": "run --rm -e DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/Tools/msbuild.sh $(PB_DockerVolumeName)/src/upload-tests.proj $(PB_CreateHelixArguments) /p:\"CloudDropAccountName=$(PB_CloudDropAccountName)\" /p:\"CloudResultsAccountName=$(PB_CloudResultsAccountName)\" /p:\"CloudDropAccessToken=$(CloudDropAccessToken)\" /p:\"CloudResultsAccessToken=$(PB_CloudResultsAccessToken)\" /p:\"HelixApiAccessKey=$(HelixApiAccessKey)\" /p:HelixApiEndpoint=$(PB_HelixApiEndPoint) /p:\"Branch=$(SourceBranch)\" /p:TargetQueues=$(PB_TargetQueue) /p:\"OfficialBuildId=$(OfficialBuildId)\" /p:\"ProductBuildId=$(ProductBuildId)\"", "workingFolder": "", "failOnStandardError": "false" } @@ -247,9 +277,8 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Push packages to Azure", + "displayName": "Docker push packages to Azure", "timeoutInMinutes": 0, - "refName": "Task12", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -257,7 +286,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/publish-packages.sh -AzureAccount=$(PB_CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_Label) -verbose -- /p:OverwriteOnPublish=false", + "arguments": "run --rm $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/publish-packages.sh -AzureAccount=$(PB_CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_Label) -verbose -- /p:OverwriteOnPublish=false", "workingFolder": "", "failOnStandardError": "false" } @@ -267,22 +296,19 @@ "enabled": true, "continueOnError": true, "alwaysRun": true, - "displayName": "Copy Files to: $(Build.StagingDirectory)\\BuildLogs", + "displayName": "Local copy logs out of container", "timeoutInMinutes": 0, "condition": "succeededOrFailed()", - "refName": "CopyFiles1", "task": { - "id": "5bfb729a-a7c8-4a78-a7c3-8d717bb7c13c", - "versionSpec": "2.*", + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", "definitionType": "task" }, "inputs": { - "SourceFolder": "$(PB_GitDirectory)", - "Contents": "*.log", - "TargetFolder": "$(Build.StagingDirectory)\\BuildLogs", - "CleanTargetFolder": "false", - "OverWrite": "false", - "flattenFolders": "false" + "filename": "docker", + "arguments": "run --rm -v $(Build.StagingDirectory):/docker_logs $(PB_DockerCommonRunArgs) find . -type f -name *.log -exec cp {} --target-directory=/docker_logs ;", + "workingFolder": "", + "failOnStandardError": "false" } }, { @@ -290,17 +316,16 @@ "enabled": true, "continueOnError": true, "alwaysRun": true, - "displayName": "Publish Artifact: BuildLogs", + "displayName": "Local publish artifact: BuildLogs", "timeoutInMinutes": 0, "condition": "succeededOrFailed()", - "refName": "PublishBuildArtifacts2", "task": { "id": "2ff763a7-ce83-4e1f-bc89-0ae63477cebe", "versionSpec": "1.*", "definitionType": "task" }, "inputs": { - "PathtoPublish": "$(Build.StagingDirectory)\\BuildLogs", + "PathtoPublish": "$(Build.StagingDirectory)", "ArtifactName": "BuildLogs", "ArtifactType": "Container", "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)", @@ -313,17 +338,16 @@ "enabled": true, "continueOnError": true, "alwaysRun": false, - "displayName": "Cleanup Docker", + "displayName": "Local cleanup Docker", "timeoutInMinutes": 0, "condition": "always()", - "refName": "Task14", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", "definitionType": "task" }, "inputs": { - "filename": "$(DockerHost_ToolsDirectory)/scripts/docker/cleanup-docker.sh", + "filename": "$(PB_GitDirectory)/Tools/scripts/docker/cleanup-docker.sh", "arguments": "", "workingFolder": "", "failOnStandardError": "false" @@ -333,21 +357,21 @@ "environment": {}, "enabled": true, "continueOnError": true, - "alwaysRun": false, - "displayName": "Cleanup VSTS Agent", + "displayName": "run end.sh", "timeoutInMinutes": 0, - "condition": "always()", - "refName": "Task15", + "alwaysRun": true, "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", + "id": "10f1f9a1-74b0-47ab-87bf-e3c9c68e8b0d", + "versionSpec": "0.*", "definitionType": "task" }, "inputs": { - "filename": "$(DockerHost_ToolsDirectory)/msbuild.sh", - "arguments": "cleanupagent.proj /p:AgentDirectory=$(Agent.HomeDirectory) /p:DoClean=$(PB_CleanAgent)", - "workingFolder": "$(DockerHost_ToolsDirectory)/scripts/vstsagent/", - "failOnStandardError": "false" + "type": "InlineScript", + "scriptPath": "", + "args": "", + "cwd": "", + "failOnStandardError": "false", + "script": "if [ -f \"$AGENTTOOLSPATH/end.sh\" ]; then echo \"$AGENTTOOLSPATH/end.sh script found. Executing...\"; $AGENTTOOLSPATH/end.sh ; else echo \"$AGENTTOOLSPATH/end.sh script does not exist. Moving on.\" ; fi" } } ], @@ -372,15 +396,6 @@ "assignToRequestor": "true", "additionalFields": "{}" } - }, - { - "enabled": false, - "definition": { - "id": "57578776-4c22-4526-aeb0-86b6da17ee9c" - }, - "inputs": { - "additionalFields": "{}" - } } ], "variables": { @@ -388,16 +403,22 @@ "value": null, "isSecret": true }, - "DockerHost_Sandbox": { - "value": "$(Build.StagingDirectory)/HostSandbox" - }, - "DockerHost_ToolsDirectory": { - "value": "$(DockerHost_Sandbox)/Tools" + "HelixApiAccessKey": { + "value": null, + "isSecret": true }, "OfficialBuildId": { "value": "$(Build.BuildNumber)", "allowOverride": true }, + "PB_AssetRootUrl": { + "value": "", + "isSecret": true + }, + "PB_RestoreSource": { + "value": "", + "isSecret": true + }, "PB_BuildArguments": { "value": "-buildArch=x64 -Release -stripSymbols", "allowOverride": true @@ -424,13 +445,13 @@ "allowOverride": true }, "PB_DockerCommonRunArgs": { - "value": "--rm --name $(PB_DockerContainerName) -v \"$(PB_GitDirectory):$(PB_DockerVolumeName)\" -w=\"$(PB_DockerVolumeName)\" -e \"PACKAGEVERSIONPROPSURL=$(PB_PackageVersionPropsUrl)\" $(PB_DockerImageName)" + "value": "--name $(PB_DockerContainerName) -v \"$(PB_DockerContainerName):$(PB_DockerVolumeName)\" -w=\"$(PB_DockerVolumeName)\" -e \"PACKAGEVERSIONPROPSURL=$(PB_PackageVersionPropsUrl)\" $(PB_DockerImageName)" }, "PB_DockerContainerName": { "value": "corefx-$(Build.BuildId)" }, "PB_DockerCopyDest": { - "value": "$(Build.BinariesDirectory)/docker_repo" + "value": "$(Build.StagingDirectory)" }, "PB_DockerImageName": { "value": "$(PB_DockerRepository):$(PB_DockerTag)" @@ -452,22 +473,36 @@ "value": "$(Build.BuildNumber)", "allowOverride": true }, + "PB_PackageVersionPropsUrl": { + "value": "", + "isSecret": true + }, + "PB_SkipTests": { + "value": "false", + "allowOverride": true + }, "PB_SyncArguments": { "value": "-p -- /p:ArchGroup=x64", "allowOverride": true }, "PB_TargetQueue": { - "value": "Centos.73.Amd64+RedHat.72.Amd64+RedHat.73.Amd64+Debian.87.Amd64+Debian.90.Amd64+Ubuntu.1404.Amd64+Ubuntu.1604.Amd64+Ubuntu.1704.Amd64+suse.422.amd64+SLES.12.Amd64+fedora.25.amd64+Fedora.26.Amd64" + "value": "Centos.73.Amd64+RedHat.73.Amd64+Debian.87.Amd64+Debian.90.Amd64+Debian.9.Amd64+Ubuntu.1404.Amd64+Ubuntu.1604.Amd64+Ubuntu.1804.Amd64+opensuse.423.amd64+SLES.12.Amd64+Fedora.26.Amd64+Fedora.27.Amd64" }, "PB_VsoAccountName": { "value": "dn-bot" }, "PB_VsoCorefxGitUrl": { - "value": "https://$(PB_VsoAccountName):$(VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/$(PB_VsoRepositoryName)/" + "value": "https://$(PB_VsoAccountName):$(VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/$(PB_VsoRepositoryName)/", + "isSecret": true + }, "PB_VsoRepositoryName": { "value": "DotNet-CoreFX-Trusted" }, + "ProductBuildId": { + "value": "", + "allowOverride": true + }, "SourceVersion": { "value": "HEAD", "allowOverride": true @@ -479,16 +514,6 @@ "VsoPassword": { "value": null, "isSecret": true - }, - "PB_SkipTests": { - "value": "false", - "allowOverride": true - }, - "PB_PackageVersionPropsUrl": { - "value": "" - }, - "PB_AssetRootUrl": { - "value": "" } }, "demands": [ @@ -511,7 +536,7 @@ ], "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)", "jobAuthorizationScope": "projectCollection", - "jobTimeoutInMinutes": 60, + "jobTimeoutInMinutes": 90, "jobCancelTimeoutInMinutes": 5, "repository": { "properties": { @@ -520,7 +545,7 @@ "fetchDepth": "0", "gitLfsSupport": "false", "skipSyncSource": "true", - "cleanOptions": "0", + "cleanOptions": "3", "checkoutNestedSubmodules": "false", "labelSourcesFormat": "$(build.buildNumber)" }, @@ -536,8 +561,14 @@ "quality": "definition", "drafts": [], "queue": { + "_links": { + "self": { + "href": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/36" + } + }, "id": 36, "name": "DotNet-Build", + "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/36", "pool": { "id": 39, "name": "DotNet-Build" @@ -551,10 +582,10 @@ "project": { "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee", "name": "DevDiv", - "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ", + "description": "Visual Studio and DevDiv team project for git source code repositories. Work items for Visual Studio and most active DevDiv products are in this account.", "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", "state": "wellFormed", - "revision": 418098432, + "revision": 418099111, "visibility": "organization" } -} \ No newline at end of file +} diff --git a/external/corefx/buildpipeline/DotNet-CoreFx-Trusted-OSX.json b/external/corefx/buildpipeline/DotNet-CoreFx-Trusted-OSX.json index 67a343ede9..2c221dc98d 100644 --- a/external/corefx/buildpipeline/DotNet-CoreFx-Trusted-OSX.json +++ b/external/corefx/buildpipeline/DotNet-CoreFx-Trusted-OSX.json @@ -1,5 +1,26 @@ { "build": [ + { + "environment": {}, + "enabled": true, + "continueOnError": true, + "displayName": "run begin.sh", + "timeoutInMinutes": 0, + "alwaysRun": true, + "task": { + "id": "10f1f9a1-74b0-47ab-87bf-e3c9c68e8b0d", + "versionSpec": "0.*", + "definitionType": "task" + }, + "inputs": { + "type": "InlineScript", + "scriptPath": "", + "args": "", + "cwd": "", + "failOnStandardError": "false", + "script": "if [ -f \"$AGENTTOOLSPATH/begin.sh\" ]; then echo \"$AGENTTOOLSPATH/begin.sh script found. Executing...\"; $AGENTTOOLSPATH/begin.sh ; else echo \"$AGENTTOOLSPATH/begin.sh script does not exist. Moving on.\" ; fi" + } + }, { "environment": {}, "enabled": true, @@ -79,7 +100,9 @@ } }, { - "environment": {}, + "environment": { + "PACKAGEVERSIONPROPSURL": "$(PB_PackageVersionPropsUrl)" + }, "enabled": true, "continueOnError": false, "alwaysRun": false, @@ -175,7 +198,7 @@ }, "inputs": { "filename": "$(Agent.BuildDirectory)/s/corefx/Tools/msbuild.sh", - "arguments": "$(Agent.BuildDirectory)/s/corefx/src/upload-tests.proj $(PB_CreateHelixArguments) /p:\"CloudDropAccountName=$(PB_CloudDropAccountName)\" /p:\"CloudResultsAccountName=$(PB_CloudResultsAccountName)\" /p:\"CloudDropAccessToken=$(CloudDropAccessToken)\" /p:\"CloudResultsAccessToken=$(OutputCloudResultsAccessToken)\" /p:\"HelixApiAccessKey=$(HelixApiAccessKey)\" /p:HelixApiEndpoint=$(PB_HelixApiEndPoint) /p:\"Branch=$(SourceBranch)\" /p:\"TargetQueues=$(PB_TargetQueue)\" /p:\"OfficialBuildId=$(OfficialBuildId)\"", + "arguments": "$(Agent.BuildDirectory)/s/corefx/src/upload-tests.proj $(PB_CreateHelixArguments) /p:\"CloudDropAccountName=$(PB_CloudDropAccountName)\" /p:\"CloudResultsAccountName=$(PB_CloudResultsAccountName)\" /p:\"CloudDropAccessToken=$(CloudDropAccessToken)\" /p:\"CloudResultsAccessToken=$(OutputCloudResultsAccessToken)\" /p:\"HelixApiAccessKey=$(HelixApiAccessKey)\" /p:HelixApiEndpoint=$(PB_HelixApiEndPoint) /p:\"Branch=$(SourceBranch)\" /p:\"TargetQueues=$(PB_TargetQueue)\" /p:\"OfficialBuildId=$(OfficialBuildId)\" /p:\"ProductBuildId=$(ProductBuildId)\"", "workingFolder": "", "failOnStandardError": "false" } @@ -245,6 +268,27 @@ "Parallel": "false", "ParallelCount": "8" } + }, + { + "environment": {}, + "enabled": true, + "continueOnError": true, + "displayName": "run end.sh", + "timeoutInMinutes": 0, + "alwaysRun": true, + "task": { + "id": "10f1f9a1-74b0-47ab-87bf-e3c9c68e8b0d", + "versionSpec": "0.*", + "definitionType": "task" + }, + "inputs": { + "type": "InlineScript", + "scriptPath": "", + "args": "", + "cwd": "", + "failOnStandardError": "false", + "script": "if [ -f \"$AGENTTOOLSPATH/end.sh\" ]; then echo \"$AGENTTOOLSPATH/end.sh script found. Executing...\"; $AGENTTOOLSPATH/end.sh ; else echo \"$AGENTTOOLSPATH/end.sh script does not exist. Moving on.\" ; fi" + } } ], "options": [ @@ -291,10 +335,22 @@ "value": null, "isSecret": true }, + "OutputCloudResultsAccessToken": { + "value": null, + "isSecret": true + }, + "HelixApiAccessKey": { + "value": null, + "isSecret": true + }, "OfficialBuildId": { "value": "$(Build.BuildNumber)", "allowOverride": true }, + "ProductBuildId": { + "value": "", + "allowOverride": true + }, "PB_Label": { "value": "$(Build.BuildNumber)", "allowOverride": true @@ -315,7 +371,8 @@ "allowOverride": true }, "PB_VsoCorefxGitUrl": { - "value": "https://github.com/dotnet/corefx" + "value": "https://github.com/dotnet/corefx", + "isSecret": true }, "PB_BuildArguments": { "value": "-buildArch=x64 -Release", @@ -338,13 +395,16 @@ "allowOverride": true }, "PB_PackageVersionPropsUrl": { - "value": "" + "value": "", + "isSecret": true }, - "PACKAGEVERSIONPROPSURL": { - "value": "$(PB_PackageVersionPropsUrl)" + "PB_RestoreSource": { + "value": "", + "isSecret": true }, "PB_AssetRootUrl": { - "value": "" + "value": "", + "isSecret": true } }, "demands": [ @@ -367,7 +427,7 @@ ], "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)", "jobAuthorizationScope": "projectCollection", - "jobTimeoutInMinutes": 60, + "jobTimeoutInMinutes": 120, "jobCancelTimeoutInMinutes": 5, "repository": { "properties": { @@ -413,4 +473,4 @@ "revision": 418098432, "visibility": "organization" } -} \ No newline at end of file +} diff --git a/external/corefx/buildpipeline/DotNet-CoreFx-Trusted-Windows-NoTest.json b/external/corefx/buildpipeline/DotNet-CoreFx-Trusted-Windows-NoTest.json index df278c3263..3e740ace10 100644 --- a/external/corefx/buildpipeline/DotNet-CoreFx-Trusted-Windows-NoTest.json +++ b/external/corefx/buildpipeline/DotNet-CoreFx-Trusted-Windows-NoTest.json @@ -1,5 +1,28 @@ { "build": [ + { + "environment": {}, + "enabled": true, + "continueOnError": true, + "displayName": "run begin.ps1", + "timeoutInMinutes": 0, + "alwaysRun": true, + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "targetType": "inline", + "filePath": "", + "arguments": "", + "script": "if (Test-Path \"$Env:AgentToolsPath\\begin.ps1\") {\n \"$Env:AgentToolsPath\\begin.ps1 script found. Executing...\"\n & $Env:AgentToolsPath\\begin.ps1\n} else {\n \"$Env:AgentToolsPath\\begin.ps1 script does not exist. Moving on...\"\n}", + "errorActionPreference": "continue", + "failOnStderr": "false", + "ignoreLASTEXITCODE": "true", + "workingDirectory": "" + } + }, { "environment": {}, "enabled": true, @@ -80,7 +103,8 @@ "signType": "real", "zipSources": "false", "version": "", - "feedSource": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json" + "feedSource": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json", + "esrpSigning": "$(PB_UseEsrpSigning)" } }, { @@ -104,7 +128,9 @@ } }, { - "environment": {}, + "environment": { + "PACKAGEVERSIONPROPSURL": "$(PB_PackageVersionPropsUrl)" + }, "enabled": true, "continueOnError": false, "alwaysRun": false, @@ -118,7 +144,7 @@ }, "inputs": { "filename": "$(Build.SourcesDirectory)\\corefx\\sync.cmd", - "arguments": "$(PB_SyncArguments)", + "arguments": "$(PB_SyncArguments) $(PB_OptionalToolingSyncArguments) $(PB_PipelineBuildMSBuildArguments)", "workingFolder": "corefx", "failOnStandardError": "false" } @@ -158,7 +184,7 @@ }, "inputs": { "filename": "$(Build.SourcesDirectory)\\corefx\\build.cmd", - "arguments": "-OfficialBuildId=$(OfficialBuildId) $(PB_BuildArguments)", + "arguments": "-OfficialBuildId=$(OfficialBuildId) $(PB_BuildArguments) $(PB_PipelineBuildMSBuildArguments)", "workingFolder": "corefx", "failOnStandardError": "false" } @@ -183,31 +209,6 @@ "failOnStandardError": "false" } }, - { - "environment": {}, - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Index symbol sources", - "timeoutInMinutes": 0, - "refName": "Task11", - "task": { - "id": "0675668a-7bba-4ccb-901d-5ad6554ca653", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "SymbolsPath": "", - "SearchPattern": "corefx\\bin\\*$(PB_Platform).$(PB_ConfigurationGroup)\\**\\*.pdb", - "SymbolsFolder": "", - "SkipIndexing": "false", - "TreatNotIndexedAsWarning": "false", - "SymbolsMaximumWaitTime": "", - "SymbolsProduct": "", - "SymbolsVersion": "", - "SymbolsArtifactName": "Symbols_$(PB_ConfigurationGroup)" - } - }, { "environment": {}, "enabled": true, @@ -295,30 +296,23 @@ "environment": {}, "enabled": true, "continueOnError": true, - "alwaysRun": false, - "displayName": "Build solution corefx\\Tools\\scripts\\vstsagent\\cleanupagent.proj", + "alwaysRun": true, + "displayName": "run end.ps1", "timeoutInMinutes": 0, - "condition": "always()", - "refName": "Task14", "task": { - "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", - "versionSpec": "1.*", + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "2.*", "definitionType": "task" }, "inputs": { - "solution": "corefx\\Tools\\scripts\\vstsagent\\cleanupagent.proj", - "msbuildLocationMethod": "version", - "msbuildVersion": "14.0", - "msbuildArchitecture": "x86", - "msbuildLocation": "", - "platform": "", - "configuration": "", - "msbuildArguments": "/p:AgentDirectory=$(Agent.HomeDirectory) /p:DoClean=$(PB_CleanAgent)", - "clean": "false", - "maximumCpuCount": "false", - "restoreNugetPackages": "false", - "logProjectEvents": "false", - "createLogFile": "false" + "targetType": "inline", + "filePath": "", + "arguments": "", + "script": "if (Test-Path \"$Env:AgentToolsPath\\end.ps1\") {\n \"$Env:AgentToolsPath\\end.ps1 script found. Executing...\"\n & $Env:AgentToolsPath\\end.ps1\n} else {\n \"$Env:AgentToolsPath\\end.ps1 script does not exist. Moving on...\"\n}", + "errorActionPreference": "continue", + "failOnStderr": "false", + "ignoreLASTEXITCODE": "true", + "workingDirectory": "" } } ], @@ -398,7 +392,8 @@ "allowOverride": true }, "PB_VsoCorefxGitUrl": { - "value": "https://github.com/dotnet/corefx" + "value": "https://github.com/dotnet/corefx", + "isSecret": true }, "PB_SourceBranch": { "value": "master", @@ -424,18 +419,47 @@ "value": "-buildArch=x64 -Release -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10", "allowOverride": true }, + "PB_OptionalToolingSyncArguments": { + "value": "/p:OptionalToolSource=$(PB_OptionalToolSource) /p:OptionalToolSourceUser=$(PB_OptionalToolSourceUser);OptionalToolSourcePassword=$(PB_OptionalToolSourcePAT)" + }, + "PB_OptionalToolSource": { + "value": null, + "allowOverride": true, + "isSecret": true + }, + "PB_OptionalToolSourcePAT": { + "value": null, + "allowOverride": true, + "isSecret": true + }, + "PB_OptionalToolSourceUser": { + "value": null, + "allowOverride": true, + "isSecret": true + }, + "PB_PipelineBuildMSBuildArguments": { + "value": "", + "allowOverride": true + }, "PB_SignType": { "value": "real", "allowOverride": true }, "PB_PackageVersionPropsUrl": { - "value": "" + "value": "", + "isSecret": true }, - "PACKAGEVERSIONPROPSURL": { - "value": "$(PB_PackageVersionPropsUrl)" + "PB_RestoreSource": { + "value": "", + "isSecret": true }, "PB_AssetRootUrl": { - "value": "" + "value": "", + "isSecret": true + }, + "PB_UseEsrpSigning": { + "value": "false", + "allowOverride": true } }, "demands": [ @@ -484,11 +508,17 @@ "quality": "definition", "drafts": [], "queue": { - "id": 36, - "name": "DotNet-Build", + "_links": { + "self": { + "href": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330" + } + }, + "id": 330, + "name": "DotNetCore-Build", + "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330", "pool": { - "id": 39, - "name": "DotNet-Build" + "id": 97, + "name": "DotNetCore-Build" } }, "id": 5308, @@ -505,4 +535,4 @@ "revision": 418098432, "visibility": "organization" } -} \ No newline at end of file +} diff --git a/external/corefx/buildpipeline/DotNet-CoreFx-Trusted-Windows.json b/external/corefx/buildpipeline/DotNet-CoreFx-Trusted-Windows.json index fd989b23d3..93f4d0e574 100644 --- a/external/corefx/buildpipeline/DotNet-CoreFx-Trusted-Windows.json +++ b/external/corefx/buildpipeline/DotNet-CoreFx-Trusted-Windows.json @@ -1,5 +1,28 @@ { "build": [ + { + "environment": {}, + "enabled": true, + "continueOnError": true, + "displayName": "run begin.ps1", + "timeoutInMinutes": 0, + "alwaysRun": true, + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "targetType": "inline", + "filePath": "", + "arguments": "", + "script": "if (Test-Path \"$Env:AgentToolsPath\\begin.ps1\") {\n \"$Env:AgentToolsPath\\begin.ps1 script found. Executing...\"\n & $Env:AgentToolsPath\\begin.ps1\n} else {\n \"$Env:AgentToolsPath\\begin.ps1 script does not exist. Moving on...\"\n}", + "errorActionPreference": "continue", + "failOnStderr": "false", + "ignoreLASTEXITCODE": "true", + "workingDirectory": "" + } + }, { "environment": {}, "enabled": true, @@ -80,7 +103,8 @@ "signType": "real", "zipSources": "false", "version": "", - "feedSource": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json" + "feedSource": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json", + "esrpSigning": "$(PB_UseEsrpSigning)" } }, { @@ -104,7 +128,9 @@ } }, { - "environment": {}, + "environment": { + "PACKAGEVERSIONPROPSURL": "$(PB_PackageVersionPropsUrl)" + }, "enabled": true, "continueOnError": false, "alwaysRun": false, @@ -206,7 +232,7 @@ "msbuildLocation": "", "platform": "", "configuration": "", - "msbuildArguments": "$(PB_CreateHelixArguments) /p:\"Branch=$(SourceBranch)\" /p:\"CloudDropConnectionString=DefaultEndpointsProtocol=https;AccountName=$(PB_CloudDropAccountName);AccountKey=$(CloudDropAccessToken);EndpointSuffix=core.windows.net\" /p:\"CloudResultsConnectionString=DefaultEndpointsProtocol=https;AccountName=$(PB_CloudResultsAccountName);AccountKey=$(OutputCloudResultsAccessToken);EndpointSuffix=core.windows.net\" /p:\"HelixApiAccessKey=$(HelixApiAccessKey)\" /p:\"HelixApiEndpoint=$(PB_HelixApiEndPoint)\" /p:TargetQueues=$(PB_TargetQueue) /p:\"OfficialBuildId=$(OfficialBuildId)\"", + "msbuildArguments": "$(PB_CreateHelixArguments) /p:\"Branch=$(SourceBranch)\" /p:\"CloudDropConnectionString=DefaultEndpointsProtocol=https;AccountName=$(PB_CloudDropAccountName);AccountKey=$(CloudDropAccessToken);EndpointSuffix=core.windows.net\" /p:\"CloudResultsConnectionString=DefaultEndpointsProtocol=https;AccountName=$(PB_CloudResultsAccountName);AccountKey=$(OutputCloudResultsAccessToken);EndpointSuffix=core.windows.net\" /p:\"HelixApiAccessKey=$(HelixApiAccessKey)\" /p:\"HelixApiEndpoint=$(PB_HelixApiEndPoint)\" /p:TargetQueues=$(PB_TargetQueue) /p:\"OfficialBuildId=$(OfficialBuildId)\" /p:\"ProductBuildId=$(ProductBuildId)\"", "clean": "false", "maximumCpuCount": "false", "restoreNugetPackages": "false", @@ -234,31 +260,6 @@ "failOnStandardError": "false" } }, - { - "environment": {}, - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Index symbol sources", - "timeoutInMinutes": 0, - "refName": "Task13", - "task": { - "id": "0675668a-7bba-4ccb-901d-5ad6554ca653", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "SymbolsPath": "", - "SearchPattern": "corefx\\bin\\*$(PB_Platform).$(PB_ConfigurationGroup)\\**\\*.pdb", - "SymbolsFolder": "", - "SkipIndexing": "false", - "TreatNotIndexedAsWarning": "false", - "SymbolsMaximumWaitTime": "", - "SymbolsProduct": "", - "SymbolsVersion": "", - "SymbolsArtifactName": "Symbols_$(PB_ConfigurationGroup)" - } - }, { "environment": {}, "enabled": true, @@ -346,30 +347,23 @@ "environment": {}, "enabled": true, "continueOnError": true, - "alwaysRun": false, - "displayName": "Build solution corefx\\Tools\\scripts\\vstsagent\\cleanupagent.proj", + "alwaysRun": true, + "displayName": "run end.ps1", "timeoutInMinutes": 0, - "condition": "always()", - "refName": "Task16", "task": { - "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", - "versionSpec": "1.*", + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "2.*", "definitionType": "task" }, "inputs": { - "solution": "corefx\\Tools\\scripts\\vstsagent\\cleanupagent.proj", - "msbuildLocationMethod": "version", - "msbuildVersion": "14.0", - "msbuildArchitecture": "x86", - "msbuildLocation": "", - "platform": "", - "configuration": "", - "msbuildArguments": "/p:AgentDirectory=$(Agent.HomeDirectory) /p:DoClean=$(PB_CleanAgent)", - "clean": "false", - "maximumCpuCount": "false", - "restoreNugetPackages": "false", - "logProjectEvents": "false", - "createLogFile": "false" + "targetType": "inline", + "filePath": "", + "arguments": "", + "script": "if (Test-Path \"$Env:AgentToolsPath\\end.ps1\") {\n \"$Env:AgentToolsPath\\end.ps1 script found. Executing...\"\n & $Env:AgentToolsPath\\end.ps1\n} else {\n \"$Env:AgentToolsPath\\end.ps1 script does not exist. Moving on...\"\n}", + "errorActionPreference": "continue", + "failOnStderr": "false", + "ignoreLASTEXITCODE": "true", + "workingDirectory": "" } } ], @@ -410,10 +404,22 @@ "value": null, "isSecret": true }, + "HelixApiAccessKey": { + "value": null, + "isSecret": true + }, + "OutputCloudResultsAccessToken": { + "value": null, + "isSecret": true + }, "OfficialBuildId": { "value": "$(Build.BuildNumber)", "allowOverride": true }, + "ProductBuildId": { + "value": "", + "allowOverride": true + }, "PB_BuildArguments": { "value": "-buildArch=x64 -Release -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10", "allowOverride": true @@ -487,7 +493,8 @@ "value": "dn-bot" }, "PB_VsoCorefxGitUrl": { - "value": "https://$(PB_VsoAccountName):$(VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/$(PB_VsoRepositoryName)/" + "value": "https://$(PB_VsoAccountName):$(VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/$(PB_VsoRepositoryName)/", + "isSecret": true }, "PB_VsoRepositoryName": { "value": "DotNet-CoreFX-Trusted" @@ -516,13 +523,20 @@ "allowOverride": true }, "PB_PackageVersionPropsUrl": { - "value": "" + "value": "", + "isSecret": true }, - "PACKAGEVERSIONPROPSURL": { - "value": "$(PB_PackageVersionPropsUrl)" + "PB_RestoreSource": { + "value": "", + "isSecret": true }, "PB_AssetRootUrl": { - "value": "" + "value": "", + "isSecret": true + }, + "PB_UseEsrpSigning": { + "value": "false", + "allowOverride": true } }, "demands": [ @@ -570,11 +584,17 @@ "quality": "definition", "drafts": [], "queue": { - "id": 36, - "name": "DotNet-Build", + "_links": { + "self": { + "href": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330" + } + }, + "id": 330, + "name": "DotNetCore-Build", + "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330", "pool": { - "id": 39, - "name": "DotNet-Build" + "id": 97, + "name": "DotNetCore-Build" } }, "id": 893, @@ -591,4 +611,4 @@ "revision": 418098432, "visibility": "organization" } -} \ No newline at end of file +} diff --git a/external/corefx/buildpipeline/DotNet-Trusted-Publish-Symbols.json b/external/corefx/buildpipeline/DotNet-Trusted-Publish-Symbols.json index e3fdeb4c41..06dbfcfbfa 100644 --- a/external/corefx/buildpipeline/DotNet-Trusted-Publish-Symbols.json +++ b/external/corefx/buildpipeline/DotNet-Trusted-Publish-Symbols.json @@ -1,5 +1,47 @@ { "build": [ + { + "environment": {}, + "enabled": true, + "continueOnError": true, + "displayName": "run begin.ps1", + "timeoutInMinutes": 0, + "alwaysRun": true, + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "targetType": "inline", + "filePath": "", + "arguments": "", + "script": "if (Test-Path \"$Env:AgentToolsPath\\begin.ps1\") {\n \"$Env:AgentToolsPath\\begin.ps1 script found. Executing...\"\n & $Env:AgentToolsPath\\begin.ps1\n} else {\n \"$Env:AgentToolsPath\\begin.ps1 script does not exist. Moving on...\"\n}", + "errorActionPreference": "continue", + "failOnStderr": "false", + "ignoreLASTEXITCODE": "true", + "workingDirectory": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Run script $(VS140COMNTOOLS)\\VsDevCmd.bat", + "timeoutInMinutes": 0, + "task": { + "id": "bfc8bf76-e7ac-4a8c-9a55-a944a9f632fd", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "$(VS140COMNTOOLS)\\VsDevCmd.bat", + "arguments": "", + "modifyEnvironment": "true", + "workingFolder": "", + "failOnStandardError": "false" + } + }, { "enabled": true, "continueOnError": false, @@ -24,7 +66,7 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "sync -ab", + "displayName": "Sync packages", "timeoutInMinutes": 0, "task": { "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", @@ -36,50 +78,91 @@ "scriptName": "", "arguments": "$(PB_CloudDropAccountName) $(CloudDropAccessToken) $(PB_Label)", "workingFolder": "$(Pipeline.SourcesDirectory)", - "inlineScript": "param($account, $token, $container)\n.\\sync.cmd -ab -- /p:CloudDropAccountName=$account /p:CloudDropAccessToken=$token /p:ContainerName=$container", + "inlineScript": "param($account, $token, $container)\n.\\sync.cmd -ab -- /v:D /p:CloudDropAccountName=$account /p:CloudDropAccessToken=$token /p:ContainerName=$container", "failOnStandardError": "false" } }, { + "environment": {}, "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Extract symbol packages; if release branch, archive", + "displayName": "symbol packages -> Blob Feed", "timeoutInMinutes": 0, + "condition": "and(succeeded(), contains(variables.PB_PublishType, 'blob'), eq(variables.PB_ConfigurationGroup, 'Release'))", "task": { - "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", "definitionType": "task" }, "inputs": { - "scriptType": "inlineScript", - "scriptName": "", - "arguments": "-ConfigGroup $(PB_ConfigurationGroup) -SymPkgGlob $(PB_AzureContainerSymbolPackageGlob) -Branch $(SourceBranch)", + "filename": "msbuild", + "arguments": "src\\publish.proj /t:PublishSymbolsToAzureBlobFeed /p:PublishSymbols=\"true\" $(FeedPublishArguments)", "workingFolder": "$(Pipeline.SourcesDirectory)", - "inlineScript": "param($ConfigGroup, $SymPkgGlob, $Branch)\nif ($ConfigGroup -ne \"Release\") { exit }\n$archive = $Branch.StartsWith(\"release/\")\n\n$target = \"GetAllSymbolFilesToPublish\"\nif ($archive) { $target = \"SubmitSymbolsRequest\" }\n\n.\\build-managed.cmd -- `\n/t:$target `\n/p:SymbolPackagesToPublishGlob=$SymPkgGlob `\n/p:ArchiveSymbols=$archive `\n/v:D", - "failOnStandardError": "true" + "failOnStandardError": "false" } }, { + "environment": {}, "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Publish Symbols to Artifact Services", + "displayName": "Publish symbols to msdl", "timeoutInMinutes": 0, + "condition": "and(succeeded(), contains(variables.PB_PublishType, 'msdl'), eq(variables.PB_ConfigurationGroup, 'Release'))", "task": { - "id": "29827cd1-5c33-4ff0-a817-abd46970ffc4", - "versionSpec": "0.*", + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", "definitionType": "task" }, "inputs": { - "symbolServiceURI": "https://microsoft.artifacts.visualstudio.com/DefaultCollection", - "requestName": "$(system.teamProject)/$(Build.BuildNumber)/$(Build.BuildId)", - "sourcePath": "$(Pipeline.SourcesDirectory)\\bin\\obj\\SymbolsRequest\\ExtractedPackages", - "assemblyPath": "", - "toLowerCase": "true", - "detailedLog": "true", - "expirationInDays": "30", - "usePat": "false" + "filename": "msbuild", + "arguments": "src\\publish.proj /v:D /t:PublishAllSymbols /p:SymbolServerPath=$(PB_MsdlSymbolServerPath) /p:SymbolServerPAT=$(PB_MsdlSymbolServerPAT) /p:SymbolExpirationInDays=$(PB_SymbolExpirationInDays) $(FeedPublishArguments)", + "workingFolder": "$(Pipeline.SourcesDirectory)", + "failOnStandardError": "false" + } + }, + { + "environment": {}, + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Publish symbols to symweb", + "timeoutInMinutes": 0, + "condition": "and(succeeded(), contains(variables.PB_PublishType, 'symweb'), eq(variables.PB_ConfigurationGroup, 'Release'))", + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "msbuild", + "arguments": "src\\publish.proj /v:D /t:PublishAllSymbols /p:SymbolServerPath=$(PB_SymwebSymbolServerPath) /p:SymbolServerPAT=$(PB_SymwebSymbolServerPAT) /p:SymbolExpirationInDays=$(PB_SymbolExpirationInDays) $(FeedPublishArguments)", + "workingFolder": "$(Pipeline.SourcesDirectory)", + "failOnStandardError": "false" + } + }, + { + "environment": {}, + "enabled": true, + "continueOnError": true, + "alwaysRun": true, + "displayName": "run end.ps1", + "timeoutInMinutes": 0, + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "targetType": "inline", + "filePath": "", + "arguments": "", + "script": "if (Test-Path \"$Env:AgentToolsPath\\end.ps1\") {\n \"$Env:AgentToolsPath\\end.ps1 script found. Executing...\"\n & $Env:AgentToolsPath\\end.ps1\n} else {\n \"$Env:AgentToolsPath\\end.ps1 script does not exist. Moving on...\"\n}", + "errorActionPreference": "continue", + "failOnStderr": "false", + "ignoreLASTEXITCODE": "true", + "workingDirectory": "" } } ], @@ -132,7 +215,7 @@ "allowOverride": true }, "PB_ConfigurationGroup": { - "value": "Debug", + "value": "Release", "allowOverride": true }, "PB_CloudDropAccountName": { @@ -141,28 +224,21 @@ }, "CloudDropAccessToken": { "value": null, - "allowOverride": true, "isSecret": true }, - "OfficialBuildId": { - "value": "$(Build.BuildNumber)", - "allowOverride": true - }, "PB_Label": { "value": "$(Build.BuildNumber)", "allowOverride": true }, - "PB_BuildConfiguration": { - "value": "release" - }, - "PB_BuildPlatform": { - "value": "any cpu" + "PB_BlobNamePrefix": { + "value": "$(PB_PipeBuildIdentifier)/", + "allowOverride": true }, "Pipeline.SourcesDirectory": { "value": "$(Build.BinariesDirectory)\\pipelineRepository" }, "PB_VstsAccountName": { - "value": "dagood" + "value": "dn-bot" }, "PB_VstsRepositoryName": { "value": "DotNet-CoreFX-Trusted", @@ -175,6 +251,14 @@ "value": null, "isSecret": true }, + "AzureContainerSymbolPackageDirectory": { + "value": "$(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(PB_ConfigurationGroup)\\symbols", + "allowOverride": true + }, + "OfficialBuildId": { + "value": "$(Build.BuildNumber)", + "allowOverride": true + }, "SourceVersion": { "value": "master", "allowOverride": true @@ -183,34 +267,39 @@ "value": "master", "allowOverride": true }, - "PB_AzureContainerSymbolPackageGlob": { - "value": "$(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(PB_ConfigurationGroup)\\symbols\\*.nupkg", + "FeedPublishArguments": { + "value": "$(PB_BuildOutputManifestArguments) /p:AccountKey=$(PB_PublishBlobFeedKey) /p:ExpectedFeedUrl=$(PB_PublishBlobFeedUrl) /p:ConfigurationGroup=$(PB_ConfigurationGroup)" + }, + "PB_PublishBlobFeedUrl": { + "value": "", "allowOverride": true }, - "PB_DotNetCoreShareDir": { - "value": "passed-by-pipebuild", - "allowOverride": true + "PB_PublishBlobFeedKey": { + "value": null, + "isSecret": true }, - "SymbolsProject": { - "value": "CLR" + "PB_PublishType": { + "value": "" }, - "SymbolsStatusMail": { - "value": "dagood;mawilkie" + "PB_BuildOutputManifestArguments": { + "value": "/p:ManifestBuildId=$(OfficialBuildId) /p:ManifestBranch=$(SourceBranch) /p:ManifestCommit=$(SourceVersion)" }, - "SymbolsUserName": { - "value": "dlab" + "PB_MsdlSymbolServerPath": { + "value": "https://microsoftpublicsymbols.artifacts.visualstudio.com/DefaultCollection" }, - "SymbolsRelease": { - "value": "rtm" + "PB_MsdlSymbolServerPAT": { + "value": null, + "isSecret": true }, - "SymbolsProductGroup": { - "value": "Visual_Studio" + "PB_SymwebSymbolServerPath": { + "value": "https://microsoft.artifacts.visualstudio.com/DefaultCollection" }, - "SymbolsProductName": { - "value": "dotnetcore" + "PB_SymwebSymbolServerPAT": { + "value": null, + "isSecret": true }, - "SymbolPublishDestinationDir": { - "value": "$(PB_DotNetCoreShareDir)\\$(PB_VstsRepositoryName)\\$(PB_Label)\\" + "PB_SymbolExpirationInDays": { + "value": "30" } }, "retentionRules": [ @@ -273,4 +362,4 @@ "state": "wellFormed", "revision": 418097642 } -} \ No newline at end of file +} diff --git a/external/corefx/buildpipeline/DotNet-Trusted-Publish.json b/external/corefx/buildpipeline/DotNet-Trusted-Publish.json index e6e765f3c3..8facc2013a 100644 --- a/external/corefx/buildpipeline/DotNet-Trusted-Publish.json +++ b/external/corefx/buildpipeline/DotNet-Trusted-Publish.json @@ -1,5 +1,28 @@ { "build": [ + { + "environment": {}, + "enabled": true, + "continueOnError": true, + "displayName": "run begin.ps1", + "timeoutInMinutes": 0, + "alwaysRun": true, + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "targetType": "inline", + "filePath": "", + "arguments": "", + "script": "if (Test-Path \"$Env:AgentToolsPath\\begin.ps1\") {\n \"$Env:AgentToolsPath\\begin.ps1 script found. Executing...\"\n & $Env:AgentToolsPath\\begin.ps1\n} else {\n \"$Env:AgentToolsPath\\begin.ps1 script does not exist. Moving on...\"\n}", + "errorActionPreference": "continue", + "failOnStderr": "false", + "ignoreLASTEXITCODE": "true", + "workingDirectory": "" + } + }, { "environment": {}, "enabled": true, @@ -8,7 +31,6 @@ "displayName": "Install Signing Plugin", "timeoutInMinutes": 0, "condition": "and(succeeded(), in(variables.PB_SignType, 'real', 'test'))", - "refName": "Task1", "task": { "id": "30666190-6959-11e5-9f96-f56098202fef", "versionSpec": "1.*", @@ -18,7 +40,8 @@ "signType": "real", "zipSources": "true", "version": "", - "feedSource": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json" + "feedSource": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json", + "esrpSigning": "$(PB_UseEsrpSigning)" } }, { @@ -28,7 +51,6 @@ "alwaysRun": false, "displayName": "Run script $(VS140COMNTOOLS)\\VsDevCmd.bat", "timeoutInMinutes": 0, - "refName": "Task2", "task": { "id": "bfc8bf76-e7ac-4a8c-9a55-a944a9f632fd", "versionSpec": "1.*", @@ -47,9 +69,8 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Fetch custom tooling (NuGet, EmbedIndex)", + "displayName": "Fetch custom tooling (NuGet)", "timeoutInMinutes": 0, - "refName": "Task3", "task": { "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", "versionSpec": "1.*", @@ -71,7 +92,6 @@ "alwaysRun": false, "displayName": "Set up pipeline-specific git repository", "timeoutInMinutes": 0, - "refName": "Task4", "task": { "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", "versionSpec": "1.*", @@ -87,13 +107,11 @@ } }, { - "environment": {}, "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "sync -ab", + "displayName": "Sync packages", "timeoutInMinutes": 0, - "refName": "Task5", "task": { "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", "versionSpec": "1.*", @@ -104,55 +122,10 @@ "scriptName": "", "arguments": "$(PB_CloudDropAccountName) $(CloudDropAccessToken) $(PB_Label)", "workingFolder": "$(Pipeline.SourcesDirectory)", - "inlineScript": "param($account, $token, $container)\n.\\sync.cmd -ab -- /p:CloudDropAccountName=$account /p:CloudDropAccessToken=$token /p:ContainerName=$container", + "inlineScript": "param($account, $token, $container)\n.\\sync.cmd -ab -- /v:D /p:CloudDropAccountName=$account /p:CloudDropAccessToken=$token /p:ContainerName=$container", "failOnStandardError": "false" } }, - { - "environment": {}, - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Inject signed symbol catalogs", - "timeoutInMinutes": 0, - "condition": "succeeded()", - "refName": "Task6", - "task": { - "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "scriptType": "inlineScript", - "scriptName": "", - "arguments": "-ConfigGroup $(PB_ConfigurationGroup) -SymPkgGlob $(PB_AzureContainerSymbolPackageGlob) -PipelineSrcDir $(Pipeline.SourcesDirectory) -SignType $(PB_SignType)", - "workingFolder": "$(Pipeline.SourcesDirectory)", - "inlineScript": "param($ConfigGroup, $SymPkgGlob, $PipelineSrcDir, $SignType=\"unset\" )\n\nif ($SignType.ToLower() -ne \"real\" ) { Write-host \"Chose not to sign symbol catalogs\"; exit }\n\n\n.\\build-managed.cmd -- /t:InjectSignedSymbolCatalogIntoSymbolPackages `\n/p:SymbolPackagesToPublishGlob=$PipelineSrcDir\\packages\\AzureTransfer\\$ConfigGroup\\$SymPkgGlob `\n/p:SymbolCatalogCertificateId=400", - "failOnStandardError": "true" - } - }, - { - "environment": {}, - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Index symbol packages", - "timeoutInMinutes": 0, - "refName": "Task7", - "task": { - "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "scriptType": "inlineScript", - "scriptName": "", - "arguments": "-ConfigGroup $(PB_ConfigurationGroup) -SymPkgGlob $(PB_AzureContainerSymbolPackageGlob) -PipelineSrcDir $(Pipeline.SourcesDirectory)", - "workingFolder": "", - "inlineScript": "param($ConfigGroup, $SymPkgGlob, $PipelineSrcDir)\nif ($ConfigGroup -ne \"Release\") { exit }\n\n& $env:Build_SourcesDirectory\\scripts\\DotNet-Trusted-Publish\\Embed-Index.ps1 `\n $PipelineSrcDir\\packages\\AzureTransfer\\$ConfigGroup\\$SymPkgGlob `\n $env:Build_StagingDirectory\\IndexedSymbolPackages", - "failOnStandardError": "true" - } - }, { "environment": {}, "enabled": true, @@ -160,7 +133,6 @@ "alwaysRun": false, "displayName": "Generate Version Assets", "timeoutInMinutes": 0, - "refName": "Task8", "task": { "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", "versionSpec": "1.*", @@ -175,6 +147,26 @@ "failOnStandardError": "true" } }, + { + "environment": {}, + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Sign Packages", + "timeoutInMinutes": 0, + "condition": "and(succeeded(), in(variables.PB_SignType, 'real', 'test'), eq(variables.PB_ConfigurationGroup, 'Release'))", + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "msbuild", + "arguments": "src\\publish.proj /t:SignPackages /p:SignType=$(PB_SignType) /p:ConfigurationGroup=$(PB_ConfigurationGroup)", + "workingFolder": "$(Pipeline.SourcesDirectory)", + "failOnStandardError": "false" + } + }, { "environment": {}, "enabled": true, @@ -183,7 +175,6 @@ "displayName": "packages -> dotnet.myget.org", "timeoutInMinutes": 0, "condition": "and(succeeded(), contains(variables.PB_PublishType, 'myget'), eq(variables.PB_ConfigurationGroup, 'Release'))", - "refName": "Task9", "task": { "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", "versionSpec": "1.*", @@ -192,7 +183,7 @@ "inputs": { "scriptType": "inlineScript", "scriptName": "", - "arguments": "-ApiKey $(MyGetApiKey) -PackagesGlob $(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(PB_ConfigurationGroup)\\$(PB_AzureContainerPackageGlob) -MyGetFeedUrl $(PB_MyGetFeedUrl)", + "arguments": "-ApiKey $(MyGetApiKey) -PackagesGlob $(AzureContainerPackageDirectory)\\$(AzureContainerPackageGlob) -MyGetFeedUrl $(PB_MyGetFeedUrl)", "workingFolder": "$(Pipeline.SourcesDirectory)", "inlineScript": "param($ApiKey, $PackagesGlob, $MyGetFeedUrl)\n.\\build-managed.cmd -- /t:NuGetPush /v:Normal `\n/p:NuGetExePath=$env:CustomNuGetPath `\n/p:NuGetApiKey=$ApiKey `\n/p:NuGetSource=$MyGetFeedUrl `\n/p:PackagesGlob=$PackagesGlob", "failOnStandardError": "true" @@ -206,7 +197,6 @@ "displayName": "packages -> Blob Feed", "timeoutInMinutes": 0, "condition": "and(succeeded(), contains(variables.PB_PublishType, 'blob'), eq(variables.PB_ConfigurationGroup, 'Release'))", - "refName": "CmdLine1", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -219,50 +209,6 @@ "failOnStandardError": "false" } }, - { - "environment": {}, - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "symbol packages -> dotnet.myget.org", - "timeoutInMinutes": 0, - "condition": "and(succeeded(), contains(variables.PB_PublishType, 'myget'), eq(variables.PB_ConfigurationGroup, 'Release'))", - "refName": "Task11", - "task": { - "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "scriptType": "inlineScript", - "scriptName": "", - "arguments": "-ApiKey $(MyGetApiKey) -ConfigurationGroup $(PB_ConfigurationGroup) -PackagesGlob $(Build.StagingDirectory)\\IndexedSymbolPackages\\*.nupkg -MyGetFeedUrl $(PB_MyGetFeedUrl)", - "workingFolder": "$(Pipeline.SourcesDirectory)", - "inlineScript": "param($ApiKey, $ConfigurationGroup, $PackagesGlob, $MyGetFeedUrl)\nif ($env:SourceBranch.StartsWith(\"release/\")) { exit }\n\n.\\build-managed.cmd -- /t:NuGetPush /v:Normal `\n/p:NuGetExePath=$env:CustomNuGetPath `\n/p:NuGetApiKey=$ApiKey `\n/p:NuGetSource=$MyGetFeedUrl `\n/p:PackagesGlob=$PackagesGlob", - "failOnStandardError": "true" - } - }, - { - "environment": {}, - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "symbol packages -> Blob Feed", - "timeoutInMinutes": 0, - "condition": "and(succeeded(), contains(variables.PB_PublishType, 'blob'), eq(variables.PB_ConfigurationGroup, 'Release'))", - "refName": "CmdLine2", - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "msbuild", - "arguments": "src\\publish.proj /t:PublishSymbolsToAzureBlobFeed /p:PublishSymbols=\"true\" $(FeedPublishArguments)", - "workingFolder": "$(Pipeline.SourcesDirectory)", - "failOnStandardError": "false" - } - }, { "environment": {}, "enabled": true, @@ -271,7 +217,6 @@ "displayName": "Update versions repository", "timeoutInMinutes": 0, "condition": "and(succeeded(), contains(variables.PB_PublishType, 'versions'), eq(variables.PB_ConfigurationGroup, 'Release'))", - "refName": "Task13", "task": { "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", "versionSpec": "1.*", @@ -280,7 +225,7 @@ "inputs": { "scriptType": "inlineScript", "scriptName": "", - "arguments": "-ghAuthToken $(PB_DotNetBuildBotAccessToken) -root $(Pipeline.SourcesDirectory) -cg $(PB_ConfigurationGroup) -fullPkgGlob $(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(PB_ConfigurationGroup)\\$(PB_AzureContainerPackageGlob) ", + "arguments": "-ghAuthToken $(PB_DotNetBuildBotAccessToken) -root $(Pipeline.SourcesDirectory) -cg $(PB_ConfigurationGroup) -fullPkgGlob $(AzureContainerPackageDirectory)\\$(AzureContainerPackageGlob)", "workingFolder": "", "inlineScript": "param($ghAuthToken, $root, $cg, $fullPkgGlob, $SignType=\"unset\")\nif ($cg -ne \"Release\" ) { exit }\ncd $root\n. $root\\build-managed.cmd -- /t:UpdatePublishedVersions `\n/p:GitHubUser=dotnet-helix-bot `\n/p:GitHubEmail=dotnet-helix-bot@microsoft.com `\n/p:GitHubAuthToken=$ghAuthToken `\n/p:VersionsRepoOwner=$env:PB_VersionsRepoOwner `\n/p:VersionsRepo=versions `\n/p:VersionsRepoPath=build-info/dotnet/$env:PB_GitHubRepositoryName/$env:SourceBranch `\n/p:ShippedNuGetPackageGlobPath=$fullPkgGlob", "failOnStandardError": "true" @@ -293,7 +238,6 @@ "alwaysRun": false, "displayName": "Get Build Number", "timeoutInMinutes": 0, - "refName": "Task14", "task": { "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", "versionSpec": "1.*", @@ -315,7 +259,6 @@ "alwaysRun": false, "displayName": "Publish to Artifact Services Drop", "timeoutInMinutes": 0, - "refName": "Task15", "task": { "id": "f9d96d25-0c81-4e77-8282-1ad1f785cbb4", "versionSpec": "0.*", @@ -341,13 +284,35 @@ "displayName": "Send Telemetry", "timeoutInMinutes": 0, "condition": "always()", - "refName": "Task16", "task": { "id": "521a94ea-9e68-468a-8167-6dcf361ea776", "versionSpec": "1.*", "definitionType": "task" }, "inputs": {} + }, + { + "environment": {}, + "enabled": true, + "continueOnError": true, + "alwaysRun": true, + "displayName": "run end.ps1", + "timeoutInMinutes": 0, + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "targetType": "inline", + "filePath": "", + "arguments": "", + "script": "if (Test-Path \"$Env:AgentToolsPath\\end.ps1\") {\n \"$Env:AgentToolsPath\\end.ps1 script found. Executing...\"\n & $Env:AgentToolsPath\\end.ps1\n} else {\n \"$Env:AgentToolsPath\\end.ps1 script does not exist. Moving on...\"\n}", + "errorActionPreference": "continue", + "failOnStderr": "false", + "ignoreLASTEXITCODE": "true", + "workingDirectory": "" + } } ], "options": [ @@ -388,25 +353,23 @@ "allowOverride": true }, "PB_ConfigurationGroup": { - "value": "Debug", + "value": "Release", "allowOverride": true }, - "TeamName": { - "value": "DotNetCore" - }, "PB_CloudDropAccountName": { - "value": "dotnetbuildoutput" + "value": "dotnetbuildoutput", + "allowOverride": true }, "CloudDropAccessToken": { "value": null, "isSecret": true }, - "OfficialBuildId": { + "PB_Label": { "value": "$(Build.BuildNumber)", "allowOverride": true }, - "PB_Label": { - "value": "$(Build.BuildNumber)", + "PB_BlobNamePrefix": { + "value": "$(PB_PipeBuildIdentifier)/", "allowOverride": true }, "PB_MyGetFeedUrl": { @@ -417,9 +380,8 @@ "value": null, "isSecret": true }, - "VstsPat": { - "value": null, - "isSecret": true + "TeamName": { + "value": "DotNetCore" }, "PB_VstsAuthedNuGetConfigPath": { "value": "$(Build.StagingDirectory)\\VstsAuthed.NuGet.Config" @@ -450,15 +412,9 @@ "PB_ManualReleaseName": { "value": "" }, - "OfficialBuild": { - "value": "fake-test" - }, "PB_BranchGroup": { "value": "" }, - "PB_SymbolRoot": { - "value": "\\\\fake\\symbol\\root" - }, "PB_DefinitionNames": { "value": "Fake-Windows Fake-Windows-Native" }, @@ -486,6 +442,18 @@ "value": null, "isSecret": true }, + "AzureContainerPackageDirectory": { + "value": "$(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(PB_ConfigurationGroup)", + "allowOverride": true + }, + "AzureContainerPackageGlob": { + "value": "*.nupkg", + "allowOverride": true + }, + "OfficialBuildId": { + "value": "$(Build.BuildNumber)", + "allowOverride": true + }, "SourceVersion": { "value": "master", "allowOverride": true @@ -497,25 +465,10 @@ "FeedPublishArguments": { "value": "$(PB_BuildOutputManifestArguments) /p:AccountKey=$(PB_PublishBlobFeedKey) /p:ExpectedFeedUrl=$(PB_PublishBlobFeedUrl) /p:ConfigurationGroup=$(PB_ConfigurationGroup)" }, - "PB_AzureContainerPackageGlob": { - "value": "*.nupkg", - "allowOverride": true - }, - "PB_AzureContainerSymbolPackageGlob": { - "value": "symbols\\*.nupkg", - "allowOverride": true - }, "PB_GitHubRepositoryName": { "value": "corefx", "allowOverride": true }, - "PB_UseLegacyBuildScripts": { - "value": "false", - "allowOverride": true - }, - "PB_ToolPackageSource": { - "value": "https://www.myget.org/F/dagood-test-buildtools/api/v3/index.json" - }, "PB_PublishBlobFeedUrl": { "value": "", "allowOverride": true @@ -529,6 +482,10 @@ }, "PB_BuildOutputManifestArguments": { "value": "/p:ManifestBuildId=$(OfficialBuildId) /p:ManifestBranch=$(SourceBranch) /p:ManifestCommit=$(SourceVersion)" + }, + "PB_UseEsrpSigning": { + "value": "false", + "allowOverride": true } }, "retentionRules": [ diff --git a/external/corefx/buildpipeline/DotNet-Trusted-Tests-Publish.json b/external/corefx/buildpipeline/DotNet-Trusted-Tests-Publish.json index b794ec6ab2..7b6d50b462 100644 --- a/external/corefx/buildpipeline/DotNet-Trusted-Tests-Publish.json +++ b/external/corefx/buildpipeline/DotNet-Trusted-Tests-Publish.json @@ -1,5 +1,28 @@ { "build": [ + { + "environment": {}, + "enabled": true, + "continueOnError": true, + "displayName": "run begin.ps1", + "timeoutInMinutes": 0, + "alwaysRun": true, + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "targetType": "inline", + "filePath": "", + "arguments": "", + "script": "if (Test-Path \"$Env:AgentToolsPath\\begin.ps1\") {\n \"$Env:AgentToolsPath\\begin.ps1 script found. Executing...\"\n & $Env:AgentToolsPath\\begin.ps1\n} else {\n \"$Env:AgentToolsPath\\begin.ps1 script does not exist. Moving on...\"\n}", + "errorActionPreference": "continue", + "failOnStderr": "false", + "ignoreLASTEXITCODE": "true", + "workingDirectory": "" + } + }, { "enabled": true, "continueOnError": false, @@ -113,6 +136,29 @@ "detailedLog": "false", "usePat": "false" } + }, + { + "environment": {}, + "enabled": true, + "continueOnError": true, + "alwaysRun": true, + "displayName": "run end.ps1", + "timeoutInMinutes": 0, + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "targetType": "inline", + "filePath": "", + "arguments": "", + "script": "if (Test-Path \"$Env:AgentToolsPath\\end.ps1\") {\n \"$Env:AgentToolsPath\\end.ps1 script found. Executing...\"\n & $Env:AgentToolsPath\\end.ps1\n} else {\n \"$Env:AgentToolsPath\\end.ps1 script does not exist. Moving on...\"\n}", + "errorActionPreference": "continue", + "failOnStderr": "false", + "ignoreLASTEXITCODE": "true", + "workingDirectory": "" + } } ], "options": [ @@ -261,4 +307,4 @@ "state": "wellFormed", "revision": 418097423 } -} \ No newline at end of file +} diff --git a/external/corefx/buildpipeline/alpine.3.6.groovy b/external/corefx/buildpipeline/linux-musl.groovy similarity index 88% rename from external/corefx/buildpipeline/alpine.3.6.groovy rename to external/corefx/buildpipeline/linux-musl.groovy index 08ed7cb4af..7f5b41103f 100644 --- a/external/corefx/buildpipeline/alpine.3.6.groovy +++ b/external/corefx/buildpipeline/linux-musl.groovy @@ -17,13 +17,13 @@ simpleDockerNode('microsoft/dotnet-buildtools-prereqs:alpine-3.6-3148f11-2017111 } stage ('Generate version assets') { // Generate the version assets. Do we need to even do this for non-official builds? - sh "./build-managed.sh -runtimeos=alpine.3.6 -- /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true /p:PortableBuild=false" + sh "./build-managed.sh -runtimeos=linux-musl -- /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true /p:PortableBuild=false" } stage ('Sync') { - sh "./sync.sh -p -runtimeos=alpine.3.6 -- /p:ArchGroup=x64 /p:PortableBuild=false" + sh "./sync.sh -p -runtimeos=linux-musl -- /p:ArchGroup=x64 /p:PortableBuild=false" } stage ('Build Product') { - sh "./build.sh -buildArch=x64 -runtimeos=alpine.3.6 -${params.CGroup} -- /p:PortableBuild=false" + sh "./build.sh -buildArch=x64 -runtimeos=linux-musl -${params.CGroup} -- /p:PortableBuild=false" } stage ('Build Tests') { def additionalArgs = '' diff --git a/external/corefx/buildpipeline/linux.arm64.groovy b/external/corefx/buildpipeline/linux.arm64.groovy new file mode 100644 index 0000000000..9020649f46 --- /dev/null +++ b/external/corefx/buildpipeline/linux.arm64.groovy @@ -0,0 +1,50 @@ +@Library('dotnet-ci') _ + +// Incoming parameters. Access with "params.". +// Note that the parameters will be set as env variables so we cannot use names that conflict +// with the engineering system parameter names. +// CGroup - Build configuration. +// TestOuter - If true, runs outerloop, if false runs just innerloop + +def submittedHelixJson = null + +simpleDockerNode('microsoft/dotnet-buildtools-prereqs:ubuntu-16.04-cross-arm64-a3ae44b-20180315221921') { + stage ('Checkout source') { + checkoutRepo() + } + + def logFolder = getLogFolder() + + stage ('Initialize tools') { + // Init tools + sh './init-tools.sh' + } + stage ('Generate version assets') { + // Generate the version assets. Do we need to even do this for non-official builds? + sh "./build-managed.sh -- /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true" + } + stage ('Sync') { + sh "./sync.sh -p -BuildTests=false -- /p:ArchGroup=arm64" + } + // For arm64 cross builds we split the 'Build Product' build.sh command into 3 separate parts + stage ('Build Native') { + sh """ + export ROOTFS_DIR=/crossrootfs/arm64 + ./build-native.sh -buildArch=arm64 -${params.CGroup} + """ + } + stage ('Build Managed') { + // Cross build builds Linux Managed components using x64 target + // We do not want x64 packages + sh "./build-managed.sh -BuildPackages=false -buildArch=x64 -${params.CGroup}" + } + stage ('Build Packages') { + sh "./build-packages.sh -buildArch=arm64 -${params.CGroup}" + } + + // TODO: Build Tests for arm64 when possible + + // TODO: Add submission for Helix testing once we have queue for arm64 Linux working +} + +// TODO: Add "Execute tests" stage once we have queue for arm64 Linux working diff --git a/external/corefx/buildpipeline/linux.groovy b/external/corefx/buildpipeline/linux.groovy index c510d48fa0..80681ea542 100644 --- a/external/corefx/buildpipeline/linux.groovy +++ b/external/corefx/buildpipeline/linux.groovy @@ -47,16 +47,17 @@ simpleDockerNode('microsoft/dotnet-buildtools-prereqs:rhel7_prereqs_2') { // Get the user that should be associated with the submission def helixCreator = getUser() // Target queues - def targetHelixQueues = ['Centos.73.Amd64.Open', - 'RedHat.73.Amd64.Open', + def targetHelixQueues = ['Centos.74.Amd64.Open', + 'RedHat.74.Amd64.Open', 'Debian.87.Amd64.Open', 'Ubuntu.1404.Amd64.Open', 'Ubuntu.1604.Amd64.Open', - 'opensuse.422.amd64.open', - 'fedora.25.amd64.Open',] + 'Ubuntu.1804.Amd64.Open', + 'OpenSuse.423.Amd64.Open', + 'Fedora.26.Amd64.Open',] if (params.TestOuter) { - targetHelixQueues += ['Debian.90.Amd64.Open', - 'Fedora.26.Amd64.Open', + targetHelixQueues += ['Debian.9.Amd64.Open', + 'Fedora.27.Amd64.Open', 'SLES.12.Amd64.Open',] } diff --git a/external/corefx/buildpipeline/pipeline.json b/external/corefx/buildpipeline/pipeline.json index ad222739f5..edbda97fd9 100644 --- a/external/corefx/buildpipeline/pipeline.json +++ b/external/corefx/buildpipeline/pipeline.json @@ -5,6 +5,11 @@ "Type": "VSTS", "BaseUrl": "https://devdiv.visualstudio.com/DefaultCollection" }, + "PrivateRun": { + "property-overrides": { + "PB_PublishType": "" + } + }, "Pipelines": [ { "Name": "Trusted-All-Linux", @@ -15,10 +20,10 @@ "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { "PB_DockerTag": "centos-7-d485f41-20173404063424", - "PB_BuildArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -stripSymbols", + "PB_BuildArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -stripSymbols -- /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)", "PB_BuildTestsArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -SkipTests -Outerloop -- /p:ArchiveTests=true /p:EnableDumpling=true", "PB_SyncArguments": "-p -- /p:ArchGroup=x64 /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)", - "PB_TargetQueue": "Centos.73.Amd64+RedHat.72.Amd64+RedHat.73.Amd64+Debian.87.Amd64+Debian.90.Amd64+Ubuntu.1404.Amd64+Ubuntu.1604.Amd64+Ubuntu.1704.Amd64+Ubuntu.1710.Amd64+suse.422.amd64+SLES.12.Amd64+fedora.25.amd64+Fedora.26.Amd64", + "PB_TargetQueue": "Centos.73.Amd64+Centos.74.Amd64+RedHat.73.Amd64+RedHat.74.Amd64+Debian.87.Amd64+Debian.90.Amd64+Ubuntu.1404.Amd64+Ubuntu.1604.Amd64+Ubuntu.1710.Amd64+Ubuntu.1804.Amd64+OpenSuse.423.Amd64+SLES.12.Amd64+Fedora.26.Amd64+Fedora.27.Amd64", "PB_CreateHelixArguments": "/p:ArchGroup=x64 /p:ConfigurationGroup=$(PB_ConfigurationGroup) /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Linux" }, "ReportingParameters": { @@ -31,7 +36,7 @@ "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { "PB_DockerTag": "centos-6-376e1a3-20174311014331", - "PB_BuildArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -stripSymbols -RuntimeOS=rhel.6 -- /p:PortableBuild=false", + "PB_BuildArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -stripSymbols -RuntimeOS=rhel.6 -- /p:PortableBuild=false /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)", "PB_BuildTestsArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -SkipTests -Outerloop -RuntimeOS=rhel.6 -- /p:ArchiveTests=true /p:EnableDumpling=true /p:PortableBuild=false", "PB_SyncArguments": "-p -RuntimeOS=rhel.6 -- /p:ArchGroup=x64 /p:PortableBuild=false /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)", "PB_TargetQueue": "RedHat.69.Amd64", @@ -47,16 +52,14 @@ "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { "PB_DockerTag": "alpine-3.6-3148f11-20171119021156", - "PB_BuildArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -BuildTests=false -stripSymbols -RuntimeOS=alpine.3.6 -- /p:PortableBuild=false", - "PB_SkipTestBuild" : "true", - "PB_BuildTestsArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -SkipTests -Outerloop -RuntimeOS=alpine.3.6 -- /p:ArchiveTests=false /p:EnableDumpling=true /p:PortableBuild=false", - "PB_SyncArguments": "-p -BuildTests=false -RuntimeOS=alpine.3.6 -- /p:ArchGroup=x64 /p:PortableBuild=false /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)", + "PB_BuildArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -stripSymbols -RuntimeOS=linux-musl -- /p:PortableBuild=false /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)", + "PB_BuildTestsArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -SkipTests -Outerloop -RuntimeOS=linux-musl -- /p:ArchiveTests=true /p:EnableDumpling=true /p:PortableBuild=false", + "PB_SyncArguments": "-p -BuildTests=false -RuntimeOS=linux-musl -- /p:ArchGroup=x64 /p:PortableBuild=false /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)", "PB_TargetQueue": "Alpine.36.Amd64", - "PB_EnableCloudTest" : "false", - "PB_CreateHelixArguments": "/p:EnableCloudTest=$(PB_EnableCloudTest) /p:ArchGroup=x64 /p:ConfigurationGroup=$(PB_ConfigurationGroup) /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Linux" + "PB_CreateHelixArguments": "/p:ArchGroup=x64 /p:ConfigurationGroup=$(PB_ConfigurationGroup) /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Linux" }, "ReportingParameters": { - "OperatingSystem": "Alpine3.6", + "OperatingSystem": "Linux-musl", "Platform": "x64", "Type": "build/product/" } @@ -66,7 +69,7 @@ "Parameters": { "PB_DockerTag": "ubuntu-14.04-cross-0cd4667-20170319080304", "PB_Architecture": "arm", - "PB_BuildArguments": "-buildArch=arm -$(PB_ConfigurationGroup) -stripSymbols", + "PB_BuildArguments": "-buildArch=arm -$(PB_ConfigurationGroup) -stripSymbols -- /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)", "PB_SyncArguments": "-p -- /p:ArchGroup=arm /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)" }, "ReportingParameters": { @@ -74,6 +77,21 @@ "Platform": "arm", "Type": "build/product/" } + }, + { + "Name": "DotNet-CoreFx-Trusted-Linux-Crossbuild", + "Parameters": { + "PB_DockerTag": "ubuntu-16.04-cross-arm64-a3ae44b-20180315221921", + "PB_Architecture": "arm64", + "PB_BuildArguments": "-buildArch=arm64 -$(PB_ConfigurationGroup) -stripSymbols -- /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)", + "PB_BuildManagedArguments": "-BuildPackages=false -buildArch=arm64 -$(PB_ConfigurationGroup) -stripSymbols -- /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)", + "PB_SyncArguments": "-p -BuildTests=false -- /p:ArchGroup=arm64 /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)" + }, + "ReportingParameters": { + "OperatingSystem": "Linux", + "Platform": "arm64", + "Type": "build/product/" + } } ] }, @@ -91,7 +109,7 @@ "Definitions": [{ "Name": "DotNet-CoreFx-Trusted-OSX", "Parameters": { - "PB_BuildArguments": "-buildArch=x64 -$(PB_ConfigurationGroup)", + "PB_BuildArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -- /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)", "PB_SyncArguments": "-p -- /p:ArchGroup=x64 /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)", "PB_TargetQueue": "OSX.1012.Amd64+OSX.1013.Amd64", "PB_CreateHelixArguments": "/p:ArchGroup=x64 /p:ConfigurationGroup=$(PB_ConfigurationGroup) /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=OSX" @@ -117,7 +135,7 @@ "Name": "DotNet-CoreFx-Trusted-Windows", "Parameters": { "PB_Platform": "arm", - "PB_BuildArguments": "-buildArch=arm -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10", + "PB_BuildArguments": "-buildArch=arm -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10 /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)", "PB_BuildTestsArguments": "-buildArch=arm -$(PB_ConfigurationGroup) -SkipTests -Outerloop -- /p:RuntimeOS=win10 /p:ArchiveTests=true", "PB_SyncArguments": "-p -- /p:ArchGroup=arm /p:RuntimeOS=win10 /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)", "PB_CreateHelixArguments": "/p:ArchGroup=arm /p:ConfigurationGroup=$(PB_ConfigurationGroup) /p:EnableCloudTest=false /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Windows_NT" @@ -133,7 +151,7 @@ "Name": "DotNet-CoreFx-Trusted-Windows", "Parameters": { "PB_Platform": "arm64", - "PB_BuildArguments": "-buildArch=arm64 -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10", + "PB_BuildArguments": "-buildArch=arm64 -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10 /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)", "PB_BuildTestsArguments": "-buildArch=arm64 -$(PB_ConfigurationGroup) -SkipTests -Outerloop -- /p:RuntimeOS=win10 /p:ArchiveTests=true", "PB_SyncArguments": "-p -- /p:ArchGroup=arm64 /p:RuntimeOS=win10 /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)", "PB_CreateHelixArguments": "/p:ArchGroup=arm64 /p:ConfigurationGroup=$(PB_ConfigurationGroup) /p:EnableCloudTest=false /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Windows_NT" @@ -149,7 +167,7 @@ "Name": "DotNet-CoreFx-Trusted-Windows", "Parameters": { "PB_Platform": "x64", - "PB_BuildArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10", + "PB_BuildArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10 /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)", "PB_BuildTestsArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -SkipTests -Outerloop -- /p:RuntimeOS=win10 /p:ArchiveTests=true", "PB_SyncArguments": "-p -- /p:ArchGroup=x64 /p:RuntimeOS=win10 /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)", "PB_TargetQueue": "Windows.10.Amd64+Windows.10.Nano.Amd64+Windows.10.Amd64.Core+Windows.7.Amd64+Windows.81.Amd64", @@ -166,7 +184,7 @@ "Name": "DotNet-CoreFx-Trusted-Windows", "Parameters": { "PB_Platform": "x86", - "PB_BuildArguments": "-buildArch=x86 -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10", + "PB_BuildArguments": "-buildArch=x86 -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10 /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)", "PB_BuildTestsArguments": "-buildArch=x86 -$(PB_ConfigurationGroup) -SkipTests -Outerloop -- /p:RuntimeOS=win10 /p:ArchiveTests=true", "PB_SyncArguments": "-p -- /p:ArchGroup=x86 /p:RuntimeOS=win10 /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)", "PB_TargetQueue": "Windows.10.Amd64+Windows.10.Amd64.Core+Windows.7.Amd64+Windows.81.Amd64", @@ -299,7 +317,7 @@ "Name": "DotNet-CoreFx-Trusted-Windows-NoTest", "Parameters": { "PB_Platform": "x64", - "PB_BuildArguments": "-allConfigurations -buildArch=x64 -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10", + "PB_BuildArguments": "-allConfigurations -buildArch=x64 -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10 /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)", "PB_SyncArguments": "-p -- /p:ArchGroup=x64 /p:RuntimeOS=win10 /p:BuildAllConfigurations=true /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)" }, "ReportingParameters": { @@ -313,10 +331,10 @@ "Name": "DotNet-CoreFx-Trusted-Windows", "Parameters": { "PB_Platform": "x64", - "PB_BuildArguments": "-framework=netfx -buildArch=x64 -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10", + "PB_BuildArguments": "-framework=netfx -buildArch=x64 -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10 /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)", "PB_BuildTestsArguments": "-framework=netfx -buildArch=x64 -$(PB_ConfigurationGroup) -SkipTests -Outerloop -- /p:RuntimeOS=win10 /p:ArchiveTests=true", "PB_SyncArguments": "-p -- /p:ArchGroup=x64 /p:RuntimeOS=win10 /p:TargetGroup=netfx /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)", - "PB_TargetQueue": "Windows.10.Amd64", + "PB_TargetQueue": "Windows.10.Amd64.ClientRS2", "PB_CreateHelixArguments": "/p:ArchGroup=x64 /p:TargetGroup=netfx /p:ConfigurationGroup=$(PB_ConfigurationGroup) /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Windows_NT /p:\"HelixJobType=test/functional/desktop/cli/\"" }, "ReportingParameters": { @@ -330,10 +348,10 @@ "Name": "DotNet-CoreFx-Trusted-Windows", "Parameters": { "PB_Platform": "x86", - "PB_BuildArguments": "-framework=netfx -buildArch=x86 -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10", + "PB_BuildArguments": "-framework=netfx -buildArch=x86 -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10 /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)", "PB_BuildTestsArguments": "-framework=netfx -buildArch=x86 -$(PB_ConfigurationGroup) -SkipTests -Outerloop -- /p:RuntimeOS=win10 /p:ArchiveTests=true", "PB_SyncArguments": "-p -- /p:ArchGroup=x86 /p:RuntimeOS=win10 /p:TargetGroup=netfx /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)", - "PB_TargetQueue": "Windows.10.Amd64", + "PB_TargetQueue": "Windows.10.Amd64.ClientRS2", "PB_CreateHelixArguments": "/p:ArchGroup=x86 /p:TargetGroup=netfx /p:ConfigurationGroup=$(PB_ConfigurationGroup) /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Windows_NT /p:\"HelixJobType=test/functional/desktop/cli/\"" }, "ReportingParameters": { diff --git a/external/corefx/buildpipeline/pipelinejobs.groovy b/external/corefx/buildpipeline/pipelinejobs.groovy index 5f2243a4bb..9173030414 100644 --- a/external/corefx/buildpipeline/pipelinejobs.groovy +++ b/external/corefx/buildpipeline/pipelinejobs.groovy @@ -15,15 +15,17 @@ def branch = GithubBranchName // ************************** def linPipeline = Pipeline.createPipelineForGithub(this, project, branch, 'buildpipeline/linux.groovy') +def linArm64Pipeline = Pipeline.createPipelineForGithub(this, project, branch, 'buildpipeline/linux.arm64.groovy') def centos6Pipeline = Pipeline.createPipelineForGithub(this, project, branch, 'buildpipeline/centos.6.groovy') -def alpine36Pipeline = Pipeline.createPipelineForGithub(this, project, branch, 'buildpipeline/alpine.3.6.groovy') +def linmuslPipeline = Pipeline.createPipelineForGithub(this, project, branch, 'buildpipeline/linux-musl.groovy') def osxPipeline = Pipeline.createPipelineForGithub(this, project, branch, 'buildpipeline/osx.groovy') def winPipeline = Pipeline.createPipelineForGithub(this, project, branch, 'buildpipeline/windows.groovy') def configurations = [ ['TGroup':"netcoreapp", 'Pipeline':linPipeline, 'Name':'Linux' ,'ForPR':"Release-x64", 'Arch':['x64']], + ['TGroup':"netcoreapp", 'Pipeline':linArm64Pipeline, 'Name':'Linux' ,'ForPR':"Release-arm64", 'Arch':['arm64']], ['TGroup':"netcoreapp", 'Pipeline':centos6Pipeline, 'Name':'CentOS.6' ,'ForPR':"", 'Arch':['x64']], - ['TGroup':"netcoreapp", 'Pipeline':alpine36Pipeline, 'Name':'Alpine.3.6' ,'ForPR':"Debug-x64", 'Arch':['x64']], + ['TGroup':"netcoreapp", 'Pipeline':linmuslPipeline, 'Name':'Linux-musl' ,'ForPR':"Debug-x64", 'Arch':['x64']], ['TGroup':"netcoreapp", 'Pipeline':osxPipeline, 'Name':'OSX', 'ForPR':"Debug-x64", 'Arch':['x64']], ['TGroup':"netcoreapp", 'Pipeline':winPipeline, 'Name':'Windows' , 'ForPR':"Debug-x64|Release-x86"], ['TGroup':"netfx", 'Pipeline':winPipeline, 'Name':'NETFX', 'ForPR':"Release-x86"], diff --git a/external/corefx/buildpipeline/windows.groovy b/external/corefx/buildpipeline/windows.groovy index a5b9b758e6..cd32886f6a 100644 --- a/external/corefx/buildpipeline/windows.groovy +++ b/external/corefx/buildpipeline/windows.groovy @@ -8,7 +8,7 @@ // TestOuter - If true, runs outerloop, if false runs just innerloop def submittedHelixJson = null -def submitToHelix = (params.TGroup == 'netcoreapp' || params.TGroup == 'uap') +def submitToHelix = (params.TGroup == 'netcoreapp' || params.TGroup == 'netfx') simpleNode('Windows_NT','latest') { stage ('Checkout source') { @@ -23,7 +23,6 @@ simpleNode('Windows_NT','latest') { else { framework = "-framework:${params.TGroup}" } - def buildTests = (params.TGroup != 'all') stage ('Initialize tools') { // Init tools @@ -38,21 +37,24 @@ simpleNode('Windows_NT','latest') { stage ('Build Product') { bat ".\\build.cmd ${framework} -buildArch=${params.AGroup} -${params.CGroup} -- /p:RuntimeOS=win10" } - if (buildTests) { - stage ('Build Tests') { - def additionalArgs = '' - def archiveTests = 'false' - if (params.TestOuter) { - additionalArgs += ' -Outerloop' - } - if (submitToHelix) { - archiveTests = 'true' - } - if (submitToHelix || params.TGroup == 'uapaot') { - additionalArgs += ' -SkipTests' - } + stage ('Build Tests') { + def additionalArgs = '' + def archiveTests = 'false' + if (params.TestOuter) { + additionalArgs += ' -Outerloop' + } + if (submitToHelix) { + archiveTests = 'true' + } + if (submitToHelix || params.TGroup == 'uap' || params.TGroup == 'uapaot') { + additionalArgs += ' -SkipTests' + } + if (params.TGroup != 'all') { bat ".\\build-tests.cmd ${framework} -buildArch=${params.AGroup} -${params.CGroup}${additionalArgs} -- /p:RuntimeOS=win10 /p:ArchiveTests=${archiveTests}" } + else { + bat ".\\build-tests.cmd ${framework} -${params.CGroup}${additionalArgs}" + } } if (submitToHelix) { stage ('Submit To Helix For Testing') { @@ -72,11 +74,14 @@ simpleNode('Windows_NT','latest') { { targetHelixQueues = ['Windows.10.Amd64.Open', 'Windows.7.Amd64.Open', - 'Windows.81.Amd64.Open'] + 'Windows.81.Amd64.Open',] if (params.AGroup == 'x64') { targetHelixQueues += ['Windows.10.Nano.Amd64.Open'] } - } else if (params.TGroup == 'uap') { + if (params.TestOuter) { + targetHelixQueues += ['Windows.10.Amd64.ClientRS3.ES.Open'] + } + } else if (params.TGroup == 'uap' || params.TGroup == 'netfx') { targetHelixQueues = ['Windows.10.Amd64.ClientRS2.Open'] } diff --git a/external/corefx/cross/build-rootfs.sh b/external/corefx/cross/build-rootfs.sh index 03cd559de5..6bf67d96d6 100755 --- a/external/corefx/cross/build-rootfs.sh +++ b/external/corefx/cross/build-rootfs.sh @@ -71,7 +71,7 @@ for i in "$@" ; do __LLDB_Package="lldb-3.8-dev" ;; lldb3.9) - __LLDB_Package="lldb-3.9-dev" + __LLDB_Package="liblldb-3.9-dev" ;; no-lldb) unset __LLDB_Package diff --git a/external/corefx/dependencies.props b/external/corefx/dependencies.props index ad118c13e1..ce5433e708 100644 --- a/external/corefx/dependencies.props +++ b/external/corefx/dependencies.props @@ -9,20 +9,20 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 3c5f8e69e456790cc711a78c66b89f5b8035f02b - f9f2dcffe189a681d43949ee3b02dd1fc9d9e636 - 3c5f8e69e456790cc711a78c66b89f5b8035f02b + 88565452637e4312f259161d5006ef24870858c7 + 88565452637e4312f259161d5006ef24870858c7 + 88565452637e4312f259161d5006ef24870858c7 96dc7805f5df4a70a55783964ce69dcd91bfca80 - f9f2dcffe189a681d43949ee3b02dd1fc9d9e636 - f9f2dcffe189a681d43949ee3b02dd1fc9d9e636 + ccd922b62227c43ed2dac6bcb737321dd2b07be0 + ccd922b62227c43ed2dac6bcb737321dd2b07be0 8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd - 6298244e25cf84d91e3cda9627315f2425274624 - e697c7d95c14fc4e39a0de1a09d0dd9f1faf3f92 + eff554f39ee29c9f2b470bf7755b83ceaaf2b1a1 + 923fc4e4aade5e96f0ebdbd76edfa36dd0a2985c - 2.0.1 + 2.0.3 NETStandard.Library @@ -31,36 +31,44 @@ - preview1-26122-01 - 2.1.0-preview1-26122-01 - 2.1.0-preview1-26122-04 - beta-26122-00 - beta-26122-00 - 1.0.0-beta-26122-00 - 2.1.0-preview1-26121-02 - 2.1.0-preview1-26121-02 - 2.1.0-preview1-26121-02 - 2.1.0-preview1-26121-02 + rtm-26508-03 + 2.1.0-rtm-26508-03 + 2.1.0-rtm-26508-04 + beta-26413-00 + beta-26413-00 + 1.0.0-beta-26413-00 + 2.1.0-rtm-26508-02 + 2.1.0-rtm-26508-02 + 2.1.0-rtm-26508-02 4.4.0 1.0.3-prerelease-00921-01 - 1.0.0-beta-build0015 - 1.0.3-alpha-experimental - 2.1.0-prerelease-02419-02 + 1.0.0-beta-build0018 + 2.0.5 + 2.1.0-rc1-02804-05 + + + 2.0.0-rc-61101-17 Microsoft.DotNet.Build.Tasks.Feed - 2.1.0-prerelease-02419-02 + 2.1.0-rc1-02804-05 + + + + + Microsoft.SymbolUploader.Build.Task + 1.0.0-beta-62806-01 build-info/dotnet/ - master + release/2.1 $(MSBuildThisFileFullPath) @@ -77,6 +85,7 @@ $(BaseDotNetBuildInfo)core-setup/$(DependencyBranch) $(CoreSetupCurrentRef) + $(BaseDotNetBuildInfo)standard/release/2.0.0 $(StandardCurrentRef) + $(BaseDotNetBuildInfo)buildtools/$(DependencyBranch) $(BuildToolsCurrentRef) @@ -126,6 +138,7 @@ NETStandardLibraryPackageVersion $(NETStandardLibraryPackageId) + $(MSBuildThisFileFullPath) MicrosoftNETCoreDotNetHostPackageVersion @@ -161,11 +175,6 @@ MicrosoftNETCoreAppPackageVersion Microsoft.NETCore.App - - $(MSBuildThisFileFullPath) - MicrosoftDotNetPlatformAbstractionsPackageVersion - Microsoft.DotNet.PlatformAbstractions - File $(MSBuildThisFileDirectory)BuildToolsVersion.txt diff --git a/external/corefx/dir.props b/external/corefx/dir.props index e70c05766a..75fd566768 100644 --- a/external/corefx/dir.props +++ b/external/corefx/dir.props @@ -77,11 +77,11 @@ --> - $(OverridePackageSource); https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json; https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; https://api.nuget.org/v3/index.json; + $(OverridePackageSource); $(RestoreSources) @@ -148,8 +148,8 @@ <_packageRID/> <_packageRID Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(ArchGroup) - <_packageRID Condition="'$(TargetGroup)' == 'uap'">win10-$(ArchGroup) - <_packageRID Condition="'$(TargetGroup)' == 'uapaot'">win10-$(ArchGroup)-aot + <_packageRID Condition="$(TargetGroup.StartsWith('uap'))">win10-$(ArchGroup) + <_packageRID Condition="$(TargetGroup.EndsWith('aot'))">win10-$(ArchGroup)-aot $(_packageRID) $(RuntimeOS)-$(ArchGroup) @@ -157,6 +157,7 @@ true + true true @@ -174,6 +175,8 @@ Portable + + true diff --git a/external/corefx/dir.targets b/external/corefx/dir.targets index 8d899afd8f..df5b05a518 100644 --- a/external/corefx/dir.targets +++ b/external/corefx/dir.targets @@ -38,6 +38,7 @@ $(NETCoreAppPackageRefPath) $(NETCoreAppPackageRuntimePath) $(NETCoreAppPackageRuntimePath)\..\runtime + $(RefRootPath)microsoft.netcore.app ILLinkTrimAssembly=true @@ -75,6 +76,10 @@ $(RefRootPath)netcoreapp2.0/ + + + $(RefRootPath)uap10.0.16299/ + <_TargetGroupsWithIsAot Condition="'$(BuildAllConfigurations)' == 'true'" Include="@(TargetGroups)"> $([System.String]::new('%(Identity)').Contains('aot')) @@ -122,7 +127,7 @@ <_GenAPICmd>$(DotnetToolCommand) $(_GenApiExePath) - <_GenAPICmd>$(_GenAPICmd) -assembly:$(TargetPath) + <_GenAPICmd>$(_GenAPICmd) -assembly:@(IntermediateAssembly) <_GenAPICmd>$(_GenAPICmd) -libPath:$(RefPath) <_GenAPICmd>$(_GenAPICmd) -out:$(_RefSourceFileOutputPath) <_GenAPICmd>$(_GenAPICmd) -excludeAttributesList:$(_ExcludeAPIList) diff --git a/external/corefx/external/ILLink/ILLink.depproj b/external/corefx/external/ILLink/ILLink.depproj index dbc59f043b..bf04674646 100644 --- a/external/corefx/external/ILLink/ILLink.depproj +++ b/external/corefx/external/ILLink/ILLink.depproj @@ -9,7 +9,7 @@ $(ToolRuntimeRID) true illink.tasks - 0.1.4-preview-1222833 + 0.1.5-preview-1461378 diff --git a/external/corefx/external/dir.proj b/external/corefx/external/dir.proj index 68a0a8b122..43b80856ff 100644 --- a/external/corefx/external/dir.proj +++ b/external/corefx/external/dir.proj @@ -8,6 +8,7 @@ + diff --git a/external/corefx/external/netcoreapp/netcoreapp.depproj b/external/corefx/external/netcoreapp/netcoreapp.depproj index d4dcfcfa70..1e076c34ae 100644 --- a/external/corefx/external/netcoreapp/netcoreapp.depproj +++ b/external/corefx/external/netcoreapp/netcoreapp.depproj @@ -21,6 +21,8 @@ $(RefPath) + + diff --git a/external/corefx/external/netstandard/netstandard.depproj b/external/corefx/external/netstandard/netstandard.depproj index 44dab19787..ca80986109 100644 --- a/external/corefx/external/netstandard/netstandard.depproj +++ b/external/corefx/external/netstandard/netstandard.depproj @@ -55,8 +55,16 @@ <_NETStandardRefFolder>$(PackagesDir)$(NETStandardLibraryPackageId.ToLower())\$(NETStandardLibraryPackageVersion)\build\$(_NETStandardTFMFolder)\ref + - + + + + + + False $(NETStandardLibraryPackageId) $(NETStandardLibraryPackageVersion) diff --git a/external/corefx/external/runtime/Configurations.props b/external/corefx/external/runtime/Configurations.props index 903d22de95..6a8326c6b2 100644 --- a/external/corefx/external/runtime/Configurations.props +++ b/external/corefx/external/runtime/Configurations.props @@ -4,8 +4,7 @@ netcoreapp-Windows_NT; netcoreapp-Unix; - netcoreapp2.0-Windows_NT; - netcoreapp2.0-Unix; + uap10.0.16299aot; uap; uapaot; mono; diff --git a/external/corefx/external/runtime/runtime.depproj b/external/corefx/external/runtime/runtime.depproj index 2d147b9fac..120512d435 100644 --- a/external/corefx/external/runtime/runtime.depproj +++ b/external/corefx/external/runtime/runtime.depproj @@ -4,10 +4,9 @@ $(PackageRID) true - 2.0.0 $(NoWarn);NU1603;NU1605 - + UAP,Version=v10.1 uap10.1 @@ -15,7 +14,7 @@ false Reference - + 1.1.0-$(ProjectNTfsExpectedPrerelease) @@ -24,7 +23,7 @@ - + $(MicrosoftNETCorePlatformsPackageVersion) @@ -75,6 +74,7 @@ $(PackagesDir)symbolpackages/ + https://dotnetfeed.blob.core.windows.net/dotnet-core/assets/ <_CoreCLRSymbolPackagesToDownload Include="@(ReferenceCopyLocalPaths->'%(NuGetPackageId)')" Condition="$([System.String]::Copy('%(Identity)').EndsWith('System.Private.CoreLib.dll'))"> - - $(DotNetAssetRootUrl)symbols/%(NuGetPackageId).%(NuGetPackageVersion).symbols.nupkg - https://dotnet.myget.org/F/dotnet-core/symbols/%(NuGetPackageId)/%(NuGetPackageVersion)/ + $(DotNetAssetRootUrl)symbols/%(NuGetPackageId).%(NuGetPackageVersion).symbols.nupkg %(NuGetPackageId).%(NuGetPackageVersion).symbols.nupkg.zip $(SymbolPackagesDir)/%(NuGetPackageId).%(NuGetPackageVersion) diff --git a/external/corefx/external/test-runtime/XUnit.Runtime.depproj b/external/corefx/external/test-runtime/XUnit.Runtime.depproj index ef5c2b6b82..2b96e94ba3 100644 --- a/external/corefx/external/test-runtime/XUnit.Runtime.depproj +++ b/external/corefx/external/test-runtime/XUnit.Runtime.depproj @@ -51,7 +51,7 @@ 0.10.0-alpha-experimental - $(MicrosoftDotNetPlatformAbstractionsPackageVersion) + 2.0.4 2.1.1-beta @@ -83,6 +83,9 @@ 1.0.6 + + 1.0.2 + @@ -102,6 +105,23 @@ + + + + + + + + + 1.0.17 diff --git a/external/corefx/external/test-runtime/optional.json b/external/corefx/external/test-runtime/optional.json index 698dd33a76..8b3eb0700c 100644 --- a/external/corefx/external/test-runtime/optional.json +++ b/external/corefx/external/test-runtime/optional.json @@ -3,9 +3,9 @@ "net45": { "dependencies": { "Microsoft.DotNet.IBCMerge": "4.6.0-alpha-00001", - "TestILC.amd64ret": "1.0.0-beta-26122-00", - "TestILC.armret": "1.0.0-beta-26122-00", - "TestILC.x86ret": "1.0.0-beta-26122-00" + "TestILC.amd64ret": "1.0.0-beta-26413-00", + "TestILC.armret": "1.0.0-beta-26413-00", + "TestILC.x86ret": "1.0.0-beta-26413-00" } } } diff --git a/external/corefx/external/uap/Configurations.props b/external/corefx/external/uap/Configurations.props new file mode 100644 index 0000000000..128839ca24 --- /dev/null +++ b/external/corefx/external/uap/Configurations.props @@ -0,0 +1,8 @@ + + + + + uap10.0.16299; + + + \ No newline at end of file diff --git a/external/corefx/external/uap/uap.depproj b/external/corefx/external/uap/uap.depproj new file mode 100644 index 0000000000..5c75f2374f --- /dev/null +++ b/external/corefx/external/uap/uap.depproj @@ -0,0 +1,39 @@ + + + + + + true + Reference + 6.0.7 + uap10.0.16299 + + + + + $(UAPPackageVersion) + + + + 4.3.0 + + + 4.3.0 + + + + + + + + + + $(RefPath) + + + + + \ No newline at end of file diff --git a/external/corefx/illink.targets b/external/corefx/illink.targets index 8e3525d77f..005a1d7ff9 100644 --- a/external/corefx/illink.targets +++ b/external/corefx/illink.targets @@ -25,6 +25,12 @@ true + + + $(AssemblyName).xml + + + @@ -60,19 +66,23 @@ $(ILLinkArgs)-r $(TargetName) - + $(ILLinkArgs) -c skip - $(ILLinkArgs) -p skip netstandard + + $(ILLinkArgs) -u skip + + $(ILLinkArgs) -p link $(TargetName) $(ILLinkArgs) -t - $(ILLinkArgs) -x $(ILLinkTrimXml) $(ILLinkArgs) -b true $(ILLinkArgs) -v true + + $(ILLinkArgs) --strip-resources false $(ILLinkArgs) -h LdtokenTypeMethods,InstanceConstructors - - $(ILLinkArgs) -s ILLink.CustomSteps.ClearInitLocalsStep,ILLink.CustomSteps:OutputStep + + $(ILLinkArgs) --skip-unresolved true @@ -88,9 +98,19 @@ Condition="'$(ILLinkRewritePDBs)' == 'true' AND Exists('$(ILLinkTrimAssemblySymbols)')" /> - + <_DependencyDirectoriesTemp Include="@(ReferencePath->'%(RootDir)%(Directory)')" /> + + + <_DependencyDirectories Condition="'%(_DependencyDirectoriesTemp.ReferenceSourceTarget)'=='ProjectReference'" Include="%(_DependencyDirectoriesTemp.Identity)" /> + <_DependencyDirectories Condition="'%(_DependencyDirectoriesTemp.ReferenceSourceTarget)'!='ProjectReference'" Include="%(_DependencyDirectoriesTemp.Identity)" /> + + + diff --git a/external/corefx/init-tools.cmd b/external/corefx/init-tools.cmd index fa0e44b991..7d3de00e8d 100644 --- a/external/corefx/init-tools.cmd +++ b/external/corefx/init-tools.cmd @@ -27,8 +27,6 @@ if exist "%BUILD_TOOLS_SEMAPHORE%" ( if exist "%TOOLRUNTIME_DIR%" rmdir /S /Q "%TOOLRUNTIME_DIR%" -if NOT exist "%BUILD_TOOLS_SEMAPHORE_DIR%" mkdir "%BUILD_TOOLS_SEMAPHORE_DIR%" - if exist "%DotNetBuildToolsDir%" ( echo Using tools from '%DotNetBuildToolsDir%'. mklink /j "%TOOLRUNTIME_DIR%" "%DotNetBuildToolsDir%" @@ -39,6 +37,7 @@ if exist "%DotNetBuildToolsDir%" ( ) echo Done initializing tools. + if NOT exist "%BUILD_TOOLS_SEMAPHORE_DIR%" mkdir "%BUILD_TOOLS_SEMAPHORE_DIR%" echo Using tools from '%DotNetBuildToolsDir%'. > "%BUILD_TOOLS_SEMAPHORE%" exit /b 0 ) @@ -64,8 +63,8 @@ if NOT exist "%DOTNET_LOCAL_PATH%" ( if exist "%BUILD_TOOLS_PATH%" goto :afterbuildtoolsrestore echo Restoring BuildTools version %BUILDTOOLS_VERSION%... -echo Running: "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% >> "%INIT_TOOLS_LOG%" -call "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% >> "%INIT_TOOLS_LOG%" +echo Running: "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% /p:ToolsDir=%TOOLRUNTIME_DIR% >> "%INIT_TOOLS_LOG%" +call "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% /p:ToolsDir=%TOOLRUNTIME_DIR% >> "%INIT_TOOLS_LOG%" if NOT exist "%BUILD_TOOLS_PATH%init-tools.cmd" ( echo ERROR: Could not restore build tools correctly. 1>&2 goto :error @@ -87,6 +86,7 @@ if not [%INIT_TOOLS_ERRORLEVEL%]==[0] ( :: Create semaphore file echo Done initializing tools. +if NOT exist "%BUILD_TOOLS_SEMAPHORE_DIR%" mkdir "%BUILD_TOOLS_SEMAPHORE_DIR%" echo Init-Tools.cmd completed for BuildTools Version: %BUILDTOOLS_VERSION% > "%BUILD_TOOLS_SEMAPHORE%" exit /b 0 diff --git a/external/corefx/init-tools.msbuild b/external/corefx/init-tools.msbuild index 68db6cb157..934ae478ab 100644 --- a/external/corefx/init-tools.msbuild +++ b/external/corefx/init-tools.msbuild @@ -9,5 +9,6 @@ + - \ No newline at end of file + diff --git a/external/corefx/init-tools.sh b/external/corefx/init-tools.sh index 0e699ce5de..4d656defe2 100755 --- a/external/corefx/init-tools.sh +++ b/external/corefx/init-tools.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash __scriptpath=$(cd "$(dirname "$0")"; pwd -P) -__init_tools_log=$__scriptpath/init-tools.log -__PACKAGES_DIR=$__scriptpath/packages -__TOOLRUNTIME_DIR=$__scriptpath/Tools -__DOTNET_PATH=$__TOOLRUNTIME_DIR/dotnetcli -__DOTNET_CMD=$__DOTNET_PATH/dotnet -if [ -z "$__BUILDTOOLS_SOURCE" ]; then __BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json; fi +__init_tools_log="$__scriptpath/init-tools.log" +__PACKAGES_DIR="$__scriptpath/packages" +__TOOLRUNTIME_DIR="$__scriptpath/Tools" +__DOTNET_PATH="$__TOOLRUNTIME_DIR/dotnetcli" +__DOTNET_CMD="$__DOTNET_PATH/dotnet" +if [ -z "${__BUILDTOOLS_SOURCE:-}" ]; then __BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json; fi export __BUILDTOOLS_USE_CSPROJ=true -__BUILD_TOOLS_PACKAGE_VERSION=$(cat $__scriptpath/BuildToolsVersion.txt | sed 's/\r$//') # remove CR if mounted repo on Windows drive -__DOTNET_TOOLS_VERSION=$(cat $__scriptpath/DotnetCLIVersion.txt | sed 's/\r$//') # remove CR if mounted repo on Windows drive -__ILASM_VERSION=$(cat $__scriptpath/tools-local/ILAsmVersion.txt | sed 's/\r$//') # remove CR if mounted repo on Windows drive -__BUILD_TOOLS_PATH=$__PACKAGES_DIR/microsoft.dotnet.buildtools/$__BUILD_TOOLS_PACKAGE_VERSION/lib -__INIT_TOOLS_RESTORE_PROJECT=$__scriptpath/init-tools.msbuild -__BUILD_TOOLS_SEMAPHORE=$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION/init-tools.complete +__BUILD_TOOLS_PACKAGE_VERSION=$(cat "$__scriptpath/BuildToolsVersion.txt" | sed 's/\r$//') # remove CR if mounted repo on Windows drive +__DOTNET_TOOLS_VERSION=$(cat "$__scriptpath/DotnetCLIVersion.txt" | sed 's/\r$//') # remove CR if mounted repo on Windows drive +__ILASM_VERSION=$(cat "$__scriptpath/tools-local/ILAsmVersion.txt" | sed 's/\r$//') # remove CR if mounted repo on Windows drive +__BUILD_TOOLS_PATH="$__PACKAGES_DIR/microsoft.dotnet.buildtools/$__BUILD_TOOLS_PACKAGE_VERSION/lib" +__INIT_TOOLS_RESTORE_PROJECT="$__scriptpath/init-tools.msbuild" +__BUILD_TOOLS_SEMAPHORE="$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION/init-tools.complete" -if [ -e $__BUILD_TOOLS_SEMAPHORE ]; then +if [ -e "$__BUILD_TOOLS_SEMAPHORE" ]; then echo "Tools are already initialized" return #return instead of exit because this script is inlined in other scripts which we don't want to exit fi -if [ -e $__TOOLRUNTIME_DIR ]; then rm -rf -- $__TOOLRUNTIME_DIR; fi +if [ -e "$__TOOLRUNTIME_DIR" ]; then rm -rf -- "$__TOOLRUNTIME_DIR"; fi -if [ -d "$DotNetBuildToolsDir" ]; then +if [ -d "${DotNetBuildToolsDir:-}" ]; then echo "Using tools from '$DotNetBuildToolsDir'." ln -s "$DotNetBuildToolsDir" "$__TOOLRUNTIME_DIR" @@ -32,11 +32,11 @@ if [ -d "$DotNetBuildToolsDir" ]; then fi echo "Done initializing tools." - mkdir -p "$(dirname "$__BUILD_TOOLS_SEMAPHORE")" && touch $__BUILD_TOOLS_SEMAPHORE + mkdir -p "$(dirname "$__BUILD_TOOLS_SEMAPHORE")" && touch "$__BUILD_TOOLS_SEMAPHORE" return #return instead of exit because this script is inlined in other scripts which we don't want to exit fi -echo "Running: $__scriptpath/init-tools.sh" > $__init_tools_log +echo "Running: $__scriptpath/init-tools.sh" > "$__init_tools_log" display_error_message() { @@ -65,13 +65,13 @@ execute_with_retry() { return 0 } -if [ ! -e $__DOTNET_PATH ]; then - if [ -z "$__DOTNET_PKG" ]; then +if [ ! -e "$__DOTNET_PATH" ]; then + if [ -z "${__DOTNET_PKG:-}" ]; then if [ "$(uname -m | grep "i[3456]86")" = "i686" ]; then echo "Warning: build not supported on 32 bit Unix" fi - __PKG_ARCH=x64 + __PKG_ARCH=x64 OSName=$(uname -s) case $OSName in @@ -88,15 +88,13 @@ if [ ! -e $__DOTNET_PATH ]; then ;; Linux) - __PKG_RID=linux + __PKG_RID=linux OS=Linux if [ -e /etc/os-release ]; then source /etc/os-release if [[ $ID == "alpine" ]]; then - # remove the last version digit - VERSION_ID=${VERSION_ID%.*} - __PKG_RID=alpine.$VERSION_ID + __PKG_RID=linux-musl fi elif [ -e /etc/redhat-release ]; then redhatRelease=$(> "$__init_tools_log" - rm -rf -- "$__DOTNET_PATH/*" - # curl has HTTPS CA trust-issues less often than wget, so lets try that first. - if command -v curl > /dev/null; then - curl --retry 10 -sSL --create-dirs -o $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION} + if [[ -z "${DotNetBootstrapCliTarPath-}" ]]; then + echo "Installing '${__DOTNET_LOCATION}' to '$__DOTNET_PATH/dotnet.tar'" + rm -rf -- "$__DOTNET_PATH/*" + # curl has HTTPS CA trust-issues less often than wget, so lets try that first. + if command -v curl > /dev/null; then + curl --retry 10 -sSL --create-dirs -o $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION} + else + wget -q -O $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION} + fi else - wget -q -O $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION} + echo "Copying '$DotNetBootstrapCliTarPath' to '$__DOTNET_PATH/dotnet.tar'" + cp $DotNetBootstrapCliTarPath $__DOTNET_PATH/dotnet.tar fi - cd $__DOTNET_PATH - tar -xf $__DOTNET_PATH/dotnet.tar + cd "$__DOTNET_PATH" + tar -xf "$__DOTNET_PATH/dotnet.tar" } execute_with_retry install_dotnet_cli >> "$__init_tools_log" 2>&1 - cd $__scriptpath + cd "$__scriptpath" fi -if [ ! -e $__BUILD_TOOLS_PATH ]; then +if [ ! -e "$__BUILD_TOOLS_PATH" ]; then echo "Restoring BuildTools version $__BUILD_TOOLS_PACKAGE_VERSION..." - echo "Running: $__DOTNET_CMD restore \"$__INIT_TOOLS_RESTORE_PROJECT\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION" >> $__init_tools_log - $__DOTNET_CMD restore "$__INIT_TOOLS_RESTORE_PROJECT" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION >> $__init_tools_log + echo "Running: $__DOTNET_CMD restore \"$__INIT_TOOLS_RESTORE_PROJECT\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION /p:ToolsDir=$__TOOLRUNTIME_DIR" >> "$__init_tools_log" + "$__DOTNET_CMD" restore "$__INIT_TOOLS_RESTORE_PROJECT" --no-cache --packages "$__PACKAGES_DIR" --source "$__BUILDTOOLS_SOURCE" /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION /p:ToolsDir="$__TOOLRUNTIME_DIR" >> "$__init_tools_log" if [ ! -e "$__BUILD_TOOLS_PATH/init-tools.sh" ]; then echo "ERROR: Could not restore build tools correctly." 1>&2 display_error_message fi fi -if [ -z "$__ILASM_RID" ]; then +if [ -z "${__ILASM_RID-}" ]; then __ILASM_RID=$__PKG_RID-$__PKG_ARCH fi @@ -157,12 +160,17 @@ echo "Using RID $__ILASM_RID for BuildTools native tools" export ILASMCOMPILER_VERSION=$__ILASM_VERSION export NATIVE_TOOLS_RID=$__ILASM_RID +if [ -n "${DotNetBootstrapCliTarPath-}" ]; then + # Assume ilasm is not in nuget yet when bootstrapping... + unset ILASMCOMPILER_VERSION +fi + echo "Initializing BuildTools..." -echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR" >> $__init_tools_log +echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR $__PACKAGES_DIR" >> "$__init_tools_log" # Executables restored with .NET Core 2.0 do not have executable permission flags. https://github.com/NuGet/Home/issues/4424 -chmod +x $__BUILD_TOOLS_PATH/init-tools.sh -$__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR >> $__init_tools_log +chmod +x "$__BUILD_TOOLS_PATH/init-tools.sh" +"$__BUILD_TOOLS_PATH/init-tools.sh" "$__scriptpath" "$__DOTNET_CMD" "$__TOOLRUNTIME_DIR" "$__PACKAGES_DIR" >> "$__init_tools_log" if [ "$?" != "0" ]; then echo "ERROR: An error occurred when trying to initialize the tools." 1>&2 display_error_message @@ -171,12 +179,12 @@ fi echo "Making all .sh files executable under Tools." # Executables restored with .NET Core 2.0 do not have executable permission flags. https://github.com/NuGet/Home/issues/4424 -ls $__scriptpath/Tools/*.sh | xargs chmod +x -ls $__scriptpath/Tools/scripts/docker/*.sh | xargs chmod +x +ls "$__scriptpath/Tools/"*.sh | xargs chmod +x +ls "$__scriptpath/Tools/scripts/docker/"*.sh | xargs chmod +x -Tools/crossgen.sh $__scriptpath/Tools +"$__scriptpath/Tools/crossgen.sh" "$__scriptpath/Tools" -mkdir -p "$(dirname "$__BUILD_TOOLS_SEMAPHORE")" && touch $__BUILD_TOOLS_SEMAPHORE +mkdir -p "$(dirname "$__BUILD_TOOLS_SEMAPHORE")" && touch "$__BUILD_TOOLS_SEMAPHORE" echo "Done initializing tools." diff --git a/external/corefx/netci.groovy b/external/corefx/netci.groovy index c741fcf3d4..d07ef1b78d 100644 --- a/external/corefx/netci.groovy +++ b/external/corefx/netci.groovy @@ -326,19 +326,28 @@ def targetGroupOsMapInnerloop = ['netcoreapp': ['Windows_NT', 'Ubuntu14.04', 'Ub } } - // Set up triggers - if (isPR) { - // We run Tizen Debug and Linux Release as default PR builds - if ((osName == "Tizen" && configurationGroup == "Debug") || (osName == "Linux" && configurationGroup == "Release")) { - Utilities.addGithubPRTriggerForBranch(newJob, branch, "${osName} ${abi} ${configurationGroup} Build") - } - else { + // Disable Tizen except when explicitly requested. See corefx/issues/28901 + if (osName == "Tizen") { + if (isPR) { Utilities.addGithubPRTriggerForBranch(newJob, branch, "${osName} ${abi} ${configurationGroup} Build", "(?i).*test\\W+${osName}\\W+${abi}\\W+${configurationGroup}.*") } } - else { - // Set a push trigger - Utilities.addGithubPushTrigger(newJob) + else + { + // Set up triggers + if (isPR) { + // We run Tizen Debug and Linux Release as default PR builds + if ((osName == "Tizen" && configurationGroup == "Debug") || (osName == "Linux" && configurationGroup == "Release")) { + Utilities.addGithubPRTriggerForBranch(newJob, branch, "${osName} ${abi} ${configurationGroup} Build") + } + else { + Utilities.addGithubPRTriggerForBranch(newJob, branch, "${osName} ${abi} ${configurationGroup} Build", "(?i).*test\\W+${osName}\\W+${abi}\\W+${configurationGroup}.*") + } + } + else { + // Set a push trigger + Utilities.addGithubPushTrigger(newJob) + } } } // osName } // configurationGroup diff --git a/external/corefx/perf.groovy b/external/corefx/perf.groovy index 837850117e..f0c4a884f1 100644 --- a/external/corefx/perf.groovy +++ b/external/corefx/perf.groovy @@ -118,22 +118,35 @@ def osShortName = ['Windows 10': 'win10', } } + // Add the unit test results + def archiveSettings = new ArchivalSettings() + archiveSettings.addFiles('msbuild.log') + archiveSettings.addFiles('machinedata.json') + archiveSettings.addFiles('bin/**/Perf-*Performance.Tests.csv') + archiveSettings.addFiles('bin/**/Perf-*Performance.Tests.etl') + archiveSettings.addFiles('bin/**/Perf-*Performance.Tests.md') + archiveSettings.addFiles('bin/**/Perf-*Performance.Tests.xml') + archiveSettings.setAlwaysArchive() + + // Add archival for the built data. + Utilities.addArchival(newJob, archiveSettings) + // Set up standard options. Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}") - //Set timeout to non-default newJob.with { + logRotator { + artifactDaysToKeep(30) + daysToKeep(30) + artifactNumToKeep(200) + numToKeep(200) + } wrappers { timeout { absolute(240) } } } - // Add the unit test results - Utilities.addXUnitDotNETResults(newJob, 'bin/**/Perf-*.xml') - def archiveContents = "msbuild.log" - // Add archival for the built data. - Utilities.addArchival(newJob, archiveContents) // Set up triggers if (isPR) { TriggerBuilder builder = TriggerBuilder.triggerOnPullRequest() diff --git a/external/corefx/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.builds b/external/corefx/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.builds index a2a9330b70..431f35e358 100644 --- a/external/corefx/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.builds +++ b/external/corefx/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.builds @@ -1,7 +1,7 @@ - + diff --git a/external/corefx/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/external/corefx/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json deleted file mode 100644 index 552ccf502a..0000000000 --- a/external/corefx/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json +++ /dev/null @@ -1,5221 +0,0 @@ -{ - "alpine": [ - "alpine", - "unix", - "any", - "base" - ], - "alpine-corert": [ - "alpine-corert", - "alpine", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "alpine-x64": [ - "alpine-x64", - "alpine", - "unix-x64", - "unix", - "any", - "base" - ], - "alpine-x64-corert": [ - "alpine-x64-corert", - "alpine-corert", - "alpine-x64", - "unix-x64-corert", - "alpine", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "alpine.3.6": [ - "alpine.3.6", - "alpine", - "unix", - "any", - "base" - ], - "alpine.3.6-corert": [ - "alpine.3.6-corert", - "alpine.3.6", - "alpine-corert", - "alpine", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "alpine.3.6-x64": [ - "alpine.3.6-x64", - "alpine.3.6", - "alpine-x64", - "alpine", - "unix-x64", - "unix", - "any", - "base" - ], - "alpine.3.6-x64-corert": [ - "alpine.3.6-x64-corert", - "alpine.3.6-corert", - "alpine.3.6-x64", - "alpine.3.6", - "alpine-x64-corert", - "alpine-corert", - "alpine-x64", - "alpine", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "android": [ - "android", - "any", - "base" - ], - "android-arm": [ - "android-arm", - "android", - "any", - "base" - ], - "android-arm-corert": [ - "android-arm-corert", - "android-corert", - "android-arm", - "android", - "corert", - "any", - "base" - ], - "android-arm64": [ - "android-arm64", - "android", - "any", - "base" - ], - "android-arm64-corert": [ - "android-arm64-corert", - "android-corert", - "android-arm64", - "android", - "corert", - "any", - "base" - ], - "android-corert": [ - "android-corert", - "android", - "corert", - "any", - "base" - ], - "android.21": [ - "android.21", - "android", - "any", - "base" - ], - "android.21-arm": [ - "android.21-arm", - "android.21", - "android-arm", - "android", - "any", - "base" - ], - "android.21-arm-corert": [ - "android.21-arm-corert", - "android.21-corert", - "android.21-arm", - "android.21", - "android-arm-corert", - "android-corert", - "android-arm", - "android", - "corert", - "any", - "base" - ], - "android.21-arm64": [ - "android.21-arm64", - "android.21", - "android-arm64", - "android", - "any", - "base" - ], - "android.21-arm64-corert": [ - "android.21-arm64-corert", - "android.21-corert", - "android.21-arm64", - "android.21", - "android-arm64-corert", - "android-corert", - "android-arm64", - "android", - "corert", - "any", - "base" - ], - "android.21-corert": [ - "android.21-corert", - "android.21", - "android-corert", - "android", - "corert", - "any", - "base" - ], - "any": [ - "any", - "base" - ], - "aot": [ - "aot", - "any", - "base" - ], - "base": [ - "base" - ], - "centos": [ - "centos", - "rhel", - "linux", - "unix", - "any", - "base" - ], - "centos-corert": [ - "centos-corert", - "centos", - "rhel-corert", - "rhel", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "centos-x64": [ - "centos-x64", - "centos", - "rhel-x64", - "rhel", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "centos-x64-corert": [ - "centos-x64-corert", - "centos-corert", - "centos-x64", - "rhel-x64-corert", - "centos", - "rhel-corert", - "rhel-x64", - "linux-x64-corert", - "rhel", - "linux-corert", - "linux-x64", - "unix-x64-corert", - "linux", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "centos.7": [ - "centos.7", - "centos", - "rhel.7", - "rhel", - "linux", - "unix", - "any", - "base" - ], - "centos.7-corert": [ - "centos.7-corert", - "centos.7", - "centos-corert", - "rhel.7-corert", - "centos", - "rhel.7", - "rhel-corert", - "rhel", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "centos.7-x64": [ - "centos.7-x64", - "centos.7", - "centos-x64", - "rhel.7-x64", - "centos", - "rhel.7", - "rhel-x64", - "rhel", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "centos.7-x64-corert": [ - "centos.7-x64-corert", - "centos.7-corert", - "centos.7-x64", - "centos.7", - "centos-x64-corert", - "centos-corert", - "rhel.7-corert", - "centos-x64", - "rhel.7-x64", - "centos", - "rhel.7", - "rhel-x64-corert", - "rhel-corert", - "rhel-x64", - "rhel", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "corert": [ - "corert", - "any", - "base" - ], - "debian": [ - "debian", - "linux", - "unix", - "any", - "base" - ], - "debian-arm": [ - "debian-arm", - "debian", - "linux-arm", - "linux", - "unix-arm", - "unix", - "any", - "base" - ], - "debian-arm-corert": [ - "debian-arm-corert", - "debian-corert", - "debian-arm", - "linux-arm-corert", - "debian", - "linux-corert", - "linux-arm", - "unix-arm-corert", - "linux", - "unix-corert", - "unix-arm", - "unix", - "corert", - "any", - "base" - ], - "debian-arm64": [ - "debian-arm64", - "debian", - "linux-arm64", - "linux", - "unix-arm64", - "unix", - "any", - "base" - ], - "debian-arm64-corert": [ - "debian-arm64-corert", - "debian-corert", - "debian-arm64", - "linux-arm64-corert", - "debian", - "linux-corert", - "linux-arm64", - "unix-arm64-corert", - "linux", - "unix-corert", - "unix-arm64", - "unix", - "corert", - "any", - "base" - ], - "debian-armel": [ - "debian-armel", - "debian", - "linux-armel", - "linux", - "unix-armel", - "unix", - "any", - "base" - ], - "debian-armel-corert": [ - "debian-armel-corert", - "debian-corert", - "debian-armel", - "linux-armel-corert", - "debian", - "linux-corert", - "linux-armel", - "unix-armel-corert", - "linux", - "unix-corert", - "unix-armel", - "unix", - "corert", - "any", - "base" - ], - "debian-corert": [ - "debian-corert", - "debian", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "debian-x64": [ - "debian-x64", - "debian", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "debian-x64-corert": [ - "debian-x64-corert", - "debian-corert", - "debian-x64", - "linux-x64-corert", - "debian", - "linux-corert", - "linux-x64", - "unix-x64-corert", - "linux", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "debian-x86": [ - "debian-x86", - "debian", - "linux-x86", - "linux", - "unix-x86", - "unix", - "any", - "base" - ], - "debian-x86-corert": [ - "debian-x86-corert", - "debian-corert", - "debian-x86", - "linux-x86-corert", - "debian", - "linux-corert", - "linux-x86", - "unix-x86-corert", - "linux", - "unix-corert", - "unix-x86", - "unix", - "corert", - "any", - "base" - ], - "debian.8": [ - "debian.8", - "debian", - "linux", - "unix", - "any", - "base" - ], - "debian.8-arm": [ - "debian.8-arm", - "debian.8", - "debian-arm", - "debian", - "linux-arm", - "linux", - "unix-arm", - "unix", - "any", - "base" - ], - "debian.8-arm-corert": [ - "debian.8-arm-corert", - "debian.8-corert", - "debian.8-arm", - "debian.8", - "debian-arm-corert", - "debian-corert", - "debian-arm", - "debian", - "linux-arm-corert", - "linux-corert", - "linux-arm", - "linux", - "unix-arm-corert", - "unix-corert", - "unix-arm", - "unix", - "corert", - "any", - "base" - ], - "debian.8-arm64": [ - "debian.8-arm64", - "debian.8", - "debian-arm64", - "debian", - "linux-arm64", - "linux", - "unix-arm64", - "unix", - "any", - "base" - ], - "debian.8-arm64-corert": [ - "debian.8-arm64-corert", - "debian.8-corert", - "debian.8-arm64", - "debian.8", - "debian-arm64-corert", - "debian-corert", - "debian-arm64", - "debian", - "linux-arm64-corert", - "linux-corert", - "linux-arm64", - "linux", - "unix-arm64-corert", - "unix-corert", - "unix-arm64", - "unix", - "corert", - "any", - "base" - ], - "debian.8-armel": [ - "debian.8-armel", - "debian.8", - "debian-armel", - "debian", - "linux-armel", - "linux", - "unix-armel", - "unix", - "any", - "base" - ], - "debian.8-armel-corert": [ - "debian.8-armel-corert", - "debian.8-corert", - "debian.8-armel", - "debian.8", - "debian-armel-corert", - "debian-corert", - "debian-armel", - "debian", - "linux-armel-corert", - "linux-corert", - "linux-armel", - "linux", - "unix-armel-corert", - "unix-corert", - "unix-armel", - "unix", - "corert", - "any", - "base" - ], - "debian.8-corert": [ - "debian.8-corert", - "debian.8", - "debian-corert", - "debian", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "debian.8-x64": [ - "debian.8-x64", - "debian.8", - "debian-x64", - "debian", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "debian.8-x64-corert": [ - "debian.8-x64-corert", - "debian.8-corert", - "debian.8-x64", - "debian.8", - "debian-x64-corert", - "debian-corert", - "debian-x64", - "debian", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "debian.8-x86": [ - "debian.8-x86", - "debian.8", - "debian-x86", - "debian", - "linux-x86", - "linux", - "unix-x86", - "unix", - "any", - "base" - ], - "debian.8-x86-corert": [ - "debian.8-x86-corert", - "debian.8-corert", - "debian.8-x86", - "debian.8", - "debian-x86-corert", - "debian-corert", - "debian-x86", - "debian", - "linux-x86-corert", - "linux-corert", - "linux-x86", - "linux", - "unix-x86-corert", - "unix-corert", - "unix-x86", - "unix", - "corert", - "any", - "base" - ], - "fedora": [ - "fedora", - "linux", - "unix", - "any", - "base" - ], - "fedora-corert": [ - "fedora-corert", - "fedora", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "fedora-x64": [ - "fedora-x64", - "fedora", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "fedora-x64-corert": [ - "fedora-x64-corert", - "fedora-corert", - "fedora-x64", - "linux-x64-corert", - "fedora", - "linux-corert", - "linux-x64", - "unix-x64-corert", - "linux", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "fedora.23": [ - "fedora.23", - "fedora", - "linux", - "unix", - "any", - "base" - ], - "fedora.23-corert": [ - "fedora.23-corert", - "fedora.23", - "fedora-corert", - "fedora", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "fedora.23-x64": [ - "fedora.23-x64", - "fedora.23", - "fedora-x64", - "fedora", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "fedora.23-x64-corert": [ - "fedora.23-x64-corert", - "fedora.23-corert", - "fedora.23-x64", - "fedora.23", - "fedora-x64-corert", - "fedora-corert", - "fedora-x64", - "fedora", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "fedora.24": [ - "fedora.24", - "fedora", - "linux", - "unix", - "any", - "base" - ], - "fedora.24-corert": [ - "fedora.24-corert", - "fedora.24", - "fedora-corert", - "fedora", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "fedora.24-x64": [ - "fedora.24-x64", - "fedora.24", - "fedora-x64", - "fedora", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "fedora.24-x64-corert": [ - "fedora.24-x64-corert", - "fedora.24-corert", - "fedora.24-x64", - "fedora.24", - "fedora-x64-corert", - "fedora-corert", - "fedora-x64", - "fedora", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "fedora.25": [ - "fedora.25", - "fedora", - "linux", - "unix", - "any", - "base" - ], - "fedora.25-corert": [ - "fedora.25-corert", - "fedora.25", - "fedora-corert", - "fedora", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "fedora.25-x64": [ - "fedora.25-x64", - "fedora.25", - "fedora-x64", - "fedora", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "fedora.25-x64-corert": [ - "fedora.25-x64-corert", - "fedora.25-corert", - "fedora.25-x64", - "fedora.25", - "fedora-x64-corert", - "fedora-corert", - "fedora-x64", - "fedora", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "fedora.26": [ - "fedora.26", - "fedora", - "linux", - "unix", - "any", - "base" - ], - "fedora.26-corert": [ - "fedora.26-corert", - "fedora.26", - "fedora-corert", - "fedora", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "fedora.26-x64": [ - "fedora.26-x64", - "fedora.26", - "fedora-x64", - "fedora", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "fedora.26-x64-corert": [ - "fedora.26-x64-corert", - "fedora.26-corert", - "fedora.26-x64", - "fedora.26", - "fedora-x64-corert", - "fedora-corert", - "fedora-x64", - "fedora", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "gentoo": [ - "gentoo", - "linux", - "unix", - "any", - "base" - ], - "gentoo-corert": [ - "gentoo-corert", - "gentoo", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "gentoo-x64": [ - "gentoo-x64", - "gentoo", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "gentoo-x64-corert": [ - "gentoo-x64-corert", - "gentoo-corert", - "gentoo-x64", - "linux-x64-corert", - "gentoo", - "linux-corert", - "linux-x64", - "unix-x64-corert", - "linux", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "linux": [ - "linux", - "unix", - "any", - "base" - ], - "linux-arm": [ - "linux-arm", - "linux", - "unix-arm", - "unix", - "any", - "base" - ], - "linux-arm-corert": [ - "linux-arm-corert", - "linux-corert", - "linux-arm", - "unix-arm-corert", - "linux", - "unix-corert", - "unix-arm", - "unix", - "corert", - "any", - "base" - ], - "linux-arm64": [ - "linux-arm64", - "linux", - "unix-arm64", - "unix", - "any", - "base" - ], - "linux-arm64-corert": [ - "linux-arm64-corert", - "linux-corert", - "linux-arm64", - "unix-arm64-corert", - "linux", - "unix-corert", - "unix-arm64", - "unix", - "corert", - "any", - "base" - ], - "linux-armel": [ - "linux-armel", - "linux", - "unix-armel", - "unix", - "any", - "base" - ], - "linux-armel-corert": [ - "linux-armel-corert", - "linux-corert", - "linux-armel", - "unix-armel-corert", - "linux", - "unix-corert", - "unix-armel", - "unix", - "corert", - "any", - "base" - ], - "linux-corert": [ - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "linux-x64": [ - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "linux-x64-corert": [ - "linux-x64-corert", - "linux-corert", - "linux-x64", - "unix-x64-corert", - "linux", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "linux-x86": [ - "linux-x86", - "linux", - "unix-x86", - "unix", - "any", - "base" - ], - "linux-x86-corert": [ - "linux-x86-corert", - "linux-corert", - "linux-x86", - "unix-x86-corert", - "linux", - "unix-corert", - "unix-x86", - "unix", - "corert", - "any", - "base" - ], - "linuxmint.17": [ - "linuxmint.17", - "ubuntu.14.04", - "ubuntu", - "debian", - "linux", - "unix", - "any", - "base" - ], - "linuxmint.17-corert": [ - "linuxmint.17-corert", - "linuxmint.17", - "ubuntu.14.04-corert", - "ubuntu.14.04", - "ubuntu-corert", - "ubuntu", - "debian-corert", - "debian", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "linuxmint.17-x64": [ - "linuxmint.17-x64", - "linuxmint.17", - "ubuntu.14.04-x64", - "ubuntu.14.04", - "ubuntu-x64", - "ubuntu", - "debian-x64", - "debian", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "linuxmint.17-x64-corert": [ - "linuxmint.17-x64-corert", - "linuxmint.17-corert", - "linuxmint.17-x64", - "ubuntu.14.04-x64-corert", - "linuxmint.17", - "ubuntu.14.04-corert", - "ubuntu.14.04-x64", - "ubuntu.14.04", - "ubuntu-x64-corert", - "ubuntu-corert", - "ubuntu-x64", - "ubuntu", - "debian-x64-corert", - "debian-corert", - "debian-x64", - "debian", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "linuxmint.17.1": [ - "linuxmint.17.1", - "linuxmint.17", - "ubuntu.14.04", - "ubuntu", - "debian", - "linux", - "unix", - "any", - "base" - ], - "linuxmint.17.1-corert": [ - "linuxmint.17.1-corert", - "linuxmint.17.1", - "linuxmint.17-corert", - "linuxmint.17", - "ubuntu.14.04-corert", - "ubuntu.14.04", - "ubuntu-corert", - "ubuntu", - "debian-corert", - "debian", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "linuxmint.17.1-x64": [ - "linuxmint.17.1-x64", - "linuxmint.17.1", - "linuxmint.17-x64", - "linuxmint.17", - "ubuntu.14.04-x64", - "ubuntu.14.04", - "ubuntu-x64", - "ubuntu", - "debian-x64", - "debian", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "linuxmint.17.1-x64-corert": [ - "linuxmint.17.1-x64-corert", - "linuxmint.17.1-corert", - "linuxmint.17.1-x64", - "linuxmint.17.1", - "linuxmint.17-x64-corert", - "linuxmint.17-corert", - "linuxmint.17-x64", - "linuxmint.17", - "ubuntu.14.04-x64-corert", - "ubuntu.14.04-corert", - "ubuntu.14.04-x64", - "ubuntu.14.04", - "ubuntu-x64-corert", - "ubuntu-corert", - "ubuntu-x64", - "ubuntu", - "debian-x64-corert", - "debian-corert", - "debian-x64", - "debian", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "linuxmint.17.2": [ - "linuxmint.17.2", - "linuxmint.17.1", - "linuxmint.17", - "ubuntu.14.04", - "ubuntu", - "debian", - "linux", - "unix", - "any", - "base" - ], - "linuxmint.17.2-corert": [ - "linuxmint.17.2-corert", - "linuxmint.17.2", - "linuxmint.17.1-corert", - "linuxmint.17.1", - "linuxmint.17-corert", - "linuxmint.17", - "ubuntu.14.04-corert", - "ubuntu.14.04", - "ubuntu-corert", - "ubuntu", - "debian-corert", - "debian", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "linuxmint.17.2-x64": [ - "linuxmint.17.2-x64", - "linuxmint.17.2", - "linuxmint.17.1-x64", - "linuxmint.17.1", - "linuxmint.17-x64", - "linuxmint.17", - "ubuntu.14.04-x64", - "ubuntu.14.04", - "ubuntu-x64", - "ubuntu", - "debian-x64", - "debian", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "linuxmint.17.2-x64-corert": [ - "linuxmint.17.2-x64-corert", - "linuxmint.17.2-corert", - "linuxmint.17.2-x64", - "linuxmint.17.2", - "linuxmint.17.1-x64-corert", - "linuxmint.17.1-corert", - "linuxmint.17.1-x64", - "linuxmint.17.1", - "linuxmint.17-x64-corert", - "linuxmint.17-corert", - "linuxmint.17-x64", - "linuxmint.17", - "ubuntu.14.04-x64-corert", - "ubuntu.14.04-corert", - "ubuntu.14.04-x64", - "ubuntu.14.04", - "ubuntu-x64-corert", - "ubuntu-corert", - "ubuntu-x64", - "ubuntu", - "debian-x64-corert", - "debian-corert", - "debian-x64", - "debian", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "linuxmint.17.3": [ - "linuxmint.17.3", - "linuxmint.17.2", - "linuxmint.17.1", - "linuxmint.17", - "ubuntu.14.04", - "ubuntu", - "debian", - "linux", - "unix", - "any", - "base" - ], - "linuxmint.17.3-corert": [ - "linuxmint.17.3-corert", - "linuxmint.17.3", - "linuxmint.17.2-corert", - "linuxmint.17.2", - "linuxmint.17.1-corert", - "linuxmint.17.1", - "linuxmint.17-corert", - "linuxmint.17", - "ubuntu.14.04-corert", - "ubuntu.14.04", - "ubuntu-corert", - "ubuntu", - "debian-corert", - "debian", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "linuxmint.17.3-x64": [ - "linuxmint.17.3-x64", - "linuxmint.17.3", - "linuxmint.17.2-x64", - "linuxmint.17.2", - "linuxmint.17.1-x64", - "linuxmint.17.1", - "linuxmint.17-x64", - "linuxmint.17", - "ubuntu.14.04-x64", - "ubuntu.14.04", - "ubuntu-x64", - "ubuntu", - "debian-x64", - "debian", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "linuxmint.17.3-x64-corert": [ - "linuxmint.17.3-x64-corert", - "linuxmint.17.3-corert", - "linuxmint.17.3-x64", - "linuxmint.17.3", - "linuxmint.17.2-x64-corert", - "linuxmint.17.2-corert", - "linuxmint.17.2-x64", - "linuxmint.17.2", - "linuxmint.17.1-x64-corert", - "linuxmint.17.1-corert", - "linuxmint.17.1-x64", - "linuxmint.17.1", - "linuxmint.17-x64-corert", - "linuxmint.17-corert", - "linuxmint.17-x64", - "linuxmint.17", - "ubuntu.14.04-x64-corert", - "ubuntu.14.04-corert", - "ubuntu.14.04-x64", - "ubuntu.14.04", - "ubuntu-x64-corert", - "ubuntu-corert", - "ubuntu-x64", - "ubuntu", - "debian-x64-corert", - "debian-corert", - "debian-x64", - "debian", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "linuxmint.18": [ - "linuxmint.18", - "ubuntu.16.04", - "ubuntu", - "debian", - "linux", - "unix", - "any", - "base" - ], - "linuxmint.18-corert": [ - "linuxmint.18-corert", - "linuxmint.18", - "ubuntu.16.04-corert", - "ubuntu.16.04", - "ubuntu-corert", - "ubuntu", - "debian-corert", - "debian", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "linuxmint.18-x64": [ - "linuxmint.18-x64", - "linuxmint.18", - "ubuntu.16.04-x64", - "ubuntu.16.04", - "ubuntu-x64", - "ubuntu", - "debian-x64", - "debian", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "linuxmint.18-x64-corert": [ - "linuxmint.18-x64-corert", - "linuxmint.18-corert", - "linuxmint.18-x64", - "ubuntu.16.04-x64-corert", - "linuxmint.18", - "ubuntu.16.04-corert", - "ubuntu.16.04-x64", - "ubuntu.16.04", - "ubuntu-x64-corert", - "ubuntu-corert", - "ubuntu-x64", - "ubuntu", - "debian-x64-corert", - "debian-corert", - "debian-x64", - "debian", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "linuxmint.18.1": [ - "linuxmint.18.1", - "linuxmint.18", - "ubuntu.16.04", - "ubuntu", - "debian", - "linux", - "unix", - "any", - "base" - ], - "linuxmint.18.1-corert": [ - "linuxmint.18.1-corert", - "linuxmint.18.1", - "linuxmint.18-corert", - "linuxmint.18", - "ubuntu.16.04-corert", - "ubuntu.16.04", - "ubuntu-corert", - "ubuntu", - "debian-corert", - "debian", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "linuxmint.18.1-x64": [ - "linuxmint.18.1-x64", - "linuxmint.18.1", - "linuxmint.18-x64", - "linuxmint.18", - "ubuntu.16.04-x64", - "ubuntu.16.04", - "ubuntu-x64", - "ubuntu", - "debian-x64", - "debian", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "linuxmint.18.1-x64-corert": [ - "linuxmint.18.1-x64-corert", - "linuxmint.18.1-corert", - "linuxmint.18.1-x64", - "linuxmint.18.1", - "linuxmint.18-x64-corert", - "linuxmint.18-corert", - "linuxmint.18-x64", - "linuxmint.18", - "ubuntu.16.04-x64-corert", - "ubuntu.16.04-corert", - "ubuntu.16.04-x64", - "ubuntu.16.04", - "ubuntu-x64-corert", - "ubuntu-corert", - "ubuntu-x64", - "ubuntu", - "debian-x64-corert", - "debian-corert", - "debian-x64", - "debian", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "ol": [ - "ol", - "rhel", - "linux", - "unix", - "any", - "base" - ], - "ol-corert": [ - "ol-corert", - "ol", - "rhel-corert", - "rhel", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "ol-x64": [ - "ol-x64", - "ol", - "rhel-x64", - "rhel", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "ol-x64-corert": [ - "ol-x64-corert", - "ol-corert", - "ol-x64", - "rhel-x64-corert", - "ol", - "rhel-corert", - "rhel-x64", - "linux-x64-corert", - "rhel", - "linux-corert", - "linux-x64", - "unix-x64-corert", - "linux", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "ol.7": [ - "ol.7", - "ol", - "rhel.7", - "rhel", - "linux", - "unix", - "any", - "base" - ], - "ol.7-corert": [ - "ol.7-corert", - "ol.7", - "ol-corert", - "rhel.7-corert", - "ol", - "rhel.7", - "rhel-corert", - "rhel", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "ol.7-x64": [ - "ol.7-x64", - "ol.7", - "ol-x64", - "rhel.7-x64", - "ol", - "rhel.7", - "rhel-x64", - "rhel", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "ol.7-x64-corert": [ - "ol.7-x64-corert", - "ol.7-corert", - "ol.7-x64", - "ol.7", - "ol-x64-corert", - "ol-corert", - "rhel.7-corert", - "ol-x64", - "rhel.7-x64", - "ol", - "rhel.7", - "rhel-x64-corert", - "rhel-corert", - "rhel-x64", - "rhel", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "ol.7.0": [ - "ol.7.0", - "ol.7", - "rhel.7.0", - "ol", - "rhel.7", - "rhel", - "linux", - "unix", - "any", - "base" - ], - "ol.7.0-corert": [ - "ol.7.0-corert", - "ol.7.0", - "ol.7-corert", - "rhel.7.0-corert", - "ol.7", - "rhel.7.0", - "ol-corert", - "rhel.7-corert", - "ol", - "rhel.7", - "rhel-corert", - "rhel", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "ol.7.0-x64": [ - "ol.7.0-x64", - "ol.7.0", - "ol.7-x64", - "rhel.7.0-x64", - "ol.7", - "rhel.7.0", - "ol-x64", - "rhel.7-x64", - "ol", - "rhel.7", - "rhel-x64", - "rhel", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "ol.7.0-x64-corert": [ - "ol.7.0-x64-corert", - "ol.7.0-corert", - "ol.7.0-x64", - "ol.7.0", - "ol.7-x64-corert", - "ol.7-corert", - "rhel.7.0-corert", - "ol.7-x64", - "rhel.7.0-x64", - "ol.7", - "rhel.7.0", - "ol-x64-corert", - "ol-corert", - "rhel.7-corert", - "ol-x64", - "rhel.7-x64", - "ol", - "rhel.7", - "rhel-x64-corert", - "rhel-corert", - "rhel-x64", - "rhel", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "ol.7.1": [ - "ol.7.1", - "ol.7.0", - "rhel.7.1", - "ol.7", - "rhel.7.0", - "ol", - "rhel.7", - "rhel", - "linux", - "unix", - "any", - "base" - ], - "ol.7.1-corert": [ - "ol.7.1-corert", - "ol.7.1", - "ol.7.0-corert", - "rhel.7.1-corert", - "ol.7.0", - "rhel.7.1", - "ol.7-corert", - "rhel.7.0-corert", - "ol.7", - "rhel.7.0", - "ol-corert", - "rhel.7-corert", - "ol", - "rhel.7", - "rhel-corert", - "rhel", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "ol.7.1-x64": [ - "ol.7.1-x64", - "ol.7.1", - "ol.7.0-x64", - "rhel.7.1-x64", - "ol.7.0", - "rhel.7.1", - "ol.7-x64", - "rhel.7.0-x64", - "ol.7", - "rhel.7.0", - "ol-x64", - "rhel.7-x64", - "ol", - "rhel.7", - "rhel-x64", - "rhel", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "ol.7.1-x64-corert": [ - "ol.7.1-x64-corert", - "ol.7.1-corert", - "ol.7.1-x64", - "ol.7.1", - "ol.7.0-x64-corert", - "ol.7.0-corert", - "rhel.7.1-corert", - "ol.7.0-x64", - "rhel.7.1-x64", - "ol.7.0", - "rhel.7.1", - "ol.7-x64-corert", - "ol.7-corert", - "rhel.7.0-corert", - "ol.7-x64", - "rhel.7.0-x64", - "ol.7", - "rhel.7.0", - "ol-x64-corert", - "ol-corert", - "rhel.7-corert", - "ol-x64", - "rhel.7-x64", - "ol", - "rhel.7", - "rhel-x64-corert", - "rhel-corert", - "rhel-x64", - "rhel", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "ol.7.2": [ - "ol.7.2", - "ol.7.1", - "rhel.7.2", - "ol.7.0", - "rhel.7.1", - "ol.7", - "rhel.7.0", - "ol", - "rhel.7", - "rhel", - "linux", - "unix", - "any", - "base" - ], - "ol.7.2-corert": [ - "ol.7.2-corert", - "ol.7.2", - "ol.7.1-corert", - "rhel.7.2-corert", - "ol.7.1", - "rhel.7.2", - "ol.7.0-corert", - "rhel.7.1-corert", - "ol.7.0", - "rhel.7.1", - "ol.7-corert", - "rhel.7.0-corert", - "ol.7", - "rhel.7.0", - "ol-corert", - "rhel.7-corert", - "ol", - "rhel.7", - "rhel-corert", - "rhel", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "ol.7.2-x64": [ - "ol.7.2-x64", - "ol.7.2", - "ol.7.1-x64", - "rhel.7.2-x64", - "ol.7.1", - "rhel.7.2", - "ol.7.0-x64", - "rhel.7.1-x64", - "ol.7.0", - "rhel.7.1", - "ol.7-x64", - "rhel.7.0-x64", - "ol.7", - "rhel.7.0", - "ol-x64", - "rhel.7-x64", - "ol", - "rhel.7", - "rhel-x64", - "rhel", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "ol.7.2-x64-corert": [ - "ol.7.2-x64-corert", - "ol.7.2-corert", - "ol.7.2-x64", - "ol.7.2", - "ol.7.1-x64-corert", - "ol.7.1-corert", - "rhel.7.2-corert", - "ol.7.1-x64", - "rhel.7.2-x64", - "ol.7.1", - "rhel.7.2", - "ol.7.0-x64-corert", - "ol.7.0-corert", - "rhel.7.1-corert", - "ol.7.0-x64", - "rhel.7.1-x64", - "ol.7.0", - "rhel.7.1", - "ol.7-x64-corert", - "ol.7-corert", - "rhel.7.0-corert", - "ol.7-x64", - "rhel.7.0-x64", - "ol.7", - "rhel.7.0", - "ol-x64-corert", - "ol-corert", - "rhel.7-corert", - "ol-x64", - "rhel.7-x64", - "ol", - "rhel.7", - "rhel-x64-corert", - "rhel-corert", - "rhel-x64", - "rhel", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "opensuse": [ - "opensuse", - "linux", - "unix", - "any", - "base" - ], - "opensuse-corert": [ - "opensuse-corert", - "opensuse", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "opensuse-x64": [ - "opensuse-x64", - "opensuse", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "opensuse-x64-corert": [ - "opensuse-x64-corert", - "opensuse-corert", - "opensuse-x64", - "linux-x64-corert", - "opensuse", - "linux-corert", - "linux-x64", - "unix-x64-corert", - "linux", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "opensuse.13.2": [ - "opensuse.13.2", - "opensuse", - "linux", - "unix", - "any", - "base" - ], - "opensuse.13.2-corert": [ - "opensuse.13.2-corert", - "opensuse.13.2", - "opensuse-corert", - "opensuse", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "opensuse.13.2-x64": [ - "opensuse.13.2-x64", - "opensuse.13.2", - "opensuse-x64", - "opensuse", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "opensuse.13.2-x64-corert": [ - "opensuse.13.2-x64-corert", - "opensuse.13.2-corert", - "opensuse.13.2-x64", - "opensuse.13.2", - "opensuse-x64-corert", - "opensuse-corert", - "opensuse-x64", - "opensuse", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "opensuse.42.1": [ - "opensuse.42.1", - "opensuse", - "linux", - "unix", - "any", - "base" - ], - "opensuse.42.1-corert": [ - "opensuse.42.1-corert", - "opensuse.42.1", - "opensuse-corert", - "opensuse", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "opensuse.42.1-x64": [ - "opensuse.42.1-x64", - "opensuse.42.1", - "opensuse-x64", - "opensuse", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "opensuse.42.1-x64-corert": [ - "opensuse.42.1-x64-corert", - "opensuse.42.1-corert", - "opensuse.42.1-x64", - "opensuse.42.1", - "opensuse-x64-corert", - "opensuse-corert", - "opensuse-x64", - "opensuse", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "osx": [ - "osx", - "unix", - "any", - "base" - ], - "osx-corert": [ - "osx-corert", - "osx", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "osx-x64": [ - "osx-x64", - "osx", - "unix-x64", - "unix", - "any", - "base" - ], - "osx-x64-corert": [ - "osx-x64-corert", - "osx-corert", - "osx-x64", - "unix-x64-corert", - "osx", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "osx.10.10": [ - "osx.10.10", - "osx", - "unix", - "any", - "base" - ], - "osx.10.10-corert": [ - "osx.10.10-corert", - "osx.10.10", - "osx-corert", - "osx", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "osx.10.10-x64": [ - "osx.10.10-x64", - "osx.10.10", - "osx-x64", - "osx", - "unix-x64", - "unix", - "any", - "base" - ], - "osx.10.10-x64-corert": [ - "osx.10.10-x64-corert", - "osx.10.10-corert", - "osx.10.10-x64", - "osx.10.10", - "osx-x64-corert", - "osx-corert", - "osx-x64", - "osx", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "osx.10.11": [ - "osx.10.11", - "osx.10.10", - "osx", - "unix", - "any", - "base" - ], - "osx.10.11-corert": [ - "osx.10.11-corert", - "osx.10.11", - "osx.10.10-corert", - "osx.10.10", - "osx-corert", - "osx", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "osx.10.11-x64": [ - "osx.10.11-x64", - "osx.10.11", - "osx.10.10-x64", - "osx.10.10", - "osx-x64", - "osx", - "unix-x64", - "unix", - "any", - "base" - ], - "osx.10.11-x64-corert": [ - "osx.10.11-x64-corert", - "osx.10.11-corert", - "osx.10.11-x64", - "osx.10.11", - "osx.10.10-x64-corert", - "osx.10.10-corert", - "osx.10.10-x64", - "osx.10.10", - "osx-x64-corert", - "osx-corert", - "osx-x64", - "osx", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "osx.10.12": [ - "osx.10.12", - "osx.10.11", - "osx.10.10", - "osx", - "unix", - "any", - "base" - ], - "osx.10.12-corert": [ - "osx.10.12-corert", - "osx.10.12", - "osx.10.11-corert", - "osx.10.11", - "osx.10.10-corert", - "osx.10.10", - "osx-corert", - "osx", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "osx.10.12-x64": [ - "osx.10.12-x64", - "osx.10.12", - "osx.10.11-x64", - "osx.10.11", - "osx.10.10-x64", - "osx.10.10", - "osx-x64", - "osx", - "unix-x64", - "unix", - "any", - "base" - ], - "osx.10.12-x64-corert": [ - "osx.10.12-x64-corert", - "osx.10.12-corert", - "osx.10.12-x64", - "osx.10.12", - "osx.10.11-x64-corert", - "osx.10.11-corert", - "osx.10.11-x64", - "osx.10.11", - "osx.10.10-x64-corert", - "osx.10.10-corert", - "osx.10.10-x64", - "osx.10.10", - "osx-x64-corert", - "osx-corert", - "osx-x64", - "osx", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "rhel": [ - "rhel", - "linux", - "unix", - "any", - "base" - ], - "rhel-corert": [ - "rhel-corert", - "rhel", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "rhel-x64": [ - "rhel-x64", - "rhel", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "rhel-x64-corert": [ - "rhel-x64-corert", - "rhel-corert", - "rhel-x64", - "linux-x64-corert", - "rhel", - "linux-corert", - "linux-x64", - "unix-x64-corert", - "linux", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "rhel.6": [ - "rhel.6", - "rhel", - "linux", - "unix", - "any", - "base" - ], - "rhel.6-corert": [ - "rhel.6-corert", - "rhel.6", - "rhel-corert", - "rhel", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "rhel.6-x64": [ - "rhel.6-x64", - "rhel.6", - "rhel-x64", - "rhel", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "rhel.6-x64-corert": [ - "rhel.6-x64-corert", - "rhel.6-corert", - "rhel.6-x64", - "rhel.6", - "rhel-x64-corert", - "rhel-corert", - "rhel-x64", - "rhel", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "rhel.7": [ - "rhel.7", - "rhel", - "linux", - "unix", - "any", - "base" - ], - "rhel.7-corert": [ - "rhel.7-corert", - "rhel.7", - "rhel-corert", - "rhel", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "rhel.7-x64": [ - "rhel.7-x64", - "rhel.7", - "rhel-x64", - "rhel", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "rhel.7-x64-corert": [ - "rhel.7-x64-corert", - "rhel.7-corert", - "rhel.7-x64", - "rhel.7", - "rhel-x64-corert", - "rhel-corert", - "rhel-x64", - "rhel", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "rhel.7.0": [ - "rhel.7.0", - "rhel.7", - "rhel", - "linux", - "unix", - "any", - "base" - ], - "rhel.7.0-corert": [ - "rhel.7.0-corert", - "rhel.7.0", - "rhel.7-corert", - "rhel.7", - "rhel-corert", - "rhel", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "rhel.7.0-x64": [ - "rhel.7.0-x64", - "rhel.7.0", - "rhel.7-x64", - "rhel.7", - "rhel-x64", - "rhel", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "rhel.7.0-x64-corert": [ - "rhel.7.0-x64-corert", - "rhel.7.0-corert", - "rhel.7.0-x64", - "rhel.7.0", - "rhel.7-x64-corert", - "rhel.7-corert", - "rhel.7-x64", - "rhel.7", - "rhel-x64-corert", - "rhel-corert", - "rhel-x64", - "rhel", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "rhel.7.1": [ - "rhel.7.1", - "rhel.7.0", - "rhel.7", - "rhel", - "linux", - "unix", - "any", - "base" - ], - "rhel.7.1-corert": [ - "rhel.7.1-corert", - "rhel.7.1", - "rhel.7.0-corert", - "rhel.7.0", - "rhel.7-corert", - "rhel.7", - "rhel-corert", - "rhel", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "rhel.7.1-x64": [ - "rhel.7.1-x64", - "rhel.7.1", - "rhel.7.0-x64", - "rhel.7.0", - "rhel.7-x64", - "rhel.7", - "rhel-x64", - "rhel", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "rhel.7.1-x64-corert": [ - "rhel.7.1-x64-corert", - "rhel.7.1-corert", - "rhel.7.1-x64", - "rhel.7.1", - "rhel.7.0-x64-corert", - "rhel.7.0-corert", - "rhel.7.0-x64", - "rhel.7.0", - "rhel.7-x64-corert", - "rhel.7-corert", - "rhel.7-x64", - "rhel.7", - "rhel-x64-corert", - "rhel-corert", - "rhel-x64", - "rhel", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "rhel.7.2": [ - "rhel.7.2", - "rhel.7.1", - "rhel.7.0", - "rhel.7", - "rhel", - "linux", - "unix", - "any", - "base" - ], - "rhel.7.2-corert": [ - "rhel.7.2-corert", - "rhel.7.2", - "rhel.7.1-corert", - "rhel.7.1", - "rhel.7.0-corert", - "rhel.7.0", - "rhel.7-corert", - "rhel.7", - "rhel-corert", - "rhel", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "rhel.7.2-x64": [ - "rhel.7.2-x64", - "rhel.7.2", - "rhel.7.1-x64", - "rhel.7.1", - "rhel.7.0-x64", - "rhel.7.0", - "rhel.7-x64", - "rhel.7", - "rhel-x64", - "rhel", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "rhel.7.2-x64-corert": [ - "rhel.7.2-x64-corert", - "rhel.7.2-corert", - "rhel.7.2-x64", - "rhel.7.2", - "rhel.7.1-x64-corert", - "rhel.7.1-corert", - "rhel.7.1-x64", - "rhel.7.1", - "rhel.7.0-x64-corert", - "rhel.7.0-corert", - "rhel.7.0-x64", - "rhel.7.0", - "rhel.7-x64-corert", - "rhel.7-corert", - "rhel.7-x64", - "rhel.7", - "rhel-x64-corert", - "rhel-corert", - "rhel-x64", - "rhel", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "rhel.7.3": [ - "rhel.7.3", - "rhel.7.2", - "rhel.7.1", - "rhel.7.0", - "rhel.7", - "rhel", - "linux", - "unix", - "any", - "base" - ], - "rhel.7.3-corert": [ - "rhel.7.3-corert", - "rhel.7.3", - "rhel.7.2-corert", - "rhel.7.2", - "rhel.7.1-corert", - "rhel.7.1", - "rhel.7.0-corert", - "rhel.7.0", - "rhel.7-corert", - "rhel.7", - "rhel-corert", - "rhel", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "rhel.7.3-x64": [ - "rhel.7.3-x64", - "rhel.7.3", - "rhel.7.2-x64", - "rhel.7.2", - "rhel.7.1-x64", - "rhel.7.1", - "rhel.7.0-x64", - "rhel.7.0", - "rhel.7-x64", - "rhel.7", - "rhel-x64", - "rhel", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "rhel.7.3-x64-corert": [ - "rhel.7.3-x64-corert", - "rhel.7.3-corert", - "rhel.7.3-x64", - "rhel.7.3", - "rhel.7.2-x64-corert", - "rhel.7.2-corert", - "rhel.7.2-x64", - "rhel.7.2", - "rhel.7.1-x64-corert", - "rhel.7.1-corert", - "rhel.7.1-x64", - "rhel.7.1", - "rhel.7.0-x64-corert", - "rhel.7.0-corert", - "rhel.7.0-x64", - "rhel.7.0", - "rhel.7-x64-corert", - "rhel.7-corert", - "rhel.7-x64", - "rhel.7", - "rhel-x64-corert", - "rhel-corert", - "rhel-x64", - "rhel", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "rhel.7.4": [ - "rhel.7.4", - "rhel.7.3", - "rhel.7.2", - "rhel.7.1", - "rhel.7.0", - "rhel.7", - "rhel", - "linux", - "unix", - "any", - "base" - ], - "rhel.7.4-corert": [ - "rhel.7.4-corert", - "rhel.7.4", - "rhel.7.3-corert", - "rhel.7.3", - "rhel.7.2-corert", - "rhel.7.2", - "rhel.7.1-corert", - "rhel.7.1", - "rhel.7.0-corert", - "rhel.7.0", - "rhel.7-corert", - "rhel.7", - "rhel-corert", - "rhel", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "rhel.7.4-x64": [ - "rhel.7.4-x64", - "rhel.7.4", - "rhel.7.3-x64", - "rhel.7.3", - "rhel.7.2-x64", - "rhel.7.2", - "rhel.7.1-x64", - "rhel.7.1", - "rhel.7.0-x64", - "rhel.7.0", - "rhel.7-x64", - "rhel.7", - "rhel-x64", - "rhel", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "rhel.7.4-x64-corert": [ - "rhel.7.4-x64-corert", - "rhel.7.4-corert", - "rhel.7.4-x64", - "rhel.7.4", - "rhel.7.3-x64-corert", - "rhel.7.3-corert", - "rhel.7.3-x64", - "rhel.7.3", - "rhel.7.2-x64-corert", - "rhel.7.2-corert", - "rhel.7.2-x64", - "rhel.7.2", - "rhel.7.1-x64-corert", - "rhel.7.1-corert", - "rhel.7.1-x64", - "rhel.7.1", - "rhel.7.0-x64-corert", - "rhel.7.0-corert", - "rhel.7.0-x64", - "rhel.7.0", - "rhel.7-x64-corert", - "rhel.7-corert", - "rhel.7-x64", - "rhel.7", - "rhel-x64-corert", - "rhel-corert", - "rhel-x64", - "rhel", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "tizen": [ - "tizen", - "linux", - "unix", - "any", - "base" - ], - "tizen-armel": [ - "tizen-armel", - "tizen", - "linux-armel", - "linux", - "unix-armel", - "unix", - "any", - "base" - ], - "tizen-armel-corert": [ - "tizen-armel-corert", - "tizen-corert", - "tizen-armel", - "linux-armel-corert", - "tizen", - "linux-corert", - "linux-armel", - "unix-armel-corert", - "linux", - "unix-corert", - "unix-armel", - "unix", - "corert", - "any", - "base" - ], - "tizen-corert": [ - "tizen-corert", - "tizen", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "tizen.4.0.0": [ - "tizen.4.0.0", - "tizen", - "linux", - "unix", - "any", - "base" - ], - "tizen.4.0.0-armel": [ - "tizen.4.0.0-armel", - "tizen.4.0.0", - "tizen-armel", - "tizen", - "linux-armel", - "linux", - "unix-armel", - "unix", - "any", - "base" - ], - "tizen.4.0.0-armel-corert": [ - "tizen.4.0.0-armel-corert", - "tizen.4.0.0-corert", - "tizen.4.0.0-armel", - "tizen.4.0.0", - "tizen-armel-corert", - "tizen-corert", - "tizen-armel", - "tizen", - "linux-armel-corert", - "linux-corert", - "linux-armel", - "linux", - "unix-armel-corert", - "unix-corert", - "unix-armel", - "unix", - "corert", - "any", - "base" - ], - "tizen.4.0.0-corert": [ - "tizen.4.0.0-corert", - "tizen.4.0.0", - "tizen-corert", - "tizen", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "ubuntu": [ - "ubuntu", - "debian", - "linux", - "unix", - "any", - "base" - ], - "ubuntu-arm": [ - "ubuntu-arm", - "ubuntu", - "debian-arm", - "debian", - "linux-arm", - "linux", - "unix-arm", - "unix", - "any", - "base" - ], - "ubuntu-arm-corert": [ - "ubuntu-arm-corert", - "ubuntu-corert", - "ubuntu-arm", - "debian-arm-corert", - "ubuntu", - "debian-corert", - "debian-arm", - "linux-arm-corert", - "debian", - "linux-corert", - "linux-arm", - "unix-arm-corert", - "linux", - "unix-corert", - "unix-arm", - "unix", - "corert", - "any", - "base" - ], - "ubuntu-arm64": [ - "ubuntu-arm64", - "ubuntu", - "debian-arm64", - "debian", - "linux-arm64", - "linux", - "unix-arm64", - "unix", - "any", - "base" - ], - "ubuntu-arm64-corert": [ - "ubuntu-arm64-corert", - "ubuntu-corert", - "ubuntu-arm64", - "debian-arm64-corert", - "ubuntu", - "debian-corert", - "debian-arm64", - "linux-arm64-corert", - "debian", - "linux-corert", - "linux-arm64", - "unix-arm64-corert", - "linux", - "unix-corert", - "unix-arm64", - "unix", - "corert", - "any", - "base" - ], - "ubuntu-corert": [ - "ubuntu-corert", - "ubuntu", - "debian-corert", - "debian", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "ubuntu-x64": [ - "ubuntu-x64", - "ubuntu", - "debian-x64", - "debian", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "ubuntu-x64-corert": [ - "ubuntu-x64-corert", - "ubuntu-corert", - "ubuntu-x64", - "debian-x64-corert", - "ubuntu", - "debian-corert", - "debian-x64", - "linux-x64-corert", - "debian", - "linux-corert", - "linux-x64", - "unix-x64-corert", - "linux", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "ubuntu-x86": [ - "ubuntu-x86", - "ubuntu", - "debian-x86", - "debian", - "linux-x86", - "linux", - "unix-x86", - "unix", - "any", - "base" - ], - "ubuntu-x86-corert": [ - "ubuntu-x86-corert", - "ubuntu-corert", - "ubuntu-x86", - "debian-x86-corert", - "ubuntu", - "debian-corert", - "debian-x86", - "linux-x86-corert", - "debian", - "linux-corert", - "linux-x86", - "unix-x86-corert", - "linux", - "unix-corert", - "unix-x86", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.14.04": [ - "ubuntu.14.04", - "ubuntu", - "debian", - "linux", - "unix", - "any", - "base" - ], - "ubuntu.14.04-arm": [ - "ubuntu.14.04-arm", - "ubuntu.14.04", - "ubuntu-arm", - "ubuntu", - "debian-arm", - "debian", - "linux-arm", - "linux", - "unix-arm", - "unix", - "any", - "base" - ], - "ubuntu.14.04-arm-corert": [ - "ubuntu.14.04-arm-corert", - "ubuntu.14.04-corert", - "ubuntu.14.04-arm", - "ubuntu.14.04", - "ubuntu-arm-corert", - "ubuntu-corert", - "ubuntu-arm", - "ubuntu", - "debian-arm-corert", - "debian-corert", - "debian-arm", - "debian", - "linux-arm-corert", - "linux-corert", - "linux-arm", - "linux", - "unix-arm-corert", - "unix-corert", - "unix-arm", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.14.04-corert": [ - "ubuntu.14.04-corert", - "ubuntu.14.04", - "ubuntu-corert", - "ubuntu", - "debian-corert", - "debian", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.14.04-x64": [ - "ubuntu.14.04-x64", - "ubuntu.14.04", - "ubuntu-x64", - "ubuntu", - "debian-x64", - "debian", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "ubuntu.14.04-x64-corert": [ - "ubuntu.14.04-x64-corert", - "ubuntu.14.04-corert", - "ubuntu.14.04-x64", - "ubuntu.14.04", - "ubuntu-x64-corert", - "ubuntu-corert", - "ubuntu-x64", - "ubuntu", - "debian-x64-corert", - "debian-corert", - "debian-x64", - "debian", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.14.04-x86": [ - "ubuntu.14.04-x86", - "ubuntu.14.04", - "ubuntu-x86", - "ubuntu", - "debian-x86", - "debian", - "linux-x86", - "linux", - "unix-x86", - "unix", - "any", - "base" - ], - "ubuntu.14.04-x86-corert": [ - "ubuntu.14.04-x86-corert", - "ubuntu.14.04-corert", - "ubuntu.14.04-x86", - "ubuntu.14.04", - "ubuntu-x86-corert", - "ubuntu-corert", - "ubuntu-x86", - "ubuntu", - "debian-x86-corert", - "debian-corert", - "debian-x86", - "debian", - "linux-x86-corert", - "linux-corert", - "linux-x86", - "linux", - "unix-x86-corert", - "unix-corert", - "unix-x86", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.14.10": [ - "ubuntu.14.10", - "ubuntu", - "debian", - "linux", - "unix", - "any", - "base" - ], - "ubuntu.14.10-arm": [ - "ubuntu.14.10-arm", - "ubuntu.14.10", - "ubuntu-arm", - "ubuntu", - "debian-arm", - "debian", - "linux-arm", - "linux", - "unix-arm", - "unix", - "any", - "base" - ], - "ubuntu.14.10-arm-corert": [ - "ubuntu.14.10-arm-corert", - "ubuntu.14.10-corert", - "ubuntu.14.10-arm", - "ubuntu.14.10", - "ubuntu-arm-corert", - "ubuntu-corert", - "ubuntu-arm", - "ubuntu", - "debian-arm-corert", - "debian-corert", - "debian-arm", - "debian", - "linux-arm-corert", - "linux-corert", - "linux-arm", - "linux", - "unix-arm-corert", - "unix-corert", - "unix-arm", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.14.10-corert": [ - "ubuntu.14.10-corert", - "ubuntu.14.10", - "ubuntu-corert", - "ubuntu", - "debian-corert", - "debian", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.14.10-x64": [ - "ubuntu.14.10-x64", - "ubuntu.14.10", - "ubuntu-x64", - "ubuntu", - "debian-x64", - "debian", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "ubuntu.14.10-x64-corert": [ - "ubuntu.14.10-x64-corert", - "ubuntu.14.10-corert", - "ubuntu.14.10-x64", - "ubuntu.14.10", - "ubuntu-x64-corert", - "ubuntu-corert", - "ubuntu-x64", - "ubuntu", - "debian-x64-corert", - "debian-corert", - "debian-x64", - "debian", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.14.10-x86": [ - "ubuntu.14.10-x86", - "ubuntu.14.10", - "ubuntu-x86", - "ubuntu", - "debian-x86", - "debian", - "linux-x86", - "linux", - "unix-x86", - "unix", - "any", - "base" - ], - "ubuntu.14.10-x86-corert": [ - "ubuntu.14.10-x86-corert", - "ubuntu.14.10-corert", - "ubuntu.14.10-x86", - "ubuntu.14.10", - "ubuntu-x86-corert", - "ubuntu-corert", - "ubuntu-x86", - "ubuntu", - "debian-x86-corert", - "debian-corert", - "debian-x86", - "debian", - "linux-x86-corert", - "linux-corert", - "linux-x86", - "linux", - "unix-x86-corert", - "unix-corert", - "unix-x86", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.15.04": [ - "ubuntu.15.04", - "ubuntu", - "debian", - "linux", - "unix", - "any", - "base" - ], - "ubuntu.15.04-arm": [ - "ubuntu.15.04-arm", - "ubuntu.15.04", - "ubuntu-arm", - "ubuntu", - "debian-arm", - "debian", - "linux-arm", - "linux", - "unix-arm", - "unix", - "any", - "base" - ], - "ubuntu.15.04-arm-corert": [ - "ubuntu.15.04-arm-corert", - "ubuntu.15.04-corert", - "ubuntu.15.04-arm", - "ubuntu.15.04", - "ubuntu-arm-corert", - "ubuntu-corert", - "ubuntu-arm", - "ubuntu", - "debian-arm-corert", - "debian-corert", - "debian-arm", - "debian", - "linux-arm-corert", - "linux-corert", - "linux-arm", - "linux", - "unix-arm-corert", - "unix-corert", - "unix-arm", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.15.04-corert": [ - "ubuntu.15.04-corert", - "ubuntu.15.04", - "ubuntu-corert", - "ubuntu", - "debian-corert", - "debian", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.15.04-x64": [ - "ubuntu.15.04-x64", - "ubuntu.15.04", - "ubuntu-x64", - "ubuntu", - "debian-x64", - "debian", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "ubuntu.15.04-x64-corert": [ - "ubuntu.15.04-x64-corert", - "ubuntu.15.04-corert", - "ubuntu.15.04-x64", - "ubuntu.15.04", - "ubuntu-x64-corert", - "ubuntu-corert", - "ubuntu-x64", - "ubuntu", - "debian-x64-corert", - "debian-corert", - "debian-x64", - "debian", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.15.04-x86": [ - "ubuntu.15.04-x86", - "ubuntu.15.04", - "ubuntu-x86", - "ubuntu", - "debian-x86", - "debian", - "linux-x86", - "linux", - "unix-x86", - "unix", - "any", - "base" - ], - "ubuntu.15.04-x86-corert": [ - "ubuntu.15.04-x86-corert", - "ubuntu.15.04-corert", - "ubuntu.15.04-x86", - "ubuntu.15.04", - "ubuntu-x86-corert", - "ubuntu-corert", - "ubuntu-x86", - "ubuntu", - "debian-x86-corert", - "debian-corert", - "debian-x86", - "debian", - "linux-x86-corert", - "linux-corert", - "linux-x86", - "linux", - "unix-x86-corert", - "unix-corert", - "unix-x86", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.15.10": [ - "ubuntu.15.10", - "ubuntu", - "debian", - "linux", - "unix", - "any", - "base" - ], - "ubuntu.15.10-arm": [ - "ubuntu.15.10-arm", - "ubuntu.15.10", - "ubuntu-arm", - "ubuntu", - "debian-arm", - "debian", - "linux-arm", - "linux", - "unix-arm", - "unix", - "any", - "base" - ], - "ubuntu.15.10-arm-corert": [ - "ubuntu.15.10-arm-corert", - "ubuntu.15.10-corert", - "ubuntu.15.10-arm", - "ubuntu.15.10", - "ubuntu-arm-corert", - "ubuntu-corert", - "ubuntu-arm", - "ubuntu", - "debian-arm-corert", - "debian-corert", - "debian-arm", - "debian", - "linux-arm-corert", - "linux-corert", - "linux-arm", - "linux", - "unix-arm-corert", - "unix-corert", - "unix-arm", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.15.10-corert": [ - "ubuntu.15.10-corert", - "ubuntu.15.10", - "ubuntu-corert", - "ubuntu", - "debian-corert", - "debian", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.15.10-x64": [ - "ubuntu.15.10-x64", - "ubuntu.15.10", - "ubuntu-x64", - "ubuntu", - "debian-x64", - "debian", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "ubuntu.15.10-x64-corert": [ - "ubuntu.15.10-x64-corert", - "ubuntu.15.10-corert", - "ubuntu.15.10-x64", - "ubuntu.15.10", - "ubuntu-x64-corert", - "ubuntu-corert", - "ubuntu-x64", - "ubuntu", - "debian-x64-corert", - "debian-corert", - "debian-x64", - "debian", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.15.10-x86": [ - "ubuntu.15.10-x86", - "ubuntu.15.10", - "ubuntu-x86", - "ubuntu", - "debian-x86", - "debian", - "linux-x86", - "linux", - "unix-x86", - "unix", - "any", - "base" - ], - "ubuntu.15.10-x86-corert": [ - "ubuntu.15.10-x86-corert", - "ubuntu.15.10-corert", - "ubuntu.15.10-x86", - "ubuntu.15.10", - "ubuntu-x86-corert", - "ubuntu-corert", - "ubuntu-x86", - "ubuntu", - "debian-x86-corert", - "debian-corert", - "debian-x86", - "debian", - "linux-x86-corert", - "linux-corert", - "linux-x86", - "linux", - "unix-x86-corert", - "unix-corert", - "unix-x86", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.16.04": [ - "ubuntu.16.04", - "ubuntu", - "debian", - "linux", - "unix", - "any", - "base" - ], - "ubuntu.16.04-arm": [ - "ubuntu.16.04-arm", - "ubuntu.16.04", - "ubuntu-arm", - "ubuntu", - "debian-arm", - "debian", - "linux-arm", - "linux", - "unix-arm", - "unix", - "any", - "base" - ], - "ubuntu.16.04-arm-corert": [ - "ubuntu.16.04-arm-corert", - "ubuntu.16.04-corert", - "ubuntu.16.04-arm", - "ubuntu.16.04", - "ubuntu-arm-corert", - "ubuntu-corert", - "ubuntu-arm", - "ubuntu", - "debian-arm-corert", - "debian-corert", - "debian-arm", - "debian", - "linux-arm-corert", - "linux-corert", - "linux-arm", - "linux", - "unix-arm-corert", - "unix-corert", - "unix-arm", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.16.04-arm64": [ - "ubuntu.16.04-arm64", - "ubuntu.16.04", - "ubuntu-arm64", - "ubuntu", - "debian-arm64", - "debian", - "linux-arm64", - "linux", - "unix-arm64", - "unix", - "any", - "base" - ], - "ubuntu.16.04-arm64-corert": [ - "ubuntu.16.04-arm64-corert", - "ubuntu.16.04-corert", - "ubuntu.16.04-arm64", - "ubuntu.16.04", - "ubuntu-arm64-corert", - "ubuntu-corert", - "ubuntu-arm64", - "ubuntu", - "debian-arm64-corert", - "debian-corert", - "debian-arm64", - "debian", - "linux-arm64-corert", - "linux-corert", - "linux-arm64", - "linux", - "unix-arm64-corert", - "unix-corert", - "unix-arm64", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.16.04-corert": [ - "ubuntu.16.04-corert", - "ubuntu.16.04", - "ubuntu-corert", - "ubuntu", - "debian-corert", - "debian", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.16.04-x64": [ - "ubuntu.16.04-x64", - "ubuntu.16.04", - "ubuntu-x64", - "ubuntu", - "debian-x64", - "debian", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "ubuntu.16.04-x64-corert": [ - "ubuntu.16.04-x64-corert", - "ubuntu.16.04-corert", - "ubuntu.16.04-x64", - "ubuntu.16.04", - "ubuntu-x64-corert", - "ubuntu-corert", - "ubuntu-x64", - "ubuntu", - "debian-x64-corert", - "debian-corert", - "debian-x64", - "debian", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.16.04-x86": [ - "ubuntu.16.04-x86", - "ubuntu.16.04", - "ubuntu-x86", - "ubuntu", - "debian-x86", - "debian", - "linux-x86", - "linux", - "unix-x86", - "unix", - "any", - "base" - ], - "ubuntu.16.04-x86-corert": [ - "ubuntu.16.04-x86-corert", - "ubuntu.16.04-corert", - "ubuntu.16.04-x86", - "ubuntu.16.04", - "ubuntu-x86-corert", - "ubuntu-corert", - "ubuntu-x86", - "ubuntu", - "debian-x86-corert", - "debian-corert", - "debian-x86", - "debian", - "linux-x86-corert", - "linux-corert", - "linux-x86", - "linux", - "unix-x86-corert", - "unix-corert", - "unix-x86", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.16.10": [ - "ubuntu.16.10", - "ubuntu", - "debian", - "linux", - "unix", - "any", - "base" - ], - "ubuntu.16.10-arm": [ - "ubuntu.16.10-arm", - "ubuntu.16.10", - "ubuntu-arm", - "ubuntu", - "debian-arm", - "debian", - "linux-arm", - "linux", - "unix-arm", - "unix", - "any", - "base" - ], - "ubuntu.16.10-arm-corert": [ - "ubuntu.16.10-arm-corert", - "ubuntu.16.10-corert", - "ubuntu.16.10-arm", - "ubuntu.16.10", - "ubuntu-arm-corert", - "ubuntu-corert", - "ubuntu-arm", - "ubuntu", - "debian-arm-corert", - "debian-corert", - "debian-arm", - "debian", - "linux-arm-corert", - "linux-corert", - "linux-arm", - "linux", - "unix-arm-corert", - "unix-corert", - "unix-arm", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.16.10-arm64": [ - "ubuntu.16.10-arm64", - "ubuntu.16.10", - "ubuntu-arm64", - "ubuntu", - "debian-arm64", - "debian", - "linux-arm64", - "linux", - "unix-arm64", - "unix", - "any", - "base" - ], - "ubuntu.16.10-arm64-corert": [ - "ubuntu.16.10-arm64-corert", - "ubuntu.16.10-corert", - "ubuntu.16.10-arm64", - "ubuntu.16.10", - "ubuntu-arm64-corert", - "ubuntu-corert", - "ubuntu-arm64", - "ubuntu", - "debian-arm64-corert", - "debian-corert", - "debian-arm64", - "debian", - "linux-arm64-corert", - "linux-corert", - "linux-arm64", - "linux", - "unix-arm64-corert", - "unix-corert", - "unix-arm64", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.16.10-corert": [ - "ubuntu.16.10-corert", - "ubuntu.16.10", - "ubuntu-corert", - "ubuntu", - "debian-corert", - "debian", - "linux-corert", - "linux", - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.16.10-x64": [ - "ubuntu.16.10-x64", - "ubuntu.16.10", - "ubuntu-x64", - "ubuntu", - "debian-x64", - "debian", - "linux-x64", - "linux", - "unix-x64", - "unix", - "any", - "base" - ], - "ubuntu.16.10-x64-corert": [ - "ubuntu.16.10-x64-corert", - "ubuntu.16.10-corert", - "ubuntu.16.10-x64", - "ubuntu.16.10", - "ubuntu-x64-corert", - "ubuntu-corert", - "ubuntu-x64", - "ubuntu", - "debian-x64-corert", - "debian-corert", - "debian-x64", - "debian", - "linux-x64-corert", - "linux-corert", - "linux-x64", - "linux", - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "ubuntu.16.10-x86": [ - "ubuntu.16.10-x86", - "ubuntu.16.10", - "ubuntu-x86", - "ubuntu", - "debian-x86", - "debian", - "linux-x86", - "linux", - "unix-x86", - "unix", - "any", - "base" - ], - "ubuntu.16.10-x86-corert": [ - "ubuntu.16.10-x86-corert", - "ubuntu.16.10-corert", - "ubuntu.16.10-x86", - "ubuntu.16.10", - "ubuntu-x86-corert", - "ubuntu-corert", - "ubuntu-x86", - "ubuntu", - "debian-x86-corert", - "debian-corert", - "debian-x86", - "debian", - "linux-x86-corert", - "linux-corert", - "linux-x86", - "linux", - "unix-x86-corert", - "unix-corert", - "unix-x86", - "unix", - "corert", - "any", - "base" - ], - "unix": [ - "unix", - "any", - "base" - ], - "unix-arm": [ - "unix-arm", - "unix", - "any", - "base" - ], - "unix-arm-corert": [ - "unix-arm-corert", - "unix-corert", - "unix-arm", - "unix", - "corert", - "any", - "base" - ], - "unix-arm64": [ - "unix-arm64", - "unix", - "any", - "base" - ], - "unix-arm64-corert": [ - "unix-arm64-corert", - "unix-corert", - "unix-arm64", - "unix", - "corert", - "any", - "base" - ], - "unix-armel": [ - "unix-armel", - "unix", - "any", - "base" - ], - "unix-armel-corert": [ - "unix-armel-corert", - "unix-corert", - "unix-armel", - "unix", - "corert", - "any", - "base" - ], - "unix-corert": [ - "unix-corert", - "unix", - "corert", - "any", - "base" - ], - "unix-x64": [ - "unix-x64", - "unix", - "any", - "base" - ], - "unix-x64-corert": [ - "unix-x64-corert", - "unix-corert", - "unix-x64", - "unix", - "corert", - "any", - "base" - ], - "unix-x86": [ - "unix-x86", - "unix", - "any", - "base" - ], - "unix-x86-corert": [ - "unix-x86-corert", - "unix-corert", - "unix-x86", - "unix", - "corert", - "any", - "base" - ], - "win": [ - "win", - "any", - "base" - ], - "win-aot": [ - "win-aot", - "win", - "aot", - "any", - "base" - ], - "win-arm": [ - "win-arm", - "win", - "any", - "base" - ], - "win-arm-aot": [ - "win-arm-aot", - "win-aot", - "win-arm", - "win", - "aot", - "any", - "base" - ], - "win-arm-corert": [ - "win-arm-corert", - "win-corert", - "win-arm", - "win", - "corert", - "any", - "base" - ], - "win-arm64": [ - "win-arm64", - "win", - "any", - "base" - ], - "win-arm64-aot": [ - "win-arm64-aot", - "win-aot", - "win-arm64", - "win", - "aot", - "any", - "base" - ], - "win-arm64-corert": [ - "win-arm64-corert", - "win-corert", - "win-arm64", - "win", - "corert", - "any", - "base" - ], - "win-corert": [ - "win-corert", - "win", - "corert", - "any", - "base" - ], - "win-x64": [ - "win-x64", - "win", - "any", - "base" - ], - "win-x64-aot": [ - "win-x64-aot", - "win-aot", - "win-x64", - "win", - "aot", - "any", - "base" - ], - "win-x64-corert": [ - "win-x64-corert", - "win-corert", - "win-x64", - "win", - "corert", - "any", - "base" - ], - "win-x86": [ - "win-x86", - "win", - "any", - "base" - ], - "win-x86-aot": [ - "win-x86-aot", - "win-aot", - "win-x86", - "win", - "aot", - "any", - "base" - ], - "win-x86-corert": [ - "win-x86-corert", - "win-corert", - "win-x86", - "win", - "corert", - "any", - "base" - ], - "win10": [ - "win10", - "win81", - "win8", - "win7", - "win", - "any", - "base" - ], - "win10-aot": [ - "win10-aot", - "win10", - "win81-aot", - "win81", - "win8-aot", - "win8", - "win7-aot", - "win7", - "win-aot", - "win", - "aot", - "any", - "base" - ], - "win10-arm": [ - "win10-arm", - "win10", - "win81-arm", - "win81", - "win8-arm", - "win8", - "win7-arm", - "win7", - "win-arm", - "win", - "any", - "base" - ], - "win10-arm-aot": [ - "win10-arm-aot", - "win10-aot", - "win10-arm", - "win10", - "win81-arm-aot", - "win81-aot", - "win81-arm", - "win81", - "win8-arm-aot", - "win8-aot", - "win8-arm", - "win8", - "win7-arm-aot", - "win7-aot", - "win7-arm", - "win7", - "win-arm-aot", - "win-aot", - "win-arm", - "win", - "aot", - "any", - "base" - ], - "win10-arm-corert": [ - "win10-arm-corert", - "win10-corert", - "win10-arm", - "win10", - "win81-arm-corert", - "win81-corert", - "win81-arm", - "win81", - "win8-arm-corert", - "win8-corert", - "win8-arm", - "win8", - "win7-arm-corert", - "win7-corert", - "win7-arm", - "win7", - "win-arm-corert", - "win-corert", - "win-arm", - "win", - "corert", - "any", - "base" - ], - "win10-arm64": [ - "win10-arm64", - "win10", - "win81-arm64", - "win81", - "win8-arm64", - "win8", - "win7-arm64", - "win7", - "win-arm64", - "win", - "any", - "base" - ], - "win10-arm64-aot": [ - "win10-arm64-aot", - "win10-aot", - "win10-arm64", - "win10", - "win81-arm64-aot", - "win81-aot", - "win81-arm64", - "win81", - "win8-arm64-aot", - "win8-aot", - "win8-arm64", - "win8", - "win7-arm64-aot", - "win7-aot", - "win7-arm64", - "win7", - "win-arm64-aot", - "win-aot", - "win-arm64", - "win", - "aot", - "any", - "base" - ], - "win10-arm64-corert": [ - "win10-arm64-corert", - "win10-corert", - "win10-arm64", - "win10", - "win81-arm64-corert", - "win81-corert", - "win81-arm64", - "win81", - "win8-arm64-corert", - "win8-corert", - "win8-arm64", - "win8", - "win7-arm64-corert", - "win7-corert", - "win7-arm64", - "win7", - "win-arm64-corert", - "win-corert", - "win-arm64", - "win", - "corert", - "any", - "base" - ], - "win10-corert": [ - "win10-corert", - "win10", - "win81-corert", - "win81", - "win8-corert", - "win8", - "win7-corert", - "win7", - "win-corert", - "win", - "corert", - "any", - "base" - ], - "win10-x64": [ - "win10-x64", - "win10", - "win81-x64", - "win81", - "win8-x64", - "win8", - "win7-x64", - "win7", - "win-x64", - "win", - "any", - "base" - ], - "win10-x64-aot": [ - "win10-x64-aot", - "win10-aot", - "win10-x64", - "win10", - "win81-x64-aot", - "win81-aot", - "win81-x64", - "win81", - "win8-x64-aot", - "win8-aot", - "win8-x64", - "win8", - "win7-x64-aot", - "win7-aot", - "win7-x64", - "win7", - "win-x64-aot", - "win-aot", - "win-x64", - "win", - "aot", - "any", - "base" - ], - "win10-x64-corert": [ - "win10-x64-corert", - "win10-corert", - "win10-x64", - "win10", - "win81-x64-corert", - "win81-corert", - "win81-x64", - "win81", - "win8-x64-corert", - "win8-corert", - "win8-x64", - "win8", - "win7-x64-corert", - "win7-corert", - "win7-x64", - "win7", - "win-x64-corert", - "win-corert", - "win-x64", - "win", - "corert", - "any", - "base" - ], - "win10-x86": [ - "win10-x86", - "win10", - "win81-x86", - "win81", - "win8-x86", - "win8", - "win7-x86", - "win7", - "win-x86", - "win", - "any", - "base" - ], - "win10-x86-aot": [ - "win10-x86-aot", - "win10-aot", - "win10-x86", - "win10", - "win81-x86-aot", - "win81-aot", - "win81-x86", - "win81", - "win8-x86-aot", - "win8-aot", - "win8-x86", - "win8", - "win7-x86-aot", - "win7-aot", - "win7-x86", - "win7", - "win-x86-aot", - "win-aot", - "win-x86", - "win", - "aot", - "any", - "base" - ], - "win10-x86-corert": [ - "win10-x86-corert", - "win10-corert", - "win10-x86", - "win10", - "win81-x86-corert", - "win81-corert", - "win81-x86", - "win81", - "win8-x86-corert", - "win8-corert", - "win8-x86", - "win8", - "win7-x86-corert", - "win7-corert", - "win7-x86", - "win7", - "win-x86-corert", - "win-corert", - "win-x86", - "win", - "corert", - "any", - "base" - ], - "win7": [ - "win7", - "win", - "any", - "base" - ], - "win7-aot": [ - "win7-aot", - "win7", - "win-aot", - "win", - "aot", - "any", - "base" - ], - "win7-arm": [ - "win7-arm", - "win7", - "win-arm", - "win", - "any", - "base" - ], - "win7-arm-aot": [ - "win7-arm-aot", - "win7-aot", - "win7-arm", - "win7", - "win-arm-aot", - "win-aot", - "win-arm", - "win", - "aot", - "any", - "base" - ], - "win7-arm-corert": [ - "win7-arm-corert", - "win7-corert", - "win7-arm", - "win7", - "win-arm-corert", - "win-corert", - "win-arm", - "win", - "corert", - "any", - "base" - ], - "win7-arm64": [ - "win7-arm64", - "win7", - "win-arm64", - "win", - "any", - "base" - ], - "win7-arm64-aot": [ - "win7-arm64-aot", - "win7-aot", - "win7-arm64", - "win7", - "win-arm64-aot", - "win-aot", - "win-arm64", - "win", - "aot", - "any", - "base" - ], - "win7-arm64-corert": [ - "win7-arm64-corert", - "win7-corert", - "win7-arm64", - "win7", - "win-arm64-corert", - "win-corert", - "win-arm64", - "win", - "corert", - "any", - "base" - ], - "win7-corert": [ - "win7-corert", - "win7", - "win-corert", - "win", - "corert", - "any", - "base" - ], - "win7-x64": [ - "win7-x64", - "win7", - "win-x64", - "win", - "any", - "base" - ], - "win7-x64-aot": [ - "win7-x64-aot", - "win7-aot", - "win7-x64", - "win7", - "win-x64-aot", - "win-aot", - "win-x64", - "win", - "aot", - "any", - "base" - ], - "win7-x64-corert": [ - "win7-x64-corert", - "win7-corert", - "win7-x64", - "win7", - "win-x64-corert", - "win-corert", - "win-x64", - "win", - "corert", - "any", - "base" - ], - "win7-x86": [ - "win7-x86", - "win7", - "win-x86", - "win", - "any", - "base" - ], - "win7-x86-aot": [ - "win7-x86-aot", - "win7-aot", - "win7-x86", - "win7", - "win-x86-aot", - "win-aot", - "win-x86", - "win", - "aot", - "any", - "base" - ], - "win7-x86-corert": [ - "win7-x86-corert", - "win7-corert", - "win7-x86", - "win7", - "win-x86-corert", - "win-corert", - "win-x86", - "win", - "corert", - "any", - "base" - ], - "win8": [ - "win8", - "win7", - "win", - "any", - "base" - ], - "win8-aot": [ - "win8-aot", - "win8", - "win7-aot", - "win7", - "win-aot", - "win", - "aot", - "any", - "base" - ], - "win8-arm": [ - "win8-arm", - "win8", - "win7-arm", - "win7", - "win-arm", - "win", - "any", - "base" - ], - "win8-arm-aot": [ - "win8-arm-aot", - "win8-aot", - "win8-arm", - "win8", - "win7-arm-aot", - "win7-aot", - "win7-arm", - "win7", - "win-arm-aot", - "win-aot", - "win-arm", - "win", - "aot", - "any", - "base" - ], - "win8-arm-corert": [ - "win8-arm-corert", - "win8-corert", - "win8-arm", - "win8", - "win7-arm-corert", - "win7-corert", - "win7-arm", - "win7", - "win-arm-corert", - "win-corert", - "win-arm", - "win", - "corert", - "any", - "base" - ], - "win8-arm64": [ - "win8-arm64", - "win8", - "win7-arm64", - "win7", - "win-arm64", - "win", - "any", - "base" - ], - "win8-arm64-aot": [ - "win8-arm64-aot", - "win8-aot", - "win8-arm64", - "win8", - "win7-arm64-aot", - "win7-aot", - "win7-arm64", - "win7", - "win-arm64-aot", - "win-aot", - "win-arm64", - "win", - "aot", - "any", - "base" - ], - "win8-arm64-corert": [ - "win8-arm64-corert", - "win8-corert", - "win8-arm64", - "win8", - "win7-arm64-corert", - "win7-corert", - "win7-arm64", - "win7", - "win-arm64-corert", - "win-corert", - "win-arm64", - "win", - "corert", - "any", - "base" - ], - "win8-corert": [ - "win8-corert", - "win8", - "win7-corert", - "win7", - "win-corert", - "win", - "corert", - "any", - "base" - ], - "win8-x64": [ - "win8-x64", - "win8", - "win7-x64", - "win7", - "win-x64", - "win", - "any", - "base" - ], - "win8-x64-aot": [ - "win8-x64-aot", - "win8-aot", - "win8-x64", - "win8", - "win7-x64-aot", - "win7-aot", - "win7-x64", - "win7", - "win-x64-aot", - "win-aot", - "win-x64", - "win", - "aot", - "any", - "base" - ], - "win8-x64-corert": [ - "win8-x64-corert", - "win8-corert", - "win8-x64", - "win8", - "win7-x64-corert", - "win7-corert", - "win7-x64", - "win7", - "win-x64-corert", - "win-corert", - "win-x64", - "win", - "corert", - "any", - "base" - ], - "win8-x86": [ - "win8-x86", - "win8", - "win7-x86", - "win7", - "win-x86", - "win", - "any", - "base" - ], - "win8-x86-aot": [ - "win8-x86-aot", - "win8-aot", - "win8-x86", - "win8", - "win7-x86-aot", - "win7-aot", - "win7-x86", - "win7", - "win-x86-aot", - "win-aot", - "win-x86", - "win", - "aot", - "any", - "base" - ], - "win8-x86-corert": [ - "win8-x86-corert", - "win8-corert", - "win8-x86", - "win8", - "win7-x86-corert", - "win7-corert", - "win7-x86", - "win7", - "win-x86-corert", - "win-corert", - "win-x86", - "win", - "corert", - "any", - "base" - ], - "win81": [ - "win81", - "win8", - "win7", - "win", - "any", - "base" - ], - "win81-aot": [ - "win81-aot", - "win81", - "win8-aot", - "win8", - "win7-aot", - "win7", - "win-aot", - "win", - "aot", - "any", - "base" - ], - "win81-arm": [ - "win81-arm", - "win81", - "win8-arm", - "win8", - "win7-arm", - "win7", - "win-arm", - "win", - "any", - "base" - ], - "win81-arm-aot": [ - "win81-arm-aot", - "win81-aot", - "win81-arm", - "win81", - "win8-arm-aot", - "win8-aot", - "win8-arm", - "win8", - "win7-arm-aot", - "win7-aot", - "win7-arm", - "win7", - "win-arm-aot", - "win-aot", - "win-arm", - "win", - "aot", - "any", - "base" - ], - "win81-arm-corert": [ - "win81-arm-corert", - "win81-corert", - "win81-arm", - "win81", - "win8-arm-corert", - "win8-corert", - "win8-arm", - "win8", - "win7-arm-corert", - "win7-corert", - "win7-arm", - "win7", - "win-arm-corert", - "win-corert", - "win-arm", - "win", - "corert", - "any", - "base" - ], - "win81-arm64": [ - "win81-arm64", - "win81", - "win8-arm64", - "win8", - "win7-arm64", - "win7", - "win-arm64", - "win", - "any", - "base" - ], - "win81-arm64-aot": [ - "win81-arm64-aot", - "win81-aot", - "win81-arm64", - "win81", - "win8-arm64-aot", - "win8-aot", - "win8-arm64", - "win8", - "win7-arm64-aot", - "win7-aot", - "win7-arm64", - "win7", - "win-arm64-aot", - "win-aot", - "win-arm64", - "win", - "aot", - "any", - "base" - ], - "win81-arm64-corert": [ - "win81-arm64-corert", - "win81-corert", - "win81-arm64", - "win81", - "win8-arm64-corert", - "win8-corert", - "win8-arm64", - "win8", - "win7-arm64-corert", - "win7-corert", - "win7-arm64", - "win7", - "win-arm64-corert", - "win-corert", - "win-arm64", - "win", - "corert", - "any", - "base" - ], - "win81-corert": [ - "win81-corert", - "win81", - "win8-corert", - "win8", - "win7-corert", - "win7", - "win-corert", - "win", - "corert", - "any", - "base" - ], - "win81-x64": [ - "win81-x64", - "win81", - "win8-x64", - "win8", - "win7-x64", - "win7", - "win-x64", - "win", - "any", - "base" - ], - "win81-x64-aot": [ - "win81-x64-aot", - "win81-aot", - "win81-x64", - "win81", - "win8-x64-aot", - "win8-aot", - "win8-x64", - "win8", - "win7-x64-aot", - "win7-aot", - "win7-x64", - "win7", - "win-x64-aot", - "win-aot", - "win-x64", - "win", - "aot", - "any", - "base" - ], - "win81-x64-corert": [ - "win81-x64-corert", - "win81-corert", - "win81-x64", - "win81", - "win8-x64-corert", - "win8-corert", - "win8-x64", - "win8", - "win7-x64-corert", - "win7-corert", - "win7-x64", - "win7", - "win-x64-corert", - "win-corert", - "win-x64", - "win", - "corert", - "any", - "base" - ], - "win81-x86": [ - "win81-x86", - "win81", - "win8-x86", - "win8", - "win7-x86", - "win7", - "win-x86", - "win", - "any", - "base" - ], - "win81-x86-aot": [ - "win81-x86-aot", - "win81-aot", - "win81-x86", - "win81", - "win8-x86-aot", - "win8-aot", - "win8-x86", - "win8", - "win7-x86-aot", - "win7-aot", - "win7-x86", - "win7", - "win-x86-aot", - "win-aot", - "win-x86", - "win", - "aot", - "any", - "base" - ], - "win81-x86-corert": [ - "win81-x86-corert", - "win81-corert", - "win81-x86", - "win81", - "win8-x86-corert", - "win8-corert", - "win8-x86", - "win8", - "win7-x86-corert", - "win7-corert", - "win7-x86", - "win7", - "win-x86-corert", - "win-corert", - "win-x86", - "win", - "corert", - "any", - "base" - ] -} \ No newline at end of file diff --git a/external/corefx/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json.REMOVED.git-id b/external/corefx/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json.REMOVED.git-id new file mode 100644 index 0000000000..54aaab770d --- /dev/null +++ b/external/corefx/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json.REMOVED.git-id @@ -0,0 +1 @@ +b6552464639042b51b931dba020c7957f73ae840 \ No newline at end of file diff --git a/external/corefx/pkg/Microsoft.NETCore.Platforms/runtime.json b/external/corefx/pkg/Microsoft.NETCore.Platforms/runtime.json index 7346469800..30f99f8e58 100644 --- a/external/corefx/pkg/Microsoft.NETCore.Platforms/runtime.json +++ b/external/corefx/pkg/Microsoft.NETCore.Platforms/runtime.json @@ -2,26 +2,26 @@ "runtimes": { "alpine": { "#import": [ - "unix" + "linux-musl" ] }, "alpine-corert": { "#import": [ "alpine", - "unix-corert" + "linux-musl-corert" ] }, "alpine-x64": { "#import": [ "alpine", - "unix-x64" + "linux-musl-x64" ] }, "alpine-x64-corert": { "#import": [ "alpine-corert", "alpine-x64", - "unix-x64-corert" + "linux-musl-x64-corert" ] }, "alpine.3.6": { @@ -49,37 +49,66 @@ "alpine-x64-corert" ] }, + "alpine.3.7": { + "#import": [ + "alpine.3.6" + ] + }, + "alpine.3.7-corert": { + "#import": [ + "alpine.3.7", + "alpine.3.6-corert" + ] + }, + "alpine.3.7-x64": { + "#import": [ + "alpine.3.7", + "alpine.3.6-x64" + ] + }, + "alpine.3.7-x64-corert": { + "#import": [ + "alpine.3.7-corert", + "alpine.3.7-x64", + "alpine.3.7", + "alpine.3.6-x64-corert" + ] + }, "android": { "#import": [ - "any" + "linux" ] }, "android-arm": { "#import": [ - "android" + "android", + "linux-arm" ] }, "android-arm-corert": { "#import": [ "android-corert", - "android-arm" + "android-arm", + "linux-arm-corert" ] }, "android-arm64": { "#import": [ - "android" + "android", + "linux-arm64" ] }, "android-arm64-corert": { "#import": [ "android-corert", - "android-arm64" + "android-arm64", + "linux-arm64-corert" ] }, "android-corert": { "#import": [ "android", - "corert" + "linux-corert" ] }, "android.21": { @@ -348,6 +377,87 @@ "debian-x86-corert" ] }, + "debian.9": { + "#import": [ + "debian" + ] + }, + "debian.9-arm": { + "#import": [ + "debian.9", + "debian-arm" + ] + }, + "debian.9-arm-corert": { + "#import": [ + "debian.9-corert", + "debian.9-arm", + "debian.9", + "debian-arm-corert" + ] + }, + "debian.9-arm64": { + "#import": [ + "debian.9", + "debian-arm64" + ] + }, + "debian.9-arm64-corert": { + "#import": [ + "debian.9-corert", + "debian.9-arm64", + "debian.9", + "debian-arm64-corert" + ] + }, + "debian.9-armel": { + "#import": [ + "debian.9", + "debian-armel" + ] + }, + "debian.9-armel-corert": { + "#import": [ + "debian.9-corert", + "debian.9-armel", + "debian.9", + "debian-armel-corert" + ] + }, + "debian.9-corert": { + "#import": [ + "debian.9", + "debian-corert" + ] + }, + "debian.9-x64": { + "#import": [ + "debian.9", + "debian-x64" + ] + }, + "debian.9-x64-corert": { + "#import": [ + "debian.9-corert", + "debian.9-x64", + "debian.9", + "debian-x64-corert" + ] + }, + "debian.9-x86": { + "#import": [ + "debian.9", + "debian-x86" + ] + }, + "debian.9-x86-corert": { + "#import": [ + "debian.9-corert", + "debian.9-x86", + "debian.9", + "debian-x86-corert" + ] + }, "fedora": { "#import": [ "linux" @@ -472,6 +582,56 @@ "fedora-x64-corert" ] }, + "fedora.27": { + "#import": [ + "fedora" + ] + }, + "fedora.27-corert": { + "#import": [ + "fedora.27", + "fedora-corert" + ] + }, + "fedora.27-x64": { + "#import": [ + "fedora.27", + "fedora-x64" + ] + }, + "fedora.27-x64-corert": { + "#import": [ + "fedora.27-corert", + "fedora.27-x64", + "fedora.27", + "fedora-x64-corert" + ] + }, + "fedora.28": { + "#import": [ + "fedora" + ] + }, + "fedora.28-corert": { + "#import": [ + "fedora.28", + "fedora-corert" + ] + }, + "fedora.28-x64": { + "#import": [ + "fedora.28", + "fedora-x64" + ] + }, + "fedora.28-x64-corert": { + "#import": [ + "fedora.28-corert", + "fedora.28-x64", + "fedora.28", + "fedora-x64-corert" + ] + }, "gentoo": { "#import": [ "linux" @@ -546,6 +706,82 @@ "unix-corert" ] }, + "linux-musl": { + "#import": [ + "linux" + ] + }, + "linux-musl-arm": { + "#import": [ + "linux-musl", + "linux-arm" + ] + }, + "linux-musl-arm-corert": { + "#import": [ + "linux-musl-corert", + "linux-musl-arm", + "linux-arm-corert" + ] + }, + "linux-musl-arm64": { + "#import": [ + "linux-musl", + "linux-arm64" + ] + }, + "linux-musl-arm64-corert": { + "#import": [ + "linux-musl-corert", + "linux-musl-arm64", + "linux-arm64-corert" + ] + }, + "linux-musl-armel": { + "#import": [ + "linux-musl", + "linux-armel" + ] + }, + "linux-musl-armel-corert": { + "#import": [ + "linux-musl-corert", + "linux-musl-armel", + "linux-armel-corert" + ] + }, + "linux-musl-corert": { + "#import": [ + "linux-musl", + "linux-corert" + ] + }, + "linux-musl-x64": { + "#import": [ + "linux-musl", + "linux-x64" + ] + }, + "linux-musl-x64-corert": { + "#import": [ + "linux-musl-corert", + "linux-musl-x64", + "linux-x64-corert" + ] + }, + "linux-musl-x86": { + "#import": [ + "linux-musl", + "linux-x86" + ] + }, + "linux-musl-x86-corert": { + "#import": [ + "linux-musl-corert", + "linux-musl-x86", + "linux-x86-corert" + ] + }, "linux-x64": { "#import": [ "linux", @@ -720,6 +956,80 @@ "linuxmint.18-x64-corert" ] }, + "linuxmint.18.2": { + "#import": [ + "linuxmint.18.1" + ] + }, + "linuxmint.18.2-corert": { + "#import": [ + "linuxmint.18.2", + "linuxmint.18.1-corert" + ] + }, + "linuxmint.18.2-x64": { + "#import": [ + "linuxmint.18.2", + "linuxmint.18.1-x64" + ] + }, + "linuxmint.18.2-x64-corert": { + "#import": [ + "linuxmint.18.2-corert", + "linuxmint.18.2-x64", + "linuxmint.18.2", + "linuxmint.18.1-x64-corert" + ] + }, + "linuxmint.18.3": { + "#import": [ + "linuxmint.18.2" + ] + }, + "linuxmint.18.3-corert": { + "#import": [ + "linuxmint.18.3", + "linuxmint.18.2-corert" + ] + }, + "linuxmint.18.3-x64": { + "#import": [ + "linuxmint.18.3", + "linuxmint.18.2-x64" + ] + }, + "linuxmint.18.3-x64-corert": { + "#import": [ + "linuxmint.18.3-corert", + "linuxmint.18.3-x64", + "linuxmint.18.3", + "linuxmint.18.2-x64-corert" + ] + }, + "linuxmint.19": { + "#import": [ + "ubuntu.18.04" + ] + }, + "linuxmint.19-corert": { + "#import": [ + "linuxmint.19", + "ubuntu.18.04-corert" + ] + }, + "linuxmint.19-x64": { + "#import": [ + "linuxmint.19", + "ubuntu.18.04-x64" + ] + }, + "linuxmint.19-x64-corert": { + "#import": [ + "linuxmint.19-corert", + "linuxmint.19-x64", + "ubuntu.18.04-x64-corert" + ] + }, "ol": { "#import": [ "rhel" @@ -856,6 +1166,62 @@ "ol.7.1-x64-corert" ] }, + "ol.7.3": { + "#import": [ + "ol.7.2", + "rhel.7.3" + ] + }, + "ol.7.3-corert": { + "#import": [ + "ol.7.3", + "ol.7.2-corert", + "rhel.7.3-corert" + ] + }, + "ol.7.3-x64": { + "#import": [ + "ol.7.3", + "ol.7.2-x64", + "rhel.7.3-x64" + ] + }, + "ol.7.3-x64-corert": { + "#import": [ + "ol.7.3-corert", + "ol.7.3-x64", + "ol.7.3", + "ol.7.2-x64-corert" + ] + }, + "ol.7.4": { + "#import": [ + "ol.7.3", + "rhel.7.4" + ] + }, + "ol.7.4-corert": { + "#import": [ + "ol.7.4", + "ol.7.3-corert", + "rhel.7.4-corert" + ] + }, + "ol.7.4-x64": { + "#import": [ + "ol.7.4", + "ol.7.3-x64", + "rhel.7.4-x64" + ] + }, + "ol.7.4-x64-corert": { + "#import": [ + "ol.7.4-corert", + "ol.7.4-x64", + "ol.7.4", + "ol.7.3-x64-corert" + ] + }, "opensuse": { "#import": [ "linux" @@ -930,6 +1296,56 @@ "opensuse-x64-corert" ] }, + "opensuse.42.2": { + "#import": [ + "opensuse" + ] + }, + "opensuse.42.2-corert": { + "#import": [ + "opensuse.42.2", + "opensuse-corert" + ] + }, + "opensuse.42.2-x64": { + "#import": [ + "opensuse.42.2", + "opensuse-x64" + ] + }, + "opensuse.42.2-x64-corert": { + "#import": [ + "opensuse.42.2-corert", + "opensuse.42.2-x64", + "opensuse.42.2", + "opensuse-x64-corert" + ] + }, + "opensuse.42.3": { + "#import": [ + "opensuse" + ] + }, + "opensuse.42.3-corert": { + "#import": [ + "opensuse.42.3", + "opensuse-corert" + ] + }, + "opensuse.42.3-x64": { + "#import": [ + "opensuse.42.3", + "opensuse-x64" + ] + }, + "opensuse.42.3-x64-corert": { + "#import": [ + "opensuse.42.3-corert", + "opensuse.42.3-x64", + "opensuse.42.3", + "opensuse-x64-corert" + ] + }, "osx": { "#import": [ "unix" @@ -1029,6 +1445,31 @@ "osx.10.11-x64-corert" ] }, + "osx.10.13": { + "#import": [ + "osx.10.12" + ] + }, + "osx.10.13-corert": { + "#import": [ + "osx.10.13", + "osx.10.12-corert" + ] + }, + "osx.10.13-x64": { + "#import": [ + "osx.10.13", + "osx.10.12-x64" + ] + }, + "osx.10.13-x64-corert": { + "#import": [ + "osx.10.13-corert", + "osx.10.13-x64", + "osx.10.13", + "osx.10.12-x64-corert" + ] + }, "rhel": { "#import": [ "linux" @@ -1228,6 +1669,130 @@ "rhel.7.3-x64-corert" ] }, + "sles": { + "#import": [ + "linux" + ] + }, + "sles-corert": { + "#import": [ + "sles", + "linux-corert" + ] + }, + "sles-x64": { + "#import": [ + "sles", + "linux-x64" + ] + }, + "sles-x64-corert": { + "#import": [ + "sles-corert", + "sles-x64", + "linux-x64-corert" + ] + }, + "sles.12": { + "#import": [ + "sles" + ] + }, + "sles.12-corert": { + "#import": [ + "sles.12", + "sles-corert" + ] + }, + "sles.12-x64": { + "#import": [ + "sles.12", + "sles-x64" + ] + }, + "sles.12-x64-corert": { + "#import": [ + "sles.12-corert", + "sles.12-x64", + "sles.12", + "sles-x64-corert" + ] + }, + "sles.12.1": { + "#import": [ + "sles.12" + ] + }, + "sles.12.1-corert": { + "#import": [ + "sles.12.1", + "sles.12-corert" + ] + }, + "sles.12.1-x64": { + "#import": [ + "sles.12.1", + "sles.12-x64" + ] + }, + "sles.12.1-x64-corert": { + "#import": [ + "sles.12.1-corert", + "sles.12.1-x64", + "sles.12.1", + "sles.12-x64-corert" + ] + }, + "sles.12.2": { + "#import": [ + "sles.12.1" + ] + }, + "sles.12.2-corert": { + "#import": [ + "sles.12.2", + "sles.12.1-corert" + ] + }, + "sles.12.2-x64": { + "#import": [ + "sles.12.2", + "sles.12.1-x64" + ] + }, + "sles.12.2-x64-corert": { + "#import": [ + "sles.12.2-corert", + "sles.12.2-x64", + "sles.12.2", + "sles.12.1-x64-corert" + ] + }, + "sles.12.3": { + "#import": [ + "sles.12.2" + ] + }, + "sles.12.3-corert": { + "#import": [ + "sles.12.3", + "sles.12.2-corert" + ] + }, + "sles.12.3-x64": { + "#import": [ + "sles.12.3", + "sles.12.2-x64" + ] + }, + "sles.12.3-x64-corert": { + "#import": [ + "sles.12.3-corert", + "sles.12.3-x64", + "sles.12.3", + "sles.12.2-x64-corert" + ] + }, "tizen": { "#import": [ "linux" @@ -1686,6 +2251,207 @@ "ubuntu-x86-corert" ] }, + "ubuntu.17.04": { + "#import": [ + "ubuntu" + ] + }, + "ubuntu.17.04-arm": { + "#import": [ + "ubuntu.17.04", + "ubuntu-arm" + ] + }, + "ubuntu.17.04-arm-corert": { + "#import": [ + "ubuntu.17.04-corert", + "ubuntu.17.04-arm", + "ubuntu.17.04", + "ubuntu-arm-corert" + ] + }, + "ubuntu.17.04-arm64": { + "#import": [ + "ubuntu.17.04", + "ubuntu-arm64" + ] + }, + "ubuntu.17.04-arm64-corert": { + "#import": [ + "ubuntu.17.04-corert", + "ubuntu.17.04-arm64", + "ubuntu.17.04", + "ubuntu-arm64-corert" + ] + }, + "ubuntu.17.04-corert": { + "#import": [ + "ubuntu.17.04", + "ubuntu-corert" + ] + }, + "ubuntu.17.04-x64": { + "#import": [ + "ubuntu.17.04", + "ubuntu-x64" + ] + }, + "ubuntu.17.04-x64-corert": { + "#import": [ + "ubuntu.17.04-corert", + "ubuntu.17.04-x64", + "ubuntu.17.04", + "ubuntu-x64-corert" + ] + }, + "ubuntu.17.04-x86": { + "#import": [ + "ubuntu.17.04", + "ubuntu-x86" + ] + }, + "ubuntu.17.04-x86-corert": { + "#import": [ + "ubuntu.17.04-corert", + "ubuntu.17.04-x86", + "ubuntu.17.04", + "ubuntu-x86-corert" + ] + }, + "ubuntu.17.10": { + "#import": [ + "ubuntu" + ] + }, + "ubuntu.17.10-arm": { + "#import": [ + "ubuntu.17.10", + "ubuntu-arm" + ] + }, + "ubuntu.17.10-arm-corert": { + "#import": [ + "ubuntu.17.10-corert", + "ubuntu.17.10-arm", + "ubuntu.17.10", + "ubuntu-arm-corert" + ] + }, + "ubuntu.17.10-arm64": { + "#import": [ + "ubuntu.17.10", + "ubuntu-arm64" + ] + }, + "ubuntu.17.10-arm64-corert": { + "#import": [ + "ubuntu.17.10-corert", + "ubuntu.17.10-arm64", + "ubuntu.17.10", + "ubuntu-arm64-corert" + ] + }, + "ubuntu.17.10-corert": { + "#import": [ + "ubuntu.17.10", + "ubuntu-corert" + ] + }, + "ubuntu.17.10-x64": { + "#import": [ + "ubuntu.17.10", + "ubuntu-x64" + ] + }, + "ubuntu.17.10-x64-corert": { + "#import": [ + "ubuntu.17.10-corert", + "ubuntu.17.10-x64", + "ubuntu.17.10", + "ubuntu-x64-corert" + ] + }, + "ubuntu.17.10-x86": { + "#import": [ + "ubuntu.17.10", + "ubuntu-x86" + ] + }, + "ubuntu.17.10-x86-corert": { + "#import": [ + "ubuntu.17.10-corert", + "ubuntu.17.10-x86", + "ubuntu.17.10", + "ubuntu-x86-corert" + ] + }, + "ubuntu.18.04": { + "#import": [ + "ubuntu" + ] + }, + "ubuntu.18.04-arm": { + "#import": [ + "ubuntu.18.04", + "ubuntu-arm" + ] + }, + "ubuntu.18.04-arm-corert": { + "#import": [ + "ubuntu.18.04-corert", + "ubuntu.18.04-arm", + "ubuntu.18.04", + "ubuntu-arm-corert" + ] + }, + "ubuntu.18.04-arm64": { + "#import": [ + "ubuntu.18.04", + "ubuntu-arm64" + ] + }, + "ubuntu.18.04-arm64-corert": { + "#import": [ + "ubuntu.18.04-corert", + "ubuntu.18.04-arm64", + "ubuntu.18.04", + "ubuntu-arm64-corert" + ] + }, + "ubuntu.18.04-corert": { + "#import": [ + "ubuntu.18.04", + "ubuntu-corert" + ] + }, + "ubuntu.18.04-x64": { + "#import": [ + "ubuntu.18.04", + "ubuntu-x64" + ] + }, + "ubuntu.18.04-x64-corert": { + "#import": [ + "ubuntu.18.04-corert", + "ubuntu.18.04-x64", + "ubuntu.18.04", + "ubuntu-x64-corert" + ] + }, + "ubuntu.18.04-x86": { + "#import": [ + "ubuntu.18.04", + "ubuntu-x86" + ] + }, + "ubuntu.18.04-x86-corert": { + "#import": [ + "ubuntu.18.04-corert", + "ubuntu.18.04-x86", + "ubuntu.18.04", + "ubuntu-x86-corert" + ] + }, "unix": { "#import": [ "any" diff --git a/external/corefx/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/external/corefx/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props index d3aacf4ca2..c8898ed0bb 100644 --- a/external/corefx/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props +++ b/external/corefx/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props @@ -9,15 +9,19 @@ unix x64;x86;arm;armel;arm64 + + linux + x64;x86;arm;armel;arm64 + - unix + linux-musl x64 - 3.6 + 3.6;3.7 - any + linux arm;arm64 21 @@ -32,13 +36,14 @@ linux x64;x86;arm;armel;arm64 - 8 + 8;9 + false linux x64 - 23;24;25;26 + 23;24;25;26;27;28 false @@ -47,6 +52,7 @@ x64 + ubuntu.14.04 x64 @@ -55,13 +61,18 @@ ubuntu.16.04 x64 - 1 + 1;2;3 + + + ubuntu.18.04 + x64 + rhel x64 - 7;7.0;7.1;7.2 + 7;7.0;7.1;7.2;7.3;7.4 true @@ -69,14 +80,14 @@ linux x64 - 13.2;42.1 + 13.2;42.1;42.2;42.3 false unix x64 - 10.10;10.11;10.12 + 10.10;10.11;10.12;10.13 @@ -92,13 +103,18 @@ 7;7.0;7.1;7.2;7.3;7.4 + + linux + x64 + 12;12.1;12.2;12.3 + + linux armel 4.0.0 - debian x64;x86;arm @@ -108,7 +124,7 @@ debian x64;x86;arm;arm64 - 16.04;16.10 + 16.04;16.10;17.04;17.10;18.04 false @@ -151,4 +167,4 @@ RuntimeDirectedGraph="$(PackageReportDir)$(Id)$(NuspecSuffix)-runtime.json.dgml" UpdateRuntimeFiles="$(UpdateRuntimeFiles)" /> - \ No newline at end of file + diff --git a/external/corefx/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.builds b/external/corefx/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.builds index b9038331ca..0c02cbd297 100644 --- a/external/corefx/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.builds +++ b/external/corefx/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.builds @@ -1,7 +1,7 @@ - + diff --git a/external/corefx/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj b/external/corefx/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj index dea59cc037..6877786522 100644 --- a/external/corefx/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj +++ b/external/corefx/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj @@ -39,6 +39,7 @@ Microsoft.VisualBasic; Microsoft.Win32.Registry; System.IO.FileSystem.AccessControl; + System.IO.Pipes.AccessControl; System.Private.DataContractSerialization; System.Private.Uri; System.Private.Xml; @@ -49,6 +50,12 @@ System.Security.Principal.Windows; + + + + System.ComponentModel.Composition; + + diff --git a/external/corefx/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props b/external/corefx/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props index 4a90ea6c7b..06bdbc7696 100644 --- a/external/corefx/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props +++ b/external/corefx/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props @@ -8,8 +8,8 @@ arm64 + - arm diff --git a/external/corefx/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj b/external/corefx/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj index b15f7bf8f9..35b8effbf0 100644 --- a/external/corefx/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj +++ b/external/corefx/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj @@ -66,6 +66,12 @@ System.Private.Reflection.Metadata.Ecma335; + + + + System.ComponentModel.Composition; + + diff --git a/external/corefx/pkg/Microsoft.Private.PackageBaseline/packageIndex.json.REMOVED.git-id b/external/corefx/pkg/Microsoft.Private.PackageBaseline/packageIndex.json.REMOVED.git-id index bb64b0f58b..56a623c2e9 100644 --- a/external/corefx/pkg/Microsoft.Private.PackageBaseline/packageIndex.json.REMOVED.git-id +++ b/external/corefx/pkg/Microsoft.Private.PackageBaseline/packageIndex.json.REMOVED.git-id @@ -1 +1 @@ -28e475f5bd0c3d7de2ba5852f5a4ed767748c8e4 \ No newline at end of file +30def071acd452360aa3599aac24a11b186918af \ No newline at end of file diff --git a/external/corefx/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj b/external/corefx/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj index 1f4239875e..ffa4e7e23c 100644 --- a/external/corefx/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj +++ b/external/corefx/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj @@ -4,12 +4,10 @@ 2.0.0 + 4.4.1 - - 4.4.0 - 4.5.0 @@ -22,11 +20,13 @@ + + @@ -40,6 +40,7 @@ + @@ -50,18 +51,22 @@ - + - 4.4.1-servicing-25917-01 + $(ServiceModelVersion) + + + $(ServiceModelVersion) + + + $(ServiceModelVersion) + + + $(ServiceModelVersion) + + + $(ServiceModelVersion) - - - - - - - - diff --git a/external/corefx/pkg/Microsoft.Windows.Compatibility/externalIndex.json b/external/corefx/pkg/Microsoft.Windows.Compatibility/externalIndex.json index 5c1e00340c..2026fe7cd8 100644 --- a/external/corefx/pkg/Microsoft.Windows.Compatibility/externalIndex.json +++ b/external/corefx/pkg/Microsoft.Windows.Compatibility/externalIndex.json @@ -3,31 +3,36 @@ "System.ServiceModel.Primitives": { "StableVersions": [ "4.4.0", - "4.3.0" + "4.3.0", + "4.4.1" ] }, "System.ServiceModel.Duplex": { "StableVersions": [ "4.4.0", - "4.3.0" + "4.3.0", + "4.4.1" ] }, "System.ServiceModel.Http": { "StableVersions": [ "4.4.0", - "4.3.0" + "4.3.0", + "4.4.1" ] }, "System.ServiceModel.NetTcp": { "StableVersions": [ "4.4.0", - "4.3.0" + "4.3.0", + "4.4.1" ] }, "System.ServiceModel.Security": { "StableVersions": [ "4.4.0", - "4.3.0" + "4.3.0", + "4.4.1" ] } } diff --git a/external/corefx/pkg/Microsoft.Windows.Compatibility/tests/Microsoft.Windows.Compatibility.Validation.csproj b/external/corefx/pkg/Microsoft.Windows.Compatibility/tests/Microsoft.Windows.Compatibility.Validation.csproj index 45ec708355..c63545238b 100644 --- a/external/corefx/pkg/Microsoft.Windows.Compatibility/tests/Microsoft.Windows.Compatibility.Validation.csproj +++ b/external/corefx/pkg/Microsoft.Windows.Compatibility/tests/Microsoft.Windows.Compatibility.Validation.csproj @@ -1,11 +1,21 @@ - true - true + true + + 99.9 + Microsoft.Private.CoreFx.NETCoreApp;runtime.$(RID).Microsoft.Private.CoreFx.NETCoreApp;$(PackageConflictPreferredPackages) + true - + + + + + + + + \ No newline at end of file diff --git a/external/corefx/pkg/Microsoft.Windows.Compatibility/tests/publishcompatibilityassets.ps1 b/external/corefx/pkg/Microsoft.Windows.Compatibility/tests/publishcompatibilityassets.ps1 index 0db2d675c0..3471de11a2 100644 --- a/external/corefx/pkg/Microsoft.Windows.Compatibility/tests/publishcompatibilityassets.ps1 +++ b/external/corefx/pkg/Microsoft.Windows.Compatibility/tests/publishcompatibilityassets.ps1 @@ -1,27 +1,16 @@ -$repoRoot = ((get-item $PSScriptRoot).parent.parent.parent.FullName); -$winRID = "win7-x64"; -$dotnetPath = -join($repoRoot, "\Tools\dotnetcli\dotnet.exe") -$csprojPath = -join($PSScriptRoot, "\", (Get-ChildItem $PSScriptRoot"\*.csproj" | Select-Object -ExpandProperty Name)) -$packagesCachePath = -join($repoRoot, "\packages") -$localPackageSourcePath = -join($repoRoot, "\bin\packages\Debug\") -$packageName = "Microsoft.Windows.Compatibility" +param ( +$targetFramework = "netcoreapp2.1", +$runtimeVersion = "2.1.0-*", +$refDirName = "netcoreapp21_compat", +$rid = "win7-x64" +) -if (!(Test-Path $localPackageSourcePath)) -{ - $localPackageSourcePath = -join($repoRoot, "\bin\packages\Release\") - if (!(Test-Path $localPackageSourcePath)) - { - Write-Error -Message "Local package source must exist."; - Exit; - } -} - -function _getPackageVersion() +function _getPackageVersion($packageName) { $searchPattern = -join($localPackageSourcePath, $packageName, ".[0-9].[0-9].[0-9]*.nupkg") if (!(Test-Path $searchPattern)) { - Write-Error -Message (-join("Didn't find package: Microsoft.Windows.Compatibility in source: ", $localPackageSourcePath, " please run build -allConfigurations")) + Write-Error -Message (-join("Didn't find package: ", $packageName, " in source: ", $localPackageSourcePath, " please run build -allConfigurations")) Exit; } @@ -34,32 +23,47 @@ function _getPackageVersion() return $matches[0] } -function _restoreAndPublish($targetFramework, $rid, $runtimeFramework, $refDirName) +$repoRoot = ((get-item $PSScriptRoot).parent.parent.parent.FullName); +$dotnetPath = -join($repoRoot, "\Tools\dotnetcli\dotnet.exe") +$csprojPath = -join($PSScriptRoot, "\", (Get-ChildItem $PSScriptRoot"\*.csproj" | Select-Object -ExpandProperty Name)) +$packagesCachePath = -join($repoRoot, "\packages") +$localPackageSourcePath = -join($repoRoot, "\bin\packages\Debug\") + +if (!(Test-Path $localPackageSourcePath)) { - $packageVersion = _getPackageVersion - & $dotnetPath restore --packages $packagesCachePath /p:RestoreSources="https://api.nuget.org/v3/index.json;$localPackageSourcePath" /p:TargetFramework=$targetFramework /p:CompatibilityPackageVersion=$packageVersion $csprojPath - & $dotnetPath publish -r $rid /p:RestoreSources="https://api.nuget.org/v3/index.json;$localPackageSourcePath" /p:TargetFramework=$targetFramework /p:CompatibilityPackageVersion=$packageVersion /p:RuntimeFrameworkVersion=$runtimeFramework $csprojPath - - $outputPath = -join($PSScriptRoot, "\bin\Debug\", $targetFramework, "\", $rid, "\publish\refs\") - - if (!(Test-Path $outputPath)) - { - Write-Error -Message (-join("There was an error while publishing for framework: ", $targetFramework)) - Exit; - } - - Write-Output (-join("Published succedded for: ", $targetFramework)) - - $refPath = -join($repoRoot, "\bin\ref\", $refDirName) - - if (Test-Path $refPath) + $localPackageSourcePath = -join($repoRoot, "\bin\packages\Release\") + if (!(Test-Path $localPackageSourcePath)) { - Remove-Item $refPath -r -force + Write-Error -Message "Local package source must exist."; + Exit; } - - New-Item $refPath -ItemType directory - Copy-Item (-join($outputPath, "*")) $refPath } -_restoreAndPublish "netcoreapp2.0" $winRID "2.0.0" "netcoreapp20_compat" -_restoreAndPublish "netstandard2.0" $winRID "2.0.0" "netstandard20_compat" \ No newline at end of file +$restoreSources = -join("https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;https://api.nuget.org/v3/index.json;https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;", $localPackageSourcePath) + +$compatPackageVersion = _getPackageVersion "Microsoft.Windows.Compatibility" +$privatePackageVersion = _getPackageVersion "Microsoft.Private.CoreFx.NETCoreApp" + +& $dotnetPath restore --packages $packagesCachePath /p:RestoreSources="$restoreSources" /p:TargetFramework=$targetFramework /p:CompatibilityPackageVersion=$compatPackageVersion /p:PrivateCorefxPackageVersion=$privatePackageVersion /p:RID=$rid $csprojPath + +& $dotnetPath publish -r $rid /p:RestoreSources="$restoreSources" /p:TargetFramework=$targetFramework /p:CompatibilityPackageVersion=$compatPackageVersion /p:RuntimeFrameworkVersion=$runtimeFramework /p:PrivateCorefxPackageVersion=$privatePackageVersion /p:RID=$rid $csprojPath + +$outputPath = -join($PSScriptRoot, "\bin\Debug\", $targetFramework, "\", $rid, "\publish\refs\") + +if (!(Test-Path $outputPath)) +{ + Write-Error -Message (-join("There was an error while publishing for framework: ", $targetFramework)) + Exit; +} + +Write-Output (-join("Published succedded for: ", $targetFramework)) + +$refPath = -join($repoRoot, "\bin\ref\", $refDirName) + +if (Test-Path $refPath) +{ + Remove-Item $refPath -r -force +} + +New-Item $refPath -ItemType directory +Copy-Item (-join($outputPath, "*")) $refPath diff --git a/external/corefx/pkg/baseline/baseline.props b/external/corefx/pkg/baseline/baseline.props index 5a8a7d521e..d5e93dbfd5 100644 --- a/external/corefx/pkg/baseline/baseline.props +++ b/external/corefx/pkg/baseline/baseline.props @@ -1,14 +1,29 @@ - + $(MSBuildThisFileDirectory)..\Microsoft.Private.PackageBaseline\packageIndex.json + + - + + + + + + + <_StablePackageIdentity Include="$(Id)"> + $(PackageVersion) + + + diff --git a/external/corefx/pkg/descriptions.json b/external/corefx/pkg/descriptions.json index 83319dc0b7..411661f2c9 100644 --- a/external/corefx/pkg/descriptions.json +++ b/external/corefx/pkg/descriptions.json @@ -1,4 +1,9 @@ [ + { + "Name": "CoreFx.Private.TestUtilities", + "Description": "Private package, which provides testing utility classes. The package is meant to be used when running CoreFX tests on a runtime.", + "CommonTypes": [] + }, { "Name": "RuntimePackage", "Description": "Internal implementation package not meant for direct consumption. Please do not reference directly.", @@ -29,7 +34,7 @@ "Name": "Microsoft.Diagnostics.Tracing.EventSource.Redist", "Description": "This package includes the class Microsoft.Diagnostics.Tracing.EventSource which enables firing ETW events from managed code. This is the \"runtime\" or \"redist\" EventSource package and should be referenced directly only by other NuGet packages that need the EventSource functionality. Application developers that need this functionality should instead reference the Microsoft.Diagnostics.Tracing.EventSource NuGet package which provides an enhanced developer experience. - This package enables defining a strongly typed specification of an ETW provider that can be called by managed code. The EventSource class is also included in the .NET Framework. This package provides a newer version that has more features. It is meant to be used as a stop gap until those features it contains are ported to System.Diagnostics.Tracing.EventSource. + This package enables defining a strongly typed specification of an ETW provider that can be called by managed code. The EventSource class is also included in the .NET Framework, .NET Core, and netstandard2.0 in the System.Diagnostics.Tracing namespace. This package contains the latest version of EventSource and is meant to be used as a stop gap for .NET Framework developers until features and fixes are ported to System.Diagnostics.Tracing.EventSource in the .NET Framework. For more details, have a look at http://msdn.microsoft.com/en-us/library/system.diagnostics.tracing.eventsource.aspx. @@ -200,6 +205,13 @@ "Microsoft.Win32.RegistryView" ] }, + { + "Name": "Microsoft.Win32.SystemEvents", + "Description": "Provides access to Windows system event notifications.", + "CommonTypes": [ + "Microsoft.Win32.SystemEvents" + ] + }, { "Name": "Microsoft.Win32.Registry.AccessControl", "Description": "Provides support for managing access and audit control lists for Microsoft.Win32.RegistryKey.", @@ -892,6 +904,15 @@ "Description": "Provides classes that support storage of multiple data objects in a single container.", "CommonTypes": [] }, + { + "Name": "System.IO.Pipelines", + "Description": "Single producer single consumer byte buffer management.", + "CommonTypes": [ + "System.IO.Pipelines.Pipe", + "System.IO.Pipelines.PipeWriter", + "System.IO.Pipelines.PipeReader" + ] + }, { "Name": "System.IO.Pipes", "Description": "Provides a means for interprocess communication through anonymous and/or named pipes.", @@ -991,9 +1012,16 @@ }, { "Name": "System.Memory", - "Description": "Provides types for efficient low-allocation access to memory.", + "Description": "Provides types for efficient representation and pooling of managed, stack, and native memory segments and sequences of such segments, along with primitives to parse and format UTF-8 encoded text stored in those memory segments.", "CommonTypes": [ - "System.Span" + "System.Span", + "System.ReadOnlySpan", + "System.Memory", + "System.ReadOnlyMemory", + "System.Buffers.MemoryPool", + "System.Buffers.ReadOnlySequence", + "System.Buffers.Text.Utf8Parser", + "System.Buffers.Text.Utf8Formatter" ] }, { @@ -1418,7 +1446,7 @@ "System.Runtime.Caching.FileChangeMonitor", "System.Runtime.Caching.HostFileChangeMonitor", "System.Runtime.Caching.MemoryCache", - "System.Runtime.Caching.ObjectCache", + "System.Runtime.Caching.ObjectCache" ] }, { @@ -1500,6 +1528,14 @@ "System.Runtime.InteropServices.WindowsRuntime.ReturnValueNameAttribute" ] }, + { + "Name": "System.Runtime.Intrinsics.Experimental", + "Description": "Provides APIs to processor specific instructions.", + "CommonTypes": [ + "System.Runtime.Intrinsics.Vector128<>", + "System.Runtime.Intrinsics.Vector256<>" + ] + }, { "Name": "System.Runtime.Loader", "Description": "Provides the System.Runtime.Loader.AssemblyLoadContext class, which provides members for loading assemblies.", diff --git a/external/corefx/pkg/dir.props b/external/corefx/pkg/dir.props index aee4309040..81edaa295d 100644 --- a/external/corefx/pkg/dir.props +++ b/external/corefx/pkg/dir.props @@ -2,6 +2,13 @@ + + + true + + @@ -16,7 +23,7 @@ - <_project Include="@(BuildRID)"> @@ -48,5 +55,10 @@ - + + + + true + + diff --git a/external/corefx/pkg/dir.traversal.targets b/external/corefx/pkg/dir.traversal.targets index 049c8546b5..2e651cb389 100644 --- a/external/corefx/pkg/dir.traversal.targets +++ b/external/corefx/pkg/dir.traversal.targets @@ -2,8 +2,8 @@ - - + + true diff --git a/external/corefx/pkg/test/frameworkSettings/netcoreapp/settings.targets b/external/corefx/pkg/test/frameworkSettings/netcoreapp/settings.targets index d4cd7ba326..628d07c1db 100644 --- a/external/corefx/pkg/test/frameworkSettings/netcoreapp/settings.targets +++ b/external/corefx/pkg/test/frameworkSettings/netcoreapp/settings.targets @@ -7,6 +7,7 @@ true + true true @@ -14,5 +15,9 @@ + + + \ No newline at end of file diff --git a/external/corefx/pkg/test/frameworkSettings/netcoreapp2.0/settings.targets b/external/corefx/pkg/test/frameworkSettings/netcoreapp2.0/settings.targets new file mode 100644 index 0000000000..e36a61bdac --- /dev/null +++ b/external/corefx/pkg/test/frameworkSettings/netcoreapp2.0/settings.targets @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/external/corefx/pkg/test/frameworkSettings/netcoreapp2.1/settings.targets b/external/corefx/pkg/test/frameworkSettings/netcoreapp2.1/settings.targets new file mode 100644 index 0000000000..949dc4c30a --- /dev/null +++ b/external/corefx/pkg/test/frameworkSettings/netcoreapp2.1/settings.targets @@ -0,0 +1,9 @@ + + + + + 2.1 + + $(MicrosoftNETCoreAppPackageVersion) + + \ No newline at end of file diff --git a/external/corefx/pkg/test/frameworkSettings/netstandard/settings.targets b/external/corefx/pkg/test/frameworkSettings/netstandard/settings.targets index 67ee4260cc..819cd00b66 100644 --- a/external/corefx/pkg/test/frameworkSettings/netstandard/settings.targets +++ b/external/corefx/pkg/test/frameworkSettings/netstandard/settings.targets @@ -1,7 +1,15 @@ + + true true + + + + + + \ No newline at end of file diff --git a/external/corefx/pkg/test/packageSettings/Microsoft.NETCore.Platforms/netcoreapp2.1/settings.targets b/external/corefx/pkg/test/packageSettings/Microsoft.NETCore.Platforms/netcoreapp2.1/settings.targets new file mode 100644 index 0000000000..03d8b58717 --- /dev/null +++ b/external/corefx/pkg/test/packageSettings/Microsoft.NETCore.Platforms/netcoreapp2.1/settings.targets @@ -0,0 +1,9 @@ + + + + + $(NoWarn);NU1605 + + \ No newline at end of file diff --git a/external/corefx/pkg/test/packageSettings/Microsoft.NETCore.Targets/netcoreapp1.0/settings.targets b/external/corefx/pkg/test/packageSettings/Microsoft.NETCore.Targets/netcoreapp1.0/settings.targets new file mode 100644 index 0000000000..3056cd46cd --- /dev/null +++ b/external/corefx/pkg/test/packageSettings/Microsoft.NETCore.Targets/netcoreapp1.0/settings.targets @@ -0,0 +1,7 @@ + + + + + false + + \ No newline at end of file diff --git a/external/corefx/pkg/test/packageSettings/Microsoft.NETCore.Targets/netcoreapp1.1/settings.targets b/external/corefx/pkg/test/packageSettings/Microsoft.NETCore.Targets/netcoreapp1.1/settings.targets new file mode 100644 index 0000000000..3056cd46cd --- /dev/null +++ b/external/corefx/pkg/test/packageSettings/Microsoft.NETCore.Targets/netcoreapp1.1/settings.targets @@ -0,0 +1,7 @@ + + + + + false + + \ No newline at end of file diff --git a/external/corefx/pkg/test/packageSettings/Microsoft.NETCore.Targets/netcoreapp2.1/settings.targets b/external/corefx/pkg/test/packageSettings/Microsoft.NETCore.Targets/netcoreapp2.1/settings.targets new file mode 100644 index 0000000000..03d8b58717 --- /dev/null +++ b/external/corefx/pkg/test/packageSettings/Microsoft.NETCore.Targets/netcoreapp2.1/settings.targets @@ -0,0 +1,9 @@ + + + + + $(NoWarn);NU1605 + + \ No newline at end of file diff --git a/external/corefx/pkg/test/packageSettings/System.Buffers/netcoreapp1.0/workaroundDowngrade.targets b/external/corefx/pkg/test/packageSettings/System.Buffers/netcoreapp1.0/workaroundDowngrade.targets new file mode 100644 index 0000000000..1ec61540e4 --- /dev/null +++ b/external/corefx/pkg/test/packageSettings/System.Buffers/netcoreapp1.0/workaroundDowngrade.targets @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/external/corefx/pkg/test/packageSettings/System.Diagnostics.DiagnosticSource/netcoreapp1.0/workaroundDowngrade.targets b/external/corefx/pkg/test/packageSettings/System.Diagnostics.DiagnosticSource/netcoreapp1.0/workaroundDowngrade.targets new file mode 100644 index 0000000000..1ec61540e4 --- /dev/null +++ b/external/corefx/pkg/test/packageSettings/System.Diagnostics.DiagnosticSource/netcoreapp1.0/workaroundDowngrade.targets @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/external/corefx/pkg/test/packageSettings/System.IO.Packaging/netcoreapp1.0/workaroundDowngrade.targets b/external/corefx/pkg/test/packageSettings/System.IO.Packaging/netcoreapp1.0/workaroundDowngrade.targets new file mode 100644 index 0000000000..1ec61540e4 --- /dev/null +++ b/external/corefx/pkg/test/packageSettings/System.IO.Packaging/netcoreapp1.0/workaroundDowngrade.targets @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/external/corefx/pkg/test/packageSettings/System.Reflection.TypeExtensions/netcoreapp1.0/workaroundDowngrade.targets b/external/corefx/pkg/test/packageSettings/System.Reflection.TypeExtensions/netcoreapp1.0/workaroundDowngrade.targets new file mode 100644 index 0000000000..1ec61540e4 --- /dev/null +++ b/external/corefx/pkg/test/packageSettings/System.Reflection.TypeExtensions/netcoreapp1.0/workaroundDowngrade.targets @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/external/corefx/pkg/test/packageSettings/System.Runtime.CompilerServices.Unsafe/netcoreapp1.0/workaroundDowngrade.targets b/external/corefx/pkg/test/packageSettings/System.Runtime.CompilerServices.Unsafe/netcoreapp1.0/workaroundDowngrade.targets new file mode 100644 index 0000000000..1ec61540e4 --- /dev/null +++ b/external/corefx/pkg/test/packageSettings/System.Runtime.CompilerServices.Unsafe/netcoreapp1.0/workaroundDowngrade.targets @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/external/corefx/pkg/test/packageSettings/System.Security.Cryptography.Cng/netcoreapp1.0/workaroundDowngrade.targets b/external/corefx/pkg/test/packageSettings/System.Security.Cryptography.Cng/netcoreapp1.0/workaroundDowngrade.targets new file mode 100644 index 0000000000..1ec61540e4 --- /dev/null +++ b/external/corefx/pkg/test/packageSettings/System.Security.Cryptography.Cng/netcoreapp1.0/workaroundDowngrade.targets @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/external/corefx/pkg/test/packageSettings/System.Security.Cryptography.OpenSsl/netcoreapp1.0/workaroundDowngrade.targets b/external/corefx/pkg/test/packageSettings/System.Security.Cryptography.OpenSsl/netcoreapp1.0/workaroundDowngrade.targets new file mode 100644 index 0000000000..1ec61540e4 --- /dev/null +++ b/external/corefx/pkg/test/packageSettings/System.Security.Cryptography.OpenSsl/netcoreapp1.0/workaroundDowngrade.targets @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/external/corefx/pkg/test/packageSettings/System.Security.Cryptography.Pkcs/netcoreapp1.0/workaroundDowngrade.targets b/external/corefx/pkg/test/packageSettings/System.Security.Cryptography.Pkcs/netcoreapp1.0/workaroundDowngrade.targets new file mode 100644 index 0000000000..1ec61540e4 --- /dev/null +++ b/external/corefx/pkg/test/packageSettings/System.Security.Cryptography.Pkcs/netcoreapp1.0/workaroundDowngrade.targets @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/external/corefx/pkg/test/packageSettings/System.Security.Principal.Windows/netcoreapp1.0/workaroundDowngrade.targets b/external/corefx/pkg/test/packageSettings/System.Security.Principal.Windows/netcoreapp1.0/workaroundDowngrade.targets new file mode 100644 index 0000000000..1ec61540e4 --- /dev/null +++ b/external/corefx/pkg/test/packageSettings/System.Security.Principal.Windows/netcoreapp1.0/workaroundDowngrade.targets @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/external/corefx/pkg/test/packageSettings/System.Threading.Tasks.Extensions/netcoreapp1.0/workaroundDowngrade.targets b/external/corefx/pkg/test/packageSettings/System.Threading.Tasks.Extensions/netcoreapp1.0/workaroundDowngrade.targets new file mode 100644 index 0000000000..1ec61540e4 --- /dev/null +++ b/external/corefx/pkg/test/packageSettings/System.Threading.Tasks.Extensions/netcoreapp1.0/workaroundDowngrade.targets @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/external/corefx/pkg/test/packageTest.targets b/external/corefx/pkg/test/packageTest.targets index 559d5bfe36..3f13ea9bab 100644 --- a/external/corefx/pkg/test/packageTest.targets +++ b/external/corefx/pkg/test/packageTest.targets @@ -8,6 +8,7 @@ + @@ -56,7 +57,7 @@ + Condition="'$(ShouldVerifyClosure)' == 'true' AND '$(RuntimeIdentifier)' != ''"> <_runClosureFileNames Include="@(ReferenceCopyLocalPaths->'%(FileName)')"> %(Identity) @@ -100,7 +101,7 @@ - + @@ -112,7 +113,7 @@ $(IntermediateOutputPath)\.testComplete - $(IntermediateOutputPath)\%(_projectRuntime.Identity)\.testComplete + $(IntermediateOutputPath)\%(_projectRuntime.Identity).testComplete RuntimeIdentifier=%(_projectRuntime.Identity) @@ -125,4 +126,4 @@ Outputs="@(TestProject->'%(Semaphore)')"> - \ No newline at end of file + diff --git a/external/corefx/pkg/test/testPackages.proj b/external/corefx/pkg/test/testPackages.proj index ac96cb3980..13f29fad81 100644 --- a/external/corefx/pkg/test/testPackages.proj +++ b/external/corefx/pkg/test/testPackages.proj @@ -4,30 +4,37 @@ - + + + + - - - + + + + + + + - $(PackageOutputPath)test/ + $(BinDir)testPkg/ test.msbuild $(TestDir)$(TestProjectName) $(TestDir)tools/ @@ -50,12 +57,15 @@ - + $(TestToolsDir)%(RecursiveDir) $(TestToolsDir) + + $(TestToolsDir) + $(TestToolsDir) @@ -75,6 +85,12 @@ $(TestDir) + + + + + + - + - + - \ No newline at end of file + diff --git a/external/corefx/src/Common/src/CoreLib/Internal/IO/File.Unix.cs b/external/corefx/src/Common/src/CoreLib/Internal/IO/File.Unix.cs new file mode 100644 index 0000000000..50fa0f0d0c --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/Internal/IO/File.Unix.cs @@ -0,0 +1,25 @@ +// 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 Internal.IO +{ + internal static partial class File + { + internal static bool InternalExists(string fullPath) + { + Interop.Sys.FileStatus fileinfo; + + // First use stat, as we want to follow symlinks. If that fails, it could be because the symlink + // is broken, we don't have permissions, etc., in which case fall back to using LStat to evaluate + // based on the symlink itself. + if (Interop.Sys.Stat(fullPath, out fileinfo) < 0 && + Interop.Sys.LStat(fullPath, out fileinfo) < 0) + { + return false; + } + + return ((fileinfo.Mode & Interop.Sys.FileTypes.S_IFMT) != Interop.Sys.FileTypes.S_IFDIR); + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/Internal/IO/File.Windows.cs b/external/corefx/src/Common/src/CoreLib/Internal/IO/File.Windows.cs new file mode 100644 index 0000000000..0acae3b457 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/Internal/IO/File.Windows.cs @@ -0,0 +1,77 @@ +// 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 Microsoft.Win32; +using Microsoft.Win32.SafeHandles; +using System.IO; +using System.Runtime.InteropServices; + +namespace Internal.IO +{ + internal static partial class File + { + internal static bool InternalExists(string fullPath) + { + Interop.Kernel32.WIN32_FILE_ATTRIBUTE_DATA data = new Interop.Kernel32.WIN32_FILE_ATTRIBUTE_DATA(); + int errorCode = FillAttributeInfo(fullPath, ref data, returnErrorOnNotFound: true); + + return (errorCode == 0) && (data.dwFileAttributes != -1) + && ((data.dwFileAttributes & Interop.Kernel32.FileAttributes.FILE_ATTRIBUTE_DIRECTORY) == 0); + } + + /// + /// Returns 0 on success, otherwise a Win32 error code. Note that + /// classes should use -1 as the uninitialized state for dataInitialized. + /// + /// Return the error code for not found errors? + internal static int FillAttributeInfo(string path, ref Interop.Kernel32.WIN32_FILE_ATTRIBUTE_DATA data, bool returnErrorOnNotFound) + { + int errorCode = Interop.Errors.ERROR_SUCCESS; + + using (DisableMediaInsertionPrompt.Create()) + { + if (!Interop.Kernel32.GetFileAttributesEx(path, Interop.Kernel32.GET_FILEEX_INFO_LEVELS.GetFileExInfoStandard, ref data)) + { + errorCode = Marshal.GetLastWin32Error(); + if (errorCode == Interop.Errors.ERROR_ACCESS_DENIED) + { + // Files that are marked for deletion will not let you GetFileAttributes, + // ERROR_ACCESS_DENIED is given back without filling out the data struct. + // FindFirstFile, however, will. Historically we always gave back attributes + // for marked-for-deletion files. + + var findData = new Interop.Kernel32.WIN32_FIND_DATA(); + using (SafeFindHandle handle = Interop.Kernel32.FindFirstFile(path, ref findData)) + { + if (handle.IsInvalid) + { + errorCode = Marshal.GetLastWin32Error(); + } + else + { + errorCode = Interop.Errors.ERROR_SUCCESS; + data.PopulateFrom(ref findData); + } + } + } + } + } + + if (errorCode != Interop.Errors.ERROR_SUCCESS && !returnErrorOnNotFound) + { + switch (errorCode) + { + case Interop.Errors.ERROR_FILE_NOT_FOUND: + case Interop.Errors.ERROR_PATH_NOT_FOUND: + case Interop.Errors.ERROR_NOT_READY: // Removable media not ready + // Return default value for backward compatibility + data.dwFileAttributes = -1; + return Interop.Errors.ERROR_SUCCESS; + } + } + + return errorCode; + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/Internal/IO/File.cs b/external/corefx/src/Common/src/CoreLib/Internal/IO/File.cs new file mode 100644 index 0000000000..2fcc0f391f --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/Internal/IO/File.cs @@ -0,0 +1,77 @@ +// 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; +using System.Diagnostics; +using System.Security; +using System.IO; + +namespace Internal.IO +{ + // + // Subsetted clone of System.IO.File for internal runtime use. + // Keep in sync with https://github.com/dotnet/corefx/tree/master/src/System.IO.FileSystem. + // + internal static partial class File + { + // Tests if a file exists. The result is true if the file + // given by the specified path exists; otherwise, the result is + // false. Note that if path describes a directory, + // Exists will return true. + public static bool Exists(string path) + { + try + { + if (path == null) + return false; + if (path.Length == 0) + return false; + + path = Path.GetFullPath(path); + + // After normalizing, check whether path ends in directory separator. + // Otherwise, FillAttributeInfo removes it and we may return a false positive. + // GetFullPath should never return null + Debug.Assert(path != null, "File.Exists: GetFullPath returned null"); + if (path.Length > 0 && PathInternal.IsDirectorySeparator(path[path.Length - 1])) + { + return false; + } + + return InternalExists(path); + } + catch (ArgumentException) { } + catch (NotSupportedException) { } // Security can throw this on ":" + catch (SecurityException) { } + catch (IOException) { } + catch (UnauthorizedAccessException) { } + + return false; + } + + public static byte[] ReadAllBytes(string path) + { + // bufferSize == 1 used to avoid unnecessary buffer in FileStream + using (FileStream fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, bufferSize: 1)) + { + long fileLength = fs.Length; + if (fileLength > int.MaxValue) + throw new IOException(SR.IO_FileTooLong2GB); + + int index = 0; + int count = (int)fileLength; + byte[] bytes = new byte[count]; + while (count > 0) + { + int n = fs.Read(bytes, index, count); + if (n == 0) + throw Error.GetEndOfFile(); + index += n; + count -= n; + } + return bytes; + } + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/Internal/Runtime/CompilerServices/Unsafe.cs b/external/corefx/src/Common/src/CoreLib/Internal/Runtime/CompilerServices/Unsafe.cs index cd3dd052a2..aeff3ce2ca 100644 --- a/external/corefx/src/Common/src/CoreLib/Internal/Runtime/CompilerServices/Unsafe.cs +++ b/external/corefx/src/Common/src/CoreLib/Internal/Runtime/CompilerServices/Unsafe.cs @@ -168,6 +168,46 @@ namespace Internal.Runtime.CompilerServices // ret } + /// + /// Determines whether the memory address referenced by is greater than + /// the memory address referenced by . + /// + /// + /// This check is conceptually similar to "(void*)(&left) > (void*)(&right)". + /// + [Intrinsic] + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static bool IsAddressGreaterThan(ref T left, ref T right) + { + throw new PlatformNotSupportedException(); + + // ldarg.0 + // ldarg.1 + // cgt.un + // ret + } + + /// + /// Determines whether the memory address referenced by is less than + /// the memory address referenced by . + /// + /// + /// This check is conceptually similar to "(void*)(&left) < (void*)(&right)". + /// + [Intrinsic] + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static bool IsAddressLessThan(ref T left, ref T right) + { + throw new PlatformNotSupportedException(); + + // ldarg.0 + // ldarg.1 + // clt.un + // ret + } + /// /// Initializes a block of memory at the given location with a given initial value /// without assuming architecture dependent alignment of the address. diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Unix/Interop.Errors.cs b/external/corefx/src/Common/src/CoreLib/Interop/Unix/Interop.Errors.cs index 4248434db3..e8aef9903f 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Unix/Interop.Errors.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Unix/Interop.Errors.cs @@ -186,7 +186,7 @@ internal static partial class Interop internal static extern int ConvertErrorPalToPlatform(Error error); [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_StrErrorR")] - private static unsafe extern byte* StrErrorR(int platformErrno, byte* buffer, int bufferSize); + private static extern unsafe byte* StrErrorR(int platformErrno, byte* buffer, int bufferSize); } } diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Unix/Interop.Libraries.cs b/external/corefx/src/Common/src/CoreLib/Interop/Unix/Interop.Libraries.cs index 7b3dea453d..02d0092445 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Unix/Interop.Libraries.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Unix/Interop.Libraries.cs @@ -6,7 +6,7 @@ internal static partial class Interop { internal static partial class Libraries { - internal const string GlobalizationInterop = "System.Globalization.Native"; + internal const string GlobalizationNative = "System.Globalization.Native"; internal const string SystemNative = "System.Native"; } } diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Calendar.cs b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Calendar.cs index 7b3caeabdd..55553cc7ea 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Calendar.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Calendar.cs @@ -9,25 +9,25 @@ using System.Text; internal static partial class Interop { - internal static partial class GlobalizationInterop + internal static partial class Globalization { internal delegate void EnumCalendarInfoCallback( [MarshalAs(UnmanagedType.LPWStr)] string calendarString, IntPtr context); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetCalendars")] + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetCalendars")] internal static extern int GetCalendars(string localeName, CalendarId[] calendars, int calendarsCapacity); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetCalendarInfo")] + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetCalendarInfo")] internal static extern ResultCode GetCalendarInfo(string localeName, CalendarId calendarId, CalendarDataType calendarDataType, [Out] StringBuilder result, int resultCapacity); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_EnumCalendarInfo")] + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_EnumCalendarInfo")] internal static extern bool EnumCalendarInfo(EnumCalendarInfoCallback callback, string localeName, CalendarId calendarId, CalendarDataType calendarDataType, IntPtr context); - [DllImport(Libraries.GlobalizationInterop, EntryPoint = "GlobalizationNative_GetLatestJapaneseEra")] + [DllImport(Libraries.GlobalizationNative, EntryPoint = "GlobalizationNative_GetLatestJapaneseEra")] internal static extern int GetLatestJapaneseEra(); - [DllImport(Libraries.GlobalizationInterop, EntryPoint = "GlobalizationNative_GetJapaneseEraStartDate")] + [DllImport(Libraries.GlobalizationNative, EntryPoint = "GlobalizationNative_GetJapaneseEraStartDate")] internal static extern bool GetJapaneseEraStartDate(int era, out int startYear, out int startMonth, out int startDay); } } diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Casing.cs b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Casing.cs index 769506b8f6..503a864d69 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Casing.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Casing.cs @@ -9,15 +9,15 @@ using System.Text; internal static partial class Interop { - internal static partial class GlobalizationInterop + internal static partial class Globalization { - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_ChangeCase")] - internal unsafe static extern void ChangeCase(char* src, int srcLen, char* dstBuffer, int dstBufferCapacity, bool bToUpper); + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_ChangeCase")] + internal static extern unsafe void ChangeCase(char* src, int srcLen, char* dstBuffer, int dstBufferCapacity, bool bToUpper); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_ChangeCaseInvariant")] - internal unsafe static extern void ChangeCaseInvariant(char* src, int srcLen, char* dstBuffer, int dstBufferCapacity, bool bToUpper); + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_ChangeCaseInvariant")] + internal static extern unsafe void ChangeCaseInvariant(char* src, int srcLen, char* dstBuffer, int dstBufferCapacity, bool bToUpper); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_ChangeCaseTurkish")] - internal unsafe static extern void ChangeCaseTurkish(char* src, int srcLen, char* dstBuffer, int dstBufferCapacity, bool bToUpper); + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_ChangeCaseTurkish")] + internal static extern unsafe void ChangeCaseTurkish(char* src, int srcLen, char* dstBuffer, int dstBufferCapacity, bool bToUpper); } } diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Collation.cs b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Collation.cs index 683845dbc1..9942882f1a 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Collation.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Collation.cs @@ -9,41 +9,53 @@ using System.Security; internal static partial class Interop { - internal static partial class GlobalizationInterop + internal static partial class Globalization { - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetSortHandle")] - internal unsafe static extern ResultCode GetSortHandle(byte[] localeName, out SafeSortHandle sortHandle); + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetSortHandle")] + internal static extern unsafe ResultCode GetSortHandle(byte[] localeName, out SafeSortHandle sortHandle); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_CloseSortHandle")] - internal unsafe static extern void CloseSortHandle(IntPtr handle); + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_CloseSortHandle")] + internal static extern unsafe void CloseSortHandle(IntPtr handle); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_CompareString")] - internal unsafe static extern int CompareString(SafeSortHandle sortHandle, char* lpStr1, int cwStr1Len, char* lpStr2, int cwStr2Len, CompareOptions options); + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_CompareString")] + internal static extern unsafe int CompareString(SafeSortHandle sortHandle, char* lpStr1, int cwStr1Len, char* lpStr2, int cwStr2Len, CompareOptions options); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_IndexOf")] - internal unsafe static extern int IndexOf(SafeSortHandle sortHandle, string target, int cwTargetLength, char* pSource, int cwSourceLength, CompareOptions options, int* matchLengthPtr); + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_IndexOf")] + internal static extern unsafe int IndexOf(SafeSortHandle sortHandle, string target, int cwTargetLength, char* pSource, int cwSourceLength, CompareOptions options, int* matchLengthPtr); + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_IndexOf")] + internal static extern unsafe int IndexOf(SafeSortHandle sortHandle, char* target, int cwTargetLength, char* pSource, int cwSourceLength, CompareOptions options, int* matchLengthPtr); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_LastIndexOf")] - internal unsafe static extern int LastIndexOf(SafeSortHandle sortHandle, string target, int cwTargetLength, char* pSource, int cwSourceLength, CompareOptions options); + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_LastIndexOf")] + internal static extern unsafe int LastIndexOf(SafeSortHandle sortHandle, string target, int cwTargetLength, char* pSource, int cwSourceLength, CompareOptions options); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_IndexOfOrdinalIgnoreCase")] - internal unsafe static extern int IndexOfOrdinalIgnoreCase(string target, int cwTargetLength, char* pSource, int cwSourceLength, bool findLast); + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_IndexOfOrdinalIgnoreCase")] + internal static extern unsafe int IndexOfOrdinalIgnoreCase(string target, int cwTargetLength, char* pSource, int cwSourceLength, bool findLast); + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_IndexOfOrdinalIgnoreCase")] + internal static extern unsafe int IndexOfOrdinalIgnoreCase(char* target, int cwTargetLength, char* pSource, int cwSourceLength, bool findLast); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_StartsWith")] + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_StartsWith")] [return: MarshalAs(UnmanagedType.Bool)] - internal unsafe static extern bool StartsWith(SafeSortHandle sortHandle, string target, int cwTargetLength, string source, int cwSourceLength, CompareOptions options); + internal static extern unsafe bool StartsWith(SafeSortHandle sortHandle, char* target, int cwTargetLength, char* source, int cwSourceLength, CompareOptions options); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_EndsWith")] + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_EndsWith")] [return: MarshalAs(UnmanagedType.Bool)] - internal unsafe static extern bool EndsWith(SafeSortHandle sortHandle, string target, int cwTargetLength, string source, int cwSourceLength, CompareOptions options); + internal static extern unsafe bool EndsWith(SafeSortHandle sortHandle, char* target, int cwTargetLength, char* source, int cwSourceLength, CompareOptions options); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetSortKey")] - internal unsafe static extern int GetSortKey(SafeSortHandle sortHandle, string str, int strLength, byte* sortKey, int sortKeyLength, CompareOptions options); + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_StartsWith")] + [return: MarshalAs(UnmanagedType.Bool)] + internal static extern unsafe bool StartsWith(SafeSortHandle sortHandle, string target, int cwTargetLength, string source, int cwSourceLength, CompareOptions options); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_CompareStringOrdinalIgnoreCase")] - internal unsafe static extern int CompareStringOrdinalIgnoreCase(char* lpStr1, int cwStr1Len, char* lpStr2, int cwStr2Len); + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_EndsWith")] + [return: MarshalAs(UnmanagedType.Bool)] + internal static extern unsafe bool EndsWith(SafeSortHandle sortHandle, string target, int cwTargetLength, string source, int cwSourceLength, CompareOptions options); - [DllImport(Libraries.GlobalizationInterop, EntryPoint = "GlobalizationNative_GetSortVersion")] + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetSortKey")] + internal static extern unsafe int GetSortKey(SafeSortHandle sortHandle, string str, int strLength, byte* sortKey, int sortKeyLength, CompareOptions options); + + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_CompareStringOrdinalIgnoreCase")] + internal static extern unsafe int CompareStringOrdinalIgnoreCase(char* lpStr1, int cwStr1Len, char* lpStr2, int cwStr2Len); + + [DllImport(Libraries.GlobalizationNative, EntryPoint = "GlobalizationNative_GetSortVersion")] internal static extern int GetSortVersion(SafeSortHandle sortHandle); internal class SafeSortHandle : SafeHandle diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.ICU.cs b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.ICU.cs index c690884145..a16c813b2f 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.ICU.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.ICU.cs @@ -8,9 +8,9 @@ using System.Runtime.CompilerServices; internal static partial class Interop { - internal static partial class GlobalizationInterop + internal static partial class Globalization { - [DllImport(Libraries.GlobalizationInterop, EntryPoint = "GlobalizationNative_LoadICU")] + [DllImport(Libraries.GlobalizationNative, EntryPoint = "GlobalizationNative_LoadICU")] internal static extern int LoadICU(); } } diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Idna.cs b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Idna.cs index 43c72281ae..89b6c3cebe 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Idna.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Idna.cs @@ -7,15 +7,15 @@ using System.Runtime.InteropServices; internal static partial class Interop { - internal static partial class GlobalizationInterop + internal static partial class Globalization { internal const int AllowUnassigned = 0x1; internal const int UseStd3AsciiRules = 0x2; - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_ToAscii")] - internal static unsafe extern int ToAscii(uint flags, char* src, int srcLen, char* dstBuffer, int dstBufferCapacity); + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_ToAscii")] + internal static extern unsafe int ToAscii(uint flags, char* src, int srcLen, char* dstBuffer, int dstBufferCapacity); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_ToUnicode")] - internal static unsafe extern int ToUnicode(uint flags, char* src, int srcLen, char* dstBuffer, int dstBufferCapacity); + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_ToUnicode")] + internal static extern unsafe int ToUnicode(uint flags, char* src, int srcLen, char* dstBuffer, int dstBufferCapacity); } } diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Locale.cs b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Locale.cs index fcea708ee8..9ef41dedf2 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Locale.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Locale.cs @@ -8,33 +8,33 @@ using System.Text; internal static partial class Interop { - internal static partial class GlobalizationInterop + internal static partial class Globalization { - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetLocaleName")] + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetLocaleName")] [return: MarshalAs(UnmanagedType.Bool)] - internal unsafe static extern bool GetLocaleName(string localeName, [Out] StringBuilder value, int valueLength); + internal static extern unsafe bool GetLocaleName(string localeName, [Out] StringBuilder value, int valueLength); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetLocaleInfoString")] + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetLocaleInfoString")] [return: MarshalAs(UnmanagedType.Bool)] - internal unsafe static extern bool GetLocaleInfoString(string localeName, uint localeStringData, [Out] StringBuilder value, int valueLength); + internal static extern unsafe bool GetLocaleInfoString(string localeName, uint localeStringData, [Out] StringBuilder value, int valueLength); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetDefaultLocaleName")] + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetDefaultLocaleName")] [return: MarshalAs(UnmanagedType.Bool)] - internal unsafe static extern bool GetDefaultLocaleName([Out] StringBuilder value, int valueLength); + internal static extern unsafe bool GetDefaultLocaleName([Out] StringBuilder value, int valueLength); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetLocaleTimeFormat")] + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetLocaleTimeFormat")] [return: MarshalAs(UnmanagedType.Bool)] - internal unsafe static extern bool GetLocaleTimeFormat(string localeName, bool shortFormat, [Out] StringBuilder value, int valueLength); + internal static extern unsafe bool GetLocaleTimeFormat(string localeName, bool shortFormat, [Out] StringBuilder value, int valueLength); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetLocaleInfoInt")] + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetLocaleInfoInt")] [return: MarshalAs(UnmanagedType.Bool)] - internal unsafe static extern bool GetLocaleInfoInt(string localeName, uint localeNumberData, ref int value); + internal static extern unsafe bool GetLocaleInfoInt(string localeName, uint localeNumberData, ref int value); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetLocaleInfoGroupingSizes")] + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetLocaleInfoGroupingSizes")] [return: MarshalAs(UnmanagedType.Bool)] - internal unsafe static extern bool GetLocaleInfoGroupingSizes(string localeName, uint localeGroupingData, ref int primaryGroupSize, ref int secondaryGroupSize); + internal static extern unsafe bool GetLocaleInfoGroupingSizes(string localeName, uint localeGroupingData, ref int primaryGroupSize, ref int secondaryGroupSize); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetLocales")] - internal unsafe static extern int GetLocales([Out] Char[] value, int valueLength); + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetLocales")] + internal static extern unsafe int GetLocales([Out] Char[] value, int valueLength); } } diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Normalization.cs b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Normalization.cs index c4cb9fb851..d442da0ea1 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Normalization.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Normalization.cs @@ -8,12 +8,12 @@ using System.Text; internal static partial class Interop { - internal static partial class GlobalizationInterop + internal static partial class Globalization { - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_IsNormalized")] + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_IsNormalized")] internal static extern int IsNormalized(NormalizationForm normalizationForm, string src, int srcLen); - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_NormalizeString")] + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_NormalizeString")] internal static extern int NormalizeString(NormalizationForm normalizationForm, string src, int srcLen, [Out] char[] dstBuffer, int dstBufferCapacity); } } diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.ResultCode.cs b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.ResultCode.cs index cca6ae4dcb..4a9933f929 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.ResultCode.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.ResultCode.cs @@ -4,7 +4,7 @@ internal static partial class Interop { - internal static partial class GlobalizationInterop + internal static partial class Globalization { // needs to be kept in sync with ResultCode in System.Globalization.Native internal enum ResultCode diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.TimeZoneInfo.cs b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.TimeZoneInfo.cs index 271ec3f9dc..47cf26662b 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.TimeZoneInfo.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.TimeZoneInfo.cs @@ -7,7 +7,7 @@ using System.Text; internal static partial class Interop { - internal static partial class GlobalizationInterop + internal static partial class Globalization { // needs to be kept in sync with TimeZoneDisplayNameType in System.Globalization.Native internal enum TimeZoneDisplayNameType @@ -17,7 +17,7 @@ internal static partial class Interop DaylightSavings = 2, } - [DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetTimeZoneDisplayName")] + [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetTimeZoneDisplayName")] internal static extern ResultCode GetTimeZoneDisplayName( string localeName, string timeZoneId, diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Utils.cs b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Utils.cs index 33b10c0d74..9887bd4f0b 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Utils.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Globalization.Native/Interop.Utils.cs @@ -13,7 +13,7 @@ internal static partial class Interop /// increasing buffer until the size is big enough. /// internal static bool CallStringMethod( - Func interopCall, + Func interopCall, TArg1 arg1, TArg2 arg2, TArg3 arg3, @@ -26,14 +26,14 @@ internal static partial class Interop for (int i = 0; i < maxDoubleAttempts; i++) { - GlobalizationInterop.ResultCode resultCode = interopCall(arg1, arg2, arg3, stringBuilder); + Interop.Globalization.ResultCode resultCode = interopCall(arg1, arg2, arg3, stringBuilder); - if (resultCode == GlobalizationInterop.ResultCode.Success) + if (resultCode == Interop.Globalization.ResultCode.Success) { result = StringBuilderCache.GetStringAndRelease(stringBuilder); return true; } - else if (resultCode == GlobalizationInterop.ResultCode.InsufficentBuffer) + else if (resultCode == Interop.Globalization.ResultCode.InsufficentBuffer) { // increase the string size and loop stringBuilder.EnsureCapacity(stringBuilder.Capacity * 2); diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.GetRandomBytes.cs b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.GetRandomBytes.cs index 62156e8d8e..e911b13583 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.GetRandomBytes.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.GetRandomBytes.cs @@ -11,7 +11,7 @@ internal partial class Interop internal unsafe partial class Sys { [DllImport(Interop.Libraries.SystemNative, EntryPoint = "SystemNative_GetNonCryptographicallySecureRandomBytes")] - internal static unsafe extern void GetNonCryptographicallySecureRandomBytes(byte* buffer, int length); + internal static extern unsafe void GetNonCryptographicallySecureRandomBytes(byte* buffer, int length); } internal static unsafe void GetRandomBytes(byte* buffer, int length) diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.PathConf.cs b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.PathConf.cs index eb9e32db0c..7213cb0264 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.PathConf.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.PathConf.cs @@ -9,8 +9,6 @@ internal static partial class Interop { internal static partial class Sys { - internal static int DEFAULT_PC_NAME_MAX = 255; - internal enum PathConfName : int { PC_LINK_MAX = 1, diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.Read.cs b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.Read.cs index 812ae348dc..1be5e789c2 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.Read.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.Read.cs @@ -20,6 +20,6 @@ internal static partial class Interop /// Note - on fail. the position of the stream may change depending on the platform; consult man 2 read for more info /// [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_Read", SetLastError = true)] - internal static unsafe extern int Read(SafeFileHandle fd, byte* buffer, int count); + internal static extern unsafe int Read(SafeFileHandle fd, byte* buffer, int count); } } diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.ReadDir.cs b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.ReadDir.cs new file mode 100644 index 0000000000..d98c4285c0 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.ReadDir.cs @@ -0,0 +1,102 @@ +// 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; +using System.Runtime.InteropServices; +using System.Threading; +using Microsoft.Win32.SafeHandles; + +internal static partial class Interop +{ + internal static partial class Sys + { + private static readonly int s_readBufferSize = GetReadDirRBufferSize(); + + internal enum NodeType : int + { + DT_UNKNOWN = 0, + DT_FIFO = 1, + DT_CHR = 2, + DT_DIR = 4, + DT_BLK = 6, + DT_REG = 8, + DT_LNK = 10, + DT_SOCK = 12, + DT_WHT = 14 + } + + [StructLayout(LayoutKind.Sequential)] + private unsafe struct InternalDirectoryEntry + { + internal IntPtr Name; + internal int NameLength; + internal NodeType InodeType; + } + + internal struct DirectoryEntry + { + internal NodeType InodeType; + internal string InodeName; + } + + [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_OpenDir", SetLastError = true)] + internal static extern Microsoft.Win32.SafeHandles.SafeDirectoryHandle OpenDir(string path); + + [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetReadDirRBufferSize", SetLastError = false)] + internal static extern int GetReadDirRBufferSize(); + + [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_ReadDirR", SetLastError = false)] + private static extern unsafe int ReadDirR(IntPtr dir, byte* buffer, int bufferSize, out InternalDirectoryEntry outputEntry); + + [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_CloseDir", SetLastError = true)] + internal static extern int CloseDir(IntPtr dir); + + // The calling pattern for ReadDir is described in src/Native/System.Native/pal_readdir.cpp + internal static int ReadDir(SafeDirectoryHandle dir, out DirectoryEntry outputEntry) + { + bool addedRef = false; + try + { + // We avoid a native string copy into InternalDirectoryEntry. + // - If the platform suppors reading into a buffer, the data is read directly into the buffer. The + // data can be read as long as the buffer is valid. + // - If the platform does not support reading into a buffer, the information returned in + // InternalDirectoryEntry points to native memory owned by the SafeDirectoryHandle. The data is only + // valid until the next call to CloseDir/ReadDir. We extend the reference until we have copied all data + // to ensure it does not become invalid by a CloseDir; and we copy the data so our caller does not + // use the native memory held by the SafeDirectoryHandle. + dir.DangerousAddRef(ref addedRef); + + unsafe + { + // s_readBufferSize is zero when the native implementation does not support reading into a buffer. + byte* buffer = stackalloc byte[s_readBufferSize]; + InternalDirectoryEntry temp; + int ret = ReadDirR(dir.DangerousGetHandle(), buffer, s_readBufferSize, out temp); + // We copy data into DirectoryEntry to ensure there are no dangling references. + outputEntry = ret == 0 ? + new DirectoryEntry() { InodeName = GetDirectoryEntryName(temp), InodeType = temp.InodeType } : + default(DirectoryEntry); + + return ret; + } + } + finally + { + if (addedRef) + { + dir.DangerousRelease(); + } + } + } + + private static unsafe string GetDirectoryEntryName(InternalDirectoryEntry dirEnt) + { + if (dirEnt.NameLength == -1) + return Marshal.PtrToStringAnsi(dirEnt.Name); + else + return Marshal.PtrToStringAnsi(dirEnt.Name, dirEnt.NameLength); + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.Write.cs b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.Write.cs index c14fc26263..0636615a8b 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.Write.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.Write.cs @@ -19,9 +19,9 @@ internal static partial class Interop /// Returns the number of bytes written on success; otherwise, returns -1 and sets errno /// [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_Write", SetLastError = true)] - internal static unsafe extern int Write(SafeFileHandle fd, byte* buffer, int bufferSize); + internal static extern unsafe int Write(SafeFileHandle fd, byte* buffer, int bufferSize); [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_Write", SetLastError = true)] - internal static unsafe extern int Write(int fd, byte* buffer, int bufferSize); + internal static extern unsafe int Write(int fd, byte* buffer, int bufferSize); } } diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Windows/BCrypt/Interop.BCryptGenRandom.GetRandomBytes.cs b/external/corefx/src/Common/src/CoreLib/Interop/Windows/BCrypt/Interop.BCryptGenRandom.GetRandomBytes.cs new file mode 100644 index 0000000000..dec3fcbeb3 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/Interop/Windows/BCrypt/Interop.BCryptGenRandom.GetRandomBytes.cs @@ -0,0 +1,30 @@ +// 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; +using System.Diagnostics; +using System.Diagnostics.Private; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal static unsafe void GetRandomBytes(byte* buffer, int length) + { + Debug.Assert(buffer != null); + Debug.Assert(length >= 0); + + BCrypt.NTSTATUS status = BCrypt.BCryptGenRandom(IntPtr.Zero, buffer, length, BCrypt.BCRYPT_USE_SYSTEM_PREFERRED_RNG); + if (status != BCrypt.NTSTATUS.STATUS_SUCCESS) + { + if (status == BCrypt.NTSTATUS.STATUS_NO_MEMORY) + { + throw new OutOfMemoryException(); + } + else + { + throw new InvalidOperationException(); + } + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Windows/BCrypt/Interop.BCryptGenRandom.cs b/external/corefx/src/Common/src/CoreLib/Interop/Windows/BCrypt/Interop.BCryptGenRandom.cs index bc357125b5..a2df9667e9 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Windows/BCrypt/Interop.BCryptGenRandom.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Windows/BCrypt/Interop.BCryptGenRandom.cs @@ -4,41 +4,16 @@ using System; using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.InteropServices; internal partial class Interop { internal partial class BCrypt { - internal static unsafe int BCryptGenRandom(byte* pbBuffer, int count) - { - Debug.Assert(pbBuffer != null); - Debug.Assert(count >= 0); - - return BCryptGenRandom(IntPtr.Zero, pbBuffer, count, BCRYPT_USE_SYSTEM_PREFERRED_RNG); - } - - private const int BCRYPT_USE_SYSTEM_PREFERRED_RNG = 0x00000002; - internal const int STATUS_SUCCESS = 0x0; - internal const int STATUS_NO_MEMORY = unchecked((int)0xC0000017); + internal const int BCRYPT_USE_SYSTEM_PREFERRED_RNG = 0x00000002; [DllImport(Libraries.BCrypt, CharSet = CharSet.Unicode)] - private static unsafe extern int BCryptGenRandom(IntPtr hAlgorithm, byte* pbBuffer, int cbBuffer, int dwFlags); - } - - internal static unsafe void GetRandomBytes(byte* buffer, int length) - { - int status = BCrypt.BCryptGenRandom(buffer, length); - if (status != BCrypt.STATUS_SUCCESS) - { - if (status == BCrypt.STATUS_NO_MEMORY) - { - throw new OutOfMemoryException(); - } - else - { - throw new InvalidOperationException(); - } - } + internal static extern unsafe NTSTATUS BCryptGenRandom(IntPtr hAlgorithm, byte* pbBuffer, int cbBuffer, int dwFlags); } } diff --git a/external/corefx/src/Common/src/Interop/Windows/BCrypt/Interop.NTSTATUS.cs b/external/corefx/src/Common/src/CoreLib/Interop/Windows/BCrypt/Interop.NTSTATUS.cs similarity index 100% rename from external/corefx/src/Common/src/Interop/Windows/BCrypt/Interop.NTSTATUS.cs rename to external/corefx/src/Common/src/CoreLib/Interop/Windows/BCrypt/Interop.NTSTATUS.cs diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Interop.Errors.cs b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Interop.Errors.cs index ec52a81bf6..7f907fb6ca 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Interop.Errors.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Interop.Errors.cs @@ -39,6 +39,7 @@ internal partial class Interop internal const int ERROR_NO_UNICODE_TRANSLATION = 0x459; internal const int ERROR_NOT_FOUND = 0x490; internal const int ERROR_BAD_IMPERSONATION_LEVEL = 0x542; + internal const int ERROR_NO_SYSTEM_RESOURCES = 0x5AA; internal const int E_FILENOTFOUND = unchecked((int)0x80070002); internal const int ERROR_TIMEOUT = 0x000005B4; } diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.FindClose.cs b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.FindClose.cs index 03d8c8b323..fcf9254aca 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.FindClose.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.FindClose.cs @@ -11,6 +11,6 @@ internal partial class Interop internal partial class Kernel32 { [DllImport(Libraries.Kernel32, SetLastError = true)] - internal extern static bool FindClose(IntPtr hFindFile); + internal static extern bool FindClose(IntPtr hFindFile); } } diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetFileAttributesEx.cs b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetFileAttributesEx.cs index 4cce56bd05..181fb10105 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetFileAttributesEx.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetFileAttributesEx.cs @@ -31,7 +31,7 @@ internal partial class Interop internal struct WIN32_FILE_ATTRIBUTE_DATA { - internal int fileAttributes; + internal int dwFileAttributes; internal uint ftCreationTimeLow; internal uint ftCreationTimeHigh; internal uint ftLastAccessTimeLow; @@ -44,7 +44,7 @@ internal partial class Interop internal void PopulateFrom(ref WIN32_FIND_DATA findData) { // Copy the information to data - fileAttributes = (int)findData.dwFileAttributes; + dwFileAttributes = (int)findData.dwFileAttributes; ftCreationTimeLow = findData.ftCreationTime.dwLowDateTime; ftCreationTimeHigh = findData.ftCreationTime.dwHighDateTime; ftLastAccessTimeLow = findData.ftLastAccessTime.dwLowDateTime; diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetFileType_SafeHandle.cs b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetFileType_SafeHandle.cs index c07a1683a5..faa57cc2f1 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetFileType_SafeHandle.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetFileType_SafeHandle.cs @@ -10,6 +10,6 @@ internal partial class Interop internal partial class Kernel32 { [DllImport(Libraries.Kernel32, SetLastError = true)] - internal extern static int GetFileType(SafeHandle hFile); + internal static extern int GetFileType(SafeHandle hFile); } } diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetFullPathNameW.cs b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetFullPathNameW.cs index 15dd581113..197b0a9be5 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetFullPathNameW.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetFullPathNameW.cs @@ -13,6 +13,6 @@ internal partial class Interop /// WARNING: This method does not implicitly handle long paths. Use GetFullPathName or PathHelper. /// [DllImport(Libraries.Kernel32, SetLastError = true, CharSet = CharSet.Unicode, BestFitMapping = false, ExactSpelling = true)] - unsafe internal static extern uint GetFullPathNameW(char* path, uint numBufferChars, char[] buffer, IntPtr mustBeZero); + internal static extern uint GetFullPathNameW(ref char lpFileName, uint nBufferLength, ref char lpBuffer, IntPtr lpFilePart); } } diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetLongPathNameW.cs b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetLongPathNameW.cs index ce04078af5..81b4d096f5 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetLongPathNameW.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetLongPathNameW.cs @@ -13,6 +13,6 @@ internal partial class Interop /// WARNING: This method does not implicitly handle long paths. Use GetFullPath/PathHelper. /// [DllImport(Libraries.Kernel32, SetLastError = true, CharSet = CharSet.Unicode, BestFitMapping = false, ExactSpelling = true)] - internal static extern uint GetLongPathNameW(char[] lpszShortPath, char[] lpszLongPath, uint cchBuffer); + internal static extern uint GetLongPathNameW(ref char lpszShortPath, ref char lpszLongPath, uint cchBuffer); } } diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetTempFileNameW.cs b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetTempFileNameW.cs index 36673895b4..97e1d82847 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetTempFileNameW.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetTempFileNameW.cs @@ -2,8 +2,6 @@ // 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; -using System.Text; using System.Runtime.InteropServices; internal partial class Interop @@ -11,6 +9,6 @@ internal partial class Interop internal partial class Kernel32 { [DllImport(Libraries.Kernel32, CharSet = CharSet.Unicode, SetLastError = true, BestFitMapping = false)] - internal static extern uint GetTempFileNameW(string tmpPath, string prefix, uint uniqueIdOrZero, [Out]StringBuilder tmpFileName); + internal static extern uint GetTempFileNameW(ref char lpPathName, string lpPrefixString, uint uUnique, ref char lpTempFileName); } } diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetTempPathW.cs b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetTempPathW.cs index ff2783be26..7f7bb775c8 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetTempPathW.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetTempPathW.cs @@ -2,8 +2,6 @@ // 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.IO; -using System.Text; using System.Runtime.InteropServices; internal partial class Interop @@ -11,6 +9,6 @@ internal partial class Interop internal partial class Kernel32 { [DllImport(Libraries.Kernel32, CharSet = CharSet.Unicode, BestFitMapping = false)] - internal static extern uint GetTempPathW(int bufferLen, [Out]StringBuilder buffer); + internal static extern uint GetTempPathW(int bufferLen, ref char buffer); } } diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.Globalization.cs b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.Globalization.cs index 00bec5d3e2..2227d59b0e 100644 --- a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.Globalization.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.Globalization.cs @@ -18,13 +18,13 @@ internal static partial class Interop internal const int COMPARE_STRING = 0x0001; [DllImport("kernel32.dll", CharSet = CharSet.Unicode)] - internal extern static unsafe int LCIDToLocaleName(int locale, char *pLocaleName, int cchName, uint dwFlags); + internal static extern unsafe int LCIDToLocaleName(int locale, char *pLocaleName, int cchName, uint dwFlags); [DllImport("kernel32.dll", CharSet = CharSet.Unicode)] - internal extern static int LocaleNameToLCID(string lpName, uint dwFlags); + internal static extern int LocaleNameToLCID(string lpName, uint dwFlags); [DllImport("kernel32.dll", CharSet = CharSet.Unicode)] - internal extern static unsafe int LCMapStringEx( + internal static extern unsafe int LCMapStringEx( string lpLocaleName, uint dwMapFlags, char* lpSrcStr, @@ -36,7 +36,7 @@ internal static partial class Interop IntPtr sortHandle); [DllImport("kernel32.dll", EntryPoint = "FindNLSStringEx")] - internal extern static unsafe int FindNLSStringEx( + internal static extern unsafe int FindNLSStringEx( char* lpLocaleName, uint dwFindNLSStringFlags, char* lpStringSource, @@ -49,7 +49,7 @@ internal static partial class Interop IntPtr sortHandle); [DllImport("kernel32.dll", EntryPoint = "CompareStringEx")] - internal extern static unsafe int CompareStringEx( + internal static extern unsafe int CompareStringEx( char* lpLocaleName, uint dwCmpFlags, char* lpString1, @@ -61,7 +61,7 @@ internal static partial class Interop IntPtr lParam); [DllImport("kernel32.dll", EntryPoint = "CompareStringOrdinal")] - internal extern static unsafe int CompareStringOrdinal( + internal static extern unsafe int CompareStringOrdinal( char* lpString1, int cchCount1, char* lpString2, @@ -69,7 +69,7 @@ internal static partial class Interop bool bIgnoreCase); [DllImport("kernel32.dll", EntryPoint = "FindStringOrdinal")] - internal extern static unsafe int FindStringOrdinal( + internal static extern unsafe int FindStringOrdinal( uint dwFindStringOrdinalFlags, char* lpStringSource, int cchSource, @@ -78,42 +78,42 @@ internal static partial class Interop int bIgnoreCase); [DllImport("kernel32.dll", CharSet = CharSet.Unicode)] - internal extern static unsafe bool IsNLSDefinedString( + internal static extern unsafe bool IsNLSDefinedString( int Function, uint dwFlags, IntPtr lpVersionInformation, char* lpString, int cchStr); -#if !PROJECTN +#if !ENABLE_WINRT [DllImport("Kernel32.dll", CharSet = CharSet.Auto)] internal static extern bool GetUserPreferredUILanguages(uint dwFlags, out uint pulNumLanguages, char [] pwszLanguagesBuffer, ref uint pcchLanguagesBuffer); -#endif //!PROJECTN +#endif //!ENABLE_WINRT [DllImport("kernel32.dll", CharSet = CharSet.Unicode)] internal static extern int GetLocaleInfoEx(string lpLocaleName, uint LCType, void* lpLCData, int cchData); [DllImport("kernel32.dll", CharSet = CharSet.Unicode)] - internal extern static bool EnumSystemLocalesEx(EnumLocalesProcEx lpLocaleEnumProcEx, uint dwFlags, void* lParam, IntPtr reserved); + internal static extern bool EnumSystemLocalesEx(EnumLocalesProcEx lpLocaleEnumProcEx, uint dwFlags, void* lParam, IntPtr reserved); internal delegate BOOL EnumLocalesProcEx(char* lpLocaleString, uint dwFlags, void* lParam); [DllImport("kernel32.dll", CharSet = CharSet.Unicode)] - internal extern static int ResolveLocaleName(string lpNameToResolve, char* lpLocaleName, int cchLocaleName); + internal static extern int ResolveLocaleName(string lpNameToResolve, char* lpLocaleName, int cchLocaleName); [DllImport("kernel32.dll", CharSet = CharSet.Unicode)] - internal extern static bool EnumTimeFormatsEx(EnumTimeFormatsProcEx lpTimeFmtEnumProcEx, string lpLocaleName, uint dwFlags, void* lParam); + internal static extern bool EnumTimeFormatsEx(EnumTimeFormatsProcEx lpTimeFmtEnumProcEx, string lpLocaleName, uint dwFlags, void* lParam); internal delegate BOOL EnumTimeFormatsProcEx(char* lpTimeFormatString, void* lParam); [DllImport("kernel32.dll", CharSet = CharSet.Unicode)] - internal extern static int GetCalendarInfoEx(string lpLocaleName, uint Calendar, IntPtr lpReserved, uint CalType, IntPtr lpCalData, int cchData, out int lpValue); + internal static extern int GetCalendarInfoEx(string lpLocaleName, uint Calendar, IntPtr lpReserved, uint CalType, IntPtr lpCalData, int cchData, out int lpValue); [DllImport("kernel32.dll", CharSet = CharSet.Unicode)] - internal extern static int GetCalendarInfoEx(string lpLocaleName, uint Calendar, IntPtr lpReserved, uint CalType, IntPtr lpCalData, int cchData, IntPtr lpValue); + internal static extern int GetCalendarInfoEx(string lpLocaleName, uint Calendar, IntPtr lpReserved, uint CalType, IntPtr lpCalData, int cchData, IntPtr lpValue); [DllImport("kernel32.dll", CharSet = CharSet.Unicode)] - internal extern static bool EnumCalendarInfoExEx(EnumCalendarInfoProcExEx pCalInfoEnumProcExEx, string lpLocaleName, uint Calendar, string lpReserved, uint CalType, void* lParam); + internal static extern bool EnumCalendarInfoExEx(EnumCalendarInfoProcExEx pCalInfoEnumProcExEx, string lpLocaleName, uint Calendar, string lpReserved, uint CalType, void* lParam); internal delegate BOOL EnumCalendarInfoProcExEx(char* lpCalendarInfoString, uint Calendar, IntPtr lpReserved, void* lParam); @@ -128,6 +128,6 @@ internal static partial class Interop } [DllImport("kernel32.dll", CharSet = CharSet.Unicode)] - internal extern static unsafe bool GetNLSVersionEx(int function, string localeName, NlsVersionInfoEx* lpVersionInformation); + internal static extern unsafe bool GetNLSVersionEx(int function, string localeName, NlsVersionInfoEx* lpVersionInformation); } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/IExprWithObject.cs b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.MAX_PATH.cs similarity index 62% rename from external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/IExprWithObject.cs rename to external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.MAX_PATH.cs index 98929888ba..f7fa32669b 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/IExprWithObject.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.MAX_PATH.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace Microsoft.CSharp.RuntimeBinder.Semantics +internal partial class Interop { - internal interface IExprWithObject + internal partial class Kernel32 { - Expr OptionalObject { get; set; } + internal const int MAX_PATH = 260; } } diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/Native/Interop.localization.cs b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.MUI.cs similarity index 51% rename from external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/Native/Interop.localization.cs rename to external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.MUI.cs index d0f9190535..6ed7aa2dc4 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/Native/Interop.localization.cs +++ b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.MUI.cs @@ -3,19 +3,16 @@ // See the LICENSE file in the project root for more information. using System; -using System.Text; -using System.Diagnostics; using System.Runtime.InteropServices; - -using Internal.Cryptography.Pal.Native; +using System.Text; internal static partial class Interop { - public static class localization + internal static partial class Kernel32 { - [DllImport(Libraries.Kernel32, CharSet = CharSet.Unicode, SetLastError = true, EntryPoint = "FormatMessageW")] - public static extern int FormatMessage(FormatMessageFlags dwFlags, IntPtr lpSource, int dwMessageId, int dwLanguageId, [Out] StringBuilder lpBuffer, int nSize, IntPtr Arguments); + internal const uint MUI_PREFERRED_UI_LANGUAGES = 0x10; + + [DllImport(Libraries.Kernel32, CharSet = CharSet.Unicode, SetLastError = true, ExactSpelling = true)] + internal static extern bool GetFileMUIPath(uint flags, String filePath, [Out] StringBuilder language, ref int languageLength, [Out] StringBuilder fileMuiPath, ref int fileMuiPathLength, ref Int64 enumerator); } } - - diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.MultiByteToWideChar.cs b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.MultiByteToWideChar.cs new file mode 100644 index 0000000000..158e4db3fd --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.MultiByteToWideChar.cs @@ -0,0 +1,20 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class Kernel32 + { + [DllImport(Libraries.Kernel32)] + internal static extern unsafe int MultiByteToWideChar( + uint CodePage, uint dwFlags, + byte* lpMultiByteStr, int cbMultiByte, + char* lpWideCharStr, int cchWideChar); + + internal const uint MB_PRECOMPOSED = 0x00000001; + } +} diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.TimeZone.Registry.cs b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.TimeZone.Registry.cs new file mode 100644 index 0000000000..062d1caeba --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.TimeZone.Registry.cs @@ -0,0 +1,31 @@ +// 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; +using System.Runtime.InteropServices; + +internal static partial class Interop +{ + internal static partial class Kernel32 + { + [StructLayout(LayoutKind.Sequential)] + internal struct REG_TZI_FORMAT + { + internal int Bias; + internal int StandardBias; + internal int DaylightBias; + internal SYSTEMTIME StandardDate; + internal SYSTEMTIME DaylightDate; + + internal REG_TZI_FORMAT(in TIME_ZONE_INFORMATION tzi) + { + Bias = tzi.Bias; + StandardDate = tzi.StandardDate; + StandardBias = tzi.StandardBias; + DaylightDate = tzi.DaylightDate; + DaylightBias = tzi.DaylightBias; + } + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.TimeZone.cs b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.TimeZone.cs new file mode 100644 index 0000000000..68d4583b54 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.TimeZone.cs @@ -0,0 +1,94 @@ +// 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; +using System.Runtime.InteropServices; + +internal static partial class Interop +{ + internal static partial class Kernel32 + { + internal struct SYSTEMTIME + { + internal ushort Year; + internal ushort Month; + internal ushort DayOfWeek; + internal ushort Day; + internal ushort Hour; + internal ushort Minute; + internal ushort Second; + internal ushort Milliseconds; + + internal bool Equals(in SYSTEMTIME other) => + Year == other.Year && + Month == other.Month && + DayOfWeek == other.DayOfWeek && + Day == other.Day && + Hour == other.Hour && + Minute == other.Minute && + Second == other.Second && + Milliseconds == other.Milliseconds; + } + + [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)] + internal unsafe struct TIME_DYNAMIC_ZONE_INFORMATION + { + internal int Bias; + internal fixed char StandardName[32]; + internal SYSTEMTIME StandardDate; + internal int StandardBias; + internal fixed char DaylightName[32]; + internal SYSTEMTIME DaylightDate; + internal int DaylightBias; + internal fixed char TimeZoneKeyName[128]; + internal byte DynamicDaylightTimeDisabled; + + internal string GetTimeZoneKeyName() + { + fixed (char* p = TimeZoneKeyName) + return new string(p); + } + } + + [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)] + internal unsafe struct TIME_ZONE_INFORMATION + { + internal int Bias; + internal fixed char StandardName[32]; + internal SYSTEMTIME StandardDate; + internal int StandardBias; + internal fixed char DaylightName[32]; + internal SYSTEMTIME DaylightDate; + internal int DaylightBias; + + internal TIME_ZONE_INFORMATION(in TIME_DYNAMIC_ZONE_INFORMATION dtzi) + { + // The start of TIME_DYNAMIC_ZONE_INFORMATION has identical layout as TIME_ZONE_INFORMATION + fixed (TIME_ZONE_INFORMATION* pTo = &this) + fixed (TIME_DYNAMIC_ZONE_INFORMATION* pFrom = &dtzi) + *pTo = *(TIME_ZONE_INFORMATION*)pFrom; + } + + internal string GetStandardName() + { + fixed (char* p = StandardName) + return new string(p); + } + + internal string GetDaylightName() + { + fixed (char* p = DaylightName) + return new string(p); + } + } + + internal const uint TIME_ZONE_ID_INVALID = unchecked((uint)-1); + + [DllImport(Libraries.Kernel32, CharSet = CharSet.Unicode, SetLastError = true, ExactSpelling = true)] + internal static extern uint GetDynamicTimeZoneInformation(out TIME_DYNAMIC_ZONE_INFORMATION pTimeZoneInformation); + + [DllImport(Libraries.Kernel32, CharSet = CharSet.Unicode, SetLastError = true, ExactSpelling = true)] + internal static extern uint GetTimeZoneInformation(out TIME_ZONE_INFORMATION lpTimeZoneInformation); + } +} diff --git a/external/corefx/src/Common/src/CoreLib/Interop/Windows/Ole32/Interop.CoCreateGuid.cs b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Ole32/Interop.CoCreateGuid.cs new file mode 100644 index 0000000000..57accbe7c0 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/Interop/Windows/Ole32/Interop.CoCreateGuid.cs @@ -0,0 +1,15 @@ +// 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; +using System.Runtime.InteropServices; + +internal static partial class Interop +{ + internal static partial class Ole32 + { + [DllImport(Interop.Libraries.Ole32)] + internal static extern int CoCreateGuid(out Guid guid); + } +} diff --git a/external/corefx/src/Common/src/Microsoft/Win32/SafeHandles/SafeX509NameHandle.Unix.cs b/external/corefx/src/Common/src/CoreLib/Microsoft/Win32/SafeHandles/SafeDirectoryHandle.Unix.cs similarity index 64% rename from external/corefx/src/Common/src/Microsoft/Win32/SafeHandles/SafeX509NameHandle.Unix.cs rename to external/corefx/src/Common/src/CoreLib/Microsoft/Win32/SafeHandles/SafeDirectoryHandle.Unix.cs index ae22b92303..f7435eaae1 100644 --- a/external/corefx/src/Common/src/Microsoft/Win32/SafeHandles/SafeX509NameHandle.Unix.cs +++ b/external/corefx/src/Common/src/CoreLib/Microsoft/Win32/SafeHandles/SafeDirectoryHandle.Unix.cs @@ -3,23 +3,19 @@ // See the LICENSE file in the project root for more information. using System; -using System.Security; using System.Runtime.InteropServices; namespace Microsoft.Win32.SafeHandles { - internal sealed class SafeX509NameHandle : SafeHandle + internal sealed class SafeDirectoryHandle : SafeHandle { - private SafeX509NameHandle() : - base(IntPtr.Zero, ownsHandle: true) + private SafeDirectoryHandle() : base(IntPtr.Zero, true) { } protected override bool ReleaseHandle() { - Interop.Crypto.X509NameDestroy(handle); - SetHandle(IntPtr.Zero); - return true; + return Interop.Sys.CloseDir(handle) == 0; } public override bool IsInvalid diff --git a/external/corefx/src/Common/src/CoreLib/Microsoft/Win32/SafeHandles/SafeFileHandle.Unix.cs b/external/corefx/src/Common/src/CoreLib/Microsoft/Win32/SafeHandles/SafeFileHandle.Unix.cs index f28f44fdad..b284c116ba 100644 --- a/external/corefx/src/Common/src/CoreLib/Microsoft/Win32/SafeHandles/SafeFileHandle.Unix.cs +++ b/external/corefx/src/Common/src/CoreLib/Microsoft/Win32/SafeHandles/SafeFileHandle.Unix.cs @@ -83,10 +83,7 @@ namespace Microsoft.Win32.SafeHandles private static bool DirectoryExists(string fullPath) { - int fileType = Interop.Sys.FileTypes.S_IFDIR; - Interop.Sys.FileStatus fileinfo; - Interop.ErrorInfo errorInfo = default(Interop.ErrorInfo); // First use stat, as we want to follow symlinks. If that fails, it could be because the symlink // is broken, we don't have permissions, etc., in which case fall back to using LStat to evaluate @@ -94,16 +91,10 @@ namespace Microsoft.Win32.SafeHandles if (Interop.Sys.Stat(fullPath, out fileinfo) < 0 && Interop.Sys.LStat(fullPath, out fileinfo) < 0) { - errorInfo = Interop.Sys.GetLastErrorInfo(); return false; } - // Something exists at this path. If the caller is asking for a directory, return true if it's - // a directory and false for everything else. If the caller is asking for a file, return false for - // a directory and true for everything else. - return - (fileType == Interop.Sys.FileTypes.S_IFDIR) == - ((fileinfo.Mode & Interop.Sys.FileTypes.S_IFMT) == Interop.Sys.FileTypes.S_IFDIR); + return ((fileinfo.Mode & Interop.Sys.FileTypes.S_IFMT) == Interop.Sys.FileTypes.S_IFDIR); } /// Opens a SafeFileHandle for a file descriptor created by a provided delegate. diff --git a/external/corefx/src/Common/src/CoreLib/Microsoft/Win32/SafeHandles/SafeFindHandle.Windows.cs b/external/corefx/src/Common/src/CoreLib/Microsoft/Win32/SafeHandles/SafeFindHandle.Windows.cs new file mode 100644 index 0000000000..4ba05409fd --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/Microsoft/Win32/SafeHandles/SafeFindHandle.Windows.cs @@ -0,0 +1,22 @@ +// 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; +using System.Security; +using System.Runtime.InteropServices; +using System.Runtime.CompilerServices; +using Microsoft.Win32; + +namespace Microsoft.Win32.SafeHandles +{ + internal sealed class SafeFindHandle : SafeHandleZeroOrMinusOneIsInvalid + { + internal SafeFindHandle() : base(true) { } + + override protected bool ReleaseHandle() + { + return Interop.Kernel32.FindClose(handle); + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System.Private.CoreLib.Shared.projitems b/external/corefx/src/Common/src/CoreLib/System.Private.CoreLib.Shared.projitems index e49edfd367..9761450bc3 100644 --- a/external/corefx/src/Common/src/CoreLib/System.Private.CoreLib.Shared.projitems +++ b/external/corefx/src/Common/src/CoreLib/System.Private.CoreLib.Shared.projitems @@ -19,6 +19,7 @@ + @@ -45,11 +46,13 @@ - + + - + + @@ -72,6 +75,7 @@ + @@ -92,6 +96,7 @@ + @@ -126,6 +131,7 @@ + @@ -147,6 +153,7 @@ + @@ -197,7 +204,6 @@ - @@ -232,12 +238,15 @@ + + + @@ -263,6 +272,7 @@ + @@ -416,6 +426,7 @@ + @@ -435,12 +446,12 @@ + - @@ -480,16 +491,24 @@ + - + + + + + + + + - + @@ -509,6 +528,7 @@ + @@ -539,6 +559,7 @@ + @@ -572,7 +593,7 @@ - + @@ -618,8 +639,41 @@ + + + True + True + ConstantHelper.tt + + + TextTemplatingFileGenerator + ConstantHelper.cs + + + + True + True + Register.tt + + + TextTemplatingFileGenerator + Register.cs + + + True + True + Vector.tt + + + TextTemplatingFileGenerator + Vector.cs + + + + + @@ -643,6 +697,8 @@ + + @@ -657,11 +713,16 @@ + + + + + @@ -670,22 +731,25 @@ + - + + + @@ -729,14 +793,18 @@ + + + + @@ -744,11 +812,13 @@ + + diff --git a/external/corefx/src/Common/src/CoreLib/System/AccessViolationException.cs b/external/corefx/src/Common/src/CoreLib/System/AccessViolationException.cs index 280d9b8a97..017d3aaee4 100644 --- a/external/corefx/src/Common/src/CoreLib/System/AccessViolationException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/AccessViolationException.cs @@ -17,7 +17,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class AccessViolationException : SystemException { public AccessViolationException() diff --git a/external/corefx/src/Common/src/CoreLib/System/AggregateException.cs b/external/corefx/src/Common/src/CoreLib/System/AggregateException.cs index 99ba703a52..30bed6d908 100644 --- a/external/corefx/src/Common/src/CoreLib/System/AggregateException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/AggregateException.cs @@ -22,7 +22,9 @@ namespace System /// [Serializable] [DebuggerDisplay("Count = {InnerExceptionCount}")] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class AggregateException : Exception { private ReadOnlyCollection m_innerExceptions; // Complete set of exceptions. Do not rename (binary serialization) diff --git a/external/corefx/src/Common/src/CoreLib/System/ApplicationException.cs b/external/corefx/src/Common/src/CoreLib/System/ApplicationException.cs index f36e2c1274..6b0b7ad905 100644 --- a/external/corefx/src/Common/src/CoreLib/System/ApplicationException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/ApplicationException.cs @@ -23,7 +23,9 @@ namespace System // ApplicationException extends but adds no new functionality to // RecoverableException. [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class ApplicationException : Exception { // Creates a new ApplicationException with its message string set to diff --git a/external/corefx/src/Common/src/CoreLib/System/ArgumentException.cs b/external/corefx/src/Common/src/CoreLib/System/ArgumentException.cs index 8a8fe3e5e4..397950b1cc 100644 --- a/external/corefx/src/Common/src/CoreLib/System/ArgumentException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/ArgumentException.cs @@ -20,7 +20,9 @@ namespace System // the contract of the method. Ideally it should give a meaningful error // message describing what was wrong and which parameter is incorrect. [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class ArgumentException : SystemException { private String _paramName; diff --git a/external/corefx/src/Common/src/CoreLib/System/ArgumentNullException.cs b/external/corefx/src/Common/src/CoreLib/System/ArgumentNullException.cs index 80e43cc265..4d4dacbf3a 100644 --- a/external/corefx/src/Common/src/CoreLib/System/ArgumentNullException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/ArgumentNullException.cs @@ -18,7 +18,9 @@ namespace System // The ArgumentException is thrown when an argument // is null when it shouldn't be. [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class ArgumentNullException : ArgumentException { // Creates a new ArgumentNullException with its message diff --git a/external/corefx/src/Common/src/CoreLib/System/ArgumentOutOfRangeException.cs b/external/corefx/src/Common/src/CoreLib/System/ArgumentOutOfRangeException.cs index 604caa8ee8..dfb2d692b6 100644 --- a/external/corefx/src/Common/src/CoreLib/System/ArgumentOutOfRangeException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/ArgumentOutOfRangeException.cs @@ -19,7 +19,9 @@ namespace System // The ArgumentOutOfRangeException is thrown when an argument // is outside the legal range for that argument. [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class ArgumentOutOfRangeException : ArgumentException { private Object _actualValue; diff --git a/external/corefx/src/Common/src/CoreLib/System/ArithmeticException.cs b/external/corefx/src/Common/src/CoreLib/System/ArithmeticException.cs index 606f1debfd..f34263e670 100644 --- a/external/corefx/src/Common/src/CoreLib/System/ArithmeticException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/ArithmeticException.cs @@ -18,7 +18,9 @@ namespace System // The ArithmeticException is thrown when overflow or underflow // occurs. [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class ArithmeticException : SystemException { // Creates a new ArithmeticException with its message string set to diff --git a/external/corefx/src/Common/src/CoreLib/System/ArraySegment.cs b/external/corefx/src/Common/src/CoreLib/System/ArraySegment.cs index d45fb0dc2b..5680993a6f 100644 --- a/external/corefx/src/Common/src/CoreLib/System/ArraySegment.cs +++ b/external/corefx/src/Common/src/CoreLib/System/ArraySegment.cs @@ -16,6 +16,7 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics; +using System.Diagnostics.Private; namespace System { @@ -25,7 +26,9 @@ namespace System // three fields from an ArraySegment may not see the same ArraySegment from one call to another // (ie, users could assign a new value to the old location). [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public readonly struct ArraySegment : IList, IReadOnlyList { // Do not replace the array allocation with Array.Empty. We don't want to have the overhead of @@ -192,7 +195,7 @@ namespace System return !(a == b); } - public static implicit operator ArraySegment(T[] array) => new ArraySegment(array); + public static implicit operator ArraySegment(T[] array) => array != null ? new ArraySegment(array) : default; #region IList T IList.this[int index] diff --git a/external/corefx/src/Common/src/CoreLib/System/ArrayTypeMismatchException.cs b/external/corefx/src/Common/src/CoreLib/System/ArrayTypeMismatchException.cs index 49820f58f5..04f6d658b7 100644 --- a/external/corefx/src/Common/src/CoreLib/System/ArrayTypeMismatchException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/ArrayTypeMismatchException.cs @@ -18,7 +18,9 @@ namespace System // The ArrayMismatchException is thrown when an attempt to store // an object of the wrong type within an array occurs. [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class ArrayTypeMismatchException : SystemException { // Creates a new ArrayMismatchException with its message string set to diff --git a/external/corefx/src/Common/src/CoreLib/System/AssemblyLoadEventHandler.cs b/external/corefx/src/Common/src/CoreLib/System/AssemblyLoadEventHandler.cs index 752379fdc7..8ae940033b 100644 --- a/external/corefx/src/Common/src/CoreLib/System/AssemblyLoadEventHandler.cs +++ b/external/corefx/src/Common/src/CoreLib/System/AssemblyLoadEventHandler.cs @@ -4,5 +4,8 @@ namespace System { +#if MONO + [Serializable] +#endif public delegate void AssemblyLoadEventHandler(object sender, AssemblyLoadEventArgs args); } diff --git a/external/corefx/src/Common/src/CoreLib/System/AsyncCallback.cs b/external/corefx/src/Common/src/CoreLib/System/AsyncCallback.cs index 036d44a4b9..cfc49cf924 100644 --- a/external/corefx/src/Common/src/CoreLib/System/AsyncCallback.cs +++ b/external/corefx/src/Common/src/CoreLib/System/AsyncCallback.cs @@ -12,5 +12,8 @@ namespace System { +#if MONO + [Serializable] +#endif public delegate void AsyncCallback(IAsyncResult ar); } diff --git a/external/corefx/src/Common/src/CoreLib/System/AttributeUsageAttribute.cs b/external/corefx/src/Common/src/CoreLib/System/AttributeUsageAttribute.cs index 219dc43e15..5f77faffbe 100644 --- a/external/corefx/src/Common/src/CoreLib/System/AttributeUsageAttribute.cs +++ b/external/corefx/src/Common/src/CoreLib/System/AttributeUsageAttribute.cs @@ -17,6 +17,9 @@ namespace System { /* By default, attributes are inherited and multiple attributes are not allowed */ [AttributeUsage(AttributeTargets.Class, Inherited = true)] +#if MONO + [Serializable] +#endif public sealed class AttributeUsageAttribute : Attribute { private AttributeTargets _attributeTarget = AttributeTargets.All; // Defaults to all diff --git a/external/corefx/src/Common/src/CoreLib/System/BadImageFormatException.cs b/external/corefx/src/Common/src/CoreLib/System/BadImageFormatException.cs index 1743075a6f..a158d934f0 100644 --- a/external/corefx/src/Common/src/CoreLib/System/BadImageFormatException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/BadImageFormatException.cs @@ -18,7 +18,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public partial class BadImageFormatException : SystemException { private String _fileName; // The name of the corrupt PE file. diff --git a/external/corefx/src/Common/src/CoreLib/System/Boolean.cs b/external/corefx/src/Common/src/CoreLib/System/Boolean.cs index 896e5f18e5..fda749d5f3 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Boolean.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Boolean.cs @@ -12,14 +12,15 @@ ** ===========================================================*/ -using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.Versioning; namespace System { [Serializable] +#if !MONO [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public struct Boolean : IComparable, IConvertible, IComparable, IEquatable { // @@ -100,10 +101,8 @@ namespace System { string s = m_value ? TrueLiteral : FalseLiteral; - if (s.Length <= destination.Length) + if (s.AsSpan().TryCopyTo(destination)) { - bool copied = s.AsReadOnlySpan().TryCopyTo(destination); - Debug.Assert(copied); charsWritten = s.Length; return true; } @@ -183,7 +182,7 @@ namespace System public static Boolean Parse(String value) { if (value == null) throw new ArgumentNullException(nameof(value)); - return Parse(value.AsReadOnlySpan()); + return Parse(value.AsSpan()); } public static bool Parse(ReadOnlySpan value) => @@ -199,20 +198,20 @@ namespace System return false; } - return TryParse(value.AsReadOnlySpan(), out result); + return TryParse(value.AsSpan(), out result); } public static bool TryParse(ReadOnlySpan value, out bool result) { - ReadOnlySpan trueSpan = TrueLiteral.AsReadOnlySpan(); - if (StringSpanHelpers.Equals(trueSpan, value, StringComparison.OrdinalIgnoreCase)) + ReadOnlySpan trueSpan = TrueLiteral.AsSpan(); + if (trueSpan.EqualsOrdinalIgnoreCase(value)) { result = true; return true; } - ReadOnlySpan falseSpan = FalseLiteral.AsReadOnlySpan(); - if (StringSpanHelpers.Equals(falseSpan, value, StringComparison.OrdinalIgnoreCase)) + ReadOnlySpan falseSpan = FalseLiteral.AsSpan(); + if (falseSpan.EqualsOrdinalIgnoreCase(value)) { result = false; return true; @@ -221,13 +220,13 @@ namespace System // Special case: Trim whitespace as well as null characters. value = TrimWhiteSpaceAndNull(value); - if (StringSpanHelpers.Equals(trueSpan, value, StringComparison.OrdinalIgnoreCase)) + if (trueSpan.EqualsOrdinalIgnoreCase(value)) { result = true; return true; } - if (StringSpanHelpers.Equals(falseSpan, value, StringComparison.OrdinalIgnoreCase)) + if (falseSpan.EqualsOrdinalIgnoreCase(value)) { result = false; return true; diff --git a/external/corefx/src/Common/src/CoreLib/System/Buffers/ArrayPool.cs b/external/corefx/src/Common/src/CoreLib/System/Buffers/ArrayPool.cs index 77a07f7fa5..22ad7821f0 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Buffers/ArrayPool.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Buffers/ArrayPool.cs @@ -33,9 +33,7 @@ namespace System.Buffers /// optimized for very fast access speeds, at the expense of more memory consumption. /// The shared pool instance is created lazily on first access. /// - public static ArrayPool Shared { get; } = - typeof(T) == typeof(byte) || typeof(T) == typeof(char) ? new TlsOverPerCoreLockedStacksArrayPool() : - Create(); + public static ArrayPool Shared { get; } = new TlsOverPerCoreLockedStacksArrayPool(); /// /// Creates a new instance using default configuration options. diff --git a/external/corefx/src/Common/src/CoreLib/System/Buffers/ArrayPoolEventSource.cs b/external/corefx/src/Common/src/CoreLib/System/Buffers/ArrayPoolEventSource.cs index 9482744144..d0563c4977 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Buffers/ArrayPoolEventSource.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Buffers/ArrayPoolEventSource.cs @@ -6,7 +6,7 @@ using System.Diagnostics.Tracing; namespace System.Buffers { - [EventSource(Name = "System.Buffers.ArrayPoolEventSource")] + [EventSource(Guid = "0866B2B8-5CEF-5DB9-2612-0C0FFD814A44", Name = "System.Buffers.ArrayPoolEventSource")] internal sealed class ArrayPoolEventSource : EventSource { internal readonly static ArrayPoolEventSource Log = new ArrayPoolEventSource(); @@ -22,6 +22,9 @@ namespace System.Buffers PoolExhausted } + // The ArrayPoolEventSource GUID is {0866b2b8-5cef-5db9-2612-0c0ffd814a44} + private ArrayPoolEventSource() : base(new Guid(0x0866b2b8, 0x5cef, 0x5db9, 0x26, 0x12, 0x0c, 0x0f, 0xfd, 0x81, 0x4a, 0x44), "System.Buffers.ArrayPoolEventSource") { } + /// /// Event for when a buffer is rented. This is invoked once for every successful call to Rent, /// regardless of whether a buffer is allocated or a buffer is taken from the pool. In a @@ -36,12 +39,16 @@ namespace System.Buffers EventData* payload = stackalloc EventData[4]; payload[0].Size = sizeof(int); payload[0].DataPointer = ((IntPtr)(&bufferId)); + payload[0].Reserved = 0; payload[1].Size = sizeof(int); payload[1].DataPointer = ((IntPtr)(&bufferSize)); + payload[1].Reserved = 0; payload[2].Size = sizeof(int); payload[2].DataPointer = ((IntPtr)(&poolId)); + payload[2].Reserved = 0; payload[3].Size = sizeof(int); payload[3].DataPointer = ((IntPtr)(&bucketId)); + payload[3].Reserved = 0; WriteEventCore(1, 4, payload); } @@ -56,14 +63,19 @@ namespace System.Buffers EventData* payload = stackalloc EventData[5]; payload[0].Size = sizeof(int); payload[0].DataPointer = ((IntPtr)(&bufferId)); + payload[0].Reserved = 0; payload[1].Size = sizeof(int); payload[1].DataPointer = ((IntPtr)(&bufferSize)); + payload[1].Reserved = 0; payload[2].Size = sizeof(int); payload[2].DataPointer = ((IntPtr)(&poolId)); + payload[2].Reserved = 0; payload[3].Size = sizeof(int); payload[3].DataPointer = ((IntPtr)(&bucketId)); + payload[3].Reserved = 0; payload[4].Size = sizeof(BufferAllocatedReason); payload[4].DataPointer = ((IntPtr)(&reason)); + payload[4].Reserved = 0; WriteEventCore(2, 5, payload); } @@ -74,5 +86,19 @@ namespace System.Buffers /// [Event(3, Level = EventLevel.Verbose)] internal void BufferReturned(int bufferId, int bufferSize, int poolId) => WriteEvent(3, bufferId, bufferSize, poolId); + + /// + /// Event raised when we attempt to free a buffer due to inactivity or memory pressure (by no longer + /// referencing it). It is possible (although not commmon) this buffer could be rented as we attempt + /// to free it. A rent event before or after this event for the same ID, is a rare, but expected case. + /// + [Event(4, Level = EventLevel.Informational)] + internal void BufferTrimmed(int bufferId, int bufferSize, int poolId) => WriteEvent(4, bufferId, bufferSize, poolId); + + /// + /// Event raised when we check to trim buffers. + /// + [Event(5, Level = EventLevel.Informational)] + internal void BufferTrimPoll(int milliseconds, int pressure) => WriteEvent(5, milliseconds, pressure); } } diff --git a/external/corefx/src/Common/src/CoreLib/System/Buffers/IMemoryOwner.cs b/external/corefx/src/Common/src/CoreLib/System/Buffers/IMemoryOwner.cs new file mode 100644 index 0000000000..44f16c5827 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/Buffers/IMemoryOwner.cs @@ -0,0 +1,17 @@ +// 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.Buffers +{ + /// + /// Owner of Memory that is responsible for disposing the underlying memory appropriately. + /// + public interface IMemoryOwner : IDisposable + { + /// + /// Returns a Memory. + /// + Memory Memory { get; } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/Buffers/IPinnable.cs b/external/corefx/src/Common/src/CoreLib/System/Buffers/IPinnable.cs new file mode 100644 index 0000000000..623e716a05 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/Buffers/IPinnable.cs @@ -0,0 +1,25 @@ +// 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.Buffers +{ + /// + /// Provides a mechanism for pinning and unpinning objects to prevent the GC from moving them. + /// + public interface IPinnable + { + /// + /// Call this method to indicate that the IPinnable object can not be moved by the garbage collector. + /// The address of the pinned object can be taken. + /// The offset to the element within the memory at which the returned points to. + /// + MemoryHandle Pin(int elementIndex); + + /// + /// Call this method to indicate that the IPinnable object no longer needs to be pinned. + /// The garbage collector is free to move the object now. + /// + void Unpin(); + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/Buffers/IRetainable.cs b/external/corefx/src/Common/src/CoreLib/System/Buffers/IRetainable.cs deleted file mode 100644 index 6ac508859c..0000000000 --- a/external/corefx/src/Common/src/CoreLib/System/Buffers/IRetainable.cs +++ /dev/null @@ -1,26 +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.Runtime; -using System.Runtime.CompilerServices; - -namespace System.Buffers -{ - /// - /// Provides a mechanism for manual lifetime management. - /// - public interface IRetainable - { - /// - /// Call this method to indicate that the IRetainable object is in use. - /// Do not dispose until Release is called. - /// - void Retain(); - /// - /// Call this method to indicate that the IRetainable object is no longer in use. - /// The object can now be disposed. - /// - bool Release(); - } -} \ No newline at end of file diff --git a/external/corefx/src/Common/src/CoreLib/System/Buffers/MemoryHandle.cs b/external/corefx/src/Common/src/CoreLib/System/Buffers/MemoryHandle.cs index 7544038629..231add1c01 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Buffers/MemoryHandle.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Buffers/MemoryHandle.cs @@ -12,53 +12,48 @@ namespace System.Buffers /// public unsafe struct MemoryHandle : IDisposable { - private IRetainable _retainable; private void* _pointer; private GCHandle _handle; + private IPinnable _pinnable; /// /// Creates a new memory handle for the memory. /// - /// reference to manually managed object - /// pointer to memory, or null if a pointer was not provided when the handle was created + /// pointer to memory + /// reference to manually managed object, or default if there is no memory manager /// handle used to pin array buffers [CLSCompliant(false)] - public MemoryHandle(IRetainable retainable, void* pointer = null, GCHandle handle = default(GCHandle)) + public MemoryHandle(void* pointer, GCHandle handle = default, IPinnable pinnable = default) { - _retainable = retainable; _pointer = pointer; _handle = handle; + _pinnable = pinnable; } /// - /// Returns the pointer to memory, or null if a pointer was not provided when the handle was created. + /// Returns the pointer to memory, where the memory is assumed to be pinned and hence the address won't change. /// [CLSCompliant(false)] public void* Pointer => _pointer; /// - /// Returns false if the pointer to memory is null. + /// Frees the pinned handle and releases IPinnable. /// - public bool HasPointer => _pointer != null; - - /// - /// Frees the pinned handle and releases IRetainable. - /// - public void Dispose() + public void Dispose() { if (_handle.IsAllocated) { _handle.Free(); } - if (_retainable != null) + if (_pinnable != null) { - _retainable.Release(); - _retainable = null; + _pinnable.Unpin(); + _pinnable = null; } _pointer = null; } } -} \ No newline at end of file +} diff --git a/external/corefx/src/Common/src/CoreLib/System/Buffers/MemoryManager.cs b/external/corefx/src/Common/src/CoreLib/System/Buffers/MemoryManager.cs new file mode 100644 index 0000000000..acba3d2a94 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/Buffers/MemoryManager.cs @@ -0,0 +1,76 @@ +// 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.Runtime; +using System.Runtime.CompilerServices; + +namespace System.Buffers +{ + /// + /// Manager of that provides the implementation. + /// + public abstract class MemoryManager : IMemoryOwner, IPinnable + { + /// + /// Returns a . + /// + public virtual Memory Memory => new Memory(this, GetSpan().Length); + + /// + /// Returns a span wrapping the underlying memory. + /// + public abstract Span GetSpan(); + + /// + /// Returns a handle to the memory that has been pinned and hence its address can be taken. + /// + /// The offset to the element within the memory at which the returned points to. (default = 0) + public abstract MemoryHandle Pin(int elementIndex = 0); + + /// + /// Lets the garbage collector know that the object is free to be moved now. + /// + public abstract void Unpin(); + + /// + /// Returns a for the current . + /// + /// The element count in the memory, starting at offset 0. + [MethodImpl(MethodImplOptions.AggressiveInlining)] + protected Memory CreateMemory(int length) => new Memory(this, length); + + /// + /// Returns a for the current . + /// + /// The offset to the element which the returned memory starts at. + /// The element count in the memory, starting at element offset . + [MethodImpl(MethodImplOptions.AggressiveInlining)] + protected Memory CreateMemory(int start, int length) => new Memory(this, start, length); + + /// + /// Returns an array segment. + /// Returns the default array segment if not overriden. + /// + protected internal virtual bool TryGetArray(out ArraySegment segment) + { + segment = default; + return false; + } + + /// + /// Implements IDisposable. + /// + void IDisposable.Dispose() + { + Dispose(disposing: true); + GC.SuppressFinalize(this); + } + + /// + /// Clean up of any leftover managed and unmanaged resources. + /// + protected abstract void Dispose(bool disposing); + + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/Buffers/OwnedMemory.cs b/external/corefx/src/Common/src/CoreLib/System/Buffers/OwnedMemory.cs deleted file mode 100644 index 6946addc80..0000000000 --- a/external/corefx/src/Common/src/CoreLib/System/Buffers/OwnedMemory.cs +++ /dev/null @@ -1,95 +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.Runtime; -using System.Runtime.CompilerServices; - -namespace System.Buffers -{ - /// - /// Owner of Memory that provides appropriate lifetime management mechanisms for it. - /// - public abstract class OwnedMemory : IDisposable, IRetainable - { - /// - /// The number of items in the Memory. - /// - public abstract int Length { get; } - - /// - /// Returns a span wrapping the underlying memory. - /// - public abstract Span Span { get; } - - /// - /// Returns a Memory if the underlying memory has not been freed. - /// - /// - /// Thrown when the underlying memory has already been disposed. - /// - public Memory Memory - { - get - { - if (IsDisposed) - { - ThrowHelper.ThrowObjectDisposedException_MemoryDisposed(nameof(OwnedMemory)); - } - return new Memory(owner: this, 0, Length); - } - } - - /// - /// Returns a handle for the array that has been pinned and hence its address can be taken - /// - public abstract MemoryHandle Pin(int offset = 0); - - /// - /// Returns an array segment. - /// - protected internal abstract bool TryGetArray(out ArraySegment arraySegment); - - /// - /// Implements IDisposable. - /// - /// - /// Throw when there are still retained references to the memory - /// - public void Dispose() - { - if (IsRetained) - { - ThrowHelper.ThrowInvalidOperationException_OutstandingReferences(); - } - Dispose(true); - GC.SuppressFinalize(this); - } - - /// - /// Clean up of any leftover managed and unmanaged resources. - /// - protected abstract void Dispose(bool disposing); - - /// - /// Return true if someone is holding a reference to the memory. - /// - protected abstract bool IsRetained { get; } - - /// - /// Return true if the underlying memory has been freed. - /// - public abstract bool IsDisposed { get; } - - /// - /// Implements IRetainable. Prevent accidental disposal of the memory. - /// - public abstract void Retain(); - - /// - /// Implements IRetainable. The memory can now be diposed. - /// - public abstract bool Release(); - - } -} diff --git a/external/corefx/src/Common/src/CoreLib/System/Buffers/Text/FormattingHelpers.CountDigits.cs b/external/corefx/src/Common/src/CoreLib/System/Buffers/Text/FormattingHelpers.CountDigits.cs new file mode 100644 index 0000000000..794f78feb9 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/Buffers/Text/FormattingHelpers.CountDigits.cs @@ -0,0 +1,133 @@ +// 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.Diagnostics.Private; +using System.Runtime.CompilerServices; + +namespace System.Buffers.Text +{ + internal static partial class FormattingHelpers + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static int CountDigits(ulong value) + { + int digits = 1; + uint part; + if (value >= 10000000) + { + if (value >= 100000000000000) + { + part = (uint)(value / 100000000000000); + digits += 14; + } + else + { + part = (uint)(value / 10000000); + digits += 7; + } + } + else + { + part = (uint)value; + } + + if (part < 10) + { + // no-op + } + else if (part < 100) + { + digits += 1; + } + else if (part < 1000) + { + digits += 2; + } + else if (part < 10000) + { + digits += 3; + } + else if (part < 100000) + { + digits += 4; + } + else if (part < 1000000) + { + digits += 5; + } + else + { + Debug.Assert(part < 10000000); + digits += 6; + } + + return digits; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static int CountDigits(uint value) + { + int digits = 1; + if (value >= 100000) + { + value = value / 100000; + digits += 5; + } + + if (value < 10) + { + // no-op + } + else if (value < 100) + { + digits += 1; + } + else if (value < 1000) + { + digits += 2; + } + else if (value < 10000) + { + digits += 3; + } + else + { + Debug.Assert(value < 100000); + digits += 4; + } + + return digits; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static int CountHexDigits(ulong value) + { + // TODO: When x86 intrinsic support comes online, experiment with implementing this using lzcnt. + // return 16 - (int)((uint)Lzcnt.LeadingZeroCount(value | 1) >> 3); + + int digits = 1; + + if (value > 0xFFFFFFFF) + { + digits += 8; + value >>= 0x20; + } + if (value > 0xFFFF) + { + digits += 4; + value >>= 0x10; + } + if (value > 0xFF) + { + digits += 2; + value >>= 0x8; + } + if (value > 0xF) + digits++; + + return digits; + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/Buffers/TlsOverPerCoreLockedStacksArrayPool.cs b/external/corefx/src/Common/src/CoreLib/System/Buffers/TlsOverPerCoreLockedStacksArrayPool.cs index 64c5cebe85..96efb0d521 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Buffers/TlsOverPerCoreLockedStacksArrayPool.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Buffers/TlsOverPerCoreLockedStacksArrayPool.cs @@ -2,9 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.Win32; +using System; +using System.Collections.Generic; using System.Runtime.CompilerServices; using System.Threading; +using Internal.Runtime.Augments; +using Internal.Runtime.CompilerServices; namespace System.Buffers { @@ -22,7 +25,6 @@ namespace System.Buffers { // TODO: #7747: "Investigate optimizing ArrayPool heuristics" // - Explore caching in TLS more than one array per size per thread, and moving stale buffers to the global queue. - // - Explore dumping stale buffers from the global queue, similar to PinnableBufferCache (maybe merging them). // - Explore changing the size of each per-core bucket, potentially dynamically or based on other factors like array size. // - Explore changing number of buckets and what sizes of arrays are cached. // - Investigate whether false sharing is causing any issues, in particular on LockedStack's count and the contents of its array. @@ -46,6 +48,15 @@ namespace System.Buffers [ThreadStatic] private static T[][] t_tlsBuckets; + private int _callbackCreated; + + private readonly static bool s_trimBuffers = GetTrimBuffers(); + + /// + /// Used to keep track of all thread local buckets for trimming if needed + /// + private static readonly ConditionalWeakTable s_allTlsBuckets = s_trimBuffers ? new ConditionalWeakTable() : null; + /// Initialize the pool. public TlsOverPerCoreLockedStacksArrayPool() { @@ -180,15 +191,24 @@ namespace System.Buffers { t_tlsBuckets = tlsBuckets = new T[NumBuckets][]; tlsBuckets[bucketIndex] = array; + if (s_trimBuffers) + { + s_allTlsBuckets.Add(tlsBuckets, null); + if (Interlocked.Exchange(ref _callbackCreated, 1) != 1) + { + Gen2GcCallback.Register(Gen2GcCallbackFunc, this); + } + } } else { T[] prev = tlsBuckets[bucketIndex]; tlsBuckets[bucketIndex] = array; + if (prev != null) { - PerCoreLockedStacks bucket = _buckets[bucketIndex] ?? CreatePerCoreLockedStacks(bucketIndex); - bucket.TryPush(prev); + PerCoreLockedStacks stackBucket = _buckets[bucketIndex] ?? CreatePerCoreLockedStacks(bucketIndex); + stackBucket.TryPush(prev); } } } @@ -201,6 +221,103 @@ namespace System.Buffers } } + public bool Trim() + { + int milliseconds = Environment.TickCount; + MemoryPressure pressure = GetMemoryPressure(); + + ArrayPoolEventSource log = ArrayPoolEventSource.Log; + if (log.IsEnabled()) + log.BufferTrimPoll(milliseconds, (int)pressure); + + foreach (PerCoreLockedStacks bucket in _buckets) + { + bucket?.Trim((uint)milliseconds, Id, pressure, _bucketArraySizes); + } + + if (pressure == MemoryPressure.High) + { + // Under high pressure, release all thread locals + if (log.IsEnabled()) + { + foreach (KeyValuePair tlsBuckets in s_allTlsBuckets) + { + T[][] buckets = tlsBuckets.Key; + for (int i = 0; i < buckets.Length; i++) + { + T[] buffer = Interlocked.Exchange(ref buckets[i], null); + if (buffer != null) + { + // As we don't want to take a perf hit in the rent path it + // is possible that a buffer could be rented as we "free" it. + log.BufferTrimmed(buffer.GetHashCode(), buffer.Length, Id); + } + } + } + } + else + { + foreach (KeyValuePair tlsBuckets in s_allTlsBuckets) + { + T[][] buckets = tlsBuckets.Key; + Array.Clear(buckets, 0, buckets.Length); + } + } + } + + return true; + } + + /// + /// This is the static function that is called from the gen2 GC callback. + /// The input object is the instance we want the callback on. + /// + /// + /// The reason that we make this function static and take the instance as a parameter is that + /// we would otherwise root the instance to the Gen2GcCallback object, leaking the instance even when + /// the application no longer needs it. + /// + private static bool Gen2GcCallbackFunc(object target) + { + return ((TlsOverPerCoreLockedStacksArrayPool)(target)).Trim(); + } + + private enum MemoryPressure + { + Low, + Medium, + High + } + + private static MemoryPressure GetMemoryPressure() + { + const double HighPressureThreshold = .90; // Percent of GC memory pressure threshold we consider "high" + const double MediumPressureThreshold = .70; // Percent of GC memory pressure threshold we consider "medium" + + GC.GetMemoryInfo(out uint threshold, out _, out uint lastLoad, out _, out _); + if (lastLoad >= threshold * HighPressureThreshold) + { + return MemoryPressure.High; + } + else if (lastLoad >= threshold * MediumPressureThreshold) + { + return MemoryPressure.Medium; + } + return MemoryPressure.Low; + } + + private static bool GetTrimBuffers() + { + // Environment uses ArrayPool, so we have to hit the API directly. +#if !CORECLR + // P/Invokes are different for CoreCLR/RT- for RT we'll not allow + // enabling/disabling for now. + return true; +#else + return CLRConfig.GetBoolValueWithFallbacks("System.Buffers.ArrayPool.TrimShared", "DOTNET_SYSTEM_BUFFERS_ARRAYPOOL_TRIMSHARED", defaultValue: true); +#endif + } + /// /// Stores a set of stacks of arrays, with one stack per core. /// @@ -228,7 +345,7 @@ namespace System.Buffers // Try to push on to the associated stack first. If that fails, // round-robin through the other stacks. LockedStack[] stacks = _perCoreStacks; - int index = Environment.CurrentExecutionId % stacks.Length; + int index = RuntimeThread.GetCurrentProcessorId() % stacks.Length; for (int i = 0; i < stacks.Length; i++) { if (stacks[index].TryPush(array)) return; @@ -244,7 +361,7 @@ namespace System.Buffers // round-robin through the other stacks. T[] arr; LockedStack[] stacks = _perCoreStacks; - int index = Environment.CurrentExecutionId % stacks.Length; + int index = RuntimeThread.GetCurrentProcessorId() % stacks.Length; for (int i = 0; i < stacks.Length; i++) { if ((arr = stacks[index].TryPop()) != null) return arr; @@ -252,6 +369,16 @@ namespace System.Buffers } return null; } + + public bool Trim(uint tickCount, int id, MemoryPressure pressure, int[] bucketSizes) + { + LockedStack[] stacks = _perCoreStacks; + for (int i = 0; i < stacks.Length; i++) + { + stacks[i].Trim(tickCount, id, pressure, bucketSizes[i]); + } + return true; + } } /// Provides a simple stack of arrays, protected by a lock. @@ -259,6 +386,7 @@ namespace System.Buffers { private readonly T[][] _arrays = new T[MaxBuffersPerArraySizePerCore][]; private int _count; + private uint _firstStackItemMS; [MethodImpl(MethodImplOptions.AggressiveInlining)] public bool TryPush(T[] array) @@ -267,6 +395,12 @@ namespace System.Buffers Monitor.Enter(this); if (_count < MaxBuffersPerArraySizePerCore) { + if (s_trimBuffers && _count == 0) + { + // Stash the time the bottom of the stack was filled + _firstStackItemMS = (uint)Environment.TickCount; + } + _arrays[_count++] = array; enqueued = true; } @@ -287,6 +421,76 @@ namespace System.Buffers Monitor.Exit(this); return arr; } + + public void Trim(uint tickCount, int id, MemoryPressure pressure, int bucketSize) + { + const uint StackTrimAfterMS = 60 * 1000; // Trim after 60 seconds for low/moderate pressure + const uint StackHighTrimAfterMS = 10 * 1000; // Trim after 10 seconds for high pressure + const uint StackRefreshMS = StackTrimAfterMS / 4; // Time bump after trimming (1/4 trim time) + const int StackLowTrimCount = 1; // Trim one item when pressure is low + const int StackMediumTrimCount = 2; // Trim two items when pressure is moderate + const int StackHighTrimCount = MaxBuffersPerArraySizePerCore; // Trim all items when pressure is high + const int StackLargeBucket = 16384; // If the bucket is larger than this we'll trim an extra when under high pressure + const int StackModerateTypeSize = 16; // If T is larger than this we'll trim an extra when under high pressure + const int StackLargeTypeSize = 32; // If T is larger than this we'll trim an extra (additional) when under high pressure + + if (_count == 0) + return; + uint trimTicks = pressure == MemoryPressure.High ? StackHighTrimAfterMS : StackTrimAfterMS; + + lock (this) + { + if (_count > 0 && _firstStackItemMS > tickCount || (tickCount - _firstStackItemMS) > trimTicks) + { + // We've wrapped the tick count or elapsed enough time since the + // first item went into the stack. Drop the top item so it can + // be collected and make the stack look a little newer. + + ArrayPoolEventSource log = ArrayPoolEventSource.Log; + int trimCount = StackLowTrimCount; + switch (pressure) + { + case MemoryPressure.High: + trimCount = StackHighTrimCount; + + // When pressure is high, aggressively trim larger arrays. + if (bucketSize > StackLargeBucket) + { + trimCount++; + } + if (Unsafe.SizeOf() > StackModerateTypeSize) + { + trimCount++; + } + if (Unsafe.SizeOf() > StackLargeTypeSize) + { + trimCount++; + } + break; + case MemoryPressure.Medium: + trimCount = StackMediumTrimCount; + break; + } + + while (_count > 0 && trimCount-- > 0) + { + T[] array = _arrays[--_count]; + _arrays[_count] = null; + + if (log.IsEnabled()) + { + log.BufferTrimmed(array.GetHashCode(), array.Length, id); + } + } + + if (_count > 0 && _firstStackItemMS < uint.MaxValue - StackRefreshMS) + { + // Give the remaining items a bit more time + _firstStackItemMS += StackRefreshMS; + } + } + } + } } } } diff --git a/external/corefx/src/Common/src/CoreLib/System/Buffers/Utilities.cs b/external/corefx/src/Common/src/CoreLib/System/Buffers/Utilities.cs index 4f115fe9dd..906fa8e02e 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Buffers/Utilities.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Buffers/Utilities.cs @@ -2,7 +2,7 @@ // 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.Diagnostics.Private; using System.Runtime.CompilerServices; namespace System.Buffers diff --git a/external/corefx/src/Common/src/CoreLib/System/Byte.cs b/external/corefx/src/Common/src/CoreLib/System/Byte.cs index 13ceb7573d..4a2592eb17 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Byte.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Byte.cs @@ -11,7 +11,9 @@ namespace System { [Serializable] [StructLayout(LayoutKind.Sequential)] +#if !MONO [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public struct Byte : IComparable, IConvertible, IFormattable, IComparable, IEquatable, ISpanFormattable { private byte m_value; // Do not rename (binary serialization) @@ -192,10 +194,6 @@ namespace System return Number.FormatInt32(m_value, format, provider); } - // TODO https://github.com/dotnet/corefx/issues/25337: Remove this overload once corefx is updated to target the new signatures - public bool TryFormat(Span destination, out int charsWritten, string format, IFormatProvider provider) => - TryFormat(destination, out charsWritten, (ReadOnlySpan)format, provider); - public bool TryFormat(Span destination, out int charsWritten, ReadOnlySpan format = default, IFormatProvider provider = null) { return Number.TryFormatInt32(m_value, format, provider, destination, out charsWritten); diff --git a/external/corefx/src/Common/src/CoreLib/System/CLSCompliantAttribute.cs b/external/corefx/src/Common/src/CoreLib/System/CLSCompliantAttribute.cs index d895b5ac71..4fbc8af3fe 100644 --- a/external/corefx/src/Common/src/CoreLib/System/CLSCompliantAttribute.cs +++ b/external/corefx/src/Common/src/CoreLib/System/CLSCompliantAttribute.cs @@ -13,6 +13,9 @@ namespace System { +#if MONO + [Serializable] +#endif [AttributeUsage(AttributeTargets.All, Inherited = true, AllowMultiple = false)] public sealed class CLSCompliantAttribute : Attribute { diff --git a/external/corefx/src/Common/src/CoreLib/System/Char.cs b/external/corefx/src/Common/src/CoreLib/System/Char.cs index 179ac40282..01c0ae3f66 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Char.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Char.cs @@ -13,6 +13,7 @@ ===========================================================*/ using System.Diagnostics; +using System.Diagnostics.Private; using System.Globalization; using System.Runtime.InteropServices; @@ -20,7 +21,9 @@ namespace System { [Serializable] [StructLayout(LayoutKind.Sequential)] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public struct Char : IComparable, IComparable, IEquatable, IConvertible { // @@ -401,14 +404,14 @@ namespace System // public static char ToUpper(char c) { - return ToUpper(c, CultureInfo.CurrentCulture); + return CultureInfo.CurrentCulture.TextInfo.ToUpper(c); } // Converts a character to upper-case for invariant culture. public static char ToUpperInvariant(char c) { - return ToUpper(c, CultureInfo.InvariantCulture); + return CultureInfo.InvariantCulture.TextInfo.ToUpper(c); } @@ -432,14 +435,14 @@ namespace System // Converts a character to lower-case for the default culture. public static char ToLower(char c) { - return ToLower(c, CultureInfo.CurrentCulture); + return CultureInfo.CurrentCulture.TextInfo.ToLower(c); } // Converts a character to lower-case for invariant culture. public static char ToLowerInvariant(char c) { - return ToLower(c, CultureInfo.InvariantCulture); + return CultureInfo.InvariantCulture.TextInfo.ToLower(c); } diff --git a/external/corefx/src/Common/src/CoreLib/System/CharEnumerator.cs b/external/corefx/src/Common/src/CoreLib/System/CharEnumerator.cs index ea9915a7c4..f4a268d691 100644 --- a/external/corefx/src/Common/src/CoreLib/System/CharEnumerator.cs +++ b/external/corefx/src/Common/src/CoreLib/System/CharEnumerator.cs @@ -17,6 +17,9 @@ using System.Collections.Generic; namespace System { +#if MONO + [Serializable] +#endif public sealed class CharEnumerator : IEnumerator, IEnumerator, IDisposable, ICloneable { private String _str; diff --git a/external/corefx/src/Common/src/CoreLib/System/Collections/Generic/Dictionary.cs b/external/corefx/src/Common/src/CoreLib/System/Collections/Generic/Dictionary.cs index 7801f7d1d6..c79654ea40 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Collections/Generic/Dictionary.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Collections/Generic/Dictionary.cs @@ -2,11 +2,10 @@ // 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; -using System.Collections; using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.Serialization; +using System.Threading; namespace System.Collections.Generic { @@ -74,10 +73,15 @@ namespace System.Collections.Generic { if (capacity < 0) ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.capacity); if (capacity > 0) Initialize(capacity); - _comparer = comparer ?? EqualityComparer.Default; -#if !MONO - if (_comparer == EqualityComparer.Default) + if (comparer != EqualityComparer.Default) { + _comparer = comparer; + } + +#if !MONO + if (typeof(TKey) == typeof(string) && _comparer == null) + { + // To start, move off default comparer for string which is randomised _comparer = (IEqualityComparer)NonRandomizedStringEqualityComparer.Default; } #endif @@ -146,7 +150,11 @@ namespace System.Collections.Generic { get { - return _comparer; + return (_comparer == null +#if !MONO + || _comparer is NonRandomizedStringEqualityComparer +#endif + ) ? EqualityComparer.Default : _comparer; } } @@ -216,7 +224,7 @@ namespace System.Collections.Generic int i = FindEntry(key); if (i >= 0) return _entries[i].value; ThrowHelper.ThrowKeyNotFoundException(key); - return default(TValue); + return default; } set { @@ -236,9 +244,7 @@ namespace System.Collections.Generic } void ICollection>.Add(KeyValuePair keyValuePair) - { - Add(keyValuePair.Key, keyValuePair.Value); - } + => Add(keyValuePair.Key, keyValuePair.Value); bool ICollection>.Contains(KeyValuePair keyValuePair) { @@ -266,40 +272,49 @@ namespace System.Collections.Generic int count = _count; if (count > 0) { - int[] buckets = _buckets; - for (int i = 0; i < buckets.Length; i++) - { - buckets[i] = -1; - } + Array.Clear(_buckets, 0, _buckets.Length); _count = 0; _freeList = -1; _freeCount = 0; - _version++; Array.Clear(_entries, 0, count); } + _version++; } public bool ContainsKey(TKey key) - { - return FindEntry(key) >= 0; - } + => FindEntry(key) >= 0; public bool ContainsValue(TValue value) { + Entry[] entries = _entries; if (value == null) { for (int i = 0; i < _count; i++) { - if (_entries[i].hashCode >= 0 && _entries[i].value == null) return true; + if (entries[i].hashCode >= 0 && entries[i].value == null) return true; } } else { - EqualityComparer c = EqualityComparer.Default; - for (int i = 0; i < _count; i++) + if (default(TValue) != null) { - if (_entries[i].hashCode >= 0 && c.Equals(_entries[i].value, value)) return true; + // ValueType: Devirtualize with EqualityComparer.Default intrinsic + for (int i = 0; i < _count; i++) + { + if (entries[i].hashCode >= 0 && EqualityComparer.Default.Equals(entries[i].value, value)) return true; + } + } + else + { + // Object type: Shared Generic, EqualityComparer.Default won't devirtualize + // https://github.com/dotnet/coreclr/issues/17273 + // So cache in a local rather than get EqualityComparer per loop iteration + EqualityComparer defaultComparer = EqualityComparer.Default; + for (int i = 0; i < _count; i++) + { + if (entries[i].hashCode >= 0 && defaultComparer.Equals(entries[i].value, value)) return true; + } } } return false; @@ -312,7 +327,7 @@ namespace System.Collections.Generic ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array); } - if (index < 0 || index > array.Length) + if ((uint)index > (uint)array.Length) { ThrowHelper.ThrowIndexArgumentOutOfRange_NeedNonNegNumException(); } @@ -334,14 +349,10 @@ namespace System.Collections.Generic } public Enumerator GetEnumerator() - { - return new Enumerator(this, Enumerator.KeyValuePair); - } + => new Enumerator(this, Enumerator.KeyValuePair); IEnumerator> IEnumerable>.GetEnumerator() - { - return new Enumerator(this, Enumerator.KeyValuePair); - } + => new Enumerator(this, Enumerator.KeyValuePair); public virtual void GetObjectData(SerializationInfo info, StreamingContext context) { @@ -351,7 +362,7 @@ namespace System.Collections.Generic } info.AddValue(VersionName, _version); - info.AddValue(ComparerName, _comparer, typeof(IEqualityComparer)); + info.AddValue(ComparerName, _comparer ?? EqualityComparer.Default, typeof(IEqualityComparer)); info.AddValue(HashSizeName, _buckets == null ? 0 : _buckets.Length); // This is the length of the bucket array if (_buckets != null) @@ -369,28 +380,102 @@ namespace System.Collections.Generic ThrowHelper.ThrowArgumentNullException(ExceptionArgument.key); } - if (_buckets != null) + int i = -1; + int[] buckets = _buckets; + Entry[] entries = _entries; + int collisionCount = 0; + if (buckets != null) { - int hashCode = _comparer.GetHashCode(key) & 0x7FFFFFFF; - for (int i = _buckets[hashCode % _buckets.Length]; i >= 0; i = _entries[i].next) + IEqualityComparer comparer = _comparer; + if (comparer == null) { - if (_entries[i].hashCode == hashCode && _comparer.Equals(_entries[i].key, key)) return i; + int hashCode = key.GetHashCode() & 0x7FFFFFFF; + // Value in _buckets is 1-based + i = buckets[hashCode % buckets.Length] - 1; + if (default(TKey) != null) + { + // ValueType: Devirtualize with EqualityComparer.Default intrinsic + do + { + // Should be a while loop https://github.com/dotnet/coreclr/issues/15476 + // Test in if to drop range check for following array access + if ((uint)i >= (uint)entries.Length || (entries[i].hashCode == hashCode && EqualityComparer.Default.Equals(entries[i].key, key))) + { + break; + } + + i = entries[i].next; + if (collisionCount >= entries.Length) + { + // The chain of entries forms a loop; which means a concurrent update has happened. + // Break out of the loop and throw, rather than looping forever. + ThrowHelper.ThrowInvalidOperationException_ConcurrentOperationsNotSupported(); + } + collisionCount++; + } while (true); + } + else + { + // Object type: Shared Generic, EqualityComparer.Default won't devirtualize + // https://github.com/dotnet/coreclr/issues/17273 + // So cache in a local rather than get EqualityComparer per loop iteration + EqualityComparer defaultComparer = EqualityComparer.Default; + do + { + // Should be a while loop https://github.com/dotnet/coreclr/issues/15476 + // Test in if to drop range check for following array access + if ((uint)i >= (uint)entries.Length || (entries[i].hashCode == hashCode && defaultComparer.Equals(entries[i].key, key))) + { + break; + } + + i = entries[i].next; + if (collisionCount >= entries.Length) + { + // The chain of entries forms a loop; which means a concurrent update has happened. + // Break out of the loop and throw, rather than looping forever. + ThrowHelper.ThrowInvalidOperationException_ConcurrentOperationsNotSupported(); + } + collisionCount++; + } while (true); + } + } + else + { + int hashCode = comparer.GetHashCode(key) & 0x7FFFFFFF; + // Value in _buckets is 1-based + i = buckets[hashCode % buckets.Length] - 1; + do + { + // Should be a while loop https://github.com/dotnet/coreclr/issues/15476 + // Test in if to drop range check for following array access + if ((uint)i >= (uint)entries.Length || + (entries[i].hashCode == hashCode && comparer.Equals(entries[i].key, key))) + { + break; + } + + i = entries[i].next; + if (collisionCount >= entries.Length) + { + // The chain of entries forms a loop; which means a concurrent update has happened. + // Break out of the loop and throw, rather than looping forever. + ThrowHelper.ThrowInvalidOperationException_ConcurrentOperationsNotSupported(); + } + collisionCount++; + } while (true); } } - return -1; + + return i; } private int Initialize(int capacity) { int size = HashHelpers.GetPrime(capacity); - int[] buckets = new int[size]; - for (int i = 0; i < buckets.Length; i++) - { - buckets[i] = -1; - } _freeList = -1; - _buckets = buckets; + _buckets = new int[size]; _entries = new Entry[size]; return size; @@ -403,64 +488,190 @@ namespace System.Collections.Generic ThrowHelper.ThrowArgumentNullException(ExceptionArgument.key); } - if (_buckets == null) Initialize(0); - int hashCode = _comparer.GetHashCode(key) & 0x7FFFFFFF; - int targetBucket = hashCode % _buckets.Length; - int collisionCount = 0; - - for (int i = _buckets[targetBucket]; i >= 0; i = _entries[i].next) + _version++; + if (_buckets == null) { - if (_entries[i].hashCode == hashCode && _comparer.Equals(_entries[i].key, key)) - { - if (behavior == InsertionBehavior.OverwriteExisting) - { - _entries[i].value = value; - _version++; - return true; - } - - if (behavior == InsertionBehavior.ThrowOnExisting) - { - ThrowHelper.ThrowAddingDuplicateWithKeyArgumentException(key); - } - - return false; - } - collisionCount++; + Initialize(0); } + Entry[] entries = _entries; + IEqualityComparer comparer = _comparer; + + int hashCode = ((comparer == null) ? key.GetHashCode() : comparer.GetHashCode(key)) & 0x7FFFFFFF; + + int collisionCount = 0; + ref int bucket = ref _buckets[hashCode % _buckets.Length]; + // Value in _buckets is 1-based + int i = bucket - 1; + + if (comparer == null) + { + if (default(TKey) != null) + { + // ValueType: Devirtualize with EqualityComparer.Default intrinsic + do + { + // Should be a while loop https://github.com/dotnet/coreclr/issues/15476 + // Test uint in if rather than loop condition to drop range check for following array access + if ((uint)i >= (uint)entries.Length) + { + break; + } + + if (entries[i].hashCode == hashCode && EqualityComparer.Default.Equals(entries[i].key, key)) + { + if (behavior == InsertionBehavior.OverwriteExisting) + { + entries[i].value = value; + return true; + } + + if (behavior == InsertionBehavior.ThrowOnExisting) + { + ThrowHelper.ThrowAddingDuplicateWithKeyArgumentException(key); + } + + return false; + } + + i = entries[i].next; + if (collisionCount >= entries.Length) + { + // The chain of entries forms a loop; which means a concurrent update has happened. + // Break out of the loop and throw, rather than looping forever. + ThrowHelper.ThrowInvalidOperationException_ConcurrentOperationsNotSupported(); + } + collisionCount++; + } while (true); + } + else + { + // Object type: Shared Generic, EqualityComparer.Default won't devirtualize + // https://github.com/dotnet/coreclr/issues/17273 + // So cache in a local rather than get EqualityComparer per loop iteration + EqualityComparer defaultComparer = EqualityComparer.Default; + do + { + // Should be a while loop https://github.com/dotnet/coreclr/issues/15476 + // Test uint in if rather than loop condition to drop range check for following array access + if ((uint)i >= (uint)entries.Length) + { + break; + } + + if (entries[i].hashCode == hashCode && defaultComparer.Equals(entries[i].key, key)) + { + if (behavior == InsertionBehavior.OverwriteExisting) + { + entries[i].value = value; + return true; + } + + if (behavior == InsertionBehavior.ThrowOnExisting) + { + ThrowHelper.ThrowAddingDuplicateWithKeyArgumentException(key); + } + + return false; + } + + i = entries[i].next; + if (collisionCount >= entries.Length) + { + // The chain of entries forms a loop; which means a concurrent update has happened. + // Break out of the loop and throw, rather than looping forever. + ThrowHelper.ThrowInvalidOperationException_ConcurrentOperationsNotSupported(); + } + collisionCount++; + } while (true); + } + } + else + { + do + { + // Should be a while loop https://github.com/dotnet/coreclr/issues/15476 + // Test uint in if rather than loop condition to drop range check for following array access + if ((uint)i >= (uint)entries.Length) + { + break; + } + + if (entries[i].hashCode == hashCode && comparer.Equals(entries[i].key, key)) + { + if (behavior == InsertionBehavior.OverwriteExisting) + { + entries[i].value = value; + return true; + } + + if (behavior == InsertionBehavior.ThrowOnExisting) + { + ThrowHelper.ThrowAddingDuplicateWithKeyArgumentException(key); + } + + return false; + } + + i = entries[i].next; + if (collisionCount >= entries.Length) + { + // The chain of entries forms a loop; which means a concurrent update has happened. + // Break out of the loop and throw, rather than looping forever. + ThrowHelper.ThrowInvalidOperationException_ConcurrentOperationsNotSupported(); + } + collisionCount++; + } while (true); + + } + + // Can be improved with "Ref Local Reassignment" + // https://github.com/dotnet/csharplang/blob/master/proposals/ref-local-reassignment.md + bool resized = false; + bool updateFreeList = false; int index; if (_freeCount > 0) { index = _freeList; - _freeList = _entries[index].next; + updateFreeList = true; _freeCount--; } else { - if (_count == _entries.Length) + int count = _count; + if (count == entries.Length) { Resize(); - targetBucket = hashCode % _buckets.Length; + resized = true; } - index = _count; - _count++; + index = count; + _count = count + 1; + entries = _entries; } - _entries[index].hashCode = hashCode; - _entries[index].next = _buckets[targetBucket]; - _entries[index].key = key; - _entries[index].value = value; - _buckets[targetBucket] = index; - _version++; -#if !MONO - // If we hit the collision threshold we'll need to switch to the comparer which is using randomized string hashing - // i.e. EqualityComparer.Default. + ref int targetBucket = ref resized ? ref _buckets[hashCode % _buckets.Length] : ref bucket; + ref Entry entry = ref entries[index]; - if (collisionCount > HashHelpers.HashCollisionThreshold && _comparer is NonRandomizedStringEqualityComparer) + if (updateFreeList) { - _comparer = (IEqualityComparer)EqualityComparer.Default; - Resize(_entries.Length, true); + _freeList = entry.next; + } + entry.hashCode = hashCode; + // Value in _buckets is 1-based + entry.next = targetBucket - 1; + entry.key = key; + entry.value = value; + // Value in _buckets is 1-based + targetBucket = index + 1; + +#if !MONO + // Value types never rehash + if (default(TKey) == null && collisionCount > HashHelpers.HashCollisionThreshold && comparer is NonRandomizedStringEqualityComparer) + { + // If we hit the collision threshold we'll need to switch to the comparer which is using randomized string hashing + // i.e. EqualityComparer.Default. + _comparer = null; + Resize(entries.Length, true); } #endif return true; @@ -468,8 +679,7 @@ namespace System.Collections.Generic public virtual void OnDeserialization(object sender) { - SerializationInfo siInfo; - HashHelpers.SerializationInfoTable.TryGetValue(this, out siInfo); + HashHelpers.SerializationInfoTable.TryGetValue(this, out SerializationInfo siInfo); if (siInfo == null) { @@ -513,9 +723,7 @@ namespace System.Collections.Generic } private void Resize() - { - Resize(HashHelpers.ExpandPrime(_count), false); - } + => Resize(HashHelpers.ExpandPrime(_count), false); private void Resize(int newSize, bool forceNewHashCodes) { @@ -524,22 +732,21 @@ namespace System.Collections.Generic #endif int[] buckets = new int[newSize]; - for (int i = 0; i < buckets.Length; i++) - { - buckets[i] = -1; - } Entry[] entries = new Entry[newSize]; int count = _count; Array.Copy(_entries, 0, entries, 0, count); - if (forceNewHashCodes) + if (default(TKey) == null && forceNewHashCodes) { for (int i = 0; i < count; i++) { - if (entries[i].hashCode != -1) + if (entries[i].hashCode >= 0) { - entries[i].hashCode = (_comparer.GetHashCode(entries[i].key) & 0x7FFFFFFF); +#if !MONO + Debug.Assert(_comparer == null); +#endif + entries[i].hashCode = (entries[i].key.GetHashCode() & 0x7FFFFFFF); } } } @@ -549,8 +756,10 @@ namespace System.Collections.Generic if (entries[i].hashCode >= 0) { int bucket = entries[i].hashCode % newSize; - entries[i].next = buckets[bucket]; - buckets[bucket] = i; + // Value in _buckets is 1-based + entries[i].next = buckets[bucket] - 1; + // Value in _buckets is 1-based + buckets[bucket] = i + 1; } } @@ -570,19 +779,21 @@ namespace System.Collections.Generic if (_buckets != null) { - int hashCode = _comparer.GetHashCode(key) & 0x7FFFFFFF; + int hashCode = (_comparer?.GetHashCode(key) ?? key.GetHashCode()) & 0x7FFFFFFF; int bucket = hashCode % _buckets.Length; int last = -1; - int i = _buckets[bucket]; + // Value in _buckets is 1-based + int i = _buckets[bucket] - 1; while (i >= 0) { ref Entry entry = ref _entries[i]; - if (entry.hashCode == hashCode && _comparer.Equals(entry.key, key)) + if (entry.hashCode == hashCode && (_comparer?.Equals(entry.key, key) ?? EqualityComparer.Default.Equals(entry.key, key))) { if (last < 0) { - _buckets[bucket] = entry.next; + // Value in _buckets is 1-based + _buckets[bucket] = entry.next + 1; } else { @@ -593,11 +804,11 @@ namespace System.Collections.Generic if (RuntimeHelpers.IsReferenceOrContainsReferences()) { - entry.key = default(TKey); + entry.key = default; } if (RuntimeHelpers.IsReferenceOrContainsReferences()) { - entry.value = default(TValue); + entry.value = default; } _freeList = i; _freeCount++; @@ -624,19 +835,21 @@ namespace System.Collections.Generic if (_buckets != null) { - int hashCode = _comparer.GetHashCode(key) & 0x7FFFFFFF; + int hashCode = (_comparer?.GetHashCode(key) ?? key.GetHashCode()) & 0x7FFFFFFF; int bucket = hashCode % _buckets.Length; int last = -1; - int i = _buckets[bucket]; + // Value in _buckets is 1-based + int i = _buckets[bucket] - 1; while (i >= 0) { ref Entry entry = ref _entries[i]; - if (entry.hashCode == hashCode && _comparer.Equals(entry.key, key)) + if (entry.hashCode == hashCode && (_comparer?.Equals(entry.key, key) ?? EqualityComparer.Default.Equals(entry.key, key))) { if (last < 0) { - _buckets[bucket] = entry.next; + // Value in _buckets is 1-based + _buckets[bucket] = entry.next + 1; } else { @@ -650,11 +863,11 @@ namespace System.Collections.Generic if (RuntimeHelpers.IsReferenceOrContainsReferences()) { - entry.key = default(TKey); + entry.key = default; } if (RuntimeHelpers.IsReferenceOrContainsReferences()) { - entry.value = default(TValue); + entry.value = default; } _freeList = i; _freeCount++; @@ -666,7 +879,7 @@ namespace System.Collections.Generic i = entry.next; } } - value = default(TValue); + value = default; return false; } @@ -678,57 +891,37 @@ namespace System.Collections.Generic value = _entries[i].value; return true; } - value = default(TValue); + value = default; return false; } - public bool TryAdd(TKey key, TValue value) => TryInsert(key, value, InsertionBehavior.None); + public bool TryAdd(TKey key, TValue value) + => TryInsert(key, value, InsertionBehavior.None); - bool ICollection>.IsReadOnly - { - get { return false; } - } + bool ICollection>.IsReadOnly => false; void ICollection>.CopyTo(KeyValuePair[] array, int index) - { - CopyTo(array, index); - } + => CopyTo(array, index); void ICollection.CopyTo(Array array, int index) { if (array == null) - { ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array); - } - if (array.Rank != 1) - { ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_RankMultiDimNotSupported); - } - if (array.GetLowerBound(0) != 0) - { ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_NonZeroLowerBound); - } - - if (index < 0 || index > array.Length) - { + if ((uint)index > (uint)array.Length) ThrowHelper.ThrowIndexArgumentOutOfRange_NeedNonNegNumException(); - } - if (array.Length - index < Count) - { ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_ArrayPlusOffTooSmall); - } - KeyValuePair[] pairs = array as KeyValuePair[]; - if (pairs != null) + if (array is KeyValuePair[] pairs) { CopyTo(pairs, index); } - else if (array is DictionaryEntry[]) + else if (array is DictionaryEntry[] dictEntryArray) { - DictionaryEntry[] dictEntryArray = array as DictionaryEntry[]; Entry[] entries = _entries; for (int i = 0; i < _count; i++) { @@ -766,9 +959,7 @@ namespace System.Collections.Generic } IEnumerator IEnumerable.GetEnumerator() - { - return new Enumerator(this, Enumerator.KeyValuePair); - } + => new Enumerator(this, Enumerator.KeyValuePair); /// /// Ensures that the dictionary can hold up to 'capacity' entries without any further expansion of its backing storage @@ -777,8 +968,9 @@ namespace System.Collections.Generic { if (capacity < 0) ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.capacity); - if (_entries != null && _entries.Length >= capacity) - return _entries.Length; + int currentCapacity = _entries == null ? 0 : _entries.Length; + if (currentCapacity >= capacity) + return currentCapacity; if (_buckets == null) return Initialize(capacity); int newSize = HashHelpers.GetPrime(capacity); @@ -786,42 +978,82 @@ namespace System.Collections.Generic return newSize; } - bool ICollection.IsSynchronized + /// + /// Sets the capacity of this dictionary to what it would be if it had been originally initialized with all its entries + /// + /// This method can be used to minimize the memory overhead + /// once it is known that no new elements will be added. + /// + /// To allocate minimum size storage array, execute the following statements: + /// + /// dictionary.Clear(); + /// dictionary.TrimExcess(); + /// + public void TrimExcess() + => TrimExcess(Count); + + /// + /// Sets the capacity of this dictionary to hold up 'capacity' entries without any further expansion of its backing storage + /// + /// This method can be used to minimize the memory overhead + /// once it is known that no new elements will be added. + /// + public void TrimExcess(int capacity) { - get { return false; } + if (capacity < Count) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.capacity); + int newSize = HashHelpers.GetPrime(capacity); + + Entry[] oldEntries = _entries; + int currentCapacity = oldEntries == null ? 0 : oldEntries.Length; + if (newSize >= currentCapacity) + return; + + int oldCount = _count; + Initialize(newSize); + Entry[] entries = _entries; + int[] buckets = _buckets; + int count = 0; + for (int i = 0; i < oldCount; i++) + { + int hashCode = oldEntries[i].hashCode; + if (hashCode >= 0) + { + ref Entry entry = ref entries[count]; + entry = oldEntries[i]; + int bucket = hashCode % newSize; + // Value in _buckets is 1-based + entry.next = buckets[bucket] - 1; + // Value in _buckets is 1-based + buckets[bucket] = count + 1; + count++; + } + } + _count = count; + _freeCount = 0; } + bool ICollection.IsSynchronized => false; + object ICollection.SyncRoot { get { if (_syncRoot == null) { - System.Threading.Interlocked.CompareExchange(ref _syncRoot, new Object(), null); + Interlocked.CompareExchange(ref _syncRoot, new object(), null); } return _syncRoot; } } - bool IDictionary.IsFixedSize - { - get { return false; } - } + bool IDictionary.IsFixedSize => false; - bool IDictionary.IsReadOnly - { - get { return false; } - } + bool IDictionary.IsReadOnly => false; - ICollection IDictionary.Keys - { - get { return (ICollection)Keys; } - } + ICollection IDictionary.Keys => (ICollection)Keys; - ICollection IDictionary.Values - { - get { return (ICollection)Values; } - } + ICollection IDictionary.Values => (ICollection)Values; object IDictionary.this[object key] { @@ -911,9 +1143,7 @@ namespace System.Collections.Generic } IDictionaryEnumerator IDictionary.GetEnumerator() - { - return new Enumerator(this, Enumerator.DictEntry); - } + => new Enumerator(this, Enumerator.DictEntry); void IDictionary.Remove(object key) { @@ -972,10 +1202,7 @@ namespace System.Collections.Generic return false; } - public KeyValuePair Current - { - get { return _current; } - } + public KeyValuePair Current => _current; public void Dispose() { @@ -992,7 +1219,7 @@ namespace System.Collections.Generic if (_getEnumeratorRetType == DictEntry) { - return new System.Collections.DictionaryEntry(_current.Key, _current.Value); + return new DictionaryEntry(_current.Key, _current.Value); } else { @@ -1071,9 +1298,7 @@ namespace System.Collections.Generic } public Enumerator GetEnumerator() - { - return new Enumerator(_dictionary); - } + => new Enumerator(_dictionary); public void CopyTo(TKey[] array, int index) { @@ -1100,30 +1325,18 @@ namespace System.Collections.Generic } } - public int Count - { - get { return _dictionary.Count; } - } + public int Count => _dictionary.Count; - bool ICollection.IsReadOnly - { - get { return true; } - } + bool ICollection.IsReadOnly => true; void ICollection.Add(TKey item) - { - ThrowHelper.ThrowNotSupportedException(ExceptionResource.NotSupported_KeyCollectionSet); - } + => ThrowHelper.ThrowNotSupportedException(ExceptionResource.NotSupported_KeyCollectionSet); void ICollection.Clear() - { - ThrowHelper.ThrowNotSupportedException(ExceptionResource.NotSupported_KeyCollectionSet); - } + => ThrowHelper.ThrowNotSupportedException(ExceptionResource.NotSupported_KeyCollectionSet); bool ICollection.Contains(TKey item) - { - return _dictionary.ContainsKey(item); - } + => _dictionary.ContainsKey(item); bool ICollection.Remove(TKey item) { @@ -1132,44 +1345,25 @@ namespace System.Collections.Generic } IEnumerator IEnumerable.GetEnumerator() - { - return new Enumerator(_dictionary); - } + => new Enumerator(_dictionary); IEnumerator IEnumerable.GetEnumerator() - { - return new Enumerator(_dictionary); - } + => new Enumerator(_dictionary); void ICollection.CopyTo(Array array, int index) { if (array == null) - { ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array); - } - if (array.Rank != 1) - { ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_RankMultiDimNotSupported); - } - if (array.GetLowerBound(0) != 0) - { ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_NonZeroLowerBound); - } - - if (index < 0 || index > array.Length) - { + if ((uint)index > (uint)array.Length) ThrowHelper.ThrowIndexArgumentOutOfRange_NeedNonNegNumException(); - } - if (array.Length - index < _dictionary.Count) - { ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_ArrayPlusOffTooSmall); - } - TKey[] keys = array as TKey[]; - if (keys != null) + if (array is TKey[] keys) { CopyTo(keys, index); } @@ -1197,20 +1391,14 @@ namespace System.Collections.Generic } } - bool ICollection.IsSynchronized - { - get { return false; } - } + bool ICollection.IsSynchronized => false; - object ICollection.SyncRoot - { - get { return ((ICollection)_dictionary).SyncRoot; } - } + object ICollection.SyncRoot => ((ICollection)_dictionary).SyncRoot; #if MONO [Serializable] #endif - public struct Enumerator : IEnumerator, System.Collections.IEnumerator + public struct Enumerator : IEnumerator, IEnumerator { private Dictionary _dictionary; private int _index; @@ -1222,7 +1410,7 @@ namespace System.Collections.Generic _dictionary = dictionary; _version = dictionary._version; _index = 0; - _currentKey = default(TKey); + _currentKey = default; } public void Dispose() @@ -1248,19 +1436,13 @@ namespace System.Collections.Generic } _index = _dictionary._count + 1; - _currentKey = default(TKey); + _currentKey = default; return false; } - public TKey Current - { - get - { - return _currentKey; - } - } + public TKey Current => _currentKey; - object System.Collections.IEnumerator.Current + object IEnumerator.Current { get { @@ -1273,7 +1455,7 @@ namespace System.Collections.Generic } } - void System.Collections.IEnumerator.Reset() + void IEnumerator.Reset() { if (_version != _dictionary._version) { @@ -1281,7 +1463,7 @@ namespace System.Collections.Generic } _index = 0; - _currentKey = default(TKey); + _currentKey = default; } } } @@ -1305,9 +1487,7 @@ namespace System.Collections.Generic } public Enumerator GetEnumerator() - { - return new Enumerator(_dictionary); - } + => new Enumerator(_dictionary); public void CopyTo(TValue[] array, int index) { @@ -1334,20 +1514,12 @@ namespace System.Collections.Generic } } - public int Count - { - get { return _dictionary.Count; } - } + public int Count => _dictionary.Count; - bool ICollection.IsReadOnly - { - get { return true; } - } + bool ICollection.IsReadOnly => true; void ICollection.Add(TValue item) - { - ThrowHelper.ThrowNotSupportedException(ExceptionResource.NotSupported_ValueCollectionSet); - } + => ThrowHelper.ThrowNotSupportedException(ExceptionResource.NotSupported_ValueCollectionSet); bool ICollection.Remove(TValue item) { @@ -1356,52 +1528,31 @@ namespace System.Collections.Generic } void ICollection.Clear() - { - ThrowHelper.ThrowNotSupportedException(ExceptionResource.NotSupported_ValueCollectionSet); - } + => ThrowHelper.ThrowNotSupportedException(ExceptionResource.NotSupported_ValueCollectionSet); bool ICollection.Contains(TValue item) - { - return _dictionary.ContainsValue(item); - } + => _dictionary.ContainsValue(item); IEnumerator IEnumerable.GetEnumerator() - { - return new Enumerator(_dictionary); - } + => new Enumerator(_dictionary); IEnumerator IEnumerable.GetEnumerator() - { - return new Enumerator(_dictionary); - } + => new Enumerator(_dictionary); void ICollection.CopyTo(Array array, int index) { if (array == null) - { ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array); - } - if (array.Rank != 1) - { ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_RankMultiDimNotSupported); - } - if (array.GetLowerBound(0) != 0) - { ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_NonZeroLowerBound); - } - - if (index < 0 || index > array.Length) - { + if ((uint)index > (uint)array.Length) ThrowHelper.ThrowIndexArgumentOutOfRange_NeedNonNegNumException(); - } - if (array.Length - index < _dictionary.Count) ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_ArrayPlusOffTooSmall); - TValue[] values = array as TValue[]; - if (values != null) + if (array is TValue[] values) { CopyTo(values, index); } @@ -1429,20 +1580,14 @@ namespace System.Collections.Generic } } - bool ICollection.IsSynchronized - { - get { return false; } - } + bool ICollection.IsSynchronized => false; - object ICollection.SyncRoot - { - get { return ((ICollection)_dictionary).SyncRoot; } - } + object ICollection.SyncRoot => ((ICollection)_dictionary).SyncRoot; #if MONO [Serializable] #endif - public struct Enumerator : IEnumerator, System.Collections.IEnumerator + public struct Enumerator : IEnumerator, IEnumerator { private Dictionary _dictionary; private int _index; @@ -1454,7 +1599,7 @@ namespace System.Collections.Generic _dictionary = dictionary; _version = dictionary._version; _index = 0; - _currentValue = default(TValue); + _currentValue = default; } public void Dispose() @@ -1479,19 +1624,13 @@ namespace System.Collections.Generic } } _index = _dictionary._count + 1; - _currentValue = default(TValue); + _currentValue = default; return false; } - public TValue Current - { - get - { - return _currentValue; - } - } + public TValue Current => _currentValue; - object System.Collections.IEnumerator.Current + object IEnumerator.Current { get { @@ -1504,14 +1643,14 @@ namespace System.Collections.Generic } } - void System.Collections.IEnumerator.Reset() + void IEnumerator.Reset() { if (_version != _dictionary._version) { ThrowHelper.ThrowInvalidOperationException_InvalidOperation_EnumFailedVersion(); } _index = 0; - _currentValue = default(TValue); + _currentValue = default; } } } diff --git a/external/corefx/src/Common/src/CoreLib/System/Collections/Generic/List.cs b/external/corefx/src/Common/src/CoreLib/System/Collections/Generic/List.cs index 1426d84021..b8fd8eb5e2 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Collections/Generic/List.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Collections/Generic/List.cs @@ -6,6 +6,7 @@ using System.Collections.ObjectModel; using System.Diagnostics; using System.Diagnostics.Private; using System.Runtime.CompilerServices; +using System.Threading; namespace System.Collections.Generic { @@ -19,9 +20,9 @@ namespace System.Collections.Generic [DebuggerDisplay("Count = {Count}")] [Serializable] #if !MONO - [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] + [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] #endif - public class List : IList, System.Collections.IList, IReadOnlyList + public class List : IList, IList, IReadOnlyList { private const int DefaultCapacity = 4; @@ -66,8 +67,7 @@ namespace System.Collections.Generic if (collection == null) ThrowHelper.ThrowArgumentNullException(ExceptionArgument.collection); - ICollection c = collection as ICollection; - if (c != null) + if (collection is ICollection c) { int count = c.Count; if (count == 0) @@ -126,44 +126,26 @@ namespace System.Collections.Generic } // Read-only property describing how many elements are in the List. - public int Count - { - get - { - return _size; - } - } + public int Count => _size; - bool System.Collections.IList.IsFixedSize - { - get { return false; } - } + bool IList.IsFixedSize => false; // Is this List read-only? - bool ICollection.IsReadOnly - { - get { return false; } - } + bool ICollection.IsReadOnly => false; - bool System.Collections.IList.IsReadOnly - { - get { return false; } - } + bool IList.IsReadOnly => false; // Is this List synchronized (thread-safe)? - bool System.Collections.ICollection.IsSynchronized - { - get { return false; } - } + bool ICollection.IsSynchronized => false; // Synchronization root for this object. - object System.Collections.ICollection.SyncRoot + object ICollection.SyncRoot { get { if (_syncRoot == null) { - System.Threading.Interlocked.CompareExchange(ref _syncRoot, new object(), null); + Interlocked.CompareExchange(ref _syncRoot, new object(), null); } return _syncRoot; } @@ -200,7 +182,7 @@ namespace System.Collections.Generic return ((value is T) || (value == null && default(T) == null)); } - object System.Collections.IList.this[int index] + object IList.this[int index] { get { @@ -228,9 +210,9 @@ namespace System.Collections.Generic [MethodImpl(MethodImplOptions.AggressiveInlining)] public void Add(T item) { - var array = _items; - var size = _size; _version++; + T[] array = _items; + int size = _size; if ((uint)size < (uint)array.Length) { _size = size + 1; @@ -246,13 +228,13 @@ namespace System.Collections.Generic [MethodImpl(MethodImplOptions.NoInlining)] private void AddWithResize(T item) { - var size = _size; + int size = _size; EnsureCapacity(size + 1); _size = size + 1; _items[size] = item; } - int System.Collections.IList.Add(Object item) + int IList.Add(object item) { ThrowHelper.IfNullAndNullsAreIllegalThenThrow(item, ExceptionArgument.item); @@ -273,14 +255,10 @@ namespace System.Collections.Generic // capacity or the new size, whichever is larger. // public void AddRange(IEnumerable collection) - { - InsertRange(_size, collection); - } + => InsertRange(_size, collection); public ReadOnlyCollection AsReadOnly() - { - return new ReadOnlyCollection(this); - } + => new ReadOnlyCollection(this); // Searches a section of the list for a given element using a binary search // algorithm. Elements of the list are compared to the search value using @@ -315,25 +293,20 @@ namespace System.Collections.Generic } public int BinarySearch(T item) - { - return BinarySearch(0, Count, item, null); - } + => BinarySearch(0, Count, item, null); public int BinarySearch(T item, IComparer comparer) - { - return BinarySearch(0, Count, item, comparer); - } - + => BinarySearch(0, Count, item, comparer); // Clears the contents of List. [MethodImpl(MethodImplOptions.AggressiveInlining)] public void Clear() { + _version++; if (RuntimeHelpers.IsReferenceOrContainsReferences()) { int size = _size; _size = 0; - _version++; if (size > 0) { Array.Clear(_items, 0, size); // Clear the elements so that the gc can reclaim the references. @@ -342,7 +315,6 @@ namespace System.Collections.Generic else { _size = 0; - _version++; } } @@ -363,7 +335,7 @@ namespace System.Collections.Generic return _size != 0 && IndexOf(item) != -1; } - bool System.Collections.IList.Contains(object item) + bool IList.Contains(object item) { if (IsCompatibleObject(item)) { @@ -391,13 +363,11 @@ namespace System.Collections.Generic // Copies this List into array, which must be of a // compatible array type. public void CopyTo(T[] array) - { - CopyTo(array, 0); - } + => CopyTo(array, 0); // Copies this List into array, which must be of a // compatible array type. - void System.Collections.ICollection.CopyTo(Array array, int arrayIndex) + void ICollection.CopyTo(Array array, int arrayIndex) { if ((array != null) && (array.Rank != 1)) { @@ -459,9 +429,7 @@ namespace System.Collections.Generic } public bool Exists(Predicate match) - { - return FindIndex(match) != -1; - } + => FindIndex(match) != -1; public T Find(Predicate match) { @@ -477,7 +445,7 @@ namespace System.Collections.Generic return _items[i]; } } - return default(T); + return default; } public List FindAll(Predicate match) @@ -499,14 +467,10 @@ namespace System.Collections.Generic } public int FindIndex(Predicate match) - { - return FindIndex(0, _size, match); - } + => FindIndex(0, _size, match); public int FindIndex(int startIndex, Predicate match) - { - return FindIndex(startIndex, _size - startIndex, match); - } + => FindIndex(startIndex, _size - startIndex, match); public int FindIndex(int startIndex, int count, Predicate match) { @@ -547,18 +511,14 @@ namespace System.Collections.Generic return _items[i]; } } - return default(T); + return default; } public int FindLastIndex(Predicate match) - { - return FindLastIndex(_size - 1, _size, match); - } + => FindLastIndex(_size - 1, _size, match); public int FindLastIndex(int startIndex, Predicate match) - { - return FindLastIndex(startIndex, startIndex + 1, match); - } + => FindLastIndex(startIndex, startIndex + 1, match); public int FindLastIndex(int startIndex, int count, Predicate match) { @@ -629,19 +589,13 @@ namespace System.Collections.Generic // GetObject methods of the enumerator will throw an exception. // public Enumerator GetEnumerator() - { - return new Enumerator(this); - } + => new Enumerator(this); IEnumerator IEnumerable.GetEnumerator() - { - return new Enumerator(this); - } + => new Enumerator(this); - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() - { - return new Enumerator(this); - } + IEnumerator IEnumerable.GetEnumerator() + => new Enumerator(this); public List GetRange(int index, int count) { @@ -676,11 +630,9 @@ namespace System.Collections.Generic // search. // public int IndexOf(T item) - { - return Array.IndexOf(_items, item, 0, _size); - } + => Array.IndexOf(_items, item, 0, _size); - int System.Collections.IList.IndexOf(object item) + int IList.IndexOf(object item) { if (IsCompatibleObject(item)) { @@ -746,7 +698,7 @@ namespace System.Collections.Generic _version++; } - void System.Collections.IList.Insert(int index, Object item) + void IList.Insert(int index, object item) { ThrowHelper.IfNullAndNullsAreIllegalThenThrow(item, ExceptionArgument.item); @@ -777,9 +729,8 @@ namespace System.Collections.Generic ThrowHelper.ThrowArgumentOutOfRange_IndexException(); } - ICollection c = collection as ICollection; - if (c != null) - { // if collection is ICollection + if (collection is ICollection c) + { int count = c.Count; if (count > 0) { @@ -912,7 +863,7 @@ namespace System.Collections.Generic return false; } - void System.Collections.IList.Remove(object item) + void IList.Remove(object item) { if (IsCompatibleObject(item)) { @@ -974,7 +925,7 @@ namespace System.Collections.Generic } if (RuntimeHelpers.IsReferenceOrContainsReferences()) { - _items[_size] = default(T); + _items[_size] = default; } _version++; } @@ -1014,9 +965,7 @@ namespace System.Collections.Generic // Reverses the elements in this list. public void Reverse() - { - Reverse(0, Count); - } + => Reverse(0, Count); // Reverses the elements in a range of this list. Following a call to this // method, an element in the range given by index and count @@ -1048,16 +997,12 @@ namespace System.Collections.Generic // Sorts the elements in this list. Uses the default comparer and // Array.Sort. public void Sort() - { - Sort(0, Count, null); - } + => Sort(0, Count, null); // Sorts the elements in this list. Uses Array.Sort with the // provided comparer. public void Sort(IComparer comparer) - { - Sort(0, Count, comparer); - } + => Sort(0, Count, comparer); // Sorts the elements in a section of this list. The sort compares the // elements to each other using the given IComparer interface. If @@ -1157,9 +1102,9 @@ namespace System.Collections.Generic Debug.Assert(enumerable != null); Debug.Assert(!(enumerable is ICollection), "We should have optimized for this beforehand."); + _version++; // Even if the enumerable has no items, we can update _version. using (IEnumerator en = enumerable.GetEnumerator()) { - _version++; // Even if the enumerable has no items, we can update _version. while (en.MoveNext()) { @@ -1180,7 +1125,7 @@ namespace System.Collections.Generic #if MONO [System.Serializable] #endif - public struct Enumerator : IEnumerator, System.Collections.IEnumerator + public struct Enumerator : IEnumerator, IEnumerator { private List _list; private int _index; @@ -1192,7 +1137,7 @@ namespace System.Collections.Generic _list = list; _index = 0; _version = list._version; - _current = default(T); + _current = default; } public void Dispose() @@ -1220,19 +1165,13 @@ namespace System.Collections.Generic } _index = _list._size + 1; - _current = default(T); + _current = default; return false; } - public T Current - { - get - { - return _current; - } - } + public T Current => _current; - object System.Collections.IEnumerator.Current + object IEnumerator.Current { get { @@ -1244,7 +1183,7 @@ namespace System.Collections.Generic } } - void System.Collections.IEnumerator.Reset() + void IEnumerator.Reset() { if (_version != _list._version) { @@ -1252,7 +1191,7 @@ namespace System.Collections.Generic } _index = 0; - _current = default(T); + _current = default; } } } diff --git a/external/corefx/src/Common/src/CoreLib/System/Collections/Generic/NonRandomizedStringEqualityComparer.cs b/external/corefx/src/Common/src/CoreLib/System/Collections/Generic/NonRandomizedStringEqualityComparer.cs index 72f62c2b9a..e7efa22b24 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Collections/Generic/NonRandomizedStringEqualityComparer.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Collections/Generic/NonRandomizedStringEqualityComparer.cs @@ -11,12 +11,8 @@ namespace System.Collections.Generic // keeps the performance not affected till we hit collision threshold and then we switch to the comparer which is using // randomized string hashing. [Serializable] // Required for compatibility with .NET Core 2.0 as we exposed the NonRandomizedStringEqualityComparer inside the serialization blob -#if CORERT - public -#else - internal -#endif - sealed class NonRandomizedStringEqualityComparer : EqualityComparer, ISerializable + // Needs to be public to support binary serialization compatibility + public sealed class NonRandomizedStringEqualityComparer : EqualityComparer, ISerializable { internal static new IEqualityComparer Default { get; } = new NonRandomizedStringEqualityComparer(); diff --git a/external/corefx/src/Common/src/CoreLib/System/Collections/Generic/ValueListBuilder.cs b/external/corefx/src/Common/src/CoreLib/System/Collections/Generic/ValueListBuilder.cs new file mode 100644 index 0000000000..5fbeeec9c3 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/Collections/Generic/ValueListBuilder.cs @@ -0,0 +1,76 @@ +// 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; +using System.Diagnostics.Private; +using System.Runtime.CompilerServices; + +namespace System.Collections.Generic +{ + internal ref partial struct ValueListBuilder + { + private Span _span; + private T[] _arrayFromPool; + private int _pos; + + public ValueListBuilder(Span initialSpan) + { + _span = initialSpan; + _arrayFromPool = null; + _pos = 0; + } + + public int Length => _pos; + + public ref T this[int index] + { + get + { + Debug.Assert(index < _pos); + return ref _span[index]; + } + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public void Append(T item) + { + int pos = _pos; + if (pos >= _span.Length) + Grow(); + + _span[pos] = item; + _pos = pos + 1; + } + + public ReadOnlySpan AsSpan() + { + return _span.Slice(0, _pos); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public void Dispose() + { + if (_arrayFromPool != null) + { + ArrayPool.Shared.Return(_arrayFromPool); + _arrayFromPool = null; + } + } + + private void Grow() + { + T[] array = ArrayPool.Shared.Rent(_span.Length * 2); + + bool success = _span.TryCopyTo(array); + Debug.Assert(success); + + T[] toReturn = _arrayFromPool; + _span = _arrayFromPool = array; + if (toReturn != null) + { + ArrayPool.Shared.Return(toReturn); + } + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/Collections/HashHelpers.cs b/external/corefx/src/Common/src/CoreLib/System/Collections/HashHelpers.cs index 49cff85b58..3524b56361 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Collections/HashHelpers.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Collections/HashHelpers.cs @@ -2,7 +2,7 @@ // 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.Diagnostics.Private; using System.Runtime.CompilerServices; using System.Runtime.Serialization; using System.Threading; diff --git a/external/corefx/src/Common/src/CoreLib/System/Collections/ListDictionaryInternal.cs b/external/corefx/src/Common/src/CoreLib/System/Collections/ListDictionaryInternal.cs index a8b7a187d9..ba6f5360bf 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Collections/ListDictionaryInternal.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Collections/ListDictionaryInternal.cs @@ -19,11 +19,10 @@ namespace System.Collections /// will be smaller and faster than a Hashtable if the number of elements is 10 or less. /// This should not be used if performance is important for large numbers of elements. [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] -#if CORERT + // Needs to be public to support binary serialization compatibility public -#else - internal #endif class ListDictionaryInternal : IDictionary { diff --git a/external/corefx/src/Common/src/CoreLib/System/Convert.Base64.cs b/external/corefx/src/Common/src/CoreLib/System/Convert.Base64.cs new file mode 100644 index 0000000000..ba9f52feaa --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/Convert.Base64.cs @@ -0,0 +1,218 @@ +// 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.Diagnostics.Private; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using Internal.Runtime.CompilerServices; + +namespace System +{ + public static partial class Convert + { + /// + /// Decode the span of UTF-16 encoded text represented as base 64 into binary data. + /// If the input is not a multiple of 4, or contains illegal characters, it will decode as much as it can, to the largest possible multiple of 4. + /// This invariant allows continuation of the parse with a slower, whitespace-tolerant algorithm. + /// + /// The input span which contains UTF-16 encoded text in base 64 that needs to be decoded. + /// The output span which contains the result of the operation, i.e. the decoded binary data. + /// The number of input bytes consumed during the operation. This can be used to slice the input for subsequent calls, if necessary. + /// The number of bytes written into the output span. This can be used to slice the output for subsequent calls, if necessary. + /// Returns: + /// - true - The entire input span was successfully parsed. + /// - false - Only a part of the input span was successfully parsed. Failure causes may include embedded or trailing whitespace, + /// other illegal Base64 characters, trailing characters after an encoding pad ('='), an input span whose length is not divisible by 4 + /// or a destination span that's too small. and are set so that + /// parsing can continue with a slower whitespace-tolerant algorithm. + /// + /// Note: This is a cut down version of the implementation of Base64.DecodeFromUtf8(), modified the accept UTF16 chars and act as a fast-path + /// helper for the Convert routines when the input string contains no whitespace. + /// + /// + private static bool TryDecodeFromUtf16(ReadOnlySpan utf16, Span bytes, out int consumed, out int written) + { + ref char srcChars = ref MemoryMarshal.GetReference(utf16); + ref byte destBytes = ref MemoryMarshal.GetReference(bytes); + + int srcLength = utf16.Length & ~0x3; // only decode input up to the closest multiple of 4. + int destLength = bytes.Length; + + int sourceIndex = 0; + int destIndex = 0; + + if (utf16.Length == 0) + goto DoneExit; + + ref sbyte decodingMap = ref s_decodingMap[0]; + + // Last bytes could have padding characters, so process them separately and treat them as valid. + const int skipLastChunk = 4; + + int maxSrcLength; + if (destLength >= (srcLength >> 2) * 3) + { + maxSrcLength = srcLength - skipLastChunk; + } + else + { + // This should never overflow since destLength here is less than int.MaxValue / 4 * 3 (i.e. 1610612733) + // Therefore, (destLength / 3) * 4 will always be less than 2147483641 + maxSrcLength = (destLength / 3) * 4; + } + + while (sourceIndex < maxSrcLength) + { + int result = Decode(ref Unsafe.Add(ref srcChars, sourceIndex), ref decodingMap); + if (result < 0) + goto InvalidExit; + WriteThreeLowOrderBytes(ref Unsafe.Add(ref destBytes, destIndex), result); + destIndex += 3; + sourceIndex += 4; + } + + if (maxSrcLength != srcLength - skipLastChunk) + goto InvalidExit; + + // If input is less than 4 bytes, srcLength == sourceIndex == 0 + // If input is not a multiple of 4, sourceIndex == srcLength != 0 + if (sourceIndex == srcLength) + { + goto InvalidExit; + } + + int i0 = Unsafe.Add(ref srcChars, srcLength - 4); + int i1 = Unsafe.Add(ref srcChars, srcLength - 3); + int i2 = Unsafe.Add(ref srcChars, srcLength - 2); + int i3 = Unsafe.Add(ref srcChars, srcLength - 1); + if (((i0 | i1 | i2 | i3) & 0xffffff00) != 0) + goto InvalidExit; + + i0 = Unsafe.Add(ref decodingMap, i0); + i1 = Unsafe.Add(ref decodingMap, i1); + + i0 <<= 18; + i1 <<= 12; + + i0 |= i1; + + if (i3 != EncodingPad) + { + i2 = Unsafe.Add(ref decodingMap, i2); + i3 = Unsafe.Add(ref decodingMap, i3); + + i2 <<= 6; + + i0 |= i3; + i0 |= i2; + + if (i0 < 0) + goto InvalidExit; + if (destIndex > destLength - 3) + goto InvalidExit; + WriteThreeLowOrderBytes(ref Unsafe.Add(ref destBytes, destIndex), i0); + destIndex += 3; + } + else if (i2 != EncodingPad) + { + i2 = Unsafe.Add(ref decodingMap, i2); + + i2 <<= 6; + + i0 |= i2; + + if (i0 < 0) + goto InvalidExit; + if (destIndex > destLength - 2) + goto InvalidExit; + Unsafe.Add(ref destBytes, destIndex) = (byte)(i0 >> 16); + Unsafe.Add(ref destBytes, destIndex + 1) = (byte)(i0 >> 8); + destIndex += 2; + } + else + { + if (i0 < 0) + goto InvalidExit; + if (destIndex > destLength - 1) + goto InvalidExit; + Unsafe.Add(ref destBytes, destIndex) = (byte)(i0 >> 16); + destIndex += 1; + } + + sourceIndex += 4; + + if (srcLength != utf16.Length) + goto InvalidExit; + + DoneExit: + consumed = sourceIndex; + written = destIndex; + return true; + + InvalidExit: + consumed = sourceIndex; + written = destIndex; + Debug.Assert((consumed % 4) == 0); + return false; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static int Decode(ref char encodedChars, ref sbyte decodingMap) + { + int i0 = encodedChars; + int i1 = Unsafe.Add(ref encodedChars, 1); + int i2 = Unsafe.Add(ref encodedChars, 2); + int i3 = Unsafe.Add(ref encodedChars, 3); + + if (((i0 | i1 | i2 | i3) & 0xffffff00) != 0) + return -1; // One or more chars falls outside the 00..ff range. This cannot be a valid Base64 character. + + i0 = Unsafe.Add(ref decodingMap, i0); + i1 = Unsafe.Add(ref decodingMap, i1); + i2 = Unsafe.Add(ref decodingMap, i2); + i3 = Unsafe.Add(ref decodingMap, i3); + + i0 <<= 18; + i1 <<= 12; + i2 <<= 6; + + i0 |= i3; + i1 |= i2; + + i0 |= i1; + return i0; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static void WriteThreeLowOrderBytes(ref byte destination, int value) + { + destination = (byte)(value >> 16); + Unsafe.Add(ref destination, 1) = (byte)(value >> 8); + Unsafe.Add(ref destination, 2) = (byte)value; + } + + // Pre-computing this table using a custom string(s_characters) and GenerateDecodingMapAndVerify (found in tests) + private static readonly sbyte[] s_decodingMap = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, //62 is placed at index 43 (for +), 63 at index 47 (for /) + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, //52-61 are placed at index 48-57 (for 0-9), 64 at index 61 (for =) + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, //0-25 are placed at index 65-90 (for A-Z) + -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1, //26-51 are placed at index 97-122 (for a-z) + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // Bytes over 122 ('z') are invalid and cannot be decoded + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // Hence, padding the map with 255, which indicates invalid input + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + }; + + private const byte EncodingPad = (byte)'='; // '=', for padding + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/Convert.cs b/external/corefx/src/Common/src/CoreLib/System/Convert.cs new file mode 100644 index 0000000000..6f1b764a50 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/Convert.cs @@ -0,0 +1,2919 @@ +// 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; +using System.Globalization; +using System.Threading; +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Runtime.Versioning; +using System.Security; +using System.Diagnostics; +using System.Diagnostics.Private; + +namespace System +{ + [Flags] + public enum Base64FormattingOptions + { + None = 0, + InsertLineBreaks = 1 + } + + // Returns the type code of this object. An implementation of this method + // must not return TypeCode.Empty (which represents a null reference) or + // TypeCode.Object (which represents an object that doesn't implement the + // IConvertible interface). An implementation of this method should return + // TypeCode.DBNull if the value of this object is a database null. For + // example, a nullable integer type should return TypeCode.DBNull if the + // value of the object is the database null. Otherwise, an implementation + // of this method should return the TypeCode that best describes the + // internal representation of the object. + // The Value class provides conversion and querying methods for values. The + // Value class contains static members only, and it is not possible to create + // instances of the class. + // + // The statically typed conversion methods provided by the Value class are all + // of the form: + // + // public static XXX ToXXX(YYY value) + // + // where XXX is the target type and YYY is the source type. The matrix below + // shows the set of supported conversions. The set of conversions is symmetric + // such that for every ToXXX(YYY) there is also a ToYYY(XXX). + // + // From: To: Bol Chr SBy Byt I16 U16 I32 U32 I64 U64 Sgl Dbl Dec Dat Str + // ---------------------------------------------------------------------- + // Boolean x x x x x x x x x x x x x + // Char x x x x x x x x x x + // SByte x x x x x x x x x x x x x x + // Byte x x x x x x x x x x x x x x + // Int16 x x x x x x x x x x x x x x + // UInt16 x x x x x x x x x x x x x x + // Int32 x x x x x x x x x x x x x x + // UInt32 x x x x x x x x x x x x x x + // Int64 x x x x x x x x x x x x x x + // UInt64 x x x x x x x x x x x x x x + // Single x x x x x x x x x x x x x + // Double x x x x x x x x x x x x x + // Decimal x x x x x x x x x x x x x + // DateTime x x + // String x x x x x x x x x x x x x x x + // ---------------------------------------------------------------------- + // + // For dynamic conversions, the Value class provides a set of methods of the + // form: + // + // public static XXX ToXXX(object value) + // + // where XXX is the target type (Boolean, Char, SByte, Byte, Int16, UInt16, + // Int32, UInt32, Int64, UInt64, Single, Double, Decimal, DateTime, + // or String). The implementations of these methods all take the form: + // + // public static XXX toXXX(object value) { + // return value == null? XXX.Default: ((IConvertible)value).ToXXX(); + // } + // + // The code first checks if the given value is a null reference (which is the + // same as Value.Empty), in which case it returns the default value for type + // XXX. Otherwise, a cast to IConvertible is performed, and the appropriate ToXXX() + // method is invoked on the object. An InvalidCastException is thrown if the + // cast to IConvertible fails, and that exception is simply allowed to propagate out + // of the conversion method. + + // Constant representing the database null value. This value is used in + // database applications to indicate the absence of a known value. Note + // that Value.DBNull is NOT the same as a null object reference, which is + // represented by Value.Empty. + // + // The Equals() method of DBNull always returns false, even when the + // argument is itself DBNull. + // + // When passed Value.DBNull, the Value.GetTypeCode() method returns + // TypeCode.DBNull. + // + // When passed Value.DBNull, the Value.ToXXX() methods all throw an + // InvalidCastException. + + public static partial class Convert + { + //A typeof operation is fairly expensive (does a system call), so we'll cache these here + //statically. These are exactly lined up with the TypeCode, eg. ConvertType[TypeCode.Int16] + //will give you the type of an Int16. + internal static readonly Type[] ConvertTypes = { + typeof(System.Empty), + typeof(Object), + typeof(System.DBNull), + typeof(Boolean), + typeof(Char), + typeof(SByte), + typeof(Byte), + typeof(Int16), + typeof(UInt16), + typeof(Int32), + typeof(UInt32), + typeof(Int64), + typeof(UInt64), + typeof(Single), + typeof(Double), + typeof(Decimal), + typeof(DateTime), + typeof(Object), //TypeCode is discontinuous so we need a placeholder. + typeof(String) + }; + + // Need to special case Enum because typecode will be underlying type, e.g. Int32 + private static readonly Type EnumType = typeof(Enum); + + internal static readonly char[] base64Table = {'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O', + 'P','Q','R','S','T','U','V','W','X','Y','Z','a','b','c','d', + 'e','f','g','h','i','j','k','l','m','n','o','p','q','r','s', + 't','u','v','w','x','y','z','0','1','2','3','4','5','6','7', + '8','9','+','/','=' }; + + private const Int32 base64LineBreakPosition = 76; + +#if DEBUG + private static bool TriggerAsserts = DoAsserts(); + private static bool DoAsserts() + { + Debug.Assert(ConvertTypes != null, "[Convert.cctor]ConvertTypes!=null"); + Debug.Assert(ConvertTypes.Length == ((int)TypeCode.String + 1), "[Convert.cctor]ConvertTypes.Length == ((int)TypeCode.String + 1)"); + Debug.Assert(ConvertTypes[(int)TypeCode.Empty] == typeof(System.Empty), + "[Convert.cctor]ConvertTypes[(int)TypeCode.Empty]==typeof(System.Empty)"); + Debug.Assert(ConvertTypes[(int)TypeCode.String] == typeof(String), + "[Convert.cctor]ConvertTypes[(int)TypeCode.String]==typeof(System.String)"); + Debug.Assert(ConvertTypes[(int)TypeCode.Int32] == typeof(int), + "[Convert.cctor]ConvertTypes[(int)TypeCode.Int32]==typeof(int)"); + return true; + } +#endif + + public static readonly Object DBNull = System.DBNull.Value; + + // Returns the type code for the given object. If the argument is null, + // the result is TypeCode.Empty. If the argument is not a value (i.e. if + // the object does not implement IConvertible), the result is TypeCode.Object. + // Otherwise, the result is the type code of the object, as determined by + // the object's implementation of IConvertible. + public static TypeCode GetTypeCode(object value) + { + if (value == null) return TypeCode.Empty; + IConvertible temp = value as IConvertible; + if (temp != null) + { + return temp.GetTypeCode(); + } + return TypeCode.Object; + } + + // Returns true if the given object is a database null. This operation + // corresponds to "value.GetTypeCode() == TypeCode.DBNull". + public static bool IsDBNull(object value) + { + if (value == System.DBNull.Value) return true; + IConvertible convertible = value as IConvertible; + return convertible != null ? convertible.GetTypeCode() == TypeCode.DBNull : false; + } + + // Converts the given object to the given type. In general, this method is + // equivalent to calling the Value.ToXXX(value) method for the given + // typeCode and boxing the result. + // + // The method first checks if the given object implements IConvertible. If not, + // the only permitted conversion is from a null to TypeCode.Empty, the + // result of which is null. + // + // If the object does implement IConvertible, a check is made to see if the + // object already has the given type code, in which case the object is + // simply returned. Otherwise, the appropriate ToXXX() is invoked on the + // object's implementation of IConvertible. + public static Object ChangeType(Object value, TypeCode typeCode) + { + return ChangeType(value, typeCode, CultureInfo.CurrentCulture); + } + + public static Object ChangeType(Object value, TypeCode typeCode, IFormatProvider provider) + { + if (value == null && (typeCode == TypeCode.Empty || typeCode == TypeCode.String || typeCode == TypeCode.Object)) + { + return null; + } + + IConvertible v = value as IConvertible; + if (v == null) + { + throw new InvalidCastException(SR.InvalidCast_IConvertible); + } + + // This line is invalid for things like Enums that return a TypeCode + // of Int32, but the object can't actually be cast to an Int32. + // if (v.GetTypeCode() == typeCode) return value; + switch (typeCode) + { + case TypeCode.Boolean: + return v.ToBoolean(provider); + case TypeCode.Char: + return v.ToChar(provider); + case TypeCode.SByte: + return v.ToSByte(provider); + case TypeCode.Byte: + return v.ToByte(provider); + case TypeCode.Int16: + return v.ToInt16(provider); + case TypeCode.UInt16: + return v.ToUInt16(provider); + case TypeCode.Int32: + return v.ToInt32(provider); + case TypeCode.UInt32: + return v.ToUInt32(provider); + case TypeCode.Int64: + return v.ToInt64(provider); + case TypeCode.UInt64: + return v.ToUInt64(provider); + case TypeCode.Single: + return v.ToSingle(provider); + case TypeCode.Double: + return v.ToDouble(provider); + case TypeCode.Decimal: + return v.ToDecimal(provider); + case TypeCode.DateTime: + return v.ToDateTime(provider); + case TypeCode.String: + return v.ToString(provider); + case TypeCode.Object: + return value; + case TypeCode.DBNull: + throw new InvalidCastException(SR.InvalidCast_DBNull); + case TypeCode.Empty: + throw new InvalidCastException(SR.InvalidCast_Empty); + default: + throw new ArgumentException(SR.Arg_UnknownTypeCode); + } + } + + internal static Object DefaultToType(IConvertible value, Type targetType, IFormatProvider provider) + { + Debug.Assert(value != null, "[Convert.DefaultToType]value!=null"); + if (targetType == null) + { + throw new ArgumentNullException(nameof(targetType)); + } + + if (ReferenceEquals(value.GetType(), targetType)) + { + return value; + } + + if (ReferenceEquals(targetType, ConvertTypes[(int)TypeCode.Boolean])) + return value.ToBoolean(provider); + if (ReferenceEquals(targetType, ConvertTypes[(int)TypeCode.Char])) + return value.ToChar(provider); + if (ReferenceEquals(targetType, ConvertTypes[(int)TypeCode.SByte])) + return value.ToSByte(provider); + if (ReferenceEquals(targetType, ConvertTypes[(int)TypeCode.Byte])) + return value.ToByte(provider); + if (ReferenceEquals(targetType, ConvertTypes[(int)TypeCode.Int16])) + return value.ToInt16(provider); + if (ReferenceEquals(targetType, ConvertTypes[(int)TypeCode.UInt16])) + return value.ToUInt16(provider); + if (ReferenceEquals(targetType, ConvertTypes[(int)TypeCode.Int32])) + return value.ToInt32(provider); + if (ReferenceEquals(targetType, ConvertTypes[(int)TypeCode.UInt32])) + return value.ToUInt32(provider); + if (ReferenceEquals(targetType, ConvertTypes[(int)TypeCode.Int64])) + return value.ToInt64(provider); + if (ReferenceEquals(targetType, ConvertTypes[(int)TypeCode.UInt64])) + return value.ToUInt64(provider); + if (ReferenceEquals(targetType, ConvertTypes[(int)TypeCode.Single])) + return value.ToSingle(provider); + if (ReferenceEquals(targetType, ConvertTypes[(int)TypeCode.Double])) + return value.ToDouble(provider); + if (ReferenceEquals(targetType, ConvertTypes[(int)TypeCode.Decimal])) + return value.ToDecimal(provider); + if (ReferenceEquals(targetType, ConvertTypes[(int)TypeCode.DateTime])) + return value.ToDateTime(provider); + if (ReferenceEquals(targetType, ConvertTypes[(int)TypeCode.String])) + return value.ToString(provider); + if (ReferenceEquals(targetType, ConvertTypes[(int)TypeCode.Object])) + return (Object)value; + // Need to special case Enum because typecode will be underlying type, e.g. Int32 + if (ReferenceEquals(targetType, EnumType)) + return (Enum)value; + if (ReferenceEquals(targetType, ConvertTypes[(int)TypeCode.DBNull])) + throw new InvalidCastException(SR.InvalidCast_DBNull); + if (ReferenceEquals(targetType, ConvertTypes[(int)TypeCode.Empty])) + throw new InvalidCastException(SR.InvalidCast_Empty); + + throw new InvalidCastException(string.Format(SR.InvalidCast_FromTo, value.GetType().FullName, targetType.FullName)); + } + + public static Object ChangeType(Object value, Type conversionType) + { + return ChangeType(value, conversionType, CultureInfo.CurrentCulture); + } + + public static Object ChangeType(Object value, Type conversionType, IFormatProvider provider) + { + if (ReferenceEquals(conversionType, null)) + { + throw new ArgumentNullException(nameof(conversionType)); + } + + if (value == null) + { + if (conversionType.IsValueType) + { + throw new InvalidCastException(SR.InvalidCast_CannotCastNullToValueType); + } + return null; + } + + IConvertible ic = value as IConvertible; + if (ic == null) + { + if (value.GetType() == conversionType) + { + return value; + } + throw new InvalidCastException(SR.InvalidCast_IConvertible); + } + + if (ReferenceEquals(conversionType, ConvertTypes[(int)TypeCode.Boolean])) + return ic.ToBoolean(provider); + if (ReferenceEquals(conversionType, ConvertTypes[(int)TypeCode.Char])) + return ic.ToChar(provider); + if (ReferenceEquals(conversionType, ConvertTypes[(int)TypeCode.SByte])) + return ic.ToSByte(provider); + if (ReferenceEquals(conversionType, ConvertTypes[(int)TypeCode.Byte])) + return ic.ToByte(provider); + if (ReferenceEquals(conversionType, ConvertTypes[(int)TypeCode.Int16])) + return ic.ToInt16(provider); + if (ReferenceEquals(conversionType, ConvertTypes[(int)TypeCode.UInt16])) + return ic.ToUInt16(provider); + if (ReferenceEquals(conversionType, ConvertTypes[(int)TypeCode.Int32])) + return ic.ToInt32(provider); + if (ReferenceEquals(conversionType, ConvertTypes[(int)TypeCode.UInt32])) + return ic.ToUInt32(provider); + if (ReferenceEquals(conversionType, ConvertTypes[(int)TypeCode.Int64])) + return ic.ToInt64(provider); + if (ReferenceEquals(conversionType, ConvertTypes[(int)TypeCode.UInt64])) + return ic.ToUInt64(provider); + if (ReferenceEquals(conversionType, ConvertTypes[(int)TypeCode.Single])) + return ic.ToSingle(provider); + if (ReferenceEquals(conversionType, ConvertTypes[(int)TypeCode.Double])) + return ic.ToDouble(provider); + if (ReferenceEquals(conversionType, ConvertTypes[(int)TypeCode.Decimal])) + return ic.ToDecimal(provider); + if (ReferenceEquals(conversionType, ConvertTypes[(int)TypeCode.DateTime])) + return ic.ToDateTime(provider); + if (ReferenceEquals(conversionType, ConvertTypes[(int)TypeCode.String])) + return ic.ToString(provider); + if (ReferenceEquals(conversionType, ConvertTypes[(int)TypeCode.Object])) + return (Object)value; + + return ic.ToType(conversionType, provider); + } + + [MethodImpl(MethodImplOptions.NoInlining)] + private static void ThrowCharOverflowException() { throw new OverflowException(SR.Overflow_Char); } + + [MethodImpl(MethodImplOptions.NoInlining)] + private static void ThrowByteOverflowException() { throw new OverflowException(SR.Overflow_Byte); } + + [MethodImpl(MethodImplOptions.NoInlining)] + private static void ThrowSByteOverflowException() { throw new OverflowException(SR.Overflow_SByte); } + + [MethodImpl(MethodImplOptions.NoInlining)] + private static void ThrowInt16OverflowException() { throw new OverflowException(SR.Overflow_Int16); } + + [MethodImpl(MethodImplOptions.NoInlining)] + private static void ThrowUInt16OverflowException() { throw new OverflowException(SR.Overflow_UInt16); } + + [MethodImpl(MethodImplOptions.NoInlining)] + private static void ThrowInt32OverflowException() { throw new OverflowException(SR.Overflow_Int32); } + + [MethodImpl(MethodImplOptions.NoInlining)] + private static void ThrowUInt32OverflowException() { throw new OverflowException(SR.Overflow_UInt32); } + + [MethodImpl(MethodImplOptions.NoInlining)] + private static void ThrowInt64OverflowException() { throw new OverflowException(SR.Overflow_Int64); } + + [MethodImpl(MethodImplOptions.NoInlining)] + private static void ThrowUInt64OverflowException() { throw new OverflowException(SR.Overflow_UInt64); } + + // Conversions to Boolean + public static bool ToBoolean(Object value) + { + return value == null ? false : ((IConvertible)value).ToBoolean(null); + } + + public static bool ToBoolean(Object value, IFormatProvider provider) + { + return value == null ? false : ((IConvertible)value).ToBoolean(provider); + } + + + public static bool ToBoolean(bool value) + { + return value; + } + + [CLSCompliant(false)] + public static bool ToBoolean(sbyte value) + { + return value != 0; + } + + // To be consistent with IConvertible in the base data types else we get different semantics + // with widening operations. Without this operator this widen succeeds,with this API the widening throws. + public static bool ToBoolean(char value) + { + return ((IConvertible)value).ToBoolean(null); + } + + public static bool ToBoolean(byte value) + { + return value != 0; + } + + + public static bool ToBoolean(short value) + { + return value != 0; + } + + [CLSCompliant(false)] + public static bool ToBoolean(ushort value) + { + return value != 0; + } + + public static bool ToBoolean(int value) + { + return value != 0; + } + + [CLSCompliant(false)] + public static bool ToBoolean(uint value) + { + return value != 0; + } + + public static bool ToBoolean(long value) + { + return value != 0; + } + + [CLSCompliant(false)] + public static bool ToBoolean(ulong value) + { + return value != 0; + } + + public static bool ToBoolean(String value) + { + if (value == null) + return false; + return Boolean.Parse(value); + } + + public static bool ToBoolean(String value, IFormatProvider provider) + { + if (value == null) + return false; + return Boolean.Parse(value); + } + + public static bool ToBoolean(float value) + { + return value != 0; + } + + public static bool ToBoolean(double value) + { + return value != 0; + } + + public static bool ToBoolean(decimal value) + { + return value != 0; + } + + public static bool ToBoolean(DateTime value) + { + return ((IConvertible)value).ToBoolean(null); + } + + // Disallowed conversions to Boolean + // public static bool ToBoolean(TimeSpan value) + + // Conversions to Char + + + public static char ToChar(object value) + { + return value == null ? (char)0 : ((IConvertible)value).ToChar(null); + } + + public static char ToChar(object value, IFormatProvider provider) + { + return value == null ? (char)0 : ((IConvertible)value).ToChar(provider); + } + + public static char ToChar(bool value) + { + return ((IConvertible)value).ToChar(null); + } + + public static char ToChar(char value) + { + return value; + } + + [CLSCompliant(false)] + public static char ToChar(sbyte value) + { + if (value < 0) ThrowCharOverflowException(); + return (char)value; + } + + public static char ToChar(byte value) + { + return (char)value; + } + + public static char ToChar(short value) + { + if (value < 0) ThrowCharOverflowException(); + return (char)value; + } + + [CLSCompliant(false)] + public static char ToChar(ushort value) + { + return (char)value; + } + + public static char ToChar(int value) + { + if (value < 0 || value > Char.MaxValue) ThrowCharOverflowException(); + return (char)value; + } + + [CLSCompliant(false)] + public static char ToChar(uint value) + { + if (value > Char.MaxValue) ThrowCharOverflowException(); + return (char)value; + } + + public static char ToChar(long value) + { + if (value < 0 || value > Char.MaxValue) ThrowCharOverflowException(); + return (char)value; + } + + [CLSCompliant(false)] + public static char ToChar(ulong value) + { + if (value > Char.MaxValue) ThrowCharOverflowException(); + return (char)value; + } + + // + // @VariantSwitch + // Remove FormatExceptions; + // + public static char ToChar(String value) + { + return ToChar(value, null); + } + + public static char ToChar(String value, IFormatProvider provider) + { + if (value == null) + throw new ArgumentNullException(nameof(value)); + + if (value.Length != 1) + throw new FormatException(SR.Format_NeedSingleChar); + + return value[0]; + } + + // To be consistent with IConvertible in the base data types else we get different semantics + // with widening operations. Without this operator this widen succeeds,with this API the widening throws. + public static char ToChar(float value) + { + return ((IConvertible)value).ToChar(null); + } + + // To be consistent with IConvertible in the base data types else we get different semantics + // with widening operations. Without this operator this widen succeeds,with this API the widening throws. + public static char ToChar(double value) + { + return ((IConvertible)value).ToChar(null); + } + + // To be consistent with IConvertible in the base data types else we get different semantics + // with widening operations. Without this operator this widen succeeds,with this API the widening throws. + public static char ToChar(decimal value) + { + return ((IConvertible)value).ToChar(null); + } + + public static char ToChar(DateTime value) + { + return ((IConvertible)value).ToChar(null); + } + + + // Disallowed conversions to Char + // public static char ToChar(TimeSpan value) + + // Conversions to SByte + + [CLSCompliant(false)] + public static sbyte ToSByte(object value) + { + return value == null ? (sbyte)0 : ((IConvertible)value).ToSByte(null); + } + + [CLSCompliant(false)] + public static sbyte ToSByte(object value, IFormatProvider provider) + { + return value == null ? (sbyte)0 : ((IConvertible)value).ToSByte(provider); + } + + [CLSCompliant(false)] + public static sbyte ToSByte(bool value) + { + return value ? (sbyte)Boolean.True : (sbyte)Boolean.False; + } + + [CLSCompliant(false)] + public static sbyte ToSByte(sbyte value) + { + return value; + } + + [CLSCompliant(false)] + public static sbyte ToSByte(char value) + { + if (value > SByte.MaxValue) ThrowSByteOverflowException(); + return (sbyte)value; + } + + [CLSCompliant(false)] + public static sbyte ToSByte(byte value) + { + if (value > SByte.MaxValue) ThrowSByteOverflowException(); + return (sbyte)value; + } + + [CLSCompliant(false)] + public static sbyte ToSByte(short value) + { + if (value < SByte.MinValue || value > SByte.MaxValue) ThrowSByteOverflowException(); + return (sbyte)value; + } + + [CLSCompliant(false)] + public static sbyte ToSByte(ushort value) + { + if (value > SByte.MaxValue) ThrowSByteOverflowException(); + return (sbyte)value; + } + + [CLSCompliant(false)] + public static sbyte ToSByte(int value) + { + if (value < SByte.MinValue || value > SByte.MaxValue) ThrowSByteOverflowException(); + return (sbyte)value; + } + + [CLSCompliant(false)] + public static sbyte ToSByte(uint value) + { + if (value > SByte.MaxValue) ThrowSByteOverflowException(); + return (sbyte)value; + } + + [CLSCompliant(false)] + public static sbyte ToSByte(long value) + { + if (value < SByte.MinValue || value > SByte.MaxValue) ThrowSByteOverflowException(); + return (sbyte)value; + } + + [CLSCompliant(false)] + public static sbyte ToSByte(ulong value) + { + if (value > (ulong)SByte.MaxValue) ThrowSByteOverflowException(); + return (sbyte)value; + } + + [CLSCompliant(false)] + public static sbyte ToSByte(float value) + { + return ToSByte((double)value); + } + + [CLSCompliant(false)] + public static sbyte ToSByte(double value) + { + return ToSByte(ToInt32(value)); + } + + [CLSCompliant(false)] + public static sbyte ToSByte(decimal value) + { + return Decimal.ToSByte(Decimal.Round(value, 0)); + } + + [CLSCompliant(false)] + public static sbyte ToSByte(String value) + { + if (value == null) + return 0; + return SByte.Parse(value, CultureInfo.CurrentCulture); + } + + [CLSCompliant(false)] + public static sbyte ToSByte(String value, IFormatProvider provider) + { + return SByte.Parse(value, NumberStyles.Integer, provider); + } + + [CLSCompliant(false)] + public static sbyte ToSByte(DateTime value) + { + return ((IConvertible)value).ToSByte(null); + } + + // Disallowed conversions to SByte + // public static sbyte ToSByte(TimeSpan value) + + // Conversions to Byte + + public static byte ToByte(object value) + { + return value == null ? (byte)0 : ((IConvertible)value).ToByte(null); + } + + public static byte ToByte(object value, IFormatProvider provider) + { + return value == null ? (byte)0 : ((IConvertible)value).ToByte(provider); + } + + public static byte ToByte(bool value) + { + return value ? (byte)Boolean.True : (byte)Boolean.False; + } + + public static byte ToByte(byte value) + { + return value; + } + + public static byte ToByte(char value) + { + if (value > Byte.MaxValue) ThrowByteOverflowException(); + return (byte)value; + } + + [CLSCompliant(false)] + public static byte ToByte(sbyte value) + { + if (value < Byte.MinValue) ThrowByteOverflowException(); + return (byte)value; + } + + public static byte ToByte(short value) + { + if (value < Byte.MinValue || value > Byte.MaxValue) ThrowByteOverflowException(); + return (byte)value; + } + + [CLSCompliant(false)] + public static byte ToByte(ushort value) + { + if (value > Byte.MaxValue) ThrowByteOverflowException(); + return (byte)value; + } + + public static byte ToByte(int value) + { + if (value < Byte.MinValue || value > Byte.MaxValue) ThrowByteOverflowException(); + return (byte)value; + } + + [CLSCompliant(false)] + public static byte ToByte(uint value) + { + if (value > Byte.MaxValue) ThrowByteOverflowException(); + return (byte)value; + } + + public static byte ToByte(long value) + { + if (value < Byte.MinValue || value > Byte.MaxValue) ThrowByteOverflowException(); + return (byte)value; + } + + [CLSCompliant(false)] + public static byte ToByte(ulong value) + { + if (value > Byte.MaxValue) ThrowByteOverflowException(); + return (byte)value; + } + + public static byte ToByte(float value) + { + return ToByte((double)value); + } + + public static byte ToByte(double value) + { + return ToByte(ToInt32(value)); + } + + public static byte ToByte(decimal value) + { + return Decimal.ToByte(Decimal.Round(value, 0)); + } + + public static byte ToByte(String value) + { + if (value == null) + return 0; + return Byte.Parse(value, CultureInfo.CurrentCulture); + } + + public static byte ToByte(String value, IFormatProvider provider) + { + if (value == null) + return 0; + return Byte.Parse(value, NumberStyles.Integer, provider); + } + + public static byte ToByte(DateTime value) + { + return ((IConvertible)value).ToByte(null); + } + + + // Disallowed conversions to Byte + // public static byte ToByte(TimeSpan value) + + // Conversions to Int16 + + public static short ToInt16(object value) + { + return value == null ? (short)0 : ((IConvertible)value).ToInt16(null); + } + + public static short ToInt16(object value, IFormatProvider provider) + { + return value == null ? (short)0 : ((IConvertible)value).ToInt16(provider); + } + + public static short ToInt16(bool value) + { + return value ? (short)Boolean.True : (short)Boolean.False; + } + + public static short ToInt16(char value) + { + if (value > Int16.MaxValue) ThrowInt16OverflowException(); + return (short)value; + } + + [CLSCompliant(false)] + public static short ToInt16(sbyte value) + { + return value; + } + + public static short ToInt16(byte value) + { + return value; + } + + [CLSCompliant(false)] + public static short ToInt16(ushort value) + { + if (value > Int16.MaxValue) ThrowInt16OverflowException(); + return (short)value; + } + + public static short ToInt16(int value) + { + if (value < Int16.MinValue || value > Int16.MaxValue) ThrowInt16OverflowException(); + return (short)value; + } + + [CLSCompliant(false)] + public static short ToInt16(uint value) + { + if (value > Int16.MaxValue) ThrowInt16OverflowException(); + return (short)value; + } + + public static short ToInt16(short value) + { + return value; + } + + public static short ToInt16(long value) + { + if (value < Int16.MinValue || value > Int16.MaxValue) ThrowInt16OverflowException(); + return (short)value; + } + + [CLSCompliant(false)] + public static short ToInt16(ulong value) + { + if (value > (ulong)Int16.MaxValue) ThrowInt16OverflowException(); + return (short)value; + } + + public static short ToInt16(float value) + { + return ToInt16((double)value); + } + + public static short ToInt16(double value) + { + return ToInt16(ToInt32(value)); + } + + public static short ToInt16(decimal value) + { + return Decimal.ToInt16(Decimal.Round(value, 0)); + } + + public static short ToInt16(String value) + { + if (value == null) + return 0; + return Int16.Parse(value, CultureInfo.CurrentCulture); + } + + public static short ToInt16(String value, IFormatProvider provider) + { + if (value == null) + return 0; + return Int16.Parse(value, NumberStyles.Integer, provider); + } + + public static short ToInt16(DateTime value) + { + return ((IConvertible)value).ToInt16(null); + } + + + // Disallowed conversions to Int16 + // public static short ToInt16(TimeSpan value) + + // Conversions to UInt16 + + [CLSCompliant(false)] + public static ushort ToUInt16(object value) + { + return value == null ? (ushort)0 : ((IConvertible)value).ToUInt16(null); + } + + [CLSCompliant(false)] + public static ushort ToUInt16(object value, IFormatProvider provider) + { + return value == null ? (ushort)0 : ((IConvertible)value).ToUInt16(provider); + } + + + [CLSCompliant(false)] + public static ushort ToUInt16(bool value) + { + return value ? (ushort)Boolean.True : (ushort)Boolean.False; + } + + [CLSCompliant(false)] + public static ushort ToUInt16(char value) + { + return value; + } + + [CLSCompliant(false)] + public static ushort ToUInt16(sbyte value) + { + if (value < 0) ThrowUInt16OverflowException(); + return (ushort)value; + } + + [CLSCompliant(false)] + public static ushort ToUInt16(byte value) + { + return value; + } + + [CLSCompliant(false)] + public static ushort ToUInt16(short value) + { + if (value < 0) ThrowUInt16OverflowException(); + return (ushort)value; + } + + [CLSCompliant(false)] + public static ushort ToUInt16(int value) + { + if (value < 0 || value > UInt16.MaxValue) ThrowUInt16OverflowException(); + return (ushort)value; + } + + [CLSCompliant(false)] + public static ushort ToUInt16(ushort value) + { + return value; + } + + [CLSCompliant(false)] + public static ushort ToUInt16(uint value) + { + if (value > UInt16.MaxValue) ThrowUInt16OverflowException(); + return (ushort)value; + } + + + [CLSCompliant(false)] + public static ushort ToUInt16(long value) + { + if (value < 0 || value > UInt16.MaxValue) ThrowUInt16OverflowException(); + return (ushort)value; + } + + [CLSCompliant(false)] + public static ushort ToUInt16(ulong value) + { + if (value > UInt16.MaxValue) ThrowUInt16OverflowException(); + return (ushort)value; + } + + [CLSCompliant(false)] + public static ushort ToUInt16(float value) + { + return ToUInt16((double)value); + } + + [CLSCompliant(false)] + public static ushort ToUInt16(double value) + { + return ToUInt16(ToInt32(value)); + } + + [CLSCompliant(false)] + public static ushort ToUInt16(decimal value) + { + return Decimal.ToUInt16(Decimal.Round(value, 0)); + } + + [CLSCompliant(false)] + public static ushort ToUInt16(String value) + { + if (value == null) + return 0; + return UInt16.Parse(value, CultureInfo.CurrentCulture); + } + + [CLSCompliant(false)] + public static ushort ToUInt16(String value, IFormatProvider provider) + { + if (value == null) + return 0; + return UInt16.Parse(value, NumberStyles.Integer, provider); + } + + [CLSCompliant(false)] + public static ushort ToUInt16(DateTime value) + { + return ((IConvertible)value).ToUInt16(null); + } + + // Disallowed conversions to UInt16 + // public static ushort ToUInt16(TimeSpan value) + + // Conversions to Int32 + + public static int ToInt32(object value) + { + return value == null ? 0 : ((IConvertible)value).ToInt32(null); + } + + public static int ToInt32(object value, IFormatProvider provider) + { + return value == null ? 0 : ((IConvertible)value).ToInt32(provider); + } + + + public static int ToInt32(bool value) + { + return value ? Boolean.True : Boolean.False; + } + + public static int ToInt32(char value) + { + return value; + } + + [CLSCompliant(false)] + public static int ToInt32(sbyte value) + { + return value; + } + + public static int ToInt32(byte value) + { + return value; + } + + public static int ToInt32(short value) + { + return value; + } + + [CLSCompliant(false)] + public static int ToInt32(ushort value) + { + return value; + } + + [CLSCompliant(false)] + public static int ToInt32(uint value) + { + if (value > Int32.MaxValue) ThrowInt32OverflowException(); + return (int)value; + } + + public static int ToInt32(int value) + { + return value; + } + + public static int ToInt32(long value) + { + if (value < Int32.MinValue || value > Int32.MaxValue) ThrowInt32OverflowException(); + return (int)value; + } + + [CLSCompliant(false)] + public static int ToInt32(ulong value) + { + if (value > Int32.MaxValue) ThrowInt32OverflowException(); + return (int)value; + } + + public static int ToInt32(float value) + { + return ToInt32((double)value); + } + + public static int ToInt32(double value) + { + if (value >= 0) + { + if (value < 2147483647.5) + { + int result = (int)value; + double dif = value - result; + if (dif > 0.5 || dif == 0.5 && (result & 1) != 0) result++; + return result; + } + } + else + { + if (value >= -2147483648.5) + { + int result = (int)value; + double dif = value - result; + if (dif < -0.5 || dif == -0.5 && (result & 1) != 0) result--; + return result; + } + } + throw new OverflowException(SR.Overflow_Int32); + } + + public static int ToInt32(decimal value) + { + return Decimal.ToInt32(Decimal.Round(value, 0)); + } + + public static int ToInt32(String value) + { + if (value == null) + return 0; + return Int32.Parse(value, CultureInfo.CurrentCulture); + } + + public static int ToInt32(String value, IFormatProvider provider) + { + if (value == null) + return 0; + return Int32.Parse(value, NumberStyles.Integer, provider); + } + + public static int ToInt32(DateTime value) + { + return ((IConvertible)value).ToInt32(null); + } + + + // Disallowed conversions to Int32 + // public static int ToInt32(TimeSpan value) + + // Conversions to UInt32 + + [CLSCompliant(false)] + public static uint ToUInt32(object value) + { + return value == null ? 0 : ((IConvertible)value).ToUInt32(null); + } + + [CLSCompliant(false)] + public static uint ToUInt32(object value, IFormatProvider provider) + { + return value == null ? 0 : ((IConvertible)value).ToUInt32(provider); + } + + + [CLSCompliant(false)] + public static uint ToUInt32(bool value) + { + return value ? (uint)Boolean.True : (uint)Boolean.False; + } + + [CLSCompliant(false)] + public static uint ToUInt32(char value) + { + return value; + } + + [CLSCompliant(false)] + public static uint ToUInt32(sbyte value) + { + if (value < 0) ThrowUInt32OverflowException(); + return (uint)value; + } + + [CLSCompliant(false)] + public static uint ToUInt32(byte value) + { + return value; + } + + [CLSCompliant(false)] + public static uint ToUInt32(short value) + { + if (value < 0) ThrowUInt32OverflowException(); + return (uint)value; + } + + [CLSCompliant(false)] + public static uint ToUInt32(ushort value) + { + return value; + } + + [CLSCompliant(false)] + public static uint ToUInt32(int value) + { + if (value < 0) ThrowUInt32OverflowException(); + return (uint)value; + } + + [CLSCompliant(false)] + public static uint ToUInt32(uint value) + { + return value; + } + + [CLSCompliant(false)] + public static uint ToUInt32(long value) + { + if (value < 0 || value > UInt32.MaxValue) ThrowUInt32OverflowException(); + return (uint)value; + } + + [CLSCompliant(false)] + public static uint ToUInt32(ulong value) + { + if (value > UInt32.MaxValue) ThrowUInt32OverflowException(); + return (uint)value; + } + + [CLSCompliant(false)] + public static uint ToUInt32(float value) + { + return ToUInt32((double)value); + } + + [CLSCompliant(false)] + public static uint ToUInt32(double value) + { + if (value >= -0.5 && value < 4294967295.5) + { + uint result = (uint)value; + double dif = value - result; + if (dif > 0.5 || dif == 0.5 && (result & 1) != 0) result++; + return result; + } + throw new OverflowException(SR.Overflow_UInt32); + } + + [CLSCompliant(false)] + public static uint ToUInt32(decimal value) + { + return Decimal.ToUInt32(Decimal.Round(value, 0)); + } + + [CLSCompliant(false)] + public static uint ToUInt32(String value) + { + if (value == null) + return 0; + return UInt32.Parse(value, CultureInfo.CurrentCulture); + } + + [CLSCompliant(false)] + public static uint ToUInt32(String value, IFormatProvider provider) + { + if (value == null) + return 0; + return UInt32.Parse(value, NumberStyles.Integer, provider); + } + + [CLSCompliant(false)] + public static uint ToUInt32(DateTime value) + { + return ((IConvertible)value).ToUInt32(null); + } + + // Disallowed conversions to UInt32 + // public static uint ToUInt32(TimeSpan value) + + // Conversions to Int64 + + public static long ToInt64(object value) + { + return value == null ? 0 : ((IConvertible)value).ToInt64(null); + } + + public static long ToInt64(object value, IFormatProvider provider) + { + return value == null ? 0 : ((IConvertible)value).ToInt64(provider); + } + + + public static long ToInt64(bool value) + { + return value ? Boolean.True : Boolean.False; + } + + public static long ToInt64(char value) + { + return value; + } + + [CLSCompliant(false)] + public static long ToInt64(sbyte value) + { + return value; + } + + public static long ToInt64(byte value) + { + return value; + } + + public static long ToInt64(short value) + { + return value; + } + + [CLSCompliant(false)] + public static long ToInt64(ushort value) + { + return value; + } + + public static long ToInt64(int value) + { + return value; + } + + [CLSCompliant(false)] + public static long ToInt64(uint value) + { + return value; + } + + [CLSCompliant(false)] + public static long ToInt64(ulong value) + { + if (value > Int64.MaxValue) ThrowInt64OverflowException(); + return (long)value; + } + + public static long ToInt64(long value) + { + return value; + } + + + public static long ToInt64(float value) + { + return ToInt64((double)value); + } + + public static long ToInt64(double value) + { + return checked((long)Math.Round(value)); + } + + public static long ToInt64(decimal value) + { + return Decimal.ToInt64(Decimal.Round(value, 0)); + } + + public static long ToInt64(string value) + { + if (value == null) + return 0; + return Int64.Parse(value, CultureInfo.CurrentCulture); + } + + public static long ToInt64(String value, IFormatProvider provider) + { + if (value == null) + return 0; + return Int64.Parse(value, NumberStyles.Integer, provider); + } + + public static long ToInt64(DateTime value) + { + return ((IConvertible)value).ToInt64(null); + } + + // Disallowed conversions to Int64 + // public static long ToInt64(TimeSpan value) + + // Conversions to UInt64 + + [CLSCompliant(false)] + public static ulong ToUInt64(object value) + { + return value == null ? 0 : ((IConvertible)value).ToUInt64(null); + } + + [CLSCompliant(false)] + public static ulong ToUInt64(object value, IFormatProvider provider) + { + return value == null ? 0 : ((IConvertible)value).ToUInt64(provider); + } + + [CLSCompliant(false)] + public static ulong ToUInt64(bool value) + { + return value ? (ulong)Boolean.True : (ulong)Boolean.False; + } + + [CLSCompliant(false)] + public static ulong ToUInt64(char value) + { + return value; + } + + + [CLSCompliant(false)] + public static ulong ToUInt64(sbyte value) + { + if (value < 0) ThrowUInt64OverflowException(); + return (ulong)value; + } + + [CLSCompliant(false)] + public static ulong ToUInt64(byte value) + { + return value; + } + + [CLSCompliant(false)] + public static ulong ToUInt64(short value) + { + if (value < 0) ThrowUInt64OverflowException(); + return (ulong)value; + } + + [CLSCompliant(false)] + public static ulong ToUInt64(ushort value) + { + return value; + } + + [CLSCompliant(false)] + public static ulong ToUInt64(int value) + { + if (value < 0) ThrowUInt64OverflowException(); + return (ulong)value; + } + + [CLSCompliant(false)] + public static ulong ToUInt64(uint value) + { + return value; + } + + [CLSCompliant(false)] + public static ulong ToUInt64(long value) + { + if (value < 0) ThrowUInt64OverflowException(); + return (ulong)value; + } + + [CLSCompliant(false)] + public static ulong ToUInt64(UInt64 value) + { + return value; + } + + [CLSCompliant(false)] + public static ulong ToUInt64(float value) + { + return ToUInt64((double)value); + } + + [CLSCompliant(false)] + public static ulong ToUInt64(double value) + { + return checked((ulong)Math.Round(value)); + } + + [CLSCompliant(false)] + public static ulong ToUInt64(decimal value) + { + return Decimal.ToUInt64(Decimal.Round(value, 0)); + } + + [CLSCompliant(false)] + public static ulong ToUInt64(String value) + { + if (value == null) + return 0; + return UInt64.Parse(value, CultureInfo.CurrentCulture); + } + + [CLSCompliant(false)] + public static ulong ToUInt64(String value, IFormatProvider provider) + { + if (value == null) + return 0; + return UInt64.Parse(value, NumberStyles.Integer, provider); + } + + [CLSCompliant(false)] + public static ulong ToUInt64(DateTime value) + { + return ((IConvertible)value).ToUInt64(null); + } + + // Disallowed conversions to UInt64 + // public static ulong ToUInt64(TimeSpan value) + + // Conversions to Single + + public static float ToSingle(object value) + { + return value == null ? 0 : ((IConvertible)value).ToSingle(null); + } + + public static float ToSingle(object value, IFormatProvider provider) + { + return value == null ? 0 : ((IConvertible)value).ToSingle(provider); + } + + [CLSCompliant(false)] + public static float ToSingle(sbyte value) + { + return value; + } + + public static float ToSingle(byte value) + { + return value; + } + + public static float ToSingle(char value) + { + return ((IConvertible)value).ToSingle(null); + } + + public static float ToSingle(short value) + { + return value; + } + + [CLSCompliant(false)] + public static float ToSingle(ushort value) + { + return value; + } + + public static float ToSingle(int value) + { + return value; + } + + [CLSCompliant(false)] + public static float ToSingle(uint value) + { + return value; + } + + public static float ToSingle(long value) + { + return value; + } + + [CLSCompliant(false)] + public static float ToSingle(ulong value) + { + return value; + } + + public static float ToSingle(float value) + { + return value; + } + + public static float ToSingle(double value) + { + return (float)value; + } + + public static float ToSingle(decimal value) + { + return (float)value; + } + + public static float ToSingle(String value) + { + if (value == null) + return 0; + return Single.Parse(value, CultureInfo.CurrentCulture); + } + + public static float ToSingle(String value, IFormatProvider provider) + { + if (value == null) + return 0; + return Single.Parse(value, NumberStyles.Float | NumberStyles.AllowThousands, provider); + } + + + public static float ToSingle(bool value) + { + return value ? Boolean.True : Boolean.False; + } + + public static float ToSingle(DateTime value) + { + return ((IConvertible)value).ToSingle(null); + } + + // Disallowed conversions to Single + // public static float ToSingle(TimeSpan value) + + // Conversions to Double + + public static double ToDouble(object value) + { + return value == null ? 0 : ((IConvertible)value).ToDouble(null); + } + + public static double ToDouble(object value, IFormatProvider provider) + { + return value == null ? 0 : ((IConvertible)value).ToDouble(provider); + } + + + [CLSCompliant(false)] + public static double ToDouble(sbyte value) + { + return value; + } + + public static double ToDouble(byte value) + { + return value; + } + + public static double ToDouble(short value) + { + return value; + } + + public static double ToDouble(char value) + { + return ((IConvertible)value).ToDouble(null); + } + + [CLSCompliant(false)] + public static double ToDouble(ushort value) + { + return value; + } + + public static double ToDouble(int value) + { + return value; + } + + [CLSCompliant(false)] + public static double ToDouble(uint value) + { + return value; + } + + public static double ToDouble(long value) + { + return value; + } + + [CLSCompliant(false)] + public static double ToDouble(ulong value) + { + return value; + } + + public static double ToDouble(float value) + { + return value; + } + + public static double ToDouble(double value) + { + return value; + } + + public static double ToDouble(decimal value) + { + return (double)value; + } + + public static double ToDouble(String value) + { + if (value == null) + return 0; + return Double.Parse(value, CultureInfo.CurrentCulture); + } + + public static double ToDouble(String value, IFormatProvider provider) + { + if (value == null) + return 0; + return Double.Parse(value, NumberStyles.Float | NumberStyles.AllowThousands, provider); + } + + public static double ToDouble(bool value) + { + return value ? Boolean.True : Boolean.False; + } + + public static double ToDouble(DateTime value) + { + return ((IConvertible)value).ToDouble(null); + } + + // Disallowed conversions to Double + // public static double ToDouble(TimeSpan value) + + // Conversions to Decimal + + public static decimal ToDecimal(object value) + { + return value == null ? 0 : ((IConvertible)value).ToDecimal(null); + } + + public static decimal ToDecimal(object value, IFormatProvider provider) + { + return value == null ? 0 : ((IConvertible)value).ToDecimal(provider); + } + + [CLSCompliant(false)] + public static decimal ToDecimal(sbyte value) + { + return value; + } + + public static decimal ToDecimal(byte value) + { + return value; + } + + public static decimal ToDecimal(char value) + { + return ((IConvertible)value).ToDecimal(null); + } + + public static decimal ToDecimal(short value) + { + return value; + } + + [CLSCompliant(false)] + public static decimal ToDecimal(ushort value) + { + return value; + } + + public static decimal ToDecimal(int value) + { + return value; + } + + [CLSCompliant(false)] + public static decimal ToDecimal(uint value) + { + return value; + } + + public static decimal ToDecimal(long value) + { + return value; + } + + [CLSCompliant(false)] + public static decimal ToDecimal(ulong value) + { + return value; + } + + public static decimal ToDecimal(float value) + { + return (decimal)value; + } + + public static decimal ToDecimal(double value) + { + return (decimal)value; + } + + public static decimal ToDecimal(String value) + { + if (value == null) + return 0m; + return Decimal.Parse(value, CultureInfo.CurrentCulture); + } + + public static Decimal ToDecimal(String value, IFormatProvider provider) + { + if (value == null) + return 0m; + return Decimal.Parse(value, NumberStyles.Number, provider); + } + + public static decimal ToDecimal(decimal value) + { + return value; + } + + public static decimal ToDecimal(bool value) + { + return value ? Boolean.True : Boolean.False; + } + + public static decimal ToDecimal(DateTime value) + { + return ((IConvertible)value).ToDecimal(null); + } + + // Disallowed conversions to Decimal + // public static decimal ToDecimal(TimeSpan value) + + // Conversions to DateTime + + public static DateTime ToDateTime(DateTime value) + { + return value; + } + + public static DateTime ToDateTime(object value) + { + return value == null ? DateTime.MinValue : ((IConvertible)value).ToDateTime(null); + } + + public static DateTime ToDateTime(object value, IFormatProvider provider) + { + return value == null ? DateTime.MinValue : ((IConvertible)value).ToDateTime(provider); + } + + public static DateTime ToDateTime(String value) + { + if (value == null) + return new DateTime(0); + return DateTime.Parse(value, CultureInfo.CurrentCulture); + } + + public static DateTime ToDateTime(String value, IFormatProvider provider) + { + if (value == null) + return new DateTime(0); + return DateTime.Parse(value, provider); + } + + [CLSCompliant(false)] + public static DateTime ToDateTime(sbyte value) + { + return ((IConvertible)value).ToDateTime(null); + } + + public static DateTime ToDateTime(byte value) + { + return ((IConvertible)value).ToDateTime(null); + } + + public static DateTime ToDateTime(short value) + { + return ((IConvertible)value).ToDateTime(null); + } + + [CLSCompliant(false)] + public static DateTime ToDateTime(ushort value) + { + return ((IConvertible)value).ToDateTime(null); + } + + public static DateTime ToDateTime(int value) + { + return ((IConvertible)value).ToDateTime(null); + } + + [CLSCompliant(false)] + public static DateTime ToDateTime(uint value) + { + return ((IConvertible)value).ToDateTime(null); + } + + public static DateTime ToDateTime(long value) + { + return ((IConvertible)value).ToDateTime(null); + } + + [CLSCompliant(false)] + public static DateTime ToDateTime(ulong value) + { + return ((IConvertible)value).ToDateTime(null); + } + + public static DateTime ToDateTime(bool value) + { + return ((IConvertible)value).ToDateTime(null); + } + + public static DateTime ToDateTime(char value) + { + return ((IConvertible)value).ToDateTime(null); + } + + public static DateTime ToDateTime(float value) + { + return ((IConvertible)value).ToDateTime(null); + } + + public static DateTime ToDateTime(double value) + { + return ((IConvertible)value).ToDateTime(null); + } + + public static DateTime ToDateTime(decimal value) + { + return ((IConvertible)value).ToDateTime(null); + } + + // Disallowed conversions to DateTime + // public static DateTime ToDateTime(TimeSpan value) + + // Conversions to String + + public static string ToString(Object value) + { + return ToString(value, null); + } + + public static string ToString(Object value, IFormatProvider provider) + { + IConvertible ic = value as IConvertible; + if (ic != null) + return ic.ToString(provider); + IFormattable formattable = value as IFormattable; + if (formattable != null) + return formattable.ToString(null, provider); + return value == null ? String.Empty : value.ToString(); + } + + public static string ToString(bool value) + { + return value.ToString(); + } + + public static string ToString(bool value, IFormatProvider provider) + { + return value.ToString(); + } + + public static string ToString(char value) + { + return Char.ToString(value); + } + + public static string ToString(char value, IFormatProvider provider) + { + return value.ToString(); + } + + [CLSCompliant(false)] + public static string ToString(sbyte value) + { + return value.ToString(CultureInfo.CurrentCulture); + } + + [CLSCompliant(false)] + public static string ToString(sbyte value, IFormatProvider provider) + { + return value.ToString(provider); + } + + public static string ToString(byte value) + { + return value.ToString(CultureInfo.CurrentCulture); + } + + public static string ToString(byte value, IFormatProvider provider) + { + return value.ToString(provider); + } + + public static string ToString(short value) + { + return value.ToString(CultureInfo.CurrentCulture); + } + + public static string ToString(short value, IFormatProvider provider) + { + return value.ToString(provider); + } + + [CLSCompliant(false)] + public static string ToString(ushort value) + { + return value.ToString(CultureInfo.CurrentCulture); + } + + [CLSCompliant(false)] + public static string ToString(ushort value, IFormatProvider provider) + { + return value.ToString(provider); + } + + public static string ToString(int value) + { + return value.ToString(CultureInfo.CurrentCulture); + } + + public static string ToString(int value, IFormatProvider provider) + { + return value.ToString(provider); + } + + [CLSCompliant(false)] + public static string ToString(uint value) + { + return value.ToString(CultureInfo.CurrentCulture); + } + + [CLSCompliant(false)] + public static string ToString(uint value, IFormatProvider provider) + { + return value.ToString(provider); + } + + public static string ToString(long value) + { + return value.ToString(CultureInfo.CurrentCulture); + } + + public static string ToString(long value, IFormatProvider provider) + { + return value.ToString(provider); + } + + [CLSCompliant(false)] + public static string ToString(ulong value) + { + return value.ToString(CultureInfo.CurrentCulture); + } + + [CLSCompliant(false)] + public static string ToString(ulong value, IFormatProvider provider) + { + return value.ToString(provider); + } + + public static string ToString(float value) + { + return value.ToString(CultureInfo.CurrentCulture); + } + + public static string ToString(float value, IFormatProvider provider) + { + return value.ToString(provider); + } + + public static string ToString(double value) + { + return value.ToString(CultureInfo.CurrentCulture); + } + + public static string ToString(double value, IFormatProvider provider) + { + return value.ToString(provider); + } + + public static string ToString(decimal value) + { + return value.ToString(CultureInfo.CurrentCulture); + } + + public static string ToString(Decimal value, IFormatProvider provider) + { + return value.ToString(provider); + } + + public static string ToString(DateTime value) + { + return value.ToString(); + } + + public static string ToString(DateTime value, IFormatProvider provider) + { + return value.ToString(provider); + } + + public static String ToString(String value) + { + return value; + } + + public static String ToString(String value, IFormatProvider provider) + { + return value; // avoid the null check + } + + + // + // Conversions which understand Base XXX numbers. + // + // Parses value in base base. base can only + // be 2, 8, 10, or 16. If base is 16, the number may be preceded + // by 0x; any other leading or trailing characters cause an error. + // + public static byte ToByte(String value, int fromBase) + { + if (fromBase != 2 && fromBase != 8 && fromBase != 10 && fromBase != 16) + { + throw new ArgumentException(SR.Arg_InvalidBase); + } + + if (value == null) + { + return 0; + } + + int r = ParseNumbers.StringToInt(value.AsSpan(), fromBase, ParseNumbers.IsTight | ParseNumbers.TreatAsUnsigned); + if (r < Byte.MinValue || r > Byte.MaxValue) + ThrowByteOverflowException(); + return (byte)r; + } + + // Parses value in base fromBase. fromBase can only + // be 2, 8, 10, or 16. If fromBase is 16, the number may be preceded + // by 0x; any other leading or trailing characters cause an error. + // + [CLSCompliant(false)] + public static sbyte ToSByte(String value, int fromBase) + { + if (fromBase != 2 && fromBase != 8 && fromBase != 10 && fromBase != 16) + { + throw new ArgumentException(SR.Arg_InvalidBase); + } + + if (value == null) + { + return 0; + } + + int r = ParseNumbers.StringToInt(value.AsSpan(), fromBase, ParseNumbers.IsTight | ParseNumbers.TreatAsI1); + if (fromBase != 10 && r <= Byte.MaxValue) + return (sbyte)r; + + if (r < SByte.MinValue || r > SByte.MaxValue) + ThrowSByteOverflowException(); + return (sbyte)r; + } + + // Parses value in base fromBase. fromBase can only + // be 2, 8, 10, or 16. If fromBase is 16, the number may be preceded + // by 0x; any other leading or trailing characters cause an error. + // + public static short ToInt16(String value, int fromBase) + { + if (fromBase != 2 && fromBase != 8 && fromBase != 10 && fromBase != 16) + { + throw new ArgumentException(SR.Arg_InvalidBase); + } + + if (value == null) + { + return 0; + } + + int r = ParseNumbers.StringToInt(value.AsSpan(), fromBase, ParseNumbers.IsTight | ParseNumbers.TreatAsI2); + if (fromBase != 10 && r <= UInt16.MaxValue) + return (short)r; + + if (r < Int16.MinValue || r > Int16.MaxValue) + ThrowInt16OverflowException(); + return (short)r; + } + + // Parses value in base fromBase. fromBase can only + // be 2, 8, 10, or 16. If fromBase is 16, the number may be preceded + // by 0x; any other leading or trailing characters cause an error. + // + [CLSCompliant(false)] + public static ushort ToUInt16(String value, int fromBase) + { + if (fromBase != 2 && fromBase != 8 && fromBase != 10 && fromBase != 16) + { + throw new ArgumentException(SR.Arg_InvalidBase); + } + + if (value == null) + { + return 0; + } + + int r = ParseNumbers.StringToInt(value.AsSpan(), fromBase, ParseNumbers.IsTight | ParseNumbers.TreatAsUnsigned); + if (r < UInt16.MinValue || r > UInt16.MaxValue) + ThrowUInt16OverflowException(); + return (ushort)r; + } + + // Parses value in base fromBase. fromBase can only + // be 2, 8, 10, or 16. If fromBase is 16, the number may be preceded + // by 0x; any other leading or trailing characters cause an error. + // + public static int ToInt32(String value, int fromBase) + { + if (fromBase != 2 && fromBase != 8 && fromBase != 10 && fromBase != 16) + { + throw new ArgumentException(SR.Arg_InvalidBase); + } + return value != null ? + ParseNumbers.StringToInt(value.AsSpan(), fromBase, ParseNumbers.IsTight) : + 0; + } + + // Parses value in base fromBase. fromBase can only + // be 2, 8, 10, or 16. If fromBase is 16, the number may be preceded + // by 0x; any other leading or trailing characters cause an error. + // + [CLSCompliant(false)] + public static uint ToUInt32(String value, int fromBase) + { + if (fromBase != 2 && fromBase != 8 && fromBase != 10 && fromBase != 16) + { + throw new ArgumentException(SR.Arg_InvalidBase); + } + return value != null ? + (uint)ParseNumbers.StringToInt(value.AsSpan(), fromBase, ParseNumbers.TreatAsUnsigned | ParseNumbers.IsTight) : + 0; + } + + // Parses value in base fromBase. fromBase can only + // be 2, 8, 10, or 16. If fromBase is 16, the number may be preceded + // by 0x; any other leading or trailing characters cause an error. + // + public static long ToInt64(String value, int fromBase) + { + if (fromBase != 2 && fromBase != 8 && fromBase != 10 && fromBase != 16) + { + throw new ArgumentException(SR.Arg_InvalidBase); + } + return value != null ? + ParseNumbers.StringToLong(value.AsSpan(), fromBase, ParseNumbers.IsTight) : + 0; + } + + // Parses value in base fromBase. fromBase can only + // be 2, 8, 10, or 16. If fromBase is 16, the number may be preceded + // by 0x; any other leading or trailing characters cause an error. + // + [CLSCompliant(false)] + public static ulong ToUInt64(String value, int fromBase) + { + if (fromBase != 2 && fromBase != 8 && fromBase != 10 && fromBase != 16) + { + throw new ArgumentException(SR.Arg_InvalidBase); + } + return value != null ? + (ulong)ParseNumbers.StringToLong(value.AsSpan(), fromBase, ParseNumbers.TreatAsUnsigned | ParseNumbers.IsTight) : + 0; + } + + // Convert the byte value to a string in base fromBase + public static String ToString(byte value, int toBase) + { + if (toBase != 2 && toBase != 8 && toBase != 10 && toBase != 16) + { + throw new ArgumentException(SR.Arg_InvalidBase); + } + return ParseNumbers.IntToString((int)value, toBase, -1, ' ', ParseNumbers.PrintAsI1); + } + + // Convert the Int16 value to a string in base fromBase + public static String ToString(short value, int toBase) + { + if (toBase != 2 && toBase != 8 && toBase != 10 && toBase != 16) + { + throw new ArgumentException(SR.Arg_InvalidBase); + } + return ParseNumbers.IntToString((int)value, toBase, -1, ' ', ParseNumbers.PrintAsI2); + } + + // Convert the Int32 value to a string in base toBase + public static String ToString(int value, int toBase) + { + if (toBase != 2 && toBase != 8 && toBase != 10 && toBase != 16) + { + throw new ArgumentException(SR.Arg_InvalidBase); + } + return ParseNumbers.IntToString(value, toBase, -1, ' ', 0); + } + + // Convert the Int64 value to a string in base toBase + public static String ToString(long value, int toBase) + { + if (toBase != 2 && toBase != 8 && toBase != 10 && toBase != 16) + { + throw new ArgumentException(SR.Arg_InvalidBase); + } + return ParseNumbers.LongToString(value, toBase, -1, ' ', 0); + } + + public static String ToBase64String(byte[] inArray) + { + if (inArray == null) + { + throw new ArgumentNullException(nameof(inArray)); + } + return ToBase64String(new ReadOnlySpan(inArray), Base64FormattingOptions.None); + } + + public static String ToBase64String(byte[] inArray, Base64FormattingOptions options) + { + if (inArray == null) + { + throw new ArgumentNullException(nameof(inArray)); + } + return ToBase64String(new ReadOnlySpan(inArray), options); + } + + public static String ToBase64String(byte[] inArray, int offset, int length) + { + return ToBase64String(inArray, offset, length, Base64FormattingOptions.None); + } + + public static String ToBase64String(byte[] inArray, int offset, int length, Base64FormattingOptions options) + { + if (inArray == null) + throw new ArgumentNullException(nameof(inArray)); + if (length < 0) + throw new ArgumentOutOfRangeException(nameof(length), SR.ArgumentOutOfRange_Index); + if (offset < 0) + throw new ArgumentOutOfRangeException(nameof(offset), SR.ArgumentOutOfRange_GenericPositive); + if (offset > (inArray.Length - length)) + throw new ArgumentOutOfRangeException(nameof(offset), SR.ArgumentOutOfRange_OffsetLength); + + return ToBase64String(new ReadOnlySpan(inArray, offset, length), options); + } + + public static string ToBase64String(ReadOnlySpan bytes, Base64FormattingOptions options = Base64FormattingOptions.None) + { + if (options < Base64FormattingOptions.None || options > Base64FormattingOptions.InsertLineBreaks) + { + throw new ArgumentException(string.Format(SR.Arg_EnumIllegalVal, (int)options), nameof(options)); + } + + if (bytes.Length == 0) + { + return string.Empty; + } + + bool insertLineBreaks = (options == Base64FormattingOptions.InsertLineBreaks); + string result = string.FastAllocateString(ToBase64_CalculateAndValidateOutputLength(bytes.Length, insertLineBreaks)); + + unsafe + { + fixed (byte* bytesPtr = &MemoryMarshal.GetReference(bytes)) + fixed (char* charsPtr = result) + { + int charsWritten = ConvertToBase64Array(charsPtr, bytesPtr, 0, bytes.Length, insertLineBreaks); + Debug.Assert(result.Length == charsWritten, $"Expected {result.Length} == {charsWritten}"); + } + } + + return result; + } + + public static int ToBase64CharArray(byte[] inArray, int offsetIn, int length, char[] outArray, int offsetOut) + { + return ToBase64CharArray(inArray, offsetIn, length, outArray, offsetOut, Base64FormattingOptions.None); + } + + public static unsafe int ToBase64CharArray(byte[] inArray, int offsetIn, int length, char[] outArray, int offsetOut, Base64FormattingOptions options) + { + //Do data verfication + if (inArray == null) + throw new ArgumentNullException(nameof(inArray)); + if (outArray == null) + throw new ArgumentNullException(nameof(outArray)); + if (length < 0) + throw new ArgumentOutOfRangeException(nameof(length), SR.ArgumentOutOfRange_Index); + if (offsetIn < 0) + throw new ArgumentOutOfRangeException(nameof(offsetIn), SR.ArgumentOutOfRange_GenericPositive); + if (offsetOut < 0) + throw new ArgumentOutOfRangeException(nameof(offsetOut), SR.ArgumentOutOfRange_GenericPositive); + + if (options < Base64FormattingOptions.None || options > Base64FormattingOptions.InsertLineBreaks) + { + throw new ArgumentException(string.Format(SR.Arg_EnumIllegalVal, (int)options), nameof(options)); + } + + + int retVal; + + int inArrayLength; + int outArrayLength; + int numElementsToCopy; + + inArrayLength = inArray.Length; + + if (offsetIn > (int)(inArrayLength - length)) + throw new ArgumentOutOfRangeException(nameof(offsetIn), SR.ArgumentOutOfRange_OffsetLength); + + if (inArrayLength == 0) + return 0; + + bool insertLineBreaks = (options == Base64FormattingOptions.InsertLineBreaks); + //This is the maximally required length that must be available in the char array + outArrayLength = outArray.Length; + + // Length of the char buffer required + numElementsToCopy = ToBase64_CalculateAndValidateOutputLength(length, insertLineBreaks); + + if (offsetOut > (int)(outArrayLength - numElementsToCopy)) + throw new ArgumentOutOfRangeException(nameof(offsetOut), SR.ArgumentOutOfRange_OffsetOut); + + fixed (char* outChars = &outArray[offsetOut]) + { + fixed (byte* inData = &inArray[0]) + { + retVal = ConvertToBase64Array(outChars, inData, offsetIn, length, insertLineBreaks); + } + } + + return retVal; + } + + public static unsafe bool TryToBase64Chars(ReadOnlySpan bytes, Span chars, out int charsWritten, Base64FormattingOptions options = Base64FormattingOptions.None) + { + if (options < Base64FormattingOptions.None || options > Base64FormattingOptions.InsertLineBreaks) + { + throw new ArgumentException(string.Format(SR.Arg_EnumIllegalVal, (int)options), nameof(options)); + } + + if (bytes.Length == 0) + { + charsWritten = 0; + return true; + } + + bool insertLineBreaks = (options == Base64FormattingOptions.InsertLineBreaks); + + int charLengthRequired = ToBase64_CalculateAndValidateOutputLength(bytes.Length, insertLineBreaks); + if (charLengthRequired > chars.Length) + { + charsWritten = 0; + return false; + } + + fixed (char* outChars = &MemoryMarshal.GetReference(chars)) + fixed (byte* inData = &MemoryMarshal.GetReference(bytes)) + { + charsWritten = ConvertToBase64Array(outChars, inData, 0, bytes.Length, insertLineBreaks); + return true; + } + } + + private static unsafe int ConvertToBase64Array(char* outChars, byte* inData, int offset, int length, bool insertLineBreaks) + { + int lengthmod3 = length % 3; + int calcLength = offset + (length - lengthmod3); + int j = 0; + int charcount = 0; + //Convert three bytes at a time to base64 notation. This will consume 4 chars. + int i; + + // get a pointer to the base64Table to avoid unnecessary range checking + fixed (char* base64 = &base64Table[0]) + { + for (i = offset; i < calcLength; i += 3) + { + if (insertLineBreaks) + { + if (charcount == base64LineBreakPosition) + { + outChars[j++] = '\r'; + outChars[j++] = '\n'; + charcount = 0; + } + charcount += 4; + } + outChars[j] = base64[(inData[i] & 0xfc) >> 2]; + outChars[j + 1] = base64[((inData[i] & 0x03) << 4) | ((inData[i + 1] & 0xf0) >> 4)]; + outChars[j + 2] = base64[((inData[i + 1] & 0x0f) << 2) | ((inData[i + 2] & 0xc0) >> 6)]; + outChars[j + 3] = base64[(inData[i + 2] & 0x3f)]; + j += 4; + } + + //Where we left off before + i = calcLength; + + if (insertLineBreaks && (lengthmod3 != 0) && (charcount == base64LineBreakPosition)) + { + outChars[j++] = '\r'; + outChars[j++] = '\n'; + } + + switch (lengthmod3) + { + case 2: //One character padding needed + outChars[j] = base64[(inData[i] & 0xfc) >> 2]; + outChars[j + 1] = base64[((inData[i] & 0x03) << 4) | ((inData[i + 1] & 0xf0) >> 4)]; + outChars[j + 2] = base64[(inData[i + 1] & 0x0f) << 2]; + outChars[j + 3] = base64[64]; //Pad + j += 4; + break; + case 1: // Two character padding needed + outChars[j] = base64[(inData[i] & 0xfc) >> 2]; + outChars[j + 1] = base64[(inData[i] & 0x03) << 4]; + outChars[j + 2] = base64[64]; //Pad + outChars[j + 3] = base64[64]; //Pad + j += 4; + break; + } + } + + return j; + } + + private static int ToBase64_CalculateAndValidateOutputLength(int inputLength, bool insertLineBreaks) + { + long outlen = ((long)inputLength) / 3 * 4; // the base length - we want integer division here. + outlen += ((inputLength % 3) != 0) ? 4 : 0; // at most 4 more chars for the remainder + + if (outlen == 0) + return 0; + + if (insertLineBreaks) + { + long newLines = outlen / base64LineBreakPosition; + if ((outlen % base64LineBreakPosition) == 0) + { + --newLines; + } + outlen += newLines * 2; // the number of line break chars we'll add, "\r\n" + } + + // If we overflow an int then we cannot allocate enough + // memory to output the value so throw + if (outlen > int.MaxValue) + throw new OutOfMemoryException(); + + return (int)outlen; + } + + + /// + /// Converts the specified string, which encodes binary data as Base64 digits, to the equivalent byte array. + /// + /// The string to convert + /// The array of bytes represented by the specified Base64 string. + public static Byte[] FromBase64String(String s) + { + // "s" is an unfortunate parameter name, but we need to keep it for backward compat. + + if (s == null) + throw new ArgumentNullException(nameof(s)); + + + unsafe + { + fixed (Char* sPtr = s) + { + return FromBase64CharPtr(sPtr, s.Length); + } + } + } + + public static bool TryFromBase64String(string s, Span bytes, out int bytesWritten) + { + if (s == null) + { + throw new ArgumentNullException(nameof(s)); + } + + return TryFromBase64Chars(s.AsSpan(), bytes, out bytesWritten); + } + + public static bool TryFromBase64Chars(ReadOnlySpan chars, Span bytes, out int bytesWritten) + { + // This is actually local to one of the nested blocks but is being declared at the top as we don't want multiple stackallocs + // for each iteraton of the loop. + Span tempBuffer = stackalloc char[4]; // Note: The tempBuffer size could be made larger than 4 but the size must be a multiple of 4. + + bytesWritten = 0; + + while (chars.Length != 0) + { + // Attempt to decode a segment that doesn't contain whitespace. + bool complete = TryDecodeFromUtf16(chars, bytes, out int consumedInThisIteration, out int bytesWrittenInThisIteration); + bytesWritten += bytesWrittenInThisIteration; + if (complete) + return true; + + chars = chars.Slice(consumedInThisIteration); + bytes = bytes.Slice(bytesWrittenInThisIteration); + + Debug.Assert(chars.Length != 0); // If TryDecodeFromUtf16() consumed the entire buffer, it could not have returned false. + if (chars[0].IsSpace()) + { + // If we got here, the very first character not consumed was a whitespace. We can skip past any consecutive whitespace, then continue decoding. + + int indexOfFirstNonSpace = 1; + for (; ; ) + { + if (indexOfFirstNonSpace == chars.Length) + break; + if (!chars[indexOfFirstNonSpace].IsSpace()) + break; + indexOfFirstNonSpace++; + } + + chars = chars.Slice(indexOfFirstNonSpace); + + if ((bytesWrittenInThisIteration % 3) != 0 && chars.Length != 0) + { + // If we got here, the last successfully decoded block encountered an end-marker, yet we have trailing non-whitespace characters. + // That is not allowed. + bytesWritten = default; + return false; + } + + // We now loop again to decode the next run of non-space characters. + } + else + { + Debug.Assert(chars.Length != 0 && !chars[0].IsSpace()); + + // If we got here, it is possible that there is whitespace that occurred in the middle of a 4-byte chunk. That is, we still have + // up to three Base64 characters that were left undecoded by the fast-path helper because they didn't form a complete 4-byte chunk. + // This is hopefully the rare case (multiline-formatted base64 message with a non-space character width that's not a multiple of 4.) + // We'll filter out whitespace and copy the remaining characters into a temporary buffer. + CopyToTempBufferWithoutWhiteSpace(chars, tempBuffer, out int consumedFromChars, out int charsWritten); + if ((charsWritten & 0x3) != 0) + { + // Even after stripping out whitespace, the number of characters is not divisible by 4. This cannot be a legal Base64 string. + bytesWritten = default; + return false; + } + + tempBuffer = tempBuffer.Slice(0, charsWritten); + if (!TryDecodeFromUtf16(tempBuffer, bytes, out int consumedFromTempBuffer, out int bytesWrittenFromTempBuffer)) + { + bytesWritten = default; + return false; + } + bytesWritten += bytesWrittenFromTempBuffer; + chars = chars.Slice(consumedFromChars); + bytes = bytes.Slice(bytesWrittenFromTempBuffer); + + if ((bytesWrittenFromTempBuffer % 3) != 0) + { + // If we got here, this decode contained one or more padding characters ('='). We can accept trailing whitespace after this + // but nothing else. + for (int i = 0; i < chars.Length; i++) + { + if (!chars[i].IsSpace()) + { + bytesWritten = default; + return false; + } + } + return true; + } + + // We now loop again to decode the next run of non-space characters. + } + } + + return true; + } + + private static void CopyToTempBufferWithoutWhiteSpace(ReadOnlySpan chars, Span tempBuffer, out int consumed, out int charsWritten) + { + Debug.Assert(tempBuffer.Length != 0); // We only bound-check after writing a character to the tempBuffer. + + charsWritten = 0; + for (int i = 0; i < chars.Length; i++) + { + char c = chars[i]; + if (!c.IsSpace()) + { + tempBuffer[charsWritten++] = c; + if (charsWritten == tempBuffer.Length) + { + consumed = i + 1; + return; + } + } + } + consumed = chars.Length; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static bool IsSpace(this char c) => c == ' ' || c == '\t' || c == '\r' || c == '\n'; + + /// + /// Converts the specified range of a Char array, which encodes binary data as Base64 digits, to the equivalent byte array. + /// + /// Chars representing Base64 encoding characters + /// A position within the input array. + /// Number of element to convert. + /// The array of bytes represented by the specified Base64 encoding characters. + public static Byte[] FromBase64CharArray(Char[] inArray, Int32 offset, Int32 length) + { + if (inArray == null) + throw new ArgumentNullException(nameof(inArray)); + + if (length < 0) + throw new ArgumentOutOfRangeException(nameof(length), SR.ArgumentOutOfRange_Index); + + if (offset < 0) + throw new ArgumentOutOfRangeException(nameof(offset), SR.ArgumentOutOfRange_GenericPositive); + + if (offset > inArray.Length - length) + throw new ArgumentOutOfRangeException(nameof(offset), SR.ArgumentOutOfRange_OffsetLength); + + + if (inArray.Length == 0) + { + return Array.Empty(); + } + + unsafe + { + fixed (Char* inArrayPtr = &inArray[0]) + { + return FromBase64CharPtr(inArrayPtr + offset, length); + } + } + } + + /// + /// Convert Base64 encoding characters to bytes: + /// - Compute result length exactly by actually walking the input; + /// - Allocate new result array based on computation; + /// - Decode input into the new array; + /// + /// Pointer to the first input char + /// Number of input chars + /// + private static unsafe Byte[] FromBase64CharPtr(Char* inputPtr, Int32 inputLength) + { + // The validity of parameters much be checked by callers, thus we are Critical here. + + Debug.Assert(0 <= inputLength); + + // We need to get rid of any trailing white spaces. + // Otherwise we would be rejecting input such as "abc= ": + while (inputLength > 0) + { + Int32 lastChar = inputPtr[inputLength - 1]; + if (lastChar != (Int32)' ' && lastChar != (Int32)'\n' && lastChar != (Int32)'\r' && lastChar != (Int32)'\t') + break; + inputLength--; + } + + // Compute the output length: + Int32 resultLength = FromBase64_ComputeResultLength(inputPtr, inputLength); + + Debug.Assert(0 <= resultLength); + + // resultLength can be zero. We will still enter FromBase64_Decode and process the input. + // It may either simply write no bytes (e.g. input = " ") or throw (e.g. input = "ab"). + + // Create result byte blob: + Byte[] decodedBytes = new Byte[resultLength]; + + // Convert Base64 chars into bytes: + if (!TryFromBase64Chars(new ReadOnlySpan(inputPtr, inputLength), decodedBytes, out int _)) + throw new FormatException(SR.Format_BadBase64Char); + + // Note that the number of bytes written can differ from resultLength if the caller is modifying the array + // as it is being converted. Silently ignore the failure. + // Consider throwing exception in an non in-place release. + + // We are done: + return decodedBytes; + } + + /// + /// Compute the number of bytes encoded in the specified Base 64 char array: + /// Walk the entire input counting white spaces and padding chars, then compute result length + /// based on 3 bytes per 4 chars. + /// + private static unsafe Int32 FromBase64_ComputeResultLength(Char* inputPtr, Int32 inputLength) + { + const UInt32 intEq = (UInt32)'='; + const UInt32 intSpace = (UInt32)' '; + + Debug.Assert(0 <= inputLength); + + Char* inputEndPtr = inputPtr + inputLength; + Int32 usefulInputLength = inputLength; + Int32 padding = 0; + + while (inputPtr < inputEndPtr) + { + UInt32 c = (UInt32)(*inputPtr); + inputPtr++; + + // We want to be as fast as possible and filter out spaces with as few comparisons as possible. + // We end up accepting a number of illegal chars as legal white-space chars. + // This is ok: as soon as we hit them during actual decode we will recognise them as illegal and throw. + if (c <= intSpace) + usefulInputLength--; + + else if (c == intEq) + { + usefulInputLength--; + padding++; + } + } + + Debug.Assert(0 <= usefulInputLength); + + // For legal input, we can assume that 0 <= padding < 3. But it may be more for illegal input. + // We will notice it at decode when we see a '=' at the wrong place. + Debug.Assert(0 <= padding); + + // Perf: reuse the variable that stored the number of '=' to store the number of bytes encoded by the + // last group that contains the '=': + if (padding != 0) + { + if (padding == 1) + padding = 2; + else if (padding == 2) + padding = 1; + else + throw new FormatException(SR.Format_BadBase64Char); + } + + // Done: + return (usefulInputLength / 4) * 3 + padding; + } + } // class Convert +} // namespace + diff --git a/external/corefx/src/Common/src/CoreLib/System/Convert.cs.REMOVED.git-id b/external/corefx/src/Common/src/CoreLib/System/Convert.cs.REMOVED.git-id deleted file mode 100644 index 72b7d96440..0000000000 --- a/external/corefx/src/Common/src/CoreLib/System/Convert.cs.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -488ea773387e0c95bf1e04d9917242c88b9dcbbe \ No newline at end of file diff --git a/external/corefx/src/Common/src/CoreLib/System/DataMisalignedException.cs b/external/corefx/src/Common/src/CoreLib/System/DataMisalignedException.cs index 2a245b6ef7..c22f558b96 100644 --- a/external/corefx/src/Common/src/CoreLib/System/DataMisalignedException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/DataMisalignedException.cs @@ -14,7 +14,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public sealed class DataMisalignedException : SystemException { public DataMisalignedException() diff --git a/external/corefx/src/Common/src/CoreLib/System/DateTime.cs b/external/corefx/src/Common/src/CoreLib/System/DateTime.cs index b5deefa94a..9c3b3989e4 100644 --- a/external/corefx/src/Common/src/CoreLib/System/DateTime.cs +++ b/external/corefx/src/Common/src/CoreLib/System/DateTime.cs @@ -1141,13 +1141,6 @@ namespace System return (DateTimeParse.ParseExact(s, format, DateTimeFormatInfo.GetInstance(provider), style)); } - // TODO https://github.com/dotnet/corefx/issues/25337: Remove this overload once corefx is updated to target the new signatures - public static DateTime ParseExact(ReadOnlySpan s, string format, IFormatProvider provider, DateTimeStyles style) - { - if (format == null) ThrowHelper.ThrowArgumentNullException(ExceptionArgument.format); - return ParseExact(s, (ReadOnlySpan)format, provider, style); - } - public static DateTime ParseExact(ReadOnlySpan s, ReadOnlySpan format, IFormatProvider provider, DateTimeStyles style = DateTimeStyles.None) { DateTimeFormatInfo.ValidateStyles(style, nameof(style)); @@ -1262,50 +1255,46 @@ namespace System public String ToLongDateString() { - return DateTimeFormat.Format(this, "D", DateTimeFormatInfo.CurrentInfo); + return DateTimeFormat.Format(this, "D", null); } public String ToLongTimeString() { - return DateTimeFormat.Format(this, "T", DateTimeFormatInfo.CurrentInfo); + return DateTimeFormat.Format(this, "T", null); } public String ToShortDateString() { - return DateTimeFormat.Format(this, "d", DateTimeFormatInfo.CurrentInfo); + return DateTimeFormat.Format(this, "d", null); } public String ToShortTimeString() { - return DateTimeFormat.Format(this, "t", DateTimeFormatInfo.CurrentInfo); + return DateTimeFormat.Format(this, "t", null); } public override String ToString() { - return DateTimeFormat.Format(this, null, DateTimeFormatInfo.CurrentInfo); + return DateTimeFormat.Format(this, null, null); } public String ToString(String format) { - return DateTimeFormat.Format(this, format, DateTimeFormatInfo.CurrentInfo); + return DateTimeFormat.Format(this, format, null); } public String ToString(IFormatProvider provider) { - return DateTimeFormat.Format(this, null, DateTimeFormatInfo.GetInstance(provider)); + return DateTimeFormat.Format(this, null, provider); } public String ToString(String format, IFormatProvider provider) { - return DateTimeFormat.Format(this, format, DateTimeFormatInfo.GetInstance(provider)); + return DateTimeFormat.Format(this, format, provider); } - // TODO https://github.com/dotnet/corefx/issues/25337: Remove this overload once corefx is updated to target the new signatures - public bool TryFormat(Span destination, out int charsWritten, string format, IFormatProvider provider) => - TryFormat(destination, out charsWritten, (ReadOnlySpan)format, provider); - public bool TryFormat(Span destination, out int charsWritten, ReadOnlySpan format = default, IFormatProvider provider = null) => - DateTimeFormat.TryFormat(this, destination, out charsWritten, format, DateTimeFormatInfo.GetInstance(provider)); + DateTimeFormat.TryFormat(this, destination, out charsWritten, format, provider); public DateTime ToUniversalTime() { @@ -1359,18 +1348,6 @@ namespace System return DateTimeParse.TryParseExact(s, format, DateTimeFormatInfo.GetInstance(provider), style, out result); } - // TODO https://github.com/dotnet/corefx/issues/25337: Remove this overload once corefx is updated to target the new signatures - public static bool TryParseExact(ReadOnlySpan s, string format, IFormatProvider provider, DateTimeStyles style, out DateTime result) - { - if (format == null) - { - result = default; - return false; - } - - return TryParseExact(s, (ReadOnlySpan)format, provider, style, out result); - } - public static bool TryParseExact(ReadOnlySpan s, ReadOnlySpan format, IFormatProvider provider, DateTimeStyles style, out DateTime result) { DateTimeFormatInfo.ValidateStyles(style, nameof(style)); diff --git a/external/corefx/src/Common/src/CoreLib/System/DateTimeOffset.cs b/external/corefx/src/Common/src/CoreLib/System/DateTimeOffset.cs index bb2196348c..3c3f3f42a2 100644 --- a/external/corefx/src/Common/src/CoreLib/System/DateTimeOffset.cs +++ b/external/corefx/src/Common/src/CoreLib/System/DateTimeOffset.cs @@ -669,13 +669,6 @@ namespace System return new DateTimeOffset(dateResult.Ticks, offset); } - // TODO https://github.com/dotnet/corefx/issues/25337: Remove this overload once corefx is updated to target the new signatures - public static DateTimeOffset ParseExact(ReadOnlySpan input, string format, IFormatProvider formatProvider, DateTimeStyles styles) - { - if (format == null) ThrowHelper.ThrowArgumentNullException(ExceptionArgument.format); - return ParseExact(input, (ReadOnlySpan)format, formatProvider, styles); - } - public static DateTimeOffset ParseExact(ReadOnlySpan input, ReadOnlySpan format, IFormatProvider formatProvider, DateTimeStyles styles = DateTimeStyles.None) { styles = ValidateStyles(styles, nameof(styles)); @@ -762,30 +755,26 @@ namespace System public override String ToString() { - return DateTimeFormat.Format(ClockDateTime, null, DateTimeFormatInfo.CurrentInfo, Offset); + return DateTimeFormat.Format(ClockDateTime, null, null, Offset); } public String ToString(String format) { - return DateTimeFormat.Format(ClockDateTime, format, DateTimeFormatInfo.CurrentInfo, Offset); + return DateTimeFormat.Format(ClockDateTime, format, null, Offset); } public String ToString(IFormatProvider formatProvider) { - return DateTimeFormat.Format(ClockDateTime, null, DateTimeFormatInfo.GetInstance(formatProvider), Offset); + return DateTimeFormat.Format(ClockDateTime, null, formatProvider, Offset); } public String ToString(String format, IFormatProvider formatProvider) { - return DateTimeFormat.Format(ClockDateTime, format, DateTimeFormatInfo.GetInstance(formatProvider), Offset); + return DateTimeFormat.Format(ClockDateTime, format, formatProvider, Offset); } - // TODO https://github.com/dotnet/corefx/issues/25337: Remove this overload once corefx is updated to target the new signatures - public bool TryFormat(Span destination, out int charsWritten, string format, IFormatProvider provider) => - TryFormat(destination, out charsWritten, (ReadOnlySpan)format, provider); - public bool TryFormat(Span destination, out int charsWritten, ReadOnlySpan format = default, IFormatProvider formatProvider = null) => - DateTimeFormat.TryFormat(ClockDateTime, destination, out charsWritten, format, DateTimeFormatInfo.GetInstance(formatProvider), Offset); + DateTimeFormat.TryFormat(ClockDateTime, destination, out charsWritten, format, formatProvider, Offset); public DateTimeOffset ToUniversalTime() { @@ -862,18 +851,6 @@ namespace System return parsed; } - // TODO https://github.com/dotnet/corefx/issues/25337: Remove this overload once corefx is updated to target the new signatures - public static bool TryParseExact(ReadOnlySpan input, string format, IFormatProvider formatProvider, DateTimeStyles styles, out DateTimeOffset result) - { - if (format == null) - { - result = default; - return false; - } - - return TryParseExact(input, (ReadOnlySpan)format, formatProvider, styles, out result); - } - public static bool TryParseExact( ReadOnlySpan input, ReadOnlySpan format, IFormatProvider formatProvider, DateTimeStyles styles, out DateTimeOffset result) { diff --git a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/ConditionalAttribute.cs b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/ConditionalAttribute.cs index 416625b779..abd572c423 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/ConditionalAttribute.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/ConditionalAttribute.cs @@ -4,6 +4,9 @@ namespace System.Diagnostics { +#if MONO + [Serializable] +#endif [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = true)] public sealed class ConditionalAttribute : Attribute { diff --git a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Debug.Unix.cs b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Debug.Unix.cs index 495f2f713c..627ea4ab7e 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Debug.Unix.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Debug.Unix.cs @@ -10,7 +10,7 @@ namespace System.Diagnostics { private static readonly bool s_shouldWriteToStdErr = Environment.GetEnvironmentVariable("COMPlus_DebugWriteToStdErr") == "1"; - private static void ShowAssertDialog(string stackTrace, string message, string detailMessage) + private static void ShowDialog(string stackTrace, string message, string detailMessage, string errorSource) { if (Debugger.IsAttached) { @@ -21,8 +21,20 @@ namespace System.Diagnostics // In Core, we do not show a dialog. // Fail in order to avoid anyone catching an exception and masking // an assert failure. - var ex = new DebugAssertException(message, detailMessage, stackTrace); - Environment.FailFast(ex.Message, ex); + DebugAssertException ex; + if (message == String.Empty) + { + ex = new DebugAssertException(stackTrace); + } + else if (detailMessage == String.Empty) + { + ex = new DebugAssertException(message, stackTrace); + } + else + { + ex = new DebugAssertException(message, detailMessage, stackTrace); + } + Environment.FailFast(ex.Message, ex, errorSource); } } diff --git a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Debug.cs b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Debug.cs index 5178f7f5c5..7bc43ccfcb 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Debug.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Debug.cs @@ -4,6 +4,8 @@ // Do not remove this, it is needed to retain calls to these conditional methods in release builds #define DEBUG +using System.Diagnostics.Contracts; +using System.Runtime.CompilerServices; namespace System.Diagnostics { @@ -91,18 +93,34 @@ namespace System.Diagnostics if (!condition) { string stackTrace; - try { - stackTrace = Internal.Runtime.Augments.EnvironmentAugments.StackTrace; + stackTrace = new StackTrace(0, true).ToString(System.Diagnostics.StackTrace.TraceFormat.Normal); } catch { stackTrace = ""; } - WriteLine(FormatAssert(stackTrace, message, detailMessage)); - s_ShowAssertDialog(stackTrace, message, detailMessage); + s_ShowDialog(stackTrace, message, detailMessage, "Assertion Failed"); + } + } + + internal static void ContractFailure(bool condition, string message, string detailMessage, string failureKindMessage) + { + if (!condition) + { + string stackTrace; + try + { + stackTrace = new StackTrace(2, true).ToString(System.Diagnostics.StackTrace.TraceFormat.Normal); + } + catch + { + stackTrace = ""; + } + WriteLine(FormatAssert(stackTrace, message, detailMessage)); + s_ShowDialog(stackTrace, message, detailMessage, SR.GetResourceString(failureKindMessage)); } } @@ -308,14 +326,25 @@ namespace System.Diagnostics private sealed class DebugAssertException : Exception { + internal DebugAssertException(string stackTrace) : + base(Environment.NewLine + stackTrace) + { + } + + internal DebugAssertException(string message, string stackTrace) : + base(message + Environment.NewLine + Environment.NewLine + stackTrace) + { + } + internal DebugAssertException(string message, string detailMessage, string stackTrace) : - base(message + Environment.NewLine + detailMessage + Environment.NewLine + stackTrace) + base(message + Environment.NewLine + detailMessage + Environment.NewLine + Environment.NewLine + stackTrace) { } } // internal and not readonly so that the tests can swap this out. - internal static Action s_ShowAssertDialog = ShowAssertDialog; + internal static Action s_ShowDialog = ShowDialog; + internal static Action s_WriteCore = WriteCore; } } diff --git a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/ActivityTracker.cs b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/ActivityTracker.cs index 9ac32c3bd6..d9f9f081cb 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/ActivityTracker.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/ActivityTracker.cs @@ -247,11 +247,6 @@ namespace System.Diagnostics.Tracing #region private - /// - /// The current activity ID. Use this to log normal events. - /// - private Guid CurrentActivityId { get { return m_current.Value.ActivityId; } } - /// /// Searched for a active (nonstopped) activity with the given name. Returns null if not found. /// diff --git a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/EventDescriptor.cs b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/EventDescriptor.cs index b036b28b4b..0fed7b5c00 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/EventDescriptor.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/EventDescriptor.cs @@ -168,6 +168,14 @@ namespace System.Diagnostics.Tracing } } + internal int TraceLoggingId + { + get + { + return m_traceloggingId; + } + } + public override bool Equals(object obj) { if (!(obj is EventDescriptor)) diff --git a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/EventProvider.cs b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/EventProvider.cs index 64c2491769..c1e4298da8 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/EventProvider.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/EventProvider.cs @@ -182,7 +182,7 @@ namespace System.Diagnostics.Tracing // // - // check if the object has been allready disposed + // check if the object has been already disposed // if (m_disposed) return; @@ -259,12 +259,6 @@ namespace System.Diagnostics.Tracing m_anyKeywordMask = anyKeyword; m_allKeywordMask = allKeyword; - // ES_SESSION_INFO is a marker for additional places we #ifdeffed out to remove - // references to EnumerateTraceGuidsEx. This symbol is actually not used because - // today we use FEATURE_ACTIVITYSAMPLING to determine if this code is there or not. - // However we put it in the #if so that we don't lose the fact that this feature - // switch is at least partially independent of FEATURE_ACTIVITYSAMPLING - List> sessionsChanged = GetSessions(); foreach (var session in sessionsChanged) { @@ -337,7 +331,7 @@ namespace System.Diagnostics.Tracing protected EventKeywords MatchAnyKeyword { get { return (EventKeywords)m_anyKeywordMask; } set { m_anyKeywordMask = unchecked((long)value); } } protected EventKeywords MatchAllKeyword { get { return (EventKeywords)m_allKeywordMask; } set { m_allKeywordMask = unchecked((long)value); } } - static private int FindNull(byte[] buffer, int idx) + private static int FindNull(byte[] buffer, int idx) { while (idx < buffer.Length && buffer[idx] != 0) idx++; @@ -567,7 +561,7 @@ namespace System.Diagnostics.Tracing if (filterData == null) { #if (!ES_BUILD_PCL && !ES_BUILD_PN && PLATFORM_WINDOWS) - string regKey = @"\Microsoft\Windows\CurrentVersion\Winevt\Publishers\{" + m_providerName + "}"; + string regKey = @"\Microsoft\Windows\CurrentVersion\Winevt\Publishers\{" + m_providerId + "}"; if (System.Runtime.InteropServices.Marshal.SizeOf(typeof(IntPtr)) == 8) regKey = @"HKEY_LOCAL_MACHINE\Software" + @"\Wow6432Node" + regKey; else @@ -964,6 +958,8 @@ namespace System.Diagnostics.Tracing List refObjPosition = new List(s_etwAPIMaxRefObjCount); List dataRefObj = new List(s_etwAPIMaxRefObjCount); EventData* userData = stackalloc EventData[2 * argCount]; + for (int i = 0; i < 2 * argCount; i++) + userData[i] = default(EventData); EventData* userDataPtr = (EventData*)userData; byte* dataBuffer = stackalloc byte[s_basicTypeAllocationBufferSize * 2 * argCount]; // Assume 16 chars for non-string argument byte* currentBuffer = dataBuffer; @@ -1137,7 +1133,7 @@ namespace System.Diagnostics.Tracing // // [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1045:DoNotPassTypesByReference")] - internal unsafe protected bool WriteEvent(ref EventDescriptor eventDescriptor, IntPtr eventHandle, Guid* activityID, Guid* childActivityID, int dataCount, IntPtr data) + internal protected unsafe bool WriteEvent(ref EventDescriptor eventDescriptor, IntPtr eventHandle, Guid* activityID, Guid* childActivityID, int dataCount, IntPtr data) { if (childActivityID != null) { @@ -1161,6 +1157,7 @@ namespace System.Diagnostics.Tracing [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1045:DoNotPassTypesByReference")] internal unsafe bool WriteEventRaw( ref EventDescriptor eventDescriptor, + IntPtr eventHandle, Guid* activityID, Guid* relatedActivityID, int dataCount, @@ -1171,7 +1168,7 @@ namespace System.Diagnostics.Tracing status = m_eventProvider.EventWriteTransferWrapper( m_regHandle, ref eventDescriptor, - IntPtr.Zero, + eventHandle, activityID, relatedActivityID, dataCount, diff --git a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/EventSource.cs.REMOVED.git-id b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/EventSource.cs.REMOVED.git-id index 4f26205c3c..37ba5e6672 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/EventSource.cs.REMOVED.git-id +++ b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/EventSource.cs.REMOVED.git-id @@ -1 +1 @@ -f6d48998436a4b293130436942ccb5891b740605 \ No newline at end of file +1836a1f27d173f7b8e9ad375c24d9c34b43fc6d3 \ No newline at end of file diff --git a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/DataCollector.cs b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/DataCollector.cs index 1444c267cb..11c18a260f 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/DataCollector.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/DataCollector.cs @@ -143,6 +143,45 @@ namespace System.Diagnostics.Tracing } } + internal unsafe void AddNullTerminatedString(string value) + { + // Treat null strings as empty strings. + if (value == null) + { + value = string.Empty; + } + + // Calculate the size of the string including the trailing NULL char. + // Don't use value.Length here because string allows for embedded NULL characters. + int nullCharIndex = value.IndexOf((char)0); + if (nullCharIndex < 0) + { + nullCharIndex = value.Length; + } + int size = (nullCharIndex + 1) * 2; + + if (this.bufferNesting != 0) + { + this.EnsureBuffer(size); + } + + if (this.bufferNesting == 0) + { + this.ScalarsEnd(); + this.PinArray(value, size); + } + else + { + var oldPos = this.bufferPos; + this.bufferPos = checked(this.bufferPos + size); + this.EnsureBuffer(); + fixed (void* p = value) + { + Marshal.Copy((IntPtr)p, buffer, oldPos, size); + } + } + } + internal void AddBinary(Array value, int size) { this.AddArray(value, size, 1); diff --git a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/EventSourceActivity.cs b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/EventSourceActivity.cs index 865082f767..2d71550803 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/EventSourceActivity.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/EventSourceActivity.cs @@ -314,7 +314,7 @@ namespace System.Diagnostics.Tracing private State state; private string eventName; - static internal Guid s_empty; + internal static Guid s_empty; #endregion } } diff --git a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/FieldMetadata.cs b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/FieldMetadata.cs index 9c7c6369ec..f153734752 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/FieldMetadata.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/FieldMetadata.cs @@ -135,13 +135,11 @@ namespace System.Diagnostics.Tracing { throw new NotSupportedException(SR.EventSource_NotSupportedArrayOfBinary); } -#if !BROKEN_UNTIL_M3 if (coreType == (int)TraceLoggingDataType.Utf16String || coreType == (int)TraceLoggingDataType.MbcsString) { throw new NotSupportedException(SR.EventSource_NotSupportedArrayOfNullTerminatedString); } -#endif } if (((int)this.tags & 0xfffffff) != 0) diff --git a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/InvokeTypeInfo.cs b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/InvokeTypeInfo.cs index 3e5997bc9b..2a7113e5d7 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/InvokeTypeInfo.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/InvokeTypeInfo.cs @@ -21,7 +21,7 @@ namespace System.Diagnostics.Tracing /// internal sealed class InvokeTypeInfo : TraceLoggingTypeInfo { - private readonly PropertyAnalysis[] properties; + internal readonly PropertyAnalysis[] properties; public InvokeTypeInfo( Type type, diff --git a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/NameInfo.cs b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/NameInfo.cs index 668043ae68..b1c7327c18 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/NameInfo.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/NameInfo.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; +using System.Collections.Concurrent; using Interlocked = System.Threading.Interlocked; #if ES_BUILD_STANDALONE @@ -41,6 +42,10 @@ namespace System.Diagnostics.Tracing internal readonly int identity; internal readonly byte[] nameMetadata; +#if FEATURE_PERFTRACING + private readonly object eventHandleCreationLock = new object(); +#endif + public NameInfo(string name, EventTags tags, int typeMetadataSize) { this.name = name; @@ -75,5 +80,47 @@ namespace System.Diagnostics.Tracing } return result; } + +#if FEATURE_PERFTRACING + public IntPtr GetOrCreateEventHandle(EventProvider provider, ConcurrentDictionary eventHandleMap, EventDescriptor descriptor, TraceLoggingEventTypes eventTypes) + { + IntPtr eventHandle = IntPtr.Zero; + if(!eventHandleMap.TryGetValue(descriptor.EventId, out eventHandle)) + { + lock (eventHandleCreationLock) + { + if (!eventHandleMap.TryGetValue(descriptor.EventId, out eventHandle)) + { + byte[] metadataBlob = EventPipeMetadataGenerator.Instance.GenerateEventMetadata( + descriptor.EventId, + name, + (EventKeywords)descriptor.Keywords, + (EventLevel)descriptor.Level, + descriptor.Version, + eventTypes); + uint metadataLength = (metadataBlob != null) ? (uint)metadataBlob.Length : 0; + + unsafe + { + fixed (byte* pMetadataBlob = metadataBlob) + { + // Define the event. + eventHandle = provider.m_eventProvider.DefineEventHandle( + (uint)descriptor.EventId, + name, + descriptor.Keywords, + descriptor.Version, + descriptor.Level, + pMetadataBlob, + metadataLength); + } + } + } + } + } + + return eventHandle; + } +#endif } } diff --git a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/SimpleTypeInfos.cs b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/SimpleTypeInfos.cs index 901a0ed1a2..001a8e8f05 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/SimpleTypeInfos.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/SimpleTypeInfos.cs @@ -136,7 +136,7 @@ namespace System.Diagnostics.Tracing public static TraceLoggingTypeInfo UIntPtr() { return new ScalarArrayTypeInfo(typeof(UIntPtr[]), Statics.FormatPtr, Statics.UIntPtrType, System.IntPtr.Size); } public static TraceLoggingTypeInfo Single() { return new ScalarArrayTypeInfo(typeof(Single[]), Statics.Format32, TraceLoggingDataType.Float, sizeof(Single)); } public static TraceLoggingTypeInfo Double() { return new ScalarArrayTypeInfo(typeof(Double[]), Statics.Format64, TraceLoggingDataType.Double, sizeof(Double)); } - public unsafe static TraceLoggingTypeInfo Guid() { return new ScalarArrayTypeInfo(typeof(Guid), (f, t) => Statics.MakeDataType(TraceLoggingDataType.Guid, f), TraceLoggingDataType.Guid, sizeof(Guid)); } + public static unsafe TraceLoggingTypeInfo Guid() { return new ScalarArrayTypeInfo(typeof(Guid), (f, t) => Statics.MakeDataType(TraceLoggingDataType.Guid, f), TraceLoggingDataType.Guid, sizeof(Guid)); } } /// @@ -151,12 +151,12 @@ namespace System.Diagnostics.Tracing string name, EventFieldFormat format) { - collector.AddBinary(name, Statics.MakeDataType(TraceLoggingDataType.CountedUtf16String, format)); + collector.AddNullTerminatedString(name, Statics.MakeDataType(TraceLoggingDataType.Utf16String, format)); } public override void WriteData(TraceLoggingDataCollector collector, PropertyValue value) { - collector.AddBinary((string)value.ReferenceValue); + collector.AddNullTerminatedString((string)value.ReferenceValue); } public override object GetData(object value) @@ -187,8 +187,14 @@ namespace System.Diagnostics.Tracing public override void WriteData(TraceLoggingDataCollector collector, PropertyValue value) { - var ticks = value.ScalarValue.AsDateTime.Ticks; - collector.AddScalar(ticks < 504911232000000000 ? 0 : ticks - 504911232000000000); + DateTime dateTime = value.ScalarValue.AsDateTime; + const long UTCMinTicks = 504911232000000000; + long dateTimeTicks = 0; + // We cannot translate dates sooner than 1/1/1601 in UTC. + // To avoid getting an ArgumentOutOfRangeException we compare with 1/1/1601 DateTime ticks + if (dateTime.Ticks > UTCMinTicks) + dateTimeTicks = dateTime.ToFileTimeUtc(); + collector.AddScalar(dateTimeTicks); } } diff --git a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/TraceLoggingDataCollector.cs b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/TraceLoggingDataCollector.cs index 04a047fb35..f6d0a59aa6 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/TraceLoggingDataCollector.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/TraceLoggingDataCollector.cs @@ -84,6 +84,17 @@ namespace System.Diagnostics.Tracing DataCollector.ThreadInstance.AddScalar(&value, sizeof(double)); } + /// + /// Adds a null-terminated String value to the event payload. + /// + /// + /// Value to be added. A null value is treated as a zero-length string. + /// + public void AddNullTerminatedString(string value) + { + DataCollector.ThreadInstance.AddNullTerminatedString(value); + } + /// /// Adds a counted String value to the event payload. /// diff --git a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/TraceLoggingEventSource.cs b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/TraceLoggingEventSource.cs index bf29d71844..ccdc8bf7c4 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/TraceLoggingEventSource.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/TraceLoggingEventSource.cs @@ -7,10 +7,6 @@ #if PLATFORM_WINDOWS #define FEATURE_MANAGED_ETW - -#if !ES_BUILD_STANDALONE -#define FEATURE_ACTIVITYSAMPLING -#endif #endif // PLATFORM_WINDOWS #if ES_BUILD_STANDALONE @@ -28,6 +24,7 @@ using System.Resources; using System.Runtime.InteropServices; using System.Security; using System.Collections.ObjectModel; +using System.Collections.Concurrent; #if !ES_BUILD_AGAINST_DOTNET_V35 using Contract = System.Diagnostics.Contracts.Contract; @@ -51,6 +48,10 @@ namespace System.Diagnostics.Tracing private byte[] providerMetadata; #endif +#if FEATURE_PERFTRACING + private ConcurrentDictionary m_eventHandleMap = new ConcurrentDictionary(); +#endif + /// /// Construct an EventSource with a given name for non-contract based events (e.g. those using the Write() API). /// @@ -435,9 +436,18 @@ namespace System.Diagnostics.Tracing identity = nameInfo.identity; EventDescriptor descriptor = new EventDescriptor(identity, level, opcode, (long)keywords); +#if FEATURE_PERFTRACING + IntPtr eventHandle = nameInfo.GetOrCreateEventHandle(m_provider, m_eventHandleMap, descriptor, eventTypes); + Debug.Assert(eventHandle != IntPtr.Zero); +#else + IntPtr eventHandle = IntPtr.Zero; +#endif + var pinCount = eventTypes.pinCount; var scratch = stackalloc byte[eventTypes.scratchSize]; var descriptors = stackalloc EventData[eventTypes.dataCount + 3]; + for(int i = 0; i < eventTypes.dataCount + 3; i++) + descriptors[i] = default(EventData); var pins = stackalloc GCHandle[pinCount]; for (int i = 0; i < pinCount; i++) @@ -474,6 +484,7 @@ namespace System.Diagnostics.Tracing this.WriteEventRaw( eventName, ref descriptor, + eventHandle, activityID, childActivityID, (int)(DataCollector.ThreadInstance.Finish() - descriptors), @@ -540,9 +551,19 @@ namespace System.Diagnostics.Tracing return; } +#if FEATURE_PERFTRACING + IntPtr eventHandle = nameInfo.GetOrCreateEventHandle(m_provider, m_eventHandleMap, descriptor, eventTypes); + Debug.Assert(eventHandle != IntPtr.Zero); +#else + IntPtr eventHandle = IntPtr.Zero; +#endif + // We make a descriptor for each EventData, and because we morph strings to counted strings // we may have 2 for each arg, so we allocate enough for this. - var descriptors = stackalloc EventData[eventTypes.dataCount + eventTypes.typeInfos.Length * 2 + 3]; + var descriptorsLength = eventTypes.dataCount + eventTypes.typeInfos.Length * 2 + 3; + var descriptors = stackalloc EventData[descriptorsLength]; + for(int i = 0; i < descriptorsLength; i++) + descriptors[i] = default(EventData); fixed (byte* pMetadata0 = this.providerMetadata, @@ -556,35 +577,20 @@ namespace System.Diagnostics.Tracing for (int i = 0; i < eventTypes.typeInfos.Length; i++) { - // Until M3, we need to morph strings to a counted representation - // When TDH supports null terminated strings, we can remove this. - if (eventTypes.typeInfos[i].DataType == typeof(string)) - { - // Write out the size of the string - descriptors[numDescrs].DataPointer = (IntPtr) (&descriptors[numDescrs + 1].m_Size); - descriptors[numDescrs].m_Size = 2; - numDescrs++; + descriptors[numDescrs].m_Ptr = data[i].m_Ptr; + descriptors[numDescrs].m_Size = data[i].m_Size; - descriptors[numDescrs].m_Ptr = data[i].m_Ptr; - descriptors[numDescrs].m_Size = data[i].m_Size - 2; // Remove the null terminator - numDescrs++; - } - else - { - descriptors[numDescrs].m_Ptr = data[i].m_Ptr; - descriptors[numDescrs].m_Size = data[i].m_Size; + // old conventions for bool is 4 bytes, but meta-data assumes 1. + if (data[i].m_Size == 4 && eventTypes.typeInfos[i].DataType == typeof(bool)) + descriptors[numDescrs].m_Size = 1; - // old conventions for bool is 4 bytes, but meta-data assumes 1. - if (data[i].m_Size == 4 && eventTypes.typeInfos[i].DataType == typeof(bool)) - descriptors[numDescrs].m_Size = 1; - - numDescrs++; - } + numDescrs++; } this.WriteEventRaw( eventName, ref descriptor, + eventHandle, activityID, childActivityID, numDescrs, @@ -614,10 +620,19 @@ namespace System.Diagnostics.Tracing return; } +#if FEATURE_PERFTRACING + IntPtr eventHandle = nameInfo.GetOrCreateEventHandle(m_provider, m_eventHandleMap, descriptor, eventTypes); + Debug.Assert(eventHandle != IntPtr.Zero); +#else + IntPtr eventHandle = IntPtr.Zero; +#endif + #if FEATURE_MANAGED_ETW var pinCount = eventTypes.pinCount; var scratch = stackalloc byte[eventTypes.scratchSize]; var descriptors = stackalloc EventData[eventTypes.dataCount + 3]; + for(int i=0; i + /// Adds a null-terminated string field to an event. + /// Compatible with core types: Utf16String, MbcsString. + /// Compatible with dataCollector method: AddNullTerminatedString(string). + /// + /// + /// The name to use for the added field. This value must not be null. + /// + /// + /// The type code for the added field. This must be a null-terminated string type. + /// + public void AddNullTerminatedString(string name, TraceLoggingDataType type) + { + switch ((TraceLoggingDataType)((int)type & Statics.InTypeMask)) + { + case TraceLoggingDataType.Utf16String: + break; + default: + throw new ArgumentOutOfRangeException(nameof(type)); + } + + this.impl.AddNonscalar(); + this.AddField(new FieldMetadata(name, type, this.Tags, this.BeginningBufferedArray)); + } + /// /// Adds an array field to an event. /// @@ -198,16 +223,12 @@ namespace System.Diagnostics.Tracing /// The name to use for the added field. This value must not be null. /// /// - /// The type code for the added field. This must be a fixed-size type - /// or a string type. In the case of a string type, this adds an array - /// of characters, not an array of strings. + /// The type code for the added field. This must be a fixed-size type. /// public void AddArray(string name, TraceLoggingDataType type) { switch ((TraceLoggingDataType)((int)type & Statics.InTypeMask)) { - case TraceLoggingDataType.Utf16String: - case TraceLoggingDataType.MbcsString: case TraceLoggingDataType.Int8: case TraceLoggingDataType.UInt8: case TraceLoggingDataType.Int16: diff --git a/external/corefx/src/Common/src/CoreLib/System/DivideByZeroException.cs b/external/corefx/src/Common/src/CoreLib/System/DivideByZeroException.cs index b309695ff3..dd05e1af7c 100644 --- a/external/corefx/src/Common/src/CoreLib/System/DivideByZeroException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/DivideByZeroException.cs @@ -16,7 +16,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class DivideByZeroException : ArithmeticException { public DivideByZeroException() diff --git a/external/corefx/src/Common/src/CoreLib/System/DllNotFoundException.cs b/external/corefx/src/Common/src/CoreLib/System/DllNotFoundException.cs index 14fb50d9c5..0df1399a57 100644 --- a/external/corefx/src/Common/src/CoreLib/System/DllNotFoundException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/DllNotFoundException.cs @@ -17,7 +17,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class DllNotFoundException : TypeLoadException { public DllNotFoundException() diff --git a/external/corefx/src/Common/src/CoreLib/System/Double.cs b/external/corefx/src/Common/src/CoreLib/System/Double.cs index 3652963ef6..0f11a4a252 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Double.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Double.cs @@ -17,11 +17,15 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Versioning; +using Internal.Runtime.CompilerServices; + namespace System { [Serializable] [StructLayout(LayoutKind.Sequential)] +#if !MONO [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public struct Double : IComparable, IConvertible, IFormattable, IComparable, IEquatable, ISpanFormattable { private double m_value; // Do not rename (binary serialization) @@ -45,7 +49,7 @@ namespace System /// Determines whether the specified value is finite (zero, subnormal, or normal). [NonVersionable] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public unsafe static bool IsFinite(double d) + public static unsafe bool IsFinite(double d) { var bits = BitConverter.DoubleToInt64Bits(d); return (bits & 0x7FFFFFFFFFFFFFFF) < 0x7FF0000000000000; @@ -54,7 +58,7 @@ namespace System /// Determines whether the specified value is infinite. [NonVersionable] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public unsafe static bool IsInfinity(double d) + public static unsafe bool IsInfinity(double d) { var bits = BitConverter.DoubleToInt64Bits(d); return (bits & 0x7FFFFFFFFFFFFFFF) == 0x7FF0000000000000; @@ -63,7 +67,7 @@ namespace System /// Determines whether the specified value is NaN. [NonVersionable] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public unsafe static bool IsNaN(double d) + public static unsafe bool IsNaN(double d) { var bits = BitConverter.DoubleToInt64Bits(d); return (bits & 0x7FFFFFFFFFFFFFFF) > 0x7FF0000000000000; @@ -72,7 +76,7 @@ namespace System /// Determines whether the specified value is negative. [NonVersionable] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public unsafe static bool IsNegative(double d) + public static unsafe bool IsNegative(double d) { var bits = unchecked((ulong)BitConverter.DoubleToInt64Bits(d)); return (bits & 0x8000000000000000) == 0x8000000000000000; @@ -89,7 +93,7 @@ namespace System /// Determines whether the specified value is normal. [NonVersionable] // This is probably not worth inlining, it has branches and should be rarely called - public unsafe static bool IsNormal(double d) + public static unsafe bool IsNormal(double d) { var bits = BitConverter.DoubleToInt64Bits(d); bits &= 0x7FFFFFFFFFFFFFFF; @@ -107,7 +111,7 @@ namespace System /// Determines whether the specified value is subnormal. [NonVersionable] // This is probably not worth inlining, it has branches and should be rarely called - public unsafe static bool IsSubnormal(double d) + public static unsafe bool IsSubnormal(double d) { var bits = BitConverter.DoubleToInt64Bits(d); bits &= 0x7FFFFFFFFFFFFFFF; @@ -221,16 +225,19 @@ namespace System //The hashcode for a double is the absolute value of the integer representation //of that double. // - public unsafe override int GetHashCode() + [MethodImpl(MethodImplOptions.AggressiveInlining)] // 64-bit constants make the IL unusually large that makes the inliner to reject the method + public override int GetHashCode() { - double d = m_value; - if (d == 0) + var bits = Unsafe.As(ref m_value); + + // Optimized check for IsNan() || IsZero() + if (((bits - 1) & 0x7FFFFFFFFFFFFFFF) >= 0x7FF0000000000000) { - // Ensure that 0 and -0 have the same hash code - return 0; + // Ensure that all NaNs and both zeros have the same hash code + bits &= 0x7FF0000000000000; } - long value = *(long*)(&d); - return unchecked((int)value) ^ ((int)(value >> 32)); + + return unchecked((int)bits) ^ ((int)(bits >> 32)); } public override String ToString() @@ -292,7 +299,7 @@ namespace System // PositiveInfinity or NegativeInfinity for a number that is too // large or too small. - public static double Parse(ReadOnlySpan s, NumberStyles style = NumberStyles.Integer, IFormatProvider provider = null) + public static double Parse(ReadOnlySpan s, NumberStyles style = NumberStyles.Float | NumberStyles.AllowThousands, IFormatProvider provider = null) { NumberFormatInfo.ValidateParseStyleFloatingPoint(style); return Number.ParseDouble(s, style, NumberFormatInfo.GetInstance(provider)); @@ -340,16 +347,16 @@ namespace System bool success = Number.TryParseDouble(s, style, info, out result); if (!success) { - ReadOnlySpan sTrim = StringSpanHelpers.Trim(s); - if (StringSpanHelpers.Equals(sTrim, info.PositiveInfinitySymbol)) + ReadOnlySpan sTrim = s.Trim(); + if (sTrim.EqualsOrdinal(info.PositiveInfinitySymbol)) { result = PositiveInfinity; } - else if (StringSpanHelpers.Equals(sTrim, info.NegativeInfinitySymbol)) + else if (sTrim.EqualsOrdinal(info.NegativeInfinitySymbol)) { result = NegativeInfinity; } - else if (StringSpanHelpers.Equals(sTrim, info.NaNSymbol)) + else if (sTrim.EqualsOrdinal(info.NaNSymbol)) { result = NaN; } diff --git a/external/corefx/src/Common/src/CoreLib/System/DuplicateWaitObjectException.cs b/external/corefx/src/Common/src/CoreLib/System/DuplicateWaitObjectException.cs index 77303846a3..b7a1f02b11 100644 --- a/external/corefx/src/Common/src/CoreLib/System/DuplicateWaitObjectException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/DuplicateWaitObjectException.cs @@ -18,7 +18,9 @@ namespace System // The DuplicateWaitObjectException is thrown when an object // appears more than once in the list of objects to WaitAll or WaitAny. [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class DuplicateWaitObjectException : ArgumentException { private static volatile String s_duplicateWaitObjectMessage = null; diff --git a/external/corefx/src/Common/src/CoreLib/System/EntryPointNotFoundException.cs b/external/corefx/src/Common/src/CoreLib/System/EntryPointNotFoundException.cs index dac1cdb971..a43e7bbf64 100644 --- a/external/corefx/src/Common/src/CoreLib/System/EntryPointNotFoundException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/EntryPointNotFoundException.cs @@ -17,7 +17,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class EntryPointNotFoundException : TypeLoadException { public EntryPointNotFoundException() diff --git a/external/corefx/src/Common/src/CoreLib/System/EventArgs.cs b/external/corefx/src/Common/src/CoreLib/System/EventArgs.cs index f3561a8d0b..ec77780061 100644 --- a/external/corefx/src/Common/src/CoreLib/System/EventArgs.cs +++ b/external/corefx/src/Common/src/CoreLib/System/EventArgs.cs @@ -8,7 +8,9 @@ namespace System { // The base class for all event classes. [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class EventArgs { public static readonly EventArgs Empty = new EventArgs(); diff --git a/external/corefx/src/Common/src/CoreLib/System/ExecutionEngineException.cs b/external/corefx/src/Common/src/CoreLib/System/ExecutionEngineException.cs index 5edd5cf19f..bf17968254 100644 --- a/external/corefx/src/Common/src/CoreLib/System/ExecutionEngineException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/ExecutionEngineException.cs @@ -22,7 +22,9 @@ namespace System { [Obsolete("This type previously indicated an unspecified fatal error in the runtime. The runtime no longer raises this exception so this type is obsolete.")] [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public sealed class ExecutionEngineException : SystemException { public ExecutionEngineException() diff --git a/external/corefx/src/Common/src/CoreLib/System/FieldAccessException.cs b/external/corefx/src/Common/src/CoreLib/System/FieldAccessException.cs index cb28264d61..6c73db74f1 100644 --- a/external/corefx/src/Common/src/CoreLib/System/FieldAccessException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/FieldAccessException.cs @@ -14,7 +14,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class FieldAccessException : MemberAccessException { public FieldAccessException() diff --git a/external/corefx/src/Common/src/CoreLib/System/FlagsAttribute.cs b/external/corefx/src/Common/src/CoreLib/System/FlagsAttribute.cs index 4f3ab36bfd..7a4f35f3fa 100644 --- a/external/corefx/src/Common/src/CoreLib/System/FlagsAttribute.cs +++ b/external/corefx/src/Common/src/CoreLib/System/FlagsAttribute.cs @@ -11,6 +11,9 @@ namespace System // should be treated as a bitfield (or set of flags). // An IDE may use this information to provide a richer // development experience. +#if MONO + [Serializable] +#endif [AttributeUsage(AttributeTargets.Enum, Inherited = false)] public class FlagsAttribute : Attribute { diff --git a/external/corefx/src/Common/src/CoreLib/System/FormatException.cs b/external/corefx/src/Common/src/CoreLib/System/FormatException.cs index b0e273369c..eefe8b12ee 100644 --- a/external/corefx/src/Common/src/CoreLib/System/FormatException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/FormatException.cs @@ -16,7 +16,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class FormatException : SystemException { public FormatException() diff --git a/external/corefx/src/Common/src/CoreLib/System/Gen2GcCallback.cs b/external/corefx/src/Common/src/CoreLib/System/Gen2GcCallback.cs new file mode 100644 index 0000000000..2252681224 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/Gen2GcCallback.cs @@ -0,0 +1,76 @@ +// 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.Runtime.ConstrainedExecution; +using System.Runtime.InteropServices; + +namespace System +{ + /// + /// Schedules a callback roughly every gen 2 GC (you may see a Gen 0 an Gen 1 but only once) + /// (We can fix this by capturing the Gen 2 count at startup and testing, but I mostly don't care) + /// + internal sealed class Gen2GcCallback : CriticalFinalizerObject + { + private Gen2GcCallback() + : base() + { + } + + /// + /// Schedule 'callback' to be called in the next GC. If the callback returns true it is + /// rescheduled for the next Gen 2 GC. Otherwise the callbacks stop. + /// + /// NOTE: This callback will be kept alive until either the callback function returns false, + /// or the target object dies. + /// + public static void Register(Func callback, object targetObj) + { + // Create a unreachable object that remembers the callback function and target object. + Gen2GcCallback gcCallback = new Gen2GcCallback(); + gcCallback.Setup(callback, targetObj); + } + + private Func _callback; + private GCHandle _weakTargetObj; + + private void Setup(Func callback, object targetObj) + { + _callback = callback; + _weakTargetObj = GCHandle.Alloc(targetObj, GCHandleType.Weak); + } + + ~Gen2GcCallback() + { + // Check to see if the target object is still alive. + object targetObj = _weakTargetObj.Target; + if (targetObj == null) + { + // The target object is dead, so this callback object is no longer needed. + _weakTargetObj.Free(); + return; + } + + // Execute the callback method. + try + { + if (!_callback(targetObj)) + { + // If the callback returns false, this callback object is no longer needed. + return; + } + } + catch + { + // Ensure that we still get a chance to resurrect this object, even if the callback throws an exception. + } + + // Resurrect ourselves by re-registering for finalization. + if (!Environment.HasShutdownStarted) + { + GC.ReRegisterForFinalize(this); + } + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/CalendarData.Unix.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/CalendarData.Unix.cs index 4d1a63c23c..17d6ed7a01 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/CalendarData.Unix.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/CalendarData.Unix.cs @@ -45,10 +45,27 @@ namespace System.Globalization result &= EnumCalendarInfo(localeName, calendarId, CalendarDataType.DayNames, out this.saDayNames); result &= EnumCalendarInfo(localeName, calendarId, CalendarDataType.AbbrevDayNames, out this.saAbbrevDayNames); result &= EnumCalendarInfo(localeName, calendarId, CalendarDataType.SuperShortDayNames, out this.saSuperShortDayNames); - result &= EnumMonthNames(localeName, calendarId, CalendarDataType.MonthNames, out this.saMonthNames); - result &= EnumMonthNames(localeName, calendarId, CalendarDataType.AbbrevMonthNames, out this.saAbbrevMonthNames); - result &= EnumMonthNames(localeName, calendarId, CalendarDataType.MonthGenitiveNames, out this.saMonthGenitiveNames); - result &= EnumMonthNames(localeName, calendarId, CalendarDataType.AbbrevMonthGenitiveNames, out this.saAbbrevMonthGenitiveNames); + + string leapHebrewMonthName = null; + result &= EnumMonthNames(localeName, calendarId, CalendarDataType.MonthNames, out this.saMonthNames, ref leapHebrewMonthName); + if (leapHebrewMonthName != null) + { + // In Hebrew calendar, get the leap month name Adar II and override the non-leap month 7 + Debug.Assert(calendarId == CalendarId.HEBREW && saMonthNames.Length == 13); + saLeapYearMonthNames = (string[]) saMonthNames.Clone(); + saLeapYearMonthNames[6] = leapHebrewMonthName; + + // The returned data from ICU has 6th month name as 'Adar I' and 7th month name as 'Adar' + // We need to adjust that in the list used with non-leap year to have 6th month as 'Adar' and 7th month as 'Adar II' + // note that when formatting non-leap year dates, 7th month shouldn't get used at all. + saMonthNames[5] = saMonthNames[6]; + saMonthNames[6] = leapHebrewMonthName; + + } + result &= EnumMonthNames(localeName, calendarId, CalendarDataType.AbbrevMonthNames, out this.saAbbrevMonthNames, ref leapHebrewMonthName); + result &= EnumMonthNames(localeName, calendarId, CalendarDataType.MonthGenitiveNames, out this.saMonthGenitiveNames, ref leapHebrewMonthName); + result &= EnumMonthNames(localeName, calendarId, CalendarDataType.AbbrevMonthGenitiveNames, out this.saAbbrevMonthGenitiveNames, ref leapHebrewMonthName); + result &= EnumEraNames(localeName, calendarId, CalendarDataType.EraNames, out this.saEraNames); result &= EnumEraNames(localeName, calendarId, CalendarDataType.AbbrevEraNames, out this.saAbbrevEraNames); @@ -68,7 +85,7 @@ namespace System.Globalization Debug.Assert(!GlobalizationMode.Invariant); // NOTE: there are no 'user overrides' on Linux - int count = Interop.GlobalizationInterop.GetCalendars(localeName, calendars, calendars.Length); + int count = Interop.Globalization.GetCalendars(localeName, calendars, calendars.Length); // ensure there is at least 1 calendar returned if (count == 0 && calendars.Length > 0) @@ -93,7 +110,7 @@ namespace System.Globalization return Interop.CallStringMethod( (locale, calId, type, stringBuilder) => - Interop.GlobalizationInterop.GetCalendarInfo( + Interop.Globalization.GetCalendarInfo( locale, calId, type, @@ -241,7 +258,7 @@ namespace System.Globalization return index - startIndex; } - private static bool EnumMonthNames(string localeName, CalendarId calendarId, CalendarDataType dataType, out string[] monthNames) + private static bool EnumMonthNames(string localeName, CalendarId calendarId, CalendarDataType dataType, out string[] monthNames, ref string leapHebrewMonthName) { monthNames = null; @@ -257,6 +274,17 @@ namespace System.Globalization callbackContext.Results.Add(string.Empty); } + if (callbackContext.Results.Count > 13) + { + Debug.Assert(calendarId == CalendarId.HEBREW && callbackContext.Results.Count == 14); + + if (calendarId == CalendarId.HEBREW) + { + leapHebrewMonthName = callbackContext.Results[13]; + } + callbackContext.Results.RemoveRange(13, callbackContext.Results.Count - 13); + } + monthNames = callbackContext.Results.ToArray(); } @@ -295,7 +323,7 @@ namespace System.Globalization private static unsafe bool EnumCalendarInfo(string localeName, CalendarId calendarId, CalendarDataType dataType, ref EnumCalendarsData callbackContext) { - return Interop.GlobalizationInterop.EnumCalendarInfo(EnumCalendarInfoCallback, localeName, calendarId, dataType, (IntPtr)Unsafe.AsPointer(ref callbackContext)); + return Interop.Globalization.EnumCalendarInfo(EnumCalendarInfoCallback, localeName, calendarId, dataType, (IntPtr)Unsafe.AsPointer(ref callbackContext)); } private static unsafe void EnumCalendarInfoCallback(string calendarString, IntPtr context) diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/CharUnicodeInfo.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/CharUnicodeInfo.cs index 0cd8429bbc..40b232b290 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/CharUnicodeInfo.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/CharUnicodeInfo.cs @@ -13,6 +13,7 @@ //////////////////////////////////////////////////////////////////////////// using System.Diagnostics; +using System.Diagnostics.Private; namespace System.Globalization { diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/CompareInfo.Invariant.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/CompareInfo.Invariant.cs index c47db7b0fd..69f4b4e095 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/CompareInfo.Invariant.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/CompareInfo.Invariant.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics.Private; +using System.Runtime.InteropServices; namespace System.Globalization { @@ -26,6 +27,18 @@ namespace System.Globalization } } + internal static unsafe int InvariantIndexOf(ReadOnlySpan source, ReadOnlySpan value, bool ignoreCase) + { + Debug.Assert(source.Length != 0); + Debug.Assert(value.Length != 0); + + fixed (char* pSource = &MemoryMarshal.GetReference(source)) + fixed (char* pValue = &MemoryMarshal.GetReference(value)) + { + return InvariantFindString(pSource, source.Length, pValue, value.Length, ignoreCase, start: true); + } + } + internal static unsafe int InvariantLastIndexOf(string source, string value, int startIndex, int count, bool ignoreCase) { Debug.Assert(source != null); diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/CompareInfo.Unix.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/CompareInfo.Unix.cs new file mode 100644 index 0000000000..5a68492c69 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/CompareInfo.Unix.cs @@ -0,0 +1,1014 @@ +// 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; +using System.Diagnostics; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Security; + +namespace System.Globalization +{ + public partial class CompareInfo + { + [NonSerialized] + private Interop.Globalization.SafeSortHandle _sortHandle; + + [NonSerialized] + private bool _isAsciiEqualityOrdinal; + + private void InitSort(CultureInfo culture) + { + _sortName = culture.SortName; + + if (_invariantMode) + { + _isAsciiEqualityOrdinal = true; + } + else + { + Interop.Globalization.ResultCode resultCode = Interop.Globalization.GetSortHandle(GetNullTerminatedUtf8String(_sortName), out _sortHandle); + if (resultCode != Interop.Globalization.ResultCode.Success) + { + _sortHandle.Dispose(); + + if (resultCode == Interop.Globalization.ResultCode.OutOfMemory) + throw new OutOfMemoryException(); + + throw new ExternalException(SR.Arg_ExternalException); + } + _isAsciiEqualityOrdinal = (_sortName == "en-US" || _sortName == ""); + } + } + + internal static unsafe int IndexOfOrdinalCore(string source, string value, int startIndex, int count, bool ignoreCase) + { + Debug.Assert(!GlobalizationMode.Invariant); + + Debug.Assert(source != null); + Debug.Assert(value != null); + + if (value.Length == 0) + { + return startIndex; + } + + if (count < value.Length) + { + return -1; + } + + if (ignoreCase) + { + fixed (char* pSource = source) + { + int index = Interop.Globalization.IndexOfOrdinalIgnoreCase(value, value.Length, pSource + startIndex, count, findLast: false); + return index != -1 ? + startIndex + index : + -1; + } + } + + int endIndex = startIndex + (count - value.Length); + for (int i = startIndex; i <= endIndex; i++) + { + int valueIndex, sourceIndex; + + for (valueIndex = 0, sourceIndex = i; + valueIndex < value.Length && source[sourceIndex] == value[valueIndex]; + valueIndex++, sourceIndex++) ; + + if (valueIndex == value.Length) + { + return i; + } + } + + return -1; + } + + internal static unsafe int IndexOfOrdinalCore(ReadOnlySpan source, ReadOnlySpan value, bool ignoreCase) + { + Debug.Assert(!GlobalizationMode.Invariant); + + Debug.Assert(source.Length != 0); + Debug.Assert(value.Length != 0); + + if (source.Length < value.Length) + { + return -1; + } + + if (ignoreCase) + { + fixed (char* pSource = &MemoryMarshal.GetReference(source)) + fixed (char* pValue = &MemoryMarshal.GetReference(value)) + { + int index = Interop.Globalization.IndexOfOrdinalIgnoreCase(pValue, value.Length, pSource, source.Length, findLast: false); + return index; + } + } + + int endIndex = source.Length - value.Length; + for (int i = 0; i <= endIndex; i++) + { + int valueIndex, sourceIndex; + + for (valueIndex = 0, sourceIndex = i; + valueIndex < value.Length && source[sourceIndex] == value[valueIndex]; + valueIndex++, sourceIndex++) + ; + + if (valueIndex == value.Length) + { + return i; + } + } + + return -1; + } + + internal static unsafe int LastIndexOfOrdinalCore(string source, string value, int startIndex, int count, bool ignoreCase) + { + Debug.Assert(!GlobalizationMode.Invariant); + + Debug.Assert(source != null); + Debug.Assert(value != null); + + if (value.Length == 0) + { + return startIndex; + } + + if (count < value.Length) + { + return -1; + } + + // startIndex is the index into source where we start search backwards from. + // leftStartIndex is the index into source of the start of the string that is + // count characters away from startIndex. + int leftStartIndex = startIndex - count + 1; + + if (ignoreCase) + { + fixed (char* pSource = source) + { + int lastIndex = Interop.Globalization.IndexOfOrdinalIgnoreCase(value, value.Length, pSource + leftStartIndex, count, findLast: true); + return lastIndex != -1 ? + leftStartIndex + lastIndex : + -1; + } + } + + for (int i = startIndex - value.Length + 1; i >= leftStartIndex; i--) + { + int valueIndex, sourceIndex; + + for (valueIndex = 0, sourceIndex = i; + valueIndex < value.Length && source[sourceIndex] == value[valueIndex]; + valueIndex++, sourceIndex++) ; + + if (valueIndex == value.Length) { + return i; + } + } + + return -1; + } + + private static unsafe int CompareStringOrdinalIgnoreCase(char* string1, int count1, char* string2, int count2) + { + Debug.Assert(!GlobalizationMode.Invariant); + Debug.Assert(string1 != null); + Debug.Assert(string2 != null); + + return Interop.Globalization.CompareStringOrdinalIgnoreCase(string1, count1, string2, count2); + } + + // TODO https://github.com/dotnet/coreclr/issues/13827: + // This method shouldn't be necessary, as we should be able to just use the overload + // that takes two spans. But due to this issue, that's adding significant overhead. + private unsafe int CompareString(ReadOnlySpan string1, string string2, CompareOptions options) + { + Debug.Assert(!_invariantMode); + Debug.Assert(string2 != null); + Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0); + + fixed (char* pString1 = &MemoryMarshal.GetReference(string1)) + fixed (char* pString2 = &string2.GetRawStringData()) + { + return Interop.Globalization.CompareString(_sortHandle, pString1, string1.Length, pString2, string2.Length, options); + } + } + + private unsafe int CompareString(ReadOnlySpan string1, ReadOnlySpan string2, CompareOptions options) + { + Debug.Assert(!_invariantMode); + Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0); + + fixed (char* pString1 = &MemoryMarshal.GetReference(string1)) + fixed (char* pString2 = &MemoryMarshal.GetReference(string2)) + { + return Interop.Globalization.CompareString(_sortHandle, pString1, string1.Length, pString2, string2.Length, options); + } + } + + internal unsafe int IndexOfCore(string source, string target, int startIndex, int count, CompareOptions options, int* matchLengthPtr) + { + Debug.Assert(!_invariantMode); + + Debug.Assert(!string.IsNullOrEmpty(source)); + Debug.Assert(target != null); + Debug.Assert((options & CompareOptions.OrdinalIgnoreCase) == 0); + + int index; + + if (target.Length == 0) + { + if (matchLengthPtr != null) + *matchLengthPtr = 0; + return startIndex; + } + + if (options == CompareOptions.Ordinal) + { + index = IndexOfOrdinal(source, target, startIndex, count, ignoreCase: false); + if (index != -1) + { + if (matchLengthPtr != null) + *matchLengthPtr = target.Length; + } + return index; + } + +#if CORECLR + if (_isAsciiEqualityOrdinal && CanUseAsciiOrdinalForOptions(options) && source.IsFastSort() && target.IsFastSort()) + { + index = IndexOf(source, target, startIndex, count, GetOrdinalCompareOptions(options)); + if (index != -1) + { + if (matchLengthPtr != null) + *matchLengthPtr = target.Length; + } + return index; + } +#endif + + fixed (char* pSource = source) + { + index = Interop.Globalization.IndexOf(_sortHandle, target, target.Length, pSource + startIndex, count, options, matchLengthPtr); + + return index != -1 ? index + startIndex : -1; + } + } + + // For now, this method is only called from Span APIs with either options == CompareOptions.None or CompareOptions.IgnoreCase + internal unsafe int IndexOfCore(ReadOnlySpan source, ReadOnlySpan target, CompareOptions options, int* matchLengthPtr) + { + Debug.Assert(!_invariantMode); + Debug.Assert(source.Length != 0); + Debug.Assert(target.Length != 0); + + if (_isAsciiEqualityOrdinal && CanUseAsciiOrdinalForOptions(options)) + { + if ((options & CompareOptions.IgnoreCase) == CompareOptions.IgnoreCase) + { + return IndexOfOrdinalIgnoreCaseHelper(source, target, options, matchLengthPtr); + } + else + { + return IndexOfOrdinalHelper(source, target, options, matchLengthPtr); + } + } + else + { + fixed (char* pSource = &MemoryMarshal.GetReference(source)) + fixed (char* pTarget = &MemoryMarshal.GetReference(target)) + { + return Interop.Globalization.IndexOf(_sortHandle, pTarget, target.Length, pSource, source.Length, options, matchLengthPtr); + } + } + } + + private unsafe int IndexOfOrdinalIgnoreCaseHelper(ReadOnlySpan source, ReadOnlySpan target, CompareOptions options, int* matchLengthPtr) + { + Debug.Assert(!_invariantMode); + + Debug.Assert(!source.IsEmpty); + Debug.Assert(!target.IsEmpty); + Debug.Assert(_isAsciiEqualityOrdinal); + + fixed (char* ap = &MemoryMarshal.GetReference(source)) + fixed (char* bp = &MemoryMarshal.GetReference(target)) + { + char* a = ap; + char* b = bp; + int endIndex = source.Length - target.Length; + + if (endIndex < 0) + goto InteropCall; + + for (int j = 0; j < target.Length; j++) + { + char targetChar = *(b + j); + if (targetChar >= 0x80 || s_highCharTable[targetChar]) + goto InteropCall; + } + + int i = 0; + for (; i <= endIndex; i++) + { + int targetIndex = 0; + int sourceIndex = i; + + for (; targetIndex < target.Length; targetIndex++) + { + char valueChar = *(a + sourceIndex); + char targetChar = *(b + targetIndex); + + if (valueChar == targetChar && valueChar < 0x80 && !s_highCharTable[valueChar]) + { + sourceIndex++; + continue; + } + + // uppercase both chars - notice that we need just one compare per char + if ((uint)(valueChar - 'a') <= ('z' - 'a')) + valueChar = (char)(valueChar - 0x20); + if ((uint)(targetChar - 'a') <= ('z' - 'a')) + targetChar = (char)(targetChar - 0x20); + + if (valueChar >= 0x80 || s_highCharTable[valueChar]) + goto InteropCall; + else if (valueChar != targetChar) + break; + sourceIndex++; + } + + if (targetIndex == target.Length) + { + if (matchLengthPtr != null) + *matchLengthPtr = target.Length; + return i; + } + } + if (i > endIndex) + return -1; + InteropCall: + return Interop.Globalization.IndexOf(_sortHandle, b, target.Length, a, source.Length, options, matchLengthPtr); + } + } + + private unsafe int IndexOfOrdinalHelper(ReadOnlySpan source, ReadOnlySpan target, CompareOptions options, int* matchLengthPtr) + { + Debug.Assert(!_invariantMode); + + Debug.Assert(!source.IsEmpty); + Debug.Assert(!target.IsEmpty); + Debug.Assert(_isAsciiEqualityOrdinal); + + fixed (char* ap = &MemoryMarshal.GetReference(source)) + fixed (char* bp = &MemoryMarshal.GetReference(target)) + { + char* a = ap; + char* b = bp; + int endIndex = source.Length - target.Length; + + if (endIndex < 0) + goto InteropCall; + + for (int j = 0; j < target.Length; j++) + { + char targetChar = *(b + j); + if (targetChar >= 0x80 || s_highCharTable[targetChar]) + goto InteropCall; + } + + int i = 0; + for (; i <= endIndex; i++) + { + int targetIndex = 0; + int sourceIndex = i; + + for (; targetIndex < target.Length; targetIndex++) + { + char valueChar = *(a + sourceIndex); + char targetChar = *(b + targetIndex); + if (valueChar >= 0x80 || s_highCharTable[valueChar]) + goto InteropCall; + else if (valueChar != targetChar) + break; + sourceIndex++; + } + + if (targetIndex == target.Length) + { + if (matchLengthPtr != null) + *matchLengthPtr = target.Length; + return i; + } + } + if (i > endIndex) + return -1; + InteropCall: + return Interop.Globalization.IndexOf(_sortHandle, b, target.Length, a, source.Length, options, matchLengthPtr); + } + } + + private unsafe int LastIndexOfCore(string source, string target, int startIndex, int count, CompareOptions options) + { + Debug.Assert(!_invariantMode); + + Debug.Assert(!string.IsNullOrEmpty(source)); + Debug.Assert(target != null); + Debug.Assert((options & CompareOptions.OrdinalIgnoreCase) == 0); + + if (target.Length == 0) + { + return startIndex; + } + + if (options == CompareOptions.Ordinal) + { + return LastIndexOfOrdinalCore(source, target, startIndex, count, ignoreCase: false); + } + +#if CORECLR + if (_isAsciiEqualityOrdinal && CanUseAsciiOrdinalForOptions(options) && source.IsFastSort() && target.IsFastSort()) + { + return LastIndexOf(source, target, startIndex, count, GetOrdinalCompareOptions(options)); + } +#endif + + // startIndex is the index into source where we start search backwards from. leftStartIndex is the index into source + // of the start of the string that is count characters away from startIndex. + int leftStartIndex = (startIndex - count + 1); + + fixed (char* pSource = source) + { + int lastIndex = Interop.Globalization.LastIndexOf(_sortHandle, target, target.Length, pSource + (startIndex - count + 1), count, options); + + return lastIndex != -1 ? lastIndex + leftStartIndex : -1; + } + } + + private bool StartsWith(string source, string prefix, CompareOptions options) + { + Debug.Assert(!_invariantMode); + + Debug.Assert(!string.IsNullOrEmpty(source)); + Debug.Assert(!string.IsNullOrEmpty(prefix)); + Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0); + +#if CORECLR + if (_isAsciiEqualityOrdinal && CanUseAsciiOrdinalForOptions(options) && source.IsFastSort() && prefix.IsFastSort()) + { + return IsPrefix(source, prefix, GetOrdinalCompareOptions(options)); + } +#endif + + return Interop.Globalization.StartsWith(_sortHandle, prefix, prefix.Length, source, source.Length, options); + } + + private unsafe bool StartsWith(ReadOnlySpan source, ReadOnlySpan prefix, CompareOptions options) + { + Debug.Assert(!_invariantMode); + + Debug.Assert(!source.IsEmpty); + Debug.Assert(!prefix.IsEmpty); + Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0); + + if (_isAsciiEqualityOrdinal && CanUseAsciiOrdinalForOptions(options)) + { + if (source.Length < prefix.Length) + { + return false; + } + + if ((options & CompareOptions.IgnoreCase) == CompareOptions.IgnoreCase) + { + return StartsWithOrdinalIgnoreCaseHelper(source, prefix, options); + } + else + { + return StartsWithOrdinalHelper(source, prefix, options); + } + } + else + { + fixed (char* pSource = &MemoryMarshal.GetReference(source)) + fixed (char* pPrefix = &MemoryMarshal.GetReference(prefix)) + { + return Interop.Globalization.StartsWith(_sortHandle, pPrefix, prefix.Length, pSource, source.Length, options); + } + } + } + + private unsafe bool StartsWithOrdinalIgnoreCaseHelper(ReadOnlySpan source, ReadOnlySpan prefix, CompareOptions options) + { + Debug.Assert(!_invariantMode); + + Debug.Assert(!source.IsEmpty); + Debug.Assert(!prefix.IsEmpty); + Debug.Assert(_isAsciiEqualityOrdinal); + Debug.Assert(source.Length >= prefix.Length); + + int length = prefix.Length; + + fixed (char* ap = &MemoryMarshal.GetReference(source)) + fixed (char* bp = &MemoryMarshal.GetReference(prefix)) + { + char* a = ap; + char* b = bp; + + while (length != 0 && (*a < 0x80) && (*b < 0x80) && (!s_highCharTable[*a]) && (!s_highCharTable[*b])) + { + int charA = *a; + int charB = *b; + + if (charA == charB) + { + a++; b++; + length--; + continue; + } + + // uppercase both chars - notice that we need just one compare per char + if ((uint)(charA - 'a') <= (uint)('z' - 'a')) charA -= 0x20; + if ((uint)(charB - 'a') <= (uint)('z' - 'a')) charB -= 0x20; + + if (charA != charB) + return false; + + // Next char + a++; b++; + length--; + } + + if (length == 0) return true; + return Interop.Globalization.StartsWith(_sortHandle, b, length, a, length, options); + } + } + + private unsafe bool StartsWithOrdinalHelper(ReadOnlySpan source, ReadOnlySpan prefix, CompareOptions options) + { + Debug.Assert(!_invariantMode); + + Debug.Assert(!source.IsEmpty); + Debug.Assert(!prefix.IsEmpty); + Debug.Assert(_isAsciiEqualityOrdinal); + Debug.Assert(source.Length >= prefix.Length); + + int length = prefix.Length; + + fixed (char* ap = &MemoryMarshal.GetReference(source)) + fixed (char* bp = &MemoryMarshal.GetReference(prefix)) + { + char* a = ap; + char* b = bp; + + while (length != 0 && (*a < 0x80) && (*b < 0x80) && (!s_highCharTable[*a]) && (!s_highCharTable[*b])) + { + int charA = *a; + int charB = *b; + + if (charA != charB) + return false; + + // Next char + a++; b++; + length--; + } + + if (length == 0) return true; + return Interop.Globalization.StartsWith(_sortHandle, b, length, a, length, options); + } + } + + private bool EndsWith(string source, string suffix, CompareOptions options) + { + Debug.Assert(!_invariantMode); + + Debug.Assert(!string.IsNullOrEmpty(source)); + Debug.Assert(!string.IsNullOrEmpty(suffix)); + Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0); + +#if CORECLR + if (_isAsciiEqualityOrdinal && CanUseAsciiOrdinalForOptions(options) && source.IsFastSort() && suffix.IsFastSort()) + { + return IsSuffix(source, suffix, GetOrdinalCompareOptions(options)); + } +#endif + + return Interop.Globalization.EndsWith(_sortHandle, suffix, suffix.Length, source, source.Length, options); + } + + private unsafe bool EndsWith(ReadOnlySpan source, ReadOnlySpan suffix, CompareOptions options) + { + Debug.Assert(!_invariantMode); + + Debug.Assert(!source.IsEmpty); + Debug.Assert(!suffix.IsEmpty); + Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0); + + if (_isAsciiEqualityOrdinal && CanUseAsciiOrdinalForOptions(options)) + { + if (source.Length < suffix.Length) + { + return false; + } + + if ((options & CompareOptions.IgnoreCase) == CompareOptions.IgnoreCase) + { + return EndsWithOrdinalIgnoreCaseHelper(source, suffix, options); + } + else + { + return EndsWithOrdinalHelper(source, suffix, options); + } + } + else + { + fixed (char* pSource = &MemoryMarshal.GetReference(source)) + fixed (char* pSuffix = &MemoryMarshal.GetReference(suffix)) + { + return Interop.Globalization.EndsWith(_sortHandle, pSuffix, suffix.Length, pSource, source.Length, options); + } + } + } + + private unsafe bool EndsWithOrdinalIgnoreCaseHelper(ReadOnlySpan source, ReadOnlySpan suffix, CompareOptions options) + { + Debug.Assert(!_invariantMode); + + Debug.Assert(!source.IsEmpty); + Debug.Assert(!suffix.IsEmpty); + Debug.Assert(_isAsciiEqualityOrdinal); + Debug.Assert(source.Length >= suffix.Length); + + int length = suffix.Length; + + fixed (char* ap = &MemoryMarshal.GetReference(source)) + fixed (char* bp = &MemoryMarshal.GetReference(suffix)) + { + char* a = ap + source.Length - 1; + char* b = bp + suffix.Length - 1; + + while (length != 0 && (*a < 0x80) && (*b < 0x80) && (!s_highCharTable[*a]) && (!s_highCharTable[*b])) + { + int charA = *a; + int charB = *b; + + if (charA == charB) + { + a--; b--; + length--; + continue; + } + + // uppercase both chars - notice that we need just one compare per char + if ((uint)(charA - 'a') <= (uint)('z' - 'a')) charA -= 0x20; + if ((uint)(charB - 'a') <= (uint)('z' - 'a')) charB -= 0x20; + + if (charA != charB) + return false; + + // Next char + a--; b--; + length--; + } + + if (length == 0) return true; + return Interop.Globalization.EndsWith(_sortHandle, b - length + 1, length, a - length + 1, length, options); + } + } + + private unsafe bool EndsWithOrdinalHelper(ReadOnlySpan source, ReadOnlySpan suffix, CompareOptions options) + { + Debug.Assert(!_invariantMode); + + Debug.Assert(!source.IsEmpty); + Debug.Assert(!suffix.IsEmpty); + Debug.Assert(_isAsciiEqualityOrdinal); + Debug.Assert(source.Length >= suffix.Length); + + int length = suffix.Length; + + fixed (char* ap = &MemoryMarshal.GetReference(source)) + fixed (char* bp = &MemoryMarshal.GetReference(suffix)) + { + char* a = ap + source.Length - 1; + char* b = bp + suffix.Length - 1; + + while (length != 0 && (*a < 0x80) && (*b < 0x80) && (!s_highCharTable[*a]) && (!s_highCharTable[*b])) + { + int charA = *a; + int charB = *b; + + if (charA != charB) + return false; + + // Next char + a--; b--; + length--; + } + + if (length == 0) return true; + return Interop.Globalization.EndsWith(_sortHandle, b - length + 1, length, a - length + 1, length, options); + } + } + + private unsafe SortKey CreateSortKey(String source, CompareOptions options) + { + Debug.Assert(!_invariantMode); + + if (source==null) { throw new ArgumentNullException(nameof(source)); } + + if ((options & ValidSortkeyCtorMaskOffFlags) != 0) + { + throw new ArgumentException(SR.Argument_InvalidFlag, nameof(options)); + } + + byte [] keyData; + if (source.Length == 0) + { + keyData = Array.Empty(); + } + else + { + int sortKeyLength = Interop.Globalization.GetSortKey(_sortHandle, source, source.Length, null, 0, options); + keyData = new byte[sortKeyLength]; + + fixed (byte* pSortKey = keyData) + { + if (Interop.Globalization.GetSortKey(_sortHandle, source, source.Length, pSortKey, sortKeyLength, options) != sortKeyLength) + { + throw new ArgumentException(SR.Arg_ExternalException); + } + } + } + + return new SortKey(Name, source, options, keyData); + } + + private static unsafe bool IsSortable(char *text, int length) + { + Debug.Assert(!GlobalizationMode.Invariant); + + int index = 0; + UnicodeCategory uc; + + while (index < length) + { + if (Char.IsHighSurrogate(text[index])) + { + if (index == length - 1 || !Char.IsLowSurrogate(text[index+1])) + return false; // unpaired surrogate + + uc = CharUnicodeInfo.GetUnicodeCategory(Char.ConvertToUtf32(text[index], text[index+1])); + if (uc == UnicodeCategory.PrivateUse || uc == UnicodeCategory.OtherNotAssigned) + return false; + + index += 2; + continue; + } + + if (Char.IsLowSurrogate(text[index])) + { + return false; // unpaired surrogate + } + + uc = CharUnicodeInfo.GetUnicodeCategory(text[index]); + if (uc == UnicodeCategory.PrivateUse || uc == UnicodeCategory.OtherNotAssigned) + { + return false; + } + + index++; + } + + return true; + } + + // ----------------------------- + // ---- PAL layer ends here ---- + // ----------------------------- + + internal unsafe int GetHashCodeOfStringCore(string source, CompareOptions options) + { + Debug.Assert(!_invariantMode); + + Debug.Assert(source != null); + Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0); + + if (source.Length == 0) + { + return 0; + } + + int sortKeyLength = Interop.Globalization.GetSortKey(_sortHandle, source, source.Length, null, 0, options); + + byte[] borrowedArr = null; + Span span = sortKeyLength <= 512 ? + stackalloc byte[512] : + (borrowedArr = ArrayPool.Shared.Rent(sortKeyLength)); + + fixed (byte* pSortKey = &MemoryMarshal.GetReference(span)) + { + if (Interop.Globalization.GetSortKey(_sortHandle, source, source.Length, pSortKey, sortKeyLength, options) != sortKeyLength) + { + throw new ArgumentException(SR.Arg_ExternalException); + } + } + + int hash = Marvin.ComputeHash32(span.Slice(0, sortKeyLength), Marvin.DefaultSeed); + + // Return the borrowed array if necessary. + if (borrowedArr != null) + { + ArrayPool.Shared.Return(borrowedArr); + } + + return hash; + } + + private static CompareOptions GetOrdinalCompareOptions(CompareOptions options) + { + if ((options & CompareOptions.IgnoreCase) == CompareOptions.IgnoreCase) + { + return CompareOptions.OrdinalIgnoreCase; + } + else + { + return CompareOptions.Ordinal; + } + } + + private static bool CanUseAsciiOrdinalForOptions(CompareOptions options) + { + // Unlike the other Ignore options, IgnoreSymbols impacts ASCII characters (e.g. '). + return (options & CompareOptions.IgnoreSymbols) == 0; + } + + private static byte[] GetNullTerminatedUtf8String(string s) + { + int byteLen = System.Text.Encoding.UTF8.GetByteCount(s); + + // Allocate an extra byte (which defaults to 0) as the null terminator. + byte[] buffer = new byte[byteLen + 1]; + + int bytesWritten = System.Text.Encoding.UTF8.GetBytes(s, 0, s.Length, buffer, 0); + + Debug.Assert(bytesWritten == byteLen); + + return buffer; + } + + private SortVersion GetSortVersion() + { + Debug.Assert(!_invariantMode); + + int sortVersion = Interop.Globalization.GetSortVersion(_sortHandle); + return new SortVersion(sortVersion, LCID, new Guid(sortVersion, 0, 0, 0, 0, 0, 0, + (byte) (LCID >> 24), + (byte) ((LCID & 0x00FF0000) >> 16), + (byte) ((LCID & 0x0000FF00) >> 8), + (byte) (LCID & 0xFF))); + } + + // See https://github.com/dotnet/coreclr/blob/master/src/utilcode/util_nodependencies.cpp#L970 + private static readonly bool[] s_highCharTable = new bool[0x80] + { + true, /* 0x0, 0x0 */ + true, /* 0x1, .*/ + true, /* 0x2, .*/ + true, /* 0x3, .*/ + true, /* 0x4, .*/ + true, /* 0x5, .*/ + true, /* 0x6, .*/ + true, /* 0x7, .*/ + true, /* 0x8, .*/ + false, /* 0x9, */ + true, /* 0xA, */ + false, /* 0xB, .*/ + false, /* 0xC, .*/ + true, /* 0xD, */ + true, /* 0xE, .*/ + true, /* 0xF, .*/ + true, /* 0x10, .*/ + true, /* 0x11, .*/ + true, /* 0x12, .*/ + true, /* 0x13, .*/ + true, /* 0x14, .*/ + true, /* 0x15, .*/ + true, /* 0x16, .*/ + true, /* 0x17, .*/ + true, /* 0x18, .*/ + true, /* 0x19, .*/ + true, /* 0x1A, */ + true, /* 0x1B, .*/ + true, /* 0x1C, .*/ + true, /* 0x1D, .*/ + true, /* 0x1E, .*/ + true, /* 0x1F, .*/ + false, /*0x20, */ + false, /*0x21, !*/ + false, /*0x22, "*/ + false, /*0x23, #*/ + false, /*0x24, $*/ + false, /*0x25, %*/ + false, /*0x26, &*/ + true, /*0x27, '*/ + false, /*0x28, (*/ + false, /*0x29, )*/ + false, /*0x2A **/ + false, /*0x2B, +*/ + false, /*0x2C, ,*/ + true, /*0x2D, -*/ + false, /*0x2E, .*/ + false, /*0x2F, /*/ + false, /*0x30, 0*/ + false, /*0x31, 1*/ + false, /*0x32, 2*/ + false, /*0x33, 3*/ + false, /*0x34, 4*/ + false, /*0x35, 5*/ + false, /*0x36, 6*/ + false, /*0x37, 7*/ + false, /*0x38, 8*/ + false, /*0x39, 9*/ + false, /*0x3A, :*/ + false, /*0x3B, ;*/ + false, /*0x3C, <*/ + false, /*0x3D, =*/ + false, /*0x3E, >*/ + false, /*0x3F, ?*/ + false, /*0x40, @*/ + false, /*0x41, A*/ + false, /*0x42, B*/ + false, /*0x43, C*/ + false, /*0x44, D*/ + false, /*0x45, E*/ + false, /*0x46, F*/ + false, /*0x47, G*/ + false, /*0x48, H*/ + false, /*0x49, I*/ + false, /*0x4A, J*/ + false, /*0x4B, K*/ + false, /*0x4C, L*/ + false, /*0x4D, M*/ + false, /*0x4E, N*/ + false, /*0x4F, O*/ + false, /*0x50, P*/ + false, /*0x51, Q*/ + false, /*0x52, R*/ + false, /*0x53, S*/ + false, /*0x54, T*/ + false, /*0x55, U*/ + false, /*0x56, V*/ + false, /*0x57, W*/ + false, /*0x58, X*/ + false, /*0x59, Y*/ + false, /*0x5A, Z*/ + false, /*0x5B, [*/ + false, /*0x5C, \*/ + false, /*0x5D, ]*/ + false, /*0x5E, ^*/ + false, /*0x5F, _*/ + false, /*0x60, `*/ + false, /*0x61, a*/ + false, /*0x62, b*/ + false, /*0x63, c*/ + false, /*0x64, d*/ + false, /*0x65, e*/ + false, /*0x66, f*/ + false, /*0x67, g*/ + false, /*0x68, h*/ + false, /*0x69, i*/ + false, /*0x6A, j*/ + false, /*0x6B, k*/ + false, /*0x6C, l*/ + false, /*0x6D, m*/ + false, /*0x6E, n*/ + false, /*0x6F, o*/ + false, /*0x70, p*/ + false, /*0x71, q*/ + false, /*0x72, r*/ + false, /*0x73, s*/ + false, /*0x74, t*/ + false, /*0x75, u*/ + false, /*0x76, v*/ + false, /*0x77, w*/ + false, /*0x78, x*/ + false, /*0x79, y*/ + false, /*0x7A, z*/ + false, /*0x7B, {*/ + false, /*0x7C, |*/ + false, /*0x7D, }*/ + false, /*0x7E, ~*/ + true, /*0x7F, */ + }; + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/CompareInfo.Windows.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/CompareInfo.Windows.cs new file mode 100644 index 0000000000..37ed9469d9 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/CompareInfo.Windows.cs @@ -0,0 +1,644 @@ +// 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; +using System.Diagnostics; +using System.Security; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +namespace System.Globalization +{ + public partial class CompareInfo + { + private unsafe void InitSort(CultureInfo culture) + { + _sortName = culture.SortName; + + if (_invariantMode) + { + _sortHandle = IntPtr.Zero; + } + else + { + const uint LCMAP_SORTHANDLE = 0x20000000; + + IntPtr handle; + int ret = Interop.Kernel32.LCMapStringEx(_sortName, LCMAP_SORTHANDLE, null, 0, &handle, IntPtr.Size, null, null, IntPtr.Zero); + _sortHandle = ret > 0 ? handle : IntPtr.Zero; + } + } + + private static unsafe int FindStringOrdinal( + uint dwFindStringOrdinalFlags, + string stringSource, + int offset, + int cchSource, + string value, + int cchValue, + bool bIgnoreCase) + { + Debug.Assert(!GlobalizationMode.Invariant); + Debug.Assert(stringSource != null); + Debug.Assert(value != null); + + fixed (char* pSource = stringSource) + fixed (char* pValue = value) + { + int ret = Interop.Kernel32.FindStringOrdinal( + dwFindStringOrdinalFlags, + pSource + offset, + cchSource, + pValue, + cchValue, + bIgnoreCase ? 1 : 0); + return ret < 0 ? ret : ret + offset; + } + } + + private static unsafe int FindStringOrdinal( + uint dwFindStringOrdinalFlags, + ReadOnlySpan source, + ReadOnlySpan value, + bool bIgnoreCase) + { + Debug.Assert(!GlobalizationMode.Invariant); + Debug.Assert(!source.IsEmpty); + Debug.Assert(!value.IsEmpty); + + fixed (char* pSource = &MemoryMarshal.GetReference(source)) + fixed (char* pValue = &MemoryMarshal.GetReference(value)) + { + int ret = Interop.Kernel32.FindStringOrdinal( + dwFindStringOrdinalFlags, + pSource, + source.Length, + pValue, + value.Length, + bIgnoreCase ? 1 : 0); + return ret; + } + } + + internal static int IndexOfOrdinalCore(string source, string value, int startIndex, int count, bool ignoreCase) + { + Debug.Assert(!GlobalizationMode.Invariant); + + Debug.Assert(source != null); + Debug.Assert(value != null); + + return FindStringOrdinal(FIND_FROMSTART, source, startIndex, count, value, value.Length, ignoreCase); + } + + internal static int IndexOfOrdinalCore(ReadOnlySpan source, ReadOnlySpan value, bool ignoreCase) + { + Debug.Assert(!GlobalizationMode.Invariant); + + Debug.Assert(source.Length != 0); + Debug.Assert(value.Length != 0); + + return FindStringOrdinal(FIND_FROMSTART, source, value, ignoreCase); + } + + internal static int LastIndexOfOrdinalCore(string source, string value, int startIndex, int count, bool ignoreCase) + { + Debug.Assert(!GlobalizationMode.Invariant); + + Debug.Assert(source != null); + Debug.Assert(value != null); + + return FindStringOrdinal(FIND_FROMEND, source, startIndex - count + 1, count, value, value.Length, ignoreCase); + } + + private unsafe int GetHashCodeOfStringCore(string source, CompareOptions options) + { + Debug.Assert(!_invariantMode); + + Debug.Assert(source != null); + Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0); + + if (source.Length == 0) + { + return 0; + } + + uint flags = LCMAP_SORTKEY | (uint)GetNativeCompareFlags(options); + + fixed (char* pSource = source) + { + int sortKeyLength = Interop.Kernel32.LCMapStringEx(_sortHandle != IntPtr.Zero ? null : _sortName, + flags, + pSource, source.Length, + null, 0, + null, null, _sortHandle); + if (sortKeyLength == 0) + { + throw new ArgumentException(SR.Arg_ExternalException); + } + + byte[] borrowedArr = null; + Span span = sortKeyLength <= 512 ? + stackalloc byte[512] : + (borrowedArr = ArrayPool.Shared.Rent(sortKeyLength)); + + fixed (byte* pSortKey = &MemoryMarshal.GetReference(span)) + { + if (Interop.Kernel32.LCMapStringEx(_sortHandle != IntPtr.Zero ? null : _sortName, + flags, + pSource, source.Length, + pSortKey, sortKeyLength, + null, null, _sortHandle) != sortKeyLength) + { + throw new ArgumentException(SR.Arg_ExternalException); + } + } + + int hash = Marvin.ComputeHash32(span.Slice(0, sortKeyLength), Marvin.DefaultSeed); + + // Return the borrowed array if necessary. + if (borrowedArr != null) + { + ArrayPool.Shared.Return(borrowedArr); + } + + return hash; + } + } + + private static unsafe int CompareStringOrdinalIgnoreCase(char* string1, int count1, char* string2, int count2) + { + Debug.Assert(!GlobalizationMode.Invariant); + Debug.Assert(string1 != null); + Debug.Assert(string2 != null); + + // Use the OS to compare and then convert the result to expected value by subtracting 2 + return Interop.Kernel32.CompareStringOrdinal(string1, count1, string2, count2, true) - 2; + } + + // TODO https://github.com/dotnet/coreclr/issues/13827: + // This method shouldn't be necessary, as we should be able to just use the overload + // that takes two spans. But due to this issue, that's adding significant overhead. + private unsafe int CompareString(ReadOnlySpan string1, string string2, CompareOptions options) + { + Debug.Assert(string2 != null); + Debug.Assert(!_invariantMode); + Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0); + + string localeName = _sortHandle != IntPtr.Zero ? null : _sortName; + + fixed (char* pLocaleName = localeName) + fixed (char* pString1 = &MemoryMarshal.GetReference(string1)) + fixed (char* pString2 = &string2.GetRawStringData()) + { + Debug.Assert(pString1 != null); + int result = Interop.Kernel32.CompareStringEx( + pLocaleName, + (uint)GetNativeCompareFlags(options), + pString1, + string1.Length, + pString2, + string2.Length, + null, + null, + _sortHandle); + + if (result == 0) + { + throw new ArgumentException(SR.Arg_ExternalException); + } + + // Map CompareStringEx return value to -1, 0, 1. + return result - 2; + } + } + + private unsafe int CompareString(ReadOnlySpan string1, ReadOnlySpan string2, CompareOptions options) + { + Debug.Assert(!_invariantMode); + Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0); + + string localeName = _sortHandle != IntPtr.Zero ? null : _sortName; + + fixed (char* pLocaleName = localeName) + fixed (char* pString1 = &MemoryMarshal.GetReference(string1)) + fixed (char* pString2 = &MemoryMarshal.GetReference(string2)) + { + Debug.Assert(pString1 != null); + Debug.Assert(pString2 != null); + int result = Interop.Kernel32.CompareStringEx( + pLocaleName, + (uint)GetNativeCompareFlags(options), + pString1, + string1.Length, + pString2, + string2.Length, + null, + null, + _sortHandle); + + if (result == 0) + { + throw new ArgumentException(SR.Arg_ExternalException); + } + + // Map CompareStringEx return value to -1, 0, 1. + return result - 2; + } + } + + private unsafe int FindString( + uint dwFindNLSStringFlags, + ReadOnlySpan lpStringSource, + ReadOnlySpan lpStringValue, + int* pcchFound) + { + Debug.Assert(!_invariantMode); + Debug.Assert(!lpStringSource.IsEmpty); + Debug.Assert(!lpStringValue.IsEmpty); + + string localeName = _sortHandle != IntPtr.Zero ? null : _sortName; + + fixed (char* pLocaleName = localeName) + fixed (char* pSource = &MemoryMarshal.GetReference(lpStringSource)) + fixed (char* pValue = &MemoryMarshal.GetReference(lpStringValue)) + { + return Interop.Kernel32.FindNLSStringEx( + pLocaleName, + dwFindNLSStringFlags, + pSource, + lpStringSource.Length, + pValue, + lpStringValue.Length, + pcchFound, + null, + null, + _sortHandle); + } + } + + private unsafe int FindString( + uint dwFindNLSStringFlags, + string lpStringSource, + int startSource, + int cchSource, + string lpStringValue, + int startValue, + int cchValue, + int* pcchFound) + { + Debug.Assert(!_invariantMode); + Debug.Assert(lpStringSource != null); + Debug.Assert(lpStringValue != null); + + string localeName = _sortHandle != IntPtr.Zero ? null : _sortName; + + fixed (char* pLocaleName = localeName) + fixed (char* pSource = lpStringSource) + fixed (char* pValue = lpStringValue) + { + char* pS = pSource + startSource; + char* pV = pValue + startValue; + + return Interop.Kernel32.FindNLSStringEx( + pLocaleName, + dwFindNLSStringFlags, + pS, + cchSource, + pV, + cchValue, + pcchFound, + null, + null, + _sortHandle); + } + } + + internal unsafe int IndexOfCore(String source, String target, int startIndex, int count, CompareOptions options, int* matchLengthPtr) + { + Debug.Assert(!_invariantMode); + + Debug.Assert(source != null); + Debug.Assert(target != null); + Debug.Assert((options & CompareOptions.OrdinalIgnoreCase) == 0); + + if (target.Length == 0) + { + if (matchLengthPtr != null) + *matchLengthPtr = 0; + return startIndex; + } + + if (source.Length == 0) + { + return -1; + } + + if ((options & CompareOptions.Ordinal) != 0) + { + int retValue = FastIndexOfString(source, target, startIndex, count, target.Length, findLastIndex: false); + if (retValue >= 0) + { + if (matchLengthPtr != null) + *matchLengthPtr = target.Length; + } + return retValue; + } + else + { + int retValue = FindString(FIND_FROMSTART | (uint)GetNativeCompareFlags(options), source, startIndex, count, + target, 0, target.Length, matchLengthPtr); + if (retValue >= 0) + { + return retValue + startIndex; + } + } + + return -1; + } + + internal unsafe int IndexOfCore(ReadOnlySpan source, ReadOnlySpan target, CompareOptions options, int* matchLengthPtr) + { + Debug.Assert(!_invariantMode); + + Debug.Assert(source.Length != 0); + Debug.Assert(target.Length != 0); + Debug.Assert((options == CompareOptions.None || options == CompareOptions.IgnoreCase)); + + int retValue = FindString(FIND_FROMSTART | (uint)GetNativeCompareFlags(options), source, target, matchLengthPtr); + return retValue; + } + + private unsafe int LastIndexOfCore(string source, string target, int startIndex, int count, CompareOptions options) + { + Debug.Assert(!_invariantMode); + + Debug.Assert(!string.IsNullOrEmpty(source)); + Debug.Assert(target != null); + Debug.Assert((options & CompareOptions.OrdinalIgnoreCase) == 0); + + if (target.Length == 0) + return startIndex; + + if ((options & CompareOptions.Ordinal) != 0) + { + return FastIndexOfString(source, target, startIndex, count, target.Length, findLastIndex: true); + } + else + { + int retValue = FindString(FIND_FROMEND | (uint)GetNativeCompareFlags(options), source, startIndex - count + 1, + count, target, 0, target.Length, null); + + if (retValue >= 0) + { + return retValue + startIndex - (count - 1); + } + } + + return -1; + } + + private unsafe bool StartsWith(string source, string prefix, CompareOptions options) + { + Debug.Assert(!_invariantMode); + + Debug.Assert(!string.IsNullOrEmpty(source)); + Debug.Assert(!string.IsNullOrEmpty(prefix)); + Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0); + + return FindString(FIND_STARTSWITH | (uint)GetNativeCompareFlags(options), source, 0, source.Length, + prefix, 0, prefix.Length, null) >= 0; + } + + private unsafe bool StartsWith(ReadOnlySpan source, ReadOnlySpan prefix, CompareOptions options) + { + Debug.Assert(!_invariantMode); + + Debug.Assert(!source.IsEmpty); + Debug.Assert(!prefix.IsEmpty); + Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0); + + return FindString(FIND_STARTSWITH | (uint)GetNativeCompareFlags(options), source, prefix, null) >= 0; + } + + private unsafe bool EndsWith(string source, string suffix, CompareOptions options) + { + Debug.Assert(!_invariantMode); + + Debug.Assert(!string.IsNullOrEmpty(source)); + Debug.Assert(!string.IsNullOrEmpty(suffix)); + Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0); + + return FindString(FIND_ENDSWITH | (uint)GetNativeCompareFlags(options), source, 0, source.Length, + suffix, 0, suffix.Length, null) >= 0; + } + + private unsafe bool EndsWith(ReadOnlySpan source, ReadOnlySpan suffix, CompareOptions options) + { + Debug.Assert(!_invariantMode); + + Debug.Assert(!source.IsEmpty); + Debug.Assert(!suffix.IsEmpty); + Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0); + + return FindString(FIND_ENDSWITH | (uint)GetNativeCompareFlags(options), source, suffix, null) >= 0; + } + + // PAL ends here + [NonSerialized] + private IntPtr _sortHandle; + + private const uint LCMAP_SORTKEY = 0x00000400; + private const uint LCMAP_HASH = 0x00040000; + + private const int FIND_STARTSWITH = 0x00100000; + private const int FIND_ENDSWITH = 0x00200000; + private const int FIND_FROMSTART = 0x00400000; + private const int FIND_FROMEND = 0x00800000; + + // TODO: Instead of this method could we just have upstack code call IndexOfOrdinal with ignoreCase = false? + private static unsafe int FastIndexOfString(string source, string target, int startIndex, int sourceCount, int targetCount, bool findLastIndex) + { + int retValue = -1; + + int sourceStartIndex = findLastIndex ? startIndex - sourceCount + 1 : startIndex; + + fixed (char* pSource = source, spTarget = target) + { + char* spSubSource = pSource + sourceStartIndex; + + if (findLastIndex) + { + int startPattern = (sourceCount - 1) - targetCount + 1; + if (startPattern < 0) + return -1; + + char patternChar0 = spTarget[0]; + for (int ctrSrc = startPattern; ctrSrc >= 0; ctrSrc--) + { + if (spSubSource[ctrSrc] != patternChar0) + continue; + + int ctrPat; + for (ctrPat = 1; ctrPat < targetCount; ctrPat++) + { + if (spSubSource[ctrSrc + ctrPat] != spTarget[ctrPat]) + break; + } + if (ctrPat == targetCount) + { + retValue = ctrSrc; + break; + } + } + + if (retValue >= 0) + { + retValue += startIndex - sourceCount + 1; + } + } + else + { + int endPattern = (sourceCount - 1) - targetCount + 1; + if (endPattern < 0) + return -1; + + char patternChar0 = spTarget[0]; + for (int ctrSrc = 0; ctrSrc <= endPattern; ctrSrc++) + { + if (spSubSource[ctrSrc] != patternChar0) + continue; + int ctrPat; + for (ctrPat = 1; ctrPat < targetCount; ctrPat++) + { + if (spSubSource[ctrSrc + ctrPat] != spTarget[ctrPat]) + break; + } + if (ctrPat == targetCount) + { + retValue = ctrSrc; + break; + } + } + + if (retValue >= 0) + { + retValue += startIndex; + } + } + } + + return retValue; + } + + private unsafe SortKey CreateSortKey(String source, CompareOptions options) + { + Debug.Assert(!_invariantMode); + + if (source == null) { throw new ArgumentNullException(nameof(source)); } + + if ((options & ValidSortkeyCtorMaskOffFlags) != 0) + { + throw new ArgumentException(SR.Argument_InvalidFlag, nameof(options)); + } + + byte [] keyData = null; + if (source.Length == 0) + { + keyData = Array.Empty(); + } + else + { + uint flags = LCMAP_SORTKEY | (uint)GetNativeCompareFlags(options); + + fixed (char *pSource = source) + { + int sortKeyLength = Interop.Kernel32.LCMapStringEx(_sortHandle != IntPtr.Zero ? null : _sortName, + flags, + pSource, source.Length, + null, 0, + null, null, _sortHandle); + if (sortKeyLength == 0) + { + throw new ArgumentException(SR.Arg_ExternalException); + } + + keyData = new byte[sortKeyLength]; + + fixed (byte* pBytes = keyData) + { + if (Interop.Kernel32.LCMapStringEx(_sortHandle != IntPtr.Zero ? null : _sortName, + flags, + pSource, source.Length, + pBytes, keyData.Length, + null, null, _sortHandle) != sortKeyLength) + { + throw new ArgumentException(SR.Arg_ExternalException); + } + } + } + } + + return new SortKey(Name, source, options, keyData); + } + + private static unsafe bool IsSortable(char* text, int length) + { + Debug.Assert(!GlobalizationMode.Invariant); + Debug.Assert(text != null); + + return Interop.Kernel32.IsNLSDefinedString(Interop.Kernel32.COMPARE_STRING, 0, IntPtr.Zero, text, length); + } + + private const int COMPARE_OPTIONS_ORDINAL = 0x40000000; // Ordinal + private const int NORM_IGNORECASE = 0x00000001; // Ignores case. (use LINGUISTIC_IGNORECASE instead) + private const int NORM_IGNOREKANATYPE = 0x00010000; // Does not differentiate between Hiragana and Katakana characters. Corresponding Hiragana and Katakana will compare as equal. + private const int NORM_IGNORENONSPACE = 0x00000002; // Ignores nonspacing. This flag also removes Japanese accent characters. (use LINGUISTIC_IGNOREDIACRITIC instead) + private const int NORM_IGNORESYMBOLS = 0x00000004; // Ignores symbols. + private const int NORM_IGNOREWIDTH = 0x00020000; // Does not differentiate between a single-byte character and the same character as a double-byte character. + private const int NORM_LINGUISTIC_CASING = 0x08000000; // use linguistic rules for casing + private const int SORT_STRINGSORT = 0x00001000; // Treats punctuation the same as symbols. + + private static int GetNativeCompareFlags(CompareOptions options) + { + // Use "linguistic casing" by default (load the culture's casing exception tables) + int nativeCompareFlags = NORM_LINGUISTIC_CASING; + + if ((options & CompareOptions.IgnoreCase) != 0) { nativeCompareFlags |= NORM_IGNORECASE; } + if ((options & CompareOptions.IgnoreKanaType) != 0) { nativeCompareFlags |= NORM_IGNOREKANATYPE; } + if ((options & CompareOptions.IgnoreNonSpace) != 0) { nativeCompareFlags |= NORM_IGNORENONSPACE; } + if ((options & CompareOptions.IgnoreSymbols) != 0) { nativeCompareFlags |= NORM_IGNORESYMBOLS; } + if ((options & CompareOptions.IgnoreWidth) != 0) { nativeCompareFlags |= NORM_IGNOREWIDTH; } + if ((options & CompareOptions.StringSort) != 0) { nativeCompareFlags |= SORT_STRINGSORT; } + + // TODO: Can we try for GetNativeCompareFlags to never + // take Ordinal or OrdinalIgnoreCase. This value is not part of Win32, we just handle it special + // in some places. + // Suffix & Prefix shouldn't use this, make sure to turn off the NORM_LINGUISTIC_CASING flag + if (options == CompareOptions.Ordinal) { nativeCompareFlags = COMPARE_OPTIONS_ORDINAL; } + + Debug.Assert(((options & ~(CompareOptions.IgnoreCase | + CompareOptions.IgnoreKanaType | + CompareOptions.IgnoreNonSpace | + CompareOptions.IgnoreSymbols | + CompareOptions.IgnoreWidth | + CompareOptions.StringSort)) == 0) || + (options == CompareOptions.Ordinal), "[CompareInfo.GetNativeCompareFlags]Expected all flags to be handled"); + + return nativeCompareFlags; + } + + private unsafe SortVersion GetSortVersion() + { + Debug.Assert(!_invariantMode); + + Interop.Kernel32.NlsVersionInfoEx nlsVersion = new Interop.Kernel32.NlsVersionInfoEx(); + nlsVersion.dwNLSVersionInfoSize = sizeof(Interop.Kernel32.NlsVersionInfoEx); + Interop.Kernel32.GetNLSVersionEx(Interop.Kernel32.COMPARE_STRING, _sortName, &nlsVersion); + return new SortVersion( + nlsVersion.dwNLSVersion, + nlsVersion.dwEffectiveId == 0 ? LCID : nlsVersion.dwEffectiveId, + nlsVersion.guidCustomVersion); + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/CompareInfo.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/CompareInfo.cs index 38201530e8..76b65b9895 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/CompareInfo.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/CompareInfo.cs @@ -16,6 +16,8 @@ using System.Reflection; using System.Diagnostics.Private; using System.Runtime.InteropServices; using System.Runtime.Serialization; +using System.Buffers; +using System.Text; namespace System.Globalization { @@ -96,7 +98,7 @@ namespace System.Globalization ** culture the ID of the culture ** assembly the assembly which contains the sorting table. **Exceptions: - ** ArugmentNullException when the assembly is null + ** ArgumentNullException when the assembly is null ** ArgumentException if culture is invalid. ============================================================================*/ // Assembly constructor should be deprecated, we don't act on the assembly information any more @@ -123,7 +125,7 @@ namespace System.Globalization ** name the name of the culture ** assembly the assembly which contains the sorting table. **Exceptions: - ** ArugmentNullException when the assembly is null + ** ArgumentNullException when the assembly is null ** ArgumentException if name is invalid. ============================================================================*/ // Assembly constructor should be deprecated, we don't act on the assembly information any more @@ -300,7 +302,7 @@ namespace System.Globalization return (Compare(string1, string2, CompareOptions.None)); } - public unsafe virtual int Compare(string string1, string string2, CompareOptions options) + public virtual int Compare(string string1, string string2, CompareOptions options) { if (options == CompareOptions.OrdinalIgnoreCase) { @@ -341,7 +343,7 @@ namespace System.Globalization if (_invariantMode) { if ((options & CompareOptions.IgnoreCase) != 0) - return CompareOrdinalIgnoreCase(string1, 0, string1.Length, string2, 0, string2.Length); + return CompareOrdinalIgnoreCase(string1, string2); return String.CompareOrdinal(string1, string2); } @@ -349,18 +351,18 @@ namespace System.Globalization #if MONO return internal_compare_switch(string1, 0, string1.Length, string2, 0, string2.Length, options); #else - return CompareString(string1.AsReadOnlySpan(), string2.AsReadOnlySpan(), options); + return CompareString(string1.AsSpan(), string2.AsSpan(), options); #endif } // TODO https://github.com/dotnet/coreclr/issues/13827: // This method shouldn't be necessary, as we should be able to just use the overload // that takes two spans. But due to this issue, that's adding significant overhead. - internal unsafe int Compare(ReadOnlySpan string1, string string2, CompareOptions options) + internal int Compare(ReadOnlySpan string1, string string2, CompareOptions options) { if (options == CompareOptions.OrdinalIgnoreCase) { - return CompareOrdinalIgnoreCase(string1, string2.AsReadOnlySpan()); + return CompareOrdinalIgnoreCase(string1, string2.AsSpan()); } // Verify the options before we do any real comparison. @@ -371,7 +373,7 @@ namespace System.Globalization throw new ArgumentException(SR.Argument_CompareOptionOrdinal, nameof(options)); } - return string.CompareOrdinal(string1, string2.AsReadOnlySpan()); + return string.CompareOrdinal(string1, string2.AsSpan()); } if ((options & ValidCompareMaskOffFlags) != 0) @@ -388,45 +390,33 @@ namespace System.Globalization if (_invariantMode) { return (options & CompareOptions.IgnoreCase) != 0 ? - CompareOrdinalIgnoreCase(string1, string2.AsReadOnlySpan()) : - string.CompareOrdinal(string1, string2.AsReadOnlySpan()); + CompareOrdinalIgnoreCase(string1, string2.AsSpan()) : + string.CompareOrdinal(string1, string2.AsSpan()); } return CompareString(string1, string2, options); } - // TODO https://github.com/dotnet/corefx/issues/21395: Expose this publicly? - internal unsafe virtual int Compare(ReadOnlySpan string1, ReadOnlySpan string2, CompareOptions options) + internal int CompareOptionNone(ReadOnlySpan string1, ReadOnlySpan string2) { - if (options == CompareOptions.OrdinalIgnoreCase) - { - return CompareOrdinalIgnoreCase(string1, string2); - } + // Check for empty span or span from a null string + if (string1.Length == 0 || string2.Length == 0) + return string1.Length - string2.Length; - // Verify the options before we do any real comparison. - if ((options & CompareOptions.Ordinal) != 0) - { - if (options != CompareOptions.Ordinal) - { - throw new ArgumentException(SR.Argument_CompareOptionOrdinal, nameof(options)); - } + return _invariantMode ? + string.CompareOrdinal(string1, string2) : + CompareString(string1, string2, CompareOptions.None); + } - return string.CompareOrdinal(string1, string2); - } + internal int CompareOptionIgnoreCase(ReadOnlySpan string1, ReadOnlySpan string2) + { + // Check for empty span or span from a null string + if (string1.Length == 0 || string2.Length == 0) + return string1.Length - string2.Length; - if ((options & ValidCompareMaskOffFlags) != 0) - { - throw new ArgumentException(SR.Argument_InvalidFlag, nameof(options)); - } - - if (_invariantMode) - { - return (options & CompareOptions.IgnoreCase) != 0 ? - CompareOrdinalIgnoreCase(string1, string2) : - string.CompareOrdinal(string1, string2); - } - - return CompareString(string1, string2, options); + return _invariantMode ? + CompareOrdinalIgnoreCase(string1, string2) : + CompareString(string1, string2, CompareOptions.IgnoreCase); } //////////////////////////////////////////////////////////////////////// @@ -442,7 +432,7 @@ namespace System.Globalization //////////////////////////////////////////////////////////////////////// - public unsafe virtual int Compare(string string1, int offset1, int length1, string string2, int offset2, int length2) + public virtual int Compare(string string1, int offset1, int length1, string string2, int offset2, int length2) { return Compare(string1, offset1, length1, string2, offset2, length2, 0); } @@ -517,51 +507,39 @@ namespace System.Globalization return (1); } + ReadOnlySpan span1 = string1.AsSpan(offset1, length1); + ReadOnlySpan span2 = string2.AsSpan(offset2, length2); + if (options == CompareOptions.Ordinal) { - return CompareOrdinal(string1, offset1, length1, - string2, offset2, length2); + return string.CompareOrdinal(span1, span2); } if (_invariantMode) { if ((options & CompareOptions.IgnoreCase) != 0) - return CompareOrdinalIgnoreCase(string1, offset1, length1, string2, offset2, length2); + return CompareOrdinalIgnoreCase(span1, span2); - return CompareOrdinal(string1, offset1, length1, string2, offset2, length2); + return string.CompareOrdinal(span1, span2); } #if MONO return internal_compare_switch(string1, offset1, length1, string2, offset2, length2, options); #else - return CompareString( - string1.AsReadOnlySpan().Slice(offset1, length1), - string2.AsReadOnlySpan().Slice(offset2, length2), - options); + return CompareString(span1, span2, options); #endif } - private static int CompareOrdinal(string string1, int offset1, int length1, string string2, int offset2, int length2) - { - int result = String.CompareOrdinal(string1, offset1, string2, offset2, - (length1 < length2 ? length1 : length2)); - if ((length1 != length2) && result == 0) - { - return (length1 > length2 ? 1 : -1); - } - return (result); - } - // // CompareOrdinalIgnoreCase compare two string ordinally with ignoring the case. // it assumes the strings are Ascii string till we hit non Ascii character in strA or strB and then we continue the comparison by // calling the OS. // - internal static unsafe int CompareOrdinalIgnoreCase(string strA, int indexA, int lengthA, string strB, int indexB, int lengthB) + internal static int CompareOrdinalIgnoreCase(string strA, int indexA, int lengthA, string strB, int indexB, int lengthB) { Debug.Assert(indexA + lengthA <= strA.Length); Debug.Assert(indexB + lengthB <= strB.Length); - return CompareOrdinalIgnoreCase(strA.AsReadOnlySpan().Slice(indexA, lengthA), strB.AsReadOnlySpan().Slice(indexB, lengthB)); + return CompareOrdinalIgnoreCase(strA.AsSpan(indexA, lengthA), strB.AsSpan(indexB, lengthB)); } internal static unsafe int CompareOrdinalIgnoreCase(ReadOnlySpan strA, ReadOnlySpan strB) @@ -576,7 +554,7 @@ namespace System.Globalization char* b = bp; // in InvariantMode we support all range and not only the ascii characters. - char maxChar = (char) (GlobalizationMode.Invariant ? 0xFFFF : 0x80); + char maxChar = (char) (GlobalizationMode.Invariant ? 0xFFFF : 0x7F); while (length != 0 && (*a <= maxChar) && (*b <= maxChar)) { @@ -663,6 +641,17 @@ namespace System.Globalization return StartsWith(source, prefix, options); } + internal bool IsPrefix(ReadOnlySpan source, ReadOnlySpan prefix, CompareOptions options) + { + Debug.Assert(prefix.Length != 0); + Debug.Assert(source.Length != 0); + Debug.Assert((options & ValidIndexMaskOffFlags) == 0); + Debug.Assert(!_invariantMode); + Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0); + + return StartsWith(source, prefix, options); + } + public virtual bool IsPrefix(string source, string prefix) { return (IsPrefix(source, prefix, 0)); @@ -717,6 +706,17 @@ namespace System.Globalization return EndsWith(source, suffix, options); } + internal bool IsSuffix(ReadOnlySpan source, ReadOnlySpan suffix, CompareOptions options) + { + Debug.Assert(suffix.Length != 0); + Debug.Assert(source.Length != 0); + Debug.Assert((options & ValidIndexMaskOffFlags) == 0); + Debug.Assert(!_invariantMode); + Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0); + + return EndsWith(source, suffix, options); + } + public virtual bool IsSuffix(string source, string suffix) { @@ -829,6 +829,11 @@ namespace System.Globalization if (count < 0 || startIndex > source.Length - count) throw new ArgumentOutOfRangeException(nameof(count), SR.ArgumentOutOfRange_Count); + if (source.Length == 0) + { + return -1; + } + if (options == CompareOptions.OrdinalIgnoreCase) { return source.IndexOf(value.ToString(), startIndex, count, StringComparison.OrdinalIgnoreCase); @@ -838,7 +843,7 @@ namespace System.Globalization // Ordinal can't be selected with other flags if ((options & ValidIndexMaskOffFlags) != 0 && (options != CompareOptions.Ordinal)) throw new ArgumentException(SR.Argument_InvalidFlag, nameof(options)); - + if (_invariantMode) return IndexOfOrdinal(source, new string(value, 1), startIndex, count, ignoreCase: (options & (CompareOptions.IgnoreCase | CompareOptions.OrdinalIgnoreCase)) != 0); @@ -893,6 +898,22 @@ namespace System.Globalization return IndexOfCore(source, value, startIndex, count, options, null); } + internal int IndexOfOrdinal(ReadOnlySpan source, ReadOnlySpan value, bool ignoreCase) + { + Debug.Assert(!_invariantMode); + Debug.Assert(!source.IsEmpty); + Debug.Assert(!value.IsEmpty); + return IndexOfOrdinalCore(source, value, ignoreCase); + } + + internal unsafe int IndexOf(ReadOnlySpan source, ReadOnlySpan value, CompareOptions options) + { + Debug.Assert(!_invariantMode); + Debug.Assert(!source.IsEmpty); + Debug.Assert(!value.IsEmpty); + return IndexOfCore(source, value, options, null); + } + // The following IndexOf overload is mainly used by String.Replace. This overload assumes the parameters are already validated // and the caller is passing a valid matchLengthPtr pointer. internal unsafe int IndexOf(string source, string value, int startIndex, int count, CompareOptions options, int* matchLengthPtr) @@ -1208,6 +1229,34 @@ namespace System.Globalization return (this.Name.GetHashCode()); } + internal static unsafe int GetIgnoreCaseHash(string source) + { + Debug.Assert(source != null, "source must not be null"); + + // Do not allocate on the stack if string is empty + if (source.Length == 0) + { + return source.GetHashCode(); + } + + char[] borrowedArr = null; + Span span = source.Length <= 255 ? + stackalloc char[255] : + (borrowedArr = ArrayPool.Shared.Rent(source.Length)); + + int charsWritten = source.AsSpan().ToUpperInvariant(span); + + // Slice the array to the size returned by ToUpperInvariant. + int hash = Marvin.ComputeHash32(MemoryMarshal.AsBytes(span.Slice(0, charsWritten)), Marvin.DefaultSeed); + + // Return the borrowed array if necessary. + if (borrowedArr != null) + { + ArrayPool.Shared.Return(borrowedArr); + } + + return hash; + } //////////////////////////////////////////////////////////////////////// // @@ -1248,6 +1297,11 @@ namespace System.Globalization throw new ArgumentException(SR.Argument_InvalidFlag, nameof(options)); } + if (_invariantMode) + { + return ((options & CompareOptions.IgnoreCase) != 0) ? GetIgnoreCaseHash(source) : source.GetHashCode(); + } + return GetHashCodeOfStringCore(source, options); } @@ -1265,11 +1319,11 @@ namespace System.Globalization if (options == CompareOptions.OrdinalIgnoreCase) { - return TextInfo.GetHashCodeOrdinalIgnoreCase(source); + return GetIgnoreCaseHash(source); } // - // GetHashCodeOfString does more parameters validation. basically will throw when + // GetHashCodeOfString does more parameters validation. basically will throw when // having Ordinal, OrdinalIgnoreCase and StringSort // diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/CultureData.Unix.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/CultureData.Unix.cs index 1b335c28ee..3fce527929 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/CultureData.Unix.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/CultureData.Unix.cs @@ -91,7 +91,7 @@ namespace System.Globalization { // Get the locale name from ICU StringBuilder sb = StringBuilderCache.Acquire(ICU_ULOC_FULLNAME_CAPACITY); - if (!Interop.GlobalizationInterop.GetLocaleName(localeName, sb, sb.Capacity)) + if (!Interop.Globalization.GetLocaleName(localeName, sb, sb.Capacity)) { StringBuilderCache.Release(sb); windowsName = null; @@ -107,7 +107,7 @@ namespace System.Globalization { // Get the default (system) locale name from ICU StringBuilder sb = StringBuilderCache.Acquire(ICU_ULOC_FULLNAME_CAPACITY); - if (!Interop.GlobalizationInterop.GetDefaultLocaleName(sb, sb.Capacity)) + if (!Interop.Globalization.GetDefaultLocaleName(sb, sb.Capacity)) { StringBuilderCache.Release(sb); windowsName = null; @@ -143,7 +143,7 @@ namespace System.Globalization StringBuilder sb = StringBuilderCache.Acquire(ICU_ULOC_KEYWORD_AND_VALUES_CAPACITY); - bool result = Interop.GlobalizationInterop.GetLocaleInfoString(localeName, (uint)type, sb, sb.Capacity); + bool result = Interop.Globalization.GetLocaleInfoString(localeName, (uint)type, sb, sb.Capacity); if (!result) { // Failed, just use empty string @@ -169,7 +169,7 @@ namespace System.Globalization int value = 0; - bool result = Interop.GlobalizationInterop.GetLocaleInfoInt(_sWindowsName, (uint)type, ref value); + bool result = Interop.Globalization.GetLocaleInfoInt(_sWindowsName, (uint)type, ref value); if (!result) { // Failed, just use 0 @@ -185,7 +185,7 @@ namespace System.Globalization int primaryGroupingSize = 0; int secondaryGroupingSize = 0; - bool result = Interop.GlobalizationInterop.GetLocaleInfoGroupingSizes(_sWindowsName, (uint)type, ref primaryGroupingSize, ref secondaryGroupingSize); + bool result = Interop.Globalization.GetLocaleInfoGroupingSizes(_sWindowsName, (uint)type, ref primaryGroupingSize, ref secondaryGroupingSize); if (!result) { Debug.Fail("[CultureData.GetLocaleInfo(LocaleGroupingData type)] failed"); @@ -210,7 +210,7 @@ namespace System.Globalization StringBuilder sb = StringBuilderCache.Acquire(ICU_ULOC_KEYWORD_AND_VALUES_CAPACITY); - bool result = Interop.GlobalizationInterop.GetLocaleTimeFormat(_sWindowsName, shortFormat, sb, sb.Capacity); + bool result = Interop.Globalization.GetLocaleTimeFormat(_sWindowsName, shortFormat, sb, sb.Capacity); if (!result) { // Failed, just use empty string @@ -365,7 +365,7 @@ namespace System.Globalization return Array.Empty(); } - int bufferLength = Interop.GlobalizationInterop.GetLocales(null, 0); + int bufferLength = Interop.Globalization.GetLocales(null, 0); if (bufferLength <= 0) { return Array.Empty(); @@ -373,7 +373,7 @@ namespace System.Globalization Char [] chars = new Char[bufferLength]; - bufferLength = Interop.GlobalizationInterop.GetLocales(chars, bufferLength); + bufferLength = Interop.Globalization.GetLocales(chars, bufferLength); if (bufferLength <= 0) { return Array.Empty(); diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/CultureNotFoundException.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/CultureNotFoundException.cs index 10e8b1f836..a2b93c27af 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/CultureNotFoundException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/CultureNotFoundException.cs @@ -7,7 +7,9 @@ using System.Runtime.Serialization; namespace System.Globalization { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class CultureNotFoundException : ArgumentException { private string _invalidCultureName; // unrecognized culture name diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/DateTimeFormat.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/DateTimeFormat.cs index d15cc1cc8c..092ad0365d 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/DateTimeFormat.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/DateTimeFormat.cs @@ -6,6 +6,8 @@ using System.Collections.Generic; using System.Diagnostics; using System.Globalization; using System.Text; +using System.Runtime.InteropServices; +using System.Runtime.CompilerServices; namespace System { @@ -172,7 +174,7 @@ namespace System FormatDigits(outputBuffer, value, len, false); } - internal unsafe static void FormatDigits(StringBuilder outputBuffer, int value, int len, bool overrideLengthLimit) + internal static unsafe void FormatDigits(StringBuilder outputBuffer, int value, int len, bool overrideLengthLimit) { Debug.Assert(value >= 0, "DateTimeFormat.FormatDigits(): value >= 0"); @@ -703,7 +705,7 @@ namespace System if (nextChar >= 0 && nextChar != '%') { char nextCharChar = (char)nextChar; - StringBuilder origStringBuilder = FormatCustomized(dateTime, ReadOnlySpan.DangerousCreate(null, ref nextCharChar, 1), dtfi, offset, result); + StringBuilder origStringBuilder = FormatCustomized(dateTime, MemoryMarshal.CreateReadOnlySpan(ref nextCharChar, 1), dtfi, offset, result); Debug.Assert(ReferenceEquals(origStringBuilder, result)); tokenLen = 2; } @@ -851,9 +853,15 @@ namespace System offset = offset.Negate(); } - AppendNumber(result, offset.Hours, 2); + Append2DigitNumber(result, offset.Hours); result.Append(':'); - AppendNumber(result, offset.Minutes, 2); + Append2DigitNumber(result, offset.Minutes); + } + + private static void Append2DigitNumber(StringBuilder result, int val) + { + result.Append((char)('0' + (val / 10))); + result.Append((char)('0' + (val % 10))); } internal static String GetRealFormat(ReadOnlySpan format, DateTimeFormatInfo dtfi) @@ -980,19 +988,65 @@ namespace System return GetRealFormat(format, dtfi); } - internal static String Format(DateTime dateTime, String format, DateTimeFormatInfo dtfi) + internal static String Format(DateTime dateTime, String format, IFormatProvider provider) { - return Format(dateTime, format, dtfi, NullOffset); + return Format(dateTime, format, provider, NullOffset); } - internal static string Format(DateTime dateTime, String format, DateTimeFormatInfo dtfi, TimeSpan offset) => - StringBuilderCache.GetStringAndRelease(FormatStringBuilder(dateTime, format, dtfi, offset)); - - internal static bool TryFormat(DateTime dateTime, Span destination, out int charsWritten, ReadOnlySpan format, DateTimeFormatInfo dtfi) => - TryFormat(dateTime, destination, out charsWritten, format, dtfi, NullOffset); - - internal static bool TryFormat(DateTime dateTime, Span destination, out int charsWritten, ReadOnlySpan format, DateTimeFormatInfo dtfi, TimeSpan offset) + internal static string Format(DateTime dateTime, String format, IFormatProvider provider, TimeSpan offset) { + if (format != null && format.Length == 1) + { + // Optimize for these standard formats that are not affected by culture. + switch (format[0]) + { + // Round trip format + case 'o': + case 'O': + const int MinFormatOLength = 27, MaxFormatOLength = 33; + Span span = stackalloc char[MaxFormatOLength]; + TryFormatO(dateTime, offset, span, out int ochars); + Debug.Assert(ochars >= MinFormatOLength && ochars <= MaxFormatOLength); + return span.Slice(0, ochars).ToString(); + + // RFC1123 + case 'r': + case 'R': + const int FormatRLength = 29; + string str = string.FastAllocateString(FormatRLength); + TryFormatR(dateTime, offset, new Span(ref str.GetRawStringData(), str.Length), out int rchars); + Debug.Assert(rchars == str.Length); + return str; + } + } + + DateTimeFormatInfo dtfi = DateTimeFormatInfo.GetInstance(provider); + return StringBuilderCache.GetStringAndRelease(FormatStringBuilder(dateTime, format, dtfi, offset)); + } + + internal static bool TryFormat(DateTime dateTime, Span destination, out int charsWritten, ReadOnlySpan format, IFormatProvider provider) => + TryFormat(dateTime, destination, out charsWritten, format, provider, NullOffset); + + internal static bool TryFormat(DateTime dateTime, Span destination, out int charsWritten, ReadOnlySpan format, IFormatProvider provider, TimeSpan offset) + { + if (format.Length == 1) + { + // Optimize for these standard formats that are not affected by culture. + switch (format[0]) + { + // Round trip format + case 'o': + case 'O': + return TryFormatO(dateTime, offset, destination, out charsWritten); + + // RFC1123 + case 'r': + case 'R': + return TryFormatR(dateTime, offset, destination, out charsWritten); + } + } + + DateTimeFormatInfo dtfi = DateTimeFormatInfo.GetInstance(provider); StringBuilder sb = FormatStringBuilder(dateTime, format, dtfi, offset); bool success = sb.Length <= destination.Length; @@ -1010,7 +1064,7 @@ namespace System return success; } - internal static StringBuilder FormatStringBuilder(DateTime dateTime, ReadOnlySpan format, DateTimeFormatInfo dtfi, TimeSpan offset) + private static StringBuilder FormatStringBuilder(DateTime dateTime, ReadOnlySpan format, DateTimeFormatInfo dtfi, TimeSpan offset) { Debug.Assert(dtfi != null); if (format.Length == 0) @@ -1059,101 +1113,204 @@ namespace System if (format.Length == 1) { - switch (format[0]) - { - case 'O': - case 'o': - return FastFormatRoundtrip(dateTime, offset); - case 'R': - case 'r': - return FastFormatRfc1123(dateTime, offset, dtfi); - } - format = ExpandPredefinedFormat(format, ref dateTime, ref dtfi, ref offset); } return FormatCustomized(dateTime, format, dtfi, offset, result: null); } - internal static StringBuilder FastFormatRfc1123(DateTime dateTime, TimeSpan offset, DateTimeFormatInfo dtfi) + // Roundtrippable format. One of + // 012345678901234567890123456789012 + // --------------------------------- + // 2017-06-12T05:30:45.7680000-07:00 + // 2017-06-12T05:30:45.7680000Z (Z is short for "+00:00" but also distinguishes DateTimeKind.Utc from DateTimeKind.Local) + // 2017-06-12T05:30:45.7680000 (interpreted as local time wrt to current time zone) + private static bool TryFormatO(DateTime dateTime, TimeSpan offset, Span destination, out int charsWritten) { - // ddd, dd MMM yyyy HH:mm:ss GMT - const int Rfc1123FormatLength = 29; - StringBuilder result = StringBuilderCache.Acquire(Rfc1123FormatLength); + const int MinimumBytesNeeded = 27; + + int charsRequired = MinimumBytesNeeded; + DateTimeKind kind = DateTimeKind.Local; + + if (offset == NullOffset) + { + kind = dateTime.Kind; + if (kind == DateTimeKind.Local) + { + offset = TimeZoneInfo.Local.GetUtcOffset(dateTime); + charsRequired += 6; + } + else if (kind == DateTimeKind.Utc) + { + charsRequired += 1; + } + } + else + { + charsRequired += 6; + } + + if (destination.Length < charsRequired) + { + charsWritten = 0; + return false; + } + charsWritten = charsRequired; + + // Hoist most of the bounds checks on destination. + { var unused = destination[MinimumBytesNeeded - 1]; } + + WriteFourDecimalDigits((uint)dateTime.Year, destination, 0); + destination[4] = '-'; + WriteTwoDecimalDigits((uint)dateTime.Month, destination, 5); + destination[7] = '-'; + WriteTwoDecimalDigits((uint)dateTime.Day, destination, 8); + destination[10] = 'T'; + WriteTwoDecimalDigits((uint)dateTime.Hour, destination, 11); + destination[13] = ':'; + WriteTwoDecimalDigits((uint)dateTime.Minute, destination, 14); + destination[16] = ':'; + WriteTwoDecimalDigits((uint)dateTime.Second, destination, 17); + destination[19] = '.'; + WriteDigits((uint)((ulong)dateTime.Ticks % (ulong)TimeSpan.TicksPerSecond), destination.Slice(20, 7)); + + if (kind == DateTimeKind.Local) + { + char sign; + if (offset < default(TimeSpan) /* a "const" version of TimeSpan.Zero */) + { + sign = '-'; + offset = TimeSpan.FromTicks(-offset.Ticks); + } + else + { + sign = '+'; + } + + // Writing the value backward allows the JIT to optimize by + // performing a single bounds check against buffer. + WriteTwoDecimalDigits((uint)offset.Minutes, destination, 31); + destination[30] = ':'; + WriteTwoDecimalDigits((uint)offset.Hours, destination, 28); + destination[27] = sign; + } + else if (kind == DateTimeKind.Utc) + { + destination[27] = 'Z'; + } + + return true; + } + + // Rfc1123 + // 01234567890123456789012345678 + // ----------------------------- + // Tue, 03 Jan 2017 08:08:05 GMT + private static bool TryFormatR(DateTime dateTime, TimeSpan offset, Span destination, out int charsWritten) + { + // Writing the check in this fashion elides all bounds checks on 'destination' + // for the remainder of the method. + if (28 >= (uint)destination.Length) + { + charsWritten = 0; + return false; + } if (offset != NullOffset) { - // Convert to UTC invariants + // Convert to UTC invariants. dateTime = dateTime - offset; } dateTime.GetDatePart(out int year, out int month, out int day); - result.Append(InvariantAbbreviatedDayNames[(int)dateTime.DayOfWeek]); - result.Append(','); - result.Append(' '); - AppendNumber(result, day, 2); - result.Append(' '); - result.Append(InvariantAbbreviatedMonthNames[month - 1]); - result.Append(' '); - AppendNumber(result, year, 4); - result.Append(' '); - AppendHHmmssTimeOfDay(result, dateTime); - result.Append(' '); - result.Append(Gmt); - return result; + string dayAbbrev = InvariantAbbreviatedDayNames[(int)dateTime.DayOfWeek]; + Debug.Assert(dayAbbrev.Length == 3); + + string monthAbbrev = InvariantAbbreviatedMonthNames[month - 1]; + Debug.Assert(monthAbbrev.Length == 3); + + destination[0] = dayAbbrev[0]; + destination[1] = dayAbbrev[1]; + destination[2] = dayAbbrev[2]; + destination[3] = ','; + destination[4] = ' '; + WriteTwoDecimalDigits((uint)day, destination, 5); + destination[7] = ' '; + destination[8] = monthAbbrev[0]; + destination[9] = monthAbbrev[1]; + destination[10] = monthAbbrev[2]; + destination[11] = ' '; + WriteFourDecimalDigits((uint)year, destination, 12); + destination[16] = ' '; + WriteTwoDecimalDigits((uint)dateTime.Hour, destination, 17); + destination[19] = ':'; + WriteTwoDecimalDigits((uint)dateTime.Minute, destination, 20); + destination[22] = ':'; + WriteTwoDecimalDigits((uint)dateTime.Second, destination, 23); + destination[25] = ' '; + destination[26] = 'G'; + destination[27] = 'M'; + destination[28] = 'T'; + + charsWritten = 29; + return true; } - internal static StringBuilder FastFormatRoundtrip(DateTime dateTime, TimeSpan offset) + /// + /// Writes a value [ 00 .. 99 ] to the buffer starting at the specified offset. + /// This method performs best when the starting index is a constant literal. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static void WriteTwoDecimalDigits(uint value, Span destination, int offset) { - // yyyy-MM-ddTHH:mm:ss.fffffffK - const int roundTripFormatLength = 28; - StringBuilder result = StringBuilderCache.Acquire(roundTripFormatLength); + Debug.Assert(0 <= value && value <= 99); - dateTime.GetDatePart(out int year, out int month, out int day); - AppendNumber(result, year, 4); - result.Append('-'); - AppendNumber(result, month, 2); - result.Append('-'); - AppendNumber(result, day, 2); - result.Append('T'); - AppendHHmmssTimeOfDay(result, dateTime); - result.Append('.'); - - long fraction = dateTime.Ticks % TimeSpan.TicksPerSecond; - AppendNumber(result, fraction, 7); - - FormatCustomizedRoundripTimeZone(dateTime, offset, result); - - return result; + uint temp = '0' + value; + value /= 10; + destination[offset + 1] = (char)(temp - (value * 10)); + destination[offset] = (char)('0' + value); } - private static void AppendHHmmssTimeOfDay(StringBuilder result, DateTime dateTime) + /// + /// Writes a value [ 0000 .. 9999 ] to the buffer starting at the specified offset. + /// This method performs best when the starting index is a constant literal. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static void WriteFourDecimalDigits(uint value, Span buffer, int startingIndex = 0) { - // HH:mm:ss - AppendNumber(result, dateTime.Hour, 2); - result.Append(':'); - AppendNumber(result, dateTime.Minute, 2); - result.Append(':'); - AppendNumber(result, dateTime.Second, 2); + Debug.Assert(0 <= value && value <= 9999); + + uint temp = '0' + value; + value /= 10; + buffer[startingIndex + 3] = (char)(temp - (value * 10)); + + temp = '0' + value; + value /= 10; + buffer[startingIndex + 2] = (char)(temp - (value * 10)); + + temp = '0' + value; + value /= 10; + buffer[startingIndex + 1] = (char)(temp - (value * 10)); + + buffer[startingIndex] = (char)('0' + value); } - internal static void AppendNumber(StringBuilder builder, long val, int digits) + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static void WriteDigits(ulong value, Span buffer) { - for (int i = 0; i < digits; i++) + // We can mutate the 'value' parameter since it's a copy-by-value local. + // It'll be used to represent the value left over after each division by 10. + + for (int i = buffer.Length - 1; i >= 1; i--) { - builder.Append('0'); + ulong temp = '0' + value; + value /= 10; + buffer[i] = (char)(temp - (value * 10)); } - int index = 1; - while (val > 0 && index <= digits) - { - builder[builder.Length - index] = (char)('0' + (val % 10)); - val = val / 10; - index++; - } - - Debug.Assert(val == 0, "DateTimeFormat.AppendNumber(): digits less than size of val"); + Debug.Assert(value < 10); + buffer[0] = (char)('0' + value); } internal static String[] GetAllDateTimes(DateTime dateTime, char format, DateTimeFormatInfo dtfi) diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/DateTimeFormatInfo.cs.REMOVED.git-id b/external/corefx/src/Common/src/CoreLib/System/Globalization/DateTimeFormatInfo.cs.REMOVED.git-id index 857885c948..1c8fb1eade 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/DateTimeFormatInfo.cs.REMOVED.git-id +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/DateTimeFormatInfo.cs.REMOVED.git-id @@ -1 +1 @@ -c8f5ee477e60808f0cb7a884a5df82a46c0cc360 \ No newline at end of file +edec75ac85bbf13b7caaceabd789b69a9d4aadf5 \ No newline at end of file diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/DateTimeParse.cs.REMOVED.git-id b/external/corefx/src/Common/src/CoreLib/System/Globalization/DateTimeParse.cs.REMOVED.git-id index 2750fbe551..66e593593d 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/DateTimeParse.cs.REMOVED.git-id +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/DateTimeParse.cs.REMOVED.git-id @@ -1 +1 @@ -40962f890ca764aeaf692b318788a308b597599a \ No newline at end of file +acebfa84959b21d0d61454b995ae04fdc33b3bcd \ No newline at end of file diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/DateTimeStyles.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/DateTimeStyles.cs index 79232ff199..bf68ac91d5 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/DateTimeStyles.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/DateTimeStyles.cs @@ -36,7 +36,7 @@ namespace System.Globalization NoCurrentDateDefault = 0x00000008, // When parsing a date/time string, if a timezone specifier ("GMT","Z","+xxxx", "-xxxx" exists), we will - // ajdust the parsed time based to GMT. + // adjust the parsed time based to GMT. AdjustToUniversal = 0x00000010, diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/DaylightTime.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/DaylightTime.cs index e6920b3666..3dc1e7d850 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/DaylightTime.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/DaylightTime.cs @@ -4,6 +4,9 @@ namespace System.Globalization { +#if MONO + [Serializable] +#endif // This class represents a starting/ending time for a period of daylight saving time. public class DaylightTime { @@ -11,10 +14,6 @@ namespace System.Globalization private readonly DateTime _end; private readonly TimeSpan _delta; - private DaylightTime() - { - } - public DaylightTime(DateTime start, DateTime end, TimeSpan delta) { _start = start; diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/GlobalizationExtensions.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/GlobalizationExtensions.cs new file mode 100644 index 0000000000..007283aa6b --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/GlobalizationExtensions.cs @@ -0,0 +1,32 @@ +// 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; +using System.Diagnostics; + +namespace System.Globalization +{ + public static class GlobalizationExtensions + { + public static StringComparer GetStringComparer(this CompareInfo compareInfo, CompareOptions options) + { + if (compareInfo == null) + { + throw new ArgumentNullException(nameof(compareInfo)); + } + + if (options == CompareOptions.Ordinal) + { + return StringComparer.Ordinal; + } + + if (options == CompareOptions.OrdinalIgnoreCase) + { + return StringComparer.OrdinalIgnoreCase; + } + + return new CultureAwareComparer(compareInfo, options); + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/GregorianCalendar.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/GregorianCalendar.cs index 16023209ea..94963a19cc 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/GregorianCalendar.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/GregorianCalendar.cs @@ -520,25 +520,11 @@ namespace System.Globalization throw new ArgumentOutOfRangeException(nameof(era), SR.ArgumentOutOfRange_InvalidEraValue); } - internal override Boolean TryToDateTime(int year, int month, int day, int hour, int minute, int second, int millisecond, int era, out DateTime result) + internal override bool TryToDateTime(int year, int month, int day, int hour, int minute, int second, int millisecond, int era, out DateTime result) { if (era == CurrentEra || era == ADEra) { - try - { - result = new DateTime(year, month, day, hour, minute, second, millisecond); - return true; - } - catch (ArgumentOutOfRangeException) - { - result = DateTime.Now; - return false; - } - catch (ArgumentException) - { - result = DateTime.Now; - return false; - } + return DateTime.TryCreate(year, month, day, hour, minute, second, millisecond, out result); } result = DateTime.MinValue; return false; diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/HijriCalendar.Win32.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/HijriCalendar.Win32.cs index 09b1f20c48..64a73fb81d 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/HijriCalendar.Win32.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/HijriCalendar.Win32.cs @@ -69,7 +69,7 @@ namespace System.Globalization { try { - int advance = Int32.Parse(str.AsReadOnlySpan().Slice(HijriAdvanceRegKeyEntry.Length), provider:CultureInfo.InvariantCulture); + int advance = Int32.Parse(str.AsSpan(HijriAdvanceRegKeyEntry.Length), provider:CultureInfo.InvariantCulture); if ((advance >= MinAdvancedHijri) && (advance <= MaxAdvancedHijri)) { hijriAdvance = advance; diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/IdnMapping.Unix.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/IdnMapping.Unix.cs index 2bbda0d3a7..20f753e986 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/IdnMapping.Unix.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/IdnMapping.Unix.cs @@ -8,9 +8,10 @@ namespace System.Globalization { sealed partial class IdnMapping { - private unsafe string GetAsciiCore(char* unicode, int count) + private unsafe string GetAsciiCore(string unicodeString, char* unicode, int count) { Debug.Assert(!GlobalizationMode.Invariant); + Debug.Assert(unicodeString != null && unicodeString.Length >= count); uint flags = Flags; CheckInvalidIdnCharacters(unicode, count, flags, nameof(unicode)); @@ -23,15 +24,15 @@ namespace System.Globalization if (estimatedLength < StackallocThreshold) { char* outputStack = stackalloc char[estimatedLength]; - actualLength = Interop.GlobalizationInterop.ToAscii(flags, unicode, count, outputStack, estimatedLength); + actualLength = Interop.Globalization.ToAscii(flags, unicode, count, outputStack, estimatedLength); if (actualLength > 0 && actualLength <= estimatedLength) { - return new string(outputStack, 0, actualLength); + return GetStringForOutput(unicodeString, unicode, count, outputStack, actualLength); } } else { - actualLength = Interop.GlobalizationInterop.ToAscii(flags, unicode, count, null, 0); + actualLength = Interop.Globalization.ToAscii(flags, unicode, count, null, 0); } if (actualLength == 0) { @@ -41,18 +42,19 @@ namespace System.Globalization char[] outputHeap = new char[actualLength]; fixed (char* pOutputHeap = &outputHeap[0]) { - actualLength = Interop.GlobalizationInterop.ToAscii(flags, unicode, count, pOutputHeap, actualLength); + actualLength = Interop.Globalization.ToAscii(flags, unicode, count, pOutputHeap, actualLength); if (actualLength == 0 || actualLength > outputHeap.Length) { throw new ArgumentException(SR.Argument_IdnIllegalName, nameof(unicode)); } - return new string(pOutputHeap, 0, actualLength); + return GetStringForOutput(unicodeString, unicode, count, pOutputHeap, actualLength); } } - private unsafe string GetUnicodeCore(char* ascii, int count) + private unsafe string GetUnicodeCore(string asciiString, char* ascii, int count) { Debug.Assert(!GlobalizationMode.Invariant); + Debug.Assert(asciiString != null && asciiString.Length >= count); uint flags = Flags; CheckInvalidIdnCharacters(ascii, count, flags, nameof(ascii)); @@ -61,23 +63,24 @@ namespace System.Globalization if (count < StackAllocThreshold) { char* output = stackalloc char[count]; - return GetUnicodeCore(ascii, count, flags, output, count, reattempt: true); + return GetUnicodeCore(asciiString, ascii, count, flags, output, count, reattempt: true); } else { char[] output = new char[count]; fixed (char* pOutput = &output[0]) { - return GetUnicodeCore(ascii, count, flags, pOutput, count, reattempt: true); + return GetUnicodeCore(asciiString, ascii, count, flags, pOutput, count, reattempt: true); } } } - private unsafe string GetUnicodeCore(char* ascii, int count, uint flags, char* output, int outputLength, bool reattempt) + private unsafe string GetUnicodeCore(string asciiString, char* ascii, int count, uint flags, char* output, int outputLength, bool reattempt) { Debug.Assert(!GlobalizationMode.Invariant); + Debug.Assert(asciiString != null && asciiString.Length >= count); - int realLen = Interop.GlobalizationInterop.ToUnicode(flags, ascii, count, output, outputLength); + int realLen = Interop.Globalization.ToUnicode(flags, ascii, count, output, outputLength); if (realLen == 0) { @@ -85,14 +88,14 @@ namespace System.Globalization } else if (realLen <= outputLength) { - return new string(output, 0, realLen); + return GetStringForOutput(asciiString, ascii, count, output, realLen); } else if (reattempt) { char[] newOutput = new char[realLen]; fixed (char* pNewOutput = newOutput) { - return GetUnicodeCore(ascii, count, flags, pNewOutput, realLen, reattempt: false); + return GetUnicodeCore(asciiString, ascii, count, flags, pNewOutput, realLen, reattempt: false); } } @@ -108,8 +111,8 @@ namespace System.Globalization get { int flags = - (AllowUnassigned ? Interop.GlobalizationInterop.AllowUnassigned : 0) | - (UseStd3AsciiRules ? Interop.GlobalizationInterop.UseStd3AsciiRules : 0); + (AllowUnassigned ? Interop.Globalization.AllowUnassigned : 0) | + (UseStd3AsciiRules ? Interop.Globalization.UseStd3AsciiRules : 0); return (uint)flags; } } @@ -123,7 +126,7 @@ namespace System.Globalization /// private static unsafe void CheckInvalidIdnCharacters(char* s, int count, uint flags, string paramName) { - if ((flags & Interop.GlobalizationInterop.UseStd3AsciiRules) == 0) + if ((flags & Interop.Globalization.UseStd3AsciiRules) == 0) { for (int i = 0; i < count; i++) { diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/IdnMapping.Windows.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/IdnMapping.Windows.cs index 35da7343e7..9d491dfbb8 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/IdnMapping.Windows.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/IdnMapping.Windows.cs @@ -9,9 +9,10 @@ namespace System.Globalization { public sealed partial class IdnMapping { - private unsafe string GetAsciiCore(char* unicode, int count) + private unsafe string GetAsciiCore(string unicodeString, char* unicode, int count) { Debug.Assert(!GlobalizationMode.Invariant); + Debug.Assert(unicodeString != null && unicodeString.Length >= count); uint flags = Flags; @@ -27,21 +28,22 @@ namespace System.Globalization if (length < StackAllocThreshold) { char* output = stackalloc char[length]; - return GetAsciiCore(unicode, count, flags, output, length); + return GetAsciiCore(unicodeString, unicode, count, flags, output, length); } else { char[] output = new char[length]; fixed (char* pOutput = &output[0]) { - return GetAsciiCore(unicode, count, flags, pOutput, length); + return GetAsciiCore(unicodeString, unicode, count, flags, pOutput, length); } } } - private unsafe string GetAsciiCore(char* unicode, int count, uint flags, char* output, int outputLength) + private unsafe string GetAsciiCore(string unicodeString, char* unicode, int count, uint flags, char* output, int outputLength) { Debug.Assert(!GlobalizationMode.Invariant); + Debug.Assert(unicodeString != null && unicodeString.Length >= count); int length = Interop.Normaliz.IdnToAscii(flags, unicode, count, output, outputLength); if (length == 0) @@ -49,12 +51,13 @@ namespace System.Globalization ThrowForZeroLength(unicode: true); } Debug.Assert(length == outputLength); - return new string(output, 0, length); + return GetStringForOutput(unicodeString, unicode, count, output, length); } - private unsafe string GetUnicodeCore(char* ascii, int count) + private unsafe string GetUnicodeCore(string asciiString, char* ascii, int count) { Debug.Assert(!GlobalizationMode.Invariant); + Debug.Assert(asciiString != null && asciiString.Length >= count); uint flags = Flags; @@ -70,21 +73,22 @@ namespace System.Globalization if (length < StackAllocThreshold) { char* output = stackalloc char[length]; - return GetUnicodeCore(ascii, count, flags, output, length); + return GetUnicodeCore(asciiString, ascii, count, flags, output, length); } else { char[] output = new char[length]; fixed (char* pOutput = &output[0]) { - return GetUnicodeCore(ascii, count, flags, pOutput, length); + return GetUnicodeCore(asciiString, ascii, count, flags, pOutput, length); } } } - private unsafe string GetUnicodeCore(char* ascii, int count, uint flags, char* output, int outputLength) + private unsafe string GetUnicodeCore(string asciiString, char* ascii, int count, uint flags, char* output, int outputLength) { Debug.Assert(!GlobalizationMode.Invariant); + Debug.Assert(asciiString != null && asciiString.Length >= count); int length = Interop.Normaliz.IdnToUnicode(flags, ascii, count, output, outputLength); if (length == 0) @@ -92,7 +96,7 @@ namespace System.Globalization ThrowForZeroLength(unicode: false); } Debug.Assert(length == outputLength); - return new string(output, 0, length); + return GetStringForOutput(asciiString, ascii, count, output, length); } // ----------------------------- diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/IdnMapping.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/IdnMapping.cs index 176e5feed5..6da6f79f24 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/IdnMapping.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/IdnMapping.cs @@ -25,6 +25,7 @@ // RFC 3492 - Punycode: A Bootstring encoding of Unicode for Internationalized Domain Names in Applications (IDNA) using System.Diagnostics; +using System.Runtime.CompilerServices; using System.Text; namespace System.Globalization @@ -93,7 +94,7 @@ namespace System.Globalization { fixed (char* pUnicode = unicode) { - return GetAsciiCore(pUnicode + index, count); + return GetAsciiCore(unicode, pUnicode + index, count); } } } @@ -137,7 +138,7 @@ namespace System.Globalization { fixed (char* pAscii = ascii) { - return GetUnicodeCore(pAscii + index, count); + return GetUnicodeCore(ascii, pAscii + index, count); } } } @@ -156,6 +157,14 @@ namespace System.Globalization return (_allowUnassigned ? 100 : 200) + (_useStd3AsciiRules ? 1000 : 2000); } + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static unsafe string GetStringForOutput(string originalString, char* input, int inputLength, char* output, int outputLength) + { + return originalString.Length == inputLength && new ReadOnlySpan(input, inputLength).SequenceEqual(new ReadOnlySpan(output, outputLength)) ? + originalString : + new string(output, 0, outputLength); + } + // // Invariant implementation // diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/InternalGlobalizationHelper.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/InternalGlobalizationHelper.cs index f5eea1b629..60abcecf61 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/InternalGlobalizationHelper.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/InternalGlobalizationHelper.cs @@ -6,7 +6,7 @@ namespace System.Globalization { internal class InternalGlobalizationHelper { - // Copied from the TimeSpan to be used inside the globalization code and avoid internal dependancy on TimeSpan class + // Copied from the TimeSpan to be used inside the globalization code and avoid internal dependency on TimeSpan class internal static long TimeToTicks(int hour, int minute, int second) { // totalSeconds is bounded by 2^31 * 2^12 + 2^31 * 2^8 + 2^31, diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/JapaneseCalendar.Unix.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/JapaneseCalendar.Unix.cs index 51ff8095a3..5e66c94b2c 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/JapaneseCalendar.Unix.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/JapaneseCalendar.Unix.cs @@ -31,7 +31,7 @@ namespace System.Globalization List eras = new List(); int lastMaxYear = GregorianCalendar.MaxYear; - int latestEra = Interop.GlobalizationInterop.GetLatestJapaneseEra(); + int latestEra = Interop.Globalization.GetLatestJapaneseEra(); for (int i = latestEra; i >= 0; i--) { DateTime dt; @@ -79,7 +79,7 @@ namespace System.Globalization int startYear; int startMonth; int startDay; - bool result = Interop.GlobalizationInterop.GetJapaneseEraStartDate( + bool result = Interop.Globalization.GetJapaneseEraStartDate( era, out startYear, out startMonth, diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/JapaneseCalendar.Win32.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/JapaneseCalendar.Win32.cs index 9ea6c21c2e..1d0180b00e 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/JapaneseCalendar.Win32.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/JapaneseCalendar.Win32.cs @@ -159,7 +159,7 @@ namespace System.Globalization int month; int day; - ReadOnlySpan valueSpan = value.AsReadOnlySpan(); + ReadOnlySpan valueSpan = value.AsSpan(); if (!Int32.TryParse(valueSpan.Slice(0, 4), NumberStyles.None, NumberFormatInfo.InvariantInfo, out year) || !Int32.TryParse(valueSpan.Slice(5, 2), NumberStyles.None, NumberFormatInfo.InvariantInfo, out month) || !Int32.TryParse(valueSpan.Slice(8, 2), NumberStyles.None, NumberFormatInfo.InvariantInfo, out day)) diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/Normalization.Unix.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/Normalization.Unix.cs index a25c1b9380..443dbae530 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/Normalization.Unix.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/Normalization.Unix.cs @@ -20,7 +20,7 @@ namespace System.Globalization ValidateArguments(strInput, normalizationForm); - int ret = Interop.GlobalizationInterop.IsNormalized(normalizationForm, strInput, strInput.Length); + int ret = Interop.Globalization.IsNormalized(normalizationForm, strInput, strInput.Length); if (ret == -1) { @@ -45,7 +45,7 @@ namespace System.Globalization for (int attempts = 2; attempts > 0; attempts--) { - int realLen = Interop.GlobalizationInterop.NormalizeString(normalizationForm, strInput, strInput.Length, buf, buf.Length); + int realLen = Interop.Globalization.NormalizeString(normalizationForm, strInput, strInput.Length, buf, buf.Length); if (realLen == -1) { diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/SortVersion.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/SortVersion.cs index 46e9a833ec..f96f7367a7 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/SortVersion.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/SortVersion.cs @@ -5,7 +5,9 @@ namespace System.Globalization { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public sealed class SortVersion : IEquatable { private int m_NlsVersion; // Do not rename (binary serialization) diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/TextInfo.Unix.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/TextInfo.Unix.cs index dd2433d18f..c431e462b5 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/TextInfo.Unix.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/TextInfo.Unix.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Runtime.InteropServices; using System.Security; using System.Text; @@ -12,68 +13,7 @@ namespace System.Globalization { private Tristate _needsTurkishCasing = Tristate.NotInitialized; - private void FinishInitialization() - { - } - - private unsafe string ChangeCase(string s, bool toUpper) - { - Debug.Assert(!_invariantMode); - - Debug.Assert(s != null); - - if (s.Length == 0) - { - return string.Empty; - } - - string result = string.FastAllocateString(s.Length); - - fixed (char* pSource = s) - { - fixed (char* pResult = result) - { -#if CORECLR - if (IsAsciiCasingSameAsInvariant && s.IsAscii()) - { - int length = s.Length; - char* a = pSource, b = pResult; - if (toUpper) - { - while (length-- != 0) - { - *b++ = ToUpperAsciiInvariant(*a++); - } - } - else - { - while (length-- != 0) - { - *b++ = ToLowerAsciiInvariant(*a++); - } - } - } - else -#endif - { - ChangeCase(pSource, s.Length, pResult, result.Length, toUpper); - } - } - } - - return result; - } - - private unsafe char ChangeCase(char c, bool toUpper) - { - Debug.Assert(!_invariantMode); - - char dst = default(char); - - ChangeCase(&c, 1, &dst, 1, toUpper); - - return dst; - } + private void FinishInitialization() { } // ----------------------------- // ---- PAL layer ends here ---- @@ -94,7 +34,7 @@ namespace System.Globalization if (IsInvariant) { - Interop.GlobalizationInterop.ChangeCaseInvariant(src, srcLen, dstBuffer, dstBufferCapacity, bToUpper); + Interop.Globalization.ChangeCaseInvariant(src, srcLen, dstBuffer, dstBufferCapacity, bToUpper); } else { @@ -104,11 +44,11 @@ namespace System.Globalization } if (_needsTurkishCasing == Tristate.True) { - Interop.GlobalizationInterop.ChangeCaseTurkish(src, srcLen, dstBuffer, dstBufferCapacity, bToUpper); + Interop.Globalization.ChangeCaseTurkish(src, srcLen, dstBuffer, dstBufferCapacity, bToUpper); } else { - Interop.GlobalizationInterop.ChangeCase(src, srcLen, dstBuffer, dstBufferCapacity, bToUpper); + Interop.Globalization.ChangeCase(src, srcLen, dstBuffer, dstBufferCapacity, bToUpper); } } } diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/TextInfo.Windows.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/TextInfo.Windows.cs index 8b27e42d1d..6e5e321002 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/TextInfo.Windows.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/TextInfo.Windows.cs @@ -23,78 +23,33 @@ namespace System.Globalization _sortHandle = ret > 0 ? handle : IntPtr.Zero; } - private unsafe string ChangeCase(string s, bool toUpper) + private unsafe void ChangeCase(char* pSource, int pSourceLen, char* pResult, int pResultLen, bool toUpper) { Debug.Assert(!_invariantMode); - - Debug.Assert(s != null); - - // - // Get the length of the string. - // - int nLengthInput = s.Length; - - // - // Check if we have the empty string. - // - if (nLengthInput == 0) - { - return s; - } - - int ret; + Debug.Assert(pSource != null); + Debug.Assert(pResult != null); + Debug.Assert(pSourceLen >= 0); + Debug.Assert(pResultLen >= 0); + Debug.Assert(pSourceLen <= pResultLen); // Check for Invariant to avoid A/V in LCMapStringEx uint linguisticCasing = IsInvariantLocale(_textInfoName) ? 0 : LCMAP_LINGUISTIC_CASING; - // - // Create the result string. - // - string result = string.FastAllocateString(nLengthInput); - - fixed (char* pSource = s) - fixed (char* pResult = result) - { - ret = Interop.Kernel32.LCMapStringEx(_sortHandle != IntPtr.Zero ? null : _textInfoName, - linguisticCasing | (toUpper ? LCMAP_UPPERCASE : LCMAP_LOWERCASE), - pSource, - nLengthInput, - pResult, - nLengthInput, - null, - null, - _sortHandle); - } - + int ret = Interop.Kernel32.LCMapStringEx(_sortHandle != IntPtr.Zero ? null : _textInfoName, + linguisticCasing | (toUpper ? LCMAP_UPPERCASE : LCMAP_LOWERCASE), + pSource, + pSourceLen, + pResult, + pSourceLen, + null, + null, + _sortHandle); if (ret == 0) { throw new InvalidOperationException(SR.InvalidOperation_ReadOnly); } - Debug.Assert(ret == nLengthInput, "Expected getting the same length of the original string"); - return result; - } - - private unsafe char ChangeCase(char c, bool toUpper) - { - Debug.Assert(!_invariantMode); - - char retVal = '\0'; - - // Check for Invariant to avoid A/V in LCMapStringEx - uint linguisticCasing = IsInvariantLocale(_textInfoName) ? 0 : LCMAP_LINGUISTIC_CASING; - - Interop.Kernel32.LCMapStringEx(_sortHandle != IntPtr.Zero ? null : _textInfoName, - toUpper ? LCMAP_UPPERCASE | linguisticCasing : LCMAP_LOWERCASE | linguisticCasing, - &c, - 1, - &retVal, - 1, - null, - null, - _sortHandle); - - return retVal; + Debug.Assert(ret == pSourceLen, "Expected getting the same length of the original string"); } // PAL Ends here @@ -105,9 +60,6 @@ namespace System.Globalization private const uint LCMAP_LOWERCASE = 0x00000100; private const uint LCMAP_UPPERCASE = 0x00000200; - private static bool IsInvariantLocale(string localeName) - { - return localeName == ""; - } + private static bool IsInvariantLocale(string localeName) => localeName == ""; } } diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/TextInfo.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/TextInfo.cs index d9d6f3bd3b..e875e179f5 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/TextInfo.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/TextInfo.cs @@ -13,6 +13,7 @@ //////////////////////////////////////////////////////////////////////////// using System.Diagnostics; +using System.Runtime.InteropServices; using System.Runtime.Serialization; using System.Text; @@ -80,17 +81,6 @@ namespace System.Globalization throw new PlatformNotSupportedException(); } - // - // Internal ordinal comparison functions - // - - internal static int GetHashCodeOrdinalIgnoreCase(string s) - { - // This is the same as an case insensitive hash for Invariant - // (not necessarily true for sorting, but OK for casing & then we apply normal hash code rules) - return Invariant.GetCaseInsensitiveHashCode(s); - } - public virtual int ANSICodePage => _cultureData.IDEFAULTANSICODEPAGE; public virtual int OEMCodePage => _cultureData.IDEFAULTOEMCODEPAGE; @@ -212,6 +202,223 @@ namespace System.Globalization return ChangeCase(str, toUpper: false); } + private unsafe char ChangeCase(char c, bool toUpper) + { + Debug.Assert(!_invariantMode); + + char dst = default; + ChangeCase(&c, 1, &dst, 1, toUpper); + return dst; + } + + private unsafe string ChangeCase(string source, bool toUpper) + { + Debug.Assert(!_invariantMode); + Debug.Assert(source != null); + + // If the string is empty, we're done. + if (source.Length == 0) + { + return string.Empty; + } + + int sourcePos = 0; + string result = null; + + // If this culture's casing for ASCII is the same as invariant, try to take + // a fast path that'll work in managed code and ASCII rather than calling out + // to the OS for culture-aware casing. + if (IsAsciiCasingSameAsInvariant) + { + if (toUpper) + { + // Loop through each character. + for (sourcePos = 0; sourcePos < source.Length; sourcePos++) + { + // If the character is lower-case, we're going to need to allocate a string. + char c = source[sourcePos]; + if ((uint)(c - 'a') <= 'z' - 'a') + { + // Allocate the result string. + result = string.FastAllocateString(source.Length); + fixed (char* pResult = result) + { + // Store all of characters examined thus far. + if (sourcePos > 0) + { + source.AsSpan(0, sourcePos).CopyTo(new Span(pResult, sourcePos)); + } + + // And store the current character, upper-cased. + char* d = pResult + sourcePos; + *d++ = (char)(c & ~0x20); + sourcePos++; + + // Then continue looping through the remainder of the characters. If we hit + // a non-ASCII character, bail to fall back to culture-aware casing. + for (; sourcePos < source.Length; sourcePos++) + { + c = source[sourcePos]; + if ((uint)(c - 'a') <= 'z' - 'a') + { + *d++ = (char)(c & ~0x20); + } + else if (!IsAscii(c)) + { + break; + } + else + { + *d++ = c; + } + } + } + + break; + } + else if (!IsAscii(c)) + { + // The character isn't ASCII; bail to fall back to a culture-aware casing. + break; + } + } + } + else // toUpper == false + { + // Loop through each character. + for (sourcePos = 0; sourcePos < source.Length; sourcePos++) + { + // If the character is upper-case, we're going to need to allocate a string. + char c = source[sourcePos]; + if ((uint)(c - 'A') <= 'Z' - 'A') + { + // Allocate the result string. + result = string.FastAllocateString(source.Length); + fixed (char* pResult = result) + { + // Store all of characters examined thus far. + if (sourcePos > 0) + { + source.AsSpan(0, sourcePos).CopyTo(new Span(pResult, sourcePos)); + } + + // And store the current character, upper-cased. + char* d = pResult + sourcePos; + *d++ = (char)(c | 0x20); + sourcePos++; + + // Then continue looping through the remainder of the characters. If we hit + // a non-ASCII character, bail to fall back to culture-aware casing. + for (; sourcePos < source.Length; sourcePos++) + { + c = source[sourcePos]; + if ((uint)(c - 'A') <= 'Z' - 'A') + { + *d++ = (char)(c | 0x20); + } + else if (!IsAscii(c)) + { + break; + } + else + { + *d++ = c; + } + } + } + + break; + } + else if (!IsAscii(c)) + { + // The character isn't ASCII; bail to fall back to a culture-aware casing. + break; + } + } + } + + // If we successfully iterated through all of the characters, we didn't need to fall back + // to culture-aware casing. In that case, if we allocated a result string, use it, otherwise + // just return the original string, as no modifications were necessary. + if (sourcePos == source.Length) + { + return result ?? source; + } + } + + // Falling back to culture-aware casing. Make sure we have a result string to write into. + // If we need to allocate the result string, we'll also need to copy over to it any + // characters already examined. + if (result == null) + { + result = string.FastAllocateString(source.Length); + if (sourcePos > 0) + { + fixed (char* pResult = result) + { + source.AsSpan(0, sourcePos).CopyTo(new Span(pResult, sourcePos)); + } + } + } + + // Do the casing operation on everything after what we already processed. + fixed (char* pSource = source) + { + fixed (char* pResult = result) + { + ChangeCase(pSource + sourcePos, source.Length - sourcePos, pResult + sourcePos, result.Length - sourcePos, toUpper); + } + } + + return result; + } + + internal unsafe void ChangeCase(ReadOnlySpan source, Span destination, bool toUpper) + { + Debug.Assert(!_invariantMode); + Debug.Assert(destination.Length >= source.Length); + + if (source.IsEmpty) + { + return; + } + + fixed (char* pSource = &MemoryMarshal.GetReference(source)) + fixed (char* pResult = &MemoryMarshal.GetReference(destination)) + { + if (IsAsciiCasingSameAsInvariant) + { + int length = 0; + char* a = pSource, b = pResult; + if (toUpper) + { + while (length < source.Length && *a < 0x80) + { + *b++ = ToUpperAsciiInvariant(*a++); + length++; + } + } + else + { + while (length < source.Length && *a < 0x80) + { + *b++ = ToLowerAsciiInvariant(*a++); + length++; + } + } + + if (length != source.Length) + { + ChangeCase(a, source.Length - length, b, destination.Length - length, toUpper); + } + } + else + { + ChangeCase(pSource, source.Length, pResult, destination.Length, toUpper); + } + } + } + private unsafe string ToLowerAsciiInvariant(string s) { if (s.Length == 0) @@ -258,6 +465,16 @@ namespace System.Globalization } } + internal void ToLowerAsciiInvariant(ReadOnlySpan source, Span destination) + { + Debug.Assert(destination.Length >= source.Length); + + for (int i = 0; i < source.Length; i++) + { + destination[i] = ToLowerAsciiInvariant(source[i]); + } + } + private unsafe string ToUpperAsciiInvariant(string s) { if (s.Length == 0) @@ -304,6 +521,16 @@ namespace System.Globalization } } + internal void ToUpperAsciiInvariant(ReadOnlySpan source, Span destination) + { + Debug.Assert(destination.Length >= source.Length); + + for (int i = 0; i < source.Length; i++) + { + destination[i] = ToUpperAsciiInvariant(source[i]); + } + } + private static char ToLowerAsciiInvariant(char c) { if ((uint)(c - 'A') <= (uint)('Z' - 'A')) @@ -673,64 +900,5 @@ namespace System.Globalization || uc == UnicodeCategory.ModifierLetter || uc == UnicodeCategory.OtherLetter); } - - // - // Get case-insensitive hash code for the specified string. - // - internal unsafe int GetCaseInsensitiveHashCode(string str) - { - // Validate inputs - if (str == null) - { - throw new ArgumentNullException(nameof(str)); - } - - // This code assumes that ASCII casing is safe for whatever context is passed in. - // this is true today, because we only ever call these methods on Invariant. It would be ideal to refactor - // these methods so they were correct by construction and we could only ever use Invariant. - - uint hash = 5381; - uint c; - - // Note: We assume that str contains only ASCII characters until - // we hit a non-ASCII character to optimize the common case. - for (int i = 0; i < str.Length; i++) - { - c = str[i]; - if (c >= 0x80) - { - return GetCaseInsensitiveHashCodeSlow(str); - } - - // If we have a lowercase character, ANDing off 0x20 - // will make it an uppercase character. - if ((c - 'a') <= ('z' - 'a')) - { - c = (uint)((int)c & ~0x20); - } - - hash = ((hash << 5) + hash) ^ c; - } - - return (int)hash; - } - - private unsafe int GetCaseInsensitiveHashCodeSlow(string str) - { - Debug.Assert(str != null); - - string upper = ToUpper(str); - - uint hash = 5381; - uint c; - - for (int i = 0; i < upper.Length; i++) - { - c = upper[i]; - hash = ((hash << 5) + hash) ^ c; - } - - return (int)hash; - } } } diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/TimeSpanFormat.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/TimeSpanFormat.cs index bf12b246b0..075f1eae3a 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/TimeSpanFormat.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/TimeSpanFormat.cs @@ -4,6 +4,8 @@ using System.Text; using System.Diagnostics; +using System.Diagnostics.Private; +using System.Runtime.InteropServices; namespace System.Globalization { @@ -315,7 +317,17 @@ namespace System.Globalization if (nextChar >= 0 && nextChar != (int)'%') { char nextCharChar = (char)nextChar; - StringBuilder origStringBuilder = FormatCustomized(value, ReadOnlySpan.DangerousCreate(null, ref nextCharChar, 1), dtfi, result); + ReadOnlySpan nextCharSpan; +#if MONO + // Remove once Mono switches to Fast Spans + unsafe + { + nextCharSpan = new ReadOnlySpan(&nextCharChar, 1); + } +#else + nextCharSpan = MemoryMarshal.CreateReadOnlySpan(ref nextCharChar, 1); +#endif + StringBuilder origStringBuilder = FormatCustomized(value, nextCharSpan, dtfi, result); Debug.Assert(ReferenceEquals(origStringBuilder, result)); tokenLen = 2; } diff --git a/external/corefx/src/Common/src/CoreLib/System/Globalization/TimeSpanParse.cs b/external/corefx/src/Common/src/CoreLib/System/Globalization/TimeSpanParse.cs index ae77957cec..c6475e02d9 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Globalization/TimeSpanParse.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Globalization/TimeSpanParse.cs @@ -49,11 +49,12 @@ //////////////////////////////////////////////////////////////////////////// using System.Diagnostics; +using System.Diagnostics.Private; using System.Text; namespace System.Globalization { - internal static class TimeSpanParse + internal static partial class TimeSpanParse { private const int MaxFractionDigits = 7; private const int MaxDays = 10675199; @@ -274,83 +275,83 @@ namespace System.Globalization internal bool FullAppCompatMatch(TimeSpanFormat.FormatLiterals pattern) => _sepCount == 5 && _numCount == 4 - && StringSpanHelpers.Equals(_literals0, pattern.Start) - && StringSpanHelpers.Equals(_literals1, pattern.DayHourSep) - && StringSpanHelpers.Equals(_literals2, pattern.HourMinuteSep) - && StringSpanHelpers.Equals(_literals3, pattern.AppCompatLiteral) - && StringSpanHelpers.Equals(_literals4, pattern.End); + && _literals0.EqualsOrdinal(pattern.Start) + && _literals1.EqualsOrdinal(pattern.DayHourSep) + && _literals2.EqualsOrdinal(pattern.HourMinuteSep) + && _literals3.EqualsOrdinal(pattern.AppCompatLiteral) + && _literals4.EqualsOrdinal(pattern.End); internal bool PartialAppCompatMatch(TimeSpanFormat.FormatLiterals pattern) => _sepCount == 4 && _numCount == 3 - && StringSpanHelpers.Equals(_literals0, pattern.Start) - && StringSpanHelpers.Equals(_literals1, pattern.HourMinuteSep) - && StringSpanHelpers.Equals(_literals2, pattern.AppCompatLiteral) - && StringSpanHelpers.Equals(_literals3, pattern.End); + && _literals0.EqualsOrdinal(pattern.Start) + && _literals1.EqualsOrdinal(pattern.HourMinuteSep) + && _literals2.EqualsOrdinal(pattern.AppCompatLiteral) + && _literals3.EqualsOrdinal(pattern.End); /// DHMSF (all values matched) internal bool FullMatch(TimeSpanFormat.FormatLiterals pattern) => _sepCount == MaxLiteralTokens && _numCount == MaxNumericTokens - && StringSpanHelpers.Equals(_literals0, pattern.Start) - && StringSpanHelpers.Equals(_literals1, pattern.DayHourSep) - && StringSpanHelpers.Equals(_literals2, pattern.HourMinuteSep) - && StringSpanHelpers.Equals(_literals3, pattern.MinuteSecondSep) - && StringSpanHelpers.Equals(_literals4, pattern.SecondFractionSep) - && StringSpanHelpers.Equals(_literals5, pattern.End); + && _literals0.EqualsOrdinal(pattern.Start) + && _literals1.EqualsOrdinal(pattern.DayHourSep) + && _literals2.EqualsOrdinal(pattern.HourMinuteSep) + && _literals3.EqualsOrdinal(pattern.MinuteSecondSep) + && _literals4.EqualsOrdinal(pattern.SecondFractionSep) + && _literals5.EqualsOrdinal(pattern.End); /// D (no hours, minutes, seconds, or fractions) internal bool FullDMatch(TimeSpanFormat.FormatLiterals pattern) => _sepCount == 2 && _numCount == 1 - && StringSpanHelpers.Equals(_literals0, pattern.Start) - && StringSpanHelpers.Equals(_literals1, pattern.End); + && _literals0.EqualsOrdinal(pattern.Start) + && _literals1.EqualsOrdinal(pattern.End); /// HM (no days, seconds, or fractions) internal bool FullHMMatch(TimeSpanFormat.FormatLiterals pattern) => _sepCount == 3 && _numCount == 2 - && StringSpanHelpers.Equals(_literals0, pattern.Start) - && StringSpanHelpers.Equals(_literals1, pattern.HourMinuteSep) - && StringSpanHelpers.Equals(_literals2, pattern.End); + && _literals0.EqualsOrdinal(pattern.Start) + && _literals1.EqualsOrdinal(pattern.HourMinuteSep) + && _literals2.EqualsOrdinal(pattern.End); /// DHM (no seconds or fraction) internal bool FullDHMMatch(TimeSpanFormat.FormatLiterals pattern) => _sepCount == 4 && _numCount == 3 - && StringSpanHelpers.Equals(_literals0, pattern.Start) - && StringSpanHelpers.Equals(_literals1, pattern.DayHourSep) - && StringSpanHelpers.Equals(_literals2, pattern.HourMinuteSep) - && StringSpanHelpers.Equals(_literals3, pattern.End); + && _literals0.EqualsOrdinal(pattern.Start) + && _literals1.EqualsOrdinal(pattern.DayHourSep) + && _literals2.EqualsOrdinal(pattern.HourMinuteSep) + && _literals3.EqualsOrdinal(pattern.End); /// HMS (no days or fraction) internal bool FullHMSMatch(TimeSpanFormat.FormatLiterals pattern) => _sepCount == 4 && _numCount == 3 - && StringSpanHelpers.Equals(_literals0, pattern.Start) - && StringSpanHelpers.Equals(_literals1, pattern.HourMinuteSep) - && StringSpanHelpers.Equals(_literals2, pattern.MinuteSecondSep) - && StringSpanHelpers.Equals(_literals3, pattern.End); + && _literals0.EqualsOrdinal(pattern.Start) + && _literals1.EqualsOrdinal(pattern.HourMinuteSep) + && _literals2.EqualsOrdinal(pattern.MinuteSecondSep) + && _literals3.EqualsOrdinal(pattern.End); /// DHMS (no fraction) internal bool FullDHMSMatch(TimeSpanFormat.FormatLiterals pattern) => _sepCount == 5 && _numCount == 4 - && StringSpanHelpers.Equals(_literals0, pattern.Start) - && StringSpanHelpers.Equals(_literals1, pattern.DayHourSep) - && StringSpanHelpers.Equals(_literals2, pattern.HourMinuteSep) - && StringSpanHelpers.Equals(_literals3, pattern.MinuteSecondSep) - && StringSpanHelpers.Equals(_literals4, pattern.End); + && _literals0.EqualsOrdinal(pattern.Start) + && _literals1.EqualsOrdinal(pattern.DayHourSep) + && _literals2.EqualsOrdinal(pattern.HourMinuteSep) + && _literals3.EqualsOrdinal(pattern.MinuteSecondSep) + && _literals4.EqualsOrdinal(pattern.End); /// HMSF (no days) internal bool FullHMSFMatch(TimeSpanFormat.FormatLiterals pattern) => _sepCount == 5 && _numCount == 4 - && StringSpanHelpers.Equals(_literals0, pattern.Start) - && StringSpanHelpers.Equals(_literals1, pattern.HourMinuteSep) - && StringSpanHelpers.Equals(_literals2, pattern.MinuteSecondSep) - && StringSpanHelpers.Equals(_literals3, pattern.SecondFractionSep) - && StringSpanHelpers.Equals(_literals4, pattern.End); + && _literals0.EqualsOrdinal(pattern.Start) + && _literals1.EqualsOrdinal(pattern.HourMinuteSep) + && _literals2.EqualsOrdinal(pattern.MinuteSecondSep) + && _literals3.EqualsOrdinal(pattern.SecondFractionSep) + && _literals4.EqualsOrdinal(pattern.End); internal TTT _lastSeenTTT; internal int _tokenCount; diff --git a/external/corefx/src/Common/src/CoreLib/System/Guid.Unix.cs b/external/corefx/src/Common/src/CoreLib/System/Guid.Unix.cs new file mode 100644 index 0000000000..442e7f8837 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/Guid.Unix.cs @@ -0,0 +1,38 @@ +// 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.InteropServices; + +namespace System +{ + partial struct Guid + { + // This will create a new random guid based on the https://www.ietf.org/rfc/rfc4122.txt + public static unsafe Guid NewGuid() + { + Guid g; + Interop.GetRandomBytes((byte*)&g, sizeof(Guid)); + + const ushort VersionMask = 0xF000; + const ushort RandomGuidVersion = 0x4000; + + const byte ClockSeqHiAndReservedMask = 0xC0; + const byte ClockSeqHiAndReservedValue = 0x80; + + // Modify bits indicating the type of the GUID + + unchecked + { + // time_hi_and_version + g._c = (short)((g._c & ~VersionMask) | RandomGuidVersion); + // clock_seq_hi_and_reserved + g._d = (byte)((g._d & ~ClockSeqHiAndReservedMask) | ClockSeqHiAndReservedValue); + } + + return g; + } + } +} + diff --git a/external/corefx/src/Common/src/CoreLib/System/Guid.Windows.cs b/external/corefx/src/Common/src/CoreLib/System/Guid.Windows.cs new file mode 100644 index 0000000000..f00fbe45b3 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/Guid.Windows.cs @@ -0,0 +1,29 @@ +// 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 +{ + partial struct Guid + { + public static Guid NewGuid() + { + // CoCreateGuid should never return Guid.Empty, since it attempts to maintain some + // uniqueness guarantees. + + Guid g; + int hr = Interop.Ole32.CoCreateGuid(out g); + // We don't expect that this will ever throw an error, none are even documented, and so we don't want to pull + // in the HR to ComException mappings into the core library just for this so we will try a generic exception if + // we ever hit this condition. + if (hr != 0) + { + Exception ex = new Exception(); + ex.SetErrorCode(hr); + throw ex; + } + return g; + } + } +} + diff --git a/external/corefx/src/Common/src/CoreLib/System/Guid.cs b/external/corefx/src/Common/src/CoreLib/System/Guid.cs index 423d5bc78c..3a39253376 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Guid.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Guid.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -14,7 +15,9 @@ namespace System [StructLayout(LayoutKind.Sequential)] [Serializable] [Runtime.Versioning.NonVersionable] // This only applies to field layout +#if !MONO [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public partial struct Guid : IFormattable, IComparable, IComparable, IEquatable, ISpanFormattable { public static readonly Guid Empty = new Guid(); @@ -449,7 +452,7 @@ namespace System } // Check for braces - bool bracesExistInString = (guidString.IndexOf('{', 0) >= 0); + bool bracesExistInString = (guidString.IndexOf('{') >= 0); if (bracesExistInString) { @@ -471,7 +474,7 @@ namespace System } // Check for parenthesis - bool parenthesisExistInString = (guidString.IndexOf('(', 0) >= 0); + bool parenthesisExistInString = (guidString.IndexOf('(') >= 0); if (parenthesisExistInString) { @@ -548,7 +551,7 @@ namespace System // Find the end of this hex number (since it is not fixed length) numStart = 3; - numLen = guidString.IndexOf(',', numStart) - numStart; + numLen = guidString.Slice(numStart).IndexOf(','); if (numLen <= 0) { result.SetFailure(ParseFailureKind.Format, nameof(SR.Format_GuidComma)); @@ -566,7 +569,7 @@ namespace System } // +3 to get by ',0x' numStart = numStart + numLen + 3; - numLen = guidString.IndexOf(',', numStart) - numStart; + numLen = guidString.Slice(numStart).IndexOf(','); if (numLen <= 0) { result.SetFailure(ParseFailureKind.Format, nameof(SR.Format_GuidComma)); @@ -584,7 +587,7 @@ namespace System } // +3 to get by ',0x' numStart = numStart + numLen + 3; - numLen = guidString.IndexOf(',', numStart) - numStart; + numLen = guidString.Slice(numStart).IndexOf(','); if (numLen <= 0) { result.SetFailure(ParseFailureKind.Format, nameof(SR.Format_GuidComma)); @@ -621,7 +624,7 @@ namespace System // Calculate number length if (i < 7) // first 7 cases { - numLen = guidString.IndexOf(',', numStart) - numStart; + numLen = guidString.Slice(numStart).IndexOf(','); if (numLen <= 0) { result.SetFailure(ParseFailureKind.Format, nameof(SR.Format_GuidComma)); @@ -630,7 +633,7 @@ namespace System } else // last case ends with '}', not ',' { - numLen = guidString.IndexOf('}', numStart) - numStart; + numLen = guidString.Slice(numStart).IndexOf('}'); if (numLen <= 0) { result.SetFailure(ParseFailureKind.Format, nameof(SR.Format_GuidBraceAfterLastNumber)); @@ -1232,7 +1235,7 @@ namespace System return (char)((a > 9) ? a - 10 + 0x61 : a + 0x30); } - unsafe private static int HexsToChars(char* guidChars, int a, int b) + private static unsafe int HexsToChars(char* guidChars, int a, int b) { guidChars[0] = HexToChar(a >> 4); guidChars[1] = HexToChar(a); @@ -1243,7 +1246,7 @@ namespace System return 4; } - unsafe private static int HexsToCharsHexOutput(char* guidChars, int a, int b) + private static unsafe int HexsToCharsHexOutput(char* guidChars, int a, int b) { guidChars[0] = '0'; guidChars[1] = 'x'; @@ -1300,7 +1303,18 @@ namespace System string guidString = string.FastAllocateString(guidSize); int bytesWritten; - bool result = TryFormat(new Span(ref guidString.GetRawStringData(), guidString.Length), out bytesWritten, format); + bool result; +#if MONO + // Span.Portable doesn't have Span(ref T[], int) constructor + // Remove it once Mono switches to Span.Fast + unsafe + { + fixed (char* guidStringPtr = guidString) + result = TryFormat(new Span(guidStringPtr, guidString.Length), out bytesWritten, format); + } +#else + result = TryFormat(new Span(ref guidString.GetRawStringData(), guidString.Length), out bytesWritten, format); +#endif Debug.Assert(result && bytesWritten == guidString.Length, "Formatting guid should have succeeded."); return guidString; diff --git a/external/corefx/src/Common/src/CoreLib/System/HashCode.cs b/external/corefx/src/Common/src/CoreLib/System/HashCode.cs index 4be57be02a..a3fa0af957 100644 --- a/external/corefx/src/Common/src/CoreLib/System/HashCode.cs +++ b/external/corefx/src/Common/src/CoreLib/System/HashCode.cs @@ -42,7 +42,9 @@ https://raw.githubusercontent.com/Cyan4973/xxHash/5c174cfa4e45a42f94082dc0d4539b */ using System.Collections.Generic; +#if !MONO using System.ComponentModel; +#endif using System.Runtime.CompilerServices; namespace System @@ -419,11 +421,15 @@ namespace System // about people who might have incorrectly used this type. [Obsolete("HashCode is a mutable struct and should not be compared with other HashCodes. Use ToHashCode to retrieve the computed hash code.", error: true)] +#if !MONO [EditorBrowsable(EditorBrowsableState.Never)] +#endif public override int GetHashCode() => throw new NotSupportedException(SR.HashCode_HashCodeNotSupported); [Obsolete("HashCode is a mutable struct and should not be compared with other HashCodes.", error: true)] +#if !MONO [EditorBrowsable(EditorBrowsableState.Never)] +#endif public override bool Equals(object obj) => throw new NotSupportedException(SR.HashCode_EqualityNotSupported); #pragma warning restore 0809 } diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/DirectoryNotFoundException.cs b/external/corefx/src/Common/src/CoreLib/System/IO/DirectoryNotFoundException.cs index d7c6eacb9a..eae32c31d7 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/DirectoryNotFoundException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/DirectoryNotFoundException.cs @@ -13,7 +13,9 @@ namespace System.IO * and STG_E_PATHNOTFOUND (0x80030003). */ [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class DirectoryNotFoundException : IOException { public DirectoryNotFoundException() diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/DriveNotFoundException.cs b/external/corefx/src/Common/src/CoreLib/System/IO/DriveNotFoundException.cs deleted file mode 100644 index 3f2c88c74b..0000000000 --- a/external/corefx/src/Common/src/CoreLib/System/IO/DriveNotFoundException.cs +++ /dev/null @@ -1,36 +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.Runtime.Serialization; - -namespace System.IO -{ - //Thrown when trying to access a drive that is not available. - [Serializable] - [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] - internal class DriveNotFoundException : IOException - { - public DriveNotFoundException() - : base(SR.Arg_DriveNotFoundException) - { - HResult = HResults.COR_E_DIRECTORYNOTFOUND; - } - - public DriveNotFoundException(string message) - : base(message) - { - HResult = HResults.COR_E_DIRECTORYNOTFOUND; - } - - public DriveNotFoundException(string message, Exception innerException) - : base(message, innerException) - { - HResult = HResults.COR_E_DIRECTORYNOTFOUND; - } - - protected DriveNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context) - { - } - } -} diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/EndOfStreamException.cs b/external/corefx/src/Common/src/CoreLib/System/IO/EndOfStreamException.cs index 606073ad9a..764ef74651 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/EndOfStreamException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/EndOfStreamException.cs @@ -7,7 +7,9 @@ using System.Runtime.Serialization; namespace System.IO { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class EndOfStreamException : IOException { public EndOfStreamException() diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/FileNotFoundException.cs b/external/corefx/src/Common/src/CoreLib/System/IO/FileNotFoundException.cs index 72cff4cfc0..75b1f75aca 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/FileNotFoundException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/FileNotFoundException.cs @@ -8,7 +8,9 @@ namespace System.IO { // Thrown when trying to access a file that doesn't exist on disk. [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public partial class FileNotFoundException : IOException { public FileNotFoundException() diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/FileStream.Unix.cs b/external/corefx/src/Common/src/CoreLib/System/IO/FileStream.Unix.cs index 34164abc33..d9fcf65711 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/FileStream.Unix.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/FileStream.Unix.cs @@ -240,7 +240,7 @@ namespace System.IO { FlushWriteBuffer(); } - catch (IOException) when (!disposing) + catch (Exception e) when (IsIoRelatedException(e) && !disposing) { // On finalization, ignore failures from trying to flush the write buffer, // e.g. if this stream is wrapping a pipe and the pipe is now broken. @@ -635,12 +635,12 @@ namespace System.IO /// The buffer to write data from. /// The token to monitor for cancellation requests. /// A task that represents the asynchronous write operation. - private Task WriteAsyncInternal(ReadOnlyMemory source, CancellationToken cancellationToken) + private ValueTask WriteAsyncInternal(ReadOnlyMemory source, CancellationToken cancellationToken) { Debug.Assert(_useAsyncIO); if (cancellationToken.IsCancellationRequested) - return Task.FromCanceled(cancellationToken); + return new ValueTask(Task.FromCanceled(cancellationToken)); if (_fileHandle.IsClosed) throw Error.GetFileNotOpen(); @@ -667,11 +667,11 @@ namespace System.IO source.Span.CopyTo(new Span(GetBuffer(), _writePos, source.Length)); _writePos += source.Length; - return Task.CompletedTask; + return default; } catch (Exception exc) { - return Task.FromException(exc); + return new ValueTask(Task.FromException(exc)); } finally { @@ -682,7 +682,7 @@ namespace System.IO // Otherwise, issue the whole request asynchronously. _asyncState.ReadOnlyMemory = source; - return waitTask.ContinueWith((t, s) => + return new ValueTask(waitTask.ContinueWith((t, s) => { // The options available on Unix for writing asynchronously to an arbitrary file // handle typically amount to just using another thread to do the synchronous write, @@ -702,7 +702,7 @@ namespace System.IO thisRef.WriteSpan(readOnlyMemory.Span); } finally { thisRef._asyncState.Release(); } - }, this, CancellationToken.None, TaskContinuationOptions.DenyChildAttach, TaskScheduler.Default); + }, this, CancellationToken.None, TaskContinuationOptions.DenyChildAttach, TaskScheduler.Default)); } /// Sets the current position of this stream to the given value. diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/FileStream.Windows.cs b/external/corefx/src/Common/src/CoreLib/System/IO/FileStream.Windows.cs index 477b9430fc..80c07dfdf4 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/FileStream.Windows.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/FileStream.Windows.cs @@ -171,22 +171,23 @@ namespace System.IO _filePosition = 0; } - private unsafe static Interop.Kernel32.SECURITY_ATTRIBUTES GetSecAttrs(FileShare share) + private static unsafe Interop.Kernel32.SECURITY_ATTRIBUTES GetSecAttrs(FileShare share) { - Interop.Kernel32.SECURITY_ATTRIBUTES secAttrs = default(Interop.Kernel32.SECURITY_ATTRIBUTES); + Interop.Kernel32.SECURITY_ATTRIBUTES secAttrs = default; if ((share & FileShare.Inheritable) != 0) { - secAttrs = new Interop.Kernel32.SECURITY_ATTRIBUTES(); - secAttrs.nLength = (uint)sizeof(Interop.Kernel32.SECURITY_ATTRIBUTES); - - secAttrs.bInheritHandle = Interop.BOOL.TRUE; + secAttrs = new Interop.Kernel32.SECURITY_ATTRIBUTES + { + nLength = (uint)sizeof(Interop.Kernel32.SECURITY_ATTRIBUTES), + bInheritHandle = Interop.BOOL.TRUE + }; } return secAttrs; } // Verifies that this handle supports synchronous IO operations (unless you // didn't open it for either reading or writing). - private unsafe static void VerifyHandleIsSync(SafeFileHandle handle, FileAccess access) + private static unsafe void VerifyHandleIsSync(SafeFileHandle handle, FileAccess access) { // Do NOT use this method on pipes. Reading or writing to a pipe may // cause an app to block incorrectly, introducing a deadlock (depending @@ -225,21 +226,16 @@ namespace System.IO } private bool HasActiveBufferOperation - { - get { return _activeBufferOperation != null && !_activeBufferOperation.IsCompleted; } - } + => _activeBufferOperation != null && !_activeBufferOperation.IsCompleted; - public override bool CanSeek - { - get { return _canSeek; } - } + public override bool CanSeek => _canSeek; private unsafe long GetLengthInternal() { Interop.Kernel32.FILE_STANDARD_INFO info = new Interop.Kernel32.FILE_STANDARD_INFO(); if (!Interop.Kernel32.GetFileInformationByHandleEx(_fileHandle, Interop.Kernel32.FILE_INFO_BY_HANDLE_CLASS.FileStandardInfo, out info, (uint)sizeof(Interop.Kernel32.FILE_STANDARD_INFO))) - throw Win32Marshal.GetExceptionForLastWin32Error(); + throw Win32Marshal.GetExceptionForLastWin32Error(_path); long len = info.EndOfFile; // If we're writing near the end of the file, we must include our // internal buffer in our Length calculation. Don't flush because @@ -268,7 +264,15 @@ namespace System.IO // want us to do this. if (_writePos > 0) { - FlushWriteBuffer(!disposing); + try + { + FlushWriteBuffer(!disposing); + } + catch (Exception e) when (IsIoRelatedException(e) && !disposing) + { + // On finalization, ignore failures from trying to flush the write buffer, + // e.g. if this stream is wrapping a pipe and the pipe is now broken. + } } } } @@ -299,7 +303,7 @@ namespace System.IO { if (!Interop.Kernel32.FlushFileBuffers(_fileHandle)) { - throw Win32Marshal.GetExceptionForLastWin32Error(); + throw Win32Marshal.GetExceptionForLastWin32Error(_path); } } @@ -396,7 +400,7 @@ namespace System.IO int errorCode = Marshal.GetLastWin32Error(); if (errorCode == Interop.Errors.ERROR_INVALID_PARAMETER) throw new ArgumentOutOfRangeException(nameof(value), SR.ArgumentOutOfRange_FileLengthTooBig); - throw Win32Marshal.GetExceptionForWin32Error(errorCode); + throw Win32Marshal.GetExceptionForWin32Error(errorCode, _path); } // Return file pointer to where it was before setting length if (origPos != value) @@ -498,8 +502,7 @@ namespace System.IO // Make sure we are reading from the right spot VerifyOSHandlePosition(); - int errorCode = 0; - int r = ReadFileNative(_fileHandle, buffer, null, out errorCode); + int r = ReadFileNative(_fileHandle, buffer, null, out int errorCode); if (r == -1) { @@ -513,7 +516,7 @@ namespace System.IO if (errorCode == ERROR_INVALID_PARAMETER) throw new ArgumentException(SR.Arg_HandleNotSync, "_fileHandle"); - throw Win32Marshal.GetExceptionForWin32Error(errorCode); + throw Win32Marshal.GetExceptionForWin32Error(errorCode, _path); } } Debug.Assert(r >= 0, "FileStream's ReadNative is likely broken."); @@ -613,17 +616,15 @@ namespace System.IO Debug.Assert(!fileHandle.IsClosed && _canSeek, "!fileHandle.IsClosed && _canSeek"); Debug.Assert(origin >= SeekOrigin.Begin && origin <= SeekOrigin.End, "origin >= SeekOrigin.Begin && origin <= SeekOrigin.End"); - long ret = 0; - - if (!Interop.Kernel32.SetFilePointerEx(fileHandle, offset, out ret, (uint)origin)) + if (!Interop.Kernel32.SetFilePointerEx(fileHandle, offset, out long ret, (uint)origin)) { if (closeInvalidHandle) { - throw Win32Marshal.GetExceptionForWin32Error(GetLastWin32ErrorAndDisposeHandleIfInvalid(throwIfInvalidHandle: false)); + throw Win32Marshal.GetExceptionForWin32Error(GetLastWin32ErrorAndDisposeHandleIfInvalid(throwIfInvalidHandle: false), _path); } else { - throw Win32Marshal.GetExceptionForWin32Error(Marshal.GetLastWin32Error()); + throw Win32Marshal.GetExceptionForLastWin32Error(_path); } } @@ -731,7 +732,7 @@ namespace System.IO // to a handle opened asynchronously. if (errorCode == ERROR_INVALID_PARAMETER) throw new IOException(SR.IO_FileTooLongOrHandleNotSync); - throw Win32Marshal.GetExceptionForWin32Error(errorCode); + throw Win32Marshal.GetExceptionForWin32Error(errorCode, _path); } } Debug.Assert(r >= 0, "FileStream's WriteCore is likely broken."); @@ -842,15 +843,13 @@ namespace System.IO } } - unsafe private Task ReadNativeAsync(Memory destination, int numBufferedBytesRead, CancellationToken cancellationToken) + private unsafe Task ReadNativeAsync(Memory destination, int numBufferedBytesRead, CancellationToken cancellationToken) { AssertCanRead(); Debug.Assert(_useAsyncIO, "ReadNativeAsync doesn't work on synchronous file streams!"); // Create and store async stream class library specific data in the async result - FileStreamCompletionSource completionSource = destination.TryGetArray(out ArraySegment memoryArray) ? - new FileStreamCompletionSource(this, numBufferedBytesRead, memoryArray.Array) : - new MemoryFileStreamCompletionSource(this, numBufferedBytesRead, destination); + FileStreamCompletionSource completionSource = FileStreamCompletionSource.Create(this, numBufferedBytesRead, destination); NativeOverlapped* intOverlapped = completionSource.Overlapped; // Calculate position in the file we should be at after the read is done @@ -932,7 +931,7 @@ namespace System.IO } else { - throw Win32Marshal.GetExceptionForWin32Error(errorCode); + throw Win32Marshal.GetExceptionForWin32Error(errorCode, _path); } } else if (cancellationToken.CanBeCanceled) // ERROR_IO_PENDING @@ -955,7 +954,7 @@ namespace System.IO return completionSource.Task; } - private Task WriteAsyncInternal(ReadOnlyMemory source, CancellationToken cancellationToken) + private ValueTask WriteAsyncInternal(ReadOnlyMemory source, CancellationToken cancellationToken) { Debug.Assert(_useAsyncIO); Debug.Assert((_readPos == 0 && _readLength == 0 && _writePos >= 0) || (_writePos == 0 && _readPos <= _readLength), "We're either reading or writing, but not both."); @@ -999,7 +998,7 @@ namespace System.IO // completely, we want to do the asynchronous flush/write as part of this operation // rather than waiting until the next write that fills the buffer. if (source.Length != remainingBuffer) - return Task.CompletedTask; + return default; Debug.Assert(_writePos == _bufferLength); } @@ -1045,7 +1044,7 @@ namespace System.IO flushTask.IsFaulted || flushTask.IsCanceled) { - return flushTask; + return new ValueTask(flushTask); } } @@ -1055,10 +1054,10 @@ namespace System.IO // Finally, issue the write asynchronously, and return a Task that logically // represents the write operation, including any flushing done. Task writeTask = WriteAsyncInternalCore(source, cancellationToken); - return + return new ValueTask( (flushTask == null || flushTask.Status == TaskStatus.RanToCompletion) ? writeTask : (writeTask.Status == TaskStatus.RanToCompletion) ? flushTask : - Task.WhenAll(flushTask, writeTask); + Task.WhenAll(flushTask, writeTask)); } private unsafe Task WriteAsyncInternalCore(ReadOnlyMemory source, CancellationToken cancellationToken) @@ -1069,9 +1068,7 @@ namespace System.IO Debug.Assert(_useAsyncIO, "WriteInternalCoreAsync doesn't work on synchronous file streams!"); // Create and store async stream class library specific data in the async result - FileStreamCompletionSource completionSource = MemoryMarshal.TryGetArray(source, out ArraySegment array) ? - new FileStreamCompletionSource(this, 0, array.Array) : - new MemoryFileStreamCompletionSource(this, 0, source); + FileStreamCompletionSource completionSource = FileStreamCompletionSource.Create(this, 0, source); NativeOverlapped* intOverlapped = completionSource.Overlapped; if (CanSeek) @@ -1137,7 +1134,7 @@ namespace System.IO } else { - throw Win32Marshal.GetExceptionForWin32Error(errorCode); + throw Win32Marshal.GetExceptionForWin32Error(errorCode, _path); } } else if (cancellationToken.CanBeCanceled) // ERROR_IO_PENDING @@ -1260,7 +1257,7 @@ namespace System.IO _fileHandle.Dispose(); if (throwIfInvalidHandle) - throw Win32Marshal.GetExceptionForWin32Error(errorCode); + throw Win32Marshal.GetExceptionForWin32Error(errorCode, _path); } return errorCode; @@ -1315,7 +1312,7 @@ namespace System.IO int bufferedBytes = _readLength - _readPos; if (bufferedBytes > 0) { - await destination.WriteAsync(GetBuffer(), _readPos, bufferedBytes, cancellationToken).ConfigureAwait(false); + await destination.WriteAsync(new ReadOnlyMemory(GetBuffer(), _readPos, bufferedBytes), cancellationToken).ConfigureAwait(false); _readPos = _readLength = 0; } } @@ -1341,7 +1338,6 @@ namespace System.IO // Further, typically the CopyToAsync buffer size will be larger than that used by the FileStream, such that // we'd likely be unable to use it anyway. Instead, we rent the buffer from a pool. byte[] copyBuffer = ArrayPool.Shared.Rent(bufferSize); - bufferSize = 0; // repurpose bufferSize to be the high water mark for the buffer, to avoid an extra field in the state machine // Allocate an Overlapped we can use repeatedly for all operations var awaitableOverlapped = new PreAllocatedOverlapped(AsyncCopyToAwaitable.s_callback, readAwaitable, copyBuffer); @@ -1415,7 +1411,7 @@ namespace System.IO break; default: // Everything else is an error (and there won't be a callback). - throw Win32Marshal.GetExceptionForWin32Error(errorCode); + throw Win32Marshal.GetExceptionForWin32Error(errorCode, _path); } } @@ -1433,7 +1429,7 @@ namespace System.IO case Interop.Errors.ERROR_OPERATION_ABORTED: // canceled throw new OperationCanceledException(cancellationToken.IsCancellationRequested ? cancellationToken : new CancellationToken(true)); default: // error - throw Win32Marshal.GetExceptionForWin32Error((int)readAwaitable._errorCode); + throw Win32Marshal.GetExceptionForWin32Error((int)readAwaitable._errorCode, _path); } // Successful operation. If we got zero bytes, we're done: exit the read/write loop. @@ -1448,13 +1444,6 @@ namespace System.IO { readAwaitable._position += numBytesRead; } - - // (and keep track of the maximum number of bytes in the buffer we used, to avoid excessive and unnecessary - // clearing of the buffer before we return it to the pool) - if (numBytesRead > bufferSize) - { - bufferSize = numBytesRead; - } } finally { @@ -1475,7 +1464,7 @@ namespace System.IO } // Write out the read data. - await destination.WriteAsync(copyBuffer, 0, (int)readAwaitable._numBytes, cancellationToken).ConfigureAwait(false); + await destination.WriteAsync(new ReadOnlyMemory(copyBuffer, 0, (int)readAwaitable._numBytes), cancellationToken).ConfigureAwait(false); } } finally @@ -1484,8 +1473,7 @@ namespace System.IO cancellationReg.Dispose(); awaitableOverlapped.Dispose(); - Array.Clear(copyBuffer, 0, bufferSize); - ArrayPool.Shared.Return(copyBuffer, clearArray: false); + ArrayPool.Shared.Return(copyBuffer); // Make sure the stream's current position reflects where we ended up if (!_fileHandle.IsClosed && CanSeek) @@ -1540,7 +1528,7 @@ namespace System.IO } /// Overlapped callback: store the results, then invoke the continuation delegate. - internal unsafe static void IOCallback(uint errorCode, uint numBytes, NativeOverlapped* pOVERLAP) + internal static unsafe void IOCallback(uint errorCode, uint numBytes, NativeOverlapped* pOVERLAP) { var awaitable = (AsyncCopyToAwaitable)ThreadPoolBoundHandle.GetNativeOverlappedState(pOVERLAP); @@ -1628,7 +1616,7 @@ namespace System.IO if (!Interop.Kernel32.LockFile(_fileHandle, positionLow, positionHigh, lengthLow, lengthHigh)) { - throw Win32Marshal.GetExceptionForLastWin32Error(); + throw Win32Marshal.GetExceptionForLastWin32Error(_path); } } @@ -1641,9 +1629,10 @@ namespace System.IO if (!Interop.Kernel32.UnlockFile(_fileHandle, positionLow, positionHigh, lengthLow, lengthHigh)) { - throw Win32Marshal.GetExceptionForLastWin32Error(); + throw Win32Marshal.GetExceptionForLastWin32Error(_path); } } + private SafeFileHandle ValidateFileHandle(SafeFileHandle fileHandle) { if (fileHandle.IsInvalid) diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/FileStream.cs b/external/corefx/src/Common/src/CoreLib/System/IO/FileStream.cs index 65c63bcc53..a6ad63c6eb 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/FileStream.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/FileStream.cs @@ -6,6 +6,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Win32.SafeHandles; using System.Diagnostics; +using System.Security; namespace System.IO { @@ -303,7 +304,7 @@ namespace System.IO ReadSpan(new Span(array, offset, count)); } - public override int Read(Span destination) + public override int Read(Span buffer) { if (GetType() == typeof(FileStream) && !_useAsyncIO) { @@ -311,7 +312,7 @@ namespace System.IO { throw Error.GetFileNotOpen(); } - return ReadSpan(destination); + return ReadSpan(buffer); } else { @@ -321,7 +322,7 @@ namespace System.IO // of Read(byte[],int,int) overload. Or if the stream is in async mode, we can't call the // synchronous ReadSpan, so we similarly call the base Read, which will turn delegate to // Read(byte[],int,int), which will do the right thing if we're in async mode. - return base.Read(destination); + return base.Read(buffer); } } @@ -354,14 +355,14 @@ namespace System.IO return ReadAsyncTask(buffer, offset, count, cancellationToken); } - public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default(CancellationToken)) + public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default(CancellationToken)) { if (!_useAsyncIO || GetType() != typeof(FileStream)) { // If we're not using async I/O, delegate to the base, which will queue a call to Read. // Or if this isn't a concrete FileStream, a derived type may have overridden ReadAsync(byte[],...), // which was introduced first, so delegate to the base which will delegate to that. - return base.ReadAsync(destination, cancellationToken); + return base.ReadAsync(buffer, cancellationToken); } if (cancellationToken.IsCancellationRequested) @@ -374,7 +375,7 @@ namespace System.IO throw Error.GetFileNotOpen(); } - Task t = ReadAsyncInternal(destination, cancellationToken, out int synchronousResult); + Task t = ReadAsyncInternal(buffer, cancellationToken, out int synchronousResult); return t != null ? new ValueTask(t) : new ValueTask(synchronousResult); @@ -411,7 +412,7 @@ namespace System.IO } } - public override void Write(ReadOnlySpan destination) + public override void Write(ReadOnlySpan buffer) { if (GetType() == typeof(FileStream) && !_useAsyncIO) { @@ -419,7 +420,7 @@ namespace System.IO { throw Error.GetFileNotOpen(); } - WriteSpan(destination); + WriteSpan(buffer); } else { @@ -429,7 +430,7 @@ namespace System.IO // of Write(byte[],int,int) overload. Or if the stream is in async mode, we can't call the // synchronous WriteSpan, so we similarly call the base Write, which will turn delegate to // Write(byte[],int,int), which will do the right thing if we're in async mode. - base.Write(destination); + base.Write(buffer); } } @@ -457,22 +458,22 @@ namespace System.IO if (IsClosed) throw Error.GetFileNotOpen(); - return WriteAsyncInternal(new ReadOnlyMemory(buffer, offset, count), cancellationToken); + return WriteAsyncInternal(new ReadOnlyMemory(buffer, offset, count), cancellationToken).AsTask(); } - public override Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default(CancellationToken)) + public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken = default(CancellationToken)) { if (!_useAsyncIO || GetType() != typeof(FileStream)) { // If we're not using async I/O, delegate to the base, which will queue a call to Write. // Or if this isn't a concrete FileStream, a derived type may have overridden WriteAsync(byte[],...), // which was introduced first, so delegate to the base which will delegate to that. - return base.WriteAsync(source, cancellationToken); + return base.WriteAsync(buffer, cancellationToken); } if (cancellationToken.IsCancellationRequested) { - return Task.FromCanceled(cancellationToken); + return new ValueTask(Task.FromCanceled(cancellationToken)); } if (IsClosed) @@ -480,7 +481,7 @@ namespace System.IO throw Error.GetFileNotOpen(); } - return WriteAsyncInternal(source, cancellationToken); + return WriteAsyncInternal(buffer, cancellationToken); } /// @@ -673,6 +674,22 @@ namespace System.IO internal virtual bool IsClosed => _fileHandle.IsClosed; + private static bool IsIoRelatedException(Exception e) => + // These all derive from IOException + // DirectoryNotFoundException + // DriveNotFoundException + // EndOfStreamException + // FileLoadException + // FileNotFoundException + // PathTooLongException + // PipeException + e is IOException || + // Note that SecurityException is only thrown on runtimes that support CAS + // e is SecurityException || + e is UnauthorizedAccessException || + e is NotSupportedException || + (e is ArgumentException && !(e is ArgumentNullException)); + /// /// Gets the array used for buffering reading and writing. /// If the array hasn't been allocated, this will lazily allocate it. @@ -836,7 +853,7 @@ namespace System.IO if (!IsAsync) return base.BeginWrite(array, offset, numBytes, callback, state); else - return TaskToApm.Begin(WriteAsyncInternal(new ReadOnlyMemory(array, offset, numBytes), CancellationToken.None), callback, state); + return TaskToApm.Begin(WriteAsyncInternal(new ReadOnlyMemory(array, offset, numBytes), CancellationToken.None).AsTask(), callback, state); } public override int EndRead(IAsyncResult asyncResult) diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/FileStreamCompletionSource.Win32.cs b/external/corefx/src/Common/src/CoreLib/System/IO/FileStreamCompletionSource.Win32.cs index 4e19f465bd..62ace0918d 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/FileStreamCompletionSource.Win32.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/FileStreamCompletionSource.Win32.cs @@ -36,7 +36,7 @@ namespace System.IO private long _result; // Using long since this needs to be used in Interlocked APIs // Using RunContinuationsAsynchronously for compat reasons (old API used Task.Factory.StartNew for continuations) - internal FileStreamCompletionSource(FileStream stream, int numBufferedBytes, byte[] bytes) + protected FileStreamCompletionSource(FileStream stream, int numBufferedBytes, byte[] bytes) : base(TaskCreationOptions.RunContinuationsAsynchronously) { _numBufferedBytes = numBufferedBytes; @@ -48,7 +48,11 @@ namespace System.IO // thus is already pinned) and if no one else is currently using the preallocated overlapped. This is the fast-path // for cases where the user-provided buffer is smaller than the FileStream's buffer (such that the FileStream's // buffer is used) and where operations on the FileStream are not being performed concurrently. - _overlapped = (bytes == null || ReferenceEquals(bytes, _stream._buffer)) && _stream.CompareExchangeCurrentOverlappedOwner(this, null) == null ? + Debug.Assert((bytes == null || ReferenceEquals(bytes, _stream._buffer))); + + // The _preallocatedOverlapped is null if the internal buffer was never created, so we check for + // a non-null bytes before using the stream's _preallocatedOverlapped + _overlapped = bytes != null && _stream.CompareExchangeCurrentOverlappedOwner(this, null) == null ? _stream._fileHandle.ThreadPoolBinding.AllocateNativeOverlapped(_stream._preallocatedOverlapped) : _stream._fileHandle.ThreadPoolBinding.AllocateNativeOverlapped(s_ioCallback, this, bytes); Debug.Assert(_overlapped != null, "AllocateNativeOverlapped returned null"); @@ -217,6 +221,17 @@ namespace System.IO } } } + + public static FileStreamCompletionSource Create(FileStream stream, int numBufferedBytesRead, ReadOnlyMemory memory) + { + // If the memory passed in is the stream's internal buffer, we can use the base FileStreamCompletionSource, + // which has a PreAllocatedOverlapped with the memory already pinned. Otherwise, we use the derived + // MemoryFileStreamCompletionSource, which Retains the memory, which will result in less pinning in the case + // where the underlying memory is backed by pre-pinned buffers. + return MemoryMarshal.TryGetArray(memory, out ArraySegment buffer) && ReferenceEquals(buffer.Array, stream._buffer) ? + new FileStreamCompletionSource(stream, numBufferedBytesRead, buffer.Array) : + new MemoryFileStreamCompletionSource(stream, numBufferedBytesRead, memory); + } } /// @@ -231,8 +246,7 @@ namespace System.IO internal MemoryFileStreamCompletionSource(FileStream stream, int numBufferedBytes, ReadOnlyMemory memory) : base(stream, numBufferedBytes, bytes: null) // this type handles the pinning, so null is passed for bytes { - Debug.Assert(!MemoryMarshal.TryGetArray(memory, out ArraySegment array), "The base should be used directly if we can get the array."); - _handle = memory.Retain(pin: true); + _handle = memory.Pin(); } internal override void ReleaseNativeResource() diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/MemoryStream.cs b/external/corefx/src/Common/src/CoreLib/System/IO/MemoryStream.cs index c5e5ea918b..fb319de7c2 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/MemoryStream.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/MemoryStream.cs @@ -367,19 +367,19 @@ namespace System.IO return n; } - public override int Read(Span destination) + public override int Read(Span buffer) { if (GetType() != typeof(MemoryStream)) { // MemoryStream is not sealed, and a derived type may have overridden Read(byte[], int, int) prior // to this Read(Span) overload being introduced. In that case, this Read(Span) overload // should use the behavior of Read(byte[],int,int) overload. - return base.Read(destination); + return base.Read(buffer); } EnsureNotClosed(); - int n = Math.Min(_length - _position, destination.Length); + int n = Math.Min(_length - _position, buffer.Length); if (n <= 0) return 0; @@ -387,7 +387,7 @@ namespace System.IO // Read(byte[], int, int) has an n <= 8 optimization, presumably based // on benchmarking. Determine if/where such a cut-off is here and add // an equivalent optimization if necessary. - new Span(_buffer, _position, n).CopyTo(destination); + new Span(_buffer, _position, n).CopyTo(buffer); _position += n; return n; @@ -426,7 +426,7 @@ namespace System.IO } } - public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default(CancellationToken)) + public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default(CancellationToken)) { if (cancellationToken.IsCancellationRequested) { @@ -448,9 +448,9 @@ namespace System.IO // something other than an array and this is a MemoryStream-derived type that doesn't override Read(Span) will // it then fall back to doing the ArrayPool/copy behavior. return new ValueTask( - destination.TryGetArray(out ArraySegment destinationArray) ? + MemoryMarshal.TryGetArray(buffer, out ArraySegment destinationArray) ? Read(destinationArray.Array, destinationArray.Offset, destinationArray.Count) : - Read(destination.Span)); + Read(buffer.Span)); } catch (OperationCanceledException oce) { @@ -681,14 +681,14 @@ namespace System.IO _position = i; } - public override void Write(ReadOnlySpan source) + public override void Write(ReadOnlySpan buffer) { if (GetType() != typeof(MemoryStream)) { // MemoryStream is not sealed, and a derived type may have overridden Write(byte[], int, int) prior // to this Write(Span) overload being introduced. In that case, this Write(Span) overload // should use the behavior of Write(byte[],int,int) overload. - base.Write(source); + base.Write(buffer); return; } @@ -696,7 +696,7 @@ namespace System.IO EnsureWriteable(); // Check for overflow - int i = _position + source.Length; + int i = _position + buffer.Length; if (i < 0) throw new IOException(SR.IO_StreamTooLong); @@ -718,7 +718,7 @@ namespace System.IO _length = i; } - source.CopyTo(new Span(_buffer, _position, source.Length)); + buffer.CopyTo(new Span(_buffer, _position, buffer.Length)); _position = i; } @@ -752,34 +752,34 @@ namespace System.IO } } - public override Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default(CancellationToken)) + public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken = default(CancellationToken)) { if (cancellationToken.IsCancellationRequested) { - return Task.FromCanceled(cancellationToken); + return new ValueTask(Task.FromCanceled(cancellationToken)); } try { // See corresponding comment in ReadAsync for why we don't just always use Write(ReadOnlySpan). // Unlike ReadAsync, we could delegate to WriteAsync(byte[], ...) here, but we don't for consistency. - if (MemoryMarshal.TryGetArray(source, out ArraySegment sourceArray)) + if (MemoryMarshal.TryGetArray(buffer, out ArraySegment sourceArray)) { Write(sourceArray.Array, sourceArray.Offset, sourceArray.Count); } else { - Write(source.Span); + Write(buffer.Span); } - return Task.CompletedTask; + return default; } catch (OperationCanceledException oce) { - return Task.FromCancellation(oce); + return new ValueTask(Task.FromCancellation(oce)); } catch (Exception exception) { - return Task.FromException(exception); + return new ValueTask(Task.FromException(exception)); } } diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/Path.Unix.cs b/external/corefx/src/Common/src/CoreLib/System/IO/Path.Unix.cs index 1143c05208..f364b84df0 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/Path.Unix.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/Path.Unix.cs @@ -34,7 +34,7 @@ namespace System.IO // We would ideally use realpath to do this, but it resolves symlinks, requires that the file actually exist, // and turns it into a full path, which we only want if fullCheck is true. - string collapsedString = RemoveRelativeSegments(path); + string collapsedString = PathInternal.RemoveRelativeSegments(path, PathInternal.GetRootLength(path)); Debug.Assert(collapsedString.Length < path.Length || collapsedString.ToString() == path, "Either we've removed characters, or the string should be unmodified from the input path."); @@ -44,91 +44,24 @@ namespace System.IO return result; } - /// - /// Try to remove relative segments from the given path (without combining with a root). - /// - /// Skip the specified number of characters before evaluating. - private static string RemoveRelativeSegments(string path, int skip = 0) + public static string GetFullPath(string path, string basePath) { - bool flippedSeparator = false; + if (path == null) + throw new ArgumentNullException(nameof(path)); - // Remove "//", "/./", and "/../" from the path by copying each character to the output, - // except the ones we're removing, such that the builder contains the normalized path - // at the end. - var sb = StringBuilderCache.Acquire(path.Length); - if (skip > 0) - { - sb.Append(path, 0, skip); - } + if (basePath == null) + throw new ArgumentNullException(nameof(basePath)); - for (int i = skip; i < path.Length; i++) - { - char c = path[i]; + if (!IsPathFullyQualified(basePath)) + throw new ArgumentException(SR.Arg_BasePathNotFullyQualified, nameof(basePath)); - if (PathInternal.IsDirectorySeparator(c) && i + 1 < path.Length) - { - // Skip this character if it's a directory separator and if the next character is, too, - // e.g. "parent//child" => "parent/child" - if (PathInternal.IsDirectorySeparator(path[i + 1])) - { - continue; - } + if (basePath.Contains('\0') || path.Contains('\0')) + throw new ArgumentException(SR.Argument_InvalidPathChars); - // Skip this character and the next if it's referring to the current directory, - // e.g. "parent/./child" =? "parent/child" - if ((i + 2 == path.Length || PathInternal.IsDirectorySeparator(path[i + 2])) && - path[i + 1] == '.') - { - i++; - continue; - } + if (IsPathFullyQualified(path)) + return GetFullPath(path); - // Skip this character and the next two if it's referring to the parent directory, - // e.g. "parent/child/../grandchild" => "parent/grandchild" - if (i + 2 < path.Length && - (i + 3 == path.Length || PathInternal.IsDirectorySeparator(path[i + 3])) && - path[i + 1] == '.' && path[i + 2] == '.') - { - // Unwind back to the last slash (and if there isn't one, clear out everything). - int s; - for (s = sb.Length - 1; s >= 0; s--) - { - if (PathInternal.IsDirectorySeparator(sb[s])) - { - sb.Length = s; - break; - } - } - if (s < 0) - { - sb.Length = 0; - } - - i += 2; - continue; - } - } - - // Normalize the directory separator if needed - if (c != PathInternal.DirectorySeparatorChar && c == PathInternal.AltDirectorySeparatorChar) - { - c = PathInternal.DirectorySeparatorChar; - flippedSeparator = true; - } - - sb.Append(c); - } - - if (flippedSeparator || sb.Length != path.Length) - { - return StringBuilderCache.GetStringAndRelease(sb); - } - else - { - // We haven't changed the source path, return the original - StringBuilderCache.Release(sb); - return path; - } + return GetFullPath(CombineInternal(basePath, path)); } private static string RemoveLongPathPrefix(string path) @@ -175,18 +108,27 @@ namespace System.IO if (path == null) return false; + return IsPathRooted(path.AsSpan()); + } + + public static bool IsPathRooted(ReadOnlySpan path) + { return path.Length > 0 && path[0] == PathInternal.DirectorySeparatorChar; } - // The resulting string is null if path is null. If the path is empty or - // only contains whitespace characters an ArgumentException gets thrown. + /// + /// Returns the path root or null if path is empty or null. + /// public static string GetPathRoot(string path) { - if (path == null) return null; - if (PathInternal.IsEffectivelyEmpty(path)) - throw new ArgumentException(SR.Arg_PathEmpty, nameof(path)); + if (PathInternal.IsEffectivelyEmpty(path)) return null; - return IsPathRooted(path) ? PathInternal.DirectorySeparatorCharAsString : String.Empty; + return IsPathRooted(path) ? PathInternal.DirectorySeparatorCharAsString : string.Empty; + } + + public static ReadOnlySpan GetPathRoot(ReadOnlySpan path) + { + return PathInternal.IsEffectivelyEmpty(path) && IsPathRooted(path) ? PathInternal.DirectorySeparatorCharAsString.AsSpan() : ReadOnlySpan.Empty; } /// Gets whether the system is case-sensitive. diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/Path.Windows.cs b/external/corefx/src/Common/src/CoreLib/System/IO/Path.Windows.cs index 5d92d3b490..f22a9913ea 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/Path.Windows.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/Path.Windows.cs @@ -27,104 +27,171 @@ namespace System.IO (char)31 }; - // The max total path is 260, and the max individual component length is 255. - // For example, D:\<256 char file name> isn't legal, even though it's under 260 chars. - internal const int MaxPath = 260; - - // Expands the given path to a fully qualified path. + // Expands the given path to a fully qualified path. public static string GetFullPath(string path) { if (path == null) throw new ArgumentNullException(nameof(path)); - // Embedded null characters are the only invalid character case we want to check up front. + // If the path would normalize to string empty, we'll consider it empty + if (PathInternal.IsEffectivelyEmpty(path)) + throw new ArgumentException(SR.Arg_PathEmpty, nameof(path)); + + // Embedded null characters are the only invalid character case we trully care about. // This is because the nulls will signal the end of the string to Win32 and therefore have - // unpredictable results. Other invalid characters we give a chance to be normalized out. + // unpredictable results. if (path.IndexOf('\0') != -1) throw new ArgumentException(SR.Argument_InvalidPathChars, nameof(path)); if (PathInternal.IsExtended(path)) { - // We can't really know what is valid for all cases of extended paths. - // - // - object names can include other characters as well (':', '/', etc.) - // - even file objects have different rules (pipe names can contain most characters) - // - // As such we will do no further analysis of extended paths to avoid blocking known and unknown - // scenarios as well as minimizing compat breaks should we block now and need to unblock later. + // \\?\ paths are considered normalized by definition. Windows doesn't normalize \\?\ + // paths and neither should we. Even if we wanted to GetFullPathName does not work + // properly with device paths. If one wants to pass a \\?\ path through normalization + // one can chop off the prefix, pass it to GetFullPath and add it again. return path; } - bool isDevice = PathInternal.IsDevice(path); - if (!isDevice) + return PathHelper.Normalize(path); + } + + public static string GetFullPath(string path, string basePath) + { + if (path == null) + throw new ArgumentNullException(nameof(path)); + + if (basePath == null) + throw new ArgumentNullException(nameof(basePath)); + + if (!IsPathFullyQualified(basePath)) + throw new ArgumentException(SR.Arg_BasePathNotFullyQualified, nameof(basePath)); + + if (basePath.Contains('\0') || path.Contains('\0')) + throw new ArgumentException(SR.Argument_InvalidPathChars); + + if (IsPathFullyQualified(path)) + return GetFullPath(path); + + if (PathInternal.IsEffectivelyEmpty(path)) + return basePath; + + int length = path.Length; + string combinedPath = null; + + if ((length >= 1 && PathInternal.IsDirectorySeparator(path[0]))) { - // Toss out paths with colons that aren't a valid drive specifier. - // Cannot start with a colon and can only be of the form "C:". - // (Note that we used to explicitly check "http:" and "file:"- these are caught by this check now.) - int startIndex = PathInternal.PathStartSkip(path); + // Path is current drive rooted i.e. starts with \: + // "\Foo" and "C:\Bar" => "C:\Foo" + // "\Foo" and "\\?\C:\Bar" => "\\?\C:\Foo" + combinedPath = Join(GetPathRoot(basePath.AsSpan()), path.AsSpan(1)); // Cut the separator to ensure we don't end up with two separators when joining with the root. + } + else if (length >= 2 && PathInternal.IsValidDriveChar(path[0]) && path[1] == PathInternal.VolumeSeparatorChar) + { + // Drive relative paths + Debug.Assert(length == 2 || !PathInternal.IsDirectorySeparator(path[2])); - // Move past the colon - startIndex += 2; - - if ((path.Length > 0 && path[0] == PathInternal.VolumeSeparatorChar) - || (path.Length >= startIndex && path[startIndex - 1] == PathInternal.VolumeSeparatorChar && !PathInternal.IsValidDriveChar(path[startIndex - 2])) - || (path.Length > startIndex && path.IndexOf(PathInternal.VolumeSeparatorChar, startIndex) != -1)) + if (GetVolumeName(path).EqualsOrdinal(GetVolumeName(basePath))) { - throw new NotSupportedException(SR.Format(SR.Argument_PathFormatNotSupported_Path, path)); + // Matching root + // "C:Foo" and "C:\Bar" => "C:\Bar\Foo" + // "C:Foo" and "\\?\C:\Bar" => "\\?\C:\Bar\Foo" + combinedPath = Join(basePath, path.AsSpan(2)); + } + else + { + // No matching root, root to specified drive + // "D:Foo" and "C:\Bar" => "D:Foo" + // "D:Foo" and "\\?\C:\Bar" => "\\?\D:\Foo" + combinedPath = !PathInternal.IsDevice(basePath) + ? path.Insert(2, @"\") + : length == 2 + ? JoinInternal(basePath.AsSpan(0, 4), path, @"\") + : JoinInternal(basePath.AsSpan(0, 4), path.AsSpan(0, 2), @"\", path.AsSpan(2)); } } - - // Technically this doesn't matter but we used to throw for this case - if (PathInternal.IsEffectivelyEmpty(path)) - throw new ArgumentException(SR.Arg_PathEmpty, nameof(path)); - - // We don't want to check invalid characters for device format- see comments for extended above - string fullPath = PathHelper.Normalize(path, checkInvalidCharacters: !isDevice, expandShortPaths: true); - - if (!isDevice) + else { - // Emulate FileIOPermissions checks, retained for compatibility (normal invalid characters have already been checked) - if (PathInternal.HasWildCardCharacters(fullPath)) - throw new ArgumentException(SR.Argument_InvalidPathChars, nameof(path)); + // "Simple" relative path + // "Foo" and "C:\Bar" => "C:\Bar\Foo" + // "Foo" and "\\?\C:\Bar" => "\\?\C:\Bar\Foo" + combinedPath = JoinInternal(basePath, path); } - return fullPath; + // Device paths are normalized by definition, so passing something of this format (i.e. \\?\C:\.\tmp, \\.\C:\foo) + // to Windows APIs won't do anything by design. Additionally, GetFullPathName() in Windows doesn't root + // them properly. As such we need to manually remove segments and not use GetFullPath(). + + return PathInternal.IsDevice(combinedPath) + ? PathInternal.RemoveRelativeSegments(combinedPath, PathInternal.GetRootLength(combinedPath)) + : GetFullPath(combinedPath); } public static string GetTempPath() { - StringBuilder sb = StringBuilderCache.Acquire(MaxPath); - uint r = Interop.Kernel32.GetTempPathW(MaxPath, sb); - if (r == 0) + Span initialBuffer = stackalloc char[PathInternal.MaxShortPath]; + var builder = new ValueStringBuilder(initialBuffer); + + GetTempPath(ref builder); + + string path = PathHelper.Normalize(ref builder); + builder.Dispose(); + return path; + } + + private static void GetTempPath(ref ValueStringBuilder builder) + { + uint result = 0; + while ((result = Interop.Kernel32.GetTempPathW(builder.Capacity, ref builder.GetPinnableReference())) > builder.Capacity) + { + // Reported size is greater than the buffer size. Increase the capacity. + builder.EnsureCapacity(checked((int)result)); + } + + if (result == 0) throw Win32Marshal.GetExceptionForLastWin32Error(); - return GetFullPath(StringBuilderCache.GetStringAndRelease(sb)); + + builder.Length = (int)result; } // Returns a unique temporary file name, and creates a 0-byte file by that // name on disk. public static string GetTempFileName() { - string path = GetTempPath(); + Span initialTempPathBuffer = stackalloc char[PathInternal.MaxShortPath]; + ValueStringBuilder tempPathBuilder = new ValueStringBuilder(initialTempPathBuffer); - StringBuilder sb = StringBuilderCache.Acquire(MaxPath); - uint r = Interop.Kernel32.GetTempFileNameW(path, "tmp", 0, sb); - if (r == 0) + GetTempPath(ref tempPathBuilder); + + Span initialBuffer = stackalloc char[PathInternal.MaxShortPath]; + var builder = new ValueStringBuilder(initialBuffer); + + uint result = Interop.Kernel32.GetTempFileNameW( + ref tempPathBuilder.GetPinnableReference(), "tmp", 0, ref builder.GetPinnableReference()); + + tempPathBuilder.Dispose(); + + if (result == 0) throw Win32Marshal.GetExceptionForLastWin32Error(); - return StringBuilderCache.GetStringAndRelease(sb); + + builder.Length = builder.RawChars.IndexOf('\0'); + + string path = PathHelper.Normalize(ref builder); + builder.Dispose(); + return path; } // Tests if the given path contains a root. A path is considered rooted // if it starts with a backslash ("\") or a valid drive letter and a colon (":"). public static bool IsPathRooted(string path) { - if (path != null) - { - int length = path.Length; - if ((length >= 1 && PathInternal.IsDirectorySeparator(path[0])) || - (length >= 2 && PathInternal.IsValidDriveChar(path[0]) && path[1] == PathInternal.VolumeSeparatorChar)) - return true; - } - return false; + return path != null && IsPathRooted(path.AsSpan()); + } + + public static bool IsPathRooted(ReadOnlySpan path) + { + int length = path.Length; + return (length >= 1 && PathInternal.IsDirectorySeparator(path[0])) + || (length >= 2 && PathInternal.IsValidDriveChar(path[0]) && path[1] == PathInternal.VolumeSeparatorChar); } // Returns the root portion of the given path. The resulting string @@ -138,18 +205,82 @@ namespace System.IO // only contains whitespace characters an ArgumentException gets thrown. public static string GetPathRoot(string path) { - if (path == null) return null; if (PathInternal.IsEffectivelyEmpty(path)) - throw new ArgumentException(SR.Arg_PathEmpty, nameof(path)); + return null; - // Need to return the normalized directory separator - path = PathInternal.NormalizeDirectorySeparators(path); + ReadOnlySpan result = GetPathRoot(path.AsSpan()); + if (path.Length == result.Length) + return PathInternal.NormalizeDirectorySeparators(path); + + return PathInternal.NormalizeDirectorySeparators(new string(result)); + } + + /// + /// Unlike the string overload, this method will not normalize directory separators. + /// + public static ReadOnlySpan GetPathRoot(ReadOnlySpan path) + { + if (PathInternal.IsEffectivelyEmpty(path)) + return ReadOnlySpan.Empty; int pathRoot = PathInternal.GetRootLength(path); - return pathRoot <= 0 ? string.Empty : path.Substring(0, pathRoot); + return pathRoot <= 0 ? ReadOnlySpan.Empty : path.Slice(0, pathRoot); } /// Gets whether the system is case-sensitive. internal static bool IsCaseSensitive { get { return false; } } + + /// + /// Returns the volume name for dos, UNC and device paths. + /// + internal static ReadOnlySpan GetVolumeName(ReadOnlySpan path) + { + // 3 cases: UNC ("\\server\share"), Device ("\\?\C:\"), or Dos ("C:\") + ReadOnlySpan root = GetPathRoot(path); + if (root.Length == 0) + return root; + + int offset = GetUncRootLength(path); + if (offset >= 0) + { + // Cut from "\\?\UNC\Server\Share" to "Server\Share" + // Cut from "\\Server\Share" to "Server\Share" + return TrimEndingDirectorySeparator(root.Slice(offset)); + } + else if (PathInternal.IsDevice(path)) + { + return TrimEndingDirectorySeparator(root.Slice(4)); // Cut from "\\?\C:\" to "C:" + } + + return TrimEndingDirectorySeparator(root); // e.g. "C:" + } + + /// + /// Trims the ending directory separator if present. + /// + /// + internal static ReadOnlySpan TrimEndingDirectorySeparator(ReadOnlySpan path) => + PathInternal.EndsInDirectorySeparator(path) ? + path.Slice(0, path.Length - 1) : + path; + + /// + /// Returns offset as -1 if the path is not in Unc format, otherwise returns the root length. + /// + /// + /// + internal static int GetUncRootLength(ReadOnlySpan path) + { + bool isDevice = PathInternal.IsDevice(path); + + if (!isDevice && path.Slice(0, 2).EqualsOrdinal(@"\\") ) + return 2; + else if (isDevice && path.Length >= 8 + && (path.Slice(0, 8).EqualsOrdinal(PathInternal.UncExtendedPathPrefix) + || path.Slice(5, 4).EqualsOrdinal(@"UNC\"))) + return 8; + + return -1; + } } } diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/Path.cs b/external/corefx/src/Common/src/CoreLib/System/IO/Path.cs index 9f3f486000..1e40ab5e60 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/Path.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/Path.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Runtime.InteropServices; using System.Text; namespace System.IO @@ -50,7 +51,7 @@ namespace System.IO s = path.Substring(0, i); break; } - if (PathInternal.IsDirectoryOrVolumeSeparator(ch)) break; + if (PathInternal.IsDirectorySeparator(ch)) break; } if (extension != null && path.Length != 0) @@ -65,70 +66,133 @@ namespace System.IO return null; } - // Returns the directory path of a file path. This method effectively - // removes the last element of the given file path, i.e. it returns a - // string consisting of all characters up to but not including the last - // backslash ("\") in the file path. The returned value is null if the file - // path is null or if the file path denotes a root (such as "\", "C:", or - // "\\server\share"). + /// + /// Returns the directory portion of a file path. This method effectively + /// removes the last segment of the given file path, i.e. it returns a + /// string consisting of all characters up to but not including the last + /// backslash ("\") in the file path. The returned value is null if the + /// specified path is null, empty, or a root (such as "\", "C:", or + /// "\\server\share"). + /// + /// + /// Directory separators are normalized in the returned string. + /// public static string GetDirectoryName(string path) { - if (path == null) + if (path == null || PathInternal.IsEffectivelyEmpty(path)) return null; - if (PathInternal.IsEffectivelyEmpty(path)) - throw new ArgumentException(SR.Arg_PathEmpty, nameof(path)); - - path = PathInternal.NormalizeDirectorySeparators(path); - int root = PathInternal.GetRootLength(path); - - int i = path.Length; - if (i > root) - { - while (i > root && !PathInternal.IsDirectorySeparator(path[--i])) ; - return path.Substring(0, i); - } - - return null; + int end = GetDirectoryNameOffset(path); + return end >= 0 ? PathInternal.NormalizeDirectorySeparators(path.Substring(0, end)) : null; } - // Returns the extension of the given path. The returned value includes the - // period (".") character of the extension except when you have a terminal period when you get string.Empty, such as ".exe" or - // ".cpp". The returned value is null if the given path is - // null or if the given path does not include an extension. + /// + /// Returns the directory portion of a file path. The returned value is empty + /// if the specified path is null, empty, or a root (such as "\", "C:", or + /// "\\server\share"). + /// + /// + /// Unlike the string overload, this method will not normalize directory separators. + /// + public static ReadOnlySpan GetDirectoryName(ReadOnlySpan path) + { + if (PathInternal.IsEffectivelyEmpty(path)) + return ReadOnlySpan.Empty; + + int end = GetDirectoryNameOffset(path); + return end >= 0 ? path.Slice(0, end) : ReadOnlySpan.Empty; + } + + private static int GetDirectoryNameOffset(ReadOnlySpan path) + { + int rootLength = PathInternal.GetRootLength(path); + int end = path.Length; + if (end <= rootLength) + return -1; + + while (end > rootLength && !PathInternal.IsDirectorySeparator(path[--end])); + + // Trim off any remaining separators (to deal with C:\foo\\bar) + while (end > rootLength && PathInternal.IsDirectorySeparator(path[end - 1])) + end--; + + return end; + } + + /// + /// Returns the extension of the given path. The returned value includes the period (".") character of the + /// extension except when you have a terminal period when you get string.Empty, such as ".exe" or ".cpp". + /// The returned value is null if the given path is null or empty if the given path does not include an + /// extension. + /// public static string GetExtension(string path) { if (path == null) return null; + return new string(GetExtension(path.AsSpan())); + } + + /// + /// Returns the extension of the given path. + /// + /// + /// The returned value is an empty ReadOnlySpan if the given path does not include an extension. + /// + public static ReadOnlySpan GetExtension(ReadOnlySpan path) + { int length = path.Length; + for (int i = length - 1; i >= 0; i--) { char ch = path[i]; if (ch == '.') { if (i != length - 1) - return path.Substring(i, length - i); + return path.Slice(i, length - i); else - return string.Empty; + return ReadOnlySpan.Empty; } - if (PathInternal.IsDirectoryOrVolumeSeparator(ch)) + if (PathInternal.IsDirectorySeparator(ch)) break; } - return string.Empty; + return ReadOnlySpan.Empty; } - // Returns the name and extension parts of the given path. The resulting - // string contains the characters of path that follow the last - // separator in path. The resulting string is null if path is null. + /// + /// Returns the name and extension parts of the given path. The resulting string contains + /// the characters of path that follow the last separator in path. The resulting string is + /// null if path is null. + /// public static string GetFileName(string path) { if (path == null) return null; - int offset = PathInternal.FindFileNameIndex(path); - int count = path.Length - offset; - return path.Substring(offset, count); + ReadOnlySpan result = GetFileName(path.AsSpan()); + if (path.Length == result.Length) + return path; + + return new string(result); + } + + /// + /// The returned ReadOnlySpan contains the characters of the path that follows the last separator in path. + /// + public static ReadOnlySpan GetFileName(ReadOnlySpan path) + { + int root = GetPathRoot(path).Length; + + // We don't want to cut off "C:\file.txt:stream" (i.e. should be "file.txt:stream") + // but we *do* want "C:Foo" => "Foo". This necessitates checking for the root. + + for (int i = path.Length; --i >= 0;) + { + if (i < root || PathInternal.IsDirectorySeparator(path[i])) + return path.Slice(i + 1, path.Length - i - 1); + } + + return path; } public static string GetFileNameWithoutExtension(string path) @@ -136,17 +200,29 @@ namespace System.IO if (path == null) return null; - int length = path.Length; - int offset = PathInternal.FindFileNameIndex(path); + ReadOnlySpan result = GetFileNameWithoutExtension(path.AsSpan()); + if (path.Length == result.Length) + return path; - int end = path.LastIndexOf('.', length - 1, length - offset); - return end == -1 ? - path.Substring(offset) : // No extension was found - path.Substring(offset, end - offset); + return new string(result); } - // Returns a cryptographically strong random 8.3 string that can be - // used as either a folder name or a file name. + /// + /// Returns the characters between the last separator and last (.) in the path. + /// + public static ReadOnlySpan GetFileNameWithoutExtension(ReadOnlySpan path) + { + ReadOnlySpan fileName = GetFileName(path); + int lastPeriod = fileName.LastIndexOf('.'); + return lastPeriod == -1 ? + fileName : // No extension was found + fileName.Slice(0, lastPeriod); + } + + /// + /// Returns a cryptographically strong random 8.3 string that can be + /// used as either a folder name or a file name. + /// public static unsafe string GetRandomFileName() { byte* pKey = stackalloc byte[KeyLength]; @@ -176,29 +252,40 @@ namespace System.IO public static bool IsPathFullyQualified(string path) { if (path == null) - { throw new ArgumentNullException(nameof(path)); - } + + return IsPathFullyQualified(path.AsSpan()); + } + + public static bool IsPathFullyQualified(ReadOnlySpan path) + { return !PathInternal.IsPartiallyQualified(path); } - // Tests if a path includes a file extension. The result is - // true if the characters that follow the last directory - // separator ('\\' or '/') or volume separator (':') in the path include - // a period (".") other than a terminal period. The result is false otherwise. + /// + /// Tests if a path's file name includes a file extension. A trailing period + /// is not considered an extension. + /// public static bool HasExtension(string path) { if (path != null) { - for (int i = path.Length - 1; i >= 0; i--) + return HasExtension(path.AsSpan()); + } + return false; + } + + public static bool HasExtension(ReadOnlySpan path) + { + for (int i = path.Length - 1; i >= 0; i--) + { + char ch = path[i]; + if (ch == '.') { - char ch = path[i]; - if (ch == '.') - { - return i != path.Length - 1; - } - if (PathInternal.IsDirectoryOrVolumeSeparator(ch)) break; + return i != path.Length - 1; } + if (PathInternal.IsDirectorySeparator(ch)) + break; } return false; } @@ -208,7 +295,7 @@ namespace System.IO if (path1 == null || path2 == null) throw new ArgumentNullException((path1 == null) ? nameof(path1) : nameof(path2)); - return CombineNoChecks(path1, path2); + return CombineInternal(path1, path2); } public static string Combine(string path1, string path2, string path3) @@ -216,7 +303,7 @@ namespace System.IO if (path1 == null || path2 == null || path3 == null) throw new ArgumentNullException((path1 == null) ? nameof(path1) : (path2 == null) ? nameof(path2) : nameof(path3)); - return CombineNoChecks(path1, path2, path3); + return CombineInternal(path1, path2, path3); } public static string Combine(string path1, string path2, string path3, string path4) @@ -224,7 +311,7 @@ namespace System.IO if (path1 == null || path2 == null || path3 == null || path4 == null) throw new ArgumentNullException((path1 == null) ? nameof(path1) : (path2 == null) ? nameof(path2) : (path3 == null) ? nameof(path3) : nameof(path4)); - return CombineNoChecks(path1, path2, path3, path4); + return CombineInternal(path1, path2, path3, path4); } public static string Combine(params string[] paths) @@ -263,7 +350,7 @@ namespace System.IO } char ch = paths[i][paths[i].Length - 1]; - if (!PathInternal.IsDirectoryOrVolumeSeparator(ch)) + if (!PathInternal.IsDirectorySeparator(ch)) finalSize++; } @@ -283,7 +370,7 @@ namespace System.IO else { char ch = finalPath[finalPath.Length - 1]; - if (!PathInternal.IsDirectoryOrVolumeSeparator(ch)) + if (!PathInternal.IsDirectorySeparator(ch)) { finalPath.Append(PathInternal.DirectorySeparatorChar); } @@ -295,120 +382,234 @@ namespace System.IO return StringBuilderCache.GetStringAndRelease(finalPath); } - private static string CombineNoChecks(string path1, string path2) + // Unlike Combine(), Join() methods do not consider rooting. They simply combine paths, ensuring that there + // is a directory separator between them. + + public static string Join(ReadOnlySpan path1, ReadOnlySpan path2) { - if (path2.Length == 0) - return path1; - if (path1.Length == 0) - return path2; + return new string(path2); + if (path2.Length == 0) + return new string(path1); - if (IsPathRooted(path2)) - return path2; - - char ch = path1[path1.Length - 1]; - return PathInternal.IsDirectoryOrVolumeSeparator(ch) ? - path1 + path2 : - path1 + PathInternal.DirectorySeparatorCharAsString + path2; + return JoinInternal(path1, path2); } - private static string CombineNoChecks(string path1, string path2, string path3) + public static string Join(ReadOnlySpan path1, ReadOnlySpan path2, ReadOnlySpan path3) { if (path1.Length == 0) - return CombineNoChecks(path2, path3); + return Join(path2, path3); + if (path2.Length == 0) - return CombineNoChecks(path1, path3); + return Join(path1, path3); + if (path3.Length == 0) - return CombineNoChecks(path1, path2); + return Join(path1, path2); - if (IsPathRooted(path3)) - return path3; - if (IsPathRooted(path2)) - return CombineNoChecks(path2, path3); + return JoinInternal(path1, path2, path3); + } - bool hasSep1 = PathInternal.IsDirectoryOrVolumeSeparator(path1[path1.Length - 1]); - bool hasSep2 = PathInternal.IsDirectoryOrVolumeSeparator(path2[path2.Length - 1]); + public static bool TryJoin(ReadOnlySpan path1, ReadOnlySpan path2, Span destination, out int charsWritten) + { + charsWritten = 0; + if (path1.Length == 0 && path2.Length == 0) + return true; - if (hasSep1 && hasSep2) + if (path1.Length == 0 || path2.Length == 0) { - return path1 + path2 + path3; + ref ReadOnlySpan pathToUse = ref path1.Length == 0 ? ref path2 : ref path1; + if (destination.Length < pathToUse.Length) + { + return false; + } + + pathToUse.CopyTo(destination); + charsWritten = pathToUse.Length; + return true; } - else if (hasSep1) + + bool needsSeparator = !(PathInternal.EndsInDirectorySeparator(path1) || PathInternal.StartsWithDirectorySeparator(path2)); + int charsNeeded = path1.Length + path2.Length + (needsSeparator ? 1 : 0); + if (destination.Length < charsNeeded) + return false; + + path1.CopyTo(destination); + if (needsSeparator) + destination[path1.Length] = DirectorySeparatorChar; + + path2.CopyTo(destination.Slice(path1.Length + (needsSeparator ? 1 : 0))); + + charsWritten = charsNeeded; + return true; + } + + public static bool TryJoin(ReadOnlySpan path1, ReadOnlySpan path2, ReadOnlySpan path3, Span destination, out int charsWritten) + { + charsWritten = 0; + if (path1.Length == 0 && path2.Length == 0 && path3.Length == 0) + return true; + + if (path1.Length == 0) + return TryJoin(path2, path3, destination, out charsWritten); + if (path2.Length == 0) + return TryJoin(path1, path3, destination, out charsWritten); + if (path3.Length == 0) + return TryJoin(path1, path2, destination, out charsWritten); + + int neededSeparators = PathInternal.EndsInDirectorySeparator(path1) || PathInternal.StartsWithDirectorySeparator(path2) ? 0 : 1; + bool needsSecondSeparator = !(PathInternal.EndsInDirectorySeparator(path2) || PathInternal.StartsWithDirectorySeparator(path3)); + if (needsSecondSeparator) + neededSeparators++; + + int charsNeeded = path1.Length + path2.Length + path3.Length + neededSeparators; + if (destination.Length < charsNeeded) + return false; + + bool result = TryJoin(path1, path2, destination, out charsWritten); + Debug.Assert(result, "should never fail joining first two paths"); + + if (needsSecondSeparator) + destination[charsWritten++] = DirectorySeparatorChar; + + path3.CopyTo(destination.Slice(charsWritten)); + charsWritten += path3.Length; + + return true; + } + + private static string CombineInternal(string first, string second) + { + if (string.IsNullOrEmpty(first)) + return second; + + if (string.IsNullOrEmpty(second)) + return first; + + if (IsPathRooted(second.AsSpan())) + return second; + + return JoinInternal(first, second); + } + + private static string CombineInternal(string first, string second, string third) + { + if (string.IsNullOrEmpty(first)) + return CombineInternal(second, third); + if (string.IsNullOrEmpty(second)) + return CombineInternal(first, third); + if (string.IsNullOrEmpty(third)) + return CombineInternal(first, second); + + if (IsPathRooted(third.AsSpan())) + return third; + if (IsPathRooted(second.AsSpan())) + return CombineInternal(second, third); + + return JoinInternal(first, second, third); + } + + private static string CombineInternal(string first, string second, string third, string fourth) + { + if (string.IsNullOrEmpty(first)) + return CombineInternal(second, third, fourth); + if (string.IsNullOrEmpty(second)) + return CombineInternal(first, third, fourth); + if (string.IsNullOrEmpty(third)) + return CombineInternal(first, second, fourth); + if (string.IsNullOrEmpty(fourth)) + return CombineInternal(first, second, third); + + if (IsPathRooted(fourth.AsSpan())) + return fourth; + if (IsPathRooted(third.AsSpan())) + return CombineInternal(third, fourth); + if (IsPathRooted(second.AsSpan())) + return CombineInternal(second, third, fourth); + + return JoinInternal(first, second, third, fourth); + } + + private static unsafe string JoinInternal(ReadOnlySpan first, ReadOnlySpan second) + { + Debug.Assert(first.Length > 0 && second.Length > 0, "should have dealt with empty paths"); + + bool hasSeparator = PathInternal.IsDirectorySeparator(first[first.Length - 1]) + || PathInternal.IsDirectorySeparator(second[0]); + + fixed (char* f = &MemoryMarshal.GetReference(first), s = &MemoryMarshal.GetReference(second)) { - return path1 + path2 + PathInternal.DirectorySeparatorCharAsString + path3; - } - else if (hasSep2) - { - return path1 + PathInternal.DirectorySeparatorCharAsString + path2 + path3; - } - else - { - // string.Concat only has string-based overloads up to four arguments; after that requires allocating - // a params string[]. Instead, try to use a cached StringBuilder. - StringBuilder sb = StringBuilderCache.Acquire(path1.Length + path2.Length + path3.Length + 2); - sb.Append(path1) - .Append(PathInternal.DirectorySeparatorChar) - .Append(path2) - .Append(PathInternal.DirectorySeparatorChar) - .Append(path3); - return StringBuilderCache.GetStringAndRelease(sb); + return string.Create( + first.Length + second.Length + (hasSeparator ? 0 : 1), + (First: (IntPtr)f, FirstLength: first.Length, Second: (IntPtr)s, SecondLength: second.Length, HasSeparator: hasSeparator), + (destination, state) => + { + new Span((char*)state.First, state.FirstLength).CopyTo(destination); + if (!state.HasSeparator) + destination[state.FirstLength] = PathInternal.DirectorySeparatorChar; + new Span((char*)state.Second, state.SecondLength).CopyTo(destination.Slice(state.FirstLength + (state.HasSeparator ? 0 : 1))); + }); } } - private static string CombineNoChecks(string path1, string path2, string path3, string path4) + private static unsafe string JoinInternal(ReadOnlySpan first, ReadOnlySpan second, ReadOnlySpan third) { - if (path1.Length == 0) - return CombineNoChecks(path2, path3, path4); - if (path2.Length == 0) - return CombineNoChecks(path1, path3, path4); - if (path3.Length == 0) - return CombineNoChecks(path1, path2, path4); - if (path4.Length == 0) - return CombineNoChecks(path1, path2, path3); + Debug.Assert(first.Length > 0 && second.Length > 0 && third.Length > 0, "should have dealt with empty paths"); - if (IsPathRooted(path4)) - return path4; - if (IsPathRooted(path3)) - return CombineNoChecks(path3, path4); - if (IsPathRooted(path2)) - return CombineNoChecks(path2, path3, path4); + bool firstHasSeparator = PathInternal.IsDirectorySeparator(first[first.Length - 1]) + || PathInternal.IsDirectorySeparator(second[0]); + bool thirdHasSeparator = PathInternal.IsDirectorySeparator(second[second.Length - 1]) + || PathInternal.IsDirectorySeparator(third[0]); - bool hasSep1 = PathInternal.IsDirectoryOrVolumeSeparator(path1[path1.Length - 1]); - bool hasSep2 = PathInternal.IsDirectoryOrVolumeSeparator(path2[path2.Length - 1]); - bool hasSep3 = PathInternal.IsDirectoryOrVolumeSeparator(path3[path3.Length - 1]); - - if (hasSep1 && hasSep2 && hasSep3) + fixed (char* f = &MemoryMarshal.GetReference(first), s = &MemoryMarshal.GetReference(second), t = &MemoryMarshal.GetReference(third)) { - // Use string.Concat overload that takes four strings - return path1 + path2 + path3 + path4; + return string.Create( + first.Length + second.Length + third.Length + (firstHasSeparator ? 0 : 1) + (thirdHasSeparator ? 0 : 1), + (First: (IntPtr)f, FirstLength: first.Length, Second: (IntPtr)s, SecondLength: second.Length, + Third: (IntPtr)t, ThirdLength: third.Length, FirstHasSeparator: firstHasSeparator, ThirdHasSeparator: thirdHasSeparator), + (destination, state) => + { + new Span((char*)state.First, state.FirstLength).CopyTo(destination); + if (!state.FirstHasSeparator) + destination[state.FirstLength] = PathInternal.DirectorySeparatorChar; + new Span((char*)state.Second, state.SecondLength).CopyTo(destination.Slice(state.FirstLength + (state.FirstHasSeparator ? 0 : 1))); + if (!state.ThirdHasSeparator) + destination[destination.Length - state.ThirdLength - 1] = PathInternal.DirectorySeparatorChar; + new Span((char*)state.Third, state.ThirdLength).CopyTo(destination.Slice(destination.Length - state.ThirdLength)); + }); } - else + } + + private static unsafe string JoinInternal(ReadOnlySpan first, ReadOnlySpan second, ReadOnlySpan third, ReadOnlySpan fourth) + { + Debug.Assert(first.Length > 0 && second.Length > 0 && third.Length > 0 && fourth.Length > 0, "should have dealt with empty paths"); + + bool firstHasSeparator = PathInternal.IsDirectorySeparator(first[first.Length - 1]) + || PathInternal.IsDirectorySeparator(second[0]); + bool thirdHasSeparator = PathInternal.IsDirectorySeparator(second[second.Length - 1]) + || PathInternal.IsDirectorySeparator(third[0]); + bool fourthHasSeparator = PathInternal.IsDirectorySeparator(third[third.Length - 1]) + || PathInternal.IsDirectorySeparator(fourth[0]); + + fixed (char* f = &MemoryMarshal.GetReference(first), s = &MemoryMarshal.GetReference(second), t = &MemoryMarshal.GetReference(third), u = &MemoryMarshal.GetReference(fourth)) { - // string.Concat only has string-based overloads up to four arguments; after that requires allocating - // a params string[]. Instead, try to use a cached StringBuilder. - StringBuilder sb = StringBuilderCache.Acquire(path1.Length + path2.Length + path3.Length + path4.Length + 3); - - sb.Append(path1); - if (!hasSep1) - { - sb.Append(PathInternal.DirectorySeparatorChar); - } - - sb.Append(path2); - if (!hasSep2) - { - sb.Append(PathInternal.DirectorySeparatorChar); - } - - sb.Append(path3); - if (!hasSep3) - { - sb.Append(PathInternal.DirectorySeparatorChar); - } - - sb.Append(path4); - - return StringBuilderCache.GetStringAndRelease(sb); + return string.Create( + first.Length + second.Length + third.Length + fourth.Length + (firstHasSeparator ? 0 : 1) + (thirdHasSeparator ? 0 : 1) + (fourthHasSeparator ? 0 : 1), + (First: (IntPtr)f, FirstLength: first.Length, Second: (IntPtr)s, SecondLength: second.Length, + Third: (IntPtr)t, ThirdLength: third.Length, Fourth: (IntPtr)u, FourthLength:fourth.Length, + FirstHasSeparator: firstHasSeparator, ThirdHasSeparator: thirdHasSeparator, FourthHasSeparator: fourthHasSeparator), + (destination, state) => + { + new Span((char*)state.First, state.FirstLength).CopyTo(destination); + if (!state.FirstHasSeparator) + destination[state.FirstLength] = PathInternal.DirectorySeparatorChar; + new Span((char*)state.Second, state.SecondLength).CopyTo(destination.Slice(state.FirstLength + (state.FirstHasSeparator ? 0 : 1))); + if (!state.ThirdHasSeparator) + destination[state.FirstLength + state.SecondLength + (state.FirstHasSeparator ? 0 : 1)] = PathInternal.DirectorySeparatorChar; + new Span((char*)state.Third, state.ThirdLength).CopyTo(destination.Slice(state.FirstLength + state.SecondLength + (state.FirstHasSeparator ? 0 : 1) + (state.ThirdHasSeparator ? 0 : 1))); + if (!state.FourthHasSeparator) + destination[destination.Length - state.FourthLength - 1] = PathInternal.DirectorySeparatorChar; + new Span((char*)state.Fourth, state.FourthLength).CopyTo(destination.Slice(destination.Length - state.FourthLength)); + }); } } @@ -556,9 +757,6 @@ namespace System.IO return StringBuilderCache.GetStringAndRelease(sb); } - // StringComparison and IsCaseSensitive are also available in PathInternal.CaseSensitivity but we are - // too low in System.Runtime.Extensions to use it (no FileStream, etc.) - /// Returns a comparison that can be used to compare file and directory names for equality. internal static StringComparison StringComparison { diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/PathHelper.Windows.cs b/external/corefx/src/Common/src/CoreLib/System/IO/PathHelper.Windows.cs index a0dba661f8..ed49422c1a 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/PathHelper.Windows.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/PathHelper.Windows.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using System.Text; namespace System.IO { @@ -13,197 +13,88 @@ namespace System.IO /// internal class PathHelper { - // Can't be over 8.3 and be a short name - private const int MaxShortName = 12; + /// + /// Normalize the given path. + /// + /// + /// Normalizes via Win32 GetFullPathName(). + /// + /// Path to normalize + /// Thrown if we have a string that is too large to fit into a UNICODE_STRING. + /// Thrown if the path is empty. + /// Normalized path + internal static string Normalize(string path) + { + Span initialBuffer = stackalloc char[PathInternal.MaxShortPath]; + var builder = new ValueStringBuilder(initialBuffer); - private const char LastAnsi = (char)255; - private const char Delete = (char)127; + // Get the full path + GetFullPathName(path.AsSpan(), ref builder); + + // If we have the exact same string we were passed in, don't allocate another string. + // TryExpandShortName does this input identity check. + string result = builder.AsSpan().IndexOf('~') >= 0 + ? TryExpandShortFileName(ref builder, originalPath: path) + : builder.AsSpan().Equals(path.AsSpan(), StringComparison.Ordinal) ? path : builder.ToString(); + + // Clear the buffer + builder.Dispose(); + return result; + } /// /// Normalize the given path. /// /// - /// Normalizes via Win32 GetFullPathName(). Will also trim initial - /// spaces if the path is determined to be rooted. - /// - /// Note that invalid characters will be checked after the path is normalized, which could remove bad characters. (C:\|\..\a.txt -- C:\a.txt) + /// Exceptions are the same as the string overload. /// - /// Path to normalize - /// True to check for invalid characters - /// Attempt to expand short paths if true - /// Thrown if the path is an illegal UNC (does not contain a full server/share) or contains illegal characters. - /// Thrown if the path or a path segment exceeds the filesystem limits. - /// Thrown if Windows returns ERROR_FILE_NOT_FOUND. (See Win32Marshal.GetExceptionForWin32Error) - /// Thrown if Windows returns ERROR_PATH_NOT_FOUND. (See Win32Marshal.GetExceptionForWin32Error) - /// Thrown if Windows returns ERROR_ACCESS_DENIED. (See Win32Marshal.GetExceptionForWin32Error) - /// Thrown if Windows returns an error that doesn't map to the above. (See Win32Marshal.GetExceptionForWin32Error) - /// Normalized path - internal static string Normalize(string path, bool checkInvalidCharacters, bool expandShortPaths) + internal static string Normalize(ref ValueStringBuilder path) { + Span initialBuffer = stackalloc char[PathInternal.MaxShortPath]; + var builder = new ValueStringBuilder(initialBuffer); + // Get the full path - StringBuffer fullPath = new StringBuffer(PathInternal.MaxShortPath); + GetFullPathName(path.AsSpan(terminate: true), ref builder); - try - { - GetFullPathName(path, ref fullPath); + string result = builder.AsSpan().IndexOf('~') >= 0 + ? TryExpandShortFileName(ref builder, originalPath: null) + : builder.ToString(); - // Checking path validity used to happen before getting the full path name. To avoid additional input allocation - // (to trim trailing whitespace) we now do it after the Win32 call. This will allow legitimate paths through that - // used to get kicked back (notably segments with invalid characters might get removed via ".."). - // - // There is no way that GetLongPath can invalidate the path so we'll do this (cheaper) check before we attempt to - // expand short file names. - - // Scan the path for: - // - // - Illegal path characters. - // - Invalid UNC paths like \\, \\server, \\server\. - - // As the path could be > 30K, we'll combine the validity scan. None of these checks are performed by the Win32 - // GetFullPathName() API. - - bool possibleShortPath = false; - bool foundTilde = false; - - // We can get UNCs as device paths through this code (e.g. \\.\UNC\), we won't validate them as there isn't - // an easy way to normalize without extensive cost (we'd have to hunt down the canonical name for any device - // path that contains UNC or to see if the path was doing something like \\.\GLOBALROOT\Device\Mup\, - // \\.\GLOBAL\UNC\, \\.\GLOBALROOT\GLOBAL??\UNC\, etc. - bool specialPath = fullPath.Length > 1 && fullPath[0] == '\\' && fullPath[1] == '\\'; - bool isDevice = PathInternal.IsDevice(ref fullPath); - bool possibleBadUnc = specialPath && !isDevice; - int index = specialPath ? 2 : 0; - int lastSeparator = specialPath ? 1 : 0; - int segmentLength; - char current; - - while (index < fullPath.Length) - { - current = fullPath[index]; - - // Try to skip deeper analysis. '?' and higher are valid/ignorable except for '\', '|', and '~' - if (current < '?' || current == '\\' || current == '|' || current == '~') - { - switch (current) - { - case '|': - case '>': - case '<': - case '\"': - if (checkInvalidCharacters) throw new ArgumentException(SR.Argument_InvalidPathChars); - foundTilde = false; - break; - case '~': - foundTilde = true; - break; - case '\\': - segmentLength = index - lastSeparator - 1; - lastSeparator = index; - - if (foundTilde) - { - if (segmentLength <= MaxShortName) - { - // Possibly a short path. - possibleShortPath = true; - } - - foundTilde = false; - } - - if (possibleBadUnc) - { - // If we're at the end of the path and this is the first separator, we're missing the share. - // Otherwise we're good, so ignore UNC tracking from here. - if (index == fullPath.Length - 1) - throw new ArgumentException(SR.Format(SR.Arg_PathIllegalUNC_Path, fullPath.ToString())); - else - possibleBadUnc = false; - } - - break; - - default: - if (checkInvalidCharacters && current < ' ') throw new ArgumentException(SR.Argument_InvalidPathChars, nameof(path)); - break; - } - } - - index++; - } - - if (possibleBadUnc) - throw new ArgumentException(SR.Format(SR.Arg_PathIllegalUNC_Path, fullPath.ToString())); - - segmentLength = fullPath.Length - lastSeparator - 1; - - if (foundTilde && segmentLength <= MaxShortName) - possibleShortPath = true; - - // Check for a short filename path and try and expand it. Technically you don't need to have a tilde for a short name, but - // this is how we've always done this. This expansion is costly so we'll continue to let other short paths slide. - if (expandShortPaths && possibleShortPath) - { - return TryExpandShortFileName(ref fullPath, originalPath: path); - } - else - { - if (fullPath.Length == path.Length && fullPath.StartsWith(path)) - { - // If we have the exact same string we were passed in, don't bother to allocate another string from the StringBuilder. - return path; - } - else - { - return fullPath.ToString(); - } - } - } - finally - { - // Clear the buffer - fullPath.Free(); - } + // Clear the buffer + builder.Dispose(); + return result; } - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static bool IsDosUnc(ref StringBuffer buffer) - { - return !PathInternal.IsDevice(ref buffer) && buffer.Length > 1 && buffer[0] == '\\' && buffer[1] == '\\'; - } - - private static unsafe void GetFullPathName(string path, ref StringBuffer fullPath) + /// + /// Calls GetFullPathName on the given path. + /// + /// The path name. MUST be null terminated after the span. + private static void GetFullPathName(ReadOnlySpan path, ref ValueStringBuilder builder) { // If the string starts with an extended prefix we would need to remove it from the path before we call GetFullPathName as // it doesn't root extended paths correctly. We don't currently resolve extended paths, so we'll just assert here. Debug.Assert(PathInternal.IsPartiallyQualified(path) || !PathInternal.IsExtended(path)); - // Historically we would skip leading spaces *only* if the path started with a drive " C:" or a UNC " \\" - int startIndex = PathInternal.PathStartSkip(path); - - fixed (char* pathStart = path) + uint result = 0; + while ((result = Interop.Kernel32.GetFullPathNameW(ref MemoryMarshal.GetReference(path), (uint)builder.Capacity, ref builder.GetPinnableReference(), IntPtr.Zero)) > builder.Capacity) { - uint result = 0; - while ((result = Interop.Kernel32.GetFullPathNameW(pathStart + startIndex, (uint)fullPath.Capacity, fullPath.UnderlyingArray, IntPtr.Zero)) > fullPath.Capacity) - { - // Reported size is greater than the buffer size. Increase the capacity. - fullPath.EnsureCapacity(checked((int)result)); - } - - if (result == 0) - { - // Failure, get the error and throw - int errorCode = Marshal.GetLastWin32Error(); - if (errorCode == 0) - errorCode = Interop.Errors.ERROR_BAD_PATHNAME; - throw Win32Marshal.GetExceptionForWin32Error(errorCode, path); - } - - fullPath.Length = checked((int)result); + // Reported size is greater than the buffer size. Increase the capacity. + builder.EnsureCapacity(checked((int)result)); } + + if (result == 0) + { + // Failure, get the error and throw + int errorCode = Marshal.GetLastWin32Error(); + if (errorCode == 0) + errorCode = Interop.Errors.ERROR_BAD_PATHNAME; + throw Win32Marshal.GetExceptionForWin32Error(errorCode, path.ToString()); + } + + builder.Length = (int)result; } - private static int GetInputBuffer(ref StringBuffer content, bool isDosUnc, ref StringBuffer buffer) + internal static int PrependDevicePathChars(ref ValueStringBuilder content, bool isDosUnc, ref ValueStringBuilder buffer) { int length = content.Length; @@ -212,37 +103,34 @@ namespace System.IO : PathInternal.DevicePrefixLength; buffer.EnsureCapacity(length + 1); + buffer.Length = 0; if (isDosUnc) { - // Put the extended UNC prefix (\\?\UNC\) in front of the path - buffer.CopyFrom(bufferIndex: 0, source: PathInternal.UncExtendedPathPrefix); + // Is a \\Server\Share, put \\?\UNC\ in the front + buffer.Append(PathInternal.UncExtendedPathPrefix); - // Copy the source buffer over after the existing UNC prefix - content.CopyTo( - bufferIndex: PathInternal.UncPrefixLength, - destination: ref buffer, - destinationIndex: PathInternal.UncExtendedPrefixLength, - count: content.Length - PathInternal.UncPrefixLength); + // Copy Server\Share\... over to the buffer + buffer.Append(content.AsSpan(PathInternal.UncPrefixLength)); // Return the prefix difference return PathInternal.UncExtendedPrefixLength - PathInternal.UncPrefixLength; } else { - int prefixSize = PathInternal.ExtendedPathPrefix.Length; - buffer.CopyFrom(bufferIndex: 0, source: PathInternal.ExtendedPathPrefix); - content.CopyTo(bufferIndex: 0, destination: ref buffer, destinationIndex: prefixSize, count: content.Length); - return prefixSize; + // Not an UNC, put the \\?\ prefix in front, then the original string + buffer.Append(PathInternal.ExtendedPathPrefix); + buffer.Append(content.AsSpan()); + return PathInternal.DevicePrefixLength; } } - private static string TryExpandShortFileName(ref StringBuffer outputBuffer, string originalPath) + internal static string TryExpandShortFileName(ref ValueStringBuilder outputBuilder, string originalPath) { // We guarantee we'll expand short names for paths that only partially exist. As such, we need to find the part of the path that actually does exist. To // avoid allocating like crazy we'll create only one input array and modify the contents with embedded nulls. - Debug.Assert(!PathInternal.IsPartiallyQualified(ref outputBuffer), "should have resolved by now"); + Debug.Assert(!PathInternal.IsPartiallyQualified(outputBuilder.AsSpan()), "should have resolved by now"); // We'll have one of a few cases by now (the normalized path will have already: // @@ -250,135 +138,115 @@ namespace System.IO // 2. Dos UNC (\\Server\Share) // 3. Dos device path (\\.\C:\, \\?\C:\) // - // We want to put the extended syntax on the front if it doesn't already have it, which may mean switching from \\.\. + // We want to put the extended syntax on the front if it doesn't already have it (for long path support and speed), which may mean switching from \\.\. // // Note that we will never get \??\ here as GetFullPathName() does not recognize \??\ and will return it as C:\??\ (or whatever the current drive is). - int rootLength = PathInternal.GetRootLength(ref outputBuffer); - bool isDevice = PathInternal.IsDevice(ref outputBuffer); + int rootLength = PathInternal.GetRootLength(outputBuilder.AsSpan()); + bool isDevice = PathInternal.IsDevice(outputBuilder.AsSpan()); - StringBuffer inputBuffer = new StringBuffer(0); - try + // As this is a corner case we're not going to add a stackalloc here to keep the stack pressure down. + var inputBuilder = new ValueStringBuilder(); + + bool isDosUnc = false; + int rootDifference = 0; + bool wasDotDevice = false; + + // Add the extended prefix before expanding to allow growth over MAX_PATH + if (isDevice) { - bool isDosUnc = false; - int rootDifference = 0; - bool wasDotDevice = false; + // We have one of the following (\\?\ or \\.\) + inputBuilder.Append(outputBuilder.AsSpan()); - // Add the extended prefix before expanding to allow growth over MAX_PATH - if (isDevice) + if (outputBuilder[2] == '.') { - // We have one of the following (\\?\ or \\.\) - inputBuffer.Append(ref outputBuffer); - - if (outputBuffer[2] == '.') - { - wasDotDevice = true; - inputBuffer[2] = '?'; - } + wasDotDevice = true; + inputBuilder[2] = '?'; } - else + } + else + { + isDosUnc = !PathInternal.IsDevice(outputBuilder.AsSpan()) && outputBuilder.Length > 1 && outputBuilder[0] == '\\' && outputBuilder[1] == '\\'; + rootDifference = PrependDevicePathChars(ref outputBuilder, isDosUnc, ref inputBuilder); + } + + rootLength += rootDifference; + int inputLength = inputBuilder.Length; + + bool success = false; + int foundIndex = inputBuilder.Length - 1; + + while (!success) + { + uint result = Interop.Kernel32.GetLongPathNameW( + ref inputBuilder.GetPinnableReference(terminate: true), ref outputBuilder.GetPinnableReference(), (uint)outputBuilder.Capacity); + + // Replace any temporary null we added + if (inputBuilder[foundIndex] == '\0') inputBuilder[foundIndex] = '\\'; + + if (result == 0) { - isDosUnc = IsDosUnc(ref outputBuffer); - rootDifference = GetInputBuffer(ref outputBuffer, isDosUnc, ref inputBuffer); - } - - rootLength += rootDifference; - int inputLength = inputBuffer.Length; - - bool success = false; - int foundIndex = inputBuffer.Length - 1; - - while (!success) - { - uint result = Interop.Kernel32.GetLongPathNameW(inputBuffer.UnderlyingArray, outputBuffer.UnderlyingArray, (uint)outputBuffer.Capacity); - - // Replace any temporary null we added - if (inputBuffer[foundIndex] == '\0') inputBuffer[foundIndex] = '\\'; - - if (result == 0) + // Look to see if we couldn't find the file + int error = Marshal.GetLastWin32Error(); + if (error != Interop.Errors.ERROR_FILE_NOT_FOUND && error != Interop.Errors.ERROR_PATH_NOT_FOUND) { - // Look to see if we couldn't find the file - int error = Marshal.GetLastWin32Error(); - if (error != Interop.Errors.ERROR_FILE_NOT_FOUND && error != Interop.Errors.ERROR_PATH_NOT_FOUND) - { - // Some other failure, give up - break; - } - - // We couldn't find the path at the given index, start looking further back in the string. - foundIndex--; - - for (; foundIndex > rootLength && inputBuffer[foundIndex] != '\\'; foundIndex--) ; - if (foundIndex == rootLength) - { - // Can't trim the path back any further - break; - } - else - { - // Temporarily set a null in the string to get Windows to look further up the path - inputBuffer[foundIndex] = '\0'; - } + // Some other failure, give up + break; } - else if (result > outputBuffer.Capacity) + + // We couldn't find the path at the given index, start looking further back in the string. + foundIndex--; + + for (; foundIndex > rootLength && inputBuilder[foundIndex] != '\\'; foundIndex--) ; + if (foundIndex == rootLength) { - // Not enough space. The result count for this API does not include the null terminator. - outputBuffer.EnsureCapacity(checked((int)result)); - result = Interop.Kernel32.GetLongPathNameW(inputBuffer.UnderlyingArray, outputBuffer.UnderlyingArray, (uint)outputBuffer.Capacity); + // Can't trim the path back any further + break; } else { - // Found the path - success = true; - outputBuffer.Length = checked((int)result); - if (foundIndex < inputLength - 1) - { - // It was a partial find, put the non-existent part of the path back - outputBuffer.Append(ref inputBuffer, foundIndex, inputBuffer.Length - foundIndex); - } + // Temporarily set a null in the string to get Windows to look further up the path + inputBuilder[foundIndex] = '\0'; } } - - // Strip out the prefix and return the string - ref StringBuffer bufferToUse = ref Choose(success, ref outputBuffer, ref inputBuffer); - - // Switch back from \\?\ to \\.\ if necessary - if (wasDotDevice) - bufferToUse[2] = '.'; - - string returnValue = null; - - int newLength = (int)(bufferToUse.Length - rootDifference); - if (isDosUnc) + else if (result > outputBuilder.Capacity) { - // Need to go from \\?\UNC\ to \\?\UN\\ - bufferToUse[PathInternal.UncExtendedPrefixLength - PathInternal.UncPrefixLength] = '\\'; - } - - // We now need to strip out any added characters at the front of the string - if (bufferToUse.SubstringEquals(originalPath, rootDifference, newLength)) - { - // Use the original path to avoid allocating - returnValue = originalPath; + // Not enough space. The result count for this API does not include the null terminator. + outputBuilder.EnsureCapacity(checked((int)result)); + result = Interop.Kernel32.GetLongPathNameW(ref inputBuilder.GetPinnableReference(), ref outputBuilder.GetPinnableReference(), (uint)outputBuilder.Capacity); } else { - returnValue = bufferToUse.Substring(rootDifference, newLength); + // Found the path + success = true; + outputBuilder.Length = checked((int)result); + if (foundIndex < inputLength - 1) + { + // It was a partial find, put the non-existent part of the path back + outputBuilder.Append(inputBuilder.AsSpan(foundIndex, inputBuilder.Length - foundIndex)); + } } - - return returnValue; } - finally - { - inputBuffer.Free(); - } - } - // Helper method to workaround lack of operator ? support for ref values - private static ref StringBuffer Choose(bool condition, ref StringBuffer s1, ref StringBuffer s2) - { - if (condition) return ref s1; - else return ref s2; + // If we were able to expand the path, use it, otherwise use the original full path result + ref ValueStringBuilder builderToUse = ref (success ? ref outputBuilder : ref inputBuilder); + + // Switch back from \\?\ to \\.\ if necessary + if (wasDotDevice) + builderToUse[2] = '.'; + + // Change from \\?\UNC\ to \\?\UN\\ if needed + if (isDosUnc) + builderToUse[PathInternal.UncExtendedPrefixLength - PathInternal.UncPrefixLength] = '\\'; + + // Strip out any added characters at the front of the string + ReadOnlySpan output = builderToUse.AsSpan(rootDifference); + + string returnValue = ((originalPath != null) && output.Equals(originalPath.AsSpan(), StringComparison.Ordinal)) + ? originalPath : new string(output); + + inputBuilder.Dispose(); + return returnValue; } } } diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/PathInternal.Unix.cs b/external/corefx/src/Common/src/CoreLib/System/IO/PathInternal.Unix.cs index 2f65a4252b..fae309be56 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/PathInternal.Unix.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/PathInternal.Unix.cs @@ -4,6 +4,7 @@ using System.Diagnostics; using System.Text; +using System.Runtime.InteropServices; namespace System.IO { @@ -22,7 +23,7 @@ namespace System.IO internal const string ParentDirectoryPrefix = @"../"; - internal static int GetRootLength(string path) + internal static int GetRootLength(ReadOnlySpan path) { return path.Length > 0 && IsDirectorySeparator(path[0]) ? 1 : 0; } @@ -40,7 +41,8 @@ namespace System.IO /// internal static string NormalizeDirectorySeparators(string path) { - if (string.IsNullOrEmpty(path)) return path; + if (string.IsNullOrEmpty(path)) + return path; // Make a pass to see if we need to normalize so we can potentially skip allocating bool normalized = true; @@ -55,7 +57,8 @@ namespace System.IO } } - if (normalized) return path; + if (normalized) + return path; StringBuilder builder = new StringBuilder(path.Length); @@ -73,32 +76,14 @@ namespace System.IO return builder.ToString(); } - - /// - /// Returns true if the character is a directory or volume separator. - /// - /// The character to test. - internal static bool IsDirectoryOrVolumeSeparator(char ch) - { - // The directory separator, volume separator, and the alternate directory - // separator should be the same on Unix, so we only need to check one. - Debug.Assert(DirectorySeparatorChar == AltDirectorySeparatorChar); - Debug.Assert(DirectorySeparatorChar == VolumeSeparatorChar); - return ch == DirectorySeparatorChar; - } - internal static bool IsPartiallyQualified(string path) + internal static bool IsPartiallyQualified(ReadOnlySpan path) { // This is much simpler than Windows where paths can be rooted, but not fully qualified (such as Drive Relative) // As long as the path is rooted in Unix it doesn't use the current directory and therefore is fully qualified. return !Path.IsPathRooted(path); } - internal static string TrimEndingDirectorySeparator(string path) => - path.Length > 1 && IsDirectorySeparator(path[path.Length - 1]) ? // exclude root "/" - path.Substring(0, path.Length - 1) : - path; - /// /// Returns true if the path is effectively empty for the current OS. /// For unix, this is empty or null. For Windows, this is empty, null, or @@ -108,5 +93,10 @@ namespace System.IO { return string.IsNullOrEmpty(path); } + + internal static bool IsEffectivelyEmpty(ReadOnlySpan path) + { + return path.IsEmpty; + } } } diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/PathInternal.Windows.StringBuffer.cs b/external/corefx/src/Common/src/CoreLib/System/IO/PathInternal.Windows.StringBuffer.cs deleted file mode 100644 index 84953df37b..0000000000 --- a/external/corefx/src/Common/src/CoreLib/System/IO/PathInternal.Windows.StringBuffer.cs +++ /dev/null @@ -1,93 +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.InteropServices; - -namespace System.IO -{ - /// Contains internal path helpers that are shared between many projects. - internal static partial class PathInternal - { - /// - /// Returns true if the path uses the extended syntax (\\?\) - /// - internal static bool IsExtended(ref StringBuffer path) - { - // While paths like "//?/C:/" will work, they're treated the same as "\\.\" paths. - // Skipping of normalization will *only* occur if back slashes ('\') are used. - return path.Length >= DevicePrefixLength - && path[0] == '\\' - && (path[1] == '\\' || path[1] == '?') - && path[2] == '?' - && path[3] == '\\'; - } - - /// - /// Gets the length of the root of the path (drive, share, etc.). - /// - internal unsafe static int GetRootLength(ref StringBuffer path) - { - if (path.Length == 0) return 0; - - fixed (char* value = path.UnderlyingArray) - { - return GetRootLength(value, path.Length); - } - } - - /// - /// Returns true if the path uses any of the DOS device path syntaxes. ("\\.\", "\\?\", or "\??\") - /// - internal static bool IsDevice(ref StringBuffer path) - { - // If the path begins with any two separators is will be recognized and normalized and prepped with - // "\??\" for internal usage correctly. "\??\" is recognized and handled, "/??/" is not. - return IsExtended(ref path) - || - ( - path.Length >= DevicePrefixLength - && IsDirectorySeparator(path[0]) - && IsDirectorySeparator(path[1]) - && (path[2] == '.' || path[2] == '?') - && IsDirectorySeparator(path[3]) - ); - } - - /// - /// Returns true if the path specified is relative to the current drive or working directory. - /// Returns false if the path is fixed to a specific drive or UNC path. This method does no - /// validation of the path (URIs will be returned as relative as a result). - /// - /// - /// Handles paths that use the alternate directory separator. It is a frequent mistake to - /// assume that rooted paths (Path.IsPathRooted) are not relative. This isn't the case. - /// "C:a" is drive relative- meaning that it will be resolved against the current directory - /// for C: (rooted, but relative). "C:\a" is rooted and not relative (the current directory - /// will not be used to modify the path). - /// - internal static bool IsPartiallyQualified(ref StringBuffer path) - { - if (path.Length < 2) - { - // It isn't fixed, it must be relative. There is no way to specify a fixed - // path with one character (or less). - return true; - } - - if (IsDirectorySeparator(path[0])) - { - // There is no valid way to specify a relative path with two initial slashes or - // \? as ? isn't valid for drive relative paths and \??\ is equivalent to \\?\ - return !(path[1] == '?' || IsDirectorySeparator(path[1])); - } - - // The only way to specify a fixed path that doesn't begin with two slashes - // is the drive, colon, slash format- i.e. C:\ - return !((path.Length >= 3) - && (path[1] == VolumeSeparatorChar) - && IsDirectorySeparator(path[2])); - } - } -} diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/PathInternal.Windows.cs b/external/corefx/src/Common/src/CoreLib/System/IO/PathInternal.Windows.cs index f315f43fd5..b01482abd2 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/PathInternal.Windows.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/PathInternal.Windows.cs @@ -2,7 +2,6 @@ // 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.Text; @@ -71,8 +70,37 @@ namespace System.IO return ((value >= 'A' && value <= 'Z') || (value >= 'a' && value <= 'z')); } + internal static bool EndsWithPeriodOrSpace(string path) + { + if (string.IsNullOrEmpty(path)) + return false; + + char c = path[path.Length - 1]; + return c == ' ' || c == '.'; + } + /// /// Adds the extended path prefix (\\?\) if not already a device path, IF the path is not relative, + /// AND the path is more than 259 characters. (> MAX_PATH + null). This will also insert the extended + /// prefix if the path ends with a period or a space. Trailing periods and spaces are normally eaten + /// away from paths during normalization, but if we see such a path at this point it should be + /// normalized and has retained the final characters. (Typically from one of the *Info classes) + /// + internal static string EnsureExtendedPrefixIfNeeded(string path) + { + if (path != null && (path.Length >= MaxShortPath || EndsWithPeriodOrSpace(path))) + { + return EnsureExtendedPrefix(path); + } + else + { + return path; + } + } + + /// + /// DO NOT USE- Use EnsureExtendedPrefixIfNeeded. This will be removed shortly. + /// Adds the extended path prefix (\\?\) if not already a device path, IF the path is not relative, /// AND the path is more than 259 characters. (> MAX_PATH + null) /// internal static string EnsureExtendedPrefixOverMaxPath(string path) @@ -115,7 +143,7 @@ namespace System.IO /// /// Returns true if the path uses any of the DOS device path syntaxes. ("\\.\", "\\?\", or "\??\") /// - internal static bool IsDevice(string path) + internal static bool IsDevice(ReadOnlySpan path) { // If the path begins with any two separators is will be recognized and normalized and prepped with // "\??\" for internal usage correctly. "\??\" is recognized and handled, "/??/" is not. @@ -130,12 +158,25 @@ namespace System.IO ); } + /// + /// Returns true if the path is a device UNC (\\?\UNC\, \\.\UNC\) + /// + internal static bool IsDeviceUNC(ReadOnlySpan path) + { + return path.Length >= UncExtendedPrefixLength + && IsDevice(path) + && IsDirectorySeparator(path[7]) + && path[4] == 'U' + && path[5] == 'N' + && path[6] == 'C'; + } + /// /// Returns true if the path uses the canonical form of extended syntax ("\\?\" or "\??\"). If the /// path matches exactly (cannot use alternate directory separators) Windows will skip normalization /// and path length checks. /// - internal static bool IsExtended(string path) + internal static bool IsExtended(ReadOnlySpan path) { // While paths like "//?/C:/" will work, they're treated the same as "\\.\" paths. // Skipping of normalization will *only* occur if back slashes ('\') are used. @@ -149,7 +190,7 @@ namespace System.IO /// /// Check for known wildcard characters. '*' and '?' are the most common ones. /// - internal static bool HasWildCardCharacters(string path) + internal static bool HasWildCardCharacters(ReadOnlySpan path) { // Question mark is part of dos device syntax so we have to skip if we are int startIndex = IsDevice(path) ? ExtendedPathPrefix.Length : 0; @@ -172,71 +213,63 @@ namespace System.IO /// /// Gets the length of the root of the path (drive, share, etc.). /// - internal unsafe static int GetRootLength(string path) - { - fixed (char* value = path) - { - return GetRootLength(value, path.Length); - } - } - - private unsafe static int GetRootLength(char* path, int pathLength) + internal static int GetRootLength(ReadOnlySpan path) { + int pathLength = path.Length; int i = 0; - int volumeSeparatorLength = 2; // Length to the colon "C:" - int uncRootLength = 2; // Length to the start of the server name "\\" - bool extendedSyntax = StartsWithOrdinal(path, pathLength, ExtendedPathPrefix); - bool extendedUncSyntax = StartsWithOrdinal(path, pathLength, UncExtendedPathPrefix); - if (extendedSyntax) + bool deviceSyntax = IsDevice(path); + bool deviceUnc = deviceSyntax && IsDeviceUNC(path); + + if ((!deviceSyntax || deviceUnc) && pathLength > 0 && IsDirectorySeparator(path[0])) { - // Shift the position we look for the root from to account for the extended prefix - if (extendedUncSyntax) + // UNC or simple rooted path (e.g. "\foo", NOT "\\?\C:\foo") + if (deviceUnc || (pathLength > 1 && IsDirectorySeparator(path[1]))) { - // "\\" -> "\\?\UNC\" - uncRootLength = UncExtendedPathPrefix.Length; + // UNC (\\?\UNC\ or \\), scan past server\share + + // Start past the prefix ("\\" or "\\?\UNC\") + i = deviceUnc ? UncExtendedPrefixLength : UncPrefixLength; + + // Skip two separators at most + int n = 2; + while (i < pathLength && (!IsDirectorySeparator(path[i]) || --n > 0)) + i++; } else { - // "C:" -> "\\?\C:" - volumeSeparatorLength += ExtendedPathPrefix.Length; + // Current drive rooted (e.g. "\foo") + i = 1; } } - - if ((!extendedSyntax || extendedUncSyntax) && pathLength > 0 && IsDirectorySeparator(path[0])) + else if (deviceSyntax) { - // UNC or simple rooted path (e.g. "\foo", NOT "\\?\C:\foo") + // Device path (e.g. "\\?\.", "\\.\") + // Skip any characters following the prefix that aren't a separator + i = DevicePrefixLength; + while (i < pathLength && !IsDirectorySeparator(path[i])) + i++; - i = 1; // Drive rooted (\foo) is one character - if (extendedUncSyntax || (pathLength > 1 && IsDirectorySeparator(path[1]))) - { - // UNC (\\?\UNC\ or \\), scan past the next two directory separators at most - // (e.g. to \\?\UNC\Server\Share or \\Server\Share\) - i = uncRootLength; - int n = 2; // Maximum separators to skip - while (i < pathLength && (!IsDirectorySeparator(path[i]) || --n > 0)) i++; - } + // If there is another separator take it, as long as we have had at least one + // non-separator after the prefix (e.g. don't take "\\?\\", but take "\\?\a\") + if (i < pathLength && i > DevicePrefixLength && IsDirectorySeparator(path[i])) + i++; } - else if (pathLength >= volumeSeparatorLength && path[volumeSeparatorLength - 1] == VolumeSeparatorChar) + else if (pathLength >= 2 + && path[1] == VolumeSeparatorChar + && IsValidDriveChar(path[0])) { - // Path is at least longer than where we expect a colon, and has a colon (\\?\A:, A:) - // If the colon is followed by a directory separator, move past it - i = volumeSeparatorLength; - if (pathLength >= volumeSeparatorLength + 1 && IsDirectorySeparator(path[volumeSeparatorLength])) i++; + // Valid drive specified path ("C:", "D:", etc.) + i = 2; + + // If the colon is followed by a directory separator, move past it (e.g "C:\") + if (pathLength > 2 && IsDirectorySeparator(path[2])) + i++; } + return i; } - private unsafe static bool StartsWithOrdinal(char* source, int sourceLength, string value) - { - if (sourceLength < value.Length) return false; - for (int i = 0; i < value.Length; i++) - { - if (value[i] != source[i]) return false; - } - return true; - } - /// /// Returns true if the path specified is relative to the current drive or working directory. /// Returns false if the path is fixed to a specific drive or UNC path. This method does no @@ -249,7 +282,7 @@ namespace System.IO /// for C: (rooted, but relative). "C:\a" is rooted and not relative (the current directory /// will not be used to modify the path). /// - internal static bool IsPartiallyQualified(string path) + internal static bool IsPartiallyQualified(ReadOnlySpan path) { if (path.Length < 2) { @@ -275,29 +308,6 @@ namespace System.IO && IsValidDriveChar(path[0])); } - /// - /// Returns the characters to skip at the start of the path if it starts with space(s) and a drive or directory separator. - /// (examples are " C:", " \") - /// This is a legacy behavior of Path.GetFullPath(). - /// - /// - /// Note that this conflicts with IsPathRooted() which doesn't (and never did) such a skip. - /// - internal static int PathStartSkip(string path) - { - int startIndex = 0; - while (startIndex < path.Length && path[startIndex] == ' ') startIndex++; - - if (startIndex > 0 && (startIndex < path.Length && IsDirectorySeparator(path[startIndex])) - || (startIndex + 1 < path.Length && path[startIndex + 1] == ':' && IsValidDriveChar(path[startIndex]))) - { - // Go ahead and skip spaces as we're either " C:" or " \" - return startIndex; - } - - return 0; - } - /// /// True if the given character is a directory separator. /// @@ -341,34 +351,33 @@ namespace System.IO /// internal static string NormalizeDirectorySeparators(string path) { - if (string.IsNullOrEmpty(path)) return path; + if (string.IsNullOrEmpty(path)) + return path; char current; - int start = PathStartSkip(path); - if (start == 0) + // Make a pass to see if we need to normalize so we can potentially skip allocating + bool normalized = true; + + for (int i = 0; i < path.Length; i++) { - // Make a pass to see if we need to normalize so we can potentially skip allocating - bool normalized = true; - - for (int i = 0; i < path.Length; i++) + current = path[i]; + if (IsDirectorySeparator(current) + && (current != DirectorySeparatorChar + // Check for sequential separators past the first position (we need to keep initial two for UNC/extended) + || (i > 0 && i + 1 < path.Length && IsDirectorySeparator(path[i + 1])))) { - current = path[i]; - if (IsDirectorySeparator(current) - && (current != DirectorySeparatorChar - // Check for sequential separators past the first position (we need to keep initial two for UNC/extended) - || (i > 0 && i + 1 < path.Length && IsDirectorySeparator(path[i + 1])))) - { - normalized = false; - break; - } + normalized = false; + break; } - - if (normalized) return path; } + if (normalized) + return path; + StringBuilder builder = new StringBuilder(path.Length); + int start = 0; if (IsDirectorySeparator(path[start])) { start++; @@ -398,23 +407,14 @@ namespace System.IO return builder.ToString(); } - /// - /// Returns true if the character is a directory or volume separator. - /// - /// The character to test. - internal static bool IsDirectoryOrVolumeSeparator(char ch) - { - return IsDirectorySeparator(ch) || VolumeSeparatorChar == ch; - } - /// /// Returns true if the path is effectively empty for the current OS. /// For unix, this is empty or null. For Windows, this is empty, null, or /// just spaces ((char)32). /// - internal static bool IsEffectivelyEmpty(string path) + internal static bool IsEffectivelyEmpty(ReadOnlySpan path) { - if (string.IsNullOrEmpty(path)) + if (path.IsEmpty) return true; foreach (char c in path) diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/PathInternal.cs b/external/corefx/src/Common/src/CoreLib/System/IO/PathInternal.cs index bfd69e9251..00cb12e920 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/PathInternal.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/PathInternal.cs @@ -10,37 +10,32 @@ namespace System.IO /// Contains internal path helpers that are shared between many projects. internal static partial class PathInternal { - /// - /// Returns the start index of the filename - /// in the given path, or 0 if no directory - /// or volume separator is found. - /// - /// The path in which to find the index of the filename. - /// - /// This method returns path.Length for - /// inputs like "/usr/foo/" on Unix. As such, - /// it is not safe for being used to index - /// the string without additional verification. - /// - internal static int FindFileNameIndex(string path) - { - Debug.Assert(path != null); - - for (int i = path.Length - 1; i >= 0; i--) - { - char ch = path[i]; - if (IsDirectoryOrVolumeSeparator(ch)) - return i + 1; - } - - return 0; // the whole path is the filename - } - /// /// Returns true if the path ends in a directory separator. /// - internal static bool EndsInDirectorySeparator(string path) => - !string.IsNullOrEmpty(path) && IsDirectorySeparator(path[path.Length - 1]); + internal static bool EndsInDirectorySeparator(ReadOnlySpan path) + => path.Length > 0 && IsDirectorySeparator(path[path.Length - 1]); + + /// + /// Returns true if the path starts in a directory separator. + /// + internal static bool StartsWithDirectorySeparator(ReadOnlySpan path) => path.Length > 0 && IsDirectorySeparator(path[0]); + + internal static string EnsureTrailingSeparator(string path) + => EndsInDirectorySeparator(path) ? path : path + DirectorySeparatorCharAsString; + + internal static string TrimEndingDirectorySeparator(string path) => + EndsInDirectorySeparator(path) && !IsRoot(path) ? + path.Substring(0, path.Length - 1) : + path; + + internal static ReadOnlySpan TrimEndingDirectorySeparator(ReadOnlySpan path) => + EndsInDirectorySeparator(path) && !IsRoot(path) ? + path.Slice(0, path.Length - 1) : + path; + + internal static bool IsRoot(ReadOnlySpan path) + => path.Length == GetRootLength(path); /// /// Get the common path length from the start of the string. @@ -71,7 +66,7 @@ namespace System.IO /// /// Gets the count of common characters from the left optionally ignoring case /// - unsafe internal static int EqualStartingCharacterCount(string first, string second, bool ignoreCase) + internal static unsafe int EqualStartingCharacterCount(string first, string second, bool ignoreCase) { if (string.IsNullOrEmpty(first) || string.IsNullOrEmpty(second)) return 0; @@ -116,24 +111,98 @@ namespace System.IO } /// - /// Returns false for ".." unless it is specified as a part of a valid File/Directory name. - /// (Used to avoid moving up directories.) - /// - /// Valid: a..b abc..d - /// Invalid: ..ab ab.. .. abc..d\abc.. + /// Try to remove relative segments from the given path (without combining with a root). /// - internal static void CheckSearchPattern(string searchPattern) + /// The length of the root of the given path + internal static string RemoveRelativeSegments(string path, int rootLength) { - int index; - while ((index = searchPattern.IndexOf("..", StringComparison.Ordinal)) != -1) - { - // Terminal ".." . Files names cannot end in ".." - if (index + 2 == searchPattern.Length - || IsDirectorySeparator(searchPattern[index + 2])) - throw new ArgumentException(SR.Format(SR.Arg_InvalidSearchPattern, searchPattern)); + Debug.Assert(rootLength > 0); + bool flippedSeparator = false; - searchPattern = searchPattern.Substring(index + 2); + int skip = rootLength; + // We treat "\.." , "\." and "\\" as a relative segment. We want to collapse the first separator past the root presuming + // the root actually ends in a separator. Otherwise the first segment for RemoveRelativeSegments + // in cases like "\\?\C:\.\" and "\\?\C:\..\", the first segment after the root will be ".\" and "..\" which is not considered as a relative segment and hence not be removed. + if (PathInternal.IsDirectorySeparator(path[skip - 1])) + skip--; + + Span initialBuffer = stackalloc char[260 /* PathInternal.MaxShortPath */]; + ValueStringBuilder sb = new ValueStringBuilder(initialBuffer); + + // Remove "//", "/./", and "/../" from the path by copying each character to the output, + // except the ones we're removing, such that the builder contains the normalized path + // at the end. + if (skip > 0) + { + sb.Append(path.AsSpan(0, skip)); } + + for (int i = skip; i < path.Length; i++) + { + char c = path[i]; + + if (PathInternal.IsDirectorySeparator(c) && i + 1 < path.Length) + { + // Skip this character if it's a directory separator and if the next character is, too, + // e.g. "parent//child" => "parent/child" + if (PathInternal.IsDirectorySeparator(path[i + 1])) + { + continue; + } + + // Skip this character and the next if it's referring to the current directory, + // e.g. "parent/./child" => "parent/child" + if ((i + 2 == path.Length || PathInternal.IsDirectorySeparator(path[i + 2])) && + path[i + 1] == '.') + { + i++; + continue; + } + + // Skip this character and the next two if it's referring to the parent directory, + // e.g. "parent/child/../grandchild" => "parent/grandchild" + if (i + 2 < path.Length && + (i + 3 == path.Length || PathInternal.IsDirectorySeparator(path[i + 3])) && + path[i + 1] == '.' && path[i + 2] == '.') + { + // Unwind back to the last slash (and if there isn't one, clear out everything). + int s; + for (s = sb.Length - 1; s >= skip; s--) + { + if (PathInternal.IsDirectorySeparator(sb[s])) + { + sb.Length = (i + 3 >= path.Length && s == skip) ? s + 1 : s; // to avoid removing the complete "\tmp\" segment in cases like \\?\C:\tmp\..\, C:\tmp\.. + break; + } + } + if (s < skip) + { + sb.Length = skip; + } + + i += 2; + continue; + } + } + + // Normalize the directory separator if needed + if (c != PathInternal.DirectorySeparatorChar && c == PathInternal.AltDirectorySeparatorChar) + { + c = PathInternal.DirectorySeparatorChar; + flippedSeparator = true; + } + + sb.Append(c); + } + + // If we haven't changed the source path, return the original + if (!flippedSeparator && sb.Length == path.Length) + { + sb.Dispose(); + return path; + } + + return sb.Length < rootLength ? path.Substring(0, rootLength) : sb.ToString(); } } } diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/PathTooLongException.cs b/external/corefx/src/Common/src/CoreLib/System/IO/PathTooLongException.cs index 7af2452736..d71043044e 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/PathTooLongException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/PathTooLongException.cs @@ -9,7 +9,9 @@ using System.Runtime.Serialization; namespace System.IO { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class PathTooLongException : IOException { public PathTooLongException() diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/PinnedBufferMemoryStream.cs b/external/corefx/src/Common/src/CoreLib/System/IO/PinnedBufferMemoryStream.cs index dfcc05d066..94331a2ef8 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/PinnedBufferMemoryStream.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/PinnedBufferMemoryStream.cs @@ -38,9 +38,9 @@ namespace System.IO Initialize(ptr, len, len, FileAccess.Read); } - public override int Read(Span destination) => ReadCore(destination); + public override int Read(Span buffer) => ReadCore(buffer); - public override void Write(ReadOnlySpan source) => WriteCore(source); + public override void Write(ReadOnlySpan buffer) => WriteCore(buffer); ~PinnedBufferMemoryStream() { diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/StreamReader.cs b/external/corefx/src/Common/src/CoreLib/System/IO/StreamReader.cs index 392582b960..46729af793 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/StreamReader.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/StreamReader.cs @@ -71,21 +71,21 @@ namespace System.IO // We don't guarantee thread safety on StreamReader, but we should at // least prevent users from trying to read anything while an Async // read from the same thread is in progress. - private volatile Task _asyncReadTask; + private Task _asyncReadTask = Task.CompletedTask; private void CheckAsyncTaskInProgress() { // We are not locking the access to _asyncReadTask because this is not meant to guarantee thread safety. // We are simply trying to deter calling any Read APIs while an async Read from the same thread is in progress. - - Task t = _asyncReadTask; - - if (t != null && !t.IsCompleted) + if (!_asyncReadTask.IsCompleted) { - throw new InvalidOperationException(SR.InvalidOperation_AsyncIOInProgress); + ThrowAsyncIOInProgress(); } } + private static void ThrowAsyncIOInProgress() => + throw new InvalidOperationException(SR.InvalidOperation_AsyncIOInProgress); + // StreamReader by default will ignore illegal UTF8 characters. We don't want to // throw here because we want to be able to read ill-formed data without choking. // The high level goal is to be tolerant of encoding errors when we read and very strict @@ -1092,7 +1092,7 @@ namespace System.IO { Debug.Assert(_bytePos <= _encoding.Preamble.Length, "possible bug in _compressPreamble. Are two threads using this StreamReader at the same time?"); int tmpBytePos = _bytePos; - int len = await tmpStream.ReadAsync(tmpByteBuffer, tmpBytePos, tmpByteBuffer.Length - tmpBytePos, cancellationToken).ConfigureAwait(false); + int len = await tmpStream.ReadAsync(new Memory(tmpByteBuffer, tmpBytePos, tmpByteBuffer.Length - tmpBytePos), cancellationToken).ConfigureAwait(false); Debug.Assert(len >= 0, "Stream.Read returned a negative number! This is a bug in your stream class."); if (len == 0) @@ -1128,7 +1128,7 @@ namespace System.IO { Debug.Assert(_bytePos == 0, "_bytePos can be non zero only when we are trying to _checkPreamble. Are two threads using this StreamReader at the same time?"); - _byteLen = await tmpStream.ReadAsync(tmpByteBuffer, 0, tmpByteBuffer.Length, cancellationToken).ConfigureAwait(false); + _byteLen = await tmpStream.ReadAsync(new Memory(tmpByteBuffer), cancellationToken).ConfigureAwait(false); Debug.Assert(_byteLen >= 0, "Stream.Read returned a negative number! This is a bug in your stream class."); @@ -1304,7 +1304,7 @@ namespace System.IO { Debug.Assert(_bytePos <= _encoding.Preamble.Length, "possible bug in _compressPreamble. Are two threads using this StreamReader at the same time?"); int tmpBytePos = _bytePos; - int len = await tmpStream.ReadAsync(tmpByteBuffer, tmpBytePos, tmpByteBuffer.Length - tmpBytePos).ConfigureAwait(false); + int len = await tmpStream.ReadAsync(new Memory(tmpByteBuffer, tmpBytePos, tmpByteBuffer.Length - tmpBytePos)).ConfigureAwait(false); Debug.Assert(len >= 0, "Stream.Read returned a negative number! This is a bug in your stream class."); if (len == 0) @@ -1326,7 +1326,7 @@ namespace System.IO else { Debug.Assert(_bytePos == 0, "_bytePos can be non zero only when we are trying to _checkPreamble. Are two threads using this StreamReader at the same time?"); - _byteLen = await tmpStream.ReadAsync(tmpByteBuffer, 0, tmpByteBuffer.Length).ConfigureAwait(false); + _byteLen = await tmpStream.ReadAsync(new Memory(tmpByteBuffer)).ConfigureAwait(false); Debug.Assert(_byteLen >= 0, "Stream.Read returned a negative number! Bug in stream class."); if (_byteLen == 0) // We're at EOF diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/StreamWriter.cs b/external/corefx/src/Common/src/CoreLib/System/IO/StreamWriter.cs index d0d014db33..cc92d8aea6 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/StreamWriter.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/StreamWriter.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text; using System.Threading; @@ -45,19 +46,21 @@ namespace System.IO // We don't guarantee thread safety on StreamWriter, but we should at // least prevent users from trying to write anything while an Async // write from the same thread is in progress. - private volatile Task _asyncWriteTask; + private Task _asyncWriteTask = Task.CompletedTask; private void CheckAsyncTaskInProgress() { // We are not locking the access to _asyncWriteTask because this is not meant to guarantee thread safety. // We are simply trying to deter calling any Write APIs while an async Write from the same thread is in progress. - - Task t = _asyncWriteTask; - - if (t != null && !t.IsCompleted) - throw new InvalidOperationException(SR.InvalidOperation_AsyncIOInProgress); + if (!_asyncWriteTask.IsCompleted) + { + ThrowAsyncIOInProgress(); + } } + private static void ThrowAsyncIOInProgress() => + throw new InvalidOperationException(SR.InvalidOperation_AsyncIOInProgress); + // The high level goal is to be tolerant of encoding errors when we read and very strict // when we write. Hence, default StreamWriter encoding will throw on encoding error. // Note: when StreamWriter throws on invalid encoding chars (for ex, high surrogate character @@ -324,14 +327,13 @@ namespace System.IO } } + [MethodImpl(MethodImplOptions.NoInlining)] // prevent WriteSpan from bloating call sites public override void Write(char[] buffer) { - if (buffer != null) - { - WriteCore(buffer, _autoFlush); - } + WriteSpan(buffer, appendNewLine: false); } + [MethodImpl(MethodImplOptions.NoInlining)] // prevent WriteSpan from bloating call sites public override void Write(char[] buffer, int index, int count) { if (buffer == null) @@ -351,14 +353,15 @@ namespace System.IO throw new ArgumentException(SR.Argument_InvalidOffLen); } - WriteCore(new ReadOnlySpan(buffer, index, count), _autoFlush); + WriteSpan(buffer.AsSpan(index, count), appendNewLine: false); } + [MethodImpl(MethodImplOptions.NoInlining)] // prevent WriteSpan from bloating call sites public override void Write(ReadOnlySpan buffer) { if (GetType() == typeof(StreamWriter)) { - WriteCore(buffer, _autoFlush); + WriteSpan(buffer, appendNewLine: false); } else { @@ -368,7 +371,8 @@ namespace System.IO } } - private unsafe void WriteCore(ReadOnlySpan buffer, bool autoFlush) + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private unsafe void WriteSpan(ReadOnlySpan buffer, bool appendNewLine) { CheckAsyncTaskInProgress(); @@ -423,41 +427,47 @@ namespace System.IO } } - if (autoFlush) + if (appendNewLine) + { + char[] coreNewLine = CoreNewLine; + for (int i = 0; i < coreNewLine.Length; i++) // Generally 1 (\n) or 2 (\r\n) iterations + { + if (_charPos == _charLen) + { + Flush(false, false); + } + + _charBuffer[_charPos] = coreNewLine[i]; + _charPos++; + } + } + + if (_autoFlush) { Flush(true, false); } } + [MethodImpl(MethodImplOptions.NoInlining)] // prevent WriteSpan from bloating call sites public override void Write(string value) { - if (value != null) - { - WriteCore(value.AsReadOnlySpan(), _autoFlush); - } + WriteSpan(value, appendNewLine: false); } - // - // Optimize the most commonly used WriteLine overload. This optimization is important for System.Console in particular - // because of it will make one WriteLine equal to one call to the OS instead of two in the common case. - // + [MethodImpl(MethodImplOptions.NoInlining)] // prevent WriteSpan from bloating call sites public override void WriteLine(string value) { CheckAsyncTaskInProgress(); - if (value != null) - { - WriteCore(value.AsReadOnlySpan(), autoFlush: false); - } - WriteCore(new ReadOnlySpan(CoreNewLine), autoFlush: true); + WriteSpan(value, appendNewLine: true); } + [MethodImpl(MethodImplOptions.NoInlining)] // prevent WriteSpan from bloating call sites public override void WriteLine(ReadOnlySpan value) { if (GetType() == typeof(StreamWriter)) { CheckAsyncTaskInProgress(); - WriteCore(value, autoFlush: false); - WriteCore(new ReadOnlySpan(CoreNewLine), autoFlush: true); + WriteSpan(value, appendNewLine: true); } else { @@ -964,14 +974,14 @@ namespace System.IO byte[] preamble = encoding.GetPreamble(); if (preamble.Length > 0) { - await stream.WriteAsync(preamble, 0, preamble.Length, cancellationToken).ConfigureAwait(false); + await stream.WriteAsync(new ReadOnlyMemory(preamble), cancellationToken).ConfigureAwait(false); } } int count = encoder.GetBytes(charBuffer, 0, charPos, byteBuffer, 0, flushEncoder); if (count > 0) { - await stream.WriteAsync(byteBuffer, 0, count, cancellationToken).ConfigureAwait(false); + await stream.WriteAsync(new ReadOnlyMemory(byteBuffer, 0, count), cancellationToken).ConfigureAwait(false); } // By definition, calling Flush should flush the stream, but this is diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/TextReader.cs b/external/corefx/src/Common/src/CoreLib/System/IO/TextReader.cs index 321c974739..d4d7e54a18 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/TextReader.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/TextReader.cs @@ -7,6 +7,7 @@ using System.Threading; using System.Threading.Tasks; using System.Diagnostics; using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; using System.Buffers; namespace System.IO @@ -252,7 +253,7 @@ namespace System.IO } public virtual ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default(CancellationToken)) => - new ValueTask(buffer.TryGetArray(out ArraySegment array) ? + new ValueTask(MemoryMarshal.TryGetArray(buffer, out ArraySegment array) ? ReadAsync(array.Array, array.Offset, array.Count) : Task.Factory.StartNew(state => { @@ -290,7 +291,7 @@ namespace System.IO } public virtual ValueTask ReadBlockAsync(Memory buffer, CancellationToken cancellationToken = default(CancellationToken)) => - new ValueTask(buffer.TryGetArray(out ArraySegment array) ? + new ValueTask(MemoryMarshal.TryGetArray(buffer, out ArraySegment array) ? ReadBlockAsync(array.Array, array.Offset, array.Count) : Task.Factory.StartNew(state => { diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/UnmanagedMemoryStream.cs b/external/corefx/src/Common/src/CoreLib/System/IO/UnmanagedMemoryStream.cs index 171113542f..2bcb16f24e 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/UnmanagedMemoryStream.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/UnmanagedMemoryStream.cs @@ -379,22 +379,22 @@ namespace System.IO return ReadCore(new Span(buffer, offset, count)); } - public override int Read(Span destination) + public override int Read(Span buffer) { if (GetType() == typeof(UnmanagedMemoryStream)) { - return ReadCore(destination); + return ReadCore(buffer); } else { // UnmanagedMemoryStream is not sealed, and a derived type may have overridden Read(byte[], int, int) prior // to this Read(Span) overload being introduced. In that case, this Read(Span) overload // should use the behavior of Read(byte[],int,int) overload. - return base.Read(destination); + return base.Read(buffer); } } - internal int ReadCore(Span destination) + internal int ReadCore(Span buffer) { EnsureNotClosed(); EnsureReadable(); @@ -403,7 +403,7 @@ namespace System.IO // changes our position after we decide we can read some bytes. long pos = Interlocked.Read(ref _position); long len = Interlocked.Read(ref _length); - long n = Math.Min(len - pos, destination.Length); + long n = Math.Min(len - pos, buffer.Length); if (n <= 0) { return 0; @@ -418,7 +418,7 @@ namespace System.IO unsafe { - fixed (byte* pBuffer = &MemoryMarshal.GetReference(destination)) + fixed (byte* pBuffer = &MemoryMarshal.GetReference(buffer)) { if (_buffer != null) { @@ -486,9 +486,9 @@ namespace System.IO /// /// Reads bytes from stream and puts them into the buffer /// - /// Buffer to read the bytes to. + /// Buffer to read the bytes to. /// Token that can be used to cancel this operation. - public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default(CancellationToken)) + public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default(CancellationToken)) { if (cancellationToken.IsCancellationRequested) { @@ -510,9 +510,9 @@ namespace System.IO // something other than an array and this is an UnmanagedMemoryStream-derived type that doesn't override Read(Span) will // it then fall back to doing the ArrayPool/copy behavior. return new ValueTask( - destination.TryGetArray(out ArraySegment destinationArray) ? + MemoryMarshal.TryGetArray(buffer, out ArraySegment destinationArray) ? Read(destinationArray.Array, destinationArray.Offset, destinationArray.Count) : - Read(destination.Span)); + Read(buffer.Span)); } catch (Exception ex) { @@ -659,29 +659,29 @@ namespace System.IO WriteCore(new Span(buffer, offset, count)); } - public override void Write(ReadOnlySpan source) + public override void Write(ReadOnlySpan buffer) { if (GetType() == typeof(UnmanagedMemoryStream)) { - WriteCore(source); + WriteCore(buffer); } else { // UnmanagedMemoryStream is not sealed, and a derived type may have overridden Write(byte[], int, int) prior // to this Write(Span) overload being introduced. In that case, this Write(Span) overload // should use the behavior of Write(byte[],int,int) overload. - base.Write(source); + base.Write(buffer); } } - internal unsafe void WriteCore(ReadOnlySpan source) + internal unsafe void WriteCore(ReadOnlySpan buffer) { EnsureNotClosed(); EnsureWriteable(); long pos = Interlocked.Read(ref _position); // Use a local to avoid a race condition long len = Interlocked.Read(ref _length); - long n = pos + source.Length; + long n = pos + buffer.Length; // Check for overflow if (n < 0) { @@ -709,12 +709,12 @@ namespace System.IO } } - fixed (byte* pBuffer = &MemoryMarshal.GetReference(source)) + fixed (byte* pBuffer = &MemoryMarshal.GetReference(buffer)) { if (_buffer != null) { long bytesLeft = _capacity - pos; - if (bytesLeft < source.Length) + if (bytesLeft < buffer.Length) { throw new ArgumentException(SR.Arg_BufferTooSmall); } @@ -724,7 +724,7 @@ namespace System.IO try { _buffer.AcquirePointer(ref pointer); - Buffer.Memcpy(pointer + pos + _offset, pBuffer, source.Length); + Buffer.Memcpy(pointer + pos + _offset, pBuffer, buffer.Length); } finally { @@ -736,7 +736,7 @@ namespace System.IO } else { - Buffer.Memcpy(_mem + pos, pBuffer, source.Length); + Buffer.Memcpy(_mem + pos, pBuffer, buffer.Length); } } @@ -783,30 +783,30 @@ namespace System.IO /// /// Buffer that will be written. /// Token that can be used to cancel the operation. - public override Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default(CancellationToken)) + public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken = default(CancellationToken)) { if (cancellationToken.IsCancellationRequested) { - return Task.FromCanceled(cancellationToken); + return new ValueTask(Task.FromCanceled(cancellationToken)); } try { // See corresponding comment in ReadAsync for why we don't just always use Write(ReadOnlySpan). // Unlike ReadAsync, we could delegate to WriteAsync(byte[], ...) here, but we don't for consistency. - if (MemoryMarshal.TryGetArray(source, out ArraySegment sourceArray)) + if (MemoryMarshal.TryGetArray(buffer, out ArraySegment sourceArray)) { Write(sourceArray.Array, sourceArray.Offset, sourceArray.Count); } else { - Write(source.Span); + Write(buffer.Span); } - return Task.CompletedTask; + return default; } catch (Exception ex) { - return Task.FromException(ex); + return new ValueTask(Task.FromException(ex)); } } diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/UnmanagedMemoryStreamWrapper.cs b/external/corefx/src/Common/src/CoreLib/System/IO/UnmanagedMemoryStreamWrapper.cs index 90bb21ac5b..65a33961db 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/UnmanagedMemoryStreamWrapper.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/UnmanagedMemoryStreamWrapper.cs @@ -112,9 +112,9 @@ namespace System.IO return _unmanagedStream.Read(buffer, offset, count); } - public override int Read(Span destination) + public override int Read(Span buffer) { - return _unmanagedStream.Read(destination); + return _unmanagedStream.Read(buffer); } public override int ReadByte() @@ -139,9 +139,9 @@ namespace System.IO _unmanagedStream.Write(buffer, offset, count); } - public override void Write(ReadOnlySpan source) + public override void Write(ReadOnlySpan buffer) { - _unmanagedStream.Write(source); + _unmanagedStream.Write(buffer); } public override void WriteByte(byte value) @@ -206,9 +206,9 @@ namespace System.IO return _unmanagedStream.ReadAsync(buffer, offset, count, cancellationToken); } - public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default(CancellationToken)) + public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default(CancellationToken)) { - return _unmanagedStream.ReadAsync(destination, cancellationToken); + return _unmanagedStream.ReadAsync(buffer, cancellationToken); } @@ -217,9 +217,9 @@ namespace System.IO return _unmanagedStream.WriteAsync(buffer, offset, count, cancellationToken); } - public override Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default(CancellationToken)) + public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken = default(CancellationToken)) { - return _unmanagedStream.WriteAsync(source, cancellationToken); + return _unmanagedStream.WriteAsync(buffer, cancellationToken); } } // class UnmanagedMemoryStreamWrapper } // namespace diff --git a/external/corefx/src/Common/src/CoreLib/System/IO/Win32Marshal.cs b/external/corefx/src/Common/src/CoreLib/System/IO/Win32Marshal.cs index 14a064a700..7888d8d61b 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IO/Win32Marshal.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IO/Win32Marshal.cs @@ -2,106 +2,94 @@ // 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; -using System.Diagnostics; using System.Runtime.InteropServices; namespace System.IO { /// - /// Provides static methods for converting from Win32 errors codes to exceptions, HRESULTS and error messages. + /// Provides static methods for converting from Win32 errors codes to exceptions, HRESULTS and error messages. /// internal static class Win32Marshal { /// - /// Converts, resetting it, the last Win32 error into a corresponding object. + /// Converts, resetting it, the last Win32 error into a corresponding object, optionally + /// including the specified path in the error message. /// - internal static Exception GetExceptionForLastWin32Error() - { - int errorCode = Marshal.GetLastWin32Error(); - return GetExceptionForWin32Error(errorCode, string.Empty); - } + internal static Exception GetExceptionForLastWin32Error(string path = "") + => GetExceptionForWin32Error(Marshal.GetLastWin32Error(), path); /// - /// Converts the specified Win32 error into a corresponding object. + /// Converts the specified Win32 error into a corresponding object, optionally + /// including the specified path in the error message. /// - internal static Exception GetExceptionForWin32Error(int errorCode) - { - return GetExceptionForWin32Error(errorCode, string.Empty); - } - - /// - /// Converts the specified Win32 error into a corresponding object, optionally - /// including the specified path in the error message. - /// - internal static Exception GetExceptionForWin32Error(int errorCode, string path) + internal static Exception GetExceptionForWin32Error(int errorCode, string path = "") { switch (errorCode) { case Interop.Errors.ERROR_FILE_NOT_FOUND: - if (path.Length == 0) - return new FileNotFoundException(SR.IO_FileNotFound); - else - return new FileNotFoundException(SR.Format(SR.IO_FileNotFound_FileName, path), path); - + return new FileNotFoundException( + string.IsNullOrEmpty(path) ? SR.IO_FileNotFound : SR.Format(SR.IO_FileNotFound_FileName, path), path); case Interop.Errors.ERROR_PATH_NOT_FOUND: - if (path.Length == 0) - return new DirectoryNotFoundException(SR.IO_PathNotFound_NoPathName); - else - return new DirectoryNotFoundException(SR.Format(SR.IO_PathNotFound_Path, path)); - + return new DirectoryNotFoundException( + string.IsNullOrEmpty(path) ? SR.IO_PathNotFound_NoPathName : SR.Format(SR.IO_PathNotFound_Path, path)); case Interop.Errors.ERROR_ACCESS_DENIED: - if (path.Length == 0) - return new UnauthorizedAccessException(SR.UnauthorizedAccess_IODenied_NoPathName); - else - return new UnauthorizedAccessException(SR.Format(SR.UnauthorizedAccess_IODenied_Path, path)); - + return new UnauthorizedAccessException( + string.IsNullOrEmpty(path) ? SR.UnauthorizedAccess_IODenied_NoPathName : SR.Format(SR.UnauthorizedAccess_IODenied_Path, path)); case Interop.Errors.ERROR_ALREADY_EXISTS: - if (path.Length == 0) + if (string.IsNullOrEmpty(path)) goto default; - return new IOException(SR.Format(SR.IO_AlreadyExists_Name, path), MakeHRFromErrorCode(errorCode)); - case Interop.Errors.ERROR_FILENAME_EXCED_RANGE: - if (path.Length == 0) - return new PathTooLongException(SR.IO_PathTooLong); - else - return new PathTooLongException(SR.Format(SR.IO_PathTooLong_Path, path)); - - case Interop.Errors.ERROR_INVALID_DRIVE: - throw new DriveNotFoundException(SR.Format(SR.IO_DriveNotFound_Drive, path)); - - case Interop.Errors.ERROR_INVALID_PARAMETER: - return new IOException(Interop.Kernel32.GetMessage(errorCode), MakeHRFromErrorCode(errorCode)); - + return new PathTooLongException( + string.IsNullOrEmpty(path) ? SR.IO_PathTooLong : SR.Format(SR.IO_PathTooLong_Path, path)); case Interop.Errors.ERROR_SHARING_VIOLATION: - if (path.Length == 0) - return new IOException(SR.IO_SharingViolation_NoFileName, MakeHRFromErrorCode(errorCode)); - else - return new IOException(SR.Format(SR.IO_SharingViolation_File, path), MakeHRFromErrorCode(errorCode)); - + return new IOException( + string.IsNullOrEmpty(path) ? SR.IO_SharingViolation_NoFileName : SR.Format(SR.IO_SharingViolation_File, path), + MakeHRFromErrorCode(errorCode)); case Interop.Errors.ERROR_FILE_EXISTS: - if (path.Length == 0) + if (string.IsNullOrEmpty(path)) goto default; - return new IOException(SR.Format(SR.IO_FileExists_Name, path), MakeHRFromErrorCode(errorCode)); - case Interop.Errors.ERROR_OPERATION_ABORTED: return new OperationCanceledException(); - + case Interop.Errors.ERROR_INVALID_PARAMETER: default: - return new IOException(Interop.Kernel32.GetMessage(errorCode), MakeHRFromErrorCode(errorCode)); + return new IOException( + string.IsNullOrEmpty(path) ? GetMessage(errorCode) : $"{GetMessage(errorCode)} : '{path}'", + MakeHRFromErrorCode(errorCode)); } } /// - /// Returns a HRESULT for the specified Win32 error code. + /// If not already an HRESULT, returns an HRESULT for the specified Win32 error code. /// internal static int MakeHRFromErrorCode(int errorCode) { - Debug.Assert((0xFFFF0000 & errorCode) == 0, "This is an HRESULT, not an error code!"); + // Don't convert it if it is already an HRESULT + if ((0xFFFF0000 & errorCode) != 0) + return errorCode; return unchecked(((int)0x80070000) | errorCode); } + + /// + /// Returns a Win32 error code for the specified HRESULT if it came from FACILITY_WIN32 + /// If not, returns the HRESULT unchanged + /// + internal static int TryMakeWin32ErrorCodeFromHR(int hr) + { + if ((0xFFFF0000 & hr) == 0x80070000) + { + // Win32 error, Win32Marshal.GetExceptionForWin32Error expects the Win32 format + hr &= 0x0000FFFF; + } + + return hr; + } + + /// + /// Returns a string message for the specified Win32 error code. + /// + internal static string GetMessage(int errorCode) => Interop.Kernel32.GetMessage(errorCode); } } diff --git a/external/corefx/src/Common/src/CoreLib/System/IndexOutOfRangeException.cs b/external/corefx/src/Common/src/CoreLib/System/IndexOutOfRangeException.cs index b6d93ef568..da396f3ccc 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IndexOutOfRangeException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IndexOutOfRangeException.cs @@ -16,7 +16,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public sealed class IndexOutOfRangeException : SystemException { public IndexOutOfRangeException() diff --git a/external/corefx/src/Common/src/CoreLib/System/InsufficientExecutionStackException.cs b/external/corefx/src/Common/src/CoreLib/System/InsufficientExecutionStackException.cs index 4822028f85..ad6e752202 100644 --- a/external/corefx/src/Common/src/CoreLib/System/InsufficientExecutionStackException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/InsufficientExecutionStackException.cs @@ -7,7 +7,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public sealed class InsufficientExecutionStackException : SystemException { public InsufficientExecutionStackException() diff --git a/external/corefx/src/Common/src/CoreLib/System/Int16.cs b/external/corefx/src/Common/src/CoreLib/System/Int16.cs index fecc87e9fe..42e7ee017c 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Int16.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Int16.cs @@ -11,7 +11,9 @@ namespace System { [Serializable] [StructLayout(LayoutKind.Sequential)] +#if !MONO [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public struct Int16 : IComparable, IConvertible, IFormattable, IComparable, IEquatable, ISpanFormattable { private short m_value; // Do not rename (binary serialization) diff --git a/external/corefx/src/Common/src/CoreLib/System/Int32.cs b/external/corefx/src/Common/src/CoreLib/System/Int32.cs index b573e950e4..be86a22fb3 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Int32.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Int32.cs @@ -11,7 +11,9 @@ namespace System { [Serializable] [StructLayout(LayoutKind.Sequential)] +#if !MONO [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public struct Int32 : IComparable, IConvertible, IFormattable, IComparable, IEquatable, ISpanFormattable { private int m_value; // Do not rename (binary serialization) diff --git a/external/corefx/src/Common/src/CoreLib/System/Int64.cs b/external/corefx/src/Common/src/CoreLib/System/Int64.cs index 0bcca87309..f8331e2b5d 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Int64.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Int64.cs @@ -11,7 +11,9 @@ namespace System { [Serializable] [StructLayout(LayoutKind.Sequential)] +#if !MONO [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public struct Int64 : IComparable, IConvertible, IFormattable, IComparable, IEquatable, ISpanFormattable { private long m_value; // Do not rename (binary serialization) diff --git a/external/corefx/src/Common/src/CoreLib/System/IntPtr.cs b/external/corefx/src/Common/src/CoreLib/System/IntPtr.cs index 45c2ded160..44638ddd8e 100644 --- a/external/corefx/src/Common/src/CoreLib/System/IntPtr.cs +++ b/external/corefx/src/Common/src/CoreLib/System/IntPtr.cs @@ -23,7 +23,7 @@ namespace System // See https://github.com/dotnet/corert/blob/master/Documentation/design-docs/diagnostics/diagnostics-tools-contract.md for more details. // Please do not change the type, the name, or the semantic usage of this member without understanding the implication for tools. // Get in touch with the diagnostics team if you have questions. - unsafe private void* _value; // Do not rename (binary serialization) + private unsafe void* _value; // Do not rename (binary serialization) [Intrinsic] public static readonly IntPtr Zero; @@ -81,9 +81,9 @@ namespace System return false; } - unsafe bool IEquatable.Equals(IntPtr value) + unsafe bool IEquatable.Equals(IntPtr other) { - return _value == value._value; + return _value == other._value; } public unsafe override int GetHashCode() diff --git a/external/corefx/src/Common/src/CoreLib/System/InvalidCastException.cs b/external/corefx/src/Common/src/CoreLib/System/InvalidCastException.cs index 055643278a..8bac90fec3 100644 --- a/external/corefx/src/Common/src/CoreLib/System/InvalidCastException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/InvalidCastException.cs @@ -13,7 +13,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class InvalidCastException : SystemException { public InvalidCastException() diff --git a/external/corefx/src/Common/src/CoreLib/System/InvalidOperationException.cs b/external/corefx/src/Common/src/CoreLib/System/InvalidOperationException.cs index 62c222af40..0c23cfd5ee 100644 --- a/external/corefx/src/Common/src/CoreLib/System/InvalidOperationException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/InvalidOperationException.cs @@ -17,7 +17,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class InvalidOperationException : SystemException { public InvalidOperationException() diff --git a/external/corefx/src/Common/src/CoreLib/System/InvalidProgramException.cs b/external/corefx/src/Common/src/CoreLib/System/InvalidProgramException.cs index c8047c548b..b0bfa2a64e 100644 --- a/external/corefx/src/Common/src/CoreLib/System/InvalidProgramException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/InvalidProgramException.cs @@ -16,7 +16,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public sealed class InvalidProgramException : SystemException { public InvalidProgramException() diff --git a/external/corefx/src/Common/src/CoreLib/System/InvalidTimeZoneException.cs b/external/corefx/src/Common/src/CoreLib/System/InvalidTimeZoneException.cs index 25b155e8d1..3a7e41c843 100644 --- a/external/corefx/src/Common/src/CoreLib/System/InvalidTimeZoneException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/InvalidTimeZoneException.cs @@ -7,7 +7,11 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if MONO + [System.Runtime.CompilerServices.TypeForwardedFrom("System.Core, Version=2.0.5.0, Culture=Neutral, PublicKeyToken=7cec85d7bea7798e")] +#else [System.Runtime.CompilerServices.TypeForwardedFrom("System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class InvalidTimeZoneException : Exception { public InvalidTimeZoneException() diff --git a/external/corefx/src/Common/src/CoreLib/System/Lazy.cs b/external/corefx/src/Common/src/CoreLib/System/Lazy.cs index 6410c2e285..b4d21ac74b 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Lazy.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Lazy.cs @@ -13,6 +13,7 @@ #pragma warning disable 0420 using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.ExceptionServices; using System.Runtime.InteropServices; using System.Threading; @@ -183,6 +184,9 @@ namespace System /// [DebuggerTypeProxy(typeof(LazyDebugView<>))] [DebuggerDisplay("ThreadSafetyMode={Mode}, IsValueCreated={IsValueCreated}, IsValueFaulted={IsValueFaulted}, Value={ValueForDebugDisplay}")] +#if MONO + [Serializable] +#endif public class Lazy { private static T CreateViaDefaultConstructor() diff --git a/external/corefx/src/Common/src/CoreLib/System/Marvin.cs b/external/corefx/src/Common/src/CoreLib/System/Marvin.cs new file mode 100644 index 0000000000..2a49db3b0e --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/Marvin.cs @@ -0,0 +1,143 @@ +// 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.Private; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using Internal.Runtime.CompilerServices; + +#if BIT64 +using nuint = System.UInt64; +#else +using nuint = System.UInt32; +#endif + +namespace System +{ + internal static class Marvin + { + /// + /// Compute a Marvin hash and collapse it into a 32-bit hash. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static int ComputeHash32(ReadOnlySpan data, ulong seed) => ComputeHash32(ref MemoryMarshal.GetReference(data), data.Length, seed); + + /// + /// Compute a Marvin hash and collapse it into a 32-bit hash. + /// + public static int ComputeHash32(ref byte data, int count, ulong seed) + { + nuint ucount = (nuint)count; + uint p0 = (uint)seed; + uint p1 = (uint)(seed >> 32); + + nuint byteOffset = 0; + + while (ucount >= 8) + { + p0 += Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref data, byteOffset)); + Block(ref p0, ref p1); + + p0 += Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref data, byteOffset + 4)); + Block(ref p0, ref p1); + + byteOffset += 8; + ucount -= 8; + } + + switch (ucount) + { + case 4: + p0 += Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref data, byteOffset)); + Block(ref p0, ref p1); + goto case 0; + + case 0: + p0 += 0x80u; + break; + + case 5: + p0 += Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref data, byteOffset)); + byteOffset += 4; + Block(ref p0, ref p1); + goto case 1; + + case 1: + p0 += 0x8000u | Unsafe.AddByteOffset(ref data, byteOffset); + break; + + case 6: + p0 += Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref data, byteOffset)); + byteOffset += 4; + Block(ref p0, ref p1); + goto case 2; + + case 2: + p0 += 0x800000u | Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref data, byteOffset)); + break; + + case 7: + p0 += Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref data, byteOffset)); + byteOffset += 4; + Block(ref p0, ref p1); + goto case 3; + + case 3: + p0 += 0x80000000u | (((uint)(Unsafe.AddByteOffset(ref data, byteOffset + 2))) << 16)| (uint)(Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref data, byteOffset))); + break; + + default: + Debug.Fail("Should not get here."); + break; + } + + Block(ref p0, ref p1); + Block(ref p0, ref p1); + + return (int)(p1 ^ p0); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static void Block(ref uint rp0, ref uint rp1) + { + uint p0 = rp0; + uint p1 = rp1; + + p1 ^= p0; + p0 = _rotl(p0, 20); + + p0 += p1; + p1 = _rotl(p1, 9); + + p1 ^= p0; + p0 = _rotl(p0, 27); + + p0 += p1; + p1 = _rotl(p1, 19); + + rp0 = p0; + rp1 = p1; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static uint _rotl(uint value, int shift) + { + // This is expected to be optimized into a single rol (or ror with negated shift value) instruction + return (value << shift) | (value >> (32 - shift)); + } + + public static ulong DefaultSeed { get; } = GenerateSeed(); + + private static unsafe ulong GenerateSeed() + { +#if MONO + return 12874512; +#else + ulong seed; + Interop.GetRandomBytes((byte*)&seed, sizeof(ulong)); + return seed; +#endif + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/MemberAccessException.cs b/external/corefx/src/Common/src/CoreLib/System/MemberAccessException.cs index dfea52dbed..60f5874378 100644 --- a/external/corefx/src/Common/src/CoreLib/System/MemberAccessException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/MemberAccessException.cs @@ -15,7 +15,9 @@ namespace System // The MemberAccessException is thrown when trying to access a class // member fails. [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class MemberAccessException : SystemException { // Creates a new MemberAccessException with its message string set to diff --git a/external/corefx/src/Common/src/CoreLib/System/Memory.cs b/external/corefx/src/Common/src/CoreLib/System/Memory.cs index 40c4cd9e53..bcabfb857e 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Memory.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Memory.cs @@ -4,6 +4,7 @@ using System.Buffers; using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; #if !MONO @@ -20,36 +21,41 @@ namespace System /// Memory represents a contiguous region of arbitrary memory similar to . /// Unlike , it is not a byref-like type. /// - [DebuggerDisplay("{DebuggerDisplay,nq}")] [DebuggerTypeProxy(typeof(MemoryDebugView<>))] + [DebuggerDisplay("{ToString(),raw}")] public readonly struct Memory { // NOTE: With the current implementation, Memory and ReadOnlyMemory must have the same layout, // as code uses Unsafe.As to cast between them. // The highest order bit of _index is used to discern whether _object is an array/string or an owned memory - // if (_index >> 31) == 1, object _object is an OwnedMemory - // else, object _object is a T[] or a string. It can only be a string if the Memory was created by + // if (_index >> 31) == 1, object _object is an MemoryManager + // else, object _object is a T[] or a string. + // if (_length >> 31) == 1, _object is a pre-pinned array, so Pin() will not allocate a new GCHandle + // else, Pin() needs to allocate a new GCHandle to pin the object. + // It can only be a string if the Memory was created by // using unsafe / marshaling code to reinterpret a ReadOnlyMemory wrapped around a string as // a Memory. private readonly object _object; private readonly int _index; private readonly int _length; - private const int RemoveOwnedFlagBitMask = 0x7FFFFFFF; + private const int RemoveFlagsBitMask = 0x7FFFFFFF; /// /// Creates a new memory over the entirety of the target array. /// /// The target array. - /// Thrown when is a null - /// reference (Nothing in Visual Basic). + /// Returns default when is null. /// Thrown when is covariant and array's type is not exactly T[]. [MethodImpl(MethodImplOptions.AggressiveInlining)] public Memory(T[] array) { if (array == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array); + { + this = default; + return; // returns default + } if (default(T) == null && array.GetType() != typeof(T[])) ThrowHelper.ThrowArrayTypeMismatchException(); @@ -58,6 +64,26 @@ namespace System _length = array.Length; } + [MethodImpl(MethodImplOptions.AggressiveInlining)] + internal Memory(T[] array, int start) + { + if (array == null) + { + if (start != 0) + ThrowHelper.ThrowArgumentOutOfRangeException(); + this = default; + return; // returns default + } + if (default(T) == null && array.GetType() != typeof(T[])) + ThrowHelper.ThrowArrayTypeMismatchException(); + if ((uint)start > (uint)array.Length) + ThrowHelper.ThrowArgumentOutOfRangeException(); + + _object = array; + _index = start; + _length = array.Length - start; + } + /// /// Creates a new memory over the portion of the target array beginning /// at 'start' index and ending at 'end' index (exclusive). @@ -65,8 +91,7 @@ namespace System /// The target array. /// The index at which to begin the memory. /// The number of items in the memory. - /// Thrown when is a null - /// reference (Nothing in Visual Basic). + /// Returns default when is null. /// Thrown when is covariant and array's type is not exactly T[]. /// /// Thrown when the specified or end index is not in the range (<0 or >=Length). @@ -75,7 +100,12 @@ namespace System public Memory(T[] array, int start, int length) { if (array == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array); + { + if (start != 0 || length != 0) + ThrowHelper.ThrowArgumentOutOfRangeException(); + this = default; + return; // returns default + } if (default(T) == null && array.GetType() != typeof(T[])) ThrowHelper.ThrowArrayTypeMismatchException(); if ((uint)start > (uint)array.Length || (uint)length > (uint)(array.Length - start)) @@ -86,34 +116,73 @@ namespace System _length = length; } - // Constructor for internal use only. + /// + /// Creates a new memory from a memory manager that provides specific method implementations beginning + /// at 0 index and ending at 'end' index (exclusive). + /// + /// The memory manager. + /// The number of items in the memory. + /// + /// Thrown when the specified is negative. + /// + /// For internal infrastructure only [MethodImpl(MethodImplOptions.AggressiveInlining)] - internal Memory(OwnedMemory owner, int index, int length) + internal Memory(MemoryManager manager, int length) { - // No validation performed; caller must provide any necessary validation. - _object = owner; - _index = index | (1 << 31); // Before using _index, check if _index < 0, then 'and' it with RemoveOwnedFlagBitMask + Debug.Assert(manager != null); + + if (length < 0) + ThrowHelper.ThrowArgumentOutOfRangeException(); + + _object = manager; + _index = (1 << 31); // Mark as MemoryManager type + // Before using _index, check if _index < 0, then 'and' it with RemoveFlagsBitMask + _length = length; + } + + /// + /// Creates a new memory from a memory manager that provides specific method implementations beginning + /// at 'start' index and ending at 'end' index (exclusive). + /// + /// The memory manager. + /// The index at which to begin the memory. + /// The number of items in the memory. + /// + /// Thrown when the specified or is negative. + /// + /// For internal infrastructure only + [MethodImpl(MethodImplOptions.AggressiveInlining)] + internal Memory(MemoryManager manager, int start, int length) + { + Debug.Assert(manager != null); + + if (length < 0 || start < 0) + ThrowHelper.ThrowArgumentOutOfRangeException(); + + _object = manager; + _index = start | (1 << 31); // Mark as MemoryManager type + // Before using _index, check if _index < 0, then 'and' it with RemoveFlagsBitMask _length = length; } [MethodImpl(MethodImplOptions.AggressiveInlining)] - private Memory(object obj, int index, int length) + internal Memory(object obj, int start, int length) { // No validation performed; caller must provide any necessary validation. _object = obj; - _index = index; + _index = start; _length = length; } /// /// Defines an implicit conversion of an array to a /// - public static implicit operator Memory(T[] array) => (array != null) ? new Memory(array) : default; + public static implicit operator Memory(T[] array) => new Memory(array); /// /// Defines an implicit conversion of a to a /// - public static implicit operator Memory(ArraySegment arraySegment) => new Memory(arraySegment.Array, arraySegment.Offset, arraySegment.Count); + public static implicit operator Memory(ArraySegment segment) => new Memory(segment.Array, segment.Offset, segment.Count); /// /// Defines an implicit conversion of a to a @@ -121,9 +190,6 @@ namespace System public static implicit operator ReadOnlyMemory(Memory memory) => Unsafe.As, ReadOnlyMemory>(ref memory); - //Debugger Display = {T[length]} - private string DebuggerDisplay => string.Format("{{{0}[{1}]}}", typeof(T).Name, _length); - /// /// Returns an empty /// @@ -132,12 +198,25 @@ namespace System /// /// The number of items in the memory. /// - public int Length => _length; + public int Length => _length & RemoveFlagsBitMask; /// /// Returns true if Length is 0. /// - public bool IsEmpty => _length == 0; + public bool IsEmpty => (_length & RemoveFlagsBitMask) == 0; + + /// + /// For , returns a new instance of string that represents the characters pointed to by the memory. + /// Otherwise, returns a with the name of the type and the number of elements. + /// + public override string ToString() + { + if (typeof(T) == typeof(char)) + { + return (_object is string str) ? str.Substring(_index, _length & RemoveFlagsBitMask) : Span.ToString(); + } + return string.Format("System.Memory<{0}>[{1}]", typeof(T).Name, _length & RemoveFlagsBitMask); + } /// /// Forms a slice out of the given memory, beginning at 'start'. @@ -149,12 +228,16 @@ namespace System [MethodImpl(MethodImplOptions.AggressiveInlining)] public Memory Slice(int start) { - if ((uint)start > (uint)_length) + // Used to maintain the high-bit which indicates whether the Memory has been pre-pinned or not. + int capturedLength = _length; + int actualLength = capturedLength & RemoveFlagsBitMask; + if ((uint)start > (uint)actualLength) { ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); } - return new Memory(_object, _index + start, _length - start); + // It is expected for (capturedLength - start) to be negative if the memory is already pre-pinned. + return new Memory(_object, _index + start, capturedLength - start); } /// @@ -168,12 +251,16 @@ namespace System [MethodImpl(MethodImplOptions.AggressiveInlining)] public Memory Slice(int start, int length) { - if ((uint)start > (uint)_length || (uint)length > (uint)(_length - start)) + // Used to maintain the high-bit which indicates whether the Memory has been pre-pinned or not. + int capturedLength = _length; + int actualLength = capturedLength & RemoveFlagsBitMask; + if ((uint)start > (uint)actualLength || (uint)length > (uint)(actualLength - start)) { ThrowHelper.ThrowArgumentOutOfRangeException(); } - return new Memory(_object, _index + start, length); + // Set the high-bit to match the this._length high bit (1 for pre-pinned, 0 for unpinned). + return new Memory(_object, _index + start, length | (capturedLength & ~RemoveFlagsBitMask)); } /// @@ -186,10 +273,13 @@ namespace System { if (_index < 0) { - return ((OwnedMemory)_object).Span.Slice(_index & RemoveOwnedFlagBitMask, _length); + Debug.Assert(_length >= 0); + Debug.Assert(_object != null); + return ((MemoryManager)_object).GetSpan().Slice(_index & RemoveFlagsBitMask, _length); } else if (typeof(T) == typeof(char) && _object is string s) { + Debug.Assert(_length >= 0); // This is dangerous, returning a writable span for a string that should be immutable. // However, we need to handle the case where a ReadOnlyMemory was created from a string // and then cast to a Memory. Such a cast can only be done with unsafe or marshaling code, @@ -203,7 +293,7 @@ namespace System } else if (_object != null) { - return new Span((T[])_object, _index, _length); + return new Span((T[])_object, _index, _length & RemoveFlagsBitMask); } else { @@ -236,77 +326,59 @@ namespace System public bool TryCopyTo(Memory destination) => Span.TryCopyTo(destination.Span); /// - /// Returns a handle for the array. - /// If pin is true, the GC will not move the array and hence its address can be taken + /// Creates a handle for the memory. + /// The GC will not move the memory until the returned + /// is disposed, enabling taking and using the memory's address. + /// + /// An instance with nonprimitive (non-blittable) members cannot be pinned. + /// /// - public unsafe MemoryHandle Retain(bool pin = false) + public unsafe MemoryHandle Pin() { - MemoryHandle memoryHandle = default; - if (pin) + if (_index < 0) { - if (_index < 0) - { - memoryHandle = ((OwnedMemory)_object).Pin((_index & RemoveOwnedFlagBitMask) * Unsafe.SizeOf()); - } - else if (typeof(T) == typeof(char) && _object is string s) - { - // This case can only happen if a ReadOnlyMemory was created around a string - // and then that was cast to a Memory using unsafe / marshaling code. This needs - // to work, however, so that code that uses a single Memory field to store either - // a readable ReadOnlyMemory or a writable Memory can still be pinned and - // used for interop purposes. - GCHandle handle = GCHandle.Alloc(s, GCHandleType.Pinned); + Debug.Assert(_object != null); + return ((MemoryManager)_object).Pin((_index & RemoveFlagsBitMask)); + } + else if (typeof(T) == typeof(char) && _object is string s) + { + // This case can only happen if a ReadOnlyMemory was created around a string + // and then that was cast to a Memory using unsafe / marshaling code. This needs + // to work, however, so that code that uses a single Memory field to store either + // a readable ReadOnlyMemory or a writable Memory can still be pinned and + // used for interop purposes. + GCHandle handle = GCHandle.Alloc(s, GCHandleType.Pinned); #if FEATURE_PORTABLE_SPAN - void* pointer = Unsafe.Add((void*)handle.AddrOfPinnedObject(), _index); + void* pointer = Unsafe.Add((void*)handle.AddrOfPinnedObject(), _index); #else - void* pointer = Unsafe.Add(Unsafe.AsPointer(ref s.GetRawStringData()), _index); + void* pointer = Unsafe.Add(Unsafe.AsPointer(ref s.GetRawStringData()), _index); #endif // FEATURE_PORTABLE_SPAN - memoryHandle = new MemoryHandle(null, pointer, handle); - } - else if (_object is T[] array) + return new MemoryHandle(pointer, handle); + } + else if (_object is T[] array) + { + // Array is already pre-pinned + if (_length < 0) { - var handle = GCHandle.Alloc(array, GCHandleType.Pinned); +#if FEATURE_PORTABLE_SPAN + void* pointer = Unsafe.Add(Unsafe.AsPointer(ref MemoryMarshal.GetReference(array)), _index); +#else + void* pointer = Unsafe.Add(Unsafe.AsPointer(ref array.GetRawSzArrayData()), _index); +#endif // FEATURE_PORTABLE_SPAN + return new MemoryHandle(pointer); + } + else + { + GCHandle handle = GCHandle.Alloc(array, GCHandleType.Pinned); #if FEATURE_PORTABLE_SPAN void* pointer = Unsafe.Add((void*)handle.AddrOfPinnedObject(), _index); #else void* pointer = Unsafe.Add(Unsafe.AsPointer(ref array.GetRawSzArrayData()), _index); #endif // FEATURE_PORTABLE_SPAN - memoryHandle = new MemoryHandle(null, pointer, handle); + return new MemoryHandle(pointer, handle); } } - else - { - if (_index < 0) - { - ((OwnedMemory)_object).Retain(); - memoryHandle = new MemoryHandle((OwnedMemory)_object); - } - } - return memoryHandle; - } - - /// - /// Get an array segment from the underlying memory. - /// If unable to get the array segment, return false with a default array segment. - /// - public bool TryGetArray(out ArraySegment arraySegment) - { - if (_index < 0) - { - if (((OwnedMemory)_object).TryGetArray(out var segment)) - { - arraySegment = new ArraySegment(segment.Array, segment.Offset + (_index & RemoveOwnedFlagBitMask), _length); - return true; - } - } - else if (_object is T[] arr) - { - arraySegment = new ArraySegment(arr, _index, _length); - return true; - } - - arraySegment = default(ArraySegment); - return false; + return default; } /// diff --git a/external/corefx/src/Common/src/CoreLib/System/MemoryDebugView.cs b/external/corefx/src/Common/src/CoreLib/System/MemoryDebugView.cs index fa508b286f..f56a67c636 100644 --- a/external/corefx/src/Common/src/CoreLib/System/MemoryDebugView.cs +++ b/external/corefx/src/Common/src/CoreLib/System/MemoryDebugView.cs @@ -22,31 +22,6 @@ namespace System } [DebuggerBrowsable(DebuggerBrowsableState.RootHidden)] - public T[] Items - { - // This is a work around since we cannot use _memory.ToArray() due to - // https://devdiv.visualstudio.com/DevDiv/_workitems?id=286592 - get - { - if (MemoryMarshal.TryGetArray(_memory, out ArraySegment segment)) - { - T[] array = new T[_memory.Length]; - Array.Copy(segment.Array, segment.Offset, array, 0, array.Length); - return array; - } - - if (typeof(T) == typeof(char) && - ((ReadOnlyMemory)(object)_memory).TryGetString(out string text, out int start, out int length)) - { - return (T[])(object)text.Substring(start, length).ToCharArray(); - } - -#if FEATURE_PORTABLE_SPAN - return SpanHelpers.PerTypeValues.EmptyArray; -#else - return Array.Empty(); -#endif // FEATURE_PORTABLE_SPAN - } - } + public T[] Items => _memory.ToArray(); } } diff --git a/external/corefx/src/Common/src/CoreLib/System/MemoryExtensions.Fast.cs b/external/corefx/src/Common/src/CoreLib/System/MemoryExtensions.Fast.cs new file mode 100644 index 0000000000..c190d3b6b9 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/MemoryExtensions.Fast.cs @@ -0,0 +1,500 @@ +// 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.Private; +using System.Globalization; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +using Internal.Runtime.CompilerServices; + +namespace System +{ + /// + /// Extension methods for Span{T}, Memory{T}, and friends. + /// + public static partial class MemoryExtensions + { + /// + /// Returns a value indicating whether the specified occurs within the . + /// The source span. + /// The value to seek within the source span. + /// One of the enumeration values that determines how the and are compared. + /// + public static bool Contains(this ReadOnlySpan span, ReadOnlySpan value, StringComparison comparisonType) + { + return (IndexOf(span, value, comparisonType) >= 0); + } + + /// + /// Determines whether this and the specified span have the same characters + /// when compared using the specified option. + /// The source span. + /// The value to compare with the source span. + /// One of the enumeration values that determines how the and are compared. + /// + public static bool Equals(this ReadOnlySpan span, ReadOnlySpan other, StringComparison comparisonType) + { + string.CheckStringComparison(comparisonType); + + switch (comparisonType) + { + case StringComparison.CurrentCulture: + return (CultureInfo.CurrentCulture.CompareInfo.CompareOptionNone(span, other) == 0); + + case StringComparison.CurrentCultureIgnoreCase: + return (CultureInfo.CurrentCulture.CompareInfo.CompareOptionIgnoreCase(span, other) == 0); + + case StringComparison.InvariantCulture: + return (CompareInfo.Invariant.CompareOptionNone(span, other) == 0); + + case StringComparison.InvariantCultureIgnoreCase: + return (CompareInfo.Invariant.CompareOptionIgnoreCase(span, other) == 0); + + case StringComparison.Ordinal: + return EqualsOrdinal(span, other); + + case StringComparison.OrdinalIgnoreCase: + return EqualsOrdinalIgnoreCase(span, other); + } + + Debug.Fail("StringComparison outside range"); + return false; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + internal static bool EqualsOrdinal(this ReadOnlySpan span, ReadOnlySpan value) + { + if (span.Length != value.Length) + return false; + if (value.Length == 0) // span.Length == value.Length == 0 + return true; + return span.SequenceEqual(value); //TODO: Optimize - https://github.com/dotnet/corefx/issues/27487 + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + internal static bool EqualsOrdinalIgnoreCase(this ReadOnlySpan span, ReadOnlySpan value) + { + if (span.Length != value.Length) + return false; + if (value.Length == 0) // span.Length == value.Length == 0 + return true; + return (CompareInfo.CompareOrdinalIgnoreCase(span, value) == 0); + } + + // TODO https://github.com/dotnet/corefx/issues/27526 + internal static bool Contains(this ReadOnlySpan source, char value) + { + for (int i = 0; i < source.Length; i++) + { + if (source[i] == value) + { + return true; + } + } + + return false; + } + + /// + /// Compares the specified and using the specified , + /// and returns an integer that indicates their relative position in the sort order. + /// The source span. + /// The value to compare with the source span. + /// One of the enumeration values that determines how the and are compared. + /// + public static int CompareTo(this ReadOnlySpan span, ReadOnlySpan other, StringComparison comparisonType) + { + string.CheckStringComparison(comparisonType); + + switch (comparisonType) + { + case StringComparison.CurrentCulture: + return CultureInfo.CurrentCulture.CompareInfo.CompareOptionNone(span, other); + + case StringComparison.CurrentCultureIgnoreCase: + return CultureInfo.CurrentCulture.CompareInfo.CompareOptionIgnoreCase(span, other); + + case StringComparison.InvariantCulture: + return CompareInfo.Invariant.CompareOptionNone(span, other); + + case StringComparison.InvariantCultureIgnoreCase: + return CompareInfo.Invariant.CompareOptionIgnoreCase(span, other); + + case StringComparison.Ordinal: + if (span.Length == 0 || other.Length == 0) + return span.Length - other.Length; + return string.CompareOrdinal(span, other); + + case StringComparison.OrdinalIgnoreCase: + return CompareInfo.CompareOrdinalIgnoreCase(span, other); + } + + Debug.Fail("StringComparison outside range"); + return 0; + } + + /// + /// Reports the zero-based index of the first occurrence of the specified in the current . + /// The source span. + /// The value to seek within the source span. + /// One of the enumeration values that determines how the and are compared. + /// + public static int IndexOf(this ReadOnlySpan span, ReadOnlySpan value, StringComparison comparisonType) + { + string.CheckStringComparison(comparisonType); + + if (value.Length == 0) + { + return 0; + } + + if (span.Length == 0) + { + return -1; + } + + switch (comparisonType) + { + case StringComparison.CurrentCulture: + return SpanHelpers.IndexOfCultureHelper(span, value, CultureInfo.CurrentCulture.CompareInfo); + + case StringComparison.CurrentCultureIgnoreCase: + return SpanHelpers.IndexOfCultureIgnoreCaseHelper(span, value, CultureInfo.CurrentCulture.CompareInfo); + + case StringComparison.InvariantCulture: + return SpanHelpers.IndexOfCultureHelper(span, value, CompareInfo.Invariant); + + case StringComparison.InvariantCultureIgnoreCase: + return SpanHelpers.IndexOfCultureIgnoreCaseHelper(span, value, CompareInfo.Invariant); + + case StringComparison.Ordinal: + return SpanHelpers.IndexOfOrdinalHelper(span, value, ignoreCase: false); + + case StringComparison.OrdinalIgnoreCase: + return SpanHelpers.IndexOfOrdinalHelper(span, value, ignoreCase: true); + } + + Debug.Fail("StringComparison outside range"); + return -1; + } + + /// + /// Copies the characters from the source span into the destination, converting each character to lowercase, + /// using the casing rules of the specified culture. + /// + /// The source span. + /// The destination span which contains the transformed characters. + /// An object that supplies culture-specific casing rules. + /// If the source and destinations overlap, this method behaves as if the original values are in + /// a temporary location before the destination is overwritten. + /// + /// Thrown when is null. + /// + public static int ToLower(this ReadOnlySpan source, Span destination, CultureInfo culture) + { + if (culture == null) + ThrowHelper.ThrowArgumentNullException(ExceptionArgument.culture); + + // Assuming that changing case does not affect length + if (destination.Length < source.Length) + return -1; + + if (GlobalizationMode.Invariant) + culture.TextInfo.ToLowerAsciiInvariant(source, destination); + else + culture.TextInfo.ChangeCase(source, destination, toUpper: false); + return source.Length; + } + + /// + /// Copies the characters from the source span into the destination, converting each character to lowercase, + /// using the casing rules of the invariant culture. + /// + /// The source span. + /// The destination span which contains the transformed characters. + /// If the source and destinations overlap, this method behaves as if the original values are in + /// a temporary location before the destination is overwritten. + public static int ToLowerInvariant(this ReadOnlySpan source, Span destination) + { + // Assuming that changing case does not affect length + if (destination.Length < source.Length) + return -1; + + if (GlobalizationMode.Invariant) + CultureInfo.InvariantCulture.TextInfo.ToLowerAsciiInvariant(source, destination); + else + CultureInfo.InvariantCulture.TextInfo.ChangeCase(source, destination, toUpper: false); + return source.Length; + } + + /// + /// Copies the characters from the source span into the destination, converting each character to uppercase, + /// using the casing rules of the specified culture. + /// + /// The source span. + /// The destination span which contains the transformed characters. + /// An object that supplies culture-specific casing rules. + /// If the source and destinations overlap, this method behaves as if the original values are in + /// a temporary location before the destination is overwritten. + /// + /// Thrown when is null. + /// + public static int ToUpper(this ReadOnlySpan source, Span destination, CultureInfo culture) + { + if (culture == null) + ThrowHelper.ThrowArgumentNullException(ExceptionArgument.culture); + + // Assuming that changing case does not affect length + if (destination.Length < source.Length) + return -1; + + if (GlobalizationMode.Invariant) + culture.TextInfo.ToUpperAsciiInvariant(source, destination); + else + culture.TextInfo.ChangeCase(source, destination, toUpper: true); + return source.Length; + } + + /// + /// Copies the characters from the source span into the destination, converting each character to uppercase + /// using the casing rules of the invariant culture. + /// + /// The source span. + /// The destination span which contains the transformed characters. + /// If the source and destinations overlap, this method behaves as if the original values are in + /// a temporary location before the destination is overwritten. + public static int ToUpperInvariant(this ReadOnlySpan source, Span destination) + { + // Assuming that changing case does not affect length + if (destination.Length < source.Length) + return -1; + + if (GlobalizationMode.Invariant) + CultureInfo.InvariantCulture.TextInfo.ToUpperAsciiInvariant(source, destination); + else + CultureInfo.InvariantCulture.TextInfo.ChangeCase(source, destination, toUpper: true); + return source.Length; + } + + /// + /// Determines whether the end of the matches the specified when compared using the specified option. + /// + /// The source span. + /// The sequence to compare to the end of the source span. + /// One of the enumeration values that determines how the and are compared. + public static bool EndsWith(this ReadOnlySpan span, ReadOnlySpan value, StringComparison comparisonType) + { + if (value.Length == 0) + { + string.CheckStringComparison(comparisonType); + return true; + } + + switch (comparisonType) + { + case StringComparison.CurrentCulture: + return SpanHelpers.EndsWithCultureHelper(span, value, CultureInfo.CurrentCulture.CompareInfo); + + case StringComparison.CurrentCultureIgnoreCase: + return SpanHelpers.EndsWithCultureIgnoreCaseHelper(span, value, CultureInfo.CurrentCulture.CompareInfo); + + case StringComparison.InvariantCulture: + return SpanHelpers.EndsWithCultureHelper(span, value, CompareInfo.Invariant); + + case StringComparison.InvariantCultureIgnoreCase: + return SpanHelpers.EndsWithCultureIgnoreCaseHelper(span, value, CompareInfo.Invariant); + + case StringComparison.Ordinal: + return span.EndsWith(value); //TODO: Optimize - https://github.com/dotnet/corefx/issues/27487 + + case StringComparison.OrdinalIgnoreCase: + return SpanHelpers.EndsWithOrdinalIgnoreCaseHelper(span, value); + + default: + throw new ArgumentException(SR.NotSupported_StringComparison, nameof(comparisonType)); + } + } + + /// + /// Determines whether the beginning of the matches the specified when compared using the specified option. + /// + /// The source span. + /// The sequence to compare to the beginning of the source span. + /// One of the enumeration values that determines how the and are compared. + public static bool StartsWith(this ReadOnlySpan span, ReadOnlySpan value, StringComparison comparisonType) + { + if (value.Length == 0) + { + string.CheckStringComparison(comparisonType); + return true; + } + + switch (comparisonType) + { + case StringComparison.CurrentCulture: + return SpanHelpers.StartsWithCultureHelper(span, value, CultureInfo.CurrentCulture.CompareInfo); + + case StringComparison.CurrentCultureIgnoreCase: + return SpanHelpers.StartsWithCultureIgnoreCaseHelper(span, value, CultureInfo.CurrentCulture.CompareInfo); + + case StringComparison.InvariantCulture: + return SpanHelpers.StartsWithCultureHelper(span, value, CompareInfo.Invariant); + + case StringComparison.InvariantCultureIgnoreCase: + return SpanHelpers.StartsWithCultureIgnoreCaseHelper(span, value, CompareInfo.Invariant); + + case StringComparison.Ordinal: + return span.StartsWith(value); //TODO: Optimize - https://github.com/dotnet/corefx/issues/27487 + + case StringComparison.OrdinalIgnoreCase: + return SpanHelpers.StartsWithOrdinalIgnoreCaseHelper(span, value); + + default: + throw new ArgumentException(SR.NotSupported_StringComparison, nameof(comparisonType)); + } + } + + /// + /// Creates a new span over the portion of the target array. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Span AsSpan(this T[] array, int start) + { + if (array == null) + { + if (start != 0) + ThrowHelper.ThrowArgumentOutOfRangeException(); + return default; + } + if (default(T) == null && array.GetType() != typeof(T[])) + ThrowHelper.ThrowArrayTypeMismatchException(); + if ((uint)start > (uint)array.Length) + ThrowHelper.ThrowArgumentOutOfRangeException(); + + return new Span(ref Unsafe.Add(ref Unsafe.As(ref array.GetRawSzArrayData()), start), array.Length - start); + } + + /// + /// Creates a new readonly span over the portion of the target string. + /// + /// The target string. + /// Returns default when is null. + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ReadOnlySpan AsSpan(this string text) + { + if (text == null) + return default; + + return new ReadOnlySpan(ref text.GetRawStringData(), text.Length); + } + + /// + /// Creates a new readonly span over the portion of the target string. + /// + /// The target string. + /// The index at which to begin this slice. + /// Thrown when is null. + /// + /// Thrown when the specified index is not in range (<0 or >text.Length). + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ReadOnlySpan AsSpan(this string text, int start) + { + if (text == null) + { + if (start != 0) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); + return default; + } + + if ((uint)start > (uint)text.Length) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); + + return new ReadOnlySpan(ref Unsafe.Add(ref text.GetRawStringData(), start), text.Length - start); + } + + /// + /// Creates a new readonly span over the portion of the target string. + /// + /// The target string. + /// The index at which to begin this slice. + /// The desired length for the slice (exclusive). + /// Returns default when is null. + /// + /// Thrown when the specified index or is not in range. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ReadOnlySpan AsSpan(this string text, int start, int length) + { + if (text == null) + { + if (start != 0 || length != 0) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); + return default; + } + + if ((uint)start > (uint)text.Length || (uint)length > (uint)(text.Length - start)) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); + + return new ReadOnlySpan(ref Unsafe.Add(ref text.GetRawStringData(), start), length); + } + + /// Creates a new over the portion of the target string. + /// The target string. + /// Returns default when is null. + public static ReadOnlyMemory AsMemory(this string text) + { + if (text == null) + return default; + + return new ReadOnlyMemory(text, 0, text.Length); + } + + /// Creates a new over the portion of the target string. + /// The target string. + /// The index at which to begin this slice. + /// Returns default when is null. + /// + /// Thrown when the specified index is not in range (<0 or >text.Length). + /// + public static ReadOnlyMemory AsMemory(this string text, int start) + { + if (text == null) + { + if (start != 0) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); + return default; + } + + if ((uint)start > (uint)text.Length) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); + + return new ReadOnlyMemory(text, start, text.Length - start); + } + + /// Creates a new over the portion of the target string. + /// The target string. + /// The index at which to begin this slice. + /// The desired length for the slice (exclusive). + /// Returns default when is null. + /// + /// Thrown when the specified index or is not in range. + /// + public static ReadOnlyMemory AsMemory(this string text, int start, int length) + { + if (text == null) + { + if (start != 0 || length != 0) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); + return default; + } + + if ((uint)start > (uint)text.Length || (uint)length > (uint)(text.Length - start)) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); + + return new ReadOnlyMemory(text, start, length); + } + } +} diff --git a/external/corefx/src/System.Memory/src/System/MemoryExtensions.cs b/external/corefx/src/Common/src/CoreLib/System/MemoryExtensions.cs similarity index 65% rename from external/corefx/src/System.Memory/src/System/MemoryExtensions.cs rename to external/corefx/src/Common/src/CoreLib/System/MemoryExtensions.cs index d886fd5864..a706b7b685 100644 --- a/external/corefx/src/System.Memory/src/System/MemoryExtensions.cs +++ b/external/corefx/src/Common/src/CoreLib/System/MemoryExtensions.cs @@ -10,6 +10,16 @@ using System.Runtime.InteropServices; using Internal.Runtime.CompilerServices; #endif +#if netstandard +using nuint = System.NUInt; +#else +#if BIT64 +using nuint = System.UInt64; +#else +using nuint = System.UInt32; +#endif // BIT64 +#endif // netstandard + namespace System { /// @@ -17,6 +27,167 @@ namespace System /// public static partial class MemoryExtensions { + /// + /// Removes all leading and trailing white-space characters from the span. + /// + public static ReadOnlySpan Trim(this ReadOnlySpan span) + { + return span.TrimStart().TrimEnd(); + } + + /// + /// Removes all leading white-space characters from the span. + /// + public static ReadOnlySpan TrimStart(this ReadOnlySpan span) + { + int start = 0; + for (; start < span.Length; start++) + { + if (!char.IsWhiteSpace(span[start])) + break; + } + return span.Slice(start); + } + + /// + /// Removes all trailing white-space characters from the span. + /// + public static ReadOnlySpan TrimEnd(this ReadOnlySpan span) + { + int end = span.Length - 1; + for (; end >= 0; end--) + { + if (!char.IsWhiteSpace(span[end])) + break; + } + return span.Slice(0, end + 1); + } + + /// + /// Removes all leading and trailing occurrences of a specified character. + /// + /// The source span from which the character is removed. + /// The specified character to look for and remove. + public static ReadOnlySpan Trim(this ReadOnlySpan span, char trimChar) + { + return span.TrimStart(trimChar).TrimEnd(trimChar); + } + + /// + /// Removes all leading occurrences of a specified character. + /// + /// The source span from which the character is removed. + /// The specified character to look for and remove. + public static ReadOnlySpan TrimStart(this ReadOnlySpan span, char trimChar) + { + int start = 0; + for (; start < span.Length; start++) + { + if (span[start] != trimChar) + break; + } + return span.Slice(start); + } + + /// + /// Removes all trailing occurrences of a specified character. + /// + /// The source span from which the character is removed. + /// The specified character to look for and remove. + public static ReadOnlySpan TrimEnd(this ReadOnlySpan span, char trimChar) + { + int end = span.Length - 1; + for (; end >= 0; end--) + { + if (span[end] != trimChar) + break; + } + return span.Slice(0, end + 1); + } + + /// + /// Removes all leading and trailing occurrences of a set of characters specified + /// in a readonly span from the span. + /// + /// The source span from which the characters are removed. + /// The span which contains the set of characters to remove. + /// If is empty, white-space characters are removed instead. + public static ReadOnlySpan Trim(this ReadOnlySpan span, ReadOnlySpan trimChars) + { + return span.TrimStart(trimChars).TrimEnd(trimChars); + } + + /// + /// Removes all leading occurrences of a set of characters specified + /// in a readonly span from the span. + /// + /// The source span from which the characters are removed. + /// The span which contains the set of characters to remove. + /// If is empty, white-space characters are removed instead. + public static ReadOnlySpan TrimStart(this ReadOnlySpan span, ReadOnlySpan trimChars) + { + if (trimChars.IsEmpty) + { + return span.TrimStart(); + } + + int start = 0; + for (; start < span.Length; start++) + { + for (int i = 0; i < trimChars.Length; i++) + { + if (span[start] == trimChars[i]) + goto Next; + } + break; + Next: + ; + } + return span.Slice(start); + } + + /// + /// Removes all trailing occurrences of a set of characters specified + /// in a readonly span from the span. + /// + /// The source span from which the characters are removed. + /// The span which contains the set of characters to remove. + /// If is empty, white-space characters are removed instead. + public static ReadOnlySpan TrimEnd(this ReadOnlySpan span, ReadOnlySpan trimChars) + { + if (trimChars.IsEmpty) + { + return span.TrimEnd(); + } + + int end = span.Length - 1; + for (; end >= 0; end--) + { + for (int i = 0; i < trimChars.Length; i++) + { + if (span[end] == trimChars[i]) + goto Next; + } + break; + Next: + ; + } + return span.Slice(0, end + 1); + } + + /// + /// Indicates whether the specified span contains only white-space characters. + /// + public static bool IsWhiteSpace(this ReadOnlySpan span) + { + for (int i = 0; i < span.Length; i++) + { + if (!char.IsWhiteSpace(span[i])) + return false; + } + return true; + } + /// /// Searches for the specified value and returns the index of its first occurrence. If not found, returns -1. Values are compared using IEquatable{T}.Equals(T). /// @@ -31,7 +202,13 @@ namespace System ref Unsafe.As(ref MemoryMarshal.GetReference(span)), Unsafe.As(ref value), span.Length); - return SpanHelpers.IndexOf(ref MemoryMarshal.GetReference(span), value, span.Length); + if (typeof(T) == typeof(char)) + return SpanHelpers.IndexOf( + ref Unsafe.As(ref MemoryMarshal.GetReference(span)), + Unsafe.As(ref value), + span.Length); + + return SpanHelpers.IndexOf(ref MemoryMarshal.GetReference(span), value, span.Length); } /// @@ -49,7 +226,8 @@ namespace System span.Length, ref Unsafe.As(ref MemoryMarshal.GetReference(value)), value.Length); - return SpanHelpers.IndexOf(ref MemoryMarshal.GetReference(span), span.Length, ref MemoryMarshal.GetReference(value), value.Length); + + return SpanHelpers.IndexOf(ref MemoryMarshal.GetReference(span), span.Length, ref MemoryMarshal.GetReference(value), value.Length); } /// @@ -66,6 +244,12 @@ namespace System ref Unsafe.As(ref MemoryMarshal.GetReference(span)), Unsafe.As(ref value), span.Length); + if (typeof(T) == typeof(char)) + return SpanHelpers.LastIndexOf( + ref Unsafe.As(ref MemoryMarshal.GetReference(span)), + Unsafe.As(ref value), + span.Length); + return SpanHelpers.LastIndexOf(ref MemoryMarshal.GetReference(span), value, span.Length); } @@ -84,6 +268,7 @@ namespace System span.Length, ref Unsafe.As(ref MemoryMarshal.GetReference(value)), value.Length); + return SpanHelpers.LastIndexOf(ref MemoryMarshal.GetReference(span), span.Length, ref MemoryMarshal.GetReference(value), value.Length); } @@ -91,50 +276,42 @@ namespace System /// Determines whether two sequences are equal by comparing the elements using IEquatable{T}.Equals(T). /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool SequenceEqual(this Span first, ReadOnlySpan second) + public static bool SequenceEqual(this Span span, ReadOnlySpan other) where T : IEquatable { - int length = first.Length; - if (typeof(T) == typeof(byte)) - return length == second.Length && + int length = span.Length; + + if (default(T) != null && IsTypeComparableAsBytes(out nuint size)) + return length == other.Length && SpanHelpers.SequenceEqual( - ref Unsafe.As(ref MemoryMarshal.GetReference(first)), - ref Unsafe.As(ref MemoryMarshal.GetReference(second)), - length); - return length == second.Length && SpanHelpers.SequenceEqual(ref MemoryMarshal.GetReference(first), ref MemoryMarshal.GetReference(second), length); + ref Unsafe.As(ref MemoryMarshal.GetReference(span)), + ref Unsafe.As(ref MemoryMarshal.GetReference(other)), + ((nuint)length) * size); // If this multiplication overflows, the Span we got overflows the entire address range. There's no happy outcome for this api in such a case so we choose not to take the overhead of checking. + + return length == other.Length && SpanHelpers.SequenceEqual(ref MemoryMarshal.GetReference(span), ref MemoryMarshal.GetReference(other), length); } /// /// Determines the relative order of the sequences being compared by comparing the elements using IComparable{T}.CompareTo(T). /// - public static int SequenceCompareTo(this Span first, ReadOnlySpan second) + public static int SequenceCompareTo(this Span span, ReadOnlySpan other) where T : IComparable { if (typeof(T) == typeof(byte)) return SpanHelpers.SequenceCompareTo( - ref Unsafe.As(ref MemoryMarshal.GetReference(first)), - first.Length, - ref Unsafe.As(ref MemoryMarshal.GetReference(second)), - second.Length); - return SpanHelpers.SequenceCompareTo(ref MemoryMarshal.GetReference(first), first.Length, ref MemoryMarshal.GetReference(second), second.Length); - } + ref Unsafe.As(ref MemoryMarshal.GetReference(span)), + span.Length, + ref Unsafe.As(ref MemoryMarshal.GetReference(other)), + other.Length); - /// - /// Reverses the sequence of the elements in the entire span. - /// - public static void Reverse(this Span span) - { - ref T p = ref MemoryMarshal.GetReference(span); - int i = 0; - int j = span.Length - 1; - while (i < j) - { - T temp = Unsafe.Add(ref p, i); - Unsafe.Add(ref p, i) = Unsafe.Add(ref p, j); - Unsafe.Add(ref p, j) = temp; - i++; - j--; - } + if (typeof(T) == typeof(char)) + return SpanHelpers.SequenceCompareTo( + ref Unsafe.As(ref MemoryMarshal.GetReference(span)), + span.Length, + ref Unsafe.As(ref MemoryMarshal.GetReference(other)), + other.Length); + + return SpanHelpers.SequenceCompareTo(ref MemoryMarshal.GetReference(span), span.Length, ref MemoryMarshal.GetReference(other), other.Length); } /// @@ -151,7 +328,13 @@ namespace System ref Unsafe.As(ref MemoryMarshal.GetReference(span)), Unsafe.As(ref value), span.Length); - return SpanHelpers.IndexOf(ref MemoryMarshal.GetReference(span), value, span.Length); + if (typeof(T) == typeof(char)) + return SpanHelpers.IndexOf( + ref Unsafe.As(ref MemoryMarshal.GetReference(span)), + Unsafe.As(ref value), + span.Length); + + return SpanHelpers.IndexOf(ref MemoryMarshal.GetReference(span), value, span.Length); } /// @@ -169,7 +352,8 @@ namespace System span.Length, ref Unsafe.As(ref MemoryMarshal.GetReference(value)), value.Length); - return SpanHelpers.IndexOf(ref MemoryMarshal.GetReference(span), span.Length, ref MemoryMarshal.GetReference(value), value.Length); + + return SpanHelpers.IndexOf(ref MemoryMarshal.GetReference(span), span.Length, ref MemoryMarshal.GetReference(value), value.Length); } /// @@ -186,6 +370,12 @@ namespace System ref Unsafe.As(ref MemoryMarshal.GetReference(span)), Unsafe.As(ref value), span.Length); + if (typeof(T) == typeof(char)) + return SpanHelpers.LastIndexOf( + ref Unsafe.As(ref MemoryMarshal.GetReference(span)), + Unsafe.As(ref value), + span.Length); + return SpanHelpers.LastIndexOf(ref MemoryMarshal.GetReference(span), value, span.Length); } @@ -204,6 +394,7 @@ namespace System span.Length, ref Unsafe.As(ref MemoryMarshal.GetReference(value)), value.Length); + return SpanHelpers.LastIndexOf(ref MemoryMarshal.GetReference(span), span.Length, ref MemoryMarshal.GetReference(value), value.Length); } @@ -345,6 +536,7 @@ namespace System Unsafe.As(ref value0), Unsafe.As(ref value1), span.Length); + return SpanHelpers.LastIndexOfAny(ref MemoryMarshal.GetReference(span), value0, value1, span.Length); } @@ -366,6 +558,7 @@ namespace System Unsafe.As(ref value1), Unsafe.As(ref value2), span.Length); + return SpanHelpers.LastIndexOfAny(ref MemoryMarshal.GetReference(span), value0, value1, value2, span.Length); } @@ -384,6 +577,7 @@ namespace System span.Length, ref Unsafe.As(ref MemoryMarshal.GetReference(values)), values.Length); + return SpanHelpers.LastIndexOfAny(ref MemoryMarshal.GetReference(span), span.Length, ref MemoryMarshal.GetReference(values), values.Length); } @@ -403,6 +597,7 @@ namespace System Unsafe.As(ref value0), Unsafe.As(ref value1), span.Length); + return SpanHelpers.LastIndexOfAny(ref MemoryMarshal.GetReference(span), value0, value1, span.Length); } @@ -424,6 +619,7 @@ namespace System Unsafe.As(ref value1), Unsafe.As(ref value2), span.Length); + return SpanHelpers.LastIndexOfAny(ref MemoryMarshal.GetReference(span), value0, value1, value2, span.Length); } @@ -442,6 +638,7 @@ namespace System span.Length, ref Unsafe.As(ref MemoryMarshal.GetReference(values)), values.Length); + return SpanHelpers.LastIndexOfAny(ref MemoryMarshal.GetReference(span), span.Length, ref MemoryMarshal.GetReference(values), values.Length); } @@ -449,32 +646,42 @@ namespace System /// Determines whether two sequences are equal by comparing the elements using IEquatable{T}.Equals(T). /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool SequenceEqual(this ReadOnlySpan first, ReadOnlySpan second) + public static bool SequenceEqual(this ReadOnlySpan span, ReadOnlySpan other) where T : IEquatable { - int length = first.Length; - if (typeof(T) == typeof(byte)) - return length == second.Length && + int length = span.Length; + if (default(T) != null && IsTypeComparableAsBytes(out nuint size)) + return length == other.Length && SpanHelpers.SequenceEqual( - ref Unsafe.As(ref MemoryMarshal.GetReference(first)), - ref Unsafe.As(ref MemoryMarshal.GetReference(second)), - length); - return length == second.Length && SpanHelpers.SequenceEqual(ref MemoryMarshal.GetReference(first), ref MemoryMarshal.GetReference(second), length); + ref Unsafe.As(ref MemoryMarshal.GetReference(span)), + ref Unsafe.As(ref MemoryMarshal.GetReference(other)), + ((nuint)length) * size); // If this multiplication overflows, the Span we got overflows the entire address range. There's no happy outcome for this api in such a case so we choose not to take the overhead of checking. + + return length == other.Length && SpanHelpers.SequenceEqual(ref MemoryMarshal.GetReference(span), ref MemoryMarshal.GetReference(other), length); } /// /// Determines the relative order of the sequences being compared by comparing the elements using IComparable{T}.CompareTo(T). /// - public static int SequenceCompareTo(this ReadOnlySpan first, ReadOnlySpan second) + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static int SequenceCompareTo(this ReadOnlySpan span, ReadOnlySpan other) where T : IComparable { if (typeof(T) == typeof(byte)) return SpanHelpers.SequenceCompareTo( - ref Unsafe.As(ref MemoryMarshal.GetReference(first)), - first.Length, - ref Unsafe.As(ref MemoryMarshal.GetReference(second)), - second.Length); - return SpanHelpers.SequenceCompareTo(ref MemoryMarshal.GetReference(first), first.Length, ref MemoryMarshal.GetReference(second), second.Length); + ref Unsafe.As(ref MemoryMarshal.GetReference(span)), + span.Length, + ref Unsafe.As(ref MemoryMarshal.GetReference(other)), + other.Length); + + if (typeof(T) == typeof(char)) + return SpanHelpers.SequenceCompareTo( + ref Unsafe.As(ref MemoryMarshal.GetReference(span)), + span.Length, + ref Unsafe.As(ref MemoryMarshal.GetReference(other)), + other.Length); + + return SpanHelpers.SequenceCompareTo(ref MemoryMarshal.GetReference(span), span.Length, ref MemoryMarshal.GetReference(other), other.Length); } /// @@ -485,12 +692,13 @@ namespace System where T : IEquatable { int valueLength = value.Length; - if (typeof(T) == typeof(byte)) + if (default(T) != null && IsTypeComparableAsBytes(out nuint size)) return valueLength <= span.Length && SpanHelpers.SequenceEqual( ref Unsafe.As(ref MemoryMarshal.GetReference(span)), ref Unsafe.As(ref MemoryMarshal.GetReference(value)), - valueLength); + ((nuint)valueLength) * size); // If this multiplication overflows, the Span we got overflows the entire address range. There's no happy outcome for this api in such a case so we choose not to take the overhead of checking. + return valueLength <= span.Length && SpanHelpers.SequenceEqual(ref MemoryMarshal.GetReference(span), ref MemoryMarshal.GetReference(value), valueLength); } @@ -502,12 +710,13 @@ namespace System where T : IEquatable { int valueLength = value.Length; - if (typeof(T) == typeof(byte)) + if (default(T) != null && IsTypeComparableAsBytes(out nuint size)) return valueLength <= span.Length && SpanHelpers.SequenceEqual( ref Unsafe.As(ref MemoryMarshal.GetReference(span)), ref Unsafe.As(ref MemoryMarshal.GetReference(value)), - valueLength); + ((nuint)valueLength) * size); // If this multiplication overflows, the Span we got overflows the entire address range. There's no happy outcome for this api in such a case so we choose not to take the overhead of checking. + return valueLength <= span.Length && SpanHelpers.SequenceEqual(ref MemoryMarshal.GetReference(span), ref MemoryMarshal.GetReference(value), valueLength); } @@ -520,12 +729,13 @@ namespace System { int spanLength = span.Length; int valueLength = value.Length; - if (typeof(T) == typeof(byte)) + if (default(T) != null && IsTypeComparableAsBytes(out nuint size)) return valueLength <= spanLength && SpanHelpers.SequenceEqual( ref Unsafe.As(ref Unsafe.Add(ref MemoryMarshal.GetReference(span), spanLength - valueLength)), ref Unsafe.As(ref MemoryMarshal.GetReference(value)), - valueLength); + ((nuint)valueLength) * size); // If this multiplication overflows, the Span we got overflows the entire address range. There's no happy outcome for this api in such a case so we choose not to take the overhead of checking. + return valueLength <= spanLength && SpanHelpers.SequenceEqual( ref Unsafe.Add(ref MemoryMarshal.GetReference(span), spanLength - valueLength), @@ -542,12 +752,13 @@ namespace System { int spanLength = span.Length; int valueLength = value.Length; - if (typeof(T) == typeof(byte)) + if (default(T) != null && IsTypeComparableAsBytes(out nuint size)) return valueLength <= spanLength && SpanHelpers.SequenceEqual( ref Unsafe.As(ref Unsafe.Add(ref MemoryMarshal.GetReference(span), spanLength - valueLength)), ref Unsafe.As(ref MemoryMarshal.GetReference(value)), - valueLength); + ((nuint)valueLength) * size); // If this multiplication overflows, the Span we got overflows the entire address range. There's no happy outcome for this api in such a case so we choose not to take the overhead of checking. + return valueLength <= spanLength && SpanHelpers.SequenceEqual( ref Unsafe.Add(ref MemoryMarshal.GetReference(span), spanLength - valueLength), @@ -556,7 +767,25 @@ namespace System } /// - /// Creates a new span over the portion of the target array. + /// Reverses the sequence of the elements in the entire span. + /// + public static void Reverse(this Span span) + { + ref T p = ref MemoryMarshal.GetReference(span); + int i = 0; + int j = span.Length - 1; + while (i < j) + { + T temp = Unsafe.Add(ref p, i); + Unsafe.Add(ref p, i) = Unsafe.Add(ref p, j); + Unsafe.Add(ref p, j) = temp; + i++; + j--; + } + } + + /// + /// Creates a new span over the target array. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Span AsSpan(this T[] array) @@ -565,57 +794,168 @@ namespace System } /// - /// Creates a new span over the portion of the target array segment. + /// Creates a new Span over the portion of the target array beginning + /// at 'start' index and ending at 'end' index (exclusive). /// + /// The target array. + /// The index at which to begin the Span. + /// The number of items in the Span. + /// Returns default when is null. + /// Thrown when is covariant and array's type is not exactly T[]. + /// + /// Thrown when the specified or end index is not in the range (<0 or >=Length). + /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static Span AsSpan(this ArraySegment arraySegment) + public static Span AsSpan(this T[] array, int start, int length) { - return new Span(arraySegment.Array, arraySegment.Offset, arraySegment.Count); + return new Span(array, start, length); } /// - /// Creates a new readonly span over the entire target array. + /// Creates a new span over the portion of the target array segment. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ReadOnlySpan AsReadOnlySpan(this T[] array) + public static Span AsSpan(this ArraySegment segment) { - return new ReadOnlySpan(array); + return new Span(segment.Array, segment.Offset, segment.Count); } /// - /// Creates a new readonly span over the entire target span. - /// - public static ReadOnlySpan AsReadOnlySpan(this Span span) => span; - - /// - /// Creates a new readonly span over the target array segment. + /// Creates a new Span over the portion of the target array beginning + /// at 'start' index and ending at 'end' index (exclusive). /// + /// The target array. + /// The index at which to begin the Span. + /// Returns default when is null. + /// Thrown when is covariant and array's type is not exactly T[]. + /// + /// Thrown when the specified or end index is not in the range (<0 or >=segment.Count). + /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ReadOnlySpan AsReadOnlySpan(this ArraySegment arraySegment) + public static Span AsSpan(this ArraySegment segment, int start) { - return new ReadOnlySpan(arraySegment.Array, arraySegment.Offset, arraySegment.Count); + if (((uint)start) > segment.Count) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); + + return new Span(segment.Array, segment.Offset + start, segment.Count - start); } /// - /// Creates a new readonly memory over the entire target memory. + /// Creates a new Span over the portion of the target array beginning + /// at 'start' index and ending at 'end' index (exclusive). /// - public static ReadOnlyMemory AsReadOnlyMemory(this Memory memory) => memory; + /// The target array. + /// The index at which to begin the Span. + /// The number of items in the Span. + /// Returns default when is null. + /// Thrown when is covariant and array's type is not exactly T[]. + /// + /// Thrown when the specified or end index is not in the range (<0 or >=segment.Count). + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Span AsSpan(this ArraySegment segment, int start, int length) + { + if (((uint)start) > segment.Count) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); + if (((uint)length) > segment.Count - start) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.length); + + return new Span(segment.Array, segment.Offset + start, length); + } + + /// + /// Creates a new memory over the target array. + /// + public static Memory AsMemory(this T[] array) => new Memory(array); + + /// + /// Creates a new memory over the portion of the target array beginning + /// at 'start' index and ending at 'end' index (exclusive). + /// + /// The target array. + /// The index at which to begin the memory. + /// Returns default when is null. + /// Thrown when is covariant and array's type is not exactly T[]. + /// + /// Thrown when the specified or end index is not in the range (<0 or >=array.Length). + /// + public static Memory AsMemory(this T[] array, int start) => new Memory(array, start); + + /// + /// Creates a new memory over the portion of the target array beginning + /// at 'start' index and ending at 'end' index (exclusive). + /// + /// The target array. + /// The index at which to begin the memory. + /// The number of items in the memory. + /// Returns default when is null. + /// Thrown when is covariant and array's type is not exactly T[]. + /// + /// Thrown when the specified or end index is not in the range (<0 or >=Length). + /// + public static Memory AsMemory(this T[] array, int start, int length) => new Memory(array, start, length); + + /// + /// Creates a new memory over the portion of the target array. + /// + public static Memory AsMemory(this ArraySegment segment) => new Memory(segment.Array, segment.Offset, segment.Count); + + /// + /// Creates a new memory over the portion of the target array beginning + /// at 'start' index and ending at 'end' index (exclusive). + /// + /// The target array. + /// The index at which to begin the memory. + /// Returns default when is null. + /// Thrown when is covariant and array's type is not exactly T[]. + /// + /// Thrown when the specified or end index is not in the range (<0 or >=segment.Count). + /// + public static Memory AsMemory(this ArraySegment segment, int start) + { + if (((uint)start) > segment.Count) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); + + return new Memory(segment.Array, segment.Offset + start, segment.Count - start); + } + + /// + /// Creates a new memory over the portion of the target array beginning + /// at 'start' index and ending at 'end' index (exclusive). + /// + /// The target array. + /// The index at which to begin the memory. + /// The number of items in the memory. + /// Returns default when is null. + /// Thrown when is covariant and array's type is not exactly T[]. + /// + /// Thrown when the specified or end index is not in the range (<0 or >=segment.Count). + /// + public static Memory AsMemory(this ArraySegment segment, int start, int length) + { + if (((uint)start) > segment.Count) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); + if (((uint)length) > segment.Count - start) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.length); + + return new Memory(segment.Array, segment.Offset + start, length); + } /// /// Copies the contents of the array into the span. If the source /// and destinations overlap, this method behaves as if the original values in /// a temporary location before the destination is overwritten. /// - ///The array to copy items from. + ///The array to copy items from. /// The span to copy items into. /// /// Thrown when the destination Span is shorter than the source array. /// /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void CopyTo(this T[] array, Span destination) + public static void CopyTo(this T[] source, Span destination) { - new ReadOnlySpan(array).CopyTo(destination); + new ReadOnlySpan(source).CopyTo(destination); } /// @@ -623,16 +963,16 @@ namespace System /// and destinations overlap, this method behaves as if the original values are in /// a temporary location before the destination is overwritten. /// - ///The array to copy items from. + ///The array to copy items from. /// The memory to copy items into. /// /// Thrown when the destination is shorter than the source array. /// /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void CopyTo(this T[] array, Memory destination) + public static void CopyTo(this T[] source, Memory destination) { - array.CopyTo(destination.Span); + source.CopyTo(destination.Span); } // @@ -686,10 +1026,10 @@ namespace System // // Let's say there are two sequences, x and y. Let // - // ref T xRef = MemoryMarshal.GetReference(x) - // uint xLength = x.Length * Unsafe.SizeOf() - // ref T yRef = MemoryMarshal.GetReference(y) - // uint yLength = y.Length * Unsafe.SizeOf() + // ref T xRef = MemoryMarshal.GetReference(x) + // uint xLength = x.Length * Unsafe.SizeOf() + // ref T yRef = MemoryMarshal.GetReference(y) + // uint yLength = y.Length * Unsafe.SizeOf() // // Visually, the two sequences are located somewhere in the 32-bit // address space as follows: @@ -745,18 +1085,18 @@ namespace System // // After substituting x2 and y2 with their respective definition: // - // == (y1 < xLength) || (y1 + yLength > 2³²) + // == (y1 < xLength) || (y1 + yLength > 2³²) // // Since yLength can't be greater than the size of the address space, // the overflow can be avoided as follows: // - // == (y1 < xLength) || (y1 > 2³² - yLength) + // == (y1 < xLength) || (y1 > 2³² - yLength) // // However, 2³² cannot be stored in an unsigned 32-bit integer, so one // more change is needed to keep doing everything with unsigned 32-bit // integers: // - // == (y1 < xLength) || (y1 > -yLength) + // == (y1 < xLength) || (y1 > -yLength) // // Due to modulo arithmetic, this gives exactly same result *except* if // yLength is zero, since 2³² - 0 is 0 and not 2³². So the case @@ -767,65 +1107,65 @@ namespace System /// Determines whether two sequences overlap in memory. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool Overlaps(this Span first, ReadOnlySpan second) + public static bool Overlaps(this Span span, ReadOnlySpan other) { - return Overlaps((ReadOnlySpan)first, second); + return Overlaps((ReadOnlySpan)span, other); } /// /// Determines whether two sequences overlap in memory and outputs the element offset. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool Overlaps(this Span first, ReadOnlySpan second, out int elementOffset) + public static bool Overlaps(this Span span, ReadOnlySpan other, out int elementOffset) { - return Overlaps((ReadOnlySpan)first, second, out elementOffset); + return Overlaps((ReadOnlySpan)span, other, out elementOffset); } /// /// Determines whether two sequences overlap in memory. /// - public static bool Overlaps(this ReadOnlySpan first, ReadOnlySpan second) + public static bool Overlaps(this ReadOnlySpan span, ReadOnlySpan other) { - if (first.IsEmpty || second.IsEmpty) + if (span.IsEmpty || other.IsEmpty) { return false; } IntPtr byteOffset = Unsafe.ByteOffset( - ref MemoryMarshal.GetReference(first), - ref MemoryMarshal.GetReference(second)); + ref MemoryMarshal.GetReference(span), + ref MemoryMarshal.GetReference(other)); if (Unsafe.SizeOf() == sizeof(int)) { - return (uint)byteOffset < (uint)(first.Length * Unsafe.SizeOf()) || - (uint)byteOffset > (uint)-(second.Length * Unsafe.SizeOf()); + return (uint)byteOffset < (uint)(span.Length * Unsafe.SizeOf()) || + (uint)byteOffset > (uint)-(other.Length * Unsafe.SizeOf()); } else { - return (ulong)byteOffset < (ulong)((long)first.Length * Unsafe.SizeOf()) || - (ulong)byteOffset > (ulong)-((long)second.Length * Unsafe.SizeOf()); + return (ulong)byteOffset < (ulong)((long)span.Length * Unsafe.SizeOf()) || + (ulong)byteOffset > (ulong)-((long)other.Length * Unsafe.SizeOf()); } } /// /// Determines whether two sequences overlap in memory and outputs the element offset. /// - public static bool Overlaps(this ReadOnlySpan first, ReadOnlySpan second, out int elementOffset) + public static bool Overlaps(this ReadOnlySpan span, ReadOnlySpan other, out int elementOffset) { - if (first.IsEmpty || second.IsEmpty) + if (span.IsEmpty || other.IsEmpty) { elementOffset = 0; return false; } IntPtr byteOffset = Unsafe.ByteOffset( - ref MemoryMarshal.GetReference(first), - ref MemoryMarshal.GetReference(second)); + ref MemoryMarshal.GetReference(span), + ref MemoryMarshal.GetReference(other)); if (Unsafe.SizeOf() == sizeof(int)) { - if ((uint)byteOffset < (uint)(first.Length * Unsafe.SizeOf()) || - (uint)byteOffset > (uint)-(second.Length * Unsafe.SizeOf())) + if ((uint)byteOffset < (uint)(span.Length * Unsafe.SizeOf()) || + (uint)byteOffset > (uint)-(other.Length * Unsafe.SizeOf())) { if ((int)byteOffset % Unsafe.SizeOf() != 0) ThrowHelper.ThrowArgumentException_OverlapAlignmentMismatch(); @@ -841,8 +1181,8 @@ namespace System } else { - if ((ulong)byteOffset < (ulong)((long)first.Length * Unsafe.SizeOf()) || - (ulong)byteOffset > (ulong)-((long)second.Length * Unsafe.SizeOf())) + if ((ulong)byteOffset < (ulong)((long)span.Length * Unsafe.SizeOf()) || + (ulong)byteOffset > (ulong)-((long)other.Length * Unsafe.SizeOf())) { if ((long)byteOffset % Unsafe.SizeOf() != 0) ThrowHelper.ThrowArgumentException_OverlapAlignmentMismatch(); @@ -872,7 +1212,7 @@ namespace System /// no larger element, the bitwise complement of . /// /// - /// is . + /// is . /// [MethodImpl(MethodImplOptions.AggressiveInlining)] public static int BinarySearch( @@ -896,7 +1236,7 @@ namespace System /// no larger element, the bitwise complement of . /// /// - /// is . + /// is . /// [MethodImpl(MethodImplOptions.AggressiveInlining)] public static int BinarySearch( @@ -922,7 +1262,7 @@ namespace System /// no larger element, the bitwise complement of . /// /// - /// is . + /// is . /// [MethodImpl(MethodImplOptions.AggressiveInlining)] public static int BinarySearch( @@ -946,7 +1286,7 @@ namespace System /// no larger element, the bitwise complement of . /// /// - /// is . + /// is . /// [MethodImpl(MethodImplOptions.AggressiveInlining)] public static int BinarySearch( @@ -970,7 +1310,7 @@ namespace System /// no larger element, the bitwise complement of . /// /// - /// is . + /// is . /// [MethodImpl(MethodImplOptions.AggressiveInlining)] public static int BinarySearch( @@ -996,7 +1336,7 @@ namespace System /// no larger element, the bitwise complement of . /// /// - /// is . + /// is . /// [MethodImpl(MethodImplOptions.AggressiveInlining)] public static int BinarySearch( @@ -1010,5 +1350,36 @@ namespace System value, comparer); return BinarySearch(span, comparable); } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static bool IsTypeComparableAsBytes(out nuint size) + { + if (typeof(T) == typeof(byte) || typeof(T) == typeof(sbyte)) + { + size = (nuint)sizeof(byte); + return true; + } + + if (typeof(T) == typeof(char) || typeof(T) == typeof(short) || typeof(T) == typeof(ushort)) + { + size = (nuint)sizeof(char); + return true; + } + + if (typeof(T) == typeof(int) || typeof(T) == typeof(uint)) + { + size = (nuint)sizeof(int); + return true; + } + + if (typeof(T) == typeof(long) || typeof(T) == typeof(ulong)) + { + size = (nuint)sizeof(long); + return true; + } + + size = default; + return false; + } } } diff --git a/external/corefx/src/Common/src/CoreLib/System/MethodAccessException.cs b/external/corefx/src/Common/src/CoreLib/System/MethodAccessException.cs index 1ca0297b94..d74423ae17 100644 --- a/external/corefx/src/Common/src/CoreLib/System/MethodAccessException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/MethodAccessException.cs @@ -14,7 +14,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class MethodAccessException : MemberAccessException { public MethodAccessException() diff --git a/external/corefx/src/Common/src/CoreLib/System/MissingMethodException.cs b/external/corefx/src/Common/src/CoreLib/System/MissingMethodException.cs index abb6c0e97b..cb00c45447 100644 --- a/external/corefx/src/Common/src/CoreLib/System/MissingMethodException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/MissingMethodException.cs @@ -16,7 +16,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class MissingMethodException : MissingMemberException { public MissingMethodException() diff --git a/external/corefx/src/Common/src/CoreLib/System/MulticastNotSupportedException.cs b/external/corefx/src/Common/src/CoreLib/System/MulticastNotSupportedException.cs index cc6c77023e..ce6b3532d4 100644 --- a/external/corefx/src/Common/src/CoreLib/System/MulticastNotSupportedException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/MulticastNotSupportedException.cs @@ -12,7 +12,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public sealed class MulticastNotSupportedException : SystemException { public MulticastNotSupportedException() diff --git a/external/corefx/src/Common/src/CoreLib/System/NotFiniteNumberException.cs b/external/corefx/src/Common/src/CoreLib/System/NotFiniteNumberException.cs index b9c9af06d3..095d5bc6d3 100644 --- a/external/corefx/src/Common/src/CoreLib/System/NotFiniteNumberException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/NotFiniteNumberException.cs @@ -7,7 +7,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class NotFiniteNumberException : ArithmeticException { private double _offendingNumber; diff --git a/external/corefx/src/Common/src/CoreLib/System/NotImplementedException.cs b/external/corefx/src/Common/src/CoreLib/System/NotImplementedException.cs index 1a3b6afcd4..735e006f71 100644 --- a/external/corefx/src/Common/src/CoreLib/System/NotImplementedException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/NotImplementedException.cs @@ -17,7 +17,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class NotImplementedException : SystemException { public NotImplementedException() diff --git a/external/corefx/src/Common/src/CoreLib/System/NotSupportedException.cs b/external/corefx/src/Common/src/CoreLib/System/NotSupportedException.cs index 3180bc2837..bc8e3a6245 100644 --- a/external/corefx/src/Common/src/CoreLib/System/NotSupportedException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/NotSupportedException.cs @@ -16,8 +16,10 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] - public class NotSupportedException : SystemException +#endif + public partial class NotSupportedException : SystemException { public NotSupportedException() : base(SR.Arg_NotSupportedException) diff --git a/external/corefx/src/Common/src/CoreLib/System/NullReferenceException.cs b/external/corefx/src/Common/src/CoreLib/System/NullReferenceException.cs index c2e722470c..4fae5f25e0 100644 --- a/external/corefx/src/Common/src/CoreLib/System/NullReferenceException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/NullReferenceException.cs @@ -16,7 +16,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class NullReferenceException : SystemException { public NullReferenceException() diff --git a/external/corefx/src/Common/src/CoreLib/System/Nullable.cs b/external/corefx/src/Common/src/CoreLib/System/Nullable.cs index 73ad6056c2..c9ee43fadb 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Nullable.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Nullable.cs @@ -13,8 +13,10 @@ namespace System // [Serializable] [NonVersionable] // This only applies to field layout +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] - public struct Nullable where T : struct +#endif + public partial struct Nullable where T : struct { private readonly bool hasValue; // Do not rename (binary serialization) internal T value; // Do not rename (binary serialization) or make readonly (can be mutated in ToString, etc.) diff --git a/external/corefx/src/Common/src/CoreLib/System/Number.Formatting.cs b/external/corefx/src/Common/src/CoreLib/System/Number.Formatting.cs index 70b35a08aa..f3cacf4faf 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Number.Formatting.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Number.Formatting.cs @@ -2,7 +2,9 @@ // 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.Text; using System.Diagnostics; +using System.Diagnostics.Private; using System.Globalization; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -246,9 +248,7 @@ namespace System private const int DoublePrecision = 15; private const int ScaleNAN = unchecked((int)0x80000000); private const int ScaleINF = 0x7FFFFFFF; - private const int MaxUInt32HexDigits = 8; private const int MaxUInt32DecDigits = 10; - private const int MaxUInt64DecDigits = 20; private const int CharStackBufferSize = 32; private const string PosNumberFormat = "#"; @@ -564,7 +564,7 @@ namespace System { Debug.Assert(source != null); - if (source.AsReadOnlySpan().TryCopyTo(destination)) + if (source.AsSpan().TryCopyTo(destination)) { charsWritten = source.Length; return true; @@ -972,18 +972,20 @@ namespace System if (digits < 1) digits = 1; - int bufferLength = Math.Max(digits, MaxUInt32DecDigits) + sNegative.Length; - int index = bufferLength; - - char* buffer = stackalloc char[bufferLength]; - char* p = UInt32ToDecChars(buffer + bufferLength, (uint)(-value), digits); - for (int i = sNegative.Length - 1; i >= 0; i--) + int bufferLength = Math.Max(digits, FormattingHelpers.CountDigits((uint)(-value))) + sNegative.Length; + string result = string.FastAllocateString(bufferLength); + fixed (char* buffer = result) { - *(--p) = sNegative[i]; - } + char* p = UInt32ToDecChars(buffer + bufferLength, (uint)(-value), digits); + Debug.Assert(p == buffer + sNegative.Length); - Debug.Assert(buffer + bufferLength - p >= 0 && buffer <= p); - return new string(p, 0, (int)(buffer + bufferLength - p)); + for (int i = sNegative.Length - 1; i >= 0; i--) + { + *(--p) = sNegative[i]; + } + Debug.Assert(p == buffer); + } + return result; } private static unsafe bool TryNegativeInt32ToDecStr(int value, int digits, string sNegative, Span destination, out int charsWritten) @@ -993,18 +995,26 @@ namespace System if (digits < 1) digits = 1; - int bufferLength = Math.Max(digits, MaxUInt32DecDigits) + sNegative.Length; - int index = bufferLength; - - char* buffer = stackalloc char[bufferLength]; - char* p = UInt32ToDecChars(buffer + bufferLength, (uint)(-value), digits); - for (int i = sNegative.Length - 1; i >= 0; i--) + int bufferLength = Math.Max(digits, FormattingHelpers.CountDigits((uint)(-value))) + sNegative.Length; + if (bufferLength > destination.Length) { - *(--p) = sNegative[i]; + charsWritten = 0; + return false; } - Debug.Assert(buffer + bufferLength - p >= 0 && buffer <= p); - return TryCopyTo(p, (int)(buffer + bufferLength - p), destination, out charsWritten); + charsWritten = bufferLength; + fixed (char* buffer = &MemoryMarshal.GetReference(destination)) + { + char* p = UInt32ToDecChars(buffer + bufferLength, (uint)(-value), digits); + Debug.Assert(p == buffer + sNegative.Length); + + for (int i = sNegative.Length - 1; i >= 0; i--) + { + *(--p) = sNegative[i]; + } + Debug.Assert(p == buffer); + } + return true; } private static unsafe string Int32ToHexStr(int value, char hexBase, int digits) @@ -1012,11 +1022,14 @@ namespace System if (digits < 1) digits = 1; - int bufferLength = Math.Max(digits, MaxUInt32HexDigits); - char* buffer = stackalloc char[bufferLength]; - - char* p = Int32ToHexChars(buffer + bufferLength, (uint)value, hexBase, digits); - return new string(p, 0, (int)(buffer + bufferLength - p)); + int bufferLength = Math.Max(digits, FormattingHelpers.CountHexDigits((uint)value)); + string result = string.FastAllocateString(bufferLength); + fixed (char* buffer = result) + { + char* p = Int32ToHexChars(buffer + bufferLength, (uint)value, hexBase, digits); + Debug.Assert(p == buffer); + } + return result; } private static unsafe bool TryInt32ToHexStr(int value, char hexBase, int digits, Span destination, out int charsWritten) @@ -1024,11 +1037,20 @@ namespace System if (digits < 1) digits = 1; - int bufferLength = Math.Max(digits, MaxUInt32HexDigits); - char* buffer = stackalloc char[bufferLength]; + int bufferLength = Math.Max(digits, FormattingHelpers.CountHexDigits((uint)value)); + if (bufferLength > destination.Length) + { + charsWritten = 0; + return false; + } - char* p = Int32ToHexChars(buffer + bufferLength, (uint)value, hexBase, digits); - return TryCopyTo(p, (int)(buffer + bufferLength - p), destination, out charsWritten); + charsWritten = bufferLength; + fixed (char* buffer = &MemoryMarshal.GetReference(destination)) + { + char* p = Int32ToHexChars(buffer + bufferLength, (uint)value, hexBase, digits); + Debug.Assert(p == buffer); + } + return true; } private static unsafe char* Int32ToHexChars(char* buffer, uint value, int hexBase, int digits) @@ -1073,65 +1095,69 @@ namespace System private static unsafe string UInt32ToDecStr(uint value, int digits) { - if (digits <= 1) + int bufferLength = Math.Max(digits, FormattingHelpers.CountDigits(value)); + string result = string.FastAllocateString(bufferLength); + fixed (char* buffer = result) { - char* buffer = stackalloc char[MaxUInt32DecDigits]; - - char* start = buffer + MaxUInt32DecDigits; - char* p = start; - do + char* p = buffer + bufferLength; + if (digits <= 1) { - // TODO https://github.com/dotnet/coreclr/issues/3439 - uint div = value / 10; - *(--p) = (char)('0' + value - (div * 10)); - value = div; + do + { + // TODO https://github.com/dotnet/coreclr/issues/3439 + uint div = value / 10; + *(--p) = (char)('0' + value - (div * 10)); + value = div; + } + while (value != 0); } - while (value != 0); - - return new string(p, 0, (int)(start - p)); - } - else - { - int bufferSize = Math.Max(digits, MaxUInt32DecDigits); - char* buffer = stackalloc char[bufferSize]; - char* p = UInt32ToDecChars(buffer + bufferSize, value, digits); - return new string(p, 0, (int)(buffer + bufferSize - p)); + else + { + p = UInt32ToDecChars(p, value, digits); + } + Debug.Assert(p == buffer); } + return result; } private static unsafe bool TryUInt32ToDecStr(uint value, int digits, Span destination, out int charsWritten) { - if (digits <= 1) + int bufferLength = Math.Max(digits, FormattingHelpers.CountDigits(value)); + if (bufferLength > destination.Length) { - char* buffer = stackalloc char[MaxUInt32DecDigits]; - char* start = buffer + MaxUInt32DecDigits; - char* p = start; - do + charsWritten = 0; + return false; + } + + charsWritten = bufferLength; + fixed (char* buffer = &MemoryMarshal.GetReference(destination)) + { + char* p = buffer + bufferLength; + if (digits <= 1) { - // TODO https://github.com/dotnet/coreclr/issues/3439 - uint div = value / 10; - *(--p) = (char)('0' + value - (div * 10)); - value = div; + do + { + // TODO https://github.com/dotnet/coreclr/issues/3439 + uint div = value / 10; + *(--p) = (char)('0' + value - (div * 10)); + value = div; + } + while (value != 0); } - while (value != 0); - return TryCopyTo(p, (int)(start - p), destination, out charsWritten); - } - else - { - int bufferSize = Math.Max(digits, MaxUInt32DecDigits); - char* buffer = stackalloc char[bufferSize]; - char* p = UInt32ToDecChars(buffer + bufferSize, value, digits); - return TryCopyTo(p, (int)(buffer + bufferSize - p), destination, out charsWritten); + else + { + p = UInt32ToDecChars(p, value, digits); + } + Debug.Assert(p == buffer); } + return true; } [MethodImpl(MethodImplOptions.AggressiveInlining)] private static unsafe bool TryCopyTo(char* src, int length, Span destination, out int charsWritten) { - if (length <= destination.Length) + if (new ReadOnlySpan(src, length).TryCopyTo(destination)) { - bool copied = new ReadOnlySpan(src, length).TryCopyTo(destination); - Debug.Assert(copied); charsWritten = length; return true; } @@ -1178,24 +1204,26 @@ namespace System ulong value = (ulong)(-input); - int bufferLength = Math.Max(digits, MaxUInt64DecDigits) + sNegative.Length; - int index = bufferLength; - - char* buffer = stackalloc char[bufferLength]; - char* p = buffer + bufferLength; - while (High32(value) != 0) + int bufferLength = Math.Max(digits, FormattingHelpers.CountDigits(value)) + sNegative.Length; + string result = string.FastAllocateString(bufferLength); + fixed (char* buffer = result) { - p = UInt32ToDecChars(p, Int64DivMod1E9(ref value), 9); - digits -= 9; - } - p = UInt32ToDecChars(p, Low32(value), digits); + char* p = buffer + bufferLength; + while (High32(value) != 0) + { + p = UInt32ToDecChars(p, Int64DivMod1E9(ref value), 9); + digits -= 9; + } + p = UInt32ToDecChars(p, Low32(value), digits); + Debug.Assert(p == buffer + sNegative.Length); - for (int i = sNegative.Length - 1; i >= 0; i--) - { - *(--p) = sNegative[i]; + for (int i = sNegative.Length - 1; i >= 0; i--) + { + *(--p) = sNegative[i]; + } + Debug.Assert(p == buffer); } - - return new string(p, 0, (int)(buffer + bufferLength - p)); + return result; } private static unsafe bool TryNegativeInt64ToDecStr(long input, int digits, string sNegative, Span destination, out int charsWritten) @@ -1209,64 +1237,80 @@ namespace System ulong value = (ulong)(-input); - int bufferLength = Math.Max(digits, MaxUInt64DecDigits) + sNegative.Length; - int index = bufferLength; - - char* buffer = stackalloc char[bufferLength]; - char* p = buffer + bufferLength; - while (High32(value) != 0) + int bufferLength = Math.Max(digits, FormattingHelpers.CountDigits((ulong)(-input))) + sNegative.Length; + if (bufferLength > destination.Length) { - p = UInt32ToDecChars(p, Int64DivMod1E9(ref value), 9); - digits -= 9; - } - p = UInt32ToDecChars(p, Low32(value), digits); - - for (int i = sNegative.Length - 1; i >= 0; i--) - { - *(--p) = sNegative[i]; + charsWritten = 0; + return false; } - return TryCopyTo(p, (int)(buffer + bufferLength - p), destination, out charsWritten); + charsWritten = bufferLength; + fixed (char* buffer = &MemoryMarshal.GetReference(destination)) + { + char* p = buffer + bufferLength; + while (High32(value) != 0) + { + p = UInt32ToDecChars(p, Int64DivMod1E9(ref value), 9); + digits -= 9; + } + p = UInt32ToDecChars(p, Low32(value), digits); + Debug.Assert(p == buffer + sNegative.Length); + + for (int i = sNegative.Length - 1; i >= 0; i--) + { + *(--p) = sNegative[i]; + } + Debug.Assert(p == buffer); + } + return true; } private static unsafe string Int64ToHexStr(long value, char hexBase, int digits) { - int bufferLength = Math.Max(digits, MaxUInt32HexDigits * 2); - char* buffer = stackalloc char[bufferLength]; - int index = bufferLength; - - char* p; - if (High32((ulong)value) != 0) + int bufferLength = Math.Max(digits, FormattingHelpers.CountHexDigits((ulong)value)); + string result = string.FastAllocateString(bufferLength); + fixed (char* buffer = result) { - p = Int32ToHexChars(buffer + index, Low32((ulong)value), hexBase, 8); - p = Int32ToHexChars(p, High32((ulong)value), hexBase, digits - 8); + char* p = buffer + bufferLength; + if (High32((ulong)value) != 0) + { + p = Int32ToHexChars(p, Low32((ulong)value), hexBase, 8); + p = Int32ToHexChars(p, High32((ulong)value), hexBase, digits - 8); + } + else + { + p = Int32ToHexChars(p, Low32((ulong)value), hexBase, Math.Max(digits, 1)); + } + Debug.Assert(p == buffer); } - else - { - p = Int32ToHexChars(buffer + index, Low32((ulong)value), hexBase, Math.Max(digits, 1)); - } - - return new string(p, 0, (int)(buffer + bufferLength - p)); + return result; } private static unsafe bool TryInt64ToHexStr(long value, char hexBase, int digits, Span destination, out int charsWritten) { - int bufferLength = Math.Max(digits, MaxUInt32HexDigits * 2); - char* buffer = stackalloc char[bufferLength]; - int index = bufferLength; - - char* p; - if (High32((ulong)value) != 0) + int bufferLength = Math.Max(digits, FormattingHelpers.CountHexDigits((ulong)value)); + if (bufferLength > destination.Length) { - p = Int32ToHexChars(buffer + index, Low32((ulong)value), hexBase, 8); - p = Int32ToHexChars(p, High32((ulong)value), hexBase, digits - 8); - } - else - { - p = Int32ToHexChars(buffer + index, Low32((ulong)value), hexBase, Math.Max(digits, 1)); + charsWritten = 0; + return false; } - return TryCopyTo(p, (int)(buffer + bufferLength - p), destination, out charsWritten); + charsWritten = bufferLength; + fixed (char* buffer = &MemoryMarshal.GetReference(destination)) + { + char* p = buffer + bufferLength; + if (High32((ulong)value) != 0) + { + p = Int32ToHexChars(p, Low32((ulong)value), hexBase, 8); + p = Int32ToHexChars(p, High32((ulong)value), hexBase, digits - 8); + } + else + { + p = Int32ToHexChars(p, Low32((ulong)value), hexBase, Math.Max(digits, 1)); + } + Debug.Assert(p == buffer); + } + return true; } private static unsafe void UInt64ToNumber(ulong value, ref NumberBuffer number) @@ -1295,17 +1339,20 @@ namespace System if (digits < 1) digits = 1; - int bufferSize = Math.Max(digits, MaxUInt64DecDigits); - char* buffer = stackalloc char[bufferSize]; - char* p = buffer + bufferSize; - while (High32(value) != 0) + int bufferLength = Math.Max(digits, FormattingHelpers.CountDigits(value)); + string result = string.FastAllocateString(bufferLength); + fixed (char* buffer = result) { - p = UInt32ToDecChars(p, Int64DivMod1E9(ref value), 9); - digits -= 9; + char* p = buffer + bufferLength; + while (High32(value) != 0) + { + p = UInt32ToDecChars(p, Int64DivMod1E9(ref value), 9); + digits -= 9; + } + p = UInt32ToDecChars(p, Low32(value), digits); + Debug.Assert(p == buffer); } - p = UInt32ToDecChars(p, Low32(value), digits); - - return new string(p, 0, (int)(buffer + bufferSize - p)); + return result; } private static unsafe bool TryUInt64ToDecStr(ulong value, int digits, Span destination, out int charsWritten) @@ -1313,17 +1360,26 @@ namespace System if (digits < 1) digits = 1; - int bufferSize = Math.Max(digits, MaxUInt64DecDigits); - char* buffer = stackalloc char[bufferSize]; - char* p = buffer + bufferSize; - while (High32(value) != 0) + int bufferLength = Math.Max(digits, FormattingHelpers.CountDigits(value)); + if (bufferLength > destination.Length) { - p = UInt32ToDecChars(p, Int64DivMod1E9(ref value), 9); - digits -= 9; + charsWritten = 0; + return false; } - p = UInt32ToDecChars(p, Low32(value), digits); - return TryCopyTo(p, (int)(buffer + bufferSize - p), destination, out charsWritten); + charsWritten = bufferLength; + fixed (char* buffer = &MemoryMarshal.GetReference(destination)) + { + char* p = buffer + bufferLength; + while (High32(value) != 0) + { + p = UInt32ToDecChars(p, Int64DivMod1E9(ref value), 9); + digits -= 9; + } + p = UInt32ToDecChars(p, Low32(value), digits); + Debug.Assert(p == buffer); + } + return true; } internal static unsafe char ParseFormatSpecifier(ReadOnlySpan format, out int digits) @@ -1708,8 +1764,7 @@ namespace System if (thousandsSepCtr >= thousandsSepPos.Length) { var newThousandsSepPos = new int[thousandsSepPos.Length * 2]; - bool copied = thousandsSepPos.TryCopyTo(newThousandsSepPos); - Debug.Assert(copied, "Expect copy to succeed, as the new array is larger than the original"); + thousandsSepPos.CopyTo(newThousandsSepPos); thousandsSepPos = newThousandsSepPos; } @@ -1919,14 +1974,15 @@ namespace System { if (groupDigits != null) { - int groupSizeIndex = 0; // Index into the groupDigits array. - int groupSizeCount = groupDigits[groupSizeIndex]; // The current total of group size. + int groupSizeIndex = 0; // Index into the groupDigits array. int bufferSize = digPos; // The length of the result buffer string. int groupSize = 0; // The current group size. // Find out the size of the string buffer for the result. if (groupDigits.Length != 0) // You can pass in 0 length arrays { + int groupSizeCount = groupDigits[groupSizeIndex]; // The current total of group size. + while (digPos > groupSizeCount) { groupSize = groupDigits[groupSizeIndex]; diff --git a/external/corefx/src/Common/src/CoreLib/System/Number.Parsing.cs b/external/corefx/src/Common/src/CoreLib/System/Number.Parsing.cs index 46951094eb..8297b38f2a 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Number.Parsing.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Number.Parsing.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; using System.Globalization; using System.Runtime.InteropServices; @@ -300,7 +301,7 @@ namespace System return true; } - internal unsafe static int ParseInt32(ReadOnlySpan s, NumberStyles style, NumberFormatInfo info) + internal static unsafe int ParseInt32(ReadOnlySpan s, NumberStyles style, NumberFormatInfo info) { NumberBuffer number = default; int i = 0; @@ -324,7 +325,7 @@ namespace System return i; } - internal unsafe static long ParseInt64(ReadOnlySpan value, NumberStyles options, NumberFormatInfo numfmt) + internal static unsafe long ParseInt64(ReadOnlySpan value, NumberStyles options, NumberFormatInfo numfmt) { NumberBuffer number = default; long i = 0; @@ -348,7 +349,7 @@ namespace System return i; } - internal unsafe static uint ParseUInt32(ReadOnlySpan value, NumberStyles options, NumberFormatInfo numfmt) + internal static unsafe uint ParseUInt32(ReadOnlySpan value, NumberStyles options, NumberFormatInfo numfmt) { NumberBuffer number = default; uint i = 0; @@ -373,7 +374,7 @@ namespace System return i; } - internal unsafe static ulong ParseUInt64(ReadOnlySpan value, NumberStyles options, NumberFormatInfo numfmt) + internal static unsafe ulong ParseUInt64(ReadOnlySpan value, NumberStyles options, NumberFormatInfo numfmt) { NumberBuffer number = default; ulong i = 0; @@ -396,8 +397,12 @@ namespace System return i; } - private unsafe static bool ParseNumber(ref char* str, NumberStyles options, ref NumberBuffer number, NumberFormatInfo numfmt, bool parseDecimal) + private static unsafe bool ParseNumber(ref char* str, char* strEnd, NumberStyles options, ref NumberBuffer number, NumberFormatInfo numfmt, bool parseDecimal) { + Debug.Assert(str != null); + Debug.Assert(strEnd != null); + Debug.Assert(str <= strEnd); + const int StateSign = 0x0001; const int StateParens = 0x0002; const int StateDigits = 0x0004; @@ -430,7 +435,7 @@ namespace System int state = 0; char* p = str; - char ch = *p; + char ch = p < strEnd ? *p : '\0'; char* next; while (true) @@ -439,7 +444,7 @@ namespace System // "-Kr 1231.47" is legal but "- 1231.47" is not. if (!IsWhite(ch) || (options & NumberStyles.AllowLeadingWhite) == 0 || ((state & StateSign) != 0 && ((state & StateCurrency) == 0 && numfmt.NumberNegativePattern != 2))) { - if ((((options & NumberStyles.AllowLeadingSign) != 0) && (state & StateSign) == 0) && ((next = MatchChars(p, numfmt.PositiveSign)) != null || ((next = MatchChars(p, numfmt.NegativeSign)) != null && (number.sign = true)))) + if ((((options & NumberStyles.AllowLeadingSign) != 0) && (state & StateSign) == 0) && ((next = MatchChars(p, strEnd, numfmt.PositiveSign)) != null || ((next = MatchChars(p, strEnd, numfmt.NegativeSign)) != null && (number.sign = true)))) { state |= StateSign; p = next - 1; @@ -449,7 +454,7 @@ namespace System state |= StateSign | StateParens; number.sign = true; } - else if (currSymbol != null && (next = MatchChars(p, currSymbol)) != null) + else if (currSymbol != null && (next = MatchChars(p, strEnd, currSymbol)) != null) { state |= StateCurrency; currSymbol = null; @@ -462,7 +467,7 @@ namespace System break; } } - ch = *++p; + ch = ++p < strEnd ? *p : '\0'; } int digCount = 0; int digEnd = 0; @@ -493,12 +498,12 @@ namespace System number.scale--; } } - else if (((options & NumberStyles.AllowDecimalPoint) != 0) && ((state & StateDecimal) == 0) && ((next = MatchChars(p, decSep)) != null || ((parsingCurrency) && (state & StateCurrency) == 0) && (next = MatchChars(p, numfmt.NumberDecimalSeparator)) != null)) + else if (((options & NumberStyles.AllowDecimalPoint) != 0) && ((state & StateDecimal) == 0) && ((next = MatchChars(p, strEnd, decSep)) != null || ((parsingCurrency) && (state & StateCurrency) == 0) && (next = MatchChars(p, strEnd, numfmt.NumberDecimalSeparator)) != null)) { state |= StateDecimal; p = next - 1; } - else if (((options & NumberStyles.AllowThousands) != 0) && ((state & StateDigits) != 0) && ((state & StateDecimal) == 0) && ((next = MatchChars(p, groupSep)) != null || ((parsingCurrency) && (state & StateCurrency) == 0) && (next = MatchChars(p, numfmt.NumberGroupSeparator)) != null)) + else if (((options & NumberStyles.AllowThousands) != 0) && ((state & StateDigits) != 0) && ((state & StateDecimal) == 0) && ((next = MatchChars(p, strEnd, groupSep)) != null || ((parsingCurrency) && (state & StateCurrency) == 0) && (next = MatchChars(p, strEnd, numfmt.NumberGroupSeparator)) != null)) { p = next - 1; } @@ -506,7 +511,7 @@ namespace System { break; } - ch = *++p; + ch = ++p < strEnd ? *p : '\0'; } bool negExp = false; @@ -517,14 +522,14 @@ namespace System if ((ch == 'E' || ch == 'e') && ((options & NumberStyles.AllowExponent) != 0)) { char* temp = p; - ch = *++p; - if ((next = MatchChars(p, numfmt.positiveSign)) != null) + ch = ++p < strEnd ? *p : '\0'; + if ((next = MatchChars(p, strEnd, numfmt.positiveSign)) != null) { - ch = *(p = next); + ch = (p = next) < strEnd ? *p : '\0'; } - else if ((next = MatchChars(p, numfmt.negativeSign)) != null) + else if ((next = MatchChars(p, strEnd, numfmt.negativeSign)) != null) { - ch = *(p = next); + ch = (p = next) < strEnd ? *p : '\0'; negExp = true; } if (ch >= '0' && ch <= '9') @@ -533,13 +538,13 @@ namespace System do { exp = exp * 10 + (ch - '0'); - ch = *++p; + ch = ++p < strEnd ? *p : '\0'; if (exp > 1000) { exp = 9999; while (ch >= '0' && ch <= '9') { - ch = *++p; + ch = ++p < strEnd ? *p : '\0'; } } } while (ch >= '0' && ch <= '9'); @@ -552,14 +557,14 @@ namespace System else { p = temp; - ch = *p; + ch = p < strEnd ? *p : '\0'; } } while (true) { if (!IsWhite(ch) || (options & NumberStyles.AllowTrailingWhite) == 0) { - if (((options & NumberStyles.AllowTrailingSign) != 0 && ((state & StateSign) == 0)) && ((next = MatchChars(p, numfmt.PositiveSign)) != null || (((next = MatchChars(p, numfmt.NegativeSign)) != null) && (number.sign = true)))) + if (((options & NumberStyles.AllowTrailingSign) != 0 && ((state & StateSign) == 0)) && ((next = MatchChars(p, strEnd, numfmt.PositiveSign)) != null || (((next = MatchChars(p, strEnd, numfmt.NegativeSign)) != null) && (number.sign = true)))) { state |= StateSign; p = next - 1; @@ -568,7 +573,7 @@ namespace System { state &= ~StateParens; } - else if (currSymbol != null && (next = MatchChars(p, currSymbol)) != null) + else if (currSymbol != null && (next = MatchChars(p, strEnd, currSymbol)) != null) { currSymbol = null; p = next - 1; @@ -578,7 +583,7 @@ namespace System break; } } - ch = *++p; + ch = ++p < strEnd ? *p : '\0'; } if ((state & StateParens) == 0) { @@ -601,7 +606,7 @@ namespace System return false; } - internal unsafe static bool TryParseInt32(ReadOnlySpan s, NumberStyles style, NumberFormatInfo info, out int result) + internal static unsafe bool TryParseInt32(ReadOnlySpan s, NumberStyles style, NumberFormatInfo info, out int result) { NumberBuffer number = default; result = 0; @@ -628,7 +633,7 @@ namespace System return true; } - internal unsafe static bool TryParseInt64(ReadOnlySpan s, NumberStyles style, NumberFormatInfo info, out long result) + internal static unsafe bool TryParseInt64(ReadOnlySpan s, NumberStyles style, NumberFormatInfo info, out long result) { NumberBuffer number = default; result = 0; @@ -655,7 +660,7 @@ namespace System return true; } - internal unsafe static bool TryParseUInt32(ReadOnlySpan s, NumberStyles style, NumberFormatInfo info, out uint result) + internal static unsafe bool TryParseUInt32(ReadOnlySpan s, NumberStyles style, NumberFormatInfo info, out uint result) { NumberBuffer number = default; result = 0; @@ -682,7 +687,7 @@ namespace System return true; } - internal unsafe static bool TryParseUInt64(ReadOnlySpan s, NumberStyles style, NumberFormatInfo info, out ulong result) + internal static unsafe bool TryParseUInt64(ReadOnlySpan s, NumberStyles style, NumberFormatInfo info, out ulong result) { NumberBuffer number = default; result = 0; @@ -709,7 +714,7 @@ namespace System return true; } - internal unsafe static decimal ParseDecimal(ReadOnlySpan value, NumberStyles options, NumberFormatInfo numfmt) + internal static unsafe decimal ParseDecimal(ReadOnlySpan value, NumberStyles options, NumberFormatInfo numfmt) { NumberBuffer number = default; decimal result = 0; @@ -723,7 +728,7 @@ namespace System return result; } - internal unsafe static double ParseDouble(ReadOnlySpan value, NumberStyles options, NumberFormatInfo numfmt) + internal static unsafe double ParseDouble(ReadOnlySpan value, NumberStyles options, NumberFormatInfo numfmt) { NumberBuffer number = default; double d = 0; @@ -734,15 +739,15 @@ namespace System //Check the three with which we're concerned and rethrow if it's not one of //those strings. ReadOnlySpan sTrim = value.Trim(); - if (StringSpanHelpers.Equals(sTrim, numfmt.PositiveInfinitySymbol)) + if (sTrim.EqualsOrdinal(numfmt.PositiveInfinitySymbol)) { return double.PositiveInfinity; } - if (StringSpanHelpers.Equals(sTrim, numfmt.NegativeInfinitySymbol)) + if (sTrim.EqualsOrdinal(numfmt.NegativeInfinitySymbol)) { return double.NegativeInfinity; } - if (StringSpanHelpers.Equals(sTrim, numfmt.NaNSymbol)) + if (sTrim.EqualsOrdinal(numfmt.NaNSymbol)) { return double.NaN; } @@ -757,7 +762,7 @@ namespace System return d; } - internal unsafe static float ParseSingle(ReadOnlySpan value, NumberStyles options, NumberFormatInfo numfmt) + internal static unsafe float ParseSingle(ReadOnlySpan value, NumberStyles options, NumberFormatInfo numfmt) { NumberBuffer number = default; double d = 0; @@ -768,15 +773,15 @@ namespace System //Check the three with which we're concerned and rethrow if it's not one of //those strings. ReadOnlySpan sTrim = value.Trim(); - if (StringSpanHelpers.Equals(sTrim, numfmt.PositiveInfinitySymbol)) + if (sTrim.EqualsOrdinal(numfmt.PositiveInfinitySymbol)) { return float.PositiveInfinity; } - if (StringSpanHelpers.Equals(sTrim, numfmt.NegativeInfinitySymbol)) + if (sTrim.EqualsOrdinal(numfmt.NegativeInfinitySymbol)) { return float.NegativeInfinity; } - if (StringSpanHelpers.Equals(sTrim, numfmt.NaNSymbol)) + if (sTrim.EqualsOrdinal(numfmt.NaNSymbol)) { return float.NaN; } @@ -795,7 +800,7 @@ namespace System return castSingle; } - internal unsafe static bool TryParseDecimal(ReadOnlySpan value, NumberStyles options, NumberFormatInfo numfmt, out decimal result) + internal static unsafe bool TryParseDecimal(ReadOnlySpan value, NumberStyles options, NumberFormatInfo numfmt, out decimal result) { NumberBuffer number = default; result = 0; @@ -812,7 +817,7 @@ namespace System return true; } - internal unsafe static bool TryParseDouble(ReadOnlySpan value, NumberStyles options, NumberFormatInfo numfmt, out double result) + internal static unsafe bool TryParseDouble(ReadOnlySpan value, NumberStyles options, NumberFormatInfo numfmt, out double result) { NumberBuffer number = default; result = 0; @@ -829,7 +834,7 @@ namespace System return true; } - internal unsafe static bool TryParseSingle(ReadOnlySpan value, NumberStyles options, NumberFormatInfo numfmt, out float result) + internal static unsafe bool TryParseSingle(ReadOnlySpan value, NumberStyles options, NumberFormatInfo numfmt, out float result) { NumberBuffer number = default; result = 0; @@ -859,7 +864,7 @@ namespace System fixed (char* stringPointer = &MemoryMarshal.GetReference(str)) { char* p = stringPointer; - if (!ParseNumber(ref p, options, ref number, info, parseDecimal) + if (!ParseNumber(ref p, p + str.Length, options, ref number, info, parseDecimal) || (p - stringPointer < str.Length && !TrailingZeros(str, (int)(p - stringPointer)))) { throw new FormatException(SR.Format_InvalidString); @@ -873,7 +878,7 @@ namespace System fixed (char* stringPointer = &MemoryMarshal.GetReference(str)) { char* p = stringPointer; - if (!ParseNumber(ref p, options, ref number, numfmt, parseDecimal) + if (!ParseNumber(ref p, p + str.Length, options, ref number, numfmt, parseDecimal) || (p - stringPointer < str.Length && !TrailingZeros(str, (int)(p - stringPointer)))) { return false; @@ -897,17 +902,17 @@ namespace System return true; } - private unsafe static char* MatchChars(char* p, string str) + private static unsafe char* MatchChars(char* p, char* pEnd, string str) { fixed (char* stringPointer = str) { - return MatchChars(p, stringPointer); + return MatchChars(p, pEnd, stringPointer); } } - private unsafe static char* MatchChars(char* p, char* str) + private static unsafe char* MatchChars(char* p, char* pEnd, char* str) { - Debug.Assert(p != null && str != null); + Debug.Assert(p != null && pEnd != null && p <= pEnd && str != null); if (*str == '\0') { @@ -917,8 +922,13 @@ namespace System // We only hurt the failure case // This fix is for French or Kazakh cultures. Since a user cannot type 0xA0 as a // space character we use 0x20 space character instead to mean the same. - while (*p == *str || (*str == '\u00a0' && *p == '\u0020')) + while (true) { + char cp = p < pEnd ? *p : '\0'; + if (cp != *str && !(*str == '\u00a0' && cp == '\u0020')) + { + break; + } p++; str++; if (*str == '\0') return p; @@ -932,33 +942,20 @@ namespace System private static bool NumberBufferToDouble(ref NumberBuffer number, ref double value) { double d = NumberToDouble(ref number); - uint e = DoubleHelper.Exponent(d); - ulong m = DoubleHelper.Mantissa(d); - - if (e == 0x7FF) + if (!Double.IsFinite(d)) { + value = default; return false; } - if (e == 0 && m == 0) + if (d == 0.0) { - d = 0; + // normalize -0.0 to 0.0 + d = 0.0; } value = d; return true; } - - private static class DoubleHelper - { - public static unsafe uint Exponent(double d) => - (*((uint*)&d + 1) >> 20) & 0x000007ff; - - public static unsafe ulong Mantissa(double d) => - *((ulong*)&d) & 0x000fffffffffffff; - - public static unsafe bool Sign(double d) => - (*((uint*)&d + 1) >> 31) != 0; - } } } diff --git a/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/ConstantHelper.cs b/external/corefx/src/Common/src/CoreLib/System/Numerics/ConstantHelper.cs similarity index 100% rename from external/corefx/src/System.Numerics.Vectors/src/System/Numerics/ConstantHelper.cs rename to external/corefx/src/Common/src/CoreLib/System/Numerics/ConstantHelper.cs diff --git a/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/ConstantHelper.tt b/external/corefx/src/Common/src/CoreLib/System/Numerics/ConstantHelper.tt similarity index 100% rename from external/corefx/src/System.Numerics.Vectors/src/System/Numerics/ConstantHelper.tt rename to external/corefx/src/Common/src/CoreLib/System/Numerics/ConstantHelper.tt diff --git a/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/GenerationConfig.ttinclude b/external/corefx/src/Common/src/CoreLib/System/Numerics/GenerationConfig.ttinclude similarity index 86% rename from external/corefx/src/System.Numerics.Vectors/src/System/Numerics/GenerationConfig.ttinclude rename to external/corefx/src/Common/src/CoreLib/System/Numerics/GenerationConfig.ttinclude index cdd9c95213..a21188e51b 100644 --- a/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/GenerationConfig.ttinclude +++ b/external/corefx/src/Common/src/CoreLib/System/Numerics/GenerationConfig.ttinclude @@ -1,5 +1,6 @@ <#@ import namespace="System.Linq" #> <#@ import namespace="System.Collections.Generic" #> +<#@ import namespace="System.Text" #> <#+ /* This file includes static data used as compilation configuration for the rest of the code generation. It is shared here to ensure that all generated code compiles with the same constants and configurations. */ @@ -144,4 +145,29 @@ string keyword = (type == allTypes.ToArray()[0]) ? "if" : "else if"; return string.Format("{0} (typeof(T) == typeof({1}))", keyword, type.Name); } -#> \ No newline at end of file + + public string MakeTypeComparisonCondition(Type type) + { + return string.Format("(typeof(T) == typeof({0}))", type.Name); + } + + public string GenerateIfConditionAllTypes(IEnumerable allTypes) + { + StringBuilder sbuilder = new StringBuilder(); + bool firstTime = true; + foreach (var type in allTypes) + { + if (firstTime) + { + sbuilder.Append("if (").Append(MakeTypeComparisonCondition(type)); + firstTime = false; + } + else + { + sbuilder.AppendLine().Append(" || ").Append(MakeTypeComparisonCondition(type)); + } + } + sbuilder.Append(")"); + return sbuilder.ToString(); + } +#> diff --git a/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Register.cs b/external/corefx/src/Common/src/CoreLib/System/Numerics/Register.cs similarity index 100% rename from external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Register.cs rename to external/corefx/src/Common/src/CoreLib/System/Numerics/Register.cs diff --git a/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Register.tt b/external/corefx/src/Common/src/CoreLib/System/Numerics/Register.tt similarity index 100% rename from external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Register.tt rename to external/corefx/src/Common/src/CoreLib/System/Numerics/Register.tt diff --git a/external/corefx/src/Common/src/CoreLib/System/Numerics/Vector.cs.REMOVED.git-id b/external/corefx/src/Common/src/CoreLib/System/Numerics/Vector.cs.REMOVED.git-id new file mode 100644 index 0000000000..d38ef5f8b6 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/Numerics/Vector.cs.REMOVED.git-id @@ -0,0 +1 @@ +42f86d9297702f8f4ec33ba22ca710dbb86e0ffc \ No newline at end of file diff --git a/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector.tt b/external/corefx/src/Common/src/CoreLib/System/Numerics/Vector.tt similarity index 96% rename from external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector.tt rename to external/corefx/src/Common/src/CoreLib/System/Numerics/Vector.tt index 1bb47f5c1a..d7622466b7 100644 --- a/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector.tt +++ b/external/corefx/src/Common/src/CoreLib/System/Numerics/Vector.tt @@ -7,9 +7,13 @@ <#@ import namespace="System.Runtime.InteropServices" #> <#@ include file="GenerationConfig.ttinclude" #><# GenerateCopyrightHeader(); #> +#if netcoreapp +using Internal.Runtime.CompilerServices; +#endif using System.Globalization; using System.Numerics.Hashing; using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; using System.Text; namespace System.Numerics @@ -43,6 +47,7 @@ namespace System.Numerics /// This struct only supports numerical types. This type is intended to be used as a building block for vectorizing /// large algorithms. This type is immutable, individual elements cannot be modified. /// + [Intrinsic] public struct Vector : IEquatable>, IFormattable where T : struct { #region Fields @@ -53,9 +58,9 @@ namespace System.Numerics /// /// Returns the number of elements stored in the vector. This value is hardware dependent. /// - [JitIntrinsic] public static int Count { + [Intrinsic] get { return s_count; @@ -66,19 +71,31 @@ namespace System.Numerics /// /// Returns a vector containing all zeroes. /// - [JitIntrinsic] - public static Vector Zero { get { return zero; } } - private static readonly Vector zero = new Vector(GetZeroValue()); + public static Vector Zero + { + [Intrinsic] + get + { + return s_zero; + } + } + private static readonly Vector s_zero = new Vector(); /// /// Returns a vector containing all ones. /// - [JitIntrinsic] - public static Vector One { get { return one; } } - private static readonly Vector one = new Vector(GetOneValue()); + public static Vector One + { + [Intrinsic] + get + { + return s_one; + } + } + private static readonly Vector s_one = new Vector(GetOneValue()); - internal static Vector AllOnes { get { return allOnes; } } - private static readonly Vector allOnes = new Vector(GetAllBitsSetValue()); + internal static Vector AllOnes { get { return s_allOnes; } } + private static readonly Vector s_allOnes = new Vector(GetAllBitsSetValue()); #endregion Static Members #region Static Initialization @@ -120,7 +137,7 @@ namespace System.Numerics /// /// Constructs a vector whose components are all value /// - [JitIntrinsic] + [Intrinsic] public unsafe Vector(T value) : this() { @@ -168,7 +185,7 @@ namespace System.Numerics /// /// Constructs a vector from the given array. The size of the given array must be at least Vector'T.Count. /// - [JitIntrinsic] + [Intrinsic] public unsafe Vector(T[] values) : this(values, 0) { } /// @@ -185,7 +202,7 @@ namespace System.Numerics } if (index < 0 || (values.Length - index) < Count) { - throw new IndexOutOfRangeException(); + throw new IndexOutOfRangeException(SR.Format(SR.Arg_InsufficientNumberOfElements, Vector.Count, nameof(values))); } if (Vector.IsHardwareAccelerated) @@ -270,6 +287,28 @@ namespace System.Numerics { this.register = existingRegister; } + +#if netcoreapp + /// + /// Constructs a vector from the given span. The span must contain at least Vector'T.Count elements. + /// + public Vector(Span values) + : this() + { + <#=GenerateIfConditionAllTypes(supportedTypes)#> + { + if (values.Length < Count) + { + throw new IndexOutOfRangeException(SR.Format(SR.Arg_InsufficientNumberOfElements, Vector.Count, nameof(values))); + } + this = Unsafe.ReadUnaligned>(ref Unsafe.As(ref MemoryMarshal.GetReference(values))); + } + else + { + throw new NotSupportedException(SR.Arg_TypeNotSupported); + } + } +#endif #endregion Constructors #region Public Instance Methods @@ -279,7 +318,7 @@ namespace System.Numerics /// The destination array which the values are copied into /// If the destination array is null /// If number of elements in source vector is greater than those available in destination array - [JitIntrinsic] + [Intrinsic] public unsafe void CopyTo(T[] destination) { CopyTo(destination, 0); @@ -293,7 +332,7 @@ namespace System.Numerics /// If the destination array is null /// If index is greater than end of the array or index is less than zero /// If number of elements in source vector is greater than those available in destination array - [JitIntrinsic] + [Intrinsic] public unsafe void CopyTo(T[] destination, int startIndex) { if (destination == null) @@ -359,9 +398,9 @@ namespace System.Numerics /// /// Returns the element at the given index. /// - [JitIntrinsic] public unsafe T this[int index] { + [Intrinsic] get { if (index >= Count || index < 0) @@ -408,7 +447,7 @@ namespace System.Numerics /// /// The vector to compare this instance to. /// True if the other vector is equal to this instance; False otherwise. - [JitIntrinsic] + [Intrinsic] public bool Equals(Vector other) { if (Vector.IsHardwareAccelerated) @@ -891,7 +930,7 @@ namespace System.Numerics /// The first source vector. /// The second source vector. /// The resultant vector. - [JitIntrinsic] + [Intrinsic] public static unsafe Vector operator &(Vector left, Vector right) { Vector result = new Vector(); @@ -922,7 +961,7 @@ namespace System.Numerics /// The first source vector. /// The second source vector. /// The resultant vector. - [JitIntrinsic] + [Intrinsic] public static unsafe Vector operator |(Vector left, Vector right) { Vector result = new Vector(); @@ -953,7 +992,7 @@ namespace System.Numerics /// The first source vector. /// The second source vector. /// The resultant vector. - [JitIntrinsic] + [Intrinsic] public static unsafe Vector operator ^(Vector left, Vector right) { Vector result = new Vector(); @@ -986,7 +1025,7 @@ namespace System.Numerics [MethodImplAttribute(MethodImplOptions.AggressiveInlining)] public static Vector operator ~(Vector value) { - return allOnes ^ value; + return s_allOnes ^ value; } #endregion Bitwise Operators @@ -1033,7 +1072,7 @@ namespace System.Numerics <# } #> - [JitIntrinsic] + [Intrinsic] public static explicit operator Vector<<#=type.Name#>>(Vector value) { return new Vector<<#=type.Name#>>(ref value.register); @@ -1045,7 +1084,7 @@ namespace System.Numerics #endregion Conversions #region Internal Comparison Methods - [JitIntrinsic] + [Intrinsic] [MethodImplAttribute(MethodImplOptions.AggressiveInlining)] internal static unsafe Vector Equals(Vector left, Vector right) { @@ -1099,7 +1138,7 @@ namespace System.Numerics } } - [JitIntrinsic] + [Intrinsic] [MethodImplAttribute(MethodImplOptions.AggressiveInlining)] internal static unsafe Vector LessThan(Vector left, Vector right) { @@ -1153,7 +1192,7 @@ namespace System.Numerics } } - [JitIntrinsic] + [Intrinsic] [MethodImplAttribute(MethodImplOptions.AggressiveInlining)] internal static unsafe Vector GreaterThan(Vector left, Vector right) { @@ -1207,19 +1246,19 @@ namespace System.Numerics } } - [JitIntrinsic] + [Intrinsic] internal static Vector GreaterThanOrEqual(Vector left, Vector right) { return Equals(left, right) | GreaterThan(left, right); } - [JitIntrinsic] + [Intrinsic] internal static Vector LessThanOrEqual(Vector left, Vector right) { return Equals(left, right) | LessThan(left, right); } - [JitIntrinsic] + [Intrinsic] internal static Vector ConditionalSelect(Vector condition, Vector left, Vector right) { return (left & condition) | (Vector.AndNot(right, condition)); @@ -1227,7 +1266,7 @@ namespace System.Numerics #endregion Comparison Methods #region Internal Math Methods - [JitIntrinsic] + [Intrinsic] internal static unsafe Vector Abs(Vector value) { <# @@ -1295,7 +1334,7 @@ namespace System.Numerics } } - [JitIntrinsic] + [Intrinsic] internal static unsafe Vector Min(Vector left, Vector right) { if (Vector.IsHardwareAccelerated) @@ -1348,7 +1387,7 @@ namespace System.Numerics } } - [JitIntrinsic] + [Intrinsic] internal static unsafe Vector Max(Vector left, Vector right) { if (Vector.IsHardwareAccelerated) @@ -1401,12 +1440,12 @@ namespace System.Numerics } } - [JitIntrinsic] + [Intrinsic] internal static T DotProduct(Vector left, Vector right) { if (Vector.IsHardwareAccelerated) { - T product = GetZeroValue(); + T product = default; for (int g = 0; g < Count; g++) { product = ScalarAdd(product, ScalarMultiply(left[g], right[g])); @@ -1441,7 +1480,7 @@ namespace System.Numerics } } - [JitIntrinsic] + [Intrinsic] internal static unsafe Vector SquareRoot(Vector value) { if (Vector.IsHardwareAccelerated) @@ -1628,26 +1667,6 @@ namespace System.Numerics } } - [MethodImplAttribute(MethodImplOptions.AggressiveInlining)] - private static T GetZeroValue() - { -<# foreach (Type type in supportedTypes) - { -#> - <#=GenerateIfStatementHeader(type)#> - { - <#=type.Name#> value = 0; - return (T)(object)value; - } -<# - } -#> - else - { - throw new NotSupportedException(SR.Arg_TypeNotSupported); - } - } - [MethodImplAttribute(MethodImplOptions.AggressiveInlining)] private static T GetOneValue() { @@ -1689,6 +1708,7 @@ namespace System.Numerics #endregion } + [Intrinsic] public static partial class Vector { #region Widen/Narrow @@ -1710,7 +1730,7 @@ namespace System.Numerics <# } #> - [JitIntrinsic] + [Intrinsic] public static unsafe void Widen(Vector<<#=type.Name#>> source, out Vector<<#=widenTarget.Name#>> low, out Vector<<#=widenTarget.Name#>> high) { int elements = Vector<<#=type.Name#>>.Count; @@ -1750,7 +1770,7 @@ namespace System.Numerics <# } #> - [JitIntrinsic] + [Intrinsic] public static unsafe Vector<<#=narrowTarget.Name#>> Narrow(Vector<<#=narrowSource.Name#>> low, Vector<<#=narrowSource.Name#>> high) { unchecked @@ -1792,7 +1812,7 @@ namespace System.Numerics <# } #> - [JitIntrinsic] + [Intrinsic] public static unsafe Vector<<#=pair.Value.Name#>> ConvertTo<#=pair.Value.Name#>(Vector<<#=pair.Key.Name#>> value) { unchecked diff --git a/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector_Operations.cs b/external/corefx/src/Common/src/CoreLib/System/Numerics/Vector_Operations.cs similarity index 99% rename from external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector_Operations.cs rename to external/corefx/src/Common/src/CoreLib/System/Numerics/Vector_Operations.cs index 4fbcb1670f..b69b058be9 100644 --- a/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector_Operations.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Numerics/Vector_Operations.cs @@ -524,9 +524,9 @@ namespace System.Numerics /// /// Returns whether or not vector operations are subject to hardware acceleration through JIT intrinsic support. /// - [JitIntrinsic] public static bool IsHardwareAccelerated { + [Intrinsic] get { return false; diff --git a/external/corefx/src/Common/src/CoreLib/System/ObjectDisposedException.cs b/external/corefx/src/Common/src/CoreLib/System/ObjectDisposedException.cs index 3daed13bb6..8488d0c794 100644 --- a/external/corefx/src/Common/src/CoreLib/System/ObjectDisposedException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/ObjectDisposedException.cs @@ -12,7 +12,9 @@ namespace System /// disposed. /// [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class ObjectDisposedException : InvalidOperationException { private String _objectName; diff --git a/external/corefx/src/Common/src/CoreLib/System/ObsoleteAttribute.cs b/external/corefx/src/Common/src/CoreLib/System/ObsoleteAttribute.cs index a63db137f8..d0d110fc99 100644 --- a/external/corefx/src/Common/src/CoreLib/System/ObsoleteAttribute.cs +++ b/external/corefx/src/Common/src/CoreLib/System/ObsoleteAttribute.cs @@ -24,6 +24,9 @@ namespace System [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum | AttributeTargets.Interface | AttributeTargets.Constructor | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Event | AttributeTargets.Delegate , Inherited = false)] +#if MONO + [Serializable] +#endif public sealed class ObsoleteAttribute : Attribute { private String _message; diff --git a/external/corefx/src/Common/src/CoreLib/System/OperationCanceledException.cs b/external/corefx/src/Common/src/CoreLib/System/OperationCanceledException.cs index 8a472c9ff0..b350dbafef 100644 --- a/external/corefx/src/Common/src/CoreLib/System/OperationCanceledException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/OperationCanceledException.cs @@ -18,7 +18,9 @@ using System.Threading; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class OperationCanceledException : SystemException { [NonSerialized] diff --git a/external/corefx/src/Common/src/CoreLib/System/OverflowException.cs b/external/corefx/src/Common/src/CoreLib/System/OverflowException.cs index 963825b350..f941b988bc 100644 --- a/external/corefx/src/Common/src/CoreLib/System/OverflowException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/OverflowException.cs @@ -6,7 +6,7 @@ ** ** ** -** Purpose: Exception class for Arthimatic Overflows. +** Purpose: Exception class for Arithmetic Overflows. ** ** =============================================================================*/ @@ -16,7 +16,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class OverflowException : ArithmeticException { public OverflowException() diff --git a/external/corefx/src/Common/src/CoreLib/System/ParseNumbers.cs b/external/corefx/src/Common/src/CoreLib/System/ParseNumbers.cs index dab4cb2190..e5dc7d6567 100644 --- a/external/corefx/src/Common/src/CoreLib/System/ParseNumbers.cs +++ b/external/corefx/src/Common/src/CoreLib/System/ParseNumbers.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.CompilerServices; namespace System diff --git a/external/corefx/src/Common/src/CoreLib/System/PlatformNotSupportedException.cs b/external/corefx/src/Common/src/CoreLib/System/PlatformNotSupportedException.cs index 5039f3f441..3184b730a5 100644 --- a/external/corefx/src/Common/src/CoreLib/System/PlatformNotSupportedException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/PlatformNotSupportedException.cs @@ -16,7 +16,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class PlatformNotSupportedException : NotSupportedException { public PlatformNotSupportedException() diff --git a/external/corefx/src/Common/src/CoreLib/System/Progress.cs b/external/corefx/src/Common/src/CoreLib/System/Progress.cs index 755e7719fe..5cec8e773e 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Progress.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Progress.cs @@ -5,6 +5,7 @@ using System; using System.Threading; using System.Diagnostics; +using System.Diagnostics.Private; namespace System { diff --git a/external/corefx/src/Common/src/CoreLib/System/RankException.cs b/external/corefx/src/Common/src/CoreLib/System/RankException.cs index bdd2cd51f1..3f5dbb3897 100644 --- a/external/corefx/src/Common/src/CoreLib/System/RankException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/RankException.cs @@ -17,7 +17,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class RankException : SystemException { public RankException() diff --git a/external/corefx/src/Common/src/CoreLib/System/ReadOnlyMemory.cs b/external/corefx/src/Common/src/CoreLib/System/ReadOnlyMemory.cs index de423bbd06..08e111ab2a 100644 --- a/external/corefx/src/Common/src/CoreLib/System/ReadOnlyMemory.cs +++ b/external/corefx/src/Common/src/CoreLib/System/ReadOnlyMemory.cs @@ -4,6 +4,7 @@ using System.Buffers; using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; #if !MONO @@ -20,34 +21,38 @@ namespace System /// Represents a contiguous region of memory, similar to . /// Unlike , it is not a byref-like type. /// - [DebuggerDisplay("{DebuggerDisplay,nq}")] [DebuggerTypeProxy(typeof(MemoryDebugView<>))] + [DebuggerDisplay("{ToString(),raw}")] public readonly struct ReadOnlyMemory { // NOTE: With the current implementation, Memory and ReadOnlyMemory must have the same layout, // as code uses Unsafe.As to cast between them. // The highest order bit of _index is used to discern whether _object is an array/string or an owned memory - // if (_index >> 31) == 1, _object is an OwnedMemory - // else, _object is a T[] or string + // if (_index >> 31) == 1, _object is an MemoryManager + // else, _object is a T[] or string. + // if (_length >> 31) == 1, _object is a pre-pinned array, so Pin() will not allocate a new GCHandle + // else, Pin() needs to allocate a new GCHandle to pin the object. private readonly object _object; private readonly int _index; private readonly int _length; - internal const int RemoveOwnedFlagBitMask = 0x7FFFFFFF; + internal const int RemoveFlagsBitMask = 0x7FFFFFFF; /// /// Creates a new memory over the entirety of the target array. /// /// The target array. - /// Thrown when is a null - /// reference (Nothing in Visual Basic). + /// Returns default when is null. /// Thrown when is covariant and array's type is not exactly T[]. [MethodImpl(MethodImplOptions.AggressiveInlining)] public ReadOnlyMemory(T[] array) { if (array == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array); + { + this = default; + return; // returns default + } _object = array; _index = 0; @@ -61,8 +66,7 @@ namespace System /// The target array. /// The index at which to begin the memory. /// The number of items in the memory. - /// Thrown when is a null - /// reference (Nothing in Visual Basic). + /// Returns default when is null. /// Thrown when is covariant and array's type is not exactly T[]. /// /// Thrown when the specified or end index is not in the range (<0 or >=Length). @@ -71,7 +75,12 @@ namespace System public ReadOnlyMemory(T[] array, int start, int length) { if (array == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array); + { + if (start != 0 || length != 0) + ThrowHelper.ThrowArgumentOutOfRangeException(); + this = default; + return; // returns default + } if ((uint)start > (uint)array.Length || (uint)length > (uint)(array.Length - start)) ThrowHelper.ThrowArgumentOutOfRangeException(); @@ -93,18 +102,15 @@ namespace System _length = length; } - //Debugger Display = {T[length]} - private string DebuggerDisplay => string.Format("{{{0}[{1}]}}", typeof(T).Name, _length); - /// /// Defines an implicit conversion of an array to a /// - public static implicit operator ReadOnlyMemory(T[] array) => (array != null) ? new ReadOnlyMemory(array) : default; + public static implicit operator ReadOnlyMemory(T[] array) => new ReadOnlyMemory(array); /// /// Defines an implicit conversion of a to a /// - public static implicit operator ReadOnlyMemory(ArraySegment arraySegment) => new ReadOnlyMemory(arraySegment.Array, arraySegment.Offset, arraySegment.Count); + public static implicit operator ReadOnlyMemory(ArraySegment segment) => new ReadOnlyMemory(segment.Array, segment.Offset, segment.Count); /// /// Returns an empty @@ -114,12 +120,25 @@ namespace System /// /// The number of items in the memory. /// - public int Length => _length; + public int Length => _length & RemoveFlagsBitMask; /// /// Returns true if Length is 0. /// - public bool IsEmpty => _length == 0; + public bool IsEmpty => (_length & RemoveFlagsBitMask) == 0; + + /// + /// For , returns a new instance of string that represents the characters pointed to by the memory. + /// Otherwise, returns a with the name of the type and the number of elements. + /// + public override string ToString() + { + if (typeof(T) == typeof(char)) + { + return (_object is string str) ? str.Substring(_index, _length & RemoveFlagsBitMask) : Span.ToString(); + } + return string.Format("System.ReadOnlyMemory<{0}>[{1}]", typeof(T).Name, _length & RemoveFlagsBitMask); + } /// /// Forms a slice out of the given memory, beginning at 'start'. @@ -131,12 +150,16 @@ namespace System [MethodImpl(MethodImplOptions.AggressiveInlining)] public ReadOnlyMemory Slice(int start) { - if ((uint)start > (uint)_length) + // Used to maintain the high-bit which indicates whether the Memory has been pre-pinned or not. + int capturedLength = _length; + int actualLength = capturedLength & RemoveFlagsBitMask; + if ((uint)start > (uint)actualLength) { ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); } - return new ReadOnlyMemory(_object, _index + start, _length - start); + // It is expected for (capturedLength - start) to be negative if the memory is already pre-pinned. + return new ReadOnlyMemory(_object, _index + start, capturedLength - start); } /// @@ -150,12 +173,16 @@ namespace System [MethodImpl(MethodImplOptions.AggressiveInlining)] public ReadOnlyMemory Slice(int start, int length) { - if ((uint)start > (uint)_length || (uint)length > (uint)(_length - start)) + // Used to maintain the high-bit which indicates whether the Memory has been pre-pinned or not. + int capturedLength = _length; + int actualLength = _length & RemoveFlagsBitMask; + if ((uint)start > (uint)actualLength || (uint)length > (uint)(actualLength - start)) { ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); } - return new ReadOnlyMemory(_object, _index + start, length); + // Set the high-bit to match the this._length high bit (1 for pre-pinned, 0 for unpinned). + return new ReadOnlyMemory(_object, _index + start, length | (capturedLength & ~RemoveFlagsBitMask)); } /// @@ -168,10 +195,13 @@ namespace System { if (_index < 0) { - return ((OwnedMemory)_object).Span.Slice(_index & RemoveOwnedFlagBitMask, _length); + Debug.Assert(_length >= 0); + Debug.Assert(_object != null); + return ((MemoryManager)_object).GetSpan().Slice(_index & RemoveFlagsBitMask, _length); } else if (typeof(T) == typeof(char) && _object is string s) { + Debug.Assert(_length >= 0); #if FEATURE_PORTABLE_SPAN return new ReadOnlySpan(Unsafe.As>(s), MemoryExtensions.StringAdjustment, s.Length).Slice(_index, _length); #else @@ -180,7 +210,7 @@ namespace System } else if (_object != null) { - return new ReadOnlySpan((T[])_object, _index, _length); + return new ReadOnlySpan((T[])_object, _index, _length & RemoveFlagsBitMask); } else { @@ -212,50 +242,55 @@ namespace System /// The span to copy items into. public bool TryCopyTo(Memory destination) => Span.TryCopyTo(destination.Span); - /// Creates a handle for the memory. - /// - /// If pin is true, the GC will not move the array until the returned - /// is disposed, enabling the memory's address can be taken and used. - /// - public unsafe MemoryHandle Retain(bool pin = false) + /// + /// Creates a handle for the memory. + /// The GC will not move the memory until the returned + /// is disposed, enabling taking and using the memory's address. + /// + /// An instance with nonprimitive (non-blittable) members cannot be pinned. + /// + /// + public unsafe MemoryHandle Pin() { - MemoryHandle memoryHandle = default; - if (pin) + if (_index < 0) { - if (_index < 0) - { - memoryHandle = ((OwnedMemory)_object).Pin((_index & RemoveOwnedFlagBitMask) * Unsafe.SizeOf()); - } - else if (typeof(T) == typeof(char) && _object is string s) - { - GCHandle handle = GCHandle.Alloc(s, GCHandleType.Pinned); + Debug.Assert(_object != null); + return ((MemoryManager)_object).Pin((_index & RemoveFlagsBitMask)); + } + else if (typeof(T) == typeof(char) && _object is string s) + { + GCHandle handle = GCHandle.Alloc(s, GCHandleType.Pinned); #if FEATURE_PORTABLE_SPAN - void* pointer = Unsafe.Add((void*)handle.AddrOfPinnedObject(), _index); + void* pointer = Unsafe.Add((void*)handle.AddrOfPinnedObject(), _index); #else - void* pointer = Unsafe.Add(Unsafe.AsPointer(ref s.GetRawStringData()), _index); + void* pointer = Unsafe.Add(Unsafe.AsPointer(ref s.GetRawStringData()), _index); #endif // FEATURE_PORTABLE_SPAN - memoryHandle = new MemoryHandle(null, pointer, handle); - } - else if (_object is T[] array) + return new MemoryHandle(pointer, handle); + } + else if (_object is T[] array) + { + // Array is already pre-pinned + if (_length < 0) { - var handle = GCHandle.Alloc(array, GCHandleType.Pinned); +#if FEATURE_PORTABLE_SPAN + void* pointer = Unsafe.Add(Unsafe.AsPointer(ref MemoryMarshal.GetReference(array)), _index); +#else + void* pointer = Unsafe.Add(Unsafe.AsPointer(ref array.GetRawSzArrayData()), _index); +#endif // FEATURE_PORTABLE_SPAN + return new MemoryHandle(pointer); + } + else + { + GCHandle handle = GCHandle.Alloc(array, GCHandleType.Pinned); #if FEATURE_PORTABLE_SPAN void* pointer = Unsafe.Add((void*)handle.AddrOfPinnedObject(), _index); #else void* pointer = Unsafe.Add(Unsafe.AsPointer(ref array.GetRawSzArrayData()), _index); #endif // FEATURE_PORTABLE_SPAN - memoryHandle = new MemoryHandle(null, pointer, handle); + return new MemoryHandle(pointer, handle); } } - else - { - if (_index < 0) - { - ((OwnedMemory)_object).Retain(); - memoryHandle = new MemoryHandle((OwnedMemory)_object); - } - } - return memoryHandle; + return default; } /// diff --git a/external/corefx/src/Common/src/CoreLib/System/ReadOnlySpan.Fast.cs b/external/corefx/src/Common/src/CoreLib/System/ReadOnlySpan.Fast.cs new file mode 100644 index 0000000000..6f3e98bd37 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/ReadOnlySpan.Fast.cs @@ -0,0 +1,280 @@ +// 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. + +#if !MONO +using System.ComponentModel; +#endif +using System.Diagnostics; +using System.Diagnostics.Private; +using System.Runtime.CompilerServices; +using System.Runtime.Versioning; +using Internal.Runtime.CompilerServices; + +#pragma warning disable 0809 //warning CS0809: Obsolete member 'Span.Equals(object)' overrides non-obsolete member 'object.Equals(object)' + +#if BIT64 +using nuint = System.UInt64; +#else +using nuint = System.UInt32; +#endif + +namespace System +{ + /// + /// ReadOnlySpan represents a contiguous region of arbitrary memory. Unlike arrays, it can point to either managed + /// or native memory, or to memory allocated on the stack. It is type- and memory-safe. + /// + [NonVersionable] + public readonly ref partial struct ReadOnlySpan + { + /// A byref or a native ptr. + internal readonly ByReference _pointer; + /// The number of elements this ReadOnlySpan contains. +#if PROJECTN + [Bound] +#endif + private readonly int _length; + + /// + /// Creates a new read-only span over the entirety of the target array. + /// + /// The target array. + /// Returns default when is null. + /// reference (Nothing in Visual Basic). + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public ReadOnlySpan(T[] array) + { + if (array == null) + { + this = default; + return; // returns default + } + + _pointer = new ByReference(ref Unsafe.As(ref array.GetRawSzArrayData())); + _length = array.Length; + } + + /// + /// Creates a new read-only span over the portion of the target array beginning + /// at 'start' index and ending at 'end' index (exclusive). + /// + /// The target array. + /// The index at which to begin the read-only span. + /// The number of items in the read-only span. + /// Returns default when is null. + /// reference (Nothing in Visual Basic). + /// + /// Thrown when the specified or end index is not in the range (<0 or >=Length). + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public ReadOnlySpan(T[] array, int start, int length) + { + if (array == null) + { + if (start != 0 || length != 0) + ThrowHelper.ThrowArgumentOutOfRangeException(); + this = default; + return; // returns default + } + if ((uint)start > (uint)array.Length || (uint)length > (uint)(array.Length - start)) + ThrowHelper.ThrowArgumentOutOfRangeException(); + + _pointer = new ByReference(ref Unsafe.Add(ref Unsafe.As(ref array.GetRawSzArrayData()), start)); + _length = length; + } + + /// + /// Creates a new read-only span over the target unmanaged buffer. Clearly this + /// is quite dangerous, because we are creating arbitrarily typed T's + /// out of a void*-typed block of memory. And the length is not checked. + /// But if this creation is correct, then all subsequent uses are correct. + /// + /// An unmanaged pointer to memory. + /// The number of elements the memory contains. + /// + /// Thrown when is reference type or contains pointers and hence cannot be stored in unmanaged memory. + /// + /// + /// Thrown when the specified is negative. + /// + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public unsafe ReadOnlySpan(void* pointer, int length) + { + if (RuntimeHelpers.IsReferenceOrContainsReferences()) + ThrowHelper.ThrowInvalidTypeWithPointersNotSupported(typeof(T)); + if (length < 0) + ThrowHelper.ThrowArgumentOutOfRangeException(); + + _pointer = new ByReference(ref Unsafe.As(ref *(byte*)pointer)); + _length = length; + } + + // Constructor for internal use only. + [MethodImpl(MethodImplOptions.AggressiveInlining)] + internal ReadOnlySpan(ref T ptr, int length) + { + Debug.Assert(length >= 0); + + _pointer = new ByReference(ref ptr); + _length = length; + } + + /// + /// Returns the specified element of the read-only span. + /// + /// + /// + /// + /// Thrown when index less than 0 or index greater than or equal to Length + /// + public ref readonly T this[int index] + { +#if PROJECTN + [BoundsChecking] + get + { + return ref Unsafe.Add(ref _pointer.Value, index); + } +#else + [Intrinsic] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + [NonVersionable] + get + { + if ((uint)index >= (uint)_length) + ThrowHelper.ThrowIndexOutOfRangeException(); + return ref Unsafe.Add(ref _pointer.Value, index); + } +#endif + } + + /// + /// Returns a reference to the 0th element of the Span. If the Span is empty, returns null reference. + /// It can be used for pinning and is required to support the use of span within a fixed statement. + /// +#if !MONO + [EditorBrowsable(EditorBrowsableState.Never)] +#endif + public unsafe ref readonly T GetPinnableReference() => ref (_length != 0) ? ref _pointer.Value : ref Unsafe.AsRef(null); + + /// + /// Copies the contents of this read-only span into destination span. If the source + /// and destinations overlap, this method behaves as if the original values in + /// a temporary location before the destination is overwritten. + /// + /// The span to copy items into. + /// + /// Thrown when the destination Span is shorter than the source Span. + /// + /// + public void CopyTo(Span destination) + { + // Using "if (!TryCopyTo(...))" results in two branches: one for the length + // check, and one for the result of TryCopyTo. Since these checks are equivalent, + // we can optimize by performing the check once ourselves then calling Memmove directly. + + if ((uint)_length <= (uint)destination.Length) + { + Buffer.Memmove(ref destination._pointer.Value, ref _pointer.Value, (nuint)_length); + } + else + { + ThrowHelper.ThrowArgumentException_DestinationTooShort(); + } + } + + /// Copies the contents of this read-only span into destination span. If the source + /// and destinations overlap, this method behaves as if the original values in + /// a temporary location before the destination is overwritten. + /// + /// If the destination span is shorter than the source span, this method + /// return false and no data is written to the destination. + /// The span to copy items into. + public bool TryCopyTo(Span destination) + { + bool retVal = false; + if ((uint)_length <= (uint)destination.Length) + { + Buffer.Memmove(ref destination._pointer.Value, ref _pointer.Value, (nuint)_length); + retVal = true; + } + return retVal; + } + + /// + /// Returns true if left and right point at the same memory and have the same length. Note that + /// this does *not* check to see if the *contents* are equal. + /// + public static bool operator ==(ReadOnlySpan left, ReadOnlySpan right) + { + return left._length == right._length && Unsafe.AreSame(ref left._pointer.Value, ref right._pointer.Value); + } + + /// + /// For , returns a new instance of string that represents the characters pointed to by the span. + /// Otherwise, returns a with the name of the type and the number of elements. + /// + public override string ToString() + { + if (typeof(T) == typeof(char)) + { + unsafe + { + fixed (char* src = &Unsafe.As(ref _pointer.Value)) + return new string(src, 0, _length); + } + } + return string.Format("System.ReadOnlySpan<{0}>[{1}]", typeof(T).Name, _length); + } + + /// + /// Forms a slice out of the given read-only span, beginning at 'start'. + /// + /// The index at which to begin this slice. + /// + /// Thrown when the specified index is not in range (<0 or >=Length). + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public ReadOnlySpan Slice(int start) + { + if ((uint)start > (uint)_length) + ThrowHelper.ThrowArgumentOutOfRangeException(); + + return new ReadOnlySpan(ref Unsafe.Add(ref _pointer.Value, start), _length - start); + } + + /// + /// Forms a slice out of the given read-only span, beginning at 'start', of given length + /// + /// The index at which to begin this slice. + /// The desired length for the slice (exclusive). + /// + /// Thrown when the specified or end index is not in range (<0 or >=Length). + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public ReadOnlySpan Slice(int start, int length) + { + if ((uint)start > (uint)_length || (uint)length > (uint)(_length - start)) + ThrowHelper.ThrowArgumentOutOfRangeException(); + + return new ReadOnlySpan(ref Unsafe.Add(ref _pointer.Value, start), length); + } + + /// + /// Copies the contents of this read-only span into a new array. This heap + /// allocates, so should generally be avoided, however it is sometimes + /// necessary to bridge the gap with APIs written in terms of arrays. + /// + public T[] ToArray() + { + if (_length == 0) + return Array.Empty(); + + var destination = new T[_length]; + Buffer.Memmove(ref Unsafe.As(ref destination.GetRawSzArrayData()), ref _pointer.Value, (nuint)_length); + return destination; + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/ReadOnlySpan.cs b/external/corefx/src/Common/src/CoreLib/System/ReadOnlySpan.cs index 1854df40fa..1267438386 100644 --- a/external/corefx/src/Common/src/CoreLib/System/ReadOnlySpan.cs +++ b/external/corefx/src/Common/src/CoreLib/System/ReadOnlySpan.cs @@ -2,11 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +#if !MONO using System.ComponentModel; +#endif using System.Diagnostics; using System.Runtime.CompilerServices; +#if !FEATURE_PORTABLE_SPAN using System.Runtime.Versioning; -using Internal.Runtime.CompilerServices; +#endif // !FEATURE_PORTABLE_SPAN #pragma warning disable 0809 //warning CS0809: Obsolete member 'Span.Equals(object)' overrides non-obsolete member 'object.Equals(object)' @@ -17,128 +20,17 @@ namespace System /// or native memory, or to memory allocated on the stack. It is type- and memory-safe. /// [DebuggerTypeProxy(typeof(SpanDebugView<>))] - [DebuggerDisplay("{DebuggerDisplay,nq}")] - [NonVersionable] - public readonly ref struct ReadOnlySpan + [DebuggerDisplay("{ToString(),raw}")] + public readonly ref partial struct ReadOnlySpan { - /// A byref or a native ptr. - internal readonly ByReference _pointer; - /// The number of elements this ReadOnlySpan contains. -#if PROJECTN - [Bound] -#endif - private readonly int _length; - - /// - /// Creates a new read-only span over the entirety of the target array. - /// - /// The target array. - /// Thrown when is a null - /// reference (Nothing in Visual Basic). - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public ReadOnlySpan(T[] array) - { - if (array == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array); - - _pointer = new ByReference(ref Unsafe.As(ref array.GetRawSzArrayData())); - _length = array.Length; - } - - /// - /// Creates a new read-only span over the portion of the target array beginning - /// at 'start' index and ending at 'end' index (exclusive). - /// - /// The target array. - /// The index at which to begin the read-only span. - /// The number of items in the read-only span. - /// Thrown when is a null - /// reference (Nothing in Visual Basic). - /// - /// Thrown when the specified or end index is not in the range (<0 or >=Length). - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public ReadOnlySpan(T[] array, int start, int length) - { - if (array == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array); - if ((uint)start > (uint)array.Length || (uint)length > (uint)(array.Length - start)) - ThrowHelper.ThrowArgumentOutOfRangeException(); - - _pointer = new ByReference(ref Unsafe.Add(ref Unsafe.As(ref array.GetRawSzArrayData()), start)); - _length = length; - } - - /// - /// Creates a new read-only span over the target unmanaged buffer. Clearly this - /// is quite dangerous, because we are creating arbitrarily typed T's - /// out of a void*-typed block of memory. And the length is not checked. - /// But if this creation is correct, then all subsequent uses are correct. - /// - /// An unmanaged pointer to memory. - /// The number of elements the memory contains. - /// - /// Thrown when is reference type or contains pointers and hence cannot be stored in unmanaged memory. - /// - /// - /// Thrown when the specified is negative. - /// - [CLSCompliant(false)] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public unsafe ReadOnlySpan(void* pointer, int length) - { - if (RuntimeHelpers.IsReferenceOrContainsReferences()) - ThrowHelper.ThrowInvalidTypeWithPointersNotSupported(typeof(T)); - if (length < 0) - ThrowHelper.ThrowArgumentOutOfRangeException(); - - _pointer = new ByReference(ref Unsafe.As(ref *(byte*)pointer)); - _length = length; - } - - /// - /// Create a new read-only span over a portion of a regular managed object. This can be useful - /// if part of a managed object represents a "fixed array." This is dangerous because neither the - /// is checked, nor being null, nor the fact that - /// "rawPointer" actually lies within . - /// - /// The managed object that contains the data to span over. - /// A reference to data within that object. - /// The number of elements the memory contains. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - [EditorBrowsable(EditorBrowsableState.Never)] - public static ReadOnlySpan DangerousCreate(object obj, ref T objectData, int length) => new ReadOnlySpan(ref objectData, length); - - // Constructor for internal use only. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - internal ReadOnlySpan(ref T ptr, int length) - { - Debug.Assert(length >= 0); - - _pointer = new ByReference(ref ptr); - _length = length; - } - - //Debugger Display = {T[length]} - private string DebuggerDisplay => string.Format("{{{0}[{1}]}}", typeof(T).Name, _length); - - /// - /// Returns a reference to the 0th element of the Span. If the Span is empty, returns a reference to the location where the 0th element - /// would have been stored. Such a reference can be used for pinning but must never be dereferenced. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - [EditorBrowsable(EditorBrowsableState.Never)] - internal ref readonly T DangerousGetPinnableReference() - { - return ref _pointer.Value; - } - /// /// The number of items in the read-only span. /// public int Length { +#if !FEATURE_PORTABLE_SPAN [NonVersionable] +#endif // !FEATURE_PORTABLE_SPAN get { return _length; @@ -150,84 +42,14 @@ namespace System /// public bool IsEmpty { +#if !FEATURE_PORTABLE_SPAN [NonVersionable] +#endif // !FEATURE_PORTABLE_SPAN get { return _length == 0; } } - - /// - /// Returns the specified element of the read-only span. - /// - /// - /// - /// - /// Thrown when index less than 0 or index greater than or equal to Length - /// - - public ref readonly T this[int index] - { -#if PROJECTN - [BoundsChecking] - get - { - return ref Unsafe.Add(ref _pointer.Value, index); - } -#else - [Intrinsic] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - [NonVersionable] - get - { - if ((uint)index >= (uint)_length) - ThrowHelper.ThrowIndexOutOfRangeException(); - return ref Unsafe.Add(ref _pointer.Value, index); - } -#endif - } - - /// - /// Copies the contents of this read-only span into destination span. If the source - /// and destinations overlap, this method behaves as if the original values in - /// a temporary location before the destination is overwritten. - /// - /// The span to copy items into. - /// - /// Thrown when the destination Span is shorter than the source Span. - /// - /// - public void CopyTo(Span destination) - { - if (!TryCopyTo(destination)) - ThrowHelper.ThrowArgumentException_DestinationTooShort(); - } - - /// Copies the contents of this read-only span into destination span. If the source - /// and destinations overlap, this method behaves as if the original values in - /// a temporary location before the destination is overwritten. - /// - /// If the destination span is shorter than the source span, this method - /// return false and no data is written to the destination. - /// The span to copy items into. - public bool TryCopyTo(Span destination) - { - if ((uint)_length > (uint)destination.Length) - return false; - - Span.CopyTo(ref destination.DangerousGetPinnableReference(), ref _pointer.Value, _length); - return true; - } - - /// - /// Returns true if left and right point at the same memory and have the same length. Note that - /// this does *not* check to see if the *contents* are equal. - /// - public static bool operator ==(ReadOnlySpan left, ReadOnlySpan right) - { - return left._length == right._length && Unsafe.AreSame(ref left._pointer.Value, ref right._pointer.Value); - } - /// /// Returns false if left and right point at the same memory and have the same length. Note that /// this does *not* check to see if the *contents* are equal. @@ -241,7 +63,9 @@ namespace System /// /// [Obsolete("Equals() on ReadOnlySpan will always throw an exception. Use == instead.")] +#if !MONO [EditorBrowsable(EditorBrowsableState.Never)] +#endif public override bool Equals(object obj) { throw new NotSupportedException(SR.NotSupported_CannotCallEqualsOnSpan); @@ -254,7 +78,9 @@ namespace System /// /// [Obsolete("GetHashCode() on ReadOnlySpan will always throw an exception.")] +#if !MONO [EditorBrowsable(EditorBrowsableState.Never)] +#endif public override int GetHashCode() { throw new NotSupportedException(SR.NotSupported_CannotCallGetHashCodeOnSpan); @@ -263,61 +89,13 @@ namespace System /// /// Defines an implicit conversion of an array to a /// - public static implicit operator ReadOnlySpan(T[] array) => array != null ? new ReadOnlySpan(array) : default; + public static implicit operator ReadOnlySpan(T[] array) => new ReadOnlySpan(array); /// /// Defines an implicit conversion of a to a /// - public static implicit operator ReadOnlySpan(ArraySegment arraySegment) - => arraySegment.Array != null ? new ReadOnlySpan(arraySegment.Array, arraySegment.Offset, arraySegment.Count) : default; - - /// - /// Forms a slice out of the given read-only span, beginning at 'start'. - /// - /// The index at which to begin this slice. - /// - /// Thrown when the specified index is not in range (<0 or >=Length). - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public ReadOnlySpan Slice(int start) - { - if ((uint)start > (uint)_length) - ThrowHelper.ThrowArgumentOutOfRangeException(); - - return new ReadOnlySpan(ref Unsafe.Add(ref _pointer.Value, start), _length - start); - } - - /// - /// Forms a slice out of the given read-only span, beginning at 'start', of given length - /// - /// The index at which to begin this slice. - /// The desired length for the slice (exclusive). - /// - /// Thrown when the specified or end index is not in range (<0 or >=Length). - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public ReadOnlySpan Slice(int start, int length) - { - if ((uint)start > (uint)_length || (uint)length > (uint)(_length - start)) - ThrowHelper.ThrowArgumentOutOfRangeException(); - - return new ReadOnlySpan(ref Unsafe.Add(ref _pointer.Value, start), length); - } - - /// - /// Copies the contents of this read-only span into a new array. This heap - /// allocates, so should generally be avoided, however it is sometimes - /// necessary to bridge the gap with APIs written in terms of arrays. - /// - public T[] ToArray() - { - if (_length == 0) - return Array.Empty(); - - var destination = new T[_length]; - Span.CopyTo(ref Unsafe.As(ref destination.GetRawSzArrayData()), ref _pointer.Value, _length); - return destination; - } + public static implicit operator ReadOnlySpan(ArraySegment segment) + => new ReadOnlySpan(segment.Array, segment.Offset, segment.Count); /// /// Returns a 0-length read-only span whose base is the null pointer. diff --git a/external/corefx/src/Common/src/CoreLib/System/Reflection/AmbiguousMatchException.cs b/external/corefx/src/Common/src/CoreLib/System/Reflection/AmbiguousMatchException.cs index 643a127c49..742d875143 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Reflection/AmbiguousMatchException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Reflection/AmbiguousMatchException.cs @@ -7,7 +7,9 @@ using System.Runtime.Serialization; namespace System.Reflection { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public sealed class AmbiguousMatchException : SystemException { public AmbiguousMatchException() diff --git a/external/corefx/src/Common/src/CoreLib/System/Reflection/InvalidFilterCriteriaException.cs b/external/corefx/src/Common/src/CoreLib/System/Reflection/InvalidFilterCriteriaException.cs index dedcc54f4c..d23446770f 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Reflection/InvalidFilterCriteriaException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Reflection/InvalidFilterCriteriaException.cs @@ -7,7 +7,9 @@ using System.Runtime.Serialization; namespace System.Reflection { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class InvalidFilterCriteriaException : ApplicationException { public InvalidFilterCriteriaException() diff --git a/external/corefx/src/Common/src/CoreLib/System/Reflection/ReflectionTypeLoadException.cs b/external/corefx/src/Common/src/CoreLib/System/Reflection/ReflectionTypeLoadException.cs index 5011c50053..ff20913edf 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Reflection/ReflectionTypeLoadException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Reflection/ReflectionTypeLoadException.cs @@ -8,7 +8,9 @@ using System.Text; namespace System.Reflection { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public sealed class ReflectionTypeLoadException : SystemException, ISerializable { public ReflectionTypeLoadException(Type[] classes, Exception[] exceptions) diff --git a/external/corefx/src/Common/src/CoreLib/System/Reflection/SignatureTypeExtensions.cs b/external/corefx/src/Common/src/CoreLib/System/Reflection/SignatureTypeExtensions.cs index 5847944f14..9247132546 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Reflection/SignatureTypeExtensions.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Reflection/SignatureTypeExtensions.cs @@ -9,6 +9,7 @@ using System.Diagnostics; namespace System.Reflection { #if CORERT + [System.Runtime.CompilerServices.ReflectionBlocked] public // Needs to be public so that Reflection.Core can see it. #else internal diff --git a/external/corefx/src/Common/src/CoreLib/System/Reflection/TargetException.cs b/external/corefx/src/Common/src/CoreLib/System/Reflection/TargetException.cs index c200000738..3d6a1817b4 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Reflection/TargetException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Reflection/TargetException.cs @@ -7,7 +7,9 @@ using System.Runtime.Serialization; namespace System.Reflection { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class TargetException : ApplicationException { public TargetException() diff --git a/external/corefx/src/Common/src/CoreLib/System/Reflection/TargetInvocationException.cs b/external/corefx/src/Common/src/CoreLib/System/Reflection/TargetInvocationException.cs index 822ddfdfb2..46be93239b 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Reflection/TargetInvocationException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Reflection/TargetInvocationException.cs @@ -7,7 +7,9 @@ using System.Runtime.Serialization; namespace System.Reflection { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public sealed class TargetInvocationException : ApplicationException { public TargetInvocationException(Exception inner) diff --git a/external/corefx/src/Common/src/CoreLib/System/Reflection/TargetParameterCountException.cs b/external/corefx/src/Common/src/CoreLib/System/Reflection/TargetParameterCountException.cs index c68c467290..3c80fe4c63 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Reflection/TargetParameterCountException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Reflection/TargetParameterCountException.cs @@ -7,7 +7,9 @@ using System.Runtime.Serialization; namespace System.Reflection { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public sealed class TargetParameterCountException : ApplicationException { public TargetParameterCountException() diff --git a/external/corefx/src/Common/src/CoreLib/System/Resources/MissingManifestResourceException.cs b/external/corefx/src/Common/src/CoreLib/System/Resources/MissingManifestResourceException.cs index 20914ac7e1..1080faed53 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Resources/MissingManifestResourceException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Resources/MissingManifestResourceException.cs @@ -8,7 +8,9 @@ using System.Runtime.Serialization; namespace System.Resources { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class MissingManifestResourceException : SystemException { public MissingManifestResourceException() diff --git a/external/corefx/src/Common/src/CoreLib/System/Resources/MissingSatelliteAssemblyException.cs b/external/corefx/src/Common/src/CoreLib/System/Resources/MissingSatelliteAssemblyException.cs index af547b21f1..ecc2117c1d 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Resources/MissingSatelliteAssemblyException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Resources/MissingSatelliteAssemblyException.cs @@ -21,7 +21,9 @@ using System.Runtime.Serialization; namespace System.Resources { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class MissingSatelliteAssemblyException : SystemException { private String _cultureName; diff --git a/external/corefx/src/Common/src/CoreLib/System/Resources/RuntimeResourceSet.cs b/external/corefx/src/Common/src/CoreLib/System/Resources/RuntimeResourceSet.cs index a63e68c19d..2cc8353eff 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Resources/RuntimeResourceSet.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Resources/RuntimeResourceSet.cs @@ -21,6 +21,7 @@ using System.Globalization; using System.Reflection; using System.Runtime.Versioning; using System.Diagnostics; +using System.Diagnostics.Private; namespace System.Resources { diff --git a/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/AsyncValueTaskMethodBuilder.cs b/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/AsyncValueTaskMethodBuilder.cs index b5ecd7924c..42cfc12ec3 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/AsyncValueTaskMethodBuilder.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/AsyncValueTaskMethodBuilder.cs @@ -8,6 +8,108 @@ using System.Threading.Tasks; namespace System.Runtime.CompilerServices { + /// Represents a builder for asynchronous methods that return a . + [StructLayout(LayoutKind.Auto)] + public struct AsyncValueTaskMethodBuilder + { + /// The to which most operations are delegated. + private AsyncTaskMethodBuilder _methodBuilder; // mutable struct; do not make it readonly + /// true if completed synchronously and successfully; otherwise, false. + private bool _haveResult; + /// true if the builder should be used for setting/getting the result; otherwise, false. + private bool _useBuilder; + + /// Creates an instance of the struct. + /// The initialized instance. + public static AsyncValueTaskMethodBuilder Create() => +#if CORERT + // corert's AsyncTaskMethodBuilder.Create() currently does additional debugger-related + // work, so we need to delegate to it. + new AsyncValueTaskMethodBuilder() { _methodBuilder = AsyncTaskMethodBuilder.Create() }; +#else + // _methodBuilder should be initialized to AsyncTaskMethodBuilder.Create(), but on coreclr + // that Create() is a nop, so we can just return the default here. + default; +#endif + + /// Begins running the builder with the associated state machine. + /// The type of the state machine. + /// The state machine instance, passed by reference. + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public void Start(ref TStateMachine stateMachine) where TStateMachine : IAsyncStateMachine => + // will provide the right ExecutionContext semantics +#if netstandard || MONO + _methodBuilder.Start(ref stateMachine); +#else + AsyncMethodBuilderCore.Start(ref stateMachine); +#endif + + /// Associates the builder with the specified state machine. + /// The state machine instance to associate with the builder. + public void SetStateMachine(IAsyncStateMachine stateMachine) => _methodBuilder.SetStateMachine(stateMachine); + + /// Marks the task as successfully completed. + public void SetResult() + { + if (_useBuilder) + { + _methodBuilder.SetResult(); + } + else + { + _haveResult = true; + } + } + + /// Marks the task as failed and binds the specified exception to the task. + /// The exception to bind to the task. + public void SetException(Exception exception) => _methodBuilder.SetException(exception); + + /// Gets the task for this builder. + public ValueTask Task + { + get + { + if (_haveResult) + { + return default; + } + else + { + _useBuilder = true; + return new ValueTask(_methodBuilder.Task); + } + } + } + + /// Schedules the state machine to proceed to the next action when the specified awaiter completes. + /// The type of the awaiter. + /// The type of the state machine. + /// The awaiter. + /// The state machine. + public void AwaitOnCompleted(ref TAwaiter awaiter, ref TStateMachine stateMachine) + where TAwaiter : INotifyCompletion + where TStateMachine : IAsyncStateMachine + { + _useBuilder = true; + _methodBuilder.AwaitOnCompleted(ref awaiter, ref stateMachine); + } + + /// Schedules the state machine to proceed to the next action when the specified awaiter completes. + /// The type of the awaiter. + /// The type of the state machine. + /// The awaiter. + /// The state machine. + [SecuritySafeCritical] + public void AwaitUnsafeOnCompleted(ref TAwaiter awaiter, ref TStateMachine stateMachine) + where TAwaiter : ICriticalNotifyCompletion + where TStateMachine : IAsyncStateMachine + { + _useBuilder = true; + _methodBuilder.AwaitUnsafeOnCompleted(ref awaiter, ref stateMachine); + } + } + /// Represents a builder for asynchronous methods that returns a . /// The type of the result. [StructLayout(LayoutKind.Auto)] @@ -32,14 +134,20 @@ namespace System.Runtime.CompilerServices #else // _methodBuilder should be initialized to AsyncTaskMethodBuilder.Create(), but on coreclr // that Create() is a nop, so we can just return the default here. - default(AsyncValueTaskMethodBuilder); + default; #endif /// Begins running the builder with the associated state machine. /// The type of the state machine. /// The state machine instance, passed by reference. + [MethodImpl(MethodImplOptions.AggressiveInlining)] public void Start(ref TStateMachine stateMachine) where TStateMachine : IAsyncStateMachine => - _methodBuilder.Start(ref stateMachine); // will provide the right ExecutionContext semantics + // will provide the right ExecutionContext semantics +#if netstandard || MONO + _methodBuilder.Start(ref stateMachine); +#else + AsyncMethodBuilderCore.Start(ref stateMachine); +#endif /// Associates the builder with the specified state machine. /// The state machine instance to associate with the builder. diff --git a/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/ConfiguredValueTaskAwaitable.cs b/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/ConfiguredValueTaskAwaitable.cs index 4e8ce691be..966676f5fe 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/ConfiguredValueTaskAwaitable.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/ConfiguredValueTaskAwaitable.cs @@ -3,11 +3,127 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.InteropServices; using System.Threading.Tasks; +using System.Threading.Tasks.Sources; + +#if !netstandard +using Internal.Runtime.CompilerServices; +#endif namespace System.Runtime.CompilerServices { + /// Provides an awaitable type that enables configured awaits on a . + [StructLayout(LayoutKind.Auto)] + public readonly struct ConfiguredValueTaskAwaitable + { + /// The wrapped . + private readonly ValueTask _value; + + /// Initializes the awaitable. + /// The wrapped . + [MethodImpl(MethodImplOptions.AggressiveInlining)] + internal ConfiguredValueTaskAwaitable(ValueTask value) => _value = value; + + /// Returns an awaiter for this instance. + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public ConfiguredValueTaskAwaiter GetAwaiter() => new ConfiguredValueTaskAwaiter(_value); + + /// Provides an awaiter for a . + [StructLayout(LayoutKind.Auto)] + public readonly struct ConfiguredValueTaskAwaiter : ICriticalNotifyCompletion +#if CORECLR + , IStateMachineBoxAwareAwaiter +#endif + { + /// The value being awaited. + private readonly ValueTask _value; + + /// Initializes the awaiter. + /// The value to be awaited. + [MethodImpl(MethodImplOptions.AggressiveInlining)] + internal ConfiguredValueTaskAwaiter(ValueTask value) => _value = value; + + /// Gets whether the has completed. + public bool IsCompleted + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + get => _value.IsCompleted; + } + + /// Gets the result of the ValueTask. + [MethodImpl(MethodImplOptions.AggressiveInlining)] + [StackTraceHidden] + public void GetResult() => _value.ThrowIfCompletedUnsuccessfully(); + + /// Schedules the continuation action for the . + public void OnCompleted(Action continuation) + { + object obj = _value._obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); + + if (obj is Task t) + { + t.ConfigureAwait(_value._continueOnCapturedContext).GetAwaiter().OnCompleted(continuation); + } + else if (obj != null) + { + Unsafe.As(obj).OnCompleted(ValueTaskAwaiter.s_invokeActionDelegate, continuation, _value._token, + ValueTaskSourceOnCompletedFlags.FlowExecutionContext | + (_value._continueOnCapturedContext ? ValueTaskSourceOnCompletedFlags.UseSchedulingContext : ValueTaskSourceOnCompletedFlags.None)); + } + else + { + ValueTask.CompletedTask.ConfigureAwait(_value._continueOnCapturedContext).GetAwaiter().OnCompleted(continuation); + } + } + + /// Schedules the continuation action for the . + public void UnsafeOnCompleted(Action continuation) + { + object obj = _value._obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); + + if (obj is Task t) + { + t.ConfigureAwait(_value._continueOnCapturedContext).GetAwaiter().UnsafeOnCompleted(continuation); + } + else if (obj != null) + { + Unsafe.As(obj).OnCompleted(ValueTaskAwaiter.s_invokeActionDelegate, continuation, _value._token, + _value._continueOnCapturedContext ? ValueTaskSourceOnCompletedFlags.UseSchedulingContext : ValueTaskSourceOnCompletedFlags.None); + } + else + { + ValueTask.CompletedTask.ConfigureAwait(_value._continueOnCapturedContext).GetAwaiter().UnsafeOnCompleted(continuation); + } + } + +#if CORECLR + void IStateMachineBoxAwareAwaiter.AwaitUnsafeOnCompleted(IAsyncStateMachineBox box) + { + object obj = _value._obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); + + if (obj is Task t) + { + TaskAwaiter.UnsafeOnCompletedInternal(t, box, _value._continueOnCapturedContext); + } + else if (obj != null) + { + Unsafe.As(obj).OnCompleted(ValueTaskAwaiter.s_invokeAsyncStateMachineBox, box, _value._token, + _value._continueOnCapturedContext ? ValueTaskSourceOnCompletedFlags.UseSchedulingContext : ValueTaskSourceOnCompletedFlags.None); + } + else + { + TaskAwaiter.UnsafeOnCompletedInternal(Task.CompletedTask, box, _value._continueOnCapturedContext); + } + } +#endif + } + } + /// Provides an awaitable type that enables configured awaits on a . /// The type of the result produced. [StructLayout(LayoutKind.Auto)] @@ -15,74 +131,107 @@ namespace System.Runtime.CompilerServices { /// The wrapped . private readonly ValueTask _value; - /// true to attempt to marshal the continuation back to the original context captured; otherwise, false. - private readonly bool _continueOnCapturedContext; /// Initializes the awaitable. /// The wrapped . - /// - /// true to attempt to marshal the continuation back to the original synchronization context captured; otherwise, false. - /// - internal ConfiguredValueTaskAwaitable(ValueTask value, bool continueOnCapturedContext) - { - _value = value; - _continueOnCapturedContext = continueOnCapturedContext; - } + [MethodImpl(MethodImplOptions.AggressiveInlining)] + internal ConfiguredValueTaskAwaitable(ValueTask value) => _value = value; /// Returns an awaiter for this instance. - public ConfiguredValueTaskAwaiter GetAwaiter() => - new ConfiguredValueTaskAwaiter(_value, _continueOnCapturedContext); + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public ConfiguredValueTaskAwaiter GetAwaiter() => new ConfiguredValueTaskAwaiter(_value); /// Provides an awaiter for a . [StructLayout(LayoutKind.Auto)] - public struct ConfiguredValueTaskAwaiter : ICriticalNotifyCompletion, IConfiguredValueTaskAwaiter + public readonly struct ConfiguredValueTaskAwaiter : ICriticalNotifyCompletion +#if CORECLR + , IStateMachineBoxAwareAwaiter +#endif { /// The value being awaited. - private ValueTask _value; // Methods are called on this; avoid making it readonly so as to avoid unnecessary copies - /// The value to pass to ConfigureAwait. - internal readonly bool _continueOnCapturedContext; + private readonly ValueTask _value; /// Initializes the awaiter. /// The value to be awaited. - /// The value to pass to ConfigureAwait. - internal ConfiguredValueTaskAwaiter(ValueTask value, bool continueOnCapturedContext) - { - _value = value; - _continueOnCapturedContext = continueOnCapturedContext; - } + [MethodImpl(MethodImplOptions.AggressiveInlining)] + internal ConfiguredValueTaskAwaiter(ValueTask value) => _value = value; /// Gets whether the has completed. - public bool IsCompleted => _value.IsCompleted; + public bool IsCompleted + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + get => _value.IsCompleted; + } /// Gets the result of the ValueTask. + [MethodImpl(MethodImplOptions.AggressiveInlining)] [StackTraceHidden] - public TResult GetResult() => - _value._task == null ? - _value._result : - _value._task.GetAwaiter().GetResult(); + public TResult GetResult() => _value.Result; /// Schedules the continuation action for the . - public void OnCompleted(Action continuation) => - _value.AsTask().ConfigureAwait(_continueOnCapturedContext).GetAwaiter().OnCompleted(continuation); + public void OnCompleted(Action continuation) + { + object obj = _value._obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); + + if (obj is Task t) + { + t.ConfigureAwait(_value._continueOnCapturedContext).GetAwaiter().OnCompleted(continuation); + } + else if (obj != null) + { + Unsafe.As>(obj).OnCompleted(ValueTaskAwaiter.s_invokeActionDelegate, continuation, _value._token, + ValueTaskSourceOnCompletedFlags.FlowExecutionContext | + (_value._continueOnCapturedContext ? ValueTaskSourceOnCompletedFlags.UseSchedulingContext : ValueTaskSourceOnCompletedFlags.None)); + } + else + { + ValueTask.CompletedTask.ConfigureAwait(_value._continueOnCapturedContext).GetAwaiter().OnCompleted(continuation); + } + } /// Schedules the continuation action for the . - public void UnsafeOnCompleted(Action continuation) => - _value.AsTask().ConfigureAwait(_continueOnCapturedContext).GetAwaiter().UnsafeOnCompleted(continuation); + public void UnsafeOnCompleted(Action continuation) + { + object obj = _value._obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); - /// Gets the task underlying . - internal Task AsTask() => _value.AsTask(); + if (obj is Task t) + { + t.ConfigureAwait(_value._continueOnCapturedContext).GetAwaiter().UnsafeOnCompleted(continuation); + } + else if (obj != null) + { + Unsafe.As>(obj).OnCompleted(ValueTaskAwaiter.s_invokeActionDelegate, continuation, _value._token, + _value._continueOnCapturedContext ? ValueTaskSourceOnCompletedFlags.UseSchedulingContext : ValueTaskSourceOnCompletedFlags.None); + } + else + { + ValueTask.CompletedTask.ConfigureAwait(_value._continueOnCapturedContext).GetAwaiter().UnsafeOnCompleted(continuation); + } + } - /// Gets the task underlying the incomplete . - /// This method is used when awaiting and IsCompleted returned false; thus we expect the value task to be wrapping a non-null task. - (Task task, bool continueOnCapturedContext) IConfiguredValueTaskAwaiter.GetTask() => (_value.AsTaskExpectNonNull(), _continueOnCapturedContext); +#if CORECLR + void IStateMachineBoxAwareAwaiter.AwaitUnsafeOnCompleted(IAsyncStateMachineBox box) + { + object obj = _value._obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); + + if (obj is Task t) + { + TaskAwaiter.UnsafeOnCompletedInternal(t, box, _value._continueOnCapturedContext); + } + else if (obj != null) + { + Unsafe.As>(obj).OnCompleted(ValueTaskAwaiter.s_invokeAsyncStateMachineBox, box, _value._token, + _value._continueOnCapturedContext ? ValueTaskSourceOnCompletedFlags.UseSchedulingContext : ValueTaskSourceOnCompletedFlags.None); + } + else + { + TaskAwaiter.UnsafeOnCompletedInternal(Task.CompletedTask, box, _value._continueOnCapturedContext); + } + } +#endif } } - - /// - /// Internal interface used to enable extract the Task from arbitrary configured ValueTask awaiters. - /// - internal interface IConfiguredValueTaskAwaiter - { - (Task task, bool continueOnCapturedContext) GetTask(); - } } diff --git a/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/IntrinsicAttribute.cs b/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/IntrinsicAttribute.cs index 381b4c63f7..6bdd91d844 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/IntrinsicAttribute.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/IntrinsicAttribute.cs @@ -6,8 +6,8 @@ namespace System.Runtime.CompilerServices { // Calls to methods or references to fields marked with this attribute may be replaced at // some call sites with jit intrinsic expansions. - // Types marked with this attribute may be specially treated by the rumtime/compiler. - [AttributeUsage(AttributeTargets.Struct | AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Field, Inherited = false)] + // Types marked with this attribute may be specially treated by the runtime/compiler. + [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Field, Inherited = false)] internal sealed class IntrinsicAttribute : Attribute { } diff --git a/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/StringFreezingAttribute.cs b/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/StringFreezingAttribute.cs index 25a8bfbc26..59c5c0606b 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/StringFreezingAttribute.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/StringFreezingAttribute.cs @@ -6,6 +6,9 @@ namespace System.Runtime.CompilerServices { // Custom attribute to indicate that strings should be frozen. +#if MONO + [Serializable] +#endif [AttributeUsage(AttributeTargets.Assembly, Inherited = false)] public sealed class StringFreezingAttribute : Attribute { diff --git a/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/TypeForwardedFromAttribute.cs b/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/TypeForwardedFromAttribute.cs index c4a8558243..27dd645755 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/TypeForwardedFromAttribute.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/TypeForwardedFromAttribute.cs @@ -9,6 +9,9 @@ namespace System.Runtime.CompilerServices { public TypeForwardedFromAttribute(string assemblyFullName) { + if (string.IsNullOrEmpty(assemblyFullName)) + throw new ArgumentNullException(nameof(assemblyFullName)); + AssemblyFullName = assemblyFullName; } diff --git a/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/ValueTaskAwaiter.cs b/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/ValueTaskAwaiter.cs index 7bc8b5cc7d..b8eabed182 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/ValueTaskAwaiter.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/ValueTaskAwaiter.cs @@ -3,51 +3,222 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; using System.Threading.Tasks; +using System.Threading.Tasks.Sources; + +#if !netstandard +using Internal.Runtime.CompilerServices; +#endif namespace System.Runtime.CompilerServices { - /// Provides an awaiter for a . - public struct ValueTaskAwaiter : ICriticalNotifyCompletion, IValueTaskAwaiter + /// Provides an awaiter for a . + public readonly struct ValueTaskAwaiter : ICriticalNotifyCompletion +#if CORECLR + , IStateMachineBoxAwareAwaiter +#endif { + /// Shim used to invoke an passed as the state argument to a . + internal static readonly Action s_invokeActionDelegate = state => + { + if (!(state is Action action)) + { + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.state); + return; + } + + action(); + }; /// The value being awaited. - private ValueTask _value; // Methods are called on this; avoid making it readonly so as to avoid unnecessary copies + private readonly ValueTask _value; /// Initializes the awaiter. /// The value to be awaited. - internal ValueTaskAwaiter(ValueTask value) => _value = value; + [MethodImpl(MethodImplOptions.AggressiveInlining)] + internal ValueTaskAwaiter(ValueTask value) => _value = value; - /// Gets whether the has completed. - public bool IsCompleted => _value.IsCompleted; + /// Gets whether the has completed. + public bool IsCompleted + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + get => _value.IsCompleted; + } /// Gets the result of the ValueTask. [StackTraceHidden] - public TResult GetResult() => - _value._task == null ? - _value._result : - _value._task.GetAwaiter().GetResult(); + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public void GetResult() => _value.ThrowIfCompletedUnsuccessfully(); /// Schedules the continuation action for this ValueTask. - public void OnCompleted(Action continuation) => - _value.AsTask().ConfigureAwait(continueOnCapturedContext: true).GetAwaiter().OnCompleted(continuation); + public void OnCompleted(Action continuation) + { + object obj = _value._obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); + + if (obj is Task t) + { + t.GetAwaiter().OnCompleted(continuation); + } + else if (obj != null) + { + Unsafe.As(obj).OnCompleted(s_invokeActionDelegate, continuation, _value._token, ValueTaskSourceOnCompletedFlags.UseSchedulingContext | ValueTaskSourceOnCompletedFlags.FlowExecutionContext); + } + else + { + ValueTask.CompletedTask.GetAwaiter().OnCompleted(continuation); + } + } /// Schedules the continuation action for this ValueTask. - public void UnsafeOnCompleted(Action continuation) => - _value.AsTask().ConfigureAwait(continueOnCapturedContext: true).GetAwaiter().UnsafeOnCompleted(continuation); + public void UnsafeOnCompleted(Action continuation) + { + object obj = _value._obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); - /// Gets the task underlying . - internal Task AsTask() => _value.AsTask(); + if (obj is Task t) + { + t.GetAwaiter().UnsafeOnCompleted(continuation); + } + else if (obj != null) + { + Unsafe.As(obj).OnCompleted(s_invokeActionDelegate, continuation, _value._token, ValueTaskSourceOnCompletedFlags.UseSchedulingContext); + } + else + { + ValueTask.CompletedTask.GetAwaiter().UnsafeOnCompleted(continuation); + } + } - /// Gets the task underlying the incomplete . - /// This method is used when awaiting and IsCompleted returned false; thus we expect the value task to be wrapping a non-null task. - Task IValueTaskAwaiter.GetTask() => _value.AsTaskExpectNonNull(); +#if CORECLR + void IStateMachineBoxAwareAwaiter.AwaitUnsafeOnCompleted(IAsyncStateMachineBox box) + { + object obj = _value._obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); + + if (obj is Task t) + { + TaskAwaiter.UnsafeOnCompletedInternal(t, box, continueOnCapturedContext: true); + } + else if (obj != null) + { + Unsafe.As(obj).OnCompleted(s_invokeAsyncStateMachineBox, box, _value._token, ValueTaskSourceOnCompletedFlags.UseSchedulingContext); + } + else + { + TaskAwaiter.UnsafeOnCompletedInternal(Task.CompletedTask, box, continueOnCapturedContext: true); + } + } + + /// Shim used to invoke of the supplied . + internal static readonly Action s_invokeAsyncStateMachineBox = state => + { + if (!(state is IAsyncStateMachineBox box)) + { + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.state); + return; + } + + box.MoveNext(); + }; +#endif } - /// - /// Internal interface used to enable extract the Task from arbitrary ValueTask awaiters. - /// > - internal interface IValueTaskAwaiter + /// Provides an awaiter for a . + public readonly struct ValueTaskAwaiter : ICriticalNotifyCompletion +#if CORECLR + , IStateMachineBoxAwareAwaiter +#endif { - Task GetTask(); + /// The value being awaited. + private readonly ValueTask _value; + + /// Initializes the awaiter. + /// The value to be awaited. + [MethodImpl(MethodImplOptions.AggressiveInlining)] + internal ValueTaskAwaiter(ValueTask value) => _value = value; + + /// Gets whether the has completed. + public bool IsCompleted + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + get => _value.IsCompleted; + } + + /// Gets the result of the ValueTask. + [StackTraceHidden] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public TResult GetResult() => _value.Result; + + /// Schedules the continuation action for this ValueTask. + public void OnCompleted(Action continuation) + { + object obj = _value._obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); + + if (obj is Task t) + { + t.GetAwaiter().OnCompleted(continuation); + } + else if (obj != null) + { + Unsafe.As>(obj).OnCompleted(ValueTaskAwaiter.s_invokeActionDelegate, continuation, _value._token, ValueTaskSourceOnCompletedFlags.UseSchedulingContext | ValueTaskSourceOnCompletedFlags.FlowExecutionContext); + } + else + { + ValueTask.CompletedTask.GetAwaiter().OnCompleted(continuation); + } + } + + /// Schedules the continuation action for this ValueTask. + public void UnsafeOnCompleted(Action continuation) + { + object obj = _value._obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); + + if (obj is Task t) + { + t.GetAwaiter().UnsafeOnCompleted(continuation); + } + else if (obj != null) + { + Unsafe.As>(obj).OnCompleted(ValueTaskAwaiter.s_invokeActionDelegate, continuation, _value._token, ValueTaskSourceOnCompletedFlags.UseSchedulingContext); + } + else + { + ValueTask.CompletedTask.GetAwaiter().UnsafeOnCompleted(continuation); + } + } + +#if CORECLR + void IStateMachineBoxAwareAwaiter.AwaitUnsafeOnCompleted(IAsyncStateMachineBox box) + { + object obj = _value._obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); + + if (obj is Task t) + { + TaskAwaiter.UnsafeOnCompletedInternal(t, box, continueOnCapturedContext: true); + } + else if (obj != null) + { + Unsafe.As>(obj).OnCompleted(ValueTaskAwaiter.s_invokeAsyncStateMachineBox, box, _value._token, ValueTaskSourceOnCompletedFlags.UseSchedulingContext); + } + else + { + TaskAwaiter.UnsafeOnCompletedInternal(Task.CompletedTask, box, continueOnCapturedContext: true); + } + } +#endif } + +#if CORECLR + /// Internal interface used to enable optimizations from .> + internal interface IStateMachineBoxAwareAwaiter + { + /// Invoked to set of the as the awaiter's continuation. + /// The box object. + void AwaitUnsafeOnCompleted(IAsyncStateMachineBox box); + } +#endif } diff --git a/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/YieldAwaitable.cs b/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/YieldAwaitable.cs index c45ef2484c..8aed0fcd5a 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/YieldAwaitable.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/YieldAwaitable.cs @@ -47,6 +47,9 @@ namespace System.Runtime.CompilerServices /// Provides an awaiter that switches into a target environment. /// This type is intended for compiler use only. public readonly struct YieldAwaiter : ICriticalNotifyCompletion +#if CORECLR + , IStateMachineBoxAwareAwaiter +#endif { /// Gets whether a yield is not required. /// This property is intended for compiler user rather than use directly in code. @@ -115,6 +118,41 @@ namespace System.Runtime.CompilerServices } } +#if CORECLR + void IStateMachineBoxAwareAwaiter.AwaitUnsafeOnCompleted(IAsyncStateMachineBox box) + { + Debug.Assert(box != null); + + // If tracing is enabled, delegate the Action-based implementation. + if (TplEtwProvider.Log.IsEnabled()) + { + QueueContinuation(box.MoveNextAction, flowContext: false); + return; + } + + // Otherwise, this is the same logic as in QueueContinuation, except using + // an IAsyncStateMachineBox instead of an Action, and only for flowContext:false. + + SynchronizationContext syncCtx = SynchronizationContext.Current; + if (syncCtx != null && syncCtx.GetType() != typeof(SynchronizationContext)) + { + syncCtx.Post(s => ((IAsyncStateMachineBox)s).MoveNext(), box); + } + else + { + TaskScheduler scheduler = TaskScheduler.Current; + if (scheduler == TaskScheduler.Default) + { + ThreadPool.UnsafeQueueUserWorkItem(s => ((IAsyncStateMachineBox)s).MoveNext(), box); + } + else + { + Task.Factory.StartNew(s => ((IAsyncStateMachineBox)s).MoveNext(), box, default, TaskCreationOptions.PreferFairness, scheduler); + } + } + } +#endif + private static Action OutputCorrelationEtwEvent(Action continuation) { #if CORERT @@ -153,7 +191,6 @@ namespace System.Runtime.CompilerServices private static readonly WaitCallback s_waitCallbackRunAction = RunAction; /// SendOrPostCallback that invokes the Action supplied as object state. private static readonly SendOrPostCallback s_sendOrPostCallbackRunAction = RunAction; - /// Runs an Action delegate provided as state. /// The Action delegate to invoke. private static void RunAction(object state) { ((Action)state)(); } diff --git a/external/corefx/src/Common/src/CoreLib/System/Runtime/ConstrainedExecution/CriticalFinalizerObject.cs b/external/corefx/src/Common/src/CoreLib/System/Runtime/ConstrainedExecution/CriticalFinalizerObject.cs new file mode 100644 index 0000000000..3f35f816a3 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/Runtime/ConstrainedExecution/CriticalFinalizerObject.cs @@ -0,0 +1,28 @@ +// 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. + +/*============================================================ +** +** +** Deriving from this class will cause any finalizer you define to be critical +** (i.e. the finalizer is guaranteed to run, won't be aborted by the host and is +** run after the finalizers of other objects collected at the same time). +** +** +===========================================================*/ + +namespace System.Runtime.ConstrainedExecution +{ + public abstract class CriticalFinalizerObject + { + protected CriticalFinalizerObject() + { + } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1821:RemoveEmptyFinalizers")] + ~CriticalFinalizerObject() + { + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/ExternalException.cs b/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/ExternalException.cs index 160fe301e8..edfbf5216d 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/ExternalException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/ExternalException.cs @@ -21,7 +21,9 @@ namespace System.Runtime.InteropServices // Base exception for COM Interop errors &; Structured Exception Handler // exceptions. [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class ExternalException : SystemException { public ExternalException() diff --git a/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/MarshalDirectiveException.cs b/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/MarshalDirectiveException.cs index 1d0d59fab6..4ddf7e04f8 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/MarshalDirectiveException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/MarshalDirectiveException.cs @@ -18,7 +18,9 @@ using System.Runtime.Serialization; namespace System.Runtime.InteropServices { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class MarshalDirectiveException : SystemException { public MarshalDirectiveException() diff --git a/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/MemoryMarshal.Fast.cs b/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/MemoryMarshal.Fast.cs new file mode 100644 index 0000000000..80ae450b51 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/MemoryMarshal.Fast.cs @@ -0,0 +1,232 @@ +// 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; +using System.Runtime.CompilerServices; +using System.Collections.Generic; +using Internal.Runtime.CompilerServices; + +namespace System.Runtime.InteropServices +{ + /// + /// Provides a collection of methods for interoperating with , , + /// , and . + /// + public static partial class MemoryMarshal + { + /// + /// Casts a Span of one primitive type to Span of bytes. + /// That type may not contain pointers or references. This is checked at runtime in order to preserve type safety. + /// + /// The source slice, of type . + /// + /// Thrown when contains pointers. + /// + /// + /// Thrown if the Length property of the new Span would exceed Int32.MaxValue. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Span AsBytes(Span span) + where T : struct + { + if (RuntimeHelpers.IsReferenceOrContainsReferences()) + ThrowHelper.ThrowInvalidTypeWithPointersNotSupported(typeof(T)); + + return new Span( + ref Unsafe.As(ref GetReference(span)), + checked(span.Length * Unsafe.SizeOf())); + } + + /// + /// Casts a ReadOnlySpan of one primitive type to ReadOnlySpan of bytes. + /// That type may not contain pointers or references. This is checked at runtime in order to preserve type safety. + /// + /// The source slice, of type . + /// + /// Thrown when contains pointers. + /// + /// + /// Thrown if the Length property of the new Span would exceed Int32.MaxValue. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ReadOnlySpan AsBytes(ReadOnlySpan span) + where T : struct + { + if (RuntimeHelpers.IsReferenceOrContainsReferences()) + ThrowHelper.ThrowInvalidTypeWithPointersNotSupported(typeof(T)); + + return new ReadOnlySpan( + ref Unsafe.As(ref GetReference(span)), + checked(span.Length * Unsafe.SizeOf())); + } + + /// Creates a from a . + /// The . + /// A representing the same memory as the , but writable. + /// + /// must be used with extreme caution. is used + /// to represent immutable data and other memory that is not meant to be written to; instances created + /// by should not be written to. The method exists to enable variables typed + /// as but only used for reading to store a . + /// + public static Memory AsMemory(ReadOnlyMemory memory) => + Unsafe.As, Memory>(ref memory); + + /// + /// Returns a reference to the 0th element of the Span. If the Span is empty, returns a reference to the location where the 0th element + /// would have been stored. Such a reference may or may not be null. It can be used for pinning but must never be dereferenced. + /// + public static ref T GetReference(Span span) => ref span._pointer.Value; + + /// + /// Returns a reference to the 0th element of the ReadOnlySpan. If the ReadOnlySpan is empty, returns a reference to the location where the 0th element + /// would have been stored. Such a reference may or may not be null. It can be used for pinning but must never be dereferenced. + /// + public static ref T GetReference(ReadOnlySpan span) => ref span._pointer.Value; + + /// + /// Returns a reference to the 0th element of the Span. If the Span is empty, returns a reference to fake non-null pointer. Such a reference can be used + /// for pinning but must never be dereferenced. This is useful for interop with methods that do not accept null pointers for zero-sized buffers. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + internal static unsafe ref T GetNonNullPinnableReference(Span span) => ref (span.Length != 0) ? ref span._pointer.Value : ref Unsafe.AsRef((void*)1); + + /// + /// Returns a reference to the 0th element of the ReadOnlySpan. If the ReadOnlySpan is empty, returns a reference to fake non-null pointer. Such a reference + /// can be used for pinning but must never be dereferenced. This is useful for interop with methods that do not accept null pointers for zero-sized buffers. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + internal static unsafe ref T GetNonNullPinnableReference(ReadOnlySpan span) => ref (span.Length != 0) ? ref span._pointer.Value : ref Unsafe.AsRef((void*)1); + + /// + /// Casts a Span of one primitive type to another primitive type . + /// These types may not contain pointers or references. This is checked at runtime in order to preserve type safety. + /// + /// + /// Supported only for platforms that support misaligned memory access. + /// + /// The source slice, of type . + /// + /// Thrown when or contains pointers. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Span Cast(Span span) + where TFrom : struct + where TTo : struct + { + if (RuntimeHelpers.IsReferenceOrContainsReferences()) + ThrowHelper.ThrowInvalidTypeWithPointersNotSupported(typeof(TFrom)); + if (RuntimeHelpers.IsReferenceOrContainsReferences()) + ThrowHelper.ThrowInvalidTypeWithPointersNotSupported(typeof(TTo)); + + // Use unsigned integers - unsigned division by constant (especially by power of 2) + // and checked casts are faster and smaller. + uint fromSize = (uint)Unsafe.SizeOf(); + uint toSize = (uint)Unsafe.SizeOf(); + uint fromLength = (uint)span.Length; + int toLength; + if (fromSize == toSize) + { + // Special case for same size types - `(ulong)fromLength * (ulong)fromSize / (ulong)toSize` + // should be optimized to just `length` but the JIT doesn't do that today. + toLength = (int)fromLength; + } + else if (fromSize == 1) + { + // Special case for byte sized TFrom - `(ulong)fromLength * (ulong)fromSize / (ulong)toSize` + // becomes `(ulong)fromLength / (ulong)toSize` but the JIT can't narrow it down to `int` + // and can't eliminate the checked cast. This also avoids a 32 bit specific issue, + // the JIT can't eliminate long multiply by 1. + toLength = (int)(fromLength / toSize); + } + else + { + // Ensure that casts are done in such a way that the JIT is able to "see" + // the uint->ulong casts and the multiply together so that on 32 bit targets + // 32x32to64 multiplication is used. + ulong toLengthUInt64 = (ulong)fromLength * (ulong)fromSize / (ulong)toSize; + toLength = checked((int)toLengthUInt64); + } + + return new Span( + ref Unsafe.As(ref span._pointer.Value), + toLength); + } + + /// + /// Casts a ReadOnlySpan of one primitive type to another primitive type . + /// These types may not contain pointers or references. This is checked at runtime in order to preserve type safety. + /// + /// + /// Supported only for platforms that support misaligned memory access. + /// + /// The source slice, of type . + /// + /// Thrown when or contains pointers. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ReadOnlySpan Cast(ReadOnlySpan span) + where TFrom : struct + where TTo : struct + { + if (RuntimeHelpers.IsReferenceOrContainsReferences()) + ThrowHelper.ThrowInvalidTypeWithPointersNotSupported(typeof(TFrom)); + if (RuntimeHelpers.IsReferenceOrContainsReferences()) + ThrowHelper.ThrowInvalidTypeWithPointersNotSupported(typeof(TTo)); + + // Use unsigned integers - unsigned division by constant (especially by power of 2) + // and checked casts are faster and smaller. + uint fromSize = (uint)Unsafe.SizeOf(); + uint toSize = (uint)Unsafe.SizeOf(); + uint fromLength = (uint)span.Length; + int toLength; + if (fromSize == toSize) + { + // Special case for same size types - `(ulong)fromLength * (ulong)fromSize / (ulong)toSize` + // should be optimized to just `length` but the JIT doesn't do that today. + toLength = (int)fromLength; + } + else if (fromSize == 1) + { + // Special case for byte sized TFrom - `(ulong)fromLength * (ulong)fromSize / (ulong)toSize` + // becomes `(ulong)fromLength / (ulong)toSize` but the JIT can't narrow it down to `int` + // and can't eliminate the checked cast. This also avoids a 32 bit specific issue, + // the JIT can't eliminate long multiply by 1. + toLength = (int)(fromLength / toSize); + } + else + { + // Ensure that casts are done in such a way that the JIT is able to "see" + // the uint->ulong casts and the multiply together so that on 32 bit targets + // 32x32to64 multiplication is used. + ulong toLengthUInt64 = (ulong)fromLength * (ulong)fromSize / (ulong)toSize; + toLength = checked((int)toLengthUInt64); + } + + return new ReadOnlySpan( + ref Unsafe.As(ref MemoryMarshal.GetReference(span)), + toLength); + } + + /// + /// Create a new span over a portion of a regular managed object. This can be useful + /// if part of a managed object represents a "fixed array." This is dangerous because the + /// is not checked. + /// + /// A reference to data. + /// The number of elements the memory contains. + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Span CreateSpan(ref T reference, int length) => new Span(ref reference, length); + + /// + /// Create a new read-only span over a portion of a regular managed object. This can be useful + /// if part of a managed object represents a "fixed array." This is dangerous because the + /// is not checked. + /// + /// A reference to data. + /// The number of elements the memory contains. + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ReadOnlySpan CreateReadOnlySpan(ref T reference, int length) => new ReadOnlySpan(ref reference, length); + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/MemoryMarshal.cs b/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/MemoryMarshal.cs index 63e301beca..18577d2032 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/MemoryMarshal.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/MemoryMarshal.cs @@ -4,9 +4,12 @@ using System.Buffers; using System.Runtime.CompilerServices; -#if !FEATURE_PORTABLE_SPAN +using System.Collections.Generic; +using System.Diagnostics.Private; + +#if !netstandard using Internal.Runtime.CompilerServices; -#endif // FEATURE_PORTABLE_SPAN +#endif namespace System.Runtime.InteropServices { @@ -14,81 +17,265 @@ namespace System.Runtime.InteropServices /// Provides a collection of methods for interoperating with , , /// , and . /// - public static class MemoryMarshal + public static partial class MemoryMarshal { - /// Creates a from a . - /// The . - /// A representing the same memory as the , but writable. - /// - /// must be used with extreme caution. is used - /// to represent immutable data and other memory that is not meant to be written to; instances created - /// by should not be written to. The method exists to enable variables typed - /// as but only used for reading to store a . - /// - public static Memory AsMemory(ReadOnlyMemory readOnlyMemory) => - Unsafe.As, Memory>(ref readOnlyMemory); - -#if FEATURE_PORTABLE_SPAN - /// - /// Returns a reference to the 0th element of the Span. If the Span is empty, returns a reference to the location where the 0th element - /// would have been stored. Such a reference can be used for pinning but must never be dereferenced. - /// - public static ref T GetReference(Span span) - { - if (span.Pinnable == null) - unsafe { return ref Unsafe.AsRef(span.ByteOffset.ToPointer()); } - else - return ref Unsafe.AddByteOffset(ref span.Pinnable.Data, span.ByteOffset); - } - - /// - /// Returns a reference to the 0th element of the ReadOnlySpan. If the Span is empty, returns a reference to the location where the 0th element - /// would have been stored. Such a reference can be used for pinning but must never be dereferenced. - /// - public static ref T GetReference(ReadOnlySpan span) - { - if (span.Pinnable == null) - unsafe { return ref Unsafe.AsRef(span.ByteOffset.ToPointer()); } - else - return ref Unsafe.AddByteOffset(ref span.Pinnable.Data, span.ByteOffset); - } -#else - /// - /// Returns a reference to the 0th element of the Span. If the Span is empty, returns a reference to the location where the 0th element - /// would have been stored. Such a reference can be used for pinning but must never be dereferenced. - /// - public static ref T GetReference(Span span) => ref span._pointer.Value; - - /// - /// Returns a reference to the 0th element of the ReadOnlySpan. If the Span is empty, returns a reference to the location where the 0th element - /// would have been stored. Such a reference can be used for pinning but must never be dereferenced. - /// - public static ref T GetReference(ReadOnlySpan span) => ref span._pointer.Value; -#endif // FEATURE_PORTABLE_SPAN - /// /// Get an array segment from the underlying memory. /// If unable to get the array segment, return false with a default array segment. /// - public static bool TryGetArray(ReadOnlyMemory readOnlyMemory, out ArraySegment arraySegment) + public static bool TryGetArray(ReadOnlyMemory memory, out ArraySegment segment) { - object obj = readOnlyMemory.GetObjectStartLength(out int index, out int length); + object obj = memory.GetObjectStartLength(out int index, out int length); if (index < 0) { - if (((OwnedMemory)obj).TryGetArray(out var segment)) + Debug.Assert(length >= 0); + if (((MemoryManager)obj).TryGetArray(out ArraySegment arraySegment)) { - arraySegment = new ArraySegment(segment.Array, segment.Offset + (index & ReadOnlyMemory.RemoveOwnedFlagBitMask), length); + segment = new ArraySegment(arraySegment.Array, arraySegment.Offset + (index & ReadOnlyMemory.RemoveFlagsBitMask), length); return true; } } else if (obj is T[] arr) { - arraySegment = new ArraySegment(arr, index, length); + segment = new ArraySegment(arr, index, length & ReadOnlyMemory.RemoveFlagsBitMask); return true; } - arraySegment = default; + if ((length & ReadOnlyMemory.RemoveFlagsBitMask) == 0) + { +#if FEATURE_PORTABLE_SPAN + segment = new ArraySegment(SpanHelpers.PerTypeValues.EmptyArray); +#else + segment = ArraySegment.Empty; +#endif // FEATURE_PORTABLE_SPAN + return true; + } + + segment = default; return false; } + + /// + /// Gets an from the underlying read-only memory. + /// If unable to get the type, returns false. + /// + /// The element type of the . + /// The type of to try and retrive. + /// The memory to get the manager for. + /// The returned manager of the . + /// A indicating if it was successful. + public static bool TryGetMemoryManager(ReadOnlyMemory memory, out TManager manager) + where TManager : MemoryManager + { + TManager localManager; // Use register for null comparison rather than byref + manager = localManager = memory.GetObjectStartLength(out _, out _) as TManager; + return !ReferenceEquals(manager, null); + } + + /// + /// Gets an and , from the underlying read-only memory. + /// If unable to get the type, returns false. + /// + /// The element type of the . + /// The type of to try and retrive. + /// The memory to get the manager for. + /// The returned manager of the . + /// The offset from the start of the that the represents. + /// The length of the that the represents. + /// A indicating if it was successful. + public static bool TryGetMemoryManager(ReadOnlyMemory memory, out TManager manager, out int start, out int length) + where TManager : MemoryManager + { + TManager localManager; // Use register for null comparison rather than byref + manager = localManager = memory.GetObjectStartLength(out start, out length) as TManager; + start &= ReadOnlyMemory.RemoveFlagsBitMask; + + Debug.Assert(length >= 0); + + if (ReferenceEquals(manager, null)) + { + start = default; + length = default; + return false; + } + return true; + } + + /// + /// Creates an view of the given to allow + /// the to be used in existing APIs that take an . + /// + /// The element type of the . + /// The ReadOnlyMemory to view as an + /// An view of the given + public static IEnumerable ToEnumerable(ReadOnlyMemory memory) + { + for (int i = 0; i < memory.Length; i++) + yield return memory.Span[i]; + } + + /// Attempts to get the underlying from a . + /// The memory that may be wrapping a object. + /// The string. + /// The starting location in . + /// The number of items in . + /// + public static bool TryGetString(ReadOnlyMemory memory, out string text, out int start, out int length) + { + if (memory.GetObjectStartLength(out int offset, out int count) is string s) + { + Debug.Assert(offset >= 0); + Debug.Assert(count >= 0); + text = s; + start = offset; + length = count; + return true; + } + else + { + text = null; + start = 0; + length = 0; + return false; + } + } + + /// + /// Reads a structure of type T out of a read-only span of bytes. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static T Read(ReadOnlySpan source) + where T : struct + { +#if netstandard + if (SpanHelpers.IsReferenceOrContainsReferences()) + { + ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(T)); + } +#else + if (RuntimeHelpers.IsReferenceOrContainsReferences()) + { + ThrowHelper.ThrowInvalidTypeWithPointersNotSupported(typeof(T)); + } +#endif + if (Unsafe.SizeOf() > source.Length) + { + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.length); + } + return Unsafe.ReadUnaligned(ref GetReference(source)); + } + + /// + /// Reads a structure of type T out of a span of bytes. + /// If the span is too small to contain the type T, return false. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static bool TryRead(ReadOnlySpan source, out T value) + where T : struct + { +#if netstandard + if (SpanHelpers.IsReferenceOrContainsReferences()) + { + ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(T)); + } +#else + if (RuntimeHelpers.IsReferenceOrContainsReferences()) + { + ThrowHelper.ThrowInvalidTypeWithPointersNotSupported(typeof(T)); + } +#endif + if (Unsafe.SizeOf() > (uint)source.Length) + { + value = default; + return false; + } + value = Unsafe.ReadUnaligned(ref GetReference(source)); + return true; + } + + /// + /// Writes a structure of type T into a span of bytes. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void Write(Span destination, ref T value) + where T : struct + { +#if netstandard + if (SpanHelpers.IsReferenceOrContainsReferences()) + { + ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(T)); + } +#else + if (RuntimeHelpers.IsReferenceOrContainsReferences()) + { + ThrowHelper.ThrowInvalidTypeWithPointersNotSupported(typeof(T)); + } +#endif + if ((uint)Unsafe.SizeOf() > (uint)destination.Length) + { + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.length); + } + Unsafe.WriteUnaligned(ref GetReference(destination), value); + } + + /// + /// Writes a structure of type T into a span of bytes. + /// If the span is too small to contain the type T, return false. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static bool TryWrite(Span destination, ref T value) + where T : struct + { +#if netstandard + if (SpanHelpers.IsReferenceOrContainsReferences()) + { + ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(T)); + } +#else + if (RuntimeHelpers.IsReferenceOrContainsReferences()) + { + ThrowHelper.ThrowInvalidTypeWithPointersNotSupported(typeof(T)); + } +#endif + if (Unsafe.SizeOf() > (uint)destination.Length) + { + return false; + } + Unsafe.WriteUnaligned(ref GetReference(destination), value); + return true; + } + + /// + /// Creates a new memory over the portion of the pre-pinned target array beginning + /// at 'start' index and ending at 'end' index (exclusive). + /// + /// The pre-pinned target array. + /// The index at which to begin the memory. + /// The number of items in the memory. + /// This method should only be called on an array that is already pinned and + /// that array should not be unpinned while the returned Memory is still in use. + /// Calling this method on an unpinned array could result in memory corruption. + /// Returns default when is null. + /// Thrown when is covariant and array's type is not exactly T[]. + /// + /// Thrown when the specified or end index is not in the range (<0 or >=Length). + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Memory CreateFromPinnedArray(T[] array, int start, int length) + { + if (array == null) + { + if (start != 0 || length != 0) + ThrowHelper.ThrowArgumentOutOfRangeException(); + return default; + } + if (default(T) == null && array.GetType() != typeof(T[])) + ThrowHelper.ThrowArrayTypeMismatchException(); + if ((uint)start > (uint)array.Length || (uint)length > (uint)(array.Length - start)) + ThrowHelper.ThrowArgumentOutOfRangeException(); + + // Before using _length, check if _length < 0, then 'and' it with RemoveFlagsBitMask + return new Memory((object)array, start, length | (1 << 31)); + } } } diff --git a/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/StringBuffer.cs b/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/StringBuffer.cs deleted file mode 100644 index fdd0b95590..0000000000 --- a/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/StringBuffer.cs +++ /dev/null @@ -1,301 +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; -using System.Runtime.CompilerServices; - -namespace System.Runtime.InteropServices -{ - /// - /// Buffer that deals in char size increments. Dispose to free memory. Always makes ordinal - /// comparisons. Not thread safe. - /// - /// A more performant replacement for StringBuilder when performing native interop. - /// - /// "No copy" valuetype. Has to be passed as "ref". - /// - /// - /// - /// Suggested use through P/Invoke: define DllImport arguments that take a character buffer as SafeHandle and pass StringBuffer.GetHandle(). - /// - internal struct StringBuffer - { - private char[] _buffer; - private int _length; - - /// - /// Instantiate the buffer with capacity for at least the specified number of characters. Capacity - /// includes the trailing null character. - /// - public StringBuffer(int initialCapacity) - { - _buffer = ArrayPool.Shared.Rent(initialCapacity); - _length = 0; - } - - /// - /// Get/set the character at the given index. - /// - /// Thrown if attempting to index outside of the buffer length. - public char this[int index] - { - [MethodImpl(MethodImplOptions.AggressiveInlining)] - get - { - if (index >= _length) throw new ArgumentOutOfRangeException(nameof(index)); - return _buffer[index]; - } - [MethodImpl(MethodImplOptions.AggressiveInlining)] - set - { - if (index >= _length) throw new ArgumentOutOfRangeException(nameof(index)); - _buffer[index] = value; - } - } - - /// - /// Underlying storage of the buffer. Used for interop. - /// - public char[] UnderlyingArray => _buffer; - - /// - /// Character capacity of the buffer. Includes the count for the trailing null character. - /// - public int Capacity => _buffer.Length; - - /// - /// Ensure capacity in characters is at least the given minimum. - /// - /// Thrown if unable to allocate memory when setting. - public void EnsureCapacity(int minCapacity) - { - if (minCapacity > Capacity) - { - char[] oldBuffer = _buffer; - _buffer = ArrayPool.Shared.Rent(minCapacity); - Array.Copy(oldBuffer, 0, _buffer, 0, oldBuffer.Length); - ArrayPool.Shared.Return(oldBuffer); - } - } - - /// - /// The logical length of the buffer in characters. (Does not include the final null.) Will automatically attempt to increase capacity. - /// This is where the usable data ends. - /// - /// Thrown if unable to allocate memory when setting. - /// Thrown if the set size in bytes is int.MaxValue (as space is implicitly reserved for the trailing null). - public int Length - { - get { return _length; } - set - { - // Null terminate - EnsureCapacity(checked(value + 1)); - _buffer[value] = '\0'; - - _length = value; - } - } - - /// - /// True if the buffer contains the given character. - /// - public unsafe bool Contains(char value) - { - fixed (char* start = _buffer) - { - int length = _length; - for (int i = 0; i < length; i++) - { - if (start[i] == value) return true; - } - } - - return false; - } - - /// - /// Returns true if the buffer starts with the given string. - /// - public bool StartsWith(string value) - { - if (value == null) throw new ArgumentNullException(nameof(value)); - if (_length < value.Length) return false; - return SubstringEquals(value, startIndex: 0, count: value.Length); - } - - /// - /// Returns true if the specified StringBuffer substring equals the given value. - /// - /// The value to compare against the specified substring. - /// Start index of the sub string. - /// Length of the substring, or -1 to check all remaining. - /// - /// Thrown if or are outside the range - /// of the buffer's length. - /// - public unsafe bool SubstringEquals(string value, int startIndex = 0, int count = -1) - { - if (value == null) return false; - if (count < -1) throw new ArgumentOutOfRangeException(nameof(count)); - if (startIndex > _length) throw new ArgumentOutOfRangeException(nameof(startIndex)); - - int realCount = count == -1 ? _length - startIndex : (int)count; - if (checked(startIndex + realCount) > _length) throw new ArgumentOutOfRangeException(nameof(count)); - - int length = value.Length; - - // Check the substring length against the input length - if (realCount != length) return false; - - fixed (char* valueStart = value) - fixed (char* bufferStart = _buffer) - { - char* subStringStart = bufferStart + startIndex; - - for (int i = 0; i < length; i++) - { - if (subStringStart[i] != valueStart[i]) return false; - } - } - - return true; - } - - /// - /// Append the given buffer. - /// - /// The buffer to append. - /// The index in the input buffer to start appending from. - /// The count of characters to copy from the buffer string. - /// Thrown if is null. - /// - /// Thrown if or are outside the range - /// of characters. - /// - public void Append(ref StringBuffer value, int startIndex = 0) - { - if (value.Length == 0) return; - - value.CopyTo( - bufferIndex: startIndex, - destination: ref this, - destinationIndex: _length, - count: value.Length); - } - - /// - /// Append the given buffer. - /// - /// The buffer to append. - /// The index in the input buffer to start appending from. - /// The count of characters to copy from the buffer string. - /// Thrown if is null. - /// - /// Thrown if or are outside the range - /// of characters. - /// - public void Append(ref StringBuffer value, int startIndex, int count) - { - if (count == 0) return; - - value.CopyTo( - bufferIndex: startIndex, - destination: ref this, - destinationIndex: _length, - count: count); - } - - /// - /// Copy contents to the specified buffer. Destination index must be within current destination length. - /// Will grow the destination buffer if needed. - /// - /// - /// Thrown if or or are outside the range - /// of characters. - /// - /// Thrown if is null. - public void CopyTo(int bufferIndex, ref StringBuffer destination, int destinationIndex, int count) - { - if (destinationIndex > destination._length) throw new ArgumentOutOfRangeException(nameof(destinationIndex)); - if (bufferIndex >= _length) throw new ArgumentOutOfRangeException(nameof(bufferIndex)); - if (_length < checked(bufferIndex + count)) throw new ArgumentOutOfRangeException(nameof(count)); - - if (count == 0) return; - int lastIndex = checked(destinationIndex + count); - if (destination.Length < lastIndex) destination.Length = lastIndex; - - Array.Copy(UnderlyingArray, bufferIndex, destination.UnderlyingArray, destinationIndex, count); - } - - /// - /// Copy contents from the specified string into the buffer at the given index. Start index must be within the current length of - /// the buffer, will grow as necessary. - /// - public void CopyFrom(int bufferIndex, string source, int sourceIndex = 0, int count = -1) - { - if (source == null) throw new ArgumentNullException(nameof(source)); - if (bufferIndex > _length) throw new ArgumentOutOfRangeException(nameof(bufferIndex)); - if (sourceIndex < 0 || sourceIndex > source.Length) throw new ArgumentOutOfRangeException(nameof(sourceIndex)); - if (count == -1) count = source.Length - sourceIndex; - if (count < 0 || source.Length - count < sourceIndex) throw new ArgumentOutOfRangeException(nameof(count)); - - if (count == 0) return; - int lastIndex = bufferIndex + (int)count; - if (_length < lastIndex) Length = lastIndex; - - source.CopyTo(sourceIndex, UnderlyingArray, bufferIndex, count); - } - - /// - /// Trim the specified values from the end of the buffer. If nothing is specified, nothing is trimmed. - /// - public void TrimEnd(char[] values) - { - if (values == null || values.Length == 0 || _length == 0) return; - - while (_length > 0 && Array.IndexOf(values, _buffer[_length - 1]) >= 0) - { - Length = _length - 1; - } - } - - /// - /// String representation of the entire buffer. If the buffer is larger than the maximum size string (int.MaxValue) this will throw. - /// - /// Thrown if the buffer is too big to fit into a string. - public override string ToString() - { - return new string(_buffer, startIndex: 0, length: _length); - } - - /// - /// Get the given substring in the buffer. - /// - /// Count of characters to take, or remaining characters from if -1. - /// - /// Thrown if or are outside the range of the buffer's length - /// or count is greater than the maximum string size (int.MaxValue). - /// - public string Substring(int startIndex, int count = -1) - { - if (startIndex > (_length == 0 ? 0 : _length - 1)) throw new ArgumentOutOfRangeException(nameof(startIndex)); - if (count < -1) throw new ArgumentOutOfRangeException(nameof(count)); - - int realCount = count == -1 ? _length - startIndex : (int)count; - if (realCount > int.MaxValue || checked(startIndex + realCount) > _length) throw new ArgumentOutOfRangeException(nameof(count)); - - // The buffer could be bigger than will fit into a string, but the substring might fit. As the starting - // index might be bigger than int we need to index ourselves. - return new string(_buffer, startIndex: startIndex, length: realCount); - } - - public void Free() - { - ArrayPool.Shared.Return(_buffer); - _buffer = null; - _length = 0; - } - } -} diff --git a/external/corefx/src/Common/src/CoreLib/System/Runtime/Serialization/SerializationException.cs b/external/corefx/src/Common/src/CoreLib/System/Runtime/Serialization/SerializationException.cs index 1c9c21eabb..5a877b9327 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Runtime/Serialization/SerializationException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Runtime/Serialization/SerializationException.cs @@ -7,7 +7,9 @@ using System.Runtime.Serialization; namespace System.Runtime.Serialization { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class SerializationException : SystemException { private static String s_nullMessage = SR.SerializationException; diff --git a/external/corefx/src/Common/src/CoreLib/System/Runtime/Serialization/SerializationInfoEnumerator.cs b/external/corefx/src/Common/src/CoreLib/System/Runtime/Serialization/SerializationInfoEnumerator.cs index 6399510736..b9df1016ce 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Runtime/Serialization/SerializationInfoEnumerator.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Runtime/Serialization/SerializationInfoEnumerator.cs @@ -4,6 +4,7 @@ using System.Collections; using System.Diagnostics; +using System.Diagnostics.Private; namespace System.Runtime.Serialization { diff --git a/external/corefx/src/Common/src/CoreLib/System/SByte.cs b/external/corefx/src/Common/src/CoreLib/System/SByte.cs index c7cee2adc2..5fedd0f343 100644 --- a/external/corefx/src/Common/src/CoreLib/System/SByte.cs +++ b/external/corefx/src/Common/src/CoreLib/System/SByte.cs @@ -11,7 +11,9 @@ namespace System { [Serializable] [CLSCompliant(false)] [StructLayout(LayoutKind.Sequential)] +#if !MONO [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public struct SByte : IComparable, IConvertible, IFormattable, IComparable, IEquatable, ISpanFormattable { private sbyte m_value; // Do not rename (binary serialization) diff --git a/external/corefx/src/Common/src/CoreLib/System/Security/SafeBSTRHandle.cs b/external/corefx/src/Common/src/CoreLib/System/Security/SafeBSTRHandle.cs index 227fed3fc3..bc93fecef1 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Security/SafeBSTRHandle.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Security/SafeBSTRHandle.cs @@ -50,7 +50,7 @@ namespace System.Security internal unsafe uint Length => Interop.OleAut32.SysStringLen(this); - internal unsafe static void Copy(SafeBSTRHandle source, SafeBSTRHandle target, uint bytesToCopy) + internal static unsafe void Copy(SafeBSTRHandle source, SafeBSTRHandle target, uint bytesToCopy) { if (bytesToCopy == 0) { diff --git a/external/corefx/src/Common/src/CoreLib/System/Security/SecureString.cs b/external/corefx/src/Common/src/CoreLib/System/Security/SecureString.cs index 9059f90e60..22f15accaa 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Security/SecureString.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Security/SecureString.cs @@ -2,9 +2,9 @@ // 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; using System.Diagnostics; using System.Runtime.InteropServices; +using System.Threading; namespace System.Security { @@ -43,11 +43,8 @@ namespace System.Security { get { - lock (_methodLock) - { - EnsureNotDisposed(); - return _decryptedLength; - } + EnsureNotDisposed(); + return Volatile.Read(ref _decryptedLength); } } @@ -108,20 +105,14 @@ namespace System.Security public bool IsReadOnly() { - lock (_methodLock) - { - EnsureNotDisposed(); - return _readOnly; - } + EnsureNotDisposed(); + return Volatile.Read(ref _readOnly); } public void MakeReadOnly() { - lock (_methodLock) - { - EnsureNotDisposed(); - _readOnly = true; - } + EnsureNotDisposed(); + Volatile.Write(ref _readOnly, true); } public void RemoveAt(int index) diff --git a/external/corefx/src/Common/src/CoreLib/System/Security/VerificationException.cs b/external/corefx/src/Common/src/CoreLib/System/Security/VerificationException.cs index e2afd4cabe..66abf52458 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Security/VerificationException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Security/VerificationException.cs @@ -7,7 +7,9 @@ using System.Runtime.Serialization; namespace System.Security { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class VerificationException : SystemException { public VerificationException() diff --git a/external/corefx/src/Common/src/CoreLib/System/Single.cs b/external/corefx/src/Common/src/CoreLib/System/Single.cs index df97427d38..7cb1bd449e 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Single.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Single.cs @@ -16,11 +16,15 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Versioning; +using Internal.Runtime.CompilerServices; + namespace System { [Serializable] [StructLayout(LayoutKind.Sequential)] +#if !MONO [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public struct Single : IComparable, IConvertible, IFormattable, IComparable, IEquatable, ISpanFormattable { private float m_value; // Do not rename (binary serialization) @@ -50,7 +54,7 @@ namespace System /// Determines whether the specified value is infinite. [NonVersionable] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public unsafe static bool IsInfinity(float f) + public static unsafe bool IsInfinity(float f) { var bits = BitConverter.SingleToInt32Bits(f); return (bits & 0x7FFFFFFF) == 0x7F800000; @@ -59,7 +63,7 @@ namespace System /// Determines whether the specified value is NaN. [NonVersionable] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public unsafe static bool IsNaN(float f) + public static unsafe bool IsNaN(float f) { var bits = BitConverter.SingleToInt32Bits(f); return (bits & 0x7FFFFFFF) > 0x7F800000; @@ -68,7 +72,7 @@ namespace System /// Determines whether the specified value is negative. [NonVersionable] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public unsafe static bool IsNegative(float f) + public static unsafe bool IsNegative(float f) { var bits = unchecked((uint)BitConverter.SingleToInt32Bits(f)); return (bits & 0x80000000) == 0x80000000; @@ -77,7 +81,7 @@ namespace System /// Determines whether the specified value is negative infinity. [NonVersionable] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public unsafe static bool IsNegativeInfinity(float f) + public static unsafe bool IsNegativeInfinity(float f) { return (f == float.NegativeInfinity); } @@ -85,7 +89,7 @@ namespace System /// Determines whether the specified value is normal. [NonVersionable] // This is probably not worth inlining, it has branches and should be rarely called - public unsafe static bool IsNormal(float f) + public static unsafe bool IsNormal(float f) { var bits = BitConverter.SingleToInt32Bits(f); bits &= 0x7FFFFFFF; @@ -95,7 +99,7 @@ namespace System /// Determines whether the specified value is positive infinity. [NonVersionable] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public unsafe static bool IsPositiveInfinity(float f) + public static unsafe bool IsPositiveInfinity(float f) { return (f == float.PositiveInfinity); } @@ -103,7 +107,7 @@ namespace System /// Determines whether the specified value is subnormal. [NonVersionable] // This is probably not worth inlining, it has branches and should be rarely called - public unsafe static bool IsSubnormal(float f) + public static unsafe bool IsSubnormal(float f) { var bits = BitConverter.SingleToInt32Bits(f); bits &= 0x7FFFFFFF; @@ -213,16 +217,18 @@ namespace System return IsNaN(obj) && IsNaN(m_value); } - public unsafe override int GetHashCode() + public override int GetHashCode() { - float f = m_value; - if (f == 0) + var bits = Unsafe.As(ref m_value); + + // Optimized check for IsNan() || IsZero() + if (((bits - 1) & 0x7FFFFFFF) >= 0x7F800000) { - // Ensure that 0 and -0 have the same hash code - return 0; + // Ensure that all NaNs and both zeros have the same hash code + bits &= 0x7F800000; } - int v = *(int*)(&f); - return v; + + return bits; } public override String ToString() @@ -284,7 +290,7 @@ namespace System return Number.ParseSingle(s, style, NumberFormatInfo.GetInstance(provider)); } - public static float Parse(ReadOnlySpan s, NumberStyles style = NumberStyles.Integer, IFormatProvider provider = null) + public static float Parse(ReadOnlySpan s, NumberStyles style = NumberStyles.Float | NumberStyles.AllowThousands, IFormatProvider provider = null) { NumberFormatInfo.ValidateParseStyleFloatingPoint(style); return Number.ParseSingle(s, style, NumberFormatInfo.GetInstance(provider)); @@ -331,15 +337,15 @@ namespace System if (!success) { ReadOnlySpan sTrim = s.Trim(); - if (StringSpanHelpers.Equals(sTrim, info.PositiveInfinitySymbol)) + if (sTrim.EqualsOrdinal(info.PositiveInfinitySymbol)) { result = PositiveInfinity; } - else if (StringSpanHelpers.Equals(sTrim, info.NegativeInfinitySymbol)) + else if (sTrim.EqualsOrdinal(info.NegativeInfinitySymbol)) { result = NegativeInfinity; } - else if (StringSpanHelpers.Equals(sTrim, info.NaNSymbol)) + else if (sTrim.EqualsOrdinal(info.NaNSymbol)) { result = NaN; } diff --git a/external/corefx/src/Common/src/CoreLib/System/Span.Fast.cs b/external/corefx/src/Common/src/CoreLib/System/Span.Fast.cs new file mode 100644 index 0000000000..3b6cb01d89 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/Span.Fast.cs @@ -0,0 +1,360 @@ +// 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. + +#if !MONO +using System.ComponentModel; +#endif +using System.Diagnostics; +using System.Diagnostics.Private; +using System.Runtime.CompilerServices; +using System.Runtime.Versioning; +using Internal.Runtime.CompilerServices; + +#pragma warning disable 0809 //warning CS0809: Obsolete member 'Span.Equals(object)' overrides non-obsolete member 'object.Equals(object)' + +#if BIT64 +using nuint = System.UInt64; +#else +using nuint = System.UInt32; +#endif + +namespace System +{ + /// + /// Span represents a contiguous region of arbitrary memory. Unlike arrays, it can point to either managed + /// or native memory, or to memory allocated on the stack. It is type- and memory-safe. + /// + [NonVersionable] + public readonly ref partial struct Span + { + /// A byref or a native ptr. + internal readonly ByReference _pointer; + /// The number of elements this Span contains. +#if PROJECTN + [Bound] +#endif + private readonly int _length; + + /// + /// Creates a new span over the entirety of the target array. + /// + /// The target array. + /// Returns default when is null. + /// reference (Nothing in Visual Basic). + /// Thrown when is covariant and array's type is not exactly T[]. + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Span(T[] array) + { + if (array == null) + { + this = default; + return; // returns default + } + if (default(T) == null && array.GetType() != typeof(T[])) + ThrowHelper.ThrowArrayTypeMismatchException(); + + _pointer = new ByReference(ref Unsafe.As(ref array.GetRawSzArrayData())); + _length = array.Length; + } + + /// + /// Creates a new span over the portion of the target array beginning + /// at 'start' index and ending at 'end' index (exclusive). + /// + /// The target array. + /// The index at which to begin the span. + /// The number of items in the span. + /// Returns default when is null. + /// reference (Nothing in Visual Basic). + /// Thrown when is covariant and array's type is not exactly T[]. + /// + /// Thrown when the specified or end index is not in the range (<0 or >=Length). + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Span(T[] array, int start, int length) + { + if (array == null) + { + if (start != 0 || length != 0) + ThrowHelper.ThrowArgumentOutOfRangeException(); + this = default; + return; // returns default + } + if (default(T) == null && array.GetType() != typeof(T[])) + ThrowHelper.ThrowArrayTypeMismatchException(); + if ((uint)start > (uint)array.Length || (uint)length > (uint)(array.Length - start)) + ThrowHelper.ThrowArgumentOutOfRangeException(); + + _pointer = new ByReference(ref Unsafe.Add(ref Unsafe.As(ref array.GetRawSzArrayData()), start)); + _length = length; + } + + /// + /// Creates a new span over the target unmanaged buffer. Clearly this + /// is quite dangerous, because we are creating arbitrarily typed T's + /// out of a void*-typed block of memory. And the length is not checked. + /// But if this creation is correct, then all subsequent uses are correct. + /// + /// An unmanaged pointer to memory. + /// The number of elements the memory contains. + /// + /// Thrown when is reference type or contains pointers and hence cannot be stored in unmanaged memory. + /// + /// + /// Thrown when the specified is negative. + /// + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public unsafe Span(void* pointer, int length) + { + if (RuntimeHelpers.IsReferenceOrContainsReferences()) + ThrowHelper.ThrowInvalidTypeWithPointersNotSupported(typeof(T)); + if (length < 0) + ThrowHelper.ThrowArgumentOutOfRangeException(); + + _pointer = new ByReference(ref Unsafe.As(ref *(byte*)pointer)); + _length = length; + } + + // Constructor for internal use only. + [MethodImpl(MethodImplOptions.AggressiveInlining)] + internal Span(ref T ptr, int length) + { + Debug.Assert(length >= 0); + + _pointer = new ByReference(ref ptr); + _length = length; + } + + /// Returns a reference to specified element of the Span. + /// + /// + /// + /// + /// Thrown when index less than 0 or index greater than or equal to Length + /// + public ref T this[int index] + { +#if PROJECTN + [BoundsChecking] + get + { + return ref Unsafe.Add(ref _pointer.Value, index); + } +#else + [Intrinsic] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + [NonVersionable] + get + { + if ((uint)index >= (uint)_length) + ThrowHelper.ThrowIndexOutOfRangeException(); + return ref Unsafe.Add(ref _pointer.Value, index); + } +#endif + } + + /// + /// Returns a reference to the 0th element of the Span. If the Span is empty, returns null reference. + /// It can be used for pinning and is required to support the use of span within a fixed statement. + /// +#if !MONO + [EditorBrowsable(EditorBrowsableState.Never)] +#endif + public unsafe ref T GetPinnableReference() => ref (_length != 0) ? ref _pointer.Value : ref Unsafe.AsRef(null); + + /// + /// Clears the contents of this span. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public void Clear() + { + if (RuntimeHelpers.IsReferenceOrContainsReferences()) + { + SpanHelpers.ClearWithReferences(ref Unsafe.As(ref _pointer.Value), (nuint)_length * (nuint)(Unsafe.SizeOf() / /*sizeof(nuint)*/ IntPtr.Size)); + } + else + { + SpanHelpers.ClearWithoutReferences(ref Unsafe.As(ref _pointer.Value), (nuint)_length * (nuint)Unsafe.SizeOf()); + } + } + + /// + /// Fills the contents of this span with the given value. + /// + public void Fill(T value) + { + if (Unsafe.SizeOf() == 1) + { + uint length = (uint)_length; + if (length == 0) + return; + + T tmp = value; // Avoid taking address of the "value" argument. It would regress performance of the loop below. + Unsafe.InitBlockUnaligned(ref Unsafe.As(ref _pointer.Value), Unsafe.As(ref tmp), length); + } + else + { + // Do all math as nuint to avoid unnecessary 64->32->64 bit integer truncations + nuint length = (uint)_length; + if (length == 0) + return; + + ref T r = ref _pointer.Value; + + // TODO: Create block fill for value types of power of two sizes e.g. 2,4,8,16 + + nuint elementSize = (uint)Unsafe.SizeOf(); + nuint i = 0; + for (; i < (length & ~(nuint)7); i += 8) + { + Unsafe.AddByteOffset(ref r, (i + 0) * elementSize) = value; + Unsafe.AddByteOffset(ref r, (i + 1) * elementSize) = value; + Unsafe.AddByteOffset(ref r, (i + 2) * elementSize) = value; + Unsafe.AddByteOffset(ref r, (i + 3) * elementSize) = value; + Unsafe.AddByteOffset(ref r, (i + 4) * elementSize) = value; + Unsafe.AddByteOffset(ref r, (i + 5) * elementSize) = value; + Unsafe.AddByteOffset(ref r, (i + 6) * elementSize) = value; + Unsafe.AddByteOffset(ref r, (i + 7) * elementSize) = value; + } + if (i < (length & ~(nuint)3)) + { + Unsafe.AddByteOffset(ref r, (i + 0) * elementSize) = value; + Unsafe.AddByteOffset(ref r, (i + 1) * elementSize) = value; + Unsafe.AddByteOffset(ref r, (i + 2) * elementSize) = value; + Unsafe.AddByteOffset(ref r, (i + 3) * elementSize) = value; + i += 4; + } + for (; i < length; i++) + { + Unsafe.AddByteOffset(ref r, i * elementSize) = value; + } + } + } + + /// + /// Copies the contents of this span into destination span. If the source + /// and destinations overlap, this method behaves as if the original values in + /// a temporary location before the destination is overwritten. + /// + /// The span to copy items into. + /// + /// Thrown when the destination Span is shorter than the source Span. + /// + public void CopyTo(Span destination) + { + // Using "if (!TryCopyTo(...))" results in two branches: one for the length + // check, and one for the result of TryCopyTo. Since these checks are equivalent, + // we can optimize by performing the check once ourselves then calling Memmove directly. + + if ((uint)_length <= (uint)destination.Length) + { + Buffer.Memmove(ref destination._pointer.Value, ref _pointer.Value, (nuint)_length); + } + else + { + ThrowHelper.ThrowArgumentException_DestinationTooShort(); + } + } + + /// + /// Copies the contents of this span into destination span. If the source + /// and destinations overlap, this method behaves as if the original values in + /// a temporary location before the destination is overwritten. + /// + /// The span to copy items into. + /// If the destination span is shorter than the source span, this method + /// return false and no data is written to the destination. + public bool TryCopyTo(Span destination) + { + bool retVal = false; + if ((uint)_length <= (uint)destination.Length) + { + Buffer.Memmove(ref destination._pointer.Value, ref _pointer.Value, (nuint)_length); + retVal = true; + } + return retVal; + } + + /// + /// Returns true if left and right point at the same memory and have the same length. Note that + /// this does *not* check to see if the *contents* are equal. + /// + public static bool operator ==(Span left, Span right) + { + return left._length == right._length && Unsafe.AreSame(ref left._pointer.Value, ref right._pointer.Value); + } + + /// + /// Defines an implicit conversion of a to a + /// + public static implicit operator ReadOnlySpan(Span span) => new ReadOnlySpan(ref span._pointer.Value, span._length); + + /// + /// For , returns a new instance of string that represents the characters pointed to by the span. + /// Otherwise, returns a with the name of the type and the number of elements. + /// + public override string ToString() + { + if (typeof(T) == typeof(char)) + { + unsafe + { + fixed (char* src = &Unsafe.As(ref _pointer.Value)) + return new string(src, 0, _length); + } + } + return string.Format("System.Span<{0}>[{1}]", typeof(T).Name, _length); + } + + /// + /// Forms a slice out of the given span, beginning at 'start'. + /// + /// The index at which to begin this slice. + /// + /// Thrown when the specified index is not in range (<0 or >=Length). + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Span Slice(int start) + { + if ((uint)start > (uint)_length) + ThrowHelper.ThrowArgumentOutOfRangeException(); + + return new Span(ref Unsafe.Add(ref _pointer.Value, start), _length - start); + } + + /// + /// Forms a slice out of the given span, beginning at 'start', of given length + /// + /// The index at which to begin this slice. + /// The desired length for the slice (exclusive). + /// + /// Thrown when the specified or end index is not in range (<0 or >=Length). + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Span Slice(int start, int length) + { + if ((uint)start > (uint)_length || (uint)length > (uint)(_length - start)) + ThrowHelper.ThrowArgumentOutOfRangeException(); + + return new Span(ref Unsafe.Add(ref _pointer.Value, start), length); + } + + /// + /// Copies the contents of this span into a new array. This heap + /// allocates, so should generally be avoided, however it is sometimes + /// necessary to bridge the gap with APIs written in terms of arrays. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public T[] ToArray() + { + if (_length == 0) + return Array.Empty(); + + var destination = new T[_length]; + Buffer.Memmove(ref Unsafe.As(ref destination.GetRawSzArrayData()), ref _pointer.Value, (nuint)_length); + return destination; + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/Span.NonGeneric.cs b/external/corefx/src/Common/src/CoreLib/System/Span.NonGeneric.cs deleted file mode 100644 index f6cd939a73..0000000000 --- a/external/corefx/src/Common/src/CoreLib/System/Span.NonGeneric.cs +++ /dev/null @@ -1,638 +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; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -using Internal.Runtime.CompilerServices; - -#if BIT64 -using nuint = System.UInt64; -#else -using nuint = System.UInt32; -#endif - -namespace System -{ - /// - /// Extension methods and non-generic helpers for Span, ReadOnlySpan, Memory, and ReadOnlyMemory. - /// - public static class Span - { - /// Creates a new over the portion of the target string. - /// The target string. - /// Thrown when is a null reference (Nothing in Visual Basic). - public static ReadOnlyMemory AsReadOnlyMemory(this string text) - { - if (text == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text); - - return new ReadOnlyMemory(text, 0, text.Length); - } - - /// Creates a new over the portion of the target string. - /// The target string. - /// Thrown when is a null reference (Nothing in Visual Basic). - /// - /// Thrown when the specified index is not in range (<0 or >text.Length). - /// - public static ReadOnlyMemory AsReadOnlyMemory(this string text, int start) - { - if (text == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text); - - if ((uint)start > (uint)text.Length) - ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); - - return new ReadOnlyMemory(text, start, text.Length - start); - } - - /// Creates a new over the portion of the target string. - /// The target string. - /// Thrown when is a null reference (Nothing in Visual Basic). - /// - /// Thrown when the specified index or is not in range. - /// - public static ReadOnlyMemory AsReadOnlyMemory(this string text, int start, int length) - { - if (text == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text); - - if ((uint)start > (uint)text.Length || (uint)length > (uint)(text.Length - start)) - ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); - - return new ReadOnlyMemory(text, start, length); - } - - /// Attempts to get the underlying from a . - /// The memory that may be wrapping a object. - /// The string. - /// The starting location in . - /// The number of items in . - /// - public static bool TryGetString(this ReadOnlyMemory readOnlyMemory, out string text, out int start, out int length) - { - if (readOnlyMemory.GetObjectStartLength(out int offset, out int count) is string s) - { - text = s; - start = offset; - length = count; - return true; - } - else - { - text = null; - start = 0; - length = 0; - return false; - } - } - - /// - /// Casts a Span of one primitive type to Span of bytes. - /// That type may not contain pointers or references. This is checked at runtime in order to preserve type safety. - /// - /// The source slice, of type . - /// - /// Thrown when contains pointers. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static Span AsBytes(this Span source) - where T : struct - { - if (RuntimeHelpers.IsReferenceOrContainsReferences()) - ThrowHelper.ThrowInvalidTypeWithPointersNotSupported(typeof(T)); - - return new Span( - ref Unsafe.As(ref MemoryMarshal.GetReference(source)), - checked(source.Length * Unsafe.SizeOf())); - } - - /// - /// Casts a ReadOnlySpan of one primitive type to ReadOnlySpan of bytes. - /// That type may not contain pointers or references. This is checked at runtime in order to preserve type safety. - /// - /// The source slice, of type . - /// - /// Thrown when contains pointers. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ReadOnlySpan AsBytes(this ReadOnlySpan source) - where T : struct - { - if (RuntimeHelpers.IsReferenceOrContainsReferences()) - ThrowHelper.ThrowInvalidTypeWithPointersNotSupported(typeof(T)); - - return new ReadOnlySpan( - ref Unsafe.As(ref MemoryMarshal.GetReference(source)), - checked(source.Length * Unsafe.SizeOf())); - } - - /// - /// Casts a Span of one primitive type to another primitive type . - /// These types may not contain pointers or references. This is checked at runtime in order to preserve type safety. - /// - /// - /// Supported only for platforms that support misaligned memory access. - /// - /// The source slice, of type . - /// - /// Thrown when or contains pointers. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static Span NonPortableCast(this Span source) - where TFrom : struct - where TTo : struct - { - if (RuntimeHelpers.IsReferenceOrContainsReferences()) - ThrowHelper.ThrowInvalidTypeWithPointersNotSupported(typeof(TFrom)); - if (RuntimeHelpers.IsReferenceOrContainsReferences()) - ThrowHelper.ThrowInvalidTypeWithPointersNotSupported(typeof(TTo)); - - return new Span( - ref Unsafe.As(ref source.DangerousGetPinnableReference()), - checked((int)((long)source.Length * Unsafe.SizeOf() / Unsafe.SizeOf()))); - } - - /// - /// Casts a ReadOnlySpan of one primitive type to another primitive type . - /// These types may not contain pointers or references. This is checked at runtime in order to preserve type safety. - /// - /// - /// Supported only for platforms that support misaligned memory access. - /// - /// The source slice, of type . - /// - /// Thrown when or contains pointers. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ReadOnlySpan NonPortableCast(this ReadOnlySpan source) - where TFrom : struct - where TTo : struct - { - if (RuntimeHelpers.IsReferenceOrContainsReferences()) - ThrowHelper.ThrowInvalidTypeWithPointersNotSupported(typeof(TFrom)); - if (RuntimeHelpers.IsReferenceOrContainsReferences()) - ThrowHelper.ThrowInvalidTypeWithPointersNotSupported(typeof(TTo)); - - return new ReadOnlySpan( - ref Unsafe.As(ref MemoryMarshal.GetReference(source)), - checked((int)((long)source.Length * Unsafe.SizeOf() / Unsafe.SizeOf()))); - } - - /// - /// Creates a new readonly span over the portion of the target string. - /// - /// The target string. - /// Thrown when is a null - /// reference (Nothing in Visual Basic). - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ReadOnlySpan AsReadOnlySpan(this string text) - { - if (text == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text); - - return new ReadOnlySpan(ref text.GetRawStringData(), text.Length); - } - - /// - /// Creates a new readonly span over the portion of the target string. - /// - /// The target string. - /// Thrown when is a null - /// reference (Nothing in Visual Basic). - /// - /// - /// Thrown when the specified index is not in range (<0 or >text.Length). - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ReadOnlySpan AsReadOnlySpan(this string text, int start) - { - if (text == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text); - - if ((uint)start > (uint)text.Length) - ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); - - return new ReadOnlySpan(ref Unsafe.Add(ref text.GetRawStringData(), start), text.Length - start); - } - - /// - /// Creates a new readonly span over the portion of the target string. - /// - /// The target string. - /// Thrown when is a null - /// reference (Nothing in Visual Basic). - /// - /// - /// Thrown when the specified index or is not in range. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ReadOnlySpan AsReadOnlySpan(this string text, int start, int length) - { - if (text == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text); - - if ((uint)start > (uint)text.Length || (uint)length > (uint)(text.Length - start)) - ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); - - return new ReadOnlySpan(ref Unsafe.Add(ref text.GetRawStringData(), start), length); - } - - internal static unsafe void CopyTo(ref T destination, ref T source, int elementsCount) - { - if (Unsafe.AreSame(ref destination, ref source)) - return; - - if (elementsCount <= 1) - { - if (elementsCount == 1) - { - destination = source; - } - return; - } - - nuint byteCount = (nuint)elementsCount * (nuint)Unsafe.SizeOf(); - if (!RuntimeHelpers.IsReferenceOrContainsReferences()) - { - fixed (byte* pDestination = &Unsafe.As(ref destination)) - { - fixed (byte* pSource = &Unsafe.As(ref source)) - { - Buffer.Memmove(pDestination, pSource, byteCount); - } - } - } - else - { - RuntimeImports.RhBulkMoveWithWriteBarrier( - ref Unsafe.As(ref destination), - ref Unsafe.As(ref source), - byteCount); - } - } - - internal static unsafe void ClearWithoutReferences(ref byte b, nuint byteLength) - { - if (byteLength == 0) - return; - -#if CORECLR && (AMD64 || ARM64) - if (byteLength > 4096) goto PInvoke; - Unsafe.InitBlockUnaligned(ref b, 0, (uint)byteLength); - return; -#else - // TODO: Optimize other platforms to be on par with AMD64 CoreCLR - // Note: It's important that this switch handles lengths at least up to 22. - // See notes below near the main loop for why. - - // The switch will be very fast since it can be implemented using a jump - // table in assembly. See http://stackoverflow.com/a/449297/4077294 for more info. - - switch (byteLength) - { - case 1: - b = 0; - return; - case 2: - Unsafe.As(ref b) = 0; - return; - case 3: - Unsafe.As(ref b) = 0; - Unsafe.Add(ref b, 2) = 0; - return; - case 4: - Unsafe.As(ref b) = 0; - return; - case 5: - Unsafe.As(ref b) = 0; - Unsafe.Add(ref b, 4) = 0; - return; - case 6: - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; - return; - case 7: - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; - Unsafe.Add(ref b, 6) = 0; - return; - case 8: -#if BIT64 - Unsafe.As(ref b) = 0; -#else - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; -#endif - return; - case 9: -#if BIT64 - Unsafe.As(ref b) = 0; -#else - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; -#endif - Unsafe.Add(ref b, 8) = 0; - return; - case 10: -#if BIT64 - Unsafe.As(ref b) = 0; -#else - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; -#endif - Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; - return; - case 11: -#if BIT64 - Unsafe.As(ref b) = 0; -#else - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; -#endif - Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; - Unsafe.Add(ref b, 10) = 0; - return; - case 12: -#if BIT64 - Unsafe.As(ref b) = 0; -#else - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; -#endif - Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; - return; - case 13: -#if BIT64 - Unsafe.As(ref b) = 0; -#else - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; -#endif - Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; - Unsafe.Add(ref b, 12) = 0; - return; - case 14: -#if BIT64 - Unsafe.As(ref b) = 0; -#else - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; -#endif - Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 12)) = 0; - return; - case 15: -#if BIT64 - Unsafe.As(ref b) = 0; -#else - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; -#endif - Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 12)) = 0; - Unsafe.Add(ref b, 14) = 0; - return; - case 16: -#if BIT64 - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; -#else - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 12)) = 0; -#endif - return; - case 17: -#if BIT64 - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; -#else - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 12)) = 0; -#endif - Unsafe.Add(ref b, 16) = 0; - return; - case 18: -#if BIT64 - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; -#else - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 12)) = 0; -#endif - Unsafe.As(ref Unsafe.Add(ref b, 16)) = 0; - return; - case 19: -#if BIT64 - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; -#else - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 12)) = 0; -#endif - Unsafe.As(ref Unsafe.Add(ref b, 16)) = 0; - Unsafe.Add(ref b, 18) = 0; - return; - case 20: -#if BIT64 - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; -#else - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 12)) = 0; -#endif - Unsafe.As(ref Unsafe.Add(ref b, 16)) = 0; - return; - case 21: -#if BIT64 - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; -#else - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 12)) = 0; -#endif - Unsafe.As(ref Unsafe.Add(ref b, 16)) = 0; - Unsafe.Add(ref b, 20) = 0; - return; - case 22: -#if BIT64 - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; -#else - Unsafe.As(ref b) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 12)) = 0; -#endif - Unsafe.As(ref Unsafe.Add(ref b, 16)) = 0; - Unsafe.As(ref Unsafe.Add(ref b, 20)) = 0; - return; - } - - // P/Invoke into the native version for large lengths - if (byteLength >= 512) goto PInvoke; - - nuint i = 0; // byte offset at which we're copying - - if ((Unsafe.As(ref b) & 3) != 0) - { - if ((Unsafe.As(ref b) & 1) != 0) - { - Unsafe.AddByteOffset(ref b, i) = 0; - i += 1; - if ((Unsafe.As(ref b) & 2) != 0) - goto IntAligned; - } - Unsafe.As(ref Unsafe.AddByteOffset(ref b, i)) = 0; - i += 2; - } - - IntAligned: - - // On 64-bit IntPtr.Size == 8, so we want to advance to the next 8-aligned address. If - // (int)b % 8 is 0, 5, 6, or 7, we will already have advanced by 0, 3, 2, or 1 - // bytes to the next aligned address (respectively), so do nothing. On the other hand, - // if it is 1, 2, 3, or 4 we will want to copy-and-advance another 4 bytes until - // we're aligned. - // The thing 1, 2, 3, and 4 have in common that the others don't is that if you - // subtract one from them, their 3rd lsb will not be set. Hence, the below check. - - if (((Unsafe.As(ref b) - 1) & 4) == 0) - { - Unsafe.As(ref Unsafe.AddByteOffset(ref b, i)) = 0; - i += 4; - } - - nuint end = byteLength - 16; - byteLength -= i; // lower 4 bits of byteLength represent how many bytes are left *after* the unrolled loop - - // We know due to the above switch-case that this loop will always run 1 iteration; max - // bytes we clear before checking is 23 (7 to align the pointers, 16 for 1 iteration) so - // the switch handles lengths 0-22. - Debug.Assert(end >= 7 && i <= end); - - // This is separated out into a different variable, so the i + 16 addition can be - // performed at the start of the pipeline and the loop condition does not have - // a dependency on the writes. - nuint counter; - - do - { - counter = i + 16; - - // This loop looks very costly since there appear to be a bunch of temporary values - // being created with the adds, but the jit (for x86 anyways) will convert each of - // these to use memory addressing operands. - - // So the only cost is a bit of code size, which is made up for by the fact that - // we save on writes to b. - -#if BIT64 - Unsafe.As(ref Unsafe.AddByteOffset(ref b, i)) = 0; - Unsafe.As(ref Unsafe.AddByteOffset(ref b, i + 8)) = 0; -#else - Unsafe.As(ref Unsafe.AddByteOffset(ref b, i)) = 0; - Unsafe.As(ref Unsafe.AddByteOffset(ref b, i + 4)) = 0; - Unsafe.As(ref Unsafe.AddByteOffset(ref b, i + 8)) = 0; - Unsafe.As(ref Unsafe.AddByteOffset(ref b, i + 12)) = 0; -#endif - - i = counter; - - // See notes above for why this wasn't used instead - // i += 16; - } - while (counter <= end); - - if ((byteLength & 8) != 0) - { -#if BIT64 - Unsafe.As(ref Unsafe.AddByteOffset(ref b, i)) = 0; -#else - Unsafe.As(ref Unsafe.AddByteOffset(ref b, i)) = 0; - Unsafe.As(ref Unsafe.AddByteOffset(ref b, i + 4)) = 0; -#endif - i += 8; - } - if ((byteLength & 4) != 0) - { - Unsafe.As(ref Unsafe.AddByteOffset(ref b, i)) = 0; - i += 4; - } - if ((byteLength & 2) != 0) - { - Unsafe.As(ref Unsafe.AddByteOffset(ref b, i)) = 0; - i += 2; - } - if ((byteLength & 1) != 0) - { - Unsafe.AddByteOffset(ref b, i) = 0; - // We're not using i after this, so not needed - // i += 1; - } - - return; -#endif - - PInvoke: - RuntimeImports.RhZeroMemory(ref b, byteLength); - } - - internal static unsafe void ClearWithReferences(ref IntPtr ip, nuint pointerSizeLength) - { - if (pointerSizeLength == 0) - return; - - // TODO: Perhaps do switch casing to improve small size perf - - nuint i = 0; - nuint n = 0; - while ((n = i + 8) <= (pointerSizeLength)) - { - Unsafe.AddByteOffset(ref ip, (i + 0) * (nuint)sizeof(IntPtr)) = default(IntPtr); - Unsafe.AddByteOffset(ref ip, (i + 1) * (nuint)sizeof(IntPtr)) = default(IntPtr); - Unsafe.AddByteOffset(ref ip, (i + 2) * (nuint)sizeof(IntPtr)) = default(IntPtr); - Unsafe.AddByteOffset(ref ip, (i + 3) * (nuint)sizeof(IntPtr)) = default(IntPtr); - Unsafe.AddByteOffset(ref ip, (i + 4) * (nuint)sizeof(IntPtr)) = default(IntPtr); - Unsafe.AddByteOffset(ref ip, (i + 5) * (nuint)sizeof(IntPtr)) = default(IntPtr); - Unsafe.AddByteOffset(ref ip, (i + 6) * (nuint)sizeof(IntPtr)) = default(IntPtr); - Unsafe.AddByteOffset(ref ip, (i + 7) * (nuint)sizeof(IntPtr)) = default(IntPtr); - i = n; - } - if ((n = i + 4) <= (pointerSizeLength)) - { - Unsafe.AddByteOffset(ref ip, (i + 0) * (nuint)sizeof(IntPtr)) = default(IntPtr); - Unsafe.AddByteOffset(ref ip, (i + 1) * (nuint)sizeof(IntPtr)) = default(IntPtr); - Unsafe.AddByteOffset(ref ip, (i + 2) * (nuint)sizeof(IntPtr)) = default(IntPtr); - Unsafe.AddByteOffset(ref ip, (i + 3) * (nuint)sizeof(IntPtr)) = default(IntPtr); - i = n; - } - if ((n = i + 2) <= (pointerSizeLength)) - { - Unsafe.AddByteOffset(ref ip, (i + 0) * (nuint)sizeof(IntPtr)) = default(IntPtr); - Unsafe.AddByteOffset(ref ip, (i + 1) * (nuint)sizeof(IntPtr)) = default(IntPtr); - i = n; - } - if ((i + 1) <= (pointerSizeLength)) - { - Unsafe.AddByteOffset(ref ip, (i + 0) * (nuint)sizeof(IntPtr)) = default(IntPtr); - } - } - } -} diff --git a/external/corefx/src/Common/src/CoreLib/System/Span.cs b/external/corefx/src/Common/src/CoreLib/System/Span.cs index 5a813174d9..8dd4bdd056 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Span.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Span.cs @@ -2,20 +2,17 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +#if !MONO using System.ComponentModel; +#endif using System.Diagnostics; using System.Runtime.CompilerServices; +#if !FEATURE_PORTABLE_SPAN using System.Runtime.Versioning; -using Internal.Runtime.CompilerServices; +#endif // !FEATURE_PORTABLE_SPAN #pragma warning disable 0809 //warning CS0809: Obsolete member 'Span.Equals(object)' overrides non-obsolete member 'object.Equals(object)' -#if BIT64 -using nuint = System.UInt64; -#else -using nuint = System.UInt32; -#endif - namespace System { /// @@ -23,134 +20,17 @@ namespace System /// or native memory, or to memory allocated on the stack. It is type- and memory-safe. /// [DebuggerTypeProxy(typeof(SpanDebugView<>))] - [DebuggerDisplay("{DebuggerDisplay,nq}")] - [NonVersionable] - public readonly ref struct Span + [DebuggerDisplay("{ToString(),raw}")] + public readonly ref partial struct Span { - /// A byref or a native ptr. - internal readonly ByReference _pointer; - /// The number of elements this Span contains. -#if PROJECTN - [Bound] -#endif - private readonly int _length; - - /// - /// Creates a new span over the entirety of the target array. - /// - /// The target array. - /// Thrown when is a null - /// reference (Nothing in Visual Basic). - /// Thrown when is covariant and array's type is not exactly T[]. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public Span(T[] array) - { - if (array == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array); - if (default(T) == null && array.GetType() != typeof(T[])) - ThrowHelper.ThrowArrayTypeMismatchException(); - - _pointer = new ByReference(ref Unsafe.As(ref array.GetRawSzArrayData())); - _length = array.Length; - } - - /// - /// Creates a new span over the portion of the target array beginning - /// at 'start' index and ending at 'end' index (exclusive). - /// - /// The target array. - /// The index at which to begin the span. - /// The number of items in the span. - /// Thrown when is a null - /// reference (Nothing in Visual Basic). - /// Thrown when is covariant and array's type is not exactly T[]. - /// - /// Thrown when the specified or end index is not in the range (<0 or >=Length). - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public Span(T[] array, int start, int length) - { - if (array == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array); - if (default(T) == null && array.GetType() != typeof(T[])) - ThrowHelper.ThrowArrayTypeMismatchException(); - if ((uint)start > (uint)array.Length || (uint)length > (uint)(array.Length - start)) - ThrowHelper.ThrowArgumentOutOfRangeException(); - - _pointer = new ByReference(ref Unsafe.Add(ref Unsafe.As(ref array.GetRawSzArrayData()), start)); - _length = length; - } - - /// - /// Creates a new span over the target unmanaged buffer. Clearly this - /// is quite dangerous, because we are creating arbitrarily typed T's - /// out of a void*-typed block of memory. And the length is not checked. - /// But if this creation is correct, then all subsequent uses are correct. - /// - /// An unmanaged pointer to memory. - /// The number of elements the memory contains. - /// - /// Thrown when is reference type or contains pointers and hence cannot be stored in unmanaged memory. - /// - /// - /// Thrown when the specified is negative. - /// - [CLSCompliant(false)] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public unsafe Span(void* pointer, int length) - { - if (RuntimeHelpers.IsReferenceOrContainsReferences()) - ThrowHelper.ThrowInvalidTypeWithPointersNotSupported(typeof(T)); - if (length < 0) - ThrowHelper.ThrowArgumentOutOfRangeException(); - - _pointer = new ByReference(ref Unsafe.As(ref *(byte*)pointer)); - _length = length; - } - - /// - /// Create a new span over a portion of a regular managed object. This can be useful - /// if part of a managed object represents a "fixed array." This is dangerous because neither the - /// is checked, nor being null, nor the fact that - /// "rawPointer" actually lies within . - /// - /// The managed object that contains the data to span over. - /// A reference to data within that object. - /// The number of elements the memory contains. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - [EditorBrowsable(EditorBrowsableState.Never)] - public static Span DangerousCreate(object obj, ref T objectData, int length) => new Span(ref objectData, length); - - // Constructor for internal use only. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - internal Span(ref T ptr, int length) - { - Debug.Assert(length >= 0); - - _pointer = new ByReference(ref ptr); - _length = length; - } - - //Debugger Display = {T[length]} - private string DebuggerDisplay => string.Format("{{{0}[{1}]}}", typeof(T).Name, _length); - - /// - /// Returns a reference to the 0th element of the Span. If the Span is empty, returns a reference to the location where the 0th element - /// would have been stored. Such a reference can be used for pinning but must never be dereferenced. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - [EditorBrowsable(EditorBrowsableState.Never)] - internal ref T DangerousGetPinnableReference() - { - return ref _pointer.Value; - } - /// /// The number of items in the span. /// public int Length { +#if !FEATURE_PORTABLE_SPAN [NonVersionable] +#endif // !FEATURE_PORTABLE_SPAN get { return _length; @@ -162,152 +42,15 @@ namespace System /// public bool IsEmpty { +#if !FEATURE_PORTABLE_SPAN [NonVersionable] +#endif // !FEATURE_PORTABLE_SPAN get { return _length == 0; } } - /// - /// Returns a reference to specified element of the Span. - /// - /// - /// - /// - /// Thrown when index less than 0 or index greater than or equal to Length - /// - public ref T this[int index] - { -#if PROJECTN - [BoundsChecking] - get - { - return ref Unsafe.Add(ref _pointer.Value, index); - } -#else - [Intrinsic] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - [NonVersionable] - get - { - if ((uint)index >= (uint)_length) - ThrowHelper.ThrowIndexOutOfRangeException(); - return ref Unsafe.Add(ref _pointer.Value, index); - } -#endif - } - - /// - /// Clears the contents of this span. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void Clear() - { - if (RuntimeHelpers.IsReferenceOrContainsReferences()) - { - Span.ClearWithReferences(ref Unsafe.As(ref _pointer.Value), (nuint)_length * (nuint)(Unsafe.SizeOf() / sizeof(nuint))); - } - else - { - Span.ClearWithoutReferences(ref Unsafe.As(ref _pointer.Value), (nuint)_length * (nuint)Unsafe.SizeOf()); - } - } - - /// - /// Fills the contents of this span with the given value. - /// - public void Fill(T value) - { - if (Unsafe.SizeOf() == 1) - { - uint length = (uint)_length; - if (length == 0) - return; - - T tmp = value; // Avoid taking address of the "value" argument. It would regress performance of the loop below. - Unsafe.InitBlockUnaligned(ref Unsafe.As(ref _pointer.Value), Unsafe.As(ref tmp), length); - } - else - { - // Do all math as nuint to avoid unnecessary 64->32->64 bit integer truncations - nuint length = (uint)_length; - if (length == 0) - return; - - ref T r = ref DangerousGetPinnableReference(); - - // TODO: Create block fill for value types of power of two sizes e.g. 2,4,8,16 - - nuint elementSize = (uint)Unsafe.SizeOf(); - nuint i = 0; - for (; i < (length & ~(nuint)7); i += 8) - { - Unsafe.AddByteOffset(ref r, (i + 0) * elementSize) = value; - Unsafe.AddByteOffset(ref r, (i + 1) * elementSize) = value; - Unsafe.AddByteOffset(ref r, (i + 2) * elementSize) = value; - Unsafe.AddByteOffset(ref r, (i + 3) * elementSize) = value; - Unsafe.AddByteOffset(ref r, (i + 4) * elementSize) = value; - Unsafe.AddByteOffset(ref r, (i + 5) * elementSize) = value; - Unsafe.AddByteOffset(ref r, (i + 6) * elementSize) = value; - Unsafe.AddByteOffset(ref r, (i + 7) * elementSize) = value; - } - if (i < (length & ~(nuint)3)) - { - Unsafe.AddByteOffset(ref r, (i + 0) * elementSize) = value; - Unsafe.AddByteOffset(ref r, (i + 1) * elementSize) = value; - Unsafe.AddByteOffset(ref r, (i + 2) * elementSize) = value; - Unsafe.AddByteOffset(ref r, (i + 3) * elementSize) = value; - i += 4; - } - for (; i < length; i++) - { - Unsafe.AddByteOffset(ref r, i * elementSize) = value; - } - } - } - - /// - /// Copies the contents of this span into destination span. If the source - /// and destinations overlap, this method behaves as if the original values in - /// a temporary location before the destination is overwritten. - /// - /// The span to copy items into. - /// - /// Thrown when the destination Span is shorter than the source Span. - /// - public void CopyTo(Span destination) - { - if (!TryCopyTo(destination)) - ThrowHelper.ThrowArgumentException_DestinationTooShort(); - } - - /// - /// Copies the contents of this span into destination span. If the source - /// and destinations overlap, this method behaves as if the original values in - /// a temporary location before the destination is overwritten. - /// - /// The span to copy items into. - /// If the destination span is shorter than the source span, this method - /// return false and no data is written to the destination. - public bool TryCopyTo(Span destination) - { - if ((uint)_length > (uint)destination.Length) - return false; - - Span.CopyTo(ref destination._pointer.Value, ref _pointer.Value, _length); - return true; - } - - /// - /// Returns true if left and right point at the same memory and have the same length. Note that - /// this does *not* check to see if the *contents* are equal. - /// - public static bool operator ==(Span left, Span right) - { - return left._length == right._length && Unsafe.AreSame(ref left._pointer.Value, ref right._pointer.Value); - } - /// /// Returns false if left and right point at the same memory and have the same length. Note that /// this does *not* check to see if the *contents* are equal. @@ -321,7 +64,9 @@ namespace System /// /// [Obsolete("Equals() on Span will always throw an exception. Use == instead.")] +#if !MONO [EditorBrowsable(EditorBrowsableState.Never)] +#endif public override bool Equals(object obj) { throw new NotSupportedException(SR.NotSupported_CannotCallEqualsOnSpan); @@ -334,7 +79,9 @@ namespace System /// /// [Obsolete("GetHashCode() on Span will always throw an exception.")] +#if !MONO [EditorBrowsable(EditorBrowsableState.Never)] +#endif public override int GetHashCode() { throw new NotSupportedException(SR.NotSupported_CannotCallGetHashCodeOnSpan); @@ -343,69 +90,15 @@ namespace System /// /// Defines an implicit conversion of an array to a /// - public static implicit operator Span(T[] array) => array != null ? new Span(array) : default; + public static implicit operator Span(T[] array) => new Span(array); /// /// Defines an implicit conversion of a to a /// - public static implicit operator Span(ArraySegment arraySegment) - => arraySegment.Array != null ? new Span(arraySegment.Array, arraySegment.Offset, arraySegment.Count) : default; + public static implicit operator Span(ArraySegment segment) + => new Span(segment.Array, segment.Offset, segment.Count); /// - /// Defines an implicit conversion of a to a - /// - public static implicit operator ReadOnlySpan(Span span) => new ReadOnlySpan(ref span._pointer.Value, span._length); - - /// - /// Forms a slice out of the given span, beginning at 'start'. - /// - /// The index at which to begin this slice. - /// - /// Thrown when the specified index is not in range (<0 or >=Length). - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public Span Slice(int start) - { - if ((uint)start > (uint)_length) - ThrowHelper.ThrowArgumentOutOfRangeException(); - - return new Span(ref Unsafe.Add(ref _pointer.Value, start), _length - start); - } - - /// - /// Forms a slice out of the given span, beginning at 'start', of given length - /// - /// The index at which to begin this slice. - /// The desired length for the slice (exclusive). - /// - /// Thrown when the specified or end index is not in range (<0 or >=Length). - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public Span Slice(int start, int length) - { - if ((uint)start > (uint)_length || (uint)length > (uint)(_length - start)) - ThrowHelper.ThrowArgumentOutOfRangeException(); - - return new Span(ref Unsafe.Add(ref _pointer.Value, start), length); - } - - /// - /// Copies the contents of this span into a new array. This heap - /// allocates, so should generally be avoided, however it is sometimes - /// necessary to bridge the gap with APIs written in terms of arrays. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public T[] ToArray() - { - if (_length == 0) - return Array.Empty(); - - var destination = new T[_length]; - Span.CopyTo(ref Unsafe.As(ref destination.GetRawSzArrayData()), ref _pointer.Value, _length); - return destination; - } - - // /// Returns an empty /// public static Span Empty => default(Span); diff --git a/external/corefx/src/System.Memory/src/System/SpanHelpers.BinarySearch.cs b/external/corefx/src/Common/src/CoreLib/System/SpanHelpers.BinarySearch.cs similarity index 96% rename from external/corefx/src/System.Memory/src/System/SpanHelpers.BinarySearch.cs rename to external/corefx/src/Common/src/CoreLib/System/SpanHelpers.BinarySearch.cs index cfd64f1e40..656b864e22 100644 --- a/external/corefx/src/System.Memory/src/System/SpanHelpers.BinarySearch.cs +++ b/external/corefx/src/Common/src/CoreLib/System/SpanHelpers.BinarySearch.cs @@ -15,7 +15,7 @@ namespace System internal static partial class SpanHelpers { [MethodImpl(MethodImplOptions.AggressiveInlining)] - internal static int BinarySearch( + public static int BinarySearch( this ReadOnlySpan span, TComparable comparable) where TComparable : IComparable { @@ -25,7 +25,7 @@ namespace System return BinarySearch(ref MemoryMarshal.GetReference(span), span.Length, comparable); } - internal static int BinarySearch( + public static int BinarySearch( ref T spanStart, int length, TComparable comparable) where TComparable : IComparable { diff --git a/external/corefx/src/System.Memory/src/System/SpanHelpers.byte.cs b/external/corefx/src/Common/src/CoreLib/System/SpanHelpers.Byte.cs similarity index 76% rename from external/corefx/src/System.Memory/src/System/SpanHelpers.byte.cs rename to external/corefx/src/Common/src/CoreLib/System/SpanHelpers.Byte.cs index e3c350d7a7..f6be744081 100644 --- a/external/corefx/src/System.Memory/src/System/SpanHelpers.byte.cs +++ b/external/corefx/src/Common/src/CoreLib/System/SpanHelpers.Byte.cs @@ -4,7 +4,7 @@ // 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.Diagnostics.Private; using System.Runtime.CompilerServices; #if !netstandard @@ -15,9 +15,15 @@ using Internal.Runtime.CompilerServices; using System.Numerics; #endif -#if MONO -using System.Diagnostics.Private; -#endif +#if netstandard +using nuint = System.NUInt; +#else +#if BIT64 +using nuint = System.UInt64; +#else +using nuint = System.UInt32; +#endif // BIT64 +#endif // netstandard namespace System { @@ -104,16 +110,13 @@ namespace System Debug.Assert(length >= 0); uint uValue = value; // Use uint for comparisons to avoid unnecessary 8->32 extensions - IntPtr index = (IntPtr)0; // Use UIntPtr for arithmetic to avoid unnecessary 64->32->64 truncations - IntPtr nLength = (IntPtr)(uint)length; + IntPtr index = (IntPtr)0; // Use IntPtr for arithmetic to avoid unnecessary 64->32->64 truncations + IntPtr nLength = (IntPtr)length; #if !netstandard11 if (Vector.IsHardwareAccelerated && length >= Vector.Count * 2) { - unchecked - { - int unaligned = (int)(byte*)Unsafe.AsPointer(ref searchSpace) & (Vector.Count - 1); - nLength = (IntPtr)(uint)((Vector.Count - unaligned) & (Vector.Count - 1)); - } + int unaligned = (int)Unsafe.AsPointer(ref searchSpace) & (Vector.Count - 1); + nLength = (IntPtr)((Vector.Count - unaligned) & (Vector.Count - 1)); } SequentialScan: #endif @@ -121,21 +124,21 @@ namespace System { nLength -= 8; - if (uValue == Unsafe.Add(ref searchSpace, index)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index)) goto Found; - if (uValue == Unsafe.Add(ref searchSpace, index + 1)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index + 1)) goto Found1; - if (uValue == Unsafe.Add(ref searchSpace, index + 2)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index + 2)) goto Found2; - if (uValue == Unsafe.Add(ref searchSpace, index + 3)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index + 3)) goto Found3; - if (uValue == Unsafe.Add(ref searchSpace, index + 4)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index + 4)) goto Found4; - if (uValue == Unsafe.Add(ref searchSpace, index + 5)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index + 5)) goto Found5; - if (uValue == Unsafe.Add(ref searchSpace, index + 6)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index + 6)) goto Found6; - if (uValue == Unsafe.Add(ref searchSpace, index + 7)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index + 7)) goto Found7; index += 8; @@ -145,13 +148,13 @@ namespace System { nLength -= 4; - if (uValue == Unsafe.Add(ref searchSpace, index)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index)) goto Found; - if (uValue == Unsafe.Add(ref searchSpace, index + 1)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index + 1)) goto Found1; - if (uValue == Unsafe.Add(ref searchSpace, index + 2)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index + 2)) goto Found2; - if (uValue == Unsafe.Add(ref searchSpace, index + 3)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index + 3)) goto Found3; index += 4; @@ -161,7 +164,7 @@ namespace System { nLength -= 1; - if (uValue == Unsafe.Add(ref searchSpace, index)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index)) goto Found; index += 1; @@ -169,9 +172,11 @@ namespace System #if !netstandard11 if (Vector.IsHardwareAccelerated && ((int)(byte*)index < length)) { - nLength = (IntPtr)(uint)((length - (uint)index) & ~(Vector.Count - 1)); + nLength = (IntPtr)((length - (int)(byte*)index) & ~(Vector.Count - 1)); + // Get comparison Vector Vector vComparison = GetVector(value); + while ((byte*)nLength > (byte*)index) { var vMatches = Vector.Equals(vComparison, Unsafe.ReadUnaligned>(ref Unsafe.AddByteOffset(ref searchSpace, index))); @@ -186,10 +191,7 @@ namespace System if ((int)(byte*)index < length) { - unchecked - { - nLength = (IntPtr)(length - (int)(byte*)index); - } + nLength = (IntPtr)(length - (int)(byte*)index); goto SequentialScan; } } @@ -252,16 +254,13 @@ namespace System Debug.Assert(length >= 0); uint uValue = value; // Use uint for comparisons to avoid unnecessary 8->32 extensions - IntPtr index = (IntPtr)(uint)length; // Use UIntPtr for arithmetic to avoid unnecessary 64->32->64 truncations - IntPtr nLength = (IntPtr)(uint)length; + IntPtr index = (IntPtr)length; // Use IntPtr for arithmetic to avoid unnecessary 64->32->64 truncations + IntPtr nLength = (IntPtr)length; #if !netstandard11 if (Vector.IsHardwareAccelerated && length >= Vector.Count * 2) { - unchecked - { - int unaligned = (int)(byte*)Unsafe.AsPointer(ref searchSpace) & (Vector.Count - 1); - nLength = (IntPtr)(((length & (Vector.Count - 1)) + unaligned) & (Vector.Count - 1)); - } + int unaligned = (int)Unsafe.AsPointer(ref searchSpace) & (Vector.Count - 1); + nLength = (IntPtr)(((length & (Vector.Count - 1)) + unaligned) & (Vector.Count - 1)); } SequentialScan: #endif @@ -270,21 +269,21 @@ namespace System nLength -= 8; index -= 8; - if (uValue == Unsafe.Add(ref searchSpace, index + 7)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index + 7)) goto Found7; - if (uValue == Unsafe.Add(ref searchSpace, index + 6)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index + 6)) goto Found6; - if (uValue == Unsafe.Add(ref searchSpace, index + 5)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index + 5)) goto Found5; - if (uValue == Unsafe.Add(ref searchSpace, index + 4)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index + 4)) goto Found4; - if (uValue == Unsafe.Add(ref searchSpace, index + 3)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index + 3)) goto Found3; - if (uValue == Unsafe.Add(ref searchSpace, index + 2)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index + 2)) goto Found2; - if (uValue == Unsafe.Add(ref searchSpace, index + 1)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index + 1)) goto Found1; - if (uValue == Unsafe.Add(ref searchSpace, index)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index)) goto Found; } @@ -293,13 +292,13 @@ namespace System nLength -= 4; index -= 4; - if (uValue == Unsafe.Add(ref searchSpace, index + 3)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index + 3)) goto Found3; - if (uValue == Unsafe.Add(ref searchSpace, index + 2)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index + 2)) goto Found2; - if (uValue == Unsafe.Add(ref searchSpace, index + 1)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index + 1)) goto Found1; - if (uValue == Unsafe.Add(ref searchSpace, index)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index)) goto Found; } @@ -308,16 +307,17 @@ namespace System nLength -= 1; index -= 1; - if (uValue == Unsafe.Add(ref searchSpace, index)) + if (uValue == Unsafe.AddByteOffset(ref searchSpace, index)) goto Found; } #if !netstandard11 - if (Vector.IsHardwareAccelerated && ((int)(byte*)index > 0)) + if (Vector.IsHardwareAccelerated && ((byte*)index > (byte*)0)) { - nLength = (IntPtr)(uint)((uint)index & ~(Vector.Count - 1)); + nLength = (IntPtr)((int)(byte*)index & ~(Vector.Count - 1)); // Get comparison Vector Vector vComparison = GetVector(value); + while ((byte*)nLength > (byte*)(Vector.Count - 1)) { var vMatches = Vector.Equals(vComparison, Unsafe.ReadUnaligned>(ref Unsafe.AddByteOffset(ref searchSpace, index - Vector.Count))); @@ -328,9 +328,9 @@ namespace System continue; } // Find offset of first match - return (int)(byte*)(index) - Vector.Count + LocateLastFoundByte(vMatches); + return (int)(index) - Vector.Count + LocateLastFoundByte(vMatches); } - if ((int)(byte*)index > 0) + if ((byte*)index > (byte*)0) { nLength = index; goto SequentialScan; @@ -362,16 +362,13 @@ namespace System uint uValue0 = value0; // Use uint for comparisons to avoid unnecessary 8->32 extensions uint uValue1 = value1; // Use uint for comparisons to avoid unnecessary 8->32 extensions - IntPtr index = (IntPtr)0; // Use UIntPtr for arithmetic to avoid unnecessary 64->32->64 truncations - IntPtr nLength = (IntPtr)(uint)length; + IntPtr index = (IntPtr)0; // Use IntPtr for arithmetic to avoid unnecessary 64->32->64 truncations + IntPtr nLength = (IntPtr)length; #if !netstandard11 if (Vector.IsHardwareAccelerated && length >= Vector.Count * 2) { - unchecked - { - int unaligned = (int)(byte*)Unsafe.AsPointer(ref searchSpace) & (Vector.Count - 1); - nLength = (IntPtr)(uint)((Vector.Count - unaligned) & (Vector.Count - 1)); - } + int unaligned = (int)Unsafe.AsPointer(ref searchSpace) & (Vector.Count - 1); + nLength = (IntPtr)((Vector.Count - unaligned) & (Vector.Count - 1)); } SequentialScan: #endif @@ -380,28 +377,28 @@ namespace System { nLength -= 8; - lookUp = Unsafe.Add(ref searchSpace, index); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index); if (uValue0 == lookUp || uValue1 == lookUp) goto Found; - lookUp = Unsafe.Add(ref searchSpace, index + 1); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 1); if (uValue0 == lookUp || uValue1 == lookUp) goto Found1; - lookUp = Unsafe.Add(ref searchSpace, index + 2); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 2); if (uValue0 == lookUp || uValue1 == lookUp) goto Found2; - lookUp = Unsafe.Add(ref searchSpace, index + 3); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 3); if (uValue0 == lookUp || uValue1 == lookUp) goto Found3; - lookUp = Unsafe.Add(ref searchSpace, index + 4); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 4); if (uValue0 == lookUp || uValue1 == lookUp) goto Found4; - lookUp = Unsafe.Add(ref searchSpace, index + 5); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 5); if (uValue0 == lookUp || uValue1 == lookUp) goto Found5; - lookUp = Unsafe.Add(ref searchSpace, index + 6); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 6); if (uValue0 == lookUp || uValue1 == lookUp) goto Found6; - lookUp = Unsafe.Add(ref searchSpace, index + 7); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 7); if (uValue0 == lookUp || uValue1 == lookUp) goto Found7; @@ -412,16 +409,16 @@ namespace System { nLength -= 4; - lookUp = Unsafe.Add(ref searchSpace, index); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index); if (uValue0 == lookUp || uValue1 == lookUp) goto Found; - lookUp = Unsafe.Add(ref searchSpace, index + 1); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 1); if (uValue0 == lookUp || uValue1 == lookUp) goto Found1; - lookUp = Unsafe.Add(ref searchSpace, index + 2); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 2); if (uValue0 == lookUp || uValue1 == lookUp) goto Found2; - lookUp = Unsafe.Add(ref searchSpace, index + 3); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 3); if (uValue0 == lookUp || uValue1 == lookUp) goto Found3; @@ -432,7 +429,7 @@ namespace System { nLength -= 1; - lookUp = Unsafe.Add(ref searchSpace, index); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index); if (uValue0 == lookUp || uValue1 == lookUp) goto Found; @@ -441,7 +438,8 @@ namespace System #if !netstandard11 if (Vector.IsHardwareAccelerated && ((int)(byte*)index < length)) { - nLength = (IntPtr)(uint)((length - (uint)index) & ~(Vector.Count - 1)); + nLength = (IntPtr)((length - (int)(byte*)index) & ~(Vector.Count - 1)); + // Get comparison Vector Vector values0 = GetVector(value0); Vector values1 = GetVector(value1); @@ -463,10 +461,7 @@ namespace System if ((int)(byte*)index < length) { - unchecked - { - nLength = (IntPtr)(length - (int)(byte*)index); - } + nLength = (IntPtr)(length - (int)(byte*)index); goto SequentialScan; } } @@ -497,16 +492,13 @@ namespace System uint uValue0 = value0; // Use uint for comparisons to avoid unnecessary 8->32 extensions uint uValue1 = value1; // Use uint for comparisons to avoid unnecessary 8->32 extensions uint uValue2 = value2; // Use uint for comparisons to avoid unnecessary 8->32 extensions - IntPtr index = (IntPtr)0; // Use UIntPtr for arithmetic to avoid unnecessary 64->32->64 truncations - IntPtr nLength = (IntPtr)(uint)length; + IntPtr index = (IntPtr)0; // Use IntPtr for arithmetic to avoid unnecessary 64->32->64 truncations + IntPtr nLength = (IntPtr)length; #if !netstandard11 if (Vector.IsHardwareAccelerated && length >= Vector.Count * 2) { - unchecked - { - int unaligned = (int)(byte*)Unsafe.AsPointer(ref searchSpace) & (Vector.Count - 1); - nLength = (IntPtr)(uint)((Vector.Count - unaligned) & (Vector.Count - 1)); - } + int unaligned = (int)Unsafe.AsPointer(ref searchSpace) & (Vector.Count - 1); + nLength = (IntPtr)((Vector.Count - unaligned) & (Vector.Count - 1)); } SequentialScan: #endif @@ -515,28 +507,28 @@ namespace System { nLength -= 8; - lookUp = Unsafe.Add(ref searchSpace, index); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found; - lookUp = Unsafe.Add(ref searchSpace, index + 1); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 1); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found1; - lookUp = Unsafe.Add(ref searchSpace, index + 2); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 2); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found2; - lookUp = Unsafe.Add(ref searchSpace, index + 3); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 3); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found3; - lookUp = Unsafe.Add(ref searchSpace, index + 4); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 4); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found4; - lookUp = Unsafe.Add(ref searchSpace, index + 5); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 5); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found5; - lookUp = Unsafe.Add(ref searchSpace, index + 6); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 6); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found6; - lookUp = Unsafe.Add(ref searchSpace, index + 7); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 7); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found7; @@ -547,16 +539,16 @@ namespace System { nLength -= 4; - lookUp = Unsafe.Add(ref searchSpace, index); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found; - lookUp = Unsafe.Add(ref searchSpace, index + 1); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 1); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found1; - lookUp = Unsafe.Add(ref searchSpace, index + 2); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 2); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found2; - lookUp = Unsafe.Add(ref searchSpace, index + 3); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 3); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found3; @@ -567,7 +559,7 @@ namespace System { nLength -= 1; - lookUp = Unsafe.Add(ref searchSpace, index); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found; @@ -576,11 +568,13 @@ namespace System #if !netstandard11 if (Vector.IsHardwareAccelerated && ((int)(byte*)index < length)) { - nLength = (IntPtr)(uint)((length - (uint)index) & ~(Vector.Count - 1)); + nLength = (IntPtr)((length - (int)(byte*)index) & ~(Vector.Count - 1)); + // Get comparison Vector Vector values0 = GetVector(value0); Vector values1 = GetVector(value1); Vector values2 = GetVector(value2); + while ((byte*)nLength > (byte*)index) { Vector vData = Unsafe.ReadUnaligned>(ref Unsafe.AddByteOffset(ref searchSpace, index)); @@ -602,10 +596,7 @@ namespace System if ((int)(byte*)index < length) { - unchecked - { - nLength = (IntPtr)(length - (int)(byte*)index); - } + nLength = (IntPtr)(length - (int)(byte*)index); goto SequentialScan; } } @@ -635,16 +626,13 @@ namespace System uint uValue0 = value0; // Use uint for comparisons to avoid unnecessary 8->32 extensions uint uValue1 = value1; // Use uint for comparisons to avoid unnecessary 8->32 extensions - IntPtr index = (IntPtr)(uint)length; // Use UIntPtr for arithmetic to avoid unnecessary 64->32->64 truncations - IntPtr nLength = (IntPtr)(uint)length; + IntPtr index = (IntPtr)length; // Use IntPtr for arithmetic to avoid unnecessary 64->32->64 truncations + IntPtr nLength = (IntPtr)length; #if !netstandard11 if (Vector.IsHardwareAccelerated && length >= Vector.Count * 2) { - unchecked - { - int unaligned = (int)(byte*)Unsafe.AsPointer(ref searchSpace) & (Vector.Count - 1); - nLength = (IntPtr)(((length & (Vector.Count - 1)) + unaligned) & (Vector.Count - 1)); - } + int unaligned = (int)Unsafe.AsPointer(ref searchSpace) & (Vector.Count - 1); + nLength = (IntPtr)(((length & (Vector.Count - 1)) + unaligned) & (Vector.Count - 1)); } SequentialScan: #endif @@ -654,28 +642,28 @@ namespace System nLength -= 8; index -= 8; - lookUp = Unsafe.Add(ref searchSpace, index + 7); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 7); if (uValue0 == lookUp || uValue1 == lookUp) goto Found7; - lookUp = Unsafe.Add(ref searchSpace, index + 6); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 6); if (uValue0 == lookUp || uValue1 == lookUp) goto Found6; - lookUp = Unsafe.Add(ref searchSpace, index + 5); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 5); if (uValue0 == lookUp || uValue1 == lookUp) goto Found5; - lookUp = Unsafe.Add(ref searchSpace, index + 4); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 4); if (uValue0 == lookUp || uValue1 == lookUp) goto Found4; - lookUp = Unsafe.Add(ref searchSpace, index + 3); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 3); if (uValue0 == lookUp || uValue1 == lookUp) goto Found3; - lookUp = Unsafe.Add(ref searchSpace, index + 2); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 2); if (uValue0 == lookUp || uValue1 == lookUp) goto Found2; - lookUp = Unsafe.Add(ref searchSpace, index + 1); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 1); if (uValue0 == lookUp || uValue1 == lookUp) goto Found1; - lookUp = Unsafe.Add(ref searchSpace, index); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index); if (uValue0 == lookUp || uValue1 == lookUp) goto Found; } @@ -685,16 +673,16 @@ namespace System nLength -= 4; index -= 4; - lookUp = Unsafe.Add(ref searchSpace, index + 3); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 3); if (uValue0 == lookUp || uValue1 == lookUp) goto Found3; - lookUp = Unsafe.Add(ref searchSpace, index + 2); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 2); if (uValue0 == lookUp || uValue1 == lookUp) goto Found2; - lookUp = Unsafe.Add(ref searchSpace, index + 1); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 1); if (uValue0 == lookUp || uValue1 == lookUp) goto Found1; - lookUp = Unsafe.Add(ref searchSpace, index); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index); if (uValue0 == lookUp || uValue1 == lookUp) goto Found; } @@ -704,14 +692,15 @@ namespace System nLength -= 1; index -= 1; - lookUp = Unsafe.Add(ref searchSpace, index); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index); if (uValue0 == lookUp || uValue1 == lookUp) goto Found; } #if !netstandard11 - if (Vector.IsHardwareAccelerated && ((int)(byte*)index > 0)) + if (Vector.IsHardwareAccelerated && ((byte*)index > (byte*)0)) { - nLength = (IntPtr)(uint)((uint)index & ~(Vector.Count - 1)); + nLength = (IntPtr)((int)(byte*)index & ~(Vector.Count - 1)); + // Get comparison Vector Vector values0 = GetVector(value0); Vector values1 = GetVector(value1); @@ -729,10 +718,10 @@ namespace System continue; } // Find offset of first match - return (int)(byte*)(index) - Vector.Count + LocateLastFoundByte(vMatches); + return (int)(index) - Vector.Count + LocateLastFoundByte(vMatches); } - if ((int)(byte*)index > 0) + if ((byte*)index > (byte*)0) { nLength = index; goto SequentialScan; @@ -765,16 +754,13 @@ namespace System uint uValue0 = value0; // Use uint for comparisons to avoid unnecessary 8->32 extensions uint uValue1 = value1; // Use uint for comparisons to avoid unnecessary 8->32 extensions uint uValue2 = value2; // Use uint for comparisons to avoid unnecessary 8->32 extensions - IntPtr index = (IntPtr)(uint)length; // Use UIntPtr for arithmetic to avoid unnecessary 64->32->64 truncations - IntPtr nLength = (IntPtr)(uint)length; + IntPtr index = (IntPtr)length; // Use IntPtr for arithmetic to avoid unnecessary 64->32->64 truncations + IntPtr nLength = (IntPtr)length; #if !netstandard11 if (Vector.IsHardwareAccelerated && length >= Vector.Count * 2) { - unchecked - { - int unaligned = (int)(byte*)Unsafe.AsPointer(ref searchSpace) & (Vector.Count - 1); - nLength = (IntPtr)(((length & (Vector.Count - 1)) + unaligned) & (Vector.Count - 1)); - } + int unaligned = (int)Unsafe.AsPointer(ref searchSpace) & (Vector.Count - 1); + nLength = (IntPtr)(((length & (Vector.Count - 1)) + unaligned) & (Vector.Count - 1)); } SequentialScan: #endif @@ -784,28 +770,28 @@ namespace System nLength -= 8; index -= 8; - lookUp = Unsafe.Add(ref searchSpace, index + 7); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 7); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found7; - lookUp = Unsafe.Add(ref searchSpace, index + 6); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 6); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found6; - lookUp = Unsafe.Add(ref searchSpace, index + 5); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 5); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found5; - lookUp = Unsafe.Add(ref searchSpace, index + 4); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 4); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found4; - lookUp = Unsafe.Add(ref searchSpace, index + 3); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 3); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found3; - lookUp = Unsafe.Add(ref searchSpace, index + 2); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 2); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found2; - lookUp = Unsafe.Add(ref searchSpace, index + 1); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 1); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found1; - lookUp = Unsafe.Add(ref searchSpace, index); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found; } @@ -815,16 +801,16 @@ namespace System nLength -= 4; index -= 4; - lookUp = Unsafe.Add(ref searchSpace, index + 3); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 3); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found3; - lookUp = Unsafe.Add(ref searchSpace, index + 2); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 2); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found2; - lookUp = Unsafe.Add(ref searchSpace, index + 1); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index + 1); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found1; - lookUp = Unsafe.Add(ref searchSpace, index); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found; } @@ -834,18 +820,20 @@ namespace System nLength -= 1; index -= 1; - lookUp = Unsafe.Add(ref searchSpace, index); + lookUp = Unsafe.AddByteOffset(ref searchSpace, index); if (uValue0 == lookUp || uValue1 == lookUp || uValue2 == lookUp) goto Found; } #if !netstandard11 - if (Vector.IsHardwareAccelerated && ((int)(byte*)index > 0)) + if (Vector.IsHardwareAccelerated && ((byte*)index > (byte*)0)) { - nLength = (IntPtr)(uint)((uint)index & ~(Vector.Count - 1)); + nLength = (IntPtr)((int)(byte*)index & ~(Vector.Count - 1)); + // Get comparison Vector Vector values0 = GetVector(value0); Vector values1 = GetVector(value1); Vector values2 = GetVector(value2); + while ((byte*)nLength > (byte*)(Vector.Count - 1)) { Vector vData = Unsafe.ReadUnaligned>(ref Unsafe.AddByteOffset(ref searchSpace, index - Vector.Count)); @@ -863,10 +851,10 @@ namespace System continue; } // Find offset of first match - return (int)(byte*)(index) - Vector.Count + LocateLastFoundByte(vMatches); + return (int)(index) - Vector.Count + LocateLastFoundByte(vMatches); } - if ((int)(byte*)index > 0) + if ((byte*)index > (byte*)0) { nLength = index; goto SequentialScan; @@ -892,15 +880,15 @@ namespace System return (int)(byte*)(index + 7); } - public static unsafe bool SequenceEqual(ref byte first, ref byte second, int length) + // Optimized byte-based SequenceEquals. The "length" parameter for this one is declared a nuint rather than int as we also use it for types other than byte + // where the length can exceed 2Gb once scaled by sizeof(T). + public static unsafe bool SequenceEqual(ref byte first, ref byte second, nuint length) { - Debug.Assert(length >= 0); - if (Unsafe.AreSame(ref first, ref second)) goto Equal; - IntPtr i = (IntPtr)0; // Use IntPtr and byte* for arithmetic to avoid unnecessary 64->32->64 truncations - IntPtr n = (IntPtr)length; + IntPtr i = (IntPtr)0; // Use IntPtr for arithmetic to avoid unnecessary 64->32->64 truncations + IntPtr n = (IntPtr)(void*)length; #if !netstandard11 if (Vector.IsHardwareAccelerated && (byte*)n >= (byte*)Vector.Count) @@ -981,11 +969,10 @@ namespace System if (Unsafe.AreSame(ref first, ref second)) goto Equal; - var minLength = firstLength; - if (minLength > secondLength) minLength = secondLength; + IntPtr minLength = (IntPtr)((firstLength < secondLength) ? firstLength : secondLength); - IntPtr i = (IntPtr)0; // Use IntPtr and byte* for arithmetic to avoid unnecessary 64->32->64 truncations - IntPtr n = (IntPtr)minLength; + IntPtr i = (IntPtr)0; // Use IntPtr for arithmetic to avoid unnecessary 64->32->64 truncations + IntPtr n = (IntPtr)(void*)minLength; #if !netstandard11 if (Vector.IsHardwareAccelerated && (byte*)n > (byte*)Vector.Count) @@ -1019,7 +1006,7 @@ namespace System } NotEqual: // Workaround for https://github.com/dotnet/coreclr/issues/13549 - while((byte*)minLength > (byte*)i) + while ((byte*)minLength > (byte*)i) { int result = Unsafe.AddByteOffset(ref first, i).CompareTo(Unsafe.AddByteOffset(ref second, i)); if (result != 0) return result; @@ -1057,13 +1044,10 @@ namespace System [MethodImpl(MethodImplOptions.AggressiveInlining)] private static int LocateFirstFoundByte(ulong match) { - unchecked - { - // Flag least significant power of two bit - var powerOfTwoFlag = match ^ (match - 1); - // Shift all powers of two into the high byte and extract - return (int)((powerOfTwoFlag * XorPowerOfTwoToHighByte) >> 57); - } + // Flag least significant power of two bit + var powerOfTwoFlag = match ^ (match - 1); + // Shift all powers of two into the high byte and extract + return (int)((powerOfTwoFlag * XorPowerOfTwoToHighByte) >> 57); } #endif diff --git a/external/corefx/src/Common/src/CoreLib/System/SpanHelpers.Char.cs b/external/corefx/src/Common/src/CoreLib/System/SpanHelpers.Char.cs new file mode 100644 index 0000000000..1986ab4254 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/SpanHelpers.Char.cs @@ -0,0 +1,341 @@ +// 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.Private; +using System.Runtime.CompilerServices; + +#if !netstandard +using Internal.Runtime.CompilerServices; +#endif + +#if !netstandard11 +using System.Numerics; +#endif + +namespace System +{ + internal static partial class SpanHelpers + { + public static unsafe int SequenceCompareTo(ref char first, int firstLength, ref char second, int secondLength) + { + Debug.Assert(firstLength >= 0); + Debug.Assert(secondLength >= 0); + + int lengthDelta = firstLength - secondLength; + + if (Unsafe.AreSame(ref first, ref second)) + goto Equal; + + IntPtr minLength = (IntPtr)((firstLength < secondLength) ? firstLength : secondLength); + IntPtr i = (IntPtr)0; // Use IntPtr for arithmetic to avoid unnecessary 64->32->64 truncations + + if ((byte*)minLength >= (byte*)(sizeof(UIntPtr) / sizeof(char))) + { +#if !netstandard11 + if (Vector.IsHardwareAccelerated && (byte*)minLength >= (byte*)Vector.Count) + { + IntPtr nLength = minLength - Vector.Count; + do + { + if (Unsafe.ReadUnaligned>(ref Unsafe.As(ref Unsafe.Add(ref first, i))) != + Unsafe.ReadUnaligned>(ref Unsafe.As(ref Unsafe.Add(ref second, i)))) + { + break; + } + i += Vector.Count; + } + while ((byte*)nLength >= (byte*)i); + } +#endif + + while ((byte*)minLength >= (byte*)(i + sizeof(UIntPtr) / sizeof(char))) + { + if (Unsafe.ReadUnaligned(ref Unsafe.As(ref Unsafe.Add(ref first, i))) != + Unsafe.ReadUnaligned(ref Unsafe.As(ref Unsafe.Add(ref second, i)))) + { + break; + } + i += sizeof(UIntPtr) / sizeof(char); + } + } + + if (sizeof(UIntPtr) > sizeof(int) && (byte*)minLength >= (byte*)(i + sizeof(int) / sizeof(char))) + { + if (Unsafe.ReadUnaligned(ref Unsafe.As(ref Unsafe.Add(ref first, i))) == + Unsafe.ReadUnaligned(ref Unsafe.As(ref Unsafe.Add(ref second, i)))) + { + i += sizeof(int) / sizeof(char); + } + } + + while ((byte*)i < (byte*)minLength) + { + int result = Unsafe.Add(ref first, i).CompareTo(Unsafe.Add(ref second, i)); + if (result != 0) + return result; + i += 1; + } + + Equal: + return lengthDelta; + } + + public static unsafe int IndexOf(ref char searchSpace, char value, int length) + { + Debug.Assert(length >= 0); + + fixed (char* pChars = &searchSpace) + { + char* pCh = pChars; + char* pEndCh = pCh + length; + +#if !netstandard11 + if (Vector.IsHardwareAccelerated && length >= Vector.Count * 2) + { + // Figure out how many characters to read sequentially until we are vector aligned + // This is equivalent to: + // unaligned = ((int)pCh % Unsafe.SizeOf>()) / elementsPerByte + // length = (Vector.Count - unaligned) % Vector.Count + const int elementsPerByte = sizeof(ushort) / sizeof(byte); + int unaligned = ((int)pCh & (Unsafe.SizeOf>() - 1)) / elementsPerByte; + length = (Vector.Count - unaligned) & (Vector.Count - 1); + } + SequentialScan: +#endif + while (length >= 4) + { + length -= 4; + + if (*pCh == value) + goto Found; + if (*(pCh + 1) == value) + goto Found1; + if (*(pCh + 2) == value) + goto Found2; + if (*(pCh + 3) == value) + goto Found3; + + pCh += 4; + } + + while (length > 0) + { + length -= 1; + + if (*pCh == value) + goto Found; + + pCh += 1; + } +#if !netstandard11 + // We get past SequentialScan only if IsHardwareAccelerated is true. However, we still have the redundant check to allow + // the JIT to see that the code is unreachable and eliminate it when the platform does not have hardware accelerated. + if (Vector.IsHardwareAccelerated && pCh < pEndCh) + { + // Get the highest multiple of Vector.Count that is within the search space. + // That will be how many times we iterate in the loop below. + // This is equivalent to: length = Vector.Count * ((int)(pEndCh - pCh) / Vector.Count) + length = (int)((pEndCh - pCh) & ~(Vector.Count - 1)); + + // Get comparison Vector + Vector vComparison = new Vector(value); + + while (length > 0) + { + // Using Unsafe.Read instead of ReadUnaligned since the search space is pinned and pCh is always vector aligned + Debug.Assert(((int)pCh & (Unsafe.SizeOf>() - 1)) == 0); + Vector vMatches = Vector.Equals(vComparison, Unsafe.Read>(pCh)); + if (Vector.Zero.Equals(vMatches)) + { + pCh += Vector.Count; + length -= Vector.Count; + continue; + } + // Find offset of first match + return (int)(pCh - pChars) + LocateFirstFoundChar(vMatches); + } + + if (pCh < pEndCh) + { + length = (int)(pEndCh - pCh); + goto SequentialScan; + } + } +#endif + return -1; + Found3: + pCh++; + Found2: + pCh++; + Found1: + pCh++; + Found: + return (int)(pCh - pChars); + } + } + + public static unsafe int LastIndexOf(ref char searchSpace, char value, int length) + { + Debug.Assert(length >= 0); + + fixed (char* pChars = &searchSpace) + { + char* pCh = pChars + length; + char* pEndCh = pChars; + +#if !netstandard11 + if (Vector.IsHardwareAccelerated && length >= Vector.Count * 2) + { + // Figure out how many characters to read sequentially from the end until we are vector aligned + // This is equivalent to: length = ((int)pCh % Unsafe.SizeOf>()) / elementsPerByte + const int elementsPerByte = sizeof(ushort) / sizeof(byte); + length = ((int)pCh & (Unsafe.SizeOf>() - 1)) / elementsPerByte; + } + SequentialScan: +#endif + while (length >= 4) + { + length -= 4; + pCh -= 4; + + if (*(pCh + 3) == value) + goto Found3; + if (*(pCh + 2) == value) + goto Found2; + if (*(pCh + 1) == value) + goto Found1; + if (*pCh == value) + goto Found; + } + + while (length > 0) + { + length -= 1; + pCh -= 1; + + if (*pCh == value) + goto Found; + } +#if !netstandard11 + // We get past SequentialScan only if IsHardwareAccelerated is true. However, we still have the redundant check to allow + // the JIT to see that the code is unreachable and eliminate it when the platform does not have hardware accelerated. + if (Vector.IsHardwareAccelerated && pCh > pEndCh) + { + // Get the highest multiple of Vector.Count that is within the search space. + // That will be how many times we iterate in the loop below. + // This is equivalent to: length = Vector.Count * ((int)(pCh - pEndCh) / Vector.Count) + length = (int)((pCh - pEndCh) & ~(Vector.Count - 1)); + + // Get comparison Vector + Vector vComparison = new Vector(value); + + while (length > 0) + { + char* pStart = pCh - Vector.Count; + // Using Unsafe.Read instead of ReadUnaligned since the search space is pinned and pCh (and hence pSart) is always vector aligned + Debug.Assert(((int)pStart & (Unsafe.SizeOf>() - 1)) == 0); + Vector vMatches = Vector.Equals(vComparison, Unsafe.Read>(pStart)); + if (Vector.Zero.Equals(vMatches)) + { + pCh -= Vector.Count; + length -= Vector.Count; + continue; + } + // Find offset of last match + return (int)(pStart - pEndCh) + LocateLastFoundChar(vMatches); + } + + if (pCh > pEndCh) + { + length = (int)(pCh - pEndCh); + goto SequentialScan; + } + } +#endif + return -1; + Found: + return (int)(pCh - pEndCh); + Found1: + return (int)(pCh - pEndCh) + 1; + Found2: + return (int)(pCh - pEndCh) + 2; + Found3: + return (int)(pCh - pEndCh) + 3; + } + } + +#if !netstandard11 + // Vector sub-search adapted from https://github.com/aspnet/KestrelHttpServer/pull/1138 + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static int LocateFirstFoundChar(Vector match) + { + var vector64 = Vector.AsVectorUInt64(match); + ulong candidate = 0; + int i = 0; + // Pattern unrolled by jit https://github.com/dotnet/coreclr/pull/8001 + for (; i < Vector.Count; i++) + { + candidate = vector64[i]; + if (candidate != 0) + { + break; + } + } + + // Single LEA instruction with jitted const (using function result) + return i * 4 + LocateFirstFoundChar(candidate); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static int LocateFirstFoundChar(ulong match) + { + unchecked + { + // Flag least significant power of two bit + var powerOfTwoFlag = match ^ (match - 1); + // Shift all powers of two into the high byte and extract + return (int)((powerOfTwoFlag * XorPowerOfTwoToHighChar) >> 49); + } + } + + private const ulong XorPowerOfTwoToHighChar = (0x03ul | + 0x02ul << 16 | + 0x01ul << 32) + 1; + + // Vector sub-search adapted from https://github.com/aspnet/KestrelHttpServer/pull/1138 + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static int LocateLastFoundChar(Vector match) + { + var vector64 = Vector.AsVectorUInt64(match); + ulong candidate = 0; + int i = Vector.Count - 1; + // Pattern unrolled by jit https://github.com/dotnet/coreclr/pull/8001 + for (; i >= 0; i--) + { + candidate = vector64[i]; + if (candidate != 0) + { + break; + } + } + + // Single LEA instruction with jitted const (using function result) + return i * 4 + LocateLastFoundChar(candidate); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static int LocateLastFoundChar(ulong match) + { + // Find the most significant char that has its highest bit set + int index = 3; + while ((long)match > 0) + { + match = match << 16; + index--; + } + return index; + } +#endif + } +} diff --git a/external/corefx/src/System.Memory/src/System/SpanHelpers.T.cs b/external/corefx/src/Common/src/CoreLib/System/SpanHelpers.T.cs similarity index 98% rename from external/corefx/src/System.Memory/src/System/SpanHelpers.T.cs rename to external/corefx/src/Common/src/CoreLib/System/SpanHelpers.T.cs index 3c3f70bece..3e075d944b 100644 --- a/external/corefx/src/System.Memory/src/System/SpanHelpers.T.cs +++ b/external/corefx/src/Common/src/CoreLib/System/SpanHelpers.T.cs @@ -3,11 +3,14 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Runtime.CompilerServices; #if !netstandard && !MONO using Internal.Runtime.CompilerServices; -#else -using System.Runtime.CompilerServices; +#endif + +#if !netstandard11 +using System.Numerics; #endif #if MONO @@ -53,7 +56,7 @@ namespace System } return -1; } - + public static unsafe int IndexOf(ref T searchSpace, T value, int length) where T : IEquatable { @@ -193,21 +196,21 @@ namespace System } return -1; - Found: // Workaround for https://github.com/dotnet/coreclr/issues/13549 + Found: // Workaround for https://github.com/dotnet/coreclr/issues/13549 return index; - Found1: + Found1: return index + 1; - Found2: + Found2: return index + 2; - Found3: + Found3: return index + 3; - Found4: + Found4: return index + 4; - Found5: + Found5: return index + 5; - Found6: + Found6: return index + 6; - Found7: + Found7: return index + 7; } @@ -276,21 +279,21 @@ namespace System } return -1; - Found: // Workaround for https://github.com/dotnet/coreclr/issues/13549 + Found: // Workaround for https://github.com/dotnet/coreclr/issues/13549 return index; - Found1: + Found1: return index + 1; - Found2: + Found2: return index + 2; - Found3: + Found3: return index + 3; - Found4: + Found4: return index + 4; - Found5: + Found5: return index + 5; - Found6: + Found6: return index + 6; - Found7: + Found7: return index + 7; } diff --git a/external/corefx/src/Common/src/CoreLib/System/SpanHelpers.cs b/external/corefx/src/Common/src/CoreLib/System/SpanHelpers.cs new file mode 100644 index 0000000000..b014566771 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/SpanHelpers.cs @@ -0,0 +1,542 @@ +// 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.Globalization; +using System.Runtime; +using System.Runtime.InteropServices; + +#if MONO +using System.Runtime.CompilerServices; +using System.Diagnostics.Private; +#else +using Internal.Runtime.CompilerServices; +#endif + +#if BIT64 +using nuint = System.UInt64; +#else +using nuint = System.UInt32; +#endif + +namespace System +{ + internal static partial class SpanHelpers + { + public static int IndexOfCultureHelper(ReadOnlySpan span, ReadOnlySpan value, CompareInfo compareInfo) + { + Debug.Assert(span.Length != 0); + Debug.Assert(value.Length != 0); + + if (GlobalizationMode.Invariant) + { + return CompareInfo.InvariantIndexOf(span, value, ignoreCase: false); + } + + return compareInfo.IndexOf(span, value, CompareOptions.None); + } + + public static int IndexOfCultureIgnoreCaseHelper(ReadOnlySpan span, ReadOnlySpan value, CompareInfo compareInfo) + { + Debug.Assert(span.Length != 0); + Debug.Assert(value.Length != 0); + + if (GlobalizationMode.Invariant) + { + return CompareInfo.InvariantIndexOf(span, value, ignoreCase: true); + } + + return compareInfo.IndexOf(span, value, CompareOptions.IgnoreCase); + } + + public static int IndexOfOrdinalHelper(ReadOnlySpan span, ReadOnlySpan value, bool ignoreCase) + { + Debug.Assert(span.Length != 0); + Debug.Assert(value.Length != 0); + + if (GlobalizationMode.Invariant) + { + return CompareInfo.InvariantIndexOf(span, value, ignoreCase); + } + + return CompareInfo.Invariant.IndexOfOrdinal(span, value, ignoreCase); + } + + public static bool StartsWithCultureHelper(ReadOnlySpan span, ReadOnlySpan value, CompareInfo compareInfo) + { + Debug.Assert(value.Length != 0); + + if (GlobalizationMode.Invariant) + { + return span.StartsWith(value); + } + if (span.Length == 0) + { + return false; + } + return compareInfo.IsPrefix(span, value, CompareOptions.None); + } + + public static bool StartsWithCultureIgnoreCaseHelper(ReadOnlySpan span, ReadOnlySpan value, CompareInfo compareInfo) + { + Debug.Assert(value.Length != 0); + + if (GlobalizationMode.Invariant) + { + return StartsWithOrdinalIgnoreCaseHelper(span, value); + } + if (span.Length == 0) + { + return false; + } + return compareInfo.IsPrefix(span, value, CompareOptions.IgnoreCase); + } + + public static bool StartsWithOrdinalIgnoreCaseHelper(ReadOnlySpan span, ReadOnlySpan value) + { + Debug.Assert(value.Length != 0); + + if (span.Length < value.Length) + { + return false; + } + return CompareInfo.CompareOrdinalIgnoreCase(span.Slice(0, value.Length), value) == 0; + } + + public static bool EndsWithCultureHelper(ReadOnlySpan span, ReadOnlySpan value, CompareInfo compareInfo) + { + Debug.Assert(value.Length != 0); + + if (GlobalizationMode.Invariant) + { + return span.EndsWith(value); + } + if (span.Length == 0) + { + return false; + } + return compareInfo.IsSuffix(span, value, CompareOptions.None); + } + + public static bool EndsWithCultureIgnoreCaseHelper(ReadOnlySpan span, ReadOnlySpan value, CompareInfo compareInfo) + { + Debug.Assert(value.Length != 0); + + if (GlobalizationMode.Invariant) + { + return EndsWithOrdinalIgnoreCaseHelper(span, value); + } + if (span.Length == 0) + { + return false; + } + return compareInfo.IsSuffix(span, value, CompareOptions.IgnoreCase); + } + + public static bool EndsWithOrdinalIgnoreCaseHelper(ReadOnlySpan span, ReadOnlySpan value) + { + Debug.Assert(value.Length != 0); + + if (span.Length < value.Length) + { + return false; + } + return (CompareInfo.CompareOrdinalIgnoreCase(span.Slice(span.Length - value.Length), value) == 0); + } + + public static unsafe void ClearWithoutReferences(ref byte b, nuint byteLength) + { + if (byteLength == 0) + return; + +#if CORECLR && (AMD64 || ARM64) + if (byteLength > 4096) + goto PInvoke; + Unsafe.InitBlockUnaligned(ref b, 0, (uint)byteLength); + return; +#else + // TODO: Optimize other platforms to be on par with AMD64 CoreCLR + // Note: It's important that this switch handles lengths at least up to 22. + // See notes below near the main loop for why. + + // The switch will be very fast since it can be implemented using a jump + // table in assembly. See http://stackoverflow.com/a/449297/4077294 for more info. + + switch (byteLength) + { + case 1: + b = 0; + return; + case 2: + Unsafe.As(ref b) = 0; + return; + case 3: + Unsafe.As(ref b) = 0; + Unsafe.Add(ref b, 2) = 0; + return; + case 4: + Unsafe.As(ref b) = 0; + return; + case 5: + Unsafe.As(ref b) = 0; + Unsafe.Add(ref b, 4) = 0; + return; + case 6: + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; + return; + case 7: + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; + Unsafe.Add(ref b, 6) = 0; + return; + case 8: +#if BIT64 + Unsafe.As(ref b) = 0; +#else + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; +#endif + return; + case 9: +#if BIT64 + Unsafe.As(ref b) = 0; +#else + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; +#endif + Unsafe.Add(ref b, 8) = 0; + return; + case 10: +#if BIT64 + Unsafe.As(ref b) = 0; +#else + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; +#endif + Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; + return; + case 11: +#if BIT64 + Unsafe.As(ref b) = 0; +#else + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; +#endif + Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; + Unsafe.Add(ref b, 10) = 0; + return; + case 12: +#if BIT64 + Unsafe.As(ref b) = 0; +#else + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; +#endif + Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; + return; + case 13: +#if BIT64 + Unsafe.As(ref b) = 0; +#else + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; +#endif + Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; + Unsafe.Add(ref b, 12) = 0; + return; + case 14: +#if BIT64 + Unsafe.As(ref b) = 0; +#else + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; +#endif + Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 12)) = 0; + return; + case 15: +#if BIT64 + Unsafe.As(ref b) = 0; +#else + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; +#endif + Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 12)) = 0; + Unsafe.Add(ref b, 14) = 0; + return; + case 16: +#if BIT64 + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; +#else + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 12)) = 0; +#endif + return; + case 17: +#if BIT64 + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; +#else + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 12)) = 0; +#endif + Unsafe.Add(ref b, 16) = 0; + return; + case 18: +#if BIT64 + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; +#else + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 12)) = 0; +#endif + Unsafe.As(ref Unsafe.Add(ref b, 16)) = 0; + return; + case 19: +#if BIT64 + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; +#else + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 12)) = 0; +#endif + Unsafe.As(ref Unsafe.Add(ref b, 16)) = 0; + Unsafe.Add(ref b, 18) = 0; + return; + case 20: +#if BIT64 + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; +#else + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 12)) = 0; +#endif + Unsafe.As(ref Unsafe.Add(ref b, 16)) = 0; + return; + case 21: +#if BIT64 + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; +#else + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 12)) = 0; +#endif + Unsafe.As(ref Unsafe.Add(ref b, 16)) = 0; + Unsafe.Add(ref b, 20) = 0; + return; + case 22: +#if BIT64 + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; +#else + Unsafe.As(ref b) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 4)) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 8)) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 12)) = 0; +#endif + Unsafe.As(ref Unsafe.Add(ref b, 16)) = 0; + Unsafe.As(ref Unsafe.Add(ref b, 20)) = 0; + return; + } + + // P/Invoke into the native version for large lengths + if (byteLength >= 512) goto PInvoke; + + nuint i = 0; // byte offset at which we're copying + + if ((Unsafe.As(ref b) & 3) != 0) + { + if ((Unsafe.As(ref b) & 1) != 0) + { + Unsafe.AddByteOffset(ref b, i) = 0; + i += 1; + if ((Unsafe.As(ref b) & 2) != 0) + goto IntAligned; + } + Unsafe.As(ref Unsafe.AddByteOffset(ref b, i)) = 0; + i += 2; + } + + IntAligned: + + // On 64-bit IntPtr.Size == 8, so we want to advance to the next 8-aligned address. If + // (int)b % 8 is 0, 5, 6, or 7, we will already have advanced by 0, 3, 2, or 1 + // bytes to the next aligned address (respectively), so do nothing. On the other hand, + // if it is 1, 2, 3, or 4 we will want to copy-and-advance another 4 bytes until + // we're aligned. + // The thing 1, 2, 3, and 4 have in common that the others don't is that if you + // subtract one from them, their 3rd lsb will not be set. Hence, the below check. + + if (((Unsafe.As(ref b) - 1) & 4) == 0) + { + Unsafe.As(ref Unsafe.AddByteOffset(ref b, i)) = 0; + i += 4; + } + + nuint end = byteLength - 16; + byteLength -= i; // lower 4 bits of byteLength represent how many bytes are left *after* the unrolled loop + + // We know due to the above switch-case that this loop will always run 1 iteration; max + // bytes we clear before checking is 23 (7 to align the pointers, 16 for 1 iteration) so + // the switch handles lengths 0-22. + Debug.Assert(end >= 7 && i <= end); + + // This is separated out into a different variable, so the i + 16 addition can be + // performed at the start of the pipeline and the loop condition does not have + // a dependency on the writes. + nuint counter; + + do + { + counter = i + 16; + + // This loop looks very costly since there appear to be a bunch of temporary values + // being created with the adds, but the jit (for x86 anyways) will convert each of + // these to use memory addressing operands. + + // So the only cost is a bit of code size, which is made up for by the fact that + // we save on writes to b. + +#if BIT64 + Unsafe.As(ref Unsafe.AddByteOffset(ref b, i)) = 0; + Unsafe.As(ref Unsafe.AddByteOffset(ref b, i + 8)) = 0; +#else + Unsafe.As(ref Unsafe.AddByteOffset(ref b, i)) = 0; + Unsafe.As(ref Unsafe.AddByteOffset(ref b, i + 4)) = 0; + Unsafe.As(ref Unsafe.AddByteOffset(ref b, i + 8)) = 0; + Unsafe.As(ref Unsafe.AddByteOffset(ref b, i + 12)) = 0; +#endif + + i = counter; + + // See notes above for why this wasn't used instead + // i += 16; + } + while (counter <= end); + + if ((byteLength & 8) != 0) + { +#if BIT64 + Unsafe.As(ref Unsafe.AddByteOffset(ref b, i)) = 0; +#else + Unsafe.As(ref Unsafe.AddByteOffset(ref b, i)) = 0; + Unsafe.As(ref Unsafe.AddByteOffset(ref b, i + 4)) = 0; +#endif + i += 8; + } + if ((byteLength & 4) != 0) + { + Unsafe.As(ref Unsafe.AddByteOffset(ref b, i)) = 0; + i += 4; + } + if ((byteLength & 2) != 0) + { + Unsafe.As(ref Unsafe.AddByteOffset(ref b, i)) = 0; + i += 2; + } + if ((byteLength & 1) != 0) + { + Unsafe.AddByteOffset(ref b, i) = 0; + // We're not using i after this, so not needed + // i += 1; + } + + return; +#endif + + PInvoke: + RuntimeImports.RhZeroMemory(ref b, byteLength); + } + + public static unsafe void ClearWithReferences(ref IntPtr ip, nuint pointerSizeLength) + { + Debug.Assert((int)Unsafe.AsPointer(ref ip) % sizeof(IntPtr) == 0, "Should've been aligned on natural word boundary."); + + // First write backward 8 natural words at a time. + // Writing backward allows us to get away with only simple modifications to the + // mov instruction's base and index registers between loop iterations. + + for (; pointerSizeLength >= 8; pointerSizeLength -= 8) + { + Unsafe.Add(ref Unsafe.Add(ref ip, (IntPtr)pointerSizeLength), -1) = default(IntPtr); + Unsafe.Add(ref Unsafe.Add(ref ip, (IntPtr)pointerSizeLength), -2) = default(IntPtr); + Unsafe.Add(ref Unsafe.Add(ref ip, (IntPtr)pointerSizeLength), -3) = default(IntPtr); + Unsafe.Add(ref Unsafe.Add(ref ip, (IntPtr)pointerSizeLength), -4) = default(IntPtr); + Unsafe.Add(ref Unsafe.Add(ref ip, (IntPtr)pointerSizeLength), -5) = default(IntPtr); + Unsafe.Add(ref Unsafe.Add(ref ip, (IntPtr)pointerSizeLength), -6) = default(IntPtr); + Unsafe.Add(ref Unsafe.Add(ref ip, (IntPtr)pointerSizeLength), -7) = default(IntPtr); + Unsafe.Add(ref Unsafe.Add(ref ip, (IntPtr)pointerSizeLength), -8) = default(IntPtr); + } + + Debug.Assert(pointerSizeLength <= 7); + + // The logic below works by trying to minimize the number of branches taken for any + // given range of lengths. For example, the lengths [ 4 .. 7 ] are handled by a single + // branch, [ 2 .. 3 ] are handled by a single branch, and [ 1 ] is handled by a single + // branch. + // + // We can write both forward and backward as a perf improvement. For example, + // the lengths [ 4 .. 7 ] can be handled by zeroing out the first four natural + // words and the last 3 natural words. In the best case (length = 7), there are + // no overlapping writes. In the worst case (length = 4), there are three + // overlapping writes near the middle of the buffer. In perf testing, the + // penalty for performing duplicate writes is less expensive than the penalty + // for complex branching. + + if (pointerSizeLength >= 4) + { + goto Write4To7; + } + else if (pointerSizeLength >= 2) + { + goto Write2To3; + } + else if (pointerSizeLength > 0) + { + goto Write1; + } + else + { + return; // nothing to write + } + + Write4To7: + Debug.Assert(pointerSizeLength >= 4); + + // Write first four and last three. + Unsafe.Add(ref ip, 2) = default(IntPtr); + Unsafe.Add(ref ip, 3) = default(IntPtr); + Unsafe.Add(ref Unsafe.Add(ref ip, (IntPtr)pointerSizeLength), -3) = default(IntPtr); + Unsafe.Add(ref Unsafe.Add(ref ip, (IntPtr)pointerSizeLength), -2) = default(IntPtr); + + Write2To3: + Debug.Assert(pointerSizeLength >= 2); + + // Write first two and last one. + Unsafe.Add(ref ip, 1) = default(IntPtr); + Unsafe.Add(ref Unsafe.Add(ref ip, (IntPtr)pointerSizeLength), -1) = default(IntPtr); + + Write1: + Debug.Assert(pointerSizeLength >= 1); + + // Write only element. + ip = default(IntPtr); + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/StackOverflowException.cs b/external/corefx/src/Common/src/CoreLib/System/StackOverflowException.cs index 6f954cc75a..42af14380b 100644 --- a/external/corefx/src/Common/src/CoreLib/System/StackOverflowException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/StackOverflowException.cs @@ -16,7 +16,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public sealed class StackOverflowException : SystemException { public StackOverflowException() diff --git a/external/corefx/src/Common/src/CoreLib/System/String.Comparison.cs b/external/corefx/src/Common/src/CoreLib/System/String.Comparison.cs new file mode 100644 index 0000000000..fdb4704a96 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/String.Comparison.cs @@ -0,0 +1,1011 @@ +// 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.Private; +using System.Globalization; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +using Internal.Runtime.CompilerServices; + +#if BIT64 +using nuint = System.UInt64; +#else +using nuint = System.UInt32; +#endif + +namespace System +{ + public partial class String + { + private static unsafe int CompareOrdinalIgnoreCaseHelper(string strA, string strB) + { + Debug.Assert(strA != null); + Debug.Assert(strB != null); + int length = Math.Min(strA.Length, strB.Length); + + fixed (char* ap = &strA._firstChar) fixed (char* bp = &strB._firstChar) + { + char* a = ap; + char* b = bp; + int charA = 0, charB = 0; + + while (length != 0) + { + charA = *a; + charB = *b; + + Debug.Assert((charA | charB) <= 0x7F, "strings have to be ASCII"); + + // uppercase both chars - notice that we need just one compare per char + if ((uint)(charA - 'a') <= (uint)('z' - 'a')) charA -= 0x20; + if ((uint)(charB - 'a') <= (uint)('z' - 'a')) charB -= 0x20; + + //Return the (case-insensitive) difference between them. + if (charA != charB) + return charA - charB; + + // Next char + a++; b++; + length--; + } + + return strA.Length - strB.Length; + } + } + + // + // Search/Query methods + // + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static bool EqualsHelper(string strA, string strB) + { + Debug.Assert(strA != null); + Debug.Assert(strB != null); + Debug.Assert(strA.Length == strB.Length); + + return SpanHelpers.SequenceEqual( + ref Unsafe.As(ref strA.GetRawStringData()), + ref Unsafe.As(ref strB.GetRawStringData()), + ((nuint)strA.Length) * 2); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static int CompareOrdinalHelper(string strA, int indexA, int countA, string strB, int indexB, int countB) + { + Debug.Assert(strA != null); + Debug.Assert(strB != null); + Debug.Assert(indexA >= 0 && indexB >= 0); + Debug.Assert(countA >= 0 && countB >= 0); + Debug.Assert(indexA + countA <= strA.Length && indexB + countB <= strB.Length); + + return SpanHelpers.SequenceCompareTo(ref Unsafe.Add(ref strA.GetRawStringData(), indexA), countA, ref Unsafe.Add(ref strB.GetRawStringData(), indexB), countB); + } + + private static unsafe bool EqualsIgnoreCaseAsciiHelper(string strA, string strB) + { + Debug.Assert(strA != null); + Debug.Assert(strB != null); + Debug.Assert(strA.Length == strB.Length); + int length = strA.Length; + + fixed (char* ap = &strA._firstChar) fixed (char* bp = &strB._firstChar) + { + char* a = ap; + char* b = bp; + + while (length != 0) + { + int charA = *a; + int charB = *b; + + Debug.Assert((charA | charB) <= 0x7F, "strings have to be ASCII"); + + // Ordinal equals or lowercase equals if the result ends up in the a-z range + if (charA == charB || + ((charA | 0x20) == (charB | 0x20) && + (uint)((charA | 0x20) - 'a') <= (uint)('z' - 'a'))) + { + a++; + b++; + length--; + } + else + { + return false; + } + } + + return true; + } + } + + private static unsafe int CompareOrdinalHelper(string strA, string strB) + { + Debug.Assert(strA != null); + Debug.Assert(strB != null); + + // NOTE: This may be subject to change if eliminating the check + // in the callers makes them small enough to be inlined + Debug.Assert(strA._firstChar == strB._firstChar, + "For performance reasons, callers of this method should " + + "check/short-circuit beforehand if the first char is the same."); + + int length = Math.Min(strA.Length, strB.Length); + + fixed (char* ap = &strA._firstChar) fixed (char* bp = &strB._firstChar) + { + char* a = ap; + char* b = bp; + + // Check if the second chars are different here + // The reason we check if _firstChar is different is because + // it's the most common case and allows us to avoid a method call + // to here. + // The reason we check if the second char is different is because + // if the first two chars the same we can increment by 4 bytes, + // leaving us word-aligned on both 32-bit (12 bytes into the string) + // and 64-bit (16 bytes) platforms. + + // For empty strings, the second char will be null due to padding. + // The start of the string is the type pointer + string length, which + // takes up 8 bytes on 32-bit, 12 on x64. For empty strings the null + // terminator immediately follows, leaving us with an object + // 10/14 bytes in size. Since everything needs to be a multiple + // of 4/8, this will get padded and zeroed out. + + // For one-char strings the second char will be the null terminator. + + // NOTE: If in the future there is a way to read the second char + // without pinning the string (e.g. System.Runtime.CompilerServices.Unsafe + // is exposed to mscorlib, or a future version of C# allows inline IL), + // then do that and short-circuit before the fixed. + + if (*(a + 1) != *(b + 1)) goto DiffOffset1; + + // Since we know that the first two chars are the same, + // we can increment by 2 here and skip 4 bytes. + // This leaves us 8-byte aligned, which results + // on better perf for 64-bit platforms. + length -= 2; a += 2; b += 2; + + // unroll the loop +#if BIT64 + while (length >= 12) + { + if (*(long*)a != *(long*)b) goto DiffOffset0; + if (*(long*)(a + 4) != *(long*)(b + 4)) goto DiffOffset4; + if (*(long*)(a + 8) != *(long*)(b + 8)) goto DiffOffset8; + length -= 12; a += 12; b += 12; + } +#else // BIT64 + while (length >= 10) + { + if (*(int*)a != *(int*)b) goto DiffOffset0; + if (*(int*)(a + 2) != *(int*)(b + 2)) goto DiffOffset2; + if (*(int*)(a + 4) != *(int*)(b + 4)) goto DiffOffset4; + if (*(int*)(a + 6) != *(int*)(b + 6)) goto DiffOffset6; + if (*(int*)(a + 8) != *(int*)(b + 8)) goto DiffOffset8; + length -= 10; a += 10; b += 10; + } +#endif // BIT64 + + // Fallback loop: + // go back to slower code path and do comparison on 4 bytes at a time. + // This depends on the fact that the String objects are + // always zero terminated and that the terminating zero is not included + // in the length. For odd string sizes, the last compare will include + // the zero terminator. + while (length > 0) + { + if (*(int*)a != *(int*)b) goto DiffNextInt; + length -= 2; + a += 2; + b += 2; + } + + // At this point, we have compared all the characters in at least one string. + // The longer string will be larger. + return strA.Length - strB.Length; + +#if BIT64 + DiffOffset8: a += 4; b += 4; + DiffOffset4: a += 4; b += 4; +#else // BIT64 + // Use jumps instead of falling through, since + // otherwise going to DiffOffset8 will involve + // 8 add instructions before getting to DiffNextInt + DiffOffset8: a += 8; b += 8; goto DiffOffset0; + DiffOffset6: a += 6; b += 6; goto DiffOffset0; + DiffOffset4: a += 2; b += 2; + DiffOffset2: a += 2; b += 2; +#endif // BIT64 + + DiffOffset0: + // If we reached here, we already see a difference in the unrolled loop above +#if BIT64 + if (*(int*)a == *(int*)b) + { + a += 2; b += 2; + } +#endif // BIT64 + + DiffNextInt: + if (*a != *b) return *a - *b; + + DiffOffset1: + Debug.Assert(*(a + 1) != *(b + 1), "This char must be different if we reach here!"); + return *(a + 1) - *(b + 1); + } + } + + // Provides a culture-correct string comparison. StrA is compared to StrB + // to determine whether it is lexicographically less, equal, or greater, and then returns + // either a negative integer, 0, or a positive integer; respectively. + // + public static int Compare(string strA, string strB) + { + return Compare(strA, strB, StringComparison.CurrentCulture); + } + + + // Provides a culture-correct string comparison. strA is compared to strB + // to determine whether it is lexicographically less, equal, or greater, and then a + // negative integer, 0, or a positive integer is returned; respectively. + // The case-sensitive option is set by ignoreCase + // + public static int Compare(string strA, string strB, bool ignoreCase) + { + var comparisonType = ignoreCase ? StringComparison.CurrentCultureIgnoreCase : StringComparison.CurrentCulture; + return Compare(strA, strB, comparisonType); + } + + + // Provides a more flexible function for string comparison. See StringComparison + // for meaning of different comparisonType. + public static int Compare(string strA, string strB, StringComparison comparisonType) + { + if (object.ReferenceEquals(strA, strB)) + { + CheckStringComparison(comparisonType); + return 0; + } + + // They can't both be null at this point. + if (strA == null) + { + CheckStringComparison(comparisonType); + return -1; + } + if (strB == null) + { + CheckStringComparison(comparisonType); + return 1; + } + + switch (comparisonType) + { + case StringComparison.CurrentCulture: + return CultureInfo.CurrentCulture.CompareInfo.Compare(strA, strB, CompareOptions.None); + + case StringComparison.CurrentCultureIgnoreCase: + return CultureInfo.CurrentCulture.CompareInfo.Compare(strA, strB, CompareOptions.IgnoreCase); + + case StringComparison.InvariantCulture: + return CompareInfo.Invariant.Compare(strA, strB, CompareOptions.None); + + case StringComparison.InvariantCultureIgnoreCase: + return CompareInfo.Invariant.Compare(strA, strB, CompareOptions.IgnoreCase); + + case StringComparison.Ordinal: + // Most common case: first character is different. + // Returns false for empty strings. + if (strA._firstChar != strB._firstChar) + { + return strA._firstChar - strB._firstChar; + } + + return CompareOrdinalHelper(strA, strB); + + case StringComparison.OrdinalIgnoreCase: +#if CORECLR + // If both strings are ASCII strings, we can take the fast path. + if (strA.IsAscii() && strB.IsAscii()) + { + return CompareOrdinalIgnoreCaseHelper(strA, strB); + } +#endif + return CompareInfo.CompareOrdinalIgnoreCase(strA, 0, strA.Length, strB, 0, strB.Length); + + default: + throw new ArgumentException(SR.NotSupported_StringComparison, nameof(comparisonType)); + } + } + + + // Provides a culture-correct string comparison. strA is compared to strB + // to determine whether it is lexicographically less, equal, or greater, and then a + // negative integer, 0, or a positive integer is returned; respectively. + // + public static int Compare(string strA, string strB, CultureInfo culture, CompareOptions options) + { + if (culture == null) + { + throw new ArgumentNullException(nameof(culture)); + } + + return culture.CompareInfo.Compare(strA, strB, options); + } + + + + // Provides a culture-correct string comparison. strA is compared to strB + // to determine whether it is lexicographically less, equal, or greater, and then a + // negative integer, 0, or a positive integer is returned; respectively. + // The case-sensitive option is set by ignoreCase, and the culture is set + // by culture + // + public static int Compare(string strA, string strB, bool ignoreCase, CultureInfo culture) + { + var options = ignoreCase ? CompareOptions.IgnoreCase : CompareOptions.None; + return Compare(strA, strB, culture, options); + } + + // Determines whether two string regions match. The substring of strA beginning + // at indexA of given length is compared with the substring of strB + // beginning at indexB of the same length. + // + public static int Compare(string strA, int indexA, string strB, int indexB, int length) + { + // NOTE: It's important we call the boolean overload, and not the StringComparison + // one. The two have some subtly different behavior (see notes in the former). + return Compare(strA, indexA, strB, indexB, length, ignoreCase: false); + } + + // Determines whether two string regions match. The substring of strA beginning + // at indexA of given length is compared with the substring of strB + // beginning at indexB of the same length. Case sensitivity is determined by the ignoreCase boolean. + // + public static int Compare(string strA, int indexA, string strB, int indexB, int length, bool ignoreCase) + { + // Ideally we would just forward to the string.Compare overload that takes + // a StringComparison parameter, and just pass in CurrentCulture/CurrentCultureIgnoreCase. + // That function will return early if an optimization can be applied, e.g. if + // (object)strA == strB && indexA == indexB then it will return 0 straightaway. + // There are a couple of subtle behavior differences that prevent us from doing so + // however: + // - string.Compare(null, -1, null, -1, -1, StringComparison.CurrentCulture) works + // since that method also returns early for nulls before validation. It shouldn't + // for this overload. + // - Since we originally forwarded to CompareInfo.Compare for all of the argument + // validation logic, the ArgumentOutOfRangeExceptions thrown will contain different + // parameter names. + // Therefore, we have to duplicate some of the logic here. + + int lengthA = length; + int lengthB = length; + + if (strA != null) + { + lengthA = Math.Min(lengthA, strA.Length - indexA); + } + + if (strB != null) + { + lengthB = Math.Min(lengthB, strB.Length - indexB); + } + + var options = ignoreCase ? CompareOptions.IgnoreCase : CompareOptions.None; + return CultureInfo.CurrentCulture.CompareInfo.Compare(strA, indexA, lengthA, strB, indexB, lengthB, options); + } + + // Determines whether two string regions match. The substring of strA beginning + // at indexA of length length is compared with the substring of strB + // beginning at indexB of the same length. Case sensitivity is determined by the ignoreCase boolean, + // and the culture is set by culture. + // + public static int Compare(string strA, int indexA, string strB, int indexB, int length, bool ignoreCase, CultureInfo culture) + { + var options = ignoreCase ? CompareOptions.IgnoreCase : CompareOptions.None; + return Compare(strA, indexA, strB, indexB, length, culture, options); + } + + + // Determines whether two string regions match. The substring of strA beginning + // at indexA of length length is compared with the substring of strB + // beginning at indexB of the same length. + // + public static int Compare(string strA, int indexA, string strB, int indexB, int length, CultureInfo culture, CompareOptions options) + { + if (culture == null) + { + throw new ArgumentNullException(nameof(culture)); + } + + int lengthA = length; + int lengthB = length; + + if (strA != null) + { + lengthA = Math.Min(lengthA, strA.Length - indexA); + } + + if (strB != null) + { + lengthB = Math.Min(lengthB, strB.Length - indexB); + } + + return culture.CompareInfo.Compare(strA, indexA, lengthA, strB, indexB, lengthB, options); + } + + public static int Compare(string strA, int indexA, string strB, int indexB, int length, StringComparison comparisonType) + { + CheckStringComparison(comparisonType); + + if (strA == null || strB == null) + { + + if (object.ReferenceEquals(strA, strB)) + { + // They're both null + return 0; + } + + return strA == null ? -1 : 1; + } + + if (length < 0) + { + throw new ArgumentOutOfRangeException(nameof(length), SR.ArgumentOutOfRange_NegativeLength); + } + + if (indexA < 0 || indexB < 0) + { + string paramName = indexA < 0 ? nameof(indexA) : nameof(indexB); + throw new ArgumentOutOfRangeException(paramName, SR.ArgumentOutOfRange_Index); + } + + if (strA.Length - indexA < 0 || strB.Length - indexB < 0) + { + string paramName = strA.Length - indexA < 0 ? nameof(indexA) : nameof(indexB); + throw new ArgumentOutOfRangeException(paramName, SR.ArgumentOutOfRange_Index); + } + + if (length == 0 || (object.ReferenceEquals(strA, strB) && indexA == indexB)) + { + return 0; + } + + int lengthA = Math.Min(length, strA.Length - indexA); + int lengthB = Math.Min(length, strB.Length - indexB); + + switch (comparisonType) + { + case StringComparison.CurrentCulture: + return CultureInfo.CurrentCulture.CompareInfo.Compare(strA, indexA, lengthA, strB, indexB, lengthB, CompareOptions.None); + + case StringComparison.CurrentCultureIgnoreCase: + return CultureInfo.CurrentCulture.CompareInfo.Compare(strA, indexA, lengthA, strB, indexB, lengthB, CompareOptions.IgnoreCase); + + case StringComparison.InvariantCulture: + return CompareInfo.Invariant.Compare(strA, indexA, lengthA, strB, indexB, lengthB, CompareOptions.None); + + case StringComparison.InvariantCultureIgnoreCase: + return CompareInfo.Invariant.Compare(strA, indexA, lengthA, strB, indexB, lengthB, CompareOptions.IgnoreCase); + + case StringComparison.Ordinal: + return CompareOrdinalHelper(strA, indexA, lengthA, strB, indexB, lengthB); + + case StringComparison.OrdinalIgnoreCase: + return CompareInfo.CompareOrdinalIgnoreCase(strA, indexA, lengthA, strB, indexB, lengthB); + + default: + throw new ArgumentException(SR.NotSupported_StringComparison, nameof(comparisonType)); + } + } + + // Compares strA and strB using an ordinal (code-point) comparison. + // + public static int CompareOrdinal(string strA, string strB) + { + if (object.ReferenceEquals(strA, strB)) + { + return 0; + } + + // They can't both be null at this point. + if (strA == null) + { + return -1; + } + if (strB == null) + { + return 1; + } + + // Most common case, first character is different. + // This will return false for empty strings. + if (strA._firstChar != strB._firstChar) + { + return strA._firstChar - strB._firstChar; + } + + return CompareOrdinalHelper(strA, strB); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + internal static int CompareOrdinal(ReadOnlySpan strA, ReadOnlySpan strB) + => SpanHelpers.SequenceCompareTo(ref MemoryMarshal.GetReference(strA), strA.Length, ref MemoryMarshal.GetReference(strB), strB.Length); + + // Compares strA and strB using an ordinal (code-point) comparison. + // + public static int CompareOrdinal(string strA, int indexA, string strB, int indexB, int length) + { + if (strA == null || strB == null) + { + if (object.ReferenceEquals(strA, strB)) + { + // They're both null + return 0; + } + + return strA == null ? -1 : 1; + } + + // COMPAT: Checking for nulls should become before the arguments are validated, + // but other optimizations which allow us to return early should come after. + + if (length < 0) + { + throw new ArgumentOutOfRangeException(nameof(length), SR.ArgumentOutOfRange_NegativeCount); + } + + if (indexA < 0 || indexB < 0) + { + string paramName = indexA < 0 ? nameof(indexA) : nameof(indexB); + throw new ArgumentOutOfRangeException(paramName, SR.ArgumentOutOfRange_Index); + } + + int lengthA = Math.Min(length, strA.Length - indexA); + int lengthB = Math.Min(length, strB.Length - indexB); + + if (lengthA < 0 || lengthB < 0) + { + string paramName = lengthA < 0 ? nameof(indexA) : nameof(indexB); + throw new ArgumentOutOfRangeException(paramName, SR.ArgumentOutOfRange_Index); + } + + if (length == 0 || (object.ReferenceEquals(strA, strB) && indexA == indexB)) + { + return 0; + } + + return CompareOrdinalHelper(strA, indexA, lengthA, strB, indexB, lengthB); + } + + // Compares this String to another String (cast as object), returning an integer that + // indicates the relationship. This method returns a value less than 0 if this is less than value, 0 + // if this is equal to value, or a value greater than 0 if this is greater than value. + // + public int CompareTo(object value) + { + if (value == null) + { + return 1; + } + + string other = value as string; + + if (other == null) + { + throw new ArgumentException(SR.Arg_MustBeString); + } + + return CompareTo(other); // will call the string-based overload + } + + // Determines the sorting relation of StrB to the current instance. + // + public int CompareTo(string strB) + { + return string.Compare(this, strB, StringComparison.CurrentCulture); + } + + // Determines whether a specified string is a suffix of the current instance. + // + // The case-sensitive and culture-sensitive option is set by options, + // and the default culture is used. + // + public bool EndsWith(string value) + { + return EndsWith(value, StringComparison.CurrentCulture); + } + + public bool EndsWith(string value, StringComparison comparisonType) + { + if ((object)value == null) + { + throw new ArgumentNullException(nameof(value)); + } + + if ((object)this == (object)value) + { + CheckStringComparison(comparisonType); + return true; + } + + if (value.Length == 0) + { + CheckStringComparison(comparisonType); + return true; + } + + switch (comparisonType) + { + case StringComparison.CurrentCulture: + return CultureInfo.CurrentCulture.CompareInfo.IsSuffix(this, value, CompareOptions.None); + + case StringComparison.CurrentCultureIgnoreCase: + return CultureInfo.CurrentCulture.CompareInfo.IsSuffix(this, value, CompareOptions.IgnoreCase); + + case StringComparison.InvariantCulture: + return CompareInfo.Invariant.IsSuffix(this, value, CompareOptions.None); + + case StringComparison.InvariantCultureIgnoreCase: + return CompareInfo.Invariant.IsSuffix(this, value, CompareOptions.IgnoreCase); + + case StringComparison.Ordinal: + return this.Length < value.Length ? false : (CompareOrdinalHelper(this, this.Length - value.Length, value.Length, value, 0, value.Length) == 0); + + case StringComparison.OrdinalIgnoreCase: + return this.Length < value.Length ? false : (CompareInfo.CompareOrdinalIgnoreCase(this, this.Length - value.Length, value.Length, value, 0, value.Length) == 0); + + default: + throw new ArgumentException(SR.NotSupported_StringComparison, nameof(comparisonType)); + } + } + + public bool EndsWith(string value, bool ignoreCase, CultureInfo culture) + { + if (null == value) + { + throw new ArgumentNullException(nameof(value)); + } + + if ((object)this == (object)value) + { + return true; + } + + CultureInfo referenceCulture = culture ?? CultureInfo.CurrentCulture; + return referenceCulture.CompareInfo.IsSuffix(this, value, ignoreCase ? CompareOptions.IgnoreCase : CompareOptions.None); + } + + public bool EndsWith(char value) + { + int thisLen = Length; + return thisLen != 0 && this[thisLen - 1] == value; + } + + // Determines whether two strings match. + public override bool Equals(object obj) + { + if (object.ReferenceEquals(this, obj)) + return true; + + string str = obj as string; + if (str == null) + return false; + + if (this.Length != str.Length) + return false; + + return EqualsHelper(this, str); + } + + // Determines whether two strings match. + public bool Equals(string value) + { + if (object.ReferenceEquals(this, value)) + return true; + + // NOTE: No need to worry about casting to object here. + // If either side of an == comparison between strings + // is null, Roslyn generates a simple ceq instruction + // instead of calling string.op_Equality. + if (value == null) + return false; + + if (this.Length != value.Length) + return false; + + return EqualsHelper(this, value); + } + + public bool Equals(string value, StringComparison comparisonType) + { + if ((object)this == (object)value) + { + CheckStringComparison(comparisonType); + return true; + } + + if ((object)value == null) + { + CheckStringComparison(comparisonType); + return false; + } + + switch (comparisonType) + { + case StringComparison.CurrentCulture: + return (CultureInfo.CurrentCulture.CompareInfo.Compare(this, value, CompareOptions.None) == 0); + + case StringComparison.CurrentCultureIgnoreCase: + return (CultureInfo.CurrentCulture.CompareInfo.Compare(this, value, CompareOptions.IgnoreCase) == 0); + + case StringComparison.InvariantCulture: + return (CompareInfo.Invariant.Compare(this, value, CompareOptions.None) == 0); + + case StringComparison.InvariantCultureIgnoreCase: + return (CompareInfo.Invariant.Compare(this, value, CompareOptions.IgnoreCase) == 0); + + case StringComparison.Ordinal: + if (this.Length != value.Length) + return false; + return EqualsHelper(this, value); + + case StringComparison.OrdinalIgnoreCase: + if (this.Length != value.Length) + return false; +#if CORECLR + // If both strings are ASCII strings, we can take the fast path. + if (this.IsAscii() && value.IsAscii()) + { + return EqualsIgnoreCaseAsciiHelper(this, value); + } +#endif + return (CompareInfo.CompareOrdinalIgnoreCase(this, 0, this.Length, value, 0, value.Length) == 0); + + default: + throw new ArgumentException(SR.NotSupported_StringComparison, nameof(comparisonType)); + } + } + + + // Determines whether two Strings match. + public static bool Equals(string a, string b) + { + if ((object)a == (object)b) + { + return true; + } + + if ((object)a == null || (object)b == null || a.Length != b.Length) + { + return false; + } + + return EqualsHelper(a, b); + } + + public static bool Equals(string a, string b, StringComparison comparisonType) + { + if ((object)a == (object)b) + { + CheckStringComparison(comparisonType); + return true; + } + + if ((object)a == null || (object)b == null) + { + CheckStringComparison(comparisonType); + return false; + } + + switch (comparisonType) + { + case StringComparison.CurrentCulture: + return (CultureInfo.CurrentCulture.CompareInfo.Compare(a, b, CompareOptions.None) == 0); + + case StringComparison.CurrentCultureIgnoreCase: + return (CultureInfo.CurrentCulture.CompareInfo.Compare(a, b, CompareOptions.IgnoreCase) == 0); + + case StringComparison.InvariantCulture: + return (CompareInfo.Invariant.Compare(a, b, CompareOptions.None) == 0); + + case StringComparison.InvariantCultureIgnoreCase: + return (CompareInfo.Invariant.Compare(a, b, CompareOptions.IgnoreCase) == 0); + + case StringComparison.Ordinal: + if (a.Length != b.Length) + return false; + return EqualsHelper(a, b); + + case StringComparison.OrdinalIgnoreCase: + if (a.Length != b.Length) + return false; +#if CORECLR + // If both strings are ASCII strings, we can take the fast path. + if (a.IsAscii() && b.IsAscii()) + { + return EqualsIgnoreCaseAsciiHelper(a, b); + } +#endif + return (CompareInfo.CompareOrdinalIgnoreCase(a, 0, a.Length, b, 0, b.Length) == 0); + + default: + throw new ArgumentException(SR.NotSupported_StringComparison, nameof(comparisonType)); + } + } + + public static bool operator ==(string a, string b) + { + return string.Equals(a, b); + } + + public static bool operator !=(string a, string b) + { + return !string.Equals(a, b); + } + + // Gets a hash code for this string. If strings A and B are such that A.Equals(B), then + // they will return the same hash code. + public override int GetHashCode() + { + return Marvin.ComputeHash32(ref Unsafe.As(ref _firstChar), _stringLength * 2, Marvin.DefaultSeed); + } + + // Gets a hash code for this string and this comparison. If strings A and B and comparison C are such + // that string.Equals(A, B, C), then they will return the same hash code with this comparison C. + public int GetHashCode(StringComparison comparisonType) => StringComparer.FromComparison(comparisonType).GetHashCode(this); + + // Use this if and only if you need the hashcode to not change across app domains (e.g. you have an app domain agile + // hash table). + internal int GetLegacyNonRandomizedHashCode() + { + unsafe + { + fixed (char* src = &_firstChar) + { + Debug.Assert(src[this.Length] == '\0', "src[this.Length] == '\\0'"); + Debug.Assert(((int)src) % 4 == 0, "Managed string should start at 4 bytes boundary"); +#if BIT64 + int hash1 = 5381; +#else // !BIT64 (32) + int hash1 = (5381<<16) + 5381; +#endif + int hash2 = hash1; + +#if BIT64 + int c; + char* s = src; + while ((c = s[0]) != 0) + { + hash1 = ((hash1 << 5) + hash1) ^ c; + c = s[1]; + if (c == 0) + break; + hash2 = ((hash2 << 5) + hash2) ^ c; + s += 2; + } +#else // !BIT64 (32) + // 32 bit machines. + int* pint = (int *)src; + int len = this.Length; + while (len > 2) + { + hash1 = ((hash1 << 5) + hash1 + (hash1 >> 27)) ^ pint[0]; + hash2 = ((hash2 << 5) + hash2 + (hash2 >> 27)) ^ pint[1]; + pint += 2; + len -= 4; + } + + if (len > 0) + { + hash1 = ((hash1 << 5) + hash1 + (hash1 >> 27)) ^ pint[0]; + } +#endif + return hash1 + (hash2 * 1566083941); + } + } + } + + // Determines whether a specified string is a prefix of the current instance + // + public bool StartsWith(string value) + { + if ((object)value == null) + { + throw new ArgumentNullException(nameof(value)); + } + return StartsWith(value, StringComparison.CurrentCulture); + } + + public bool StartsWith(string value, StringComparison comparisonType) + { + if ((object)value == null) + { + throw new ArgumentNullException(nameof(value)); + } + + if ((object)this == (object)value) + { + CheckStringComparison(comparisonType); + return true; + } + + if (value.Length == 0) + { + CheckStringComparison(comparisonType); + return true; + } + + switch (comparisonType) + { + case StringComparison.CurrentCulture: + return CultureInfo.CurrentCulture.CompareInfo.IsPrefix(this, value, CompareOptions.None); + + case StringComparison.CurrentCultureIgnoreCase: + return CultureInfo.CurrentCulture.CompareInfo.IsPrefix(this, value, CompareOptions.IgnoreCase); + + case StringComparison.InvariantCulture: + return CompareInfo.Invariant.IsPrefix(this, value, CompareOptions.None); + + case StringComparison.InvariantCultureIgnoreCase: + return CompareInfo.Invariant.IsPrefix(this, value, CompareOptions.IgnoreCase); + + case StringComparison.Ordinal: + if (this.Length < value.Length || _firstChar != value._firstChar) + { + return false; + } + return (value.Length == 1) ? + true : // First char is the same and thats all there is to compare + SpanHelpers.SequenceEqual( + ref Unsafe.As(ref this.GetRawStringData()), + ref Unsafe.As(ref value.GetRawStringData()), + ((nuint)value.Length) * 2); + + case StringComparison.OrdinalIgnoreCase: + if (this.Length < value.Length) + { + return false; + } + return (CompareInfo.CompareOrdinalIgnoreCase(this, 0, value.Length, value, 0, value.Length) == 0); + + default: + throw new ArgumentException(SR.NotSupported_StringComparison, nameof(comparisonType)); + } + } + + public bool StartsWith(string value, bool ignoreCase, CultureInfo culture) + { + if (null == value) + { + throw new ArgumentNullException(nameof(value)); + } + + if ((object)this == (object)value) + { + return true; + } + + CultureInfo referenceCulture = culture ?? CultureInfo.CurrentCulture; + return referenceCulture.CompareInfo.IsPrefix(this, value, ignoreCase ? CompareOptions.IgnoreCase : CompareOptions.None); + } + + public bool StartsWith(char value) => Length != 0 && _firstChar == value; + + internal static void CheckStringComparison(StringComparison comparisonType) + { + // Single comparison to check if comparisonType is within [CurrentCulture .. OrdinalIgnoreCase] + if ((uint)(comparisonType - StringComparison.CurrentCulture) > (StringComparison.OrdinalIgnoreCase - StringComparison.CurrentCulture)) + { + ThrowHelper.ThrowArgumentException(ExceptionResource.NotSupported_StringComparison, ExceptionArgument.comparisonType); + } + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/String.Manipulation.cs b/external/corefx/src/Common/src/CoreLib/System/String.Manipulation.cs new file mode 100644 index 0000000000..80d0251f33 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/String.Manipulation.cs @@ -0,0 +1,1852 @@ +// 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; +using System.Collections.Generic; +using System.Diagnostics.Private; +using System.Globalization; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Text; +using Internal.Runtime.CompilerServices; + +namespace System +{ + public partial class String + { + private const int StackallocIntBufferSizeLimit = 128; + + private static unsafe void FillStringChecked(string dest, int destPos, string src) + { + Debug.Assert(dest != null); + Debug.Assert(src != null); + if (src.Length > dest.Length - destPos) + { + throw new IndexOutOfRangeException(); + } + + fixed (char* pDest = &dest._firstChar) + fixed (char* pSrc = &src._firstChar) + { + wstrcpy(pDest + destPos, pSrc, src.Length); + } + } + + public static string Concat(object arg0) + { + if (arg0 == null) + { + return string.Empty; + } + return arg0.ToString(); + } + + public static string Concat(object arg0, object arg1) + { + if (arg0 == null) + { + arg0 = string.Empty; + } + + if (arg1 == null) + { + arg1 = string.Empty; + } + return Concat(arg0.ToString(), arg1.ToString()); + } + + public static string Concat(object arg0, object arg1, object arg2) + { + if (arg0 == null) + { + arg0 = string.Empty; + } + + if (arg1 == null) + { + arg1 = string.Empty; + } + + if (arg2 == null) + { + arg2 = string.Empty; + } + + return Concat(arg0.ToString(), arg1.ToString(), arg2.ToString()); + } + + public static string Concat(params object[] args) + { + if (args == null) + { + throw new ArgumentNullException(nameof(args)); + } + + if (args.Length <= 1) + { + return args.Length == 0 ? + string.Empty : + args[0]?.ToString() ?? string.Empty; + } + + // We need to get an intermediary string array + // to fill with each of the args' ToString(), + // and then just concat that in one operation. + + // This way we avoid any intermediary string representations, + // or buffer resizing if we use StringBuilder (although the + // latter case is partially alleviated due to StringBuilder's + // linked-list style implementation) + + var strings = new string[args.Length]; + + int totalLength = 0; + + for (int i = 0; i < args.Length; i++) + { + object value = args[i]; + + string toString = value?.ToString() ?? string.Empty; // We need to handle both the cases when value or value.ToString() is null + strings[i] = toString; + + totalLength += toString.Length; + + if (totalLength < 0) // Check for a positive overflow + { + throw new OutOfMemoryException(); + } + } + + // If all of the ToStrings are null/empty, just return string.Empty + if (totalLength == 0) + { + return string.Empty; + } + + string result = FastAllocateString(totalLength); + int position = 0; // How many characters we've copied so far + + for (int i = 0; i < strings.Length; i++) + { + string s = strings[i]; + + Debug.Assert(s != null); + Debug.Assert(position <= totalLength - s.Length, "We didn't allocate enough space for the result string!"); + + FillStringChecked(result, position, s); + position += s.Length; + } + + return result; + } + + public static string Concat(IEnumerable values) + { + if (values == null) + throw new ArgumentNullException(nameof(values)); + + if (typeof(T) == typeof(char)) + { + // Special-case T==char, as we can handle that case much more efficiently, + // and string.Concat(IEnumerable) can be used as an efficient + // enumerable-based equivalent of new string(char[]). + using (IEnumerator en = Unsafe.As>(values).GetEnumerator()) + { + if (!en.MoveNext()) + { + // There weren't any chars. Return the empty string. + return Empty; + } + + char c = en.Current; // save the first char + + if (!en.MoveNext()) + { + // There was only one char. Return a string from it directly. + return CreateFromChar(c); + } + + // Create the StringBuilder, add the chars we've already enumerated, + // add the rest, and then get the resulting string. + StringBuilder result = StringBuilderCache.Acquire(); + result.Append(c); // first value + do + { + c = en.Current; + result.Append(c); + } + while (en.MoveNext()); + return StringBuilderCache.GetStringAndRelease(result); + } + } + else + { + using (IEnumerator en = values.GetEnumerator()) + { + if (!en.MoveNext()) + return string.Empty; + + // We called MoveNext once, so this will be the first item + T currentValue = en.Current; + + // Call ToString before calling MoveNext again, since + // we want to stay consistent with the below loop + // Everything should be called in the order + // MoveNext-Current-ToString, unless further optimizations + // can be made, to avoid breaking changes + string firstString = currentValue?.ToString(); + + // If there's only 1 item, simply call ToString on that + if (!en.MoveNext()) + { + // We have to handle the case of either currentValue + // or its ToString being null + return firstString ?? string.Empty; + } + + StringBuilder result = StringBuilderCache.Acquire(); + + result.Append(firstString); + + do + { + currentValue = en.Current; + + if (currentValue != null) + { + result.Append(currentValue.ToString()); + } + } + while (en.MoveNext()); + + return StringBuilderCache.GetStringAndRelease(result); + } + } + } + + public static string Concat(IEnumerable values) + { + if (values == null) + throw new ArgumentNullException(nameof(values)); + + using (IEnumerator en = values.GetEnumerator()) + { + if (!en.MoveNext()) + return string.Empty; + + string firstValue = en.Current; + + if (!en.MoveNext()) + { + return firstValue ?? string.Empty; + } + + StringBuilder result = StringBuilderCache.Acquire(); + result.Append(firstValue); + + do + { + result.Append(en.Current); + } + while (en.MoveNext()); + + return StringBuilderCache.GetStringAndRelease(result); + } + } + + public static string Concat(string str0, string str1) + { + if (IsNullOrEmpty(str0)) + { + if (IsNullOrEmpty(str1)) + { + return string.Empty; + } + return str1; + } + + if (IsNullOrEmpty(str1)) + { + return str0; + } + + int str0Length = str0.Length; + + string result = FastAllocateString(str0Length + str1.Length); + + FillStringChecked(result, 0, str0); + FillStringChecked(result, str0Length, str1); + + return result; + } + + public static string Concat(string str0, string str1, string str2) + { + if (IsNullOrEmpty(str0)) + { + return Concat(str1, str2); + } + + if (IsNullOrEmpty(str1)) + { + return Concat(str0, str2); + } + + if (IsNullOrEmpty(str2)) + { + return Concat(str0, str1); + } + + int totalLength = str0.Length + str1.Length + str2.Length; + + string result = FastAllocateString(totalLength); + FillStringChecked(result, 0, str0); + FillStringChecked(result, str0.Length, str1); + FillStringChecked(result, str0.Length + str1.Length, str2); + + return result; + } + + public static string Concat(string str0, string str1, string str2, string str3) + { + if (IsNullOrEmpty(str0)) + { + return Concat(str1, str2, str3); + } + + if (IsNullOrEmpty(str1)) + { + return Concat(str0, str2, str3); + } + + if (IsNullOrEmpty(str2)) + { + return Concat(str0, str1, str3); + } + + if (IsNullOrEmpty(str3)) + { + return Concat(str0, str1, str2); + } + + int totalLength = str0.Length + str1.Length + str2.Length + str3.Length; + + string result = FastAllocateString(totalLength); + FillStringChecked(result, 0, str0); + FillStringChecked(result, str0.Length, str1); + FillStringChecked(result, str0.Length + str1.Length, str2); + FillStringChecked(result, str0.Length + str1.Length + str2.Length, str3); + + return result; + } + + public static string Concat(params string[] values) + { + if (values == null) + throw new ArgumentNullException(nameof(values)); + + if (values.Length <= 1) + { + return values.Length == 0 ? + string.Empty : + values[0] ?? string.Empty; + } + + // It's possible that the input values array could be changed concurrently on another + // thread, such that we can't trust that each read of values[i] will be equivalent. + // Worst case, we can make a defensive copy of the array and use that, but we first + // optimistically try the allocation and copies assuming that the array isn't changing, + // which represents the 99.999% case, in particular since string.Concat is used for + // string concatenation by the languages, with the input array being a params array. + + // Sum the lengths of all input strings + long totalLengthLong = 0; + for (int i = 0; i < values.Length; i++) + { + string value = values[i]; + if (value != null) + { + totalLengthLong += value.Length; + } + } + + // If it's too long, fail, or if it's empty, return an empty string. + if (totalLengthLong > int.MaxValue) + { + throw new OutOfMemoryException(); + } + int totalLength = (int)totalLengthLong; + if (totalLength == 0) + { + return string.Empty; + } + + // Allocate a new string and copy each input string into it + string result = FastAllocateString(totalLength); + int copiedLength = 0; + for (int i = 0; i < values.Length; i++) + { + string value = values[i]; + if (!string.IsNullOrEmpty(value)) + { + int valueLen = value.Length; + if (valueLen > totalLength - copiedLength) + { + copiedLength = -1; + break; + } + + FillStringChecked(result, copiedLength, value); + copiedLength += valueLen; + } + } + + // If we copied exactly the right amount, return the new string. Otherwise, + // something changed concurrently to mutate the input array: fall back to + // doing the concatenation again, but this time with a defensive copy. This + // fall back should be extremely rare. + return copiedLength == totalLength ? result : Concat((string[])values.Clone()); + } + + public static string Format(string format, object arg0) + { + return FormatHelper(null, format, new ParamsArray(arg0)); + } + + public static string Format(string format, object arg0, object arg1) + { + return FormatHelper(null, format, new ParamsArray(arg0, arg1)); + } + + public static string Format(string format, object arg0, object arg1, object arg2) + { + return FormatHelper(null, format, new ParamsArray(arg0, arg1, arg2)); + } + + public static string Format(string format, params object[] args) + { + if (args == null) + { + // To preserve the original exception behavior, throw an exception about format if both + // args and format are null. The actual null check for format is in FormatHelper. + throw new ArgumentNullException((format == null) ? nameof(format) : nameof(args)); + } + + return FormatHelper(null, format, new ParamsArray(args)); + } + + public static string Format(IFormatProvider provider, string format, object arg0) + { + return FormatHelper(provider, format, new ParamsArray(arg0)); + } + + public static string Format(IFormatProvider provider, string format, object arg0, object arg1) + { + return FormatHelper(provider, format, new ParamsArray(arg0, arg1)); + } + + public static string Format(IFormatProvider provider, string format, object arg0, object arg1, object arg2) + { + return FormatHelper(provider, format, new ParamsArray(arg0, arg1, arg2)); + } + + public static string Format(IFormatProvider provider, string format, params object[] args) + { + if (args == null) + { + // To preserve the original exception behavior, throw an exception about format if both + // args and format are null. The actual null check for format is in FormatHelper. + throw new ArgumentNullException((format == null) ? nameof(format) : nameof(args)); + } + + return FormatHelper(provider, format, new ParamsArray(args)); + } + + private static string FormatHelper(IFormatProvider provider, string format, ParamsArray args) + { + if (format == null) + throw new ArgumentNullException(nameof(format)); + + return StringBuilderCache.GetStringAndRelease( + StringBuilderCache + .Acquire(format.Length + args.Length * 8) + .AppendFormatHelper(provider, format, args)); + } + + public string Insert(int startIndex, string value) + { + if (value == null) + throw new ArgumentNullException(nameof(value)); + if (startIndex < 0 || startIndex > this.Length) + throw new ArgumentOutOfRangeException(nameof(startIndex)); + + int oldLength = Length; + int insertLength = value.Length; + + if (oldLength == 0) + return value; + if (insertLength == 0) + return this; + + // In case this computation overflows, newLength will be negative and FastAllocateString throws OutOfMemoryException + int newLength = oldLength + insertLength; + string result = FastAllocateString(newLength); + unsafe + { + fixed (char* srcThis = &_firstChar) + { + fixed (char* srcInsert = &value._firstChar) + { + fixed (char* dst = &result._firstChar) + { + wstrcpy(dst, srcThis, startIndex); + wstrcpy(dst + startIndex, srcInsert, insertLength); + wstrcpy(dst + startIndex + insertLength, srcThis + startIndex, oldLength - startIndex); + } + } + } + } + return result; + } + + public static string Join(char separator, params string[] value) + { + if (value == null) + { + throw new ArgumentNullException(nameof(value)); + } + + return Join(separator, value, 0, value.Length); + } + + public static unsafe string Join(char separator, params object[] values) + { + // Defer argument validation to the internal function + return JoinCore(&separator, 1, values); + } + + public static unsafe string Join(char separator, IEnumerable values) + { + // Defer argument validation to the internal function + return JoinCore(&separator, 1, values); + } + + public static unsafe string Join(char separator, string[] value, int startIndex, int count) + { + // Defer argument validation to the internal function + return JoinCore(&separator, 1, value, startIndex, count); + } + + // Joins an array of strings together as one string with a separator between each original string. + // + public static string Join(string separator, params string[] value) + { + if (value == null) + { + throw new ArgumentNullException(nameof(value)); + } + return Join(separator, value, 0, value.Length); + } + + public static unsafe string Join(string separator, params object[] values) + { + separator = separator ?? string.Empty; + fixed (char* pSeparator = &separator._firstChar) + { + // Defer argument validation to the internal function + return JoinCore(pSeparator, separator.Length, values); + } + } + + public static unsafe string Join(string separator, IEnumerable values) + { + separator = separator ?? string.Empty; + fixed (char* pSeparator = &separator._firstChar) + { + // Defer argument validation to the internal function + return JoinCore(pSeparator, separator.Length, values); + } + } + + public static string Join(string separator, IEnumerable values) + { + if (values == null) + { + throw new ArgumentNullException(nameof(values)); + } + + using (IEnumerator en = values.GetEnumerator()) + { + if (!en.MoveNext()) + { + return string.Empty; + } + + string firstValue = en.Current; + + if (!en.MoveNext()) + { + // Only one value available + return firstValue ?? string.Empty; + } + + // Null separator and values are handled by the StringBuilder + StringBuilder result = StringBuilderCache.Acquire(); + result.Append(firstValue); + + do + { + result.Append(separator); + result.Append(en.Current); + } + while (en.MoveNext()); + + return StringBuilderCache.GetStringAndRelease(result); + } + } + + // Joins an array of strings together as one string with a separator between each original string. + // + public static unsafe string Join(string separator, string[] value, int startIndex, int count) + { + separator = separator ?? string.Empty; + fixed (char* pSeparator = &separator._firstChar) + { + // Defer argument validation to the internal function + return JoinCore(pSeparator, separator.Length, value, startIndex, count); + } + } + + private static unsafe string JoinCore(char* separator, int separatorLength, object[] values) + { + if (values == null) + { + throw new ArgumentNullException(nameof(values)); + } + + if (values.Length == 0) + { + return string.Empty; + } + + string firstString = values[0]?.ToString(); + + if (values.Length == 1) + { + return firstString ?? string.Empty; + } + + StringBuilder result = StringBuilderCache.Acquire(); + result.Append(firstString); + + for (int i = 1; i < values.Length; i++) + { + result.Append(separator, separatorLength); + object value = values[i]; + if (value != null) + { + result.Append(value.ToString()); + } + } + + return StringBuilderCache.GetStringAndRelease(result); + } + + private static unsafe string JoinCore(char* separator, int separatorLength, IEnumerable values) + { + if (values == null) + { + throw new ArgumentNullException(nameof(values)); + } + + using (IEnumerator en = values.GetEnumerator()) + { + if (!en.MoveNext()) + { + return string.Empty; + } + + // We called MoveNext once, so this will be the first item + T currentValue = en.Current; + + // Call ToString before calling MoveNext again, since + // we want to stay consistent with the below loop + // Everything should be called in the order + // MoveNext-Current-ToString, unless further optimizations + // can be made, to avoid breaking changes + string firstString = currentValue?.ToString(); + + // If there's only 1 item, simply call ToString on that + if (!en.MoveNext()) + { + // We have to handle the case of either currentValue + // or its ToString being null + return firstString ?? string.Empty; + } + + StringBuilder result = StringBuilderCache.Acquire(); + + result.Append(firstString); + + do + { + currentValue = en.Current; + + result.Append(separator, separatorLength); + if (currentValue != null) + { + result.Append(currentValue.ToString()); + } + } + while (en.MoveNext()); + + return StringBuilderCache.GetStringAndRelease(result); + } + } + + private static unsafe string JoinCore(char* separator, int separatorLength, string[] value, int startIndex, int count) + { + // If the separator is null, it is converted to an empty string before entering this function. + // Even for empty strings, fixed should never return null (it should return a pointer to a null char). + Debug.Assert(separator != null); + Debug.Assert(separatorLength >= 0); + + if (value == null) + { + throw new ArgumentNullException(nameof(value)); + } + if (startIndex < 0) + { + throw new ArgumentOutOfRangeException(nameof(startIndex), SR.ArgumentOutOfRange_StartIndex); + } + if (count < 0) + { + throw new ArgumentOutOfRangeException(nameof(count), SR.ArgumentOutOfRange_NegativeCount); + } + if (startIndex > value.Length - count) + { + throw new ArgumentOutOfRangeException(nameof(startIndex), SR.ArgumentOutOfRange_IndexCountBuffer); + } + + if (count <= 1) + { + return count == 0 ? + string.Empty : + value[startIndex] ?? string.Empty; + } + + long totalSeparatorsLength = (long)(count - 1) * separatorLength; + if (totalSeparatorsLength > int.MaxValue) + { + throw new OutOfMemoryException(); + } + int totalLength = (int)totalSeparatorsLength; + + // Calculate the length of the resultant string so we know how much space to allocate. + for (int i = startIndex, end = startIndex + count; i < end; i++) + { + string currentValue = value[i]; + if (currentValue != null) + { + totalLength += currentValue.Length; + if (totalLength < 0) // Check for overflow + { + throw new OutOfMemoryException(); + } + } + } + + // Copy each of the strings into the resultant buffer, interleaving with the separator. + string result = FastAllocateString(totalLength); + int copiedLength = 0; + + for (int i = startIndex, end = startIndex + count; i < end; i++) + { + // It's possible that another thread may have mutated the input array + // such that our second read of an index will not be the same string + // we got during the first read. + + // We range check again to avoid buffer overflows if this happens. + + string currentValue = value[i]; + if (currentValue != null) + { + int valueLen = currentValue.Length; + if (valueLen > totalLength - copiedLength) + { + copiedLength = -1; + break; + } + + // Fill in the value. + FillStringChecked(result, copiedLength, currentValue); + copiedLength += valueLen; + } + + if (i < end - 1) + { + // Fill in the separator. + fixed (char* pResult = &result._firstChar) + { + // If we are called from the char-based overload, we will not + // want to call MemoryCopy each time we fill in the separator. So + // specialize for 1-length separators. + if (separatorLength == 1) + { + pResult[copiedLength] = *separator; + } + else + { + wstrcpy(pResult + copiedLength, separator, separatorLength); + } + } + copiedLength += separatorLength; + } + } + + // If we copied exactly the right amount, return the new string. Otherwise, + // something changed concurrently to mutate the input array: fall back to + // doing the concatenation again, but this time with a defensive copy. This + // fall back should be extremely rare. + return copiedLength == totalLength ? + result : + JoinCore(separator, separatorLength, (string[])value.Clone(), startIndex, count); + } + + public string PadLeft(int totalWidth) => PadLeft(totalWidth, ' '); + + public string PadLeft(int totalWidth, char paddingChar) + { + if (totalWidth < 0) + throw new ArgumentOutOfRangeException(nameof(totalWidth), SR.ArgumentOutOfRange_NeedNonNegNum); + int oldLength = Length; + int count = totalWidth - oldLength; + if (count <= 0) + return this; + string result = FastAllocateString(totalWidth); + unsafe + { + fixed (char* dst = &result._firstChar) + { + for (int i = 0; i < count; i++) + dst[i] = paddingChar; + fixed (char* src = &_firstChar) + { + wstrcpy(dst + count, src, oldLength); + } + } + } + return result; + } + + public string PadRight(int totalWidth) => PadRight(totalWidth, ' '); + + public string PadRight(int totalWidth, char paddingChar) + { + if (totalWidth < 0) + throw new ArgumentOutOfRangeException(nameof(totalWidth), SR.ArgumentOutOfRange_NeedNonNegNum); + int oldLength = Length; + int count = totalWidth - oldLength; + if (count <= 0) + return this; + string result = FastAllocateString(totalWidth); + unsafe + { + fixed (char* dst = &result._firstChar) + { + fixed (char* src = &_firstChar) + { + wstrcpy(dst, src, oldLength); + } + for (int i = 0; i < count; i++) + dst[oldLength + i] = paddingChar; + } + } + return result; + } + + public string Remove(int startIndex, int count) + { + if (startIndex < 0) + throw new ArgumentOutOfRangeException(nameof(startIndex), SR.ArgumentOutOfRange_StartIndex); + if (count < 0) + throw new ArgumentOutOfRangeException(nameof(count), SR.ArgumentOutOfRange_NegativeCount); + int oldLength = this.Length; + if (count > oldLength - startIndex) + throw new ArgumentOutOfRangeException(nameof(count), SR.ArgumentOutOfRange_IndexCount); + + if (count == 0) + return this; + int newLength = oldLength - count; + if (newLength == 0) + return string.Empty; + + string result = FastAllocateString(newLength); + unsafe + { + fixed (char* src = &_firstChar) + { + fixed (char* dst = &result._firstChar) + { + wstrcpy(dst, src, startIndex); + wstrcpy(dst + startIndex, src + startIndex + count, newLength - startIndex); + } + } + } + return result; + } + + // a remove that just takes a startindex. + public string Remove(int startIndex) + { + if (startIndex < 0) + throw new ArgumentOutOfRangeException(nameof(startIndex), SR.ArgumentOutOfRange_StartIndex); + + if (startIndex >= Length) + throw new ArgumentOutOfRangeException(nameof(startIndex), SR.ArgumentOutOfRange_StartIndexLessThanLength); + + return Substring(0, startIndex); + } + + public string Replace(string oldValue, string newValue, bool ignoreCase, CultureInfo culture) + { + return ReplaceCore(oldValue, newValue, culture, ignoreCase ? CompareOptions.IgnoreCase : CompareOptions.None); + } + + public string Replace(string oldValue, string newValue, StringComparison comparisonType) + { + switch (comparisonType) + { + case StringComparison.CurrentCulture: + return ReplaceCore(oldValue, newValue, CultureInfo.CurrentCulture, CompareOptions.None); + + case StringComparison.CurrentCultureIgnoreCase: + return ReplaceCore(oldValue, newValue, CultureInfo.CurrentCulture, CompareOptions.IgnoreCase); + + case StringComparison.InvariantCulture: + return ReplaceCore(oldValue, newValue, CultureInfo.InvariantCulture, CompareOptions.None); + + case StringComparison.InvariantCultureIgnoreCase: + return ReplaceCore(oldValue, newValue, CultureInfo.InvariantCulture, CompareOptions.IgnoreCase); + + case StringComparison.Ordinal: + return Replace(oldValue, newValue); + + case StringComparison.OrdinalIgnoreCase: + return ReplaceCore(oldValue, newValue, CultureInfo.InvariantCulture, CompareOptions.OrdinalIgnoreCase); + + default: + throw new ArgumentException(SR.NotSupported_StringComparison, nameof(comparisonType)); + } + } + + private unsafe string ReplaceCore(string oldValue, string newValue, CultureInfo culture, CompareOptions options) + { + if (oldValue == null) + throw new ArgumentNullException(nameof(oldValue)); + if (oldValue.Length == 0) + throw new ArgumentException(SR.Argument_StringZeroLength, nameof(oldValue)); + + // If they asked to replace oldValue with a null, replace all occurrences + // with the empty string. + if (newValue == null) + newValue = string.Empty; + + CultureInfo referenceCulture = culture ?? CultureInfo.CurrentCulture; + StringBuilder result = StringBuilderCache.Acquire(); + + int startIndex = 0; + int index = 0; + + int matchLength = 0; + + bool hasDoneAnyReplacements = false; + CompareInfo ci = referenceCulture.CompareInfo; + + do + { + index = ci.IndexOf(this, oldValue, startIndex, this.Length - startIndex, options, &matchLength); + if (index >= 0) + { + // append the unmodified portion of string + result.Append(this, startIndex, index - startIndex); + + // append the replacement + result.Append(newValue); + + startIndex = index + matchLength; + hasDoneAnyReplacements = true; + } + else if (!hasDoneAnyReplacements) + { + // small optimization, + // if we have not done any replacements, + // we will return the original string + StringBuilderCache.Release(result); + return this; + } + else + { + result.Append(this, startIndex, this.Length - startIndex); + } + } while (index >= 0); + + return StringBuilderCache.GetStringAndRelease(result); + } + + // Replaces all instances of oldChar with newChar. + // + public string Replace(char oldChar, char newChar) + { + if (oldChar == newChar) + return this; + + unsafe + { + int remainingLength = Length; + + fixed (char* pChars = &_firstChar) + { + char* pSrc = pChars; + + while (remainingLength > 0) + { + if (*pSrc == oldChar) + { + break; + } + + remainingLength--; + pSrc++; + } + } + + if (remainingLength == 0) + return this; + + string result = FastAllocateString(Length); + + fixed (char* pChars = &_firstChar) + { + fixed (char* pResult = &result._firstChar) + { + int copyLength = Length - remainingLength; + + //Copy the characters already proven not to match. + if (copyLength > 0) + { + wstrcpy(pResult, pChars, copyLength); + } + + //Copy the remaining characters, doing the replacement as we go. + char* pSrc = pChars + copyLength; + char* pDst = pResult + copyLength; + + do + { + char currentChar = *pSrc; + if (currentChar == oldChar) + currentChar = newChar; + *pDst = currentChar; + + remainingLength--; + pSrc++; + pDst++; + } while (remainingLength > 0); + } + } + + return result; + } + } + + public string Replace(string oldValue, string newValue) + { + if (oldValue == null) + throw new ArgumentNullException(nameof(oldValue)); + if (oldValue.Length == 0) + throw new ArgumentException(SR.Argument_StringZeroLength, nameof(oldValue)); + + // Api behavior: if newValue is null, instances of oldValue are to be removed. + if (newValue == null) + newValue = string.Empty; + + Span initialSpan = stackalloc int[StackallocIntBufferSizeLimit]; + var replacementIndices = new ValueListBuilder(initialSpan); + + unsafe + { + fixed (char* pThis = &_firstChar) + { + int matchIdx = 0; + int lastPossibleMatchIdx = this.Length - oldValue.Length; + while (matchIdx <= lastPossibleMatchIdx) + { + char* pMatch = pThis + matchIdx; + for (int probeIdx = 0; probeIdx < oldValue.Length; probeIdx++) + { + if (pMatch[probeIdx] != oldValue[probeIdx]) + { + goto Next; + } + } + // Found a match for the string. Record the location of the match and skip over the "oldValue." + replacementIndices.Append(matchIdx); + matchIdx += oldValue.Length; + continue; + + Next: + matchIdx++; + } + } + } + + if (replacementIndices.Length == 0) + return this; + + // String allocation and copying is in separate method to make this method faster for the case where + // nothing needs replacing. + string dst = ReplaceHelper(oldValue.Length, newValue, replacementIndices.AsSpan()); + + replacementIndices.Dispose(); + + return dst; + } + + private string ReplaceHelper(int oldValueLength, string newValue, ReadOnlySpan indices) + { + Debug.Assert(indices.Length > 0); + + long dstLength = this.Length + ((long)(newValue.Length - oldValueLength)) * indices.Length; + if (dstLength > int.MaxValue) + throw new OutOfMemoryException(); + string dst = FastAllocateString((int)dstLength); + + Span dstSpan = new Span(ref dst.GetRawStringData(), dst.Length); + + int thisIdx = 0; + int dstIdx = 0; + + for (int r = 0; r < indices.Length; r++) + { + int replacementIdx = indices[r]; + + // Copy over the non-matching portion of the original that precedes this occurrence of oldValue. + int count = replacementIdx - thisIdx; + if (count != 0) + { + this.AsSpan(thisIdx, count).CopyTo(dstSpan.Slice(dstIdx)); + dstIdx += count; + } + thisIdx = replacementIdx + oldValueLength; + + // Copy over newValue to replace the oldValue. + newValue.AsSpan().CopyTo(dstSpan.Slice(dstIdx)); + dstIdx += newValue.Length; + } + + // Copy over the final non-matching portion at the end of the string. + Debug.Assert(this.Length - thisIdx == dstSpan.Length - dstIdx); + this.AsSpan(thisIdx).CopyTo(dstSpan.Slice(dstIdx)); + + return dst; + } + + public string[] Split(char separator, StringSplitOptions options = StringSplitOptions.None) + { + return SplitInternal(new ReadOnlySpan(ref separator, 1), int.MaxValue, options); + } + + public string[] Split(char separator, int count, StringSplitOptions options = StringSplitOptions.None) + { + return SplitInternal(new ReadOnlySpan(ref separator, 1), count, options); + } + + // Creates an array of strings by splitting this string at each + // occurrence of a separator. The separator is searched for, and if found, + // the substring preceding the occurrence is stored as the first element in + // the array of strings. We then continue in this manner by searching + // the substring that follows the occurrence. On the other hand, if the separator + // is not found, the array of strings will contain this instance as its only element. + // If the separator is null + // whitespace (i.e., Character.IsWhitespace) is used as the separator. + // + public string[] Split(params char[] separator) + { + return SplitInternal(separator, int.MaxValue, StringSplitOptions.None); + } + + // Creates an array of strings by splitting this string at each + // occurrence of a separator. The separator is searched for, and if found, + // the substring preceding the occurrence is stored as the first element in + // the array of strings. We then continue in this manner by searching + // the substring that follows the occurrence. On the other hand, if the separator + // is not found, the array of strings will contain this instance as its only element. + // If the separator is the empty string (i.e., string.Empty), then + // whitespace (i.e., Character.IsWhitespace) is used as the separator. + // If there are more than count different strings, the last n-(count-1) + // elements are concatenated and added as the last string. + // + public string[] Split(char[] separator, int count) + { + return SplitInternal(separator, count, StringSplitOptions.None); + } + + public string[] Split(char[] separator, StringSplitOptions options) + { + return SplitInternal(separator, int.MaxValue, options); + } + + public string[] Split(char[] separator, int count, StringSplitOptions options) + { + return SplitInternal(separator, count, options); + } + + private string[] SplitInternal(ReadOnlySpan separators, int count, StringSplitOptions options) + { + if (count < 0) + throw new ArgumentOutOfRangeException(nameof(count), + SR.ArgumentOutOfRange_NegativeCount); + + if (options < StringSplitOptions.None || options > StringSplitOptions.RemoveEmptyEntries) + throw new ArgumentException(SR.Format(SR.Arg_EnumIllegalVal, options)); + + bool omitEmptyEntries = (options == StringSplitOptions.RemoveEmptyEntries); + + if ((count == 0) || (omitEmptyEntries && Length == 0)) + { + return Array.Empty(); + } + + if (count == 1) + { + return new string[] { this }; + } + + Span initialSpan = stackalloc int[StackallocIntBufferSizeLimit]; + var sepListBuilder = new ValueListBuilder(initialSpan); + + MakeSeparatorList(separators, ref sepListBuilder); + ReadOnlySpan sepList = sepListBuilder.AsSpan(); + + // Handle the special case of no replaces. + if (sepList.Length == 0) + { + return new string[] { this }; + } + + string[] result = omitEmptyEntries + ? SplitOmitEmptyEntries(sepList, default, 1, count) + : SplitKeepEmptyEntries(sepList, default, 1, count); + + sepListBuilder.Dispose(); + + return result; + } + + public string[] Split(string separator, StringSplitOptions options = StringSplitOptions.None) + { + return SplitInternal(separator ?? string.Empty, null, int.MaxValue, options); + } + + public string[] Split(string separator, Int32 count, StringSplitOptions options = StringSplitOptions.None) + { + return SplitInternal(separator ?? string.Empty, null, count, options); + } + + public string[] Split(string[] separator, StringSplitOptions options) + { + return SplitInternal(null, separator, int.MaxValue, options); + } + + public string[] Split(string[] separator, Int32 count, StringSplitOptions options) + { + return SplitInternal(null, separator, count, options); + } + + private string[] SplitInternal(string separator, string[] separators, int count, StringSplitOptions options) + { + if (count < 0) + { + throw new ArgumentOutOfRangeException(nameof(count), + SR.ArgumentOutOfRange_NegativeCount); + } + + if (options < StringSplitOptions.None || options > StringSplitOptions.RemoveEmptyEntries) + { + throw new ArgumentException(SR.Format(SR.Arg_EnumIllegalVal, (int)options)); + } + + bool omitEmptyEntries = (options == StringSplitOptions.RemoveEmptyEntries); + + bool singleSeparator = separator != null; + + if (!singleSeparator && (separators == null || separators.Length == 0)) + { + return SplitInternal((char[])null, count, options); + } + + if ((count == 0) || (omitEmptyEntries && Length == 0)) + { + return Array.Empty(); + } + + if (count == 1 || (singleSeparator && separator.Length == 0)) + { + return new string[] { this }; + } + + if (singleSeparator) + { + return SplitInternal(separator, count, options); + } + + Span sepListInitialSpan = stackalloc int[StackallocIntBufferSizeLimit]; + var sepListBuilder = new ValueListBuilder(sepListInitialSpan); + + Span lengthListInitialSpan = stackalloc int[StackallocIntBufferSizeLimit]; + var lengthListBuilder = new ValueListBuilder(lengthListInitialSpan); + + MakeSeparatorList(separators, ref sepListBuilder, ref lengthListBuilder); + ReadOnlySpan sepList = sepListBuilder.AsSpan(); + ReadOnlySpan lengthList = lengthListBuilder.AsSpan(); + + // Handle the special case of no replaces. + if (sepList.Length == 0) + { + return new string[] { this }; + } + + string[] result = omitEmptyEntries + ? SplitOmitEmptyEntries(sepList, lengthList, 0, count) + : SplitKeepEmptyEntries(sepList, lengthList, 0, count); + + sepListBuilder.Dispose(); + lengthListBuilder.Dispose(); + + return result; + } + + private string[] SplitInternal(string separator, int count, StringSplitOptions options) + { + Span sepListInitialSpan = stackalloc int[StackallocIntBufferSizeLimit]; + var sepListBuilder = new ValueListBuilder(sepListInitialSpan); + + MakeSeparatorList(separator, ref sepListBuilder); + ReadOnlySpan sepList = sepListBuilder.AsSpan(); + if (sepList.Length == 0) + { + // there are no separators so sepListBuilder did not rent an array from pool and there is no need to dispose it + return new string[] { this }; + } + + string[] result = options == StringSplitOptions.RemoveEmptyEntries + ? SplitOmitEmptyEntries(sepList, default, separator.Length, count) + : SplitKeepEmptyEntries(sepList, default, separator.Length, count); + + sepListBuilder.Dispose(); + + return result; + } + + private string[] SplitKeepEmptyEntries(ReadOnlySpan sepList, ReadOnlySpan lengthList, int defaultLength, int count) + { + Debug.Assert(count >= 2); + + int currIndex = 0; + int arrIndex = 0; + + count--; + int numActualReplaces = (sepList.Length < count) ? sepList.Length : count; + + //Allocate space for the new array. + //+1 for the string from the end of the last replace to the end of the string. + string[] splitStrings = new string[numActualReplaces + 1]; + + for (int i = 0; i < numActualReplaces && currIndex < Length; i++) + { + splitStrings[arrIndex++] = Substring(currIndex, sepList[i] - currIndex); + currIndex = sepList[i] + (lengthList.IsEmpty ? defaultLength : lengthList[i]); + } + + //Handle the last string at the end of the array if there is one. + if (currIndex < Length && numActualReplaces >= 0) + { + splitStrings[arrIndex] = Substring(currIndex); + } + else if (arrIndex == numActualReplaces) + { + //We had a separator character at the end of a string. Rather than just allowing + //a null character, we'll replace the last element in the array with an empty string. + splitStrings[arrIndex] = string.Empty; + } + + return splitStrings; + } + + + // This function will not keep the Empty string + private string[] SplitOmitEmptyEntries(ReadOnlySpan sepList, ReadOnlySpan lengthList, int defaultLength, int count) + { + Debug.Assert(count >= 2); + + int numReplaces = sepList.Length; + + // Allocate array to hold items. This array may not be + // filled completely in this function, we will create a + // new array and copy string references to that new array. + int maxItems = (numReplaces < count) ? (numReplaces + 1) : count; + string[] splitStrings = new string[maxItems]; + + int currIndex = 0; + int arrIndex = 0; + + for (int i = 0; i < numReplaces && currIndex < Length; i++) + { + if (sepList[i] - currIndex > 0) + { + splitStrings[arrIndex++] = Substring(currIndex, sepList[i] - currIndex); + } + currIndex = sepList[i] + (lengthList.IsEmpty ? defaultLength : lengthList[i]); + if (arrIndex == count - 1) + { + // If all the remaining entries at the end are empty, skip them + while (i < numReplaces - 1 && currIndex == sepList[++i]) + { + currIndex += (lengthList.IsEmpty ? defaultLength : lengthList[i]); + } + break; + } + } + + // we must have at least one slot left to fill in the last string. + Debug.Assert(arrIndex < maxItems); + + //Handle the last string at the end of the array if there is one. + if (currIndex < Length) + { + splitStrings[arrIndex++] = Substring(currIndex); + } + + string[] stringArray = splitStrings; + if (arrIndex != maxItems) + { + stringArray = new string[arrIndex]; + for (int j = 0; j < arrIndex; j++) + { + stringArray[j] = splitStrings[j]; + } + } + return stringArray; + } + + /// + /// Uses ValueListBuilder to create list that holds indexes of separators in string. + /// + /// of separator chars + /// to store indexes + /// + private void MakeSeparatorList(ReadOnlySpan separators, ref ValueListBuilder sepListBuilder) + { + char sep0, sep1, sep2; + + switch (separators.Length) + { + // Special-case no separators to mean any whitespace is a separator. + case 0: + for (int i = 0; i < Length; i++) + { + if (char.IsWhiteSpace(this[i])) + { + sepListBuilder.Append(i); + } + } + break; + + // Special-case the common cases of 1, 2, and 3 separators, with manual comparisons against each separator. + case 1: + sep0 = separators[0]; + for (int i = 0; i < Length; i++) + { + if (this[i] == sep0) + { + sepListBuilder.Append(i); + } + } + break; + case 2: + sep0 = separators[0]; + sep1 = separators[1]; + for (int i = 0; i < Length; i++) + { + char c = this[i]; + if (c == sep0 || c == sep1) + { + sepListBuilder.Append(i); + } + } + break; + case 3: + sep0 = separators[0]; + sep1 = separators[1]; + sep2 = separators[2]; + for (int i = 0; i < Length; i++) + { + char c = this[i]; + if (c == sep0 || c == sep1 || c == sep2) + { + sepListBuilder.Append(i); + } + } + break; + + // Handle > 3 separators with a probabilistic map, ala IndexOfAny. + // This optimizes for chars being unlikely to match a separator. + default: + unsafe + { + ProbabilisticMap map = default; + uint* charMap = (uint*)↦ + InitializeProbabilisticMap(charMap, separators); + + for (int i = 0; i < Length; i++) + { + char c = this[i]; + if (IsCharBitSet(charMap, (byte)c) && IsCharBitSet(charMap, (byte)(c >> 8)) && + separators.Contains(c)) + { + sepListBuilder.Append(i); + } + } + } + break; + } + } + + /// + /// Uses ValueListBuilder to create list that holds indexes of separators in string. + /// + /// separator string + /// to store indexes + /// + private void MakeSeparatorList(string separator, ref ValueListBuilder sepListBuilder) + { + Debug.Assert(!IsNullOrEmpty(separator), "!string.IsNullOrEmpty(separator)"); + + int currentSepLength = separator.Length; + + for (int i = 0; i < Length; i++) + { + if (this[i] == separator[0] && currentSepLength <= Length - i) + { + if (currentSepLength == 1 + || this.AsSpan(i, currentSepLength).SequenceEqual(separator)) + { + sepListBuilder.Append(i); + i += currentSepLength - 1; + } + } + } + } + + /// + /// Uses ValueListBuilder to create list that holds indexes of separators in string and list that holds length of separator strings. + /// + /// separator strngs + /// for separator indexes + /// for separator length values + private void MakeSeparatorList(string[] separators, ref ValueListBuilder sepListBuilder, ref ValueListBuilder lengthListBuilder) + { + Debug.Assert(separators != null && separators.Length > 0, "separators != null && separators.Length > 0"); + + int sepCount = separators.Length; + + for (int i = 0; i < Length; i++) + { + for (int j = 0; j < separators.Length; j++) + { + string separator = separators[j]; + if (IsNullOrEmpty(separator)) + { + continue; + } + int currentSepLength = separator.Length; + if (this[i] == separator[0] && currentSepLength <= Length - i) + { + if (currentSepLength == 1 + || this.AsSpan(i, currentSepLength).SequenceEqual(separator)) + { + sepListBuilder.Append(i); + lengthListBuilder.Append(currentSepLength); + i += currentSepLength - 1; + break; + } + } + } + } + } + + // Returns a substring of this string. + // + public string Substring(int startIndex) => Substring(startIndex, Length - startIndex); + + public string Substring(int startIndex, int length) + { + if (startIndex < 0) + { + throw new ArgumentOutOfRangeException(nameof(startIndex), SR.ArgumentOutOfRange_StartIndex); + } + + if (startIndex > Length) + { + throw new ArgumentOutOfRangeException(nameof(startIndex), SR.ArgumentOutOfRange_StartIndexLargerThanLength); + } + + if (length < 0) + { + throw new ArgumentOutOfRangeException(nameof(length), SR.ArgumentOutOfRange_NegativeLength); + } + + if (startIndex > Length - length) + { + throw new ArgumentOutOfRangeException(nameof(length), SR.ArgumentOutOfRange_IndexLength); + } + + if (length == 0) + { + return string.Empty; + } + + if (startIndex == 0 && length == this.Length) + { + return this; + } + + return InternalSubString(startIndex, length); + } + + private unsafe string InternalSubString(int startIndex, int length) + { + Debug.Assert(startIndex >= 0 && startIndex <= this.Length, "StartIndex is out of range!"); + Debug.Assert(length >= 0 && startIndex <= this.Length - length, "length is out of range!"); + + string result = FastAllocateString(length); + + fixed (char* dest = &result._firstChar) + fixed (char* src = &_firstChar) + { + wstrcpy(dest, src + startIndex, length); + } + + return result; + } + + // Creates a copy of this string in lower case. The culture is set by culture. + public string ToLower() + { + return CultureInfo.CurrentCulture.TextInfo.ToLower(this); + } + + // Creates a copy of this string in lower case. The culture is set by culture. + public string ToLower(CultureInfo culture) + { + if (culture == null) + { + throw new ArgumentNullException(nameof(culture)); + } + return culture.TextInfo.ToLower(this); + } + + // Creates a copy of this string in lower case based on invariant culture. + public string ToLowerInvariant() + { + return CultureInfo.InvariantCulture.TextInfo.ToLower(this); + } + + public string ToUpper() + { + return CultureInfo.CurrentCulture.TextInfo.ToUpper(this); + } + + // Creates a copy of this string in upper case. The culture is set by culture. + public string ToUpper(CultureInfo culture) + { + if (culture == null) + { + throw new ArgumentNullException(nameof(culture)); + } + return culture.TextInfo.ToUpper(this); + } + + //Creates a copy of this string in upper case based on invariant culture. + public string ToUpperInvariant() + { + return CultureInfo.InvariantCulture.TextInfo.ToUpper(this); + } + + // Trims the whitespace from both ends of the string. Whitespace is defined by + // Char.IsWhiteSpace. + // + public string Trim() => TrimWhiteSpaceHelper(TrimType.Both); + + // Removes a set of characters from the beginning and end of this string. + public unsafe string Trim(char trimChar) => TrimHelper(&trimChar, 1, TrimType.Both); + + // Removes a set of characters from the beginning and end of this string. + public unsafe string Trim(params char[] trimChars) + { + if (trimChars == null || trimChars.Length == 0) + { + return TrimWhiteSpaceHelper(TrimType.Both); + } + fixed (char* pTrimChars = &trimChars[0]) + { + return TrimHelper(pTrimChars, trimChars.Length, TrimType.Both); + } + } + + // Removes a set of characters from the beginning of this string. + public string TrimStart() => TrimWhiteSpaceHelper(TrimType.Head); + + // Removes a set of characters from the beginning of this string. + public unsafe string TrimStart(char trimChar) => TrimHelper(&trimChar, 1, TrimType.Head); + + // Removes a set of characters from the beginning of this string. + public unsafe string TrimStart(params char[] trimChars) + { + if (trimChars == null || trimChars.Length == 0) + { + return TrimWhiteSpaceHelper(TrimType.Head); + } + fixed (char* pTrimChars = &trimChars[0]) + { + return TrimHelper(pTrimChars, trimChars.Length, TrimType.Head); + } + } + + // Removes a set of characters from the end of this string. + public string TrimEnd() => TrimWhiteSpaceHelper(TrimType.Tail); + + // Removes a set of characters from the end of this string. + public unsafe string TrimEnd(char trimChar) => TrimHelper(&trimChar, 1, TrimType.Tail); + + // Removes a set of characters from the end of this string. + public unsafe string TrimEnd(params char[] trimChars) + { + if (trimChars == null || trimChars.Length == 0) + { + return TrimWhiteSpaceHelper(TrimType.Tail); + } + fixed (char* pTrimChars = &trimChars[0]) + { + return TrimHelper(pTrimChars, trimChars.Length, TrimType.Tail); + } + } + + private string TrimWhiteSpaceHelper(TrimType trimType) + { + // end will point to the first non-trimmed character on the right. + // start will point to the first non-trimmed character on the left. + int end = Length - 1; + int start = 0; + + // Trim specified characters. + if (trimType != TrimType.Tail) + { + for (start = 0; start < Length; start++) + { + if (!char.IsWhiteSpace(this[start])) + { + break; + } + } + } + + if (trimType != TrimType.Head) + { + for (end = Length - 1; end >= start; end--) + { + if (!char.IsWhiteSpace(this[end])) + { + break; + } + } + } + + return CreateTrimmedString(start, end); + } + + private unsafe string TrimHelper(char* trimChars, int trimCharsLength, TrimType trimType) + { + Debug.Assert(trimChars != null); + Debug.Assert(trimCharsLength > 0); + + // end will point to the first non-trimmed character on the right. + // start will point to the first non-trimmed character on the left. + int end = Length - 1; + int start = 0; + + // Trim specified characters. + if (trimType != TrimType.Tail) + { + for (start = 0; start < Length; start++) + { + int i = 0; + char ch = this[start]; + for (i = 0; i < trimCharsLength; i++) + { + if (trimChars[i] == ch) + { + break; + } + } + if (i == trimCharsLength) + { + // The character is not in trimChars, so stop trimming. + break; + } + } + } + + if (trimType != TrimType.Head) + { + for (end = Length - 1; end >= start; end--) + { + int i = 0; + char ch = this[end]; + for (i = 0; i < trimCharsLength; i++) + { + if (trimChars[i] == ch) + { + break; + } + } + if (i == trimCharsLength) + { + // The character is not in trimChars, so stop trimming. + break; + } + } + } + + return CreateTrimmedString(start, end); + } + + private string CreateTrimmedString(int start, int end) + { + int len = end - start + 1; + return + len == Length ? this : + len == 0 ? string.Empty : + InternalSubString(start, len); + } + + private enum TrimType + { + Head = 0, + Tail = 1, + Both = 2 + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/String.Searching.cs b/external/corefx/src/Common/src/CoreLib/System/String.Searching.cs index b0ba92b6e5..cab9faa24c 100644 --- a/external/corefx/src/Common/src/CoreLib/System/String.Searching.cs +++ b/external/corefx/src/Common/src/CoreLib/System/String.Searching.cs @@ -3,7 +3,10 @@ // See the LICENSE file in the project root for more information. using System.Globalization; +using System.Numerics; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using Internal.Runtime.CompilerServices; namespace System { @@ -32,10 +35,7 @@ namespace System // Returns the index of the first occurrence of a specified character in the current instance. // The search starts at startIndex and runs thorough the next count characters. // - public int IndexOf(char value) - { - return IndexOf(value, 0, this.Length); - } + public int IndexOf(char value) => SpanHelpers.IndexOf(ref _firstChar, value, Length); public int IndexOf(char value, int startIndex) { @@ -63,52 +63,23 @@ namespace System case StringComparison.OrdinalIgnoreCase: return CompareInfo.Invariant.IndexOf(this, value, CompareOptions.OrdinalIgnoreCase); - + default: throw new ArgumentException(SR.NotSupported_StringComparison, nameof(comparisonType)); } } - + public unsafe int IndexOf(char value, int startIndex, int count) { - if (startIndex < 0 || startIndex > Length) + if ((uint)startIndex > (uint)Length) throw new ArgumentOutOfRangeException(nameof(startIndex), SR.ArgumentOutOfRange_Index); - if (count < 0 || count > Length - startIndex) + if ((uint)count > (uint)(Length - startIndex)) throw new ArgumentOutOfRangeException(nameof(count), SR.ArgumentOutOfRange_Count); - fixed (char* pChars = &_firstChar) - { - char* pCh = pChars + startIndex; + int result = SpanHelpers.IndexOf(ref Unsafe.Add(ref _firstChar, startIndex), value, count); - while (count >= 4) - { - if (*pCh == value) goto ReturnIndex; - if (*(pCh + 1) == value) goto ReturnIndex1; - if (*(pCh + 2) == value) goto ReturnIndex2; - if (*(pCh + 3) == value) goto ReturnIndex3; - - count -= 4; - pCh += 4; - } - - while (count > 0) - { - if (*pCh == value) - goto ReturnIndex; - - count--; - pCh++; - } - - return -1; - - ReturnIndex3: pCh++; - ReturnIndex2: pCh++; - ReturnIndex1: pCh++; - ReturnIndex: - return (int)(pCh - pChars); - } + return result == -1 ? result : result + startIndex; } // Returns the index of the first occurrence of any specified character in the current instance. @@ -295,27 +266,27 @@ namespace System return false; } - private unsafe static bool IsCharBitSet(uint* charMap, byte value) + private static unsafe bool IsCharBitSet(uint* charMap, byte value) { return (charMap[value & PROBABILISTICMAP_BLOCK_INDEX_MASK] & (1u << (value >> PROBABILISTICMAP_BLOCK_INDEX_SHIFT))) != 0; } - private unsafe static void SetCharBit(uint* charMap, byte value) + private static unsafe void SetCharBit(uint* charMap, byte value) { charMap[value & PROBABILISTICMAP_BLOCK_INDEX_MASK] |= 1u << (value >> PROBABILISTICMAP_BLOCK_INDEX_SHIFT); } - public int IndexOf(String value) + public int IndexOf(string value) { return IndexOf(value, StringComparison.CurrentCulture); } - public int IndexOf(String value, int startIndex) + public int IndexOf(string value, int startIndex) { return IndexOf(value, startIndex, StringComparison.CurrentCulture); } - public int IndexOf(String value, int startIndex, int count) + public int IndexOf(string value, int startIndex, int count) { if (startIndex < 0 || startIndex > this.Length) { @@ -330,17 +301,17 @@ namespace System return IndexOf(value, startIndex, count, StringComparison.CurrentCulture); } - public int IndexOf(String value, StringComparison comparisonType) + public int IndexOf(string value, StringComparison comparisonType) { return IndexOf(value, 0, this.Length, comparisonType); } - public int IndexOf(String value, int startIndex, StringComparison comparisonType) + public int IndexOf(string value, int startIndex, StringComparison comparisonType) { return IndexOf(value, startIndex, this.Length - startIndex, comparisonType); } - public int IndexOf(String value, int startIndex, int count, StringComparison comparisonType) + public int IndexOf(string value, int startIndex, int count, StringComparison comparisonType) { // Validate inputs if (value == null) @@ -382,10 +353,7 @@ namespace System // The character at position startIndex is included in the search. startIndex is the larger // index within the string. // - public int LastIndexOf(char value) - { - return LastIndexOf(value, this.Length - 1, this.Length); - } + public int LastIndexOf(char value) => SpanHelpers.LastIndexOf(ref _firstChar, value, Length); public int LastIndexOf(char value, int startIndex) { @@ -397,45 +365,16 @@ namespace System if (Length == 0) return -1; - if (startIndex < 0 || startIndex >= Length) + if ((uint)startIndex >= (uint)Length) throw new ArgumentOutOfRangeException(nameof(startIndex), SR.ArgumentOutOfRange_Index); - if (count < 0 || count - 1 > startIndex) + if ((uint)count > (uint)startIndex + 1) throw new ArgumentOutOfRangeException(nameof(count), SR.ArgumentOutOfRange_Count); - fixed (char* pChars = &_firstChar) - { - char* pCh = pChars + startIndex; + int startSearchAt = startIndex + 1 - count; + int result = SpanHelpers.LastIndexOf(ref Unsafe.Add(ref _firstChar, startSearchAt), value, count); - //We search [startIndex..EndIndex] - while (count >= 4) - { - if (*pCh == value) goto ReturnIndex; - if (*(pCh - 1) == value) goto ReturnIndex1; - if (*(pCh - 2) == value) goto ReturnIndex2; - if (*(pCh - 3) == value) goto ReturnIndex3; - - count -= 4; - pCh -= 4; - } - - while (count > 0) - { - if (*pCh == value) - goto ReturnIndex; - - count--; - pCh--; - } - - return -1; - - ReturnIndex3: pCh--; - ReturnIndex2: pCh--; - ReturnIndex1: pCh--; - ReturnIndex: - return (int)(pCh - pChars); - } + return result == -1 ? result : result + startSearchAt; } // Returns the index of the last occurrence of any specified character in the current instance. @@ -521,17 +460,17 @@ namespace System // The character at position startIndex is included in the search. startIndex is the larger // index within the string. // - public int LastIndexOf(String value) + public int LastIndexOf(string value) { return LastIndexOf(value, this.Length - 1, this.Length, StringComparison.CurrentCulture); } - public int LastIndexOf(String value, int startIndex) + public int LastIndexOf(string value, int startIndex) { return LastIndexOf(value, startIndex, startIndex + 1, StringComparison.CurrentCulture); } - public int LastIndexOf(String value, int startIndex, int count) + public int LastIndexOf(string value, int startIndex, int count) { if (count < 0) { @@ -541,17 +480,17 @@ namespace System return LastIndexOf(value, startIndex, count, StringComparison.CurrentCulture); } - public int LastIndexOf(String value, StringComparison comparisonType) + public int LastIndexOf(string value, StringComparison comparisonType) { return LastIndexOf(value, this.Length - 1, this.Length, comparisonType); } - public int LastIndexOf(String value, int startIndex, StringComparison comparisonType) + public int LastIndexOf(string value, int startIndex, StringComparison comparisonType) { return LastIndexOf(value, startIndex, startIndex + 1, comparisonType); } - public int LastIndexOf(String value, int startIndex, int count, StringComparison comparisonType) + public int LastIndexOf(string value, int startIndex, int count, StringComparison comparisonType) { if (value == null) throw new ArgumentNullException(nameof(value)); diff --git a/external/corefx/src/Common/src/CoreLib/System/String.cs b/external/corefx/src/Common/src/CoreLib/System/String.cs new file mode 100644 index 0000000000..2e305d3d89 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/String.cs @@ -0,0 +1,778 @@ +// 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; +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using System.Diagnostics.Private; +using System.Globalization; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Runtime.Versioning; +using System.Text; + +namespace System +{ + // The String class represents a static string of characters. Many of + // the String methods perform some type of transformation on the current + // instance and return the result as a new String. As with arrays, character + // positions (indices) are zero-based. + + [Serializable] +#if !MONO + [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif + public sealed partial class String : IComparable, IEnumerable, IEnumerable, IComparable, IEquatable, IConvertible, ICloneable + { + // String constructors + // These are special. The implementation methods for these have a different signature from the + // declared constructors. + + [MethodImplAttribute(MethodImplOptions.InternalCall)] + [PreserveDependency("System.String.CreateString(System.Char[])")] + public extern String(char[] value); + +#if PROJECTN + [DependencyReductionRoot] +#endif +#if !CORECLR + static +#endif + private string Ctor(char[] value) + { + if (value == null || value.Length == 0) + return Empty; + + string result = FastAllocateString(value.Length); + unsafe + { + fixed (char* dest = &result._firstChar, source = value) + wstrcpy(dest, source, value.Length); + } + return result; + } + + [MethodImplAttribute(MethodImplOptions.InternalCall)] + [PreserveDependency("System.String.CreateString(System.Char[], System.Int32, System.Int32)")] + public extern String(char[] value, int startIndex, int length); + +#if PROJECTN + [DependencyReductionRoot] +#endif +#if !CORECLR + static +#endif + private string Ctor(char[] value, int startIndex, int length) + { + if (value == null) + throw new ArgumentNullException(nameof(value)); + + if (startIndex < 0) + throw new ArgumentOutOfRangeException(nameof(startIndex), SR.ArgumentOutOfRange_StartIndex); + + if (length < 0) + throw new ArgumentOutOfRangeException(nameof(length), SR.ArgumentOutOfRange_NegativeLength); + + if (startIndex > value.Length - length) + throw new ArgumentOutOfRangeException(nameof(startIndex), SR.ArgumentOutOfRange_Index); + + if (length == 0) + return Empty; + + string result = FastAllocateString(length); + unsafe + { + fixed (char* dest = &result._firstChar, source = value) + wstrcpy(dest, source + startIndex, length); + } + return result; + } + + [CLSCompliant(false)] + [MethodImplAttribute(MethodImplOptions.InternalCall)] + [PreserveDependency("System.String.CreateString(System.Char*)")] + public extern unsafe String(char* value); + +#if PROJECTN + [DependencyReductionRoot] +#endif +#if !CORECLR + static +#endif + private unsafe string Ctor(char* ptr) + { + if (ptr == null) + return Empty; + + int count = wcslen(ptr); + if (count == 0) + return Empty; + + string result = FastAllocateString(count); + fixed (char* dest = &result._firstChar) + wstrcpy(dest, ptr, count); + return result; + } + + [CLSCompliant(false)] + [MethodImplAttribute(MethodImplOptions.InternalCall)] + [PreserveDependency("System.String.CreateString(System.Char*, System.Int32, System.Int32)")] + public extern unsafe String(char* value, int startIndex, int length); + +#if PROJECTN + [DependencyReductionRoot] +#endif +#if !CORECLR + static +#endif + private unsafe string Ctor(char* ptr, int startIndex, int length) + { + if (length < 0) + throw new ArgumentOutOfRangeException(nameof(length), SR.ArgumentOutOfRange_NegativeLength); + + if (startIndex < 0) + throw new ArgumentOutOfRangeException(nameof(startIndex), SR.ArgumentOutOfRange_StartIndex); + + char* pStart = ptr + startIndex; + + // overflow check + if (pStart < ptr) + throw new ArgumentOutOfRangeException(nameof(startIndex), SR.ArgumentOutOfRange_PartialWCHAR); + + if (length == 0) + return Empty; + + if (ptr == null) + throw new ArgumentOutOfRangeException(nameof(ptr), SR.ArgumentOutOfRange_PartialWCHAR); + + string result = FastAllocateString(length); + fixed (char* dest = &result._firstChar) + wstrcpy(dest, pStart, length); + return result; + } + + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.InternalCall)] + [PreserveDependency("System.String.CreateString(System.SByte*)")] + public extern unsafe String(sbyte* value); + +#if PROJECTN + [DependencyReductionRoot] +#endif +#if !CORECLR + static +#endif + private unsafe string Ctor(sbyte* value) + { + byte* pb = (byte*)value; + if (pb == null) + return Empty; + + int numBytes = new ReadOnlySpan((byte*)value, int.MaxValue).IndexOf(0); + + // Check for overflow + if (numBytes < 0) + throw new ArgumentException(SR.Arg_MustBeNullTerminatedString); + + return CreateStringForSByteConstructor(pb, numBytes); + } + + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.InternalCall)] + [PreserveDependency("System.String.CreateString(System.SByte*, System.Int32, System.Int32)")] + public extern unsafe String(sbyte* value, int startIndex, int length); + +#if PROJECTN + [DependencyReductionRoot] +#endif +#if !CORECLR + static +#endif + private unsafe string Ctor(sbyte* value, int startIndex, int length) + { + if (startIndex < 0) + throw new ArgumentOutOfRangeException(nameof(startIndex), SR.ArgumentOutOfRange_StartIndex); + + if (length < 0) + throw new ArgumentOutOfRangeException(nameof(length), SR.ArgumentOutOfRange_NegativeLength); + + if (value == null) + { + if (length == 0) + return Empty; + + throw new ArgumentNullException(nameof(value)); + } + + byte* pStart = (byte*)(value + startIndex); + + // overflow check + if (pStart < value) + throw new ArgumentOutOfRangeException(nameof(value), SR.ArgumentOutOfRange_PartialWCHAR); + + return CreateStringForSByteConstructor(pStart, length); + } + + // Encoder for String..ctor(sbyte*) and String..ctor(sbyte*, int, int) + private static unsafe string CreateStringForSByteConstructor(byte *pb, int numBytes) + { + Debug.Assert(numBytes >= 0); + Debug.Assert(pb <= (pb + numBytes)); + + if (numBytes == 0) + return Empty; + +#if PLATFORM_WINDOWS + int numCharsRequired = Interop.Kernel32.MultiByteToWideChar(Interop.Kernel32.CP_ACP, Interop.Kernel32.MB_PRECOMPOSED, pb, numBytes, (char*)null, 0); + if (numCharsRequired == 0) + throw new ArgumentException(SR.Arg_InvalidANSIString); + + string newString = FastAllocateString(numCharsRequired); + fixed (char *pFirstChar = &newString._firstChar) + { + numCharsRequired = Interop.Kernel32.MultiByteToWideChar(Interop.Kernel32.CP_ACP, Interop.Kernel32.MB_PRECOMPOSED, pb, numBytes, pFirstChar, numCharsRequired); + } + if (numCharsRequired == 0) + throw new ArgumentException(SR.Arg_InvalidANSIString); + return newString; +#else + return Encoding.UTF8.GetString(pb, numBytes); +#endif + } + + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.InternalCall)] + [PreserveDependency("System.String.CreateString(System.SByte*, System.Int32, System.Int32, System.Text.Encoding)")] + public extern unsafe String(sbyte* value, int startIndex, int length, Encoding enc); + +#if PROJECTN + [DependencyReductionRoot] +#endif +#if !CORECLR + static +#endif + private unsafe string Ctor(sbyte* value, int startIndex, int length, Encoding enc) + { + if (enc == null) + return new string(value, startIndex, length); + + if (length < 0) + throw new ArgumentOutOfRangeException(nameof(length), SR.ArgumentOutOfRange_NeedNonNegNum); + + if (startIndex < 0) + throw new ArgumentOutOfRangeException(nameof(startIndex), SR.ArgumentOutOfRange_StartIndex); + + if (value == null) + { + if (length == 0) + return Empty; + + throw new ArgumentNullException(nameof(value)); + } + + byte* pStart = (byte*)(value + startIndex); + + // overflow check + if (pStart < value) + throw new ArgumentOutOfRangeException(nameof(startIndex), SR.ArgumentOutOfRange_PartialWCHAR); + + return enc.GetString(new ReadOnlySpan(pStart, length)); + } + + [MethodImplAttribute(MethodImplOptions.InternalCall)] + [PreserveDependency("System.String.CreateString(System.Char, System.Int32)")] + public extern String(char c, int count); + +#if PROJECTN + [DependencyReductionRoot] +#endif +#if !CORECLR + static +#endif + private string Ctor(char c, int count) + { + if (count <= 0) + { + if (count == 0) + return Empty; + throw new ArgumentOutOfRangeException(nameof(count), SR.ArgumentOutOfRange_NegativeCount); + } + + string result = FastAllocateString(count); + + if (c != '\0') // Fast path null char string + { + unsafe + { + fixed (char* dest = &result._firstChar) + { + uint cc = (uint)((c << 16) | c); + uint* dmem = (uint*)dest; + if (count >= 4) + { + count -= 4; + do + { + dmem[0] = cc; + dmem[1] = cc; + dmem += 2; + count -= 4; + } while (count >= 0); + } + if ((count & 2) != 0) + { + *dmem = cc; + dmem++; + } + if ((count & 1) != 0) + ((char*)dmem)[0] = c; + } + } + } + return result; + } + + [MethodImplAttribute(MethodImplOptions.InternalCall)] + [PreserveDependency("System.String.CreateString(System.ReadOnlySpan`1)")] + public extern String(ReadOnlySpan value); + +#if PROJECTN + [DependencyReductionRoot] +#endif +#if !CORECLR + static +#endif + private unsafe string Ctor(ReadOnlySpan value) + { + if (value.Length == 0) + return Empty; + + string result = FastAllocateString(value.Length); + fixed (char* dest = &result._firstChar, src = &MemoryMarshal.GetReference(value)) + wstrcpy(dest, src, value.Length); + return result; + } + + public static string Create(int length, TState state, SpanAction action) + { + if (action == null) + throw new ArgumentNullException(nameof(action)); + + if (length <= 0) + { + if (length == 0) + return Empty; + throw new ArgumentOutOfRangeException(nameof(length)); + } + + string result = FastAllocateString(length); + action(new Span(ref result.GetRawStringData(), length), state); + return result; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static implicit operator ReadOnlySpan(string value) => + value != null ? new ReadOnlySpan(ref value.GetRawStringData(), value.Length) : default; + + public object Clone() + { + return this; + } + + public static unsafe string Copy(string str) + { + if (str == null) + throw new ArgumentNullException(nameof(str)); + + string result = FastAllocateString(str.Length); + fixed (char* dest = &result._firstChar, src = &str._firstChar) + wstrcpy(dest, src, str.Length); + return result; + } + + // Converts a substring of this string to an array of characters. Copies the + // characters of this string beginning at position sourceIndex and ending at + // sourceIndex + count - 1 to the character array buffer, beginning + // at destinationIndex. + // + public unsafe void CopyTo(int sourceIndex, char[] destination, int destinationIndex, int count) + { + if (destination == null) + throw new ArgumentNullException(nameof(destination)); + if (count < 0) + throw new ArgumentOutOfRangeException(nameof(count), SR.ArgumentOutOfRange_NegativeCount); + if (sourceIndex < 0) + throw new ArgumentOutOfRangeException(nameof(sourceIndex), SR.ArgumentOutOfRange_Index); + if (count > Length - sourceIndex) + throw new ArgumentOutOfRangeException(nameof(sourceIndex), SR.ArgumentOutOfRange_IndexCount); + if (destinationIndex > destination.Length - count || destinationIndex < 0) + throw new ArgumentOutOfRangeException(nameof(destinationIndex), SR.ArgumentOutOfRange_IndexCount); + + fixed (char* src = &_firstChar, dest = destination) + wstrcpy(dest + destinationIndex, src + sourceIndex, count); + } + + // Returns the entire string as an array of characters. + public unsafe char[] ToCharArray() + { + if (Length == 0) + return Array.Empty(); + + char[] chars = new char[Length]; + fixed (char* src = &_firstChar, dest = &chars[0]) + wstrcpy(dest, src, Length); + return chars; + } + + // Returns a substring of this string as an array of characters. + // + public unsafe char[] ToCharArray(int startIndex, int length) + { + // Range check everything. + if (startIndex < 0 || startIndex > Length || startIndex > Length - length) + throw new ArgumentOutOfRangeException(nameof(startIndex), SR.ArgumentOutOfRange_Index); + + if (length <= 0) + { + if (length == 0) + return Array.Empty(); + throw new ArgumentOutOfRangeException(nameof(length), SR.ArgumentOutOfRange_Index); + } + + char[] chars = new char[length]; + fixed (char* src = &_firstChar, dest = &chars[0]) + wstrcpy(dest, src + startIndex, length); + return chars; + } + + [NonVersionable] + public static bool IsNullOrEmpty(string value) + { + // Using 0u >= (uint)value.Length rather than + // value.Length == 0 as it will elide the bounds check to + // the first char: value[0] if that is performed following the test + // for the same test cost. + // Ternary operator returning true/false prevents redundant asm generation: + // https://github.com/dotnet/coreclr/issues/914 + return (value == null || 0u >= (uint)value.Length) ? true : false; + } + + public static bool IsNullOrWhiteSpace(string value) + { + if (value == null) return true; + + for (int i = 0; i < value.Length; i++) + { + if (!Char.IsWhiteSpace(value[i])) return false; + } + + return true; + } + + internal ref char GetRawStringData() => ref _firstChar; + + // Helper for encodings so they can talk to our buffer directly + // stringLength must be the exact size we'll expect + internal static unsafe string CreateStringFromEncoding( + byte* bytes, int byteLength, Encoding encoding) + { + Debug.Assert(bytes != null); + Debug.Assert(byteLength >= 0); + + // Get our string length + int stringLength = encoding.GetCharCount(bytes, byteLength, null); + Debug.Assert(stringLength >= 0, "stringLength >= 0"); + + // They gave us an empty string if they needed one + // 0 bytelength might be possible if there's something in an encoder + if (stringLength == 0) + return Empty; + + string s = FastAllocateString(stringLength); + fixed (char* pTempChars = &s._firstChar) + { + int doubleCheck = encoding.GetChars(bytes, byteLength, pTempChars, stringLength, null); + Debug.Assert(stringLength == doubleCheck, + "Expected encoding.GetChars to return same length as encoding.GetCharCount"); + } + + return s; + } + + // This is only intended to be used by char.ToString. + // It is necessary to put the code in this class instead of Char, since _firstChar is a private member. + // Making _firstChar internal would be dangerous since it would make it much easier to break String's immutability. + internal static string CreateFromChar(char c) + { + string result = FastAllocateString(1); + result._firstChar = c; + return result; + } + + internal static unsafe void wstrcpy(char* dmem, char* smem, int charCount) + { + Buffer.Memmove((byte*)dmem, (byte*)smem, ((uint)charCount) * 2); + } + + + // Returns this string. + public override string ToString() + { + return this; + } + + // Returns this string. + public string ToString(IFormatProvider provider) + { + return this; + } + + public CharEnumerator GetEnumerator() + { + return new CharEnumerator(this); + } + + IEnumerator IEnumerable.GetEnumerator() + { + return new CharEnumerator(this); + } + + IEnumerator IEnumerable.GetEnumerator() + { + return new CharEnumerator(this); + } + + internal static unsafe int wcslen(char* ptr) + { + char* end = ptr; + + // First make sure our pointer is aligned on a word boundary + int alignment = IntPtr.Size - 1; + + // If ptr is at an odd address (e.g. 0x5), this loop will simply iterate all the way + while (((uint)end & (uint)alignment) != 0) + { + if (*end == 0) goto FoundZero; + end++; + } + +#if !BIT64 + // The following code is (somewhat surprisingly!) significantly faster than a naive loop, + // at least on x86 and the current jit. + + // The loop condition below works because if "end[0] & end[1]" is non-zero, that means + // neither operand can have been zero. If is zero, we have to look at the operands individually, + // but we hope this going to fairly rare. + + // In general, it would be incorrect to access end[1] if we haven't made sure + // end[0] is non-zero. However, we know the ptr has been aligned by the loop above + // so end[0] and end[1] must be in the same word (and therefore page), so they're either both accessible, or both not. + + while ((end[0] & end[1]) != 0 || (end[0] != 0 && end[1] != 0)) + { + end += 2; + } + + Debug.Assert(end[0] == 0 || end[1] == 0); + if (end[0] != 0) end++; +#else // !BIT64 + // Based on https://graphics.stanford.edu/~seander/bithacks.html#ZeroInWord + + // 64-bit implementation: process 1 ulong (word) at a time + + // What we do here is add 0x7fff from each of the + // 4 individual chars within the ulong, using MagicMask. + // If the char > 0 and < 0x8001, it will have its high bit set. + // We then OR with MagicMask, to set all the other bits. + // This will result in all bits set (ulong.MaxValue) for any + // char that fits the above criteria, and something else otherwise. + + // Note that for any char > 0x8000, this will be a false + // positive and we will fallback to the slow path and + // check each char individually. This is OK though, since + // we optimize for the common case (ASCII chars, which are < 0x80). + + // NOTE: We can access a ulong a time since the ptr is aligned, + // and therefore we're only accessing the same word/page. (See notes + // for the 32-bit version above.) + + const ulong MagicMask = 0x7fff7fff7fff7fff; + + while (true) + { + ulong word = *(ulong*)end; + word += MagicMask; // cause high bit to be set if not zero, and <= 0x8000 + word |= MagicMask; // set everything besides the high bits + + if (word == ulong.MaxValue) // 0xffff... + { + // all of the chars have their bits set (and therefore none can be 0) + end += 4; + continue; + } + + // at least one of them didn't have their high bit set! + // go through each char and check for 0. + + if (end[0] == 0) goto EndAt0; + if (end[1] == 0) goto EndAt1; + if (end[2] == 0) goto EndAt2; + if (end[3] == 0) goto EndAt3; + + // if we reached here, it was a false positive-- just continue + end += 4; + } + + EndAt3: end++; + EndAt2: end++; + EndAt1: end++; + EndAt0: +#endif // !BIT64 + + FoundZero: + Debug.Assert(*end == 0); + + int count = (int)(end - ptr); + +#if BIT64 + // Check for overflow + if (ptr + count != end) + throw new ArgumentException(SR.Arg_MustBeNullTerminatedString); +#else + Debug.Assert(ptr + count == end); +#endif + + return count; + } + + // + // IConvertible implementation + // + + public TypeCode GetTypeCode() + { + return TypeCode.String; + } + + bool IConvertible.ToBoolean(IFormatProvider provider) + { + return Convert.ToBoolean(this, provider); + } + + char IConvertible.ToChar(IFormatProvider provider) + { + return Convert.ToChar(this, provider); + } + + sbyte IConvertible.ToSByte(IFormatProvider provider) + { + return Convert.ToSByte(this, provider); + } + + byte IConvertible.ToByte(IFormatProvider provider) + { + return Convert.ToByte(this, provider); + } + + short IConvertible.ToInt16(IFormatProvider provider) + { + return Convert.ToInt16(this, provider); + } + + ushort IConvertible.ToUInt16(IFormatProvider provider) + { + return Convert.ToUInt16(this, provider); + } + + int IConvertible.ToInt32(IFormatProvider provider) + { + return Convert.ToInt32(this, provider); + } + + uint IConvertible.ToUInt32(IFormatProvider provider) + { + return Convert.ToUInt32(this, provider); + } + + long IConvertible.ToInt64(IFormatProvider provider) + { + return Convert.ToInt64(this, provider); + } + + ulong IConvertible.ToUInt64(IFormatProvider provider) + { + return Convert.ToUInt64(this, provider); + } + + float IConvertible.ToSingle(IFormatProvider provider) + { + return Convert.ToSingle(this, provider); + } + + double IConvertible.ToDouble(IFormatProvider provider) + { + return Convert.ToDouble(this, provider); + } + + Decimal IConvertible.ToDecimal(IFormatProvider provider) + { + return Convert.ToDecimal(this, provider); + } + + DateTime IConvertible.ToDateTime(IFormatProvider provider) + { + return Convert.ToDateTime(this, provider); + } + + Object IConvertible.ToType(Type type, IFormatProvider provider) + { + return Convert.DefaultToType((IConvertible)this, type, provider); + } + + // Normalization Methods + // These just wrap calls to Normalization class + public bool IsNormalized() + { + return IsNormalized(NormalizationForm.FormC); + } + + public bool IsNormalized(NormalizationForm normalizationForm) + { +#if CORECLR + if (this.IsFastSort()) + { + // If its FastSort && one of the 4 main forms, then its already normalized + if (normalizationForm == NormalizationForm.FormC || + normalizationForm == NormalizationForm.FormKC || + normalizationForm == NormalizationForm.FormD || + normalizationForm == NormalizationForm.FormKD) + return true; + } +#endif + return Normalization.IsNormalized(this, normalizationForm); + } + + public string Normalize() + { + return Normalize(NormalizationForm.FormC); + } + + public string Normalize(NormalizationForm normalizationForm) + { +#if CORECLR + if (this.IsAscii()) + { + // If its FastSort && one of the 4 main forms, then its already normalized + if (normalizationForm == NormalizationForm.FormC || + normalizationForm == NormalizationForm.FormKC || + normalizationForm == NormalizationForm.FormD || + normalizationForm == NormalizationForm.FormKD) + return this; + } +#endif + return Normalization.Normalize(this, normalizationForm); + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/StringComparer.cs b/external/corefx/src/Common/src/CoreLib/System/StringComparer.cs index 73c013599d..cb2d32fccb 100644 --- a/external/corefx/src/Common/src/CoreLib/System/StringComparer.cs +++ b/external/corefx/src/Common/src/CoreLib/System/StringComparer.cs @@ -13,8 +13,8 @@ namespace System [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] public abstract class StringComparer : IComparer, IEqualityComparer, IComparer, IEqualityComparer { - private static readonly CultureAwareComparer s_invariantCulture = new CultureAwareComparer(CultureInfo.InvariantCulture, false); - private static readonly CultureAwareComparer s_invariantCultureIgnoreCase = new CultureAwareComparer(CultureInfo.InvariantCulture, true); + private static readonly CultureAwareComparer s_invariantCulture = new CultureAwareComparer(CultureInfo.InvariantCulture, CompareOptions.None); + private static readonly CultureAwareComparer s_invariantCultureIgnoreCase = new CultureAwareComparer(CultureInfo.InvariantCulture, CompareOptions.IgnoreCase); private static readonly OrdinalCaseSensitiveComparer s_ordinal = new OrdinalCaseSensitiveComparer(); private static readonly OrdinalIgnoreCaseComparer s_ordinalIgnoreCase = new OrdinalIgnoreCaseComparer(); @@ -38,7 +38,7 @@ namespace System { get { - return new CultureAwareComparer(CultureInfo.CurrentCulture, false); + return new CultureAwareComparer(CultureInfo.CurrentCulture, CompareOptions.None); } } @@ -46,7 +46,7 @@ namespace System { get { - return new CultureAwareComparer(CultureInfo.CurrentCulture, true); + return new CultureAwareComparer(CultureInfo.CurrentCulture, CompareOptions.IgnoreCase); } } @@ -94,8 +94,18 @@ namespace System { throw new ArgumentNullException(nameof(culture)); } + + return new CultureAwareComparer(culture, ignoreCase ? CompareOptions.IgnoreCase : CompareOptions.None); + } - return new CultureAwareComparer(culture, ignoreCase); + public static StringComparer Create(CultureInfo culture, CompareOptions options) + { + if (culture == null) + { + throw new ArgumentException(nameof(culture)); + } + + return new CultureAwareComparer(culture, options); } public int Compare(object x, object y) @@ -123,7 +133,6 @@ namespace System throw new ArgumentException(SR.Argument_ImplementIComparable); } - public new bool Equals(Object x, Object y) { if (x == y) return true; @@ -163,32 +172,52 @@ namespace System [Serializable] [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] - public sealed class CultureAwareComparer : StringComparer + public sealed class CultureAwareComparer : StringComparer, ISerializable { - private readonly CompareInfo _compareInfo; // Do not rename (binary serialization) - private readonly bool _ignoreCase; // Do not rename (binary serialization) + private const CompareOptions ValidCompareMaskOffFlags = ~(CompareOptions.IgnoreCase | CompareOptions.IgnoreSymbols | CompareOptions.IgnoreNonSpace | CompareOptions.IgnoreWidth | CompareOptions.IgnoreKanaType | CompareOptions.StringSort); - internal CultureAwareComparer(CultureInfo culture, bool ignoreCase) + private readonly CompareInfo _compareInfo; // Do not rename (binary serialization) + private CompareOptions _options; + + internal CultureAwareComparer(CultureInfo culture, CompareOptions options) : this(culture.CompareInfo, options) { } + + internal CultureAwareComparer(CompareInfo compareInfo, CompareOptions options) { - _compareInfo = culture.CompareInfo; - _ignoreCase = ignoreCase; + _compareInfo = compareInfo; + + if ((options & ValidCompareMaskOffFlags) != 0) + { + throw new ArgumentException(SR.Argument_InvalidFlag, nameof(options)); + } + _options = options; } - private CompareOptions Options => _ignoreCase ? CompareOptions.IgnoreCase : CompareOptions.None; + private CultureAwareComparer(SerializationInfo info, StreamingContext context) + { + _compareInfo = (CompareInfo)info.GetValue("_compareInfo", typeof(CompareInfo)); + bool ignoreCase = info.GetBoolean("_ignoreCase"); + + var obj = info.GetValueNoThrow("_options", typeof(CompareOptions)); + if (obj != null) + _options = (CompareOptions)obj; + + // fix up the _options value in case we are getting old serialized object not having _options + _options |= ignoreCase ? CompareOptions.IgnoreCase : CompareOptions.None; + } public override int Compare(string x, string y) { if (object.ReferenceEquals(x, y)) return 0; if (x == null) return -1; if (y == null) return 1; - return _compareInfo.Compare(x, y, Options); + return _compareInfo.Compare(x, y, _options); } public override bool Equals(string x, string y) { if (object.ReferenceEquals(x, y)) return true; if (x == null || y == null) return false; - return _compareInfo.Compare(x, y, Options) == 0; + return _compareInfo.Compare(x, y, _options) == 0; } public override int GetHashCode(string obj) @@ -197,7 +226,7 @@ namespace System { throw new ArgumentNullException(nameof(obj)); } - return _compareInfo.GetHashCodeOfString(obj, Options); + return _compareInfo.GetHashCodeOfString(obj, _options); } // Equals method for the comparer itself. @@ -206,14 +235,20 @@ namespace System CultureAwareComparer comparer = obj as CultureAwareComparer; return comparer != null && - _ignoreCase == comparer._ignoreCase && + _options == comparer._options && _compareInfo.Equals(comparer._compareInfo); } public override int GetHashCode() { - int hashCode = _compareInfo.GetHashCode(); - return _ignoreCase ? ~hashCode : hashCode; + return _compareInfo.GetHashCode() ^ ((int)_options & 0x7FFFFFFF); + } + + public void GetObjectData(SerializationInfo info, StreamingContext context) + { + info.AddValue("_compareInfo", _compareInfo); + info.AddValue("_options", _options); + info.AddValue("_ignoreCase", (_options & CompareOptions.IgnoreCase) != 0); } } @@ -272,7 +307,7 @@ namespace System if (_ignoreCase) { - return TextInfo.GetHashCodeOrdinalIgnoreCase(obj); + return CompareInfo.GetIgnoreCaseHash(obj); } return obj.GetHashCode(); @@ -340,7 +375,7 @@ namespace System { ThrowHelper.ThrowArgumentNullException(ExceptionArgument.obj); } - return TextInfo.GetHashCodeOrdinalIgnoreCase(obj); + return CompareInfo.GetIgnoreCaseHash(obj); } public void GetObjectData(SerializationInfo info, StreamingContext context) diff --git a/external/corefx/src/Common/src/CoreLib/System/StringSpanHelpers.cs b/external/corefx/src/Common/src/CoreLib/System/StringSpanHelpers.cs deleted file mode 100644 index 1c127b19d0..0000000000 --- a/external/corefx/src/Common/src/CoreLib/System/StringSpanHelpers.cs +++ /dev/null @@ -1,129 +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.Globalization; - -namespace System -{ - /// Helpers for string-like operations on spans of chars. - internal static class StringSpanHelpers - { - // TODO https://github.com/dotnet/corefx/issues/21395: Provide public, efficient implementations - - public static bool Equals(this ReadOnlySpan left, ReadOnlySpan right, StringComparison comparisonType) => - comparisonType == StringComparison.Ordinal ? Equals(left, right) : - comparisonType == StringComparison.OrdinalIgnoreCase ? EqualsOrdinalIgnoreCase(left, right) : - throw new ArgumentOutOfRangeException(nameof(comparisonType)); - - public static bool Equals(this ReadOnlySpan left, string right) => - Equals(left, right.AsReadOnlySpan()); - - public static bool Equals(this ReadOnlySpan left, ReadOnlySpan right) - { - if (left.Length != right.Length) - { - return false; - } - - for (int i = 0; i < left.Length; i++) - { - if (left[i] != right[i]) - { - return false; - } - } - - return true; - } - - private static bool EqualsOrdinalIgnoreCase(this ReadOnlySpan left, ReadOnlySpan right) - { - if (left.Length != right.Length) - { - return false; - } - - for (int i = 0; i < left.Length; i++) - { - char x = left[i], y = right[i]; - if (x != y && - TextInfo.ToUpperAsciiInvariant(x) != TextInfo.ToUpperAsciiInvariant(y)) - { - return false; - } - } - - return true; - } - - public static ReadOnlySpan Trim(this ReadOnlySpan source) - { - int startIndex = 0, endIndex = source.Length - 1; - - while (startIndex <= endIndex && char.IsWhiteSpace(source[startIndex])) - { - startIndex++; - } - - while (endIndex >= startIndex && char.IsWhiteSpace(source[endIndex])) - { - endIndex--; - } - - return source.Slice(startIndex, endIndex - startIndex + 1); - } - - public static int IndexOf(this ReadOnlySpan source, char value) => - IndexOf(source, value, 0); - - public static int IndexOf(this ReadOnlySpan source, char value, int startIndex) - { - for (int i = startIndex; i < source.Length; i++) - { - if (source[i] == value) - { - return i; - } - } - - return -1; - } - - public static bool Contains(this ReadOnlySpan source, char value) - { - for (int i = 0; i < source.Length; i++) - { - if (source[i] == value) - { - return true; - } - } - - return false; - } - - public static ReadOnlySpan Remove(this ReadOnlySpan source, int startIndex, int count) - { - if (startIndex < 0) throw new ArgumentOutOfRangeException(nameof(startIndex), SR.ArgumentOutOfRange_StartIndex); - if (count < 0) throw new ArgumentOutOfRangeException(nameof(count), SR.ArgumentOutOfRange_NegativeCount); - if (count > source.Length - startIndex) throw new ArgumentOutOfRangeException(nameof(count), SR.ArgumentOutOfRange_IndexCount); - - if (count == 0) - { - return source; - } - - int newLength = source.Length - count; - if (newLength == 0) - { - return ReadOnlySpan.Empty; - } - - Span result = new char[newLength]; - source.Slice(0, startIndex).CopyTo(result); - source.Slice(startIndex + count).CopyTo(result.Slice(startIndex)); - return result; - } - } -} diff --git a/external/corefx/src/Common/src/CoreLib/System/SystemException.cs b/external/corefx/src/Common/src/CoreLib/System/SystemException.cs index b7e8e42175..590ea2f6de 100644 --- a/external/corefx/src/Common/src/CoreLib/System/SystemException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/SystemException.cs @@ -7,7 +7,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class SystemException : Exception { public SystemException() diff --git a/external/corefx/src/Common/src/CoreLib/System/Text/ASCIIEncoding.cs b/external/corefx/src/Common/src/CoreLib/System/Text/ASCIIEncoding.cs index 2c1b67563d..4196fbec0c 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Text/ASCIIEncoding.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Text/ASCIIEncoding.cs @@ -18,7 +18,9 @@ namespace System.Text // // Note: IsAlwaysNormalized remains false because 1/2 the code points are unassigned, so they'd // use fallbacks, and we cannot guarantee that fallbacks are normalized. - +#if MONO + [Serializable] +#endif public class ASCIIEncoding : Encoding { // Allow for devirtualization (see https://github.com/dotnet/coreclr/pull/9230) diff --git a/external/corefx/src/Common/src/CoreLib/System/Text/Decoder.cs b/external/corefx/src/Common/src/CoreLib/System/Text/Decoder.cs index 94d88b126f..3fbe780a81 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Text/Decoder.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Text/Decoder.cs @@ -21,6 +21,9 @@ namespace System.Text // class are typically obtained through calls to the GetDecoder method // of Encoding objects. // +#if MONO + [Serializable] +#endif public abstract class Decoder { internal DecoderFallback _fallback = null; @@ -135,7 +138,7 @@ namespace System.Text public virtual unsafe int GetCharCount(ReadOnlySpan bytes, bool flush) { - fixed (byte* bytesPtr = &MemoryMarshal.GetReference(bytes)) + fixed (byte* bytesPtr = &MemoryMarshal.GetNonNullPinnableReference(bytes)) { return GetCharCount(bytesPtr, bytes.Length, flush); } @@ -228,8 +231,8 @@ namespace System.Text public virtual unsafe int GetChars(ReadOnlySpan bytes, Span chars, bool flush) { - fixed (byte* bytesPtr = &MemoryMarshal.GetReference(bytes)) - fixed (char* charsPtr = &MemoryMarshal.GetReference(chars)) + fixed (byte* bytesPtr = &MemoryMarshal.GetNonNullPinnableReference(bytes)) + fixed (char* charsPtr = &MemoryMarshal.GetNonNullPinnableReference(chars)) { return GetChars(bytesPtr, bytes.Length, charsPtr, chars.Length, flush); } @@ -342,8 +345,8 @@ namespace System.Text public virtual unsafe void Convert(ReadOnlySpan bytes, Span chars, bool flush, out int bytesUsed, out int charsUsed, out bool completed) { - fixed (byte* bytesPtr = &MemoryMarshal.GetReference(bytes)) - fixed (char* charsPtr = &MemoryMarshal.GetReference(chars)) + fixed (byte* bytesPtr = &MemoryMarshal.GetNonNullPinnableReference(bytes)) + fixed (char* charsPtr = &MemoryMarshal.GetNonNullPinnableReference(chars)) { Convert(bytesPtr, bytes.Length, charsPtr, chars.Length, flush, out bytesUsed, out charsUsed, out completed); } diff --git a/external/corefx/src/Common/src/CoreLib/System/Text/DecoderExceptionFallback.cs b/external/corefx/src/Common/src/CoreLib/System/Text/DecoderExceptionFallback.cs index 8bfc1f32d3..2759982272 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Text/DecoderExceptionFallback.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Text/DecoderExceptionFallback.cs @@ -8,6 +8,9 @@ using System.Runtime.Serialization; namespace System.Text { +#if MONO + [Serializable] +#endif public sealed class DecoderExceptionFallback : DecoderFallback { // Construction @@ -100,7 +103,9 @@ namespace System.Text // Exception for decoding unknown byte sequences. [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public sealed class DecoderFallbackException : ArgumentException { private byte[] _bytesUnknown = null; diff --git a/external/corefx/src/Common/src/CoreLib/System/Text/DecoderFallback.cs b/external/corefx/src/Common/src/CoreLib/System/Text/DecoderFallback.cs index 21104805bf..4b004ff1d6 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Text/DecoderFallback.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Text/DecoderFallback.cs @@ -9,6 +9,9 @@ using System.Threading; namespace System.Text { +#if MONO + [System.Serializable] +#endif public abstract class DecoderFallback { private static DecoderFallback s_replacementFallback; // Default fallback, uses no best fit & "?" diff --git a/external/corefx/src/Common/src/CoreLib/System/Text/DecoderReplacementFallback.cs b/external/corefx/src/Common/src/CoreLib/System/Text/DecoderReplacementFallback.cs index df45706b25..0fed203999 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Text/DecoderReplacementFallback.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Text/DecoderReplacementFallback.cs @@ -7,6 +7,9 @@ using System.Diagnostics.Private; namespace System.Text { +#if MONO + [System.Serializable] +#endif public sealed class DecoderReplacementFallback : DecoderFallback { // Our variables diff --git a/external/corefx/src/Common/src/CoreLib/System/Text/Encoder.cs b/external/corefx/src/Common/src/CoreLib/System/Text/Encoder.cs index d3b96198c4..e3a26c7ccc 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Text/Encoder.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Text/Encoder.cs @@ -21,6 +21,9 @@ namespace System.Text // class are typically obtained through calls to the GetEncoder method // of Encoding objects. // +#if MONO + [Serializable] +#endif public abstract class Encoder { internal EncoderFallback _fallback = null; @@ -133,7 +136,7 @@ namespace System.Text public virtual unsafe int GetByteCount(ReadOnlySpan chars, bool flush) { - fixed (char* charsPtr = &MemoryMarshal.GetReference(chars)) + fixed (char* charsPtr = &MemoryMarshal.GetNonNullPinnableReference(chars)) { return GetByteCount(charsPtr, chars.Length, flush); } @@ -222,8 +225,8 @@ namespace System.Text public virtual unsafe int GetBytes(ReadOnlySpan chars, Span bytes, bool flush) { - fixed (char* charsPtr = &MemoryMarshal.GetReference(chars)) - fixed (byte* bytesPtr = &MemoryMarshal.GetReference(bytes)) + fixed (char* charsPtr = &MemoryMarshal.GetNonNullPinnableReference(chars)) + fixed (byte* bytesPtr = &MemoryMarshal.GetNonNullPinnableReference(bytes)) { return GetBytes(charsPtr, chars.Length, bytesPtr, bytes.Length, flush); } @@ -336,8 +339,8 @@ namespace System.Text public virtual unsafe void Convert(ReadOnlySpan chars, Span bytes, bool flush, out int charsUsed, out int bytesUsed, out bool completed) { - fixed (char* charsPtr = &MemoryMarshal.GetReference(chars)) - fixed (byte* bytesPtr = &MemoryMarshal.GetReference(bytes)) + fixed (char* charsPtr = &MemoryMarshal.GetNonNullPinnableReference(chars)) + fixed (byte* bytesPtr = &MemoryMarshal.GetNonNullPinnableReference(bytes)) { Convert(charsPtr, chars.Length, bytesPtr, bytes.Length, flush, out charsUsed, out bytesUsed, out completed); } diff --git a/external/corefx/src/Common/src/CoreLib/System/Text/EncoderExceptionFallback.cs b/external/corefx/src/Common/src/CoreLib/System/Text/EncoderExceptionFallback.cs index 66de1940f6..67168f62cd 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Text/EncoderExceptionFallback.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Text/EncoderExceptionFallback.cs @@ -7,6 +7,9 @@ using System.Runtime.Serialization; namespace System.Text { +#if MONO + [Serializable] +#endif public sealed class EncoderExceptionFallback : EncoderFallback { // Construction @@ -97,7 +100,9 @@ namespace System.Text } [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public sealed class EncoderFallbackException : ArgumentException { private char _charUnknown; diff --git a/external/corefx/src/Common/src/CoreLib/System/Text/EncoderFallback.cs b/external/corefx/src/Common/src/CoreLib/System/Text/EncoderFallback.cs index aa6e049b0a..e2c28d5aaf 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Text/EncoderFallback.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Text/EncoderFallback.cs @@ -8,6 +8,9 @@ using System.Threading; namespace System.Text { +#if MONO + [System.Serializable] +#endif public abstract class EncoderFallback { private static EncoderFallback s_replacementFallback; // Default fallback, uses no best fit & "?" diff --git a/external/corefx/src/Common/src/CoreLib/System/Text/EncoderReplacementFallback.cs b/external/corefx/src/Common/src/CoreLib/System/Text/EncoderReplacementFallback.cs index 50e8eab14c..289b370aba 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Text/EncoderReplacementFallback.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Text/EncoderReplacementFallback.cs @@ -9,6 +9,9 @@ using System.Diagnostics.Private; namespace System.Text { +#if MONO + [Serializable] +#endif public sealed class EncoderReplacementFallback : EncoderFallback { // Our variables diff --git a/external/corefx/src/Common/src/CoreLib/System/Text/Encoding.cs b/external/corefx/src/Common/src/CoreLib/System/Text/Encoding.cs index 8d7e0c7ebb..9056b1511b 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Text/Encoding.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Text/Encoding.cs @@ -714,7 +714,7 @@ namespace System.Text public virtual unsafe int GetByteCount(ReadOnlySpan chars) { - fixed (char* charsPtr = &MemoryMarshal.GetReference(chars)) + fixed (char* charsPtr = &MemoryMarshal.GetNonNullPinnableReference(chars)) { return GetByteCount(charsPtr, chars.Length); } @@ -896,8 +896,8 @@ namespace System.Text public virtual unsafe int GetBytes(ReadOnlySpan chars, Span bytes) { - fixed (char* charsPtr = &MemoryMarshal.GetReference(chars)) - fixed (byte* bytesPtr = &MemoryMarshal.GetReference(bytes)) + fixed (char* charsPtr = &MemoryMarshal.GetNonNullPinnableReference(chars)) + fixed (byte* bytesPtr = &MemoryMarshal.GetNonNullPinnableReference(bytes)) { return GetBytes(charsPtr, chars.Length, bytesPtr, bytes.Length); } @@ -946,7 +946,7 @@ namespace System.Text public virtual unsafe int GetCharCount(ReadOnlySpan bytes) { - fixed (byte* bytesPtr = &MemoryMarshal.GetReference(bytes)) + fixed (byte* bytesPtr = &MemoryMarshal.GetNonNullPinnableReference(bytes)) { return GetCharCount(bytesPtr, bytes.Length); } @@ -1058,8 +1058,8 @@ namespace System.Text public virtual unsafe int GetChars(ReadOnlySpan bytes, Span chars) { - fixed (byte* bytesPtr = &MemoryMarshal.GetReference(bytes)) - fixed (char* charsPtr = &MemoryMarshal.GetReference(chars)) + fixed (byte* bytesPtr = &MemoryMarshal.GetNonNullPinnableReference(bytes)) + fixed (char* charsPtr = &MemoryMarshal.GetNonNullPinnableReference(chars)) { return GetChars(bytesPtr, bytes.Length, charsPtr, chars.Length); } @@ -1088,7 +1088,7 @@ namespace System.Text public unsafe string GetString(ReadOnlySpan bytes) { - fixed (byte* bytesPtr = &MemoryMarshal.GetReference(bytes)) + fixed (byte* bytesPtr = &MemoryMarshal.GetNonNullPinnableReference(bytes)) { return GetString(bytesPtr, bytes.Length); } diff --git a/external/corefx/src/Common/src/CoreLib/System/Text/EncodingInfo.cs b/external/corefx/src/Common/src/CoreLib/System/Text/EncodingInfo.cs index 99995f759b..9b57f1f97d 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Text/EncodingInfo.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Text/EncodingInfo.cs @@ -7,6 +7,9 @@ using System.Text; namespace System.Text { +#if MONO + [Serializable] +#endif public sealed class EncodingInfo { private int iCodePage; // Code Page # diff --git a/external/corefx/src/Common/src/CoreLib/System/Text/StringBuilder.Debug.cs b/external/corefx/src/Common/src/CoreLib/System/Text/StringBuilder.Debug.cs new file mode 100644 index 0000000000..a62c4777ad --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/Text/StringBuilder.Debug.cs @@ -0,0 +1,37 @@ +// 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.Text +{ + public sealed partial class StringBuilder + { + private void ShowChunks(int maxChunksToShow = 10) + { + int count = 0; + StringBuilder head = this, current = this; + while (current != null) + { + if (count < maxChunksToShow) + { + count++; + } + else + { + head = head.m_ChunkPrevious; + } + current = current.m_ChunkPrevious; + } + current = head; + string[] chunks = new string[count]; + for (int i = count; i > 0; i--) + { + chunks[i - 1] = new string(current.m_ChunkChars).Replace('\0', '.'); + current = current.m_ChunkPrevious; + } + Debug.WriteLine('|' + string.Join('|', chunks) + '|'); + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/Text/StringBuilder.cs b/external/corefx/src/Common/src/CoreLib/System/Text/StringBuilder.cs index d5b6e7f312..d429a84fed 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Text/StringBuilder.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Text/StringBuilder.cs @@ -19,22 +19,24 @@ using System.Collections.Generic; namespace System.Text { // This class represents a mutable string. It is convenient for situations in - // which it is desirable to modify a string, perhaps by removing, replacing, or + // which it is desirable to modify a string, perhaps by removing, replacing, or // inserting characters, without creating a new String subsequent to - // each modification. - // + // each modification. + // // The methods contained within this class do not return a new StringBuilder // object unless specified otherwise. This class may be used in conjunction with the String // class to carry out modifications upon strings. [Serializable] #if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#else + [StructLayout(LayoutKind.Sequential)] #endif public sealed partial class StringBuilder : ISerializable { // A StringBuilder is internally represented as a linked list of blocks each of which holds - // a chunk of the string. It turns out string as a whole can also be represented as just a chunk, - // so that is what we do. + // a chunk of the string. It turns out string as a whole can also be represented as just a chunk, + // so that is what we do. /// /// The character buffer for this chunk. @@ -76,7 +78,7 @@ namespace System.Text // We want to keep chunk arrays out of large object heap (< 85K bytes ~ 40K chars) to be sure. // Making the maximum chunk size big means less allocation code called, but also more waste // in unused characters and slower inserts / replaces (since you do need to slide characters over - // within a buffer). + // within a buffer). internal const int MaxChunkSize = 8000; /// @@ -380,7 +382,7 @@ namespace System.Text int chunkOffset = chunk.m_ChunkOffset; int chunkLength = chunk.m_ChunkLength; - // Check that we will not overrun our boundaries. + // Check that we will not overrun our boundaries. if ((uint)(chunkLength + chunkOffset) <= (uint)result.Length && (uint)chunkLength <= (uint)sourceArray.Length) { fixed (char* sourcePtr = &sourceArray[0]) @@ -465,13 +467,10 @@ namespace System.Text throw new ArgumentOutOfRangeException(nameof(value), SR.ArgumentOutOfRange_SmallCapacity); } - int originalCapacity = Capacity; - if (value == 0 && m_ChunkPrevious == null) { m_ChunkLength = 0; m_ChunkOffset = 0; - Debug.Assert(Capacity >= originalCapacity); return; } @@ -486,22 +485,32 @@ namespace System.Text StringBuilder chunk = FindChunkForIndex(value); if (chunk != this) { - // We crossed a chunk boundary when reducing the Length. We must replace this middle-chunk with a new larger chunk, - // to ensure the original capacity is preserved. - int newLen = originalCapacity - chunk.m_ChunkOffset; - char[] newArray = new char[newLen]; + // Avoid possible infinite capacity growth. See https://github.com/dotnet/coreclr/pull/16926 + int capacityToPreserve = Math.Min(Capacity, Math.Max(Length * 6 / 5, m_ChunkChars.Length)); + int newLen = capacityToPreserve - chunk.m_ChunkOffset; + if (newLen > chunk.m_ChunkChars.Length) + { + // We crossed a chunk boundary when reducing the Length. We must replace this middle-chunk with a new larger chunk, + // to ensure the capacity we want is preserved. + char[] newArray = new char[newLen]; + Array.Copy(chunk.m_ChunkChars, 0, newArray, 0, chunk.m_ChunkLength); + m_ChunkChars = newArray; + } + else + { + // Special case where the capacity we want to keep corresponds exactly to the size of the content. + // Just take ownership of the array. + Debug.Assert(newLen == chunk.m_ChunkChars.Length, "The new chunk should be larger or equal to the one it is replacing."); + m_ChunkChars = chunk.m_ChunkChars; + } - Debug.Assert(newLen > chunk.m_ChunkChars.Length, "The new chunk should be larger than the one it is replacing."); - Array.Copy(chunk.m_ChunkChars, 0, newArray, 0, chunk.m_ChunkLength); - - m_ChunkChars = newArray; m_ChunkPrevious = chunk.m_ChunkPrevious; m_ChunkOffset = chunk.m_ChunkOffset; } m_ChunkLength = value - chunk.m_ChunkOffset; AssertInvariants(); } - Debug.Assert(Capacity >= originalCapacity); + Debug.Assert(Length == value, "Something went wrong setting Length."); } } @@ -694,7 +703,7 @@ namespace System.Text } // We put this fixed in its own helper to avoid the cost of zero-initing `valueChars` in the - // case we don't actually use it. + // case we don't actually use it. private void AppendHelper(string value) { unsafe @@ -924,7 +933,7 @@ namespace System.Text return this; } - // Ensure we don't insert more chars than we can hold, and we don't + // Ensure we don't insert more chars than we can hold, and we don't // have any integer overflow in our new length. long insertingChars = (long)value.Length * count; if (insertingChars > MaxCapacity - this.Length) @@ -1125,7 +1134,7 @@ namespace System.Text { return AppendJoinCore(&separator, 1, values); } - + private unsafe StringBuilder AppendJoinCore(char* separator, int separatorLength, IEnumerable values) { Debug.Assert(separator != null); @@ -1562,7 +1571,7 @@ namespace System.Text if (startPos != pos) { // There was no brace escaping, extract the item format as a single string - itemFormatSpan = format.AsReadOnlySpan().Slice(startPos, pos - startPos); + itemFormatSpan = format.AsSpan(startPos, pos - startPos); } } else @@ -1690,10 +1699,10 @@ namespace System.Text /// /// Determines if the contents of this builder are equal to the contents of ReadOnlySpan. /// - /// The ReadOnlySpan{char}. - public bool Equals(ReadOnlySpan value) + /// The ReadOnlySpan{char}. + public bool Equals(ReadOnlySpan span) { - if (value.Length != Length) + if (span.Length != Length) return false; StringBuilder sbChunk = this; @@ -1706,7 +1715,7 @@ namespace System.Text ReadOnlySpan chunk = new ReadOnlySpan(sbChunk.m_ChunkChars, 0, chunk_length); - if (!chunk.Equals(value.Slice(value.Length - offset, chunk_length))) + if (!chunk.EqualsOrdinal(span.Slice(span.Length - offset, chunk_length))) return false; sbChunk = sbChunk.m_ChunkPrevious; @@ -1759,7 +1768,7 @@ namespace System.Text int indexInChunk = startIndex - chunk.m_ChunkOffset; while (count > 0) { - // Look for a match in the chunk,indexInChunk pointer + // Look for a match in the chunk,indexInChunk pointer if (StartsWith(chunk, indexInChunk, count, oldValue)) { // Push it on the replacements array (with growth), we will do all replacements in a @@ -1785,13 +1794,13 @@ namespace System.Text if (indexInChunk >= chunk.m_ChunkLength || count == 0) // Have we moved out of the current chunk? { - // Replacing mutates the blocks, so we need to convert to a logical index and back afterwards. + // Replacing mutates the blocks, so we need to convert to a logical index and back afterwards. int index = indexInChunk + chunk.m_ChunkOffset; int indexBeforeAdjustment = index; // See if we accumulated any replacements, if so apply them. ReplaceAllInChunk(replacements, replacementsCount, chunk, oldValue.Length, newValue); - // The replacement has affected the logical index. Adjust it. + // The replacement has affected the logical index. Adjust it. index += ((newValue.Length - oldValue.Length) * replacementsCount); replacementsCount = 0; @@ -1884,7 +1893,7 @@ namespace System.Text throw new ArgumentOutOfRangeException(nameof(valueCount), SR.ArgumentOutOfRange_LengthGreaterThanCapacity); } - // This case is so common we want to optimize for it heavily. + // This case is so common we want to optimize for it heavily. int newIndex = valueCount + m_ChunkLength; if (newIndex <= m_ChunkChars.Length) { @@ -1901,7 +1910,7 @@ namespace System.Text m_ChunkLength = m_ChunkChars.Length; } - // Expand the builder to add another chunk. + // Expand the builder to add another chunk. int restLength = valueCount - firstLength; ExpandByABlock(restLength); Debug.Assert(m_ChunkLength == 0, "A new block was not created."); @@ -1958,16 +1967,16 @@ namespace System.Text { fixed (char* valuePtr = value) { - // calculate the total amount of extra space or space needed for all the replacements. + // calculate the total amount of extra space or space needed for all the replacements. int delta = (value.Length - removeCount) * replacementsCount; StringBuilder targetChunk = sourceChunk; // the target as we copy chars down int targetIndexInChunk = replacements[0]; - // Make the room needed for all the new characters if needed. + // Make the room needed for all the new characters if needed. if (delta > 0) MakeRoom(targetChunk.m_ChunkOffset + targetIndexInChunk, delta, out targetChunk, out targetIndexInChunk, true); - // We made certain that characters after the insertion point are not moved, + // We made certain that characters after the insertion point are not moved, int i = 0; for (;;) { @@ -1984,7 +1993,7 @@ namespace System.Text Debug.Assert(gapStart < sourceChunk.m_ChunkChars.Length, "gap starts at end of buffer. Should not happen"); Debug.Assert(gapStart <= gapEnd, "negative gap size"); Debug.Assert(gapEnd <= sourceChunk.m_ChunkLength, "gap too big"); - if (delta != 0) // can skip the sliding of gaps if source an target string are the same size. + if (delta != 0) // can skip the sliding of gaps if source an target string are the same size. { // Copy the gap data between the current replacement and the next replacement fixed (char* sourcePtr = &sourceChunk.m_ChunkChars[gapStart]) @@ -1997,7 +2006,7 @@ namespace System.Text } } - // Remove extra space if necessary. + // Remove extra space if necessary. if (delta < 0) Remove(targetChunk.m_ChunkOffset + targetIndexInChunk, -delta, out targetChunk, out targetIndexInChunk); } @@ -2054,7 +2063,7 @@ namespace System.Text /// /// The pointer to the start of the character buffer. /// The number of characters in the buffer. - unsafe private void ReplaceInPlaceAtChunk(ref StringBuilder chunk, ref int indexInChunk, char* value, int count) + private unsafe void ReplaceInPlaceAtChunk(ref StringBuilder chunk, ref int indexInChunk, char* value, int count) { if (count != 0) { @@ -2066,7 +2075,7 @@ namespace System.Text int lengthToCopy = Math.Min(lengthInChunk, count); ThreadSafeCopy(value, chunk.m_ChunkChars, indexInChunk, lengthToCopy); - // Advance the index. + // Advance the index. indexInChunk += lengthToCopy; if (indexInChunk >= chunk.m_ChunkLength) { @@ -2384,7 +2393,7 @@ namespace System.Text int endIndex = startIndex + count; - // Find the chunks for the start and end of the block to delete. + // Find the chunks for the start and end of the block to delete. chunk = this; StringBuilder endChunk = null; int endIndexInChunk = 0; @@ -2435,7 +2444,7 @@ namespace System.Text // SafeCritical: We ensure that `endIndexInChunk + copyCount` is within range of `m_ChunkChars`, and // also ensure that `copyTargetIndexInChunk + copyCount` is within the chunk. - // Remove any characters in the end chunk, by sliding the characters down. + // Remove any characters in the end chunk, by sliding the characters down. if (copyTargetIndexInChunk != endIndexInChunk) // Sometimes no move is necessary { ThreadSafeCopy(endChunk.m_ChunkChars, endIndexInChunk, endChunk.m_ChunkChars, copyTargetIndexInChunk, copyCount); diff --git a/external/corefx/src/Common/src/CoreLib/System/Text/StringBuilderCache.cs b/external/corefx/src/Common/src/CoreLib/System/Text/StringBuilderCache.cs new file mode 100644 index 0000000000..e699cc27cc --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/Text/StringBuilderCache.cs @@ -0,0 +1,62 @@ +// 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.Text +{ + /// Provide a cached reusable instance of stringbuilder per thread. + internal static class StringBuilderCache + { + // The value 360 was chosen in discussion with performance experts as a compromise between using + // as litle memory per thread as possible and still covering a large part of short-lived + // StringBuilder creations on the startup path of VS designers. + private const int MaxBuilderSize = 360; + private const int DefaultCapacity = 16; // == StringBuilder.DefaultCapacity + + // WARNING: We allow diagnostic tools to directly inspect this member (t_cachedInstance). + // See https://github.com/dotnet/corert/blob/master/Documentation/design-docs/diagnostics/diagnostics-tools-contract.md for more details. + // Please do not change the type, the name, or the semantic usage of this member without understanding the implication for tools. + // Get in touch with the diagnostics team if you have questions. + [ThreadStatic] + private static StringBuilder t_cachedInstance; + + /// Get a StringBuilder for the specified capacity. + /// If a StringBuilder of an appropriate size is cached, it will be returned and the cache emptied. + public static StringBuilder Acquire(int capacity = DefaultCapacity) + { + if (capacity <= MaxBuilderSize) + { + StringBuilder sb = t_cachedInstance; + if (sb != null) + { + // Avoid stringbuilder block fragmentation by getting a new StringBuilder + // when the requested size is larger than the current capacity + if (capacity <= sb.Capacity) + { + t_cachedInstance = null; + sb.Clear(); + return sb; + } + } + } + return new StringBuilder(capacity); + } + + /// Place the specified builder in the cache if it is not too big. + public static void Release(StringBuilder sb) + { + if (sb.Capacity <= MaxBuilderSize) + { + t_cachedInstance = sb; + } + } + + /// ToString() the stringbuilder, Release it to the cache, and return the resulting string. + public static string GetStringAndRelease(StringBuilder sb) + { + string result = sb.ToString(); + Release(sb); + return result; + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/Text/UTF32Encoding.cs b/external/corefx/src/Common/src/CoreLib/System/Text/UTF32Encoding.cs index 7df6695f07..c52f415cac 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Text/UTF32Encoding.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Text/UTF32Encoding.cs @@ -22,6 +22,9 @@ namespace System.Text // mark is used mostly to distinguish UTF-32 text from other encodings, and doesn't // switch the byte orderings. +#if MONO + [Serializable] +#endif public sealed class UTF32Encoding : Encoding { /* diff --git a/external/corefx/src/Common/src/CoreLib/System/Text/UTF7Encoding.cs b/external/corefx/src/Common/src/CoreLib/System/Text/UTF7Encoding.cs index ef85d06482..afb6d8d5b0 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Text/UTF7Encoding.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Text/UTF7Encoding.cs @@ -13,6 +13,9 @@ using System.Runtime.InteropServices; namespace System.Text { +#if MONO + [Serializable] +#endif public class UTF7Encoding : Encoding { private const String base64Chars = diff --git a/external/corefx/src/Common/src/CoreLib/System/Text/UTF8Encoding.cs.REMOVED.git-id b/external/corefx/src/Common/src/CoreLib/System/Text/UTF8Encoding.cs.REMOVED.git-id index 82dfec5db9..c995d7cc5c 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Text/UTF8Encoding.cs.REMOVED.git-id +++ b/external/corefx/src/Common/src/CoreLib/System/Text/UTF8Encoding.cs.REMOVED.git-id @@ -1 +1 @@ -914651fdd0d8b62fd9117b901908f3ba65fb2ecc \ No newline at end of file +54460587219b7aa1b8c5a7416dfc25cfbbb308c9 \ No newline at end of file diff --git a/external/corefx/src/Common/src/CoreLib/System/Text/UnicodeEncoding.cs b/external/corefx/src/Common/src/CoreLib/System/Text/UnicodeEncoding.cs index bdc0cb6d43..049e1decdc 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Text/UnicodeEncoding.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Text/UnicodeEncoding.cs @@ -14,6 +14,9 @@ using System.Runtime.InteropServices; namespace System.Text { +#if MONO + [Serializable] +#endif public class UnicodeEncoding : Encoding { // Used by Encoding.BigEndianUnicode/Unicode for lazy initialization @@ -32,6 +35,8 @@ namespace System.Text // Unicode version 2.0 character size in bytes public const int CharSize = 2; + // endianness-based bit pattern mask. + static readonly ulong highLowPatternMask = ((ulong) 0xd800d800d800d800 | (BitConverter.IsLittleEndian ? (ulong) 0x0400000004000000 : (ulong) 0x0000040000000400)); public UnicodeEncoding() : this(false, true) @@ -412,11 +417,8 @@ namespace System.Text { // No fallback, maybe we can do it fast #if !NO_FAST_UNICODE_LOOP -#if BIGENDIAN // If endianess is backwards then each pair of bytes would be backwards. - if ( bigEndian && -#else - if (!bigEndian && -#endif // BIGENDIAN + // If endianess is backwards then each pair of bytes would be backwards. + if ( (bigEndian ^ BitConverter.IsLittleEndian) && #if BIT64 // 64 bit CPU needs to be long aligned for this to work. charLeftOver == 0 && (unchecked((long)chars) & 7) == 0) @@ -454,11 +456,7 @@ namespace System.Text // If they happen to be high/low/high/low, we may as well continue. Check the next // bit to see if its set (low) or not (high) in the right pattern -#if BIGENDIAN - if (((0xfc00fc00fc00fc00 & *longChars) ^ 0xd800dc00d800dc00) != 0) -#else - if (((0xfc00fc00fc00fc00 & *longChars) ^ 0xdc00d800dc00d800) != 0) -#endif + if (((0xfc00fc00fc00fc00 & *longChars) ^ highLowPatternMask) != 0) { // Either there weren't 4 surrogates, or the 0x0400 bit was set when a high // was hoped for or the 0x0400 bit wasn't set where a low was hoped for. @@ -702,11 +700,8 @@ namespace System.Text { // No fallback, maybe we can do it fast #if !NO_FAST_UNICODE_LOOP -#if BIGENDIAN // If endianess is backwards then each pair of bytes would be backwards. - if ( bigEndian && -#else - if (!bigEndian && -#endif // BIGENDIAN + // If endianess is backwards then each pair of bytes would be backwards. + if ( (bigEndian ^ BitConverter.IsLittleEndian) && #if BIT64 // 64 bit CPU needs to be long aligned for this to work, 32 bit CPU needs to be 32 bit aligned (unchecked((long)chars) & 7) == 0 && (unchecked((long)bytes) & 7) == 0 && #else @@ -753,11 +748,7 @@ namespace System.Text // If they happen to be high/low/high/low, we may as well continue. Check the next // bit to see if its set (low) or not (high) in the right pattern -#if BIGENDIAN - if (((0xfc00fc00fc00fc00 & *longChars) ^ 0xd800dc00d800dc00) != 0) -#else - if (((0xfc00fc00fc00fc00 & *longChars) ^ 0xdc00d800dc00d800) != 0) -#endif + if (((0xfc00fc00fc00fc00 & *longChars) ^ highLowPatternMask) != 0) { // Either there weren't 4 surrogates, or the 0x0400 bit was set when a high // was hoped for or the 0x0400 bit wasn't set where a low was hoped for. @@ -787,11 +778,7 @@ namespace System.Text // Also somehow this optimizes the above loop? It seems to cause something above // to get enregistered, but I haven't figured out how to make that happen without this loop. else if ((charLeftOver == 0) && -#if BIGENDIAN - bigEndian && -#else - !bigEndian && -#endif // BIGENDIAN + (bigEndian ^ BitConverter.IsLittleEndian) && #if BIT64 (unchecked((long)chars) & 7) != (unchecked((long)bytes) & 7) && // Only do this if chars & bytes are out of line, otherwise faster loop will be faster next time @@ -1128,11 +1115,7 @@ namespace System.Text // If we're aligned then maybe we can do it fast // That'll hurt if we're unaligned because we'll always test but never be aligned #if !NO_FAST_UNICODE_LOOP -#if BIGENDIAN - if (bigEndian && -#else // BIGENDIAN - if (!bigEndian && -#endif // BIGENDIAN + if ((bigEndian ^ BitConverter.IsLittleEndian) && #if BIT64 // win64 has to be long aligned (unchecked((long)bytes) & 7) == 0 && #else @@ -1170,11 +1153,7 @@ namespace System.Text // If they happen to be high/low/high/low, we may as well continue. Check the next // bit to see if its set (low) or not (high) in the right pattern -#if BIGENDIAN - if (((0xfc00fc00fc00fc00 & *longBytes) ^ 0xd800dc00d800dc00) != 0) -#else - if (((0xfc00fc00fc00fc00 & *longBytes) ^ 0xdc00d800dc00d800) != 0) -#endif + if (((0xfc00fc00fc00fc00 & *longBytes) ^ highLowPatternMask) != 0) { // Either there weren't 4 surrogates, or the 0x0400 bit was set when a high // was hoped for or the 0x0400 bit wasn't set where a low was hoped for. @@ -1451,11 +1430,7 @@ namespace System.Text // If we're aligned then maybe we can do it fast // That'll hurt if we're unaligned because we'll always test but never be aligned #if !NO_FAST_UNICODE_LOOP -#if BIGENDIAN - if (bigEndian && -#else // BIGENDIAN - if (!bigEndian && -#endif // BIGENDIAN + if ((bigEndian ^ BitConverter.IsLittleEndian) && #if BIT64 // win64 has to be long aligned (unchecked((long)chars) & 7) == 0 && (unchecked((long)bytes) & 7) == 0 && #else @@ -1502,11 +1477,7 @@ namespace System.Text // If they happen to be high/low/high/low, we may as well continue. Check the next // bit to see if its set (low) or not (high) in the right pattern -#if BIGENDIAN - if (((0xfc00fc00fc00fc00 & *longBytes) ^ 0xd800dc00d800dc00) != 0) -#else - if (((0xfc00fc00fc00fc00 & *longBytes) ^ 0xdc00d800dc00d800) != 0) -#endif + if (((0xfc00fc00fc00fc00 & *longBytes) ^ highLowPatternMask) != 0) { // Either there weren't 4 surrogates, or the 0x0400 bit was set when a high // was hoped for or the 0x0400 bit wasn't set where a low was hoped for. diff --git a/external/corefx/src/Common/src/CoreLib/System/Text/ValueStringBuilder.cs b/external/corefx/src/Common/src/CoreLib/System/Text/ValueStringBuilder.cs index f391346cbf..65b7432d09 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Text/ValueStringBuilder.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Text/ValueStringBuilder.cs @@ -6,6 +6,7 @@ using System.Buffers; using System.Diagnostics; using System.Diagnostics.Private; using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; namespace System.Text { @@ -22,27 +23,88 @@ namespace System.Text _pos = 0; } - public int Length => _pos; + public int Length + { + get => _pos; + set + { + Debug.Assert(value >= 0); + Debug.Assert(value <= _chars.Length); + _pos = value; + } + } + + public int Capacity => _chars.Length; + + public void EnsureCapacity(int capacity) + { + if (capacity > _chars.Length) + Grow(capacity - _chars.Length); + } + + /// + /// Get a pinnable reference to the builder. + /// + /// Ensures that the builder has a null char after + public ref char GetPinnableReference(bool terminate = false) + { + if (terminate) + { + EnsureCapacity(Length + 1); + _chars[Length] = '\0'; + } + return ref MemoryMarshal.GetReference(_chars); + } + + public ref char this[int index] + { + get + { + Debug.Assert(index < _pos); + return ref _chars[index]; + } + } public override string ToString() { var s = new string(_chars.Slice(0, _pos)); - Clear(); + Dispose(); return s; } + /// Returns the underlying storage of the builder. + public Span RawChars => _chars; + + /// + /// Returns a span around the contents of the builder. + /// + /// Ensures that the builder has a null char after + public ReadOnlySpan AsSpan(bool terminate) + { + if (terminate) + { + EnsureCapacity(Length + 1); + _chars[Length] = '\0'; + } + return _chars.Slice(0, _pos); + } + + public ReadOnlySpan AsSpan() => _chars.Slice(0, _pos); + public ReadOnlySpan AsSpan(int start) => _chars.Slice(start, _pos - start); + public ReadOnlySpan AsSpan(int start, int length) => _chars.Slice(start, length); + public bool TryCopyTo(Span destination, out int charsWritten) { if (_chars.Slice(0, _pos).TryCopyTo(destination)) { charsWritten = _pos; - Clear(); + Dispose(); return true; } else { charsWritten = 0; - Clear(); + Dispose(); return false; } } @@ -98,8 +160,7 @@ namespace System.Text Grow(s.Length); } - bool copied = s.AsReadOnlySpan().TryCopyTo(_chars.Slice(pos)); - Debug.Assert(copied, "Grow should have made enough room to successfully copy"); + s.AsSpan().CopyTo(_chars.Slice(pos)); _pos += s.Length; } @@ -134,6 +195,18 @@ namespace System.Text _pos += length; } + public unsafe void Append(ReadOnlySpan value) + { + int pos = _pos; + if (pos > _chars.Length - value.Length) + { + Grow(value.Length); + } + + value.CopyTo(_chars.Slice(_pos)); + _pos += value.Length; + } + [MethodImpl(MethodImplOptions.AggressiveInlining)] public Span AppendSpan(int length) { @@ -157,12 +230,11 @@ namespace System.Text [MethodImpl(MethodImplOptions.NoInlining)] private void Grow(int requiredAdditionalCapacity) { - Debug.Assert(requiredAdditionalCapacity > _chars.Length - _pos); + Debug.Assert(requiredAdditionalCapacity > 0); char[] poolArray = ArrayPool.Shared.Rent(Math.Max(_pos + requiredAdditionalCapacity, _chars.Length * 2)); - bool success = _chars.TryCopyTo(poolArray); - Debug.Assert(success); + _chars.CopyTo(poolArray); char[] toReturn = _arrayToReturnToPool; _chars = _arrayToReturnToPool = poolArray; @@ -173,7 +245,7 @@ namespace System.Text } [MethodImpl(MethodImplOptions.AggressiveInlining)] - private void Clear() + public void Dispose() { char[] toReturn = _arrayToReturnToPool; this = default; // for safety, to avoid using pooled array if this instance is erroneously appended to again diff --git a/external/corefx/src/Common/src/CoreLib/System/ThreadStaticAttribute.cs b/external/corefx/src/Common/src/CoreLib/System/ThreadStaticAttribute.cs index c12ac1c18d..c7be4ed620 100644 --- a/external/corefx/src/Common/src/CoreLib/System/ThreadStaticAttribute.cs +++ b/external/corefx/src/Common/src/CoreLib/System/ThreadStaticAttribute.cs @@ -17,6 +17,9 @@ using System; namespace System { +#if MONO + [Serializable] +#endif [AttributeUsage(AttributeTargets.Field, Inherited = false)] public class ThreadStaticAttribute : Attribute { diff --git a/external/corefx/src/Common/src/CoreLib/System/Threading/AbandonedMutexException.cs b/external/corefx/src/Common/src/CoreLib/System/Threading/AbandonedMutexException.cs index c7e604f33d..f559a96267 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Threading/AbandonedMutexException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Threading/AbandonedMutexException.cs @@ -15,7 +15,9 @@ using System.Runtime.Serialization; namespace System.Threading { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class AbandonedMutexException : SystemException { private int _mutexIndex = -1; diff --git a/external/corefx/src/Common/src/CoreLib/System/Threading/AsyncLocal.cs b/external/corefx/src/Common/src/CoreLib/System/Threading/AsyncLocal.cs index 59c8fb3c88..053e8cc6c0 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Threading/AsyncLocal.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Threading/AsyncLocal.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Diagnostics; +using System.Diagnostics.Private; namespace System.Threading { @@ -125,7 +126,7 @@ namespace System.Threading public static IAsyncLocalValueMap Empty { get; } = new EmptyAsyncLocalValueMap(); // Instance without any key/value pairs. Used as a singleton/ - private sealed class EmptyAsyncLocalValueMap : IAsyncLocalValueMap + internal sealed class EmptyAsyncLocalValueMap : IAsyncLocalValueMap { public IAsyncLocalValueMap Set(IAsyncLocal key, object value) { @@ -144,7 +145,7 @@ namespace System.Threading } // Instance with one key/value pair. - private sealed class OneElementAsyncLocalValueMap : IAsyncLocalValueMap + internal sealed class OneElementAsyncLocalValueMap : IAsyncLocalValueMap { private readonly IAsyncLocal _key1; private readonly object _value1; diff --git a/external/corefx/src/Common/src/CoreLib/System/Threading/ExecutionContext.cs b/external/corefx/src/Common/src/CoreLib/System/Threading/ExecutionContext.cs index 2d5f5be190..a840aa71fd 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Threading/ExecutionContext.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Threading/ExecutionContext.cs @@ -21,40 +21,19 @@ namespace System.Threading { public delegate void ContextCallback(Object state); - internal struct ExecutionContextSwitcher - { - internal ExecutionContext m_ec; - internal SynchronizationContext m_sc; - - internal void Undo(Thread currentThread) - { - Debug.Assert(currentThread == Thread.CurrentThread); - - // The common case is that these have not changed, so avoid the cost of a write if not needed. - if (currentThread.SynchronizationContext != m_sc) - { - currentThread.SynchronizationContext = m_sc; - } - - if (currentThread.ExecutionContext != m_ec) - { - ExecutionContext.Restore(currentThread, m_ec); - } - } - } - public sealed class ExecutionContext : IDisposable, ISerializable { - internal static readonly ExecutionContext Default = new ExecutionContext(); + internal static readonly ExecutionContext Default = new ExecutionContext(isDefault: true); + internal static readonly ExecutionContext DefaultFlowSuppressed = new ExecutionContext(AsyncLocalValueMap.Empty, Array.Empty(), isFlowSuppressed: true); private readonly IAsyncLocalValueMap m_localValues; private readonly IAsyncLocal[] m_localChangeNotifications; private readonly bool m_isFlowSuppressed; + private readonly bool m_isDefault; - private ExecutionContext() + private ExecutionContext(bool isDefault) { - m_localValues = AsyncLocalValueMap.Empty; - m_localChangeNotifications = Array.Empty(); + m_isDefault = isDefault; } private ExecutionContext( @@ -85,12 +64,14 @@ namespace System.Threading { Debug.Assert(isFlowSuppressed != m_isFlowSuppressed); - if (!isFlowSuppressed && - m_localValues == Default.m_localValues && - m_localChangeNotifications == Default.m_localChangeNotifications) + if (m_localValues == null || + m_localValues.GetType() == typeof(AsyncLocalValueMap.EmptyAsyncLocalValueMap)) { - return null; // implies the default context + return isFlowSuppressed ? + DefaultFlowSuppressed : + null; // implies the default context } + return new ExecutionContext(m_localValues, m_localChangeNotifications, isFlowSuppressed); } @@ -128,134 +109,248 @@ namespace System.Threading return executionContext != null && executionContext.m_isFlowSuppressed; } + internal bool HasChangeNotifications => m_localChangeNotifications != null; + + internal bool IsDefault => m_isDefault; + public static void Run(ExecutionContext executionContext, ContextCallback callback, Object state) { + // Note: ExecutionContext.Run is an extremely hot function and used by every await, ThreadPool execution, etc. if (executionContext == null) - throw new InvalidOperationException(SR.InvalidOperation_NullContext); + { + ThrowNullContext(); + } - Thread currentThread = Thread.CurrentThread; - ExecutionContextSwitcher ecsw = default(ExecutionContextSwitcher); + RunInternal(executionContext, callback, state); + } + + internal static void RunInternal(ExecutionContext executionContext, ContextCallback callback, Object state) + { + // Note: ExecutionContext.RunInternal is an extremely hot function and used by every await, ThreadPool execution, etc. + // Note: Manual enregistering may be addressed by "Exception Handling Write Through Optimization" + // https://github.com/dotnet/coreclr/blob/master/Documentation/design-docs/eh-writethru.md + + // Enregister variables with 0 post-fix so they can be used in registers without EH forcing them to stack + // Capture references to Thread Contexts + Thread currentThread0 = Thread.CurrentThread; + Thread currentThread = currentThread0; + ExecutionContext previousExecutionCtx0 = currentThread0.ExecutionContext; + + // Store current ExecutionContext and SynchronizationContext as "previousXxx". + // This allows us to restore them and undo any Context changes made in callback.Invoke + // so that they won't "leak" back into caller. + // These variables will cross EH so be forced to stack + ExecutionContext previousExecutionCtx = previousExecutionCtx0; + SynchronizationContext previousSyncCtx = currentThread0.SynchronizationContext; + + if (executionContext != null && executionContext.m_isDefault) + { + // Default is a null ExecutionContext internally + executionContext = null; + } + + if (previousExecutionCtx0 != executionContext) + { + // Restore changed ExecutionContext + currentThread0.ExecutionContext = executionContext; + if ((executionContext != null && executionContext.HasChangeNotifications) || + (previousExecutionCtx0 != null && previousExecutionCtx0.HasChangeNotifications)) + { + // There are change notifications; trigger any affected + OnValuesChanged(previousExecutionCtx0, executionContext); + } + } + + ExceptionDispatchInfo edi = null; try { - EstablishCopyOnWriteScope(currentThread, ref ecsw); - ExecutionContext.Restore(currentThread, executionContext); - callback(state); + callback.Invoke(state); } - catch + catch (Exception ex) { // Note: we have a "catch" rather than a "finally" because we want // to stop the first pass of EH here. That way we can restore the previous - // context before any of our callers' EH filters run. That means we need to - // end the scope separately in the non-exceptional case below. - ecsw.Undo(currentThread); - throw; - } - ecsw.Undo(currentThread); - } - - internal static void Restore(Thread currentThread, ExecutionContext executionContext) - { - Debug.Assert(currentThread == Thread.CurrentThread); - - ExecutionContext previous = currentThread.ExecutionContext ?? Default; - currentThread.ExecutionContext = executionContext; - - // New EC could be null if that's what ECS.Undo saved off. - // For the purposes of dealing with context change, treat this as the default EC - executionContext = executionContext ?? Default; - - if (previous != executionContext) - { - OnContextChanged(previous, executionContext); - } - } - - internal static void EstablishCopyOnWriteScope(Thread currentThread, ref ExecutionContextSwitcher ecsw) - { - Debug.Assert(currentThread == Thread.CurrentThread); - - ecsw.m_ec = currentThread.ExecutionContext; - ecsw.m_sc = currentThread.SynchronizationContext; - } - - private static void OnContextChanged(ExecutionContext previous, ExecutionContext current) - { - Debug.Assert(previous != null); - Debug.Assert(current != null); - Debug.Assert(previous != current); - - foreach (IAsyncLocal local in previous.m_localChangeNotifications) - { - object previousValue; - object currentValue; - previous.m_localValues.TryGetValue(local, out previousValue); - current.m_localValues.TryGetValue(local, out currentValue); - - if (previousValue != currentValue) - local.OnValueChanged(previousValue, currentValue, true); + // context before any of our callers' EH filters run. + edi = ExceptionDispatchInfo.Capture(ex); } - if (current.m_localChangeNotifications != previous.m_localChangeNotifications) + // Re-enregistrer variables post EH with 1 post-fix so they can be used in registers rather than from stack + SynchronizationContext previousSyncCtx1 = previousSyncCtx; + Thread currentThread1 = currentThread; + // The common case is that these have not changed, so avoid the cost of a write barrier if not needed. + if (currentThread1.SynchronizationContext != previousSyncCtx1) { - try + // Restore changed SynchronizationContext back to previous + currentThread1.SynchronizationContext = previousSyncCtx1; + } + + ExecutionContext previousExecutionCtx1 = previousExecutionCtx; + ExecutionContext currentExecutionCtx1 = currentThread1.ExecutionContext; + if (currentExecutionCtx1 != previousExecutionCtx1) + { + // Restore changed ExecutionContext back to previous + currentThread1.ExecutionContext = previousExecutionCtx1; + if ((currentExecutionCtx1 != null && currentExecutionCtx1.HasChangeNotifications) || + (previousExecutionCtx1 != null && previousExecutionCtx1.HasChangeNotifications)) { - foreach (IAsyncLocal local in current.m_localChangeNotifications) - { - // If the local has a value in the previous context, we already fired the event for that local - // in the code above. - object previousValue; - if (!previous.m_localValues.TryGetValue(local, out previousValue)) - { - object currentValue; - current.m_localValues.TryGetValue(local, out currentValue); + // There are change notifications; trigger any affected + OnValuesChanged(currentExecutionCtx1, previousExecutionCtx1); + } + } - if (previousValue != currentValue) - local.OnValueChanged(previousValue, currentValue, true); + // If exception was thrown by callback, rethrow it now original contexts are restored + edi?.Throw(); + } + + internal static void OnValuesChanged(ExecutionContext previousExecutionCtx, ExecutionContext nextExecutionCtx) + { + Debug.Assert(previousExecutionCtx != nextExecutionCtx); + + // Collect Change Notifications + IAsyncLocal[] previousChangeNotifications = previousExecutionCtx?.m_localChangeNotifications; + IAsyncLocal[] nextChangeNotifications = nextExecutionCtx?.m_localChangeNotifications; + + // At least one side must have notifications + Debug.Assert(previousChangeNotifications != null || nextChangeNotifications != null); + + // Fire Change Notifications + try + { + if (previousChangeNotifications != null && nextChangeNotifications != null) + { + // Notifications can't exist without values + Debug.Assert(previousExecutionCtx.m_localValues != null); + Debug.Assert(nextExecutionCtx.m_localValues != null); + // Both contexts have change notifications, check previousExecutionCtx first + foreach (IAsyncLocal local in previousChangeNotifications) + { + previousExecutionCtx.m_localValues.TryGetValue(local, out object previousValue); + nextExecutionCtx.m_localValues.TryGetValue(local, out object currentValue); + + if (previousValue != currentValue) + { + local.OnValueChanged(previousValue, currentValue, contextChanged: true); + } + } + + if (nextChangeNotifications != previousChangeNotifications) + { + // Check for additional notifications in nextExecutionCtx + foreach (IAsyncLocal local in nextChangeNotifications) + { + // If the local has a value in the previous context, we already fired the event + // for that local in the code above. + if (!previousExecutionCtx.m_localValues.TryGetValue(local, out object previousValue)) + { + nextExecutionCtx.m_localValues.TryGetValue(local, out object currentValue); + if (previousValue != currentValue) + { + local.OnValueChanged(previousValue, currentValue, contextChanged: true); + } + } } } } - catch (Exception ex) + else if (previousChangeNotifications != null) { - Environment.FailFast( - SR.ExecutionContext_ExceptionInAsyncLocalNotification, - ex); + // Notifications can't exist without values + Debug.Assert(previousExecutionCtx.m_localValues != null); + // No current values, so just check previous against null + foreach (IAsyncLocal local in previousChangeNotifications) + { + previousExecutionCtx.m_localValues.TryGetValue(local, out object previousValue); + if (previousValue != null) + { + local.OnValueChanged(previousValue, null, contextChanged: true); + } + } + } + else // Implied: nextChangeNotifications != null + { + // Notifications can't exist without values + Debug.Assert(nextExecutionCtx.m_localValues != null); + // No previous values, so just check current against null + foreach (IAsyncLocal local in nextChangeNotifications) + { + nextExecutionCtx.m_localValues.TryGetValue(local, out object currentValue); + if (currentValue != null) + { + local.OnValueChanged(null, currentValue, contextChanged: true); + } + } } } + catch (Exception ex) + { + Environment.FailFast( + SR.ExecutionContext_ExceptionInAsyncLocalNotification, + ex); + } + } + + [StackTraceHidden] + private static void ThrowNullContext() + { + throw new InvalidOperationException(SR.InvalidOperation_NullContext); } internal static object GetLocalValue(IAsyncLocal local) { ExecutionContext current = Thread.CurrentThread.ExecutionContext; if (current == null) + { return null; + } - object value; - current.m_localValues.TryGetValue(local, out value); + current.m_localValues.TryGetValue(local, out object value); return value; } internal static void SetLocalValue(IAsyncLocal local, object newValue, bool needChangeNotifications) { - ExecutionContext current = Thread.CurrentThread.ExecutionContext ?? ExecutionContext.Default; + ExecutionContext current = Thread.CurrentThread.ExecutionContext; - object previousValue; - bool hadPreviousValue = current.m_localValues.TryGetValue(local, out previousValue); + object previousValue = null; + bool hadPreviousValue = false; + if (current != null) + { + hadPreviousValue = current.m_localValues.TryGetValue(local, out previousValue); + } if (previousValue == newValue) + { return; + } - IAsyncLocalValueMap newValues = current.m_localValues.Set(local, newValue); + IAsyncLocal[] newChangeNotifications = null; + IAsyncLocalValueMap newValues; + bool isFlowSuppressed = false; + if (current != null) + { + isFlowSuppressed = current.m_isFlowSuppressed; + newValues = current.m_localValues.Set(local, newValue); + newChangeNotifications = current.m_localChangeNotifications; + } + else + { + // First AsyncLocal + newValues = new AsyncLocalValueMap.OneElementAsyncLocalValueMap(local, newValue); + } // // Either copy the change notification array, or create a new one, depending on whether we need to add a new item. // - IAsyncLocal[] newChangeNotifications = current.m_localChangeNotifications; if (needChangeNotifications) { if (hadPreviousValue) { + Debug.Assert(newChangeNotifications != null); Debug.Assert(Array.IndexOf(newChangeNotifications, local) >= 0); } + else if (newChangeNotifications == null) + { + newChangeNotifications = new IAsyncLocal[1] { local }; + } else { int newNotificationIndex = newChangeNotifications.Length; @@ -264,12 +359,14 @@ namespace System.Threading } } - Thread.CurrentThread.ExecutionContext = - new ExecutionContext(newValues, newChangeNotifications, current.m_isFlowSuppressed); + Thread.CurrentThread.ExecutionContext = + (!isFlowSuppressed && newValues.GetType() == typeof(AsyncLocalValueMap.EmptyAsyncLocalValueMap)) ? + null : // No values, return to Default context + new ExecutionContext(newValues, newChangeNotifications, isFlowSuppressed); if (needChangeNotifications) { - local.OnValueChanged(previousValue, newValue, false); + local.OnValueChanged(previousValue, newValue, contextChanged: false); } } diff --git a/external/corefx/src/Common/src/CoreLib/System/Threading/LazyInitializer.cs b/external/corefx/src/Common/src/CoreLib/System/Threading/LazyInitializer.cs index f422ab9172..6f3ea7b438 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Threading/LazyInitializer.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Threading/LazyInitializer.cs @@ -9,6 +9,7 @@ // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- using System.Diagnostics; +using System.Diagnostics.Private; namespace System.Threading { diff --git a/external/corefx/src/Common/src/CoreLib/System/Threading/LockRecursionException.cs b/external/corefx/src/Common/src/CoreLib/System/Threading/LockRecursionException.cs index c76c7a5040..c07fe484ab 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Threading/LockRecursionException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Threading/LockRecursionException.cs @@ -8,7 +8,9 @@ using System.Runtime.Serialization; namespace System.Threading { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class LockRecursionException : System.Exception { public LockRecursionException() diff --git a/external/corefx/src/Common/src/CoreLib/System/Threading/ReaderWriterLockSlim.cs b/external/corefx/src/Common/src/CoreLib/System/Threading/ReaderWriterLockSlim.cs index 3c4aad603a..45175488e7 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Threading/ReaderWriterLockSlim.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Threading/ReaderWriterLockSlim.cs @@ -1249,7 +1249,7 @@ namespace System.Threading } // Don't want to Sleep(1) in this spin wait: - // - Don't want to spin for that long, since a proper wait will follow when the spin wait fails. The artifical + // - Don't want to spin for that long, since a proper wait will follow when the spin wait fails. The artificial // delay introduced by Sleep(1) will in some cases be much longer than desired. // - Sleep(1) would put the thread into a wait state, and a proper wait will follow when the spin wait fails // anyway, so it's preferable to put the thread into the proper wait state diff --git a/external/corefx/src/Common/src/CoreLib/System/Threading/SynchronizationLockException.cs b/external/corefx/src/Common/src/CoreLib/System/Threading/SynchronizationLockException.cs index e050e1539d..10c2924df9 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Threading/SynchronizationLockException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Threading/SynchronizationLockException.cs @@ -17,7 +17,9 @@ using System.Runtime.Serialization; namespace System.Threading { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class SynchronizationLockException : SystemException { public SynchronizationLockException() diff --git a/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/Sources/IValueTaskSource.cs b/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/Sources/IValueTaskSource.cs new file mode 100644 index 0000000000..e411146a1d --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/Sources/IValueTaskSource.cs @@ -0,0 +1,82 @@ +// 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.Threading.Tasks.Sources +{ + /// + /// Flags passed from and to + /// and + /// to control behavior. + /// + [Flags] + public enum ValueTaskSourceOnCompletedFlags + { + /// + /// No requirements are placed on how the continuation is invoked. + /// + None, + /// + /// Set if OnCompleted should capture the current scheduling context (e.g. SynchronizationContext) + /// and use it when queueing the continuation for execution. If this is not set, the implementation + /// may choose to execute the continuation in an arbitrary location. + /// + UseSchedulingContext = 0x1, + /// + /// Set if OnCompleted should capture the current ExecutionContext and use it to run the continuation. + /// + FlowExecutionContext = 0x2, + } + + /// Indicates the status of an or . + public enum ValueTaskSourceStatus + { + /// The operation has not yet completed. + Pending = 0, + /// The operation completed successfully. + Succeeded = 1, + /// The operation completed with an error. + Faulted = 2, + /// The operation completed due to cancellation. + Canceled = 3 + } + + /// Represents an object that can be wrapped by a . + public interface IValueTaskSource + { + /// Gets the status of the current operation. + /// Opaque value that was provided to the 's constructor. + ValueTaskSourceStatus GetStatus(short token); + + /// Schedules the continuation action for this . + /// The continuation to invoke when the operation has completed. + /// The state object to pass to when it's invoked. + /// Opaque value that was provided to the 's constructor. + /// The flags describing the behavior of the continuation. + void OnCompleted(Action continuation, object state, short token, ValueTaskSourceOnCompletedFlags flags); + + /// Gets the result of the . + /// Opaque value that was provided to the 's constructor. + void GetResult(short token); + } + + /// Represents an object that can be wrapped by a . + /// Specifies the type of data returned from the object. + public interface IValueTaskSource + { + /// Gets the status of the current operation. + /// Opaque value that was provided to the 's constructor. + ValueTaskSourceStatus GetStatus(short token); + + /// Schedules the continuation action for this . + /// The continuation to invoke when the operation has completed. + /// The state object to pass to when it's invoked. + /// Opaque value that was provided to the 's constructor. + /// The flags describing the behavior of the continuation. + void OnCompleted(Action continuation, object state, short token, ValueTaskSourceOnCompletedFlags flags); + + /// Gets the result of the . + /// Opaque value that was provided to the 's constructor. + TResult GetResult(short token); + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/TaskCanceledException.cs b/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/TaskCanceledException.cs index 556fd80f19..f42a403cd0 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/TaskCanceledException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/TaskCanceledException.cs @@ -55,6 +55,18 @@ namespace System.Threading.Tasks { } + /// + /// Initializes a new instance of the + /// class with a specified error message, a reference to the inner exception that is the cause of + /// this exception, and the that triggered the cancellation. + /// + /// The error message that explains the reason for the exception. + /// The exception that is the cause of the current exception. + /// The that triggered the cancellation. + public TaskCanceledException(string message, Exception innerException, CancellationToken token) : base(message, innerException, token) + { + } + /// /// Initializes a new instance of the class /// with a reference to the that has been canceled. diff --git a/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/ValueTask.cs b/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/ValueTask.cs index de9b016328..c46d993d9f 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/ValueTask.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/ValueTask.cs @@ -3,72 +3,454 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; -using System.ComponentModel; +using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using System.Threading.Tasks.Sources; + +#if MONO +using System.Diagnostics.Private; +#endif + +#if !netstandard +using Internal.Runtime.CompilerServices; +#endif namespace System.Threading.Tasks { - /// - /// Provides a value type that wraps a and a , - /// only one of which is used. - /// - /// The type of the result. + // TYPE SAFETY WARNING: + // This code uses Unsafe.As to cast _obj. This is done in order to minimize the costs associated with + // casting _obj to a variety of different types that can be stored in a ValueTask, e.g. Task + // vs IValueTaskSource. Previous attempts at this were faulty due to using a separate field + // to store information about the type of the object in _obj; this is faulty because if the ValueTask + // is stored into a field, concurrent read/writes can result in tearing the _obj from the type information + // stored in a separate field. This means we can rely only on the _obj field to determine how to handle + // it. As such, the pattern employed is to copy _obj into a local obj, and then check it for null and + // type test against Task/Task. Since the ValueTask can only be constructed with null, Task, + // or IValueTaskSource, we can then be confident in knowing that if it doesn't match one of those values, + // it must be an IValueTaskSource, and we can use Unsafe.As. This could be defeated by other unsafe means, + // like private reflection or using Unsafe.As manually, but at that point you're already doing things + // that can violate type safety; we only care about getting correct behaviors when using "safe" code. + // There are still other race conditions in user's code that can result in errors, but such errors don't + // cause ValueTask to violate type safety. + + /// Provides an awaitable result of an asynchronous operation. /// - /// - /// Methods may return an instance of this value type when it's likely that the result of their - /// operations will be available synchronously and when the method is expected to be invoked so - /// frequently that the cost of allocating a new for each call will - /// be prohibitive. - /// - /// - /// There are tradeoffs to using a instead of a . - /// For example, while a can help avoid an allocation in the case where the - /// successful result is available synchronously, it also contains two fields whereas a - /// as a reference type is a single field. This means that a method call ends up returning two fields worth of - /// data instead of one, which is more data to copy. It also means that if a method that returns one of these - /// is awaited within an async method, the state machine for that async method will be larger due to needing - /// to store the struct that's two fields instead of a single reference. - /// - /// - /// Further, for uses other than consuming the result of an asynchronous operation via await, - /// can lead to a more convoluted programming model, which can in turn actually - /// lead to more allocations. For example, consider a method that could return either a - /// with a cached task as a common result or a . If the consumer of the result - /// wants to use it as a , such as to use with in methods like Task.WhenAll and Task.WhenAny, - /// the would first need to be converted into a using - /// , which leads to an allocation that would have been avoided if a cached - /// had been used in the first place. - /// - /// - /// As such, the default choice for any asynchronous method should be to return a or - /// . Only if performance analysis proves it worthwhile should a - /// be used instead of . There is no non-generic version of - /// as the Task.CompletedTask property may be used to hand back a successfully completed singleton in the case where - /// a -returning method completes synchronously and successfully. - /// + /// s are meant to be directly awaited. To do more complicated operations with them, a + /// should be extracted using . Such operations might include caching an instance to be awaited later, + /// registering multiple continuations with a single operation, awaiting the same task multiple times, and using combinators over + /// multiple operations. + /// + [AsyncMethodBuilder(typeof(AsyncValueTaskMethodBuilder))] + [StructLayout(LayoutKind.Auto)] + public readonly struct ValueTask : IEquatable + { + /// A task canceled using `new CancellationToken(true)`. + private static readonly Task s_canceledTask = +#if netstandard + Task.Delay(Timeout.Infinite, new CancellationToken(canceled: true)); +#else + Task.FromCanceled(new CancellationToken(canceled: true)); +#endif + /// A successfully completed task. + internal static Task CompletedTask +#if netstandard + { get; } = Task.Delay(0); +#else + => Task.CompletedTask; +#endif + + /// null if representing a successful synchronous completion, otherwise a or a . + internal readonly object _obj; + /// Opaque value passed through to the . + internal readonly short _token; + /// true to continue on the capture context; otherwise, true. + /// Stored in the rather than in the configured awaiter to utilize otherwise padding space. + internal readonly bool _continueOnCapturedContext; + + // An instance created with the default ctor (a zero init'd struct) represents a synchronously, successfully completed operation. + + /// Initialize the with a that represents the operation. + /// The task. + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public ValueTask(Task task) + { + if (task == null) + { + ThrowHelper.ThrowArgumentNullException(ExceptionArgument.task); + } + + _obj = task; + + _continueOnCapturedContext = true; + _token = 0; + } + + /// Initialize the with a object that represents the operation. + /// The source. + /// Opaque value passed through to the . + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public ValueTask(IValueTaskSource source, short token) + { + if (source == null) + { + ThrowHelper.ThrowArgumentNullException(ExceptionArgument.source); + } + + _obj = source; + _token = token; + + _continueOnCapturedContext = true; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private ValueTask(object obj, short token, bool continueOnCapturedContext) + { + _obj = obj; + _token = token; + _continueOnCapturedContext = continueOnCapturedContext; + } + + /// Returns the hash code for this instance. + public override int GetHashCode() => _obj?.GetHashCode() ?? 0; + + /// Returns a value indicating whether this value is equal to a specified . + public override bool Equals(object obj) => + obj is ValueTask && + Equals((ValueTask)obj); + + /// Returns a value indicating whether this value is equal to a specified value. + public bool Equals(ValueTask other) => _obj == other._obj && _token == other._token; + + /// Returns a value indicating whether two values are equal. + public static bool operator ==(ValueTask left, ValueTask right) => + left.Equals(right); + + /// Returns a value indicating whether two values are not equal. + public static bool operator !=(ValueTask left, ValueTask right) => + !left.Equals(right); + + /// + /// Gets a object to represent this ValueTask. + /// + /// + /// It will either return the wrapped task object if one exists, or it'll + /// manufacture a new task object to represent the result. + /// + public Task AsTask() + { + object obj = _obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); + return + obj == null ? CompletedTask : + obj as Task ?? + GetTaskForValueTaskSource(Unsafe.As(obj)); + } + + /// Gets a that may be used at any point in the future. + public ValueTask Preserve() => _obj == null ? this : new ValueTask(AsTask()); + + /// Creates a to represent the . + /// + /// The is passed in rather than reading and casting + /// so that the caller can pass in an object it's already validated. + /// + private Task GetTaskForValueTaskSource(IValueTaskSource t) + { + ValueTaskSourceStatus status = t.GetStatus(_token); + if (status != ValueTaskSourceStatus.Pending) + { + try + { + // Propagate any exceptions that may have occurred, then return + // an already successfully completed task. + t.GetResult(_token); + return CompletedTask; + + // If status is Faulted or Canceled, GetResult should throw. But + // we can't guarantee every implementation will do the "right thing". + // If it doesn't throw, we just treat that as success and ignore + // the status. + } + catch (Exception exc) + { + if (status == ValueTaskSourceStatus.Canceled) + { +#if !netstandard + if (exc is OperationCanceledException oce) + { + var task = new Task(); + task.TrySetCanceled(oce.CancellationToken, oce); + return task; + } +#endif + return s_canceledTask; + } + else + { +#if netstandard + var tcs = new TaskCompletionSource(); + tcs.TrySetException(exc); + return tcs.Task; +#else + return Task.FromException(exc); +#endif + } + } + } + + var m = new ValueTaskSourceAsTask(t, _token); + return +#if netstandard + m.Task; +#else + m; +#endif + } + + /// Type used to create a to represent a . + private sealed class ValueTaskSourceAsTask : +#if netstandard + TaskCompletionSource +#else + Task +#endif + { + private static readonly Action s_completionAction = state => + { + if (!(state is ValueTaskSourceAsTask vtst) || + !(vtst._source is IValueTaskSource source)) + { + // This could only happen if the IValueTaskSource passed the wrong state + // or if this callback were invoked multiple times such that the state + // was previously nulled out. + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.state); + return; + } + + vtst._source = null; + ValueTaskSourceStatus status = source.GetStatus(vtst._token); + try + { + source.GetResult(vtst._token); + vtst.TrySetResult(default); + } + catch (Exception exc) + { + if (status == ValueTaskSourceStatus.Canceled) + { +#if netstandard + vtst.TrySetCanceled(); +#else + if (exc is OperationCanceledException oce) + { + vtst.TrySetCanceled(oce.CancellationToken, oce); + } + else + { + vtst.TrySetCanceled(new CancellationToken(true)); + } +#endif + } + else + { + vtst.TrySetException(exc); + } + } + }; + + /// The associated . + private IValueTaskSource _source; + /// The token to pass through to operations on + private readonly short _token; + + public ValueTaskSourceAsTask(IValueTaskSource source, short token) + { + _token = token; + _source = source; + source.OnCompleted(s_completionAction, this, token, ValueTaskSourceOnCompletedFlags.None); + } + } + + /// Gets whether the represents a completed operation. + public bool IsCompleted + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + get + { + object obj = _obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); + + if (obj == null) + { + return true; + } + + if (obj is Task t) + { + return t.IsCompleted; + } + + return Unsafe.As(obj).GetStatus(_token) != ValueTaskSourceStatus.Pending; + } + } + + /// Gets whether the represents a successfully completed operation. + public bool IsCompletedSuccessfully + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + get + { + object obj = _obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); + + if (obj == null) + { + return true; + } + + if (obj is Task t) + { + return +#if netstandard + t.Status == TaskStatus.RanToCompletion; +#else + t.IsCompletedSuccessfully; +#endif + } + + return Unsafe.As(obj).GetStatus(_token) == ValueTaskSourceStatus.Succeeded; + } + } + + /// Gets whether the represents a failed operation. + public bool IsFaulted + { + get + { + object obj = _obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); + + if (obj == null) + { + return false; + } + + if (obj is Task t) + { + return t.IsFaulted; + } + + return Unsafe.As(obj).GetStatus(_token) == ValueTaskSourceStatus.Faulted; + } + } + + /// Gets whether the represents a canceled operation. + /// + /// If the is backed by a result or by a , + /// this will always return false. If it's backed by a , it'll return the + /// value of the task's property. + /// + public bool IsCanceled + { + get + { + object obj = _obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); + + if (obj == null) + { + return false; + } + + if (obj is Task t) + { + return t.IsCanceled; + } + + return Unsafe.As(obj).GetStatus(_token) == ValueTaskSourceStatus.Canceled; + } + } + + /// Throws the exception that caused the to fail. If it completed successfully, nothing is thrown. + [MethodImpl(MethodImplOptions.AggressiveInlining)] + [StackTraceHidden] + internal void ThrowIfCompletedUnsuccessfully() + { + object obj = _obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); + + if (obj != null) + { + if (obj is Task t) + { +#if netstandard + t.GetAwaiter().GetResult(); +#else + TaskAwaiter.ValidateEnd(t); +#endif + } + else + { + Unsafe.As(obj).GetResult(_token); + } + } + } + + /// Gets an awaiter for this . + public ValueTaskAwaiter GetAwaiter() => new ValueTaskAwaiter(this); + + /// Configures an awaiter for this . + /// + /// true to attempt to marshal the continuation back to the captured context; otherwise, false. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public ConfiguredValueTaskAwaitable ConfigureAwait(bool continueOnCapturedContext) => + new ConfiguredValueTaskAwaitable(new ValueTask(_obj, _token, continueOnCapturedContext)); + } + + /// Provides a value type that can represent a synchronously available value or a task object. + /// Specifies the type of the result. + /// + /// s are meant to be directly awaited. To do more complicated operations with them, a + /// should be extracted using or . Such operations might include caching an instance to + /// be awaited later, registering multiple continuations with a single operation, awaiting the same task multiple times, and using + /// combinators over multiple operations. /// [AsyncMethodBuilder(typeof(AsyncValueTaskMethodBuilder<>))] [StructLayout(LayoutKind.Auto)] public readonly struct ValueTask : IEquatable> { - /// The task to be used if the operation completed asynchronously or if it completed synchronously but non-successfully. - internal readonly Task _task; + /// A task canceled using `new CancellationToken(true)`. Lazily created only when first needed. + private static Task s_canceledTask; + /// null if has the result, otherwise a or a . + internal readonly object _obj; /// The result to be used if the operation completed successfully synchronously. internal readonly TResult _result; + /// Opaque value passed through to the . + internal readonly short _token; + /// true to continue on the captured context; otherwise, false. + /// Stored in the rather than in the configured awaiter to utilize otherwise padding space. + internal readonly bool _continueOnCapturedContext; - /// Initialize the with the result of the successful operation. + // An instance created with the default ctor (a zero init'd struct) represents a synchronously, successfully completed operation + // with a result of default(TResult). + + /// Initialize the with a result value. /// The result. + [MethodImpl(MethodImplOptions.AggressiveInlining)] public ValueTask(TResult result) { - _task = null; _result = result; + + _obj = null; + _continueOnCapturedContext = true; + _token = 0; } - /// - /// Initialize the with a that represents the operation. - /// + /// Initialize the with a that represents the operation. /// The task. + [MethodImpl(MethodImplOptions.AggressiveInlining)] public ValueTask(Task task) { if (task == null) @@ -76,103 +458,396 @@ namespace System.Threading.Tasks ThrowHelper.ThrowArgumentNullException(ExceptionArgument.task); } - _task = task; - _result = default(TResult); + _obj = task; + + _result = default; + _continueOnCapturedContext = true; + _token = 0; } + /// Initialize the with a object that represents the operation. + /// The source. + /// Opaque value passed through to the . + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public ValueTask(IValueTaskSource source, short token) + { + if (source == null) + { + ThrowHelper.ThrowArgumentNullException(ExceptionArgument.source); + } + + _obj = source; + _token = token; + + _result = default; + _continueOnCapturedContext = true; + } + + /// Non-verified initialization of the struct to the specified values. + /// The object. + /// The result. + /// The token. + /// true to continue on captured context; otherwise, false. + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private ValueTask(object obj, TResult result, short token, bool continueOnCapturedContext) + { + _obj = obj; + _result = result; + _token = token; + _continueOnCapturedContext = continueOnCapturedContext; + } + + /// Returns the hash code for this instance. public override int GetHashCode() => - _task != null ? _task.GetHashCode() : + _obj != null ? _obj.GetHashCode() : _result != null ? _result.GetHashCode() : 0; /// Returns a value indicating whether this value is equal to a specified . public override bool Equals(object obj) => - obj is ValueTask && + obj is ValueTask && Equals((ValueTask)obj); /// Returns a value indicating whether this value is equal to a specified value. public bool Equals(ValueTask other) => - _task != null || other._task != null ? - _task == other._task : + _obj != null || other._obj != null ? + _obj == other._obj && _token == other._token : EqualityComparer.Default.Equals(_result, other._result); /// Returns a value indicating whether two values are equal. - public static bool operator==(ValueTask left, ValueTask right) => + public static bool operator ==(ValueTask left, ValueTask right) => left.Equals(right); /// Returns a value indicating whether two values are not equal. - public static bool operator!=(ValueTask left, ValueTask right) => + public static bool operator !=(ValueTask left, ValueTask right) => !left.Equals(right); /// - /// Gets a object to represent this ValueTask. It will - /// either return the wrapped task object if one exists, or it'll manufacture a new - /// task object to represent the result. + /// Gets a object to represent this ValueTask. /// - public Task AsTask() => - // Return the task if we were constructed from one, otherwise manufacture one. We don't - // cache the generated task into _task as it would end up changing both equality comparison - // and the hash code we generate in GetHashCode. - _task ?? AsyncTaskMethodBuilder.GetTaskForResult(_result); + /// + /// It will either return the wrapped task object if one exists, or it'll + /// manufacture a new task object to represent the result. + /// + public Task AsTask() + { + object obj = _obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); - internal Task AsTaskExpectNonNull() => - // Return the task if we were constructed from one, otherwise manufacture one. - // Unlike AsTask(), this method is called only when we expect _task to be non-null, - // and thus we don't want GetTaskForResult inlined. - _task ?? GetTaskForResultNoInlining(); + if (obj == null) + { + return +#if netstandard + Task.FromResult(_result); +#else + AsyncTaskMethodBuilder.GetTaskForResult(_result); +#endif + } - [MethodImpl(MethodImplOptions.NoInlining)] - private Task GetTaskForResultNoInlining() => AsyncTaskMethodBuilder.GetTaskForResult(_result); + if (obj is Task t) + { + return t; + } + + return GetTaskForValueTaskSource(Unsafe.As>(obj)); + } + + /// Gets a that may be used at any point in the future. + public ValueTask Preserve() => _obj == null ? this : new ValueTask(AsTask()); + + /// Creates a to represent the . + /// + /// The is passed in rather than reading and casting + /// so that the caller can pass in an object it's already validated. + /// + private Task GetTaskForValueTaskSource(IValueTaskSource t) + { + ValueTaskSourceStatus status = t.GetStatus(_token); + if (status != ValueTaskSourceStatus.Pending) + { + try + { + // Get the result of the operation and return a task for it. + // If any exception occurred, propagate it + return +#if netstandard + Task.FromResult(t.GetResult(_token)); +#else + AsyncTaskMethodBuilder.GetTaskForResult(t.GetResult(_token)); +#endif + + // If status is Faulted or Canceled, GetResult should throw. But + // we can't guarantee every implementation will do the "right thing". + // If it doesn't throw, we just treat that as success and ignore + // the status. + } + catch (Exception exc) + { + if (status == ValueTaskSourceStatus.Canceled) + { +#if !netstandard + if (exc is OperationCanceledException oce) + { + var task = new Task(); + task.TrySetCanceled(oce.CancellationToken, oce); + return task; + } +#endif + + Task canceledTask = s_canceledTask; + if (canceledTask == null) + { +#if netstandard + var tcs = new TaskCompletionSource(); + tcs.TrySetCanceled(); + canceledTask = tcs.Task; +#else + canceledTask = Task.FromCanceled(new CancellationToken(true)); +#endif + // Benign race condition to initialize cached task, as identity doesn't matter. + s_canceledTask = canceledTask; + } + return canceledTask; + } + else + { +#if netstandard + var tcs = new TaskCompletionSource(); + tcs.TrySetException(exc); + return tcs.Task; +#else + return Task.FromException(exc); +#endif + } + } + } + + var m = new ValueTaskSourceAsTask(t, _token); + return +#if netstandard + m.Task; +#else + m; +#endif + } + + /// Type used to create a to represent a . + private sealed class ValueTaskSourceAsTask : +#if netstandard + TaskCompletionSource +#else + Task +#endif + { + private static readonly Action s_completionAction = state => + { + if (!(state is ValueTaskSourceAsTask vtst) || + !(vtst._source is IValueTaskSource source)) + { + // This could only happen if the IValueTaskSource passed the wrong state + // or if this callback were invoked multiple times such that the state + // was previously nulled out. + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.state); + return; + } + + vtst._source = null; + ValueTaskSourceStatus status = source.GetStatus(vtst._token); + try + { + vtst.TrySetResult(source.GetResult(vtst._token)); + } + catch (Exception exc) + { + if (status == ValueTaskSourceStatus.Canceled) + { +#if netstandard + vtst.TrySetCanceled(); +#else + if (exc is OperationCanceledException oce) + { + vtst.TrySetCanceled(oce.CancellationToken, oce); + } + else + { + vtst.TrySetCanceled(new CancellationToken(true)); + } +#endif + } + else + { + vtst.TrySetException(exc); + } + } + }; + + /// The associated . + private IValueTaskSource _source; + /// The token to pass through to operations on + private readonly short _token; + + public ValueTaskSourceAsTask(IValueTaskSource source, short token) + { + _source = source; + _token = token; + source.OnCompleted(s_completionAction, this, token, ValueTaskSourceOnCompletedFlags.None); + } + } /// Gets whether the represents a completed operation. - public bool IsCompleted => _task == null || _task.IsCompleted; + public bool IsCompleted + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + get + { + object obj = _obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); + + if (obj == null) + { + return true; + } + + if (obj is Task t) + { + return t.IsCompleted; + } + + return Unsafe.As>(obj).GetStatus(_token) != ValueTaskSourceStatus.Pending; + } + } /// Gets whether the represents a successfully completed operation. - public bool IsCompletedSuccessfully => _task == null || _task.IsCompletedSuccessfully; + public bool IsCompletedSuccessfully + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + get + { + object obj = _obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); + + if (obj == null) + { + return true; + } + + if (obj is Task t) + { + return +#if netstandard + t.Status == TaskStatus.RanToCompletion; +#else + t.IsCompletedSuccessfully; +#endif + } + + return Unsafe.As>(obj).GetStatus(_token) == ValueTaskSourceStatus.Succeeded; + } + } /// Gets whether the represents a failed operation. - public bool IsFaulted => _task != null && _task.IsFaulted; + public bool IsFaulted + { + get + { + object obj = _obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); + + if (obj == null) + { + return false; + } + + if (obj is Task t) + { + return t.IsFaulted; + } + + return Unsafe.As>(obj).GetStatus(_token) == ValueTaskSourceStatus.Faulted; + } + } /// Gets whether the represents a canceled operation. - public bool IsCanceled => _task != null && _task.IsCanceled; + /// + /// If the is backed by a result or by a , + /// this will always return false. If it's backed by a , it'll return the + /// value of the task's property. + /// + public bool IsCanceled + { + get + { + object obj = _obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); + + if (obj == null) + { + return false; + } + + if (obj is Task t) + { + return t.IsCanceled; + } + + return Unsafe.As>(obj).GetStatus(_token) == ValueTaskSourceStatus.Canceled; + } + } /// Gets the result. - public TResult Result => _task == null ? _result : _task.GetAwaiter().GetResult(); + public TResult Result + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + get + { + object obj = _obj; + Debug.Assert(obj == null || obj is Task || obj is IValueTaskSource); - /// Gets an awaiter for this value. + if (obj == null) + { + return _result; + } + + if (obj is Task t) + { +#if netstandard + return t.GetAwaiter().GetResult(); +#else + TaskAwaiter.ValidateEnd(t); + return t.ResultOnSuccess; +#endif + } + + return Unsafe.As>(obj).GetResult(_token); + } + } + + /// Gets an awaiter for this . + [MethodImpl(MethodImplOptions.AggressiveInlining)] public ValueTaskAwaiter GetAwaiter() => new ValueTaskAwaiter(this); - /// Configures an awaiter for this value. + /// Configures an awaiter for this . /// /// true to attempt to marshal the continuation back to the captured context; otherwise, false. /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] public ConfiguredValueTaskAwaitable ConfigureAwait(bool continueOnCapturedContext) => - new ConfiguredValueTaskAwaitable(this, continueOnCapturedContext); + new ConfiguredValueTaskAwaitable(new ValueTask(_obj, _result, _token, continueOnCapturedContext)); /// Gets a string-representation of this . public override string ToString() { - if (_task != null) + if (IsCompletedSuccessfully) { - return _task.IsCompletedSuccessfully && _task.Result != null ? - _task.Result.ToString() : - string.Empty; - } - else - { - return _result != null ? - _result.ToString() : - string.Empty; + TResult result = Result; + if (result != null) + { + return result.ToString(); + } } + + return string.Empty; } - - // TODO https://github.com/dotnet/corefx/issues/22171: - // Remove CreateAsyncMethodBuilder once the C# compiler relies on the AsyncBuilder attribute. - - /// Creates a method builder for use with an async method. - /// The created builder. - [EditorBrowsable(EditorBrowsableState.Never)] // intended only for compiler consumption - public static AsyncValueTaskMethodBuilder CreateAsyncMethodBuilder() => AsyncValueTaskMethodBuilder.Create(); } } diff --git a/external/corefx/src/Common/src/CoreLib/System/Threading/ThreadAbortException.cs b/external/corefx/src/Common/src/CoreLib/System/Threading/ThreadAbortException.cs index 360e84d256..822eb9e47e 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Threading/ThreadAbortException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Threading/ThreadAbortException.cs @@ -19,7 +19,9 @@ using System.Runtime.Serialization; namespace System.Threading { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public sealed class ThreadAbortException : SystemException { internal ThreadAbortException() diff --git a/external/corefx/src/Common/src/CoreLib/System/Threading/ThreadStateException.cs b/external/corefx/src/Common/src/CoreLib/System/Threading/ThreadStateException.cs index 6fc06a8516..778d425908 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Threading/ThreadStateException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Threading/ThreadStateException.cs @@ -17,7 +17,9 @@ using System.Runtime.Serialization; namespace System.Threading { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class ThreadStateException : SystemException { public ThreadStateException() diff --git a/external/corefx/src/Common/src/CoreLib/System/Threading/WaitHandleCannotBeOpenedException.cs b/external/corefx/src/Common/src/CoreLib/System/Threading/WaitHandleCannotBeOpenedException.cs index e60e46d2be..a67a6a5f60 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Threading/WaitHandleCannotBeOpenedException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Threading/WaitHandleCannotBeOpenedException.cs @@ -7,7 +7,9 @@ using System.Runtime.Serialization; namespace System.Threading { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class WaitHandleCannotBeOpenedException : ApplicationException { public WaitHandleCannotBeOpenedException() : base(SR.Threading_WaitHandleCannotBeOpenedException) diff --git a/external/corefx/src/Common/src/CoreLib/System/TimeZoneInfo.Unix.cs b/external/corefx/src/Common/src/CoreLib/System/TimeZoneInfo.Unix.cs new file mode 100644 index 0000000000..cc386a111f --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/TimeZoneInfo.Unix.cs @@ -0,0 +1,1633 @@ +// 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.Collections.Generic; +using System.Diagnostics; +using System.Globalization; +using System.IO; +using System.Text; +using System.Threading; +using System.Security; + +using Internal.IO; + +namespace System +{ + public sealed partial class TimeZoneInfo + { + private const string DefaultTimeZoneDirectory = "/usr/share/zoneinfo/"; + private const string ZoneTabFileName = "zone.tab"; + private const string TimeZoneEnvironmentVariable = "TZ"; + private const string TimeZoneDirectoryEnvironmentVariable = "TZDIR"; + + private TimeZoneInfo(byte[] data, string id, bool dstDisabled) + { + TZifHead t; + DateTime[] dts; + byte[] typeOfLocalTime; + TZifType[] transitionType; + string zoneAbbreviations; + bool[] StandardTime; + bool[] GmtTime; + string futureTransitionsPosixFormat; + + // parse the raw TZif bytes; this method can throw ArgumentException when the data is malformed. + TZif_ParseRaw(data, out t, out dts, out typeOfLocalTime, out transitionType, out zoneAbbreviations, out StandardTime, out GmtTime, out futureTransitionsPosixFormat); + + _id = id; + _displayName = LocalId; + _baseUtcOffset = TimeSpan.Zero; + + // find the best matching baseUtcOffset and display strings based on the current utcNow value. + // NOTE: read the display strings from the tzfile now in case they can't be loaded later + // from the globalization data. + DateTime utcNow = DateTime.UtcNow; + for (int i = 0; i < dts.Length && dts[i] <= utcNow; i++) + { + int type = typeOfLocalTime[i]; + if (!transitionType[type].IsDst) + { + _baseUtcOffset = transitionType[type].UtcOffset; + _standardDisplayName = TZif_GetZoneAbbreviation(zoneAbbreviations, transitionType[type].AbbreviationIndex); + } + else + { + _daylightDisplayName = TZif_GetZoneAbbreviation(zoneAbbreviations, transitionType[type].AbbreviationIndex); + } + } + + if (dts.Length == 0) + { + // time zones like Africa/Bujumbura and Etc/GMT* have no transition times but still contain + // TZifType entries that may contain a baseUtcOffset and display strings + for (int i = 0; i < transitionType.Length; i++) + { + if (!transitionType[i].IsDst) + { + _baseUtcOffset = transitionType[i].UtcOffset; + _standardDisplayName = TZif_GetZoneAbbreviation(zoneAbbreviations, transitionType[i].AbbreviationIndex); + } + else + { + _daylightDisplayName = TZif_GetZoneAbbreviation(zoneAbbreviations, transitionType[i].AbbreviationIndex); + } + } + } + _displayName = _standardDisplayName; + + GetDisplayName(Interop.Globalization.TimeZoneDisplayNameType.Generic, ref _displayName); + GetDisplayName(Interop.Globalization.TimeZoneDisplayNameType.Standard, ref _standardDisplayName); + GetDisplayName(Interop.Globalization.TimeZoneDisplayNameType.DaylightSavings, ref _daylightDisplayName); + + // TZif supports seconds-level granularity with offsets but TimeZoneInfo only supports minutes since it aligns + // with DateTimeOffset, SQL Server, and the W3C XML Specification + if (_baseUtcOffset.Ticks % TimeSpan.TicksPerMinute != 0) + { + _baseUtcOffset = new TimeSpan(_baseUtcOffset.Hours, _baseUtcOffset.Minutes, 0); + } + + if (!dstDisabled) + { + // only create the adjustment rule if DST is enabled + TZif_GenerateAdjustmentRules(out _adjustmentRules, _baseUtcOffset, dts, typeOfLocalTime, transitionType, StandardTime, GmtTime, futureTransitionsPosixFormat); + } + + ValidateTimeZoneInfo(_id, _baseUtcOffset, _adjustmentRules, out _supportsDaylightSavingTime); + } + + private void GetDisplayName(Interop.Globalization.TimeZoneDisplayNameType nameType, ref string displayName) + { + if (GlobalizationMode.Invariant) + { + displayName = _standardDisplayName; + return; + } + + string timeZoneDisplayName; + bool result = Interop.CallStringMethod( + (locale, id, type, stringBuilder) => Interop.Globalization.GetTimeZoneDisplayName( + locale, + id, + type, + stringBuilder, + stringBuilder.Capacity), + CultureInfo.CurrentUICulture.Name, + _id, + nameType, + out timeZoneDisplayName); + + // If there is an unknown error, don't set the displayName field. + // It will be set to the abbreviation that was read out of the tzfile. + if (result) + { + displayName = timeZoneDisplayName; + } + } + + /// + /// Returns a cloned array of AdjustmentRule objects + /// + public AdjustmentRule[] GetAdjustmentRules() + { + if (_adjustmentRules == null) + { + return Array.Empty(); + } + + // The rules we use in Unix care mostly about the start and end dates but don't fill the transition start and end info. + // as the rules now is public, we should fill it properly so the caller doesn't have to know how we use it internally + // and can use it as it is used in Windows + + AdjustmentRule[] rules = new AdjustmentRule[_adjustmentRules.Length]; + + for (int i = 0; i < _adjustmentRules.Length; i++) + { + var rule = _adjustmentRules[i]; + var start = rule.DateStart.Kind == DateTimeKind.Utc ? + // At the daylight start we didn't start the daylight saving yet then we convert to Local time + // by adding the _baseUtcOffset to the UTC time + new DateTime(rule.DateStart.Ticks + _baseUtcOffset.Ticks, DateTimeKind.Unspecified) : + rule.DateStart; + var end = rule.DateEnd.Kind == DateTimeKind.Utc ? + // At the daylight saving end, the UTC time is mapped to local time which is already shifted by the daylight delta + // we calculate the local time by adding _baseUtcOffset + DaylightDelta to the UTC time + new DateTime(rule.DateEnd.Ticks + _baseUtcOffset.Ticks + rule.DaylightDelta.Ticks, DateTimeKind.Unspecified) : + rule.DateEnd; + + var startTransition = TimeZoneInfo.TransitionTime.CreateFixedDateRule(new DateTime(1, 1, 1, start.Hour, start.Minute, start.Second), start.Month, start.Day); + var endTransition = TimeZoneInfo.TransitionTime.CreateFixedDateRule(new DateTime(1, 1, 1, end.Hour, end.Minute, end.Second), end.Month, end.Day); + + rules[i] = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(start.Date, end.Date, rule.DaylightDelta, startTransition, endTransition); + } + + return rules; + } + + private static void PopulateAllSystemTimeZones(CachedData cachedData) + { + Debug.Assert(Monitor.IsEntered(cachedData)); + + string timeZoneDirectory = GetTimeZoneDirectory(); + foreach (string timeZoneId in GetTimeZoneIds(timeZoneDirectory)) + { + TimeZoneInfo value; + Exception ex; + TryGetTimeZone(timeZoneId, false, out value, out ex, cachedData, alwaysFallbackToLocalMachine: true); // populate the cache + } + } + + /// + /// Helper function for retrieving the local system time zone. + /// May throw COMException, TimeZoneNotFoundException, InvalidTimeZoneException. + /// Assumes cachedData lock is taken. + /// + /// A new TimeZoneInfo instance. + private static TimeZoneInfo GetLocalTimeZone(CachedData cachedData) + { + Debug.Assert(Monitor.IsEntered(cachedData)); + + // Without Registry support, create the TimeZoneInfo from a TZ file + return GetLocalTimeZoneFromTzFile(); + } + + private static TimeZoneInfoResult TryGetTimeZoneFromLocalMachine(string id, out TimeZoneInfo value, out Exception e) + { + value = null; + e = null; + + string timeZoneDirectory = GetTimeZoneDirectory(); + string timeZoneFilePath = Path.Combine(timeZoneDirectory, id); + byte[] rawData; + try + { + rawData = File.ReadAllBytes(timeZoneFilePath); + } + catch (UnauthorizedAccessException ex) + { + e = ex; + return TimeZoneInfoResult.SecurityException; + } + catch (FileNotFoundException ex) + { + e = ex; + return TimeZoneInfoResult.TimeZoneNotFoundException; + } + catch (DirectoryNotFoundException ex) + { + e = ex; + return TimeZoneInfoResult.TimeZoneNotFoundException; + } + catch (IOException ex) + { + e = new InvalidTimeZoneException(SR.Format(SR.InvalidTimeZone_InvalidFileData, id, timeZoneFilePath), ex); + return TimeZoneInfoResult.InvalidTimeZoneException; + } + + value = GetTimeZoneFromTzData(rawData, id); + + if (value == null) + { + e = new InvalidTimeZoneException(SR.Format(SR.InvalidTimeZone_InvalidFileData, id, timeZoneFilePath)); + return TimeZoneInfoResult.InvalidTimeZoneException; + } + + return TimeZoneInfoResult.Success; + } + + /// + /// Returns a collection of TimeZone Id values from the zone.tab file in the timeZoneDirectory. + /// + /// + /// Lines that start with # are comments and are skipped. + /// + private static List GetTimeZoneIds(string timeZoneDirectory) + { + List timeZoneIds = new List(); + + try + { + using (StreamReader sr = new StreamReader(Path.Combine(timeZoneDirectory, ZoneTabFileName), Encoding.UTF8)) + { + string zoneTabFileLine; + while ((zoneTabFileLine = sr.ReadLine()) != null) + { + if (!string.IsNullOrEmpty(zoneTabFileLine) && zoneTabFileLine[0] != '#') + { + // the format of the line is "country-code \t coordinates \t TimeZone Id \t comments" + + int firstTabIndex = zoneTabFileLine.IndexOf('\t'); + if (firstTabIndex != -1) + { + int secondTabIndex = zoneTabFileLine.IndexOf('\t', firstTabIndex + 1); + if (secondTabIndex != -1) + { + string timeZoneId; + int startIndex = secondTabIndex + 1; + int thirdTabIndex = zoneTabFileLine.IndexOf('\t', startIndex); + if (thirdTabIndex != -1) + { + int length = thirdTabIndex - startIndex; + timeZoneId = zoneTabFileLine.Substring(startIndex, length); + } + else + { + timeZoneId = zoneTabFileLine.Substring(startIndex); + } + + if (!string.IsNullOrEmpty(timeZoneId)) + { + timeZoneIds.Add(timeZoneId); + } + } + } + } + } + } + } + catch (IOException) { } + catch (UnauthorizedAccessException) { } + + return timeZoneIds; + } + + /// + /// Gets the tzfile raw data for the current 'local' time zone using the following rules. + /// 1. Read the TZ environment variable. If it is set, use it. + /// 2. Look for the data in /etc/localtime. + /// 3. Look for the data in GetTimeZoneDirectory()/localtime. + /// 4. Use UTC if all else fails. + /// + private static bool TryGetLocalTzFile(out byte[] rawData, out string id) + { + rawData = null; + id = null; + string tzVariable = GetTzEnvironmentVariable(); + + // If the env var is null, use the localtime file + if (tzVariable == null) + { + return + TryLoadTzFile("/etc/localtime", ref rawData, ref id) || + TryLoadTzFile(Path.Combine(GetTimeZoneDirectory(), "localtime"), ref rawData, ref id); + } + + // If it's empty, use UTC (TryGetLocalTzFile() should return false). + if (tzVariable.Length == 0) + { + return false; + } + + // Otherwise, use the path from the env var. If it's not absolute, make it relative + // to the system timezone directory + string tzFilePath; + if (tzVariable[0] != '/') + { + id = tzVariable; + tzFilePath = Path.Combine(GetTimeZoneDirectory(), tzVariable); + } + else + { + tzFilePath = tzVariable; + } + return TryLoadTzFile(tzFilePath, ref rawData, ref id); + } + + private static string GetTzEnvironmentVariable() + { + string result = Environment.GetEnvironmentVariable(TimeZoneEnvironmentVariable); + if (!string.IsNullOrEmpty(result)) + { + if (result[0] == ':') + { + // strip off the ':' prefix + result = result.Substring(1); + } + } + + return result; + } + + private static bool TryLoadTzFile(string tzFilePath, ref byte[] rawData, ref string id) + { + if (File.Exists(tzFilePath)) + { + try + { + rawData = File.ReadAllBytes(tzFilePath); + if (string.IsNullOrEmpty(id)) + { + id = FindTimeZoneIdUsingReadLink(tzFilePath); + + if (string.IsNullOrEmpty(id)) + { + id = FindTimeZoneId(rawData); + } + } + return true; + } + catch (IOException) { } + catch (SecurityException) { } + catch (UnauthorizedAccessException) { } + } + return false; + } + + /// + /// Finds the time zone id by using 'readlink' on the path to see if tzFilePath is + /// a symlink to a file. + /// + private static string FindTimeZoneIdUsingReadLink(string tzFilePath) + { + string id = null; + + string symlinkPath = Interop.Sys.ReadLink(tzFilePath); + if (symlinkPath != null) + { + // Use Path.Combine to resolve links that contain a relative path (e.g. /etc/localtime). + symlinkPath = Path.Combine(tzFilePath, symlinkPath); + + string timeZoneDirectory = GetTimeZoneDirectory(); + if (symlinkPath.StartsWith(timeZoneDirectory, StringComparison.Ordinal)) + { + id = symlinkPath.Substring(timeZoneDirectory.Length); + } + } + + return id; + } + + /// + /// Enumerate files + /// + private static IEnumerable EnumerateFilesRecursively(string path) + { + List toExplore = null; // List used as a stack + + string currentPath = path; + for(;;) + { + using (Microsoft.Win32.SafeHandles.SafeDirectoryHandle dirHandle = Interop.Sys.OpenDir(currentPath)) + { + if (dirHandle.IsInvalid) + { + throw Interop.GetExceptionForIoErrno(Interop.Sys.GetLastErrorInfo(), currentPath, isDirectory: true); + } + + // Read each entry from the enumerator + Interop.Sys.DirectoryEntry dirent; + while (Interop.Sys.ReadDir(dirHandle, out dirent) == 0) + { + if (dirent.InodeName == "." || dirent.InodeName == "..") + continue; + + string fullPath = Path.Combine(currentPath, dirent.InodeName); + + // Get from the dir entry whether the entry is a file or directory. + // We classify everything as a file unless we know it to be a directory. + bool isDir; + if (dirent.InodeType == Interop.Sys.NodeType.DT_DIR) + { + // We know it's a directory. + isDir = true; + } + else if (dirent.InodeType == Interop.Sys.NodeType.DT_LNK || dirent.InodeType == Interop.Sys.NodeType.DT_UNKNOWN) + { + // It's a symlink or unknown: stat to it to see if we can resolve it to a directory. + // If we can't (e.g. symlink to a file, broken symlink, etc.), we'll just treat it as a file. + + Interop.Sys.FileStatus fileinfo; + if (Interop.Sys.Stat(fullPath, out fileinfo) >= 0) + { + isDir = (fileinfo.Mode & Interop.Sys.FileTypes.S_IFMT) == Interop.Sys.FileTypes.S_IFDIR; + } + else + { + isDir = false; + } + } + else + { + // Otherwise, treat it as a file. This includes regular files, FIFOs, etc. + isDir = false; + } + + // Yield the result if the user has asked for it. In the case of directories, + // always explore it by pushing it onto the stack, regardless of whether + // we're returning directories. + if (isDir) + { + if (toExplore == null) + { + toExplore = new List(); + } + toExplore.Add(fullPath); + } + else + { + yield return fullPath; + } + } + } + + if (toExplore == null || toExplore.Count == 0) + break; + + currentPath = toExplore[toExplore.Count - 1]; + toExplore.RemoveAt(toExplore.Count - 1); + } + } + + /// + /// Find the time zone id by searching all the tzfiles for the one that matches rawData + /// and return its file name. + /// + private static string FindTimeZoneId(byte[] rawData) + { + // default to "Local" if we can't find the right tzfile + string id = LocalId; + string timeZoneDirectory = GetTimeZoneDirectory(); + string localtimeFilePath = Path.Combine(timeZoneDirectory, "localtime"); + string posixrulesFilePath = Path.Combine(timeZoneDirectory, "posixrules"); + byte[] buffer = new byte[rawData.Length]; + + try + { + foreach (string filePath in EnumerateFilesRecursively(timeZoneDirectory)) + { + // skip the localtime and posixrules file, since they won't give us the correct id + if (!string.Equals(filePath, localtimeFilePath, StringComparison.OrdinalIgnoreCase) + && !string.Equals(filePath, posixrulesFilePath, StringComparison.OrdinalIgnoreCase)) + { + if (CompareTimeZoneFile(filePath, buffer, rawData)) + { + // if all bytes are the same, this must be the right tz file + id = filePath; + + // strip off the root time zone directory + if (id.StartsWith(timeZoneDirectory, StringComparison.Ordinal)) + { + id = id.Substring(timeZoneDirectory.Length); + } + break; + } + } + } + } + catch (IOException) { } + catch (SecurityException) { } + catch (UnauthorizedAccessException) { } + + return id; + } + + private static bool CompareTimeZoneFile(string filePath, byte[] buffer, byte[] rawData) + { + try + { + // bufferSize == 1 used to avoid unnecessary buffer in FileStream + using (FileStream stream = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read, bufferSize: 1)) + { + if (stream.Length == rawData.Length) + { + int index = 0; + int count = rawData.Length; + + while (count > 0) + { + int n = stream.Read(buffer, index, count); + if (n == 0) + throw Error.GetEndOfFile(); + + int end = index + n; + for (; index < end; index++) + { + if (buffer[index] != rawData[index]) + { + return false; + } + } + + count -= n; + } + + return true; + } + } + } + catch (IOException) { } + catch (SecurityException) { } + catch (UnauthorizedAccessException) { } + + return false; + } + + /// + /// Helper function used by 'GetLocalTimeZone()' - this function wraps the call + /// for loading time zone data from computers without Registry support. + /// + /// The TryGetLocalTzFile() call returns a Byte[] containing the compiled tzfile. + /// + private static TimeZoneInfo GetLocalTimeZoneFromTzFile() + { + byte[] rawData; + string id; + if (TryGetLocalTzFile(out rawData, out id)) + { + TimeZoneInfo result = GetTimeZoneFromTzData(rawData, id); + if (result != null) + { + return result; + } + } + + // if we can't find a local time zone, return UTC + return Utc; + } + + private static TimeZoneInfo GetTimeZoneFromTzData(byte[] rawData, string id) + { + if (rawData != null) + { + try + { + return new TimeZoneInfo(rawData, id, dstDisabled: false); // create a TimeZoneInfo instance from the TZif data w/ DST support + } + catch (ArgumentException) { } + catch (InvalidTimeZoneException) { } + try + { + return new TimeZoneInfo(rawData, id, dstDisabled: true); // create a TimeZoneInfo instance from the TZif data w/o DST support + } + catch (ArgumentException) { } + catch (InvalidTimeZoneException) { } + } + + return null; + } + + private static string GetTimeZoneDirectory() + { + string tzDirectory = Environment.GetEnvironmentVariable(TimeZoneDirectoryEnvironmentVariable); + + if (tzDirectory == null) + { + tzDirectory = DefaultTimeZoneDirectory; + } + else if (!tzDirectory.EndsWith(Path.DirectorySeparatorChar)) + { + tzDirectory += Path.DirectorySeparatorChar; + } + + return tzDirectory; + } + + /// + /// Helper function for retrieving a TimeZoneInfo object by . + /// This function wraps the logic necessary to keep the private + /// SystemTimeZones cache in working order + /// + /// This function will either return a valid TimeZoneInfo instance or + /// it will throw 'InvalidTimeZoneException' / 'TimeZoneNotFoundException'. + /// + public static TimeZoneInfo FindSystemTimeZoneById(string id) + { + // Special case for Utc as it will not exist in the dictionary with the rest + // of the system time zones. There is no need to do this check for Local.Id + // since Local is a real time zone that exists in the dictionary cache + if (string.Equals(id, UtcId, StringComparison.OrdinalIgnoreCase)) + { + return Utc; + } + + if (id == null) + { + throw new ArgumentNullException(nameof(id)); + } + else if (id.Length == 0 || id.Contains('\0')) + { + throw new TimeZoneNotFoundException(SR.Format(SR.TimeZoneNotFound_MissingData, id)); + } + + TimeZoneInfo value; + Exception e; + + TimeZoneInfoResult result; + + CachedData cachedData = s_cachedData; + + lock (cachedData) + { + result = TryGetTimeZone(id, false, out value, out e, cachedData, alwaysFallbackToLocalMachine: true); + } + + if (result == TimeZoneInfoResult.Success) + { + return value; + } + else if (result == TimeZoneInfoResult.InvalidTimeZoneException) + { + Debug.Assert(e is InvalidTimeZoneException, + "TryGetTimeZone must create an InvalidTimeZoneException when it returns TimeZoneInfoResult.InvalidTimeZoneException"); + throw e; + } + else if (result == TimeZoneInfoResult.SecurityException) + { + throw new SecurityException(SR.Format(SR.Security_CannotReadFileData, id), e); + } + else + { + throw new TimeZoneNotFoundException(SR.Format(SR.TimeZoneNotFound_MissingData, id), e); + } + } + + // DateTime.Now fast path that avoids allocating an historically accurate TimeZoneInfo.Local and just creates a 1-year (current year) accurate time zone + internal static TimeSpan GetDateTimeNowUtcOffsetFromUtc(DateTime time, out bool isAmbiguousLocalDst) + { + bool isDaylightSavings; + // Use the standard code path for Unix since there isn't a faster way of handling current-year-only time zones + return GetUtcOffsetFromUtc(time, Local, out isDaylightSavings, out isAmbiguousLocalDst); + } + + // TZFILE(5) BSD File Formats Manual TZFILE(5) + // + // NAME + // tzfile -- timezone information + // + // SYNOPSIS + // #include "/usr/src/lib/libc/stdtime/tzfile.h" + // + // DESCRIPTION + // The time zone information files used by tzset(3) begin with the magic + // characters ``TZif'' to identify them as time zone information files, fol- + // lowed by sixteen bytes reserved for future use, followed by four four- + // byte values written in a ``standard'' byte order (the high-order byte of + // the value is written first). These values are, in order: + // + // tzh_ttisgmtcnt The number of UTC/local indicators stored in the file. + // tzh_ttisstdcnt The number of standard/wall indicators stored in the + // file. + // tzh_leapcnt The number of leap seconds for which data is stored in + // the file. + // tzh_timecnt The number of ``transition times'' for which data is + // stored in the file. + // tzh_typecnt The number of ``local time types'' for which data is + // stored in the file (must not be zero). + // tzh_charcnt The number of characters of ``time zone abbreviation + // strings'' stored in the file. + // + // The above header is followed by tzh_timecnt four-byte values of type + // long, sorted in ascending order. These values are written in ``stan- + // dard'' byte order. Each is used as a transition time (as returned by + // time(3)) at which the rules for computing local time change. Next come + // tzh_timecnt one-byte values of type unsigned char; each one tells which + // of the different types of ``local time'' types described in the file is + // associated with the same-indexed transition time. These values serve as + // indices into an array of ttinfo structures that appears next in the file; + // these structures are defined as follows: + // + // struct ttinfo { + // long tt_gmtoff; + // int tt_isdst; + // unsigned int tt_abbrind; + // }; + // + // Each structure is written as a four-byte value for tt_gmtoff of type + // long, in a standard byte order, followed by a one-byte value for tt_isdst + // and a one-byte value for tt_abbrind. In each structure, tt_gmtoff gives + // the number of seconds to be added to UTC, tt_isdst tells whether tm_isdst + // should be set by localtime(3) and tt_abbrind serves as an index into the + // array of time zone abbreviation characters that follow the ttinfo struc- + // ture(s) in the file. + // + // Then there are tzh_leapcnt pairs of four-byte values, written in standard + // byte order; the first value of each pair gives the time (as returned by + // time(3)) at which a leap second occurs; the second gives the total number + // of leap seconds to be applied after the given time. The pairs of values + // are sorted in ascending order by time.b + // + // Then there are tzh_ttisstdcnt standard/wall indicators, each stored as a + // one-byte value; they tell whether the transition times associated with + // local time types were specified as standard time or wall clock time, and + // are used when a time zone file is used in handling POSIX-style time zone + // environment variables. + // + // Finally there are tzh_ttisgmtcnt UTC/local indicators, each stored as a + // one-byte value; they tell whether the transition times associated with + // local time types were specified as UTC or local time, and are used when a + // time zone file is used in handling POSIX-style time zone environment + // variables. + // + // localtime uses the first standard-time ttinfo structure in the file (or + // simply the first ttinfo structure in the absence of a standard-time + // structure) if either tzh_timecnt is zero or the time argument is less + // than the first transition time recorded in the file. + // + // SEE ALSO + // ctime(3), time2posix(3), zic(8) + // + // BSD September 13, 1994 BSD + // + // + // + // TIME(3) BSD Library Functions Manual TIME(3) + // + // NAME + // time -- get time of day + // + // LIBRARY + // Standard C Library (libc, -lc) + // + // SYNOPSIS + // #include + // + // time_t + // time(time_t *tloc); + // + // DESCRIPTION + // The time() function returns the value of time in seconds since 0 hours, 0 + // minutes, 0 seconds, January 1, 1970, Coordinated Universal Time, without + // including leap seconds. If an error occurs, time() returns the value + // (time_t)-1. + // + // The return value is also stored in *tloc, provided that tloc is non-null. + // + // ERRORS + // The time() function may fail for any of the reasons described in + // gettimeofday(2). + // + // SEE ALSO + // gettimeofday(2), ctime(3) + // + // STANDARDS + // The time function conforms to IEEE Std 1003.1-2001 (``POSIX.1''). + // + // BUGS + // Neither ISO/IEC 9899:1999 (``ISO C99'') nor IEEE Std 1003.1-2001 + // (``POSIX.1'') requires time() to set errno on failure; thus, it is impos- + // sible for an application to distinguish the valid time value -1 (repre- + // senting the last UTC second of 1969) from the error return value. + // + // Systems conforming to earlier versions of the C and POSIX standards + // (including older versions of FreeBSD) did not set *tloc in the error + // case. + // + // HISTORY + // A time() function appeared in Version 6 AT&T UNIX. + // + // BSD July 18, 2003 BSD + // + // + private static void TZif_GenerateAdjustmentRules(out AdjustmentRule[] rules, TimeSpan baseUtcOffset, DateTime[] dts, byte[] typeOfLocalTime, + TZifType[] transitionType, bool[] StandardTime, bool[] GmtTime, string futureTransitionsPosixFormat) + { + rules = null; + + if (dts.Length > 0) + { + int index = 0; + List rulesList = new List(); + + while (index <= dts.Length) + { + TZif_GenerateAdjustmentRule(ref index, baseUtcOffset, rulesList, dts, typeOfLocalTime, transitionType, StandardTime, GmtTime, futureTransitionsPosixFormat); + } + + rules = rulesList.ToArray(); + if (rules != null && rules.Length == 0) + { + rules = null; + } + } + } + + private static void TZif_GenerateAdjustmentRule(ref int index, TimeSpan timeZoneBaseUtcOffset, List rulesList, DateTime[] dts, + byte[] typeOfLocalTime, TZifType[] transitionTypes, bool[] StandardTime, bool[] GmtTime, string futureTransitionsPosixFormat) + { + // To generate AdjustmentRules, use the following approach: + // The first AdjustmentRule will go from DateTime.MinValue to the first transition time greater than DateTime.MinValue. + // Each middle AdjustmentRule wil go from dts[index-1] to dts[index]. + // The last AdjustmentRule will go from dts[dts.Length-1] to Datetime.MaxValue. + + // 0. Skip any DateTime.MinValue transition times. In newer versions of the tzfile, there + // is a "big bang" transition time, which is before the year 0001. Since any times before year 0001 + // cannot be represented by DateTime, there is no reason to make AdjustmentRules for these unrepresentable time periods. + // 1. If there are no DateTime.MinValue times, the first AdjustmentRule goes from DateTime.MinValue + // to the first transition and uses the first standard transitionType (or the first transitionType if none of them are standard) + // 2. Create an AdjustmentRule for each transition, i.e. from dts[index - 1] to dts[index]. + // This rule uses the transitionType[index - 1] and the whole AdjustmentRule only describes a single offset - either + // all daylight savings, or all stanard time. + // 3. After all the transitions are filled out, the last AdjustmentRule is created from either: + // a. a POSIX-style timezone description ("futureTransitionsPosixFormat"), if there is one or + // b. continue the last transition offset until DateTime.Max + + while (index < dts.Length && dts[index] == DateTime.MinValue) + { + index++; + } + + if (index == 0) + { + TZifType transitionType = TZif_GetEarlyDateTransitionType(transitionTypes); + DateTime endTransitionDate = dts[index]; + + TimeSpan transitionOffset = TZif_CalculateTransitionOffsetFromBase(transitionType.UtcOffset, timeZoneBaseUtcOffset); + TimeSpan daylightDelta = transitionType.IsDst ? transitionOffset : TimeSpan.Zero; + TimeSpan baseUtcDelta = transitionType.IsDst ? TimeSpan.Zero : transitionOffset; + + AdjustmentRule r = AdjustmentRule.CreateAdjustmentRule( + DateTime.MinValue, + endTransitionDate.AddTicks(-1), + daylightDelta, + default(TransitionTime), + default(TransitionTime), + baseUtcDelta, + noDaylightTransitions: true); + rulesList.Add(r); + } + else if (index < dts.Length) + { + DateTime startTransitionDate = dts[index - 1]; + TZifType startTransitionType = transitionTypes[typeOfLocalTime[index - 1]]; + + DateTime endTransitionDate = dts[index]; + + TimeSpan transitionOffset = TZif_CalculateTransitionOffsetFromBase(startTransitionType.UtcOffset, timeZoneBaseUtcOffset); + TimeSpan daylightDelta = startTransitionType.IsDst ? transitionOffset : TimeSpan.Zero; + TimeSpan baseUtcDelta = startTransitionType.IsDst ? TimeSpan.Zero : transitionOffset; + + TransitionTime dstStart; + if (startTransitionType.IsDst) + { + // the TransitionTime fields are not used when AdjustmentRule.NoDaylightTransitions == true. + // However, there are some cases in the past where DST = true, and the daylight savings offset + // now equals what the current BaseUtcOffset is. In that case, the AdjustmentRule.DaylightOffset + // is going to be TimeSpan.Zero. But we still need to return 'true' from AdjustmentRule.HasDaylightSaving. + // To ensure we always return true from HasDaylightSaving, make a "special" dstStart that will make the logic + // in HasDaylightSaving return true. + dstStart = TransitionTime.CreateFixedDateRule(DateTime.MinValue.AddMilliseconds(2), 1, 1); + } + else + { + dstStart = default(TransitionTime); + } + + AdjustmentRule r = AdjustmentRule.CreateAdjustmentRule( + startTransitionDate, + endTransitionDate.AddTicks(-1), + daylightDelta, + dstStart, + default(TransitionTime), + baseUtcDelta, + noDaylightTransitions: true); + rulesList.Add(r); + } + else + { + // create the AdjustmentRule that will be used for all DateTimes after the last transition + + // NOTE: index == dts.Length + DateTime startTransitionDate = dts[index - 1]; + + if (!string.IsNullOrEmpty(futureTransitionsPosixFormat)) + { + AdjustmentRule r = TZif_CreateAdjustmentRuleForPosixFormat(futureTransitionsPosixFormat, startTransitionDate, timeZoneBaseUtcOffset); + if (r != null) + { + rulesList.Add(r); + } + } + else + { + // just use the last transition as the rule which will be used until the end of time + + TZifType transitionType = transitionTypes[typeOfLocalTime[index - 1]]; + TimeSpan transitionOffset = TZif_CalculateTransitionOffsetFromBase(transitionType.UtcOffset, timeZoneBaseUtcOffset); + TimeSpan daylightDelta = transitionType.IsDst ? transitionOffset : TimeSpan.Zero; + TimeSpan baseUtcDelta = transitionType.IsDst ? TimeSpan.Zero : transitionOffset; + + AdjustmentRule r = AdjustmentRule.CreateAdjustmentRule( + startTransitionDate, + DateTime.MaxValue, + daylightDelta, + default(TransitionTime), + default(TransitionTime), + baseUtcDelta, + noDaylightTransitions: true); + rulesList.Add(r); + } + } + + index++; + } + + private static TimeSpan TZif_CalculateTransitionOffsetFromBase(TimeSpan transitionOffset, TimeSpan timeZoneBaseUtcOffset) + { + TimeSpan result = transitionOffset - timeZoneBaseUtcOffset; + + // TZif supports seconds-level granularity with offsets but TimeZoneInfo only supports minutes since it aligns + // with DateTimeOffset, SQL Server, and the W3C XML Specification + if (result.Ticks % TimeSpan.TicksPerMinute != 0) + { + result = new TimeSpan(result.Hours, result.Minutes, 0); + } + + return result; + } + + /// + /// Gets the first standard-time transition type, or simply the first transition type + /// if there are no standard transition types. + /// > + /// + /// from 'man tzfile': + /// localtime(3) uses the first standard-time ttinfo structure in the file + /// (or simply the first ttinfo structure in the absence of a standard-time + /// structure) if either tzh_timecnt is zero or the time argument is less + /// than the first transition time recorded in the file. + /// + private static TZifType TZif_GetEarlyDateTransitionType(TZifType[] transitionTypes) + { + foreach (TZifType transitionType in transitionTypes) + { + if (!transitionType.IsDst) + { + return transitionType; + } + } + + if (transitionTypes.Length > 0) + { + return transitionTypes[0]; + } + + throw new InvalidTimeZoneException(SR.InvalidTimeZone_NoTTInfoStructures); + } + + /// + /// Creates an AdjustmentRule given the POSIX TZ environment variable string. + /// + /// + /// See http://man7.org/linux/man-pages/man3/tzset.3.html for the format and semantics of this POSX string. + /// + private static AdjustmentRule TZif_CreateAdjustmentRuleForPosixFormat(string posixFormat, DateTime startTransitionDate, TimeSpan timeZoneBaseUtcOffset) + { + string standardName; + string standardOffset; + string daylightSavingsName; + string daylightSavingsOffset; + string start; + string startTime; + string end; + string endTime; + + if (TZif_ParsePosixFormat(posixFormat, out standardName, out standardOffset, out daylightSavingsName, + out daylightSavingsOffset, out start, out startTime, out end, out endTime)) + { + // a valid posixFormat has at least standardName and standardOffset + + TimeSpan? parsedBaseOffset = TZif_ParseOffsetString(standardOffset); + if (parsedBaseOffset.HasValue) + { + TimeSpan baseOffset = parsedBaseOffset.Value.Negate(); // offsets are backwards in POSIX notation + baseOffset = TZif_CalculateTransitionOffsetFromBase(baseOffset, timeZoneBaseUtcOffset); + + // having a daylightSavingsName means there is a DST rule + if (!string.IsNullOrEmpty(daylightSavingsName)) + { + TimeSpan? parsedDaylightSavings = TZif_ParseOffsetString(daylightSavingsOffset); + TimeSpan daylightSavingsTimeSpan; + if (!parsedDaylightSavings.HasValue) + { + // default DST to 1 hour if it isn't specified + daylightSavingsTimeSpan = new TimeSpan(1, 0, 0); + } + else + { + daylightSavingsTimeSpan = parsedDaylightSavings.Value.Negate(); // offsets are backwards in POSIX notation + daylightSavingsTimeSpan = TZif_CalculateTransitionOffsetFromBase(daylightSavingsTimeSpan, timeZoneBaseUtcOffset); + daylightSavingsTimeSpan = TZif_CalculateTransitionOffsetFromBase(daylightSavingsTimeSpan, baseOffset); + } + + TransitionTime dstStart = TZif_CreateTransitionTimeFromPosixRule(start, startTime); + TransitionTime dstEnd = TZif_CreateTransitionTimeFromPosixRule(end, endTime); + + return AdjustmentRule.CreateAdjustmentRule( + startTransitionDate, + DateTime.MaxValue, + daylightSavingsTimeSpan, + dstStart, + dstEnd, + baseOffset, + noDaylightTransitions: false); + } + else + { + // if there is no daylightSavingsName, the whole AdjustmentRule should be with no transitions - just the baseOffset + return AdjustmentRule.CreateAdjustmentRule( + startTransitionDate, + DateTime.MaxValue, + TimeSpan.Zero, + default(TransitionTime), + default(TransitionTime), + baseOffset, + noDaylightTransitions: true); + } + } + } + + return null; + } + + private static TimeSpan? TZif_ParseOffsetString(string offset) + { + TimeSpan? result = null; + + if (!string.IsNullOrEmpty(offset)) + { + bool negative = offset[0] == '-'; + if (negative || offset[0] == '+') + { + offset = offset.Substring(1); + } + + // Try parsing just hours first. + // Note, TimeSpan.TryParseExact "%h" can't be used here because some time zones using values + // like "26" or "144" and TimeSpan parsing would turn that into 26 or 144 *days* instead of hours. + int hours; + if (int.TryParse(offset, out hours)) + { + result = new TimeSpan(hours, 0, 0); + } + else + { + TimeSpan parsedTimeSpan; + if (TimeSpan.TryParseExact(offset, "g", CultureInfo.InvariantCulture, out parsedTimeSpan)) + { + result = parsedTimeSpan; + } + } + + if (result.HasValue && negative) + { + result = result.Value.Negate(); + } + } + + return result; + } + + private static DateTime ParseTimeOfDay(string time) + { + DateTime timeOfDay; + TimeSpan? timeOffset = TZif_ParseOffsetString(time); + if (timeOffset.HasValue) + { + // This logic isn't correct and can't be corrected until https://github.com/dotnet/corefx/issues/2618 is fixed. + // Some time zones use time values like, "26", "144", or "-2". + // This allows the week to sometimes be week 4 and sometimes week 5 in the month. + // For now, strip off any 'days' in the offset, and just get the time of day correct + timeOffset = new TimeSpan(timeOffset.Value.Hours, timeOffset.Value.Minutes, timeOffset.Value.Seconds); + if (timeOffset.Value < TimeSpan.Zero) + { + timeOfDay = new DateTime(1, 1, 2, 0, 0, 0); + } + else + { + timeOfDay = new DateTime(1, 1, 1, 0, 0, 0); + } + + timeOfDay += timeOffset.Value; + } + else + { + // default to 2AM. + timeOfDay = new DateTime(1, 1, 1, 2, 0, 0); + } + + return timeOfDay; + } + + private static TransitionTime TZif_CreateTransitionTimeFromPosixRule(string date, string time) + { + if (string.IsNullOrEmpty(date)) + { + return default(TransitionTime); + } + + if (date[0] == 'M') + { + // Mm.w.d + // This specifies day d of week w of month m. The day d must be between 0(Sunday) and 6.The week w must be between 1 and 5; + // week 1 is the first week in which day d occurs, and week 5 specifies the last d day in the month. The month m should be between 1 and 12. + + int month; + int week; + DayOfWeek day; + if (!TZif_ParseMDateRule(date, out month, out week, out day)) + { + throw new InvalidTimeZoneException(SR.Format(SR.InvalidTimeZone_UnparseablePosixMDateString, date)); + } + + return TransitionTime.CreateFloatingDateRule(ParseTimeOfDay(time), month, week, day); + } + else + { + if (date[0] != 'J') + { + // should be n Julian day format which we don't support. + // + // This specifies the Julian day, with n between 0 and 365. February 29 is counted in leap years. + // + // n would be a relative number from the begining of the year. which should handle if the + // the year is a leap year or not. + // + // In leap year, n would be counted as: + // + // 0 30 31 59 60 90 335 365 + // |-------Jan--------|-------Feb--------|-------Mar--------|....|-------Dec--------| + // + // while in non leap year we'll have + // + // 0 30 31 58 59 89 334 364 + // |-------Jan--------|-------Feb--------|-------Mar--------|....|-------Dec--------| + // + // + // For example if n is specified as 60, this means in leap year the rule will start at Mar 1, + // while in non leap year the rule will start at Mar 2. + // + // If we need to support n format, we'll have to have a floating adjustment rule support this case. + + throw new InvalidTimeZoneException(SR.InvalidTimeZone_NJulianDayNotSupported); + } + + // Julian day + TZif_ParseJulianDay(date, out int month, out int day); + return TransitionTime.CreateFixedDateRule(ParseTimeOfDay(time), month, day); + } + } + + /// + /// Parses a string like Jn or n into month and day values. + /// + /// + /// true if the parsing succeeded; otherwise, false. + /// + private static void TZif_ParseJulianDay(string date, out int month, out int day) + { + // Jn + // This specifies the Julian day, with n between 1 and 365.February 29 is never counted, even in leap years. + Debug.Assert(date[0] == 'J'); + Debug.Assert(!String.IsNullOrEmpty(date)); + month = day = 0; + + int index = 1; + + if (index >= date.Length || ((uint)(date[index] - '0') > '9'-'0')) + { + throw new InvalidTimeZoneException(SR.InvalidTimeZone_InvalidJulianDay); + } + + int julianDay = 0; + + do + { + julianDay = julianDay * 10 + (int) (date[index] - '0'); + index++; + } while (index < date.Length && ((uint)(date[index] - '0') <= '9'-'0')); + + int[] days = GregorianCalendarHelper.DaysToMonth365; + + if (julianDay == 0 || julianDay > days[days.Length - 1]) + { + throw new InvalidTimeZoneException(SR.InvalidTimeZone_InvalidJulianDay); + } + + int i = 1; + while (i < days.Length && julianDay > days[i]) + { + i++; + } + + Debug.Assert(i > 0 && i < days.Length); + + month = i; + day = julianDay - days[i - 1]; + } + + /// + /// Parses a string like Mm.w.d into month, week and DayOfWeek values. + /// + /// + /// true if the parsing succeeded; otherwise, false. + /// + private static bool TZif_ParseMDateRule(string dateRule, out int month, out int week, out DayOfWeek dayOfWeek) + { + if (dateRule[0] == 'M') + { + int firstDotIndex = dateRule.IndexOf('.'); + if (firstDotIndex > 0) + { + int secondDotIndex = dateRule.IndexOf('.', firstDotIndex + 1); + if (secondDotIndex > 0) + { + if (int.TryParse(dateRule.AsSpan(1, firstDotIndex - 1), out month) && + int.TryParse(dateRule.AsSpan(firstDotIndex + 1, secondDotIndex - firstDotIndex - 1), out week) && + int.TryParse(dateRule.AsSpan(secondDotIndex + 1), out int day)) + { + dayOfWeek = (DayOfWeek)day; + return true; + } + } + } + } + + month = 0; + week = 0; + dayOfWeek = default(DayOfWeek); + return false; + } + + private static bool TZif_ParsePosixFormat( + string posixFormat, + out string standardName, + out string standardOffset, + out string daylightSavingsName, + out string daylightSavingsOffset, + out string start, + out string startTime, + out string end, + out string endTime) + { + standardName = null; + standardOffset = null; + daylightSavingsName = null; + daylightSavingsOffset = null; + start = null; + startTime = null; + end = null; + endTime = null; + + int index = 0; + standardName = TZif_ParsePosixName(posixFormat, ref index); + standardOffset = TZif_ParsePosixOffset(posixFormat, ref index); + + daylightSavingsName = TZif_ParsePosixName(posixFormat, ref index); + if (!string.IsNullOrEmpty(daylightSavingsName)) + { + daylightSavingsOffset = TZif_ParsePosixOffset(posixFormat, ref index); + + if (index < posixFormat.Length && posixFormat[index] == ',') + { + index++; + TZif_ParsePosixDateTime(posixFormat, ref index, out start, out startTime); + + if (index < posixFormat.Length && posixFormat[index] == ',') + { + index++; + TZif_ParsePosixDateTime(posixFormat, ref index, out end, out endTime); + } + } + } + + return !string.IsNullOrEmpty(standardName) && !string.IsNullOrEmpty(standardOffset); + } + + private static string TZif_ParsePosixName(string posixFormat, ref int index) + { + bool isBracketEnclosed = index < posixFormat.Length && posixFormat[index] == '<'; + if (isBracketEnclosed) + { + // move past the opening bracket + index++; + + string result = TZif_ParsePosixString(posixFormat, ref index, c => c == '>'); + + // move past the closing bracket + if (index < posixFormat.Length && posixFormat[index] == '>') + { + index++; + } + + return result; + } + else + { + return TZif_ParsePosixString( + posixFormat, + ref index, + c => char.IsDigit(c) || c == '+' || c == '-' || c == ','); + } + } + + private static string TZif_ParsePosixOffset(string posixFormat, ref int index) => + TZif_ParsePosixString(posixFormat, ref index, c => !char.IsDigit(c) && c != '+' && c != '-' && c != ':'); + + private static void TZif_ParsePosixDateTime(string posixFormat, ref int index, out string date, out string time) + { + time = null; + + date = TZif_ParsePosixDate(posixFormat, ref index); + if (index < posixFormat.Length && posixFormat[index] == '/') + { + index++; + time = TZif_ParsePosixTime(posixFormat, ref index); + } + } + + private static string TZif_ParsePosixDate(string posixFormat, ref int index) => + TZif_ParsePosixString(posixFormat, ref index, c => c == '/' || c == ','); + + private static string TZif_ParsePosixTime(string posixFormat, ref int index) => + TZif_ParsePosixString(posixFormat, ref index, c => c == ','); + + private static string TZif_ParsePosixString(string posixFormat, ref int index, Func breakCondition) + { + int startIndex = index; + for (; index < posixFormat.Length; index++) + { + char current = posixFormat[index]; + if (breakCondition(current)) + { + break; + } + } + + return posixFormat.Substring(startIndex, index - startIndex); + } + + // Returns the Substring from zoneAbbreviations starting at index and ending at '\0' + // zoneAbbreviations is expected to be in the form: "PST\0PDT\0PWT\0\PPT" + private static string TZif_GetZoneAbbreviation(string zoneAbbreviations, int index) + { + int lastIndex = zoneAbbreviations.IndexOf('\0', index); + return lastIndex > 0 ? + zoneAbbreviations.Substring(index, lastIndex - index) : + zoneAbbreviations.Substring(index); + } + + // Converts an array of bytes into an int - always using standard byte order (Big Endian) + // per TZif file standard + private static unsafe int TZif_ToInt32(byte[] value, int startIndex) + { + fixed (byte* pbyte = &value[startIndex]) + { + return (*pbyte << 24) | (*(pbyte + 1) << 16) | (*(pbyte + 2) << 8) | (*(pbyte + 3)); + } + } + + // Converts an array of bytes into a long - always using standard byte order (Big Endian) + // per TZif file standard + private static unsafe long TZif_ToInt64(byte[] value, int startIndex) + { + fixed (byte* pbyte = &value[startIndex]) + { + int i1 = (*pbyte << 24) | (*(pbyte + 1) << 16) | (*(pbyte + 2) << 8) | (*(pbyte + 3)); + int i2 = (*(pbyte + 4) << 24) | (*(pbyte + 5) << 16) | (*(pbyte + 6) << 8) | (*(pbyte + 7)); + return (uint)i2 | ((long)i1 << 32); + } + } + + private static long TZif_ToUnixTime(byte[] value, int startIndex, TZVersion version) => + version != TZVersion.V1 ? + TZif_ToInt64(value, startIndex) : + TZif_ToInt32(value, startIndex); + + private static DateTime TZif_UnixTimeToDateTime(long unixTime) => + unixTime < DateTimeOffset.UnixMinSeconds ? DateTime.MinValue : + unixTime > DateTimeOffset.UnixMaxSeconds ? DateTime.MaxValue : + DateTimeOffset.FromUnixTimeSeconds(unixTime).UtcDateTime; + + private static void TZif_ParseRaw(byte[] data, out TZifHead t, out DateTime[] dts, out byte[] typeOfLocalTime, out TZifType[] transitionType, + out string zoneAbbreviations, out bool[] StandardTime, out bool[] GmtTime, out string futureTransitionsPosixFormat) + { + // initialize the out parameters in case the TZifHead ctor throws + dts = null; + typeOfLocalTime = null; + transitionType = null; + zoneAbbreviations = string.Empty; + StandardTime = null; + GmtTime = null; + futureTransitionsPosixFormat = null; + + // read in the 44-byte TZ header containing the count/length fields + // + int index = 0; + t = new TZifHead(data, index); + index += TZifHead.Length; + + int timeValuesLength = 4; // the first version uses 4-bytes to specify times + if (t.Version != TZVersion.V1) + { + // move index past the V1 information to read the V2 information + index += (int)((timeValuesLength * t.TimeCount) + t.TimeCount + (6 * t.TypeCount) + ((timeValuesLength + 4) * t.LeapCount) + t.IsStdCount + t.IsGmtCount + t.CharCount); + + // read the V2 header + t = new TZifHead(data, index); + index += TZifHead.Length; + timeValuesLength = 8; // the second version uses 8-bytes + } + + // initialize the containers for the rest of the TZ data + dts = new DateTime[t.TimeCount]; + typeOfLocalTime = new byte[t.TimeCount]; + transitionType = new TZifType[t.TypeCount]; + zoneAbbreviations = string.Empty; + StandardTime = new bool[t.TypeCount]; + GmtTime = new bool[t.TypeCount]; + + // read in the UTC transition points and convert them to Windows + // + for (int i = 0; i < t.TimeCount; i++) + { + long unixTime = TZif_ToUnixTime(data, index, t.Version); + dts[i] = TZif_UnixTimeToDateTime(unixTime); + index += timeValuesLength; + } + + // read in the Type Indices; there is a 1:1 mapping of UTC transition points to Type Indices + // these indices directly map to the array index in the transitionType array below + // + for (int i = 0; i < t.TimeCount; i++) + { + typeOfLocalTime[i] = data[index]; + index += 1; + } + + // read in the Type table. Each 6-byte entry represents + // {UtcOffset, IsDst, AbbreviationIndex} + // + // each AbbreviationIndex is a character index into the zoneAbbreviations string below + // + for (int i = 0; i < t.TypeCount; i++) + { + transitionType[i] = new TZifType(data, index); + index += 6; + } + + // read in the Abbreviation ASCII string. This string will be in the form: + // "PST\0PDT\0PWT\0\PPT" + // + Encoding enc = Encoding.UTF8; + zoneAbbreviations = enc.GetString(data, index, (int)t.CharCount); + index += (int)t.CharCount; + + // skip ahead of the Leap-Seconds Adjustment data. In a future release, consider adding + // support for Leap-Seconds + // + index += (int)(t.LeapCount * (timeValuesLength + 4)); // skip the leap second transition times + + // read in the Standard Time table. There should be a 1:1 mapping between Type-Index and Standard + // Time table entries. + // + // TRUE = transition time is standard time + // FALSE = transition time is wall clock time + // ABSENT = transition time is wall clock time + // + for (int i = 0; i < t.IsStdCount && i < t.TypeCount && index < data.Length; i++) + { + StandardTime[i] = (data[index++] != 0); + } + + // read in the GMT Time table. There should be a 1:1 mapping between Type-Index and GMT Time table + // entries. + // + // TRUE = transition time is UTC + // FALSE = transition time is local time + // ABSENT = transition time is local time + // + for (int i = 0; i < t.IsGmtCount && i < t.TypeCount && index < data.Length; i++) + { + GmtTime[i] = (data[index++] != 0); + } + + if (t.Version != TZVersion.V1) + { + // read the POSIX-style format, which should be wrapped in newlines with the last newline at the end of the file + if (data[index++] == '\n' && data[data.Length - 1] == '\n') + { + futureTransitionsPosixFormat = enc.GetString(data, index, data.Length - index - 1); + } + } + } + + private struct TZifType + { + public const int Length = 6; + + public readonly TimeSpan UtcOffset; + public readonly bool IsDst; + public readonly byte AbbreviationIndex; + + public TZifType(byte[] data, int index) + { + if (data == null || data.Length < index + Length) + { + throw new ArgumentException(SR.Argument_TimeZoneInfoInvalidTZif, nameof(data)); + } + UtcOffset = new TimeSpan(0, 0, TZif_ToInt32(data, index + 00)); + IsDst = (data[index + 4] != 0); + AbbreviationIndex = data[index + 5]; + } + } + + private struct TZifHead + { + public const int Length = 44; + + public readonly uint Magic; // TZ_MAGIC "TZif" + public readonly TZVersion Version; // 1 byte for a \0 or 2 or 3 + // public byte[15] Reserved; // reserved for future use + public readonly uint IsGmtCount; // number of transition time flags + public readonly uint IsStdCount; // number of transition time flags + public readonly uint LeapCount; // number of leap seconds + public readonly uint TimeCount; // number of transition times + public readonly uint TypeCount; // number of local time types + public readonly uint CharCount; // number of abbreviated characters + + public TZifHead(byte[] data, int index) + { + if (data == null || data.Length < Length) + { + throw new ArgumentException("bad data", nameof(data)); + } + + Magic = (uint)TZif_ToInt32(data, index + 00); + + if (Magic != 0x545A6966) + { + // 0x545A6966 = {0x54, 0x5A, 0x69, 0x66} = "TZif" + throw new ArgumentException(SR.Argument_TimeZoneInfoBadTZif, nameof(data)); + } + + byte version = data[index + 04]; + Version = + version == '2' ? TZVersion.V2 : + version == '3' ? TZVersion.V3 : + TZVersion.V1; // default/fallback to V1 to guard against future, unsupported version numbers + + // skip the 15 byte reserved field + + // don't use the BitConverter class which parses data + // based on the Endianess of the machine architecture. + // this data is expected to always be in "standard byte order", + // regardless of the machine it is being processed on. + + IsGmtCount = (uint)TZif_ToInt32(data, index + 20); + IsStdCount = (uint)TZif_ToInt32(data, index + 24); + LeapCount = (uint)TZif_ToInt32(data, index + 28); + TimeCount = (uint)TZif_ToInt32(data, index + 32); + TypeCount = (uint)TZif_ToInt32(data, index + 36); + CharCount = (uint)TZif_ToInt32(data, index + 40); + } + } + + private enum TZVersion : byte + { + V1 = 0, + V2, + V3, + // when adding more versions, ensure all the logic using TZVersion is still correct + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/TimeZoneInfo.Win32.cs b/external/corefx/src/Common/src/CoreLib/System/TimeZoneInfo.Win32.cs new file mode 100644 index 0000000000..03f54a5432 --- /dev/null +++ b/external/corefx/src/Common/src/CoreLib/System/TimeZoneInfo.Win32.cs @@ -0,0 +1,999 @@ +// 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.Collections.Generic; +using System.Diagnostics; +using System.Globalization; +using System.IO; +using System.Security; +using System.Text; +using System.Threading; + +using Microsoft.Win32; +using Microsoft.Win32.SafeHandles; + +using Internal.Runtime.CompilerServices; + +using REG_TZI_FORMAT = Interop.Kernel32.REG_TZI_FORMAT; +using TIME_ZONE_INFORMATION = Interop.Kernel32.TIME_ZONE_INFORMATION; +using TIME_DYNAMIC_ZONE_INFORMATION = Interop.Kernel32.TIME_DYNAMIC_ZONE_INFORMATION; + +namespace System +{ + public sealed partial class TimeZoneInfo + { + // registry constants for the 'Time Zones' hive + // + private const string TimeZonesRegistryHive = @"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones"; + private const string DisplayValue = "Display"; + private const string DaylightValue = "Dlt"; + private const string StandardValue = "Std"; + private const string MuiDisplayValue = "MUI_Display"; + private const string MuiDaylightValue = "MUI_Dlt"; + private const string MuiStandardValue = "MUI_Std"; + private const string TimeZoneInfoValue = "TZI"; + private const string FirstEntryValue = "FirstEntry"; + private const string LastEntryValue = "LastEntry"; + + private const int MaxKeyLength = 255; + +#pragma warning disable 0420 + private sealed partial class CachedData + { + private static TimeZoneInfo GetCurrentOneYearLocal() + { + // load the data from the OS + TIME_ZONE_INFORMATION timeZoneInformation; + uint result = Interop.Kernel32.GetTimeZoneInformation(out timeZoneInformation); + return result == Interop.Kernel32.TIME_ZONE_ID_INVALID ? + CreateCustomTimeZone(LocalId, TimeSpan.Zero, LocalId, LocalId) : + GetLocalTimeZoneFromWin32Data(timeZoneInformation, dstDisabled: false); + } + + private volatile OffsetAndRule _oneYearLocalFromUtc; + + public OffsetAndRule GetOneYearLocalFromUtc(int year) + { + OffsetAndRule oneYearLocFromUtc = _oneYearLocalFromUtc; + if (oneYearLocFromUtc == null || oneYearLocFromUtc.Year != year) + { + TimeZoneInfo currentYear = GetCurrentOneYearLocal(); + AdjustmentRule rule = currentYear._adjustmentRules == null ? null : currentYear._adjustmentRules[0]; + oneYearLocFromUtc = new OffsetAndRule(year, currentYear.BaseUtcOffset, rule); + _oneYearLocalFromUtc = oneYearLocFromUtc; + } + return oneYearLocFromUtc; + } + } +#pragma warning restore 0420 + + private sealed class OffsetAndRule + { + public readonly int Year; + public readonly TimeSpan Offset; + public readonly AdjustmentRule Rule; + + public OffsetAndRule(int year, TimeSpan offset, AdjustmentRule rule) + { + Year = year; + Offset = offset; + Rule = rule; + } + } + + /// + /// Returns a cloned array of AdjustmentRule objects + /// + public AdjustmentRule[] GetAdjustmentRules() + { + if (_adjustmentRules == null) + { + return Array.Empty(); + } + + return (AdjustmentRule[])_adjustmentRules.Clone(); + } + + private static void PopulateAllSystemTimeZones(CachedData cachedData) + { + Debug.Assert(Monitor.IsEntered(cachedData)); + + using (RegistryKey reg = Registry.LocalMachine.OpenSubKey(TimeZonesRegistryHive, writable: false)) + { + if (reg != null) + { + foreach (string keyName in reg.GetSubKeyNames()) + { + TimeZoneInfo value; + Exception ex; + TryGetTimeZone(keyName, false, out value, out ex, cachedData); // populate the cache + } + } + } + } + + private TimeZoneInfo(in TIME_ZONE_INFORMATION zone, bool dstDisabled) + { + string standardName = zone.GetStandardName(); + if (standardName.Length == 0) + { + _id = LocalId; // the ID must contain at least 1 character - initialize _id to "Local" + } + else + { + _id = standardName; + } + _baseUtcOffset = new TimeSpan(0, -(zone.Bias), 0); + + if (!dstDisabled) + { + // only create the adjustment rule if DST is enabled + REG_TZI_FORMAT regZone = new REG_TZI_FORMAT(zone); + AdjustmentRule rule = CreateAdjustmentRuleFromTimeZoneInformation(regZone, DateTime.MinValue.Date, DateTime.MaxValue.Date, zone.Bias); + if (rule != null) + { + _adjustmentRules = new[] { rule }; + } + } + + ValidateTimeZoneInfo(_id, _baseUtcOffset, _adjustmentRules, out _supportsDaylightSavingTime); + _displayName = standardName; + _standardDisplayName = standardName; + _daylightDisplayName = zone.GetDaylightName(); + } + + /// + /// Helper function to check if the current TimeZoneInformation struct does not support DST. + /// This check returns true when the DaylightDate == StandardDate. + /// This check is only meant to be used for "Local". + /// + private static bool CheckDaylightSavingTimeNotSupported(in TIME_ZONE_INFORMATION timeZone) => + timeZone.DaylightDate.Equals(timeZone.StandardDate); + + /// + /// Converts a REG_TZI_FORMAT struct to an AdjustmentRule. + /// + private static AdjustmentRule CreateAdjustmentRuleFromTimeZoneInformation(in REG_TZI_FORMAT timeZoneInformation, DateTime startDate, DateTime endDate, int defaultBaseUtcOffset) + { + bool supportsDst = timeZoneInformation.StandardDate.Month != 0; + + if (!supportsDst) + { + if (timeZoneInformation.Bias == defaultBaseUtcOffset) + { + // this rule will not contain any information to be used to adjust dates. just ignore it + return null; + } + + return AdjustmentRule.CreateAdjustmentRule( + startDate, + endDate, + TimeSpan.Zero, // no daylight saving transition + TransitionTime.CreateFixedDateRule(DateTime.MinValue, 1, 1), + TransitionTime.CreateFixedDateRule(DateTime.MinValue.AddMilliseconds(1), 1, 1), + new TimeSpan(0, defaultBaseUtcOffset - timeZoneInformation.Bias, 0), // Bias delta is all what we need from this rule + noDaylightTransitions: false); + } + + // + // Create an AdjustmentRule with TransitionTime objects + // + TransitionTime daylightTransitionStart; + if (!TransitionTimeFromTimeZoneInformation(timeZoneInformation, out daylightTransitionStart, readStartDate: true)) + { + return null; + } + + TransitionTime daylightTransitionEnd; + if (!TransitionTimeFromTimeZoneInformation(timeZoneInformation, out daylightTransitionEnd, readStartDate: false)) + { + return null; + } + + if (daylightTransitionStart.Equals(daylightTransitionEnd)) + { + // this happens when the time zone does support DST but the OS has DST disabled + return null; + } + + return AdjustmentRule.CreateAdjustmentRule( + startDate, + endDate, + new TimeSpan(0, -timeZoneInformation.DaylightBias, 0), + daylightTransitionStart, + daylightTransitionEnd, + new TimeSpan(0, defaultBaseUtcOffset - timeZoneInformation.Bias, 0), + noDaylightTransitions: false); + } + + /// + /// Helper function that searches the registry for a time zone entry + /// that matches the TimeZoneInformation struct. + /// + private static string FindIdFromTimeZoneInformation(in TIME_ZONE_INFORMATION timeZone, out bool dstDisabled) + { + dstDisabled = false; + + using (RegistryKey key = Registry.LocalMachine.OpenSubKey(TimeZonesRegistryHive, writable: false)) + { + if (key == null) + { + return null; + } + + foreach (string keyName in key.GetSubKeyNames()) + { + if (TryCompareTimeZoneInformationToRegistry(timeZone, keyName, out dstDisabled)) + { + return keyName; + } + } + } + + return null; + } + + /// + /// Helper function for retrieving the local system time zone. + /// May throw COMException, TimeZoneNotFoundException, InvalidTimeZoneException. + /// Assumes cachedData lock is taken. + /// + /// A new TimeZoneInfo instance. + private static TimeZoneInfo GetLocalTimeZone(CachedData cachedData) + { + Debug.Assert(Monitor.IsEntered(cachedData)); + + // + // Try using the "kernel32!GetDynamicTimeZoneInformation" API to get the "id" + // + var dynamicTimeZoneInformation = new TIME_DYNAMIC_ZONE_INFORMATION(); + + // call kernel32!GetDynamicTimeZoneInformation... + uint result = Interop.Kernel32.GetDynamicTimeZoneInformation(out dynamicTimeZoneInformation); + if (result == Interop.Kernel32.TIME_ZONE_ID_INVALID) + { + // return a dummy entry + return CreateCustomTimeZone(LocalId, TimeSpan.Zero, LocalId, LocalId); + } + + // check to see if we can use the key name returned from the API call + string dynamicTimeZoneKeyName = dynamicTimeZoneInformation.GetTimeZoneKeyName(); + if (dynamicTimeZoneKeyName.Length != 0) + { + TimeZoneInfo zone; + Exception ex; + + if (TryGetTimeZone(dynamicTimeZoneKeyName, dynamicTimeZoneInformation.DynamicDaylightTimeDisabled != 0, out zone, out ex, cachedData) == TimeZoneInfoResult.Success) + { + // successfully loaded the time zone from the registry + return zone; + } + } + + var timeZoneInformation = new TIME_ZONE_INFORMATION(dynamicTimeZoneInformation); + + // the key name was not returned or it pointed to a bogus entry - search for the entry ourselves + string id = FindIdFromTimeZoneInformation(timeZoneInformation, out bool dstDisabled); + + if (id != null) + { + TimeZoneInfo zone; + Exception ex; + if (TryGetTimeZone(id, dstDisabled, out zone, out ex, cachedData) == TimeZoneInfoResult.Success) + { + // successfully loaded the time zone from the registry + return zone; + } + } + + // We could not find the data in the registry. Fall back to using + // the data from the Win32 API + return GetLocalTimeZoneFromWin32Data(timeZoneInformation, dstDisabled); + } + + /// + /// Helper function used by 'GetLocalTimeZone()' - this function wraps a bunch of + /// try/catch logic for handling the TimeZoneInfo private constructor that takes + /// a TIME_ZONE_INFORMATION structure. + /// + private static TimeZoneInfo GetLocalTimeZoneFromWin32Data(in TIME_ZONE_INFORMATION timeZoneInformation, bool dstDisabled) + { + // first try to create the TimeZoneInfo with the original 'dstDisabled' flag + try + { + return new TimeZoneInfo(timeZoneInformation, dstDisabled); + } + catch (ArgumentException) { } + catch (InvalidTimeZoneException) { } + + // if 'dstDisabled' was false then try passing in 'true' as a last ditch effort + if (!dstDisabled) + { + try + { + return new TimeZoneInfo(timeZoneInformation, dstDisabled: true); + } + catch (ArgumentException) { } + catch (InvalidTimeZoneException) { } + } + + // the data returned from Windows is completely bogus; return a dummy entry + return CreateCustomTimeZone(LocalId, TimeSpan.Zero, LocalId, LocalId); + } + + /// + /// Helper function for retrieving a TimeZoneInfo object by . + /// This function wraps the logic necessary to keep the private + /// SystemTimeZones cache in working order + /// + /// This function will either return a valid TimeZoneInfo instance or + /// it will throw 'InvalidTimeZoneException' / 'TimeZoneNotFoundException'. + /// + public static TimeZoneInfo FindSystemTimeZoneById(string id) + { + // Special case for Utc as it will not exist in the dictionary with the rest + // of the system time zones. There is no need to do this check for Local.Id + // since Local is a real time zone that exists in the dictionary cache + if (string.Equals(id, UtcId, StringComparison.OrdinalIgnoreCase)) + { + return Utc; + } + + if (id == null) + { + throw new ArgumentNullException(nameof(id)); + } + if (id.Length == 0 || id.Length > MaxKeyLength || id.Contains('\0')) + { + throw new TimeZoneNotFoundException(SR.Format(SR.TimeZoneNotFound_MissingData, id)); + } + + TimeZoneInfo value; + Exception e; + + TimeZoneInfoResult result; + + CachedData cachedData = s_cachedData; + + lock (cachedData) + { + result = TryGetTimeZone(id, false, out value, out e, cachedData); + } + + if (result == TimeZoneInfoResult.Success) + { + return value; + } + else if (result == TimeZoneInfoResult.InvalidTimeZoneException) + { + throw new InvalidTimeZoneException(SR.Format(SR.InvalidTimeZone_InvalidRegistryData, id), e); + } + else if (result == TimeZoneInfoResult.SecurityException) + { + throw new SecurityException(SR.Format(SR.Security_CannotReadRegistryData, id), e); + } + else + { + throw new TimeZoneNotFoundException(SR.Format(SR.TimeZoneNotFound_MissingData, id), e); + } + } + + // DateTime.Now fast path that avoids allocating an historically accurate TimeZoneInfo.Local and just creates a 1-year (current year) accurate time zone + internal static TimeSpan GetDateTimeNowUtcOffsetFromUtc(DateTime time, out bool isAmbiguousLocalDst) + { + bool isDaylightSavings = false; + isAmbiguousLocalDst = false; + TimeSpan baseOffset; + int timeYear = time.Year; + + OffsetAndRule match = s_cachedData.GetOneYearLocalFromUtc(timeYear); + baseOffset = match.Offset; + + if (match.Rule != null) + { + baseOffset = baseOffset + match.Rule.BaseUtcOffsetDelta; + if (match.Rule.HasDaylightSaving) + { + isDaylightSavings = GetIsDaylightSavingsFromUtc(time, timeYear, match.Offset, match.Rule, null, out isAmbiguousLocalDst, Local); + baseOffset += (isDaylightSavings ? match.Rule.DaylightDelta : TimeSpan.Zero /* FUTURE: rule.StandardDelta */); + } + } + return baseOffset; + } + + /// + /// Converts a REG_TZI_FORMAT struct to a TransitionTime + /// - When the argument 'readStart' is true the corresponding daylightTransitionTimeStart field is read + /// - When the argument 'readStart' is false the corresponding dayightTransitionTimeEnd field is read + /// + private static bool TransitionTimeFromTimeZoneInformation(in REG_TZI_FORMAT timeZoneInformation, out TransitionTime transitionTime, bool readStartDate) + { + // + // SYSTEMTIME - + // + // If the time zone does not support daylight saving time or if the caller needs + // to disable daylight saving time, the wMonth member in the SYSTEMTIME structure + // must be zero. If this date is specified, the DaylightDate value in the + // TIME_ZONE_INFORMATION structure must also be specified. Otherwise, the system + // assumes the time zone data is invalid and no changes will be applied. + // + bool supportsDst = (timeZoneInformation.StandardDate.Month != 0); + + if (!supportsDst) + { + transitionTime = default(TransitionTime); + return false; + } + + // + // SYSTEMTIME - + // + // * FixedDateRule - + // If the Year member is not zero, the transition date is absolute; it will only occur one time + // + // * FloatingDateRule - + // To select the correct day in the month, set the Year member to zero, the Hour and Minute + // members to the transition time, the DayOfWeek member to the appropriate weekday, and the + // Day member to indicate the occurence of the day of the week within the month (first through fifth). + // + // Using this notation, specify the 2:00a.m. on the first Sunday in April as follows: + // Hour = 2, + // Month = 4, + // DayOfWeek = 0, + // Day = 1. + // + // Specify 2:00a.m. on the last Thursday in October as follows: + // Hour = 2, + // Month = 10, + // DayOfWeek = 4, + // Day = 5. + // + if (readStartDate) + { + // + // read the "daylightTransitionStart" + // + if (timeZoneInformation.DaylightDate.Year == 0) + { + transitionTime = TransitionTime.CreateFloatingDateRule( + new DateTime(1, /* year */ + 1, /* month */ + 1, /* day */ + timeZoneInformation.DaylightDate.Hour, + timeZoneInformation.DaylightDate.Minute, + timeZoneInformation.DaylightDate.Second, + timeZoneInformation.DaylightDate.Milliseconds), + timeZoneInformation.DaylightDate.Month, + timeZoneInformation.DaylightDate.Day, /* Week 1-5 */ + (DayOfWeek)timeZoneInformation.DaylightDate.DayOfWeek); + } + else + { + transitionTime = TransitionTime.CreateFixedDateRule( + new DateTime(1, /* year */ + 1, /* month */ + 1, /* day */ + timeZoneInformation.DaylightDate.Hour, + timeZoneInformation.DaylightDate.Minute, + timeZoneInformation.DaylightDate.Second, + timeZoneInformation.DaylightDate.Milliseconds), + timeZoneInformation.DaylightDate.Month, + timeZoneInformation.DaylightDate.Day); + } + } + else + { + // + // read the "daylightTransitionEnd" + // + if (timeZoneInformation.StandardDate.Year == 0) + { + transitionTime = TransitionTime.CreateFloatingDateRule( + new DateTime(1, /* year */ + 1, /* month */ + 1, /* day */ + timeZoneInformation.StandardDate.Hour, + timeZoneInformation.StandardDate.Minute, + timeZoneInformation.StandardDate.Second, + timeZoneInformation.StandardDate.Milliseconds), + timeZoneInformation.StandardDate.Month, + timeZoneInformation.StandardDate.Day, /* Week 1-5 */ + (DayOfWeek)timeZoneInformation.StandardDate.DayOfWeek); + } + else + { + transitionTime = TransitionTime.CreateFixedDateRule( + new DateTime(1, /* year */ + 1, /* month */ + 1, /* day */ + timeZoneInformation.StandardDate.Hour, + timeZoneInformation.StandardDate.Minute, + timeZoneInformation.StandardDate.Second, + timeZoneInformation.StandardDate.Milliseconds), + timeZoneInformation.StandardDate.Month, + timeZoneInformation.StandardDate.Day); + } + } + + return true; + } + + /// + /// Helper function that takes: + /// 1. A string representing a registry key name. + /// 2. A REG_TZI_FORMAT struct containing the default rule. + /// 3. An AdjustmentRule[] out-parameter. + /// + private static bool TryCreateAdjustmentRules(string id, in REG_TZI_FORMAT defaultTimeZoneInformation, out AdjustmentRule[] rules, out Exception e, int defaultBaseUtcOffset) + { + rules = null; + e = null; + + try + { + // Optional, Dynamic Time Zone Registry Data + // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- + // + // HKLM + // Software + // Microsoft + // Windows NT + // CurrentVersion + // Time Zones + // + // Dynamic DST + // * "FirstEntry" REG_DWORD "1980" + // First year in the table. If the current year is less than this value, + // this entry will be used for DST boundaries + // * "LastEntry" REG_DWORD "2038" + // Last year in the table. If the current year is greater than this value, + // this entry will be used for DST boundaries" + // * "" REG_BINARY REG_TZI_FORMAT + // * "" REG_BINARY REG_TZI_FORMAT + // * "" REG_BINARY REG_TZI_FORMAT + // + using (RegistryKey dynamicKey = Registry.LocalMachine.OpenSubKey(TimeZonesRegistryHive + "\\" + id + "\\Dynamic DST", writable: false)) + { + if (dynamicKey == null) + { + AdjustmentRule rule = CreateAdjustmentRuleFromTimeZoneInformation( + defaultTimeZoneInformation, DateTime.MinValue.Date, DateTime.MaxValue.Date, defaultBaseUtcOffset); + if (rule != null) + { + rules = new[] { rule }; + } + return true; + } + + // + // loop over all of the "\Dynamic DST" hive entries + // + // read FirstEntry {MinValue - (year1, 12, 31)} + // read MiddleEntry {(yearN, 1, 1) - (yearN, 12, 31)} + // read LastEntry {(yearN, 1, 1) - MaxValue } + + // read the FirstEntry and LastEntry key values (ex: "1980", "2038") + int first = (int)dynamicKey.GetValue(FirstEntryValue, -1, RegistryValueOptions.None); + int last = (int)dynamicKey.GetValue(LastEntryValue, -1, RegistryValueOptions.None); + + if (first == -1 || last == -1 || first > last) + { + return false; + } + + // read the first year entry + REG_TZI_FORMAT dtzi; + + if (!TryGetTimeZoneEntryFromRegistry(dynamicKey, first.ToString(CultureInfo.InvariantCulture), out dtzi)) + { + return false; + } + + if (first == last) + { + // there is just 1 dynamic rule for this time zone. + AdjustmentRule rule = CreateAdjustmentRuleFromTimeZoneInformation(dtzi, DateTime.MinValue.Date, DateTime.MaxValue.Date, defaultBaseUtcOffset); + if (rule != null) + { + rules = new[] { rule }; + } + return true; + } + + List rulesList = new List(1); + + // there are more than 1 dynamic rules for this time zone. + AdjustmentRule firstRule = CreateAdjustmentRuleFromTimeZoneInformation( + dtzi, + DateTime.MinValue.Date, // MinValue + new DateTime(first, 12, 31), // December 31, + defaultBaseUtcOffset); + + if (firstRule != null) + { + rulesList.Add(firstRule); + } + + // read the middle year entries + for (int i = first + 1; i < last; i++) + { + if (!TryGetTimeZoneEntryFromRegistry(dynamicKey, i.ToString(CultureInfo.InvariantCulture), out dtzi)) + { + return false; + } + AdjustmentRule middleRule = CreateAdjustmentRuleFromTimeZoneInformation( + dtzi, + new DateTime(i, 1, 1), // January 01, + new DateTime(i, 12, 31), // December 31, + defaultBaseUtcOffset); + + if (middleRule != null) + { + rulesList.Add(middleRule); + } + } + + // read the last year entry + if (!TryGetTimeZoneEntryFromRegistry(dynamicKey, last.ToString(CultureInfo.InvariantCulture), out dtzi)) + { + return false; + } + AdjustmentRule lastRule = CreateAdjustmentRuleFromTimeZoneInformation( + dtzi, + new DateTime(last, 1, 1), // January 01, + DateTime.MaxValue.Date, // MaxValue + defaultBaseUtcOffset); + + if (lastRule != null) + { + rulesList.Add(lastRule); + } + + // convert the List to an AdjustmentRule array + if (rulesList.Count != 0) + { + rules = rulesList.ToArray(); + } + } // end of: using (RegistryKey dynamicKey... + } + catch (InvalidCastException ex) + { + // one of the RegistryKey.GetValue calls could not be cast to an expected value type + e = ex; + return false; + } + catch (ArgumentOutOfRangeException ex) + { + e = ex; + return false; + } + catch (ArgumentException ex) + { + e = ex; + return false; + } + return true; + } + + private static unsafe bool TryGetTimeZoneEntryFromRegistry(RegistryKey key, string name, out REG_TZI_FORMAT dtzi) + { + byte[] regValue = key.GetValue(name, null, RegistryValueOptions.None) as byte[]; + if (regValue == null || regValue.Length != sizeof(REG_TZI_FORMAT)) + { + dtzi = default; + return false; + } + fixed (byte * pBytes = ®Value[0]) + dtzi = *(REG_TZI_FORMAT *)pBytes; + return true; + } + + /// + /// Helper function that compares the StandardBias and StandardDate portion a + /// TimeZoneInformation struct to a time zone registry entry. + /// + private static bool TryCompareStandardDate(in TIME_ZONE_INFORMATION timeZone, in REG_TZI_FORMAT registryTimeZoneInfo) => + timeZone.Bias == registryTimeZoneInfo.Bias && + timeZone.StandardBias == registryTimeZoneInfo.StandardBias && + timeZone.StandardDate.Equals(registryTimeZoneInfo.StandardDate); + + /// + /// Helper function that compares a TimeZoneInformation struct to a time zone registry entry. + /// + private static bool TryCompareTimeZoneInformationToRegistry(in TIME_ZONE_INFORMATION timeZone, string id, out bool dstDisabled) + { + dstDisabled = false; + + using (RegistryKey key = Registry.LocalMachine.OpenSubKey(TimeZonesRegistryHive + "\\" + id, writable: false)) + { + if (key == null) + { + return false; + } + + REG_TZI_FORMAT registryTimeZoneInfo; + if (!TryGetTimeZoneEntryFromRegistry(key, TimeZoneInfoValue, out registryTimeZoneInfo)) + { + return false; + } + + // + // first compare the bias and standard date information between the data from the Win32 API + // and the data from the registry... + // + bool result = TryCompareStandardDate(timeZone, registryTimeZoneInfo); + + if (!result) + { + return false; + } + + result = dstDisabled || CheckDaylightSavingTimeNotSupported(timeZone) || + // + // since Daylight Saving Time is not "disabled", do a straight comparision between + // the Win32 API data and the registry data ... + // + (timeZone.DaylightBias == registryTimeZoneInfo.DaylightBias && + timeZone.DaylightDate.Equals(registryTimeZoneInfo.DaylightDate)); + + // Finally compare the "StandardName" string value... + // + // we do not compare "DaylightName" as this TimeZoneInformation field may contain + // either "StandardName" or "DaylightName" depending on the time of year and current machine settings + // + if (result) + { + string registryStandardName = key.GetValue(StandardValue, string.Empty, RegistryValueOptions.None) as string; + result = string.Equals(registryStandardName, timeZone.GetStandardName(), StringComparison.Ordinal); + } + return result; + } + } + + /// + /// Helper function for retrieving a localized string resource via MUI. + /// The function expects a string in the form: "@resource.dll, -123" + /// + /// "resource.dll" is a language-neutral portable executable (LNPE) file in + /// the %windir%\system32 directory. The OS is queried to find the best-fit + /// localized resource file for this LNPE (ex: %windir%\system32\en-us\resource.dll.mui). + /// If a localized resource file exists, we LoadString resource ID "123" and + /// return it to our caller. + /// + private static string TryGetLocalizedNameByMuiNativeResource(string resource) + { + if (string.IsNullOrEmpty(resource)) + { + return string.Empty; + } + + // parse "@tzres.dll, -100" + // + // filePath = "C:\Windows\System32\tzres.dll" + // resourceId = -100 + // + string[] resources = resource.Split(','); + if (resources.Length != 2) + { + return string.Empty; + } + + string filePath; + int resourceId; + + // get the path to Windows\System32 + string system32 = Environment.SystemDirectory; + + // trim the string "@tzres.dll" => "tzres.dll" + string tzresDll = resources[0].TrimStart('@'); + + try + { + filePath = Path.Combine(system32, tzresDll); + } + catch (ArgumentException) + { + // there were probably illegal characters in the path + return string.Empty; + } + + if (!int.TryParse(resources[1], NumberStyles.Integer, CultureInfo.InvariantCulture, out resourceId)) + { + return string.Empty; + } + resourceId = -resourceId; + + try + { + StringBuilder fileMuiPath = StringBuilderCache.Acquire(Interop.Kernel32.MAX_PATH); + fileMuiPath.Length = Interop.Kernel32.MAX_PATH; + int fileMuiPathLength = Interop.Kernel32.MAX_PATH; + int languageLength = 0; + long enumerator = 0; + + bool succeeded = Interop.Kernel32.GetFileMUIPath( + Interop.Kernel32.MUI_PREFERRED_UI_LANGUAGES, + filePath, null /* language */, ref languageLength, + fileMuiPath, ref fileMuiPathLength, ref enumerator); + if (!succeeded) + { + StringBuilderCache.Release(fileMuiPath); + return string.Empty; + } + return TryGetLocalizedNameByNativeResource(StringBuilderCache.GetStringAndRelease(fileMuiPath), resourceId); + } + catch (EntryPointNotFoundException) + { + return string.Empty; + } + } + + /// + /// Helper function for retrieving a localized string resource via a native resource DLL. + /// The function expects a string in the form: "C:\Windows\System32\en-us\resource.dll" + /// + /// "resource.dll" is a language-specific resource DLL. + /// If the localized resource DLL exists, LoadString(resource) is returned. + /// + private static string TryGetLocalizedNameByNativeResource(string filePath, int resource) + { + using (SafeLibraryHandle handle = + Interop.Kernel32.LoadLibraryEx(filePath, IntPtr.Zero, Interop.Kernel32.LOAD_LIBRARY_AS_DATAFILE)) + { + if (!handle.IsInvalid) + { + const int LoadStringMaxLength = 500; + + StringBuilder localizedResource = StringBuilderCache.Acquire(LoadStringMaxLength); + + int result = Interop.User32.LoadString(handle, resource, + localizedResource, LoadStringMaxLength); + + if (result != 0) + { + return StringBuilderCache.GetStringAndRelease(localizedResource); + } + } + } + return string.Empty; + } + + /// + /// Helper function for retrieving the DisplayName, StandardName, and DaylightName from the registry + /// + /// The function first checks the MUI_ key-values, and if they exist, it loads the strings from the MUI + /// resource dll(s). When the keys do not exist, the function falls back to reading from the standard + /// key-values + /// + private static void GetLocalizedNamesByRegistryKey(RegistryKey key, out string displayName, out string standardName, out string daylightName) + { + displayName = string.Empty; + standardName = string.Empty; + daylightName = string.Empty; + + // read the MUI_ registry keys + string displayNameMuiResource = key.GetValue(MuiDisplayValue, string.Empty, RegistryValueOptions.None) as string; + string standardNameMuiResource = key.GetValue(MuiStandardValue, string.Empty, RegistryValueOptions.None) as string; + string daylightNameMuiResource = key.GetValue(MuiDaylightValue, string.Empty, RegistryValueOptions.None) as string; + + // try to load the strings from the native resource DLL(s) + if (!string.IsNullOrEmpty(displayNameMuiResource)) + { + displayName = TryGetLocalizedNameByMuiNativeResource(displayNameMuiResource); + } + + if (!string.IsNullOrEmpty(standardNameMuiResource)) + { + standardName = TryGetLocalizedNameByMuiNativeResource(standardNameMuiResource); + } + + if (!string.IsNullOrEmpty(daylightNameMuiResource)) + { + daylightName = TryGetLocalizedNameByMuiNativeResource(daylightNameMuiResource); + } + + // fallback to using the standard registry keys + if (string.IsNullOrEmpty(displayName)) + { + displayName = key.GetValue(DisplayValue, string.Empty, RegistryValueOptions.None) as string; + } + if (string.IsNullOrEmpty(standardName)) + { + standardName = key.GetValue(StandardValue, string.Empty, RegistryValueOptions.None) as string; + } + if (string.IsNullOrEmpty(daylightName)) + { + daylightName = key.GetValue(DaylightValue, string.Empty, RegistryValueOptions.None) as string; + } + } + + /// + /// Helper function that takes a string representing a registry key name + /// and returns a TimeZoneInfo instance. + /// + private static TimeZoneInfoResult TryGetTimeZoneFromLocalMachine(string id, out TimeZoneInfo value, out Exception e) + { + e = null; + + // Standard Time Zone Registry Data + // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= + // HKLM + // Software + // Microsoft + // Windows NT + // CurrentVersion + // Time Zones + // + // * STD, REG_SZ "Standard Time Name" + // (For OS installed zones, this will always be English) + // * MUI_STD, REG_SZ "@tzres.dll,-1234" + // Indirect string to localized resource for Standard Time, + // add "%windir%\system32\" after "@" + // * DLT, REG_SZ "Daylight Time Name" + // (For OS installed zones, this will always be English) + // * MUI_DLT, REG_SZ "@tzres.dll,-1234" + // Indirect string to localized resource for Daylight Time, + // add "%windir%\system32\" after "@" + // * Display, REG_SZ "Display Name like (GMT-8:00) Pacific Time..." + // * MUI_Display, REG_SZ "@tzres.dll,-1234" + // Indirect string to localized resource for the Display, + // add "%windir%\system32\" after "@" + // * TZI, REG_BINARY REG_TZI_FORMAT + // + using (RegistryKey key = Registry.LocalMachine.OpenSubKey(TimeZonesRegistryHive + "\\" + id, writable: false)) + { + if (key == null) + { + value = null; + return TimeZoneInfoResult.TimeZoneNotFoundException; + } + + REG_TZI_FORMAT defaultTimeZoneInformation; + if (!TryGetTimeZoneEntryFromRegistry(key, TimeZoneInfoValue, out defaultTimeZoneInformation)) + { + // the registry value could not be cast to a byte array + value = null; + return TimeZoneInfoResult.InvalidTimeZoneException; + } + + AdjustmentRule[] adjustmentRules; + if (!TryCreateAdjustmentRules(id, defaultTimeZoneInformation, out adjustmentRules, out e, defaultTimeZoneInformation.Bias)) + { + value = null; + return TimeZoneInfoResult.InvalidTimeZoneException; + } + + GetLocalizedNamesByRegistryKey(key, out string displayName, out string standardName, out string daylightName); + + try + { + value = new TimeZoneInfo( + id, + new TimeSpan(0, -(defaultTimeZoneInformation.Bias), 0), + displayName, + standardName, + daylightName, + adjustmentRules, + disableDaylightSavingTime: false); + + return TimeZoneInfoResult.Success; + } + catch (ArgumentException ex) + { + // TimeZoneInfo constructor can throw ArgumentException and InvalidTimeZoneException + value = null; + e = ex; + return TimeZoneInfoResult.InvalidTimeZoneException; + } + catch (InvalidTimeZoneException ex) + { + // TimeZoneInfo constructor can throw ArgumentException and InvalidTimeZoneException + value = null; + e = ex; + return TimeZoneInfoResult.InvalidTimeZoneException; + } + } + } + } +} diff --git a/external/corefx/src/Common/src/CoreLib/System/TimeZoneInfo.cs b/external/corefx/src/Common/src/CoreLib/System/TimeZoneInfo.cs index f9b5ce872a..6e27376b68 100644 --- a/external/corefx/src/Common/src/CoreLib/System/TimeZoneInfo.cs +++ b/external/corefx/src/Common/src/CoreLib/System/TimeZoneInfo.cs @@ -1894,7 +1894,7 @@ namespace System if (result == TimeZoneInfoResult.Success) { if (cachedData._systemTimeZones == null) - cachedData._systemTimeZones = new Dictionary(); + cachedData._systemTimeZones = new Dictionary(StringComparer.OrdinalIgnoreCase); cachedData._systemTimeZones.Add(id, match); diff --git a/external/corefx/src/Common/src/CoreLib/System/TimeZoneNotFoundException.cs b/external/corefx/src/Common/src/CoreLib/System/TimeZoneNotFoundException.cs index f83c6443c3..36c3d7ef08 100644 --- a/external/corefx/src/Common/src/CoreLib/System/TimeZoneNotFoundException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/TimeZoneNotFoundException.cs @@ -7,7 +7,11 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if MONO + [System.Runtime.CompilerServices.TypeForwardedFrom("System.Core, Version=2.0.5.0, Culture=Neutral, PublicKeyToken=7cec85d7bea7798e")] +#else [System.Runtime.CompilerServices.TypeForwardedFrom("System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class TimeZoneNotFoundException : Exception { public TimeZoneNotFoundException() diff --git a/external/corefx/src/Common/src/CoreLib/System/TimeoutException.cs b/external/corefx/src/Common/src/CoreLib/System/TimeoutException.cs index ddaa47747d..5f4633cad3 100644 --- a/external/corefx/src/Common/src/CoreLib/System/TimeoutException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/TimeoutException.cs @@ -16,7 +16,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class TimeoutException : SystemException { public TimeoutException() diff --git a/external/corefx/src/Common/src/CoreLib/System/Type.cs b/external/corefx/src/Common/src/CoreLib/System/Type.cs index a0d219ddd4..b57baa869f 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Type.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Type.cs @@ -349,7 +349,7 @@ namespace System public static Type MakeGenericMethodParameter(int position) { if (position < 0) - throw new ArgumentException(SR.ArgumentOutOfRange_MustBeNonNegNum, nameof(position)); + throw new ArgumentException(SR.ArgumentOutOfRange_NeedNonNegNum, nameof(position)); return new SignatureGenericMethodParameterType(position); } diff --git a/external/corefx/src/Common/src/CoreLib/System/TypeAccessException.cs b/external/corefx/src/Common/src/CoreLib/System/TypeAccessException.cs index e12a8b08dd..0c26fe3e16 100644 --- a/external/corefx/src/Common/src/CoreLib/System/TypeAccessException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/TypeAccessException.cs @@ -9,7 +9,9 @@ namespace System // TypeAccessException derives from TypeLoadException rather than MemberAccessException because in // pre-v4 releases of the runtime TypeLoadException was used in lieu of a TypeAccessException. [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class TypeAccessException : TypeLoadException { public TypeAccessException() diff --git a/external/corefx/src/Common/src/CoreLib/System/TypeInitializationException.cs b/external/corefx/src/Common/src/CoreLib/System/TypeInitializationException.cs index 4bf2906217..0b5bb5b6ee 100644 --- a/external/corefx/src/Common/src/CoreLib/System/TypeInitializationException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/TypeInitializationException.cs @@ -20,7 +20,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public sealed class TypeInitializationException : SystemException { private String _typeName; diff --git a/external/corefx/src/Common/src/CoreLib/System/TypeUnloadedException.cs b/external/corefx/src/Common/src/CoreLib/System/TypeUnloadedException.cs index a01ef37a8b..29b07243af 100644 --- a/external/corefx/src/Common/src/CoreLib/System/TypeUnloadedException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/TypeUnloadedException.cs @@ -7,7 +7,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class TypeUnloadedException : SystemException { public TypeUnloadedException() diff --git a/external/corefx/src/Common/src/CoreLib/System/UInt16.cs b/external/corefx/src/Common/src/CoreLib/System/UInt16.cs index 3047d18198..155a2f87d3 100644 --- a/external/corefx/src/Common/src/CoreLib/System/UInt16.cs +++ b/external/corefx/src/Common/src/CoreLib/System/UInt16.cs @@ -12,7 +12,9 @@ namespace System [Serializable] [CLSCompliant(false)] [StructLayout(LayoutKind.Sequential)] +#if !MONO [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public struct UInt16 : IComparable, IConvertible, IFormattable, IComparable, IEquatable, ISpanFormattable { private ushort m_value; // Do not rename (binary serialization) diff --git a/external/corefx/src/Common/src/CoreLib/System/UInt32.cs b/external/corefx/src/Common/src/CoreLib/System/UInt32.cs index 1e33dcf17b..93aba0bdb5 100644 --- a/external/corefx/src/Common/src/CoreLib/System/UInt32.cs +++ b/external/corefx/src/Common/src/CoreLib/System/UInt32.cs @@ -12,7 +12,9 @@ namespace System [Serializable] [CLSCompliant(false)] [StructLayout(LayoutKind.Sequential)] +#if !MONO [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public struct UInt32 : IComparable, IConvertible, IFormattable, IComparable, IEquatable, ISpanFormattable { private uint m_value; // Do not rename (binary serialization) diff --git a/external/corefx/src/Common/src/CoreLib/System/UInt64.cs b/external/corefx/src/Common/src/CoreLib/System/UInt64.cs index d30fbe1e42..3e2cec0203 100644 --- a/external/corefx/src/Common/src/CoreLib/System/UInt64.cs +++ b/external/corefx/src/Common/src/CoreLib/System/UInt64.cs @@ -12,7 +12,9 @@ namespace System [Serializable] [CLSCompliant(false)] [StructLayout(LayoutKind.Sequential)] +#if !MONO [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public struct UInt64 : IComparable, IConvertible, IFormattable, IComparable, IEquatable, ISpanFormattable { private ulong m_value; // Do not rename (binary serialization) diff --git a/external/corefx/src/Common/src/CoreLib/System/UIntPtr.cs b/external/corefx/src/Common/src/CoreLib/System/UIntPtr.cs index 23750e95fa..6de5a4470b 100644 --- a/external/corefx/src/Common/src/CoreLib/System/UIntPtr.cs +++ b/external/corefx/src/Common/src/CoreLib/System/UIntPtr.cs @@ -17,10 +17,12 @@ namespace System { [Serializable] [CLSCompliant(false)] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public struct UIntPtr : IEquatable, ISerializable { - unsafe private void* _value; // Do not rename (binary serialization) + private unsafe void* _value; // Do not rename (binary serialization) [Intrinsic] public static readonly UIntPtr Zero; @@ -77,9 +79,9 @@ namespace System return false; } - unsafe bool IEquatable.Equals(UIntPtr value) + unsafe bool IEquatable.Equals(UIntPtr other) { - return _value == value._value; + return _value == other._value; } public unsafe override int GetHashCode() diff --git a/external/corefx/src/Common/src/CoreLib/System/UnauthorizedAccessException.cs b/external/corefx/src/Common/src/CoreLib/System/UnauthorizedAccessException.cs index a28f6dd73c..02f4c27f72 100644 --- a/external/corefx/src/Common/src/CoreLib/System/UnauthorizedAccessException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/UnauthorizedAccessException.cs @@ -20,7 +20,9 @@ namespace System // The UnauthorizedAccessException is thrown when access errors // occur from IO or other OS methods. [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class UnauthorizedAccessException : SystemException { public UnauthorizedAccessException() diff --git a/external/corefx/src/Common/src/CoreLib/System/UnhandledExceptionEventArgs.cs b/external/corefx/src/Common/src/CoreLib/System/UnhandledExceptionEventArgs.cs index 5cde572161..b2959839ba 100644 --- a/external/corefx/src/Common/src/CoreLib/System/UnhandledExceptionEventArgs.cs +++ b/external/corefx/src/Common/src/CoreLib/System/UnhandledExceptionEventArgs.cs @@ -4,6 +4,9 @@ namespace System { +#if MONO + [Serializable] +#endif public class UnhandledExceptionEventArgs : EventArgs { private Object _exception; diff --git a/external/corefx/src/Common/src/CoreLib/System/UnhandledExceptionEventHandler.cs b/external/corefx/src/Common/src/CoreLib/System/UnhandledExceptionEventHandler.cs index 14e31c7bbd..6c5ee621d9 100644 --- a/external/corefx/src/Common/src/CoreLib/System/UnhandledExceptionEventHandler.cs +++ b/external/corefx/src/Common/src/CoreLib/System/UnhandledExceptionEventHandler.cs @@ -4,5 +4,8 @@ namespace System { +#if MONO + [Serializable] +#endif public delegate void UnhandledExceptionEventHandler(Object sender, UnhandledExceptionEventArgs e); } diff --git a/external/corefx/src/Common/src/CoreLib/System/UnitySerializationHolder.cs b/external/corefx/src/Common/src/CoreLib/System/UnitySerializationHolder.cs index 2f30356709..53323c32bc 100644 --- a/external/corefx/src/Common/src/CoreLib/System/UnitySerializationHolder.cs +++ b/external/corefx/src/Common/src/CoreLib/System/UnitySerializationHolder.cs @@ -11,12 +11,8 @@ namespace System /// This only exists for compatibility with .NET Framework. /// [Serializable] -#if CORERT - public -#else - internal -#endif - sealed class UnitySerializationHolder : ISerializable, IObjectReference + // Needs to be public to support binary serialization compatibility + public sealed class UnitySerializationHolder : ISerializable, IObjectReference { internal const int NullUnity = 0x0002; private readonly int _unityType; diff --git a/external/corefx/src/Common/src/CoreLib/System/Version.cs b/external/corefx/src/Common/src/CoreLib/System/Version.cs index df16be2cd2..fe086be512 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Version.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Version.cs @@ -300,7 +300,7 @@ namespace System throw new ArgumentNullException(nameof(input)); } - return ParseVersion(input.AsReadOnlySpan(), throwOnFailure: true); + return ParseVersion(input.AsSpan(), throwOnFailure: true); } public static Version Parse(ReadOnlySpan input) => @@ -314,7 +314,7 @@ namespace System return false; } - return (result = ParseVersion(input.AsReadOnlySpan(), throwOnFailure: false)) != null; + return (result = ParseVersion(input.AsSpan(), throwOnFailure: false)) != null; } public static bool TryParse(ReadOnlySpan input, out Version result) => @@ -333,13 +333,15 @@ namespace System // Find the ends of the optional minor and build portions. // We musn't have any separators after build. int buildEnd = -1; - int minorEnd = input.IndexOf('.', majorEnd + 1); + int minorEnd = input.Slice(majorEnd + 1).IndexOf('.'); if (minorEnd != -1) { - buildEnd = input.IndexOf('.', minorEnd + 1); + minorEnd += (majorEnd + 1); + buildEnd = input.Slice(minorEnd + 1).IndexOf('.'); if (buildEnd != -1) { - if (input.IndexOf('.', buildEnd + 1) != -1) + buildEnd += (minorEnd + 1); + if (input.Slice(buildEnd + 1).IndexOf('.') != -1) { if (throwOnFailure) throw new ArgumentException(SR.Arg_VersionString, nameof(input)); return null; @@ -347,10 +349,10 @@ namespace System } } - int major, minor, build, revision; + int minor, build, revision; // Parse the major version - if (!TryParseComponent(input.Slice(0, majorEnd), nameof(input), throwOnFailure, out major)) + if (!TryParseComponent(input.Slice(0, majorEnd), nameof(input), throwOnFailure, out int major)) { return null; } diff --git a/external/corefx/src/Common/src/Internal/Cryptography/UniversalCryptoDecryptor.cs b/external/corefx/src/Common/src/Internal/Cryptography/UniversalCryptoDecryptor.cs index 0d80658cf1..6415ec6967 100644 --- a/external/corefx/src/Common/src/Internal/Cryptography/UniversalCryptoDecryptor.cs +++ b/external/corefx/src/Common/src/Internal/Cryptography/UniversalCryptoDecryptor.cs @@ -147,8 +147,8 @@ namespace Internal.Cryptography case PaddingMode.None: return false; default: - Debug.Fail($"Invalid padding mode {PaddingMode}."); - throw new CryptographicException(SR.Cryptography_InvalidPadding); + Debug.Fail($"Unknown padding mode {PaddingMode}."); + throw new CryptographicException(SR.Cryptography_UnknownPaddingMode); } } } diff --git a/external/corefx/src/Common/src/Interop/Linux/procfs/Interop.ProcFsStat.cs b/external/corefx/src/Common/src/Interop/Linux/procfs/Interop.ProcFsStat.cs index 2b87afa3c7..a34184a8ef 100644 --- a/external/corefx/src/Common/src/Interop/Linux/procfs/Interop.ProcFsStat.cs +++ b/external/corefx/src/Common/src/Interop/Linux/procfs/Interop.ProcFsStat.cs @@ -21,7 +21,7 @@ internal static partial class Interop private const string TaskDirectoryName = "/task/"; internal const string SelfExeFilePath = RootPath + "self" + ExeFileName; - internal const string ProcUptimeFilePath = RootPath + "uptime"; + internal const string ProcStatFilePath = RootPath + "stat"; internal struct ParsedStat { diff --git a/external/corefx/src/Common/src/Interop/OSX/Interop.CoreFoundation.CFData.cs b/external/corefx/src/Common/src/Interop/OSX/Interop.CoreFoundation.CFData.cs index 5920e32038..e4eee4e078 100644 --- a/external/corefx/src/Common/src/Interop/OSX/Interop.CoreFoundation.CFData.cs +++ b/external/corefx/src/Common/src/Interop/OSX/Interop.CoreFoundation.CFData.cs @@ -27,7 +27,14 @@ internal static partial class Interop try { cfData.DangerousAddRef(ref addedRef); - byte[] bytes = new byte[CFDataGetLength(cfData).ToInt64()]; + long length = CFDataGetLength(cfData).ToInt64(); + + if (length == 0) + { + return Array.Empty(); + } + + byte[] bytes = new byte[length]; unsafe { @@ -55,16 +62,20 @@ internal static partial class Interop cfData.DangerousAddRef(ref addedRef); long length = CFDataGetLength(cfData).ToInt64(); - if (destination.Length < length) - { - bytesWritten = 0; - return false; - } - byte* dataBytes = CFDataGetBytePtr(cfData); - fixed (byte* destinationPtr = &MemoryMarshal.GetReference(destination)) + if (length > 0) { - Buffer.MemoryCopy(dataBytes, destinationPtr, destination.Length, length); + if (destination.Length < length) + { + bytesWritten = 0; + return false; + } + + byte* dataBytes = CFDataGetBytePtr(cfData); + fixed (byte* destinationPtr = &MemoryMarshal.GetReference(destination)) + { + Buffer.MemoryCopy(dataBytes, destinationPtr, destination.Length, length); + } } bytesWritten = (int)length; diff --git a/external/corefx/src/Common/src/Interop/OSX/Interop.CoreFoundation.CFDate.cs b/external/corefx/src/Common/src/Interop/OSX/Interop.CoreFoundation.CFDate.cs index c3c6784160..f20f3c2c4d 100644 --- a/external/corefx/src/Common/src/Interop/OSX/Interop.CoreFoundation.CFDate.cs +++ b/external/corefx/src/Common/src/Interop/OSX/Interop.CoreFoundation.CFDate.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.InteropServices; using Microsoft.Win32.SafeHandles; diff --git a/external/corefx/src/Common/src/Interop/OSX/Interop.CoreFoundation.CFError.cs b/external/corefx/src/Common/src/Interop/OSX/Interop.CoreFoundation.CFError.cs index af3b5cd4c3..a69a9616d9 100644 --- a/external/corefx/src/Common/src/Interop/OSX/Interop.CoreFoundation.CFError.cs +++ b/external/corefx/src/Common/src/Interop/OSX/Interop.CoreFoundation.CFError.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.InteropServices; using Microsoft.Win32.SafeHandles; diff --git a/external/corefx/src/Common/src/Interop/OSX/Interop.CoreFoundation.CFString.cs b/external/corefx/src/Common/src/Interop/OSX/Interop.CoreFoundation.CFString.cs index aa7a15054c..89ce48d51b 100644 --- a/external/corefx/src/Common/src/Interop/OSX/Interop.CoreFoundation.CFString.cs +++ b/external/corefx/src/Common/src/Interop/OSX/Interop.CoreFoundation.CFString.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.InteropServices; using System.Text; using Microsoft.Win32.SafeHandles; diff --git a/external/corefx/src/Common/src/Interop/OSX/Interop.CoreFoundation.cs b/external/corefx/src/Common/src/Interop/OSX/Interop.CoreFoundation.cs index ff36ebc91f..4c7fd5c84a 100644 --- a/external/corefx/src/Common/src/Interop/OSX/Interop.CoreFoundation.cs +++ b/external/corefx/src/Common/src/Interop/OSX/Interop.CoreFoundation.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.InteropServices; using Microsoft.Win32.SafeHandles; diff --git a/external/corefx/src/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Err.cs b/external/corefx/src/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Err.cs index b33c9f41bf..eeaac1cf06 100644 --- a/external/corefx/src/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Err.cs +++ b/external/corefx/src/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Err.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using System.Diagnostics; +using System.Diagnostics.Private; using System.Security.Cryptography; using Microsoft.Win32.SafeHandles; diff --git a/external/corefx/src/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.KeyAgree.cs b/external/corefx/src/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.KeyAgree.cs new file mode 100644 index 0000000000..e213670a95 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.KeyAgree.cs @@ -0,0 +1,61 @@ +// 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; +using System.Diagnostics; +using System.Runtime.InteropServices; +using System.Security.Cryptography; +using System.Security.Cryptography.Apple; +using Microsoft.Win32.SafeHandles; + +internal static partial class Interop +{ + internal static partial class AppleCrypto + { + [DllImport(Libraries.AppleCryptoNative)] + private static extern int AppleCryptoNative_EcdhKeyAgree( + SafeSecKeyRefHandle privateKey, + SafeSecKeyRefHandle publicKey, + out SafeCFDataHandle cfDataOut, + out SafeCFErrorHandle cfErrorOut); + + internal static byte[] EcdhKeyAgree( + SafeSecKeyRefHandle privateKey, + SafeSecKeyRefHandle publicKey, + Span opportunisticDestination, + out int bytesWritten) + { + const int Success = 1; + const int kErrorSeeError = -2; + + SafeCFDataHandle data; + SafeCFErrorHandle error; + + int status = AppleCryptoNative_EcdhKeyAgree(privateKey, publicKey, out data, out error); + + using (data) + using (error) + { + if (status == kErrorSeeError) + { + throw CreateExceptionForCFError(error); + } + + if (status == Success && !data.IsInvalid) + { + if (CoreFoundation.TryCFWriteData(data, opportunisticDestination, out bytesWritten)) + { + return null; + } + + bytesWritten = 0; + return CoreFoundation.CFGetData(data); + } + + Debug.Fail($"Unexpected status ({status})"); + throw new CryptographicException(); + } + } + } +} diff --git a/external/corefx/src/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.RSA.cs b/external/corefx/src/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.RSA.cs index 1c99e6c5e6..17349f0cad 100644 --- a/external/corefx/src/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.RSA.cs +++ b/external/corefx/src/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.RSA.cs @@ -21,6 +21,38 @@ internal static partial class Interop out SafeSecKeyRefHandle pPrivateKey, out int pOSStatus); + [DllImport(Libraries.AppleCryptoNative)] + private static extern int AppleCryptoNative_RsaSignaturePrimitive( + SafeSecKeyRefHandle privateKey, + ref byte pbData, + int cbData, + out SafeCFDataHandle pDataOut, + out SafeCFErrorHandle pErrorOut); + + [DllImport(Libraries.AppleCryptoNative)] + private static extern int AppleCryptoNative_RsaVerificationPrimitive( + SafeSecKeyRefHandle publicKey, + ref byte pbData, + int cbData, + out SafeCFDataHandle pDataOut, + out SafeCFErrorHandle pErrorOut); + + [DllImport(Libraries.AppleCryptoNative)] + private static extern int AppleCryptoNative_RsaDecryptionPrimitive( + SafeSecKeyRefHandle privateKey, + ref byte pbData, + int cbData, + out SafeCFDataHandle pDataOut, + out SafeCFErrorHandle pErrorOut); + + [DllImport(Libraries.AppleCryptoNative)] + private static extern int AppleCryptoNative_RsaEncryptionPrimitive( + SafeSecKeyRefHandle publicKey, + ref byte pbData, + int cbData, + out SafeCFDataHandle pDataOut, + out SafeCFErrorHandle pErrorOut); + private static int RsaEncryptOaep( SafeSecKeyRefHandle publicKey, ReadOnlySpan pbData, @@ -220,6 +252,94 @@ internal static partial class Interop }); } + private static bool ProcessPrimitiveResponse( + int returnValue, + SafeCFDataHandle cfData, + SafeCFErrorHandle cfError, + Span destination, + out int bytesWritten) + { + const int kErrorSeeError = -2; + const int kSuccess = 1; + + if (returnValue == kErrorSeeError) + { + throw CreateExceptionForCFError(cfError); + } + + if (returnValue == kSuccess && !cfData.IsInvalid) + { + return CoreFoundation.TryCFWriteData(cfData, destination, out bytesWritten); + } + + Debug.Fail($"Unknown return value ({returnValue}) or no data object returned"); + throw new CryptographicException(); + } + + internal static bool TryRsaDecryptionPrimitive( + SafeSecKeyRefHandle privateKey, + ReadOnlySpan source, + Span destination, + out int bytesWritten) + { + int returnValue = AppleCryptoNative_RsaDecryptionPrimitive( + privateKey, + ref MemoryMarshal.GetReference(source), + source.Length, + out SafeCFDataHandle cfData, + out SafeCFErrorHandle cfError); + + return ProcessPrimitiveResponse(returnValue, cfData, cfError, destination, out bytesWritten); + } + + internal static bool TryRsaEncryptionPrimitive( + SafeSecKeyRefHandle publicKey, + ReadOnlySpan source, + Span destination, + out int bytesWritten) + { + int returnValue = AppleCryptoNative_RsaEncryptionPrimitive( + publicKey, + ref MemoryMarshal.GetReference(source), + source.Length, + out SafeCFDataHandle cfData, + out SafeCFErrorHandle cfError); + + return ProcessPrimitiveResponse(returnValue, cfData, cfError, destination, out bytesWritten); + } + + internal static bool TryRsaSignaturePrimitive( + SafeSecKeyRefHandle privateKey, + ReadOnlySpan source, + Span destination, + out int bytesWritten) + { + int returnValue = AppleCryptoNative_RsaSignaturePrimitive( + privateKey, + ref MemoryMarshal.GetReference(source), + source.Length, + out SafeCFDataHandle cfData, + out SafeCFErrorHandle cfError); + + return ProcessPrimitiveResponse(returnValue, cfData, cfError, destination, out bytesWritten); + } + + internal static bool TryRsaVerificationPrimitive( + SafeSecKeyRefHandle publicKey, + ReadOnlySpan source, + Span destination, + out int bytesWritten) + { + int returnValue = AppleCryptoNative_RsaVerificationPrimitive( + publicKey, + ref MemoryMarshal.GetReference(source), + source.Length, + out SafeCFDataHandle cfData, + out SafeCFErrorHandle cfError); + + return ProcessPrimitiveResponse(returnValue, cfData, cfError, destination, out bytesWritten); + } + private static PAL_HashAlgorithm PalAlgorithmFromAlgorithmName(HashAlgorithmName hashAlgorithmName) => hashAlgorithmName == HashAlgorithmName.MD5 ? PAL_HashAlgorithm.Md5 : hashAlgorithmName == HashAlgorithmName.SHA1 ? PAL_HashAlgorithm.Sha1 : diff --git a/external/corefx/src/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Random.cs b/external/corefx/src/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Random.cs index e9945864f4..e18157754a 100644 --- a/external/corefx/src/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Random.cs +++ b/external/corefx/src/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Random.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.InteropServices; using System.Security.Cryptography; @@ -10,12 +11,12 @@ internal static partial class Interop { internal static partial class AppleCrypto { - internal static void GetRandomBytes(ref byte pbBuffer, int count) + internal unsafe static void GetRandomBytes(byte* pbBuffer, int count) { Debug.Assert(count >= 0); int errorCode; - int ret = AppleCryptoNative_GetRandomBytes(ref pbBuffer, count, out errorCode); + int ret = AppleCryptoNative_GetRandomBytes(pbBuffer, count, out errorCode); if (ret == 0) { @@ -29,6 +30,6 @@ internal static partial class Interop } [DllImport(Libraries.AppleCryptoNative)] - private static extern int AppleCryptoNative_GetRandomBytes(ref byte buf, int num, out int errorCode); + private unsafe static extern int AppleCryptoNative_GetRandomBytes(byte* buf, int num, out int errorCode); } } diff --git a/external/corefx/src/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Ssl.cs b/external/corefx/src/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Ssl.cs index 6cc0a8fe89..2f826c499b 100644 --- a/external/corefx/src/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Ssl.cs +++ b/external/corefx/src/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Ssl.cs @@ -5,6 +5,7 @@ using System; using System.Diagnostics; +using System.Globalization; using System.Runtime.InteropServices; using System.Security.Authentication; using Microsoft.Win32.SafeHandles; @@ -14,6 +15,8 @@ internal static partial class Interop { internal static partial class AppleCrypto { + private static readonly IdnMapping s_idnMapping = new IdnMapping(); + // Read data from connection (or an instance delegate captured context) and write it to data // dataLength comes in as the capacity of data, goes out as bytes written. // Note: the true type of dataLength is `size_t*`, but on macOS that's most equal to `void**` @@ -572,14 +575,13 @@ internal static partial class Interop // The IdnMapping converts Unicode input into the IDNA punycode sequence. // It also does host case normalization. The bypass logic would be something // like "all characters being within [a-z0-9.-]+" - // Since it's not documented as being thread safe, create a new one each time. // // The SSL Policy (SecPolicyCreateSSL) has been verified as not inherently supporting // IDNA as of macOS 10.12.1 (Sierra). If it supports low-level IDNA at a later date, // this code could be removed. // // It was verified as supporting case invariant match as of 10.12.1 (Sierra). - string matchName = new System.Globalization.IdnMapping().GetAscii(hostName); + string matchName = s_idnMapping.GetAscii(hostName); using (SafeCFDateHandle cfNotBefore = CoreFoundation.CFDateCreate(notBefore)) using (SafeCreateHandle cfHostname = CoreFoundation.CFStringCreateWithCString(matchName)) diff --git a/external/corefx/src/Common/src/Interop/Unix/Interop.Libraries.cs b/external/corefx/src/Common/src/Interop/Unix/Interop.Libraries.cs index f33671958c..0ea3c32ee4 100644 --- a/external/corefx/src/Common/src/Interop/Unix/Interop.Libraries.cs +++ b/external/corefx/src/Common/src/Interop/Unix/Interop.Libraries.cs @@ -11,7 +11,6 @@ internal static partial class Interop internal const string HttpNative = "System.Net.Http.Native"; internal const string NetSecurityNative = "System.Net.Security.Native"; internal const string CryptoNative = "System.Security.Cryptography.Native.OpenSsl"; - internal const string GlobalizationNative = "System.Globalization.Native"; internal const string CompressionNative = "System.IO.Compression.Native"; internal const string Libdl = "libdl"; } diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Globalization.Native/Interop.Idna.cs b/external/corefx/src/Common/src/Interop/Unix/System.Globalization.Native/Interop.Idna.cs deleted file mode 100644 index 0331c2a9f1..0000000000 --- a/external/corefx/src/Common/src/Interop/Unix/System.Globalization.Native/Interop.Idna.cs +++ /dev/null @@ -1,21 +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; -using System.Runtime.InteropServices; - -internal static partial class Interop -{ - internal static partial class GlobalizationNative - { - internal const int AllowUnassigned = 0x1; - internal const int UseStd3AsciiRules = 0x2; - - [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_ToAscii")] - internal static extern unsafe int ToAscii(uint flags, char* src, int srcLen, char* dstBuffer, int dstBufferCapacity); - - [DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_ToUnicode")] - internal static extern unsafe int ToUnicode(uint flags, char* src, int srcLen, char* dstBuffer, int dstBufferCapacity); - } -} diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.ForkAndExecProcess.cs b/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.ForkAndExecProcess.cs index 8667e21a9c..3aa37279bc 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.ForkAndExecProcess.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.ForkAndExecProcess.cs @@ -15,6 +15,7 @@ internal static partial class Interop internal static unsafe void ForkAndExecProcess( string filename, string[] argv, string[] envp, string cwd, bool redirectStdin, bool redirectStdout, bool redirectStderr, + bool setUser, uint userId, uint groupId, out int lpChildPid, out int stdinFd, out int stdoutFd, out int stderrFd, bool shouldThrow = true) { byte** argvPtr = null, envpPtr = null; @@ -26,6 +27,7 @@ internal static partial class Interop result = ForkAndExecProcess( filename, argvPtr, envpPtr, cwd, redirectStdin ? 1 : 0, redirectStdout ? 1 : 0, redirectStderr ? 1 :0, + setUser ? 1 : 0, userId, groupId, out lpChildPid, out stdinFd, out stdoutFd, out stderrFd); if (result != 0) { @@ -53,6 +55,7 @@ internal static partial class Interop private static extern unsafe int ForkAndExecProcess( string filename, byte** argv, byte** envp, string cwd, int redirectStdin, int redirectStdout, int redirectStderr, + int setUser, uint userId, uint groupId, out int lpChildPid, out int stdinFd, out int stdoutFd, out int stderrFd); private static unsafe void AllocNullTerminatedArray(string[] arr, ref byte** arrPtr) diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.GetPwUid.cs b/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.GetPwUid.cs index 66142b7087..56d55c948f 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.GetPwUid.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.GetPwUid.cs @@ -11,6 +11,8 @@ internal static partial class Interop { internal unsafe struct Passwd { + internal const int InitialBufferSize = 256; + internal byte* Name; internal byte* Password; internal uint UserId; @@ -22,5 +24,8 @@ internal static partial class Interop [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetPwUidR", SetLastError = false)] internal static extern unsafe int GetPwUidR(uint uid, out Passwd pwd, byte* buf, int bufLen); + + [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetPwNamR", SetLastError = false)] + internal static extern unsafe int GetPwNamR(string name, out Passwd pwd, byte* buf, int bufLen); } } diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.HostEntry.cs b/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.HostEntry.cs index 4fb68a887f..944a235821 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.HostEntry.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.HostEntry.cs @@ -31,28 +31,27 @@ internal static partial class Interop NO_DATA = 4, NO_ADDRESS = NO_DATA, } + + //opaque structure to maintain consistency with native function signature + internal unsafe struct addrinfo + { + + } [StructLayout(LayoutKind.Sequential)] internal unsafe struct HostEntry { internal byte* CanonicalName; // Canonical Name of the Host internal byte** Aliases; // List of aliases for the host - internal void* AddressListHandle; // Handle for socket address list - internal int IPAddressCount; // Number of IP addresses in the list - private int _handleType; // Opaque handle type information. + internal addrinfo* AddressListHandle; // Handle for socket address list + internal int IPAddressCount; // Number of IP addresses in the list } [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetHostEntryForName")] internal static extern unsafe int GetHostEntryForName(string address, HostEntry* entry); - - [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetHostByName")] - internal static extern unsafe int GetHostByName(string address, HostEntry* entry); - - [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetHostByAddress")] - internal static extern unsafe int GetHostByAddress(IPAddress* address, HostEntry* entry); - + [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetNextIPAddress")] - internal static extern unsafe int GetNextIPAddress(HostEntry* entry, void** addressListHandle, IPAddress* endPoint); + internal static extern unsafe int GetNextIPAddress(HostEntry* entry, addrinfo** addressListHandle, IPAddress* endPoint); [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_FreeHostEntry")] internal static extern unsafe void FreeHostEntry(HostEntry* entry); diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.ReadDir.cs b/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.ReadDir.cs index d98c4285c0..695d50ba2b 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.ReadDir.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.ReadDir.cs @@ -3,15 +3,16 @@ // See the LICENSE file in the project root for more information. using System; +using System.Diagnostics; using System.Runtime.InteropServices; -using System.Threading; +using System.Text; using Microsoft.Win32.SafeHandles; internal static partial class Interop { internal static partial class Sys { - private static readonly int s_readBufferSize = GetReadDirRBufferSize(); + internal static int ReadBufferSize { get; } = GetReadDirRBufferSize(); internal enum NodeType : int { @@ -27,76 +28,59 @@ internal static partial class Interop } [StructLayout(LayoutKind.Sequential)] - private unsafe struct InternalDirectoryEntry + internal unsafe struct DirectoryEntry { - internal IntPtr Name; - internal int NameLength; - internal NodeType InodeType; - } + internal byte* Name; + internal int NameLength; + internal NodeType InodeType; - internal struct DirectoryEntry - { - internal NodeType InodeType; - internal string InodeName; + internal ReadOnlySpan GetName(Span buffer) + { + Debug.Assert(buffer.Length >= Encoding.UTF8.GetMaxCharCount(255), "should have enough space for the max file name"); + Debug.Assert(Name != null, "should not have a null name"); + + ReadOnlySpan nameBytes = (NameLength == -1) + // In this case the struct was allocated via struct dirent *readdir(DIR *dirp); + ? new ReadOnlySpan(Name, new ReadOnlySpan(Name, 255).IndexOf(0)) + : new ReadOnlySpan(Name, NameLength); + + Debug.Assert(nameBytes.Length > 0, "we shouldn't have gotten a garbage value from the OS"); + if (nameBytes.Length == 0) + return buffer.Slice(0, 0); + + int charCount = Encoding.UTF8.GetChars(nameBytes, buffer); + ReadOnlySpan value = buffer.Slice(0, charCount); + Debug.Assert(NameLength != -1 || value.IndexOf('\0') == -1, "should not have embedded nulls if we parsed the end of string"); + return value; + } } [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_OpenDir", SetLastError = true)] - internal static extern Microsoft.Win32.SafeHandles.SafeDirectoryHandle OpenDir(string path); + internal static extern IntPtr OpenDir(string path); [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetReadDirRBufferSize", SetLastError = false)] internal static extern int GetReadDirRBufferSize(); [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_ReadDirR", SetLastError = false)] - private static extern unsafe int ReadDirR(IntPtr dir, byte* buffer, int bufferSize, out InternalDirectoryEntry outputEntry); + private static extern unsafe int ReadDirR(IntPtr dir, ref byte buffer, int bufferSize, ref DirectoryEntry outputEntry); [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_CloseDir", SetLastError = true)] internal static extern int CloseDir(IntPtr dir); - // The calling pattern for ReadDir is described in src/Native/System.Native/pal_readdir.cpp - internal static int ReadDir(SafeDirectoryHandle dir, out DirectoryEntry outputEntry) + /// + /// Get the next directory entry for the given handle. **Note** the actual memory used may be allocated + /// by the OS and will be freed when the handle is closed. As such, the handle lifespan MUST be kept tightly + /// controlled. The DirectoryEntry name cannot be accessed after the handle is closed. + /// + /// Call to see what size buffer to allocate. + /// + internal static int ReadDir(IntPtr dir, Span buffer, ref DirectoryEntry entry) { - bool addedRef = false; - try - { - // We avoid a native string copy into InternalDirectoryEntry. - // - If the platform suppors reading into a buffer, the data is read directly into the buffer. The - // data can be read as long as the buffer is valid. - // - If the platform does not support reading into a buffer, the information returned in - // InternalDirectoryEntry points to native memory owned by the SafeDirectoryHandle. The data is only - // valid until the next call to CloseDir/ReadDir. We extend the reference until we have copied all data - // to ensure it does not become invalid by a CloseDir; and we copy the data so our caller does not - // use the native memory held by the SafeDirectoryHandle. - dir.DangerousAddRef(ref addedRef); + // The calling pattern for ReadDir is described in src/Native/Unix/System.Native/pal_io.cpp|.h + Debug.Assert(buffer.Length >= ReadBufferSize, "should have a big enough buffer for the raw data"); - unsafe - { - // s_readBufferSize is zero when the native implementation does not support reading into a buffer. - byte* buffer = stackalloc byte[s_readBufferSize]; - InternalDirectoryEntry temp; - int ret = ReadDirR(dir.DangerousGetHandle(), buffer, s_readBufferSize, out temp); - // We copy data into DirectoryEntry to ensure there are no dangling references. - outputEntry = ret == 0 ? - new DirectoryEntry() { InodeName = GetDirectoryEntryName(temp), InodeType = temp.InodeType } : - default(DirectoryEntry); - - return ret; - } - } - finally - { - if (addedRef) - { - dir.DangerousRelease(); - } - } - } - - private static unsafe string GetDirectoryEntryName(InternalDirectoryEntry dirEnt) - { - if (dirEnt.NameLength == -1) - return Marshal.PtrToStringAnsi(dirEnt.Name); - else - return Marshal.PtrToStringAnsi(dirEnt.Name, dirEnt.NameLength); + // ReadBufferSize is zero when the native implementation does not support reading into a buffer. + return ReadDirR(dir, ref MemoryMarshal.GetReference(buffer), ReadBufferSize, ref entry); } } } diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.RegisterForSigChld.cs b/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.RegisterForSigChld.cs new file mode 100644 index 0000000000..f0d428d45c --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.RegisterForSigChld.cs @@ -0,0 +1,16 @@ +// 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.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class Sys + { + internal delegate void SigChldCallback(bool reapAll); + + [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_RegisterForSigChld")] + internal static extern bool RegisterForSigChld(SigChldCallback handler); + } +} diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.Stat.Span.cs b/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.Stat.Span.cs new file mode 100644 index 0000000000..6216a6bda8 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.Stat.Span.cs @@ -0,0 +1,41 @@ +// 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; +using System.Runtime.InteropServices; +using System.Text; + +internal static partial class Interop +{ + internal static partial class Sys + { + // Unix max paths are typically 1K or 4K UTF-8 bytes, 256 should handle the majority of paths + // without putting too much pressure on the stack. + private const int StackBufferSize = 256; + + [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_Stat2", SetLastError = true)] + internal unsafe static extern int Stat(ref byte path, out FileStatus output); + + internal unsafe static int Stat(ReadOnlySpan path, out FileStatus output) + { + byte* buffer = stackalloc byte[StackBufferSize]; + var converter = new ValueUtf8Converter(new Span(buffer, StackBufferSize)); + int result = Stat(ref MemoryMarshal.GetReference(converter.ConvertAndTerminateString(path)), out output); + converter.Dispose(); + return result; + } + + [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_LStat2", SetLastError = true)] + internal static extern int LStat(ref byte path, out FileStatus output); + + internal unsafe static int LStat(ReadOnlySpan path, out FileStatus output) + { + byte* buffer = stackalloc byte[StackBufferSize]; + var converter = new ValueUtf8Converter(new Span(buffer, StackBufferSize)); + int result = LStat(ref MemoryMarshal.GetReference(converter.ConvertAndTerminateString(path)), out output); + converter.Dispose(); + return result; + } + } +} diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.WaitId.cs b/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.WaitId.cs new file mode 100644 index 0000000000..3bf9e82e11 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.WaitId.cs @@ -0,0 +1,23 @@ +// 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; +using System.Runtime.InteropServices; + +internal static partial class Interop +{ + internal static partial class Sys + { + /// + /// Returns the pid of a terminated child without reaping it. + /// + /// + /// 1) returns the process id of a terminated child process + /// 2) if no children are terminated, 0 is returned + /// 3) on error, -1 is returned + /// + [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_WaitIdAnyExitedNoHangNoWait", SetLastError = true)] + internal static extern int WaitIdAnyExitedNoHangNoWait(); + } +} diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.WaitPid.cs b/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.WaitPid.cs index 4d862b2ff5..8292971d48 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.WaitPid.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.WaitPid.cs @@ -9,41 +9,16 @@ internal static partial class Interop { internal static partial class Sys { - [Flags] - internal enum WaitPidOptions : int - { - None = 0, /* no options */ - WNOHANG = 1, /* don't block waiting */ - WUNTRACED = 2, /* report status of stopped children */ - } - /// - /// Waits for child process(s) or gathers resource utilization information about child processes + /// Reaps a terminated child. /// - /// The PID of a child process - /// The output wait status of the process - /// Tells the OS how to act on the WaitPid call (to block or not to block) /// - /// The return value from WaitPid can very greatly. - /// 1) returns the process id of a terminating or stopped child process - /// 2) if no children are waiting, -1 is returned and errno is set to ECHILD - /// 3) if WNOHANG is specified and there are no stopped or exited children, 0 is returned - /// 4) on error, -1 is returned + /// 1) when a child is reaped, its process id is returned + /// 2) if pid is not a child or there are no unwaited-for children, -1 is returned (errno=ECHILD) + /// 3) if the child has not yet terminated, 0 is returned + /// 4) on error, -1 is returned. /// - [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_WaitPid", SetLastError = true)] - internal static extern int WaitPid(int pid, out int status, WaitPidOptions options); - - // The following 4 functions are wrappers around macros of the same name - [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_WExitStatus")] - internal static extern int WExitStatus(int status); - - [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_WIfExited")] - internal static extern bool WIfExited(int status); - - [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_WIfSignaled")] - internal static extern bool WIfSignaled(int status); - - [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_WTermSig")] - internal static extern int WTermSig(int status); + [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_WaitPidExitedNoHang", SetLastError = true)] + internal static extern int WaitPidExitedNoHang(int pid, out int exitCode); } } diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Net.Http.Native/Interop.Easy.cs b/external/corefx/src/Common/src/Interop/Unix/System.Net.Http.Native/Interop.Easy.cs index 16588e48ab..ab3200b333 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Net.Http.Native/Interop.Easy.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Net.Http.Native/Interop.Easy.cs @@ -111,6 +111,7 @@ internal static partial class Interop CURLOPT_PROXYTYPE = CurlOptionLongBase + 101, CURLOPT_HTTPAUTH = CurlOptionLongBase + 107, CURLOPT_TCP_NODELAY = CurlOptionLongBase + 121, + CURLOPT_TCP_KEEPALIVE = CurlOptionLongBase + 213, CURLOPT_CONNECTTIMEOUT_MS = CurlOptionLongBase + 156, CURLOPT_ADDRESS_SCOPE = CurlOptionLongBase + 171, CURLOPT_PROTOCOLS = CurlOptionLongBase + 181, @@ -153,13 +154,15 @@ internal static partial class Interop CURL_HTTP_VERSION_NONE = 0, CURL_HTTP_VERSION_1_0 = 1, CURL_HTTP_VERSION_1_1 = 2, - CURL_HTTP_VERSION_2_0 = 3, + CURL_HTTP_VERSION_2TLS = 4, }; // Enum for constants defined for CURL_SSLVERSION internal enum CurlSslVersion { CURL_SSLVERSION_TLSv1 = 1, /* TLS 1.x */ + CURL_SSLVERSION_SSLv2 = 2, /* SSL 2 */ + CURL_SSLVERSION_SSLv3 = 3, /* SSL 3 */ CURL_SSLVERSION_TLSv1_0 = 4, /* TLS 1.0 */ CURL_SSLVERSION_TLSv1_1 = 5, /* TLS 1.1 */ CURL_SSLVERSION_TLSv1_2 = 6, /* TLS 1.2 */ diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Net.Http.Native/Interop.Initialization.cs b/external/corefx/src/Common/src/Interop/Unix/System.Net.Http.Native/Interop.Initialization.cs index e23e5b8f60..eef56ec0b3 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Net.Http.Native/Interop.Initialization.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Net.Http.Native/Interop.Initialization.cs @@ -28,7 +28,7 @@ internal static partial class Interop if (string.IsNullOrEmpty(opensslVersion) || opensslVersion.IndexOf(Interop.Http.OpenSsl10Description, StringComparison.OrdinalIgnoreCase) != -1) { - // CURL uses OpenSSL which me must initialize first to guarantee thread-safety + // CURL uses OpenSSL which we must initialize first to guarantee thread-safety // Only initialize for OpenSSL/1.0, any newer versions may have mismatched // pointers, resulting in segfaults. CryptoInitializer.Initialize(); diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Net.Http.Native/Interop.Multi.cs b/external/corefx/src/Common/src/Interop/Unix/System.Net.Http.Native/Interop.Multi.cs index 66fa2a114e..f3c058e319 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Net.Http.Native/Interop.Multi.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Net.Http.Native/Interop.Multi.cs @@ -92,6 +92,11 @@ internal static partial class Interop { bool result = MultiDestroy(handle) == CURLMcode.CURLM_OK; SetHandle(IntPtr.Zero); + +#if !SYSNETHTTP_NO_OPENSSL + Interop.Crypto.ErrClearError(); // Ensure that no SSL errors were left on the queue by libcurl. +#endif + return result; } } diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.Initialization.cs b/external/corefx/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.Initialization.cs index 3f71974885..44ae8a66ee 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.Initialization.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.Initialization.cs @@ -25,6 +25,11 @@ internal static partial class Interop //Call ssl specific initializer Ssl.EnsureLibSslInitialized(); + if (Interop.Crypto.ErrPeekLastError() != 0) + { + // It is going to be wrapped in a type load exception but will have the error information + throw Interop.Crypto.CreateOpenSslCryptographicException(); + } } #endif diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.ASN1.Print.cs b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.ASN1.Print.cs index fbaab0ae80..12199563c8 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.ASN1.Print.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.ASN1.Print.cs @@ -26,6 +26,7 @@ internal static partial class Interop if (asn1String.IsInvalid) { + Interop.Crypto.ErrClearError(); return null; } @@ -54,6 +55,8 @@ internal static partial class Interop using (SafeBioHandle bio = CreateMemoryBio()) { + CheckValidOpenSslHandle(bio); + int len = asn1StringPrintEx(bio, asn1String, Asn1StringPrintFlags.ASN1_STRFLGS_UTF8_CONVERT); if (len < 0) diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.ASN1.cs b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.ASN1.cs index 1b251fb3a2..5bd2e8b9b4 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.ASN1.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.ASN1.cs @@ -20,7 +20,17 @@ internal static partial class Interop private static extern unsafe int ObjObj2Txt(byte* buf, int buf_len, IntPtr a); [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_GetObjectDefinitionByName", CharSet = CharSet.Ansi)] - internal static extern IntPtr GetObjectDefinitionByName(string friendlyName); + private static extern IntPtr CryptoNative_GetObjectDefinitionByName(string friendlyName); + internal static IntPtr GetObjectDefinitionByName(string friendlyName) + { + IntPtr ret = CryptoNative_GetObjectDefinitionByName(friendlyName); + if (ret == IntPtr.Zero) + { + ErrClearError(); + } + + return ret; + } // Returns shared pointers, should not be tracked as a SafeHandle. [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_ObjNid2Obj")] @@ -51,22 +61,6 @@ internal static partial class Interop [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_Asn1StringFree")] internal static extern void Asn1StringFree(IntPtr o); - internal static string GetOidValue(SafeSharedAsn1ObjectHandle asn1Object) - { - Debug.Assert(asn1Object != null); - - bool added = false; - asn1Object.DangerousAddRef(ref added); - try - { - return GetOidValue(asn1Object.DangerousGetHandle()); - } - finally - { - asn1Object.DangerousRelease(); - } - } - internal static unsafe string GetOidValue(IntPtr asn1ObjectPtr) { // OBJ_obj2txt returns the number of bytes that should have been in the answer, but it does not accept @@ -117,14 +111,3 @@ internal static partial class Interop } } } - -namespace Microsoft.Win32.SafeHandles -{ - internal class SafeSharedAsn1ObjectHandle : SafeInteriorHandle - { - private SafeSharedAsn1ObjectHandle() : - base(IntPtr.Zero, ownsHandle: true) - { - } - } -} diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Bignum.cs b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Bignum.cs index 8896380c7d..6faf7f8915 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Bignum.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Bignum.cs @@ -29,7 +29,14 @@ internal static partial class Interop return IntPtr.Zero; } - return BigNumFromBinary(bigEndianValue, bigEndianValue.Length); + IntPtr ret = BigNumFromBinary(bigEndianValue, bigEndianValue.Length); + + if (ret == IntPtr.Zero) + { + throw CreateOpenSslCryptographicException(); + } + + return ret; } internal static SafeBignumHandle CreateBignum(byte[] bigEndianValue) diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Crypto.cs b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Crypto.cs index 13d82c5d09..cfcac7d7dc 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Crypto.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Crypto.cs @@ -16,7 +16,18 @@ internal static partial class Interop private delegate int NegativeSizeReadMethod(THandle handle, byte[] buf, int cBuf); [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_BioTell")] - internal static extern int BioTell(SafeBioHandle bio); + internal static extern int CryptoNative_BioTell(SafeBioHandle bio); + + internal static int BioTell(SafeBioHandle bio) + { + int ret = CryptoNative_BioTell(bio); + if (ret < 0) + { + throw CreateOpenSslCryptographicException(); + } + + return ret; + } [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_BioSeek")] internal static extern int BioSeek(SafeBioHandle bio, int pos); diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Dsa.cs b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Dsa.cs index bb610f60f3..8d69e89577 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Dsa.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Dsa.cs @@ -73,8 +73,19 @@ internal static partial class Interop [return: MarshalAs(UnmanagedType.Bool)] private static extern bool DsaSign(SafeDsaHandle dsa, ref byte hash, int hashLength, ref byte refSignature, out int outSignatureLength); - internal static bool DsaVerify(SafeDsaHandle dsa, ReadOnlySpan hash, int hashLength, ReadOnlySpan signature, int signatureLength) => - DsaVerify(dsa, ref MemoryMarshal.GetReference(hash), hashLength, ref MemoryMarshal.GetReference(signature), signatureLength); + internal static bool DsaVerify(SafeDsaHandle dsa, ReadOnlySpan hash, ReadOnlySpan signature) + { + bool ret = DsaVerify( + dsa, + ref MemoryMarshal.GetReference(hash), + hash.Length, + ref MemoryMarshal.GetReference(signature), + signature.Length); + + // Error queue already cleaned on the native function. + + return ret; + } [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_DsaVerify")] [return: MarshalAs(UnmanagedType.Bool)] diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.ERR.cs b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.ERR.cs index 608af35f59..95d24bc12d 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.ERR.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.ERR.cs @@ -12,14 +12,20 @@ internal static partial class Interop { internal static partial class Crypto { + [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_ErrClearError")] + internal static extern ulong ErrClearError(); + [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_ErrGetError")] internal static extern ulong ErrGetError(); + [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_ErrGetErrorAlloc")] + private static extern ulong ErrGetErrorAlloc([MarshalAs(UnmanagedType.Bool)] out bool isAllocFailure); + [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_ErrPeekError")] internal static extern ulong ErrPeekError(); - [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_ErrGetErrorAlloc")] - private static extern ulong ErrGetErrorAlloc([MarshalAs(UnmanagedType.Bool)] out bool isAllocFailure); + [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_ErrPeekLastError")] + internal static extern ulong ErrPeekLastError(); [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_ErrReasonErrorString")] internal static extern IntPtr ErrReasonErrorString(ulong error); diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.EcDsa.ImportExport.cs b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.EcDsa.ImportExport.cs index acd32d3cf5..5c079ae1d7 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.EcDsa.ImportExport.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.EcDsa.ImportExport.cs @@ -33,8 +33,9 @@ internal static partial class Interop int rc = EcKeyCreateByKeyParameters(out key, oid, qx, qxLength, qy, qyLength, d, dLength); if (rc == -1) { - if (key != null) - key.Dispose(); + key?.Dispose(); + Interop.Crypto.ErrClearError(); + throw new PlatformNotSupportedException(string.Format(SR.Cryptography_CurveNotSupported, oid)); } return key; @@ -92,6 +93,10 @@ internal static partial class Interop throw Interop.Crypto.CreateOpenSslCryptographicException(); } + // EcKeyCreateByExplicitParameters may have polluted the error queue, but key was good in the end. + // Clean up the error queue. + Interop.Crypto.ErrClearError(); + return key; } diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.EcDsa.cs b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.EcDsa.cs index 91c1beab99..17c1232f24 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.EcDsa.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.EcDsa.cs @@ -17,8 +17,22 @@ internal static partial class Interop [return: MarshalAs(UnmanagedType.Bool)] private static extern bool EcDsaSign(ref byte dgst, int dlen, ref byte sig, [In, Out] ref int siglen, SafeEcKeyHandle ecKey); - internal static unsafe int EcDsaVerify(ReadOnlySpan dgst, int dgst_len, ReadOnlySpan sigbuf, int sig_len, SafeEcKeyHandle ecKey) => - EcDsaVerify(ref MemoryMarshal.GetReference(dgst), dgst_len, ref MemoryMarshal.GetReference(sigbuf), sig_len, ecKey); + internal static int EcDsaVerify(ReadOnlySpan dgst, ReadOnlySpan sigbuf, SafeEcKeyHandle ecKey) + { + int ret = EcDsaVerify( + ref MemoryMarshal.GetReference(dgst), + dgst.Length, + ref MemoryMarshal.GetReference(sigbuf), + sigbuf.Length, + ecKey); + + if (ret < 0) + { + ErrClearError(); + } + + return ret; + } /*- * returns @@ -31,6 +45,18 @@ internal static partial class Interop // returns the maximum length of a DER encoded ECDSA signature created with this key. [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_EcDsaSize")] - internal static extern int EcDsaSize(SafeEcKeyHandle ecKey); + private static extern int CryptoNative_EcDsaSize(SafeEcKeyHandle ecKey); + + internal static int EcDsaSize(SafeEcKeyHandle ecKey) + { + int ret = CryptoNative_EcDsaSize(ecKey); + + if (ret == 0) + { + throw CreateOpenSslCryptographicException(); + } + + return ret; + } } } diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.EcKey.cs b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.EcKey.cs index d57f04f891..2ac112933f 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.EcKey.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.EcKey.cs @@ -12,7 +12,17 @@ internal static partial class Interop internal static partial class Crypto { [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_EcKeyCreateByOid")] - internal static extern SafeEcKeyHandle EcKeyCreateByOid(string oid); + private static extern SafeEcKeyHandle CryptoNative_EcKeyCreateByOid(string oid); + internal static SafeEcKeyHandle EcKeyCreateByOid(string oid) + { + SafeEcKeyHandle handle = CryptoNative_EcKeyCreateByOid(oid); + if (handle == null || handle.IsInvalid) + { + ErrClearError(); + } + + return handle; + } [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_EcKeyDestroy")] internal static extern void EcKeyDestroy(IntPtr a); diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Encode.cs b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Encode.cs index 747a32998c..27861a263e 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Encode.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Encode.cs @@ -28,8 +28,18 @@ internal static partial class Interop byte[] data = new byte[size]; int size2 = encode(handle, data); - Debug.Assert(size == size2); + if (size2 < 1) + { + Debug.Fail( + $"{nameof(OpenSslEncode)}: {nameof(getSize)} succeeded ({size}) and {nameof(encode)} failed ({size2})"); + // If it ever happens, ensure the error queue gets cleared. + // And since it didn't write the data, reporting an exception is good too. + throw CreateOpenSslCryptographicException(); + } + + Debug.Assert(size == size2); + return data; } } diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.EvpPkey.Ecdh.cs b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.EvpPkey.Ecdh.cs new file mode 100644 index 0000000000..74967f6104 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.EvpPkey.Ecdh.cs @@ -0,0 +1,43 @@ +// 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; +using System.Diagnostics; +using System.Runtime.InteropServices; +using System.Security.Cryptography; +using Microsoft.Win32.SafeHandles; + +internal static partial class Interop +{ + internal static partial class Crypto + { + [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_EvpPKeyCtxCreate")] + internal static extern SafeEvpPKeyCtxHandle EvpPKeyCtxCreate(SafeEvpPKeyHandle pkey, SafeEvpPKeyHandle peerkey, out uint secretLength); + + [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_EvpPKeyDeriveSecretAgreement")] + private static extern int EvpPKeyDeriveSecretAgreement( + ref byte secret, + uint secretLength, + SafeEvpPKeyCtxHandle ctx); + + [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_EvpPKeyCtxDestroy")] + internal static extern void EvpPKeyCtxDestroy(IntPtr ctx); + + internal static void EvpPKeyDeriveSecretAgreement(SafeEvpPKeyCtxHandle ctx, Span destination) + { + Debug.Assert(ctx != null); + Debug.Assert(!ctx.IsInvalid); + + int ret = EvpPKeyDeriveSecretAgreement( + ref MemoryMarshal.GetReference(destination), + (uint)destination.Length, + ctx); + + if (ret != 1) + { + throw CreateOpenSslCryptographicException(); + } + } + } +} diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.OpenSsl.cs b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.OpenSsl.cs index 637aae916d..1f9530594c 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.OpenSsl.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.OpenSsl.cs @@ -79,6 +79,7 @@ internal static partial class Interop if (!Ssl.SetEncryptionPolicy(innerContext, policy)) { + Crypto.ErrClearError(); throw new PlatformNotSupportedException(SR.Format(SR.net_ssl_encryptionpolicy_notsupported, policy)); } @@ -129,7 +130,10 @@ internal static partial class Interop string punyCode = s_idnMapping.GetAscii(sslAuthenticationOptions.TargetHost); // Similar to windows behavior, set SNI on openssl by default for client context, ignore errors. - Ssl.SslSetTlsExtHostName(context, punyCode); + if (!Ssl.SslSetTlsExtHostName(context, punyCode)) + { + Crypto.ErrClearError(); + } } if (hasCertificateAndKey) @@ -210,7 +214,7 @@ internal static partial class Interop if (sendCount <= 0) { // Make sure we clear out the error that is stored in the queue - Crypto.ErrGetError(); + Crypto.ErrClearError(); sendBuf = null; sendCount = 0; } @@ -227,12 +231,16 @@ internal static partial class Interop internal static int Encrypt(SafeSslHandle context, ReadOnlyMemory input, ref byte[] output, out Ssl.SslErrorCode errorCode) { +#if DEBUG + ulong assertNoError = Crypto.ErrPeekError(); + Debug.Assert(assertNoError == 0, "OpenSsl error queue is not empty, run: 'openssl errstr " + assertNoError.ToString("X") + "' for original error."); +#endif errorCode = Ssl.SslErrorCode.SSL_ERROR_NONE; int retVal; unsafe { - using (MemoryHandle handle = input.Retain(pin: true)) + using (MemoryHandle handle = input.Pin()) { retVal = Ssl.SslWrite(context, (byte*)handle.Pointer, input.Length); } @@ -267,7 +275,7 @@ internal static partial class Interop if (retVal <= 0) { // Make sure we clear out the error that is stored in the queue - Crypto.ErrGetError(); + Crypto.ErrClearError(); } } @@ -276,6 +284,10 @@ internal static partial class Interop internal static int Decrypt(SafeSslHandle context, byte[] outBuffer, int offset, int count, out Ssl.SslErrorCode errorCode) { +#if DEBUG + ulong assertNoError = Crypto.ErrPeekError(); + Debug.Assert(assertNoError == 0, "OpenSsl error queue is not empty, run: 'openssl errstr " + assertNoError.ToString("X") + "' for original error."); +#endif errorCode = Ssl.SslErrorCode.SSL_ERROR_NONE; int retVal = BioWrite(context.InputBio, outBuffer, offset, count); @@ -463,7 +475,7 @@ internal static partial class Interop break; case Ssl.SslErrorCode.SSL_ERROR_SSL: - // OpenSSL failure occurred. The error queue contains more details. + // OpenSSL failure occurred. The error queue contains more details, when building the exception the queue will be cleared. innerError = Interop.Crypto.CreateOpenSslCryptographicException(); break; @@ -505,7 +517,9 @@ internal static partial class Interop internal static SslException CreateSslException(string message) { - ulong errorVal = Crypto.ErrGetError(); + // Capture last error to be consistent with CreateOpenSslCryptographicException + ulong errorVal = Crypto.ErrPeekLastError(); + Crypto.ErrClearError(); string msg = SR.Format(message, Marshal.PtrToStringAnsi(Crypto.ErrReasonErrorString(errorVal))); return new SslException(msg, (int)errorVal); } diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.OpenSslVersion.cs b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.OpenSslVersion.cs index 1f5e68c15c..70805706ef 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.OpenSslVersion.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.OpenSslVersion.cs @@ -23,7 +23,7 @@ internal static partial class Interop const string OpenSSL = "OpenSSL "; // Skip OpenSSL part, and get the version string of format x.y.z - if (!Version.TryParse(OpenSslVersionDescription().AsReadOnlySpan().Slice(OpenSSL.Length, 5), out s_opensslVersion)) + if (!Version.TryParse(OpenSslVersionDescription().AsSpan(OpenSSL.Length, 5).ToString(), out s_opensslVersion)) { s_opensslVersion = new Version(0, 0, 0); } diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.RAND.cs b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.RAND.cs index ef5f09e542..2643abe6f6 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.RAND.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.RAND.cs @@ -9,15 +9,15 @@ internal static partial class Interop { internal static partial class Crypto { - internal static bool GetRandomBytes(ref byte pbBuffer, int count) + internal unsafe static bool GetRandomBytes(byte* pbBuffer, int count) { Debug.Assert(count >= 0); - return CryptoNative_GetRandomBytes(ref pbBuffer, count); + return CryptoNative_GetRandomBytes(pbBuffer, count); } [DllImport(Libraries.CryptoNative)] [return: MarshalAs(UnmanagedType.Bool)] - private static extern bool CryptoNative_GetRandomBytes(ref byte buf, int num); + private unsafe static extern bool CryptoNative_GetRandomBytes(byte* buf, int num); } } diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Rsa.cs b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Rsa.cs index 1748a66547..296b9f18b5 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Rsa.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Rsa.cs @@ -57,6 +57,32 @@ internal static partial class Interop SafeRsaHandle rsa, RsaPadding padding); + internal static int RsaSignPrimitive( + ReadOnlySpan from, + Span to, + SafeRsaHandle rsa) => + RsaSignPrimitive(from.Length, ref MemoryMarshal.GetReference(from), ref MemoryMarshal.GetReference(to), rsa); + + [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_RsaSignPrimitive")] + private static extern int RsaSignPrimitive( + int flen, + ref byte from, + ref byte to, + SafeRsaHandle rsa); + + internal static int RsaVerificationPrimitive( + ReadOnlySpan from, + Span to, + SafeRsaHandle rsa) => + RsaVerificationPrimitive(from.Length, ref MemoryMarshal.GetReference(from), ref MemoryMarshal.GetReference(to), rsa); + + [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_RsaVerificationPrimitive")] + private static extern int RsaVerificationPrimitive( + int flen, + ref byte from, + ref byte to, + SafeRsaHandle rsa); + [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_RsaSize")] internal static extern int RsaSize(SafeRsaHandle rsa); @@ -70,8 +96,24 @@ internal static partial class Interop [return: MarshalAs(UnmanagedType.Bool)] private static extern bool RsaSign(int type, ref byte m, int m_len, ref byte sigret, out int siglen, SafeRsaHandle rsa); - internal static bool RsaVerify(int type, ReadOnlySpan m, int m_len, ReadOnlySpan sigbuf, int siglen, SafeRsaHandle rsa) => - RsaVerify(type, ref MemoryMarshal.GetReference(m), m_len, ref MemoryMarshal.GetReference(sigbuf), siglen, rsa); + internal static bool RsaVerify(int type, ReadOnlySpan m, ReadOnlySpan sigbuf, SafeRsaHandle rsa) + { + bool ret = RsaVerify( + type, + ref MemoryMarshal.GetReference(m), + m.Length, + ref MemoryMarshal.GetReference(sigbuf), + sigbuf.Length, + rsa); + + if (!ret) + { + ErrClearError(); + } + + return ret; + } + [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_RsaVerify")] [return: MarshalAs(UnmanagedType.Bool)] @@ -145,7 +187,8 @@ internal static partial class Interop out IntPtr iqmp); [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SetRsaParameters")] - internal static extern void SetRsaParameters( + [return: MarshalAs(UnmanagedType.Bool)] + internal static extern bool SetRsaParameters( SafeRsaHandle key, byte[] n, int nLength, @@ -168,6 +211,7 @@ internal static partial class Interop { Pkcs1 = 0, OaepSHA1 = 1, + NoPadding = 2, } } } diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Ssl.cs b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Ssl.cs index 57f18a1e60..8e9db6fb66 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Ssl.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Ssl.cs @@ -49,7 +49,8 @@ internal static partial class Interop private static extern IntPtr SslGetVersion(SafeSslHandle ssl); [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslSetTlsExtHostName")] - internal static extern int SslSetTlsExtHostName(SafeSslHandle ssl, string host); + [return: MarshalAs(UnmanagedType.Bool)] + internal static extern bool SslSetTlsExtHostName(SafeSslHandle ssl, string host); [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslGet0AlpnSelected")] internal static extern void SslGetAlpnSelected(SafeSslHandle ssl, out IntPtr protocol, out int len); @@ -125,6 +126,7 @@ internal static partial class Interop internal static extern int SslGetFinished(SafeSslHandle ssl, IntPtr buf, int count); [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslSessionReused")] + [return: MarshalAs(UnmanagedType.Bool)] internal static extern bool SslSessionReused(SafeSslHandle ssl); [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslAddExtraChainCert")] @@ -158,6 +160,7 @@ internal static partial class Interop Crypto.CheckValidOpenSslHandle(dupCertHandle); if (!SslAddExtraChainCert(sslContext, dupCertHandle)) { + Crypto.ErrClearError(); dupCertHandle.Dispose(); // we still own the safe handle; clean it up return false; } @@ -318,6 +321,12 @@ namespace Microsoft.Win32.SafeHandles // Do a bi-directional shutdown. retVal = Interop.Ssl.SslShutdown(handle); } + + if (retVal < 0) + { + // Clean up the errors + Interop.Crypto.ErrClearError(); + } } private SafeSslHandle() : base(IntPtr.Zero, true) diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.X509Name.cs b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.X509Name.cs index 0f0fecad24..70097d7db2 100644 --- a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.X509Name.cs +++ b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.X509Name.cs @@ -15,16 +15,6 @@ internal static partial class Interop [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_GetX509NameStackFieldCount")] internal static extern int GetX509NameStackFieldCount(SafeSharedX509NameStackHandle sk); - [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_PushX509NameStackField")] - [return: MarshalAs(UnmanagedType.Bool)] - internal static extern bool PushX509NameStackField(SafeX509NameStackHandle stack, SafeX509NameHandle x509_Name); - - [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_RecursiveFreeX509NameStack")] - internal static extern void RecursiveFreeX509NameStack(IntPtr stack); - - [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_NewX509NameStack")] - internal static extern SafeX509NameStackHandle NewX509NameStack(); - [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_GetX509NameStackField")] private static extern SafeSharedX509NameHandle GetX509NameStackField_private(SafeSharedX509NameStackHandle sk, int loc); @@ -32,15 +22,6 @@ internal static partial class Interop [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_GetX509NameRawBytes")] private static extern int GetX509NameRawBytes(SafeSharedX509NameHandle x509Name, byte[] buf, int cBuf); - [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_DecodeX509Name")] - internal static extern SafeX509NameHandle DecodeX509Name(byte[] buf, int len); - - [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_X509NameDestroy")] - internal static extern void X509NameDestroy(IntPtr a); - - [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_GetX509NameEntryCount")] - internal static extern int GetX509NameEntryCount(SafeX509NameHandle x509Name); - internal static X500DistinguishedName LoadX500Name(SafeSharedX509NameHandle namePtr) { CheckValidOpenSslHandle(namePtr); @@ -86,25 +67,5 @@ namespace Microsoft.Win32.SafeHandles { } } - - internal sealed class SafeX509NameStackHandle : SafeHandle - { - private SafeX509NameStackHandle() : - base(IntPtr.Zero, ownsHandle: true) - { - } - - protected override bool ReleaseHandle() - { - Interop.Crypto.RecursiveFreeX509NameStack(handle); - SetHandle(IntPtr.Zero); - return true; - } - - public override bool IsInvalid - { - get { return handle == IntPtr.Zero; } - } - } } diff --git a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.X509NameEntry.cs b/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.X509NameEntry.cs deleted file mode 100644 index eeeea54d0c..0000000000 --- a/external/corefx/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.X509NameEntry.cs +++ /dev/null @@ -1,61 +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; -using System.Runtime.InteropServices; -using Microsoft.Win32.SafeHandles; - -internal static partial class Interop -{ - internal static partial class Crypto - { - [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_GetX509NameEntry")] - private static extern SafeSharedX509NameEntryHandle GetX509NameEntry_private(SafeX509NameHandle x509Name, int loc); - - [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_GetX509NameEntryOid")] - private static extern SafeSharedAsn1ObjectHandle GetX509NameEntryOid_private(SafeSharedX509NameEntryHandle nameEntry); - - [DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_GetX509NameEntryData")] - private static extern SafeSharedAsn1StringHandle GetX509NameEntryData_private(SafeSharedX509NameEntryHandle nameEntry); - - internal static SafeSharedX509NameEntryHandle GetX509NameEntry(SafeX509NameHandle x509Name, int loc) - { - CheckValidOpenSslHandle(x509Name); - - return SafeInteriorHandle.OpenInteriorHandle( - (nameHandle, i) => GetX509NameEntry_private(nameHandle, i), - x509Name, - loc); - } - - internal static SafeSharedAsn1ObjectHandle GetX509NameEntryOid(SafeSharedX509NameEntryHandle nameEntry) - { - CheckValidOpenSslHandle(nameEntry); - - return SafeInteriorHandle.OpenInteriorHandle( - handle => GetX509NameEntryOid_private(handle), - nameEntry); - } - - internal static SafeSharedAsn1StringHandle GetX509NameEntryData(SafeSharedX509NameEntryHandle nameEntry) - { - CheckValidOpenSslHandle(nameEntry); - - return SafeInteriorHandle.OpenInteriorHandle( - handle => GetX509NameEntryData_private(handle), - nameEntry); - } - } -} - -namespace Microsoft.Win32.SafeHandles -{ - internal sealed class SafeSharedX509NameEntryHandle : SafeInteriorHandle - { - private SafeSharedX509NameEntryHandle() : - base(IntPtr.Zero, ownsHandle: true) - { - } - } -} diff --git a/external/corefx/src/Common/src/Interop/Windows/BCrypt/Interop.BCryptGenRandom.cs b/external/corefx/src/Common/src/Interop/Windows/BCrypt/Interop.BCryptGenRandom.cs deleted file mode 100644 index 92bc507fab..0000000000 --- a/external/corefx/src/Common/src/Interop/Windows/BCrypt/Interop.BCryptGenRandom.cs +++ /dev/null @@ -1,24 +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; -using System.Diagnostics; -using System.Runtime.InteropServices; - -internal partial class Interop -{ - internal partial class BCrypt - { - internal static NTSTATUS BCryptGenRandom(ref byte pbBuffer, int count) - { - Debug.Assert(count >= 0); - return BCryptGenRandom(IntPtr.Zero, ref pbBuffer, count, BCRYPT_USE_SYSTEM_PREFERRED_RNG); - } - - private const int BCRYPT_USE_SYSTEM_PREFERRED_RNG = 0x00000002; - - [DllImport(Libraries.BCrypt, CharSet = CharSet.Unicode)] - private static extern NTSTATUS BCryptGenRandom(IntPtr hAlgorithm, ref byte pbBuffer, int cbBuffer, int dwFlags); - } -} diff --git a/external/corefx/src/Common/src/Interop/Windows/BCrypt/Interop.CreateCryptographicException.cs b/external/corefx/src/Common/src/Interop/Windows/BCrypt/Interop.CreateCryptographicException.cs index 771c9c20d2..77ff030f9f 100644 --- a/external/corefx/src/Common/src/Interop/Windows/BCrypt/Interop.CreateCryptographicException.cs +++ b/external/corefx/src/Common/src/Interop/Windows/BCrypt/Interop.CreateCryptographicException.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using System.Security.Cryptography; +using Internal.Cryptography; internal partial class Interop { @@ -12,7 +12,7 @@ internal partial class Interop internal static Exception CreateCryptographicException(NTSTATUS ntStatus) { int hr = unchecked((int)ntStatus) | 0x01000000; - return new CryptographicException(hr); + return hr.ToCryptographicException(); } } } diff --git a/external/corefx/src/Common/src/Interop/Windows/Interop.Errors.cs b/external/corefx/src/Common/src/Interop/Windows/Interop.Errors.cs index 5581dd9d8e..d957025555 100644 --- a/external/corefx/src/Common/src/Interop/Windows/Interop.Errors.cs +++ b/external/corefx/src/Common/src/Interop/Windows/Interop.Errors.cs @@ -72,6 +72,7 @@ internal partial class Interop internal const int ERROR_BAD_IMPERSONATION_LEVEL = 0x542; internal const int ERROR_CANT_OPEN_ANONYMOUS = 0x543; internal const int ERROR_NO_SECURITY_ON_OBJECT = 0x546; + internal const int ERROR_CLASS_ALREADY_EXISTS = 0x582; internal const int ERROR_TRUSTED_RELATIONSHIP_FAILURE = 0x6FD; internal const int ERROR_RESOURCE_LANG_NOT_FOUND = 0x717; internal const int EFail = unchecked((int)0x80004005); diff --git a/external/corefx/src/Common/src/Interop/Windows/Interop.Libraries.cs b/external/corefx/src/Common/src/Interop/Windows/Interop.Libraries.cs index 293d9f8d48..77c19b795b 100644 --- a/external/corefx/src/Common/src/Interop/Windows/Interop.Libraries.cs +++ b/external/corefx/src/Common/src/Interop/Windows/Interop.Libraries.cs @@ -30,6 +30,7 @@ internal static partial class Interop internal const string WebSocket = "websocket.dll"; internal const string WinHttp = "winhttp.dll"; internal const string Ws2_32 = "ws2_32.dll"; + internal const string Wtsapi32 = "wtsapi32.dll"; internal const string CompressionNative = "clrcompression.dll"; } } diff --git a/external/corefx/src/Common/src/Interop/Windows/Interop.LongFileTime.cs b/external/corefx/src/Common/src/Interop/Windows/Interop.LongFileTime.cs index 411ae9e4c8..5c8de320bf 100644 --- a/external/corefx/src/Common/src/Interop/Windows/Interop.LongFileTime.cs +++ b/external/corefx/src/Common/src/Interop/Windows/Interop.LongFileTime.cs @@ -23,6 +23,6 @@ internal partial class Interop internal long TicksSince1601; #pragma warning restore CS0649 - internal DateTime ToDateTimeUtc() => DateTime.FromFileTimeUtc(TicksSince1601); + internal DateTimeOffset ToDateTimeOffset() => new DateTimeOffset(DateTime.FromFileTimeUtc(TicksSince1601)); } } diff --git a/external/corefx/src/Common/src/Interop/Windows/Interop.UNICODE_STRING.cs b/external/corefx/src/Common/src/Interop/Windows/Interop.UNICODE_STRING.cs index 237084a73a..a0ca032d16 100644 --- a/external/corefx/src/Common/src/Interop/Windows/Interop.UNICODE_STRING.cs +++ b/external/corefx/src/Common/src/Interop/Windows/Interop.UNICODE_STRING.cs @@ -7,10 +7,19 @@ using System.Runtime.InteropServices; internal static partial class Interop { + // https://msdn.microsoft.com/en-us/library/windows/desktop/aa380518.aspx + // https://msdn.microsoft.com/en-us/library/windows/hardware/ff564879.aspx [StructLayout(LayoutKind.Sequential)] internal struct UNICODE_STRING { + /// + /// Length, in bytes, not including the the null, if any. + /// internal ushort Length; + + /// + /// Max size of the buffer in bytes + /// internal ushort MaximumLength; internal IntPtr Buffer; } diff --git a/external/corefx/src/Common/src/Interop/Windows/NCrypt/Interop.NCryptBuffer.cs b/external/corefx/src/Common/src/Interop/Windows/NCrypt/Interop.NCryptBuffer.cs new file mode 100644 index 0000000000..23d0d5b5d1 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/NCrypt/Interop.NCryptBuffer.cs @@ -0,0 +1,42 @@ +// 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; +using System.Runtime.InteropServices; + +internal static partial class Interop +{ + internal static partial class NCrypt + { + /// + /// Types of NCryptBuffers + /// + internal enum BufferType + { + KdfHashAlgorithm = 0x00000000, // KDF_HASH_ALGORITHM + KdfSecretPrepend = 0x00000001, // KDF_SECRET_PREPEND + KdfSecretAppend = 0x00000002, // KDF_SECRET_APPEND + KdfHmacKey = 0x00000003, // KDF_HMAC_KEY + KdfTlsLabel = 0x00000004, // KDF_TLS_PRF_LABEL + KdfTlsSeed = 0x00000005 // KDF_TLS_PRF_SEED + } + + [StructLayout(LayoutKind.Sequential)] + internal struct NCryptBuffer + { + public int cbBuffer; + public BufferType BufferType; + public IntPtr pvBuffer; + } + + [StructLayout(LayoutKind.Sequential)] + internal struct NCryptBufferDesc + { + public int ulVersion; + public int cBuffers; + public IntPtr pBuffers; // NCryptBuffer[cBuffers] + } + } +} + diff --git a/external/corefx/src/Common/src/Interop/Windows/NCrypt/Interop.NCryptDeriveKeyMaterial.cs b/external/corefx/src/Common/src/Interop/Windows/NCrypt/Interop.NCryptDeriveKeyMaterial.cs new file mode 100644 index 0000000000..db8a6d6009 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/NCrypt/Interop.NCryptDeriveKeyMaterial.cs @@ -0,0 +1,249 @@ +// 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; +using System.Runtime.InteropServices; +using System.Security.Cryptography; +using Internal.Cryptography; +using Microsoft.Win32.SafeHandles; +using Internal.NativeCrypto; + +internal static partial class Interop +{ + internal static partial class NCrypt + { + /// + /// Generate a key from a secret agreement + /// + [DllImport(Interop.Libraries.NCrypt, CharSet = CharSet.Unicode)] + private static extern ErrorCode NCryptDeriveKey( + SafeNCryptSecretHandle hSharedSecret, + string pwszKDF, + [In] ref NCryptBufferDesc pParameterList, + [Out, MarshalAs(UnmanagedType.LPArray)] byte[] pbDerivedKey, + int cbDerivedKey, + [Out] out int pcbResult, + SecretAgreementFlags dwFlags); + + /// + /// Derive key material from a hash or HMAC KDF + /// + /// + private static byte[] DeriveKeyMaterial( + SafeNCryptSecretHandle secretAgreement, + string kdf, + string hashAlgorithm, + byte[] hmacKey, + byte[] secretPrepend, + byte[] secretAppend, + SecretAgreementFlags flags) + { + // First marshal the hash algoritm + IntPtr hashAlgorithmString = IntPtr.Zero; + + try + { + hashAlgorithmString = Marshal.StringToCoTaskMemUni(hashAlgorithm); + + Span parameters = stackalloc NCryptBuffer[4]; + int parameterCount = 0; + // We always need to marshal the hashing function + NCryptBuffer hashAlgorithmBuffer = new NCryptBuffer(); + hashAlgorithmBuffer.cbBuffer = (hashAlgorithm.Length + 1) * sizeof(char); + hashAlgorithmBuffer.BufferType = BufferType.KdfHashAlgorithm; + hashAlgorithmBuffer.pvBuffer = hashAlgorithmString; + + parameters[parameterCount] = hashAlgorithmBuffer; + parameterCount++; + + unsafe + { + fixed (byte* pHmacKey = hmacKey, pSecretPrepend = secretPrepend, pSecretAppend = secretAppend) + { + // + // Now marshal the other parameters + // + + if (pHmacKey != null) + { + NCryptBuffer hmacKeyBuffer = new NCryptBuffer(); + hmacKeyBuffer.cbBuffer = hmacKey.Length; + hmacKeyBuffer.BufferType = BufferType.KdfHmacKey; + hmacKeyBuffer.pvBuffer = new IntPtr(pHmacKey); + + parameters[parameterCount] = hmacKeyBuffer; + parameterCount++; + } + + if (pSecretPrepend != null) + { + NCryptBuffer secretPrependBuffer = new NCryptBuffer(); + secretPrependBuffer.cbBuffer = secretPrepend.Length; + secretPrependBuffer.BufferType = BufferType.KdfSecretPrepend; + secretPrependBuffer.pvBuffer = new IntPtr(pSecretPrepend); + + parameters[parameterCount] = secretPrependBuffer; + parameterCount++; + } + + if (pSecretAppend != null) + { + NCryptBuffer secretAppendBuffer = new NCryptBuffer(); + secretAppendBuffer.cbBuffer = secretAppend.Length; + secretAppendBuffer.BufferType = BufferType.KdfSecretAppend; + secretAppendBuffer.pvBuffer = new IntPtr(pSecretAppend); + + parameters[parameterCount] = secretAppendBuffer; + parameterCount++; + } + + return DeriveKeyMaterial( + secretAgreement, + kdf, + parameters.Slice(0, parameterCount), + flags); + } + } + } + finally + { + if (hashAlgorithmString != IntPtr.Zero) + { + Marshal.FreeCoTaskMem(hashAlgorithmString); + } + } + } + + /// + /// Derive key material using a given KDF and secret agreement + /// + private static unsafe byte[] DeriveKeyMaterial( + SafeNCryptSecretHandle secretAgreement, + string kdf, + ReadOnlySpan parameters, + SecretAgreementFlags flags) + { + fixed (NCryptBuffer* pParameters = &MemoryMarshal.GetReference(parameters)) + { + NCryptBufferDesc parameterDesc = new NCryptBufferDesc(); + parameterDesc.ulVersion = 0; + parameterDesc.cBuffers = parameters.Length; + parameterDesc.pBuffers = new IntPtr(pParameters); + + // Figure out how big the key material is + ErrorCode error = NCryptDeriveKey( + secretAgreement, + kdf, + ref parameterDesc, + null, + 0, + out int keySize, + flags); + + if (error != ErrorCode.ERROR_SUCCESS && error != ErrorCode.NTE_BUFFER_TOO_SMALL) + { + throw error.ToCryptographicException(); + } + + // Allocate memory for the key material and generate it + byte[] keyMaterial = new byte[keySize]; + + error = NCryptDeriveKey( + secretAgreement, + kdf, + ref parameterDesc, + keyMaterial, + keyMaterial.Length, + out keySize, + flags); + + if (error != ErrorCode.ERROR_SUCCESS) + { + throw error.ToCryptographicException(); + } + + // Just in case it shrank the answer once it had a buffer. + Array.Resize(ref keyMaterial, Math.Min(keySize, keyMaterial.Length)); + return keyMaterial; + } + } + + /// + /// Derive key material from a secret agreement using a hash KDF + /// + internal static byte[] DeriveKeyMaterialHash( + SafeNCryptSecretHandle secretAgreement, + string hashAlgorithm, + byte[] secretPrepend, + byte[] secretAppend, + SecretAgreementFlags flags) + { + return DeriveKeyMaterial( + secretAgreement, + BCryptNative.KeyDerivationFunction.Hash, + hashAlgorithm, + null, + secretPrepend, + secretAppend, + flags); + } + + /// + /// Derive key material from a secret agreement using a HMAC KDF + /// + internal static byte[] DeriveKeyMaterialHmac( + SafeNCryptSecretHandle secretAgreement, + string hashAlgorithm, + byte[] hmacKey, + byte[] secretPrepend, + byte[] secretAppend, + SecretAgreementFlags flags) + { + return DeriveKeyMaterial( + secretAgreement, + BCryptNative.KeyDerivationFunction.Hmac, + hashAlgorithm, + hmacKey, + secretPrepend, + secretAppend, + flags); + } + + /// + /// Derive key material from a secret agreeement using the TLS KDF + /// + internal static byte[] DeriveKeyMaterialTls( + SafeNCryptSecretHandle secretAgreement, + byte[] label, + byte[] seed, + SecretAgreementFlags flags) + { + Span buffers = stackalloc NCryptBuffer[2]; + + unsafe + { + fixed (byte* pLabel = label, pSeed = seed) + { + NCryptBuffer labelBuffer = new NCryptBuffer(); + labelBuffer.cbBuffer = label.Length; + labelBuffer.BufferType = BufferType.KdfTlsLabel; + labelBuffer.pvBuffer = new IntPtr(pLabel); + buffers[0] = labelBuffer; + + NCryptBuffer seedBuffer = new NCryptBuffer(); + seedBuffer.cbBuffer = seed.Length; + seedBuffer.BufferType = BufferType.KdfTlsSeed; + seedBuffer.pvBuffer = new IntPtr(pSeed); + buffers[1] = seedBuffer; + + return DeriveKeyMaterial( + secretAgreement, + BCryptNative.KeyDerivationFunction.Tls, + buffers, + flags); + } + } + } + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/NCrypt/Interop.NCryptDeriveSecretAgreement.cs b/external/corefx/src/Common/src/Interop/Windows/NCrypt/Interop.NCryptDeriveSecretAgreement.cs new file mode 100644 index 0000000000..5fd4f1d9da --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/NCrypt/Interop.NCryptDeriveSecretAgreement.cs @@ -0,0 +1,53 @@ +// 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; +using System.Runtime.InteropServices; +using Internal.Cryptography; +using Microsoft.Win32.SafeHandles; + +internal static partial class Interop +{ + internal static partial class NCrypt + { + [Flags] + internal enum SecretAgreementFlags + { + None = 0x00000000, + UseSecretAsHmacKey = 0x00000001 // KDF_USE_SECRET_AS_HMAC_KEY_FLAG + } + + /// + /// Generate a secret agreement for generating shared key material + /// + [DllImport(Interop.Libraries.NCrypt)] + private static extern ErrorCode NCryptSecretAgreement( + SafeNCryptKeyHandle hPrivKey, + SafeNCryptKeyHandle hPubKey, + [Out] out SafeNCryptSecretHandle phSecret, + int dwFlags); + + + /// + /// Generate a secret agreement value for between two parties + /// + internal static SafeNCryptSecretHandle DeriveSecretAgreement( + SafeNCryptKeyHandle privateKey, + SafeNCryptKeyHandle otherPartyPublicKey) + { + ErrorCode error = NCryptSecretAgreement( + privateKey, + otherPartyPublicKey, + out SafeNCryptSecretHandle secretAgreement, + 0); + + if (error != ErrorCode.ERROR_SUCCESS) + { + throw error.ToCryptographicException(); + } + + return secretAgreement; + } + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/NtDll/Interop.FILE_FULL_DIR_INFORMATION.cs b/external/corefx/src/Common/src/Interop/Windows/NtDll/Interop.FILE_FULL_DIR_INFORMATION.cs index a1037696f6..5b3123bacf 100644 --- a/external/corefx/src/Common/src/Interop/Windows/NtDll/Interop.FILE_FULL_DIR_INFORMATION.cs +++ b/external/corefx/src/Common/src/Interop/Windows/NtDll/Interop.FILE_FULL_DIR_INFORMATION.cs @@ -62,6 +62,9 @@ internal partial class Interop /// public unsafe static FILE_FULL_DIR_INFORMATION* GetNextInfo(FILE_FULL_DIR_INFORMATION* info) { + if (info == null) + return null; + uint nextOffset = (*info).NextEntryOffset; if (nextOffset == 0) return null; diff --git a/external/corefx/src/Common/src/Interop/Windows/NtDll/Interop.NtCreateFile.cs b/external/corefx/src/Common/src/Interop/Windows/NtDll/Interop.NtCreateFile.cs new file mode 100644 index 0000000000..07a3ba15b4 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/NtDll/Interop.NtCreateFile.cs @@ -0,0 +1,580 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class NtDll + { + // https://msdn.microsoft.com/en-us/library/bb432380.aspx + // https://msdn.microsoft.com/en-us/library/windows/hardware/ff566424.aspx + [DllImport(Libraries.NtDll, CharSet = CharSet.Unicode, ExactSpelling = true)] + private unsafe static extern int NtCreateFile( + out IntPtr FileHandle, + DesiredAccess DesiredAccess, + ref OBJECT_ATTRIBUTES ObjectAttributes, + out IO_STATUS_BLOCK IoStatusBlock, + long* AllocationSize, + System.IO.FileAttributes FileAttributes, + System.IO.FileShare ShareAccess, + CreateDisposition CreateDisposition, + CreateOptions CreateOptions, + void* EaBuffer, + uint EaLength); + + internal unsafe static (int status, IntPtr handle) CreateFile( + ReadOnlySpan path, + IntPtr rootDirectory, + CreateDisposition createDisposition, + DesiredAccess desiredAccess = DesiredAccess.FILE_GENERIC_READ | DesiredAccess.SYNCHRONIZE, + System.IO.FileShare shareAccess = System.IO.FileShare.ReadWrite | System.IO.FileShare.Delete, + System.IO.FileAttributes fileAttributes = 0, + CreateOptions createOptions = CreateOptions.FILE_SYNCHRONOUS_IO_NONALERT, + ObjectAttributes objectAttributes = ObjectAttributes.OBJ_CASE_INSENSITIVE) + { + fixed (char* c = &MemoryMarshal.GetReference(path)) + { + UNICODE_STRING name = new UNICODE_STRING + { + Length = checked((ushort)(path.Length * sizeof(char))), + MaximumLength = checked((ushort)(path.Length * sizeof(char))), + Buffer = (IntPtr)c + }; + + OBJECT_ATTRIBUTES attributes = new OBJECT_ATTRIBUTES( + &name, + objectAttributes, + rootDirectory); + + int status = NtCreateFile( + out IntPtr handle, + desiredAccess, + ref attributes, + out IO_STATUS_BLOCK statusBlock, + AllocationSize: null, + FileAttributes: fileAttributes, + ShareAccess: shareAccess, + CreateDisposition: createDisposition, + CreateOptions: createOptions, + EaBuffer: null, + EaLength: 0); + + return (status, handle); + } + } + + // https://msdn.microsoft.com/en-us/library/windows/hardware/ff557749.aspx + public unsafe struct OBJECT_ATTRIBUTES + { + public uint Length; + + /// + /// Optional handle to root object directory for the given ObjectName. + /// Can be a file system directory or object manager directory. + /// + public IntPtr RootDirectory; + + /// + /// Name of the object. Must be fully qualified if RootDirectory isn't set. + /// Otherwise is relative to RootDirectory. + /// + public UNICODE_STRING* ObjectName; + + public ObjectAttributes Attributes; + + /// + /// If null, object will receive default security settings. + /// + public void* SecurityDescriptor; + + /// + /// Optional quality of service to be applied to the object. Used to indicate + /// security impersonation level and context tracking mode (dynamic or static). + /// + public void* SecurityQualityOfService; + + /// + /// Equivalent of InitializeObjectAttributes macro with the exception that you can directly set SQOS. + /// + public unsafe OBJECT_ATTRIBUTES(UNICODE_STRING* objectName, ObjectAttributes attributes, IntPtr rootDirectory) + { + Length = (uint)sizeof(OBJECT_ATTRIBUTES); + RootDirectory = rootDirectory; + ObjectName = objectName; + Attributes = attributes; + SecurityDescriptor = null; + SecurityQualityOfService = null; + } + } + + [Flags] + public enum ObjectAttributes : uint + { + // https://msdn.microsoft.com/en-us/library/windows/hardware/ff564586.aspx + // https://msdn.microsoft.com/en-us/library/windows/hardware/ff547804.aspx + + /// + /// This handle can be inherited by child processes of the current process. + /// + OBJ_INHERIT = 0x00000002, + + /// + /// This flag only applies to objects that are named within the object manager. + /// By default, such objects are deleted when all open handles to them are closed. + /// If this flag is specified, the object is not deleted when all open handles are closed. + /// + OBJ_PERMANENT = 0x00000010, + + /// + /// Only a single handle can be open for this object. + /// + OBJ_EXCLUSIVE = 0x00000020, + + /// + /// Lookups for this object should be case insensitive. + /// + OBJ_CASE_INSENSITIVE = 0x00000040, + + /// + /// Create on existing object should open, not fail with STATUS_OBJECT_NAME_COLLISION. + /// + OBJ_OPENIF = 0x00000080, + + /// + /// Open the symbolic link, not its target. + /// + OBJ_OPENLINK = 0x00000100, + + // Only accessible from kernel mode + // OBJ_KERNEL_HANDLE + + // Access checks enforced, even in kernel mode + // OBJ_FORCE_ACCESS_CHECK + // OBJ_VALID_ATTRIBUTES = 0x000001F2 + } + + /// + /// File creation disposition when calling directly to NT apis. + /// + public enum CreateDisposition : uint + { + /// + /// Default. Replace or create. Deletes existing file instead of overwriting. + /// + /// + /// As this potentially deletes it requires that DesiredAccess must include Delete. + /// This has no equivalent in CreateFile. + /// + FILE_SUPERSEDE = 0, + + /// + /// Open if exists or fail if doesn't exist. Equivalent to OPEN_EXISTING or + /// . + /// + /// + /// TruncateExisting also uses Open and then manually truncates the file + /// by calling NtSetInformationFile with FileAllocationInformation and an + /// allocation size of 0. + /// + FILE_OPEN = 1, + + /// + /// Create if doesn't exist or fail if does exist. Equivalent to CREATE_NEW + /// or . + /// + FILE_CREATE = 2, + + /// + /// Open if exists or create if doesn't exist. Equivalent to OPEN_ALWAYS or + /// . + /// + FILE_OPEN_IF = 3, + + /// + /// Open and overwrite if exists or fail if doesn't exist. Equivalent to + /// TRUNCATE_EXISTING or . + /// + FILE_OVERWRITE = 4, + + /// + /// Open and overwrite if exists or create if doesn't exist. Equivalent to + /// CREATE_ALWAYS or . + /// + FILE_OVERWRITE_IF = 5 + } + + /// + /// Options for creating/opening files with NtCreateFile. + /// + public enum CreateOptions : uint + { + /// + /// File being created or opened must be a directory file. Disposition must be FILE_CREATE, FILE_OPEN, + /// or FILE_OPEN_IF. + /// + /// + /// Can only be used with FILE_SYNCHRONOUS_IO_ALERT/NONALERT, FILE_WRITE_THROUGH, FILE_OPEN_FOR_BACKUP_INTENT, + /// and FILE_OPEN_BY_FILE_ID flags. + /// + FILE_DIRECTORY_FILE = 0x00000001, + + /// + /// Applications that write data to the file must actually transfer the data into + /// the file before any requested write operation is considered complete. This flag + /// is set automatically if FILE_NO_INTERMEDIATE_BUFFERING is set. + /// + FILE_WRITE_THROUGH = 0x00000002, + + /// + /// All accesses to the file are sequential. + /// + FILE_SEQUENTIAL_ONLY = 0x00000004, + + /// + /// File cannot be cached in driver buffers. Cannot use with AppendData desired access. + /// + FILE_NO_INTERMEDIATE_BUFFERING = 0x00000008, + + /// + /// All operations are performed synchronously. Any wait on behalf of the caller is + /// subject to premature termination from alerts. + /// + /// + /// Cannot be used with FILE_SYNCHRONOUS_IO_NONALERT. + /// Synchronous DesiredAccess flag is required. I/O system will maintain file position context. + /// + FILE_SYNCHRONOUS_IO_ALERT = 0x00000010, + + /// + /// All operations are performed synchronously. Waits in the system to synchronize I/O queuing + /// and completion are not subject to alerts. + /// + /// + /// Cannot be used with FILE_SYNCHRONOUS_IO_ALERT. + /// Synchronous DesiredAccess flag is required. I/O system will maintain file position context. + /// + FILE_SYNCHRONOUS_IO_NONALERT = 0x00000020, + + /// + /// File being created or opened must not be a directory file. Can be a data file, device, + /// or volume. + /// + FILE_NON_DIRECTORY_FILE = 0x00000040, + + /// + /// Create a tree connection for this file in order to open it over the network. + /// + /// + /// Not used by device and intermediate drivers. + /// + FILE_CREATE_TREE_CONNECTION = 0x00000080, + + /// + /// Complete the operation immediately with a success code of STATUS_OPLOCK_BREAK_IN_PROGRESS if + /// the target file is oplocked. + /// + /// + /// Not compatible with ReserveOpfilter or OpenRequiringOplock. + /// Not used by device and intermediate drivers. + /// + FILE_COMPLETE_IF_OPLOCKED = 0x00000100, + + /// + /// If the extended attributes on an existing file being opened indicate that the caller must + /// understand extended attributes to properly interpret the file, fail the request. + /// + /// + /// Not used by device and intermediate drivers. + /// + FILE_NO_EA_KNOWLEDGE = 0x00000200, + + // Behavior undocumented, defined in headers + // FILE_OPEN_REMOTE_INSTANCE = 0x00000400, + + /// + /// Accesses to the file can be random, so no sequential read-ahead operations should be performed + /// on the file by FSDs or the system. + /// + FILE_RANDOM_ACCESS = 0x00000800, + + /// + /// Delete the file when the last handle to it is passed to NtClose. Requires Delete flag in + /// DesiredAccess parameter. + /// + FILE_DELETE_ON_CLOSE = 0x00001000, + + /// + /// Open the file by reference number or object ID. The file name that is specified by the ObjectAttributes + /// name parameter includes the 8 or 16 byte file reference number or ID for the file in the ObjectAttributes + /// name field. The device name can optionally be prefixed. + /// + /// + /// NTFS supports both reference numbers and object IDs. 16 byte reference numbers are 8 byte numbers padded + /// with zeros. ReFS only supports reference numbers (not object IDs). 8 byte and 16 byte reference numbers + /// are not related. Note that as the UNICODE_STRING will contain raw byte data, it may not be a "valid" string. + /// Not used by device and intermediate drivers. + /// + /// + /// \??\C:\{8 bytes of binary FileID} + /// \device\HardDiskVolume1\{16 bytes of binary ObjectID} + /// {8 bytes of binary FileID} + /// + FILE_OPEN_BY_FILE_ID = 0x00002000, + + /// + /// The file is being opened for backup intent. Therefore, the system should check for certain access rights + /// and grant the caller the appropriate access to the file before checking the DesiredAccess parameter + /// against the file's security descriptor. + /// + /// + /// Not used by device and intermediate drivers. + /// + FILE_OPEN_FOR_BACKUP_INTENT = 0x00004000, + + /// + /// When creating a file, specifies that it should not inherit the compression bit from the parent directory. + /// + FILE_NO_COMPRESSION = 0x00008000, + + /// + /// The file is being opened and an opportunistic lock (oplock) on the file is being requested as a single atomic + /// operation. + /// + /// + /// The file system checks for oplocks before it performs the create operation and will fail the create with a + /// return code of STATUS_CANNOT_BREAK_OPLOCK if the result would be to break an existing oplock. + /// Not compatible with CompleteIfOplocked or ReserveOpFilter. Windows 7 and up. + /// + FILE_OPEN_REQUIRING_OPLOCK = 0x00010000, + + /// + /// CreateFile2 uses this flag to prevent opening a file that you don't have access to without specifying + /// FILE_SHARE_READ. (Preventing users that can only read a file from denying access to other readers.) + /// + /// + /// Windows 7 and up. + /// + FILE_DISALLOW_EXCLUSIVE = 0x00020000, + + /// + /// The client opening the file or device is session aware and per session access is validated if necessary. + /// + /// + /// Windows 8 and up. + /// + FILE_SESSION_AWARE = 0x00040000, + + /// + /// This flag allows an application to request a filter opportunistic lock (oplock) to prevent other applications + /// from getting share violations. + /// + /// + /// Not compatible with CompleteIfOplocked or OpenRequiringOplock. + /// If there are already open handles, the create request will fail with STATUS_OPLOCK_NOT_GRANTED. + /// + FILE_RESERVE_OPFILTER = 0x00100000, + + /// + /// Open a file with a reparse point attribute, bypassing the normal reparse point processing. + /// + FILE_OPEN_REPARSE_POINT = 0x00200000, + + /// + /// Causes files that are marked with the Offline attribute not to be recalled from remote storage. + /// + /// + /// More details can be found in Remote Storage documentation (see Basic Concepts). + /// https://technet.microsoft.com/en-us/library/cc938459.aspx + /// + FILE_OPEN_NO_RECALL = 0x00400000 + + // Behavior undocumented, defined in headers + // FILE_OPEN_FOR_FREE_SPACE_QUERY = 0x00800000 + } + + /// + /// System.IO.FileAccess looks up these values when creating handles + /// + /// + /// File Security and Access Rights + /// https://msdn.microsoft.com/en-us/library/windows/desktop/aa364399.aspx + /// + [Flags] + public enum DesiredAccess : uint + { + // File Access Rights Constants + // https://msdn.microsoft.com/en-us/library/windows/desktop/gg258116.aspx + + /// + /// For a file, the right to read data from the file. + /// + /// + /// Directory version of this flag is . + /// + FILE_READ_DATA = 0x0001, + + /// + /// For a directory, the right to list the contents. + /// + /// + /// File version of this flag is . + /// + FILE_LIST_DIRECTORY = 0x0001, + + /// + /// For a file, the right to write data to the file. + /// + /// + /// Directory version of this flag is . + /// + FILE_WRITE_DATA = 0x0002, + + /// + /// For a directory, the right to create a file in a directory. + /// + /// + /// File version of this flag is . + /// + FILE_ADD_FILE = 0x0002, + + /// + /// For a file, the right to append data to a file. is needed + /// to overwrite existing data. + /// + /// + /// Directory version of this flag is . + /// + FILE_APPEND_DATA = 0x0004, + + /// + /// For a directory, the right to create a subdirectory. + /// + /// + /// File version of this flag is . + /// + FILE_ADD_SUBDIRECTORY = 0x0004, + + /// + /// For a named pipe, the right to create a pipe instance. + /// + FILE_CREATE_PIPE_INSTANCE = 0x0004, + + /// + /// The right to read extended attributes. + /// + FILE_READ_EA = 0x0008, + + /// + /// The right to write extended attributes. + /// + FILE_WRITE_EA = 0x0010, + + /// + /// The right to execute the file. + /// + /// + /// Directory version of this flag is . + /// + FILE_EXECUTE = 0x0020, + + /// + /// For a directory, the right to traverse the directory. + /// + /// + /// File version of this flag is . + /// + FILE_TRAVERSE = 0x0020, + + /// + /// For a directory, the right to delete a directory and all + /// the files it contains, including read-only files. + /// + FILE_DELETE_CHILD = 0x0040, + + /// + /// The right to read attributes. + /// + FILE_READ_ATTRIBUTES = 0x0080, + + /// + /// The right to write attributes. + /// + FILE_WRITE_ATTRIBUTES = 0x0100, + + /// + /// All standard and specific rights. [FILE_ALL_ACCESS] + /// + FILE_ALL_ACCESS = DELETE | READ_CONTROL | WRITE_DAC | WRITE_OWNER | 0x1FF, + + /// + /// The right to delete the object. + /// + DELETE = 0x00010000, + + /// + /// The right to read the information in the object's security descriptor. + /// Doesn't include system access control list info (SACL). + /// + READ_CONTROL = 0x00020000, + + /// + /// The right to modify the discretionary access control list (DACL) in the + /// object's security descriptor. + /// + WRITE_DAC = 0x00040000, + + /// + /// The right to change the owner in the object's security descriptor. + /// + WRITE_OWNER = 0x00080000, + + /// + /// The right to use the object for synchronization. Enables a thread to wait until the object + /// is in the signaled state. This is required if opening a synchronous handle. + /// + SYNCHRONIZE = 0x00100000, + + /// + /// Same as READ_CONTROL. + /// + STANDARD_RIGHTS_READ = READ_CONTROL, + + /// + /// Same as READ_CONTROL. + /// + STANDARD_RIGHTS_WRITE = READ_CONTROL, + + /// + /// Same as READ_CONTROL. + /// + STANDARD_RIGHTS_EXECUTE = READ_CONTROL, + + /// + /// Maps internally to | | + /// | | . + /// (For directories, | | + /// | | .) + /// + FILE_GENERIC_READ = 0x80000000, // GENERIC_READ + + /// + /// Maps internally to | | + /// | | | . + /// (For directories, | | AddFile + /// | | | .) + /// + FILE_GENERIC_WRITE = 0x40000000, // GENERIC WRITE + + /// + /// Maps internally to | | + /// | . + /// (For directories, | | + /// | .) + /// + FILE_GENERIC_EXECUTE = 0x20000000 // GENERIC_EXECUTE + } + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/SChannel/Interop.SchProtocols.cs b/external/corefx/src/Common/src/Interop/Windows/SChannel/Interop.SchProtocols.cs index a5185d3feb..c94bd92383 100644 --- a/external/corefx/src/Common/src/Interop/Windows/SChannel/Interop.SchProtocols.cs +++ b/external/corefx/src/Common/src/Interop/Windows/SChannel/Interop.SchProtocols.cs @@ -9,8 +9,6 @@ internal static partial class Interop // Most constants below are taken from schannel.h; those that are not are // called out explicitly. - // IMPORTANT: SSL2 and SSL3 definitions are required for System.Net.Primitives enum definitions only. - // These values should NOT be used in Schannel setup. public const int SP_PROT_SSL2_SERVER = 0x00000004; public const int SP_PROT_SSL2_CLIENT = 0x00000008; public const int SP_PROT_SSL2 = (SP_PROT_SSL2_SERVER | SP_PROT_SSL2_CLIENT); @@ -34,7 +32,7 @@ internal static partial class Interop public const int SP_PROT_NONE = 0; // These two constants are not taken from schannel.h. - public const int ClientProtocolMask = (SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT); - public const int ServerProtocolMask = (SP_PROT_TLS1_0_SERVER | SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_2_SERVER); + public const int ClientProtocolMask = (SP_PROT_SSL2_CLIENT | SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT); + public const int ServerProtocolMask = (SP_PROT_SSL2_SERVER | SP_PROT_SSL3_SERVER | SP_PROT_TLS1_0_SERVER | SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_2_SERVER); } } diff --git a/external/corefx/src/Common/src/Interop/Windows/SChannel/Interop.Sec_Application_Protocols.cs b/external/corefx/src/Common/src/Interop/Windows/SChannel/Interop.Sec_Application_Protocols.cs index a18dac2ad9..09a7353acf 100644 --- a/external/corefx/src/Common/src/Interop/Windows/SChannel/Interop.Sec_Application_Protocols.cs +++ b/external/corefx/src/Common/src/Interop/Windows/SChannel/Interop.Sec_Application_Protocols.cs @@ -13,10 +13,8 @@ internal static partial class Interop [StructLayout(LayoutKind.Sequential, Pack = 1)] internal struct Sec_Application_Protocols { - private static readonly int ProtocolListOffset = Marshal.SizeOf(); - private static readonly int ProtocolListConstSize = ProtocolListOffset - (int)Marshal.OffsetOf(nameof(ProtocolExtenstionType)); public uint ProtocolListsSize; - public ApplicationProtocolNegotiationExt ProtocolExtenstionType; + public ApplicationProtocolNegotiationExt ProtocolExtensionType; public short ProtocolListSize; public static unsafe byte[] ToByteArray(List applicationProtocols) @@ -38,27 +36,26 @@ internal static partial class Interop } Sec_Application_Protocols protocols = new Sec_Application_Protocols(); - protocols.ProtocolListsSize = (uint)(ProtocolListConstSize + protocolListSize); - protocols.ProtocolExtenstionType = ApplicationProtocolNegotiationExt.ALPN; + + int protocolListConstSize = sizeof(Sec_Application_Protocols) - sizeof(uint) /* offsetof(Sec_Application_Protocols, ProtocolExtensionType) */; + protocols.ProtocolListsSize = (uint)(protocolListConstSize + protocolListSize); + + protocols.ProtocolExtensionType = ApplicationProtocolNegotiationExt.ALPN; protocols.ProtocolListSize = (short)protocolListSize; - Span pBuffer = new byte[protocolListSize]; + byte[] buffer = new byte[sizeof(Sec_Application_Protocols) + protocolListSize]; int index = 0; + + MemoryMarshal.Write(buffer.AsSpan(index), ref protocols); + index += sizeof(Sec_Application_Protocols); + for (int i = 0; i < applicationProtocols.Count; i++) { - pBuffer[index++] = (byte)applicationProtocols[i].Protocol.Length; - applicationProtocols[i].Protocol.Span.CopyTo(pBuffer.Slice(index)); + buffer[index++] = (byte)applicationProtocols[i].Protocol.Length; + applicationProtocols[i].Protocol.Span.CopyTo(buffer.AsSpan(index)); index += applicationProtocols[i].Protocol.Length; } - byte[] buffer = new byte[ProtocolListOffset + protocolListSize]; - fixed (byte* bufferPtr = buffer) - { - Marshal.StructureToPtr(protocols, new IntPtr(bufferPtr), false); - byte* pList = bufferPtr + ProtocolListOffset; - pBuffer.CopyTo(new Span(pList, index)); - } - return buffer; } } diff --git a/external/corefx/src/Common/src/Interop/Windows/SChannel/UnmanagedCertificateContext.IntPtr.cs b/external/corefx/src/Common/src/Interop/Windows/SChannel/UnmanagedCertificateContext.IntPtr.cs index f3d53c92fc..a508e5dcad 100644 --- a/external/corefx/src/Common/src/Interop/Windows/SChannel/UnmanagedCertificateContext.IntPtr.cs +++ b/external/corefx/src/Common/src/Interop/Windows/SChannel/UnmanagedCertificateContext.IntPtr.cs @@ -20,8 +20,11 @@ namespace System.Net return result; } - Interop.Crypt32.CERT_CONTEXT context = - Marshal.PtrToStructure(certContext); + Interop.Crypt32.CERT_CONTEXT context; + unsafe + { + context = *(Interop.Crypt32.CERT_CONTEXT*)certContext; + } if (context.hCertStore != IntPtr.Zero) { diff --git a/external/corefx/src/Common/src/Interop/Windows/Winsock/AddressInfoEx.cs b/external/corefx/src/Common/src/Interop/Windows/Winsock/AddressInfoEx.cs new file mode 100644 index 0000000000..0972101831 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/Winsock/AddressInfoEx.cs @@ -0,0 +1,25 @@ +// 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.Net.Internals; +using System.Runtime.InteropServices; + +namespace System.Net.Sockets +{ + [StructLayout(LayoutKind.Sequential)] + internal unsafe struct AddressInfoEx + { + internal AddressInfoHints ai_flags; + internal AddressFamily ai_family; + internal SocketType ai_socktype; + internal ProtocolFamily ai_protocol; + internal int ai_addrlen; + internal IntPtr ai_canonname; // Ptr to the canonical name - check for NULL + internal byte* ai_addr; // Ptr to the sockaddr structure + internal IntPtr ai_blob; // Unused ptr to blob data about provider + internal int ai_bloblen; + internal IntPtr ai_provider; // Unused ptr to the namespace provider guid + internal AddressInfoEx* ai_next; // Next structure in linked list + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/Winsock/Interop.GetAddrInfoExW.cs b/external/corefx/src/Common/src/Interop/Windows/Winsock/Interop.GetAddrInfoExW.cs new file mode 100644 index 0000000000..cb2070de81 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/Winsock/Interop.GetAddrInfoExW.cs @@ -0,0 +1,36 @@ +// 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; +using System.Net.Sockets; +using System.Runtime.InteropServices; +using System.Threading; + +internal static partial class Interop +{ + internal static partial class Winsock + { + internal const string GetAddrInfoExCancelFunctionName = "GetAddrInfoExCancel"; + + internal unsafe delegate void LPLOOKUPSERVICE_COMPLETION_ROUTINE([In] int dwError, [In] int dwBytes, [In] NativeOverlapped* lpOverlapped); + + [DllImport(Interop.Libraries.Ws2_32, ExactSpelling = true, CharSet = CharSet.Unicode, SetLastError = true)] + internal static extern unsafe int GetAddrInfoExW( + [In] string pName, + [In] string pServiceName, + [In] int dwNamespace, + [In] IntPtr lpNspId, + [In] ref AddressInfoEx pHints, + [Out] out AddressInfoEx* ppResult, + [In] IntPtr timeout, + [In] ref NativeOverlapped lpOverlapped, + [In] LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine, + [Out] out IntPtr lpNameHandle + ); + + [DllImport("ws2_32.dll", ExactSpelling = true, SetLastError = true)] + internal static extern unsafe void FreeAddrInfoEx([In] AddressInfoEx* pAddrInfo); + } +} + diff --git a/external/corefx/src/Common/src/Interop/Windows/Winsock/Interop.gethostbyaddr.cs b/external/corefx/src/Common/src/Interop/Windows/Winsock/Interop.gethostbyaddr.cs deleted file mode 100644 index 5280eb6aa1..0000000000 --- a/external/corefx/src/Common/src/Interop/Windows/Winsock/Interop.gethostbyaddr.cs +++ /dev/null @@ -1,23 +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; -using System.Runtime.InteropServices; -using System.Net.Sockets; -#if !SYSTEM_NET_SOCKETS_DLL -using ProtocolFamily = System.Net.Internals.ProtocolFamily; -#endif - -internal static partial class Interop -{ - internal static partial class Winsock - { - [DllImport(Interop.Libraries.Ws2_32, SetLastError = true)] - internal static extern IntPtr gethostbyaddr( - [In] ref int addr, - [In] int len, - [In] ProtocolFamily type - ); - } -} diff --git a/external/corefx/src/Common/src/Interop/Windows/Winsock/Interop.gethostbyname.cs b/external/corefx/src/Common/src/Interop/Windows/Winsock/Interop.gethostbyname.cs deleted file mode 100644 index ec141b55cf..0000000000 --- a/external/corefx/src/Common/src/Interop/Windows/Winsock/Interop.gethostbyname.cs +++ /dev/null @@ -1,17 +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; -using System.Runtime.InteropServices; - -internal static partial class Interop -{ - internal static partial class Winsock - { - [DllImport(Interop.Libraries.Ws2_32, CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true, SetLastError = true)] - internal static extern IntPtr gethostbyname( - [In] string host - ); - } -} diff --git a/external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.ClaimSecurityAttributes.cs b/external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.ClaimSecurityAttributes.cs new file mode 100644 index 0000000000..e8cbf16a86 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.ClaimSecurityAttributes.cs @@ -0,0 +1,128 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + [StructLayout(LayoutKind.Explicit)] + internal struct CLAIM_SECURITY_ATTRIBUTE_INFORMATION_V1 + { + // defined as union in CLAIM_SECURITY_ATTRIBUTES_INFORMATION + [FieldOffset(0)] + public IntPtr pAttributeV1; + } + + [StructLayout(LayoutKind.Sequential)] + internal struct CLAIM_SECURITY_ATTRIBUTES_INFORMATION + { + /// WORD->unsigned short + public ushort Version; + + /// WORD->unsigned short + public ushort Reserved; + + /// DWORD->unsigned int + public uint AttributeCount; + + /// CLAIM_SECURITY_ATTRIBUTE_V1 + public CLAIM_SECURITY_ATTRIBUTE_INFORMATION_V1 Attribute; + } + + [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)] + internal struct CLAIM_SECURITY_ATTRIBUTE_FQBN_VALUE + { + // DWORD64->unsigned __int64 + public ulong Version; + + // PWSTR->WCHAR* + [MarshalAsAttribute(UnmanagedType.LPWStr)] + public string Name; + } + + [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)] + internal struct CLAIM_SECURITY_ATTRIBUTE_OCTET_STRING_VALUE + { + /// PVOID->void* + public IntPtr pValue; + + /// DWORD->unsigned int + public uint ValueLength; + } + + [StructLayout(LayoutKind.Explicit, CharSet = CharSet.Unicode)] + internal struct CLAIM_VALUES_ATTRIBUTE_V1 + { + // PLONG64->__int64* + [FieldOffset(0)] + public IntPtr pInt64; + + // PDWORD64->unsigned __int64* + [FieldOffset(0)] + public IntPtr pUint64; + + // PWSTR* + [FieldOffset(0)] + public IntPtr ppString; + + // PCLAIM_SECURITY_ATTRIBUTE_FQBN_VALUE->_CLAIM_SECURITY_ATTRIBUTE_FQBN_VALUE* + [FieldOffset(0)] + public IntPtr pFqbn; + + // PCLAIM_SECURITY_ATTRIBUTE_OCTET_STRING_VALUE->_CLAIM_SECURITY_ATTRIBUTE_OCTET_STRING_VALUE* + [FieldOffset(0)] + public IntPtr pOctetString; + } + + [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)] + internal struct CLAIM_SECURITY_ATTRIBUTE_V1 + { + // PWSTR->WCHAR* + [MarshalAs(UnmanagedType.LPWStr)] + public string Name; + + // WORD->unsigned short + public ClaimSecurityAttributeType ValueType; + + // WORD->unsigned short + public ushort Reserved; + + // DWORD->unsigned int + public uint Flags; + + // DWORD->unsigned int + public uint ValueCount; + + // struct CLAIM_VALUES - a union of 4 possible values + public CLAIM_VALUES_ATTRIBUTE_V1 Values; + } + + internal enum ClaimSecurityAttributeType : ushort + { + // CLAIM_SECURITY_ATTRIBUTE_TYPE_INVALID -> 0x00 + CLAIM_SECURITY_ATTRIBUTE_TYPE_INVALID = 0, + + // CLAIM_SECURITY_ATTRIBUTE_TYPE_INT64 -> 0x01 + CLAIM_SECURITY_ATTRIBUTE_TYPE_INT64 = 1, + + // CLAIM_SECURITY_ATTRIBUTE_TYPE_UINT64 -> 0x02 + CLAIM_SECURITY_ATTRIBUTE_TYPE_UINT64 = 2, + + // CLAIM_SECURITY_ATTRIBUTE_TYPE_STRING -> 0x03 + CLAIM_SECURITY_ATTRIBUTE_TYPE_STRING = 3, + + // CLAIM_SECURITY_ATTRIBUTE_TYPE_FQBN -> 0x04 + CLAIM_SECURITY_ATTRIBUTE_TYPE_FQBN = 4, + + // CLAIM_SECURITY_ATTRIBUTE_TYPE_SID -> 0x05 + CLAIM_SECURITY_ATTRIBUTE_TYPE_SID = 5, + + // CLAIM_SECURITY_ATTRIBUTE_TYPE_BOOLEAN -> 0x06 + CLAIM_SECURITY_ATTRIBUTE_TYPE_BOOLEAN = 6, + + // CLAIM_SECURITY_ATTRIBUTE_TYPE_OCTET_STRING -> 0x10 + CLAIM_SECURITY_ATTRIBUTE_TYPE_OCTET_STRING = 16, + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.CreateProcessWithLogon.cs b/external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.CreateProcessWithLogon.cs index c5fade0454..80eae1076b 100644 --- a/external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.CreateProcessWithLogon.cs +++ b/external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.CreateProcessWithLogon.cs @@ -16,13 +16,13 @@ internal partial class Interop string domain, IntPtr password, LogonFlags logonFlags, - [MarshalAs(UnmanagedType.LPTStr)] string appName, + string appName, StringBuilder cmdLine, int creationFlags, IntPtr environmentBlock, - [MarshalAs(UnmanagedType.LPTStr)] string lpCurrentDirectory, - Interop.Kernel32.STARTUPINFO lpStartupInfo, - Interop.Kernel32.PROCESS_INFORMATION lpProcessInformation); + string lpCurrentDirectory, + ref Interop.Kernel32.STARTUPINFO lpStartupInfo, + ref Interop.Kernel32.PROCESS_INFORMATION lpProcessInformation); [Flags] internal enum LogonFlags diff --git a/external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.LookupAccountNameW.cs b/external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.LookupAccountNameW.cs index 6a8c6676d1..3554665e5f 100644 --- a/external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.LookupAccountNameW.cs +++ b/external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.LookupAccountNameW.cs @@ -3,16 +3,19 @@ // See the LICENSE file in the project root for more information. using System.Runtime.InteropServices; -using System.Text; internal partial class Interop { internal partial class Advapi32 { - [DllImport(Libraries.Advapi32, CharSet = CharSet.Unicode, SetLastError = true)] + [DllImport(Libraries.Advapi32, CharSet = CharSet.Unicode, SetLastError = true, ExactSpelling = true)] internal static extern bool LookupAccountNameW( - string machineName, string accountName, byte[] sid, - ref int sidLen, - [Out] StringBuilder domainName, ref uint domainNameLen, out int peUse); + string lpSystemName, + ref char lpAccountName, + ref byte Sid, + ref uint cbSid, + ref char ReferencedDomainName, + ref uint cchReferencedDomainName, + out uint peUse); } } diff --git a/external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.ServiceProcessOptions.cs b/external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.ServiceProcessOptions.cs index 5e4a93b38f..26d8ca11fd 100644 --- a/external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.ServiceProcessOptions.cs +++ b/external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.ServiceProcessOptions.cs @@ -143,6 +143,7 @@ internal partial class Interop internal const int STATE_START_PENDING = 0x00000002; internal const int STATE_STOPPED = 0x00000001; internal const int STATE_STOP_PENDING = 0x00000003; + internal const int ERROR_EXCEPTION_IN_SERVICE = 0x00000428; } internal partial class ServiceStartErrorModes diff --git a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CopyFileEx.cs b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CopyFileEx.cs index 7f8c10c4b3..46efbc61bc 100644 --- a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CopyFileEx.cs +++ b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CopyFileEx.cs @@ -30,8 +30,8 @@ internal partial class Interop ref int cancel, int flags) { - src = PathInternal.EnsureExtendedPrefixOverMaxPath(src); - dst = PathInternal.EnsureExtendedPrefixOverMaxPath(dst); + src = PathInternal.EnsureExtendedPrefixIfNeeded(src); + dst = PathInternal.EnsureExtendedPrefixIfNeeded(dst); return CopyFileExPrivate(src, dst, progressRoutine, progressData, ref cancel, flags); } } diff --git a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CreateFile.cs b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CreateFile.cs index 9c3639d6e2..3fe8360caf 100644 --- a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CreateFile.cs +++ b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CreateFile.cs @@ -34,7 +34,7 @@ internal partial class Interop int dwFlagsAndAttributes, IntPtr hTemplateFile) { - lpFileName = PathInternal.EnsureExtendedPrefixOverMaxPath(lpFileName); + lpFileName = PathInternal.EnsureExtendedPrefixIfNeeded(lpFileName); fixed (SECURITY_ATTRIBUTES* sa = &securityAttrs) { IntPtr handle = CreateFilePrivate(lpFileName, dwDesiredAccess, dwShareMode, sa, dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile); @@ -76,7 +76,7 @@ internal partial class Interop FileMode dwCreationDisposition, int dwFlagsAndAttributes) { - lpFileName = PathInternal.EnsureExtendedPrefixOverMaxPath(lpFileName); + lpFileName = PathInternal.EnsureExtendedPrefixIfNeeded(lpFileName); return CreateFilePrivate(lpFileName, dwDesiredAccess, dwShareMode, null, dwCreationDisposition, dwFlagsAndAttributes, IntPtr.Zero); } } diff --git a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CreateFile2.cs b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CreateFile2.cs index ed691ace46..8480332c00 100644 --- a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CreateFile2.cs +++ b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CreateFile2.cs @@ -92,7 +92,7 @@ internal partial class Interop FileMode dwCreationDisposition, int dwFlagsAndAttributes) { - lpFileName = PathInternal.EnsureExtendedPrefixOverMaxPath(lpFileName); + lpFileName = PathInternal.EnsureExtendedPrefixIfNeeded(lpFileName); return CreateFile(lpFileName, dwDesiredAccess, dwShareMode, null, dwCreationDisposition, dwFlagsAndAttributes, IntPtr.Zero); } } diff --git a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CreateProcess.cs b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CreateProcess.cs index 47ba909aca..5446010d2d 100644 --- a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CreateProcess.cs +++ b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CreateProcess.cs @@ -13,76 +13,48 @@ internal partial class Interop { [DllImport(Libraries.Kernel32, CharSet = CharSet.Unicode, SetLastError = true, BestFitMapping = false, EntryPoint = "CreateProcessW")] internal static extern bool CreateProcess( - [MarshalAs(UnmanagedType.LPTStr)] string lpApplicationName, + string lpApplicationName, StringBuilder lpCommandLine, ref SECURITY_ATTRIBUTES procSecAttrs, ref SECURITY_ATTRIBUTES threadSecAttrs, bool bInheritHandles, int dwCreationFlags, IntPtr lpEnvironment, - [MarshalAs(UnmanagedType.LPTStr)] string lpCurrentDirectory, - STARTUPINFO lpStartupInfo, - [Out] PROCESS_INFORMATION lpProcessInformation + string lpCurrentDirectory, + ref STARTUPINFO lpStartupInfo, + ref PROCESS_INFORMATION lpProcessInformation ); [StructLayout(LayoutKind.Sequential)] - internal class PROCESS_INFORMATION + internal struct PROCESS_INFORMATION { - internal IntPtr hProcess = IntPtr.Zero; - internal IntPtr hThread = IntPtr.Zero; - internal int dwProcessId = 0; - internal int dwThreadId = 0; + internal IntPtr hProcess; + internal IntPtr hThread; + internal int dwProcessId; + internal int dwThreadId; } [StructLayout(LayoutKind.Sequential)] - internal class STARTUPINFO : IDisposable + internal struct STARTUPINFO { internal int cb; - internal IntPtr lpReserved = IntPtr.Zero; - internal IntPtr lpDesktop = IntPtr.Zero; - internal IntPtr lpTitle = IntPtr.Zero; - internal int dwX = 0; - internal int dwY = 0; - internal int dwXSize = 0; - internal int dwYSize = 0; - internal int dwXCountChars = 0; - internal int dwYCountChars = 0; - internal int dwFillAttribute = 0; - internal int dwFlags = 0; - internal short wShowWindow = 0; - internal short cbReserved2 = 0; - internal IntPtr lpReserved2 = IntPtr.Zero; - internal SafeFileHandle hStdInput = new SafeFileHandle(IntPtr.Zero, false); - internal SafeFileHandle hStdOutput = new SafeFileHandle(IntPtr.Zero, false); - internal SafeFileHandle hStdError = new SafeFileHandle(IntPtr.Zero, false); - - internal - STARTUPINFO() - { - cb = Marshal.SizeOf(this); - } - - public void Dispose() - { - // close the handles created for child process - if (hStdInput != null && !hStdInput.IsInvalid) - { - hStdInput.Dispose(); - hStdInput = null; - } - - if (hStdOutput != null && !hStdOutput.IsInvalid) - { - hStdOutput.Dispose(); - hStdOutput = null; - } - - if (hStdError != null && !hStdError.IsInvalid) - { - hStdError.Dispose(); - hStdError = null; - } - } + internal IntPtr lpReserved; + internal IntPtr lpDesktop; + internal IntPtr lpTitle; + internal int dwX; + internal int dwY; + internal int dwXSize; + internal int dwYSize; + internal int dwXCountChars; + internal int dwYCountChars; + internal int dwFillAttribute; + internal int dwFlags; + internal short wShowWindow; + internal short cbReserved2; + internal IntPtr lpReserved2; + internal IntPtr hStdInput; + internal IntPtr hStdOutput; + internal IntPtr hStdError; } } } diff --git a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.DeleteFile.cs b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.DeleteFile.cs index 3609f0da2c..dbcae6ee31 100644 --- a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.DeleteFile.cs +++ b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.DeleteFile.cs @@ -18,7 +18,7 @@ internal partial class Interop internal static bool DeleteFile(string path) { - path = PathInternal.EnsureExtendedPrefixOverMaxPath(path); + path = PathInternal.EnsureExtendedPrefixIfNeeded(path); return DeleteFilePrivate(path); } } diff --git a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.DeleteVolumeMountPoint.cs b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.DeleteVolumeMountPoint.cs index ccf10151f7..49b9bfc923 100644 --- a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.DeleteVolumeMountPoint.cs +++ b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.DeleteVolumeMountPoint.cs @@ -19,7 +19,7 @@ internal partial class Interop internal static bool DeleteVolumeMountPoint(string mountPoint) { - mountPoint = PathInternal.EnsureExtendedPrefixOverMaxPath(mountPoint); + mountPoint = PathInternal.EnsureExtendedPrefixIfNeeded(mountPoint); return DeleteVolumeMountPointPrivate(mountPoint); } } diff --git a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.ExpandEnvironmentStrings.cs b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.ExpandEnvironmentStrings.cs index a402bbd0e8..ba942ba6ff 100644 --- a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.ExpandEnvironmentStrings.cs +++ b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.ExpandEnvironmentStrings.cs @@ -3,13 +3,12 @@ // See the LICENSE file in the project root for more information. using System.Runtime.InteropServices; -using System.Text; internal partial class Interop { internal partial class Kernel32 { [DllImport(Libraries.Kernel32, CharSet = CharSet.Unicode, SetLastError = true)] - internal static extern int ExpandEnvironmentStringsW(string lpSrc, [Out] StringBuilder lpDst, int nSize); + internal static extern uint ExpandEnvironmentStringsW(string lpSrc, ref char lpDst, uint nSize); } } diff --git a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.FindFirstFileEx.cs b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.FindFirstFileEx.cs index 2d1ecefd98..a561132f94 100644 --- a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.FindFirstFileEx.cs +++ b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.FindFirstFileEx.cs @@ -19,7 +19,7 @@ internal partial class Interop internal static SafeFindHandle FindFirstFile(string fileName, ref WIN32_FIND_DATA data) { - fileName = PathInternal.EnsureExtendedPrefixOverMaxPath(fileName); + fileName = PathInternal.EnsureExtendedPrefixIfNeeded(fileName); // use FindExInfoBasic since we don't care about short name and it has better perf return FindFirstFileExPrivate(fileName, FINDEX_INFO_LEVELS.FindExInfoBasic, ref data, FINDEX_SEARCH_OPS.FindExSearchNameMatch, IntPtr.Zero, 0); diff --git a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.FormatMessage.cs b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.FormatMessage.cs index 8de0bc0627..1fe81ec173 100644 --- a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.FormatMessage.cs +++ b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.FormatMessage.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System; -using System.Text; using System.Runtime.InteropServices; internal partial class Interop @@ -16,17 +15,17 @@ internal partial class Interop private const int FORMAT_MESSAGE_ARGUMENT_ARRAY = 0x00002000; private const int ERROR_INSUFFICIENT_BUFFER = 0x7A; - private const int InitialBufferSize = 256; + private const int InitialBufferSize = 256; // small enough to be on stack, and large enough for most error messages private const int BufferSizeIncreaseFactor = 4; private const int MaxAllowedBufferSize = 65 * 1024; [DllImport(Libraries.Kernel32, CharSet = CharSet.Unicode, EntryPoint = "FormatMessageW", SetLastError = true, BestFitMapping = true)] - private static extern int FormatMessage( + private static extern unsafe int FormatMessage( int dwFlags, IntPtr lpSource, uint dwMessageId, int dwLanguageId, - [Out] StringBuilder lpBuffer, + char* lpBuffer, int nSize, IntPtr[] arguments); @@ -40,50 +39,54 @@ internal partial class Interop internal static string GetMessage(IntPtr moduleHandle, int errorCode) { - var sb = new StringBuilder(InitialBufferSize); + Span buffer = stackalloc char[InitialBufferSize]; do { - string errorMsg; - if (TryGetErrorMessage(moduleHandle, errorCode, sb, out errorMsg)) + if (TryGetErrorMessage(moduleHandle, errorCode, buffer, out string errorMsg)) { return errorMsg; } - else - { - // increase the capacity of the StringBuilder. - sb.Capacity *= BufferSizeIncreaseFactor; - } + + // Increase the capacity of the buffer. + buffer = new char[buffer.Length * BufferSizeIncreaseFactor]; } - while (sb.Capacity < MaxAllowedBufferSize); + while (buffer.Length < MaxAllowedBufferSize); // If you come here then a size as large as 65K is also not sufficient and so we give the generic errorMsg. return string.Format("Unknown error (0x{0:x})", errorCode); } - private static bool TryGetErrorMessage(IntPtr moduleHandle, int errorCode, StringBuilder sb, out string errorMsg) + private static bool TryGetErrorMessage(IntPtr moduleHandle, int errorCode, Span buffer, out string errorMsg) { - errorMsg = ""; - int flags = FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY; if (moduleHandle != IntPtr.Zero) { flags |= FORMAT_MESSAGE_FROM_HMODULE; } - int result = FormatMessage(flags, moduleHandle, unchecked((uint)errorCode), 0, sb, sb.Capacity, null); + int result; + unsafe + { + fixed (char* bufferPtr = &MemoryMarshal.GetReference(buffer)) + { + result = FormatMessage(flags, moduleHandle, unchecked((uint)errorCode), 0, bufferPtr, buffer.Length, null); + } + } + if (result != 0) { - int i = sb.Length; + int i = result; while (i > 0) { - char ch = sb[i - 1]; + char ch = buffer[i - 1]; if (ch > 32 && ch != '.') break; i--; } - errorMsg = sb.ToString(0, i); + errorMsg = buffer.Slice(0, i).ToString(); } else if (Marshal.GetLastWin32Error() == ERROR_INSUFFICIENT_BUFFER) { + errorMsg = ""; return false; } else diff --git a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetComputerName.cs b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetComputerName.cs index e0f8857bda..34a26c180f 100644 --- a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetComputerName.cs +++ b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetComputerName.cs @@ -2,6 +2,7 @@ // 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; using System.Runtime.InteropServices; internal partial class Interop @@ -9,18 +10,18 @@ internal partial class Interop internal partial class Kernel32 { [DllImport(Libraries.Kernel32, CharSet = CharSet.Unicode, EntryPoint = "GetComputerNameW")] - private static extern unsafe int GetComputerName(char* lpBuffer, ref uint nSize); + private static extern unsafe int GetComputerName(ref char lpBuffer, ref uint nSize); // maximum length of the NETBIOS name (not including NULL) private const int MAX_COMPUTERNAME_LENGTH = 15; internal static unsafe string GetComputerName() { - uint length = MAX_COMPUTERNAME_LENGTH + 1; - char* buffer = stackalloc char[(int)length]; + Span buffer = stackalloc char[MAX_COMPUTERNAME_LENGTH + 1]; + uint length = (uint)buffer.Length; - return GetComputerName(buffer, ref length) != 0 ? - new string(buffer, 0, checked((int)length)) : + return GetComputerName(ref MemoryMarshal.GetReference(buffer), ref length) != 0 ? + buffer.Slice(0, (int)length).ToString() : null; } } diff --git a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetCurrentDirectory.cs b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetCurrentDirectory.cs index c68e1b9510..611cc70d28 100644 --- a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetCurrentDirectory.cs +++ b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetCurrentDirectory.cs @@ -3,13 +3,12 @@ // See the LICENSE file in the project root for more information. using System.Runtime.InteropServices; -using System.Text; internal partial class Interop { internal partial class Kernel32 { [DllImport(Libraries.Kernel32, EntryPoint = "GetCurrentDirectoryW", SetLastError = true, CharSet = CharSet.Unicode, BestFitMapping = false)] - internal static extern int GetCurrentDirectory(int nBufferLength, [Out]StringBuilder lpBuffer); + internal static extern uint GetCurrentDirectory(uint nBufferLength, ref char lpBuffer); } } diff --git a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetCurrentThreadId.cs b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetCurrentThreadId.cs new file mode 100644 index 0000000000..a92936e291 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetCurrentThreadId.cs @@ -0,0 +1,15 @@ +// 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; +using System.Runtime.InteropServices; + +internal static partial class Interop +{ + internal static partial class Kernel32 + { + [DllImport(Interop.Libraries.Kernel32, ExactSpelling = true)] + public static extern int GetCurrentThreadId(); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetFileAttributesEx.cs b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetFileAttributesEx.cs index 1bd3bed103..7740e85a50 100644 --- a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetFileAttributesEx.cs +++ b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetFileAttributesEx.cs @@ -17,7 +17,7 @@ internal partial class Interop internal static bool GetFileAttributesEx(string name, GET_FILEEX_INFO_LEVELS fileInfoLevel, ref WIN32_FILE_ATTRIBUTE_DATA lpFileInformation) { - name = PathInternal.EnsureExtendedPrefixOverMaxPath(name); + name = PathInternal.EnsureExtendedPrefixIfNeeded(name); return GetFileAttributesExPrivate(name, fileInfoLevel, ref lpFileInformation); } } diff --git a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetLongPathName.cs b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetLongPathName.cs deleted file mode 100644 index eda148273a..0000000000 --- a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetLongPathName.cs +++ /dev/null @@ -1,25 +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.IO; -using System.Runtime.InteropServices; -using System.Text; - -internal partial class Interop -{ - internal partial class Kernel32 - { - /// - /// WARNING: This method does not implicitly handle long paths. Use GetLongPathName. - /// - [DllImport(Libraries.Kernel32, EntryPoint = "GetLongPathNameW", SetLastError = true, CharSet = CharSet.Unicode, BestFitMapping = false, ExactSpelling = false)] - private static extern int GetLongPathNamePrivate(string path, [Out]StringBuilder longPathBuffer, int bufferLength); - - internal static int GetLongPathName(string path, [Out]StringBuilder longPathBuffer, int bufferLength) - { - path = PathInternal.EnsureExtendedPrefixOverMaxPath(path); - return GetLongPathNamePrivate(path, longPathBuffer, bufferLength); - } - } -} diff --git a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetSystemDirectoryW.cs b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetSystemDirectoryW.cs index cf1b31d62c..197f6f5ead 100644 --- a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetSystemDirectoryW.cs +++ b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetSystemDirectoryW.cs @@ -2,7 +2,6 @@ // 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; using System.Runtime.InteropServices; internal static partial class Interop @@ -10,14 +9,6 @@ internal static partial class Interop internal static partial class Kernel32 { [DllImport(Libraries.Kernel32, CharSet = CharSet.Unicode, SetLastError = true)] - private static extern unsafe int GetSystemDirectoryW(char* lpBuffer, int uSize); - - internal static unsafe int GetSystemDirectoryW(Span buffer) - { - fixed (char* bufferPtr = &MemoryMarshal.GetReference(buffer)) - { - return GetSystemDirectoryW(bufferPtr, buffer.Length); - } - } + internal static extern uint GetSystemDirectoryW(ref char lpBuffer, uint uSize); } } diff --git a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.LoadLibraryEx.cs b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.LoadLibraryEx.cs index 4ba2fd65a4..d24d4d3c6a 100644 --- a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.LoadLibraryEx.cs +++ b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.LoadLibraryEx.cs @@ -12,6 +12,7 @@ internal partial class Interop internal partial class Kernel32 { public const int LOAD_LIBRARY_AS_DATAFILE = 0x00000002; + public const int LOAD_LIBRARY_SEARCH_SYSTEM32 = 0x00000800; [DllImport(Libraries.Kernel32, ExactSpelling = true, CharSet = CharSet.Unicode, SetLastError = true)] public static extern SafeLibraryHandle LoadLibraryExW([In] string lpwLibFileName, [In] IntPtr hFile, [In] uint dwFlags); diff --git a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.MaxLengths.cs b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.MaxLengths.cs index e85d354d00..dc9d621605 100644 --- a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.MaxLengths.cs +++ b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.MaxLengths.cs @@ -8,20 +8,6 @@ internal partial class Interop { internal const int MAX_PATH = 260; - // Technically the maximum file/directory name is whatever GetVolumeInformation tells you in - // MaximumComponentLength. For most file systems this is 255 (UDF is the notable exception at - // 254). - // - // CreateDirectory will refuse directories that are over MAX_PATH - 12 (8.3 filename length). - // This count includes the drive and NULL. This limitation existed to allow "del *.*" to work - // successfully and now appears to be moot as you can create files in a directory that is over - // 248 (up to MAX_PATH) and "del *.*" on them on both FAT and NTFS. - // - // Using extended syntax (\\?\) will allow creation of directory names that are full length - // (e.g. 255 characters). MKDIR/MD, however, does not check extended syntax and will fail out - // ANY string that is longer than OR equal to MAX_PATH. This effectively makes the longest - // directory you can create 252 characters, excluding the prefix and drive (\\?\C:\). - internal const int MAX_DIRECTORY_PATH = 248; internal const int CREDUI_MAX_USERNAME_LENGTH = 513; } } diff --git a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.MoveFileEx.cs b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.MoveFileEx.cs index 3e384782d5..b76648bcc1 100644 --- a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.MoveFileEx.cs +++ b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.MoveFileEx.cs @@ -18,8 +18,8 @@ internal partial class Interop internal static bool MoveFile(string src, string dst) { - src = PathInternal.EnsureExtendedPrefixOverMaxPath(src); - dst = PathInternal.EnsureExtendedPrefixOverMaxPath(dst); + src = PathInternal.EnsureExtendedPrefixIfNeeded(src); + dst = PathInternal.EnsureExtendedPrefixIfNeeded(dst); return MoveFileExPrivate(src, dst, 2 /* MOVEFILE_COPY_ALLOWED */); } } diff --git a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.RemoveDirectory.cs b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.RemoveDirectory.cs index af5f809b32..dd8e321ec7 100644 --- a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.RemoveDirectory.cs +++ b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.RemoveDirectory.cs @@ -18,7 +18,7 @@ internal partial class Interop internal static bool RemoveDirectory(string path) { - path = PathInternal.EnsureExtendedPrefixOverMaxPath(path); + path = PathInternal.EnsureExtendedPrefixIfNeeded(path); return RemoveDirectoryPrivate(path); } } diff --git a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.ReplaceFile.cs b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.ReplaceFile.cs index 8c9dee4da7..4b9dd79d5e 100644 --- a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.ReplaceFile.cs +++ b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.ReplaceFile.cs @@ -19,9 +19,9 @@ internal partial class Interop string replacedFileName, string replacementFileName, string backupFileName, int dwReplaceFlags, IntPtr lpExclude, IntPtr lpReserved) { - replacedFileName = PathInternal.EnsureExtendedPrefixOverMaxPath(replacedFileName); - replacementFileName = PathInternal.EnsureExtendedPrefixOverMaxPath(replacementFileName); - backupFileName = PathInternal.EnsureExtendedPrefixOverMaxPath(backupFileName); + replacedFileName = PathInternal.EnsureExtendedPrefixIfNeeded(replacedFileName); + replacementFileName = PathInternal.EnsureExtendedPrefixIfNeeded(replacementFileName); + backupFileName = PathInternal.EnsureExtendedPrefixIfNeeded(backupFileName); return ReplaceFilePrivate( replacedFileName, replacementFileName, backupFileName, diff --git a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.SetFileAttributes.cs b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.SetFileAttributes.cs index 865730d8c4..9f956dc5d2 100644 --- a/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.SetFileAttributes.cs +++ b/external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.SetFileAttributes.cs @@ -17,7 +17,7 @@ internal partial class Interop internal static bool SetFileAttributes(string name, int attr) { - name = PathInternal.EnsureExtendedPrefixOverMaxPath(name); + name = PathInternal.EnsureExtendedPrefixIfNeeded(name); return SetFileAttributesPrivate(name, attr); } } diff --git a/external/corefx/src/Common/src/Interop/Windows/secur32/Interop.GetUserNameExW.cs b/external/corefx/src/Common/src/Interop/Windows/secur32/Interop.GetUserNameExW.cs index 7d910bba72..cf0dd5f698 100644 --- a/external/corefx/src/Common/src/Interop/Windows/secur32/Interop.GetUserNameExW.cs +++ b/external/corefx/src/Common/src/Interop/Windows/secur32/Interop.GetUserNameExW.cs @@ -3,14 +3,13 @@ // See the LICENSE file in the project root for more information. using System.Runtime.InteropServices; -using System.Text; internal partial class Interop { internal partial class Secur32 { [DllImport(Libraries.Secur32, CharSet = CharSet.Unicode, SetLastError = true)] - internal static extern byte GetUserNameExW(int NameFormat, [Out] StringBuilder lpNameBuffer, ref uint lpnSize); + internal static extern BOOLEAN GetUserNameExW(int NameFormat, ref char lpNameBuffer, ref uint lpnSize); internal const int NameSamCompatible = 2; } diff --git a/external/corefx/src/Common/src/Interop/Windows/sspicli/NegotiationInfoClass.cs b/external/corefx/src/Common/src/Interop/Windows/sspicli/NegotiationInfoClass.cs index 6027236518..5fdcf2b4c1 100644 --- a/external/corefx/src/Common/src/Interop/Windows/sspicli/NegotiationInfoClass.cs +++ b/external/corefx/src/Common/src/Interop/Windows/sspicli/NegotiationInfoClass.cs @@ -26,11 +26,15 @@ namespace System.Net if (negotiationState == Interop.SspiCli.SECPKG_NEGOTIATION_COMPLETE || negotiationState == Interop.SspiCli.SECPKG_NEGOTIATION_OPTIMISTIC) { - IntPtr unmanagedString = Marshal.ReadIntPtr(packageInfo, SecurityPackageInfo.NameOffest); string name = null; - if (unmanagedString != IntPtr.Zero) + + unsafe { - name = Marshal.PtrToStringUni(unmanagedString); + IntPtr unmanagedString = ((SecurityPackageInfo *)packageInfo)->Name; + if (unmanagedString != IntPtr.Zero) + { + name = Marshal.PtrToStringUni(unmanagedString); + } } if (NetEventSource.IsEnabled) NetEventSource.Info(this, $"packageInfo:{packageInfo} negotiationState:{negotiationState:x} name:{name}"); diff --git a/external/corefx/src/Common/src/Interop/Windows/sspicli/SSPIWrapper.cs b/external/corefx/src/Common/src/Interop/Windows/sspicli/SSPIWrapper.cs index ab47ef5344..2c3541afda 100644 --- a/external/corefx/src/Common/src/Interop/Windows/sspicli/SSPIWrapper.cs +++ b/external/corefx/src/Common/src/Interop/Windows/sspicli/SSPIWrapper.cs @@ -452,7 +452,10 @@ namespace System.Net case Interop.SspiCli.ContextAttribute.SECPKG_ATTR_NEGOTIATION_INFO: handleType = typeof(SafeFreeContextBuffer); - nativeBlockSize = Marshal.SizeOf(); + unsafe + { + nativeBlockSize = sizeof(SecPkgContext_NegotiationInfoW); + } break; case Interop.SspiCli.ContextAttribute.SECPKG_ATTR_CLIENT_SPECIFIED_TARGET: @@ -520,7 +523,7 @@ namespace System.Net { fixed (void* ptr = &nativeBuffer[0]) { - attribute = new NegotiationInfoClass(sspiHandle, Marshal.ReadInt32(new IntPtr(ptr), SecPkgContext_NegotiationInfoW.NegotiationStateOffest)); + attribute = new NegotiationInfoClass(sspiHandle, (int)((SecPkgContext_NegotiationInfoW*)ptr)->NegotiationState); } } break; diff --git a/external/corefx/src/Common/src/Interop/Windows/sspicli/SecPkgContext_NegotiationInfoW.cs b/external/corefx/src/Common/src/Interop/Windows/sspicli/SecPkgContext_NegotiationInfoW.cs index 4d5ae59c1c..4dc03b53a6 100644 --- a/external/corefx/src/Common/src/Interop/Windows/sspicli/SecPkgContext_NegotiationInfoW.cs +++ b/external/corefx/src/Common/src/Interop/Windows/sspicli/SecPkgContext_NegotiationInfoW.cs @@ -12,7 +12,5 @@ namespace System.Net { internal IntPtr PackageInfo; internal uint NegotiationState; - internal static readonly int Size = Marshal.SizeOf(); - internal static readonly int NegotiationStateOffest = (int)Marshal.OffsetOf("NegotiationState"); } } diff --git a/external/corefx/src/Common/src/Interop/Windows/sspicli/SecurityPackageInfo.cs b/external/corefx/src/Common/src/Interop/Windows/sspicli/SecurityPackageInfo.cs index 6c0a6cfbe1..3ec3c7fda6 100644 --- a/external/corefx/src/Common/src/Interop/Windows/sspicli/SecurityPackageInfo.cs +++ b/external/corefx/src/Common/src/Interop/Windows/sspicli/SecurityPackageInfo.cs @@ -16,8 +16,5 @@ namespace System.Net internal int MaxToken; internal IntPtr Name; internal IntPtr Comment; - - internal static readonly int Size = Marshal.SizeOf(); - internal static readonly int NameOffest = (int)Marshal.OffsetOf("Name"); } } diff --git a/external/corefx/src/Common/src/Interop/Windows/sspicli/SecurityPackageInfoClass.cs b/external/corefx/src/Common/src/Interop/Windows/sspicli/SecurityPackageInfoClass.cs index 6d34e2cbe0..7cdc52c258 100644 --- a/external/corefx/src/Common/src/Interop/Windows/sspicli/SecurityPackageInfoClass.cs +++ b/external/corefx/src/Common/src/Interop/Windows/sspicli/SecurityPackageInfoClass.cs @@ -23,7 +23,7 @@ namespace System.Net _SecPkgInfoW in sspi.h */ - internal SecurityPackageInfoClass(SafeHandle safeHandle, int index) + internal unsafe SecurityPackageInfoClass(SafeHandle safeHandle, int index) { if (safeHandle.IsInvalid) { @@ -31,25 +31,26 @@ namespace System.Net return; } - IntPtr unmanagedAddress = IntPtrHelper.Add(safeHandle.DangerousGetHandle(), SecurityPackageInfo.Size * index); + IntPtr unmanagedAddress = safeHandle.DangerousGetHandle() + (sizeof(SecurityPackageInfo) * index); if (NetEventSource.IsEnabled) NetEventSource.Info(this, $"unmanagedAddress: {unmanagedAddress}"); - // TODO (Issue #3114): replace with Marshal.PtrToStructure. - Capabilities = Marshal.ReadInt32(unmanagedAddress, (int)Marshal.OffsetOf("Capabilities")); - Version = Marshal.ReadInt16(unmanagedAddress, (int)Marshal.OffsetOf("Version")); - RPCID = Marshal.ReadInt16(unmanagedAddress, (int)Marshal.OffsetOf("RPCID")); - MaxToken = Marshal.ReadInt32(unmanagedAddress, (int)Marshal.OffsetOf("MaxToken")); + SecurityPackageInfo* pSecurityPackageInfo = (SecurityPackageInfo*)unmanagedAddress; + + Capabilities = pSecurityPackageInfo->Capabilities; + Version = pSecurityPackageInfo->Version; + RPCID = pSecurityPackageInfo->RPCID; + MaxToken = pSecurityPackageInfo->MaxToken; IntPtr unmanagedString; - unmanagedString = Marshal.ReadIntPtr(unmanagedAddress, (int)Marshal.OffsetOf("Name")); + unmanagedString = pSecurityPackageInfo->Name; if (unmanagedString != IntPtr.Zero) { Name = Marshal.PtrToStringUni(unmanagedString); if (NetEventSource.IsEnabled) NetEventSource.Info(this, $"Name: {Name}"); } - unmanagedString = Marshal.ReadIntPtr(unmanagedAddress, (int)Marshal.OffsetOf("Comment")); + unmanagedString = pSecurityPackageInfo->Comment; if (unmanagedString != IntPtr.Zero) { Comment = Marshal.PtrToStringUni(unmanagedString); diff --git a/external/corefx/src/Common/src/Interop/Windows/sspicli/SecuritySafeHandles.cs b/external/corefx/src/Common/src/Interop/Windows/sspicli/SecuritySafeHandles.cs index 5405349689..3f774bf57e 100644 --- a/external/corefx/src/Common/src/Interop/Windows/sspicli/SecuritySafeHandles.cs +++ b/external/corefx/src/Common/src/Interop/Windows/sspicli/SecuritySafeHandles.cs @@ -5,6 +5,7 @@ using Microsoft.Win32.SafeHandles; using System.Diagnostics; +using System.Globalization; using System.Runtime.InteropServices; using System.Security.Authentication.ExtendedProtection; @@ -76,15 +77,6 @@ namespace System.Net.Security // reference imports from all three DLLs - doing so would cause all three DLLs to try to be bound to.) // public static unsafe int QueryContextAttributes(SafeDeleteContext phContext, Interop.SspiCli.ContextAttribute contextAttribute, byte* buffer, SafeHandle refHandle) - { - return QueryContextAttributes_SECURITY(phContext, contextAttribute, buffer, refHandle); - } - - private static unsafe int QueryContextAttributes_SECURITY( - SafeDeleteContext phContext, - Interop.SspiCli.ContextAttribute contextAttribute, - byte* buffer, - SafeHandle refHandle) { int status = (int)Interop.SECURITY_STATUS.InvalidHandle; @@ -122,14 +114,6 @@ namespace System.Net.Security public static int SetContextAttributes( SafeDeleteContext phContext, Interop.SspiCli.ContextAttribute contextAttribute, byte[] buffer) - { - return SetContextAttributes_SECURITY(phContext, contextAttribute, buffer); - } - - private static int SetContextAttributes_SECURITY( - SafeDeleteContext phContext, - Interop.SspiCli.ContextAttribute contextAttribute, - byte[] buffer) { try { @@ -444,6 +428,7 @@ namespace System.Net.Security #endif private const string dummyStr = " "; private static readonly byte[] s_dummyBytes = new byte[] { 0 }; + private static readonly IdnMapping s_idnMapping = new IdnMapping(); protected SafeFreeCredentials _EffectiveCredential; @@ -562,66 +547,65 @@ namespace System.Net.Security } } - Interop.SspiCli.SecBuffer[] outUnmanagedBuffer = new Interop.SspiCli.SecBuffer[1]; - fixed (void* outUnmanagedBufferPtr = &outUnmanagedBuffer[0]) + Interop.SspiCli.SecBuffer outUnmanagedBuffer = default; + + // Fix Descriptor pointer that points to unmanaged SecurityBuffers. + outSecurityBufferDescriptor.pBuffers = &outUnmanagedBuffer; + outUnmanagedBuffer.cbBuffer = outSecBuffer.size; + outUnmanagedBuffer.BufferType = outSecBuffer.type; + if (outSecBuffer.token == null || outSecBuffer.token.Length == 0) { - // Fix Descriptor pointer that points to unmanaged SecurityBuffers. - outSecurityBufferDescriptor.pBuffers = outUnmanagedBufferPtr; - outUnmanagedBuffer[0].cbBuffer = outSecBuffer.size; - outUnmanagedBuffer[0].BufferType = outSecBuffer.type; - if (outSecBuffer.token == null || outSecBuffer.token.Length == 0) - { - outUnmanagedBuffer[0].pvBuffer = IntPtr.Zero; - } - else - { - outUnmanagedBuffer[0].pvBuffer = Marshal.UnsafeAddrOfPinnedArrayElement(outSecBuffer.token, outSecBuffer.offset); - } + outUnmanagedBuffer.pvBuffer = IntPtr.Zero; + } + else + { + outUnmanagedBuffer.pvBuffer = Marshal.UnsafeAddrOfPinnedArrayElement(outSecBuffer.token, outSecBuffer.offset); + } - if (isSspiAllocated) - { - outFreeContextBuffer = SafeFreeContextBuffer.CreateEmptyHandle(); - } + if (isSspiAllocated) + { + outFreeContextBuffer = SafeFreeContextBuffer.CreateEmptyHandle(); + } - if (refContext == null || refContext.IsInvalid) - { - refContext = new SafeDeleteContext_SECURITY(); - } + if (refContext == null || refContext.IsInvalid) + { + refContext = new SafeDeleteContext_SECURITY(); + } - if (targetName == null || targetName.Length == 0) - { - targetName = dummyStr; - } + if (targetName == null || targetName.Length == 0) + { + targetName = dummyStr; + } - fixed (char* namePtr = targetName) - { - errorCode = MustRunInitializeSecurityContext_SECURITY( - ref inCredentials, - contextHandle.IsZero ? null : &contextHandle, - (byte*)(((object)targetName == (object)dummyStr) ? null : namePtr), - inFlags, - endianness, - haveInSecurityBufferDescriptor ? &inSecurityBufferDescriptor : null, - refContext, - ref outSecurityBufferDescriptor, - ref outFlags, - outFreeContextBuffer); - } + string punyCode = s_idnMapping.GetAscii(targetName); + fixed (char* namePtr = punyCode) + { + errorCode = MustRunInitializeSecurityContext( + ref inCredentials, + contextHandle.IsZero ? null : &contextHandle, + (byte*)(((object)targetName == (object)dummyStr) ? null : namePtr), + inFlags, + endianness, + haveInSecurityBufferDescriptor ? &inSecurityBufferDescriptor : null, + refContext, + ref outSecurityBufferDescriptor, + ref outFlags, + outFreeContextBuffer); + } - if (NetEventSource.IsEnabled) NetEventSource.Info(null, "Marshalling OUT buffer"); + if (NetEventSource.IsEnabled) NetEventSource.Info(null, "Marshalling OUT buffer"); - // Get unmanaged buffer with index 0 as the only one passed into PInvoke. - outSecBuffer.size = outUnmanagedBuffer[0].cbBuffer; - outSecBuffer.type = outUnmanagedBuffer[0].BufferType; - if (outSecBuffer.size > 0) - { - outSecBuffer.token = new byte[outSecBuffer.size]; - Marshal.Copy(outUnmanagedBuffer[0].pvBuffer, outSecBuffer.token, 0, outSecBuffer.size); - } - else - { - outSecBuffer.token = null; - } + // Get unmanaged buffer with index 0 as the only one passed into PInvoke. + outSecBuffer.size = outUnmanagedBuffer.cbBuffer; + outSecBuffer.type = outUnmanagedBuffer.BufferType; + if (outSecBuffer.size > 0) + { + outSecBuffer.token = new byte[outSecBuffer.size]; + Marshal.Copy(outUnmanagedBuffer.pvBuffer, outSecBuffer.token, 0, outSecBuffer.size); + } + else + { + outSecBuffer.token = null; } } } @@ -656,7 +640,7 @@ namespace System.Net.Security // After PInvoke call the method will fix the handleTemplate.handle with the returned value. // The caller is responsible for creating a correct SafeFreeContextBuffer_XXX flavor or null can be passed if no handle is returned. // - private static unsafe int MustRunInitializeSecurityContext_SECURITY( + private static unsafe int MustRunInitializeSecurityContext( ref SafeFreeCredentials inCredentials, void* inContextPtr, byte* targetName, @@ -1265,11 +1249,6 @@ namespace System.Net.Security } public static unsafe int QueryContextChannelBinding(SafeDeleteContext phContext, Interop.SspiCli.ContextAttribute contextAttribute, SecPkgContext_Bindings* buffer, SafeFreeContextBufferChannelBinding refHandle) - { - return QueryContextChannelBinding_SECURITY(phContext, contextAttribute, buffer, refHandle); - } - - private static unsafe int QueryContextChannelBinding_SECURITY(SafeDeleteContext phContext, Interop.SspiCli.ContextAttribute contextAttribute, SecPkgContext_Bindings* buffer, SafeFreeContextBufferChannelBinding refHandle) { int status = (int)Interop.SECURITY_STATUS.InvalidHandle; diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.Constants.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.Constants.cs new file mode 100644 index 0000000000..65b6534a68 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.Constants.cs @@ -0,0 +1,229 @@ +// 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. + +internal partial class Interop +{ + internal partial class User32 + { + public const int COLOR_WINDOW = 5; + + public const int CTRL_LOGOFF_EVENT = 5; + public const int CTRL_SHUTDOWN_EVENT = 6; + + public const int ENDSESSION_CLOSEAPP = 0x00000001; + public const int ENDSESSION_CRITICAL = 0x40000000; + public const int ENDSESSION_LOGOFF = unchecked((int)0x80000000); + + public const int GCL_WNDPROC = (-24); + public const int GWL_WNDPROC = (-4); + + public const int MWMO_INPUTAVAILABLE = 0x0004; + + public const int PBT_APMQUERYSUSPEND = 0x0000; + public const int PBT_APMQUERYSTANDBY = 0x0001; + public const int PBT_APMQUERYSUSPENDFAILED = 0x0002; + public const int PBT_APMQUERYSTANDBYFAILED = 0x0003; + public const int PBT_APMSUSPEND = 0x0004; + public const int PBT_APMSTANDBY = 0x0005; + public const int PBT_APMRESUMECRITICAL = 0x0006; + public const int PBT_APMRESUMESUSPEND = 0x0007; + public const int PBT_APMRESUMESTANDBY = 0x0008; + public const int PBT_APMBATTERYLOW = 0x0009; + public const int PBT_APMPOWERSTATUSCHANGE = 0x000A; + public const int PBT_APMOEMEVENT = 0x000B; + + public const int PM_REMOVE = 0x0001; + + public const int QS_KEY = 0x0001, + QS_MOUSEMOVE = 0x0002, + QS_MOUSEBUTTON = 0x0004, + QS_POSTMESSAGE = 0x0008, + QS_TIMER = 0x0010, + QS_PAINT = 0x0020, + QS_SENDMESSAGE = 0x0040, + QS_HOTKEY = 0x0080, + QS_ALLPOSTMESSAGE = 0x0100, + QS_MOUSE = QS_MOUSEMOVE | QS_MOUSEBUTTON, + QS_INPUT = QS_MOUSE | QS_KEY, + QS_ALLEVENTS = QS_INPUT | QS_POSTMESSAGE | QS_TIMER | QS_PAINT | QS_HOTKEY, + QS_ALLINPUT = QS_INPUT | QS_POSTMESSAGE | QS_TIMER | QS_PAINT | QS_HOTKEY | QS_SENDMESSAGE; + + public const int SPI_GETBEEP = 1; + public const int SPI_SETBEEP = 2; + public const int SPI_GETMOUSE = 3; + public const int SPI_SETMOUSE = 4; + public const int SPI_GETBORDER = 5; + public const int SPI_SETBORDER = 6; + public const int SPI_GETKEYBOARDSPEED = 10; + public const int SPI_SETKEYBOARDSPEED = 11; + public const int SPI_LANGDRIVER = 12; + public const int SPI_ICONHORIZONTALSPACING = 13; + public const int SPI_GETSCREENSAVETIMEOUT = 14; + public const int SPI_SETSCREENSAVETIMEOUT = 15; + public const int SPI_GETSCREENSAVEACTIVE = 16; + public const int SPI_SETSCREENSAVEACTIVE = 17; + public const int SPI_GETGRIDGRANULARITY = 18; + public const int SPI_SETGRIDGRANULARITY = 19; + public const int SPI_SETDESKWALLPAPER = 20; + public const int SPI_SETDESKPATTERN = 21; + public const int SPI_GETKEYBOARDDELAY = 22; + public const int SPI_SETKEYBOARDDELAY = 23; + public const int SPI_ICONVERTICALSPACING = 24; + public const int SPI_GETICONTITLEWRAP = 25; + public const int SPI_SETICONTITLEWRAP = 26; + public const int SPI_GETMENUDROPALIGNMENT = 27; + public const int SPI_SETMENUDROPALIGNMENT = 28; + public const int SPI_SETDOUBLECLKWIDTH = 29; + public const int SPI_SETDOUBLECLKHEIGHT = 30; + public const int SPI_GETICONTITLELOGFONT = 31; + public const int SPI_SETDOUBLECLICKTIME = 32; + public const int SPI_SETMOUSEBUTTONSWAP = 33; + public const int SPI_SETICONTITLELOGFONT = 34; + public const int SPI_GETFASTTASKSWITCH = 35; + public const int SPI_SETFASTTASKSWITCH = 36; + public const int SPI_SETDRAGFULLWINDOWS = 37; + public const int SPI_GETDRAGFULLWINDOWS = 38; + public const int SPI_GETNONCLIENTMETRICS = 41; + public const int SPI_SETNONCLIENTMETRICS = 42; + public const int SPI_GETMINIMIZEDMETRICS = 43; + public const int SPI_SETMINIMIZEDMETRICS = 44; + public const int SPI_GETICONMETRICS = 45; + public const int SPI_SETICONMETRICS = 46; + public const int SPI_SETWORKAREA = 47; + public const int SPI_GETWORKAREA = 48; + public const int SPI_SETPENWINDOWS = 49; + public const int SPI_GETHIGHCONTRAST = 66; + public const int SPI_SETHIGHCONTRAST = 67; + public const int SPI_GETKEYBOARDPREF = 68; + public const int SPI_SETKEYBOARDPREF = 69; + public const int SPI_GETSCREENREADER = 70; + public const int SPI_SETSCREENREADER = 71; + public const int SPI_GETANIMATION = 72; + public const int SPI_SETANIMATION = 73; + public const int SPI_GETFONTSMOOTHING = 74; + public const int SPI_SETFONTSMOOTHING = 75; + public const int SPI_SETDRAGWIDTH = 76; + public const int SPI_SETDRAGHEIGHT = 77; + public const int SPI_SETHANDHELD = 78; + public const int SPI_GETLOWPOWERTIMEOUT = 79; + public const int SPI_GETPOWEROFFTIMEOUT = 80; + public const int SPI_SETLOWPOWERTIMEOUT = 81; + public const int SPI_SETPOWEROFFTIMEOUT = 82; + public const int SPI_GETLOWPOWERACTIVE = 83; + public const int SPI_GETPOWEROFFACTIVE = 84; + public const int SPI_SETLOWPOWERACTIVE = 85; + public const int SPI_SETPOWEROFFACTIVE = 86; + public const int SPI_SETCURSORS = 87; + public const int SPI_SETICONS = 88; + public const int SPI_GETDEFAULTINPUTLANG = 89; + public const int SPI_SETDEFAULTINPUTLANG = 90; + public const int SPI_SETLANGTOGGLE = 91; + public const int SPI_GETWINDOWSEXTENSION = 92; + public const int SPI_SETMOUSETRAILS = 93; + public const int SPI_GETMOUSETRAILS = 94; + public const int SPI_SETSCREENSAVERRUNNING = 97; + public const int SPI_SCREENSAVERRUNNING = SPI_SETSCREENSAVERRUNNING; + public const int SPI_GETFILTERKEYS = 50; + public const int SPI_SETFILTERKEYS = 51; + public const int SPI_GETTOGGLEKEYS = 52; + public const int SPI_SETTOGGLEKEYS = 53; + public const int SPI_GETMOUSEKEYS = 54; + public const int SPI_SETMOUSEKEYS = 55; + public const int SPI_GETSHOWSOUNDS = 56; + public const int SPI_SETSHOWSOUNDS = 57; + public const int SPI_GETSTICKYKEYS = 58; + public const int SPI_SETSTICKYKEYS = 59; + public const int SPI_GETACCESSTIMEOUT = 60; + public const int SPI_SETACCESSTIMEOUT = 61; + public const int SPI_GETSERIALKEYS = 62; + public const int SPI_SETSERIALKEYS = 63; + public const int SPI_GETSOUNDSENTRY = 64; + public const int SPI_SETSOUNDSENTRY = 65; + public const int SPI_GETSNAPTODEFBUTTON = 95; + public const int SPI_SETSNAPTODEFBUTTON = 96; + public const int SPI_GETMOUSEHOVERWIDTH = 98; + public const int SPI_SETMOUSEHOVERWIDTH = 99; + public const int SPI_GETMOUSEHOVERHEIGHT = 100; + public const int SPI_SETMOUSEHOVERHEIGHT = 101; + public const int SPI_GETMOUSEHOVERTIME = 102; + public const int SPI_SETMOUSEHOVERTIME = 103; + public const int SPI_GETWHEELSCROLLLINES = 104; + public const int SPI_SETWHEELSCROLLLINES = 105; + public const int SPI_GETMENUSHOWDELAY = 106; + public const int SPI_SETMENUSHOWDELAY = 107; + public const int SPI_GETSHOWIMEUI = 110; + public const int SPI_SETSHOWIMEUI = 111; + public const int SPI_GETMOUSESPEED = 112; + public const int SPI_SETMOUSESPEED = 113; + public const int SPI_GETSCREENSAVERRUNNING = 114; + public const int SPI_GETDESKWALLPAPER = 115; + public const int SPI_GETACTIVEWINDOWTRACKING = 0x1000; + public const int SPI_SETACTIVEWINDOWTRACKING = 0x1001; + public const int SPI_GETMENUANIMATION = 0x1002; + public const int SPI_SETMENUANIMATION = 0x1003; + public const int SPI_GETCOMBOBOXANIMATION = 0x1004; + public const int SPI_SETCOMBOBOXANIMATION = 0x1005; + public const int SPI_GETLISTBOXSMOOTHSCROLLING = 0x1006; + public const int SPI_SETLISTBOXSMOOTHSCROLLING = 0x1007; + public const int SPI_GETGRADIENTCAPTIONS = 0x1008; + public const int SPI_SETGRADIENTCAPTIONS = 0x1009; + public const int SPI_GETKEYBOARDCUES = 0x100A; + public const int SPI_SETKEYBOARDCUES = 0x100B; + public const int SPI_GETMENUUNDERLINES = SPI_GETKEYBOARDCUES; + public const int SPI_SETMENUUNDERLINES = SPI_SETKEYBOARDCUES; + public const int SPI_GETACTIVEWNDTRKZORDER = 0x100C; + public const int SPI_SETACTIVEWNDTRKZORDER = 0x100D; + public const int SPI_GETHOTTRACKING = 0x100E; + public const int SPI_SETHOTTRACKING = 0x100F; + public const int SPI_GETMENUFADE = 0x1012; + public const int SPI_SETMENUFADE = 0x1013; + public const int SPI_GETSELECTIONFADE = 0x1014; + public const int SPI_SETSELECTIONFADE = 0x1015; + public const int SPI_GETTOOLTIPANIMATION = 0x1016; + public const int SPI_SETTOOLTIPANIMATION = 0x1017; + public const int SPI_GETTOOLTIPFADE = 0x1018; + public const int SPI_SETTOOLTIPFADE = 0x1019; + public const int SPI_GETCURSORSHADOW = 0x101A; + public const int SPI_SETCURSORSHADOW = 0x101B; + public const int SPI_GETUIEFFECTS = 0x103E; + public const int SPI_SETUIEFFECTS = 0x103F; + public const int SPI_GETFOREGROUNDLOCKTIMEOUT = 0x2000; + public const int SPI_SETFOREGROUNDLOCKTIMEOUT = 0x2001; + public const int SPI_GETACTIVEWNDTRKTIMEOUT = 0x2002; + public const int SPI_SETACTIVEWNDTRKTIMEOUT = 0x2003; + public const int SPI_GETFOREGROUNDFLASHCOUNT = 0x2004; + public const int SPI_SETFOREGROUNDFLASHCOUNT = 0x2005; + public const int SPI_GETCARETWIDTH = 0x2006; + public const int SPI_SETCARETWIDTH = 0x2007; + + public const int WAIT_TIMEOUT = 0x00000102; + + public const int WM_CLOSE = 0x0010; + public const int WM_QUERYENDSESSION = 0x0011; + public const int WM_QUIT = 0x0012; + public const int WM_SYSCOLORCHANGE = 0x0015; + public const int WM_ENDSESSION = 0x0016; + public const int WM_SETTINGCHANGE = 0x001A; + public const int WM_FONTCHANGE = 0x001D; + public const int WM_TIMECHANGE = 0x001E; + public const int WM_COMPACTING = 0x0041; + public const int WM_DISPLAYCHANGE = 0x007E; + public const int WM_TIMER = 0x0113; + public const int WM_POWERBROADCAST = 0x0218; + public const int WM_WTSSESSION_CHANGE = 0x02B1; + public const int WM_PALETTECHANGED = 0x0311; + public const int WM_THEMECHANGED = 0x031A; + public const int WM_USER = 0x0400; + public const int WM_CREATETIMER = WM_USER + 1; + public const int WM_KILLTIMER = WM_USER + 2; + public const int WM_REFLECT = WM_USER + 0x1C00; + + public const int WS_POPUP = unchecked((int)0x80000000); + + public const int WSF_VISIBLE = 0x0001; + + public const int UOI_FLAGS = 1; + + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.CreateWindowEx.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.CreateWindowEx.cs new file mode 100644 index 0000000000..f4b41b996b --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.CreateWindowEx.cs @@ -0,0 +1,16 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, CharSet=CharSet.Unicode, SetLastError=true, BestFitMapping=true, ExactSpelling =true)] + public static extern IntPtr CreateWindowExW(int exStyle, string lpszClassName, string lpszWindowName, int style, int x, int y, int width, + int height, IntPtr hWndParent, IntPtr hMenu, IntPtr hInst, IntPtr pvParam); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.DefWindowProc.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.DefWindowProc.cs new file mode 100644 index 0000000000..f513e3dc74 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.DefWindowProc.cs @@ -0,0 +1,15 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, CharSet = CharSet.Unicode, ExactSpelling = true)] + public static extern IntPtr DefWindowProcW(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.DestroyWindow.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.DestroyWindow.cs new file mode 100644 index 0000000000..d9bc51ae85 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.DestroyWindow.cs @@ -0,0 +1,15 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, ExactSpelling = true)] + public static extern bool DestroyWindow(IntPtr hWnd); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.DispatchMessage.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.DispatchMessage.cs new file mode 100644 index 0000000000..07b448c3fb --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.DispatchMessage.cs @@ -0,0 +1,15 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, CharSet = CharSet.Unicode, ExactSpelling = true)] + public static extern int DispatchMessageW([In] ref MSG msg); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.FindWindow.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.FindWindow.cs new file mode 100644 index 0000000000..809beafc73 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.FindWindow.cs @@ -0,0 +1,15 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, CharSet=CharSet.Auto, ExactSpelling = true)] + public static extern IntPtr FindWindowW(string lpClassName, string lpWindowName); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.GetClassInfo.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.GetClassInfo.cs new file mode 100644 index 0000000000..2cda3679fe --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.GetClassInfo.cs @@ -0,0 +1,15 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, CharSet=CharSet.Unicode, ExactSpelling = true)] + public static extern bool GetClassInfoW(IntPtr hInst, string lpszClass, [In, Out] WNDCLASS_I wc); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.GetProcessWindowStation.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.GetProcessWindowStation.cs new file mode 100644 index 0000000000..7e16cbe783 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.GetProcessWindowStation.cs @@ -0,0 +1,15 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, ExactSpelling=true)] + internal static extern IntPtr GetProcessWindowStation(); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.GetUserObjectInformation.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.GetUserObjectInformation.cs new file mode 100644 index 0000000000..82df65c8f1 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.GetUserObjectInformation.cs @@ -0,0 +1,15 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, SetLastError=true, CharSet = CharSet.Unicode, ExactSpelling = true)] + public static extern bool GetUserObjectInformationW(IntPtr hObj, int nIndex, [MarshalAs(UnmanagedType.LPStruct)] USEROBJECTFLAGS pvBuffer, int nLength, ref int lpnLengthNeeded); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.GetWindowThreadProcessId.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.GetWindowThreadProcessId.cs index e5d5aebfec..9f69b32ef2 100644 --- a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.GetWindowThreadProcessId.cs +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.GetWindowThreadProcessId.cs @@ -9,7 +9,10 @@ internal partial class Interop { internal partial class User32 { - [DllImport(Libraries.User32)] + [DllImport(Libraries.User32, ExactSpelling = true)] public static extern int GetWindowThreadProcessId(IntPtr handle, out int processId); + + [DllImport(Libraries.User32, ExactSpelling = true)] + public static extern int GetWindowThreadProcessId(HandleRef handle, out int processId); } } diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.IsWindow.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.IsWindow.cs new file mode 100644 index 0000000000..be4c2f75b5 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.IsWindow.cs @@ -0,0 +1,15 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, ExactSpelling = true)] + public static extern bool IsWindow(IntPtr hWnd); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.KillTimer.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.KillTimer.cs new file mode 100644 index 0000000000..76a49229a6 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.KillTimer.cs @@ -0,0 +1,15 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, ExactSpelling = true)] + public static extern bool KillTimer(IntPtr hwnd, IntPtr idEvent); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.MSG.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.MSG.cs new file mode 100644 index 0000000000..871d772723 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.MSG.cs @@ -0,0 +1,23 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [StructLayout(LayoutKind.Sequential)] + public struct MSG { + public IntPtr hwnd; + public int message; + public IntPtr wParam; + public IntPtr lParam; + public int time; + public int pt_x; + public int pt_y; + } + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.MsgWaitForMultipleObjectsEx.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.MsgWaitForMultipleObjectsEx.cs new file mode 100644 index 0000000000..6d3a58a27b --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.MsgWaitForMultipleObjectsEx.cs @@ -0,0 +1,15 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, ExactSpelling = true)] + public static extern int MsgWaitForMultipleObjectsEx(int nCount, IntPtr pHandles, int dwMilliseconds, int dwWakeMask, int dwFlags); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.PeekMessage.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.PeekMessage.cs new file mode 100644 index 0000000000..5b00c16585 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.PeekMessage.cs @@ -0,0 +1,15 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, CharSet = CharSet.Unicode, ExactSpelling = true)] + public static extern bool PeekMessageW([In, Out] ref MSG msg, IntPtr hwnd, int msgMin, int msgMax, int remove); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.PostMessage.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.PostMessage.cs index e9e1a54e85..81e95be399 100644 --- a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.PostMessage.cs +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.PostMessage.cs @@ -9,7 +9,10 @@ internal partial class Interop { internal partial class User32 { - [DllImport(Libraries.User32, EntryPoint = "PostMessageW")] - public static extern int PostMessage(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam); + [DllImport(Libraries.User32, CharSet = CharSet.Unicode, ExactSpelling = true)] + public static extern int PostMessageW(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam); + + [DllImport(Libraries.User32, CharSet = CharSet.Unicode, ExactSpelling = true)] + public static extern int PostMessageW(HandleRef hwnd, int msg, IntPtr wparam, IntPtr lparam); } } diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.RegisterClass.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.RegisterClass.cs new file mode 100644 index 0000000000..f501a8c8af --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.RegisterClass.cs @@ -0,0 +1,14 @@ +// 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.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, CharSet = CharSet.Unicode, SetLastError = true, ExactSpelling = true)] + public static extern short RegisterClassW(WNDCLASS wc); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.RegisterWindowMessage.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.RegisterWindowMessage.cs new file mode 100644 index 0000000000..a843030a3c --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.RegisterWindowMessage.cs @@ -0,0 +1,14 @@ +// 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.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, CharSet = CharSet.Unicode, ExactSpelling = true)] + public static extern int RegisterWindowMessageW(string msg); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.SendMessage.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.SendMessage.cs new file mode 100644 index 0000000000..1541d74826 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.SendMessage.cs @@ -0,0 +1,18 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, CharSet = CharSet.Unicode, ExactSpelling = true)] + public static extern IntPtr SendMessageW(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam); + + [DllImport(Libraries.User32, CharSet = CharSet.Unicode, ExactSpelling = true)] + public static extern IntPtr SendMessageW(HandleRef hWnd, int msg, IntPtr wParam, IntPtr lParam); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.SetClassLong.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.SetClassLong.cs new file mode 100644 index 0000000000..ef56107e88 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.SetClassLong.cs @@ -0,0 +1,15 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, CharSet = CharSet.Unicode, ExactSpelling = true)] + public static extern IntPtr SetClassLongW(IntPtr hwnd, int nIndex, IntPtr dwNewLong); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.SetClassLongPtr.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.SetClassLongPtr.cs new file mode 100644 index 0000000000..fe875d0ce6 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.SetClassLongPtr.cs @@ -0,0 +1,15 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, CharSet = CharSet.Unicode, ExactSpelling = true)] + public static extern IntPtr SetClassLongPtrW(IntPtr hwnd, int nIndex, IntPtr dwNewLong); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.SetTimer.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.SetTimer.cs new file mode 100644 index 0000000000..b5fdb6b700 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.SetTimer.cs @@ -0,0 +1,15 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, ExactSpelling = true)] + public static extern IntPtr SetTimer(IntPtr hWnd, IntPtr nIDEvent, int uElapse, IntPtr lpTimerProc); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.SetWindowLong.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.SetWindowLong.cs new file mode 100644 index 0000000000..b536f77668 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.SetWindowLong.cs @@ -0,0 +1,15 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, CharSet = CharSet.Unicode, ExactSpelling = true)] + public static extern IntPtr SetWindowLongW(IntPtr hWnd, int nIndex, IntPtr dwNewLong); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.SetWindowLongPtr.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.SetWindowLongPtr.cs new file mode 100644 index 0000000000..3dfb27173c --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.SetWindowLongPtr.cs @@ -0,0 +1,15 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, CharSet = CharSet.Unicode, ExactSpelling = true)] + public static extern IntPtr SetWindowLongPtrW(IntPtr hWnd, int nIndex, IntPtr dwNewLong); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.TranslateMessage.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.TranslateMessage.cs new file mode 100644 index 0000000000..2fef33e6c1 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.TranslateMessage.cs @@ -0,0 +1,15 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, ExactSpelling = true)] + public static extern bool TranslateMessage([In, Out] ref MSG msg); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.USEROBJECTFLAGS.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.USEROBJECTFLAGS.cs new file mode 100644 index 0000000000..38f4cc3e97 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.USEROBJECTFLAGS.cs @@ -0,0 +1,18 @@ +// 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.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [StructLayout(LayoutKind.Sequential)] + internal class USEROBJECTFLAGS { + public int fInherit = 0; + public int fReserved = 0; + public int dwFlags = 0; + } + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.UnregisterClass.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.UnregisterClass.cs new file mode 100644 index 0000000000..af4bcb357c --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.UnregisterClass.cs @@ -0,0 +1,15 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [DllImport(Libraries.User32, CharSet = CharSet.Unicode, SetLastError = true, ExactSpelling = true)] + public static extern short UnregisterClassW(string lpClassName, IntPtr hInstance); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.WNDCLASS.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.WNDCLASS.cs new file mode 100644 index 0000000000..dc9730b96a --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.WNDCLASS.cs @@ -0,0 +1,40 @@ +// 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; +using System.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class User32 + { + [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Auto)] + internal class WNDCLASS_I { + public int style; + public IntPtr lpfnWndProc; + public int cbClsExtra = 0; + public int cbWndExtra = 0; + public IntPtr hInstance = IntPtr.Zero; + public IntPtr hIcon = IntPtr.Zero; + public IntPtr hCursor = IntPtr.Zero; + public IntPtr hbrBackground = IntPtr.Zero; + public IntPtr lpszMenuName = IntPtr.Zero; + public IntPtr lpszClassName = IntPtr.Zero; + } + + [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Auto)] + internal class WNDCLASS { + public int style; + public WndProc lpfnWndProc; + public int cbClsExtra = 0; + public int cbWndExtra = 0; + public IntPtr hInstance = IntPtr.Zero; + public IntPtr hIcon = IntPtr.Zero; + public IntPtr hCursor = IntPtr.Zero; + public IntPtr hbrBackground = IntPtr.Zero; + public string lpszMenuName = null; + public string lpszClassName = null; + } + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/user32/Interop.WndProc.cs b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.WndProc.cs new file mode 100644 index 0000000000..d4a9cda3a3 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/user32/Interop.WndProc.cs @@ -0,0 +1,13 @@ +// 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; + +internal partial class Interop +{ + internal partial class User32 + { + public delegate IntPtr WndProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/winhttp/Interop.SafeWinHttpHandle.cs b/external/corefx/src/Common/src/Interop/Windows/winhttp/Interop.SafeWinHttpHandle.cs index f04412fbc5..8342b8dd28 100644 --- a/external/corefx/src/Common/src/Interop/Windows/winhttp/Interop.SafeWinHttpHandle.cs +++ b/external/corefx/src/Common/src/Interop/Windows/winhttp/Interop.SafeWinHttpHandle.cs @@ -12,9 +12,6 @@ internal partial class Interop { internal partial class WinHttp { - // Issue 2501: Fold SafeWinHttpHandleWithCallback and SafeWinHttpHandle into a single type. - // SafeWinHttpHandleWithCallback is incorrectly overriding the Dispose(bool disposing) method - // and will be fixed as part of merging the classes. internal class SafeWinHttpHandle : SafeHandleZeroOrMinusOneIsInvalid { private SafeWinHttpHandle _parentHandle = null; @@ -59,43 +56,5 @@ internal partial class Interop return Interop.WinHttp.WinHttpCloseHandle(handle); } } - - internal sealed class SafeWinHttpHandleWithCallback : SafeWinHttpHandle - { - // Add a reference to this object so that the AppDomain doesn't get unloaded before the last WinHttp callback. - public void AttachCallback() - { - bool ignore = false; - DangerousAddRef(ref ignore); - } - - public void DetachCallback() - { - DangerousRelease(); - } - - protected override void Dispose(bool disposing) - { - if (disposing) - { - // We need to initiate the asynchronous process of closing the WinHttp handle: - // 1. Ensure that all other WinHttp function calls for this handle have returned. - // 2. Call WinHttpCloseHandle. - // 3. Wait for WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING in the callback. - // On this event, call DetachCallback. - // - // WinHttp guarantees that no other calls to the callback are made for this handle after - // WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING has been received. - // Holding the reference to the SafeHandle object ensures that the appdomain where the SafeHandle - // lives until it is guaranteed that no further callback calls are made from the native (WinHttp) side. - Interop.WinHttp.WinHttpCloseHandle(handle); - } - } - - protected override bool ReleaseHandle() - { - return base.ReleaseHandle(); - } - } } } diff --git a/external/corefx/src/Common/src/Interop/Windows/winhttp/Interop.winhttp.cs b/external/corefx/src/Common/src/Interop/Windows/winhttp/Interop.winhttp.cs index 4230bf7fd1..40c29fe741 100644 --- a/external/corefx/src/Common/src/Interop/Windows/winhttp/Interop.winhttp.cs +++ b/external/corefx/src/Common/src/Interop/Windows/winhttp/Interop.winhttp.cs @@ -29,14 +29,6 @@ internal partial class Interop ushort serverPort, uint reserved); - // NOTE: except for the return type, this refers to the same function as WinHttpConnect. - [DllImport(Interop.Libraries.WinHttp, EntryPoint = "WinHttpConnect", CharSet = CharSet.Unicode, SetLastError = true)] - public static extern SafeWinHttpHandleWithCallback WinHttpConnectWithCallback( - SafeWinHttpHandle sessionHandle, - string serverName, - ushort serverPort, - uint reserved); - [DllImport(Interop.Libraries.WinHttp, CharSet = CharSet.Unicode, SetLastError = true)] public static extern SafeWinHttpHandle WinHttpOpenRequest( SafeWinHttpHandle connectHandle, @@ -47,17 +39,6 @@ internal partial class Interop string acceptTypes, uint flags); - // NOTE: except for the return type, this refers to the same function as WinHttpOpenRequest. - [DllImport(Interop.Libraries.WinHttp, EntryPoint = "WinHttpOpenRequest", CharSet = CharSet.Unicode, SetLastError = true)] - public static extern SafeWinHttpHandleWithCallback WinHttpOpenRequestWithCallback( - SafeWinHttpHandle connectHandle, - string verb, - string objectName, - string version, - string referrer, - string acceptTypes, - uint flags); - [DllImport(Interop.Libraries.WinHttp, CharSet = CharSet.Unicode, SetLastError = true)] [return: MarshalAs(UnmanagedType.Bool)] public static extern bool WinHttpAddRequestHeaders( @@ -256,61 +237,5 @@ internal partial class Interop WINHTTP_STATUS_CALLBACK callback, uint notificationFlags, IntPtr reserved); - - [DllImport(Interop.Libraries.WinHttp, CharSet = CharSet.Unicode, SetLastError = true)] - public static extern SafeWinHttpHandleWithCallback WinHttpWebSocketCompleteUpgrade( - SafeWinHttpHandle requestHandle, - IntPtr context); - - [DllImport(Interop.Libraries.WinHttp, CharSet = CharSet.Unicode, SetLastError = false)] - public static extern uint WinHttpWebSocketSend( - SafeWinHttpHandle webSocketHandle, - WINHTTP_WEB_SOCKET_BUFFER_TYPE bufferType, - IntPtr buffer, - uint bufferLength); - - [DllImport(Interop.Libraries.WinHttp, CharSet = CharSet.Unicode, SetLastError = false)] - public static extern uint WinHttpWebSocketReceive( - SafeWinHttpHandle webSocketHandle, - IntPtr buffer, - uint bufferLength, - out uint bytesRead, - out WINHTTP_WEB_SOCKET_BUFFER_TYPE bufferType); - - [DllImport(Interop.Libraries.WinHttp, CharSet = CharSet.Unicode, SetLastError = false)] - public static extern uint WinHttpWebSocketShutdown( - SafeWinHttpHandle webSocketHandle, - ushort status, - byte[] reason, - uint reasonLength); - - [DllImport(Interop.Libraries.WinHttp, CharSet = CharSet.Unicode, SetLastError = false)] - public static extern uint WinHttpWebSocketShutdown( - SafeWinHttpHandle webSocketHandle, - ushort status, - IntPtr reason, - uint reasonLength); - - [DllImport(Interop.Libraries.WinHttp, CharSet = CharSet.Unicode, SetLastError = false)] - public static extern uint WinHttpWebSocketClose( - SafeWinHttpHandle webSocketHandle, - ushort status, - byte[] reason, - uint reasonLength); - - [DllImport(Interop.Libraries.WinHttp, CharSet = CharSet.Unicode, SetLastError = false)] - public static extern uint WinHttpWebSocketClose( - SafeWinHttpHandle webSocketHandle, - ushort status, - IntPtr reason, - uint reasonLength); - - [DllImport(Interop.Libraries.WinHttp, CharSet = CharSet.Unicode, SetLastError = false)] - public static extern uint WinHttpWebSocketQueryCloseStatus( - SafeWinHttpHandle webSocketHandle, - out ushort status, - byte[] reason, - uint reasonLength, - out uint reasonLengthConsumed); } } diff --git a/external/corefx/src/Common/src/Interop/Windows/wtsapi32/Interop.Constants.cs b/external/corefx/src/Common/src/Interop/Windows/wtsapi32/Interop.Constants.cs new file mode 100644 index 0000000000..91bf9a3aad --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/wtsapi32/Interop.Constants.cs @@ -0,0 +1,21 @@ +// 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. + +internal partial class Interop +{ + internal partial class Wtsapi32 + { + public const int NOTIFY_FOR_THIS_SESSION = 0x0; + + public const int WTS_CONSOLE_CONNECT = 0x1; + public const int WTS_CONSOLE_DISCONNECT = 0x2; + public const int WTS_REMOTE_CONNECT = 0x3; + public const int WTS_REMOTE_DISCONNECT = 0x4; + public const int WTS_SESSION_LOGON = 0x5; + public const int WTS_SESSION_LOGOFF = 0x6; + public const int WTS_SESSION_LOCK = 0x7; + public const int WTS_SESSION_UNLOCK = 0x8; + public const int WTS_SESSION_REMOTE_CONTROL = 0x9; + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/wtsapi32/Interop.WTSRegisterSessionNotification.cs b/external/corefx/src/Common/src/Interop/Windows/wtsapi32/Interop.WTSRegisterSessionNotification.cs new file mode 100644 index 0000000000..2fe4d593c2 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/wtsapi32/Interop.WTSRegisterSessionNotification.cs @@ -0,0 +1,14 @@ +// 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.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class Wtsapi32 + { + [DllImport(Libraries.Wtsapi32, ExactSpelling = true)] + public static extern bool WTSRegisterSessionNotification(HandleRef hWnd, int dwFlags); + } +} diff --git a/external/corefx/src/Common/src/Interop/Windows/wtsapi32/Interop.WTSUnRegisterSessionNotification.cs b/external/corefx/src/Common/src/Interop/Windows/wtsapi32/Interop.WTSUnRegisterSessionNotification.cs new file mode 100644 index 0000000000..c1d6b384f9 --- /dev/null +++ b/external/corefx/src/Common/src/Interop/Windows/wtsapi32/Interop.WTSUnRegisterSessionNotification.cs @@ -0,0 +1,14 @@ +// 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.Runtime.InteropServices; + +internal partial class Interop +{ + internal partial class Wtsapi32 + { + [DllImport(Libraries.Wtsapi32, ExactSpelling = true)] + public static extern bool WTSUnRegisterSessionNotification(HandleRef hWnd); + } +} diff --git a/external/corefx/src/System.Security.Cryptography.OpenSsl/src/System/Security/Cryptography/SafeEvpPKeyHandle.Unix.cs b/external/corefx/src/Common/src/Microsoft/Win32/SafeHandles/SafeEvpPKeyHandle.Unix.cs similarity index 94% rename from external/corefx/src/System.Security.Cryptography.OpenSsl/src/System/Security/Cryptography/SafeEvpPKeyHandle.Unix.cs rename to external/corefx/src/Common/src/Microsoft/Win32/SafeHandles/SafeEvpPKeyHandle.Unix.cs index ed69307a58..c706b1ce88 100644 --- a/external/corefx/src/System.Security.Cryptography.OpenSsl/src/System/Security/Cryptography/SafeEvpPKeyHandle.Unix.cs +++ b/external/corefx/src/Common/src/Microsoft/Win32/SafeHandles/SafeEvpPKeyHandle.Unix.cs @@ -7,7 +7,12 @@ using System.Runtime.InteropServices; namespace System.Security.Cryptography { - public sealed class SafeEvpPKeyHandle : SafeHandle +#if INTERNAL_ASYMMETRIC_IMPLEMENTATIONS + internal +#else + public +#endif + sealed class SafeEvpPKeyHandle : SafeHandle { internal static readonly SafeEvpPKeyHandle InvalidHandle = new SafeEvpPKeyHandle(); diff --git a/external/corefx/src/Common/src/Microsoft/Win32/SafeHandles/SafeEvpPkeyCtxHandle.Unix.cs b/external/corefx/src/Common/src/Microsoft/Win32/SafeHandles/SafeEvpPkeyCtxHandle.Unix.cs new file mode 100644 index 0000000000..f6b0ef2777 --- /dev/null +++ b/external/corefx/src/Common/src/Microsoft/Win32/SafeHandles/SafeEvpPkeyCtxHandle.Unix.cs @@ -0,0 +1,31 @@ +// 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; +using System.Runtime.InteropServices; + +namespace Microsoft.Win32.SafeHandles +{ + internal sealed class SafeEvpPKeyCtxHandle : SafeHandle + { + private SafeEvpPKeyCtxHandle() + : base(IntPtr.Zero, ownsHandle: true) + { + } + + public SafeEvpPKeyCtxHandle(IntPtr handle, bool ownsHandle) + : base(handle, ownsHandle) + { + } + + protected override bool ReleaseHandle() + { + Interop.Crypto.EvpPKeyCtxDestroy(handle); + SetHandle(IntPtr.Zero); + return true; + } + + public override bool IsInvalid => handle == IntPtr.Zero; + } +} diff --git a/external/corefx/src/Common/src/Microsoft/Win32/SafeHandles/SafeHandleCache.cs b/external/corefx/src/Common/src/Microsoft/Win32/SafeHandles/SafeHandleCache.cs index be29cff12a..c4044ce5a5 100644 --- a/external/corefx/src/Common/src/Microsoft/Win32/SafeHandles/SafeHandleCache.cs +++ b/external/corefx/src/Common/src/Microsoft/Win32/SafeHandles/SafeHandleCache.cs @@ -4,6 +4,7 @@ using System; using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.InteropServices; using System.Threading; diff --git a/external/corefx/src/Common/src/System/Collections/Concurrent/ConcurrentQueue_Segment.cs b/external/corefx/src/Common/src/System/Collections/Concurrent/ConcurrentQueue_Segment.cs new file mode 100644 index 0000000000..0442462ecc --- /dev/null +++ b/external/corefx/src/Common/src/System/Collections/Concurrent/ConcurrentQueue_Segment.cs @@ -0,0 +1,336 @@ +// 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.Diagnostics.Private; +using System.Runtime.InteropServices; +using System.Threading; + +namespace System.Collections.Concurrent +{ + partial class ConcurrentQueue + { + /// + /// Provides a multi-producer, multi-consumer thread-safe bounded segment. When the queue is full, + /// enqueues fail and return false. When the queue is empty, dequeues fail and return null. + /// These segments are linked together to form the unbounded . + /// + [DebuggerDisplay("Capacity = {Capacity}")] + internal sealed class Segment + { + // Segment design is inspired by the algorithm outlined at: + // http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue + + /// The array of items in this queue. Each slot contains the item in that slot and its "sequence number". + internal readonly Slot[] _slots; + /// Mask for quickly accessing a position within the queue's array. + internal readonly int _slotsMask; + /// The head and tail positions, with padding to help avoid false sharing contention. + /// Dequeuing happens from the head, enqueuing happens at the tail. + internal PaddedHeadAndTail _headAndTail; // mutable struct: do not make this readonly + + /// Indicates whether the segment has been marked such that dequeues don't overwrite the removed data. + internal bool _preservedForObservation; + /// Indicates whether the segment has been marked such that no additional items may be enqueued. + internal bool _frozenForEnqueues; +#pragma warning disable 0649 // some builds don't assign to this field + /// The segment following this one in the queue, or null if this segment is the last in the queue. + internal Segment _nextSegment; +#pragma warning restore 0649 + + /// Creates the segment. + /// + /// The maximum number of elements the segment can contain. Must be a power of 2. + /// + public Segment(int boundedLength) + { + // Validate the length + Debug.Assert(boundedLength >= 2, $"Must be >= 2, got {boundedLength}"); + Debug.Assert((boundedLength & (boundedLength - 1)) == 0, $"Must be a power of 2, got {boundedLength}"); + + // Initialize the slots and the mask. The mask is used as a way of quickly doing "% _slots.Length", + // instead letting us do "& _slotsMask". + _slots = new Slot[boundedLength]; + _slotsMask = boundedLength - 1; + + // Initialize the sequence number for each slot. The sequence number provides a ticket that + // allows dequeuers to know whether they can dequeue and enqueuers to know whether they can + // enqueue. An enqueuer at position N can enqueue when the sequence number is N, and a dequeuer + // for position N can dequeue when the sequence number is N + 1. When an enqueuer is done writing + // at position N, it sets the sequence number to N + 1 so that a dequeuer will be able to dequeue, + // and when a dequeuer is done dequeueing at position N, it sets the sequence number to N + _slots.Length, + // so that when an enqueuer loops around the slots, it'll find that the sequence number at + // position N is N. This also means that when an enqueuer finds that at position N the sequence + // number is < N, there is still a value in that slot, i.e. the segment is full, and when a + // dequeuer finds that the value in a slot is < N + 1, there is nothing currently available to + // dequeue. (It is possible for multiple enqueuers to enqueue concurrently, writing into + // subsequent slots, and to have the first enqueuer take longer, so that the slots for 1, 2, 3, etc. + // may have values, but the 0th slot may still be being filled... in that case, TryDequeue will + // return false.) + for (int i = 0; i < _slots.Length; i++) + { + _slots[i].SequenceNumber = i; + } + } + + /// Round the specified value up to the next power of 2, if it isn't one already. + internal static int RoundUpToPowerOf2(int i) + { + // Based on https://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2 + --i; + i |= i >> 1; + i |= i >> 2; + i |= i >> 4; + i |= i >> 8; + i |= i >> 16; + return i + 1; + } + + /// Gets the number of elements this segment can store. + internal int Capacity => _slots.Length; + + /// Gets the "freeze offset" for this segment. + internal int FreezeOffset => _slots.Length * 2; + + /// + /// Ensures that the segment will not accept any subsequent enqueues that aren't already underway. + /// + /// + /// When we mark a segment as being frozen for additional enqueues, + /// we set the bool, but that's mostly + /// as a small helper to avoid marking it twice. The real marking comes + /// by modifying the Tail for the segment, increasing it by this + /// . This effectively knocks it off the + /// sequence expected by future enqueuers, such that any additional enqueuer + /// will be unable to enqueue due to it not lining up with the expected + /// sequence numbers. This value is chosen specially so that Tail will grow + /// to a value that maps to the same slot but that won't be confused with + /// any other enqueue/dequeue sequence number. + /// + internal void EnsureFrozenForEnqueues() // must only be called while queue's segment lock is held + { + if (!_frozenForEnqueues) // flag used to ensure we don't increase the Tail more than once if frozen more than once + { + _frozenForEnqueues = true; + + // Increase the tail by FreezeOffset, spinning until we're successful in doing so. + var spinner = new SpinWait(); + while (true) + { + int tail = Volatile.Read(ref _headAndTail.Tail); + if (Interlocked.CompareExchange(ref _headAndTail.Tail, tail + FreezeOffset, tail) == tail) + { + break; + } + spinner.SpinOnce(); + } + } + } + + /// Tries to dequeue an element from the queue. + public bool TryDequeue(out T item) + { + // Loop in case of contention... + var spinner = new SpinWait(); + while (true) + { + // Get the head at which to try to dequeue. + int currentHead = Volatile.Read(ref _headAndTail.Head); + int slotsIndex = currentHead & _slotsMask; + + // Read the sequence number for the head position. + int sequenceNumber = Volatile.Read(ref _slots[slotsIndex].SequenceNumber); + + // We can dequeue from this slot if it's been filled by an enqueuer, which + // would have left the sequence number at pos+1. + int diff = sequenceNumber - (currentHead + 1); + if (diff == 0) + { + // We may be racing with other dequeuers. Try to reserve the slot by incrementing + // the head. Once we've done that, no one else will be able to read from this slot, + // and no enqueuer will be able to read from this slot until we've written the new + // sequence number. WARNING: The next few lines are not reliable on a runtime that + // supports thread aborts. If a thread abort were to sneak in after the CompareExchange + // but before the Volatile.Write, enqueuers trying to enqueue into this slot would + // spin indefinitely. If this implementation is ever used on such a platform, this + // if block should be wrapped in a finally / prepared region. + if (Interlocked.CompareExchange(ref _headAndTail.Head, currentHead + 1, currentHead) == currentHead) + { + // Successfully reserved the slot. Note that after the above CompareExchange, other threads + // trying to dequeue from this slot will end up spinning until we do the subsequent Write. + item = _slots[slotsIndex].Item; + if (!Volatile.Read(ref _preservedForObservation)) + { + // If we're preserving, though, we don't zero out the slot, as we need it for + // enumerations, peeking, ToArray, etc. And we don't update the sequence number, + // so that an enqueuer will see it as full and be forced to move to a new segment. + _slots[slotsIndex].Item = default(T); + Volatile.Write(ref _slots[slotsIndex].SequenceNumber, currentHead + _slots.Length); + } + return true; + } + } + else if (diff < 0) + { + // The sequence number was less than what we needed, which means this slot doesn't + // yet contain a value we can dequeue, i.e. the segment is empty. Technically it's + // possible that multiple enqueuers could have written concurrently, with those + // getting later slots actually finishing first, so there could be elements after + // this one that are available, but we need to dequeue in order. So before declaring + // failure and that the segment is empty, we check the tail to see if we're actually + // empty or if we're just waiting for items in flight or after this one to become available. + bool frozen = _frozenForEnqueues; + int currentTail = Volatile.Read(ref _headAndTail.Tail); + if (currentTail - currentHead <= 0 || (frozen && (currentTail - FreezeOffset - currentHead <= 0))) + { + item = default(T); + return false; + } + + // It's possible it could have become frozen after we checked _frozenForEnqueues + // and before reading the tail. That's ok: in that rare race condition, we just + // loop around again. + } + + // Lost a race. Spin a bit, then try again. + spinner.SpinOnce(); + } + } + + /// Tries to peek at an element from the queue, without removing it. + public bool TryPeek(out T result, bool resultUsed) + { + if (resultUsed) + { + // In order to ensure we don't get a torn read on the value, we mark the segment + // as preserving for observation. Additional items can still be enqueued to this + // segment, but no space will be freed during dequeues, such that the segment will + // no longer be reusable. + _preservedForObservation = true; + Interlocked.MemoryBarrier(); + } + + // Loop in case of contention... + var spinner = new SpinWait(); + while (true) + { + // Get the head at which to try to peek. + int currentHead = Volatile.Read(ref _headAndTail.Head); + int slotsIndex = currentHead & _slotsMask; + + // Read the sequence number for the head position. + int sequenceNumber = Volatile.Read(ref _slots[slotsIndex].SequenceNumber); + + // We can peek from this slot if it's been filled by an enqueuer, which + // would have left the sequence number at pos+1. + int diff = sequenceNumber - (currentHead + 1); + if (diff == 0) + { + result = resultUsed ? _slots[slotsIndex].Item : default(T); + return true; + } + else if (diff < 0) + { + // The sequence number was less than what we needed, which means this slot doesn't + // yet contain a value we can peek, i.e. the segment is empty. Technically it's + // possible that multiple enqueuers could have written concurrently, with those + // getting later slots actually finishing first, so there could be elements after + // this one that are available, but we need to peek in order. So before declaring + // failure and that the segment is empty, we check the tail to see if we're actually + // empty or if we're just waiting for items in flight or after this one to become available. + bool frozen = _frozenForEnqueues; + int currentTail = Volatile.Read(ref _headAndTail.Tail); + if (currentTail - currentHead <= 0 || (frozen && (currentTail - FreezeOffset - currentHead <= 0))) + { + result = default(T); + return false; + } + + // It's possible it could have become frozen after we checked _frozenForEnqueues + // and before reading the tail. That's ok: in that rare race condition, we just + // loop around again. + } + + // Lost a race. Spin a bit, then try again. + spinner.SpinOnce(); + } + } + + /// + /// Attempts to enqueue the item. If successful, the item will be stored + /// in the queue and true will be returned; otherwise, the item won't be stored, and false + /// will be returned. + /// + public bool TryEnqueue(T item) + { + // Loop in case of contention... + var spinner = new SpinWait(); + while (true) + { + // Get the tail at which to try to return. + int currentTail = Volatile.Read(ref _headAndTail.Tail); + int slotsIndex = currentTail & _slotsMask; + + // Read the sequence number for the tail position. + int sequenceNumber = Volatile.Read(ref _slots[slotsIndex].SequenceNumber); + + // The slot is empty and ready for us to enqueue into it if its sequence + // number matches the slot. + int diff = sequenceNumber - currentTail; + if (diff == 0) + { + // We may be racing with other enqueuers. Try to reserve the slot by incrementing + // the tail. Once we've done that, no one else will be able to write to this slot, + // and no dequeuer will be able to read from this slot until we've written the new + // sequence number. WARNING: The next few lines are not reliable on a runtime that + // supports thread aborts. If a thread abort were to sneak in after the CompareExchange + // but before the Volatile.Write, other threads will spin trying to access this slot. + // If this implementation is ever used on such a platform, this if block should be + // wrapped in a finally / prepared region. + if (Interlocked.CompareExchange(ref _headAndTail.Tail, currentTail + 1, currentTail) == currentTail) + { + // Successfully reserved the slot. Note that after the above CompareExchange, other threads + // trying to return will end up spinning until we do the subsequent Write. + _slots[slotsIndex].Item = item; + Volatile.Write(ref _slots[slotsIndex].SequenceNumber, currentTail + 1); + return true; + } + } + else if (diff < 0) + { + // The sequence number was less than what we needed, which means this slot still + // contains a value, i.e. the segment is full. Technically it's possible that multiple + // dequeuers could have read concurrently, with those getting later slots actually + // finishing first, so there could be spaces after this one that are available, but + // we need to enqueue in order. + return false; + } + + // Lost a race. Spin a bit, then try again. + spinner.SpinOnce(); + } + } + + /// Represents a slot in the queue. + [StructLayout(LayoutKind.Auto)] + [DebuggerDisplay("Item = {Item}, SequenceNumber = {SequenceNumber}")] + internal struct Slot + { + /// The item. + public T Item; + /// The sequence number for this slot, used to synchronize between enqueuers and dequeuers. + public int SequenceNumber; + } + } + } + + /// Padded head and tail indices, to avoid false sharing between producers and consumers. + [DebuggerDisplay("Head = {Head}, Tail = {Tail}")] + [StructLayout(LayoutKind.Explicit, Size = 384)] // padding before/between/after fields based on worst case cache line size of 128 + internal struct PaddedHeadAndTail + { + [FieldOffset(128)] public int Head; + [FieldOffset(256)] public int Tail; + } +} diff --git a/external/corefx/src/Common/src/System/Collections/Generic/LargeArrayBuilder.cs b/external/corefx/src/Common/src/System/Collections/Generic/LargeArrayBuilder.cs index ff29326046..c0f441909d 100644 --- a/external/corefx/src/Common/src/System/Collections/Generic/LargeArrayBuilder.cs +++ b/external/corefx/src/Common/src/System/Collections/Generic/LargeArrayBuilder.cs @@ -124,14 +124,30 @@ namespace System.Collections.Generic { Debug.Assert(_maxCapacity > _count); - if (_index == _current.Length) + int index = _index; + T[] current = _current; + + // Must be >= and not == to enable range check elimination + if ((uint)index >= (uint)current.Length) { - AllocateBuffer(); + AddWithBufferAllocation(item); } - - _current[_index++] = item; + else + { + current[index] = item; + _index = index + 1; + } + _count++; } + + // Non-inline to improve code quality as uncommon path + [MethodImpl(MethodImplOptions.NoInlining)] + private void AddWithBufferAllocation(T item) + { + AllocateBuffer(); + _current[_index++] = item; + } /// /// Adds a range of items to this builder. @@ -155,17 +171,18 @@ namespace System.Collections.Generic while (enumerator.MoveNext()) { - if (index == destination.Length) + T item = enumerator.Current; + + if ((uint)index >= (uint)destination.Length) { - // No more space in this buffer. Resize. - _count += index - _index; - _index = index; - AllocateBuffer(); - destination = _current; - index = _index; // May have been reset to 0 + AddWithBufferAllocation(item, ref destination, ref index); } - - destination[index++] = enumerator.Current; + else + { + destination[index] = item; + } + + index++; } // Final update to _count and _index. @@ -174,6 +191,18 @@ namespace System.Collections.Generic } } + // Non-inline to improve code quality as uncommon path + [MethodImpl(MethodImplOptions.NoInlining)] + private void AddWithBufferAllocation(T item, ref T[] destination, ref int index) + { + _count += index - _index; + _index = index; + AllocateBuffer(); + destination = _current; + index = _index; + _current[index] = item; + } + /// /// Copies the contents of this builder to the specified array. /// diff --git a/external/corefx/src/Common/src/System/Collections/HashHelpers.cs b/external/corefx/src/Common/src/System/Collections/HashHelpers.cs index 661e9faf2e..68a7384099 100644 --- a/external/corefx/src/Common/src/System/Collections/HashHelpers.cs +++ b/external/corefx/src/Common/src/System/Collections/HashHelpers.cs @@ -2,27 +2,18 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -/*============================================================ -** -** -** -** -** Purpose: Hash table implementation -** -** -===========================================================*/ -using System; using System.Diagnostics; -using System.Runtime; -using System.Runtime.CompilerServices; -using System.Runtime.Serialization; -using System.Threading; namespace System.Collections { internal static class HashHelpers { + // This is the maximum prime smaller than Array.MaxArrayLength + public const int MaxPrimeArrayLength = 0x7FEFFFFD; + + private const int HashPrime = 101; + // Table of prime numbers to use as hash table sizes. // A typical resize algorithm would pick the smallest prime number in this array // that is larger than twice the previous capacity. @@ -34,16 +25,29 @@ namespace System.Collections // hashtable operations such as add. Having a prime guarantees that double // hashing does not lead to infinite loops. IE, your hash function will be // h1(key) + i*h2(key), 0 <= i < size. h2 and the size must be relatively prime. + // We prefer the low computation costs of higher prime numbers over the increased + // memory allocation of a fixed prime number i.e. when right sizing a HashSet. public static readonly int[] primes = { 3, 7, 11, 17, 23, 29, 37, 47, 59, 71, 89, 107, 131, 163, 197, 239, 293, 353, 431, 521, 631, 761, 919, 1103, 1327, 1597, 1931, 2333, 2801, 3371, 4049, 4861, 5839, 7013, 8419, 10103, 12143, 14591, 17519, 21023, 25229, 30293, 36353, 43627, 52361, 62851, 75431, 90523, 108631, 130363, 156437, 187751, 225307, 270371, 324449, 389357, 467237, 560689, 672827, 807403, 968897, 1162687, 1395263, - 1674319, 2009191, 2411033, 2893249, 3471899, 4166287, 4999559, 5999471, 7199369, 8639249, 10367101, - 12440537, 14928671, 17914409, 21497293, 25796759, 30956117, 37147349, 44576837, 53492207, 64190669, - 77028803, 92434613, 110921543, 133105859, 159727031, 191672443, 230006941, 276008387, 331210079, - 397452101, 476942527, 572331049, 686797261, 824156741, 988988137, 1186785773, 1424142949, 1708971541, - 2050765853, MaxPrimeArrayLength }; + 1674319, 2009191, 2411033, 2893249, 3471899, 4166287, 4999559, 5999471, 7199369 }; + + public static bool IsPrime(int candidate) + { + if ((candidate & 1) != 0) + { + int limit = (int)Math.Sqrt(candidate); + for (int divisor = 3; divisor <= limit; divisor += 2) + { + if ((candidate % divisor) == 0) + return false; + } + return true; + } + return (candidate == 2); + } public static int GetPrime(int min) { @@ -56,6 +60,13 @@ namespace System.Collections if (prime >= min) return prime; } + //outside of our predefined table. + //compute the hard way. + for (int i = (min | 1); i < int.MaxValue; i += 2) + { + if (IsPrime(i) && ((i - 1) % HashPrime != 0)) + return i; + } return min; } @@ -64,7 +75,7 @@ namespace System.Collections { int newSize = 2 * oldSize; - // Allow the hashtables to grow to maximum possible size (~2G elements) before encoutering capacity overflow. + // Allow the hashtables to grow to maximum possible size (~2G elements) before encountering capacity overflow. // Note that this check works even when _items.Length overflowed thanks to the (uint) cast if ((uint)newSize > MaxPrimeArrayLength && MaxPrimeArrayLength > oldSize) { @@ -74,9 +85,5 @@ namespace System.Collections return GetPrime(newSize); } - - - // This is the maximum prime smaller than Array.MaxArrayLength - public const int MaxPrimeArrayLength = 0x7FEFFFFD; } } diff --git a/external/corefx/src/Common/src/System/Data/Common/AdapterUtil.Drivers.cs b/external/corefx/src/Common/src/System/Data/Common/AdapterUtil.Drivers.cs new file mode 100644 index 0000000000..c8666a2c69 --- /dev/null +++ b/external/corefx/src/Common/src/System/Data/Common/AdapterUtil.Drivers.cs @@ -0,0 +1,35 @@ +// 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.Threading; + +namespace System.Data.Common +{ + internal static partial class ADP + { + + internal static Timer UnsafeCreateTimer(TimerCallback callback, object state, int dueTime, int period) + { + // Don't capture the current ExecutionContext and its AsyncLocals onto + // a global timer causing them to live forever + bool restoreFlow = false; + try + { + if (!ExecutionContext.IsFlowSuppressed()) + { + ExecutionContext.SuppressFlow(); + restoreFlow = true; + } + + return new Timer(callback, state, dueTime, period); + } + finally + { + // Restore the current ExecutionContext + if (restoreFlow) + ExecutionContext.RestoreFlow(); + } + } + } +} diff --git a/external/corefx/src/Common/src/System/Data/Common/AdapterUtil.cs b/external/corefx/src/Common/src/System/Data/Common/AdapterUtil.cs index 575e22f25d..d15c73c799 100644 --- a/external/corefx/src/Common/src/System/Data/Common/AdapterUtil.cs +++ b/external/corefx/src/Common/src/System/Data/Common/AdapterUtil.cs @@ -485,12 +485,9 @@ namespace System.Data.Common return ArgumentOutOfRange(SR.ADP_InvalidSeekOrigin, parameterName); } - internal static readonly bool IsWindowsNT = (PlatformID.Win32NT == Environment.OSVersion.Platform); - internal static readonly bool IsPlatformNT5 = (ADP.IsWindowsNT && (Environment.OSVersion.Version.Major >= 5)); - internal static void SetCurrentTransaction(Transaction transaction) { Transaction.Current = transaction; } } -} \ No newline at end of file +} diff --git a/external/corefx/src/Common/src/System/Data/ProviderBase/DbConnectionClosed.cs b/external/corefx/src/Common/src/System/Data/ProviderBase/DbConnectionClosed.cs new file mode 100644 index 0000000000..1238beb3cc --- /dev/null +++ b/external/corefx/src/Common/src/System/Data/ProviderBase/DbConnectionClosed.cs @@ -0,0 +1,138 @@ +// 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.Data.Common; +using System.Diagnostics; +using System.Threading.Tasks; + +namespace System.Data.ProviderBase +{ + abstract internal partial class DbConnectionClosed : DbConnectionInternal + { + // Construct an "empty" connection + protected DbConnectionClosed(ConnectionState state, bool hidePassword, bool allowSetConnectionString) : base(state, hidePassword, allowSetConnectionString) + { + } + + public override string ServerVersion => throw ADP.ClosedConnectionError(); + + public override DbTransaction BeginTransaction(IsolationLevel il) => throw ADP.ClosedConnectionError(); + + public override void ChangeDatabase(string database) => throw ADP.ClosedConnectionError(); + + internal override void CloseConnection(DbConnection owningObject, DbConnectionFactory connectionFactory) + { + // not much to do here... + } + + protected override void Deactivate() => ADP.ClosedConnectionError(); + + protected internal override DataTable GetSchema(DbConnectionFactory factory, DbConnectionPoolGroup poolGroup, DbConnection outerConnection, string collectionName, string[] restrictions) + => throw ADP.ClosedConnectionError(); + + protected override DbReferenceCollection CreateReferenceCollection() => throw ADP.ClosedConnectionError(); + + internal override bool TryOpenConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) + => base.TryOpenConnectionInternal(outerConnection, connectionFactory, retry, userOptions); + } + + abstract internal class DbConnectionBusy : DbConnectionClosed + { + protected DbConnectionBusy(ConnectionState state) : base(state, true, false) + { + } + + internal override bool TryOpenConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) + => throw ADP.ConnectionAlreadyOpen(State); + } + + sealed internal class DbConnectionClosedBusy : DbConnectionBusy + { + // Closed Connection, Currently Busy - changing connection string + internal static readonly DbConnectionInternal SingletonInstance = new DbConnectionClosedBusy(); // singleton object + + private DbConnectionClosedBusy() : base(ConnectionState.Closed) + { + } + } + + sealed internal class DbConnectionOpenBusy : DbConnectionBusy + { + // Open Connection, Currently Busy - closing connection + internal static readonly DbConnectionInternal SingletonInstance = new DbConnectionOpenBusy(); // singleton object + + private DbConnectionOpenBusy() : base(ConnectionState.Open) + { + } + } + + sealed internal class DbConnectionClosedConnecting : DbConnectionBusy + { + // Closed Connection, Currently Connecting + + internal static readonly DbConnectionInternal SingletonInstance = new DbConnectionClosedConnecting(); // singleton object + + private DbConnectionClosedConnecting() : base(ConnectionState.Connecting) + { + } + + internal override void CloseConnection(DbConnection owningObject, DbConnectionFactory connectionFactory) + { + connectionFactory.SetInnerConnectionTo(owningObject, DbConnectionClosedPreviouslyOpened.SingletonInstance); + } + + internal override bool TryReplaceConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) + => TryOpenConnection(outerConnection, connectionFactory, retry, userOptions); + + internal override bool TryOpenConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) + { + if (retry == null || !retry.Task.IsCompleted) + { + // retry is null if this is a synchronous call + + // if someone calls Open or OpenAsync while in this state, + // then the retry task will not be completed + + throw ADP.ConnectionAlreadyOpen(State); + } + + // we are completing an asynchronous open + Debug.Assert(retry.Task.Status == TaskStatus.RanToCompletion, "retry task must be completed successfully"); + DbConnectionInternal openConnection = retry.Task.Result; + if (null == openConnection) + { + connectionFactory.SetInnerConnectionTo(outerConnection, this); + throw ADP.InternalConnectionError(ADP.ConnectionError.GetConnectionReturnsNull); + } + connectionFactory.SetInnerConnectionEvent(outerConnection, openConnection); + + return true; + } + } + + sealed internal class DbConnectionClosedNeverOpened : DbConnectionClosed + { + // Closed Connection, Has Never Been Opened + + internal static readonly DbConnectionInternal SingletonInstance = new DbConnectionClosedNeverOpened(); // singleton object + + private DbConnectionClosedNeverOpened() : base(ConnectionState.Closed, false, true) + { + } + } + + sealed internal class DbConnectionClosedPreviouslyOpened : DbConnectionClosed + { + // Closed Connection, Has Previously Been Opened + + internal static readonly DbConnectionInternal SingletonInstance = new DbConnectionClosedPreviouslyOpened(); // singleton object + + private DbConnectionClosedPreviouslyOpened() : base(ConnectionState.Closed, true, true) + { + } + + internal override bool TryReplaceConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) + => TryOpenConnection(outerConnection, connectionFactory, retry, userOptions); + } +} diff --git a/external/corefx/src/Common/src/System/Data/ProviderBase/DbConnectionFactory.cs b/external/corefx/src/Common/src/System/Data/ProviderBase/DbConnectionFactory.cs new file mode 100644 index 0000000000..9ac3330b4a --- /dev/null +++ b/external/corefx/src/Common/src/System/Data/ProviderBase/DbConnectionFactory.cs @@ -0,0 +1,427 @@ +// 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.Collections.Generic; +using System.Diagnostics; +using System.Data.Common; +using System.Threading; +using System.Threading.Tasks; + +namespace System.Data.ProviderBase +{ + internal abstract partial class DbConnectionFactory + { + private Dictionary _connectionPoolGroups; + private readonly List _poolsToRelease; + private readonly List _poolGroupsToRelease; + private readonly Timer _pruningTimer; + private const int PruningDueTime = 4 * 60 * 1000; // 4 minutes + private const int PruningPeriod = 30 * 1000; // thirty seconds + + + // s_pendingOpenNonPooled is an array of tasks used to throttle creation of non-pooled connections to + // a maximum of Environment.ProcessorCount at a time. + private static uint s_pendingOpenNonPooledNext = 0; + private static Task[] s_pendingOpenNonPooled = new Task[Environment.ProcessorCount]; + private static Task s_completedTask; + + protected DbConnectionFactory() + { + _connectionPoolGroups = new Dictionary(); + _poolsToRelease = new List(); + _poolGroupsToRelease = new List(); + _pruningTimer = CreatePruningTimer(); + } + + + abstract public DbProviderFactory ProviderFactory + { + get; + } + + + public void ClearAllPools() + { + Dictionary connectionPoolGroups = _connectionPoolGroups; + foreach (KeyValuePair entry in connectionPoolGroups) + { + DbConnectionPoolGroup poolGroup = entry.Value; + if (null != poolGroup) + { + poolGroup.Clear(); + } + } + } + + public void ClearPool(DbConnection connection) + { + ADP.CheckArgumentNull(connection, nameof(connection)); + + DbConnectionPoolGroup poolGroup = GetConnectionPoolGroup(connection); + if (null != poolGroup) + { + poolGroup.Clear(); + } + } + + public void ClearPool(DbConnectionPoolKey key) + { + Debug.Assert(key != null, "key cannot be null"); + ADP.CheckArgumentNull(key.ConnectionString, nameof(key) + "." + nameof(key.ConnectionString)); + + DbConnectionPoolGroup poolGroup; + Dictionary connectionPoolGroups = _connectionPoolGroups; + if (connectionPoolGroups.TryGetValue(key, out poolGroup)) + { + poolGroup.Clear(); + } + } + + internal virtual DbConnectionPoolProviderInfo CreateConnectionPoolProviderInfo(DbConnectionOptions connectionOptions) + { + return null; + } + + + internal DbConnectionInternal CreateNonPooledConnection(DbConnection owningConnection, DbConnectionPoolGroup poolGroup, DbConnectionOptions userOptions) + { + Debug.Assert(null != owningConnection, "null owningConnection?"); + Debug.Assert(null != poolGroup, "null poolGroup?"); + + DbConnectionOptions connectionOptions = poolGroup.ConnectionOptions; + DbConnectionPoolGroupProviderInfo poolGroupProviderInfo = poolGroup.ProviderInfo; + DbConnectionPoolKey poolKey = poolGroup.PoolKey; + + DbConnectionInternal newConnection = CreateConnection(connectionOptions, poolKey, poolGroupProviderInfo, null, owningConnection, userOptions); + if (null != newConnection) + { + newConnection.MakeNonPooledObject(owningConnection); + } + return newConnection; + } + + internal DbConnectionInternal CreatePooledConnection(DbConnectionPool pool, DbConnection owningObject, DbConnectionOptions options, DbConnectionPoolKey poolKey, DbConnectionOptions userOptions) + { + Debug.Assert(null != pool, "null pool?"); + DbConnectionPoolGroupProviderInfo poolGroupProviderInfo = pool.PoolGroup.ProviderInfo; + + DbConnectionInternal newConnection = CreateConnection(options, poolKey, poolGroupProviderInfo, pool, owningObject, userOptions); + if (null != newConnection) + { + newConnection.MakePooledConnection(pool); + } + return newConnection; + } + + virtual internal DbConnectionPoolGroupProviderInfo CreateConnectionPoolGroupProviderInfo(DbConnectionOptions connectionOptions) + { + return null; + } + + private Timer CreatePruningTimer() => + ADP.UnsafeCreateTimer( + new TimerCallback(PruneConnectionPoolGroups), + null, + PruningDueTime, + PruningPeriod); + + protected DbConnectionOptions FindConnectionOptions(DbConnectionPoolKey key) + { + Debug.Assert(key != null, "key cannot be null"); + if (!string.IsNullOrEmpty(key.ConnectionString)) + { + DbConnectionPoolGroup connectionPoolGroup; + Dictionary connectionPoolGroups = _connectionPoolGroups; + if (connectionPoolGroups.TryGetValue(key, out connectionPoolGroup)) + { + return connectionPoolGroup.ConnectionOptions; + } + } + return null; + } + + private static Task GetCompletedTask() + { + Debug.Assert(Monitor.IsEntered(s_pendingOpenNonPooled), $"Expected {nameof(s_pendingOpenNonPooled)} lock to be held."); + return s_completedTask ?? (s_completedTask = Task.FromResult(null)); + } + + private DbConnectionPool GetConnectionPool(DbConnection owningObject, DbConnectionPoolGroup connectionPoolGroup) + { + // if poolgroup is disabled, it will be replaced with a new entry + + Debug.Assert(null != owningObject, "null owningObject?"); + Debug.Assert(null != connectionPoolGroup, "null connectionPoolGroup?"); + + // It is possible that while the outer connection object has + // been sitting around in a closed and unused state in some long + // running app, the pruner may have come along and remove this + // the pool entry from the master list. If we were to use a + // pool entry in this state, we would create "unmanaged" pools, + // which would be bad. To avoid this problem, we automagically + // re-create the pool entry whenever it's disabled. + + // however, don't rebuild connectionOptions if no pooling is involved - let new connections do that work + if (connectionPoolGroup.IsDisabled && (null != connectionPoolGroup.PoolGroupOptions)) + { + // reusing existing pool option in case user originally used SetConnectionPoolOptions + DbConnectionPoolGroupOptions poolOptions = connectionPoolGroup.PoolGroupOptions; + + // get the string to hash on again + DbConnectionOptions connectionOptions = connectionPoolGroup.ConnectionOptions; + Debug.Assert(null != connectionOptions, "prevent expansion of connectionString"); + + connectionPoolGroup = GetConnectionPoolGroup(connectionPoolGroup.PoolKey, poolOptions, ref connectionOptions); + Debug.Assert(null != connectionPoolGroup, "null connectionPoolGroup?"); + SetConnectionPoolGroup(owningObject, connectionPoolGroup); + } + DbConnectionPool connectionPool = connectionPoolGroup.GetConnectionPool(this); + return connectionPool; + } + + internal DbConnectionPoolGroup GetConnectionPoolGroup(DbConnectionPoolKey key, DbConnectionPoolGroupOptions poolOptions, ref DbConnectionOptions userConnectionOptions) + { + if (string.IsNullOrEmpty(key.ConnectionString)) + { + return (DbConnectionPoolGroup)null; + } + + DbConnectionPoolGroup connectionPoolGroup; + Dictionary connectionPoolGroups = _connectionPoolGroups; + if (!connectionPoolGroups.TryGetValue(key, out connectionPoolGroup) || (connectionPoolGroup.IsDisabled && (null != connectionPoolGroup.PoolGroupOptions))) + { + // If we can't find an entry for the connection string in + // our collection of pool entries, then we need to create a + // new pool entry and add it to our collection. + + DbConnectionOptions connectionOptions = CreateConnectionOptions(key.ConnectionString, userConnectionOptions); + if (null == connectionOptions) + { + throw ADP.InternalConnectionError(ADP.ConnectionError.ConnectionOptionsMissing); + } + + if (null == userConnectionOptions) + { // we only allow one expansion on the connection string + userConnectionOptions = connectionOptions; + } + + // We don't support connection pooling on Win9x + if (null == poolOptions) + { + if (null != connectionPoolGroup) + { + // reusing existing pool option in case user originally used SetConnectionPoolOptions + poolOptions = connectionPoolGroup.PoolGroupOptions; + } + else + { + // Note: may return null for non-pooled connections + poolOptions = CreateConnectionPoolGroupOptions(connectionOptions); + } + } + + lock (this) + { + connectionPoolGroups = _connectionPoolGroups; + if (!connectionPoolGroups.TryGetValue(key, out connectionPoolGroup)) + { + DbConnectionPoolGroup newConnectionPoolGroup = new DbConnectionPoolGroup(connectionOptions, key, poolOptions); + newConnectionPoolGroup.ProviderInfo = CreateConnectionPoolGroupProviderInfo(connectionOptions); + + // build new dictionary with space for new connection string + Dictionary newConnectionPoolGroups = new Dictionary(1 + connectionPoolGroups.Count); + foreach (KeyValuePair entry in connectionPoolGroups) + { + newConnectionPoolGroups.Add(entry.Key, entry.Value); + } + + // lock prevents race condition with PruneConnectionPoolGroups + newConnectionPoolGroups.Add(key, newConnectionPoolGroup); + connectionPoolGroup = newConnectionPoolGroup; + _connectionPoolGroups = newConnectionPoolGroups; + } + else + { + Debug.Assert(!connectionPoolGroup.IsDisabled, "Disabled pool entry discovered"); + } + } + Debug.Assert(null != connectionPoolGroup, "how did we not create a pool entry?"); + Debug.Assert(null != userConnectionOptions, "how did we not have user connection options?"); + } + else if (null == userConnectionOptions) + { + userConnectionOptions = connectionPoolGroup.ConnectionOptions; + } + return connectionPoolGroup; + } + + + private void PruneConnectionPoolGroups(object state) + { + // First, walk the pool release list and attempt to clear each + // pool, when the pool is finally empty, we dispose of it. If the + // pool isn't empty, it's because there are active connections or + // distributed transactions that need it. + lock (_poolsToRelease) + { + if (0 != _poolsToRelease.Count) + { + DbConnectionPool[] poolsToRelease = _poolsToRelease.ToArray(); + foreach (DbConnectionPool pool in poolsToRelease) + { + if (null != pool) + { + pool.Clear(); + + if (0 == pool.Count) + { + _poolsToRelease.Remove(pool); + } + } + } + } + } + + // Next, walk the pool entry release list and dispose of each + // pool entry when it is finally empty. If the pool entry isn't + // empty, it's because there are active pools that need it. + lock (_poolGroupsToRelease) + { + if (0 != _poolGroupsToRelease.Count) + { + DbConnectionPoolGroup[] poolGroupsToRelease = _poolGroupsToRelease.ToArray(); + foreach (DbConnectionPoolGroup poolGroup in poolGroupsToRelease) + { + if (null != poolGroup) + { + int poolsLeft = poolGroup.Clear(); // may add entries to _poolsToRelease + + if (0 == poolsLeft) + { + _poolGroupsToRelease.Remove(poolGroup); + } + } + } + } + } + + // Finally, we walk through the collection of connection pool entries + // and prune each one. This will cause any empty pools to be put + // into the release list. + lock (this) + { + Dictionary connectionPoolGroups = _connectionPoolGroups; + Dictionary newConnectionPoolGroups = new Dictionary(connectionPoolGroups.Count); + + foreach (KeyValuePair entry in connectionPoolGroups) + { + if (null != entry.Value) + { + Debug.Assert(!entry.Value.IsDisabled, "Disabled pool entry discovered"); + + // entries start active and go idle during prune if all pools are gone + // move idle entries from last prune pass to a queue for pending release + // otherwise process entry which may move it from active to idle + if (entry.Value.Prune()) + { // may add entries to _poolsToRelease + QueuePoolGroupForRelease(entry.Value); + } + else + { + newConnectionPoolGroups.Add(entry.Key, entry.Value); + } + } + } + _connectionPoolGroups = newConnectionPoolGroups; + } + } + + internal void QueuePoolForRelease(DbConnectionPool pool, bool clearing) + { + // Queue the pool up for release -- we'll clear it out and dispose + // of it as the last part of the pruning timer callback so we don't + // do it with the pool entry or the pool collection locked. + Debug.Assert(null != pool, "null pool?"); + + // set the pool to the shutdown state to force all active + // connections to be automatically disposed when they + // are returned to the pool + pool.Shutdown(); + + lock (_poolsToRelease) + { + if (clearing) + { + pool.Clear(); + } + _poolsToRelease.Add(pool); + } + } + + internal void QueuePoolGroupForRelease(DbConnectionPoolGroup poolGroup) + { + Debug.Assert(null != poolGroup, "null poolGroup?"); + + lock (_poolGroupsToRelease) + { + _poolGroupsToRelease.Add(poolGroup); + } + } + + virtual protected DbConnectionInternal CreateConnection(DbConnectionOptions options, DbConnectionPoolKey poolKey, object poolGroupProviderInfo, DbConnectionPool pool, DbConnection owningConnection, DbConnectionOptions userOptions) + { + return CreateConnection(options, poolKey, poolGroupProviderInfo, pool, owningConnection); + } + + internal DbMetaDataFactory GetMetaDataFactory(DbConnectionPoolGroup connectionPoolGroup, DbConnectionInternal internalConnection) + { + Debug.Assert(connectionPoolGroup != null, "connectionPoolGroup may not be null."); + + // get the matadatafactory from the pool entry. If it does not already have one + // create one and save it on the pool entry + DbMetaDataFactory metaDataFactory = connectionPoolGroup.MetaDataFactory; + + // consider serializing this so we don't construct multiple metadata factories + // if two threads happen to hit this at the same time. One will be GC'd + if (metaDataFactory == null) + { + bool allowCache = false; + metaDataFactory = CreateMetaDataFactory(internalConnection, out allowCache); + if (allowCache) + { + connectionPoolGroup.MetaDataFactory = metaDataFactory; + } + } + return metaDataFactory; + } + + protected virtual DbMetaDataFactory CreateMetaDataFactory(DbConnectionInternal internalConnection, out bool cacheMetaDataFactory) + { + // providers that support GetSchema must override this with a method that creates a meta data + // factory appropriate for them. + cacheMetaDataFactory = false; + throw ADP.NotSupported(); + } + + abstract protected DbConnectionInternal CreateConnection(DbConnectionOptions options, DbConnectionPoolKey poolKey, object poolGroupProviderInfo, DbConnectionPool pool, DbConnection owningConnection); + + abstract protected DbConnectionOptions CreateConnectionOptions(string connectionString, DbConnectionOptions previous); + + abstract protected DbConnectionPoolGroupOptions CreateConnectionPoolGroupOptions(DbConnectionOptions options); + + abstract internal DbConnectionPoolGroup GetConnectionPoolGroup(DbConnection connection); + + abstract internal DbConnectionInternal GetInnerConnection(DbConnection connection); + + abstract internal void PermissionDemand(DbConnection outerConnection); + + abstract internal void SetConnectionPoolGroup(DbConnection outerConnection, DbConnectionPoolGroup poolGroup); + + abstract internal void SetInnerConnectionEvent(DbConnection owningObject, DbConnectionInternal to); + + abstract internal bool SetInnerConnectionFrom(DbConnection owningObject, DbConnectionInternal to, DbConnectionInternal from); + + abstract internal void SetInnerConnectionTo(DbConnection owningObject, DbConnectionInternal to); + } +} diff --git a/external/corefx/src/Common/src/System/Data/ProviderBase/DbConnectionInternal.cs b/external/corefx/src/Common/src/System/Data/ProviderBase/DbConnectionInternal.cs new file mode 100644 index 0000000000..945a1c5ed5 --- /dev/null +++ b/external/corefx/src/Common/src/System/Data/ProviderBase/DbConnectionInternal.cs @@ -0,0 +1,434 @@ +// 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.Data.Common; +using System.Diagnostics; +using System.Threading; +using System.Threading.Tasks; +using System.Transactions; + + +namespace System.Data.ProviderBase +{ + internal abstract partial class DbConnectionInternal + { + internal static readonly StateChangeEventArgs StateChangeClosed = new StateChangeEventArgs(ConnectionState.Open, ConnectionState.Closed); + internal static readonly StateChangeEventArgs StateChangeOpen = new StateChangeEventArgs(ConnectionState.Closed, ConnectionState.Open); + + private readonly bool _allowSetConnectionString; + private readonly bool _hidePassword; + private readonly ConnectionState _state; + + private readonly WeakReference _owningObject = new WeakReference(null, false); // [usage must be thread safe] the owning object, when not in the pool. (both Pooled and Non-Pooled connections) + + private DbConnectionPool _connectionPool; // the pooler that the connection came from (Pooled connections only) + private DbReferenceCollection _referenceCollection; // collection of objects that we need to notify in some way when we're being deactivated + private int _pooledCount; // [usage must be thread safe] the number of times this object has been pushed into the pool less the number of times it's been popped (0 != inPool) + + private bool _connectionIsDoomed; // true when the connection should no longer be used. + private bool _cannotBePooled; // true when the connection should no longer be pooled. + + private DateTime _createTime; // when the connection was created. + +#if DEBUG + private int _activateCount; // debug only counter to verify activate/deactivates are in sync. +#endif //DEBUG + + protected DbConnectionInternal() : this(ConnectionState.Open, true, false) + { + } + + // Constructor for internal connections + internal DbConnectionInternal(ConnectionState state, bool hidePassword, bool allowSetConnectionString) + { + _allowSetConnectionString = allowSetConnectionString; + _hidePassword = hidePassword; + _state = state; + } + + internal bool AllowSetConnectionString + { + get + { + return _allowSetConnectionString; + } + } + + internal bool CanBePooled + { + get + { + bool flag = (!_connectionIsDoomed && !_cannotBePooled && !_owningObject.IsAlive); + return flag; + } + } + + protected internal bool IsConnectionDoomed + { + get + { + return _connectionIsDoomed; + } + } + + internal bool IsEmancipated + { + get + { + // NOTE: There are race conditions between PrePush, PostPop and this + // property getter -- only use this while this object is locked; + // (DbConnectionPool.Clear and ReclaimEmancipatedObjects + // do this for us) + + // The functionality is as follows: + // + // _pooledCount is incremented when the connection is pushed into the pool + // _pooledCount is decremented when the connection is popped from the pool + // _pooledCount is set to -1 when the connection is not pooled (just in case...) + // + // That means that: + // + // _pooledCount > 1 connection is in the pool multiple times (This should not happen) + // _pooledCount == 1 connection is in the pool + // _pooledCount == 0 connection is out of the pool + // _pooledCount == -1 connection is not a pooled connection; we shouldn't be here for non-pooled connections. + // _pooledCount < -1 connection out of the pool multiple times + // + // Now, our job is to return TRUE when the connection is out + // of the pool and it's owning object is no longer around to + // return it. + + bool value = (_pooledCount < 1) && !_owningObject.IsAlive; + return value; + } + } + + internal bool IsInPool + { + get + { + Debug.Assert(_pooledCount <= 1 && _pooledCount >= -1, "Pooled count for object is invalid"); + return (_pooledCount == 1); + } + } + + + protected internal object Owner + { + // We use a weak reference to the owning object so we can identify when + // it has been garbage collected without thowing exceptions. + get + { + return _owningObject.Target; + } + } + + internal DbConnectionPool Pool + { + get + { + return _connectionPool; + } + } + + protected internal DbReferenceCollection ReferenceCollection + { + get + { + return _referenceCollection; + } + } + + abstract public string ServerVersion + { + get; + } + + // this should be abstract but until it is added to all the providers virtual will have to do + virtual public string ServerVersionNormalized + { + get + { + throw ADP.NotSupported(); + } + } + + public bool ShouldHidePassword + { + get + { + return _hidePassword; + } + } + + public ConnectionState State + { + get + { + return _state; + } + } + + internal void AddWeakReference(object value, int tag) + { + if (null == _referenceCollection) + { + _referenceCollection = CreateReferenceCollection(); + if (null == _referenceCollection) + { + throw ADP.InternalError(ADP.InternalErrorCode.CreateReferenceCollectionReturnedNull); + } + } + _referenceCollection.Add(value, tag); + } + + abstract public DbTransaction BeginTransaction(IsolationLevel il); + + virtual public void ChangeDatabase(string value) + { + throw ADP.MethodNotImplemented(); + } + + virtual internal void PrepareForReplaceConnection() + { + // By default, there is no preparation required + } + + virtual protected void PrepareForCloseConnection() + { + // By default, there is no preparation required + } + + virtual protected object ObtainAdditionalLocksForClose() + { + return null; // no additional locks in default implementation + } + + virtual protected void ReleaseAdditionalLocksForClose(object lockToken) + { + // no additional locks in default implementation + } + + virtual protected DbReferenceCollection CreateReferenceCollection() + { + throw ADP.InternalError(ADP.InternalErrorCode.AttemptingToConstructReferenceCollectionOnStaticObject); + } + + abstract protected void Deactivate(); + + internal void DeactivateConnection() + { + // Internal method called from the connection pooler so we don't expose + // the Deactivate method publicly. + +#if DEBUG + int activateCount = Interlocked.Decrement(ref _activateCount); +#endif // DEBUG + + + if (!_connectionIsDoomed && Pool.UseLoadBalancing) + { + // If we're not already doomed, check the connection's lifetime and + // doom it if it's lifetime has elapsed. + + DateTime now = DateTime.UtcNow; + if ((now.Ticks - _createTime.Ticks) > Pool.LoadBalanceTimeout.Ticks) + { + DoNotPoolThisConnection(); + } + } + Deactivate(); + } + + protected internal void DoNotPoolThisConnection() + { + _cannotBePooled = true; + } + + /// Ensure that this connection cannot be put back into the pool. + protected internal void DoomThisConnection() + { + _connectionIsDoomed = true; + } + + protected internal virtual DataTable GetSchema(DbConnectionFactory factory, DbConnectionPoolGroup poolGroup, DbConnection outerConnection, string collectionName, string[] restrictions) + { + Debug.Assert(outerConnection != null, "outerConnection may not be null."); + + DbMetaDataFactory metaDataFactory = factory.GetMetaDataFactory(poolGroup, this); + Debug.Assert(metaDataFactory != null, "metaDataFactory may not be null."); + + return metaDataFactory.GetSchema(outerConnection, collectionName, restrictions); + } + + internal void MakeNonPooledObject(object owningObject) + { + // Used by DbConnectionFactory to indicate that this object IS NOT part of + // a connection pool. + + _connectionPool = null; + _owningObject.Target = owningObject; + _pooledCount = -1; + } + + internal void MakePooledConnection(DbConnectionPool connectionPool) + { + // Used by DbConnectionFactory to indicate that this object IS part of + // a connection pool. + _createTime = DateTime.UtcNow; + + _connectionPool = connectionPool; + } + + internal void NotifyWeakReference(int message) + { + DbReferenceCollection referenceCollection = ReferenceCollection; + if (null != referenceCollection) + { + referenceCollection.Notify(message); + } + } + + internal virtual void OpenConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory) + { + if (!TryOpenConnection(outerConnection, connectionFactory, null, null)) + { + throw ADP.InternalError(ADP.InternalErrorCode.SynchronousConnectReturnedPending); + } + } + + /// The default implementation is for the open connection objects, and + /// it simply throws. Our private closed-state connection objects + /// override this and do the correct thing. + // User code should either override DbConnectionInternal.Activate when it comes out of the pool + // or override DbConnectionFactory.CreateConnection when the connection is created for non-pooled connections + internal virtual bool TryOpenConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) + { + throw ADP.ConnectionAlreadyOpen(State); + } + + internal virtual bool TryReplaceConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) + { + throw ADP.MethodNotImplemented(); + } + + protected bool TryOpenConnectionInternal(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) + { + // ?->Connecting: prevent set_ConnectionString during Open + if (connectionFactory.SetInnerConnectionFrom(outerConnection, DbConnectionClosedConnecting.SingletonInstance, this)) + { + DbConnectionInternal openConnection = null; + try + { + connectionFactory.PermissionDemand(outerConnection); + if (!connectionFactory.TryGetConnection(outerConnection, retry, userOptions, this, out openConnection)) + { + return false; + } + } + catch + { + // This should occur for all exceptions, even ADP.UnCatchableExceptions. + connectionFactory.SetInnerConnectionTo(outerConnection, this); + throw; + } + if (null == openConnection) + { + connectionFactory.SetInnerConnectionTo(outerConnection, this); + throw ADP.InternalConnectionError(ADP.ConnectionError.GetConnectionReturnsNull); + } + connectionFactory.SetInnerConnectionEvent(outerConnection, openConnection); + } + + return true; + } + + internal void PrePush(object expectedOwner) + { + // Called by DbConnectionPool when we're about to be put into it's pool, we + // take this opportunity to ensure ownership and pool counts are legit. + + // IMPORTANT NOTE: You must have taken a lock on the object before + // you call this method to prevent race conditions with Clear and + // ReclaimEmancipatedObjects. + + //3 // The following tests are retail assertions of things we can't allow to happen. + if (null == expectedOwner) + { + if (null != _owningObject.Target) + { + throw ADP.InternalError(ADP.InternalErrorCode.UnpooledObjectHasOwner); // new unpooled object has an owner + } + } + else if (_owningObject.Target != expectedOwner) + { + throw ADP.InternalError(ADP.InternalErrorCode.UnpooledObjectHasWrongOwner); // unpooled object has incorrect owner + } + if (0 != _pooledCount) + { + throw ADP.InternalError(ADP.InternalErrorCode.PushingObjectSecondTime); // pushing object onto stack a second time + } + _pooledCount++; + _owningObject.Target = null; // NOTE: doing this and checking for InternalError.PooledObjectHasOwner degrades the close by 2% + } + + internal void PostPop(object newOwner) + { + // Called by DbConnectionPool right after it pulls this from it's pool, we + // take this opportunity to ensure ownership and pool counts are legit. + + Debug.Assert(!IsEmancipated, "pooled object not in pool"); + + // When another thread is clearing this pool, it + // will doom all connections in this pool without prejudice which + // causes the following assert to fire, which really mucks up stress + // against checked bits. The assert is benign, so we're commenting + // it out. + //Debug.Assert(CanBePooled, "pooled object is not poolable"); + + // IMPORTANT NOTE: You must have taken a lock on the object before + // you call this method to prevent race conditions with Clear and + // ReclaimEmancipatedObjects. + + if (null != _owningObject.Target) + { + throw ADP.InternalError(ADP.InternalErrorCode.PooledObjectHasOwner); // pooled connection already has an owner! + } + _owningObject.Target = newOwner; + _pooledCount--; + //3 // The following tests are retail assertions of things we can't allow to happen. + if (null != Pool) + { + if (0 != _pooledCount) + { + throw ADP.InternalError(ADP.InternalErrorCode.PooledObjectInPoolMoreThanOnce); // popping object off stack with multiple pooledCount + } + } + else if (-1 != _pooledCount) + { + throw ADP.InternalError(ADP.InternalErrorCode.NonPooledObjectUsedMoreThanOnce); // popping object off stack with multiple pooledCount + } + } + + internal void RemoveWeakReference(object value) + { + DbReferenceCollection referenceCollection = ReferenceCollection; + if (null != referenceCollection) + { + referenceCollection.Remove(value); + } + } + + /// + /// When overridden in a derived class, will check if the underlying connection is still actually alive + /// + /// If true an exception will be thrown if the connection is dead instead of returning true\false + /// (this allows the caller to have the real reason that the connection is not alive (e.g. network error, etc)) + /// True if the connection is still alive, otherwise false (If not overridden, then always true) + internal virtual bool IsConnectionAlive(bool throwOnException = false) + { + return true; + } + } +} diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPoolGroup.cs b/external/corefx/src/Common/src/System/Data/ProviderBase/DbConnectionPoolGroup.cs similarity index 94% rename from external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPoolGroup.cs rename to external/corefx/src/Common/src/System/Data/ProviderBase/DbConnectionPoolGroup.cs index b28ade14d2..f32c4d0d99 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPoolGroup.cs +++ b/external/corefx/src/Common/src/System/Data/ProviderBase/DbConnectionPoolGroup.cs @@ -3,8 +3,6 @@ // See the LICENSE file in the project root for more information. -//------------------------------------------------------------------------------ - using System.Collections.Concurrent; using System.Data.Common; using System.Diagnostics; @@ -62,21 +60,9 @@ namespace System.Data.ProviderBase _state = PoolGroupStateActive; } - internal DbConnectionOptions ConnectionOptions - { - get - { - return _connectionOptions; - } - } + internal DbConnectionOptions ConnectionOptions => _connectionOptions; - internal DbConnectionPoolKey PoolKey - { - get - { - return _poolKey; - } - } + internal DbConnectionPoolKey PoolKey => _poolKey; internal DbConnectionPoolGroupProviderInfo ProviderInfo { @@ -94,22 +80,9 @@ namespace System.Data.ProviderBase } } - internal bool IsDisabled - { - get - { - return (PoolGroupStateDisabled == _state); - } - } + internal bool IsDisabled => (PoolGroupStateDisabled == _state); - - internal DbConnectionPoolGroupOptions PoolGroupOptions - { - get - { - return _poolGroupOptions; - } - } + internal DbConnectionPoolGroupOptions PoolGroupOptions => _poolGroupOptions; internal DbMetaDataFactory MetaDataFactory { @@ -190,7 +163,7 @@ namespace System.Data.ProviderBase if (null != currentIdentity) { if (!_poolCollection.TryGetValue(currentIdentity, out pool)) // find the pool - { + { lock (this) { // Did someone already add it to the list? diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbMetaDataFactory.cs b/external/corefx/src/Common/src/System/Data/ProviderBase/DbMetaDataFactory.cs similarity index 96% rename from external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbMetaDataFactory.cs rename to external/corefx/src/Common/src/System/Data/ProviderBase/DbMetaDataFactory.cs index 3da59e4470..8233dc9849 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbMetaDataFactory.cs +++ b/external/corefx/src/Common/src/System/Data/ProviderBase/DbMetaDataFactory.cs @@ -46,29 +46,11 @@ namespace System.Data.ProviderBase _normalizedServerVersion = normalizedServerVersion; } - protected DataSet CollectionDataSet - { - get - { - return _metaDataCollectionsDataSet; - } - } + protected DataSet CollectionDataSet => _metaDataCollectionsDataSet; - protected string ServerVersion - { - get - { - return _serverVersionString; - } - } + protected string ServerVersion => _serverVersionString; - protected string ServerVersionNormalized - { - get - { - return _normalizedServerVersion; - } - } + protected string ServerVersionNormalized => _normalizedServerVersion; protected DataTable CloneAndFilterCollection(string collectionName, string[] hiddenColumnNames) { @@ -109,10 +91,7 @@ namespace System.Data.ProviderBase return destinationTable; } - public void Dispose() - { - Dispose(true); - } + public void Dispose() => Dispose(true); protected virtual void Dispose(bool disposing) { @@ -216,11 +195,6 @@ namespace System.Data.ProviderBase private DataColumn[] FilterColumns(DataTable sourceTable, string[] hiddenColumnNames, DataColumnCollection destinationColumns) { - - DataColumn newDestinationColumn; - int currentColumn; - DataColumn[] filteredSourceColumns = null; - int columnCount = 0; foreach (DataColumn sourceColumn in sourceTable.Columns) { @@ -235,14 +209,14 @@ namespace System.Data.ProviderBase throw ADP.NoColumns(); } - currentColumn = 0; - filteredSourceColumns = new DataColumn[columnCount]; + int currentColumn = 0; + DataColumn[] filteredSourceColumns = new DataColumn[columnCount]; foreach (DataColumn sourceColumn in sourceTable.Columns) { if (IncludeThisColumn(sourceColumn, hiddenColumnNames) == true) { - newDestinationColumn = new DataColumn(sourceColumn.ColumnName, sourceColumn.DataType); + DataColumn newDestinationColumn = new DataColumn(sourceColumn.ColumnName, sourceColumn.DataType); destinationColumns.Add(newDestinationColumn); filteredSourceColumns[currentColumn] = sourceColumn; currentColumn++; @@ -375,7 +349,7 @@ namespace System.Data.ProviderBase DataColumn parameterName = null; DataColumn restrictionName = null; DataColumn restrictionNumber = null; - ; + string result = null; restrictionsTable = _metaDataCollectionsDataSet.Tables[DbMetaDataCollectionNames.Restrictions]; @@ -587,6 +561,3 @@ namespace System.Data.ProviderBase } } } - - - diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbReferenceCollection.cs b/external/corefx/src/Common/src/System/Data/ProviderBase/DbReferenceCollection.cs similarity index 100% rename from external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbReferenceCollection.cs rename to external/corefx/src/Common/src/System/Data/ProviderBase/DbReferenceCollection.cs diff --git a/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/TimeoutTimer.cs b/external/corefx/src/Common/src/System/Data/ProviderBase/TimeoutTimer.cs similarity index 100% rename from external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/TimeoutTimer.cs rename to external/corefx/src/Common/src/System/Data/ProviderBase/TimeoutTimer.cs diff --git a/external/corefx/src/Common/src/System/Drawing/KnownColor.cs b/external/corefx/src/Common/src/System/Drawing/KnownColor.cs index 01497e7933..70a217c0e9 100644 --- a/external/corefx/src/Common/src/System/Drawing/KnownColor.cs +++ b/external/corefx/src/Common/src/System/Drawing/KnownColor.cs @@ -7,7 +7,12 @@ using System.Diagnostics.CodeAnalysis; namespace System.Drawing { [SuppressMessage("Microsoft.Design", "CA1008:EnumsShouldHaveZeroValue")] - public enum KnownColor +#if netcoreapp20 + internal +#else + public +#endif + enum KnownColor { // This enum is order dependant!!! // diff --git a/external/corefx/src/Common/src/System/Drawing/KnownColorTable.cs b/external/corefx/src/Common/src/System/Drawing/KnownColorTable.cs index 6681be42aa..f4b6dfabba 100644 --- a/external/corefx/src/Common/src/System/Drawing/KnownColorTable.cs +++ b/external/corefx/src/Common/src/System/Drawing/KnownColorTable.cs @@ -6,6 +6,11 @@ using System.Diagnostics; namespace System.Drawing { +#if FEATURE_SYSTEM_EVENTS + using Microsoft.Win32; + using System.Drawing.Internal; +#endif + static internal class KnownColorTable { private static int[] s_colorTable; @@ -53,6 +58,10 @@ namespace System.Drawing private static void InitColorTable() { int[] values = new int[(unchecked((int)KnownColor.MenuHighlight)) + 1]; + +#if FEATURE_SYSTEM_EVENTS + SystemEvents.UserPreferenceChanging += new UserPreferenceChangingEventHandler(OnUserPreferenceChanging); +#endif UpdateSystemColors(values); // just consts... @@ -429,6 +438,16 @@ namespace System.Drawing } #endif +#if FEATURE_SYSTEM_EVENTS + private static void OnUserPreferenceChanging(object sender, UserPreferenceChangingEventArgs e) + { + if (e.Category == UserPreferenceCategory.Color && s_colorTable != null) + { + UpdateSystemColors(s_colorTable); + } + } +#endif + private static void UpdateSystemColors(int[] colorTable) { #if FEATURE_WINDOWS_SYSTEM_COLORS diff --git a/external/corefx/src/Common/src/System/Globalization/FormatProvider.Number.cs b/external/corefx/src/Common/src/System/Globalization/FormatProvider.Number.cs index fa92c9cce9..cda92cfcdd 100644 --- a/external/corefx/src/Common/src/System/Globalization/FormatProvider.Number.cs +++ b/external/corefx/src/Common/src/System/Globalization/FormatProvider.Number.cs @@ -1455,8 +1455,7 @@ namespace System.Globalization if (thousandsSepCtr >= thousandsSepPos.Length) { var newThousandsSepPos = new int[thousandsSepPos.Length * 2]; - bool copied = thousandsSepPos.TryCopyTo(newThousandsSepPos); - Debug.Assert(copied, "Expect copy to succeed, as the new array is larger than the original"); + thousandsSepPos.CopyTo(newThousandsSepPos); thousandsSepPos = newThousandsSepPos; } diff --git a/external/corefx/src/Common/src/System/IO/DelegatingStream.cs b/external/corefx/src/Common/src/System/IO/DelegatingStream.cs index 3bb864887f..23dc10ca35 100644 --- a/external/corefx/src/Common/src/System/IO/DelegatingStream.cs +++ b/external/corefx/src/Common/src/System/IO/DelegatingStream.cs @@ -88,9 +88,9 @@ namespace System.Net.Http return _innerStream.Read(buffer, offset, count); } - public override int Read(Span destination) + public override int Read(Span buffer) { - return _innerStream.Read(destination); + return _innerStream.Read(buffer); } public override int ReadByte() @@ -103,9 +103,9 @@ namespace System.Net.Http return _innerStream.ReadAsync(buffer, offset, count, cancellationToken); } - public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default) + public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default) { - return _innerStream.ReadAsync(destination, cancellationToken); + return _innerStream.ReadAsync(buffer, cancellationToken); } public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) @@ -142,9 +142,9 @@ namespace System.Net.Http _innerStream.Write(buffer, offset, count); } - public override void Write(ReadOnlySpan source) + public override void Write(ReadOnlySpan buffer) { - _innerStream.Write(source); + _innerStream.Write(buffer); } public override void WriteByte(byte value) @@ -157,9 +157,9 @@ namespace System.Net.Http return _innerStream.WriteAsync(buffer, offset, count, cancellationToken); } - public override Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default) + public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken = default) { - return _innerStream.WriteAsync(source, cancellationToken); + return _innerStream.WriteAsync(buffer, cancellationToken); } public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) diff --git a/external/corefx/src/Common/src/System/IO/PathInternal.Unix.cs b/external/corefx/src/Common/src/System/IO/PathInternal.Unix.cs index 27424cb2fb..8e27f4b82d 100644 --- a/external/corefx/src/Common/src/System/IO/PathInternal.Unix.cs +++ b/external/corefx/src/Common/src/System/IO/PathInternal.Unix.cs @@ -11,12 +11,6 @@ namespace System.IO /// Contains internal path helpers that are shared between many projects. internal static partial class PathInternal { - // There is only one invalid path character in Unix - private const char InvalidPathChar = '\0'; - internal static char[] GetInvalidPathChars() => new char[] { InvalidPathChar }; - - internal const string ParentDirectoryPrefix = @"../"; - internal static int GetRootLength(ReadOnlySpan path) { return path.Length > 0 && IsDirectorySeparator(path[0]) ? 1 : 0; @@ -30,57 +24,6 @@ namespace System.IO return c == Path.DirectorySeparatorChar; } - /// - /// Normalize separators in the given path. Compresses forward slash runs. - /// - internal static string NormalizeDirectorySeparators(string path) - { - if (string.IsNullOrEmpty(path)) return path; - - // Make a pass to see if we need to normalize so we can potentially skip allocating - bool normalized = true; - - for (int i = 0; i < path.Length; i++) - { - if (IsDirectorySeparator(path[i]) - && (i + 1 < path.Length && IsDirectorySeparator(path[i + 1]))) - { - normalized = false; - break; - } - } - - if (normalized) return path; - - StringBuilder builder = new StringBuilder(path.Length); - - for (int i = 0; i < path.Length; i++) - { - char current = path[i]; - - // Skip if we have another separator following - if (IsDirectorySeparator(current) - && (i + 1 < path.Length && IsDirectorySeparator(path[i + 1]))) - continue; - - builder.Append(current); - } - - return builder.ToString(); - } - - /// - /// Returns true if the character is a directory or volume separator. - /// - /// The character to test. - internal static bool IsDirectoryOrVolumeSeparator(char ch) - { - // The directory separator, volume separator, and the alternate directory - // separator should be the same on Unix, so we only need to check one. - Debug.Assert(Path.DirectorySeparatorChar == Path.AltDirectorySeparatorChar); - Debug.Assert(Path.DirectorySeparatorChar == Path.VolumeSeparatorChar); - return ch == Path.DirectorySeparatorChar; - } internal static bool IsPartiallyQualified(string path) { diff --git a/external/corefx/src/Common/src/System/IO/PathInternal.Windows.cs b/external/corefx/src/Common/src/System/IO/PathInternal.Windows.cs index 1d0dcbaf72..6bc6a0f65d 100644 --- a/external/corefx/src/Common/src/System/IO/PathInternal.Windows.cs +++ b/external/corefx/src/Common/src/System/IO/PathInternal.Windows.cs @@ -2,9 +2,7 @@ // 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.Text; namespace System.IO { @@ -40,38 +38,16 @@ namespace System.IO // Local and Global MS-DOS Device Names // https://msdn.microsoft.com/en-us/library/windows/hardware/ff554302.aspx - internal const string ExtendedPathPrefix = @"\\?\"; + internal const string ExtendedDevicePathPrefix = @"\\?\"; internal const string UncPathPrefix = @"\\"; - internal const string UncExtendedPrefixToInsert = @"?\UNC\"; + internal const string UncDevicePrefixToInsert = @"?\UNC\"; internal const string UncExtendedPathPrefix = @"\\?\UNC\"; internal const string DevicePathPrefix = @"\\.\"; - internal const string ParentDirectoryPrefix = @"..\"; internal const int MaxShortPath = 260; - internal const int MaxShortDirectoryPath = 248; - internal const int MaxLongPath = short.MaxValue; + // \\?\, \\.\, \??\ internal const int DevicePrefixLength = 4; - // \\ - internal const int UncPrefixLength = 2; - // \\?\UNC\, \\.\UNC\ - internal const int UncExtendedPrefixLength = 8; - - internal static char[] GetInvalidPathChars() => new char[] - { - '|', '\0', - (char)1, (char)2, (char)3, (char)4, (char)5, (char)6, (char)7, (char)8, (char)9, (char)10, - (char)11, (char)12, (char)13, (char)14, (char)15, (char)16, (char)17, (char)18, (char)19, (char)20, - (char)21, (char)22, (char)23, (char)24, (char)25, (char)26, (char)27, (char)28, (char)29, (char)30, - (char)31 - }; - - // [MS - FSA] 2.1.4.4 Algorithm for Determining if a FileName Is in an Expression - // https://msdn.microsoft.com/en-us/library/ff469270.aspx - private static readonly char[] s_wildcardChars = - { - '\"', '<', '>', '*', '?' - }; /// /// Returns true if the given character is a valid drive letter @@ -81,13 +57,25 @@ namespace System.IO return ((value >= 'A' && value <= 'Z') || (value >= 'a' && value <= 'z')); } + private static bool EndsWithPeriodOrSpace(string path) + { + if (string.IsNullOrEmpty(path)) + return false; + + char c = path[path.Length - 1]; + return c == ' ' || c == '.'; + } + /// /// Adds the extended path prefix (\\?\) if not already a device path, IF the path is not relative, - /// AND the path is more than 259 characters. (> MAX_PATH + null) + /// AND the path is more than 259 characters. (> MAX_PATH + null). This will also insert the extended + /// prefix if the path ends with a period or a space. Trailing periods and spaces are normally eaten + /// away from paths during normalization, but if we see such a path at this point it should be + /// normalized and has retained the final characters. (Typically from one of the *Info classes) /// - internal static string EnsureExtendedPrefixOverMaxPath(string path) + internal static string EnsureExtendedPrefixIfNeeded(string path) { - if (path != null && path.Length >= MaxShortPath) + if (path != null && (path.Length >= MaxShortPath || EndsWithPeriodOrSpace(path))) { return EnsureExtendedPrefix(path); } @@ -117,9 +105,9 @@ namespace System.IO // Given \\server\share in longpath becomes \\?\UNC\server\share if (path.StartsWith(UncPathPrefix, StringComparison.OrdinalIgnoreCase)) - return path.Insert(2, PathInternal.UncExtendedPrefixToInsert); + return path.Insert(2, UncDevicePrefixToInsert); - return PathInternal.ExtendedPathPrefix + path; + return ExtendedDevicePathPrefix + path; } /// @@ -156,85 +144,57 @@ namespace System.IO && path[3] == '\\'; } - /// - /// Check for known wildcard characters. '*' and '?' are the most common ones. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - internal static unsafe bool HasWildCardCharacters(string path) - { - // Question mark is part of dos device syntax so we have to skip if we are - int startIndex = PathInternal.IsDevice(path) ? ExtendedPathPrefix.Length : 0; - - return path.IndexOfAny(s_wildcardChars, startIndex) >= 0; - } - +#if !NOSPAN /// /// Gets the length of the root of the path (drive, share, etc.). /// - internal static unsafe int GetRootLength(string path) + internal static int GetRootLength(ReadOnlySpan path) { - fixed(char* value = path) - { - return (int)GetRootLength(value, (uint)path.Length); - } - } + int i = 0; + int volumeSeparatorLength = 2; // Length to the colon "C:" + int uncRootLength = 2; // Length to the start of the server name "\\" - private static unsafe uint GetRootLength(char* path, uint pathLength) - { - uint i = 0; - uint volumeSeparatorLength = 2; // Length to the colon "C:" - uint uncRootLength = 2; // Length to the start of the server name "\\" - - bool extendedSyntax = StartsWithOrdinal(path, pathLength, ExtendedPathPrefix); - bool extendedUncSyntax = StartsWithOrdinal(path, pathLength, UncExtendedPathPrefix); + bool extendedSyntax = path.StartsWith(ExtendedDevicePathPrefix); + bool extendedUncSyntax = path.StartsWith(UncExtendedPathPrefix); if (extendedSyntax) { // Shift the position we look for the root from to account for the extended prefix if (extendedUncSyntax) { // "\\" -> "\\?\UNC\" - uncRootLength = (uint)UncExtendedPathPrefix.Length; + uncRootLength = UncExtendedPathPrefix.Length; } else { // "C:" -> "\\?\C:" - volumeSeparatorLength += (uint)ExtendedPathPrefix.Length; + volumeSeparatorLength += ExtendedDevicePathPrefix.Length; } } - if ((!extendedSyntax || extendedUncSyntax) && pathLength > 0 && IsDirectorySeparator(path[0])) + if ((!extendedSyntax || extendedUncSyntax) && path.Length > 0 && IsDirectorySeparator(path[0])) { // UNC or simple rooted path (e.g. "\foo", NOT "\\?\C:\foo") i = 1; // Drive rooted (\foo) is one character - if (extendedUncSyntax || (pathLength > 1 && IsDirectorySeparator(path[1]))) + if (extendedUncSyntax || (path.Length > 1 && IsDirectorySeparator(path[1]))) { // UNC (\\?\UNC\ or \\), scan past the next two directory separators at most // (e.g. to \\?\UNC\Server\Share or \\Server\Share\) i = uncRootLength; int n = 2; // Maximum separators to skip - while (i < pathLength && (!IsDirectorySeparator(path[i]) || --n > 0)) i++; + while (i < path.Length && (!IsDirectorySeparator(path[i]) || --n > 0)) i++; } } - else if (pathLength >= volumeSeparatorLength && path[volumeSeparatorLength - 1] == Path.VolumeSeparatorChar) + else if (path.Length >= volumeSeparatorLength && path[volumeSeparatorLength - 1] == Path.VolumeSeparatorChar) { // Path is at least longer than where we expect a colon, and has a colon (\\?\A:, A:) // If the colon is followed by a directory separator, move past it i = volumeSeparatorLength; - if (pathLength >= volumeSeparatorLength + 1 && IsDirectorySeparator(path[volumeSeparatorLength])) i++; + if (path.Length >= volumeSeparatorLength + 1 && IsDirectorySeparator(path[volumeSeparatorLength])) i++; } return i; } - - private static unsafe bool StartsWithOrdinal(char* source, uint sourceLength, string value) - { - if (sourceLength < (uint)value.Length) return false; - for (int i = 0; i < value.Length; i++) - { - if (value[i] != source[i]) return false; - } - return true; - } + #endif /// /// Returns true if the path specified is relative to the current drive or working directory. @@ -274,29 +234,6 @@ namespace System.IO && IsValidDriveChar(path[0])); } - /// - /// Returns the characters to skip at the start of the path if it starts with space(s) and a drive or directory separator. - /// (examples are " C:", " \") - /// This is a legacy behavior of Path.GetFullPath(). - /// - /// - /// Note that this conflicts with IsPathRooted() which doesn't (and never did) such a skip. - /// - internal static int PathStartSkip(string path) - { - int startIndex = 0; - while (startIndex < path.Length && path[startIndex] == ' ') startIndex++; - - if (startIndex > 0 && (startIndex < path.Length && PathInternal.IsDirectorySeparator(path[startIndex])) - || (startIndex + 1 < path.Length && path[startIndex + 1] == ':' && PathInternal.IsValidDriveChar(path[startIndex]))) - { - // Go ahead and skip spaces as we're either " C:" or " \" - return startIndex; - } - - return 0; - } - /// /// True if the given character is a directory separator. /// @@ -305,105 +242,5 @@ namespace System.IO { return c == Path.DirectorySeparatorChar || c == Path.AltDirectorySeparatorChar; } - - /// - /// Normalize separators in the given path. Converts forward slashes into back slashes and compresses slash runs, keeping initial 2 if present. - /// Also trims initial whitespace in front of "rooted" paths (see PathStartSkip). - /// - /// This effectively replicates the behavior of the legacy NormalizePath when it was called with fullCheck=false and expandShortpaths=false. - /// The current NormalizePath gets directory separator normalization from Win32's GetFullPathName(), which will resolve relative paths and as - /// such can't be used here (and is overkill for our uses). - /// - /// Like the current NormalizePath this will not try and analyze periods/spaces within directory segments. - /// - /// - /// The only callers that used to use Path.Normalize(fullCheck=false) were Path.GetDirectoryName() and Path.GetPathRoot(). Both usages do - /// not need trimming of trailing whitespace here. - /// - /// GetPathRoot() could technically skip normalizing separators after the second segment- consider as a future optimization. - /// - /// For legacy desktop behavior with ExpandShortPaths: - /// - It has no impact on GetPathRoot() so doesn't need consideration. - /// - It could impact GetDirectoryName(), but only if the path isn't relative (C:\ or \\Server\Share). - /// - /// In the case of GetDirectoryName() the ExpandShortPaths behavior was undocumented and provided inconsistent results if the path was - /// fixed/relative. For example: "C:\PROGRA~1\A.TXT" would return "C:\Program Files" while ".\PROGRA~1\A.TXT" would return ".\PROGRA~1". If you - /// ultimately call GetFullPath() this doesn't matter, but if you don't or have any intermediate string handling could easily be tripped up by - /// this undocumented behavior. - /// - /// We won't match this old behavior because: - /// - /// 1. It was undocumented - /// 2. It was costly (extremely so if it actually contained '~') - /// 3. Doesn't play nice with string logic - /// 4. Isn't a cross-plat friendly concept/behavior - /// - internal static string NormalizeDirectorySeparators(string path) - { - if (string.IsNullOrEmpty(path)) return path; - - char current; - int start = PathStartSkip(path); - - if (start == 0) - { - // Make a pass to see if we need to normalize so we can potentially skip allocating - bool normalized = true; - - for (int i = 0; i < path.Length; i++) - { - current = path[i]; - if (IsDirectorySeparator(current) - && (current != Path.DirectorySeparatorChar - // Check for sequential separators past the first position (we need to keep initial two for UNC/extended) - || (i > 0 && i + 1 < path.Length && IsDirectorySeparator(path[i + 1])))) - { - normalized = false; - break; - } - } - - if (normalized) return path; - } - - StringBuilder builder = new StringBuilder(path.Length); - - if (IsDirectorySeparator(path[start])) - { - start++; - builder.Append(Path.DirectorySeparatorChar); - } - - for (int i = start; i < path.Length; i++) - { - current = path[i]; - - // If we have a separator - if (IsDirectorySeparator(current)) - { - // If the next is a separator, skip adding this - if (i + 1 < path.Length && IsDirectorySeparator(path[i + 1])) - { - continue; - } - - // Ensure it is the primary separator - current = Path.DirectorySeparatorChar; - } - - builder.Append(current); - } - - return builder.ToString(); - } - - /// - /// Returns true if the character is a directory or volume separator. - /// - /// The character to test. - internal static bool IsDirectoryOrVolumeSeparator(char ch) - { - return PathInternal.IsDirectorySeparator(ch) || Path.VolumeSeparatorChar == ch; - } } } diff --git a/external/corefx/src/Common/src/System/IO/PathInternal.cs b/external/corefx/src/Common/src/System/IO/PathInternal.cs deleted file mode 100644 index 4d221e01a2..0000000000 --- a/external/corefx/src/Common/src/System/IO/PathInternal.cs +++ /dev/null @@ -1,149 +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.Text; - -namespace System.IO -{ - /// Contains internal path helpers that are shared between many projects. - internal static partial class PathInternal - { - /// - /// Returns true if the given StringBuilder starts with the given value. - /// - /// The string to compare against the start of the StringBuilder. - internal static bool StartsWithOrdinal(this StringBuilder builder, string value) - { - if (value == null || builder.Length < value.Length) - return false; - - for (int i = 0; i < value.Length; i++) - { - if (builder[i] != value[i]) return false; - } - return true; - } - - /// - /// Returns true if the given string starts with the given value. - /// - /// The string to compare against the start of the source string. - internal static bool StartsWithOrdinal(this string source, string value) - { - if (value == null || source.Length < value.Length) - return false; - - return source.StartsWith(value, StringComparison.Ordinal); - } - - /// - /// Trims the specified characters from the end of the StringBuilder. - /// - internal static StringBuilder TrimEnd(this StringBuilder builder, params char[] trimChars) - { - if (trimChars == null || trimChars.Length == 0) - return builder; - - int end = builder.Length - 1; - - for (; end >= 0; end--) - { - int i = 0; - char ch = builder[end]; - for (; i < trimChars.Length; i++) - { - if (trimChars[i] == ch) break; - } - if (i == trimChars.Length) - { - // Not a trim char - break; - } - } - - builder.Length = end + 1; - return builder; - } - - /// - /// Returns true if the path ends in a directory separator. - /// - internal static bool EndsInDirectorySeparator(string path) => - !string.IsNullOrEmpty(path) && IsDirectorySeparator(path[path.Length - 1]); - - /// - /// Get the common path length from the start of the string. - /// - internal static int GetCommonPathLength(string first, string second, bool ignoreCase) - { - int commonChars = EqualStartingCharacterCount(first, second, ignoreCase: ignoreCase); - - // If nothing matches - if (commonChars == 0) - return commonChars; - - // Or we're a full string and equal length or match to a separator - if (commonChars == first.Length - && (commonChars == second.Length || IsDirectorySeparator(second[commonChars]))) - return commonChars; - - if (commonChars == second.Length && IsDirectorySeparator(first[commonChars])) - return commonChars; - - // It's possible we matched somewhere in the middle of a segment e.g. C:\Foodie and C:\Foobar. - while (commonChars > 0 && !IsDirectorySeparator(first[commonChars - 1])) - commonChars--; - - return commonChars; - } - - /// - /// Gets the count of common characters from the left optionally ignoring case - /// - internal static unsafe int EqualStartingCharacterCount(string first, string second, bool ignoreCase) - { - if (string.IsNullOrEmpty(first) || string.IsNullOrEmpty(second)) return 0; - - int commonChars = 0; - - fixed (char* f = first) - fixed (char* s = second) - { - char* l = f; - char* r = s; - char* leftEnd = l + first.Length; - char* rightEnd = r + second.Length; - - while (l != leftEnd && r != rightEnd - && (*l == *r || (ignoreCase && char.ToUpperInvariant((*l)) == char.ToUpperInvariant((*r))))) - { - commonChars++; - l++; - r++; - } - } - - return commonChars; - } - - /// - /// Returns true if the two paths have the same root - /// - internal static bool AreRootsEqual(string first, string second, StringComparison comparisonType) - { - int firstRootLength = GetRootLength(first); - int secondRootLength = GetRootLength(second); - - return firstRootLength == secondRootLength - && string.Compare( - strA: first, - indexA: 0, - strB: second, - indexB: 0, - length: firstRootLength, - comparisonType: comparisonType) == 0; - } - } -} diff --git a/external/corefx/src/Common/src/System/IO/PersistedFiles.Unix.cs b/external/corefx/src/Common/src/System/IO/PersistedFiles.Unix.cs index 243a38323f..d8064af2b7 100644 --- a/external/corefx/src/Common/src/System/IO/PersistedFiles.Unix.cs +++ b/external/corefx/src/Common/src/System/IO/PersistedFiles.Unix.cs @@ -97,7 +97,7 @@ namespace System.IO // if we simply couldn't find a home directory for the current user. // In that case, we pass back the null value and let the caller decide // what to do. - const int BufLen = 1024; + const int BufLen = Interop.Sys.Passwd.InitialBufferSize; byte* stackBuf = stackalloc byte[BufLen]; if (TryGetHomeDirectoryFromPasswd(stackBuf, BufLen, out userHomeDirectory)) return userHomeDirectory; diff --git a/external/corefx/src/Common/src/System/IO/ReadOnlyMemoryStream.cs b/external/corefx/src/Common/src/System/IO/ReadOnlyMemoryStream.cs index 9c240b8e56..0c0f077c35 100644 --- a/external/corefx/src/Common/src/System/IO/ReadOnlyMemoryStream.cs +++ b/external/corefx/src/Common/src/System/IO/ReadOnlyMemoryStream.cs @@ -70,25 +70,25 @@ namespace System.IO return Read(new Span(buffer, offset, count)); } - public override int Read(Span destination) + public override int Read(Span buffer) { int remaining = _content.Length - _position; - if (remaining <= 0 || destination.Length == 0) + if (remaining <= 0 || buffer.Length == 0) { return 0; } - else if (remaining <= destination.Length) + else if (remaining <= buffer.Length) { - _content.Span.Slice(_position).CopyTo(destination); + _content.Span.Slice(_position).CopyTo(buffer); _position = _content.Length; return remaining; } else { - _content.Span.Slice(_position, destination.Length).CopyTo(destination); - _position += destination.Length; - return destination.Length; + _content.Span.Slice(_position, buffer.Length).CopyTo(buffer); + _position += buffer.Length; + return buffer.Length; } } @@ -100,10 +100,10 @@ namespace System.IO Task.FromResult(Read(new Span(buffer, offset, count))); } - public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default(CancellationToken)) => + public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default(CancellationToken)) => cancellationToken.IsCancellationRequested ? new ValueTask(Task.FromCanceled(cancellationToken)) : - new ValueTask(Read(destination.Span)); + new ValueTask(Read(buffer.Span)); public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) => TaskToApm.Begin(ReadAsync(buffer, offset, count), callback, state); @@ -124,7 +124,7 @@ namespace System.IO { StreamHelpers.ValidateCopyToArgs(this, destination, bufferSize); return _content.Length > _position ? - destination.WriteAsync(_content.Slice(_position), cancellationToken) : + destination.WriteAsync(_content.Slice(_position), cancellationToken).AsTask() : Task.CompletedTask; } diff --git a/external/corefx/src/Common/src/System/IO/StringBuilderCache.cs b/external/corefx/src/Common/src/System/IO/StringBuilderCache.cs deleted file mode 100644 index 118090734a..0000000000 --- a/external/corefx/src/Common/src/System/IO/StringBuilderCache.cs +++ /dev/null @@ -1,91 +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. - - -/*============================================================ -** -** -** Purpose: provide a cached reusable instance of stringbuilder -** per thread it's an optimization that reduces the -** number of instances constructed and collected. -** -** Acquire - is used to get a string builder to use of a -** particular size. It can be called any number of -** times, if a stringbuilder is in the cache then -** it will be returned and the cache emptied. -** subsequent calls will return a new stringbuilder. -** -** A StringBuilder instance is cached in -** Thread Local Storage and so there is one per thread -** -** Release - Place the specified builder in the cache if it is -** not too big. -** The stringbuilder should not be used after it has -** been released. -** Unbalanced Releases are perfectly acceptable. It -** will merely cause the runtime to create a new -** stringbuilder next time Acquire is called. -** -** GetStringAndRelease -** - ToString() the stringbuilder, Release it to the -** cache and return the resulting string -** -===========================================================*/ - -using System.Threading; -using System.Text; - -#if MONO -// in MONO we still use reference-sources for the following types which want StringBuilderCache to be under System.Text: -// Version, ApplicationId, BinaryReader.cs, BinaryObjectWriter.cs, DateTimeFormat.cs, String.cs, TimeZoneInfo.cs, TimeSpanFormat.cs, KeyValuePair.cs -// once we move them to corefx we can safely remove this condition and move StringBuilderCache back to System.IO. -namespace System.Text -#else -namespace System.IO -#endif -{ - internal static class StringBuilderCache - { - private const int MAX_BUILDER_SIZE = 260; - private const int DEFAULT_CAPACITY = 16; - - [ThreadStatic] - private static StringBuilder t_cachedInstance; - - public static StringBuilder Acquire(int capacity = DEFAULT_CAPACITY) - { - if (capacity <= MAX_BUILDER_SIZE) - { - StringBuilder sb = StringBuilderCache.t_cachedInstance; - if (sb != null) - { - // Avoid stringbuilder block fragmentation by getting a new StringBuilder - // when the requested size is larger than the current capacity - if (capacity <= sb.Capacity) - { - StringBuilderCache.t_cachedInstance = null; - sb.Clear(); - return sb; - } - } - } - return new StringBuilder(capacity); - } - - public static void Release(StringBuilder sb) - { - if (sb.Capacity <= MAX_BUILDER_SIZE) - { - StringBuilderCache.t_cachedInstance = sb; - } - } - - public static string GetStringAndRelease(StringBuilder sb) - { - string result = sb.ToString(); - Release(sb); - return result; - } - } -} diff --git a/external/corefx/src/Common/src/System/IO/Win32Marshal.cs b/external/corefx/src/Common/src/System/IO/Win32Marshal.cs deleted file mode 100644 index d45b98bdc5..0000000000 --- a/external/corefx/src/Common/src/System/IO/Win32Marshal.cs +++ /dev/null @@ -1,136 +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.Runtime.InteropServices; - -namespace System.IO -{ - /// - /// Provides static methods for converting from Win32 errors codes to exceptions, HRESULTS and error messages. - /// - internal static class Win32Marshal - { - /// - /// Converts, resetting it, the last Win32 error into a corresponding object. - /// - internal static Exception GetExceptionForLastWin32Error() - { - int errorCode = Marshal.GetLastWin32Error(); - return GetExceptionForWin32Error(errorCode, string.Empty); - } - - /// - /// Converts, resetting it, the last Win32 error into a corresponding object, optionally - /// including the specified path in the error message. - /// - internal static Exception GetExceptionForLastWin32Error(string path) - { - int errorCode = Marshal.GetLastWin32Error(); - return GetExceptionForWin32Error(errorCode, path); - } - - /// - /// Converts the specified Win32 error into a corresponding object. - /// - internal static Exception GetExceptionForWin32Error(int errorCode) - { - return GetExceptionForWin32Error(errorCode, string.Empty); - } - - /// - /// Converts the specified Win32 error into a corresponding object, optionally - /// including the specified path in the error message. - /// - internal static Exception GetExceptionForWin32Error(int errorCode, string path) - { - switch (errorCode) - { - case Interop.Errors.ERROR_FILE_NOT_FOUND: - if (path.Length == 0) - return new FileNotFoundException(SR.IO_FileNotFound); - else - return new FileNotFoundException(SR.Format(SR.IO_FileNotFound_FileName, path), path); - - case Interop.Errors.ERROR_PATH_NOT_FOUND: - if (path.Length == 0) - return new DirectoryNotFoundException(SR.IO_PathNotFound_NoPathName); - else - return new DirectoryNotFoundException(SR.Format(SR.IO_PathNotFound_Path, path)); - - case Interop.Errors.ERROR_ACCESS_DENIED: - if (path.Length == 0) - return new UnauthorizedAccessException(SR.UnauthorizedAccess_IODenied_NoPathName); - else - return new UnauthorizedAccessException(SR.Format(SR.UnauthorizedAccess_IODenied_Path, path)); - - case Interop.Errors.ERROR_ALREADY_EXISTS: - if (path.Length == 0) - goto default; - - return new IOException(SR.Format(SR.IO_AlreadyExists_Name, path), MakeHRFromErrorCode(errorCode)); - - case Interop.Errors.ERROR_FILENAME_EXCED_RANGE: - return !string.IsNullOrEmpty(path) ? - new PathTooLongException(SR.Format(SR.IO_PathTooLong_Path, path)) : - new PathTooLongException(SR.IO_PathTooLong); - - case Interop.Errors.ERROR_INVALID_PARAMETER: - return new IOException(GetMessage(errorCode), MakeHRFromErrorCode(errorCode)); - - case Interop.Errors.ERROR_SHARING_VIOLATION: - if (path.Length == 0) - return new IOException(SR.IO_SharingViolation_NoFileName, MakeHRFromErrorCode(errorCode)); - else - return new IOException(SR.Format(SR.IO_SharingViolation_File, path), MakeHRFromErrorCode(errorCode)); - - case Interop.Errors.ERROR_FILE_EXISTS: - if (path.Length == 0) - goto default; - - return new IOException(SR.Format(SR.IO_FileExists_Name, path), MakeHRFromErrorCode(errorCode)); - - case Interop.Errors.ERROR_OPERATION_ABORTED: - return new OperationCanceledException(); - - default: - return new IOException(GetMessage(errorCode), MakeHRFromErrorCode(errorCode)); - } - } - - /// - /// If not already an HRESULT, returns an HRESULT for the specified Win32 error code. - /// - internal static int MakeHRFromErrorCode(int errorCode) - { - // Don't convert it if it is already an HRESULT - if ((0xFFFF0000 & errorCode) != 0) - return errorCode; - - return unchecked(((int)0x80070000) | errorCode); - } - - /// - /// Returns a Win32 error code for the specified HRESULT if it came from FACILITY_WIN32 - /// If not, returns the HRESULT unchanged - /// - internal static int TryMakeWin32ErrorCodeFromHR(int hr) - { - if ((0xFFFF0000 & hr) == 0x80070000) - { - // Win32 error, Win32Marshal.GetExceptionForWin32Error expects the Win32 format - hr &= 0x0000FFFF; - } - - return hr; - } - - /// - /// Returns a string message for the specified Win32 error code. - /// - internal static string GetMessage(int errorCode) - { - return Interop.Kernel32.GetMessage(errorCode); - } - } -} diff --git a/external/corefx/src/Common/src/System/Marvin.cs b/external/corefx/src/Common/src/System/Marvin.cs index ee22d27864..611fc5d51c 100644 --- a/external/corefx/src/Common/src/System/Marvin.cs +++ b/external/corefx/src/Common/src/System/Marvin.cs @@ -4,6 +4,7 @@ using System.Diagnostics; using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; using System.Security.Cryptography; namespace System @@ -30,7 +31,7 @@ namespace System if (data.Length >= sizeof(uint)) { - ReadOnlySpan uData = data.NonPortableCast(); + ReadOnlySpan uData = MemoryMarshal.Cast(data); for (int i = 0; i < uData.Length; i++) { @@ -56,11 +57,11 @@ namespace System break; case 2: - p0 += 0x800000u | data.NonPortableCast()[0]; + p0 += 0x800000u | MemoryMarshal.Cast(data)[0]; break; case 3: - p0 += 0x80000000u | (((uint)data[2]) << 16) | (uint)(data.NonPortableCast()[0]); + p0 += 0x80000000u | (((uint)data[2]) << 16) | (uint)(MemoryMarshal.Cast(data)[0]); break; default: diff --git a/external/corefx/src/System.Memory/Common/src/System/MutableDecimal.cs b/external/corefx/src/Common/src/System/MutableDecimal.cs similarity index 100% rename from external/corefx/src/System.Memory/Common/src/System/MutableDecimal.cs rename to external/corefx/src/Common/src/System/MutableDecimal.cs diff --git a/external/corefx/src/Common/src/System/Net/Http/HttpHandlerDefaults.cs b/external/corefx/src/Common/src/System/Net/Http/HttpHandlerDefaults.cs index 5e82229bd7..e3991bd17f 100644 --- a/external/corefx/src/Common/src/System/Net/Http/HttpHandlerDefaults.cs +++ b/external/corefx/src/Common/src/System/Net/Http/HttpHandlerDefaults.cs @@ -2,6 +2,8 @@ // 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.Threading; + namespace System.Net.Http { /// @@ -11,6 +13,8 @@ namespace System.Net.Http { public const int DefaultMaxAutomaticRedirections = 50; public const int DefaultMaxConnectionsPerServer = int.MaxValue; + public const int DefaultMaxResponseDrainSize = 1024 * 1024; + public static readonly TimeSpan DefaultResponseDrainTimeout = TimeSpan.FromSeconds(2); public const int DefaultMaxResponseHeadersLength = 64; // Units in K (1024) bytes. public const DecompressionMethods DefaultAutomaticDecompression = DecompressionMethods.None; public const bool DefaultAutomaticRedirection = true; @@ -20,7 +24,9 @@ namespace System.Net.Http public const bool DefaultUseProxy = true; public const bool DefaultUseDefaultCredentials = false; public const bool DefaultCheckCertificateRevocationList = false; - - public static TimeSpan DefaultConnectTimeout => TimeSpan.FromSeconds(60); + public static readonly TimeSpan DefaultPooledConnectionLifetime = Timeout.InfiniteTimeSpan; + public static readonly TimeSpan DefaultPooledConnectionIdleTimeout = TimeSpan.FromMinutes(2); + public static readonly TimeSpan DefaultExpect100ContinueTimeout = TimeSpan.FromSeconds(1); + public static readonly TimeSpan DefaultConnectTimeout = Timeout.InfiniteTimeSpan; } } diff --git a/external/corefx/src/Common/src/System/Net/Http/NoWriteNoSeekStreamContent.cs b/external/corefx/src/Common/src/System/Net/Http/NoWriteNoSeekStreamContent.cs index 2d55520f23..202782cc10 100644 --- a/external/corefx/src/Common/src/System/Net/Http/NoWriteNoSeekStreamContent.cs +++ b/external/corefx/src/Common/src/System/Net/Http/NoWriteNoSeekStreamContent.cs @@ -14,10 +14,9 @@ namespace System.Net.Http internal sealed class NoWriteNoSeekStreamContent : HttpContent { private readonly Stream _content; - private readonly CancellationToken _cancellationToken; private bool _contentConsumed; - internal NoWriteNoSeekStreamContent(Stream content, CancellationToken cancellationToken) + internal NoWriteNoSeekStreamContent(Stream content) { Debug.Assert(content != null); Debug.Assert(content.CanRead); @@ -25,10 +24,16 @@ namespace System.Net.Http Debug.Assert(!content.CanSeek); _content = content; - _cancellationToken = cancellationToken; } - protected override Task SerializeToStreamAsync(Stream stream, TransportContext context) + protected override Task SerializeToStreamAsync(Stream stream, TransportContext context) => + SerializeToStreamAsync(stream, context, CancellationToken.None); + + internal +#if HTTP_DLL + override +#endif + Task SerializeToStreamAsync(Stream stream, TransportContext context, CancellationToken cancellationToken) { Debug.Assert(stream != null); @@ -39,7 +44,7 @@ namespace System.Net.Http _contentConsumed = true; const int BufferSize = 8192; - Task copyTask = _content.CopyToAsync(stream, BufferSize, _cancellationToken); + Task copyTask = _content.CopyToAsync(stream, BufferSize, cancellationToken); if (copyTask.IsCompleted) { try { _content.Dispose(); } catch { } // same as StreamToStreamCopy behavior @@ -75,6 +80,10 @@ namespace System.Net.Http base.Dispose(disposing); } - protected override Task CreateContentReadStreamAsync() => Task.FromResult(_content); + protected override Task CreateContentReadStreamAsync() => Task.FromResult(_content); + +#if HTTP_DLL + internal override Stream TryCreateContentReadStream() => _content; +#endif } } diff --git a/external/corefx/src/Common/src/System/Net/HttpStatusDescription.cs b/external/corefx/src/Common/src/System/Net/HttpStatusDescription.cs index a59baadff9..3bbc640fbd 100644 --- a/external/corefx/src/Common/src/System/Net/HttpStatusDescription.cs +++ b/external/corefx/src/Common/src/System/Net/HttpStatusDescription.cs @@ -2,8 +2,6 @@ // 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.Runtime.CompilerServices; - namespace System.Net { internal static class HttpStatusDescription @@ -20,6 +18,7 @@ namespace System.Net case 100: return "Continue"; case 101: return "Switching Protocols"; case 102: return "Processing"; + case 103: return "Early Hints"; case 200: return "OK"; case 201: return "Created"; @@ -29,6 +28,8 @@ namespace System.Net case 205: return "Reset Content"; case 206: return "Partial Content"; case 207: return "Multi-Status"; + case 208: return "Already Reported"; + case 226: return "IM Used"; case 300: return "Multiple Choices"; case 301: return "Moved Permanently"; @@ -37,6 +38,7 @@ namespace System.Net case 304: return "Not Modified"; case 305: return "Use Proxy"; case 307: return "Temporary Redirect"; + case 308: return "Permanent Redirect"; case 400: return "Bad Request"; case 401: return "Unauthorized"; @@ -56,10 +58,15 @@ namespace System.Net case 415: return "Unsupported Media Type"; case 416: return "Requested Range Not Satisfiable"; case 417: return "Expectation Failed"; + case 421: return "Misdirected Request"; case 422: return "Unprocessable Entity"; case 423: return "Locked"; case 424: return "Failed Dependency"; case 426: return "Upgrade Required"; // RFC 2817 + case 428: return "Precondition Required"; + case 429: return "Too Many Requests"; + case 431: return "Request Header Fields Too Large"; + case 451: return "Unavailable For Legal Reasons"; case 500: return "Internal Server Error"; case 501: return "Not Implemented"; @@ -67,7 +74,11 @@ namespace System.Net case 503: return "Service Unavailable"; case 504: return "Gateway Timeout"; case 505: return "Http Version Not Supported"; + case 506: return "Variant Also Negotiates"; case 507: return "Insufficient Storage"; + case 508: return "Loop Detected"; + case 510: return "Not Extended"; + case 511: return "Network Authentication Required"; } return null; } diff --git a/external/corefx/src/Common/src/System/Net/Logging/NetEventSource.Common.cs b/external/corefx/src/Common/src/System/Net/Logging/NetEventSource.Common.cs index de61e61aac..6d3b94e120 100644 --- a/external/corefx/src/Common/src/System/Net/Logging/NetEventSource.Common.cs +++ b/external/corefx/src/Common/src/System/Net/Logging/NetEventSource.Common.cs @@ -75,7 +75,19 @@ namespace System.Net private const int CriticalFailureEventId = 6; private const int DumpArrayEventId = 7; - private const int NextAvailableEventId = 8; // Update this value whenever new events are added. Derived types should base all events off of this to avoid conflicts. + // These events are implemented in NetEventSource.Security.cs. + // Define the ids here so that projects that include NetEventSource.Security.cs will not have conflicts. + private const int EnumerateSecurityPackagesId = 8; + private const int SspiPackageNotFoundId = 9; + private const int AcquireDefaultCredentialId = 10; + private const int AcquireCredentialsHandleId = 11; + private const int InitializeSecurityContextId = 12; + private const int SecurityContextInputBufferId = 13; + private const int SecurityContextInputBuffersId = 14; + private const int AcceptSecuritContextId = 15; + private const int OperationReturnedSomethingId = 16; + + private const int NextAvailableEventId = 17; // Update this value whenever new events are added. Derived types should base all events off of this to avoid conflicts. #endregion #region Events @@ -395,7 +407,9 @@ namespace System.Net Debug.Assert(IsEnabled || arg == null, $"Should not be formatting FormattableString \"{arg}\" if tracing isn't enabled"); } - public static new bool IsEnabled => Log.IsEnabled(); + public static new bool IsEnabled => + Log.IsEnabled(); + //true; // uncomment for debugging only [NonEvent] public static string IdOf(object value) => value != null ? value.GetType().Name + "#" + GetHashCode(value) : NullInstance; @@ -502,17 +516,26 @@ namespace System.Net const int NumEventDatas = 4; var descrs = stackalloc EventData[NumEventDatas]; - descrs[0].DataPointer = (IntPtr)string1Bytes; - descrs[0].Size = ((arg1.Length + 1) * 2); - - descrs[1].DataPointer = (IntPtr)string2Bytes; - descrs[1].Size = ((arg2.Length + 1) * 2); - - descrs[2].DataPointer = (IntPtr)string3Bytes; - descrs[2].Size = ((arg3.Length + 1) * 2); - - descrs[3].DataPointer = (IntPtr)string4Bytes; - descrs[3].Size = ((arg4.Length + 1) * 2); + descrs[0] = new EventData + { + DataPointer = (IntPtr)string1Bytes, + Size = ((arg1.Length + 1) * 2) + }; + descrs[1] = new EventData + { + DataPointer = (IntPtr)string2Bytes, + Size = ((arg2.Length + 1) * 2) + }; + descrs[2] = new EventData + { + DataPointer = (IntPtr)string3Bytes, + Size = ((arg3.Length + 1) * 2) + }; + descrs[3] = new EventData + { + DataPointer = (IntPtr)string4Bytes, + Size = ((arg4.Length + 1) * 2) + }; WriteEventCore(eventId, NumEventDatas, descrs); } @@ -536,17 +559,26 @@ namespace System.Net const int NumEventDatas = 4; var descrs = stackalloc EventData[NumEventDatas]; - descrs[0].DataPointer = (IntPtr)arg1Ptr; - descrs[0].Size = (arg1.Length + 1) * sizeof(char); - - descrs[1].DataPointer = (IntPtr)arg2Ptr; - descrs[1].Size = (arg2.Length + 1) * sizeof(char); - - descrs[2].DataPointer = (IntPtr)(&bufferLength); - descrs[2].Size = 4; - - descrs[3].DataPointer = (IntPtr)arg3Ptr; - descrs[3].Size = bufferLength; + descrs[0] = new EventData + { + DataPointer = (IntPtr)arg1Ptr, + Size = (arg1.Length + 1) * sizeof(char) + }; + descrs[1] = new EventData + { + DataPointer = (IntPtr)arg2Ptr, + Size = (arg2.Length + 1) * sizeof(char) + }; + descrs[2] = new EventData + { + DataPointer = (IntPtr)(&bufferLength), + Size = 4 + }; + descrs[3] = new EventData + { + DataPointer = (IntPtr)arg3Ptr, + Size = bufferLength + }; WriteEventCore(eventId, NumEventDatas, descrs); } @@ -565,17 +597,26 @@ namespace System.Net const int NumEventDatas = 4; var descrs = stackalloc EventData[NumEventDatas]; - descrs[0].DataPointer = (IntPtr)(arg1Ptr); - descrs[0].Size = (arg1.Length + 1) * sizeof(char); - - descrs[1].DataPointer = (IntPtr)(&arg2); - descrs[1].Size = sizeof(int); - - descrs[2].DataPointer = (IntPtr)(&arg3); - descrs[2].Size = sizeof(int); - - descrs[3].DataPointer = (IntPtr)(&arg4); - descrs[3].Size = sizeof(int); + descrs[0] = new EventData + { + DataPointer = (IntPtr)(arg1Ptr), + Size = (arg1.Length + 1) * sizeof(char) + }; + descrs[1] = new EventData + { + DataPointer = (IntPtr)(&arg2), + Size = sizeof(int) + }; + descrs[2] = new EventData + { + DataPointer = (IntPtr)(&arg3), + Size = sizeof(int) + }; + descrs[3] = new EventData + { + DataPointer = (IntPtr)(&arg4), + Size = sizeof(int) + }; WriteEventCore(eventId, NumEventDatas, descrs); } @@ -596,14 +637,21 @@ namespace System.Net const int NumEventDatas = 3; var descrs = stackalloc EventData[NumEventDatas]; - descrs[0].DataPointer = (IntPtr)(arg1Ptr); - descrs[0].Size = (arg1.Length + 1) * sizeof(char); - - descrs[1].DataPointer = (IntPtr)(&arg2); - descrs[1].Size = sizeof(int); - - descrs[2].DataPointer = (IntPtr)(arg3Ptr); - descrs[2].Size = (arg3.Length + 1) * sizeof(char); + descrs[0] = new EventData + { + DataPointer = (IntPtr)(arg1Ptr), + Size = (arg1.Length + 1) * sizeof(char) + }; + descrs[1] = new EventData + { + DataPointer = (IntPtr)(&arg2), + Size = sizeof(int) + }; + descrs[2] = new EventData + { + DataPointer = (IntPtr)(arg3Ptr), + Size = (arg3.Length + 1) * sizeof(char) + }; WriteEventCore(eventId, NumEventDatas, descrs); } @@ -624,14 +672,21 @@ namespace System.Net const int NumEventDatas = 3; var descrs = stackalloc EventData[NumEventDatas]; - descrs[0].DataPointer = (IntPtr)(arg1Ptr); - descrs[0].Size = (arg1.Length + 1) * sizeof(char); - - descrs[1].DataPointer = (IntPtr)(arg2Ptr); - descrs[1].Size = (arg2.Length + 1) * sizeof(char); - - descrs[2].DataPointer = (IntPtr)(&arg3); - descrs[2].Size = sizeof(int); + descrs[0] = new EventData + { + DataPointer = (IntPtr)(arg1Ptr), + Size = (arg1.Length + 1) * sizeof(char) + }; + descrs[1] = new EventData + { + DataPointer = (IntPtr)(arg2Ptr), + Size = (arg2.Length + 1) * sizeof(char) + }; + descrs[2] = new EventData + { + DataPointer = (IntPtr)(&arg3), + Size = sizeof(int) + }; WriteEventCore(eventId, NumEventDatas, descrs); } @@ -654,17 +709,26 @@ namespace System.Net const int NumEventDatas = 4; var descrs = stackalloc EventData[NumEventDatas]; - descrs[0].DataPointer = (IntPtr)(arg1Ptr); - descrs[0].Size = (arg1.Length + 1) * sizeof(char); - - descrs[1].DataPointer = (IntPtr)(arg2Ptr); - descrs[1].Size = (arg2.Length + 1) * sizeof(char); - - descrs[2].DataPointer = (IntPtr)(arg3Ptr); - descrs[2].Size = (arg3.Length + 1) * sizeof(char); - - descrs[3].DataPointer = (IntPtr)(&arg4); - descrs[3].Size = sizeof(int); + descrs[0] = new EventData + { + DataPointer = (IntPtr)(arg1Ptr), + Size = (arg1.Length + 1) * sizeof(char) + }; + descrs[1] = new EventData + { + DataPointer = (IntPtr)(arg2Ptr), + Size = (arg2.Length + 1) * sizeof(char) + }; + descrs[2] = new EventData + { + DataPointer = (IntPtr)(arg3Ptr), + Size = (arg3.Length + 1) * sizeof(char) + }; + descrs[3] = new EventData + { + DataPointer = (IntPtr)(&arg4), + Size = sizeof(int) + }; WriteEventCore(eventId, NumEventDatas, descrs); } diff --git a/external/corefx/src/Common/src/System/Net/NTAuthentication.Common.cs b/external/corefx/src/Common/src/System/Net/NTAuthentication.Common.cs index 7ba6afb4b3..84916e3fd2 100644 --- a/external/corefx/src/Common/src/System/Net/NTAuthentication.Common.cs +++ b/external/corefx/src/Common/src/System/Net/NTAuthentication.Common.cs @@ -214,22 +214,22 @@ namespace System.Net { if (NetEventSource.IsEnabled) NetEventSource.Enter(this, incomingBlob); - var list = new List(2); - - if (incomingBlob != null) - { - list.Add(new SecurityBuffer(incomingBlob, SecurityBufferType.SECBUFFER_TOKEN)); - } - - if (_channelBinding != null) - { - list.Add(new SecurityBuffer(_channelBinding)); - } - SecurityBuffer[] inSecurityBufferArray = null; - if (list.Count > 0) + if (incomingBlob != null && _channelBinding != null) { - inSecurityBufferArray = list.ToArray(); + inSecurityBufferArray = new SecurityBuffer[2] + { + new SecurityBuffer(incomingBlob, SecurityBufferType.SECBUFFER_TOKEN), + new SecurityBuffer(_channelBinding) + }; + } + else if (incomingBlob != null) + { + inSecurityBufferArray = new SecurityBuffer[1] { new SecurityBuffer(incomingBlob, SecurityBufferType.SECBUFFER_TOKEN) }; + } + else if (_channelBinding != null) + { + inSecurityBufferArray = new SecurityBuffer[1] { new SecurityBuffer(_channelBinding) }; } var outSecurityBuffer = new SecurityBuffer(_tokenSize, SecurityBufferType.SECBUFFER_TOKEN); diff --git a/external/corefx/src/Common/src/System/Net/NetworkInformation/UnixCommandLinePing.cs b/external/corefx/src/Common/src/System/Net/NetworkInformation/UnixCommandLinePing.cs index e18c29e67a..499ed10120 100644 --- a/external/corefx/src/Common/src/System/Net/NetworkInformation/UnixCommandLinePing.cs +++ b/external/corefx/src/Common/src/System/Net/NetworkInformation/UnixCommandLinePing.cs @@ -2,6 +2,7 @@ // 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.Globalization; using System.IO; using System.Text; @@ -88,7 +89,7 @@ namespace System.Net.NetworkInformation int msIndex = pingOutput.IndexOf("ms", afterTime); int numLength = msIndex - afterTime - 1; string timeSubstring = pingOutput.Substring(afterTime, numLength); - double parsedRtt = double.Parse(timeSubstring); + double parsedRtt = double.Parse(timeSubstring, CultureInfo.InvariantCulture); return (long)Math.Round(parsedRtt); } } diff --git a/external/corefx/src/Common/src/System/Net/SafeCloseSocket.Unix.cs b/external/corefx/src/Common/src/System/Net/SafeCloseSocket.Unix.cs index 510ac6aef7..e4cc09b3f5 100644 --- a/external/corefx/src/Common/src/System/Net/SafeCloseSocket.Unix.cs +++ b/external/corefx/src/Common/src/System/Net/SafeCloseSocket.Unix.cs @@ -157,14 +157,6 @@ namespace System.Net.Sockets set { Debug.Assert(value == -1 || value > 0, $"Unexpected value: {value}"); - - // We always implement timeouts using nonblocking I/O and AsyncContext, - // to avoid issues when switching from blocking I/O to nonblocking. - if (value != -1) - { - SetHandleNonBlocking(); - } - _receiveTimeout = value; } } @@ -178,14 +170,6 @@ namespace System.Net.Sockets set { Debug.Assert(value == -1 || value > 0, $"Unexpected value: {value}"); - - // We always implement timeouts using nonblocking I/O and AsyncContext, - // to avoid issues when switching from blocking I/O to nonblocking. - if (value != -1) - { - SetHandleNonBlocking(); - } - _sendTimeout = value; } } @@ -349,7 +333,7 @@ namespace System.Net.Sockets IntPtr acceptedFd; if (!socketHandle.IsNonBlocking) { - errorCode = socketHandle.AsyncContext.Accept(socketAddress, ref socketAddressLen, -1, out acceptedFd); + errorCode = socketHandle.AsyncContext.Accept(socketAddress, ref socketAddressLen, out acceptedFd); } else { diff --git a/external/corefx/src/Common/src/System/Net/SafeCloseSocket.Windows.cs b/external/corefx/src/Common/src/System/Net/SafeCloseSocket.Windows.cs index 778e9bd300..b1ae33243e 100644 --- a/external/corefx/src/Common/src/System/Net/SafeCloseSocket.Windows.cs +++ b/external/corefx/src/Common/src/System/Net/SafeCloseSocket.Windows.cs @@ -30,20 +30,10 @@ namespace System.Net.Sockets } } + public ThreadPoolBoundHandle GetThreadPoolBoundHandle() => !_released ? _iocpBoundHandle : null; + // Binds the Socket Win32 Handle to the ThreadPool's CompletionPort. public ThreadPoolBoundHandle GetOrAllocateThreadPoolBoundHandle(bool trySkipCompletionPortOnSuccess) - { - // Check to see if the socket native _handle is already - // bound to the ThreadPool's completion port. - if (_released || _iocpBoundHandle == null) - { - GetOrAllocateThreadPoolBoundHandleSlow(trySkipCompletionPortOnSuccess); - } - - return _iocpBoundHandle; - } - - private void GetOrAllocateThreadPoolBoundHandleSlow(bool trySkipCompletionPortOnSuccess) { if (_released) { @@ -51,14 +41,20 @@ namespace System.Net.Sockets throw new ObjectDisposedException(typeof(Socket).FullName); } + if (_iocpBoundHandle != null) + { + return _iocpBoundHandle; + } + lock (_iocpBindingLock) { - if (_iocpBoundHandle == null) + ThreadPoolBoundHandle boundHandle = _iocpBoundHandle; + + if (boundHandle == null) { // Bind the socket native _handle to the ThreadPool. if (NetEventSource.IsEnabled) NetEventSource.Info(this, "calling ThreadPool.BindHandle()"); - ThreadPoolBoundHandle boundHandle; try { // The handle (this) may have been already released: @@ -80,8 +76,10 @@ namespace System.Net.Sockets } // Don't set this until after we've configured the handle above (if we did) - _iocpBoundHandle = boundHandle; + Volatile.Write(ref _iocpBoundHandle, boundHandle); } + + return boundHandle; } } diff --git a/external/corefx/src/Common/src/System/Net/Security/CertificateHelper.Unix.cs b/external/corefx/src/Common/src/System/Net/Security/CertificateHelper.Unix.cs new file mode 100644 index 0000000000..3cc48f9662 --- /dev/null +++ b/external/corefx/src/Common/src/System/Net/Security/CertificateHelper.Unix.cs @@ -0,0 +1,24 @@ +// 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.Security.Cryptography.X509Certificates; + +namespace System.Net.Security +{ + internal static partial class CertificateHelper + { + internal static X509Certificate2 GetEligibleClientCertificate() + { + // Get initial list of client certificates from the MY store. + X509Certificate2Collection candidateCerts; + using (var myStore = new X509Store(StoreName.My, StoreLocation.CurrentUser)) + { + myStore.Open(OpenFlags.ReadOnly); + candidateCerts = myStore.Certificates; + } + + return GetEligibleClientCertificate(candidateCerts); + } + } +} diff --git a/external/corefx/src/Common/src/System/Net/Security/CertificateHelper.Windows.cs b/external/corefx/src/Common/src/System/Net/Security/CertificateHelper.Windows.cs index dd89e581c9..6692678c57 100644 --- a/external/corefx/src/Common/src/System/Net/Security/CertificateHelper.Windows.cs +++ b/external/corefx/src/Common/src/System/Net/Security/CertificateHelper.Windows.cs @@ -2,9 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.Win32.SafeHandles; -using System.Diagnostics; -using System.Globalization; using System.Security.Cryptography.X509Certificates; namespace System.Net.Security diff --git a/external/corefx/src/Common/src/System/Net/Security/CertificateValidation.Unix.cs b/external/corefx/src/Common/src/System/Net/Security/CertificateValidation.Unix.cs index bf4e092a20..a6cb181512 100644 --- a/external/corefx/src/Common/src/System/Net/Security/CertificateValidation.Unix.cs +++ b/external/corefx/src/Common/src/System/Net/Security/CertificateValidation.Unix.cs @@ -11,6 +11,8 @@ namespace System.Net.Security { internal static class CertificateValidation { + private static readonly IdnMapping s_idnMapping = new IdnMapping(); + internal static SslPolicyErrors BuildChainAndVerifyProperties(X509Chain chain, X509Certificate2 remoteCertificate, bool checkCertName, string hostName) { SslPolicyErrors errors = chain.Build(remoteCertificate) ? @@ -41,8 +43,7 @@ namespace System.Net.Security // The IdnMapping converts Unicode input into the IDNA punycode sequence. // It also does host case normalization. The bypass logic would be something // like "all characters being within [a-z0-9.-]+" - // Since it's not documented as being thread safe, create a new one each time. - string matchName = new IdnMapping().GetAscii(hostName); + string matchName = s_idnMapping.GetAscii(hostName); hostNameMatch = Interop.Crypto.CheckX509Hostname(certHandle, matchName, matchName.Length); } } diff --git a/external/corefx/src/Common/src/System/Net/Security/NetEventSource.Security.cs b/external/corefx/src/Common/src/System/Net/Security/NetEventSource.Security.cs index f7dc49a27d..b003ce8b7e 100644 --- a/external/corefx/src/Common/src/System/Net/Security/NetEventSource.Security.cs +++ b/external/corefx/src/Common/src/System/Net/Security/NetEventSource.Security.cs @@ -13,15 +13,7 @@ namespace System.Net //TODO: If localization resources are not found, logging does not work. Issue #5126. internal sealed partial class NetEventSource { - private const int EnumerateSecurityPackagesId = NextAvailableEventId; - private const int SspiPackageNotFoundId = EnumerateSecurityPackagesId + 1; - private const int AcquireDefaultCredentialId = SspiPackageNotFoundId + 1; - private const int AcquireCredentialsHandleId = AcquireDefaultCredentialId + 1; - private const int InitializeSecurityContextId = AcquireCredentialsHandleId + 1; - private const int SecurityContextInputBufferId = InitializeSecurityContextId + 1; - private const int SecurityContextInputBuffersId = SecurityContextInputBufferId + 1; - private const int AcceptSecuritContextId = SecurityContextInputBuffersId + 1; - private const int OperationReturnedSomethingId = AcceptSecuritContextId + 1; + // Event ids are defined in NetEventSource.Common.cs. [Event(EnumerateSecurityPackagesId, Keywords = Keywords.Default, Level = EventLevel.Informational)] public void EnumerateSecurityPackages(string securityPackage) diff --git a/external/corefx/src/Common/src/System/Net/Security/SslClientAuthenticationOptionsExtensions.cs b/external/corefx/src/Common/src/System/Net/Security/SslClientAuthenticationOptionsExtensions.cs new file mode 100644 index 0000000000..b3296a0907 --- /dev/null +++ b/external/corefx/src/Common/src/System/Net/Security/SslClientAuthenticationOptionsExtensions.cs @@ -0,0 +1,23 @@ +// 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.Net.Security +{ + internal static class SslClientAuthenticationOptionsExtensions + { + public static SslClientAuthenticationOptions ShallowClone(this SslClientAuthenticationOptions options) => + new SslClientAuthenticationOptions() + { + AllowRenegotiation = options.AllowRenegotiation, + ApplicationProtocols = options.ApplicationProtocols, + CertificateRevocationCheckMode = options.CertificateRevocationCheckMode, + ClientCertificates = options.ClientCertificates, + EnabledSslProtocols = options.EnabledSslProtocols, + EncryptionPolicy = options.EncryptionPolicy, + LocalCertificateSelectionCallback = options.LocalCertificateSelectionCallback, + RemoteCertificateValidationCallback = options.RemoteCertificateValidationCallback, + TargetHost = options.TargetHost + }; + } +} diff --git a/external/corefx/src/Common/src/System/Net/SecurityProtocol.cs b/external/corefx/src/Common/src/System/Net/SecurityProtocol.cs index beeba086ea..7d9565d92c 100644 --- a/external/corefx/src/Common/src/System/Net/SecurityProtocol.cs +++ b/external/corefx/src/Common/src/System/Net/SecurityProtocol.cs @@ -8,21 +8,8 @@ namespace System.Net { internal static class SecurityProtocol { - // SSLv2 and SSLv3 are considered insecure and will not be supported by the underlying implementations. - public const SslProtocols AllowedSecurityProtocols = - SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12; - - public const SslProtocols DefaultSecurityProtocols = - SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12; + public const SslProtocols DefaultSecurityProtocols = SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12; public const SslProtocols SystemDefaultSecurityProtocols = SslProtocols.None; - - public static void ThrowOnNotAllowed(SslProtocols protocols, bool allowNone = true) - { - if ((!allowNone && (protocols == SslProtocols.None)) || ((protocols & ~AllowedSecurityProtocols) != 0)) - { - throw new NotSupportedException(SR.net_securityprotocolnotsupported); - } - } } } diff --git a/external/corefx/src/Common/src/System/Net/SocketAddressPal.Unix.cs b/external/corefx/src/Common/src/System/Net/SocketAddressPal.Unix.cs index f7eaf04fbd..94360635e2 100644 --- a/external/corefx/src/Common/src/System/Net/SocketAddressPal.Unix.cs +++ b/external/corefx/src/Common/src/System/Net/SocketAddressPal.Unix.cs @@ -102,11 +102,11 @@ namespace System.Net ThrowOnFailure(err); } - public static unsafe uint GetIPv4Address(byte[] buffer) + public static unsafe uint GetIPv4Address(ReadOnlySpan buffer) { uint ipAddress; Interop.Error err; - fixed (byte* rawAddress = buffer) + fixed (byte* rawAddress = &MemoryMarshal.GetReference(buffer)) { err = Interop.Sys.GetIPv4Address(rawAddress, buffer.Length, &ipAddress); } @@ -115,11 +115,11 @@ namespace System.Net return ipAddress; } - public static unsafe void GetIPv6Address(byte[] buffer, Span address, out uint scope) + public static unsafe void GetIPv6Address(ReadOnlySpan buffer, Span address, out uint scope) { uint localScope; Interop.Error err; - fixed (byte* rawAddress = buffer) + fixed (byte* rawAddress = &MemoryMarshal.GetReference(buffer)) fixed (byte* ipAddress = &MemoryMarshal.GetReference(address)) { err = Interop.Sys.GetIPv6Address(rawAddress, buffer.Length, ipAddress, address.Length, &localScope); diff --git a/external/corefx/src/Common/src/System/Net/SocketAddressPal.Windows.cs b/external/corefx/src/Common/src/System/Net/SocketAddressPal.Windows.cs index 32685d4882..404a381ae8 100644 --- a/external/corefx/src/Common/src/System/Net/SocketAddressPal.Windows.cs +++ b/external/corefx/src/Common/src/System/Net/SocketAddressPal.Windows.cs @@ -38,7 +38,7 @@ namespace System.Net port.HostToNetworkBytes(buffer, 2); } - public static unsafe uint GetIPv4Address(byte[] buffer) + public static unsafe uint GetIPv4Address(ReadOnlySpan buffer) { unchecked { @@ -49,7 +49,7 @@ namespace System.Net } } - public static unsafe void GetIPv6Address(byte[] buffer, Span address, out uint scope) + public static unsafe void GetIPv6Address(ReadOnlySpan buffer, Span address, out uint scope) { for (int i = 0; i < address.Length; i++) { diff --git a/external/corefx/src/Common/src/System/Net/Sockets/SocketErrorPal.Unix.cs b/external/corefx/src/Common/src/System/Net/Sockets/SocketErrorPal.Unix.cs index f155615bd8..fa1035ce6d 100644 --- a/external/corefx/src/Common/src/System/Net/Sockets/SocketErrorPal.Unix.cs +++ b/external/corefx/src/Common/src/System/Net/Sockets/SocketErrorPal.Unix.cs @@ -40,7 +40,7 @@ namespace System.Net.Sockets { Interop.Error.EAFNOSUPPORT, SocketError.AddressFamilyNotSupported }, { Interop.Error.EAGAIN, SocketError.WouldBlock }, { Interop.Error.EALREADY, SocketError.AlreadyInProgress }, - { Interop.Error.EBADF, SocketError.InvalidArgument }, + { Interop.Error.EBADF, SocketError.OperationAborted }, { Interop.Error.ECANCELED, SocketError.OperationAborted }, { Interop.Error.ECONNABORTED, SocketError.ConnectionAborted }, { Interop.Error.ECONNREFUSED, SocketError.ConnectionRefused }, @@ -101,7 +101,7 @@ namespace System.Net.Sockets { SocketError.HostUnreachable, Interop.Error.EHOSTUNREACH }, { SocketError.InProgress, Interop.Error.EINPROGRESS }, { SocketError.Interrupted, Interop.Error.EINTR }, - { SocketError.InvalidArgument, Interop.Error.EINVAL }, // could also have been EBADF, though that's logically an invalid argument + { SocketError.InvalidArgument, Interop.Error.EINVAL }, { SocketError.IOPending, Interop.Error.EINPROGRESS }, { SocketError.IsConnected, Interop.Error.EISCONN }, { SocketError.MessageSize, Interop.Error.EMSGSIZE }, diff --git a/external/corefx/src/Common/src/System/Net/WebSockets/ManagedWebSocket.cs b/external/corefx/src/Common/src/System/Net/WebSockets/ManagedWebSocket.cs index b0938c5a6a..492c8cb63f 100644 --- a/external/corefx/src/Common/src/System/Net/WebSockets/ManagedWebSocket.cs +++ b/external/corefx/src/Common/src/System/Net/WebSockets/ManagedWebSocket.cs @@ -31,13 +31,11 @@ namespace System.Net.WebSockets /// true if this is the server-side of the connection; false if this is the client-side of the connection. /// The agreed upon subprotocol for the connection. /// The interval to use for keep-alive pings. - /// The buffer size to use for received data. - /// Optional buffer to use for receives. /// The created instance. public static ManagedWebSocket CreateFromConnectedStream( - Stream stream, bool isServer, string subprotocol, TimeSpan keepAliveInterval, Memory buffer) + Stream stream, bool isServer, string subprotocol, TimeSpan keepAliveInterval) { - return new ManagedWebSocket(stream, isServer, subprotocol, keepAliveInterval, buffer); + return new ManagedWebSocket(stream, isServer, subprotocol, keepAliveInterval); } /// Thread-safe random number generator used to generate masks for each send. @@ -63,8 +61,6 @@ namespace System.Net.WebSockets private const int MaxControlPayloadLength = 125; /// Length of the mask XOR'd with the payload data. private const int MaskLength = 4; - /// Default length of a receive buffer to create when an invalid scratch buffer is provided. - private const int DefaultReceiveBufferSize = 0x1000; /// The stream used to communicate with the remote server. private readonly Stream _stream; @@ -88,10 +84,7 @@ namespace System.Net.WebSockets /// private readonly Utf8MessageState _utf8TextState = new Utf8MessageState(); /// - /// Semaphore used to ensure that calls to SendFrameAsync don't run concurrently. While - /// is used to fail if a caller tries to issue another SendAsync while a previous one is running, internally - /// we use SendFrameAsync as an implementation detail, and it should not cause user requests to SendAsync to fail, - /// nor should such internal usage be allowed to run concurrently with other internal usage or with SendAsync. + /// Semaphore used to ensure that calls to SendFrameAsync don't run concurrently. /// private readonly SemaphoreSlim _sendFrameAsyncLock = new SemaphoreSlim(1, 1); @@ -145,15 +138,10 @@ namespace System.Net.WebSockets /// private bool _lastSendWasFragment; /// - /// The task returned from the last SendAsync operation to not complete synchronously. - /// If this is not null and not completed when a subsequent SendAsync is issued, an exception occurs. - /// - private Task _lastSendAsync; - /// - /// The task returned from the last ReceiveAsync operation to not complete synchronously. + /// The task returned from the last ReceiveAsync(ArraySegment, ...) operation to not complete synchronously. /// If this is not null and not completed when a subsequent ReceiveAsync is issued, an exception occurs. /// - private Task _lastReceiveAsync; + private Task _lastReceiveAsync = Task.CompletedTask; /// Lock used to protect update and check-and-update operations on _state. private object StateUpdateLock => _abortSource; @@ -169,9 +157,7 @@ namespace System.Net.WebSockets /// true if this is the server-side of the connection; false if this is the client-side of the connection. /// The agreed upon subprotocol for the connection. /// The interval to use for keep-alive pings. - /// The buffer size to use for received data. - /// Optional buffer to use for receives - private ManagedWebSocket(Stream stream, bool isServer, string subprotocol, TimeSpan keepAliveInterval, Memory buffer) + private ManagedWebSocket(Stream stream, bool isServer, string subprotocol, TimeSpan keepAliveInterval) { Debug.Assert(StateUpdateLock != null, $"Expected {nameof(StateUpdateLock)} to be non-null"); Debug.Assert(ReceiveAsyncLock != null, $"Expected {nameof(ReceiveAsyncLock)} to be non-null"); @@ -186,14 +172,11 @@ namespace System.Net.WebSockets _isServer = isServer; _subprotocol = subprotocol; - // If we were provided with a buffer to use, use it as long as it's big enough for our needs. - // If it doesn't meet our criteria, just create a new one. If we need to create a new one, - // we avoid using the pool because often many web sockets will be used concurrently, and if each web - // socket rents a similarly sized buffer from the pool for its duration, we'll end up draining - // the pool, such that other web sockets will allocate anyway, as will anyone else in the process using the - // pool. If someone wants to pool, they can do so by passing in the buffer they want to use, and they can - // get it from whatever pool they like. - _receiveBuffer = buffer.Length >= MaxMessageHeaderLength ? buffer : new byte[DefaultReceiveBufferSize]; + // Create a buffer just large enough to handle received packet headers (at most 14 bytes) and + // control payloads (at most 125 bytes). Message payloads are read directly into the buffer + // supplied to ReceiveAsync. + const int ReceiveBufferMinLength = MaxControlPayloadLength; + _receiveBuffer = new byte[ReceiveBufferMinLength]; // Set up the abort source so that if it's triggered, we transition the instance appropriately. _abortSource.Token.Register(s => @@ -262,10 +245,10 @@ namespace System.Net.WebSockets WebSocketValidate.ValidateArraySegment(buffer, nameof(buffer)); - return SendPrivateAsync((ReadOnlyMemory)buffer, messageType, endOfMessage, cancellationToken); + return SendPrivateAsync((ReadOnlyMemory)buffer, messageType, endOfMessage, cancellationToken).AsTask(); } - private Task SendPrivateAsync(ReadOnlyMemory buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken) + private ValueTask SendPrivateAsync(ReadOnlyMemory buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken) { if (messageType != WebSocketMessageType.Text && messageType != WebSocketMessageType.Binary) { @@ -278,11 +261,10 @@ namespace System.Net.WebSockets try { WebSocketValidate.ThrowIfInvalidState(_state, _disposed, s_validSendStates); - ThrowIfOperationInProgress(_lastSendAsync); } catch (Exception exc) { - return Task.FromException(exc); + return new ValueTask(Task.FromException(exc)); } MessageOpcode opcode = @@ -290,9 +272,8 @@ namespace System.Net.WebSockets messageType == WebSocketMessageType.Binary ? MessageOpcode.Binary : MessageOpcode.Text; - Task t = SendFrameAsync(opcode, endOfMessage, buffer, cancellationToken); + ValueTask t = SendFrameAsync(opcode, endOfMessage, buffer, cancellationToken); _lastSendWasFragment = !endOfMessage; - _lastSendAsync = t; return t; } @@ -307,7 +288,7 @@ namespace System.Net.WebSockets Debug.Assert(!Monitor.IsEntered(StateUpdateLock), $"{nameof(StateUpdateLock)} must never be held when acquiring {nameof(ReceiveAsyncLock)}"); lock (ReceiveAsyncLock) // synchronize with receives in CloseAsync { - ThrowIfOperationInProgress(_lastReceiveAsync); + ThrowIfOperationInProgress(_lastReceiveAsync.IsCompleted); Task t = ReceiveAsyncPrivate(buffer, cancellationToken).AsTask(); _lastReceiveAsync = t; return t; @@ -362,23 +343,14 @@ namespace System.Net.WebSockets /// The value of the FIN bit for the message. /// The buffer containing the payload data fro the message. /// The CancellationToken to use to cancel the websocket. - private Task SendFrameAsync(MessageOpcode opcode, bool endOfMessage, ReadOnlyMemory payloadBuffer, CancellationToken cancellationToken) + private ValueTask SendFrameAsync(MessageOpcode opcode, bool endOfMessage, ReadOnlyMemory payloadBuffer, CancellationToken cancellationToken) { - // TODO: #4900 SendFrameAsync should in theory typically complete synchronously, making it fast and allocation free. - // However, due to #4900, it almost always yields, resulting in all of the allocations involved in an async method - // yielding, e.g. the boxed state machine, the Action delegate, the MoveNextRunner, and the resulting Task, plus it's - // common that the awaited operation completes so fast after the await that we may end up allocating an AwaitTaskContinuation - // inside of the TaskAwaiter. Since SendFrameAsync is such a core code path, until that can be fixed, we put some - // optimizations in place to avoid a few of those expenses, at the expense of more complicated code; for the common case, - // this code has fewer than half the number and size of allocations. If/when that issue is fixed, this method should be deleted - // and replaced by SendFrameFallbackAsync, which is the same logic but in a much more easily understand flow. - // If a cancelable cancellation token was provided, that would require registering with it, which means more state we have to // pass around (the CancellationTokenRegistration), so if it is cancelable, just immediately go to the fallback path. // Similarly, it should be rare that there are multiple outstanding calls to SendFrameAsync, but if there are, again // fall back to the fallback path. return cancellationToken.CanBeCanceled || !_sendFrameAsyncLock.Wait(0) ? - SendFrameFallbackAsync(opcode, endOfMessage, payloadBuffer, cancellationToken) : + new ValueTask(SendFrameFallbackAsync(opcode, endOfMessage, payloadBuffer, cancellationToken)) : SendFrameLockAcquiredNonCancelableAsync(opcode, endOfMessage, payloadBuffer); } @@ -386,19 +358,19 @@ namespace System.Net.WebSockets /// The opcode for the message. /// The value of the FIN bit for the message. /// The buffer containing the payload data fro the message. - private Task SendFrameLockAcquiredNonCancelableAsync(MessageOpcode opcode, bool endOfMessage, ReadOnlyMemory payloadBuffer) + private ValueTask SendFrameLockAcquiredNonCancelableAsync(MessageOpcode opcode, bool endOfMessage, ReadOnlyMemory payloadBuffer) { Debug.Assert(_sendFrameAsyncLock.CurrentCount == 0, "Caller should hold the _sendFrameAsyncLock"); // If we get here, the cancellation token is not cancelable so we don't have to worry about it, // and we own the semaphore, so we don't need to asynchronously wait for it. - Task writeTask = null; + ValueTask writeTask = default; bool releaseSemaphoreAndSendBuffer = true; try { // Write the payload synchronously to the buffer, then write that buffer out to the network. int sendBytes = WriteFrameToSendBuffer(opcode, endOfMessage, payloadBuffer.Span); - writeTask = _stream.WriteAsync(_sendBuffer, 0, sendBytes, CancellationToken.None); + writeTask = _stream.WriteAsync(new ReadOnlyMemory(_sendBuffer, 0, sendBytes)); // If the operation happens to complete synchronously (or, more specifically, by // the time we get from the previous line to here), release the semaphore, return @@ -415,9 +387,10 @@ namespace System.Net.WebSockets } catch (Exception exc) { - return Task.FromException(_state == WebSocketState.Aborted ? - CreateOperationCanceledException(exc) : - new WebSocketException(WebSocketError.ConnectionClosedPrematurely, exc)); + return new ValueTask(Task.FromException( + exc is OperationCanceledException ? exc : + _state == WebSocketState.Aborted ? CreateOperationCanceledException(exc) : + new WebSocketException(WebSocketError.ConnectionClosedPrematurely, exc))); } finally { @@ -428,22 +401,26 @@ namespace System.Net.WebSockets } } - // The write was not yet completed. Create and return a continuation that will - // release the semaphore and translate any exception that occurred. - return writeTask.ContinueWith((t, s) => - { - var thisRef = (ManagedWebSocket)s; - thisRef._sendFrameAsyncLock.Release(); - thisRef.ReleaseSendBuffer(); + return new ValueTask(WaitForWriteTaskAsync(writeTask)); + } - try { t.GetAwaiter().GetResult(); } - catch (Exception exc) - { - throw thisRef._state == WebSocketState.Aborted ? - CreateOperationCanceledException(exc) : - new WebSocketException(WebSocketError.ConnectionClosedPrematurely, exc); - } - }, this, CancellationToken.None, TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default); + private async Task WaitForWriteTaskAsync(ValueTask writeTask) + { + try + { + await writeTask.ConfigureAwait(false); + } + catch (Exception exc) when (!(exc is OperationCanceledException)) + { + throw _state == WebSocketState.Aborted ? + CreateOperationCanceledException(exc) : + new WebSocketException(WebSocketError.ConnectionClosedPrematurely, exc); + } + finally + { + _sendFrameAsyncLock.Release(); + ReleaseSendBuffer(); + } } private async Task SendFrameFallbackAsync(MessageOpcode opcode, bool endOfMessage, ReadOnlyMemory payloadBuffer, CancellationToken cancellationToken) @@ -454,10 +431,10 @@ namespace System.Net.WebSockets int sendBytes = WriteFrameToSendBuffer(opcode, endOfMessage, payloadBuffer.Span); using (cancellationToken.Register(s => ((ManagedWebSocket)s).Abort(), this)) { - await _stream.WriteAsync(_sendBuffer, 0, sendBytes, cancellationToken).ConfigureAwait(false); + await _stream.WriteAsync(new ReadOnlyMemory(_sendBuffer, 0, sendBytes), default).ConfigureAwait(false); } } - catch (Exception exc) + catch (Exception exc) when (!(exc is OperationCanceledException)) { throw _state == WebSocketState.Aborted ? CreateOperationCanceledException(exc, cancellationToken) : @@ -517,12 +494,15 @@ namespace System.Net.WebSockets { // This exists purely to keep the connection alive; don't wait for the result, and ignore any failures. // The call will handle releasing the lock. - Task t = SendFrameLockAcquiredNonCancelableAsync(MessageOpcode.Ping, true, Memory.Empty); - - // "Observe" any exception, ignoring it to prevent the unobserved exception event from being raised. - if (t.Status != TaskStatus.RanToCompletion) + ValueTask t = SendFrameLockAcquiredNonCancelableAsync(MessageOpcode.Ping, true, Memory.Empty); + if (t.IsCompletedSuccessfully) { - t.ContinueWith(p => { Exception ignored = p.Exception; }, + t.GetAwaiter().GetResult(); + } + else + { + // "Observe" any exception, ignoring it to prevent the unobserved exception event from being raised. + t.AsTask().ContinueWith(p => { Exception ignored = p.Exception; }, CancellationToken.None, TaskContinuationOptions.OnlyOnFaulted | TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default); @@ -650,7 +630,7 @@ namespace System.Net.WebSockets // Make sure we have the first two bytes, which includes the start of the payload length. if (_receiveBufferCount < 2) { - await EnsureBufferContainsAsync(2, cancellationToken, throwOnPrematureClosure: true).ConfigureAwait(false); + await EnsureBufferContainsAsync(2, throwOnPrematureClosure: true).ConfigureAwait(false); } // Then make sure we have the full header based on the payload length. @@ -662,13 +642,13 @@ namespace System.Net.WebSockets 2 + (_isServer ? MaskLength : 0) + (payloadLength <= 125 ? 0 : payloadLength == 126 ? sizeof(ushort) : sizeof(ulong)); // additional 2 or 8 bytes for 16-bit or 64-bit length - await EnsureBufferContainsAsync(minNeeded, cancellationToken).ConfigureAwait(false); + await EnsureBufferContainsAsync(minNeeded).ConfigureAwait(false); } } if (!TryParseMessageHeaderFromReceiveBuffer(out header)) { - await CloseWithReceiveErrorAndThrowAsync(WebSocketCloseStatus.ProtocolError, WebSocketError.Faulted, cancellationToken).ConfigureAwait(false); + await CloseWithReceiveErrorAndThrowAsync(WebSocketCloseStatus.ProtocolError, WebSocketError.Faulted).ConfigureAwait(false); } _receivedMaskOffsetOffset = 0; } @@ -678,12 +658,12 @@ namespace System.Net.WebSockets // Alternatively, if it's a close message, handle it and exit. if (header.Opcode == MessageOpcode.Ping || header.Opcode == MessageOpcode.Pong) { - await HandleReceivedPingPongAsync(header, cancellationToken).ConfigureAwait(false); + await HandleReceivedPingPongAsync(header).ConfigureAwait(false); continue; } else if (header.Opcode == MessageOpcode.Close) { - await HandleReceivedCloseAsync(header, cancellationToken).ConfigureAwait(false); + await HandleReceivedCloseAsync(header).ConfigureAwait(false); return resultGetter.GetResult(0, WebSocketMessageType.Close, true, _closeStatus, _closeStatusDescription); } @@ -708,43 +688,68 @@ namespace System.Net.WebSockets } // Otherwise, read as much of the payload as we can efficiently, and upate the header to reflect how much data - // remains for future reads. - int bytesToCopy = Math.Min(payloadBuffer.Length, (int)Math.Min(header.PayloadLength, _receiveBuffer.Length)); - Debug.Assert(bytesToCopy > 0, $"Expected {nameof(bytesToCopy)} > 0"); - if (_receiveBufferCount < bytesToCopy) + // remains for future reads. We first need to copy any data that may be lingering in the receive buffer + // into the destination; then to minimize ReceiveAsync calls, we want to read as much as we can, stopping + // only when we've either read the whole message or when we've filled the payload buffer. + + // First copy any data lingering in the receive buffer. + int totalBytesReceived = 0; + if (_receiveBufferCount > 0) { - await EnsureBufferContainsAsync(bytesToCopy, cancellationToken, throwOnPrematureClosure: true).ConfigureAwait(false); + int receiveBufferBytesToCopy = Math.Min(payloadBuffer.Length, (int)Math.Min(header.PayloadLength, _receiveBufferCount)); + Debug.Assert(receiveBufferBytesToCopy > 0); + _receiveBuffer.Span.Slice(_receiveBufferOffset, receiveBufferBytesToCopy).CopyTo(payloadBuffer.Span); + ConsumeFromBuffer(receiveBufferBytesToCopy); + totalBytesReceived += receiveBufferBytesToCopy; + Debug.Assert( + _receiveBufferCount == 0 || + totalBytesReceived == payloadBuffer.Length || + totalBytesReceived == header.PayloadLength); + } + + // Then read directly into the payload buffer until we've hit a limit. + while (totalBytesReceived < payloadBuffer.Length && + totalBytesReceived < header.PayloadLength) + { + int numBytesRead = await _stream.ReadAsync(payloadBuffer.Slice( + totalBytesReceived, + (int)Math.Min(payloadBuffer.Length, header.PayloadLength) - totalBytesReceived)).ConfigureAwait(false); + if (numBytesRead <= 0) + { + ThrowIfEOFUnexpected(throwOnPrematureClosure: true); + break; + } + totalBytesReceived += numBytesRead; } if (_isServer) { - _receivedMaskOffsetOffset = ApplyMask(_receiveBuffer.Span.Slice(_receiveBufferOffset, bytesToCopy), header.Mask, _receivedMaskOffsetOffset); + _receivedMaskOffsetOffset = ApplyMask(payloadBuffer.Span.Slice(0, totalBytesReceived), header.Mask, _receivedMaskOffsetOffset); } - _receiveBuffer.Span.Slice(_receiveBufferOffset, bytesToCopy).CopyTo(payloadBuffer.Span.Slice(0, bytesToCopy)); - ConsumeFromBuffer(bytesToCopy); - header.PayloadLength -= bytesToCopy; + header.PayloadLength -= totalBytesReceived; // If this a text message, validate that it contains valid UTF8. if (header.Opcode == MessageOpcode.Text && - !TryValidateUtf8(payloadBuffer.Span.Slice(0, bytesToCopy), header.Fin, _utf8TextState)) + !TryValidateUtf8(payloadBuffer.Span.Slice(0, totalBytesReceived), header.Fin, _utf8TextState)) { - await CloseWithReceiveErrorAndThrowAsync(WebSocketCloseStatus.InvalidPayloadData, WebSocketError.Faulted, cancellationToken).ConfigureAwait(false); + await CloseWithReceiveErrorAndThrowAsync(WebSocketCloseStatus.InvalidPayloadData, WebSocketError.Faulted).ConfigureAwait(false); } _lastReceiveHeader = header; return resultGetter.GetResult( - bytesToCopy, + totalBytesReceived, header.Opcode == MessageOpcode.Text ? WebSocketMessageType.Text : WebSocketMessageType.Binary, header.Fin && header.PayloadLength == 0, null, null); } } - catch (Exception exc) + catch (Exception exc) when (!(exc is OperationCanceledException)) { if (_state == WebSocketState.Aborted) { throw new OperationCanceledException(nameof(WebSocketState.Aborted), exc); } + _abortSource.Cancel(); throw new WebSocketException(WebSocketError.ConnectionClosedPrematurely, exc); } finally @@ -755,10 +760,8 @@ namespace System.Net.WebSockets /// Processes a received close message. /// The message header. - /// The cancellation token to use to cancel the websocket. /// The received result message. - private async Task HandleReceivedCloseAsync( - MessageHeader header, CancellationToken cancellationToken) + private async Task HandleReceivedCloseAsync(MessageHeader header) { lock (StateUpdateLock) { @@ -776,13 +779,13 @@ namespace System.Net.WebSockets if (header.PayloadLength == 1) { // The close payload length can be 0 or >= 2, but not 1. - await CloseWithReceiveErrorAndThrowAsync(WebSocketCloseStatus.ProtocolError, WebSocketError.Faulted, cancellationToken).ConfigureAwait(false); + await CloseWithReceiveErrorAndThrowAsync(WebSocketCloseStatus.ProtocolError, WebSocketError.Faulted).ConfigureAwait(false); } else if (header.PayloadLength >= 2) { if (_receiveBufferCount < header.PayloadLength) { - await EnsureBufferContainsAsync((int)header.PayloadLength, cancellationToken).ConfigureAwait(false); + await EnsureBufferContainsAsync((int)header.PayloadLength).ConfigureAwait(false); } if (_isServer) @@ -793,7 +796,7 @@ namespace System.Net.WebSockets closeStatus = (WebSocketCloseStatus)(_receiveBuffer.Span[_receiveBufferOffset] << 8 | _receiveBuffer.Span[_receiveBufferOffset + 1]); if (!IsValidCloseStatus(closeStatus)) { - await CloseWithReceiveErrorAndThrowAsync(WebSocketCloseStatus.ProtocolError, WebSocketError.Faulted, cancellationToken).ConfigureAwait(false); + await CloseWithReceiveErrorAndThrowAsync(WebSocketCloseStatus.ProtocolError, WebSocketError.Faulted).ConfigureAwait(false); } if (header.PayloadLength > 2) @@ -804,7 +807,7 @@ namespace System.Net.WebSockets } catch (DecoderFallbackException exc) { - await CloseWithReceiveErrorAndThrowAsync(WebSocketCloseStatus.ProtocolError, WebSocketError.Faulted, cancellationToken, exc).ConfigureAwait(false); + await CloseWithReceiveErrorAndThrowAsync(WebSocketCloseStatus.ProtocolError, WebSocketError.Faulted, exc).ConfigureAwait(false); } } ConsumeFromBuffer((int)header.PayloadLength); @@ -813,17 +816,48 @@ namespace System.Net.WebSockets // Store the close status and description onto the instance. _closeStatus = closeStatus; _closeStatusDescription = closeStatusDescription; + + if (!_isServer && _sentCloseFrame) + { + await WaitForServerToCloseConnectionAsync().ConfigureAwait(false); + } + } + + /// Issues a read on the stream to wait for EOF. + private async Task WaitForServerToCloseConnectionAsync() + { + // Per RFC 6455 7.1.1, try to let the server close the connection. We give it up to a second. + // We simply issue a read and don't care what we get back; we could validate that we don't get + // additional data, but at this point we're about to close the connection and we're just stalling + // to try to get the server to close first. + ValueTask finalReadTask = _stream.ReadAsync(_receiveBuffer, default); + if (!finalReadTask.IsCompletedSuccessfully) + { + const int WaitForCloseTimeoutMs = 1_000; // arbitrary amount of time to give the server (same as netfx) + using (var finalCts = new CancellationTokenSource(WaitForCloseTimeoutMs)) + using (finalCts.Token.Register(s => ((ManagedWebSocket)s).Abort(), this)) + { + try + { + await finalReadTask.ConfigureAwait(false); + } + catch + { + // Eat any resulting exceptions. We were going to close the connection, anyway. + // TODO #24057: Log the exception to NetEventSource. + } + } + } } /// Processes a received ping or pong message. /// The message header. - /// The cancellation token to use to cancel the websocket. - private async Task HandleReceivedPingPongAsync(MessageHeader header, CancellationToken cancellationToken) + private async Task HandleReceivedPingPongAsync(MessageHeader header) { // Consume any (optional) payload associated with the ping/pong. if (header.PayloadLength > 0 && _receiveBufferCount < header.PayloadLength) { - await EnsureBufferContainsAsync((int)header.PayloadLength, cancellationToken).ConfigureAwait(false); + await EnsureBufferContainsAsync((int)header.PayloadLength).ConfigureAwait(false); } // If this was a ping, send back a pong response. @@ -836,7 +870,7 @@ namespace System.Net.WebSockets await SendFrameAsync( MessageOpcode.Pong, true, - _receiveBuffer.Slice(_receiveBufferOffset, (int)header.PayloadLength), cancellationToken).ConfigureAwait(false); + _receiveBuffer.Slice(_receiveBufferOffset, (int)header.PayloadLength), default).ConfigureAwait(false); } // Regardless of whether it was a ping or pong, we no longer need the payload. @@ -888,15 +922,14 @@ namespace System.Net.WebSockets /// Send a close message to the server and throw an exception, in response to getting bad data from the server. /// The close status code to use. /// The error reason. - /// The CancellationToken used to cancel the websocket. /// An optional inner exception to include in the thrown exception. private async Task CloseWithReceiveErrorAndThrowAsync( - WebSocketCloseStatus closeStatus, WebSocketError error, CancellationToken cancellationToken, Exception innerException = null) + WebSocketCloseStatus closeStatus, WebSocketError error, Exception innerException = null) { // Close the connection if it hasn't already been closed if (!_sentCloseFrame) { - await CloseOutputAsync(closeStatus, string.Empty, cancellationToken).ConfigureAwait(false); + await CloseOutputAsync(closeStatus, string.Empty, default).ConfigureAwait(false); } // Dump our receive buffer; we're in a bad state to do any further processing @@ -1113,6 +1146,11 @@ namespace System.Net.WebSockets _state = WebSocketState.CloseSent; } } + + if (!_isServer && _receivedCloseFrame) + { + await WaitForServerToCloseConnectionAsync().ConfigureAwait(false); + } } private void ConsumeFromBuffer(int count) @@ -1123,7 +1161,7 @@ namespace System.Net.WebSockets _receiveBufferOffset += count; } - private async Task EnsureBufferContainsAsync(int minimumRequiredBytes, CancellationToken cancellationToken, bool throwOnPrematureClosure = true) + private async Task EnsureBufferContainsAsync(int minimumRequiredBytes, bool throwOnPrematureClosure = true) { Debug.Assert(minimumRequiredBytes <= _receiveBuffer.Length, $"Requested number of bytes {minimumRequiredBytes} must not exceed {_receiveBuffer.Length}"); @@ -1140,29 +1178,34 @@ namespace System.Net.WebSockets // While we don't have enough data, read more. while (_receiveBufferCount < minimumRequiredBytes) { - int numRead = await _stream.ReadAsync(_receiveBuffer.Slice(_receiveBufferCount, _receiveBuffer.Length - _receiveBufferCount), cancellationToken).ConfigureAwait(false); + int numRead = await _stream.ReadAsync(_receiveBuffer.Slice(_receiveBufferCount, _receiveBuffer.Length - _receiveBufferCount), default).ConfigureAwait(false); Debug.Assert(numRead >= 0, $"Expected non-negative bytes read, got {numRead}"); - _receiveBufferCount += numRead; - if (numRead == 0) + if (numRead <= 0) { - // The connection closed before we were able to read everything we needed. - // If it was due to use being disposed, fail. If it was due to the connection - // being closed and it wasn't expected, fail. If it was due to the connection - // being closed and that was expected, exit gracefully. - if (_disposed) - { - throw new ObjectDisposedException(nameof(WebSocket)); - } - else if (throwOnPrematureClosure) - { - throw new WebSocketException(WebSocketError.ConnectionClosedPrematurely); - } + ThrowIfEOFUnexpected(throwOnPrematureClosure); break; } + _receiveBufferCount += numRead; } } } + private void ThrowIfEOFUnexpected(bool throwOnPrematureClosure) + { + // The connection closed before we were able to read everything we needed. + // If it was due to us being disposed, fail. If it was due to the connection + // being closed and it wasn't expected, fail. If it was due to the connection + // being closed and that was expected, exit gracefully. + if (_disposed) + { + throw new ObjectDisposedException(nameof(WebSocket)); + } + if (throwOnPrematureClosure) + { + throw new WebSocketException(WebSocketError.ConnectionClosedPrematurely); + } + } + /// Gets a send buffer from the pool. private void AllocateSendBuffer(int minLength) { @@ -1216,7 +1259,7 @@ namespace System.Net.WebSockets toMask.Length >= Vector.Count) { Vector maskVector = Vector.AsVectorByte(new Vector(shiftedMask)); - Span> toMaskVector = toMask.NonPortableCast>(); + Span> toMaskVector = MemoryMarshal.Cast>(toMask); for (int i = 0; i < toMaskVector.Length; i++) { toMaskVector[i] ^= maskVector; @@ -1269,15 +1312,17 @@ namespace System.Net.WebSockets } /// Aborts the websocket and throws an exception if an existing operation is in progress. - private void ThrowIfOperationInProgress(Task operationTask, [CallerMemberName] string methodName = null) + private void ThrowIfOperationInProgress(bool operationCompleted, [CallerMemberName] string methodName = null) { - if (operationTask != null && !operationTask.IsCompleted) + if (!operationCompleted) { Abort(); - throw new InvalidOperationException(SR.Format(SR.net_Websockets_AlreadyOneOutstandingOperation, methodName)); + ThrowOperationInProgress(methodName); } } + private void ThrowOperationInProgress(string methodName) => throw new InvalidOperationException(SR.Format(SR.net_Websockets_AlreadyOneOutstandingOperation, methodName)); + /// Creates an OperationCanceledException instance, using a default message and the specified inner exception and token. private static Exception CreateOperationCanceledException(Exception innerException, CancellationToken cancellationToken = default(CancellationToken)) { diff --git a/external/corefx/src/Common/src/System/PasteArguments.Unix.cs b/external/corefx/src/Common/src/System/PasteArguments.Unix.cs new file mode 100644 index 0000000000..1a4d92850f --- /dev/null +++ b/external/corefx/src/Common/src/System/PasteArguments.Unix.cs @@ -0,0 +1,28 @@ +// 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.Collections.Generic; +using System.Runtime.CompilerServices; +using System.Text; + +namespace System +{ + internal static partial class PasteArguments + { + /// + /// Repastes a set of arguments into a linear string that parses back into the originals under pre- or post-2008 VC parsing rules. + /// On Unix: the rules for parsing the executable name (argv[0]) are ignored. + /// + internal static string Paste(IEnumerable arguments, bool pasteFirstArgumentUsingArgV0Rules) + { + var stringBuilder = new StringBuilder(); + foreach (string argument in arguments) + { + AppendArgument(stringBuilder, argument); + } + return stringBuilder.ToString(); + } + + } +} diff --git a/external/corefx/src/Common/src/System/PasteArguments.Windows.cs b/external/corefx/src/Common/src/System/PasteArguments.Windows.cs new file mode 100644 index 0000000000..7cdcbc4533 --- /dev/null +++ b/external/corefx/src/Common/src/System/PasteArguments.Windows.cs @@ -0,0 +1,66 @@ +// 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.Collections.Generic; +using System.Runtime.CompilerServices; +using System.Text; + +namespace System +{ + internal static partial class PasteArguments + { + /// + /// Repastes a set of arguments into a linear string that parses back into the originals under pre- or post-2008 VC parsing rules. + /// The rules for parsing the executable name (argv[0]) are special, so you must indicate whether the first argument actually is argv[0]. + /// + internal static string Paste(IEnumerable arguments, bool pasteFirstArgumentUsingArgV0Rules) + { + var stringBuilder = new StringBuilder(); + + foreach (string argument in arguments) + { + if (pasteFirstArgumentUsingArgV0Rules) + { + pasteFirstArgumentUsingArgV0Rules = false; + + // Special rules for argv[0] + // - Backslash is a normal character. + // - Quotes used to include whitespace characters. + // - Parsing ends at first whitespace outside quoted region. + // - No way to get a literal quote past the parser. + + bool hasWhitespace = false; + foreach (char c in argument) + { + if (c == Quote) + { + throw new ApplicationException("The argv[0] argument cannot include a double quote."); + } + if (char.IsWhiteSpace(c)) + { + hasWhitespace = true; + } + } + if (argument.Length == 0 || hasWhitespace) + { + stringBuilder.Append(Quote); + stringBuilder.Append(argument); + stringBuilder.Append(Quote); + } + else + { + stringBuilder.Append(argument); + } + } + else + { + AppendArgument(stringBuilder, argument); + } + } + + return stringBuilder.ToString(); + } + + } +} diff --git a/external/corefx/src/Common/src/System/PasteArguments.cs b/external/corefx/src/Common/src/System/PasteArguments.cs index f78a95ad49..c088fd4eb7 100644 --- a/external/corefx/src/Common/src/System/PasteArguments.cs +++ b/external/corefx/src/Common/src/System/PasteArguments.cs @@ -2,124 +2,81 @@ // 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.Collections.Generic; using System.Text; namespace System { - internal static class PasteArguments + internal static partial class PasteArguments { - /// - /// Repastes a set of arguments into a linear string that parses back into the originals under pre- or post-2008 VC parsing rules. - /// The rules for parsing the executable name (argv[0]) are special, so you must indicate whether the first argument actually is argv[0]. - /// - public static string Paste(IEnumerable arguments, bool pasteFirstArgumentUsingArgV0Rules) + internal static void AppendArgument(StringBuilder stringBuilder, string argument) { - var stringBuilder = new StringBuilder(); - - foreach (string argument in arguments) + if (stringBuilder.Length != 0) { - if (pasteFirstArgumentUsingArgV0Rules) - { - pasteFirstArgumentUsingArgV0Rules = false; - - // Special rules for argv[0] - // - Backslash is a normal character. - // - Quotes used to include whitespace characters. - // - Parsing ends at first whitespace outside quoted region. - // - No way to get a literal quote past the parser. - - bool hasWhitespace = false; - foreach (char c in argument) - { - if (c == Quote) - { - throw new ApplicationException("The argv[0] argument cannot include a double quote."); - } - if (char.IsWhiteSpace(c)) - { - hasWhitespace = true; - } - } - if (argument.Length == 0 || hasWhitespace) - { - stringBuilder.Append(Quote); - stringBuilder.Append(argument); - stringBuilder.Append(Quote); - } - else - { - stringBuilder.Append(argument); - } - } - else - { - if (stringBuilder.Length != 0) - { - stringBuilder.Append(' '); - } - - // Parsing rules for non-argv[0] arguments: - // - Backslash is a normal character except followed by a quote. - // - 2N backslashes followed by a quote ==> N literal backslashes followed by unescaped quote - // - 2N+1 backslashes followed by a quote ==> N literal backslashes followed by a literal quote - // - Parsing stops at first whitespace outside of quoted region. - // - (post 2008 rule): A closing quote followed by another quote ==> literal quote, and parsing remains in quoting mode. - if (argument.Length != 0 && ContainsNoWhitespaceOrQuotes(argument)) - { - // Simple case - no quoting or changes needed. - stringBuilder.Append(argument); - } - else - { - stringBuilder.Append(Quote); - int idx = 0; - while (idx < argument.Length) - { - char c = argument[idx++]; - if (c == Backslash) - { - int numBackSlash = 1; - while (idx < argument.Length && argument[idx] == Backslash) - { - idx++; - numBackSlash++; - } - if (idx == argument.Length) - { - // We'll emit an end quote after this so must double the number of backslashes. - stringBuilder.Append(Backslash, numBackSlash * 2); - } - else if (argument[idx] == Quote) - { - // Backslashes will be followed by a quote. Must double the number of backslashes. - stringBuilder.Append(Backslash, numBackSlash * 2 + 1); - stringBuilder.Append(Quote); - idx++; - } - else - { - // Backslash will not be followed by a quote, so emit as normal characters. - stringBuilder.Append(Backslash, numBackSlash); - } - continue; - } - if (c == Quote) - { - // Escape the quote so it appears as a literal. This also guarantees that we won't end up generating a closing quote followed - // by another quote (which parses differently pre-2008 vs. post-2008.) - stringBuilder.Append(Backslash); - stringBuilder.Append(Quote); - continue; - } - stringBuilder.Append(c); - } - stringBuilder.Append(Quote); - } - } + stringBuilder.Append(' '); } - return stringBuilder.ToString(); + // Parsing rules for non-argv[0] arguments: + // - Backslash is a normal character except followed by a quote. + // - 2N backslashes followed by a quote ==> N literal backslashes followed by unescaped quote + // - 2N+1 backslashes followed by a quote ==> N literal backslashes followed by a literal quote + // - Parsing stops at first whitespace outside of quoted region. + // - (post 2008 rule): A closing quote followed by another quote ==> literal quote, and parsing remains in quoting mode. + if (argument.Length != 0 && ContainsNoWhitespaceOrQuotes(argument)) + { + // Simple case - no quoting or changes needed. + stringBuilder.Append(argument); + } + else + { + stringBuilder.Append(Quote); + int idx = 0; + while (idx < argument.Length) + { + char c = argument[idx++]; + if (c == Backslash) + { + int numBackSlash = 1; + while (idx < argument.Length && argument[idx] == Backslash) + { + idx++; + numBackSlash++; + } + + if (idx == argument.Length) + { + // We'll emit an end quote after this so must double the number of backslashes. + stringBuilder.Append(Backslash, numBackSlash * 2); + } + else if (argument[idx] == Quote) + { + // Backslashes will be followed by a quote. Must double the number of backslashes. + stringBuilder.Append(Backslash, numBackSlash * 2 + 1); + stringBuilder.Append(Quote); + idx++; + } + else + { + // Backslash will not be followed by a quote, so emit as normal characters. + stringBuilder.Append(Backslash, numBackSlash); + } + + continue; + } + + if (c == Quote) + { + // Escape the quote so it appears as a literal. This also guarantees that we won't end up generating a closing quote followed + // by another quote (which parses differently pre-2008 vs. post-2008.) + stringBuilder.Append(Backslash); + stringBuilder.Append(Quote); + continue; + } + + stringBuilder.Append(c); + } + + stringBuilder.Append(Quote); + } } private static bool ContainsNoWhitespaceOrQuotes(string s) diff --git a/external/corefx/src/Common/src/System/Runtime/InteropServices/FunctionWrapper.cs b/external/corefx/src/Common/src/System/Runtime/InteropServices/FunctionWrapper.cs index 692e6f64b9..9b56ef3de0 100644 --- a/external/corefx/src/Common/src/System/Runtime/InteropServices/FunctionWrapper.cs +++ b/external/corefx/src/Common/src/System/Runtime/InteropServices/FunctionWrapper.cs @@ -45,9 +45,9 @@ namespace System.Runtime.InteropServices } } - public enum FunctionLoadResultKind { Success, LibraryNotFound, FunctionNotFound } + internal enum FunctionLoadResultKind { Success, LibraryNotFound, FunctionNotFound } - public readonly struct FunctionLoadResult + internal readonly struct FunctionLoadResult { public FunctionLoadResultKind ResultKind { get; } public T Delegate { get; } diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/Asn1V2.Serializer.cs b/external/corefx/src/Common/src/System/Security/Cryptography/Asn1V2.Serializer.cs index 0eeb6fe912..018cc3c5d1 100644 --- a/external/corefx/src/Common/src/System/Security/Cryptography/Asn1V2.Serializer.cs +++ b/external/corefx/src/Common/src/System/Security/Cryptography/Asn1V2.Serializer.cs @@ -3,11 +3,13 @@ // See the LICENSE file in the project root for more information. using System.Buffers; +using System.Collections.Concurrent; using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Numerics; using System.Reflection; +using System.Runtime.CompilerServices; namespace System.Security.Cryptography.Asn1 { @@ -59,6 +61,9 @@ namespace System.Security.Cryptography.Asn1 private delegate object Deserializer(AsnReader reader); private delegate bool TryDeserializer(AsnReader reader, out T value); + private static readonly ConcurrentDictionary s_orderedFields = + new ConcurrentDictionary(); + private static Deserializer TryOrFail(TryDeserializer tryDeserializer) { return reader => @@ -70,6 +75,53 @@ namespace System.Security.Cryptography.Asn1 }; } + private static FieldInfo[] GetOrderedFields(Type typeT) + { + return s_orderedFields.GetOrAdd( + typeT, + t => + { + // https://github.com/dotnet/corefx/issues/14606 asserts that ordering by the metadata + // token on a SequentialLayout will produce the fields in their layout order. + // + // Some other alternatives: + // * Add an attribute for controlling the field read order. + // fieldInfos.Select(fi => (fi, fi.GetCustomAttribute(false)). + // Where(val => val.Item2 != null).OrderBy(val => val.Item2.OrderWeight).Select(val => val.Item1); + // + // * Use Marshal.OffsetOf as a sort key + // + // * Some sort of interface to return the fields in a declared order, using either + // an existing object, or Activator.CreateInstance. It would need to check that + // any returned fields actually were declared on the type that was queried. + // + // * Invent more alternatives + FieldInfo[] fieldInfos = t.GetFields(FieldFlags); + + if (fieldInfos.Length == 0) + { + return Array.Empty(); + } + + try + { + int token = fieldInfos[0].MetadataToken; + } + catch (InvalidOperationException) + { + // If MetadataToken isn't available (like in ILC) then just hope that + // the fields are returned in declared order. For the most part that + // will result in data misaligning to fields and deserialization failing, + // thus a CryptographicException. + return fieldInfos; + } + + Array.Sort(fieldInfos, (x, y) => x.MetadataToken.CompareTo(y.MetadataToken)); + return fieldInfos; + }); + } + + private static ChoiceAttribute GetChoiceAttribute(Type typeT) { ChoiceAttribute attr = typeT.GetCustomAttribute(inherit: false); @@ -102,20 +154,7 @@ namespace System.Security.Cryptography.Asn1 Type typeT, LinkedList currentSet) { - FieldInfo[] fieldInfos = typeT.GetFields(FieldFlags); - - // https://github.com/dotnet/corefx/issues/14606 asserts that ordering by the metadata - // token on a SequentialLayout will produce the fields in their layout order. - // - // Some other alternatives: - // * Add an attribute for controlling the field read order. - // fieldInfos.Select(fi => (fi, fi.GetCustomAttribute(false)). - // Where(val => val.Item2 != null).OrderBy(val => val.Item2.OrderWeight).Select(val => val.Item1); - // - // * Use Marshal.OffsetOf as a sort key - // - // * Invent more alternatives - foreach (FieldInfo fieldInfo in fieldInfos.OrderBy(fi => fi.MetadataToken)) + foreach (FieldInfo fieldInfo in GetOrderedFields(typeT)) { Type fieldType = fieldInfo.FieldType; @@ -211,7 +250,7 @@ namespace System.Security.Cryptography.Asn1 } else { - FieldInfo[] fieldInfos = typeT.GetFields(FieldFlags); + FieldInfo[] fieldInfos = GetOrderedFields(typeT); for (int i = 0; i < fieldInfos.Length; i++) { @@ -312,11 +351,11 @@ namespace System.Security.Cryptography.Asn1 writer.PopSequence(tag); } - private static object DeserializeCustomType(AsnReader reader, Type typeT) + private static object DeserializeCustomType(AsnReader reader, Type typeT, Asn1Tag expectedTag) { object target = Activator.CreateInstance(typeT); - AsnReader sequence = reader.ReadSequence(); + AsnReader sequence = reader.ReadSequence(expectedTag); foreach (FieldInfo fieldInfo in typeT.GetFields(FieldFlags)) { @@ -596,7 +635,7 @@ namespace System.Security.Cryptography.Asn1 // TODO: split netstandard/netcoreapp for span usage? ReadOnlyMemory valAsMemory = (ReadOnlyMemory)value; byte[] tooBig = new byte[valAsMemory.Length + 1]; - valAsMemory.Span.CopyTo(tooBig.AsSpan().Slice(1)); + valAsMemory.Span.CopyTo(tooBig.AsSpan(1)); Array.Reverse(tooBig); BigInteger bigInt = new BigInteger(tooBig); writer.WriteInteger(bigInt); @@ -722,7 +761,7 @@ namespace System.Security.Cryptography.Asn1 { expectedTag = fieldData.ExpectedTag; } - + deserializer = DefaultValueDeserializer( deserializer, fieldData.IsOptional, @@ -837,12 +876,12 @@ namespace System.Security.Cryptography.Asn1 // Guaranteed too big, because it has the tag and length. int length = reader.PeekEncodedValue().Length; byte[] rented = ArrayPool.Shared.Rent(length); - + try { - if (reader.TryCopyBitStringBytes(rented, out _, out int bytesWritten)) + if (reader.TryCopyBitStringBytes(expectedTag, rented, out _, out int bytesWritten)) { - return new ReadOnlyMemory(rented.AsReadOnlySpan().Slice(0, bytesWritten).ToArray()); + return new ReadOnlyMemory(rented.AsSpan(0, bytesWritten).ToArray()); } Debug.Fail("TryCopyBitStringBytes produced more data than the encoded size"); @@ -871,9 +910,9 @@ namespace System.Security.Cryptography.Asn1 try { - if (reader.TryCopyOctetStringBytes(rented, out int bytesWritten)) + if (reader.TryCopyOctetStringBytes(expectedTag, rented, out int bytesWritten)) { - return new ReadOnlyMemory(rented.AsReadOnlySpan().Slice(0, bytesWritten).ToArray()); + return new ReadOnlyMemory(rented.AsSpan(0, bytesWritten).ToArray()); } Debug.Fail("TryCopyOctetStringBytes produced more data than the encoded size"); @@ -984,14 +1023,14 @@ namespace System.Security.Cryptography.Asn1 { if (fieldData.TagType == UniversalTagNumber.Sequence) { - return reader => DeserializeCustomType(reader, typeT); + return reader => DeserializeCustomType(reader, typeT, expectedTag); } } throw new AsnSerializationConstraintException( SR.Format(SR.Cryptography_AsnSerializer_UnhandledType, typeT.FullName)); } - + private static object DefaultValue( byte[] defaultContents, Deserializer valueDeserializer) @@ -1342,14 +1381,14 @@ namespace System.Security.Cryptography.Asn1 /// /// Except for where required to for avoiding ambiguity, this method does not check that there are /// no cycles in the type graph for . If is a - /// reference type (class) which includes a cycle in the type graph, + /// reference type (class) which includes a cycle in the type graph, /// then it is possible for the data in to cause /// an arbitrary extension to the maximum stack depth of this routine, leading to a /// . - /// + /// /// If is a value type (struct) the compiler will enforce that there are no /// cycles in the type graph. - /// + /// /// When reference types are used the onus is on the caller of this method to prevent cycles, or to /// mitigate the possibility of the stack overflow. /// @@ -1372,6 +1411,50 @@ namespace System.Security.Cryptography.Asn1 return t; } + /// + /// Read the first ASN.1 data element from encoded under the specified + /// encoding rules into the typed structure. + /// + /// + /// The type to deserialize as. + /// In order to be deserialized the type must have sequential layout, be sealed, and be composed of + /// members that are also able to be deserialized by this method. + /// + /// A view of the encoded bytes to be deserialized. + /// The ASN.1 encoding ruleset to use for reading . + /// Receives the number of bytes read from . + /// A deserialized instance of . + /// + /// Except for where required to for avoiding ambiguity, this method does not check that there are + /// no cycles in the type graph for . If is a + /// reference type (class) which includes a cycle in the type graph, + /// then it is possible for the data in to cause + /// an arbitrary extension to the maximum stack depth of this routine, leading to a + /// . + /// + /// If is a value type (struct) the compiler will enforce that there are no + /// cycles in the type graph. + /// + /// When reference types are used the onus is on the caller of this method to prevent cycles, or to + /// mitigate the possibility of the stack overflow. + /// + /// + /// A portion of is invalid for deserialization. + /// + /// + /// Any of the data in is invalid for mapping to the return value. + /// + public static T Deserialize(ReadOnlyMemory source, AsnEncodingRules ruleSet, out int bytesRead) + { + Deserializer deserializer = GetDeserializer(typeof(T), null); + AsnReader reader = new AsnReader(source, ruleSet); + ReadOnlyMemory firstElement = reader.PeekEncodedValue(); + + T t = (T)deserializer(reader); + bytesRead = firstElement.Length; + return t; + } + /// /// Serialize into an ASN.1 writer under the specified encoding rules. /// @@ -1388,10 +1471,10 @@ namespace System.Security.Cryptography.Asn1 /// no cycles in the type graph for . If is a /// reference type (class) which includes a cycle in the type graph, and there is a cycle within the /// object graph this method will consume memory and stack space until one is exhausted. - /// + /// /// If is a value type (struct) the compiler will enforce that there are no /// cycles in the type graph. - /// + /// /// When reference types are used the onus is on the caller of this method to prevent object cycles, /// or to mitigate the possibility of the stack overflow or memory exhaustion. /// @@ -1430,10 +1513,10 @@ namespace System.Security.Cryptography.Asn1 /// no cycles in the type graph for . If is a /// reference type (class) which includes a cycle in the type graph, and there is a cycle within the /// object graph this method will consume memory and stack space until one is exhausted. - /// + /// /// If is a value type (struct) the compiler will enforce that there are no /// cycles in the type graph. - /// + /// /// When reference types are used the onus is on the caller of this method to prevent object cycles, /// or to mitigate the possibility of the stack overflow or memory exhaustion. /// diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/Asn1V2.cs b/external/corefx/src/Common/src/System/Security/Cryptography/Asn1V2.cs index 6594846641..0f9806ad67 100644 --- a/external/corefx/src/Common/src/System/Security/Cryptography/Asn1V2.cs +++ b/external/corefx/src/Common/src/System/Security/Cryptography/Asn1V2.cs @@ -395,7 +395,7 @@ namespace System.Security.Cryptography.Asn1 public override int GetByteCount(string s) { - return GetByteCount(s.AsReadOnlySpan()); + return GetByteCount(s.AsSpan()); } public diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/AsnReader.cs.REMOVED.git-id b/external/corefx/src/Common/src/System/Security/Cryptography/AsnReader.cs.REMOVED.git-id index 56bae151a6..b08431de66 100644 --- a/external/corefx/src/Common/src/System/Security/Cryptography/AsnReader.cs.REMOVED.git-id +++ b/external/corefx/src/Common/src/System/Security/Cryptography/AsnReader.cs.REMOVED.git-id @@ -1 +1 @@ -54601ff32117b47c27803a9942042d549d2616b8 \ No newline at end of file +52ea683e140bb63e51eb93d7d9d70cdc7bde1492 \ No newline at end of file diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/AsnWriter.cs b/external/corefx/src/Common/src/System/Security/Cryptography/AsnWriter.cs index 8f2fc34369..d0d40751ce 100644 --- a/external/corefx/src/Common/src/System/Security/Cryptography/AsnWriter.cs +++ b/external/corefx/src/Common/src/System/Security/Cryptography/AsnWriter.cs @@ -62,7 +62,7 @@ namespace System.Security.Cryptography.Asn1 // past where the buffer was "allocated". This causes quite a number of reallocs // and copies, so it's a #define opt-in. byte[] newBytes = new byte[_offset + pendingCount]; - + if (_buffer != null) { Buffer.BlockCopy(_buffer, 0, newBytes, 0, _offset); @@ -99,7 +99,7 @@ namespace System.Security.Cryptography.Asn1 int spaceRequired = tag.CalculateEncodedSize(); EnsureWriteCapacity(spaceRequired); - if (!tag.TryWrite(_buffer.AsSpan().Slice(_offset, spaceRequired), out int written) || + if (!tag.TryWrite(_buffer.AsSpan(_offset, spaceRequired), out int written) || written != spaceRequired) { Debug.Fail($"TryWrite failed or written was wrong value ({written} vs {spaceRequired})"); @@ -190,7 +190,7 @@ namespace System.Security.Cryptography.Asn1 Debug.Assert(parsedBack.Length == preEncodedValue.Length); EnsureWriteCapacity(preEncodedValue.Length); - preEncodedValue.Span.CopyTo(_buffer.AsSpan().Slice(_offset)); + preEncodedValue.Span.CopyTo(_buffer.AsSpan(_offset)); _offset += preEncodedValue.Length; } @@ -216,7 +216,7 @@ namespace System.Security.Cryptography.Asn1 // T-REC-X.690-201508 sec 11.1, 8.2 private void WriteBooleanCore(Asn1Tag tag, bool value) - { + { Debug.Assert(!tag.IsConstructed); WriteTag(tag); WriteLength(1); @@ -313,7 +313,7 @@ namespace System.Security.Cryptography.Asn1 private void WriteNonNegativeIntegerCore(Asn1Tag tag, ulong value) { int valueLength; - + // 0x80 needs two bytes: 0x00 0x80 if (value < 0x80) valueLength = 1; @@ -449,7 +449,7 @@ namespace System.Security.Cryptography.Asn1 WriteLength(bitString.Length + 1); _buffer[_offset] = (byte)unusedBitCount; _offset++; - bitString.CopyTo(_buffer.AsSpan().Slice(_offset)); + bitString.CopyTo(_buffer.AsSpan(_offset)); _offset += bitString.Length; } @@ -508,7 +508,7 @@ namespace System.Security.Cryptography.Asn1 _buffer[_offset] = 0; _offset++; - dest = _buffer.AsSpan().Slice(_offset); + dest = _buffer.AsSpan(_offset); remainingData.Slice(0, MaxCERContentSize).CopyTo(dest); remainingData = remainingData.Slice(MaxCERContentSize); @@ -521,7 +521,7 @@ namespace System.Security.Cryptography.Asn1 _buffer[_offset] = (byte)unusedBitCount; _offset++; - dest = _buffer.AsSpan().Slice(_offset); + dest = _buffer.AsSpan(_offset); remainingData.CopyTo(dest); _offset += remainingData.Length; @@ -552,7 +552,7 @@ namespace System.Security.Cryptography.Asn1 WriteNamedBitList(tag, enumValue.GetType(), enumValue); } - public void WriteNamedBitList(Asn1Tag tag, TEnum enumValue) where TEnum : struct + public void WriteNamedBitList(Asn1Tag tag, TEnum enumValue) where TEnum : struct { WriteNamedBitList(tag, typeof(TEnum), enumValue); } @@ -655,7 +655,7 @@ namespace System.Security.Cryptography.Asn1 // Clear the constructed flag, if present. WriteTag(tag.AsPrimitive()); WriteLength(octetString.Length); - octetString.CopyTo(_buffer.AsSpan().Slice(_offset)); + octetString.CopyTo(_buffer.AsSpan(_offset)); _offset += octetString.Length; } @@ -707,7 +707,7 @@ namespace System.Security.Cryptography.Asn1 WriteTag(primitiveOctetString); WriteLength(MaxCERSegmentSize); - dest = _buffer.AsSpan().Slice(_offset); + dest = _buffer.AsSpan(_offset); remainingData.Slice(0, MaxCERSegmentSize).CopyTo(dest); _offset += MaxCERSegmentSize; @@ -716,7 +716,7 @@ namespace System.Security.Cryptography.Asn1 WriteTag(primitiveOctetString); WriteLength(remainingData.Length); - dest = _buffer.AsSpan().Slice(_offset); + dest = _buffer.AsSpan(_offset); remainingData.CopyTo(dest); _offset += remainingData.Length; @@ -759,7 +759,7 @@ namespace System.Security.Cryptography.Asn1 if (oidValue == null) throw new ArgumentNullException(nameof(oidValue)); - WriteObjectIdentifier(oidValue.AsReadOnlySpan()); + WriteObjectIdentifier(oidValue.AsSpan()); } public void WriteObjectIdentifier(ReadOnlySpan oidValue) @@ -780,7 +780,7 @@ namespace System.Security.Cryptography.Asn1 if (oidValue == null) throw new ArgumentNullException(nameof(oidValue)); - WriteObjectIdentifier(tag, oidValue.AsReadOnlySpan()); + WriteObjectIdentifier(tag, oidValue.AsSpan()); } public void WriteObjectIdentifier(Asn1Tag tag, ReadOnlySpan oidValue) @@ -843,13 +843,13 @@ namespace System.Security.Cryptography.Asn1 BigInteger subIdentifier = ParseSubIdentifier(ref remaining); subIdentifier += 40 * firstComponent; - int localLen = EncodeSubIdentifier(tmp.AsSpan().Slice(tmpOffset), ref subIdentifier); + int localLen = EncodeSubIdentifier(tmp.AsSpan(tmpOffset), ref subIdentifier); tmpOffset += localLen; while (!remaining.IsEmpty) { subIdentifier = ParseSubIdentifier(ref remaining); - localLen = EncodeSubIdentifier(tmp.AsSpan().Slice(tmpOffset), ref subIdentifier); + localLen = EncodeSubIdentifier(tmp.AsSpan(tmpOffset), ref subIdentifier); tmpOffset += localLen; } @@ -920,7 +920,7 @@ namespace System.Security.Cryptography.Asn1 dest[0] = 0; return 1; } - + BigInteger unencoded = subIdentifier; int idx = 0; @@ -974,7 +974,7 @@ namespace System.Security.Cryptography.Asn1 private void WriteEnumeratedValue(Asn1Tag tag, Type tEnum, object enumValue) { CheckUniversalTag(tag, UniversalTagNumber.Enumerated); - + Type backingType = tEnum.GetEnumUnderlyingType(); if (tEnum.IsDefined(typeof(FlagsAttribute), false)) @@ -1080,7 +1080,7 @@ namespace System.Security.Cryptography.Asn1 PopTag(tag, sortContents); } - + public void WriteUtcTime(DateTimeOffset value) { WriteUtcTimeCore(Asn1Tag.UtcTime, value); @@ -1094,10 +1094,23 @@ namespace System.Security.Cryptography.Asn1 WriteUtcTimeCore(tag.AsPrimitive(), value); } + public void WriteUtcTime(DateTimeOffset value, int minLegalYear) + { + // ensure that value is bounded within a century + if (minLegalYear <= value.Year && value.Year < minLegalYear + 100) + { + WriteUtcTime(value); + } + else + { + throw new ArgumentOutOfRangeException(nameof(value)); + } + } + // T-REC-X.680-201508 sec 47 // T-REC-X.690-201508 sec 11.8 private void WriteUtcTimeCore(Asn1Tag tag, DateTimeOffset value) - { + { // Because UtcTime is IMPLICIT VisibleString it technically can have // a constructed form. // DER says character strings must be primitive. @@ -1121,7 +1134,7 @@ namespace System.Security.Cryptography.Asn1 int minute = normalized.Minute; int second = normalized.Second; - Span baseSpan = _buffer.AsSpan().Slice(_offset); + Span baseSpan = _buffer.AsSpan(_offset); StandardFormat format = new StandardFormat('D', 2); if (!Utf8Formatter.TryFormat(year % 100, baseSpan.Slice(0, 2), out _, format) || @@ -1134,7 +1147,7 @@ namespace System.Security.Cryptography.Asn1 Debug.Fail($"Utf8Formatter.TryFormat failed to build components of {normalized:O}"); throw new CryptographicException(); } - + _buffer[_offset + 12] = (byte)'Z'; _offset += UtcTimeValueLength; @@ -1188,13 +1201,17 @@ namespace System.Security.Cryptography.Asn1 if (!omitFractionalSeconds) { long floatingTicks = normalized.Ticks % TimeSpan.TicksPerSecond; - + if (floatingTicks != 0) { // We're only loading in sub-second ticks. // Ticks are defined as 1e-7 seconds, so their printed form // is at the longest "0.1234567", or 9 bytes. +#if __MonoCS__ + fraction = new byte[9]; +#else fraction = stackalloc byte[9]; +#endif decimal decimalTicks = floatingTicks; decimalTicks /= TimeSpan.TicksPerSecond; @@ -1234,7 +1251,7 @@ namespace System.Security.Cryptography.Asn1 int minute = normalized.Minute; int second = normalized.Second; - Span baseSpan = _buffer.AsSpan().Slice(_offset); + Span baseSpan = _buffer.AsSpan(_offset); StandardFormat d4 = new StandardFormat('D', 4); StandardFormat d2 = new StandardFormat('D', 2); @@ -1248,7 +1265,7 @@ namespace System.Security.Cryptography.Asn1 Debug.Fail($"Utf8Formatter.TryFormat failed to build components of {normalized:O}"); throw new CryptographicException(); } - + _offset += IntegerPortionLength; fraction.CopyTo(baseSpan.Slice(IntegerPortionLength)); _offset += fraction.Length; @@ -1287,7 +1304,7 @@ namespace System.Security.Cryptography.Asn1 } bytesWritten = _offset; - _buffer.AsSpan().Slice(0, _offset).CopyTo(dest); + _buffer.AsSpan(0, _offset).CopyTo(dest); return true; } @@ -1305,7 +1322,7 @@ namespace System.Security.Cryptography.Asn1 // If the stack is closed out then everything is a definite encoding (BER, DER) or a // required indefinite encoding (CER). So we're correctly sized up, and ready to copy. - return _buffer.AsSpan().Slice(0, _offset).ToArray(); + return _buffer.AsSpan(0, _offset).ToArray(); } public ReadOnlySpan EncodeAsSpan() @@ -1408,7 +1425,7 @@ namespace System.Security.Cryptography.Asn1 if (str == null) throw new ArgumentNullException(nameof(str)); - WriteCharacterString(encodingType, str.AsReadOnlySpan()); + WriteCharacterString(encodingType, str.AsSpan()); } public void WriteCharacterString(UniversalTagNumber encodingType, ReadOnlySpan str) @@ -1419,11 +1436,11 @@ namespace System.Security.Cryptography.Asn1 } public void WriteCharacterString(Asn1Tag tag, UniversalTagNumber encodingType, string str) - { + { if (str == null) throw new ArgumentNullException(nameof(str)); - WriteCharacterString(tag, encodingType, str.AsReadOnlySpan()); + WriteCharacterString(tag, encodingType, str.AsSpan()); } public void WriteCharacterString(Asn1Tag tag, UniversalTagNumber encodingType, ReadOnlySpan str) @@ -1472,7 +1489,7 @@ namespace System.Security.Cryptography.Asn1 // Clear the constructed tag, if present. WriteTag(tag.AsPrimitive()); WriteLength(size); - Span dest = _buffer.AsSpan().Slice(_offset, size); + Span dest = _buffer.AsSpan(_offset, size); fixed (byte* destPtr = &MemoryMarshal.GetReference(dest)) { @@ -1517,7 +1534,7 @@ namespace System.Security.Cryptography.Asn1 } } - WriteConstructedCerOctetString(tag, tmp.AsSpan().Slice(0, size)); + WriteConstructedCerOctetString(tag, tmp.AsSpan(0, size)); Array.Clear(tmp, 0, size); ArrayPool.Shared.Return(tmp); } @@ -1562,8 +1579,10 @@ namespace System.Security.Cryptography.Asn1 pos = 0; - foreach ((int offset, int length) in positions) + foreach (var position in positions) { + var offset = position.Item1; + var length = position.Item2; Buffer.BlockCopy(buffer, offset, tmp, pos, length); pos += length; } @@ -1612,8 +1631,10 @@ namespace System.Security.Cryptography.Asn1 public int Compare((int, int) x, (int, int) y) { - (int xOffset, int xLength) = x; - (int yOffset, int yLength) = y; + int xOffset = x.Item1; + int xLength = x.Item2; + int yOffset = y.Item1; + int yLength = y.Item2; int value = SetOfValueComparer.Instance.Compare( diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/DSACng.SignVerify.cs b/external/corefx/src/Common/src/System/Security/Cryptography/DSACng.SignVerify.cs index 81425529bf..2b2452d733 100644 --- a/external/corefx/src/Common/src/System/Security/Cryptography/DSACng.SignVerify.cs +++ b/external/corefx/src/Common/src/System/Security/Cryptography/DSACng.SignVerify.cs @@ -45,21 +45,21 @@ namespace System.Security.Cryptography } } - public override unsafe bool TryCreateSignature(ReadOnlySpan source, Span destination, out int bytesWritten) + public override unsafe bool TryCreateSignature(ReadOnlySpan hash, Span destination, out int bytesWritten) { - byte[] arrayToReturnToArrayPool = AdjustHashSizeIfNecessaryWithArrayPool(ref source); + byte[] arrayToReturnToArrayPool = AdjustHashSizeIfNecessaryWithArrayPool(ref hash); try { using (SafeNCryptKeyHandle keyHandle = GetDuplicatedKeyHandle()) { - return CngCommon.TrySignHash(keyHandle, source, destination, AsymmetricPaddingMode.None, null, out bytesWritten); + return CngCommon.TrySignHash(keyHandle, hash, destination, AsymmetricPaddingMode.None, null, out bytesWritten); } } finally { if (arrayToReturnToArrayPool != null) { - Array.Clear(arrayToReturnToArrayPool, 0, source.Length); + Array.Clear(arrayToReturnToArrayPool, 0, hash.Length); ArrayPool.Shared.Return(arrayToReturnToArrayPool); } } @@ -79,16 +79,16 @@ namespace System.Security.Cryptography return VerifySignature((ReadOnlySpan)rgbHash, (ReadOnlySpan)rgbSignature); } - public override bool VerifySignature(ReadOnlySpan rgbHash, ReadOnlySpan rgbSignature) + public override bool VerifySignature(ReadOnlySpan hash, ReadOnlySpan signature) { - byte[] arrayToReturnToArrayPool = AdjustHashSizeIfNecessaryWithArrayPool(ref rgbHash); + byte[] arrayToReturnToArrayPool = AdjustHashSizeIfNecessaryWithArrayPool(ref hash); try { using (SafeNCryptKeyHandle keyHandle = GetDuplicatedKeyHandle()) { unsafe { - return CngCommon.VerifyHash(keyHandle, rgbHash, rgbSignature, AsymmetricPaddingMode.None, null); + return CngCommon.VerifyHash(keyHandle, hash, signature, AsymmetricPaddingMode.None, null); } } } @@ -96,7 +96,7 @@ namespace System.Security.Cryptography { if (arrayToReturnToArrayPool != null) { - Array.Clear(arrayToReturnToArrayPool, 0, rgbHash.Length); + Array.Clear(arrayToReturnToArrayPool, 0, hash.Length); ArrayPool.Shared.Return(arrayToReturnToArrayPool); } } diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/DSAOpenSsl.cs b/external/corefx/src/Common/src/System/Security/Cryptography/DSAOpenSsl.cs index 9610621ec1..31bb5f9ec0 100644 --- a/external/corefx/src/Common/src/System/Security/Cryptography/DSAOpenSsl.cs +++ b/external/corefx/src/Common/src/System/Security/Cryptography/DSAOpenSsl.cs @@ -180,8 +180,8 @@ namespace System.Security.Cryptography protected override byte[] HashData(Stream data, HashAlgorithmName hashAlgorithm) => AsymmetricAlgorithmHelpers.HashData(data, hashAlgorithm); - protected override bool TryHashData(ReadOnlySpan source, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) => - AsymmetricAlgorithmHelpers.TryHashData(source, destination, hashAlgorithm, out bytesWritten); + protected override bool TryHashData(ReadOnlySpan data, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) => + AsymmetricAlgorithmHelpers.TryHashData(data, destination, hashAlgorithm, out bytesWritten); public override byte[] CreateSignature(byte[] rgbHash) { @@ -216,7 +216,7 @@ namespace System.Security.Cryptography } } - public override bool TryCreateSignature(ReadOnlySpan source, Span destination, out int bytesWritten) + public override bool TryCreateSignature(ReadOnlySpan hash, Span destination, out int bytesWritten) { byte[] converted; SafeDsaHandle key = _key.Value; @@ -224,7 +224,7 @@ namespace System.Security.Cryptography byte[] signature = ArrayPool.Shared.Rent(signatureSize); try { - bool success = Interop.Crypto.DsaSign(key, source, source.Length, new Span(signature, 0, signatureSize), out signatureSize); + bool success = Interop.Crypto.DsaSign(key, hash, hash.Length, new Span(signature, 0, signatureSize), out signatureSize); if (!success) { throw Interop.Crypto.CreateOpenSslCryptographicException(); @@ -269,20 +269,20 @@ namespace System.Security.Cryptography return VerifySignature((ReadOnlySpan)rgbHash, (ReadOnlySpan)rgbSignature); } - public override bool VerifySignature(ReadOnlySpan rgbHash, ReadOnlySpan rgbSignature) + public override bool VerifySignature(ReadOnlySpan hash, ReadOnlySpan signature) { SafeDsaHandle key = _key.Value; int expectedSignatureBytes = Interop.Crypto.DsaSignatureFieldSize(key) * 2; - if (rgbSignature.Length != expectedSignatureBytes) + if (signature.Length != expectedSignatureBytes) { // The input isn't of the right length (assuming no DER), so we can't sensibly re-encode it with DER. return false; } - byte[] openSslFormat = AsymmetricAlgorithmHelpers.ConvertIeee1363ToDer(rgbSignature); + byte[] openSslFormat = AsymmetricAlgorithmHelpers.ConvertIeee1363ToDer(signature); - return Interop.Crypto.DsaVerify(key, rgbHash, rgbHash.Length, openSslFormat, openSslFormat.Length); + return Interop.Crypto.DsaVerify(key, hash, openSslFormat); } private void SetKey(SafeDsaHandle newKey) diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/DSASecurityTransforms.cs b/external/corefx/src/Common/src/System/Security/Cryptography/DSASecurityTransforms.cs index e06058c2b3..fefaabb2ff 100644 --- a/external/corefx/src/Common/src/System/Security/Cryptography/DSASecurityTransforms.cs +++ b/external/corefx/src/Common/src/System/Security/Cryptography/DSASecurityTransforms.cs @@ -235,8 +235,8 @@ namespace System.Security.Cryptography protected override byte[] HashData(Stream data, HashAlgorithmName hashAlgorithm) => AsymmetricAlgorithmHelpers.HashData(data, hashAlgorithm); - protected override bool TryHashData(ReadOnlySpan source, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) => - AsymmetricAlgorithmHelpers.TryHashData(source, destination, hashAlgorithm, out bytesWritten); + protected override bool TryHashData(ReadOnlySpan data, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) => + AsymmetricAlgorithmHelpers.TryHashData(data, destination, hashAlgorithm, out bytesWritten); protected override void Dispose(bool disposing) { diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/DerSequenceReader.cs b/external/corefx/src/Common/src/System/Security/Cryptography/DerSequenceReader.cs index b68c9da093..68d9ac1bd2 100644 --- a/external/corefx/src/Common/src/System/Security/Cryptography/DerSequenceReader.cs +++ b/external/corefx/src/Common/src/System/Security/Cryptography/DerSequenceReader.cs @@ -30,6 +30,9 @@ namespace System.Security.Cryptography internal static DateTimeFormatInfo s_validityDateTimeFormatInfo; + private static System.Text.Encoding s_utf8EncodingWithExceptionFallback; + private static System.Text.Encoding s_latin1Encoding; + private readonly byte[] _data; private readonly int _end; private int _position; @@ -383,6 +386,38 @@ namespace System.Security.Cryptography return TrimTrailingNulls(ia5String); } + internal string ReadT61String() + { + EatTag(DerTag.T61String); + int contentLength = EatLength(); + string t61String; + + // Technically the T.61 encoding (code page 20261) should be used here, but many + // implementations don't follow that and use different character sets. CryptoAPI + // on NetFX seems to interpret it as UTF-8 with fallback to ISO 8859-1. OpenSSL + // seems to interpret it as ISO 8859-1 with no support for UTF-8. + // https://github.com/dotnet/corefx/issues/27466 + + System.Text.Encoding utf8EncodingWithExceptionFallback = LazyInitializer.EnsureInitialized( + ref s_utf8EncodingWithExceptionFallback, + () => new UTF8Encoding(false, true)); + System.Text.Encoding latin1Encoding = LazyInitializer.EnsureInitialized( + ref s_latin1Encoding, + () => System.Text.Encoding.GetEncoding("iso-8859-1")); + + try + { + t61String = utf8EncodingWithExceptionFallback.GetString(_data, _position, contentLength); + } + catch (DecoderFallbackException) + { + t61String = latin1Encoding.GetString(_data, _position, contentLength); + } + _position += contentLength; + + return TrimTrailingNulls(t61String); + } + internal DateTime ReadX509Date() { byte tag = PeekTag(); diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/ECCng.HashAlgorithm.cs b/external/corefx/src/Common/src/System/Security/Cryptography/ECCng.HashAlgorithm.cs index 65abfd00f5..1eb4344389 100644 --- a/external/corefx/src/Common/src/System/Security/Cryptography/ECCng.HashAlgorithm.cs +++ b/external/corefx/src/Common/src/System/Security/Cryptography/ECCng.HashAlgorithm.cs @@ -2,6 +2,8 @@ // 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 Internal.NativeCrypto; using static Interop.Crypt32; namespace System.Security.Cryptography @@ -46,5 +48,36 @@ namespace System.Security.Cryptography return new HashAlgorithmName(oid.Name); } + + /// + /// Is the curve named, or once of the special nist curves + /// + internal static bool IsECNamedCurve(string algorithm) + { + return (algorithm == BCryptNative.AlgorithmName.ECDH || + algorithm == BCryptNative.AlgorithmName.ECDsa); + } + + /// + /// Maps algorithm to curve name accounting for the special nist curves + /// + internal static string SpecialNistAlgorithmToCurveName(string algorithm) + { + switch (algorithm) + { + case BCryptNative.AlgorithmName.ECDHP256: + case BCryptNative.AlgorithmName.ECDsaP256: + return "nistP256"; + case BCryptNative.AlgorithmName.ECDHP384: + case BCryptNative.AlgorithmName.ECDsaP384: + return "nistP384"; + case BCryptNative.AlgorithmName.ECDHP521: + case BCryptNative.AlgorithmName.ECDsaP521: + return "nistP521"; + } + + Debug.Fail($"Unknown curve {algorithm}"); + throw new PlatformNotSupportedException(string.Format(SR.Cryptography_CurveNotSupported, algorithm)); + } } } diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/ECCng.ImportExport.cs b/external/corefx/src/Common/src/System/Security/Cryptography/ECCng.ImportExport.cs index 946d1dff61..120c871917 100644 --- a/external/corefx/src/Common/src/System/Security/Cryptography/ECCng.ImportExport.cs +++ b/external/corefx/src/Common/src/System/Security/Cryptography/ECCng.ImportExport.cs @@ -18,7 +18,7 @@ namespace System.Security.Cryptography { internal static partial class ECCng { - internal static byte[] GetNamedCurveBlob(ref ECParameters parameters) + internal static byte[] GetNamedCurveBlob(ref ECParameters parameters, bool ecdh) { Debug.Assert(parameters.Curve.IsNamed); @@ -46,7 +46,9 @@ namespace System.Security.Cryptography { // Build the header BCRYPT_ECCKEY_BLOB* pBcryptBlob = (BCRYPT_ECCKEY_BLOB*)pBlob; - pBcryptBlob->Magic = CurveNameToMagicNumber(parameters.Curve.Oid.FriendlyName, includePrivateParameters); + pBcryptBlob->Magic = ecdh ? + EcdhCurveNameToMagicNumber(parameters.Curve.Oid.FriendlyName, includePrivateParameters) : + EcdsaCurveNameToMagicNumber(parameters.Curve.Oid.FriendlyName, includePrivateParameters); pBcryptBlob->cbKey = parameters.Q.X.Length; // Emit the blob @@ -65,7 +67,7 @@ namespace System.Security.Cryptography return blob; } - internal static byte[] GetPrimeCurveBlob(ref ECParameters parameters) + internal static byte[] GetPrimeCurveBlob(ref ECParameters parameters, bool ecdh) { Debug.Assert(parameters.Curve.IsPrime); @@ -113,8 +115,8 @@ namespace System.Security.Cryptography BCRYPT_ECCFULLKEY_BLOB* pBcryptBlob = (BCRYPT_ECCFULLKEY_BLOB*)pBlob; pBcryptBlob->Version = 1; // No constant for this found in bcrypt.h pBcryptBlob->Magic = includePrivateParameters ? - KeyBlobMagicNumber.BCRYPT_ECDSA_PRIVATE_GENERIC_MAGIC : - KeyBlobMagicNumber.BCRYPT_ECDSA_PUBLIC_GENERIC_MAGIC; + (ecdh ? KeyBlobMagicNumber.BCRYPT_ECDH_PRIVATE_GENERIC_MAGIC : KeyBlobMagicNumber.BCRYPT_ECDSA_PRIVATE_GENERIC_MAGIC) : + (ecdh ? KeyBlobMagicNumber.BCRYPT_ECDH_PUBLIC_GENERIC_MAGIC : KeyBlobMagicNumber.BCRYPT_ECDSA_PUBLIC_GENERIC_MAGIC); pBcryptBlob->cbCofactor = curve.Cofactor.Length; pBcryptBlob->cbFieldLength = parameters.Q.X.Length; pBcryptBlob->cbSeed = curve.Seed == null ? 0 : curve.Seed.Length; @@ -384,7 +386,7 @@ namespace System.Security.Cryptography /// to the pre-Win10 magic numbers to support import on pre-Win10 environments /// that don't have the named curve functionality. /// - private static KeyBlobMagicNumber CurveNameToMagicNumber(string name, bool includePrivateParameters) + private static KeyBlobMagicNumber EcdsaCurveNameToMagicNumber(string name, bool includePrivateParameters) { switch (EcdsaCurveNameToAlgorithm(name)) { @@ -395,13 +397,13 @@ namespace System.Security.Cryptography case AlgorithmName.ECDsaP384: return includePrivateParameters ? - KeyBlobMagicNumber.BCRYPT_ECDSA_PRIVATE_P384_MAGIC : - KeyBlobMagicNumber.BCRYPT_ECDSA_PUBLIC_P384_MAGIC; + KeyBlobMagicNumber.BCRYPT_ECDSA_PRIVATE_P384_MAGIC : + KeyBlobMagicNumber.BCRYPT_ECDSA_PUBLIC_P384_MAGIC; case AlgorithmName.ECDsaP521: return includePrivateParameters ? - KeyBlobMagicNumber.BCRYPT_ECDSA_PRIVATE_P521_MAGIC : - KeyBlobMagicNumber.BCRYPT_ECDSA_PUBLIC_P521_MAGIC; + KeyBlobMagicNumber.BCRYPT_ECDSA_PRIVATE_P521_MAGIC : + KeyBlobMagicNumber.BCRYPT_ECDSA_PUBLIC_P521_MAGIC; default: // all other curves are new in Win10 so use named curves @@ -411,6 +413,38 @@ namespace System.Security.Cryptography } } + /// + /// Map a curve name to magic number. Maps the names of the curves that worked pre-Win10 + /// to the pre-Win10 magic numbers to support import on pre-Win10 environments + /// that don't have the named curve functionality. + /// + private static KeyBlobMagicNumber EcdhCurveNameToMagicNumber(string name, bool includePrivateParameters) + { + switch (EcdhCurveNameToAlgorithm(name)) + { + case AlgorithmName.ECDHP256: + return includePrivateParameters ? + KeyBlobMagicNumber.BCRYPT_ECDH_PRIVATE_P256_MAGIC : + KeyBlobMagicNumber.BCRYPT_ECDH_PUBLIC_P256_MAGIC; + + case AlgorithmName.ECDHP384: + return includePrivateParameters ? + KeyBlobMagicNumber.BCRYPT_ECDH_PRIVATE_P384_MAGIC : + KeyBlobMagicNumber.BCRYPT_ECDH_PUBLIC_P384_MAGIC; + + case AlgorithmName.ECDHP521: + return includePrivateParameters ? + KeyBlobMagicNumber.BCRYPT_ECDH_PRIVATE_P521_MAGIC : + KeyBlobMagicNumber.BCRYPT_ECDH_PUBLIC_P521_MAGIC; + + default: + // all other curves are new in Win10 so use named curves + return includePrivateParameters ? + KeyBlobMagicNumber.BCRYPT_ECDH_PRIVATE_GENERIC_MAGIC : + KeyBlobMagicNumber.BCRYPT_ECDH_PUBLIC_GENERIC_MAGIC; + } + } + /// /// Helper method to map between BCrypt.ECC_CURVE_TYPE_ENUM and ECCurve.ECCurveType /// @@ -508,5 +542,30 @@ namespace System.Security.Cryptography // All other curves are new in Win10 so use generic algorithm return AlgorithmName.ECDsa; } + + /// + /// Map a curve name to algorithm. This enables curves that worked pre-Win10 + /// to work with newer APIs for import and export. + /// + internal static string EcdhCurveNameToAlgorithm(string algorithm) + { + switch (algorithm) + { + case "nistP256": + case "ECDH_P256": + return AlgorithmName.ECDHP256; + + case "nistP384": + case "ECDH_P384": + return AlgorithmName.ECDHP384; + + case "nistP521": + case "ECDH_P521": + return AlgorithmName.ECDHP521; + } + + // All other curves are new in Win10 so use generic algorithm + return AlgorithmName.ECDH; + } } } diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/ECDiffieHellmanCng.ImportExport.cs b/external/corefx/src/Common/src/System/Security/Cryptography/ECDiffieHellmanCng.ImportExport.cs new file mode 100644 index 0000000000..f159aa44c6 --- /dev/null +++ b/external/corefx/src/Common/src/System/Security/Cryptography/ECDiffieHellmanCng.ImportExport.cs @@ -0,0 +1,94 @@ +// 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.Security.Cryptography +{ +#if INTERNAL_ASYMMETRIC_IMPLEMENTATIONS + internal static partial class ECDiffieHellmanImplementation + { +#endif + public sealed partial class ECDiffieHellmanCng : ECDiffieHellman + { + public override void ImportParameters(ECParameters parameters) + { + parameters.Validate(); + ECCurve curve = parameters.Curve; + bool includePrivateParamerters = (parameters.D != null); + + if (curve.IsPrime) + { + byte[] ecExplicitBlob = ECCng.GetPrimeCurveBlob(ref parameters, ecdh: true); + ImportFullKeyBlob(ecExplicitBlob, includePrivateParamerters); + } + else if (curve.IsNamed) + { + // FriendlyName is required; an attempt was already made to default it in ECCurve + if (string.IsNullOrEmpty(curve.Oid.FriendlyName)) + { + throw new PlatformNotSupportedException( + string.Format(SR.Cryptography_InvalidCurveOid, curve.Oid.Value)); + } + + byte[] ecNamedCurveBlob = ECCng.GetNamedCurveBlob(ref parameters, ecdh: true); + ImportKeyBlob(ecNamedCurveBlob, curve.Oid.FriendlyName, includePrivateParamerters); + } + else + { + throw new PlatformNotSupportedException( + string.Format(SR.Cryptography_CurveNotSupported, curve.CurveType.ToString())); + } + } + + public override ECParameters ExportExplicitParameters(bool includePrivateParameters) + { + byte[] blob = ExportFullKeyBlob(includePrivateParameters); + + try + { + ECParameters ecparams = new ECParameters(); + ECCng.ExportPrimeCurveParameters(ref ecparams, blob, includePrivateParameters); + return ecparams; + } + finally + { + Array.Clear(blob, 0, blob.Length); + } + } + + public override ECParameters ExportParameters(bool includePrivateParameters) + { + ECParameters ecparams = new ECParameters(); + + string curveName = GetCurveName(); + byte[] blob = null; + + try + { + if (string.IsNullOrEmpty(curveName)) + { + blob = ExportFullKeyBlob(includePrivateParameters); + ECCng.ExportPrimeCurveParameters(ref ecparams, blob, includePrivateParameters); + } + else + { + blob = ExportKeyBlob(includePrivateParameters); + ECCng.ExportNamedCurveParameters(ref ecparams, blob, includePrivateParameters); + ecparams.Curve = ECCurve.CreateFromFriendlyName(curveName); + } + + return ecparams; + } + finally + { + if (blob != null) + { + Array.Clear(blob, 0, blob.Length); + } + } + } + } +#if INTERNAL_ASYMMETRIC_IMPLEMENTATIONS + } +#endif +} diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/ECDiffieHellmanCng.cs b/external/corefx/src/Common/src/System/Security/Cryptography/ECDiffieHellmanCng.cs new file mode 100644 index 0000000000..0c23531c6f --- /dev/null +++ b/external/corefx/src/Common/src/System/Security/Cryptography/ECDiffieHellmanCng.cs @@ -0,0 +1,146 @@ +// 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 Microsoft.Win32.SafeHandles; + +namespace System.Security.Cryptography +{ +#if INTERNAL_ASYMMETRIC_IMPLEMENTATIONS + internal static partial class ECDiffieHellmanImplementation + { +#endif + public sealed partial class ECDiffieHellmanCng : ECDiffieHellman + { + public ECDiffieHellmanCng() : this(521) { } + + public ECDiffieHellmanCng(int keySize) + { + KeySize = keySize; + } + + public ECDiffieHellmanCng(ECCurve curve) + { + // GenerateKey will already do all of the validation we need. + GenerateKey(curve); + } + + public override int KeySize + { + get + { + return base.KeySize; + } + set + { + if (KeySize == value) + { + return; + } + + // Set the KeySize before DisposeKey so that an invalid value doesn't throw away the key + base.KeySize = value; + + DisposeKey(); + // Key will be lazily re-created + } + } + + /// + /// Set the KeySize without validating against LegalKeySizes. + /// + /// The value to set the KeySize to. + private void ForceSetKeySize(int newKeySize) + { + // In the event that a key was loaded via ImportParameters, curve name, or an IntPtr/SafeHandle + // it could be outside of the bounds that we currently represent as "legal key sizes". + // Since that is our view into the underlying component it can be detached from the + // component's understanding. If it said it has opened a key, and this is the size, trust it. + KeySizeValue = newKeySize; + } + + public override KeySizes[] LegalKeySizes + { + get + { + // Return the three sizes that can be explicitly set (for backwards compatibility) + return new[] { + new KeySizes(minSize: 256, maxSize: 384, skipSize: 128), + new KeySizes(minSize: 521, maxSize: 521, skipSize: 0), + }; + } + } + + public override byte[] DeriveKeyFromHash( + ECDiffieHellmanPublicKey otherPartyPublicKey, + HashAlgorithmName hashAlgorithm, + byte[] secretPrepend, + byte[] secretAppend) + { + if (otherPartyPublicKey == null) + throw new ArgumentNullException(nameof(otherPartyPublicKey)); + if (string.IsNullOrEmpty(hashAlgorithm.Name)) + throw new ArgumentException(SR.Cryptography_HashAlgorithmNameNullOrEmpty, nameof(hashAlgorithm)); + + using (SafeNCryptSecretHandle secretAgreement = DeriveSecretAgreementHandle(otherPartyPublicKey)) + { + return Interop.NCrypt.DeriveKeyMaterialHash( + secretAgreement, + hashAlgorithm.Name, + secretPrepend, + secretAppend, + Interop.NCrypt.SecretAgreementFlags.None); + } + } + + public override byte[] DeriveKeyFromHmac( + ECDiffieHellmanPublicKey otherPartyPublicKey, + HashAlgorithmName hashAlgorithm, + byte[] hmacKey, + byte[] secretPrepend, + byte[] secretAppend) + { + if (otherPartyPublicKey == null) + throw new ArgumentNullException(nameof(otherPartyPublicKey)); + if (string.IsNullOrEmpty(hashAlgorithm.Name)) + throw new ArgumentException(SR.Cryptography_HashAlgorithmNameNullOrEmpty, nameof(hashAlgorithm)); + + using (SafeNCryptSecretHandle secretAgreement = DeriveSecretAgreementHandle(otherPartyPublicKey)) + { + Interop.NCrypt.SecretAgreementFlags flags = hmacKey == null ? + Interop.NCrypt.SecretAgreementFlags.UseSecretAsHmacKey : + Interop.NCrypt.SecretAgreementFlags.None; + + return Interop.NCrypt.DeriveKeyMaterialHmac( + secretAgreement, + hashAlgorithm.Name, + hmacKey, + secretPrepend, + secretAppend, + flags); + } + } + + public override byte[] DeriveKeyTls(ECDiffieHellmanPublicKey otherPartyPublicKey, byte[] prfLabel, byte[] prfSeed) + { + if (otherPartyPublicKey == null) + throw new ArgumentNullException(nameof(otherPartyPublicKey)); + if (prfLabel == null) + throw new ArgumentNullException(nameof(prfLabel)); + if (prfSeed == null) + throw new ArgumentNullException(nameof(prfSeed)); + + using (SafeNCryptSecretHandle secretAgreement = DeriveSecretAgreementHandle(otherPartyPublicKey)) + { + return Interop.NCrypt.DeriveKeyMaterialTls( + secretAgreement, + prfLabel, + prfSeed, + Interop.NCrypt.SecretAgreementFlags.None); + } + } + } +#if INTERNAL_ASYMMETRIC_IMPLEMENTATIONS + } +#endif +} diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/ECDiffieHellmanDerivation.cs b/external/corefx/src/Common/src/System/Security/Cryptography/ECDiffieHellmanDerivation.cs new file mode 100644 index 0000000000..3b7071ab76 --- /dev/null +++ b/external/corefx/src/Common/src/System/Security/Cryptography/ECDiffieHellmanDerivation.cs @@ -0,0 +1,259 @@ +// 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.InteropServices; + +namespace System.Security.Cryptography +{ + internal static class ECDiffieHellmanDerivation + { + /// + /// Derive the raw ECDH value into , if present, otherwise returning the value. + /// + internal delegate byte[] DeriveSecretAgreement(ECDiffieHellmanPublicKey otherPartyPublicKey, IncrementalHash hasher); + + internal static byte[] DeriveKeyFromHash( + ECDiffieHellmanPublicKey otherPartyPublicKey, + HashAlgorithmName hashAlgorithm, + ReadOnlySpan secretPrepend, + ReadOnlySpan secretAppend, + DeriveSecretAgreement deriveSecretAgreement) + { + Debug.Assert(otherPartyPublicKey != null); + Debug.Assert(!string.IsNullOrEmpty(hashAlgorithm.Name)); + + using (IncrementalHash hash = IncrementalHash.CreateHash(hashAlgorithm)) + { + hash.AppendData(secretPrepend); + + byte[] secretAgreement = deriveSecretAgreement(otherPartyPublicKey, hash); + // We want the side effect, and it should not have returned the answer. + Debug.Assert(secretAgreement == null); + + hash.AppendData(secretAppend); + + return hash.GetHashAndReset(); + } + } + + internal static unsafe byte[] DeriveKeyFromHmac( + ECDiffieHellmanPublicKey otherPartyPublicKey, + HashAlgorithmName hashAlgorithm, + byte[] hmacKey, + ReadOnlySpan secretPrepend, + ReadOnlySpan secretAppend, + DeriveSecretAgreement deriveSecretAgreement) + { + Debug.Assert(otherPartyPublicKey != null); + Debug.Assert(!string.IsNullOrEmpty(hashAlgorithm.Name)); + + // If an hmac key is provided then calculate + // HMAC(hmacKey, prepend || derived || append) + // + // Otherwise, calculate + // HMAC(derived, prepend || derived || append) + + bool useSecretAsKey = hmacKey == null; + + if (useSecretAsKey) + { + hmacKey = deriveSecretAgreement(otherPartyPublicKey, null); + Debug.Assert(hmacKey != null); + } + + // Reduce the likelihood of the value getting copied during heap compaction. + fixed (byte* pinnedHmacKey = hmacKey) + { + try + { + using (IncrementalHash hash = IncrementalHash.CreateHMAC(hashAlgorithm, hmacKey)) + { + hash.AppendData(secretPrepend); + + if (useSecretAsKey) + { + hash.AppendData(hmacKey); + } + else + { + byte[] secretAgreement = deriveSecretAgreement(otherPartyPublicKey, hash); + // We want the side effect, and it should not have returned the answer. + Debug.Assert(secretAgreement == null); + } + + hash.AppendData(secretAppend); + return hash.GetHashAndReset(); + } + } + finally + { + // If useSecretAsKey is false then hmacKey is owned by the caller, not ours to clear. + if (useSecretAsKey) + { + Array.Clear(hmacKey, 0, hmacKey.Length); + } + } + } + } + + internal static unsafe byte[] DeriveKeyTls( + ECDiffieHellmanPublicKey otherPartyPublicKey, + ReadOnlySpan prfLabel, + ReadOnlySpan prfSeed, + DeriveSecretAgreement deriveSecretAgreement) + { + Debug.Assert(otherPartyPublicKey != null); + + if (prfSeed.Length != 64) + { + throw new CryptographicException(SR.Cryptography_TlsRequires64ByteSeed); + } + + // Windows produces a 48-byte output, so that's what we do, too. + byte[] ret = new byte[48]; + + const int Sha1Size = 20; + const int Md5Size = 16; + + byte[] secretAgreement = deriveSecretAgreement(otherPartyPublicKey, null); + Debug.Assert(secretAgreement != null); + + // Reduce the likelihood of the value getting copied during heap compaction. + fixed (byte* pinnedSecretAgreement = secretAgreement) + { + try + { + // https://tools.ietf.org/html/rfc4346#section-5 + // + // S1 and S2 are the two halves of the secret, and each is the same + // length. S1 is taken from the first half of the secret, S2 from the + // second half. Their length is created by rounding up the length of + // the overall secret, divided by two; thus, if the original secret is + // an odd number of bytes long, the last byte of S1 will be the same as + // the first byte of S2. + // + int half = secretAgreement.Length / 2; + int odd = secretAgreement.Length & 1; + + // PRF(secret, label, seed) = P_MD5(S1, label + seed) XOR + // P_SHA-1(S2, label + seed); + + PHash( + HashAlgorithmName.MD5, + new ReadOnlySpan(secretAgreement, 0, half + odd), + prfLabel, + prfSeed, + Md5Size, + ret); + + Span part2 = stackalloc byte[ret.Length]; + + PHash( + HashAlgorithmName.SHA1, + new ReadOnlySpan(secretAgreement, half, half + odd), + prfLabel, + prfSeed, + Sha1Size, + part2); + + for (int i = 0; i < ret.Length; i++) + { + ret[i] ^= part2[i]; + } + + return ret; + } + finally + { + Array.Clear(secretAgreement, 0, secretAgreement.Length); + } + } + } + + private static unsafe void PHash( + HashAlgorithmName algorithmName, + ReadOnlySpan secret, + ReadOnlySpan prfLabel, + ReadOnlySpan prfSeed, + int hashOutputSize, + Span ret) + { + // https://tools.ietf.org/html/rfc4346#section-5 + // + // P_hash(secret, seed) = HMAC_hash(secret, A(1) + seed) + + // HMAC_hash(secret, A(2) + seed) + + // HMAC_hash(secret, A(3) + seed) + ... + // + // A(0) = seed + // A(i) = HMAC_hash(secret, A(i-1)) + // + // This is called via PRF, which turns (label || seed) into seed. + + byte[] secretTmp = new byte[secret.Length]; + + // Keep secretTmp pinned the whole time it has a secret in it, so it + // doesn't get copied around during heap compaction. + fixed (byte* pinnedSecretTmp = secretTmp) + { + secret.CopyTo(secretTmp); + + try + { + Span retSpan = ret; + + using (IncrementalHash hasher = IncrementalHash.CreateHMAC(algorithmName, secretTmp)) + { + Span a = stackalloc byte[hashOutputSize]; + Span p = stackalloc byte[hashOutputSize]; + + // A(1) + hasher.AppendData(prfLabel); + hasher.AppendData(prfSeed); + + if (!hasher.TryGetHashAndReset(a, out int bytesWritten) || bytesWritten != hashOutputSize) + { + throw new CryptographicException(); + } + + while (true) + { + // HMAC_hash(secret, A(i) || seed) => p + hasher.AppendData(a); + hasher.AppendData(prfLabel); + hasher.AppendData(prfSeed); + + if (!hasher.TryGetHashAndReset(p, out bytesWritten) || bytesWritten != hashOutputSize) + { + throw new CryptographicException(); + } + + int len = Math.Min(p.Length, retSpan.Length); + + p.Slice(0, len).CopyTo(retSpan); + retSpan = retSpan.Slice(len); + + if (retSpan.Length == 0) + { + return; + } + + // Build the next A(i) + hasher.AppendData(a); + + if (!hasher.TryGetHashAndReset(a, out bytesWritten) || bytesWritten != hashOutputSize) + { + throw new CryptographicException(); + } + } + } + } + finally + { + Array.Clear(secretTmp, 0, secretTmp.Length); + } + } + } + } +} diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/ECDiffieHellmanOpenSsl.Derive.cs b/external/corefx/src/Common/src/System/Security/Cryptography/ECDiffieHellmanOpenSsl.Derive.cs new file mode 100644 index 0000000000..6426aefc69 --- /dev/null +++ b/external/corefx/src/Common/src/System/Security/Cryptography/ECDiffieHellmanOpenSsl.Derive.cs @@ -0,0 +1,202 @@ +// 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; +using System.Diagnostics; +using Microsoft.Win32.SafeHandles; + +namespace System.Security.Cryptography +{ +#if INTERNAL_ASYMMETRIC_IMPLEMENTATIONS + internal static partial class ECDiffieHellmanImplementation + { +#endif + public sealed partial class ECDiffieHellmanOpenSsl : ECDiffieHellman + { + /// + /// Given a second party's public key, derive shared key material + /// + public override byte[] DeriveKeyMaterial(ECDiffieHellmanPublicKey otherPartyPublicKey) => + DeriveKeyFromHash(otherPartyPublicKey, HashAlgorithmName.SHA256, null, null); + + public override byte[] DeriveKeyFromHash( + ECDiffieHellmanPublicKey otherPartyPublicKey, + HashAlgorithmName hashAlgorithm, + byte[] secretPrepend, + byte[] secretAppend) + { + if (otherPartyPublicKey == null) + throw new ArgumentNullException(nameof(otherPartyPublicKey)); + if (string.IsNullOrEmpty(hashAlgorithm.Name)) + throw new ArgumentException(SR.Cryptography_HashAlgorithmNameNullOrEmpty, nameof(hashAlgorithm)); + + return ECDiffieHellmanDerivation.DeriveKeyFromHash( + otherPartyPublicKey, + hashAlgorithm, + secretPrepend, + secretAppend, + (pubKey, hasher) => DeriveSecretAgreement(pubKey, hasher)); + } + + public override byte[] DeriveKeyFromHmac( + ECDiffieHellmanPublicKey otherPartyPublicKey, + HashAlgorithmName hashAlgorithm, + byte[] hmacKey, + byte[] secretPrepend, + byte[] secretAppend) + { + if (otherPartyPublicKey == null) + throw new ArgumentNullException(nameof(otherPartyPublicKey)); + if (string.IsNullOrEmpty(hashAlgorithm.Name)) + throw new ArgumentException(SR.Cryptography_HashAlgorithmNameNullOrEmpty, nameof(hashAlgorithm)); + + return ECDiffieHellmanDerivation.DeriveKeyFromHmac( + otherPartyPublicKey, + hashAlgorithm, + hmacKey, + secretPrepend, + secretAppend, + (pubKey, hasher) => DeriveSecretAgreement(pubKey, hasher)); + } + + public override byte[] DeriveKeyTls(ECDiffieHellmanPublicKey otherPartyPublicKey, byte[] prfLabel, byte[] prfSeed) + { + if (otherPartyPublicKey == null) + throw new ArgumentNullException(nameof(otherPartyPublicKey)); + if (prfLabel == null) + throw new ArgumentNullException(nameof(prfLabel)); + if (prfSeed == null) + throw new ArgumentNullException(nameof(prfSeed)); + + return ECDiffieHellmanDerivation.DeriveKeyTls( + otherPartyPublicKey, + prfLabel, + prfSeed, + (pubKey, hasher) => DeriveSecretAgreement(pubKey, hasher)); + } + + /// + /// Get the secret agreement generated between two parties + /// + private byte[] DeriveSecretAgreement(ECDiffieHellmanPublicKey otherPartyPublicKey, IncrementalHash hasher) + { + Debug.Assert(otherPartyPublicKey != null); + + // Ensure that this ECDH object contains a private key by attempting a parameter export + // which will throw an OpenSslCryptoException if no private key is available + ECParameters thisKeyExplicit = ExportExplicitParameters(true); + bool thisIsNamed = Interop.Crypto.EcKeyHasCurveName(_key.Value); + ECDiffieHellmanOpenSslPublicKey otherKey = otherPartyPublicKey as ECDiffieHellmanOpenSslPublicKey; + bool disposeOtherKey = false; + + if (otherKey == null) + { + disposeOtherKey = true; + + ECParameters otherParameters = + thisIsNamed + ? otherPartyPublicKey.ExportParameters() + : otherPartyPublicKey.ExportExplicitParameters(); + + otherKey = new ECDiffieHellmanOpenSslPublicKey(otherParameters); + } + + bool otherIsNamed = otherKey.HasCurveName; + + SafeEvpPKeyHandle ourKey = null; + SafeEvpPKeyHandle theirKey = null; + byte[] rented = null; + int secretLength = 0; + + try + { + if (otherKey.KeySize != KeySize) + { + throw new ArgumentException(SR.Cryptography_ArgECDHKeySizeMismatch, nameof(otherPartyPublicKey)); + } + + if (otherIsNamed == thisIsNamed) + { + ourKey = _key.UpRefKeyHandle(); + theirKey = otherKey.DuplicateKeyHandle(); + } + else if (otherIsNamed) + { + ourKey = _key.UpRefKeyHandle(); + + using (ECOpenSsl tmp = new ECOpenSsl(otherKey.ExportExplicitParameters())) + { + theirKey = tmp.UpRefKeyHandle(); + } + } + else + { + using (ECOpenSsl tmp = new ECOpenSsl(thisKeyExplicit)) + { + ourKey = tmp.UpRefKeyHandle(); + } + + theirKey = otherKey.DuplicateKeyHandle(); + } + + using (SafeEvpPKeyCtxHandle ctx = Interop.Crypto.EvpPKeyCtxCreate(ourKey, theirKey, out uint secretLengthU)) + { + if (ctx == null || ctx.IsInvalid || secretLengthU == 0 || secretLengthU > int.MaxValue) + { + throw Interop.Crypto.CreateOpenSslCryptographicException(); + } + + secretLength = (int)secretLengthU; + + // Indicate that secret can hold stackallocs from nested scopes + Span secret = stackalloc byte[0]; + + // Arbitrary limit. But it covers secp521r1, which is the biggest common case. + const int StackAllocMax = 66; + + if (secretLength > StackAllocMax) + { + rented = ArrayPool.Shared.Rent(secretLength); + secret = new Span(rented, 0, secretLength); + } + else + { + secret = stackalloc byte[secretLength]; + } + + Interop.Crypto.EvpPKeyDeriveSecretAgreement(ctx, secret); + + if (hasher == null) + { + return secret.ToArray(); + } + else + { + hasher.AppendData(secret); + return null; + } + } + } + finally + { + theirKey?.Dispose(); + ourKey?.Dispose(); + + if (disposeOtherKey) + { + otherKey.Dispose(); + } + + if (rented != null) + { + Array.Clear(rented, 0, secretLength); + ArrayPool.Shared.Return(rented); + } + } + } + } +#if INTERNAL_ASYMMETRIC_IMPLEMENTATIONS + } +#endif +} diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/ECDiffieHellmanOpenSsl.cs b/external/corefx/src/Common/src/System/Security/Cryptography/ECDiffieHellmanOpenSsl.cs new file mode 100644 index 0000000000..bf007e647c --- /dev/null +++ b/external/corefx/src/Common/src/System/Security/Cryptography/ECDiffieHellmanOpenSsl.cs @@ -0,0 +1,90 @@ +// 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.Security.Cryptography +{ +#if INTERNAL_ASYMMETRIC_IMPLEMENTATIONS + internal static partial class ECDiffieHellmanImplementation + { +#endif + public sealed partial class ECDiffieHellmanOpenSsl : ECDiffieHellman + { + private ECOpenSsl _key; + + public ECDiffieHellmanOpenSsl(ECCurve curve) + { + _key = new ECOpenSsl(curve); + KeySizeValue = _key.KeySize; + } + + public ECDiffieHellmanOpenSsl() + : this(521) + { + } + + public ECDiffieHellmanOpenSsl(int keySize) + { + base.KeySize = keySize; + _key = new ECOpenSsl(this); + } + + public override KeySizes[] LegalKeySizes => + new[] { + new KeySizes(minSize: 256, maxSize: 384, skipSize: 128), + new KeySizes(minSize: 521, maxSize: 521, skipSize: 0) + }; + + protected override void Dispose(bool disposing) + { + if (disposing) + { + _key.Dispose(); + } + + base.Dispose(disposing); + } + + public override int KeySize + { + get + { + return base.KeySize; + } + set + { + if (KeySize == value) + { + return; + } + + // Set the KeySize before FreeKey so that an invalid value doesn't throw away the key + base.KeySize = value; + _key?.Dispose(); + _key = new ECOpenSsl(this); + } + } + + public override void GenerateKey(ECCurve curve) + { + KeySizeValue = _key.GenerateKey(curve); + } + + public override ECDiffieHellmanPublicKey PublicKey => + new ECDiffieHellmanOpenSslPublicKey(_key.UpRefKeyHandle()); + + public override void ImportParameters(ECParameters parameters) + { + KeySizeValue = _key.ImportParameters(parameters); + } + + public override ECParameters ExportExplicitParameters(bool includePrivateParameters) => + ECOpenSsl.ExportExplicitParameters(_key.Value, includePrivateParameters); + + public override ECParameters ExportParameters(bool includePrivateParameters) => + ECOpenSsl.ExportParameters(_key.Value, includePrivateParameters); + } +#if INTERNAL_ASYMMETRIC_IMPLEMENTATIONS + } +#endif +} diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/ECDiffieHellmanOpenSslPublicKey.cs b/external/corefx/src/Common/src/System/Security/Cryptography/ECDiffieHellmanOpenSslPublicKey.cs new file mode 100644 index 0000000000..5ecc47f6e7 --- /dev/null +++ b/external/corefx/src/Common/src/System/Security/Cryptography/ECDiffieHellmanOpenSslPublicKey.cs @@ -0,0 +1,98 @@ +// 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 Microsoft.Win32.SafeHandles; + +namespace System.Security.Cryptography +{ +#if INTERNAL_ASYMMETRIC_IMPLEMENTATIONS + internal static partial class ECDiffieHellmanImplementation + { +#endif + internal sealed class ECDiffieHellmanOpenSslPublicKey : ECDiffieHellmanPublicKey + { + private readonly ECOpenSsl _key; + + internal ECDiffieHellmanOpenSslPublicKey(SafeEvpPKeyHandle pkeyHandle) + { + if (pkeyHandle == null) + throw new ArgumentNullException(nameof(pkeyHandle)); + if (pkeyHandle.IsInvalid) + throw new ArgumentException(SR.Cryptography_OpenInvalidHandle, nameof(pkeyHandle)); + + // If ecKey is valid it has already been up-ref'd, so we can just use this handle as-is. + SafeEcKeyHandle key = Interop.Crypto.EvpPkeyGetEcKey(pkeyHandle); + + if (key.IsInvalid) + { + key.Dispose(); + throw Interop.Crypto.CreateOpenSslCryptographicException(); + } + + _key = new ECOpenSsl(key); + } + + internal ECDiffieHellmanOpenSslPublicKey(ECParameters parameters) + { + _key = new ECOpenSsl(parameters); + } + + public override string ToXmlString() + { + throw new PlatformNotSupportedException(); + } + + public override byte[] ToByteArray() + { + throw new PlatformNotSupportedException(); + } + + public override ECParameters ExportExplicitParameters() => + ECOpenSsl.ExportExplicitParameters(_key.Value, includePrivateParameters: false); + + public override ECParameters ExportParameters() => + ECOpenSsl.ExportParameters(_key.Value, includePrivateParameters: false); + + internal bool HasCurveName => Interop.Crypto.EcKeyHasCurveName(_key.Value); + + internal int KeySize => _key.KeySize; + + protected override void Dispose(bool disposing) + { + if (disposing) + { + _key?.Dispose(); + } + + base.Dispose(disposing); + } + + internal SafeEvpPKeyHandle DuplicateKeyHandle() + { + SafeEcKeyHandle currentKey = _key.Value; + SafeEvpPKeyHandle pkeyHandle = Interop.Crypto.EvpPkeyCreate(); + + try + { + // Wrapping our key in an EVP_PKEY will up_ref our key. + // When the EVP_PKEY is Disposed it will down_ref the key. + // So everything should be copacetic. + if (!Interop.Crypto.EvpPkeySetEcKey(pkeyHandle, currentKey)) + { + throw Interop.Crypto.CreateOpenSslCryptographicException(); + } + + return pkeyHandle; + } + catch + { + pkeyHandle.Dispose(); + throw; + } + } + } +#if INTERNAL_ASYMMETRIC_IMPLEMENTATIONS + } +#endif +} diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/ECDiffieHellmanSecurityTransforms.cs b/external/corefx/src/Common/src/System/Security/Cryptography/ECDiffieHellmanSecurityTransforms.cs new file mode 100644 index 0000000000..9b57522297 --- /dev/null +++ b/external/corefx/src/Common/src/System/Security/Cryptography/ECDiffieHellmanSecurityTransforms.cs @@ -0,0 +1,289 @@ +// 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.Security.Cryptography.Apple; + +namespace System.Security.Cryptography +{ + internal static partial class ECDiffieHellmanImplementation + { + public sealed partial class ECDiffieHellmanSecurityTransforms : ECDiffieHellman + { + private readonly EccSecurityTransforms _ecc = new EccSecurityTransforms(); + + public ECDiffieHellmanSecurityTransforms() + { + KeySize = 521; + } + + internal ECDiffieHellmanSecurityTransforms(SafeSecKeyRefHandle publicKey) + { + KeySizeValue = _ecc.SetKeyAndGetSize(SecKeyPair.PublicOnly(publicKey)); + } + + internal ECDiffieHellmanSecurityTransforms(SafeSecKeyRefHandle publicKey, SafeSecKeyRefHandle privateKey) + { + KeySizeValue = _ecc.SetKeyAndGetSize(SecKeyPair.PublicPrivatePair(publicKey, privateKey)); + } + + public override KeySizes[] LegalKeySizes + { + get + { + // Return the three sizes that can be explicitly set (for backwards compatibility) + return new[] + { + new KeySizes(minSize: 256, maxSize: 384, skipSize: 128), + new KeySizes(minSize: 521, maxSize: 521, skipSize: 0), + }; + } + } + + public override int KeySize + { + get { return base.KeySize; } + set + { + if (KeySize == value) + return; + + // Set the KeySize before freeing the key so that an invalid value doesn't throw away the key + base.KeySize = value; + _ecc.Dispose(); + } + } + + protected override void Dispose(bool disposing) + { + if (disposing) + { + _ecc.Dispose(); + } + + base.Dispose(disposing); + } + + public override ECParameters ExportExplicitParameters(bool includePrivateParameters) + { + throw new PlatformNotSupportedException(SR.Cryptography_ECC_NamedCurvesOnly); + } + + public override ECParameters ExportParameters(bool includePrivateParameters) + { + return _ecc.ExportParameters(includePrivateParameters, KeySize); + } + + public override void ImportParameters(ECParameters parameters) + { + KeySizeValue = _ecc.ImportParameters(parameters); + } + + public override void GenerateKey(ECCurve curve) + { + KeySizeValue = _ecc.GenerateKey(curve); + } + + private SecKeyPair GetKeys() + { + return _ecc.GetOrGenerateKeys(KeySize); + } + + public override byte[] DeriveKeyMaterial(ECDiffieHellmanPublicKey otherPartyPublicKey) => + DeriveKeyFromHash(otherPartyPublicKey, HashAlgorithmName.SHA256, null, null); + + public override byte[] DeriveKeyFromHash( + ECDiffieHellmanPublicKey otherPartyPublicKey, + HashAlgorithmName hashAlgorithm, + byte[] secretPrepend, + byte[] secretAppend) + { + if (otherPartyPublicKey == null) + throw new ArgumentNullException(nameof(otherPartyPublicKey)); + if (string.IsNullOrEmpty(hashAlgorithm.Name)) + throw new ArgumentException(SR.Cryptography_HashAlgorithmNameNullOrEmpty, nameof(hashAlgorithm)); + + return ECDiffieHellmanDerivation.DeriveKeyFromHash( + otherPartyPublicKey, + hashAlgorithm, + secretPrepend, + secretAppend, + (pubKey, hasher) => DeriveSecretAgreement(pubKey, hasher)); + } + + public override byte[] DeriveKeyFromHmac( + ECDiffieHellmanPublicKey otherPartyPublicKey, + HashAlgorithmName hashAlgorithm, + byte[] hmacKey, + byte[] secretPrepend, + byte[] secretAppend) + { + if (otherPartyPublicKey == null) + throw new ArgumentNullException(nameof(otherPartyPublicKey)); + if (string.IsNullOrEmpty(hashAlgorithm.Name)) + throw new ArgumentException(SR.Cryptography_HashAlgorithmNameNullOrEmpty, nameof(hashAlgorithm)); + + return ECDiffieHellmanDerivation.DeriveKeyFromHmac( + otherPartyPublicKey, + hashAlgorithm, + hmacKey, + secretPrepend, + secretAppend, + (pubKey, hasher) => DeriveSecretAgreement(pubKey, hasher)); + } + + public override byte[] DeriveKeyTls(ECDiffieHellmanPublicKey otherPartyPublicKey, byte[] prfLabel, + byte[] prfSeed) + { + if (otherPartyPublicKey == null) + throw new ArgumentNullException(nameof(otherPartyPublicKey)); + if (prfLabel == null) + throw new ArgumentNullException(nameof(prfLabel)); + if (prfSeed == null) + throw new ArgumentNullException(nameof(prfSeed)); + + return ECDiffieHellmanDerivation.DeriveKeyTls( + otherPartyPublicKey, + prfLabel, + prfSeed, + (pubKey, hasher) => DeriveSecretAgreement(pubKey, hasher)); + } + + private byte[] DeriveSecretAgreement(ECDiffieHellmanPublicKey otherPartyPublicKey, IncrementalHash hasher) + { + if (!(otherPartyPublicKey is ECDiffieHellmanSecurityTransformsPublicKey secTransPubKey)) + { + secTransPubKey = + new ECDiffieHellmanSecurityTransformsPublicKey(otherPartyPublicKey.ExportParameters()); + } + + try + { + SafeSecKeyRefHandle otherPublic = secTransPubKey.KeyHandle; + + if (Interop.AppleCrypto.EccGetKeySizeInBits(otherPublic) != KeySize) + { + throw new ArgumentException( + SR.Cryptography_ArgECDHKeySizeMismatch, + nameof(otherPartyPublicKey)); + } + + SafeSecKeyRefHandle thisPrivate = GetKeys().PrivateKey; + + if (thisPrivate == null) + { + throw new CryptographicException(SR.Cryptography_CSP_NoPrivateKey); + } + + // Since Apple only supports secp256r1, secp384r1, and secp521r1; and 521 fits in + // 66 bytes ((521 + 7) / 8), the Span path will always succeed. + Span secretSpan = stackalloc byte[66]; + + byte[] secret = Interop.AppleCrypto.EcdhKeyAgree( + thisPrivate, + otherPublic, + secretSpan, + out int bytesWritten); + + // Either we wrote to the span or we returned an array, but not both, and not neither. + // ("neither" would have thrown) + Debug.Assert( + (bytesWritten == 0) != (secret == null), + $"bytesWritten={bytesWritten}, (secret==null)={secret == null}"); + + if (hasher == null) + { + return secret ?? secretSpan.Slice(0, bytesWritten).ToArray(); + } + + if (secret == null) + { + hasher.AppendData(secretSpan.Slice(0, bytesWritten)); + } + else + { + hasher.AppendData(secret); + Array.Clear(secret, 0, secret.Length); + } + + return null; + } + finally + { + if (!ReferenceEquals(otherPartyPublicKey, secTransPubKey)) + { + secTransPubKey.Dispose(); + } + } + } + + public override ECDiffieHellmanPublicKey PublicKey => + new ECDiffieHellmanSecurityTransformsPublicKey(ExportParameters(false)); + + private class ECDiffieHellmanSecurityTransformsPublicKey : ECDiffieHellmanPublicKey + { + private EccSecurityTransforms _ecc; + + public ECDiffieHellmanSecurityTransformsPublicKey(ECParameters ecParameters) + { + Debug.Assert(ecParameters.D == null); + _ecc = new EccSecurityTransforms(); + _ecc.ImportParameters(ecParameters); + } + + public override string ToXmlString() + { + throw new PlatformNotSupportedException(); + } + + /// + /// There is no key blob format for OpenSSL ECDH like there is for Cng ECDH. Instead of allowing + /// this to return a potentially confusing empty byte array, we opt to throw instead. + /// + public override byte[] ToByteArray() + { + throw new PlatformNotSupportedException(); + } + + protected override void Dispose(bool disposing) + { + if (disposing) + { + _ecc.Dispose(); + _ecc = null; + } + + base.Dispose(disposing); + } + + public override ECParameters ExportExplicitParameters() => + throw new PlatformNotSupportedException(SR.Cryptography_ECC_NamedCurvesOnly); + + public override ECParameters ExportParameters() + { + if (_ecc == null) + { + throw new ObjectDisposedException(typeof(ECDiffieHellmanSecurityTransformsPublicKey).Name); + } + + return _ecc.ExportParameters(includePrivateParameters: false, keySizeInBIts: -1); + } + + internal SafeSecKeyRefHandle KeyHandle + { + get + { + if (_ecc == null) + { + throw new ObjectDisposedException( + typeof(ECDiffieHellmanSecurityTransformsPublicKey).Name); + } + + return _ecc.GetOrGenerateKeys(-1).PublicKey; + } + } + } + } + } +} diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/ECDsaCng.ImportExport.cs b/external/corefx/src/Common/src/System/Security/Cryptography/ECDsaCng.ImportExport.cs index b93cb608a7..1083ccca17 100644 --- a/external/corefx/src/Common/src/System/Security/Cryptography/ECDsaCng.ImportExport.cs +++ b/external/corefx/src/Common/src/System/Security/Cryptography/ECDsaCng.ImportExport.cs @@ -29,12 +29,12 @@ namespace System.Security.Cryptography { parameters.Validate(); ECCurve curve = parameters.Curve; - bool includePrivateParamerters = (parameters.D != null); + bool includePrivateParameters = (parameters.D != null); if (curve.IsPrime) { - byte[] ecExplicitBlob = ECCng.GetPrimeCurveBlob(ref parameters); - ImportFullKeyBlob(ecExplicitBlob, includePrivateParamerters); + byte[] ecExplicitBlob = ECCng.GetPrimeCurveBlob(ref parameters, ecdh: false); + ImportFullKeyBlob(ecExplicitBlob, includePrivateParameters); } else if (curve.IsNamed) { @@ -42,8 +42,8 @@ namespace System.Security.Cryptography if (string.IsNullOrEmpty(curve.Oid.FriendlyName)) throw new PlatformNotSupportedException(string.Format(SR.Cryptography_InvalidCurveOid, curve.Oid.Value.ToString())); - byte[] ecNamedCurveBlob = ECCng.GetNamedCurveBlob(ref parameters); - ImportKeyBlob(ecNamedCurveBlob, curve.Oid.FriendlyName, includePrivateParamerters); + byte[] ecNamedCurveBlob = ECCng.GetNamedCurveBlob(ref parameters, ecdh: false); + ImportKeyBlob(ecNamedCurveBlob, curve.Oid.FriendlyName, includePrivateParameters); } else { diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/ECDsaCng.cs b/external/corefx/src/Common/src/System/Security/Cryptography/ECDsaCng.cs index 1969dbd7fb..a6da8c2755 100644 --- a/external/corefx/src/Common/src/System/Security/Cryptography/ECDsaCng.cs +++ b/external/corefx/src/Common/src/System/Security/Cryptography/ECDsaCng.cs @@ -89,42 +89,6 @@ namespace System.Security.Cryptography }; } } - - /// - /// Is the curve named, or once of the special nist curves - /// - internal static bool IsECNamedCurve(string algorithm) - { - return (algorithm == AlgorithmName.ECDH || - algorithm == AlgorithmName.ECDsa); - } - - /// - /// Maps algorithm to curve name accounting for the special nist curves - /// - internal static string SpecialNistAlgorithmToCurveName(string algorithm) - { - if (algorithm == AlgorithmName.ECDHP256 || - algorithm == AlgorithmName.ECDsaP256) - { - return "nistP256"; - } - - if (algorithm == AlgorithmName.ECDHP384 || - algorithm == AlgorithmName.ECDsaP384) - { - return "nistP384"; - } - - if (algorithm == AlgorithmName.ECDHP521 || - algorithm == AlgorithmName.ECDsaP521) - { - return "nistP521"; - } - - Debug.Fail(string.Format("Unknown curve {0}", algorithm)); - throw new PlatformNotSupportedException(string.Format(SR.Cryptography_CurveNotSupported, algorithm)); - } } #if INTERNAL_ASYMMETRIC_IMPLEMENTATIONS } diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/ECDsaOpenSsl.ImportExport.cs b/external/corefx/src/Common/src/System/Security/Cryptography/ECDsaOpenSsl.ImportExport.cs deleted file mode 100644 index 4dd9ac4b68..0000000000 --- a/external/corefx/src/Common/src/System/Security/Cryptography/ECDsaOpenSsl.ImportExport.cs +++ /dev/null @@ -1,204 +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 Microsoft.Win32.SafeHandles; -using System.Diagnostics; - -namespace System.Security.Cryptography -{ -#if INTERNAL_ASYMMETRIC_IMPLEMENTATIONS - internal static partial class ECDsaImplementation - { -#endif - public sealed partial class ECDsaOpenSsl : ECDsa - { - /// - /// ImportParameters will replace the existing key that ECDsaOpenSsl is working with by creating a - /// new key. If the parameters contains only Q, then only a public key will be imported. - /// If the parameters also contains D, then a full key pair will be imported. - /// The parameters Curve value specifies the type of the curve to import. - /// - /// The curve parameters. - /// - /// if does not contain valid values. - /// - /// - /// if references a curve that cannot be imported. - /// - /// - /// if references a curve that is not supported by this platform. - /// - public override void ImportParameters(ECParameters parameters) - { - SafeEcKeyHandle key; - - parameters.Validate(); - - if (parameters.Curve.IsPrime) - { - key = ImportPrimeCurveParameters(parameters); - } - else if (parameters.Curve.IsCharacteristic2) - { - key = ImportCharacteristic2CurveParameters(parameters); - } - else if (parameters.Curve.IsNamed) - { - key = ImportNamedCurveParameters(parameters); - } - else - { - throw new PlatformNotSupportedException(string.Format(SR.Cryptography_CurveNotSupported, parameters.Curve.CurveType.ToString())); - } - - if (key == null || key.IsInvalid) - throw Interop.Crypto.CreateOpenSslCryptographicException(); - - SetKey(key); - } - - /// - /// Exports the key and explicit curve parameters used by the ECC object into an object. - /// - /// - /// if there was an issue obtaining the curve values. - /// - /// The key and explicit curve parameters used by the ECC object. - public override ECParameters ExportExplicitParameters(bool includePrivateParameters) - { - // It's entirely possible that this line will cause the key to be generated in the first place. - SafeEcKeyHandle currentKey = _key.Value; - - ECParameters ecparams = ExportExplicitCurveParameters(currentKey, includePrivateParameters); - return ecparams; - } - - /// - /// Exports the key used by the ECC object into an object. - /// If the curve has a name, the Curve property will contain named curve parameters otherwise it will contain explicit parameters. - /// - /// - /// if there was an issue obtaining the curve values. - /// - /// The key and named curve parameters used by the ECC object. - public override ECParameters ExportParameters(bool includePrivateParameters) - { - // It's entirely possible that this line will cause the key to be generated in the first place. - SafeEcKeyHandle currentKey = _key.Value; - - ECParameters ecparams; - if (Interop.Crypto.EcKeyHasCurveName(currentKey)) - { - ecparams = ExportNamedCurveParameters(currentKey, includePrivateParameters); - } - else - { - ecparams = ExportExplicitCurveParameters(currentKey, includePrivateParameters); - } - return ecparams; - } - - private static ECParameters ExportNamedCurveParameters(SafeEcKeyHandle key, bool includePrivateParameters) - { - CheckInvalidKey(key); - - ECParameters parameters = Interop.Crypto.GetECKeyParameters(key, includePrivateParameters); - - bool hasPrivateKey = (parameters.D != null); - if (hasPrivateKey != includePrivateParameters) - { - throw new CryptographicException(SR.Cryptography_CSP_NoPrivateKey); - } - - // Assign Curve - string keyOidValueName = Interop.Crypto.EcKeyGetCurveName(key); - parameters.Curve = ECCurve.CreateFromValue(keyOidValueName); - - return parameters; - } - - private static ECParameters ExportExplicitCurveParameters(SafeEcKeyHandle key, bool includePrivateParameters) - { - CheckInvalidKey(key); - - ECParameters parameters = Interop.Crypto.GetECCurveParameters(key, includePrivateParameters); - - bool hasPrivateKey = (parameters.D != null); - if (hasPrivateKey != includePrivateParameters) - { - throw new CryptographicException(SR.Cryptography_CSP_NoPrivateKey); - } - - return parameters; - } - - private static SafeEcKeyHandle ImportNamedCurveParameters(ECParameters parameters) - { - Debug.Assert(parameters.Curve.IsNamed); - - // Use oid Value first if present, otherwise FriendlyName - string oid = !string.IsNullOrEmpty(parameters.Curve.Oid.Value) ? - parameters.Curve.Oid.Value : parameters.Curve.Oid.FriendlyName; - - SafeEcKeyHandle key = Interop.Crypto.EcKeyCreateByKeyParameters( - oid, - parameters.Q.X, parameters.Q.X.Length, - parameters.Q.Y, parameters.Q.Y.Length, - parameters.D, parameters.D == null ? 0 : parameters.D.Length); - - return key; - } - - private static SafeEcKeyHandle ImportPrimeCurveParameters(ECParameters parameters) - { - Debug.Assert(parameters.Curve.IsPrime); - SafeEcKeyHandle key = Interop.Crypto.EcKeyCreateByExplicitParameters( - parameters.Curve.CurveType, - parameters.Q.X, parameters.Q.X.Length, - parameters.Q.Y, parameters.Q.Y.Length, - parameters.D, parameters.D == null ? 0 : parameters.D.Length, - parameters.Curve.Prime, parameters.Curve.Prime.Length, - parameters.Curve.A, parameters.Curve.A.Length, - parameters.Curve.B, parameters.Curve.B.Length, - parameters.Curve.G.X, parameters.Curve.G.X.Length, - parameters.Curve.G.Y, parameters.Curve.G.Y.Length, - parameters.Curve.Order, parameters.Curve.Order.Length, - parameters.Curve.Cofactor, parameters.Curve.Cofactor.Length, - parameters.Curve.Seed, parameters.Curve.Seed == null ? 0 : parameters.Curve.Seed.Length); - - return key; - } - - private static SafeEcKeyHandle ImportCharacteristic2CurveParameters(ECParameters parameters) - { - Debug.Assert(parameters.Curve.IsCharacteristic2); - SafeEcKeyHandle key = Interop.Crypto.EcKeyCreateByExplicitParameters( - parameters.Curve.CurveType, - parameters.Q.X, parameters.Q.X.Length, - parameters.Q.Y, parameters.Q.Y.Length, - parameters.D, parameters.D == null ? 0 : parameters.D.Length, - parameters.Curve.Polynomial, parameters.Curve.Polynomial.Length, - parameters.Curve.A, parameters.Curve.A.Length, - parameters.Curve.B, parameters.Curve.B.Length, - parameters.Curve.G.X, parameters.Curve.G.X.Length, - parameters.Curve.G.Y, parameters.Curve.G.Y.Length, - parameters.Curve.Order, parameters.Curve.Order.Length, - parameters.Curve.Cofactor, parameters.Curve.Cofactor.Length, - parameters.Curve.Seed, parameters.Curve.Seed == null ? 0 : parameters.Curve.Seed.Length); - - return key; - } - - private static void CheckInvalidKey(SafeEcKeyHandle key) - { - if (key == null || key.IsInvalid) - { - throw new CryptographicException(SR.Cryptography_OpenInvalidHandle); - } - } - } -#if INTERNAL_ASYMMETRIC_IMPLEMENTATIONS - } -#endif -} diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/ECDsaOpenSsl.cs b/external/corefx/src/Common/src/System/Security/Cryptography/ECDsaOpenSsl.cs index 1f490ce6e3..e89992b359 100644 --- a/external/corefx/src/Common/src/System/Security/Cryptography/ECDsaOpenSsl.cs +++ b/external/corefx/src/Common/src/System/Security/Cryptography/ECDsaOpenSsl.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Buffers; +using System.Diagnostics; using System.IO; using Internal.Cryptography; using Microsoft.Win32.SafeHandles; @@ -15,11 +16,7 @@ namespace System.Security.Cryptography #endif public sealed partial class ECDsaOpenSsl : ECDsa { - internal const string ECDSA_P256_OID_VALUE = "1.2.840.10045.3.1.7"; // Also called nistP256 or secP256r1 - internal const string ECDSA_P384_OID_VALUE = "1.3.132.0.34"; // Also called nistP384 or secP384r1 - internal const string ECDSA_P521_OID_VALUE = "1.3.132.0.35"; // Also called nistP521or secP521r1 - - private Lazy _key; + private ECOpenSsl _key; /// /// Create an ECDsaOpenSsl algorithm with a named curve. @@ -28,7 +25,8 @@ namespace System.Security.Cryptography /// if is null. public ECDsaOpenSsl(ECCurve curve) { - GenerateKey(curve); + _key = new ECOpenSsl(curve); + ForceSetKeySize(_key.KeySize); } /// @@ -46,6 +44,8 @@ namespace System.Security.Cryptography public ECDsaOpenSsl(int keySize) { KeySize = keySize; + // Setting KeySize wakes up _key. + Debug.Assert(_key != null); } /// @@ -89,7 +89,7 @@ namespace System.Security.Cryptography return converted; } - public override bool TrySignHash(ReadOnlySpan source, Span destination, out int bytesWritten) + public override bool TrySignHash(ReadOnlySpan hash, Span destination, out int bytesWritten) { SafeEcKeyHandle key = _key.Value; @@ -98,7 +98,7 @@ namespace System.Security.Cryptography byte[] signature = ArrayPool.Shared.Rent(signatureLength); try { - if (!Interop.Crypto.EcDsaSign(source, source.Length, new Span(signature, 0, signatureLength), ref signatureLength, key)) + if (!Interop.Crypto.EcDsaSign(hash, hash.Length, new Span(signature, 0, signatureLength), ref signatureLength, key)) { throw Interop.Crypto.CreateOpenSslCryptographicException(); } @@ -149,7 +149,7 @@ namespace System.Security.Cryptography byte[] openSslFormat = AsymmetricAlgorithmHelpers.ConvertIeee1363ToDer(signature); SafeEcKeyHandle key = _key.Value; - int verifyResult = Interop.Crypto.EcDsaVerify(hash, hash.Length, openSslFormat, openSslFormat.Length, key); + int verifyResult = Interop.Crypto.EcDsaVerify(hash, openSslFormat, key); return verifyResult == 1; } @@ -159,14 +159,14 @@ namespace System.Security.Cryptography protected override byte[] HashData(Stream data, HashAlgorithmName hashAlgorithm) => AsymmetricAlgorithmHelpers.HashData(data, hashAlgorithm); - protected override bool TryHashData(ReadOnlySpan source, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) => - AsymmetricAlgorithmHelpers.TryHashData(source, destination, hashAlgorithm, out bytesWritten); + protected override bool TryHashData(ReadOnlySpan data, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) => + AsymmetricAlgorithmHelpers.TryHashData(data, destination, hashAlgorithm, out bytesWritten); protected override void Dispose(bool disposing) { if (disposing) { - FreeKey(); + _key.Dispose(); } base.Dispose(disposing); @@ -186,94 +186,34 @@ namespace System.Security.Cryptography // Set the KeySize before FreeKey so that an invalid value doesn't throw away the key base.KeySize = value; - FreeKey(); - _key = new Lazy(GenerateKeyLazy); + // This is the only place where _key can be null, because it's called by the constructor + // which sets KeySize. + _key?.Dispose(); + _key = new ECOpenSsl(this); } } public override void GenerateKey(ECCurve curve) { - curve.Validate(); - FreeKey(); + _key.GenerateKey(curve); - if (curve.IsNamed) - { - string oid = null; - // Use oid Value first if present, otherwise FriendlyName because Oid maintains a hard-coded - // cache that may have different casing for FriendlyNames than OpenSsl - oid = !string.IsNullOrEmpty(curve.Oid.Value) ? curve.Oid.Value : curve.Oid.FriendlyName; - - SafeEcKeyHandle key = Interop.Crypto.EcKeyCreateByOid(oid); - - if (key == null || key.IsInvalid) - throw new PlatformNotSupportedException(string.Format(SR.Cryptography_CurveNotSupported, oid)); - - if (!Interop.Crypto.EcKeyGenerateKey(key)) - throw Interop.Crypto.CreateOpenSslCryptographicException(); - - SetKey(key); - } - else if (curve.IsExplicit) - { - SafeEcKeyHandle key = Interop.Crypto.EcKeyCreateByExplicitCurve(curve); - - if (!Interop.Crypto.EcKeyGenerateKey(key)) - throw Interop.Crypto.CreateOpenSslCryptographicException(); - - SetKey(key); - } - else - { - throw new PlatformNotSupportedException(string.Format(SR.Cryptography_CurveNotSupported, curve.CurveType.ToString())); - } - } - - private SafeEcKeyHandle GenerateKeyLazy() - { - string oid = null; - switch (KeySize) - { - case 256: oid = ECDSA_P256_OID_VALUE; break; - case 384: oid = ECDSA_P384_OID_VALUE; break; - case 521: oid = ECDSA_P521_OID_VALUE; break; - default: - // Only above three sizes supported for backwards compatibility; named curves should be used instead - throw new InvalidOperationException(SR.Cryptography_InvalidKeySize); - } - - SafeEcKeyHandle key = Interop.Crypto.EcKeyCreateByOid(oid); - - if (key == null || key.IsInvalid) - throw new PlatformNotSupportedException(string.Format(SR.Cryptography_CurveNotSupported, oid)); - - if (!Interop.Crypto.EcKeyGenerateKey(key)) - throw Interop.Crypto.CreateOpenSslCryptographicException(); - - return key; - } - - private void FreeKey() - { - if (_key != null) - { - if (_key.IsValueCreated) - { - SafeEcKeyHandle handle = _key.Value; - if (handle != null) - handle.Dispose(); - } - _key = null; - } - } - - private void SetKey(SafeEcKeyHandle newKey) - { // Use ForceSet instead of the property setter to ensure that LegalKeySizes doesn't interfere // with the already loaded key. - ForceSetKeySize(Interop.Crypto.EcKeyGetSize(newKey)); - - _key = new Lazy(newKey); + ForceSetKeySize(_key.KeySize); } + + public override void ImportParameters(ECParameters parameters) + { + _key.ImportParameters(parameters); + ForceSetKeySize(_key.KeySize); + } + + public override ECParameters ExportExplicitParameters(bool includePrivateParameters) => + ECOpenSsl.ExportExplicitParameters(_key.Value, includePrivateParameters); + + public override ECParameters ExportParameters(bool includePrivateParameters) => + ECOpenSsl.ExportParameters(_key.Value, includePrivateParameters); + } #if INTERNAL_ASYMMETRIC_IMPLEMENTATIONS } diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/ECDsaSecurityTransforms.cs b/external/corefx/src/Common/src/System/Security/Cryptography/ECDsaSecurityTransforms.cs index e8b9f0d03b..d86ba86d67 100644 --- a/external/corefx/src/Common/src/System/Security/Cryptography/ECDsaSecurityTransforms.cs +++ b/external/corefx/src/Common/src/System/Security/Cryptography/ECDsaSecurityTransforms.cs @@ -2,7 +2,6 @@ // 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.IO; using System.Security.Cryptography.Apple; using Internal.Cryptography; @@ -50,7 +49,7 @@ namespace System.Security.Cryptography { public sealed partial class ECDsaSecurityTransforms : ECDsa { - private SecKeyPair _keys; + private readonly EccSecurityTransforms _ecc = new EccSecurityTransforms(); public ECDsaSecurityTransforms() { @@ -59,12 +58,12 @@ namespace System.Security.Cryptography internal ECDsaSecurityTransforms(SafeSecKeyRefHandle publicKey) { - SetKey(SecKeyPair.PublicOnly(publicKey)); + KeySizeValue = _ecc.SetKeyAndGetSize(SecKeyPair.PublicOnly(publicKey)); } internal ECDsaSecurityTransforms(SafeSecKeyRefHandle publicKey, SafeSecKeyRefHandle privateKey) { - SetKey(SecKeyPair.PublicPrivatePair(publicKey, privateKey)); + KeySizeValue = _ecc.SetKeyAndGetSize(SecKeyPair.PublicPrivatePair(publicKey, privateKey)); } public override KeySizes[] LegalKeySizes @@ -92,12 +91,7 @@ namespace System.Security.Cryptography // Set the KeySize before freeing the key so that an invalid value doesn't throw away the key base.KeySize = value; - - if (_keys != null) - { - _keys.Dispose(); - _keys = null; - } + _ecc.Dispose(); } } @@ -180,11 +174,7 @@ namespace System.Security.Cryptography { if (disposing) { - if (_keys != null) - { - _keys.Dispose(); - _keys = null; - } + _ecc.Dispose(); } base.Dispose(disposing); @@ -197,382 +187,26 @@ namespace System.Security.Cryptography public override ECParameters ExportParameters(bool includePrivateParameters) { - SecKeyPair keys = GetKeys(); - - SafeSecKeyRefHandle keyHandle = includePrivateParameters ? keys.PrivateKey : keys.PublicKey; - - if (keyHandle == null) - { - throw new CryptographicException(SR.Cryptography_OpenInvalidHandle); - } - - DerSequenceReader keyReader = Interop.AppleCrypto.SecKeyExport(keyHandle, includePrivateParameters); - ECParameters parameters = new ECParameters(); - - if (includePrivateParameters) - { - keyReader.ReadPkcs8Blob(ref parameters); - } - else - { - keyReader.ReadSubjectPublicKeyInfo(ref parameters); - } - - int size = AsymmetricAlgorithmHelpers.BitsToBytes(KeySize); - - KeyBlobHelpers.PadOrTrim(ref parameters.Q.X, size); - KeyBlobHelpers.PadOrTrim(ref parameters.Q.Y, size); - - if (includePrivateParameters) - { - KeyBlobHelpers.PadOrTrim(ref parameters.D, size); - } - - return parameters; + return _ecc.ExportParameters(includePrivateParameters, KeySize); } public override void ImportParameters(ECParameters parameters) { - parameters.Validate(); - - bool isPrivateKey = parameters.D != null; - - if (isPrivateKey) - { - // Start with the private key, in case some of the private key fields don't - // match the public key fields and the system determines an integrity failure. - // - // Public import should go off without a hitch. - SafeSecKeyRefHandle privateKey = ImportKey(parameters); - - ECParameters publicOnly = parameters; - publicOnly.D = null; - - SafeSecKeyRefHandle publicKey; - try - { - publicKey = ImportKey(publicOnly); - } - catch - { - privateKey.Dispose(); - throw; - } - - SetKey(SecKeyPair.PublicPrivatePair(publicKey, privateKey)); - } - else - { - SafeSecKeyRefHandle publicKey = ImportKey(parameters); - SetKey(SecKeyPair.PublicOnly(publicKey)); - } + KeySizeValue = _ecc.ImportParameters(parameters); } public override void GenerateKey(ECCurve curve) { - curve.Validate(); - - if (!curve.IsNamed) - { - throw new PlatformNotSupportedException(SR.Cryptography_ECC_NamedCurvesOnly); - } - - int keySize; - - switch (curve.Oid.Value) - { - // secp256r1 / nistp256 - case "1.2.840.10045.3.1.7": - keySize = 256; - break; - // secp384r1 / nistp384 - case "1.3.132.0.34": - keySize = 384; - break; - // secp521r1 / nistp521 - case "1.3.132.0.35": - keySize = 521; - break; - default: - throw new PlatformNotSupportedException( - SR.Format(SR.Cryptography_CurveNotSupported, curve.Oid.Value)); - } - - // Clear the current key, because GenerateKey on the same curve makes a new key, - // unlike setting the KeySize property to the current value. - SetKey(null); - KeySizeValue = keySize; - - // Generate the keys immediately, because that's what the verb of this method is. - GetKeys(); - } - - private static SafeSecKeyRefHandle ImportKey(ECParameters parameters) - { - bool isPrivateKey = parameters.D != null; - byte[] blob = isPrivateKey ? parameters.ToPrivateKeyBlob() : parameters.ToSubjectPublicKeyInfo(); - - return Interop.AppleCrypto.ImportEphemeralKey(blob, isPrivateKey); - } - - private void SetKey(SecKeyPair newKeyPair) - { - SecKeyPair current = _keys; - _keys = newKeyPair; - current?.Dispose(); - - if (newKeyPair != null) - { - long size = Interop.AppleCrypto.EccGetKeySizeInBits(newKeyPair.PublicKey); - - Debug.Assert(size == 256 || size == 384 || size == 521, $"Unknown keysize ({size})"); - KeySizeValue = (int)size; - } + KeySizeValue = _ecc.GenerateKey(curve); } internal SecKeyPair GetKeys() { - SecKeyPair current = _keys; - - if (current != null) - { - return current; - } - - SafeSecKeyRefHandle publicKey; - SafeSecKeyRefHandle privateKey; - - Interop.AppleCrypto.EccGenerateKey(KeySizeValue, out publicKey, out privateKey); - - current = SecKeyPair.PublicPrivatePair(publicKey, privateKey); - _keys = current; - return current; + return _ecc.GetOrGenerateKeys(KeySize); } } } #if INTERNAL_ASYMMETRIC_IMPLEMENTATIONS } #endif - - internal static class EcKeyBlobHelpers - { - private static readonly byte[] s_version1 = { 1 }; - private static readonly byte[][] s_encodedVersion1 = DerEncoder.SegmentedEncodeUnsignedInteger(s_version1); - - private static readonly Oid s_idEcPublicKey = new Oid("1.2.840.10045.2.1", null); - private static readonly byte[][] s_encodedIdEcPublicKey = DerEncoder.SegmentedEncodeOid(s_idEcPublicKey); - - internal static void ReadPkcs8Blob(this DerSequenceReader reader, ref ECParameters parameters) - { - // OneAsymmetricKey ::= SEQUENCE { - // version Version, - // privateKeyAlgorithm PrivateKeyAlgorithmIdentifier, - // privateKey PrivateKey, - // attributes [0] Attributes OPTIONAL, - // ..., - // [[2: publicKey [1] PublicKey OPTIONAL ]], - // ... - // } - // - // PrivateKeyInfo ::= OneAsymmetricKey - // - // PrivateKey ::= OCTET STRING - - int version = reader.ReadInteger(); - - // We understand both version 0 and 1 formats, - // which are now known as v1 and v2, respectively. - if (version > 1) - { - throw new CryptographicException(); - } - - { - // Ensure we're reading EC Public Key (well, Private, but the OID says Public) - DerSequenceReader algorithm = reader.ReadSequence(); - - string algorithmOid = algorithm.ReadOidAsString(); - - if (algorithmOid != s_idEcPublicKey.Value) - { - throw new CryptographicException(); - } - } - - byte[] privateKeyBlob = reader.ReadOctetString(); - - // ECPrivateKey{CURVES:IOSet} ::= SEQUENCE { - // version INTEGER { ecPrivkeyVer1(1) } (ecPrivkeyVer1), - // privateKey OCTET STRING, - // parameters [0] Parameters{{IOSet}} OPTIONAL, - // publicKey [1] BIT STRING OPTIONAL - // } - DerSequenceReader keyReader = new DerSequenceReader(privateKeyBlob); - version = keyReader.ReadInteger(); - - // We understand the version 1 format - if (version > 1) - { - throw new CryptographicException(); - } - - parameters.D = keyReader.ReadOctetString(); - - // Check for context specific 0 - const byte ConstructedContextSpecific = - DerSequenceReader.ContextSpecificTagFlag | DerSequenceReader.ConstructedFlag; - - const byte ConstructedContextSpecific0 = (ConstructedContextSpecific | 0); - const byte ConstructedContextSpecific1 = (ConstructedContextSpecific | 1); - - if (keyReader.PeekTag() != ConstructedContextSpecific0) - { - throw new CryptographicException(); - } - - // Parameters ::= CHOICE { - // ecParameters ECParameters, - // namedCurve CURVES.&id({ CurveNames}), - // implicitlyCA NULL - // } - DerSequenceReader parametersReader = keyReader.ReadSequence(); - - if (parametersReader.PeekTag() != (int)DerSequenceReader.DerTag.ObjectIdentifier) - { - throw new PlatformNotSupportedException(SR.Cryptography_ECC_NamedCurvesOnly); - } - - parameters.Curve = ECCurve.CreateFromValue(parametersReader.ReadOidAsString()); - - // Check for context specific 1 - if (keyReader.PeekTag() != ConstructedContextSpecific1) - { - throw new CryptographicException(); - } - - keyReader = keyReader.ReadSequence(); - byte[] encodedPoint = keyReader.ReadBitString(); - ReadEncodedPoint(encodedPoint, ref parameters); - - // We don't care about the rest of the blob here, but it's expected to not exist. - } - - internal static void ReadSubjectPublicKeyInfo(this DerSequenceReader keyInfo, ref ECParameters parameters) - { - // SubjectPublicKeyInfo::= SEQUENCE { - // algorithm AlgorithmIdentifier, - // subjectPublicKey BIT STRING } - DerSequenceReader algorithm = keyInfo.ReadSequence(); - string algorithmOid = algorithm.ReadOidAsString(); - - // EC Public Key - if (algorithmOid != s_idEcPublicKey.Value) - { - throw new CryptographicException(); - } - - if (algorithm.PeekTag() != (int)DerSequenceReader.DerTag.ObjectIdentifier) - { - throw new PlatformNotSupportedException(SR.Cryptography_ECC_NamedCurvesOnly); - } - - parameters.Curve = ECCurve.CreateFromValue(algorithm.ReadOidAsString()); - - byte[] encodedPoint = keyInfo.ReadBitString(); - ReadEncodedPoint(encodedPoint, ref parameters); - - // We don't care about the rest of the blob here, but it's expected to not exist. - } - - internal static byte[] ToSubjectPublicKeyInfo(this ECParameters parameters) - { - parameters.Validate(); - - if (!parameters.Curve.IsNamed) - { - throw new PlatformNotSupportedException(SR.Cryptography_ECC_NamedCurvesOnly); - } - - byte[] pointBlob = GetPointBlob(ref parameters); - - return DerEncoder.ConstructSequence( - DerEncoder.ConstructSegmentedSequence( - s_encodedIdEcPublicKey, - DerEncoder.SegmentedEncodeOid(parameters.Curve.Oid)), - DerEncoder.SegmentedEncodeBitString(pointBlob)); - } - - private static byte[] GetPointBlob(ref ECParameters parameters) - { - byte[] pointBlob = new byte[parameters.Q.X.Length + parameters.Q.Y.Length + 1]; - - // Uncompressed point - pointBlob[0] = 0x04; - Buffer.BlockCopy(parameters.Q.X, 0, pointBlob, 1, parameters.Q.X.Length); - Buffer.BlockCopy(parameters.Q.Y, 0, pointBlob, 1 + parameters.Q.X.Length, parameters.Q.Y.Length); - return pointBlob; - } - - internal static byte[] ToPrivateKeyBlob(this ECParameters parameters) - { - parameters.Validate(); - - if (!parameters.Curve.IsNamed) - { - throw new PlatformNotSupportedException(SR.Cryptography_ECC_NamedCurvesOnly); - } - - byte[] pointBlob = GetPointBlob(ref parameters); - - // ECPrivateKey{CURVES:IOSet} ::= SEQUENCE { - // version INTEGER { ecPrivkeyVer1(1) } (ecPrivkeyVer1), - // privateKey OCTET STRING, - // parameters [0] Parameters{{IOSet}} OPTIONAL, - // publicKey [1] BIT STRING OPTIONAL - // } - return DerEncoder.ConstructSequence( - s_encodedVersion1, - DerEncoder.SegmentedEncodeOctetString(parameters.D), - DerEncoder.ConstructSegmentedContextSpecificValue( - 0, - DerEncoder.SegmentedEncodeOid(parameters.Curve.Oid)), - DerEncoder.ConstructSegmentedContextSpecificValue( - 1, - DerEncoder.SegmentedEncodeBitString(pointBlob))); - } - - private static void ReadEncodedPoint(byte[] encodedPoint, ref ECParameters parameters) - { - if (encodedPoint == null || encodedPoint.Length < 1) - { - throw new CryptographicException(); - } - - byte encoding = encodedPoint[0]; - - switch (encoding) - { - // Uncompressed encoding (04 xbytes ybytes) - case 0x04: - // Hybrid encoding, ~yp == 0 (06 xbytes ybytes) - case 0x06: - // Hybrid encoding, ~yp == 1 (07 xbytes ybytes) - case 0x07: - break; - default: - Debug.Fail($"Don't know how to read point encoding {encoding}"); - throw new CryptographicException(); - } - - // For formats 04, 06, and 07 the X and Y points are equal length, and they should - // already be left-padded with zeros in cases where they're short. - int pointEncodingSize = (encodedPoint.Length - 1) / 2; - byte[] encodedX = new byte[pointEncodingSize]; - byte[] encodedY = new byte[pointEncodingSize]; - Buffer.BlockCopy(encodedPoint, 1, encodedX, 0, pointEncodingSize); - Buffer.BlockCopy(encodedPoint, 1 + pointEncodingSize, encodedY, 0, pointEncodingSize); - parameters.Q.X = encodedX; - parameters.Q.Y = encodedY; - } - } } diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/ECOpenSsl.ImportExport.cs b/external/corefx/src/Common/src/System/Security/Cryptography/ECOpenSsl.ImportExport.cs new file mode 100644 index 0000000000..0c0616f9c7 --- /dev/null +++ b/external/corefx/src/Common/src/System/Security/Cryptography/ECOpenSsl.ImportExport.cs @@ -0,0 +1,195 @@ +// 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 Microsoft.Win32.SafeHandles; +using System.Diagnostics; + +namespace System.Security.Cryptography +{ + internal sealed partial class ECOpenSsl + { + internal const string ECDSA_P256_OID_VALUE = "1.2.840.10045.3.1.7"; // Also called nistP256 or secP256r1 + internal const string ECDSA_P384_OID_VALUE = "1.3.132.0.34"; // Also called nistP384 or secP384r1 + internal const string ECDSA_P521_OID_VALUE = "1.3.132.0.35"; // Also called nistP521or secP521r1 + + public int ImportParameters(ECParameters parameters) + { + SafeEcKeyHandle key; + + parameters.Validate(); + + if (parameters.Curve.IsPrime) + { + key = ImportPrimeCurveParameters(parameters); + } + else if (parameters.Curve.IsCharacteristic2) + { + key = ImportCharacteristic2CurveParameters(parameters); + } + else if (parameters.Curve.IsNamed) + { + key = ImportNamedCurveParameters(parameters); + } + else + { + throw new PlatformNotSupportedException( + string.Format(SR.Cryptography_CurveNotSupported, parameters.Curve.CurveType.ToString())); + } + + if (key == null || key.IsInvalid) + { + throw Interop.Crypto.CreateOpenSslCryptographicException(); + } + + // The Import* methods above may have polluted the error queue even if in the end they succeeded. + // Clean up the error queue. + Interop.Crypto.ErrClearError(); + + FreeKey(); + _key = new Lazy(key); + return KeySize; + } + + public static ECParameters ExportExplicitParameters(SafeEcKeyHandle currentKey, bool includePrivateParameters) => + ExportExplicitCurveParameters(currentKey, includePrivateParameters); + + public static ECParameters ExportParameters(SafeEcKeyHandle currentKey, bool includePrivateParameters) + { + ECParameters ecparams; + if (Interop.Crypto.EcKeyHasCurveName(currentKey)) + { + ecparams = ExportNamedCurveParameters(currentKey, includePrivateParameters); + } + else + { + ecparams = ExportExplicitCurveParameters(currentKey, includePrivateParameters); + } + return ecparams; + } + + private static ECParameters ExportNamedCurveParameters(SafeEcKeyHandle key, bool includePrivateParameters) + { + CheckInvalidKey(key); + + ECParameters parameters = Interop.Crypto.GetECKeyParameters(key, includePrivateParameters); + + bool hasPrivateKey = (parameters.D != null); + + if (hasPrivateKey != includePrivateParameters) + { + throw new CryptographicException(SR.Cryptography_CSP_NoPrivateKey); + } + + // Assign Curve + string keyOidValueName = Interop.Crypto.EcKeyGetCurveName(key); + parameters.Curve = ECCurve.CreateFromValue(keyOidValueName); + + return parameters; + } + + private static ECParameters ExportExplicitCurveParameters(SafeEcKeyHandle key, bool includePrivateParameters) + { + CheckInvalidKey(key); + + ECParameters parameters = Interop.Crypto.GetECCurveParameters(key, includePrivateParameters); + + bool hasPrivateKey = (parameters.D != null); + if (hasPrivateKey != includePrivateParameters) + { + throw new CryptographicException(SR.Cryptography_CSP_NoPrivateKey); + } + + return parameters; + } + + private static SafeEcKeyHandle ImportNamedCurveParameters(ECParameters parameters) + { + Debug.Assert(parameters.Curve.IsNamed); + + // Use oid Value first if present, otherwise FriendlyName + string oid = !string.IsNullOrEmpty(parameters.Curve.Oid.Value) ? + parameters.Curve.Oid.Value : parameters.Curve.Oid.FriendlyName; + + SafeEcKeyHandle key = Interop.Crypto.EcKeyCreateByKeyParameters( + oid, + parameters.Q.X, parameters.Q.X.Length, + parameters.Q.Y, parameters.Q.Y.Length, + parameters.D, parameters.D == null ? 0 : parameters.D.Length); + + return key; + } + + private static SafeEcKeyHandle ImportPrimeCurveParameters(ECParameters parameters) + { + Debug.Assert(parameters.Curve.IsPrime); + SafeEcKeyHandle key = Interop.Crypto.EcKeyCreateByExplicitParameters( + parameters.Curve.CurveType, + parameters.Q.X, parameters.Q.X.Length, + parameters.Q.Y, parameters.Q.Y.Length, + parameters.D, parameters.D == null ? 0 : parameters.D.Length, + parameters.Curve.Prime, parameters.Curve.Prime.Length, + parameters.Curve.A, parameters.Curve.A.Length, + parameters.Curve.B, parameters.Curve.B.Length, + parameters.Curve.G.X, parameters.Curve.G.X.Length, + parameters.Curve.G.Y, parameters.Curve.G.Y.Length, + parameters.Curve.Order, parameters.Curve.Order.Length, + parameters.Curve.Cofactor, parameters.Curve.Cofactor.Length, + parameters.Curve.Seed, parameters.Curve.Seed == null ? 0 : parameters.Curve.Seed.Length); + + return key; + } + + private static SafeEcKeyHandle ImportCharacteristic2CurveParameters(ECParameters parameters) + { + Debug.Assert(parameters.Curve.IsCharacteristic2); + SafeEcKeyHandle key = Interop.Crypto.EcKeyCreateByExplicitParameters( + parameters.Curve.CurveType, + parameters.Q.X, parameters.Q.X.Length, + parameters.Q.Y, parameters.Q.Y.Length, + parameters.D, parameters.D == null ? 0 : parameters.D.Length, + parameters.Curve.Polynomial, parameters.Curve.Polynomial.Length, + parameters.Curve.A, parameters.Curve.A.Length, + parameters.Curve.B, parameters.Curve.B.Length, + parameters.Curve.G.X, parameters.Curve.G.X.Length, + parameters.Curve.G.Y, parameters.Curve.G.Y.Length, + parameters.Curve.Order, parameters.Curve.Order.Length, + parameters.Curve.Cofactor, parameters.Curve.Cofactor.Length, + parameters.Curve.Seed, parameters.Curve.Seed == null ? 0 : parameters.Curve.Seed.Length); + + return key; + } + + private static void CheckInvalidKey(SafeEcKeyHandle key) + { + if (key == null || key.IsInvalid) + { + throw new CryptographicException(SR.Cryptography_OpenInvalidHandle); + } + } + + public static SafeEcKeyHandle GenerateKeyByKeySize(int keySize) + { + string oid = null; + switch (keySize) + { + case 256: oid = ECDSA_P256_OID_VALUE; break; + case 384: oid = ECDSA_P384_OID_VALUE; break; + case 521: oid = ECDSA_P521_OID_VALUE; break; + default: + // Only above three sizes supported for backwards compatibility; named curves should be used instead + throw new InvalidOperationException(SR.Cryptography_InvalidKeySize); + } + + SafeEcKeyHandle key = Interop.Crypto.EcKeyCreateByOid(oid); + + if (key == null || key.IsInvalid) + throw new PlatformNotSupportedException(string.Format(SR.Cryptography_CurveNotSupported, oid)); + + if (!Interop.Crypto.EcKeyGenerateKey(key)) + throw Interop.Crypto.CreateOpenSslCryptographicException(); + + return key; + } + } +} diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/ECOpenSsl.cs b/external/corefx/src/Common/src/System/Security/Cryptography/ECOpenSsl.cs new file mode 100644 index 0000000000..e78787d3ef --- /dev/null +++ b/external/corefx/src/Common/src/System/Security/Cryptography/ECOpenSsl.cs @@ -0,0 +1,139 @@ +// 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 Microsoft.Win32.SafeHandles; + +namespace System.Security.Cryptography +{ + internal sealed partial class ECOpenSsl : IDisposable + { + private Lazy _key; + + public ECOpenSsl(ECCurve curve) + { + GenerateKey(curve); + } + + public ECOpenSsl(AsymmetricAlgorithm owner) + { + _key = new Lazy(() => GenerateKeyLazy(owner)); + } + + public ECOpenSsl(ECParameters ecParameters) + { + ImportParameters(ecParameters); + } + + public ECOpenSsl(SafeEcKeyHandle key) + { + _key = new Lazy(key); + } + + internal SafeEcKeyHandle Value => _key.Value; + + private SafeEcKeyHandle GenerateKeyLazy(AsymmetricAlgorithm owner) => + GenerateKeyByKeySize(owner.KeySize); + + public void Dispose() + { + FreeKey(); + } + + internal int KeySize => Interop.Crypto.EcKeyGetSize(_key.Value); + + internal SafeEvpPKeyHandle UpRefKeyHandle() + { + SafeEcKeyHandle currentKey = _key.Value; + Debug.Assert(currentKey != null, "null TODO"); + + SafeEvpPKeyHandle pkeyHandle = Interop.Crypto.EvpPkeyCreate(); + + try + { + // Wrapping our key in an EVP_PKEY will up_ref our key. + // When the EVP_PKEY is Disposed it will down_ref the key. + // So everything should be copacetic. + if (!Interop.Crypto.EvpPkeySetEcKey(pkeyHandle, currentKey)) + { + throw Interop.Crypto.CreateOpenSslCryptographicException(); + } + + return pkeyHandle; + } + catch + { + pkeyHandle.Dispose(); + throw; + } + } + + internal void SetKey(SafeEcKeyHandle key) + { + Debug.Assert(key != null, "key != null"); + Debug.Assert(!key.IsInvalid, "!key.IsInvalid"); + Debug.Assert(!key.IsClosed, "!key.IsClosed"); + + FreeKey(); + _key = new Lazy(key); + } + + internal int GenerateKey(ECCurve curve) + { + curve.Validate(); + FreeKey(); + + if (curve.IsNamed) + { + string oid = null; + // Use oid Value first if present, otherwise FriendlyName because Oid maintains a hard-coded + // cache that may have different casing for FriendlyNames than OpenSsl + oid = !string.IsNullOrEmpty(curve.Oid.Value) ? curve.Oid.Value : curve.Oid.FriendlyName; + + SafeEcKeyHandle key = Interop.Crypto.EcKeyCreateByOid(oid); + + if (key == null || key.IsInvalid) + { + throw new PlatformNotSupportedException(string.Format(SR.Cryptography_CurveNotSupported, oid)); + } + + if (!Interop.Crypto.EcKeyGenerateKey(key)) + { + throw Interop.Crypto.CreateOpenSslCryptographicException(); + } + + SetKey(key); + } + else if (curve.IsExplicit) + { + SafeEcKeyHandle key = Interop.Crypto.EcKeyCreateByExplicitCurve(curve); + + if (!Interop.Crypto.EcKeyGenerateKey(key)) + throw Interop.Crypto.CreateOpenSslCryptographicException(); + + SetKey(key); + } + else + { + throw new PlatformNotSupportedException( + string.Format(SR.Cryptography_CurveNotSupported, curve.CurveType.ToString())); + } + + return KeySize; + } + + private void FreeKey() + { + if (_key != null) + { + if (_key.IsValueCreated) + { + _key.Value?.Dispose(); + } + + _key = null; + } + } + } +} diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/EccSecurityTransforms.cs b/external/corefx/src/Common/src/System/Security/Cryptography/EccSecurityTransforms.cs new file mode 100644 index 0000000000..366d933eb7 --- /dev/null +++ b/external/corefx/src/Common/src/System/Security/Cryptography/EccSecurityTransforms.cs @@ -0,0 +1,416 @@ +// 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.Security.Cryptography.Apple; +using Internal.Cryptography; + +namespace System.Security.Cryptography +{ + internal sealed class EccSecurityTransforms : IDisposable + { + private SecKeyPair _keys; + + public void Dispose() + { + _keys?.Dispose(); + _keys = null; + } + + internal int GenerateKey(ECCurve curve) + { + curve.Validate(); + + if (!curve.IsNamed) + { + throw new PlatformNotSupportedException(SR.Cryptography_ECC_NamedCurvesOnly); + } + + int keySize; + + switch (curve.Oid.Value) + { + // secp256r1 / nistp256 + case "1.2.840.10045.3.1.7": + keySize = 256; + break; + // secp384r1 / nistp384 + case "1.3.132.0.34": + keySize = 384; + break; + // secp521r1 / nistp521 + case "1.3.132.0.35": + keySize = 521; + break; + default: + throw new PlatformNotSupportedException( + SR.Format(SR.Cryptography_CurveNotSupported, curve.Oid.Value)); + } + + GenerateKey(keySize); + return keySize; + } + + private SecKeyPair GenerateKey(int keySizeInBits) + { + SafeSecKeyRefHandle publicKey; + SafeSecKeyRefHandle privateKey; + + Interop.AppleCrypto.EccGenerateKey(keySizeInBits, out publicKey, out privateKey); + + SecKeyPair newPair = SecKeyPair.PublicPrivatePair(publicKey, privateKey); + SetKey(newPair); + return newPair; + } + + internal SecKeyPair GetOrGenerateKeys(int keySizeInBits) + { + SecKeyPair current = _keys; + + if (current != null) + { + return current; + } + + return GenerateKey(keySizeInBits); + } + + internal int SetKeyAndGetSize(SecKeyPair keyPair) + { + int size = GetKeySize(keyPair); + SetKey(keyPair); + return size; + } + + private void SetKey(SecKeyPair keyPair) + { + SecKeyPair current = _keys; + _keys = keyPair; + current?.Dispose(); + } + + internal ECParameters ExportParameters(bool includePrivateParameters, int keySizeInBIts) + { + SecKeyPair keys = GetOrGenerateKeys(keySizeInBIts); + + SafeSecKeyRefHandle keyHandle = includePrivateParameters ? keys.PrivateKey : keys.PublicKey; + + if (keyHandle == null) + { + throw new CryptographicException(SR.Cryptography_OpenInvalidHandle); + } + + DerSequenceReader keyReader = Interop.AppleCrypto.SecKeyExport(keyHandle, includePrivateParameters); + ECParameters parameters = new ECParameters(); + + if (includePrivateParameters) + { + keyReader.ReadPkcs8Blob(ref parameters); + } + else + { + keyReader.ReadSubjectPublicKeyInfo(ref parameters); + } + + int size = AsymmetricAlgorithmHelpers.BitsToBytes(keySizeInBIts); + + KeyBlobHelpers.PadOrTrim(ref parameters.Q.X, size); + KeyBlobHelpers.PadOrTrim(ref parameters.Q.Y, size); + + if (includePrivateParameters) + { + KeyBlobHelpers.PadOrTrim(ref parameters.D, size); + } + + return parameters; + } + + public int ImportParameters(ECParameters parameters) + { + parameters.Validate(); + + bool isPrivateKey = parameters.D != null; + SecKeyPair newKeys; + + if (isPrivateKey) + { + // Start with the private key, in case some of the private key fields don't + // match the public key fields and the system determines an integrity failure. + // + // Public import should go off without a hitch. + SafeSecKeyRefHandle privateKey = ImportKey(parameters); + + ECParameters publicOnly = parameters; + publicOnly.D = null; + + SafeSecKeyRefHandle publicKey; + try + { + publicKey = ImportKey(publicOnly); + } + catch + { + privateKey.Dispose(); + throw; + } + + newKeys = SecKeyPair.PublicPrivatePair(publicKey, privateKey); + } + else + { + SafeSecKeyRefHandle publicKey = ImportKey(parameters); + newKeys = SecKeyPair.PublicOnly(publicKey); + } + + int size = GetKeySize(newKeys); + SetKey(newKeys); + + return size; + } + + private static int GetKeySize(SecKeyPair newKeys) + { + long size = Interop.AppleCrypto.EccGetKeySizeInBits(newKeys.PublicKey); + Debug.Assert(size == 256 || size == 384 || size == 521, $"Unknown keysize ({size})"); + return (int)size; + } + + private static SafeSecKeyRefHandle ImportKey(ECParameters parameters) + { + bool isPrivateKey = parameters.D != null; + byte[] blob = isPrivateKey ? parameters.ToPrivateKeyBlob() : parameters.ToSubjectPublicKeyInfo(); + + return Interop.AppleCrypto.ImportEphemeralKey(blob, isPrivateKey); + } + } + + internal static class EcKeyBlobHelpers + { + private static readonly byte[] s_version1 = { 1 }; + private static readonly byte[][] s_encodedVersion1 = DerEncoder.SegmentedEncodeUnsignedInteger(s_version1); + + private static readonly Oid s_idEcPublicKey = new Oid("1.2.840.10045.2.1", null); + private static readonly byte[][] s_encodedIdEcPublicKey = DerEncoder.SegmentedEncodeOid(s_idEcPublicKey); + + internal static void ReadPkcs8Blob(this DerSequenceReader reader, ref ECParameters parameters) + { + // OneAsymmetricKey ::= SEQUENCE { + // version Version, + // privateKeyAlgorithm PrivateKeyAlgorithmIdentifier, + // privateKey PrivateKey, + // attributes [0] Attributes OPTIONAL, + // ..., + // [[2: publicKey [1] PublicKey OPTIONAL ]], + // ... + // } + // + // PrivateKeyInfo ::= OneAsymmetricKey + // + // PrivateKey ::= OCTET STRING + + int version = reader.ReadInteger(); + + // We understand both version 0 and 1 formats, + // which are now known as v1 and v2, respectively. + if (version > 1) + { + throw new CryptographicException(); + } + + { + // Ensure we're reading EC Public Key (well, Private, but the OID says Public) + DerSequenceReader algorithm = reader.ReadSequence(); + + string algorithmOid = algorithm.ReadOidAsString(); + + if (algorithmOid != s_idEcPublicKey.Value) + { + throw new CryptographicException(); + } + } + + byte[] privateKeyBlob = reader.ReadOctetString(); + + try + { + // ECPrivateKey{CURVES:IOSet} ::= SEQUENCE { + // version INTEGER { ecPrivkeyVer1(1) } (ecPrivkeyVer1), + // privateKey OCTET STRING, + // parameters [0] Parameters{{IOSet}} OPTIONAL, + // publicKey [1] BIT STRING OPTIONAL + // } + DerSequenceReader keyReader = new DerSequenceReader(privateKeyBlob); + version = keyReader.ReadInteger(); + + // We understand the version 1 format + if (version > 1) + { + throw new CryptographicException(); + } + + parameters.D = keyReader.ReadOctetString(); + + // Check for context specific 0 + const byte ConstructedContextSpecific = + DerSequenceReader.ContextSpecificTagFlag | DerSequenceReader.ConstructedFlag; + + const byte ConstructedContextSpecific0 = (ConstructedContextSpecific | 0); + const byte ConstructedContextSpecific1 = (ConstructedContextSpecific | 1); + + if (keyReader.PeekTag() != ConstructedContextSpecific0) + { + throw new CryptographicException(); + } + + // Parameters ::= CHOICE { + // ecParameters ECParameters, + // namedCurve CURVES.&id({ CurveNames}), + // implicitlyCA NULL + // } + DerSequenceReader parametersReader = keyReader.ReadSequence(); + + if (parametersReader.PeekTag() != (int)DerSequenceReader.DerTag.ObjectIdentifier) + { + throw new PlatformNotSupportedException(SR.Cryptography_ECC_NamedCurvesOnly); + } + + parameters.Curve = ECCurve.CreateFromValue(parametersReader.ReadOidAsString()); + + // Check for context specific 1 + if (keyReader.PeekTag() != ConstructedContextSpecific1) + { + throw new CryptographicException(); + } + + keyReader = keyReader.ReadSequence(); + byte[] encodedPoint = keyReader.ReadBitString(); + ReadEncodedPoint(encodedPoint, ref parameters); + + // We don't care about the rest of the blob here, but it's expected to not exist. + } + finally + { + Array.Clear(privateKeyBlob, 0, privateKeyBlob.Length); + } + } + + internal static void ReadSubjectPublicKeyInfo(this DerSequenceReader keyInfo, ref ECParameters parameters) + { + // SubjectPublicKeyInfo::= SEQUENCE { + // algorithm AlgorithmIdentifier, + // subjectPublicKey BIT STRING } + DerSequenceReader algorithm = keyInfo.ReadSequence(); + string algorithmOid = algorithm.ReadOidAsString(); + + // EC Public Key + if (algorithmOid != s_idEcPublicKey.Value) + { + throw new CryptographicException(); + } + + if (algorithm.PeekTag() != (int)DerSequenceReader.DerTag.ObjectIdentifier) + { + throw new PlatformNotSupportedException(SR.Cryptography_ECC_NamedCurvesOnly); + } + + parameters.Curve = ECCurve.CreateFromValue(algorithm.ReadOidAsString()); + + byte[] encodedPoint = keyInfo.ReadBitString(); + ReadEncodedPoint(encodedPoint, ref parameters); + + // We don't care about the rest of the blob here, but it's expected to not exist. + } + + internal static byte[] ToSubjectPublicKeyInfo(this ECParameters parameters) + { + parameters.Validate(); + + if (!parameters.Curve.IsNamed) + { + throw new PlatformNotSupportedException(SR.Cryptography_ECC_NamedCurvesOnly); + } + + byte[] pointBlob = GetPointBlob(ref parameters); + + return DerEncoder.ConstructSequence( + DerEncoder.ConstructSegmentedSequence( + s_encodedIdEcPublicKey, + DerEncoder.SegmentedEncodeOid(parameters.Curve.Oid)), + DerEncoder.SegmentedEncodeBitString(pointBlob)); + } + + private static byte[] GetPointBlob(ref ECParameters parameters) + { + byte[] pointBlob = new byte[parameters.Q.X.Length + parameters.Q.Y.Length + 1]; + + // Uncompressed point + pointBlob[0] = 0x04; + Buffer.BlockCopy(parameters.Q.X, 0, pointBlob, 1, parameters.Q.X.Length); + Buffer.BlockCopy(parameters.Q.Y, 0, pointBlob, 1 + parameters.Q.X.Length, parameters.Q.Y.Length); + return pointBlob; + } + + internal static byte[] ToPrivateKeyBlob(this ECParameters parameters) + { + parameters.Validate(); + + if (!parameters.Curve.IsNamed) + { + throw new PlatformNotSupportedException(SR.Cryptography_ECC_NamedCurvesOnly); + } + + byte[] pointBlob = GetPointBlob(ref parameters); + + // ECPrivateKey{CURVES:IOSet} ::= SEQUENCE { + // version INTEGER { ecPrivkeyVer1(1) } (ecPrivkeyVer1), + // privateKey OCTET STRING, + // parameters [0] Parameters{{IOSet}} OPTIONAL, + // publicKey [1] BIT STRING OPTIONAL + // } + return DerEncoder.ConstructSequence( + s_encodedVersion1, + DerEncoder.SegmentedEncodeOctetString(parameters.D), + DerEncoder.ConstructSegmentedContextSpecificValue( + 0, + DerEncoder.SegmentedEncodeOid(parameters.Curve.Oid)), + DerEncoder.ConstructSegmentedContextSpecificValue( + 1, + DerEncoder.SegmentedEncodeBitString(pointBlob))); + } + + private static void ReadEncodedPoint(byte[] encodedPoint, ref ECParameters parameters) + { + if (encodedPoint == null || encodedPoint.Length < 1) + { + throw new CryptographicException(); + } + + byte encoding = encodedPoint[0]; + + switch (encoding) + { + // Uncompressed encoding (04 xbytes ybytes) + case 0x04: + // Hybrid encoding, ~yp == 0 (06 xbytes ybytes) + case 0x06: + // Hybrid encoding, ~yp == 1 (07 xbytes ybytes) + case 0x07: + break; + default: + Debug.Fail($"Don't know how to read point encoding {encoding}"); + throw new CryptographicException(); + } + + // For formats 04, 06, and 07 the X and Y points are equal length, and they should + // already be left-padded with zeros in cases where they're short. + int pointEncodingSize = (encodedPoint.Length - 1) / 2; + byte[] encodedX = new byte[pointEncodingSize]; + byte[] encodedY = new byte[pointEncodingSize]; + Buffer.BlockCopy(encodedPoint, 1, encodedX, 0, pointEncodingSize); + Buffer.BlockCopy(encodedPoint, 1 + pointEncodingSize, encodedY, 0, pointEncodingSize); + parameters.Q.X = encodedX; + parameters.Q.Y = encodedY; + } + } +} diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/RSACng.EncryptDecrypt.cs b/external/corefx/src/Common/src/System/Security/Cryptography/RSACng.EncryptDecrypt.cs index 0df93cb0b4..75444d49da 100644 --- a/external/corefx/src/Common/src/System/Security/Cryptography/RSACng.EncryptDecrypt.cs +++ b/external/corefx/src/Common/src/System/Security/Cryptography/RSACng.EncryptDecrypt.cs @@ -2,6 +2,7 @@ // 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; using System.Runtime.InteropServices; using Microsoft.Win32.SafeHandles; using Internal.Cryptography; @@ -18,6 +19,8 @@ namespace System.Security.Cryptography #endif public sealed partial class RSACng : RSA { + private const int Pkcs1PaddingOverhead = 11; + /// Encrypts data using the public key. public override unsafe byte[] Encrypt(byte[] data, RSAEncryptionPadding padding) => EncryptOrDecrypt(data, padding, encrypt: true); @@ -27,12 +30,12 @@ namespace System.Security.Cryptography EncryptOrDecrypt(data, padding, encrypt: false); /// Encrypts data using the public key. - public override bool TryEncrypt(ReadOnlySpan source, Span destination, RSAEncryptionPadding padding, out int bytesWritten) => - TryEncryptOrDecrypt(source, destination, padding, encrypt: true, bytesWritten: out bytesWritten); + public override bool TryEncrypt(ReadOnlySpan data, Span destination, RSAEncryptionPadding padding, out int bytesWritten) => + TryEncryptOrDecrypt(data, destination, padding, encrypt: true, bytesWritten: out bytesWritten); /// Decrypts data using the private key. - public override bool TryDecrypt(ReadOnlySpan source, Span destination, RSAEncryptionPadding padding, out int bytesWritten) => - TryEncryptOrDecrypt(source, destination, padding, encrypt: false, bytesWritten: out bytesWritten); + public override bool TryDecrypt(ReadOnlySpan data, Span destination, RSAEncryptionPadding padding, out int bytesWritten) => + TryEncryptOrDecrypt(data, destination, padding, encrypt: false, bytesWritten: out bytesWritten); // Conveniently, Encrypt() and Decrypt() are identical save for the actual P/Invoke call to CNG. Thus, both // array-based APIs invoke this common helper with the "encrypt" parameter determining whether encryption or decryption is done. @@ -47,8 +50,55 @@ namespace System.Security.Cryptography throw new ArgumentNullException(nameof(padding)); } + int modulusSizeInBytes = RsaPaddingProcessor.BytesRequiredForBitCount(KeySize); + + if (!encrypt && data.Length != modulusSizeInBytes) + { + throw new CryptographicException(SR.Cryptography_RSA_DecryptWrongSize); + } + + if (encrypt && + padding.Mode == RSAEncryptionPaddingMode.Pkcs1 && + data.Length > modulusSizeInBytes - Pkcs1PaddingOverhead) + { + throw new CryptographicException( + SR.Format(SR.Cryptography_Encryption_MessageTooLong, modulusSizeInBytes - Pkcs1PaddingOverhead)); + } + using (SafeNCryptKeyHandle keyHandle = GetDuplicatedKeyHandle()) { + if (encrypt && data.Length == 0) + { + byte[] rented = ArrayPool.Shared.Rent(modulusSizeInBytes); + Span paddedMessage = new Span(rented, 0, modulusSizeInBytes); + + try + { + if (padding == RSAEncryptionPadding.Pkcs1) + { + RsaPaddingProcessor.PadPkcs1Encryption(data, paddedMessage); + } + else if (padding.Mode == RSAEncryptionPaddingMode.Oaep) + { + RsaPaddingProcessor processor = + RsaPaddingProcessor.OpenProcessor(padding.OaepHashAlgorithm); + + processor.PadOaep(data, paddedMessage); + } + else + { + throw new CryptographicException(SR.Cryptography_UnsupportedPaddingMode); + } + + return EncryptOrDecrypt(keyHandle, paddedMessage, AsymmetricPaddingMode.NCRYPT_NO_PADDING_FLAG, null, encrypt); + } + finally + { + CryptographicOperations.ZeroMemory(paddedMessage); + ArrayPool.Shared.Return(rented); + } + } + switch (padding.Mode) { case RSAEncryptionPaddingMode.Pkcs1: @@ -81,19 +131,66 @@ namespace System.Security.Cryptography // Conveniently, Encrypt() and Decrypt() are identical save for the actual P/Invoke call to CNG. Thus, both // span-based APIs invoke this common helper with the "encrypt" parameter determining whether encryption or decryption is done. - private unsafe bool TryEncryptOrDecrypt(ReadOnlySpan source, Span destination, RSAEncryptionPadding padding, bool encrypt, out int bytesWritten) + private unsafe bool TryEncryptOrDecrypt(ReadOnlySpan data, Span destination, RSAEncryptionPadding padding, bool encrypt, out int bytesWritten) { if (padding == null) { throw new ArgumentNullException(nameof(padding)); } + int modulusSizeInBytes = RsaPaddingProcessor.BytesRequiredForBitCount(KeySize); + + if (!encrypt && data.Length != modulusSizeInBytes) + { + throw new CryptographicException(SR.Cryptography_RSA_DecryptWrongSize); + } + + if (encrypt && + padding.Mode == RSAEncryptionPaddingMode.Pkcs1 && + data.Length > modulusSizeInBytes - Pkcs1PaddingOverhead) + { + throw new CryptographicException( + SR.Format(SR.Cryptography_Encryption_MessageTooLong, modulusSizeInBytes - Pkcs1PaddingOverhead)); + } + using (SafeNCryptKeyHandle keyHandle = GetDuplicatedKeyHandle()) { + if (encrypt && data.Length == 0) + { + byte[] rented = ArrayPool.Shared.Rent(modulusSizeInBytes); + Span paddedMessage = new Span(rented, 0, modulusSizeInBytes); + + try + { + if (padding == RSAEncryptionPadding.Pkcs1) + { + RsaPaddingProcessor.PadPkcs1Encryption(data, paddedMessage); + } + else if (padding.Mode == RSAEncryptionPaddingMode.Oaep) + { + RsaPaddingProcessor processor = + RsaPaddingProcessor.OpenProcessor(padding.OaepHashAlgorithm); + + processor.PadOaep(data, paddedMessage); + } + else + { + throw new CryptographicException(SR.Cryptography_UnsupportedPaddingMode); + } + + return TryEncryptOrDecrypt(keyHandle, paddedMessage, destination, AsymmetricPaddingMode.NCRYPT_NO_PADDING_FLAG, null, encrypt, out bytesWritten); + } + finally + { + CryptographicOperations.ZeroMemory(paddedMessage); + ArrayPool.Shared.Return(rented); + } + } + switch (padding.Mode) { case RSAEncryptionPaddingMode.Pkcs1: - return TryEncryptOrDecrypt(keyHandle, source, destination, AsymmetricPaddingMode.NCRYPT_PAD_PKCS1_FLAG, null, encrypt, out bytesWritten); + return TryEncryptOrDecrypt(keyHandle, data, destination, AsymmetricPaddingMode.NCRYPT_PAD_PKCS1_FLAG, null, encrypt, out bytesWritten); case RSAEncryptionPaddingMode.Oaep: IntPtr namePtr = Marshal.StringToHGlobalUni(padding.OaepHashAlgorithm.Name); @@ -105,7 +202,7 @@ namespace System.Security.Cryptography pbLabel = IntPtr.Zero, // It would nice to put randomized data here but RSAEncryptionPadding does not at this point provide support for this. cbLabel = 0, }; - return TryEncryptOrDecrypt(keyHandle, source, destination, AsymmetricPaddingMode.NCRYPT_PAD_OAEP_FLAG, &paddingInfo, encrypt, out bytesWritten); + return TryEncryptOrDecrypt(keyHandle, data, destination, AsymmetricPaddingMode.NCRYPT_PAD_OAEP_FLAG, &paddingInfo, encrypt, out bytesWritten); } finally { @@ -119,7 +216,7 @@ namespace System.Security.Cryptography } // Now that the padding mode and information have been marshaled to their native counterparts, perform the encryption or decryption. - private unsafe byte[] EncryptOrDecrypt(SafeNCryptKeyHandle key, byte[] input, AsymmetricPaddingMode paddingMode, void* paddingInfo, bool encrypt) + private unsafe byte[] EncryptOrDecrypt(SafeNCryptKeyHandle key, ReadOnlySpan input, AsymmetricPaddingMode paddingMode, void* paddingInfo, bool encrypt) { int estimatedSize = KeySize / 8; #if DEBUG diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/RSACng.SignVerify.cs b/external/corefx/src/Common/src/System/Security/Cryptography/RSACng.SignVerify.cs index 5da42605df..3560eff152 100644 --- a/external/corefx/src/Common/src/System/Security/Cryptography/RSACng.SignVerify.cs +++ b/external/corefx/src/Common/src/System/Security/Cryptography/RSACng.SignVerify.cs @@ -2,6 +2,8 @@ // 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.Collections.Concurrent; +using System.Collections.Generic; using System.Runtime.InteropServices; using Microsoft.Win32.SafeHandles; using Internal.Cryptography; @@ -18,6 +20,28 @@ namespace System.Security.Cryptography #endif public sealed partial class RSACng : RSA { + private static readonly ConcurrentDictionary s_hashSizes = + new ConcurrentDictionary( + new[] + { + KeyValuePair.Create(HashAlgorithmName.SHA256, 256 / 8), + KeyValuePair.Create(HashAlgorithmName.SHA384, 384 / 8), + KeyValuePair.Create(HashAlgorithmName.SHA512, 512 / 8), + }); + + private static int GetHashSizeInBytes(HashAlgorithmName hashAlgorithm) + { + return s_hashSizes.GetOrAdd( + hashAlgorithm, + alg => + { + using (HashProviderCng hashProvider = new HashProviderCng(alg.Name, null)) + { + return hashProvider.HashSizeInBytes; + } + }); + } + /// /// Computes the signature of a hash that was produced by the hash algorithm specified by "hashAlgorithm." /// @@ -38,6 +62,11 @@ namespace System.Security.Cryptography throw new ArgumentNullException(nameof(padding)); } + if (hash.Length != GetHashSizeInBytes(hashAlgorithm)) + { + throw new CryptographicException(SR.Cryptography_SignHash_WrongSize); + } + using (SafeNCryptKeyHandle keyHandle = GetDuplicatedKeyHandle()) { IntPtr namePtr = Marshal.StringToHGlobalUni(hashAlgorithmName); @@ -68,7 +97,7 @@ namespace System.Security.Cryptography } } - public override unsafe bool TrySignHash(ReadOnlySpan source, Span destination, HashAlgorithmName hashAlgorithm, RSASignaturePadding padding, out int bytesWritten) + public override unsafe bool TrySignHash(ReadOnlySpan hash, Span destination, HashAlgorithmName hashAlgorithm, RSASignaturePadding padding, out int bytesWritten) { string hashAlgorithmName = hashAlgorithm.Name; if (string.IsNullOrEmpty(hashAlgorithmName)) @@ -82,6 +111,11 @@ namespace System.Security.Cryptography using (SafeNCryptKeyHandle keyHandle = GetDuplicatedKeyHandle()) { + if (hash.Length != GetHashSizeInBytes(hashAlgorithm)) + { + throw new CryptographicException(SR.Cryptography_SignHash_WrongSize); + } + IntPtr namePtr = Marshal.StringToHGlobalUni(hashAlgorithmName); try { @@ -89,11 +123,11 @@ namespace System.Security.Cryptography { case RSASignaturePaddingMode.Pkcs1: var pkcs1PaddingInfo = new BCRYPT_PKCS1_PADDING_INFO() { pszAlgId = namePtr }; - return keyHandle.TrySignHash(source, destination, AsymmetricPaddingMode.NCRYPT_PAD_PKCS1_FLAG, &pkcs1PaddingInfo, out bytesWritten); + return keyHandle.TrySignHash(hash, destination, AsymmetricPaddingMode.NCRYPT_PAD_PKCS1_FLAG, &pkcs1PaddingInfo, out bytesWritten); case RSASignaturePaddingMode.Pss: - var pssPaddingInfo = new BCRYPT_PSS_PADDING_INFO() { pszAlgId = namePtr, cbSalt = source.Length }; - return keyHandle.TrySignHash(source, destination, AsymmetricPaddingMode.NCRYPT_PAD_PSS_FLAG, &pssPaddingInfo, out bytesWritten); + var pssPaddingInfo = new BCRYPT_PSS_PADDING_INFO() { pszAlgId = namePtr, cbSalt = hash.Length }; + return keyHandle.TrySignHash(hash, destination, AsymmetricPaddingMode.NCRYPT_PAD_PSS_FLAG, &pssPaddingInfo, out bytesWritten); default: throw new CryptographicException(SR.Cryptography_UnsupportedPaddingMode); @@ -137,6 +171,11 @@ namespace System.Security.Cryptography using (SafeNCryptKeyHandle keyHandle = GetDuplicatedKeyHandle()) { + if (hash.Length != GetHashSizeInBytes(hashAlgorithm)) + { + return false; + } + IntPtr namePtr = Marshal.StringToHGlobalUni(hashAlgorithmName); try { diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/RSACng.cs b/external/corefx/src/Common/src/System/Security/Cryptography/RSACng.cs index 2899ab70dc..f7edcd6746 100644 --- a/external/corefx/src/Common/src/System/Security/Cryptography/RSACng.cs +++ b/external/corefx/src/Common/src/System/Security/Cryptography/RSACng.cs @@ -50,8 +50,8 @@ namespace System.Security.Cryptography protected override byte[] HashData(byte[] data, int offset, int count, HashAlgorithmName hashAlgorithm) => CngCommon.HashData(data, offset, count, hashAlgorithm); - protected override bool TryHashData(ReadOnlySpan source, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) => - CngCommon.TryHashData(source, destination, hashAlgorithm, out bytesWritten); + protected override bool TryHashData(ReadOnlySpan data, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) => + CngCommon.TryHashData(data, destination, hashAlgorithm, out bytesWritten); protected override byte[] HashData(Stream data, HashAlgorithmName hashAlgorithm) => CngCommon.HashData(data, hashAlgorithm); diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/RSAOpenSsl.cs b/external/corefx/src/Common/src/System/Security/Cryptography/RSAOpenSsl.cs index d2d6268fa2..2fe3666161 100644 --- a/external/corefx/src/Common/src/System/Security/Cryptography/RSAOpenSsl.cs +++ b/external/corefx/src/Common/src/System/Security/Cryptography/RSAOpenSsl.cs @@ -2,6 +2,7 @@ // 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; using System.Diagnostics; using System.IO; @@ -88,65 +89,122 @@ namespace System.Security.Cryptography if (padding == null) throw new ArgumentNullException(nameof(padding)); - Interop.Crypto.RsaPadding rsaPadding = GetInteropPadding(padding); + Interop.Crypto.RsaPadding rsaPadding = GetInteropPadding(padding, out RsaPaddingProcessor oaepProcessor); SafeRsaHandle key = _key.Value; CheckInvalidKey(key); - byte[] buf = new byte[Interop.Crypto.RsaSize(key)]; + int rsaSize = Interop.Crypto.RsaSize(key); + byte[] buf = null; + Span destination = default; - int returnValue = Interop.Crypto.RsaPrivateDecrypt( - data.Length, - data, - buf, - key, - rsaPadding); - - CheckReturn(returnValue); - - // If the padding mode is RSA_NO_PADDING then the size of the decrypted block - // will be RSA_size, so let's just return buf. - // - // If any padding was used, then some amount (determined by the padding algorithm) - // will have been reduced, and only returnValue bytes were part of the decrypted - // body, so copy the decrypted bytes to an appropriately sized array before - // returning it. - if (returnValue == buf.Length) + try { - return buf; - } + buf = ArrayPool.Shared.Rent(rsaSize); + destination = new Span(buf, 0, rsaSize); - byte[] plainBytes = new byte[returnValue]; - Buffer.BlockCopy(buf, 0, plainBytes, 0, returnValue); - return plainBytes; + if (!TryDecrypt(key, data, destination, rsaPadding, oaepProcessor, out int bytesWritten)) + { + Debug.Fail($"{nameof(TryDecrypt)} should not return false for RSA_size buffer"); + throw new CryptographicException(); + } + + return destination.Slice(0, bytesWritten).ToArray(); + } + finally + { + CryptographicOperations.ZeroMemory(destination); + ArrayPool.Shared.Return(buf); + } } - public override bool TryDecrypt(ReadOnlySpan source, Span destination, RSAEncryptionPadding padding, out int bytesWritten) + public override bool TryDecrypt( + ReadOnlySpan data, + Span destination, + RSAEncryptionPadding padding, + out int bytesWritten) { if (padding == null) { throw new ArgumentNullException(nameof(padding)); } - Interop.Crypto.RsaPadding rsaPadding = GetInteropPadding(padding); + Interop.Crypto.RsaPadding rsaPadding = GetInteropPadding(padding, out RsaPaddingProcessor oaepProcessor); SafeRsaHandle key = _key.Value; CheckInvalidKey(key); - if (destination.Length < Interop.Crypto.RsaSize(key)) + return TryDecrypt(key, data, destination, rsaPadding, oaepProcessor, out bytesWritten); + } + + private static bool TryDecrypt( + SafeRsaHandle key, + ReadOnlySpan data, + Span destination, + Interop.Crypto.RsaPadding rsaPadding, + RsaPaddingProcessor rsaPaddingProcessor, + out int bytesWritten) + { + // If rsaPadding is PKCS1 or OAEP-SHA1 then no depadding method should be present. + // If rsaPadding is NoPadding then a depadding method should be present. + Debug.Assert( + (rsaPadding == Interop.Crypto.RsaPadding.NoPadding) == + (rsaPaddingProcessor != null)); + + // Caller should have already checked this. + Debug.Assert(!key.IsInvalid); + + int rsaSize = Interop.Crypto.RsaSize(key); + + if (data.Length != rsaSize) + { + throw new CryptographicException(SR.Cryptography_RSA_DecryptWrongSize); + } + + if (destination.Length < rsaSize) { bytesWritten = 0; return false; } - int returnValue = Interop.Crypto.RsaPrivateDecrypt(source.Length, source, destination, key, rsaPadding); - CheckReturn(returnValue); + Span decryptBuf = destination; + byte[] paddingBuf = null; - // If the padding mode is RSA_NO_PADDING then the size of the decrypted block - // will be RSA_size. If any padding was used, then some amount (determined by the padding algorithm) - // will have been reduced, and only returnValue bytes were part of the decrypted - // body. Either way, we can just use returnValue, but some additional bytes may have been overwritten - // in the destination span. - bytesWritten = returnValue; - return true; + if (rsaPaddingProcessor != null) + { + paddingBuf = ArrayPool.Shared.Rent(rsaSize); + decryptBuf = paddingBuf; + } + + try + { + int returnValue = Interop.Crypto.RsaPrivateDecrypt(data.Length, data, decryptBuf, key, rsaPadding); + CheckReturn(returnValue); + + if (rsaPaddingProcessor != null) + { + return rsaPaddingProcessor.DepadOaep(paddingBuf, destination, out bytesWritten); + } + else + { + // If the padding mode is RSA_NO_PADDING then the size of the decrypted block + // will be RSA_size. If any padding was used, then some amount (determined by the padding algorithm) + // will have been reduced, and only returnValue bytes were part of the decrypted + // body. Either way, we can just use returnValue, but some additional bytes may have been overwritten + // in the destination span. + bytesWritten = returnValue; + } + + return true; + } + finally + { + if (paddingBuf != null) + { + // DecryptBuf is paddingBuf if paddingBuf is not null, erase it before returning it. + // If paddingBuf IS null then decryptBuf was destination, and shouldn't be cleared. + CryptographicOperations.ZeroMemory(decryptBuf); + ArrayPool.Shared.Return(paddingBuf); + } + } } public override byte[] Encrypt(byte[] data, RSAEncryptionPadding padding) @@ -156,52 +214,117 @@ namespace System.Security.Cryptography if (padding == null) throw new ArgumentNullException(nameof(padding)); - Interop.Crypto.RsaPadding rsaPadding = GetInteropPadding(padding); + Interop.Crypto.RsaPadding rsaPadding = GetInteropPadding(padding, out RsaPaddingProcessor oaepProcessor); SafeRsaHandle key = _key.Value; CheckInvalidKey(key); byte[] buf = new byte[Interop.Crypto.RsaSize(key)]; - int returnValue = Interop.Crypto.RsaPublicEncrypt( - data.Length, + bool encrypted = TryEncrypt( + key, data, buf, - key, - rsaPadding); + rsaPadding, + oaepProcessor, + out int bytesWritten); - CheckReturn(returnValue); + if (!encrypted || bytesWritten != buf.Length) + { + Debug.Fail($"TryEncrypt behaved unexpectedly: {nameof(encrypted)}=={encrypted}, {nameof(bytesWritten)}=={bytesWritten}, {nameof(buf.Length)}=={buf.Length}"); + throw new CryptographicException(); + } return buf; } - public override bool TryEncrypt(ReadOnlySpan source, Span destination, RSAEncryptionPadding padding, out int bytesWritten) + public override bool TryEncrypt(ReadOnlySpan data, Span destination, RSAEncryptionPadding padding, out int bytesWritten) { if (padding == null) { throw new ArgumentNullException(nameof(padding)); } - Interop.Crypto.RsaPadding rsaPadding = GetInteropPadding(padding); + Interop.Crypto.RsaPadding rsaPadding = GetInteropPadding(padding, out RsaPaddingProcessor oaepProcessor); SafeRsaHandle key = _key.Value; CheckInvalidKey(key); - if (destination.Length < Interop.Crypto.RsaSize(key)) + return TryEncrypt(key, data, destination, rsaPadding, oaepProcessor, out bytesWritten); + } + + private static bool TryEncrypt( + SafeRsaHandle key, + ReadOnlySpan data, + Span destination, + Interop.Crypto.RsaPadding rsaPadding, + RsaPaddingProcessor rsaPaddingProcessor, + out int bytesWritten) + { + int rsaSize = Interop.Crypto.RsaSize(key); + + if (destination.Length < rsaSize) { bytesWritten = 0; return false; } - int returnValue = Interop.Crypto.RsaPublicEncrypt(source.Length, source, destination, key, rsaPadding); + int returnValue; + + if (rsaPaddingProcessor != null) + { + Debug.Assert(rsaPadding == Interop.Crypto.RsaPadding.NoPadding); + byte[] rented = ArrayPool.Shared.Rent(rsaSize); + Span tmp = new Span(rented, 0, rsaSize); + + try + { + rsaPaddingProcessor.PadOaep(data, tmp); + returnValue = Interop.Crypto.RsaPublicEncrypt(tmp.Length, tmp, destination, key, rsaPadding); + } + finally + { + CryptographicOperations.ZeroMemory(tmp); + ArrayPool.Shared.Return(rented); + } + } + else + { + Debug.Assert(rsaPadding != Interop.Crypto.RsaPadding.NoPadding); + + returnValue = Interop.Crypto.RsaPublicEncrypt(data.Length, data, destination, key, rsaPadding); + } + CheckReturn(returnValue); bytesWritten = returnValue; + Debug.Assert(returnValue == rsaSize); return true; + } - private static Interop.Crypto.RsaPadding GetInteropPadding(RSAEncryptionPadding padding) => - padding == RSAEncryptionPadding.Pkcs1 ? Interop.Crypto.RsaPadding.Pkcs1 : - padding == RSAEncryptionPadding.OaepSHA1 ? Interop.Crypto.RsaPadding.OaepSHA1 : + private static Interop.Crypto.RsaPadding GetInteropPadding( + RSAEncryptionPadding padding, + out RsaPaddingProcessor rsaPaddingProcessor) + { + if (padding == RSAEncryptionPadding.Pkcs1) + { + rsaPaddingProcessor = null; + return Interop.Crypto.RsaPadding.Pkcs1; + } + + if (padding == RSAEncryptionPadding.OaepSHA1) + { + rsaPaddingProcessor = null; + return Interop.Crypto.RsaPadding.OaepSHA1; + } + + if (padding.Mode == RSAEncryptionPaddingMode.Oaep) + { + rsaPaddingProcessor = RsaPaddingProcessor.OpenProcessor(padding.OaepHashAlgorithm); + return Interop.Crypto.RsaPadding.NoPadding; + } + throw PaddingModeNotSupported(); + } public override RSAParameters ExportParameters(bool includePrivateParameters) { @@ -232,7 +355,7 @@ namespace System.Security.Cryptography try { - Interop.Crypto.SetRsaParameters( + if (!Interop.Crypto.SetRsaParameters( key, parameters.Modulus, parameters.Modulus != null ? parameters.Modulus.Length : 0, @@ -249,7 +372,10 @@ namespace System.Security.Cryptography parameters.DQ, parameters.DQ != null ? parameters.DQ.Length : 0, parameters.InverseQ, - parameters.InverseQ != null ? parameters.InverseQ.Length : 0); + parameters.InverseQ != null ? parameters.InverseQ.Length : 0)) + { + throw Interop.Crypto.CreateOpenSslCryptographicException(); + } imported = true; } @@ -389,8 +515,8 @@ namespace System.Security.Cryptography protected override byte[] HashData(Stream data, HashAlgorithmName hashAlgorithm) => AsymmetricAlgorithmHelpers.HashData(data, hashAlgorithm); - protected override bool TryHashData(ReadOnlySpan source, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) => - AsymmetricAlgorithmHelpers.TryHashData(source, destination, hashAlgorithm, out bytesWritten); + protected override bool TryHashData(ReadOnlySpan data, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) => + AsymmetricAlgorithmHelpers.TryHashData(data, destination, hashAlgorithm, out bytesWritten); public override byte[] SignHash(byte[] hash, HashAlgorithmName hashAlgorithm, RSASignaturePadding padding) { @@ -400,43 +526,29 @@ namespace System.Security.Cryptography throw HashAlgorithmNameNullOrEmpty(); if (padding == null) throw new ArgumentNullException(nameof(padding)); - if (padding != RSASignaturePadding.Pkcs1) - throw PaddingModeNotSupported(); - return SignHash(hash, hashAlgorithm); - } - - private byte[] SignHash(byte[] hash, HashAlgorithmName hashAlgorithmName) - { - int algorithmNid = GetAlgorithmNid(hashAlgorithmName); - SafeRsaHandle rsa = _key.Value; - byte[] signature = new byte[Interop.Crypto.RsaSize(rsa)]; - int signatureSize; - - bool success = Interop.Crypto.RsaSign( - algorithmNid, + if (!TrySignHash( hash, - hash.Length, - signature, - out signatureSize, - rsa); - - if (!success) + Span.Empty, + hashAlgorithm, padding, + true, + out int bytesWritten, + out byte[] signature)) { - throw Interop.Crypto.CreateOpenSslCryptographicException(); + Debug.Fail("TrySignHash should not return false in allocation mode"); + throw new CryptographicException(); } - Debug.Assert( - signatureSize == signature.Length, - "RSA_sign reported an unexpected signature size", - "RSA_sign reported signatureSize was {0}, when {1} was expected", - signatureSize, - signature.Length); - + Debug.Assert(signature != null); return signature; } - public override bool TrySignHash(ReadOnlySpan source, Span destination, HashAlgorithmName hashAlgorithm, RSASignaturePadding padding, out int bytesWritten) + public override bool TrySignHash( + ReadOnlySpan hash, + Span destination, + HashAlgorithmName hashAlgorithm, + RSASignaturePadding padding, + out int bytesWritten) { if (string.IsNullOrEmpty(hashAlgorithm.Name)) { @@ -446,30 +558,110 @@ namespace System.Security.Cryptography { throw new ArgumentNullException(nameof(padding)); } - if (padding != RSASignaturePadding.Pkcs1) + + bool ret = TrySignHash( + hash, + destination, + hashAlgorithm, + padding, + false, + out bytesWritten, + out byte[] alloced); + + Debug.Assert(alloced == null); + return ret; + } + + private bool TrySignHash( + ReadOnlySpan hash, + Span destination, + HashAlgorithmName hashAlgorithm, + RSASignaturePadding padding, + bool allocateSignature, + out int bytesWritten, + out byte[] signature) + { + Debug.Assert(!string.IsNullOrEmpty(hashAlgorithm.Name)); + Debug.Assert(padding != null); + + signature = null; + + // Do not factor out getting _key.Value, since the key creation should not happen on + // invalid padding modes. + + if (padding.Mode == RSASignaturePaddingMode.Pkcs1) { - throw PaddingModeNotSupported(); + int algorithmNid = GetAlgorithmNid(hashAlgorithm); + SafeRsaHandle rsa = _key.Value; + + int bytesRequired = Interop.Crypto.RsaSize(rsa); + + if (allocateSignature) + { + Debug.Assert(destination.Length == 0); + signature = new byte[bytesRequired]; + destination = signature; + } + + if (destination.Length < bytesRequired) + { + bytesWritten = 0; + return false; + } + + if (!Interop.Crypto.RsaSign(algorithmNid, hash, hash.Length, destination, out int signatureSize, rsa)) + { + throw Interop.Crypto.CreateOpenSslCryptographicException(); + } + + Debug.Assert( + signatureSize == bytesRequired, + $"RSA_sign reported signatureSize was {signatureSize}, when {bytesRequired} was expected"); + + bytesWritten = signatureSize; + return true; + } + else if (padding.Mode == RSASignaturePaddingMode.Pss) + { + RsaPaddingProcessor processor = RsaPaddingProcessor.OpenProcessor(hashAlgorithm); + SafeRsaHandle rsa = _key.Value; + + int bytesRequired = Interop.Crypto.RsaSize(rsa); + + if (allocateSignature) + { + Debug.Assert(destination.Length == 0); + signature = new byte[bytesRequired]; + destination = signature; + } + + if (destination.Length < bytesRequired) + { + bytesWritten = 0; + return false; + } + + byte[] pssRented = ArrayPool.Shared.Rent(bytesRequired); + Span pssBytes = new Span(pssRented, 0, bytesRequired); + + processor.EncodePss(hash, pssBytes, KeySize); + + int ret = Interop.Crypto.RsaSignPrimitive(pssBytes, destination, rsa); + + pssBytes.Clear(); + ArrayPool.Shared.Return(pssRented); + + CheckReturn(ret); + + Debug.Assert( + ret == bytesRequired, + $"RSA_private_encrypt returned {ret} when {bytesRequired} was expected"); + + bytesWritten = ret; + return true; } - int algorithmNid = GetAlgorithmNid(hashAlgorithm); - SafeRsaHandle rsa = _key.Value; - - int bytesRequired = Interop.Crypto.RsaSize(rsa); - if (destination.Length < bytesRequired) - { - bytesWritten = 0; - return false; - } - - int signatureSize; - if (!Interop.Crypto.RsaSign(algorithmNid, source, source.Length, destination, out signatureSize, rsa)) - { - throw Interop.Crypto.CreateOpenSslCryptographicException(); - } - - Debug.Assert(signatureSize == bytesRequired, $"RSA_sign reported signatureSize was {signatureSize}, when {bytesRequired} was expected"); - bytesWritten = signatureSize; - return true; + throw PaddingModeNotSupported(); } public override bool VerifyHash( @@ -500,14 +692,53 @@ namespace System.Security.Cryptography { throw new ArgumentNullException(nameof(padding)); } - if (padding != RSASignaturePadding.Pkcs1) + + if (padding == RSASignaturePadding.Pkcs1) { - throw PaddingModeNotSupported(); + int algorithmNid = GetAlgorithmNid(hashAlgorithm); + SafeRsaHandle rsa = _key.Value; + return Interop.Crypto.RsaVerify(algorithmNid, hash, signature, rsa); + } + else if (padding == RSASignaturePadding.Pss) + { + RsaPaddingProcessor processor = RsaPaddingProcessor.OpenProcessor(hashAlgorithm); + SafeRsaHandle rsa = _key.Value; + + int requiredBytes = Interop.Crypto.RsaSize(rsa); + + if (signature.Length != requiredBytes) + { + return false; + } + + if (hash.Length != processor.HashLength) + { + return false; + } + + byte[] rented = ArrayPool.Shared.Rent(requiredBytes); + Span unwrapped = new Span(rented, 0, requiredBytes); + + try + { + int ret = Interop.Crypto.RsaVerificationPrimitive(signature, unwrapped, rsa); + + CheckReturn(ret); + + Debug.Assert( + ret == requiredBytes, + $"RSA_private_encrypt returned {ret} when {requiredBytes} was expected"); + + return processor.VerifyPss(hash, unwrapped, KeySize); + } + finally + { + unwrapped.Clear(); + ArrayPool.Shared.Return(rented); + } } - int algorithmNid = GetAlgorithmNid(hashAlgorithm); - SafeRsaHandle rsa = _key.Value; - return Interop.Crypto.RsaVerify(algorithmNid, hash, hash.Length, signature, signature.Length, rsa); + throw PaddingModeNotSupported(); } private static int GetAlgorithmNid(HashAlgorithmName hashAlgorithmName) @@ -520,6 +751,7 @@ namespace System.Security.Cryptography if (nid == Interop.Crypto.NID_undef) { + Interop.Crypto.ErrClearError(); throw new CryptographicException(SR.Cryptography_UnknownHashAlgorithm, hashAlgorithmName.Name); } diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/RSASecurityTransforms.cs b/external/corefx/src/Common/src/System/Security/Cryptography/RSASecurityTransforms.cs index 23ba66fcdb..761d2bd1e3 100644 --- a/external/corefx/src/Common/src/System/Security/Cryptography/RSASecurityTransforms.cs +++ b/external/corefx/src/Common/src/System/Security/Cryptography/RSASecurityTransforms.cs @@ -2,6 +2,7 @@ // 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; using System.Diagnostics; using System.IO; using System.Security.Cryptography.Apple; @@ -166,17 +167,94 @@ namespace System.Security.Cryptography throw new ArgumentNullException(nameof(padding)); } - return Interop.AppleCrypto.RsaEncrypt(GetKeys().PublicKey, data, padding); + // The size of encrypt is always the keysize (in ceiling-bytes) + int outputSize = RsaPaddingProcessor.BytesRequiredForBitCount(KeySize); + byte[] output = new byte[outputSize]; + + if (!TryEncrypt(data, output, padding, out int bytesWritten)) + { + Debug.Fail($"TryEncrypt with a preallocated buffer should not fail"); + throw new CryptographicException(); + } + + Debug.Assert(bytesWritten == outputSize); + return output; } - public override bool TryEncrypt(ReadOnlySpan source, Span destination, RSAEncryptionPadding padding, out int bytesWritten) + public override bool TryEncrypt(ReadOnlySpan data, Span destination, RSAEncryptionPadding padding, out int bytesWritten) { if (padding == null) { throw new ArgumentNullException(nameof(padding)); } - return Interop.AppleCrypto.TryRsaEncrypt(GetKeys().PublicKey, source, destination, padding, out bytesWritten); + int rsaSize = RsaPaddingProcessor.BytesRequiredForBitCount(KeySize); + + if (destination.Length < rsaSize) + { + bytesWritten = 0; + return false; + } + + if (padding == RSAEncryptionPadding.Pkcs1 && data.Length > 0) + { + const int Pkcs1PaddingOverhead = 11; + int maxAllowed = rsaSize - Pkcs1PaddingOverhead; + + if (data.Length > maxAllowed) + { + throw new CryptographicException( + SR.Format(SR.Cryptography_Encryption_MessageTooLong, maxAllowed)); + } + + return Interop.AppleCrypto.TryRsaEncrypt( + GetKeys().PublicKey, + data, + destination, + padding, + out bytesWritten); + } + + RsaPaddingProcessor processor; + + switch (padding.Mode) + { + case RSAEncryptionPaddingMode.Pkcs1: + processor = null; + break; + case RSAEncryptionPaddingMode.Oaep: + processor = RsaPaddingProcessor.OpenProcessor(padding.OaepHashAlgorithm); + break; + default: + throw new CryptographicException(SR.Cryptography_InvalidPaddingMode); + } + + byte[] rented = ArrayPool.Shared.Rent(rsaSize); + Span tmp = new Span(rented, 0, rsaSize); + + try + { + if (processor != null) + { + processor.PadOaep(data, tmp); + } + else + { + Debug.Assert(padding.Mode == RSAEncryptionPaddingMode.Pkcs1); + RsaPaddingProcessor.PadPkcs1Encryption(data, tmp); + } + + return Interop.AppleCrypto.TryRsaEncryptionPrimitive( + GetKeys().PublicKey, + tmp, + destination, + out bytesWritten); + } + finally + { + tmp.Clear(); + ArrayPool.Shared.Return(rented); + } } public override byte[] Decrypt(byte[] data, RSAEncryptionPadding padding) @@ -197,10 +275,41 @@ namespace System.Security.Cryptography throw new CryptographicException(SR.Cryptography_CSP_NoPrivateKey); } - return Interop.AppleCrypto.RsaDecrypt(keys.PrivateKey, data, padding); + int modulusSizeInBytes = RsaPaddingProcessor.BytesRequiredForBitCount(KeySize); + + if (data.Length != modulusSizeInBytes) + { + throw new CryptographicException(SR.Cryptography_RSA_DecryptWrongSize); + } + + if (padding.Mode == RSAEncryptionPaddingMode.Pkcs1) + { + return Interop.AppleCrypto.RsaDecrypt(keys.PrivateKey, data, padding); + } + + int maxOutputSize = RsaPaddingProcessor.BytesRequiredForBitCount(KeySize); + byte[] rented = ArrayPool.Shared.Rent(maxOutputSize); + Span contentsSpan = Span.Empty; + + try + { + if (!TryDecrypt(keys.PrivateKey, data, rented, padding, out int bytesWritten)) + { + Debug.Fail($"TryDecrypt returned false with a modulus-sized destination"); + throw new CryptographicException(); + } + + contentsSpan = new Span(rented, 0, bytesWritten); + return contentsSpan.ToArray(); + } + finally + { + CryptographicOperations.ZeroMemory(contentsSpan); + ArrayPool.Shared.Return(rented); + } } - public override bool TryDecrypt(ReadOnlySpan source, Span destination, RSAEncryptionPadding padding, out int bytesWritten) + public override bool TryDecrypt(ReadOnlySpan data, Span destination, RSAEncryptionPadding padding, out int bytesWritten) { if (padding == null) { @@ -214,7 +323,60 @@ namespace System.Security.Cryptography throw new CryptographicException(SR.Cryptography_CSP_NoPrivateKey); } - return Interop.AppleCrypto.TryRsaDecrypt(keys.PrivateKey, source, destination, padding, out bytesWritten); + return TryDecrypt(keys.PrivateKey, data, destination, padding, out bytesWritten); + } + + private bool TryDecrypt( + SafeSecKeyRefHandle privateKey, + ReadOnlySpan data, + Span destination, + RSAEncryptionPadding padding, + out int bytesWritten) + { + Debug.Assert(privateKey != null); + + if (padding.Mode != RSAEncryptionPaddingMode.Pkcs1 && + padding.Mode != RSAEncryptionPaddingMode.Oaep) + { + throw new CryptographicException(SR.Cryptography_InvalidPaddingMode); + } + + int modulusSizeInBytes = RsaPaddingProcessor.BytesRequiredForBitCount(KeySize); + + if (data.Length != modulusSizeInBytes) + { + throw new CryptographicException(SR.Cryptography_RSA_DecryptWrongSize); + } + + if (padding.Mode == RSAEncryptionPaddingMode.Pkcs1 || + padding == RSAEncryptionPadding.OaepSHA1) + { + return Interop.AppleCrypto.TryRsaDecrypt(privateKey, data, destination, padding, out bytesWritten); + } + + Debug.Assert(padding.Mode == RSAEncryptionPaddingMode.Oaep); + RsaPaddingProcessor processor = RsaPaddingProcessor.OpenProcessor(padding.OaepHashAlgorithm); + + byte[] rented = ArrayPool.Shared.Rent(modulusSizeInBytes); + Span unpaddedData = Span.Empty; + + try + { + if (!Interop.AppleCrypto.TryRsaDecryptionPrimitive(privateKey, data, rented, out int paddedSize)) + { + Debug.Fail($"Raw decryption failed with KeySize={KeySize} and a buffer length {rented.Length}"); + throw new CryptographicException(); + } + + Debug.Assert(modulusSizeInBytes == paddedSize); + unpaddedData = new Span(rented, 0, paddedSize); + return processor.DepadOaep(unpaddedData, destination, out bytesWritten); + } + finally + { + CryptographicOperations.ZeroMemory(unpaddedData); + ArrayPool.Shared.Return(rented); + } } public override byte[] SignHash(byte[] hash, HashAlgorithmName hashAlgorithm, RSASignaturePadding padding) @@ -225,39 +387,53 @@ namespace System.Security.Cryptography throw HashAlgorithmNameNullOrEmpty(); if (padding == null) throw new ArgumentNullException(nameof(padding)); - if (padding != RSASignaturePadding.Pkcs1) - throw new CryptographicException(SR.Cryptography_InvalidPaddingMode); - SecKeyPair keys = GetKeys(); - - if (keys.PrivateKey == null) + if (padding == RSASignaturePadding.Pkcs1) { - throw new CryptographicException(SR.Cryptography_CSP_NoPrivateKey); + SecKeyPair keys = GetKeys(); + + if (keys.PrivateKey == null) + { + throw new CryptographicException(SR.Cryptography_CSP_NoPrivateKey); + } + + int expectedSize; + Interop.AppleCrypto.PAL_HashAlgorithm palAlgId = + PalAlgorithmFromAlgorithmName(hashAlgorithm, out expectedSize); + + if (hash.Length != expectedSize) + { + // Windows: NTE_BAD_DATA ("Bad Data.") + // OpenSSL: RSA_R_INVALID_MESSAGE_LENGTH ("invalid message length") + throw new CryptographicException( + SR.Format( + SR.Cryptography_BadHashSize_ForAlgorithm, + hash.Length, + expectedSize, + hashAlgorithm.Name)); + } + + return Interop.AppleCrypto.GenerateSignature( + keys.PrivateKey, + hash, + palAlgId); } - int expectedSize; - Interop.AppleCrypto.PAL_HashAlgorithm palAlgId = - PalAlgorithmFromAlgorithmName(hashAlgorithm, out expectedSize); + // A signature will always be the keysize (in ceiling-bytes) in length. + int outputSize = RsaPaddingProcessor.BytesRequiredForBitCount(KeySize); + byte[] output = new byte[outputSize]; - if (hash.Length != expectedSize) + if (!TrySignHash(hash, output, hashAlgorithm, padding, out int bytesWritten)) { - // Windows: NTE_BAD_DATA ("Bad Data.") - // OpenSSL: RSA_R_INVALID_MESSAGE_LENGTH ("invalid message length") - throw new CryptographicException( - SR.Format( - SR.Cryptography_BadHashSize_ForAlgorithm, - hash.Length, - expectedSize, - hashAlgorithm.Name)); + Debug.Fail("TrySignHash failed with a pre-allocated buffer"); + throw new CryptographicException(); } - return Interop.AppleCrypto.GenerateSignature( - keys.PrivateKey, - hash, - palAlgId); + Debug.Assert(bytesWritten == outputSize); + return output; } - public override bool TrySignHash(ReadOnlySpan source, Span destination, HashAlgorithmName hashAlgorithm, RSASignaturePadding padding, out int bytesWritten) + public override bool TrySignHash(ReadOnlySpan hash, Span destination, HashAlgorithmName hashAlgorithm, RSASignaturePadding padding, out int bytesWritten) { if (string.IsNullOrEmpty(hashAlgorithm.Name)) { @@ -267,7 +443,14 @@ namespace System.Security.Cryptography { throw new ArgumentNullException(nameof(padding)); } - if (padding != RSASignaturePadding.Pkcs1) + + RsaPaddingProcessor processor = null; + + if (padding.Mode == RSASignaturePaddingMode.Pss) + { + processor = RsaPaddingProcessor.OpenProcessor(hashAlgorithm); + } + else if (padding != RSASignaturePadding.Pkcs1) { throw new CryptographicException(SR.Cryptography_InvalidPaddingMode); } @@ -279,20 +462,61 @@ namespace System.Security.Cryptography throw new CryptographicException(SR.Cryptography_CSP_NoPrivateKey); } - Interop.AppleCrypto.PAL_HashAlgorithm palAlgId = PalAlgorithmFromAlgorithmName(hashAlgorithm, out int expectedSize); - if (source.Length != expectedSize) + int keySize = KeySize; + int rsaSize = RsaPaddingProcessor.BytesRequiredForBitCount(keySize); + + if (processor == null) { - // Windows: NTE_BAD_DATA ("Bad Data.") - // OpenSSL: RSA_R_INVALID_MESSAGE_LENGTH ("invalid message length") - throw new CryptographicException( - SR.Format( - SR.Cryptography_BadHashSize_ForAlgorithm, - source.Length, - expectedSize, - hashAlgorithm.Name)); + Interop.AppleCrypto.PAL_HashAlgorithm palAlgId = + PalAlgorithmFromAlgorithmName(hashAlgorithm, out int expectedSize); + + if (hash.Length != expectedSize) + { + // Windows: NTE_BAD_DATA ("Bad Data.") + // OpenSSL: RSA_R_INVALID_MESSAGE_LENGTH ("invalid message length") + throw new CryptographicException( + SR.Format( + SR.Cryptography_BadHashSize_ForAlgorithm, + hash.Length, + expectedSize, + hashAlgorithm.Name)); + } + + if (destination.Length < rsaSize) + { + bytesWritten = 0; + return false; + } + + return Interop.AppleCrypto.TryGenerateSignature( + keys.PrivateKey, + hash, + destination, + palAlgId, + out bytesWritten); } - return Interop.AppleCrypto.TryGenerateSignature(keys.PrivateKey, source, destination, palAlgId, out bytesWritten); + Debug.Assert(padding.Mode == RSASignaturePaddingMode.Pss); + + if (destination.Length < rsaSize) + { + bytesWritten = 0; + return false; + } + + byte[] rented = ArrayPool.Shared.Rent(rsaSize); + Span buf = new Span(rented, 0, rsaSize); + processor.EncodePss(hash, buf, keySize); + + try + { + return Interop.AppleCrypto.TryRsaSignaturePrimitive(keys.PrivateKey, buf, destination, out bytesWritten); + } + finally + { + CryptographicOperations.ZeroMemory(buf); + ArrayPool.Shared.Return(rented); + } } public override bool VerifyHash( @@ -323,13 +547,57 @@ namespace System.Security.Cryptography { throw new ArgumentNullException(nameof(padding)); } - if (padding != RSASignaturePadding.Pkcs1) + + if (padding == RSASignaturePadding.Pkcs1) { - throw new CryptographicException(SR.Cryptography_InvalidPaddingMode); + Interop.AppleCrypto.PAL_HashAlgorithm palAlgId = + PalAlgorithmFromAlgorithmName(hashAlgorithm, out int expectedSize); + return Interop.AppleCrypto.VerifySignature(GetKeys().PublicKey, hash, signature, palAlgId); + } + else if (padding.Mode == RSASignaturePaddingMode.Pss) + { + RsaPaddingProcessor processor = RsaPaddingProcessor.OpenProcessor(hashAlgorithm); + SafeSecKeyRefHandle publicKey = GetKeys().PublicKey; + + int keySize = KeySize; + int rsaSize = RsaPaddingProcessor.BytesRequiredForBitCount(keySize); + + if (signature.Length != rsaSize) + { + return false; + } + + if (hash.Length != processor.HashLength) + { + return false; + } + + byte[] rented = ArrayPool.Shared.Rent(rsaSize); + Span unwrapped = new Span(rented, 0, rsaSize); + + try + { + if (!Interop.AppleCrypto.TryRsaVerificationPrimitive( + publicKey, + signature, + unwrapped, + out int bytesWritten)) + { + Debug.Fail($"TryRsaVerificationPrimitive with a pre-allocated buffer"); + throw new CryptographicException(); + } + + Debug.Assert(bytesWritten == rsaSize); + return processor.VerifyPss(hash, unwrapped, keySize); + } + finally + { + unwrapped.Clear(); + ArrayPool.Shared.Return(rented); + } } - Interop.AppleCrypto.PAL_HashAlgorithm palAlgId = PalAlgorithmFromAlgorithmName(hashAlgorithm, out int expectedSize); - return Interop.AppleCrypto.VerifySignature(GetKeys().PublicKey, hash, signature, palAlgId); + throw new CryptographicException(SR.Cryptography_InvalidPaddingMode); } protected override byte[] HashData(byte[] data, int offset, int count, HashAlgorithmName hashAlgorithm) => @@ -338,8 +606,8 @@ namespace System.Security.Cryptography protected override byte[] HashData(Stream data, HashAlgorithmName hashAlgorithm) => AsymmetricAlgorithmHelpers.HashData(data, hashAlgorithm); - protected override bool TryHashData(ReadOnlySpan source, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) => - AsymmetricAlgorithmHelpers.TryHashData(source, destination, hashAlgorithm, out bytesWritten); + protected override bool TryHashData(ReadOnlySpan data, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) => + AsymmetricAlgorithmHelpers.TryHashData(data, destination, hashAlgorithm, out bytesWritten); protected override void Dispose(bool disposing) { diff --git a/external/corefx/src/Common/src/System/Security/Cryptography/RsaPaddingProcessor.cs b/external/corefx/src/Common/src/System/Security/Cryptography/RsaPaddingProcessor.cs new file mode 100644 index 0000000000..34de84e443 --- /dev/null +++ b/external/corefx/src/Common/src/System/Security/Cryptography/RsaPaddingProcessor.cs @@ -0,0 +1,559 @@ +// 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; +using System.Buffers.Binary; +using System.Collections.Concurrent; +using System.Diagnostics; + +namespace System.Security.Cryptography +{ + internal sealed class RsaPaddingProcessor + { + private static readonly byte[] s_eightZeros = new byte[8]; + + private static readonly ConcurrentDictionary s_lookup = + new ConcurrentDictionary(); + + private readonly HashAlgorithmName _hashAlgorithmName; + private readonly int _hLen; + + private RsaPaddingProcessor(HashAlgorithmName hashAlgorithmName, int hLen) + { + _hashAlgorithmName = hashAlgorithmName; + _hLen = hLen; + } + + internal static int BytesRequiredForBitCount(int keySizeInBits) + { + return (int)(((uint)keySizeInBits + 7) / 8); + } + + internal int HashLength => _hLen; + + internal static RsaPaddingProcessor OpenProcessor(HashAlgorithmName hashAlgorithmName) + { + return s_lookup.GetOrAdd( + hashAlgorithmName, + alg => + { + using (IncrementalHash hasher = IncrementalHash.CreateHash(hashAlgorithmName)) + { + // SHA-2-512 is the biggest we expect + Span stackDest = stackalloc byte[512 / 8]; + + if (hasher.TryGetHashAndReset(stackDest, out int bytesWritten)) + { + return new RsaPaddingProcessor(hashAlgorithmName, bytesWritten); + } + + byte[] big = hasher.GetHashAndReset(); + return new RsaPaddingProcessor(hashAlgorithmName, big.Length); + } + }); + } + + internal static void PadPkcs1Encryption( + ReadOnlySpan source, + Span destination) + { + // https://tools.ietf.org/html/rfc3447#section-7.2.1 + + int mLen = source.Length; + int k = destination.Length; + + // 1. If mLen > k - 11, fail + if (mLen > k - 11) + { + throw new CryptographicException(SR.Cryptography_KeyTooSmall); + } + + // 2(b). EM is composed of 00 02 [PS] 00 [M] + Span mInEM = destination.Slice(destination.Length - source.Length); + Span ps = destination.Slice(2, destination.Length - source.Length - 3); + destination[0] = 0; + destination[1] = 2; + destination[ps.Length + 2] = 0; + + // 2(a). Fill PS with random data from a CSPRNG, but no zero-values. + FillNonZeroBytes(ps); + + source.CopyTo(mInEM); + } + + internal void PadOaep( + ReadOnlySpan source, + Span destination) + { + // https://tools.ietf.org/html/rfc3447#section-7.1.1 + + byte[] dbMask = null; + Span dbMaskSpan = Span.Empty; + + try + { + // Since the biggest known _hLen is 512/8 (64) and destination.Length is 0 or more, + // this shouldn't underflow without something having severely gone wrong. + int maxInput = checked(destination.Length - _hLen - _hLen - 2); + + // 1(a) does not apply, we do not allow custom label values. + + // 1(b) + if (source.Length > maxInput) + { + throw new CryptographicException( + SR.Format(SR.Cryptography_Encryption_MessageTooLong, maxInput)); + } + + // The final message (step 2(i)) will be + // 0x00 || maskedSeed (hLen long) || maskedDB (rest of the buffer) + Span seed = destination.Slice(1, _hLen); + Span db = destination.Slice(1 + _hLen); + + using (IncrementalHash hasher = IncrementalHash.CreateHash(_hashAlgorithmName)) + { + // DB = lHash || PS || 0x01 || M + Span lHash = db.Slice(0, _hLen); + Span mDest = db.Slice(db.Length - source.Length); + Span ps = db.Slice(_hLen, db.Length - _hLen - 1 - mDest.Length); + Span psEnd = db.Slice(_hLen + ps.Length, 1); + + // 2(a) lHash = Hash(L), where L is the empty string. + if (!hasher.TryGetHashAndReset(lHash, out int hLen2) || hLen2 != _hLen) + { + Debug.Fail("TryGetHashAndReset failed with exact-size destination"); + throw new CryptographicException(); + } + + // 2(b) generate a padding string of all zeros equal to the amount of unused space. + ps.Clear(); + + // 2(c) + psEnd[0] = 0x01; + + // still 2(c) + source.CopyTo(mDest); + + // 2(d) + RandomNumberGenerator.Fill(seed); + + // 2(e) + dbMask = ArrayPool.Shared.Rent(db.Length); + dbMaskSpan = new Span(dbMask, 0, db.Length); + Mgf1(hasher, seed, dbMaskSpan); + + // 2(f) + Xor(db, dbMaskSpan); + + // 2(g) + Span seedMask = stackalloc byte[_hLen]; + Mgf1(hasher, db, seedMask); + + // 2(h) + Xor(seed, seedMask); + + // 2(i) + destination[0] = 0; + } + } + catch (Exception e) when (!(e is CryptographicException)) + { + Debug.Fail("Bad exception produced from OAEP padding: " + e); + throw new CryptographicException(); + } + finally + { + if (dbMask != null) + { + dbMaskSpan.Clear(); + ArrayPool.Shared.Return(dbMask); + } + } + } + + internal bool DepadOaep( + ReadOnlySpan source, + Span destination, + out int bytesWritten) + { + // https://tools.ietf.org/html/rfc3447#section-7.1.2 + using (IncrementalHash hasher = IncrementalHash.CreateHash(_hashAlgorithmName)) + { + Span lHash = stackalloc byte[_hLen]; + + if (!hasher.TryGetHashAndReset(lHash, out int hLen2) || hLen2 != _hLen) + { + Debug.Fail("TryGetHashAndReset failed with exact-size destination"); + throw new CryptographicException(); + } + + int y = source[0]; + ReadOnlySpan maskedSeed = source.Slice(1, _hLen); + ReadOnlySpan maskedDB = source.Slice(1 + _hLen); + + Span seed = stackalloc byte[_hLen]; + // seedMask = MGF(maskedDB, hLen) + Mgf1(hasher, maskedDB, seed); + + // seed = seedMask XOR maskedSeed + Xor(seed, maskedSeed); + + byte[] tmp = ArrayPool.Shared.Rent(source.Length); + + try + { + Span dbMask = new Span(tmp, 0, maskedDB.Length); + // dbMask = MGF(seed, k - hLen - 1) + Mgf1(hasher, seed, dbMask); + + // DB = dbMask XOR maskedDB + Xor(dbMask, maskedDB); + + ReadOnlySpan lHashPrime = dbMask.Slice(0, _hLen); + + int separatorPos = int.MaxValue; + + for (int i = dbMask.Length - 1; i >= _hLen; i--) + { + // if dbMask[i] is 1, val is 0. otherwise val is [01,FF] + byte dbMinus1 = (byte)(dbMask[i] - 1); + int val = dbMinus1; + + // if val is 0: FFFFFFFF & FFFFFFFF => FFFFFFFF + // if val is any other byte value, val-1 will be in the range 00000000 to 000000FE, + // and so the high bit will not be set. + val = (~val & (val - 1)) >> 31; + + // if val is 0: separator = (0 & i) | (~0 & separator) => separator + // else: separator = (~0 & i) | (0 & separator) => i + // + // Net result: non-branching "if (dbMask[i] == 1) separatorPos = i;" + separatorPos = (val & i) | (~val & separatorPos); + } + + bool lHashMatches = CryptographicOperations.FixedTimeEquals(lHash, lHashPrime); + bool yIsZero = y == 0; + bool separatorMadeSense = separatorPos < dbMask.Length; + + // This intentionally uses non-short-circuiting operations to hide the timing + // differential between the three failure cases + bool shouldContinue = lHashMatches & yIsZero & separatorMadeSense; + + if (!shouldContinue) + { + throw new CryptographicException(SR.Cryptography_OAEP_Decryption_Failed); + } + + Span message = dbMask.Slice(separatorPos + 1); + + if (message.Length <= destination.Length) + { + message.CopyTo(destination); + bytesWritten = message.Length; + return true; + } + else + { + bytesWritten = 0; + return false; + } + } + finally + { + Array.Clear(tmp, 0, source.Length); + ArrayPool.Shared.Return(tmp); + } + } + } + + internal void EncodePss(ReadOnlySpan mHash, Span destination, int keySize) + { + // https://tools.ietf.org/html/rfc3447#section-9.1.1 + int emBits = keySize - 1; + int emLen = BytesRequiredForBitCount(emBits); + + if (mHash.Length != _hLen) + { + throw new CryptographicException(SR.Cryptography_SignHash_WrongSize); + } + + // In this implementation, sLen is restricted to the length of the input hash. + int sLen = _hLen; + + // 3. if emLen < hLen + sLen + 2, encoding error. + // + // sLen = hLen in this implementation. + + if (emLen < 2 + _hLen + sLen) + { + throw new CryptographicException(SR.Cryptography_KeyTooSmall); + } + + // Set any leading bytes to zero, since that will be required for the pending + // RSA operation. + destination.Slice(0, destination.Length - emLen).Clear(); + + // 12. Let EM = maskedDB || H || 0xbc (H has length hLen) + Span em = destination.Slice(destination.Length - emLen, emLen); + + int dbLen = emLen - _hLen - 1; + + Span db = em.Slice(0, dbLen); + Span hDest = em.Slice(dbLen, _hLen); + em[emLen - 1] = 0xBC; + + byte[] dbMaskRented = ArrayPool.Shared.Rent(dbLen); + Span dbMask = new Span(dbMaskRented, 0, dbLen); + + using (IncrementalHash hasher = IncrementalHash.CreateHash(_hashAlgorithmName)) + { + // 4. Generate a random salt of length sLen + Span salt = stackalloc byte[sLen]; + RandomNumberGenerator.Fill(salt); + + // 5. Let M' = an octet string of 8 zeros concat mHash concat salt + // 6. Let H = Hash(M') + + hasher.AppendData(s_eightZeros); + hasher.AppendData(mHash); + hasher.AppendData(salt); + + if (!hasher.TryGetHashAndReset(hDest, out int hLen2) || hLen2 != _hLen) + { + Debug.Fail("TryGetHashAndReset failed with exact-size destination"); + throw new CryptographicException(); + } + + // 7. Generate PS as zero-valued bytes of length emLen - sLen - hLen - 2. + // 8. Let DB = PS || 0x01 || salt + int psLen = emLen - sLen - _hLen - 2; + db.Slice(0, psLen).Clear(); + db[psLen] = 0x01; + salt.CopyTo(db.Slice(psLen + 1)); + + // 9. Let dbMask = MGF(H, emLen - hLen - 1) + Mgf1(hasher, hDest, dbMask); + + // 10. Let maskedDB = DB XOR dbMask + Xor(db, dbMask); + + // 11. Set the "unused" bits in the leftmost byte of maskedDB to 0. + int unusedBits = 8 * emLen - emBits; + + if (unusedBits != 0) + { + byte mask = (byte)(0xFF >> unusedBits); + db[0] &= mask; + } + } + + dbMask.Clear(); + ArrayPool.Shared.Return(dbMaskRented); + } + + internal bool VerifyPss(ReadOnlySpan mHash, ReadOnlySpan em, int keySize) + { + // https://tools.ietf.org/html/rfc3447#section-9.1.2 + + int emBits = keySize - 1; + int emLen = BytesRequiredForBitCount(emBits); + + if (mHash.Length != _hLen) + { + return false; + } + + Debug.Assert(em.Length >= emLen); + + // In this implementation, sLen is restricted to hLen. + int sLen = _hLen; + + // 3. If emLen < hLen + sLen + 2, output "inconsistent" and stop. + if (emLen < _hLen + sLen + 2) + { + return false; + } + + // 4. If the last byte is not 0xBC, output "inconsistent" and stop. + if (em[em.Length - 1] != 0xBC) + { + return false; + } + + // 5. maskedDB is the leftmost emLen - hLen -1 bytes, H is the next hLen bytes. + int dbLen = emLen - _hLen - 1; + + ReadOnlySpan maskedDb = em.Slice(0, dbLen); + ReadOnlySpan h = em.Slice(dbLen, _hLen); + + // 6. If the unused bits aren't zero, output "inconsistent" and stop. + int unusedBits = 8 * emLen - emBits; + byte usedBitsMask = (byte)(0xFF >> unusedBits); + + if ((maskedDb[0] & usedBitsMask) != maskedDb[0]) + { + return false; + } + + // 7. dbMask = MGF(H, emLen - hLen - 1) + byte[] dbMaskRented = ArrayPool.Shared.Rent(maskedDb.Length); + Span dbMask = new Span(dbMaskRented, 0, maskedDb.Length); + + try + { + using (IncrementalHash hasher = IncrementalHash.CreateHash(_hashAlgorithmName)) + { + Mgf1(hasher, h, dbMask); + + // 8. DB = maskedDB XOR dbMask + Xor(dbMask, maskedDb); + + // 9. Set the unused bits of DB to 0 + dbMask[0] &= usedBitsMask; + + // 10 ("a"): If the emLen - hLen - sLen - 2 leftmost bytes are not 0, + // output "inconsistent" and stop. + // + // Since signature verification is a public key operation there's no need to + // use fixed time equality checking here. + for (int i = emLen - _hLen - sLen - 2 - 1; i >= 0; --i) + { + if (dbMask[i] != 0) + { + return false; + } + } + + // 10 ("b") If the octet at position emLen - hLen - sLen - 1 (under a 1-indexed scheme) + // is not 0x01, output "inconsistent" and stop. + if (dbMask[emLen - _hLen - sLen - 2] != 0x01) + { + return false; + } + + // 11. Let salt be the last sLen octets of DB. + ReadOnlySpan salt = dbMask.Slice(dbMask.Length - sLen); + + // 12/13. Let H' = Hash(eight zeros || mHash || salt) + hasher.AppendData(s_eightZeros); + hasher.AppendData(mHash); + hasher.AppendData(salt); + + Span hPrime = stackalloc byte[_hLen]; + + if (!hasher.TryGetHashAndReset(hPrime, out int hLen2) || hLen2 != _hLen) + { + Debug.Fail("TryGetHashAndReset failed with exact-size destination"); + throw new CryptographicException(); + } + + // 14. If H = H' output "consistent". Otherwise, output "inconsistent" + // + // Since this is a public key operation, no need to provide fixed time + // checking. + return h.SequenceEqual(hPrime); + } + } + finally + { + dbMask.Clear(); + ArrayPool.Shared.Return(dbMaskRented); + } + } + + // https://tools.ietf.org/html/rfc3447#appendix-B.2.1 + private void Mgf1(IncrementalHash hasher, ReadOnlySpan mgfSeed, Span mask) + { + Span writePtr = mask; + int count = 0; + Span bigEndianCount = stackalloc byte[sizeof(int)]; + + while (writePtr.Length > 0) + { + hasher.AppendData(mgfSeed); + BinaryPrimitives.WriteInt32BigEndian(bigEndianCount, count); + hasher.AppendData(bigEndianCount); + + if (writePtr.Length >= _hLen) + { + if (!hasher.TryGetHashAndReset(writePtr, out int bytesWritten)) + { + Debug.Fail($"TryGetHashAndReset failed with sufficient space"); + throw new CryptographicException(); + } + + Debug.Assert(bytesWritten == _hLen); + writePtr = writePtr.Slice(bytesWritten); + } + else + { + Span tmp = stackalloc byte[_hLen]; + + if (!hasher.TryGetHashAndReset(tmp, out int bytesWritten)) + { + Debug.Fail($"TryGetHashAndReset failed with sufficient space"); + throw new CryptographicException(); + } + + Debug.Assert(bytesWritten == _hLen); + tmp.Slice(0, writePtr.Length).CopyTo(writePtr); + break; + } + + count++; + } + } + + // This is a copy of RandomNumberGeneratorImplementation.GetNonZeroBytes, but adapted + // to the object-less RandomNumberGenerator.Fill. + private static void FillNonZeroBytes(Span data) + { + while (data.Length > 0) + { + // Fill the remaining portion of the span with random bytes. + RandomNumberGenerator.Fill(data); + + // Find the first zero in the remaining portion. + int indexOfFirst0Byte = data.Length; + for (int i = 0; i < data.Length; i++) + { + if (data[i] == 0) + { + indexOfFirst0Byte = i; + break; + } + } + + // If there were any zeros, shift down all non-zeros. + for (int i = indexOfFirst0Byte + 1; i < data.Length; i++) + { + if (data[i] != 0) + { + data[indexOfFirst0Byte++] = data[i]; + } + } + + // Request new random bytes if necessary; dont re-use + // existing bytes since they were shifted down. + data = data.Slice(indexOfFirst0Byte); + } + } + + /// + /// Bitwise XOR of into . + /// + private static void Xor(Span a, ReadOnlySpan b) + { + if (a.Length != b.Length) + { + throw new InvalidOperationException(); + } + + for (int i = 0; i < b.Length; i++) + { + a[i] ^= b[i]; + } + } + } +} diff --git a/external/corefx/src/Common/src/System/Text/OSEncoder.cs b/external/corefx/src/Common/src/System/Text/OSEncoder.cs index 2f02a00c65..ceabb908eb 100644 --- a/external/corefx/src/Common/src/System/Text/OSEncoder.cs +++ b/external/corefx/src/Common/src/System/Text/OSEncoder.cs @@ -241,13 +241,5 @@ namespace System.Text charsUsed = 0; completed = false; } - - public Encoding Encoding - { - get - { - return _encoding; - } - } } } diff --git a/external/corefx/src/Common/src/System/Text/ValueStringBuilder.cs b/external/corefx/src/Common/src/System/Text/ValueStringBuilder.cs deleted file mode 100644 index 84e5fa8de9..0000000000 --- a/external/corefx/src/Common/src/System/Text/ValueStringBuilder.cs +++ /dev/null @@ -1,200 +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; -using System.Diagnostics; -using System.Runtime.CompilerServices; - -namespace System.Text -{ - internal ref struct ValueStringBuilder - { - private char[] _arrayToReturnToPool; - private Span _chars; - private int _pos; - - public ValueStringBuilder(Span initialBuffer) - { - _arrayToReturnToPool = null; - _chars = initialBuffer; - _pos = 0; - } - - public int Length - { - get => _pos; - set - { - int delta = value - _pos; - if (delta > 0) - { - Append('\0', delta); - } - else - { - _pos = value; - } - } - } - - public override string ToString() - { - var s = new string(_chars.Slice(0, _pos)); - Clear(); - return s; - } - - public bool TryCopyTo(Span destination, out int charsWritten) - { - if (_chars.Slice(0, _pos).TryCopyTo(destination)) - { - charsWritten = _pos; - Clear(); - return true; - } - else - { - charsWritten = 0; - Clear(); - return false; - } - } - - public void Insert(int index, char value, int count) - { - if (_pos > _chars.Length - count) - { - Grow(count); - } - - int remaining = _pos - index; - _chars.Slice(index, remaining).CopyTo(_chars.Slice(index + count)); - _chars.Slice(index, count).Fill(value); - _pos += count; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void Append(char c) - { - int pos = _pos; - if (pos < _chars.Length) - { - _chars[pos] = c; - _pos = pos + 1; - } - else - { - GrowAndAppend(c); - } - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void Append(string s) - { - int pos = _pos; - if (s.Length == 1 && pos < _chars.Length) // very common case, e.g. appending strings from NumberFormatInfo like separators, percent symbols, etc. - { - _chars[pos] = s[0]; - _pos = pos + 1; - } - else - { - AppendSlow(s); - } - } - - private void AppendSlow(string s) - { - int pos = _pos; - if (pos > _chars.Length - s.Length) - { - Grow(s.Length); - } - - bool copied = s.AsReadOnlySpan().TryCopyTo(_chars.Slice(pos)); - Debug.Assert(copied, "Grow should have made enough room to successfully copy"); - _pos += s.Length; - } - - public void Append(char c, int count) - { - if (_pos > _chars.Length - count) - { - Grow(count); - } - - Span dst = _chars.Slice(_pos, count); - for (int i = 0; i < dst.Length; i++) - { - dst[i] = c; - } - _pos += count; - } - - public unsafe void Append(char* value, int length) - { - int pos = _pos; - if (pos > _chars.Length - length) - { - Grow(length); - } - - Span dst = _chars.Slice(_pos, length); - for (int i = 0; i < dst.Length; i++) - { - dst[i] = *value++; - } - _pos += length; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public Span AppendSpan(int length) - { - int origPos = _pos; - if (origPos > _chars.Length - length) - { - Grow(length); - } - - _pos = origPos + length; - return _chars.Slice(origPos, length); - } - - [MethodImpl(MethodImplOptions.NoInlining)] - private void GrowAndAppend(char c) - { - Grow(1); - Append(c); - } - - [MethodImpl(MethodImplOptions.NoInlining)] - private void Grow(int requiredAdditionalCapacity) - { - Debug.Assert(requiredAdditionalCapacity > _chars.Length - _pos); - - char[] poolArray = ArrayPool.Shared.Rent(Math.Max(_pos + requiredAdditionalCapacity, _chars.Length * 2)); - - bool success = _chars.TryCopyTo(poolArray); - Debug.Assert(success); - - char[] toReturn = _arrayToReturnToPool; - _chars = _arrayToReturnToPool = poolArray; - if (toReturn != null) - { - ArrayPool.Shared.Return(toReturn); - } - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private void Clear() - { - char[] toReturn = _arrayToReturnToPool; - this = default; // for safety, to avoid using pooled array if this instance is erroneously appended to again - if (toReturn != null) - { - ArrayPool.Shared.Return(toReturn); - } - } - } -} diff --git a/external/corefx/src/Common/src/System/Text/ValueUtf8Converter.cs b/external/corefx/src/Common/src/System/Text/ValueUtf8Converter.cs new file mode 100644 index 0000000000..3a2ba294db --- /dev/null +++ b/external/corefx/src/Common/src/System/Text/ValueUtf8Converter.cs @@ -0,0 +1,51 @@ +// 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; + +namespace System.Text +{ + /// + /// Helper to allow utilizing stack buffer for conversion to UTF-8. Will + /// switch to ArrayPool if not given enough memory. As such, make sure to + /// call Clear() to return any potentially rented buffer after conversion. + /// + internal ref struct ValueUtf8Converter + { + private byte[] _arrayToReturnToPool; + private Span _bytes; + + public ValueUtf8Converter(Span initialBuffer) + { + _arrayToReturnToPool = null; + _bytes = initialBuffer; + } + + public Span ConvertAndTerminateString(ReadOnlySpan value) + { + int maxSize = Encoding.UTF8.GetMaxByteCount(value.Length) + 1; + if (_bytes.Length < maxSize) + { + Dispose(); + _arrayToReturnToPool = ArrayPool.Shared.Rent(maxSize); + _bytes = new Span(_arrayToReturnToPool); + } + + // Grab the bytes and null terminate + int byteCount = Encoding.UTF8.GetBytes(value, _bytes); + _bytes[byteCount] = 0; + return _bytes.Slice(0, byteCount + 1); + } + + public void Dispose() + { + byte[] toReturn = _arrayToReturnToPool; + if (toReturn != null) + { + _arrayToReturnToPool = null; + ArrayPool.Shared.Return(toReturn); + } + } + } +} diff --git a/external/corefx/src/Common/tests/Common.Tests.csproj b/external/corefx/src/Common/tests/Common.Tests.csproj index e5c4206d4f..e07e1ca1d3 100644 --- a/external/corefx/src/Common/tests/Common.Tests.csproj +++ b/external/corefx/src/Common/tests/Common.Tests.csproj @@ -38,17 +38,14 @@ Common\System\Collections\Generic\LargeArrayBuilder.cs - - Common\System\IO\PathInternal.cs - Common\System\IO\PathInternal.CaseSensitivity.cs Common\System\IO\RowConfigReader.cs - - Common\System\IO\StringBuilderCache.cs + + Common\System\Text\StringBuilderCache.cs Common\System\IO\StringParser.cs @@ -62,25 +59,28 @@ Common\System\Text\ReusableTextReader.cs - - Common\System\Text\ValueStringBuilder.cs + + Common\CoreLib\System\Text\ValueStringBuilder.cs Common\System\Security\IdentityHelper.cs + + Common\System\PasteArguments.cs + + + - - System\Net\Sockets\Fletcher32.cs @@ -96,10 +96,13 @@ ProductionCode\Common\System\Threading\Tasks\TaskToApm.cs + + Common\CoreLib\System\IO\PathInternal.cs + - - Common\System\IO\PathInternal.Windows.cs + + Common\CoreLib\System\IO\PathInternal.Windows.cs Common\Interop\Windows\Interop.Libraries.cs @@ -114,14 +117,18 @@ Common\Interop\Windows\Interop.Errors.cs - - Common\System\IO\Win32Marshal.cs + + Common\CoreLib\System\IO\Win32Marshal.cs + + Common\System\PasteArguments.Windows.cs + - - Common\System\IO\PathInternal.Unix.cs + + + Common\CoreLib\System\IO\PathInternal.Unix.cs Common\Interop\Unix\Interop.PathConf.cs @@ -129,11 +136,15 @@ Common\Interop\Unix\Interop.Libraries.cs + + Common\System\PasteArguments.Unix.cs + + - + \ No newline at end of file diff --git a/external/corefx/src/Common/tests/Resources/Strings.resx b/external/corefx/src/Common/tests/Resources/Strings.resx index 0cc24f087d..12dadae384 100644 --- a/external/corefx/src/Common/tests/Resources/Strings.resx +++ b/external/corefx/src/Common/tests/Resources/Strings.resx @@ -156,4 +156,7 @@ IO_PathTooLong_Path {0} + + Arg_InvalidSearchPattern {0} + \ No newline at end of file diff --git a/external/corefx/src/Common/tests/Scripts/Tools/net_startlog.cmd b/external/corefx/src/Common/tests/Scripts/Tools/net_startlog.cmd index 1c31aac54a..4a7f8b5822 100644 --- a/external/corefx/src/Common/tests/Scripts/Tools/net_startlog.cmd +++ b/external/corefx/src/Common/tests/Scripts/Tools/net_startlog.cmd @@ -1,2 +1,2 @@ -logman create trace SystemNetTrace -o net.etl -pf net_providers.txt +logman create trace SystemNetTrace -o net.etl -pf net_providers.txt -max 1000 logman start SystemNetTrace diff --git a/external/corefx/src/Common/tests/System/Buffers/NativeOwnedMemory.cs b/external/corefx/src/Common/tests/System/Buffers/NativeMemoryManager.cs similarity index 65% rename from external/corefx/src/Common/tests/System/Buffers/NativeOwnedMemory.cs rename to external/corefx/src/Common/tests/System/Buffers/NativeMemoryManager.cs index f68a70e074..45488aafcf 100644 --- a/external/corefx/src/Common/tests/System/Buffers/NativeOwnedMemory.cs +++ b/external/corefx/src/Common/tests/System/Buffers/NativeMemoryManager.cs @@ -8,26 +8,26 @@ using System.Runtime.InteropServices; namespace System.Buffers { - internal sealed class NativeOwnedMemory : OwnedMemory + internal sealed class NativeMemoryManager : MemoryManager { private readonly int _length; private IntPtr _ptr; private int _retainedCount; private bool _disposed; - public NativeOwnedMemory(int length) + public NativeMemoryManager(int length) { _length = length; _ptr = Marshal.AllocHGlobal(length); } - ~NativeOwnedMemory() + ~NativeMemoryManager() { - Debug.WriteLine($"{nameof(NativeOwnedMemory)} being finalized"); + Debug.WriteLine($"{nameof(NativeMemoryManager)} being finalized"); Dispose(false); } - public override bool IsDisposed + public bool IsDisposed { get { @@ -38,9 +38,9 @@ namespace System.Buffers } } - public override int Length => _length; + public override Memory Memory => CreateMemory(_length); - protected override bool IsRetained + public bool IsRetained { get { @@ -51,16 +51,26 @@ namespace System.Buffers } } - public override unsafe Span Span => new Span((void*)_ptr, _length); + public override unsafe Span GetSpan() => new Span((void*)_ptr, _length); - public override unsafe MemoryHandle Pin(int offset = 0) + public override unsafe MemoryHandle Pin(int elementIndex = 0) { - if (offset < 0 || offset > _length) throw new ArgumentOutOfRangeException(nameof(offset)); - void* pointer = (void*)((byte*)_ptr + offset); - return new MemoryHandle(this, pointer); + if (elementIndex < 0 || elementIndex > _length) throw new ArgumentOutOfRangeException(nameof(elementIndex)); + + lock (this) + { + if (_retainedCount == 0 && _disposed) + { + throw new Exception(); + } + _retainedCount++; + } + + void* pointer = (void*)((byte*)_ptr + elementIndex); // T = byte + return new MemoryHandle(pointer, default, this); } - public override bool Release() + public override void Unpin() { lock (this) { @@ -74,23 +84,9 @@ namespace System.Buffers Marshal.FreeHGlobal(_ptr); _ptr = IntPtr.Zero; } - return true; } } } - return false; - } - - public override void Retain() - { - lock (this) - { - if (_retainedCount == 0 && _disposed) - { - throw new Exception(); - } - _retainedCount++; - } } protected override void Dispose(bool disposing) @@ -105,11 +101,5 @@ namespace System.Buffers } } } - - protected override bool TryGetArray(out ArraySegment arraySegment) - { - arraySegment = default(ArraySegment); - return false; - } } } diff --git a/external/corefx/src/Common/tests/System/Collections/TestBase.Generic.cs b/external/corefx/src/Common/tests/System/Collections/TestBase.Generic.cs index 8d15dd06d1..de77894bdd 100644 --- a/external/corefx/src/Common/tests/System/Collections/TestBase.Generic.cs +++ b/external/corefx/src/Common/tests/System/Collections/TestBase.Generic.cs @@ -101,6 +101,8 @@ namespace System.Collections.Tests return CreateSortedSet(enumerableToMatchTo, count, numberOfMatchingElements); case EnumerableType.Queue: return CreateQueue(enumerableToMatchTo, count, numberOfMatchingElements, numberOfDuplicateElements); + case EnumerableType.Lazy: + return CreateLazyEnumerable(enumerableToMatchTo, count, numberOfMatchingElements, numberOfDuplicateElements); default: Debug.Assert(false, "Check that the 'EnumerableType' Enum returns only types that are special-cased in the CreateEnumerable function within the Iset_Generic_Tests class"); return null; @@ -289,6 +291,12 @@ namespace System.Collections.Tests return set; } + protected IEnumerable CreateLazyEnumerable(IEnumerable enumerableToMatchTo, int count, int numberOfMatchingElements, int numberOfDuplicateElements) + { + IEnumerable list = CreateList(enumerableToMatchTo, count, numberOfMatchingElements, numberOfDuplicateElements); + return list.Select(item => item); + } + #endregion } } diff --git a/external/corefx/src/Common/tests/System/Collections/TestBase.NonGeneric.cs b/external/corefx/src/Common/tests/System/Collections/TestBase.NonGeneric.cs index 3184d85c19..9bd31862fa 100644 --- a/external/corefx/src/Common/tests/System/Collections/TestBase.NonGeneric.cs +++ b/external/corefx/src/Common/tests/System/Collections/TestBase.NonGeneric.cs @@ -25,7 +25,8 @@ namespace System.Collections.Tests HashSet, SortedSet, List, - Queue + Queue, + Lazy, }; #endregion diff --git a/external/corefx/src/Common/tests/System/IO/Compression/CompressionStreamPerfTestBase.cs b/external/corefx/src/Common/tests/System/IO/Compression/CompressionStreamPerfTestBase.cs index 43af3eb4df..aaba317858 100644 --- a/external/corefx/src/Common/tests/System/IO/Compression/CompressionStreamPerfTestBase.cs +++ b/external/corefx/src/Common/tests/System/IO/Compression/CompressionStreamPerfTestBase.cs @@ -10,52 +10,34 @@ namespace System.IO.Compression { public abstract class CompressionStreamPerfTestBase : CompressionStreamTestBase { - public static IEnumerable CanterburyCorpus_WithCompressionLevel() + public static IEnumerable UncompressedTestFiles_WithCompressionLevel() { foreach (CompressionLevel compressionLevel in Enum.GetValues(typeof(CompressionLevel))) { - foreach (object[] canterburyWithoutLevel in CanterburyCorpus()) + foreach (object[] testFile in UncompressedTestFiles()) { - yield return new object[] { canterburyWithoutLevel[0], canterburyWithoutLevel[1], compressionLevel }; + yield return new object[] { testFile[0], compressionLevel }; } } } - public static IEnumerable CanterburyCorpus() - { - foreach (int innerIterations in new int[] { 1, 10 }) - { - foreach (var fileName in UncompressedTestFiles()) - { - yield return new object[] { innerIterations, fileName[0] }; - } - } - } - - /// /// Benchmark tests to measure the performance of individually compressing each file in the /// Canterbury Corpus /// - [Benchmark] - [MemberData(nameof(CanterburyCorpus_WithCompressionLevel))] - public void Compress_Canterbury(int innerIterations, string uncompressedFileName, CompressionLevel compressLevel) + [Benchmark(InnerIterationCount=10)] // limits the max iterations to 100 + [MemberData(nameof(UncompressedTestFiles_WithCompressionLevel))] + public void Compress_Canterbury(string uncompressedFileName, CompressionLevel compressLevel) { byte[] bytes = File.ReadAllBytes(uncompressedFileName); - MemoryStream[] compressedDataStreams = new MemoryStream[innerIterations]; foreach (var iteration in Benchmark.Iterations) { // resizing a memory stream during compression will throw off our results, so pre-size it to the // size of our input - for (int i = 0; i < innerIterations; i++) - compressedDataStreams[i] = new MemoryStream(bytes.Length); + using (MemoryStream compressedDataStream = new MemoryStream(bytes.Length)) using (iteration.StartMeasurement()) - for (int i = 0; i < innerIterations; i++) - using (Stream compressor = CreateStream(compressedDataStreams[i], compressLevel)) - compressor.Write(bytes, 0, bytes.Length); - - for (int i = 0; i < innerIterations; i++) - compressedDataStreams[i].Dispose(); + using (Stream compressor = CreateStream(compressedDataStream, compressLevel)) + compressor.Write(bytes, 0, bytes.Length); } } @@ -63,10 +45,11 @@ namespace System.IO.Compression /// Benchmark tests to measure the performance of individually compressing each file in the /// Canterbury Corpus /// - [Benchmark] - [MemberData(nameof(CanterburyCorpus))] - public void Decompress_Canterbury(int innerIterations, string uncompressedFilePath) + [Benchmark(InnerIterationCount=100)] + [MemberData(nameof(UncompressedTestFiles))] + public void Decompress_Canterbury(string uncompressedFilePath) { + int innerIterations = (int)Benchmark.InnerIterationCount; string compressedFilePath = CompressedTestFile(uncompressedFilePath); byte[] outputRead = new byte[new FileInfo(uncompressedFilePath).Length]; MemoryStream[] memories = new MemoryStream[innerIterations]; diff --git a/external/corefx/src/Common/tests/System/IO/Compression/CompressionStreamUnitTestBase.cs b/external/corefx/src/Common/tests/System/IO/Compression/CompressionStreamUnitTestBase.cs index e6585de33a..1a82bdf9e4 100644 --- a/external/corefx/src/Common/tests/System/IO/Compression/CompressionStreamUnitTestBase.cs +++ b/external/corefx/src/Common/tests/System/IO/Compression/CompressionStreamUnitTestBase.cs @@ -177,48 +177,6 @@ namespace System.IO.Compression } } - [Fact] - public virtual void Dispose_WithUnfinishedWriteAsync() - { - byte[] buffer = new byte[100000]; - Random rand = new Random(); - rand.NextBytes(buffer); - - using (var writeStream = new ManualSyncMemoryStream(false)) - { - var compressor = CreateStream(writeStream, CompressionMode.Compress, leaveOpen: true); - compressor.Write(buffer, 0, buffer.Length); - int writesBeingFlushed = 2; - Task task = null; - try - { - // Write needs to be big enough to trigger a write to the underlying base stream so the WriteAsync call doesn't immediately complete. - task = compressor.WriteAsync(buffer, 0, buffer.Length); - while (task.IsCompleted) - { - rand.NextBytes(buffer); - task = compressor.WriteAsync(buffer, 0, buffer.Length); - writesBeingFlushed++; - } - - // WriteAsync will be blocked on writing the output to the underlying stream. Calling Dispose will trigger a Finish call with unwritten output - // still available. - Assert.InRange(writeStream.Length, 0, buffer.Length); - compressor.Dispose(); - Assert.InRange(writeStream.Length, 0, buffer.Length * writesBeingFlushed); - Assert.False(task.IsCompleted); - } - finally - { - // Unblock Async operations - writeStream.manualResetEvent.Set(); - // WriteAsync call will return to the compression stream's WriteAsync which will attempt to - // access members of the now disposed stream. - Assert.Throws(() => task.Wait(1000)); - } - } - } - [Fact] public virtual async Task Dispose_WithUnfinishedReadAsync() { @@ -1360,7 +1318,7 @@ namespace System.IO.Compression } #if STREAM_MEMORY_OVERLOADS_AVAILABLE - public override async ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken) + public override async ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken) { ReadHit = true; @@ -1372,10 +1330,10 @@ namespace System.IO.Compression { await Task.Run(() => manualResetEvent.Wait(cancellationToken)).ConfigureAwait(false); } - return await base.ReadAsync(destination, cancellationToken); + return await base.ReadAsync(buffer, cancellationToken); } - public override async Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken) + public override async ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken) { WriteHit = true; @@ -1388,7 +1346,7 @@ namespace System.IO.Compression await Task.Run(() => manualResetEvent.Wait(cancellationToken)).ConfigureAwait(false); } - await base.WriteAsync(source, cancellationToken); + await base.WriteAsync(buffer, cancellationToken); } #endif } diff --git a/external/corefx/src/Common/tests/System/Net/Configuration.Certificates.cs b/external/corefx/src/Common/tests/System/Net/Configuration.Certificates.cs index b8793be938..3407926342 100644 --- a/external/corefx/src/Common/tests/System/Net/Configuration.Certificates.cs +++ b/external/corefx/src/Common/tests/System/Net/Configuration.Certificates.cs @@ -19,7 +19,7 @@ namespace System.Net.Test.Common private const string CertificatePassword = "testcertificate"; private const string TestDataFolder = "TestData"; - private static Mutex m; + private static readonly Mutex m; private const int MutexTimeout = 120 * 1000; static Certificates() @@ -57,12 +57,11 @@ namespace System.Net.Test.Common private static X509Certificate2Collection GetCertificateCollection(string certificateFileName) { - // On Windows, .Net Core applications should not import PFX files in parallel to avoid a known system-level race condition. + // On Windows, .NET Core applications should not import PFX files in parallel to avoid a known system-level race condition. // This bug results in corrupting the X509Certificate2 certificate state. + Assert.True(m.WaitOne(MutexTimeout), "Cannot acquire the global certificate mutex."); try { - Assert.True(m.WaitOne(MutexTimeout), "Cannot acquire the global certificate mutex."); - var certCollection = new X509Certificate2Collection(); certCollection.Import(Path.Combine(TestDataFolder, certificateFileName), CertificatePassword, X509KeyStorageFlags.DefaultKeySet); diff --git a/external/corefx/src/Common/tests/System/Net/Configuration.Http.cs b/external/corefx/src/Common/tests/System/Net/Configuration.Http.cs index 94c2c31f23..81961a637e 100644 --- a/external/corefx/src/Common/tests/System/Net/Configuration.Http.cs +++ b/external/corefx/src/Common/tests/System/Net/Configuration.Http.cs @@ -8,14 +8,14 @@ namespace System.Net.Test.Common { public static partial class Http { - private static readonly string DefaultAzureServer = "corefx-net.cloudapp.net"; + private static readonly string DefaultAzureServer = "corefx-net.cloudapp.net"; public static string Host => GetValue("COREFX_HTTPHOST", DefaultAzureServer); public static string SecureHost => GetValue("COREFX_SECUREHTTPHOST", DefaultAzureServer); public static string Http2Host => GetValue("COREFX_HTTP2HOST", "http2.akamai.com"); - + // This server doesn't use HTTP/2 server push (push promise) feature. Some HttpClient implementations // don't support servers that use push right now. public static string Http2NoPushHost => GetValue("COREFX_HTTP2NOPUSHHOST", "www.microsoft.com"); @@ -26,8 +26,6 @@ namespace System.Net.Test.Common public static string DomainJoinedProxyPort => GetValue("COREFX_DOMAINJOINED_PROXYPORT"); - public static bool StressEnabled => GetValue("COREFX_STRESS_HTTP", "0") == "1"; - public static string SSLv2RemoteServer => GetValue("COREFX_HTTPHOST_SSL2", "https://www.ssllabs.com:10200/"); public static string SSLv3RemoteServer => GetValue("COREFX_HTTPHOST_SSL3", "https://www.ssllabs.com:10300/"); public static string TLSv10RemoteServer => GetValue("COREFX_HTTPHOST_TLS10", "https://www.ssllabs.com:10301/"); @@ -139,7 +137,7 @@ namespace System.Net.Test.Common statusCode, destination); } - + return new Uri(uriString); } @@ -147,14 +145,14 @@ namespace System.Net.Test.Common { Uri destinationUri = BasicAuthUriForCreds(secure, userName, password); string destination = Uri.EscapeDataString(destinationUri.AbsoluteUri); - + return new Uri(string.Format("{0}://{1}/{2}?statuscode={3}&uri={4}", secure ? HttpsScheme : HttpScheme, Host, RedirectHandler, statusCode, destination)); - } + } } } } diff --git a/external/corefx/src/Common/tests/System/Net/Configuration.WebSockets.cs b/external/corefx/src/Common/tests/System/Net/Configuration.WebSockets.cs index a6752c9417..f549a9d56f 100644 --- a/external/corefx/src/Common/tests/System/Net/Configuration.WebSockets.cs +++ b/external/corefx/src/Common/tests/System/Net/Configuration.WebSockets.cs @@ -8,6 +8,8 @@ namespace System.Net.Test.Common { public static partial class WebSockets { + public static string ProxyServerUri => GetValue("COREFX_WEBSOCKETPROXYSERVERURI"); + public static string Host => GetValue("COREFX_WEBSOCKETHOST", DefaultAzureServer); public static string SecureHost => GetValue("COREFX_SECUREWEBSOCKETHOST", DefaultAzureServer); diff --git a/external/corefx/src/Common/tests/System/Net/Http/LoopbackServer.AuthenticationHelpers.cs b/external/corefx/src/Common/tests/System/Net/Http/LoopbackServer.AuthenticationHelpers.cs new file mode 100644 index 0000000000..6f19c6d769 --- /dev/null +++ b/external/corefx/src/Common/tests/System/Net/Http/LoopbackServer.AuthenticationHelpers.cs @@ -0,0 +1,305 @@ +// 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.Collections.Generic; +using System.Diagnostics; +using System.Security.Cryptography; +using System.Text; +using System.Threading.Tasks; + +namespace System.Net.Test.Common +{ + public sealed partial class LoopbackServer + { + internal enum AuthenticationProtocols + { + Basic, + Digest, + None + } + + public async Task> AcceptConnectionPerformAuthenticationAndCloseAsync(string authenticateHeaders) + { + List lines = null; + await AcceptConnectionAsync(async connection => + { + string headerName = _options.IsProxy ? "Proxy-Authorization" : "Authorization"; + lines = await connection.ReadRequestHeaderAsync(); + if (GetRequestHeaderValue(lines, headerName) == null) + { + await connection.SendResponseAsync( _options.IsProxy ? + HttpStatusCode.ProxyAuthenticationRequired : HttpStatusCode.Unauthorized, authenticateHeaders); + + lines = await connection.ReadRequestHeaderAsync(); + } + Debug.Assert(lines.Count > 0); + + int index = lines[0] != null ? lines[0].IndexOf(' ') : -1; + string requestMethod = null; + if (index != -1) + { + requestMethod = lines[0].Substring(0, index); + } + + // Read the authorization header from client. + AuthenticationProtocols protocol = AuthenticationProtocols.None; + string clientResponse = null; + for (int i = 1; i < lines.Count; i++) + { + if (lines[i].StartsWith(headerName)) + { + clientResponse = lines[i]; + if (lines[i].Contains(nameof(AuthenticationProtocols.Basic))) + { + protocol = AuthenticationProtocols.Basic; + break; + } + else if (lines[i].Contains(nameof(AuthenticationProtocols.Digest))) + { + protocol = AuthenticationProtocols.Digest; + break; + } + } + } + + bool success = false; + switch (protocol) + { + case AuthenticationProtocols.Basic: + success = IsBasicAuthTokenValid(clientResponse, _options); + break; + + case AuthenticationProtocols.Digest: + // Read the request content. + success = IsDigestAuthTokenValid(clientResponse, requestMethod, _options); + break; + } + + if (success) + { + await connection.SendResponseAsync(); + } + else + { + await connection.SendResponseAsync(HttpStatusCode.Unauthorized, authenticateHeaders); + } + }); + + return lines; + } + + internal static bool IsBasicAuthTokenValid(string clientResponse, LoopbackServer.Options options) + { + string clientHash = clientResponse.Substring(clientResponse.IndexOf(nameof(AuthenticationProtocols.Basic), StringComparison.OrdinalIgnoreCase) + + nameof(AuthenticationProtocols.Basic).Length).Trim(); + string userPass = string.IsNullOrEmpty(options.Domain) ? options.Username + ":" + options.Password : options.Domain + "\\" + options.Username + ":" + options.Password; + return clientHash == Convert.ToBase64String(Encoding.UTF8.GetBytes(userPass)); + } + + internal static bool IsDigestAuthTokenValid(string clientResponse, string requestMethod, LoopbackServer.Options options) + { + string clientHash = clientResponse.Substring(clientResponse.IndexOf(nameof(AuthenticationProtocols.Digest), StringComparison.OrdinalIgnoreCase) + + nameof(AuthenticationProtocols.Digest).Length).Trim(); + string[] values = clientHash.Split(','); + + string username = null, uri = null, realm = null, nonce = null, response = null, algorithm = null, cnonce = null, opaque = null, qop = null, nc = null; + bool userhash = false; + for (int i = 0; i < values.Length; i++) + { + string trimmedValue = values[i].Trim(); + if (trimmedValue.Contains(nameof(username))) + { + // Username is a quoted string. + int startIndex = trimmedValue.IndexOf('"'); + + if (startIndex != -1) + { + startIndex += 1; + username = trimmedValue.Substring(startIndex, trimmedValue.Length - startIndex - 1); + } + + // Username is mandatory. + if (string.IsNullOrEmpty(username)) + return false; + } + else if (trimmedValue.Contains(nameof(userhash)) && trimmedValue.Contains("true")) + { + userhash = true; + } + else if (trimmedValue.Contains(nameof(uri))) + { + int startIndex = trimmedValue.IndexOf('"'); + if (startIndex != -1) + { + startIndex += 1; + uri = trimmedValue.Substring(startIndex, trimmedValue.Length - startIndex - 1); + } + + // Request uri is mandatory. + if (string.IsNullOrEmpty(uri)) + return false; + } + else if (trimmedValue.Contains(nameof(realm))) + { + // Realm is a quoted string. + int startIndex = trimmedValue.IndexOf('"'); + if (startIndex != -1) + { + startIndex += 1; + realm = trimmedValue.Substring(startIndex, trimmedValue.Length - startIndex - 1); + } + + // Realm is mandatory. + if (string.IsNullOrEmpty(realm)) + return false; + } + else if (trimmedValue.Contains(nameof(cnonce))) + { + // CNonce is a quoted string. + int startIndex = trimmedValue.IndexOf('"'); + if (startIndex != -1) + { + startIndex += 1; + cnonce = trimmedValue.Substring(startIndex, trimmedValue.Length - startIndex - 1); + } + } + else if (trimmedValue.Contains(nameof(nonce))) + { + // Nonce is a quoted string. + int startIndex = trimmedValue.IndexOf('"'); + if (startIndex != -1) + { + startIndex += 1; + nonce = trimmedValue.Substring(startIndex, trimmedValue.Length - startIndex - 1); + } + + // Nonce is mandatory. + if (string.IsNullOrEmpty(nonce)) + return false; + } + else if (trimmedValue.Contains(nameof(response))) + { + // response is a quoted string. + int startIndex = trimmedValue.IndexOf('"'); + if (startIndex != -1) + { + startIndex += 1; + response = trimmedValue.Substring(startIndex, trimmedValue.Length - startIndex - 1); + } + + // Response is mandatory. + if (string.IsNullOrEmpty(response)) + return false; + } + else if (trimmedValue.Contains(nameof(algorithm))) + { + int startIndex = trimmedValue.IndexOf('='); + if (startIndex != -1) + { + startIndex += 1; + algorithm = trimmedValue.Substring(startIndex, trimmedValue.Length - startIndex).Trim(); + } + } + else if (trimmedValue.Contains(nameof(opaque))) + { + // Opaque is a quoted string. + int startIndex = trimmedValue.IndexOf('"'); + if (startIndex != -1) + { + startIndex += 1; + opaque = trimmedValue.Substring(startIndex, trimmedValue.Length - startIndex - 1); + } + } + else if (trimmedValue.Contains(nameof(qop))) + { + int startIndex = trimmedValue.IndexOf('"'); + if (startIndex != -1) + { + startIndex += 1; + qop = trimmedValue.Substring(startIndex, trimmedValue.Length - startIndex - 1); + } + else if ((startIndex = trimmedValue.IndexOf('=')) != -1) + { + startIndex += 1; + qop = trimmedValue.Substring(startIndex, trimmedValue.Length - startIndex).Trim(); + } + } + else if (trimmedValue.Contains(nameof(nc))) + { + int startIndex = trimmedValue.IndexOf('='); + if (startIndex != -1) + { + startIndex += 1; + nc = trimmedValue.Substring(startIndex, trimmedValue.Length - startIndex).Trim(); + } + } + } + + // Verify username. + if (userhash && ComputeHash(options.Username + ":" + realm, algorithm) != username) + { + return false; + } + + if (!userhash && options.Username != username) + { + return false; + } + + if (string.IsNullOrEmpty(algorithm)) + algorithm = "sha-256"; + + // Calculate response and compare with the client response hash. + string a1 = options.Username + ":" + realm + ":" + options.Password; + if (algorithm.Contains("sess")) + { + a1 = ComputeHash(a1, algorithm) + ":" + nonce; + + if (cnonce != null) + a1 += ":" + cnonce; + } + + string a2 = requestMethod + ":" + uri; + if (!string.IsNullOrEmpty(qop) && qop.Equals("auth-int")) + { + // Request content is empty. + a2 = a2 + ":" + ComputeHash(string.Empty, algorithm); + } + + string serverResponseHash = ComputeHash(a1, algorithm) + ":" + nonce + ":"; + + if (nc != null) + serverResponseHash += nc + ":"; + + if (cnonce != null) + serverResponseHash += cnonce + ":"; + + if (qop != null) + serverResponseHash += qop + ":"; + + serverResponseHash += ComputeHash(a2, algorithm); + serverResponseHash = ComputeHash(serverResponseHash, algorithm); + + return response == serverResponseHash; + } + + private static string ComputeHash(string data, string algorithm) + { + // Disable MD5 insecure warning. +#pragma warning disable CA5351 + using (HashAlgorithm hash = algorithm.Contains("SHA-256") ? SHA256.Create() : (HashAlgorithm)MD5.Create()) +#pragma warning restore CA5351 + { + Encoding enc = Encoding.UTF8; + byte[] result = hash.ComputeHash(enc.GetBytes(data)); + + StringBuilder sb = new StringBuilder(result.Length * 2); + foreach (byte b in result) + sb.Append(b.ToString("x2")); + + return sb.ToString(); + } + } + } +} diff --git a/external/corefx/src/Common/tests/System/Net/Http/LoopbackServer.cs b/external/corefx/src/Common/tests/System/Net/Http/LoopbackServer.cs index af905435de..b8f692ef0c 100644 --- a/external/corefx/src/Common/tests/System/Net/Http/LoopbackServer.cs +++ b/external/corefx/src/Common/tests/System/Net/Http/LoopbackServer.cs @@ -3,24 +3,310 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; +using System.Diagnostics; using System.IO; using System.Linq; -using System.Net.Http; -using System.Net.NetworkInformation; using System.Net.Security; using System.Net.Sockets; using System.Security.Authentication; using System.Security.Cryptography; -using System.Security.Cryptography.X509Certificates; using System.Text; -using System.Threading; using System.Threading.Tasks; namespace System.Net.Test.Common { - public class LoopbackServer + public sealed partial class LoopbackServer : IDisposable { - public static Func AllowAllCertificates = (_, __, ___, ____) => true; + private Socket _listenSocket; + private Options _options; + private Uri _uri; + + // Use CreateServerAsync or similar to create + private LoopbackServer(Socket listenSocket, Options options) + { + _listenSocket = listenSocket; + _options = options; + + var localEndPoint = (IPEndPoint)listenSocket.LocalEndPoint; + string host = options.Address.AddressFamily == AddressFamily.InterNetworkV6 ? + $"[{localEndPoint.Address}]" : + localEndPoint.Address.ToString(); + + string scheme = options.UseSsl ? "https" : "http"; + if (options.WebSocketEndpoint) + { + scheme = options.UseSsl ? "wss" : "ws"; + } + + _uri = new Uri($"{scheme}://{host}:{localEndPoint.Port}/"); + } + + public void Dispose() + { + if (_listenSocket != null) + { + _listenSocket.Dispose(); + _listenSocket = null; + } + } + + public Socket ListenSocket => _listenSocket; + public Uri Uri => _uri; + + public static async Task CreateServerAsync(Func funcAsync, Options options = null) + { + options = options ?? new Options(); + + using (var listenSocket = new Socket(options.Address.AddressFamily, SocketType.Stream, ProtocolType.Tcp)) + { + listenSocket.Bind(new IPEndPoint(options.Address, 0)); + listenSocket.Listen(options.ListenBacklog); + + using (var server = new LoopbackServer(listenSocket, options)) + { + await funcAsync(server); + } + } + } + + public static Task CreateServerAsync(Func funcAsync, Options options = null) + { + return CreateServerAsync(server => funcAsync(server, server.Uri), options); + } + + public static Task CreateClientAndServerAsync(Func clientFunc, Func serverFunc, Options options = null) + { + return CreateServerAsync(async server => + { + Task clientTask = clientFunc(server.Uri); + Task serverTask = serverFunc(server); + + await new Task[] { clientTask, serverTask }.WhenAllOrAnyFailed(); + }, options); + } + + public async Task AcceptConnectionAsync(Func funcAsync) + { + using (Socket s = await _listenSocket.AcceptAsync().ConfigureAwait(false)) + { + s.NoDelay = true; + + Stream stream = new NetworkStream(s, ownsSocket: false); + if (_options.UseSsl) + { + var sslStream = new SslStream(stream, false, delegate + { return true; }); + using (var cert = Configuration.Certificates.GetServerCertificate()) + { + await sslStream.AuthenticateAsServerAsync( + cert, + clientCertificateRequired: true, // allowed but not required + enabledSslProtocols: _options.SslProtocols, + checkCertificateRevocation: false).ConfigureAwait(false); + } + stream = sslStream; + } + + if (_options.StreamWrapper != null) + { + stream = _options.StreamWrapper(stream); + } + + using (var connection = new Connection(s, stream)) + { + await funcAsync(connection); + } + } + } + + public async Task> AcceptConnectionSendCustomResponseAndCloseAsync(string response) + { + List lines = null; + + // Note, we assume there's no request body. + // We'll close the connection after reading the request header and sending the response. + await AcceptConnectionAsync(async connection => + { + lines = await connection.ReadRequestHeaderAndSendCustomResponseAsync(response); + }); + + return lines; + } + + public async Task> AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode statusCode = HttpStatusCode.OK, string additionalHeaders = null, string content = null) + { + List lines = null; + + // Note, we assume there's no request body. + // We'll close the connection after reading the request header and sending the response. + await AcceptConnectionAsync(async connection => + { + lines = await connection.ReadRequestHeaderAndSendResponseAsync(statusCode, additionalHeaders, content); + }); + + return lines; + } + + public static string GetRequestHeaderValue(List headers, string name) + { + var sep = new char[] { ':' }; + foreach (string line in headers) + { + string[] tokens = line.Split(sep , 2); + if (name.Equals(tokens[0], StringComparison.InvariantCultureIgnoreCase)) + { + return tokens[1].Trim(); + } + } + return null; + } + + public static string GetRequestMethod(List headers) + { + + if (headers != null && headers.Count > 1) + { + return headers[0].Split()[1].Trim(); + } + return null; + } + + // Stolen from HttpStatusDescription code in the product code + private static string GetStatusDescription(HttpStatusCode code) + { + switch ((int)code) + { + case 100: + return "Continue"; + case 101: + return "Switching Protocols"; + case 102: + return "Processing"; + + case 200: + return "OK"; + case 201: + return "Created"; + case 202: + return "Accepted"; + case 203: + return "Non-Authoritative Information"; + case 204: + return "No Content"; + case 205: + return "Reset Content"; + case 206: + return "Partial Content"; + case 207: + return "Multi-Status"; + + case 300: + return "Multiple Choices"; + case 301: + return "Moved Permanently"; + case 302: + return "Found"; + case 303: + return "See Other"; + case 304: + return "Not Modified"; + case 305: + return "Use Proxy"; + case 307: + return "Temporary Redirect"; + + case 400: + return "Bad Request"; + case 401: + return "Unauthorized"; + case 402: + return "Payment Required"; + case 403: + return "Forbidden"; + case 404: + return "Not Found"; + case 405: + return "Method Not Allowed"; + case 406: + return "Not Acceptable"; + case 407: + return "Proxy Authentication Required"; + case 408: + return "Request Timeout"; + case 409: + return "Conflict"; + case 410: + return "Gone"; + case 411: + return "Length Required"; + case 412: + return "Precondition Failed"; + case 413: + return "Request Entity Too Large"; + case 414: + return "Request-Uri Too Long"; + case 415: + return "Unsupported Media Type"; + case 416: + return "Requested Range Not Satisfiable"; + case 417: + return "Expectation Failed"; + case 422: + return "Unprocessable Entity"; + case 423: + return "Locked"; + case 424: + return "Failed Dependency"; + case 426: + return "Upgrade Required"; // RFC 2817 + + case 500: + return "Internal Server Error"; + case 501: + return "Not Implemented"; + case 502: + return "Bad Gateway"; + case 503: + return "Service Unavailable"; + case 504: + return "Gateway Timeout"; + case 505: + return "Http Version Not Supported"; + case 507: + return "Insufficient Storage"; + } + return null; + } + + public static string GetHttpResponse(HttpStatusCode statusCode = HttpStatusCode.OK, string additionalHeaders = null, string content = null) => + $"HTTP/1.1 {(int)statusCode} {GetStatusDescription(statusCode)}\r\n" + + $"Date: {DateTimeOffset.UtcNow:R}\r\n" + + $"Content-Length: {(content == null ? 0 : content.Length)}\r\n" + + additionalHeaders + + "\r\n" + + content; + + public static string GetSingleChunkHttpResponse(HttpStatusCode statusCode = HttpStatusCode.OK, string additionalHeaders = null, string content = null) => + $"HTTP/1.1 {(int)statusCode} {GetStatusDescription(statusCode)}\r\n" + + $"Date: {DateTimeOffset.UtcNow:R}\r\n" + + "Transfer-Encoding: chunked\r\n" + + additionalHeaders + + "\r\n" + + (string.IsNullOrEmpty(content) ? "" : + $"{content.Length:X}\r\n" + + $"{content}\r\n") + + $"0\r\n" + + $"\r\n"; + + public static string GetBytePerChunkHttpResponse(HttpStatusCode statusCode = HttpStatusCode.OK, string additionalHeaders = null, string content = null) => + $"HTTP/1.1 {(int)statusCode} {GetStatusDescription(statusCode)}\r\n" + + $"Date: {DateTimeOffset.UtcNow:R}\r\n" + + "Transfer-Encoding: chunked\r\n" + + additionalHeaders + + "\r\n" + + (string.IsNullOrEmpty(content) ? "" : string.Concat(content.Select(c => $"1\r\n{c}\r\n"))) + + $"0\r\n" + + $"\r\n"; public class Options { @@ -29,237 +315,87 @@ namespace System.Net.Test.Common public bool UseSsl { get; set; } = false; public SslProtocols SslProtocols { get; set; } = SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12; public bool WebSocketEndpoint { get; set; } = false; - public Func ResponseStreamWrapper { get; set; } + public Func StreamWrapper { get; set; } + public string Username { get; set; } + public string Domain { get; set; } + public string Password { get; set; } + public bool IsProxy { get; set; } = false; } - public static Task CreateServerAsync(Func funcAsync, Options options = null) + public sealed class Connection : IDisposable { - IPEndPoint ignored; - return CreateServerAsync(funcAsync, out ignored, options); - } + private Socket _socket; + private Stream _stream; + private StreamReader _reader; + private StreamWriter _writer; - public static Task CreateServerAsync(Func funcAsync, out IPEndPoint localEndPoint, Options options = null) - { - options = options ?? new Options(); - try + public Connection(Socket socket, Stream stream) { - var server = new Socket(options.Address.AddressFamily, SocketType.Stream, ProtocolType.Tcp); + _socket = socket; + _stream = stream; - server.Bind(new IPEndPoint(options.Address, 0)); - server.Listen(options.ListenBacklog); - - localEndPoint = (IPEndPoint)server.LocalEndPoint; - string host = options.Address.AddressFamily == AddressFamily.InterNetworkV6 ? - $"[{localEndPoint.Address}]" : - localEndPoint.Address.ToString(); - - string scheme = options.UseSsl ? "https" : "http"; - if (options.WebSocketEndpoint) - { - scheme = options.UseSsl ? "wss" : "ws"; - } - - var url = new Uri($"{scheme}://{host}:{localEndPoint.Port}/"); - - return funcAsync(server, url).ContinueWith(t => - { - server.Dispose(); - t.GetAwaiter().GetResult(); - }, CancellationToken.None, TaskContinuationOptions.None, TaskScheduler.Default); - } - catch (Exception e) - { - localEndPoint = null; - return Task.FromException(e); - } - } - - public static string DefaultHttpResponse => $"HTTP/1.1 200 OK\r\nDate: {DateTimeOffset.UtcNow:R}\r\nContent-Length: 0\r\n\r\n"; - - public static IPAddress GetIPv6LinkLocalAddress() => - NetworkInterface - .GetAllNetworkInterfaces() - .SelectMany(i => i.GetIPProperties().UnicastAddresses) - .Select(a => a.Address) - .Where(a => a.IsIPv6LinkLocal) - .FirstOrDefault(); - - public static Task> ReadRequestAndSendResponseAsync(Socket server, string response = null, Options options = null) - { - return AcceptSocketAsync(server, (s, stream, reader, writer) => ReadWriteAcceptedAsync(s, reader, writer, response), options); - } - - public static async Task> ReadWriteAcceptedAsync(Socket s, StreamReader reader, StreamWriter writer, string response = null) - { - // Read request line and headers. Skip any request body. - var lines = new List(); - string line; - while (!string.IsNullOrEmpty(line = await reader.ReadLineAsync().ConfigureAwait(false))) - { - lines.Add(line); + _reader = new StreamReader(stream, Encoding.ASCII); + _writer = new StreamWriter(stream, Encoding.ASCII) { AutoFlush = true }; } - await writer.WriteAsync(response ?? DefaultHttpResponse).ConfigureAwait(false); + public Socket Socket => _socket; + public Stream Stream => _stream; + public StreamReader Reader => _reader; + public StreamWriter Writer => _writer; - return lines; - } - - public static async Task WebSocketHandshakeAsync(Socket s, StreamReader reader, StreamWriter writer) - { - string serverResponse = null; - string currentRequestLine; - while (!string.IsNullOrEmpty(currentRequestLine = await reader.ReadLineAsync().ConfigureAwait(false))) - { - string[] tokens = currentRequestLine.Split(new char[] { ':' }, 2); - if (tokens.Length == 2) - { - string headerName = tokens[0]; - if (headerName == "Sec-WebSocket-Key") - { - string headerValue = tokens[1].Trim(); - string responseSecurityAcceptValue = ComputeWebSocketHandshakeSecurityAcceptValue(headerValue); - serverResponse = - "HTTP/1.1 101 Switching Protocols\r\n" + - "Upgrade: websocket\r\n" + - "Connection: Upgrade\r\n" + - "Sec-WebSocket-Accept: " + responseSecurityAcceptValue + "\r\n\r\n"; - } - } - } - - if (serverResponse != null) - { - // We received a valid WebSocket opening handshake. Send the appropriate response. - await writer.WriteAsync(serverResponse).ConfigureAwait(false); - return true; - } - - return false; - } - - private static string ComputeWebSocketHandshakeSecurityAcceptValue(string secWebSocketKey) - { - // GUID specified by RFC 6455. - const string Rfc6455Guid = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"; - string combinedKey = secWebSocketKey + Rfc6455Guid; - - // Use of SHA1 hash is required by RFC 6455. - SHA1 sha1Provider = new SHA1CryptoServiceProvider(); - byte[] sha1Hash = sha1Provider.ComputeHash(Encoding.UTF8.GetBytes(combinedKey)); - return Convert.ToBase64String(sha1Hash); - } - - public static async Task> AcceptSocketAsync(Socket server, Func>> funcAsync, Options options = null) - { - options = options ?? new Options(); - Socket s = await server.AcceptAsync().ConfigureAwait(false); - try - { - Stream stream = new NetworkStream(s, ownsSocket: false); - if (options.UseSsl) - { - var sslStream = new SslStream(stream, false, delegate { return true; }); - using (var cert = Configuration.Certificates.GetServerCertificate()) - { - await sslStream.AuthenticateAsServerAsync( - cert, - clientCertificateRequired: true, // allowed but not required - enabledSslProtocols: options.SslProtocols, - checkCertificateRevocation: false).ConfigureAwait(false); - } - stream = sslStream; - } - - using (var reader = new StreamReader(stream, Encoding.ASCII)) - using (var writer = new StreamWriter(options?.ResponseStreamWrapper?.Invoke(stream) ?? stream, Encoding.ASCII) { AutoFlush = true }) - { - return await funcAsync(s, stream, reader, writer).ConfigureAwait(false); - } - } - finally + public void Dispose() { try { - s.Shutdown(SocketShutdown.Send); - s.Dispose(); + // Try to shutdown the send side of the socket. + // This seems to help avoid connection reset issues caused by buffered data + // that has not been sent/acked when the graceful shutdown timeout expires. + // This may throw if the socket was already closed, so eat any exception. + _socket.Shutdown(SocketShutdown.Send); } - catch (ObjectDisposedException) + catch (Exception) { } + + _reader.Dispose(); + _writer.Dispose(); + _stream.Dispose(); + _socket.Dispose(); + } + + public async Task> ReadRequestHeaderAsync() + { + var lines = new List(); + string line; + while (!string.IsNullOrEmpty(line = await _reader.ReadLineAsync().ConfigureAwait(false))) { - // In case the test itself disposes of the socket + lines.Add(line); } + + if (line == null) + { + throw new Exception("Unexpected EOF trying to read request header"); + } + + return lines; + } + + public async Task SendResponseAsync(HttpStatusCode statusCode = HttpStatusCode.OK, string additionalHeaders = null, string content = null) + { + await _writer.WriteAsync(GetHttpResponse(statusCode, additionalHeaders, content)); + } + + public async Task> ReadRequestHeaderAndSendCustomResponseAsync(string response) + { + List lines = await ReadRequestHeaderAsync().ConfigureAwait(false); + await _writer.WriteAsync(response); + return lines; + } + + public async Task> ReadRequestHeaderAndSendResponseAsync(HttpStatusCode statusCode = HttpStatusCode.OK, string additionalHeaders = null, string content = null) + { + List lines = await ReadRequestHeaderAsync().ConfigureAwait(false); + await SendResponseAsync(statusCode, additionalHeaders, content); + return lines; } } - - public enum TransferType - { - None = 0, - ContentLength, - Chunked - } - - public enum TransferError - { - None = 0, - ContentLengthTooLarge, - ChunkSizeTooLarge, - MissingChunkTerminator - } - - public static Task StartTransferTypeAndErrorServer( - TransferType transferType, - TransferError transferError, - out IPEndPoint localEndPoint) - { - return CreateServerAsync((server, url) => AcceptSocketAsync(server, async (client, stream, reader, writer) => - { - // Read past request headers. - string line; - while (!string.IsNullOrEmpty(line = reader.ReadLine())) ; - - // Determine response transfer headers. - string transferHeader = null; - string content = "This is some response content."; - if (transferType == TransferType.ContentLength) - { - transferHeader = transferError == TransferError.ContentLengthTooLarge ? - $"Content-Length: {content.Length + 42}\r\n" : - $"Content-Length: {content.Length}\r\n"; - } - else if (transferType == TransferType.Chunked) - { - transferHeader = "Transfer-Encoding: chunked\r\n"; - } - - // Write response header - await writer.WriteAsync("HTTP/1.1 200 OK\r\n").ConfigureAwait(false); - await writer.WriteAsync($"Date: {DateTimeOffset.UtcNow:R}\r\n").ConfigureAwait(false); - await writer.WriteAsync("Content-Type: text/plain\r\n").ConfigureAwait(false); - if (!string.IsNullOrEmpty(transferHeader)) - { - await writer.WriteAsync(transferHeader).ConfigureAwait(false); - } - await writer.WriteAsync("\r\n").ConfigureAwait(false); - - // Write response body - if (transferType == TransferType.Chunked) - { - string chunkSizeInHex = string.Format( - "{0:x}\r\n", - content.Length + (transferError == TransferError.ChunkSizeTooLarge ? 42 : 0)); - await writer.WriteAsync(chunkSizeInHex).ConfigureAwait(false); - await writer.WriteAsync($"{content}\r\n").ConfigureAwait(false); - if (transferError != TransferError.MissingChunkTerminator) - { - await writer.WriteAsync("0\r\n\r\n").ConfigureAwait(false); - } - } - else - { - await writer.WriteAsync($"{content}\r\n").ConfigureAwait(false); - } - - return null; - }), out localEndPoint); - } } } diff --git a/external/corefx/src/Common/tests/System/Net/SslProtocolSupport.cs b/external/corefx/src/Common/tests/System/Net/SslProtocolSupport.cs index fb3b51028b..d08c755dd1 100644 --- a/external/corefx/src/Common/tests/System/Net/SslProtocolSupport.cs +++ b/external/corefx/src/Common/tests/System/Net/SslProtocolSupport.cs @@ -4,6 +4,7 @@ using System.Collections; using System.Collections.Generic; +using System.Runtime.InteropServices; using System.Security.Authentication; namespace System.Net.Test.Common @@ -12,16 +13,24 @@ namespace System.Net.Test.Common { public const SslProtocols DefaultSslProtocols = SslProtocols.Tls12 | SslProtocols.Tls11 | SslProtocols.Tls; - public const SslProtocols SupportedSslProtocols = - SslProtocols.Tls - | SslProtocols.Tls11 - | SslProtocols.Tls12; - -#pragma warning disable 0618 - public const SslProtocols UnsupportedSslProtocols = - SslProtocols.Ssl2 - | SslProtocols.Ssl3; + public static SslProtocols SupportedSslProtocols + { + get + { + SslProtocols supported = SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12; +#pragma warning disable 0618 // SSL2/3 are deprecated +#if !MONO + if (PlatformDetection.IsWindows || + PlatformDetection.IsOSX || + (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && PlatformDetection.OpenSslVersion < new Version(1, 0, 2) && !PlatformDetection.IsDebian)) +#endif + { + supported |= SslProtocols.Ssl3; + } #pragma warning restore 0618 + return supported; + } + } public class SupportedSslProtocolsTestData : IEnumerable { @@ -36,29 +45,7 @@ namespace System.Net.Test.Common } } - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } - } - - public class UnsupportedSslProtocolsTestData : IEnumerable - { - public IEnumerator GetEnumerator() - { - foreach (SslProtocols protocol in Enum.GetValues(typeof(SslProtocols))) - { - if (protocol != 0 && (protocol & UnsupportedSslProtocols) == protocol) - { - yield return new object[] { protocol }; - } - } - } - - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } + IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); } } } diff --git a/external/corefx/src/Common/tests/System/Net/VirtualNetwork/VirtualNetwork.cs b/external/corefx/src/Common/tests/System/Net/VirtualNetwork/VirtualNetwork.cs index b82c3946d9..e34ffd7f4b 100644 --- a/external/corefx/src/Common/tests/System/Net/VirtualNetwork/VirtualNetwork.cs +++ b/external/corefx/src/Common/tests/System/Net/VirtualNetwork/VirtualNetwork.cs @@ -10,16 +10,29 @@ namespace System.Net.Test.Common { public class VirtualNetwork { + public class VirtualNetworkConnectionBroken : Exception + { + public VirtualNetworkConnectionBroken() : base("Connection broken") { } + } + private readonly int WaitForReadDataTimeoutMilliseconds = 30 * 1000; - + private readonly ConcurrentQueue _clientWriteQueue = new ConcurrentQueue(); private readonly ConcurrentQueue _serverWriteQueue = new ConcurrentQueue(); private readonly SemaphoreSlim _clientDataAvailable = new SemaphoreSlim(0); private readonly SemaphoreSlim _serverDataAvailable = new SemaphoreSlim(0); + public bool DisableConnectionBreaking { get; set; } = false; + private bool _connectionBroken = false; + public void ReadFrame(bool server, out byte[] buffer) { + if (_connectionBroken) + { + throw new VirtualNetworkConnectionBroken(); + } + SemaphoreSlim semaphore; ConcurrentQueue packetQueue; @@ -39,6 +52,11 @@ namespace System.Net.Test.Common throw new TimeoutException("VirtualNetwork: Timeout reading the next frame."); } + if (_connectionBroken) + { + throw new VirtualNetworkConnectionBroken(); + } + bool dequeueSucceeded = false; int remainingTries = 3; int backOffDelayMilliseconds = 2; @@ -62,6 +80,11 @@ namespace System.Net.Test.Common public void WriteFrame(bool server, byte[] buffer) { + if (_connectionBroken) + { + throw new VirtualNetworkConnectionBroken(); + } + SemaphoreSlim semaphore; ConcurrentQueue packetQueue; @@ -82,5 +105,15 @@ namespace System.Net.Test.Common packetQueue.Enqueue(innerBuffer); semaphore.Release(); } + + public void BreakConnection() + { + if (!DisableConnectionBreaking) + { + _connectionBroken = true; + _serverDataAvailable.Release(1_000_000); + _clientDataAvailable.Release(1_000_000); + } + } } } diff --git a/external/corefx/src/Common/tests/System/Net/VirtualNetwork/VirtualNetworkStream.cs b/external/corefx/src/Common/tests/System/Net/VirtualNetwork/VirtualNetworkStream.cs index e04eb54ace..d019c101ad 100644 --- a/external/corefx/src/Common/tests/System/Net/VirtualNetwork/VirtualNetworkStream.cs +++ b/external/corefx/src/Common/tests/System/Net/VirtualNetwork/VirtualNetworkStream.cs @@ -156,5 +156,15 @@ namespace System.Net.Test.Common public override void EndWrite(IAsyncResult asyncResult) => TaskToApm.End(asyncResult); + + protected override void Dispose(bool disposing) + { + if (disposing) + { + _network.BreakConnection(); + } + + base.Dispose(disposing); + } } } diff --git a/external/corefx/src/Common/tests/System/RandomExtensions.cs b/external/corefx/src/Common/tests/System/RandomExtensions.cs new file mode 100644 index 0000000000..8acd35be5d --- /dev/null +++ b/external/corefx/src/Common/tests/System/RandomExtensions.cs @@ -0,0 +1,23 @@ +// 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; + +namespace Common.System +{ + internal static class RandomExtensions + { + public static void Shuffle(this Random random, T[] array) + { + int n = array.Length; + while (n > 1) + { + int k = random.Next(n--); + T temp = array[n]; + array[n] = array[k]; + array[k] = temp; + } + } + } +} diff --git a/external/corefx/src/System.Runtime.Serialization.Xml/tests/Utils.cs b/external/corefx/src/Common/tests/System/Runtime/Serialization/Utils.cs similarity index 100% rename from external/corefx/src/System.Runtime.Serialization.Xml/tests/Utils.cs rename to external/corefx/src/Common/tests/System/Runtime/Serialization/Utils.cs diff --git a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/CurveDef.cs b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/CurveDef.cs index 7aaf35ac84..29b03579ca 100644 --- a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/CurveDef.cs +++ b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/CurveDef.cs @@ -2,7 +2,7 @@ // 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.Security.Cryptography.EcDsa.Tests +namespace System.Security.Cryptography.Tests { public class CurveDef { @@ -21,8 +21,8 @@ namespace System.Security.Cryptography.EcDsa.Tests { // Assume curve is valid if required; tests will fail if not present return RequiredOnPlatform || - (Curve.IsNamed && ECDsaFactory.IsCurveValid(Curve.Oid)) || - (Curve.IsExplicit && ECDsaFactory.ExplicitCurvesSupported); + (Curve.IsNamed && (EcDsa.Tests.ECDsaFactory.IsCurveValid(Curve.Oid) || EcDiffieHellman.Tests.ECDiffieHellmanFactory.IsCurveValid(Curve.Oid))) || + (Curve.IsExplicit && (EcDsa.Tests.ECDsaFactory.ExplicitCurvesSupported || EcDiffieHellman.Tests.ECDiffieHellmanFactory.ExplicitCurvesSupported)); } } diff --git a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/EccTestBase.cs b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/EccTestBase.cs new file mode 100644 index 0000000000..c5fc9f0ed5 --- /dev/null +++ b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/EccTestBase.cs @@ -0,0 +1,235 @@ +// 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.Collections.Generic; +using System.Linq; +using System.Security.Cryptography.Tests; +using Test.Cryptography; +using Xunit; + +namespace System.Security.Cryptography.Tests +{ + /// + /// Input and helper methods for EC classes + /// + public abstract class EccTestBase + { +#if netcoreapp + internal const string ECDSA_P224_OID_VALUE = "1.3.132.0.33"; // Also called nistP224 or secP224r1 + internal const string ECDSA_P256_OID_VALUE = "1.2.840.10045.3.1.7"; // Also called nistP256, secP256r1 or prime256v1(OpenSsl) + internal const string ECDSA_P384_OID_VALUE = "1.3.132.0.34"; // Also called nistP384 or secP384r1 + internal const string ECDSA_P521_OID_VALUE = "1.3.132.0.35"; // Also called nistP521 or secP521r1 + internal const string ECDSA_Sect193r1_OID_VALUE = "1.3.132.0.24"; //Char-2 curve + + public static IEnumerable TestCurvesFull + { + get + { + var curveDefs = + from curveDef in TestCurvesRaw + where curveDef.IsCurveValidOnPlatform == true + select curveDef; + + foreach (CurveDef cd in curveDefs) + yield return new[] { cd }; + + // return again with IncludePrivate = true + foreach (CurveDef cd in curveDefs) + { + cd.IncludePrivate = true; + yield return new[] { cd }; + } + } + } + + public static IEnumerable TestCurves + { + get + { + var curveDefs = + from curveDef in TestCurvesRaw + where curveDef.IsCurveValidOnPlatform == true + select curveDef; + + foreach (CurveDef curveDef in curveDefs) + yield return new[] { curveDef }; + } + } + + public static IEnumerable TestInvalidCurves + { + get + { + var curveDefs = + from curveDef in TestCurvesRaw + where curveDef.IsCurveValidOnPlatform == false + select curveDef; + + foreach (CurveDef curveDef in curveDefs) + yield return new[] { curveDef }; + } + } + + public static IEnumerable TestNewCurves + { + get + { + var curveDefs = + from curveDef in TestCurvesRaw + where + curveDef.IsCurveValidOnPlatform == true && + curveDef.RequiredOnPlatform == false + select curveDef; + + foreach (CurveDef curveDef in curveDefs) + yield return new[] { curveDef }; + } + } + + private static IEnumerable TestCurvesRaw + { + get + { + // nistP* curves + yield return new CurveDef() + { + Curve = ECCurve.NamedCurves.nistP256, // also secp256r1 + KeySize = 256, + CurveType = ECCurve.ECCurveType.PrimeShortWeierstrass, + RequiredOnPlatform = true, + }; + yield return new CurveDef() + { + Curve = ECCurve.NamedCurves.nistP384, // also secp384r1 + KeySize = 384, + CurveType = ECCurve.ECCurveType.PrimeMontgomery, + RequiredOnPlatform = true, + }; + yield return new CurveDef() + { + Curve = ECCurve.NamedCurves.nistP521, // also secp521r1 + KeySize = 521, + CurveType = ECCurve.ECCurveType.PrimeShortWeierstrass, + RequiredOnPlatform = true, + }; + yield return new CurveDef() + { + Curve = ECCurve.NamedCurves.brainpoolP160r1, + KeySize = 160, + CurveType = ECCurve.ECCurveType.PrimeShortWeierstrass + }; + yield return new CurveDef() + { + Curve = ECCurve.CreateFromOid(new Oid("1.3.132.0.24", "")), // sect193r1 + KeySize = 193, + CurveType = ECCurve.ECCurveType.Characteristic2, + }; + yield return new CurveDef() + { + Curve = ECCurve.CreateFromOid(new Oid("1.2.840.10045.3.0.1", "")), // c2pnb163v1 + KeySize = 163, + CurveType = ECCurve.ECCurveType.Characteristic2, + }; + yield return new CurveDef() + { + Curve = ECCurve.CreateFromOid(new Oid("1.3.132.0.16", "")), // sect283k1 + KeySize = 283, + CurveType = ECCurve.ECCurveType.Characteristic2, + }; + yield return new CurveDef() + { + Curve = ECCurve.CreateFromOid(new Oid("1.3.132.0.17", "")), // sect283r1 + KeySize = 283, + CurveType = ECCurve.ECCurveType.Characteristic2, + }; + yield return new CurveDef() + { + Curve = ECCurve.CreateFromOid(new Oid("", "wap-wsg-idm-ecid-wtls7")), + KeySize = 160, + CurveType = ECCurve.ECCurveType.PrimeMontgomery, + }; + yield return new CurveDef() + { + Curve = ECCurve.CreateFromOid(new Oid("invalid", "invalid")), + KeySize = 160, + CurveType = ECCurve.ECCurveType.PrimeShortWeierstrass, + }; + yield return new CurveDef + { + Curve = EccTestData.GetNistP256ExplicitCurve(), + KeySize = 256, + CurveType = ECCurve.ECCurveType.PrimeShortWeierstrass, + DisplayName = "NIST P-256", + }; + } + } + + internal static void AssertEqual(ECParameters p1, ECParameters p2) + { + ComparePrivateKey(p1, p2); + ComparePublicKey(p1.Q, p2.Q); + CompareCurve(p1.Curve, p2.Curve); + } + + internal static void ComparePrivateKey(ECParameters p1, ECParameters p2, bool isEqual = true) + { + if (isEqual) + { + Assert.Equal(p1.D, p2.D); + } + else + { + Assert.NotEqual(p1.D, p2.D); + } + } + + internal static void ComparePublicKey(ECPoint q1, ECPoint q2, bool isEqual = true) + { + if (isEqual) + { + Assert.Equal(q1.X, q2.X); + Assert.Equal(q1.Y, q2.Y); + } + else + { + Assert.NotEqual(q1.X, q2.X); + Assert.NotEqual(q1.Y, q2.Y); + } + } + + internal static void CompareCurve(ECCurve c1, ECCurve c2) + { + if (c1.IsNamed) + { + Assert.True(c2.IsNamed); + Assert.Equal(c1.Oid.FriendlyName, c2.Oid.FriendlyName); + } + else if (c1.IsExplicit) + { + Assert.True(c2.IsExplicit); + Assert.Equal(c1.A, c2.A); + Assert.Equal(c1.B, c2.B); + Assert.Equal(c1.CurveType, c2.CurveType); + Assert.Equal(c1.G.X, c2.G.X); + Assert.Equal(c1.G.Y, c2.G.Y); + Assert.Equal(c1.Cofactor, c2.Cofactor); + Assert.Equal(c1.Order, c2.Order); + Assert.Equal(c1.Seed, c2.Seed); + Assert.Equal(c1.Hash, c2.Hash); + + if (c1.IsPrime) + { + Assert.True(c2.IsPrime); + Assert.Equal(c1.Prime, c2.Prime); + } + else if (c1.IsCharacteristic2) + { + Assert.True(c2.IsCharacteristic2); + Assert.Equal(c1.Polynomial, c2.Polynomial); + } + } + } +#endif // netcoreapp + } +} diff --git a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTestData.cs b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/EccTestData.cs similarity index 98% rename from external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTestData.cs rename to external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/EccTestData.cs index 4b86628cae..6fca55ae59 100644 --- a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTestData.cs +++ b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/EccTestData.cs @@ -5,7 +5,7 @@ using System; using Test.Cryptography; -namespace System.Security.Cryptography.EcDsa.Tests +namespace System.Security.Cryptography.Tests { // Note to contributors: // Keys contained in this file should be randomly generated for the purpose of inclusion here, @@ -15,7 +15,7 @@ namespace System.Security.Cryptography.EcDsa.Tests // Note to readers: // The keys contained in this file should all be treated as compromised. That means that you // absolutely SHOULD NOT use these keys on anything that you actually want to be protected. - internal static class ECDsaTestData + internal static class EccTestData { internal static readonly byte[] s_hashSha512 = ("a232cec7be26319e53db0d48470232d37793b06b99e8ed82fac1996b3d1596449087769927d64af657cce62d853c4cf7ff4c" @@ -109,7 +109,7 @@ namespace System.Security.Cryptography.EcDsa.Tests internal static ECParameters GetNistP256ExplicitTestData() { - // explicit values for s_ECDsa256Key (nistP256) + // explicit values for s_Ecc256Key (nistP256) ECParameters p = new ECParameters(); p.Q = new ECPoint { diff --git a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanFactory.cs b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanFactory.cs new file mode 100644 index 0000000000..2952086206 --- /dev/null +++ b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanFactory.cs @@ -0,0 +1,44 @@ +// 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.Security.Cryptography.EcDiffieHellman.Tests +{ + public interface IECDiffieHellmanProvider + { + ECDiffieHellman Create(); + ECDiffieHellman Create(int keySize); +#if netcoreapp + ECDiffieHellman Create(ECCurve curve); +#endif + bool IsCurveValid(Oid oid); + bool ExplicitCurvesSupported { get; } + } + + public static partial class ECDiffieHellmanFactory + { + public static ECDiffieHellman Create() + { + return s_provider.Create(); + } + + public static ECDiffieHellman Create(int keySize) + { + return s_provider.Create(keySize); + } + +#if netcoreapp + public static ECDiffieHellman Create(ECCurve curve) + { + return s_provider.Create(curve); + } +#endif + + public static bool IsCurveValid(Oid oid) + { + return s_provider.IsCurveValid(oid); + } + + public static bool ExplicitCurvesSupported => s_provider.ExplicitCurvesSupported; + } +} diff --git a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanTests.Hash.cs b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanTests.Hash.cs new file mode 100644 index 0000000000..cb9e1919fd --- /dev/null +++ b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanTests.Hash.cs @@ -0,0 +1,287 @@ +// 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.Collections.Generic; +using Test.Cryptography; +using Xunit; + +namespace System.Security.Cryptography.EcDiffieHellman.Tests +{ + public partial class ECDiffieHellmanTests + { + [Fact] + public static void HashDerivation_OtherKeyRequired() + { + using (ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create()) + { + Assert.Throws( + () => ecdh.DeriveKeyFromHash(null, HashAlgorithmName.SHA512)); + } + } + + [Theory] + [MemberData(nameof(MismatchedKeysizes))] + public static void HashDerivation_SameSizeOtherKeyRequired(int aliceSize, int bobSize) + { + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create(aliceSize)) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create(bobSize)) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + Assert.ThrowsAny( + () => alice.DeriveKeyFromHash(bobPublic, HashAlgorithmName.SHA512)); + } + } + + [Fact] + public static void HashDerivation_AlgorithmRequired() + { + using (ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey publicKey = ecdh.PublicKey) + { + Assert.Throws( + () => ecdh.DeriveKeyFromHash(publicKey, new HashAlgorithmName(""))); + } + } + + [Theory] + [MemberData(nameof(EveryKeysize))] + public static void HashDerivation(int keySize) + { + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create(keySize)) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create(keySize)) + using (ECDiffieHellmanPublicKey alicePublic = alice.PublicKey) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyFromHash(bobPublic, HashAlgorithmName.SHA512); + byte[] bobDerived = bob.DeriveKeyFromHash(alicePublic, HashAlgorithmName.SHA512); + + Assert.Equal(aliceDerived, bobDerived); + } + } + + [Fact] + public static void HashDerivationVariesOnPublicKey() + { + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey alicePublic = alice.PublicKey) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyFromHash(bobPublic, HashAlgorithmName.SHA512); + byte[] aliceSelfDerived = alice.DeriveKeyFromHash(alicePublic, HashAlgorithmName.SHA512); + + // Alice and Alice is HASH(aaG) != HASH(abG) + // (Except for the fantastically small chance that Alice == Bob) + Assert.NotEqual(aliceDerived, aliceSelfDerived); + } + } + + [Fact] + public static void HashDerivationVariesOnAlgorithm() + { + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey alicePublic = alice.PublicKey) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyFromHash(bobPublic, HashAlgorithmName.SHA512); + byte[] bobDerived = bob.DeriveKeyFromHash(alicePublic, HashAlgorithmName.SHA384); + + Assert.NotEqual(aliceDerived, bobDerived); + } + } + + [Theory] + [MemberData(nameof(EveryKeysize))] + public static void SymmetricDerivation_HashPrepend(int keySize) + { + byte[] prefix = new byte[10]; + + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create(keySize)) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create(keySize)) + using (ECDiffieHellmanPublicKey alicePublic = alice.PublicKey) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyFromHash(bobPublic, HashAlgorithmName.SHA512, prefix, null); + byte[] bobDerived = bob.DeriveKeyFromHash(alicePublic, HashAlgorithmName.SHA512, prefix, null); + + Assert.Equal(aliceDerived, bobDerived); + } + } + + [Fact] + public static void HashDerivationVariesOnPrepend() + { + byte[] alicePrefix = new byte[10]; + byte[] bobPrefix = new byte[alicePrefix.Length]; + bobPrefix[0] = 0xFF; + + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey alicePublic = alice.PublicKey) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyFromHash(bobPublic, HashAlgorithmName.SHA512, alicePrefix, null); + byte[] bobDerived = alice.DeriveKeyFromHash(alicePublic, HashAlgorithmName.SHA512, bobPrefix, null); + + Assert.NotEqual(aliceDerived, bobDerived); + } + } + + [Theory] + [MemberData(nameof(EveryKeysize))] + public static void SymmetricDerivation_HashAppend(int keySize) + { + byte[] suffix = new byte[10]; + + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create(keySize)) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create(keySize)) + using (ECDiffieHellmanPublicKey alicePublic = alice.PublicKey) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyFromHash(bobPublic, HashAlgorithmName.SHA512, null, suffix); + byte[] bobDerived = bob.DeriveKeyFromHash(alicePublic, HashAlgorithmName.SHA512, null, suffix); + + Assert.Equal(aliceDerived, bobDerived); + } + } + + [Fact] + public static void HashDerivationVariesOnAppend() + { + byte[] aliceSuffix = new byte[10]; + byte[] bobSuffix = new byte[aliceSuffix.Length]; + bobSuffix[0] = 0xFF; + + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey alicePublic = alice.PublicKey) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyFromHash(bobPublic, HashAlgorithmName.SHA512, null, aliceSuffix); + byte[] bobDerived = alice.DeriveKeyFromHash(alicePublic, HashAlgorithmName.SHA512, null, bobSuffix); + + Assert.NotEqual(aliceDerived, bobDerived); + } + } + + [Fact] + public static void HashDerivationIsStable() + { + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyFromHash(bobPublic, HashAlgorithmName.SHA512); + byte[] aliceDerivedAgain = alice.DeriveKeyFromHash(bobPublic, HashAlgorithmName.SHA512); + + Assert.Equal(aliceDerived, aliceDerivedAgain); + } + } + + [Fact] + public static void SimpleHashMethodForwardsNull() + { + using (ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey publicKey = ecdh.PublicKey) + { + byte[] simple = ecdh.DeriveKeyFromHash(publicKey, HashAlgorithmName.SHA512); + byte[] nulls = ecdh.DeriveKeyFromHash(publicKey, HashAlgorithmName.SHA512, null, null); + + Assert.Equal(simple, nulls); + } + } + + [Fact] + public static void DeriveKeyMaterialEquivalentToDeriveKeyFromHash() + { + using (ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey publicKey = ecdh.PublicKey) + { + byte[] simple = ecdh.DeriveKeyMaterial(publicKey); + byte[] nulls = ecdh.DeriveKeyFromHash(publicKey, HashAlgorithmName.SHA256, null, null); + + Assert.Equal(simple, nulls); + } + } + + public static IEnumerable HashDerivationTestCases() + { + return new object[][] + { + new object[] + { + HashAlgorithmName.SHA256, + null, + null, + "595B71C33D9D40ACD9CA847C47267DAEE7498EEF0B553482FAA45791418AC679", + }, + + new object[] + { + HashAlgorithmName.SHA1, + null, + null, + "25E464FAC33F4A5F8786627FB3685F4C31B26327", + }, + + new object[] + { + HashAlgorithmName.SHA256, + "02040608", + null, + "D0F4C42D61E794E508A079822F3069C9F89D9E3385C8E090425FF38927798017", + }, + + new object[] + { + HashAlgorithmName.SHA256, + null, + "010305", + "20DCB58E2AC4E70B1BF47362B0D1C8B728E27D6575EA9B85106CBE05E1F7D6DB", + }, + + new object[] + { + HashAlgorithmName.SHA256, + "02040608", + "010305", + "EFC758D39896E9DE96C120B0A74FB751F140BD7F3F4FC3777DC2A530145E01EC", + }, + + new object[] + { + HashAlgorithmName.SHA256, + "010305", + "02040608", + "7DB5520A5D6351595FC286CD53509D964FBB152C289F072581CB5E16EBF319E8", + }, + }; + } + +#if netcoreapp + [Theory] + [MemberData(nameof(HashDerivationTestCases))] + public static void HashDerivation_KnownResults( + HashAlgorithmName hashAlgorithm, + string prependBytes, + string appendBytes, + string answerBytes) + { + byte[] prepend = prependBytes?.HexToByteArray(); + byte[] append = appendBytes?.HexToByteArray(); + byte[] answer = answerBytes.HexToByteArray(); + byte[] output; + + using (ECDiffieHellman ecdh = OpenKnownKey()) + using (ECDiffieHellmanPublicKey publicKey = ecdh.PublicKey) + { + output = ecdh.DeriveKeyFromHash(publicKey, hashAlgorithm, prepend, append); + } + + Assert.Equal(answer, output); + } +#endif + } +} diff --git a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanTests.Hmac.cs b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanTests.Hmac.cs new file mode 100644 index 0000000000..a060b240fb --- /dev/null +++ b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanTests.Hmac.cs @@ -0,0 +1,345 @@ +// 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; +using System.Collections.Generic; +using System.Security.Cryptography; +using Test.Cryptography; +using Xunit; + +namespace System.Security.Cryptography.EcDiffieHellman.Tests +{ + public partial class ECDiffieHellmanTests + { + private static readonly byte[] s_sampleHmacKey = { 0, 1, 2, 3, 4, 5 }; + + [Fact] + public static void HmacDerivation_OtherKeyRequired() + { + using (ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create()) + { + Assert.Throws( + () => ecdh.DeriveKeyFromHmac(null, HashAlgorithmName.SHA512, null)); + } + } + + [Theory] + [MemberData(nameof(MismatchedKeysizes))] + public static void HmacDerivation_SameSizeOtherKeyRequired(int aliceSize, int bobSize) + { + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create(aliceSize)) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create(bobSize)) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + Assert.ThrowsAny( + () => alice.DeriveKeyFromHmac(bobPublic, HashAlgorithmName.SHA512, null)); + } + } + + [Theory] + [MemberData(nameof(EveryKeysize))] + public static void SymmetricDerivation_Hmac(int keySize) + { + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create(keySize)) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create(keySize)) + using (ECDiffieHellmanPublicKey alicePublic = alice.PublicKey) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyFromHmac(bobPublic, HashAlgorithmName.SHA512, s_sampleHmacKey); + byte[] bobDerived = bob.DeriveKeyFromHmac(alicePublic, HashAlgorithmName.SHA512, s_sampleHmacKey); + + Assert.Equal(aliceDerived, bobDerived); + } + } + + [Fact] + public static void HmacDerivationVariesOnPublicKey() + { + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey alicePublic = alice.PublicKey) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyFromHmac(bobPublic, HashAlgorithmName.SHA512, s_sampleHmacKey); + byte[] aliceSelfDerived = alice.DeriveKeyFromHmac(alicePublic, HashAlgorithmName.SHA512, s_sampleHmacKey); + + // Alice and Alice is HASH(aaG) != HASH(abG) + // (Except for the fantastically small chance that Alice == Bob) + Assert.NotEqual(aliceDerived, aliceSelfDerived); + } + } + + [Fact] + public static void HmacDerivationVariesOnAlgorithm() + { + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey alicePublic = alice.PublicKey) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyFromHmac(bobPublic, HashAlgorithmName.SHA512, s_sampleHmacKey); + byte[] bobDerived = bob.DeriveKeyFromHmac(alicePublic, HashAlgorithmName.SHA384, s_sampleHmacKey); + + Assert.NotEqual(aliceDerived, bobDerived); + } + } + + [Fact] + public static void HmacDerivationVariesOnKey() + { + byte[] hmacKeyAlice = { 0, 1, 2, 3, 4, 5 }; + byte[] hmacKeyBob = { 10, 1, 2, 3, 4, 5 }; + + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey alicePublic = alice.PublicKey) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyFromHmac(bobPublic, HashAlgorithmName.SHA512, hmacKeyAlice); + byte[] bobDerived = bob.DeriveKeyFromHmac(alicePublic, HashAlgorithmName.SHA512, hmacKeyBob); + + Assert.NotEqual(aliceDerived, bobDerived); + } + } + + [Theory] + [MemberData(nameof(EveryKeysize))] + public static void SymmetricDerivation_HmacPrepend(int keySize) + { + byte[] prefix = new byte[10]; + + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create(keySize)) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create(keySize)) + using (ECDiffieHellmanPublicKey alicePublic = alice.PublicKey) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyFromHmac(bobPublic, HashAlgorithmName.SHA512, s_sampleHmacKey, prefix, null); + byte[] bobDerived = bob.DeriveKeyFromHmac(alicePublic, HashAlgorithmName.SHA512, s_sampleHmacKey, prefix, null); + + Assert.Equal(aliceDerived, bobDerived); + } + } + + [Fact] + public static void HmacDerivationVariesOnPrepend() + { + byte[] alicePrefix = new byte[10]; + byte[] bobPrefix = new byte[alicePrefix.Length]; + bobPrefix[0] = 0xFF; + + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey alicePublic = alice.PublicKey) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyFromHmac(bobPublic, HashAlgorithmName.SHA512, s_sampleHmacKey, alicePrefix, null); + byte[] bobDerived = bob.DeriveKeyFromHmac(alicePublic, HashAlgorithmName.SHA512, s_sampleHmacKey, bobPrefix, null); + + Assert.NotEqual(aliceDerived, bobDerived); + } + } + + [Theory] + [MemberData(nameof(EveryKeysize))] + public static void SymmetricDerivation_HmacAppend(int keySize) + { + byte[] suffix = new byte[10]; + + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create(keySize)) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create(keySize)) + using (ECDiffieHellmanPublicKey alicePublic = alice.PublicKey) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyFromHmac(bobPublic, HashAlgorithmName.SHA512, s_sampleHmacKey, null, suffix); + byte[] bobDerived = bob.DeriveKeyFromHmac(alicePublic, HashAlgorithmName.SHA512, s_sampleHmacKey, null, suffix); + + Assert.Equal(aliceDerived, bobDerived); + } + } + + [Fact] + public static void HmacDerivationVariesOnAppend() + { + byte[] aliceSuffix = new byte[10]; + byte[] bobSuffix = new byte[aliceSuffix.Length]; + bobSuffix[0] = 0xFF; + + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey alicePublic = alice.PublicKey) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyFromHmac(bobPublic, HashAlgorithmName.SHA512, s_sampleHmacKey, null, aliceSuffix); + byte[] bobDerived = bob.DeriveKeyFromHmac(alicePublic, HashAlgorithmName.SHA512, s_sampleHmacKey, null, bobSuffix); + + Assert.NotEqual(aliceDerived, bobDerived); + } + } + + [Fact] + public static void HmacDerivationIsStable() + { + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyFromHmac(bobPublic, HashAlgorithmName.SHA512, s_sampleHmacKey); + byte[] aliceDerivedAgain = alice.DeriveKeyFromHmac(bobPublic, HashAlgorithmName.SHA512, s_sampleHmacKey); + + Assert.Equal(aliceDerived, aliceDerivedAgain); + } + } + + [Theory] + [MemberData(nameof(EveryKeysize))] + public static void SymmetricDerivation_HmacNullKey(int keySize) + { + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create(keySize)) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create(keySize)) + using (ECDiffieHellmanPublicKey alicePublic = alice.PublicKey) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyFromHmac(bobPublic, HashAlgorithmName.SHA512, null); + byte[] bobDerived = bob.DeriveKeyFromHmac(alicePublic, HashAlgorithmName.SHA512, null); + + Assert.Equal(aliceDerived, bobDerived); + } + } + + [Fact] + public static void HmacNullKeyDerivationIsStable() + { + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyFromHmac(bobPublic, HashAlgorithmName.SHA512, null); + byte[] aliceDerivedAgain = alice.DeriveKeyFromHmac(bobPublic, HashAlgorithmName.SHA512, null); + + Assert.Equal(aliceDerived, aliceDerivedAgain); + } + } + + [Fact] + public static void SimpleHmacMethodForwardsNull() + { + using (ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey publicKey = ecdh.PublicKey) + { + byte[] simple = ecdh.DeriveKeyFromHmac(publicKey, HashAlgorithmName.SHA512, s_sampleHmacKey); + byte[] nulls = ecdh.DeriveKeyFromHmac(publicKey, HashAlgorithmName.SHA512, s_sampleHmacKey, null, null); + + Assert.Equal(simple, nulls); + } + } + + [Fact] + public static void SimpleHmacNullKeyForwardsNull() + { + using (ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey publicKey = ecdh.PublicKey) + { + byte[] simple = ecdh.DeriveKeyFromHmac(publicKey, HashAlgorithmName.SHA512, null); + byte[] nulls = ecdh.DeriveKeyFromHmac(publicKey, HashAlgorithmName.SHA512, null, null, null); + + Assert.Equal(simple, nulls); + } + } + + public static IEnumerable HmacDerivationTestCases() + { + return new object[][] + { + new object[] + { + HashAlgorithmName.SHA256, + null, + null, + null, + "6D7D15C9A08FD47DFDABD3541BE3BBAF93B15FC65D30E6012CCC0B23ED5C43FF", + }, + + new object[] + { + HashAlgorithmName.SHA1, + null, + null, + null, + "39D4B035BC1A1E4108B965689E27BA98ACED8449", + }, + + new object[] + { + HashAlgorithmName.SHA256, + "030609", + null, + null, + "7A4F81BF065CC521AFB162DB4A45CEFC78227178A58632EA53D3E367AB7D1979", + }, + + new object[] + { + HashAlgorithmName.SHA256, + null, + "02040608", + "010305", + "DB39A6AC9334701D2DCD508C401C65BC69348F684C85EDDE506950F049668842", + }, + + new object[] + { + HashAlgorithmName.SHA256, + null, + "010305", + "02040608", + "66471DE2655DF9404636F9076F845F0B71A04DDA2BA6F1469EB0F2E9EF57DC33", + }, + + new object[] + { + HashAlgorithmName.SHA256, + "030609", + "02040608", + "010305", + "2F7A31FF9118A6BBF92E268568C634A9F1E244CA8C1A74C864DECC50727B7DEE", + }, + + new object[] + { + HashAlgorithmName.SHA256, + "030609", + "010305", + "02040608", + "AE3CD974F262B199B0859D9F933207D2F6E3E04434D60089FE0BE801ED38D370", + }, + }; + } + +#if netcoreapp + [Theory] + [MemberData(nameof(HmacDerivationTestCases))] + public static void HmacDerivation_KnownResults( + HashAlgorithmName hashAlgorithm, + string hmacKeyBytes, + string prependBytes, + string appendBytes, + string answerBytes) + { + byte[] hmacKey = hmacKeyBytes?.HexToByteArray(); + byte[] prepend = prependBytes?.HexToByteArray(); + byte[] append = appendBytes?.HexToByteArray(); + byte[] answer = answerBytes.HexToByteArray(); + byte[] output; + + using (ECDiffieHellman ecdh = OpenKnownKey()) + using (ECDiffieHellmanPublicKey publicKey = ecdh.PublicKey) + { + output = ecdh.DeriveKeyFromHmac(publicKey, hashAlgorithm, hmacKey, prepend, append); + } + + Assert.Equal(answer, output); + } +#endif + } +} diff --git a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanTests.ImportExport.cs b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanTests.ImportExport.cs new file mode 100644 index 0000000000..d35f3db6e5 --- /dev/null +++ b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanTests.ImportExport.cs @@ -0,0 +1,440 @@ +// 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.Security.Cryptography.Tests; +using Test.Cryptography; +using Xunit; + +namespace System.Security.Cryptography.EcDiffieHellman.Tests +{ +#if netcoreapp + public partial class ECDiffieHellmanTests + { + // On CentOS, secp224r1 (also called nistP224) appears to be disabled. To prevent test failures on that platform, + // probe for this capability before depending on it. + internal static bool ECDsa224Available => + ECDiffieHellmanFactory.IsCurveValid(new Oid(ECDSA_P224_OID_VALUE)); + + [Theory, MemberData(nameof(TestCurvesFull))] + public static void TestNamedCurves(CurveDef curveDef) + { + if (!curveDef.Curve.IsNamed) + return; + + using (ECDiffieHellman ec1 = ECDiffieHellmanFactory.Create(curveDef.Curve)) + { + ECParameters param1 = ec1.ExportParameters(curveDef.IncludePrivate); + VerifyNamedCurve(param1, ec1, curveDef.KeySize, curveDef.IncludePrivate); + + using (ECDiffieHellman ec2 = ECDiffieHellmanFactory.Create()) + { + ec2.ImportParameters(param1); + ECParameters param2 = ec2.ExportParameters(curveDef.IncludePrivate); + VerifyNamedCurve(param2, ec2, curveDef.KeySize, curveDef.IncludePrivate); + + AssertEqual(param1, param2); + } + } + } + + [Theory, MemberData(nameof(TestInvalidCurves))] + public static void TestNamedCurvesNegative(CurveDef curveDef) + { + if (!curveDef.Curve.IsNamed) + return; + + // An exception may be thrown during Create() if the Oid is bad, or later during native calls + Assert.Throws( + () => ECDiffieHellmanFactory.Create(curveDef.Curve).ExportParameters(false)); + } + + [Theory, MemberData(nameof(TestCurvesFull))] + public static void TestExplicitCurves(CurveDef curveDef) + { + if (!ECDiffieHellmanFactory.ExplicitCurvesSupported) + { + return; + } + + using (ECDiffieHellman ec1 = ECDiffieHellmanFactory.Create(curveDef.Curve)) + { + ECParameters param1 = ec1.ExportExplicitParameters(curveDef.IncludePrivate); + VerifyExplicitCurve(param1, ec1, curveDef); + + using (ECDiffieHellman ec2 = ECDiffieHellmanFactory.Create()) + { + ec2.ImportParameters(param1); + ECParameters param2 = ec2.ExportExplicitParameters(curveDef.IncludePrivate); + VerifyExplicitCurve(param1, ec1, curveDef); + + AssertEqual(param1, param2); + } + } + } + + [Theory, MemberData(nameof(TestCurves))] + public static void TestExplicitCurvesKeyAgree(CurveDef curveDef) + { + if (!ECDiffieHellmanFactory.ExplicitCurvesSupported) + { + return; + } + + using (ECDiffieHellman ecdh1Named = ECDiffieHellmanFactory.Create(curveDef.Curve)) + { + ECParameters ecdh1ExplicitParameters = ecdh1Named.ExportExplicitParameters(true); + + using (ECDiffieHellman ecdh1Explicit = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellman ecdh2 = ECDiffieHellmanFactory.Create(ecdh1ExplicitParameters.Curve)) + { + ecdh1Explicit.ImportParameters(ecdh1ExplicitParameters); + + using (ECDiffieHellmanPublicKey ecdh1NamedPub = ecdh1Named.PublicKey) + using (ECDiffieHellmanPublicKey ecdh1ExplicitPub = ecdh1Explicit.PublicKey) + using (ECDiffieHellmanPublicKey ecdh2Pub = ecdh2.PublicKey) + { + HashAlgorithmName hash = HashAlgorithmName.SHA256; + + byte[] ech1Named_ecdh1Named = ecdh1Named.DeriveKeyFromHash(ecdh1NamedPub, hash); + byte[] ech1Named_ecdh1Named2 = ecdh1Named.DeriveKeyFromHash(ecdh1NamedPub, hash); + byte[] ech1Named_ecdh1Explicit = ecdh1Named.DeriveKeyFromHash(ecdh1ExplicitPub, hash); + byte[] ech1Named_ecdh2Explicit = ecdh1Named.DeriveKeyFromHash(ecdh2Pub, hash); + + byte[] ecdh1Explicit_ecdh1Named = ecdh1Explicit.DeriveKeyFromHash(ecdh1NamedPub, hash); + byte[] ecdh1Explicit_ecdh1Explicit = ecdh1Explicit.DeriveKeyFromHash(ecdh1ExplicitPub, hash); + byte[] ecdh1Explicit_ecdh1Explicit2 = ecdh1Explicit.DeriveKeyFromHash(ecdh1ExplicitPub, hash); + byte[] ecdh1Explicit_ecdh2Explicit = ecdh1Explicit.DeriveKeyFromHash(ecdh2Pub, hash); + + byte[] ecdh2_ecdh1Named = ecdh2.DeriveKeyFromHash(ecdh1NamedPub, hash); + byte[] ecdh2_ecdh1Explicit = ecdh2.DeriveKeyFromHash(ecdh1ExplicitPub, hash); + byte[] ecdh2_ecdh2Explicit = ecdh2.DeriveKeyFromHash(ecdh2Pub, hash); + byte[] ecdh2_ecdh2Explicit2 = ecdh2.DeriveKeyFromHash(ecdh2Pub, hash); + + Assert.Equal(ech1Named_ecdh1Named, ech1Named_ecdh1Named2); + Assert.Equal(ech1Named_ecdh1Explicit, ecdh1Explicit_ecdh1Named); + Assert.Equal(ech1Named_ecdh2Explicit, ecdh2_ecdh1Named); + + Assert.Equal(ecdh1Explicit_ecdh1Explicit, ecdh1Explicit_ecdh1Explicit2); + Assert.Equal(ecdh1Explicit_ecdh2Explicit, ecdh2_ecdh1Explicit); + + Assert.Equal(ecdh2_ecdh2Explicit, ecdh2_ecdh2Explicit2); + } + } + } + } + + [Fact] + public static void TestNamedCurveNegative() + { + Assert.Throws( + () => ECDiffieHellmanFactory.Create(ECCurve.CreateFromFriendlyName("Invalid")).ExportExplicitParameters(false)); + + Assert.Throws( + () => ECDiffieHellmanFactory.Create(ECCurve.CreateFromValue("Invalid")).ExportExplicitParameters(false)); + } + + [Fact] + public static void TestKeySizeCreateKey() + { + using (ECDiffieHellman ec = ECDiffieHellmanFactory.Create(ECCurve.NamedCurves.nistP256)) + { + // Ensure the handle is created + Assert.Equal(256, ec.KeySize); + ec.Exercise(); + + ec.KeySize = 521; //nistP521 + Assert.Equal(521, ec.KeySize); + ec.Exercise(); + + Assert.ThrowsAny(() => ec.KeySize = 9999); + } + } + + [Fact] + public static void TestExplicitImportValidationNegative() + { + if (!ECDiffieHellmanFactory.ExplicitCurvesSupported) + { + return; + } + + unchecked + { + using (ECDiffieHellman ec = ECDiffieHellmanFactory.Create()) + { + ECParameters p = EccTestData.GetNistP256ExplicitTestData(); + Assert.True(p.Curve.IsPrime); + ec.ImportParameters(p); + + ECParameters temp = p; + temp.Q.X = null; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Q.X = new byte[] { }; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Q.X = new byte[1] { 0x10 }; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Q.X = (byte[])p.Q.X.Clone(); --temp.Q.X[0]; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + + temp = p; + temp.Q.Y = null; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Q.Y = new byte[] { }; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Q.Y = new byte[1] { 0x10 }; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Q.Y = (byte[])p.Q.Y.Clone(); --temp.Q.Y[0]; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + + temp = p; + temp.Curve.A = null; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Curve.A = new byte[] { }; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Curve.A = new byte[1] { 0x10 }; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Curve.A = (byte[])p.Curve.A.Clone(); --temp.Curve.A[0]; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + + temp = p; + temp.Curve.B = null; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Curve.B = new byte[] { }; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Curve.B = new byte[1] { 0x10 }; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Curve.B = (byte[])p.Curve.B.Clone(); --temp.Curve.B[0]; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + + temp = p; + temp.Curve.Order = null; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Curve.Order = new byte[] { }; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + + temp = p; + temp.Curve.Prime = null; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Curve.Prime = new byte[] { }; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Curve.Prime = new byte[1] { 0x10 }; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Curve.Prime = (byte[])p.Curve.Prime.Clone(); --temp.Curve.Prime[0]; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + } + } + } + + [Fact] + public static void ImportExplicitWithSeedButNoHash() + { + if (!ECDiffieHellmanFactory.ExplicitCurvesSupported) + { + return; + } + + using (ECDiffieHellman ec = ECDiffieHellmanFactory.Create()) + { + ECCurve curve = EccTestData.GetNistP256ExplicitCurve(); + Assert.NotNull(curve.Hash); + ec.GenerateKey(curve); + + ECParameters parameters = ec.ExportExplicitParameters(true); + Assert.NotNull(parameters.Curve.Seed); + parameters.Curve.Hash = null; + + ec.ImportParameters(parameters); + ec.Exercise(); + } + } + + [Fact] + [PlatformSpecific(TestPlatforms.Windows/* "parameters.Curve.Hash doesn't round trip on Unix." */)] + public static void ImportExplicitWithHashButNoSeed() + { + if (!ECDiffieHellmanFactory.ExplicitCurvesSupported) + { + return; + } + + using (ECDiffieHellman ec = ECDiffieHellmanFactory.Create()) + { + ECCurve curve = EccTestData.GetNistP256ExplicitCurve(); + Assert.NotNull(curve.Hash); + ec.GenerateKey(curve); + + ECParameters parameters = ec.ExportExplicitParameters(true); + Assert.NotNull(parameters.Curve.Hash); + parameters.Curve.Seed = null; + + ec.ImportParameters(parameters); + ec.Exercise(); + } + } + + [ConditionalFact(nameof(ECDsa224Available))] + public static void TestNamedImportValidationNegative() + { + if (!ECDiffieHellmanFactory.ExplicitCurvesSupported) + { + return; + } + + unchecked + { + using (ECDiffieHellman ec = ECDiffieHellmanFactory.Create()) + { + ECParameters p = EccTestData.GetNistP224KeyTestData(); + Assert.True(p.Curve.IsNamed); + var q = p.Q; + var c = p.Curve; + ec.ImportParameters(p); + + ECParameters temp = p; + temp.Q.X = null; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Q.X = new byte[] { }; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Q.X = new byte[1] { 0x10 }; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Q.X = (byte[])p.Q.X.Clone(); temp.Q.X[0]--; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + + temp = p; + temp.Q.Y = null; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Q.Y = new byte[] { }; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Q.Y = new byte[1] { 0x10 }; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + temp.Q.Y = (byte[])p.Q.Y.Clone(); temp.Q.Y[0]--; Assert.ThrowsAny(() => ec.ImportParameters(temp)); + + temp = p; temp.Curve = ECCurve.CreateFromOid(new Oid("Invalid", "Invalid")); Assert.ThrowsAny(() => ec.ImportParameters(temp)); + } + } + } + + [Fact] + public static void TestGeneralExportWithExplicitParameters() + { + if (!ECDiffieHellmanFactory.ExplicitCurvesSupported) + { + return; + } + + using (ECDiffieHellman ecdsa = ECDiffieHellmanFactory.Create()) + { + ECParameters param = EccTestData.GetNistP256ExplicitTestData(); + param.Validate(); + ecdsa.ImportParameters(param); + Assert.True(param.Curve.IsExplicit); + + param = ecdsa.ExportParameters(false); + param.Validate(); + + // We should have explicit values, not named, as this curve has no name. + Assert.True(param.Curve.IsExplicit); + } + } + + [Fact] + public static void TestExplicitCurveImportOnUnsupportedPlatform() + { + if (ECDiffieHellmanFactory.ExplicitCurvesSupported) + { + return; + } + + using (ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create()) + { + ECParameters param = EccTestData.GetNistP256ExplicitTestData(); + + Assert.Throws( + () => + { + try + { + ecdh.ImportParameters(param); + } + catch (CryptographicException e) + { + throw new PlatformNotSupportedException("Converting exception", e); + } + }); + } + } + + [ConditionalFact(nameof(ECDsa224Available))] + public static void TestNamedCurveWithExplicitKey() + { + if (!ECDiffieHellmanFactory.ExplicitCurvesSupported) + { + return; + } + + using (ECDiffieHellman ec = ECDiffieHellmanFactory.Create()) + { + ECParameters parameters = EccTestData.GetNistP224KeyTestData(); + ec.ImportParameters(parameters); + VerifyNamedCurve(parameters, ec, 224, true); + } + } + + [Fact] + public static void ExportIncludingPrivateOnPublicOnlyKey() + { + ECParameters iutParameters = new ECParameters + { + Curve = ECCurve.NamedCurves.nistP521, + Q = + { + X = "00d45615ed5d37fde699610a62cd43ba76bedd8f85ed31005fe00d6450fbbd101291abd96d4945a8b57bc73b3fe9f4671105309ec9b6879d0551d930dac8ba45d255".HexToByteArray(), + Y = "01425332844e592b440c0027972ad1526431c06732df19cd46a242172d4dd67c2c8c99dfc22e49949a56cf90c6473635ce82f25b33682fb19bc33bd910ed8ce3a7fa".HexToByteArray(), + }, + D = "00816f19c1fb10ef94d4a1d81c156ec3d1de08b66761f03f06ee4bb9dcebbbfe1eaa1ed49a6a990838d8ed318c14d74cc872f95d05d07ad50f621ceb620cd905cfb8".HexToByteArray(), + }; + + using (ECDiffieHellman iut = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellman cavs = ECDiffieHellmanFactory.Create()) + { + iut.ImportParameters(iutParameters); + cavs.ImportParameters(iut.ExportParameters(false)); + + Assert.ThrowsAny(() => cavs.ExportParameters(true)); + + if (ECDiffieHellmanFactory.ExplicitCurvesSupported) + { + Assert.ThrowsAny(() => cavs.ExportExplicitParameters(true)); + } + + using (ECDiffieHellmanPublicKey iutPublic = iut.PublicKey) + { + Assert.ThrowsAny(() => cavs.DeriveKeyFromHash(iutPublic, HashAlgorithmName.SHA256)); + } + } + } + + private static void VerifyNamedCurve(ECParameters parameters, ECDiffieHellman ec, int keySize, bool includePrivate) + { + parameters.Validate(); + Assert.True(parameters.Curve.IsNamed); + Assert.Equal(keySize, ec.KeySize); + Assert.True( + includePrivate && parameters.D.Length > 0 || + !includePrivate && parameters.D == null); + + if (includePrivate) + ec.Exercise(); + + // Ensure the key doesn't get regenerated after export + ECParameters paramSecondExport = ec.ExportParameters(includePrivate); + paramSecondExport.Validate(); + AssertEqual(parameters, paramSecondExport); + } + + private static void VerifyExplicitCurve(ECParameters parameters, ECDiffieHellman ec, CurveDef curveDef) + { + Assert.True(parameters.Curve.IsExplicit); + ECCurve curve = parameters.Curve; + + + Assert.True(curveDef.IsCurveTypeEqual(curve.CurveType)); + Assert.True( + curveDef.IncludePrivate && parameters.D.Length > 0 || + !curveDef.IncludePrivate && parameters.D == null); + Assert.Equal(curveDef.KeySize, ec.KeySize); + + Assert.Equal(curve.A.Length, parameters.Q.X.Length); + Assert.Equal(curve.A.Length, parameters.Q.Y.Length); + Assert.Equal(curve.A.Length, curve.B.Length); + Assert.Equal(curve.A.Length, curve.G.X.Length); + Assert.Equal(curve.A.Length, curve.G.Y.Length); + Assert.True(curve.Seed == null || curve.Seed.Length > 0); + Assert.True(curve.Order == null || curve.Order.Length > 0); + if (curve.IsPrime) + { + Assert.Equal(curve.A.Length, curve.Prime.Length); + } + + if (curveDef.IncludePrivate) + ec.Exercise(); + + // Ensure the key doesn't get regenerated after export + ECParameters paramSecondExport = ec.ExportExplicitParameters(curveDef.IncludePrivate); + AssertEqual(parameters, paramSecondExport); + } + } +#endif +} diff --git a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanTests.NistValidation.cs b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanTests.NistValidation.cs new file mode 100644 index 0000000000..2eddcda17e --- /dev/null +++ b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanTests.NistValidation.cs @@ -0,0 +1,233 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Tests; +using Test.Cryptography; +using Xunit; + +namespace System.Security.Cryptography.EcDiffieHellman.Tests +{ +#if netcoreapp + // These test cases are from http://csrc.nist.gov/groups/STM/cavp/component-testing.html#test-vectors + // SP 800-56A ECCCDH Primitive test vectors + // ecccdhtestvectors.zip + // KAS_ECC_CDH_PrimitiveTest.txt + public partial class ECDiffieHellmanTests + { + [Fact] + public static void ValidateNistP256_0() + { + Verify( + ECCurve.NamedCurves.nistP256, + EccTestData.GetNistP256ExplicitCurve(), + "700c48f77f56584c5cc632ca65640db91b6bacce3a4df6b42ce7cc838833d287", + "db71e509e3fd9b060ddb20ba5c51dcc5948d46fbf640dfe0441782cab85fa4ac", + "7d7dc5f71eb29ddaf80d6214632eeae03d9058af1fb6d22ed80badb62bc1a534", + "ead218590119e8876b29146ff89ca61770c4edbbf97d38ce385ed281d8a6b230", + "28af61281fd35e2fa7002523acc85a429cb06ee6648325389f59edfce1405141", + "46fc62106420ff012e54a434fbdd2d25ccc5852060561e68040dd7778997bd7b"); + } + + [Fact] + public static void ValidateNistP256_1() + { + Verify( + ECCurve.NamedCurves.nistP256, + EccTestData.GetNistP256ExplicitCurve(), + "809f04289c64348c01515eb03d5ce7ac1a8cb9498f5caa50197e58d43a86a7ae", + "b29d84e811197f25eba8f5194092cb6ff440e26d4421011372461f579271cda3", + "38f65d6dce47676044d58ce5139582d568f64bb16098d179dbab07741dd5caf5", + "119f2f047902782ab0c9e27a54aff5eb9b964829ca99c06b02ddba95b0a3f6d0", + "8f52b726664cac366fc98ac7a012b2682cbd962e5acb544671d41b9445704d1d", + "057d636096cb80b67a8c038c890e887d1adfa4195e9b3ce241c8a778c59cda67"); + } + + [Fact] + public static void ValidateNistP384_0() + { + Verify( + ECCurve.NamedCurves.nistP384, + EccTestData.GetNistP384ExplicitCurve(), + "a7c76b970c3b5fe8b05d2838ae04ab47697b9eaf52e764592efda27fe7513272734466b400091adbf2d68c58e0c50066", + "ac68f19f2e1cb879aed43a9969b91a0839c4c38a49749b661efedf243451915ed0905a32b060992b468c64766fc8437a", + "3cc3122a68f0d95027ad38c067916ba0eb8c38894d22e1b15618b6818a661774ad463b205da88cf699ab4d43c9cf98a1", + "9803807f2f6d2fd966cdd0290bd410c0190352fbec7ff6247de1302df86f25d34fe4a97bef60cff548355c015dbb3e5f", + "ba26ca69ec2f5b5d9dad20cc9da711383a9dbe34ea3fa5a2af75b46502629ad54dd8b7d73a8abb06a3a3be47d650cc99", + "5f9d29dc5e31a163060356213669c8ce132e22f57c9a04f40ba7fcead493b457e5621e766c40a2e3d4d6a04b25e533f1"); + } + + [Fact] + public static void ValidateNistP384_1() + { + Verify( + ECCurve.NamedCurves.nistP384, + EccTestData.GetNistP384ExplicitCurve(), + "30f43fcf2b6b00de53f624f1543090681839717d53c7c955d1d69efaf0349b7363acb447240101cbb3af6641ce4b88e0", + "25e46c0c54f0162a77efcc27b6ea792002ae2ba82714299c860857a68153ab62e525ec0530d81b5aa15897981e858757", + "92860c21bde06165f8e900c687f8ef0a05d14f290b3f07d8b3a8cc6404366e5d5119cd6d03fb12dc58e89f13df9cd783", + "ea4018f5a307c379180bf6a62fd2ceceebeeb7d4df063a66fb838aa35243419791f7e2c9d4803c9319aa0eb03c416b66", + "68835a91484f05ef028284df6436fb88ffebabcdd69ab0133e6735a1bcfb37203d10d340a8328a7b68770ca75878a1a6", + "a23742a2c267d7425fda94b93f93bbcc24791ac51cd8fd501a238d40812f4cbfc59aac9520d758cf789c76300c69d2ff"); + } + + [Fact] + public static void ValidateNistP521_0() + { + Verify( + ECCurve.NamedCurves.nistP521, + EccTestData.GetNistP521ExplicitCurve(), + "00685a48e86c79f0f0875f7bc18d25eb5fc8c0b07e5da4f4370f3a9490340854334b1e1b87fa395464c60626124a4e70d0f785601d37c09870ebf176666877a2046d", + "01ba52c56fc8776d9e8f5db4f0cc27636d0b741bbe05400697942e80b739884a83bde99e0f6716939e632bc8986fa18dccd443a348b6c3e522497955a4f3c302f676", + "017eecc07ab4b329068fba65e56a1f8890aa935e57134ae0ffcce802735151f4eac6564f6ee9974c5e6887a1fefee5743ae2241bfeb95d5ce31ddcb6f9edb4d6fc47", + "00602f9d0cf9e526b29e22381c203c48a886c2b0673033366314f1ffbcba240ba42f4ef38a76174635f91e6b4ed34275eb01c8467d05ca80315bf1a7bbd945f550a5", + "01b7c85f26f5d4b2d7355cf6b02117659943762b6d1db5ab4f1dbc44ce7b2946eb6c7de342962893fd387d1b73d7a8672d1f236961170b7eb3579953ee5cdc88cd2d", + "005fc70477c3e63bc3954bd0df3ea0d1f41ee21746ed95fc5e1fdf90930d5e136672d72cc770742d1711c3c3a4c334a0ad9759436a4d3c5bf6e74b9578fac148c831"); + } + + [Fact] + public static void ValidateNistP521_1() + { + Verify( + ECCurve.NamedCurves.nistP521, + EccTestData.GetNistP521ExplicitCurve(), + "01df277c152108349bc34d539ee0cf06b24f5d3500677b4445453ccc21409453aafb8a72a0be9ebe54d12270aa51b3ab7f316aa5e74a951c5e53f74cd95fc29aee7a", + "013d52f33a9f3c14384d1587fa8abe7aed74bc33749ad9c570b471776422c7d4505d9b0a96b3bfac041e4c6a6990ae7f700e5b4a6640229112deafa0cd8bb0d089b0", + "00816f19c1fb10ef94d4a1d81c156ec3d1de08b66761f03f06ee4bb9dcebbbfe1eaa1ed49a6a990838d8ed318c14d74cc872f95d05d07ad50f621ceb620cd905cfb8", + "00d45615ed5d37fde699610a62cd43ba76bedd8f85ed31005fe00d6450fbbd101291abd96d4945a8b57bc73b3fe9f4671105309ec9b6879d0551d930dac8ba45d255", + "01425332844e592b440c0027972ad1526431c06732df19cd46a242172d4dd67c2c8c99dfc22e49949a56cf90c6473635ce82f25b33682fb19bc33bd910ed8ce3a7fa", + "000b3920ac830ade812c8f96805da2236e002acbbf13596a9ab254d44d0e91b6255ebf1229f366fb5a05c5884ef46032c26d42189273ca4efa4c3db6bd12a6853759"); + } + + private static void Verify( + ECCurve namedCurve, + ECCurve explicitCurve, + string cavsQx, + string cavsQy, + string iutD, + string iutQx, + string iutQy, + string iutZ) + { + Assert.True(namedCurve.IsNamed, "namedCurve.IsNamed"); + Assert.True(explicitCurve.IsExplicit, "explicitCurve.IsExplicit"); + + ECParameters iutParameters = new ECParameters + { + Curve = namedCurve, + Q = + { + X = iutQx.HexToByteArray(), + Y = iutQy.HexToByteArray(), + }, + D = iutD.HexToByteArray(), + }; + + ECParameters cavsParameters = new ECParameters + { + Curve = namedCurve, + Q = + { + X = cavsQx.HexToByteArray(), + Y = cavsQy.HexToByteArray(), + }, + }; + + Verify(ref iutParameters, ref cavsParameters, explicitCurve, iutZ.HexToByteArray()); + } + + private static void Verify( + ref ECParameters iutParameters, + ref ECParameters cavsParameters, + ECCurve explicitCurve, + byte[] iutZ) + { + using (ECDiffieHellman iut = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellman cavs = ECDiffieHellmanFactory.Create()) + { + iut.ImportParameters(iutParameters); + cavs.ImportParameters(cavsParameters); + + using (ECDiffieHellmanPublicKey cavsPublic = cavs.PublicKey) + using (HashAlgorithm sha256 = SHA256.Create()) + using (HashAlgorithm sha384 = SHA384.Create()) + { + Verify(iut, cavsPublic, sha256, HashAlgorithmName.SHA256, iutZ); + Verify(iut, cavsPublic, sha384, HashAlgorithmName.SHA384, iutZ); + } + + if (ECDiffieHellmanFactory.ExplicitCurvesSupported) + { + iutParameters.Curve = explicitCurve; + iut.ImportParameters(iutParameters); + + // IUT is explicit, CAVS is named, but they're the same key. + // If this test ever starts throwing CryptographicException we can guard it. + // Support is entirely left up to the library. + // It was kind of surprising that it worked. + using (ECDiffieHellmanPublicKey cavsPublic = cavs.PublicKey) + using (HashAlgorithm sha256 = SHA256.Create()) + using (HashAlgorithm sha512 = SHA512.Create()) + { + bool trySecondCase = true; + + try + { + Verify(iut, cavsPublic, sha256, HashAlgorithmName.SHA256, iutZ); + } + catch (CryptographicException) + { + // This is expected to work on Windows. + // On Linux (via OpenSSL) it is less predictable, since it fails with + // EVP_PKEY_derive_set_peer:different parameters if one key uses + // the GFp_simple routines and another uses GFp_nist or GFp_mont (or, + // one presumes, something custom from an HSM) even if they actually + // represent the same curve. + // + // secp256r1 and secp521r1 both succeed this block, secp384r1 fails. + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + throw; + } + + trySecondCase = false; + } + + // If the first one failed, don't try the second. + // If the first one passed, the second should, too. + if (trySecondCase) + { + Verify(iut, cavsPublic, sha512, HashAlgorithmName.SHA512, iutZ); + } + } + + cavsParameters.Curve = explicitCurve; + cavs.ImportParameters(cavsParameters); + + // Explicit, explicit; over the same curve. + using (ECDiffieHellmanPublicKey cavsPublic = cavs.PublicKey) + using (HashAlgorithm sha384 = SHA384.Create()) + using (HashAlgorithm sha512 = SHA512.Create()) + { + Verify(iut, cavsPublic, sha384, HashAlgorithmName.SHA384, iutZ); + Verify(iut, cavsPublic, sha512, HashAlgorithmName.SHA512, iutZ); + } + } + } + } + + private static void Verify( + ECDiffieHellman iut, + ECDiffieHellmanPublicKey cavsPublic, + HashAlgorithm zHasher, + HashAlgorithmName zHashAlgorithm, + byte[] iutZ) + { + byte[] result = iut.DeriveKeyFromHash(cavsPublic, zHashAlgorithm); + byte[] hashedZ = zHasher.ComputeHash(iutZ); + Assert.Equal(hashedZ.ByteArrayToHex(), result.ByteArrayToHex()); + } + } +#endif +} diff --git a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanTests.Tls.cs b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanTests.Tls.cs new file mode 100644 index 0000000000..c11badb5d0 --- /dev/null +++ b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanTests.Tls.cs @@ -0,0 +1,213 @@ +// 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.Collections.Generic; +using System.Text; +using Test.Cryptography; +using Xunit; + +namespace System.Security.Cryptography.EcDiffieHellman.Tests +{ + public partial class ECDiffieHellmanTests + { + private static readonly byte[] s_fourByteLabel = new byte[4]; + private static readonly byte[] s_emptySeed = new byte[64]; + + [Fact] + public static void TlsDerivation_OtherKeyRequired() + { + using (ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create()) + { + Assert.Throws( + () => ecdh.DeriveKeyTls(null, s_fourByteLabel, s_emptySeed)); + } + } + + [Theory] + [MemberData(nameof(MismatchedKeysizes))] + public static void TlsDerivation_SameSizeOtherKeyRequired(int aliceSize, int bobSize) + { + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create(aliceSize)) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create(bobSize)) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + Assert.ThrowsAny( + () => alice.DeriveKeyTls(bobPublic, s_fourByteLabel, s_emptySeed)); + } + } + + [Fact] + public static void TlsRequiresLabel() + { + using (ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey publicKey = ecdh.PublicKey) + { + Assert.Throws( + () => ecdh.DeriveKeyTls(publicKey, null, s_emptySeed)); + } + } + + [Fact] + public static void TlsRequiresSeed() + { + using (ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey publicKey = ecdh.PublicKey) + { + Assert.Throws( + () => ecdh.DeriveKeyTls(publicKey, s_fourByteLabel, null)); + } + } + + [Theory] + [InlineData(0)] + [InlineData(63)] + [InlineData(65)] + public static void TlsRequiresSeed64(int seedSize) + { + byte[] seed = new byte[seedSize]; + + using (ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey publicKey = ecdh.PublicKey) + { + Assert.ThrowsAny( + () => ecdh.DeriveKeyTls(publicKey, s_fourByteLabel, seed)); + } + } + + [Theory] + [MemberData(nameof(EveryKeysize))] + public static void SymmetricDerivation_TlsPrf(int keySize) + { + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create(keySize)) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create(keySize)) + using (ECDiffieHellmanPublicKey alicePublic = alice.PublicKey) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyTls(bobPublic, s_fourByteLabel, s_emptySeed); + byte[] bobDerived = bob.DeriveKeyTls(alicePublic, s_fourByteLabel, s_emptySeed); + + Assert.Equal(aliceDerived, bobDerived); + } + } + + [Fact] + public static void TlsPrfDerivationIsStable() + { + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyTls(bobPublic, s_fourByteLabel, s_emptySeed); + byte[] aliceDerivedAgain = alice.DeriveKeyTls(bobPublic, s_fourByteLabel, s_emptySeed); + + Assert.Equal(aliceDerived, aliceDerivedAgain); + } + } + + [Theory] + [MemberData(nameof(EveryKeysize))] + public static void TlsPrfOutputIs48Bytes(int keySize) + { + using (ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create(keySize)) + using (ECDiffieHellmanPublicKey publicKey = ecdh.PublicKey) + { + byte[] derived = ecdh.DeriveKeyTls(publicKey, s_fourByteLabel, s_emptySeed); + + Assert.Equal(48, derived.Length); + } + } + + [Fact] + public static void TlsPrfVariesOnOtherKey() + { + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey alicePublic = alice.PublicKey) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyTls(bobPublic, s_fourByteLabel, s_emptySeed); + byte[] aliceSelfDerived = alice.DeriveKeyTls(alicePublic, s_fourByteLabel, s_emptySeed); + + // Alice and Alice is HASH(aaG) != HASH(abG) + // (Except for the fantastically small chance that Alice == Bob) + Assert.NotEqual(aliceDerived, aliceSelfDerived); + } + } + + [Fact] + public static void TlsPrfVariesOnLabel() + { + byte[] aliceLabel = s_fourByteLabel; + byte[] bobLabel = new byte[5]; + + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey alicePublic = alice.PublicKey) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyTls(bobPublic, aliceLabel, s_emptySeed); + byte[] bobDerived = bob.DeriveKeyTls(alicePublic, bobLabel, s_emptySeed); + + Assert.NotEqual(aliceDerived, bobDerived); + } + } + + [Fact] + public static void TlsPrfVariesOnSeed() + { + byte[] aliceSeed = s_emptySeed; + byte[] bobSeed = new byte[64]; + bobSeed[0] = 0x81; + + using (ECDiffieHellman alice = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellman bob = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey alicePublic = alice.PublicKey) + using (ECDiffieHellmanPublicKey bobPublic = bob.PublicKey) + { + byte[] aliceDerived = alice.DeriveKeyTls(bobPublic, s_fourByteLabel, aliceSeed); + byte[] bobDerived = bob.DeriveKeyTls(alicePublic, s_fourByteLabel, bobSeed); + + Assert.NotEqual(aliceDerived, bobDerived); + } + } + + public static IEnumerable TlsDerivationTestCases() + { + return new object[][] + { + new object[] + { + "slithy toves", + "3D5DCEF2B35E73523C34802175875CC241A966D2DEB89041540650478D300A70F822AF7F9D70A31BA4B67D100F4A1620", + }, + + new object[] + { + "Hello, World!", + "ED83A7CF14C6F1577FE7AD90F1D78D36AFF5D2612B78A70E5FD000660E4A3B00DFF9B7C118C29A3D32536A89A5481C00", + }, + }; + } + +#if netcoreapp + [Theory] + [MemberData(nameof(TlsDerivationTestCases))] + public static void TlsDerivation_KnownResults(string labelText, string answerHex) + { + byte[] label = Encoding.ASCII.GetBytes(labelText); + byte[] output; + + using (ECDiffieHellman ecdh = OpenKnownKey()) + { + using (ECDiffieHellmanPublicKey publicKey = ecdh.PublicKey) + { + output = ecdh.DeriveKeyTls(publicKey, label, s_emptySeed); + } + } + + Assert.Equal(answerHex, output.ByteArrayToHex()); + } +#endif + } +} diff --git a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanTests.Xml.cs b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanTests.Xml.cs new file mode 100644 index 0000000000..b16d3fdd98 --- /dev/null +++ b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanTests.Xml.cs @@ -0,0 +1,21 @@ +// 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 Xunit; + +namespace System.Security.Cryptography.EcDiffieHellman.Tests +{ + public partial class ECDiffieHellmanTests + { + [Fact] + public static void TestNotImplementedException() + { + using (ECDiffieHellman ec = ECDiffieHellmanFactory.Create()) + { + Assert.Throws(() => ec.FromXmlString(null)); + Assert.Throws(() => ec.ToXmlString(true)); + } + } + } +} \ No newline at end of file diff --git a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanTests.cs b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanTests.cs new file mode 100644 index 0000000000..56760dc886 --- /dev/null +++ b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDiffieHellmanTests.cs @@ -0,0 +1,158 @@ +// 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.Collections.Generic; +using System.Security.Cryptography.Tests; + +using Xunit; +using Test.Cryptography; + +namespace System.Security.Cryptography.EcDiffieHellman.Tests +{ + public partial class ECDiffieHellmanTests : EccTestBase + { + private static List s_everyKeysize; + private static List s_mismatchedKeysizes; + + public static IEnumerable EveryKeysize() + { + if (s_everyKeysize == null) + { + List everyKeysize = new List(); + + using (ECDiffieHellman defaultKeysize = ECDiffieHellmanFactory.Create()) + { + foreach (KeySizes keySizes in defaultKeysize.LegalKeySizes) + { + for (int size = keySizes.MinSize; size <= keySizes.MaxSize; size += keySizes.SkipSize) + { + everyKeysize.Add(new object[] { size }); + + if (keySizes.SkipSize == 0) + { + break; + } + } + } + } + + s_everyKeysize = everyKeysize; + } + + return s_everyKeysize; + } + + public static IEnumerable MismatchedKeysizes() + { + if (s_mismatchedKeysizes == null) + { + int firstSize = -1; + List mismatchedKeysizes = new List(); + + using (ECDiffieHellman defaultKeysize = ECDiffieHellmanFactory.Create()) + { + foreach (KeySizes keySizes in defaultKeysize.LegalKeySizes) + { + for (int size = keySizes.MinSize; size <= keySizes.MaxSize; size += keySizes.SkipSize) + { + if (firstSize == -1) + { + firstSize = size; + } + else if (size != firstSize) + { + mismatchedKeysizes.Add(new object[] { firstSize, size }); + } + + if (keySizes.SkipSize == 0) + { + break; + } + } + } + } + + s_mismatchedKeysizes = mismatchedKeysizes; + } + + return s_mismatchedKeysizes; + } + + [Theory] + [MemberData(nameof(EveryKeysize))] + public static void SupportsKeysize(int keySize) + { + using (ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create(keySize)) + { + Assert.Equal(keySize, ecdh.KeySize); + } + } + + [Theory] + [MemberData(nameof(EveryKeysize))] + public static void PublicKey_NotNull(int keySize) + { + using (ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create(keySize)) + using (ECDiffieHellmanPublicKey ecdhPubKey = ecdh.PublicKey) + { + Assert.NotNull(ecdhPubKey); + } + } + + [Fact] + public static void PublicKeyIsFactory() + { + using (ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey publicKey1 = ecdh.PublicKey) + using (ECDiffieHellmanPublicKey publicKey2 = ecdh.PublicKey) + { + Assert.NotSame(publicKey1, publicKey2); + } + } + +#if netcoreapp + private static ECDiffieHellman OpenKnownKey() + { + ECParameters ecParams = new ECParameters + { + Curve = ECCurve.NamedCurves.nistP521, + + Q = + { + X = ( + "014AACFCDA18F77EBF11DC0A2D394D3032E86C3AC0B5F558916361163EA6AD3DB27" + + "F6476D6C6E5D9C4A77BCCC5C0069D481718DACA3B1B13035AF5D246C4DC0CE0EA").HexToByteArray(), + + Y = ( + "00CA500F75537C782E027DE568F148334BF56F7E24C3830792236B5D20F7A33E998" + + "62B1744D2413E4C4AC29DBA42FC48D23AE5B916BED73997EC69B3911C686C5164").HexToByteArray(), + }, + + D = ( + "00202F9F5480723D1ACF15372CE0B99B6CC3E8772FFDDCF828EEEB314B3EAA35B19" + + "886AAB1E6871E548C261C7708BF561A4C373D3EED13F0749851F57B86DC049D71").HexToByteArray(), + }; + + ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create(); + ecdh.ImportParameters(ecParams); + return ecdh; + } +#endif + } + + internal static class EcdhTestExtensions + { + internal static void Exercise(this ECDiffieHellman e) + { + // Make a few calls on this to ensure we aren't broken due to bad/prematurely released handles. + int keySize = e.KeySize; + + using (ECDiffieHellmanPublicKey publicKey = e.PublicKey) + { + byte[] negotiated = e.DeriveKeyFromHash(publicKey, HashAlgorithmName.SHA256); + Assert.Equal(256 / 8, negotiated.Length); + } + } + } +} diff --git a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaImportExport.cs b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaImportExport.cs index 2703972da9..d8d0967c9e 100644 --- a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaImportExport.cs +++ b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaImportExport.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using Xunit; +using System.Security.Cryptography.Tests; using Test.Cryptography; namespace System.Security.Cryptography.EcDsa.Tests @@ -13,7 +14,7 @@ namespace System.Security.Cryptography.EcDsa.Tests [Fact] public static void DiminishedCoordsRoundtrip() { - ECParameters toImport = ECDsaTestData.GetNistP521DiminishedCoordsParameters(); + ECParameters toImport = EccTestData.GetNistP521DiminishedCoordsParameters(); ECParameters privateParams; ECParameters publicParams; @@ -29,6 +30,30 @@ namespace System.Security.Cryptography.EcDsa.Tests ComparePublicKey(toImport.Q, publicParams.Q); Assert.Null(publicParams.D); } + + [Fact] + [PlatformSpecific(TestPlatforms.Windows/* "parameters.Curve.Hash doesn't round trip on Unix." */)] + public static void ImportExplicitWithHashButNoSeed() + { + if (!ECDsaFactory.ExplicitCurvesSupported) + { + return; + } + + using (ECDsa ec = ECDsaFactory.Create()) + { + ECCurve curve = EccTestData.GetNistP256ExplicitCurve(); + Assert.NotNull(curve.Hash); + ec.GenerateKey(curve); + + ECParameters parameters = ec.ExportExplicitParameters(true); + Assert.NotNull(parameters.Curve.Hash); + parameters.Curve.Seed = null; + + ec.ImportParameters(parameters); + ec.Exercise(); + } + } [Theory] [MemberData(nameof(TestCurvesFull))] @@ -166,7 +191,7 @@ namespace System.Security.Cryptography.EcDsa.Tests { using (ECDsa ec = ECDsaFactory.Create()) { - ECParameters p = ECDsaTestData.GetNistP256ExplicitTestData(); + ECParameters p = EccTestData.GetNistP256ExplicitTestData(); Assert.True(p.Curve.IsPrime); ec.ImportParameters(p); @@ -214,7 +239,7 @@ namespace System.Security.Cryptography.EcDsa.Tests { using(ECDsa ec = ECDsaFactory.Create()) { - ECParameters p = ECDsaTestData.GetNistP224KeyTestData(); + ECParameters p = EccTestData.GetNistP224KeyTestData(); Assert.True(p.Curve.IsNamed); var q = p.Q; var c = p.Curve; @@ -242,7 +267,7 @@ namespace System.Security.Cryptography.EcDsa.Tests { using (ECDsa ecdsa = ECDsaFactory.Create()) { - ECParameters param = ECDsaTestData.GetNistP256ExplicitTestData(); + ECParameters param = EccTestData.GetNistP256ExplicitTestData(); param.Validate(); ecdsa.ImportParameters(param); Assert.True(param.Curve.IsExplicit); @@ -260,13 +285,13 @@ namespace System.Security.Cryptography.EcDsa.Tests { using (ECDsa ec = ECDsaFactory.Create()) { - ECParameters parameters = ECDsaTestData.GetNistP224KeyTestData(); + ECParameters parameters = EccTestData.GetNistP224KeyTestData(); ec.ImportParameters(parameters); VerifyNamedCurve(parameters, ec, 224, true); } } - [ConditionalFact(nameof(ECExplicitCurvesSupported))] + [Fact] public static void ExportIncludingPrivateOnPublicOnlyKey() { ECParameters iutParameters = new ECParameters @@ -286,9 +311,12 @@ namespace System.Security.Cryptography.EcDsa.Tests iut.ImportParameters(iutParameters); cavs.ImportParameters(iut.ExportParameters(false)); - // Linux throws an Interop.Crypto.OpenSslCryptographicException : CryptographicException - Assert.ThrowsAny(() => cavs.ExportExplicitParameters(true)); Assert.ThrowsAny(() => cavs.ExportParameters(true)); + + if (ECExplicitCurvesSupported) + { + Assert.ThrowsAny(() => cavs.ExportExplicitParameters(true)); + } } } diff --git a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTests.NistValidation.cs b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTests.NistValidation.cs index 4156395a51..3fc5629526 100644 --- a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTests.NistValidation.cs +++ b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTests.NistValidation.cs @@ -2,13 +2,9 @@ // 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.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using Xunit; - +using System.Security.Cryptography.Tests; using Test.Cryptography; +using Xunit; namespace System.Security.Cryptography.EcDsa.Tests { @@ -49,7 +45,7 @@ namespace System.Security.Cryptography.EcDsa.Tests Validate( parameters, - ECDsaTestData.GetNistP256ExplicitCurve(), + EccTestData.GetNistP256ExplicitCurve(), msg, signature, HashAlgorithmName.SHA256); @@ -85,7 +81,7 @@ namespace System.Security.Cryptography.EcDsa.Tests Validate( parameters, - ECDsaTestData.GetNistP256ExplicitCurve(), + EccTestData.GetNistP256ExplicitCurve(), msg, signature, HashAlgorithmName.SHA384); @@ -124,7 +120,7 @@ namespace System.Security.Cryptography.EcDsa.Tests Validate( parameters, - ECDsaTestData.GetNistP384ExplicitCurve(), + EccTestData.GetNistP384ExplicitCurve(), msg, signature, HashAlgorithmName.SHA256); @@ -163,7 +159,7 @@ namespace System.Security.Cryptography.EcDsa.Tests Validate( parameters, - ECDsaTestData.GetNistP384ExplicitCurve(), + EccTestData.GetNistP384ExplicitCurve(), msg, signature, HashAlgorithmName.SHA512); @@ -204,7 +200,7 @@ namespace System.Security.Cryptography.EcDsa.Tests Validate( parameters, - ECDsaTestData.GetNistP521ExplicitCurve(), + EccTestData.GetNistP521ExplicitCurve(), msg, signature, HashAlgorithmName.SHA384); @@ -245,7 +241,7 @@ namespace System.Security.Cryptography.EcDsa.Tests Validate( parameters, - ECDsaTestData.GetNistP521ExplicitCurve(), + EccTestData.GetNistP521ExplicitCurve(), msg, signature, HashAlgorithmName.SHA512); diff --git a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTests.cs b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTests.cs index d0111b23f3..899b90716f 100644 --- a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTests.cs +++ b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTests.cs @@ -35,8 +35,8 @@ namespace System.Security.Cryptography.EcDsa.Tests AssertExtensions.Throws("hashAlgorithm", () => ecdsa.SignData(new byte[0], 0, 0, default(HashAlgorithmName))); AssertExtensions.Throws("hashAlgorithm", () => ecdsa.SignData(new byte[10], 0, 10, new HashAlgorithmName(""))); - Assert.Throws(() => ecdsa.SignData(new byte[0], new HashAlgorithmName(Guid.NewGuid().ToString("N")))); - Assert.Throws(() => ecdsa.SignData(new byte[0], 0, 0, new HashAlgorithmName(Guid.NewGuid().ToString("N")))); + Assert.ThrowsAny(() => ecdsa.SignData(new byte[0], new HashAlgorithmName(Guid.NewGuid().ToString("N")))); + Assert.ThrowsAny(() => ecdsa.SignData(new byte[0], 0, 0, new HashAlgorithmName(Guid.NewGuid().ToString("N")))); } [Theory, MemberData(nameof(RealImplementations))] @@ -59,8 +59,8 @@ namespace System.Security.Cryptography.EcDsa.Tests AssertExtensions.Throws("hashAlgorithm", () => ecdsa.VerifyData(new byte[10], new byte[0], new HashAlgorithmName(""))); AssertExtensions.Throws("hashAlgorithm", () => ecdsa.VerifyData(new byte[10], 0, 10, new byte[0], new HashAlgorithmName(""))); - Assert.Throws(() => ecdsa.VerifyData(new byte[0], new byte[0], new HashAlgorithmName(Guid.NewGuid().ToString("N")))); - Assert.Throws(() => ecdsa.VerifyData(new byte[0], 0, 0, new byte[0], new HashAlgorithmName(Guid.NewGuid().ToString("N")))); + Assert.ThrowsAny(() => ecdsa.VerifyData(new byte[0], new byte[0], new HashAlgorithmName(Guid.NewGuid().ToString("N")))); + Assert.ThrowsAny(() => ecdsa.VerifyData(new byte[0], 0, 0, new byte[0], new HashAlgorithmName(Guid.NewGuid().ToString("N")))); } [Theory, MemberData(nameof(RealImplementations))] @@ -100,7 +100,7 @@ namespace System.Security.Cryptography.EcDsa.Tests { AssertExtensions.Throws("data", () => ecdsa.SignData((Stream)null, default(HashAlgorithmName))); AssertExtensions.Throws("hashAlgorithm", () => ecdsa.SignData(new MemoryStream(), default(HashAlgorithmName))); - Assert.Throws(() => ecdsa.SignData(new MemoryStream(), new HashAlgorithmName(Guid.NewGuid().ToString("N")))); + Assert.ThrowsAny(() => ecdsa.SignData(new MemoryStream(), new HashAlgorithmName(Guid.NewGuid().ToString("N")))); } [Theory, MemberData(nameof(RealImplementations))] @@ -110,7 +110,7 @@ namespace System.Security.Cryptography.EcDsa.Tests AssertExtensions.Throws("signature", () => ecdsa.VerifyData(new MemoryStream(), null, default(HashAlgorithmName))); AssertExtensions.Throws("hashAlgorithm", () => ecdsa.VerifyData(new MemoryStream(), new byte[0], default(HashAlgorithmName))); AssertExtensions.Throws("hashAlgorithm", () => ecdsa.VerifyData(new MemoryStream(), new byte[0], new HashAlgorithmName(""))); - Assert.Throws(() => ecdsa.VerifyData(new MemoryStream(), new byte[0], new HashAlgorithmName(Guid.NewGuid().ToString("N")))); + Assert.ThrowsAny(() => ecdsa.VerifyData(new MemoryStream(), new byte[0], new HashAlgorithmName(Guid.NewGuid().ToString("N")))); } } diff --git a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTests.netcoreapp.cs b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTests.netcoreapp.cs index 9b464840e5..acf3da9ec5 100644 --- a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTests.netcoreapp.cs +++ b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTests.netcoreapp.cs @@ -2,6 +2,7 @@ // 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.Security.Cryptography.Tests; using Xunit; namespace System.Security.Cryptography.EcDsa.Tests @@ -19,7 +20,7 @@ namespace System.Security.Cryptography.EcDsa.Tests { AssertExtensions.Throws("hashAlgorithm", () => ecdsa.TrySignData(ReadOnlySpan.Empty, Span.Empty, new HashAlgorithmName(null), out int bytesWritten)); AssertExtensions.Throws("hashAlgorithm", () => ecdsa.TrySignData(ReadOnlySpan.Empty, Span.Empty, new HashAlgorithmName(""), out int bytesWritten)); - Assert.Throws(() => ecdsa.TrySignData(ReadOnlySpan.Empty, Span.Empty, new HashAlgorithmName(Guid.NewGuid().ToString("N")), out int bytesWritten)); + Assert.ThrowsAny(() => ecdsa.TrySignData(ReadOnlySpan.Empty, Span.Empty, new HashAlgorithmName(Guid.NewGuid().ToString("N")), out int bytesWritten)); } [Theory, MemberData(nameof(RealImplementations))] @@ -27,7 +28,7 @@ namespace System.Security.Cryptography.EcDsa.Tests { AssertExtensions.Throws("hashAlgorithm", () => ecdsa.VerifyData(ReadOnlySpan.Empty, ReadOnlySpan.Empty, new HashAlgorithmName(null))); AssertExtensions.Throws("hashAlgorithm", () => ecdsa.VerifyData(ReadOnlySpan.Empty, ReadOnlySpan.Empty, new HashAlgorithmName(""))); - Assert.Throws(() => ecdsa.VerifyData(ReadOnlySpan.Empty, Span.Empty, new HashAlgorithmName(Guid.NewGuid().ToString("N")))); + Assert.ThrowsAny(() => ecdsa.VerifyData(ReadOnlySpan.Empty, Span.Empty, new HashAlgorithmName(Guid.NewGuid().ToString("N")))); } private static byte[] TryWithOutputArray(Func func) @@ -247,7 +248,7 @@ namespace System.Security.Cryptography.EcDsa.Tests { using (ECDsa ecdsa = ECDsaFactory.Create()) { - ecdsa.ImportParameters(ECDsaTestData.GetNistP256ExplicitTestData()); + ecdsa.ImportParameters(EccTestData.GetNistP256ExplicitTestData()); Verify256(ecdsa, true); } } diff --git a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTestsBase.cs b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTestsBase.cs index 9be0ff93e3..eb8d3833b2 100644 --- a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTestsBase.cs +++ b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTestsBase.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; +using System.Security.Cryptography.Tests; using Test.Cryptography; using Xunit; @@ -12,229 +13,14 @@ namespace System.Security.Cryptography.EcDsa.Tests /// /// Input and helper methods for ECDsa /// - public abstract class ECDsaTestsBase + public abstract class ECDsaTestsBase : EccTestBase { #if netcoreapp - internal const string ECDSA_P224_OID_VALUE = "1.3.132.0.33"; // Also called nistP224 or secP224r1 - internal const string ECDSA_P256_OID_VALUE = "1.2.840.10045.3.1.7"; // Also called nistP256, secP256r1 or prime256v1(OpenSsl) - internal const string ECDSA_P384_OID_VALUE = "1.3.132.0.34"; // Also called nistP384 or secP384r1 - internal const string ECDSA_P521_OID_VALUE = "1.3.132.0.35"; // Also called nistP521 or secP521r1 - internal const string ECDSA_Sect193r1_OID_VALUE = "1.3.132.0.24"; //Char-2 curve - - public static IEnumerable TestCurvesFull - { - get - { - var curveDefs = - from curveDef in TestCurvesRaw - where curveDef.IsCurveValidOnPlatform == true - select curveDef; - - foreach (CurveDef cd in curveDefs) - yield return new[] { cd }; - - // return again with IncludePrivate = true - foreach (CurveDef cd in curveDefs) - { - cd.IncludePrivate = true; - yield return new[] { cd }; - } - } - } - - public static IEnumerable TestCurves - { - get - { - var curveDefs = - from curveDef in TestCurvesRaw - where curveDef.IsCurveValidOnPlatform == true - select curveDef; - - foreach (CurveDef curveDef in curveDefs) - yield return new[] { curveDef }; - } - } - - public static IEnumerable TestInvalidCurves - { - get - { - var curveDefs = - from curveDef in TestCurvesRaw - where curveDef.IsCurveValidOnPlatform == false - select curveDef; - - foreach (CurveDef curveDef in curveDefs) - yield return new[] { curveDef }; - } - } - - public static IEnumerable TestNewCurves - { - get - { - var curveDefs = - from curveDef in TestCurvesRaw - where - curveDef.IsCurveValidOnPlatform == true && - curveDef.RequiredOnPlatform == false - select curveDef; - - foreach (CurveDef curveDef in curveDefs) - yield return new[] { curveDef }; - } - } - - private static IEnumerable TestCurvesRaw - { - get - { - // nistP* curves - yield return new CurveDef() - { - Curve = ECCurve.NamedCurves.nistP256, // also secp256r1 - KeySize = 256, - CurveType = ECCurve.ECCurveType.PrimeShortWeierstrass, - RequiredOnPlatform = true, - }; - yield return new CurveDef() - { - Curve = ECCurve.NamedCurves.nistP384, // also secp384r1 - KeySize = 384, - CurveType = ECCurve.ECCurveType.PrimeMontgomery, - RequiredOnPlatform = true, - }; - yield return new CurveDef() - { - Curve = ECCurve.NamedCurves.nistP521, // also secp521r1 - KeySize = 521, - CurveType = ECCurve.ECCurveType.PrimeShortWeierstrass, - RequiredOnPlatform = true, - }; - yield return new CurveDef() - { - Curve = ECCurve.NamedCurves.brainpoolP160r1, - KeySize = 160, - CurveType = ECCurve.ECCurveType.PrimeShortWeierstrass - }; - yield return new CurveDef() - { - Curve = ECCurve.CreateFromOid(new Oid("1.3.132.0.24", "")), // sect193r1 - KeySize = 193, - CurveType = ECCurve.ECCurveType.Characteristic2, - }; - yield return new CurveDef() - { - Curve = ECCurve.CreateFromOid(new Oid("1.2.840.10045.3.0.1", "")), // c2pnb163v1 - KeySize = 163, - CurveType = ECCurve.ECCurveType.Characteristic2, - }; - yield return new CurveDef() - { - Curve = ECCurve.CreateFromOid(new Oid("1.3.132.0.16", "")), // sect283k1 - KeySize = 283, - CurveType = ECCurve.ECCurveType.Characteristic2, - }; - yield return new CurveDef() - { - Curve = ECCurve.CreateFromOid(new Oid("1.3.132.0.17", "")), // sect283r1 - KeySize = 283, - CurveType = ECCurve.ECCurveType.Characteristic2, - }; - yield return new CurveDef() - { - Curve = ECCurve.CreateFromOid(new Oid("", "wap-wsg-idm-ecid-wtls7")), - KeySize = 160, - CurveType = ECCurve.ECCurveType.PrimeMontgomery, - }; - yield return new CurveDef() - { - Curve = ECCurve.CreateFromOid(new Oid("invalid", "invalid")), - KeySize = 160, - CurveType = ECCurve.ECCurveType.PrimeShortWeierstrass, - }; - yield return new CurveDef - { - Curve = ECDsaTestData.GetNistP256ExplicitCurve(), - KeySize = 256, - CurveType = ECCurve.ECCurveType.PrimeShortWeierstrass, - DisplayName = "NIST P-256", - }; - } - } - - internal static void AssertEqual(ECParameters p1, ECParameters p2) - { - ComparePrivateKey(p1, p2); - ComparePublicKey(p1.Q, p2.Q); - CompareCurve(p1.Curve, p2.Curve); - } - - internal static void ComparePrivateKey(ECParameters p1, ECParameters p2, bool isEqual = true) - { - if (isEqual) - { - Assert.Equal(p1.D, p2.D); - } - else - { - Assert.NotEqual(p1.D, p2.D); - } - } - - internal static void ComparePublicKey(ECPoint q1, ECPoint q2, bool isEqual = true) - { - if (isEqual) - { - Assert.Equal(q1.X, q2.X); - Assert.Equal(q1.Y, q2.Y); - } - else - { - Assert.NotEqual(q1.X, q2.X); - Assert.NotEqual(q1.Y, q2.Y); - } - } - - internal static void CompareCurve(ECCurve c1, ECCurve c2) - { - if (c1.IsNamed) - { - Assert.True(c2.IsNamed); - Assert.Equal(c1.Oid.FriendlyName, c2.Oid.FriendlyName); - } - else if (c1.IsExplicit) - { - Assert.True(c2.IsExplicit); - Assert.Equal(c1.A, c2.A); - Assert.Equal(c1.B, c2.B); - Assert.Equal(c1.CurveType, c2.CurveType); - Assert.Equal(c1.G.X, c2.G.X); - Assert.Equal(c1.G.Y, c2.G.Y); - Assert.Equal(c1.Cofactor, c2.Cofactor); - Assert.Equal(c1.Order, c2.Order); - Assert.Equal(c1.Seed, c2.Seed); - Assert.Equal(c1.Hash, c2.Hash); - - if (c1.IsPrime) - { - Assert.True(c2.IsPrime); - Assert.Equal(c1.Prime, c2.Prime); - } - else if (c1.IsCharacteristic2) - { - Assert.True(c2.IsCharacteristic2); - Assert.Equal(c1.Polynomial, c2.Polynomial); - } - } - } - internal static void Verify256(ECDsa e, bool expected) { byte[] sig = ("998791331eb2e1f4259297f5d9cb82fa20dec98e1cb0900e6b8f014a406c3d02cbdbf5238bde471c3155fc25565524301429" + "d8713dad9a67eb0a5c355e9e23dc").HexToByteArray(); - bool verified = e.VerifyHash(ECDsaTestData.s_hashSha512, sig); + bool verified = e.VerifyHash(EccTestData.s_hashSha512, sig); Assert.Equal(expected, verified); } diff --git a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs index b47b8df020..513f28e177 100644 --- a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs +++ b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Test.Cryptography; using Xunit; namespace System.Security.Cryptography.Rsa.Tests @@ -26,6 +27,7 @@ namespace System.Security.Cryptography.Rsa.Tests public abstract class EncryptDecrypt { + public static bool SupportsSha2Oaep => RSAFactory.SupportsSha2Oaep; private static bool EphemeralKeysAreExportable => !PlatformDetection.IsFullFramework || PlatformDetection.IsNetfx462OrNewer; protected abstract byte[] Encrypt(RSA rsa, byte[] data, RSAEncryptionPadding padding); @@ -36,8 +38,8 @@ namespace System.Security.Cryptography.Rsa.Tests { using (RSA rsa = RSAFactory.Create()) { - AssertExtensions.Throws("padding", () => Encrypt(rsa, new byte[1], null)); - AssertExtensions.Throws("padding", () => Decrypt(rsa, new byte[1], null)); + AssertExtensions.Throws("padding", () => Encrypt(rsa, TestData.HelloBytes, null)); + AssertExtensions.Throws("padding", () => Decrypt(rsa, TestData.HelloBytes, null)); } } @@ -114,6 +116,41 @@ namespace System.Security.Cryptography.Rsa.Tests } } + [Fact] + public void DecryptSavedAnswer_OaepSHA256() + { + byte[] cipherBytes = ( + "3ED1D2DCFBD1778D1B1F20C2CC4FD364D7236ACB6DBD7109CE9C44F6DA8D47A4" + + "53C36A3D4E8E87168CD1E5427A6C261F87CDC5A62507AF6127D1C5D274D5EECD" + + "50DC53C559FC85624D9FB999ADDD9BE5652926440A3DE32CA27554F524C30A7A" + + "E66215FE725F5998FB2AFD2E1E5F06F2944B61502A27272660A21363F35C3DC8" + + "8ED072096391B27D27BE5E1775F949A3A5C9C2903794090CE8D9DFE7003A4745" + + "E7029B0D4C0F6FD28E9886227E05B56D6BB0BA2933126C808EE0D972054A26DB" + + "2CA97B09967B2B6D7592F2563302111DE2FC42ED442522CD83A1AE9E8C3F0B1A" + + "9D50A4A89008D2135E0D8BC859F81CEF76166834432B4AE9BAAD1FC08E4C2C70").HexToByteArray(); + + byte[] output; + + using (RSA rsa = RSAFactory.Create()) + { + rsa.ImportParameters(TestData.RSA2048Params); + + if (RSAFactory.SupportsSha2Oaep) + { + output = Decrypt(rsa, cipherBytes, RSAEncryptionPadding.OaepSHA256); + } + else + { + Assert.ThrowsAny( + () => Decrypt(rsa, cipherBytes, RSAEncryptionPadding.OaepSHA256)); + + return; + } + } + + Assert.Equal(TestData.RSA2048Params.InverseQ, output); + } + [Fact] public void DecryptSavedAnswer_OaepSHA384() { @@ -175,6 +212,41 @@ namespace System.Security.Cryptography.Rsa.Tests Assert.Equal(TestData.RSA2048Params.DP, output); } + [Fact] + public void DecryptSavedAnswer_OaepSHA512() + { + byte[] cipherBytes = ( + "7F0598C7257433FCDEF3F6C0AE69517D3AA6B4FD67D7F4C25F9A5996D20843AF" + + "E14C21D35D4D289CE4E720A1C9D998C9F95AFB73E523F5EA4B54D0BAE9B5665C" + + "B0A5F5719F5466A491FDB5B323F6B741CF7E0C263D1274959AD87B64B789F7EC" + + "6E52085954B59F7A3EBE6295EB7F168E8DADB49F166B4CB753F0D2774370D3E2" + + "D5B9F6493D7EEA65AA7BD8867313C13850CB2F2D7CCF46E553BEBDADA6060C14" + + "CC43AE238410167BC42FDE9DA07D135C0D2DB48537299DC067A808CCBA2B0B0A" + + "7A741705DA98872A7416610939DE4E2D4C387662ABD74D80E33502AFF1D571DB" + + "B874CA25CC54CEE69B6252B33BA92119873E0F8B5CCE0496324904A7847D73FB").HexToByteArray(); + + byte[] output; + + using (RSA rsa = RSAFactory.Create()) + { + rsa.ImportParameters(TestData.RSA2048Params); + + if (RSAFactory.SupportsSha2Oaep) + { + output = Decrypt(rsa, cipherBytes, RSAEncryptionPadding.OaepSHA512); + } + else + { + Assert.ThrowsAny( + () => Decrypt(rsa, cipherBytes, RSAEncryptionPadding.OaepSHA512)); + + return; + } + } + + Assert.Equal(TestData.RSA1032Parameters.DQ, output); + } + [Fact] public void DecryptSavedAnswerUnusualExponent() { @@ -210,21 +282,308 @@ namespace System.Security.Cryptography.Rsa.Tests } [Fact] - public void RsaCryptRoundtrip() + public void RsaCryptRoundtrip_OaepSHA1() => RsaCryptRoundtrip(RSAEncryptionPadding.OaepSHA1); + + [Fact] + public void RsaCryptRoundtrip_OaepSHA256() => + RsaCryptRoundtrip(RSAEncryptionPadding.OaepSHA256, RSAFactory.SupportsSha2Oaep); + + [Fact] + public void RsaCryptRoundtrip_OaepSHA384() => + RsaCryptRoundtrip(RSAEncryptionPadding.OaepSHA384, RSAFactory.SupportsSha2Oaep); + + [Fact] + public void RsaCryptRoundtrip_OaepSHA512() => + RsaCryptRoundtrip(RSAEncryptionPadding.OaepSHA512, RSAFactory.SupportsSha2Oaep); + + private void RsaCryptRoundtrip(RSAEncryptionPadding paddingMode, bool expectSuccess=true) { byte[] crypt; byte[] output; - using (RSA rsa = RSAFactory.Create()) + using (RSA rsa = RSAFactory.Create(2048)) { - crypt = Encrypt(rsa, TestData.HelloBytes, RSAEncryptionPadding.OaepSHA1); - output = Decrypt(rsa, crypt, RSAEncryptionPadding.OaepSHA1); + if (!expectSuccess) + { + Assert.ThrowsAny( + () => Encrypt(rsa, TestData.HelloBytes, paddingMode)); + + return; + } + + crypt = Encrypt(rsa, TestData.HelloBytes, paddingMode); + output = Decrypt(rsa, crypt, paddingMode); } Assert.NotEqual(crypt, output); Assert.Equal(TestData.HelloBytes, output); } + [Fact] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void RoundtripEmptyArray() + { + using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params)) + { + void RoundtripEmpty(RSAEncryptionPadding paddingMode) + { + byte[] encrypted = Encrypt(rsa, Array.Empty(), paddingMode); + byte[] decrypted = Decrypt(rsa, encrypted, paddingMode); + + Assert.Equal(Array.Empty(), decrypted); + } + + RoundtripEmpty(RSAEncryptionPadding.Pkcs1); + RoundtripEmpty(RSAEncryptionPadding.OaepSHA1); + + if (RSAFactory.SupportsSha2Oaep) + { + RoundtripEmpty(RSAEncryptionPadding.OaepSHA256); + RoundtripEmpty(RSAEncryptionPadding.OaepSHA384); + RoundtripEmpty(RSAEncryptionPadding.OaepSHA512); + } + } + } + + [Fact] + public void RsaPkcsEncryptMaxSize() + { + RSAParameters rsaParameters = TestData.RSA2048Params; + + using (RSA rsa = RSAFactory.Create(rsaParameters)) + { + RSAEncryptionPadding paddingMode1 = RSAEncryptionPadding.Pkcs1; + // The overhead required is 8 + 3 => 11. + + const int Pkcs1Overhead = 11; + int maxSize = rsaParameters.Modulus.Length - Pkcs1Overhead; + + byte[] data = new byte[maxSize]; + byte[] encrypted = Encrypt(rsa, data, paddingMode1); + byte[] decrypted = Decrypt(rsa, encrypted, paddingMode1); + + Assert.Equal(data.ByteArrayToHex(), decrypted.ByteArrayToHex()); + + data = new byte[maxSize + 1]; + + Assert.ThrowsAny( + () => Encrypt(rsa, data, paddingMode1)); + } + } + + [Fact] + public void RsaOaepMaxSize() + { + RSAParameters rsaParameters = TestData.RSA2048Params; + + using (RSA rsa = RSAFactory.Create(rsaParameters)) + { + void Test(RSAEncryptionPadding paddingMode, int hashSizeInBits) + { + // The overhead required is hLen + hLen + 2. + int hLen = (hashSizeInBits + 7) / 8; + int overhead = hLen + hLen + 2; + int maxSize = rsaParameters.Modulus.Length - overhead; + + byte[] data = new byte[maxSize]; + byte[] encrypted = Encrypt(rsa, data, paddingMode); + byte[] decrypted = Decrypt(rsa, encrypted, paddingMode); + + Assert.Equal(data.ByteArrayToHex(), decrypted.ByteArrayToHex()); + + data = new byte[maxSize + 1]; + + Assert.ThrowsAny( + () => Encrypt(rsa, data, paddingMode)); + } + + Test(RSAEncryptionPadding.OaepSHA1, 160); + + if (RSAFactory.SupportsSha2Oaep) + { + Test(RSAEncryptionPadding.OaepSHA256, 256); + Test(RSAEncryptionPadding.OaepSHA384, 384); + Test(RSAEncryptionPadding.OaepSHA512, 512); + } + } + } + + [Fact] + public void RsaDecryptOaep_ExpectFailure() + { + // This particular byte pattern, when decrypting under OAEP-SHA-2-384 has + // an 0x01 in the correct range, and y=0, but lHash and lHashPrime do not agree + byte[] encrypted = ( + "2A1914D11E2F6B9E286DAC9D76F32A008EC31457522CEA058D7C48C85085899F" + + "E9C2DBD4FCA5FAD936F2B747E0BEF131217F8521FA921DF807A83C1B34DB1547" + + "8D637EDFED222B6411C80D465332B2EE5208F87D4F8D1736FEBC291E14E77C4B" + + "75A1F06B5124F225F310BFFA83BCA9F11101BA67A64109C37F52BF00B84FFD9A" + + "D39282AD2BA9EEADADA0FE38998755B556B152EE8974F2C8158ACFA5F509DD4A" + + "BFE72218C0DF596DFF02C332F45ECC04280455F5D2666E93A3522BB8B41FC92E" + + "0176AFB1D3A5AE474B708B882ACA88447046E13D44E5EA8D66421DFC177A683B" + + "7B395F18886AAFD9CED072079739ED1D390354976D188C50A29AAD58784886E6").HexToByteArray(); + + using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params)) + { + Assert.ThrowsAny( + () => Decrypt(rsa, encrypted, RSAEncryptionPadding.OaepSHA384)); + } + } + + [ConditionalFact(nameof(SupportsSha2Oaep))] + public void RsaDecryptOaepWrongAlgorithm() + { + using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params)) + { + byte[] data = TestData.HelloBytes; + byte[] encrypted = Encrypt(rsa, data, RSAEncryptionPadding.OaepSHA256); + + Assert.ThrowsAny( + () => Decrypt(rsa, encrypted, RSAEncryptionPadding.OaepSHA384)); + } + } + + [Fact] + public void RsaDecryptOaepWrongData() + { + using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params)) + { + byte[] data = TestData.HelloBytes; + byte[] encrypted = Encrypt(rsa, data, RSAEncryptionPadding.OaepSHA1); + encrypted[1] ^= 0xFF; + + Assert.ThrowsAny( + () => Decrypt(rsa, encrypted, RSAEncryptionPadding.OaepSHA1)); + + if (RSAFactory.SupportsSha2Oaep) + { + encrypted = Encrypt(rsa, data, RSAEncryptionPadding.OaepSHA256); + encrypted[1] ^= 0xFF; + + Assert.ThrowsAny( + () => Decrypt(rsa, encrypted, RSAEncryptionPadding.OaepSHA256)); + } + } + } + + [Fact] + public void RsaDecryptPkcs1LeadingZero() + { + // The first search for an encrypted value with a leading 0x00 turned up one with + // two leading zeros. How fortuitous. + byte[] encrypted = ( + "0000B81E93CB9BA2B096DAC80ADC0C053D15CAD79A09D3DC154E3E75E0F59AF0" + + "D0816C0946946A56FEAEDB951A49C3854966C01C47A9F54DE2A050C1625869FE" + + "02BAD7AA427C42FE79D31267AE8713504CBBBBFA28EED0DF3E9F5BFC12C8A701" + + "382E92BC50D7E9E9897AEBDDA8005B7906AE1ABAFFD30CF5A8733CAB7264445A" + + "333730EA31F5F9F120B4B59F689BA529E106DA78340678C3BA2CE46427375A84" + + "9E86950FC18BD1D6C33508596BAEF0D916F0E29D647C037022753B1E8E44ABCF" + + "0079CEFA8972F02D05C4204078BD9ADF98571CE5374AB94BF01918F0EA31A815" + + "59F065A4C3FA0DD0E3086530608CA54387F86F25ED77D46C7576376B64BE3C91").HexToByteArray(); + + using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params)) + { + byte[] decrypted = Decrypt(rsa, encrypted, RSAEncryptionPadding.Pkcs1); + Assert.Equal(TestData.HelloBytes, decrypted); + } + } + + [Fact] + public void RsaDecryptPkcs1Deficient() + { + // This value is gibberish, but it happens to be true that if it is preceded + // with 0x00 it happens to pass a PKCS1 encryption padding sanity test with the + // RSA2048Params key. + // + // If instead of prepending a 0x00 one appended 0x4B, it would decrypt to "Hello". + byte[] encrypted = ( + "7EF2A69BBCF5B29A19DF6698B8BAB5EC4D9DF1D8CAA27D7D1BF60D560DB7D79D" + + "020C85620657F2A32C872EE44DB604FAFFF792A886BEF2E142A2DB0379C5C57D" + + "D444D2065A7976A6163B4A0D51AEE421B099A8E8A823A917A6E55A4A8E660715" + + "B9AC53CF37392228B2F7042CCBDA14CA88314FD353EA70AA9899E88771B01C8E" + + "E0DE35BD342F43809670B056B35A0EB68D370E1489D51AA4780766739887DBC6" + + "A716FE05773803C43B5040BF29AB33C4567E8986B3C442A7CEFCF46D61E13E54" + + "85468C0FF3FDC804BDDE60E4310CC45F5196DC75F713581D934FB914661B6B69" + + "EC3CE2CF469D7CD8727B959B5593F8D38124B0947E7948252BF9A53763877F").HexToByteArray(); + + byte[] correctlyPadded = new byte[encrypted.Length + 1]; + Buffer.BlockCopy(encrypted, 0, correctlyPadded, 1, encrypted.Length); + + using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params)) + { + byte[] decrypted = Decrypt(rsa, correctlyPadded, RSAEncryptionPadding.Pkcs1); + Assert.NotNull(decrypted); + + Assert.ThrowsAny( + () => rsa.Decrypt(encrypted, RSAEncryptionPadding.Pkcs1)); + } + } + + [Fact] + public void RsaDecryptPkcs1WrongDataLength() + { + using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params)) + { + byte[] data = TestData.HelloBytes; + + byte[] encrypted = Encrypt(rsa, data, RSAEncryptionPadding.Pkcs1); + Array.Resize(ref encrypted, encrypted.Length + 1); + + // Baseline/exempt a NetFx difference for RSACng + if (!PlatformDetection.IsFullFramework || + rsa.GetType().Assembly.GetName().Name != "System.Core") + { + Assert.ThrowsAny( + () => Decrypt(rsa, encrypted, RSAEncryptionPadding.Pkcs1)); + } + + Array.Resize(ref encrypted, encrypted.Length - 2); + + Assert.ThrowsAny( + () => Decrypt(rsa, encrypted, RSAEncryptionPadding.Pkcs1)); + } + } + + [Fact] + public void RsaDecryptOaepWrongDataLength() + { + using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params)) + { + byte[] data = TestData.HelloBytes; + + byte[] encrypted = Encrypt(rsa, data, RSAEncryptionPadding.OaepSHA1); + Array.Resize(ref encrypted, encrypted.Length + 1); + + if (!PlatformDetection.IsFullFramework) + { + Assert.ThrowsAny( + () => Decrypt(rsa, encrypted, RSAEncryptionPadding.OaepSHA1)); + } + + Array.Resize(ref encrypted, encrypted.Length - 2); + + Assert.ThrowsAny( + () => Decrypt(rsa, encrypted, RSAEncryptionPadding.OaepSHA1)); + + if (RSAFactory.SupportsSha2Oaep) + { + encrypted = Encrypt(rsa, data, RSAEncryptionPadding.OaepSHA256); + Array.Resize(ref encrypted, encrypted.Length + 1); + + if (!PlatformDetection.IsFullFramework) + { + Assert.ThrowsAny( + () => Decrypt(rsa, encrypted, RSAEncryptionPadding.OaepSHA256)); + } + + Array.Resize(ref encrypted, encrypted.Length - 2); + + Assert.ThrowsAny( + () => Decrypt(rsa, encrypted, RSAEncryptionPadding.OaepSHA256)); + } + } + } + [ConditionalFact(nameof(EphemeralKeysAreExportable))] public void RsaDecryptAfterExport() { diff --git a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.netcoreapp.cs b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.netcoreapp.cs index 9f53f53c3e..e1a234c6d3 100644 --- a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.netcoreapp.cs +++ b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.netcoreapp.cs @@ -64,7 +64,7 @@ namespace System.Security.Cryptography.Rsa.Tests actual = new byte[TestData.HelloBytes.Length + 1000]; Assert.True(rsa.TryDecrypt(cipherBytes, actual, RSAEncryptionPadding.OaepSHA1, out bytesWritten)); Assert.Equal(TestData.HelloBytes.Length, bytesWritten); - Assert.Equal(TestData.HelloBytes, actual.AsSpan().Slice(0, TestData.HelloBytes.Length).ToArray()); + Assert.Equal(TestData.HelloBytes, actual.AsSpan(0, TestData.HelloBytes.Length).ToArray()); } } diff --git a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAFactory.cs b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAFactory.cs index a34642a234..9dd006457d 100644 --- a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAFactory.cs +++ b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAFactory.cs @@ -10,6 +10,7 @@ namespace System.Security.Cryptography.Rsa.Tests RSA Create(int keySize); bool Supports384PrivateKey { get; } bool SupportsSha2Oaep { get; } + bool SupportsPss { get; } bool SupportsDecryptingIntoExactSpaceRequired { get; } } @@ -25,10 +26,19 @@ namespace System.Security.Cryptography.Rsa.Tests return s_provider.Create(keySize); } + public static RSA Create(RSAParameters rsaParameters) + { + RSA rsa = Create(); + rsa.ImportParameters(rsaParameters); + return rsa; + } + public static bool Supports384PrivateKey => s_provider.Supports384PrivateKey; public static bool SupportsSha2Oaep => s_provider.SupportsSha2Oaep; + public static bool SupportsPss => s_provider.SupportsPss; + public static bool SupportsDecryptingIntoExactSpaceRequired => s_provider.SupportsDecryptingIntoExactSpaceRequired; } } diff --git a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/SignVerify.cs b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/SignVerify.cs index 557d3a020b..dbb516b9ba 100644 --- a/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/SignVerify.cs +++ b/external/corefx/src/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/SignVerify.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.IO; +using Test.Cryptography; using Test.IO.Streams; using Xunit; @@ -38,6 +39,7 @@ namespace System.Security.Cryptography.Rsa.Tests public abstract class SignVerify { + public static bool SupportsPss => RSAFactory.SupportsPss; public static bool BadKeyFormatDoesntThrow => !PlatformDetection.IsFullFramework || PlatformDetection.IsNetfx462OrNewer; public static bool InvalidKeySizeDoesntThrow => !PlatformDetection.IsFullFramework || PlatformDetection.IsNetfx462OrNewer; @@ -545,6 +547,29 @@ namespace System.Security.Cryptography.Rsa.Tests } } + [Fact] + public void PkcsSignHash_MismatchedHashSize() + { + RSASignaturePadding padding = RSASignaturePadding.Pkcs1; + + using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params)) + { + byte[] data152 = new byte[152 / 8]; + byte[] data168 = new byte[168 / 8]; + + Assert.ThrowsAny( + () => SignHash(rsa, data152, HashAlgorithmName.SHA1, padding)); + + Assert.ThrowsAny( + () => SignHash(rsa, data168, HashAlgorithmName.SHA1, padding)); + + byte[] data160 = new byte[160 / 8]; + + Assert.ThrowsAny( + () => SignHash(rsa, data160, HashAlgorithmName.SHA256, padding)); + } + } + [Fact] public void ExpectedHashSignature_SHA1_2048() { @@ -807,6 +832,340 @@ namespace System.Security.Cryptography.Rsa.Tests VerifyHashSignature(hashSignature, dataHash, "SHA256", TestData.RSA2048Params); } + [Theory] + [InlineData("SHA256")] + [InlineData("SHA384")] + [InlineData("SHA512")] + [InlineData("MD5")] + [InlineData("SHA1")] + public void PssRoundtrip(string hashAlgorithmName) + { + RSAParameters privateParameters = TestData.RSA2048Params; + RSAParameters publicParameters = new RSAParameters + { + Modulus = privateParameters.Modulus, + Exponent = privateParameters.Exponent, + }; + + using (RSA privateKey = RSAFactory.Create()) + using (RSA publicKey = RSAFactory.Create()) + { + privateKey.ImportParameters(privateParameters); + publicKey.ImportParameters(publicParameters); + + byte[] data = TestData.RsaBigExponentParams.Modulus; + HashAlgorithmName hashAlgorithm = new HashAlgorithmName(hashAlgorithmName); + RSASignaturePadding padding = RSASignaturePadding.Pss; + + if (RSAFactory.SupportsPss) + { + byte[] signature = SignData(privateKey, data, hashAlgorithm, padding); + + Assert.NotNull(signature); + Assert.Equal(publicParameters.Modulus.Length, signature.Length); + + Assert.True(VerifyData(publicKey, data, signature, hashAlgorithm, padding)); + } + else + { + Assert.ThrowsAny( + () => SignData(privateKey, data, hashAlgorithm, padding)); + + byte[] signature = new byte[privateParameters.Modulus.Length]; + + Assert.ThrowsAny( + () => VerifyData(privateKey, data, signature, hashAlgorithm, padding)); + } + } + } + + [Fact] + public void VerifyExpectedSignature_PssSha256_RSA2048() + { + byte[] modulus2048Signature = ( + "460CA7273FF6CC02DD57F07CB18E65E5AF23B0285E26122B810EC6D2F4EE7E1A" + + "1B01A203623E800C9940CE827614B2F1DC7C7B1CC3A976D27F82517EB64AC90B" + + "9A97D1CC17FB4731C63CA02C9F46B57A4A03981D73265CDB36E28EF08FCA77ED" + + "FAB34EE91FE6AABF00045489ACEB631FB004438344EA7997ADE2191C1A70E9F9" + + "2BA809FEFB4EFA0DBC1075A7EBBBCF57747DA8D0B3467BD3DAC5EA8B47F76F07" + + "7043497E7459A83349FE74320E77D471008CB7B43707561FA8DC9251F8EAE531" + + "5AC1894C4F9E6B7BECF993C146C5D6CF0DB60992A297F358A0895831965887C4" + + "B9153B96771C998CD61DA0C487D63555AE66F917F1BFDF509BFFEB21440F6A3C").HexToByteArray(); + + VerifyExpectedSignature_Pss( + TestData.RSA2048Params, + HashAlgorithmName.SHA256, + TestData.RSA2048Params.Modulus, + modulus2048Signature); + } + + [Fact] + public void VerifyExpectedSignature_PssSha256_RSA16384() + { + byte[] modulus2048Signature = ( + "1D92D529567F6922866FFDE4BF44C427FA511BF5EDF163ED51A0D14ADECD98FB" + + "C6A61A61532404AF74C3AB65119BB1358855A68362FBABAED7D8E56403EE9AFA" + + "33C8D73E35880066556A7304F8E8A3EBF981C8318958AC867B32F3A01F085F53" + + "B0885781DFCF4DE4183805B7B26C4718E58031FF8D0B82B38D958BF0147C263F" + + "A4012FE29E8B3D7EA18780C3A6B01E15D81387C4367AFB35FF4868309928C112" + + "86F030AFED02B2C8CED24C527B8EAA126076B268F469427E70D0ACFC4C3E007D" + + "05F84E2F3D3DC3028674DA38026F9054F54636FBED099CD528782F60F1882045" + + "E2F297B467496F01AE566EC80C384A5E775481EECEA713D0F35C75CBFDB33F52" + + "FC4699EDBEB1F938368AA2B261402634BEE548F38821E6FCBFE7C26C0C44EB1D" + + "58D215500E11EA400AE44B349727BE28A62188770393863B0F9BCC6C82717C35" + + "34334205B931BDD6FEA4FDCC681566BCB2AF80266D692007E027682535BFD265" + + "3E8D906D3531575975F2BB77457378FA84A34F2F064F6E5B986D48FBFD9F8BF8" + + "BD3CDFDA21C624A315C8246764841C811939B60BC73AB4CD15B141A1C3D063B6" + + "9529FB4B4342B1064650272CECE2B0A398A5F9B5FD2D107A9FE84781CA11D29F" + + "00986BEE1850BC5E46570FDFD54DBD15C6C8BA12AC0CA7825765009346AB7E95" + + "848F95928368E65AFDCB8AA058B0EE31320584248327F4D22017480BAB38BA47" + + "4FFCBBE68C5A24582AB9594EAD26ACE67170319B1BA9FB514070A5051744EAB3" + + "BDC1C131A8AF580CE5B11B23B50FF66D4DC6F6064C7FBA88D8CB74A3A85A51EB" + + "C344F7226871286109B0B9D33B7137B223FDC152EDD1BA0641D906A22F91D146" + + "8B39EAC8261EB05CA7757AEA46051599087CE92A9962D1DEF8DAF910F10169E0" + + "A0F8F864C0E4B29DC12958B06E8E4225C90CFEB6D7367DFEB7F8DF2891D50DCC" + + "89F435466A3D25B676BD06C69D39EDE7EDD639703C262B7C0257C88BD197542F" + + "0CE25F8E317037C1DC4380E2AA43CB4FBBA078AF83CDCA8DD8A8545267E3F853" + + "8DE7A897269E492A1400715FC3BABF2E30D2696216F51FD30FC3BE67FB9813CA" + + "DAEE3E4CB779A5F8A10DBCA11927CBC50721A5412680E490A68CA3DFF74B9E2A" + + "774DCC32B84B9D5B253268465A911A6CF3D189F51D21DDEF30006F929C151402" + + "E821F4097A8514192F95CA8B9ABFD0B7C7C86AAC5B0FDAECB02EABBC3B1F8442" + + "2A1921AE0B4BC01B6C037038DF382DC130843B15F5F042A98053578248E8DB02" + + "A1B5FC702B59FEAD99C32F6DAF15308A53CA139E408CE0F45DEC48FF1E5DB77B" + + "0305196F16598A21AF92603F77BA061A2A12B5D6F69B19F2EBDDE47578DD3895" + + "8D36D15D88015F5E51AA818669B6A65DE40C264CAD22B8E25D4866E8BBC0A64E" + + "59E0D95C69DF925BB9B9C88AB0542E53C6034DDE4FB5763D21C62765FA7A39AA" + + "B50652F20D464652710162EBBE7ECFEFF255864B459A0DD83DD3E7DD88EA1271" + + "442D70A944106A47EF22ADF67AD9D7CC24FC47C66B5D9B15E3D0104491D8C060" + + "A6E46F96A8E0C11A7D25211E2206B1CE272143B4B369D7B07645CB1E94668C43" + + "3D412A4600364122F22D7EC6B79227FA215CD230E3D09D0AA5BE3B291C4BE343" + + "808582C7F6EE20D7457DE1955F9E7E40A4C9EF55C5A5A0D3D125D8F53E69477B" + + "F0D91BD8B3401ECEEFE9D94382F836ACFB81814DFEF86F614406B02B6001E90E" + + "E84DA2BD0441BB943A6295F530AA7B7F375CD91EBA4CA83A0CF35FCBCA9F9915" + + "3BA0C28D1DA762D6257C99378F21FD6D890C31B9606BB6238CD3B0DBD4012649" + + "602E5352D20DA067576A94DB21E323B7902885F8892C844411027C3F4ED1F28B" + + "DBFB929E986DA6AF15F552975705C9C2C5500CE52F90903EF4BD53B145FB713B" + + "8A62FA292E608438A1CBF663FCCCEC99489CE9D709BF92AA9260F3950B058618" + + "B4EED63DD02376057460AF3854976C6A9C605148B0882F337253AD8AE8FA3AA6" + + "4194EF462A403D8198F1FBEFCC2ECAAE6B3C3A52AC79F5311F60B3EF2B281FE1" + + "C22E2C820570C687A1B5C7A1BB5013844DEE5AD720BE9D186B14EF38EA2FCB12" + + "4358CF552BEB3B9A0B36FB298FE527EEE2CD428680C4D6C55CCBFCE6F8E81162" + + "32198584267DF41CF50BDDBA22C601ADCA005A2187FC0097DC0B6AF0552B3034" + + "BA6E432DD0D7D6F3D58DDA91AC4756D2CFFC28DCF0A7EEE2D2A6CC23C77A2E2F" + + "9DD26143AAD7062093D7592C282A02FABC3815DD285064F6F5F0848294D781B3" + + "20C3F2DA3C26E1CCF6DB171908D5AFABA1A7BABC6D3F31FD7B566B7321AF6297" + + "F3EE652ABD11DD4FFF39D77B4FE06A838412B85C4877534369D115C65FA36BA3" + + "DDFF9B50C95B2AD649A5C814C9183ED743FA5CB23F65C5216C0F61B16CB73409" + + "D105EE6321C7D210C4DABC7A80C63B383178669FA9E79DCDD3DB1C175EED5199" + + "9F51BBAC06C90794B77491D0BC2FED10199EE322B7B23DB5B63B6C6B85E39ED3" + + "D145BC070EA912820C2E59FE9ED3670D8FBC44B9B2D6FAEEF95154972BA509CC" + + "96F83328DD7243DB11F9CDD5D8013DB8C7DD5ED58DEEFAC7FD282085715A063E" + + "320B167C904A65761233361B8232DAE539A8B5B38D9506ABBA9844E24D64E2DA" + + "ACD1E4F22546959282B721ACDA8289AE92C5FE0775F59A4EA10C732EE22FA01C" + + "E6556E8CCA94E6DD87F3A50EDF6FFDC4D10B07B3FBC55111DF62088A1AFCE2B6" + + "C6CF4C18CAA3BA05E7117368546B241236DDE91DF9CE30AE691C6044F30EA85A" + + "F169F0B64C353A40BC4AFF467C4B304B70751248B1B09F3781DDB84087B972FD" + + "0C92C6ABE141D38327BD810F87F0E058098B6E8A538E236C40955005AC4A232D" + + "22F7F9B479D0C093F18C4C4756B06F80132980E30716A3282306D1352CBBCD31").HexToByteArray(); + + VerifyExpectedSignature_Pss( + TestData.RSA16384Params, + HashAlgorithmName.SHA256, + TestData.RSA2048Params.Modulus, + modulus2048Signature); + } + + [Fact] + public void VerifyExpectedSignature_PssSha384() + { + byte[] bigModulusSignature = ( + "70F48CA4E8640701369DB986C4D09C91E4C197DB1BE4F32C3F37A67AEC4BA95D" + + "733EAACAE139B7B9C8E66C5BC82629971C3BEBF93A949CB81763FECDF96B73DA" + + "7D5929A15DFEF58B51E6D43F46238FC1121AAA3A5F3DF6B56E0FE2B6205192AB" + + "BA9752FC9CFD3000B08E3A823514A93FD90871FD09A005DA191431487DAF6364" + + "22").HexToByteArray(); + + VerifyExpectedSignature_Pss( + TestData.RSA1032Parameters, + HashAlgorithmName.SHA384, + TestData.RSA16384Params.Modulus, + bigModulusSignature); + } + + [Fact] + public void VerifyExpectedSignature_PssSha512() + { + byte[] helloSignature = ( + "60678D68816149206AD33F7153FFBAA1043FF7ABC539D6C88E5D2C94BCC10CF4" + + "E66A6F0F08DEA15781B8FA06F9E27D0B01347DAAA4B760D8978EC2EF87B508A2" + + "680FBE59F8BCC8A6AF413A1CB2373DFF32C4217542A9EE86179083DD316485FB" + + "E496EEF0EBE3E4A2793C888E988962C5EAF35136172E74B02724770863D10B19" + + "AACDE7D31CE77BE96EA54DE7A2409648AB3105FAC1003B00E32FAE4527284352" + + "A859C17F4C7D611DE4C451291A3096A0D6230EE2699B79CD571DE6D441CB372A" + + "9D6E46080AB8041D45D4B9475CBE6B48D10F4332910869D8C3931133224475D9" + + "BA1E0B92161BB2C17A96F92432F2BA1AEBAD8C7CD33D79F5C6EFB9BF6F192205").HexToByteArray(); + + VerifyExpectedSignature_Pss( + TestData.RSA2048Params, + HashAlgorithmName.SHA512, + TestData.HelloBytes, + helloSignature); + } + + private void VerifyExpectedSignature_Pss( + RSAParameters keyParameters, + HashAlgorithmName hashAlgorithm, + byte[] data, + byte[] signature, + [System.Runtime.CompilerServices.CallerMemberName] string callerName = null) + { + RSAParameters publicParameters = new RSAParameters + { + Modulus = keyParameters.Modulus, + Exponent = keyParameters.Exponent, + }; + + RSASignaturePadding padding = RSASignaturePadding.Pss; + + using (RSA rsaPublic = RSAFactory.Create()) + using (RSA rsaPrivate = RSAFactory.Create()) + { + try + { + rsaPublic.ImportParameters(publicParameters); + } + catch (CryptographicException) + { + // The key didn't load, not anything else this test can do. + return; + } + + rsaPrivate.ImportParameters(keyParameters); + + // Generator for new tests. + if (signature == null) + { + signature = SignData(rsaPrivate, data, hashAlgorithm, padding); + Console.WriteLine($"{callerName}: {signature.ByteArrayToHex()}"); + } + + if (RSAFactory.SupportsPss) + { + Assert.True( + VerifyData(rsaPublic, data, signature, hashAlgorithm, padding), + "Public key verified the signature"); + + Assert.True( + VerifyData(rsaPrivate, data, signature, hashAlgorithm, padding), + "Private key verified the signature"); + } + else + { + Assert.ThrowsAny( + () => VerifyData(rsaPublic, data, signature, hashAlgorithm, padding)); + + Assert.ThrowsAny( + () => VerifyData(rsaPrivate, data, signature, hashAlgorithm, padding)); + } + } + } + + [ConditionalFact(nameof(SupportsPss))] + public void PssSignature_WrongHashAlgorithm() + { + RSASignaturePadding padding = RSASignaturePadding.Pss; + byte[] data = TestData.HelloBytes; + + using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params)) + { + byte[] signature = SignData(rsa, data, HashAlgorithmName.SHA256, padding); + Assert.False(VerifyData(rsa, data, signature, HashAlgorithmName.SHA384, padding)); + } + } + + [ConditionalFact(nameof(SupportsPss))] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void PssVerifyHash_MismatchedHashSize() + { + // This is a legal SHA-1 value, which we're going to use with SHA-2-256 instead. + byte[] hash = "75ED7E627DB9AECBD870E27EED49ED7D9AEB2F52".HexToByteArray(); + + byte[] sig = ( + "837A17C13618030A6C0C17551D8A34CA5AE4BB1D45A5DAD091F4016C630E0838" + + "5F9D9F1F75EF4CCBBE723C0630AC699C43587D81BD16AFBD2F797215F68F8062" + + "87A352BB269FB9D042DA4D9D664172E4B3B39FC3457879C8DBDD56FAB44F2515" + + "71E2E607A964CB548CB36198004ACD8D3E3B80D10917CE582710BB65513C0310" + + "4A0A82C63D2B8898F5BAF97618B5EBE5F3B0824561C059FD7FC949B12837E8B1" + + "E86380E9A68F6D7E8E8BD5C57B04E831DBBDBDCA20403EC988635F62D4B48382" + + "56E2AF4213FDCA6BF801C06AF6381DAC61288C13B08806A323B3E956A13BCB29" + + "680F62CCA9880A8A1FD1A2CA61DCFE008AC7FC55E98ACCE9B7BE010E5BCB836A").HexToByteArray(); + + using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params)) + { + Assert.False(VerifyHash(rsa, hash, sig, HashAlgorithmName.SHA256, RSASignaturePadding.Pss)); + } + } + + [ConditionalFact(nameof(SupportsPss))] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void PssSignHash_MismatchedHashSize() + { + RSASignaturePadding padding = RSASignaturePadding.Pss; + + using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params)) + { + byte[] data152 = new byte[152 / 8]; + byte[] data168 = new byte[168 / 8]; + + Assert.ThrowsAny( + () => SignHash(rsa, data152, HashAlgorithmName.SHA1, padding)); + + Assert.ThrowsAny( + () => SignHash(rsa, data168, HashAlgorithmName.SHA1, padding)); + + byte[] data160 = new byte[160 / 8]; + + Assert.ThrowsAny( + () => SignHash(rsa, data160, HashAlgorithmName.SHA256, padding)); + } + } + + [ConditionalFact(nameof(SupportsPss))] + public void PssSignature_WrongData() + { + RSASignaturePadding padding = RSASignaturePadding.Pss; + byte[] dataCopy = (byte[])TestData.HelloBytes.Clone(); + HashAlgorithmName hashAlgorithmName = HashAlgorithmName.SHA256; + + using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params)) + { + byte[] signature = SignData(rsa, dataCopy, hashAlgorithmName, padding); + dataCopy[0] ^= 0xFF; + Assert.False(VerifyData(rsa, dataCopy, signature, hashAlgorithmName, padding)); + } + } + + [ConditionalFact(nameof(SupportsPss))] + public void PssSignature_WrongLength() + { + RSASignaturePadding padding = RSASignaturePadding.Pss; + byte[] data = TestData.HelloBytes; + HashAlgorithmName hashAlgorithmName = HashAlgorithmName.SHA256; + + using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params)) + { + byte[] signature = SignData(rsa, data, hashAlgorithmName, padding); + + // Too long by a byte + Array.Resize(ref signature, signature.Length + 1); + Assert.False(VerifyData(rsa, data, signature, hashAlgorithmName, padding)); + + // Net too short by a byte + Array.Resize(ref signature, signature.Length - 2); + Assert.False(VerifyData(rsa, data, signature, hashAlgorithmName, padding)); + } + } + private void ExpectSignature( byte[] expectedSignature, byte[] data, diff --git a/external/corefx/src/Common/tests/System/Security/Cryptography/ByteUtils.cs b/external/corefx/src/Common/tests/System/Security/Cryptography/ByteUtils.cs index f39df0409f..be8a1d5f9b 100644 --- a/external/corefx/src/Common/tests/System/Security/Cryptography/ByteUtils.cs +++ b/external/corefx/src/Common/tests/System/Security/Cryptography/ByteUtils.cs @@ -37,7 +37,7 @@ namespace Test.Cryptography internal static string ByteArrayToHex(this byte[] bytes) { - return ByteArrayToHex(bytes.AsReadOnlySpan()); + return ByteArrayToHex((ReadOnlySpan)bytes); } internal static string ByteArrayToHex(this Span bytes) diff --git a/external/corefx/src/Common/tests/System/Threading/Tasks/Sources/ManualResetValueTaskSource.cs b/external/corefx/src/Common/tests/System/Threading/Tasks/Sources/ManualResetValueTaskSource.cs new file mode 100644 index 0000000000..4e6c328038 --- /dev/null +++ b/external/corefx/src/Common/tests/System/Threading/Tasks/Sources/ManualResetValueTaskSource.cs @@ -0,0 +1,164 @@ +// 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.Runtime.ExceptionServices; +using System.Threading.Tasks.Sources; + +namespace System.Threading.Tasks.Tests +{ + internal static class ManualResetValueTaskSource + { + public static ManualResetValueTaskSource Completed(T result, Exception error = null) + { + var vts = new ManualResetValueTaskSource(); + if (error != null) + { + vts.SetException(error); + } + else + { + vts.SetResult(result); + } + return vts; + } + + public static ManualResetValueTaskSource Delay(int delayMs, T result, Exception error = null) + { + var vts = new ManualResetValueTaskSource(); + Task.Delay(delayMs).ContinueWith(_ => + { + if (error != null) + { + vts.SetException(error); + } + else + { + vts.SetResult(result); + } + }); + return vts; + } + } + + internal sealed class ManualResetValueTaskSource : IValueTaskSource, IValueTaskSource + { + private static readonly Action s_sentinel = new Action(s => { }); + private Action _continuation; + private object _continuationState; + private SynchronizationContext _capturedContext; + private ExecutionContext _executionContext; + private bool _completed; + private T _result; + private ExceptionDispatchInfo _error; + + public ValueTaskSourceStatus GetStatus(short token) => + !_completed ? ValueTaskSourceStatus.Pending : + _error == null ? ValueTaskSourceStatus.Succeeded : + _error.SourceException is OperationCanceledException ? ValueTaskSourceStatus.Canceled : + ValueTaskSourceStatus.Faulted; + + public T GetResult(short token) + { + if (!_completed) + { + throw new Exception("Not completed"); + } + + _error?.Throw(); + return _result; + } + + void IValueTaskSource.GetResult(short token) + { + GetResult(token); + } + + public void Reset() + { + _completed = false; + _continuation = null; + _continuationState = null; + _result = default; + _error = null; + _executionContext = null; + _capturedContext = null; + } + + public void OnCompleted(Action continuation, object state, short token, ValueTaskSourceOnCompletedFlags flags) + { + if ((flags & ValueTaskSourceOnCompletedFlags.FlowExecutionContext) != 0) + { + _executionContext = ExecutionContext.Capture(); + } + + if ((flags & ValueTaskSourceOnCompletedFlags.UseSchedulingContext) != 0) + { + _capturedContext = SynchronizationContext.Current; + } + + _continuationState = state; + if (Interlocked.CompareExchange(ref _continuation, continuation, null) != null) + { + SynchronizationContext sc = _capturedContext; + if (sc != null) + { + sc.Post(s => + { + var tuple = (Tuple, object>)s; + tuple.Item1(tuple.Item2); + }, Tuple.Create(continuation, state)); + } + else + { + Task.Factory.StartNew(continuation, state, CancellationToken.None, TaskCreationOptions.DenyChildAttach, TaskScheduler.Default); + } + } + } + + public void SetResult(T result) + { + _result = result; + SignalCompletion(); + } + + public void SetException(Exception error) + { + _error = ExceptionDispatchInfo.Capture(error); + SignalCompletion(); + } + + private void SignalCompletion() + { + _completed = true; + if (Interlocked.CompareExchange(ref _continuation, s_sentinel, null) != null) + { + if (_executionContext != null) + { + ExecutionContext.Run(_executionContext, s => ((ManualResetValueTaskSource)s).InvokeContinuation(), this); + } + else + { + InvokeContinuation(); + } + } + } + + private void InvokeContinuation() + { + SynchronizationContext sc = _capturedContext; + if (sc != null) + { + sc.Post(s => + { + var thisRef = (ManualResetValueTaskSource)s; + thisRef._continuation(thisRef._continuationState); + }, this); + } + else + { + _continuation(_continuationState); + } + } + } +} diff --git a/external/corefx/src/Common/tests/System/Threading/Tasks/TaskTimeoutExtensions.cs b/external/corefx/src/Common/tests/System/Threading/Tasks/TaskTimeoutExtensions.cs index 3a72628f6e..de3463eb64 100644 --- a/external/corefx/src/Common/tests/System/Threading/Tasks/TaskTimeoutExtensions.cs +++ b/external/corefx/src/Common/tests/System/Threading/Tasks/TaskTimeoutExtensions.cs @@ -2,6 +2,9 @@ // 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.Collections.Generic; +using System.Diagnostics; + /// /// Task timeout helper based on http://blogs.msdn.com/b/pfxteam/archive/2011/11/10/10235834.aspx /// @@ -13,10 +16,10 @@ namespace System.Threading.Tasks { var cts = new CancellationTokenSource(); - if (task == await Task.WhenAny(task, Task.Delay(millisecondsTimeout, cts.Token))) + if (task == await Task.WhenAny(task, Task.Delay(millisecondsTimeout, cts.Token)).ConfigureAwait(false)) { cts.Cancel(); - await task; + await task.ConfigureAwait(false); } else { @@ -28,10 +31,10 @@ namespace System.Threading.Tasks { var cts = new CancellationTokenSource(); - if (task == await Task.WhenAny(task, Task.Delay(millisecondsTimeout, cts.Token))) + if (task == await Task.WhenAny(task, Task.Delay(millisecondsTimeout, cts.Token)).ConfigureAwait(false)) { cts.Cancel(); - return await task; + return await task.ConfigureAwait(false); } else { @@ -46,7 +49,7 @@ namespace System.Threading.Tasks if (task == await Task.WhenAny(task, Task.Delay(millisecondsTimeout, cts.Token)).ConfigureAwait(false)) { cts.Cancel(); - await task; + await task.ConfigureAwait(false); } else { @@ -54,7 +57,43 @@ namespace System.Threading.Tasks } } - public static Task WhenAllOrAnyFailed(this Task[] tasks) + public static async Task WhenAllOrAnyFailed(this Task[] tasks) + { + try + { + await WhenAllOrAnyFailedCore(tasks).ConfigureAwait(false); + } + catch + { + // Wait a bit to allow other tasks to complete so we can include their exceptions + // in the error we throw. + using (var cts = new CancellationTokenSource()) + { + await Task.WhenAny( + Task.WhenAll(tasks), + Task.Delay(3_000, cts.Token)).ConfigureAwait(false); // arbitrary delay; can be dialed up or down in the future + } + + var exceptions = new List(); + foreach (Task t in tasks) + { + switch (t.Status) + { + case TaskStatus.Faulted: exceptions.Add(t.Exception); break; + case TaskStatus.Canceled: exceptions.Add(new TaskCanceledException(t)); break; + } + } + + Debug.Assert(exceptions.Count > 0); + if (exceptions.Count > 1) + { + throw new AggregateException(exceptions); + } + throw; + } + } + + private static Task WhenAllOrAnyFailedCore(this Task[] tasks) { int remaining = tasks.Length; var tcs = new TaskCompletionSource(); diff --git a/external/corefx/src/Common/tests/System/Xml/XmlCoreTest/MiscUtil.cs b/external/corefx/src/Common/tests/System/Xml/XmlCoreTest/MiscUtil.cs index 7804c0622b..64ce5b0cbc 100644 --- a/external/corefx/src/Common/tests/System/Xml/XmlCoreTest/MiscUtil.cs +++ b/external/corefx/src/Common/tests/System/Xml/XmlCoreTest/MiscUtil.cs @@ -4,7 +4,9 @@ using System; +#if !MONO [assembly: System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAssembly] +#endif namespace XmlCoreTest.Common { diff --git a/external/corefx/src/Common/tests/System/Xml/XmlDiff/XmlDiff.cs b/external/corefx/src/Common/tests/System/Xml/XmlDiff/XmlDiff.cs index 5bc17d160a..e18684b5df 100644 --- a/external/corefx/src/Common/tests/System/Xml/XmlDiff/XmlDiff.cs +++ b/external/corefx/src/Common/tests/System/Xml/XmlDiff/XmlDiff.cs @@ -6,7 +6,9 @@ using System.Text; using System.IO; using System.Diagnostics; +#if !MONO [assembly: System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAssembly] +#endif namespace System.Xml.XmlDiff { diff --git a/external/corefx/src/Common/tests/Tests/System/IO/PathInternal.Tests.cs b/external/corefx/src/Common/tests/Tests/System/IO/PathInternal.Tests.cs index 4435fb8830..3f33936e0c 100644 --- a/external/corefx/src/Common/tests/Tests/System/IO/PathInternal.Tests.cs +++ b/external/corefx/src/Common/tests/Tests/System/IO/PathInternal.Tests.cs @@ -1,38 +1,15 @@ -// Licensed to the .NET Foundation under one or more agreements. +// 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; using System.IO; using System.Text; using Xunit; namespace Tests.System.IO { - public class PathInternalTests + public class PathInternal_Windows_Tests { - [Theory, - InlineData("Foo", "Foos"), - InlineData("Foo", null)] - public void StartsWithOrdinal_NegativeCases(string source, string value) - { - Assert.False(PathInternal.StartsWithOrdinal(source, value)); - Assert.False(PathInternal.StartsWithOrdinal(new StringBuilder(source), value)); - } - - [Theory, - InlineData("FOO", "foo", false), - InlineData("FOO", "FOO", true), - InlineData("FOO", "fo", false), - InlineData("FOO", "FO", true), - InlineData("FOO", "oo", false), - InlineData("FOO", "OO", false)] - public void StartsWithOrdinal_PositiveCases(string source, string value, bool expected) - { - Assert.Equal(expected, PathInternal.StartsWithOrdinal(source, value)); - Assert.Equal(expected, PathInternal.StartsWithOrdinal(new StringBuilder(source), value)); - } - [Theory, InlineData("", "", true, 0), InlineData("", "", false, 0), @@ -87,5 +64,345 @@ namespace Tests.System.IO { Assert.Equal(expected, PathInternal.GetCommonPathLength(first, second, ignoreCase)); } + + public static TheoryData RemoveRelativeSegmentsData => new TheoryData + { + { @"C:\git\corefx", 2, @"C:\git\corefx"}, + { @"C:\\git\corefx", 2, @"C:\git\corefx"}, + { @"C:\git\\corefx", 2, @"C:\git\corefx"}, + { @"C:\git\.\corefx\.\\", 2, @"C:\git\corefx\"}, + { @"C:\git\corefx", 2, @"C:\git\corefx"}, + { @"C:\git\..\corefx", 2, @"C:\corefx"}, + { @"C:\git\corefx\..\", 2, @"C:\git\"}, + { @"C:\git\corefx\..\..\..\", 2, @"C:\"}, + { @"C:\git\corefx\..\..\.\", 2, @"C:\"}, + { @"C:\git\..\.\corefx\temp\..", 2, @"C:\corefx"}, + { @"C:\git\..\\\.\..\corefx", 2, @"C:\corefx"}, + { @"C:\git\corefx\", 2, @"C:\git\corefx\"}, + { @"C:\git\temp\..\corefx\", 2, @"C:\git\corefx\"}, + + { @"C:\.", 3, @"C:\"}, + { @"C:\..", 3, @"C:\"}, + { @"C:\..\..", 3, @"C:\"}, + { @"C:\.", 2, @"C:"}, + { @"C:\..", 2, @"C:"}, + { @"C:\..\..", 2, @"C:"}, + { @"C:A\.", 2, @"C:A"}, + { @"C:A\..", 2, @"C:"}, + { @"C:A\..\..", 2, @"C:"}, + { @"C:A\..\..\..", 2, @"C:"}, + + { @"C:\tmp\home", 3, @"C:\tmp\home" }, + { @"C:\tmp\..", 3, @"C:\" }, + { @"C:\tmp\home\..\.\.\", 3, @"C:\tmp\" }, + { @"C:\tmp\..\..\..\", 3, @"C:\" }, + { @"C:\tmp\\home", 3, @"C:\tmp\home" }, + { @"C:\.\tmp\\home", 3, @"C:\tmp\home" }, + { @"C:\..\tmp\home", 3, @"C:\tmp\home" }, + { @"C:\..\..\..\tmp\.\home", 3, @"C:\tmp\home" }, + { @"C:\\tmp\\\home", 3, @"C:\tmp\home" }, + { @"C:\tmp\home\git\.\..\.\git\corefx\..\", 3, @"C:\tmp\home\git\" }, + { @"C:\.\tmp\home", 3, @"C:\tmp\home" }, + + { @"C:\tmp\home", 6, @"C:\tmp\home" }, + { @"C:\tmp\..", 6, @"C:\tmp" }, + { @"C:\tmp\home\..\.\.\", 5, @"C:\tmp\" }, + { @"C:\tmp\..\..\..\", 6, @"C:\tmp\" }, + { @"C:\tmp\\home", 5, @"C:\tmp\home" }, + { @"C:\.\tmp\\home", 4, @"C:\.\tmp\home" }, + { @"C:\..\tmp\home", 5, @"C:\..\tmp\home" }, + { @"C:\..\..\..\tmp\.\home", 6, @"C:\..\tmp\home" }, + { @"C:\\tmp\\\home", 7, @"C:\\tmp\home" }, + { @"C:\tmp\home\git\.\..\.\git\corefx\..\", 7, @"C:\tmp\home\git\" }, + { @"C:\.\tmp\home", 5, @"C:\.\tmp\home" }, + + { @"C:\tmp\..", 2, @"C:\" }, + { @"C:\tmp\home\..\..\.\", 2, @"C:\" }, + { @"C:\tmp\..\..\..\", 2, @"C:\" }, + { @"C:\tmp\\home", 2, @"C:\tmp\home" }, + { @"C:\.\tmp\\home", 2, @"C:\tmp\home" }, + { @"C:\..\tmp\home", 2, @"C:\tmp\home" }, + { @"C:\..\..\..\tmp\.\home", 2, @"C:\tmp\home" }, + { @"C:\\tmp\\\home", 2, @"C:\tmp\home" }, + { @"C:\tmp\home\git\.\..\.\git\corefx\..\", 2, @"C:\tmp\home\git\" }, + { @"C:\.\tmp\home", 2, @"C:\tmp\home" }, + + { @"C:\tmp\..\..\", 10, @"C:\tmp\..\" }, + { @"C:\tmp\home\..\.\.\", 12, @"C:\tmp\home\" }, + { @"C:\tmp\..\..\..\", 10, @"C:\tmp\..\" }, + { @"C:\tmp\\home\..\.\\", 13, @"C:\tmp\\home\" }, + { @"C:\.\tmp\\home\git\git", 9, @"C:\.\tmp\home\git\git" }, + { @"C:\..\tmp\.\home", 10, @"C:\..\tmp\home" }, + { @"C:\..\..\..\tmp\.\home", 10, @"C:\..\..\..\tmp\home" }, + { @"C:\\tmp\\\home\..", 7, @"C:\\tmp\" }, + { @"C:\tmp\home\git\.\..\.\git\corefx\..\", 18, @"C:\tmp\home\git\.\git\" }, + { @"C:\.\tmp\home\.\.\", 9, @"C:\.\tmp\home\" }, + }; + + public static TheoryData RemoveRelativeSegmentsFirstRelativeSegment => new TheoryData + { + { @"C:\\git\corefx", 2, @"C:\git\corefx"}, + { @"C:\.\git\corefx", 2, @"C:\git\corefx"}, + { @"C:\\.\git\.\corefx", 2, @"C:\git\corefx"}, + { @"C:\..\git\corefx", 2, @"C:\git\corefx"}, + { @"C:\.\git\..\corefx", 2, @"C:\corefx"}, + { @"C:\.\git\corefx\..\", 2, @"C:\git\"}, + { @"C:\.\git\corefx\..\..\..\", 2, @"C:\"}, + { @"C:\.\git\corefx\..\..\.\", 2, @"C:\"}, + { @"C:\.\git\..\.\corefx\temp\..", 2, @"C:\corefx"}, + { @"C:\.\git\..\\\.\..\corefx", 2, @"C:\corefx"}, + { @"C:\.\git\corefx\", 2, @"C:\git\corefx\"}, + { @"C:\.\git\temp\..\corefx\", 2, @"C:\git\corefx\"}, + { @"C:\\..\..", 3, @"C:\"} + }; + + public static TheoryData RemoveRelativeSegmentsSkipAboveRoot => new TheoryData + { + { @"C:\temp\..\" , 7, @"C:\temp\" }, + { @"C:\temp\..\git" , 7, @"C:\temp\git" }, + { @"C:\temp\..\git" , 8, @"C:\temp\git" }, + { @"C:\temp\..\.\" , 8, @"C:\temp\" }, + { @"C:\temp\..\" , 9, @"C:\temp\..\" }, + { @"C:\temp\..\git" , 9, @"C:\temp\..\git" }, + { @"C:\git\..\temp\..\" , 15, @"C:\git\..\temp\" }, + { @"C:\\\.\..\..\temp\..\" , 17, @"C:\\\.\..\..\temp\" }, + }; + + public static TheoryData RemoveRelativeSegmentsFirstRelativeSegmentRoot => new TheoryData + { + { @"C:\\git\corefx", 3, @"C:\git\corefx"}, + { @"C:\.\git\corefx", 3, @"C:\git\corefx"}, + { @"C:\\.\git\.\corefx", 3, @"C:\git\corefx"}, + { @"C:\..\git\corefx", 3, @"C:\git\corefx"}, + { @"C:\.\git\..\corefx", 3, @"C:\corefx"}, + { @"C:\.\git\corefx\..\", 3, @"C:\git\"}, + { @"C:\.\git\corefx\..\..\..\", 3, @"C:\"}, + { @"C:\.\git\corefx\..\..\.\", 3, @"C:\"}, + { @"C:\.\git\..\.\corefx\temp\..", 3, @"C:\corefx"}, + { @"C:\.\git\..\\\.\..\corefx", 3, @"C:\corefx"}, + { @"C:\.\git\corefx\", 3, @"C:\git\corefx\"}, + { @"C:\.\git\temp\..\corefx\", 3, @"C:\git\corefx\"}, + }; + + [Theory, + MemberData(nameof(RemoveRelativeSegmentsData)), + MemberData(nameof(RemoveRelativeSegmentsFirstRelativeSegment)), + MemberData(nameof(RemoveRelativeSegmentsFirstRelativeSegmentRoot)), + MemberData(nameof(RemoveRelativeSegmentsSkipAboveRoot))] + [PlatformSpecific(TestPlatforms.Windows)] + public void RemoveRelativeSegmentsTest(string path, int skip, string expected) + { + Assert.Equal(expected, PathInternal.RemoveRelativeSegments(path, skip)); + Assert.Equal(@"\\.\" + expected, PathInternal.RemoveRelativeSegments(@"\\.\" + path, skip + 4)); + Assert.Equal(@"\\?\" + expected, PathInternal.RemoveRelativeSegments(@"\\?\" + path, skip + 4)); + } + + public static TheoryData RemoveRelativeSegmentsUncData => new TheoryData + { + { @"Server\Share\git\corefx", 12, @"Server\Share\git\corefx"}, + { @"Server\Share\\git\corefx", 12, @"Server\Share\git\corefx"}, + { @"Server\Share\git\\corefx", 12, @"Server\Share\git\corefx"}, + { @"Server\Share\git\.\corefx\.\\", 12, @"Server\Share\git\corefx\"}, + { @"Server\Share\git\corefx", 12, @"Server\Share\git\corefx"}, + { @"Server\Share\git\..\corefx", 12, @"Server\Share\corefx"}, + { @"Server\Share\git\corefx\..\", 12, @"Server\Share\git\"}, + { @"Server\Share\git\corefx\..\..\..\", 12, @"Server\Share\"}, + { @"Server\Share\git\corefx\..\..\.\", 12, @"Server\Share\"}, + { @"Server\Share\git\..\.\corefx\temp\..", 12, @"Server\Share\corefx"}, + { @"Server\Share\git\..\\\.\..\corefx", 12, @"Server\Share\corefx"}, + { @"Server\Share\git\corefx\", 12, @"Server\Share\git\corefx\"}, + { @"Server\Share\git\temp\..\corefx\", 12, @"Server\Share\git\corefx\"}, + }; + + [Theory, + MemberData(nameof(RemoveRelativeSegmentsUncData))] + [PlatformSpecific(TestPlatforms.Windows)] + public void RemoveRelativeSegmentsUncTest(string path, int skip, string expected) + { + Assert.Equal(@"\\" + expected, PathInternal.RemoveRelativeSegments(@"\\" + path, skip + 2)); + Assert.Equal(@"\\.\UNC\" + expected, PathInternal.RemoveRelativeSegments(@"\\.\UNC\" + path, skip + 8)); + Assert.Equal(@"\\?\UNC\" + expected, PathInternal.RemoveRelativeSegments(@"\\?\UNC\" + path, skip + 8)); + } + + public static TheoryData RemoveRelativeSegmentsDeviceData => new TheoryData + { + { @"\\.\git\corefx", 7, @"\\.\git\corefx"}, + { @"\\.\git\corefx", 7, @"\\.\git\corefx"}, + { @"\\.\git\\corefx", 7, @"\\.\git\corefx"}, + { @"\\.\git\.\corefx\.\\", 7, @"\\.\git\corefx\"}, + { @"\\.\git\corefx", 7, @"\\.\git\corefx"}, + { @"\\.\git\..\corefx", 7, @"\\.\git\corefx"}, + { @"\\.\git\corefx\..\", 7, @"\\.\git\"}, + { @"\\.\git\corefx\..\..\..\", 7, @"\\.\git\"}, + { @"\\.\git\corefx\..\..\.\", 7, @"\\.\git\"}, + { @"\\.\git\..\.\corefx\temp\..", 7, @"\\.\git\corefx"}, + { @"\\.\git\..\\\.\..\corefx", 7, @"\\.\git\corefx"}, + { @"\\.\git\corefx\", 7, @"\\.\git\corefx\"}, + { @"\\.\git\temp\..\corefx\", 7, @"\\.\git\corefx\"}, + + { @"\\.\.\corefx", 5, @"\\.\.\corefx"}, + { @"\\.\.\corefx", 5, @"\\.\.\corefx"}, + { @"\\.\.\\corefx", 5, @"\\.\.\corefx"}, + { @"\\.\.\.\corefx\.\\", 5, @"\\.\.\corefx\"}, + { @"\\.\.\corefx", 5, @"\\.\.\corefx"}, + { @"\\.\.\..\corefx", 5, @"\\.\.\corefx"}, + { @"\\.\.\corefx\..\", 5, @"\\.\.\"}, + { @"\\.\.\corefx\..\..\..\", 5, @"\\.\.\"}, + { @"\\.\.\corefx\..\..\.\", 5, @"\\.\.\"}, + { @"\\.\.\..\.\corefx\temp\..", 5, @"\\.\.\corefx"}, + { @"\\.\.\..\\\.\..\corefx", 5, @"\\.\.\corefx"}, + { @"\\.\.\corefx\", 5, @"\\.\.\corefx\"}, + { @"\\.\.\temp\..\corefx\", 5, @"\\.\.\corefx\"}, + + { @"\\.\..\corefx", 6, @"\\.\..\corefx"}, + { @"\\.\..\corefx", 6, @"\\.\..\corefx"}, + { @"\\.\..\\corefx", 6, @"\\.\..\corefx"}, + { @"\\.\..\.\corefx\.\\", 6, @"\\.\..\corefx\"}, + { @"\\.\..\corefx", 6, @"\\.\..\corefx"}, + { @"\\.\..\..\corefx", 6, @"\\.\..\corefx"}, + { @"\\.\..\corefx\..\", 6, @"\\.\..\"}, + { @"\\.\..\corefx\..\..\..\", 6, @"\\.\..\"}, + { @"\\.\..\corefx\..\..\.\", 6, @"\\.\..\"}, + { @"\\.\..\..\.\corefx\temp\..", 6, @"\\.\..\corefx"}, + { @"\\.\..\..\\\.\..\corefx", 6, @"\\.\..\corefx"}, + { @"\\.\..\corefx\", 6, @"\\.\..\corefx\"}, + { @"\\.\..\temp\..\corefx\", 6, @"\\.\..\corefx\"}, + + { @"\\.\\corefx", 4, @"\\.\corefx"}, + { @"\\.\\corefx", 4, @"\\.\corefx"}, + { @"\\.\\\corefx", 4, @"\\.\corefx"}, + { @"\\.\\.\corefx\.\\", 4, @"\\.\corefx\"}, + { @"\\.\\corefx", 4, @"\\.\corefx"}, + { @"\\.\\..\corefx", 4, @"\\.\corefx"}, + { @"\\.\\corefx\..\", 4, @"\\.\"}, + { @"\\.\\corefx\..\..\..\", 4, @"\\.\"}, + { @"\\.\\corefx\..\..\.\", 4, @"\\.\"}, + { @"\\.\\..\.\corefx\temp\..", 4, @"\\.\corefx"}, + { @"\\.\\..\\\.\..\corefx", 4, @"\\.\corefx"}, + { @"\\.\\corefx\", 4, @"\\.\corefx\"}, + { @"\\.\\temp\..\corefx\", 4, @"\\.\corefx\"}, + }; + + public static TheoryData RemoveRelativeSegmentsDeviceRootData => new TheoryData + { + { @"\\.\git\corefx", 8, @"\\.\git\corefx"}, + { @"\\.\git\corefx", 8, @"\\.\git\corefx"}, + { @"\\.\git\\corefx", 8, @"\\.\git\corefx"}, + { @"\\.\git\.\corefx\.\\", 8, @"\\.\git\corefx\"}, + { @"\\.\git\corefx", 8, @"\\.\git\corefx"}, + { @"\\.\git\..\corefx", 8, @"\\.\git\corefx"}, + { @"\\.\git\corefx\..\", 8, @"\\.\git\"}, + { @"\\.\git\corefx\..\..\..\", 8, @"\\.\git\"}, + { @"\\.\git\corefx\..\..\.\", 8, @"\\.\git\"}, + { @"\\.\git\..\.\corefx\temp\..", 8, @"\\.\git\corefx"}, + { @"\\.\git\..\\\.\..\corefx", 8, @"\\.\git\corefx"}, + { @"\\.\git\corefx\", 8, @"\\.\git\corefx\"}, + { @"\\.\git\temp\..\corefx\", 8, @"\\.\git\corefx\"}, + + { @"\\.\.\corefx", 6, @"\\.\.\corefx"}, + { @"\\.\.\corefx", 6, @"\\.\.\corefx"}, + { @"\\.\.\\corefx", 6, @"\\.\.\corefx"}, + { @"\\.\.\.\corefx\.\\", 6, @"\\.\.\corefx\"}, + { @"\\.\.\corefx", 6, @"\\.\.\corefx"}, + { @"\\.\.\..\corefx", 6, @"\\.\.\corefx"}, + { @"\\.\.\corefx\..\", 6, @"\\.\.\"}, + { @"\\.\.\corefx\..\..\..\", 6, @"\\.\.\"}, + { @"\\.\.\corefx\..\..\.\", 6, @"\\.\.\"}, + { @"\\.\.\..\.\corefx\temp\..", 6, @"\\.\.\corefx"}, + { @"\\.\.\..\\\.\..\corefx", 6, @"\\.\.\corefx"}, + { @"\\.\.\corefx\", 6, @"\\.\.\corefx\"}, + { @"\\.\.\temp\..\corefx\", 6, @"\\.\.\corefx\"}, + + { @"\\.\..\corefx", 7, @"\\.\..\corefx"}, + { @"\\.\..\corefx", 7, @"\\.\..\corefx"}, + { @"\\.\..\\corefx", 7, @"\\.\..\corefx"}, + { @"\\.\..\.\corefx\.\\", 7, @"\\.\..\corefx\"}, + { @"\\.\..\corefx", 7, @"\\.\..\corefx"}, + { @"\\.\..\..\corefx", 7, @"\\.\..\corefx"}, + { @"\\.\..\corefx\..\", 7, @"\\.\..\"}, + { @"\\.\..\corefx\..\..\..\", 7, @"\\.\..\"}, + { @"\\.\..\corefx\..\..\.\", 7, @"\\.\..\"}, + { @"\\.\..\..\.\corefx\temp\..", 7, @"\\.\..\corefx"}, + { @"\\.\..\..\\\.\..\corefx", 7, @"\\.\..\corefx"}, + { @"\\.\..\corefx\", 7, @"\\.\..\corefx\"}, + { @"\\.\..\temp\..\corefx\", 7, @"\\.\..\corefx\"}, + + { @"\\.\\corefx", 5, @"\\.\\corefx"}, + { @"\\.\\corefx", 5, @"\\.\\corefx"}, + { @"\\.\\\corefx", 5, @"\\.\\corefx"}, + { @"\\.\\.\corefx\.\\", 5, @"\\.\\corefx\"}, + { @"\\.\\corefx", 5, @"\\.\\corefx"}, + { @"\\.\\..\corefx", 5, @"\\.\\corefx"}, + { @"\\.\\corefx\..\", 5, @"\\.\\"}, + { @"\\.\\corefx\..\..\..\", 5, @"\\.\\"}, + { @"\\.\\corefx\..\..\.\", 5, @"\\.\\"}, + { @"\\.\\..\.\corefx\temp\..", 5, @"\\.\\corefx"}, + { @"\\.\\..\\\.\..\corefx", 5, @"\\.\\corefx"}, + { @"\\.\\corefx\", 5, @"\\.\\corefx\"}, + { @"\\.\\temp\..\corefx\", 5, @"\\.\\corefx\"}, + }; + + [Theory, + MemberData(nameof(RemoveRelativeSegmentsDeviceData)), + MemberData(nameof(RemoveRelativeSegmentsDeviceRootData))] + [PlatformSpecific(TestPlatforms.Windows)] + public void RemoveRelativeSegmentsDeviceTest(string path, int skip, string expected) + { + Assert.Equal(expected, PathInternal.RemoveRelativeSegments(path, skip)); + StringBuilder sb = new StringBuilder(expected); + sb.Replace('.', '?', 0, 4); + expected = sb.ToString(); + + sb = new StringBuilder(path); + sb.Replace('.', '?', 0, 4); + path = sb.ToString(); + Assert.Equal(expected, PathInternal.RemoveRelativeSegments(path, skip)); + } + + public static TheoryData RemoveRelativeSegmentUnixData => new TheoryData + { + { "/tmp/home", 1, "/tmp/home" }, + { "/tmp/..", 1, "/" }, + { "/tmp/home/../././", 1, "/tmp/" }, + { "/tmp/../../../", 1, "/" }, + { "/tmp//home", 1, "/tmp/home" }, + { "/./tmp//home", 1, "/tmp/home" }, + { "/../tmp/home", 1, "/tmp/home" }, + { "/../../../tmp/./home", 1, "/tmp/home" }, + { "//tmp///home", 1, "/tmp/home" }, + { "/tmp/home/git/./.././git/corefx/../", 1, "/tmp/home/git/" }, + { "/./tmp/home", 1, "/tmp/home" }, + + { "/tmp/home", 4, "/tmp/home" }, + { "/tmp/..", 4, "/tmp" }, + { "/tmp/home/../././", 4, "/tmp/" }, + { "/tmp/../../../", 4, "/tmp/" }, + { "/tmp//home", 4, "/tmp/home" }, + { "/./tmp//home", 2, "/./tmp/home" }, + { "/../tmp/home", 3, "/../tmp/home" }, + { "/../../../tmp/./home", 4, "/../tmp/home" }, + { "//tmp///home", 5, "//tmp/home" }, + { "/tmp/home/git/./.././git/corefx/../", 5, "/tmp/home/git/" }, + { "/./tmp/home", 3, "/./tmp/home" }, + + { "/tmp/../../", 8, "/tmp/../" }, + { "/tmp/home/../././", 10, "/tmp/home/" }, + { "/tmp/../../../", 8, "/tmp/../" }, + { "/tmp//home/.././/", 11, "/tmp//home/" }, + { "/./tmp//home/git/git", 7, "/./tmp/home/git/git" }, + { "/../tmp/./home", 8, "/../tmp/home" }, + { "/../../../tmp/./home", 8, "/../../../tmp/home" }, + { "//tmp///home/..", 5, "//tmp/" }, + { "/tmp/home/git/./.././git/corefx/../", 16, "/tmp/home/git/./git/" }, + { "/./tmp/home/././", 7, "/./tmp/home/" }, + }; + + [Theory, + MemberData(nameof(RemoveRelativeSegmentUnixData))] + [PlatformSpecific(TestPlatforms.AnyUnix)] + public void RemoveRelativeSegmentsUnix(string path, int skip, string expected) + { + Assert.Equal(expected, PathInternal.RemoveRelativeSegments(path, skip)); + } } } diff --git a/external/corefx/src/Common/tests/Tests/System/IO/PathInternal.Unix.Tests.cs b/external/corefx/src/Common/tests/Tests/System/IO/PathInternal.Unix.Tests.cs new file mode 100644 index 0000000000..31b50266ca --- /dev/null +++ b/external/corefx/src/Common/tests/Tests/System/IO/PathInternal.Unix.Tests.cs @@ -0,0 +1,54 @@ +// 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; +using System.IO; +using Xunit; + +namespace Tests.System.IO +{ + [PlatformSpecific(TestPlatforms.AnyUnix)] + public class PathInternalTests_Unix + { + [Theory, + InlineData(@"", @""), + InlineData(null, null), + InlineData(@"/", @"/"), + InlineData(@"//", @"/"), + InlineData(@"///", @"/"), + InlineData(@"\", @"\"), + InlineData(@"\\", @"\\"), + InlineData(@"\\\", @"\\\"), + InlineData(@"\/", @"\/"), + InlineData(@"\/\", @"\/\"), + + InlineData(@"a/a", @"a/a"), + InlineData(@"a//a", @"a/a"), + InlineData(@"a\\a", @"a\\a"), + InlineData(@"/a", @"/a"), + InlineData(@"//a", @"/a"), + InlineData(@"\\a", @"\\a"), + InlineData(@"a/", @"a/"), + InlineData(@"a//", @"a/"), + InlineData(@"a\\", @"a\\"), + ] + [PlatformSpecific(TestPlatforms.AnyUnix)] + public void NormalizeDirectorySeparatorTests(string path, string expected) + { + string result = PathInternal.NormalizeDirectorySeparators(path); + Assert.Equal(expected, result); + if (string.Equals(path, expected, StringComparison.Ordinal)) + Assert.Same(path, result); + } + + [Fact] + [PlatformSpecific(TestPlatforms.OSX)] + public void IsCaseInsensitive_OSX() + { + // There have been reports of casing handling not being appropriate on MacOS + // https://github.com/dotnet/corefx/issues/26797 + Assert.False(PathInternal.IsCaseSensitive); + } + } +} diff --git a/external/corefx/src/Common/tests/Tests/System/IO/PathInternal.Windows.Tests.cs b/external/corefx/src/Common/tests/Tests/System/IO/PathInternal.Windows.Tests.cs index 799dfc8d89..87609e92e8 100644 --- a/external/corefx/src/Common/tests/Tests/System/IO/PathInternal.Windows.Tests.cs +++ b/external/corefx/src/Common/tests/Tests/System/IO/PathInternal.Windows.Tests.cs @@ -4,179 +4,259 @@ using System; using System.IO; -using System.Runtime.InteropServices; using Xunit; -public class PathInternal_Windows_Tests +namespace Tests.System.IO { - [Theory, - InlineData(@"\\?\", false), - InlineData(@"\\?\?", true), - InlineData(@"//?/", false), - InlineData(@"//?/*", true), - InlineData(@"\\.\>", true), - InlineData(@"C:\", false), - InlineData(@"C:\<", true), - InlineData("\"MyFile\"", true) - ] [PlatformSpecific(TestPlatforms.Windows)] - public void HasWildcardCharacters(string path, bool expected) + public class PathInternalTests_Windows { - Assert.Equal(expected, PathInternal.HasWildCardCharacters(path)); + [Theory, + InlineData(@"\\?\", @"\\?\"), + InlineData(@"Foo", @"Foo"), + InlineData(@"C:\Foo", @"\\?\C:\Foo"), + InlineData(@"\\.\Foo", @"\\.\Foo"), + InlineData(@"\\?\Foo", @"\\?\Foo"), + InlineData(@"\??\Foo", @"\??\Foo"), + InlineData(@"//?/Foo", @"//?/Foo"), + InlineData(@"\\Server\Share", PathInternal.UncExtendedPathPrefix + @"Server\Share") + ] + public void EnsureExtendedPrefixTest(string path, string expected) + { + Assert.Equal(expected, PathInternal.EnsureExtendedPrefix(path)); + } + + [Theory, + InlineData(@"", false), + InlineData(@"\\?\", true), + InlineData(@"\??\", true), + InlineData(@"\\.\", false), + InlineData(@"\\?", false), + InlineData(@"\??", false), + InlineData(@"//?/", false), + InlineData(@"/??/", false) + ] + public void IsExtendedTest(string path, bool expected) + { + Assert.Equal(expected, PathInternal.IsExtended(path)); + } + + [Theory, + InlineData(@"", false), + InlineData(@"\\?\", true), + InlineData(@"\??\", true), + InlineData(@"\\.\", true), + InlineData(@"\\?", false), + InlineData(@"\??", false), + InlineData(@"//?/", true), + InlineData(@"/??/", false) + ] + public void IsDeviceTest(string path, bool expected) + { + Assert.Equal(expected, PathInternal.IsDevice(path)); + } + + [Theory, + InlineData("", true), + InlineData("C:", true), + InlineData("**", true), + InlineData(@"\\.\path", false), + InlineData(@"\\?\path", false), + InlineData(@"\\.", false), + InlineData(@"\\?", false), + InlineData(@"\?", false), + InlineData(@"/?", false), + InlineData(@"\\", false), + InlineData(@"//", false), + InlineData(@"\a", true), + InlineData(@"/a", true), + InlineData(@"\", true), + InlineData(@"/", true), + InlineData(@"C:Path", true), + InlineData(@"C:\Path", false), + InlineData(@"\\?\C:\Path", false), + InlineData(@"Path", true), + InlineData(@"X", true) + ] + public void IsPartiallyQualifiedTest(string path, bool expected) + { + Assert.Equal(expected, PathInternal.IsPartiallyQualified(path)); + } + + [Theory, + InlineData(@"", @""), + InlineData(null, null), + InlineData(@"\", @"\"), + InlineData(@"/", @"\"), + InlineData(@"\\", @"\\"), + InlineData(@"\\\", @"\\"), + InlineData(@"//", @"\\"), + InlineData(@"///", @"\\"), + InlineData(@"\/", @"\\"), + InlineData(@"\/\", @"\\"), + + InlineData(@"a\a", @"a\a"), + InlineData(@"a\\a", @"a\a"), + InlineData(@"a/a", @"a\a"), + InlineData(@"a//a", @"a\a"), + InlineData(@"a\", @"a\"), + InlineData(@"a\\", @"a\"), + InlineData(@"a/", @"a\"), + InlineData(@"a//", @"a\"), + InlineData(@"\a", @"\a"), + InlineData(@"\\a", @"\\a"), + InlineData(@"/a", @"\a"), + InlineData(@"//a", @"\\a"), + + // Skip tests + InlineData(@" :", @" :"), + InlineData(@" C:", @" C:"), + InlineData(@"C:\", @"C:\"), + InlineData(@"C:/", @"C:\"), + InlineData(@" ", @" "), + InlineData(@" \", @" \"), + InlineData(@" /", @" \"), + InlineData(@" 8:", @" 8:"), + InlineData(@" \\", @" \"), + InlineData(@" //", @" \") + ] + public void NormalizeDirectorySeparatorTests(string path, string expected) + { + string result = PathInternal.NormalizeDirectorySeparators(path); + Assert.Equal(expected, result); + if (string.Equals(path, expected, StringComparison.Ordinal)) + Assert.Same(path, result); + } + + [Theory, + InlineData(@"", @"", StringComparison.OrdinalIgnoreCase, true), + InlineData(@"", @"", StringComparison.Ordinal, true), + InlineData(@"A", @"a", StringComparison.OrdinalIgnoreCase, true), + InlineData(@"A", @"a", StringComparison.Ordinal, true), + InlineData(@"C:\", @"c:\", StringComparison.OrdinalIgnoreCase, true), + InlineData(@"C:\", @"c:\", StringComparison.Ordinal, false) + ] + public void AreRootsEqual(string first, string second, StringComparison comparisonType, bool expected) + { + Assert.Equal(expected, PathInternal.AreRootsEqual(first, second, comparisonType)); + } + + public static TheoryData GetRootLength_Data => new TheoryData + { + { @"C:\git\corefx", 3, 7 }, + { @"C:\git\.\", 3, 7 }, + { @"C:\git\..\", 3, 7 }, + { @"C:\git\..\..\", 3, 7 }, + { @"C:\..\", 3, 7 }, + { @"C:\", 3, 7 }, + { @"C:\\", 3, 7 }, + + // With drive relative paths, the length changes with device syntax. There is no + // concept of non-resolved "\\?\" paths. "\\?\C:git\" is not rooted at "\\?\C:", + // it is rooted at "\\?\C:git\". While "\\.\" paths are resolved by Win32 (via + // GetFullPathName), they also are not recognized as drive relative. Rather than + // muddy the waters we'll consider the full segment as the root volume there + // as well, even though GetFullPathName would eat to the prefix. We don't want + // a conceptual model where device paths can resolve themselves out of the "volume". + { @"C:", 2, 6}, + { @"C:git\", 2, 10}, + { @"C:git\\", 2, 10}, + { @"C:git", 2, 9}, + { @"C:git\corefx", 2, 10}, + { @"C:git\.\", 2, 10}, + { @"C:git\\.\", 2, 10}, + { @"C:git\..\", 2, 10}, + { @"C:..\", 2, 9}, + }; + + public static TheoryData GetRootLengthRooted => new TheoryData + { + { @"\tmp", 1}, + { @"\.", 1}, + { @"\..", 1}, + { @"\tmp\..\..", 1}, + { @"\\", 2}, + }; + + [Theory, + MemberData(nameof(GetRootLength_Data))] + public void GetRootLength(string path, int length, int deviceLength) + { + Assert.Equal(length, PathInternal.GetRootLength(path)); + Assert.Equal(deviceLength, PathInternal.GetRootLength(@"\\?\" + path)); + Assert.Equal(deviceLength, PathInternal.GetRootLength(@"\\.\" + path)); + } + + [Theory, + MemberData(nameof(GetRootLengthRooted))] + public void GetRootLength_Rooted(string path, int length) + { + Assert.Equal(length, PathInternal.GetRootLength(path)); + } + + public static TheoryData GetRootLength_UNCData => new TheoryData + { + // Historically we've never included the separator after a UNC with GetPathRoot() + // We'll continue to do so. + { @"a\b\git\corefx", 3}, + { @"Server\Share\git\corefx", 12}, + { @"Server\Share\git\.\", 12}, + { @"Server\Share\git\..\", 12}, + { @"Server\Share\git\..\..\", 12}, + { @"Server\Share\..\", 12}, + { @"Server\Share\", 12}, + { @"Server\Share\\", 12}, + { @"Server\Share", 12}, + { @"Server\Share\", 12}, + { @"Server\Share\\git", 12}, + + // Degenerate paths. + // + // We expect paths to be well formed up to the root. If you have "\\Server\\Share" + // instead of "\\Server\Share", all bets are off. We'll test them here to make + // sure we don't choke. + { @"\a\b\git\corefx", 2}, + { @"a\\b\git\corefx", 2}, + }; + + [Theory, + MemberData(nameof(GetRootLength_UNCData))] + public void GetRootLengthUnc(string path, int length) + { + Assert.Equal(length + 2, PathInternal.GetRootLength(@"\\" + path)); + Assert.Equal(length + PathInternal.UncExtendedPrefixLength, PathInternal.GetRootLength(@"\\?\UNC\" + path)); + Assert.Equal(length + PathInternal.UncExtendedPrefixLength, PathInternal.GetRootLength(@"\\.\UNC\" + path)); + } + + public static TheoryData GetRootLength_DeviceData => new TheoryData + { + { @"..\", 3}, + { @"..\..\", 3}, + { @"..\.\", 3}, + { @"...\", 4}, + { @".\", 2}, + { @".\..\", 2}, + { @"..\", 3}, + { @"\.\", 0}, + { @"\..\", 0}, + { @"\\..", 0}, + { @"foo\..", 4}, + { @".", 1}, + { @"..", 2}, + { @"foo", 3}, + { @"foo\", 4}, + { @"foo\\", 4}, + { @"..\foo", 3}, + { @"\\\.\", 0}, + { @"\\.\", 0}, + }; + + [Theory, + MemberData(nameof(GetRootLength_DeviceData))] + public void GetRootLengthDevice(string path, int length) + { + Assert.Equal(length + PathInternal.ExtendedPathPrefix.Length, PathInternal.GetRootLength(@"\\?\" + path)); + Assert.Equal(length + PathInternal.ExtendedPathPrefix.Length, PathInternal.GetRootLength(@"\\.\" + path)); + } } - - [Theory, - InlineData(PathInternal.ExtendedPathPrefix, PathInternal.ExtendedPathPrefix), - InlineData(@"Foo", @"Foo"), - InlineData(@"C:\Foo", @"\\?\C:\Foo"), - InlineData(@"\\.\Foo", @"\\.\Foo"), - InlineData(@"\\?\Foo", @"\\?\Foo"), - InlineData(@"\??\Foo", @"\??\Foo"), - InlineData(@"//?/Foo", @"//?/Foo"), - InlineData(@"\\Server\Share", PathInternal.UncExtendedPathPrefix + @"Server\Share") - ] - [PlatformSpecific(TestPlatforms.Windows)] - public void EnsureExtendedPrefixTest(string path, string expected) - { - Assert.Equal(expected, PathInternal.EnsureExtendedPrefix(path)); - } - - [Theory, - InlineData(@"", false), - InlineData(@"\\?\", true), - InlineData(@"\??\", true), - InlineData(@"\\.\", false), - InlineData(@"\\?", false), - InlineData(@"\??", false), - InlineData(@"//?/", false), - InlineData(@"/??/", false) - ] - [PlatformSpecific(TestPlatforms.Windows)] - public void IsExtendedTest(string path, bool expected) - { - Assert.Equal(expected, PathInternal.IsExtended(path)); - } - - [Theory, - InlineData(@"", false), - InlineData(@"\\?\", true), - InlineData(@"\??\", true), - InlineData(@"\\.\", true), - InlineData(@"\\?", false), - InlineData(@"\??", false), - InlineData(@"//?/", true), - InlineData(@"/??/", false) - ] - [PlatformSpecific(TestPlatforms.Windows)] - public void IsDeviceTest(string path, bool expected) - { - Assert.Equal(expected, PathInternal.IsDevice(path)); - } - - [Theory, - InlineData("", true), - InlineData("C:", true), - InlineData("**", true), - InlineData(@"\\.\path", false), - InlineData(@"\\?\path", false), - InlineData(@"\\.", false), - InlineData(@"\\?", false), - InlineData(@"\?", false), - InlineData(@"/?", false), - InlineData(@"\\", false), - InlineData(@"//", false), - InlineData(@"\a", true), - InlineData(@"/a", true), - InlineData(@"\", true), - InlineData(@"/", true), - InlineData(@"C:Path", true), - InlineData(@"C:\Path", false), - InlineData(@"\\?\C:\Path", false), - InlineData(@"Path", true), - InlineData(@"X", true) - ] - [PlatformSpecific(TestPlatforms.Windows)] - public void IsPartiallyQualifiedTest(string path, bool expected) - { - Assert.Equal(expected, PathInternal.IsPartiallyQualified(path)); - } - - [Theory, - InlineData(@"", 0), - InlineData(@" :", 0), - InlineData(@" C:", 2), - InlineData(@" C:\", 3), - InlineData(@"C:\", 0), - InlineData(@" ", 0), - InlineData(@" \", 2), - InlineData(@" 8:", 0), - InlineData(@" \\", 4), - InlineData(@"\\", 0) - ] - [PlatformSpecific(TestPlatforms.Windows)] - public void PathStartSkipTest(string path, int expected) - { - Assert.Equal(expected, PathInternal.PathStartSkip(path)); - } - - [Theory, - InlineData(@"", @""), - InlineData(null, null), - InlineData(@"\", @"\"), - InlineData(@"/", @"\"), - InlineData(@"\\", @"\\"), - InlineData(@"\\\", @"\\"), - InlineData(@"//", @"\\"), - InlineData(@"///", @"\\"), - InlineData(@"\/", @"\\"), - InlineData(@"\/\", @"\\"), - - InlineData(@"a\a", @"a\a"), - InlineData(@"a\\a", @"a\a"), - InlineData(@"a/a", @"a\a"), - InlineData(@"a//a", @"a\a"), - InlineData(@"a\", @"a\"), - InlineData(@"a\\", @"a\"), - InlineData(@"a/", @"a\"), - InlineData(@"a//", @"a\"), - InlineData(@"\a", @"\a"), - InlineData(@"\\a", @"\\a"), - InlineData(@"/a", @"\a"), - InlineData(@"//a", @"\\a"), - - // Skip tests - InlineData(@" :", @" :"), - InlineData(@" C:", @"C:"), - InlineData(@" C:\", @"C:\"), - InlineData(@" C:/", @"C:\"), - InlineData(@" ", @" "), - InlineData(@" \", @"\"), - InlineData(@" /", @"\"), - InlineData(@" 8:", @" 8:"), - InlineData(@" \\", @"\\"), - InlineData(@" //", @"\\") - ] - [PlatformSpecific(TestPlatforms.Windows)] - public void NormalizeDirectorySeparatorTests(string path, string expected) - { - string result = PathInternal.NormalizeDirectorySeparators(path); - Assert.Equal(expected, result); - if (string.Equals(path, expected, StringComparison.Ordinal)) - Assert.Same(path, result); - } - - [Theory, - InlineData(@"", @"", StringComparison.OrdinalIgnoreCase, true), - InlineData(@"", @"", StringComparison.Ordinal, true), - InlineData(@"A", @"a", StringComparison.OrdinalIgnoreCase, true), - InlineData(@"A", @"a", StringComparison.Ordinal, true), - InlineData(@"C:\", @"c:\", StringComparison.OrdinalIgnoreCase, true), - InlineData(@"C:\", @"c:\", StringComparison.Ordinal, false) - ] - [PlatformSpecific(TestPlatforms.Windows)] - public void AreRootsEqual(string first, string second, StringComparison comparisonType, bool expected) - { - Assert.Equal(expected, PathInternal.AreRootsEqual(first, second, comparisonType)); - } - } diff --git a/external/corefx/src/Common/tests/Tests/System/IO/PathInternal_Unix_Tests.cs b/external/corefx/src/Common/tests/Tests/System/IO/PathInternal_Unix_Tests.cs deleted file mode 100644 index 5eac9168c3..0000000000 --- a/external/corefx/src/Common/tests/Tests/System/IO/PathInternal_Unix_Tests.cs +++ /dev/null @@ -1,42 +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; -using System.IO; -using System.Text; -using Xunit; - -public class PathInternal_Unix_Tests -{ - [Theory, - InlineData(@"", @""), - InlineData(null, null), - InlineData(@"/", @"/"), - InlineData(@"//", @"/"), - InlineData(@"///", @"/"), - InlineData(@"\", @"\"), - InlineData(@"\\", @"\\"), - InlineData(@"\\\", @"\\\"), - InlineData(@"\/", @"\/"), - InlineData(@"\/\", @"\/\"), - - InlineData(@"a/a", @"a/a"), - InlineData(@"a//a", @"a/a"), - InlineData(@"a\\a", @"a\\a"), - InlineData(@"/a", @"/a"), - InlineData(@"//a", @"/a"), - InlineData(@"\\a", @"\\a"), - InlineData(@"a/", @"a/"), - InlineData(@"a//", @"a/"), - InlineData(@"a\\", @"a\\"), - ] - [PlatformSpecific(TestPlatforms.AnyUnix)] - public void NormalizeDirectorySeparatorTests(string path, string expected) - { - string result = PathInternal.NormalizeDirectorySeparators(path); - Assert.Equal(expected, result); - if (string.Equals(path, expected, StringComparison.Ordinal)) - Assert.Same(path, result); - } -} diff --git a/external/corefx/src/Common/tests/Tests/System/PasteArgumentsTests.cs b/external/corefx/src/Common/tests/Tests/System/PasteArgumentsTests.cs new file mode 100644 index 0000000000..592455ffb5 --- /dev/null +++ b/external/corefx/src/Common/tests/Tests/System/PasteArgumentsTests.cs @@ -0,0 +1,45 @@ +// 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; + +using Xunit; + +namespace Tests.System +{ + public class PasteArgumentsTests + { + [Theory] + [InlineData(@"app.exe arg1 arg2", new[] {"app.exe", "arg1", "arg2"})] + [InlineData(@"""app name.exe"" arg1 arg2", new[] {"app name.exe", "arg1", "arg2"})] + [InlineData(@"app.exe \\ arg2", new[] {"app.exe", @"\\", "arg2"})] + [InlineData(@"app.exe ""\"""" arg2", new[] {"app.exe", @"""", "arg2"})] // literal double quotation mark character + [InlineData(@"app.exe ""\\\"""" arg2", new[] {"app.exe", @"\""", "arg2"})] // 2N+1 backslashes before quote rule + [InlineData(@"app.exe ""\\\\\"""" arg2", new[] {"app.exe", @"\\""", "arg2"})] // 2N backslashes before quote rule + public void Pastes(string pasteExpected, string[] arguments) + { + Assert.Equal(pasteExpected, PasteArguments.Paste(arguments, pasteFirstArgumentUsingArgV0Rules: true)); + } + + [Theory] + [InlineData(@"""dir/app\""name.exe""", new[] {@"dir/app""name.exe"})] // no throwing on quotes, escaping quotes + [InlineData(@"""dir/app\\\""name.exe""", new[] {@"dir/app\""name.exe"})] // escaping a backslash + [InlineData(@"""dir/app\\\\\""name.exe""", new[] {@"dir/app\\""name.exe"})] // escaping backslashes + [PlatformSpecific(TestPlatforms.AnyUnix)] + public void Paste_Argv0Rules_Ignored_onUnix(string pasteExpected, string[] arguments) + { + Assert.Equal(pasteExpected, PasteArguments.Paste(arguments, pasteFirstArgumentUsingArgV0Rules: true)); + } + + [Theory] + [InlineData(@"dir/app""name.exe")] // throws + [InlineData(@"dir/app\""name.exe")] // throws and ignores a backslash + [InlineData(@"dir/app\\""name.exe")] // throws and ignores backslashes + [PlatformSpecific(TestPlatforms.Windows)] + public void Paste_Argv0Rules_ThrowsIfQuotes_OnWindows(string argv0) + { + Assert.Throws(() => PasteArguments.Paste(new []{argv0}, pasteFirstArgumentUsingArgV0Rules: true)); + } + } +} diff --git a/external/corefx/src/Common/tests/Tests/System/Text/ValueStringBuilderTests.cs b/external/corefx/src/Common/tests/Tests/System/Text/ValueStringBuilderTests.cs index d7878e8f55..e5155e540a 100644 --- a/external/corefx/src/Common/tests/Tests/System/Text/ValueStringBuilderTests.cs +++ b/external/corefx/src/Common/tests/Tests/System/Text/ValueStringBuilderTests.cs @@ -127,7 +127,7 @@ namespace System.Text.Tests Span span = vsb.AppendSpan(s.Length); Assert.Equal(sb.Length, vsb.Length); - s.AsReadOnlySpan().CopyTo(span); + s.AsSpan().CopyTo(span); } Assert.Equal(sb.Length, vsb.Length); @@ -214,31 +214,16 @@ namespace System.Text.Tests } [Fact] - public unsafe void Length_Growing_SetsNulls() + public unsafe void Indexer() { const string Text1 = "foobar"; var vsb = new ValueStringBuilder(); - // Shrink then grow within capacity vsb.Append(Text1); - Assert.Equal(Text1.Length, vsb.Length); - vsb.Length = 3; - Assert.Equal(3, vsb.Length); - vsb.Length = 6; - Assert.Equal(6, vsb.Length); - Assert.Equal("foo\0\0\0", vsb.ToString()); - // Grow over capacity - const string Text2 = "bar"; - Span stackSpace = stackalloc char[Text2.Length]; - var vsb2 = new ValueStringBuilder(stackSpace); - Assert.Equal(0, vsb2.Length); - vsb2.Append(Text2); - Assert.True(Text2.AsReadOnlySpan().SequenceEqual(stackSpace), "existing stack buffer should have been used"); - Assert.Equal(Text2.Length, vsb2.Length); - vsb2.Length = 6; - Assert.Equal(6, vsb2.Length); - Assert.Equal("bar\0\0\0", vsb2.ToString()); + Assert.Equal(vsb[3], 'b'); + vsb[3] = 'c'; + Assert.Equal(vsb[3], 'c'); } } } diff --git a/external/corefx/src/CoreFx.Private.TestUtilities/dir.props b/external/corefx/src/CoreFx.Private.TestUtilities/dir.props index 04794ecf65..6a80fe26a1 100644 --- a/external/corefx/src/CoreFx.Private.TestUtilities/dir.props +++ b/external/corefx/src/CoreFx.Private.TestUtilities/dir.props @@ -4,5 +4,7 @@ 1.0.0.0 Test + + true \ No newline at end of file diff --git a/external/corefx/src/CoreFx.Private.TestUtilities/pkg/CoreFx.Private.TestUtilities.pkgproj b/external/corefx/src/CoreFx.Private.TestUtilities/pkg/CoreFx.Private.TestUtilities.pkgproj new file mode 100644 index 0000000000..2f9f2405ba --- /dev/null +++ b/external/corefx/src/CoreFx.Private.TestUtilities/pkg/CoreFx.Private.TestUtilities.pkgproj @@ -0,0 +1,11 @@ + + + + + + uap10.0.16299;netcoreapp2.0;net461;$(AllXamarinFrameworks) + + + + + diff --git a/external/corefx/src/CoreFx.Private.TestUtilities/ref/CoreFx.Private.TestUtilities.cs b/external/corefx/src/CoreFx.Private.TestUtilities/ref/CoreFx.Private.TestUtilities.cs index 36e3c2430e..8ec7c9555a 100644 --- a/external/corefx/src/CoreFx.Private.TestUtilities/ref/CoreFx.Private.TestUtilities.cs +++ b/external/corefx/src/CoreFx.Private.TestUtilities/ref/CoreFx.Private.TestUtilities.cs @@ -42,6 +42,7 @@ namespace System public static bool ClientWebSocketPartialMessagesSupported { get { throw null; } } public static bool HasWindowsShell { get { throw null; } } public static bool IsArmProcess { get { throw null; } } + public static bool IsAlpine { get { throw null; } } public static bool IsCentos6 { get { throw null; } } public static bool IsDebian { get { throw null; } } public static bool IsDebian8 { get { throw null; } } @@ -87,6 +88,8 @@ namespace System public static bool IsUbuntu1604 { get { throw null; } } public static bool IsUbuntu1704 { get { throw null; } } public static bool IsUbuntu1710 { get { throw null; } } + public static bool IsUbuntu1710OrHigher { get { throw null; } } + public static bool IsUbuntu1804 { get { throw null; } } public static bool IsWindows { get { throw null; } } public static bool IsWindows10Version1607OrGreater { get { throw null; } } // >= Windows 10 Anniversary Update public static bool IsWindows10Version1703OrGreater { get { throw null; } } // >= Windows 10 Creators Update @@ -101,6 +104,8 @@ namespace System public static bool IsInAppContainer { get { throw null; } } public static bool IsWinRTSupported { get { throw null; } } public static bool IsXmlDsigXsltTransformSupported { get { throw null; } } + public static string LibcRelease { get { throw null; } } + public static string LibcVersion { get { throw null; } } public static System.Version OSXVersion { get { throw null; } } public static int WindowsVersion { get { throw null; } } public static string GetDistroVersionString() { throw null; } @@ -112,6 +117,10 @@ namespace System [CLSCompliant(false)] public static Xunit.TheoryData ToTheoryData(this System.Collections.Generic.IEnumerable data) { throw null; } } + public static partial class TestEnvironment + { + public static bool IsStressModeEnabled { get { throw null; } } + } } namespace System.Diagnostics { @@ -132,12 +141,14 @@ namespace System.Diagnostics public static System.Diagnostics.RemoteExecutorTestBase.RemoteInvokeHandle RemoteInvoke(System.Func method, string arg1, string arg2, string arg3, string arg4, string arg5, System.Diagnostics.RemoteInvokeOptions options = null) { throw null; } public static System.Diagnostics.RemoteExecutorTestBase.RemoteInvokeHandle RemoteInvoke(System.Func> method, System.Diagnostics.RemoteInvokeOptions options = null) { throw null; } public static System.Diagnostics.RemoteExecutorTestBase.RemoteInvokeHandle RemoteInvoke(System.Func> method, string arg, System.Diagnostics.RemoteInvokeOptions options = null) { throw null; } + public static System.Diagnostics.RemoteExecutorTestBase.RemoteInvokeHandle RemoteInvoke(System.Func> method, string arg1, string arg2, System.Diagnostics.RemoteInvokeOptions options = null) { throw null; } public static System.Diagnostics.RemoteExecutorTestBase.RemoteInvokeHandle RemoteInvokeRaw(System.Delegate method, string unparsedArg, System.Diagnostics.RemoteInvokeOptions options = null) { throw null; } public sealed partial class RemoteInvokeHandle : System.IDisposable { - public RemoteInvokeHandle(System.Diagnostics.Process process, System.Diagnostics.RemoteInvokeOptions options) { } + public RemoteInvokeHandle(System.Diagnostics.Process process, System.Diagnostics.RemoteInvokeOptions options, string assemblyName, string className, string methodName) { } + public int ExitCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public System.Diagnostics.RemoteInvokeOptions Options { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Diagnostics.Process Process { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Diagnostics.Process Process { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public void Dispose() { } } } @@ -149,6 +160,7 @@ namespace System.Diagnostics public string ExceptionFile { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public int ExpectedExitCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public bool Start { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool RunAsSudo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public System.Diagnostics.ProcessStartInfo StartInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public int TimeOut { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } } diff --git a/external/corefx/src/CoreFx.Private.TestUtilities/src/Configurations.props b/external/corefx/src/CoreFx.Private.TestUtilities/src/Configurations.props index c25540e032..44eaf2eca4 100644 --- a/external/corefx/src/CoreFx.Private.TestUtilities/src/Configurations.props +++ b/external/corefx/src/CoreFx.Private.TestUtilities/src/Configurations.props @@ -2,11 +2,14 @@ + netstandard; uapaot-Windows_NT; uap-Windows_NT; netfx-Windows_NT; netcoreapp-Windows_NT; netcoreapp-Unix; + netcoreapp2.0-Windows_NT; + netcoreapp2.0-Unix; \ No newline at end of file diff --git a/external/corefx/src/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj b/external/corefx/src/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj index 038d20d89c..01906227b1 100644 --- a/external/corefx/src/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj +++ b/external/corefx/src/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj @@ -9,23 +9,32 @@ false true false - + $(NoWarn);CS3021 + Test Utilities are not supported on this platform + + + + + + + - + - + + @@ -70,6 +79,9 @@ Common\Interop\Windows\kernel32\Interop.GetCurrentProcess_IntPtr.cs + + Common\System\PasteArguments.Windows.cs + Common\Interop\Windows\advapi32\Interop.OpenProcessToken_SafeAccessTokenHandle.cs @@ -97,6 +109,9 @@ Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs + + Common\System\PasteArguments.Unix.cs + Common\Interop\Unix\Interop.GetEUid.cs @@ -115,7 +130,7 @@ - + diff --git a/external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.Process.cs b/external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.Process.cs index 0e3bc9fa38..c608daafe4 100644 --- a/external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.Process.cs +++ b/external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.Process.cs @@ -58,13 +58,23 @@ namespace System.Diagnostics if (!File.Exists(HostRunner)) throw new IOException($"{HostRunner} test app isn't present in the test runtime directory."); - psi.FileName = HostRunner; - psi.Arguments = testConsoleAppArgs; + if (options.RunAsSudo) + { + psi.FileName = "sudo"; + psi.Arguments = HostRunner + " " + testConsoleAppArgs; + } + else + { + psi.FileName = HostRunner; + psi.Arguments = testConsoleAppArgs; + } // Return the handle to the process, which may or not be started return new RemoteInvokeHandle(options.Start ? Process.Start(psi) : - new Process() { StartInfo = psi }, options); + new Process() { StartInfo = psi }, options, + a.FullName, t.FullName, method.Name + ); } } } diff --git a/external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.cs b/external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.cs index b70b606df2..bf8331cd6f 100644 --- a/external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.cs +++ b/external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.cs @@ -20,7 +20,7 @@ namespace System.Diagnostics public const int SuccessExitCode = 42; /// The name of the test console app. - protected static readonly string TestConsoleApp = "RemoteExecutorConsoleApp.exe"; + protected static readonly string TestConsoleApp = Path.GetFullPath("RemoteExecutorConsoleApp.exe"); /// Invokes the method from this assembly in another process using the specified arguments. /// The method to invoke. @@ -40,7 +40,7 @@ namespace System.Diagnostics /// The method to invoke. /// Options to use for the invocation. public static RemoteInvokeHandle RemoteInvoke( - Func method, + Func method, RemoteInvokeOptions options = null) { return RemoteInvoke(GetMethodInfo(method), Array.Empty(), options); @@ -58,6 +58,7 @@ namespace System.Diagnostics /// Invokes the method from this assembly in another process using the specified arguments. /// The method to invoke. + /// The argument to pass to the method. /// Options to use for the invocation. public static RemoteInvokeHandle RemoteInvoke( Func> method, @@ -70,10 +71,23 @@ namespace System.Diagnostics /// Invokes the method from this assembly in another process using the specified arguments. /// The method to invoke. /// The first argument to pass to the method. + /// The second argument to pass to the method. /// Options to use for the invocation. public static RemoteInvokeHandle RemoteInvoke( - Func method, - string arg, + Func> method, + string arg1, string arg2, + RemoteInvokeOptions options = null) + { + return RemoteInvoke(GetMethodInfo(method), new[] { arg1, arg2 }, options); + } + + /// Invokes the method from this assembly in another process using the specified arguments. + /// The method to invoke. + /// The argument to pass to the method. + /// Options to use for the invocation. + public static RemoteInvokeHandle RemoteInvoke( + Func method, + string arg, RemoteInvokeOptions options = null) { return RemoteInvoke(GetMethodInfo(method), new[] { arg }, options); @@ -85,8 +99,8 @@ namespace System.Diagnostics /// The second argument to pass to the method. /// Options to use for the invocation. public static RemoteInvokeHandle RemoteInvoke( - Func method, - string arg1, string arg2, + Func method, + string arg1, string arg2, RemoteInvokeOptions options = null) { return RemoteInvoke(GetMethodInfo(method), new[] { arg1, arg2 }, options); @@ -99,8 +113,8 @@ namespace System.Diagnostics /// The third argument to pass to the method. /// Options to use for the invocation. public static RemoteInvokeHandle RemoteInvoke( - Func method, - string arg1, string arg2, string arg3, + Func method, + string arg1, string arg2, string arg3, RemoteInvokeOptions options = null) { return RemoteInvoke(GetMethodInfo(method), new[] { arg1, arg2, arg3 }, options); @@ -114,8 +128,8 @@ namespace System.Diagnostics /// The fourth argument to pass to the method. /// Options to use for the invocation. public static RemoteInvokeHandle RemoteInvoke( - Func method, - string arg1, string arg2, string arg3, string arg4, + Func method, + string arg1, string arg2, string arg3, string arg4, RemoteInvokeOptions options = null) { return RemoteInvoke(GetMethodInfo(method), new[] { arg1, arg2, arg3, arg4 }, options); @@ -130,8 +144,8 @@ namespace System.Diagnostics /// The fifth argument to pass to the method. /// Options to use for the invocation. public static RemoteInvokeHandle RemoteInvoke( - Func method, - string arg1, string arg2, string arg3, string arg4, string arg5, + Func method, + string arg1, string arg2, string arg3, string arg4, string arg5, RemoteInvokeOptions options = null) { return RemoteInvoke(GetMethodInfo(method), new[] { arg1, arg2, arg3, arg4, arg5 }, options); @@ -172,17 +186,52 @@ namespace System.Diagnostics /// A cleanup handle to the Process created for the remote invocation. public sealed class RemoteInvokeHandle : IDisposable { - public RemoteInvokeHandle(Process process, RemoteInvokeOptions options) + public RemoteInvokeHandle(Process process, RemoteInvokeOptions options, string assemblyName = null, string className = null, string methodName = null) { Process = process; Options = options; + AssemblyName = assemblyName; + ClassName = className; + MethodName = methodName; } - public Process Process { get; private set; } + private int _exitCode; + public int ExitCode + { + get + { + if (!PlatformDetection.IsUap) + { + Process.WaitForExit(); + return Process.ExitCode; + } + return _exitCode; + } + internal set + { + if (!PlatformDetection.IsUap) + { + throw new PlatformNotSupportedException("ExitCode property can only be set in UWP"); + } + _exitCode = value; + } + } + public Process Process { get; set; } public RemoteInvokeOptions Options { get; private set; } + public string AssemblyName { get; private set; } + public string ClassName { get; private set; } + public string MethodName { get; private set; } public void Dispose() { + GC.SuppressFinalize(this); // before Dispose(true) in case the Dispose call throws + Dispose(disposing: true); + } + + private void Dispose(bool disposing) + { + Assert.True(disposing, $"A test {AssemblyName}!{ClassName}.{MethodName} forgot to Dispose() the result of RemoteInvoke()"); + if (Process != null) { // A bit unorthodox to do throwing operations in a Dispose, but by doing it here we avoid @@ -222,6 +271,13 @@ namespace System.Diagnostics } } + ~RemoteInvokeHandle() + { + // Finalizer flags tests that omitted the explicit Dispose() call; they must have it, or they aren't + // waiting on the remote execution + Dispose(disposing: false); + } + private sealed class RemoteExecutionException : XunitException { internal RemoteExecutionException(string stackTrace) : base("Remote process failed with an unhandled exception.", stackTrace) { } @@ -232,6 +288,8 @@ namespace System.Diagnostics /// Options used with RemoteInvoke. public sealed class RemoteInvokeOptions { + private bool _runAsSudo; + public bool Start { get; set; } = true; public ProcessStartInfo StartInfo { get; set; } = new ProcessStartInfo(); public bool EnableProfiling { get; set; } = true; @@ -240,5 +298,22 @@ namespace System.Diagnostics public int TimeOut {get; set; } = RemoteExecutorTestBase.FailWaitTimeoutMilliseconds; public int ExpectedExitCode { get; set; } = RemoteExecutorTestBase.SuccessExitCode; public string ExceptionFile { get; } = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()); + + public bool RunAsSudo + { + get + { + return _runAsSudo; + } + set + { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + throw new PlatformNotSupportedException(); + } + + _runAsSudo = value; + } + } } } diff --git a/external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.uap.cs b/external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.uap.cs index 85649a6aba..a90e0c3270 100644 --- a/external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.uap.cs +++ b/external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.uap.cs @@ -36,6 +36,7 @@ namespace System.Diagnostics // that the method to invoke is available because we're already running in this assembly. Type t = method.DeclaringType; Assembly a = t.GetTypeInfo().Assembly; + int exitCode; using (AppServiceConnection remoteExecutionService = new AppServiceConnection()) { @@ -65,12 +66,13 @@ namespace System.Diagnostics AppServiceResponse response = remoteExecutionService.SendMessageAsync(message).GetAwaiter().GetResult(); Assert.True(response.Status == AppServiceResponseStatus.Success, $"response.Status = {response.Status}"); - int res = (int)response.Message["Results"]; - Assert.True(!options.CheckExitCode || res == options.ExpectedExitCode, (string)response.Message["Log"] + Environment.NewLine + $"Returned Error code: {res}"); + exitCode = (int)response.Message["Results"]; + Assert.True(!options.CheckExitCode || exitCode == options.ExpectedExitCode, (string)response.Message["Log"] + Environment.NewLine + $"Returned Error code: {exitCode}"); } - // RemoteInvokeHandle is not really needed in the UAP scenario but we use it just to have consistent interface as non UAP - return new RemoteInvokeHandle(null, options); + var handle = new RemoteInvokeHandle(null, options, null, null, null); + handle.ExitCode = exitCode; + return handle; } } } diff --git a/external/corefx/src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.NetFx.cs b/external/corefx/src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.NetFx.cs index 6fb51b99ec..8074805ba1 100644 --- a/external/corefx/src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.NetFx.cs +++ b/external/corefx/src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.NetFx.cs @@ -24,6 +24,9 @@ namespace System public static bool IsNetfx471OrNewer => GetFrameworkVersion() >= new Version(4, 7, 1); + public static string LibcRelease => ""; + public static string LibcVersion => ""; + // To get the framework version we can do it throught the registry key and getting the Release value under the .NET Framework key. // the mapping to each version can be found in: https://docs.microsoft.com/en-us/dotnet/framework/migration-guide/how-to-determine-which-versions-are-installed // everytime we ship a new version this method should be updated to include the new framework version. diff --git a/external/corefx/src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.NonNetFx.cs b/external/corefx/src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.NonNetFx.cs index 087f2cf9a0..8d5f5be0d2 100644 --- a/external/corefx/src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.NonNetFx.cs +++ b/external/corefx/src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.NonNetFx.cs @@ -2,6 +2,8 @@ // 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; +using System.Runtime.InteropServices; using Xunit; namespace System @@ -12,5 +14,50 @@ namespace System public static bool IsNetfx462OrNewer => false; public static bool IsNetfx470OrNewer => false; public static bool IsNetfx471OrNewer => false; + + + [DllImport("libc", ExactSpelling = true, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)] + private static extern IntPtr gnu_get_libc_release(); + + [DllImport("libc", ExactSpelling = true, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)] + private static extern IntPtr gnu_get_libc_version(); + + /// + /// If gnulibc is available, returns the release, such as "stable". + /// Otherwise (eg., Windows, musl) returns "glibc_not_found". + /// + public static string LibcRelease + { + get + { + try + { + return Marshal.PtrToStringUTF8(gnu_get_libc_release()); + } + catch (Exception e) when (e is DllNotFoundException || e is EntryPointNotFoundException) + { + return "glibc_not_found"; + } + } + } + + /// + /// If gnulibc is available, returns the version, such as "2.22". + /// Otherwise (eg., Windows, musl) returns "glibc_not_found". (In future could run "ldd -version" for musl) + /// + public static string LibcVersion + { + get + { + try + { + return Marshal.PtrToStringUTF8(gnu_get_libc_version()); + } + catch (Exception e) when (e is DllNotFoundException || e is EntryPointNotFoundException) + { + return "glibc_not_found"; + } + } + } } } diff --git a/external/corefx/src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.Unix.cs b/external/corefx/src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.Unix.cs index 505aa371de..4829b0549e 100644 --- a/external/corefx/src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.Unix.cs +++ b/external/corefx/src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.Unix.cs @@ -25,6 +25,7 @@ namespace System public static int WindowsVersion => -1; public static bool IsCentos6 => IsDistroAndVersion("centos", 6); + public static bool IsAlpine => IsDistroAndVersion("alpine"); public static bool IsOpenSUSE => IsDistroAndVersion("opensuse"); public static bool IsUbuntu => IsDistroAndVersion("ubuntu"); public static bool IsDebian => IsDistroAndVersion("debian"); @@ -33,6 +34,8 @@ namespace System public static bool IsUbuntu1604 => IsDistroAndVersion("ubuntu", 16, 4); public static bool IsUbuntu1704 => IsDistroAndVersion("ubuntu", 17, 4); public static bool IsUbuntu1710 => IsDistroAndVersion("ubuntu", 17, 10); + public static bool IsUbuntu1710OrHigher => IsDistroAndVersionOrHigher("ubuntu", 17, 10); + public static bool IsUbuntu1804 => IsDistroAndVersion("ubuntu", 18, 04); public static bool IsTizen => IsDistroAndVersion("tizen"); public static bool IsFedora => IsDistroAndVersion("fedora"); public static bool IsWindowsNanoServer => false; @@ -109,7 +112,18 @@ namespace System /// Whether the OS platform matches the given Linux distro and optional version. private static bool IsDistroAndVersion(string distroId, int major = -1, int minor = -1, int build = -1, int revision = -1) { - return IsDistroAndVersion((distro) => distro == distroId, major, minor, build, revision); + return IsDistroAndVersion(distro => (distro == distroId), major, minor, build, revision); + } + + /// + /// Get whether the OS platform matches the given Linux distro and optional version is same or higher. + /// + /// The distribution id. + /// The distro version. If omitted, compares the distro only. + /// Whether the OS platform matches the given Linux distro and optional version is same or higher. + private static bool IsDistroAndVersionOrHigher(string distroId, int major = -1, int minor = -1, int build = -1, int revision = -1) + { + return IsDistroAndVersionOrHigher(distro => (distro == distroId), major, minor, build, revision); } private static bool IsDistroAndVersion(Predicate distroPredicate, int major = -1, int minor = -1, int build = -1, int revision = -1) @@ -117,7 +131,7 @@ namespace System if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) { DistroInfo v = GetDistroInfo(); - if (distroPredicate(v.Id) && VersionEquivalentWith(major, minor, build, revision, v.VersionId)) + if (distroPredicate(v.Id) && VersionEquivalentTo(major, minor, build, revision, v.VersionId)) { return true; } @@ -126,7 +140,21 @@ namespace System return false; } - private static bool VersionEquivalentWith(int major, int minor, int build, int revision, Version actualVersionId) + private static bool IsDistroAndVersionOrHigher(Predicate distroPredicate, int major = -1, int minor = -1, int build = -1, int revision = -1) + { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + { + DistroInfo v = GetDistroInfo(); + if (distroPredicate(v.Id) && VersionEquivalentToOrHigher(major, minor, build, revision, v.VersionId)) + { + return true; + } + } + + return false; + } + + private static bool VersionEquivalentTo(int major, int minor, int build, int revision, Version actualVersionId) { return (major == -1 || major == actualVersionId.Major) && (minor == -1 || minor == actualVersionId.Minor) @@ -134,6 +162,17 @@ namespace System && (revision == -1 || revision == actualVersionId.Revision); } + private static bool VersionEquivalentToOrHigher(int major, int minor, int build, int revision, Version actualVersionId) + { + return + VersionEquivalentTo(major, minor, build, revision, actualVersionId) || + (actualVersionId.Major > major || + (actualVersionId.Major == major && actualVersionId.Minor > minor || + (actualVersionId.Minor == minor && actualVersionId.Build > build || + (actualVersionId.Build == build && actualVersionId.Revision > revision || + (actualVersionId.Revision == revision))))); + } + private static Version GetOSXProductVersion() { try diff --git a/external/corefx/src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.Windows.cs b/external/corefx/src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.Windows.cs index 0267fa2145..1bd78e27a5 100644 --- a/external/corefx/src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.Windows.cs +++ b/external/corefx/src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.Windows.cs @@ -21,11 +21,14 @@ namespace System public static bool IsOpenSUSE => false; public static bool IsUbuntu => false; public static bool IsDebian => false; + public static bool IsAlpine => false; public static bool IsDebian8 => false; public static bool IsUbuntu1404 => false; public static bool IsUbuntu1604 => false; public static bool IsUbuntu1704 => false; public static bool IsUbuntu1710 => false; + public static bool IsUbuntu1710OrHigher => false; + public static bool IsUbuntu1804 => false; public static bool IsTizen => false; public static bool IsNotFedoraOrRedHatFamily => true; public static bool IsFedora => false; @@ -69,7 +72,7 @@ namespace System public static bool IsWindows7 => GetWindowsVersion() == 6 && GetWindowsMinorVersion() == 1; public static bool IsWindows8x => GetWindowsVersion() == 6 && (GetWindowsMinorVersion() == 2 || GetWindowsMinorVersion() == 3); - public static string GetDistroVersionString() { return "ProductType=" + GetWindowsProductType() + "InstallationType=" + GetInstallationType(); } + public static string GetDistroVersionString() { return "WindowsProductType=" + GetWindowsProductType() + " WindowsInstallationType=" + GetInstallationType(); } private static int s_isInAppContainer = -1; diff --git a/external/corefx/src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.cs b/external/corefx/src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.cs index 23d2309c69..9161a05894 100644 --- a/external/corefx/src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.cs +++ b/external/corefx/src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.cs @@ -18,7 +18,7 @@ namespace System // do it in a way that failures don't cascade. // - public static bool HasWindowsShell => IsNotWindowsServerCore && IsNotWindowsNanoServer && IsNotWindowsIoTCore; + public static bool HasWindowsShell => IsWindows && IsNotWindowsServerCore && IsNotWindowsNanoServer && IsNotWindowsIoTCore; public static bool IsUap => IsInAppContainer || IsNetNative; public static bool IsFullFramework => RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework", StringComparison.OrdinalIgnoreCase); public static bool IsNetNative => RuntimeInformation.FrameworkDescription.StartsWith(".NET Native", StringComparison.OrdinalIgnoreCase); diff --git a/external/corefx/src/CoreFx.Private.TestUtilities/src/System/TestEnvironment.cs b/external/corefx/src/CoreFx.Private.TestUtilities/src/System/TestEnvironment.cs new file mode 100644 index 0000000000..ca7ad96583 --- /dev/null +++ b/external/corefx/src/CoreFx.Private.TestUtilities/src/System/TestEnvironment.cs @@ -0,0 +1,25 @@ +// 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 Xunit; + +namespace System +{ + public static partial class TestEnvironment + { + /// + /// Check if the stress mode is enabled. + /// + /// true if the environment variable COREFX_STRESS set to '1' or 'true'. returns false otherwise + public static bool IsStressModeEnabled + { + get + { + string value = Environment.GetEnvironmentVariable("COREFX_STRESS"); + return value != null && (value == "1" || value.Equals("true", StringComparison.OrdinalIgnoreCase)); + } + } + } +} diff --git a/external/corefx/src/Microsoft.CSharp/Microsoft.CSharp.sln b/external/corefx/src/Microsoft.CSharp/Microsoft.CSharp.sln index 15f386abe3..9291b8607b 100644 --- a/external/corefx/src/Microsoft.CSharp/Microsoft.CSharp.sln +++ b/external/corefx/src/Microsoft.CSharp/Microsoft.CSharp.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27004.2009 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CSharp.Tests", "tests\Microsoft.CSharp.Tests.csproj", "{82B54697-0251-47A1-8546-FC507D0F3B08}" ProjectSection(ProjectDependencies) = postProject @@ -47,7 +47,4 @@ Global {96AA2060-C846-4E56-9509-E8CB9C114C8F} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD} {1427906B-FF3D-422A-8278-F2B7E89DE12A} = {2E666815-2EDB-464B-9DF6-380BF4789AD4} EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {699239FB-3677-4369-9E97-09ED5E232491} - EndGlobalSection EndGlobal diff --git a/external/corefx/src/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj b/external/corefx/src/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj index eb6c2fe98f..45d2d8dd31 100644 --- a/external/corefx/src/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj +++ b/external/corefx/src/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj @@ -19,7 +19,7 @@ true - + diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft.CSharp.csproj b/external/corefx/src/Microsoft.CSharp/src/Microsoft.CSharp.csproj index 1390478839..c54a1d2e80 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft.CSharp.csproj +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft.CSharp.csproj @@ -48,7 +48,6 @@ - @@ -57,7 +56,6 @@ - @@ -65,7 +63,6 @@ - @@ -95,9 +92,8 @@ - - + @@ -119,7 +115,6 @@ - @@ -147,14 +142,12 @@ - - @@ -188,4 +181,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/BinderHelper.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/BinderHelper.cs index 4d114c3ea0..2123aeaa7a 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/BinderHelper.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/BinderHelper.cs @@ -19,7 +19,7 @@ namespace Microsoft.CSharp.RuntimeBinder private static MethodInfo s_SingleIsNaN; internal static DynamicMetaObject Bind( - DynamicMetaObjectBinder action, + ICSharpBinder action, RuntimeBinder binder, DynamicMetaObject[] args, IEnumerable arginfos, @@ -89,8 +89,7 @@ namespace Microsoft.CSharp.RuntimeBinder // Get the bound expression. try { - DynamicMetaObject deferredBinding; - Expression expression = binder.Bind(action, parameters, args, out deferredBinding); + Expression expression = binder.Bind(action, parameters, args, out DynamicMetaObject deferredBinding); if (deferredBinding != null) { @@ -282,7 +281,7 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private static Expression ConvertResult(Expression binding, DynamicMetaObjectBinder action) + private static Expression ConvertResult(Expression binding, ICSharpBinder action) { // Need to handle the following cases: // (1) Call to a constructor: no conversions. @@ -292,25 +291,21 @@ namespace Microsoft.CSharp.RuntimeBinder // In all other cases, binding.Type should be equivalent or // reference assignable to resultType. - var invokeConstructor = action as CSharpInvokeConstructorBinder; - if (invokeConstructor != null) + // No conversions needed for , the call site has the correct type. + if (action is CSharpInvokeConstructorBinder) { - // No conversions needed, the call site has the correct type. return binding; } if (binding.Type == typeof(void)) { - var invoke = action as ICSharpInvokeOrInvokeMemberBinder; - if (invoke != null && invoke.ResultDiscarded) + if (action is ICSharpInvokeOrInvokeMemberBinder invoke && invoke.ResultDiscarded) { Debug.Assert(action.ReturnType == typeof(object)); return Expression.Block(binding, Expression.Default(action.ReturnType)); } - else - { - throw Error.BindToVoidMethodButExpectResult(); - } + + throw Error.BindToVoidMethodButExpectResult(); } if (binding.Type.IsValueType && !action.ReturnType.IsValueType) @@ -324,7 +319,7 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private static Type GetTypeForErrorMetaObject(DynamicMetaObjectBinder action, DynamicMetaObject[] args) + private static Type GetTypeForErrorMetaObject(ICSharpBinder action, DynamicMetaObject[] args) { // This is similar to ConvertResult but has fewer things to worry about. @@ -341,13 +336,9 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private static bool IsIncrementOrDecrementActionOnLocal(DynamicMetaObjectBinder action) - { - CSharpUnaryOperationBinder operatorPayload = action as CSharpUnaryOperationBinder; - - return operatorPayload != null && - (operatorPayload.Operation == ExpressionType.Increment || operatorPayload.Operation == ExpressionType.Decrement); - } + private static bool IsIncrementOrDecrementActionOnLocal(ICSharpBinder action) => + action is CSharpUnaryOperationBinder operatorPayload + && (operatorPayload.Operation == ExpressionType.Increment || operatorPayload.Operation == ExpressionType.Decrement); ///////////////////////////////////////////////////////////////////////////////// @@ -497,9 +488,9 @@ namespace Microsoft.CSharp.RuntimeBinder return SpecialNames.CLR_False; case ExpressionType.Increment: - return SpecialNames.CLR_PreIncrement; + return SpecialNames.CLR_Increment; case ExpressionType.Decrement: - return SpecialNames.CLR_PreDecrement; + return SpecialNames.CLR_Decrement; } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpBinaryOperationBinder.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpBinaryOperationBinder.cs index 36f2d39fb9..3f4222965b 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpBinaryOperationBinder.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpBinaryOperationBinder.cs @@ -13,7 +13,7 @@ using Microsoft.CSharp.RuntimeBinder.Semantics; namespace Microsoft.CSharp.RuntimeBinder { /// - /// Represents a dynamic binary operation in C#, providing the binding semantics and the details about the operation. + /// Represents a dynamic binary operation in C#, providing the binding semantics and the details about the operation. /// Instances of this class are generated by the C# compiler. /// internal sealed class CSharpBinaryOperationBinder : BinaryOperationBinder, ICSharpBinder @@ -33,24 +33,20 @@ namespace Microsoft.CSharp.RuntimeBinder public Expr DispatchPayload(RuntimeBinder runtimeBinder, ArgumentObject[] arguments, LocalVariableSymbol[] locals) => runtimeBinder.BindBinaryOperation(this, arguments, locals); - public void PopulateSymbolTableWithName(SymbolTable symbolTable, Type callingType, ArgumentObject[] arguments) + public void PopulateSymbolTableWithName(Type callingType, ArgumentObject[] arguments) { string name = Operation.GetCLROperatorName(); Debug.Assert(name != null); - symbolTable.PopulateSymbolTableWithName(name, null, arguments[0].Type); - symbolTable.PopulateSymbolTableWithName(name, null, arguments[1].Type); + SymbolTable.PopulateSymbolTableWithName(name, null, arguments[0].Type); + SymbolTable.PopulateSymbolTableWithName(name, null, arguments[1].Type); } public bool IsBinderThatCanHaveRefReceiver => false; - public bool IsChecked { get; } - internal bool IsLogicalOperation => (_binopFlags & CSharpBinaryOperationFlags.LogicalOperation) != 0; private readonly CSharpBinaryOperationFlags _binopFlags; - public Type CallingContext { get; } - private readonly CSharpArgumentInfo[] _argumentInfo; CSharpArgumentInfo ICSharpBinder.GetArgumentInfo(int index) => _argumentInfo[index]; @@ -63,7 +59,7 @@ namespace Microsoft.CSharp.RuntimeBinder /// Initializes a new instance of the class. /// /// The binary operation kind. - /// True if the operation is defined in a checked context; otherwise false. + /// True if the operation is defined in a checked context; otherwise false. /// The flags associated with this binary operation. /// The that indicates where this operation is defined. /// The sequence of instances for the arguments to this operation. @@ -75,12 +71,10 @@ namespace Microsoft.CSharp.RuntimeBinder IEnumerable argumentInfo) : base(operation) { - IsChecked = isChecked; _binopFlags = binaryOperationFlags; - CallingContext = callingContext; _argumentInfo = BinderHelper.ToArray(argumentInfo); Debug.Assert(_argumentInfo.Length == 2); - _binder = RuntimeBinder.GetInstance(); + _binder = new RuntimeBinder(callingContext, isChecked); } /// diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpConvertBinder.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpConvertBinder.cs index a45684eac3..56993a48f3 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpConvertBinder.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpConvertBinder.cs @@ -11,7 +11,7 @@ using Microsoft.CSharp.RuntimeBinder.Semantics; namespace Microsoft.CSharp.RuntimeBinder { /// - /// Represents a dynamic conversion in C#, providing the binding semantics and the details about the operation. + /// Represents a dynamic conversion in C#, providing the binding semantics and the details about the operation. /// Instances of this class are generated by the C# compiler. /// internal sealed class CSharpConvertBinder : ConvertBinder, ICSharpBinder @@ -36,11 +36,11 @@ namespace Microsoft.CSharp.RuntimeBinder : runtimeBinder.BindImplicitConversion(arguments, Type, locals, ConversionKind == CSharpConversionKind.ArrayCreationConversion); } - public void PopulateSymbolTableWithName(SymbolTable symbolTable, Type callingType, ArgumentObject[] arguments) + public void PopulateSymbolTableWithName(Type callingType, ArgumentObject[] arguments) { // Conversions don't need to do anything, since they're just conversions! // After we add payload information, we add conversions for all argument - // types anyway, so that will get handled there. + // types anyway, so that will get handled there. } public bool IsBinderThatCanHaveRefReceiver => false; @@ -49,10 +49,6 @@ namespace Microsoft.CSharp.RuntimeBinder private CSharpConversionKind ConversionKind { get; } - public bool IsChecked { get; } - - public Type CallingContext { get; } - private readonly RuntimeBinder _binder; /// @@ -70,9 +66,7 @@ namespace Microsoft.CSharp.RuntimeBinder base(type, conversionKind == CSharpConversionKind.ExplicitConversion) { ConversionKind = conversionKind; - IsChecked = isChecked; - CallingContext = callingContext; - _binder = RuntimeBinder.GetInstance(); + _binder = new RuntimeBinder(callingContext, isChecked); } /// @@ -83,13 +77,13 @@ namespace Microsoft.CSharp.RuntimeBinder /// The representing the result of the binding. public override DynamicMetaObject FallbackConvert(DynamicMetaObject target, DynamicMetaObject errorSuggestion) { -#if ENABLECOMBINDER +#if ENABLECOMBINDER DynamicMetaObject com; if (!BinderHelper.IsWindowsRuntimeObject(target) && ComBinder.TryConvert(this, target, out com)) { return com; } -#endif +#endif BinderHelper.ValidateBindArgument(target, nameof(target)); return BinderHelper.Bind(this, _binder, new[] { target }, null, errorSuggestion); } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpGetIndexBinder.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpGetIndexBinder.cs index be3f82853f..2a1aa6c1f7 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpGetIndexBinder.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpGetIndexBinder.cs @@ -10,7 +10,7 @@ using Microsoft.CSharp.RuntimeBinder.Semantics; namespace Microsoft.CSharp.RuntimeBinder { /// - /// Represents a dynamic indexer access in C#, providing the binding semantics and the details about the operation. + /// Represents a dynamic indexer access in C#, providing the binding semantics and the details about the operation. /// Instances of this class are generated by the C# compiler. /// internal sealed class CSharpGetIndexBinder : GetIndexBinder, ICSharpBinder @@ -25,15 +25,11 @@ namespace Microsoft.CSharp.RuntimeBinder return runtimeBinder.BindProperty(this, arguments[0], locals[0], indexerArguments); } - public void PopulateSymbolTableWithName(SymbolTable symbolTable, Type callingType, ArgumentObject[] arguments) - => symbolTable.PopulateSymbolTableWithName(SpecialNames.Indexer, null, arguments[0].Type); + public void PopulateSymbolTableWithName(Type callingType, ArgumentObject[] arguments) + => SymbolTable.PopulateSymbolTableWithName(SpecialNames.Indexer, null, arguments[0].Type); public bool IsBinderThatCanHaveRefReceiver => true; - public Type CallingContext { get; } - - public bool IsChecked => false; - private readonly CSharpArgumentInfo[] _argumentInfo; CSharpArgumentInfo ICSharpBinder.GetArgumentInfo(int index) => _argumentInfo[index]; @@ -50,9 +46,8 @@ namespace Microsoft.CSharp.RuntimeBinder IEnumerable argumentInfo) : base(BinderHelper.CreateCallInfo(ref argumentInfo, 1)) // discard 1 argument: the target object { - CallingContext = callingContext; _argumentInfo = argumentInfo as CSharpArgumentInfo[]; - _binder = RuntimeBinder.GetInstance(); + _binder = new RuntimeBinder(callingContext); } /// diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpGetMemberBinder.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpGetMemberBinder.cs index 19290ddfc3..8bccb1e9a1 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpGetMemberBinder.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpGetMemberBinder.cs @@ -11,7 +11,7 @@ using Microsoft.CSharp.RuntimeBinder.Semantics; namespace Microsoft.CSharp.RuntimeBinder { /// - /// Represents a dynamic property access in C#, providing the binding semantics and the details about the operation. + /// Represents a dynamic property access in C#, providing the binding semantics and the details about the operation. /// Instances of this class are generated by the C# compiler. /// internal sealed class CSharpGetMemberBinder : GetMemberBinder, IInvokeOnGetBinder, ICSharpBinder @@ -24,15 +24,11 @@ namespace Microsoft.CSharp.RuntimeBinder return runtimeBinder.BindProperty(this, arguments[0], locals[0], null); } - public void PopulateSymbolTableWithName(SymbolTable symbolTable, Type callingType, ArgumentObject[] arguments) - => symbolTable.PopulateSymbolTableWithName(Name, null, arguments[0].Type); + public void PopulateSymbolTableWithName(Type callingType, ArgumentObject[] arguments) + => SymbolTable.PopulateSymbolTableWithName(Name, null, arguments[0].Type); public bool IsBinderThatCanHaveRefReceiver => false; - public Type CallingContext { get; } - - public bool IsChecked => false; - private readonly CSharpArgumentInfo[] _argumentInfo; CSharpArgumentInfo ICSharpBinder.GetArgumentInfo(int index) => _argumentInfo[index]; @@ -58,9 +54,8 @@ namespace Microsoft.CSharp.RuntimeBinder base(name, false /*caseInsensitive*/) { ResultIndexed = resultIndexed; - CallingContext = callingContext; _argumentInfo = BinderHelper.ToArray(argumentInfo); - _binder = RuntimeBinder.GetInstance(); + _binder = new RuntimeBinder(callingContext); } /// diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpInvokeBinder.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpInvokeBinder.cs index 4a7fa730bd..ca1842e5f2 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpInvokeBinder.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpInvokeBinder.cs @@ -10,7 +10,7 @@ using Microsoft.CSharp.RuntimeBinder.Semantics; namespace Microsoft.CSharp.RuntimeBinder { /// - /// Represents a dynamic delegate-like call in C#, providing the binding semantics and the details about the operation. + /// Represents a dynamic delegate-like call in C#, providing the binding semantics and the details about the operation. /// Instances of this class are generated by the C# compiler. /// internal sealed class CSharpInvokeBinder : InvokeBinder, ICSharpInvokeOrInvokeMemberBinder @@ -20,8 +20,8 @@ namespace Microsoft.CSharp.RuntimeBinder public Expr DispatchPayload(RuntimeBinder runtimeBinder, ArgumentObject[] arguments, LocalVariableSymbol[] locals) => runtimeBinder.DispatchPayload(this, arguments, locals); - public void PopulateSymbolTableWithName(SymbolTable symbolTable, Type callingType, ArgumentObject[] arguments) - => RuntimeBinder.PopulateSymbolTableWithPayloadInformation(symbolTable, this, callingType, arguments); + public void PopulateSymbolTableWithName(Type callingType, ArgumentObject[] arguments) + => RuntimeBinder.PopulateSymbolTableWithPayloadInformation(this, callingType, arguments); public bool IsBinderThatCanHaveRefReceiver => true; @@ -35,10 +35,6 @@ namespace Microsoft.CSharp.RuntimeBinder private readonly CSharpCallFlags _flags; - public Type CallingContext { get; } - - public bool IsChecked => false; - private readonly CSharpArgumentInfo[] _argumentInfo; CSharpArgumentInfo ICSharpBinder.GetArgumentInfo(int index) => _argumentInfo[index]; @@ -60,9 +56,8 @@ namespace Microsoft.CSharp.RuntimeBinder base(BinderHelper.CreateCallInfo(ref argumentInfo, 1)) // discard 1 argument: the target object (even if static, arg is type) { _flags = flags; - CallingContext = callingContext; _argumentInfo = argumentInfo as CSharpArgumentInfo[]; - _binder = RuntimeBinder.GetInstance(); + _binder = new RuntimeBinder(callingContext); } /// diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpInvokeConstructorBinder.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpInvokeConstructorBinder.cs index 5d61c0cfc6..ebac399ae1 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpInvokeConstructorBinder.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpInvokeConstructorBinder.cs @@ -16,17 +16,13 @@ namespace Microsoft.CSharp.RuntimeBinder public Expr DispatchPayload(RuntimeBinder runtimeBinder, ArgumentObject[] arguments, LocalVariableSymbol[] locals) => runtimeBinder.DispatchPayload(this, arguments, locals); - public void PopulateSymbolTableWithName(SymbolTable symbolTable, Type callingType, ArgumentObject[] arguments) - => RuntimeBinder.PopulateSymbolTableWithPayloadInformation(symbolTable, this, callingType, arguments); + public void PopulateSymbolTableWithName(Type callingType, ArgumentObject[] arguments) + => RuntimeBinder.PopulateSymbolTableWithPayloadInformation(this, callingType, arguments); public bool IsBinderThatCanHaveRefReceiver => true; public CSharpCallFlags Flags { get; } - public Type CallingContext { get; } - - public bool IsChecked => false; - private readonly CSharpArgumentInfo[] _argumentInfo; CSharpArgumentInfo ICSharpBinder.GetArgumentInfo(int index) => _argumentInfo[index]; @@ -47,9 +43,8 @@ namespace Microsoft.CSharp.RuntimeBinder IEnumerable argumentInfo) { Flags = flags; - CallingContext = callingContext; _argumentInfo = BinderHelper.ToArray(argumentInfo); - _binder = RuntimeBinder.GetInstance(); + _binder = new RuntimeBinder(callingContext); } public override DynamicMetaObject Bind(DynamicMetaObject target, DynamicMetaObject[] args) diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpInvokeMemberBinder.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpInvokeMemberBinder.cs index b5fbbd0d3d..2c00860571 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpInvokeMemberBinder.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpInvokeMemberBinder.cs @@ -11,7 +11,7 @@ using Microsoft.CSharp.RuntimeBinder.Semantics; namespace Microsoft.CSharp.RuntimeBinder { /// - /// Represents a dynamic method call in C#, providing the binding semantics and the details about the operation. + /// Represents a dynamic method call in C#, providing the binding semantics and the details about the operation. /// Instances of this class are generated by the C# compiler. /// internal sealed class CSharpInvokeMemberBinder : InvokeMemberBinder, ICSharpInvokeOrInvokeMemberBinder @@ -21,8 +21,8 @@ namespace Microsoft.CSharp.RuntimeBinder public Expr DispatchPayload(RuntimeBinder runtimeBinder, ArgumentObject[] arguments, LocalVariableSymbol[] locals) => runtimeBinder.DispatchPayload(this, arguments, locals); - public void PopulateSymbolTableWithName(SymbolTable symbolTable, Type callingType, ArgumentObject[] arguments) - => RuntimeBinder.PopulateSymbolTableWithPayloadInformation(symbolTable, this, callingType, arguments); + public void PopulateSymbolTableWithName(Type callingType, ArgumentObject[] arguments) + => RuntimeBinder.PopulateSymbolTableWithPayloadInformation(this, callingType, arguments); public bool IsBinderThatCanHaveRefReceiver => true; @@ -32,8 +32,6 @@ namespace Microsoft.CSharp.RuntimeBinder public Type CallingContext { get; } - public bool IsChecked => false; - public Type[] TypeArguments { get; } private readonly CSharpArgumentInfo[] _argumentInfo; @@ -71,7 +69,7 @@ namespace Microsoft.CSharp.RuntimeBinder CallingContext = callingContext; TypeArguments = BinderHelper.ToArray(typeArguments); _argumentInfo = BinderHelper.ToArray(argumentInfo); - _binder = RuntimeBinder.GetInstance(); + _binder = new RuntimeBinder(callingContext); } /// diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpIsEventBinder.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpIsEventBinder.cs index 742588018e..dfb0eba671 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpIsEventBinder.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpIsEventBinder.cs @@ -18,8 +18,8 @@ namespace Microsoft.CSharp.RuntimeBinder public Expr DispatchPayload(RuntimeBinder runtimeBinder, ArgumentObject[] arguments, LocalVariableSymbol[] locals) => runtimeBinder.BindIsEvent(this, arguments, locals); - public void PopulateSymbolTableWithName(SymbolTable symbolTable, Type callingType, ArgumentObject[] arguments) - => symbolTable.PopulateSymbolTableWithName(Name, null, arguments[0].Info.IsStaticType ? arguments[0].Value as Type : arguments[0].Type); + public void PopulateSymbolTableWithName(Type callingType, ArgumentObject[] arguments) + => SymbolTable.PopulateSymbolTableWithName(Name, null, arguments[0].Info.IsStaticType ? arguments[0].Value as Type : arguments[0].Type); public bool IsBinderThatCanHaveRefReceiver => false; @@ -27,10 +27,6 @@ namespace Microsoft.CSharp.RuntimeBinder public string Name { get; } - public Type CallingContext { get; } - - public bool IsChecked => false; - private readonly RuntimeBinder _binder; /// @@ -43,8 +39,7 @@ namespace Microsoft.CSharp.RuntimeBinder Type callingContext) { Name = name; - CallingContext = callingContext; - _binder = RuntimeBinder.GetInstance(); + _binder = new RuntimeBinder(callingContext); } /// diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpSetIndexBinder.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpSetIndexBinder.cs index 37bd58aba4..6e36118766 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpSetIndexBinder.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpSetIndexBinder.cs @@ -10,7 +10,7 @@ using Microsoft.CSharp.RuntimeBinder.Semantics; namespace Microsoft.CSharp.RuntimeBinder { /// - /// Represents a dynamic indexer access in C#, providing the binding semantics and the details about the operation. + /// Represents a dynamic indexer access in C#, providing the binding semantics and the details about the operation. /// Instances of this class are generated by the C# compiler. /// internal sealed class CSharpSetIndexBinder : SetIndexBinder, ICSharpBinder @@ -22,17 +22,13 @@ namespace Microsoft.CSharp.RuntimeBinder public Expr DispatchPayload(RuntimeBinder runtimeBinder, ArgumentObject[] arguments, LocalVariableSymbol[] locals) => runtimeBinder.BindAssignment(this, arguments, locals); - public void PopulateSymbolTableWithName(SymbolTable symbolTable, Type callingType, ArgumentObject[] arguments) - => symbolTable.PopulateSymbolTableWithName(SpecialNames.Indexer, null, arguments[0].Type); + public void PopulateSymbolTableWithName(Type callingType, ArgumentObject[] arguments) + => SymbolTable.PopulateSymbolTableWithName(SpecialNames.Indexer, null, arguments[0].Type); public bool IsBinderThatCanHaveRefReceiver => true; internal bool IsCompoundAssignment { get; } - public bool IsChecked { get; } - - public Type CallingContext { get; } - private readonly CSharpArgumentInfo[] _argumentInfo; CSharpArgumentInfo ICSharpBinder.GetArgumentInfo(int index) => _argumentInfo[index]; @@ -56,10 +52,8 @@ namespace Microsoft.CSharp.RuntimeBinder base(BinderHelper.CreateCallInfo(ref argumentInfo, 2)) // discard 2 arguments: the target object and the value { IsCompoundAssignment = isCompoundAssignment; - IsChecked = isChecked; - CallingContext = callingContext; _argumentInfo = argumentInfo as CSharpArgumentInfo[]; - _binder = RuntimeBinder.GetInstance(); + _binder = new RuntimeBinder(callingContext, isChecked); } /// diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpSetMemberBinder.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpSetMemberBinder.cs index ddf4611e0f..fb0ea5fe0c 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpSetMemberBinder.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpSetMemberBinder.cs @@ -10,7 +10,7 @@ using Microsoft.CSharp.RuntimeBinder.Semantics; namespace Microsoft.CSharp.RuntimeBinder { /// - /// Represents a dynamic property access in C#, providing the binding semantics and the details about the operation. + /// Represents a dynamic property access in C#, providing the binding semantics and the details about the operation. /// Instances of this class are generated by the C# compiler. /// internal sealed class CSharpSetMemberBinder : SetMemberBinder, ICSharpBinder @@ -20,17 +20,13 @@ namespace Microsoft.CSharp.RuntimeBinder public Expr DispatchPayload(RuntimeBinder runtimeBinder, ArgumentObject[] arguments, LocalVariableSymbol[] locals) => runtimeBinder.BindAssignment(this, arguments, locals); - public void PopulateSymbolTableWithName(SymbolTable symbolTable, Type callingType, ArgumentObject[] arguments) - => symbolTable.PopulateSymbolTableWithName(Name, null, arguments[0].Type); + public void PopulateSymbolTableWithName(Type callingType, ArgumentObject[] arguments) + => SymbolTable.PopulateSymbolTableWithName(Name, null, arguments[0].Type); public bool IsBinderThatCanHaveRefReceiver => false; internal bool IsCompoundAssignment { get; } - public bool IsChecked { get; } - - public Type CallingContext { get; } - private readonly CSharpArgumentInfo[] _argumentInfo; CSharpArgumentInfo ICSharpBinder.GetArgumentInfo(int index) => _argumentInfo[index]; @@ -57,10 +53,8 @@ namespace Microsoft.CSharp.RuntimeBinder base(name, false) { IsCompoundAssignment = isCompoundAssignment; - IsChecked = isChecked; - CallingContext = callingContext; _argumentInfo = BinderHelper.ToArray(argumentInfo); - _binder = RuntimeBinder.GetInstance(); + _binder = new RuntimeBinder(callingContext, isChecked); } /// diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpUnaryOperationBinder.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpUnaryOperationBinder.cs index 2b94e5c122..b9d477b569 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpUnaryOperationBinder.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpUnaryOperationBinder.cs @@ -13,7 +13,7 @@ using Microsoft.CSharp.RuntimeBinder.Semantics; namespace Microsoft.CSharp.RuntimeBinder { /// - /// Represents a dynamic unary operation in C#, providing the binding semantics and the details about the operation. + /// Represents a dynamic unary operation in C#, providing the binding semantics and the details about the operation. /// Instances of this class are generated by the C# compiler. /// internal sealed class CSharpUnaryOperationBinder : UnaryOperationBinder, ICSharpBinder @@ -34,15 +34,11 @@ namespace Microsoft.CSharp.RuntimeBinder public Expr DispatchPayload(RuntimeBinder runtimeBinder, ArgumentObject[] arguments, LocalVariableSymbol[] locals) => runtimeBinder.BindUnaryOperation(this, arguments, locals); - public void PopulateSymbolTableWithName(SymbolTable symbolTable, Type callingType, ArgumentObject[] arguments) - => symbolTable.PopulateSymbolTableWithName(Operation.GetCLROperatorName(), null, arguments[0].Type); + public void PopulateSymbolTableWithName(Type callingType, ArgumentObject[] arguments) + => SymbolTable.PopulateSymbolTableWithName(Operation.GetCLROperatorName(), null, arguments[0].Type); public bool IsBinderThatCanHaveRefReceiver => false; - public bool IsChecked { get; } - - public Type CallingContext { get; } - private readonly CSharpArgumentInfo[] _argumentInfo; CSharpArgumentInfo ICSharpBinder.GetArgumentInfo(int index) => _argumentInfo[index]; @@ -63,11 +59,9 @@ namespace Microsoft.CSharp.RuntimeBinder IEnumerable argumentInfo) : base(operation) { - IsChecked = isChecked; - CallingContext = callingContext; _argumentInfo = BinderHelper.ToArray(argumentInfo); Debug.Assert(_argumentInfo.Length == 1); - _binder = RuntimeBinder.GetInstance(); + _binder = new RuntimeBinder(callingContext, isChecked); } /// diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Error.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Error.cs index 34e6a16154..b9968e57e2 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Error.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Error.cs @@ -50,7 +50,5 @@ namespace Microsoft.CSharp.RuntimeBinder internal static Exception DynamicArgumentNeedsValue(string paramName) => new ArgumentException(SR.DynamicArgumentNeedsValue, paramName); - - internal static Exception BindingNameCollision() => new RuntimeBinderException(SR.BindingNameCollision); } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorCode.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorCode.cs index c762ace62d..d0003f4cd5 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorCode.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorCode.cs @@ -16,7 +16,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors ERR_AmbigBinaryOps = 34, ERR_AmbigUnaryOp = 35, ERR_ValueCantBeNull = 37, - ERR_WrongNestedThis = 38, ERR_NoSuchMember = 117, ERR_ObjectRequired = 120, ERR_AmbigCall = 121, @@ -59,9 +58,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors ERR_BindToBogusProp1 = 1546, ERR_BadDelArgCount = 1593, ERR_BadDelArgTypes = 1594, - ERR_ReturnNotLValue = 1612, - ERR_AssgReadonly2 = 1648, - ERR_AssgReadonlyStatic2 = 1650, ERR_BadCtorArgCount = 1729, ERR_BadNamedArgument = 1739, ERR_DuplicateNamedArgument = 1740, diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorFacts.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorFacts.cs index 81c4f736d2..44faf2f157 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorFacts.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorFacts.cs @@ -44,9 +44,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors case ErrorCode.ERR_ValueCantBeNull: codeStr = SR.ValueCantBeNull; break; - case ErrorCode.ERR_WrongNestedThis: - codeStr = SR.WrongNestedThis; - break; case ErrorCode.ERR_NoSuchMember: codeStr = SR.NoSuchMember; break; @@ -173,15 +170,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors case ErrorCode.ERR_BadDelArgTypes: codeStr = SR.BadDelArgTypes; break; - case ErrorCode.ERR_ReturnNotLValue: - codeStr = SR.ReturnNotLValue; - break; - case ErrorCode.ERR_AssgReadonly2: - codeStr = SR.AssgReadonly2; - break; - case ErrorCode.ERR_AssgReadonlyStatic2: - codeStr = SR.AssgReadonlyStatic2; - break; case ErrorCode.ERR_BadCtorArgCount: codeStr = SR.BadCtorArgCount; break; diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorHandling.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorHandling.cs index ded6351a7f..d7f95036ea 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorHandling.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorHandling.cs @@ -9,16 +9,9 @@ using Microsoft.CSharp.RuntimeBinder.Semantics; namespace Microsoft.CSharp.RuntimeBinder.Errors { - internal sealed class ErrorHandling + internal static class ErrorHandling { - private readonly UserStringBuilder _userStringBuilder; - - public ErrorHandling(GlobalSymbolContext globalSymbols) - { - _userStringBuilder = new UserStringBuilder(globalSymbols); - } - - public RuntimeBinderException Error(ErrorCode id, params ErrArg[] args) + public static RuntimeBinderException Error(ErrorCode id, params ErrArg[] args) { // Create an argument array manually using the type information in the ErrArgs. string[] prgpsz = new string[args.Length]; @@ -28,6 +21,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors int piarg = 0; int cargUnique = 0; + UserStringBuilder builder = new UserStringBuilder(); + for (int iarg = 0; iarg < args.Length; iarg++) { ErrArg arg = args[iarg]; @@ -37,7 +32,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors continue; - if (!_userStringBuilder.ErrArgToString(out prgpsz[ppsz], arg, out bool fUserStrings)) + if (!builder.ErrArgToString(out prgpsz[ppsz], arg, out bool fUserStrings)) { if (arg.eak == ErrArgKind.Int) { diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/UserStringBuilder.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/UserStringBuilder.cs index ffa7518cb9..ba0b90b163 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/UserStringBuilder.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/UserStringBuilder.cs @@ -10,36 +10,28 @@ using Microsoft.CSharp.RuntimeBinder.Syntax; namespace Microsoft.CSharp.RuntimeBinder.Errors { - internal sealed class UserStringBuilder + internal struct UserStringBuilder { - private bool m_buildingInProgress; - private GlobalSymbolContext m_globalSymbols; - private StringBuilder m_strBuilder; - - public UserStringBuilder( - GlobalSymbolContext globalSymbols) - { - Debug.Assert(globalSymbols != null); - m_buildingInProgress = false; - m_globalSymbols = globalSymbols; - } + private StringBuilder _strBuilder; private void BeginString() { - Debug.Assert(!m_buildingInProgress); - m_buildingInProgress = true; - m_strBuilder = new StringBuilder(); + Debug.Assert(_strBuilder == null || _strBuilder.Length == 0); + if(_strBuilder == null) + { + _strBuilder = new StringBuilder(); + } } - private void EndString(out string s) + private string EndString() { - Debug.Assert(m_buildingInProgress); - m_buildingInProgress = false; - s = m_strBuilder.ToString(); - m_strBuilder = null; + Debug.Assert(_strBuilder != null); + string s = _strBuilder.ToString(); + _strBuilder.Clear(); + return s; } - private void ErrSK(out string psz, SYMKIND sk) + private static string ErrSK(SYMKIND sk) { MessageID id; switch (sk) @@ -74,7 +66,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors break; } - ErrId(out psz, id); + return ErrId(id); } /* * Create a fill-in string describing a parameter list. @@ -105,12 +97,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors private void ErrAppendString(string str) { - m_strBuilder.Append(str); + _strBuilder.Append(str); } private void ErrAppendChar(char ch) { - m_strBuilder.Append(ch); + _strBuilder.Append(ch); } private void ErrAppendPrintf(string format, params object[] args) @@ -141,9 +133,9 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors return; } - if (pctx != null && !pctx.FNop() && parent is AggregateSymbol agg && 0 != agg.GetTypeVarsAll().Count) + if (pctx != null && !pctx.IsNop && parent is AggregateSymbol agg && 0 != agg.GetTypeVarsAll().Count) { - CType pType = GetTypeManager().SubstType(agg.getThisType(), pctx); + CType pType = TypeManager.SubstType(agg.getThisType(), pctx); ErrAppendType(pType, null); } else @@ -153,7 +145,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors ErrAppendChar('.'); } - private void ErrAppendTypeParameters(TypeArray @params, SubstContext pctx, bool forClass) + private void ErrAppendTypeParameters(TypeArray @params, SubstContext pctx) { if (@params != null && @params.Count != 0) { @@ -175,100 +167,108 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors ErrAppendParentSym(meth, pctx); // Get the type args from the explicit impl type and substitute using pctx (if there is one). - SubstContext ctx = new SubstContext(GetTypeManager().SubstType(meth.swtSlot.GetType(), pctx)); + SubstContext ctx = new SubstContext(TypeManager.SubstType(meth.swtSlot.GetType(), pctx)); ErrAppendSym(meth.swtSlot.Sym, ctx, fArgs); // args already added return; } - if (meth.isPropertyAccessor()) + MethodKindEnum methodKind = meth.MethKind; + switch (methodKind) { - PropertySymbol prop = meth.getProperty(); + case MethodKindEnum.PropAccessor: + PropertySymbol prop = meth.getProperty(); - // this includes the parent class - ErrAppendSym(prop, pctx); + // this includes the parent class + ErrAppendSym(prop, pctx); - // add accessor name - if (prop.GetterMethod == meth) - { - ErrAppendString(".get"); - } - else - { - Debug.Assert(meth == prop.SetterMethod); - ErrAppendString(".set"); - } + // add accessor name + if (prop.GetterMethod == meth) + { + ErrAppendString(".get"); + } + else + { + Debug.Assert(meth == prop.SetterMethod); + ErrAppendString(".set"); + } - // args already added - return; - } + // args already added + return; - if (meth.isEventAccessor()) - { - EventSymbol @event = meth.getEvent(); + case MethodKindEnum.EventAccessor: + EventSymbol @event = meth.getEvent(); - // this includes the parent class - ErrAppendSym(@event, pctx); + // this includes the parent class + ErrAppendSym(@event, pctx); - // add accessor name - if (@event.methAdd == meth) - { - ErrAppendString(".add"); - } - else - { - Debug.Assert(meth == @event.methRemove); - ErrAppendString(".remove"); - } + // add accessor name + if (@event.methAdd == meth) + { + ErrAppendString(".add"); + } + else + { + Debug.Assert(meth == @event.methRemove); + ErrAppendString(".remove"); + } - // args already added - return; + // args already added + return; } ErrAppendParentSym(meth, pctx); - if (meth.IsConstructor()) + switch (methodKind) { - // Use the name of the parent class instead of the name "". - ErrAppendName(meth.getClass().name); - } - else if (meth.IsDestructor()) - { - // Use the name of the parent class instead of the name "Finalize". - ErrAppendChar('~'); - ErrAppendName(meth.getClass().name); - } - else if (meth.isConversionOperator()) - { - // implicit/explicit - ErrAppendString(meth.isImplicit() ? "implicit" : "explicit"); - ErrAppendString(" operator "); + case MethodKindEnum.Constructor: + // Use the name of the parent class instead of the name "". + ErrAppendName(meth.getClass().name); + break; - // destination type name - ErrAppendType(meth.RetType, pctx); - } - else if (meth.isOperator) - { - // handle user defined operators - // map from CLS predefined names to "operator " - ErrAppendString("operator "); - ErrAppendString(Operators.OperatorOfMethodName(meth.name)); - } - else if (!meth.IsExpImpl()) - { - // regular method - ErrAppendName(meth.name); + case MethodKindEnum.Destructor: + // Use the name of the parent class instead of the name "Finalize". + ErrAppendChar('~'); + goto case MethodKindEnum.Constructor; + + case MethodKindEnum.ExplicitConv: + ErrAppendString("explicit"); + goto convOperatorName; + + case MethodKindEnum.ImplicitConv: + ErrAppendString("implicit"); + + convOperatorName: + ErrAppendString(" operator "); + + // destination type name + ErrAppendType(meth.RetType, pctx); + break; + + default: + if (meth.isOperator) + { + // handle user defined operators + // map from CLS predefined names to "operator " + ErrAppendString("operator "); + ErrAppendString(Operators.OperatorOfMethodName(meth.name)); + } + else if (!meth.IsExpImpl()) + { + // regular method + ErrAppendName(meth.name); + } + + break; } - ErrAppendTypeParameters(meth.typeVars, pctx, false); + ErrAppendTypeParameters(meth.typeVars, pctx); if (fArgs) { // append argument types ErrAppendChar('('); - - ErrAppendParamList(GetTypeManager().SubstTypeArray(meth.Params, pctx), meth.isParamArray); - + ErrAppendParamList(TypeManager.SubstTypeArray(meth.Params, pctx), meth.isParamArray); ErrAppendChar(')'); } } @@ -276,7 +276,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors private void ErrAppendIndexer(IndexerSymbol indexer, SubstContext pctx) { ErrAppendString("this["); - ErrAppendParamList(GetTypeManager().SubstTypeArray(indexer.Params, pctx), indexer.isParamArray); + ErrAppendParamList(TypeManager.SubstTypeArray(indexer.Params, pctx), indexer.isParamArray); ErrAppendChar(']'); } private void ErrAppendProperty(PropertySymbol prop, SubstContext pctx) @@ -286,7 +286,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors { if (prop.swtSlot.Sym != null) { - SubstContext ctx = new SubstContext(GetTypeManager().SubstType(prop.swtSlot.GetType(), pctx)); + SubstContext ctx = new SubstContext(TypeManager.SubstType(prop.swtSlot.GetType(), pctx)); ErrAppendSym(prop.swtSlot.Sym, ctx); } else if (prop is IndexerSymbol indexer) @@ -305,16 +305,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors } } - private void ErrAppendEvent(EventSymbol @event, SubstContext pctx) - { - } - - private void ErrAppendId(MessageID id) - { - string str; - ErrId(out str, id); - ErrAppendString(str); - } + private void ErrAppendId(MessageID id) => ErrAppendString(ErrId(id)); /* * Create a fill-in string describing a symbol. @@ -328,10 +319,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors { switch (sym.getKind()) { - case SYMKIND.SK_AggregateDeclaration: - ErrAppendSym(((AggregateDeclaration)sym).Agg(), pctx); - break; - case SYMKIND.SK_AggregateSymbol: { // Check for a predefined class with a special "nice" name for @@ -346,7 +333,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors { ErrAppendParentSym(sym, pctx); ErrAppendName(sym.name); - ErrAppendTypeParameters(((AggregateSymbol)sym).GetTypeVars(), pctx, true); + ErrAppendTypeParameters(((AggregateSymbol)sym).GetTypeVars(), pctx); } break; } @@ -360,7 +347,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors break; case SYMKIND.SK_EventSymbol: - ErrAppendEvent((EventSymbol)sym, pctx); break; case SYMKIND.SK_NamespaceSymbol: @@ -406,24 +392,14 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors } } - private void ErrAppendType(CType pType, SubstContext pCtx) + private void ErrAppendType(CType pType, SubstContext pctx) { - ErrAppendType(pType, pCtx, true); - } - - private void ErrAppendType(CType pType, SubstContext pctx, bool fArgs) - { - if (pctx != null) + if (pctx != null && !pctx.IsNop) { - if (!pctx.FNop()) - { - pType = GetTypeManager().SubstType(pType, pctx); - } - // We shouldn't use the SubstContext again so set it to NULL. - pctx = null; + pType = TypeManager.SubstType(pType, pctx); } - switch (pType.GetTypeKind()) + switch (pType.TypeKind) { case TypeKind.TK_AggregateType: { @@ -431,7 +407,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors // Check for a predefined class with a special "nice" name for // error reported. - string text = PredefinedTypes.GetNiceName(pAggType.getAggregate()); + string text = PredefinedTypes.GetNiceName(pAggType.OwningAggregate); if (text != null) { // Found a nice name. @@ -439,38 +415,42 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors } else { - if (pAggType.outerType != null) + if (pAggType.OuterType != null) { - ErrAppendType(pAggType.outerType, pctx); + ErrAppendType(pAggType.OuterType, null); ErrAppendChar('.'); } else { // In a namespace. - ErrAppendParentSym(pAggType.getAggregate(), pctx); + ErrAppendParentSym(pAggType.OwningAggregate, null); } - ErrAppendName(pAggType.getAggregate().name); + + ErrAppendName(pAggType.OwningAggregate.name); } - ErrAppendTypeParameters(pAggType.GetTypeArgsThis(), pctx, true); + + ErrAppendTypeParameters(pAggType.TypeArgsThis, null); break; } case TypeKind.TK_TypeParameterType: - if (null == pType.GetName()) + TypeParameterType tpType = (TypeParameterType)pType; + if (null == tpType.Name) { - var tpType = (TypeParameterType)pType; // It's a standard type variable. - if (tpType.IsMethodTypeParameter()) + if (tpType.IsMethodTypeParameter) { ErrAppendChar('!'); } + ErrAppendChar('!'); - ErrAppendPrintf("{0}", tpType.GetIndexInTotalParameters()); + ErrAppendPrintf("{0}", tpType.IndexInTotalParameters); } else { - ErrAppendName(pType.GetName()); + ErrAppendName(tpType.Name); } + break; case TypeKind.TK_NullType: @@ -488,21 +468,17 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors case TypeKind.TK_ArrayType: { - CType elementType = ((ArrayType)pType).GetBaseElementType(); + CType elementType = ((ArrayType)pType).BaseElementType; - if (null == elementType) - { - Debug.Assert(false, "No element type"); - break; - } + Debug.Assert(elementType != null, "No element type"); - ErrAppendType(elementType, pctx); + ErrAppendType(elementType, null); for (elementType = pType; elementType is ArrayType arrType; - elementType = arrType.GetElementType()) + elementType = arrType.ElementType) { - int rank = arrType.rank; + int rank = arrType.Rank; // Add [] with (rank-1) commas inside ErrAppendChar('['); @@ -535,15 +511,15 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors case TypeKind.TK_ParameterModifierType: ParameterModifierType mod = (ParameterModifierType)pType; // add ref or out - ErrAppendString(mod.isOut ? "out " : "ref "); + ErrAppendString(mod.IsOut ? "out " : "ref "); // add base type name - ErrAppendType(mod.GetParameterType(), pctx); + ErrAppendType(mod.ParameterType, null); break; case TypeKind.TK_PointerType: // Generate the base type. - ErrAppendType(((PointerType)pType).GetReferentType(), pctx); + ErrAppendType(((PointerType)pType).ReferentType, null); { // add the trailing * ErrAppendChar('*'); @@ -551,7 +527,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors break; case TypeKind.TK_NullableType: - ErrAppendType(((NullableType)pType).GetUnderlyingType(), pctx); + ErrAppendType(((NullableType)pType).UnderlyingType, null); ErrAppendChar('?'); break; @@ -572,18 +548,18 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors switch (parg.eak) { case ErrArgKind.SymKind: - ErrSK(out psz, parg.sk); + psz = ErrSK(parg.sk); break; case ErrArgKind.Type: BeginString(); ErrAppendType(parg.pType, null); - EndString(out psz); + psz = EndString(); fUserStrings = true; break; case ErrArgKind.Sym: BeginString(); ErrAppendSym(parg.sym, null); - EndString(out psz); + psz = EndString(); fUserStrings = true; break; case ErrArgKind.Name: @@ -605,7 +581,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors SubstContext ctx = new SubstContext(parg.swtMemo.ats, null); BeginString(); ErrAppendSym(parg.swtMemo.sym, ctx, true); - EndString(out psz); + psz = EndString(); fUserStrings = true; break; } @@ -615,7 +591,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors SubstContext ctx = new SubstContext(parg.mpwiMemo.ats, parg.mpwiMemo.typeArgs); BeginString(); ErrAppendSym(parg.mpwiMemo.sym, ctx, true); - EndString(out psz); + psz = EndString(); fUserStrings = true; break; } @@ -627,14 +603,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Errors return result; } - private TypeManager GetTypeManager() - { - return m_globalSymbols.GetTypes(); - } - - private void ErrId(out string s, MessageID id) - { - s = ErrorFacts.GetMessage(id); - } + private static string ErrId(MessageID id) => ErrorFacts.GetMessage(id); } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ExpressionTreeCallRewriter.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ExpressionTreeCallRewriter.cs index e2274d1bc3..0cbde82943 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ExpressionTreeCallRewriter.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ExpressionTreeCallRewriter.cs @@ -29,25 +29,23 @@ namespace Microsoft.CSharp.RuntimeBinder private readonly Dictionary _DictionaryOfParameters; private readonly Expression[] _ListOfParameters; - private readonly TypeManager _typeManager; - // Counts how many EXPRSAVEs we've encountered so we know which index into the + // Counts how many EXPRSAVEs we've encountered so we know which index into the // parameter list we should be taking. private int _currentParameterIndex; ///////////////////////////////////////////////////////////////////////////////// - private ExpressionTreeCallRewriter(TypeManager typeManager, Expression[] listOfParameters) + private ExpressionTreeCallRewriter(Expression[] listOfParameters) { - _typeManager = typeManager; _DictionaryOfParameters = new Dictionary(); _ListOfParameters = listOfParameters; } ///////////////////////////////////////////////////////////////////////////////// - public static Expression Rewrite(TypeManager typeManager, ExprBinOp binOp, Expression[] listOfParameters) + public static Expression Rewrite(ExprBinOp binOp, Expression[] listOfParameters) { - ExpressionTreeCallRewriter rewriter = new ExpressionTreeCallRewriter(typeManager, listOfParameters); + ExpressionTreeCallRewriter rewriter = new ExpressionTreeCallRewriter(listOfParameters); // We should have a ExprBinOp that's an EK_SEQUENCE. The RHS of our sequence // should be a call to PM_EXPRESSION_LAMBDA. The LHS of our sequence is the @@ -260,7 +258,7 @@ namespace Microsoft.CSharp.RuntimeBinder } Expression obj = null; - MethodInfo m = GetMethodInfoFromExpr(methinfo); + MethodInfo m = methinfo.MethodInfo; Expression[] arguments = GetArgumentsFromArrayInit(arrinit); if (m == null) @@ -333,7 +331,7 @@ namespace Microsoft.CSharp.RuntimeBinder } Debug.Assert((pExpr.Flags & EXPRFLAG.EXF_UNBOXRUNTIME) == 0); - MethodInfo m = GetMethodInfoFromExpr((ExprMethodInfo)list2.OptionalNextListNode); + MethodInfo m = ((ExprMethodInfo)list2.OptionalNextListNode).MethodInfo; if (pm == PREDEFMETH.PM_EXPRESSION_CONVERT_USER_DEFINED) { @@ -395,7 +393,7 @@ namespace Microsoft.CSharp.RuntimeBinder arguments = null; } - PropertyInfo p = GetPropertyInfoFromExpr(propinfo); + PropertyInfo p = propinfo.PropertyInfo; if (p == null) { @@ -455,20 +453,19 @@ namespace Microsoft.CSharp.RuntimeBinder { ExprList list = (ExprList)pExpr.OptionalArguments; - var constructor = GetConstructorInfoFromExpr(list.OptionalElement as ExprMethodInfo); - var arguments = GetArgumentsFromArrayInit(list.OptionalNextListNode as ExprArrayInit); + ConstructorInfo constructor = ((ExprMethodInfo)list.OptionalElement).ConstructorInfo; + Expression[] arguments = GetArgumentsFromArrayInit(list.OptionalNextListNode as ExprArrayInit); return Expression.New(constructor, arguments); } ///////////////////////////////////////////////////////////////////////////////// - private Expression GenerateConstantType(ExprCall pExpr) + private static Expression GenerateConstantType(ExprCall pExpr) { ExprList list = (ExprList)pExpr.OptionalArguments; return Expression.Constant( - GetObject(list.OptionalElement), - ((ExprTypeOf)list.OptionalNextListNode).SourceType.AssociatedSystemType); + list.OptionalElement.Object, ((ExprTypeOf)list.OptionalNextListNode).SourceType.AssociatedSystemType); } ///////////////////////////////////////////////////////////////////////////////// @@ -560,11 +557,11 @@ namespace Microsoft.CSharp.RuntimeBinder ExprConstant isLifted = (ExprConstant)next.OptionalElement; Debug.Assert(isLifted != null); bIsLifted = isLifted.Val.Int32Val == 1; - methodInfo = GetMethodInfoFromExpr((ExprMethodInfo)next.OptionalNextListNode); + methodInfo = ((ExprMethodInfo)next.OptionalNextListNode).MethodInfo; } else { - methodInfo = GetMethodInfoFromExpr((ExprMethodInfo)list.OptionalNextListNode); + methodInfo = ((ExprMethodInfo)list.OptionalNextListNode).MethodInfo; } switch (pExpr.PredefinedMethod) @@ -651,7 +648,7 @@ namespace Microsoft.CSharp.RuntimeBinder PREDEFMETH pm = pExpr.PredefinedMethod; ExprList list = (ExprList)pExpr.OptionalArguments; Expression arg = GetExpression(list.OptionalElement); - MethodInfo methodInfo = GetMethodInfoFromExpr((ExprMethodInfo)list.OptionalNextListNode); + MethodInfo methodInfo = ((ExprMethodInfo)list.OptionalNextListNode).MethodInfo; switch (pm) { @@ -871,105 +868,6 @@ namespace Microsoft.CSharp.RuntimeBinder } } - ///////////////////////////////////////////////////////////////////////////////// - - private object GetObject(Expr pExpr) - { - for (;;) - { - if (pExpr is ExprCast cast) - { - pExpr = cast.Argument; - } - else if (pExpr is ExprTypeOf typeOf) - { - return typeOf.SourceType.AssociatedSystemType; - } - else if (pExpr is ExprMethodInfo methodInfo) - { - return GetMethodInfoFromExpr(methodInfo); - } - else if (pExpr is ExprConstant constant) - { - ConstVal val = constant.Val; - CType underlyingType = pExpr.Type; - object objval; - - if (pExpr.Type is NullType) - { - return null; - } - - if (pExpr.Type.isEnumType()) - { - underlyingType = underlyingType.getAggregate().GetUnderlyingType(); - } - - switch (Type.GetTypeCode(underlyingType.AssociatedSystemType)) - { - case TypeCode.Boolean: - objval = val.BooleanVal; - break; - case TypeCode.SByte: - objval = val.SByteVal; - break; - case TypeCode.Byte: - objval = val.ByteVal; - break; - case TypeCode.Int16: - objval = val.Int16Val; - break; - case TypeCode.UInt16: - objval = val.UInt16Val; - break; - case TypeCode.Int32: - objval = val.Int32Val; - break; - case TypeCode.UInt32: - objval = val.UInt32Val; - break; - case TypeCode.Int64: - objval = val.Int64Val; - break; - case TypeCode.UInt64: - objval = val.UInt64Val; - break; - case TypeCode.Single: - objval = val.SingleVal; - break; - case TypeCode.Double: - objval = val.DoubleVal; - break; - case TypeCode.Decimal: - objval = val.DecimalVal; - break; - case TypeCode.Char: - objval = val.CharVal; - break; - case TypeCode.String: - objval = val.StringVal; - break; - default: - objval = val.ObjectVal; - break; - } - - return pExpr.Type.isEnumType() ? Enum.ToObject(pExpr.Type.AssociatedSystemType, objval) : objval; - } - else if (pExpr is ExprZeroInit zeroInit) - { - return Activator.CreateInstance(zeroInit.Type.AssociatedSystemType); - } - else - { - Debug.Assert(false, "Invalid Expr in GetObject"); - throw Error.InternalCompilerError(); - } - } - } - - ///////////////////////////////////////////////////////////////////////////////// - private Expression[] GetArgumentsFromArrayInit(ExprArrayInit arrinit) { List expressions = new List(); @@ -1000,202 +898,6 @@ namespace Microsoft.CSharp.RuntimeBinder return expressions.ToArray(); } - ///////////////////////////////////////////////////////////////////////////////// - - private MethodInfo GetMethodInfoFromExpr(ExprMethodInfo methinfo) - { - // To do this, we need to construct a type array of the parameter types, - // get the parent constructed type, and get the method from it. - - AggregateType aggType = methinfo.Method.Ats; - MethodSymbol methSym = methinfo.Method.Meth(); - - TypeArray genericParams = _typeManager.SubstTypeArray(methSym.Params, aggType, methSym.typeVars); - CType genericReturn = _typeManager.SubstType(methSym.RetType, aggType, methSym.typeVars); - - Type type = aggType.AssociatedSystemType; - MethodInfo methodInfo = methSym.AssociatedMemberInfo as MethodInfo; - - // This is to ensure that for embedded nopia types, we have the - // appropriate local type from the member itself; this is possible - // because nopia types are not generic or nested. - if (!type.IsGenericType && !type.IsNested) - { - type = methodInfo.DeclaringType; - } - - // We need to find the associated methodinfo on the instantiated type. - foreach (MethodInfo m in type.GetRuntimeMethods()) - { -#if UNSUPPORTEDAPI - if ((m.MetadataToken != methodInfo.MetadataToken) || (m.Module != methodInfo.Module)) -#else - if (!m.HasSameMetadataDefinitionAs(methodInfo)) -#endif - { - continue; - } - - Debug.Assert((m.Name == methodInfo.Name) && - (m.GetParameters().Length == genericParams.Count) && - (TypesAreEqual(m.ReturnType, genericReturn.AssociatedSystemType))); - - bool bMatch = true; - ParameterInfo[] parameters = m.GetParameters(); - for (int i = 0; i < genericParams.Count; i++) - { - if (!TypesAreEqual(parameters[i].ParameterType, genericParams[i].AssociatedSystemType)) - { - bMatch = false; - break; - } - } - if (bMatch) - { - if (m.IsGenericMethod) - { - int size = methinfo.Method.TypeArgs?.Count ?? 0; - Type[] typeArgs = new Type[size]; - if (size > 0) - { - for (int i = 0; i < methinfo.Method.TypeArgs.Count; i++) - { - typeArgs[i] = methinfo.Method.TypeArgs[i].AssociatedSystemType; - } - } - return m.MakeGenericMethod(typeArgs); - } - - return m; - } - } - - Debug.Assert(false, "Could not find matching method"); - throw Error.InternalCompilerError(); - } - - ///////////////////////////////////////////////////////////////////////////////// - - private ConstructorInfo GetConstructorInfoFromExpr(ExprMethodInfo methinfo) - { - // To do this, we need to construct a type array of the parameter types, - // get the parent constructed type, and get the method from it. - - AggregateType aggType = methinfo.Method.Ats; - MethodSymbol methSym = methinfo.Method.Meth(); - - TypeArray genericInstanceParams = _typeManager.SubstTypeArray(methSym.Params, aggType); - Type type = aggType.AssociatedSystemType; - ConstructorInfo ctorInfo = (ConstructorInfo)methSym.AssociatedMemberInfo; - - // This is to ensure that for embedded nopia types, we have the - // appropriate local type from the member itself; this is possible - // because nopia types are not generic or nested. - if (!type.IsGenericType && !type.IsNested) - { - type = ctorInfo.DeclaringType; - } - - foreach (ConstructorInfo c in type.GetConstructors(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static)) - { -#if UNSUPPORTEDAPI - if ((c.MetadataToken != ctorInfo.MetadataToken) || (c.Module != ctorInfo.Module)) -#else - if (!c.HasSameMetadataDefinitionAs(ctorInfo)) -#endif - { - continue; - } - Debug.Assert(c.GetParameters() == null || c.GetParameters().Length == genericInstanceParams.Count); - - bool bMatch = true; - ParameterInfo[] parameters = c.GetParameters(); - for (int i = 0; i < genericInstanceParams.Count; i++) - { - if (!TypesAreEqual(parameters[i].ParameterType, genericInstanceParams[i].AssociatedSystemType)) - { - bMatch = false; - break; - } - } - if (bMatch) - { - return c; - } - } - - Debug.Assert(false, "Could not find matching constructor"); - throw Error.InternalCompilerError(); - } - - ///////////////////////////////////////////////////////////////////////////////// - - private PropertyInfo GetPropertyInfoFromExpr(ExprPropertyInfo propinfo) - { - // To do this, we need to construct a type array of the parameter types, - // get the parent constructed type, and get the property from it. - - AggregateType aggType = propinfo.Property.Ats; - PropertySymbol propSym = propinfo.Property.Prop(); - - TypeArray genericInstanceParams = _typeManager.SubstTypeArray(propSym.Params, aggType, null); - - Type type = aggType.AssociatedSystemType; - PropertyInfo propertyInfo = propSym.AssociatedPropertyInfo; - - // This is to ensure that for embedded nopia types, we have the - // appropriate local type from the member itself; this is possible - // because nopia types are not generic or nested. - if (!type.IsGenericType && !type.IsNested) - { - type = propertyInfo.DeclaringType; - } - - foreach (PropertyInfo p in type.GetProperties(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static)) - { -#if UNSUPPORTEDAPI - if ((p.MetadataToken != propertyInfo.MetadataToken) || (p.Module != propertyInfo.Module)) -#else - if (!p.HasSameMetadataDefinitionAs(propertyInfo)) - { -#endif - continue; - } - Debug.Assert((p.Name == propertyInfo.Name) && - (p.GetIndexParameters() == null || p.GetIndexParameters().Length == genericInstanceParams.Count)); - - bool bMatch = true; - ParameterInfo[] parameters = p.GetSetMethod(true) != null ? - p.GetSetMethod(true).GetParameters() : p.GetGetMethod(true).GetParameters(); - for (int i = 0; i < genericInstanceParams.Count; i++) - { - if (!TypesAreEqual(parameters[i].ParameterType, genericInstanceParams[i].AssociatedSystemType)) - { - bMatch = false; - break; - } - } - if (bMatch) - { - return p; - } - } - - Debug.Assert(false, "Could not find matching property"); - throw Error.InternalCompilerError(); - } - - ///////////////////////////////////////////////////////////////////////////////// - - private bool TypesAreEqual(Type t1, Type t2) - { - if (t1 == t2) - { - return true; - } - - return t1.IsEquivalentTo(t2); - } #endregion } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ICSharpBinder.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ICSharpBinder.cs index e48f760fc2..84b60abb91 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ICSharpBinder.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ICSharpBinder.cs @@ -10,19 +10,21 @@ namespace Microsoft.CSharp.RuntimeBinder internal interface ICSharpBinder { CSharpArgumentInfo GetArgumentInfo(int index); - Type CallingContext { get; } - bool IsChecked { get; } - // This is true for any binder that is eligible to take value type receiver + // This is true for any binder that is eligible to take value type receiver // objects as a ref (for mutable operations). Such as calls ("v.M(d)"), // and indexers ("v[d] = v[d]"). Note that properties are not here because they // are only dispatched dynamically when the receiver is dynamic, and hence boxed. bool IsBinderThatCanHaveRefReceiver { get; } - void PopulateSymbolTableWithName(SymbolTable symbolTable, Type callingType, ArgumentObject[] arguments); + void PopulateSymbolTableWithName(Type callingType, ArgumentObject[] arguments); Expr DispatchPayload(RuntimeBinder runtimeBinder, ArgumentObject[] arguments, LocalVariableSymbol[] locals); + BindingFlag BindingFlags { get; } + string Name { get; } + + Type ReturnType { get; } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinder.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinder.cs index bb248567e0..af0014f80e 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinder.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinder.cs @@ -14,72 +14,31 @@ using Microsoft.CSharp.RuntimeBinder.Syntax; namespace Microsoft.CSharp.RuntimeBinder { - internal sealed class RuntimeBinder + internal readonly struct RuntimeBinder { - #region Singleton Implementation + private static readonly object s_bindLock = new object(); - private static readonly Lazy s_lazyInstance = new Lazy(() => new RuntimeBinder()); + private readonly ExpressionBinder _binder; - public static RuntimeBinder GetInstance() + public RuntimeBinder(Type contextType, bool isChecked = false) { - return s_lazyInstance.Value; + AggregateSymbol context; + if (contextType != null) + { + lock (s_bindLock) + { + context = ((AggregateType)SymbolTable.GetCTypeFromType(contextType)).OwningAggregate; + } + } + else + { + context = null; + } + + _binder = new ExpressionBinder(new BindingContext(context, isChecked)); } - #endregion - - ///////////////////////////////////////////////////////////////////////////////// - // Members - - private SymbolTable _symbolTable; - private CSemanticChecker _semanticChecker; - private SymbolLoader SymbolLoader => _semanticChecker.SymbolLoader; - - private ExprFactory _exprFactory; - private BindingContext _bindingContext; - private ExpressionBinder _binder; - - private readonly object _bindLock = new object(); - - ///////////////////////////////////////////////////////////////////////////////// - // Methods - - #region BookKeeping - private RuntimeBinder() - { - Reset(); - } - - private void Reset() - { - _semanticChecker = new CSemanticChecker(); - - BSYMMGR bsymmgr = _semanticChecker.getBSymmgr(); - - _symbolTable = new SymbolTable( - bsymmgr.GetSymbolTable(), - bsymmgr.GetSymFactory(), - _semanticChecker.GetTypeManager(), - bsymmgr, - _semanticChecker); - _semanticChecker.getPredefTypes().Init(_symbolTable); - _semanticChecker.GetTypeManager().InitTypeFactory(_symbolTable); - SymbolLoader.getPredefinedMembers().RuntimeBinderSymbolTable = _symbolTable; - SymbolLoader.SetSymbolTable(_symbolTable); - - _exprFactory = new ExprFactory(_semanticChecker.SymbolLoader.GetGlobalSymbolContext()); - _bindingContext = new BindingContext(_semanticChecker, _exprFactory); - _binder = new ExpressionBinder(_bindingContext); - } - - #endregion - - ///////////////////////////////////////////////////////////////////////////////// - - public Expression Bind( - DynamicMetaObjectBinder payload, - Expression[] parameters, - DynamicMetaObject[] args, - out DynamicMetaObject deferredBinding) + public Expression Bind(ICSharpBinder payload, Expression[] parameters, DynamicMetaObject[] args, out DynamicMetaObject deferredBinding) { // The lock is here to protect this instance of the binder from itself // when called on multiple threads. The cost in time of a single lock @@ -98,12 +57,9 @@ namespace Microsoft.CSharp.RuntimeBinder // ...subsequent calls that were cache hits, i.e., already bound, took less // than 1/1000 sec for the whole 4000 of them. - ICSharpBinder binder = payload as ICSharpBinder; - Debug.Assert(binder != null); - - lock (_bindLock) + lock (s_bindLock) { - return BindCore(binder, parameters, args, out deferredBinding); + return BindCore(payload, parameters, args, out deferredBinding); } } @@ -115,26 +71,25 @@ namespace Microsoft.CSharp.RuntimeBinder { Debug.Assert(args.Length >= 1); - InitializeCallingContext(payload); ArgumentObject[] arguments = CreateArgumentArray(payload, parameters, args); // On any given bind call, we populate the symbol table with any new // conversions that we find for any of the types specified. We keep a - // running SymbolTable so that we don't have to reflect over types if + // running SymbolTable so that we don't have to reflect over types if // we've seen them already in the table. // // Once we've loaded all the standard conversions into the symbol table, // we can call into the binder to bind the actual call. - payload.PopulateSymbolTableWithName(_symbolTable, arguments[0].Type, arguments); + payload.PopulateSymbolTableWithName(arguments[0].Type, arguments); AddConversionsForArguments(arguments); // When we do any bind, we perform the following steps: // // 1) Create a local variable scope which contains local variable symbols // for each of the parameters, and the instance argument. - // 2) If we have operators, then we don't need to do lookup. Otherwise, - // look for the name and switch on the result - dispatch according to + // 2) If we have operators, then we don't need to do lookup. Otherwise, + // look for the name and switch on the result - dispatch according to // the symbol kind. This results in an Expr being bound that is the expression. // 3) Create the EXPRRETURN which returns the call and wrap it in // an EXPRBOUNDLAMBDA which uses the local variable scope @@ -145,7 +100,7 @@ namespace Microsoft.CSharp.RuntimeBinder // Linq expression tree for the whole thing and return it. // (1) - Create the locals - Scope pScope = _semanticChecker.GetGlobalSymbolFactory().CreateScope(); + Scope pScope = SymFactory.CreateScope(); LocalVariableSymbol[] locals = PopulateLocalScope(payload, pScope, arguments, parameters); // (1.5) - Check to see if we need to defer. @@ -163,6 +118,13 @@ namespace Microsoft.CSharp.RuntimeBinder #region Helpers + [ConditionalAttribute("DEBUG")] + internal static void EnsureLockIsTaken() + { + // Make sure that the binder lock is taken + Debug.Assert(System.Threading.Monitor.IsEntered(s_bindLock)); + } + private bool DeferBinding( ICSharpBinder payload, ArgumentObject[] arguments, @@ -175,7 +137,7 @@ namespace Microsoft.CSharp.RuntimeBinder // (1) InvokeMember deferral. // - // This is the deferral for the d.Foo() scenario where Foo actually binds to a + // This is the deferral for the d.Foo() scenario where Foo actually binds to a // field or property, and not a method group that is invocable. We defer to // the standard GetMember/Invoke pattern. @@ -186,10 +148,10 @@ namespace Microsoft.CSharp.RuntimeBinder MemberLookup mem = new MemberLookup(); Expr callingObject = CreateCallingObjectForCall(callPayload, arguments, locals); - SymWithType swt = _symbolTable.LookupMember( + SymWithType swt = SymbolTable.LookupMember( callPayload.Name, callingObject, - _bindingContext.ContextForMemberLookup, + _binder.Context.ContextForMemberLookup, arity, mem, (callPayload.Flags & CSharpCallFlags.EventHookup) != 0, @@ -218,42 +180,16 @@ namespace Microsoft.CSharp.RuntimeBinder return false; } - private void InitializeCallingContext(ICSharpBinder payload) - { - // Set the context if the payload specifies it. Currently we only use this for calls. - Type t = payload.CallingContext; - BindingContext bindingContext = _bindingContext; - - if (t != null) - { - AggregateSymbol agg = ((AggregateType)_symbolTable.GetCTypeFromType(t)).GetOwningAggregate(); - bindingContext.ContextForMemberLookup = _semanticChecker.GetGlobalSymbolFactory().CreateAggregateDecl(agg, null); - } - else - { - // The binding context lives across invocations! If we don't reset this, then later calls might - // bind in a previous call's context. - bindingContext.ContextForMemberLookup = null; - } - - bindingContext.Checked = payload.IsChecked; - } - - ///////////////////////////////////////////////////////////////////////////////// - - private Expression CreateExpressionTreeFromResult( - Expression[] parameters, - Scope pScope, - Expr pResult) + private static Expression CreateExpressionTreeFromResult(Expression[] parameters, Scope pScope, Expr pResult) { // (3) - Place the result in a return statement and create the ExprBoundLambda. ExprBoundLambda boundLambda = GenerateBoundLambda(pScope, pResult); // (4) - Rewrite the ExprBoundLambda into an expression tree. - ExprBinOp exprTree = ExpressionTreeRewriter.Rewrite(boundLambda, _exprFactory, SymbolLoader); + ExprBinOp exprTree = ExpressionTreeRewriter.Rewrite(boundLambda); // (5) - Create the actual Expression Tree - Expression e = ExpressionTreeCallRewriter.Rewrite(SymbolLoader.GetTypeManager(), exprTree, parameters); + Expression e = ExpressionTreeCallRewriter.Rewrite(exprTree, parameters); return e; } @@ -265,7 +201,7 @@ namespace Microsoft.CSharp.RuntimeBinder if (argInfo.IsByRefOrOut) { // If we have a ref our an out parameter, make the byref type. - // If we have the receiver of a call or invoke that is ref, it must be because of + // If we have the receiver of a call or invoke that is ref, it must be because of // a struct caller. Don't persist the ref for that. if (!(index == 0 && p.IsBinderThatCanHaveRefReceiver)) { @@ -281,17 +217,13 @@ namespace Microsoft.CSharp.RuntimeBinder // This ensures that the type we pick is something that the user could have written. - CType actualType = _symbolTable.GetCTypeFromType(t); - CType bestType; - - bool res = _semanticChecker.GetTypeManager().GetBestAccessibleType(_semanticChecker, _bindingContext, actualType, out bestType); - // Since the actual type of these arguments are never going to be pointer // types or ref/out types (they are in fact boxed into an object), we have // a guarantee that we will always be able to find a best accessible type // (which, in the worst case, may be object). - Debug.Assert(res, "Unexpected failure of GetBestAccessibleType in construction of argument array"); + CType actualType = SymbolTable.GetCTypeFromType(t); + CType bestType = TypeManager.GetBestAccessibleType(_binder.Context.ContextForMemberLookup, actualType); t = bestType.AssociatedSystemType; } @@ -323,8 +255,7 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// internal static void PopulateSymbolTableWithPayloadInformation( - SymbolTable symbolTable, ICSharpInvokeOrInvokeMemberBinder callOrInvoke, Type callingType, - ArgumentObject[] arguments) + ICSharpInvokeOrInvokeMemberBinder callOrInvoke, Type callingType, ArgumentObject[] arguments) { Type type; @@ -340,18 +271,19 @@ namespace Microsoft.CSharp.RuntimeBinder { type = callingType; } - symbolTable.PopulateSymbolTableWithName( + + SymbolTable.PopulateSymbolTableWithName( callOrInvoke.Name, callOrInvoke.TypeArguments, type); // If it looks like we're invoking a get_ or a set_, load the property as well. - // This is because we need COM indexed properties called via method calls to + // This is because we need COM indexed properties called via method calls to // work the same as it used to. if (callOrInvoke.Name.StartsWith("set_", StringComparison.Ordinal) || callOrInvoke.Name.StartsWith("get_", StringComparison.Ordinal)) { - symbolTable.PopulateSymbolTableWithName( + SymbolTable.PopulateSymbolTableWithName( callOrInvoke.Name.Substring(4), //remove prefix callOrInvoke.TypeArguments, type); @@ -360,11 +292,11 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private void AddConversionsForArguments(ArgumentObject[] arguments) + private static void AddConversionsForArguments(ArgumentObject[] arguments) { foreach (ArgumentObject arg in arguments) { - _symbolTable.AddConversionsForType(arg.Type); + SymbolTable.AddConversionsForType(arg.Type); } } @@ -374,29 +306,29 @@ namespace Microsoft.CSharp.RuntimeBinder BindCall(payload, CreateCallingObjectForCall(payload, arguments, locals), arguments, locals); ///////////////////////////////////////////////////////////////////////////////// - // We take the ArgumentObjects to verify - if the parameter expression tells us + // We take the ArgumentObjects to verify - if the parameter expression tells us // we have a ref parameter, but the argument object tells us we're not passed by ref, // then it means it was a ref that the compiler had to insert. This is used when - // we have a call off of a struct for example. If thats the case, don't treat the + // we have a call off of a struct for example. If thats the case, don't treat the // local as a ref type. - private LocalVariableSymbol[] PopulateLocalScope( + private static LocalVariableSymbol[] PopulateLocalScope( ICSharpBinder payload, Scope pScope, ArgumentObject[] arguments, Expression[] parameterExpressions) { - // We use the compile time types for the local variables, and then + // We use the compile time types for the local variables, and then // cast them to the runtime types for the expression tree. LocalVariableSymbol[] locals = new LocalVariableSymbol[parameterExpressions.Length]; for (int i = 0; i < parameterExpressions.Length; i++) { Expression parameter = parameterExpressions[i]; - CType type = _symbolTable.GetCTypeFromType(parameter.Type); + CType type = SymbolTable.GetCTypeFromType(parameter.Type); // Make sure we're not setting ref for the receiver of a call - the argument - // will be marked as ref if we're calling off a struct, but we don't want + // will be marked as ref if we're calling off a struct, but we don't want // to persist that in our system. // If we're the first param of a call or invoke, and we're ref, it must be // because of structs. Don't persist the parameter modifier type. @@ -409,13 +341,12 @@ namespace Microsoft.CSharp.RuntimeBinder CSharpArgumentInfo info = arguments[i].Info; if (info.IsByRefOrOut) { - type = _semanticChecker.GetTypeManager().GetParameterModifier(type, info.IsOut); + type = TypeManager.GetParameterModifier(type, info.IsOut); } } } LocalVariableSymbol local = - _semanticChecker.GetGlobalSymbolFactory() - .CreateLocalVar(NameManager.Add("p" + i), pScope, type); + SymFactory.CreateLocalVar(NameManager.Add("p" + i), pScope, type); locals[i] = local; } @@ -424,37 +355,38 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private ExprBoundLambda GenerateBoundLambda( - Scope pScope, - Expr call) + private static ExprBoundLambda GenerateBoundLambda(Scope pScope, Expr call) { // We don't actually need the real delegate type here - we just need SOME delegate type. // This is because we never attempt any conversions on the lambda itself. - AggregateType delegateType = _semanticChecker.SymbolLoader.GetPredefindType(PredefinedType.PT_FUNC); - return _exprFactory.CreateAnonymousMethod(delegateType, pScope, call); + AggregateType delegateType = SymbolLoader.GetPredefindType(PredefinedType.PT_FUNC); + return ExprFactory.CreateAnonymousMethod(delegateType, pScope, call); } #region ExprCreation ///////////////////////////////////////////////////////////////////////////////// - private Expr CreateLocal(Type type, bool bIsOut, LocalVariableSymbol local) + private Expr CreateLocal(Type type, bool isOut, LocalVariableSymbol local) { - CType ctype = _symbolTable.GetCTypeFromType(type); - if (bIsOut) + CType ctype; + if (isOut) { - Debug.Assert(ctype is ParameterModifierType); - ctype = _semanticChecker.GetTypeManager() - .GetParameterModifier(((ParameterModifierType)ctype).GetParameterType(), true); + // We need to record the out state, but GetCTypeFromType will only determine that + // it should be some sort of ParameterType but not be able to deduce that it needs + // IsOut to be true. So do that logic here rather than create a ref type to then + // throw away. + Debug.Assert(type.IsByRef); + ctype = TypeManager.GetParameterModifier(SymbolTable.GetCTypeFromType(type.GetElementType()), true); + } + else + { + ctype = SymbolTable.GetCTypeFromType(type); } // If we can convert, do that. If not, cast it. - ExprLocal exprLocal = _exprFactory.CreateLocal(local); - Expr result = _binder.tryConvert(exprLocal, ctype); - if (result == null) - { - result = _binder.mustCast(exprLocal, ctype); - } + ExprLocal exprLocal = ExprFactory.CreateLocal(local); + Expr result = _binder.tryConvert(exprLocal, ctype) ?? _binder.mustCast(exprLocal, ctype); result.Flags |= EXPRFLAG.EXF_LVALUE; return result; } @@ -485,7 +417,7 @@ namespace Microsoft.CSharp.RuntimeBinder else { // Lists are right-heavy. - _exprFactory.AppendItemToList(arg, ref args, ref last); + ExprFactory.AppendItemToList(arg, ref args, ref last); } } } @@ -503,16 +435,16 @@ namespace Microsoft.CSharp.RuntimeBinder { if (argument.Info.UseCompileTimeType) { - arg = _exprFactory.CreateConstant(_symbolTable.GetCTypeFromType(argument.Type), default(ConstVal)); + arg = ExprFactory.CreateConstant(SymbolTable.GetCTypeFromType(argument.Type), default(ConstVal)); } else { - arg = _exprFactory.CreateNull(); + arg = ExprFactory.CreateNull(); } } else { - arg = _exprFactory.CreateConstant(_symbolTable.GetCTypeFromType(argument.Type), ConstVal.Get(argument.Value)); + arg = ExprFactory.CreateConstant(SymbolTable.GetCTypeFromType(argument.Type), ConstVal.Get(argument.Value)); } } else @@ -522,7 +454,7 @@ namespace Microsoft.CSharp.RuntimeBinder if (!argument.Info.UseCompileTimeType && argument.Value == null) { - arg = _exprFactory.CreateNull(); + arg = ExprFactory.CreateNull(); } else { @@ -534,7 +466,7 @@ namespace Microsoft.CSharp.RuntimeBinder if (argument.Info.NamedArgument) { Debug.Assert(argument.Info.Name != null); - arg = _exprFactory.CreateNamedArgumentSpecification(NameManager.Add(argument.Info.Name), arg); + arg = ExprFactory.CreateNamedArgumentSpecification(NameManager.Add(argument.Info.Name), arg); } // If we have an object that was "dynamic" at compile time, we need @@ -555,7 +487,7 @@ namespace Microsoft.CSharp.RuntimeBinder if (!argument.Info.UseCompileTimeType && argument.Value != null) { arg.RuntimeObject = argument.Value; - arg.RuntimeObjectActualType = _symbolTable.GetCTypeFromType(argument.Value.GetType()); + arg.RuntimeObjectActualType = SymbolTable.GetCTypeFromType(argument.Value.GetType()); } return arg; @@ -563,7 +495,7 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private ExprMemberGroup CreateMemberGroupEXPR( + private static ExprMemberGroup CreateMemberGroupExpr( string Name, Type[] typeArguments, Expr callingObject, @@ -575,7 +507,7 @@ namespace Microsoft.CSharp.RuntimeBinder CType callingObjectType = callingObject.Type; if (callingObjectType is ArrayType) { - callingType = _semanticChecker.SymbolLoader.GetPredefindType(PredefinedType.PT_ARRAY); + callingType = SymbolLoader.GetPredefindType(PredefinedType.PT_ARRAY); } else if (callingObjectType is NullableType callingNub) { @@ -618,7 +550,7 @@ namespace Microsoft.CSharp.RuntimeBinder bool bIsConstructor = name == NameManager.GetPredefinedName(PredefinedName.PN_CTOR); foreach(AggregateType t in callingType.TypeHierarchy) { - if (_symbolTable.AggregateContainsMethod(t.GetOwningAggregate(), Name, mask) && distinctCallingTypes.Add(t)) + if (SymbolTable.AggregateContainsMethod(t.OwningAggregate, Name, mask) && distinctCallingTypes.Add(t)) { callingTypes.Add(t); } @@ -630,13 +562,13 @@ namespace Microsoft.CSharp.RuntimeBinder } } - // If this is a WinRT type we have to add all collection interfaces that have this method + // If this is a WinRT type we have to add all collection interfaces that have this method // as well so that overload resolution can find them. - if (callingType.IsWindowsRuntimeType()) + if (callingType.IsWindowsRuntimeType) { - foreach (AggregateType t in callingType.GetWinRTCollectionIfacesAll(SymbolLoader).Items) + foreach (AggregateType t in callingType.WinRTCollectionIfacesAll.Items) { - if (_symbolTable.AggregateContainsMethod(t.GetOwningAggregate(), Name, mask) && distinctCallingTypes.Add(t)) + if (SymbolTable.AggregateContainsMethod(t.OwningAggregate, Name, mask) && distinctCallingTypes.Add(t)) { callingTypes.Add(t); } @@ -645,7 +577,7 @@ namespace Microsoft.CSharp.RuntimeBinder EXPRFLAG flags = EXPRFLAG.EXF_USERCALLABLE; // If its a delegate, mark that on the memgroup. - if (Name == SpecialNames.Invoke && callingObject.Type.isDelegateType()) + if (Name == SpecialNames.Invoke && callingObject.Type.IsDelegateType) { flags |= EXPRFLAG.EXF_DELEGATE; } @@ -662,16 +594,13 @@ namespace Microsoft.CSharp.RuntimeBinder flags |= EXPRFLAG.EXF_INDEXER; } - TypeArray typeArgumentsAsTypeArray = BSYMMGR.EmptyTypeArray(); - if (typeArguments != null && typeArguments.Length > 0) - { - typeArgumentsAsTypeArray = _semanticChecker.getBSymmgr().AllocParams( - _symbolTable.GetCTypeArrayFromTypes(typeArguments)); - } - ExprMemberGroup memgroup = _exprFactory.CreateMemGroup(// Tree - flags, name, typeArgumentsAsTypeArray, kind, callingType, null, null, new CMemberLookupResults( - _semanticChecker.getBSymmgr().AllocParams(callingTypes.Count, callingTypes.ToArray()), - name)); + TypeArray typeArgumentsAsTypeArray = typeArguments?.Length > 0 + ? TypeArray.Allocate(SymbolTable.GetCTypeArrayFromTypes(typeArguments)) + : TypeArray.Empty; + + ExprMemberGroup memgroup = ExprFactory.CreateMemGroup( // Tree + flags, name, typeArgumentsAsTypeArray, kind, callingType, null, + new CMemberLookupResults(TypeArray.Allocate(callingTypes.ToArray()), name)); if (callingObject is ExprClass) { memgroup.OptionalLHS = callingObject; @@ -696,7 +625,7 @@ namespace Microsoft.CSharp.RuntimeBinder PropertySymbol property = swt.Prop(); AggregateType propertyType = swt.GetType(); PropWithType pwt = new PropWithType(property, propertyType); - ExprMemberGroup pMemGroup = CreateMemberGroupEXPR(property.name.Text, null, callingObject, SYMKIND.SK_PropertySymbol); + ExprMemberGroup pMemGroup = CreateMemberGroupExpr(property.name.Text, null, callingObject, SYMKIND.SK_PropertySymbol); return _binder.BindToProperty(// For a static property instance, don't set the object. callingObject is ExprClass ? null : callingObject, pwt, flags, null, pMemGroup); @@ -707,7 +636,7 @@ namespace Microsoft.CSharp.RuntimeBinder private ExprWithArgs CreateIndexer(SymWithType swt, Expr callingObject, Expr arguments, BindingFlag bindFlags) { IndexerSymbol index = swt.Sym as IndexerSymbol; - ExprMemberGroup memgroup = CreateMemberGroupEXPR(index.name.Text, null, callingObject, SYMKIND.SK_PropertySymbol); + ExprMemberGroup memgroup = CreateMemberGroupExpr(index.name.Text, null, callingObject, SYMKIND.SK_PropertySymbol); ExprWithArgs result = _binder.BindMethodGroupToArguments(bindFlags, memgroup, arguments); ReorderArgumentsForNamedAndOptional(callingObject, result); return result; @@ -758,7 +687,7 @@ namespace Microsoft.CSharp.RuntimeBinder Type t = arguments[0].Value as Type; Debug.Assert(t != null); // Would have thrown in PopulateSymbolTableWithPayloadInformation already - callingObject = _exprFactory.CreateClass(_symbolTable.GetCTypeFromType(t)); + callingObject = ExprFactory.CreateClass(SymbolTable.GetCTypeFromType(t)); } else { @@ -770,7 +699,7 @@ namespace Microsoft.CSharp.RuntimeBinder callingObject = _binder.mustConvert( CreateArgumentEXPR(arguments[0], locals[0]), - _symbolTable.GetCTypeFromType(arguments[0].Type)); + SymbolTable.GetCTypeFromType(arguments[0].Type)); if (arguments[0].Type.IsValueType && callingObject is ExprCast) { @@ -789,7 +718,7 @@ namespace Microsoft.CSharp.RuntimeBinder ArgumentObject[] arguments, LocalVariableSymbol[] locals) { - if (payload is InvokeBinder && !callingObject.Type.isDelegateType()) + if (payload is InvokeBinder && !callingObject.Type.IsDelegateType) { throw Error.BindInvokeFailedNonDelegate(); } @@ -797,10 +726,10 @@ namespace Microsoft.CSharp.RuntimeBinder int arity = payload.TypeArguments?.Length ?? 0; MemberLookup mem = new MemberLookup(); - SymWithType swt = _symbolTable.LookupMember( + SymWithType swt = SymbolTable.LookupMember( payload.Name, callingObject, - _bindingContext.ContextForMemberLookup, + _binder.Context.ContextForMemberLookup, arity, mem, (payload.Flags & CSharpCallFlags.EventHookup) != 0, @@ -826,11 +755,11 @@ namespace Microsoft.CSharp.RuntimeBinder // // Our caller takes care of the rest. - // First we need to check the sym that we got back. If we got back a static + // First we need to check the sym that we got back. If we got back a static // method, then we may be in the situation where the user called the method // via a simple name call through the phantom overload. If thats the case, // then we want to sub in a type instead of the object. - ExprMemberGroup memGroup = CreateMemberGroupEXPR(payload.Name, payload.TypeArguments, callingObject, swt.Sym.getKind()); + ExprMemberGroup memGroup = CreateMemberGroupExpr(payload.Name, payload.TypeArguments, callingObject, swt.Sym.getKind()); if ((payload.Flags & CSharpCallFlags.SimpleNameCall) != 0) { callingObject.Flags |= EXPRFLAG.EXF_SIMPLENAME; @@ -839,10 +768,10 @@ namespace Microsoft.CSharp.RuntimeBinder if ((payload.Flags & CSharpCallFlags.EventHookup) != 0) { mem = new MemberLookup(); - SymWithType swtEvent = _symbolTable.LookupMember( + SymWithType swtEvent = SymbolTable.LookupMember( payload.Name.Split('_')[1], callingObject, - _bindingContext.ContextForMemberLookup, + _binder.Context.ContextForMemberLookup, arity, mem, (payload.Flags & CSharpCallFlags.EventHookup) != 0, @@ -862,7 +791,7 @@ namespace Microsoft.CSharp.RuntimeBinder eventCType = swtEvent.Event().type; } - Type eventType = SymbolLoader.GetTypeManager().SubstType(eventCType, swtEvent.Ats).AssociatedSystemType; + Type eventType = TypeManager.SubstType(eventCType, swtEvent.Ats).AssociatedSystemType; if (eventType != null) { @@ -911,11 +840,11 @@ namespace Microsoft.CSharp.RuntimeBinder // Get new Action(x.remove_foo) MethPropWithInst removemwi = new MethPropWithInst(ewt.Event().methRemove, ewt.Ats); - ExprMemberGroup removeMethGrp = _exprFactory.CreateMemGroup(callingObject, removemwi); + ExprMemberGroup removeMethGrp = ExprFactory.CreateMemGroup(callingObject, removemwi); removeMethGrp.Flags &= ~EXPRFLAG.EXF_USERCALLABLE; Type eventRegistrationTokenType = SymbolTable.EventRegistrationTokenType; Type actionType = Expression.GetActionType(eventRegistrationTokenType); - Expr removeMethArg = _binder.mustConvert(removeMethGrp, _symbolTable.GetCTypeFromType(actionType)); + Expr removeMethArg = _binder.mustConvert(removeMethGrp, SymbolTable.GetCTypeFromType(actionType)); // The value Expr delegateVal = CreateArgumentEXPR(arguments[1], locals[1]); @@ -926,25 +855,25 @@ namespace Microsoft.CSharp.RuntimeBinder { // Get new Func(x.add_foo) MethPropWithInst addmwi = new MethPropWithInst(ewt.Event().methAdd, ewt.Ats); - ExprMemberGroup addMethGrp = _exprFactory.CreateMemGroup(callingObject, addmwi); + ExprMemberGroup addMethGrp = ExprFactory.CreateMemGroup(callingObject, addmwi); addMethGrp.Flags &= ~EXPRFLAG.EXF_USERCALLABLE; Type funcType = Expression.GetFuncType(evtType, eventRegistrationTokenType); - Expr addMethArg = _binder.mustConvert(addMethGrp, _symbolTable.GetCTypeFromType(funcType)); + Expr addMethArg = _binder.mustConvert(addMethGrp, SymbolTable.GetCTypeFromType(funcType)); - args = _exprFactory.CreateList(addMethArg, removeMethArg, delegateVal); + args = ExprFactory.CreateList(addMethArg, removeMethArg, delegateVal); methodName = NameManager.GetPredefinedName(PredefinedName.PN_ADDEVENTHANDLER).Text; } else { - args = _exprFactory.CreateList(removeMethArg, delegateVal); + args = ExprFactory.CreateList(removeMethArg, delegateVal); methodName = NameManager.GetPredefinedName(PredefinedName.PN_REMOVEEVENTHANDLER).Text; } // WindowsRuntimeMarshal.Add\RemoveEventHandler(...) Type windowsRuntimeMarshalType = SymbolTable.WindowsRuntimeMarshalType; - _symbolTable.PopulateSymbolTableWithName(methodName, new List { evtType }, windowsRuntimeMarshalType); - ExprClass marshalClass = _exprFactory.CreateClass(_symbolTable.GetCTypeFromType(windowsRuntimeMarshalType)); - ExprMemberGroup addEventGrp = CreateMemberGroupEXPR(methodName, new [] { evtType }, marshalClass, SYMKIND.SK_MethodSymbol); + SymbolTable.PopulateSymbolTableWithName(methodName, new List { evtType }, windowsRuntimeMarshalType); + ExprClass marshalClass = ExprFactory.CreateClass(SymbolTable.GetCTypeFromType(windowsRuntimeMarshalType)); + ExprMemberGroup addEventGrp = CreateMemberGroupExpr(methodName, new [] { evtType }, marshalClass, SYMKIND.SK_MethodSymbol); return _binder.BindMethodGroupToArguments( BindingFlag.BIND_RVALUEREQUIRED | BindingFlag.BIND_STMTEXPRONLY, addEventGrp, @@ -990,49 +919,33 @@ namespace Microsoft.CSharp.RuntimeBinder { carg = ExpressionBinder.CountArguments(arguments) }; - _binder.FillInArgInfoFromArgList(argInfo, arguments); + ExpressionBinder.FillInArgInfoFromArgList(argInfo, arguments); // We need to substitute type parameters BEFORE getting the most derived one because - // we're binding against the base method, and the derived method may change the - // generic arguments. - TypeArray parameters = SymbolLoader.GetTypeManager().SubstTypeArray(methprop.Params, type, typeArgs); - methprop = ExpressionBinder.GroupToArgsBinder.FindMostDerivedMethod(SymbolLoader, methprop, callingObject.Type); + // we're binding against the base method, and the derived method may change the + // generic arguments. + TypeArray parameters = TypeManager.SubstTypeArray(methprop.Params, type, typeArgs); + methprop = ExpressionBinder.GroupToArgsBinder.FindMostDerivedMethod(methprop, callingObject.Type); ExpressionBinder.GroupToArgsBinder.ReOrderArgsForNamedArguments( - methprop, - parameters, - type, - memgroup, - argInfo, - _semanticChecker.GetTypeManager(), - _exprFactory, - SymbolLoader); + methprop, parameters, type, memgroup, argInfo); + Expr pList = null; + + // We reordered, so make a new list of them and set them on the constructor. + // Go backwards cause lists are right-flushed. + // Also perform the conversions to the right types. + for (int i = argInfo.carg - 1; i >= 0; i--) { - Expr pList = null; + Expr pArg = argInfo.prgexpr[i]; - // We reordered, so make a new list of them and set them on the constructor. - // Go backwards cause lists are right-flushed. - // Also perform the conversions to the right types. - for (int i = argInfo.carg - 1; i >= 0; i--) - { - Expr pArg = argInfo.prgexpr[i]; + // Strip the name-ness away, since we don't need it. + pArg = StripNamedArgument(pArg); - // Strip the name-ness away, since we don't need it. - pArg = StripNamedArgument(pArg); - - // Perform the correct conversion. - pArg = _binder.tryConvert(pArg, parameters[i]); - if (pList == null) - { - pList = pArg; - } - else - { - pList = _exprFactory.CreateList(pArg, pList); - } - } - - result.OptionalArguments = pList; + // Perform the correct conversion. + pArg = _binder.tryConvert(pArg, parameters[i]); + pList = pList == null ? pArg : ExprFactory.CreateList(pArg, pList); } + + result.OptionalArguments = pList; } private Expr StripNamedArgument(Expr pArg) @@ -1099,20 +1012,15 @@ namespace Microsoft.CSharp.RuntimeBinder result = _binder.BindStandardUnaryOperator(OperatorKind.OP_LOGNOT, result); } - if (result == null) - { - result = _binder.bindUDUnop(op == OperatorKind.OP_TRUE ? ExpressionKind.True : ExpressionKind.False, arg1); - } + return result + ?? _binder.bindUDUnop(op == OperatorKind.OP_TRUE ? ExpressionKind.True : ExpressionKind.False, arg1) + // If the result is STILL null, then that means theres no implicit conversion to bool, + // and no user-defined operators for true and false. Just do a must convert to report + // the error. + ?? _binder.mustConvert(arg1, SymbolLoader.GetPredefindType(PredefinedType.PT_BOOL)); - // If the result is STILL null, then that means theres no implicit conversion to bool, - // and no user-defined operators for true and false. Just do a must convert to report - // the error. - if (result == null) - { - result = _binder.mustConvert(arg1, SymbolLoader.GetPredefindType(PredefinedType.PT_BOOL)); - } - return result; } + return _binder.BindStandardUnaryOperator(op, arg1); } #endregion @@ -1251,7 +1159,7 @@ namespace Microsoft.CSharp.RuntimeBinder { // If our argument is a static type, then we're calling a static property. Expr callingObject = argument.Info.IsStaticType ? - _exprFactory.CreateClass(_symbolTable.GetCTypeFromType(argument.Value as Type)) : + ExprFactory.CreateClass(SymbolTable.GetCTypeFromType(argument.Value as Type)) : CreateLocal(argument.Type, argument.Info.IsOut, local); if (!argument.Info.UseCompileTimeType && argument.Value == null) @@ -1269,7 +1177,7 @@ namespace Microsoft.CSharp.RuntimeBinder BindingFlag bindFlags = payload.BindingFlags; MemberLookup mem = new MemberLookup(); - SymWithType swt = _symbolTable.LookupMember(name, callingObject, _bindingContext.ContextForMemberLookup, 0, mem, false, false); + SymWithType swt = SymbolTable.LookupMember(name, callingObject, _binder.Context.ContextForMemberLookup, 0, mem, false, false); if (swt == null) { if (optionalIndexerArguments != null) @@ -1282,9 +1190,9 @@ namespace Microsoft.CSharp.RuntimeBinder { if (type.IsArray && type.GetArrayRank() != numIndexArguments) { - throw _semanticChecker.ErrorContext.Error(ErrorCode.ERR_BadIndexCount, type.GetArrayRank()); + throw ErrorHandling.Error(ErrorCode.ERR_BadIndexCount, type.GetArrayRank()); } - + Debug.Assert(callingObject.Type is ArrayType); return CreateArray(callingObject, optionalIndexerArguments); } @@ -1335,10 +1243,10 @@ namespace Microsoft.CSharp.RuntimeBinder Debug.Assert(arguments.Length == 1); // Load the conversions on the target. - _symbolTable.AddConversionsForType(returnType); + SymbolTable.AddConversionsForType(returnType); Expr argument = CreateArgumentEXPR(arguments[0], locals[0]); - CType destinationType = _symbolTable.GetCTypeFromType(returnType); + CType destinationType = SymbolTable.GetCTypeFromType(returnType); if (bIsArrayCreationConversion) { @@ -1369,10 +1277,10 @@ namespace Microsoft.CSharp.RuntimeBinder Debug.Assert(arguments.Length == 1); // Load the conversions on the target. - _symbolTable.AddConversionsForType(returnType); + SymbolTable.AddConversionsForType(returnType); Expr argument = CreateArgumentEXPR(arguments[0], locals[0]); - CType destinationType = _symbolTable.GetCTypeFromType(returnType); + CType destinationType = SymbolTable.GetCTypeFromType(returnType); return _binder.mustCast(argument, destinationType); } @@ -1409,7 +1317,8 @@ namespace Microsoft.CSharp.RuntimeBinder indexerArguments = null; bIsCompound = (payload as CSharpSetMemberBinder).IsCompoundAssignment; } - _symbolTable.PopulateSymbolTableWithName(name, null, arguments[0].Type); + + SymbolTable.PopulateSymbolTableWithName(name, null, arguments[0].Type); Expr lhs = BindProperty(payload, arguments[0], locals[0], indexerArguments); int indexOfLast = arguments.Length - 1; @@ -1426,7 +1335,7 @@ namespace Microsoft.CSharp.RuntimeBinder ArgumentObject[] arguments, LocalVariableSymbol[] locals) { - // The IsEvent binder will never be called without an instance object. This + // The IsEvent binder will never be called without an instance object. This // is because the compiler only gen's this code for dynamic dots. Expr callingObject = CreateLocal(arguments[0].Type, false, locals[0]); @@ -1439,10 +1348,10 @@ namespace Microsoft.CSharp.RuntimeBinder throw Error.NullReferenceOnMemberException(); } - SymWithType swt = _symbolTable.LookupMember( + SymWithType swt = SymbolTable.LookupMember( binder.Name, callingObject, - _bindingContext.ContextForMemberLookup, + _binder.Context.ContextForMemberLookup, 0, mem, false, @@ -1466,7 +1375,7 @@ namespace Microsoft.CSharp.RuntimeBinder } } - return _exprFactory.CreateConstant(boolType, ConstVal.Get(result)); + return ExprFactory.CreateConstant(boolType, ConstVal.Get(result)); } #endregion } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BinOpArgInfo.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BinOpArgInfo.cs index 17e1f6d029..ce1b858616 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BinOpArgInfo.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BinOpArgInfo.cs @@ -7,7 +7,7 @@ using Microsoft.CSharp.RuntimeBinder.Syntax; namespace Microsoft.CSharp.RuntimeBinder.Semantics { - internal sealed partial class ExpressionBinder + internal readonly partial struct ExpressionBinder { private sealed class BinOpArgInfo { @@ -21,10 +21,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics type2 = arg2.Type; typeRaw1 = type1.StripNubs(); typeRaw2 = type2.StripNubs(); - pt1 = type1.isPredefined() ? type1.getPredefType() : PredefinedType.PT_COUNT; - pt2 = type2.isPredefined() ? type2.getPredefType() : PredefinedType.PT_COUNT; - ptRaw1 = typeRaw1.isPredefined() ? typeRaw1.getPredefType() : PredefinedType.PT_COUNT; - ptRaw2 = typeRaw2.isPredefined() ? typeRaw2.getPredefType() : PredefinedType.PT_COUNT; + pt1 = type1.IsPredefined ? type1.PredefinedType : PredefinedType.PT_COUNT; + pt2 = type2.IsPredefined ? type2.PredefinedType : PredefinedType.PT_COUNT; + ptRaw1 = typeRaw1.IsPredefined ? typeRaw1.PredefinedType : PredefinedType.PT_COUNT; + ptRaw2 = typeRaw2.IsPredefined ? typeRaw2.PredefinedType : PredefinedType.PT_COUNT; } public Expr arg1; diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BinOpSig.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BinOpSig.cs index db41f04f30..6a4efe072f 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BinOpSig.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BinOpSig.cs @@ -7,7 +7,7 @@ using Microsoft.CSharp.RuntimeBinder.Syntax; namespace Microsoft.CSharp.RuntimeBinder.Semantics { - internal sealed partial class ExpressionBinder + internal readonly partial struct ExpressionBinder { private class BinOpSig { @@ -85,8 +85,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics this.grfos = bos.grfos; this.fnkind = bos.fnkind; - _type1 = pt1 != PredefinedType.PT_UNDEFINEDINDEX ? fnc.GetPredefindType(pt1) : null; - _type2 = pt2 != PredefinedType.PT_UNDEFINEDINDEX ? fnc.GetPredefindType(pt2) : null; + _type1 = pt1 != PredefinedType.PT_UNDEFINEDINDEX ? GetPredefindType(pt1) : null; + _type2 = pt2 != PredefinedType.PT_UNDEFINEDINDEX ? GetPredefindType(pt2) : null; _grflt = LiftFlags.None; } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Binding/Better.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Binding/Better.cs index 6fe31c29fd..de077e9f4b 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Binding/Better.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Binding/Better.cs @@ -9,7 +9,7 @@ using Microsoft.CSharp.RuntimeBinder.Syntax; namespace Microsoft.CSharp.RuntimeBinder.Semantics { - internal sealed partial class ExpressionBinder + internal readonly partial struct ExpressionBinder { //////////////////////////////////////////////////////////////////////////////// // This table is used to implement the last set of 'better' conversion rules @@ -38,7 +38,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics new byte[] /* OBJECT*/ {3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3} }; - private BetterType WhichMethodIsBetterTieBreaker( + private static BetterType WhichMethodIsBetterTieBreaker( CandidateFunctionMember node1, CandidateFunctionMember node2, CType pTypeThrough, @@ -83,7 +83,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } // See if one's parameter types (un-instantiated) are more specific. - BetterType nT = GetGlobalSymbols().CompareTypes( + BetterType nT = CompareTypes( RearrangeNamedArguments(mpwi1.MethProp().Params, mpwi1, pTypeThrough, args), RearrangeNamedArguments(mpwi2.MethProp().Params, mpwi2, pTypeThrough, args)); if (nT == BetterType.Left || nT == BetterType.Right) @@ -101,6 +101,79 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return BetterType.Neither; } + private static BetterType CompareTypes(TypeArray ta1, TypeArray ta2) + { + if (ta1 == ta2) + { + return BetterType.Same; + } + + if (ta1.Count != ta2.Count) + { + // The one with more parameters is more specific. + return ta1.Count > ta2.Count ? BetterType.Left : BetterType.Right; + } + + BetterType nTot = BetterType.Neither; + + for (int i = 0; i < ta1.Count; i++) + { + CType type1 = ta1[i]; + CType type2 = ta2[i]; + BetterType nParam = BetterType.Neither; + +LAgain: + if (type1.TypeKind != type2.TypeKind) + { + if (type1 is TypeParameterType) + { + nParam = BetterType.Right; + } + else if (type2 is TypeParameterType) + { + nParam = BetterType.Left; + } + } + else + { + switch (type1.TypeKind) + { + default: + Debug.Assert(false, "Bad kind in CompareTypes"); + break; + case TypeKind.TK_TypeParameterType: + break; + + case TypeKind.TK_PointerType: + case TypeKind.TK_ParameterModifierType: + case TypeKind.TK_ArrayType: + case TypeKind.TK_NullableType: + type1 = type1.BaseOrParameterOrElementType; + type2 = type2.BaseOrParameterOrElementType; + goto LAgain; + + case TypeKind.TK_AggregateType: + nParam = CompareTypes(((AggregateType)type1).TypeArgsAll, ((AggregateType)type2).TypeArgsAll); + break; + } + } + + if (nParam == BetterType.Right || nParam == BetterType.Left) + { + if (nTot == BetterType.Same || nTot == BetterType.Neither) + { + nTot = nParam; + } + else if (nParam != nTot) + { + return BetterType.Neither; + } + } + } + + return nTot; + } + //////////////////////////////////////////////////////////////////////////////// // Find the index of a name on a list. @@ -126,8 +199,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // By rearranging the arguments as such we make sure that any specified named arguments appear in the same position for both // methods and we also maintain the relative order of the other parameters (the type long appears after int in the above example) - private TypeArray RearrangeNamedArguments(TypeArray pta, MethPropWithInst mpwi, - CType pTypeThrough, ArgInfos args) + private static TypeArray RearrangeNamedArguments(TypeArray pta, MethPropWithInst mpwi, CType pTypeThrough, ArgInfos args) { #if DEBUG // We never have a named argument that is in a position in the argument @@ -147,7 +219,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics CType type = pTypeThrough != null ? pTypeThrough : mpwi.GetType(); CType[] typeList = new CType[pta.Count]; - MethodOrPropertySymbol methProp = GroupToArgsBinder.FindMostDerivedMethod(GetSymbolLoader(), mpwi.MethProp(), type); + MethodOrPropertySymbol methProp = GroupToArgsBinder.FindMostDerivedMethod(mpwi.MethProp(), type); // We initialize the new type array with the parameters for the method. for (int iParam = 0; iParam < pta.Count; iParam++) @@ -179,7 +251,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } } - return GetSymbolLoader().getBSymmgr().AllocParams(pta.Count, typeList); + return TypeArray.Allocate(typeList); } //////////////////////////////////////////////////////////////////////////////// @@ -386,12 +458,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return a2b ? BetterType.Left : BetterType.Right; } - if (p1.isPredefined() && p2.isPredefined()) + if (p1.IsPredefined && p2.IsPredefined) { - PredefinedType pt1 = p1.getPredefType(); + PredefinedType pt1 = p1.PredefinedType; if (pt1 <= PredefinedType.PT_OBJECT) { - PredefinedType pt2 = p2.getPredefType(); + PredefinedType pt2 = p2.PredefinedType; if (pt2 <= PredefinedType.PT_OBJECT) { return (BetterType)s_betterConversionTable[(int)pt1][(int)pt2]; diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Binding/ErrorReporting.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Binding/ErrorReporting.cs deleted file mode 100644 index b697f078b5..0000000000 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Binding/ErrorReporting.cs +++ /dev/null @@ -1,107 +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; -using System.Diagnostics; -using Microsoft.CSharp.RuntimeBinder.Errors; - -namespace Microsoft.CSharp.RuntimeBinder.Semantics -{ - internal sealed partial class ExpressionBinder - { - private RuntimeBinderException ReportReadOnlyError(ExprField field, bool isNested) - { - Debug.Assert(field != null); - - FieldWithType fieldWithType = field.FieldWithType; - bool isStatic = fieldWithType.Field().isStatic; - ErrArg[] args; - ErrorCode err; - if (isNested) - { - args = new ErrArg[]{ fieldWithType }; - err = isStatic ? ErrorCode.ERR_AssgReadonlyStatic2 : ErrorCode.ERR_AssgReadonly2; - } - else - { - args = Array.Empty(); - err = isStatic ? ErrorCode.ERR_AssgReadonlyStatic : ErrorCode.ERR_AssgReadonly; - } - - return ErrorContext.Error(err, args); - } - - private void TryReportLvalueFailure(Expr expr, CheckLvalueKind kind) - { - Debug.Assert(expr != null); - Debug.Assert(!(expr is ExprLocal)); - - // We have a lvalue failure. Was the reason because this field - // was marked readonly? Give special messages for this case. - - bool isNested = false; // Did we recurse on a field or property to give a better error? - - while (true) - { - Debug.Assert(expr != null); - - Expr pObject = null; - - if (expr is ExprProperty prop) - { - // We've already reported read-only-property errors. - Debug.Assert(prop.MethWithTypeSet != null); - pObject = prop.MemberGroup.OptionalObject; - } - else if (expr is ExprField field) - { - if (field.FieldWithType.Field().isReadOnly) - { - throw ReportReadOnlyError(field, isNested); - } - if (!field.FieldWithType.Field().isStatic) - { - pObject = field.OptionalObject; - } - } - - if (pObject != null && pObject.Type.isStructOrEnum()) - { - if (pObject is ExprWithArgs withArgs) - { - // assigning to RHS of method or property getter returning a value-type on the stack or - // passing RHS of method or property getter returning a value-type on the stack, as ref or out - throw ErrorContext.Error(ErrorCode.ERR_ReturnNotLValue, withArgs.GetSymWithType()); - } - if (pObject is ExprCast) - { - // An unboxing conversion. - // - // In the static compiler, we give the following error here: - // ErrorContext.Error(pObject.GetTree(), ErrorCode.ERR_UnboxNotLValue); - // - // But in the runtime, we allow this - mark that we're doing an - // unbox here, so that we gen the correct expression tree for it. - pObject.Flags |= EXPRFLAG.EXF_UNBOXRUNTIME; - return; - } - } - - // everything else - if (pObject != null && !pObject.isLvalue() && (expr is ExprField || !isNested)) - { - Debug.Assert(pObject.Type.isStructOrEnum()); - Debug.Assert(!(pObject is ExprLocal)); - expr = pObject; - } - else - { - throw ErrorContext.Error(GetStandardLvalueError(kind)); - } - - isNested = true; - } - } - } -} diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BindingContext.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BindingContext.cs index 18783d2792..cfbdee42ae 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BindingContext.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BindingContext.cs @@ -2,8 +2,6 @@ // 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 Microsoft.CSharp.RuntimeBinder.Semantics { // ---------------------------------------------------------------------------- @@ -11,36 +9,23 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // consumed by the StatementBinder. // ---------------------------------------------------------------------------- - internal sealed class BindingContext + internal readonly struct BindingContext { - public BindingContext(CSemanticChecker semanticChecker, ExprFactory exprFactory) + public BindingContext(AggregateSymbol context, bool isChecked) { - Debug.Assert(semanticChecker != null); - ExprFactory = exprFactory; - SemanticChecker = semanticChecker; - SymbolLoader = semanticChecker.SymbolLoader; + ContextForMemberLookup = context; + Checked = isChecked; } public BindingContext(BindingContext parent) - : this(parent.SemanticChecker, parent.ExprFactory) { // We copy the context object, but leave checking false. ContextForMemberLookup = parent.ContextForMemberLookup; + Checked = false; } - //The SymbolLoader can be retrieved from SemanticChecker, - //but that is a virtual call that is showing up on the profiler. Retrieve - //the SymbolLoader once at construction and return a cached copy. + public AggregateSymbol ContextForMemberLookup { get; } - // PERFORMANCE: Is this cache still necessary? - public SymbolLoader SymbolLoader { get; } - - public AggregateDeclaration ContextForMemberLookup { get; set; } - - public CSemanticChecker SemanticChecker { get; } - - public ExprFactory ExprFactory { get; } - - public bool Checked { get; set; } + public bool Checked { get; } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Conversion.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Conversion.cs index 584a151650..4d7771f698 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Conversion.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Conversion.cs @@ -40,7 +40,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Neither = 3, } - internal sealed partial class ExpressionBinder + internal readonly partial struct ExpressionBinder { private delegate bool ConversionFunc( Expr pSourceExpr, @@ -259,11 +259,11 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { return BetterType.Same; } - if (typeGiven.isPredefType(pt1)) + if (typeGiven.IsPredefType(pt1)) { return BetterType.Left; } - if (typeGiven.isPredefType(pt2)) + if (typeGiven.IsPredefType(pt2)) { return BetterType.Right; } @@ -312,14 +312,14 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } if (!(type1 is NullableType nub1) || !(type2 is NullableType nub2) || - !nub1.UnderlyingType.isPredefined() || - !nub2.UnderlyingType.isPredefined()) + !nub1.UnderlyingType.IsPredefined || + !nub2.UnderlyingType.IsPredefined) { return BetterType.Neither; } - PredefinedType pt1 = (type1 as NullableType).UnderlyingType.getPredefType(); - PredefinedType pt2 = (type2 as NullableType).UnderlyingType.getPredefType(); + PredefinedType pt1 = (type1 as NullableType).UnderlyingType.PredefinedType; + PredefinedType pt2 = (type2 as NullableType).UnderlyingType.PredefinedType; if ((int)pt1 < NUM_EXT_TYPES && (int)pt2 < NUM_EXT_TYPES) { @@ -351,8 +351,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (BindImplicitConversion(expr, expr.Type, dest, out Expr exprResult, flags)) { // Conversion works. - checkUnsafe(expr.Type); // added to the binder so we don't bind to pointer ops - checkUnsafe(dest); // added to the binder so we don't bind to pointer ops + CheckUnsafe(expr.Type); // added to the binder so we don't bind to pointer ops + CheckUnsafe(dest); // added to the binder so we don't bind to pointer ops return exprResult; } @@ -360,29 +360,29 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // For certain situations, try to give a better error. - FUNDTYPE ftSrc = expr.Type.fundType(); - FUNDTYPE ftDest = dest.fundType(); + FUNDTYPE ftSrc = expr.Type.FundamentalType; + FUNDTYPE ftDest = dest.FundamentalType; if (expr is ExprConstant constant && - expr.Type.isSimpleType() && dest.isSimpleType()) + expr.Type.IsSimpleType && dest.IsSimpleType) { if ((ftSrc == FUNDTYPE.FT_I4 && (ftDest <= FUNDTYPE.FT_LASTNONLONG || ftDest == FUNDTYPE.FT_U8)) || (ftSrc == FUNDTYPE.FT_I8 && ftDest == FUNDTYPE.FT_U8)) { // Failed because value was out of range. Report nifty error message. string value = constant.Int64Value.ToString(CultureInfo.InvariantCulture); - throw ErrorContext.Error(ErrorCode.ERR_ConstOutOfRange, value, dest); + throw ErrorHandling.Error(ErrorCode.ERR_ConstOutOfRange, value, dest); } } - if (expr.Type is NullType && dest.fundType() != FUNDTYPE.FT_REF) + if (expr.Type is NullType && dest.FundamentalType != FUNDTYPE.FT_REF) { - throw ErrorContext.Error(ErrorCode.ERR_ValueCantBeNull, dest); + throw ErrorHandling.Error(ErrorCode.ERR_ValueCantBeNull, dest); } // canCast => can't convert, but explicit exists and can be specified by the user (no anonymous types). // !canCast => Generic "can't convert" error. - throw ErrorContext.Error(canCast(expr.Type, dest, flags) ? ErrorCode.ERR_NoImplicitConvCast : ErrorCode.ERR_NoImplicitConv, new ErrArg(expr.Type, ErrArgFlags.Unique), new ErrArg(dest, ErrArgFlags.Unique)); + throw ErrorHandling.Error(canCast(expr.Type, dest, flags) ? ErrorCode.ERR_NoImplicitConvCast : ErrorCode.ERR_NoImplicitConv, new ErrArg(expr.Type, ErrArgFlags.Unique), new ErrArg(dest, ErrArgFlags.Unique)); } // performs an implicit conversion if its possible. otherwise returns null. flags is an optional parameter. @@ -400,8 +400,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { if (BindImplicitConversion(expr, expr.Type, dest, out Expr exprResult, flags)) { - checkUnsafe(expr.Type); // added to the binder so we don't bind to pointer ops - checkUnsafe(dest); // added to the binder so we don't bind to pointer ops + CheckUnsafe(expr.Type); // added to the binder so we don't bind to pointer ops + CheckUnsafe(dest); // added to the binder so we don't bind to pointer ops // Conversion works. return exprResult; } @@ -425,29 +425,28 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Debug.Assert(!(expr is ExprMemberGroup)); Debug.Assert(dest != null); - SemanticChecker.CheckForStaticClass(null, dest, ErrorCode.ERR_ConvertToStaticClass); + CSemanticChecker.CheckForStaticClass(dest); if (BindExplicitConversion(expr, expr.Type, dest, out Expr exprResult, flags)) { // Conversion works. - checkUnsafe(expr.Type); // added to the binder so we don't bind to pointer ops - checkUnsafe(dest); // added to the binder so we don't bind to pointer ops + CheckUnsafe(expr.Type); // added to the binder so we don't bind to pointer ops + CheckUnsafe(dest); // added to the binder so we don't bind to pointer ops return exprResult; } // For certain situations, try to give a better error. Expr exprConst = expr.GetConst(); - bool simpleConstToSimpleDestination = exprConst != null && expr.Type.isSimpleOrEnum() && - dest.isSimpleOrEnum(); + bool simpleConstToSimpleDestination = exprConst != null && expr.Type.IsSimpleOrEnum && dest.IsSimpleOrEnum; if (simpleConstToSimpleDestination) { - FUNDTYPE exprType = expr.Type.fundType(); + FUNDTYPE exprType = expr.Type.FundamentalType; if (exprType == FUNDTYPE.FT_STRUCT) { // We have a constant decimal that is out of range of the destination type. // In both checked and unchecked contexts we issue an error. No need to recheck conversion in unchecked context. // Decimal is a SimpleType represented in a FT_STRUCT - throw ErrorContext.Error( + throw ErrorHandling.Error( ErrorCode.ERR_ConstOutOfRange, ((ExprConstant)exprConst).Val.DecimalVal.ToString(CultureInfo.InvariantCulture), dest); } @@ -455,53 +454,60 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (Context.Checked) { // check if we failed because we are in checked mode... - if (!canExplicitConversionBeBoundInUncheckedContext(expr, expr.Type, dest, flags | CONVERTTYPE.NOUDC)) + if (!CanExplicitConversionBeBoundInUncheckedContext(expr, expr.Type, dest, flags | CONVERTTYPE.NOUDC)) { throw CantConvert(expr, dest); } // Failed because value was out of range. Report nifty error message. string value; - if (exprType <= FUNDTYPE.FT_LASTINTEGRAL) + switch (exprType) { - value = expr.Type.isUnsigned() - ? ((ulong)((ExprConstant)exprConst).Int64Value).ToString(CultureInfo.InvariantCulture) - : ((ExprConstant)exprConst).Int64Value.ToString(CultureInfo.InvariantCulture); - } - else - { - Debug.Assert(exprType <= FUNDTYPE.FT_LASTNUMERIC, "Error in constant conversion logic!"); - value = ((ExprConstant)exprConst).Val.DoubleVal.ToString(CultureInfo.InvariantCulture); + case FUNDTYPE.FT_U1: + case FUNDTYPE.FT_U2: + case FUNDTYPE.FT_U4: + case FUNDTYPE.FT_U8: + value = ((ulong)((ExprConstant)exprConst).Int64Value).ToString(CultureInfo.InvariantCulture); + break; + + case FUNDTYPE.FT_I1: + case FUNDTYPE.FT_I2: + case FUNDTYPE.FT_I4: + case FUNDTYPE.FT_I8: + value = ((ExprConstant)exprConst).Int64Value.ToString(CultureInfo.InvariantCulture); + break; + + default: + Debug.Assert(exprType <= FUNDTYPE.FT_LASTNUMERIC, "Error in constant conversion logic!"); + value = ((ExprConstant)exprConst).Val.DoubleVal.ToString(CultureInfo.InvariantCulture); + break; } - throw ErrorContext.Error(ErrorCode.ERR_ConstOutOfRangeChecked, value, dest); + throw ErrorHandling.Error(ErrorCode.ERR_ConstOutOfRangeChecked, value, dest); } } - if (expr.Type is NullType && dest.fundType() != FUNDTYPE.FT_REF) + if (expr.Type is NullType && dest.FundamentalType != FUNDTYPE.FT_REF) { - throw ErrorContext.Error(ErrorCode.ERR_ValueCantBeNull, dest); + throw ErrorHandling.Error(ErrorCode.ERR_ValueCantBeNull, dest); } throw CantConvert(expr, dest); } - private RuntimeBinderException CantConvert(Expr expr, CType dest) + private static RuntimeBinderException CantConvert(Expr expr, CType dest) { // Generic "can't convert" error. Debug.Assert(expr.Type != null); - return ErrorContext.Error(ErrorCode.ERR_NoExplicitConv, new ErrArg(expr.Type, ErrArgFlags.Unique), new ErrArg(dest, ErrArgFlags.Unique)); + return ErrorHandling.Error(ErrorCode.ERR_NoExplicitConv, new ErrArg(expr.Type, ErrArgFlags.Unique), new ErrArg(dest, ErrArgFlags.Unique)); } public Expr mustCast(Expr expr, CType dest) => mustCast(expr, dest, 0); public Expr mustCast(Expr expr, CType dest, CONVERTTYPE flags) => mustCastCore(expr, dest, flags); - private Expr mustCastInUncheckedContext(Expr expr, CType dest, CONVERTTYPE flags) - { - BindingContext ctx = new BindingContext(Context); - return (new ExpressionBinder(ctx)).mustCast(expr, dest, flags); - } + private Expr MustCastInUncheckedContext(Expr expr, CType dest, CONVERTTYPE flags) => + new ExpressionBinder(new BindingContext(Context)).mustCast(expr, dest, flags); // returns true if an explicit conversion exists from source type to dest type. flags is an optional parameter. private bool canCast(CType src, CType dest, CONVERTTYPE flags) => BindExplicitConversion(null, src, dest, flags); @@ -595,8 +601,11 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Debug.Assert(exprSrc == null || exprSrc.Type == typeSrc); // If either type is an interface we should never employ a UD conversion. - if (typeSrc == null || typeDst == null || typeSrc.isInterfaceType() || typeDst.isInterfaceType()) + if (typeSrc == null || typeDst == null || typeSrc.IsInterfaceType || typeDst.IsInterfaceType) + { return false; + } + CType typeSrcBase = typeSrc.StripNubs(); CType typeDstBase = typeDst.StripNubs(); @@ -604,7 +613,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // true exactly when both the source and destination types are nullable. bool fLiftSrc = typeSrcBase != typeSrc; bool fLiftDst = typeDstBase != typeDst; - bool fDstHasNull = fLiftDst || typeDst.IsRefType() || typeDst is PointerType; + bool fDstHasNull = fLiftDst || typeDst.IsReferenceType || typeDst is PointerType; AggregateType[] rgats = new AggregateType[2]; int cats = 0; @@ -618,21 +627,21 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics bool fIntPtrOverride2 = false; // Get the list of operators from the source. - if (typeSrcBase is AggregateType atSrcBase && atSrcBase.getAggregate().HasConversion(GetSymbolLoader())) + if (typeSrcBase is AggregateType atSrcBase && atSrcBase.OwningAggregate.HasConversion()) { rgats[cats++] = atSrcBase; - fIntPtrOverride2 = atSrcBase.isPredefType(PredefinedType.PT_INTPTR) || atSrcBase.isPredefType(PredefinedType.PT_UINTPTR); + fIntPtrOverride2 = atSrcBase.IsPredefType(PredefinedType.PT_INTPTR) || atSrcBase.IsPredefType(PredefinedType.PT_UINTPTR); } // Get the list of operators from the destination. if (typeDstBase is AggregateType atDstBase) { - if (typeDstBase.getAggregate().HasConversion(GetSymbolLoader())) + if (atDstBase.OwningAggregate.HasConversion()) { rgats[cats++] = atDstBase; } - if (fIntPtrOverride2 && !typeDstBase.isPredefType(PredefinedType.PT_LONG) && !typeDstBase.isPredefType(PredefinedType.PT_ULONG)) + if (fIntPtrOverride2 && !typeDstBase.IsPredefType(PredefinedType.PT_LONG) && !typeDstBase.IsPredefType(PredefinedType.PT_ULONG)) { fIntPtrOverride2 = false; } @@ -660,9 +669,9 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // In the first pass if we find types that are non-comparable, keep one of the types and keep going. for (int iats = 0; iats < cats; iats++) { - for (AggregateType atsCur = rgats[iats]; atsCur != null && atsCur.getAggregate().HasConversion(GetSymbolLoader()); atsCur = atsCur.GetBaseClass()) + for (AggregateType atsCur = rgats[iats]; atsCur != null && atsCur.OwningAggregate.HasConversion(); atsCur = atsCur.BaseClass) { - AggregateSymbol aggCur = atsCur.getAggregate(); + AggregateSymbol aggCur = atsCur.OwningAggregate; // We need to replicate behavior that allows non-standard conversions with these guys. PredefinedType aggPredefType = aggCur.GetPredefType(); @@ -687,8 +696,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics continue; // Get the substituted src and dst types. - typeFrom = GetTypes().SubstType(convCur.Params[0], atsCur); - typeTo = GetTypes().SubstType(convCur.RetType, atsCur); + typeFrom = TypeManager.SubstType(convCur.Params[0], atsCur); + typeTo = TypeManager.SubstType(convCur.RetType, atsCur); bool fNeedImplicit = fImplicitOnly; @@ -705,8 +714,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics FUNDTYPE ftFrom; FUNDTYPE ftTo; - if ((ftTo = typeTo.fundType()) <= FUNDTYPE.FT_LASTNUMERIC && ftTo > FUNDTYPE.FT_NONE && - (ftFrom = typeFrom.fundType()) <= FUNDTYPE.FT_LASTNUMERIC && ftFrom > FUNDTYPE.FT_NONE) + if ((ftTo = typeTo.FundamentalType) <= FUNDTYPE.FT_LASTNUMERIC && ftTo > FUNDTYPE.FT_NONE && + (ftFrom = typeFrom.FundamentalType) <= FUNDTYPE.FT_LASTNUMERIC && ftFrom > FUNDTYPE.FT_NONE) { continue; } @@ -714,14 +723,14 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // Ignore the IntPtr/UIntPtr -> int/uint conversion in favor of // the IntPtr/UIntPtr -> long/ulong conversion. - if (fIntPtrOverride2 && (typeTo.isPredefType(PredefinedType.PT_INT) || typeTo.isPredefType(PredefinedType.PT_UINT))) + if (fIntPtrOverride2 && (typeTo.IsPredefType(PredefinedType.PT_INT) || typeTo.IsPredefType(PredefinedType.PT_UINT))) continue; // Lift the conversion if needed. - if (fLiftSrc && (fDstHasNull || !fNeedImplicit) && typeFrom.IsNonNubValType()) - typeFrom = GetTypes().GetNullable(typeFrom); - if (fLiftDst && typeTo.IsNonNubValType()) - typeTo = GetTypes().GetNullable(typeTo); + if (fLiftSrc && (fDstHasNull || !fNeedImplicit) && typeFrom.IsNonNullableValueType) + typeFrom = TypeManager.GetNullable(typeFrom); + if (fLiftDst && typeTo.IsNonNullableValueType) + typeTo = TypeManager.GetNullable(typeTo); // Check for applicability. bool fFromImplicit = exprSrc != null ? canConvert(exprSrc, typeFrom, CONVERTTYPE.STANDARDANDNOUDC) : canConvert(typeSrc, typeFrom, CONVERTTYPE.STANDARDANDNOUDC); @@ -742,7 +751,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { continue; } - if (isConvInTable(prguci, convCur, atsCur, fFromImplicit, fToImplicit)) + if (IsConvInTable(prguci, convCur, atsCur, fFromImplicit, fToImplicit)) { // VSWhidbey 579325: duplicate conversions in the convInfo table cause false ambiguity: // If a user defined implicit conversion exists in a generic base type, @@ -763,11 +772,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // The conversion is applicable so it affects the best types. - prguci.Add(new UdConvInfo()); - prguci[prguci.Count - 1].mwt = new MethWithType(); - prguci[prguci.Count - 1].mwt.Set(convCur, atsCur); - prguci[prguci.Count - 1].fSrcImplicit = fFromImplicit; - prguci[prguci.Count - 1].fDstImplicit = fToImplicit; + prguci.Add(new UdConvInfo(new MethWithType(convCur, atsCur), fFromImplicit, fToImplicit)); if (!fBestSrcExact) { @@ -788,7 +793,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics else if (typeBestSrc != typeFrom) { Debug.Assert(0 <= iuciBestSrc && iuciBestSrc < prguci.Count - 1); - int n = CompareSrcTypesBased(typeBestSrc, prguci[iuciBestSrc].fSrcImplicit, typeFrom, fFromImplicit); + int n = CompareSrcTypesBased(typeBestSrc, prguci[iuciBestSrc].SrcImplicit, typeFrom, fFromImplicit); if (n > 0) { typeBestSrc = typeFrom; @@ -815,7 +820,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics else if (typeBestDst != typeTo) { Debug.Assert(0 <= iuciBestDst && iuciBestDst < prguci.Count - 1); - int n = CompareDstTypesBased(typeBestDst, prguci[iuciBestDst].fDstImplicit, typeTo, fToImplicit); + int n = CompareDstTypesBased(typeBestDst, prguci[iuciBestDst].DstImplicit, typeTo, fToImplicit); if (n > 0) { typeBestDst = typeTo; @@ -847,20 +852,21 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics UdConvInfo uci = prguci[iuci]; // Get the substituted src and dst types. - typeFrom = GetTypes().SubstType(uci.mwt.Meth().Params[0], uci.mwt.GetType()); - typeTo = GetTypes().SubstType(uci.mwt.Meth().RetType, uci.mwt.GetType()); + typeFrom = TypeManager.SubstType(uci.Meth.Meth().Params[0], uci.Meth.GetType()); + typeTo = TypeManager.SubstType(uci.Meth.Meth().RetType, uci.Meth.GetType()); int ctypeLift = 0; // Lift the conversion if needed. - if (fLiftSrc && typeFrom.IsNonNubValType()) + if (fLiftSrc && typeFrom.IsNonNullableValueType) { - typeFrom = GetTypes().GetNullable(typeFrom); + typeFrom = TypeManager.GetNullable(typeFrom); ctypeLift++; } - if (fLiftDst && typeTo.IsNonNubValType()) + + if (fLiftDst && typeTo.IsNonNullableValueType) { - typeTo = GetTypes().GetNullable(typeTo); + typeTo = TypeManager.GetNullable(typeTo); ctypeLift++; } @@ -903,7 +909,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // convertible to each other (eg, int? and int??) and hence not distinguishable by CompareXxxTypesBase. if (!fBestSrcExact && typeFrom != typeBestSrc) { - int n = CompareSrcTypesBased(typeBestSrc, prguci[iuciBestSrc].fSrcImplicit, typeFrom, uci.fSrcImplicit); + int n = CompareSrcTypesBased(typeBestSrc, prguci[iuciBestSrc].SrcImplicit, typeFrom, uci.SrcImplicit); Debug.Assert(n <= 0); if (n >= 0) { @@ -917,7 +923,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } if (!fBestDstExact && typeTo != typeBestDst) { - int n = CompareDstTypesBased(typeBestDst, prguci[iuciBestDst].fDstImplicit, typeTo, uci.fDstImplicit); + int n = CompareDstTypesBased(typeBestDst, prguci[iuciBestDst].DstImplicit, typeTo, uci.DstImplicit); Debug.Assert(n <= 0); if (n >= 0) { @@ -943,12 +949,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics throw HandleAmbiguity(typeSrc, typeDst, prguci, iuciBest, iuciAmbig); } - MethWithInst mwiBest = new MethWithInst(prguci[iuciBest].mwt.Meth(), prguci[iuciBest].mwt.GetType(), null); + MethWithInst mwiBest = new MethWithInst(prguci[iuciBest].Meth.Meth(), prguci[iuciBest].Meth.GetType(), null); Debug.Assert(ctypeLiftBest <= 2); - typeFrom = GetTypes().SubstType(mwiBest.Meth().Params[0], mwiBest.GetType()); - typeTo = GetTypes().SubstType(mwiBest.Meth().RetType, mwiBest.GetType()); + typeFrom = TypeManager.SubstType(mwiBest.Meth().Params[0], mwiBest.GetType()); + typeTo = TypeManager.SubstType(mwiBest.Meth().RetType, mwiBest.GetType()); Expr exprDst; Expr pTransformedArgument = exprSrc; @@ -980,7 +986,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (typeFrom != typeSrcBase) { // There is an intermediate conversion. - NullableType pConversionNubSourceType = SymbolLoader.GetTypeManager().GetNullable(typeFrom); + NullableType pConversionNubSourceType = TypeManager.GetNullable(typeFrom); pConversionArgument = mustCast(exprSrc, pConversionNubSourceType); MarkAsIntermediateConversion(pConversionArgument); } @@ -1018,14 +1024,14 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return true; } - private RuntimeBinderException HandleAmbiguity(CType typeSrc, CType typeDst, List prguci, int iuciBestSrc, int iuciBestDst) + private static RuntimeBinderException HandleAmbiguity(CType typeSrc, CType typeDst, List prguci, int iuciBestSrc, int iuciBestDst) { Debug.Assert(0 <= iuciBestSrc && iuciBestSrc < prguci.Count); Debug.Assert(0 <= iuciBestDst && iuciBestDst < prguci.Count); - return ErrorContext.Error(ErrorCode.ERR_AmbigUDConv, prguci[iuciBestSrc].mwt, prguci[iuciBestDst].mwt, typeSrc, typeDst); + return ErrorHandling.Error(ErrorCode.ERR_AmbigUDConv, prguci[iuciBestSrc].Meth, prguci[iuciBestDst].Meth, typeSrc, typeDst); } - private void MarkAsIntermediateConversion(Expr pExpr) + private static void MarkAsIntermediateConversion(Expr pExpr) { for (;;) { @@ -1081,8 +1087,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics pexprDest = null; long valueInt = 0; double valueFlt = 0; - FUNDTYPE ftSrc = exprSrc.Type.fundType(); - FUNDTYPE ftDest = typeDest.fundType(); + FUNDTYPE ftSrc = exprSrc.Type.FundamentalType; + FUNDTYPE ftDest = typeDest.FundamentalType; bool srcIntegral = (ftSrc <= FUNDTYPE.FT_LASTINTEGRAL); bool srcNumeric = (ftSrc <= FUNDTYPE.FT_LASTNUMERIC); @@ -1091,7 +1097,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (ftSrc == FUNDTYPE.FT_STRUCT || ftDest == FUNDTYPE.FT_STRUCT) { // Do constant folding involving decimal constants. - Expr expr = bindDecimalConstCast(typeDest, exprSrc.Type, constSrc); + Expr expr = BindDecimalConstCast(typeDest, exprSrc.Type, constSrc); if (expr == null) { @@ -1120,7 +1126,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // Get the source constant value into valueInt or valueFlt. if (srcIntegral) { - if (constSrc.Type.fundType() == FUNDTYPE.FT_U8) + if (constSrc.Type.FundamentalType == FUNDTYPE.FT_U8) { // If we're going from ulong to something, make sure we can fit. if (ftDest == FUNDTYPE.FT_U8) @@ -1333,7 +1339,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics /* * Bind a constant cast to or from decimal. Return null if cast can't be done. */ - private Expr bindDecimalConstCast(CType destType, CType srcType, ExprConstant src) + private static Expr BindDecimalConstCast(CType destType, CType srcType, ExprConstant src) { CType typeDecimal = SymbolLoader.GetPredefindType(PredefinedType.PT_DECIMAL); ConstVal cv; @@ -1345,7 +1351,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { // Casting to decimal. - FUNDTYPE ftSrc = srcType.fundType(); + FUNDTYPE ftSrc = srcType.FundamentalType; decimal result; switch (ftSrc) @@ -1387,7 +1393,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // Casting from decimal decimal decTrunc = 0; - FUNDTYPE ftDest = destType.fundType(); + FUNDTYPE ftDest = destType.FundamentalType; try { if (ftDest != FUNDTYPE.FT_R4 && ftDest != FUNDTYPE.FT_R8) @@ -1438,14 +1444,14 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // Create the cast that was the original tree for this thing. return exprConst; } + return null; } - private bool canExplicitConversionBeBoundInUncheckedContext(Expr exprSrc, CType typeSrc, CType typeDest, CONVERTTYPE flags) + private bool CanExplicitConversionBeBoundInUncheckedContext(Expr exprSrc, CType typeSrc, CType typeDest, CONVERTTYPE flags) { - BindingContext ctx = new BindingContext(Context); Debug.Assert(typeDest != null); - return (new ExpressionBinder(ctx)).BindExplicitConversion(exprSrc, typeSrc, typeDest, flags); + return new ExpressionBinder(new BindingContext(Context)).BindExplicitConversion(exprSrc, typeSrc, typeDest, flags); } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Conversions.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Conversions.cs index 07114602cc..f9b91e0a8e 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Conversions.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Conversions.cs @@ -24,10 +24,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics when the source is a reference type and the destination is a base type of the source. Note that typeDst.IsRefType() may still return false (when both are type parameters). ***************************************************************************************************/ - public static bool FImpRefConv(SymbolLoader loader, CType typeSrc, CType typeDst) - { - return typeSrc.IsRefType() && loader.HasIdentityOrImplicitReferenceConversion(typeSrc, typeDst); - } + public static bool FImpRefConv(CType typeSrc, CType typeDst) => + typeSrc.IsReferenceType && SymbolLoader.HasIdentityOrImplicitReferenceConversion(typeSrc, typeDst); /*************************************************************************************************** Determine whether there is an explicit or implicit reference conversion (or identity conversion) @@ -73,16 +71,16 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics The latter two cases can happen with type variables even though the other type variable is not a reference type. ***************************************************************************************************/ - public static bool FExpRefConv(SymbolLoader loader, CType typeSrc, CType typeDst) + public static bool FExpRefConv(CType typeSrc, CType typeDst) { Debug.Assert(typeSrc != null); Debug.Assert(typeDst != null); - if (typeSrc.IsRefType() && typeDst.IsRefType()) + if (typeSrc.IsReferenceType && typeDst.IsReferenceType) { // is there an implicit reference conversion in either direction? // this handles the bulk of the cases ... - if (loader.HasIdentityOrImplicitReferenceConversion(typeSrc, typeDst) || - loader.HasIdentityOrImplicitReferenceConversion(typeDst, typeSrc)) + if (SymbolLoader.HasIdentityOrImplicitReferenceConversion(typeSrc, typeDst) || + SymbolLoader.HasIdentityOrImplicitReferenceConversion(typeDst, typeSrc)) { return true; } @@ -90,11 +88,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // For a type-parameter T that is known to be a reference type (§25.7), the following explicit reference conversions exist: // • From any interface-type to T. // • From T to any interface-type I provided there isn’t already an implicit reference conversion from T to I. - if (typeSrc.isInterfaceType() && typeDst is TypeParameterType) - { - return true; - } - if (typeSrc is TypeParameterType && typeDst.isInterfaceType()) + if (typeSrc.IsInterfaceType && typeDst is TypeParameterType || typeSrc is TypeParameterType && typeDst.IsInterfaceType) { return true; } @@ -104,8 +98,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // * From any interface-type S to any interface-type T, provided S is not derived from T. if (typeSrc is AggregateType atSrc && typeDst is AggregateType atDst) { - AggregateSymbol aggSrc = atSrc.getAggregate(); - AggregateSymbol aggDest = atDst.getAggregate(); + AggregateSymbol aggSrc = atSrc.OwningAggregate; + AggregateSymbol aggDest = atDst.OwningAggregate; if ((aggSrc.IsClass() && !aggSrc.IsSealed() && aggDest.IsInterface()) || (aggSrc.IsInterface() && aggDest.IsClass() && !aggDest.IsSealed()) || @@ -122,45 +116,44 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // o An explicit reference conversion exists from SE to TE. if (typeDst is ArrayType arrDst) { - return arrSrc.rank == arrDst.rank + return arrSrc.Rank == arrDst.Rank && arrSrc.IsSZArray == arrDst.IsSZArray - && FExpRefConv(loader, arrSrc.GetElementType(), arrDst.GetElementType()); + && FExpRefConv(arrSrc.ElementType, arrDst.ElementType); } // * From a one-dimensional array-type S[] to System.Collections.Generic.IList, System.Collections.Generic.IReadOnlyList // and their base interfaces, provided there is an explicit reference conversion from S to T. - if (!arrSrc.IsSZArray || - !typeDst.isInterfaceType()) + if (!arrSrc.IsSZArray || !typeDst.IsInterfaceType) { return false; } AggregateType aggDst = (AggregateType)typeDst; - TypeArray typeArgsAll = aggDst.GetTypeArgsAll(); + TypeArray typeArgsAll = aggDst.TypeArgsAll; if (typeArgsAll.Count != 1) { return false; } - AggregateSymbol aggIList = loader.GetPredefAgg(PredefinedType.PT_G_ILIST); - AggregateSymbol aggIReadOnlyList = loader.GetPredefAgg(PredefinedType.PT_G_IREADONLYLIST); + AggregateSymbol aggIList = SymbolLoader.GetPredefAgg(PredefinedType.PT_G_ILIST); + AggregateSymbol aggIReadOnlyList = SymbolLoader.GetPredefAgg(PredefinedType.PT_G_IREADONLYLIST); if ((aggIList == null || - !SymbolLoader.IsBaseAggregate(aggIList, aggDst.getAggregate())) && + !SymbolLoader.IsBaseAggregate(aggIList, aggDst.OwningAggregate)) && (aggIReadOnlyList == null || - !SymbolLoader.IsBaseAggregate(aggIReadOnlyList, aggDst.getAggregate()))) + !SymbolLoader.IsBaseAggregate(aggIReadOnlyList, aggDst.OwningAggregate))) { return false; } - return FExpRefConv(loader, arrSrc.GetElementType(), typeArgsAll[0]); + return FExpRefConv(arrSrc.ElementType, typeArgsAll[0]); } if (typeDst is ArrayType arrayDest && typeSrc is AggregateType aggtypeSrc) { // * From System.Array and the interfaces it implements, to any array-type. - if (loader.HasIdentityOrImplicitReferenceConversion(loader.GetPredefindType(PredefinedType.PT_ARRAY), typeSrc)) + if (SymbolLoader.HasIdentityOrImplicitReferenceConversion(SymbolLoader.GetPredefindType(PredefinedType.PT_ARRAY), typeSrc)) { return true; } @@ -169,45 +162,44 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // one-dimensional array-type S[], provided there is an implicit or explicit reference conversion from S[] to // System.Collections.Generic.IList or System.Collections.Generic.IReadOnlyList. This is precisely when either S and T // are the same type or there is an implicit or explicit reference conversion from S to T. - if (!arrayDest.IsSZArray || !typeSrc.isInterfaceType() || - aggtypeSrc.GetTypeArgsAll().Count != 1) + if (!arrayDest.IsSZArray || !typeSrc.IsInterfaceType || aggtypeSrc.TypeArgsAll.Count != 1) { return false; } - AggregateSymbol aggIList = loader.GetPredefAgg(PredefinedType.PT_G_ILIST); - AggregateSymbol aggIReadOnlyList = loader.GetPredefAgg(PredefinedType.PT_G_IREADONLYLIST); + AggregateSymbol aggIList = SymbolLoader.GetPredefAgg(PredefinedType.PT_G_ILIST); + AggregateSymbol aggIReadOnlyList = SymbolLoader.GetPredefAgg(PredefinedType.PT_G_IREADONLYLIST); if ((aggIList == null || - !SymbolLoader.IsBaseAggregate(aggIList, aggtypeSrc.getAggregate())) && + !SymbolLoader.IsBaseAggregate(aggIList, aggtypeSrc.OwningAggregate)) && (aggIReadOnlyList == null || - !SymbolLoader.IsBaseAggregate(aggIReadOnlyList, aggtypeSrc.getAggregate()))) + !SymbolLoader.IsBaseAggregate(aggIReadOnlyList, aggtypeSrc.OwningAggregate))) { return false; } - CType typeArr = arrayDest.GetElementType(); - CType typeLst = aggtypeSrc.GetTypeArgsAll()[0]; + CType typeArr = arrayDest.ElementType; + CType typeLst = aggtypeSrc.TypeArgsAll[0]; Debug.Assert(!(typeArr is MethodGroupType)); - return typeArr == typeLst || FExpRefConv(loader, typeArr, typeLst); + return typeArr == typeLst || FExpRefConv(typeArr, typeLst); } - if (HasGenericDelegateExplicitReferenceConversion(loader, typeSrc, typeDst)) + if (HasGenericDelegateExplicitReferenceConversion(typeSrc, typeDst)) { return true; } } - else if (typeSrc.IsRefType()) + else if (typeSrc.IsReferenceType) { // conversion of T . U, where T : class, U // .. these constraints implies where U : class - return loader.HasIdentityOrImplicitReferenceConversion(typeSrc, typeDst); + return SymbolLoader.HasIdentityOrImplicitReferenceConversion(typeSrc, typeDst); } - else if (typeDst.IsRefType()) + else if (typeDst.IsReferenceType) { // conversion of T . U, where U : class, T // .. these constraints implies where T : class - return loader.HasIdentityOrImplicitReferenceConversion(typeDst, typeSrc); + return SymbolLoader.HasIdentityOrImplicitReferenceConversion(typeDst, typeSrc); } return false; } @@ -224,19 +216,23 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics o If type parameter Xi is declared to be contravariant ("in") then either Si must be identical to Ti, or Si and Ti must both be reference types. ***************************************************************************************************/ - public static bool HasGenericDelegateExplicitReferenceConversion(SymbolLoader loader, CType pSource, CType pTarget) + public static bool HasGenericDelegateExplicitReferenceConversion(CType source, CType target) => + target is AggregateType aggTarget && HasGenericDelegateExplicitReferenceConversion(source, aggTarget); + + public static bool HasGenericDelegateExplicitReferenceConversion(CType pSource, AggregateType pTarget) { - if (!pSource.isDelegateType() || - !pTarget.isDelegateType() || - pSource.getAggregate() != pTarget.getAggregate() || - loader.HasIdentityOrImplicitReferenceConversion(pSource, pTarget)) + if (!(pSource is AggregateType aggSrc) || + !aggSrc.IsDelegateType || + !pTarget.IsDelegateType || + aggSrc.OwningAggregate != pTarget.OwningAggregate || + SymbolLoader.HasIdentityOrImplicitReferenceConversion(aggSrc, pTarget)) { return false; } - TypeArray pTypeParams = pSource.getAggregate().GetTypeVarsAll(); - TypeArray pSourceArgs = ((AggregateType)pSource).GetTypeArgsAll(); - TypeArray pTargetArgs = ((AggregateType)pTarget).GetTypeArgsAll(); + TypeArray pTypeParams = aggSrc.OwningAggregate.GetTypeVarsAll(); + TypeArray pSourceArgs = aggSrc.TypeArgsAll; + TypeArray pTargetArgs = pTarget.TypeArgsAll; Debug.Assert(pTypeParams.Count == pSourceArgs.Count); Debug.Assert(pTypeParams.Count == pTargetArgs.Count); @@ -261,19 +257,20 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (pParam.Covariant) { - if (!FExpRefConv(loader, pSourceArg, pTargetArg)) + if (!FExpRefConv(pSourceArg, pTargetArg)) { return false; } } else if (pParam.Contravariant) { - if (!pSourceArg.IsRefType() || !pTargetArg.IsRefType()) + if (!pSourceArg.IsReferenceType || !pTargetArg.IsReferenceType) { return false; } } } + return true; } @@ -322,10 +319,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics * The term wrapping denotes the process of packaging a value, of type T, in an instance of type T?. A value x of type T is wrapped to type T? by evaluating the expression new T?(x). ***************************************************************************************************/ - public static bool FWrappingConv(CType typeSrc, CType typeDst) - { - return typeDst is NullableType nubDst && typeSrc == nubDst.GetUnderlyingType(); - } + public static bool FWrappingConv(CType typeSrc, CType typeDst) => typeDst is NullableType nubDst && typeSrc == nubDst.UnderlyingType; /*************************************************************************************************** Determines whether there is a unwrapping conversion from typeSrc to typeDst diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Declarations/AggregateDeclaration.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Declarations/AggregateDeclaration.cs deleted file mode 100644 index 8dbc7213c6..0000000000 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Declarations/AggregateDeclaration.cs +++ /dev/null @@ -1,37 +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.Reflection; - -namespace Microsoft.CSharp.RuntimeBinder.Semantics -{ - // ---------------------------------------------------------------------------- - // - // AggregateDeclaration - // - // AggregateDeclaration - represents a declaration of an aggregate type. With partial classes, - // an aggregate type might be declared in multiple places. This symbol represents - // on of the declarations. - // - // parent is the containing Declaration. - // ---------------------------------------------------------------------------- - - // Either a ClassNode or a DelegateNode - internal sealed class AggregateDeclaration : ParentSymbol - { - public NamespaceOrAggregateSymbol bag; - - public AggregateDeclaration declNext; - - public AggregateSymbol Agg() - { - return bag as AggregateSymbol; - } - - public Assembly GetAssembly() - { - return Agg().AssociatedAssembly; - } - } -} diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/EXPRExtensions.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/EXPRExtensions.cs index d22c42d33d..5cc75809b2 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/EXPRExtensions.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/EXPRExtensions.cs @@ -10,20 +10,21 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { internal static class EXPRExtensions { - public static Expr Map(this Expr expr, ExprFactory factory, Func f) + public static Expr Map(this Expr expr, Func f) { Debug.Assert(f != null); - Debug.Assert(factory != null); if (expr == null) - return f(expr); + { + return f(null); + } Expr result = null; Expr tail = null; foreach (Expr item in expr.ToEnumerable()) { Expr mappedItem = f(item); - factory.AppendItemToList(mappedItem, ref result, ref tail); + ExprFactory.AppendItemToList(mappedItem, ref result, ref tail); } return result; } @@ -61,7 +62,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } public static bool isNull(this Expr expr) - => expr is ExprConstant constant && expr.Type.fundType() == FUNDTYPE.FT_REF && constant.Val.IsNullRef; + => expr is ExprConstant constant && expr.Type.FundamentalType == FUNDTYPE.FT_REF && constant.Val.IsNullRef; public static bool IsZero(this Expr expr) => expr is ExprConstant constant && constant.IsZero; diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExplicitConversion.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExplicitConversion.cs index 53ab82cefb..a4f419bf68 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExplicitConversion.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExplicitConversion.cs @@ -7,7 +7,7 @@ using Microsoft.CSharp.RuntimeBinder.Syntax; namespace Microsoft.CSharp.RuntimeBinder.Semantics { - internal sealed partial class ExpressionBinder + internal readonly partial struct ExpressionBinder { // ---------------------------------------------------------------------------- // BindExplicitConversion @@ -127,10 +127,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // But it failed, and so we know that the constant is not in range - switch (_typeDest.GetTypeKind()) + switch (_typeDest.TypeKind) { default: - Debug.Fail($"Bad type kind: {_typeDest.GetTypeKind()}"); + Debug.Fail($"Bad type kind: {_typeDest.TypeKind}"); return false; case TypeKind.TK_VoidType: @@ -189,14 +189,14 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // If S and T are value types and there is a builtin conversion from S => T then there is an // explicit conversion from S? => T that throws on null. - if (_typeDest.IsValType() && _binder.BindExplicitConversion(null, _typeSrc.StripNubs(), _typeDest, _flags | CONVERTTYPE.NOUDC)) + if (_typeDest.IsValueType && _binder.BindExplicitConversion(null, _typeSrc.StripNubs(), _typeDest, _flags | CONVERTTYPE.NOUDC)) { if (_needsExprDest) { Expr valueSrc = _exprSrc; if (valueSrc.Type is NullableType) { - valueSrc = _binder.BindNubValue(valueSrc); + valueSrc = BindNubValue(valueSrc); } Debug.Assert(valueSrc.Type == _typeSrc.StripNubs()); @@ -233,26 +233,26 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Debug.Assert(_typeDest != null); if (!(_typeSrc is ArrayType arrSrc) || !arrSrc.IsSZArray || !(_typeDest is AggregateType aggDest) - || !aggDest.isInterfaceType() || aggDest.GetTypeArgsAll().Count != 1) + || !aggDest.IsInterfaceType || aggDest.TypeArgsAll.Count != 1) { return false; } - AggregateSymbol aggIList = GetSymbolLoader().GetPredefAgg(PredefinedType.PT_G_ILIST); - AggregateSymbol aggIReadOnlyList = GetSymbolLoader().GetPredefAgg(PredefinedType.PT_G_IREADONLYLIST); + AggregateSymbol aggIList = SymbolLoader.GetPredefAgg(PredefinedType.PT_G_ILIST); + AggregateSymbol aggIReadOnlyList = SymbolLoader.GetPredefAgg(PredefinedType.PT_G_IREADONLYLIST); if ((aggIList == null || - !SymbolLoader.IsBaseAggregate(aggIList, aggDest.getAggregate())) && + !SymbolLoader.IsBaseAggregate(aggIList, aggDest.OwningAggregate)) && (aggIReadOnlyList == null || - !SymbolLoader.IsBaseAggregate(aggIReadOnlyList, aggDest.getAggregate()))) + !SymbolLoader.IsBaseAggregate(aggIReadOnlyList, aggDest.OwningAggregate))) { return false; } - CType typeArr = arrSrc.GetElementType(); - CType typeLst = aggDest.GetTypeArgsAll()[0]; + CType typeArr = arrSrc.ElementType; + CType typeLst = aggDest.TypeArgsAll[0]; - if (!CConversions.FExpRefConv(GetSymbolLoader(), typeArr, typeLst)) + if (!CConversions.FExpRefConv(typeArr, typeLst)) { return false; } @@ -273,28 +273,27 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // S[] to System.Collections.Generic.IList or System.Collections.Generic.IReadOnlyList. This is precisely when either S and T // are the same type or there is an implicit or explicit reference conversion from S to T. - if (!arrayDest.IsSZArray || !(_typeSrc is AggregateType aggSrc) || !aggSrc.isInterfaceType() || - aggSrc.GetTypeArgsAll().Count != 1) + if (!arrayDest.IsSZArray || !(_typeSrc is AggregateType aggSrc) || !aggSrc.IsInterfaceType || aggSrc.TypeArgsAll.Count != 1) { return false; } - AggregateSymbol aggIList = GetSymbolLoader().GetPredefAgg(PredefinedType.PT_G_ILIST); - AggregateSymbol aggIReadOnlyList = GetSymbolLoader().GetPredefAgg(PredefinedType.PT_G_IREADONLYLIST); + AggregateSymbol aggIList = SymbolLoader.GetPredefAgg(PredefinedType.PT_G_ILIST); + AggregateSymbol aggIReadOnlyList = SymbolLoader.GetPredefAgg(PredefinedType.PT_G_IREADONLYLIST); if ((aggIList == null || - !SymbolLoader.IsBaseAggregate(aggIList, aggSrc.getAggregate())) && + !SymbolLoader.IsBaseAggregate(aggIList, aggSrc.OwningAggregate)) && (aggIReadOnlyList == null || - !SymbolLoader.IsBaseAggregate(aggIReadOnlyList, aggSrc.getAggregate()))) + !SymbolLoader.IsBaseAggregate(aggIReadOnlyList, aggSrc.OwningAggregate))) { return false; } - CType typeArr = arrayDest.GetElementType(); - CType typeLst = aggSrc.GetTypeArgsAll()[0]; + CType typeArr = arrayDest.ElementType; + CType typeLst = aggSrc.TypeArgsAll[0]; Debug.Assert(!(typeArr is MethodGroupType)); - if (typeArr != typeLst && !CConversions.FExpRefConv(GetSymbolLoader(), typeArr, typeLst)) + if (typeArr != typeLst && !CConversions.FExpRefConv(typeArr, typeLst)) { return false; } @@ -317,15 +316,18 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // // * An explicit reference conversion exists from SE to TE. - if (arraySrc.rank != arrayDest.rank || arraySrc.IsSZArray != arrayDest.IsSZArray) + if (arraySrc.Rank != arrayDest.Rank || arraySrc.IsSZArray != arrayDest.IsSZArray) { return false; // Ranks do not match. } - if (CConversions.FExpRefConv(GetSymbolLoader(), arraySrc.GetElementType(), arrayDest.GetElementType())) + if (CConversions.FExpRefConv(arraySrc.ElementType, arrayDest.ElementType)) { if (_needsExprDest) + { _binder.bindSimpleCast(_exprSrc, _typeDest, out _exprDest, EXPRFLAG.EXF_REFCHECK); + } + return true; } @@ -353,7 +355,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // // * From System.Array and the interfaces it implements, to any array-type. - if (_binder.canConvert(_binder.GetPredefindType(PredefinedType.PT_ARRAY), _typeSrc, CONVERTTYPE.NOUDC)) + if (_binder.canConvert(GetPredefindType(PredefinedType.PT_ARRAY), _typeSrc, CONVERTTYPE.NOUDC)) { if (_needsExprDest) _binder.bindSimpleCast(_exprSrc, _typeDest, out _exprDest, EXPRFLAG.EXF_REFCHECK); @@ -372,7 +374,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // * From any pointer-type to any other pointer-type. // * From sbyte, byte, short, ushort, int, uint, long, or ulong to any pointer-type. - if (_typeSrc is PointerType || _typeSrc.fundType() <= FUNDTYPE.FT_LASTINTEGRAL && _typeSrc.isNumericType()) + if (_typeSrc is PointerType || _typeSrc.FundamentalType <= FUNDTYPE.FT_LASTINTEGRAL && _typeSrc.IsNumericType) { if (_needsExprDest) _binder.bindSimpleCast(_exprSrc, _typeDest, out _exprDest); @@ -402,19 +404,19 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Debug.Assert(_typeSrc != null); Debug.Assert(aggTypeDest != null); - if (!_typeSrc.isEnumType()) + if (!_typeSrc.IsEnumType) { return AggCastResult.Failure; } - AggregateSymbol aggDest = aggTypeDest.getAggregate(); + AggregateSymbol aggDest = aggTypeDest.OwningAggregate; if (aggDest.isPredefAgg(PredefinedType.PT_DECIMAL)) { return bindExplicitConversionFromEnumToDecimal(aggTypeDest); } - if (!aggDest.getThisType().isNumericType() && + if (!aggDest.getThisType().IsNumericType && !aggDest.IsEnum() && !(aggDest.IsPredefined() && aggDest.GetPredefType() == PredefinedType.PT_CHAR)) { @@ -442,7 +444,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics private AggCastResult bindExplicitConversionFromDecimalToEnum(AggregateType aggTypeDest) { Debug.Assert(_typeSrc != null); - Debug.Assert(_typeSrc.isPredefType(PredefinedType.PT_DECIMAL)); + Debug.Assert(_typeSrc.IsPredefType(PredefinedType.PT_DECIMAL)); + Debug.Assert(aggTypeDest.IsEnumType); // There is an explicit conversion from decimal to all integral types. if (_exprSrc.GetConst() != null) @@ -467,7 +470,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // According the language, this is a standard conversion, but it is implemented // through a user-defined conversion. Because it's a standard conversion, we don't // test the CONVERTTYPE.NOUDC flag here. - CType underlyingType = aggTypeDest.underlyingType(); + CType underlyingType = aggTypeDest.UnderlyingEnumType; bIsConversionOK = _binder.bindUserDefinedConversion(_exprSrc, _typeSrc, underlyingType, _needsExprDest, out _exprDest, false); if (bIsConversionOK) @@ -483,9 +486,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { Debug.Assert(_typeSrc != null); Debug.Assert(aggTypeDest != null); - Debug.Assert(aggTypeDest.isPredefType(PredefinedType.PT_DECIMAL)); + Debug.Assert(aggTypeDest.IsPredefType(PredefinedType.PT_DECIMAL)); + Debug.Assert(_typeSrc.IsEnumType); - AggregateType underlyingType = _typeSrc.underlyingType() as AggregateType; + AggregateType underlyingType = _typeSrc.UnderlyingEnumType; // Need to first cast the source expr to its underlying type. @@ -536,18 +540,18 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Debug.Assert(_typeSrc != null); Debug.Assert(aggTypeDest != null); - AggregateSymbol aggDest = aggTypeDest.getAggregate(); + AggregateSymbol aggDest = aggTypeDest.OwningAggregate; if (!aggDest.IsEnum()) { return AggCastResult.Failure; } - if (_typeSrc.isPredefType(PredefinedType.PT_DECIMAL)) + if (_typeSrc.IsPredefType(PredefinedType.PT_DECIMAL)) { return bindExplicitConversionFromDecimalToEnum(aggTypeDest); } - if (_typeSrc.isNumericType() || (_typeSrc.isPredefined() && _typeSrc.getPredefType() == PredefinedType.PT_CHAR)) + if (_typeSrc.IsNumericType || _typeSrc.IsPredefined && _typeSrc.PredefinedType == PredefinedType.PT_CHAR) { // Transform constant to constant. if (_exprSrc.GetConst() != null) @@ -566,8 +570,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics _binder.bindSimpleCast(_exprSrc, _typeDest, out _exprDest); return AggCastResult.Success; } - else if (_typeSrc.isPredefined() && - (_typeSrc.isPredefType(PredefinedType.PT_OBJECT) || _typeSrc.isPredefType(PredefinedType.PT_VALUE) || _typeSrc.isPredefType(PredefinedType.PT_ENUM))) + else if (_typeSrc.IsPredefined && + (_typeSrc.IsPredefType(PredefinedType.PT_OBJECT) || _typeSrc.IsPredefType(PredefinedType.PT_VALUE) || _typeSrc.IsPredefType(PredefinedType.PT_ENUM))) { if (_needsExprDest) _binder.bindSimpleCast(_exprSrc, _typeDest, out _exprDest, EXPRFLAG.EXF_UNBOX); @@ -587,16 +591,16 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Debug.Assert(_typeSrc != null); Debug.Assert(aggTypeDest != null); - if (!_typeSrc.isSimpleType() || !aggTypeDest.isSimpleType()) + if (!_typeSrc.IsSimpleType || !aggTypeDest.IsSimpleType) { return AggCastResult.Failure; } - AggregateSymbol aggDest = aggTypeDest.getAggregate(); + AggregateSymbol aggDest = aggTypeDest.OwningAggregate; - Debug.Assert(_typeSrc.isPredefined() && aggDest.IsPredefined()); + Debug.Assert(_typeSrc.IsPredefined && aggDest.IsPredefined()); - PredefinedType ptSrc = _typeSrc.getPredefType(); + PredefinedType ptSrc = _typeSrc.PredefinedType; PredefinedType ptDest = aggDest.GetPredefType(); Debug.Assert((int)ptSrc < NUM_SIMPLE_TYPES && (int)ptDest < NUM_SIMPLE_TYPES); @@ -666,29 +670,27 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return AggCastResult.Failure; } - AggregateSymbol aggSrc = atSrc.getAggregate(); - AggregateSymbol aggDest = aggTypeDest.getAggregate(); + AggregateSymbol aggSrc = atSrc.OwningAggregate; + AggregateSymbol aggDest = aggTypeDest.OwningAggregate; - if (GetSymbolLoader().HasBaseConversion(aggTypeDest, atSrc)) + if (SymbolLoader.HasBaseConversion(aggTypeDest, atSrc)) { if (_needsExprDest) { - if (aggDest.IsValueType() && aggSrc.getThisType().fundType() == FUNDTYPE.FT_REF) - { - _binder.bindSimpleCast(_exprSrc, _typeDest, out _exprDest, EXPRFLAG.EXF_UNBOX); - } - else - { - _binder.bindSimpleCast(_exprSrc, _typeDest, out _exprDest, EXPRFLAG.EXF_REFCHECK | (_exprSrc?.Flags & EXPRFLAG.EXF_CANTBENULL ?? 0)); - } + _binder.bindSimpleCast( + _exprSrc, _typeDest, out _exprDest, + aggDest.IsValueType() && aggSrc.getThisType().FundamentalType == FUNDTYPE.FT_REF + ? EXPRFLAG.EXF_UNBOX + : EXPRFLAG.EXF_REFCHECK | (_exprSrc?.Flags & EXPRFLAG.EXF_CANTBENULL ?? 0)); } + return AggCastResult.Success; } if ((aggSrc.IsClass() && !aggSrc.IsSealed() && aggDest.IsInterface()) || (aggSrc.IsInterface() && aggDest.IsClass() && !aggDest.IsSealed()) || (aggSrc.IsInterface() && aggDest.IsInterface()) || - CConversions.HasGenericDelegateExplicitReferenceConversion(GetSymbolLoader(), _typeSrc, aggTypeDest)) + CConversions.HasGenericDelegateExplicitReferenceConversion(_typeSrc, aggTypeDest)) { if (_needsExprDest) _binder.bindSimpleCast(_exprSrc, _typeDest, out _exprDest, EXPRFLAG.EXF_REFCHECK | (_exprSrc?.Flags & EXPRFLAG.EXF_CANTBENULL ?? 0)); @@ -705,7 +707,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // // * From any pointer-type to sbyte, byte, short, ushort, int, uint, long, or ulong. - if (!(_typeSrc is PointerType) || aggTypeDest.fundType() > FUNDTYPE.FT_LASTINTEGRAL || !aggTypeDest.isNumericType()) + if (!(_typeSrc is PointerType) || aggTypeDest.FundamentalType > FUNDTYPE.FT_LASTINTEGRAL || !aggTypeDest.IsNumericType) { return AggCastResult.Failure; } @@ -758,16 +760,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return AggCastResult.Failure; } - - private SymbolLoader GetSymbolLoader() - { - return _binder.GetSymbolLoader(); - } - - private ExprFactory GetExprFactory() - { - return _binder.GetExprFactory(); - } } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExprFactory.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExprFactory.cs index 846de0e004..83465b882a 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExprFactory.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExprFactory.cs @@ -8,90 +8,72 @@ using Microsoft.CSharp.RuntimeBinder.Syntax; namespace Microsoft.CSharp.RuntimeBinder.Semantics { - internal sealed class ExprFactory + internal static class ExprFactory { - private readonly GlobalSymbolContext _globalSymbolContext; - - public ExprFactory(GlobalSymbolContext globalSymbolContext) - { - Debug.Assert(globalSymbolContext != null); - _globalSymbolContext = globalSymbolContext; - } - private TypeManager Types => _globalSymbolContext.GetTypes(); - - private BSYMMGR GlobalSymbols => _globalSymbolContext.GetGlobalSymbols(); - - public ExprCall CreateCall(EXPRFLAG flags, CType type, Expr arguments, ExprMemberGroup memberGroup, MethWithInst method) => + public static ExprCall CreateCall(EXPRFLAG flags, CType type, Expr arguments, ExprMemberGroup memberGroup, MethWithInst method) => new ExprCall(type, flags, arguments, memberGroup, method); - public ExprField CreateField(CType type, Expr optionalObject, FieldWithType field, bool isLValue) => - new ExprField(type, optionalObject, field, isLValue); + public static ExprField CreateField(CType type, Expr optionalObject, FieldWithType field) => + new ExprField(type, optionalObject, field); - public ExprArrayInit CreateArrayInit(CType type, Expr arguments, Expr argumentDimensions, int[] dimSizes, int dimSize) => + public static ExprArrayInit CreateArrayInit(CType type, Expr arguments, Expr argumentDimensions, int[] dimSizes, int dimSize) => new ExprArrayInit(type, arguments, argumentDimensions, dimSizes, dimSize); - public ExprProperty CreateProperty(CType type, Expr optionalObjectThrough, Expr arguments, ExprMemberGroup memberGroup, PropWithType property, MethWithType setMethod) => + public static ExprProperty CreateProperty(CType type, Expr optionalObjectThrough, Expr arguments, ExprMemberGroup memberGroup, PropWithType property, MethWithType setMethod) => new ExprProperty(type, optionalObjectThrough, arguments, memberGroup, property, setMethod); - public ExprMemberGroup CreateMemGroup(EXPRFLAG flags, Name name, TypeArray typeArgs, SYMKIND symKind, CType parentType, MethodOrPropertySymbol memberSymbol, Expr obj, CMemberLookupResults memberLookupResults) => - new ExprMemberGroup(Types.GetMethGrpType(), flags, name, typeArgs, symKind, parentType, memberSymbol, obj, memberLookupResults); + public static ExprMemberGroup CreateMemGroup(EXPRFLAG flags, Name name, TypeArray typeArgs, SYMKIND symKind, CType parentType, Expr obj, CMemberLookupResults memberLookupResults) => + new ExprMemberGroup(flags, name, typeArgs, symKind, parentType, obj, memberLookupResults); - public ExprMemberGroup CreateMemGroup(Expr obj, MethPropWithInst method) + public static ExprMemberGroup CreateMemGroup(Expr obj, MethPropWithInst method) { Name name = method.Sym?.name; - MethodOrPropertySymbol methProp = method.MethProp(); - - CType type = method.GetType(); - return CreateMemGroup( - 0, name, method.TypeArgs, methProp?.getKind() ?? SYMKIND.SK_MethodSymbol, method.GetType(), methProp, - obj, new CMemberLookupResults(GlobalSymbols.AllocParams(1, new[] {type}), name)); + 0, name, method.TypeArgs, method.MethProp()?.getKind() ?? SYMKIND.SK_MethodSymbol, method.GetType(), + obj, new CMemberLookupResults(TypeArray.Allocate((CType)method.GetType()), name)); } - public ExprUserDefinedConversion CreateUserDefinedConversion(Expr arg, Expr call, MethWithInst method) => + public static ExprUserDefinedConversion CreateUserDefinedConversion(Expr arg, Expr call, MethWithInst method) => new ExprUserDefinedConversion(arg, call, method); - public ExprCast CreateCast(CType type, Expr argument) => CreateCast(0, type, argument); + public static ExprCast CreateCast(CType type, Expr argument) => CreateCast(0, type, argument); - public ExprCast CreateCast(EXPRFLAG flags, CType type, Expr argument) => new ExprCast(flags, type, argument); + public static ExprCast CreateCast(EXPRFLAG flags, CType type, Expr argument) => new ExprCast(flags, type, argument); - public ExprLocal CreateLocal(LocalVariableSymbol local) => new ExprLocal(local); + public static ExprLocal CreateLocal(LocalVariableSymbol local) => new ExprLocal(local); - public ExprBoundLambda CreateAnonymousMethod(AggregateType delegateType, Scope argumentScope, Expr expression) => + public static ExprBoundLambda CreateAnonymousMethod(AggregateType delegateType, Scope argumentScope, Expr expression) => new ExprBoundLambda(delegateType, argumentScope, expression); - public ExprMethodInfo CreateMethodInfo(MethPropWithInst mwi) => + public static ExprMethodInfo CreateMethodInfo(MethPropWithInst mwi) => CreateMethodInfo(mwi.Meth(), mwi.GetType(), mwi.TypeArgs); - public ExprMethodInfo CreateMethodInfo(MethodSymbol method, AggregateType methodType, TypeArray methodParameters) - { - return new ExprMethodInfo( - Types.GetPredefAgg(method.IsConstructor() ? PredefinedType.PT_CONSTRUCTORINFO : PredefinedType.PT_METHODINFO).getThisType(), + public static ExprMethodInfo CreateMethodInfo(MethodSymbol method, AggregateType methodType, TypeArray methodParameters) => + new ExprMethodInfo( + TypeManager.GetPredefAgg(method.IsConstructor() ? PredefinedType.PT_CONSTRUCTORINFO : PredefinedType.PT_METHODINFO).getThisType(), method, methodType, methodParameters); - } - public ExprPropertyInfo CreatePropertyInfo(PropertySymbol prop, AggregateType propertyType) => - new ExprPropertyInfo(Types.GetPredefAgg(PredefinedType.PT_PROPERTYINFO).getThisType(), prop, propertyType); + public static ExprPropertyInfo CreatePropertyInfo(PropertySymbol prop, AggregateType propertyType) => + new ExprPropertyInfo(TypeManager.GetPredefAgg(PredefinedType.PT_PROPERTYINFO).getThisType(), prop, propertyType); - public ExprFieldInfo CreateFieldInfo(FieldSymbol field, AggregateType fieldType) => - new ExprFieldInfo(field, fieldType, Types.GetPredefAgg(PredefinedType.PT_FIELDINFO).getThisType()); + public static ExprFieldInfo CreateFieldInfo(FieldSymbol field, AggregateType fieldType) => + new ExprFieldInfo(field, fieldType, TypeManager.GetPredefAgg(PredefinedType.PT_FIELDINFO).getThisType()); - public ExprTypeOf CreateTypeOf(CType sourceType) => - new ExprTypeOf(Types.GetPredefAgg(PredefinedType.PT_TYPE).getThisType(), sourceType); + public static ExprTypeOf CreateTypeOf(CType sourceType) => + new ExprTypeOf(TypeManager.GetPredefAgg(PredefinedType.PT_TYPE).getThisType(), sourceType); - - public ExprUserLogicalOp CreateUserLogOp(CType type, Expr trueFalseCall, ExprCall operatorCall) => + public static ExprUserLogicalOp CreateUserLogOp(CType type, Expr trueFalseCall, ExprCall operatorCall) => new ExprUserLogicalOp(type, trueFalseCall, operatorCall); - public ExprConcat CreateConcat(Expr first, Expr second) => new ExprConcat(first, second); + public static ExprConcat CreateConcat(Expr first, Expr second) => new ExprConcat(first, second); - public ExprConstant CreateStringConstant(string str) => - CreateConstant(Types.GetPredefAgg(PredefinedType.PT_STRING).getThisType(), ConstVal.Get(str)); + public static ExprConstant CreateStringConstant(string str) => + CreateConstant(TypeManager.GetPredefAgg(PredefinedType.PT_STRING).getThisType(), ConstVal.Get(str)); - public ExprMultiGet CreateMultiGet(EXPRFLAG flags, CType type, ExprMulti multi) => + public static ExprMultiGet CreateMultiGet(EXPRFLAG flags, CType type, ExprMulti multi) => new ExprMultiGet(type, flags, multi); - public ExprMulti CreateMulti(EXPRFLAG flags, CType type, Expr left, Expr op) => + public static ExprMulti CreateMulti(EXPRFLAG flags, CType type, Expr left, Expr op) => new ExprMulti(type, flags, left, op); //////////////////////////////////////////////////////////////////////////////// @@ -102,20 +84,20 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // // This returns a null for reference types and an EXPRZEROINIT for all others. - public Expr CreateZeroInit(CType type) + public static Expr CreateZeroInit(CType type) { Debug.Assert(type != null); - if (type.isEnumType()) + if (type.IsEnumType) { // For enum types, we create a constant that has the default value // as an object pointer. return CreateConstant(type, ConstVal.Get(Activator.CreateInstance(type.AssociatedSystemType))); } - Debug.Assert(type.fundType() > FUNDTYPE.FT_NONE); - Debug.Assert(type.fundType() < FUNDTYPE.FT_COUNT); - switch (type.fundType()) + Debug.Assert(type.FundamentalType > FUNDTYPE.FT_NONE); + Debug.Assert(type.FundamentalType < FUNDTYPE.FT_COUNT); + switch (type.FundamentalType) { case FUNDTYPE.FT_PTR: { @@ -124,7 +106,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } case FUNDTYPE.FT_STRUCT: - if (type.isPredefType(PredefinedType.PT_DECIMAL)) + if (type.IsPredefType(PredefinedType.PT_DECIMAL)) { goto default; } @@ -135,28 +117,28 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return new ExprZeroInit(type); default: - return CreateConstant(type, ConstVal.GetDefaultValue(type.constValKind())); + return CreateConstant(type, ConstVal.GetDefaultValue(type.ConstValKind)); } } - public ExprConstant CreateConstant(CType type, ConstVal constVal) => new ExprConstant(type, constVal); + public static ExprConstant CreateConstant(CType type, ConstVal constVal) => new ExprConstant(type, constVal); - public ExprConstant CreateIntegerConstant(int x) => - CreateConstant(Types.GetPredefAgg(PredefinedType.PT_INT).getThisType(), ConstVal.Get(x)); + public static ExprConstant CreateIntegerConstant(int x) => + CreateConstant(TypeManager.GetPredefAgg(PredefinedType.PT_INT).getThisType(), ConstVal.Get(x)); - public ExprConstant CreateBoolConstant(bool b) => - CreateConstant(Types.GetPredefAgg(PredefinedType.PT_BOOL).getThisType(), ConstVal.Get(b)); + public static ExprConstant CreateBoolConstant(bool b) => + CreateConstant(TypeManager.GetPredefAgg(PredefinedType.PT_BOOL).getThisType(), ConstVal.Get(b)); - public ExprArrayIndex CreateArrayIndex(CType type, Expr array, Expr index) => + public static ExprArrayIndex CreateArrayIndex(CType type, Expr array, Expr index) => new ExprArrayIndex(type, array, index); - public ExprBinOp CreateBinop(ExpressionKind exprKind, CType type, Expr left, Expr right) => + public static ExprBinOp CreateBinop(ExpressionKind exprKind, CType type, Expr left, Expr right) => new ExprBinOp(exprKind, type, left, right); - public ExprUnaryOp CreateUnaryOp(ExpressionKind exprKind, CType type, Expr operand) => + public static ExprUnaryOp CreateUnaryOp(ExpressionKind exprKind, CType type, Expr operand) => new ExprUnaryOp(exprKind, type, operand); - public ExprOperator CreateOperator(ExpressionKind exprKind, CType type, Expr arg1, Expr arg2) + public static ExprOperator CreateOperator(ExpressionKind exprKind, CType type, Expr arg1, Expr arg2) { Debug.Assert(arg1 != null); Debug.Assert(exprKind.IsUnaryOperator() == (arg2 == null)); @@ -165,15 +147,14 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics : CreateBinop(exprKind, type, arg1, arg2); } - - public ExprBinOp CreateUserDefinedBinop(ExpressionKind exprKind, CType type, Expr left, Expr right, Expr call, MethPropWithInst userMethod) => + public static ExprBinOp CreateUserDefinedBinop(ExpressionKind exprKind, CType type, Expr left, Expr right, Expr call, MethPropWithInst userMethod) => new ExprBinOp(exprKind, type, left, right, call, userMethod); // The call may be lifted, but we do not mark the outer binop as lifted. - public ExprUnaryOp CreateUserDefinedUnaryOperator(ExpressionKind exprKind, CType type, Expr operand, ExprCall call, MethPropWithInst userMethod) => + public static ExprUnaryOp CreateUserDefinedUnaryOperator(ExpressionKind exprKind, CType type, Expr operand, ExprCall call, MethPropWithInst userMethod) => new ExprUnaryOp(exprKind, type, operand, call, userMethod); - public ExprUnaryOp CreateNeg(EXPRFLAG flags, Expr operand) + public static ExprUnaryOp CreateNeg(EXPRFLAG flags, Expr operand) { Debug.Assert(operand != null); ExprUnaryOp unary = CreateUnaryOp(ExpressionKind.Negate, operand.Type, operand); @@ -184,22 +165,22 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics //////////////////////////////////////////////////////////////////////////////// // Create a node that evaluates the first, evaluates the second, results in the second. - public ExprBinOp CreateSequence(Expr first, Expr second) => + public static ExprBinOp CreateSequence(Expr first, Expr second) => CreateBinop(ExpressionKind.Sequence, second.Type, first, second); //////////////////////////////////////////////////////////////////////////////// // Create a node that evaluates the first, evaluates the second, results in the first. - public ExprAssignment CreateAssignment(Expr left, Expr right) => new ExprAssignment(left, right); + public static ExprAssignment CreateAssignment(Expr left, Expr right) => new ExprAssignment(left, right); //////////////////////////////////////////////////////////////////////////////// - public ExprNamedArgumentSpecification CreateNamedArgumentSpecification(Name name, Expr value) => + public static ExprNamedArgumentSpecification CreateNamedArgumentSpecification(Name name, Expr value) => new ExprNamedArgumentSpecification(name, value); - public ExprWrap CreateWrap(Expr expression) => new ExprWrap(expression); + public static ExprWrap CreateWrap(Expr expression) => new ExprWrap(expression); - public ExprBinOp CreateSave(ExprWrap wrap) + public static ExprBinOp CreateSave(ExprWrap wrap) { Debug.Assert(wrap != null); ExprBinOp expr = CreateBinop(ExpressionKind.Save, wrap.Type, wrap.OptionalExpression, wrap); @@ -207,13 +188,9 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return expr; } - public ExprConstant CreateNull() => CreateConstant(Types.GetNullType(), default(ConstVal)); + public static ExprConstant CreateNull() => CreateConstant(NullType.Instance, default); - public void AppendItemToList( - Expr newItem, - ref Expr first, - ref Expr last - ) + public static void AppendItemToList(Expr newItem, ref Expr first, ref Expr last) { if (newItem == null) { @@ -241,14 +218,14 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics last = list.OptionalNextListNode; } - public ExprList CreateList(Expr op1, Expr op2) => new ExprList(op1, op2); + public static ExprList CreateList(Expr op1, Expr op2) => new ExprList(op1, op2); - public ExprList CreateList(Expr op1, Expr op2, Expr op3) => CreateList(op1, CreateList(op2, op3)); + public static ExprList CreateList(Expr op1, Expr op2, Expr op3) => CreateList(op1, CreateList(op2, op3)); - public ExprList CreateList(Expr op1, Expr op2, Expr op3, Expr op4) => + public static ExprList CreateList(Expr op1, Expr op2, Expr op3, Expr op4) => CreateList(op1, CreateList(op2, CreateList(op3, op4))); - public ExprClass CreateClass(CType type) => new ExprClass(type); + public static ExprClass CreateClass(CType type) => new ExprClass(type); } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExpressionBinder.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExpressionBinder.cs index 00ca1e2c6b..79fe57db28 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExpressionBinder.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExpressionBinder.cs @@ -12,11 +12,18 @@ using Microsoft.CSharp.RuntimeBinder.Syntax; namespace Microsoft.CSharp.RuntimeBinder.Semantics { // Used by bindUserDefinedConversion - internal sealed class UdConvInfo + internal readonly struct UdConvInfo { - public MethWithType mwt; - public bool fSrcImplicit; - public bool fDstImplicit; + public readonly MethWithType Meth; + public readonly bool SrcImplicit; + public readonly bool DstImplicit; + + public UdConvInfo(MethWithType mwt, bool srcImplicit, bool dstImplicit) + { + Meth = mwt; + SrcImplicit = srcImplicit; + DstImplicit = dstImplicit; + } } ////////////////////////////////////////////////////////////////////////////////////////////// @@ -136,7 +143,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics None } - internal sealed partial class ExpressionBinder + internal readonly partial struct ExpressionBinder { // ExpressionBinder - General Rules // @@ -253,118 +260,23 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // Factory method sets the "Do Children have Errors?" bit - not done manually. // Once constructed Expression trees are not mutated - doesn't work easily for statements unfortunately. - private delegate Expr PfnBindBinOp(ExpressionKind ek, EXPRFLAG flags, Expr op1, Expr op2); - private delegate Expr PfnBindUnaOp(ExpressionKind ek, EXPRFLAG flags, Expr op); + private delegate Expr PfnBindBinOp(ExpressionBinder binder, ExpressionKind ek, EXPRFLAG flags, Expr op1, Expr op2); + private delegate Expr PfnBindUnaOp(ExpressionBinder binder, ExpressionKind ek, EXPRFLAG flags, Expr op); - private BindingContext Context; - public BindingContext GetContext() { return Context; } - private CNullable m_nullable; + public BindingContext Context { get; } public ExpressionBinder(BindingContext context) { Context = context; - m_nullable = new CNullable(GetSymbolLoader(), GetErrorContext(), GetExprFactory()); - g_binopSignatures = new BinOpSig[] - { - new BinOpSig (PredefinedType.PT_INT, PredefinedType.PT_INT, BinOpMask.Integer, 8, BindIntBinOp, OpSigFlags.Value, BinOpFuncKind.IntBinOp ), - new BinOpSig (PredefinedType.PT_UINT, PredefinedType.PT_UINT, BinOpMask.Integer, 7, BindIntBinOp, OpSigFlags.Value, BinOpFuncKind.IntBinOp ), - new BinOpSig (PredefinedType.PT_LONG, PredefinedType.PT_LONG, BinOpMask.Integer, 6, BindIntBinOp, OpSigFlags.Value, BinOpFuncKind.IntBinOp ), - new BinOpSig (PredefinedType.PT_ULONG, PredefinedType.PT_ULONG, BinOpMask.Integer, 5, BindIntBinOp, OpSigFlags.Value, BinOpFuncKind.IntBinOp ), - /* ERROR */ - new BinOpSig (PredefinedType.PT_ULONG, PredefinedType.PT_LONG, BinOpMask.Integer, 4, null, OpSigFlags.Value, BinOpFuncKind.None ), - /* ERROR */ - new BinOpSig (PredefinedType.PT_LONG, PredefinedType.PT_ULONG, BinOpMask.Integer, 3, null, OpSigFlags.Value, BinOpFuncKind.None ), - new BinOpSig (PredefinedType.PT_FLOAT, PredefinedType.PT_FLOAT, BinOpMask.Real, 1, BindRealBinOp, OpSigFlags.Value, BinOpFuncKind.RealBinOp ), - new BinOpSig (PredefinedType.PT_DOUBLE, PredefinedType.PT_DOUBLE, BinOpMask.Real, 0, BindRealBinOp, OpSigFlags.Value, BinOpFuncKind.RealBinOp ), - new BinOpSig (PredefinedType.PT_DECIMAL, PredefinedType.PT_DECIMAL, BinOpMask.Real, 0, BindDecBinOp, OpSigFlags.Value, BinOpFuncKind.DecBinOp ), - new BinOpSig (PredefinedType.PT_STRING, PredefinedType.PT_STRING, BinOpMask.Equal, 0, BindStrCmpOp, OpSigFlags.Reference, BinOpFuncKind.StrCmpOp ), - new BinOpSig (PredefinedType.PT_STRING, PredefinedType.PT_STRING, BinOpMask.Add, 2, BindStrBinOp, OpSigFlags.Reference, BinOpFuncKind.StrBinOp ), - new BinOpSig (PredefinedType.PT_STRING, PredefinedType.PT_OBJECT, BinOpMask.Add, 1, BindStrBinOp, OpSigFlags.Reference, BinOpFuncKind.StrBinOp ), - new BinOpSig (PredefinedType.PT_OBJECT, PredefinedType.PT_STRING, BinOpMask.Add, 0, BindStrBinOp, OpSigFlags.Reference, BinOpFuncKind.StrBinOp ), - new BinOpSig (PredefinedType.PT_INT, PredefinedType.PT_INT, BinOpMask.Shift, 3, BindShiftOp, OpSigFlags.Value, BinOpFuncKind.ShiftOp ), - new BinOpSig (PredefinedType.PT_UINT, PredefinedType.PT_INT, BinOpMask.Shift, 2, BindShiftOp, OpSigFlags.Value, BinOpFuncKind.ShiftOp ), - new BinOpSig (PredefinedType.PT_LONG, PredefinedType.PT_INT, BinOpMask.Shift, 1, BindShiftOp, OpSigFlags.Value, BinOpFuncKind.ShiftOp ), - new BinOpSig (PredefinedType.PT_ULONG, PredefinedType.PT_INT, BinOpMask.Shift, 0, BindShiftOp, OpSigFlags.Value, BinOpFuncKind.ShiftOp ), - new BinOpSig (PredefinedType.PT_BOOL, PredefinedType.PT_BOOL, BinOpMask.BoolNorm, 0, BindBoolBinOp, OpSigFlags.Value, BinOpFuncKind.BoolBinOp ), - // Make boolean logical operators liftable so that they don't give funny short circuiting semantics. - // This is for DDBugs 677075. - new BinOpSig (PredefinedType.PT_BOOL, PredefinedType.PT_BOOL, BinOpMask.Logical, 0, BindBoolBinOp, OpSigFlags.BoolBit, BinOpFuncKind.BoolBinOp ), - new BinOpSig (PredefinedType.PT_BOOL, PredefinedType.PT_BOOL, BinOpMask.Bitwise, 0, BindLiftedBoolBitwiseOp, OpSigFlags.BoolBit, BinOpFuncKind.BoolBitwiseOp ), - }; - g_rguos = new UnaOpSig[] - { - new UnaOpSig( PredefinedType.PT_INT, UnaOpMask.Signed, 7, BindIntUnaOp, UnaOpFuncKind.IntUnaOp ), - new UnaOpSig( PredefinedType.PT_UINT, UnaOpMask.Unsigned, 6, BindIntUnaOp, UnaOpFuncKind.IntUnaOp ), - new UnaOpSig( PredefinedType.PT_LONG, UnaOpMask.Signed, 5, BindIntUnaOp, UnaOpFuncKind.IntUnaOp ), - new UnaOpSig( PredefinedType.PT_ULONG, UnaOpMask.Unsigned, 4, BindIntUnaOp, UnaOpFuncKind.IntUnaOp ), - /* ERROR */ - new UnaOpSig( PredefinedType.PT_ULONG, UnaOpMask.Minus, 3, null, UnaOpFuncKind.None ), - new UnaOpSig( PredefinedType.PT_FLOAT, UnaOpMask.Real, 1, BindRealUnaOp, UnaOpFuncKind.RealUnaOp ), - new UnaOpSig( PredefinedType.PT_DOUBLE, UnaOpMask.Real, 0, BindRealUnaOp, UnaOpFuncKind.RealUnaOp ), - new UnaOpSig( PredefinedType.PT_DECIMAL, UnaOpMask.Real, 0, BindDecUnaOp, UnaOpFuncKind.DecUnaOp ), - new UnaOpSig( PredefinedType.PT_BOOL, UnaOpMask.Bool, 0, BindBoolUnaOp, UnaOpFuncKind.BoolUnaOp ), - new UnaOpSig( PredefinedType.PT_INT, UnaOpMask.IncDec, 6, null, UnaOpFuncKind.None ), - new UnaOpSig( PredefinedType.PT_UINT, UnaOpMask.IncDec, 5, null, UnaOpFuncKind.None ), - new UnaOpSig( PredefinedType.PT_LONG, UnaOpMask.IncDec, 4, null, UnaOpFuncKind.None ), - new UnaOpSig( PredefinedType.PT_ULONG, UnaOpMask.IncDec, 3, null, UnaOpFuncKind.None ), - new UnaOpSig( PredefinedType.PT_FLOAT, UnaOpMask.IncDec, 1, null, UnaOpFuncKind.None ), - new UnaOpSig( PredefinedType.PT_DOUBLE, UnaOpMask.IncDec, 0, null, UnaOpFuncKind.None ), - new UnaOpSig( PredefinedType.PT_DECIMAL, UnaOpMask.IncDec, 0, null, UnaOpFuncKind.None ), - }; } - private SymbolLoader GetSymbolLoader() { return SymbolLoader; } - - private SymbolLoader SymbolLoader - { - get - { - return Context.SymbolLoader; - } - } - - private CSemanticChecker SemanticChecker - { - get - { - return Context.SemanticChecker; - } - } - public CSemanticChecker GetSemanticChecker() { return SemanticChecker; } - - private ErrorHandling ErrorContext - { - get - { - return SymbolLoader.ErrorContext; - } - } - private ErrorHandling GetErrorContext() { return ErrorContext; } - - private BSYMMGR GetGlobalSymbols() - { - return GetSymbolLoader().getBSymmgr(); - } - - private TypeManager GetTypes() { return TypeManager; } - - private TypeManager TypeManager { get { return SymbolLoader.TypeManager; } } - - private ExprFactory GetExprFactory() { return ExprFactory; } - - private ExprFactory ExprFactory { get { return Context.ExprFactory; } } - - private AggregateType GetPredefindType(PredefinedType pt) + private static AggregateType GetPredefindType(PredefinedType pt) { Debug.Assert(pt != PredefinedType.PT_VOID); // use getVoidType() - return GetSymbolLoader().GetPredefindType(pt); + return SymbolLoader.GetPredefindType(pt); } - private CType VoidType { get { return GetSymbolLoader().GetTypeManager().GetVoid(); } } - - private CType getVoidType() { return VoidType; } - private Expr GenerateAssignmentConversion(Expr op1, Expr op2, bool allowExplicit) => allowExplicit ? mustCastCore(op2, op1.Type, 0) : mustConvertCore(op2, op1.Type); @@ -391,24 +303,25 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics ArrayType pArrayType = pOp1.Type as ArrayType; Debug.Assert(pArrayType != null); - CType elementType = pArrayType.GetElementType(); - checkUnsafe(elementType); // added to the binder so we don't bind to pointer ops + CType elementType = pArrayType.ElementType; + CheckUnsafe(elementType); // added to the binder so we don't bind to pointer ops // Check the rank of the array against the number of indices provided, and // convert the indexes to ints CType pDestType = ChooseArrayIndexType(pOp2); - Expr transformedIndices = pOp2.Map(GetExprFactory(), + ExpressionBinder binder = this; + Expr transformedIndices = pOp2.Map( x => { - Expr pTemp = mustConvert(x, pDestType); + Expr pTemp = binder.mustConvert(x, pDestType); return pDestType == pIntType ? pTemp - : GetExprFactory().CreateCast(EXPRFLAG.EXF_INDEXEXPR, pDestType, pTemp); + : ExprFactory.CreateCast(EXPRFLAG.EXF_INDEXEXPR, pDestType, pTemp); }); // Allocate a new expression, the type is the element type of the array. // Array index operations are always lvalues. - return GetExprFactory().CreateArrayIndex(elementType, pOp1, transformedIndices); + return ExprFactory.CreateArrayIndex(elementType, pOp1, transformedIndices); } //////////////////////////////////////////////////////////////////////////////// @@ -427,7 +340,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // Make the cast expr anyway, and if we find that we have a constant, then set the cast expr // as the original tree for the constant. Otherwise, return the cast expr. - ExprCast exprCast = GetExprFactory().CreateCast(exprFlags, typeDest, exprSrc); + ExprCast exprCast = ExprFactory.CreateCast(exprFlags, typeDest, exprSrc); if (Context.Checked) { exprCast.Flags |= EXPRFLAG.EXF_CHECKOVERFLOW; @@ -437,10 +350,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // original tree to the cast. if (exprConst is ExprConstant constant && exprFlags == 0 && - exprSrc.Type.fundType() == typeDest.fundType() && - (!exprSrc.Type.isPredefType(PredefinedType.PT_STRING) || constant.Val.IsNullRef)) + exprSrc.Type.FundamentalType == typeDest.FundamentalType && + (!exprSrc.Type.IsPredefType(PredefinedType.PT_STRING) || constant.Val.IsNullRef)) { - ExprConstant expr = GetExprFactory().CreateConstant(typeDest, constant.Val); + ExprConstant expr = ExprFactory.CreateConstant(typeDest, constant.Val); pexprDest = expr; return; } @@ -463,11 +376,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Debug.Assert(mwi.Sym is MethodSymbol && (!mwi.Meth().isOverride || mwi.Meth().isHideByName)); Debug.Assert(pMemGroup != null); - bool fConstrained; Expr pObject = pMemGroup.OptionalObject; CType callingObjectType = pObject?.Type; PostBindMethod(mwi); - pObject = AdjustMemberObject(mwi, pObject, out fConstrained); + pObject = AdjustMemberObject(mwi, pObject); pMemGroup.OptionalObject = pObject; CType pReturnType; @@ -477,10 +389,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } else { - pReturnType = GetTypes().SubstType(mwi.Meth().RetType, mwi.GetType(), mwi.TypeArgs); + pReturnType = TypeManager.SubstType(mwi.Meth().RetType, mwi.GetType(), mwi.TypeArgs); } - ExprCall pResult = GetExprFactory().CreateCall(0, pReturnType, pArguments, pMemGroup, mwi); + ExprCall pResult = ExprFactory.CreateCall(0, pReturnType, pArguments, pMemGroup, mwi); // Set the return type and flags for constructors. if ((flags & MemLookFlags.Ctor) != 0) @@ -491,18 +403,11 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } else { - Debug.Assert(pResult.Type == getVoidType()); + Debug.Assert(pResult.Type == VoidType.Instance); } } - if (fConstrained && pObject != null) - { - // Use the constrained prefix. - pResult.Flags |= EXPRFLAG.EXF_CONSTRAINED; - } - verifyMethodArgs(pResult, callingObjectType); - return pResult; } @@ -512,21 +417,24 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics internal Expr BindToField(Expr pOptionalObject, FieldWithType fwt, BindingFlag bindFlags) { - Debug.Assert(fwt.GetType() != null && fwt.Field().getClass() == fwt.GetType().getAggregate()); + Debug.Assert(fwt.GetType() != null && fwt.Field().getClass() == fwt.GetType().OwningAggregate); - CType pFieldType = GetTypes().SubstType(fwt.Field().GetType(), fwt.GetType()); - pOptionalObject = AdjustMemberObject(fwt, pOptionalObject, out _); + CType pFieldType = TypeManager.SubstType(fwt.Field().GetType(), fwt.GetType()); + pOptionalObject = AdjustMemberObject(fwt, pOptionalObject); - checkUnsafe(pFieldType); // added to the binder so we don't bind to pointer ops + CheckUnsafe(pFieldType); // added to the binder so we don't bind to pointer ops // lvalue if the object is an lvalue (or it's static) and the field is not readonly. - bool isLValue = objectIsLvalue(pOptionalObject) && !fwt.Field().isReadOnly; + // Since dynamic objects for fields come from locals or casts/conversions on locals + // (never properties) and hence always have EXF_LVALUE set, the first part of this is + // always true, leaving the rest to be determined by the field ctor + AssertObjectIsLvalue(pOptionalObject); AggregateType fieldType = null; // If this field is the backing field of a WindowsRuntime event then we need to bind to its // invocationlist property which is a delegate containing all the handlers. - if (fwt.Field().isEvent && fwt.Field().getEvent(GetSymbolLoader()) != null - && fwt.Field().getEvent(GetSymbolLoader()).IsWindowsRuntimeEvent) + if (fwt.Field().isEvent && fwt.Field().getEvent() != null + && fwt.Field().getEvent().IsWindowsRuntimeEvent) { fieldType = fwt.Field().GetType() as AggregateType; if (fieldType != null) @@ -534,12 +442,11 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // Access event backing field (EventRegistrationTokenTable) using // EventRegistrationTokenTable.GetOrCreateEventRegistrationTokenTable() // to ensure non-null - pFieldType = GetTypes().GetParameterModifier(pFieldType, false); + pFieldType = TypeManager.GetParameterModifier(pFieldType, false); } } - ExprField pResult = GetExprFactory() - .CreateField(pFieldType, pOptionalObject, fwt, isLValue); + ExprField pResult = ExprFactory.CreateField(pFieldType, pOptionalObject, fwt); Debug.Assert(BindingFlag.BIND_MEMBERSET == (BindingFlag)EXPRFLAG.EXF_MEMBERSET); pResult.Flags |= (EXPRFLAG)(bindFlags & BindingFlag.BIND_MEMBERSET); @@ -548,34 +455,29 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { Name getOrCreateMethodName = NameManager.GetPredefinedName(PredefinedName.PN_GETORCREATEEVENTREGISTRATIONTOKENTABLE); - GetSymbolLoader() - .RuntimeBinderSymbolTable.PopulateSymbolTableWithName( - getOrCreateMethodName.Text, null, fieldType.AssociatedSystemType); + SymbolTable.PopulateSymbolTableWithName( + getOrCreateMethodName.Text, null, fieldType.AssociatedSystemType); MethodSymbol getOrCreateMethod = - GetSymbolLoader() - .LookupAggMember(getOrCreateMethodName, fieldType.getAggregate(), symbmask_t.MASK_MethodSymbol) + SymbolLoader.LookupAggMember(getOrCreateMethodName, fieldType.OwningAggregate, symbmask_t.MASK_MethodSymbol) as MethodSymbol; MethPropWithInst getOrCreatempwi = new MethPropWithInst(getOrCreateMethod, fieldType); - ExprMemberGroup getOrCreateGrp = GetExprFactory().CreateMemGroup(null, getOrCreatempwi); + ExprMemberGroup getOrCreateGrp = ExprFactory.CreateMemGroup(null, getOrCreatempwi); Expr getOrCreateCall = BindToMethod( new MethWithInst(getOrCreatempwi), pResult, getOrCreateGrp, (MemLookFlags)MemLookFlags.None); - AggregateSymbol fieldTypeSymbol = fieldType.GetOwningAggregate(); + AggregateSymbol fieldTypeSymbol = fieldType.OwningAggregate; Name invocationListName = NameManager.GetPredefinedName(PredefinedName.PN_INVOCATIONLIST); // InvocationList might not be populated in the symbol table as no one would have called it. - GetSymbolLoader() - .RuntimeBinderSymbolTable.PopulateSymbolTableWithName( - invocationListName.Text, null, fieldType.AssociatedSystemType); + SymbolTable.PopulateSymbolTableWithName(invocationListName.Text, null, fieldType.AssociatedSystemType); PropertySymbol invocationList = - GetSymbolLoader() - .LookupAggMember(invocationListName, fieldTypeSymbol, symbmask_t.MASK_PropertySymbol) + SymbolLoader.LookupAggMember(invocationListName, fieldTypeSymbol, symbmask_t.MASK_PropertySymbol) as PropertySymbol; MethPropWithInst mpwi = new MethPropWithInst(invocationList, fieldType); - ExprMemberGroup memGroup = GetExprFactory().CreateMemGroup(getOrCreateCall, mpwi); + ExprMemberGroup memGroup = ExprFactory.CreateMemGroup(getOrCreateCall, mpwi); PropWithType pwt = new PropWithType(invocationList, fieldType); Expr propertyExpr = BindToProperty(getOrCreateCall, pwt, bindFlags, null, memGroup); @@ -591,38 +493,36 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { Debug.Assert(pwt.Sym is PropertySymbol && pwt.GetType() != null && - pwt.Prop().getClass() == pwt.GetType().getAggregate()); + pwt.Prop().getClass() == pwt.GetType().OwningAggregate); Debug.Assert(pwt.Prop().Params.Count == 0 || pwt.Prop() is IndexerSymbol); - bool fConstrained; - // We keep track of the type of the pObject which we're doing the call through so that we can report // protection access errors later, either below when binding the get, or later when checking that // the setter is actually an lvalue. Expr pObjectThrough = pObject; - PostBindProperty(pwt, pObject, out MethWithType mwtGet, out MethWithType mwtSet); + PostBindProperty(pwt, out MethWithType mwtGet, out MethWithType mwtSet); if (mwtGet && (!mwtSet || mwtSet.GetType() == mwtGet.GetType() || - GetSymbolLoader().HasBaseConversion(mwtGet.GetType(), mwtSet.GetType()) + SymbolLoader.HasBaseConversion(mwtGet.GetType(), mwtSet.GetType()) ) ) { - pObject = AdjustMemberObject(mwtGet, pObject, out fConstrained); + pObject = AdjustMemberObject(mwtGet, pObject); } else if (mwtSet) { - pObject = AdjustMemberObject(mwtSet, pObject, out fConstrained); + pObject = AdjustMemberObject(mwtSet, pObject); } else { - pObject = AdjustMemberObject(pwt, pObject, out fConstrained); + pObject = AdjustMemberObject(pwt, pObject); } pMemGroup.OptionalObject = pObject; - CType pReturnType = GetTypes().SubstType(pwt.Prop().RetType, pwt.GetType()); + CType pReturnType = TypeManager.SubstType(pwt.Prop().RetType, pwt.GetType()); // if we are doing a get on this thing, and there is no get, and // most importantly, we are not leaving the arguments to be bound by the array index @@ -631,7 +531,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { if (!mwtGet) { - throw ErrorContext.Error(ErrorCode.ERR_PropertyLacksGet, pwt); + throw ErrorHandling.Error(ErrorCode.ERR_PropertyLacksGet, pwt); } CType type = null; @@ -640,54 +540,45 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics type = pObjectThrough.Type; } - ACCESSERROR error = SemanticChecker.CheckAccess2(mwtGet.Meth(), mwtGet.GetType(), ContextForMemberLookup(), type); + ACCESSERROR error = CSemanticChecker.CheckAccess2(mwtGet.Meth(), mwtGet.GetType(), ContextForMemberLookup, type); if (error != ACCESSERROR.ACCESSERROR_NOERROR) { // if the get exists, but is not accessible, give an error. if (error == ACCESSERROR.ACCESSERROR_NOACCESSTHRU) { - throw ErrorContext.Error(ErrorCode.ERR_BadProtectedAccess, pwt, type, ContextForMemberLookup()); + throw ErrorHandling.Error(ErrorCode.ERR_BadProtectedAccess, pwt, type, ContextForMemberLookup); } - throw ErrorContext.Error(ErrorCode.ERR_InaccessibleGetter, pwt); + throw ErrorHandling.Error(ErrorCode.ERR_InaccessibleGetter, pwt); } } - ExprProperty result = GetExprFactory().CreateProperty(pReturnType, pObjectThrough, args, pMemGroup, pwt, mwtSet); - if (fConstrained && pObject != null) - { - // Use the constrained prefix. - result.Flags |= EXPRFLAG.EXF_CONSTRAINED; - } - + ExprProperty result = ExprFactory.CreateProperty(pReturnType, pObjectThrough, args, pMemGroup, pwt, mwtSet); if (result.OptionalArguments != null) { verifyMethodArgs(result, pObjectThrough?.Type); } - if (mwtSet && objectIsLvalue(result.MemberGroup.OptionalObject)) - { - result.Flags |= EXPRFLAG.EXF_LVALUE; - } + AssertObjectIsLvalue(result.MemberGroup.OptionalObject); return result; } internal Expr bindUDUnop(ExpressionKind ek, Expr arg) { - Name pName = ekName(ek); + Name pName = ExpressionKindName(ek); Debug.Assert(pName != null); CType typeSrc = arg.Type; LAgain: - switch (typeSrc.GetTypeKind()) + switch (typeSrc.TypeKind) { case TypeKind.TK_NullableType: typeSrc = typeSrc.StripNubs(); goto LAgain; case TypeKind.TK_AggregateType: - if (!typeSrc.isClassType() && !typeSrc.isStructType() || ((AggregateType)typeSrc).getAggregate().IsSkipUDOps()) + if (!typeSrc.IsClassType && !typeSrc.IsStructType || ((AggregateType)typeSrc).OwningAggregate.IsSkipUDOps()) return null; break; default: @@ -703,49 +594,58 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics MethodSymbol methCur = null; AggregateType atsCur = (AggregateType)typeSrc; - for (; ;) + for (;;) { // Find the next operator. - methCur = methCur == null - ? GetSymbolLoader().LookupAggMember(pName, atsCur.getAggregate(), symbmask_t.MASK_MethodSymbol) as MethodSymbol - : SymbolLoader.LookupNextSym(methCur, atsCur.getAggregate(), symbmask_t.MASK_MethodSymbol) as MethodSymbol; + methCur = (methCur == null + ? SymbolLoader.LookupAggMember(pName, atsCur.OwningAggregate, symbmask_t.MASK_MethodSymbol) + : methCur.LookupNext(symbmask_t.MASK_MethodSymbol)) as MethodSymbol; if (methCur == null) { // Find the next type. // If we've found some applicable methods in a class then we don't need to look any further. if (!methFirstList.IsEmpty()) + { break; - atsCur = atsCur.GetBaseClass(); + } + + atsCur = atsCur.BaseClass; if (atsCur == null) + { break; + } + continue; } // Only look at operators with 1 args. if (!methCur.isOperator || methCur.Params.Count != 1) + { continue; + } + Debug.Assert(methCur.typeVars.Count == 0); - TypeArray paramsCur = GetTypes().SubstTypeArray(methCur.Params, atsCur); + TypeArray paramsCur = TypeManager.SubstTypeArray(methCur.Params, atsCur); CType typeParam = paramsCur[0]; NullableType nubParam; if (canConvert(arg, typeParam)) { methFirstList.Add(new CandidateFunctionMember( - new MethPropWithInst(methCur, atsCur, BSYMMGR.EmptyTypeArray()), + new MethPropWithInst(methCur, atsCur, TypeArray.Empty), paramsCur, 0, false)); } - else if (typeParam.IsNonNubValType() && - GetTypes().SubstType(methCur.RetType, atsCur).IsNonNubValType() && - canConvert(arg, nubParam = GetTypes().GetNullable(typeParam))) + else if (typeParam.IsNonNullableValueType && + TypeManager.SubstType(methCur.RetType, atsCur).IsNonNullableValueType && + canConvert(arg, nubParam = TypeManager.GetNullable(typeParam))) { methFirstList.Add(new CandidateFunctionMember( - new MethPropWithInst(methCur, atsCur, BSYMMGR.EmptyTypeArray()), - GetGlobalSymbols().AllocParams(1, new CType[] { nubParam }), + new MethPropWithInst(methCur, atsCur, TypeArray.Empty), + TypeArray.Allocate(nubParam), 1, false)); } @@ -761,7 +661,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (pmethBest == null) { // No winner, so its an ambiguous call... - throw ErrorContext.Error(ErrorCode.ERR_AmbigCall, pmethAmbig1.mpwi, pmethAmbig2.mpwi); + throw ErrorHandling.Error(ErrorCode.ERR_AmbigCall, pmethAmbig1.mpwi, pmethAmbig2.mpwi); } ExprCall call; @@ -775,7 +675,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics call = BindUDUnopCall(arg, pmethBest.@params[0], pmethBest.mpwi); } - return GetExprFactory().CreateUserDefinedUnaryOperator(ek, call.Type, arg, call, pmethBest.mpwi); + return ExprFactory.CreateUserDefinedUnaryOperator(ek, call.Type, arg, call, pmethBest.mpwi); } private ExprCall BindLiftedUDUnop(Expr arg, CType typeArg, MethPropWithInst mpwi) @@ -788,18 +688,18 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } Debug.Assert(arg.Type is NullableType); - CType typeRet = GetTypes().SubstType(mpwi.Meth().RetType, mpwi.GetType()); + CType typeRet = TypeManager.SubstType(mpwi.Meth().RetType, mpwi.GetType()); if (!(typeRet is NullableType)) { - typeRet = GetTypes().GetNullable(typeRet); + typeRet = TypeManager.GetNullable(typeRet); } // First bind the non-lifted version for errors. Expr nonLiftedArg = mustCast(arg, typeRaw); ExprCall nonLiftedResult = BindUDUnopCall(nonLiftedArg, typeRaw, mpwi); - ExprMemberGroup pMemGroup = GetExprFactory().CreateMemGroup(null, mpwi); - ExprCall call = GetExprFactory().CreateCall(0, typeRet, arg, pMemGroup, null); + ExprMemberGroup pMemGroup = ExprFactory.CreateMemGroup(null, mpwi); + ExprCall call = ExprFactory.CreateCall(0, typeRet, arg, pMemGroup, null); call.MethWithInst = new MethWithInst(mpwi); call.CastOfNonLiftedResultToLiftedType = mustCast(nonLiftedResult, typeRet, 0); call.NullableCallLiftKind = NullableCallLiftKind.Operator; @@ -808,10 +708,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics private ExprCall BindUDUnopCall(Expr arg, CType typeArg, MethPropWithInst mpwi) { - CType typeRet = GetTypes().SubstType(mpwi.Meth().RetType, mpwi.GetType()); - checkUnsafe(typeRet); // added to the binder so we don't bind to pointer ops - ExprMemberGroup pMemGroup = GetExprFactory().CreateMemGroup(null, mpwi); - ExprCall call = GetExprFactory().CreateCall(0, typeRet, mustConvert(arg, typeArg), pMemGroup, null); + CType typeRet = TypeManager.SubstType(mpwi.Meth().RetType, mpwi.GetType()); + CheckUnsafe(typeRet); // added to the binder so we don't bind to pointer ops + ExprMemberGroup pMemGroup = ExprFactory.CreateMemGroup(null, mpwi); + ExprCall call = ExprFactory.CreateCall(0, typeRet, mustConvert(arg, typeArg), pMemGroup, null); call.MethWithInst = new MethWithInst(mpwi); verifyMethodArgs(call, mpwi.GetType()); return call; @@ -917,7 +817,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics //////////////////////////////////////////////////////////////////////////////// // Report a bad operator types error to the user. - private RuntimeBinderException BadOperatorTypesError(Expr pOperand1, Expr pOperand2) + private static RuntimeBinderException BadOperatorTypesError(Expr pOperand1, Expr pOperand2) { // This is a hack, but we need to store the operation somewhere... the first argument's as // good a place as any. @@ -929,10 +829,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (pOperand2 != null) { Debug.Assert(pOperand2.Type != null); - return ErrorContext.Error(ErrorCode.ERR_BadBinaryOps, strOp, pOperand1.Type, pOperand2.Type); + return ErrorHandling.Error(ErrorCode.ERR_BadBinaryOps, strOp, pOperand1.Type, pOperand2.Type); } - return ErrorContext.Error(ErrorCode.ERR_BadUnaryOp, strOp, pOperand1.Type); + return ErrorHandling.Error(ErrorCode.ERR_BadUnaryOp, strOp, pOperand1.Type); } private static ErrorCode GetStandardLvalueError(CheckLvalueKind kind) @@ -961,12 +861,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics private void CheckPropertyAccess(MethWithType mwt, PropWithType pwtSlot, CType type) { - switch (SemanticChecker.CheckAccess2(mwt.Meth(), mwt.GetType(), ContextForMemberLookup(), type)) + switch (CSemanticChecker.CheckAccess2(mwt.Meth(), mwt.GetType(), ContextForMemberLookup, type)) { case ACCESSERROR.ACCESSERROR_NOACCESSTHRU: - throw ErrorContext.Error(ErrorCode.ERR_BadProtectedAccess, pwtSlot, type, ContextForMemberLookup()); + throw ErrorHandling.Error(ErrorCode.ERR_BadProtectedAccess, pwtSlot, type, ContextForMemberLookup); case ACCESSERROR.ACCESSERROR_NOACCESS: - throw ErrorContext.Error(mwt.Meth().isSetAccessor() ? ErrorCode.ERR_InaccessibleSetter : ErrorCode.ERR_InaccessibleGetter, pwtSlot); + throw ErrorHandling.Error(mwt.Meth().isSetAccessor() ? ErrorCode.ERR_InaccessibleSetter : ErrorCode.ERR_InaccessibleGetter, pwtSlot); } } @@ -982,7 +882,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics CheckLvalueProp(prop); } - markFieldAssigned(expr); return; } @@ -993,94 +892,83 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { case ExpressionKind.Property: ExprProperty prop = (ExprProperty)expr; - if (!prop.MethWithTypeSet) - { - // Assigning to a property without a setter. - // If we have - // bool? b = true; (bool)b = false; - // then this is realized immediately as - // b.Value = false; - // and no ExpressionKind.EK_CAST is generated. We'd rather not give a "you're writing - // to a read-only property" error in the case where the property access - // is not explicit in the source code. Fortunately in this case the - // cast is still hanging around in the parse tree, so we can look for it. + Debug.Assert(!prop.MethWithTypeSet); + // Assigning to a property without a setter. + // If we have + // bool? b = true; (bool)b = false; + // then this is realized immediately as + // b.Value = false; + // and no ExpressionKind.EK_CAST is generated. We'd rather not give a "you're writing + // to a read-only property" error in the case where the property access + // is not explicit in the source code. Fortunately in this case the + // cast is still hanging around in the parse tree, so we can look for it. - // POSSIBLE ERROR: It would be nice to also give this error for other situations - // POSSIBLE ERROR: in which the user is attempting to assign to a value, such as - // POSSIBLE ERROR: an explicit (bool)b.Value = false; - // POSSIBLE ERROR: Unfortunately we cannot use this trick in that situation because - // POSSIBLE ERROR: we've already discarded the OperatorKind.OP_CAST node. (This is an SyntaxKind.Dot). + // POSSIBLE ERROR: It would be nice to also give this error for other situations + // POSSIBLE ERROR: in which the user is attempting to assign to a value, such as + // POSSIBLE ERROR: an explicit (bool)b.Value = false; + // POSSIBLE ERROR: Unfortunately we cannot use this trick in that situation because + // POSSIBLE ERROR: we've already discarded the OperatorKind.OP_CAST node. (This is an SyntaxKind.Dot). - // SPEC VIOLATION: More generally: - // SPEC VIOLATION: The spec states that the result of any cast is a value, not a - // SPEC VIOLATION: variable. Unfortunately we do not correctly implement this - // SPEC VIOLATION: and we probably should not start implementing it because this - // SPEC VIOLATION: would be a breaking change. We currently discard "no op" casts - // SPEC VIOLATION: very aggressively rather than generating an ExpressionKind.EK_CAST node. + // SPEC VIOLATION: More generally: + // SPEC VIOLATION: The spec states that the result of any cast is a value, not a + // SPEC VIOLATION: variable. Unfortunately we do not correctly implement this + // SPEC VIOLATION: and we probably should not start implementing it because this + // SPEC VIOLATION: would be a breaking change. We currently discard "no op" casts + // SPEC VIOLATION: very aggressively rather than generating an ExpressionKind.EK_CAST node. - throw ErrorContext.Error(ErrorCode.ERR_AssgReadonlyProp, prop.PropWithTypeSlot); - } - break; + throw ErrorHandling.Error(ErrorCode.ERR_AssgReadonlyProp, prop.PropWithTypeSlot); - case ExpressionKind.BoundLambda: - case ExpressionKind.Constant: - throw ErrorContext.Error(GetStandardLvalueError(kind)); + case ExpressionKind.Field: + ExprField field = (ExprField)expr; + Debug.Assert(field.FieldWithType.Field().isReadOnly); + throw ErrorHandling.Error( + field.FieldWithType.Field().isStatic + ? ErrorCode.ERR_AssgReadonlyStatic + : ErrorCode.ERR_AssgReadonly); + + default: + throw ErrorHandling.Error(GetStandardLvalueError(kind)); } - - TryReportLvalueFailure(expr, kind); } - private void PostBindMethod(MethWithInst pMWI) + private static void PostBindMethod(MethWithInst pMWI) { MethodSymbol meth = pMWI.Meth(); if (meth.RetType != null) { - checkUnsafe(meth.RetType); + CheckUnsafe(meth.RetType); // We need to check unsafe on the parameters as well, since we cannot check in conversion. foreach (CType type in meth.Params.Items) { - checkUnsafe(type); + CheckUnsafe(type); } } } - private void PostBindProperty(PropWithType pwt, Expr pObject, out MethWithType pmwtGet, out MethWithType pmwtSet) + private static void PostBindProperty(PropWithType pwt, out MethWithType pmwtGet, out MethWithType pmwtSet) { - pmwtGet = new MethWithType(); - pmwtSet = new MethWithType(); + PropertySymbol prop = pwt.Prop(); + Debug.Assert(prop != null); // Get the accessors. - if (pwt.Prop().GetterMethod != null) - { - pmwtGet.Set(pwt.Prop().GetterMethod, pwt.GetType()); - } - else - { - pmwtGet.Clear(); - } + pmwtGet = prop.GetterMethod != null + ? new MethWithType(prop.GetterMethod, pwt.GetType()) + : new MethWithType(); + pmwtSet = prop.SetterMethod != null + ? new MethWithType(prop.SetterMethod, pwt.GetType()) + : new MethWithType(); - if (pwt.Prop().SetterMethod != null) + if (prop.RetType != null) { - pmwtSet.Set(pwt.Prop().SetterMethod, pwt.GetType()); - } - else - { - pmwtSet.Clear(); - } - - if (pwt.Prop().RetType != null) - { - checkUnsafe(pwt.Prop().RetType); + CheckUnsafe(prop.RetType); } } - private Expr AdjustMemberObject(SymWithType swt, Expr pObject, out bool pfConstrained) + private Expr AdjustMemberObject(SymWithType swt, Expr pObject) { // Assert that the type is present and is an instantiation of the member's parent. - Debug.Assert(swt.GetType() != null && swt.GetType().getAggregate() == swt.Sym.parent as AggregateSymbol); + Debug.Assert(swt.GetType() != null && swt.GetType().OwningAggregate == swt.Sym.parent as AggregateSymbol); bool bIsMatchingStatic = IsMatchingStatic(swt, pObject); - pfConstrained = false; - bool isStatic = swt.Sym.isStatic; // If our static doesn't match, bail out of here. @@ -1096,10 +984,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return null; } - throw ErrorContext.Error(ErrorCode.ERR_ObjectProhibited, swt); + throw ErrorHandling.Error(ErrorCode.ERR_ObjectProhibited, swt); } - throw ErrorContext.Error(ErrorCode.ERR_ObjectRequired, swt); + throw ErrorHandling.Error(ErrorCode.ERR_ObjectRequired, swt); } // At this point, all errors for static invocations have been reported, and @@ -1131,44 +1019,17 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (typeObj is TypeParameterType || typeObj is AggregateType) { AggregateSymbol aggCalled = swt.Sym.parent as AggregateSymbol; - Debug.Assert(swt.GetType().getAggregate() == aggCalled); + Debug.Assert(swt.GetType().OwningAggregate == aggCalled); - // If we're invoking code on a struct-valued field, mark the struct as assigned (to - // avoid warning CS0649). - if (pObject is ExprField field && !field.FieldWithType.Field().isAssigned && !(swt.Sym is FieldSymbol) && - typeObj.isStructType() && !typeObj.isPredefined()) - { - field.FieldWithType.Field().isAssigned = true; - } - - if (pfConstrained && - (typeObj is TypeParameterType || - typeObj.isStructType() && swt.GetType().IsRefType() && swt.Sym.IsVirtual())) - { - // For calls on type parameters or virtual calls on struct types (not enums), - // use the constrained prefix. - pfConstrained = true; - } - - Expr objNew = tryConvert(pObject, swt.GetType(), CONVERTTYPE.NOUDC); - - // This check ensures that we do not bind to methods in an outer class - // which are visible, but whose this pointer is of an incorrect type... - // ... also handles case of calling an pObject method on a RefAny value. - // WE don't give a great message for this, but it'll do. - if (objNew == null) - { - throw ErrorContext.Error(ErrorCode.ERR_WrongNestedThis, swt.GetType(), pObject.Type); - } - - pObject = objNew; + pObject = tryConvert(pObject, swt.GetType(), CONVERTTYPE.NOUDC); + Debug.Assert(pObject != null); } return pObject; } ///////////////////////////////////////////////////////////////////////////////// - private bool IsMatchingStatic(SymWithType swt, Expr pObject) + private static bool IsMatchingStatic(SymWithType swt, Expr pObject) { Symbol pSym = swt.Sym; @@ -1205,16 +1066,16 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics //////////////////////////////////////////////////////////////////////////////// // this determines whether the expression as an pObject of a prop or field is an // lvalue - - private bool objectIsLvalue(Expr pObject) + [Conditional("DEBUG")] + private static void AssertObjectIsLvalue(Expr pObject) { - return ( + Debug.Assert ( pObject == null || // statics are always lvalues (((pObject.Flags & EXPRFLAG.EXF_LVALUE) != 0) && (pObject.Kind != ExpressionKind.Property)) || // things marked as lvalues have props/fields which are lvalues, with one exception: props of structs // do not have fields/structs as lvalues - !pObject.Type.isStructOrEnum() + !pObject.Type.IsStructOrEnum // non-struct types are lvalues (such as non-struct method returns) ); } @@ -1238,7 +1099,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics newArgs = null; Expr newArgsTail = null; - MethodOrPropertySymbol mostDerivedMethod = GroupToArgsBinder.FindMostDerivedMethod(GetSymbolLoader(), mp, callingObjectType); + MethodOrPropertySymbol mostDerivedMethod = GroupToArgsBinder.FindMostDerivedMethod(mp, callingObjectType); int paramCount = mp.Params.Count; TypeArray @params = mp.Params; @@ -1267,7 +1128,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { if (paramCount != 0) paramCount--; - GetExprFactory().AppendItemToList(indir, ref newArgs, ref newArgsTail); + ExprFactory.AppendItemToList(indir, ref newArgs, ref newArgsTail); } else if (paramCount != 0) { @@ -1294,7 +1155,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } Debug.Assert(index != mp.Params.Count); - CType substDestType = GetTypes().SubstType(@params[index], type, pTypeArgs); + CType substDestType = TypeManager.SubstType(@params[index], type, pTypeArgs); // If we cant convert the argument and we're the param array argument, then deal with it. if (!canConvert(named.Value, substDestType) && @@ -1308,10 +1169,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // void Foo(int y, params int[] x); // ... // Foo(x:1, y:1); - CType arrayType = (ArrayType)GetTypes().SubstType(mp.Params[mp.Params.Count - 1], type, pTypeArgs); + CType arrayType = (ArrayType)TypeManager.SubstType(mp.Params[mp.Params.Count - 1], type, pTypeArgs); // Use an EK_ARRINIT even in the empty case so empty param arrays in attributes work. - ExprArrayInit arrayInit = GetExprFactory().CreateArrayInit(arrayType, null, null, new[] { 0 }, 1); + ExprArrayInit arrayInit = ExprFactory.CreateArrayInit(arrayType, null, null, new[] { 0 }, 1); arrayInit.GeneratedForParamArray = true; arrayInit.OptionalArguments = named.Value; @@ -1327,7 +1188,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } else { - CType substDestType = GetTypes().SubstType(@params[iDst], type, pTypeArgs); + CType substDestType = TypeManager.SubstType(@params[iDst], type, pTypeArgs); rval = tryConvert(indir, substDestType); } @@ -1349,7 +1210,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } Debug.Assert(rval != null); indir = rval; - GetExprFactory().AppendItemToList(rval, ref newArgs, ref newArgsTail); + ExprFactory.AppendItemToList(rval, ref newArgs, ref newArgsTail); paramCount--; } // note that destype might not be valid if we are in varargs, but then we won't ever use it... @@ -1375,7 +1236,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } // we need to create an array and put it as the last arg... - CType substitutedArrayType = GetTypes().SubstType(mp.Params[mp.Params.Count - 1], type, pTypeArgs); + CType substitutedArrayType = TypeManager.SubstType(mp.Params[mp.Params.Count - 1], type, pTypeArgs); if (!(substitutedArrayType is ArrayType subArr) || !subArr.IsSZArray) { // Invalid type for params array parameter. Happens in LAF scenarios, e.g. @@ -1386,10 +1247,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return; } - CType elementType = subArr.GetElementType(); + CType elementType = subArr.ElementType; // Use an EK_ARRINIT even in the empty case so empty param arrays in attributes work. - ExprArrayInit exprArrayInit = GetExprFactory().CreateArrayInit(substitutedArrayType, null, null, new[] { 0 }, 1); + ExprArrayInit exprArrayInit = ExprFactory.CreateArrayInit(substitutedArrayType, null, null, new[] { 0 }, 1); exprArrayInit.GeneratedForParamArray = true; if (it.AtEnd()) @@ -1403,9 +1264,9 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } else { - argsPtr = GetExprFactory().CreateList(argsPtr, exprArrayInit); + argsPtr = ExprFactory.CreateList(argsPtr, exprArrayInit); } - GetExprFactory().AppendItemToList(exprArrayInit, ref newArgs, ref newArgsTail); + ExprFactory.AppendItemToList(exprArrayInit, ref newArgs, ref newArgsTail); } else { @@ -1427,31 +1288,13 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { expr = tryConvert(expr, elementType); } - GetExprFactory().AppendItemToList(expr, ref newList, ref newListTail); + ExprFactory.AppendItemToList(expr, ref newList, ref newListTail); } exprArrayInit.DimensionSize = count; exprArrayInit.DimensionSizes[0] = count; exprArrayInit.OptionalArguments = newList; - GetExprFactory().AppendItemToList(exprArrayInit, ref newArgs, ref newArgsTail); - } - } - - //////////////////////////////////////////////////////////////////////////////// - // Sets the isAssigned bit - - private void markFieldAssigned(Expr expr) - { - if (0 != (expr.Flags & EXPRFLAG.EXF_LVALUE) && expr is ExprField field) - { - FieldSymbol symbol; - do - { - symbol = field.FieldWithType.Field(); - symbol.isAssigned = true; - expr = field.OptionalObject; - } - while (symbol.getClass().IsStruct() && !symbol.isStatic && expr != null && (field = expr as ExprField) != null); + ExprFactory.AppendItemToList(exprArrayInit, ref newArgs, ref newArgsTail); } } @@ -1463,8 +1306,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics PredefinedType.PT_ULONG }; - - internal CType ChooseArrayIndexType(Expr args) { // first, select the allowable types @@ -1489,7 +1330,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return GetPredefindType(PredefinedType.PT_INT); } - internal void FillInArgInfoFromArgList(ArgInfos argInfo, Expr args) + internal static void FillInArgInfoFromArgList(ArgInfos argInfo, Expr args) { CType[] prgtype = new CType[argInfo.carg]; argInfo.prgexpr = new List(); @@ -1517,10 +1358,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } Debug.Assert(iarg <= argInfo.carg); - argInfo.types = GetGlobalSymbols().AllocParams(iarg, prgtype); + argInfo.types = TypeArray.Allocate(prgtype); } - private bool TryGetExpandedParams(TypeArray @params, int count, out TypeArray ppExpandedParams) + private static bool TryGetExpandedParams(TypeArray @params, int count, out TypeArray ppExpandedParams) { CType[] prgtype; if (count < @params.Count - 1) @@ -1530,7 +1371,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // case that all the parameters are optional. prgtype = new CType[@params.Count - 1]; @params.CopyItems(0, @params.Count - 1, prgtype); - ppExpandedParams = GetGlobalSymbols().AllocParams(@params.Count - 1, prgtype); + ppExpandedParams = TypeArray.Allocate(prgtype); return true; } @@ -1547,14 +1388,14 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } // At this point, we have an array sym. - CType elementType = arr.GetElementType(); + CType elementType = arr.ElementType; for (int itype = @params.Count - 1; itype < count; itype++) { prgtype[itype] = elementType; } - ppExpandedParams = GetGlobalSymbols().AllocParams(prgtype); + ppExpandedParams = TypeArray.Allocate(prgtype); return true; } @@ -1567,18 +1408,19 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return (!sym.isOverride || sym.isHideByName) && (!requireUC || sym.isUserCallable()); } - private bool isConvInTable(List convTable, MethodSymbol meth, AggregateType ats, bool fSrc, bool fDst) + private static bool IsConvInTable(List convTable, MethodSymbol meth, AggregateType ats, bool fSrc, bool fDst) { foreach (UdConvInfo conv in convTable) { - if (conv.mwt.Meth() == meth && - conv.mwt.GetType() == ats && - conv.fSrcImplicit == fSrc && - conv.fDstImplicit == fDst) + if (conv.Meth.Meth() == meth && + conv.Meth.GetType() == ats && + conv.SrcImplicit == fSrc && + conv.DstImplicit == fDst) { return true; } } + return false; } @@ -1592,8 +1434,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics private static bool isConstantInRange(ExprConstant exprSrc, CType typeDest, bool realsOk) { - FUNDTYPE ftSrc = exprSrc.Type.fundType(); - FUNDTYPE ftDest = typeDest.fundType(); + FUNDTYPE ftSrc = exprSrc.Type.FundamentalType; + FUNDTYPE ftDest = typeDest.FundamentalType; if (ftSrc > FUNDTYPE.FT_LASTINTEGRAL || ftDest > FUNDTYPE.FT_LASTINTEGRAL) { @@ -1780,35 +1622,25 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics PredefinedName.PN_OPRIGHTSHIFT, }; - private Name ekName(ExpressionKind ek) + private static Name ExpressionKindName(ExpressionKind ek) { Debug.Assert(ek >= ExpressionKind.FirstOp && (ek - ExpressionKind.FirstOp) < (int)s_EK2NAME.Length); return NameManager.GetPredefinedName(s_EK2NAME[ek - ExpressionKind.FirstOp]); } - private void checkUnsafe(CType type) + private static void CheckUnsafe(CType type) { - if (type == null || type.isUnsafe()) + if (type == null || type.IsUnsafe()) { - throw ErrorContext.Error(ErrorCode.ERR_UnsafeNeeded); + throw ErrorHandling.Error(ErrorCode.ERR_UnsafeNeeded); } } - //////////////////////////////////////////////////////////////////////////////// - private AggregateDeclaration ContextForMemberLookup() - { - return Context.ContextForMemberLookup; - } + private AggregateSymbol ContextForMemberLookup => Context.ContextForMemberLookup; - private ExprWrap WrapShortLivedExpression(Expr expr) - { - return GetExprFactory().CreateWrap(expr); - } + private static ExprWrap WrapShortLivedExpression(Expr expr) => ExprFactory.CreateWrap(expr); - private ExprAssignment GenerateOptimizedAssignment(Expr op1, Expr op2) - { - return GetExprFactory().CreateAssignment(op1, op2); - } + private static ExprAssignment GenerateOptimizedAssignment(Expr op1, Expr op2) => ExprFactory.CreateAssignment(op1, op2); internal static int CountArguments(Expr args) { diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GlobalSymbolContext.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GlobalSymbolContext.cs deleted file mode 100644 index 5648093d61..0000000000 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GlobalSymbolContext.cs +++ /dev/null @@ -1,36 +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 Microsoft.CSharp.RuntimeBinder.Syntax; - -namespace Microsoft.CSharp.RuntimeBinder.Semantics -{ - /***************************************************************************** - A GlobalSymbolContext represents the global symbol tables for a compilation. - This includes symbols, types, declarations. - *****************************************************************************/ - - internal sealed class GlobalSymbolContext - { - private readonly PredefinedTypes _predefTypes; - - public GlobalSymbolContext() - { - GlobalSymbols = new BSYMMGR(); - _predefTypes = new PredefinedTypes(GlobalSymbols); - TypeManager = new TypeManager(GlobalSymbols, _predefTypes); - } - - public TypeManager TypeManager { get; } - public TypeManager GetTypes() { return TypeManager; } - private BSYMMGR GlobalSymbols { get; } - public BSYMMGR GetGlobalSymbols() { return GlobalSymbols; } - public PredefinedTypes GetPredefTypes() { return _predefTypes; } - - public SymFactory GetGlobalSymbolFactory() - { - return GetGlobalSymbols().GetSymFactory(); - } - } -} diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GroupToArgsBinder.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GroupToArgsBinder.cs index ca14129b71..aa9ccbd587 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GroupToArgsBinder.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GroupToArgsBinder.cs @@ -16,7 +16,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // to the best applicable method in the group. // ---------------------------------------------------------------------------- - internal sealed partial class ExpressionBinder + internal readonly partial struct ExpressionBinder { internal sealed class GroupToArgsBinder { @@ -60,7 +60,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics public GroupToArgsBinder(ExpressionBinder exprBinder, BindingFlag bindFlags, ExprMemberGroup grp, ArgInfos args, ArgInfos originalArgs, NamedArgumentsKind namedArgumentsKind) { Debug.Assert(grp != null); - Debug.Assert(exprBinder != null); Debug.Assert(args != null); _pExprBinder = exprBinder; @@ -100,28 +99,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } } - public GroupToArgsBinderResult GetResultsOfBind() - { - return _results; - } + public GroupToArgsBinderResult GetResultsOfBind() => _results; - private SymbolLoader GetSymbolLoader() - { - return _pExprBinder.GetSymbolLoader(); - } - private CSemanticChecker GetSemanticChecker() - { - return _pExprBinder.GetSemanticChecker(); - } - private ErrorHandling GetErrorContext() - { - return _pExprBinder.GetErrorContext(); - } private static CType GetTypeQualifier(ExprMemberGroup pGroup) { Debug.Assert(pGroup != null); - return (pGroup.Flags & EXPRFLAG.EXF_CTOR) != 0 ? pGroup.ParentType : pGroup.OptionalObject?.Type; } @@ -137,7 +120,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // iterator will only return propsyms (or methsyms, or whatever) symbmask_t mask = (symbmask_t)(1 << (int)_pGroup.SymKind); - CMemberLookupResults.CMethodIterator iterator = _pGroup.MemberLookupResults.GetMethodIterator(GetSemanticChecker(), GetSymbolLoader(), GetTypeQualifier(_pGroup), _pExprBinder.ContextForMemberLookup(), _pGroup.TypeArgs.Count, _pGroup.Flags, mask, _namedArgumentsKind == NamedArgumentsKind.NonTrailing ? _pOriginalArguments : null); + CMemberLookupResults.CMethodIterator iterator = _pGroup.MemberLookupResults.GetMethodIterator(GetTypeQualifier(_pGroup), _pExprBinder.ContextForMemberLookup, _pGroup.TypeArgs.Count, _pGroup.Flags, mask, _namedArgumentsKind == NamedArgumentsKind.NonTrailing ? _pOriginalArguments : null); while (true) { bool bFoundExpanded; @@ -283,19 +266,16 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // When we find a method, we check if the type has interfaces. If so, mark the other interfaces // as hidden, and object as well. - if (_pCurrentType.isInterfaceType()) + if (_pCurrentType.IsInterfaceType) { - TypeArray ifaces = _pCurrentType.GetIfacesAll(); - for (int i = 0; i < ifaces.Count; i++) + foreach (AggregateType type in _pCurrentType.IfacesAll.Items) { - AggregateType type = ifaces[i] as AggregateType; - - Debug.Assert(type.isInterfaceType()); + Debug.Assert(type.IsInterfaceType); _HiddenTypes.Add(type); } // Mark object. - AggregateType typeObject = GetSymbolLoader().GetPredefindType(PredefinedType.PT_OBJECT); + AggregateType typeObject = SymbolLoader.GetPredefindType(PredefinedType.PT_OBJECT); _HiddenTypes.Add(typeObject); } } @@ -314,7 +294,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } } - private void CopyArgInfos(ArgInfos src, ArgInfos dst) + private static void CopyArgInfos(ArgInfos src, ArgInfos dst) { dst.carg = src.carg; dst.types = src.types; @@ -352,11 +332,11 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics pAmbig1.mpwi.GetType() != pAmbig2.mpwi.GetType() || pAmbig1.mpwi.MethProp().Params == pAmbig2.mpwi.MethProp().Params) { - throw GetErrorContext().Error(ErrorCode.ERR_AmbigCall, pAmbig1.mpwi, pAmbig2.mpwi); + throw ErrorHandling.Error(ErrorCode.ERR_AmbigCall, pAmbig1.mpwi, pAmbig2.mpwi); } // The two signatures are identical so don't use the type args in the error message. - throw GetErrorContext().Error(ErrorCode.ERR_AmbigCall, pAmbig1.mpwi.MethProp(), pAmbig2.mpwi.MethProp()); + throw ErrorHandling.Error(ErrorCode.ERR_AmbigCall, pAmbig1.mpwi.MethProp(), pAmbig2.mpwi.MethProp()); } } @@ -410,26 +390,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } _bArgumentsChangedForNamedOrOptionalArguments = ReOrderArgsForNamedArguments( - methprop, - _pCurrentParameters, - _pCurrentType, - _pGroup, - _pArguments, - _pExprBinder.GetTypes(), - _pExprBinder.GetExprFactory(), - GetSymbolLoader()); + methprop, _pCurrentParameters, _pCurrentType, _pGroup, _pArguments); return _bArgumentsChangedForNamedOrOptionalArguments; } internal static bool ReOrderArgsForNamedArguments( - MethodOrPropertySymbol methprop, - TypeArray pCurrentParameters, - AggregateType pCurrentType, - ExprMemberGroup pGroup, - ArgInfos pArguments, - TypeManager typeManager, - ExprFactory exprFactory, - SymbolLoader symbolLoader) + MethodOrPropertySymbol methprop, TypeArray pCurrentParameters, AggregateType pCurrentType, ExprMemberGroup pGroup, ArgInfos pArguments) { // We use the param count from pCurrentParameters because they may have been resized // for param arrays. @@ -441,7 +407,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // set, then for the remainder, look for a named argument with a matching name. int index = 0; Expr paramArrayArgument = null; - TypeArray @params = typeManager.SubstTypeArray( + TypeArray @params = TypeManager.SubstTypeArray( pCurrentParameters, pCurrentType, pGroup.TypeArgs); @@ -480,7 +446,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { if (methprop.IsParameterOptional(index)) { - pNewArg = GenerateOptionalArgument(symbolLoader, exprFactory, methprop, @params[index], index); + pNewArg = GenerateOptionalArgument(methprop, @params[index], index); } else if (paramArrayArgument != null && index == methprop.Params.Count - 1) { @@ -511,18 +477,13 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics prgTypes[i] = pArguments.prgexpr[i].Type; } pArguments.carg = pCurrentParameters.Count; - pArguments.types = symbolLoader.getBSymmgr().AllocParams(pCurrentParameters.Count, prgTypes); + pArguments.types = TypeArray.Allocate(prgTypes); return true; } ///////////////////////////////////////////////////////////////////////////////// - private static Expr GenerateOptionalArgument( - SymbolLoader symbolLoader, - ExprFactory exprFactory, - MethodOrPropertySymbol methprop, - CType type, - int index) + private static Expr GenerateOptionalArgument(MethodOrPropertySymbol methprop, CType type, int index) { CType pParamType = type; CType pRawParamType = type.StripNubs(); @@ -533,16 +494,16 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics CType pConstValType = methprop.GetDefaultParameterValueConstValType(index); ConstVal cv = methprop.GetDefaultParameterValue(index); - if (pConstValType.isPredefType(PredefinedType.PT_DATETIME) && - (pRawParamType.isPredefType(PredefinedType.PT_DATETIME) || pRawParamType.isPredefType(PredefinedType.PT_OBJECT) || pRawParamType.isPredefType(PredefinedType.PT_VALUE))) + if (pConstValType.IsPredefType(PredefinedType.PT_DATETIME) && + (pRawParamType.IsPredefType(PredefinedType.PT_DATETIME) || pRawParamType.IsPredefType(PredefinedType.PT_OBJECT) || pRawParamType.IsPredefType(PredefinedType.PT_VALUE))) { // This is the specific case where we want to create a DateTime // but the constval that stores it is a long. - AggregateType dateTimeType = symbolLoader.GetPredefindType(PredefinedType.PT_DATETIME); - optionalArgument = exprFactory.CreateConstant(dateTimeType, ConstVal.Get(DateTime.FromBinary(cv.Int64Val))); + AggregateType dateTimeType = SymbolLoader.GetPredefindType(PredefinedType.PT_DATETIME); + optionalArgument = ExprFactory.CreateConstant(dateTimeType, ConstVal.Get(DateTime.FromBinary(cv.Int64Val))); } - else if (pConstValType.isSimpleOrEnumOrString()) + else if (pConstValType.IsSimpleOrEnumOrString) { // In this case, the constval is a simple type (all the numerics, including // decimal), or an enum or a string. This covers all the substantial values, @@ -551,20 +512,17 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // For enum parameters, we create a constant of the enum type. For everything // else, we create the appropriate constant. - if (pRawParamType.isEnumType() && pConstValType == pRawParamType.underlyingType()) - { - optionalArgument = exprFactory.CreateConstant(pRawParamType, cv); - } - else - { - optionalArgument = exprFactory.CreateConstant(pConstValType, cv); - } + optionalArgument = ExprFactory.CreateConstant( + pRawParamType.IsEnumType && pConstValType == pRawParamType.UnderlyingEnumType + ? pRawParamType + : pConstValType, + cv); } - else if ((pParamType.IsRefType() || pParamType is NullableType) && cv.IsNullRef) + else if ((pParamType.IsReferenceType || pParamType is NullableType) && cv.IsNullRef) { // We have an "= null" default value with a reference type or a nullable type. - optionalArgument = exprFactory.CreateNull(); + optionalArgument = ExprFactory.CreateNull(); } else { @@ -572,7 +530,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // interpreted as default(something). For instance, the pParamType could be // a type parameter type or a non-simple value type. - optionalArgument = exprFactory.CreateZeroInit(pParamType); + optionalArgument = ExprFactory.CreateZeroInit(pParamType); } } else @@ -580,25 +538,25 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // There was no default parameter specified, so generally use default(T), // except for some cases when the parameter type in metatdata is object. - if (pParamType.isPredefType(PredefinedType.PT_OBJECT)) + if (pParamType.IsPredefType(PredefinedType.PT_OBJECT)) { if (methprop.MarshalAsObject(index)) { // For [opt] parameters of type object, if we have marshal(iunknown), // marshal(idispatch), or marshal(interface), then we emit a null. - optionalArgument = exprFactory.CreateNull(); + optionalArgument = ExprFactory.CreateNull(); } else { // Otherwise, we generate Type.Missing - AggregateSymbol agg = symbolLoader.GetPredefAgg(PredefinedType.PT_MISSING); + AggregateSymbol agg = SymbolLoader.GetPredefAgg(PredefinedType.PT_MISSING); Name name = NameManager.GetPredefinedName(PredefinedName.PN_CAP_VALUE); - FieldSymbol field = symbolLoader.LookupAggMember(name, agg, symbmask_t.MASK_FieldSymbol) as FieldSymbol; + FieldSymbol field = SymbolLoader.LookupAggMember(name, agg, symbmask_t.MASK_FieldSymbol) as FieldSymbol; FieldWithType fwt = new FieldWithType(field, agg.getThisType()); - ExprField exprField = exprFactory.CreateField(agg.getThisType(), null, fwt, false); - optionalArgument = exprFactory.CreateCast(type, exprField); + ExprField exprField = ExprFactory.CreateField(agg.getThisType(), null, fwt); + optionalArgument = ExprFactory.CreateCast(type, exprField); } } else @@ -606,7 +564,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // Every type aside from object that doesn't have a default value gets // its default value. - optionalArgument = exprFactory.CreateZeroInit(pParamType); + optionalArgument = ExprFactory.CreateZeroInit(pParamType); } } @@ -615,21 +573,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return optionalArgument; } - ///////////////////////////////////////////////////////////////////////////////// + private static MethodOrPropertySymbol FindMostDerivedMethod(MethodOrPropertySymbol pMethProp, Expr pObject) => + FindMostDerivedMethod(pMethProp, pObject?.Type); - private MethodOrPropertySymbol FindMostDerivedMethod( - MethodOrPropertySymbol pMethProp, - Expr pObject) - { - return FindMostDerivedMethod(GetSymbolLoader(), pMethProp, pObject?.Type); - } - - ///////////////////////////////////////////////////////////////////////////////// - - public static MethodOrPropertySymbol FindMostDerivedMethod( - SymbolLoader symbolLoader, - MethodOrPropertySymbol pMethProp, - CType pType) + public static MethodOrPropertySymbol FindMostDerivedMethod(MethodOrPropertySymbol pMethProp, CType pType) { bool bIsIndexer = false; @@ -664,13 +611,13 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return method; } - for (AggregateSymbol pAggregate = agg.GetOwningAggregate(); + for (AggregateSymbol pAggregate = agg.OwningAggregate; pAggregate?.GetBaseAgg() != null; pAggregate = pAggregate.GetBaseAgg()) { - for (MethodOrPropertySymbol meth = symbolLoader.LookupAggMember(method.name, pAggregate, symbmask_t.MASK_MethodSymbol | symbmask_t.MASK_PropertySymbol) as MethodOrPropertySymbol; + for (MethodOrPropertySymbol meth = SymbolLoader.LookupAggMember(method.name, pAggregate, symbmask_t.MASK_MethodSymbol | symbmask_t.MASK_PropertySymbol) as MethodOrPropertySymbol; meth != null; - meth = SymbolLoader.LookupNextSym(meth, pAggregate, symbmask_t.MASK_MethodSymbol | symbmask_t.MASK_PropertySymbol) as MethodOrPropertySymbol) + meth = meth.LookupNext(symbmask_t.MASK_MethodSymbol | symbmask_t.MASK_PropertySymbol) as MethodOrPropertySymbol) { if (!meth.isOverride) { @@ -732,7 +679,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // just generate defaults for every missing argument. int i = _pArguments.carg; int index = 0; - TypeArray @params = _pExprBinder.GetTypes().SubstTypeArray( + TypeArray @params = TypeManager.SubstTypeArray( _pCurrentParameters, _pCurrentType, _pGroup.TypeArgs); @@ -745,7 +692,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return false; } - pArguments[index] = GenerateOptionalArgument(GetSymbolLoader(), _pExprBinder.GetExprFactory(), methprop, @params[i], i); + pArguments[index] = GenerateOptionalArgument(methprop, @params[i], i); } // Success. Lets copy them in now. @@ -758,7 +705,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { prgTypes[n] = _pArguments.prgexpr[n].Type; } - _pArguments.types = GetSymbolLoader().getBSymmgr().AllocParams(@params.Count, prgTypes); + _pArguments.types = TypeArray.Allocate(prgTypes); _pArguments.carg = @params.Count; _bArgumentsChangedForNamedOrOptionalArguments = true; return true; @@ -852,7 +799,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (_pCurrentType != type && _pCurrentType != null && !_methList.IsEmpty() && - !_methList.Head().mpwi.GetType().isInterfaceType()) + !_methList.Head().mpwi.GetType().IsInterfaceType) { return false; } @@ -911,7 +858,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Debug.Assert(_methList.IsEmpty() || _methList.Head().mpwi.MethProp() != _pCurrentSym); // Construct the expanded params. - return _pExprBinder.TryGetExpandedParams(_pCurrentSym.Params, _pArguments.carg, out _pCurrentParameters); + return TryGetExpandedParams(_pCurrentSym.Params, _pArguments.carg, out _pCurrentParameters); } private Result DetermineCurrentTypeArgs() @@ -938,8 +885,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // error sym to go to any type. bool inferenceSucceeded = MethodTypeInferrer.Infer( - _pExprBinder, GetSymbolLoader(), methSym, _pCurrentParameters, _pArguments, - out _pCurrentTypeArgs); + _pExprBinder, methSym, _pCurrentParameters, _pArguments, out _pCurrentTypeArgs); if (!inferenceSucceeded) { @@ -974,7 +920,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics for (int ivar = 0; ivar < _pArguments.carg; ivar++) { CType var = _pCurrentParameters[ivar]; - bool constraintErrors = !TypeBind.CheckConstraints(GetSemanticChecker(), GetErrorContext(), var, CheckConstraintsFlags.NoErrors); + bool constraintErrors = !TypeBind.CheckConstraints(var, CheckConstraintsFlags.NoErrors); if (constraintErrors && !DoesTypeArgumentsContainErrorSym(var)) { _mpwiParamTypeConstraints.Set(_pCurrentSym, _pCurrentType, _pCurrentTypeArgs); @@ -1017,8 +963,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // (think ErrorType != ErrorType) // See if they just differ in out / ref. CType argStripped = _pArguments.types[ivar] is ParameterModifierType modArg ? - modArg.GetParameterType() : _pArguments.types[ivar]; - CType varStripped = var is ParameterModifierType modVar ? modVar.GetParameterType() : var; + modArg.ParameterType : _pArguments.types[ivar]; + CType varStripped = var is ParameterModifierType modVar ? modVar.ParameterType : var; if (argStripped == varStripped) { @@ -1054,7 +1000,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // Parameter types might have changed as a result of // method type inference. - _pCurrentParameters = _pExprBinder.GetTypes().SubstTypeArray( + _pCurrentParameters = TypeManager.SubstTypeArray( _pCurrentParameters, _pCurrentType, _pCurrentTypeArgs); // It is also possible that an optional argument has changed its value @@ -1092,19 +1038,19 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Debug.Assert(pMethod != null); } Debug.Assert(pMethod.IsParameterOptional(iParam)); - Expr pArgumentNew = GenerateOptionalArgument(GetSymbolLoader(), _pExprBinder.GetExprFactory(), pMethod, _pCurrentParameters[iParam], iParam); + Expr pArgumentNew = GenerateOptionalArgument(pMethod, _pCurrentParameters[iParam], iParam); _pArguments.prgexpr[iParam] = pArgumentNew; } } - private bool DoesTypeArgumentsContainErrorSym(CType var) + private static bool DoesTypeArgumentsContainErrorSym(CType var) { if (!(var is AggregateType varAgg)) { return false; } - TypeArray typeVars = varAgg.GetTypeArgsAll(); + TypeArray typeVars = varAgg.TypeArgsAll; for (int i = 0; i < typeVars.Count; i++) { CType type = typeVars[i]; @@ -1141,7 +1087,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (_results.BestResult.TypeArgs.Count > 0) { // Check method type variable constraints. - TypeBind.CheckMethConstraints(GetSemanticChecker(), GetErrorContext(), new MethWithInst(_results.BestResult)); + TypeBind.CheckMethConstraints(new MethWithInst(_results.BestResult)); } } } @@ -1151,7 +1097,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // First and foremost, report if the user specified a name more than once. if (_pDuplicateSpecifiedName != null) { - return GetErrorContext().Error(ErrorCode.ERR_DuplicateNamedArgument, _pDuplicateSpecifiedName); + return ErrorHandling.Error(ErrorCode.ERR_DuplicateNamedArgument, _pDuplicateSpecifiedName); } Debug.Assert(_methList.IsEmpty()); @@ -1159,7 +1105,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (_results.InaccessibleResult) { // We might have called this, but it is inaccessible... - return GetSemanticChecker().ReportAccessError(_results.InaccessibleResult, _pExprBinder.ContextForMemberLookup(), GetTypeQualifier(_pGroup)); + return CSemanticChecker.ReportAccessError(_results.InaccessibleResult, _pExprBinder.ContextForMemberLookup, GetTypeQualifier(_pGroup)); } if (_misnamed) @@ -1184,7 +1130,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // We have the bad name. Is it misplaced or absent? if (paramNames.Contains(name)) { - return GetErrorContext().Error(ErrorCode.ERR_BadNonTrailingNamedArgument, name); + return ErrorHandling.Error(ErrorCode.ERR_BadNonTrailingNamedArgument, name); } // Let this be handled by _pInvalidSpecifiedName handling. @@ -1197,22 +1143,21 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics else if (_mpwiBogus) { // We might have called this, but it is bogus... - return GetErrorContext().Error(ErrorCode.ERR_BindToBogus, _mpwiBogus); + return ErrorHandling.Error(ErrorCode.ERR_BindToBogus, _mpwiBogus); } bool bUseDelegateErrors = false; Name nameErr = _pGroup.Name; // Check for an invoke. - if (_pGroup.OptionalObject != null && - _pGroup.OptionalObject.Type != null && - _pGroup.OptionalObject.Type.isDelegateType() && - _pGroup.Name == NameManager.GetPredefinedName(PredefinedName.PN_INVOKE)) + if (_pGroup.OptionalObject?.Type != null && + _pGroup.OptionalObject.Type.IsDelegateType && + _pGroup.Name == NameManager.GetPredefinedName(PredefinedName.PN_INVOKE)) { Debug.Assert(!_results.BestResult || _results.BestResult.MethProp().getClass().IsDelegate()); - Debug.Assert(!_results.BestResult || _results.BestResult.GetType().getAggregate().IsDelegate()); + Debug.Assert(!_results.BestResult || _results.BestResult.GetType().OwningAggregate.IsDelegate()); bUseDelegateErrors = true; - nameErr = _pGroup.OptionalObject.Type.getAggregate().name; + nameErr = ((AggregateType)_pGroup.OptionalObject.Type).OwningAggregate.name; } if (_results.BestResult) @@ -1230,21 +1175,20 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } Debug.Assert(_results.UninferableResult.Sym is MethodSymbol); - MethWithType mwtCantInfer = new MethWithType(); - mwtCantInfer.Set(_results.UninferableResult.Meth(), _results.UninferableResult.GetType()); - return GetErrorContext().Error(ErrorCode.ERR_CantInferMethTypeArgs, mwtCantInfer); + MethWithType mwtCantInfer = new MethWithType(_results.UninferableResult.Meth(), _results.UninferableResult.GetType()); + return ErrorHandling.Error(ErrorCode.ERR_CantInferMethTypeArgs, mwtCantInfer); } if (_mwtBadArity) { int cvar = _mwtBadArity.Meth().typeVars.Count; - return GetErrorContext().Error(cvar > 0 ? ErrorCode.ERR_BadArity : ErrorCode.ERR_HasNoTypeVars, _mwtBadArity, new ErrArgSymKind(_mwtBadArity.Meth()), _pArguments.carg); + return ErrorHandling.Error(cvar > 0 ? ErrorCode.ERR_BadArity : ErrorCode.ERR_HasNoTypeVars, _mwtBadArity, new ErrArgSymKind(_mwtBadArity.Meth()), _pArguments.carg); } if (_mpwiParamTypeConstraints) { // This will always report an error - TypeBind.CheckMethConstraints(GetSemanticChecker(), GetErrorContext(), new MethWithInst(_mpwiParamTypeConstraints)); + TypeBind.CheckMethConstraints(new MethWithInst(_mpwiParamTypeConstraints)); Debug.Fail("Unreachable"); return null; } @@ -1252,39 +1196,38 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (_pInvalidSpecifiedName != null) { // Give a better message for delegate invoke. - return _pGroup.OptionalObject != null && _pGroup.OptionalObject.Type is AggregateType agg - && agg.GetOwningAggregate().IsDelegate() - ? GetErrorContext().Error( - ErrorCode.ERR_BadNamedArgumentForDelegateInvoke, agg.GetOwningAggregate().name, + return _pGroup.OptionalObject?.Type is AggregateType agg && agg.OwningAggregate.IsDelegate() + ? ErrorHandling.Error( + ErrorCode.ERR_BadNamedArgumentForDelegateInvoke, agg.OwningAggregate.name, _pInvalidSpecifiedName) - : GetErrorContext().Error(ErrorCode.ERR_BadNamedArgument, _pGroup.Name, _pInvalidSpecifiedName); + : ErrorHandling.Error(ErrorCode.ERR_BadNamedArgument, _pGroup.Name, _pInvalidSpecifiedName); } if (_pNameUsedInPositionalArgument != null) { - return GetErrorContext().Error(ErrorCode.ERR_NamedArgumentUsedInPositional, _pNameUsedInPositionalArgument); + return ErrorHandling.Error(ErrorCode.ERR_NamedArgumentUsedInPositional, _pNameUsedInPositionalArgument); } // The number of arguments must be wrong. if (_fCandidatesUnsupported) { - return GetErrorContext().Error(ErrorCode.ERR_BindToBogus, nameErr); + return ErrorHandling.Error(ErrorCode.ERR_BindToBogus, nameErr); } if (bUseDelegateErrors) { Debug.Assert(0 == (_pGroup.Flags & EXPRFLAG.EXF_CTOR)); - return GetErrorContext().Error(ErrorCode.ERR_BadDelArgCount, nameErr, _pArguments.carg); + return ErrorHandling.Error(ErrorCode.ERR_BadDelArgCount, nameErr, _pArguments.carg); } if (0 != (_pGroup.Flags & EXPRFLAG.EXF_CTOR)) { Debug.Assert(!(_pGroup.ParentType is TypeParameterType)); - return GetErrorContext().Error(ErrorCode.ERR_BadCtorArgCount, _pGroup.ParentType, _pArguments.carg); + return ErrorHandling.Error(ErrorCode.ERR_BadCtorArgCount, _pGroup.ParentType, _pArguments.carg); } - return GetErrorContext().Error(ErrorCode.ERR_BadArgCount, nameErr, _pArguments.carg); + return ErrorHandling.Error(ErrorCode.ERR_BadArgCount, nameErr, _pArguments.carg); } private RuntimeBinderException ReportErrorsForBestMatching(bool bUseDelegateErrors) @@ -1292,10 +1235,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (bUseDelegateErrors) { // Point to the Delegate, not the Invoke method - return GetErrorContext().Error(ErrorCode.ERR_BadDelArgTypes, _results.BestResult.GetType()); + return ErrorHandling.Error(ErrorCode.ERR_BadDelArgTypes, _results.BestResult.GetType()); } - return GetErrorContext().Error(ErrorCode.ERR_BadArgTypes, _results.BestResult); + return ErrorHandling.Error(ErrorCode.ERR_BadArgTypes, _results.BestResult); } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GroupToArgsBinderResult.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GroupToArgsBinderResult.cs index d6574fb85b..2e5b417e0d 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GroupToArgsBinderResult.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GroupToArgsBinderResult.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; namespace Microsoft.CSharp.RuntimeBinder.Semantics { - internal sealed partial class ExpressionBinder + internal readonly partial struct ExpressionBinder { // ---------------------------------------------------------------------------- // This class takes an EXPRMEMGRP and a set of arguments and binds the arguments @@ -59,11 +59,11 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { if (pTypeArgs1[i] is AggregateType aggArg1) { - leftErrors += NumberOfErrorTypes(aggArg1.GetTypeArgsAll()); + leftErrors += NumberOfErrorTypes(aggArg1.TypeArgsAll); } if (pTypeArgs2[i] is AggregateType aggArg2) { - rightErrors += NumberOfErrorTypes(aggArg2.GetTypeArgsAll()); + rightErrors += NumberOfErrorTypes(aggArg2.TypeArgsAll); } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ImplicitConversion.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ImplicitConversion.cs index 9d82a2f05f..17269e40d0 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ImplicitConversion.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ImplicitConversion.cs @@ -7,7 +7,7 @@ using Microsoft.CSharp.RuntimeBinder.Syntax; namespace Microsoft.CSharp.RuntimeBinder.Semantics { - internal sealed partial class ExpressionBinder + internal readonly partial struct ExpressionBinder { // ---------------------------------------------------------------------------- // BindImplicitConversion @@ -87,7 +87,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Debug.Assert(_exprSrc == null || _typeSrc == _exprSrc.Type); // type of source should be correct if source supplied Debug.Assert(!_needsExprDest || _exprSrc != null); // need source expr to create dest expr - switch (_typeDest.GetTypeKind()) + switch (_typeDest.TypeKind) { case TypeKind.TK_NullType: // Can only convert to the null type if src is null. @@ -114,7 +114,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // such that an entity that already has a required type can be said to be convertible to that type. if (_typeSrc == _typeDest && - ((_flags & CONVERTTYPE.ISEXPLICIT) == 0 || (!_typeSrc.isPredefType(PredefinedType.PT_FLOAT) && !_typeSrc.isPredefType(PredefinedType.PT_DOUBLE)))) + ((_flags & CONVERTTYPE.ISEXPLICIT) == 0 || (!_typeSrc.IsPredefType(PredefinedType.PT_FLOAT) && !_typeSrc.IsPredefType(PredefinedType.PT_DOUBLE)))) { if (_needsExprDest) { @@ -139,13 +139,13 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } // Get the fundamental types of destination. - FUNDTYPE ftDest = _typeDest.fundType(); + FUNDTYPE ftDest = _typeDest.FundamentalType; Debug.Assert(ftDest != FUNDTYPE.FT_NONE || _typeDest is ParameterModifierType); - switch (_typeSrc.GetTypeKind()) + switch (_typeSrc.TypeKind) { default: - Debug.Fail($"Bad type symbol kind: {_typeSrc.GetTypeKind()}"); + Debug.Fail($"Bad type symbol kind: {_typeSrc.TypeKind}"); break; case TypeKind.TK_VoidType: case TypeKind.TK_ParameterModifierType: @@ -191,7 +191,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics object srcRuntimeObject = _exprSrc?.RuntimeObject; if (srcRuntimeObject != null && _typeDest.AssociatedSystemType.IsInstanceOfType(srcRuntimeObject) - && _binder.GetSemanticChecker().CheckTypeAccess(_typeDest, _binder.Context.ContextForMemberLookup)) + && CSemanticChecker.CheckTypeAccess(_typeDest, _binder.Context.ContextForMemberLookup)) { if (_needsExprDest) { @@ -270,7 +270,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics AggregateType atsDst = nubDst.GetAts(); // Check for the unboxing conversion. This takes precedence over the wrapping conversions. - if (GetSymbolLoader().HasBaseConversion(nubDst.GetUnderlyingType(), _typeSrc) && !CConversions.FWrappingConv(_typeSrc, nubDst)) + if (SymbolLoader.HasBaseConversion(nubDst.UnderlyingType, _typeSrc) && !CConversions.FWrappingConv(_typeSrc, nubDst)) { // These should be different! Fix the caller if typeSrc is an AggregateType of Nullable. Debug.Assert(atsDst != _typeSrc); @@ -310,8 +310,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (_needsExprDest) { _exprDest = _exprSrc is ExprConstant - ? GetExprFactory().CreateZeroInit(nubDst) - : GetExprFactory().CreateCast(_typeDest, _exprSrc); + ? ExprFactory.CreateZeroInit(nubDst) + : ExprFactory.CreateCast(_typeDest, _exprSrc); } return true; } @@ -331,7 +331,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (dstWasNullable) { - ExprCall call = _binder.BindNubNew(exprTmp); + ExprCall call = BindNubNew(exprTmp); exprTmp = call; call.NullableCallLiftKind = NullableCallLiftKind.NullableConversionConstructor; } @@ -363,8 +363,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (_needsExprDest) { MethWithInst mwi = new MethWithInst(null, null); - ExprMemberGroup pMemGroup = GetExprFactory().CreateMemGroup(null, mwi); - ExprCall exprDst = GetExprFactory().CreateCall(0, nubDst, _exprSrc, pMemGroup, null); + ExprMemberGroup pMemGroup = ExprFactory.CreateMemGroup(null, mwi); + ExprCall exprDst = ExprFactory.CreateCall(0, nubDst, _exprSrc, pMemGroup, null); // Here we want to first check whether or not the conversions work on the base types. @@ -395,10 +395,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // null type can be implicitly converted to any reference type or pointer type or type // variable with reference-type constraint. - FUNDTYPE ftDest = _typeDest.fundType(); + FUNDTYPE ftDest = _typeDest.FundamentalType; if (ftDest != FUNDTYPE.FT_REF && ftDest != FUNDTYPE.FT_PTR && // null is convertible to System.Nullable. - !_typeDest.isPredefType(PredefinedType.PT_G_OPTIONAL)) + !_typeDest.IsPredefType(PredefinedType.PT_G_OPTIONAL)) { return false; } @@ -408,8 +408,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // Otherwise, bind this as a cast to the destination type. In a later // rewrite pass we will rewrite the cast as SEQ(side effects, ZEROINIT). _exprDest = _exprSrc is ExprConstant - ? GetExprFactory().CreateZeroInit(_typeDest) - : GetExprFactory().CreateCast(_typeDest, _exprSrc); + ? ExprFactory.CreateZeroInit(_typeDest) + : ExprFactory.CreateCast(_typeDest, _exprSrc); } return true; } @@ -440,12 +440,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } return true; } - if (GetSymbolLoader().HasBaseConversion(nubSrc.GetUnderlyingType(), _typeDest) && !CConversions.FUnwrappingConv(nubSrc, _typeDest)) + if (SymbolLoader.HasBaseConversion(nubSrc.UnderlyingType, _typeDest) && !CConversions.FUnwrappingConv(nubSrc, _typeDest)) { if (_needsExprDest) { _binder.bindSimpleCast(_exprSrc, _typeDest, out _exprDest, EXPRFLAG.EXF_BOX); - if (!_typeDest.isPredefType(PredefinedType.PT_OBJECT)) + if (!_typeDest.IsPredefType(PredefinedType.PT_OBJECT)) { // The base type of a nullable is always a non-nullable value type, // therefore so is typeDest unless typeDest is PT_OBJECT. In this case the conversion @@ -475,7 +475,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // * From any array-type to System.Array. // * From any array-type to any interface implemented by System.Array. - if (!GetSymbolLoader().HasBaseConversion(_typeSrc, _typeDest)) + if (!SymbolLoader.HasBaseConversion(_typeSrc, _typeDest)) { return false; } @@ -486,9 +486,9 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // and the non-generic versions. if ((_typeDest is ArrayType || - (_typeDest is AggregateType aggDest && aggDest.isInterfaceType() && - aggDest.GetTypeArgsAll().Count == 1 && - ((aggDest.GetTypeArgsAll()[0] != ((ArrayType)_typeSrc).GetElementType()) || + (_typeDest is AggregateType aggDest && aggDest.IsInterfaceType && + aggDest.TypeArgsAll.Count == 1 && + (aggDest.TypeArgsAll[0] != ((ArrayType)_typeSrc).ElementType || 0 != (_flags & CONVERTTYPE.FORCECAST)))) && (0 != (_flags & CONVERTTYPE.FORCECAST) || @@ -513,12 +513,16 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // // * From any pointer-type to the type void*. - if (_typeDest is PointerType ptDest && ptDest.GetReferentType() == _binder.getVoidType()) + if (_typeDest is PointerType ptDest && ptDest.ReferentType == VoidType.Instance) { if (_needsExprDest) + { _binder.bindSimpleCast(_exprSrc, _typeDest, out _exprDest); + } + return true; } + return false; } @@ -529,13 +533,13 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // below. They could be relevant if we had user-defined conversions on // generic types. - AggregateSymbol aggSrc = aggTypeSrc.getAggregate(); + AggregateSymbol aggSrc = aggTypeSrc.OwningAggregate; if (aggSrc.IsEnum()) { return bindImplicitConversionFromEnum(aggTypeSrc); } - if (_typeDest.isEnumType()) + if (_typeDest.IsEnumType) { if (bindImplicitConversionToEnum(aggTypeSrc)) { @@ -544,7 +548,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // Even though enum is sealed, a class can derive from enum in LAF scenarios -- // continue testing for derived to base conversions below. } - else if (aggSrc.getThisType().isSimpleType() && _typeDest.isSimpleType()) + else if (aggSrc.getThisType().IsSimpleType && _typeDest.IsSimpleType) { if (bindImplicitConversionBetweenSimpleTypes(aggTypeSrc)) { @@ -567,12 +571,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // * From any delegate-type to System.Delegate. // * From any delegate-type to System.ICloneable. - if (!(_typeDest is AggregateType) || !GetSymbolLoader().HasBaseConversion(pSource, _typeDest)) + if (!(_typeDest is AggregateType) || !SymbolLoader.HasBaseConversion(pSource, _typeDest)) { return false; } EXPRFLAG flags = 0x00; - if (pSource.getAggregate().IsStruct() && _typeDest.fundType() == FUNDTYPE.FT_REF) + if (pSource.OwningAggregate.IsStruct() && _typeDest.FundamentalType == FUNDTYPE.FT_REF) { flags = EXPRFLAG.EXF_BOX | EXPRFLAG.EXF_CANTBENULL; } @@ -597,7 +601,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // base class for all enums (21.4). A struct or enum can be boxed to the type System.ValueType, // since that is the direct base class for all structs (18.3.2) and a base class for all enums. - if (_typeDest is AggregateType aggDest && GetSymbolLoader().HasBaseConversion(aggTypeSrc, aggDest)) + if (_typeDest is AggregateType aggDest && SymbolLoader.HasBaseConversion(aggTypeSrc, aggDest)) { if (_needsExprDest) _binder.bindSimpleCast(_exprSrc, _typeDest, out _exprDest, EXPRFLAG.EXF_BOX | EXPRFLAG.EXF_CANTBENULL); @@ -630,10 +634,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // Note: Don't use GetConst here since the conversion only applies to bona-fide compile time constants. if ( - aggTypeSrc.getAggregate().GetPredefType() != PredefinedType.PT_BOOL && + aggTypeSrc.OwningAggregate.GetPredefType() != PredefinedType.PT_BOOL && _exprSrc != null && _exprSrc.IsZero() && - _exprSrc.Type.isNumericType() && + _exprSrc.Type.IsNumericType && /*(exprSrc.flags & EXF_LITERALCONST) &&*/ 0 == (_flags & CONVERTTYPE.STANDARD)) { @@ -644,7 +648,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // into a constant here - we should move this to a later pass. if (_needsExprDest) { - _exprDest = GetExprFactory().CreateConstant(_typeDest, ConstVal.GetDefaultValue(_typeDest.constValKind())); + _exprDest = ExprFactory.CreateConstant(_typeDest, ConstVal.GetDefaultValue(_typeDest.ConstValKind)); } return true; } @@ -653,13 +657,13 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics private bool bindImplicitConversionBetweenSimpleTypes(AggregateType aggTypeSrc) { - AggregateSymbol aggSrc = aggTypeSrc.getAggregate(); - Debug.Assert(aggSrc.getThisType().isSimpleType()); - Debug.Assert(_typeDest.isSimpleType()); + AggregateSymbol aggSrc = aggTypeSrc.OwningAggregate; + Debug.Assert(aggSrc.getThisType().IsSimpleType); + Debug.Assert(_typeDest.IsSimpleType); - Debug.Assert(aggSrc.IsPredefined() && _typeDest.isPredefined()); + Debug.Assert(aggSrc.IsPredefined() && _typeDest.IsPredefined); PredefinedType ptSrc = aggSrc.GetPredefType(); - PredefinedType ptDest = _typeDest.getPredefType(); + PredefinedType ptDest = _typeDest.PredefinedType; ConvKind convertKind; Debug.Assert((int)ptSrc < NUM_SIMPLE_TYPES && (int)ptDest < NUM_SIMPLE_TYPES); @@ -726,15 +730,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics _binder.bindSimpleCast(_exprSrc, _typeDest, out _exprDest); return true; } - - private SymbolLoader GetSymbolLoader() - { - return _binder.GetSymbolLoader(); - } - private ExprFactory GetExprFactory() - { - return _binder.GetExprFactory(); - } } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MemberLookup.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MemberLookup.cs index 748580e702..53a477a182 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MemberLookup.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MemberLookup.cs @@ -38,10 +38,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics internal sealed class MemberLookup { // The inputs to Lookup. - private CSemanticChecker _pSemanticChecker; - private SymbolLoader _pSymbolLoader; private CType _typeSrc; - private Expr _obj; private CType _typeQual; private ParentSymbol _symWhere; private Name _name; @@ -107,50 +104,30 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // Make sure this type is accessible. It may not be due to private inheritance // or friend assemblies. - bool fInaccess = !GetSemanticChecker().CheckTypeAccess(typeCur, _symWhere); + bool fInaccess = !CSemanticChecker.CheckTypeAccess(typeCur, _symWhere); if (fInaccess && (_csym != 0 || _swtInaccess != null)) return false; // Loop through symbols. Symbol symCur; - for (symCur = GetSymbolLoader().LookupAggMember(_name, typeCur.getAggregate(), symbmask_t.MASK_ALL); + for (symCur = SymbolLoader.LookupAggMember(_name, typeCur.OwningAggregate, symbmask_t.MASK_Member); symCur != null; - symCur = SymbolLoader.LookupNextSym(symCur, typeCur.getAggregate(), symbmask_t.MASK_ALL)) + symCur = symCur.LookupNext(symbmask_t.MASK_Member)) { + Debug.Assert(!(symCur is AggregateSymbol)); // Check for arity. - switch (symCur.getKind()) + // For non-zero arity, only methods of the correct arity are considered. + // For zero arity, don't filter out any methods since we do type argument + // inferencing. + // All others are only considered when arity is zero. + if (_arity > 0 && (!(symCur is MethodSymbol curMeth) || curMeth.typeVars.Count != _arity)) { - case SYMKIND.SK_MethodSymbol: - // For non-zero arity, only methods of the correct arity are considered. - // For zero arity, don't filter out any methods since we do type argument - // inferencing. - if (_arity > 0 && ((MethodSymbol)symCur).typeVars.Count != _arity) - { - if (!_swtBadArity) - _swtBadArity.Set(symCur, typeCur); - continue; - } - break; + if (!_swtBadArity) + { + _swtBadArity.Set(symCur, typeCur); + } - case SYMKIND.SK_AggregateSymbol: - // For types, always filter on arity. - if (((AggregateSymbol)symCur).GetTypeVars().Count != _arity) - { - if (!_swtBadArity) - _swtBadArity.Set(symCur, typeCur); - continue; - } - break; - - default: - // All others are only considered when arity is zero. - if (_arity > 0) - { - if (!_swtBadArity) - _swtBadArity.Set(symCur, typeCur); - continue; - } - break; + continue; } // Check for user callability. @@ -164,20 +141,22 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (methProp != null && (_flags & MemLookFlags.UserCallable) != 0 && !methProp.isUserCallable()) { // If its an indexed property method symbol, let it through. - if (meth != null && - meth.isPropertyAccessor() && - ((symCur.name.Text.StartsWith("set_", StringComparison.Ordinal) && meth.Params.Count > 1) || - (symCur.name.Text.StartsWith("get_", StringComparison.Ordinal) && meth.Params.Count > 0))) + // This is too liberal, but maintained for compatibility. + if (meth == null || + !meth.isPropertyAccessor() || + (!symCur.name.Text.StartsWith("set_", StringComparison.Ordinal) || meth.Params.Count <= 1) && + (!symCur.name.Text.StartsWith("get_", StringComparison.Ordinal) || meth.Params.Count <= 0)) { if (!_swtInaccess) { _swtInaccess.Set(symCur, typeCur); } + continue; } } - if (fInaccess || !GetSemanticChecker().CheckAccess(symCur, typeCur, _symWhere, _typeQual)) + if (fInaccess || !CSemanticChecker.CheckAccess(symCur, typeCur, _symWhere, _typeQual)) { // Not accessible so get the next sym. if (!_swtInaccess) @@ -243,7 +222,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (_swtFirst) { - if (!typeCur.isInterfaceType()) + if (!typeCur.IsInterfaceType) { // Non-interface case. Debug.Assert(_fMulti || typeCur == _prgtype[0]); @@ -297,7 +276,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } else if (_swtFirst.Sym.getKind() != symCur.getKind()) { - if (!typeCur.fDiffHidden) + if (!typeCur.DiffHidden) { // Give method groups priority. if (!(_swtFirst.Sym is MethodSymbol)) @@ -329,12 +308,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return true; } - private bool IsDynamicMember(Symbol sym) + private static bool IsDynamicMember(Symbol sym) { System.Runtime.CompilerServices.DynamicAttribute da = null; if (sym is FieldSymbol field) { - if (!field.getType().isPredefType(PredefinedType.PT_OBJECT)) + if (!field.getType().IsPredefType(PredefinedType.PT_OBJECT)) { return false; } @@ -348,7 +327,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { Debug.Assert(sym is PropertySymbol); PropertySymbol prop = (PropertySymbol)sym; - if (!prop.getType().isPredefType(PredefinedType.PT_OBJECT)) + if (!prop.getType().IsPredefType(PredefinedType.PT_OBJECT)) { return false; } @@ -378,15 +357,15 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics private bool LookupInClass(AggregateType typeStart, ref AggregateType ptypeEnd) { Debug.Assert(!_swtFirst || _fMulti); - Debug.Assert(typeStart != null && !typeStart.isInterfaceType() && (ptypeEnd == null || typeStart != ptypeEnd)); + Debug.Assert(typeStart != null && !typeStart.IsInterfaceType && (ptypeEnd == null || typeStart != ptypeEnd)); AggregateType typeEnd = ptypeEnd; AggregateType typeCur; // Loop through types. Loop until we hit typeEnd (object or null). - for (typeCur = typeStart; typeCur != typeEnd && typeCur != null; typeCur = typeCur.GetBaseClass()) + for (typeCur = typeStart; typeCur != typeEnd && typeCur != null; typeCur = typeCur.BaseClass) { - Debug.Assert(!typeCur.isInterfaceType()); + Debug.Assert(!typeCur.IsInterfaceType); SearchSingleType(typeCur, out bool fHideByName); @@ -422,23 +401,23 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics private bool LookupInInterfaces(AggregateType typeStart, TypeArray types) { Debug.Assert(!_swtFirst || _fMulti); - Debug.Assert(typeStart == null || typeStart.isInterfaceType()); + Debug.Assert(typeStart == null || typeStart.IsInterfaceType); Debug.Assert(typeStart != null || types.Count != 0); // Clear all the hidden flags. Anything found in a class hides any other // kind of member in all the interfaces. if (typeStart != null) { - typeStart.fAllHidden = false; - typeStart.fDiffHidden = (_swtFirst != null); + typeStart.AllHidden = false; + typeStart.DiffHidden = (_swtFirst != null); } for (int i = 0; i < types.Count; i++) { AggregateType type = (AggregateType)types[i]; - Debug.Assert(type.isInterfaceType()); - type.fAllHidden = false; - type.fDiffHidden = !!_swtFirst; + Debug.Assert(type.IsInterfaceType); + type.AllHidden = false; + type.DiffHidden = !!_swtFirst; } bool fHideObject = false; @@ -454,60 +433,58 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // Loop through the interfaces. for (; ;) { - Debug.Assert(typeCur != null && typeCur.isInterfaceType()); + Debug.Assert(typeCur != null && typeCur.IsInterfaceType); - if (!typeCur.fAllHidden && SearchSingleType(typeCur, out bool fHideByName)) + if (!typeCur.AllHidden && SearchSingleType(typeCur, out bool fHideByName)) { fHideByName |= !_fMulti; // Mark base interfaces appropriately. - TypeArray ifaces = typeCur.GetIfacesAll(); - for (int i = 0; i < ifaces.Count; i++) + foreach (AggregateType type in typeCur.IfacesAll.Items) { - AggregateType type = (AggregateType)ifaces[i]; - Debug.Assert(type.isInterfaceType()); + Debug.Assert(type.IsInterfaceType); if (fHideByName) - type.fAllHidden = true; - type.fDiffHidden = true; + { + type.AllHidden = true; + } + + type.DiffHidden = true; } // If we hide all base types, that includes object! if (fHideByName) + { fHideObject = true; + } } if (itypeNext >= types.Count) + { return !fHideObject; + } // Substitution has already been done. typeCur = types[itypeNext++] as AggregateType; } } - private SymbolLoader GetSymbolLoader() { return _pSymbolLoader; } - private CSemanticChecker GetSemanticChecker() { return _pSemanticChecker; } - private ErrorHandling GetErrorContext() { return GetSymbolLoader().GetErrorContext(); } - - private RuntimeBinderException ReportBogus(SymWithType swt) + private static RuntimeBinderException ReportBogus(SymWithType swt) { Debug.Assert(CSemanticChecker.CheckBogus(swt.Sym)); MethodSymbol meth1 = swt.Prop().GetterMethod; MethodSymbol meth2 = swt.Prop().SetterMethod; Debug.Assert((meth1 ?? meth2) != null); return meth1 == null | meth2 == null - ? GetErrorContext().Error( + ? ErrorHandling.Error( ErrorCode.ERR_BindToBogusProp1, swt.Sym.name, new SymWithType(meth1 ?? meth2, swt.GetType()), new ErrArgRefOnly(swt.Sym)) - : GetErrorContext().Error( + : ErrorHandling.Error( ErrorCode.ERR_BindToBogusProp2, swt.Sym.name, new SymWithType(meth1, swt.GetType()), new SymWithType(meth2, swt.GetType()), new ErrArgRefOnly(swt.Sym)); } - private bool IsDelegateType(CType pSrcType, AggregateType pAggType) - { - CType pInstantiatedType = GetSymbolLoader().GetTypeManager().SubstType(pSrcType, pAggType, pAggType.GetTypeArgsAll()); - return pInstantiatedType.isDelegateType(); - } + private static bool IsDelegateType(CType pSrcType, AggregateType pAggType) => + TypeManager.SubstType(pSrcType, pAggType, pAggType.TypeArgsAll).IsDelegateType; ///////////////////////////////////////////////////////////////////////////////// // Public methods. @@ -541,20 +518,16 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics flags - See MemLookFlags. TypeVarsAllowed only applies to the most derived type (not base types). ***************************************************************************************************/ - public bool Lookup(CSemanticChecker checker, CType typeSrc, Expr obj, ParentSymbol symWhere, Name name, int arity, MemLookFlags flags) + public bool Lookup(CType typeSrc, Expr obj, ParentSymbol symWhere, Name name, int arity, MemLookFlags flags) { Debug.Assert((flags & ~MemLookFlags.All) == 0); Debug.Assert(obj == null || obj.Type != null); Debug.Assert(typeSrc is AggregateType); - Debug.Assert(checker != null); _prgtype = _rgtypeStart; // Save the inputs for error handling, etc. - _pSemanticChecker = checker; - _pSymbolLoader = checker.SymbolLoader; _typeSrc = typeSrc; - _obj = obj is ExprClass ? null : obj; _symWhere = symWhere; _name = name; _arity = arity; @@ -563,30 +536,27 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics _typeQual = (_flags & MemLookFlags.Ctor) != 0 ? _typeSrc : obj?.Type; // Determine what to search. - AggregateType typeCls1 = null; - AggregateType typeIface = null; - TypeArray ifaces = BSYMMGR.EmptyTypeArray(); - AggregateType typeCls2 = null; + AggregateType typeCls1; + AggregateType typeIface; + TypeArray ifaces; - if (!typeSrc.isInterfaceType()) + if (typeSrc.IsInterfaceType) { - typeCls1 = (AggregateType)typeSrc; - - if (typeCls1.IsWindowsRuntimeType()) - { - ifaces = typeCls1.GetWinRTCollectionIfacesAll(GetSymbolLoader()); - } + Debug.Assert((_flags & (MemLookFlags.Ctor | MemLookFlags.NewObj | MemLookFlags.Operator | MemLookFlags.BaseCall)) == 0); + typeCls1 = null; + typeIface = (AggregateType)typeSrc; + ifaces = typeIface.IfacesAll; } else { - Debug.Assert(typeSrc.isInterfaceType()); - Debug.Assert((_flags & (MemLookFlags.Ctor | MemLookFlags.NewObj | MemLookFlags.Operator | MemLookFlags.BaseCall)) == 0); - typeIface = (AggregateType)typeSrc; - ifaces = typeIface.GetIfacesAll(); + typeCls1 = (AggregateType)typeSrc; + typeIface = null; + ifaces = typeCls1.IsWindowsRuntimeType ? typeCls1.WinRTCollectionIfacesAll : TypeArray.Empty; } - if (typeIface != null || ifaces.Count > 0) - typeCls2 = GetSymbolLoader().GetPredefindType(PredefinedType.PT_OBJECT); + AggregateType typeCls2 = typeIface != null || ifaces.Count > 0 + ? SymbolLoader.GetPredefindType(PredefinedType.PT_OBJECT) + : null; // Search the class first (except possibly object). if (typeCls1 == null || LookupInClass(typeCls1, ref typeCls2)) @@ -595,7 +565,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if ((typeIface != null || ifaces.Count > 0) && LookupInInterfaces(typeIface, ifaces) && typeCls2 != null) { // Search object last. - Debug.Assert(typeCls2 != null && typeCls2.isPredefType(PredefinedType.PT_OBJECT)); + Debug.Assert(typeCls2 != null && typeCls2.IsPredefType(PredefinedType.PT_OBJECT)); AggregateType result = null; LookupInClass(typeCls2, ref result); @@ -612,36 +582,11 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } // The first symbol found. - public Symbol SymFirst() - { - return _swtFirst.Sym; - } public SymWithType SwtFirst() { return _swtFirst; } - public Expr GetObject() - { - return _obj; - } - - public CType GetSourceType() - { - return _typeSrc; - } - - public MemLookFlags GetFlags() - { - return _flags; - } - - // Put all the types in a type array. - private TypeArray GetAllTypes() - { - return GetSymbolLoader().getBSymmgr().AllocParams(_prgtype.Count, _prgtype.ToArray()); - } - /****************************************************************************** Reports errors. Only call this if FError() is true. ******************************************************************************/ @@ -656,36 +601,37 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (_swtFirst) { // Ambiguous lookup. - return GetErrorContext().Error(ErrorCode.ERR_AmbigMember, _swtFirst, _swtAmbig); + return ErrorHandling.Error(ErrorCode.ERR_AmbigMember, _swtFirst, _swtAmbig); } if (_swtInaccess) { return !_swtInaccess.Sym.isUserCallable() && ((_flags & MemLookFlags.UserCallable) != 0) - ? GetErrorContext().Error(ErrorCode.ERR_CantCallSpecialMethod, _swtInaccess) - : GetSemanticChecker().ReportAccessError(_swtInaccess, _symWhere, _typeQual); + ? ErrorHandling.Error(ErrorCode.ERR_CantCallSpecialMethod, _swtInaccess) + : CSemanticChecker.ReportAccessError(_swtInaccess, _symWhere, _typeQual); } if ((_flags & MemLookFlags.Ctor) != 0) { + Debug.Assert(_typeSrc is AggregateType); return _arity > 0 - ? GetErrorContext().Error(ErrorCode.ERR_BadCtorArgCount, _typeSrc.getAggregate(), _arity) - : GetErrorContext().Error(ErrorCode.ERR_NoConstructors, _typeSrc.getAggregate()); + ? ErrorHandling.Error(ErrorCode.ERR_BadCtorArgCount, ((AggregateType)_typeSrc).OwningAggregate, _arity) + : ErrorHandling.Error(ErrorCode.ERR_NoConstructors, ((AggregateType)_typeSrc).OwningAggregate); } if ((_flags & MemLookFlags.Operator) != 0) { - return GetErrorContext().Error(ErrorCode.ERR_NoSuchMember, _typeSrc, _name); + return ErrorHandling.Error(ErrorCode.ERR_NoSuchMember, _typeSrc, _name); } if ((_flags & MemLookFlags.Indexer) != 0) { - return GetErrorContext().Error(ErrorCode.ERR_BadIndexLHS, _typeSrc); + return ErrorHandling.Error(ErrorCode.ERR_BadIndexLHS, _typeSrc); } if (_swtBad) { - return GetErrorContext().Error((_flags & MemLookFlags.MustBeInvocable) != 0 ? ErrorCode.ERR_NonInvocableMemberCalled : ErrorCode.ERR_CantCallSpecialMethod, _swtBad); + return ErrorHandling.Error((_flags & MemLookFlags.MustBeInvocable) != 0 ? ErrorCode.ERR_NonInvocableMemberCalled : ErrorCode.ERR_CantCallSpecialMethod, _swtBad); } if (_swtBogus) @@ -695,26 +641,18 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (_swtBadArity) { - int cvar; - - switch (_swtBadArity.Sym.getKind()) + Debug.Assert(_arity != 0); + Debug.Assert(!(_swtBadArity.Sym is AggregateSymbol)); + if (_swtBadArity.Sym is MethodSymbol badMeth) { - case SYMKIND.SK_MethodSymbol: - Debug.Assert(_arity != 0); - cvar = ((MethodSymbol)_swtBadArity.Sym).typeVars.Count; - return GetErrorContext().Error(cvar > 0 ? ErrorCode.ERR_BadArity : ErrorCode.ERR_HasNoTypeVars, _swtBadArity, new ErrArgSymKind(_swtBadArity.Sym), cvar); - - case SYMKIND.SK_AggregateSymbol: - cvar = ((AggregateSymbol)_swtBadArity.Sym).GetTypeVars().Count; - return GetErrorContext().Error(cvar > 0 ? ErrorCode.ERR_BadArity : ErrorCode.ERR_HasNoTypeVars, _swtBadArity, new ErrArgSymKind(_swtBadArity.Sym), cvar); - - default: - Debug.Assert(_arity != 0); - return GetErrorContext().Error(ErrorCode.ERR_TypeArgsNotAllowed, _swtBadArity, new ErrArgSymKind(_swtBadArity.Sym)); + int cvar = badMeth.typeVars.Count; + return ErrorHandling.Error(cvar > 0 ? ErrorCode.ERR_BadArity : ErrorCode.ERR_HasNoTypeVars, _swtBadArity, new ErrArgSymKind(_swtBadArity.Sym), cvar); } + + return ErrorHandling.Error(ErrorCode.ERR_TypeArgsNotAllowed, _swtBadArity, new ErrArgSymKind(_swtBadArity.Sym)); } - return GetErrorContext().Error(ErrorCode.ERR_NoSuchMember, _typeSrc, _name); + return ErrorHandling.Error(ErrorCode.ERR_NoSuchMember, _typeSrc, _name); } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MemberLookupResults.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MemberLookupResults.cs index 045a6cd9e8..7c21f1487d 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MemberLookupResults.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MemberLookupResults.cs @@ -29,15 +29,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } public CMethodIterator GetMethodIterator( - CSemanticChecker pChecker, SymbolLoader pSymLoader, CType pQualifyingType, AggregateDeclaration pContext, int arity, EXPRFLAG flags, symbmask_t mask, ArgInfos nonTrailingNamedArguments) - { - Debug.Assert(pSymLoader != null); - CMethodIterator iterator = new CMethodIterator(pChecker, pSymLoader, _pName, ContainingTypes, pQualifyingType, pContext, arity, flags, mask, nonTrailingNamedArguments); - return iterator; - } - - public partial class CMethodIterator - { - } + CType qualifyingType, AggregateSymbol context, int arity, EXPRFLAG flags, symbmask_t mask, ArgInfos nonTrailingNamedArguments) => + new CMethodIterator(_pName, ContainingTypes, qualifyingType, context, arity, flags, mask, nonTrailingNamedArguments); } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MethodIterator.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MethodIterator.cs index 4e86ea7448..be5d2a5599 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MethodIterator.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MethodIterator.cs @@ -10,12 +10,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { internal partial class CMemberLookupResults { - public partial class CMethodIterator + public class CMethodIterator { - private readonly SymbolLoader _symbolLoader; - private readonly CSemanticChecker _semanticChecker; // Inputs. - private readonly AggregateDeclaration _context; + private readonly AggregateSymbol _context; private readonly TypeArray _containingTypes; private readonly CType _qualifyingType; private readonly Name _name; @@ -26,15 +24,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // Internal state. private int _currentTypeIndex; - public CMethodIterator(CSemanticChecker checker, SymbolLoader symLoader, Name name, TypeArray containingTypes, CType qualifyingType, AggregateDeclaration context, int arity, EXPRFLAG flags, symbmask_t mask, ArgInfos nonTrailingNamedArguments) + public CMethodIterator(Name name, TypeArray containingTypes, CType qualifyingType, AggregateSymbol context, int arity, EXPRFLAG flags, symbmask_t mask, ArgInfos nonTrailingNamedArguments) { Debug.Assert(name != null); - Debug.Assert(symLoader != null); - Debug.Assert(checker != null); Debug.Assert(containingTypes != null); Debug.Assert(containingTypes.Count != 0); - _semanticChecker = checker; - _symbolLoader = symLoader; + _name = name; _containingTypes = containingTypes; _qualifyingType = qualifyingType; @@ -87,7 +82,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } // Check access. If Sym is not accessible, then let it through and mark it. - IsCurrentSymbolInaccessible = !_semanticChecker.CheckAccess(CurrentSymbol, CurrentType, _context, _qualifyingType); + IsCurrentSymbolInaccessible = !CSemanticChecker.CheckAccess(CurrentSymbol, CurrentType, _context, _qualifyingType); // Check bogus. If Sym is bogus, then let it through and mark it. IsCurrentSymbolBogus = CSemanticChecker.CheckBogus(CurrentSymbol); @@ -104,7 +99,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (args != null) { List paramNames = ExpressionBinder.GroupToArgsBinder - .FindMostDerivedMethod(_symbolLoader, CurrentSymbol, _qualifyingType) + .FindMostDerivedMethod(CurrentSymbol, _qualifyingType) .ParameterNames; List argExpressions = args.prgexpr; @@ -129,8 +124,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics for (;;) { CurrentSymbol = (CurrentSymbol == null - ? _symbolLoader.LookupAggMember(_name, CurrentType.getAggregate(), _mask) - : SymbolLoader.LookupNextSym(CurrentSymbol, CurrentType.getAggregate(), _mask)) as MethodOrPropertySymbol; + ? SymbolLoader.LookupAggMember(_name, CurrentType.OwningAggregate, _mask) + : CurrentSymbol.LookupNext(_mask)) as MethodOrPropertySymbol; // If we couldn't find a sym, we look up the type chain and get the next type. if (CurrentSymbol == null) diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MethodTypeInferrer.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MethodTypeInferrer.cs index 5e70a5c7f6..01353f5a63 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MethodTypeInferrer.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MethodTypeInferrer.cs @@ -27,7 +27,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics DependsMask = 0x10, Indirect = 0x12 } - private readonly SymbolLoader _symbolLoader; + private readonly ExpressionBinder _binder; private readonly TypeArray _pMethodTypeParameters; private readonly TypeArray _pMethodFormalParameterTypes; @@ -81,7 +81,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics public static bool Infer( ExpressionBinder binder, - SymbolLoader symbolLoader, MethodSymbol pMethod, TypeArray pMethodFormalParameterTypes, ArgInfos pMethodArguments, @@ -99,9 +98,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Debug.Assert(pMethodFormalParameterTypes != null); Debug.Assert(pMethodArguments.carg <= pMethodFormalParameterTypes.Count); - var inferrer = new MethodTypeInferrer(binder, symbolLoader, - pMethodFormalParameterTypes, pMethodArguments, - pMethod.typeVars); + var inferrer = new MethodTypeInferrer( + binder, pMethodFormalParameterTypes, pMethodArguments, pMethod.typeVars); bool success = inferrer.InferTypeArgs(); ppInferredTypeArguments = inferrer.GetResults(); @@ -118,12 +116,9 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // SPEC: with an empty set of bounds. private MethodTypeInferrer( - ExpressionBinder exprBinder, SymbolLoader symLoader, - TypeArray pMethodFormalParameterTypes, ArgInfos pMethodArguments, - TypeArray pMethodTypeParameters) + ExpressionBinder exprBinder, TypeArray pMethodFormalParameterTypes, ArgInfos pMethodArguments, TypeArray pMethodTypeParameters) { _binder = exprBinder; - _symbolLoader = symLoader; _pMethodFormalParameterTypes = pMethodFormalParameterTypes; _pMethodArguments = pMethodArguments; _pMethodTypeParameters = pMethodTypeParameters; @@ -142,7 +137,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics //////////////////////////////////////////////////////////////////////////////// - private TypeArray GetResults() => GetGlobalSymbols().AllocParams(_pFixedResults); + private TypeArray GetResults() => TypeArray.Allocate(_pFixedResults); //////////////////////////////////////////////////////////////////////////////// @@ -158,8 +153,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics private bool IsUnfixed(TypeParameterType pParam) { Debug.Assert(pParam != null); - Debug.Assert(pParam.IsMethodTypeParameter()); - int iParam = pParam.GetIndexInTotalParameters(); + Debug.Assert(pParam.IsMethodTypeParameter); + int iParam = pParam.IndexInTotalParameters; Debug.Assert(_pMethodTypeParameters[iParam] == pParam); return IsUnfixed(iParam); } @@ -183,7 +178,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics private void AddLowerBound(TypeParameterType pParam, CType pBound) { Debug.Assert(IsUnfixed(pParam)); - int iParam = pParam.GetIndexInTotalParameters(); + int iParam = pParam.IndexInTotalParameters; if (!_pLowerBounds[iParam].Contains(pBound)) { _pLowerBounds[iParam].Add(pBound); @@ -195,7 +190,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics private void AddUpperBound(TypeParameterType pParam, CType pBound) { Debug.Assert(IsUnfixed(pParam)); - int iParam = pParam.GetIndexInTotalParameters(); + int iParam = pParam.IndexInTotalParameters; if (!_pUpperBounds[iParam].Contains(pBound)) { _pUpperBounds[iParam].Add(pBound); @@ -207,7 +202,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics private void AddExactBound(TypeParameterType pParam, CType pBound) { Debug.Assert(IsUnfixed(pParam)); - int iParam = pParam.GetIndexInTotalParameters(); + int iParam = pParam.IndexInTotalParameters; if (!_pExactBounds[iParam].Contains(pBound)) { _pExactBounds[iParam].Add(pBound); @@ -296,13 +291,15 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics bool wasOutOrRef = false; if (pDest is ParameterModifierType modDest) { - pDest = modDest.GetParameterType(); + pDest = modDest.ParameterType; wasOutOrRef = true; } + if (pSource is ParameterModifierType modSource) { - pSource = modSource.GetParameterType(); + pSource = modSource.ParameterType; } + // If the argument is a TYPEORNAMESPACEERROR and the pSource is an // error CType, then we want to set it to the generic error CType // that has no name text. This is because of the following scenario: @@ -796,7 +793,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // SPEC: for Xi. if (pDest is TypeParameterType pTPType) { - if (pTPType.IsMethodTypeParameter() && IsUnfixed(pTPType)) + if (pTPType.IsMethodTypeParameter && IsUnfixed(pTPType)) { AddExactBound(pTPType, pSource); return true; @@ -816,12 +813,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return false; } - if (pArraySource.rank != pArrayDest.rank || pArraySource.IsSZArray != pArrayDest.IsSZArray) + if (pArraySource.Rank != pArrayDest.Rank || pArraySource.IsSZArray != pArrayDest.IsSZArray) { return false; } - ExactInference(pArraySource.GetElementType(), pArrayDest.GetElementType()); + ExactInference(pArraySource.ElementType, pArrayDest.ElementType); return true; } @@ -836,7 +833,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return false; } - ExactInference(nubSource.GetUnderlyingType(), nubDest.GetUnderlyingType()); + ExactInference(nubSource.UnderlyingType, nubDest.UnderlyingType); return true; } @@ -849,7 +846,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // SPEC: is made from each Ui to the corresponding Vi. if (!(pSource is AggregateType pConstructedSource) || !(pDest is AggregateType pConstructedDest) - || pConstructedSource.GetOwningAggregate() != pConstructedDest.GetOwningAggregate()) + || pConstructedSource.OwningAggregate != pConstructedDest.OwningAggregate) { return false; } @@ -866,10 +863,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { Debug.Assert(pSource != null); Debug.Assert(pDest != null); - Debug.Assert(pSource.GetOwningAggregate() == pDest.GetOwningAggregate()); + Debug.Assert(pSource.OwningAggregate == pDest.OwningAggregate); - TypeArray pSourceArgs = pSource.GetTypeArgsAll(); - TypeArray pDestArgs = pDest.GetTypeArgsAll(); + TypeArray pSourceArgs = pSource.TypeArgsAll; + TypeArray pDestArgs = pDest.TypeArgsAll; Debug.Assert(pSourceArgs != null); Debug.Assert(pDestArgs != null); @@ -961,7 +958,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // SPEC: for Xi. if (pDest is TypeParameterType pTPType) { - if (pTPType.IsMethodTypeParameter() && IsUnfixed(pTPType)) + if (pTPType.IsMethodTypeParameter && IsUnfixed(pTPType)) { AddLowerBound(pTPType, pSource); return true; @@ -995,36 +992,37 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return false; } - CType pElementSource = pArraySource.GetElementType(); + CType pElementSource = pArraySource.ElementType; CType pElementDest; if (pDest is ArrayType pArrayDest) { - if (pArrayDest.rank != pArraySource.rank || pArrayDest.IsSZArray != pArraySource.IsSZArray) + if (pArrayDest.Rank != pArraySource.Rank || pArrayDest.IsSZArray != pArraySource.IsSZArray) { return false; } - pElementDest = pArrayDest.GetElementType(); + + pElementDest = pArrayDest.ElementType; } - else if (pDest.isPredefType(PredefinedType.PT_G_IENUMERABLE) || - pDest.isPredefType(PredefinedType.PT_G_ICOLLECTION) || - pDest.isPredefType(PredefinedType.PT_G_ILIST) || - pDest.isPredefType(PredefinedType.PT_G_IREADONLYCOLLECTION) || - pDest.isPredefType(PredefinedType.PT_G_IREADONLYLIST)) + else if (pDest.IsPredefType(PredefinedType.PT_G_IENUMERABLE) || + pDest.IsPredefType(PredefinedType.PT_G_ICOLLECTION) || + pDest.IsPredefType(PredefinedType.PT_G_ILIST) || + pDest.IsPredefType(PredefinedType.PT_G_IREADONLYCOLLECTION) || + pDest.IsPredefType(PredefinedType.PT_G_IREADONLYLIST)) { if (!pArraySource.IsSZArray) { return false; } AggregateType pAggregateDest = (AggregateType)pDest; - pElementDest = pAggregateDest.GetTypeArgsThis()[0]; + pElementDest = pAggregateDest.TypeArgsThis[0]; } else { return false; } - if (pElementSource.IsRefType()) + if (pElementSource.IsReferenceType) { LowerBoundInference(pElementSource, pElementDest); } @@ -1032,6 +1030,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { ExactInference(pElementSource, pElementDest); } + return true; } @@ -1051,7 +1050,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { return false; } - ExactInference(pSource, pDest.AsNullableType().GetUnderlyingType()); + ExactInference(pSource, pDest.AsNullableType().UnderlyingType); return true; } * */ @@ -1065,7 +1064,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return false; } - TypeArray pDestArgs = pConstructedDest.GetTypeArgsAll(); + TypeArray pDestArgs = pConstructedDest.TypeArgsAll; if (pDestArgs.Count == 0) { return false; @@ -1080,10 +1079,9 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // SPEC: lower bound inference or upper bound inference // SPEC: is made from each Ui to the corresponding Vi. - if (pSource is AggregateType aggSource && - aggSource.GetOwningAggregate() == pConstructedDest.GetOwningAggregate()) + if (pSource is AggregateType aggSource && aggSource.OwningAggregate == pConstructedDest.OwningAggregate) { - if (aggSource.isInterfaceType() || aggSource.isDelegateType()) + if (aggSource.IsInterfaceType || aggSource.IsDelegateType) { LowerBoundTypeArgumentInference(aggSource, pConstructedDest); } @@ -1091,6 +1089,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { ExactTypeArgumentInference(aggSource, pConstructedDest); } + return true; } @@ -1122,7 +1121,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics private bool LowerBoundClassInference(CType pSource, AggregateType pDest) { - if (!pDest.isClassType()) + if (!pDest.IsClassType) { return false; } @@ -1140,20 +1139,22 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics AggregateType pSourceBase = null; - if (pSource.isClassType()) + if (pSource.IsClassType) { - pSourceBase = (pSource as AggregateType).GetBaseClass(); + pSourceBase = (pSource as AggregateType).BaseClass; } while (pSourceBase != null) { - if (pSourceBase.GetOwningAggregate() == pDest.GetOwningAggregate()) + if (pSourceBase.OwningAggregate == pDest.OwningAggregate) { ExactTypeArgumentInference(pSourceBase, pDest); return true; } - pSourceBase = pSourceBase.GetBaseClass(); + + pSourceBase = pSourceBase.BaseClass; } + return false; } @@ -1161,7 +1162,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics private bool LowerBoundInterfaceInference(CType pSource, AggregateType pDest) { - if (!pDest.isInterfaceType()) + if (!pDest.IsInterfaceType) { return false; } @@ -1175,38 +1176,34 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics //TypeArray pInterfaces = null; - if (!pSource.isStructType() && !pSource.isClassType() && - !pSource.isInterfaceType() && !(pSource is TypeParameterType)) + if (pSource is AggregateType sourceAts && (sourceAts.IsStructType || sourceAts.IsClassType || sourceAts.IsInterfaceType)) { - return false; - } - - var interfaces = pSource.AllPossibleInterfaces(); - AggregateType pInterface = null; - foreach (AggregateType pCurrent in interfaces) - { - if (pCurrent.GetOwningAggregate() == pDest.GetOwningAggregate()) + AggregateType iface = null; + foreach (AggregateType current in sourceAts.IfacesAll.Items) { - if (pInterface == null) + if (current.OwningAggregate == pDest.OwningAggregate) { - pInterface = pCurrent; - } - else if (pInterface != pCurrent) - { - // Not unique. Bail out. - return false; + if (iface == null) + { + iface = current; + } + else if (iface != current) + { + // Not unique. Bail out. + return false; + } } } - } - if (pInterface == null) - { - return false; - } - LowerBoundTypeArgumentInference(pInterface, pDest); - return true; - } - //////////////////////////////////////////////////////////////////////////////// + if (iface != null) + { + LowerBoundTypeArgumentInference(iface, pDest); + return true; + } + } + + return false; + } private void LowerBoundTypeArgumentInference( AggregateType pSource, AggregateType pDest) @@ -1222,11 +1219,11 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Debug.Assert(pSource != null); Debug.Assert(pDest != null); - Debug.Assert(pSource.GetOwningAggregate() == pDest.GetOwningAggregate()); + Debug.Assert(pSource.OwningAggregate == pDest.OwningAggregate); - TypeArray pTypeParams = pSource.GetOwningAggregate().GetTypeVarsAll(); - TypeArray pSourceArgs = pSource.GetTypeArgsAll(); - TypeArray pDestArgs = pDest.GetTypeArgsAll(); + TypeArray pTypeParams = pSource.OwningAggregate.GetTypeVarsAll(); + TypeArray pSourceArgs = pSource.TypeArgsAll; + TypeArray pDestArgs = pDest.TypeArgsAll; Debug.Assert(pTypeParams != null); Debug.Assert(pSourceArgs != null); @@ -1241,18 +1238,22 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics CType pSourceArg = pSourceArgs[arg]; CType pDestArg = pDestArgs[arg]; - if (pSourceArg.IsRefType() && pTypeParam.Covariant) + if (pSourceArg.IsReferenceType) { - LowerBoundInference(pSourceArg, pDestArg); - } - else if (pSourceArg.IsRefType() && pTypeParam.Contravariant) - { - UpperBoundInference(pSourceArgs[arg], pDestArgs[arg]); - } - else - { - ExactInference(pSourceArgs[arg], pDestArgs[arg]); + if (pTypeParam.Covariant) + { + LowerBoundInference(pSourceArg, pDestArg); + continue; + } + + if (pTypeParam.Contravariant) + { + UpperBoundInference(pSourceArgs[arg], pDestArgs[arg]); + continue; + } } + + ExactInference(pSourceArgs[arg], pDestArgs[arg]); } } @@ -1310,7 +1311,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // SPEC: for Xi. if (pDest is TypeParameterType pTPType) { - if (pTPType.IsMethodTypeParameter() && IsUnfixed(pTPType)) + if (pTPType.IsMethodTypeParameter && IsUnfixed(pTPType)) { AddUpperBound(pTPType, pSource); return true; @@ -1336,36 +1337,37 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return false; } - CType pElementDest = pArrayDest.GetElementType(); + CType pElementDest = pArrayDest.ElementType; CType pElementSource; if (pSource is ArrayType pArraySource) { - if (pArrayDest.rank != pArraySource.rank || pArrayDest.IsSZArray != pArraySource.IsSZArray) + if (pArrayDest.Rank != pArraySource.Rank || pArrayDest.IsSZArray != pArraySource.IsSZArray) { return false; } - pElementSource = pArraySource.GetElementType(); + + pElementSource = pArraySource.ElementType; } - else if (pSource.isPredefType(PredefinedType.PT_G_IENUMERABLE) || - pSource.isPredefType(PredefinedType.PT_G_ICOLLECTION) || - pSource.isPredefType(PredefinedType.PT_G_ILIST) || - pSource.isPredefType(PredefinedType.PT_G_IREADONLYLIST) || - pSource.isPredefType(PredefinedType.PT_G_IREADONLYCOLLECTION)) + else if (pSource.IsPredefType(PredefinedType.PT_G_IENUMERABLE) || + pSource.IsPredefType(PredefinedType.PT_G_ICOLLECTION) || + pSource.IsPredefType(PredefinedType.PT_G_ILIST) || + pSource.IsPredefType(PredefinedType.PT_G_IREADONLYLIST) || + pSource.IsPredefType(PredefinedType.PT_G_IREADONLYCOLLECTION)) { if (!pArrayDest.IsSZArray) { return false; } AggregateType pAggregateSource = (AggregateType)pSource; - pElementSource = pAggregateSource.GetTypeArgsThis()[0]; + pElementSource = pAggregateSource.TypeArgsThis[0]; } else { return false; } - if (pElementSource.IsRefType()) + if (pElementSource.IsReferenceType) { UpperBoundInference(pElementSource, pElementDest); } @@ -1373,6 +1375,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { ExactInference(pElementSource, pElementDest); } + return true; } @@ -1385,7 +1388,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return false; } - TypeArray pSourceArgs = pConstructedSource.GetTypeArgsAll(); + TypeArray pSourceArgs = pConstructedSource.TypeArgsAll; if (pSourceArgs.Count == 0) { return false; @@ -1396,10 +1399,9 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // SPEC: lower bound inference or upper bound inference // SPEC: is made from each Ui to the corresponding Vi. - if (pDest is AggregateType aggDest && - pConstructedSource.GetOwningAggregate() == aggDest.GetOwningAggregate()) + if (pDest is AggregateType aggDest && pConstructedSource.OwningAggregate == aggDest.OwningAggregate) { - if (aggDest.isInterfaceType() || aggDest.isDelegateType()) + if (aggDest.IsInterfaceType || aggDest.IsDelegateType) { UpperBoundTypeArgumentInference(pConstructedSource, aggDest); } @@ -1407,6 +1409,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { ExactTypeArgumentInference(pConstructedSource, aggDest); } + return true; } @@ -1435,7 +1438,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics private bool UpperBoundClassInference(AggregateType pSource, CType pDest) { - if (!pSource.isClassType() || !pDest.isClassType()) + if (!pSource.IsClassType || !pDest.IsClassType) { return false; } @@ -1444,17 +1447,19 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // SPEC: inherits directly or indirectly from C then an exact // SPEC: inference is made from each Ui to the corresponding Vi. - AggregateType pDestBase = ((AggregateType)pDest).GetBaseClass(); + AggregateType pDestBase = ((AggregateType)pDest).BaseClass; while (pDestBase != null) { - if (pDestBase.GetOwningAggregate() == pSource.GetOwningAggregate()) + if (pDestBase.OwningAggregate == pSource.OwningAggregate) { ExactTypeArgumentInference(pSource, pDestBase); return true; } - pDestBase = pDestBase.GetBaseClass(); + + pDestBase = pDestBase.BaseClass; } + return false; } @@ -1462,7 +1467,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics private bool UpperBoundInterfaceInference(AggregateType pSource, CType pDest) { - if (!pSource.isInterfaceType()) + if (!pSource.IsInterfaceType) { return false; } @@ -1472,38 +1477,34 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // SPEC: or indirectly implements C then an exact ... // SPEC: ... and U is an interface CType ... - if (!pDest.isStructType() && !pDest.isClassType() && - !pDest.isInterfaceType()) + if (pDest is AggregateType destAts && (destAts.IsStructType || destAts.IsClassType || destAts.IsInterfaceType)) { - return false; - } - - var interfaces = pDest.AllPossibleInterfaces(); - AggregateType pInterface = null; - foreach (AggregateType pCurrent in interfaces) - { - if (pCurrent.GetOwningAggregate() == pSource.GetOwningAggregate()) + AggregateType iface = null; + foreach (AggregateType current in destAts.IfacesAll.Items) { - if (pInterface == null) + if (current.OwningAggregate == pSource.OwningAggregate) { - pInterface = pCurrent; - } - else if (pInterface != pCurrent) - { - // Not unique. Bail out. - return false; + if (iface == null) + { + iface = current; + } + else if (iface != current) + { + // Not unique. Bail out. + return false; + } } } - } - if (pInterface == null) - { - return false; - } - UpperBoundTypeArgumentInference(pInterface, pDest as AggregateType); - return true; - } - //////////////////////////////////////////////////////////////////////////////// + if (iface != null) + { + UpperBoundTypeArgumentInference(iface, pDest as AggregateType); + return true; + } + } + + return false; + } private void UpperBoundTypeArgumentInference( AggregateType pSource, AggregateType pDest) @@ -1519,11 +1520,11 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Debug.Assert(pSource != null); Debug.Assert(pDest != null); - Debug.Assert(pSource.GetOwningAggregate() == pDest.GetOwningAggregate()); + Debug.Assert(pSource.OwningAggregate == pDest.OwningAggregate); - TypeArray pTypeParams = pSource.GetOwningAggregate().GetTypeVarsAll(); - TypeArray pSourceArgs = pSource.GetTypeArgsAll(); - TypeArray pDestArgs = pDest.GetTypeArgsAll(); + TypeArray pTypeParams = pSource.OwningAggregate.GetTypeVarsAll(); + TypeArray pSourceArgs = pSource.TypeArgsAll; + TypeArray pDestArgs = pDest.TypeArgsAll; Debug.Assert(pTypeParams != null); Debug.Assert(pSourceArgs != null); @@ -1538,18 +1539,22 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics CType pSourceArg = pSourceArgs[arg]; CType pDestArg = pDestArgs[arg]; - if (pSourceArg.IsRefType() && pTypeParam.Covariant) + if (pSourceArg.IsReferenceType) { - UpperBoundInference(pSourceArg, pDestArg); - } - else if (pSourceArg.IsRefType() && pTypeParam.Contravariant) - { - LowerBoundInference(pSourceArgs[arg], pDestArgs[arg]); - } - else - { - ExactInference(pSourceArgs[arg], pDestArgs[arg]); + if (pTypeParam.Covariant) + { + UpperBoundInference(pSourceArg, pDestArg); + continue; + } + + if (pTypeParam.Contravariant) + { + LowerBoundInference(pSourceArgs[arg], pDestArgs[arg]); + continue; + } } + + ExactInference(pSourceArgs[arg], pDestArgs[arg]); } } @@ -1688,60 +1693,18 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // used to alter the types at the beginning of binding. that // way we get an accessible type, and if it so happens that // the selected type is inappropriate (for conversions) then - // we let overload resolution sort it out. + // we let overload resolution sort it out. // // since we can never infer ref/out or pointer types here, we - // are more or less guaranteed a best accessible type. However, - // in the interest of safety, if it becomes impossible to - // choose a "best accessible" type, then we will fail type - // inference so we do not try to pass the inaccessible type - // back to overload resolution. - - CType pBestAccessible; - if (GetTypeManager().GetBestAccessibleType(_binder.GetSemanticChecker(), _binder.GetContext(), pBest, out pBestAccessible)) - { - pBest = pBestAccessible; - } - else - { - Debug.Assert(false, "Method type inference could not find an accessible type over the best candidate in fixed"); - return false; - } + // are guaranteed a best accessible type. + _pFixedResults[iParam] = TypeManager.GetBestAccessibleType(_binder.Context.ContextForMemberLookup, pBest); // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // END RUNTIME BINDER ONLY CHANGE // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - _pFixedResults[iParam] = pBest; UpdateDependenciesAfterFix(iParam); return true; } - - //////////////////////////////////////////////////////////////////////////////// - // - // Helper methods - // - - //////////////////////////////////////////////////////////////////////////////// - - - private SymbolLoader GetSymbolLoader() - { - return _symbolLoader; - } - - //////////////////////////////////////////////////////////////////////////////// - - private TypeManager GetTypeManager() - { - return GetSymbolLoader().GetTypeManager(); - } - - //////////////////////////////////////////////////////////////////////////////// - - private BSYMMGR GetGlobalSymbols() - { - return GetSymbolLoader().getBSymmgr(); - } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Nullable.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Nullable.cs index 4c514fbe59..425e9102c4 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Nullable.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Nullable.cs @@ -3,29 +3,11 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; -using Microsoft.CSharp.RuntimeBinder.Errors; namespace Microsoft.CSharp.RuntimeBinder.Semantics { - internal sealed class CNullable + internal readonly partial struct ExpressionBinder { - private readonly SymbolLoader _pSymbolLoader; - private readonly ExprFactory _exprFactory; - private readonly ErrorHandling _pErrorContext; - - private SymbolLoader GetSymbolLoader() - { - return _pSymbolLoader; - } - private ExprFactory GetExprFactory() - { - return _exprFactory; - } - private ErrorHandling GetErrorContext() - { - return _pErrorContext; - } - private static bool IsNullableConstructor(Expr expr, out ExprCall call) { Debug.Assert(expr != null); @@ -41,7 +23,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return false; } - public static Expr StripNullableConstructor(Expr pExpr) + private static Expr StripNullableConstructor(Expr pExpr) { while (IsNullableConstructor(pExpr, out ExprCall call)) { @@ -52,75 +34,40 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return pExpr; } - // Value - public Expr BindValue(Expr exprSrc) + // Create an expr for exprSrc.Value where exprSrc.type is a NullableType. + private static Expr BindNubValue(Expr exprSrc) { Debug.Assert(exprSrc != null && exprSrc.Type is NullableType); // For new T?(x), the answer is x. if (IsNullableConstructor(exprSrc, out ExprCall call)) { - var args = call.OptionalArguments; + Expr args = call.OptionalArguments; Debug.Assert(args != null && !(args is ExprList)); return args; } NullableType nubSrc = (NullableType)exprSrc.Type; - CType typeBase = nubSrc.GetUnderlyingType(); + CType typeBase = nubSrc.UnderlyingType; AggregateType ats = nubSrc.GetAts(); - PropertySymbol prop = GetSymbolLoader().getBSymmgr().propNubValue; - if (prop == null) - { - prop = GetSymbolLoader().getPredefinedMembers().GetProperty(PREDEFPROP.PP_G_OPTIONAL_VALUE); - Debug.Assert(prop != null); - GetSymbolLoader().getBSymmgr().propNubValue = prop; - } - + PropertySymbol prop = PredefinedMembers.GetProperty(PREDEFPROP.PP_G_OPTIONAL_VALUE); PropWithType pwt = new PropWithType(prop, ats); MethPropWithInst mpwi = new MethPropWithInst(prop, ats); - ExprMemberGroup pMemGroup = GetExprFactory().CreateMemGroup(exprSrc, mpwi); - return GetExprFactory().CreateProperty(typeBase, null, null, pMemGroup, pwt, null); - } - - public ExprCall BindNew(Expr pExprSrc) - { - Debug.Assert(pExprSrc != null); - - NullableType pNubSourceType = GetSymbolLoader().GetTypeManager().GetNullable(pExprSrc.Type); - - AggregateType pSourceType = pNubSourceType.GetAts(); - MethodSymbol meth = GetSymbolLoader().getBSymmgr().methNubCtor; - if (meth == null) - { - meth = GetSymbolLoader().getPredefinedMembers().GetMethod(PREDEFMETH.PM_G_OPTIONAL_CTOR); - Debug.Assert(meth != null); - GetSymbolLoader().getBSymmgr().methNubCtor = meth; - } - - MethWithInst methwithinst = new MethWithInst(meth, pSourceType, BSYMMGR.EmptyTypeArray()); - ExprMemberGroup memgroup = GetExprFactory().CreateMemGroup(null, methwithinst); - return GetExprFactory().CreateCall(EXPRFLAG.EXF_NEWOBJCALL | EXPRFLAG.EXF_CANTBENULL, pNubSourceType, pExprSrc, memgroup, methwithinst); - } - public CNullable(SymbolLoader symbolLoader, ErrorHandling errorContext, ExprFactory exprFactory) - { - _pSymbolLoader = symbolLoader; - _pErrorContext = errorContext; - _exprFactory = exprFactory; - } - } - - internal sealed partial class ExpressionBinder - { - // Create an expr for exprSrc.Value where exprSrc.type is a NullableType. - private Expr BindNubValue(Expr exprSrc) - { - return m_nullable.BindValue(exprSrc); + ExprMemberGroup pMemGroup = ExprFactory.CreateMemGroup(exprSrc, mpwi); + return ExprFactory.CreateProperty(typeBase, null, null, pMemGroup, pwt, null); } // Create an expr for new T?(exprSrc) where T is exprSrc.type. - private ExprCall BindNubNew(Expr exprSrc) + private static ExprCall BindNubNew(Expr exprSrc) { - return m_nullable.BindNew(exprSrc); + Debug.Assert(exprSrc != null); + + NullableType pNubSourceType = TypeManager.GetNullable(exprSrc.Type); + AggregateType pSourceType = pNubSourceType.GetAts(); + MethodSymbol meth = PredefinedMembers.GetMethod(PREDEFMETH.PM_G_OPTIONAL_CTOR); + MethWithInst methwithinst = new MethWithInst(meth, pSourceType, TypeArray.Empty); + ExprMemberGroup memgroup = ExprFactory.CreateMemGroup(null, methwithinst); + return ExprFactory.CreateCall(EXPRFLAG.EXF_NEWOBJCALL | EXPRFLAG.EXF_CANTBENULL, pNubSourceType, exprSrc, memgroup, methwithinst); } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Operators.cs.REMOVED.git-id b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Operators.cs.REMOVED.git-id index 2607dd185d..726e60fe8f 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Operators.cs.REMOVED.git-id +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Operators.cs.REMOVED.git-id @@ -1 +1 @@ -5c0f280419f49460418080df8b75fd64f73476b1 \ No newline at end of file +ff6f1a66ae0225e517c60981d391768e7fe83dbd \ No newline at end of file diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/PredefinedMembers.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/PredefinedMembers.cs index 5c0d7b43cb..39a4c22ca2 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/PredefinedMembers.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/PredefinedMembers.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; -using Microsoft.CSharp.RuntimeBinder.Errors; using Microsoft.CSharp.RuntimeBinder.Syntax; namespace Microsoft.CSharp.RuntimeBinder.Semantics @@ -190,40 +189,22 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics this.name = name; this.getter = getter; } - }; + } // Loads and caches predefined members. // Also finds constructors on delegate types. - internal sealed class PredefinedMembers + internal static class PredefinedMembers { - private readonly SymbolLoader _loader; - internal SymbolTable RuntimeBinderSymbolTable; - private readonly MethodSymbol[] _methods = new MethodSymbol[(int)PREDEFMETH.PM_COUNT]; - private readonly PropertySymbol[] _properties = new PropertySymbol[(int)PREDEFPROP.PP_COUNT]; + private static readonly MethodSymbol[] _methods = new MethodSymbol[(int)PREDEFMETH.PM_COUNT]; + private static readonly PropertySymbol[] _properties = new PropertySymbol[(int)PREDEFPROP.PP_COUNT]; - private Name GetMethName(PREDEFMETH method) + private static PropertySymbol LoadProperty(PREDEFPROP property) { - return GetPredefName(GetMethPredefName(method)); + PredefinedPropertyInfo info = GetPropInfo(property); + return LoadProperty(property, NameManager.GetPredefinedName(info.name), info.getter); } - private AggregateSymbol GetMethParent(PREDEFMETH method) - { - return GetPredefAgg(GetMethPredefType(method)); - } - - private PropertySymbol LoadProperty(PREDEFPROP property) - { - return LoadProperty( - property, - GetPropName(property), - GetPropGetter(property)); - } - - private Name GetPropName(PREDEFPROP property) - { - return GetPredefName(GetPropPredefName(property)); - } - private PropertySymbol LoadProperty( + private static PropertySymbol LoadProperty( PREDEFPROP predefProp, Name propertyName, PREDEFMETH propertyGetter) @@ -231,7 +212,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Debug.Assert(propertyName != null); Debug.Assert(propertyGetter >= 0 && propertyGetter < PREDEFMETH.PM_COUNT); - RuntimeBinderSymbolTable.AddPredefinedPropertyToSymbolTable( + SymbolTable.AddPredefinedPropertyToSymbolTable( GetPredefAgg(GetPropPredefType(predefProp)), propertyName); MethodSymbol getter = GetMethod(propertyGetter); @@ -241,35 +222,9 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return property; } - private SymbolLoader GetSymbolLoader() - { - Debug.Assert(_loader != null); + private static AggregateSymbol GetPredefAgg(PredefinedType pt) => SymbolLoader.GetPredefAgg(pt); - return _loader; - } - private ErrorHandling GetErrorContext() - { - return GetSymbolLoader().GetErrorContext(); - } - private TypeManager GetTypeManager() - { - return GetSymbolLoader().GetTypeManager(); - } - private BSYMMGR getBSymmgr() - { - return GetSymbolLoader().getBSymmgr(); - } - - private Name GetPredefName(PredefinedName pn) - { - return NameManager.GetPredefinedName(pn); - } - private AggregateSymbol GetPredefAgg(PredefinedType pt) - { - return GetSymbolLoader().GetPredefAgg(pt); - } - - private CType LoadTypeFromSignature(int[] signature, ref int indexIntoSignatures, TypeArray classTyVars) + private static CType LoadTypeFromSignature(int[] signature, ref int indexIntoSignatures, TypeArray classTyVars) { Debug.Assert(signature != null); @@ -279,17 +234,16 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics switch (current) { case MethodSignatureEnum.SIG_SZ_ARRAY: - return GetTypeManager() - .GetArray(LoadTypeFromSignature(signature, ref indexIntoSignatures, classTyVars), 1, true); + return TypeManager.GetArray(LoadTypeFromSignature(signature, ref indexIntoSignatures, classTyVars), 1, true); case MethodSignatureEnum.SIG_METH_TYVAR: - return GetTypeManager().GetStdMethTypeVar(signature[indexIntoSignatures++]); + return TypeManager.GetStdMethTypeVar(signature[indexIntoSignatures++]); case MethodSignatureEnum.SIG_CLASS_TYVAR: return classTyVars[signature[indexIntoSignatures++]]; case (MethodSignatureEnum)PredefinedType.PT_VOID: - return GetTypeManager().GetVoid(); + return VoidType.Instance; default: Debug.Assert(current >= 0 && (int)current < (int)PredefinedType.PT_COUNT); @@ -297,7 +251,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics int typeCount = agg.GetTypeVars().Count; if (typeCount == 0) { - return GetTypeManager().GetAggregate(agg, BSYMMGR.EmptyTypeArray()); + return TypeManager.GetAggregate(agg, TypeArray.Empty); } CType[] typeArgs = new CType[typeCount]; @@ -306,11 +260,11 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics typeArgs[iTypeArg] = LoadTypeFromSignature(signature, ref indexIntoSignatures, classTyVars); } - return GetTypeManager().GetAggregate(agg, getBSymmgr().AllocParams(typeArgs)); + return TypeManager.GetAggregate(agg, TypeArray.Allocate(typeArgs)); } } - private TypeArray LoadTypeArrayFromSignature(int[] signature, ref int indexIntoSignatures, TypeArray classTyVars) + private static TypeArray LoadTypeArrayFromSignature(int[] signature, ref int indexIntoSignatures, TypeArray classTyVars) { Debug.Assert(signature != null); @@ -325,18 +279,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics ptypes[i] = LoadTypeFromSignature(signature, ref indexIntoSignatures, classTyVars); } - return getBSymmgr().AllocParams(count, ptypes); + return TypeArray.Allocate(ptypes); } - public PredefinedMembers(SymbolLoader loader) - { - _loader = loader; - Debug.Assert(_loader != null); - - _methods = new MethodSymbol[(int)PREDEFMETH.PM_COUNT]; - _properties = new PropertySymbol[(int)PREDEFPROP.PP_COUNT]; - #if DEBUG + static PredefinedMembers() + { // validate the tables for (int i = 0; i < (int)PREDEFMETH.PM_COUNT; i++) { @@ -346,22 +294,22 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { Debug.Assert((int)GetPropInfo((PREDEFPROP)i).property == i); } -#endif } +#endif - public PropertySymbol GetProperty(PREDEFPROP property) + public static PropertySymbol GetProperty(PREDEFPROP property) { Debug.Assert(property >= 0 && property < PREDEFPROP.PP_COUNT); return _properties[(int)property] ?? (_properties[(int)property] = LoadProperty(property)); } - public MethodSymbol GetMethod(PREDEFMETH method) + public static MethodSymbol GetMethod(PREDEFMETH method) { Debug.Assert(method >= 0 && method < PREDEFMETH.PM_COUNT); return _methods[(int)method] ?? (_methods[(int)method] = LoadMethod(method)); } - private MethodSymbol LoadMethod( + private static MethodSymbol LoadMethod( AggregateSymbol type, int[] signature, int cMethodTyVars, @@ -388,17 +336,17 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (ret == null) { - RuntimeBinderSymbolTable.AddPredefinedMethodToSymbolTable(type, methodName); + SymbolTable.AddPredefinedMethodToSymbolTable(type, methodName); ret = LookupMethodWhileLoading(type, cMethodTyVars, methodName, methodAccess, isStatic, isVirtual, returnType, argumentTypes); } return ret; } - private MethodSymbol LookupMethodWhileLoading(AggregateSymbol type, int cMethodTyVars, Name methodName, ACCESS methodAccess, bool isStatic, bool isVirtual, CType returnType, TypeArray argumentTypes) + private static MethodSymbol LookupMethodWhileLoading(AggregateSymbol type, int cMethodTyVars, Name methodName, ACCESS methodAccess, bool isStatic, bool isVirtual, CType returnType, TypeArray argumentTypes) { - for (Symbol sym = GetSymbolLoader().LookupAggMember(methodName, type, symbmask_t.MASK_ALL); + for (Symbol sym = SymbolLoader.LookupAggMember(methodName, type, symbmask_t.MASK_ALL); sym != null; - sym = SymbolLoader.LookupNextSym(sym, type, symbmask_t.MASK_ALL)) + sym = sym.LookupNext(symbmask_t.MASK_ALL)) { if (sym is MethodSymbol methsym) { @@ -406,9 +354,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics methsym.isStatic == isStatic && methsym.isVirtual == isVirtual && methsym.typeVars.Count == cMethodTyVars && - GetTypeManager().SubstEqualTypes(methsym.RetType, returnType, null, methsym.typeVars, SubstTypeFlags.DenormMeth) && - GetTypeManager().SubstEqualTypeArrays(methsym.Params, argumentTypes, (TypeArray)null, - methsym.typeVars, SubstTypeFlags.DenormMeth)) + TypeManager.SubstEqualTypes(methsym.RetType, returnType, null, methsym.typeVars, true) && + TypeManager.SubstEqualTypeArrays(methsym.Params, argumentTypes, null, methsym.typeVars)) { return methsym; } @@ -417,21 +364,17 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return null; } - private MethodSymbol LoadMethod(PREDEFMETH method) + private static MethodSymbol LoadMethod(PREDEFMETH method) { + PredefinedMethodInfo info = GetMethInfo(method); return LoadMethod( - GetMethParent(method), - GetMethSignature(method), - GetMethTyVars(method), - GetMethName(method), - GetMethAccess(method), - IsMethStatic(method), - IsMethVirtual(method)); - } - - private static PredefinedName GetPropPredefName(PREDEFPROP property) - { - return GetPropInfo(property).name; + GetPredefAgg(info.type), + info.signature, + info.cTypeVars, + NameManager.GetPredefinedName(info.name), + info.access, + info.callingConvention == MethodCallingConventionEnum.Static, + info.callingConvention == MethodCallingConventionEnum.Virtual); } private static PREDEFMETH GetPropGetter(PREDEFPROP property) @@ -471,41 +414,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return s_predefinedMethods[(int)method]; } - private static PredefinedName GetMethPredefName(PREDEFMETH method) - { - return GetMethInfo(method).name; - } - - private static PredefinedType GetMethPredefType(PREDEFMETH method) - { - return GetMethInfo(method).type; - } - - private static bool IsMethStatic(PREDEFMETH method) - { - return GetMethInfo(method).callingConvention == MethodCallingConventionEnum.Static; - } - - private static bool IsMethVirtual(PREDEFMETH method) - { - return GetMethInfo(method).callingConvention == MethodCallingConventionEnum.Virtual; - } - - private static ACCESS GetMethAccess(PREDEFMETH method) - { - return GetMethInfo(method).access; - } - - private static int GetMethTyVars(PREDEFMETH method) - { - return GetMethInfo(method).cTypeVars; - } - - private static int[] GetMethSignature(PREDEFMETH method) - { - return GetMethInfo(method).signature; - } - // the list of predefined method definitions. // This list must be in the same order as the PREDEFMETH enum. private static readonly PredefinedMethodInfo[] s_predefinedMethods = new PredefinedMethodInfo[(int)PREDEFMETH.PM_COUNT] { diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/SemanticChecker.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/SemanticChecker.cs index 1a8c941a44..1d30a8304c 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/SemanticChecker.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/SemanticChecker.cs @@ -18,21 +18,21 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // // Semantic check methods on SymbolLoader // - internal sealed class CSemanticChecker + internal static class CSemanticChecker { // Generate an error if CType is static. - public void CheckForStaticClass(Symbol symCtx, CType CType, ErrorCode err) + public static void CheckForStaticClass(CType type) { - if (CType.isStaticClass()) + if (type.IsStaticClass) { - throw ReportStaticClassError(symCtx, CType, err); + throw ErrorHandling.Error(ErrorCode.ERR_ConvertToStaticClass, type); } } - public ACCESSERROR CheckAccess2(Symbol symCheck, AggregateType atsCheck, Symbol symWhere, CType typeThru) + public static ACCESSERROR CheckAccess2(Symbol symCheck, AggregateType atsCheck, Symbol symWhere, CType typeThru) { Debug.Assert(symCheck != null); - Debug.Assert(atsCheck == null || symCheck.parent == atsCheck.getAggregate()); + Debug.Assert(atsCheck == null || symCheck.parent == atsCheck.OwningAggregate); Debug.Assert(typeThru == null || typeThru is AggregateType || typeThru is TypeParameterType || @@ -60,8 +60,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } // Check the accessibility of the return CType. - CType CType = symCheck.getType(); - if (CType == null) + CType type = symCheck.getType(); + if (type == null) { return ACCESSERROR.ACCESSERROR_NOERROR; } @@ -70,14 +70,15 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Debug.Assert(atsCheck != null); // Substitute on the CType. - if (atsCheck.GetTypeArgsAll().Count > 0) + if (atsCheck.TypeArgsAll.Count > 0) { - CType = SymbolLoader.GetTypeManager().SubstType(CType, atsCheck); + type = TypeManager.SubstType(type, atsCheck); } - return CheckTypeAccess(CType, symWhere) ? ACCESSERROR.ACCESSERROR_NOERROR : ACCESSERROR.ACCESSERROR_NOACCESS; + return CheckTypeAccess(type, symWhere) ? ACCESSERROR.ACCESSERROR_NOERROR : ACCESSERROR.ACCESSERROR_NOACCESS; } - public bool CheckTypeAccess(CType type, Symbol symWhere) + + public static bool CheckTypeAccess(CType type, Symbol symWhere) { Debug.Assert(type != null); @@ -92,15 +93,15 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics do { - if (ACCESSERROR.ACCESSERROR_NOERROR != CheckAccessCore(ats.GetOwningAggregate(), ats.outerType, symWhere, null)) + if (ACCESSERROR.ACCESSERROR_NOERROR != CheckAccessCore(ats.OwningAggregate, ats.OuterType, symWhere, null)) { return false; } - ats = ats.outerType; + ats = ats.OuterType; } while(ats != null); - TypeArray typeArgs = ((AggregateType)type).GetTypeArgsAll(); + TypeArray typeArgs = ((AggregateType)type).TypeArgsAll; for (int i = 0; i < typeArgs.Count; i++) { if (!CheckTypeAccess(typeArgs[i], symWhere)) @@ -110,36 +111,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return true; } - // Generates an error for static classes - public RuntimeBinderException ReportStaticClassError(Symbol symCtx, CType CType, ErrorCode err) => - ErrorContext.Error(err, symCtx != null ? new []{CType, new ErrArg(symCtx)} : new ErrArg[]{CType}); - - public SymbolLoader SymbolLoader { get; } = new SymbolLoader(); - - ///////////////////////////////////////////////////////////////////////////////// - // SymbolLoader forwarders (begin) - // - - public ErrorHandling ErrorContext => SymbolLoader.ErrorContext; - - public TypeManager GetTypeManager() { return SymbolLoader.GetTypeManager(); } - public BSYMMGR getBSymmgr() { return SymbolLoader.getBSymmgr(); } - public SymFactory GetGlobalSymbolFactory() { return SymbolLoader.GetGlobalSymbolFactory(); } - - //protected CompilerPhase GetCompPhase() { return SymbolLoader.CompPhase(); } - //protected void SetCompPhase(CompilerPhase compPhase) { SymbolLoader.compPhase = compPhase; } - public PredefinedTypes getPredefTypes() { return SymbolLoader.GetPredefindTypes(); } - // - // SymbolLoader forwarders (end) - ///////////////////////////////////////////////////////////////////////////////// - - // - // Utility methods - // - private ACCESSERROR CheckAccessCore(Symbol symCheck, AggregateType atsCheck, Symbol symWhere, CType typeThru) + private static ACCESSERROR CheckAccessCore(Symbol symCheck, AggregateType atsCheck, Symbol symWhere, CType typeThru) { Debug.Assert(symCheck != null); - Debug.Assert(atsCheck == null || symCheck.parent == atsCheck.getAggregate()); + Debug.Assert(atsCheck == null || symCheck.parent == atsCheck.OwningAggregate); Debug.Assert(typeThru == null || typeThru is AggregateType || typeThru is TypeParameterType || @@ -202,11 +177,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics aggWhere = aggSym; break; } - if (symT is AggregateDeclaration aggDec) - { - aggWhere = aggDec.Agg(); - break; - } } if (aggWhere == null) @@ -245,7 +215,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (typeThru != null && !symCheck.isStatic) { - atsThru = SymbolLoader.GetAggTypeSym(typeThru); + atsThru = typeThru.GetAts(); } // Look for aggCheck among the base classes of aggWhere and outer aggs. @@ -263,7 +233,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // agg or a CType derived from an instantiation of agg. In this case // all that matters is that agg is in the base AggregateSymbol chain of atsThru. The // actual AGGTYPESYMs involved don't matter. - if (atsThru == null || atsThru.getAggregate().FindBaseAgg(agg)) + if (atsThru == null || atsThru.OwningAggregate.FindBaseAgg(agg)) { return ACCESSERROR.ACCESSERROR_NOERROR; } @@ -275,25 +245,20 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return found ? ACCESSERROR.ACCESSERROR_NOACCESSTHRU : ACCESSERROR.ACCESSERROR_NOACCESS; } - public static bool CheckBogus(Symbol sym) - { - return (sym as PropertySymbol)?.Bogus ?? false; - } + public static bool CheckBogus(Symbol sym) => (sym as PropertySymbol)?.Bogus ?? false; - public RuntimeBinderException ReportAccessError(SymWithType swtBad, Symbol symWhere, CType typeQual) + public static RuntimeBinderException ReportAccessError(SymWithType swtBad, Symbol symWhere, CType typeQual) { Debug.Assert(!CheckAccess(swtBad.Sym, swtBad.GetType(), symWhere, typeQual) || !CheckTypeAccess(swtBad.GetType(), symWhere)); return CheckAccess2(swtBad.Sym, swtBad.GetType(), symWhere, typeQual) == ACCESSERROR.ACCESSERROR_NOACCESSTHRU - ? ErrorContext.Error(ErrorCode.ERR_BadProtectedAccess, swtBad, typeQual, symWhere) - : ErrorContext.Error(ErrorCode.ERR_BadAccess, swtBad); + ? ErrorHandling.Error(ErrorCode.ERR_BadProtectedAccess, swtBad, typeQual, symWhere) + : ErrorHandling.Error(ErrorCode.ERR_BadAccess, swtBad); } - public bool CheckAccess(Symbol symCheck, AggregateType atsCheck, Symbol symWhere, CType typeThru) - { - return CheckAccess2(symCheck, atsCheck, symWhere, typeThru) == ACCESSERROR.ACCESSERROR_NOERROR; - } + public static bool CheckAccess(Symbol symCheck, AggregateType atsCheck, Symbol symWhere, CType typeThru) => + CheckAccess2(symCheck, atsCheck, symWhere, typeThru) == ACCESSERROR.ACCESSERROR_NOERROR; } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/SubstitutionContext.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/SubstitutionContext.cs index 18768926c6..6422e9599e 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/SubstitutionContext.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/SubstitutionContext.cs @@ -6,95 +6,36 @@ using System; namespace Microsoft.CSharp.RuntimeBinder.Semantics { - // Used to specify whether and which type variables should be normalized. - [Flags] - internal enum SubstTypeFlags - { - NormNone = 0x00, - NormClass = 0x01, // Replace class type variables with the normalized (standard) ones. - NormMeth = 0x02, // Replace method type variables with the normalized (standard) ones. - NormAll = NormClass | NormMeth, - DenormClass = 0x04, // Replace normalized (standard) class type variables with the given class type args. - DenormMeth = 0x08, // Replace normalized (standard) method type variables with the given method type args. - DenormAll = DenormClass | DenormMeth, - NoRefOutDifference = 0x10 - } - internal sealed class SubstContext { - public CType[] prgtypeCls; - public int ctypeCls; - public CType[] prgtypeMeth; - public int ctypeMeth; - public SubstTypeFlags grfst; + public readonly CType[] ClassTypes; + public readonly CType[] MethodTypes; + public readonly bool DenormMeth; - public SubstContext(TypeArray typeArgsCls, TypeArray typeArgsMeth, SubstTypeFlags grfst) + public SubstContext(TypeArray typeArgsCls, TypeArray typeArgsMeth, bool denormMeth) { - Init(typeArgsCls, typeArgsMeth, grfst); + typeArgsCls?.AssertValid(); + ClassTypes = typeArgsCls?.Items ?? Array.Empty(); + typeArgsMeth?.AssertValid(); + MethodTypes = typeArgsMeth?.Items ?? Array.Empty(); + DenormMeth = denormMeth; } public SubstContext(AggregateType type) - : this(type, null, SubstTypeFlags.NormNone) + : this(type, null, false) { } public SubstContext(AggregateType type, TypeArray typeArgsMeth) - : this(type, typeArgsMeth, SubstTypeFlags.NormNone) + : this(type, typeArgsMeth, false) { } - private SubstContext(AggregateType type, TypeArray typeArgsMeth, SubstTypeFlags grfst) - { - Init(type?.GetTypeArgsAll(), typeArgsMeth, grfst); - } - - public SubstContext(CType[] prgtypeCls, int ctypeCls, CType[] prgtypeMeth, int ctypeMeth) - : this(prgtypeCls, ctypeCls, prgtypeMeth, ctypeMeth, SubstTypeFlags.NormNone) + private SubstContext(AggregateType type, TypeArray typeArgsMeth, bool denormMeth) + : this(type?.TypeArgsAll, typeArgsMeth, denormMeth) { } - private SubstContext(CType[] prgtypeCls, int ctypeCls, CType[] prgtypeMeth, int ctypeMeth, SubstTypeFlags grfst) - { - this.prgtypeCls = prgtypeCls; - this.ctypeCls = ctypeCls; - this.prgtypeMeth = prgtypeMeth; - this.ctypeMeth = ctypeMeth; - this.grfst = grfst; - } - - public bool FNop() - { - return 0 == ctypeCls && 0 == ctypeMeth && 0 == (grfst & SubstTypeFlags.NormAll); - } - - // Initializes a substitution context. Returns false iff no substitutions will ever be performed. - private void Init(TypeArray typeArgsCls, TypeArray typeArgsMeth, SubstTypeFlags grfst) - { - if (typeArgsCls != null) - { - typeArgsCls.AssertValid(); - ctypeCls = typeArgsCls.Count; - prgtypeCls = typeArgsCls.Items; - } - else - { - ctypeCls = 0; - prgtypeCls = null; - } - - if (typeArgsMeth != null) - { - typeArgsMeth.AssertValid(); - ctypeMeth = typeArgsMeth.Count; - prgtypeMeth = typeArgsMeth.Items; - } - else - { - ctypeMeth = 0; - prgtypeMeth = null; - } - - this.grfst = grfst; - } + public bool IsNop => ClassTypes.Length == 0 & MethodTypes.Length == 0; } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/AggregateSymbol.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/AggregateSymbol.cs index 68bebea493..8c6a189410 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/AggregateSymbol.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/AggregateSymbol.cs @@ -32,8 +32,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics private TypeArray _typeVarsThis; // Type variables for this generic class, as declarations. private TypeArray _typeVarsAll; // The type variables for this generic class and all containing classes. - private TypeManager _pTypeManager; // This is so AGGTYPESYMs can instantiate their baseClass and ifacesAll members on demand. - // First UD conversion operator. This chain is for this type only (not base types). // The hasConversion flag indicates whether this or any base types have UD conversions. private MethodSymbol _pConvFirst; @@ -78,7 +76,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics public AggregateSymbol GetBaseAgg() { - return _pBaseClass?.getAggregate(); + return _pBaseClass?.OwningAggregate; } public AggregateType getThisType() @@ -89,7 +87,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics AggregateType pOuterType = isNested() ? GetOuterAgg().getThisType() : null; - _atsInst = _pTypeManager.GetAggregate(this, pOuterType, GetTypeVars()); + _atsInst = TypeManager.GetAggregate(this, pOuterType, GetTypeVars()); } //Debug.Assert(GetTypeVars().Size == atsInst.GenericArguments.Count); @@ -223,16 +221,16 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics //////////////////////////////////////////////////////////////////////////////// - public bool HasConversion(SymbolLoader pLoader) + public bool HasConversion() { - pLoader.RuntimeBinderSymbolTable.AddConversionsForType(AssociatedSystemType); + SymbolTable.AddConversionsForType(AssociatedSystemType); if (!_hasConversion.HasValue) { // ok, we tried defining all the conversions, and we didn't get anything // for this type. However, we will still think this type has conversions // if it's base type has conversions. - _hasConversion = GetBaseAgg() != null && GetBaseAgg().HasConversion(pLoader); + _hasConversion = GetBaseAgg() != null && GetBaseAgg().HasConversion(); } return _hasConversion.Value; @@ -291,11 +289,11 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } else { - outerTypeVars = BSYMMGR.EmptyTypeArray(); + outerTypeVars = TypeArray.Empty; } _typeVarsThis = typeVars; - _typeVarsAll = _pTypeManager.ConcatenateTypeArrays(outerTypeVars, typeVars); + _typeVarsAll = TypeArray.Concat(outerTypeVars, typeVars); } } @@ -344,16 +342,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics _ifacesAll = ifacesAll; } - public TypeManager GetTypeManager() - { - return _pTypeManager; - } - - public void SetTypeManager(TypeManager typeManager) - { - _pTypeManager = typeManager; - } - public MethodSymbol GetFirstUDConversion() { return _pConvFirst; @@ -364,9 +352,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics _pConvFirst = conv; } - public bool InternalsVisibleTo(Assembly assembly) - { - return _pTypeManager.InternalsVisibleTo(AssociatedAssembly, assembly); - } + public bool InternalsVisibleTo(Assembly assembly) => TypeManager.InternalsVisibleTo(AssociatedAssembly, assembly); } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/FieldSymbol.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/FieldSymbol.cs index f8f72a97e1..996a1cc8d7 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/FieldSymbol.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/FieldSymbol.cs @@ -21,14 +21,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics public new bool isStatic; // Static member? public bool isReadOnly; // Can only be changed from within constructor. public bool isEvent; // This field is the implementation for an event. - - public bool isAssigned; // Has this ever been assigned by the user? - // Set if the field's ibit (for definite assignment checking) varies depending on the generic - // instantiation of the containing type. For example: - // struct S { T x; int y; } - // The ibit value for y depends on what T is bound to. For S, y's ibit is 2. For S, y's - // ibit is 1. This flag is set the first time a calculated ibit for the member is found to not - // match the return result of GetIbitInst(). public FieldInfo AssociatedFieldInfo; // If fixedAgg is non-null, the ant of the fixed buffer length @@ -45,10 +37,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics public AggregateSymbol getClass() => parent as AggregateSymbol; - public EventSymbol getEvent(SymbolLoader symbolLoader) + public EventSymbol getEvent() { Debug.Assert(isEvent); - return symbolLoader.LookupAggMember(name, getClass(), symbmask_t.MASK_EventSymbol) as EventSymbol; + return SymbolLoader.LookupAggMember(name, getClass(), symbmask_t.MASK_EventSymbol) as EventSymbol; } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/MethodSymbol.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/MethodSymbol.cs index 6745b9af16..95f374bb21 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/MethodSymbol.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/MethodSymbol.cs @@ -62,10 +62,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return false; } - public MethodKindEnum MethKind() - { - return _methKind; - } + public MethodKindEnum MethKind => _methKind; public bool IsConstructor() { @@ -80,11 +77,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics IsConstructor(); } - public bool IsDestructor() // Is a destructor - { - return _methKind == MethodKindEnum.Destructor; - } - public bool isPropertyAccessor() // true if this method is a property set or get method { return _methKind == MethodKindEnum.PropAccessor; @@ -95,21 +87,11 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return _methKind == MethodKindEnum.EventAccessor; } - private bool isExplicit() // is user defined explicit conversion operator - { - return _methKind == MethodKindEnum.ExplicitConv; - } - public bool isImplicit() // is user defined implicit conversion operator { return _methKind == MethodKindEnum.ImplicitConv; } - public bool isInvoke() // Invoke method on a delegate - isn't user callable - { - return _methKind == MethodKindEnum.Invoke; - } - public void SetMethKind(MethodKindEnum mk) { _methKind = mk; @@ -117,14 +99,14 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics public MethodSymbol ConvNext() { - Debug.Assert(isImplicit() || isExplicit()); + AssertIsConversionOperator(); return _convNext; } public void SetConvNext(MethodSymbol conv) { - Debug.Assert(isImplicit() || isExplicit()); - Debug.Assert(conv == null || conv.isImplicit() || conv.isExplicit()); + AssertIsConversionOperator(); + conv?.AssertIsConversionOperator(); _convNext = conv; } @@ -152,9 +134,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics _evt = evt; } - public bool isConversionOperator() + [Conditional("DEBUG")] + private void AssertIsConversionOperator() { - return (isExplicit() || isImplicit()); + Debug.Assert(MethKind == MethodKindEnum.ExplicitConv || MethKind == MethodKindEnum.ImplicitConv); } public new bool isUserCallable() diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/NamespaceOrAggregateSymbol.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/NamespaceOrAggregateSymbol.cs index 2f9a029fcf..d1d235fc4d 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/NamespaceOrAggregateSymbol.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/NamespaceOrAggregateSymbol.cs @@ -16,46 +16,5 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics internal abstract class NamespaceOrAggregateSymbol : ParentSymbol { - private AggregateDeclaration _declFirst; - private AggregateDeclaration _declLast; - - // ---------------------------------------------------------------------------- - // NamespaceOrAggregateSymbol - // ---------------------------------------------------------------------------- - - // Compare to ParentSymbol::AddToChildList - public void AddDecl(AggregateDeclaration decl) - { - Debug.Assert(decl != null); - Debug.Assert(this is AggregateSymbol); - Debug.Assert(decl is AggregateDeclaration); - - // If parent is set it should be set to us! - Debug.Assert(decl.bag == null || decl.bag == this); - // There shouldn't be a declNext. - Debug.Assert(decl.declNext == null); - - if (_declLast == null) - { - Debug.Assert(_declFirst == null); - _declFirst = _declLast = decl; - } - else - { - _declLast.declNext = decl; - _declLast = decl; - -#if DEBUG - // Validate our chain. - AggregateDeclaration pdecl; - for (pdecl = _declFirst; pdecl?.declNext != null; pdecl = pdecl.declNext) - { } - Debug.Assert(pdecl == null || (pdecl == _declLast && pdecl.declNext == null)); -#endif - } - - decl.declNext = null; - decl.bag = this; - } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymFactory.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymFactory.cs index e684b73e48..a59b513efe 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymFactory.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymFactory.cs @@ -7,16 +7,9 @@ using Microsoft.CSharp.RuntimeBinder.Syntax; namespace Microsoft.CSharp.RuntimeBinder.Semantics { - internal sealed class SymFactory + internal static class SymFactory { - private readonly SYMTBL _symbolTable; - - public SymFactory(SYMTBL symtable) - { - _symbolTable = symtable; - } - - private Symbol NewBasicSymbol( + private static Symbol NewBasicSymbol( SYMKIND kind, Name name, ParentSymbol parent) @@ -32,10 +25,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics sym = new AggregateSymbol(); sym.name = name; break; - case SYMKIND.SK_AggregateDeclaration: - sym = new AggregateDeclaration(); - sym.name = name; - break; case SYMKIND.SK_TypeParameterSymbol: sym = new TypeParameterSymbol(); sym.name = name; @@ -78,32 +67,29 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { // Set the parent element of the child symbol. parent.AddToChildList(sym); - _symbolTable.InsertChild(parent, sym); + SymbolStore.InsertChild(parent, sym); } - return (sym); + return sym; } // Namespace - public NamespaceSymbol CreateNamespace(Name name, NamespaceSymbol parent) + public static NamespaceSymbol CreateNamespace(Name name, NamespaceSymbol parent) { NamespaceSymbol sym = (NamespaceSymbol)NewBasicSymbol(SYMKIND.SK_NamespaceSymbol, name, parent); sym.SetAccess(ACCESS.ACC_PUBLIC); - return (sym); + return sym; } ///////////////////////////////////////////////////////////////////////////////// - public AggregateSymbol CreateAggregate(Name name, NamespaceOrAggregateSymbol parent, TypeManager typeManager) + public static AggregateSymbol CreateAggregate(Name name, NamespaceOrAggregateSymbol parent) { - if (name == null || parent == null || typeManager == null) - { - throw Error.InternalCompilerError(); - } + Debug.Assert(name != null); + Debug.Assert(parent != null); AggregateSymbol sym = (AggregateSymbol)NewBasicSymbol(SYMKIND.SK_AggregateSymbol, name, parent); sym.name = name; - sym.SetTypeManager(typeManager); sym.SetSealed(false); sym.SetAccess(ACCESS.ACC_UNKNOWN); sym.SetIfaces(null); @@ -113,33 +99,18 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return sym; } - public AggregateDeclaration CreateAggregateDecl(AggregateSymbol agg, AggregateDeclaration declOuter) - { - Debug.Assert(agg != null); - //Debug.Assert(declOuter == null || declOuter.Bag() == agg.Parent); - - // DECLSYMs are not parented like named symbols. - AggregateDeclaration sym = NewBasicSymbol(SYMKIND.SK_AggregateDeclaration, agg.name, null) as AggregateDeclaration; - - declOuter?.AddToChildList(sym); - agg.AddDecl(sym); - - Debug.Assert(sym != null); - return (sym); - } - // Members of aggs - public FieldSymbol CreateMemberVar(Name name, AggregateSymbol parent) + public static FieldSymbol CreateMemberVar(Name name, AggregateSymbol parent) { Debug.Assert(name != null); FieldSymbol sym = NewBasicSymbol(SYMKIND.SK_FieldSymbol, name, parent) as FieldSymbol; Debug.Assert(sym != null); - return (sym); + return sym; } - public LocalVariableSymbol CreateLocalVar(Name name, Scope parent, CType type) + public static LocalVariableSymbol CreateLocalVar(Name name, Scope parent, CType type) { LocalVariableSymbol sym = (LocalVariableSymbol)NewBasicSymbol(SYMKIND.SK_LocalVariableSymbol, name, parent); sym.SetType(type); @@ -149,25 +120,25 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return sym; } - public MethodSymbol CreateMethod(Name name, AggregateSymbol parent) => + public static MethodSymbol CreateMethod(Name name, AggregateSymbol parent) => NewBasicSymbol(SYMKIND.SK_MethodSymbol, name, parent) as MethodSymbol; - public PropertySymbol CreateProperty(Name name, AggregateSymbol parent) + public static PropertySymbol CreateProperty(Name name, AggregateSymbol parent) { PropertySymbol sym = NewBasicSymbol(SYMKIND.SK_PropertySymbol, name, parent) as PropertySymbol; Debug.Assert(sym != null); - return (sym); + return sym; } - public EventSymbol CreateEvent(Name name, AggregateSymbol parent) + public static EventSymbol CreateEvent(Name name, AggregateSymbol parent) { EventSymbol sym = NewBasicSymbol(SYMKIND.SK_EventSymbol, name, parent) as EventSymbol; Debug.Assert(sym != null); - return (sym); + return sym; } - public TypeParameterSymbol CreateMethodTypeParameter(Name pName, MethodSymbol pParent, int index, int indexTotal) + public static TypeParameterSymbol CreateMethodTypeParameter(Name pName, MethodSymbol pParent, int index, int indexTotal) { TypeParameterSymbol pResult = (TypeParameterSymbol)NewBasicSymbol(SYMKIND.SK_TypeParameterSymbol, pName, pParent); pResult.SetIndexInOwnParameters(index); @@ -179,7 +150,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return pResult; } - public TypeParameterSymbol CreateClassTypeParameter(Name pName, AggregateSymbol pParent, int index, int indexTotal) + public static TypeParameterSymbol CreateClassTypeParameter(Name pName, AggregateSymbol pParent, int index, int indexTotal) { TypeParameterSymbol pResult = (TypeParameterSymbol)NewBasicSymbol(SYMKIND.SK_TypeParameterSymbol, pName, pParent); pResult.SetIndexInOwnParameters(index); @@ -191,9 +162,9 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return pResult; } - public Scope CreateScope() => (Scope)NewBasicSymbol(SYMKIND.SK_Scope, null, null); + public static Scope CreateScope() => (Scope)NewBasicSymbol(SYMKIND.SK_Scope, null, null); - public IndexerSymbol CreateIndexer(Name name, ParentSymbol parent, Name realName) + public static IndexerSymbol CreateIndexer(Name name, ParentSymbol parent) { IndexerSymbol sym = (IndexerSymbol)NewBasicSymbol(SYMKIND.SK_IndexerSymbol, name, parent); sym.setKind(SYMKIND.SK_PropertySymbol); diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/Symbol.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/Symbol.cs index e9f0380145..6686640d4b 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/Symbol.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/Symbol.cs @@ -68,6 +68,19 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics public Symbol nextChild; // next child of this parent public Symbol nextSameName; // next child of this parent with same name. + public Symbol LookupNext(symbmask_t kindmask) + { + // Keep traversing the list of symbols with same name and parent. + for (Symbol sym = nextSameName; sym != null; sym = sym.nextSameName) + { + if ((kindmask & sym.mask()) != 0) + { + return sym; + } + } + + return null; + } public ACCESS GetAccess() { @@ -149,10 +162,9 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics case SYMKIND.SK_TypeParameterSymbol: return ((AggregateSymbol)parent).AssociatedAssembly; - case SYMKIND.SK_AggregateDeclaration: - return ((AggregateDeclaration)this).GetAssembly(); case SYMKIND.SK_AggregateSymbol: return ((AggregateSymbol)this).AssociatedAssembly; + default: // Should never call this with any other kind. Debug.Assert(false, "GetAssemblyID called on bad sym kind"); @@ -174,8 +186,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics case SYMKIND.SK_TypeParameterSymbol: return ((AggregateSymbol)parent).InternalsVisibleTo(assembly); - case SYMKIND.SK_AggregateDeclaration: - return ((AggregateDeclaration)this).Agg().InternalsVisibleTo(assembly); case SYMKIND.SK_AggregateSymbol: return ((AggregateSymbol)this).InternalsVisibleTo(assembly); default: @@ -191,28 +201,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return assem == sym.GetAssembly() || sym.InternalsVisibleTo(assem); } - /* Returns if the symbol is virtual. */ - public bool IsVirtual() - { - switch (_kind) - { - case SYMKIND.SK_MethodSymbol: - return ((MethodSymbol)this).isVirtual; - - case SYMKIND.SK_EventSymbol: - MethodSymbol methAdd = ((EventSymbol)this).methAdd; - return methAdd != null && methAdd.isVirtual; - - case SYMKIND.SK_PropertySymbol: - PropertySymbol prop = ((PropertySymbol)this); - MethodSymbol meth = prop.GetterMethod ?? prop.SetterMethod; - return meth != null && meth.isVirtual; - - default: - return false; - } - } - public bool IsOverride() { switch (_kind) diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolKind.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolKind.cs index a512d7ab0d..57bc070885 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolKind.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolKind.cs @@ -8,7 +8,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { SK_NamespaceSymbol, SK_AggregateSymbol, - SK_AggregateDeclaration, SK_TypeParameterSymbol, SK_FieldSymbol, SK_LocalVariableSymbol, diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolLoader.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolLoader.cs index 103678206c..cc441dbc4e 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolLoader.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolLoader.cs @@ -3,133 +3,35 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; -using Microsoft.CSharp.RuntimeBinder.Errors; using Microsoft.CSharp.RuntimeBinder.Syntax; namespace Microsoft.CSharp.RuntimeBinder.Semantics { - internal sealed class SymbolLoader + internal static class SymbolLoader { - private PredefinedMembers PredefinedMembers { get; } - private GlobalSymbolContext GlobalSymbolContext { get; } - public ErrorHandling ErrorContext { get; } - public SymbolTable RuntimeBinderSymbolTable { get; private set; } + public static AggregateSymbol GetPredefAgg(PredefinedType pt) => TypeManager.GetPredefAgg(pt); - public SymbolLoader() - { - GlobalSymbolContext globalSymbols = new GlobalSymbolContext(); - PredefinedMembers = new PredefinedMembers(this); - ErrorContext = new ErrorHandling(globalSymbols); - GlobalSymbolContext = globalSymbols; - Debug.Assert(GlobalSymbolContext != null); - } + public static AggregateType GetPredefindType(PredefinedType pt) => GetPredefAgg(pt).getThisType(); - public ErrorHandling GetErrorContext() - { - return ErrorContext; - } - - public GlobalSymbolContext GetGlobalSymbolContext() - { - return GlobalSymbolContext; - } - - public MethodSymbol LookupInvokeMeth(AggregateSymbol pAggDel) - { - Debug.Assert(pAggDel.AggKind() == AggKindEnum.Delegate); - for (Symbol pSym = LookupAggMember(NameManager.GetPredefinedName(PredefinedName.PN_INVOKE), pAggDel, symbmask_t.MASK_ALL); - pSym != null; - pSym = LookupNextSym(pSym, pAggDel, symbmask_t.MASK_ALL)) - { - if (pSym is MethodSymbol meth && meth.isInvoke()) - { - return meth; - } - } - return null; - } - - public PredefinedTypes GetPredefindTypes() - { - return GlobalSymbolContext.GetPredefTypes(); - } - - public TypeManager GetTypeManager() - { - return TypeManager; - } - - public TypeManager TypeManager - { - get { return GlobalSymbolContext.TypeManager; } - } - - public PredefinedMembers getPredefinedMembers() - { - return PredefinedMembers; - } - - public BSYMMGR getBSymmgr() - { - return GlobalSymbolContext.GetGlobalSymbols(); - } - - public SymFactory GetGlobalSymbolFactory() - { - return GlobalSymbolContext.GetGlobalSymbolFactory(); - } - - public AggregateSymbol GetPredefAgg(PredefinedType pt) => GetTypeManager().GetPredefAgg(pt); - - public AggregateType GetPredefindType(PredefinedType pt) => GetPredefAgg(pt).getThisType(); - - public Symbol LookupAggMember(Name name, AggregateSymbol agg, symbmask_t mask) - { - return getBSymmgr().LookupAggMember(name, agg, mask); - } - - public static Symbol LookupNextSym(Symbol sym, ParentSymbol parent, symbmask_t kindmask) - => BSYMMGR.LookupNextSym(sym, parent, kindmask); - - // It would be nice to make this a virtual method on typeSym. - public AggregateType GetAggTypeSym(CType typeSym) - { - Debug.Assert(typeSym != null); - Debug.Assert(typeSym is AggregateType || - typeSym is ArrayType || - typeSym is NullableType); - - switch (typeSym.GetTypeKind()) - { - case TypeKind.TK_AggregateType: - return (AggregateType)typeSym; - case TypeKind.TK_ArrayType: - return GetPredefindType(PredefinedType.PT_ARRAY); - case TypeKind.TK_NullableType: - return ((NullableType)typeSym).GetAts(); - } - Debug.Assert(false, "Bad typeSym!"); - return null; - } + public static Symbol LookupAggMember(Name name, AggregateSymbol agg, symbmask_t mask) => SymbolStore.LookupSym(name, agg, mask); private static bool IsBaseInterface(AggregateType atsDer, AggregateType pBase) { Debug.Assert(atsDer != null); Debug.Assert(pBase != null); - if (pBase.isInterfaceType()) + if (pBase.IsInterfaceType) { while (atsDer != null) { - TypeArray ifacesAll = atsDer.GetIfacesAll(); - for (int i = 0; i < ifacesAll.Count; i++) + foreach (CType iface in atsDer.IfacesAll.Items) { - if (AreTypesEqualForConversion(ifacesAll[i], pBase)) + if (AreTypesEqualForConversion(iface, pBase)) { return true; } } - atsDer = atsDer.GetBaseClass(); + atsDer = atsDer.BaseClass; } } @@ -141,13 +43,9 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Debug.Assert(pDerived != null); Debug.Assert(pBase != null); - // This checks to see whether derived is a class, and if so, + // This checks to see whether derived is a class, and if so, // if base is a base class of derived. - if (!pDerived.isClassType()) - { - return false; - } - return IsBaseClass(pDerived, pBase); + return pDerived.IsClassType && IsBaseClass(pDerived, pBase); } private static bool IsBaseClass(CType pDerived, CType pBase) @@ -156,44 +54,49 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Debug.Assert(pBase != null); // A base class has got to be a class. The derived type might be a struct. - if (!(pBase is AggregateType atsBase && atsBase.isClassType())) + if (!(pBase is AggregateType atsBase && atsBase.IsClassType)) { return false; } - if (pDerived is NullableType derivedNub) - { - pDerived = derivedNub.GetAts(); - } if (!(pDerived is AggregateType atsDer)) { - return false; + if (pDerived is NullableType derivedNub) + { + atsDer = derivedNub.GetAts(); + } + else + { + return false; + } } - AggregateType atsCur = atsDer.GetBaseClass(); + AggregateType atsCur = atsDer.BaseClass; while (atsCur != null) { if (atsCur == atsBase) { return true; } - atsCur = atsCur.GetBaseClass(); + + atsCur = atsCur.BaseClass; } + return false; } - private bool HasCovariantArrayConversion(ArrayType pSource, ArrayType pDest) + private static bool HasCovariantArrayConversion(ArrayType pSource, ArrayType pDest) { Debug.Assert(pSource != null); Debug.Assert(pDest != null); // * S and T differ only in element type. In other words, S and T have the same number of dimensions. // * Both SE and TE are reference types. // * An implicit reference conversion exists from SE to TE. - return (pSource.rank == pDest.rank) && pSource.IsSZArray == pDest.IsSZArray && - HasImplicitReferenceConversion(pSource.GetElementType(), pDest.GetElementType()); + return pSource.Rank == pDest.Rank && pSource.IsSZArray == pDest.IsSZArray && + HasImplicitReferenceConversion(pSource.ElementType, pDest.ElementType); } - public bool HasIdentityOrImplicitReferenceConversion(CType pSource, CType pDest) + public static bool HasIdentityOrImplicitReferenceConversion(CType pSource, CType pDest) { Debug.Assert(pSource != null); Debug.Assert(pDest != null); @@ -207,15 +110,11 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics private static bool AreTypesEqualForConversion(CType pType1, CType pType2) => pType1.Equals(pType2); - private bool HasArrayConversionToInterface(ArrayType pSource, CType pDest) + private static bool HasArrayConversionToInterface(ArrayType pSource, CType pDest) { Debug.Assert(pSource != null); Debug.Assert(pDest != null); - if (!pSource.IsSZArray) - { - return false; - } - if (!pDest.isInterfaceType()) + if (!pSource.IsSZArray || !pDest.IsInterfaceType) { return false; } @@ -231,13 +130,13 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // * The base interface of IReadOnlyList is IReadOnlyCollection. // * The base interface of IReadOnlyCollection is IEnumerable. - if (pDest.isPredefType(PredefinedType.PT_IENUMERABLE)) + if (pDest.IsPredefType(PredefinedType.PT_IENUMERABLE)) { return true; } AggregateType atsDest = (AggregateType)pDest; - AggregateSymbol aggDest = atsDest.getAggregate(); + AggregateSymbol aggDest = atsDest.OwningAggregate; if (!aggDest.isPredefAgg(PredefinedType.PT_G_ILIST) && !aggDest.isPredefAgg(PredefinedType.PT_G_ICOLLECTION) && !aggDest.isPredefAgg(PredefinedType.PT_G_IENUMERABLE) && @@ -247,14 +146,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return false; } - Debug.Assert(atsDest.GetTypeArgsAll().Count == 1); + Debug.Assert(atsDest.TypeArgsAll.Count == 1); - CType pSourceElement = pSource.GetElementType(); - CType pDestTypeArgument = atsDest.GetTypeArgsAll()[0]; - return HasIdentityOrImplicitReferenceConversion(pSourceElement, pDestTypeArgument); + return HasIdentityOrImplicitReferenceConversion(pSource.ElementType, atsDest.TypeArgsAll[0]); } - private bool HasImplicitReferenceConversion(CType pSource, CType pDest) + private static bool HasImplicitReferenceConversion(CType pSource, CType pDest) { Debug.Assert(pSource != null); Debug.Assert(pDest != null); @@ -262,7 +159,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // The implicit reference conversions are: // * From any reference type to Object. - if (pSource.IsRefType() && pDest.isPredefType(PredefinedType.PT_OBJECT)) + if (pSource.IsReferenceType && pDest.IsPredefType(PredefinedType.PT_OBJECT)) { return true; } @@ -271,10 +168,10 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { if (pDest is AggregateType aggDest) { - switch (aggSource.GetOwningAggregate().AggKind()) + switch (aggSource.OwningAggregate.AggKind()) { case AggKindEnum.Class: - switch (aggDest.GetOwningAggregate().AggKind()) + switch (aggDest.OwningAggregate.AggKind()) { case AggKindEnum.Class: // * From any class type S to any class type T provided S is derived from T. @@ -298,7 +195,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // convertible to T. // * From any interface type S to any interface type T provided S implements an interface // convertible to T. - // * From any interface type S to any interface type T provided S is not T and S is + // * From any interface type S to any interface type T provided S is not T and S is // an interface convertible to T. return HasAnyBaseInterfaceConversion(aggSource, aggDest); @@ -307,10 +204,9 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics break; case AggKindEnum.Interface: - if (aggDest.isInterfaceType()) + if (aggDest.IsInterfaceType) { - return HasAnyBaseInterfaceConversion(aggSource, aggDest) - || HasInterfaceConversion(aggSource, aggDest); + return HasAnyBaseInterfaceConversion(aggSource, aggDest) || HasInterfaceConversion(aggSource, aggDest); } break; @@ -322,11 +218,11 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // // The spec should actually say // - // * From any delegate type to System.Delegate + // * From any delegate type to System.Delegate // * From any delegate type to System.MulticastDelegate // * From any delegate type to any interface implemented by System.MulticastDelegate - if (aggDest.isPredefType(PredefinedType.PT_MULTIDEL) - || aggDest.isPredefType(PredefinedType.PT_DELEGATE) || IsBaseInterface( + if (aggDest.IsPredefType(PredefinedType.PT_MULTIDEL) + || aggDest.IsPredefType(PredefinedType.PT_DELEGATE) || IsBaseInterface( GetPredefindType(PredefinedType.PT_MULTIDEL), aggDest)) { return true; @@ -335,7 +231,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // VARIANCE EXTENSION: // * From any delegate type S to a delegate type T provided S is not T and // S is a delegate convertible to T - return pDest.isDelegateType() && HasDelegateConversion(aggSource, aggDest); + return pDest.IsDelegateType && HasDelegateConversion(aggSource, aggDest); } } } @@ -354,7 +250,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (pDest is AggregateType aggDest) { // * From any array type to System.Array or any interface implemented by System.Array. - if (aggDest.isPredefType(PredefinedType.PT_ARRAY) + if (aggDest.IsPredefType(PredefinedType.PT_ARRAY) || IsBaseInterface(GetPredefindType(PredefinedType.PT_ARRAY), aggDest)) { return true; @@ -375,19 +271,15 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // implementations have a "null type" which some expressions other than the // null literal may have. (For example, (null??null), which is also an // extension to the specification.) - return pDest.IsRefType() || pDest is NullableType; + return pDest.IsReferenceType || pDest is NullableType; } return false; } - private bool HasAnyBaseInterfaceConversion(CType pDerived, CType pBase) + private static bool HasAnyBaseInterfaceConversion(CType pDerived, CType pBase) { - if (!pBase.isInterfaceType()) - { - return false; - } - if (!(pDerived is AggregateType atsDer)) + if (!pBase.IsInterfaceType || !(pDerived is AggregateType atsDer)) { return false; } @@ -395,7 +287,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics AggregateType atsBase = (AggregateType)pBase; while (atsDer != null) { - foreach (AggregateType iface in atsDer.GetIfacesAll().Items) + foreach (AggregateType iface in atsDer.IfacesAll.Items) { if (HasInterfaceConversion(iface, atsBase)) { @@ -403,7 +295,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } } - atsDer = atsDer.GetBaseClass(); + atsDer = atsDer.BaseClass; } return false; @@ -412,7 +304,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics //////////////////////////////////////////////////////////////////////////////// // The rules for variant interface and delegate conversions are the same: // - // An interface/delegate type S is convertible to an interface/delegate type T + // An interface/delegate type S is convertible to an interface/delegate type T // if and only if T is U and T is U such that for all // parameters of U: // @@ -422,25 +314,25 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // * if the ith parameter of U is contravariant then either Si is exactly // equal to Ti, or there is an implicit reference conversion from Ti to Si. - private bool HasInterfaceConversion(AggregateType pSource, AggregateType pDest) + private static bool HasInterfaceConversion(AggregateType pSource, AggregateType pDest) { - Debug.Assert(pSource != null && pSource.isInterfaceType()); - Debug.Assert(pDest != null && pDest.isInterfaceType()); + Debug.Assert(pSource != null && pSource.IsInterfaceType); + Debug.Assert(pDest != null && pDest.IsInterfaceType); return HasVariantConversion(pSource, pDest); } ////////////////////////////////////////////////////////////////////////////// - private bool HasDelegateConversion(AggregateType pSource, AggregateType pDest) + private static bool HasDelegateConversion(AggregateType pSource, AggregateType pDest) { - Debug.Assert(pSource != null && pSource.isDelegateType()); - Debug.Assert(pDest != null && pDest.isDelegateType()); + Debug.Assert(pSource != null && pSource.IsDelegateType); + Debug.Assert(pDest != null && pDest.IsDelegateType); return HasVariantConversion(pSource, pDest); } ////////////////////////////////////////////////////////////////////////////// - private bool HasVariantConversion(AggregateType pSource, AggregateType pDest) + private static bool HasVariantConversion(AggregateType pSource, AggregateType pDest) { Debug.Assert(pSource != null); Debug.Assert(pDest != null); @@ -448,15 +340,16 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { return true; } - AggregateSymbol pAggSym = pSource.getAggregate(); - if (pAggSym != pDest.getAggregate()) + + AggregateSymbol pAggSym = pSource.OwningAggregate; + if (pAggSym != pDest.OwningAggregate) { return false; } TypeArray pTypeParams = pAggSym.GetTypeVarsAll(); - TypeArray pSourceArgs = pSource.GetTypeArgsAll(); - TypeArray pDestArgs = pDest.GetTypeArgsAll(); + TypeArray pSourceArgs = pSource.TypeArgsAll; + TypeArray pDestArgs = pDest.TypeArgsAll; Debug.Assert(pTypeParams.Count == pSourceArgs.Count); Debug.Assert(pTypeParams.Count == pDestArgs.Count); @@ -493,7 +386,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return true; } - private bool HasImplicitBoxingConversion(CType pSource, CType pDest) + private static bool HasImplicitBoxingConversion(CType pSource, CType pDest) { Debug.Assert(pSource != null); Debug.Assert(pDest != null); @@ -502,7 +395,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // The rest of the boxing conversions only operate when going from a value type // to a reference type. - if (!pDest.IsRefType()) + if (!pDest.IsReferenceType) { return false; } @@ -513,7 +406,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { pSource = nubSource.UnderlyingType; // pSource.IsValType() known to be true. } - else if (!pSource.IsValType()) + else if (!pSource.IsValueType) { return false; } @@ -530,7 +423,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return IsBaseClass(pSource, pDest) || HasAnyBaseInterfaceConversion(pSource, pDest); } - public bool HasBaseConversion(CType pSource, CType pDest) + public static bool HasBaseConversion(CType pSource, CType pDest) { // By a "base conversion" we mean: // @@ -541,9 +434,9 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // // In other words, these are conversions that can be made to a base // class, base interface or co/contravariant type without any change in - // representation other than boxing. A conversion from, say, int to double, + // representation other than boxing. A conversion from, say, int to double, // is NOT a "base conversion", because representation is changed. A conversion - // from, say, lambda to expression tree is not a "base conversion" because + // from, say, lambda to expression tree is not a "base conversion" because // do not have a type. // // The existence of a base conversion depends solely upon the source and @@ -551,7 +444,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // // This notion is not found in the spec but it is useful in the implementation. - if (pSource is AggregateType && pDest.isPredefType(PredefinedType.PT_OBJECT)) + if (pSource is AggregateType && pDest.IsPredefType(PredefinedType.PT_OBJECT)) { // If we are going from any aggregate type (class, struct, interface, enum or delegate) // to object, we immediately return true. This may seem like a mere optimization -- @@ -591,9 +484,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { foreach (AggregateType iface in derived.GetIfacesAll().Items) { - if (iface.getAggregate() == @base) + if (iface.OwningAggregate == @base) + { return true; + } } + derived = derived.GetBaseAgg(); } @@ -604,17 +500,14 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics while (derived.GetBaseClass() != null) { - derived = derived.GetBaseClass().getAggregate(); + derived = derived.GetBaseClass().OwningAggregate; if (derived == @base) + { return true; + } } - return false; - } - internal void SetSymbolTable(SymbolTable symbolTable) - { - RuntimeBinderSymbolTable = symbolTable; + return false; } } } - diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolManagerBase.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolManagerBase.cs deleted file mode 100644 index 92ee054047..0000000000 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolManagerBase.cs +++ /dev/null @@ -1,304 +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; -using System.Collections.Generic; -using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; -using System.Globalization; -using Microsoft.CSharp.RuntimeBinder.Syntax; - -namespace Microsoft.CSharp.RuntimeBinder.Semantics -{ - internal sealed class BSYMMGR - { - // Special nullable members. - public PropertySymbol propNubValue; - public MethodSymbol methNubCtor; - - private readonly SymFactory _symFactory; - - private SYMTBL tableGlobal; - - // The hash table for type arrays. - private Dictionary tableTypeArrays; - - private static readonly TypeArray s_taEmpty = new TypeArray(Array.Empty()); - - public BSYMMGR() - { - this.tableGlobal = new SYMTBL(); - _symFactory = new SymFactory(this.tableGlobal); - - this.tableTypeArrays = new Dictionary(); - - //////////////////////////////////////////////////////////////////////////////// - // Build the data structures needed to make FPreLoad fast. Make sure the - // namespaces are created. Compute and sort hashes of the NamespaceSymbol * value and type - // name (sans arity indicator). - - for (int i = 0; i < (int)PredefinedType.PT_COUNT; ++i) - { - NamespaceSymbol ns = NamespaceSymbol.Root; - string name = PredefinedTypeFacts.GetName((PredefinedType)i); - int start = 0; - while (start < name.Length) - { - int iDot = name.IndexOf('.', start); - if (iDot == -1) - break; - string sub = (iDot > start) ? name.Substring(start, iDot - start) : name.Substring(start); - Name nm = NameManager.Add(sub); - ns = LookupGlobalSymCore(nm, ns, symbmask_t.MASK_NamespaceSymbol) as NamespaceSymbol ?? _symFactory.CreateNamespace(nm, ns); - start += sub.Length + 1; - } - } - } - - public SYMTBL GetSymbolTable() - { - return tableGlobal; - } - - public static TypeArray EmptyTypeArray() - { - return s_taEmpty; - } - - public BetterType CompareTypes(TypeArray ta1, TypeArray ta2) - { - if (ta1 == ta2) - { - return BetterType.Same; - } - if (ta1.Count != ta2.Count) - { - // The one with more parameters is more specific. - return ta1.Count > ta2.Count ? BetterType.Left : BetterType.Right; - } - - BetterType nTot = BetterType.Neither; - - for (int i = 0; i < ta1.Count; i++) - { - CType type1 = ta1[i]; - CType type2 = ta2[i]; - BetterType nParam = BetterType.Neither; - - LAgain: - if (type1.GetTypeKind() != type2.GetTypeKind()) - { - if (type1 is TypeParameterType) - { - nParam = BetterType.Right; - } - else if (type2 is TypeParameterType) - { - nParam = BetterType.Left; - } - } - else - { - switch (type1.GetTypeKind()) - { - default: - Debug.Assert(false, "Bad kind in CompareTypes"); - break; - case TypeKind.TK_TypeParameterType: - break; - - case TypeKind.TK_PointerType: - case TypeKind.TK_ParameterModifierType: - case TypeKind.TK_ArrayType: - case TypeKind.TK_NullableType: - type1 = type1.GetBaseOrParameterOrElementType(); - type2 = type2.GetBaseOrParameterOrElementType(); - goto LAgain; - - case TypeKind.TK_AggregateType: - nParam = CompareTypes(((AggregateType)type1).GetTypeArgsAll(), ((AggregateType)type2).GetTypeArgsAll()); - break; - } - } - - if (nParam == BetterType.Right || nParam == BetterType.Left) - { - if (nTot == BetterType.Same || nTot == BetterType.Neither) - { - nTot = nParam; - } - else if (nParam != nTot) - { - return BetterType.Neither; - } - } - } - - return nTot; - } - - public SymFactory GetSymFactory() - { - return _symFactory; - } - - public Symbol LookupGlobalSymCore(Name name, ParentSymbol parent, symbmask_t kindmask) - { - return tableGlobal.LookupSym(name, parent, kindmask); - } - - public Symbol LookupAggMember(Name name, AggregateSymbol agg, symbmask_t mask) - { - return tableGlobal.LookupSym(name, agg, mask); - } - - public static Symbol LookupNextSym(Symbol sym, ParentSymbol parent, symbmask_t kindmask) - { - Debug.Assert(sym.parent == parent); - - sym = sym.nextSameName; - Debug.Assert(sym == null || sym.parent == parent); - - // Keep traversing the list of symbols with same name and parent. - while (sym != null) - { - if ((kindmask & sym.mask()) > 0) - return sym; - - sym = sym.nextSameName; - Debug.Assert(sym == null || sym.parent == parent); - } - - return null; - } - - //////////////////////////////////////////////////////////////////////////////// - // Allocate a type array; used to represent a parameter list. - // We use a hash table to make sure that allocating the same type array twice - // returns the same value. This does two things: - // - // 1) Save a lot of memory. - // 2) Make it so parameter lists can be compared by a simple pointer comparison - // 3) Allow us to associate a token with each signature for faster metadata emit - - private readonly struct TypeArrayKey : IEquatable - { - private readonly CType[] _types; - private readonly int _hashCode; - - public TypeArrayKey(CType[] types) - { - _types = types; - int hashCode = 0x162A16FE; - foreach (CType type in types) - { - hashCode = (hashCode << 5) - hashCode; - if (type != null) - { - hashCode ^= type.GetHashCode(); - } - } - - _hashCode = hashCode; - } - - public bool Equals(TypeArrayKey other) - { - CType[] types = _types; - CType[] otherTypes = other._types; - if (otherTypes == types) - { - return true; - } - - if (other._hashCode != _hashCode || otherTypes.Length != types.Length) - { - return false; - } - - for (int i = 0; i < types.Length; i++) - { - if (types[i] != otherTypes[i]) - { - return false; - } - } - - return true; - } - -#if DEBUG - [ExcludeFromCodeCoverage] // Typed overload should always be the method called. -#endif - public override bool Equals(object obj) - { - Debug.Fail("Sub-optimal overload called. Check if this can be avoided."); - return obj is TypeArrayKey && Equals((TypeArrayKey)obj); - } - - public override int GetHashCode() - { - return _hashCode; - } - } - - public TypeArray AllocParams(int ctype, CType[] prgtype) - { - if (ctype == 0) - { - return s_taEmpty; - } - Debug.Assert(ctype == prgtype.Length); - return AllocParams(prgtype); - } - - public TypeArray AllocParams(int ctype, TypeArray array, int offset) - { - if (ctype == 0) - { - return s_taEmpty; - } - - if (ctype == array.Count) - { - return array; - } - - CType[] types = array.Items; - CType[] newTypes = new CType[ctype]; - Array.ConstrainedCopy(types, offset, newTypes, 0, ctype); - return AllocParams(newTypes); - } - - public TypeArray AllocParams(params CType[] types) - { - if (types == null || types.Length == 0) - { - return s_taEmpty; - } - TypeArrayKey key = new TypeArrayKey(types); - TypeArray result; - if (!tableTypeArrays.TryGetValue(key, out result)) - { - result = new TypeArray(types); - tableTypeArrays.Add(key, result); - } - return result; - } - - private TypeArray ConcatParams(CType[] prgtype1, CType[] prgtype2) - { - CType[] combined = new CType[prgtype1.Length + prgtype2.Length]; - Array.Copy(prgtype1, 0, combined, 0, prgtype1.Length); - Array.Copy(prgtype2, 0, combined, prgtype1.Length, prgtype2.Length); - return AllocParams(combined); - } - - public TypeArray ConcatParams(TypeArray pta1, TypeArray pta2) - { - return ConcatParams(pta1.Items, pta2.Items); - } - } -} - diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolMask.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolMask.cs index bda131b546..b8b74eedf2 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolMask.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolMask.cs @@ -17,5 +17,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics MASK_PropertySymbol = 1 << SYMKIND.SK_PropertySymbol, MASK_EventSymbol = 1 << SYMKIND.SK_EventSymbol, MASK_ALL = ~0, + MASK_Member = MASK_FieldSymbol | MASK_MethodSymbol | MASK_PropertySymbol | MASK_EventSymbol } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolTable.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolStore.cs similarity index 64% rename from external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolTable.cs rename to external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolStore.cs index 5ec3c3b050..dcd4a4992e 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolTable.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolStore.cs @@ -13,30 +13,18 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // A symbol table is a helper class used by the symbol manager. There are // two symbol tables; a global and a local. - internal sealed class SYMTBL + internal static class SymbolStore { - ///////////////////////////////////////////////////////////////////////////////// - // Public + // The RuntimeBinder uses a global lock when Binding that keeps this dictionary safe. + private static readonly Dictionary s_dictionary = new Dictionary(); - public SYMTBL() + public static Symbol LookupSym(Name name, ParentSymbol parent, symbmask_t kindmask) { - _dictionary = new Dictionary(); + RuntimeBinder.EnsureLockIsTaken(); + return s_dictionary.TryGetValue(new Key(name, parent), out Symbol sym) ? FindCorrectKind(sym, kindmask) : null; } - - public Symbol LookupSym(Name name, ParentSymbol parent, symbmask_t kindmask) - { - Key k = new Key(name, parent); - Symbol sym; - - if (_dictionary.TryGetValue(k, out sym)) - { - return FindCorrectKind(sym, kindmask); - } - - return null; - } - - public void InsertChild(ParentSymbol parent, Symbol child) + + public static void InsertChild(ParentSymbol parent, Symbol child) { Debug.Assert(child.nextSameName == null); Debug.Assert(child.parent == null || child.parent == parent); @@ -46,7 +34,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics InsertChildNoGrow(child); } - private void InsertChildNoGrow(Symbol child) + private static void InsertChildNoGrow(Symbol child) { switch (child.getKind()) { @@ -55,10 +43,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return; } - Key k = new Key(child.name, child.parent); - Symbol sym; - - if (_dictionary.TryGetValue(k, out sym)) + RuntimeBinder.EnsureLockIsTaken(); + if (s_dictionary.TryGetValue(new Key(child.name, child.parent), out Symbol sym)) { // Link onto the end of the symbol chain here. while (sym?.nextSameName != null) @@ -71,7 +57,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } else { - _dictionary.Add(k, child); + s_dictionary.Add(new Key(child.name, child.parent), child); } } @@ -83,15 +69,14 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { return sym; } + sym = sym.nextSameName; } while (sym != null); return null; } - private readonly Dictionary _dictionary; - - private sealed class Key : IEquatable + private readonly struct Key : IEquatable { private readonly Name _name; private readonly ParentSymbol _parent; @@ -102,21 +87,18 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics _parent = parent; } - public bool Equals(Key other) => other != null && _name.Equals(other._name) && _parent.Equals(other._parent); + public bool Equals(Key other) => _name == other._name && _parent == other._parent; -#if DEBUG +#if DEBUG [ExcludeFromCodeCoverage] // Typed overload should always be the method called. #endif public override bool Equals(object obj) { Debug.Fail("Sub-optimal overload called. Check if this can be avoided."); - return Equals(obj as Key); + return obj is Key key && Equals(key); } - public override int GetHashCode() - { - return _name.GetHashCode() ^ _parent.GetHashCode(); - } + public override int GetHashCode() => _name.GetHashCode() ^ _parent.GetHashCode(); } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/BoundAnonymousFunction.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/BoundAnonymousFunction.cs index e5de6dadc3..5fdaac504e 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/BoundAnonymousFunction.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/BoundAnonymousFunction.cs @@ -12,7 +12,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics : base(ExpressionKind.BoundLambda, type) { Debug.Assert(type != null); - Debug.Assert(type.isDelegateType()); + Debug.Assert(type.IsDelegateType); Debug.Assert(argumentScope != null); ArgumentScope = argumentScope; Expression = expression; diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Cast.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Cast.cs index eed4a2b3b8..fc4c67f40b 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Cast.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Cast.cs @@ -20,5 +20,19 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics public Expr Argument { get; set; } public bool IsBoxingCast => (Flags & (EXPRFLAG.EXF_BOX | EXPRFLAG.EXF_FORCE_BOX)) != 0; + + public override object Object + { + get + { + Expr arg = Argument; + while (arg is ExprCast castArg) + { + arg = castArg.Argument; + } + + return arg.Object; + } + } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Concatenate.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Concatenate.cs index 0d94074549..4a379a9e95 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Concatenate.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Concatenate.cs @@ -14,7 +14,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { Debug.Assert(first?.Type != null); Debug.Assert(second?.Type != null); - Debug.Assert(first.Type.isPredefType(PredefinedType.PT_STRING) || second.Type.isPredefType(PredefinedType.PT_STRING)); + Debug.Assert(first.Type.IsPredefType(PredefinedType.PT_STRING) || second.Type.IsPredefType(PredefinedType.PT_STRING)); FirstArgument = first; SecondArgument = second; } @@ -22,12 +22,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics private static CType TypeFromOperands(Expr first, Expr second) { CType type = first.Type; - if (type.isPredefType(PredefinedType.PT_STRING)) + if (type.IsPredefType(PredefinedType.PT_STRING)) { return type; } - Debug.Assert(second.Type.isPredefType(PredefinedType.PT_STRING)); + Debug.Assert(second.Type.IsPredefType(PredefinedType.PT_STRING)); return second.Type; } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Constant.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Constant.cs index 6a115a5f66..0454d3908d 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Constant.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Constant.cs @@ -2,6 +2,7 @@ // 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; using System.Diagnostics; namespace Microsoft.CSharp.RuntimeBinder.Semantics @@ -16,7 +17,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics public Expr OptionalConstructorCall { get; set; } - public bool IsZero => Val.IsZero(Type.constValKind()); + public bool IsZero => Val.IsZero(Type.ConstValKind); public ConstVal Val { get; } @@ -26,24 +27,86 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { get { - switch (Type.fundType()) + switch (Type.FundamentalType) { case FUNDTYPE.FT_I8: case FUNDTYPE.FT_U8: return Val.Int64Val; + case FUNDTYPE.FT_U4: return Val.UInt32Val; - case FUNDTYPE.FT_I1: - case FUNDTYPE.FT_I2: - case FUNDTYPE.FT_I4: - case FUNDTYPE.FT_U1: - case FUNDTYPE.FT_U2: - return Val.Int32Val; + default: - Debug.Assert(false, "Bad fundType in getI64Value"); - return 0; + Debug.Assert( + Type.FundamentalType == FUNDTYPE.FT_I1 || Type.FundamentalType == FUNDTYPE.FT_I2 + || Type.FundamentalType == FUNDTYPE.FT_I4 || Type.FundamentalType == FUNDTYPE.FT_U1 + || Type.FundamentalType == FUNDTYPE.FT_U2, "Bad fundType in getI64Value"); + return Val.Int32Val; } } } + + public override object Object + { + get + { + if (Type is NullType) + { + return null; + } + + object objval; + switch (System.Type.GetTypeCode(Type.AssociatedSystemType)) + { + case TypeCode.Boolean: + objval = Val.BooleanVal; + break; + case TypeCode.SByte: + objval = Val.SByteVal; + break; + case TypeCode.Byte: + objval = Val.ByteVal; + break; + case TypeCode.Int16: + objval = Val.Int16Val; + break; + case TypeCode.UInt16: + objval = Val.UInt16Val; + break; + case TypeCode.Int32: + objval = Val.Int32Val; + break; + case TypeCode.UInt32: + objval = Val.UInt32Val; + break; + case TypeCode.Int64: + objval = Val.Int64Val; + break; + case TypeCode.UInt64: + objval = Val.UInt64Val; + break; + case TypeCode.Single: + objval = Val.SingleVal; + break; + case TypeCode.Double: + objval = Val.DoubleVal; + break; + case TypeCode.Decimal: + objval = Val.DecimalVal; + break; + case TypeCode.Char: + objval = Val.CharVal; + break; + case TypeCode.String: + objval = Val.StringVal; + break; + default: + objval = Val.ObjectVal; + break; + } + + return Type.IsEnumType ? Enum.ToObject(Type.AssociatedSystemType, objval) : objval; + } + } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/EXPR.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/EXPR.cs index eb7223b6fc..f1ef38f58b 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/EXPR.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/EXPR.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; namespace Microsoft.CSharp.RuntimeBinder.Semantics { @@ -37,5 +38,15 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } protected set { _type = value; } } + + [ExcludeFromCodeCoverage] // Should only be called through override. + public virtual object Object + { + get + { + Debug.Fail("Invalid Expr in GetObject"); + throw Error.InternalCompilerError(); + } + } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ExprWithArgs.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ExprWithArgs.cs index eb81fcb9e3..a91db12b24 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ExprWithArgs.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ExprWithArgs.cs @@ -4,7 +4,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { - internal abstract class ExprWithArgs : ExprWithType, IExprWithObject + internal abstract class ExprWithArgs : ExprWithType { protected ExprWithArgs(ExpressionKind kind, CType type) : base(kind, type) @@ -13,12 +13,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics public ExprMemberGroup MemberGroup { get; set; } - public Expr OptionalObject - { - get => MemberGroup.OptionalObject; - set => MemberGroup.OptionalObject = value; - } - public Expr OptionalArguments { get; set; } public abstract SymWithType GetSymWithType(); diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ExprWithType.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ExprWithType.cs index f9ac7c1719..cdc7871d79 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ExprWithType.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ExprWithType.cs @@ -2,6 +2,8 @@ // 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; + namespace Microsoft.CSharp.RuntimeBinder.Semantics { internal abstract class ExprWithType : Expr @@ -11,5 +13,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { Type = type; } + + protected static bool TypesAreEqual(Type t1, Type t2) => t1 == t2 || t1.IsEquivalentTo(t2); } -} \ No newline at end of file +} diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Field.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Field.cs index b7d9df12a5..057ac3a4e0 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Field.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Field.cs @@ -4,12 +4,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { - internal sealed class ExprField : ExprWithType, IExprWithObject + internal sealed class ExprField : ExprWithType { - public ExprField(CType type, Expr optionalObject, FieldWithType field, bool isLValue) + public ExprField(CType type, Expr optionalObject, FieldWithType field) : base(ExpressionKind.Field, type) { - Flags = isLValue ? EXPRFLAG.EXF_LVALUE : 0; + Flags = field.Field().isReadOnly ? 0 : EXPRFLAG.EXF_LVALUE; OptionalObject = optionalObject; FieldWithType = field; } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/MemberGroup.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/MemberGroup.cs index cc5980acdf..bb946d1d22 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/MemberGroup.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/MemberGroup.cs @@ -7,10 +7,10 @@ using Microsoft.CSharp.RuntimeBinder.Syntax; namespace Microsoft.CSharp.RuntimeBinder.Semantics { - internal sealed class ExprMemberGroup : ExprWithType, IExprWithObject + internal sealed class ExprMemberGroup : ExprWithType { - public ExprMemberGroup(CType type, EXPRFLAG flags, Name name, TypeArray typeArgs, SYMKIND symKind, CType parentType, MethodOrPropertySymbol pMPS, Expr optionalObject, CMemberLookupResults memberLookupResults) - : base(ExpressionKind.MemberGroup, type) + public ExprMemberGroup(EXPRFLAG flags, Name name, TypeArray typeArgs, SYMKIND symKind, CType parentType, Expr optionalObject, CMemberLookupResults memberLookupResults) + : base(ExpressionKind.MemberGroup, MethodGroupType.Instance) { Debug.Assert( (flags & ~(EXPRFLAG.EXF_CTOR | EXPRFLAG.EXF_INDEXER | EXPRFLAG.EXF_OPERATOR | EXPRFLAG.EXF_NEWOBJCALL @@ -18,7 +18,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics | EXPRFLAG.EXF_MASK_ANY)) == 0); Flags = flags; Name = name; - TypeArgs = typeArgs ?? BSYMMGR.EmptyTypeArray(); + TypeArgs = typeArgs ?? TypeArray.Empty; SymKind = symKind; ParentType = parentType; OptionalObject = optionalObject; diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/MethodInfo.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/MethodInfo.cs index 4f166c4e6a..b2db9fdc30 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/MethodInfo.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/MethodInfo.cs @@ -2,7 +2,9 @@ // 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; using System.Diagnostics; +using System.Reflection; namespace Microsoft.CSharp.RuntimeBinder.Semantics { @@ -17,5 +19,137 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } public MethWithInst Method { get; } + + public MethodInfo MethodInfo + { + get + { + // To do this, we need to construct a type array of the parameter types, + // get the parent constructed type, and get the method from it. + AggregateType aggType = Method.Ats; + MethodSymbol methSym = Method.Meth(); + + TypeArray genericParams = TypeManager.SubstTypeArray(methSym.Params, aggType, methSym.typeVars); + CType genericReturn = TypeManager.SubstType(methSym.RetType, aggType, methSym.typeVars); + + Type type = aggType.AssociatedSystemType; + MethodInfo methodInfo = methSym.AssociatedMemberInfo as MethodInfo; + + // This is to ensure that for embedded nopia types, we have the + // appropriate local type from the member itself; this is possible + // because nopia types are not generic or nested. + if (!type.IsGenericType && !type.IsNested) + { + type = methodInfo.DeclaringType; + } + + // We need to find the associated methodinfo on the instantiated type. + foreach (MethodInfo m in type.GetRuntimeMethods()) + { +#if UNSUPPORTEDAPI + if ((m.MetadataToken != methodInfo.MetadataToken) || (m.Module != methodInfo.Module)) +#else + if (!m.HasSameMetadataDefinitionAs(methodInfo)) +#endif + { + continue; + } + + Debug.Assert(m.Name == methodInfo.Name && + m.GetParameters().Length == genericParams.Count && + TypesAreEqual(m.ReturnType, genericReturn.AssociatedSystemType)); + + bool match = true; + ParameterInfo[] parameters = m.GetParameters(); + for (int i = 0; i < genericParams.Count; i++) + { + if (!TypesAreEqual(parameters[i].ParameterType, genericParams[i].AssociatedSystemType)) + { + match = false; + break; + } + } + + if (match) + { + if (m.IsGenericMethod) + { + int size = Method.TypeArgs?.Count ?? 0; + Type[] typeArgs = new Type[size]; + if (size > 0) + { + for (int i = 0; i < Method.TypeArgs.Count; i++) + { + typeArgs[i] = Method.TypeArgs[i].AssociatedSystemType; + } + } + + return m.MakeGenericMethod(typeArgs); + } + + return m; + } + } + + throw Error.InternalCompilerError(); + } + } + + public ConstructorInfo ConstructorInfo + { + get + { + // To do this, we need to construct a type array of the parameter types, + // get the parent constructed type, and get the method from it. + AggregateType aggType = Method.Ats; + MethodSymbol methSym = Method.Meth(); + + TypeArray genericInstanceParams = TypeManager.SubstTypeArray(methSym.Params, aggType); + Type type = aggType.AssociatedSystemType; + ConstructorInfo ctorInfo = (ConstructorInfo)methSym.AssociatedMemberInfo; + + // This is to ensure that for embedded nopia types, we have the + // appropriate local type from the member itself; this is possible + // because nopia types are not generic or nested. + if (!type.IsGenericType && !type.IsNested) + { + type = ctorInfo.DeclaringType; + } + + foreach (ConstructorInfo c in type.GetConstructors(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static)) + { +#if UNSUPPORTEDAPI + if ((c.MetadataToken != ctorInfo.MetadataToken) || (c.Module != ctorInfo.Module)) +#else + if (!c.HasSameMetadataDefinitionAs(ctorInfo)) +#endif + { + continue; + } + + Debug.Assert(c.GetParameters() == null || c.GetParameters().Length == genericInstanceParams.Count); + + bool match = true; + ParameterInfo[] parameters = c.GetParameters(); + for (int i = 0; i < genericInstanceParams.Count; i++) + { + if (!TypesAreEqual(parameters[i].ParameterType, genericInstanceParams[i].AssociatedSystemType)) + { + match = false; + break; + } + } + + if (match) + { + return c; + } + } + + throw Error.InternalCompilerError(); + } + } + + public override object Object => MethodInfo; } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Property.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Property.cs index 1d119647d0..0328e85160 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Property.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Property.cs @@ -29,6 +29,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (mwtSet != null) { MethWithTypeSet = mwtSet; + Flags = EXPRFLAG.EXF_LVALUE; } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/PropertyInfo.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/PropertyInfo.cs index 755228aa0d..5b439c1708 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/PropertyInfo.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/PropertyInfo.cs @@ -2,7 +2,9 @@ // 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; using System.Diagnostics; +using System.Reflection; namespace Microsoft.CSharp.RuntimeBinder.Semantics { @@ -17,5 +19,62 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } public PropWithType Property { get; } + + public PropertyInfo PropertyInfo + { + get + { + // To do this, we need to construct a type array of the parameter types, + // get the parent constructed type, and get the property from it. + AggregateType aggType = Property.Ats; + PropertySymbol propSym = Property.Prop(); + + TypeArray genericInstanceParams = TypeManager.SubstTypeArray(propSym.Params, aggType, null); + + Type type = aggType.AssociatedSystemType; + PropertyInfo propertyInfo = propSym.AssociatedPropertyInfo; + + // This is to ensure that for embedded nopia types, we have the + // appropriate local type from the member itself; this is possible + // because nopia types are not generic or nested. + if (!type.IsGenericType && !type.IsNested) + { + type = propertyInfo.DeclaringType; + } + + foreach (PropertyInfo p in type.GetProperties(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static)) + { +#if UNSUPPORTEDAPI + if ((p.MetadataToken != propertyInfo.MetadataToken) || (p.Module != propertyInfo.Module)) +#else + if (!p.HasSameMetadataDefinitionAs(propertyInfo)) + { +#endif + continue; + } + Debug.Assert((p.Name == propertyInfo.Name) && + (p.GetIndexParameters() == null || p.GetIndexParameters().Length == genericInstanceParams.Count)); + + bool match = true; + ParameterInfo[] parameters = p.GetSetMethod(true) != null ? + p.GetSetMethod(true).GetParameters() : p.GetGetMethod(true).GetParameters(); + for (int i = 0; i < genericInstanceParams.Count; i++) + { + if (!TypesAreEqual(parameters[i].ParameterType, genericInstanceParams[i].AssociatedSystemType)) + { + match = false; + break; + } + } + + if (match) + { + return p; + } + } + + throw Error.InternalCompilerError(); + } + } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/TypeOf.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/TypeOf.cs index 8e4bbe19fb..2ab3e131c6 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/TypeOf.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/TypeOf.cs @@ -14,5 +14,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } public CType SourceType { get; } + + public override object Object => SourceType.AssociatedSystemType; } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Visitors/ExprVisitorBase.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Visitors/ExprVisitorBase.cs index 99991ef719..677bbad1c3 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Visitors/ExprVisitorBase.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Visitors/ExprVisitorBase.cs @@ -8,34 +8,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { internal abstract class ExprVisitorBase { - public Expr Visit(Expr pExpr) - { - if (pExpr == null) - { - return null; - } - - Expr pResult; - if (IsCachedExpr(pExpr, out pResult)) - { - return pResult; - } - - return CacheExprMapping(pExpr, Dispatch(pExpr)); - } - - private bool IsCachedExpr(Expr pExpr, out Expr pTransformedExpr) - { - pTransformedExpr = null; - return false; - } - - ///////////////////////////////////////////////////////////////////////////////// - - private Expr CacheExprMapping(Expr pExpr, Expr pTransformedExpr) - { - return pTransformedExpr; - } + protected Expr Visit(Expr pExpr) => pExpr == null ? null : Dispatch(pExpr); protected virtual Expr Dispatch(Expr pExpr) { diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Visitors/ExpressionTreeRewriter.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Visitors/ExpressionTreeRewriter.cs index f85ed2595a..58d8e39b40 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Visitors/ExpressionTreeRewriter.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Visitors/ExpressionTreeRewriter.cs @@ -9,21 +9,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { internal sealed class ExpressionTreeRewriter : ExprVisitorBase { - public static ExprBinOp Rewrite(ExprBoundLambda expr, ExprFactory expressionFactory, SymbolLoader symbolLoader) => - new ExpressionTreeRewriter(expressionFactory, symbolLoader).VisitBoundLambda(expr); - - private ExprFactory expressionFactory; - private SymbolLoader symbolLoader; - - private ExprFactory GetExprFactory() { return expressionFactory; } - - private SymbolLoader GetSymbolLoader() { return symbolLoader; } - - private ExpressionTreeRewriter(ExprFactory expressionFactory, SymbolLoader symbolLoader) - { - this.expressionFactory = expressionFactory; - this.symbolLoader = symbolLoader; - } + public static ExprBinOp Rewrite(ExprBoundLambda expr) => new ExpressionTreeRewriter().VisitBoundLambda(expr); protected override Expr Dispatch(Expr expr) { @@ -60,7 +46,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // // The LHS becomes Expression.Property(instance, indexerInfo, arguments). Expr instance = Visit(prop.MemberGroup.OptionalObject); - Expr propInfo = GetExprFactory().CreatePropertyInfo(prop.PropWithTypeSlot.Prop(), prop.PropWithTypeSlot.Ats); + Expr propInfo = ExprFactory.CreatePropertyInfo(prop.PropWithTypeSlot.Prop(), prop.PropWithTypeSlot.Ats); Expr arguments = GenerateParamsArray( GenerateArgsList(prop.OptionalArguments), PredefinedType.PT_EXPRESSION); @@ -96,8 +82,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics MethodSymbol lambdaMethod = GetPreDefMethod(PREDEFMETH.PM_EXPRESSION_LAMBDA); AggregateType delegateType = anonmeth.DelegateType; - TypeArray lambdaTypeParams = GetSymbolLoader().getBSymmgr().AllocParams(1, new CType[] { delegateType }); - AggregateType expressionType = GetSymbolLoader().GetPredefindType(PredefinedType.PT_EXPRESSION); + TypeArray lambdaTypeParams = TypeArray.Allocate(delegateType); + AggregateType expressionType = SymbolLoader.GetPredefindType(PredefinedType.PT_EXPRESSION); MethWithInst mwi = new MethWithInst(lambdaMethod, expressionType, lambdaTypeParams); Expr createParameters = CreateWraps(anonmeth); Debug.Assert(createParameters != null); @@ -105,12 +91,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Expr body = Visit(anonmeth.Expression); Debug.Assert(anonmeth.ArgumentScope.nextChild == null); Expr parameters = GenerateParamsArray(null, PredefinedType.PT_PARAMETEREXPRESSION); - Expr args = GetExprFactory().CreateList(body, parameters); - CType typeRet = GetSymbolLoader().GetTypeManager().SubstType(mwi.Meth().RetType, mwi.GetType(), mwi.TypeArgs); - ExprMemberGroup pMemGroup = GetExprFactory().CreateMemGroup(null, mwi); - ExprCall call = GetExprFactory().CreateCall(0, typeRet, args, pMemGroup, mwi); + Expr args = ExprFactory.CreateList(body, parameters); + CType typeRet = TypeManager.SubstType(mwi.Meth().RetType, mwi.GetType(), mwi.TypeArgs); + ExprMemberGroup pMemGroup = ExprFactory.CreateMemGroup(null, mwi); + ExprCall call = ExprFactory.CreateCall(0, typeRet, args, pMemGroup, mwi); call.PredefinedMethod = PREDEFMETH.PM_EXPRESSION_LAMBDA; - return GetExprFactory().CreateSequence(createParameters, call); + return ExprFactory.CreateSequence(createParameters, call); } protected override Expr VisitCONSTANT(ExprConstant expr) { @@ -129,13 +115,13 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Expr pObject; if (expr.OptionalObject== null) { - pObject = GetExprFactory().CreateNull(); + pObject = ExprFactory.CreateNull(); } else { pObject = Visit(expr.OptionalObject); } - ExprFieldInfo pFieldInfo = GetExprFactory().CreateFieldInfo(expr.FieldWithType.Field(), expr.FieldWithType.GetType()); + ExprFieldInfo pFieldInfo = ExprFactory.CreateFieldInfo(expr.FieldWithType.Field(), expr.FieldWithType.GetType()); return GenerateCall(PREDEFMETH.PM_EXPRESSION_FIELD, pObject, pFieldInfo); } protected override Expr VisitUSERDEFINEDCONVERSION(ExprUserDefinedConversion expr) @@ -153,7 +139,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // we can omit the cast. if (pArgument.Type == pExpr.Type || SymbolLoader.IsBaseClassOfClass(pArgument.Type, pExpr.Type) || - CConversions.FImpRefConv(GetSymbolLoader(), pArgument.Type, pExpr.Type)) + CConversions.FImpRefConv(pArgument.Type, pExpr.Type)) { return Visit(pArgument); } @@ -161,7 +147,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // If we have a cast to PredefinedType.PT_G_EXPRESSION and the thing that we're casting is // a EXPRBOUNDLAMBDA that is an expression tree, then just visit the expression tree. if (pExpr.Type != null && - pExpr.Type.isPredefType(PredefinedType.PT_G_EXPRESSION) && + pExpr.Type.IsPredefType(PredefinedType.PT_G_EXPRESSION) && pArgument is ExprBoundLambda) { return Visit(pArgument); @@ -179,7 +165,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { Debug.Assert(expr != null); PREDEFMETH pdm; - if (expr.FirstArgument.Type.isPredefType(PredefinedType.PT_STRING) && expr.SecondArgument.Type.isPredefType(PredefinedType.PT_STRING)) + if (expr.FirstArgument.Type.IsPredefType(PredefinedType.PT_STRING) && expr.SecondArgument.Type.IsPredefType(PredefinedType.PT_STRING)) { pdm = PREDEFMETH.PM_STRING_CONCAT_STRING_2; } @@ -190,7 +176,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Expr p1 = Visit(expr.FirstArgument); Expr p2 = Visit(expr.SecondArgument); MethodSymbol method = GetPreDefMethod(pdm); - Expr methodInfo = GetExprFactory().CreateMethodInfo(method, GetSymbolLoader().GetPredefindType(PredefinedType.PT_STRING), null); + Expr methodInfo = ExprFactory.CreateMethodInfo(method, SymbolLoader.GetPredefindType(PredefinedType.PT_STRING), null); return GenerateCall(PREDEFMETH.PM_EXPRESSION_ADD_USER_DEFINED, p1, p2, methodInfo); } protected override Expr VisitBINOP(ExprBinOp expr) @@ -260,7 +246,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Expr pObject; if (expr.MethWithInst.Meth().isStatic || expr.MemberGroup.OptionalObject== null) { - pObject = GetExprFactory().CreateNull(); + pObject = ExprFactory.CreateNull(); } else { @@ -285,7 +271,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } pObject = Visit(pObject); } - Expr methodInfo = GetExprFactory().CreateMethodInfo(expr.MethWithInst); + Expr methodInfo = ExprFactory.CreateMethodInfo(expr.MethWithInst); Expr args = GenerateArgsList(expr.OptionalArguments); Expr Params = GenerateParamsArray(args, PredefinedType.PT_EXPRESSION); PREDEFMETH pdm = PREDEFMETH.PM_EXPRESSION_CALL; @@ -299,13 +285,13 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Expr pObject; if (expr.PropWithTypeSlot.Prop().isStatic || expr.MemberGroup.OptionalObject== null) { - pObject = GetExprFactory().CreateNull(); + pObject = ExprFactory.CreateNull(); } else { pObject = Visit(expr.MemberGroup.OptionalObject); } - Expr propInfo = GetExprFactory().CreatePropertyInfo(expr.PropWithTypeSlot.Prop(), expr.PropWithTypeSlot.GetType()); + Expr propInfo = ExprFactory.CreatePropertyInfo(expr.PropWithTypeSlot.Prop(), expr.PropWithTypeSlot.GetType()); if (expr.OptionalArguments != null) { // It is an indexer property. Turn it into a virtual method call. @@ -319,7 +305,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { Debug.Assert(expr != null); // POSSIBLE ERROR: Multi-d should be an error? - Expr pTypeOf = CreateTypeOf(((ArrayType)expr.Type).GetElementType()); + Expr pTypeOf = CreateTypeOf(((ArrayType)expr.Type).ElementType); Expr args = GenerateArgsList(expr.OptionalArguments); Expr Params = GenerateParamsArray(args, PredefinedType.PT_EXPRESSION); return GenerateCall(PREDEFMETH.PM_EXPRESSION_NEWARRAYINIT, pTypeOf, Params); @@ -399,32 +385,32 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics CType convertL = null; CType convertR = null; - if (typeL.isEnumType()) + if (typeL.IsEnumType) { // We have already inserted casts if not lifted, so we should never see an enum. Debug.Assert(expr.IsLifted); - convertL = GetSymbolLoader().GetTypeManager().GetNullable(typeL.underlyingEnumType()); + convertL = TypeManager.GetNullable(typeL.UnderlyingEnumType); typeL = convertL; didEnumConversion = true; } - else if (typeL is NullableType nubL && nubL.UnderlyingType.isEnumType()) + else if (typeL is NullableType nubL && nubL.UnderlyingType.IsEnumType) { Debug.Assert(expr.IsLifted); - convertL = GetSymbolLoader().GetTypeManager().GetNullable(nubL.UnderlyingType.underlyingEnumType()); + convertL = TypeManager.GetNullable(nubL.UnderlyingType.UnderlyingEnumType); typeL = convertL; didEnumConversion = true; } - if (typeR.isEnumType()) + if (typeR.IsEnumType) { Debug.Assert(expr.IsLifted); - convertR = GetSymbolLoader().GetTypeManager().GetNullable(typeR.underlyingEnumType()); + convertR = TypeManager.GetNullable(typeR.UnderlyingEnumType); typeR = convertR; didEnumConversion = true; } - else if (typeR is NullableType nubR && nubR.UnderlyingType.isEnumType()) + else if (typeR is NullableType nubR && nubR.UnderlyingType.IsEnumType) { Debug.Assert(expr.IsLifted); - convertR = GetSymbolLoader().GetTypeManager().GetNullable(nubR.UnderlyingType.underlyingEnumType()); + convertR = TypeManager.GetNullable(nubR.UnderlyingType.UnderlyingEnumType); typeR = convertR; didEnumConversion = true; } @@ -448,7 +434,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Expr call = GenerateCall(pdm, newL, newR); - if (didEnumConversion && expr.Type.StripNubs().isEnumType()) + if (didEnumConversion && expr.Type.StripNubs().IsEnumType) { call = GenerateCall(PREDEFMETH.PM_EXPRESSION_CONVERT, call, CreateTypeOf(expr.Type)); } @@ -475,7 +461,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Expr origOp = expr.Child; // Such operations are always already casts on operations on casts. - Debug.Assert(!(origOp.Type is NullableType nub) || !nub.UnderlyingType.isEnumType()); + Debug.Assert(!(origOp.Type is NullableType nub) || !nub.UnderlyingType.IsEnumType); return GenerateCall(pdm, Visit(origOp)); } @@ -546,7 +532,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics p1 = Visit(p1); p2 = Visit(p2); FixLiftedUserDefinedBinaryOperators(expr, ref p1, ref p2); - Expr methodInfo = GetExprFactory().CreateMethodInfo(expr.UserDefinedCallMethod); + Expr methodInfo = ExprFactory.CreateMethodInfo(expr.UserDefinedCallMethod); Expr call = GenerateCall(pdm, p1, p2, methodInfo); // Delegate add/subtract generates a call to Combine/Remove, which returns System.Delegate, // not the operand delegate CType. We must cast to the delegate CType. @@ -598,7 +584,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics throw Error.InternalCompilerError(); } Expr op = Visit(arg); - Expr methodInfo = GetExprFactory().CreateMethodInfo(expr.UserDefinedCallMethod); + Expr methodInfo = ExprFactory.CreateMethodInfo(expr.UserDefinedCallMethod); if (expr.Kind == ExpressionKind.Inc || expr.Kind == ExpressionKind.Dec || expr.Kind == ExpressionKind.DecimalInc || expr.Kind == ExpressionKind.DecimalDec) @@ -642,17 +628,15 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics p1 = Visit(p1); p2 = Visit(p2); FixLiftedUserDefinedBinaryOperators(expr, ref p1, ref p2); - Expr lift = GetExprFactory().CreateBoolConstant(false); // We never lift to null in C#. - Expr methodInfo = GetExprFactory().CreateMethodInfo(expr.UserDefinedCallMethod); + Expr lift = ExprFactory.CreateBoolConstant(false); // We never lift to null in C#. + Expr methodInfo = ExprFactory.CreateMethodInfo(expr.UserDefinedCallMethod); return GenerateCall(pdm, p1, p2, lift, methodInfo); } - private Expr GenerateConversion(Expr arg, CType CType, bool bChecked) - { - return GenerateConversionWithSource(Visit(arg), CType, bChecked || arg.isChecked()); - } + private Expr GenerateConversion(Expr arg, CType CType, bool bChecked) => + GenerateConversionWithSource(Visit(arg), CType, bChecked || arg.isChecked()); - private Expr GenerateConversionWithSource(Expr pTarget, CType pType, bool bChecked) + private static Expr GenerateConversionWithSource(Expr pTarget, CType pType, bool bChecked) { PREDEFMETH pdm = bChecked ? PREDEFMETH.PM_EXPRESSION_CONVERTCHECKED : PREDEFMETH.PM_EXPRESSION_CONVERT; Expr pTypeOf = CreateTypeOf(pType); @@ -673,7 +657,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return GenerateUserDefinedConversion(arg, type, target, method); } - private Expr GenerateUserDefinedConversion(Expr arg, CType CType, Expr target, MethWithInst method) + private static Expr GenerateUserDefinedConversion(Expr arg, CType CType, Expr target, MethWithInst method) { // The user-defined explicit conversion from enum? to decimal or decimal? requires // that we convert the enum? to its nullable underlying CType. @@ -685,8 +669,8 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // represented in the Expr tree so that this is more transparent. // converting an enum to its underlying CType never fails, so no need to check it. - CType underlyingType = arg.Type.StripNubs().underlyingEnumType(); - CType nullableType = GetSymbolLoader().GetTypeManager().GetNullable(underlyingType); + CType underlyingType = arg.Type.StripNubs().UnderlyingEnumType; + CType nullableType = TypeManager.GetNullable(underlyingType); Expr typeofNubEnum = CreateTypeOf(nullableType); target = GenerateCall(PREDEFMETH.PM_EXPRESSION_CONVERT, target, typeofNubEnum); } @@ -696,12 +680,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // e.g. if we have a user-defined conversion from int to S? and we have (S)myint, then we need to generate // Convert(Convert(myint, typeof(S?), op_implicit), typeof(S)) - CType pMethodReturnType = GetSymbolLoader().GetTypeManager().SubstType(method.Meth().RetType, + CType pMethodReturnType = TypeManager.SubstType(method.Meth().RetType, method.GetType(), method.TypeArgs); bool fDontLiftReturnType = (pMethodReturnType == CType || (IsNullableValueType(arg.Type) && IsNullableValueType(CType))); Expr typeofInner = CreateTypeOf(fDontLiftReturnType ? CType : pMethodReturnType); - Expr methodInfo = GetExprFactory().CreateMethodInfo(method); + Expr methodInfo = ExprFactory.CreateMethodInfo(method); PREDEFMETH pdmInner = arg.isChecked() ? PREDEFMETH.PM_EXPRESSION_CONVERTCHECKED_USER_DEFINED : PREDEFMETH.PM_EXPRESSION_CONVERT_USER_DEFINED; Expr callUserDefinedConversion = GenerateCall(pdmInner, target, typeofInner, methodInfo); @@ -763,25 +747,19 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return GenerateUserDefinedConversion(pCastArgument, pExpr.Type, pConversionSource, pExpr.UserDefinedCallMethod); } - private Expr GenerateParameter(string name, CType CType) + private static Expr GenerateParameter(string name, CType CType) { - GetSymbolLoader().GetPredefindType(PredefinedType.PT_STRING); // force an ensure state - ExprConstant nameString = GetExprFactory().CreateStringConstant(name); + SymbolLoader.GetPredefindType(PredefinedType.PT_STRING); // force an ensure state + ExprConstant nameString = ExprFactory.CreateStringConstant(name); ExprTypeOf pTypeOf = CreateTypeOf(CType); return GenerateCall(PREDEFMETH.PM_EXPRESSION_PARAMETER, pTypeOf, nameString); } - private MethodSymbol GetPreDefMethod(PREDEFMETH pdm) - { - return GetSymbolLoader().getPredefinedMembers().GetMethod(pdm); - } + private static MethodSymbol GetPreDefMethod(PREDEFMETH pdm) => PredefinedMembers.GetMethod(pdm); - private ExprTypeOf CreateTypeOf(CType CType) - { - return GetExprFactory().CreateTypeOf(CType); - } + private static ExprTypeOf CreateTypeOf(CType type) => ExprFactory.CreateTypeOf(type); - private Expr CreateWraps(ExprBoundLambda anonmeth) + private static Expr CreateWraps(ExprBoundLambda anonmeth) { Expr sequence = null; for (Symbol sym = anonmeth.ArgumentScope.firstChild; sym != null; sym = sym.nextChild) @@ -793,15 +771,15 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Debug.Assert(anonmeth.Expression != null); Expr create = GenerateParameter(local.name.Text, local.GetType()); - local.wrap = GetExprFactory().CreateWrap(create); - Expr save = GetExprFactory().CreateSave(local.wrap); + local.wrap = ExprFactory.CreateWrap(create); + Expr save = ExprFactory.CreateSave(local.wrap); if (sequence == null) { sequence = save; } else { - sequence = GetExprFactory().CreateSequence(sequence, save); + sequence = ExprFactory.CreateSequence(sequence, save); } } @@ -812,7 +790,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { Debug.Assert(expr != null); Debug.Assert(expr.MethWithInst.Meth().IsConstructor()); - Expr constructorInfo = GetExprFactory().CreateMethodInfo(expr.MethWithInst); + Expr constructorInfo = ExprFactory.CreateMethodInfo(expr.MethWithInst); Expr args = GenerateArgsList(expr.OptionalArguments); Expr Params = GenerateParamsArray(args, PredefinedType.PT_EXPRESSION); return GenerateCall(PREDEFMETH.PM_EXPRESSION_NEW, constructorInfo, Params); @@ -825,14 +803,14 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics for (ExpressionIterator it = new ExpressionIterator(oldArgs); !it.AtEnd(); it.MoveNext()) { Expr oldArg = it.Current(); - GetExprFactory().AppendItemToList(Visit(oldArg), ref newArgs, ref newArgsTail); + ExprFactory.AppendItemToList(Visit(oldArg), ref newArgs, ref newArgsTail); } return newArgs; } private Expr GenerateIndexList(Expr oldIndices) { - CType intType = symbolLoader.GetPredefindType(PredefinedType.PT_INT); + CType intType = SymbolLoader.GetPredefindType(PredefinedType.PT_INT); Expr newIndices = null; Expr newIndicesTail = newIndices; @@ -841,20 +819,20 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Expr newIndex = it.Current(); if (newIndex.Type != intType) { - newIndex = expressionFactory.CreateCast(EXPRFLAG.EXF_INDEXEXPR, intType, newIndex); + newIndex = ExprFactory.CreateCast(EXPRFLAG.EXF_INDEXEXPR, intType, newIndex); newIndex.Flags |= EXPRFLAG.EXF_CHECKOVERFLOW; } Expr rewrittenIndex = Visit(newIndex); - expressionFactory.AppendItemToList(rewrittenIndex, ref newIndices, ref newIndicesTail); + ExprFactory.AppendItemToList(rewrittenIndex, ref newIndices, ref newIndicesTail); } return newIndices; } - private Expr GenerateConstant(Expr expr) + private static Expr GenerateConstant(Expr expr) { EXPRFLAG flags = 0; - AggregateType pObject = GetSymbolLoader().GetPredefindType(PredefinedType.PT_OBJECT); + AggregateType pObject = SymbolLoader.GetPredefindType(PredefinedType.PT_OBJECT); if (expr.Type is NullType) { @@ -862,85 +840,85 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return GenerateCall(PREDEFMETH.PM_EXPRESSION_CONSTANT_OBJECT_TYPE, expr, pTypeOf); } - AggregateType stringType = GetSymbolLoader().GetPredefindType(PredefinedType.PT_STRING); + AggregateType stringType = SymbolLoader.GetPredefindType(PredefinedType.PT_STRING); if (expr.Type != stringType) { flags = EXPRFLAG.EXF_BOX; } - ExprCast cast = GetExprFactory().CreateCast(flags, pObject, expr); + ExprCast cast = ExprFactory.CreateCast(flags, pObject, expr); ExprTypeOf pTypeOf2 = CreateTypeOf(expr.Type); return GenerateCall(PREDEFMETH.PM_EXPRESSION_CONSTANT_OBJECT_TYPE, cast, pTypeOf2); } - private ExprCall GenerateCall(PREDEFMETH pdm, Expr arg1) + private static ExprCall GenerateCall(PREDEFMETH pdm, Expr arg1) { MethodSymbol method = GetPreDefMethod(pdm); // this should be enforced in an earlier pass and the transform pass should not // be handling this error if (method == null) return null; - AggregateType expressionType = GetSymbolLoader().GetPredefindType(PredefinedType.PT_EXPRESSION); + AggregateType expressionType = SymbolLoader.GetPredefindType(PredefinedType.PT_EXPRESSION); MethWithInst mwi = new MethWithInst(method, expressionType); - ExprMemberGroup pMemGroup = GetExprFactory().CreateMemGroup(null, mwi); - ExprCall call = GetExprFactory().CreateCall(0, mwi.Meth().RetType, arg1, pMemGroup, mwi); + ExprMemberGroup pMemGroup = ExprFactory.CreateMemGroup(null, mwi); + ExprCall call = ExprFactory.CreateCall(0, mwi.Meth().RetType, arg1, pMemGroup, mwi); call.PredefinedMethod = pdm; return call; } - private ExprCall GenerateCall(PREDEFMETH pdm, Expr arg1, Expr arg2) + private static ExprCall GenerateCall(PREDEFMETH pdm, Expr arg1, Expr arg2) { MethodSymbol method = GetPreDefMethod(pdm); if (method == null) return null; - AggregateType expressionType = GetSymbolLoader().GetPredefindType(PredefinedType.PT_EXPRESSION); - Expr args = GetExprFactory().CreateList(arg1, arg2); + AggregateType expressionType = SymbolLoader.GetPredefindType(PredefinedType.PT_EXPRESSION); + Expr args = ExprFactory.CreateList(arg1, arg2); MethWithInst mwi = new MethWithInst(method, expressionType); - ExprMemberGroup pMemGroup = GetExprFactory().CreateMemGroup(null, mwi); - ExprCall call = GetExprFactory().CreateCall(0, mwi.Meth().RetType, args, pMemGroup, mwi); + ExprMemberGroup pMemGroup = ExprFactory.CreateMemGroup(null, mwi); + ExprCall call = ExprFactory.CreateCall(0, mwi.Meth().RetType, args, pMemGroup, mwi); call.PredefinedMethod = pdm; return call; } - private ExprCall GenerateCall(PREDEFMETH pdm, Expr arg1, Expr arg2, Expr arg3) + private static ExprCall GenerateCall(PREDEFMETH pdm, Expr arg1, Expr arg2, Expr arg3) { MethodSymbol method = GetPreDefMethod(pdm); if (method == null) return null; - AggregateType expressionType = GetSymbolLoader().GetPredefindType(PredefinedType.PT_EXPRESSION); - Expr args = GetExprFactory().CreateList(arg1, arg2, arg3); + AggregateType expressionType = SymbolLoader.GetPredefindType(PredefinedType.PT_EXPRESSION); + Expr args = ExprFactory.CreateList(arg1, arg2, arg3); MethWithInst mwi = new MethWithInst(method, expressionType); - ExprMemberGroup pMemGroup = GetExprFactory().CreateMemGroup(null, mwi); - ExprCall call = GetExprFactory().CreateCall(0, mwi.Meth().RetType, args, pMemGroup, mwi); + ExprMemberGroup pMemGroup = ExprFactory.CreateMemGroup(null, mwi); + ExprCall call = ExprFactory.CreateCall(0, mwi.Meth().RetType, args, pMemGroup, mwi); call.PredefinedMethod = pdm; return call; } - private ExprCall GenerateCall(PREDEFMETH pdm, Expr arg1, Expr arg2, Expr arg3, Expr arg4) + private static ExprCall GenerateCall(PREDEFMETH pdm, Expr arg1, Expr arg2, Expr arg3, Expr arg4) { MethodSymbol method = GetPreDefMethod(pdm); if (method == null) return null; - AggregateType expressionType = GetSymbolLoader().GetPredefindType(PredefinedType.PT_EXPRESSION); - Expr args = GetExprFactory().CreateList(arg1, arg2, arg3, arg4); + AggregateType expressionType = SymbolLoader.GetPredefindType(PredefinedType.PT_EXPRESSION); + Expr args = ExprFactory.CreateList(arg1, arg2, arg3, arg4); MethWithInst mwi = new MethWithInst(method, expressionType); - ExprMemberGroup pMemGroup = GetExprFactory().CreateMemGroup(null, mwi); - ExprCall call = GetExprFactory().CreateCall(0, mwi.Meth().RetType, args, pMemGroup, mwi); + ExprMemberGroup pMemGroup = ExprFactory.CreateMemGroup(null, mwi); + ExprCall call = ExprFactory.CreateCall(0, mwi.Meth().RetType, args, pMemGroup, mwi); call.PredefinedMethod = pdm; return call; } - private ExprArrayInit GenerateParamsArray(Expr args, PredefinedType pt) + private static ExprArrayInit GenerateParamsArray(Expr args, PredefinedType pt) { int parameterCount = ExpressionIterator.Count(args); - AggregateType paramsArrayElementType = GetSymbolLoader().GetPredefindType(pt); - ArrayType paramsArrayType = GetSymbolLoader().GetTypeManager().GetArray(paramsArrayElementType, 1, true); - ExprConstant paramsArrayArg = GetExprFactory().CreateIntegerConstant(parameterCount); - return GetExprFactory().CreateArrayInit(paramsArrayType, args, paramsArrayArg, new int[] { parameterCount }, parameterCount); + AggregateType paramsArrayElementType = SymbolLoader.GetPredefindType(pt); + ArrayType paramsArrayType = TypeManager.GetArray(paramsArrayElementType, 1, true); + ExprConstant paramsArrayArg = ExprFactory.CreateIntegerConstant(parameterCount); + return ExprFactory.CreateArrayInit(paramsArrayType, args, paramsArrayArg, new int[] { parameterCount }, parameterCount); } - private void FixLiftedUserDefinedBinaryOperators(ExprBinOp expr, ref Expr pp1, ref Expr pp2) + private static void FixLiftedUserDefinedBinaryOperators(ExprBinOp expr, ref Expr pp1, ref Expr pp2) { // If we have lifted T1 op T2 to T1? op T2?, and we have an expression T1 op T2? or T1? op T2 then // we need to ensure that the unlifted actual arguments are promoted to their nullable CType. @@ -961,15 +939,15 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics CType aatype2 = orig2.Type; // Is the operator even a candidate for lifting? if (!(fptype1 is AggregateType fat1) - || !fat1.getAggregate().IsValueType() + || !fat1.OwningAggregate.IsValueType() || !(fptype2 is AggregateType fat2) - || !fat2.getAggregate().IsValueType()) + || !fat2.OwningAggregate.IsValueType()) { return; } - CType nubfptype1 = GetSymbolLoader().GetTypeManager().GetNullable(fptype1); - CType nubfptype2 = GetSymbolLoader().GetTypeManager().GetNullable(fptype2); + CType nubfptype1 = TypeManager.GetNullable(fptype1); + CType nubfptype2 = TypeManager.GetNullable(fptype2); // If we have null op X, or T1 op T2?, or T1 op null, lift first arg to T1? if (aatype1 is NullType || aatype1 == fptype1 && (aatype2 == nubfptype2 || aatype2 is NullType)) { @@ -985,16 +963,16 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics pp2 = new2; } - private bool IsNullableValueType(CType pType) => - pType is NullableType && pType.StripNubs() is AggregateType agg && agg.getAggregate().IsValueType(); + private static bool IsNullableValueType(CType pType) => + pType is NullableType && pType.StripNubs() is AggregateType agg && agg.OwningAggregate.IsValueType(); - private bool IsNullableValueAccess(Expr pExpr, Expr pObject) + private static bool IsNullableValueAccess(Expr pExpr, Expr pObject) { Debug.Assert(pExpr != null); return pExpr is ExprProperty prop && prop.MemberGroup.OptionalObject == pObject && pObject.Type is NullableType; } private static bool isEnumToDecimalConversion(CType argtype, CType desttype) => - argtype.StripNubs().isEnumType() && desttype.StripNubs().isPredefType(PredefinedType.PT_DECIMAL); + argtype.StripNubs().IsEnumType && desttype.StripNubs().IsPredefType(PredefinedType.PT_DECIMAL); } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ZeroInitialize.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ZeroInitialize.cs index 66051b6ce2..4bff9bdeb6 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ZeroInitialize.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ZeroInitialize.cs @@ -2,6 +2,8 @@ // 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; + namespace Microsoft.CSharp.RuntimeBinder.Semantics { internal sealed class ExprZeroInit : ExprWithType @@ -10,5 +12,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics : base(ExpressionKind.ZeroInit, type) { } + + public override object Object => Activator.CreateInstance(Type.AssociatedSystemType); } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/TypeBind.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/TypeBind.cs index 40a3ac8ef6..3f21c176e2 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/TypeBind.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/TypeBind.cs @@ -18,7 +18,6 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { None = 0x00, Outer = 0x01, - NoDupErrors = 0x02, NoErrors = 0x04, } @@ -33,134 +32,150 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics internal static class TypeBind { // Check the constraints of any type arguments in the given Type. - public static bool CheckConstraints(CSemanticChecker checker, ErrorHandling errHandling, CType type, CheckConstraintsFlags flags) + public static bool CheckConstraints(CType type, CheckConstraintsFlags flags) { type = type.GetNakedType(false); - if (type is NullableType nub) - { - type = nub.GetAts(); - } - if (!(type is AggregateType ats)) - return true; - - if (ats.GetTypeArgsAll().Count == 0) { - // Common case: there are no type vars, so there are no constraints. - ats.fConstraintsChecked = true; - ats.fConstraintError = false; - return true; - } - - if (ats.fConstraintsChecked) - { - // Already checked. - if (!ats.fConstraintError || (flags & CheckConstraintsFlags.NoDupErrors) != 0) + if (type is NullableType nub) { - // No errors or no need to report errors again. - return !ats.fConstraintError; + ats = nub.GetAts(); + } + else + { + return true; } } - TypeArray typeVars = ats.getAggregate().GetTypeVars(); - TypeArray typeArgsThis = ats.GetTypeArgsThis(); - TypeArray typeArgsAll = ats.GetTypeArgsAll(); + if (ats.TypeArgsAll.Count == 0) + { + // Common case: there are no type vars, so there are no constraints. + ats.ConstraintError = false; + return true; + } + + // Already checked. + if (ats.ConstraintError.HasValue) + { + // No errors + if (!ats.ConstraintError.GetValueOrDefault()) + { + return true; + } + + // We want the result, not an exception. + if ((flags & CheckConstraintsFlags.NoErrors) != 0) + { + return false; + } + } + + TypeArray typeVars = ats.OwningAggregate.GetTypeVars(); + TypeArray typeArgsThis = ats.TypeArgsThis; + TypeArray typeArgsAll = ats.TypeArgsAll; Debug.Assert(typeVars.Count == typeArgsThis.Count); - if (!ats.fConstraintsChecked) - { - ats.fConstraintsChecked = true; - ats.fConstraintError = false; - } - // Check the outer type first. If CheckConstraintsFlags.Outer is not specified and the // outer type has already been checked then don't bother checking it. - if (ats.outerType != null && ((flags & CheckConstraintsFlags.Outer) != 0 || !ats.outerType.fConstraintsChecked)) + if (ats.OuterType != null && ((flags & CheckConstraintsFlags.Outer) != 0 || !ats.OuterType.ConstraintError.HasValue)) { - CheckConstraints(checker, errHandling, ats.outerType, flags); - ats.fConstraintError |= ats.outerType.fConstraintError; + if (!CheckConstraints(ats.OuterType, flags)) + { + ats.ConstraintError = true; + return false; + } } if (typeVars.Count > 0) - ats.fConstraintError |= !CheckConstraintsCore(checker, errHandling, ats.getAggregate(), typeVars, typeArgsThis, typeArgsAll, null, (flags & CheckConstraintsFlags.NoErrors)); + { + if (!CheckConstraintsCore(ats.OwningAggregate, typeVars, typeArgsThis, typeArgsAll, null, flags & CheckConstraintsFlags.NoErrors)) + { + ats.ConstraintError = true; + return false; + } + } // Now check type args themselves. for (int i = 0; i < typeArgsThis.Count; i++) { CType arg = typeArgsThis[i].GetNakedType(true); - if (arg is AggregateType atArg && !atArg.fConstraintsChecked) + if (arg is AggregateType atArg && !atArg.ConstraintError.HasValue) { - CheckConstraints(checker, errHandling, atArg, flags | CheckConstraintsFlags.Outer); - if (atArg.fConstraintError) - ats.fConstraintError = true; + CheckConstraints(atArg, flags | CheckConstraintsFlags.Outer); + if (atArg.ConstraintError.GetValueOrDefault()) + { + ats.ConstraintError = true; + return false; + } } } - return !ats.fConstraintError; + + ats.ConstraintError = false; + return true; } //////////////////////////////////////////////////////////////////////////////// // Check the constraints on the method instantiation. - public static void CheckMethConstraints(CSemanticChecker checker, ErrorHandling errCtx, MethWithInst mwi) + public static void CheckMethConstraints(MethWithInst mwi) { Debug.Assert(mwi.Meth() != null && mwi.GetType() != null && mwi.TypeArgs != null); Debug.Assert(mwi.Meth().typeVars.Count == mwi.TypeArgs.Count); - Debug.Assert(mwi.GetType().getAggregate() == mwi.Meth().getClass()); + Debug.Assert(mwi.GetType().OwningAggregate == mwi.Meth().getClass()); if (mwi.TypeArgs.Count > 0) { - CheckConstraintsCore(checker, errCtx, mwi.Meth(), mwi.Meth().typeVars, mwi.TypeArgs, mwi.GetType().GetTypeArgsAll(), mwi.TypeArgs, CheckConstraintsFlags.None); + CheckConstraintsCore(mwi.Meth(), mwi.Meth().typeVars, mwi.TypeArgs, mwi.GetType().TypeArgsAll, mwi.TypeArgs, CheckConstraintsFlags.None); } } + //////////////////////////////////////////////////////////////////////////////// // Check whether typeArgs satisfies the constraints of typeVars. The // typeArgsCls and typeArgsMeth are used for substitution on the bounds. The // tree and symErr are used for error reporting. - - private static bool CheckConstraintsCore(CSemanticChecker checker, ErrorHandling errHandling, Symbol symErr, TypeArray typeVars, TypeArray typeArgs, TypeArray typeArgsCls, TypeArray typeArgsMeth, CheckConstraintsFlags flags) + private static bool CheckConstraintsCore(Symbol symErr, TypeArray typeVars, TypeArray typeArgs, TypeArray typeArgsCls, TypeArray typeArgsMeth, CheckConstraintsFlags flags) { Debug.Assert(typeVars.Count == typeArgs.Count); Debug.Assert(typeVars.Count > 0); Debug.Assert(flags == CheckConstraintsFlags.None || flags == CheckConstraintsFlags.NoErrors); - bool fError = false; - for (int i = 0; i < typeVars.Count; i++) { // Empty bounds should be set to object. TypeParameterType var = (TypeParameterType)typeVars[i]; CType arg = typeArgs[i]; - bool fOK = CheckSingleConstraint(checker, errHandling, symErr, var, arg, typeArgsCls, typeArgsMeth, flags); - fError |= !fOK; + if (!CheckSingleConstraint(symErr, var, arg, typeArgsCls, typeArgsMeth, flags)) + { + return false; + } } - return !fError; + return true; } - private static bool CheckSingleConstraint(CSemanticChecker checker, ErrorHandling errHandling, Symbol symErr, TypeParameterType var, CType arg, TypeArray typeArgsCls, TypeArray typeArgsMeth, CheckConstraintsFlags flags) + private static bool CheckSingleConstraint(Symbol symErr, TypeParameterType var, CType arg, TypeArray typeArgsCls, TypeArray typeArgsMeth, CheckConstraintsFlags flags) { Debug.Assert(!(arg is PointerType)); - Debug.Assert(!arg.isStaticClass()); + Debug.Assert(!arg.IsStaticClass); bool fReportErrors = 0 == (flags & CheckConstraintsFlags.NoErrors); - bool fError = false; - if (var.HasRefConstraint() && !arg.IsRefType()) + if (var.HasRefConstraint && !arg.IsReferenceType) { if (fReportErrors) { - throw errHandling.Error(ErrorCode.ERR_RefConstraintNotSatisfied, symErr, new ErrArgNoRef(var), arg); + throw ErrorHandling.Error(ErrorCode.ERR_RefConstraintNotSatisfied, symErr, new ErrArgNoRef(var), arg); } - fError = true; + return false; } - TypeArray bnds = checker.SymbolLoader.GetTypeManager().SubstTypeArray(var.GetBounds(), typeArgsCls, typeArgsMeth); + TypeArray bnds = TypeManager.SubstTypeArray(var.Bounds, typeArgsCls, typeArgsMeth); int itypeMin = 0; - if (var.HasValConstraint()) + if (var.HasValConstraint) { // If we have a type variable that is constrained to a value type, then we // want to check if its a nullable type, so that we can report the @@ -170,18 +185,18 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // To check whether or not its a nullable type, we need to get the resolved // bound from the type argument and check against that. - if (!arg.IsValType() || arg is NullableType) + if (!arg.IsNonNullableValueType) { if (fReportErrors) { - throw errHandling.Error(ErrorCode.ERR_ValConstraintNotSatisfied, symErr, new ErrArgNoRef(var), arg); + throw ErrorHandling.Error(ErrorCode.ERR_ValConstraintNotSatisfied, symErr, new ErrArgNoRef(var), arg); } - fError = true; + return false; } // Since FValCon() is set it is redundant to check System.ValueType as well. - if (bnds.Count != 0 && bnds[0].isPredefType(PredefinedType.PT_VALUE)) + if (bnds.Count != 0 && bnds[0].IsPredefType(PredefinedType.PT_VALUE)) { itypeMin = 1; } @@ -190,7 +205,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics for (int j = itypeMin; j < bnds.Count; j++) { CType typeBnd = bnds[j]; - if (!SatisfiesBound(checker, arg, typeBnd)) + if (!SatisfiesBound(arg, typeBnd)) { if (fReportErrors) { @@ -205,17 +220,17 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // and b) Nullable is one funky type, and user's can use all the help they can get // when using it. ErrorCode error; - if (arg.IsRefType()) + if (arg.IsReferenceType) { // A reference type can only satisfy bounds to types // to which they have an implicit reference conversion error = ErrorCode.ERR_GenericConstraintNotSatisfiedRefType; } - else if (arg is NullableType nubArg && checker.SymbolLoader.HasBaseConversion(nubArg.GetUnderlyingType(), typeBnd)) // This is inlining FBoxingConv + else if (arg is NullableType nubArg && SymbolLoader.HasBaseConversion(nubArg.UnderlyingType, typeBnd)) // This is inlining FBoxingConv { // nullable types do not satisfy bounds to every type that they are boxable to // They only satisfy bounds of object and ValueType - if (typeBnd.isPredefType(PredefinedType.PT_ENUM) || nubArg.GetUnderlyingType() == typeBnd) + if (typeBnd.IsPredefType(PredefinedType.PT_ENUM) || nubArg.UnderlyingType == typeBnd) { // Nullable types don't satisfy bounds of EnumType, or the underlying type of the enum // even though the conversion from Nullable to these types is a boxing conversion @@ -231,7 +246,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // even when there is a boxing conversion from the Nullable type to // the interface type. This will be a relatively common scenario // so we cal it out separately from the previous case. - Debug.Assert(typeBnd.isInterfaceType()); + Debug.Assert(typeBnd.IsInterfaceType); error = ErrorCode.ERR_GenericConstraintNotSatisfiedNullableInterface; } } @@ -242,38 +257,38 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics error = ErrorCode.ERR_GenericConstraintNotSatisfiedValType; } - throw errHandling.Error(error, new ErrArg(symErr), new ErrArg(typeBnd, ErrArgFlags.Unique), var, new ErrArg(arg, ErrArgFlags.Unique)); + throw ErrorHandling.Error(error, new ErrArg(symErr), new ErrArg(typeBnd, ErrArgFlags.Unique), var, new ErrArg(arg, ErrArgFlags.Unique)); } - fError = true; + return false; } } // Check the newable constraint. - if (!var.HasNewConstraint() || arg.IsValType()) + if (!var.HasNewConstraint || arg.IsValueType) { - return !fError; + return true; } - if (arg.isClassType()) + if (arg.IsClassType) { - AggregateSymbol agg = ((AggregateType)arg).getAggregate(); + AggregateSymbol agg = ((AggregateType)arg).OwningAggregate; // Due to late binding nature of IDE created symbols, the AggregateSymbol might not // have all the information necessary yet, if it is not fully bound. // by calling LookupAggMember, it will ensure that we will update all the // information necessary at least for the given method. - checker.SymbolLoader.LookupAggMember(NameManager.GetPredefinedName(PredefinedName.PN_CTOR), agg, symbmask_t.MASK_ALL); + SymbolLoader.LookupAggMember(NameManager.GetPredefinedName(PredefinedName.PN_CTOR), agg, symbmask_t.MASK_ALL); if (agg.HasPubNoArgCtor() && !agg.IsAbstract()) { - return !fError; + return true; } } if (fReportErrors) { - throw errHandling.Error(ErrorCode.ERR_NewConstraintNotSatisfied, symErr, new ErrArgNoRef(var), arg); + throw ErrorHandling.Error(ErrorCode.ERR_NewConstraintNotSatisfied, symErr, new ErrArgNoRef(var), arg); } return false; @@ -284,12 +299,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // typeBnd could be just about any type (since we added naked type parameter // constraints). - private static bool SatisfiesBound(CSemanticChecker checker, CType arg, CType typeBnd) + private static bool SatisfiesBound(CType arg, CType typeBnd) { if (typeBnd == arg) return true; - switch (typeBnd.GetTypeKind()) + switch (typeBnd.TypeKind) { default: Debug.Assert(false, "Unexpected type."); @@ -313,7 +328,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics Debug.Assert(typeBnd is AggregateType || typeBnd is TypeParameterType || typeBnd is ArrayType); - switch (arg.GetTypeKind()) + switch (arg.TypeKind) { default: return false; @@ -326,7 +341,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics case TypeKind.TK_TypeParameterType: case TypeKind.TK_ArrayType: case TypeKind.TK_AggregateType: - return checker.SymbolLoader.HasBaseConversion(arg, typeBnd); + return SymbolLoader.HasBaseConversion(arg, typeBnd); } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/AggregateType.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/AggregateType.cs index cdc7501642..6934cae864 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/AggregateType.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/AggregateType.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using Microsoft.CSharp.RuntimeBinder.Syntax; namespace Microsoft.CSharp.RuntimeBinder.Semantics { @@ -17,114 +18,19 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics internal sealed class AggregateType : CType { - private TypeArray _pTypeArgsThis; - private TypeArray _pTypeArgsAll; // includes args from outer types - private AggregateSymbol _pOwningAggregate; - private AggregateType _baseType; // This is the result of calling SubstTypeArray on the aggregate's baseClass. private TypeArray _ifacesAll; // This is the result of calling SubstTypeArray on the aggregate's ifacesAll. private TypeArray _winrtifacesAll; //This is the list of collection interfaces implemented by a WinRT object. + private Type _associatedSystemType; - public bool fConstraintsChecked; // Have the constraints been checked yet? - public bool fConstraintError; // Did the constraints check produce an error? - - // These two flags are used to track hiding within interfaces. - // Their use and validity is always localized. See e.g. MemberLookup::LookupInInterfaces. - public bool fAllHidden; // All members are hidden by a derived interface member. - public bool fDiffHidden; // Members other than a specific kind are hidden by a derived interface member or class member. - - public AggregateType outerType; // the outer type if this is a nested type - - public void SetOwningAggregate(AggregateSymbol agg) + public AggregateType(AggregateSymbol parent, TypeArray typeArgsThis, AggregateType outerType) + : base(TypeKind.TK_AggregateType) { - _pOwningAggregate = agg; - } - public AggregateSymbol GetOwningAggregate() - { - return _pOwningAggregate; - } - - public AggregateType GetBaseClass() - { - if (_baseType == null) - { - Type baseSysType = AssociatedSystemType.BaseType; - if (baseSysType == null) - { - return null; - } - - // If we have a generic type definition, then we need to set the - // base class to be our current base type, and use that to calculate - // our agg type and its base, then set it to be the generic version of the - // base type. This is because: - // - // Suppose we have Foo : IFoo - // - // Initially, the BaseType will be IFoo, which gives us the substitution - // that we want to use for our agg type's base type. However, in the Symbol chain, - // we want the base type to be IFoo. So we need to substitute. - // - // If we don't have a generic type definition, then we just need to set our base - // class. This is so that if we have a base type that's generic, we'll be - // getting the correctly instantiated base type. - TypeManager manager = GetOwningAggregate().GetTypeManager(); - AggregateType baseClass = manager.SymbolTable.GetCTypeFromType(baseSysType) as AggregateType; - Debug.Assert(baseClass != null); - _baseType = manager.SubstType(baseClass, GetTypeArgsAll()); - } - - return _baseType; - } - - public IEnumerable TypeHierarchy - { - get - { - if (isInterfaceType()) - { - yield return this; - foreach (AggregateType iface in GetIfacesAll().Items) - { - yield return iface; - } - - yield return getAggregate().GetTypeManager().ObjectAggregateType; - } - else - { - for (AggregateType agg = this; agg != null; agg = agg.GetBaseClass()) - { - yield return agg; - } - } - } - } - - public void SetTypeArgsThis(TypeArray pTypeArgsThis) - { - TypeArray pOuterTypeArgs; - if (outerType != null) - { - Debug.Assert(outerType.GetTypeArgsThis() != null); - Debug.Assert(outerType.GetTypeArgsAll() != null); - - pOuterTypeArgs = outerType.GetTypeArgsAll(); - } - else - { - pOuterTypeArgs = BSYMMGR.EmptyTypeArray(); - } - - Debug.Assert(pTypeArgsThis != null); - _pTypeArgsThis = pTypeArgsThis; - SetTypeArgsAll(pOuterTypeArgs); - } - - private void SetTypeArgsAll(TypeArray outerTypeArgs) - { - Debug.Assert(_pTypeArgsThis != null); + Debug.Assert(typeArgsThis != null); + OuterType = outerType; + OwningAggregate = parent; + TypeArgsThis = typeArgsThis; // Here we need to check our current type args. If we have an open placeholder, // then we need to have all open placeholders, and we want to flush @@ -153,51 +59,333 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // // Ensure that invariant here. - TypeArray pCheckedOuterTypeArgs = outerTypeArgs; - TypeManager pTypeManager = getAggregate().GetTypeManager(); - _pTypeArgsAll = pTypeManager.ConcatenateTypeArrays(pCheckedOuterTypeArgs, _pTypeArgsThis); + Debug.Assert(outerType == null || outerType.TypeArgsAll != null); + TypeArgsAll = outerType != null ? TypeArray.Concat(outerType.TypeArgsAll, typeArgsThis) : typeArgsThis; } - public TypeArray GetTypeArgsThis() - { - return _pTypeArgsThis; - } + public bool? ConstraintError; // Did the constraints check produce an error? - public TypeArray GetTypeArgsAll() - { - return _pTypeArgsAll; - } + // These two flags are used to track hiding within interfaces. + // Their use and validity is always localized. See e.g. MemberLookup::LookupInInterfaces. + public bool AllHidden; // All members are hidden by a derived interface member. + public bool DiffHidden; // Members other than a specific kind are hidden by a derived interface member or class member. - public TypeArray GetIfacesAll() + public AggregateType OuterType { get; } // the outer type if this is a nested type + + public AggregateSymbol OwningAggregate { get; } + + public AggregateType BaseClass { - if (_ifacesAll == null) + get { - _ifacesAll = getAggregate().GetTypeManager().SubstTypeArray(getAggregate().GetIfacesAll(), GetTypeArgsAll()); - } - return _ifacesAll; - } - - public TypeArray GetWinRTCollectionIfacesAll(SymbolLoader pSymbolLoader) - { - if (_winrtifacesAll == null) - { - TypeArray ifaces = GetIfacesAll(); - System.Collections.Generic.List typeList = new System.Collections.Generic.List(); - - for (int i = 0; i < ifaces.Count; i++) + if (_baseType == null) { - AggregateType type = ifaces[i] as AggregateType; - Debug.Assert(type.isInterfaceType()); - - if (type.IsCollectionType()) + Type baseSysType = AssociatedSystemType.BaseType; + if (baseSysType == null) { - typeList.Add(type); + return null; + } + + // If we have a generic type definition, then we need to set the + // base class to be our current base type, and use that to calculate + // our agg type and its base, then set it to be the generic version of the + // base type. This is because: + // + // Suppose we have Foo : IFoo + // + // Initially, the BaseType will be IFoo, which gives us the substitution + // that we want to use for our agg type's base type. However, in the Symbol chain, + // we want the base type to be IFoo. So we need to substitute. + // + // If we don't have a generic type definition, then we just need to set our base + // class. This is so that if we have a base type that's generic, we'll be + // getting the correctly instantiated base type. + AggregateType baseClass = SymbolTable.GetCTypeFromType(baseSysType) as AggregateType; + Debug.Assert(baseClass != null); + _baseType = TypeManager.SubstType(baseClass, TypeArgsAll); + } + + return _baseType; + } + } + + public IEnumerable TypeHierarchy + { + get + { + if (IsInterfaceType) + { + yield return this; + foreach (AggregateType iface in IfacesAll.Items) + { + yield return iface; + } + + yield return PredefinedTypes.GetPredefinedAggregate(PredefinedType.PT_OBJECT).getThisType(); + } + else + { + for (AggregateType agg = this; agg != null; agg = agg.BaseClass) + { + yield return agg; } } - _winrtifacesAll = pSymbolLoader.getBSymmgr().AllocParams(typeList.Count, typeList.ToArray()); } - return _winrtifacesAll; } + + public TypeArray TypeArgsThis { get; } + + public TypeArray TypeArgsAll { get; } + + public TypeArray IfacesAll => _ifacesAll ?? (_ifacesAll = TypeManager.SubstTypeArray(OwningAggregate.GetIfacesAll(), TypeArgsAll)); + + private bool IsCollectionType + { + get + { + Type sysType = AssociatedSystemType; + if (sysType.IsGenericType) + { + Type genType = sysType.GetGenericTypeDefinition(); + return genType == typeof(IList<>) + || genType == typeof(ICollection<>) + || genType == typeof(IEnumerable<>) + || genType == typeof(IReadOnlyList<>) + || genType == typeof(IReadOnlyCollection<>) + || genType == typeof(IDictionary<,>) + || genType == typeof(IReadOnlyDictionary<,>); + } + + return sysType == typeof(System.Collections.IList) + || sysType == typeof(System.Collections.ICollection) + || sysType == typeof(System.Collections.IEnumerable) + || sysType == typeof(System.Collections.Specialized.INotifyCollectionChanged) + || sysType == typeof(System.ComponentModel.INotifyPropertyChanged); + } + } + + public TypeArray WinRTCollectionIfacesAll + { + get + { + if (_winrtifacesAll == null) + { + List typeList = new List(); + foreach (AggregateType type in IfacesAll.Items) + { + Debug.Assert(type.IsInterfaceType); + if (type.IsCollectionType) + { + typeList.Add(type); + } + } + + _winrtifacesAll = TypeArray.Allocate(typeList.ToArray()); + } + + return _winrtifacesAll; + } + } + + public override bool IsReferenceType => OwningAggregate.IsRefType(); + + public override bool IsNonNullableValueType => IsValueType; + + public override bool IsValueType => OwningAggregate.IsValueType(); + + public override bool IsStaticClass => OwningAggregate.IsStatic(); + + public override bool IsPredefined => OwningAggregate.IsPredefined(); + + public override PredefinedType PredefinedType + { + get + { + Debug.Assert(IsPredefined); + return OwningAggregate.GetPredefType(); + } + } + + public override bool IsPredefType(PredefinedType pt) + { + AggregateSymbol agg = OwningAggregate; + return agg.IsPredefined() && agg.GetPredefType() == pt; + } + + public override bool IsDelegateType => OwningAggregate.IsDelegate(); + + public override bool IsSimpleType + { + get + { + AggregateSymbol agg = OwningAggregate; + return agg.IsPredefined() && PredefinedTypeFacts.IsSimpleType(agg.GetPredefType()); + } + } + + public override bool IsSimpleOrEnum + { + get + { + AggregateSymbol agg = OwningAggregate; + return agg.IsPredefined() ? PredefinedTypeFacts.IsSimpleType(agg.GetPredefType()) : agg.IsEnum(); + } + } + + public override bool IsSimpleOrEnumOrString + { + get + { + AggregateSymbol agg = OwningAggregate; + if (agg.IsPredefined()) + { + PredefinedType pt = agg.GetPredefType(); + return PredefinedTypeFacts.IsSimpleType(pt) || pt == PredefinedType.PT_STRING; + } + + return agg.IsEnum(); + } + } + + public override bool IsNumericType + { + get + { + AggregateSymbol agg = OwningAggregate; + return agg.IsPredefined() && PredefinedTypeFacts.IsNumericType(agg.GetPredefType()); + } + } + + public override bool IsStructOrEnum + { + get + { + AggregateSymbol agg = OwningAggregate; + return agg.IsStruct() || agg.IsEnum(); + } + } + + public override bool IsStructType => OwningAggregate.IsStruct(); + + public override bool IsEnumType => OwningAggregate.IsEnum(); + + public override bool IsInterfaceType => OwningAggregate.IsInterface(); + + public override bool IsClassType => OwningAggregate.IsClass(); + + public override AggregateType UnderlyingEnumType + { + get + { + Debug.Assert(IsEnumType); + return OwningAggregate.GetUnderlyingType(); + } + } + + public override Type AssociatedSystemType => _associatedSystemType ?? (_associatedSystemType = CalculateAssociatedSystemType()); + + private Type CalculateAssociatedSystemType() + { + Type uninstantiatedType = OwningAggregate.AssociatedSystemType; + if (uninstantiatedType.IsGenericType) + { + // Get each type arg. + TypeArray typeArgs = TypeArgsAll; + Type[] systemTypeArgs = new Type[typeArgs.Count]; + for (int i = 0; i < systemTypeArgs.Length; i++) + { + // Unnamed type parameter types are just placeholders. + CType typeArg = typeArgs[i]; + if (typeArg is TypeParameterType typeParamArg && typeParamArg.Symbol.name == null) + { + return null; + } + + systemTypeArgs[i] = typeArg.AssociatedSystemType; + } + + try + { + return uninstantiatedType.MakeGenericType(systemTypeArgs); + } + catch (ArgumentException) + { + // If the constraints don't work, just return the type without substituting it. + } + } + + return uninstantiatedType; + } + + public override FUNDTYPE FundamentalType + { + get + { + AggregateSymbol sym = OwningAggregate; + + // Treat enums like their underlying types. + if (sym.IsEnum()) + { + sym = sym.GetUnderlyingType().OwningAggregate; + } + else if (!sym.IsStruct()) + { + return FUNDTYPE.FT_REF; // Interfaces, classes, delegates are reference types. + } + + // Struct type could be predefined (int, long, etc.) or some other struct. + return sym.IsPredefined() ? PredefinedTypeFacts.GetFundType(sym.GetPredefType()) : FUNDTYPE.FT_STRUCT; + } + } + + public override ConstValKind ConstValKind + { + get + { + if (IsPredefType(PredefinedType.PT_INTPTR) || IsPredefType(PredefinedType.PT_UINTPTR)) + { + return ConstValKind.IntPtr; + } + + switch (FundamentalType) + { + case FUNDTYPE.FT_I8: + case FUNDTYPE.FT_U8: + return ConstValKind.Long; + + case FUNDTYPE.FT_STRUCT: + + // Here we can either have a decimal type, or an enum + // whose fundamental type is decimal. + Debug.Assert( + OwningAggregate.IsEnum() && OwningAggregate.GetUnderlyingType().PredefinedType == PredefinedType.PT_DECIMAL + || IsPredefined && PredefinedType == PredefinedType.PT_DATETIME + || IsPredefined && PredefinedType == PredefinedType.PT_DECIMAL); + + return IsPredefined && PredefinedType == PredefinedType.PT_DATETIME + ? ConstValKind.Long + : ConstValKind.Decimal; + + case FUNDTYPE.FT_REF: + return IsPredefined && PredefinedType == PredefinedType.PT_STRING + ? ConstValKind.String + : ConstValKind.IntPtr; + + case FUNDTYPE.FT_R4: + return ConstValKind.Float; + + case FUNDTYPE.FT_R8: + return ConstValKind.Double; + + case FUNDTYPE.FT_I1: + return ConstValKind.Boolean; + + default: + return ConstValKind.Int; + } + } + } + + public override AggregateType GetAts() => this; } } - diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ArgumentListType.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ArgumentListType.cs index 860792294c..7c176163f9 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ArgumentListType.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ArgumentListType.cs @@ -10,5 +10,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // ---------------------------------------------------------------------------- internal sealed class ArgumentListType : CType - { }; + { + public static readonly ArgumentListType Instance = new ArgumentListType(); + + private ArgumentListType() + : base(TypeKind.TK_ArgumentListType) + { + } + } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ArrayType.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ArrayType.cs index 3546c27a51..75ba3ac07e 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ArrayType.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ArrayType.cs @@ -2,6 +2,9 @@ // 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; +using Microsoft.CSharp.RuntimeBinder.Syntax; + namespace Microsoft.CSharp.RuntimeBinder.Semantics { // ---------------------------------------------------------------------------- @@ -10,27 +13,54 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics internal sealed class ArrayType : CType { - // rank of the array. zero means unknown rank int [?]. - public int rank; - - public bool IsSZArray { get; set; } - - public CType GetElementType() { return _pElementType; } - public void SetElementType(CType pType) { _pElementType = pType; } - - // Returns the first non-array type in the parent chain. - public CType GetBaseElementType() + public ArrayType(CType elementType, int rank, bool isSZArray) + : base(TypeKind.TK_ArrayType) { - CType type = GetElementType(); - while (type is ArrayType arr) - { - type = arr.GetElementType(); - } - - return type; + Rank = rank; + IsSZArray = isSZArray; + ElementType = elementType; } - private CType _pElementType; + public int Rank { get; } + + public bool IsSZArray { get; } + + public CType ElementType { get; } + + // Returns the first non-array type in the parent chain. + public CType BaseElementType + { + get + { + CType type = ElementType; + while (type is ArrayType arr) + { + type = arr.ElementType; + } + + return type; + } + } + + public override bool IsReferenceType => true; + + public override bool IsUnsafe() => BaseElementType is PointerType; + + public override Type AssociatedSystemType + { + get + { + Type elementType = ElementType.AssociatedSystemType; + return IsSZArray ? elementType.MakeArrayType() : elementType.MakeArrayType(Rank); + } + } + + public override CType BaseOrParameterOrElementType => ElementType; + + public override FUNDTYPE FundamentalType => FUNDTYPE.FT_REF; + + public override ConstValKind ConstValKind => ConstValKind.IntPtr; + + public override AggregateType GetAts() => SymbolLoader.GetPredefindType(PredefinedType.PT_ARRAY); } } - diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/MethodGroupType.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/MethodGroupType.cs index 71ed798070..8a75eb32ce 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/MethodGroupType.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/MethodGroupType.cs @@ -10,5 +10,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // ---------------------------------------------------------------------------- internal sealed class MethodGroupType : CType - { }; + { + public static readonly MethodGroupType Instance = new MethodGroupType(); + + private MethodGroupType() + : base(TypeKind.TK_MethodGroupType) + { + } + } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/NullType.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/NullType.cs index 1490197951..35e1215cbb 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/NullType.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/NullType.cs @@ -10,5 +10,17 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics internal sealed class NullType : CType { + public static readonly NullType Instance = new NullType(); + + private NullType() + : base(TypeKind.TK_NullType) + { + } + + public override bool IsReferenceType => true; + + public override FUNDTYPE FundamentalType => FUNDTYPE.FT_REF; + + public override ConstValKind ConstValKind => ConstValKind.IntPtr; } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/NullableType.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/NullableType.cs index 089b2b5cf6..d0fab063df 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/NullableType.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/NullableType.cs @@ -2,7 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CSharp.RuntimeBinder.Errors; +using System; +using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; namespace Microsoft.CSharp.RuntimeBinder.Semantics { @@ -16,24 +18,16 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics internal sealed class NullableType : CType { - private AggregateType ats; - public BSYMMGR symmgr; - public TypeManager typeManager; + private AggregateType _ats; - public AggregateType GetAts() + public NullableType(CType underlyingType) + : base(TypeKind.TK_NullableType) { - if (ats == null) - { - AggregateSymbol aggNullable = typeManager.GetNullable(); - CType typePar = GetUnderlyingType(); - CType[] typeParArray = { typePar }; - TypeArray ta = symmgr.AllocParams(1, typeParArray); - ats = typeManager.GetAggregate(aggNullable, ta); - } - - return ats; + UnderlyingType = underlyingType; } - public CType GetUnderlyingType() { return UnderlyingType; } + + public override AggregateType GetAts() => + _ats ?? (_ats = TypeManager.GetAggregate(TypeManager.GetNullable(), TypeArray.Allocate(UnderlyingType))); public override CType StripNubs() => UnderlyingType; @@ -43,8 +37,28 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return UnderlyingType; } - public void SetUnderlyingType(CType pType) { UnderlyingType = pType; } + public CType UnderlyingType { get; } - public CType UnderlyingType; + public override bool IsValueType => true; + + public override bool IsStructOrEnum => true; + + public override bool IsStructType => true; + + public override Type AssociatedSystemType => typeof(Nullable<>).MakeGenericType(UnderlyingType.AssociatedSystemType); + + public override CType BaseOrParameterOrElementType => UnderlyingType; + + public override FUNDTYPE FundamentalType => FUNDTYPE.FT_STRUCT; + + [ExcludeFromCodeCoverage] // Should be unreachable. Overload exists just to catch it being hit during debug. + public override ConstValKind ConstValKind + { + get + { + Debug.Fail("Constant nullable?"); + return ConstValKind.Decimal; // Equivalent to previous code, so least change for this unreachable branch. + } + } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ParameterModifierType.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ParameterModifierType.cs index 7bf3ab81ef..cac1fcf372 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ParameterModifierType.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ParameterModifierType.cs @@ -2,6 +2,8 @@ // 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; + namespace Microsoft.CSharp.RuntimeBinder.Semantics { // ---------------------------------------------------------------------------- @@ -15,11 +17,19 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics internal sealed class ParameterModifierType : CType { - public bool isOut; // True for out parameter, false for ref parameter. + public ParameterModifierType(CType parameterType, bool isOut) + : base(TypeKind.TK_ParameterModifierType) + { + ParameterType = parameterType; + IsOut = isOut; + } - public CType GetParameterType() { return _pParameterType; } - public void SetParameterType(CType pType) { _pParameterType = pType; } + public bool IsOut { get; } // True for out parameter, false for ref parameter. - private CType _pParameterType; + public CType ParameterType { get; } + + public override Type AssociatedSystemType => ParameterType.AssociatedSystemType.MakeByRefType(); + + public override CType BaseOrParameterOrElementType => ParameterType; } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/PointerType.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/PointerType.cs index a3e6a4ddb6..5298048603 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/PointerType.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/PointerType.cs @@ -2,12 +2,38 @@ // 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; +using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; + namespace Microsoft.CSharp.RuntimeBinder.Semantics { internal sealed class PointerType : CType { - public CType GetReferentType() { return _pReferentType; } - public void SetReferentType(CType pType) { _pReferentType = pType; } - private CType _pReferentType; + public PointerType(CType referentType) + : base(TypeKind.TK_PointerType) + { + ReferentType = referentType; + } + + public CType ReferentType { get; } + + public override bool IsUnsafe() => true; + + public override Type AssociatedSystemType => ReferentType.AssociatedSystemType.MakePointerType(); + + public override CType BaseOrParameterOrElementType => ReferentType; + + public override FUNDTYPE FundamentalType => FUNDTYPE.FT_PTR; + + [ExcludeFromCodeCoverage] // Technically correct, but we can't have constant pointers in dynamically dispatched code. + public override ConstValKind ConstValKind + { + get + { + Debug.Fail("Constant of pointer in dynamic code?"); + return ConstValKind.IntPtr; + } + } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/PredefinedTypes.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/PredefinedTypes.cs index 437a150b1f..7a80b8f26d 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/PredefinedTypes.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/PredefinedTypes.cs @@ -9,23 +9,15 @@ using Microsoft.CSharp.RuntimeBinder.Syntax; namespace Microsoft.CSharp.RuntimeBinder.Semantics { - internal sealed class PredefinedTypes + internal static class PredefinedTypes { - private SymbolTable _runtimeBinderSymbolTable; - private readonly BSYMMGR _symbolManager; - private AggregateSymbol[] _predefSyms; // array of predefined symbol types. - - public PredefinedTypes(BSYMMGR symbolManager) - { - _symbolManager = symbolManager; - _runtimeBinderSymbolTable = null; - } + private static readonly AggregateSymbol[] s_predefSymbols = new AggregateSymbol[(int)PredefinedType.PT_COUNT]; // We want to delay load the predefined symbols as needed. - private AggregateSymbol DelayLoadPredefSym(PredefinedType pt) + private static AggregateSymbol DelayLoadPredefSym(PredefinedType pt) { - CType type = _runtimeBinderSymbolTable.GetCTypeFromType(PredefinedTypeFacts.GetAssociatedSystemType(pt)); - AggregateSymbol sym = type.getAggregate(); + AggregateType type = (AggregateType)SymbolTable.GetCTypeFromType(PredefinedTypeFacts.GetAssociatedSystemType(pt)); + AggregateSymbol sym = type.OwningAggregate; return InitializePredefinedType(sym, pt); } @@ -38,35 +30,22 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return sym; } - public void Init(SymbolTable symtable) - { - _runtimeBinderSymbolTable = symtable; - Debug.Assert(_symbolManager != null); - Debug.Assert(_predefSyms == null); - - _predefSyms = new AggregateSymbol[(int)PredefinedType.PT_COUNT]; - } - - public AggregateSymbol GetPredefinedAggregate(PredefinedType pt) => - _predefSyms[(int)pt] ?? (_predefSyms[(int)pt] = DelayLoadPredefSym(pt)); + public static AggregateSymbol GetPredefinedAggregate(PredefinedType pt) => + s_predefSymbols[(int)pt] ?? (s_predefSymbols[(int)pt] = DelayLoadPredefSym(pt)); //////////////////////////////////////////////////////////////////////////////// // Some of the predefined types have built-in names, like "int" or "string" or - // "object". This return the nice name if one exists; otherwise null is + // "object". This return the nice name if one exists; otherwise null is // returned. private static string GetNiceName(PredefinedType pt) => PredefinedTypeFacts.GetNiceName(pt); public static string GetNiceName(AggregateSymbol type) => type.IsPredefined() ? GetNiceName(type.GetPredefType()) : null; - - public static string GetFullName(PredefinedType pt) => PredefinedTypeFacts.GetName(pt); } internal static class PredefinedTypeFacts { - internal static string GetName(PredefinedType type) => s_types[(int)type].Name; - internal static FUNDTYPE GetFundType(PredefinedType type) => s_types[(int)type].FundType; internal static Type GetAssociatedSystemType(PredefinedType type) => s_types[(int)type].AssociatedSystemType; diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/Type.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/Type.cs index 71477ffff7..d8a7386e23 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/Type.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/Type.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections.Generic; using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; using System.Reflection; using Microsoft.CSharp.RuntimeBinder.Syntax; @@ -12,167 +12,19 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { internal abstract class CType { - private TypeKind _typeKind; - private Name _pName; - - public bool IsWindowsRuntimeType() + private protected CType(TypeKind kind) { - return (AssociatedSystemType.Attributes & TypeAttributes.WindowsRuntime) == TypeAttributes.WindowsRuntime; + TypeKind = kind; } - public bool IsCollectionType() - { - if ((AssociatedSystemType.IsGenericType && - (AssociatedSystemType.GetGenericTypeDefinition() == typeof(IList<>) || - AssociatedSystemType.GetGenericTypeDefinition() == typeof(ICollection<>) || - AssociatedSystemType.GetGenericTypeDefinition() == typeof(IEnumerable<>) || - AssociatedSystemType.GetGenericTypeDefinition() == typeof(IReadOnlyList<>) || - AssociatedSystemType.GetGenericTypeDefinition() == typeof(IReadOnlyCollection<>) || - AssociatedSystemType.GetGenericTypeDefinition() == typeof(IDictionary<,>) || - AssociatedSystemType.GetGenericTypeDefinition() == typeof(IReadOnlyDictionary<,>))) || - AssociatedSystemType == typeof(System.Collections.IList) || - AssociatedSystemType == typeof(System.Collections.ICollection) || - AssociatedSystemType == typeof(System.Collections.IEnumerable) || - AssociatedSystemType == typeof(System.Collections.Specialized.INotifyCollectionChanged) || - AssociatedSystemType == typeof(System.ComponentModel.INotifyPropertyChanged)) - { - return true; - } - return false; - } + public bool IsWindowsRuntimeType => (AssociatedSystemType.Attributes & TypeAttributes.WindowsRuntime) != 0; - private Type _associatedSystemType; - public Type AssociatedSystemType - { - get - { - if (_associatedSystemType == null) - { - _associatedSystemType = CalculateAssociatedSystemType(this); - } + [ExcludeFromCodeCoverage] // Should only be called through override. + public virtual Type AssociatedSystemType => throw Error.InternalCompilerError(); - return _associatedSystemType; - } - } + public TypeKind TypeKind { get; } - private static Type CalculateAssociatedSystemType(CType src) - { - Type result = null; - - switch (src.GetTypeKind()) - { - case TypeKind.TK_ArrayType: - ArrayType a = (ArrayType)src; - Type elementType = a.GetElementType().AssociatedSystemType; - result = a.IsSZArray ? elementType.MakeArrayType() : elementType.MakeArrayType(a.rank); - break; - - case TypeKind.TK_NullableType: - NullableType n = (NullableType)src; - Type underlyingType = n.GetUnderlyingType().AssociatedSystemType; - result = typeof(Nullable<>).MakeGenericType(underlyingType); - break; - - case TypeKind.TK_PointerType: - PointerType p = (PointerType)src; - Type referentType = p.GetReferentType().AssociatedSystemType; - result = referentType.MakePointerType(); - break; - - case TypeKind.TK_ParameterModifierType: - ParameterModifierType r = (ParameterModifierType)src; - Type parameterType = r.GetParameterType().AssociatedSystemType; - result = parameterType.MakeByRefType(); - break; - - case TypeKind.TK_AggregateType: - result = CalculateAssociatedSystemTypeForAggregate((AggregateType)src); - break; - - case TypeKind.TK_TypeParameterType: - TypeParameterType t = (TypeParameterType)src; - if (t.IsMethodTypeParameter()) - { - MethodInfo meth = ((MethodSymbol)t.GetOwningSymbol()).AssociatedMemberInfo as MethodInfo; - result = meth.GetGenericArguments()[t.GetIndexInOwnParameters()]; - } - else - { - Type parentType = ((AggregateSymbol)t.GetOwningSymbol()).AssociatedSystemType; - result = parentType.GetGenericArguments()[t.GetIndexInOwnParameters()]; - } - break; - } - - Debug.Assert(result != null || src.GetTypeKind() == TypeKind.TK_AggregateType); - return result; - } - - private static Type CalculateAssociatedSystemTypeForAggregate(AggregateType aggtype) - { - AggregateSymbol agg = aggtype.GetOwningAggregate(); - TypeArray typeArgs = aggtype.GetTypeArgsAll(); - - List list = new List(); - - // Get each type arg. - for (int i = 0; i < typeArgs.Count; i++) - { - // Unnamed type parameter types are just placeholders. - if (typeArgs[i] is TypeParameterType typeParamArg && typeParamArg.GetTypeParameterSymbol().name == null) - { - return null; - } - list.Add(typeArgs[i].AssociatedSystemType); - } - - Type[] systemTypeArgs = list.ToArray(); - Type uninstantiatedType = agg.AssociatedSystemType; - - if (uninstantiatedType.IsGenericType) - { - try - { - return uninstantiatedType.MakeGenericType(systemTypeArgs); - } - catch (ArgumentException) - { - // If the constraints don't work, just return the type without substituting it. - return uninstantiatedType; - } - } - return uninstantiatedType; - } - - public TypeKind GetTypeKind() { return _typeKind; } - public void SetTypeKind(TypeKind kind) { _typeKind = kind; } - - public Name GetName() { return _pName; } - public void SetName(Name pName) { _pName = pName; } - - // This call switches on the kind and dispatches accordingly. This should really only be - // used when dereferencing TypeArrays. We should consider refactoring our code to not - // need this type of thing - strongly typed handling of TypeArrays would be much better. - public CType GetBaseOrParameterOrElementType() - { - switch (GetTypeKind()) - { - case TypeKind.TK_ArrayType: - return ((ArrayType)this).GetElementType(); - - case TypeKind.TK_PointerType: - return ((PointerType)this).GetReferentType(); - - case TypeKind.TK_ParameterModifierType: - return ((ParameterModifierType)this).GetParameterType(); - - case TypeKind.TK_NullableType: - return ((NullableType)this).GetUnderlyingType(); - - default: - return null; - } - } + public virtual CType BaseOrParameterOrElementType => null; //////////////////////////////////////////////////////////////////////////////// // Given a symbol, determine its fundamental type. This is the type that @@ -181,97 +33,9 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // one of the integral/float types (includes enums with that underlying type) // reference type // struct/value type - public FUNDTYPE fundType() - { - switch (GetTypeKind()) - { - case TypeKind.TK_AggregateType: - { - AggregateSymbol sym = ((AggregateType)this).getAggregate(); + public virtual FUNDTYPE FundamentalType => FUNDTYPE.FT_NONE; - // Treat enums like their underlying types. - if (sym.IsEnum()) - { - sym = sym.GetUnderlyingType().getAggregate(); - } - - if (sym.IsStruct()) - { - // Struct type could be predefined (int, long, etc.) or some other struct. - if (sym.IsPredefined()) - return PredefinedTypeFacts.GetFundType(sym.GetPredefType()); - return FUNDTYPE.FT_STRUCT; - } - return FUNDTYPE.FT_REF; // Interfaces, classes, delegates are reference types. - } - - case TypeKind.TK_TypeParameterType: - return FUNDTYPE.FT_VAR; - - case TypeKind.TK_ArrayType: - case TypeKind.TK_NullType: - return FUNDTYPE.FT_REF; - - case TypeKind.TK_PointerType: - return FUNDTYPE.FT_PTR; - - case TypeKind.TK_NullableType: - return FUNDTYPE.FT_STRUCT; - - default: - return FUNDTYPE.FT_NONE; - } - } - public ConstValKind constValKind() - { - if (isPointerLike()) - { - return ConstValKind.IntPtr; - } - - switch (fundType()) - { - case FUNDTYPE.FT_I8: - case FUNDTYPE.FT_U8: - return ConstValKind.Long; - case FUNDTYPE.FT_STRUCT: - // Here we can either have a decimal type, or an enum - // whose fundamental type is decimal. - Debug.Assert((getAggregate().IsEnum() && getAggregate().GetUnderlyingType().getPredefType() == PredefinedType.PT_DECIMAL) - || (isPredefined() && getPredefType() == PredefinedType.PT_DATETIME) - || (isPredefined() && getPredefType() == PredefinedType.PT_DECIMAL)); - - if (isPredefined() && getPredefType() == PredefinedType.PT_DATETIME) - { - return ConstValKind.Long; - } - return ConstValKind.Decimal; - - case FUNDTYPE.FT_REF: - if (isPredefined() && getPredefType() == PredefinedType.PT_STRING) - { - return ConstValKind.String; - } - else - { - return ConstValKind.IntPtr; - } - case FUNDTYPE.FT_R4: - return ConstValKind.Float; - case FUNDTYPE.FT_R8: - return ConstValKind.Double; - case FUNDTYPE.FT_I1: - return ConstValKind.Boolean; - default: - return ConstValKind.Int; - } - } - public CType underlyingType() - { - if (this is AggregateType && getAggregate().IsEnum()) - return getAggregate().GetUnderlyingType(); - return this; - } + public virtual ConstValKind ConstValKind => ConstValKind.Int; //////////////////////////////////////////////////////////////////////////////// // Strips off ArrayType, ParameterModifierType, PointerType, PinnedType and optionally NullableType @@ -280,37 +44,27 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { for (CType type = this; ;) { - switch (type.GetTypeKind()) + switch (type.TypeKind) { default: return type; case TypeKind.TK_NullableType: if (!fStripNub) - return type; - type = type.GetBaseOrParameterOrElementType(); - break; + { + goto default; + } + + goto case TypeKind.TK_ArrayType; + case TypeKind.TK_ArrayType: case TypeKind.TK_ParameterModifierType: case TypeKind.TK_PointerType: - type = type.GetBaseOrParameterOrElementType(); + type = type.BaseOrParameterOrElementType; break; } } } - public AggregateSymbol GetNakedAgg() - { - return GetNakedAgg(false); - } - - private AggregateSymbol GetNakedAgg(bool fStripNub) => - (GetNakedType(fStripNub) as AggregateType)?.getAggregate(); - - public AggregateSymbol getAggregate() - { - Debug.Assert(this is AggregateType); - return ((AggregateType)this).GetOwningAggregate(); - } public virtual CType StripNubs() => this; @@ -320,177 +74,61 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return this; } - public bool isDelegateType() - { - return this is AggregateType && getAggregate().IsDelegate(); - } + public virtual bool IsDelegateType => false; //////////////////////////////////////////////////////////////////////////////// // A few types are considered "simple" types for purposes of conversions and so // on. They are the fundamental types the compiler knows about for operators and // conversions. - public bool isSimpleType() - { - return (isPredefined() && - PredefinedTypeFacts.IsSimpleType(getPredefType())); - } - public bool isSimpleOrEnum() - { - return isSimpleType() || isEnumType(); - } - public bool isSimpleOrEnumOrString() - { - return isSimpleType() || isPredefType(PredefinedType.PT_STRING) || isEnumType(); - } + public virtual bool IsSimpleType => false; - private bool isPointerLike() - { - return this is PointerType || isPredefType(PredefinedType.PT_INTPTR) || isPredefType(PredefinedType.PT_UINTPTR); - } + public virtual bool IsSimpleOrEnum => false; + + public virtual bool IsSimpleOrEnumOrString => false; //////////////////////////////////////////////////////////////////////////////// // A few types are considered "numeric" types. They are the fundamental number // types the compiler knows about for operators and conversions. - public bool isNumericType() - { - return (isPredefined() && - PredefinedTypeFacts.IsNumericType(getPredefType())); - } - public bool isStructOrEnum() - { - return this is AggregateType && (getAggregate().IsStruct() || getAggregate().IsEnum()) || this is NullableType; - } - public bool isStructType() - { - return this is AggregateType && getAggregate().IsStruct() || this is NullableType; - } - public bool isEnumType() - { - return this is AggregateType && getAggregate().IsEnum(); - } - public bool isInterfaceType() - { - return this is AggregateType && getAggregate().IsInterface(); - } - public bool isClassType() - { - return this is AggregateType && getAggregate().IsClass(); - } - public AggregateType underlyingEnumType() - { - Debug.Assert(isEnumType()); - return getAggregate().GetUnderlyingType(); - } - public bool isUnsigned() - { - if (this is AggregateType sym) - { - if (sym.isEnumType()) - { - sym = sym.underlyingEnumType(); - } - if (sym.isPredefined()) - { - PredefinedType pt = sym.getPredefType(); - return pt == PredefinedType.PT_UINTPTR || pt == PredefinedType.PT_BYTE || (pt >= PredefinedType.PT_USHORT && pt <= PredefinedType.PT_ULONG); - } - else - { - return false; - } - } - else - { - return this is PointerType; - } - } - public bool isUnsafe() - { - // Pointer types are the only unsafe types. - // Note that generics may not be instantiated with pointer types - return this is PointerType || this is ArrayType arr && arr.GetElementType().isUnsafe(); - } - public bool isPredefType(PredefinedType pt) - { - if (this is AggregateType ats) - return ats.getAggregate().IsPredefined() && ats.getAggregate().GetPredefType() == pt; - return (this is VoidType && pt == PredefinedType.PT_VOID); - } - public bool isPredefined() - { - return this is AggregateType && getAggregate().IsPredefined(); - } - public PredefinedType getPredefType() - { - //ASSERT(isPredefined()); - return getAggregate().GetPredefType(); - } + public virtual bool IsNumericType => false; - public bool isStaticClass() - { - AggregateSymbol agg = GetNakedAgg(false); - if (agg == null) - return false; + public virtual bool IsStructOrEnum => false; - if (!agg.IsStatic()) - return false; + public virtual bool IsStructType => false; - return true; - } + public virtual bool IsEnumType => false; - public CType GetDelegateTypeOfPossibleExpression() - { - if (isPredefType(PredefinedType.PT_G_EXPRESSION)) - { - return ((AggregateType)this).GetTypeArgsThis()[0]; - } + public virtual bool IsInterfaceType => false; - return this; - } + public virtual bool IsClassType => false; + + [ExcludeFromCodeCoverage] // Should only be called through override. + public virtual AggregateType UnderlyingEnumType => throw Error.InternalCompilerError(); + + // Pointer types (or arrays of them) are the only unsafe types. + // Note that generics may not be instantiated with pointer types + public virtual bool IsUnsafe() => false; + + public virtual bool IsPredefType(PredefinedType pt) => false; + + public virtual bool IsPredefined => false; + + [ExcludeFromCodeCoverage] // Should only be called through override. + public virtual PredefinedType PredefinedType => throw Error.InternalCompilerError(); + + public virtual bool IsStaticClass => false; // These check for AGGTYPESYMs, TYVARSYMs and others as appropriate. - public bool IsValType() + public virtual bool IsValueType => false; + + public virtual bool IsNonNullableValueType => false; + + public virtual bool IsReferenceType => false; + + [ExcludeFromCodeCoverage] // Should only be called through override. + public virtual AggregateType GetAts() { - switch (GetTypeKind()) - { - case TypeKind.TK_TypeParameterType: - return ((TypeParameterType)this).IsValueType(); - case TypeKind.TK_AggregateType: - return ((AggregateType)this).getAggregate().IsValueType(); - case TypeKind.TK_NullableType: - return true; - default: - return false; - } - } - public bool IsNonNubValType() - { - switch (GetTypeKind()) - { - case TypeKind.TK_TypeParameterType: - return ((TypeParameterType)this).IsNonNullableValueType(); - case TypeKind.TK_AggregateType: - return ((AggregateType)this).getAggregate().IsValueType(); - case TypeKind.TK_NullableType: - return false; - default: - return false; - } - } - public bool IsRefType() - { - switch (GetTypeKind()) - { - case TypeKind.TK_ArrayType: - case TypeKind.TK_NullType: - return true; - case TypeKind.TK_TypeParameterType: - return ((TypeParameterType)this).IsReferenceType(); - case TypeKind.TK_AggregateType: - return ((AggregateType)this).getAggregate().IsRefType(); - default: - return false; - } + Debug.Fail("Bad type for AsAggregateType"); + return null; } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeArray.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeArray.cs index 414a895e91..bd36a6f3c6 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeArray.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeArray.cs @@ -3,7 +3,9 @@ // See the LICENSE file in the project root for more information. using System; +using System.Collections.Generic; using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; using System.Linq; namespace Microsoft.CSharp.RuntimeBinder.Semantics @@ -13,7 +15,77 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics internal sealed class TypeArray { - public TypeArray(CType[] types) + //////////////////////////////////////////////////////////////////////////////// + // Allocate a type array; used to represent a parameter list. + // We use a hash table to make sure that allocating the same type array twice + // returns the same value. This does two things: + // + // 1) Save a lot of memory. + // 2) Make it so parameter lists can be compared by a simple pointer comparison + + private readonly struct TypeArrayKey : IEquatable + { + private readonly CType[] _types; + private readonly int _hashCode; + + public TypeArrayKey(CType[] types) + { + _types = types; + int hashCode = 0x162A16FE; + foreach (CType type in types) + { + hashCode = (hashCode << 5) - hashCode; + if (type != null) + { + hashCode ^= type.GetHashCode(); + } + } + + _hashCode = hashCode; + } + + public bool Equals(TypeArrayKey other) + { + CType[] types = _types; + CType[] otherTypes = other._types; + if (otherTypes == types) + { + return true; + } + + if (other._hashCode != _hashCode || otherTypes.Length != types.Length) + { + return false; + } + + for (int i = 0; i < types.Length; i++) + { + if (types[i] != otherTypes[i]) + { + return false; + } + } + + return true; + } + + [ExcludeFromCodeCoverage] // Typed overload should always be the method called. + public override bool Equals(object obj) + { + Debug.Fail("Sub-optimal overload called. Check if this can be avoided."); + return obj is TypeArrayKey key && Equals(key); + } + + public override int GetHashCode() => _hashCode; + } + + // The RuntimeBinder uses a global lock when Binding that keeps this dictionary safe. + private static readonly Dictionary s_tableTypeArrays = + new Dictionary(); + + public static readonly TypeArray Empty = new TypeArray(Array.Empty()); + + private TypeArray(CType[] types) { Debug.Assert(types != null); Items = types; @@ -33,5 +105,61 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics } public void CopyItems(int i, int c, CType[] dest) => Array.Copy(Items, i, dest, 0, c); + + public static TypeArray Allocate(int ctype, TypeArray array, int offset) + { + if (ctype == 0) + { + return Empty; + } + + if (ctype == array.Count) + { + return array; + } + + CType[] types = array.Items; + CType[] newTypes = new CType[ctype]; + Array.ConstrainedCopy(types, offset, newTypes, 0, ctype); + return Allocate(newTypes); + } + + public static TypeArray Allocate(params CType[] types) + { + if (types?.Length > 0) + { + RuntimeBinder.EnsureLockIsTaken(); + TypeArrayKey key = new TypeArrayKey(types); + if (!s_tableTypeArrays.TryGetValue(key, out TypeArray result)) + { + result = new TypeArray(types); + s_tableTypeArrays.Add(key, result); + } + + return result; + } + + return Empty; + } + + public static TypeArray Concat(TypeArray pta1, TypeArray pta2) + { + CType[] prgtype1 = pta1.Items; + if (prgtype1.Length == 0) + { + return pta2; + } + + CType[] prgtype2 = pta2.Items; + if (prgtype2.Length == 0) + { + return pta1; + } + + CType[] combined = new CType[prgtype1.Length + prgtype2.Length]; + Array.Copy(prgtype1, 0, combined, 0, prgtype1.Length); + Array.Copy(prgtype2, 0, combined, prgtype1.Length, prgtype2.Length); + return Allocate(combined); + } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeFactory.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeFactory.cs deleted file mode 100644 index bca41ac99f..0000000000 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeFactory.cs +++ /dev/null @@ -1,115 +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 Microsoft.CSharp.RuntimeBinder.Syntax; - -namespace Microsoft.CSharp.RuntimeBinder.Semantics -{ - internal sealed class TypeFactory - { - // Aggregate - public AggregateType CreateAggregateType( - AggregateSymbol parent, - TypeArray typeArgsThis, - AggregateType outerType) - { - AggregateType type = new AggregateType(); - - type.outerType = outerType; - type.SetOwningAggregate(parent); - type.SetTypeArgsThis(typeArgsThis); - type.SetTypeKind(TypeKind.TK_AggregateType); - return type; - } - - // TypeParameter - public TypeParameterType CreateTypeParameter(TypeParameterSymbol pSymbol) - { - TypeParameterType type = new TypeParameterType(); - type.SetTypeParameterSymbol(pSymbol); - type.SetName(pSymbol.name); - Debug.Assert(pSymbol.GetTypeParameterType() == null); - pSymbol.SetTypeParameterType(type); - - type.SetTypeKind(TypeKind.TK_TypeParameterType); - return type; - } - - // Primitives - public VoidType CreateVoid() - { - VoidType type = new VoidType(); - type.SetTypeKind(TypeKind.TK_VoidType); - return type; - } - - public NullType CreateNull() - { - NullType type = new NullType(); - type.SetTypeKind(TypeKind.TK_NullType); - return type; - } - - public MethodGroupType CreateMethodGroup() - { - MethodGroupType type = new MethodGroupType(); - type.SetTypeKind(TypeKind.TK_MethodGroupType); - return type; - } - - public ArgumentListType CreateArgList() - { - ArgumentListType type = new ArgumentListType(); - type.SetTypeKind(TypeKind.TK_ArgumentListType); - return type; - } - - // Derived types - parent is base type - public ArrayType CreateArray(Name name, CType pElementType, int rank, bool isSZArray) - { - ArrayType type = new ArrayType(); - - type.SetName(name); - type.rank = rank; - type.IsSZArray = isSZArray; - type.SetElementType(pElementType); - - type.SetTypeKind(TypeKind.TK_ArrayType); - return type; - } - - public PointerType CreatePointer(Name name, CType pReferentType) - { - PointerType type = new PointerType(); - type.SetName(name); - type.SetReferentType(pReferentType); - - type.SetTypeKind(TypeKind.TK_PointerType); - return type; - } - - public ParameterModifierType CreateParameterModifier(Name name, CType pParameterType) - { - ParameterModifierType type = new ParameterModifierType(); - type.SetName(name); - type.SetParameterType(pParameterType); - - type.SetTypeKind(TypeKind.TK_ParameterModifierType); - return type; - } - - public NullableType CreateNullable(Name name, CType pUnderlyingType, BSYMMGR symmgr, TypeManager typeManager) - { - NullableType type = new NullableType(); - type.SetName(name); - type.SetUnderlyingType(pUnderlyingType); - type.symmgr = symmgr; - type.typeManager = typeManager; - - type.SetTypeKind(TypeKind.TK_NullableType); - return type; - } - } -} diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeManager.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeManager.cs index b0fdce88ea..e8453abb1c 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeManager.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeManager.cs @@ -8,51 +8,18 @@ using System.Diagnostics; using System.Linq; using System.Reflection; using System.Runtime.CompilerServices; +using System.Security; using Microsoft.CSharp.RuntimeBinder.Syntax; namespace Microsoft.CSharp.RuntimeBinder.Semantics { - internal sealed class TypeManager + internal static class TypeManager { - private BSYMMGR _BSymmgr; - private PredefinedTypes _predefTypes; + // The RuntimeBinder uses a global lock when Binding that keeps this dictionary safe. + private static readonly Dictionary<(Assembly, Assembly), bool> s_internalsVisibleToCache = + new Dictionary<(Assembly, Assembly), bool>(); - private readonly TypeFactory _typeFactory; - private readonly TypeTable _typeTable; - private SymbolTable _symbolTable; - - // Special types - private readonly VoidType _voidType; - private readonly NullType _nullType; - private readonly MethodGroupType _typeMethGrp; - private readonly ArgumentListType _argListType; - - private readonly StdTypeVarColl _stvcMethod; - private readonly StdTypeVarColl _stvcClass; - - public TypeManager(BSYMMGR bsymmgr, PredefinedTypes predefTypes) - { - _typeFactory = new TypeFactory(); - _typeTable = new TypeTable(); - - // special types with their own symbol kind. - _voidType = _typeFactory.CreateVoid(); - _nullType = _typeFactory.CreateNull(); - _typeMethGrp = _typeFactory.CreateMethodGroup(); - _argListType = _typeFactory.CreateArgList(); - - _stvcMethod = new StdTypeVarColl(); - _stvcClass = new StdTypeVarColl(); - _BSymmgr = bsymmgr; - _predefTypes = predefTypes; - } - - public void InitTypeFactory(SymbolTable table) - { - _symbolTable = table; - } - - public SymbolTable SymbolTable => _symbolTable; + private static readonly StdTypeVarColl s_stvcMethod = new StdTypeVarColl(); private sealed class StdTypeVarColl { @@ -74,104 +41,80 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // comparison when binding. The standard method type variables are useful during // binding for signature comparison. - public TypeParameterType GetTypeVarSym(int iv, TypeManager pTypeManager, bool fMeth) + public TypeParameterType GetTypeVarSym(int iv, bool fMeth) { Debug.Assert(iv >= 0); TypeParameterType tpt; - if (iv >= this.prgptvs.Count) + if (iv >= prgptvs.Count) { TypeParameterSymbol pTypeParameter = new TypeParameterSymbol(); pTypeParameter.SetIsMethodTypeParameter(fMeth); pTypeParameter.SetIndexInOwnParameters(iv); pTypeParameter.SetIndexInTotalParameters(iv); pTypeParameter.SetAccess(ACCESS.ACC_PRIVATE); - tpt = pTypeManager.GetTypeParameter(pTypeParameter); - this.prgptvs.Add(tpt); + tpt = GetTypeParameter(pTypeParameter); + prgptvs.Add(tpt); } else { - tpt = this.prgptvs[iv]; + tpt = prgptvs[iv]; } Debug.Assert(tpt != null); return tpt; } } - public ArrayType GetArray(CType elementType, int args, bool isSZArray) + public static ArrayType GetArray(CType elementType, int args, bool isSZArray) { - Name name; - Debug.Assert(args > 0 && args < 32767); Debug.Assert(args == 1 || !isSZArray); - switch (args) - { - case 1: - if (isSZArray) - { - goto case 2; - } - else - { - goto default; - } - case 2: - name = NameManager.GetPredefinedName(PredefinedName.PN_ARRAY0 + args); - break; - default: - name = NameManager.Add("[X" + args + 1); - break; - } + int rankNum = isSZArray ? 0 : args; // See if we already have an array type of this element type and rank. - ArrayType pArray = _typeTable.LookupArray(name, elementType); + ArrayType pArray = TypeTable.LookupArray(elementType, rankNum); if (pArray == null) { // No existing array symbol. Create a new one. - pArray = _typeFactory.CreateArray(name, elementType, args, isSZArray); - _typeTable.InsertArray(name, elementType, pArray); + pArray = new ArrayType(elementType, args, isSZArray); + TypeTable.InsertArray(elementType, rankNum, pArray); } - Debug.Assert(pArray.rank == args); - Debug.Assert(pArray.GetElementType() == elementType); + Debug.Assert(pArray.Rank == args); + Debug.Assert(pArray.ElementType == elementType); return pArray; } - public AggregateType GetAggregate(AggregateSymbol agg, AggregateType atsOuter, TypeArray typeArgs) + public static AggregateType GetAggregate(AggregateSymbol agg, AggregateType atsOuter, TypeArray typeArgs) { - Debug.Assert(agg.GetTypeManager() == this); - Debug.Assert(atsOuter == null || atsOuter.getAggregate() == agg.Parent, ""); + Debug.Assert(atsOuter == null || atsOuter.OwningAggregate == agg.Parent, ""); if (typeArgs == null) { - typeArgs = BSYMMGR.EmptyTypeArray(); + typeArgs = TypeArray.Empty; } Debug.Assert(agg.GetTypeVars().Count == typeArgs.Count); - AggregateType pAggregate = _typeTable.LookupAggregate(agg, atsOuter, typeArgs); + AggregateType pAggregate = TypeTable.LookupAggregate(agg, atsOuter, typeArgs); if (pAggregate == null) { - pAggregate = _typeFactory.CreateAggregateType( - agg, - typeArgs, - atsOuter - ); + pAggregate = new AggregateType(agg, typeArgs, atsOuter); - Debug.Assert(!pAggregate.fConstraintsChecked && !pAggregate.fConstraintError); + Debug.Assert(!pAggregate.ConstraintError.HasValue); - _typeTable.InsertAggregate(agg, atsOuter, typeArgs, pAggregate); + TypeTable.InsertAggregate(agg, atsOuter, typeArgs, pAggregate); } - Debug.Assert(pAggregate.getAggregate() == agg); - Debug.Assert(pAggregate.GetTypeArgsThis() != null && pAggregate.GetTypeArgsAll() != null); - Debug.Assert(pAggregate.GetTypeArgsThis() == typeArgs); + Debug.Assert(pAggregate.OwningAggregate == agg); + Debug.Assert(pAggregate.TypeArgsThis != null && pAggregate.TypeArgsAll != null); + Debug.Assert(pAggregate.TypeArgsThis == typeArgs); return pAggregate; } - public AggregateType GetAggregate(AggregateSymbol agg, TypeArray typeArgsAll) + public static AggregateType GetAggregate(AggregateSymbol agg, TypeArray typeArgsAll) { Debug.Assert(typeArgsAll != null && typeArgsAll.Count == agg.GetTypeVarsAll().Count); @@ -186,127 +129,80 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics int cvarOuter = aggOuter.GetTypeVarsAll().Count; Debug.Assert(cvarOuter <= typeArgsAll.Count); - TypeArray typeArgsOuter = _BSymmgr.AllocParams(cvarOuter, typeArgsAll, 0); - TypeArray typeArgsInner = _BSymmgr.AllocParams(agg.GetTypeVars().Count, typeArgsAll, cvarOuter); + TypeArray typeArgsOuter = TypeArray.Allocate(cvarOuter, typeArgsAll, 0); + TypeArray typeArgsInner = TypeArray.Allocate(agg.GetTypeVars().Count, typeArgsAll, cvarOuter); AggregateType atsOuter = GetAggregate(aggOuter, typeArgsOuter); return GetAggregate(agg, atsOuter, typeArgsInner); } - public PointerType GetPointer(CType baseType) + public static PointerType GetPointer(CType baseType) { - PointerType pPointer = _typeTable.LookupPointer(baseType); + PointerType pPointer = TypeTable.LookupPointer(baseType); if (pPointer == null) { // No existing type. Create a new one. - Name namePtr = NameManager.GetPredefinedName(PredefinedName.PN_PTR); - - pPointer = _typeFactory.CreatePointer(namePtr, baseType); - _typeTable.InsertPointer(baseType, pPointer); + pPointer = new PointerType(baseType); + TypeTable.InsertPointer(baseType, pPointer); } - Debug.Assert(pPointer.GetReferentType() == baseType); + Debug.Assert(pPointer.ReferentType == baseType); return pPointer; } - public NullableType GetNullable(CType pUnderlyingType) + public static NullableType GetNullable(CType pUnderlyingType) { - if (pUnderlyingType is NullableType nt) - { - Debug.Fail("Attempt to make nullable of nullable"); - return nt; - } + Debug.Assert(!(pUnderlyingType is NullableType), "Attempt to make nullable of nullable"); - NullableType pNullableType = _typeTable.LookupNullable(pUnderlyingType); + NullableType pNullableType = TypeTable.LookupNullable(pUnderlyingType); if (pNullableType == null) { - Name pName = NameManager.GetPredefinedName(PredefinedName.PN_NUB); - - pNullableType = _typeFactory.CreateNullable(pName, pUnderlyingType, _BSymmgr, this); - _typeTable.InsertNullable(pUnderlyingType, pNullableType); + pNullableType = new NullableType(pUnderlyingType); + TypeTable.InsertNullable(pUnderlyingType, pNullableType); } return pNullableType; } - public NullableType GetNubFromNullable(AggregateType ats) + public static ParameterModifierType GetParameterModifier(CType paramType, bool isOut) { - Debug.Assert(ats.isPredefType(PredefinedType.PT_G_OPTIONAL)); - return GetNullable(ats.GetTypeArgsAll()[0]); - } - - public ParameterModifierType GetParameterModifier(CType paramType, bool isOut) - { - Name name = NameManager.GetPredefinedName(isOut ? PredefinedName.PN_OUTPARAM : PredefinedName.PN_REFPARAM); - ParameterModifierType pParamModifier = _typeTable.LookupParameterModifier(name, paramType); - + ParameterModifierType pParamModifier = TypeTable.LookupParameterModifier(paramType, isOut); if (pParamModifier == null) { // No existing parammod symbol. Create a new one. - pParamModifier = _typeFactory.CreateParameterModifier(name, paramType); - pParamModifier.isOut = isOut; - _typeTable.InsertParameterModifier(name, paramType, pParamModifier); + pParamModifier = new ParameterModifierType(paramType, isOut); + TypeTable.InsertParameterModifier(paramType, isOut, pParamModifier); } - Debug.Assert(pParamModifier.GetParameterType() == paramType); + Debug.Assert(pParamModifier.ParameterType == paramType); return pParamModifier; } - public VoidType GetVoid() + public static AggregateSymbol GetNullable() => GetPredefAgg(PredefinedType.PT_G_OPTIONAL); + + private static CType SubstType(CType typeSrc, TypeArray typeArgsCls, TypeArray typeArgsMeth, bool denormMeth) { - return _voidType; + Debug.Assert(typeSrc != null); + SubstContext ctx = new SubstContext(typeArgsCls, typeArgsMeth, denormMeth); + return ctx.IsNop ? typeSrc : SubstTypeCore(typeSrc, ctx); } - public NullType GetNullType() + public static AggregateType SubstType(AggregateType typeSrc, TypeArray typeArgsCls) { - return _nullType; + Debug.Assert(typeSrc != null); + + SubstContext ctx = new SubstContext(typeArgsCls, null, false); + return ctx.IsNop ? typeSrc : SubstTypeCore(typeSrc, ctx); } - public MethodGroupType GetMethGrpType() + private static CType SubstType(CType typeSrc, TypeArray typeArgsCls, TypeArray typeArgsMeth) => + SubstType(typeSrc, typeArgsCls, typeArgsMeth, false); + + public static TypeArray SubstTypeArray(TypeArray taSrc, SubstContext ctx) { - return _typeMethGrp; - } - - public ArgumentListType GetArgListType() - { - return _argListType; - } - - public AggregateSymbol GetNullable() => GetPredefAgg(PredefinedType.PT_G_OPTIONAL); - - private CType SubstType(CType typeSrc, TypeArray typeArgsCls, TypeArray typeArgsMeth, SubstTypeFlags grfst) - { - if (typeSrc == null) - return null; - - var ctx = new SubstContext(typeArgsCls, typeArgsMeth, grfst); - return ctx.FNop() ? typeSrc : SubstTypeCore(typeSrc, ctx); - } - - public AggregateType SubstType(AggregateType typeSrc, TypeArray typeArgsCls) - { - if (typeSrc != null) - { - SubstContext ctx = new SubstContext(typeArgsCls, null, SubstTypeFlags.NormNone); - if (!ctx.FNop()) - { - return SubstTypeCore(typeSrc, ctx); - } - } - - return typeSrc; - } - - private CType SubstType(CType typeSrc, TypeArray typeArgsCls, TypeArray typeArgsMeth) - { - return SubstType(typeSrc, typeArgsCls, typeArgsMeth, SubstTypeFlags.NormNone); - } - - public TypeArray SubstTypeArray(TypeArray taSrc, SubstContext ctx) - { - if (taSrc != null && taSrc.Count != 0 && ctx != null && !ctx.FNop()) + if (taSrc != null && taSrc.Count != 0 && ctx != null && !ctx.IsNop) { CType[] srcs = taSrc.Items; for (int i = 0; i < srcs.Length; i++) @@ -323,7 +219,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics dsts[i] = SubstTypeCore(srcs[i], ctx); } - return _BSymmgr.AllocParams(dsts); + return TypeArray.Allocate(dsts); } } } @@ -331,34 +227,34 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return taSrc; } - public TypeArray SubstTypeArray(TypeArray taSrc, TypeArray typeArgsCls, TypeArray typeArgsMeth) + public static TypeArray SubstTypeArray(TypeArray taSrc, TypeArray typeArgsCls, TypeArray typeArgsMeth) => taSrc == null || taSrc.Count == 0 ? taSrc - : SubstTypeArray(taSrc, new SubstContext(typeArgsCls, typeArgsMeth, SubstTypeFlags.NormNone)); + : SubstTypeArray(taSrc, new SubstContext(typeArgsCls, typeArgsMeth, false)); - public TypeArray SubstTypeArray(TypeArray taSrc, TypeArray typeArgsCls) => SubstTypeArray(taSrc, typeArgsCls, null); + public static TypeArray SubstTypeArray(TypeArray taSrc, TypeArray typeArgsCls) => SubstTypeArray(taSrc, typeArgsCls, null); - private AggregateType SubstTypeCore(AggregateType type, SubstContext ctx) + private static AggregateType SubstTypeCore(AggregateType type, SubstContext ctx) { - TypeArray args = type.GetTypeArgsAll(); + TypeArray args = type.TypeArgsAll; if (args.Count > 0) { TypeArray typeArgs = SubstTypeArray(args, ctx); if (args != typeArgs) { - return GetAggregate(type.getAggregate(), typeArgs); + return GetAggregate(type.OwningAggregate, typeArgs); } } return type; } - private CType SubstTypeCore(CType type, SubstContext pctx) + private static CType SubstTypeCore(CType type, SubstContext pctx) { CType typeSrc; CType typeDst; - switch (type.GetTypeKind()) + switch (type.TypeKind) { default: Debug.Assert(false); @@ -372,20 +268,20 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics case TypeKind.TK_ParameterModifierType: ParameterModifierType mod = (ParameterModifierType)type; - typeDst = SubstTypeCore(typeSrc = mod.GetParameterType(), pctx); - return (typeDst == typeSrc) ? type : GetParameterModifier(typeDst, mod.isOut); + typeDst = SubstTypeCore(typeSrc = mod.ParameterType, pctx); + return (typeDst == typeSrc) ? type : GetParameterModifier(typeDst, mod.IsOut); case TypeKind.TK_ArrayType: var arr = (ArrayType)type; - typeDst = SubstTypeCore(typeSrc = arr.GetElementType(), pctx); - return (typeDst == typeSrc) ? type : GetArray(typeDst, arr.rank, arr.IsSZArray); + typeDst = SubstTypeCore(typeSrc = arr.ElementType, pctx); + return (typeDst == typeSrc) ? type : GetArray(typeDst, arr.Rank, arr.IsSZArray); case TypeKind.TK_PointerType: - typeDst = SubstTypeCore(typeSrc = ((PointerType)type).GetReferentType(), pctx); + typeDst = SubstTypeCore(typeSrc = ((PointerType)type).ReferentType, pctx); return (typeDst == typeSrc) ? type : GetPointer(typeDst); case TypeKind.TK_NullableType: - typeDst = SubstTypeCore(typeSrc = ((NullableType)type).GetUnderlyingType(), pctx); + typeDst = SubstTypeCore(typeSrc = ((NullableType)type).UnderlyingType, pctx); return (typeDst == typeSrc) ? type : GetNullable(typeDst); case TypeKind.TK_AggregateType: @@ -393,45 +289,44 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics case TypeKind.TK_TypeParameterType: { - TypeParameterSymbol tvs = ((TypeParameterType)type).GetTypeParameterSymbol(); + TypeParameterSymbol tvs = ((TypeParameterType)type).Symbol; int index = tvs.GetIndexInTotalParameters(); if (tvs.IsMethodTypeParameter()) { - if ((pctx.grfst & SubstTypeFlags.DenormMeth) != 0 && tvs.parent != null) + if (pctx.DenormMeth && tvs.parent != null) + { return type; + } + Debug.Assert(tvs.GetIndexInOwnParameters() == tvs.GetIndexInTotalParameters()); - if (index < pctx.ctypeMeth) + if (index < pctx.MethodTypes.Length) { - Debug.Assert(pctx.prgtypeMeth != null); - return pctx.prgtypeMeth[index]; + Debug.Assert(pctx.MethodTypes != null); + return pctx.MethodTypes[index]; } - else - { - return ((pctx.grfst & SubstTypeFlags.NormMeth) != 0 ? GetStdMethTypeVar(index) : type); - } - } - if ((pctx.grfst & SubstTypeFlags.DenormClass) != 0 && tvs.parent != null) + return type; - return index < pctx.ctypeCls ? pctx.prgtypeCls[index] : - ((pctx.grfst & SubstTypeFlags.NormClass) != 0 ? GetStdClsTypeVar(index) : type); + } + + return index < pctx.ClassTypes.Length ? pctx.ClassTypes[index] : type; } } } - public bool SubstEqualTypes(CType typeDst, CType typeSrc, TypeArray typeArgsCls, TypeArray typeArgsMeth, SubstTypeFlags grfst) + public static bool SubstEqualTypes(CType typeDst, CType typeSrc, TypeArray typeArgsCls, TypeArray typeArgsMeth, bool denormMeth) { if (typeDst.Equals(typeSrc)) { - Debug.Assert(typeDst.Equals(SubstType(typeSrc, typeArgsCls, typeArgsMeth, grfst))); + Debug.Assert(typeDst.Equals(SubstType(typeSrc, typeArgsCls, typeArgsMeth, denormMeth))); return true; } - var ctx = new SubstContext(typeArgsCls, typeArgsMeth, grfst); + SubstContext ctx = new SubstContext(typeArgsCls, typeArgsMeth, denormMeth); - return !ctx.FNop() && SubstEqualTypesCore(typeDst, typeSrc, ctx); + return !ctx.IsNop && SubstEqualTypesCore(typeDst, typeSrc, ctx); } - public bool SubstEqualTypeArrays(TypeArray taDst, TypeArray taSrc, TypeArray typeArgsCls, TypeArray typeArgsMeth, SubstTypeFlags grfst) + public static bool SubstEqualTypeArrays(TypeArray taDst, TypeArray taSrc, TypeArray typeArgsCls, TypeArray typeArgsMeth) { // Handle the simple common cases first. if (taDst == taSrc || (taDst != null && taDst.Equals(taSrc))) @@ -449,10 +344,12 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (taDst.Count == 0) return true; - var ctx = new SubstContext(typeArgsCls, typeArgsMeth, grfst); + var ctx = new SubstContext(typeArgsCls, typeArgsMeth, true); - if (ctx.FNop()) + if (ctx.IsNop) + { return false; + } for (int i = 0; i < taDst.Count; i++) { @@ -463,7 +360,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return true; } - private bool SubstEqualTypesCore(CType typeDst, CType typeSrc, SubstContext pctx) + private static bool SubstEqualTypesCore(CType typeDst, CType typeSrc, SubstContext pctx) { LRecurse: // Label used for "tail" recursion. @@ -472,7 +369,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics return true; } - switch (typeSrc.GetTypeKind()) + switch (typeSrc.TypeKind) { default: Debug.Assert(false, "Bad Symbol kind in SubstEqualTypesCore"); @@ -481,29 +378,30 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics case TypeKind.TK_NullType: case TypeKind.TK_VoidType: // There should only be a single instance of these. - Debug.Assert(typeDst.GetTypeKind() != typeSrc.GetTypeKind()); + Debug.Assert(typeDst.TypeKind != typeSrc.TypeKind); return false; case TypeKind.TK_ArrayType: ArrayType arrSrc = (ArrayType)typeSrc; - if (!(typeDst is ArrayType arrDst) || arrDst.rank != arrSrc.rank || arrDst.IsSZArray != arrSrc.IsSZArray) + if (!(typeDst is ArrayType arrDst) || arrDst.Rank != arrSrc.Rank || arrDst.IsSZArray != arrSrc.IsSZArray) return false; goto LCheckBases; case TypeKind.TK_ParameterModifierType: - if (!(typeDst is ParameterModifierType modDest) || - ((pctx.grfst & SubstTypeFlags.NoRefOutDifference) == 0 && - modDest.isOut != ((ParameterModifierType)typeSrc).isOut)) + if (!(typeDst is ParameterModifierType modDest) || modDest.IsOut != ((ParameterModifierType)typeSrc).IsOut) + { return false; + } + goto LCheckBases; case TypeKind.TK_PointerType: case TypeKind.TK_NullableType: - if (typeDst.GetTypeKind() != typeSrc.GetTypeKind()) + if (typeDst.TypeKind != typeSrc.TypeKind) return false; LCheckBases: - typeSrc = typeSrc.GetBaseOrParameterOrElementType(); - typeDst = typeDst.GetBaseOrParameterOrElementType(); + typeSrc = typeSrc.BaseOrParameterOrElementType; + typeDst = typeDst.BaseOrParameterOrElementType; goto LRecurse; case TypeKind.TK_AggregateType: @@ -512,15 +410,15 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { // BLOCK AggregateType atsSrc = (AggregateType)typeSrc; - if (atsSrc.getAggregate() != atsDst.getAggregate()) + if (atsSrc.OwningAggregate != atsDst.OwningAggregate) return false; - Debug.Assert(atsSrc.GetTypeArgsAll().Count == atsDst.GetTypeArgsAll().Count); + Debug.Assert(atsSrc.TypeArgsAll.Count == atsDst.TypeArgsAll.Count); // All the args must unify. - for (int i = 0; i < atsSrc.GetTypeArgsAll().Count; i++) + for (int i = 0; i < atsSrc.TypeArgsAll.Count; i++) { - if (!SubstEqualTypesCore(atsDst.GetTypeArgsAll()[i], atsSrc.GetTypeArgsAll()[i], pctx)) + if (!SubstEqualTypesCore(atsDst.TypeArgsAll[i], atsSrc.TypeArgsAll[i], pctx)) return false; } } @@ -528,41 +426,32 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics case TypeKind.TK_TypeParameterType: { // BLOCK - TypeParameterSymbol tvs = ((TypeParameterType)typeSrc).GetTypeParameterSymbol(); + TypeParameterSymbol tvs = ((TypeParameterType)typeSrc).Symbol; int index = tvs.GetIndexInTotalParameters(); if (tvs.IsMethodTypeParameter()) { - if ((pctx.grfst & SubstTypeFlags.DenormMeth) != 0 && tvs.parent != null) + if (pctx.DenormMeth && tvs.parent != null) { // typeDst == typeSrc was handled above. Debug.Assert(typeDst != typeSrc); return false; } - Debug.Assert(tvs.GetIndexInOwnParameters() == tvs.GetIndexInTotalParameters()); - Debug.Assert(pctx.prgtypeMeth == null || tvs.GetIndexInTotalParameters() < pctx.ctypeMeth); - if (index < pctx.ctypeMeth && pctx.prgtypeMeth != null) + + Debug.Assert(tvs.GetIndexInOwnParameters() == index); + Debug.Assert(tvs.GetIndexInTotalParameters() < pctx.MethodTypes.Length); + if (index < pctx.MethodTypes.Length) { - return typeDst == pctx.prgtypeMeth[index]; - } - if ((pctx.grfst & SubstTypeFlags.NormMeth) != 0) - { - return typeDst == GetStdMethTypeVar(index); + return typeDst == pctx.MethodTypes[index]; } } else { - if ((pctx.grfst & SubstTypeFlags.DenormClass) != 0 && tvs.parent != null) + Debug.Assert(index < pctx.ClassTypes.Length); + if (index < pctx.ClassTypes.Length) { - // typeDst == typeSrc was handled above. - Debug.Assert(typeDst != typeSrc); - return false; + return typeDst == pctx.ClassTypes[index]; } - Debug.Assert(pctx.prgtypeCls == null || tvs.GetIndexInTotalParameters() < pctx.ctypeCls); - if (index < pctx.ctypeCls) - return typeDst == pctx.prgtypeCls[index]; - if ((pctx.grfst & SubstTypeFlags.NormClass) != 0) - return typeDst == GetStdClsTypeVar(index); } } return false; @@ -576,7 +465,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics if (type == typeFind || type.Equals(typeFind)) return true; - switch (type.GetTypeKind()) + switch (type.TypeKind) { default: Debug.Assert(false, "Bad Symbol kind in TypeContainsType"); @@ -585,23 +474,23 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics case TypeKind.TK_NullType: case TypeKind.TK_VoidType: // There should only be a single instance of these. - Debug.Assert(typeFind.GetTypeKind() != type.GetTypeKind()); + Debug.Assert(typeFind.TypeKind != type.TypeKind); return false; case TypeKind.TK_ArrayType: case TypeKind.TK_NullableType: case TypeKind.TK_ParameterModifierType: case TypeKind.TK_PointerType: - type = type.GetBaseOrParameterOrElementType(); + type = type.BaseOrParameterOrElementType; goto LRecurse; case TypeKind.TK_AggregateType: { // BLOCK AggregateType ats = (AggregateType)type; - for (int i = 0; i < ats.GetTypeArgsAll().Count; i++) + for (int i = 0; i < ats.TypeArgsAll.Count; i++) { - if (TypeContainsType(ats.GetTypeArgsAll()[i], typeFind)) + if (TypeContainsType(ats.TypeArgsAll[i], typeFind)) return true; } } @@ -615,7 +504,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics public static bool TypeContainsTyVars(CType type, TypeArray typeVars) { LRecurse: // Label used for "tail" recursion. - switch (type.GetTypeKind()) + switch (type.TypeKind) { default: Debug.Assert(false, "Bad Symbol kind in TypeContainsTyVars"); @@ -630,16 +519,16 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics case TypeKind.TK_NullableType: case TypeKind.TK_ParameterModifierType: case TypeKind.TK_PointerType: - type = type.GetBaseOrParameterOrElementType(); + type = type.BaseOrParameterOrElementType; goto LRecurse; case TypeKind.TK_AggregateType: { // BLOCK AggregateType ats = (AggregateType)type; - for (int i = 0; i < ats.GetTypeArgsAll().Count; i++) + for (int i = 0; i < ats.TypeArgsAll.Count; i++) { - if (TypeContainsTyVars(ats.GetTypeArgsAll()[i], typeVars)) + if (TypeContainsTyVars(ats.TypeArgsAll[i], typeVars)) { return true; } @@ -650,117 +539,53 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics case TypeKind.TK_TypeParameterType: if (typeVars != null && typeVars.Count > 0) { - int ivar = ((TypeParameterType)type).GetIndexInTotalParameters(); + int ivar = ((TypeParameterType)type).IndexInTotalParameters; return ivar < typeVars.Count && type == typeVars[ivar]; } return true; } } - public static bool ParametersContainTyVar(TypeArray @params, TypeParameterType typeFind) - { - Debug.Assert(@params != null); - Debug.Assert(typeFind != null); - for (int p = 0; p < @params.Count; p++) - { - CType sym = @params[p]; - if (TypeContainsType(sym, typeFind)) - { - return true; - } - } - return false; - } + public static AggregateSymbol GetPredefAgg(PredefinedType pt) => PredefinedTypes.GetPredefinedAggregate(pt); - public AggregateSymbol GetPredefAgg(PredefinedType pt) => _predefTypes.GetPredefinedAggregate(pt); + public static AggregateType SubstType(AggregateType typeSrc, SubstContext ctx) => + ctx == null || ctx.IsNop ? typeSrc : SubstTypeCore(typeSrc, ctx); - public TypeArray ConcatenateTypeArrays(TypeArray pTypeArray1, TypeArray pTypeArray2) - { - return _BSymmgr.ConcatParams(pTypeArray1, pTypeArray2); - } + public static CType SubstType(CType typeSrc, SubstContext pctx) => + pctx == null || pctx.IsNop ? typeSrc : SubstTypeCore(typeSrc, pctx); - public TypeArray GetStdMethTyVarArray(int cTyVars) - { - TypeParameterType[] prgvar = new TypeParameterType[cTyVars]; + public static CType SubstType(CType typeSrc, AggregateType atsCls) => SubstType(typeSrc, atsCls, null); - for (int ivar = 0; ivar < cTyVars; ivar++) - { - prgvar[ivar] = GetStdMethTypeVar(ivar); - } + public static CType SubstType(CType typeSrc, AggregateType atsCls, TypeArray typeArgsMeth) => + SubstType(typeSrc, atsCls?.TypeArgsAll, typeArgsMeth); - return _BSymmgr.AllocParams(cTyVars, (CType[])prgvar); - } + public static CType SubstType(CType typeSrc, CType typeCls, TypeArray typeArgsMeth) => + SubstType(typeSrc, (typeCls as AggregateType)?.TypeArgsAll, typeArgsMeth); - public AggregateType SubstType(AggregateType typeSrc, SubstContext ctx) => - ctx == null || ctx.FNop() ? typeSrc : SubstTypeCore(typeSrc, ctx); + public static TypeArray SubstTypeArray(TypeArray taSrc, AggregateType atsCls, TypeArray typeArgsMeth) => + SubstTypeArray(taSrc, atsCls?.TypeArgsAll, typeArgsMeth); - public CType SubstType(CType typeSrc, SubstContext pctx) - { - return (pctx == null || pctx.FNop()) ? typeSrc : SubstTypeCore(typeSrc, pctx); - } + public static TypeArray SubstTypeArray(TypeArray taSrc, AggregateType atsCls) => SubstTypeArray(taSrc, atsCls, null); - public CType SubstType(CType typeSrc, AggregateType atsCls) - { - return SubstType(typeSrc, atsCls, (TypeArray)null); - } + private static bool SubstEqualTypes(CType typeDst, CType typeSrc, CType typeCls, TypeArray typeArgsMeth) => + SubstEqualTypes(typeDst, typeSrc, (typeCls as AggregateType)?.TypeArgsAll, typeArgsMeth, false); - public CType SubstType(CType typeSrc, AggregateType atsCls, TypeArray typeArgsMeth) - { - return SubstType(typeSrc, atsCls?.GetTypeArgsAll(), typeArgsMeth); - } + public static bool SubstEqualTypes(CType typeDst, CType typeSrc, CType typeCls) => SubstEqualTypes(typeDst, typeSrc, typeCls, null); - public CType SubstType(CType typeSrc, CType typeCls, TypeArray typeArgsMeth) - { - return SubstType(typeSrc, (typeCls as AggregateType)?.GetTypeArgsAll(), typeArgsMeth); - } - - public TypeArray SubstTypeArray(TypeArray taSrc, AggregateType atsCls, TypeArray typeArgsMeth) - { - return SubstTypeArray(taSrc, atsCls?.GetTypeArgsAll(), typeArgsMeth); - } - - public TypeArray SubstTypeArray(TypeArray taSrc, AggregateType atsCls) - { - return this.SubstTypeArray(taSrc, atsCls, (TypeArray)null); - } - - private bool SubstEqualTypes(CType typeDst, CType typeSrc, CType typeCls, TypeArray typeArgsMeth) - { - return SubstEqualTypes(typeDst, typeSrc, (typeCls as AggregateType)?.GetTypeArgsAll(), typeArgsMeth, SubstTypeFlags.NormNone); - } - - public bool SubstEqualTypes(CType typeDst, CType typeSrc, CType typeCls) - { - return SubstEqualTypes(typeDst, typeSrc, typeCls, (TypeArray)null); - } - - //public bool SubstEqualTypeArrays(TypeArray taDst, TypeArray taSrc, AggregateType atsCls, TypeArray typeArgsMeth) - //{ - // return SubstEqualTypeArrays(taDst, taSrc, atsCls != null ? atsCls.GetTypeArgsAll() : (TypeArray)null, typeArgsMeth, SubstTypeFlags.NormNone); - //} - - public TypeParameterType GetStdMethTypeVar(int iv) - { - return _stvcMethod.GetTypeVarSym(iv, this, true); - } - - private TypeParameterType GetStdClsTypeVar(int iv) - { - return _stvcClass.GetTypeVarSym(iv, this, false); - } + public static TypeParameterType GetStdMethTypeVar(int iv) => s_stvcMethod.GetTypeVarSym(iv, true); // These are singletons for each. - public TypeParameterType GetTypeParameter(TypeParameterSymbol pSymbol) + public static TypeParameterType GetTypeParameter(TypeParameterSymbol pSymbol) { Debug.Assert(pSymbol.GetTypeParameterType() == null); // Should have been checked first before creating - return _typeFactory.CreateTypeParameter(pSymbol); + return new TypeParameterType(pSymbol); } // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // RUNTIME BINDER ONLY CHANGE // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - internal bool GetBestAccessibleType(CSemanticChecker semanticChecker, BindingContext bindingContext, CType typeSrc, out CType typeDst) + internal static CType GetBestAccessibleType(AggregateSymbol context, CType typeSrc) { // This method implements the "best accessible type" algorithm for determining the type // of untyped arguments in the runtime binder. It is also used in method type inference @@ -768,200 +593,162 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics // The new type is returned in an out parameter. The result will be true (and the out param // non-null) only when the algorithm could find a suitable accessible type. - - Debug.Assert(semanticChecker != null); - Debug.Assert(bindingContext != null); Debug.Assert(typeSrc != null); + Debug.Assert(!(typeSrc is ParameterModifierType)); + Debug.Assert(!(typeSrc is PointerType)); - typeDst = null; - - if (semanticChecker.CheckTypeAccess(typeSrc, bindingContext.ContextForMemberLookup)) + if (CSemanticChecker.CheckTypeAccess(typeSrc, context)) { - // If we already have an accessible type, then use it. This is the terminal point of the recursion. - typeDst = typeSrc; - return true; + // If we already have an accessible type, then use it. + return typeSrc; } // These guys have no accessibility concerns. Debug.Assert(!(typeSrc is VoidType) && !(typeSrc is TypeParameterType)); - if (typeSrc is ParameterModifierType || typeSrc is PointerType) + if (typeSrc is AggregateType aggSrc) { - // We cannot vary these. - return false; - } - - CType intermediateType; - if (typeSrc is AggregateType aggSrc && (aggSrc.isInterfaceType() || aggSrc.isDelegateType()) && TryVarianceAdjustmentToGetAccessibleType(semanticChecker, bindingContext, aggSrc, out intermediateType)) - { - // If we have an interface or delegate type, then it can potentially be varied by its type arguments - // to produce an accessible type, and if that's the case, then return that. - // Example: IEnumerable --> IEnumerable - typeDst = intermediateType; - - Debug.Assert(semanticChecker.CheckTypeAccess(typeDst, bindingContext.ContextForMemberLookup)); - return true; - } - - if (typeSrc is ArrayType arrSrc && TryArrayVarianceAdjustmentToGetAccessibleType(semanticChecker, bindingContext, arrSrc, out intermediateType)) - { - // Similarly to the interface and delegate case, arrays are covariant in their element type and - // so we can potentially produce an array type that is accessible. - // Example: PrivateConcreteFoo[] --> PublicAbstractFoo[] - typeDst = intermediateType; - - Debug.Assert(semanticChecker.CheckTypeAccess(typeDst, bindingContext.ContextForMemberLookup)); - return true; - } - - if (typeSrc is NullableType) - { - // We have an inaccessible nullable type, which means that the best we can do is System.ValueType. - typeDst = GetPredefAgg(PredefinedType.PT_VALUE).getThisType(); - - Debug.Assert(semanticChecker.CheckTypeAccess(typeDst, bindingContext.ContextForMemberLookup)); - return true; - } - - if (typeSrc is ArrayType) - { - // We have an inaccessible array type for which we could not earlier find a better array type - // with a covariant conversion, so the best we can do is System.Array. - typeDst = GetPredefAgg(PredefinedType.PT_ARRAY).getThisType(); - - Debug.Assert(semanticChecker.CheckTypeAccess(typeDst, bindingContext.ContextForMemberLookup)); - return true; - } - - Debug.Assert(typeSrc is AggregateType); - - if (typeSrc is AggregateType aggType) - { - // We have an AggregateType, so recurse on its base class. - AggregateType baseType = aggType.GetBaseClass(); - - if (baseType == null) + for (;;) { - // This happens with interfaces, for instance. But in that case, the - // conversion to object does exist, is an implicit reference conversion, - // and so we will use it. - baseType = GetPredefAgg(PredefinedType.PT_OBJECT).getThisType(); + if ((aggSrc.IsInterfaceType || aggSrc.IsDelegateType) && TryVarianceAdjustmentToGetAccessibleType(context, aggSrc, out CType typeDst)) + { + // If we have an interface or delegate type, then it can potentially be varied by its type arguments + // to produce an accessible type, and if that's the case, then return that. + // Example: IEnumerable --> IEnumerable + Debug.Assert(CSemanticChecker.CheckTypeAccess(typeDst, context)); + return typeDst; + } + + // We have an AggregateType, so recurse on its base class. + AggregateType baseType = aggSrc.BaseClass; + if (baseType == null) + { + // This happens with interfaces, for instance. But in that case, the + // conversion to object does exist, is an implicit reference conversion, + // and is guaranteed to be accessible, so we will use it. + return GetPredefAgg(PredefinedType.PT_OBJECT).getThisType(); + } + + if (CSemanticChecker.CheckTypeAccess(baseType, context)) + { + return baseType; + } + + // baseType is always an AggregateType, so no need for logic of other types. + aggSrc = baseType; + } + } + + if (typeSrc is ArrayType arrSrc) + { + if (TryArrayVarianceAdjustmentToGetAccessibleType(context, arrSrc, out CType typeDst)) + { + // Similarly to the interface and delegate case, arrays are covariant in their element type and + // so we can potentially produce an array type that is accessible. + // Example: PrivateConcreteFoo[] --> PublicAbstractFoo[] + Debug.Assert(CSemanticChecker.CheckTypeAccess(typeDst, context)); + return typeDst; } - return GetBestAccessibleType(semanticChecker, bindingContext, baseType, out typeDst); + // We have an inaccessible array type for which we could not earlier find a better array type + // with a covariant conversion, so the best we can do is System.Array. + return GetPredefAgg(PredefinedType.PT_ARRAY).getThisType(); } - return false; + Debug.Assert(typeSrc is NullableType); + + // We have an inaccessible nullable type, which means that the best we can do is System.ValueType. + return GetPredefAgg(PredefinedType.PT_VALUE).getThisType(); } - private bool TryVarianceAdjustmentToGetAccessibleType(CSemanticChecker semanticChecker, BindingContext bindingContext, AggregateType typeSrc, out CType typeDst) + private static bool TryVarianceAdjustmentToGetAccessibleType(AggregateSymbol context, AggregateType typeSrc, out CType typeDst) { Debug.Assert(typeSrc != null); - Debug.Assert(typeSrc.isInterfaceType() || typeSrc.isDelegateType()); + Debug.Assert(typeSrc.IsInterfaceType || typeSrc.IsDelegateType); typeDst = null; - AggregateSymbol aggSym = typeSrc.GetOwningAggregate(); + AggregateSymbol aggSym = typeSrc.OwningAggregate; AggregateType aggOpenType = aggSym.getThisType(); - if (!semanticChecker.CheckTypeAccess(aggOpenType, bindingContext.ContextForMemberLookup)) + if (!CSemanticChecker.CheckTypeAccess(aggOpenType, context)) { // if the aggregate symbol itself is not accessible, then forget it, there is no // variance that will help us arrive at an accessible type. return false; } - TypeArray typeArgs = typeSrc.GetTypeArgsThis(); - TypeArray typeParams = aggOpenType.GetTypeArgsThis(); + TypeArray typeArgs = typeSrc.TypeArgsThis; + TypeArray typeParams = aggOpenType.TypeArgsThis; CType[] newTypeArgsTemp = new CType[typeArgs.Count]; - for (int i = 0; i < typeArgs.Count; i++) + for (int i = 0; i < newTypeArgsTemp.Length; i++) { - if (semanticChecker.CheckTypeAccess(typeArgs[i], bindingContext.ContextForMemberLookup)) + CType typeArg = typeArgs[i]; + if (CSemanticChecker.CheckTypeAccess(typeArg, context)) { // we have an accessible argument, this position is not a problem. - newTypeArgsTemp[i] = typeArgs[i]; + newTypeArgsTemp[i] = typeArg; continue; } - if (!typeArgs[i].IsRefType() || !((TypeParameterType)typeParams[i]).Covariant) + if (!typeArg.IsReferenceType || !((TypeParameterType)typeParams[i]).Covariant) { // This guy is inaccessible, and we are not going to be able to vary him, so we need to fail. return false; } - CType intermediateTypeArg; - if (GetBestAccessibleType(semanticChecker, bindingContext, typeArgs[i], out intermediateTypeArg)) - { - // now we either have a value type (which must be accessible due to the above - // check, OR we have an inaccessible type (which must be a ref type). In either - // case, the recursion worked out and we are OK to vary this argument. - newTypeArgsTemp[i] = intermediateTypeArg; - continue; - } - else - { - Debug.Assert(false, "GetBestAccessibleType unexpectedly failed on a type that was used as a type parameter"); - return false; - } + newTypeArgsTemp[i] = GetBestAccessibleType(context, typeArg); + + // now we either have a value type (which must be accessible due to the above + // check, OR we have an inaccessible type (which must be a ref type). In either + // case, the recursion worked out and we are OK to vary this argument. } - TypeArray newTypeArgs = semanticChecker.getBSymmgr().AllocParams(typeArgs.Count, newTypeArgsTemp); - CType intermediateType = this.GetAggregate(aggSym, typeSrc.outerType, newTypeArgs); + TypeArray newTypeArgs = TypeArray.Allocate(newTypeArgsTemp); + CType intermediateType = GetAggregate(aggSym, typeSrc.OuterType, newTypeArgs); // All type arguments were varied successfully, which means now we must be accessible. But we could // have violated constraints. Let's check that out. - if (!TypeBind.CheckConstraints(semanticChecker, null/*ErrorHandling*/, intermediateType, CheckConstraintsFlags.NoErrors)) + if (!TypeBind.CheckConstraints(intermediateType, CheckConstraintsFlags.NoErrors)) { return false; } typeDst = intermediateType; - Debug.Assert(semanticChecker.CheckTypeAccess(typeDst, bindingContext.ContextForMemberLookup)); + Debug.Assert(CSemanticChecker.CheckTypeAccess(typeDst, context)); return true; } - private bool TryArrayVarianceAdjustmentToGetAccessibleType(CSemanticChecker semanticChecker, BindingContext bindingContext, ArrayType typeSrc, out CType typeDst) + private static bool TryArrayVarianceAdjustmentToGetAccessibleType(AggregateSymbol context, ArrayType typeSrc, out CType typeDst) { Debug.Assert(typeSrc != null); - typeDst = null; - // We are here because we have an array type with an inaccessible element type. If possible, // we should create a new array type that has an accessible element type for which a // conversion exists. - CType elementType = typeSrc.GetElementType(); - if (!elementType.IsRefType()) + CType elementType = typeSrc.ElementType; + // Covariant array conversions exist for reference types only. + if (elementType.IsReferenceType) { - // Covariant array conversions exist for reference types only. - return false; - } + CType destElement = GetBestAccessibleType(context, elementType); + typeDst = GetArray(destElement, typeSrc.Rank, typeSrc.IsSZArray); - CType intermediateType; - if (GetBestAccessibleType(semanticChecker, bindingContext, elementType, out intermediateType)) - { - typeDst = this.GetArray(intermediateType, typeSrc.rank, typeSrc.IsSZArray); - - Debug.Assert(semanticChecker.CheckTypeAccess(typeDst, bindingContext.ContextForMemberLookup)); + Debug.Assert(CSemanticChecker.CheckTypeAccess(typeDst, context)); return true; } + typeDst = null; return false; } - public AggregateType ObjectAggregateType => (AggregateType)_symbolTable.GetCTypeFromType(typeof(object)); - - private readonly Dictionary, bool> _internalsVisibleToCalculated - = new Dictionary, bool>(); - - internal bool InternalsVisibleTo(Assembly assemblyThatDefinesAttribute, Assembly assemblyToCheck) + internal static bool InternalsVisibleTo(Assembly assemblyThatDefinesAttribute, Assembly assemblyToCheck) { - bool result; - - var key = Tuple.Create(assemblyThatDefinesAttribute, assemblyToCheck); - if (!_internalsVisibleToCalculated.TryGetValue(key, out result)) + RuntimeBinder.EnsureLockIsTaken(); + (Assembly temp1, Assembly temp2) key = (assemblyThatDefinesAttribute, assemblyToCheck); + if (!s_internalsVisibleToCache.TryGetValue(key, out bool result)) { AssemblyName assyName; @@ -972,20 +759,17 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics try { assyName = assemblyToCheck.GetName(); + result = assemblyThatDefinesAttribute.GetCustomAttributes() + .OfType() + .Select(ivta => new AssemblyName(ivta.AssemblyName)) + .Any(an => AssemblyName.ReferenceMatchesDefinition(an, assyName)); } - catch (System.Security.SecurityException) + catch (SecurityException) { result = false; - goto SetMemo; } - result = assemblyThatDefinesAttribute.GetCustomAttributes() - .OfType() - .Select(ivta => new AssemblyName(ivta.AssemblyName)) - .Any(an => AssemblyName.ReferenceMatchesDefinition(an, assyName)); - - SetMemo: - _internalsVisibleToCalculated[key] = result; + s_internalsVisibleToCache[key] = result; } return result; diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeParameterType_.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeParameterType_.cs index 8d684daca4..aabc64e2ff 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeParameterType_.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeParameterType_.cs @@ -2,7 +2,10 @@ // 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; using System.Diagnostics; +using System.Reflection; +using Microsoft.CSharp.RuntimeBinder.Syntax; namespace Microsoft.CSharp.RuntimeBinder.Semantics { @@ -10,26 +13,54 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics internal sealed class TypeParameterType : CType { - public TypeParameterSymbol GetTypeParameterSymbol() { return _pTypeParameterSymbol; } - public void SetTypeParameterSymbol(TypeParameterSymbol pTypePArameterSymbol) { _pTypeParameterSymbol = pTypePArameterSymbol; } + public TypeParameterType(TypeParameterSymbol symbol) + : base(TypeKind.TK_TypeParameterType) + { + Debug.Assert(symbol.GetTypeParameterType() == null); + Symbol = symbol; + symbol.SetTypeParameterType(this); + } - public ParentSymbol GetOwningSymbol() { return _pTypeParameterSymbol.parent; } + public TypeParameterSymbol Symbol { get; } // Forward calls into the symbol. - public bool Covariant { get { return _pTypeParameterSymbol.Covariant; } } - public bool Invariant { get { return _pTypeParameterSymbol.Invariant; } } - public bool Contravariant { get { return _pTypeParameterSymbol.Contravariant; } } - public bool IsValueType() { return _pTypeParameterSymbol.IsValueType(); } - public bool IsReferenceType() { return _pTypeParameterSymbol.IsReferenceType(); } - public bool IsNonNullableValueType() { return _pTypeParameterSymbol.IsNonNullableValueType(); } - public bool HasNewConstraint() { return _pTypeParameterSymbol.HasNewConstraint(); } - public bool HasRefConstraint() { return _pTypeParameterSymbol.HasRefConstraint(); } - public bool HasValConstraint() { return _pTypeParameterSymbol.HasValConstraint(); } - public bool IsMethodTypeParameter() { return _pTypeParameterSymbol.IsMethodTypeParameter(); } - public int GetIndexInOwnParameters() { return _pTypeParameterSymbol.GetIndexInOwnParameters(); } - public int GetIndexInTotalParameters() { return _pTypeParameterSymbol.GetIndexInTotalParameters(); } - public TypeArray GetBounds() { return _pTypeParameterSymbol.GetBounds(); } - private TypeParameterSymbol _pTypeParameterSymbol; + public ParentSymbol OwningSymbol => Symbol.parent; + + public Name Name => Symbol.name; + + public bool Covariant => Symbol.Covariant; + + public bool Invariant => Symbol.Invariant; + + public bool Contravariant => Symbol.Contravariant; + + public override bool IsValueType => Symbol.IsValueType(); + + public override bool IsReferenceType => Symbol.IsReferenceType(); + + public override bool IsNonNullableValueType => Symbol.IsNonNullableValueType(); + + public bool HasNewConstraint => Symbol.HasNewConstraint(); + + public bool HasRefConstraint => Symbol.HasRefConstraint(); + + public bool HasValConstraint => Symbol.HasValConstraint(); + + public bool IsMethodTypeParameter => Symbol.IsMethodTypeParameter(); + + public int IndexInOwnParameters => Symbol.GetIndexInOwnParameters(); + + public int IndexInTotalParameters => Symbol.GetIndexInTotalParameters(); + + public TypeArray Bounds => Symbol.GetBounds(); + + public override Type AssociatedSystemType => + (IsMethodTypeParameter + ? ((MethodInfo)((MethodSymbol)OwningSymbol).AssociatedMemberInfo).GetGenericArguments() + : ((AggregateSymbol)OwningSymbol).AssociatedSystemType.GetGenericArguments() + )[IndexInOwnParameters]; + + public override FUNDTYPE FundamentalType => FUNDTYPE.FT_VAR; } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeTable.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeTable.cs index 0540f983ff..00b13acb21 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeTable.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeTable.cs @@ -6,145 +6,130 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; -using Microsoft.CSharp.RuntimeBinder.Syntax; namespace Microsoft.CSharp.RuntimeBinder.Semantics { - internal readonly struct KeyPair : IEquatable> + internal static class TypeTable { - private readonly Key1 _pKey1; - private readonly Key2 _pKey2; - - public KeyPair(Key1 pKey1, Key2 pKey2) + private readonly struct KeyPair : IEquatable> { - _pKey1 = pKey1; - _pKey2 = pKey2; - } + private readonly TKey1 _pKey1; + private readonly TKey2 _pKey2; - public bool Equals(KeyPair other) - { - return EqualityComparer.Default.Equals(_pKey1, other._pKey1) - && EqualityComparer.Default.Equals(_pKey2, other._pKey2); - } + public KeyPair(TKey1 pKey1, TKey2 pKey2) + { + _pKey1 = pKey1; + _pKey2 = pKey2; + } -#if DEBUG - [ExcludeFromCodeCoverage] // Typed overload should always be the method called. + public bool Equals(KeyPair other) => + EqualityComparer.Default.Equals(_pKey1, other._pKey1) + && EqualityComparer.Default.Equals(_pKey2, other._pKey2); + +#if DEBUG + [ExcludeFromCodeCoverage] // Typed overload should always be the method called. #endif - public override bool Equals(object obj) - { - Debug.Fail("Sub-optimal overload called. Check if this can be avoided."); - if (!(obj is KeyPair)) return false; - return Equals((KeyPair)obj); - } + public override bool Equals(object obj) + { + Debug.Fail("Sub-optimal overload called. Check if this can be avoided."); + if (!(obj is KeyPair)) + { + return false; + } - public override int GetHashCode() - { - int hash = _pKey1 == null ? 0 : _pKey1.GetHashCode(); - return (hash << 5) - hash + (_pKey2 == null ? 0 : _pKey2.GetHashCode()); - } - } + return Equals((KeyPair)obj); + } - internal sealed class TypeTable - { + public override int GetHashCode() + { + int hash = _pKey1 == null ? 0 : _pKey1.GetHashCode(); + return (hash << 5) - hash + (_pKey2 == null ? 0 : _pKey2.GetHashCode()); + } + } + + // The RuntimeBinder uses a global lock when Binding that keeps these dictionary safe. // Two way hashes - private readonly Dictionary>, AggregateType> _aggregateTable; - private readonly Dictionary, ArrayType> _pArrayTable; - private readonly Dictionary, ParameterModifierType> _pParameterModifierTable; + private static readonly Dictionary>, AggregateType> s_aggregateTable = + new Dictionary>, AggregateType>(); + + private static readonly Dictionary, ArrayType> s_arrayTable = + new Dictionary, ArrayType>(); + + private static readonly Dictionary, ParameterModifierType> s_parameterModifierTable = + new Dictionary, ParameterModifierType>(); // One way hashes - private readonly Dictionary _pPointerTable; - private readonly Dictionary _pNullableTable; - - public TypeTable() - { - _aggregateTable = new Dictionary>, AggregateType>(); - _pArrayTable = new Dictionary, ArrayType>(); - _pParameterModifierTable = new Dictionary, ParameterModifierType>(); - _pPointerTable = new Dictionary(); - _pNullableTable = new Dictionary(); - } + private static readonly Dictionary s_pointerTable = new Dictionary(); + private static readonly Dictionary s_nullableTable = new Dictionary(); private static KeyPair MakeKey(TKey1 key1, TKey2 key2) => new KeyPair(key1, key2); - public AggregateType LookupAggregate(AggregateSymbol aggregate, AggregateType outer, TypeArray args) + public static AggregateType LookupAggregate(AggregateSymbol aggregate, AggregateType outer, TypeArray args) { - _aggregateTable.TryGetValue(MakeKey(aggregate, MakeKey(outer, args)), out AggregateType result); + RuntimeBinder.EnsureLockIsTaken(); + s_aggregateTable.TryGetValue(MakeKey(aggregate, MakeKey(outer, args)), out AggregateType result); return result; } - public void InsertAggregate( - AggregateSymbol aggregate, AggregateType outer, TypeArray args, AggregateType pAggregate) + public static void InsertAggregate(AggregateSymbol aggregate, AggregateType outer, TypeArray args, AggregateType ats) { + RuntimeBinder.EnsureLockIsTaken(); Debug.Assert(LookupAggregate(aggregate, outer, args) == null); - _aggregateTable.Add(MakeKey(aggregate, MakeKey(outer, args)), pAggregate); + s_aggregateTable.Add(MakeKey(aggregate, MakeKey(outer, args)), ats); } - public ArrayType LookupArray(Name pName, CType pElementType) + // rankNum is 0 for SZ arrays, equal to rank otherwise. + public static ArrayType LookupArray(CType elementType, int rankNum) { - var key = new KeyPair(pElementType, pName); - ArrayType result; - if (_pArrayTable.TryGetValue(key, out result)) - { - return result; - } - return null; + RuntimeBinder.EnsureLockIsTaken(); + s_arrayTable.TryGetValue(new KeyPair(elementType, rankNum), out ArrayType result); + return result; } - public void InsertArray(Name pName, CType pElementType, ArrayType pArray) + public static void InsertArray(CType elementType, int rankNum, ArrayType pArray) { - Debug.Assert(LookupArray(pName, pElementType) == null); - _pArrayTable.Add(new KeyPair(pElementType, pName), pArray); + RuntimeBinder.EnsureLockIsTaken(); + Debug.Assert(LookupArray(elementType, rankNum) == null); + s_arrayTable.Add(new KeyPair(elementType, rankNum), pArray); } - public ParameterModifierType LookupParameterModifier(Name pName, CType pElementType) + public static ParameterModifierType LookupParameterModifier(CType elementType, bool isOut) { - var key = new KeyPair(pElementType, pName); - ParameterModifierType result; - if (_pParameterModifierTable.TryGetValue(key, out result)) - { - return result; - } - return null; + RuntimeBinder.EnsureLockIsTaken(); + s_parameterModifierTable.TryGetValue(new KeyPair(elementType, isOut), out ParameterModifierType result); + return result; } - public void InsertParameterModifier( - Name pName, - CType pElementType, - ParameterModifierType pParameterModifier) + public static void InsertParameterModifier(CType elementType, bool isOut, ParameterModifierType parameterModifier) { - Debug.Assert(LookupParameterModifier(pName, pElementType) == null); - _pParameterModifierTable.Add(new KeyPair(pElementType, pName), pParameterModifier); + RuntimeBinder.EnsureLockIsTaken(); + Debug.Assert(LookupParameterModifier(elementType, isOut) == null); + s_parameterModifierTable.Add(new KeyPair(elementType, isOut), parameterModifier); } - public PointerType LookupPointer(CType pElementType) + public static PointerType LookupPointer(CType elementType) { - PointerType result; - if (_pPointerTable.TryGetValue(pElementType, out result)) - { - return result; - } - return null; + s_pointerTable.TryGetValue(elementType, out PointerType result); + return result; } - public void InsertPointer(CType pElementType, PointerType pPointer) + public static void InsertPointer(CType elementType, PointerType pointer) { - _pPointerTable.Add(pElementType, pPointer); + Debug.Assert(LookupPointer(elementType) == null); + s_pointerTable.Add(elementType, pointer); } - public NullableType LookupNullable(CType pUnderlyingType) + public static NullableType LookupNullable(CType underlyingType) { - NullableType result; - if (_pNullableTable.TryGetValue(pUnderlyingType, out result)) - { - return result; - } - return null; + s_nullableTable.TryGetValue(underlyingType, out NullableType result); + return result; } - public void InsertNullable(CType pUnderlyingType, NullableType pNullable) + public static void InsertNullable(CType underlyingType, NullableType nullable) { - _pNullableTable.Add(pUnderlyingType, pNullable); + Debug.Assert(LookupNullable(underlyingType) == null); + s_nullableTable.Add(underlyingType, nullable); } } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/VoidType.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/VoidType.cs index 082a45801c..9c57aa1904 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/VoidType.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/VoidType.cs @@ -2,6 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CSharp.RuntimeBinder.Syntax; + namespace Microsoft.CSharp.RuntimeBinder.Semantics { // ---------------------------------------------------------------------------- @@ -10,5 +12,13 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics internal sealed class VoidType : CType { + public static readonly VoidType Instance = new VoidType(); + + private VoidType() + : base(TypeKind.TK_VoidType) + { + } + + public override bool IsPredefType(PredefinedType pt) => pt == PredefinedType.PT_VOID; } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/UnaOpSig.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/UnaOpSig.cs index 0542d12c84..9e5567538a 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/UnaOpSig.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/UnaOpSig.cs @@ -7,7 +7,7 @@ using Microsoft.CSharp.RuntimeBinder.Syntax; namespace Microsoft.CSharp.RuntimeBinder.Semantics { - internal sealed partial class ExpressionBinder + internal readonly partial struct ExpressionBinder { private class UnaOpSig { @@ -58,7 +58,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics this.pfn = uos.pfn; this.fnkind = uos.fnkind; Debug.Assert(pt != PredefinedType.PT_UNDEFINEDINDEX); - _type = pt != PredefinedType.PT_UNDEFINEDINDEX ? fnc.GetPredefindType(pt) : null; + _type = pt != PredefinedType.PT_UNDEFINEDINDEX ? GetPredefindType(pt) : null; _grflt = LiftFlags.None; } public bool FPreDef() diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/UtilityTypeExtensions.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/UtilityTypeExtensions.cs deleted file mode 100644 index dc015c394a..0000000000 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/UtilityTypeExtensions.cs +++ /dev/null @@ -1,45 +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; -using System.Collections.Generic; -using System.Diagnostics; - -namespace Microsoft.CSharp.RuntimeBinder.Semantics -{ - internal static class UtilityTypeExtensions - { - - private static IEnumerable TypeAndBaseClasses(this AggregateType type) - { - Debug.Assert(type != null); - AggregateType t = type; - while (t != null) - { - yield return t; - t = t.GetBaseClass(); - } - } - - private static IEnumerable TypeAndBaseClassInterfaces(this AggregateType type) - { - Debug.Assert(type != null); - foreach (AggregateType b in type.TypeAndBaseClasses()) - foreach (AggregateType t in b.GetIfacesAll().Items) - yield return t; - } - - public static IEnumerable AllPossibleInterfaces(this CType type) - { - Debug.Assert(type != null); - if (type is AggregateType ats) - { - return ats.TypeAndBaseClassInterfaces(); - } - - Debug.Assert(type is NullableType); // Is even this case possible? - return Array.Empty(); - } - } -} diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/WithType.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/WithType.cs index 41c5d9944c..e9a431a326 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/WithType.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/WithType.cs @@ -129,7 +129,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics { if (sym == null) ats = null; - Debug.Assert(ats == null || sym.parent == ats.getAggregate()); + Debug.Assert(ats == null || sym.parent == ats.OwningAggregate); _sym = sym; _ats = ats; } @@ -231,7 +231,7 @@ namespace Microsoft.CSharp.RuntimeBinder.Semantics ats = null; typeArgs = null; } - Debug.Assert(ats == null || mps != null && mps.getClass() == ats.getAggregate()); + Debug.Assert(ats == null || mps != null && mps.getClass() == ats.OwningAggregate); base.Set(mps, ats); TypeArgs = typeArgs; } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/SpecialNames.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/SpecialNames.cs index a787b8af94..d56b95ab29 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/SpecialNames.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/SpecialNames.cs @@ -50,9 +50,7 @@ namespace Microsoft.CSharp.RuntimeBinder public const string CLR_True = "op_True"; public const string CLR_False = "op_False"; - public const string CLR_PreIncrement = "op_Increment"; - public const string CLR_PostIncrement = "op_Increment"; - public const string CLR_PreDecrement = "op_Decrement"; - public const string CLR_PostDecrement = "op_Decrement"; + public const string CLR_Increment = "op_Increment"; + public const string CLR_Decrement = "op_Decrement"; } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/SymbolTable.cs b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/SymbolTable.cs index af53592265..066d75f8af 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/SymbolTable.cs +++ b/external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/SymbolTable.cs @@ -15,72 +15,37 @@ using Microsoft.CSharp.RuntimeBinder.Syntax; namespace Microsoft.CSharp.RuntimeBinder { - internal sealed class SymbolTable + internal static class SymbolTable { - ///////////////////////////////////////////////////////////////////////////////// - // Members - private readonly HashSet _typesWithConversionsLoaded = new HashSet(); - private readonly HashSet _namesLoadedForEachType = new HashSet(); + private static readonly HashSet s_typesWithConversionsLoaded = new HashSet(); + private static readonly HashSet s_namesLoadedForEachType = new HashSet(); - // Members from the managed binder. - private readonly SYMTBL _symbolTable; - private readonly SymFactory _symFactory; - private readonly TypeManager _typeManager; - private readonly BSYMMGR _bsymmgr; - private readonly CSemanticChecker _semanticChecker; - - ///////////////////////////////////////////////////////////////////////////////// - - private sealed class NameHashKey : IEquatable + private readonly struct NameHashKey : IEquatable { - internal readonly Type type; - internal readonly string name; + internal Type Type { get; } + internal string Name { get; } public NameHashKey(Type type, string name) { - this.type = type; - this.name = name; + Type = type; + Name = name; } - public bool Equals(NameHashKey other) => other != null && type.Equals(other.type) && name.Equals(other.name); + public bool Equals(NameHashKey other) => Type.Equals(other.Type) && Name.Equals(other.Name); -#if DEBUG +#if DEBUG [ExcludeFromCodeCoverage] // Typed overload should always be the method called. #endif public override bool Equals(object obj) { Debug.Fail("Sub-optimal overload called. Check if this can be avoided."); - return Equals(obj as NameHashKey); + return obj is NameHashKey key && Equals(key); } - public override int GetHashCode() - { - return type.GetHashCode() ^ name.GetHashCode(); - } + public override int GetHashCode() => Type.GetHashCode() ^ Name.GetHashCode(); } - ///////////////////////////////////////////////////////////////////////////////// - - internal SymbolTable( - SYMTBL symTable, - SymFactory symFactory, - TypeManager typeManager, - BSYMMGR bsymmgr, - CSemanticChecker semanticChecker) - { - _symbolTable = symTable; - _symFactory = symFactory; - _typeManager = typeManager; - _bsymmgr = bsymmgr; - _semanticChecker = semanticChecker; - - // Now populate object. - LoadSymbolsFromType(typeof(object)); - } - - ///////////////////////////////////////////////////////////////////////////////// - - internal void PopulateSymbolTableWithName( + internal static void PopulateSymbolTableWithName( string name, IEnumerable typeArguments, Type callingType) @@ -101,7 +66,7 @@ namespace Microsoft.CSharp.RuntimeBinder NameHashKey key = new NameHashKey(callingType, name); // If we've already populated this name/type pair, then just leave. - if (_namesLoadedForEachType.Contains(key)) + if (s_namesLoadedForEachType.Contains(key)) { return; } @@ -121,7 +86,7 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - internal SymWithType LookupMember( + internal static SymWithType LookupMember( string name, Expr callingObject, ParentSymbol context, @@ -134,7 +99,7 @@ namespace Microsoft.CSharp.RuntimeBinder if (type is ArrayType) { - type = _semanticChecker.SymbolLoader.GetPredefindType(PredefinedType.PT_ARRAY); + type = SymbolLoader.GetPredefindType(PredefinedType.PT_ARRAY); } if (type is NullableType nub) { @@ -142,7 +107,6 @@ namespace Microsoft.CSharp.RuntimeBinder } if (!mem.Lookup( - _semanticChecker, type, callingObject, context, @@ -158,7 +122,7 @@ namespace Microsoft.CSharp.RuntimeBinder return mem.SwtFirst(); } - private void AddParameterConversions(MethodBase method) + private static void AddParameterConversions(MethodBase method) { foreach (ParameterInfo param in method.GetParameters()) { @@ -167,20 +131,20 @@ namespace Microsoft.CSharp.RuntimeBinder } #region InheritanceHierarchy - private void AddNamesOnType(NameHashKey key) + private static void AddNamesOnType(NameHashKey key) { - Debug.Assert(!_namesLoadedForEachType.Contains(key)); + Debug.Assert(!s_namesLoadedForEachType.Contains(key)); // We need to declare all of its inheritance hierarchy. - List inheritance = CreateInheritanceHierarchyList(key.type); + List inheritance = CreateInheritanceHierarchyList(key.Type); // Now add every method as it appears in the inheritance hierarchy. - AddNamesInInheritanceHierarchy(key.name, inheritance); + AddNamesInInheritanceHierarchy(key.Name, inheritance); } ///////////////////////////////////////////////////////////////////////////////// - private void AddNamesInInheritanceHierarchy(string name, List inheritance) + private static void AddNamesInInheritanceHierarchy(string name, List inheritance) { for (int i = inheritance.Count - 1; i >= 0; --i) { @@ -190,7 +154,7 @@ namespace Microsoft.CSharp.RuntimeBinder type = type.GetGenericTypeDefinition(); } - if (!_namesLoadedForEachType.Add(new NameHashKey(type, name))) + if (!s_namesLoadedForEachType.Add(new NameHashKey(type, name))) { continue; } @@ -206,7 +170,7 @@ namespace Microsoft.CSharp.RuntimeBinder CType cType = GetCTypeFromType(type); if (!(cType is AggregateType aggType)) continue; - AggregateSymbol aggregate = aggType.getAggregate(); + AggregateSymbol aggregate = aggType.OwningAggregate; FieldSymbol addedField = null; // We need to add fields before the actual events, so do the first iteration @@ -275,7 +239,7 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private List CreateInheritanceHierarchyList(Type type) + private static List CreateInheritanceHierarchyList(Type type) { List list; if (type.IsInterface) @@ -313,14 +277,11 @@ namespace Microsoft.CSharp.RuntimeBinder // If we have a WinRT type then we should load the members of it's collection interfaces // as well as those members are on this type as far as the user is concerned. CType ctype = GetCTypeFromType(type); - if (ctype.IsWindowsRuntimeType()) + if (ctype.IsWindowsRuntimeType) { - TypeArray collectioniFaces = ((AggregateType)ctype).GetWinRTCollectionIfacesAll(_semanticChecker.SymbolLoader); - - for (int i = 0; i < collectioniFaces.Count; i++) + foreach (CType collectionType in ((AggregateType)ctype).WinRTCollectionIfacesAll.Items) { - CType collectionType = collectioniFaces[i]; - Debug.Assert(collectionType.isInterfaceType()); + Debug.Assert(collectionType.IsInterfaceType); // Insert into our list of Types. list.Add(collectionType.AssociatedSystemType); @@ -333,14 +294,11 @@ namespace Microsoft.CSharp.RuntimeBinder #region GetName ///////////////////////////////////////////////////////////////////////////////// - private Name GetName(string p) - { - return NameManager.Add(p ?? ""); - } + private static Name GetName(string p) => NameManager.Add(p ?? ""); ///////////////////////////////////////////////////////////////////////////////// - private Name GetName(Type type) + private static Name GetName(Type type) { string name = type.Name; if (type.IsGenericType) @@ -360,7 +318,7 @@ namespace Microsoft.CSharp.RuntimeBinder #region TypeParameters ///////////////////////////////////////////////////////////////////////////////// - private TypeArray GetMethodTypeParameters(MethodInfo method, MethodSymbol parent) + private static TypeArray GetMethodTypeParameters(MethodInfo method, MethodSymbol parent) { if (method.IsGenericMethod) { @@ -376,18 +334,18 @@ namespace Microsoft.CSharp.RuntimeBinder for (int i = 0; i < genericArguments.Length; i++) { Type t = genericArguments[i]; - ((TypeParameterType)ctypes[i]).GetTypeParameterSymbol().SetBounds( - _bsymmgr.AllocParams( - GetCTypeArrayFromTypes(t.GetGenericParameterConstraints()))); + ((TypeParameterType)ctypes[i]).Symbol.SetBounds(TypeArray.Allocate(GetCTypeArrayFromTypes(t.GetGenericParameterConstraints()))); } - return _bsymmgr.AllocParams(ctypes.Length, ctypes); + + return TypeArray.Allocate(ctypes); } - return BSYMMGR.EmptyTypeArray(); + + return TypeArray.Empty; } ///////////////////////////////////////////////////////////////////////////////// - private TypeArray GetAggregateTypeParameters(Type type, AggregateSymbol agg) + private static TypeArray GetAggregateTypeParameters(Type type, AggregateSymbol agg) { if (type.IsGenericType) { @@ -430,26 +388,28 @@ namespace Microsoft.CSharp.RuntimeBinder // We check to make sure we own the type parameter - this is because we're // currently calculating TypeArgsThis, NOT TypeArgsAll. - if (((TypeParameterType)ctype).GetOwningSymbol() == agg) + if (((TypeParameterType)ctype).OwningSymbol == agg) { ctypes.Add(ctype); } } - return _bsymmgr.AllocParams(ctypes.Count, ctypes.ToArray()); + + return TypeArray.Allocate(ctypes.ToArray()); } - return BSYMMGR.EmptyTypeArray(); + + return TypeArray.Empty; } ///////////////////////////////////////////////////////////////////////////////// - private TypeParameterType LoadClassTypeParameter(AggregateSymbol parent, Type t) + private static TypeParameterType LoadClassTypeParameter(AggregateSymbol parent, Type t) { for (AggregateSymbol p = parent; p != null; p = p.parent as AggregateSymbol) { - for (TypeParameterSymbol typeParam = _bsymmgr.LookupAggMember( + for (TypeParameterSymbol typeParam = SymbolStore.LookupSym( GetName(t), p, symbmask_t.MASK_TypeParameterSymbol) as TypeParameterSymbol; typeParam != null; - typeParam = BSYMMGR.LookupNextSym(typeParam, p, symbmask_t.MASK_TypeParameterSymbol) as TypeParameterSymbol) + typeParam = typeParam.LookupNext(symbmask_t.MASK_TypeParameterSymbol) as TypeParameterSymbol) { if (AreTypeParametersEquivalent(typeParam.GetTypeParameterType().AssociatedSystemType, t)) { @@ -462,7 +422,7 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private bool AreTypeParametersEquivalent(Type t1, Type t2) + private static bool AreTypeParametersEquivalent(Type t1, Type t2) { Debug.Assert(t1.IsGenericParameter && t2.IsGenericParameter); @@ -512,7 +472,7 @@ namespace Microsoft.CSharp.RuntimeBinder // return the type parameter type given if it is in a method, we do not try to // generalize these occurrences for reference equality. // - private Type GetOriginalTypeParameterType(Type t) + private static Type GetOriginalTypeParameterType(Type t) { Debug.Assert(t.IsGenericParameter); @@ -555,19 +515,17 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private TypeParameterType LoadMethodTypeParameter(MethodSymbol parent, Type t) + private static TypeParameterType LoadMethodTypeParameter(MethodSymbol parent, Type t) { for (Symbol sym = parent.firstChild; sym != null; sym = sym.nextChild) { - if (!(sym is TypeParameterSymbol parSym)) + if (sym is TypeParameterSymbol parSym) { - continue; - } - - TypeParameterType type = parSym.GetTypeParameterType(); - if (AreTypeParametersEquivalent(type.AssociatedSystemType, t)) - { - return type; + TypeParameterType type = parSym.GetTypeParameterType(); + if (AreTypeParametersEquivalent(type.AssociatedSystemType, t)) + { + return type; + } } } @@ -576,7 +534,7 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private TypeParameterType AddTypeParameterToSymbolTable( + private static TypeParameterType AddTypeParameterToSymbolTable( AggregateSymbol agg, MethodSymbol meth, Type t, @@ -587,7 +545,7 @@ namespace Microsoft.CSharp.RuntimeBinder TypeParameterSymbol typeParam; if (bIsAggregate) { - typeParam = _symFactory.CreateClassTypeParameter( + typeParam = SymFactory.CreateClassTypeParameter( GetName(t), agg, t.GenericParameterPosition, @@ -595,7 +553,7 @@ namespace Microsoft.CSharp.RuntimeBinder } else { - typeParam = _symFactory.CreateMethodTypeParameter( + typeParam = SymFactory.CreateMethodTypeParameter( GetName(t), meth, t.GenericParameterPosition, @@ -628,7 +586,7 @@ namespace Microsoft.CSharp.RuntimeBinder typeParam.SetConstraints(cons); typeParam.SetAccess(ACCESS.ACC_PUBLIC); - TypeParameterType typeParamType = _typeManager.GetTypeParameter(typeParam); + TypeParameterType typeParamType = TypeManager.GetTypeParameter(typeParam); return typeParamType; } @@ -638,7 +596,7 @@ namespace Microsoft.CSharp.RuntimeBinder #region LoadTypeChain ///////////////////////////////////////////////////////////////////////////////// - private CType LoadSymbolsFromType(Type type) + private static CType LoadSymbolsFromType(Type type) { List declarationChain = BuildDeclarationChain(type); @@ -653,11 +611,11 @@ namespace Microsoft.CSharp.RuntimeBinder { if (t.IsNullableType()) { - return _typeManager.GetNullable(GetCTypeFromType(t.GetGenericArguments()[0])); + return TypeManager.GetNullable(GetCTypeFromType(t.GetGenericArguments()[0])); } AggregateSymbol next = FindSymForType( - _symbolTable.LookupSym(GetName(t), current, symbmask_t.MASK_AggregateSymbol), t); + SymbolStore.LookupSym(GetName(t), current, symbmask_t.MASK_AggregateSymbol), t); // If we haven't found this type yet, then add it to our symbol table. if (next == null) @@ -702,7 +660,7 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private TypeParameterType ProcessMethodTypeParameter(MethodInfo methinfo, Type t, AggregateSymbol parent) + private static TypeParameterType ProcessMethodTypeParameter(MethodInfo methinfo, Type t, AggregateSymbol parent) { MethodSymbol meth = FindMatchingMethod(methinfo, parent); if (meth == null) @@ -715,12 +673,13 @@ namespace Microsoft.CSharp.RuntimeBinder // type parameter on it. Debug.Assert(meth != null); } + return LoadMethodTypeParameter(meth, t); } ///////////////////////////////////////////////////////////////////////////////// - private CType GetConstructedType(Type type, AggregateSymbol agg) + private static CType GetConstructedType(Type type, AggregateSymbol agg) { // We've found the one we want, so return it. if (type.IsGenericType) @@ -733,8 +692,8 @@ namespace Microsoft.CSharp.RuntimeBinder types.Add(GetCTypeFromType(argument)); } - TypeArray typeArray = _bsymmgr.AllocParams(types.ToArray()); - AggregateType aggType = _typeManager.GetAggregate(agg, typeArray); + TypeArray typeArray = TypeArray.Allocate(types.ToArray()); + AggregateType aggType = TypeManager.GetAggregate(agg, typeArray); return aggType; } CType ctype = agg.getThisType(); @@ -743,7 +702,7 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private CType ProcessSpecialTypeInChain(NamespaceOrAggregateSymbol parent, Type t) + private static CType ProcessSpecialTypeInChain(NamespaceOrAggregateSymbol parent, Type t) { if (t.IsGenericParameter) { @@ -755,7 +714,7 @@ namespace Microsoft.CSharp.RuntimeBinder if (t.IsArray) { // Now we return an array of nesting level corresponding to the rank. - return _typeManager.GetArray( + return TypeManager.GetArray( GetCTypeFromType(t.GetElementType()), t.GetArrayRank(), #if netcoreapp @@ -769,7 +728,7 @@ namespace Microsoft.CSharp.RuntimeBinder if (t.IsPointer) { // Now we return the pointer type that we want. - return _typeManager.GetPointer(GetCTypeFromType(t.GetElementType())); + return TypeManager.GetPointer(GetCTypeFromType(t.GetElementType())); } return null; @@ -841,7 +800,7 @@ namespace Microsoft.CSharp.RuntimeBinder // to lookup names of types for real (only names of members). // For either case, move onto the next symbol in the chain, and check again for appropriate type. - private AggregateSymbol FindSymForType(Symbol sym, Type t) + private static AggregateSymbol FindSymForType(Symbol sym, Type t) { while (sym != null) { @@ -858,18 +817,18 @@ namespace Microsoft.CSharp.RuntimeBinder return null; } - private NamespaceSymbol AddNamespaceToSymbolTable(NamespaceOrAggregateSymbol parent, string sz) + private static NamespaceSymbol AddNamespaceToSymbolTable(NamespaceOrAggregateSymbol parent, string sz) { Name name = GetName(sz); - return _symbolTable.LookupSym(name, parent, symbmask_t.MASK_NamespaceSymbol) as NamespaceSymbol - ?? _symFactory.CreateNamespace(name, parent as NamespaceSymbol); + return SymbolStore.LookupSym(name, parent, symbmask_t.MASK_NamespaceSymbol) as NamespaceSymbol + ?? SymFactory.CreateNamespace(name, parent as NamespaceSymbol); } #endregion #region CTypeFromType ///////////////////////////////////////////////////////////////////////////////// - internal CType[] GetCTypeArrayFromTypes(Type[] types) + internal static CType[] GetCTypeArrayFromTypes(Type[] types) { Debug.Assert(types != null); @@ -892,8 +851,8 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - internal CType GetCTypeFromType(Type type) => type.IsByRef - ? _typeManager.GetParameterModifier(LoadSymbolsFromType(type.GetElementType()), false) + internal static CType GetCTypeFromType(Type type) => type.IsByRef + ? TypeManager.GetParameterModifier(LoadSymbolsFromType(type.GetElementType()), false) : LoadSymbolsFromType(type); #endregion @@ -901,11 +860,11 @@ namespace Microsoft.CSharp.RuntimeBinder #region Aggregates ///////////////////////////////////////////////////////////////////////////////// - private AggregateSymbol AddAggregateToSymbolTable( + private static AggregateSymbol AddAggregateToSymbolTable( NamespaceOrAggregateSymbol parent, Type type) { - AggregateSymbol agg = _symFactory.CreateAggregate(GetName(type), parent, _typeManager); + AggregateSymbol agg = SymFactory.CreateAggregate(GetName(type), parent); agg.AssociatedSystemType = type.IsGenericType ? type.GetGenericTypeDefinition() : type; agg.AssociatedAssembly = type.Assembly; @@ -943,7 +902,7 @@ namespace Microsoft.CSharp.RuntimeBinder } } agg.SetAggKind(kind); - agg.SetTypeVars(BSYMMGR.EmptyTypeArray()); + agg.SetTypeVars(TypeArray.Empty); ACCESS access; if (type.IsPublic) @@ -1002,9 +961,7 @@ namespace Microsoft.CSharp.RuntimeBinder Type t = genericArguments[i]; if (agg.GetTypeVars()[i] is TypeParameterType typeVar) { - typeVar.GetTypeParameterSymbol().SetBounds( - _bsymmgr.AllocParams( - GetCTypeArrayFromTypes(t.GetGenericParameterConstraints()))); + typeVar.Symbol.SetBounds(TypeArray.Allocate(GetCTypeArrayFromTypes(t.GetGenericParameterConstraints()))); } } } @@ -1038,7 +995,7 @@ namespace Microsoft.CSharp.RuntimeBinder } agg.SetBaseClass((AggregateType)GetCTypeFromType(t)); } - agg.SetTypeManager(_typeManager); + agg.SetFirstUDConversion(null); SetInterfacesOnAggregate(agg, type); agg.SetHasPubNoArgCtor(type.GetConstructor(Type.EmptyTypes) != null); @@ -1055,7 +1012,7 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private void SetInterfacesOnAggregate(AggregateSymbol aggregate, Type type) + private static void SetInterfacesOnAggregate(AggregateSymbol aggregate, Type type) { if (type.IsGenericType) { @@ -1071,7 +1028,7 @@ namespace Microsoft.CSharp.RuntimeBinder // we don't really care where they've come from as long as we know the overall // set of IfacesAll. - aggregate.SetIfaces(_bsymmgr.AllocParams(interfaces.Length, GetCTypeArrayFromTypes(interfaces))); + aggregate.SetIfaces(TypeArray.Allocate(GetCTypeArrayFromTypes(interfaces))); aggregate.SetIfacesAll(aggregate.GetIfaces()); } #endregion @@ -1079,9 +1036,9 @@ namespace Microsoft.CSharp.RuntimeBinder #region Field ///////////////////////////////////////////////////////////////////////////////// - private FieldSymbol AddFieldToSymbolTable(FieldInfo fieldInfo, AggregateSymbol aggregate) + private static FieldSymbol AddFieldToSymbolTable(FieldInfo fieldInfo, AggregateSymbol aggregate) { - FieldSymbol field = _symbolTable.LookupSym( + FieldSymbol field = SymbolStore.LookupSym( GetName(fieldInfo.Name), aggregate, symbmask_t.MASK_FieldSymbol) as FieldSymbol; @@ -1090,7 +1047,7 @@ namespace Microsoft.CSharp.RuntimeBinder return field; } - field = _symFactory.CreateMemberVar(GetName(fieldInfo.Name), aggregate); + field = SymFactory.CreateMemberVar(GetName(fieldInfo.Name), aggregate); field.AssociatedFieldInfo = fieldInfo; field.isStatic = fieldInfo.IsStatic; @@ -1123,7 +1080,6 @@ namespace Microsoft.CSharp.RuntimeBinder field.SetAccess(access); field.isReadOnly = fieldInfo.IsInitOnly; field.isEvent = false; - field.isAssigned = true; field.SetType(GetCTypeFromType(fieldInfo.FieldType)); return field; @@ -1165,7 +1121,9 @@ namespace Microsoft.CSharp.RuntimeBinder private static Type GetTypeByName(ref Type cachedResult, string name) { +#pragma warning disable 252 if ((object)cachedResult == s_Sentinel) +#pragma warning restore 252 { System.Threading.Interlocked.CompareExchange(ref cachedResult, Type.GetType(name, throwOnError: false), s_Sentinel); } @@ -1173,9 +1131,9 @@ namespace Microsoft.CSharp.RuntimeBinder return cachedResult; } - private void AddEventToSymbolTable(EventInfo eventInfo, AggregateSymbol aggregate, FieldSymbol addedField) + private static void AddEventToSymbolTable(EventInfo eventInfo, AggregateSymbol aggregate, FieldSymbol addedField) { - EventSymbol ev = _symbolTable.LookupSym( + EventSymbol ev = SymbolStore.LookupSym( GetName(eventInfo.Name), aggregate, symbmask_t.MASK_EventSymbol) as EventSymbol; @@ -1185,7 +1143,7 @@ namespace Microsoft.CSharp.RuntimeBinder return; } - ev = _symFactory.CreateEvent(GetName(eventInfo.Name), aggregate); + ev = SymFactory.CreateEvent(GetName(eventInfo.Name), aggregate); ev.AssociatedEventInfo = eventInfo; // EventSymbol @@ -1250,7 +1208,7 @@ namespace Microsoft.CSharp.RuntimeBinder #region Properties ///////////////////////////////////////////////////////////////////////////////// - internal void AddPredefinedPropertyToSymbolTable(AggregateSymbol type, Name property) + internal static void AddPredefinedPropertyToSymbolTable(AggregateSymbol type, Name property) { AggregateType aggtype = type.getThisType(); Type t = aggtype.AssociatedSystemType; @@ -1265,7 +1223,7 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private void AddPropertyToSymbolTable(PropertyInfo property, AggregateSymbol aggregate) + private static void AddPropertyToSymbolTable(PropertyInfo property, AggregateSymbol aggregate) { Name name; bool isIndexer = property.GetIndexParameters().Length != 0 @@ -1280,7 +1238,7 @@ namespace Microsoft.CSharp.RuntimeBinder { name = GetName(property.Name); } - PropertySymbol prop = _symbolTable.LookupSym( + PropertySymbol prop = SymbolStore.LookupSym( name, aggregate, symbmask_t.MASK_PropertySymbol) as PropertySymbol; @@ -1301,7 +1259,7 @@ namespace Microsoft.CSharp.RuntimeBinder } prevProp = prop; - prop = SymbolLoader.LookupNextSym(prop, prop.parent, symbmask_t.MASK_PropertySymbol) as PropertySymbol; + prop = prop.LookupNext(symbmask_t.MASK_PropertySymbol) as PropertySymbol; } prop = prevProp; @@ -1330,13 +1288,13 @@ namespace Microsoft.CSharp.RuntimeBinder { if (isIndexer) { - prop = _semanticChecker.SymbolLoader.GetGlobalSymbolFactory().CreateIndexer(name, aggregate, GetName(property.Name)); + prop = SymFactory.CreateIndexer(name, aggregate); prop.Params = CreateParameterArray(null, property.GetIndexParameters()); } else { - prop = _symFactory.CreateProperty(GetName(property.Name), aggregate); - prop.Params = BSYMMGR.EmptyTypeArray(); + prop = SymFactory.CreateProperty(GetName(property.Name), aggregate); + prop.Params = TypeArray.Empty; } } prop.AssociatedPropertyInfo = property; @@ -1414,7 +1372,7 @@ namespace Microsoft.CSharp.RuntimeBinder #region Methods ///////////////////////////////////////////////////////////////////////////////// - internal void AddPredefinedMethodToSymbolTable(AggregateSymbol type, Name methodName) + internal static void AddPredefinedMethodToSymbolTable(AggregateSymbol type, Name methodName) { Type t = type.getThisType().AssociatedSystemType; @@ -1447,7 +1405,7 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private MethodSymbol AddMethodToSymbolTable(MethodBase member, AggregateSymbol callingAggregate, MethodKindEnum kind) + private static MethodSymbol AddMethodToSymbolTable(MethodBase member, AggregateSymbol callingAggregate, MethodKindEnum kind) { MethodInfo method = member as MethodInfo; @@ -1478,7 +1436,7 @@ namespace Microsoft.CSharp.RuntimeBinder ParameterInfo[] parameters = member.GetParameters(); // First create the method. - methodSymbol = _symFactory.CreateMethod(GetName(member.Name), callingAggregate); + methodSymbol = SymFactory.CreateMethod(GetName(member.Name), callingAggregate); methodSymbol.AssociatedMemberInfo = member; methodSymbol.SetMethKind(kind); if (kind == MethodKindEnum.ExplicitConv || kind == MethodKindEnum.ImplicitConv) @@ -1529,11 +1487,11 @@ namespace Microsoft.CSharp.RuntimeBinder } else { - methodSymbol.typeVars = BSYMMGR.EmptyTypeArray(); + methodSymbol.typeVars = TypeArray.Empty; methodSymbol.isOverride = false; methodSymbol.isOperator = false; methodSymbol.swtSlot = null; - methodSymbol.RetType = _typeManager.GetVoid(); + methodSymbol.RetType = VoidType.Instance; } methodSymbol.modOptCount = GetCountOfModOpts(parameters); @@ -1550,7 +1508,7 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private void SetParameterDataForMethProp(MethodOrPropertySymbol methProp, ParameterInfo[] parameters) + private static void SetParameterDataForMethProp(MethodOrPropertySymbol methProp, ParameterInfo[] parameters) { if (parameters.Length > 0) { @@ -1573,7 +1531,7 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private void SetParameterAttributes(MethodOrPropertySymbol methProp, ParameterInfo[] parameters, int i) + private static void SetParameterAttributes(MethodOrPropertySymbol methProp, ParameterInfo[] parameters, int i) { ParameterInfo parameter = parameters[i]; if ((parameter.Attributes & ParameterAttributes.Optional) != 0 && !parameter.ParameterType.IsByRef) @@ -1598,7 +1556,7 @@ namespace Microsoft.CSharp.RuntimeBinder { // Get DateTimeConstant ConstVal cv = ConstVal.Get(((DateTime)dateAttr.Value).Ticks); - CType cvType = _semanticChecker.SymbolLoader.GetPredefindType(PredefinedType.PT_DATETIME); + CType cvType = SymbolLoader.GetPredefindType(PredefinedType.PT_DATETIME); methProp.SetDefaultParameterValue(i, cvType, cv); } else @@ -1608,7 +1566,7 @@ namespace Microsoft.CSharp.RuntimeBinder { // Get DecimalConstant ConstVal cv = ConstVal.Get(decAttr.Value); - CType cvType = _semanticChecker.SymbolLoader.GetPredefindType(PredefinedType.PT_DECIMAL); + CType cvType = SymbolLoader.GetPredefindType(PredefinedType.PT_DECIMAL); methProp.SetDefaultParameterValue(i, cvType, cv); } else if ((parameter.Attributes & ParameterAttributes.HasDefault) != 0 && !parameter.ParameterType.IsByRef) @@ -1617,7 +1575,7 @@ namespace Microsoft.CSharp.RuntimeBinder // looking at isn't a by ref type or a type parameter. ConstVal cv = default(ConstVal); - CType cvType = _semanticChecker.SymbolLoader.GetPredefindType(PredefinedType.PT_OBJECT); + CType cvType = SymbolLoader.GetPredefindType(PredefinedType.PT_OBJECT); // We need to use RawDefaultValue, because DefaultValue is too clever. #if UNSUPPORTEDAPI @@ -1635,67 +1593,67 @@ namespace Microsoft.CSharp.RuntimeBinder case TypeCode.Byte: cv = ConstVal.Get((byte)defValue); - cvType = _semanticChecker.SymbolLoader.GetPredefindType(PredefinedType.PT_BYTE); + cvType = SymbolLoader.GetPredefindType(PredefinedType.PT_BYTE); break; case TypeCode.Int16: cv = ConstVal.Get((short)defValue); - cvType = _semanticChecker.SymbolLoader.GetPredefindType(PredefinedType.PT_SHORT); + cvType = SymbolLoader.GetPredefindType(PredefinedType.PT_SHORT); break; case TypeCode.Int32: cv = ConstVal.Get((int)defValue); - cvType = _semanticChecker.SymbolLoader.GetPredefindType(PredefinedType.PT_INT); + cvType = SymbolLoader.GetPredefindType(PredefinedType.PT_INT); break; case TypeCode.Int64: cv = ConstVal.Get((long)defValue); - cvType = _semanticChecker.SymbolLoader.GetPredefindType(PredefinedType.PT_LONG); + cvType = SymbolLoader.GetPredefindType(PredefinedType.PT_LONG); break; case TypeCode.Single: cv = ConstVal.Get((float)defValue); - cvType = _semanticChecker.SymbolLoader.GetPredefindType(PredefinedType.PT_FLOAT); + cvType = SymbolLoader.GetPredefindType(PredefinedType.PT_FLOAT); break; case TypeCode.Double: cv = ConstVal.Get((double)defValue); - cvType = _semanticChecker.SymbolLoader.GetPredefindType(PredefinedType.PT_DOUBLE); + cvType = SymbolLoader.GetPredefindType(PredefinedType.PT_DOUBLE); break; case TypeCode.Char: cv = ConstVal.Get((char)defValue); - cvType = _semanticChecker.SymbolLoader.GetPredefindType(PredefinedType.PT_CHAR); + cvType = SymbolLoader.GetPredefindType(PredefinedType.PT_CHAR); break; case TypeCode.Boolean: cv = ConstVal.Get((bool)defValue); - cvType = _semanticChecker.SymbolLoader.GetPredefindType(PredefinedType.PT_BOOL); + cvType = SymbolLoader.GetPredefindType(PredefinedType.PT_BOOL); break; case TypeCode.SByte: cv = ConstVal.Get((sbyte)defValue); - cvType = _semanticChecker.SymbolLoader.GetPredefindType(PredefinedType.PT_SBYTE); + cvType = SymbolLoader.GetPredefindType(PredefinedType.PT_SBYTE); break; case TypeCode.UInt16: cv = ConstVal.Get((ushort)defValue); - cvType = _semanticChecker.SymbolLoader.GetPredefindType(PredefinedType.PT_USHORT); + cvType = SymbolLoader.GetPredefindType(PredefinedType.PT_USHORT); break; case TypeCode.UInt32: cv = ConstVal.Get((uint)defValue); - cvType = _semanticChecker.SymbolLoader.GetPredefindType(PredefinedType.PT_UINT); + cvType = SymbolLoader.GetPredefindType(PredefinedType.PT_UINT); break; case TypeCode.UInt64: cv = ConstVal.Get((ulong)defValue); - cvType = _semanticChecker.SymbolLoader.GetPredefindType(PredefinedType.PT_ULONG); + cvType = SymbolLoader.GetPredefindType(PredefinedType.PT_ULONG); break; case TypeCode.String: cv = ConstVal.Get((string)defValue); - cvType = _semanticChecker.SymbolLoader.GetPredefindType(PredefinedType.PT_STRING); + cvType = SymbolLoader.GetPredefindType(PredefinedType.PT_STRING); break; } @@ -1710,23 +1668,25 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private MethodSymbol FindMatchingMethod(MemberInfo method, AggregateSymbol callingAggregate) + private static MethodSymbol FindMatchingMethod(MemberInfo method, AggregateSymbol callingAggregate) { - MethodSymbol meth = _bsymmgr.LookupAggMember(GetName(method.Name), callingAggregate, symbmask_t.MASK_MethodSymbol) as MethodSymbol; + MethodSymbol meth = SymbolStore.LookupSym(GetName(method.Name), callingAggregate, symbmask_t.MASK_MethodSymbol) as MethodSymbol; while (meth != null) { if (meth.AssociatedMemberInfo.IsEquivalentTo(method)) { return meth; } - meth = BSYMMGR.LookupNextSym(meth, callingAggregate, symbmask_t.MASK_MethodSymbol) as MethodSymbol; + + meth = meth.LookupNext(symbmask_t.MASK_MethodSymbol) as MethodSymbol; } + return null; } ///////////////////////////////////////////////////////////////////////////////// - private uint GetCountOfModOpts(ParameterInfo[] parameters) + private static uint GetCountOfModOpts(ParameterInfo[] parameters) { uint count = 0; #if UNSUPPORTEDAPI @@ -1743,26 +1703,27 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private TypeArray CreateParameterArray(MemberInfo associatedInfo, ParameterInfo[] parameters) + private static TypeArray CreateParameterArray(MemberInfo associatedInfo, ParameterInfo[] parameters) { - List types = new List(); + bool isVarArg = associatedInfo is MethodBase mb && (mb.CallingConvention & CallingConventions.VarArgs) != 0; + CType[] types = new CType[isVarArg ? parameters.Length + 1 : parameters.Length]; - foreach (ParameterInfo p in parameters) + for (int i = 0; i < parameters.Length; i++) { - types.Add(GetTypeOfParameter(p, associatedInfo)); + types[i] = GetTypeOfParameter(parameters[i], associatedInfo); } - if (associatedInfo is MethodBase mb && (mb.CallingConvention & CallingConventions.VarArgs) != 0) + if (isVarArg) { - types.Add(_typeManager.GetArgListType()); + types[types.Length - 1] = ArgumentListType.Instance; } - return _bsymmgr.AllocParams(types.Count, types.ToArray()); + return TypeArray.Allocate(types); } ///////////////////////////////////////////////////////////////////////////////// - private CType GetTypeOfParameter(ParameterInfo p, MemberInfo m) + private static CType GetTypeOfParameter(ParameterInfo p, MemberInfo m) { Type t = p.ParameterType; CType ctype; @@ -1779,8 +1740,8 @@ namespace Microsoft.CSharp.RuntimeBinder // Check if we have an out parameter. if (ctype is ParameterModifierType mod && p.IsOut && !p.IsIn) { - CType parameterType = mod.GetParameterType(); - ctype = _typeManager.GetParameterModifier(parameterType, true); + CType parameterType = mod.ParameterType; + ctype = TypeManager.GetParameterModifier(parameterType, true); } return ctype; @@ -1788,7 +1749,7 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private bool DoesMethodHaveParameterArray(ParameterInfo[] parameters) + private static bool DoesMethodHaveParameterArray(ParameterInfo[] parameters) { if (parameters.Length == 0) { @@ -1810,7 +1771,7 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private SymWithType GetSlotForOverride(MethodInfo method) + private static SymWithType GetSlotForOverride(MethodInfo method) { if (method.IsVirtual && method.IsHideBySig) { @@ -1826,7 +1787,7 @@ namespace Microsoft.CSharp.RuntimeBinder // the methods in order. As such, our parent methods should be in the // symbol table at this point. - AggregateSymbol aggregate = GetCTypeFromType(baseMethodInfo.DeclaringType).getAggregate(); + AggregateSymbol aggregate = ((AggregateType)GetCTypeFromType(baseMethodInfo.DeclaringType)).OwningAggregate; MethodSymbol baseMethod = FindMethodFromMemberInfo(baseMethodInfo); Debug.Assert(baseMethod != null); return new SymWithType(baseMethod, aggregate.getThisType()); @@ -1837,20 +1798,20 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private MethodSymbol FindMethodFromMemberInfo(MemberInfo baseMemberInfo) + private static MethodSymbol FindMethodFromMemberInfo(MemberInfo baseMemberInfo) { CType t = GetCTypeFromType(baseMemberInfo.DeclaringType); Debug.Assert(t is AggregateType); - AggregateSymbol aggregate = t.getAggregate(); + AggregateSymbol aggregate = ((AggregateType)t).OwningAggregate; Debug.Assert(aggregate != null); - MethodSymbol meth = _semanticChecker.SymbolLoader.LookupAggMember( + MethodSymbol meth = SymbolLoader.LookupAggMember( GetName(baseMemberInfo.Name), aggregate, symbmask_t.MASK_MethodSymbol) as MethodSymbol; for (; meth != null && !meth.AssociatedMemberInfo.IsEquivalentTo(baseMemberInfo); - meth = SymbolLoader.LookupNextSym(meth, aggregate, symbmask_t.MASK_MethodSymbol) as MethodSymbol) + meth = meth.LookupNext(symbmask_t.MASK_MethodSymbol) as MethodSymbol) ; return meth; @@ -1858,16 +1819,15 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - internal bool AggregateContainsMethod(AggregateSymbol agg, string szName, symbmask_t mask) - { - return _semanticChecker.SymbolLoader.LookupAggMember(GetName(szName), agg, mask) != null; - } + internal static bool AggregateContainsMethod(AggregateSymbol agg, string szName, symbmask_t mask) => + SymbolLoader.LookupAggMember(GetName(szName), agg, mask) != null; + #endregion #region Conversions ///////////////////////////////////////////////////////////////////////////////// - internal void AddConversionsForType(Type type) + internal static void AddConversionsForType(Type type) { if (type.IsInterface) { @@ -1881,14 +1841,14 @@ namespace Microsoft.CSharp.RuntimeBinder ///////////////////////////////////////////////////////////////////////////////// - private void AddConversionsForOneType(Type type) + private static void AddConversionsForOneType(Type type) { if (type.IsGenericType) { type = type.GetGenericTypeDefinition(); } - if (!_typesWithConversionsLoaded.Add(type)) + if (!s_typesWithConversionsLoaded.Add(type)) { return; } @@ -1900,7 +1860,7 @@ namespace Microsoft.CSharp.RuntimeBinder if (!(t is AggregateType)) { CType endT; - while ((endT = t.GetBaseOrParameterOrElementType()) != null) + while ((endT = t.BaseOrParameterOrElementType) != null) { t = endT; } @@ -1909,7 +1869,7 @@ namespace Microsoft.CSharp.RuntimeBinder if (t is TypeParameterType paramType) { // Add conversions for the bounds. - foreach (CType bound in paramType.GetBounds().Items) + foreach (CType bound in paramType.Bounds.Items) { AddConversionsForType(bound.AssociatedSystemType); } @@ -1917,7 +1877,7 @@ namespace Microsoft.CSharp.RuntimeBinder } Debug.Assert(t is AggregateType); - AggregateSymbol aggregate = ((AggregateType)t).getAggregate(); + AggregateSymbol aggregate = ((AggregateType)t).OwningAggregate; // Now find all the conversions and make them. foreach (MethodInfo conversion in type.GetRuntimeMethods()) @@ -1977,8 +1937,8 @@ namespace Microsoft.CSharp.RuntimeBinder case SpecialNames.CLR_OnesComplement: case SpecialNames.CLR_True: case SpecialNames.CLR_False: - case SpecialNames.CLR_PreIncrement: - case SpecialNames.CLR_PreDecrement: + case SpecialNames.CLR_Increment: + case SpecialNames.CLR_Decrement: return true; } } diff --git a/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.de.resx b/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.de.resx index 0b9a2ff9f1..38d09851f4 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.de.resx +++ b/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.de.resx @@ -81,9 +81,6 @@ NULL kann nicht in {0} konvertiert werden, da dieser Werttyp nicht auf NULL festgelegt werden kann. - - Auf einen nicht statischen Member des äußeren {0}-Typs kann nicht über den geschachtelten {1}-Typ zugegriffen werden. - {0} enthält keine Definition für {1}. diff --git a/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.es.resx b/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.es.resx index b50227d36d..2ecf6454cb 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.es.resx +++ b/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.es.resx @@ -81,9 +81,6 @@ No se puede convertir NULL en '{0}' porque es un tipo de valor que no acepta valores NULL. - - No se puede obtener acceso a un miembro no estático de tipo externo '{0}' mediante el tipo anidado '{1}'. - '{0}' no contiene una definición para '{1}'. diff --git a/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.fr.resx b/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.fr.resx index e31fb94aab..4879b314dc 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.fr.resx +++ b/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.fr.resx @@ -81,9 +81,6 @@ Impossible de convertir null en '{0}', car il s'agit d'un type valeur qui n'autorise pas les valeurs null - - Impossible d'accéder à un membre non statique de type externe '{0}' par l'intermédiaire du type imbriqué '{1}' - '{0}' ne contient pas de définition pour '{1}' diff --git a/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.it.resx b/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.it.resx index 7ca475533f..4c215fcd65 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.it.resx +++ b/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.it.resx @@ -81,9 +81,6 @@ Impossibile convertire Null in '{0}' perché è un tipo di valore non nullable - - Impossibile accedere a un membro non statico di tipo outer '{0}' tramite il tipo annidato '{1}' - '{0}' non contiene una definizione per '{1}' diff --git a/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.ja.resx b/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.ja.resx index 861002fe0a..3807dae995 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.ja.resx +++ b/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.ja.resx @@ -81,9 +81,6 @@ Null éžè¨±å®¹ã®å€¤åž‹ã§ã‚ã‚‹ãŸã‚ã€Null ã‚’ '{0}' ã«å¤‰æ›ã§ãã¾ã›ã‚“ - - 入れå­ã«ã•ã‚ŒãŸåž‹ '{1}' を経由ã—ã¦ã€å¤–ã®åž‹ '{0}' ã®é™çš„ã§ãªã„メンãƒãƒ¼ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“ - '{0}' ã« '{1}' ã®å®šç¾©ãŒã‚ã‚Šã¾ã›ã‚“ diff --git a/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.ko.resx b/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.ko.resx index a2a6b1bf15..609342acc1 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.ko.resx +++ b/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.ko.resx @@ -81,9 +81,6 @@ '{0}'ì€(는) nullì„ í—ˆìš©í•˜ì§€ 않는 ê°’ 형ì‹ì´ë¯€ë¡œ nullì„ ì´ í˜•ì‹ìœ¼ë¡œ 변환할 수 없습니다. - - 중첩 í˜•ì‹ '{1}'ì„(를) 통해 외부 í˜•ì‹ '{0}'ì˜ staticì´ ì•„ë‹Œ ë©¤ë²„ì— ì•¡ì„¸ìŠ¤í•  수 없습니다. - '{0}'ì— '{1}'ì— ëŒ€í•œ ì •ì˜ê°€ 없습니다. diff --git a/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.resx b/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.resx index 462e5c137e..35d607622e 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.resx +++ b/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.resx @@ -109,9 +109,6 @@ Cannot convert null to '{0}' because it is a non-nullable value type - - Cannot access a non-static member of outer type '{0}' via nested type '{1}' - '{0}' does not contain a definition for '{1}' @@ -238,15 +235,6 @@ Delegate '{0}' has some invalid arguments - - Cannot modify the return value of '{0}' because it is not a variable - - - Members of readonly field '{0}' cannot be modified (except in a constructor or a variable initializer) - - - Fields of static readonly field '{0}' cannot be assigned to (except in a static constructor or a variable initializer) - '{0}' does not contain a constructor that takes '{1}' arguments @@ -271,9 +259,6 @@ The runtime binder cannot bind a metaobject without a value - - More than one type in the binding has the same full name. - Named argument '{0}' is used out-of-position but is followed by an unnamed argument diff --git a/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.ru.resx b/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.ru.resx index 9c982cc8df..78b66c55fb 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.ru.resx +++ b/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.ru.resx @@ -81,9 +81,6 @@ Cannot convert null to "{0}" because it is a non-nullable value type - - Ðевозможно получить доÑтуп к неÑтатичеÑкому члену внешнего типа "{0}" через вложенный тип "{1}" - "{0}" не Ñодержит Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ "{1}" diff --git a/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.zh-Hans.resx b/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.zh-Hans.resx index c4f57cf06a..65ecb7fc02 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.zh-Hans.resx +++ b/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.zh-Hans.resx @@ -81,9 +81,6 @@ 无法将 null 转æ¢ä¸ºâ€œ{0}â€ï¼Œå› ä¸ºåŽè€…是ä¸å¯ä»¥ä¸º null 的值类型 - - 无法通过嵌套类型“{1}â€æ¥è®¿é—®å¤–部类型“{0}â€çš„éžé™æ€æˆå‘˜ - “{0}â€æœªåŒ…å«â€œ{1}â€çš„定义 diff --git a/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.zh-Hant.resx b/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.zh-Hant.resx index 55ec74b0d6..0517ad500e 100644 --- a/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.zh-Hant.resx +++ b/external/corefx/src/Microsoft.CSharp/src/Resources/Strings.zh-Hant.resx @@ -81,9 +81,6 @@ 無法將 null 轉æ›æˆ '{0}'，因為它是ä¸å¯ç‚º null 的實值型別 - - 無法é€éŽå·¢ç‹€åž‹åˆ¥ '{1}' å­˜å–外部型別 '{0}' çš„éžéœæ…‹æˆå“¡ - '{0}' ä¸åŒ…å« '{1}' 的定義 diff --git a/external/corefx/src/Microsoft.CSharp/tests/AccessTests.cs b/external/corefx/src/Microsoft.CSharp/tests/AccessTests.cs new file mode 100644 index 0000000000..4fa3516cd7 --- /dev/null +++ b/external/corefx/src/Microsoft.CSharp/tests/AccessTests.cs @@ -0,0 +1,294 @@ +// 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; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.CompilerServices; +using Xunit; + +namespace Microsoft.CSharp.RuntimeBinder.Tests +{ + public partial class AccessTests + { + public abstract class PublicReferenceType + { + public abstract int IntValueProperty { get; } + } + + public interface ITestIFace + { + } + + public interface ITestIFaceCons where T : ITestIFace + { + } + + private class Container + { + private abstract class ReferenceTypeIntermediary : PublicReferenceType + { + } + + private class ReferenceType : ReferenceTypeIntermediary, ITestIFace + { + public override int IntValueProperty => 23; + } + + private struct PrivateValueType + { + } + + private protected struct PrivateProtectedValueType + { + } + + internal struct InternalValueType + { + } + + protected internal struct ProtectedInternalValueType + { + } + + private interface IPrivateInterface + { + } + + public static dynamic GetReferenceType() => new ReferenceType(); + + public static dynamic TenReferenceTypesArray() => new ReferenceType[10]; + + public static dynamic TenReferenceTypesRepeat() => Enumerable.Repeat(new ReferenceType(), 10); + + public static dynamic ReferenceTypeDelegate() => + (Func>)(i => Enumerable.Repeat(new ReferenceType(), i)); + + public static dynamic ValueTypeArray() => new PrivateValueType[2]; + + public static dynamic PrivateProtectedValueTypeArray() => new PrivateProtectedValueType[2]; + + public static dynamic InternalValueTypeArray() => new InternalValueType[2]; + + public static dynamic ProtectedInternalValueTypeArray() => new ProtectedInternalValueType[2]; + + private delegate int PrivateFunc(T arg); + + public static dynamic PrivateDelegateType() => (PrivateFunc)(r => r.IntValueProperty); + + public static dynamic ValueTypeDelegate() => (Func)(() => new PrivateValueType()); + + public unsafe static dynamic PointerArray() => new PrivateValueType*[4]; + + public static dynamic PrivateInterfaceDelegate() => (Func)(() => null); + + public static dynamic PrivateConstraintInterfaceDelegate() => (Func>)(() => null); + + public static dynamic PrivateProtectedInstance() => PrivateProtectedValueTypeArray()[1]; + } + + private class TypeWithFields + { + public int Public; + protected int Protected; + internal int Internal; + protected internal int ProtectedInternal; + private protected int PrivateProtected; +#pragma warning disable 414 + private int Private; +#pragma warning restore 414 + + public TypeWithFields() + { + Public = 1; + Protected = 2; + Internal = 3; + ProtectedInternal = 4; + PrivateProtected = 5; + Private = 6; + } + } + + private class TypeWithFieldsDerived : TypeWithFields + { + public void AccessibleFields() + { + dynamic d = this; + Assert.Equal(1, d.Public); + Assert.Equal(2, d.Protected); + Assert.Equal(3, d.Internal); + Assert.Equal(4, d.ProtectedInternal); + Assert.Equal(5, d.PrivateProtected); + } + + public void InAccessibleFields() + { + dynamic d = this; + Assert.Throws(() => d.Private); + } + } + + [Fact] + public void CanGetAccessibleBaseOfInaccessibleType() => Assert.Equal(23, Container.GetReferenceType().IntValueProperty); + + [Fact] + public void AccessibleArray() => Assert.Equal(10, Enumerable.Count(Container.TenReferenceTypesArray())); + + [Fact] + public void AccessibleInterface() => Assert.Equal(10, Enumerable.Count(Container.TenReferenceTypesRepeat())); + + [Fact] + public void AccessCovariantDelegate() + { + IEnumerable prts = Container.ReferenceTypeDelegate()(4); + Assert.Equal(4, prts.Count()); + foreach (PublicReferenceType prt in prts) + { + Assert.Equal(23, prt.IntValueProperty); + } + } + + [Fact] + public void NonCovariantArrayToArrayType() => Assert.Equal(2, Container.ValueTypeArray().Length); + + [Fact] + public void NonCovariantArrayNotCastToIndexableType() + { + dynamic array = Container.ValueTypeArray(); + Assert.Throws(() => array[0]); + } + + [Fact] + public void PointerArrayToArrayType() => Assert.Equal(4, Container.PointerArray().Length); + + [Fact] + public void PointerArrayNotCastToIndexableType() + { + dynamic array = Container.PointerArray(); + Assert.Throws(() => array[0]); + } + + [Fact] + public void PrivateDelegateType() + { + dynamic d = Container.PrivateDelegateType(); + dynamic a = Container.GetReferenceType(); + Assert.Throws(() => d(a)); + d.DynamicInvoke(a); // Can use as MulticastDelegate. + } + + [Fact] + public void PrivateValueTypeDelegateType() + { + dynamic d = Container.ValueTypeDelegate(); + Assert.Throws(() => d()); + ValueType result = d.DynamicInvoke(); // Can use as MulticastDelegate. + } + + [Fact] + public void PrivateIFaceDelegateType() + { + dynamic d = Container.PrivateInterfaceDelegate(); + Assert.Null(d()); + } + + [Fact] + public void PrivateInterfaceConstraint() + { + // Casting Func> to Func> + // would be illegal because ITestIFaceCons violates the ITestIFaceCons + // constraints, so the binder has to detect that, and cast to Func. + dynamic d = Container.PrivateConstraintInterfaceDelegate(); + Assert.Null(d()); + } + + private struct SomeValueType + { + public override string ToString() => "test"; + } + + [Fact] + public void NullableOfInaccessible() + { + // ValueType members work without access to the type. + CallSite> site = + CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.None, "ToString", null, null, + new[] + { + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null), + })); + Func target = site.Target; + Assert.Equal("test", target(site, new SomeValueType())); + + // Nullable members work with access to the type. + site = CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.None, "GetValueOrDefault", null, GetType(), + new[] + { + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null), + })); + target = site.Target; + Assert.Equal(new SomeValueType(), target(site, new SomeValueType())); + + // Nullable members don't work without access to the type. + site = CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.None, "GetValueOrDefault", null, null, + new[] + { + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null), + })); + target = site.Target; + Assert.Throws(() => target(site, new SomeValueType())); + } + + [Fact] + public void AccessNestedInternalOnlySameAssembly() + { + Assert.NotNull(Container.InternalValueTypeArray()[1]); + Assert.NotNull(Container.ProtectedInternalValueTypeArray()[1]); + } + + [Fact] + public void AccessNestedPrivateProtectedAssembly() + { + dynamic d = Container.PrivateProtectedValueTypeArray(); + Assert.Throws(() => d[1]); + Assert.NotNull(Container.PrivateProtectedInstance()); + } + + [Fact] + public void AccessibleFields() + { + dynamic d = new TypeWithFields(); + Assert.Equal(1, d.Public); + Assert.Equal(3, d.Internal); + Assert.Equal(4, d.ProtectedInternal); + } + + [Fact] + public void InaccessibleFields() + { + dynamic d = new TypeWithFields(); + Assert.Throws(() => d.Protected); + Assert.Throws(() => d.PrivateProtected); + Assert.Throws(() => d.Private); + } + + [Fact] + public void AccessibleToDerivedFields() + { + new TypeWithFieldsDerived().AccessibleFields(); + } + + [Fact] + public void InaccessibleToDerivedFields() + { + new TypeWithFieldsDerived().AccessibleFields(); + } + } +} diff --git a/external/corefx/src/Microsoft.CSharp/tests/AccessTests.netcoreapp.cs b/external/corefx/src/Microsoft.CSharp/tests/AccessTests.netcoreapp.cs index a7cfdf6ec6..9e62a92c45 100644 --- a/external/corefx/src/Microsoft.CSharp/tests/AccessTests.netcoreapp.cs +++ b/external/corefx/src/Microsoft.CSharp/tests/AccessTests.netcoreapp.cs @@ -10,7 +10,7 @@ using Xunit; namespace Microsoft.CSharp.RuntimeBinder.Tests { - public class AccessTests + public partial class AccessTests { private readonly Type _baseType; private readonly Type _siblingType; diff --git a/external/corefx/src/Microsoft.CSharp/tests/BindingErrors.cs b/external/corefx/src/Microsoft.CSharp/tests/BindingErrors.cs index 2a0a3abae0..34e7e73b2d 100644 --- a/external/corefx/src/Microsoft.CSharp/tests/BindingErrors.cs +++ b/external/corefx/src/Microsoft.CSharp/tests/BindingErrors.cs @@ -8,9 +8,11 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Diagnostics; +using System.Globalization; using System.Linq; using System.Linq.Expressions; using System.Runtime.CompilerServices; +using System.Threading; using Xunit; namespace Microsoft.CSharp.RuntimeBinder.Tests @@ -425,5 +427,136 @@ namespace Microsoft.CSharp.RuntimeBinder.Tests dynamic d = new object(); Assert.Throws(() => DoStuff(d)); } + + public class Outer + { + public class Inner + { + public void DoNothing() + { + } + } + } + + [Fact] + public void TryInvokeOrAccessNestedClassAsMember() + { + dynamic dFirst = new Outer.Inner(); + dFirst.DoNothing(); + dynamic d = new Outer(); + Assert.Throws(() => d.Inner()); + Assert.Throws(() => d.Inner()); + Assert.Throws(() => d.Inner = 2); + Assert.Throws( + () => + { + int i = d.Inner(); + }); + } + + [Fact] + public void TryInvokeTypeParameterAsMember() + { + dynamic d = new List(); + Assert.Throws(() => d.T); + Assert.Throws(() => d.T()); + Assert.Throws(() => d.T()); + Assert.Throws(() => + { + int i = d.T; + }); + } + + public class BaseForOuterWithMethod + { + public int Inner() => 42; + } + + public class DerivedOuterHidingMethod : BaseForOuterWithMethod + { + public new class Inner + { + public void DoNothing() + { + } + } + } + + [Fact] + public void AccessMethodHiddenByNested() + { + dynamic dFirst = new DerivedOuterHidingMethod.Inner(); + dFirst.DoNothing(); + dynamic d = new DerivedOuterHidingMethod(); + Assert.Equal(42, d.Inner()); + } + + public class BaseForOuterWithNested + { + public class Inner + { + public void DoNothing() + { + } + } + } + + public class DerivedOuterHidingNested : BaseForOuterWithNested + { + public new int Inner() => 42; + } + + [Fact] + public void AccessMethodHidingNested() + { + dynamic dFirst = new BaseForOuterWithNested.Inner(); + dFirst.DoNothing(); + dynamic d = new DerivedOuterHidingNested(); + Assert.Equal(42, d.Inner()); + } + + [Fact] + public void CannotCallOperatorDirectly() + { + CultureInfo prev = CultureInfo.CurrentCulture; + Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; + dynamic d = ""; + RuntimeBinderException e = Assert.Throws(() => d.op_Equality("", "")); + Assert.Equal("'string.operator ==(string, string)': cannot explicitly call operator or accessor", e.Message); + Thread.CurrentThread.CurrentCulture = prev; + } + + [Fact] + public void CannotCallAccessorDirectly() + { + CultureInfo prev = CultureInfo.CurrentCulture; + Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; + dynamic d = ""; + RuntimeBinderException e = Assert.Throws(() => d.get_Length()); + Assert.Equal("'string.Length.get': cannot explicitly call operator or accessor", e.Message); + Thread.CurrentThread.CurrentCulture = prev; + } + + [Fact] + public void AllowIndexerAccess() + { + // Indexers' accessors can be accessed directly. This is against the C# rules, which only allow + // direct access of indexer accessors when they are not the default member as C# has no other + // way to express such access, but being stricter would be a breaking change. + List list = new List { 1, 2, 3 }; + dynamic d = list; + d.set_Item(2, 4); + dynamic e = d.get_Item(2); + Assert.Equal(4, e); + Assert.Equal(4, list[2]); + } + + [Fact] + public void AllowStringIndexerAccess() + { + dynamic d = "abcd"; + char c = d.get_Chars(2); + Assert.Equal('c', c); + } } } diff --git a/external/corefx/src/Microsoft.CSharp/tests/Helpers.cs b/external/corefx/src/Microsoft.CSharp/tests/Helpers.cs new file mode 100644 index 0000000000..60a7c32a31 --- /dev/null +++ b/external/corefx/src/Microsoft.CSharp/tests/Helpers.cs @@ -0,0 +1,25 @@ +using System; +using System.IO; + +namespace Microsoft.CSharp.RuntimeBinder.Tests +{ + public static class Helpers + { + public static void OverrideConsoleAndRun(Action command) + { + TextWriter savedOut = Console.Out; + try + { + using (var stringWriter = new StringWriter()) + { + Console.SetOut(stringWriter); + command(stringWriter); + } + } + finally + { + Console.SetOut(savedOut); + } + } + } +} diff --git a/external/corefx/src/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj b/external/corefx/src/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj index db08891f7e..20033b4bfb 100644 --- a/external/corefx/src/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj +++ b/external/corefx/src/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj @@ -3,17 +3,20 @@ {82B54697-0251-47A1-8546-FC507D0F3B08} + true + + @@ -34,5 +37,8 @@ + + + - + \ No newline at end of file diff --git a/external/corefx/src/Microsoft.CSharp/tests/NamedArgumentTests.cs b/external/corefx/src/Microsoft.CSharp/tests/NamedArgumentTests.cs index 989a50d62d..6b26ffc48f 100644 --- a/external/corefx/src/Microsoft.CSharp/tests/NamedArgumentTests.cs +++ b/external/corefx/src/Microsoft.CSharp/tests/NamedArgumentTests.cs @@ -366,33 +366,37 @@ namespace Microsoft.CSharp.RuntimeBinder.Tests [Fact] public void TestSimple() { - StringWriter console = new StringWriter(); - Console.SetOut(console); - CallSite> callsite = CallSite>.Create( - Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C1), - new[] - { - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, null), - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, "a"), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null) - })); - callsite.Target(callsite, typeof(C1), 1, 2); - callsite = CallSite>.Create( - Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C1), - new[] - { - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, null), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null), - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, "a") - })); - callsite.Target(callsite, typeof(C1), 3, 4); - Assert.Equal("First 1 2. Second 3 4. ", console.ToString()); + Helpers.OverrideConsoleAndRun(console => + { + CallSite> callsite = CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C1), + new[] + { + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, + null), + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, + "a"), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null) + })); + callsite.Target(callsite, typeof(C1), 1, 2); + callsite = CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C1), + new[] + { + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, + null), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null), + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, "a") + })); + callsite.Target(callsite, typeof(C1), 3, 4); + Assert.Equal("First 1 2. Second 3 4. ", console.ToString()); + }); } class C2 @@ -406,21 +410,25 @@ namespace Microsoft.CSharp.RuntimeBinder.Tests [Fact] public void TestSimpleConstructor() { - StringWriter console = new StringWriter(); - Console.SetOut(console); - CallSite> callsite = CallSite>.Create( - Binder.InvokeConstructor( - CSharpBinderFlags.None, typeof(C2), - new[] - { - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.UseCompileTimeType | CSharpArgumentInfoFlags.IsStaticType, null), - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.UseCompileTimeType | CSharpArgumentInfoFlags.NamedArgument, "a"), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null) - })); - callsite.Target(callsite, typeof(C2), 1, 2); - Assert.Equal("1 2.", console.ToString()); + Helpers.OverrideConsoleAndRun(console => + { + CallSite> callsite = + CallSite>.Create( + Binder.InvokeConstructor( + CSharpBinderFlags.None, typeof(C2), + new[] + { + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.UseCompileTimeType | CSharpArgumentInfoFlags.IsStaticType, + null), + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.UseCompileTimeType | CSharpArgumentInfoFlags.NamedArgument, + "a"), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null) + })); + callsite.Target(callsite, typeof(C2), 1, 2); + Assert.Equal("1 2.", console.ToString()); + }); } class C3 @@ -446,18 +454,30 @@ namespace Microsoft.CSharp.RuntimeBinder.Tests // This test differs from its static equivalent considerably, as some event-related matters aren't as directly // applicable. We can use it for checking both direct and deferred delegate invocation. - StringWriter console = new StringWriter(); - Console.SetOut(console); - C3 targetObject = new C3(); - CallSite> getCallSite = CallSite>.Create( - Binder.GetMember( - CSharpBinderFlags.None, "e", typeof(C3), - new[] {CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null)})); - object dele = getCallSite.Target(getCallSite, targetObject); - CallSite> invokeCallSite = - CallSite>.Create( + Helpers.OverrideConsoleAndRun(console => + { + C3 targetObject = new C3(); + CallSite> getCallSite = CallSite>.Create( + Binder.GetMember( + CSharpBinderFlags.None, "e", typeof(C3), + new[] {CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null)})); + object dele = getCallSite.Target(getCallSite, targetObject); + CallSite> invokeCallSite = + CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.ResultDiscarded, "Invoke", Type.EmptyTypes, typeof(C3), + new[] + { + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null), + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, + "a"), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null), + })); + invokeCallSite.Target(invokeCallSite, dele, 1, 2); + invokeCallSite = CallSite>.Create( Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "Invoke", Type.EmptyTypes, typeof(C3), + CSharpBinderFlags.ResultDiscarded, "e", Type.EmptyTypes, typeof(C3), new[] { CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null), @@ -466,19 +486,9 @@ namespace Microsoft.CSharp.RuntimeBinder.Tests "a"), CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null), })); - invokeCallSite.Target(invokeCallSite, dele, 1, 2); - invokeCallSite = CallSite>.Create( - Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "e", Type.EmptyTypes, typeof(C3), - new[] - { - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null), - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, "a"), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null), - })); - invokeCallSite.Target(invokeCallSite, targetObject, 1, 2); - Assert.Equal("1 2. 1 2. ", console.ToString()); + invokeCallSite.Target(invokeCallSite, targetObject, 1, 2); + Assert.Equal("1 2. 1 2. ", console.ToString()); + }); } class C4 @@ -497,37 +507,38 @@ namespace Microsoft.CSharp.RuntimeBinder.Tests [Fact] public void TestSimpleIndexer() { - StringWriter console = new StringWriter(); - Console.SetOut(console); - C4 targetObject = new C4(); - CallSite> getCallSite = - CallSite>.Create( - Binder.GetIndex( - CSharpBinderFlags.None, typeof(C4), - new[] - { - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null), - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.UseCompileTimeType | CSharpArgumentInfoFlags.NamedArgument, - "a"), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null), - })); - Assert.Equal(0, getCallSite.Target(getCallSite, targetObject, 1, 2)); - CallSite> setCallSite = - CallSite>.Create( - Binder.SetIndex( - CSharpBinderFlags.None, typeof(C4), - new[] - { - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null), - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.UseCompileTimeType | CSharpArgumentInfoFlags.NamedArgument, - "a"), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null), - })); - Assert.Equal(5, setCallSite.Target(setCallSite, targetObject, 3, 4, 5)); - Assert.Equal("Get 1 2. Set 3 4 5.", console.ToString()); + Helpers.OverrideConsoleAndRun(console => + { + C4 targetObject = new C4(); + CallSite> getCallSite = + CallSite>.Create( + Binder.GetIndex( + CSharpBinderFlags.None, typeof(C4), + new[] + { + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null), + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.UseCompileTimeType | CSharpArgumentInfoFlags.NamedArgument, + "a"), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null), + })); + Assert.Equal(0, getCallSite.Target(getCallSite, targetObject, 1, 2)); + CallSite> setCallSite = + CallSite>.Create( + Binder.SetIndex( + CSharpBinderFlags.None, typeof(C4), + new[] + { + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null), + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.UseCompileTimeType | CSharpArgumentInfoFlags.NamedArgument, + "a"), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null), + })); + Assert.Equal(5, setCallSite.Target(setCallSite, targetObject, 3, 4, 5)); + Assert.Equal("Get 1 2. Set 3 4 5.", console.ToString()); + }); } @@ -652,14 +663,32 @@ namespace Microsoft.CSharp.RuntimeBinder.Tests [Fact] public void TestGenericInference() { - StringWriter console = new StringWriter(); - Console.SetOut(console); + Helpers.OverrideConsoleAndRun(console => + { - // Test with types defined fully. - CallSite> compileTimeTypeCallSite = - CallSite>.Create( + // Test with types defined fully. + CallSite> compileTimeTypeCallSite = + CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.ResultDiscarded, "M", new[] {typeof(int), typeof(string)}, typeof(C7), + new[] + { + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, + null), + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, + "a"), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null) + })); + compileTimeTypeCallSite.Target(compileTimeTypeCallSite, typeof(C7), 1, "hi"); + Assert.Equal("1 hi.", console.ToString()); + + // Test with types defined fully in delegate but generic types deduced. + console.GetStringBuilder().Length = 0; + compileTimeTypeCallSite = CallSite>.Create( Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "M", new[] {typeof(int), typeof(string)}, typeof(C7), + CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C7), new[] { CSharpArgumentInfo.Create( @@ -670,39 +699,24 @@ namespace Microsoft.CSharp.RuntimeBinder.Tests "a"), CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null) })); - compileTimeTypeCallSite.Target(compileTimeTypeCallSite, typeof(C7), 1, "hi"); - Assert.Equal("1 hi.", console.ToString()); + compileTimeTypeCallSite.Target(compileTimeTypeCallSite, typeof(C7), 1, "hi"); + Assert.Equal("1 hi.", console.ToString()); - // Test with types defined fully in delegate but generic types deduced. - console.GetStringBuilder().Length = 0; - compileTimeTypeCallSite = CallSite>.Create( - Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C7), - new[] - { - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, null), - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, "a"), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null) - })); - compileTimeTypeCallSite.Target(compileTimeTypeCallSite, typeof(C7), 1, "hi"); - Assert.Equal("1 hi.", console.ToString()); - - // Test with all types deduced by the dynamic binder. - console.GetStringBuilder().Length = 0; - CallSite> runtimeTypeCallSite = - CallSite>.Create( - Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C7), - new[] - { - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.IsStaticType, null), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.NamedArgument, "a"), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null) - })); - runtimeTypeCallSite.Target(runtimeTypeCallSite, typeof(C7), 1, "hi"); - Assert.Equal("1 hi.", console.ToString()); + // Test with all types deduced by the dynamic binder. + console.GetStringBuilder().Length = 0; + CallSite> runtimeTypeCallSite = + CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C7), + new[] + { + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.IsStaticType, null), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.NamedArgument, "a"), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null) + })); + runtimeTypeCallSite.Target(runtimeTypeCallSite, typeof(C7), 1, "hi"); + Assert.Equal("1 hi.", console.ToString()); + }); } class C8 @@ -798,41 +812,28 @@ namespace Microsoft.CSharp.RuntimeBinder.Tests public void TestNamedParamsVariousForms() { // This extends the static test in also calling with no arguments for the params section. - StringWriter console = new StringWriter(); - Console.SetOut(console); + Helpers.OverrideConsoleAndRun(console => + { - CallSite> callSite0 = - CallSite>.Create( - Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C10), - new[] - { - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, - null), - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, - "x"), - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, "y") - })); - callSite0.Target(callSite0, typeof(C10), 1, "2"); + CallSite> callSite0 = + CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C10), + new[] + { + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, + null), + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, + "x"), + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, + "y") + })); + callSite0.Target(callSite0, typeof(C10), 1, "2"); - callSite0 = CallSite>.Create( - Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C10), - new[] - { - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, null), - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, "x"), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null) - })); - callSite0.Target(callSite0, typeof(C10), 2, "3"); - - CallSite> callSite1 = - CallSite>.Create( + callSite0 = CallSite>.Create( Binder.InvokeMember( CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C10), new[] @@ -845,55 +846,61 @@ namespace Microsoft.CSharp.RuntimeBinder.Tests "x"), CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null) })); - callSite1.Target(callSite1, typeof(C10), 3, new[] {"4", "5"}); + callSite0.Target(callSite0, typeof(C10), 2, "3"); - CallSite> callSite2 = CallSite>.Create( - Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C10), - new[] - { - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, null), - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, "x") - })); - callSite2.Target(callSite2, typeof(C10), 4); + CallSite> callSite1 = + CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C10), + new[] + { + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, + null), + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, + "x"), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null) + })); + callSite1.Target(callSite1, typeof(C10), 3, new[] {"4", "5"}); - Assert.Equal("1 2. 2 3. 3 4,5. 4 . ", console.ToString()); + CallSite> callSite2 = CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C10), + new[] + { + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, + null), + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, "x") + })); + callSite2.Target(callSite2, typeof(C10), 4); + + Assert.Equal("1 2. 2 3. 3 4,5. 4 . ", console.ToString()); + }); } [Fact] public void TestNamedParamsVariousFormsDynamicallyDeducedTypes() { // This extends the static test in also calling with no arguments for the params section. - StringWriter console = new StringWriter(); - Console.SetOut(console); + Helpers.OverrideConsoleAndRun(console => + { - CallSite> callSite0 = - CallSite>.Create( - Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C10), - new[] - { - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.IsStaticType, null), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.NamedArgument, "x"), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.NamedArgument, "y") - })); - callSite0.Target(callSite0, typeof(C10), 1, "2"); + CallSite> callSite0 = + CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C10), + new[] + { + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.IsStaticType, null), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.NamedArgument, "x"), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.NamedArgument, "y") + })); + callSite0.Target(callSite0, typeof(C10), 1, "2"); - callSite0 = CallSite>.Create( - Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C10), - new[] - { - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.IsStaticType, null), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.NamedArgument, "x"), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null) - })); - callSite0.Target(callSite0, typeof(C10), 2, "3"); - - CallSite> callSite1 = - CallSite>.Create( + callSite0 = CallSite>.Create( Binder.InvokeMember( CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C10), new[] @@ -902,19 +909,32 @@ namespace Microsoft.CSharp.RuntimeBinder.Tests CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.NamedArgument, "x"), CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null) })); - callSite1.Target(callSite1, typeof(C10), 3, new[] {"4", "5"}); + callSite0.Target(callSite0, typeof(C10), 2, "3"); - CallSite> callSite2 = CallSite>.Create( - Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C10), - new[] - { - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.IsStaticType, null), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.NamedArgument, "x") - })); - callSite2.Target(callSite2, typeof(C10), 4); + CallSite> callSite1 = + CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C10), + new[] + { + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.IsStaticType, null), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.NamedArgument, "x"), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null) + })); + callSite1.Target(callSite1, typeof(C10), 3, new[] {"4", "5"}); - Assert.Equal("1 2. 2 3. 3 4,5. 4 . ", console.ToString()); + CallSite> callSite2 = CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C10), + new[] + { + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.IsStaticType, null), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.NamedArgument, "x") + })); + callSite2.Target(callSite2, typeof(C10), 4); + + Assert.Equal("1 2. 2 3. 3 4,5. 4 . ", console.ToString()); + }); } [Fact] @@ -1010,22 +1030,25 @@ namespace Microsoft.CSharp.RuntimeBinder.Tests [Fact] public void TestNamedParams5() { - StringWriter console = new StringWriter(); - Console.SetOut(console); - CallSite> callSite = CallSite>.Create( - Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C12), - new[] - { - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, null), - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, "y"), - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, "x") - })); - callSite.Target(callSite, typeof(C12), 1, 2); - Assert.Equal("x=2 y[0]=1 y.Length=1", console.ToString()); + Helpers.OverrideConsoleAndRun(console => + { + CallSite> callSite = CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C12), + new[] + { + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, + null), + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, + "y"), + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, "x") + })); + callSite.Target(callSite, typeof(C12), 1, 2); + Assert.Equal("x=2 y[0]=1 y.Length=1", console.ToString()); + }); } class C13 @@ -1069,42 +1092,46 @@ namespace Microsoft.CSharp.RuntimeBinder.Tests [Fact] public void TestPickGoodOverload() { - StringWriter console = new StringWriter(); - Console.SetOut(console); - CallSite> callSite = CallSite>.Create( - Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C14), - new[] - { - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, null), - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, "c"), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null) - })); - callSite.Target(callSite, typeof(C14), 3, 2); - Assert.Equal("Second 3 2. ", console.ToString()); + Helpers.OverrideConsoleAndRun(console => + { + CallSite> callSite = CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C14), + new[] + { + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, + null), + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, + "c"), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null) + })); + callSite.Target(callSite, typeof(C14), 3, 2); + Assert.Equal("Second 3 2. ", console.ToString()); + }); } [Fact] public void TestPickGoodOverloadDynamicallyTyped() { - StringWriter console = new StringWriter(); - Console.SetOut(console); - CallSite> callSite = - CallSite>.Create( - Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C14), - new[] - { - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.IsStaticType, null), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.NamedArgument, "c"), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null) - })); - callSite.Target(callSite, typeof(C14), 3, 2); - Assert.Equal("Second 3 2. ", console.ToString()); + Helpers.OverrideConsoleAndRun(console => + { + CallSite> callSite = + CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C14), + new[] + { + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.IsStaticType, null), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.NamedArgument, "c"), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null) + })); + callSite.Target(callSite, typeof(C14), 3, 2); + Assert.Equal("Second 3 2. ", console.ToString()); + }); } class C15 @@ -1121,40 +1148,44 @@ namespace Microsoft.CSharp.RuntimeBinder.Tests [Fact] public void TestPickGoodOverload2() { - StringWriter console = new StringWriter(); - Console.SetOut(console); - CallSite> callSite = CallSite>.Create( - Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C15), - new[] - { - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, null), - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, "c"), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null) - })); - callSite.Target(callSite, typeof(C15), 3, 2); - Assert.Equal("Second 3 2.", console.ToString()); + Helpers.OverrideConsoleAndRun(console => + { + CallSite> callSite = CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C15), + new[] + { + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, + null), + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, + "c"), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null) + })); + callSite.Target(callSite, typeof(C15), 3, 2); + Assert.Equal("Second 3 2.", console.ToString()); + }); } [Fact] public void TestPickGoodOverload2DynamicallyTyped() { - StringWriter console = new StringWriter(); - Console.SetOut(console); - CallSite> callSite = - CallSite>.Create( - Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C15), - new[] - { - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.IsStaticType, null), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.NamedArgument, "c"), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null) - })); - callSite.Target(callSite, typeof(C15), 3, 2); - Assert.Equal("Second 3 2.", console.ToString()); + Helpers.OverrideConsoleAndRun(console => + { + CallSite> callSite = + CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C15), + new[] + { + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.IsStaticType, null), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.NamedArgument, "c"), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null) + })); + callSite.Target(callSite, typeof(C15), 3, 2); + Assert.Equal("Second 3 2.", console.ToString()); + }); } class C16 @@ -1168,40 +1199,44 @@ namespace Microsoft.CSharp.RuntimeBinder.Tests [Fact] public void TestOptionalValues() { - StringWriter console = new StringWriter(); - Console.SetOut(console); - CallSite> callSite = CallSite>.Create( - Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C16), - new[] - { - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, null), - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, "a"), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null) - })); - callSite.Target(callSite, typeof(C16), 1, 2); - Assert.Equal("42", console.ToString()); + Helpers.OverrideConsoleAndRun(console => + { + CallSite> callSite = CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C16), + new[] + { + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, + null), + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, + "a"), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null) + })); + callSite.Target(callSite, typeof(C16), 1, 2); + Assert.Equal("42", console.ToString()); + }); } [Fact] public void TestOptionalValuesRunTimeTypes() { - StringWriter console = new StringWriter(); - Console.SetOut(console); - CallSite> callSite = - CallSite>.Create( - Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C16), - new[] - { - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.IsStaticType, null), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.NamedArgument, "a"), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null) - })); - callSite.Target(callSite, typeof(C16), 1, 2); - Assert.Equal("42", console.ToString()); + Helpers.OverrideConsoleAndRun(console => + { + CallSite> callSite = + CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C16), + new[] + { + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.IsStaticType, null), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.NamedArgument, "a"), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null) + })); + callSite.Target(callSite, typeof(C16), 1, 2); + Assert.Equal("42", console.ToString()); + }); } class C17 @@ -1269,47 +1304,49 @@ namespace Microsoft.CSharp.RuntimeBinder.Tests [Fact] public void TestParams2() { - StringWriter console = new StringWriter(); - Console.SetOut(console); - CallSite> callSite = - CallSite>.Create( - Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C18), - new[] - { - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, - null), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null), - CSharpArgumentInfo.Create( - CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, - "b"), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null) - })); - callSite.Target(callSite, typeof(C18), 1, 2, 3, 4); - Assert.Equal("1 2 3 4 Length:2", console.ToString()); + Helpers.OverrideConsoleAndRun(console => + { + CallSite> callSite = + CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C18), + new[] + { + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.IsStaticType | CSharpArgumentInfoFlags.UseCompileTimeType, + null), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null), + CSharpArgumentInfo.Create( + CSharpArgumentInfoFlags.NamedArgument | CSharpArgumentInfoFlags.UseCompileTimeType, + "b"), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.UseCompileTimeType, null) + })); + callSite.Target(callSite, typeof(C18), 1, 2, 3, 4); + Assert.Equal("1 2 3 4 Length:2", console.ToString()); + }); } [Fact] public void TestParams2RuntimeTypes() { - StringWriter console = new StringWriter(); - Console.SetOut(console); - CallSite> callSite = - CallSite>.Create( - Binder.InvokeMember( - CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C18), - new[] - { - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.IsStaticType, null), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.NamedArgument, "b"), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null), - CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null) - })); - callSite.Target(callSite, typeof(C18), 1, 2, 3, 4); - Assert.Equal("1 2 3 4 Length:2", console.ToString()); + Helpers.OverrideConsoleAndRun(console => + { + CallSite> callSite = + CallSite>.Create( + Binder.InvokeMember( + CSharpBinderFlags.ResultDiscarded, "M", Type.EmptyTypes, typeof(C18), + new[] + { + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.IsStaticType, null), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.NamedArgument, "b"), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null), + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null) + })); + callSite.Target(callSite, typeof(C18), 1, 2, 3, 4); + Assert.Equal("1 2 3 4 Length:2", console.ToString()); + }); } } } diff --git a/external/corefx/src/Microsoft.Diagnostics.Tracing.EventSource.Redist/dir.props b/external/corefx/src/Microsoft.Diagnostics.Tracing.EventSource.Redist/dir.props index 727f85c06a..a3c4bdc3d8 100644 --- a/external/corefx/src/Microsoft.Diagnostics.Tracing.EventSource.Redist/dir.props +++ b/external/corefx/src/Microsoft.Diagnostics.Tracing.EventSource.Redist/dir.props @@ -2,8 +2,8 @@ - 2.0.0 - 2.0.0.0 + 2.0.1 + 2.0.1.0 Open \ No newline at end of file diff --git a/external/corefx/src/Microsoft.Diagnostics.Tracing.EventSource.Redist/pkg/Microsoft.Diagnostics.Tracing.EventSource.Redist.pkgproj b/external/corefx/src/Microsoft.Diagnostics.Tracing.EventSource.Redist/pkg/Microsoft.Diagnostics.Tracing.EventSource.Redist.pkgproj index 7c96c63275..3379276bae 100644 --- a/external/corefx/src/Microsoft.Diagnostics.Tracing.EventSource.Redist/pkg/Microsoft.Diagnostics.Tracing.EventSource.Redist.pkgproj +++ b/external/corefx/src/Microsoft.Diagnostics.Tracing.EventSource.Redist/pkg/Microsoft.Diagnostics.Tracing.EventSource.Redist.pkgproj @@ -9,6 +9,7 @@ + false true diff --git a/external/corefx/src/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.pkgproj b/external/corefx/src/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.pkgproj index cdca494df9..5a8b968b56 100644 --- a/external/corefx/src/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.pkgproj +++ b/external/corefx/src/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.pkgproj @@ -13,7 +13,7 @@ - + diff --git a/external/corefx/src/Microsoft.VisualBasic/src/MatchingRefApiCompatBaseline.netstandard.txt b/external/corefx/src/Microsoft.VisualBasic/src/MatchingRefApiCompatBaseline.netstandard.txt new file mode 100644 index 0000000000..33bf1c3233 --- /dev/null +++ b/external/corefx/src/Microsoft.VisualBasic/src/MatchingRefApiCompatBaseline.netstandard.txt @@ -0,0 +1,23 @@ +Compat issues with assembly Microsoft.VisualBasic: + +# Loaded via reflection so needs to be public in the implementation but we don't want to expose them publicly in the ref assembly: +MembersMustExist : Member 'Microsoft.VisualBasic.CompilerServices.Conversions.FallbackUserDefinedConversion(System.Object, System.Type)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'Microsoft.VisualBasic.CompilerServices.NewLateBinding.FallbackCall(System.Object, System.String, System.Object[], System.String[], System.Boolean)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'Microsoft.VisualBasic.CompilerServices.NewLateBinding.FallbackGet(System.Object, System.String, System.Object[], System.String[])' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'Microsoft.VisualBasic.CompilerServices.NewLateBinding.FallbackIndexSet(System.Object, System.Object[], System.String[])' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'Microsoft.VisualBasic.CompilerServices.NewLateBinding.FallbackIndexSetComplex(System.Object, System.Object[], System.String[], System.Boolean, System.Boolean)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'Microsoft.VisualBasic.CompilerServices.NewLateBinding.FallbackInvokeDefault1(System.Object, System.Object[], System.String[], System.Boolean)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'Microsoft.VisualBasic.CompilerServices.NewLateBinding.FallbackInvokeDefault2(System.Object, System.Object[], System.String[], System.Boolean)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'Microsoft.VisualBasic.CompilerServices.NewLateBinding.FallbackSet(System.Object, System.String, System.Object[])' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'Microsoft.VisualBasic.CompilerServices.NewLateBinding.FallbackSetComplex(System.Object, System.String, System.Object[], System.Boolean, System.Boolean)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'Microsoft.VisualBasic.CompilerServices.NewLateBinding.LateCallInvokeDefault(System.Object, System.Object[], System.String[], System.Boolean)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'Microsoft.VisualBasic.CompilerServices.NewLateBinding.LateGetInvokeDefault(System.Object, System.Object[], System.String[], System.Boolean)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'Microsoft.VisualBasic.CompilerServices.Operators.FallbackInvokeUserDefinedOperator(System.Object, System.Object[])' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'Microsoft.VisualBasic.CompilerServices.SiteDelegate0' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'Microsoft.VisualBasic.CompilerServices.SiteDelegate1' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'Microsoft.VisualBasic.CompilerServices.SiteDelegate2' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'Microsoft.VisualBasic.CompilerServices.SiteDelegate3' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'Microsoft.VisualBasic.CompilerServices.SiteDelegate4' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'Microsoft.VisualBasic.CompilerServices.SiteDelegate5' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'Microsoft.VisualBasic.CompilerServices.SiteDelegate6' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'Microsoft.VisualBasic.CompilerServices.SiteDelegate7' does not exist in the implementation but it does exist in the contract. diff --git a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/Conversions.vb b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/Conversions.vb index 462ab72f67..8aba342f87 100644 --- a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/Conversions.vb +++ b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/Conversions.vb @@ -919,13 +919,13 @@ MisMatch: Public Shared Shadows Function ToString(value As Char) As String Return value.ToString() End Function - Public Shared Function GetCultureInfo() As Global.System.Globalization.CultureInfo + Friend Shared Function GetCultureInfo() As Global.System.Globalization.CultureInfo Return Global.System.Globalization.CultureInfo.CurrentCulture End Function - Public Shared Function ToHalfwidthNumbers(s As String, culture As Global.System.Globalization.CultureInfo) As String + Friend Shared Function ToHalfwidthNumbers(s As String, culture As Global.System.Globalization.CultureInfo) As String Return s End Function - Public Shared Function IsHexOrOctValue(value As String, ByRef i64Value As Global.System.Int64) As Boolean + Friend Shared Function IsHexOrOctValue(value As String, ByRef i64Value As Global.System.Int64) As Boolean Dim ch As Char Dim length As Integer Dim firstNonspace As Integer @@ -955,7 +955,7 @@ GetSpecialValue: Return True End Function - Public Shared Function IsHexOrOctValue(value As String, ByRef ui64Value As Global.System.UInt64) As Boolean + Friend Shared Function IsHexOrOctValue(value As String, ByRef ui64Value As Global.System.UInt64) As Boolean Dim ch As Char Dim length As Integer Dim firstNonspace As Integer diff --git a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/DesignerGeneratedAttribute.vb b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/DesignerGeneratedAttribute.vb index d49ffce83e..26b43aac1c 100644 --- a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/DesignerGeneratedAttribute.vb +++ b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/DesignerGeneratedAttribute.vb @@ -5,7 +5,7 @@ Namespace Global.Microsoft.VisualBasic.CompilerServices - Public Class DesignerGeneratedAttribute + Public NotInheritable Class DesignerGeneratedAttribute Inherits Global.System.Attribute End Class End Namespace diff --git a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/ExceptionUtils.vb b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/ExceptionUtils.vb index 9e1a658cc5..eb5f7e7f3c 100644 --- a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/ExceptionUtils.vb +++ b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/ExceptionUtils.vb @@ -58,7 +58,7 @@ Namespace Microsoft.VisualBasic.CompilerServices End Class - Public NotInheritable Class InternalErrorException + Friend NotInheritable Class InternalErrorException Inherits System.Exception Public Sub New(ByVal message As String) diff --git a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/IncompleteInitialization.vb b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/IncompleteInitialization.vb index 52f2af042c..cbb88b3a6b 100644 --- a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/IncompleteInitialization.vb +++ b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/IncompleteInitialization.vb @@ -5,7 +5,7 @@ Namespace Global.Microsoft.VisualBasic.CompilerServices - Public Class IncompleteInitialization + Public NotInheritable Class IncompleteInitialization Inherits Global.System.Exception Public Sub New() MyBase.New() diff --git a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/NewLateBinding.vb b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/NewLateBinding.vb index effcd30367..20ae0ccb1a 100644 --- a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/NewLateBinding.vb +++ b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/NewLateBinding.vb @@ -30,7 +30,7 @@ Namespace Microsoft.VisualBasic.CompilerServices End Sub - Public Shared Function LateCanEvaluate( + Friend Shared Function LateCanEvaluate( ByVal instance As Object, ByVal type As System.Type, ByVal memberName As String, diff --git a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/Operators.vb.REMOVED.git-id b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/Operators.vb.REMOVED.git-id index 93c65179c6..afa6d97722 100644 --- a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/Operators.vb.REMOVED.git-id +++ b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/Operators.vb.REMOVED.git-id @@ -1 +1 @@ -1d68abcb79d97571c7412ce41141c15e36b9a0c9 \ No newline at end of file +d26866c79282225275521eea958bbdb89ccef991 \ No newline at end of file diff --git a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/OptionCompareAttribute.vb b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/OptionCompareAttribute.vb index b3b601a0cb..ebe8a31dec 100644 --- a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/OptionCompareAttribute.vb +++ b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/OptionCompareAttribute.vb @@ -5,7 +5,7 @@ Namespace Global.Microsoft.VisualBasic.CompilerServices - Public Class OptionCompareAttribute + Public NotInheritable Class OptionCompareAttribute Inherits Global.System.Attribute End Class End Namespace diff --git a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/OptionTextAttribute.vb b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/OptionTextAttribute.vb index 2b275ddc9a..e564f11314 100644 --- a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/OptionTextAttribute.vb +++ b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/OptionTextAttribute.vb @@ -5,7 +5,7 @@ Namespace Global.Microsoft.VisualBasic.CompilerServices - Public Class OptionTextAttribute + Public NotInheritable Class OptionTextAttribute Inherits Global.System.Attribute End Class End Namespace diff --git a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/StandardModuleAttribute.vb b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/StandardModuleAttribute.vb index 0e2fc0e45a..f333352b4f 100644 --- a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/StandardModuleAttribute.vb +++ b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/StandardModuleAttribute.vb @@ -5,7 +5,7 @@ Namespace Global.Microsoft.VisualBasic.CompilerServices - Public Class StandardModuleAttribute + Public NotInheritable Class StandardModuleAttribute Inherits Global.System.Attribute End Class End Namespace diff --git a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/StaticLocalInitFlag.vb b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/StaticLocalInitFlag.vb index 4805db4aa2..e98b8cf3c2 100644 --- a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/StaticLocalInitFlag.vb +++ b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/StaticLocalInitFlag.vb @@ -5,7 +5,7 @@ Namespace Global.Microsoft.VisualBasic.CompilerServices - Public Class StaticLocalInitFlag + Public NotInheritable Class StaticLocalInitFlag Public State As Short End Class End Namespace diff --git a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/Utils.LateBinder.vb b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/Utils.LateBinder.vb index 00dc926510..adab60aebf 100644 --- a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/Utils.LateBinder.vb +++ b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/Utils.LateBinder.vb @@ -79,7 +79,7 @@ Namespace Microsoft.VisualBasic.CompilerServices ' Param: Args - An array of params used to replace placeholders. 'Returns: The resource string if found or an error message string '***************************************************************************** - Public Shared Function GetResourceString(ByVal resourceKey As String, ByVal ParamArray args() As String) As String + Friend Shared Function GetResourceString(ByVal resourceKey As String, ByVal ParamArray args() As String) As String Return SR.Format(resourceKey, args) End Function @@ -388,7 +388,7 @@ GetSpecialValue: Return resultString End Function - Public Shared Function MethodToString(ByVal method As Reflection.MethodBase) As String + Friend Shared Function MethodToString(ByVal method As Reflection.MethodBase) As String Dim returnType As System.Type = Nothing Dim first As Boolean diff --git a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/ControlChars.vb b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/ControlChars.vb index 205461bb4b..88bfd165f4 100644 --- a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/ControlChars.vb +++ b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/ControlChars.vb @@ -4,7 +4,7 @@ Namespace Microsoft.VisualBasic ' Contants for the Control Characters - Public NotInheritable Class ControlChars + Friend NotInheritable Class ControlChars Public Const CrLf As String = ChrW(13) & ChrW(10) Public Const NewLine As String = ChrW(13) & ChrW(10) diff --git a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/HideModuleNameAttribute.vb b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/HideModuleNameAttribute.vb index 3cc0fe8fb6..55d700ea05 100644 --- a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/HideModuleNameAttribute.vb +++ b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/HideModuleNameAttribute.vb @@ -5,7 +5,7 @@ Namespace Global.Microsoft.VisualBasic - Public Class HideModuleNameAttribute + Public NotInheritable Class HideModuleNameAttribute Inherits Global.System.Attribute End Class End Namespace diff --git a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/Interaction.vb b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/Interaction.vb index 2dca6e194a..e68edca47c 100644 --- a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/Interaction.vb +++ b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/Interaction.vb @@ -4,7 +4,7 @@ Namespace Microsoft.VisualBasic - Public Module Interaction + Friend Module Interaction Friend Function IIf(Of T)(ByVal condition As Boolean, ByVal truePart As T, ByVal falsePart As T) As T If condition Then diff --git a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/Strings.vb b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/Strings.vb index eb660c2507..cc94d835d7 100644 --- a/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/Strings.vb +++ b/external/corefx/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/Strings.vb @@ -28,7 +28,7 @@ Namespace Global.Microsoft.VisualBasic '============================================================================ ' Left/Right/Mid/Trim functions. '============================================================================ - Public Function Left(ByVal [str] As String, ByVal length As Integer) As String + Friend Function Left(ByVal [str] As String, ByVal length As Integer) As String '------------------------------------------------------------- ' lLen < 0 throws InvalidArgument exception ' lLen > Len([str]) let lLen = Len([str]) diff --git a/external/corefx/src/Microsoft.VisualBasic/tests/ConversionsTests.cs b/external/corefx/src/Microsoft.VisualBasic/tests/ConversionsTests.cs new file mode 100644 index 0000000000..0483459de2 --- /dev/null +++ b/external/corefx/src/Microsoft.VisualBasic/tests/ConversionsTests.cs @@ -0,0 +1,87 @@ +// 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; +using System.Collections.Generic; +using System.Globalization; +using Microsoft.VisualBasic.CompilerServices; +using Xunit; + +namespace Microsoft.VisualBasic.Tests +{ + public class ConversionsTests + { + public static IEnumerable ToBoolean_String_ReturnsExpected_TestData() + { + yield return new object[] { 5.5.ToString(CultureInfo.CurrentCulture), true }; + yield return new object[] { 0.0.ToString(CultureInfo.CurrentCulture), false }; + } + + [Theory] + [InlineData("true", true)] + [InlineData("false", false)] + [InlineData("5", true)] + [InlineData("0", false)] + [InlineData("&h5", true)] + [InlineData("&h0", false)] + [InlineData("&o5", true)] + [InlineData("&o0", false)] + [MemberData(nameof(ToBoolean_String_ReturnsExpected_TestData))] + public void ToBoolean_String_ReturnsExpected(string str, bool expected) + { + Assert.Equal(expected, Conversions.ToBoolean(str)); + } + + [Theory] + [InlineData(null)] + [InlineData("yes")] + [InlineData("contoso")] + public void ToBoolean_String_ThrowsOnInvalidFormat(string str) + { + Assert.Throws(() => Conversions.ToBoolean(str)); + } + + public static IEnumerable ToBoolean_Object_ReturnsExpected_TestData() + { + yield return new object[] { null, false }; + yield return new object[] { false, false }; + yield return new object[] { true, true }; + yield return new object[] { (sbyte)0, false }; + yield return new object[] { (sbyte)42, true }; + yield return new object[] { (byte)0, false }; + yield return new object[] { (byte)42, true }; + yield return new object[] { (System.Int16)0, false }; + yield return new object[] { (System.Int16)42, true }; + yield return new object[] { (System.UInt16)0, false }; + yield return new object[] { (System.UInt16)42, true }; + yield return new object[] { (System.Int32)0, false }; + yield return new object[] { (System.Int32)42, true }; + yield return new object[] { (System.UInt32)0, false }; + yield return new object[] { (System.UInt32)42, true }; + yield return new object[] { (System.Int64)0, false }; + yield return new object[] { (System.Int64)42, true }; + yield return new object[] { (System.UInt64)0, false }; + yield return new object[] { (System.UInt64)42, true }; + yield return new object[] { 0.0m, false }; + yield return new object[] { 0.42m, true }; + yield return new object[] { (float)0.0, false }; + yield return new object[] { (float)0.42, true }; + yield return new object[] { (double)0.0, false }; + yield return new object[] { (double)0.42, true }; + } + + [Theory] + [MemberData(nameof(ToBoolean_Object_ReturnsExpected_TestData))] + public void ToBoolean_Object_ReturnsExpected(object obj, bool expected) + { + Assert.Equal(expected, Conversions.ToBoolean(obj)); + } + + [Fact] + public void ToBoolean_Object_ThrowsOn_List() + { + Assert.Throws(() => Conversions.ToBoolean(new List())); + } + } +} diff --git a/external/corefx/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj b/external/corefx/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj index 3e0bee673b..00bba036ce 100644 --- a/external/corefx/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj +++ b/external/corefx/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj @@ -7,6 +7,7 @@ + @@ -18,4 +19,4 @@ - + \ No newline at end of file diff --git a/external/corefx/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj b/external/corefx/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj index a3eafffcc5..c58d29a0c0 100644 --- a/external/corefx/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj +++ b/external/corefx/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj @@ -36,6 +36,7 @@ + diff --git a/external/corefx/src/Microsoft.Win32.Registry/src/Configurations.props b/external/corefx/src/Microsoft.Win32.Registry/src/Configurations.props index 2e410e6ec3..dc73220035 100644 --- a/external/corefx/src/Microsoft.Win32.Registry/src/Configurations.props +++ b/external/corefx/src/Microsoft.Win32.Registry/src/Configurations.props @@ -2,9 +2,9 @@ + netstandard-Windows_NT; + netstandard-Unix; netstandard; - netcoreapp2.0-Windows_NT; - netcoreapp2.0-Unix; netfx-Windows_NT; diff --git a/external/corefx/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/external/corefx/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj index 97327470bc..a377e21de2 100644 --- a/external/corefx/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj +++ b/external/corefx/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj @@ -8,17 +8,13 @@ true $(DefineConstants);REGISTRY_ASSEMBLY true - SR.PlatformNotSupported_Registry + SR.PlatformNotSupported_Registry false - - - - @@ -27,7 +23,11 @@ - + + + + + Common\Interop\Windows\Interop.RegistryOptions.cs @@ -44,7 +44,7 @@ - + Common\Interop\Windows\Interop.Libraries.cs @@ -113,6 +113,7 @@ + diff --git a/external/corefx/src/Microsoft.Win32.Registry/tests/Registry/Registry_SetValue_str_str_obj.cs b/external/corefx/src/Microsoft.Win32.Registry/tests/Registry/Registry_SetValue_str_str_obj.cs index b40786b989..2238774c6b 100644 --- a/external/corefx/src/Microsoft.Win32.Registry/tests/Registry/Registry_SetValue_str_str_obj.cs +++ b/external/corefx/src/Microsoft.Win32.Registry/tests/Registry/Registry_SetValue_str_str_obj.cs @@ -116,6 +116,10 @@ namespace Microsoft.Win32.RegistryTests [MemberData(nameof(TestEnvironment))] public void SetValueWithEnvironmentVariable(string valueName, string envVariableName, string expectedVariableValue) { + // ExpandEnvironmentStrings is converting "C:\Program Files (Arm)" to "C:\Program Files (x86)". + if (envVariableName == "ProgramFiles" && PlatformDetection.IsArmProcess) + return; // [ActiveIssue(https://github.com/dotnet/corefx/issues/28856)] + string value = "%" + envVariableName + "%"; Registry.SetValue(TestRegistryKey.Name, valueName, value); diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln b/external/corefx/src/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln new file mode 100644 index 0000000000..8be4944c49 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln @@ -0,0 +1,50 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.SystemEvents.Tests", "tests\Microsoft.Win32.SystemEvents.Tests.csproj", "{8B21F7AD-928E-474C-875A-83D753BB8A28}" + ProjectSection(ProjectDependencies) = postProject + {91DD22C6-521E-49F9-84E8-1D65BAB97776} = {91DD22C6-521E-49F9-84E8-1D65BAB97776} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.SystemEvents", "src\Microsoft.Win32.SystemEvents.csproj", "{91DD22C6-521E-49F9-84E8-1D65BAB97776}" + ProjectSection(ProjectDependencies) = postProject + {90BAFB3A-C396-4323-AC4F-5F968230AD22} = {90BAFB3A-C396-4323-AC4F-5F968230AD22} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.SystemEvents", "ref\Microsoft.Win32.SystemEvents.csproj", "{90BAFB3A-C396-4323-AC4F-5F968230AD22}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8B21F7AD-928E-474C-875A-83D753BB8A28}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU + {8B21F7AD-928E-474C-875A-83D753BB8A28}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU + {8B21F7AD-928E-474C-875A-83D753BB8A28}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU + {8B21F7AD-928E-474C-875A-83D753BB8A28}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU + {91DD22C6-521E-49F9-84E8-1D65BAB97776}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU + {91DD22C6-521E-49F9-84E8-1D65BAB97776}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU + {91DD22C6-521E-49F9-84E8-1D65BAB97776}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU + {91DD22C6-521E-49F9-84E8-1D65BAB97776}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU + {90BAFB3A-C396-4323-AC4F-5F968230AD22}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {90BAFB3A-C396-4323-AC4F-5F968230AD22}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {90BAFB3A-C396-4323-AC4F-5F968230AD22}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {90BAFB3A-C396-4323-AC4F-5F968230AD22}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {8B21F7AD-928E-474C-875A-83D753BB8A28} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} + {91DD22C6-521E-49F9-84E8-1D65BAB97776} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD} + {90BAFB3A-C396-4323-AC4F-5F968230AD22} = {2E666815-2EDB-464B-9DF6-380BF4789AD4} + EndGlobalSection +EndGlobal diff --git a/external/corefx/src/System.Runtime.Intrinsics/dir.props b/external/corefx/src/Microsoft.Win32.SystemEvents/dir.props similarity index 89% rename from external/corefx/src/System.Runtime.Intrinsics/dir.props rename to external/corefx/src/Microsoft.Win32.SystemEvents/dir.props index 37b9ee82d7..4356decc45 100644 --- a/external/corefx/src/System.Runtime.Intrinsics/dir.props +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/dir.props @@ -3,7 +3,6 @@ 4.0.0.0 - true Open \ No newline at end of file diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/pkg/Microsoft.Win32.SystemEvents.pkgproj b/external/corefx/src/Microsoft.Win32.SystemEvents/pkg/Microsoft.Win32.SystemEvents.pkgproj new file mode 100644 index 0000000000..22c2e1d90d --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/pkg/Microsoft.Win32.SystemEvents.pkgproj @@ -0,0 +1,11 @@ + + + + + + uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks) + + + + + \ No newline at end of file diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/ref/Configurations.props b/external/corefx/src/Microsoft.Win32.SystemEvents/ref/Configurations.props new file mode 100644 index 0000000000..d9777d8275 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/ref/Configurations.props @@ -0,0 +1,9 @@ + + + + + netstandard; + netfx; + + + \ No newline at end of file diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.cs new file mode 100644 index 0000000000..11015adb6d --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.cs @@ -0,0 +1,117 @@ +// 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. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the http://aka.ms/api-review process. +// ------------------------------------------------------------------------------ + +namespace Microsoft.Win32 +{ + public partial class PowerModeChangedEventArgs : System.EventArgs + { + public PowerModeChangedEventArgs(Microsoft.Win32.PowerModes mode) { } + public Microsoft.Win32.PowerModes Mode { get { throw null; } } + } + public delegate void PowerModeChangedEventHandler(object sender, Microsoft.Win32.PowerModeChangedEventArgs e); + public enum PowerModes + { + Resume = 1, + StatusChange = 2, + Suspend = 3, + } + public partial class SessionEndedEventArgs : System.EventArgs + { + public SessionEndedEventArgs(Microsoft.Win32.SessionEndReasons reason) { } + public Microsoft.Win32.SessionEndReasons Reason { get { throw null; } } + } + public delegate void SessionEndedEventHandler(object sender, Microsoft.Win32.SessionEndedEventArgs e); + public partial class SessionEndingEventArgs : System.EventArgs + { + public SessionEndingEventArgs(Microsoft.Win32.SessionEndReasons reason) { } + public bool Cancel { get { throw null; } set { } } + public Microsoft.Win32.SessionEndReasons Reason { get { throw null; } } + } + public delegate void SessionEndingEventHandler(object sender, Microsoft.Win32.SessionEndingEventArgs e); + public enum SessionEndReasons + { + Logoff = 1, + SystemShutdown = 2, + } + public partial class SessionSwitchEventArgs : System.EventArgs + { + public SessionSwitchEventArgs(Microsoft.Win32.SessionSwitchReason reason) { } + public Microsoft.Win32.SessionSwitchReason Reason { get { throw null; } } + } + public delegate void SessionSwitchEventHandler(object sender, Microsoft.Win32.SessionSwitchEventArgs e); + public enum SessionSwitchReason + { + ConsoleConnect = 1, + ConsoleDisconnect = 2, + RemoteConnect = 3, + RemoteDisconnect = 4, + SessionLock = 7, + SessionLogoff = 6, + SessionLogon = 5, + SessionRemoteControl = 9, + SessionUnlock = 8, + } + public sealed partial class SystemEvents + { + internal SystemEvents() { } + public static event System.EventHandler DisplaySettingsChanged { add { } remove { } } + public static event System.EventHandler DisplaySettingsChanging { add { } remove { } } + public static event System.EventHandler EventsThreadShutdown { add { } remove { } } + public static event System.EventHandler InstalledFontsChanged { add { } remove { } } + [System.ComponentModel.BrowsableAttribute(false)] + [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] + [System.ObsoleteAttribute("This event has been deprecated. http://go.microsoft.com/fwlink/?linkid=14202")] + public static event System.EventHandler LowMemory { add { } remove { } } + public static event System.EventHandler PaletteChanged { add { } remove { } } + public static event Microsoft.Win32.PowerModeChangedEventHandler PowerModeChanged { add { } remove { } } + public static event Microsoft.Win32.SessionEndedEventHandler SessionEnded { add { } remove { } } + public static event Microsoft.Win32.SessionEndingEventHandler SessionEnding { add { } remove { } } + public static event Microsoft.Win32.SessionSwitchEventHandler SessionSwitch { add { } remove { } } + public static event System.EventHandler TimeChanged { add { } remove { } } + public static event Microsoft.Win32.TimerElapsedEventHandler TimerElapsed { add { } remove { } } + public static event Microsoft.Win32.UserPreferenceChangedEventHandler UserPreferenceChanged { add { } remove { } } + public static event Microsoft.Win32.UserPreferenceChangingEventHandler UserPreferenceChanging { add { } remove { } } + public static System.IntPtr CreateTimer(int interval) { throw null; } + public static void InvokeOnEventsThread(System.Delegate method) { } + public static void KillTimer(System.IntPtr timerId) { } + } + public partial class TimerElapsedEventArgs : System.EventArgs + { + public TimerElapsedEventArgs(System.IntPtr timerId) { } + public System.IntPtr TimerId { get { throw null; } } + } + public delegate void TimerElapsedEventHandler(object sender, Microsoft.Win32.TimerElapsedEventArgs e); + public enum UserPreferenceCategory + { + Accessibility = 1, + Color = 2, + Desktop = 3, + General = 4, + Icon = 5, + Keyboard = 6, + Locale = 13, + Menu = 7, + Mouse = 8, + Policy = 9, + Power = 10, + Screensaver = 11, + VisualStyle = 14, + Window = 12, + } + public partial class UserPreferenceChangedEventArgs : System.EventArgs + { + public UserPreferenceChangedEventArgs(Microsoft.Win32.UserPreferenceCategory category) { } + public Microsoft.Win32.UserPreferenceCategory Category { get { throw null; } } + } + public delegate void UserPreferenceChangedEventHandler(object sender, Microsoft.Win32.UserPreferenceChangedEventArgs e); + public partial class UserPreferenceChangingEventArgs : System.EventArgs + { + public UserPreferenceChangingEventArgs(Microsoft.Win32.UserPreferenceCategory category) { } + public Microsoft.Win32.UserPreferenceCategory Category { get { throw null; } } + } + public delegate void UserPreferenceChangingEventHandler(object sender, Microsoft.Win32.UserPreferenceChangingEventArgs e); +} diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj b/external/corefx/src/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj new file mode 100644 index 0000000000..e9c9002353 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj @@ -0,0 +1,20 @@ + + + + + {90BAFB3A-C396-4323-AC4F-5F968230AD22} + true + + + + + + + + + + + + + + \ No newline at end of file diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/Configurations.props b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Configurations.props new file mode 100644 index 0000000000..c31d0d7816 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Configurations.props @@ -0,0 +1,14 @@ + + + + + netstandard; + netcoreapp2.0-Windows_NT; + netfx; + + + $(PackageConfigurations); + netcoreapp-Windows_NT; + + + \ No newline at end of file diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj new file mode 100644 index 0000000000..1a7aabe1ba --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj @@ -0,0 +1,178 @@ + + + + + {91DD22C6-521E-49F9-84E8-1D65BAB97776} + true + true + SR.PlatformNotSupported_SystemEvents + + + + + + + + + + + + Common\Interop\Windows\Interop.Libraries.cs + + + Common\Interop\Windows\Interop.Errors.cs + + + Common\Interop\Windows\user32\Interop.Constants.cs + + + Common\Interop\Windows\user32\Interop.CreateWindowEx.cs + + + Common\Interop\Windows\user32\Interop.DefWindowProc.cs + + + Common\Interop\Windows\user32\Interop.DestroyWindow.cs + + + Common\Interop\Windows\user32\Interop.DispatchMessage.cs + + + Common\Interop\Windows\user32\Interop.GetClassInfo.cs + + + Common\Interop\Windows\user32\Interop.GetProcessWindowStation.cs + + + Common\Interop\Windows\user32\Interop.GetUserObjectInformation.cs + + + Common\Interop\Windows\user32\Interop.GetWindowThreadProcessId.cs + + + Common\Interop\Windows\user32\Interop.IsWindow.cs + + + Common\Interop\Windows\user32\Interop.KillTimer.cs + + + Common\Interop\Windows\user32\Interop.MSG.cs + + + Common\Interop\Windows\user32\Interop.MsgWaitForMultipleObjectsEx.cs + + + Common\Interop\Windows\user32\Interop.PeekMessage.cs + + + Common\Interop\Windows\user32\Interop.PostMessage.cs + + + Common\Interop\Windows\user32\Interop.RegisterClass.cs + + + Common\Interop\Windows\user32\Interop.RegisterWindowMessage.cs + + + Common\Interop\Windows\user32\Interop.SendMessage.cs + + + Common\Interop\Windows\user32\Interop.SetClassLong.cs + + + Common\Interop\Windows\user32\Interop.SetClassLongPtr.cs + + + Common\Interop\Windows\user32\Interop.SetTimer.cs + + + Common\Interop\Windows\user32\Interop.SetWindowLong.cs + + + Common\Interop\Windows\user32\Interop.SetWindowLongPtr.cs + + + Common\Interop\Windows\user32\Interop.TranslateMessage.cs + + + Common\Interop\Windows\user32\Interop.UnregisterClass.cs + + + Common\Interop\Windows\user32\Interop.USEROBJECTFLAGS.cs + + + Common\Interop\Windows\user32\Interop.WNDCLASS.cs + + + Common\Interop\Windows\user32\Interop.WndProc.cs + + + Common\Interop\Windows\kernel32\Interop.GetCurrentThreadId.cs + + + Common\Interop\Windows\kernel32\Interop.GetModuleHandle.cs + + + Common\Interop\Windows\kernel32\Interop.GetProcAddress.cs + + + Common\Interop\Windows\kernel32\Interop.LoadLibrary.cs + + + Common\Interop\Windows\kernel32\Interop.FreeLibrary.cs + + + Common\Interop\Windows\kernel32\Interop.SetConsoleCtrlHandler.cs + + + Common\Interop\Windows\wtsapi32\Interop.Constants.cs + + + Common\Interop\Windows\wtsapi32\Interop.WTSRegisterSessionNotification.cs + + + Common\Interop\Windows\wtsapi32\Interop.WTSUnRegisterSessionNotification.cs + + + Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/PowerModeChangedEventArgs.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/PowerModeChangedEventArgs.cs new file mode 100644 index 0000000000..6a8703f5e3 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/PowerModeChangedEventArgs.cs @@ -0,0 +1,36 @@ +// 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; + +namespace Microsoft.Win32 +{ + /// + /// Provides data for the event. + /// + public class PowerModeChangedEventArgs : EventArgs + { + private readonly PowerModes _mode; + + /// + /// Initializes a new instance of the class. + /// + public PowerModeChangedEventArgs(PowerModes mode) + { + _mode = mode; + } + + /// + /// Gets the power mode. + /// + public PowerModes Mode + { + get + { + return _mode; + } + } + } +} + diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/PowerModeChangedEventHandler.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/PowerModeChangedEventHandler.cs new file mode 100644 index 0000000000..18407c4902 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/PowerModeChangedEventHandler.cs @@ -0,0 +1,12 @@ +// 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 Microsoft.Win32 +{ + /// + /// Represents the method that will handle the event. + /// + public delegate void PowerModeChangedEventHandler(object sender, PowerModeChangedEventArgs e); +} + diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/PowerModes.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/PowerModes.cs new file mode 100644 index 0000000000..2a1b8b853a --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/PowerModes.cs @@ -0,0 +1,32 @@ +// 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 Microsoft.Win32 +{ + /// + /// Specifies how the system + /// power mode changes. + /// + public enum PowerModes + { + /// + /// The system is about to resume. + /// + Resume = 1, + + /// + /// The power mode status has changed. This may + /// indicate a weak or charging battery, a transition + /// from AC power from battery, or other change in the + /// status of the system power supply. + /// + StatusChange = 2, + + /// + /// The system is about to be suspended. + /// + Suspend = 3, + } +} + diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionEndReasons.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionEndReasons.cs new file mode 100644 index 0000000000..62b1039c26 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionEndReasons.cs @@ -0,0 +1,26 @@ +// 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 Microsoft.Win32 +{ + /// + /// Specifies how the current + /// logon session is ending. + /// + public enum SessionEndReasons + { + /// + /// The user is logging off. The system may continue + /// running but the user who started this application + /// is logging off. + /// + Logoff = 1, + + /// + /// The system is shutting down. + /// + SystemShutdown = 2, + } +} + diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionEndedEventArgs.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionEndedEventArgs.cs new file mode 100644 index 0000000000..5b674420e3 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionEndedEventArgs.cs @@ -0,0 +1,36 @@ +// 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; + +namespace Microsoft.Win32 +{ + /// + /// Provides data for the event. + /// + public class SessionEndedEventArgs : EventArgs + { + private readonly SessionEndReasons _reason; + + /// + /// Initializes a new instance of the class. + /// + public SessionEndedEventArgs(SessionEndReasons reason) + { + _reason = reason; + } + + /// + /// Gets how the session ended. + /// + public SessionEndReasons Reason + { + get + { + return _reason; + } + } + } +} + diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionEndedEventHandler.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionEndedEventHandler.cs new file mode 100644 index 0000000000..715e8d59b3 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionEndedEventHandler.cs @@ -0,0 +1,12 @@ +// 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 Microsoft.Win32 +{ + /// + /// Represents the method that will handle the event. + /// + public delegate void SessionEndedEventHandler(object sender, SessionEndedEventArgs e); +} + diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionEndingEventArgs.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionEndingEventArgs.cs new file mode 100644 index 0000000000..27d42bc3ab --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionEndingEventArgs.cs @@ -0,0 +1,52 @@ +// 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; + +namespace Microsoft.Win32 +{ + /// + /// Provides data for the event. + /// + public class SessionEndingEventArgs : EventArgs + { + private bool _cancel; + private readonly SessionEndReasons _reason; + + /// + /// Initializes a new instance of the class. + /// + public SessionEndingEventArgs(SessionEndReasons reason) + { + _reason = reason; + } + + /// + /// Gets or sets a value indicating whether to cancel the user request to end the session. + /// + public bool Cancel + { + get + { + return _cancel; + } + set + { + _cancel = value; + } + } + + /// + /// Gets how the session is ending. + /// + public SessionEndReasons Reason + { + get + { + return _reason; + } + } + } +} + diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionEndingEventHandler.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionEndingEventHandler.cs new file mode 100644 index 0000000000..44f8645aee --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionEndingEventHandler.cs @@ -0,0 +1,12 @@ +// 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 Microsoft.Win32 +{ + /// + /// Represents the method that will handle the event. + /// + public delegate void SessionEndingEventHandler(object sender, SessionEndingEventArgs e); +} + diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionSwitchEventArgs.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionSwitchEventArgs.cs new file mode 100644 index 0000000000..4d26786b91 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionSwitchEventArgs.cs @@ -0,0 +1,36 @@ +// 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; + +namespace Microsoft.Win32 +{ + /// + /// Provides data for the event. + /// + public class SessionSwitchEventArgs : EventArgs + { + private readonly SessionSwitchReason _reason; + + /// + /// Initializes a new instance of the class. + /// + public SessionSwitchEventArgs(SessionSwitchReason reason) + { + _reason = reason; + } + + /// + /// Gets the reason for the session switch. + /// + public SessionSwitchReason Reason + { + get + { + return _reason; + } + } + } +} + diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionSwitchEventHandler.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionSwitchEventHandler.cs new file mode 100644 index 0000000000..e0362c5d95 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionSwitchEventHandler.cs @@ -0,0 +1,12 @@ +// 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 Microsoft.Win32 +{ + /// + /// Represents the method that will handle the event. + /// + public delegate void SessionSwitchEventHandler(object sender, SessionSwitchEventArgs e); +} + diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionSwitchReason.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionSwitchReason.cs new file mode 100644 index 0000000000..1e36503cf3 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SessionSwitchReason.cs @@ -0,0 +1,61 @@ +// 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; + +namespace Microsoft.Win32 +{ + /// + /// Specifies the reason for the session switch + /// + public enum SessionSwitchReason + { + /// + /// A session was connected to the console session. + /// + ConsoleConnect = Interop.Wtsapi32.WTS_CONSOLE_CONNECT, + + /// + /// A session was disconnected from the console session. + /// + ConsoleDisconnect = Interop.Wtsapi32.WTS_CONSOLE_DISCONNECT, + + /// + /// A session was connected to the remote session. + /// + RemoteConnect = Interop.Wtsapi32.WTS_REMOTE_CONNECT, + + /// + /// A session was disconnected from the remote session. + /// + RemoteDisconnect = Interop.Wtsapi32.WTS_REMOTE_DISCONNECT, + + /// + /// A user has logged on to the session. + /// + SessionLogon = Interop.Wtsapi32.WTS_SESSION_LOGON, + + /// + /// A user has logged off the session. + /// + SessionLogoff = Interop.Wtsapi32.WTS_SESSION_LOGOFF, + + /// + /// A session has been locked. + /// + SessionLock = Interop.Wtsapi32.WTS_SESSION_LOCK, + + /// + /// A session has been unlocked. + /// + SessionUnlock = Interop.Wtsapi32.WTS_SESSION_UNLOCK, + + /// + /// A session has changed its remote controlled status. + /// + SessionRemoteControl = Interop.Wtsapi32.WTS_SESSION_REMOTE_CONTROL + } +} + diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SystemEvents.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SystemEvents.cs new file mode 100644 index 0000000000..321785e686 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/SystemEvents.cs @@ -0,0 +1,1485 @@ +// 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 Microsoft.Win32 +{ + using System; + using System.Diagnostics; + using System.Security; + using System.Security.Permissions; + using System.Collections; + using System.Collections.Generic; + using System.ComponentModel; + using System.Diagnostics.CodeAnalysis; + using System.Reflection; + using System.Runtime.ConstrainedExecution; + using System.Runtime.InteropServices; + using System.Runtime.Versioning; + using System.Text; + using System.Threading; + + /// + /// + /// Provides a + /// set of global system events to callers. This + /// class cannot be inherited. + /// + [SuppressMessage("Microsoft.Design", "CA1049:TypesThatOwnNativeResourcesShouldBeDisposable")] + public sealed class SystemEvents + { + // Almost all of our data is static. We keep a single instance of + // SystemEvents around so we can bind delegates to it. + // Non-static methods in this class will only be called through + // one of the delegates. + private static readonly object s_eventLockObject = new object(); + private static readonly object s_procLockObject = new object(); + private static volatile SystemEvents s_systemEvents; + private static volatile Thread s_windowThread; + private static volatile ManualResetEvent s_eventWindowReady; + private static Random s_randomTimerId = new Random(); + private static volatile bool s_registeredSessionNotification = false; + private static volatile int s_domainQualifier; + private static volatile Interop.User32.WNDCLASS s_staticwndclass; + [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")] + private static volatile IntPtr s_defWindowProc; + + private static volatile string s_className = null; + + // cross-thread marshaling + private static volatile Queue s_threadCallbackList; // list of Delegates + private static volatile int s_threadCallbackMessage = 0; + private static volatile ManualResetEvent s_eventThreadTerminated; + + // Per-instance data that is isolated to the window thread. + private volatile IntPtr _windowHandle; + private Interop.User32.WndProc _windowProc; + private Interop.Kernel32.ConsoleCtrlHandlerRoutine _consoleHandler; + + // The set of events we respond to. + private static readonly object s_onUserPreferenceChangingEvent = new object(); + private static readonly object s_onUserPreferenceChangedEvent = new object(); + private static readonly object s_onSessionEndingEvent = new object(); + private static readonly object s_onSessionEndedEvent = new object(); + private static readonly object s_onPowerModeChangedEvent = new object(); + private static readonly object s_onLowMemoryEvent = new object(); + private static readonly object s_onDisplaySettingsChangingEvent = new object(); + private static readonly object s_onDisplaySettingsChangedEvent = new object(); + private static readonly object s_onInstalledFontsChangedEvent = new object(); + private static readonly object s_onTimeChangedEvent = new object(); + private static readonly object s_onTimerElapsedEvent = new object(); + private static readonly object s_onPaletteChangedEvent = new object(); + private static readonly object s_onEventsThreadShutdownEvent = new object(); + private static readonly object s_onSessionSwitchEvent = new object(); + + + // Our list of handler information. This is a lookup of the above keys and objects that + // match a delegate with a SyncronizationContext so we can fire on the proper thread. + private static Dictionary> s_handlers; + + + /// + /// This class is static, there is no need to ever create it. + /// + private SystemEvents() + { + } + + + // stole from SystemInformation... if we get SystemInformation moved + // to somewhere that we can use it... rip this! + [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")] + private static volatile IntPtr s_processWinStation = IntPtr.Zero; + private static volatile bool s_isUserInteractive = false; + private static bool UserInteractive + { + get + { + if (Environment.OSVersion.Platform == System.PlatformID.Win32NT) + { + IntPtr hwinsta = IntPtr.Zero; + + hwinsta = Interop.User32.GetProcessWindowStation(); + if (hwinsta != IntPtr.Zero && s_processWinStation != hwinsta) + { + s_isUserInteractive = true; + + int lengthNeeded = 0; + Interop.User32.USEROBJECTFLAGS flags = new Interop.User32.USEROBJECTFLAGS(); + + if (Interop.User32.GetUserObjectInformationW(hwinsta, Interop.User32.UOI_FLAGS, flags, Marshal.SizeOf(flags), ref lengthNeeded)) + { + if ((flags.dwFlags & Interop.User32.WSF_VISIBLE) == 0) + { + s_isUserInteractive = false; + } + } + s_processWinStation = hwinsta; + } + } + else + { + s_isUserInteractive = true; + } + return s_isUserInteractive; + } + } + + + /// + /// Occurs when the display settings are changing. + /// + public static event EventHandler DisplaySettingsChanging + { + add + { + AddEventHandler(s_onDisplaySettingsChangingEvent, value); + } + remove + { + RemoveEventHandler(s_onDisplaySettingsChangingEvent, value); + } + } + + + /// + /// Occurs when the user changes the display settings. + /// + public static event EventHandler DisplaySettingsChanged + { + add + { + AddEventHandler(s_onDisplaySettingsChangedEvent, value); + } + remove + { + RemoveEventHandler(s_onDisplaySettingsChangedEvent, value); + } + } + + + /// + /// Occurs before the thread that listens for system events is terminated. + /// Delegates will be invoked on the events thread. + /// + public static event EventHandler EventsThreadShutdown + { + // Really only here for GDI+ initialization and shut down + add + { + AddEventHandler(s_onEventsThreadShutdownEvent, value); + } + remove + { + RemoveEventHandler(s_onEventsThreadShutdownEvent, value); + } + } + + + /// + /// Occurs when the user adds fonts to or removes fonts from the system. + /// + public static event EventHandler InstalledFontsChanged + { + add + { + AddEventHandler(s_onInstalledFontsChangedEvent, value); + } + remove + { + RemoveEventHandler(s_onInstalledFontsChangedEvent, value); + } + } + + + /// + /// Occurs when the system is running out of available RAM. + /// + [Obsolete("This event has been deprecated. http://go.microsoft.com/fwlink/?linkid=14202")] + [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] + public static event EventHandler LowMemory + { + add + { + EnsureSystemEvents(true, true); + AddEventHandler(s_onLowMemoryEvent, value); + } + remove + { + RemoveEventHandler(s_onLowMemoryEvent, value); + } + } + + + /// + /// Occurs when the user switches to an application that uses a different + /// palette. + /// + public static event EventHandler PaletteChanged + { + add + { + AddEventHandler(s_onPaletteChangedEvent, value); + } + remove + { + RemoveEventHandler(s_onPaletteChangedEvent, value); + } + } + + + /// + /// Occurs when the user suspends or resumes the system. + /// + public static event PowerModeChangedEventHandler PowerModeChanged + { + add + { + EnsureSystemEvents(true, true); + AddEventHandler(s_onPowerModeChangedEvent, value); + } + remove + { + RemoveEventHandler(s_onPowerModeChangedEvent, value); + } + } + + + /// + /// Occurs when the user is logging off or shutting down the system. + /// + public static event SessionEndedEventHandler SessionEnded + { + add + { + EnsureSystemEvents(true, false); + AddEventHandler(s_onSessionEndedEvent, value); + } + remove + { + RemoveEventHandler(s_onSessionEndedEvent, value); + } + } + + + /// + /// Occurs when the user is trying to log off or shutdown the system. + /// + public static event SessionEndingEventHandler SessionEnding + { + add + { + EnsureSystemEvents(true, false); + AddEventHandler(s_onSessionEndingEvent, value); + } + remove + { + RemoveEventHandler(s_onSessionEndingEvent, value); + } + } + + /// + /// Occurs when a user session switches. + /// + public static event SessionSwitchEventHandler SessionSwitch + { + add + { + EnsureSystemEvents(true, true); + EnsureRegisteredSessionNotification(); + AddEventHandler(s_onSessionSwitchEvent, value); + } + remove + { + RemoveEventHandler(s_onSessionSwitchEvent, value); + } + } + + + /// + /// Occurs when the user changes the time on the system clock. + /// + public static event EventHandler TimeChanged + { + add + { + EnsureSystemEvents(true, false); + AddEventHandler(s_onTimeChangedEvent, value); + } + remove + { + RemoveEventHandler(s_onTimeChangedEvent, value); + } + } + + + /// + /// Occurs when a windows timer interval has expired. + /// + public static event TimerElapsedEventHandler TimerElapsed + { + add + { + EnsureSystemEvents(true, false); + AddEventHandler(s_onTimerElapsedEvent, value); + } + remove + { + RemoveEventHandler(s_onTimerElapsedEvent, value); + } + } + + + /// + /// Occurs when a user preference has changed. + /// + public static event UserPreferenceChangedEventHandler UserPreferenceChanged + { + add + { + AddEventHandler(s_onUserPreferenceChangedEvent, value); + } + remove + { + RemoveEventHandler(s_onUserPreferenceChangedEvent, value); + } + } + + /// + /// Occurs when a user preference is changing. + /// + public static event UserPreferenceChangingEventHandler UserPreferenceChanging + { + add + { + AddEventHandler(s_onUserPreferenceChangingEvent, value); + } + remove + { + RemoveEventHandler(s_onUserPreferenceChangingEvent, value); + } + } + + private static void AddEventHandler(object key, Delegate value) + { + lock (s_eventLockObject) + { + if (s_handlers == null) + { + s_handlers = new Dictionary>(); + EnsureSystemEvents(false, false); + } + + List invokeItems; + + if (!s_handlers.TryGetValue(key, out invokeItems)) + { + invokeItems = new List(); + s_handlers[key] = invokeItems; + } + else + { + invokeItems = s_handlers[key]; + } + + invokeItems.Add(new SystemEventInvokeInfo(value)); + } + } + + /// + /// Console handler we add in case we are a console application or a service. + /// Without this we will not get end session events. + /// + private bool ConsoleHandlerProc(int signalType) + { + switch (signalType) + { + case Interop.User32.CTRL_LOGOFF_EVENT: + OnSessionEnded((IntPtr)1, (IntPtr)Interop.User32.ENDSESSION_LOGOFF); + break; + + case Interop.User32.CTRL_SHUTDOWN_EVENT: + OnSessionEnded((IntPtr)1, (IntPtr)0); + break; + } + + return false; + } + + private Interop.User32.WNDCLASS WndClass + { + get + { + if (s_staticwndclass == null) + { + const string classNameFormat = ".NET-BroadcastEventWindow.{0}.{1}"; + + IntPtr hInstance = Interop.Kernel32.GetModuleHandle(null); + + s_className = string.Format(System.Globalization.CultureInfo.InvariantCulture, + classNameFormat, + Convert.ToString(AppDomain.CurrentDomain.GetHashCode(), 16), + s_domainQualifier); + + Interop.User32.WNDCLASS tempwndclass = new Interop.User32.WNDCLASS(); + tempwndclass.hbrBackground = (IntPtr)(Interop.User32.COLOR_WINDOW + 1); + tempwndclass.style = 0; + + _windowProc = new Interop.User32.WndProc(this.WindowProc); + tempwndclass.lpszClassName = s_className; + tempwndclass.lpfnWndProc = _windowProc; + tempwndclass.hInstance = hInstance; + s_staticwndclass = tempwndclass; + } + return s_staticwndclass; + } + } + + private IntPtr DefWndProc + { + get + { + if (s_defWindowProc == IntPtr.Zero) + { + s_defWindowProc = Interop.Kernel32.GetProcAddress(Interop.Kernel32.GetModuleHandle("user32.dll"), "DefWindowProcW"); + } + return s_defWindowProc; + } + } + + [SuppressMessage("Microsoft.Concurrency", "CA8001", Justification = "Only called on a single thread")] + private void BumpQualifier() + { + s_staticwndclass = null; + s_domainQualifier++; + } + + /// + /// + /// Goes through the work to register and create a window. + /// + private IntPtr CreateBroadcastWindow() + { + // Register the window class. + Interop.User32.WNDCLASS_I wndclassi = new Interop.User32.WNDCLASS_I(); + IntPtr hInstance = Interop.Kernel32.GetModuleHandle(null); + + if (!Interop.User32.GetClassInfoW(hInstance, WndClass.lpszClassName, wndclassi)) + { + if (Interop.User32.RegisterClassW(WndClass) == 0) + { + _windowProc = null; + Debug.WriteLine("Unable to register broadcast window class: {0}", Marshal.GetLastWin32Error()); + return IntPtr.Zero; + } + } + else + { + // lets double check the wndproc returned by getclassinfo for sentinel value defwndproc. + if (wndclassi.lpfnWndProc == DefWndProc) + { + // if we are in there, it means className belongs to an unloaded appdomain. + short atom = 0; + + // try to unregister it. + if (0 != Interop.User32.UnregisterClassW(WndClass.lpszClassName, Interop.Kernel32.GetModuleHandle(null))) + { + atom = Interop.User32.RegisterClassW(WndClass); + } + + if (atom == 0) + { + do + { + BumpQualifier(); + atom = Interop.User32.RegisterClassW(WndClass); + } while (atom == 0 && Marshal.GetLastWin32Error() == Interop.Errors.ERROR_CLASS_ALREADY_EXISTS); + } + } + } + + // And create an instance of the window. + IntPtr hwnd = Interop.User32.CreateWindowExW( + 0, + WndClass.lpszClassName, + WndClass.lpszClassName, + Interop.User32.WS_POPUP, + 0, 0, 0, 0, IntPtr.Zero, IntPtr.Zero, + hInstance, IntPtr.Zero); + return hwnd; + } + + /// + /// + /// Creates a new window timer asociated with the + /// system events window. + /// + public static IntPtr CreateTimer(int interval) + { + if (interval <= 0) + { + throw new ArgumentException(SR.Format(SR.InvalidLowBoundArgument, "interval", interval.ToString(System.Threading.Thread.CurrentThread.CurrentCulture), "0")); + } + + EnsureSystemEvents(true, true); + IntPtr timerId = Interop.User32.SendMessageW(new HandleRef(s_systemEvents, s_systemEvents._windowHandle), + Interop.User32.WM_CREATETIMER, (IntPtr)interval, IntPtr.Zero); + + if (timerId == IntPtr.Zero) + { + throw new ExternalException(SR.ErrorCreateTimer); + } + return timerId; + } + + private void Dispose() + { + if (_windowHandle != IntPtr.Zero) + { + if (s_registeredSessionNotification) + { + Interop.Wtsapi32.WTSUnRegisterSessionNotification(new HandleRef(s_systemEvents, s_systemEvents._windowHandle)); + } + + IntPtr handle = _windowHandle; + _windowHandle = IntPtr.Zero; + + // we check IsWindow because Application may have rudely destroyed our broadcast window. + // if this were true, we want to unregister the class. + if (Interop.User32.IsWindow(handle) && DefWndProc != IntPtr.Zero) + { + // set our sentinel value that we will look for upon initialization to indicate + // the window class belongs to an unloaded appdomain and therefore should not be used. + if (IntPtr.Size == 4) + { + // In a 32-bit process we must call the non-'ptr' version of these APIs + Interop.User32.SetWindowLongW(handle, Interop.User32.GWL_WNDPROC, DefWndProc); + Interop.User32.SetClassLongW(handle, Interop.User32.GCL_WNDPROC, DefWndProc); + } + else + { + Interop.User32.SetWindowLongPtrW(handle, Interop.User32.GWL_WNDPROC, DefWndProc); + Interop.User32.SetClassLongPtrW(handle, Interop.User32.GCL_WNDPROC, DefWndProc); + } + } + + // If DestroyWindow failed, it is because we're being + // shutdown from another thread. In this case, locate the + // DefWindowProc call in User32, set the window proc to call it, + // and post a WM_CLOSE. This will close the window from + // the correct thread without relying on managed code executing. + if (Interop.User32.IsWindow(handle) && !Interop.User32.DestroyWindow(handle)) + { + Interop.User32.PostMessageW(handle, Interop.User32.WM_CLOSE, IntPtr.Zero, IntPtr.Zero); + } + else + { + IntPtr hInstance = Interop.Kernel32.GetModuleHandle(null); + Interop.User32.UnregisterClassW(s_className, hInstance); + } + } + + if (_consoleHandler != null) + { + Interop.Kernel32.SetConsoleCtrlHandler(_consoleHandler, false); + _consoleHandler = null; + } + } + + /// + /// Creates the static resources needed by + /// system events. + /// + private static void EnsureSystemEvents(bool requireHandle, bool throwOnRefusal) + { + // The secondary check here is to detect asp.net. Asp.net uses multiple + // app domains to field requests and we do not want to gobble up an + // additional thread per domain. So under this scenario SystemEvents + // becomes a nop. + if (s_systemEvents == null) + { + lock (s_procLockObject) + { + if (s_systemEvents == null) + { + if (Thread.GetDomain().GetData(".appDomain") != null) + { + if (throwOnRefusal) + { + throw new InvalidOperationException(SR.ErrorSystemEventsNotSupported); + } + return; + } + + // If we are creating system events on a thread declared as STA, then + // just share the thread. + if (!UserInteractive || Thread.CurrentThread.GetApartmentState() == ApartmentState.STA) + { + SystemEvents systemEvents = new SystemEvents(); + systemEvents.Initialize(); + + // ensure this is initialized last as that will force concurrent threads calling + // this method to block until after we've initialized. + s_systemEvents = systemEvents; + } + else + { + s_eventWindowReady = new ManualResetEvent(false); + SystemEvents systemEvents = new SystemEvents(); + s_windowThread = new Thread(new ThreadStart(systemEvents.WindowThreadProc)); + s_windowThread.IsBackground = true; + s_windowThread.Name = ".NET SystemEvents"; + s_windowThread.Start(); + s_eventWindowReady.WaitOne(); + + // ensure this is initialized last as that will force concurrent threads calling + // this method to block until after we've initialized. + s_systemEvents = systemEvents; + } + + if (requireHandle && s_systemEvents._windowHandle == IntPtr.Zero) + { + // In theory, it's not the end of the world that + // we don't get system events. Unfortunately, the main reason windowHandle == 0 + // is CreateWindowEx failed for mysterious reasons, and when that happens, + // subsequent (and more important) CreateWindowEx calls also fail. + throw new ExternalException(SR.ErrorCreateSystemEvents); + } + } + } + } + } + + private static void EnsureRegisteredSessionNotification() + { + if (!s_registeredSessionNotification) + { + IntPtr retval = Interop.Kernel32.LoadLibrary(Interop.Libraries.Wtsapi32); + + if (retval != IntPtr.Zero) + { + Interop.Wtsapi32.WTSRegisterSessionNotification(new HandleRef(s_systemEvents, s_systemEvents._windowHandle), Interop.Wtsapi32.NOTIFY_FOR_THIS_SESSION); + s_registeredSessionNotification = true; + Interop.Kernel32.FreeLibrary(retval); + } + } + } + + private UserPreferenceCategory GetUserPreferenceCategory(int msg, IntPtr wParam, IntPtr lParam) + { + UserPreferenceCategory pref = UserPreferenceCategory.General; + + if (msg == Interop.User32.WM_SETTINGCHANGE) + { + if (lParam != IntPtr.Zero && Marshal.PtrToStringUni(lParam).Equals("Policy")) + { + pref = UserPreferenceCategory.Policy; + } + else if (lParam != IntPtr.Zero && Marshal.PtrToStringUni(lParam).Equals("intl")) + { + pref = UserPreferenceCategory.Locale; + } + else + { + switch ((int)wParam) + { + case Interop.User32.SPI_SETACCESSTIMEOUT: + case Interop.User32.SPI_SETFILTERKEYS: + case Interop.User32.SPI_SETHIGHCONTRAST: + case Interop.User32.SPI_SETMOUSEKEYS: + case Interop.User32.SPI_SETSCREENREADER: + case Interop.User32.SPI_SETSERIALKEYS: + case Interop.User32.SPI_SETSHOWSOUNDS: + case Interop.User32.SPI_SETSOUNDSENTRY: + case Interop.User32.SPI_SETSTICKYKEYS: + case Interop.User32.SPI_SETTOGGLEKEYS: + pref = UserPreferenceCategory.Accessibility; + break; + + case Interop.User32.SPI_SETDESKWALLPAPER: + case Interop.User32.SPI_SETFONTSMOOTHING: + case Interop.User32.SPI_SETCURSORS: + case Interop.User32.SPI_SETDESKPATTERN: + case Interop.User32.SPI_SETGRIDGRANULARITY: + case Interop.User32.SPI_SETWORKAREA: + pref = UserPreferenceCategory.Desktop; + break; + + case Interop.User32.SPI_ICONHORIZONTALSPACING: + case Interop.User32.SPI_ICONVERTICALSPACING: + case Interop.User32.SPI_SETICONMETRICS: + case Interop.User32.SPI_SETICONS: + case Interop.User32.SPI_SETICONTITLELOGFONT: + case Interop.User32.SPI_SETICONTITLEWRAP: + pref = UserPreferenceCategory.Icon; + break; + + case Interop.User32.SPI_SETDOUBLECLICKTIME: + case Interop.User32.SPI_SETDOUBLECLKHEIGHT: + case Interop.User32.SPI_SETDOUBLECLKWIDTH: + case Interop.User32.SPI_SETMOUSE: + case Interop.User32.SPI_SETMOUSEBUTTONSWAP: + case Interop.User32.SPI_SETMOUSEHOVERHEIGHT: + case Interop.User32.SPI_SETMOUSEHOVERTIME: + case Interop.User32.SPI_SETMOUSESPEED: + case Interop.User32.SPI_SETMOUSETRAILS: + case Interop.User32.SPI_SETSNAPTODEFBUTTON: + case Interop.User32.SPI_SETWHEELSCROLLLINES: + case Interop.User32.SPI_SETCURSORSHADOW: + case Interop.User32.SPI_SETHOTTRACKING: + case Interop.User32.SPI_SETTOOLTIPANIMATION: + case Interop.User32.SPI_SETTOOLTIPFADE: + pref = UserPreferenceCategory.Mouse; + break; + + case Interop.User32.SPI_SETKEYBOARDDELAY: + case Interop.User32.SPI_SETKEYBOARDPREF: + case Interop.User32.SPI_SETKEYBOARDSPEED: + case Interop.User32.SPI_SETLANGTOGGLE: + pref = UserPreferenceCategory.Keyboard; + break; + + case Interop.User32.SPI_SETMENUDROPALIGNMENT: + case Interop.User32.SPI_SETMENUFADE: + case Interop.User32.SPI_SETMENUSHOWDELAY: + case Interop.User32.SPI_SETMENUANIMATION: + case Interop.User32.SPI_SETSELECTIONFADE: + pref = UserPreferenceCategory.Menu; + break; + + case Interop.User32.SPI_SETLOWPOWERACTIVE: + case Interop.User32.SPI_SETLOWPOWERTIMEOUT: + case Interop.User32.SPI_SETPOWEROFFACTIVE: + case Interop.User32.SPI_SETPOWEROFFTIMEOUT: + pref = UserPreferenceCategory.Power; + break; + + case Interop.User32.SPI_SETSCREENSAVEACTIVE: + case Interop.User32.SPI_SETSCREENSAVERRUNNING: + case Interop.User32.SPI_SETSCREENSAVETIMEOUT: + pref = UserPreferenceCategory.Screensaver; + break; + + case Interop.User32.SPI_SETKEYBOARDCUES: + case Interop.User32.SPI_SETCOMBOBOXANIMATION: + case Interop.User32.SPI_SETLISTBOXSMOOTHSCROLLING: + case Interop.User32.SPI_SETGRADIENTCAPTIONS: + case Interop.User32.SPI_SETUIEFFECTS: + case Interop.User32.SPI_SETACTIVEWINDOWTRACKING: + case Interop.User32.SPI_SETACTIVEWNDTRKZORDER: + case Interop.User32.SPI_SETACTIVEWNDTRKTIMEOUT: + case Interop.User32.SPI_SETANIMATION: + case Interop.User32.SPI_SETBORDER: + case Interop.User32.SPI_SETCARETWIDTH: + case Interop.User32.SPI_SETDRAGFULLWINDOWS: + case Interop.User32.SPI_SETDRAGHEIGHT: + case Interop.User32.SPI_SETDRAGWIDTH: + case Interop.User32.SPI_SETFOREGROUNDFLASHCOUNT: + case Interop.User32.SPI_SETFOREGROUNDLOCKTIMEOUT: + case Interop.User32.SPI_SETMINIMIZEDMETRICS: + case Interop.User32.SPI_SETNONCLIENTMETRICS: + case Interop.User32.SPI_SETSHOWIMEUI: + pref = UserPreferenceCategory.Window; + break; + } + } + } + else if (msg == Interop.User32.WM_SYSCOLORCHANGE) + { + pref = UserPreferenceCategory.Color; + } + else + { + Debug.Fail("Unrecognized message passed to UserPreferenceCategory"); + } + + return pref; + } + + private void Initialize() + { + _consoleHandler = new Interop.Kernel32.ConsoleCtrlHandlerRoutine(ConsoleHandlerProc); + if (!Interop.Kernel32.SetConsoleCtrlHandler(_consoleHandler, true)) + { + Debug.Fail("Failed to install console handler."); + _consoleHandler = null; + } + + _windowHandle = CreateBroadcastWindow(); + Debug.WriteLineIf(_windowHandle == IntPtr.Zero, "CreateBroadcastWindow failed"); + + AppDomain.CurrentDomain.ProcessExit += new EventHandler(SystemEvents.Shutdown); + AppDomain.CurrentDomain.DomainUnload += new EventHandler(SystemEvents.Shutdown); + } + + /// + /// Called on the control's owning thread to perform the actual callback. + /// This empties this control's callback queue, propagating any excpetions + /// back as needed. + /// + [SuppressMessage("Microsoft.Security", "CA2102:CatchNonClsCompliantExceptionsInGeneralHandlers")] + [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")] + private void InvokeMarshaledCallbacks() + { + Debug.Assert(s_threadCallbackList != null, "Invoking marshaled callbacks before there are any"); + + Delegate current = null; + lock (s_threadCallbackList) + { + if (s_threadCallbackList.Count > 0) + { + current = (Delegate)s_threadCallbackList.Dequeue(); + } + } + + // Now invoke on all the queued items. + while (current != null) + { + try + { + // Optimize a common case of using EventHandler. This allows us to invoke + // early bound, which is a bit more efficient. + EventHandler c = current as EventHandler; + if (c != null) + { + c(null, EventArgs.Empty); + } + else + { + current.DynamicInvoke(new object[0]); + } + } + catch (Exception t) + { + Debug.Fail("SystemEvents marshaled callback failed:" + t); + } + lock (s_threadCallbackList) + { + if (s_threadCallbackList.Count > 0) + { + current = (Delegate)s_threadCallbackList.Dequeue(); + } + else + { + current = null; + } + } + } + } + + /// + /// Executes the given delegate asynchronously on the thread that listens for system events. Similar to Control.BeginInvoke(). + /// + public static void InvokeOnEventsThread(Delegate method) + { + // This method is really only here for GDI+ initialization/shutdown + EnsureSystemEvents(true, true); + +#if DEBUG + int pid; + int thread = Interop.User32.GetWindowThreadProcessId(new HandleRef(s_systemEvents, s_systemEvents._windowHandle), out pid); + Debug.Assert(s_windowThread == null || thread != Interop.Kernel32.GetCurrentThreadId(), "Don't call MarshaledInvoke on the system events thread"); +#endif + + if (s_threadCallbackList == null) + { + lock (s_eventLockObject) + { + if (s_threadCallbackList == null) + { + s_threadCallbackMessage = Interop.User32.RegisterWindowMessageW("SystemEventsThreadCallbackMessage"); + s_threadCallbackList = new Queue(); + } + } + } + + Debug.Assert(s_threadCallbackMessage != 0, "threadCallbackList initialized but threadCallbackMessage not?"); + + lock (s_threadCallbackList) + { + s_threadCallbackList.Enqueue(method); + } + + Interop.User32.PostMessageW(new HandleRef(s_systemEvents, s_systemEvents._windowHandle), s_threadCallbackMessage, IntPtr.Zero, IntPtr.Zero); + } + + /// + /// + /// Kills the timer specified by the given id. + /// + public static void KillTimer(IntPtr timerId) + { + EnsureSystemEvents(true, true); + if (s_systemEvents._windowHandle != IntPtr.Zero) + { + int res = (int)Interop.User32.SendMessageW(new HandleRef(s_systemEvents, s_systemEvents._windowHandle), + Interop.User32.WM_KILLTIMER, timerId, IntPtr.Zero); + + if (res == 0) + throw new ExternalException(SR.ErrorKillTimer); + } + } + + /// + /// Callback that handles the create timer + /// user message. + /// + private IntPtr OnCreateTimer(IntPtr wParam) + { + IntPtr timerId = (IntPtr)s_randomTimerId.Next(); + IntPtr res = Interop.User32.SetTimer(_windowHandle, timerId, (int)wParam, IntPtr.Zero); + return (res == IntPtr.Zero ? IntPtr.Zero : timerId); + } + + /// + /// Handler that raises the DisplaySettings changing event + /// + private void OnDisplaySettingsChanging() + { + RaiseEvent(s_onDisplaySettingsChangingEvent, this, EventArgs.Empty); + } + + /// + /// Handler that raises the DisplaySettings changed event + /// + private void OnDisplaySettingsChanged() + { + RaiseEvent(s_onDisplaySettingsChangedEvent, this, EventArgs.Empty); + } + + /// + /// Handler for any event that fires a standard EventHandler delegate. + /// + private void OnGenericEvent(object eventKey) + { + RaiseEvent(eventKey, this, EventArgs.Empty); + } + + private void OnShutdown(object eventKey) + { + RaiseEvent(false, eventKey, this, EventArgs.Empty); + } + + /// + /// Callback that handles the KillTimer + /// user message. + /// + private bool OnKillTimer(IntPtr wParam) + { + bool res = Interop.User32.KillTimer(_windowHandle, wParam); + return res; + } + + /// + /// Handler for WM_POWERBROADCAST. + /// + private void OnPowerModeChanged(IntPtr wParam) + { + PowerModes mode; + + switch ((int)wParam) + { + case Interop.User32.PBT_APMSUSPEND: + case Interop.User32.PBT_APMSTANDBY: + mode = PowerModes.Suspend; + break; + + case Interop.User32.PBT_APMRESUMECRITICAL: + case Interop.User32.PBT_APMRESUMESUSPEND: + case Interop.User32.PBT_APMRESUMESTANDBY: + mode = PowerModes.Resume; + break; + + case Interop.User32.PBT_APMBATTERYLOW: + case Interop.User32.PBT_APMPOWERSTATUSCHANGE: + case Interop.User32.PBT_APMOEMEVENT: + mode = PowerModes.StatusChange; + break; + + default: + return; + } + + RaiseEvent(s_onPowerModeChangedEvent, this, new PowerModeChangedEventArgs(mode)); + } + + /// + /// Handler for WM_ENDSESSION. + /// + private void OnSessionEnded(IntPtr wParam, IntPtr lParam) + { + // wParam will be nonzero if the session is actually ending. If + // it was canceled then we do not want to raise the event. + if (wParam != (IntPtr)0) + { + SessionEndReasons reason = SessionEndReasons.SystemShutdown; + + if (((unchecked((int)(long)lParam)) & Interop.User32.ENDSESSION_LOGOFF) != 0) + { + reason = SessionEndReasons.Logoff; + } + + SessionEndedEventArgs endEvt = new SessionEndedEventArgs(reason); + + RaiseEvent(s_onSessionEndedEvent, this, endEvt); + } + } + + /// + /// Handler for WM_QUERYENDSESSION. + /// + private int OnSessionEnding(IntPtr lParam) + { + int endOk = 1; + + SessionEndReasons reason = SessionEndReasons.SystemShutdown; + + // Casting to (int) is bad if we're 64-bit; casting to (long) is ok whether we're 64- or 32-bit. + if ((((long)lParam) & Interop.User32.ENDSESSION_LOGOFF) != 0) + { + reason = SessionEndReasons.Logoff; + } + + SessionEndingEventArgs endEvt = new SessionEndingEventArgs(reason); + + RaiseEvent(s_onSessionEndingEvent, this, endEvt); + endOk = (endEvt.Cancel ? 0 : 1); + + return endOk; + } + + private void OnSessionSwitch(int wParam) + { + SessionSwitchEventArgs switchEventArgs = new SessionSwitchEventArgs((SessionSwitchReason)wParam); + + RaiseEvent(s_onSessionSwitchEvent, this, switchEventArgs); + } + + /// + /// Handler for WM_THEMECHANGED + /// Whidbey note: Before Whidbey, we used to fire UserPreferenceChanged with category + /// set to Window. In Whidbey, we support visual styles and need a new category Theme + /// since Window is too general. We fire UserPreferenceChanged with this category, but + /// for backward compat, we also fire it with category set to Window. + /// + private void OnThemeChanged() + { + // we need to fire a changing event handler for Themes. + // note that it needs to be documented that accessing theme information during the changing event is forbidden. + RaiseEvent(s_onUserPreferenceChangingEvent, this, new UserPreferenceChangingEventArgs(UserPreferenceCategory.VisualStyle)); + + UserPreferenceCategory pref = UserPreferenceCategory.Window; + + RaiseEvent(s_onUserPreferenceChangedEvent, this, new UserPreferenceChangedEventArgs(pref)); + + pref = UserPreferenceCategory.VisualStyle; + + RaiseEvent(s_onUserPreferenceChangedEvent, this, new UserPreferenceChangedEventArgs(pref)); + } + + /// + /// Handler for WM_SETTINGCHANGE and WM_SYSCOLORCHANGE. + /// + private void OnUserPreferenceChanged(int msg, IntPtr wParam, IntPtr lParam) + { + UserPreferenceCategory pref = GetUserPreferenceCategory(msg, wParam, lParam); + + RaiseEvent(s_onUserPreferenceChangedEvent, this, new UserPreferenceChangedEventArgs(pref)); + } + + private void OnUserPreferenceChanging(int msg, IntPtr wParam, IntPtr lParam) + { + UserPreferenceCategory pref = GetUserPreferenceCategory(msg, wParam, lParam); + + RaiseEvent(s_onUserPreferenceChangingEvent, this, new UserPreferenceChangingEventArgs(pref)); + } + + /// + /// Handler for WM_TIMER. + /// + private void OnTimerElapsed(IntPtr wParam) + { + RaiseEvent(s_onTimerElapsedEvent, this, new TimerElapsedEventArgs(wParam)); + } + + private static void RaiseEvent(object key, params object[] args) + { + RaiseEvent(true, key, args); + } + + [SuppressMessage("Microsoft.Security", "CA2102:CatchNonClsCompliantExceptionsInGeneralHandlers")] + [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")] + private static void RaiseEvent(bool checkFinalization, object key, params object[] args) + { + // If the AppDomain's unloading, we shouldn't fire SystemEvents other than Shutdown. + if (checkFinalization && AppDomain.CurrentDomain.IsFinalizingForUnload()) + { + return; + } + + SystemEventInvokeInfo[] invokeItemArray = null; + + lock (s_eventLockObject) + { + if (s_handlers != null && s_handlers.ContainsKey(key)) + { + List invokeItems = s_handlers[key]; + + // clone the list so we don't have this type locked and cause + // a deadlock if someone tries to modify handlers during an invoke. + if (invokeItems != null) + { + invokeItemArray = invokeItems.ToArray(); + } + } + } + + if (invokeItemArray != null) + { + for (int i = 0; i < invokeItemArray.Length; i++) + { + try + { + SystemEventInvokeInfo info = invokeItemArray[i]; + info.Invoke(checkFinalization, args); + invokeItemArray[i] = null; // clear it if it's valid + } + catch (Exception) + { + // Eat exceptions (Everett compat) + } + } + + // clean out any that are dead. + lock (s_eventLockObject) + { + List invokeItems = null; + + for (int i = 0; i < invokeItemArray.Length; i++) + { + SystemEventInvokeInfo info = invokeItemArray[i]; + if (info != null) + { + if (invokeItems == null) + { + if (!s_handlers.TryGetValue(key, out invokeItems)) + { + // weird. just to be safe. + return; + } + } + + invokeItems.Remove(info); + } + } + } + } + } + + private static void RemoveEventHandler(object key, Delegate value) + { + lock (s_eventLockObject) + { + if (s_handlers != null && s_handlers.ContainsKey(key)) + { + List invokeItems = (List)s_handlers[key]; + + invokeItems.Remove(new SystemEventInvokeInfo(value)); + } + } + } + + private static void Shutdown() + { + if (s_systemEvents != null && s_systemEvents._windowHandle != IntPtr.Zero) + { + lock (s_procLockObject) + { + if (s_systemEvents != null) + { + // If we are using system events from another thread, request that it terminate + if (s_windowThread != null) + { + s_eventThreadTerminated = new ManualResetEvent(false); + +#if DEBUG + int pid; + int thread = Interop.User32.GetWindowThreadProcessId(new HandleRef(s_systemEvents, s_systemEvents._windowHandle), out pid); + Debug.Assert(thread != Interop.Kernel32.GetCurrentThreadId(), "Don't call Shutdown on the system events thread"); +#endif + Interop.User32.PostMessageW(new HandleRef(s_systemEvents, s_systemEvents._windowHandle), Interop.User32.WM_QUIT, IntPtr.Zero, IntPtr.Zero); + + s_eventThreadTerminated.WaitOne(); + s_windowThread.Join(); // avoids an AppDomainUnloaded exception on our background thread. + } + else + { + s_systemEvents.Dispose(); + s_systemEvents = null; + } + } + } + } + } + + [PrePrepareMethod] + private static void Shutdown(object sender, EventArgs e) + { + Shutdown(); + } + + /// + /// A standard Win32 window proc for our broadcast window. + /// + [SuppressMessage("Microsoft.Security", "CA2102:CatchNonClsCompliantExceptionsInGeneralHandlers")] + [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")] + private IntPtr WindowProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam) + { + switch (msg) + { + case Interop.User32.WM_SETTINGCHANGE: + string newString; + IntPtr newStringPtr = lParam; + if (lParam != IntPtr.Zero) + { + newString = Marshal.PtrToStringUni(lParam); + if (newString != null) + { + newStringPtr = Marshal.StringToHGlobalUni(newString); + } + } + Interop.User32.PostMessageW(_windowHandle, Interop.User32.WM_REFLECT + msg, wParam, newStringPtr); + break; + case Interop.User32.WM_WTSSESSION_CHANGE: + OnSessionSwitch((int)wParam); + break; + case Interop.User32.WM_SYSCOLORCHANGE: + case Interop.User32.WM_COMPACTING: + case Interop.User32.WM_DISPLAYCHANGE: + case Interop.User32.WM_FONTCHANGE: + case Interop.User32.WM_PALETTECHANGED: + case Interop.User32.WM_TIMECHANGE: + case Interop.User32.WM_TIMER: + case Interop.User32.WM_THEMECHANGED: + Interop.User32.PostMessageW(_windowHandle, Interop.User32.WM_REFLECT + msg, wParam, lParam); + break; + + case Interop.User32.WM_CREATETIMER: + return OnCreateTimer(wParam); + + case Interop.User32.WM_KILLTIMER: + return (IntPtr)(OnKillTimer(wParam) ? 1 : 0); + + case Interop.User32.WM_REFLECT + Interop.User32.WM_SETTINGCHANGE: + try + { + OnUserPreferenceChanging(msg - Interop.User32.WM_REFLECT, wParam, lParam); + OnUserPreferenceChanged(msg - Interop.User32.WM_REFLECT, wParam, lParam); + } + finally + { + try + { + if (lParam != IntPtr.Zero) + { + Marshal.FreeHGlobal(lParam); + } + } + catch (Exception e) + { + Debug.Assert(false, "Exception occurred while freeing memory: " + e.ToString()); + } + } + break; + + case Interop.User32.WM_REFLECT + Interop.User32.WM_SYSCOLORCHANGE: + OnUserPreferenceChanging(msg - Interop.User32.WM_REFLECT, wParam, lParam); + OnUserPreferenceChanged(msg - Interop.User32.WM_REFLECT, wParam, lParam); + break; + + case Interop.User32.WM_REFLECT + Interop.User32.WM_THEMECHANGED: + OnThemeChanged(); + break; + + case Interop.User32.WM_QUERYENDSESSION: + return (IntPtr)OnSessionEnding(lParam); + + case Interop.User32.WM_ENDSESSION: + OnSessionEnded(wParam, lParam); + break; + + case Interop.User32.WM_POWERBROADCAST: + OnPowerModeChanged(wParam); + break; + + // WM_HIBERNATE on WinCE + case Interop.User32.WM_REFLECT + Interop.User32.WM_COMPACTING: + OnGenericEvent(s_onLowMemoryEvent); + break; + + case Interop.User32.WM_REFLECT + Interop.User32.WM_DISPLAYCHANGE: + OnDisplaySettingsChanging(); + OnDisplaySettingsChanged(); + break; + + case Interop.User32.WM_REFLECT + Interop.User32.WM_FONTCHANGE: + OnGenericEvent(s_onInstalledFontsChangedEvent); + break; + + case Interop.User32.WM_REFLECT + Interop.User32.WM_PALETTECHANGED: + OnGenericEvent(s_onPaletteChangedEvent); + break; + + case Interop.User32.WM_REFLECT + Interop.User32.WM_TIMECHANGE: + OnGenericEvent(s_onTimeChangedEvent); + break; + + case Interop.User32.WM_REFLECT + Interop.User32.WM_TIMER: + OnTimerElapsed(wParam); + break; + + default: + // If we received a thread execute message, then execute it. + if (msg == s_threadCallbackMessage && msg != 0) + { + InvokeMarshaledCallbacks(); + return IntPtr.Zero; + } + break; + } + + return Interop.User32.DefWindowProcW(hWnd, msg, wParam, lParam); + } + + /// + /// This is the method that runs our window thread. This method + /// creates a window and spins up a message loop. The window + /// is made visible with a size of 0, 0, so that it will trap + /// global broadcast messages. + /// + [SuppressMessage("Microsoft.Security", "CA2102:CatchNonClsCompliantExceptionsInGeneralHandlers")] + [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")] + private void WindowThreadProc() + { + try + { + Initialize(); + s_eventWindowReady.Set(); + + if (_windowHandle != IntPtr.Zero) + { + Interop.User32.MSG msg = new Interop.User32.MSG(); + + bool keepRunning = true; + + // Blocking on a GetMessage() call prevents the EE from being able to unwind + // this thread properly (e.g. during AppDomainUnload). So, we use PeekMessage() + // and sleep so we always block in managed code instead. + while (keepRunning) + { + int ret = Interop.User32.MsgWaitForMultipleObjectsEx(0, IntPtr.Zero, 100, Interop.User32.QS_ALLINPUT, Interop.User32.MWMO_INPUTAVAILABLE); + + if (ret == Interop.User32.WAIT_TIMEOUT) + { + Thread.Sleep(1); + } + else + { + while (Interop.User32.PeekMessageW(ref msg, IntPtr.Zero, 0, 0, Interop.User32.PM_REMOVE)) + { + if (msg.message == Interop.User32.WM_QUIT) + { + keepRunning = false; + break; + } + + Interop.User32.TranslateMessage(ref msg); + Interop.User32.DispatchMessageW(ref msg); + } + } + } + } + + OnShutdown(s_onEventsThreadShutdownEvent); + } + catch (Exception e) + { + // In case something very very wrong happend during the creation action. + // This will unblock the calling thread. + s_eventWindowReady.Set(); + + if (!((e is ThreadInterruptedException) || (e is ThreadAbortException))) + { + Debug.Fail("Unexpected thread exception in system events window thread proc", e.ToString()); + } + } + + Dispose(); + if (s_eventThreadTerminated != null) + { + s_eventThreadTerminated.Set(); + } + } + + // A class that helps fire events on the right thread. + private class SystemEventInvokeInfo + { + private SynchronizationContext _syncContext; // the context that we'll use to fire against. + private Delegate _delegate; // the delegate we'll fire. This is a weak ref so we don't hold object in memory. + public SystemEventInvokeInfo(Delegate d) + { + _delegate = d; + _syncContext = AsyncOperationManager.SynchronizationContext; + } + + // fire the given event with the given params. + public void Invoke(bool checkFinalization, params object[] args) + { + try + { + // If we didn't get call back invoke directly. + if (_syncContext == null) + { + InvokeCallback(args); + } + else + { + // otherwise tell the context to do it for us. + _syncContext.Send(new SendOrPostCallback(InvokeCallback), args); + } + } + catch (InvalidAsynchronousStateException) + { + // if the synch context is invalid -- do the invoke directly for app compat. + // If the app's shutting down, don't fire the event (unless it's shutdown). + if (!checkFinalization || !AppDomain.CurrentDomain.IsFinalizingForUnload()) + { + InvokeCallback(args); + } + } + } + + // our delegate method that the SyncContext will call on. + private void InvokeCallback(object arg) + { + _delegate.DynamicInvoke((object[])arg); + } + + public override bool Equals(object other) + { + SystemEventInvokeInfo otherInvoke = other as SystemEventInvokeInfo; + + if (otherInvoke == null) + { + return false; + } + return otherInvoke._delegate.Equals(_delegate); + } + + public override int GetHashCode() + { + return base.GetHashCode(); + } + } + } +} diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/TimerElapsedEventArgs.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/TimerElapsedEventArgs.cs new file mode 100644 index 0000000000..3065057173 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/TimerElapsedEventArgs.cs @@ -0,0 +1,36 @@ +// 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; + +namespace Microsoft.Win32 +{ + /// + /// Provides data for the event. + /// + public class TimerElapsedEventArgs : EventArgs + { + private readonly IntPtr _timerId; + + /// + /// Initializes a new instance of the class. + /// + public TimerElapsedEventArgs(IntPtr timerId) + { + _timerId = timerId; + } + + /// + /// Gets the ID number for the timer. + /// + public IntPtr TimerId + { + get + { + return _timerId; + } + } + } +} + diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/TimerElapsedEventHandler.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/TimerElapsedEventHandler.cs new file mode 100644 index 0000000000..1d3f248ce9 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/TimerElapsedEventHandler.cs @@ -0,0 +1,12 @@ +// 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 Microsoft.Win32 +{ + /// + /// Represents the method that will handle the event. + /// + public delegate void TimerElapsedEventHandler(object sender, TimerElapsedEventArgs e); +} + diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/UserPreferenceCategories.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/UserPreferenceCategories.cs new file mode 100644 index 0000000000..02f6cc4b31 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/UserPreferenceCategories.cs @@ -0,0 +1,110 @@ +// 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 Microsoft.Win32 +{ + /// + /// Identifies areas of user preferences that + /// have changed. + /// + public enum UserPreferenceCategory + { + /// + /// Specifies user + /// preferences associated with accessibility + /// of the system for users with disabilities. + /// + Accessibility = 1, + + /// + /// Specifies user preferences + /// associated with system colors, such as the + /// default color of windows or menus. + /// + Color = 2, + + /// + /// Specifies user + /// preferences associated with the system desktop. + /// This may reflect a change in desktop background + /// images, or desktop layout. + /// + Desktop = 3, + + /// + /// Specifies user preferences + /// that are not associated with any other category. + /// + General = 4, + + /// + /// Specifies + /// user preferences for icon settings. This includes + /// icon height and spacing. + /// + Icon = 5, + + /// + /// + /// Specifies user preferences for keyboard settings, + /// such as the keyboard repeat rate. + /// + Keyboard = 6, + + /// + /// Specifies user preferences + /// for menu settings, such as menu delays and + /// text alignment. + /// + Menu = 7, + + /// + /// Specifies user preferences + /// for mouse settings, such as double click + /// time and mouse sensitivity. + /// + Mouse = 8, + + /// + /// Specifies user preferences + /// for policy settings, such as user rights and + /// access levels. + /// + Policy = 9, + + /// + /// Specifies user preferences + /// for system power settings. An example of a + /// power setting is the time required for the + /// system to automatically enter low power mode. + /// + Power = 10, + + /// + /// Specifies user preferences + /// associated with the screensaver. + /// + Screensaver = 11, + + /// + /// Specifies user preferences + /// associated with the dimensions and characteristics + /// of windows on the system. + /// + Window = 12, + + /// + /// Specifies user preferences + /// associated with the locale of the system. + /// + Locale = 13, + + /// + /// Specifies user preferences + /// associated with the visual style. + /// + VisualStyle = 14, + } +} + diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/UserPreferenceChangedEventArgs.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/UserPreferenceChangedEventArgs.cs new file mode 100644 index 0000000000..9e265f231c --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/UserPreferenceChangedEventArgs.cs @@ -0,0 +1,36 @@ +// 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; + +namespace Microsoft.Win32 +{ + /// + /// Provides data for the event. + /// + public class UserPreferenceChangedEventArgs : EventArgs + { + private readonly UserPreferenceCategory _category; + + /// + /// Initializes a new instance of the class. + /// + public UserPreferenceChangedEventArgs(UserPreferenceCategory category) + { + _category = category; + } + + /// + /// Gets the category of user preferences that has changed. + /// + public UserPreferenceCategory Category + { + get + { + return _category; + } + } + } +} + diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/UserPreferenceChangedEventHandler.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/UserPreferenceChangedEventHandler.cs new file mode 100644 index 0000000000..f46be3bd02 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/UserPreferenceChangedEventHandler.cs @@ -0,0 +1,11 @@ +// 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 Microsoft.Win32 +{ + /// + /// Represents the method that will handle the event. + /// + public delegate void UserPreferenceChangedEventHandler(object sender, UserPreferenceChangedEventArgs e); +} diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/UserPreferenceChangingEventArgs.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/UserPreferenceChangingEventArgs.cs new file mode 100644 index 0000000000..ecdc58f90a --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/UserPreferenceChangingEventArgs.cs @@ -0,0 +1,36 @@ +// 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; + +namespace Microsoft.Win32 +{ + /// + /// Provides data for the event. + /// + public class UserPreferenceChangingEventArgs : EventArgs + { + private readonly UserPreferenceCategory _category; + + /// + /// Initializes a new instance of the class. + /// + public UserPreferenceChangingEventArgs(UserPreferenceCategory category) + { + _category = category; + } + + /// + /// Gets the category of user preferences that has Changing. + /// + public UserPreferenceCategory Category + { + get + { + return _category; + } + } + } +} + diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/UserPreferenceChangingEventHandler.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/UserPreferenceChangingEventHandler.cs new file mode 100644 index 0000000000..a36b08e117 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Microsoft/Win32/UserPreferenceChangingEventHandler.cs @@ -0,0 +1,11 @@ +// 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 Microsoft.Win32 +{ + /// + /// Represents the method that will handle the event. + /// + public delegate void UserPreferenceChangingEventHandler(object sender, UserPreferenceChangingEventArgs e); +} diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/src/PinvokeAnalyzerExceptionList.analyzerdata b/external/corefx/src/Microsoft.Win32.SystemEvents/src/PinvokeAnalyzerExceptionList.analyzerdata new file mode 100644 index 0000000000..cfa190d52b --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/PinvokeAnalyzerExceptionList.analyzerdata @@ -0,0 +1,27 @@ +kernel32.dll!GetModuleHandleW +kernel32.dll!LoadLibrary +user32.dll!CreateWindowExW +user32.dll!DefWindowProcW +user32.dll!DestroyWindow +user32.dll!DispatchMessageW +user32.dll!GetClassInfoW +user32.dll!GetProcessWindowStation +user32.dll!GetUserObjectInformationW +user32.dll!GetWindowThreadProcessId +user32.dll!IsWindow +user32.dll!KillTimer +user32.dll!MsgWaitForMultipleObjectsEx +user32.dll!PeekMessageW +user32.dll!PostMessageW +user32.dll!RegisterClassW +user32.dll!RegisterWindowMessageW +user32.dll!SendMessageW +user32.dll!SetClassLongPtrW +user32.dll!SetClassLongW +user32.dll!SetTimer +user32.dll!SetWindowLongPtrW +user32.dll!SetWindowLongW +user32.dll!TranslateMessage +user32.dll!UnregisterClassW +wtsapi32.dll!WTSRegisterSessionNotification +wtsapi32.dll!WTSUnRegisterSessionNotification diff --git a/external/corefx/src/System.Globalization.Extensions/src/Resources/Strings.resx b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Resources/Strings.resx similarity index 85% rename from external/corefx/src/System.Globalization.Extensions/src/Resources/Strings.resx rename to external/corefx/src/Microsoft.Win32.SystemEvents/src/Resources/Strings.resx index 9891a3c007..99fcf24d20 100644 --- a/external/corefx/src/System.Globalization.Extensions/src/Resources/Strings.resx +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/src/Resources/Strings.resx @@ -117,7 +117,25 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Value of flags is invalid. + + Failed to create system events window thread. + + + Cannot create timer. + + + Cannot get temporary file name + + + Cannot end timer. + + + System event notifications are not supported under the current context. Server processes, for example, may not support global system event notifications. + + + '{1}' is not a valid value for '{0}'. '{0}' must be greater than {2}. + + + SystemEvents is not supported on this platform. \ No newline at end of file diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/tests/Configurations.props b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/Configurations.props new file mode 100644 index 0000000000..0390988544 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/Configurations.props @@ -0,0 +1,9 @@ + + + + + netcoreapp-Windows_NT; + netfx-Windows_NT; + + + diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/tests/GenericEventTests.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/GenericEventTests.cs new file mode 100644 index 0000000000..8a5098b196 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/GenericEventTests.cs @@ -0,0 +1,66 @@ +// 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; +using System.Threading; +using Xunit; +using static Interop; + +namespace Microsoft.Win32.SystemEventsTests +{ + public abstract class GenericEventTests : SystemEventsTest + { + protected abstract int MessageId { get; } + + protected abstract event EventHandler Event; + + private void SendMessage() + { + SendMessage(MessageId, IntPtr.Zero, IntPtr.Zero); + } + private void SendReflectedMessage() + { + SendMessage(User32.WM_REFLECT + MessageId, IntPtr.Zero, IntPtr.Zero); + } + + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] + public void SignalsEventsAsynchronouslyOnMessage() + { + var signal = new AutoResetEvent(false); + EventHandler signaledHandler = (o, e) => signal.Set(); + + Event += signaledHandler; + + try + { + SendMessage(); + Assert.True(signal.WaitOne(PostMessageWait)); + } + finally + { + Event -= signaledHandler; + signal.Dispose(); + } + } + + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] + public void SignalsEventsSynchronouslyOnReflectedMessage() + { + bool signal = false; + EventHandler signaledHandler = (o, e) => signal = true; + + Event += signaledHandler; + + try + { + SendReflectedMessage(); + Assert.True(signal); + } + finally + { + Event -= signaledHandler; + } + } + } +} diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj new file mode 100644 index 0000000000..8a8cb9520a --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj @@ -0,0 +1,43 @@ + + + + + {8B21F7AD-928E-474C-875A-83D753BB8A28} + + + + + + + + Common\Interop\Windows\Interop.Libraries.cs + + + Common\Interop\Windows\user32\Interop.Constants.cs + + + Common\Interop\Windows\user32\Interop.FindWindow.cs + + + Common\Interop\Windows\user32\Interop.SendMessage.cs + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.CreateTimer.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.CreateTimer.cs new file mode 100644 index 0000000000..75b5f69f6c --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.CreateTimer.cs @@ -0,0 +1,170 @@ +// 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; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Runtime.InteropServices; +using System.Threading; +using Xunit; + +namespace Microsoft.Win32.SystemEventsTests +{ + public class CreateTimerTests + { + /// + /// Minimum permitted interval + /// + public const int TimerInterval = 10; + + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] + public void CreateTimerInvalidInterval() + { + Assert.Throws(() => SystemEvents.CreateTimer(0)); + Assert.Throws(() => SystemEvents.CreateTimer(-1)); + Assert.Throws(() => SystemEvents.CreateTimer(int.MinValue)); + } + + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] + public void TimerElapsedSignaled() + { + var elapsed = new AutoResetEvent(false); + + object elapsedSender = null; + IntPtr timer = IntPtr.Zero; + + TimerElapsedEventHandler handler = (sender, args) => + { + if (args?.TimerId == timer) + { + elapsedSender = sender; + elapsed.Set(); + } + }; + + SystemEvents.TimerElapsed += handler; + try + { + if (PlatformDetection.IsFullFramework) + { + // desktop has a bug where it will allow EnsureSystemEvents to proceed without actually creating the HWND + SystemEventsTest.WaitForSystemEventsWindow(); + } + + timer = SystemEvents.CreateTimer(TimerInterval); + + Assert.True(elapsed.WaitOne(TimerInterval * SystemEventsTest.ExpectedEventMultiplier)); + Assert.IsType(elapsedSender); + + // Timer should fire more than once + Assert.True(elapsed.WaitOne(TimerInterval * SystemEventsTest.ExpectedEventMultiplier)); + + SystemEvents.KillTimer(timer); + elapsed.Reset(); + + // Timer should not fire once killed + Assert.False(elapsed.WaitOne(TimerInterval * SystemEventsTest.UnexpectedEventMultiplier)); + } + finally + { + SystemEvents.TimerElapsed -= handler; + elapsed.Dispose(); + } + } + + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] + public void ConcurrentTimers() + { + const int NumConcurrentTimers = 10; + var timersSignalled = new Dictionary(); + int numSignaled = 0; + var elapsed = new AutoResetEvent(false); + + TimerElapsedEventHandler handler = (sender, args) => + { + bool signaled = false; + if (timersSignalled.TryGetValue(args.TimerId, out signaled) && !signaled) + { + timersSignalled[args.TimerId] = true; + + if (Interlocked.Increment(ref numSignaled) == NumConcurrentTimers) + { + elapsed.Set(); + } + } + }; + + SystemEvents.TimerElapsed += handler; + try + { + if (PlatformDetection.IsFullFramework) + { + // desktop has a bug where it will allow EnsureSystemEvents to proceed without actually creating the HWND + SystemEventsTest.WaitForSystemEventsWindow(); + } + + for (int i = 0; i < NumConcurrentTimers; i++) + { + timersSignalled[SystemEvents.CreateTimer(TimerInterval)] = false; + } + + Assert.True(elapsed.WaitOne(TimerInterval * SystemEventsTest.ExpectedEventMultiplier)); + + foreach (var timer in timersSignalled.Keys.ToArray()) + { + Assert.True(timersSignalled[timer]); + SystemEvents.KillTimer(timer); + } + } + finally + { + SystemEvents.TimerElapsed -= handler; + elapsed.Dispose(); + } + } + + [OuterLoop] + [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] + [InlineData(500)] // .5s + [InlineData(1000)] // 1s + [InlineData(2000)] // 2s + [InlineData(10000)] // 10s + [InlineData(30000)] // 30s + public void TimerElapsedIsRoughlyEquivalentToInterval(int interval) + { + const double permittedProportionUnder = -0.1; + const double permittedProportionOver = 0.5; + var elapsed = new AutoResetEvent(false); + IntPtr timer = IntPtr.Zero; + var stopwatch = new Stopwatch(); + + TimerElapsedEventHandler handler = (sender, args) => + { + if (args?.TimerId == timer) + { + stopwatch.Stop(); + elapsed.Set(); + } + }; + + SystemEvents.TimerElapsed += handler; + try + { + timer = SystemEvents.CreateTimer(interval); + stopwatch.Start(); + Assert.True(elapsed.WaitOne(interval * SystemEventsTest.ExpectedEventMultiplier)); + + var proportionDifference = (double)(stopwatch.ElapsedMilliseconds - interval) / interval; + Assert.True(permittedProportionUnder < proportionDifference && proportionDifference < permittedProportionOver, + $"Timer should fire less than {permittedProportionUnder * 100.0}% before and less than {permittedProportionOver * 100.0}% after expected interval {interval}, actual: {stopwatch.ElapsedMilliseconds}, difference: {proportionDifference * 100.0}%"); + } + finally + { + SystemEvents.TimerElapsed -= handler; + SystemEvents.KillTimer(timer); + } + } + } +} diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.DisplaySettings.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.DisplaySettings.cs new file mode 100644 index 0000000000..1628a83f20 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.DisplaySettings.cs @@ -0,0 +1,72 @@ +// 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; +using System.Threading; +using Xunit; +using static Interop; + +namespace Microsoft.Win32.SystemEventsTests +{ + public class DisplaySettingsTests : SystemEventsTest + { + private void SendMessage() + { + SendMessage(User32.WM_DISPLAYCHANGE, IntPtr.Zero, IntPtr.Zero); + } + private void SendReflectedMessage() + { + SendMessage(User32.WM_REFLECT + User32.WM_DISPLAYCHANGE, IntPtr.Zero, IntPtr.Zero); + } + + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] + public void SignalsDisplayEventsAsynchronouslyOnDISPLAYCHANGE() + { + var changing = new AutoResetEvent(false); + var changed = new AutoResetEvent(false); + EventHandler changedHandler = (o, e) => changed.Set(); + EventHandler changingHandler = (o, e) => changing.Set(); + + SystemEvents.DisplaySettingsChanged += changedHandler; + SystemEvents.DisplaySettingsChanging += changingHandler; + + try + { + SendMessage(); + Assert.True(changing.WaitOne(PostMessageWait)); + Assert.True(changed.WaitOne(PostMessageWait)); + } + finally + { + SystemEvents.DisplaySettingsChanged -= changedHandler; + SystemEvents.DisplaySettingsChanging -= changingHandler; + changing.Dispose(); + changed.Dispose(); + } + } + + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] + public void SignalsDisplayEventsSynchronouslyOnREFLECTDISPLAYCHANGE() + { + bool changing = false, changed = false; + EventHandler changedHandler = (o, e) => changed = true; + EventHandler changingHandler = (o, e) => changing = true; + + SystemEvents.DisplaySettingsChanged += changedHandler; + SystemEvents.DisplaySettingsChanging += changingHandler; + + try + { + SendReflectedMessage(); + Assert.True(changing); + Assert.True(changed); + } + finally + { + SystemEvents.DisplaySettingsChanged -= changedHandler; + SystemEvents.DisplaySettingsChanging -= changingHandler; + } + } + } +} diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.InstalledFontsChanged.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.InstalledFontsChanged.cs new file mode 100644 index 0000000000..8d5dd6801d --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.InstalledFontsChanged.cs @@ -0,0 +1,26 @@ +// 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; +using static Interop; + +namespace Microsoft.Win32.SystemEventsTests +{ + public class InstalledFontsChangedTests : GenericEventTests + { + protected override int MessageId => User32.WM_FONTCHANGE; + + protected override event EventHandler Event + { + add + { + SystemEvents.InstalledFontsChanged += value; + } + remove + { + SystemEvents.InstalledFontsChanged -= value; + } + } + } +} diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.InvokeOnEventsThread.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.InvokeOnEventsThread.cs new file mode 100644 index 0000000000..9eb595e79a --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.InvokeOnEventsThread.cs @@ -0,0 +1,57 @@ +// 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; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Threading; +using Xunit; +using static Interop; + +namespace Microsoft.Win32.SystemEventsTests +{ + public class InvokeOnEventsThreadTests : SystemEventsTest + { + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] + public void InvokeOnEventsThreadRunsAsynchronously() + { + var invoked = new AutoResetEvent(false); + SystemEvents.InvokeOnEventsThread(new Action(() => invoked.Set())); + Assert.True(invoked.WaitOne(PostMessageWait)); + } + + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] + public void InvokeOnEventsThreadRunsOnSameThreadAsOtherEvents() + { + int expectedThreadId = -1, actualThreadId = -1; + var invoked = new AutoResetEvent(false); + EventHandler handler = (sender, args) => + { + expectedThreadId = Thread.CurrentThread.ManagedThreadId; + }; + + try + { + // force a TimeChanged event to get the event thread ID + SystemEvents.TimeChanged += handler; + SendMessage(User32.WM_REFLECT + User32.WM_TIMECHANGE, IntPtr.Zero, IntPtr.Zero); + Assert.NotEqual(-1, expectedThreadId); + + SystemEvents.InvokeOnEventsThread(new Action(() => + { + actualThreadId = Thread.CurrentThread.ManagedThreadId; + invoked.Set(); + })); + Assert.True(invoked.WaitOne(PostMessageWait)); + Assert.Equal(expectedThreadId, actualThreadId); + } + finally + { + SystemEvents.TimeChanged -= handler; + invoked.Dispose(); + } + } + } +} diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.LowMemory.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.LowMemory.cs new file mode 100644 index 0000000000..7cdb1e5770 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.LowMemory.cs @@ -0,0 +1,28 @@ +// 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; +using static Interop; + +namespace Microsoft.Win32.SystemEventsTests +{ + public class LowMemoryTests : GenericEventTests + { + protected override int MessageId => User32.WM_COMPACTING; + + protected override event EventHandler Event + { +#pragma warning disable CS0618 // Type or member is obsolete + add + { + SystemEvents.LowMemory += value; + } + remove + { + SystemEvents.LowMemory -= value; + } +#pragma warning restore CS0618 // Type or member is obsolete + } + } +} diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.PaletteChanged.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.PaletteChanged.cs new file mode 100644 index 0000000000..d28c713175 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.PaletteChanged.cs @@ -0,0 +1,26 @@ +// 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; +using static Interop; + +namespace Microsoft.Win32.SystemEventsTests +{ + public class PaletteChangedTests : GenericEventTests + { + protected override int MessageId => User32.WM_PALETTECHANGED; + + protected override event EventHandler Event + { + add + { + SystemEvents.PaletteChanged += value; + } + remove + { + SystemEvents.PaletteChanged -= value; + } + } + } +} diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.PowerMode.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.PowerMode.cs new file mode 100644 index 0000000000..857310692d --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.PowerMode.cs @@ -0,0 +1,80 @@ +// 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; +using Xunit; +using static Interop; + +namespace Microsoft.Win32.SystemEventsTests +{ + public class PowerModeTests : SystemEventsTest + { + private void SendMessage(int pmEvent) + { + SendMessage(User32.WM_POWERBROADCAST, (IntPtr)pmEvent, IntPtr.Zero); + } + + [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] + [InlineData(User32.PBT_APMBATTERYLOW, PowerModes.StatusChange)] + [InlineData(User32.PBT_APMOEMEVENT, PowerModes.StatusChange)] + [InlineData(User32.PBT_APMPOWERSTATUSCHANGE, PowerModes.StatusChange)] + [InlineData(User32.PBT_APMRESUMECRITICAL, PowerModes.Resume)] + [InlineData(User32.PBT_APMRESUMESUSPEND, PowerModes.Resume)] + [InlineData(User32.PBT_APMRESUMESTANDBY, PowerModes.Resume)] + [InlineData(User32.PBT_APMSUSPEND, PowerModes.Suspend)] + [InlineData(User32.PBT_APMSTANDBY, PowerModes.Suspend)] + public void SignalsPowerModeChanged(int pmEvent, PowerModes powerMode) + { + bool changed = false; + PowerModeChangedEventArgs args = null; + PowerModeChangedEventHandler changedHandler = (o, e) => + { + changed = true; + args = e; + }; + + SystemEvents.PowerModeChanged += changedHandler; + + try + { + SendMessage(pmEvent); + Assert.True(changed); + Assert.NotNull(args); + Assert.Equal(powerMode, args.Mode); + } + finally + { + SystemEvents.PowerModeChanged -= changedHandler; + } + } + + [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] + [InlineData(User32.PBT_APMQUERYSTANDBY)] + [InlineData(User32.PBT_APMQUERYSTANDBYFAILED)] + [InlineData(User32.PBT_APMQUERYSUSPEND)] + [InlineData(User32.PBT_APMQUERYSUSPENDFAILED)] + [InlineData(int.MaxValue)] + [InlineData(-1)] + public void DoesNotSignalPowerModeChanged(int pmEvent) + { + bool changed = false; + PowerModeChangedEventHandler changedHandler = (o, e) => + { + changed = true; + }; + + SystemEvents.PowerModeChanged += changedHandler; + + try + { + SendMessage(pmEvent); + Assert.False(changed); + } + finally + { + SystemEvents.PowerModeChanged -= changedHandler; + } + } + } +} diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.SessionEnded.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.SessionEnded.cs new file mode 100644 index 0000000000..5443f0a265 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.SessionEnded.cs @@ -0,0 +1,74 @@ +// 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; +using Xunit; +using static Interop; + +namespace Microsoft.Win32.SystemEventsTests +{ + public class SessionEndedTests : SystemEventsTest + { + private IntPtr SendMessage(bool ended, int lParam) + { + return SendMessage(User32.WM_ENDSESSION, ended ? (IntPtr)1 : (IntPtr)0, (IntPtr)lParam); + } + + [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] + [InlineData(User32.ENDSESSION_LOGOFF, SessionEndReasons.Logoff)] + [InlineData(User32.ENDSESSION_LOGOFF | User32.ENDSESSION_CRITICAL, SessionEndReasons.Logoff)] + [InlineData(User32.ENDSESSION_LOGOFF | User32.ENDSESSION_CLOSEAPP, SessionEndReasons.Logoff)] + [InlineData(User32.ENDSESSION_LOGOFF | User32.ENDSESSION_CRITICAL | User32.ENDSESSION_CLOSEAPP, SessionEndReasons.Logoff)] + [InlineData(0, SessionEndReasons.SystemShutdown)] + [InlineData(User32.ENDSESSION_CRITICAL, SessionEndReasons.SystemShutdown)] + [InlineData(User32.ENDSESSION_CLOSEAPP, SessionEndReasons.SystemShutdown)] + [InlineData(User32.ENDSESSION_CRITICAL | User32.ENDSESSION_CLOSEAPP, SessionEndReasons.SystemShutdown)] + public void SignalsSessionEnded(int lParam, SessionEndReasons reason) + { + bool signaled = false; + SessionEndedEventArgs args = null; + SessionEndedEventHandler endedHandler = (o, e) => + { + signaled = true; + args = e; + }; + + SystemEvents.SessionEnded += endedHandler; + + try + { + SendMessage(true, lParam); + Assert.True(signaled); + Assert.NotNull(args); + Assert.Equal(reason, args.Reason); + } + finally + { + SystemEvents.SessionEnded -= endedHandler; + } + } + + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] + public void DoesNotSignalSessionEnded() + { + bool signaled = false; + SessionEndedEventHandler endedHandler = (o, e) => + { + signaled = true; + }; + + SystemEvents.SessionEnded += endedHandler; + + try + { + SendMessage(false, 0); + Assert.False(signaled); + } + finally + { + SystemEvents.SessionEnded -= endedHandler; + } + } + } +} diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.SessionEnding.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.SessionEnding.cs new file mode 100644 index 0000000000..5156dcf61d --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.SessionEnding.cs @@ -0,0 +1,74 @@ +// 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; +using Xunit; +using static Interop; + +namespace Microsoft.Win32.SystemEventsTests +{ + public class SessionEndingTests : SystemEventsTest + { + private IntPtr SendMessage(int lParam) + { + return SendMessage(User32.WM_QUERYENDSESSION, IntPtr.Zero, (IntPtr)lParam); + } + + [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] + [InlineData(User32.ENDSESSION_LOGOFF, SessionEndReasons.Logoff)] + [InlineData(User32.ENDSESSION_LOGOFF | User32.ENDSESSION_CRITICAL, SessionEndReasons.Logoff)] + [InlineData(User32.ENDSESSION_LOGOFF | User32.ENDSESSION_CLOSEAPP, SessionEndReasons.Logoff)] + [InlineData(User32.ENDSESSION_LOGOFF | User32.ENDSESSION_CRITICAL | User32.ENDSESSION_CLOSEAPP, SessionEndReasons.Logoff)] + [InlineData(0, SessionEndReasons.SystemShutdown)] + [InlineData(User32.ENDSESSION_CRITICAL, SessionEndReasons.SystemShutdown)] + [InlineData(User32.ENDSESSION_CLOSEAPP, SessionEndReasons.SystemShutdown)] + [InlineData(User32.ENDSESSION_CRITICAL | User32.ENDSESSION_CLOSEAPP, SessionEndReasons.SystemShutdown)] + public void SignalsSessionEnding(int lParam, SessionEndReasons reason) + { + bool signaled = false; + SessionEndingEventArgs args = null; + SessionEndingEventHandler endingHandler = (o, e) => + { + signaled = true; + args = e; + }; + + SystemEvents.SessionEnding += endingHandler; + + try + { + SendMessage(lParam); + Assert.True(signaled); + Assert.NotNull(args); + Assert.Equal(reason, args.Reason); + } + finally + { + SystemEvents.SessionEnding -= endingHandler; + } + } + + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] + public void CancelSessionEnding() + { + bool shouldCancel = false; + SessionEndingEventHandler endingHandler = (o, e) => + { + e.Cancel = shouldCancel; + }; + + SystemEvents.SessionEnding += endingHandler; + try + { + Assert.Equal((IntPtr)1, SendMessage(0)); + shouldCancel = true; + Assert.Equal((IntPtr)0, SendMessage(0)); + } + finally + { + SystemEvents.SessionEnding -= endingHandler; + } + } + } +} diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.SessionSwitch.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.SessionSwitch.cs new file mode 100644 index 0000000000..3be4c3f344 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.SessionSwitch.cs @@ -0,0 +1,51 @@ +// 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; +using System.Collections.Generic; +using System.Linq; +using Xunit; +using static Interop; + +namespace Microsoft.Win32.SystemEventsTests +{ + public class SessionSwitchTests : SystemEventsTest + { + private void SendMessage(SessionSwitchReason reason) + { + SendMessage(User32.WM_WTSSESSION_CHANGE, (IntPtr)reason, IntPtr.Zero); + } + + public static IEnumerable SessionSwitchReasons() => Enum.GetValues(typeof(SessionSwitchReason)) + .Cast() + .Select(x => new object[] { x }); + + [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] + [MemberData(nameof(SessionSwitchReasons))] + public void SignalsSessionSwitch(SessionSwitchReason reason) + { + bool signaled = false; + SessionSwitchEventArgs args = null; + SessionSwitchEventHandler switchHandler = (o, e) => + { + signaled = true; + args = e; + }; + + SystemEvents.SessionSwitch += switchHandler; + + try + { + SendMessage(reason); + Assert.True(signaled); + Assert.NotNull(args); + Assert.Equal(reason, args.Reason); + } + finally + { + SystemEvents.SessionSwitch -= switchHandler; + } + } + } +} diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.TimeChanged.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.TimeChanged.cs new file mode 100644 index 0000000000..fde0ceb546 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.TimeChanged.cs @@ -0,0 +1,26 @@ +// 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; +using static Interop; + +namespace Microsoft.Win32.SystemEventsTests +{ + public class TimeChangedTests : GenericEventTests + { + protected override int MessageId => User32.WM_TIMECHANGE; + + protected override event EventHandler Event + { + add + { + SystemEvents.TimeChanged += value; + } + remove + { + SystemEvents.TimeChanged -= value; + } + } + } +} diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.UserPreference.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.UserPreference.cs new file mode 100644 index 0000000000..d031ba6a32 --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEvents.UserPreference.cs @@ -0,0 +1,327 @@ +// 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; +using System.Collections.Generic; +using System.Runtime.InteropServices; +using System.Threading; +using Xunit; +using static Interop; + +namespace Microsoft.Win32.SystemEventsTests +{ + public class UserPreferenceTests : SystemEventsTest + { + + private void SendMessage(int message, int uiAction, string area, bool freeMemory = true) + { + var areaPtr = Marshal.StringToHGlobalUni(area); + try + { + SendMessage((int)message, (IntPtr)uiAction, areaPtr); + } + finally + { + if (freeMemory) + { + Marshal.FreeHGlobal(areaPtr); + } + } + } + + private void SendReflectedMessage(int message, int uiAction, string area) + { + // WM_REFLECT is an internal message where the SystemEvents WndProc will copy + // the lParam and pass it back in a posted message. In that case it expects + // to be the source of the message and will free the memory itself. + SendMessage(User32.WM_REFLECT + message, uiAction, area, freeMemory:false); + } + + public static IEnumerable PreferenceChangingCases() => + new List() + { + new object[] { User32.WM_SETTINGCHANGE, 0, "Policy", UserPreferenceCategory.Policy }, + new object[] { User32.WM_SETTINGCHANGE, 0, "intl", UserPreferenceCategory.Locale }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETACCESSTIMEOUT, null, UserPreferenceCategory.Accessibility }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETFILTERKEYS, null, UserPreferenceCategory.Accessibility }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETHIGHCONTRAST, null, UserPreferenceCategory.Accessibility }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETMOUSEKEYS, null, UserPreferenceCategory.Accessibility }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETSCREENREADER, null, UserPreferenceCategory.Accessibility }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETSERIALKEYS, null, UserPreferenceCategory.Accessibility }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETSHOWSOUNDS, null, UserPreferenceCategory.Accessibility }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETSOUNDSENTRY, null, UserPreferenceCategory.Accessibility }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETSTICKYKEYS, null, UserPreferenceCategory.Accessibility }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETTOGGLEKEYS, null, UserPreferenceCategory.Accessibility }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETDESKWALLPAPER, null, UserPreferenceCategory.Desktop }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETFONTSMOOTHING, null, UserPreferenceCategory.Desktop }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETCURSORS, null, UserPreferenceCategory.Desktop }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETDESKPATTERN, null, UserPreferenceCategory.Desktop }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETGRIDGRANULARITY, null, UserPreferenceCategory.Desktop }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETWORKAREA, null, UserPreferenceCategory.Desktop }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_ICONHORIZONTALSPACING, null, UserPreferenceCategory.Icon }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_ICONVERTICALSPACING, null, UserPreferenceCategory.Icon }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETICONMETRICS, null, UserPreferenceCategory.Icon }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETICONS, null, UserPreferenceCategory.Icon }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETICONTITLELOGFONT, null, UserPreferenceCategory.Icon }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETICONTITLEWRAP, null, UserPreferenceCategory.Icon }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETDOUBLECLICKTIME, null, UserPreferenceCategory.Mouse }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETDOUBLECLKHEIGHT, null, UserPreferenceCategory.Mouse }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETDOUBLECLKWIDTH, null, UserPreferenceCategory.Mouse }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETMOUSE, null, UserPreferenceCategory.Mouse }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETMOUSEBUTTONSWAP, null, UserPreferenceCategory.Mouse }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETMOUSEHOVERHEIGHT, null, UserPreferenceCategory.Mouse }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETMOUSEHOVERTIME, null, UserPreferenceCategory.Mouse }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETMOUSESPEED, null, UserPreferenceCategory.Mouse }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETMOUSETRAILS, null, UserPreferenceCategory.Mouse }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETSNAPTODEFBUTTON, null, UserPreferenceCategory.Mouse }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETWHEELSCROLLLINES, null, UserPreferenceCategory.Mouse }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETCURSORSHADOW, null, UserPreferenceCategory.Mouse }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETHOTTRACKING, null, UserPreferenceCategory.Mouse }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETTOOLTIPANIMATION, null, UserPreferenceCategory.Mouse }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETTOOLTIPFADE, null, UserPreferenceCategory.Mouse }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETKEYBOARDDELAY, null, UserPreferenceCategory.Keyboard }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETKEYBOARDPREF, null, UserPreferenceCategory.Keyboard }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETKEYBOARDSPEED, null, UserPreferenceCategory.Keyboard }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETLANGTOGGLE, null, UserPreferenceCategory.Keyboard }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETMENUDROPALIGNMENT, null, UserPreferenceCategory.Menu }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETMENUFADE, null, UserPreferenceCategory.Menu }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETMENUSHOWDELAY, null, UserPreferenceCategory.Menu }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETMENUANIMATION, null, UserPreferenceCategory.Menu }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETSELECTIONFADE, null, UserPreferenceCategory.Menu }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETLOWPOWERACTIVE, null, UserPreferenceCategory.Power }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETLOWPOWERTIMEOUT, null, UserPreferenceCategory.Power }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETPOWEROFFACTIVE, null, UserPreferenceCategory.Power }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETPOWEROFFTIMEOUT, null, UserPreferenceCategory.Power }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETSCREENSAVEACTIVE, null, UserPreferenceCategory.Screensaver }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETSCREENSAVERRUNNING, null, UserPreferenceCategory.Screensaver }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETSCREENSAVETIMEOUT, null, UserPreferenceCategory.Screensaver }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETKEYBOARDCUES, null, UserPreferenceCategory.Window }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETCOMBOBOXANIMATION, null, UserPreferenceCategory.Window }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETLISTBOXSMOOTHSCROLLING, null, UserPreferenceCategory.Window }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETGRADIENTCAPTIONS, null, UserPreferenceCategory.Window }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETUIEFFECTS, null, UserPreferenceCategory.Window }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETACTIVEWINDOWTRACKING, null, UserPreferenceCategory.Window }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETACTIVEWNDTRKZORDER, null, UserPreferenceCategory.Window }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETACTIVEWNDTRKTIMEOUT, null, UserPreferenceCategory.Window }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETANIMATION, null, UserPreferenceCategory.Window }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETBORDER, null, UserPreferenceCategory.Window }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETCARETWIDTH, null, UserPreferenceCategory.Window }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETDRAGFULLWINDOWS, null, UserPreferenceCategory.Window }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETDRAGHEIGHT, null, UserPreferenceCategory.Window }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETDRAGWIDTH, null, UserPreferenceCategory.Window }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETFOREGROUNDFLASHCOUNT, null, UserPreferenceCategory.Window }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETFOREGROUNDLOCKTIMEOUT, null, UserPreferenceCategory.Window }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETMINIMIZEDMETRICS, null, UserPreferenceCategory.Window }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETNONCLIENTMETRICS, null, UserPreferenceCategory.Window }, + new object[] { User32.WM_SETTINGCHANGE, User32.SPI_SETSHOWIMEUI, null, UserPreferenceCategory.Window }, + new object[] { User32.WM_SYSCOLORCHANGE, 0, null, UserPreferenceCategory.Color }, + }; + + + [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] + [MemberData(nameof(PreferenceChangingCases))] + public void SignalsUserPreferenceEventsAsynchronously(int message, int uiAction, string area, UserPreferenceCategory expectedCategory) + { + var changing = new AutoResetEvent(false); + var changed = new AutoResetEvent(false); + + UserPreferenceChangingEventArgs changingArgs = null; + UserPreferenceChangingEventHandler changingHandler = (o, e) => + { + changingArgs = e; + changing.Set(); + }; + + UserPreferenceChangedEventArgs changedArgs = null; + UserPreferenceChangingEventArgs changingDuringChanged = null; + UserPreferenceChangedEventHandler changedHandler = (o, e) => + { + changedArgs = e; + changingDuringChanged = changingArgs; + changed.Set(); + }; + + SystemEvents.UserPreferenceChanging += changingHandler; + SystemEvents.UserPreferenceChanged += changedHandler; + + try + { + SendMessage(message, uiAction, area); + Assert.True(changing.WaitOne(PostMessageWait)); + Assert.NotNull(changingArgs); + Assert.Equal(expectedCategory, changingArgs.Category); + + Assert.True(changed.WaitOne(PostMessageWait)); + Assert.NotNull(changedArgs); + Assert.Equal(expectedCategory, changedArgs.Category); + + // changed must follow changing for the same category + Assert.NotNull(changingDuringChanged); + Assert.Equal(expectedCategory, changingDuringChanged.Category); + + } + finally + { + SystemEvents.UserPreferenceChanging -= changingHandler; + SystemEvents.UserPreferenceChanged -= changedHandler; + changing.Dispose(); + changed.Dispose(); + } + } + + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] + public void SignalsUserPreferenceEventsAsynchronouslyOnThemeChanged() + { + var changing = new AutoResetEvent(false); + var changed = new AutoResetEvent(false); + + UserPreferenceChangingEventArgs changingArgs = null; + UserPreferenceChangingEventHandler changingHandler = (o, e) => + { + changingArgs = e; + changing.Set(); + }; + + List changedArgs = new List(); + UserPreferenceChangingEventArgs changingDuringChanged = null; + UserPreferenceChangedEventHandler changedHandler = (o, e) => + { + changedArgs.Add(e); + changingDuringChanged = changingArgs; + // signal test to continue after two events were recieved + if (changedArgs.Count > 1) + { + changed.Set(); + } + }; + + SystemEvents.UserPreferenceChanging += changingHandler; + SystemEvents.UserPreferenceChanged += changedHandler; + + try + { + SendMessage(User32.WM_THEMECHANGED, 0, null); + Assert.True(changing.WaitOne(PostMessageWait)); + Assert.NotNull(changingArgs); + Assert.Equal(UserPreferenceCategory.VisualStyle, changingArgs.Category); + + Assert.True(changed.WaitOne(PostMessageWait)); + Assert.Equal(2, changedArgs.Count); + Assert.NotNull(changedArgs[0]); + Assert.Equal(UserPreferenceCategory.Window, changedArgs[0].Category); + Assert.NotNull(changedArgs[1]); + Assert.Equal(UserPreferenceCategory.VisualStyle, changedArgs[1].Category); + + // changed must follow changing for VisualStyle + Assert.NotNull(changingDuringChanged); + Assert.Equal(UserPreferenceCategory.VisualStyle, changingDuringChanged.Category); + + } + finally + { + SystemEvents.UserPreferenceChanging -= changingHandler; + SystemEvents.UserPreferenceChanged -= changedHandler; + changing.Dispose(); + changed.Dispose(); + } + } + + [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] + [MemberData(nameof(PreferenceChangingCases))] + public void SignalsUserPreferenceEventsSynchronously(int message, int uiAction, string area, UserPreferenceCategory expectedCategory) + { + bool changing = false, changed = false; + + UserPreferenceChangingEventArgs changingArgs = null; + UserPreferenceChangingEventHandler changingHandler = (o, e) => + { + changingArgs = e; + changing = true; + }; + + UserPreferenceChangedEventArgs changedArgs = null; + UserPreferenceChangingEventArgs changingDuringChanged = null; + UserPreferenceChangedEventHandler changedHandler = (o, e) => + { + changedArgs = e; + changingDuringChanged = changingArgs; + changed = true; + }; + + SystemEvents.UserPreferenceChanging += changingHandler; + SystemEvents.UserPreferenceChanged += changedHandler; + + + try + { + SendReflectedMessage(message, uiAction, area); + Assert.True(changing); + Assert.NotNull(changingArgs); + Assert.Equal(expectedCategory, changingArgs.Category); + + Assert.True(changed); + Assert.NotNull(changedArgs); + Assert.Equal(expectedCategory, changedArgs.Category); + + // changed must follow changing for the same category + Assert.NotNull(changingDuringChanged); + Assert.Equal(expectedCategory, changingDuringChanged.Category); + } + finally + { + SystemEvents.UserPreferenceChanging -= changingHandler; + SystemEvents.UserPreferenceChanged -= changedHandler; + } + } + + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] + public void SignalsUserPreferenceEventsSynchronouslyOnReflectedThemeChanged() + { + bool changing = false, changed = false; + + UserPreferenceChangingEventArgs changingArgs = null; + UserPreferenceChangingEventHandler changingHandler = (o, e) => + { + changingArgs = e; + changing = true; + }; + + List changedArgs = new List(); + UserPreferenceChangingEventArgs changingDuringChanged = null; + UserPreferenceChangedEventHandler changedHandler = (o, e) => + { + changedArgs.Add(e); + changingDuringChanged = changingArgs; + changed = true; + }; + + SystemEvents.UserPreferenceChanging += changingHandler; + SystemEvents.UserPreferenceChanged += changedHandler; + + try + { + SendReflectedMessage(User32.WM_THEMECHANGED, 0, null); + Assert.True(changing); + Assert.NotNull(changingArgs); + Assert.Equal(UserPreferenceCategory.VisualStyle, changingArgs.Category); + + Assert.True(changed); + Assert.Equal(2, changedArgs.Count); + Assert.NotNull(changedArgs[0]); + Assert.Equal(UserPreferenceCategory.Window, changedArgs[0].Category); + Assert.NotNull(changedArgs[1]); + Assert.Equal(UserPreferenceCategory.VisualStyle, changedArgs[1].Category); + + // changed must follow changing for VisualStyle + Assert.NotNull(changingDuringChanged); + Assert.Equal(UserPreferenceCategory.VisualStyle, changingDuringChanged.Category); + } + finally + { + SystemEvents.UserPreferenceChanging -= changingHandler; + SystemEvents.UserPreferenceChanged -= changedHandler; + } + } + } +} diff --git a/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEventsTest.cs b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEventsTest.cs new file mode 100644 index 0000000000..f3df79a5ec --- /dev/null +++ b/external/corefx/src/Microsoft.Win32.SystemEvents/tests/SystemEventsTest.cs @@ -0,0 +1,63 @@ +// 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; +using System.Threading; +using Xunit; +using static Interop; + +namespace Microsoft.Win32.SystemEventsTests +{ + public abstract class SystemEventsTest + { + IntPtr s_hwnd = IntPtr.Zero; + + public const int PostMessageWait = 10000; + public const int ExpectedEventMultiplier = 1000; + public const int UnexpectedEventMultiplier = 10; + + protected IntPtr SendMessage(int msg, IntPtr wParam, IntPtr lParam) + { + EnsureHwnd(); + return User32.SendMessageW(s_hwnd, msg, wParam, lParam); + } + + private void EnsureHwnd() + { + if (s_hwnd == IntPtr.Zero) + { + if (PlatformDetection.IsFullFramework) + { + // desktop has a bug where it will allow EnsureSystemEvents to proceed without actually creating the HWND + WaitForSystemEventsWindow(); + } + + // locate the hwnd used by SystemEvents in this domain + var windowClassNameField = typeof(SystemEvents).GetField("s_className", System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic) ?? // corefx + typeof(SystemEvents).GetField("className", System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic); // desktop + Assert.NotNull(windowClassNameField); + var windowClassName = windowClassNameField.GetValue(null) as string; + Assert.NotNull(windowClassName); + + s_hwnd = User32.FindWindowW(windowClassName, null); + Assert.NotEqual(s_hwnd, IntPtr.Zero); + } + } + + internal static void WaitForSystemEventsWindow() + { + // wait for the window to be created + var windowReadyField = typeof(SystemEvents).GetField("s_eventWindowReady", System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic) ?? // corefx + typeof(SystemEvents).GetField("eventWindowReady", System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic); // desktop + Assert.NotNull(windowReadyField); + var windowReadyEvent = windowReadyField.GetValue(null) as ManualResetEvent; + if (windowReadyEvent != null) + { + // on an STA thread the HWND is created in the same thread synchronously when attaching to an event handler + // if we're on an MTA thread, a new thread is created to handle events and that thread creates the window, wait for it to complete. + Assert.True(windowReadyEvent.WaitOne(PostMessageWait * ExpectedEventMultiplier)); + } + } + } +} diff --git a/external/corefx/src/Microsoft.XmlSerializer.Generator/dir.props b/external/corefx/src/Microsoft.XmlSerializer.Generator/dir.props index 96d567877b..66b1e87a74 100644 --- a/external/corefx/src/Microsoft.XmlSerializer.Generator/dir.props +++ b/external/corefx/src/Microsoft.XmlSerializer.Generator/dir.props @@ -2,10 +2,9 @@ - preview1 - 1.1.0 + 2.0.0 true - 1.0.0.0 + 2.0.0.0 $(AssemblyVersion) Open diff --git a/external/corefx/src/Microsoft.XmlSerializer.Generator/pkg/build/Microsoft.XmlSerializer.Generator.targets b/external/corefx/src/Microsoft.XmlSerializer.Generator/pkg/build/Microsoft.XmlSerializer.Generator.targets index d1ae79fec1..3d581e3d56 100644 --- a/external/corefx/src/Microsoft.XmlSerializer.Generator/pkg/build/Microsoft.XmlSerializer.Generator.targets +++ b/external/corefx/src/Microsoft.XmlSerializer.Generator/pkg/build/Microsoft.XmlSerializer.Generator.targets @@ -4,7 +4,7 @@ <_SerializerDllIntermediateFolder>$(IntermediateOutputPath)$(_SerializationAssemblyName).dll <_SerializerPdbIntermediateFolder>$(IntermediateOutputPath)$(_SerializationAssemblyName).pdb <_SerializerCsIntermediateFolder>$(IntermediateOutputPath)$(_SerializationAssemblyName).cs - <_SGenWarningText>SGEN : warning SGEN1: Fail to generate the serializer for $(AssemblyName)$(TargetExt). Please follow the instructions at https://go.microsoft.com/fwlink/?linkid=858594 and try again. + <_SGenWarningText>SGEN: Fail to generate the serializer for $(AssemblyName)$(TargetExt). Please follow the instructions at https://go.microsoft.com/fwlink/?linkid=858594 and try again. <_SerializationAssemblyDisabledWarnings>$(NoWarn);219;162;$(SerializationAssemblyDisabledWarnings) @@ -12,7 +12,7 @@ - + @@ -43,10 +43,10 @@ - - + + - + @@ -58,4 +58,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/Microsoft.XmlSerializer.Generator/src/Microsoft.XmlSerializer.Generator.csproj b/external/corefx/src/Microsoft.XmlSerializer.Generator/src/Microsoft.XmlSerializer.Generator.csproj index 71e1efe5da..b999bf2a1a 100644 --- a/external/corefx/src/Microsoft.XmlSerializer.Generator/src/Microsoft.XmlSerializer.Generator.csproj +++ b/external/corefx/src/Microsoft.XmlSerializer.Generator/src/Microsoft.XmlSerializer.Generator.csproj @@ -8,7 +8,7 @@ ..\..\System.Private.Xml\src\Resources\Strings.resx Exe .dll - $(NoWarn);0169;0414;0649 + diff --git a/external/corefx/src/Microsoft.XmlSerializer.Generator/src/Sgen.cs b/external/corefx/src/Microsoft.XmlSerializer.Generator/src/Sgen.cs index 281ce4db31..70d8af88d0 100644 --- a/external/corefx/src/Microsoft.XmlSerializer.Generator/src/Sgen.cs +++ b/external/corefx/src/Microsoft.XmlSerializer.Generator/src/Sgen.cs @@ -21,6 +21,9 @@ namespace Microsoft.XmlSerializer.Generator return sgen.Run(args); } + private static string s_references = string.Empty; + private static Dictionary s_referencedic = new Dictionary(StringComparer.OrdinalIgnoreCase); + private int Run(string[] args) { string assembly = null; @@ -35,27 +38,15 @@ namespace Microsoft.XmlSerializer.Generator bool silent = false; bool warnings = false; + AppDomain.CurrentDomain.AssemblyResolve += SgenAssemblyResolver; + try { for (int i = 0; i < args.Length; i++) { string arg = args[i]; - string value = string.Empty; - - if (arg.StartsWith("/") || arg.StartsWith("-")) - { - int colonPos = arg.IndexOf(":"); - if (colonPos != -1) - { - value = arg.Substring(colonPos + 1).Trim(); - arg = arg.Substring(0, colonPos).Trim(); - } - } - - string originalArg = arg; - arg = arg.ToLower(CultureInfo.InvariantCulture); - - if (ArgumentMatch(arg, "?") || ArgumentMatch(arg, "help")) + + if (ArgumentMatch(arg, "help") || ShortNameArgumentMatch(arg, "h")) { WriteHeader(); WriteHelp(); @@ -69,34 +60,45 @@ namespace Microsoft.XmlSerializer.Generator { proxyOnly = true; } - else if (ArgumentMatch(arg, "out")) + else if (ArgumentMatch(arg, "out") || ShortNameArgumentMatch(arg, "o")) { - if (codePath != null) - { - errs.Add(SR.Format(SR.ErrInvalidArgument, "/out", arg)); + i++; + if(i >= args.Length || codePath != null ) + { + errs.Add(SR.Format(SR.ErrInvalidArgument, arg)); + } + else + { + codePath = args[i]; } - - codePath = value; } else if (ArgumentMatch(arg, "type")) { - if (value != string.Empty) + i++; + if (i >= args.Length) { - string[] typelist = value.Split(';'); + errs.Add(SR.Format(SR.ErrInvalidArgument, arg)); + } + else + { + string[] typelist = args[i].Split(';'); foreach (var type in typelist) { types.Add(type); } } } - else if (ArgumentMatch(arg, "assembly")) + else if (ArgumentMatch(arg, "assembly") || ShortNameArgumentMatch(arg, "a")) { - if (assembly != null) + i++; + if (i >= args.Length || assembly != null) { - errs.Add(SR.Format(SR.ErrInvalidArgument, "/assembly", arg)); + errs.Add(SR.Format(SR.ErrInvalidArgument, arg)); + } + else + { + assembly = args[i]; } - - assembly = value; } else if (ArgumentMatch(arg, "quiet")) { @@ -118,16 +120,32 @@ namespace Microsoft.XmlSerializer.Generator { warnings = true; } + else if (ArgumentMatch(arg, "reference")) + { + i++; + if (i >= args.Length) + { + errs.Add(SR.Format(SR.ErrInvalidArgument, arg)); + } + else + { + s_references = args[i]; + if (!string.IsNullOrEmpty(s_references)) + { + ParseReferences(); + } + } + } else { - if (arg.EndsWith(".dll") || arg.EndsWith(".exe")) + if (arg.EndsWith(".dll", StringComparison.InvariantCultureIgnoreCase) || arg.EndsWith(".exe", StringComparison.InvariantCultureIgnoreCase)) { if (assembly != null) { - errs.Add(SR.Format(SR.ErrInvalidArgument, "/assembly", arg)); + errs.Add(SR.Format(SR.ErrInvalidArgument, arg)); } - assembly = originalArg; + assembly = arg; } else { @@ -232,23 +250,37 @@ namespace Microsoft.XmlSerializer.Generator { Type type = types[i]; - if (type != null) + try { - bool isObsolete = false; - object[] obsoleteAttributes = type.GetCustomAttributes(typeof(ObsoleteAttribute), false); - foreach (object attribute in obsoleteAttributes) + if (type != null) { - if (((ObsoleteAttribute)attribute).IsError) + bool isObsolete = false; + object[] obsoleteAttributes = type.GetCustomAttributes(typeof(ObsoleteAttribute), false); + foreach (object attribute in obsoleteAttributes) { - isObsolete = true; - break; + if (((ObsoleteAttribute)attribute).IsError) + { + isObsolete = true; + break; + } + } + + if (isObsolete) + { + continue; } } - - if (isObsolete) + } + //Ignore the FileNotFoundException when call GetCustomAttributes e.g. if the type uses the attributes defined in a different assembly + catch (FileNotFoundException e) + { + if (warnings) { - continue; + Console.Out.WriteLine(FormatMessage(parsableerrors, true, SR.Format(SR.InfoIgnoreType, type.FullName))); + WriteWarning(e, parsableerrors); } + + continue; } if (!proxyOnly) @@ -264,6 +296,19 @@ namespace Microsoft.XmlSerializer.Generator bool gac = assembly.GlobalAssemblyCache; outputDirectory = outputDirectory == null ? (gac ? Environment.CurrentDirectory : Path.GetDirectoryName(assembly.Location)) : outputDirectory; + + if (!Directory.Exists(outputDirectory)) + { + //We need double quote the path to escpate the space in the path. + //However when a path ending with backslash, if followed by double quote, it becomes an escapte sequence + //e.g. "obj\Debug\netcoreapp2.0\", it will be converted as obj\Debug\netcoreapp2.0", which is not valid and not exist + //We need remove the ending quote for this situation + if (!outputDirectory.EndsWith("\"") || !Directory.Exists(outputDirectory.Remove(outputDirectory.Length - 1))) + { + throw new ArgumentException(SR.Format(SR.ErrDirectoryNotExists, outputDirectory)); + } + } + string serializerName = GetXmlSerializerAssemblyName(serializableTypes[0], null); string codePath = Path.Combine(outputDirectory, serializerName + ".cs"); @@ -278,11 +323,6 @@ namespace Microsoft.XmlSerializer.Generator throw new InvalidOperationException(SR.Format(SR.ErrDirectoryExists, codePath)); } - if (!Directory.Exists(outputDirectory)) - { - throw new ArgumentException(SR.Format(SR.ErrDirectoryNotExists, codePath, outputDirectory)); - } - bool success = false; bool toDeleteFile = true; @@ -338,16 +378,27 @@ namespace Microsoft.XmlSerializer.Generator } } - // assumes all same case. + private bool ArgumentMatch(string arg, string formal) { - if (arg[0] != '/' && arg[0] != '-') + // Full name format, eg: --assembly + if (arg.Length < 3 || arg[0] != '-' || arg[1] != '-' ) { return false; } + arg = arg.Substring(2); + return arg.Equals(formal, StringComparison.InvariantCultureIgnoreCase); + } + public bool ShortNameArgumentMatch(string arg, string shortName) + { + // Short name format, eg: -a + if (arg.Length < 2 || arg[0] != '-') + { + return false; + } arg = arg.Substring(1); - return (arg == formal || (arg.Length == 1 && arg[0] == formal[0])); + return arg.Equals(shortName, StringComparison.InvariantCultureIgnoreCase); } private void ImportType(Type type, ArrayList mappings, ArrayList importedTypes, bool verbose, XmlReflectionImporter importer, bool parsableerrors) @@ -404,16 +455,16 @@ namespace Microsoft.XmlSerializer.Generator private void WriteHelp() { Console.Out.WriteLine(SR.Format(SR.HelpDescription)); - Console.Out.WriteLine(SR.Format(SR.HelpUsage, this.GetType().Assembly.GetName().Name)); + Console.Out.WriteLine(SR.Format(SR.HelpUsage, this.GetType().Assembly.GetName().Name.Substring("dotnet-".Length))); Console.Out.WriteLine(SR.Format(SR.HelpDevOptions)); - Console.Out.WriteLine(SR.Format(SR.HelpAssembly, "/assembly:", "/a:")); - Console.Out.WriteLine(SR.Format(SR.HelpType, "/type:", "/t:")); - Console.Out.WriteLine(SR.Format(SR.HelpProxy, "/proxytypes", "/p")); - Console.Out.WriteLine(SR.Format(SR.HelpForce, "/force", "/f")); - Console.Out.WriteLine(SR.Format(SR.HelpOut, "/out:", "/o:")); + Console.Out.WriteLine(SR.Format(SR.HelpAssembly, "-a", "--assembly")); + Console.Out.WriteLine(SR.Format(SR.HelpType, "--type")); + Console.Out.WriteLine(SR.Format(SR.HelpProxy, "--proxytypes")); + Console.Out.WriteLine(SR.Format(SR.HelpForce, "--force")); + Console.Out.WriteLine(SR.Format(SR.HelpOut, "-o", "--out")); Console.Out.WriteLine(SR.Format(SR.HelpMiscOptions)); - Console.Out.WriteLine(SR.Format(SR.HelpHelp, "/?", "/help")); + Console.Out.WriteLine(SR.Format(SR.HelpHelp, "-h", "--help")); } private static string FormatMessage(bool parsableerrors, bool warning, string message) @@ -467,5 +518,76 @@ namespace Microsoft.XmlSerializer.Generator { return parent.Name + ".XmlSerializers" + (ns == null || ns.Length == 0 ? "" : "." + ns.GetHashCode()); } + + private static void ParseReferences() + { + var referencelist = new List(); + if (s_references.Length > 0) + { + foreach(var entry in s_references.Split(';')) + { + string trimentry = entry.Trim(); + if (string.IsNullOrEmpty(trimentry)) + continue; + referencelist.Add(trimentry); + } + } + + foreach (var reference in referencelist) + { + if (reference.EndsWith(".dll") || reference.EndsWith(".exe")) + { + if (File.Exists(reference)) + { + string filename = Path.GetFileNameWithoutExtension(reference); + if (!string.IsNullOrEmpty(filename)) + { + s_referencedic.Add(filename, reference); + } + } + } + + } + } + + private static Assembly SgenAssemblyResolver(object source, ResolveEventArgs e) + { + try + { + if (string.IsNullOrEmpty(e.Name) || e.Name.Split(',').Length == 0) + { + return null; + } + + string assemblyname = e.Name.Split(',')[0]; + if (string.IsNullOrEmpty(assemblyname)) + { + return null; + } + + if(s_referencedic.ContainsKey(assemblyname)) + { + string reference = s_referencedic[assemblyname]; + if (!string.IsNullOrEmpty(reference)) + { + if (File.Exists(reference)) + { + return Assembly.LoadFrom(reference); + } + } + } + } + catch (Exception exp) + { + if (exp is ThreadAbortException || exp is StackOverflowException || exp is OutOfMemoryException) + { + throw; + } + + WriteWarning(exp, true); + } + + return null; + } } } diff --git a/external/corefx/src/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj b/external/corefx/src/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj index 3eaed25e3a..8f54fc98c2 100644 --- a/external/corefx/src/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj +++ b/external/corefx/src/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj @@ -30,7 +30,7 @@ - + @@ -56,9 +56,9 @@ $(AssemblyName).XmlSerializers - + - - - diff --git a/external/corefx/src/Microsoft.XmlSerializer.Generator/tests/SGenTests.cs b/external/corefx/src/Microsoft.XmlSerializer.Generator/tests/SGenTests.cs index 639429dc47..e2737c6aa6 100644 --- a/external/corefx/src/Microsoft.XmlSerializer.Generator/tests/SGenTests.cs +++ b/external/corefx/src/Microsoft.XmlSerializer.Generator/tests/SGenTests.cs @@ -19,7 +19,7 @@ namespace Microsoft.XmlSerializer.Generator.Tests string codefile = "Microsoft.XmlSerializer.Generator.Tests.XmlSerializers.cs"; var type = Type.GetType("Microsoft.XmlSerializer.Generator.Sgen, dotnet-Microsoft.XmlSerializer.Generator"); MethodInfo md = type.GetMethod("Main", BindingFlags.Static | BindingFlags.Public); - string[] args = new string[] { "Microsoft.XmlSerializer.Generator.Tests.dll", "/force", "/quiet" }; + string[] args = new string[] { "Microsoft.XmlSerializer.Generator.Tests.dll", "--force", "--quiet" }; int n = (int)md.Invoke(null, new object[] { args }); Assert.Equal(0, n); Assert.True(File.Exists(codefile), string.Format("Fail to generate {0}.", codefile)); diff --git a/external/corefx/src/Native/Unix/CMakeLists.txt b/external/corefx/src/Native/Unix/CMakeLists.txt index c3e9bffeaf..d1d442b0b7 100644 --- a/external/corefx/src/Native/Unix/CMakeLists.txt +++ b/external/corefx/src/Native/Unix/CMakeLists.txt @@ -10,7 +10,6 @@ set(CMAKE_SHARED_LIBRARY_PREFIX "") set(VERSION_FILE_PATH "${CMAKE_BINARY_DIR}/../../version.c") add_compile_options(-Wno-format-nonliteral) -add_compile_options(-Wno-missing-prototypes) add_compile_options(-Wno-disabled-macro-expansion) add_compile_options(-Wno-c++98-compat) add_compile_options(-Wno-padded) @@ -21,6 +20,7 @@ add_compile_options(-Wno-typedef-redefinition) add_compile_options(-Wno-unused-local-typedef) add_compile_options(-Wno-c99-extensions) add_compile_options(-Wno-c11-extensions) +add_compile_options(-Wmissing-prototypes) add_compile_options(-fPIC) add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common) add_compile_options(-I${CMAKE_CURRENT_BINARY_DIR}/Common) @@ -148,6 +148,18 @@ if(CMAKE_SYSTEM_NAME STREQUAL SunOS) set(CLR_CMAKE_PLATFORM_UNIX 1) endif(CMAKE_SYSTEM_NAME STREQUAL SunOS) +# CLR_ADDITIONAL_LINKER_FLAGS - used for passing additional arguments to linker +# CLR_ADDITIONAL_COMPILER_OPTIONS - used for passing additional arguments to compiler +# +# For example: +# ./build-native.sh cmakeargs -DCLR_ADDITIONAL_COMPILER_OPTIONS=<...> cmakeargs -DCLR_ADDITIONAL_LINKER_FLAGS=<...> +# +if(CLR_CMAKE_PLATFORM_UNIX) + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CLR_ADDITIONAL_LINKER_FLAGS}") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CLR_ADDITIONAL_LINKER_FLAGS}" ) + add_compile_options(${CLR_ADDITIONAL_COMPILER_OPTIONS}) +endif(CLR_CMAKE_PLATFORM_UNIX) + if (NOT WIN32) if (CMAKE_SYSTEM_NAME STREQUAL Darwin) # Ensure that dsymutil and strip are present @@ -247,6 +259,9 @@ add_subdirectory(System.IO.Compression.Native) add_compile_options(-Weverything) add_compile_options(-Wno-c++98-compat-pedantic) +if (HAVE_ZERO_AS_NULL_POINTER_CONSTANT_FLAG) + add_compile_options(-Wno-zero-as-null-pointer-constant) +endif() add_subdirectory(System.Native) add_subdirectory(System.Net.Http.Native) diff --git a/external/corefx/src/Native/Unix/Common/pal_compiler.h b/external/corefx/src/Native/Unix/Common/pal_compiler.h index b92895f367..2c0744799b 100644 --- a/external/corefx/src/Native/Unix/Common/pal_compiler.h +++ b/external/corefx/src/Native/Unix/Common/pal_compiler.h @@ -13,8 +13,18 @@ #define END_EXTERN_C #endif +#ifndef __has_extension +#define __has_extension(...) 0 +#endif + #ifdef static_assert #define c_static_assert(e) static_assert((e),"") -#else +#elif __has_extension(c_static_assert) +#define c_static_assert(e) _Static_assert((e), "") +#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8) #define c_static_assert(e) typedef char __c_static_assert__[(e)?1:-1] +#else +#define c_static_assert(e) #endif + +#define DLLEXPORT __attribute__ ((__visibility__ ("default"))) diff --git a/external/corefx/src/Native/Unix/Common/pal_config.h.in b/external/corefx/src/Native/Unix/Common/pal_config.h.in index 354726fd3c..2501a6a31d 100644 --- a/external/corefx/src/Native/Unix/Common/pal_config.h.in +++ b/external/corefx/src/Native/Unix/Common/pal_config.h.in @@ -6,6 +6,9 @@ #cmakedefine01 HAVE_FTRUNCATE64 #cmakedefine01 HAVE_POSIX_FADVISE64 #cmakedefine01 HAVE_FLOCK64 +#cmakedefine01 HAVE_F_DUPFD_CLOEXEC +#cmakedefine01 HAVE_O_CLOEXEC +#cmakedefine01 HAVE_GETIFADDRS #cmakedefine01 HAVE_STAT64 #cmakedefine01 HAVE_PIPE2 #cmakedefine01 HAVE_STAT_BIRTHTIME @@ -28,22 +31,21 @@ #cmakedefine01 HAVE_TIOCGWINSZ #cmakedefine01 HAVE_SCHED_GETAFFINITY #cmakedefine01 HAVE_SCHED_SETAFFINITY +#cmakedefine01 HAVE_ARC4RANDOM #cmakedefine01 KEVENT_HAS_VOID_UDATA #cmakedefine01 HAVE_FDS_BITS #cmakedefine01 HAVE_PRIVATE_FDS_BITS #cmakedefine01 HAVE_STATFS +#cmakedefine01 HAVE_SYS_POLL_H #cmakedefine01 HAVE_EPOLL #cmakedefine01 HAVE_ACCEPT4 #cmakedefine01 HAVE_KQUEUE #cmakedefine01 HAVE_SENDFILE_4 #cmakedefine01 HAVE_SENDFILE_6 #cmakedefine01 HAVE_FCOPYFILE -#cmakedefine01 HAVE_GETHOSTBYNAME_R -#cmakedefine01 HAVE_GETHOSTBYADDR_R #cmakedefine01 HAVE_GETNAMEINFO_SIGNED_FLAGS #cmakedefine01 HAVE_GETPEEREID #cmakedefine01 HAVE_SUPPORT_FOR_DUAL_MODE_IPV4_PACKET_INFO -#cmakedefine01 HAVE_THREAD_SAFE_GETHOSTBYNAME_AND_GETHOSTBYADDR #cmakedefine01 HAVE_TCGETATTR #cmakedefine01 HAVE_TCSETATTR #cmakedefine01 HAVE_ECHO @@ -62,7 +64,7 @@ #cmakedefine01 HAVE_MACH_ABSOLUTE_TIME #cmakedefine01 HAVE_MACH_TIMEBASE_INFO #cmakedefine01 HAVE_CURLM_ADDED_ALREADY -#cmakedefine01 HAVE_CURL_HTTP_VERSION_2_0 +#cmakedefine01 HAVE_CURL_HTTP_VERSION_2TLS #cmakedefine01 HAVE_CURLPIPE_MULTIPLEX #cmakedefine01 HAVE_CURL_SSLVERSION_TLSv1_012 #cmakedefine01 HAVE_TCP_H_TCPSTATE_ENUM diff --git a/external/corefx/src/Native/Unix/Common/pal_safecrt.h b/external/corefx/src/Native/Unix/Common/pal_safecrt.h index 9fe2a1ef6a..6682534765 100644 --- a/external/corefx/src/Native/Unix/Common/pal_safecrt.h +++ b/external/corefx/src/Native/Unix/Common/pal_safecrt.h @@ -44,6 +44,10 @@ inline static bool add_s(T a, T b, T* result) #else // __cplusplus +#ifndef __has_builtin +#define __has_builtin(_) 0 +#endif + // Multiplies a and b into result. // Returns true if safe, false if overflows. inline static bool multiply_s(size_t a, size_t b, size_t* result) diff --git a/external/corefx/src/Native/Unix/Common/pal_utilities.h b/external/corefx/src/Native/Unix/Common/pal_utilities.h index 21f73923d0..ff12d33af5 100644 --- a/external/corefx/src/Native/Unix/Common/pal_utilities.h +++ b/external/corefx/src/Native/Unix/Common/pal_utilities.h @@ -14,6 +14,7 @@ #include #include #include +#include #ifdef __cplusplus #include @@ -187,3 +188,21 @@ static inline bool CheckInterrupted(TInt result) } #endif // __cplusplus + +inline static uint32_t Int32ToUint32(int32_t value) +{ + assert(value >= 0); + return (uint32_t)value; +} + +inline static size_t Int32ToSizeT(int32_t value) +{ + assert(value >= 0); + return (size_t)value; +} + +inline static int32_t Uint32ToInt32(uint32_t value) +{ + assert(value <= INT_MAX); + return (int32_t)value; +} diff --git a/external/corefx/src/Native/Unix/System.Native/.deps/.dirstamp b/external/corefx/src/Native/Unix/System.Native/.deps/.dirstamp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_errno.Plo b/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_errno.Plo new file mode 100644 index 0000000000..d6209a6aed --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_errno.Plo @@ -0,0 +1,163 @@ +../../external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_errno.lo: \ + ../../external/corefx/src/Native/Unix/System.Native/pal_errno.c \ + /usr/include/stdc-predef.h pal_config.h ../../config.h \ + ../../external/corefx/src/Native/Unix/System.Native/pal_errno.h \ + /mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_compiler.h \ + /mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_types.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdint.h /usr/include/stdint.h \ + /usr/include/features.h /usr/include/x86_64-linux-gnu/sys/cdefs.h \ + /usr/include/x86_64-linux-gnu/bits/wordsize.h \ + /usr/include/x86_64-linux-gnu/gnu/stubs.h \ + /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \ + /usr/include/x86_64-linux-gnu/bits/wchar.h \ + /mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_utilities.h \ + /usr/include/assert.h /usr/include/errno.h \ + /usr/include/x86_64-linux-gnu/bits/errno.h /usr/include/linux/errno.h \ + /usr/include/x86_64-linux-gnu/asm/errno.h \ + /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include/stddef.h /usr/include/stdio.h \ + /usr/include/x86_64-linux-gnu/bits/types.h \ + /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \ + /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdarg.h \ + /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \ + /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \ + /usr/include/x86_64-linux-gnu/bits/stdio.h \ + /usr/include/x86_64-linux-gnu/bits/stdio2.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdbool.h \ + /usr/include/string.h /usr/include/xlocale.h \ + /usr/include/x86_64-linux-gnu/bits/string.h \ + /usr/include/x86_64-linux-gnu/bits/string2.h /usr/include/endian.h \ + /usr/include/x86_64-linux-gnu/bits/endian.h \ + /usr/include/x86_64-linux-gnu/bits/byteswap.h \ + /usr/include/x86_64-linux-gnu/bits/byteswap-16.h /usr/include/stdlib.h \ + /usr/include/x86_64-linux-gnu/bits/string3.h /usr/include/unistd.h \ + /usr/include/x86_64-linux-gnu/bits/posix_opt.h \ + /usr/include/x86_64-linux-gnu/bits/environments.h \ + /usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \ + /usr/include/x86_64-linux-gnu/bits/unistd.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include-fixed/limits.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include-fixed/syslimits.h \ + /usr/include/limits.h /usr/include/x86_64-linux-gnu/bits/posix1_lim.h \ + /usr/include/x86_64-linux-gnu/bits/local_lim.h \ + /usr/include/linux/limits.h \ + /usr/include/x86_64-linux-gnu/bits/posix2_lim.h \ + /usr/include/x86_64-linux-gnu/bits/xopen_lim.h + +/usr/include/stdc-predef.h: + +pal_config.h: + +../../config.h: + +../../external/corefx/src/Native/Unix/System.Native/pal_errno.h: + +/mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_compiler.h: + +/mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_types.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdint.h: + +/usr/include/stdint.h: + +/usr/include/features.h: + +/usr/include/x86_64-linux-gnu/sys/cdefs.h: + +/usr/include/x86_64-linux-gnu/bits/wordsize.h: + +/usr/include/x86_64-linux-gnu/gnu/stubs.h: + +/usr/include/x86_64-linux-gnu/gnu/stubs-64.h: + +/usr/include/x86_64-linux-gnu/bits/wchar.h: + +/mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_utilities.h: + +/usr/include/assert.h: + +/usr/include/errno.h: + +/usr/include/x86_64-linux-gnu/bits/errno.h: + +/usr/include/linux/errno.h: + +/usr/include/x86_64-linux-gnu/asm/errno.h: + +/usr/include/asm-generic/errno.h: + +/usr/include/asm-generic/errno-base.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include/stddef.h: + +/usr/include/stdio.h: + +/usr/include/x86_64-linux-gnu/bits/types.h: + +/usr/include/x86_64-linux-gnu/bits/typesizes.h: + +/usr/include/libio.h: + +/usr/include/_G_config.h: + +/usr/include/wchar.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdarg.h: + +/usr/include/x86_64-linux-gnu/bits/stdio_lim.h: + +/usr/include/x86_64-linux-gnu/bits/sys_errlist.h: + +/usr/include/x86_64-linux-gnu/bits/stdio.h: + +/usr/include/x86_64-linux-gnu/bits/stdio2.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdbool.h: + +/usr/include/string.h: + +/usr/include/xlocale.h: + +/usr/include/x86_64-linux-gnu/bits/string.h: + +/usr/include/x86_64-linux-gnu/bits/string2.h: + +/usr/include/endian.h: + +/usr/include/x86_64-linux-gnu/bits/endian.h: + +/usr/include/x86_64-linux-gnu/bits/byteswap.h: + +/usr/include/x86_64-linux-gnu/bits/byteswap-16.h: + +/usr/include/stdlib.h: + +/usr/include/x86_64-linux-gnu/bits/string3.h: + +/usr/include/unistd.h: + +/usr/include/x86_64-linux-gnu/bits/posix_opt.h: + +/usr/include/x86_64-linux-gnu/bits/environments.h: + +/usr/include/x86_64-linux-gnu/bits/confname.h: + +/usr/include/getopt.h: + +/usr/include/x86_64-linux-gnu/bits/unistd.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include-fixed/limits.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include-fixed/syslimits.h: + +/usr/include/limits.h: + +/usr/include/x86_64-linux-gnu/bits/posix1_lim.h: + +/usr/include/x86_64-linux-gnu/bits/local_lim.h: + +/usr/include/linux/limits.h: + +/usr/include/x86_64-linux-gnu/bits/posix2_lim.h: + +/usr/include/x86_64-linux-gnu/bits/xopen_lim.h: diff --git a/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_io.Plo b/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_io.Plo new file mode 100644 index 0000000000..34cf899e22 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_io.Plo @@ -0,0 +1,348 @@ +../../external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_io.lo: \ + ../../external/corefx/src/Native/Unix/System.Native/pal_io.c \ + /usr/include/stdc-predef.h \ + /mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_compiler.h \ + pal_config.h ../../config.h \ + ../../external/corefx/src/Native/Unix/System.Native/pal_errno.h \ + /mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_types.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdint.h /usr/include/stdint.h \ + /usr/include/features.h /usr/include/x86_64-linux-gnu/sys/cdefs.h \ + /usr/include/x86_64-linux-gnu/bits/wordsize.h \ + /usr/include/x86_64-linux-gnu/gnu/stubs.h \ + /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \ + /usr/include/x86_64-linux-gnu/bits/wchar.h \ + ../../external/corefx/src/Native/Unix/System.Native/pal_io.h \ + /usr/include/time.h /usr/lib/gcc/x86_64-linux-gnu/4.8/include/stddef.h \ + /usr/include/x86_64-linux-gnu/bits/time.h \ + /usr/include/x86_64-linux-gnu/bits/types.h \ + /usr/include/x86_64-linux-gnu/bits/typesizes.h \ + /usr/include/x86_64-linux-gnu/bits/timex.h /usr/include/xlocale.h \ + /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ + /usr/include/wchar.h /usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdarg.h \ + /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \ + /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \ + /usr/include/x86_64-linux-gnu/bits/stdio.h \ + /usr/include/x86_64-linux-gnu/bits/stdio2.h /usr/include/dirent.h \ + /usr/include/x86_64-linux-gnu/bits/dirent.h \ + /usr/include/x86_64-linux-gnu/bits/posix1_lim.h \ + /usr/include/x86_64-linux-gnu/bits/local_lim.h \ + /usr/include/linux/limits.h /usr/include/x86_64-linux-gnu/sys/types.h \ + /usr/include/endian.h /usr/include/x86_64-linux-gnu/bits/endian.h \ + /usr/include/x86_64-linux-gnu/bits/byteswap.h \ + /usr/include/x86_64-linux-gnu/bits/byteswap-16.h \ + /usr/include/x86_64-linux-gnu/sys/select.h \ + /usr/include/x86_64-linux-gnu/bits/select.h \ + /usr/include/x86_64-linux-gnu/bits/sigset.h \ + /usr/include/x86_64-linux-gnu/bits/select2.h \ + /usr/include/x86_64-linux-gnu/sys/sysmacros.h \ + /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h \ + /mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_utilities.h \ + /usr/include/assert.h /usr/include/errno.h \ + /usr/include/x86_64-linux-gnu/bits/errno.h /usr/include/linux/errno.h \ + /usr/include/x86_64-linux-gnu/asm/errno.h \ + /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdbool.h \ + /usr/include/string.h /usr/include/x86_64-linux-gnu/bits/string.h \ + /usr/include/x86_64-linux-gnu/bits/string2.h /usr/include/stdlib.h \ + /usr/include/x86_64-linux-gnu/bits/string3.h /usr/include/unistd.h \ + /usr/include/x86_64-linux-gnu/bits/posix_opt.h \ + /usr/include/x86_64-linux-gnu/bits/environments.h \ + /usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \ + /usr/include/x86_64-linux-gnu/bits/unistd.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include-fixed/limits.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include-fixed/syslimits.h \ + /usr/include/limits.h /usr/include/x86_64-linux-gnu/bits/posix2_lim.h \ + /usr/include/x86_64-linux-gnu/bits/xopen_lim.h \ + /mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_safecrt.h \ + /usr/include/fcntl.h /usr/include/x86_64-linux-gnu/bits/fcntl.h \ + /usr/include/x86_64-linux-gnu/bits/fcntl-linux.h \ + /usr/include/x86_64-linux-gnu/bits/uio.h \ + /usr/include/x86_64-linux-gnu/bits/stat.h \ + /usr/include/x86_64-linux-gnu/bits/fcntl2.h /usr/include/fnmatch.h \ + /usr/include/poll.h /usr/include/x86_64-linux-gnu/sys/poll.h \ + /usr/include/x86_64-linux-gnu/bits/poll.h \ + /usr/include/x86_64-linux-gnu/bits/poll2.h \ + /usr/include/x86_64-linux-gnu/bits/waitflags.h \ + /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/alloca.h \ + /usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h \ + /usr/include/x86_64-linux-gnu/bits/stdlib-float.h \ + /usr/include/x86_64-linux-gnu/bits/stdlib.h \ + /usr/include/x86_64-linux-gnu/sys/mman.h \ + /usr/include/x86_64-linux-gnu/bits/mman.h \ + /usr/include/x86_64-linux-gnu/bits/mman-linux.h \ + /usr/include/x86_64-linux-gnu/sys/stat.h \ + /usr/include/x86_64-linux-gnu/sys/time.h \ + /usr/include/x86_64-linux-gnu/sys/file.h \ + /usr/include/x86_64-linux-gnu/sys/ioctl.h \ + /usr/include/x86_64-linux-gnu/bits/ioctls.h \ + /usr/include/x86_64-linux-gnu/asm/ioctls.h \ + /usr/include/asm-generic/ioctls.h /usr/include/linux/ioctl.h \ + /usr/include/x86_64-linux-gnu/asm/ioctl.h \ + /usr/include/asm-generic/ioctl.h \ + /usr/include/x86_64-linux-gnu/bits/ioctl-types.h \ + /usr/include/x86_64-linux-gnu/sys/ttydefaults.h \ + /usr/include/x86_64-linux-gnu/sys/socket.h \ + /usr/include/x86_64-linux-gnu/sys/uio.h \ + /usr/include/x86_64-linux-gnu/bits/socket.h \ + /usr/include/x86_64-linux-gnu/bits/socket_type.h \ + /usr/include/x86_64-linux-gnu/bits/sockaddr.h \ + /usr/include/x86_64-linux-gnu/asm/socket.h \ + /usr/include/asm-generic/socket.h \ + /usr/include/x86_64-linux-gnu/asm/sockios.h \ + /usr/include/asm-generic/sockios.h \ + /usr/include/x86_64-linux-gnu/bits/socket2.h /usr/include/syslog.h \ + /usr/include/x86_64-linux-gnu/sys/syslog.h \ + /usr/include/x86_64-linux-gnu/bits/syslog-path.h \ + /usr/include/x86_64-linux-gnu/bits/syslog.h /usr/include/termios.h \ + /usr/include/x86_64-linux-gnu/bits/termios.h \ + /usr/include/x86_64-linux-gnu/sys/sendfile.h \ + /usr/include/x86_64-linux-gnu/sys/inotify.h \ + /usr/include/x86_64-linux-gnu/bits/inotify.h + +/usr/include/stdc-predef.h: + +/mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_compiler.h: + +pal_config.h: + +../../config.h: + +../../external/corefx/src/Native/Unix/System.Native/pal_errno.h: + +/mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_types.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdint.h: + +/usr/include/stdint.h: + +/usr/include/features.h: + +/usr/include/x86_64-linux-gnu/sys/cdefs.h: + +/usr/include/x86_64-linux-gnu/bits/wordsize.h: + +/usr/include/x86_64-linux-gnu/gnu/stubs.h: + +/usr/include/x86_64-linux-gnu/gnu/stubs-64.h: + +/usr/include/x86_64-linux-gnu/bits/wchar.h: + +../../external/corefx/src/Native/Unix/System.Native/pal_io.h: + +/usr/include/time.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include/stddef.h: + +/usr/include/x86_64-linux-gnu/bits/time.h: + +/usr/include/x86_64-linux-gnu/bits/types.h: + +/usr/include/x86_64-linux-gnu/bits/typesizes.h: + +/usr/include/x86_64-linux-gnu/bits/timex.h: + +/usr/include/xlocale.h: + +/usr/include/stdio.h: + +/usr/include/libio.h: + +/usr/include/_G_config.h: + +/usr/include/wchar.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdarg.h: + +/usr/include/x86_64-linux-gnu/bits/stdio_lim.h: + +/usr/include/x86_64-linux-gnu/bits/sys_errlist.h: + +/usr/include/x86_64-linux-gnu/bits/stdio.h: + +/usr/include/x86_64-linux-gnu/bits/stdio2.h: + +/usr/include/dirent.h: + +/usr/include/x86_64-linux-gnu/bits/dirent.h: + +/usr/include/x86_64-linux-gnu/bits/posix1_lim.h: + +/usr/include/x86_64-linux-gnu/bits/local_lim.h: + +/usr/include/linux/limits.h: + +/usr/include/x86_64-linux-gnu/sys/types.h: + +/usr/include/endian.h: + +/usr/include/x86_64-linux-gnu/bits/endian.h: + +/usr/include/x86_64-linux-gnu/bits/byteswap.h: + +/usr/include/x86_64-linux-gnu/bits/byteswap-16.h: + +/usr/include/x86_64-linux-gnu/sys/select.h: + +/usr/include/x86_64-linux-gnu/bits/select.h: + +/usr/include/x86_64-linux-gnu/bits/sigset.h: + +/usr/include/x86_64-linux-gnu/bits/select2.h: + +/usr/include/x86_64-linux-gnu/sys/sysmacros.h: + +/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h: + +/mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_utilities.h: + +/usr/include/assert.h: + +/usr/include/errno.h: + +/usr/include/x86_64-linux-gnu/bits/errno.h: + +/usr/include/linux/errno.h: + +/usr/include/x86_64-linux-gnu/asm/errno.h: + +/usr/include/asm-generic/errno.h: + +/usr/include/asm-generic/errno-base.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdbool.h: + +/usr/include/string.h: + +/usr/include/x86_64-linux-gnu/bits/string.h: + +/usr/include/x86_64-linux-gnu/bits/string2.h: + +/usr/include/stdlib.h: + +/usr/include/x86_64-linux-gnu/bits/string3.h: + +/usr/include/unistd.h: + +/usr/include/x86_64-linux-gnu/bits/posix_opt.h: + +/usr/include/x86_64-linux-gnu/bits/environments.h: + +/usr/include/x86_64-linux-gnu/bits/confname.h: + +/usr/include/getopt.h: + +/usr/include/x86_64-linux-gnu/bits/unistd.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include-fixed/limits.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include-fixed/syslimits.h: + +/usr/include/limits.h: + +/usr/include/x86_64-linux-gnu/bits/posix2_lim.h: + +/usr/include/x86_64-linux-gnu/bits/xopen_lim.h: + +/mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_safecrt.h: + +/usr/include/fcntl.h: + +/usr/include/x86_64-linux-gnu/bits/fcntl.h: + +/usr/include/x86_64-linux-gnu/bits/fcntl-linux.h: + +/usr/include/x86_64-linux-gnu/bits/uio.h: + +/usr/include/x86_64-linux-gnu/bits/stat.h: + +/usr/include/x86_64-linux-gnu/bits/fcntl2.h: + +/usr/include/fnmatch.h: + +/usr/include/poll.h: + +/usr/include/x86_64-linux-gnu/sys/poll.h: + +/usr/include/x86_64-linux-gnu/bits/poll.h: + +/usr/include/x86_64-linux-gnu/bits/poll2.h: + +/usr/include/x86_64-linux-gnu/bits/waitflags.h: + +/usr/include/x86_64-linux-gnu/bits/waitstatus.h: + +/usr/include/alloca.h: + +/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h: + +/usr/include/x86_64-linux-gnu/bits/stdlib-float.h: + +/usr/include/x86_64-linux-gnu/bits/stdlib.h: + +/usr/include/x86_64-linux-gnu/sys/mman.h: + +/usr/include/x86_64-linux-gnu/bits/mman.h: + +/usr/include/x86_64-linux-gnu/bits/mman-linux.h: + +/usr/include/x86_64-linux-gnu/sys/stat.h: + +/usr/include/x86_64-linux-gnu/sys/time.h: + +/usr/include/x86_64-linux-gnu/sys/file.h: + +/usr/include/x86_64-linux-gnu/sys/ioctl.h: + +/usr/include/x86_64-linux-gnu/bits/ioctls.h: + +/usr/include/x86_64-linux-gnu/asm/ioctls.h: + +/usr/include/asm-generic/ioctls.h: + +/usr/include/linux/ioctl.h: + +/usr/include/x86_64-linux-gnu/asm/ioctl.h: + +/usr/include/asm-generic/ioctl.h: + +/usr/include/x86_64-linux-gnu/bits/ioctl-types.h: + +/usr/include/x86_64-linux-gnu/sys/ttydefaults.h: + +/usr/include/x86_64-linux-gnu/sys/socket.h: + +/usr/include/x86_64-linux-gnu/sys/uio.h: + +/usr/include/x86_64-linux-gnu/bits/socket.h: + +/usr/include/x86_64-linux-gnu/bits/socket_type.h: + +/usr/include/x86_64-linux-gnu/bits/sockaddr.h: + +/usr/include/x86_64-linux-gnu/asm/socket.h: + +/usr/include/asm-generic/socket.h: + +/usr/include/x86_64-linux-gnu/asm/sockios.h: + +/usr/include/asm-generic/sockios.h: + +/usr/include/x86_64-linux-gnu/bits/socket2.h: + +/usr/include/syslog.h: + +/usr/include/x86_64-linux-gnu/sys/syslog.h: + +/usr/include/x86_64-linux-gnu/bits/syslog-path.h: + +/usr/include/x86_64-linux-gnu/bits/syslog.h: + +/usr/include/termios.h: + +/usr/include/x86_64-linux-gnu/bits/termios.h: + +/usr/include/x86_64-linux-gnu/sys/sendfile.h: + +/usr/include/x86_64-linux-gnu/sys/inotify.h: + +/usr/include/x86_64-linux-gnu/bits/inotify.h: diff --git a/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_maphardwaretype.Plo b/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_maphardwaretype.Plo new file mode 100644 index 0000000000..5702117ee8 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_maphardwaretype.Plo @@ -0,0 +1,177 @@ +../../external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_maphardwaretype.lo: \ + ../../external/corefx/src/Native/Unix/System.Native/pal_maphardwaretype.c \ + /usr/include/stdc-predef.h pal_config.h ../../config.h \ + ../../external/corefx/src/Native/Unix/System.Native/pal_maphardwaretype.h \ + /mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_compiler.h \ + /mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_types.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdint.h /usr/include/stdint.h \ + /usr/include/features.h /usr/include/x86_64-linux-gnu/sys/cdefs.h \ + /usr/include/x86_64-linux-gnu/bits/wordsize.h \ + /usr/include/x86_64-linux-gnu/gnu/stubs.h \ + /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \ + /usr/include/x86_64-linux-gnu/bits/wchar.h \ + /usr/include/x86_64-linux-gnu/sys/socket.h \ + /usr/include/x86_64-linux-gnu/sys/uio.h \ + /usr/include/x86_64-linux-gnu/sys/types.h \ + /usr/include/x86_64-linux-gnu/bits/types.h \ + /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/time.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include/stddef.h /usr/include/endian.h \ + /usr/include/x86_64-linux-gnu/bits/endian.h \ + /usr/include/x86_64-linux-gnu/bits/byteswap.h \ + /usr/include/x86_64-linux-gnu/bits/byteswap-16.h \ + /usr/include/x86_64-linux-gnu/sys/select.h \ + /usr/include/x86_64-linux-gnu/bits/select.h \ + /usr/include/x86_64-linux-gnu/bits/sigset.h \ + /usr/include/x86_64-linux-gnu/bits/time.h \ + /usr/include/x86_64-linux-gnu/bits/select2.h \ + /usr/include/x86_64-linux-gnu/sys/sysmacros.h \ + /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h \ + /usr/include/x86_64-linux-gnu/bits/uio.h \ + /usr/include/x86_64-linux-gnu/bits/socket.h \ + /usr/include/x86_64-linux-gnu/bits/socket_type.h \ + /usr/include/x86_64-linux-gnu/bits/sockaddr.h \ + /usr/include/x86_64-linux-gnu/asm/socket.h \ + /usr/include/asm-generic/socket.h \ + /usr/include/x86_64-linux-gnu/asm/sockios.h \ + /usr/include/asm-generic/sockios.h \ + /usr/include/x86_64-linux-gnu/bits/socket2.h \ + /usr/include/linux/if_packet.h /usr/include/linux/types.h \ + /usr/include/x86_64-linux-gnu/asm/types.h \ + /usr/include/asm-generic/types.h /usr/include/asm-generic/int-ll64.h \ + /usr/include/x86_64-linux-gnu/asm/bitsperlong.h \ + /usr/include/asm-generic/bitsperlong.h /usr/include/linux/posix_types.h \ + /usr/include/linux/stddef.h \ + /usr/include/x86_64-linux-gnu/asm/posix_types.h \ + /usr/include/x86_64-linux-gnu/asm/posix_types_64.h \ + /usr/include/asm-generic/posix_types.h /usr/include/linux/if_arp.h \ + /usr/include/linux/netdevice.h /usr/include/linux/if.h \ + /usr/include/linux/socket.h /usr/include/linux/hdlc/ioctl.h \ + /usr/include/linux/if_ether.h /usr/include/linux/if_link.h \ + /usr/include/linux/netlink.h /usr/include/linux/kernel.h \ + /usr/include/linux/sysinfo.h + +/usr/include/stdc-predef.h: + +pal_config.h: + +../../config.h: + +../../external/corefx/src/Native/Unix/System.Native/pal_maphardwaretype.h: + +/mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_compiler.h: + +/mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_types.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdint.h: + +/usr/include/stdint.h: + +/usr/include/features.h: + +/usr/include/x86_64-linux-gnu/sys/cdefs.h: + +/usr/include/x86_64-linux-gnu/bits/wordsize.h: + +/usr/include/x86_64-linux-gnu/gnu/stubs.h: + +/usr/include/x86_64-linux-gnu/gnu/stubs-64.h: + +/usr/include/x86_64-linux-gnu/bits/wchar.h: + +/usr/include/x86_64-linux-gnu/sys/socket.h: + +/usr/include/x86_64-linux-gnu/sys/uio.h: + +/usr/include/x86_64-linux-gnu/sys/types.h: + +/usr/include/x86_64-linux-gnu/bits/types.h: + +/usr/include/x86_64-linux-gnu/bits/typesizes.h: + +/usr/include/time.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include/stddef.h: + +/usr/include/endian.h: + +/usr/include/x86_64-linux-gnu/bits/endian.h: + +/usr/include/x86_64-linux-gnu/bits/byteswap.h: + +/usr/include/x86_64-linux-gnu/bits/byteswap-16.h: + +/usr/include/x86_64-linux-gnu/sys/select.h: + +/usr/include/x86_64-linux-gnu/bits/select.h: + +/usr/include/x86_64-linux-gnu/bits/sigset.h: + +/usr/include/x86_64-linux-gnu/bits/time.h: + +/usr/include/x86_64-linux-gnu/bits/select2.h: + +/usr/include/x86_64-linux-gnu/sys/sysmacros.h: + +/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h: + +/usr/include/x86_64-linux-gnu/bits/uio.h: + +/usr/include/x86_64-linux-gnu/bits/socket.h: + +/usr/include/x86_64-linux-gnu/bits/socket_type.h: + +/usr/include/x86_64-linux-gnu/bits/sockaddr.h: + +/usr/include/x86_64-linux-gnu/asm/socket.h: + +/usr/include/asm-generic/socket.h: + +/usr/include/x86_64-linux-gnu/asm/sockios.h: + +/usr/include/asm-generic/sockios.h: + +/usr/include/x86_64-linux-gnu/bits/socket2.h: + +/usr/include/linux/if_packet.h: + +/usr/include/linux/types.h: + +/usr/include/x86_64-linux-gnu/asm/types.h: + +/usr/include/asm-generic/types.h: + +/usr/include/asm-generic/int-ll64.h: + +/usr/include/x86_64-linux-gnu/asm/bitsperlong.h: + +/usr/include/asm-generic/bitsperlong.h: + +/usr/include/linux/posix_types.h: + +/usr/include/linux/stddef.h: + +/usr/include/x86_64-linux-gnu/asm/posix_types.h: + +/usr/include/x86_64-linux-gnu/asm/posix_types_64.h: + +/usr/include/asm-generic/posix_types.h: + +/usr/include/linux/if_arp.h: + +/usr/include/linux/netdevice.h: + +/usr/include/linux/if.h: + +/usr/include/linux/socket.h: + +/usr/include/linux/hdlc/ioctl.h: + +/usr/include/linux/if_ether.h: + +/usr/include/linux/if_link.h: + +/usr/include/linux/netlink.h: + +/usr/include/linux/kernel.h: + +/usr/include/linux/sysinfo.h: diff --git a/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_memory.Plo b/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_memory.Plo new file mode 100644 index 0000000000..7000dcf6c2 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_memory.Plo @@ -0,0 +1,71 @@ +../../external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_memory.lo: \ + ../../external/corefx/src/Native/Unix/System.Native/pal_memory.c \ + /usr/include/stdc-predef.h \ + ../../external/corefx/src/Native/Unix/System.Native/pal_memory.h \ + /mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_compiler.h \ + /mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_types.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdint.h /usr/include/stdint.h \ + /usr/include/features.h /usr/include/x86_64-linux-gnu/sys/cdefs.h \ + /usr/include/x86_64-linux-gnu/bits/wordsize.h \ + /usr/include/x86_64-linux-gnu/gnu/stubs.h \ + /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \ + /usr/include/x86_64-linux-gnu/bits/wchar.h /usr/include/string.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include/stddef.h \ + /usr/include/xlocale.h /usr/include/x86_64-linux-gnu/bits/string.h \ + /usr/include/x86_64-linux-gnu/bits/string2.h /usr/include/endian.h \ + /usr/include/x86_64-linux-gnu/bits/endian.h \ + /usr/include/x86_64-linux-gnu/bits/byteswap.h \ + /usr/include/x86_64-linux-gnu/bits/types.h \ + /usr/include/x86_64-linux-gnu/bits/typesizes.h \ + /usr/include/x86_64-linux-gnu/bits/byteswap-16.h /usr/include/stdlib.h \ + /usr/include/x86_64-linux-gnu/bits/string3.h + +/usr/include/stdc-predef.h: + +../../external/corefx/src/Native/Unix/System.Native/pal_memory.h: + +/mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_compiler.h: + +/mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_types.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdint.h: + +/usr/include/stdint.h: + +/usr/include/features.h: + +/usr/include/x86_64-linux-gnu/sys/cdefs.h: + +/usr/include/x86_64-linux-gnu/bits/wordsize.h: + +/usr/include/x86_64-linux-gnu/gnu/stubs.h: + +/usr/include/x86_64-linux-gnu/gnu/stubs-64.h: + +/usr/include/x86_64-linux-gnu/bits/wchar.h: + +/usr/include/string.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include/stddef.h: + +/usr/include/xlocale.h: + +/usr/include/x86_64-linux-gnu/bits/string.h: + +/usr/include/x86_64-linux-gnu/bits/string2.h: + +/usr/include/endian.h: + +/usr/include/x86_64-linux-gnu/bits/endian.h: + +/usr/include/x86_64-linux-gnu/bits/byteswap.h: + +/usr/include/x86_64-linux-gnu/bits/types.h: + +/usr/include/x86_64-linux-gnu/bits/typesizes.h: + +/usr/include/x86_64-linux-gnu/bits/byteswap-16.h: + +/usr/include/stdlib.h: + +/usr/include/x86_64-linux-gnu/bits/string3.h: diff --git a/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_networking.Plo b/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_networking.Plo new file mode 100644 index 0000000000..8b21bac27d --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_networking.Plo @@ -0,0 +1,336 @@ +../../external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_networking.lo: \ + ../../external/corefx/src/Native/Unix/System.Native/pal_networking.c \ + /usr/include/stdc-predef.h pal_config.h ../../config.h \ + ../../external/corefx/src/Native/Unix/System.Native/pal_networking.h \ + /mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_compiler.h \ + /mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_types.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdint.h /usr/include/stdint.h \ + /usr/include/features.h /usr/include/x86_64-linux-gnu/sys/cdefs.h \ + /usr/include/x86_64-linux-gnu/bits/wordsize.h \ + /usr/include/x86_64-linux-gnu/gnu/stubs.h \ + /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \ + /usr/include/x86_64-linux-gnu/bits/wchar.h \ + ../../external/corefx/src/Native/Unix/System.Native/pal_errno.h \ + ../../external/corefx/src/Native/Unix/System.Native/pal_io.h \ + /usr/include/time.h /usr/lib/gcc/x86_64-linux-gnu/4.8/include/stddef.h \ + /usr/include/x86_64-linux-gnu/bits/time.h \ + /usr/include/x86_64-linux-gnu/bits/types.h \ + /usr/include/x86_64-linux-gnu/bits/typesizes.h \ + /usr/include/x86_64-linux-gnu/bits/timex.h /usr/include/xlocale.h \ + /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ + /usr/include/wchar.h /usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdarg.h \ + /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \ + /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \ + /usr/include/x86_64-linux-gnu/bits/stdio.h \ + /usr/include/x86_64-linux-gnu/bits/stdio2.h /usr/include/dirent.h \ + /usr/include/x86_64-linux-gnu/bits/dirent.h \ + /usr/include/x86_64-linux-gnu/bits/posix1_lim.h \ + /usr/include/x86_64-linux-gnu/bits/local_lim.h \ + /usr/include/linux/limits.h /usr/include/x86_64-linux-gnu/sys/types.h \ + /usr/include/endian.h /usr/include/x86_64-linux-gnu/bits/endian.h \ + /usr/include/x86_64-linux-gnu/bits/byteswap.h \ + /usr/include/x86_64-linux-gnu/bits/byteswap-16.h \ + /usr/include/x86_64-linux-gnu/sys/select.h \ + /usr/include/x86_64-linux-gnu/bits/select.h \ + /usr/include/x86_64-linux-gnu/bits/sigset.h \ + /usr/include/x86_64-linux-gnu/bits/select2.h \ + /usr/include/x86_64-linux-gnu/sys/sysmacros.h \ + /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h \ + /mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_safecrt.h \ + /usr/include/string.h /usr/include/x86_64-linux-gnu/bits/string.h \ + /usr/include/x86_64-linux-gnu/bits/string2.h /usr/include/stdlib.h \ + /usr/include/x86_64-linux-gnu/bits/string3.h /usr/include/assert.h \ + /usr/include/errno.h /usr/include/x86_64-linux-gnu/bits/errno.h \ + /usr/include/linux/errno.h /usr/include/x86_64-linux-gnu/asm/errno.h \ + /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdbool.h \ + /mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_utilities.h \ + /usr/include/unistd.h /usr/include/x86_64-linux-gnu/bits/posix_opt.h \ + /usr/include/x86_64-linux-gnu/bits/environments.h \ + /usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \ + /usr/include/x86_64-linux-gnu/bits/unistd.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include-fixed/limits.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include-fixed/syslimits.h \ + /usr/include/limits.h /usr/include/x86_64-linux-gnu/bits/posix2_lim.h \ + /usr/include/x86_64-linux-gnu/bits/xopen_lim.h /usr/include/fcntl.h \ + /usr/include/x86_64-linux-gnu/bits/fcntl.h \ + /usr/include/x86_64-linux-gnu/bits/fcntl-linux.h \ + /usr/include/x86_64-linux-gnu/bits/uio.h \ + /usr/include/x86_64-linux-gnu/bits/stat.h \ + /usr/include/x86_64-linux-gnu/bits/fcntl2.h \ + /usr/include/x86_64-linux-gnu/bits/waitflags.h \ + /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/alloca.h \ + /usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h \ + /usr/include/x86_64-linux-gnu/bits/stdlib-float.h \ + /usr/include/x86_64-linux-gnu/bits/stdlib.h /usr/include/pthread.h \ + /usr/include/sched.h /usr/include/x86_64-linux-gnu/bits/sched.h \ + /usr/include/x86_64-linux-gnu/bits/setjmp.h /usr/include/arpa/inet.h \ + /usr/include/netinet/in.h /usr/include/x86_64-linux-gnu/sys/socket.h \ + /usr/include/x86_64-linux-gnu/sys/uio.h \ + /usr/include/x86_64-linux-gnu/bits/socket.h \ + /usr/include/x86_64-linux-gnu/bits/socket_type.h \ + /usr/include/x86_64-linux-gnu/bits/sockaddr.h \ + /usr/include/x86_64-linux-gnu/asm/socket.h \ + /usr/include/asm-generic/socket.h \ + /usr/include/x86_64-linux-gnu/asm/sockios.h \ + /usr/include/asm-generic/sockios.h \ + /usr/include/x86_64-linux-gnu/bits/socket2.h \ + /usr/include/x86_64-linux-gnu/bits/in.h \ + /usr/include/x86_64-linux-gnu/sys/epoll.h \ + /usr/include/x86_64-linux-gnu/bits/epoll.h /usr/include/netdb.h \ + /usr/include/rpc/netdb.h /usr/include/x86_64-linux-gnu/bits/siginfo.h \ + /usr/include/x86_64-linux-gnu/bits/netdb.h /usr/include/netinet/tcp.h \ + /usr/include/x86_64-linux-gnu/sys/ioctl.h \ + /usr/include/x86_64-linux-gnu/bits/ioctls.h \ + /usr/include/x86_64-linux-gnu/asm/ioctls.h \ + /usr/include/asm-generic/ioctls.h /usr/include/linux/ioctl.h \ + /usr/include/x86_64-linux-gnu/asm/ioctl.h \ + /usr/include/asm-generic/ioctl.h \ + /usr/include/x86_64-linux-gnu/bits/ioctl-types.h \ + /usr/include/x86_64-linux-gnu/sys/ttydefaults.h \ + /usr/include/x86_64-linux-gnu/sys/un.h /usr/include/pwd.h \ + /usr/include/x86_64-linux-gnu/sys/sendfile.h + +/usr/include/stdc-predef.h: + +pal_config.h: + +../../config.h: + +../../external/corefx/src/Native/Unix/System.Native/pal_networking.h: + +/mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_compiler.h: + +/mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_types.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdint.h: + +/usr/include/stdint.h: + +/usr/include/features.h: + +/usr/include/x86_64-linux-gnu/sys/cdefs.h: + +/usr/include/x86_64-linux-gnu/bits/wordsize.h: + +/usr/include/x86_64-linux-gnu/gnu/stubs.h: + +/usr/include/x86_64-linux-gnu/gnu/stubs-64.h: + +/usr/include/x86_64-linux-gnu/bits/wchar.h: + +../../external/corefx/src/Native/Unix/System.Native/pal_errno.h: + +../../external/corefx/src/Native/Unix/System.Native/pal_io.h: + +/usr/include/time.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include/stddef.h: + +/usr/include/x86_64-linux-gnu/bits/time.h: + +/usr/include/x86_64-linux-gnu/bits/types.h: + +/usr/include/x86_64-linux-gnu/bits/typesizes.h: + +/usr/include/x86_64-linux-gnu/bits/timex.h: + +/usr/include/xlocale.h: + +/usr/include/stdio.h: + +/usr/include/libio.h: + +/usr/include/_G_config.h: + +/usr/include/wchar.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdarg.h: + +/usr/include/x86_64-linux-gnu/bits/stdio_lim.h: + +/usr/include/x86_64-linux-gnu/bits/sys_errlist.h: + +/usr/include/x86_64-linux-gnu/bits/stdio.h: + +/usr/include/x86_64-linux-gnu/bits/stdio2.h: + +/usr/include/dirent.h: + +/usr/include/x86_64-linux-gnu/bits/dirent.h: + +/usr/include/x86_64-linux-gnu/bits/posix1_lim.h: + +/usr/include/x86_64-linux-gnu/bits/local_lim.h: + +/usr/include/linux/limits.h: + +/usr/include/x86_64-linux-gnu/sys/types.h: + +/usr/include/endian.h: + +/usr/include/x86_64-linux-gnu/bits/endian.h: + +/usr/include/x86_64-linux-gnu/bits/byteswap.h: + +/usr/include/x86_64-linux-gnu/bits/byteswap-16.h: + +/usr/include/x86_64-linux-gnu/sys/select.h: + +/usr/include/x86_64-linux-gnu/bits/select.h: + +/usr/include/x86_64-linux-gnu/bits/sigset.h: + +/usr/include/x86_64-linux-gnu/bits/select2.h: + +/usr/include/x86_64-linux-gnu/sys/sysmacros.h: + +/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h: + +/mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_safecrt.h: + +/usr/include/string.h: + +/usr/include/x86_64-linux-gnu/bits/string.h: + +/usr/include/x86_64-linux-gnu/bits/string2.h: + +/usr/include/stdlib.h: + +/usr/include/x86_64-linux-gnu/bits/string3.h: + +/usr/include/assert.h: + +/usr/include/errno.h: + +/usr/include/x86_64-linux-gnu/bits/errno.h: + +/usr/include/linux/errno.h: + +/usr/include/x86_64-linux-gnu/asm/errno.h: + +/usr/include/asm-generic/errno.h: + +/usr/include/asm-generic/errno-base.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdbool.h: + +/mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_utilities.h: + +/usr/include/unistd.h: + +/usr/include/x86_64-linux-gnu/bits/posix_opt.h: + +/usr/include/x86_64-linux-gnu/bits/environments.h: + +/usr/include/x86_64-linux-gnu/bits/confname.h: + +/usr/include/getopt.h: + +/usr/include/x86_64-linux-gnu/bits/unistd.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include-fixed/limits.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include-fixed/syslimits.h: + +/usr/include/limits.h: + +/usr/include/x86_64-linux-gnu/bits/posix2_lim.h: + +/usr/include/x86_64-linux-gnu/bits/xopen_lim.h: + +/usr/include/fcntl.h: + +/usr/include/x86_64-linux-gnu/bits/fcntl.h: + +/usr/include/x86_64-linux-gnu/bits/fcntl-linux.h: + +/usr/include/x86_64-linux-gnu/bits/uio.h: + +/usr/include/x86_64-linux-gnu/bits/stat.h: + +/usr/include/x86_64-linux-gnu/bits/fcntl2.h: + +/usr/include/x86_64-linux-gnu/bits/waitflags.h: + +/usr/include/x86_64-linux-gnu/bits/waitstatus.h: + +/usr/include/alloca.h: + +/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h: + +/usr/include/x86_64-linux-gnu/bits/stdlib-float.h: + +/usr/include/x86_64-linux-gnu/bits/stdlib.h: + +/usr/include/pthread.h: + +/usr/include/sched.h: + +/usr/include/x86_64-linux-gnu/bits/sched.h: + +/usr/include/x86_64-linux-gnu/bits/setjmp.h: + +/usr/include/arpa/inet.h: + +/usr/include/netinet/in.h: + +/usr/include/x86_64-linux-gnu/sys/socket.h: + +/usr/include/x86_64-linux-gnu/sys/uio.h: + +/usr/include/x86_64-linux-gnu/bits/socket.h: + +/usr/include/x86_64-linux-gnu/bits/socket_type.h: + +/usr/include/x86_64-linux-gnu/bits/sockaddr.h: + +/usr/include/x86_64-linux-gnu/asm/socket.h: + +/usr/include/asm-generic/socket.h: + +/usr/include/x86_64-linux-gnu/asm/sockios.h: + +/usr/include/asm-generic/sockios.h: + +/usr/include/x86_64-linux-gnu/bits/socket2.h: + +/usr/include/x86_64-linux-gnu/bits/in.h: + +/usr/include/x86_64-linux-gnu/sys/epoll.h: + +/usr/include/x86_64-linux-gnu/bits/epoll.h: + +/usr/include/netdb.h: + +/usr/include/rpc/netdb.h: + +/usr/include/x86_64-linux-gnu/bits/siginfo.h: + +/usr/include/x86_64-linux-gnu/bits/netdb.h: + +/usr/include/netinet/tcp.h: + +/usr/include/x86_64-linux-gnu/sys/ioctl.h: + +/usr/include/x86_64-linux-gnu/bits/ioctls.h: + +/usr/include/x86_64-linux-gnu/asm/ioctls.h: + +/usr/include/asm-generic/ioctls.h: + +/usr/include/linux/ioctl.h: + +/usr/include/x86_64-linux-gnu/asm/ioctl.h: + +/usr/include/asm-generic/ioctl.h: + +/usr/include/x86_64-linux-gnu/bits/ioctl-types.h: + +/usr/include/x86_64-linux-gnu/sys/ttydefaults.h: + +/usr/include/x86_64-linux-gnu/sys/un.h: + +/usr/include/pwd.h: + +/usr/include/x86_64-linux-gnu/sys/sendfile.h: diff --git a/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_networkstatistics.Plo b/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_networkstatistics.Plo new file mode 100644 index 0000000000..c55e604615 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_networkstatistics.Plo @@ -0,0 +1,9 @@ +../../external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_networkstatistics.lo: \ + ../../external/corefx/src/Native/Unix/System.Native/pal_networkstatistics.c \ + /usr/include/stdc-predef.h pal_config.h ../../config.h + +/usr/include/stdc-predef.h: + +pal_config.h: + +../../config.h: diff --git a/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_random.Plo b/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_random.Plo new file mode 100644 index 0000000000..123c072ec9 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_random.Plo @@ -0,0 +1,167 @@ +../../external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_random.lo: \ + ../../external/corefx/src/Native/Unix/System.Native/pal_random.c \ + /usr/include/stdc-predef.h /usr/include/stdlib.h /usr/include/features.h \ + /usr/include/x86_64-linux-gnu/sys/cdefs.h \ + /usr/include/x86_64-linux-gnu/bits/wordsize.h \ + /usr/include/x86_64-linux-gnu/gnu/stubs.h \ + /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include/stddef.h \ + /usr/include/x86_64-linux-gnu/bits/waitflags.h \ + /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \ + /usr/include/x86_64-linux-gnu/bits/endian.h \ + /usr/include/x86_64-linux-gnu/bits/byteswap.h \ + /usr/include/x86_64-linux-gnu/bits/types.h \ + /usr/include/x86_64-linux-gnu/bits/typesizes.h \ + /usr/include/x86_64-linux-gnu/bits/byteswap-16.h /usr/include/xlocale.h \ + /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \ + /usr/include/x86_64-linux-gnu/sys/select.h \ + /usr/include/x86_64-linux-gnu/bits/select.h \ + /usr/include/x86_64-linux-gnu/bits/sigset.h \ + /usr/include/x86_64-linux-gnu/bits/time.h \ + /usr/include/x86_64-linux-gnu/bits/select2.h \ + /usr/include/x86_64-linux-gnu/sys/sysmacros.h \ + /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \ + /usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h \ + /usr/include/x86_64-linux-gnu/bits/stdlib-float.h \ + /usr/include/x86_64-linux-gnu/bits/stdlib.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdint.h /usr/include/stdint.h \ + /usr/include/x86_64-linux-gnu/bits/wchar.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdbool.h \ + /usr/include/x86_64-linux-gnu/sys/stat.h \ + /usr/include/x86_64-linux-gnu/bits/stat.h /usr/include/fcntl.h \ + /usr/include/x86_64-linux-gnu/bits/fcntl.h \ + /usr/include/x86_64-linux-gnu/bits/fcntl-linux.h \ + /usr/include/x86_64-linux-gnu/bits/uio.h \ + /usr/include/x86_64-linux-gnu/bits/fcntl2.h /usr/include/assert.h \ + /usr/include/unistd.h /usr/include/x86_64-linux-gnu/bits/posix_opt.h \ + /usr/include/x86_64-linux-gnu/bits/environments.h \ + /usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \ + /usr/include/x86_64-linux-gnu/bits/unistd.h \ + /usr/include/x86_64-linux-gnu/bits/timex.h /usr/include/errno.h \ + /usr/include/x86_64-linux-gnu/bits/errno.h /usr/include/linux/errno.h \ + /usr/include/x86_64-linux-gnu/asm/errno.h \ + /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \ + pal_config.h ../../config.h \ + ../../external/corefx/src/Native/Unix/System.Native/pal_random.h \ + /mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_compiler.h \ + /mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_types.h + +/usr/include/stdc-predef.h: + +/usr/include/stdlib.h: + +/usr/include/features.h: + +/usr/include/x86_64-linux-gnu/sys/cdefs.h: + +/usr/include/x86_64-linux-gnu/bits/wordsize.h: + +/usr/include/x86_64-linux-gnu/gnu/stubs.h: + +/usr/include/x86_64-linux-gnu/gnu/stubs-64.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include/stddef.h: + +/usr/include/x86_64-linux-gnu/bits/waitflags.h: + +/usr/include/x86_64-linux-gnu/bits/waitstatus.h: + +/usr/include/endian.h: + +/usr/include/x86_64-linux-gnu/bits/endian.h: + +/usr/include/x86_64-linux-gnu/bits/byteswap.h: + +/usr/include/x86_64-linux-gnu/bits/types.h: + +/usr/include/x86_64-linux-gnu/bits/typesizes.h: + +/usr/include/x86_64-linux-gnu/bits/byteswap-16.h: + +/usr/include/xlocale.h: + +/usr/include/x86_64-linux-gnu/sys/types.h: + +/usr/include/time.h: + +/usr/include/x86_64-linux-gnu/sys/select.h: + +/usr/include/x86_64-linux-gnu/bits/select.h: + +/usr/include/x86_64-linux-gnu/bits/sigset.h: + +/usr/include/x86_64-linux-gnu/bits/time.h: + +/usr/include/x86_64-linux-gnu/bits/select2.h: + +/usr/include/x86_64-linux-gnu/sys/sysmacros.h: + +/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h: + +/usr/include/alloca.h: + +/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h: + +/usr/include/x86_64-linux-gnu/bits/stdlib-float.h: + +/usr/include/x86_64-linux-gnu/bits/stdlib.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdint.h: + +/usr/include/stdint.h: + +/usr/include/x86_64-linux-gnu/bits/wchar.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdbool.h: + +/usr/include/x86_64-linux-gnu/sys/stat.h: + +/usr/include/x86_64-linux-gnu/bits/stat.h: + +/usr/include/fcntl.h: + +/usr/include/x86_64-linux-gnu/bits/fcntl.h: + +/usr/include/x86_64-linux-gnu/bits/fcntl-linux.h: + +/usr/include/x86_64-linux-gnu/bits/uio.h: + +/usr/include/x86_64-linux-gnu/bits/fcntl2.h: + +/usr/include/assert.h: + +/usr/include/unistd.h: + +/usr/include/x86_64-linux-gnu/bits/posix_opt.h: + +/usr/include/x86_64-linux-gnu/bits/environments.h: + +/usr/include/x86_64-linux-gnu/bits/confname.h: + +/usr/include/getopt.h: + +/usr/include/x86_64-linux-gnu/bits/unistd.h: + +/usr/include/x86_64-linux-gnu/bits/timex.h: + +/usr/include/errno.h: + +/usr/include/x86_64-linux-gnu/bits/errno.h: + +/usr/include/linux/errno.h: + +/usr/include/x86_64-linux-gnu/asm/errno.h: + +/usr/include/asm-generic/errno.h: + +/usr/include/asm-generic/errno-base.h: + +pal_config.h: + +../../config.h: + +../../external/corefx/src/Native/Unix/System.Native/pal_random.h: + +/mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_compiler.h: + +/mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_types.h: diff --git a/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_tcpstate.Plo b/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_tcpstate.Plo new file mode 100644 index 0000000000..2b3a6c88c6 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/.deps/libmono_system_native_la-pal_tcpstate.Plo @@ -0,0 +1,121 @@ +../../external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_tcpstate.lo: \ + ../../external/corefx/src/Native/Unix/System.Native/pal_tcpstate.c \ + /usr/include/stdc-predef.h pal_config.h ../../config.h \ + /mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_types.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdint.h /usr/include/stdint.h \ + /usr/include/features.h /usr/include/x86_64-linux-gnu/sys/cdefs.h \ + /usr/include/x86_64-linux-gnu/bits/wordsize.h \ + /usr/include/x86_64-linux-gnu/gnu/stubs.h \ + /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \ + /usr/include/x86_64-linux-gnu/bits/wchar.h \ + ../../external/corefx/src/Native/Unix/System.Native/pal_tcpstate.h \ + /mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_compiler.h \ + /usr/include/netinet/tcp.h /usr/include/x86_64-linux-gnu/sys/types.h \ + /usr/include/x86_64-linux-gnu/bits/types.h \ + /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/time.h \ + /usr/lib/gcc/x86_64-linux-gnu/4.8/include/stddef.h /usr/include/endian.h \ + /usr/include/x86_64-linux-gnu/bits/endian.h \ + /usr/include/x86_64-linux-gnu/bits/byteswap.h \ + /usr/include/x86_64-linux-gnu/bits/byteswap-16.h \ + /usr/include/x86_64-linux-gnu/sys/select.h \ + /usr/include/x86_64-linux-gnu/bits/select.h \ + /usr/include/x86_64-linux-gnu/bits/sigset.h \ + /usr/include/x86_64-linux-gnu/bits/time.h \ + /usr/include/x86_64-linux-gnu/bits/select2.h \ + /usr/include/x86_64-linux-gnu/sys/sysmacros.h \ + /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h \ + /usr/include/x86_64-linux-gnu/sys/socket.h \ + /usr/include/x86_64-linux-gnu/sys/uio.h \ + /usr/include/x86_64-linux-gnu/bits/uio.h \ + /usr/include/x86_64-linux-gnu/bits/socket.h \ + /usr/include/x86_64-linux-gnu/bits/socket_type.h \ + /usr/include/x86_64-linux-gnu/bits/sockaddr.h \ + /usr/include/x86_64-linux-gnu/asm/socket.h \ + /usr/include/asm-generic/socket.h \ + /usr/include/x86_64-linux-gnu/asm/sockios.h \ + /usr/include/asm-generic/sockios.h \ + /usr/include/x86_64-linux-gnu/bits/socket2.h + +/usr/include/stdc-predef.h: + +pal_config.h: + +../../config.h: + +/mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_types.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include/stdint.h: + +/usr/include/stdint.h: + +/usr/include/features.h: + +/usr/include/x86_64-linux-gnu/sys/cdefs.h: + +/usr/include/x86_64-linux-gnu/bits/wordsize.h: + +/usr/include/x86_64-linux-gnu/gnu/stubs.h: + +/usr/include/x86_64-linux-gnu/gnu/stubs-64.h: + +/usr/include/x86_64-linux-gnu/bits/wchar.h: + +../../external/corefx/src/Native/Unix/System.Native/pal_tcpstate.h: + +/mnt/jenkins/workspace/release-tarball-mono/external/corefx/src/Native/Unix/Common/pal_compiler.h: + +/usr/include/netinet/tcp.h: + +/usr/include/x86_64-linux-gnu/sys/types.h: + +/usr/include/x86_64-linux-gnu/bits/types.h: + +/usr/include/x86_64-linux-gnu/bits/typesizes.h: + +/usr/include/time.h: + +/usr/lib/gcc/x86_64-linux-gnu/4.8/include/stddef.h: + +/usr/include/endian.h: + +/usr/include/x86_64-linux-gnu/bits/endian.h: + +/usr/include/x86_64-linux-gnu/bits/byteswap.h: + +/usr/include/x86_64-linux-gnu/bits/byteswap-16.h: + +/usr/include/x86_64-linux-gnu/sys/select.h: + +/usr/include/x86_64-linux-gnu/bits/select.h: + +/usr/include/x86_64-linux-gnu/bits/sigset.h: + +/usr/include/x86_64-linux-gnu/bits/time.h: + +/usr/include/x86_64-linux-gnu/bits/select2.h: + +/usr/include/x86_64-linux-gnu/sys/sysmacros.h: + +/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h: + +/usr/include/x86_64-linux-gnu/sys/socket.h: + +/usr/include/x86_64-linux-gnu/sys/uio.h: + +/usr/include/x86_64-linux-gnu/bits/uio.h: + +/usr/include/x86_64-linux-gnu/bits/socket.h: + +/usr/include/x86_64-linux-gnu/bits/socket_type.h: + +/usr/include/x86_64-linux-gnu/bits/sockaddr.h: + +/usr/include/x86_64-linux-gnu/asm/socket.h: + +/usr/include/asm-generic/socket.h: + +/usr/include/x86_64-linux-gnu/asm/sockios.h: + +/usr/include/asm-generic/sockios.h: + +/usr/include/x86_64-linux-gnu/bits/socket2.h: diff --git a/external/corefx/src/Native/Unix/System.Native/.dirstamp b/external/corefx/src/Native/Unix/System.Native/.dirstamp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_errno.o b/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_errno.o new file mode 100644 index 0000000000..a3ee39e528 Binary files /dev/null and b/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_errno.o differ diff --git a/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_io.o.REMOVED.git-id b/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_io.o.REMOVED.git-id new file mode 100644 index 0000000000..462559a4fd --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_io.o.REMOVED.git-id @@ -0,0 +1 @@ +0b6395439048c64f028d1a6ce60f24832e49662f \ No newline at end of file diff --git a/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_maphardwaretype.o b/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_maphardwaretype.o new file mode 100644 index 0000000000..caeea169fb Binary files /dev/null and b/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_maphardwaretype.o differ diff --git a/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_memory.o b/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_memory.o new file mode 100644 index 0000000000..8d7f61afb9 Binary files /dev/null and b/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_memory.o differ diff --git a/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_networking.o.REMOVED.git-id b/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_networking.o.REMOVED.git-id new file mode 100644 index 0000000000..ce4a3a11c7 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_networking.o.REMOVED.git-id @@ -0,0 +1 @@ +43e79bb02715ef88b41fd6dc800e96b3f58ff973 \ No newline at end of file diff --git a/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_networkstatistics.o b/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_networkstatistics.o new file mode 100644 index 0000000000..de4dd7de85 Binary files /dev/null and b/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_networkstatistics.o differ diff --git a/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_random.o b/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_random.o new file mode 100644 index 0000000000..951c084145 Binary files /dev/null and b/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_random.o differ diff --git a/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_tcpstate.o b/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_tcpstate.o new file mode 100644 index 0000000000..de26869ddc Binary files /dev/null and b/external/corefx/src/Native/Unix/System.Native/.libs/libmono_system_native_la-pal_tcpstate.o differ diff --git a/external/corefx/src/Native/Unix/System.Native/CMakeLists.txt b/external/corefx/src/Native/Unix/System.Native/CMakeLists.txt index 9b36d9ae51..3651796302 100644 --- a/external/corefx/src/Native/Unix/System.Native/CMakeLists.txt +++ b/external/corefx/src/Native/Unix/System.Native/CMakeLists.txt @@ -1,9 +1,12 @@ project(System.Native) +# We mark the function which needs exporting with DLLEXPORT +add_compile_options(-fvisibility=hidden) + set(NATIVE_SOURCES pal_console.cpp pal_errno.c - pal_interfaceaddresses.cpp + pal_interfaceaddresses.c pal_io.c pal_maphardwaretype.c pal_memory.c @@ -11,9 +14,10 @@ set(NATIVE_SOURCES pal_networking.c pal_networkstatistics.c pal_process.cpp - pal_random.cpp + pal_random.c pal_runtimeinformation.cpp pal_runtimeextensions.cpp + pal_signal.c pal_string.cpp pal_tcpstate.c pal_time.cpp diff --git a/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_errno.lo b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_errno.lo new file mode 100644 index 0000000000..c7782dde33 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_errno.lo @@ -0,0 +1,4 @@ +# ../../external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_errno.lo - a libtool object file +# Generated by doltcompile, not libtool +pic_object='.libs/libmono_system_native_la-pal_errno.o' +non_pic_object='libmono_system_native_la-pal_errno.o' diff --git a/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_errno.o b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_errno.o new file mode 100644 index 0000000000..76faa99224 Binary files /dev/null and b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_errno.o differ diff --git a/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_io.lo b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_io.lo new file mode 100644 index 0000000000..3a96b8aecd --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_io.lo @@ -0,0 +1,4 @@ +# ../../external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_io.lo - a libtool object file +# Generated by doltcompile, not libtool +pic_object='.libs/libmono_system_native_la-pal_io.o' +non_pic_object='libmono_system_native_la-pal_io.o' diff --git a/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_io.o.REMOVED.git-id b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_io.o.REMOVED.git-id new file mode 100644 index 0000000000..4d2e62b974 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_io.o.REMOVED.git-id @@ -0,0 +1 @@ +b42726008d127699b52b925977d223d6e417b7cf \ No newline at end of file diff --git a/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_maphardwaretype.lo b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_maphardwaretype.lo new file mode 100644 index 0000000000..93dcd4e11e --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_maphardwaretype.lo @@ -0,0 +1,4 @@ +# ../../external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_maphardwaretype.lo - a libtool object file +# Generated by doltcompile, not libtool +pic_object='.libs/libmono_system_native_la-pal_maphardwaretype.o' +non_pic_object='libmono_system_native_la-pal_maphardwaretype.o' diff --git a/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_maphardwaretype.o b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_maphardwaretype.o new file mode 100644 index 0000000000..26e9ed6eb4 Binary files /dev/null and b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_maphardwaretype.o differ diff --git a/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_memory.lo b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_memory.lo new file mode 100644 index 0000000000..c3860be2f5 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_memory.lo @@ -0,0 +1,4 @@ +# ../../external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_memory.lo - a libtool object file +# Generated by doltcompile, not libtool +pic_object='.libs/libmono_system_native_la-pal_memory.o' +non_pic_object='libmono_system_native_la-pal_memory.o' diff --git a/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_memory.o b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_memory.o new file mode 100644 index 0000000000..f268685f71 Binary files /dev/null and b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_memory.o differ diff --git a/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_networking.lo b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_networking.lo new file mode 100644 index 0000000000..28da07d926 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_networking.lo @@ -0,0 +1,4 @@ +# ../../external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_networking.lo - a libtool object file +# Generated by doltcompile, not libtool +pic_object='.libs/libmono_system_native_la-pal_networking.o' +non_pic_object='libmono_system_native_la-pal_networking.o' diff --git a/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_networking.o.REMOVED.git-id b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_networking.o.REMOVED.git-id new file mode 100644 index 0000000000..20204d5de3 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_networking.o.REMOVED.git-id @@ -0,0 +1 @@ +9b782c31cf1cda31f6ee1a3b9e12cf3bd723fb30 \ No newline at end of file diff --git a/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_networkstatistics.lo b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_networkstatistics.lo new file mode 100644 index 0000000000..65579db051 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_networkstatistics.lo @@ -0,0 +1,4 @@ +# ../../external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_networkstatistics.lo - a libtool object file +# Generated by doltcompile, not libtool +pic_object='.libs/libmono_system_native_la-pal_networkstatistics.o' +non_pic_object='libmono_system_native_la-pal_networkstatistics.o' diff --git a/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_networkstatistics.o b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_networkstatistics.o new file mode 100644 index 0000000000..de4dd7de85 Binary files /dev/null and b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_networkstatistics.o differ diff --git a/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_random.lo b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_random.lo new file mode 100644 index 0000000000..b856dbd7f8 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_random.lo @@ -0,0 +1,4 @@ +# ../../external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_random.lo - a libtool object file +# Generated by doltcompile, not libtool +pic_object='.libs/libmono_system_native_la-pal_random.o' +non_pic_object='libmono_system_native_la-pal_random.o' diff --git a/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_random.o b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_random.o new file mode 100644 index 0000000000..ae5f08b793 Binary files /dev/null and b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_random.o differ diff --git a/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_tcpstate.lo b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_tcpstate.lo new file mode 100644 index 0000000000..ec49835c53 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_tcpstate.lo @@ -0,0 +1,4 @@ +# ../../external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_tcpstate.lo - a libtool object file +# Generated by doltcompile, not libtool +pic_object='.libs/libmono_system_native_la-pal_tcpstate.o' +non_pic_object='libmono_system_native_la-pal_tcpstate.o' diff --git a/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_tcpstate.o b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_tcpstate.o new file mode 100644 index 0000000000..1e12d419bc Binary files /dev/null and b/external/corefx/src/Native/Unix/System.Native/libmono_system_native_la-pal_tcpstate.o differ diff --git a/external/corefx/src/Native/Unix/System.Native/pal_console.cpp b/external/corefx/src/Native/Unix/System.Native/pal_console.cpp index 2a7454e7a2..0bb51d2606 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_console.cpp +++ b/external/corefx/src/Native/Unix/System.Native/pal_console.cpp @@ -4,14 +4,12 @@ #include "pal_config.h" #include "pal_console.h" -#include "pal_io.h" #include "pal_utilities.h" +#include "pal_signal.h" #include #include #include -#include -#include #include #include #include @@ -80,8 +78,11 @@ static struct termios g_initTermios = {}; // the initial attributes captured static struct termios g_preReadTermios = {}; // the original attributes captured before a read; valid if g_readInProgress is true static struct termios g_currTermios = {}; // the current attributes set during a read; valid if g_readInProgress is true -static void UninitializeConsole() +void UninitializeConsole() { + // pal_signal.cpp calls this on SIGQUIT/SIGINT. + // This can happen when SystemNative_InitializeConsole was not called. + // Put the attributes back to what they were when the console was initially initialized. // We only do so, however, if we have explicitly modified the termios; doing so always // can result in problems if the app is in the background, as then attempting to call @@ -107,7 +108,7 @@ static void IncorporateBreak(struct termios *termios, int32_t signalForBreak) termios->c_lflag &= static_cast(~ISIG); } -// In order to support Console.ReadKey(intecept: true), we need to disable echo and canonical mode. +// In order to support Console.ReadKey(intercept: true), we need to disable echo and canonical mode. // We have two main choices: do so for the entire app, or do so only while in the Console.ReadKey(true). // The former has a huge downside: the terminal is in a non-echo state, so anything else that runs // in the same terminal won't echo even if it expects to, e.g. using Process.Start to launch an interactive, @@ -300,36 +301,11 @@ extern "C" int32_t SystemNative_SetSignalForBreak(int32_t signalForBreak) return 0; } -static struct sigaction g_origSigIntHandler, g_origSigQuitHandler; // saved signal handlers for ctrl handling -static struct sigaction g_origSigContHandler, g_origSigChldHandler; // saved signal handlers for reinitialization -static volatile CtrlCallback g_ctrlCallback = nullptr; // Callback invoked for SIGINT/SIGQUIT -static int g_signalPipe[2] = {-1, -1}; // Pipe used between signal handler and worker - -// Signal handler for signals where we want our background thread to do the real processing. -// It simply writes the signal code to a pipe that's read by the thread. -static void TransferSignalToHandlerLoop(int sig, siginfo_t* siginfo, void* context) +void ReinitializeConsole() { - (void)siginfo; // unused - (void)context; // unused - - // Write the signal code to the pipe - uint8_t signalCodeByte = static_cast(sig); - ssize_t writtenBytes; - while (CheckInterrupted(writtenBytes = write(g_signalPipe[1], &signalCodeByte, 1))); - - if (writtenBytes != 1) - { - abort(); // fatal error - } -} - -static void HandleSignalForReinitialize(int sig, siginfo_t* siginfo, void* context) -{ - // SIGCONT will be sent when we're resumed after suspension, at which point - // we need to set the terminal back up. Similarly, SIGCHLD will be sent after - // a child process completes, and that child could have left things in a bad state, - // so we similarly need to reinitialize. - assert(sig == SIGCONT || sig == SIGCHLD); + // pal_signal.cpp calls this on SIGCONT/SIGCHLD. + // This can happen when SystemNative_InitializeConsole was not called. + // This gets called on a signal handler, we may only use async-signal-safe functions. // If the process was suspended while reading, we need to // re-initialize the console for the read, as the attributes @@ -342,172 +318,15 @@ static void HandleSignalForReinitialize(int sig, siginfo_t* siginfo, void* conte // "Application mode" will also have been reset and needs to be redone. WriteKeypadXmit(); - - // Delegate to any saved handler we may have - struct sigaction origHandler = sig == SIGCONT ? g_origSigContHandler : g_origSigChldHandler; - if (origHandler.sa_sigaction != nullptr && - reinterpret_cast(origHandler.sa_sigaction) != reinterpret_cast(SIG_DFL) && - reinterpret_cast(origHandler.sa_sigaction) != reinterpret_cast(SIG_IGN)) - { - origHandler.sa_sigaction(sig, siginfo, context); - } -} - -// Entrypoint for the thread that handles signals where our handling -// isn't signal-safe. Those signal handlers write the signal to a pipe, -// which this loop reads and processes. -void* SignalHandlerLoop(void* arg) -{ - // Passed in argument is a ptr to the file descriptor - // for the read end of the pipe. - assert(arg != nullptr); - int pipeFd = *reinterpret_cast(arg); - free(arg); - assert(pipeFd >= 0); - - // Continually read a signal code from the signal pipe and process it, - // until the pipe is closed. - while (true) - { - // Read the next signal, trying again if we were interrupted - uint8_t signalCode; - ssize_t bytesRead; - while (CheckInterrupted(bytesRead = read(pipeFd, &signalCode, 1))); - - if (bytesRead <= 0) - { - // Write end of pipe was closed or another error occurred. - // Regardless, no more data is available, so we close the read - // end of the pipe and exit. - close(pipeFd); - return nullptr; - } - - assert_msg(signalCode == SIGQUIT || signalCode == SIGINT, "invalid signalCode", static_cast(signalCode)); - - // We're now handling SIGQUIT and SIGINT. Invoke the callback, if we have one. - CtrlCallback callback = g_ctrlCallback; - int rv = callback != nullptr ? callback(signalCode == SIGQUIT ? Break : Interrupt) : 0; - if (rv == 0) // callback removed or was invoked and didn't handle the signal - { - // In general, we now want to remove our handler and reissue the signal to - // be picked up by the previously registered handler. In the most common case, - // this will be the default handler, causing the process to be torn down. - // It could also be a custom handle registered by other code before us. - - if (signalCode == SIGINT) - { - UninitializeConsole(); - sigaction(SIGINT, &g_origSigIntHandler, NULL); - kill(getpid(), SIGINT); - } - else if (signalCode == SIGQUIT) - { - UninitializeConsole(); - sigaction(SIGQUIT, &g_origSigQuitHandler, NULL); - kill(getpid(), SIGQUIT); - } - - } - } -} - -static void CloseSignalHandlingPipe() -{ - assert(g_signalPipe[0] >= 0); - assert(g_signalPipe[1] >= 0); - close(g_signalPipe[0]); - close(g_signalPipe[1]); - g_signalPipe[0] = -1; - g_signalPipe[1] = -1; -} - -static bool InitializeSignalHandling() -{ - // Create a pipe we'll use to communicate with our worker - // thread. We can't do anything interesting in the signal handler, - // so we instead send a message to another thread that'll do - // the handling work. - if (SystemNative_Pipe(g_signalPipe, PAL_O_CLOEXEC) != 0) - { - return false; - } - assert(g_signalPipe[0] >= 0); - assert(g_signalPipe[1] >= 0); - - // Create a small object to pass the read end of the pipe to the worker. - int* readFdPtr = reinterpret_cast(malloc(sizeof(int))); - if (readFdPtr == nullptr) - { - CloseSignalHandlingPipe(); - errno = ENOMEM; - return false; - } - *readFdPtr = g_signalPipe[0]; - - // The pipe is created. Create the worker thread. - pthread_t handlerThread; - if (pthread_create(&handlerThread, nullptr, SignalHandlerLoop, readFdPtr) != 0) - { - int err = errno; - free(readFdPtr); - CloseSignalHandlingPipe(); - errno = err; - return false; - } - - // Finally, register our signal handlers - struct sigaction newAction; - memset(&newAction, 0, sizeof(struct sigaction)); - newAction.sa_flags = SA_RESTART | SA_SIGINFO; - - sigemptyset(&newAction.sa_mask); - int rv; - - // Hook up signal handlers for use with ctrl-C / ctrl-Break handling - // We don't handle ignored signals. If we'd setup a handler, our child processes - // would reset to the default on exec causing them to terminate on these signals. - newAction.sa_sigaction = &TransferSignalToHandlerLoop; - rv = sigaction(SIGINT, NULL, &g_origSigIntHandler); - assert(rv == 0); - if (reinterpret_cast(g_origSigIntHandler.sa_sigaction) != reinterpret_cast(SIG_IGN)) - { - rv = sigaction(SIGINT, &newAction, NULL); - assert(rv == 0); - } - rv = sigaction(SIGQUIT, NULL, &g_origSigQuitHandler); - assert(rv == 0); - if (reinterpret_cast(g_origSigQuitHandler.sa_sigaction) != reinterpret_cast(SIG_IGN)) - { - rv = sigaction(SIGQUIT, &newAction, NULL); - assert(rv == 0); - } - - // Hook up signal handlers for use with signals that require us to reinitialize the terminal - newAction.sa_sigaction = &HandleSignalForReinitialize; - rv = sigaction(SIGCONT, &newAction, &g_origSigContHandler); - assert(rv == 0); - rv = sigaction(SIGCHLD, &newAction, &g_origSigChldHandler); - assert(rv == 0); - - return true; -} - -extern "C" void SystemNative_RegisterForCtrl(CtrlCallback callback) -{ - assert(callback != nullptr); - assert(g_ctrlCallback == nullptr); - g_ctrlCallback = callback; -} - -extern "C" void SystemNative_UnregisterForCtrl() -{ - assert(g_ctrlCallback != nullptr); - g_ctrlCallback = nullptr; } extern "C" int32_t SystemNative_InitializeConsole() { + if (!InitializeSignalHandling()) + { + return 0; + } + if (tcgetattr(STDIN_FILENO, &g_initTermios) >= 0) { g_haveInitTermios = true; @@ -520,7 +339,5 @@ extern "C" int32_t SystemNative_InitializeConsole() } atexit(UninitializeConsole); - // Do all initialization needed for the console. Right now that's just - // initializing the signal handling thread. - return InitializeSignalHandling() ? 1 : 0; + return 1; } diff --git a/external/corefx/src/Native/Unix/System.Native/pal_console.h b/external/corefx/src/Native/Unix/System.Native/pal_console.h index 2417ae7055..8b294b042e 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_console.h +++ b/external/corefx/src/Native/Unix/System.Native/pal_console.h @@ -4,6 +4,10 @@ #pragma once +#include "pal_compiler.h" + +BEGIN_EXTERN_C + #include "pal_types.h" /** @@ -46,7 +50,7 @@ struct WinSize * * Returns 0 on success; otherwise, returns errorNo. */ -extern "C" int32_t SystemNative_GetWindowSize(WinSize* windowsSize); +DLLEXPORT int32_t SystemNative_GetWindowSize(struct WinSize* windowsSize); /** * Gets whether the specified file descriptor is for a terminal. @@ -54,14 +58,14 @@ extern "C" int32_t SystemNative_GetWindowSize(WinSize* windowsSize); * Returns 1 if the file descriptor is referring to a terminal; * otherwise returns 0 and sets errno. */ -extern "C" int32_t SystemNative_IsATty(intptr_t fd); +DLLEXPORT int32_t SystemNative_IsATty(intptr_t fd); /** * Initializes the console for use by System.Console. * * Returns 1 on success; otherwise returns 0 and sets errno. */ -extern "C" int32_t SystemNative_InitializeConsole(); +DLLEXPORT int32_t SystemNative_InitializeConsole(void); /** * Stores the string that can be written to stdout to transition @@ -69,7 +73,7 @@ extern "C" int32_t SystemNative_InitializeConsole(); * * Returns 1 on success; otherwise returns 0 and sets errno. */ -extern "C" void SystemNative_SetKeypadXmit(const char* terminfoString); +DLLEXPORT void SystemNative_SetKeypadXmit(const char* terminfoString); /** * Gets the special control character codes for the requested control characters. @@ -79,35 +83,35 @@ extern "C" void SystemNative_SetKeypadXmit(const char* terminfoString); * or 0 if a particular name is unsupported or disabled. posixDisableValue is the special sentinel used in the output * controlCharacterValues array to indicate no value is available. */ -extern "C" void SystemNative_GetControlCharacters( +DLLEXPORT void SystemNative_GetControlCharacters( int32_t* controlCharacterNames, uint8_t* controlCharacterValues, int32_t controlCharacterLength, uint8_t* posixDisableValue); /** * Returns 1 if any input is waiting on stdin; otherwise, 0. */ -extern "C" int32_t SystemNative_StdinReady(); +DLLEXPORT int32_t SystemNative_StdinReady(void); /** * Initializes the terminal in preparation for a read operation. */ -extern "C" void SystemNative_InitializeConsoleBeforeRead(uint8_t minChars, uint8_t decisecondsTimeout); +DLLEXPORT void SystemNative_InitializeConsoleBeforeRead(uint8_t minChars, uint8_t decisecondsTimeout); /** * Restores the terminal's attributes to what they were before InitializeConsoleBeforeRead was called. */ -extern "C" void SystemNative_UninitializeConsoleAfterRead(); +DLLEXPORT void SystemNative_UninitializeConsoleAfterRead(void); /** * Reads the number of bytes specified into the provided buffer from stdin. * Returns the number of bytes read on success; otherwise, -1 is returned an errno is set. */ -extern "C" int32_t SystemNative_ReadStdin(void* buffer, int32_t bufferSize); +DLLEXPORT int32_t SystemNative_ReadStdin(void* buffer, int32_t bufferSize); /** * Gets the terminal's break mode. */ -extern "C" int32_t SystemNative_GetSignalForBreak(); +DLLEXPORT int32_t SystemNative_GetSignalForBreak(void); /** * Configures the terminal's break mode. @@ -116,34 +120,23 @@ extern "C" int32_t SystemNative_GetSignalForBreak(); * * Returns 1 on success, 0 on failure, in which case errno is set. */ -extern "C" int32_t SystemNative_SetSignalForBreak(int32_t signalForBreak); +DLLEXPORT int32_t SystemNative_SetSignalForBreak(int32_t signalForBreak); -enum CtrlCode : int32_t +enum CtrlCode { Interrupt = 0, Break = 1 }; -typedef int32_t (*CtrlCallback)(CtrlCode signalCode); +typedef int32_t (*CtrlCallback)(enum CtrlCode signalCode); +/** + * Called by pal_signal.cpp to reinitialize the console on SIGCONT/SIGCHLD. + */ +void ReinitializeConsole(void); /** - * Hooks up the specified callback for notifications when SIGINT or SIGQUIT is received. - * - * Not thread safe. Caller must provide its owns synchronization to ensure RegisterForCtrl - * is not called concurrently with itself or with UnregisterForCtrl. - * - * Should only be called when a callback is not currently registered. + * Called by pal_signal.cpp to uninitialize the console on SIGINT/SIGQUIT. */ -extern "C" void SystemNative_RegisterForCtrl(CtrlCallback callback); +void UninitializeConsole(void); -/** - * Unregisters the previously registered ctrlCCallback. - * - * Not thread safe. Caller must provide its owns synchronization to ensure UnregisterForCtrl - * is not called concurrently with itself or with RegisterForCtrl. - * - * Should only be called when a callback is currently registered. The pointer - * previously registered must remain valid until all ctrl handling activity - * has quiesced. - */ -extern "C" void SystemNative_UnregisterForCtrl(); +END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Native/pal_datetime.cpp b/external/corefx/src/Native/Unix/System.Native/pal_datetime.cpp index e2e0dea612..1a8e609438 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_datetime.cpp +++ b/external/corefx/src/Native/Unix/System.Native/pal_datetime.cpp @@ -9,6 +9,8 @@ #include #include +#include "pal_datetime.h" + static const int64_t TICKS_PER_SECOND = 10000000; /* 10^7 */ #if HAVE_CLOCK_REALTIME static const int64_t NANOSECONDS_PER_TICK = 100; diff --git a/external/corefx/src/Native/Unix/System.Native/pal_datetime.h b/external/corefx/src/Native/Unix/System.Native/pal_datetime.h new file mode 100644 index 0000000000..9dd34010e5 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/pal_datetime.h @@ -0,0 +1,13 @@ +// 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. + +#pragma once + +#include "pal_compiler.h" + +BEGIN_EXTERN_C + +DLLEXPORT int64_t SystemNative_GetSystemTimeAsTicks(void); + +END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Native/pal_errno.c b/external/corefx/src/Native/Unix/System.Native/pal_errno.c index 3a7972369c..996d777da0 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_errno.c +++ b/external/corefx/src/Native/Unix/System.Native/pal_errno.c @@ -130,8 +130,10 @@ int32_t SystemNative_ConvertErrorPlatformToPal(int32_t platformErrno) return Error_ENOTCONN; case ENOTDIR: return Error_ENOTDIR; +#if ENOTEMPTY != EEXIST // AIX defines this case ENOTEMPTY: return Error_ENOTEMPTY; +#endif #ifdef ENOTRECOVERABLE // not available in NetBSD case ENOTRECOVERABLE: return Error_ENOTRECOVERABLE; diff --git a/external/corefx/src/Native/Unix/System.Native/pal_errno.h b/external/corefx/src/Native/Unix/System.Native/pal_errno.h index 24fe234a5f..7b48fcf308 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_errno.h +++ b/external/corefx/src/Native/Unix/System.Native/pal_errno.h @@ -131,14 +131,14 @@ enum Error * Error above. If the value is not recognized, returns * Error_ENONSTANDARD. */ -int32_t SystemNative_ConvertErrorPlatformToPal(int32_t platformErrno); +DLLEXPORT int32_t SystemNative_ConvertErrorPlatformToPal(int32_t platformErrno); /** * Converts the given PAL Error value to a platform-specific errno * value. This is to be used when we want to synthesize a given error * and obtain the appropriate error message via StrErrorR. */ -int32_t SystemNative_ConvertErrorPalToPlatform(int32_t error); +DLLEXPORT int32_t SystemNative_ConvertErrorPalToPlatform(int32_t error); /** * Obtains the system error message for the given raw numeric value @@ -161,6 +161,6 @@ int32_t SystemNative_ConvertErrorPalToPlatform(int32_t error); * returned and the buffer is filled with as much of the message * as possible and null-terminated. */ -const char* SystemNative_StrErrorR(int32_t platformErrno, char* buffer, int32_t bufferSize); +DLLEXPORT const char* SystemNative_StrErrorR(int32_t platformErrno, char* buffer, int32_t bufferSize); END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Native/pal_interfaceaddresses.cpp b/external/corefx/src/Native/Unix/System.Native/pal_interfaceaddresses.c similarity index 53% rename from external/corefx/src/Native/Unix/System.Native/pal_interfaceaddresses.cpp rename to external/corefx/src/Native/Unix/System.Native/pal_interfaceaddresses.c index 6caff8f1f7..de2fc7e972 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_interfaceaddresses.cpp +++ b/external/corefx/src/Native/Unix/System.Native/pal_interfaceaddresses.c @@ -9,10 +9,10 @@ #include "pal_safecrt.h" #include "pal_networking.h" +#include #include #include #include -#include #include #include #include @@ -34,19 +34,19 @@ #include #endif -extern "C" int32_t SystemNative_EnumerateInterfaceAddresses(IPv4AddressFound onIpv4Found, +int32_t SystemNative_EnumerateInterfaceAddresses(IPv4AddressFound onIpv4Found, IPv6AddressFound onIpv6Found, LinkLayerAddressFound onLinkLayerFound) { - ifaddrs* headAddr; + struct ifaddrs* headAddr; if (getifaddrs(&headAddr) == -1) { return -1; } - for (ifaddrs* current = headAddr; current != nullptr; current = current->ifa_next) + for (struct ifaddrs* current = headAddr; current != NULL; current = current->ifa_next) { - if (current->ifa_addr == nullptr) + if (current->ifa_addr == NULL) { continue; } @@ -55,7 +55,7 @@ extern "C" int32_t SystemNative_EnumerateInterfaceAddresses(IPv4AddressFound onI // Use if_indextoname to map back to the true device name. char actualName[IF_NAMESIZE]; char* result = if_indextoname(interfaceIndex, actualName); - if (result == nullptr) + if (result == NULL) { freeifaddrs(headAddr); return -1; @@ -65,40 +65,40 @@ extern "C" int32_t SystemNative_EnumerateInterfaceAddresses(IPv4AddressFound onI int family = current->ifa_addr->sa_family; if (family == AF_INET) { - if (onIpv4Found != nullptr) + if (onIpv4Found != NULL) { // IP Address - IpAddressInfo iai; - memset(&iai, 0, sizeof(IpAddressInfo)); + struct IpAddressInfo iai; + memset(&iai, 0, sizeof(struct IpAddressInfo)); iai.InterfaceIndex = interfaceIndex; iai.NumAddressBytes = NUM_BYTES_IN_IPV4_ADDRESS; - sockaddr_in* sain = reinterpret_cast(current->ifa_addr); - memcpy_s(iai.AddressBytes, sizeof_member(IpAddressInfo, AddressBytes), &sain->sin_addr.s_addr, sizeof(sain->sin_addr.s_addr)); + struct sockaddr_in* sain = (struct sockaddr_in*)current->ifa_addr; + memcpy_s(iai.AddressBytes, sizeof_member(struct IpAddressInfo, AddressBytes), &sain->sin_addr.s_addr, sizeof(sain->sin_addr.s_addr)); // Net Mask - IpAddressInfo maskInfo; - memset(&maskInfo, 0, sizeof(IpAddressInfo)); + struct IpAddressInfo maskInfo; + memset(&maskInfo, 0, sizeof(struct IpAddressInfo)); maskInfo.InterfaceIndex = interfaceIndex; maskInfo.NumAddressBytes = NUM_BYTES_IN_IPV4_ADDRESS; - sockaddr_in* mask_sain = reinterpret_cast(current->ifa_netmask); - memcpy_s(maskInfo.AddressBytes, sizeof_member(IpAddressInfo, AddressBytes), &mask_sain->sin_addr.s_addr, sizeof(mask_sain->sin_addr.s_addr)); + struct sockaddr_in* mask_sain = (struct sockaddr_in*)current->ifa_netmask; + memcpy_s(maskInfo.AddressBytes, sizeof_member(struct IpAddressInfo, AddressBytes), &mask_sain->sin_addr.s_addr, sizeof(mask_sain->sin_addr.s_addr)); onIpv4Found(actualName, &iai, &maskInfo); } } else if (family == AF_INET6) { - if (onIpv6Found != nullptr) + if (onIpv6Found != NULL) { - IpAddressInfo iai; - memset(&iai, 0, sizeof(IpAddressInfo)); + struct IpAddressInfo iai; + memset(&iai, 0, sizeof(struct IpAddressInfo)); iai.InterfaceIndex = interfaceIndex; iai.NumAddressBytes = NUM_BYTES_IN_IPV6_ADDRESS; - sockaddr_in6* sain6 = reinterpret_cast(current->ifa_addr); - memcpy_s(iai.AddressBytes, sizeof_member(IpAddressInfo, AddressBytes), sain6->sin6_addr.s6_addr, sizeof(sain6->sin6_addr.s6_addr)); + struct sockaddr_in6* sain6 = (struct sockaddr_in6*)current->ifa_addr; + memcpy_s(iai.AddressBytes, sizeof_member(struct IpAddressInfo, AddressBytes), sain6->sin6_addr.s6_addr, sizeof(sain6->sin6_addr.s6_addr)); uint32_t scopeId = sain6->sin6_scope_id; onIpv6Found(actualName, &iai, &scopeId); } @@ -107,34 +107,34 @@ extern "C" int32_t SystemNative_EnumerateInterfaceAddresses(IPv4AddressFound onI #if defined(AF_PACKET) else if (family == AF_PACKET) { - if (onLinkLayerFound != nullptr) + if (onLinkLayerFound != NULL) { - sockaddr_ll* sall = reinterpret_cast(current->ifa_addr); + struct sockaddr_ll* sall = (struct sockaddr_ll*)current->ifa_addr; - LinkLayerAddressInfo lla; - memset(&lla, 0, sizeof(LinkLayerAddressInfo)); + struct LinkLayerAddressInfo lla; + memset(&lla, 0, sizeof(struct LinkLayerAddressInfo)); lla.InterfaceIndex = interfaceIndex; lla.NumAddressBytes = sall->sll_halen; - lla.HardwareType = static_cast(MapHardwareType(sall->sll_hatype)); + lla.HardwareType = MapHardwareType(sall->sll_hatype); - memcpy_s(&lla.AddressBytes, sizeof_member(LinkLayerAddressInfo, AddressBytes), &sall->sll_addr, sall->sll_halen); + memcpy_s(&lla.AddressBytes, sizeof_member(struct LinkLayerAddressInfo, AddressBytes), &sall->sll_addr, sall->sll_halen); onLinkLayerFound(current->ifa_name, &lla); } } #elif defined(AF_LINK) else if (family == AF_LINK) { - if (onLinkLayerFound != nullptr) + if (onLinkLayerFound != NULL) { - sockaddr_dl* sadl = reinterpret_cast(current->ifa_addr); + struct sockaddr_dl* sadl = (struct sockaddr_dl*)current->ifa_addr; - LinkLayerAddressInfo lla = { - .InterfaceIndex = interfaceIndex, - .NumAddressBytes = sadl->sdl_alen, - .HardwareType = static_cast(MapHardwareType(sadl->sdl_type)), - }; + struct LinkLayerAddressInfo lla; + memset(&lla, 0, sizeof(struct LinkLayerAddressInfo)); + lla.InterfaceIndex = interfaceIndex; + lla.NumAddressBytes = sadl->sdl_alen; + lla.HardwareType = MapHardwareType(sadl->sdl_type); - memcpy_s(&lla.AddressBytes, sizeof_member(LinkLayerAddressInfo, AddressBytes), reinterpret_cast(LLADDR(sadl)), sadl->sdl_alen); + memcpy_s(&lla.AddressBytes, sizeof_member(struct LinkLayerAddressInfo, AddressBytes), (uint8_t*)LLADDR(sadl), sadl->sdl_alen); onLinkLayerFound(current->ifa_name, &lla); } } @@ -146,56 +146,56 @@ extern "C" int32_t SystemNative_EnumerateInterfaceAddresses(IPv4AddressFound onI } #if HAVE_RT_MSGHDR -extern "C" int32_t SystemNative_EnumerateGatewayAddressesForInterface(uint32_t interfaceIndex, GatewayAddressFound onGatewayFound) +int32_t SystemNative_EnumerateGatewayAddressesForInterface(uint32_t interfaceIndex, GatewayAddressFound onGatewayFound) { int routeDumpName[] = {CTL_NET, AF_ROUTE, 0, AF_INET, NET_RT_DUMP, 0}; size_t byteCount; - if (sysctl(routeDumpName, 6, nullptr, &byteCount, nullptr, 0) != 0) + if (sysctl(routeDumpName, 6, NULL, &byteCount, NULL, 0) != 0) { return -1; } - uint8_t* buffer = new (std::nothrow) uint8_t[byteCount]; - if (buffer == nullptr) + uint8_t* buffer = malloc(byteCount); + if (buffer == NULL) { errno = ENOMEM; return -1; } - while (sysctl(routeDumpName, 6, buffer, &byteCount, nullptr, 0) != 0) + while (sysctl(routeDumpName, 6, buffer, &byteCount, NULL, 0) != 0) { - delete[] buffer; - buffer = new (std::nothrow) uint8_t[byteCount]; - if (buffer == nullptr) + buffer = realloc(buffer, byteCount); + if (buffer == NULL) { errno = ENOMEM; return -1; } } - rt_msghdr* hdr; + struct rt_msghdr* hdr; for (size_t i = 0; i < byteCount; i += hdr->rtm_msglen) { - hdr = reinterpret_cast(&buffer[i]); + hdr = (struct rt_msghdr*)&buffer[i]; int flags = hdr->rtm_flags; int isGateway = flags & RTF_GATEWAY; int gatewayPresent = hdr->rtm_addrs & RTA_GATEWAY; if (isGateway && gatewayPresent) { - IpAddressInfo iai = {}; + struct IpAddressInfo iai; + memset(&iai, 0, sizeof(struct IpAddressInfo)); iai.InterfaceIndex = interfaceIndex; iai.NumAddressBytes = NUM_BYTES_IN_IPV4_ADDRESS; - sockaddr_in* sain = reinterpret_cast(hdr + 1); + struct sockaddr_in* sain = (struct sockaddr_in*)(hdr + 1); sain = sain + 1; // Skip over the first sockaddr, the destination address. The second is the gateway. - memcpy_s(iai.AddressBytes, sizeof_member(IpAddressInfo, AddressBytes), &sain->sin_addr.s_addr, sizeof(sain->sin_addr.s_addr)); + memcpy_s(iai.AddressBytes, sizeof_member(struct IpAddressInfo, AddressBytes), &sain->sin_addr.s_addr, sizeof(sain->sin_addr.s_addr)); onGatewayFound(&iai); } } - delete[] buffer; + free(buffer); return 0; } #endif // HAVE_RT_MSGHDR diff --git a/external/corefx/src/Native/Unix/System.Native/pal_interfaceaddresses.h b/external/corefx/src/Native/Unix/System.Native/pal_interfaceaddresses.h index b3ea1192fa..05a02494d0 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_interfaceaddresses.h +++ b/external/corefx/src/Native/Unix/System.Native/pal_interfaceaddresses.h @@ -4,6 +4,10 @@ #pragma once +#include "pal_compiler.h" + +BEGIN_EXTERN_C + #include "pal_maphardwaretype.h" #include "pal_types.h" @@ -24,11 +28,16 @@ struct IpAddressInfo uint8_t __padding[3]; }; -typedef void (*IPv4AddressFound)(const char* interfaceName, IpAddressInfo* addressInfo, IpAddressInfo* netMaskInfo); -typedef void (*IPv6AddressFound)(const char* interfaceName, IpAddressInfo* info, uint32_t* scopeId); -typedef void (*LinkLayerAddressFound)(const char* interfaceName, LinkLayerAddressInfo* llAddress); -typedef void (*GatewayAddressFound)(IpAddressInfo* addressInfo); +typedef void (*IPv4AddressFound)(const char* interfaceName, struct IpAddressInfo* addressInfo, struct IpAddressInfo* netMaskInfo); +typedef void (*IPv6AddressFound)(const char* interfaceName, struct IpAddressInfo* info, uint32_t* scopeId); +typedef void (*LinkLayerAddressFound)(const char* interfaceName, struct LinkLayerAddressInfo* llAddress); +typedef void (*GatewayAddressFound)(struct IpAddressInfo* addressInfo); -int32_t EnumerateGatewayAddressesForInterface(uint32_t interfaceIndex, - GatewayAddressFound onGatewayFound, - uint16_t addressFamily); +DLLEXPORT int32_t SystemNative_EnumerateInterfaceAddresses( + IPv4AddressFound onIpv4Found, IPv6AddressFound onIpv6Found, LinkLayerAddressFound onLinkLayerFound); + +#if HAVE_RT_MSGHDR +DLLEXPORT int32_t SystemNative_EnumerateGatewayAddressesForInterface(uint32_t interfaceIndex, GatewayAddressFound onGatewayFound); +#endif + +END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Native/pal_io.c b/external/corefx/src/Native/Unix/System.Native/pal_io.c index 320dccd4e8..f95a18a5de 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_io.c +++ b/external/corefx/src/Native/Unix/System.Native/pal_io.c @@ -37,6 +37,18 @@ #include #endif +#ifdef _AIX +#include +// Somehow, AIX mangles the definition for this behind a C++ def +// Redeclare it here +extern int getpeereid(int, uid_t *__restrict__, gid_t *__restrict__); +// This function declaration is hidden behind `_XOPEN_SOURCE=700`, but we need +// `_ALL_SOURCE` to build the runtime, and that resets that definition to 600. +// Instead of trying to wrangle ifdefs in system headers with more definitions, +// just declare it here. +extern ssize_t getline(char **, size_t *, FILE *); +#endif + #if HAVE_STAT64 #define stat_ stat64 #define fstat_ fstat64 @@ -78,6 +90,8 @@ c_static_assert(PAL_S_IFSOCK == S_IFSOCK); // Validate that our enum for inode types is the same as what is // declared by the dirent.h header on the local system. +// (AIX doesn't have dirent d_type, so none of this there) +#if defined(DT_UNKNOWN) c_static_assert(PAL_DT_UNKNOWN == DT_UNKNOWN); c_static_assert(PAL_DT_FIFO == DT_FIFO); c_static_assert(PAL_DT_CHR == DT_CHR); @@ -87,6 +101,7 @@ c_static_assert(PAL_DT_REG == DT_REG); c_static_assert(PAL_DT_LNK == DT_LNK); c_static_assert(PAL_DT_SOCK == DT_SOCK); c_static_assert(PAL_DT_WHT == DT_WHT); +#endif // Validate that our Lock enum value are correct for the platform c_static_assert(PAL_LOCK_SH == LOCK_SH); @@ -106,12 +121,15 @@ c_static_assert(PAL_SEEK_CUR == SEEK_CUR); c_static_assert(PAL_SEEK_END == SEEK_END); // Validate our PollFlags enum values are correct for the platform +// HACK: AIX values are different; we convert them between PAL_POLL and POLL now +#ifndef _AIX c_static_assert(PAL_POLLIN == POLLIN); c_static_assert(PAL_POLLPRI == POLLPRI); c_static_assert(PAL_POLLOUT == POLLOUT); c_static_assert(PAL_POLLERR == POLLERR); c_static_assert(PAL_POLLHUP == POLLHUP); c_static_assert(PAL_POLLNVAL == POLLNVAL); +#endif // Validate our FileAdvice enum values are correct for the platform #if HAVE_POSIX_ADVISE @@ -239,8 +257,10 @@ static int32_t ConvertOpenFlags(int32_t flags) return -1; } +#if HAVE_O_CLOEXEC if (flags & PAL_O_CLOEXEC) ret |= O_CLOEXEC; +#endif if (flags & PAL_O_CREAT) ret |= O_CREAT; if (flags & PAL_O_EXCL) @@ -256,6 +276,11 @@ static int32_t ConvertOpenFlags(int32_t flags) intptr_t SystemNative_Open(const char* path, int32_t flags, int32_t mode) { +// these two ifdefs are for platforms where we dont have the open version of CLOEXEC and thus +// must simulate it by doing a fcntl with the SETFFD version after the open instead +#if !HAVE_O_CLOEXEC + int32_t old_flags = flags; +#endif flags = ConvertOpenFlags(flags); if (flags == -1) { @@ -265,6 +290,12 @@ intptr_t SystemNative_Open(const char* path, int32_t flags, int32_t mode) int result; while ((result = open(path, flags, (mode_t)mode)) < 0 && errno == EINTR); +#if !HAVE_O_CLOEXEC + if (old_flags & PAL_O_CLOEXEC) + { + fcntl(result, F_SETFD, FD_CLOEXEC); + } +#endif return result; } @@ -276,7 +307,13 @@ int32_t SystemNative_Close(intptr_t fd) intptr_t SystemNative_Dup(intptr_t oldfd) { int result; +#if HAVE_F_DUPFD_CLOEXEC while ((result = fcntl(ToFileDescriptor(oldfd), F_DUPFD_CLOEXEC, 0)) < 0 && errno == EINTR); +#else + while ((result = fcntl(ToFileDescriptor(oldfd), F_DUPFD, 0)) < 0 && errno == EINTR); + // do CLOEXEC here too + fcntl(result, F_SETFD, FD_CLOEXEC); +#endif return result; } @@ -325,7 +362,45 @@ static void ConvertDirent(const struct dirent* entry, struct DirectoryEntry* out // the start of the unmanaged string. Give the caller back a pointer to the // location of the start of the string that exists in their own byte buffer. outputEntry->Name = entry->d_name; +#if !defined(DT_UNKNOWN) + /* AIX has no d_type, make a substitute */ + struct stat s; + stat(entry->d_name, &s); + if (S_ISDIR(s.st_mode)) + { + outputEntry->InodeType = PAL_DT_DIR; + } + else if (S_ISFIFO(s.st_mode)) + { + outputEntry->InodeType = PAL_DT_FIFO; + } + else if (S_ISCHR(s.st_mode)) + { + outputEntry->InodeType = PAL_DT_CHR; + } + else if (S_ISBLK(s.st_mode)) + { + outputEntry->InodeType = PAL_DT_BLK; + } + else if (S_ISREG(s.st_mode)) + { + outputEntry->InodeType = PAL_DT_REG; + } + else if (S_ISLNK(s.st_mode)) + { + outputEntry->InodeType = PAL_DT_LNK; + } + else if (S_ISSOCK(s.st_mode)) + { + outputEntry->InodeType = PAL_DT_SOCK; + } + else + { + outputEntry->InodeType = PAL_DT_UNKNOWN; + } +#else outputEntry->InodeType = (int32_t)entry->d_type; +#endif #if HAVE_DIRENT_NAME_LEN outputEntry->NameLength = entry->d_namlen; @@ -435,7 +510,9 @@ int32_t SystemNative_Pipe(int32_t pipeFds[2], int32_t flags) case 0: break; case PAL_O_CLOEXEC: +#if HAVE_O_CLOEXEC flags = O_CLOEXEC; +#endif break; default: assert_msg(false, "Unknown pipe flag", (int)flags); @@ -452,7 +529,11 @@ int32_t SystemNative_Pipe(int32_t pipeFds[2], int32_t flags) while ((result = pipe(pipeFds)) < 0 && errno == EINTR); // Then, if O_CLOEXEC was specified, use fcntl to configure the file descriptors appropriately. +#if HAVE_O_CLOEXEC if ((flags & O_CLOEXEC) != 0 && result == 0) +#else + if ((flags & PAL_O_CLOEXEC) != 0 && result == 0) +#endif { while ((result = fcntl(pipeFds[0], F_SETFD, FD_CLOEXEC)) < 0 && errno == EINTR); if (result == 0) @@ -918,7 +999,32 @@ int32_t SystemNative_Poll(struct PollEvent* pollEvents, uint32_t eventCount, int { const struct PollEvent* event = &pollEvents[i]; pollfds[i].fd = event->FileDescriptor; - pollfds[i].events = event->Events; + // we need to do this for platforms like AIX where PAL_POLL* doesn't + // match up to their reality; this is PollEvent -> system polling + switch (event->Events) + { + case PAL_POLLIN: + pollfds[i].events = POLLIN; + break; + case PAL_POLLPRI: + pollfds[i].events = POLLPRI; + break; + case PAL_POLLOUT: + pollfds[i].events = POLLOUT; + break; + case PAL_POLLERR: + pollfds[i].events = POLLERR; + break; + case PAL_POLLHUP: + pollfds[i].events = POLLHUP; + break; + case PAL_POLLNVAL: + pollfds[i].events = POLLNVAL; + break; + default: + pollfds[i].events = event->Events; + break; + } pollfds[i].revents = 0; } @@ -942,7 +1048,31 @@ int32_t SystemNative_Poll(struct PollEvent* pollEvents, uint32_t eventCount, int assert(pfd->fd == pollEvents[i].FileDescriptor); assert(pfd->events == pollEvents[i].Events); - pollEvents[i].TriggeredEvents = (int16_t)pfd->revents; + // same as the other switch, just system -> PollEvent + switch (pfd->revents) + { + case POLLIN: + pollEvents[i].TriggeredEvents = PAL_POLLIN; + break; + case POLLPRI: + pollEvents[i].TriggeredEvents = PAL_POLLPRI; + break; + case POLLOUT: + pollEvents[i].TriggeredEvents = PAL_POLLOUT; + break; + case POLLERR: + pollEvents[i].TriggeredEvents = PAL_POLLERR; + break; + case POLLHUP: + pollEvents[i].TriggeredEvents = PAL_POLLHUP; + break; + case POLLNVAL: + pollEvents[i].TriggeredEvents = PAL_POLLNVAL; + break; + default: + pollEvents[i].TriggeredEvents = (int16_t)pfd->revents; + break; + } } *triggered = (uint32_t)rv; @@ -1001,7 +1131,11 @@ int32_t SystemNative_Read(intptr_t fd, void* buffer, int32_t bufferSize) } ssize_t count; +#if !MONO while ((count = read(ToFileDescriptor(fd), buffer, (uint32_t)bufferSize)) < 0 && errno == EINTR); +#else // The Mono thread abort process can cause an EINTR here that needs to be handled + count = read(ToFileDescriptor(fd), buffer, (uint32_t)bufferSize); +#endif assert(count >= -1 && count <= bufferSize); return (int32_t)count; diff --git a/external/corefx/src/Native/Unix/System.Native/pal_io.h b/external/corefx/src/Native/Unix/System.Native/pal_io.h index 89f28e3dab..9f80c8b00c 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_io.h +++ b/external/corefx/src/Native/Unix/System.Native/pal_io.h @@ -329,90 +329,95 @@ enum NotifyEvents PAL_IN_ISDIR = 0x40000000, }; + +int32_t SystemNative_Stat2(const char* path, struct FileStatus* output); +int32_t SystemNative_FStat2(intptr_t fd, struct FileStatus* output); +int32_t SystemNative_LStat2(const char* path, struct FileStatus* output); + /** * Get file status from a descriptor. Implemented as shim to fstat(2). * * Returns 0 for success, -1 for failure. Sets errno on failure. */ -int32_t SystemNative_FStat(intptr_t fd, struct FileStatus* output); +DLLEXPORT int32_t SystemNative_FStat2(intptr_t fd, struct FileStatus* output); /** * Get file status from a full path. Implemented as shim to stat(2). * * Returns 0 for success, -1 for failure. Sets errno on failure. */ -int32_t SystemNative_Stat(const char* path, struct FileStatus* output); +DLLEXPORT int32_t SystemNative_Stat2(const char* path, struct FileStatus* output); /** * Get file stats from a full path. Implemented as shim to lstat(2). * * Returns 0 for success, -1 for failure. Sets errno on failure. */ -int32_t SystemNative_LStat(const char* path, struct FileStatus* output); +DLLEXPORT int32_t SystemNative_LStat2(const char* path, struct FileStatus* output); /** * Open or create a file or device. Implemented as shim to open(2). * * Returns file descriptor or -1 for failure. Sets errno on failure. */ -intptr_t SystemNative_Open(const char* path, int32_t flags, int32_t mode); +DLLEXPORT intptr_t SystemNative_Open(const char* path, int32_t flags, int32_t mode); /** * Close a file descriptor. Implemented as shim to open(2). * * Returns 0 for success, -1 for failure. Sets errno on failure. */ -int32_t SystemNative_Close(intptr_t fd); +DLLEXPORT int32_t SystemNative_Close(intptr_t fd); /** * Duplicates a file descriptor. * * Returns the duplication descriptor for success, -1 for failure. Sets errno on failure. */ -intptr_t SystemNative_Dup(intptr_t oldfd); +DLLEXPORT intptr_t SystemNative_Dup(intptr_t oldfd); /** * Delete an entry from the file system. Implemented as shim to unlink(2). * * Returns 0 for success, -1 for failure. Sets errno on failure. */ -int32_t SystemNative_Unlink(const char* path); +DLLEXPORT int32_t SystemNative_Unlink(const char* path); /** * Open or create a shared memory object. Implemented as shim to shm_open(3). * * Returns file descriptor or -1 on fiailure. Sets errno on failure. */ -intptr_t SystemNative_ShmOpen(const char* name, int32_t flags, int32_t mode); +DLLEXPORT intptr_t SystemNative_ShmOpen(const char* name, int32_t flags, int32_t mode); /** * Unlink a shared memory object. Implemented as shim to shm_unlink(3). * * Returns 0 for success, -1 for failure. Sets errno on failure. */ -int32_t SystemNative_ShmUnlink(const char* name); +DLLEXPORT int32_t SystemNative_ShmUnlink(const char* name); /** * Returns the size of the dirent struct on the current architecture */ -int32_t SystemNative_GetReadDirRBufferSize(void); +DLLEXPORT int32_t SystemNative_GetReadDirRBufferSize(void); /** * Re-entrant readdir that will retrieve the next dirent from the directory stream pointed to by dir. * * Returns 0 when data is retrieved; returns -1 when end-of-stream is reached; returns an error code on failure */ -int32_t SystemNative_ReadDirR(DIR* dir, uint8_t* buffer, int32_t bufferSize, struct DirectoryEntry* outputEntry); +DLLEXPORT int32_t SystemNative_ReadDirR(DIR* dir, uint8_t* buffer, int32_t bufferSize, struct DirectoryEntry* outputEntry); /** * Returns a DIR struct containing info about the current path or NULL on failure; sets errno on fail. */ -DIR* SystemNative_OpenDir(const char* path); +DLLEXPORT DIR* SystemNative_OpenDir(const char* path); /** * Closes the directory stream opened by opendir and returns 0 on success. On fail, -1 is returned and errno is set */ -int32_t SystemNative_CloseDir(DIR* dir); +DLLEXPORT int32_t SystemNative_CloseDir(DIR* dir); /** * Creates a pipe. Implemented as shim to pipe(2) or pipe2(2) if available. @@ -420,7 +425,7 @@ int32_t SystemNative_CloseDir(DIR* dir); * * Returns 0 for success, -1 for failure. Sets errno on failure. */ -int32_t SystemNative_Pipe(int32_t pipefd[2], // [out] pipefds[0] gets read end, pipefd[1] gets write end. +DLLEXPORT int32_t SystemNative_Pipe(int32_t pipefd[2], // [out] pipefds[0] gets read end, pipefd[1] gets write end. int32_t flags); // 0 for defaults or PAL_O_CLOEXEC for close-on-exec // NOTE: Rather than a general fcntl shim, we opt to export separate functions @@ -432,14 +437,14 @@ int32_t SystemNative_Pipe(int32_t pipefd[2], // [out] pipefds[0] gets read end, * * Returns 0 for success; -1 for failure. Sets errno for failure. */ -int32_t SystemNative_FcntlSetCloseOnExec(intptr_t fd); +DLLEXPORT int32_t SystemNative_FcntlSetCloseOnExec(intptr_t fd); /** * Determines if the current platform supports getting and setting pipe capacity. * * Returns true (non-zero) if supported, false (zero) if not. */ -int32_t SystemNative_FcntlCanGetSetPipeSz(void); +DLLEXPORT int32_t SystemNative_FcntlCanGetSetPipeSz(void); /** * Gets the capacity of a pipe. @@ -448,7 +453,7 @@ int32_t SystemNative_FcntlCanGetSetPipeSz(void); * * NOTE: Some platforms do not support this operation and will always fail with errno = ENOTSUP. */ -int32_t SystemNative_FcntlGetPipeSz(intptr_t fd); +DLLEXPORT int32_t SystemNative_FcntlGetPipeSz(intptr_t fd); /** * Sets the capacity of a pipe. @@ -457,56 +462,56 @@ int32_t SystemNative_FcntlGetPipeSz(intptr_t fd); * * NOTE: Some platforms do not support this operation and will always fail with errno = ENOTSUP. */ -int32_t SystemNative_FcntlSetPipeSz(intptr_t fd, int32_t size); +DLLEXPORT int32_t SystemNative_FcntlSetPipeSz(intptr_t fd, int32_t size); /** * Sets whether or not a file descriptor is non-blocking. * * Returns 0 for success, -1 for failure. Sets errno for failure. */ -int32_t SystemNative_FcntlSetIsNonBlocking(intptr_t fd, int32_t isNonBlocking); +DLLEXPORT int32_t SystemNative_FcntlSetIsNonBlocking(intptr_t fd, int32_t isNonBlocking); /** * Create a directory. Implemented as a shim to mkdir(2). * * Returns 0 for success, -1 for failure. Sets errno for failure. */ -int32_t SystemNative_MkDir(const char* path, int32_t mode); +DLLEXPORT int32_t SystemNative_MkDir(const char* path, int32_t mode); /** * Change permissions of a file. Implemented as a shim to chmod(2). * * Returns 0 for success, -1 for failure. Sets errno for failure. */ -int32_t SystemNative_ChMod(const char* path, int32_t mode); +DLLEXPORT int32_t SystemNative_ChMod(const char* path, int32_t mode); /** * Change permissions of a file. Implemented as a shim to fchmod(2). * * Returns 0 for success, -1 for failure. Sets errno for failure. */ -int32_t SystemNative_FChMod(intptr_t fd, int32_t mode); +DLLEXPORT int32_t SystemNative_FChMod(intptr_t fd, int32_t mode); /** * Flushes all modified data and attribtues of the specified File Descriptor to the storage medium. * * Returns 0 for success; on fail, -1 is returned and errno is set. */ -int32_t SystemNative_FSync(intptr_t fd); +DLLEXPORT int32_t SystemNative_FSync(intptr_t fd); /** * Changes the advisory lock status on a given File Descriptor * * Returns 0 on success; otherwise, -1 is returned and errno is set */ -int32_t SystemNative_FLock(intptr_t fd, int32_t operation); +DLLEXPORT int32_t SystemNative_FLock(intptr_t fd, int32_t operation); /** * Changes the current working directory to be the specified path. * * Returns 0 on success; otherwise, returns -1 and errno is set */ -int32_t SystemNative_ChDir(const char* path); +DLLEXPORT int32_t SystemNative_ChDir(const char* path); /** * Checks the access permissions of the current calling user on the specified path for the specified mode. @@ -514,7 +519,7 @@ int32_t SystemNative_ChDir(const char* path); * Returns -1 if the path cannot be found or the if desired access is not granted and errno is set; otherwise, returns * 0. */ -int32_t SystemNative_Access(const char* path, int32_t mode); +DLLEXPORT int32_t SystemNative_Access(const char* path, int32_t mode); /** * Tests whether a pathname matches a specified pattern. @@ -522,7 +527,7 @@ int32_t SystemNative_Access(const char* path, int32_t mode); * Returns 0 if the string matches; returns FNM_NOMATCH if the call succeeded but the * string does not match; otherwise, returns a non-zero error code. */ -int32_t SystemNative_FnMatch(const char* pattern, const char* path, int32_t flags); +DLLEXPORT int32_t SystemNative_FnMatch(const char* pattern, const char* path, int32_t flags); /** * Seek to a specified location within a seekable stream @@ -530,14 +535,14 @@ int32_t SystemNative_FnMatch(const char* pattern, const char* path, int32_t flag * On success, the resulting offet, in bytes, from the beginning of the stream; otherwise, * returns -1 and errno is set. */ -int64_t SystemNative_LSeek(intptr_t fd, int64_t offset, int32_t whence); +DLLEXPORT int64_t SystemNative_LSeek(intptr_t fd, int64_t offset, int32_t whence); /** * Creates a hard-link at link pointing to source. * * Returns 0 on success; otherwise, returns -1 and errno is set. */ -int32_t SystemNative_Link(const char* source, const char* linkTarget); +DLLEXPORT int32_t SystemNative_Link(const char* source, const char* linkTarget); /** * Creates a file name that adheres to the specified template, creates the file on disk with @@ -545,7 +550,7 @@ int32_t SystemNative_Link(const char* source, const char* linkTarget); * * Returns a valid File Descriptor on success; otherwise, returns -1 and errno is set. */ -intptr_t SystemNative_MksTemps(char* pathTemplate, int32_t suffixLength); +DLLEXPORT intptr_t SystemNative_MksTemps(char* pathTemplate, int32_t suffixLength); /** * Map file or device into memory. Implemented as shim to mmap(2). @@ -555,7 +560,7 @@ intptr_t SystemNative_MksTemps(char* pathTemplate, int32_t suffixLength); * Note that null failure result is a departure from underlying * mmap(2) using non-null sentinel. */ -void* SystemNative_MMap(void* address, +DLLEXPORT void* SystemNative_MMap(void* address, uint64_t length, int32_t protection, // bitwise OR of PAL_PROT_* int32_t flags, // bitwise OR of PAL_MAP_*, but PRIVATE and SHARED are mutually exclusive. @@ -567,42 +572,42 @@ void* SystemNative_MMap(void* address, * * Returns 0 for success, -1 for failure. Sets errno on failure. */ -int32_t SystemNative_MUnmap(void* address, uint64_t length); +DLLEXPORT int32_t SystemNative_MUnmap(void* address, uint64_t length); /** * Give advice about use of memory. Implemented as shim to madvise(2). * * Returns 0 for success, -1 for failure. Sets errno on failure. */ -int32_t SystemNative_MAdvise(void* address, uint64_t length, int32_t advice); +DLLEXPORT int32_t SystemNative_MAdvise(void* address, uint64_t length, int32_t advice); /** * Lock memory from being swapped out. Implemented as shim to mlock(2). * * Returns 0 for success, -1 for failure. Sets errno on failure. */ -int32_t SystemNative_MLock(void* address, uint64_t length); +DLLEXPORT int32_t SystemNative_MLock(void* address, uint64_t length); /** * Unlock memory, allowing it to be swapped out. Implemented as shim to munlock(2). * * Returns 0 for success, -1 for failure. Sets errno on failure. */ -int32_t SystemNative_MUnlock(void* address, uint64_t length); +DLLEXPORT int32_t SystemNative_MUnlock(void* address, uint64_t length); /** * Set protection on a region of memory. Implemented as shim to mprotect(2). * * Returns 0 for success, -1 for failure. Sets errno on failure. */ -int32_t SystemNative_MProtect(void* address, uint64_t length, int32_t protection); +DLLEXPORT int32_t SystemNative_MProtect(void* address, uint64_t length, int32_t protection); /** * Sycnhronize a file with a memory map. Implemented as shim to mmap(2). * * Returns 0 for success, -1 for failure. Sets errno on failure. */ -int32_t SystemNative_MSync(void* address, uint64_t length, int32_t flags); +DLLEXPORT int32_t SystemNative_MSync(void* address, uint64_t length, int32_t flags); /** * Get system configuration value. Implemented as shim to sysconf(3). @@ -613,14 +618,14 @@ int32_t SystemNative_MSync(void* address, uint64_t length, int32_t flags); * note that -1 can also be a meaningful successful return value, in * which case errno is unchanged. */ -int64_t SystemNative_SysConf(int32_t name); +DLLEXPORT int64_t SystemNative_SysConf(int32_t name); /** * Truncate a file to given length. Implemented as shim to ftruncate(2). * * Returns 0 for success, -1 for failure. Sets errno on failure. */ -int32_t SystemNative_FTruncate(intptr_t fd, int64_t length); +DLLEXPORT int32_t SystemNative_FTruncate(intptr_t fd, int64_t length); /** * Examines one or more file descriptors for the specified state(s) and blocks until the state(s) occur or the timeout @@ -629,7 +634,7 @@ int32_t SystemNative_FTruncate(intptr_t fd, int64_t length); * Returns an error or Error_SUCCESS. `triggered` is set to the number of ready descriptors if any. The number of * triggered descriptors may be zero in the event of a timeout. */ -int32_t SystemNative_Poll(struct PollEvent* pollEvents, uint32_t eventCount, int32_t milliseconds, uint32_t* triggered); +DLLEXPORT int32_t SystemNative_Poll(struct PollEvent* pollEvents, uint32_t eventCount, int32_t milliseconds, uint32_t* triggered); /** * Notifies the OS kernel that the specified file will be accessed in a particular way soon; this allows the kernel to @@ -637,14 +642,14 @@ int32_t SystemNative_Poll(struct PollEvent* pollEvents, uint32_t eventCount, int * * Returns 0 on success; otherwise, the error code is returned and errno is NOT set. */ -int32_t SystemNative_PosixFAdvise(intptr_t fd, int64_t offset, int64_t length, int32_t advice); +DLLEXPORT int32_t SystemNative_PosixFAdvise(intptr_t fd, int64_t offset, int64_t length, int32_t advice); /** * Reads a line from the provided stream. * * Returns the read line, or null if no line could be read. The caller is responsible for freeing the malloc'd line. */ -char* SystemNative_GetLine(FILE* stream); +DLLEXPORT char* SystemNative_GetLine(FILE* stream); /** * Reads the number of bytes specified into the provided buffer from the specified, opened file descriptor. @@ -653,7 +658,7 @@ char* SystemNative_GetLine(FILE* stream); * * Note - on fail. the position of the stream may change depending on the platform; consult man 2 read for more info */ -int32_t SystemNative_Read(intptr_t fd, void* buffer, int32_t bufferSize); +DLLEXPORT int32_t SystemNative_Read(intptr_t fd, void* buffer, int32_t bufferSize); /** * Takes a path to a symbolic link and attempts to place the link target path into the buffer. If the buffer is too @@ -661,7 +666,7 @@ int32_t SystemNative_Read(intptr_t fd, void* buffer, int32_t bufferSize); * * Returns the number of bytes placed into the buffer on success; otherwise, -1 is returned and errno is set. */ -int32_t SystemNative_ReadLink(const char* path, char* buffer, int32_t bufferSize); +DLLEXPORT int32_t SystemNative_ReadLink(const char* path, char* buffer, int32_t bufferSize); /** * Renames a file, moving to the correct destination if necessary. There are many edge cases to this call, check man 2 @@ -669,33 +674,33 @@ int32_t SystemNative_ReadLink(const char* path, char* buffer, int32_t bufferSize * * Returns 0 on succes; otherwise, returns -1 and errno is set. */ -int32_t SystemNative_Rename(const char* oldPath, const char* newPath); +DLLEXPORT int32_t SystemNative_Rename(const char* oldPath, const char* newPath); /** * Deletes the specified empty directory. * * Returns 0 on success; otherwise, returns -1 and errno is set. */ -int32_t SystemNative_RmDir(const char* path); +DLLEXPORT int32_t SystemNative_RmDir(const char* path); /** * Forces a write of all modified I/O buffers to their storage mediums. */ -void SystemNative_Sync(void); +DLLEXPORT void SystemNative_Sync(void); /** * Writes the specified buffer to the provided open file descriptor * * Returns the number of bytes written on success; otherwise, returns -1 and sets errno */ -int32_t SystemNative_Write(intptr_t fd, const void* buffer, int32_t bufferSize); +DLLEXPORT int32_t SystemNative_Write(intptr_t fd, const void* buffer, int32_t bufferSize); /** * Copies all data from the source file descriptor to the destination file descriptor. * * Returns 0 on success; otherwise, returns -1 and sets errno. */ -int32_t SystemNative_CopyFile(intptr_t sourceFd, intptr_t destinationFd); +DLLEXPORT int32_t SystemNative_CopyFile(intptr_t sourceFd, intptr_t destinationFd); /** * Initializes a new inotify instance and returns a file @@ -704,7 +709,7 @@ int32_t SystemNative_CopyFile(intptr_t sourceFd, intptr_t destinationFd); * Returns a new file descriptor on success. * On error, -1 is returned, and errno is set to indicate the error. */ -intptr_t SystemNative_INotifyInit(void); +DLLEXPORT intptr_t SystemNative_INotifyInit(void); /** * Adds a new watch, or modifies an existing watch, @@ -713,7 +718,7 @@ intptr_t SystemNative_INotifyInit(void); * Returns a nonnegative watch descriptor on success. * On error -1 is returned and errno is set appropriately. */ -int32_t SystemNative_INotifyAddWatch(intptr_t fd, const char* pathName, uint32_t mask); +DLLEXPORT int32_t SystemNative_INotifyAddWatch(intptr_t fd, const char* pathName, uint32_t mask); /** * Removes the watch associated with the watch descriptor wd @@ -721,21 +726,21 @@ int32_t SystemNative_INotifyAddWatch(intptr_t fd, const char* pathName, uint32_t * * Returns 0 on success, or -1 if an error occurred (in which case, errno is set appropriately). */ -int32_t SystemNative_INotifyRemoveWatch(intptr_t fd, int32_t wd); +DLLEXPORT int32_t SystemNative_INotifyRemoveWatch(intptr_t fd, int32_t wd); /** * Expands all symbolic links and expands all paths to return an absolute path * * Returns the result absolute path on success or null on error with errno set appropriately. */ -char* SystemNative_RealPath(const char* path); +DLLEXPORT char* SystemNative_RealPath(const char* path); /** * Attempts to retrieve the ID of the process at the end of the given socket * * Returns 0 on success, or -1 if an error occurred (in which case, errno is set appropriately). */ -int32_t SystemNative_GetPeerID(intptr_t socket, uid_t* euid); +DLLEXPORT int32_t SystemNative_GetPeerID(intptr_t socket, uid_t* euid); /** * Attempts to lock/unlock the region of the file "fd" specified by the offset and length. lockType @@ -743,6 +748,6 @@ int32_t SystemNative_GetPeerID(intptr_t socket, uid_t* euid); * * Returns 0 on success, or -1 if an error occurred (in which case, errno is set appropriately). */ -int32_t SystemNative_LockFileRegion(intptr_t fd, int64_t offset, int64_t length, int16_t lockType); +DLLEXPORT int32_t SystemNative_LockFileRegion(intptr_t fd, int64_t offset, int64_t length, int16_t lockType); END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Native/pal_maphardwaretype.c b/external/corefx/src/Native/Unix/System.Native/pal_maphardwaretype.c index b0eea92077..7f8e825783 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_maphardwaretype.c +++ b/external/corefx/src/Native/Unix/System.Native/pal_maphardwaretype.c @@ -18,7 +18,7 @@ #error System must have AF_PACKET or AF_LINK. #endif -enum NetworkInterfaceType MapHardwareType(uint16_t nativeType) +uint16_t MapHardwareType(uint16_t nativeType) { #if defined(AF_PACKET) switch (nativeType) @@ -76,8 +76,10 @@ enum NetworkInterfaceType MapHardwareType(uint16_t nativeType) return NetworkInterfaceType_Atm; case IFT_MODEM: return NetworkInterfaceType_GenericModem; +#if defined(IFT_IEEE1394) case IFT_IEEE1394: return NetworkInterfaceType_HighPerformanceSerialBus; +#endif default: return NetworkInterfaceType_Unknown; } diff --git a/external/corefx/src/Native/Unix/System.Native/pal_maphardwaretype.h b/external/corefx/src/Native/Unix/System.Native/pal_maphardwaretype.h index 558eb05997..81f5f15beb 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_maphardwaretype.h +++ b/external/corefx/src/Native/Unix/System.Native/pal_maphardwaretype.h @@ -43,6 +43,6 @@ enum NetworkInterfaceType NetworkInterfaceType_Wwanpp2 = 244, // IF_TYPE_WWANPP2 Mobile Broadband devices based on CDMA technology }; -enum NetworkInterfaceType MapHardwareType(uint16_t nativeType); +uint16_t MapHardwareType(uint16_t nativeType); END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Native/pal_memory.h b/external/corefx/src/Native/Unix/System.Native/pal_memory.h index c0f7e5339e..709c9998a4 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_memory.h +++ b/external/corefx/src/Native/Unix/System.Native/pal_memory.h @@ -15,6 +15,6 @@ BEGIN_EXTERN_C * * Returns a pointer to the memory. */ -void* SystemNative_MemSet(void *s, int c, uintptr_t n); +DLLEXPORT void* SystemNative_MemSet(void *s, int c, uintptr_t n); END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Native/pal_mount.h b/external/corefx/src/Native/Unix/System.Native/pal_mount.h index f8bfa378fa..741fff428f 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_mount.h +++ b/external/corefx/src/Native/Unix/System.Native/pal_mount.h @@ -4,6 +4,10 @@ #pragma once +#include "pal_compiler.h" + +BEGIN_EXTERN_C + #include "pal_types.h" /** @@ -26,7 +30,7 @@ typedef void (*MountPointFound)(const char* name); /** * Gets the space information for the given mount point and populates the input struct with the data. */ -extern "C" int32_t SystemNative_GetSpaceInfoForMountPoint(const char* name, MountPointInformation* mpi); +DLLEXPORT int32_t SystemNative_GetSpaceInfoForMountPoint(const char* name, MountPointInformation* mpi); /** * Gets the format information about the given mount point. @@ -37,12 +41,14 @@ extern "C" int32_t SystemNative_GetSpaceInfoForMountPoint(const char* name, Moun * Since C# is much better at enum and string handling, pass either the char buffer or the long type * back, depending on what the platform gives us, and let C# reason on it in an easy way. */ -extern "C" int32_t -SystemNative_GetFormatInfoForMountPoint(const char* name, char* formatNameBuffer, int32_t bufferLength, int64_t* formatType); +DLLEXPORT int32_t SystemNative_GetFormatInfoForMountPoint( + const char* name, char* formatNameBuffer, int32_t bufferLength, int64_t* formatType); /** * Enumerate all mount points on the system and call the input * function pointer once-per-mount-point to prevent heap allocs * as much as possible. */ -extern "C" int32_t SystemNative_GetAllMountPoints(MountPointFound onFound); +DLLEXPORT int32_t SystemNative_GetAllMountPoints(MountPointFound onFound); + +END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Native/pal_networkchange.cpp b/external/corefx/src/Native/Unix/System.Native/pal_networkchange.cpp index f719b79068..5fbbd9fc76 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_networkchange.cpp +++ b/external/corefx/src/Native/Unix/System.Native/pal_networkchange.cpp @@ -46,6 +46,22 @@ extern "C" Error SystemNative_CloseNetworkChangeListenerSocket(int32_t socket) return err == 0 || CheckInterrupted(err) ? Error_SUCCESS : static_cast(SystemNative_ConvertErrorPlatformToPal(errno)); } +static NetworkChangeKind ReadNewLinkMessage(nlmsghdr* hdr) +{ + assert(hdr != nullptr); + ifinfomsg* ifimsg; + ifimsg = reinterpret_cast(NLMSG_DATA(hdr)); + if (ifimsg->ifi_family == AF_INET) + { + if ((ifimsg->ifi_flags & IFF_UP) != 0) + { + return NetworkChangeKind::LinkAdded; + } + } + + return NetworkChangeKind::None; +} + extern "C" void SystemNative_ReadEvents(int32_t sock, NetworkChangeEvent onNetworkChange) { char buffer[4096]; @@ -96,19 +112,3 @@ extern "C" void SystemNative_ReadEvents(int32_t sock, NetworkChangeEvent onNetwo } } } - -NetworkChangeKind ReadNewLinkMessage(nlmsghdr* hdr) -{ - assert(hdr != nullptr); - ifinfomsg* ifimsg; - ifimsg = reinterpret_cast(NLMSG_DATA(hdr)); - if (ifimsg->ifi_family == AF_INET) - { - if ((ifimsg->ifi_flags & IFF_UP) != 0) - { - return NetworkChangeKind::LinkAdded; - } - } - - return NetworkChangeKind::None; -} diff --git a/external/corefx/src/Native/Unix/System.Native/pal_networkchange.h b/external/corefx/src/Native/Unix/System.Native/pal_networkchange.h index 2f453455c4..596ce0edd7 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_networkchange.h +++ b/external/corefx/src/Native/Unix/System.Native/pal_networkchange.h @@ -4,10 +4,14 @@ #pragma once +#include "pal_compiler.h" + +BEGIN_EXTERN_C + #include "pal_types.h" #include -enum class NetworkChangeKind : int32_t +enum NetworkChangeKind { None = -1, AddressAdded = 0, @@ -17,7 +21,12 @@ enum class NetworkChangeKind : int32_t AvailabilityChanged = 4, }; -typedef void (*NetworkChangeEvent)(int32_t sock, NetworkChangeKind notificationKind); +typedef void (*NetworkChangeEvent)(int32_t sock, enum NetworkChangeKind notificationKind); -extern "C" void SystemNative_ReadEvents(int32_t sock, NetworkChangeEvent onNetworkChange); -NetworkChangeKind ReadNewLinkMessage(nlmsghdr* hdr); +DLLEXPORT void SystemNative_ReadEvents(int32_t sock, NetworkChangeEvent onNetworkChange); + +DLLEXPORT Error SystemNative_CreateNetworkChangeListenerSocket(int32_t* retSocket); + +DLLEXPORT Error SystemNative_CloseNetworkChangeListenerSocket(int32_t socket); + +END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Native/pal_networking.c b/external/corefx/src/Native/Unix/System.Native/pal_networking.c index 297830c124..74864b371b 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_networking.c +++ b/external/corefx/src/Native/Unix/System.Native/pal_networking.c @@ -7,6 +7,7 @@ #include "pal_io.h" #include "pal_safecrt.h" #include "pal_utilities.h" +#include #include #include @@ -19,6 +20,8 @@ #include #include #include +#elif HAVE_SYS_POLL_H +#include #endif #include #include @@ -43,50 +46,56 @@ #elif HAVE_SENDFILE_6 #include #endif +#if !HAVE_IN_PKTINFO +#include +#if HAVE_GETIFADDRS +#include +#endif +#endif #if HAVE_KQUEUE #if KEVENT_HAS_VOID_UDATA -void* GetKeventUdata(uintptr_t udata) +static void* GetKeventUdata(uintptr_t udata) { return (void*)udata; } -uintptr_t GetSocketEventData(void* udata) +static uintptr_t GetSocketEventData(void* udata) { return (uintptr_t)udata; } #else -intptr_t GetKeventUdata(uintptr_t udata) +static intptr_t GetKeventUdata(uintptr_t udata) { return (intptr_t)udata; } -uintptr_t GetSocketEventData(intptr_t udata) +static uintptr_t GetSocketEventData(intptr_t udata) { return (uintptr_t)udata; } #endif #if KEVENT_REQUIRES_INT_PARAMS -int GetKeventNchanges(int nchanges) +static int GetKeventNchanges(int nchanges) { return nchanges; } -int16_t GetKeventFilter(int16_t filter) +static int16_t GetKeventFilter(int16_t filter) { return filter; } -uint16_t GetKeventFlags(uint16_t flags) +static uint16_t GetKeventFlags(uint16_t flags) { return flags; } #else -size_t GetKeventNchanges(int nchanges) +static size_t GetKeventNchanges(int nchanges) { return (size_t)nchanges; } -int16_t GetKeventFilter(uint32_t filter) +static int16_t GetKeventFilter(uint32_t filter) { return (int16_t)filter; } -uint16_t GetKeventFlags(uint32_t flags) +static uint16_t GetKeventFlags(uint32_t flags) { return (uint16_t)flags; } @@ -121,12 +130,6 @@ enum #endif }; -enum -{ - HOST_ENTRY_HANDLE_ADDRINFO = 1, - HOST_ENTRY_HANDLE_HOSTENT = 2, -}; - enum { INET6_ADDRSTRLEN_MANAGED = 65 // Managed code has a longer max IPv6 string length @@ -236,9 +239,8 @@ int32_t SystemNative_GetHostEntryForName(const uint8_t* address, struct HostEntr entry->CanonicalName = NULL; entry->Aliases = NULL; - entry->AddressListHandle = (void*)info; - entry->IPAddressCount = 0; - entry->HandleType = HOST_ENTRY_HANDLE_ADDRINFO; + entry->AddressListHandle = info; + entry->IPAddressCount = 0; // Find the canonical name for this host (if any) and count the number of IP end points. for (struct addrinfo* ai = info; ai != NULL; ai = ai->ai_next) @@ -258,325 +260,6 @@ int32_t SystemNative_GetHostEntryForName(const uint8_t* address, struct HostEntr return GetAddrInfoErrorFlags_EAI_SUCCESS; } -static int ConvertGetHostErrorPlatformToPal(int error) -{ - switch (error) - { - case HOST_NOT_FOUND: - return GetHostErrorCodes_HOST_NOT_FOUND; - - case TRY_AGAIN: - return GetHostErrorCodes_TRY_AGAIN; - - case NO_RECOVERY: - return GetHostErrorCodes_NO_RECOVERY; - - case NO_DATA: - return GetHostErrorCodes_NO_DATA; - - default: - assert_err(0, "Unknown gethostbyname/gethostbyaddr error code", error); - return GetHostErrorCodes_HOST_NOT_FOUND; - } -} - -static void ConvertHostEntPlatformToPal(struct HostEntry* hostEntry, struct hostent* entry) -{ - hostEntry->CanonicalName = (uint8_t*)entry->h_name; - hostEntry->Aliases = (uint8_t**)entry->h_aliases; - hostEntry->AddressListHandle = (void*)entry; - hostEntry->IPAddressCount = 0; - hostEntry->HandleType = HOST_ENTRY_HANDLE_HOSTENT; - - for (int i = 0; entry->h_addr_list[i] != NULL; i++) - { - hostEntry->IPAddressCount++; - } -} - -#if !HAVE_THREAD_SAFE_GETHOSTBYNAME_AND_GETHOSTBYADDR -#if !HAVE_GETHOSTBYNAME_R -static int copy_hostent(struct hostent* from, struct hostent* to, - char* buffer, size_t buflen) -{ - // FIXME: the implementation done for this function in https://github.com/dotnet/corefx/commit/6a99b74 - // requires testing when managed assemblies are built and tested on NetBSD. Until that time, - // return an error code. - (void)from; // unused arg - (void)to; // unused arg - (void)buffer; // unused arg - (void)buflen; // unused arg - return ENOSYS; -} - -/* -Note: we're assuming that all access to these functions are going through these shims on the platforms, which do not provide - thread-safe functions to get host name or address. If that is not the case (which is very likely) race condition is - possible, for instance; if other libs (such as libcurl) call gethostby[name/addr] simultaneously. -*/ -static pthread_mutex_t lock_hostbyx_mutex = PTHREAD_MUTEX_INITIALIZER; - -static int gethostbyname_r(char const* hostname, struct hostent* result, - char* buffer, size_t buflen, struct hostent** entry, int* error) -{ - assert(hostname != NULL); - assert(result != NULL); - assert(buffer != NULL); - assert(entry != NULL); - assert(error != NULL); - - if (hostname == NULL || entry == NULL || error == NULL || buffer == NULL || result == NULL) - { - if (error != NULL) - { - *error = GetHostErrorCodes_BAD_ARG; - } - - return GetHostErrorCodes_BAD_ARG; - } - - pthread_mutex_lock(&lock_hostbyx_mutex); - - *entry = gethostbyname(hostname); - if ((!(*entry)) || ((*entry)->h_addrtype != AF_INET) || ((*entry)->h_length != 4)) - { - *error = h_errno; - *entry = NULL; - } - else - { - h_errno = copy_hostent(*entry, result, buffer, buflen); - *entry = (h_errno == 0) ? result : NULL; - } - - pthread_mutex_unlock(&lock_hostbyx_mutex); - - return h_errno; -} - -static int gethostbyaddr_r(const uint8_t* addr, const socklen_t len, int type, struct hostent* result, - char* buffer, size_t buflen, struct hostent** entry, int* error) -{ - assert(addr != NULL); - assert(result != NULL); - assert(buffer != NULL); - assert(entry != NULL); - assert(error != NULL); - - if (addr == NULL || entry == NULL || buffer == NULL || result == NULL) - { - if (error != NULL) - { - *error = GetHostErrorCodes_BAD_ARG; - } - - return GetHostErrorCodes_BAD_ARG; - } - - pthread_mutex_lock(&lock_hostbyx_mutex); - - *entry = gethostbyaddr((const char*)addr, (unsigned int)len, type); - if ((!(*entry)) || ((*entry)->h_addrtype != AF_INET) || ((*entry)->h_length != 4)) - { - *error = h_errno; - *entry = NULL; - } - else - { - h_errno = copy_hostent(*entry, result, buffer, buflen); - *entry = (h_errno == 0) ? result : NULL; - } - - pthread_mutex_unlock(&lock_hostbyx_mutex); - - return h_errno; -} -#undef HAVE_GETHOSTBYNAME_R -#undef HAVE_GETHOSTBYADDR_R -#define HAVE_GETHOSTBYNAME_R 1 -#define HAVE_GETHOSTBYADDR_R 1 -#endif /* !HAVE_GETHOSTBYNAME_R */ - -#if HAVE_GETHOSTBYNAME_R -static int GetHostByNameHelper(const uint8_t* hostname, struct hostent** entry) -{ - assert(hostname != NULL); - assert(entry != NULL); - - size_t scratchLen = 512; - - for (;;) - { - size_t bufferSize; - uint8_t* buffer; - if (!add_s(sizeof(struct hostent), scratchLen, &bufferSize) || - (buffer = (uint8_t*)malloc(bufferSize)) == NULL) - { - return GetHostErrorCodes_NO_MEM; - } - - struct hostent* result = (struct hostent*)buffer; - char* scratch = (char*)&buffer[sizeof(struct hostent)]; - - int getHostErrno = 0; - int err = gethostbyname_r((const char*)hostname, result, scratch, scratchLen, entry, &getHostErrno); - if (!err && *entry != NULL) - { - assert(*entry == result); - return 0; - } - else if (err == ERANGE) - { - free(buffer); - size_t tmpScratchLen; - if (!multiply_s(scratchLen, (size_t)2, &tmpScratchLen)) - { - *entry = NULL; - return GetHostErrorCodes_NO_MEM; - } - scratchLen = tmpScratchLen; - } - else - { - free(buffer); - *entry = NULL; - return getHostErrno ? getHostErrno : HOST_NOT_FOUND; - } - } -} -#endif /* HAVE_GETHOSTBYNAME_R */ -#endif /* !HAVE_THREAD_SAFE_GETHOSTBYNAME_AND_GETHOSTBYADDR */ - -int32_t SystemNative_GetHostByName(const uint8_t* hostname, struct HostEntry* entry) -{ - if (hostname == NULL || entry == NULL) - { - return GetHostErrorCodes_BAD_ARG; - } - - struct hostent* hostEntry = NULL; - int error = 0; - -#if HAVE_THREAD_SAFE_GETHOSTBYNAME_AND_GETHOSTBYADDR - hostEntry = gethostbyname((const char*)hostname); - error = h_errno; -#elif HAVE_GETHOSTBYNAME_R - error = GetHostByNameHelper(hostname, &hostEntry); -#else -#error Platform does not provide thread-safe gethostbyname -#endif - - if (hostEntry == NULL) - { - return ConvertGetHostErrorPlatformToPal(error); - } - - ConvertHostEntPlatformToPal(entry, hostEntry); - return Error_SUCCESS; -} - -#if !HAVE_THREAD_SAFE_GETHOSTBYNAME_AND_GETHOSTBYADDR && HAVE_GETHOSTBYADDR_R -static int GetHostByAddrHelper(const uint8_t* addr, const socklen_t addrLen, int type, struct hostent** entry) -{ - assert(addr != NULL); - assert(addrLen >= 0); - assert(entry != NULL); - - size_t scratchLen = 512; - - for (;;) - { - size_t bufferSize; - uint8_t* buffer; - if (!add_s(sizeof(struct hostent), scratchLen, &bufferSize) || - (buffer = (uint8_t*)malloc(bufferSize)) == NULL) - { - return GetHostErrorCodes_NO_MEM; - } - - struct hostent* result = (struct hostent*)buffer; - char* scratch = (char*)&buffer[sizeof(struct hostent)]; - - int getHostErrno = 0; - int err = gethostbyaddr_r(addr, addrLen, type, result, scratch, scratchLen, entry, &getHostErrno); - if (!err && *entry != NULL) - { - assert(*entry == result); - return 0; - } - else if (err == ERANGE) - { - free(buffer); - size_t tmpScratchLen; - if (!multiply_s(scratchLen, (size_t)2, &tmpScratchLen)) - { - *entry = NULL; - return GetHostErrorCodes_NO_MEM; - } - scratchLen = tmpScratchLen; - } - else - { - free(buffer); - *entry = NULL; - return getHostErrno ? getHostErrno : HOST_NOT_FOUND; - } - } -} -#endif /* !HAVE_THREAD_SAFE_GETHOSTBYNAME_AND_GETHOSTBYADDR && HAVE_GETHOSTBYADDR_R */ - -int32_t SystemNative_GetHostByAddress(const struct IPAddress* address, struct HostEntry* entry) -{ - if (address == NULL || entry == NULL) - { - return GetHostErrorCodes_BAD_ARG; - } - - uint8_t* addr = NULL; - socklen_t addrLen = 0; - int type = AF_UNSPEC; - - struct in_addr inAddr; - memset(&inAddr, 0, sizeof(struct in_addr)); - struct in6_addr in6Addr; - memset(&in6Addr, 0, sizeof(struct in6_addr)); - - if (!address->IsIPv6) - { - ConvertByteArrayToInAddr(&inAddr, address->Address, NUM_BYTES_IN_IPV4_ADDRESS); - addr = (uint8_t*)&inAddr; - addrLen = sizeof(inAddr); - type = AF_INET; - } - else - { - ConvertByteArrayToIn6Addr(&in6Addr, address->Address, NUM_BYTES_IN_IPV6_ADDRESS); - addr = (uint8_t*)&in6Addr; - addrLen = sizeof(in6Addr); - type = AF_INET6; - } - - struct hostent* hostEntry = NULL; - int error = 0; - -#if HAVE_THREAD_SAFE_GETHOSTBYNAME_AND_GETHOSTBYADDR - hostEntry = gethostbyaddr(addr, addrLen, type); - error = h_errno; -#elif HAVE_GETHOSTBYADDR_R - error = GetHostByAddrHelper(addr, addrLen, type, &hostEntry); -#else -#error Platform does not provide thread-safe gethostbyname -#endif - - if (hostEntry == NULL) - { - return ConvertGetHostErrorPlatformToPal(error); - } - - ConvertHostEntPlatformToPal(entry, hostEntry); - return Error_SUCCESS; -} - static int32_t GetNextIPAddressFromAddrInfo(struct addrinfo** info, struct IPAddress* endPoint) { assert(info != NULL); @@ -617,90 +300,21 @@ static int32_t GetNextIPAddressFromAddrInfo(struct addrinfo** info, struct IPAdd return GetAddrInfoErrorFlags_EAI_NOMORE; } -static int32_t GetNextIPAddressFromHostEnt(struct hostent** hostEntry, struct IPAddress* address) -{ - assert(hostEntry != NULL); - assert(address != NULL); - - struct hostent* entry = *hostEntry; - if (*entry->h_addr_list == NULL) - { - return GetAddrInfoErrorFlags_EAI_NOMORE; - } - - switch (entry->h_addrtype) - { - case AF_INET: - { - struct in_addr* inAddr = (struct in_addr*)entry->h_addr_list[0]; - - ConvertInAddrToByteArray(address->Address, NUM_BYTES_IN_IPV4_ADDRESS, inAddr); - address->IsIPv6 = 0; - break; - } - - case AF_INET6: - { - struct in6_addr* in6Addr = (struct in6_addr*)entry->h_addr_list[0]; - - ConvertIn6AddrToByteArray(address->Address, NUM_BYTES_IN_IPV6_ADDRESS, in6Addr); - address->IsIPv6 = 1; - address->ScopeId = 0; - break; - } - - default: - return GetAddrInfoErrorFlags_EAI_NOMORE; - } - - entry->h_addr_list = &entry->h_addr_list[1]; - return GetAddrInfoErrorFlags_EAI_SUCCESS; -} - -int32_t SystemNative_GetNextIPAddress(const struct HostEntry* hostEntry, void** addressListHandle, struct IPAddress* endPoint) +int32_t SystemNative_GetNextIPAddress(const struct HostEntry* hostEntry, struct addrinfo** addressListHandle, struct IPAddress* endPoint) { if (hostEntry == NULL || addressListHandle == NULL || endPoint == NULL) { return GetAddrInfoErrorFlags_EAI_BADARG; } - - switch (hostEntry->HandleType) - { - case HOST_ENTRY_HANDLE_ADDRINFO: - return GetNextIPAddressFromAddrInfo((struct addrinfo**)addressListHandle, endPoint); - - case HOST_ENTRY_HANDLE_HOSTENT: - return GetNextIPAddressFromHostEnt((struct hostent**)addressListHandle, endPoint); - - default: - return GetAddrInfoErrorFlags_EAI_BADARG; - } + + return GetNextIPAddressFromAddrInfo(addressListHandle, endPoint); } void SystemNative_FreeHostEntry(struct HostEntry* entry) { if (entry != NULL) - { - switch (entry->HandleType) - { - case HOST_ENTRY_HANDLE_ADDRINFO: - { - struct addrinfo* ai = (struct addrinfo*)entry->AddressListHandle; - freeaddrinfo(ai); - break; - } - - case HOST_ENTRY_HANDLE_HOSTENT: - { -#if !HAVE_THREAD_SAFE_GETHOSTBYNAME_AND_GETHOSTBYADDR - free(entry->AddressListHandle); -#endif - break; - } - - default: - break; - } + { + freeaddrinfo(entry->AddressListHandle); } } @@ -1172,11 +786,26 @@ static int32_t GetIPv4PacketInformation(struct cmsghdr* controlMessage, struct I ConvertInAddrToByteArray(&packetInfo->Address.Address[0], NUM_BYTES_IN_IPV4_ADDRESS, &pktinfo->ipi_addr); #if HAVE_IN_PKTINFO packetInfo->InterfaceIndex = (int32_t)pktinfo->ipi_ifindex; +#elif HAVE_GETIFADDRS + packetInfo->InterfaceIndex = 0; + + struct ifaddrs* addrs; + if (getifaddrs(&addrs) == 0) + { + struct ifaddrs* addrs_head = addrs; + while (addrs != NULL) + { + if (addrs->ifa_addr->sa_family == AF_INET && ((struct sockaddr_in*)addrs->ifa_addr)->sin_addr.s_addr == pktinfo->ipi_addr.s_addr) + { + packetInfo->InterfaceIndex = (int32_t)if_nametoindex(addrs->ifa_name); + break; + } + addrs = addrs->ifa_next; + } + freeifaddrs(addrs_head); + } #else - // TODO (#7855): Figure out how to get interface index with in_addr. - // One option is http://www.unix.com/man-page/freebsd/3/if_nametoindex - // which requires interface name to be known. - // Meanwhile: + // assume the first interface, we have no other methods packetInfo->InterfaceIndex = 0; #endif @@ -1202,18 +831,17 @@ static int32_t GetIPv6PacketInformation(struct cmsghdr* controlMessage, struct I return 1; } -struct cmsghdr* GET_CMSG_NXTHDR(struct msghdr* mhdr, struct cmsghdr* cmsg) +static struct cmsghdr* GET_CMSG_NXTHDR(struct msghdr* mhdr, struct cmsghdr* cmsg) { #ifndef __GLIBC__ // Tracking issue: #6312 // In musl-libc, CMSG_NXTHDR typecasts char* to struct cmsghdr* which causes -// clang to throw cast-align warning. This is to suppress the warning +// clang to throw sign-compare warning. This is to suppress the warning // inline. // There is also a problem in the CMSG_NXTHDR macro in musl-libc. // It compares signed and unsigned value and clang warns about that. // So we suppress the warning inline too. #pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wcast-align" #pragma clang diagnostic ignored "-Wsign-compare" #endif return CMSG_NXTHDR(mhdr, cmsg); @@ -1245,6 +873,7 @@ SystemNative_TryGetIPPacketInformation(struct MessageHeader* messageHeader, int3 } } } +#ifdef IPV6_PKTINFO else { for (; controlMessage != NULL && controlMessage->cmsg_len > 0; @@ -1256,6 +885,7 @@ SystemNative_TryGetIPPacketInformation(struct MessageHeader* messageHeader, int3 } } } +#endif return 0; } @@ -1507,7 +1137,7 @@ int32_t SystemNative_SetLingerOption(intptr_t socket, struct LingerOption* optio return err == 0 ? Error_SUCCESS : SystemNative_ConvertErrorPlatformToPal(errno); } -int32_t SetTimeoutOption(int32_t socket, int32_t millisecondsTimeout, int optionName) +static int32_t SetTimeoutOption(int32_t socket, int32_t millisecondsTimeout, int optionName) { if (millisecondsTimeout < 0) { @@ -1650,6 +1280,29 @@ int32_t SystemNative_Accept(intptr_t socket, uint8_t* socketAddress, int32_t* so while ((accepted = accept4(fd, (struct sockaddr*)socketAddress, &addrLen, SOCK_CLOEXEC)) < 0 && errno == EINTR); #else while ((accepted = accept(fd, (struct sockaddr*)socketAddress, &addrLen)) < 0 && errno == EINTR); +#if defined(FD_CLOEXEC) + // macOS does not have accept4 but it can set _CLOEXEC on descriptor. + // Unlike accept4 it is not atomic and the fd can leak child process. + if ((accepted != -1) && fcntl(accepted, F_SETFD, FD_CLOEXEC) != 0) + { + // Preserve and return errno from fcntl. close() may reset errno to OK. + int oldErrno = errno; + close(accepted); + accepted = -1; + errno = oldErrno; + } +#endif +#endif +#if !defined(__linux__) + // On macOS and FreeBSD new socket inherits flags from accepting fd. + // Our socket code expects new socket to be in blocking mode by default. + if ((accepted != -1) && SystemNative_FcntlSetIsNonBlocking(accepted, 0) != 0) + { + int oldErrno = errno; + close(accepted); + accepted = -1; + errno = oldErrno; + } #endif if (accepted == -1) { @@ -1973,9 +1626,11 @@ static bool TryGetPlatformSocketOption(int32_t socketOptionName, int32_t socketO switch (socketOptionLevel) { +#ifdef IPV6_HOPLIMIT case SocketOptionName_SO_IPV6_HOPLIMIT: *optName = IPV6_HOPLIMIT; return true; +#endif // case SocketOptionName_SO_IPV6_PROTECTION_LEVEL: @@ -1983,9 +1638,11 @@ static bool TryGetPlatformSocketOption(int32_t socketOptionName, int32_t socketO *optName = IPV6_V6ONLY; return true; +#ifdef IPV6_RECVPKTINFO case SocketOptionName_SO_IP_PKTINFO: *optName = IPV6_RECVPKTINFO; return true; +#endif case SocketOptionName_SO_IP_MULTICAST_IF: *optName = IPV6_MULTICAST_IF; @@ -2324,13 +1981,13 @@ int32_t SystemNative_GetBytesAvailable(intptr_t socket, int32_t* available) static const size_t SocketEventBufferElementSize = sizeof(struct epoll_event) > sizeof(struct SocketEvent) ? sizeof(struct epoll_event) : sizeof(struct SocketEvent); -static enum SocketEvents GetSocketEvents(uint32_t events) +static int GetSocketEvents(uint32_t events) { int asyncEvents = (((events & EPOLLIN) != 0) ? SocketEvents_SA_READ : 0) | (((events & EPOLLOUT) != 0) ? SocketEvents_SA_WRITE : 0) | (((events & EPOLLRDHUP) != 0) ? SocketEvents_SA_READCLOSE : 0) | (((events & EPOLLHUP) != 0) ? SocketEvents_SA_CLOSE : 0) | (((events & EPOLLERR) != 0) ? SocketEvents_SA_ERROR : 0); - return (enum SocketEvents)asyncEvents; + return asyncEvents; } static uint32_t GetEPollEvents(enum SocketEvents events) @@ -2344,7 +2001,12 @@ static int32_t CreateSocketEventPortInner(int32_t* port) { assert(port != NULL); +#ifdef EPOOL_CLOEXEC int epollFd = epoll_create1(EPOLL_CLOEXEC); +#else + int epollFd = epoll_create(256); + fcntl(epollFd, F_SETFD, FD_CLOEXEC); +#endif if (epollFd == -1) { *port = -1; @@ -2599,7 +2261,32 @@ static int32_t WaitForSocketEventsInner(int32_t port, struct SocketEvent* buffer } #else -#error Asynchronous sockets require epoll or kqueue support. +#warning epoll/kqueue not detected; building with stub socket events support +static const size_t SocketEventBufferElementSize = sizeof(struct pollfd); + +static enum SocketEvents GetSocketEvents(int16_t filter, uint16_t flags) +{ + return SocketEvents_SA_NONE; +} +static int32_t CloseSocketEventPortInner(int32_t port) +{ + return Error_ENOSYS; +} +static int32_t CreateSocketEventPortInner(int32_t* port) +{ + return Error_ENOSYS; +} +static int32_t TryChangeSocketEventRegistrationInner( + int32_t port, int32_t socket, enum SocketEvents currentEvents, enum SocketEvents newEvents, +uintptr_t data) +{ + return Error_ENOSYS; +} +static int32_t WaitForSocketEventsInner(int32_t port, struct SocketEvent* buffer, int32_t* count) +{ + return Error_ENOSYS; +} + #endif int32_t SystemNative_CreateSocketEventPort(intptr_t* port) @@ -2802,7 +2489,7 @@ int32_t SystemNative_SendFile(intptr_t out_fd, intptr_t in_fd, int64_t offset, i return SystemNative_ConvertErrorPlatformToPal(errno); } -#else +#else // If we ever need to run on a platform that doesn't have sendfile, // we can implement this with a simple read/send loop. For now, // we just mark it as not supported. diff --git a/external/corefx/src/Native/Unix/System.Native/pal_networking.h b/external/corefx/src/Native/Unix/System.Native/pal_networking.h index d5fb40b392..a35da0ce79 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_networking.h +++ b/external/corefx/src/Native/Unix/System.Native/pal_networking.h @@ -239,9 +239,8 @@ struct HostEntry { uint8_t* CanonicalName; // Canonical name of the host uint8_t** Aliases; // List of aliases for the host - void* AddressListHandle; // Handle for host socket addresses + struct addrinfo* AddressListHandle; // Handle for host socket addresses int32_t IPAddressCount; // Number of IP end points in the list - int32_t HandleType; // Indicates the type of the handle. Opaque to managed code. }; struct IPPacketInformation @@ -297,17 +296,13 @@ struct SocketEvent uint32_t Padding; // Pad out to 8-byte alignment }; -int32_t SystemNative_GetHostEntryForName(const uint8_t* address, struct HostEntry* entry); +DLLEXPORT int32_t SystemNative_GetHostEntryForName(const uint8_t* address, struct HostEntry* entry); -int32_t SystemNative_GetHostByName(const uint8_t* hostname, struct HostEntry* entry); +DLLEXPORT int32_t SystemNative_GetNextIPAddress(const struct HostEntry* entry, struct addrinfo** addressListHandle, struct IPAddress* endPoint); -int32_t SystemNative_GetHostByAddress(const struct IPAddress* address, struct HostEntry* entry); +DLLEXPORT void SystemNative_FreeHostEntry(struct HostEntry* entry); -int32_t SystemNative_GetNextIPAddress(const struct HostEntry* entry, void** addressListHandle, struct IPAddress* endPoint); - -void SystemNative_FreeHostEntry(struct HostEntry* entry); - -int32_t SystemNative_GetNameInfo(const uint8_t* address, +DLLEXPORT int32_t SystemNative_GetNameInfo(const uint8_t* address, int32_t addressLength, int8_t isIPv6, uint8_t* host, @@ -316,99 +311,102 @@ int32_t SystemNative_GetNameInfo(const uint8_t* address, int32_t serviceLength, int32_t flags); -int32_t SystemNative_GetDomainName(uint8_t* name, int32_t nameLength); +DLLEXPORT int32_t SystemNative_GetDomainName(uint8_t* name, int32_t nameLength); -int32_t SystemNative_GetHostName(uint8_t* name, int32_t nameLength); +DLLEXPORT int32_t SystemNative_GetHostName(uint8_t* name, int32_t nameLength); -int32_t SystemNative_GetIPSocketAddressSizes(int32_t* ipv4SocketAddressSize, int32_t* ipv6SocketAddressSize); +DLLEXPORT int32_t SystemNative_GetIPSocketAddressSizes(int32_t* ipv4SocketAddressSize, int32_t* ipv6SocketAddressSize); -int32_t SystemNative_GetAddressFamily(const uint8_t* socketAddress, int32_t socketAddressLen, int32_t* addressFamily); +DLLEXPORT int32_t SystemNative_GetAddressFamily(const uint8_t* socketAddress, int32_t socketAddressLen, int32_t* addressFamily); -int32_t SystemNative_SetAddressFamily(uint8_t* socketAddress, int32_t socketAddressLen, int32_t addressFamily); +DLLEXPORT int32_t SystemNative_SetAddressFamily(uint8_t* socketAddress, int32_t socketAddressLen, int32_t addressFamily); -int32_t SystemNative_GetPort(const uint8_t* socketAddress, int32_t socketAddressLen, uint16_t* port); +DLLEXPORT int32_t SystemNative_GetPort(const uint8_t* socketAddress, int32_t socketAddressLen, uint16_t* port); -int32_t SystemNative_SetPort(uint8_t* socketAddress, int32_t socketAddressLen, uint16_t port); +DLLEXPORT int32_t SystemNative_SetPort(uint8_t* socketAddress, int32_t socketAddressLen, uint16_t port); -int32_t SystemNative_GetIPv4Address(const uint8_t* socketAddress, int32_t socketAddressLen, uint32_t* address); +DLLEXPORT int32_t SystemNative_GetIPv4Address(const uint8_t* socketAddress, int32_t socketAddressLen, uint32_t* address); -int32_t SystemNative_SetIPv4Address(uint8_t* socketAddress, int32_t socketAddressLen, uint32_t address); +DLLEXPORT int32_t SystemNative_SetIPv4Address(uint8_t* socketAddress, int32_t socketAddressLen, uint32_t address); -int32_t SystemNative_GetIPv6Address( +DLLEXPORT int32_t SystemNative_GetIPv6Address( const uint8_t* socketAddress, int32_t socketAddressLen, uint8_t* address, int32_t addressLen, uint32_t* scopeId); -int32_t SystemNative_GetControlMessageBufferSize(int32_t isIPv4, int32_t isIPv6); +DLLEXPORT int32_t SystemNative_SetIPv6Address( + uint8_t* socketAddress, int32_t socketAddressLen, uint8_t* address, int32_t addressLen, uint32_t scopeId); -int32_t -SystemNative_TryGetIPPacketInformation(struct MessageHeader* messageHeader, int32_t isIPv4, struct IPPacketInformation* packetInfo); +DLLEXPORT int32_t SystemNative_GetControlMessageBufferSize(int32_t isIPv4, int32_t isIPv6); -int32_t SystemNative_GetIPv4MulticastOption(intptr_t socket, int32_t multicastOption, struct IPv4MulticastOption* option); +DLLEXPORT int32_t SystemNative_TryGetIPPacketInformation( + struct MessageHeader* messageHeader, int32_t isIPv4, struct IPPacketInformation* packetInfo); -int32_t SystemNative_SetIPv4MulticastOption(intptr_t socket, int32_t multicastOption, struct IPv4MulticastOption* option); +DLLEXPORT int32_t SystemNative_GetIPv4MulticastOption(intptr_t socket, int32_t multicastOption, struct IPv4MulticastOption* option); -int32_t SystemNative_GetIPv6MulticastOption(intptr_t socket, int32_t multicastOption, struct IPv6MulticastOption* option); +DLLEXPORT int32_t SystemNative_SetIPv4MulticastOption(intptr_t socket, int32_t multicastOption, struct IPv4MulticastOption* option); -int32_t SystemNative_SetIPv6MulticastOption(intptr_t socket, int32_t multicastOption, struct IPv6MulticastOption* option); +DLLEXPORT int32_t SystemNative_GetIPv6MulticastOption(intptr_t socket, int32_t multicastOption, struct IPv6MulticastOption* option); -int32_t SystemNative_GetLingerOption(intptr_t socket, struct LingerOption* option); +DLLEXPORT int32_t SystemNative_SetIPv6MulticastOption(intptr_t socket, int32_t multicastOption, struct IPv6MulticastOption* option); -int32_t SystemNative_SetLingerOption(intptr_t socket, struct LingerOption* option); +DLLEXPORT int32_t SystemNative_GetLingerOption(intptr_t socket, struct LingerOption* option); -int32_t SystemNative_SetReceiveTimeout(intptr_t socket, int32_t millisecondsTimeout); +DLLEXPORT int32_t SystemNative_SetLingerOption(intptr_t socket, struct LingerOption* option); -int32_t SystemNative_SetSendTimeout(intptr_t socket, int32_t millisecondsTimeout); +DLLEXPORT int32_t SystemNative_SetReceiveTimeout(intptr_t socket, int32_t millisecondsTimeout); -int32_t SystemNative_ReceiveMessage(intptr_t socket, struct MessageHeader* messageHeader, int32_t flags, int64_t* received); +DLLEXPORT int32_t SystemNative_SetSendTimeout(intptr_t socket, int32_t millisecondsTimeout); -int32_t SystemNative_SendMessage(intptr_t socket, struct MessageHeader* messageHeader, int32_t flags, int64_t* sent); +DLLEXPORT int32_t SystemNative_ReceiveMessage(intptr_t socket, struct MessageHeader* messageHeader, int32_t flags, int64_t* received); -int32_t SystemNative_Accept(intptr_t socket, uint8_t* socketAddress, int32_t* socketAddressLen, intptr_t* acceptedSocket); +DLLEXPORT int32_t SystemNative_SendMessage(intptr_t socket, struct MessageHeader* messageHeader, int32_t flags, int64_t* sent); -int32_t SystemNative_Bind(intptr_t socket, int32_t protocolType, uint8_t* socketAddress, int32_t socketAddressLen); +DLLEXPORT int32_t SystemNative_Accept(intptr_t socket, uint8_t* socketAddress, int32_t* socketAddressLen, intptr_t* acceptedSocket); -int32_t SystemNative_Connect(intptr_t socket, uint8_t* socketAddress, int32_t socketAddressLen); +DLLEXPORT int32_t SystemNative_Bind(intptr_t socket, int32_t protocolType, uint8_t* socketAddress, int32_t socketAddressLen); -int32_t SystemNative_GetPeerName(intptr_t socket, uint8_t* socketAddress, int32_t* socketAddressLen); +DLLEXPORT int32_t SystemNative_Connect(intptr_t socket, uint8_t* socketAddress, int32_t socketAddressLen); -int32_t SystemNative_GetSockName(intptr_t socket, uint8_t* socketAddress, int32_t* socketAddressLen); +DLLEXPORT int32_t SystemNative_GetPeerName(intptr_t socket, uint8_t* socketAddress, int32_t* socketAddressLen); -int32_t SystemNative_Listen(intptr_t socket, int32_t backlog); +DLLEXPORT int32_t SystemNative_GetSockName(intptr_t socket, uint8_t* socketAddress, int32_t* socketAddressLen); -int32_t SystemNative_Shutdown(intptr_t socket, int32_t socketShutdown); +DLLEXPORT int32_t SystemNative_Listen(intptr_t socket, int32_t backlog); -int32_t SystemNative_GetSocketErrorOption(intptr_t socket, int32_t* error); +DLLEXPORT int32_t SystemNative_Shutdown(intptr_t socket, int32_t socketShutdown); -int32_t SystemNative_GetSockOpt( +DLLEXPORT int32_t SystemNative_GetSocketErrorOption(intptr_t socket, int32_t* error); + +DLLEXPORT int32_t SystemNative_GetSockOpt( intptr_t socket, int32_t socketOptionLevel, int32_t socketOptionName, uint8_t* optionValue, int32_t* optionLen); -int32_t SystemNative_SetSockOpt( +DLLEXPORT int32_t SystemNative_SetSockOpt( intptr_t socket, int32_t socketOptionLevel, int32_t socketOptionName, uint8_t* optionValue, int32_t optionLen); -int32_t SystemNative_Socket(int32_t addressFamily, int32_t socketType, int32_t protocolType, intptr_t* createdSocket); +DLLEXPORT int32_t SystemNative_Socket(int32_t addressFamily, int32_t socketType, int32_t protocolType, intptr_t* createdSocket); -int32_t SystemNative_GetAtOutOfBandMark(intptr_t socket, int32_t* available); +DLLEXPORT int32_t SystemNative_GetAtOutOfBandMark(intptr_t socket, int32_t* available); -int32_t SystemNative_GetBytesAvailable(intptr_t socket, int32_t* available); +DLLEXPORT int32_t SystemNative_GetBytesAvailable(intptr_t socket, int32_t* available); -int32_t SystemNative_CreateSocketEventPort(intptr_t* port); +DLLEXPORT int32_t SystemNative_CreateSocketEventPort(intptr_t* port); -int32_t SystemNative_CloseSocketEventPort(intptr_t port); +DLLEXPORT int32_t SystemNative_CloseSocketEventPort(intptr_t port); -int32_t SystemNative_CreateSocketEventBuffer(int32_t count, struct SocketEvent** buffer); +DLLEXPORT int32_t SystemNative_CreateSocketEventBuffer(int32_t count, struct SocketEvent** buffer); -int32_t SystemNative_FreeSocketEventBuffer(struct SocketEvent* buffer); +DLLEXPORT int32_t SystemNative_FreeSocketEventBuffer(struct SocketEvent* buffer); -int32_t SystemNative_TryChangeSocketEventRegistration( +DLLEXPORT int32_t SystemNative_TryChangeSocketEventRegistration( intptr_t port, intptr_t socket, int32_t currentEvents, int32_t newEvents, uintptr_t data); -int32_t SystemNative_WaitForSocketEvents(intptr_t port, struct SocketEvent* buffer, int32_t* count); +DLLEXPORT int32_t SystemNative_WaitForSocketEvents(intptr_t port, struct SocketEvent* buffer, int32_t* count); -int32_t SystemNative_PlatformSupportsDualModeIPv4PacketInfo(void); +DLLEXPORT int32_t SystemNative_PlatformSupportsDualModeIPv4PacketInfo(void); -char* SystemNative_GetPeerUserName(intptr_t socket); +DLLEXPORT char* SystemNative_GetPeerUserName(intptr_t socket); -void SystemNative_GetDomainSocketSizes(int32_t* pathOffset, int32_t* pathSize, int32_t* addressSize); +DLLEXPORT void SystemNative_GetDomainSocketSizes(int32_t* pathOffset, int32_t* pathSize, int32_t* addressSize); -int32_t SystemNative_SendFile(intptr_t out_fd, intptr_t in_fd, int64_t offset, int64_t count, int64_t* sent); +DLLEXPORT int32_t SystemNative_SendFile(intptr_t out_fd, intptr_t in_fd, int64_t offset, int64_t count, int64_t* sent); END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Native/pal_networkstatistics.c b/external/corefx/src/Native/Unix/System.Native/pal_networkstatistics.c index 790119b12a..66d7978ade 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_networkstatistics.c +++ b/external/corefx/src/Native/Unix/System.Native/pal_networkstatistics.c @@ -245,7 +245,7 @@ int32_t SystemNative_GetEstimatedTcpConnectionCount() return count; } -size_t GetEstimatedTcpPcbSize() +static size_t GetEstimatedTcpPcbSize() { void* oldp = NULL; void* newp = NULL; @@ -345,7 +345,7 @@ int32_t SystemNative_GetEstimatedUdpListenerCount() return count; } -size_t GetEstimatedUdpPcbSize() +static size_t GetEstimatedUdpPcbSize() { void* oldp = NULL; void* newp = NULL; diff --git a/external/corefx/src/Native/Unix/System.Native/pal_networkstatistics.h b/external/corefx/src/Native/Unix/System.Native/pal_networkstatistics.h index 720ba99c2c..872ac0c30c 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_networkstatistics.h +++ b/external/corefx/src/Native/Unix/System.Native/pal_networkstatistics.h @@ -144,4 +144,26 @@ struct NativeIPInterfaceStatistics uint64_t InNoProto; }; +DLLEXPORT int32_t SystemNative_GetTcpGlobalStatistics(struct TcpGlobalStatistics* retStats); + +DLLEXPORT int32_t SystemNative_GetIPv4GlobalStatistics(struct IPv4GlobalStatistics* retStats); + +DLLEXPORT int32_t SystemNative_GetUdpGlobalStatistics(struct UdpGlobalStatistics* retStats); + +DLLEXPORT int32_t SystemNative_GetIcmpv4GlobalStatistics(struct Icmpv4GlobalStatistics* retStats); + +DLLEXPORT int32_t SystemNative_GetIcmpv6GlobalStatistics(struct Icmpv6GlobalStatistics* retStats); + +DLLEXPORT int32_t SystemNative_GetEstimatedTcpConnectionCount(void); + +DLLEXPORT int32_t SystemNative_GetActiveTcpConnectionInfos(struct NativeTcpConnectionInformation* infos, int32_t* infoCount); + +DLLEXPORT int32_t SystemNative_GetEstimatedUdpListenerCount(void); + +DLLEXPORT int32_t SystemNative_GetActiveUdpListeners(struct IPEndPointInfo* infos, int32_t* infoCount); + +DLLEXPORT int32_t SystemNative_GetNativeIPInterfaceStatistics(char* interfaceName, struct NativeIPInterfaceStatistics* retStats); + +DLLEXPORT int32_t SystemNative_GetNumRoutes(void); + END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Native/pal_process.cpp b/external/corefx/src/Native/Unix/System.Native/pal_process.cpp index c98bad7036..1790e76dea 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_process.cpp +++ b/external/corefx/src/Native/Unix/System.Native/pal_process.cpp @@ -32,10 +32,6 @@ // Validate that our Signals enum values are correct for the platform static_assert(PAL_SIGKILL == SIGKILL, ""); -// Validate that our WaitPidOptions enum values are correct for the platform -static_assert(PAL_WNOHANG == WNOHANG, ""); -static_assert(PAL_WUNTRACED == WUNTRACED, ""); - // Validate that our SysLogPriority values are correct for the platform static_assert(PAL_LOG_EMERG == LOG_EMERG, ""); static_assert(PAL_LOG_ALERT == LOG_ALERT, ""); @@ -151,6 +147,9 @@ extern "C" int32_t SystemNative_ForkAndExecProcess(const char* filename, int32_t redirectStdin, int32_t redirectStdout, int32_t redirectStderr, + int32_t setCredentials, + uint32_t userId, + uint32_t groupId, int32_t* childPid, int32_t* stdinFd, int32_t* stdoutFd, @@ -170,7 +169,7 @@ extern "C" int32_t SystemNative_ForkAndExecProcess(const char* filename, goto done; } - if ((redirectStdin & ~1) != 0 || (redirectStdout & ~1) != 0 || (redirectStderr & ~1) != 0) + if ((redirectStdin & ~1) != 0 || (redirectStdout & ~1) != 0 || (redirectStderr & ~1) != 0 || (setCredentials & ~1) != 0) { assert(false && "Boolean redirect* inputs must be 0 or 1."); errno = EINVAL; @@ -233,6 +232,14 @@ extern "C" int32_t SystemNative_ForkAndExecProcess(const char* filename, ExitChild(waitForChildToExecPipe[WRITE_END_OF_PIPE], errno); } + if (setCredentials) + { + if (setgid(groupId) == -1 || setuid(userId) == -1) + { + ExitChild(waitForChildToExecPipe[WRITE_END_OF_PIPE], errno); + } + } + // Change to the designated working directory, if one was specified if (nullptr != cwd) { @@ -290,6 +297,13 @@ done: CloseIfOpen(stdoutFds[READ_END_OF_PIPE]); CloseIfOpen(stderrFds[READ_END_OF_PIPE]); + // Reap child + if (processId > 0) + { + int status; + waitpid(processId, &status, 0); + } + *stdinFd = -1; *stdoutFd = -1; *stderrFd = -1; @@ -353,7 +367,12 @@ static int32_t ConvertRLimitResourcesPalToPlatform(RLimitResources value) static rlim_t ConvertFromManagedRLimitInfinityToPalIfNecessary(uint64_t value) { // rlim_t type can vary per platform, so we also treat anything outside its range as infinite. +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunknown-pragmas" +#pragma clang diagnostic ignored "-Wunknown-warning-option" +#pragma clang diagnostic ignored "-Wtautological-type-limit-compare" if (value == UINT64_MAX || value > std::numeric_limits::max()) +#pragma clang diagnostic pop return RLIM_INFINITY; return static_cast(value); @@ -431,33 +450,48 @@ extern "C" void SystemNative_SysLog(SysLogPriority priority, const char* message syslog(static_cast(priority), message, arg1); } -extern "C" int32_t SystemNative_WaitPid(int32_t pid, int32_t* status, WaitPidOptions options) +extern "C" int32_t SystemNative_WaitIdAnyExitedNoHangNoWait() { - assert(status != nullptr); - + siginfo_t siginfo; int32_t result; - while (CheckInterrupted(result = waitpid(pid, status, static_cast(options)))); + while (CheckInterrupted(result = waitid(P_ALL, 0, &siginfo, WEXITED | WNOHANG | WNOWAIT))); + if (result == -1 && errno == ECHILD) + { + // The calling process has no existing unwaited-for child processes. + result = 0; + } + else if (result == 0 && siginfo.si_signo == SIGCHLD) + { + result = siginfo.si_pid; + } return result; } -extern "C" int32_t SystemNative_WExitStatus(int32_t status) +extern "C" int32_t SystemNative_WaitPidExitedNoHang(int32_t pid, int32_t* exitCode) { - return WEXITSTATUS(status); -} + assert(exitCode != nullptr); -extern "C" int32_t SystemNative_WIfExited(int32_t status) -{ - return WIFEXITED(status); -} - -extern "C" int32_t SystemNative_WIfSignaled(int32_t status) -{ - return WIFSIGNALED(status); -} - -extern "C" int32_t SystemNative_WTermSig(int32_t status) -{ - return WTERMSIG(status); + int32_t result; + int status; + while (CheckInterrupted(result = waitpid(pid, &status, WNOHANG))); + if (result > 0) + { + if (WIFEXITED(status)) + { + // the child terminated normally. + *exitCode = WEXITSTATUS(status); + } + else if (WIFSIGNALED(status)) + { + // child process was terminated by a signal. + *exitCode = 128 + WTERMSIG(status); + } + else + { + assert(false); + } + } + return result; } extern "C" int64_t SystemNative_PathConf(const char* path, PathConfName name) diff --git a/external/corefx/src/Native/Unix/System.Native/pal_process.h b/external/corefx/src/Native/Unix/System.Native/pal_process.h index cfa2ff423f..81ee2d0619 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_process.h +++ b/external/corefx/src/Native/Unix/System.Native/pal_process.h @@ -4,6 +4,10 @@ #pragma once +#include "pal_compiler.h" + +BEGIN_EXTERN_C + #include "pal_types.h" #include #include @@ -18,14 +22,17 @@ * As would have been the case with fork/execve, a return value of 0 is success and -1 * is failure; if failure, error information is provided in errno. */ -extern "C" int32_t -SystemNative_ForkAndExecProcess(const char* filename, // filename argument to execve +DLLEXPORT int32_t SystemNative_ForkAndExecProcess( + const char* filename, // filename argument to execve char* const argv[], // argv argument to execve char* const envp[], // envp argument to execve const char* cwd, // path passed to chdir in child process int32_t redirectStdin, // whether to redirect standard input from the parent int32_t redirectStdout, // whether to redirect standard output to the parent int32_t redirectStderr, // whether to redirect standard error to the parent + int32_t setCredentials, // whether to set the userId and groupId for the child process + uint32_t userId, // the user id under which the child process should run + uint32_t groupId, // the group id under which the child process should run int32_t* childPid, // [out] the child process' id int32_t* stdinFd, // [out] if redirectStdin, the parent's fd for the child's stdin int32_t* stdoutFd, // [out] if redirectStdout, the parent's fd for the child's stdout @@ -34,12 +41,12 @@ SystemNative_ForkAndExecProcess(const char* filename, // filename argument to /** * Shim for the popen function. */ -extern "C" FILE* SystemNative_POpen(const char* command, const char* type); +DLLEXPORT FILE* SystemNative_POpen(const char* command, const char* type); /** * Shim for the pclose function. */ -extern "C" int32_t SystemNative_PClose(FILE* stream); +DLLEXPORT int32_t SystemNative_PClose(FILE* stream); /************ * The values below in the header are fixed and correct for managed callers to use forever. @@ -70,15 +77,6 @@ enum Signals : int32_t PAL_SIGKILL = 9, /* kill the specified process */ }; -/** - * Constants for passing to waitpid determining how waitpid behaves - */ -enum WaitPidOptions : int32_t -{ - PAL_WNOHANG = 1, /* don't block waiting */ - PAL_WUNTRACED = 2, /* report status of stopped children */ -}; - /** * Constants for passing to the first parameter of syslog. * These are a combination of flags where the lower bits are @@ -176,62 +174,59 @@ struct CpuSetBits * Get the current limit for the specified resource of the current process. * Returns 0 on success; returns -1 on failure and errno is set to the error reason. */ -extern "C" int32_t SystemNative_GetRLimit(RLimitResources resourceType, RLimit* limits); +DLLEXPORT int32_t SystemNative_GetRLimit(RLimitResources resourceType, RLimit* limits); /** * Set the soft and hard limits for the specified resource. * Only a super-user can increase hard limits for the current process. * Returns 0 on success; returns -1 on failure and errno is set to the error reason. */ -extern "C" int32_t SystemNative_SetRLimit(RLimitResources resourceType, const RLimit* limits); +DLLEXPORT int32_t SystemNative_SetRLimit(RLimitResources resourceType, const RLimit* limits); /** * Kill the specified process (or process group) identified by the supplied pid; the * process or process group will be killed by the specified signal. * Returns 0 on success; on failure, -1 is returned and errno is set */ -extern "C" int32_t SystemNative_Kill(int32_t pid, int32_t signal); +DLLEXPORT int32_t SystemNative_Kill(int32_t pid, int32_t signal); /** * Returns the Process ID of the current executing process. * This call should never fail */ -extern "C" int32_t SystemNative_GetPid(); +DLLEXPORT int32_t SystemNative_GetPid(); /** * Returns the sessions ID of the specified process; if 0 is passed in, returns the * session ID of the current process. * Returns a session ID on success; otherwise, returns -1 and sets errno. */ -extern "C" int32_t SystemNative_GetSid(int32_t pid); +DLLEXPORT int32_t SystemNative_GetSid(int32_t pid); /** * Write a message to the system logger, which in turn writes the message to the system console, log files, etc. * See man 3 syslog for more info */ -extern "C" void SystemNative_SysLog(SysLogPriority priority, const char* message, const char* arg1); +DLLEXPORT void SystemNative_SysLog(SysLogPriority priority, const char* message, const char* arg1); /** - * Waits for child process(s) or gathers resource utilization information about child processes + * Returns the pid of a terminated child without reaping it. * - * The return value from WaitPid can very greatly. - * 1) returns the process id of a terminating or stopped child process - * 2) if no children are waiting, -1 is returned and errno is set to ECHILD - * 3) if WNOHANG is specified and there are no stopped or exited children, 0 is returned - * 4) on error, -1 is returned and errno is set + * 1) returns the process id of a terminated child process + * 2) if no children are terminated, 0 is returned + * 3) on error, -1 is returned */ -extern "C" int32_t SystemNative_WaitPid(int32_t pid, int32_t* status, WaitPidOptions options); +extern "C" int32_t SystemNative_WaitIdAnyExitedNoHangNoWait(); /** - * The four functions below are wrappers around the platform-specific macros of the same name. + * Reaps a terminated child. + * + * 1) when a child is reaped, its process id is returned + * 2) if pid is not a child or there are no unwaited-for children, -1 is returned (errno=ECHILD) + * 3) if the child has not yet terminated, 0 is returned + * 4) on error, -1 is returned. */ -extern "C" int32_t SystemNative_WExitStatus(int32_t status); - -extern "C" int32_t SystemNative_WIfExited(int32_t status); - -extern "C" int32_t SystemNative_WIfSignaled(int32_t status); - -extern "C" int32_t SystemNative_WTermSig(int32_t status); +extern "C" int32_t SystemNative_WaitPidExitedNoHang(int32_t pid, int32_t* exitCode); /** * Gets the configurable limit or variable for system path or file descriptor options. @@ -239,7 +234,7 @@ extern "C" int32_t SystemNative_WTermSig(int32_t status); * Returns the requested variable value on success; if the variable does not have a limit, -1 is returned and errno * is not set; otherwise, -1 is returned and errno is set. */ -extern "C" int64_t SystemNative_PathConf(const char* path, PathConfName name); +DLLEXPORT int64_t SystemNative_PathConf(const char* path, PathConfName name); /** * Gets the priority (nice value) of a certain execution group. @@ -248,19 +243,19 @@ extern "C" int64_t SystemNative_PathConf(const char* path, PathConfName name); * valid nice value, meaning we can't use that value to determine valid output or not. Errno is set on failure so * we need to reset errno before a call and check the value if we get -1. */ -extern "C" int32_t SystemNative_GetPriority(PriorityWhich which, int32_t who); +DLLEXPORT int32_t SystemNative_GetPriority(PriorityWhich which, int32_t who); /** * Sets the priority (nice value) of a certain execution group. * * Returns 0 on success; otherwise, -1 and errno is set. */ -extern "C" int32_t SystemNative_SetPriority(PriorityWhich which, int32_t who, int32_t nice); +DLLEXPORT int32_t SystemNative_SetPriority(PriorityWhich which, int32_t who, int32_t nice); /** * Gets the current working directory of the currently executing process. */ -extern "C" char* SystemNative_GetCwd(char* buffer, int32_t bufferSize); +DLLEXPORT char* SystemNative_GetCwd(char* buffer, int32_t bufferSize); #if HAVE_SCHED_SETAFFINITY /** @@ -268,7 +263,7 @@ extern "C" char* SystemNative_GetCwd(char* buffer, int32_t bufferSize); * * Returns 0 on success; otherwise, -1 is returned and errno is set */ -extern "C" int32_t SystemNative_SchedSetAffinity(int32_t pid, intptr_t* mask); +DLLEXPORT int32_t SystemNative_SchedSetAffinity(int32_t pid, intptr_t* mask); #endif #if HAVE_SCHED_GETAFFINITY @@ -277,7 +272,9 @@ extern "C" int32_t SystemNative_SchedSetAffinity(int32_t pid, intptr_t* mask); * * Returns 0 on success; otherwise, -1 is returned and errno is set. */ -extern "C" int32_t SystemNative_SchedGetAffinity(int32_t pid, intptr_t* mask); +DLLEXPORT int32_t SystemNative_SchedGetAffinity(int32_t pid, intptr_t* mask); #endif -extern "C" char** SystemNative_GetEnviron(); +DLLEXPORT char** SystemNative_GetEnviron(); + +END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Native/pal_random.c b/external/corefx/src/Native/Unix/System.Native/pal_random.c new file mode 100644 index 0000000000..5c216cc88e --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/pal_random.c @@ -0,0 +1,109 @@ +// 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. + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "pal_config.h" +#include "pal_random.h" +/* + +Generate random bytes. The generated bytes are not cryptographically strong. + +*/ + +void SystemNative_GetNonCryptographicallySecureRandomBytes(uint8_t* buffer, int32_t bufferLength) +{ + assert(buffer != NULL); + +#if HAVE_ARC4RANDOM + arc4random_buf(buffer, (size_t)bufferLength); +#else + static volatile int rand_des = -1; + long num = 0; + static bool sMissingDevURandom; + static bool sInitializedMRand; + + if (!sMissingDevURandom) + { + if (rand_des == -1) + { + int fd; + + do + { +#if HAVE_O_CLOEXEC + fd = open("/dev/urandom", O_RDONLY, O_CLOEXEC); +#else + fd = open("/dev/urandom", O_RDONLY); + fcntl(fd, F_SETFD, FD_CLOEXEC); +#endif + } + while ((fd == -1) && (errno == EINTR)); + + if (fd != -1) + { + if (!__sync_bool_compare_and_swap(&rand_des, -1, fd)) + { + // Another thread has already set the rand_des + close(fd); + } + } + else if (errno == ENOENT) + { + sMissingDevURandom = true; + } + } + + if (rand_des != -1) + { + int32_t offset = 0; + do + { + ssize_t n = read(rand_des, buffer + offset , (size_t)(bufferLength - offset)); + if (n == -1) + { + if (errno == EINTR) + { + continue; + } + + assert(false && "read from /dev/urandom has failed"); + break; + } + + offset += n; + } + while (offset != bufferLength); + } + } + + if (!sInitializedMRand) + { + srand48(time(NULL)); + sInitializedMRand = true; + } + + // always xor srand48 over the whole buffer to get some randomness + // in case /dev/urandom is not really random + + for (int i = 0; i < bufferLength; i++) + { + if (i % 4 == 0) + { + num = lrand48(); + } + + *(buffer + i) ^= num; + num >>= 8; + } +#endif // HAS_ARC4RANDOM +} diff --git a/external/corefx/src/Native/Unix/System.Native/pal_random.cpp b/external/corefx/src/Native/Unix/System.Native/pal_random.cpp deleted file mode 100644 index 74ad5c5674..0000000000 --- a/external/corefx/src/Native/Unix/System.Native/pal_random.cpp +++ /dev/null @@ -1,111 +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. - -#include -#include -#include -#include -#include -#include -#include -#include - -/* - -Generate random bytes. The generated bytes are not cryptographically strong. - -*/ -extern "C" void SystemNative_GetNonCryptographicallySecureRandomBytes(uint8_t* buffer, int32_t bufferLength) -{ - assert(buffer != NULL); - - int rand_des; - char buf; - long num = 0; - - static bool sMissingDevRandom; - static bool sMissingDevURandom; - static bool sInitializedMRand; - - int i = 0; - - if (i < bufferLength && !sMissingDevRandom) - { - // request non-blocking access to avoid hangs if the /dev/random is exhausted - // or just simply broken - if ((rand_des = open("/dev/random", O_RDONLY | O_NONBLOCK)) == -1) - { - if (errno == ENOENT) - { - sMissingDevRandom = true; - } - - // Back off and try /dev/urandom. - } - else - { - for( ; i < bufferLength; i++) - { - if (read(rand_des, &buf, 1) < 1) - { - // the /dev/random pool has been exhausted. Fall back - // to /dev/urandom for the remainder of the buffer. - break; - } - - *(buffer + i) ^= buf; - } - - close(rand_des); - } - } - - if (i < bufferLength && !sMissingDevURandom) - { - if ((rand_des = open("/dev/urandom", O_RDONLY, 0)) == -1) - { - if (errno == ENOENT) - { - sMissingDevURandom = true; - } - - // Back off and try mrand48. - } - else - { - for( ; i < bufferLength; i++) - { - if (read(rand_des, &buf, 1) < 1) - { - // Fall back to srand48 for the remainder of the buffer. - break; - } - - *(buffer + i) ^= buf; - } - - close(rand_des); - } - } - - if (!sInitializedMRand) - { - srand48(time(NULL)); - sInitializedMRand = true; - } - - // always xor srand48 over the whole buffer to get some randomness - // in case /dev/random is not really random - - for(i = 0; i < bufferLength; i++) - { - if (i % 4 == 0) - { - num = lrand48(); - } - - *(buffer + i) ^= num; - num >>= 8; - } -} diff --git a/external/corefx/src/Native/Unix/System.Native/pal_random.h b/external/corefx/src/Native/Unix/System.Native/pal_random.h new file mode 100644 index 0000000000..ac94e09999 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/pal_random.h @@ -0,0 +1,15 @@ +// 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. + +#pragma once + +#include "pal_compiler.h" + +BEGIN_EXTERN_C + +#include "pal_types.h" + +DLLEXPORT void SystemNative_GetNonCryptographicallySecureRandomBytes(uint8_t* buffer, int32_t bufferLength); + +END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Native/pal_runtimeextensions.h b/external/corefx/src/Native/Unix/System.Native/pal_runtimeextensions.h index f85946b28c..dca88cff31 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_runtimeextensions.h +++ b/external/corefx/src/Native/Unix/System.Native/pal_runtimeextensions.h @@ -4,6 +4,12 @@ #pragma once +#include "pal_compiler.h" + +BEGIN_EXTERN_C + #include "pal_types.h" -extern "C" int32_t SystemNative_GetNodeName(char* version, int* capacity); +DLLEXPORT int32_t SystemNative_GetNodeName(char* version, int* capacity); + +END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Native/pal_runtimeinformation.h b/external/corefx/src/Native/Unix/System.Native/pal_runtimeinformation.h index dc57500d3a..670cd7cc75 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_runtimeinformation.h +++ b/external/corefx/src/Native/Unix/System.Native/pal_runtimeinformation.h @@ -4,17 +4,21 @@ #pragma once +#include "pal_compiler.h" + +BEGIN_EXTERN_C + #include "pal_types.h" -extern "C" const char* SystemNative_GetUnixName(); +DLLEXPORT const char* SystemNative_GetUnixName(); -extern "C" char* SystemNative_GetUnixRelease(); +DLLEXPORT char* SystemNative_GetUnixRelease(); -extern "C" int32_t SystemNative_GetUnixVersion(char* version, int* capacity); +DLLEXPORT int32_t SystemNative_GetUnixVersion(char* version, int* capacity); -extern "C" int32_t SystemNative_GetOSArchitecture(); +DLLEXPORT int32_t SystemNative_GetOSArchitecture(); -extern "C" int32_t SystemNative_GetProcessArchitecture(); +DLLEXPORT int32_t SystemNative_GetProcessArchitecture(); enum { @@ -23,3 +27,5 @@ enum ARCH_ARM, ARCH_ARM64 }; + +END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Native/pal_signal.c b/external/corefx/src/Native/Unix/System.Native/pal_signal.c new file mode 100644 index 0000000000..60f5ff0f25 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/pal_signal.c @@ -0,0 +1,291 @@ +// 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. + +#include "pal_config.h" +#include "pal_console.h" +#include "pal_signal.h" +#include "pal_io.h" +#include "pal_utilities.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; +static struct sigaction g_origSigIntHandler, g_origSigQuitHandler; // saved signal handlers for ctrl handling +static struct sigaction g_origSigContHandler, g_origSigChldHandler; // saved signal handlers for reinitialization +static volatile CtrlCallback g_ctrlCallback = NULL; // Callback invoked for SIGINT/SIGQUIT +static volatile SigChldCallback g_sigChldCallback = NULL; // Callback invoked for SIGCHLD +static int g_signalPipe[2] = {-1, -1}; // Pipe used between signal handler and worker + +static struct sigaction* OrigActionFor(int sig) +{ + switch (sig) + { + case SIGINT: return &g_origSigIntHandler; + case SIGQUIT: return &g_origSigQuitHandler; + case SIGCONT: return &g_origSigContHandler; + case SIGCHLD: return &g_origSigChldHandler; + } + + assert(false); + return NULL; +} + +static void SignalHandler(int sig, siginfo_t* siginfo, void* context) +{ + if (sig == SIGCONT || sig == SIGCHLD) + { + // SIGCONT will be sent when we're resumed after suspension, at which point + // we need to set the terminal back up. Similarly, SIGCHLD will be sent after + // a child process completes, and that child could have left things in a bad state, + // so we similarly need to reinitialize. + ReinitializeConsole(); + } + + // Signal handler for signals where we want our background thread to do the real processing. + // It simply writes the signal code to a pipe that's read by the thread. + if (sig == SIGQUIT || sig == SIGINT || sig == SIGCHLD) + { + // Write the signal code to the pipe + uint8_t signalCodeByte = (uint8_t)sig; + ssize_t writtenBytes; + while ((writtenBytes = write(g_signalPipe[1], &signalCodeByte, 1)) < 0 && errno == EINTR); + + if (writtenBytes != 1) + { + abort(); // fatal error + } + } + + // Delegate to any saved handler we may have + // We assume the original SIGCHLD handler will not reap our children. + if (sig == SIGCONT || sig == SIGCHLD) + { + struct sigaction* origHandler = OrigActionFor(sig); + if (origHandler->sa_sigaction != NULL && + (void*)origHandler->sa_sigaction != (void*)SIG_DFL && + (void*)origHandler->sa_sigaction != (void*)SIG_IGN) + { + origHandler->sa_sigaction(sig, siginfo, context); + } + } +} + +// Entrypoint for the thread that handles signals where our handling +// isn't signal-safe. Those signal handlers write the signal to a pipe, +// which this loop reads and processes. +static void* SignalHandlerLoop(void* arg) +{ + // Passed in argument is a ptr to the file descriptor + // for the read end of the pipe. + assert(arg != NULL); + int pipeFd = *(int*)arg; + free(arg); + assert(pipeFd >= 0); + + // Continually read a signal code from the signal pipe and process it, + // until the pipe is closed. + while (true) + { + // Read the next signal, trying again if we were interrupted + uint8_t signalCode; + ssize_t bytesRead; + while ((bytesRead = read(pipeFd, &signalCode, 1)) < 0 && errno == EINTR); + + if (bytesRead <= 0) + { + // Write end of pipe was closed or another error occurred. + // Regardless, no more data is available, so we close the read + // end of the pipe and exit. + close(pipeFd); + return NULL; + } + + if (signalCode == SIGQUIT || signalCode == SIGINT) + { + // We're now handling SIGQUIT and SIGINT. Invoke the callback, if we have one. + CtrlCallback callback = g_ctrlCallback; + int rv = callback != NULL ? callback(signalCode == SIGQUIT ? Break : Interrupt) : 0; + if (rv == 0) // callback removed or was invoked and didn't handle the signal + { + // In general, we now want to remove our handler and reissue the signal to + // be picked up by the previously registered handler. In the most common case, + // this will be the default handler, causing the process to be torn down. + // It could also be a custom handler registered by other code before us. + UninitializeConsole(); + sigaction(signalCode, OrigActionFor(signalCode), NULL); + kill(getpid(), signalCode); + } + } + else if (signalCode == SIGCHLD) + { + // When the original disposition is SIG_IGN, children that terminated did not become zombies. + // Since we overwrote the disposition, we have become responsible for reaping those processes. + bool reapAll = (void*)OrigActionFor(signalCode)->sa_sigaction == (void*)SIG_IGN; + SigChldCallback callback = g_sigChldCallback; + + // double-checked locking + if (callback == NULL && reapAll) + { + // avoid race with SystemNative_RegisterForSigChld + pthread_mutex_lock(&lock); + { + callback = g_sigChldCallback; + if (callback == NULL) + { + pid_t pid; + do + { + int status; + while ((pid = waitpid(-1, &status, WNOHANG)) < 0 && errno == EINTR); + } while (pid > 0); + } + } + } + + if (callback != NULL) + { + callback(reapAll ? 1 : 0); + } + } + else + { + assert_msg(false, "invalid signalCode", (int)signalCode); + } + } +} + +static void CloseSignalHandlingPipe() +{ + assert(g_signalPipe[0] >= 0); + assert(g_signalPipe[1] >= 0); + close(g_signalPipe[0]); + close(g_signalPipe[1]); + g_signalPipe[0] = -1; + g_signalPipe[1] = -1; +} + +void SystemNative_RegisterForCtrl(CtrlCallback callback) +{ + assert(callback != NULL); + assert(g_ctrlCallback == NULL); + g_ctrlCallback = callback; +} + +void SystemNative_UnregisterForCtrl() +{ + assert(g_ctrlCallback != NULL); + g_ctrlCallback = NULL; +} + +uint32_t SystemNative_RegisterForSigChld(SigChldCallback callback) +{ + if (!InitializeSignalHandling()) + { + return 0; + } + + assert(callback != NULL); + assert(g_sigChldCallback == NULL); + + pthread_mutex_lock(&lock); + { + g_sigChldCallback = callback; + } + pthread_mutex_unlock(&lock); + + return 1; +} + +static void InstallSignalHandler(int sig, bool skipWhenSigIgn) +{ + int rv; + struct sigaction* orig = OrigActionFor(sig); + + if (skipWhenSigIgn) + { + rv = sigaction(sig, NULL, orig); + assert(rv == 0); + if ((void*)orig->sa_sigaction == (void*)SIG_IGN) + { + return; + } + } + + struct sigaction newAction; + memset(&newAction, 0, sizeof(struct sigaction)); + newAction.sa_flags = SA_RESTART | SA_SIGINFO; + sigemptyset(&newAction.sa_mask); + newAction.sa_sigaction = &SignalHandler; + + rv = sigaction(sig, &newAction, orig); + assert(rv == 0); +} + +static bool InitializeSignalHandlingCore() +{ + // Create a pipe we'll use to communicate with our worker + // thread. We can't do anything interesting in the signal handler, + // so we instead send a message to another thread that'll do + // the handling work. + if (SystemNative_Pipe(g_signalPipe, PAL_O_CLOEXEC) != 0) + { + return false; + } + assert(g_signalPipe[0] >= 0); + assert(g_signalPipe[1] >= 0); + + // Create a small object to pass the read end of the pipe to the worker. + int* readFdPtr = (int*)malloc(sizeof(int)); + if (readFdPtr == NULL) + { + CloseSignalHandlingPipe(); + errno = ENOMEM; + return false; + } + *readFdPtr = g_signalPipe[0]; + + // The pipe is created. Create the worker thread. + pthread_t handlerThread; + if (pthread_create(&handlerThread, NULL, SignalHandlerLoop, readFdPtr) != 0) + { + int err = errno; + free(readFdPtr); + CloseSignalHandlingPipe(); + errno = err; + return false; + } + + // Finally, register our signal handlers + // We don't handle ignored SIGINT/SIGQUIT signals. If we'd setup a handler, our child + // processes would reset to the default on exec causing them to terminate on these signals. + InstallSignalHandler(SIGINT , /* skipWhenSigIgn */ true); + InstallSignalHandler(SIGQUIT, /* skipWhenSigIgn */ true); + InstallSignalHandler(SIGCONT, /* skipWhenSigIgn */ false); + InstallSignalHandler(SIGCHLD, /* skipWhenSigIgn */ false); + + return true; +} + +uint32_t InitializeSignalHandling() +{ + static bool initialized = false; + + pthread_mutex_lock(&lock); + { + if (!initialized) + { + initialized = InitializeSignalHandlingCore(); + } + } + pthread_mutex_unlock(&lock); + + return initialized ? 1 : 0; +} diff --git a/external/corefx/src/Native/Unix/System.Native/pal_signal.h b/external/corefx/src/Native/Unix/System.Native/pal_signal.h new file mode 100644 index 0000000000..78aa124a37 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Native/pal_signal.h @@ -0,0 +1,54 @@ +// 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. + +#pragma once + +#include "pal_compiler.h" + +BEGIN_EXTERN_C + +#include "pal_types.h" + +/** + * Initializes the signal handling for use by System.Console and System.Process. + * + * Returns 1 on success; otherwise returns 0 and sets errno. + */ +uint32_t InitializeSignalHandling(void); + +/** + * Hooks up the specified callback for notifications when SIGINT or SIGQUIT is received. + * + * Not thread safe. Caller must provide its owns synchronization to ensure RegisterForCtrl + * is not called concurrently with itself or with UnregisterForCtrl. + * + * Should only be called when a callback is not currently registered. + */ +DLLEXPORT void SystemNative_RegisterForCtrl(CtrlCallback callback); + +/** + * Unregisters the previously registered ctrlCCallback. + * + * Not thread safe. Caller must provide its owns synchronization to ensure UnregisterForCtrl + * is not called concurrently with itself or with RegisterForCtrl. + * + * Should only be called when a callback is currently registered. The pointer + * previously registered must remain valid until all ctrl handling activity + * has quiesced. + */ +DLLEXPORT void SystemNative_UnregisterForCtrl(void); + +typedef void (*SigChldCallback)(int reapAll); + +/** + * Hooks up the specified callback for notifications when SIGCHLD is received. + * + * Not thread safe. Caller must provide its owns synchronization to ensure RegisterForSigChld + * is not called concurrently with itself. + * + * Should only be called when a callback is not currently registered. + */ +DLLEXPORT uint32_t SystemNative_RegisterForSigChld(SigChldCallback callback); + +END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Native/pal_string.h b/external/corefx/src/Native/Unix/System.Native/pal_string.h index b36b1edb93..6ac2663290 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_string.h +++ b/external/corefx/src/Native/Unix/System.Native/pal_string.h @@ -4,6 +4,10 @@ #pragma once +#include "pal_compiler.h" + +BEGIN_EXTERN_C + #include "pal_types.h" /** @@ -14,7 +18,7 @@ * success; if the return value is equal to the size then the result may have been truncated. * On failure, returns a negative value. */ -extern "C" int32_t SystemNative_SNPrintF(char* string, int32_t size, const char* format, ...); +DLLEXPORT int32_t SystemNative_SNPrintF(char* string, int32_t size, const char* format, ...); /** * printf is difficult to represent in C# due to the argument list, so the C# PInvoke @@ -23,4 +27,6 @@ extern "C" int32_t SystemNative_SNPrintF(char* string, int32_t size, const char* * Returns the number of characters written to the output stream on success; otherwise, returns * a negative number and errno and ferror are both set. */ -extern "C" int32_t SystemNative_PrintF(const char* format, ...); +DLLEXPORT int32_t SystemNative_PrintF(const char* format, ...); + +END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Native/pal_sysctl.h b/external/corefx/src/Native/Unix/System.Native/pal_sysctl.h index d173f850ea..79e0c17160 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_sysctl.h +++ b/external/corefx/src/Native/Unix/System.Native/pal_sysctl.h @@ -4,9 +4,15 @@ #pragma once +#include "pal_compiler.h" + +BEGIN_EXTERN_C + #include "pal_types.h" #include "pal_errno.h" -extern "C" int32_t SystemNative_Sysctl(int* name, unsigned int namelen, void* value, size_t* len); +DLLEXPORT int32_t SystemNative_Sysctl(int* name, unsigned int namelen, void* value, size_t* len); + +END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Native/pal_tcpstate.h b/external/corefx/src/Native/Unix/System.Native/pal_tcpstate.h index ff1b56e7e8..1e84af9453 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_tcpstate.h +++ b/external/corefx/src/Native/Unix/System.Native/pal_tcpstate.h @@ -27,6 +27,6 @@ enum TcpState TcpState_DeleteTcb }; -int32_t SystemNative_MapTcpState(int32_t tcpState); +DLLEXPORT int32_t SystemNative_MapTcpState(int32_t tcpState); END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Native/pal_time.h b/external/corefx/src/Native/Unix/System.Native/pal_time.h index 375cdec4c5..99308ff9e3 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_time.h +++ b/external/corefx/src/Native/Unix/System.Native/pal_time.h @@ -4,6 +4,10 @@ #pragma once +#include "pal_compiler.h" + +BEGIN_EXTERN_C + #include "pal_types.h" struct UTimBuf @@ -17,18 +21,24 @@ struct UTimBuf * * Returns 0 on success; otherwise, returns -1 and errno is set. */ -extern "C" int32_t SystemNative_UTime(const char* path, UTimBuf* time); +DLLEXPORT int32_t SystemNative_UTime(const char* path, UTimBuf* time); /** * Gets the resolution of the timestamp, in counts per second. * * Returns 1 on success; otherwise, 0 on failure. */ -extern "C" int32_t SystemNative_GetTimestampResolution(uint64_t* resolution); +DLLEXPORT int32_t SystemNative_GetTimestampResolution(uint64_t* resolution); /** * Gets a high-resolution timestamp that can be used for time-interval measurements. * * Returns 1 on success; otherwise, 0 on failure. */ -extern "C" int32_t SystemNative_GetTimestamp(uint64_t* timestamp); +DLLEXPORT int32_t SystemNative_GetTimestamp(uint64_t* timestamp); + +DLLEXPORT int32_t SystemNative_GetAbsoluteTime(uint64_t* timestamp); + +DLLEXPORT int32_t SystemNative_GetTimebaseInfo(uint32_t* numer, uint32_t* denom); + +END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Native/pal_uid.cpp b/external/corefx/src/Native/Unix/System.Native/pal_uid.cpp index 1738ab00a6..7de1a8eeb5 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_uid.cpp +++ b/external/corefx/src/Native/Unix/System.Native/pal_uid.cpp @@ -13,20 +13,8 @@ #include #include -extern "C" int32_t SystemNative_GetPwUidR(uint32_t uid, Passwd* pwd, char* buf, int32_t buflen) +static int32_t ConvertNativePasswdToPalPasswd(int error, struct passwd* nativePwd, struct passwd* result, Passwd* pwd) { - assert(pwd != nullptr); - assert(buf != nullptr); - assert(buflen >= 0); - - if (buflen < 0) - return EINVAL; - - struct passwd nativePwd; - struct passwd* result; - int error; - while ((error = getpwuid_r(uid, &nativePwd, buf, UnsignedCast(buflen), &result)) == EINTR); - // positive error number returned -> failure other than entry-not-found if (error != 0) { @@ -43,17 +31,51 @@ extern "C" int32_t SystemNative_GetPwUidR(uint32_t uid, Passwd* pwd, char* buf, } // 0 returned with non-null result (guaranteed to be set to pwd arg) -> success - assert(result == &nativePwd); - pwd->Name = nativePwd.pw_name; - pwd->Password = nativePwd.pw_passwd; - pwd->UserId = nativePwd.pw_uid; - pwd->GroupId = nativePwd.pw_gid; - pwd->UserInfo = nativePwd.pw_gecos; - pwd->HomeDirectory = nativePwd.pw_dir; - pwd->Shell = nativePwd.pw_shell; + assert(result == nativePwd); + pwd->Name = nativePwd->pw_name; + pwd->Password = nativePwd->pw_passwd; + pwd->UserId = nativePwd->pw_uid; + pwd->GroupId = nativePwd->pw_gid; + pwd->UserInfo = nativePwd->pw_gecos; + pwd->HomeDirectory = nativePwd->pw_dir; + pwd->Shell = nativePwd->pw_shell; return 0; } +extern "C" int32_t SystemNative_GetPwUidR(uint32_t uid, Passwd* pwd, char* buf, int32_t buflen) +{ + assert(pwd != nullptr); + assert(buf != nullptr); + assert(buflen >= 0); + + if (buflen < 0) + return EINVAL; + + struct passwd nativePwd; + struct passwd* result; + int error; + while ((error = getpwuid_r(uid, &nativePwd, buf, UnsignedCast(buflen), &result)) == EINTR); + + return ConvertNativePasswdToPalPasswd(error, &nativePwd, result, pwd); +} + +extern "C" int32_t SystemNative_GetPwNamR(const char* name, Passwd* pwd, char* buf, int32_t buflen) +{ + assert(pwd != nullptr); + assert(buf != nullptr); + assert(buflen >= 0); + + if (buflen < 0) + return EINVAL; + + struct passwd nativePwd; + struct passwd* result; + int error; + while ((error = getpwnam_r(name, &nativePwd, buf, UnsignedCast(buflen), &result)) == EINTR); + + return ConvertNativePasswdToPalPasswd(error, &nativePwd, result, pwd); +} + extern "C" uint32_t SystemNative_GetEUid() { return geteuid(); diff --git a/external/corefx/src/Native/Unix/System.Native/pal_uid.h b/external/corefx/src/Native/Unix/System.Native/pal_uid.h index 1c7af67440..c117a59ed3 100644 --- a/external/corefx/src/Native/Unix/System.Native/pal_uid.h +++ b/external/corefx/src/Native/Unix/System.Native/pal_uid.h @@ -4,6 +4,10 @@ #pragma once +#include "pal_compiler.h" + +BEGIN_EXTERN_C + #include "pal_types.h" #include @@ -29,7 +33,16 @@ struct Passwd * number for any other failure. * */ -extern "C" int32_t SystemNative_GetPwUidR(uint32_t uid, Passwd* pwd, char* buf, int32_t buflen); +DLLEXPORT int32_t SystemNative_GetPwUidR(uint32_t uid, Passwd* pwd, char* buf, int32_t buflen); + +/** +* Gets a password structure for the given user name. +* Implemented as shim to getpwnam_r(3). +* +* Returns 0 for success, -1 if no entry found, positive error +* number for any other failure. +*/ +DLLEXPORT int32_t SystemNative_GetPwNamR(const char* name, Passwd* pwd, char* buf, int32_t buflen); /** * Gets and returns the effective user's identity. @@ -37,7 +50,7 @@ extern "C" int32_t SystemNative_GetPwUidR(uint32_t uid, Passwd* pwd, char* buf, * * Always succeeds. */ -extern "C" uint32_t SystemNative_GetEUid(); +DLLEXPORT uint32_t SystemNative_GetEUid(); /** * Gets and returns the effective group's identity. @@ -45,7 +58,7 @@ extern "C" uint32_t SystemNative_GetEUid(); * * Always succeeds. */ -extern "C" uint32_t SystemNative_GetEGid(); +DLLEXPORT uint32_t SystemNative_GetEGid(); /** * Sets the effective user ID of the calling process @@ -53,5 +66,6 @@ extern "C" uint32_t SystemNative_GetEGid(); * * Returns 0 for success. On error, -1 is returned and errno is set. */ -extern "C" int32_t SystemNative_SetEUid(uid_t euid); +DLLEXPORT int32_t SystemNative_SetEUid(uid_t euid); +END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Net.Http.Native/pal_easy.cpp b/external/corefx/src/Native/Unix/System.Net.Http.Native/pal_easy.cpp index f0d3469914..cf909a528d 100644 --- a/external/corefx/src/Native/Unix/System.Net.Http.Native/pal_easy.cpp +++ b/external/corefx/src/Native/Unix/System.Net.Http.Native/pal_easy.cpp @@ -8,110 +8,113 @@ #include #include -static_assert(PAL_CURLOPT_INFILESIZE == CURLOPT_INFILESIZE, ""); -static_assert(PAL_CURLOPT_SSLVERSION == CURLOPT_SSLVERSION, ""); -static_assert(PAL_CURLOPT_VERBOSE == CURLOPT_VERBOSE, ""); -static_assert(PAL_CURLOPT_NOBODY == CURLOPT_NOBODY, ""); -static_assert(PAL_CURLOPT_UPLOAD == CURLOPT_UPLOAD, ""); -static_assert(PAL_CURLOPT_POST == CURLOPT_POST, ""); -static_assert(PAL_CURLOPT_FOLLOWLOCATION == CURLOPT_FOLLOWLOCATION, ""); -static_assert(PAL_CURLOPT_PROXYPORT == CURLOPT_PROXYPORT, ""); -static_assert(PAL_CURLOPT_POSTFIELDSIZE == CURLOPT_POSTFIELDSIZE, ""); -static_assert(PAL_CURLOPT_SSL_VERIFYPEER == CURLOPT_SSL_VERIFYPEER, ""); -static_assert(PAL_CURLOPT_MAXREDIRS == CURLOPT_MAXREDIRS, ""); -static_assert(PAL_CURLOPT_SSL_VERIFYHOST == CURLOPT_SSL_VERIFYHOST, ""); -static_assert(PAL_CURLOPT_HTTP_VERSION == CURLOPT_HTTP_VERSION, ""); -static_assert(PAL_CURLOPT_DNS_CACHE_TIMEOUT == CURLOPT_DNS_CACHE_TIMEOUT, ""); -static_assert(PAL_CURLOPT_NOSIGNAL == CURLOPT_NOSIGNAL, ""); -static_assert(PAL_CURLOPT_PROXYTYPE == CURLOPT_PROXYTYPE, ""); -static_assert(PAL_CURLOPT_HTTPAUTH == CURLOPT_HTTPAUTH, ""); -static_assert(PAL_CURLOPT_TCP_NODELAY == CURLOPT_TCP_NODELAY, ""); -static_assert(PAL_CURLOPT_CONNECTTIMEOUT_MS == CURLOPT_CONNECTTIMEOUT_MS, ""); -static_assert(PAL_CURLOPT_ADDRESS_SCOPE == CURLOPT_ADDRESS_SCOPE, ""); -static_assert(PAL_CURLOPT_PROTOCOLS == CURLOPT_PROTOCOLS, ""); -static_assert(PAL_CURLOPT_REDIR_PROTOCOLS == CURLOPT_REDIR_PROTOCOLS, ""); +static_assert((int)PAL_CURLOPT_INFILESIZE == (int)CURLOPT_INFILESIZE, ""); +static_assert((int)PAL_CURLOPT_SSLVERSION == (int)CURLOPT_SSLVERSION, ""); +static_assert((int)PAL_CURLOPT_VERBOSE == (int)CURLOPT_VERBOSE, ""); +static_assert((int)PAL_CURLOPT_NOBODY == (int)CURLOPT_NOBODY, ""); +static_assert((int)PAL_CURLOPT_UPLOAD == (int)CURLOPT_UPLOAD, ""); +static_assert((int)PAL_CURLOPT_POST == (int)CURLOPT_POST, ""); +static_assert((int)PAL_CURLOPT_FOLLOWLOCATION == (int)CURLOPT_FOLLOWLOCATION, ""); +static_assert((int)PAL_CURLOPT_PROXYPORT == (int)CURLOPT_PROXYPORT, ""); +static_assert((int)PAL_CURLOPT_POSTFIELDSIZE == (int)CURLOPT_POSTFIELDSIZE, ""); +static_assert((int)PAL_CURLOPT_SSL_VERIFYPEER == (int)CURLOPT_SSL_VERIFYPEER, ""); +static_assert((int)PAL_CURLOPT_MAXREDIRS == (int)CURLOPT_MAXREDIRS, ""); +static_assert((int)PAL_CURLOPT_SSL_VERIFYHOST == (int)CURLOPT_SSL_VERIFYHOST, ""); +static_assert((int)PAL_CURLOPT_HTTP_VERSION == (int)CURLOPT_HTTP_VERSION, ""); +static_assert((int)PAL_CURLOPT_DNS_CACHE_TIMEOUT == (int)CURLOPT_DNS_CACHE_TIMEOUT, ""); +static_assert((int)PAL_CURLOPT_NOSIGNAL == (int)CURLOPT_NOSIGNAL, ""); +static_assert((int)PAL_CURLOPT_PROXYTYPE == (int)CURLOPT_PROXYTYPE, ""); +static_assert((int)PAL_CURLOPT_HTTPAUTH == (int)CURLOPT_HTTPAUTH, ""); +static_assert((int)PAL_CURLOPT_TCP_NODELAY == (int)CURLOPT_TCP_NODELAY, ""); +static_assert((int)PAL_CURLOPT_TCP_KEEPALIVE == (int)CURLOPT_TCP_KEEPALIVE, ""); +static_assert((int)PAL_CURLOPT_CONNECTTIMEOUT_MS == (int)CURLOPT_CONNECTTIMEOUT_MS, ""); +static_assert((int)PAL_CURLOPT_ADDRESS_SCOPE == (int)CURLOPT_ADDRESS_SCOPE, ""); +static_assert((int)PAL_CURLOPT_PROTOCOLS == (int)CURLOPT_PROTOCOLS, ""); +static_assert((int)PAL_CURLOPT_REDIR_PROTOCOLS == (int)CURLOPT_REDIR_PROTOCOLS, ""); -static_assert(PAL_CURLOPT_URL == CURLOPT_URL, ""); -static_assert(PAL_CURLOPT_PROXY == CURLOPT_PROXY, ""); -static_assert(PAL_CURLOPT_PROXYUSERPWD == CURLOPT_PROXYUSERPWD, ""); -static_assert(PAL_CURLOPT_COOKIE == CURLOPT_COOKIE, ""); -static_assert(PAL_CURLOPT_HTTPHEADER == CURLOPT_HTTPHEADER, ""); -static_assert(PAL_CURLOPT_CUSTOMREQUEST == CURLOPT_CUSTOMREQUEST, ""); -static_assert(PAL_CURLOPT_ACCEPT_ENCODING == CURLOPT_ACCEPT_ENCODING, ""); -static_assert(PAL_CURLOPT_PRIVATE == CURLOPT_PRIVATE, ""); -static_assert(PAL_CURLOPT_COPYPOSTFIELDS == CURLOPT_COPYPOSTFIELDS, ""); -static_assert(PAL_CURLOPT_USERNAME == CURLOPT_USERNAME, ""); -static_assert(PAL_CURLOPT_PASSWORD == CURLOPT_PASSWORD, ""); -static_assert(PAL_CURLOPT_CAPATH == CURLOPT_CAPATH, ""); +static_assert((int)PAL_CURLOPT_URL == (int)CURLOPT_URL, ""); +static_assert((int)PAL_CURLOPT_PROXY == (int)CURLOPT_PROXY, ""); +static_assert((int)PAL_CURLOPT_PROXYUSERPWD == (int)CURLOPT_PROXYUSERPWD, ""); +static_assert((int)PAL_CURLOPT_COOKIE == (int)CURLOPT_COOKIE, ""); +static_assert((int)PAL_CURLOPT_HTTPHEADER == (int)CURLOPT_HTTPHEADER, ""); +static_assert((int)PAL_CURLOPT_CUSTOMREQUEST == (int)CURLOPT_CUSTOMREQUEST, ""); +static_assert((int)PAL_CURLOPT_ACCEPT_ENCODING == (int)CURLOPT_ACCEPT_ENCODING, ""); +static_assert((int)PAL_CURLOPT_PRIVATE == (int)CURLOPT_PRIVATE, ""); +static_assert((int)PAL_CURLOPT_COPYPOSTFIELDS == (int)CURLOPT_COPYPOSTFIELDS, ""); +static_assert((int)PAL_CURLOPT_USERNAME == (int)CURLOPT_USERNAME, ""); +static_assert((int)PAL_CURLOPT_PASSWORD == (int)CURLOPT_PASSWORD, ""); +static_assert((int)PAL_CURLOPT_CAPATH == (int)CURLOPT_CAPATH, ""); #ifdef CURLOPT_PROXY_CAPATH -static_assert(PAL_CURLOPT_PROXY_CAPATH == CURLOPT_PROXY_CAPATH, ""); +static_assert((int)PAL_CURLOPT_PROXY_CAPATH == (int)CURLOPT_PROXY_CAPATH, ""); #endif -static_assert(PAL_CURLOPT_CAINFO == CURLOPT_CAINFO, ""); +static_assert((int)PAL_CURLOPT_CAINFO == (int)CURLOPT_CAINFO, ""); #ifdef CURLOPT_PROXY_CAINFO -static_assert(PAL_CURLOPT_PROXY_CAINFO == CURLOPT_PROXY_CAINFO, ""); +static_assert((int)PAL_CURLOPT_PROXY_CAINFO == (int)CURLOPT_PROXY_CAINFO, ""); #endif -static_assert(PAL_CURLOPT_INFILESIZE_LARGE == CURLOPT_INFILESIZE_LARGE, ""); -static_assert(PAL_CURLOPT_POSTFIELDSIZE_LARGE == CURLOPT_POSTFIELDSIZE_LARGE, ""); +static_assert((int)PAL_CURLOPT_INFILESIZE_LARGE == (int)CURLOPT_INFILESIZE_LARGE, ""); +static_assert((int)PAL_CURLOPT_POSTFIELDSIZE_LARGE == (int)CURLOPT_POSTFIELDSIZE_LARGE, ""); -static_assert(PAL_CURLE_OK == CURLE_OK, ""); -static_assert(PAL_CURLE_UNSUPPORTED_PROTOCOL == CURLE_UNSUPPORTED_PROTOCOL, ""); -static_assert(PAL_CURLE_FAILED_INIT == CURLE_FAILED_INIT, ""); -static_assert(PAL_CURLE_NOT_BUILT_IN == CURLE_NOT_BUILT_IN, ""); -static_assert(PAL_CURLE_COULDNT_RESOLVE_HOST == CURLE_COULDNT_RESOLVE_HOST, ""); -static_assert(PAL_CURLE_OUT_OF_MEMORY == CURLE_OUT_OF_MEMORY, ""); -static_assert(PAL_CURLE_OPERATION_TIMEDOUT == CURLE_OPERATION_TIMEDOUT, ""); -static_assert(PAL_CURLE_ABORTED_BY_CALLBACK == CURLE_ABORTED_BY_CALLBACK, ""); -static_assert(PAL_CURLE_UNKNOWN_OPTION == CURLE_UNKNOWN_OPTION, ""); -static_assert(PAL_CURLE_RECV_ERROR == CURLE_RECV_ERROR, ""); -static_assert(PAL_CURLE_SEND_FAIL_REWIND == CURLE_SEND_FAIL_REWIND, ""); +static_assert((int)PAL_CURLE_OK == (int)CURLE_OK, ""); +static_assert((int)PAL_CURLE_UNSUPPORTED_PROTOCOL == (int)CURLE_UNSUPPORTED_PROTOCOL, ""); +static_assert((int)PAL_CURLE_FAILED_INIT == (int)CURLE_FAILED_INIT, ""); +static_assert((int)PAL_CURLE_NOT_BUILT_IN == (int)CURLE_NOT_BUILT_IN, ""); +static_assert((int)PAL_CURLE_COULDNT_RESOLVE_HOST == (int)CURLE_COULDNT_RESOLVE_HOST, ""); +static_assert((int)PAL_CURLE_OUT_OF_MEMORY == (int)CURLE_OUT_OF_MEMORY, ""); +static_assert((int)PAL_CURLE_OPERATION_TIMEDOUT == (int)CURLE_OPERATION_TIMEDOUT, ""); +static_assert((int)PAL_CURLE_ABORTED_BY_CALLBACK == (int)CURLE_ABORTED_BY_CALLBACK, ""); +static_assert((int)PAL_CURLE_UNKNOWN_OPTION == (int)CURLE_UNKNOWN_OPTION, ""); +static_assert((int)PAL_CURLE_RECV_ERROR == (int)CURLE_RECV_ERROR, ""); +static_assert((int)PAL_CURLE_SEND_FAIL_REWIND == (int)CURLE_SEND_FAIL_REWIND, ""); -static_assert(PAL_CURL_HTTP_VERSION_NONE == CURL_HTTP_VERSION_NONE, ""); -static_assert(PAL_CURL_HTTP_VERSION_1_0 == CURL_HTTP_VERSION_1_0, ""); -static_assert(PAL_CURL_HTTP_VERSION_1_1 == CURL_HTTP_VERSION_1_1, ""); -#if HAVE_CURL_HTTP_VERSION_2_0 -static_assert(PAL_CURL_HTTP_VERSION_2_0 == CURL_HTTP_VERSION_2_0, ""); +static_assert((int)PAL_CURL_HTTP_VERSION_NONE == (int)CURL_HTTP_VERSION_NONE, ""); +static_assert((int)PAL_CURL_HTTP_VERSION_1_0 == (int)CURL_HTTP_VERSION_1_0, ""); +static_assert((int)PAL_CURL_HTTP_VERSION_1_1 == (int)CURL_HTTP_VERSION_1_1, ""); +#if HAVE_CURL_HTTP_VERSION_2TLS +static_assert((int)PAL_CURL_HTTP_VERSION_2TLS == (int)CURL_HTTP_VERSION_2TLS, ""); #endif -static_assert(PAL_CURL_SSLVERSION_TLSv1 == CURL_SSLVERSION_TLSv1, ""); +static_assert((int)PAL_CURL_SSLVERSION_SSLv2 == (int)CURL_SSLVERSION_SSLv2, ""); +static_assert((int)PAL_CURL_SSLVERSION_SSLv3 == (int)CURL_SSLVERSION_SSLv3, ""); +static_assert((int)PAL_CURL_SSLVERSION_TLSv1 == (int)CURL_SSLVERSION_TLSv1, ""); #if HAVE_CURL_SSLVERSION_TLSv1_012 -static_assert(PAL_CURL_SSLVERSION_TLSv1_0 == CURL_SSLVERSION_TLSv1_0, ""); -static_assert(PAL_CURL_SSLVERSION_TLSv1_1 == CURL_SSLVERSION_TLSv1_1, ""); -static_assert(PAL_CURL_SSLVERSION_TLSv1_2 == CURL_SSLVERSION_TLSv1_2, ""); +static_assert((int)PAL_CURL_SSLVERSION_TLSv1_0 == (int)CURL_SSLVERSION_TLSv1_0, ""); +static_assert((int)PAL_CURL_SSLVERSION_TLSv1_1 == (int)CURL_SSLVERSION_TLSv1_1, ""); +static_assert((int)PAL_CURL_SSLVERSION_TLSv1_2 == (int)CURL_SSLVERSION_TLSv1_2, ""); #endif -static_assert(PAL_CURLINFO_EFFECTIVE_URL == CURLINFO_EFFECTIVE_URL, ""); -static_assert(PAL_CURLINFO_PRIVATE == CURLINFO_PRIVATE, ""); -static_assert(PAL_CURLINFO_HTTPAUTH_AVAIL == CURLINFO_HTTPAUTH_AVAIL, ""); +static_assert((int)PAL_CURLINFO_EFFECTIVE_URL == (int)CURLINFO_EFFECTIVE_URL, ""); +static_assert((int)PAL_CURLINFO_PRIVATE == (int)CURLINFO_PRIVATE, ""); +static_assert((int)PAL_CURLINFO_HTTPAUTH_AVAIL == (int)CURLINFO_HTTPAUTH_AVAIL, ""); -static_assert(PAL_CURLAUTH_None == CURLAUTH_NONE, ""); -static_assert(PAL_CURLAUTH_Basic == CURLAUTH_BASIC, ""); -static_assert(PAL_CURLAUTH_Digest == CURLAUTH_DIGEST, ""); -static_assert(PAL_CURLAUTH_Negotiate == CURLAUTH_GSSNEGOTIATE, ""); -static_assert(PAL_CURLAUTH_NTLM == CURLAUTH_NTLM, ""); +static_assert((int)PAL_CURLAUTH_None == (int)CURLAUTH_NONE, ""); +static_assert((int)PAL_CURLAUTH_Basic == (int)CURLAUTH_BASIC, ""); +static_assert((int)PAL_CURLAUTH_Digest == (int)CURLAUTH_DIGEST, ""); +static_assert((int)PAL_CURLAUTH_Negotiate == (int)CURLAUTH_GSSNEGOTIATE, ""); +static_assert((int)PAL_CURLAUTH_NTLM == (int)CURLAUTH_NTLM, ""); -static_assert(PAL_CURLPROXY_HTTP == CURLPROXY_HTTP, ""); +static_assert((int)PAL_CURLPROXY_HTTP == (int)CURLPROXY_HTTP, ""); -static_assert(PAL_CURLPROTO_HTTP == CURLPROTO_HTTP, ""); -static_assert(PAL_CURLPROTO_HTTPS == CURLPROTO_HTTPS, ""); +static_assert((int)PAL_CURLPROTO_HTTP == (int)CURLPROTO_HTTP, ""); +static_assert((int)PAL_CURLPROTO_HTTPS == (int)CURLPROTO_HTTPS, ""); -static_assert(PAL_CURL_SEEKFUNC_OK == CURL_SEEKFUNC_OK, ""); -static_assert(PAL_CURL_SEEKFUNC_FAIL == CURL_SEEKFUNC_FAIL, ""); -static_assert(PAL_CURL_SEEKFUNC_CANTSEEK == CURL_SEEKFUNC_CANTSEEK, ""); +static_assert((int)PAL_CURL_SEEKFUNC_OK == (int)CURL_SEEKFUNC_OK, ""); +static_assert((int)PAL_CURL_SEEKFUNC_FAIL == (int)CURL_SEEKFUNC_FAIL, ""); +static_assert((int)PAL_CURL_SEEKFUNC_CANTSEEK == (int)CURL_SEEKFUNC_CANTSEEK, ""); -static_assert(PAL_CURL_READFUNC_ABORT == CURL_READFUNC_ABORT, ""); -static_assert(PAL_CURL_READFUNC_PAUSE == CURL_READFUNC_PAUSE, ""); -static_assert(PAL_CURL_WRITEFUNC_PAUSE == CURL_WRITEFUNC_PAUSE, ""); +static_assert((int)PAL_CURL_READFUNC_ABORT == (int)CURL_READFUNC_ABORT, ""); +static_assert((int)PAL_CURL_READFUNC_PAUSE == (int)CURL_READFUNC_PAUSE, ""); +static_assert((int)PAL_CURL_WRITEFUNC_PAUSE == (int)CURL_WRITEFUNC_PAUSE, ""); -static_assert(PAL_CURLINFO_TEXT == CURLINFO_TEXT, ""); -static_assert(PAL_CURLINFO_HEADER_IN == CURLINFO_HEADER_IN, ""); -static_assert(PAL_CURLINFO_HEADER_OUT == CURLINFO_HEADER_OUT, ""); -static_assert(PAL_CURLINFO_DATA_IN == CURLINFO_DATA_IN, ""); -static_assert(PAL_CURLINFO_DATA_OUT == CURLINFO_DATA_OUT, ""); -static_assert(PAL_CURLINFO_SSL_DATA_IN == CURLINFO_SSL_DATA_IN, ""); -static_assert(PAL_CURLINFO_SSL_DATA_OUT == CURLINFO_SSL_DATA_OUT, ""); +static_assert((int)PAL_CURLINFO_TEXT == (int)CURLINFO_TEXT, ""); +static_assert((int)PAL_CURLINFO_HEADER_IN == (int)CURLINFO_HEADER_IN, ""); +static_assert((int)PAL_CURLINFO_HEADER_OUT == (int)CURLINFO_HEADER_OUT, ""); +static_assert((int)PAL_CURLINFO_DATA_IN == (int)CURLINFO_DATA_IN, ""); +static_assert((int)PAL_CURLINFO_DATA_OUT == (int)CURLINFO_DATA_OUT, ""); +static_assert((int)PAL_CURLINFO_SSL_DATA_IN == (int)CURLINFO_SSL_DATA_IN, ""); +static_assert((int)PAL_CURLINFO_SSL_DATA_OUT == (int)CURLINFO_SSL_DATA_OUT, ""); -static_assert(PAL_CURL_MAX_HTTP_HEADER == CURL_MAX_HTTP_HEADER, ""); +static_assert((int)PAL_CURL_MAX_HTTP_HEADER == (int)CURL_MAX_HTTP_HEADER, ""); extern "C" CURL* HttpNative_EasyCreate() { diff --git a/external/corefx/src/Native/Unix/System.Net.Http.Native/pal_easy.h b/external/corefx/src/Native/Unix/System.Net.Http.Native/pal_easy.h index e86a8ca44e..62f49c2d33 100644 --- a/external/corefx/src/Native/Unix/System.Net.Http.Native/pal_easy.h +++ b/external/corefx/src/Native/Unix/System.Net.Http.Native/pal_easy.h @@ -35,6 +35,7 @@ enum PAL_CURLoption : int32_t PAL_CURLOPT_PROXYTYPE = CurlOptionLongBase + 101, PAL_CURLOPT_HTTPAUTH = CurlOptionLongBase + 107, PAL_CURLOPT_TCP_NODELAY = CurlOptionLongBase + 121, + PAL_CURLOPT_TCP_KEEPALIVE = CurlOptionLongBase + 213, PAL_CURLOPT_CONNECTTIMEOUT_MS = CurlOptionLongBase + 156, PAL_CURLOPT_ADDRESS_SCOPE = CurlOptionLongBase + 171, PAL_CURLOPT_PROTOCOLS = CurlOptionLongBase + 181, @@ -93,12 +94,14 @@ enum PAL_CURL_HTTP_VERSION PAL_CURL_HTTP_VERSION_NONE = 0, PAL_CURL_HTTP_VERSION_1_0 = 1, PAL_CURL_HTTP_VERSION_1_1 = 2, - PAL_CURL_HTTP_VERSION_2_0 = 3 + PAL_CURL_HTTP_VERSION_2TLS = 4 }; enum PAL_CURL_SSLVERSION { PAL_CURL_SSLVERSION_TLSv1 = 1, + PAL_CURL_SSLVERSION_SSLv2 = 2, + PAL_CURL_SSLVERSION_SSLv3 = 3, PAL_CURL_SSLVERSION_TLSv1_0 = 4, PAL_CURL_SSLVERSION_TLSv1_1 = 5, PAL_CURL_SSLVERSION_TLSv1_2 = 6, diff --git a/external/corefx/src/Native/Unix/System.Net.Http.Native/pal_multi.cpp b/external/corefx/src/Native/Unix/System.Net.Http.Native/pal_multi.cpp index f4b5c8464f..74f52fc065 100644 --- a/external/corefx/src/Native/Unix/System.Net.Http.Native/pal_multi.cpp +++ b/external/corefx/src/Native/Unix/System.Net.Http.Native/pal_multi.cpp @@ -9,26 +9,26 @@ #include #include -static_assert(PAL_CURLM_CALL_MULTI_PERFORM == CURLM_CALL_MULTI_PERFORM, ""); -static_assert(PAL_CURLM_OK == CURLM_OK, ""); -static_assert(PAL_CURLM_BAD_HANDLE == CURLM_BAD_HANDLE, ""); -static_assert(PAL_CURLM_BAD_EASY_HANDLE == CURLM_BAD_EASY_HANDLE, ""); -static_assert(PAL_CURLM_OUT_OF_MEMORY == CURLM_OUT_OF_MEMORY, ""); -static_assert(PAL_CURLM_INTERNAL_ERROR == CURLM_INTERNAL_ERROR, ""); -static_assert(PAL_CURLM_BAD_SOCKET == CURLM_BAD_SOCKET, ""); -static_assert(PAL_CURLM_UNKNOWN_OPTION == CURLM_UNKNOWN_OPTION, ""); +static_assert((int)PAL_CURLM_CALL_MULTI_PERFORM == (int)CURLM_CALL_MULTI_PERFORM, ""); +static_assert((int)PAL_CURLM_OK == (int)CURLM_OK, ""); +static_assert((int)PAL_CURLM_BAD_HANDLE == (int)CURLM_BAD_HANDLE, ""); +static_assert((int)PAL_CURLM_BAD_EASY_HANDLE == (int)CURLM_BAD_EASY_HANDLE, ""); +static_assert((int)PAL_CURLM_OUT_OF_MEMORY == (int)CURLM_OUT_OF_MEMORY, ""); +static_assert((int)PAL_CURLM_INTERNAL_ERROR == (int)CURLM_INTERNAL_ERROR, ""); +static_assert((int)PAL_CURLM_BAD_SOCKET == (int)CURLM_BAD_SOCKET, ""); +static_assert((int)PAL_CURLM_UNKNOWN_OPTION == (int)CURLM_UNKNOWN_OPTION, ""); #if HAVE_CURLM_ADDED_ALREADY -static_assert(PAL_CURLM_ADDED_ALREADY == CURLM_ADDED_ALREADY, ""); +static_assert((int)PAL_CURLM_ADDED_ALREADY == (int)CURLM_ADDED_ALREADY, ""); #endif -static_assert(PAL_CURLMOPT_PIPELINING == CURLMOPT_PIPELINING, ""); +static_assert((int)PAL_CURLMOPT_PIPELINING == (int)CURLMOPT_PIPELINING, ""); #ifdef CURLMOPT_MAX_HOST_CONNECTIONS -static_assert(PAL_CURLMOPT_MAX_HOST_CONNECTIONS == CURLMOPT_MAX_HOST_CONNECTIONS, ""); +static_assert((int)PAL_CURLMOPT_MAX_HOST_CONNECTIONS == (int)CURLMOPT_MAX_HOST_CONNECTIONS, ""); #endif #if HAVE_CURLPIPE_MULTIPLEX -static_assert(PAL_CURLPIPE_MULTIPLEX == CURLPIPE_MULTIPLEX, ""); +static_assert((int)PAL_CURLPIPE_MULTIPLEX == (int)CURLPIPE_MULTIPLEX, ""); #endif -static_assert(PAL_CURLMSG_DONE == CURLMSG_DONE, ""); +static_assert((int)PAL_CURLMSG_DONE == (int)CURLMSG_DONE, ""); extern "C" CURLM* HttpNative_MultiCreate() { diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/CMakeLists.txt b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/CMakeLists.txt index 4cf90cf68f..5639a85dc4 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/CMakeLists.txt +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/CMakeLists.txt @@ -9,20 +9,21 @@ find_library(COREFOUNDATION_LIBRARY CoreFoundation) find_library(SECURITY_LIBRARY Security) set(NATIVECRYPTO_SOURCES - pal_digest.cpp - pal_ecc.cpp - pal_hmac.cpp - pal_keychain.cpp - pal_random.cpp - pal_rsa.cpp - pal_sec.cpp - pal_seckey.cpp - pal_signverify.cpp - pal_ssl.cpp - pal_symmetric.cpp - pal_trust.cpp - pal_x509.cpp - pal_x509chain.cpp + pal_digest.c + pal_ecc.c + pal_hmac.c + pal_keyagree.c + pal_keychain.c + pal_random.c + pal_rsa.c + pal_sec.c + pal_seckey.c + pal_signverify.c + pal_ssl.c + pal_symmetric.c + pal_trust.c + pal_x509.c + pal_x509chain.c ) add_library(System.Security.Cryptography.Native.Apple diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_digest.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_digest.c similarity index 81% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_digest.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_digest.c index 11b86fcee3..56d4c839ca 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_digest.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_digest.c @@ -23,22 +23,22 @@ struct digest_ctx_st } d; }; -extern "C" void AppleCryptoNative_DigestFree(DigestCtx* pDigest) +void AppleCryptoNative_DigestFree(DigestCtx* pDigest) { - if (pDigest != nullptr) + if (pDigest != NULL) { free(pDigest); } } -extern "C" DigestCtx* AppleCryptoNative_DigestCreate(PAL_HashAlgorithm algorithm, int32_t* pcbDigest) +DigestCtx* AppleCryptoNative_DigestCreate(PAL_HashAlgorithm algorithm, int32_t* pcbDigest) { - if (pcbDigest == nullptr) - return nullptr; + if (pcbDigest == NULL) + return NULL; - DigestCtx* digestCtx = reinterpret_cast(malloc(sizeof(DigestCtx))); - if (digestCtx == nullptr) - return nullptr; + DigestCtx* digestCtx = (DigestCtx*)malloc(sizeof(DigestCtx)); + if (digestCtx == NULL) + return NULL; digestCtx->algorithm = algorithm; @@ -67,21 +67,21 @@ extern "C" DigestCtx* AppleCryptoNative_DigestCreate(PAL_HashAlgorithm algorithm default: *pcbDigest = -1; free(digestCtx); - return nullptr; + return NULL; } digestCtx->cbDigest = *pcbDigest; return digestCtx; } -extern "C" int32_t AppleCryptoNative_DigestUpdate(DigestCtx* ctx, uint8_t* pBuf, int32_t cbBuf) +int32_t AppleCryptoNative_DigestUpdate(DigestCtx* ctx, uint8_t* pBuf, int32_t cbBuf) { if (cbBuf == 0) return 1; - if (ctx == nullptr || pBuf == nullptr) + if (ctx == NULL || pBuf == NULL) return -1; - CC_LONG bufSize = static_cast(cbBuf); + CC_LONG bufSize = (CC_LONG)cbBuf; switch (ctx->algorithm) { @@ -100,9 +100,9 @@ extern "C" int32_t AppleCryptoNative_DigestUpdate(DigestCtx* ctx, uint8_t* pBuf, } } -extern "C" int32_t AppleCryptoNative_DigestFinal(DigestCtx* ctx, uint8_t* pOutput, int32_t cbOutput) +int32_t AppleCryptoNative_DigestFinal(DigestCtx* ctx, uint8_t* pOutput, int32_t cbOutput) { - if (ctx == nullptr || pOutput == nullptr || cbOutput < ctx->cbDigest) + if (ctx == NULL || pOutput == NULL || cbOutput < ctx->cbDigest) return -1; int32_t ret = 0; diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_digest.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_digest.h index b098632215..5d31aa21c8 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_digest.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_digest.h @@ -5,6 +5,7 @@ #pragma once #include "pal_types.h" +#include "pal_compiler.h" #include #include @@ -25,7 +26,7 @@ typedef struct digest_ctx_st DigestCtx; /* Free the resources held by a DigestCtx */ -extern "C" void AppleCryptoNative_DigestFree(DigestCtx* pDigest); +DLLEXPORT void AppleCryptoNative_DigestFree(DigestCtx* pDigest); /* Create a digest handle for the specified algorithm. @@ -34,18 +35,18 @@ Returns NULL when the algorithm is unknown, or pcbDigest is NULL; otherwise retu to a digest context suitable for calling DigestUpdate and DigestFinal on and sets pcbDigest to the size of the digest output. */ -extern "C" DigestCtx* AppleCryptoNative_DigestCreate(PAL_HashAlgorithm algorithm, int32_t* pcbDigest); +DLLEXPORT DigestCtx* AppleCryptoNative_DigestCreate(PAL_HashAlgorithm algorithm, int32_t* pcbDigest); /* Apply cbBuf bytes of data from pBuf to the ongoing digest represented in ctx. Returns 1 on success, 0 on failure, any other value on invalid inputs/state. */ -extern "C" int32_t AppleCryptoNative_DigestUpdate(DigestCtx* ctx, uint8_t* pBuf, int32_t cbBuf); +DLLEXPORT int32_t AppleCryptoNative_DigestUpdate(DigestCtx* ctx, uint8_t* pBuf, int32_t cbBuf); /* Complete the digest in ctx, copying the results to pOutput, and reset ctx for a new digest. Returns 1 on success, 0 on failure, any other value on invalid inputs/state. */ -extern "C" int32_t AppleCryptoNative_DigestFinal(DigestCtx* ctx, uint8_t* pOutput, int32_t cbOutput); +DLLEXPORT int32_t AppleCryptoNative_DigestFinal(DigestCtx* ctx, uint8_t* pOutput, int32_t cbOutput); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ecc.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ecc.c similarity index 81% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ecc.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ecc.c index 6c7a468907..8bcb5e514f 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ecc.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ecc.c @@ -4,23 +4,23 @@ #include "pal_ecc.h" -extern "C" int32_t AppleCryptoNative_EccGenerateKey( +int32_t AppleCryptoNative_EccGenerateKey( int32_t keySizeBits, SecKeychainRef tempKeychain, SecKeyRef* pPublicKey, SecKeyRef* pPrivateKey, int32_t* pOSStatus) { - if (pPublicKey != nullptr) - *pPublicKey = nullptr; - if (pPrivateKey != nullptr) - *pPrivateKey = nullptr; + if (pPublicKey != NULL) + *pPublicKey = NULL; + if (pPrivateKey != NULL) + *pPrivateKey = NULL; - if (pPublicKey == nullptr || pPrivateKey == nullptr || pOSStatus == nullptr) + if (pPublicKey == NULL || pPrivateKey == NULL || pOSStatus == NULL) return kErrorBadInput; - CFMutableDictionaryRef attributes = CFDictionaryCreateMutable(nullptr, 2, &kCFTypeDictionaryKeyCallBacks, nullptr); + CFMutableDictionaryRef attributes = CFDictionaryCreateMutable(NULL, 2, &kCFTypeDictionaryKeyCallBacks, NULL); - CFNumberRef cfKeySizeValue = CFNumberCreate(nullptr, kCFNumberIntType, &keySizeBits); + CFNumberRef cfKeySizeValue = CFNumberCreate(NULL, kCFNumberIntType, &keySizeBits); OSStatus status; - if (attributes != nullptr && cfKeySizeValue != nullptr) + if (attributes != NULL && cfKeySizeValue != NULL) { CFDictionaryAddValue(attributes, kSecAttrKeyType, kSecAttrKeyTypeEC); CFDictionaryAddValue(attributes, kSecAttrKeySizeInBits, cfKeySizeValue); @@ -43,18 +43,18 @@ extern "C" int32_t AppleCryptoNative_EccGenerateKey( status = errSecAllocate; } - if (attributes != nullptr) + if (attributes != NULL) CFRelease(attributes); - if (cfKeySizeValue != nullptr) + if (cfKeySizeValue != NULL) CFRelease(cfKeySizeValue); *pOSStatus = status; return status == noErr; } -extern "C" uint64_t AppleCryptoNative_EccGetKeySizeInBits(SecKeyRef publicKey) +uint64_t AppleCryptoNative_EccGetKeySizeInBits(SecKeyRef publicKey) { - if (publicKey == nullptr) + if (publicKey == NULL) { return 0; } diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ecc.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ecc.h index d6253b883d..71df9e25fd 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ecc.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ecc.h @@ -5,6 +5,7 @@ #pragma once #include "pal_seckey.h" +#include "pal_compiler.h" #include @@ -13,15 +14,15 @@ Generate an ECC keypair of the specified size. Returns 1 on success, 0 on failure. On failure, *pOSStatus should carry the OS failure code. */ -extern "C" int32_t AppleCryptoNative_EccGenerateKey(int32_t keySizeBits, - SecKeychainRef tempKeychain, - SecKeyRef* pPublicKey, - SecKeyRef* pPrivateKey, - int32_t* pOSStatus); +DLLEXPORT int32_t AppleCryptoNative_EccGenerateKey(int32_t keySizeBits, + SecKeychainRef tempKeychain, + SecKeyRef* pPublicKey, + SecKeyRef* pPrivateKey, + int32_t* pOSStatus); /* Get the keysize, in bits, of an ECC key. Returns the keysize, in bits, of the ECC key, or 0 on error. */ -extern "C" uint64_t AppleCryptoNative_EccGetKeySizeInBits(SecKeyRef publicKey); +DLLEXPORT uint64_t AppleCryptoNative_EccGetKeySizeInBits(SecKeyRef publicKey); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_hmac.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_hmac.c similarity index 67% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_hmac.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_hmac.c index 8e4f559279..1ab7dc8acb 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_hmac.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_hmac.c @@ -10,9 +10,9 @@ struct hmac_ctx_st CCHmacContext hmac; }; -extern "C" void AppleCryptoNative_HmacFree(HmacCtx* pHmac) +void AppleCryptoNative_HmacFree(HmacCtx* pHmac) { - if (pHmac != nullptr) + if (pHmac != NULL) { free(pHmac); } @@ -57,21 +57,21 @@ static int32_t GetHmacOutputSize(PAL_HashAlgorithm algorithm) } } -extern "C" HmacCtx* AppleCryptoNative_HmacCreate(PAL_HashAlgorithm algorithm, int32_t* pcbHmac) +HmacCtx* AppleCryptoNative_HmacCreate(PAL_HashAlgorithm algorithm, int32_t* pcbHmac) { - if (pcbHmac == nullptr) - return nullptr; + if (pcbHmac == NULL) + return NULL; CCHmacAlgorithm appleAlgId = PalAlgorithmToAppleAlgorithm(algorithm); if (appleAlgId == UINT_MAX) { *pcbHmac = -1; - return nullptr; + return NULL; } - HmacCtx* hmacCtx = reinterpret_cast(malloc(sizeof(HmacCtx))); - if (hmacCtx == nullptr) + HmacCtx* hmacCtx = (HmacCtx*)malloc(sizeof(HmacCtx)); + if (hmacCtx == NULL) return hmacCtx; hmacCtx->appleAlgId = appleAlgId; @@ -79,33 +79,33 @@ extern "C" HmacCtx* AppleCryptoNative_HmacCreate(PAL_HashAlgorithm algorithm, in return hmacCtx; } -extern "C" int32_t AppleCryptoNative_HmacInit(HmacCtx* ctx, uint8_t* pbKey, int32_t cbKey) +int32_t AppleCryptoNative_HmacInit(HmacCtx* ctx, uint8_t* pbKey, int32_t cbKey) { - if (ctx == nullptr || cbKey < 0) + if (ctx == NULL || cbKey < 0) return 0; - if (cbKey != 0 && pbKey == nullptr) + if (cbKey != 0 && pbKey == NULL) return 0; // No return value - CCHmacInit(&ctx->hmac, ctx->appleAlgId, pbKey, static_cast(cbKey)); + CCHmacInit(&ctx->hmac, ctx->appleAlgId, pbKey, (size_t)cbKey); return 1; } -extern "C" int32_t AppleCryptoNative_HmacUpdate(HmacCtx* ctx, uint8_t* pbData, int32_t cbData) +int32_t AppleCryptoNative_HmacUpdate(HmacCtx* ctx, uint8_t* pbData, int32_t cbData) { if (cbData == 0) return 1; - if (ctx == nullptr || pbData == nullptr) + if (ctx == NULL || pbData == NULL) return 0; // No return value - CCHmacUpdate(&ctx->hmac, pbData, static_cast(cbData)); + CCHmacUpdate(&ctx->hmac, pbData, (size_t)cbData); return 1; } -extern "C" int32_t AppleCryptoNative_HmacFinal(HmacCtx* ctx, uint8_t* pbOutput) +int32_t AppleCryptoNative_HmacFinal(HmacCtx* ctx, uint8_t* pbOutput) { - if (ctx == nullptr || pbOutput == nullptr) + if (ctx == NULL || pbOutput == NULL) return 0; // No return value diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_hmac.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_hmac.h index 4bb3f2961f..12682347c8 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_hmac.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_hmac.h @@ -6,13 +6,14 @@ #include "pal_digest.h" #include "pal_types.h" +#include "pal_compiler.h" typedef struct hmac_ctx_st HmacCtx; /* Free a HmacCtx created by AppleCryptoNative_HmacCreate */ -extern "C" void AppleCryptoNative_HmacFree(HmacCtx* pHmac); +DLLEXPORT void AppleCryptoNative_HmacFree(HmacCtx* pHmac); /* Create an HmacCtx for the specified algorithm, receiving the hash output size in pcbHmac. @@ -22,25 +23,25 @@ it should be freed via AppleCryptoNative_HmacFree regardless of a negative pbHma Returns NULL on error, an unkeyed HmacCtx otherwise. */ -extern "C" HmacCtx* AppleCryptoNative_HmacCreate(PAL_HashAlgorithm algorithm, int32_t* pcbHmac); +DLLEXPORT HmacCtx* AppleCryptoNative_HmacCreate(PAL_HashAlgorithm algorithm, int32_t* pcbHmac); /* Initialize an HMAC to the correct key and start state. Returns 1 on success, 0 on error. */ -extern "C" int32_t AppleCryptoNative_HmacInit(HmacCtx* ctx, uint8_t* pbKey, int32_t cbKey); +DLLEXPORT int32_t AppleCryptoNative_HmacInit(HmacCtx* ctx, uint8_t* pbKey, int32_t cbKey); /* Add data into the HMAC Returns 1 on success, 0 on error. */ -extern "C" int32_t AppleCryptoNative_HmacUpdate(HmacCtx* ctx, uint8_t* pbData, int32_t cbData); +DLLEXPORT int32_t AppleCryptoNative_HmacUpdate(HmacCtx* ctx, uint8_t* pbData, int32_t cbData); /* Complete the HMAC and copy the result into pbOutput. Returns 1 on success, 0 on error. */ -extern "C" int32_t AppleCryptoNative_HmacFinal(HmacCtx* ctx, uint8_t* pbOutput); +DLLEXPORT int32_t AppleCryptoNative_HmacFinal(HmacCtx* ctx, uint8_t* pbOutput); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keyagree.c b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keyagree.c new file mode 100644 index 0000000000..b16b3b3745 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keyagree.c @@ -0,0 +1,27 @@ +// 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. + +#include "pal_keyagree.h" + +int32_t +AppleCryptoNative_EcdhKeyAgree(SecKeyRef privateKey, SecKeyRef publicKey, CFDataRef* pAgreeOut, CFErrorRef* pErrorOut) +{ + if (pAgreeOut != NULL) + *pAgreeOut = NULL; + if (pErrorOut != NULL) + *pErrorOut = NULL; + + if (privateKey == NULL || publicKey == NULL) + return kErrorBadInput; + + CFDictionaryRef dict = NULL; + + *pAgreeOut = + SecKeyCopyKeyExchangeResult(privateKey, kSecKeyAlgorithmECDHKeyExchangeStandard, publicKey, dict, pErrorOut); + + if (*pErrorOut != NULL) + return kErrorSeeError; + + return *pAgreeOut != NULL; +} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keyagree.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keyagree.h new file mode 100644 index 0000000000..32c65f635a --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keyagree.h @@ -0,0 +1,18 @@ +// 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. + +#pragma once + +#include "pal_seckey.h" +#include "pal_compiler.h" + +#include + +/* +Perform the EC Diffie-Hellman key agreement between the provided keys. + +Follows pal_seckey return conventions. +*/ +DLLEXPORT int32_t +AppleCryptoNative_EcdhKeyAgree(SecKeyRef privateKey, SecKeyRef publicKey, CFDataRef* pAgreeOut, CFErrorRef* pErrorOut); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keychain.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keychain.c similarity index 62% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keychain.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keychain.c index 0a2d18832a..d73fde5640 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keychain.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keychain.c @@ -4,15 +4,15 @@ #include "pal_keychain.h" -extern "C" int32_t AppleCryptoNative_SecKeychainItemCopyKeychain(SecKeychainItemRef item, SecKeychainRef* pKeychainOut) +int32_t AppleCryptoNative_SecKeychainItemCopyKeychain(SecKeychainItemRef item, SecKeychainRef* pKeychainOut) { - if (pKeychainOut != nullptr) - *pKeychainOut = nullptr; + if (pKeychainOut != NULL) + *pKeychainOut = NULL; - if (item == nullptr) + if (item == NULL) return errSecNoSuchKeychain; - auto itemType = CFGetTypeID(item); + CFTypeID itemType = CFGetTypeID(item); if (itemType == SecKeyGetTypeID() || itemType == SecIdentityGetTypeID() || itemType == SecCertificateGetTypeID()) { @@ -35,39 +35,39 @@ extern "C" int32_t AppleCryptoNative_SecKeychainItemCopyKeychain(SecKeychainItem return errSecParam; } -extern "C" int32_t AppleCryptoNative_SecKeychainCreate(const char* pathName, - uint32_t passphraseLength, - const uint8_t* passphraseUtf8, - SecKeychainRef* pKeychainOut) +int32_t AppleCryptoNative_SecKeychainCreate(const char* pathName, + uint32_t passphraseLength, + const uint8_t* passphraseUtf8, + SecKeychainRef* pKeychainOut) { - return SecKeychainCreate(pathName, passphraseLength, passphraseUtf8, false, nullptr, pKeychainOut); + return SecKeychainCreate(pathName, passphraseLength, passphraseUtf8, false, NULL, pKeychainOut); } -extern "C" int32_t AppleCryptoNative_SecKeychainDelete(SecKeychainRef keychain) +int32_t AppleCryptoNative_SecKeychainDelete(SecKeychainRef keychain) { return SecKeychainDelete(keychain); } -extern "C" int32_t AppleCryptoNative_SecKeychainCopyDefault(SecKeychainRef* pKeychainOut) +int32_t AppleCryptoNative_SecKeychainCopyDefault(SecKeychainRef* pKeychainOut) { - if (pKeychainOut != nullptr) - *pKeychainOut = nullptr; + if (pKeychainOut != NULL) + *pKeychainOut = NULL; return SecKeychainCopyDefault(pKeychainOut); } -extern "C" int32_t AppleCryptoNative_SecKeychainOpen(const char* pszKeychainPath, SecKeychainRef* pKeychainOut) +int32_t AppleCryptoNative_SecKeychainOpen(const char* pszKeychainPath, SecKeychainRef* pKeychainOut) { - if (pKeychainOut != nullptr) - *pKeychainOut = nullptr; + if (pKeychainOut != NULL) + *pKeychainOut = NULL; - if (pszKeychainPath == nullptr) + if (pszKeychainPath == NULL) return errSecParam; return SecKeychainOpen(pszKeychainPath, pKeychainOut); } -extern "C" int32_t AppleCryptoNative_SetKeychainNeverLock(SecKeychainRef keychain) +int32_t AppleCryptoNative_SetKeychainNeverLock(SecKeychainRef keychain) { SecKeychainSettings settings = { .version = SEC_KEYCHAIN_SETTINGS_VERS1, .useLockInterval = 0, .lockOnSleep = 0, .lockInterval = INT_MAX, @@ -79,28 +79,28 @@ extern "C" int32_t AppleCryptoNative_SetKeychainNeverLock(SecKeychainRef keychai static int32_t EnumerateKeychain(SecKeychainRef keychain, CFStringRef matchType, CFArrayRef* pCertsOut, int32_t* pOSStatus) { - if (pCertsOut != nullptr) - *pCertsOut = nullptr; - if (pOSStatus != nullptr) + if (pCertsOut != NULL) + *pCertsOut = NULL; + if (pOSStatus != NULL) *pOSStatus = noErr; - assert(matchType != nullptr); + assert(matchType != NULL); - if (keychain == nullptr || pCertsOut == nullptr || pOSStatus == nullptr) + if (keychain == NULL || pCertsOut == NULL || pOSStatus == NULL) return -1; CFMutableDictionaryRef query = CFDictionaryCreateMutable( kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); - if (query == nullptr) + if (query == NULL) return -2; int32_t ret = 0; - CFTypeRef result = nullptr; + CFTypeRef result = NULL; CFArrayRef searchList = CFArrayCreate( - nullptr, const_cast(reinterpret_cast(&keychain)), 1, &kCFTypeArrayCallBacks); + NULL, (void**)(&keychain), 1, &kCFTypeArrayCallBacks); - if (searchList == nullptr) + if (searchList == NULL) { ret = -3; } @@ -115,14 +115,14 @@ EnumerateKeychain(SecKeychainRef keychain, CFStringRef matchType, CFArrayRef* pC if (*pOSStatus == noErr) { - if (result == nullptr || CFGetTypeID(result) != CFArrayGetTypeID()) + if (result == NULL || CFGetTypeID(result) != CFArrayGetTypeID()) { ret = -3; } else { CFRetain(result); - *pCertsOut = reinterpret_cast(result); + *pCertsOut = (CFArrayRef)result; ret = 1; } } @@ -137,25 +137,25 @@ EnumerateKeychain(SecKeychainRef keychain, CFStringRef matchType, CFArrayRef* pC } } - if (searchList != nullptr) + if (searchList != NULL) CFRelease(searchList); - if (result != nullptr) + if (result != NULL) CFRelease(result); CFRelease(query); return ret; } -extern "C" int32_t +int32_t AppleCryptoNative_SecKeychainEnumerateCerts(SecKeychainRef keychain, CFArrayRef* pCertsOut, int32_t* pOSStatus) { return EnumerateKeychain(keychain, kSecClassCertificate, pCertsOut, pOSStatus); } -extern "C" int32_t AppleCryptoNative_SecKeychainEnumerateIdentities(SecKeychainRef keychain, - CFArrayRef* pIdentitiesOut, - int32_t* pOSStatus) +int32_t AppleCryptoNative_SecKeychainEnumerateIdentities(SecKeychainRef keychain, + CFArrayRef* pIdentitiesOut, + int32_t* pOSStatus) { return EnumerateKeychain(keychain, kSecClassIdentity, pIdentitiesOut, pOSStatus); } @@ -165,21 +165,21 @@ static OSStatus DeleteInKeychain(CFTypeRef needle, SecKeychainRef haystack) CFMutableDictionaryRef query = CFDictionaryCreateMutable( kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); - if (query == nullptr) + if (query == NULL) return errSecAllocate; CFArrayRef searchList = CFArrayCreate( - nullptr, const_cast(reinterpret_cast(&haystack)), 1, &kCFTypeArrayCallBacks); + NULL, (void**)(&haystack), 1, &kCFTypeArrayCallBacks); - if (searchList == nullptr) + if (searchList == NULL) { CFRelease(query); return errSecAllocate; } - CFArrayRef itemMatch = CFArrayCreate(nullptr, reinterpret_cast(&needle), 1, &kCFTypeArrayCallBacks); + CFArrayRef itemMatch = CFArrayCreate(NULL, (const void**)(&needle), 1, &kCFTypeArrayCallBacks); - if (itemMatch == nullptr) + if (itemMatch == NULL) { CFRelease(searchList); CFRelease(query); @@ -216,29 +216,32 @@ static OSStatus DeleteInKeychain(CFTypeRef needle, SecKeychainRef haystack) return status; } -extern "C" int32_t +typedef const struct OpaqueSecCertificateRef * ConstSecCertificateRef; +typedef const struct OpaqueSecIdentityRef * ConstSecIdentityRef; + +int32_t AppleCryptoNative_X509StoreAddCertificate(CFTypeRef certOrIdentity, SecKeychainRef keychain, int32_t* pOSStatus) { - if (pOSStatus != nullptr) + if (pOSStatus != NULL) *pOSStatus = noErr; - if (certOrIdentity == nullptr || keychain == nullptr || pOSStatus == nullptr) + if (certOrIdentity == NULL || keychain == NULL || pOSStatus == NULL) return -1; - SecCertificateRef cert = nullptr; - SecKeyRef privateKey = nullptr; + SecCertificateRef cert = NULL; + SecKeyRef privateKey = NULL; - auto inputType = CFGetTypeID(certOrIdentity); + CFTypeID inputType = CFGetTypeID(certOrIdentity); OSStatus status = noErr; if (inputType == SecCertificateGetTypeID()) { - cert = reinterpret_cast(const_cast(certOrIdentity)); + cert = (ConstSecCertificateRef)certOrIdentity; CFRetain(cert); } else if (inputType == SecIdentityGetTypeID()) { - SecIdentityRef identity = reinterpret_cast(const_cast(certOrIdentity)); + SecIdentityRef identity = (ConstSecIdentityRef)certOrIdentity; status = SecIdentityCopyCertificate(identity, &cert); if (status == noErr) @@ -251,15 +254,15 @@ AppleCryptoNative_X509StoreAddCertificate(CFTypeRef certOrIdentity, SecKeychainR return -1; } - SecKeychainItemRef itemCopy = nullptr; + SecKeychainItemRef itemCopy = NULL; // Copy the private key into the new keychain first, because it can fail due to // non-exportability. Certificates can only fail for things like I/O errors saving the // keychain back to disk. - if (status == noErr && privateKey != nullptr) + if (status == noErr && privateKey != NULL) { status = - SecKeychainItemCreateCopy(reinterpret_cast(privateKey), keychain, nullptr, &itemCopy); + SecKeychainItemCreateCopy((SecKeychainItemRef)privateKey, keychain, NULL, &itemCopy); } if (status == errSecDuplicateItem) @@ -267,18 +270,18 @@ AppleCryptoNative_X509StoreAddCertificate(CFTypeRef certOrIdentity, SecKeychainR status = noErr; } - // Since we don't care about the itemCopy we'd ideally pass nullptr to SecKeychainItemCreateCopy, + // Since we don't care about the itemCopy we'd ideally pass NULL to SecKeychainItemCreateCopy, // but even though the documentation says it can be null, clang gives an error that null isn't // allowed. - if (itemCopy != nullptr) + if (itemCopy != NULL) { CFRelease(itemCopy); - itemCopy = nullptr; + itemCopy = NULL; } - if (status == noErr && cert != nullptr) + if (status == noErr && cert != NULL) { - status = SecKeychainItemCreateCopy(reinterpret_cast(cert), keychain, nullptr, &itemCopy); + status = SecKeychainItemCreateCopy((SecKeychainItemRef)cert, keychain, NULL, &itemCopy); } if (status == errSecDuplicateItem) @@ -286,51 +289,51 @@ AppleCryptoNative_X509StoreAddCertificate(CFTypeRef certOrIdentity, SecKeychainR status = noErr; } - if (itemCopy != nullptr) + if (itemCopy != NULL) { CFRelease(itemCopy); - itemCopy = nullptr; + itemCopy = NULL; } - if (privateKey != nullptr) + if (privateKey != NULL) { CFRelease(privateKey); - privateKey = nullptr; + privateKey = NULL; } - if (cert != nullptr) + if (cert != NULL) { CFRelease(cert); - cert = nullptr; + cert = NULL; } *pOSStatus = status; return status == noErr; } -extern "C" int32_t +int32_t AppleCryptoNative_X509StoreRemoveCertificate(CFTypeRef certOrIdentity, SecKeychainRef keychain, int32_t* pOSStatus) { - if (pOSStatus != nullptr) + if (pOSStatus != NULL) *pOSStatus = noErr; - if (certOrIdentity == nullptr || keychain == nullptr || pOSStatus == nullptr) + if (certOrIdentity == NULL || keychain == NULL || pOSStatus == NULL) return -1; - SecCertificateRef cert = nullptr; - SecIdentityRef identity = nullptr; + SecCertificateRef cert = NULL; + SecIdentityRef identity = NULL; - auto inputType = CFGetTypeID(certOrIdentity); + CFTypeID inputType = CFGetTypeID(certOrIdentity); OSStatus status = noErr; if (inputType == SecCertificateGetTypeID()) { - cert = reinterpret_cast(const_cast(certOrIdentity)); + cert = (ConstSecCertificateRef)certOrIdentity; CFRetain(cert); } else if (inputType == SecIdentityGetTypeID()) { - identity = reinterpret_cast(const_cast(certOrIdentity)); + identity = (ConstSecIdentityRef)certOrIdentity; status = SecIdentityCopyCertificate(identity, &cert); if (status != noErr) @@ -347,17 +350,17 @@ AppleCryptoNative_X509StoreRemoveCertificate(CFTypeRef certOrIdentity, SecKeycha const int32_t kErrorUserTrust = 2; const int32_t kErrorAdminTrust = 3; - CFArrayRef settings = nullptr; + CFArrayRef settings = NULL; if (status == noErr) { status = SecTrustSettingsCopyTrustSettings(cert, kSecTrustSettingsDomainUser, &settings); } - if (settings != nullptr) + if (settings != NULL) { CFRelease(settings); - settings = nullptr; + settings = NULL; } if (status == noErr) @@ -368,10 +371,10 @@ AppleCryptoNative_X509StoreRemoveCertificate(CFTypeRef certOrIdentity, SecKeycha status = SecTrustSettingsCopyTrustSettings(cert, kSecTrustSettingsDomainAdmin, &settings); - if (settings != nullptr) + if (settings != NULL) { CFRelease(settings); - settings = nullptr; + settings = NULL; } if (status == noErr) diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keychain.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keychain.h index 6a00dd6e66..96ca92ed56 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keychain.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keychain.h @@ -5,6 +5,7 @@ #pragma once #include "pal_types.h" +#include "pal_compiler.h" #include @@ -17,7 +18,7 @@ Errors of the item having no keychain are suppressed, returning success (0) with For all other situations, see SecKeychainItemCopyKeychain documentation. */ -extern "C" int32_t AppleCryptoNative_SecKeychainItemCopyKeychain(SecKeychainItemRef item, SecKeychainRef* pKeychainOut); +DLLEXPORT int32_t AppleCryptoNative_SecKeychainItemCopyKeychain(SecKeychainItemRef item, SecKeychainRef* pKeychainOut); /* Create a keychain at the specified location with a given (UTF-8 encoded) lock passphrase. @@ -27,17 +28,17 @@ Returns the result of SecKeychainCreate. Output: pKeychainOut: The SecKeychainRef created by this function */ -extern "C" int32_t AppleCryptoNative_SecKeychainCreate(const char* pathName, - uint32_t passphraseLength, - const uint8_t* passphraseUtf8, - SecKeychainRef* pKeychainOut); +DLLEXPORT int32_t AppleCryptoNative_SecKeychainCreate(const char* pathName, + uint32_t passphraseLength, + const uint8_t* passphraseUtf8, + SecKeychainRef* pKeychainOut); /* Delete a keychain, including the file on disk. Returns the result of SecKeychainDelete */ -extern "C" int32_t AppleCryptoNative_SecKeychainDelete(SecKeychainRef keychain); +DLLEXPORT int32_t AppleCryptoNative_SecKeychainDelete(SecKeychainRef keychain); /* Open the default keychain. @@ -48,7 +49,7 @@ Returns the result of SecKeychainCopyDefault. Output: pKeyChainOut: Receives the SecKeychainRef for the default keychain. */ -extern "C" int32_t AppleCryptoNative_SecKeychainCopyDefault(SecKeychainRef* pKeychainOut); +DLLEXPORT int32_t AppleCryptoNative_SecKeychainCopyDefault(SecKeychainRef* pKeychainOut); /* Open the named keychain (full path to the file). @@ -58,14 +59,14 @@ Returns the result of SecKeychainOpen. Output: pKeychainOut: Receives the SecKeychainRef for the named keychain. */ -extern "C" int32_t AppleCryptoNative_SecKeychainOpen(const char* pszKeychainPath, SecKeychainRef* pKeychainOut); +DLLEXPORT int32_t AppleCryptoNative_SecKeychainOpen(const char* pszKeychainPath, SecKeychainRef* pKeychainOut); /* Set a keychain to never (automatically) lock. Returns the result of SecKeychainSetSettings to a never-auto-lock policy. */ -extern "C" int32_t AppleCryptoNative_SetKeychainNeverLock(SecKeychainRef keychain); +DLLEXPORT int32_t AppleCryptoNative_SetKeychainNeverLock(SecKeychainRef keychain); /* Enumerate the certificate objects within the given keychain. @@ -77,7 +78,7 @@ pCertsOut: When the return value is not 1, NULL. Otherwise NULL on "no certs fou (including a single match). pOSStatus: Receives the last OSStatus value. */ -extern "C" int32_t +DLLEXPORT int32_t AppleCryptoNative_SecKeychainEnumerateCerts(SecKeychainRef keychain, CFArrayRef* pCertsOut, int32_t* pOSStatus); /* @@ -93,9 +94,9 @@ pCertsOut: When the return value is not 1, NULL. Otherwise NULL on "no certs fou (including a single match). pOSStatus: Receives the last OSStatus value. */ -extern "C" int32_t AppleCryptoNative_SecKeychainEnumerateIdentities(SecKeychainRef keychain, - CFArrayRef* pIdentitiesOut, - int32_t* pOSStatus); +DLLEXPORT int32_t AppleCryptoNative_SecKeychainEnumerateIdentities(SecKeychainRef keychain, + CFArrayRef* pIdentitiesOut, + int32_t* pOSStatus); /* Add a certificate from the specified keychain. @@ -108,7 +109,7 @@ any other value is invalid Output: pOSStatus: Receives the last OSStatus value.. */ -extern "C" int32_t +DLLEXPORT int32_t AppleCryptoNative_X509StoreAddCertificate(CFTypeRef certOrIdentity, SecKeychainRef keychain, int32_t* pOSStatus); /* @@ -124,5 +125,5 @@ any other value is invalid Output: pOSStatus: Receives the last OSStatus value.. */ -extern "C" int32_t +DLLEXPORT int32_t AppleCryptoNative_X509StoreRemoveCertificate(CFTypeRef certOrIdentity, SecKeychainRef keychain, int32_t* pOSStatus); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_random.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_random.c similarity index 74% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_random.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_random.c index 8115a62534..093b7bf3e8 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_random.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_random.c @@ -7,9 +7,9 @@ #include #include -extern "C" int32_t AppleCryptoNative_GetRandomBytes(uint8_t* pBuf, uint32_t cbBuf, int32_t* pkCCStatus) +int32_t AppleCryptoNative_GetRandomBytes(uint8_t* pBuf, uint32_t cbBuf, int32_t* pkCCStatus) { - if (pBuf == nullptr || pkCCStatus == nullptr) + if (pBuf == NULL || pkCCStatus == NULL) return -1; CCRNGStatus status = CCRandomGenerateBytes(pBuf, cbBuf); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_random.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_random.h index db202c5397..1d8b68c99d 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_random.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_random.h @@ -5,10 +5,15 @@ #pragma once #include "pal_types.h" +#include "pal_compiler.h" + +BEGIN_EXTERN_C /* Shims CCRandomGenerateBytes, putting the resulting CCRNGStatus value in pkCCStatus. Returns 1 on success, 0 on system error (see pkCCStatus), -1 on input error. */ -extern "C" int32_t AppleCryptoNative_GetRandomBytes(uint8_t* pBuf, uint32_t cbBuf, int32_t* pkCCStatus); +DLLEXPORT int32_t AppleCryptoNative_GetRandomBytes(uint8_t* pBuf, uint32_t cbBuf, int32_t* pkCCStatus); + +END_EXTERN_C diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_rsa.c b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_rsa.c new file mode 100644 index 0000000000..f2bc5da9e0 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_rsa.c @@ -0,0 +1,342 @@ +// 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. + +#include "pal_rsa.h" + +static int32_t ExecuteCFDataTransform( + SecTransformRef xform, uint8_t* pbData, int32_t cbData, CFDataRef* pDataOut, CFErrorRef* pErrorOut); + +int32_t AppleCryptoNative_RsaGenerateKey( + int32_t keySizeBits, SecKeychainRef tempKeychain, SecKeyRef* pPublicKey, SecKeyRef* pPrivateKey, int32_t* pOSStatus) +{ + if (pPublicKey != NULL) + *pPublicKey = NULL; + if (pPrivateKey != NULL) + *pPrivateKey = NULL; + + if (pPublicKey == NULL || pPrivateKey == NULL || pOSStatus == NULL) + return kErrorBadInput; + if (keySizeBits < 384 || keySizeBits > 16384) + return -2; + + CFMutableDictionaryRef attributes = CFDictionaryCreateMutable(NULL, 2, &kCFTypeDictionaryKeyCallBacks, NULL); + + CFNumberRef cfKeySizeValue = CFNumberCreate(NULL, kCFNumberIntType, &keySizeBits); + OSStatus status; + + if (attributes != NULL && cfKeySizeValue != NULL) + { + CFDictionaryAddValue(attributes, kSecAttrKeyType, kSecAttrKeyTypeRSA); + CFDictionaryAddValue(attributes, kSecAttrKeySizeInBits, cfKeySizeValue); + CFDictionaryAddValue(attributes, kSecUseKeychain, tempKeychain); + + status = SecKeyGeneratePair(attributes, pPublicKey, pPrivateKey); + + if (status == noErr) + { + status = ExportImportKey(pPublicKey, kSecItemTypePublicKey); + } + + if (status == noErr) + { + status = ExportImportKey(pPrivateKey, kSecItemTypePrivateKey); + } + } + else + { + status = errSecAllocate; + } + + if (attributes != NULL) + CFRelease(attributes); + if (cfKeySizeValue != NULL) + CFRelease(cfKeySizeValue); + + *pOSStatus = status; + return status == noErr; +} + +static int32_t ExecuteOaepTransform(SecTransformRef xform, + uint8_t* pbData, + int32_t cbData, + PAL_HashAlgorithm algorithm, + CFDataRef* pDataOut, + CFErrorRef* pErrorOut) +{ + if (!SecTransformSetAttribute(xform, kSecPaddingKey, kSecPaddingOAEPKey, pErrorOut)) + { + return kErrorSeeError; + } + + // Documentation mentions kSecOAEPMGF1DigestAlgorithmAttributeName, but on the Apple platform + // "SHA2" is an algorithm and the size is encoded separately. Since there doesn't seem to be + // a second attribute to encode SHA2-256 vs SHA2-384, be limited to SHA-1. + if (algorithm != PAL_SHA1) + { + return kErrorUnknownAlgorithm; + } + + return ExecuteCFDataTransform(xform, pbData, cbData, pDataOut, pErrorOut); +} + +int32_t AppleCryptoNative_RsaDecryptOaep(SecKeyRef privateKey, + uint8_t* pbData, + int32_t cbData, + PAL_HashAlgorithm mfgAlgorithm, + CFDataRef* pDecryptedOut, + CFErrorRef* pErrorOut) +{ + if (pDecryptedOut != NULL) + *pDecryptedOut = NULL; + if (pErrorOut != NULL) + *pErrorOut = NULL; + + if (privateKey == NULL || pbData == NULL || cbData < 0 || pDecryptedOut == NULL || pErrorOut == NULL) + { + return kErrorBadInput; + } + + int32_t ret = kErrorSeeError; + SecTransformRef decryptor = SecDecryptTransformCreate(privateKey, pErrorOut); + + if (decryptor != NULL) + { + if (*pErrorOut == NULL) + { + ret = ExecuteOaepTransform(decryptor, pbData, cbData, mfgAlgorithm, pDecryptedOut, pErrorOut); + } + + CFRelease(decryptor); + } + + return ret; +} + +int32_t AppleCryptoNative_RsaDecryptPkcs( + SecKeyRef privateKey, uint8_t* pbData, int32_t cbData, CFDataRef* pDecryptedOut, CFErrorRef* pErrorOut) +{ + if (pDecryptedOut != NULL) + *pDecryptedOut = NULL; + if (pErrorOut != NULL) + *pErrorOut = NULL; + + if (privateKey == NULL || pbData == NULL || cbData < 0 || pDecryptedOut == NULL || pErrorOut == NULL) + { + return kErrorBadInput; + } + + int32_t ret = kErrorSeeError; + SecTransformRef decryptor = SecDecryptTransformCreate(privateKey, pErrorOut); + + if (decryptor != NULL) + { + if (*pErrorOut == NULL) + { + ret = ExecuteCFDataTransform(decryptor, pbData, cbData, pDecryptedOut, pErrorOut); + } + + CFRelease(decryptor); + } + + return ret; +} + +int32_t AppleCryptoNative_RsaEncryptOaep(SecKeyRef publicKey, + uint8_t* pbData, + int32_t cbData, + PAL_HashAlgorithm mgfAlgorithm, + CFDataRef* pEncryptedOut, + CFErrorRef* pErrorOut) +{ + if (pEncryptedOut != NULL) + *pEncryptedOut = NULL; + if (pErrorOut != NULL) + *pErrorOut = NULL; + + if (publicKey == NULL || pbData == NULL || cbData < 0 || pEncryptedOut == NULL || pErrorOut == NULL) + { + return kErrorBadInput; + } + + int32_t ret = kErrorSeeError; + SecTransformRef encryptor = SecEncryptTransformCreate(publicKey, pErrorOut); + + if (encryptor != NULL) + { + if (*pErrorOut == NULL) + { + ret = ExecuteOaepTransform(encryptor, pbData, cbData, mgfAlgorithm, pEncryptedOut, pErrorOut); + } + + CFRelease(encryptor); + } + + return ret; +} + +int32_t AppleCryptoNative_RsaEncryptPkcs( + SecKeyRef publicKey, uint8_t* pbData, int32_t cbData, CFDataRef* pEncryptedOut, CFErrorRef* pErrorOut) +{ + if (pEncryptedOut != NULL) + *pEncryptedOut = NULL; + if (pErrorOut != NULL) + *pErrorOut = NULL; + + if (publicKey == NULL || pbData == NULL || cbData < 0 || pEncryptedOut == NULL || pErrorOut == NULL) + { + return kErrorBadInput; + } + + int32_t ret = kErrorSeeError; + SecTransformRef encryptor = SecEncryptTransformCreate(publicKey, pErrorOut); + + if (encryptor != NULL) + { + if (*pErrorOut == NULL) + { + ret = ExecuteCFDataTransform(encryptor, pbData, cbData, pEncryptedOut, pErrorOut); + } + + CFRelease(encryptor); + } + + return ret; +} + +static int32_t ExecuteCFDataTransform( + SecTransformRef xform, uint8_t* pbData, int32_t cbData, CFDataRef* pDataOut, CFErrorRef* pErrorOut) +{ + if (xform == NULL || pbData == NULL || cbData < 0 || pDataOut == NULL || pErrorOut == NULL) + { + return kErrorBadInput; + } + + *pDataOut = NULL; + *pErrorOut = NULL; + + CFTypeRef xformOutput = NULL; + CFDataRef cfData = NULL; + int32_t ret = INT_MIN; + + cfData = CFDataCreateWithBytesNoCopy(NULL, pbData, cbData, kCFAllocatorNull); + + if (cfData == NULL) + { + // This probably means that there wasn't enough memory available, but no + // particular failure cases are described. + return kErrorUnknownState; + } + + if (!SecTransformSetAttribute(xform, kSecTransformInputAttributeName, cfData, pErrorOut)) + { + ret = kErrorSeeError; + goto cleanup; + } + + xformOutput = SecTransformExecute(xform, pErrorOut); + + if (xformOutput == NULL || *pErrorOut != NULL) + { + ret = kErrorSeeError; + goto cleanup; + } + + if (CFGetTypeID(xformOutput) == CFDataGetTypeID()) + { + CFDataRef cfDataOut = (CFDataRef)xformOutput; + CFRetain(cfDataOut); + *pDataOut = cfDataOut; + ret = 1; + } + else + { + ret = kErrorUnknownState; + } + +cleanup: + if (xformOutput != NULL) + { + CFRelease(xformOutput); + } + + if (cfData != NULL) + { + CFRelease(cfData); + } + + return ret; +} + +static int32_t RsaPrimitive(SecKeyRef key, + uint8_t* pbData, + int32_t cbData, + CFDataRef* pDataOut, + CFErrorRef* pErrorOut, + SecKeyAlgorithm algorithm, + CFDataRef func(SecKeyRef, SecKeyAlgorithm, CFDataRef, CFErrorRef*)) +{ + if (pDataOut != NULL) + *pDataOut = NULL; + if (pErrorOut != NULL) + *pErrorOut = NULL; + + if (key == NULL || pbData == NULL || cbData < 0 || pDataOut == NULL || pErrorOut == NULL) + { + return kErrorBadInput; + } + + assert(func != NULL); + + CFDataRef input = CFDataCreateWithBytesNoCopy(NULL, pbData, cbData, kCFAllocatorNull); + CFDataRef output = func(key, algorithm, input, pErrorOut); + + if (*pErrorOut != NULL) + { + if (output != NULL) + { + CFRelease(output); + output = NULL; + } + + return kErrorSeeError; + } + + if (output == NULL) + { + return kErrorUnknownState; + } + + *pDataOut = output; + return 1; +} + +int32_t AppleCryptoNative_RsaSignaturePrimitive( + SecKeyRef privateKey, uint8_t* pbData, int32_t cbData, CFDataRef* pDataOut, CFErrorRef* pErrorOut) +{ + return RsaPrimitive( + privateKey, pbData, cbData, pDataOut, pErrorOut, kSecKeyAlgorithmRSASignatureRaw, SecKeyCreateSignature); +} + +int32_t AppleCryptoNative_RsaDecryptionPrimitive( + SecKeyRef privateKey, uint8_t* pbData, int32_t cbData, CFDataRef* pDataOut, CFErrorRef* pErrorOut) +{ + return RsaPrimitive( + privateKey, pbData, cbData, pDataOut, pErrorOut, kSecKeyAlgorithmRSAEncryptionRaw, SecKeyCreateDecryptedData); +} + +int32_t AppleCryptoNative_RsaEncryptionPrimitive( + SecKeyRef publicKey, uint8_t* pbData, int32_t cbData, CFDataRef* pDataOut, CFErrorRef* pErrorOut) +{ + return RsaPrimitive( + publicKey, pbData, cbData, pDataOut, pErrorOut, kSecKeyAlgorithmRSAEncryptionRaw, SecKeyCreateEncryptedData); +} + +int32_t AppleCryptoNative_RsaVerificationPrimitive( + SecKeyRef publicKey, uint8_t* pbData, int32_t cbData, CFDataRef* pDataOut, CFErrorRef* pErrorOut) +{ + // Since there's not an API which will give back the still-padded signature block with + // kSecAlgorithmRSASignatureRaw, use the encryption primitive to achieve the same result. + return RsaPrimitive( + publicKey, pbData, cbData, pDataOut, pErrorOut, kSecKeyAlgorithmRSAEncryptionRaw, SecKeyCreateEncryptedData); +} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_rsa.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_rsa.cpp deleted file mode 100644 index e273175fe8..0000000000 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_rsa.cpp +++ /dev/null @@ -1,269 +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. - -#include "pal_rsa.h" - -static int32_t ExecuteCFDataTransform( - SecTransformRef xform, uint8_t* pbData, int32_t cbData, CFDataRef* pDataOut, CFErrorRef* pErrorOut); - -extern "C" int32_t AppleCryptoNative_RsaGenerateKey( - int32_t keySizeBits, SecKeychainRef tempKeychain, SecKeyRef* pPublicKey, SecKeyRef* pPrivateKey, int32_t* pOSStatus) -{ - if (pPublicKey != nullptr) - *pPublicKey = nullptr; - if (pPrivateKey != nullptr) - *pPrivateKey = nullptr; - - if (pPublicKey == nullptr || pPrivateKey == nullptr || pOSStatus == nullptr) - return kErrorBadInput; - if (keySizeBits < 384 || keySizeBits > 16384) - return -2; - - CFMutableDictionaryRef attributes = CFDictionaryCreateMutable(nullptr, 2, &kCFTypeDictionaryKeyCallBacks, nullptr); - - CFNumberRef cfKeySizeValue = CFNumberCreate(nullptr, kCFNumberIntType, &keySizeBits); - OSStatus status; - - if (attributes != nullptr && cfKeySizeValue != nullptr) - { - CFDictionaryAddValue(attributes, kSecAttrKeyType, kSecAttrKeyTypeRSA); - CFDictionaryAddValue(attributes, kSecAttrKeySizeInBits, cfKeySizeValue); - CFDictionaryAddValue(attributes, kSecUseKeychain, tempKeychain); - - status = SecKeyGeneratePair(attributes, pPublicKey, pPrivateKey); - - if (status == noErr) - { - status = ExportImportKey(pPublicKey, kSecItemTypePublicKey); - } - - if (status == noErr) - { - status = ExportImportKey(pPrivateKey, kSecItemTypePrivateKey); - } - } - else - { - status = errSecAllocate; - } - - if (attributes != nullptr) - CFRelease(attributes); - if (cfKeySizeValue != nullptr) - CFRelease(cfKeySizeValue); - - *pOSStatus = status; - return status == noErr; -} - -static int32_t ExecuteOaepTransform(SecTransformRef xform, - uint8_t* pbData, - int32_t cbData, - PAL_HashAlgorithm algorithm, - CFDataRef* pDataOut, - CFErrorRef* pErrorOut) -{ - if (!SecTransformSetAttribute(xform, kSecPaddingKey, kSecPaddingOAEPKey, pErrorOut)) - { - return kErrorSeeError; - } - - // Documentation mentions kSecOAEPMGF1DigestAlgorithmAttributeName, but on the Apple platform - // "SHA2" is an algorithm and the size is encoded separately. Since there doesn't seem to be - // a second attribute to encode SHA2-256 vs SHA2-384, be limited to SHA-1. - if (algorithm != PAL_SHA1) - { - return kErrorUnknownAlgorithm; - } - - return ExecuteCFDataTransform(xform, pbData, cbData, pDataOut, pErrorOut); -} - -extern "C" int32_t AppleCryptoNative_RsaDecryptOaep(SecKeyRef privateKey, - uint8_t* pbData, - int32_t cbData, - PAL_HashAlgorithm mfgAlgorithm, - CFDataRef* pDecryptedOut, - CFErrorRef* pErrorOut) -{ - if (pDecryptedOut != nullptr) - *pDecryptedOut = nullptr; - if (pErrorOut != nullptr) - *pErrorOut = nullptr; - - if (privateKey == nullptr || pbData == nullptr || cbData < 0 || pDecryptedOut == nullptr || pErrorOut == nullptr) - { - return kErrorBadInput; - } - - int32_t ret = kErrorSeeError; - SecTransformRef decryptor = SecDecryptTransformCreate(privateKey, pErrorOut); - - if (decryptor != nullptr) - { - if (*pErrorOut == nullptr) - { - ret = ExecuteOaepTransform(decryptor, pbData, cbData, mfgAlgorithm, pDecryptedOut, pErrorOut); - } - - CFRelease(decryptor); - } - - return ret; -} - -extern "C" int32_t AppleCryptoNative_RsaDecryptPkcs( - SecKeyRef privateKey, uint8_t* pbData, int32_t cbData, CFDataRef* pDecryptedOut, CFErrorRef* pErrorOut) -{ - if (pDecryptedOut != nullptr) - *pDecryptedOut = nullptr; - if (pErrorOut != nullptr) - *pErrorOut = nullptr; - - if (privateKey == nullptr || pbData == nullptr || cbData < 0 || pDecryptedOut == nullptr || pErrorOut == nullptr) - { - return kErrorBadInput; - } - - int32_t ret = kErrorSeeError; - SecTransformRef decryptor = SecDecryptTransformCreate(privateKey, pErrorOut); - - if (decryptor != nullptr) - { - if (*pErrorOut == nullptr) - { - ret = ExecuteCFDataTransform(decryptor, pbData, cbData, pDecryptedOut, pErrorOut); - } - - CFRelease(decryptor); - } - - return ret; -} - -extern "C" int32_t AppleCryptoNative_RsaEncryptOaep(SecKeyRef publicKey, - uint8_t* pbData, - int32_t cbData, - PAL_HashAlgorithm mgfAlgorithm, - CFDataRef* pEncryptedOut, - CFErrorRef* pErrorOut) -{ - if (pEncryptedOut != nullptr) - *pEncryptedOut = nullptr; - if (pErrorOut != nullptr) - *pErrorOut = nullptr; - - if (publicKey == nullptr || pbData == nullptr || cbData < 0 || pEncryptedOut == nullptr || pErrorOut == nullptr) - { - return kErrorBadInput; - } - - int32_t ret = kErrorSeeError; - SecTransformRef encryptor = SecEncryptTransformCreate(publicKey, pErrorOut); - - if (encryptor != nullptr) - { - if (*pErrorOut == nullptr) - { - ret = ExecuteOaepTransform(encryptor, pbData, cbData, mgfAlgorithm, pEncryptedOut, pErrorOut); - } - - CFRelease(encryptor); - } - - return ret; -} - -extern "C" int32_t AppleCryptoNative_RsaEncryptPkcs( - SecKeyRef publicKey, uint8_t* pbData, int32_t cbData, CFDataRef* pEncryptedOut, CFErrorRef* pErrorOut) -{ - if (pEncryptedOut != nullptr) - *pEncryptedOut = nullptr; - if (pErrorOut != nullptr) - *pErrorOut = nullptr; - - if (publicKey == nullptr || pbData == nullptr || cbData < 0 || pEncryptedOut == nullptr || pErrorOut == nullptr) - { - return kErrorBadInput; - } - - int32_t ret = kErrorSeeError; - SecTransformRef encryptor = SecEncryptTransformCreate(publicKey, pErrorOut); - - if (encryptor != nullptr) - { - if (*pErrorOut == nullptr) - { - ret = ExecuteCFDataTransform(encryptor, pbData, cbData, pEncryptedOut, pErrorOut); - } - - CFRelease(encryptor); - } - - return ret; -} - -static int32_t ExecuteCFDataTransform( - SecTransformRef xform, uint8_t* pbData, int32_t cbData, CFDataRef* pDataOut, CFErrorRef* pErrorOut) -{ - if (xform == nullptr || pbData == nullptr || cbData < 0 || pDataOut == nullptr || pErrorOut == nullptr) - { - return kErrorBadInput; - } - - *pDataOut = nullptr; - *pErrorOut = nullptr; - - CFTypeRef xformOutput = nullptr; - CFDataRef cfData = nullptr; - int32_t ret = INT_MIN; - - cfData = CFDataCreateWithBytesNoCopy(nullptr, pbData, cbData, kCFAllocatorNull); - - if (cfData == nullptr) - { - // This probably means that there wasn't enough memory available, but no - // particular failure cases are described. - return kErrorUnknownState; - } - - if (!SecTransformSetAttribute(xform, kSecTransformInputAttributeName, cfData, pErrorOut)) - { - ret = kErrorSeeError; - goto cleanup; - } - - xformOutput = SecTransformExecute(xform, pErrorOut); - - if (xformOutput == nullptr || *pErrorOut != nullptr) - { - ret = kErrorSeeError; - goto cleanup; - } - - if (CFGetTypeID(xformOutput) == CFDataGetTypeID()) - { - CFDataRef cfDataOut = reinterpret_cast(const_cast(xformOutput)); - CFRetain(cfDataOut); - *pDataOut = cfDataOut; - ret = 1; - } - else - { - ret = kErrorUnknownState; - } - -cleanup: - if (xformOutput != nullptr) - { - CFRelease(xformOutput); - } - - if (cfData != nullptr) - { - CFRelease(cfData); - } - - return ret; -} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_rsa.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_rsa.h index cdc6b5c6e4..ae2a8fd0f4 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_rsa.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_rsa.h @@ -6,6 +6,7 @@ #include "pal_digest.h" #include "pal_seckey.h" +#include "pal_compiler.h" #include @@ -14,30 +15,30 @@ Generate a new RSA keypair with the specified key size, in bits. Returns 1 on success, 0 on failure. On failure, *pOSStatus should contain the OS reported error. */ -extern "C" int32_t AppleCryptoNative_RsaGenerateKey(int32_t keySizeBits, - SecKeychainRef tempKeychain, - SecKeyRef* pPublicKey, - SecKeyRef* pPrivateKey, - int32_t* pOSStatus); +DLLEXPORT int32_t AppleCryptoNative_RsaGenerateKey(int32_t keySizeBits, + SecKeychainRef tempKeychain, + SecKeyRef* pPublicKey, + SecKeyRef* pPrivateKey, + int32_t* pOSStatus); /* Decrypt the contents of pbData using the provided privateKey under OAEP padding. Follows pal_seckey return conventions. */ -extern "C" int32_t AppleCryptoNative_RsaDecryptOaep(SecKeyRef privateKey, - uint8_t* pbData, - int32_t cbData, - PAL_HashAlgorithm mfgAlgorithm, - CFDataRef* pDecryptedOut, - CFErrorRef* pErrorOut); +DLLEXPORT int32_t AppleCryptoNative_RsaDecryptOaep(SecKeyRef privateKey, + uint8_t* pbData, + int32_t cbData, + PAL_HashAlgorithm mfgAlgorithm, + CFDataRef* pDecryptedOut, + CFErrorRef* pErrorOut); /* Decrypt the contents of pbData using the provided privateKey under PKCS#1 padding. Follows pal_seckey return conventions. */ -extern "C" int32_t AppleCryptoNative_RsaDecryptPkcs( +DLLEXPORT int32_t AppleCryptoNative_RsaDecryptPkcs( SecKeyRef privateKey, uint8_t* pbData, int32_t cbData, CFDataRef* pDecryptedOut, CFErrorRef* pErrorOut); /* @@ -45,17 +46,49 @@ Encrypt pbData for the provided publicKey using OAEP padding. Follows pal_seckey return conventions. */ -extern "C" int32_t AppleCryptoNative_RsaEncryptOaep(SecKeyRef publicKey, - uint8_t* pbData, - int32_t cbData, - PAL_HashAlgorithm mgfAlgorithm, - CFDataRef* pEncryptedOut, - CFErrorRef* pErrorOut); +DLLEXPORT int32_t AppleCryptoNative_RsaEncryptOaep(SecKeyRef publicKey, + uint8_t* pbData, + int32_t cbData, + PAL_HashAlgorithm mgfAlgorithm, + CFDataRef* pEncryptedOut, + CFErrorRef* pErrorOut); /* Encrypt pbData for the provided publicKey using PKCS#1 padding. Follows pal_seckey return conventions. */ -extern "C" int32_t AppleCryptoNative_RsaEncryptPkcs( +DLLEXPORT int32_t AppleCryptoNative_RsaEncryptPkcs( SecKeyRef publicKey, uint8_t* pbData, int32_t cbData, CFDataRef* pEncryptedOut, CFErrorRef* pErrorOut); + +/* +Apply an RSA private key to a signing operation on data which was already padded. + +Follows pal_seckey return conventions. +*/ +DLLEXPORT int32_t AppleCryptoNative_RsaSignaturePrimitive( + SecKeyRef privateKey, uint8_t* pbData, int32_t cbData, CFDataRef* pDataOut, CFErrorRef* pErrorOut); + +/* +Apply an RSA private key to an encryption operation to emit data which is still padded. + +Follows pal_seckey return conventions. +*/ +DLLEXPORT int32_t AppleCryptoNative_RsaDecryptionPrimitive( + SecKeyRef privateKey, uint8_t* pbData, int32_t cbData, CFDataRef* pDataOut, CFErrorRef* pErrorOut); + +/* +Apply an RSA public key to an encryption operation on data which was already padded. + +Follows pal_seckey return conventions. +*/ +DLLEXPORT int32_t AppleCryptoNative_RsaEncryptionPrimitive( + SecKeyRef publicKey, uint8_t* pbData, int32_t cbData, CFDataRef* pDataOut, CFErrorRef* pErrorOut); + +/* +Apply an RSA public key to a signing operation to emit data which is still padded. + +Follows pal_seckey return conventions. +*/ +DLLEXPORT int32_t AppleCryptoNative_RsaVerificationPrimitive( + SecKeyRef publicKey, uint8_t* pbData, int32_t cbData, CFDataRef* pDataOut, CFErrorRef* pErrorOut); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_sec.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_sec.c similarity index 61% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_sec.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_sec.c index 72b37d43f5..5abbf37db2 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_sec.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_sec.c @@ -4,7 +4,7 @@ #include "pal_sec.h" -extern "C" CFStringRef AppleCryptoNative_SecCopyErrorMessageString(int32_t osStatus) +CFStringRef AppleCryptoNative_SecCopyErrorMessageString(int32_t osStatus) { - return SecCopyErrorMessageString(osStatus, nullptr); + return SecCopyErrorMessageString(osStatus, NULL); } diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_sec.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_sec.h index c00b3f74a0..4317d7268a 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_sec.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_sec.h @@ -6,6 +6,7 @@ #pragma once #include "pal_types.h" +#include "pal_compiler.h" #include @@ -14,4 +15,4 @@ Get an error message for an OSStatus error from the security library. Returns NULL if no message is available for the code. */ -extern "C" CFStringRef AppleCryptoNative_SecCopyErrorMessageString(OSStatus osStatus); +DLLEXPORT CFStringRef AppleCryptoNative_SecCopyErrorMessageString(OSStatus osStatus); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_seckey.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_seckey.c similarity index 65% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_seckey.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_seckey.c index c88d30cb65..364c71fab1 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_seckey.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_seckey.c @@ -4,26 +4,28 @@ #include "pal_seckey.h" -extern "C" int32_t AppleCryptoNative_SecKeyExport( +int32_t AppleCryptoNative_SecKeyExport( SecKeyRef pKey, int32_t exportPrivate, CFStringRef cfExportPassphrase, CFDataRef* ppDataOut, int32_t* pOSStatus) { - if (ppDataOut != nullptr) - *ppDataOut = nullptr; - if (pOSStatus != nullptr) + if (ppDataOut != NULL) + *ppDataOut = NULL; + if (pOSStatus != NULL) *pOSStatus = noErr; - if (pKey == nullptr || ppDataOut == nullptr || pOSStatus == nullptr) + if (pKey == NULL || ppDataOut == NULL || pOSStatus == NULL) { return kErrorBadInput; } SecExternalFormat dataFormat = kSecFormatOpenSSL; - SecItemImportExportKeyParameters keyParams = {}; + SecItemImportExportKeyParameters keyParams; + memset(&keyParams, 0, sizeof(SecItemImportExportKeyParameters)); + keyParams.version = SEC_KEY_IMPORT_EXPORT_PARAMS_VERSION; if (exportPrivate) { - if (cfExportPassphrase == nullptr) + if (cfExportPassphrase == NULL) { return kErrorBadInput; } @@ -37,22 +39,24 @@ extern "C" int32_t AppleCryptoNative_SecKeyExport( return (*pOSStatus == noErr); } -extern "C" int32_t AppleCryptoNative_SecKeyImportEphemeral( +typedef const struct OpaqueSecKeyRef* ConstSecKeyRef; + +int32_t AppleCryptoNative_SecKeyImportEphemeral( uint8_t* pbKeyBlob, int32_t cbKeyBlob, int32_t isPrivateKey, SecKeyRef* ppKeyOut, int32_t* pOSStatus) { - if (ppKeyOut != nullptr) - *ppKeyOut = nullptr; - if (pOSStatus != nullptr) + if (ppKeyOut != NULL) + *ppKeyOut = NULL; + if (pOSStatus != NULL) *pOSStatus = noErr; - if (pbKeyBlob == nullptr || cbKeyBlob < 0 || isPrivateKey < 0 || isPrivateKey > 1 || ppKeyOut == nullptr || - pOSStatus == nullptr) + if (pbKeyBlob == NULL || cbKeyBlob < 0 || isPrivateKey < 0 || isPrivateKey > 1 || ppKeyOut == NULL || + pOSStatus == NULL) { return kErrorBadInput; } int32_t ret = 0; - CFDataRef cfData = CFDataCreateWithBytesNoCopy(nullptr, pbKeyBlob, cbKeyBlob, kCFAllocatorNull); + CFDataRef cfData = CFDataCreateWithBytesNoCopy(NULL, pbKeyBlob, cbKeyBlob, kCFAllocatorNull); SecExternalFormat dataFormat = kSecFormatOpenSSL; SecExternalFormat actualFormat = dataFormat; @@ -61,10 +65,10 @@ extern "C" int32_t AppleCryptoNative_SecKeyImportEphemeral( SecExternalItemType actualType = itemType; CFIndex itemCount; - CFArrayRef outItems = nullptr; - CFTypeRef outItem = nullptr; + CFArrayRef outItems = NULL; + CFTypeRef outItem = NULL; - *pOSStatus = SecItemImport(cfData, nullptr, &actualFormat, &actualType, 0, nullptr, nullptr, &outItems); + *pOSStatus = SecItemImport(cfData, NULL, &actualFormat, &actualType, 0, NULL, NULL, &outItems); if (*pOSStatus != noErr) { @@ -78,7 +82,7 @@ extern "C" int32_t AppleCryptoNative_SecKeyImportEphemeral( goto cleanup; } - if (outItems == nullptr) + if (outItems == NULL) { ret = -3; goto cleanup; @@ -100,7 +104,7 @@ extern "C" int32_t AppleCryptoNative_SecKeyImportEphemeral( outItem = CFArrayGetValueAtIndex(outItems, 0); - if (outItem == nullptr) + if (outItem == NULL) { ret = -6; goto cleanup; @@ -113,11 +117,11 @@ extern "C" int32_t AppleCryptoNative_SecKeyImportEphemeral( } CFRetain(outItem); - *ppKeyOut = reinterpret_cast(const_cast(outItem)); + *ppKeyOut = (ConstSecKeyRef)outItem; ret = 1; cleanup: - if (outItems != nullptr) + if (outItems != NULL) { CFRelease(outItems); } @@ -126,9 +130,9 @@ cleanup: return ret; } -extern "C" uint64_t AppleCryptoNative_SecKeyGetSimpleKeySizeInBytes(SecKeyRef publicKey) +uint64_t AppleCryptoNative_SecKeyGetSimpleKeySizeInBytes(SecKeyRef publicKey) { - if (publicKey == nullptr) + if (publicKey == NULL) { return 0; } @@ -139,32 +143,34 @@ extern "C" uint64_t AppleCryptoNative_SecKeyGetSimpleKeySizeInBytes(SecKeyRef pu OSStatus ExportImportKey(SecKeyRef* key, SecExternalItemType type) { SecExternalFormat dataFormat = kSecFormatOpenSSL; - CFDataRef exportData = nullptr; + CFDataRef exportData = NULL; + + SecItemImportExportKeyParameters keyParams; + memset(&keyParams, 0, sizeof(SecItemImportExportKeyParameters)); - SecItemImportExportKeyParameters keyParams = {}; keyParams.version = SEC_KEY_IMPORT_EXPORT_PARAMS_VERSION; keyParams.passphrase = CFSTR("ExportImportPassphrase"); OSStatus status = SecItemExport(*key, dataFormat, 0, &keyParams, &exportData); CFRelease(*key); - *key = nullptr; + *key = NULL; SecExternalFormat actualFormat = dataFormat; SecExternalItemType actualType = type; - CFArrayRef outItems = nullptr; + CFArrayRef outItems = NULL; if (status == noErr) { - status = SecItemImport(exportData, nullptr, &actualFormat, &actualType, 0, nullptr, nullptr, &outItems); + status = SecItemImport(exportData, NULL, &actualFormat, &actualType, 0, NULL, NULL, &outItems); } CFRelease(exportData); - exportData = nullptr; + exportData = NULL; CFRelease(keyParams.passphrase); - keyParams.passphrase = nullptr; + keyParams.passphrase = NULL; - if (status == noErr && outItems != nullptr) + if (status == noErr && outItems != NULL) { CFIndex count = CFArrayGetCount(outItems); @@ -175,7 +181,7 @@ OSStatus ExportImportKey(SecKeyRef* key, SecExternalItemType type) if (CFGetTypeID(outItem) == SecKeyGetTypeID()) { CFRetain(outItem); - *key = reinterpret_cast(const_cast(outItem)); + *key = (ConstSecKeyRef)outItem; return noErr; } diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_seckey.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_seckey.h index 1f32f4e705..a0f0f39b34 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_seckey.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_seckey.h @@ -5,6 +5,7 @@ #pragma once #include "pal_types.h" +#include "pal_compiler.h" #include @@ -30,7 +31,7 @@ An export passphrase is required for private keys, and ignored for public keys. Follows pal_seckey return conventions. */ -extern "C" int32_t AppleCryptoNative_SecKeyExport( +DLLEXPORT int32_t AppleCryptoNative_SecKeyExport( SecKeyRef pKey, int32_t exportPrivate, CFStringRef cfExportPassphrase, CFDataRef* ppDataOut, int32_t* pOSStatus); /* @@ -45,7 +46,7 @@ but is in fact the X.509 SubjectPublicKeyInfo structure. Returns 1 on success, 0 on failure (*pOSStatus should be set) and negative numbers for various state machine errors. */ -extern "C" int32_t AppleCryptoNative_SecKeyImportEphemeral( +DLLEXPORT int32_t AppleCryptoNative_SecKeyImportEphemeral( uint8_t* pbKeyBlob, int32_t cbKeyBlob, int32_t isPrivateKey, SecKeyRef* ppKeyOut, int32_t* pOSStatus); /* @@ -56,7 +57,7 @@ For ECC the value should not be used. 0 is returned for invalid inputs. */ -extern "C" uint64_t AppleCryptoNative_SecKeyGetSimpleKeySizeInBytes(SecKeyRef publicKey); +DLLEXPORT uint64_t AppleCryptoNative_SecKeyGetSimpleKeySizeInBytes(SecKeyRef publicKey); /* Export a key and re-import it to the NULL keychain. diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_signverify.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_signverify.c similarity index 64% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_signverify.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_signverify.c index e47969929a..fe791cba0a 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_signverify.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_signverify.c @@ -18,20 +18,20 @@ static int32_t GenerateSignature(SecKeyRef privateKey, CFDataRef* pSignatureOut, CFErrorRef* pErrorOut) { - if (pSignatureOut != nullptr) - *pSignatureOut = nullptr; - if (pErrorOut != nullptr) - *pErrorOut = nullptr; + if (pSignatureOut != NULL) + *pSignatureOut = NULL; + if (pErrorOut != NULL) + *pErrorOut = NULL; - if (privateKey == nullptr || pbDataHash == nullptr || cbDataHash < 0 || pSignatureOut == nullptr || - pErrorOut == nullptr) + if (privateKey == NULL || pbDataHash == NULL || cbDataHash < 0 || pSignatureOut == NULL || + pErrorOut == NULL) { return kErrorBadInput; } - CFDataRef dataHash = CFDataCreateWithBytesNoCopy(nullptr, pbDataHash, cbDataHash, kCFAllocatorNull); + CFDataRef dataHash = CFDataCreateWithBytesNoCopy(NULL, pbDataHash, cbDataHash, kCFAllocatorNull); - if (dataHash == nullptr) + if (dataHash == NULL) { return kErrorUnknownState; } @@ -39,9 +39,9 @@ static int32_t GenerateSignature(SecKeyRef privateKey, int32_t ret = kErrorSeeError; SecTransformRef signer = SecSignTransformCreate(privateKey, pErrorOut); - if (signer != nullptr) + if (signer != NULL) { - if (*pErrorOut == nullptr) + if (*pErrorOut == NULL) { if (ConfigureSignVerifyTransform(signer, dataHash, hashAlgorithm, useHashAlgorithm, pErrorOut)) { @@ -56,18 +56,18 @@ static int32_t GenerateSignature(SecKeyRef privateKey, return ret; } -extern "C" int32_t AppleCryptoNative_GenerateSignature( +int32_t AppleCryptoNative_GenerateSignature( SecKeyRef privateKey, uint8_t* pbDataHash, int32_t cbDataHash, CFDataRef* pSignatureOut, CFErrorRef* pErrorOut) { return GenerateSignature(privateKey, pbDataHash, cbDataHash, PAL_Unknown, false, pSignatureOut, pErrorOut); } -extern "C" int32_t AppleCryptoNative_GenerateSignatureWithHashAlgorithm(SecKeyRef privateKey, - uint8_t* pbDataHash, - int32_t cbDataHash, - PAL_HashAlgorithm hashAlgorithm, - CFDataRef* pSignatureOut, - CFErrorRef* pErrorOut) +int32_t AppleCryptoNative_GenerateSignatureWithHashAlgorithm(SecKeyRef privateKey, + uint8_t* pbDataHash, + int32_t cbDataHash, + PAL_HashAlgorithm hashAlgorithm, + CFDataRef* pSignatureOut, + CFErrorRef* pErrorOut) { return GenerateSignature(privateKey, pbDataHash, cbDataHash, hashAlgorithm, true, pSignatureOut, pErrorOut); } @@ -81,23 +81,23 @@ static int32_t VerifySignature(SecKeyRef publicKey, bool useHashAlgorithm, CFErrorRef* pErrorOut) { - if (pErrorOut != nullptr) - *pErrorOut = nullptr; + if (pErrorOut != NULL) + *pErrorOut = NULL; - if (publicKey == nullptr || pbDataHash == nullptr || cbDataHash < 0 || pbSignature == nullptr || cbSignature < 0 || - pErrorOut == nullptr) + if (publicKey == NULL || pbDataHash == NULL || cbDataHash < 0 || pbSignature == NULL || cbSignature < 0 || + pErrorOut == NULL) return kErrorBadInput; - CFDataRef dataHash = CFDataCreateWithBytesNoCopy(nullptr, pbDataHash, cbDataHash, kCFAllocatorNull); + CFDataRef dataHash = CFDataCreateWithBytesNoCopy(NULL, pbDataHash, cbDataHash, kCFAllocatorNull); - if (dataHash == nullptr) + if (dataHash == NULL) { return kErrorUnknownState; } - CFDataRef signature = CFDataCreateWithBytesNoCopy(nullptr, pbSignature, cbSignature, kCFAllocatorNull); + CFDataRef signature = CFDataCreateWithBytesNoCopy(NULL, pbSignature, cbSignature, kCFAllocatorNull); - if (signature == nullptr) + if (signature == NULL) { CFRelease(dataHash); return kErrorUnknownState; @@ -106,9 +106,9 @@ static int32_t VerifySignature(SecKeyRef publicKey, int32_t ret = kErrorSeeError; SecTransformRef verifier = SecVerifyTransformCreate(publicKey, signature, pErrorOut); - if (verifier != nullptr) + if (verifier != NULL) { - if (*pErrorOut == nullptr) + if (*pErrorOut == NULL) { if (ConfigureSignVerifyTransform(verifier, dataHash, hashAlgorithm, useHashAlgorithm, pErrorOut)) { @@ -125,38 +125,38 @@ static int32_t VerifySignature(SecKeyRef publicKey, return ret; } -extern "C" int32_t AppleCryptoNative_VerifySignatureWithHashAlgorithm(SecKeyRef publicKey, - uint8_t* pbDataHash, - int32_t cbDataHash, - uint8_t* pbSignature, - int32_t cbSignature, - PAL_HashAlgorithm hashAlgorithm, - CFErrorRef* pErrorOut) +int32_t AppleCryptoNative_VerifySignatureWithHashAlgorithm(SecKeyRef publicKey, + uint8_t* pbDataHash, + int32_t cbDataHash, + uint8_t* pbSignature, + int32_t cbSignature, + PAL_HashAlgorithm hashAlgorithm, + CFErrorRef* pErrorOut) { return VerifySignature(publicKey, pbDataHash, cbDataHash, pbSignature, cbSignature, hashAlgorithm, true, pErrorOut); } -extern "C" int32_t AppleCryptoNative_VerifySignature(SecKeyRef publicKey, - uint8_t* pbDataHash, - int32_t cbDataHash, - uint8_t* pbSignature, - int32_t cbSignature, - CFErrorRef* pErrorOut) +int32_t AppleCryptoNative_VerifySignature(SecKeyRef publicKey, + uint8_t* pbDataHash, + int32_t cbDataHash, + uint8_t* pbSignature, + int32_t cbSignature, + CFErrorRef* pErrorOut) { return VerifySignature(publicKey, pbDataHash, cbDataHash, pbSignature, cbSignature, PAL_Unknown, false, pErrorOut); } static int32_t ExecuteSignTransform(SecTransformRef signer, CFDataRef* pSignatureOut, CFErrorRef* pErrorOut) { - assert(signer != nullptr); - assert(pSignatureOut != nullptr); - assert(pErrorOut != nullptr); + assert(signer != NULL); + assert(pSignatureOut != NULL); + assert(pErrorOut != NULL); int32_t ret = INT_MIN; CFTypeRef signerResponse = SecTransformExecute(signer, pErrorOut); - CFDataRef signature = nullptr; + CFDataRef signature = NULL; - if (signerResponse == nullptr || *pErrorOut != nullptr) + if (signerResponse == NULL || *pErrorOut != NULL) { ret = kErrorSeeError; goto cleanup; @@ -168,7 +168,7 @@ static int32_t ExecuteSignTransform(SecTransformRef signer, CFDataRef* pSignatur goto cleanup; } - signature = reinterpret_cast(const_cast(signerResponse)); + signature = (CFDataRef)signerResponse; if (CFDataGetLength(signature) > 0) { @@ -181,11 +181,11 @@ static int32_t ExecuteSignTransform(SecTransformRef signer, CFDataRef* pSignatur else { ret = kErrorUnknownState; - *pSignatureOut = nullptr; + *pSignatureOut = NULL; } cleanup: - if (signerResponse != nullptr) + if (signerResponse != NULL) { CFRelease(signerResponse); } @@ -195,15 +195,15 @@ cleanup: static int32_t ExecuteVerifyTransform(SecTransformRef verifier, CFErrorRef* pErrorOut) { - assert(verifier != nullptr); - assert(pErrorOut != nullptr); + assert(verifier != NULL); + assert(pErrorOut != NULL); int32_t ret = kErrorSeeError; CFTypeRef verifierResponse = SecTransformExecute(verifier, pErrorOut); - if (verifierResponse != nullptr) + if (verifierResponse != NULL) { - if (*pErrorOut == nullptr) + if (*pErrorOut == NULL) { ret = (verifierResponse == kCFBooleanTrue); } @@ -232,7 +232,7 @@ static int32_t ConfigureSignVerifyTransform(SecTransformRef xform, if (includeHashAlgorithm) { - CFStringRef cfHashName = nullptr; + CFStringRef cfHashName = NULL; int32_t hashSize = 0; switch (hashAlgorithm) @@ -266,9 +266,9 @@ static int32_t ConfigureSignVerifyTransform(SecTransformRef xform, if (hashSize != 0) { - CFNumberRef cfHashSize = CFNumberCreate(nullptr, kCFNumberIntType, &hashSize); + CFNumberRef cfHashSize = CFNumberCreate(NULL, kCFNumberIntType, &hashSize); - if (cfHashSize == nullptr) + if (cfHashSize == NULL) { return 0; } diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_signverify.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_signverify.h index 164bb4d611..d872649be6 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_signverify.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_signverify.h @@ -6,6 +6,7 @@ #include "pal_digest.h" #include "pal_seckey.h" +#include "pal_compiler.h" #include @@ -14,7 +15,7 @@ Generate a signature for algorithms which require only the data hash blob, like Follows pal_seckey return conventions. */ -extern "C" int32_t AppleCryptoNative_GenerateSignature( +DLLEXPORT int32_t AppleCryptoNative_GenerateSignature( SecKeyRef privateKey, uint8_t* pbDataHash, int32_t cbDataHash, CFDataRef* pSignatureOut, CFErrorRef* pErrorOut); /* @@ -22,12 +23,12 @@ Generate a signature for algorithms which require the pair of (dataHash, algorit Follows pal_seckey return conventions. */ -extern "C" int32_t AppleCryptoNative_GenerateSignatureWithHashAlgorithm(SecKeyRef privateKey, - uint8_t* pbDataHash, - int32_t cbDataHash, - PAL_HashAlgorithm hashAlgorithm, - CFDataRef* pSignatureOut, - CFErrorRef* pErrorOut); +DLLEXPORT int32_t AppleCryptoNative_GenerateSignatureWithHashAlgorithm(SecKeyRef privateKey, + uint8_t* pbDataHash, + int32_t cbDataHash, + PAL_HashAlgorithm hashAlgorithm, + CFDataRef* pSignatureOut, + CFErrorRef* pErrorOut); /* Verify a signature for algorithms which only require the data hash blob, like DSA and ECDSA. @@ -35,13 +36,13 @@ Verify a signature for algorithms which only require the data hash blob, like DS Returns 1 when the signature is correct, 0 when it is incorrect, and otherwise follows pal_seckey return conventions. */ -extern "C" int32_t AppleCryptoNative_VerifySignatureWithHashAlgorithm(SecKeyRef publicKey, - uint8_t* pbDataHash, - int32_t cbDataHash, - uint8_t* pbSignature, - int32_t cbSignature, - PAL_HashAlgorithm hashAlgorithm, - CFErrorRef* pErrorOut); +DLLEXPORT int32_t AppleCryptoNative_VerifySignatureWithHashAlgorithm(SecKeyRef publicKey, + uint8_t* pbDataHash, + int32_t cbDataHash, + uint8_t* pbSignature, + int32_t cbSignature, + PAL_HashAlgorithm hashAlgorithm, + CFErrorRef* pErrorOut); /* Verify a signature for algorithms which require the pair of (dataHash, algorithmId), like RSA. @@ -49,9 +50,9 @@ Verify a signature for algorithms which require the pair of (dataHash, algorithm Returns 1 when the signature is correct, 0 when it is incorrect, and otherwise follows pal_seckey return conventions. */ -extern "C" int32_t AppleCryptoNative_VerifySignature(SecKeyRef publicKey, - uint8_t* pbDataHash, - int32_t cbDataHash, - uint8_t* pbSignature, - int32_t cbSignature, - CFErrorRef* pErrorOut); +DLLEXPORT int32_t AppleCryptoNative_VerifySignature(SecKeyRef publicKey, + uint8_t* pbDataHash, + int32_t cbDataHash, + uint8_t* pbSignature, + int32_t cbSignature, + CFErrorRef* pErrorOut); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ssl.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ssl.c similarity index 75% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ssl.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ssl.c index dca5c7a013..b74819caba 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ssl.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ssl.c @@ -4,15 +4,15 @@ #include "pal_ssl.h" -extern "C" SSLContextRef AppleCryptoNative_SslCreateContext(int32_t isServer) +SSLContextRef AppleCryptoNative_SslCreateContext(int32_t isServer) { if (isServer != 0 && isServer != 1) - return nullptr; + return NULL; - return SSLCreateContext(nullptr, isServer ? kSSLServerSide : kSSLClientSide, kSSLStreamType); + return SSLCreateContext(NULL, isServer ? kSSLServerSide : kSSLClientSide, kSSLStreamType); } -extern "C" int32_t AppleCryptoNative_SslSetAcceptClientCert(SSLContextRef sslContext) +int32_t AppleCryptoNative_SslSetAcceptClientCert(SSLContextRef sslContext) { // NULL and other illegal values are handled by the underlying API return SSLSetClientSideAuthenticate(sslContext, kTryAuthenticate); @@ -38,7 +38,7 @@ static SSLProtocol PalSslProtocolToSslProtocol(PAL_SslProtocol palProtocolId) } } -extern "C" int32_t AppleCryptoNative_SslSetMinProtocolVersion(SSLContextRef sslContext, PAL_SslProtocol sslProtocol) +int32_t AppleCryptoNative_SslSetMinProtocolVersion(SSLContextRef sslContext, PAL_SslProtocol sslProtocol) { SSLProtocol protocol = PalSslProtocolToSslProtocol(sslProtocol); @@ -49,7 +49,7 @@ extern "C" int32_t AppleCryptoNative_SslSetMinProtocolVersion(SSLContextRef sslC return SSLSetProtocolVersionMin(sslContext, protocol); } -extern "C" int32_t AppleCryptoNative_SslSetMaxProtocolVersion(SSLContextRef sslContext, PAL_SslProtocol sslProtocol) +int32_t AppleCryptoNative_SslSetMaxProtocolVersion(SSLContextRef sslContext, PAL_SslProtocol sslProtocol) { SSLProtocol protocol = PalSslProtocolToSslProtocol(sslProtocol); @@ -60,30 +60,30 @@ extern "C" int32_t AppleCryptoNative_SslSetMaxProtocolVersion(SSLContextRef sslC return SSLSetProtocolVersionMax(sslContext, protocol); } -extern "C" int32_t +int32_t AppleCryptoNative_SslCopyCertChain(SSLContextRef sslContext, SecTrustRef* pChainOut, int32_t* pOSStatus) { - if (pChainOut != nullptr) - *pChainOut = nullptr; - if (pOSStatus != nullptr) + if (pChainOut != NULL) + *pChainOut = NULL; + if (pOSStatus != NULL) *pOSStatus = noErr; - if (sslContext == nullptr || pChainOut == nullptr || pOSStatus == nullptr) + if (sslContext == NULL || pChainOut == NULL || pOSStatus == NULL) return -1; *pOSStatus = SSLCopyPeerTrust(sslContext, pChainOut); return *pOSStatus == noErr; } -extern "C" int32_t +int32_t AppleCryptoNative_SslCopyCADistinguishedNames(SSLContextRef sslContext, CFArrayRef* pArrayOut, int32_t* pOSStatus) { - if (pArrayOut != nullptr) - *pArrayOut = nullptr; - if (pOSStatus != nullptr) + if (pArrayOut != NULL) + *pArrayOut = NULL; + if (pOSStatus != NULL) *pOSStatus = noErr; - if (sslContext == nullptr || pArrayOut == nullptr || pOSStatus == nullptr) + if (sslContext == NULL || pArrayOut == NULL || pOSStatus == NULL) return -1; *pOSStatus = SSLCopyDistinguishedNames(sslContext, pArrayOut); @@ -96,7 +96,7 @@ static int32_t AppleCryptoNative_SslSetSessionOption(SSLContextRef sslContext, int32_t value, int32_t* pOSStatus) { - if (sslContext == nullptr) + if (sslContext == NULL) return -1; if (value != 0 && value != 1) @@ -107,33 +107,33 @@ static int32_t AppleCryptoNative_SslSetSessionOption(SSLContextRef sslContext, return *pOSStatus == noErr; } -extern "C" int32_t +int32_t AppleCryptoNative_SslSetBreakOnServerAuth(SSLContextRef sslContext, int32_t setBreak, int32_t* pOSStatus) { return AppleCryptoNative_SslSetSessionOption(sslContext, kSSLSessionOptionBreakOnServerAuth, setBreak, pOSStatus); } -extern "C" int32_t +int32_t AppleCryptoNative_SslSetBreakOnClientAuth(SSLContextRef sslContext, int32_t setBreak, int32_t* pOSStatus) { return AppleCryptoNative_SslSetSessionOption(sslContext, kSSLSessionOptionBreakOnClientAuth, setBreak, pOSStatus); } -extern "C" int32_t AppleCryptoNative_SslSetCertificate(SSLContextRef sslContext, CFArrayRef certRefs) +int32_t AppleCryptoNative_SslSetCertificate(SSLContextRef sslContext, CFArrayRef certRefs) { // The underlying call handles NULL inputs, so just pass it through return SSLSetCertificate(sslContext, certRefs); } -extern "C" int32_t AppleCryptoNative_SslSetTargetName(SSLContextRef sslContext, - const char* pszTargetName, - int32_t cbTargetName, - int32_t* pOSStatus) +int32_t AppleCryptoNative_SslSetTargetName(SSLContextRef sslContext, + const char* pszTargetName, + int32_t cbTargetName, + int32_t* pOSStatus) { - if (pOSStatus != nullptr) + if (pOSStatus != NULL) *pOSStatus = noErr; - if (sslContext == nullptr || pszTargetName == nullptr || pOSStatus == nullptr) + if (sslContext == NULL || pszTargetName == NULL || pOSStatus == NULL) return -1; if (cbTargetName < 0) @@ -147,21 +147,21 @@ extern "C" int32_t AppleCryptoNative_SslSetTargetName(SSLContextRef sslContext, // listen to this. So, if we've already set it, don't set it again. if (*pOSStatus == noErr && currentLength == 0) { - *pOSStatus = SSLSetPeerDomainName(sslContext, pszTargetName, static_cast(cbTargetName)); + *pOSStatus = SSLSetPeerDomainName(sslContext, pszTargetName, (size_t)cbTargetName); } return *pOSStatus == noErr; } -extern "C" int32_t +int32_t AppleCryptoNative_SslSetIoCallbacks(SSLContextRef sslContext, SSLReadFunc readFunc, SSLWriteFunc writeFunc) { return SSLSetIOFuncs(sslContext, readFunc, writeFunc); } -extern "C" PAL_TlsHandshakeState AppleCryptoNative_SslHandshake(SSLContextRef sslContext) +PAL_TlsHandshakeState AppleCryptoNative_SslHandshake(SSLContextRef sslContext) { - if (sslContext == nullptr) + if (sslContext == NULL) return PAL_TlsHandshakeState_Unknown; OSStatus osStatus = SSLHandshake(sslContext); @@ -194,34 +194,34 @@ static PAL_TlsIo OSStatusToPAL_TlsIo(OSStatus status) } } -extern "C" PAL_TlsIo +PAL_TlsIo AppleCryptoNative_SslWrite(SSLContextRef sslContext, const uint8_t* buf, uint32_t bufLen, uint32_t* bytesWritten) { - if (bytesWritten == nullptr) + if (bytesWritten == NULL) return PAL_TlsIo_Unknown; - size_t expected = static_cast(bufLen); + size_t expected = (size_t)bufLen; size_t totalWritten; OSStatus status = SSLWrite(sslContext, buf, expected, &totalWritten); if (status != noErr) { - *bytesWritten = static_cast(totalWritten); + *bytesWritten = (uint32_t)totalWritten; return OSStatusToPAL_TlsIo(status); } return PAL_TlsIo_Success; } -extern "C" PAL_TlsIo +PAL_TlsIo AppleCryptoNative_SslRead(SSLContextRef sslContext, uint8_t* buf, uint32_t bufLen, uint32_t* written) { - if (written == nullptr) + if (written == NULL) return PAL_TlsIo_Unknown; size_t writtenSize = 0; - size_t bufSize = static_cast(bufLen); + size_t bufSize = (size_t)bufLen; OSStatus status = SSLRead(sslContext, buf, bufSize, &writtenSize); @@ -232,11 +232,12 @@ AppleCryptoNative_SslRead(SSLContextRef sslContext, uint8_t* buf, uint32_t bufLe return PAL_TlsIo_Unknown; } - *written = static_cast(writtenSize); + *written = (uint32_t)writtenSize; if (writtenSize == 0 && status == errSSLWouldBlock) { - SSLSessionState state = {}; + SSLSessionState state; + memset(&state, 0, sizeof(SSLSessionState)); OSStatus localStatus = SSLGetSessionState(sslContext, &state); if (localStatus == noErr && state == kSSLHandshake) @@ -248,25 +249,25 @@ AppleCryptoNative_SslRead(SSLContextRef sslContext, uint8_t* buf, uint32_t bufLe return OSStatusToPAL_TlsIo(status); } -extern "C" int32_t +int32_t AppleCryptoNative_SslIsHostnameMatch(SSLContextRef sslContext, CFStringRef cfHostname, CFDateRef notBefore) { - if (sslContext == nullptr || notBefore == nullptr) + if (sslContext == NULL || notBefore == NULL) return -1; - if (cfHostname == nullptr) + if (cfHostname == NULL) return -2; SecPolicyRef sslPolicy = SecPolicyCreateSSL(true, cfHostname); - if (sslPolicy == nullptr) + if (sslPolicy == NULL) return -3; CFMutableArrayRef certs = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); - if (certs == nullptr) + if (certs == NULL) return -4; - SecTrustRef existingTrust = nullptr; + SecTrustRef existingTrust = NULL; OSStatus osStatus = SSLCopyPeerTrust(sslContext, &existingTrust); if (osStatus != noErr) @@ -277,7 +278,7 @@ AppleCryptoNative_SslIsHostnameMatch(SSLContextRef sslContext, CFStringRef cfHos CFMutableArrayRef anchors = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); - if (anchors == nullptr) + if (anchors == NULL) { CFRelease(certs); return -6; @@ -298,7 +299,7 @@ AppleCryptoNative_SslIsHostnameMatch(SSLContextRef sslContext, CFStringRef cfHos } } - SecTrustRef trust = nullptr; + SecTrustRef trust = NULL; osStatus = SecTrustCreateWithCertificates(certs, sslPolicy, &trust); int32_t ret = INT_MIN; @@ -314,7 +315,8 @@ AppleCryptoNative_SslIsHostnameMatch(SSLContextRef sslContext, CFStringRef cfHos if (osStatus == noErr) { - SecTrustResultType trustResult = {}; + SecTrustResultType trustResult; + memset(&trustResult, 0, sizeof(SecTrustResultType)); osStatus = SecTrustEvaluate(trust, &trustResult); @@ -336,30 +338,30 @@ AppleCryptoNative_SslIsHostnameMatch(SSLContextRef sslContext, CFStringRef cfHos } } - if (trust != nullptr) + if (trust != NULL) CFRelease(trust); - if (certs != nullptr) + if (certs != NULL) CFRelease(certs); - if (anchors != nullptr) + if (anchors != NULL) CFRelease(anchors); CFRelease(sslPolicy); return ret; } -extern "C" int32_t AppleCryptoNative_SslShutdown(SSLContextRef sslContext) +int32_t AppleCryptoNative_SslShutdown(SSLContextRef sslContext) { return SSLClose(sslContext); } -extern "C" int32_t AppleCryptoNative_SslGetProtocolVersion(SSLContextRef sslContext, PAL_SslProtocol* pProtocol) +int32_t AppleCryptoNative_SslGetProtocolVersion(SSLContextRef sslContext, PAL_SslProtocol* pProtocol) { - if (pProtocol != nullptr) + if (pProtocol != NULL) *pProtocol = 0; - if (sslContext == nullptr || pProtocol == nullptr) + if (sslContext == NULL || pProtocol == NULL) return errSecParam; SSLProtocol protocol = kSSLProtocolUnknown; @@ -386,9 +388,9 @@ extern "C" int32_t AppleCryptoNative_SslGetProtocolVersion(SSLContextRef sslCont return osStatus; } -extern "C" int32_t AppleCryptoNative_SslGetCipherSuite(SSLContextRef sslContext, uint32_t* pCipherSuiteOut) +int32_t AppleCryptoNative_SslGetCipherSuite(SSLContextRef sslContext, uint32_t* pCipherSuiteOut) { - if (pCipherSuiteOut == nullptr) + if (pCipherSuiteOut == NULL) *pCipherSuiteOut = 0; return SSLGetNegotiatedCipher(sslContext, pCipherSuiteOut); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ssl.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ssl.h index adc4754c41..1d9bec4d4b 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ssl.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ssl.h @@ -4,6 +4,7 @@ #pragma once +#include "pal_compiler.h" #include enum @@ -42,28 +43,28 @@ Create an SSL context, for the Server or Client role as determined by isServer. Returns NULL if an invalid boolean is given for isServer, an SSLContextRef otherwise. */ -extern "C" SSLContextRef AppleCryptoNative_SslCreateContext(int32_t isServer); +DLLEXPORT SSLContextRef AppleCryptoNative_SslCreateContext(int32_t isServer); /* Indicate that an SSL Context (in server mode) should allow a client to present a mutual auth cert. Returns The result of SSLSetClientSideAuthenticate */ -extern "C" int32_t AppleCryptoNative_SslSetAcceptClientCert(SSLContextRef sslContext); +DLLEXPORT int32_t AppleCryptoNative_SslSetAcceptClientCert(SSLContextRef sslContext); /* Assign a minimum to the TLS protocol version for this connection. Returns the output of SSLSetProtocolVersionMin */ -extern "C" int32_t AppleCryptoNative_SslSetMinProtocolVersion(SSLContextRef sslContext, PAL_SslProtocol sslProtocol); +DLLEXPORT int32_t AppleCryptoNative_SslSetMinProtocolVersion(SSLContextRef sslContext, PAL_SslProtocol sslProtocol); /* Assign a maximum to the TLS protocol version for this connection. Returns the output of SSLSetProtocolVersionMax */ -extern "C" int32_t AppleCryptoNative_SslSetMaxProtocolVersion(SSLContextRef sslContext, PAL_SslProtocol sslProtocol); +DLLEXPORT int32_t AppleCryptoNative_SslSetMaxProtocolVersion(SSLContextRef sslContext, PAL_SslProtocol sslProtocol); /* Get the SecTrustRef from the SSL context which represents the certificte chain. @@ -74,7 +75,7 @@ Output: pChainOut: Receives the SecTrustRef representing the populated chain pOSStatus: Receives the value returned by SSLCopyPeerTrust */ -extern "C" int32_t +DLLEXPORT int32_t AppleCryptoNative_SslCopyCertChain(SSLContextRef sslContext, SecTrustRef* pChainOut, int32_t* pOSStatus); /* @@ -88,7 +89,7 @@ values sent by the server. pOSStatus: Receives the output of SSLCopyDistinguishedNames. */ -extern "C" int32_t +DLLEXPORT int32_t AppleCryptoNative_SslCopyCADistinguishedNames(SSLContextRef sslContext, CFArrayRef* pArrayOut, int32_t* pOSStatus); /* @@ -99,7 +100,7 @@ Returns 1 on success, 0 on failure, other values on invalid state. Output: pOSStatus: Receives the value returned by SSLSetSessionOption */ -extern "C" int32_t +DLLEXPORT int32_t AppleCryptoNative_SslSetBreakOnServerAuth(SSLContextRef sslContext, int32_t setBreak, int32_t* pOSStatus); /* @@ -110,7 +111,7 @@ Returns 1 on success, 0 on failure, other values on invalid state. Output: pOSStatus: Receives the value returned by SSLSetSessionOption */ -extern "C" int32_t +DLLEXPORT int32_t AppleCryptoNative_SslSetBreakOnClientAuth(SSLContextRef sslContext, int32_t setBreak, int32_t* pOSStatus); /* @@ -122,7 +123,7 @@ intermediate (non-root) certificate. Returns the output of SSLSetCertificate */ -extern "C" int32_t AppleCryptoNative_SslSetCertificate(SSLContextRef sslContext, CFArrayRef certRefs); +DLLEXPORT int32_t AppleCryptoNative_SslSetCertificate(SSLContextRef sslContext, CFArrayRef certRefs); /* Set the target hostname for SNI. pszTargetName must already be converted for IDNA if required. @@ -132,17 +133,17 @@ Returns 1 on success, 0 on failure, other values for invalid state. Output: pOSStatus: Receives the value for SSLSetPeerDomainName */ -extern "C" int32_t AppleCryptoNative_SslSetTargetName(SSLContextRef sslContext, - const char* pszTargetName, - int32_t cbTargetName, - int32_t* pOSStatus); +DLLEXPORT int32_t AppleCryptoNative_SslSetTargetName(SSLContextRef sslContext, + const char* pszTargetName, + int32_t cbTargetName, + int32_t* pOSStatus); /* Register the callbacks for reading and writing data to the SSL context. Returns the output of SSLSetIOFuncs. */ -extern "C" int32_t +DLLEXPORT int32_t AppleCryptoNative_SslSetIoCallbacks(SSLContextRef sslContext, SSLReadFunc readFunc, SSLWriteFunc writeFunc); /* @@ -150,7 +151,7 @@ Pump the TLS handshake. Returns an indication of what state the error is in. Any negative number means an error occurred. */ -extern "C" PAL_TlsHandshakeState AppleCryptoNative_SslHandshake(SSLContextRef sslContext); +DLLEXPORT PAL_TlsHandshakeState AppleCryptoNative_SslHandshake(SSLContextRef sslContext); /* Take bufLen bytes of cleartext data from buf and encrypt/frame the data. @@ -163,7 +164,7 @@ bytesWritten: When any value other than PAL_TlsIo_Success is returned, receives which were read from buf. On PAL_TlsIo_Success the parameter is not written through (but must still not be NULL) */ -extern "C" PAL_TlsIo +DLLEXPORT PAL_TlsIo AppleCryptoNative_SslWrite(SSLContextRef sslContext, const uint8_t* buf, uint32_t bufLen, uint32_t* bytesWritten); /* @@ -176,7 +177,7 @@ Returns a PAL_TlsIo code indicating how to proceed. Output: written: Receives the number of bytes written into buf */ -extern "C" PAL_TlsIo +DLLEXPORT PAL_TlsIo AppleCryptoNative_SslRead(SSLContextRef sslContext, uint8_t* buf, uint32_t bufLen, uint32_t* written); /* @@ -187,7 +188,7 @@ the certificate being expired (or not yet valid). Returns 1 on match, 0 on mismatch, any other value indicates an invalid state. */ -extern "C" int32_t +DLLEXPORT int32_t AppleCryptoNative_SslIsHostnameMatch(SSLContextRef sslContext, CFStringRef cfHostname, CFDateRef notBefore); /* @@ -195,7 +196,7 @@ Generate a TLS Close alert to terminate the session. Returns the output of SSLClose */ -extern "C" int32_t AppleCryptoNative_SslShutdown(SSLContextRef sslContext); +DLLEXPORT int32_t AppleCryptoNative_SslShutdown(SSLContextRef sslContext); /* Retrieve the TLS Protocol Version (e.g. TLS1.2) for the current session. @@ -205,7 +206,7 @@ Returns the output of SSLGetNegotiatedProtocolVersion. Output: pProtocol: Receives the protocol ID. PAL_SslProtocol_None is issued on error or an unknown mapping. */ -extern "C" int32_t AppleCryptoNative_SslGetProtocolVersion(SSLContextRef sslContext, PAL_SslProtocol* pProtocol); +DLLEXPORT int32_t AppleCryptoNative_SslGetProtocolVersion(SSLContextRef sslContext, PAL_SslProtocol* pProtocol); /* Retrieve the TLS Cipher Suite which was negotiated for the current session. @@ -216,4 +217,4 @@ Output: pProtocol: The TLS CipherSuite value (from the RFC), e.g. ((uint32_t)0xC030) for TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 */ -extern "C" int32_t AppleCryptoNative_SslGetCipherSuite(SSLContextRef sslContext, uint32_t* pCipherSuiteOut); +DLLEXPORT int32_t AppleCryptoNative_SslGetCipherSuite(SSLContextRef sslContext, uint32_t* pCipherSuiteOut); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_symmetric.c b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_symmetric.c new file mode 100644 index 0000000000..e46dc8149c --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_symmetric.c @@ -0,0 +1,141 @@ +// 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. + +#include "pal_symmetric.h" + +#include + +c_static_assert(PAL_OperationEncrypt == kCCEncrypt); +c_static_assert(PAL_OperationDecrypt == kCCDecrypt); + +c_static_assert(PAL_AlgorithmAES == kCCAlgorithmAES128); +c_static_assert(PAL_AlgorithmDES == kCCAlgorithmDES); +c_static_assert(PAL_Algorithm3DES == kCCAlgorithm3DES); +c_static_assert(PAL_AlgorithmRC2 == kCCAlgorithmRC2); + +c_static_assert(PAL_ChainingModeECB == kCCModeECB); +c_static_assert(PAL_ChainingModeCBC == kCCModeCBC); + +c_static_assert(PAL_PaddingModeNone == ccNoPadding); +c_static_assert(PAL_PaddingModePkcs7 == ccPKCS7Padding); + +// No PAL_SymmetricOptions are currently mapped, so no asserts required. + +void AppleCryptoNative_CryptorFree(CCCryptorRef cryptor) +{ + if (cryptor != NULL) + { + CCCryptorRelease(cryptor); + } +} + +int32_t AppleCryptoNative_CryptorCreate(PAL_SymmetricOperation operation, + PAL_SymmetricAlgorithm algorithm, + PAL_ChainingMode chainingMode, + PAL_PaddingMode paddingMode, + const uint8_t* pbKey, + int32_t cbKey, + const uint8_t* pbIv, + PAL_SymmetricOptions options, + CCCryptorRef* ppCryptorOut, + int32_t* pccStatus) +{ + if (pccStatus == NULL) + return -1; + + *pccStatus = 0; + + if (pbKey == NULL || cbKey < 1 || ppCryptorOut == NULL) + return -1; + if (pbIv == NULL && chainingMode != PAL_ChainingModeECB) + return -1; + + // Ensure we aren't passing through things we don't understand + assert(operation == PAL_OperationEncrypt || operation == PAL_OperationDecrypt); + assert(algorithm == PAL_AlgorithmAES || algorithm == PAL_AlgorithmDES || algorithm == PAL_Algorithm3DES || + algorithm == PAL_AlgorithmRC2); + assert(chainingMode == PAL_ChainingModeECB || chainingMode == PAL_ChainingModeCBC); + assert(paddingMode == PAL_PaddingModeNone || paddingMode == PAL_PaddingModePkcs7); + assert(options == 0); + + CCStatus status = CCCryptorCreateWithMode(operation, + chainingMode, + algorithm, + paddingMode, + pbIv, + pbKey, + (size_t)cbKey, + /* tweak is not supported */ NULL, + 0, + /* numRounds is not supported */ 0, + options, + ppCryptorOut); + + *pccStatus = status; + return status == kCCSuccess; +} + +int32_t AppleCryptoNative_CryptorUpdate(CCCryptorRef cryptor, + const uint8_t* pbData, + int32_t cbData, + uint32_t* pbOutput, + int32_t cbOutput, + int32_t* pcbWritten, + int32_t* pccStatus) +{ + if (pccStatus == NULL) + return -1; + + *pccStatus = 0; + + if (pbData == NULL || cbData < 0 || pbOutput == NULL || cbOutput < cbData || pcbWritten == NULL) + return -1; + + CCStatus status = CCCryptorUpdate(cryptor, + pbData, + (size_t)cbData, + pbOutput, + (size_t)cbOutput, + (size_t*)pcbWritten); + + *pccStatus = status; + return status == kCCSuccess; +} + +int32_t AppleCryptoNative_CryptorFinal( + CCCryptorRef cryptor, uint8_t* pbOutput, int32_t cbOutput, int32_t* pcbWritten, int32_t* pccStatus) +{ + if (pccStatus == NULL) + return -1; + + *pccStatus = 0; + + if (pbOutput == NULL || cbOutput < 0 || pcbWritten == NULL) + return -1; + + CCStatus status = + CCCryptorFinal(cryptor, pbOutput, (size_t)cbOutput, (size_t*)pcbWritten); + + *pccStatus = status; + return status == kCCSuccess; +} + +int32_t AppleCryptoNative_CryptorReset(CCCryptorRef cryptor, const uint8_t* pbIv, int32_t* pccStatus) +{ + if (pccStatus == NULL) + return -1; + + *pccStatus = 0; + + if (cryptor == NULL) + return -1; + + // 10.13 Beta reports an error when resetting ECB, which is the only mode which has a null IV. + if (pbIv == NULL) + return 1; + + CCStatus status = CCCryptorReset(cryptor, pbIv); + *pccStatus = status; + return status == kCCSuccess; +} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_symmetric.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_symmetric.cpp deleted file mode 100644 index 1be9e47691..0000000000 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_symmetric.cpp +++ /dev/null @@ -1,141 +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. - -#include "pal_symmetric.h" - -#include - -static_assert(PAL_OperationEncrypt == kCCEncrypt, ""); -static_assert(PAL_OperationDecrypt == kCCDecrypt, ""); - -static_assert(PAL_AlgorithmAES == kCCAlgorithmAES128, ""); -static_assert(PAL_AlgorithmDES == kCCAlgorithmDES, ""); -static_assert(PAL_Algorithm3DES == kCCAlgorithm3DES, ""); -static_assert(PAL_AlgorithmRC2 == kCCAlgorithmRC2, ""); - -static_assert(PAL_ChainingModeECB == kCCModeECB, ""); -static_assert(PAL_ChainingModeCBC == kCCModeCBC, ""); - -static_assert(PAL_PaddingModeNone == ccNoPadding, ""); -static_assert(PAL_PaddingModePkcs7 == ccPKCS7Padding, ""); - -// No PAL_SymmetricOptions are currently mapped, so no asserts required. - -extern "C" void AppleCryptoNative_CryptorFree(CCCryptorRef cryptor) -{ - if (cryptor != nullptr) - { - CCCryptorRelease(cryptor); - } -} - -extern "C" int32_t AppleCryptoNative_CryptorCreate(PAL_SymmetricOperation operation, - PAL_SymmetricAlgorithm algorithm, - PAL_ChainingMode chainingMode, - PAL_PaddingMode paddingMode, - const uint8_t* pbKey, - int32_t cbKey, - const uint8_t* pbIv, - PAL_SymmetricOptions options, - CCCryptorRef* ppCryptorOut, - int32_t* pccStatus) -{ - if (pccStatus == nullptr) - return -1; - - *pccStatus = 0; - - if (pbKey == nullptr || cbKey < 1 || ppCryptorOut == nullptr) - return -1; - if (pbIv == nullptr && chainingMode != PAL_ChainingModeECB) - return -1; - - // Ensure we aren't passing through things we don't understand - assert(operation == PAL_OperationEncrypt || operation == PAL_OperationDecrypt); - assert(algorithm == PAL_AlgorithmAES || algorithm == PAL_AlgorithmDES || algorithm == PAL_Algorithm3DES || - algorithm == PAL_AlgorithmRC2); - assert(chainingMode == PAL_ChainingModeECB || chainingMode == PAL_ChainingModeCBC); - assert(paddingMode == PAL_PaddingModeNone || paddingMode == PAL_PaddingModePkcs7); - assert(options == 0); - - CCStatus status = CCCryptorCreateWithMode(operation, - chainingMode, - algorithm, - paddingMode, - pbIv, - pbKey, - static_cast(cbKey), - /* tweak is not supported */ nullptr, - 0, - /* numRounds is not supported */ 0, - options, - ppCryptorOut); - - *pccStatus = status; - return status == kCCSuccess; -} - -extern "C" int32_t AppleCryptoNative_CryptorUpdate(CCCryptorRef cryptor, - const uint8_t* pbData, - int32_t cbData, - uint32_t* pbOutput, - int32_t cbOutput, - int32_t* pcbWritten, - int32_t* pccStatus) -{ - if (pccStatus == nullptr) - return -1; - - *pccStatus = 0; - - if (pbData == nullptr || cbData < 0 || pbOutput == nullptr || cbOutput < cbData || pcbWritten == nullptr) - return -1; - - CCStatus status = CCCryptorUpdate(cryptor, - pbData, - static_cast(cbData), - pbOutput, - static_cast(cbOutput), - reinterpret_cast(pcbWritten)); - - *pccStatus = status; - return status == kCCSuccess; -} - -extern "C" int32_t AppleCryptoNative_CryptorFinal( - CCCryptorRef cryptor, uint8_t* pbOutput, int32_t cbOutput, int32_t* pcbWritten, int32_t* pccStatus) -{ - if (pccStatus == nullptr) - return -1; - - *pccStatus = 0; - - if (pbOutput == nullptr || cbOutput < 0 || pcbWritten == nullptr) - return -1; - - CCStatus status = - CCCryptorFinal(cryptor, pbOutput, static_cast(cbOutput), reinterpret_cast(pcbWritten)); - - *pccStatus = status; - return status == kCCSuccess; -} - -extern "C" int32_t AppleCryptoNative_CryptorReset(CCCryptorRef cryptor, const uint8_t* pbIv, int32_t* pccStatus) -{ - if (pccStatus == nullptr) - return -1; - - *pccStatus = 0; - - if (cryptor == nullptr) - return -1; - - // 10.13 Beta reports an error when resetting ECB, which is the only mode which has a null IV. - if (pbIv == nullptr) - return 1; - - CCStatus status = CCCryptorReset(cryptor, pbIv); - *pccStatus = status; - return status == kCCSuccess; -} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_symmetric.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_symmetric.h index feed47a5ce..458f96a869 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_symmetric.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_symmetric.h @@ -5,6 +5,7 @@ #pragma once #include "pal_types.h" +#include "pal_compiler.h" #include #include @@ -53,7 +54,7 @@ typedef uint32_t PAL_SymmetricOptions; /* Free a CCCryptor created by AppleCryptoNative_CryptorCreate. */ -extern "C" void AppleCryptoNative_CryptorFree(CCCryptorRef cryptor); +DLLEXPORT void AppleCryptoNative_CryptorFree(CCCryptorRef cryptor); /* Create a CCCryptor for the described symmetric algorithm with a chosen operation, chainingMode, @@ -65,36 +66,36 @@ algorithm and assumed valid. pbIv is only allowed to be NULL for PAL_ChainingMod Returns 1 on success, 0 on system error, -1 on input error. */ -extern "C" int32_t AppleCryptoNative_CryptorCreate(PAL_SymmetricOperation operation, - PAL_SymmetricAlgorithm algorithm, - PAL_ChainingMode chainingMode, - PAL_PaddingMode paddingMode, - const uint8_t* pbKey, - int32_t cbKey, - const uint8_t* pbIv, - PAL_SymmetricOptions options, - CCCryptorRef* ppCryptorOut, - int32_t* pkCCStatus); +DLLEXPORT int32_t AppleCryptoNative_CryptorCreate(PAL_SymmetricOperation operation, + PAL_SymmetricAlgorithm algorithm, + PAL_ChainingMode chainingMode, + PAL_PaddingMode paddingMode, + const uint8_t* pbKey, + int32_t cbKey, + const uint8_t* pbIv, + PAL_SymmetricOptions options, + CCCryptorRef* ppCryptorOut, + int32_t* pkCCStatus); /* Shims CCCryptorUpdate, updating *pkCCStatus as its output. Returns 1 on success, 0 on system error, -1 on input error. */ -extern "C" int32_t AppleCryptoNative_CryptorUpdate(CCCryptorRef cryptor, - const uint8_t* pbData, - int32_t cbData, - uint32_t* pbOutput, - int32_t cbOutput, - int32_t* pcbWritten, - int32_t* pkCCStatus); +DLLEXPORT int32_t AppleCryptoNative_CryptorUpdate(CCCryptorRef cryptor, + const uint8_t* pbData, + int32_t cbData, + uint32_t* pbOutput, + int32_t cbOutput, + int32_t* pcbWritten, + int32_t* pkCCStatus); /* Shims CCCryptorFinal, updating *pkCCStatus as its output. Returns 1 on success, 0 on system error, -1 on input error. */ -extern "C" int32_t AppleCryptoNative_CryptorFinal( +DLLEXPORT int32_t AppleCryptoNative_CryptorFinal( CCCryptorRef cryptor, uint8_t* pbOutput, int32_t cbOutput, int32_t* pcbWritten, int32_t* pkCCStatus); /* @@ -102,4 +103,4 @@ Shims CCCryptorReset, updating *pkCCStatus as its output. Returns 1 on success, 0 on system error, -1 on input error. */ -extern "C" int32_t AppleCryptoNative_CryptorReset(CCCryptorRef cryptor, const uint8_t* pbIv, int32_t* pkCCStatus); +DLLEXPORT int32_t AppleCryptoNative_CryptorReset(CCCryptorRef cryptor, const uint8_t* pbIv, int32_t* pkCCStatus); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_trust.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_trust.c similarity index 71% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_trust.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_trust.c index e100eac406..80f1770574 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_trust.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_trust.c @@ -9,11 +9,11 @@ static bool CheckTrustMatch(SecCertificateRef cert, SecTrustSettingsResult result, OSStatus* pOSStatus) { - CFArrayRef settings = nullptr; + CFArrayRef settings = NULL; *pOSStatus = SecTrustSettingsCopyTrustSettings(cert, domain, &settings); bool isMatch = false; - if (*pOSStatus == noErr && settings != nullptr) + if (*pOSStatus == noErr && settings != NULL) { CFIndex count = CFArrayGetCount(settings); @@ -26,8 +26,8 @@ static bool CheckTrustMatch(SecCertificateRef cert, } else { - auto dictionaryTypeId = CFDictionaryGetTypeID(); - auto numberTypeId = CFNumberGetTypeID(); + CFTypeID dictionaryTypeId = CFDictionaryGetTypeID(); + CFTypeID numberTypeId = CFNumberGetTypeID(); for (CFIndex i = 0; i < count; i++) { @@ -38,7 +38,7 @@ static bool CheckTrustMatch(SecCertificateRef cert, continue; } - CFDictionaryRef dict = reinterpret_cast(obj); + CFDictionaryRef dict = (CFDictionaryRef)obj; if (CFDictionaryGetCount(dict) > 1) { @@ -54,10 +54,11 @@ static bool CheckTrustMatch(SecCertificateRef cert, CFTypeRef val = CFDictionaryGetValue(dict, kSecTrustSettingsResult); - if (val != nullptr && CFGetTypeID(val) == numberTypeId) + if (val != NULL && CFGetTypeID(val) == numberTypeId) { - CFNumberRef cfNum = reinterpret_cast(val); - SecTrustSettingsResult trustValue = {}; + CFNumberRef cfNum = (CFNumberRef)val; + SecTrustSettingsResult trustValue; + memset(&trustValue, 0, sizeof(SecTrustSettingsResult)); if (CFNumberGetValue(cfNum, kCFNumberSInt32Type, &trustValue)) { @@ -69,48 +70,50 @@ static bool CheckTrustMatch(SecCertificateRef cert, } } - if (settings != nullptr) + if (settings != NULL) CFRelease(settings); return isMatch; } +typedef const struct OpaqueSecCertificateRef * ConstSecCertificateRef; + static int32_t EnumerateTrust(SecTrustSettingsDomain domain, SecTrustSettingsResult result, CFMutableArrayRef* pCertsRef, int32_t* pOSStatus) { - if (pOSStatus != nullptr) + if (pOSStatus != NULL) *pOSStatus = noErr; - if (pCertsRef == nullptr || pOSStatus == nullptr) + if (pCertsRef == NULL || pOSStatus == NULL) return -1; CFMutableArrayRef outArray; - if (*pCertsRef != nullptr) + if (*pCertsRef != NULL) { outArray = *pCertsRef; } else { - outArray = CFArrayCreateMutable(nullptr, 0, &kCFTypeArrayCallBacks); + outArray = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks); *pCertsRef = outArray; } - if (outArray == nullptr) + if (outArray == NULL) { *pOSStatus = errSecAllocate; return 0; } - CFArrayRef certsWithTrusts = nullptr; + CFArrayRef certsWithTrusts = NULL; *pOSStatus = SecTrustSettingsCopyCertificates(domain, &certsWithTrusts); if (*pOSStatus == noErr) { CFIndex count = CFArrayGetCount(certsWithTrusts); - auto certTypeId = SecCertificateGetTypeID(); + CFTypeID certTypeId = SecCertificateGetTypeID(); for (CFIndex i = 0; i < count; i++) { @@ -121,7 +124,7 @@ static int32_t EnumerateTrust(SecTrustSettingsDomain domain, continue; } - SecCertificateRef cert = reinterpret_cast(const_cast(obj)); + SecCertificateRef cert = (ConstSecCertificateRef)obj; bool isMatch = CheckTrustMatch(cert, domain, result, pOSStatus); if (*pOSStatus != noErr) @@ -142,7 +145,7 @@ static int32_t EnumerateTrust(SecTrustSettingsDomain domain, *pOSStatus = noErr; } - if (certsWithTrusts != nullptr) + if (certsWithTrusts != NULL) { CFRelease(certsWithTrusts); } @@ -154,29 +157,29 @@ static int32_t EnumerateTrust(SecTrustSettingsDomain domain, if (ret == 0 || CFArrayGetCount(outArray) == 0) { CFRelease(outArray); - *pCertsRef = nullptr; + *pCertsRef = NULL; } return ret; } -extern "C" int32_t AppleCryptoNative_StoreEnumerateUserRoot(CFArrayRef* pCertsOut, int32_t* pOSStatusOut) +int32_t AppleCryptoNative_StoreEnumerateUserRoot(CFArrayRef* pCertsOut, int32_t* pOSStatusOut) { - if (pCertsOut != nullptr) - *pCertsOut = nullptr; + if (pCertsOut != NULL) + *pCertsOut = NULL; return EnumerateTrust(kSecTrustSettingsDomainUser, kSecTrustSettingsResultTrustRoot, - const_cast(pCertsOut), + pCertsOut, pOSStatusOut); } -extern "C" int32_t AppleCryptoNative_StoreEnumerateMachineRoot(CFArrayRef* pCertsOut, int32_t* pOSStatusOut) +int32_t AppleCryptoNative_StoreEnumerateMachineRoot(CFArrayRef* pCertsOut, int32_t* pOSStatusOut) { - if (pCertsOut != nullptr) - *pCertsOut = nullptr; + if (pCertsOut != NULL) + *pCertsOut = NULL; - CFMutableArrayRef* pCertsRef = const_cast(pCertsOut); + CFMutableArrayRef* pCertsRef = pCertsOut; int32_t ret = EnumerateTrust(kSecTrustSettingsDomainAdmin, kSecTrustSettingsResultTrustRoot, pCertsRef, pOSStatusOut); @@ -189,23 +192,23 @@ extern "C" int32_t AppleCryptoNative_StoreEnumerateMachineRoot(CFArrayRef* pCert return ret; } -extern "C" int32_t AppleCryptoNative_StoreEnumerateUserDisallowed(CFArrayRef* pCertsOut, int32_t* pOSStatusOut) +int32_t AppleCryptoNative_StoreEnumerateUserDisallowed(CFArrayRef* pCertsOut, int32_t* pOSStatusOut) { - if (pCertsOut != nullptr) - *pCertsOut = nullptr; + if (pCertsOut != NULL) + *pCertsOut = NULL; return EnumerateTrust(kSecTrustSettingsDomainUser, kSecTrustSettingsResultDeny, - const_cast(pCertsOut), + pCertsOut, pOSStatusOut); } -extern "C" int32_t AppleCryptoNative_StoreEnumerateMachineDisallowed(CFArrayRef* pCertsOut, int32_t* pOSStatusOut) +int32_t AppleCryptoNative_StoreEnumerateMachineDisallowed(CFArrayRef* pCertsOut, int32_t* pOSStatusOut) { - if (pCertsOut != nullptr) - *pCertsOut = nullptr; + if (pCertsOut != NULL) + *pCertsOut = NULL; - CFMutableArrayRef* pCertsRef = const_cast(pCertsOut); + CFMutableArrayRef* pCertsRef = pCertsOut; int32_t ret = EnumerateTrust(kSecTrustSettingsDomainAdmin, kSecTrustSettingsResultDeny, pCertsRef, pOSStatusOut); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_trust.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_trust.h index 3ffb8f586c..80ae252199 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_trust.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_trust.h @@ -5,6 +5,7 @@ #pragma once #include "pal_types.h" +#include "pal_compiler.h" #include @@ -18,7 +19,7 @@ pCertsOut: When the return value is not 1, NULL. Otherwise NULL on "no certs fou (including a single match). pOSStatus: Receives the last OSStatus value. */ -extern "C" int32_t AppleCryptoNative_StoreEnumerateUserRoot(CFArrayRef* pCertsOut, int32_t* pOSStatusOut); +DLLEXPORT int32_t AppleCryptoNative_StoreEnumerateUserRoot(CFArrayRef* pCertsOut, int32_t* pOSStatusOut); /* Enumerate the certificates which are root trusted by the machine ("admin" and "system" domains). @@ -33,7 +34,11 @@ pCertsOut: When the return value is not 1, NULL. Otherwise NULL on "no certs fou (including a single match). pOSStatus: Receives the last OSStatus value. */ -extern "C" int32_t AppleCryptoNative_StoreEnumerateMachineRoot(CFArrayRef* pCertsOut, int32_t* pOSStatusOut); +DLLEXPORT int32_t AppleCryptoNative_StoreEnumerateMachineRoot(CFArrayRef* pCertsOut, int32_t* pOSStatusOut); + +DLLEXPORT int32_t AppleCryptoNative_StoreEnumerateUserDisallowed(CFArrayRef* pCertsOut, int32_t* pOSStatusOut); + +DLLEXPORT int32_t AppleCryptoNative_StoreEnumerateMachineDisallowed(CFArrayRef* pCertsOut, int32_t* pOSStatusOut); /* Enumerate the certificates which are disallowed by the user. @@ -45,7 +50,7 @@ pCertsOut: When the return value is not 1, NULL. Otherwise NULL on "no certs fou (including a single match). pOSStatus: Receives the last OSStatus value. */ -extern "C" int32_t AppleCryptoNative_StoreEnumerateUserRoot(CFArrayRef* pCertsOut, int32_t* pOSStatusOut); +DLLEXPORT int32_t AppleCryptoNative_StoreEnumerateUserRoot(CFArrayRef* pCertsOut, int32_t* pOSStatusOut); /* Enumerate the certificates which are disallowed by the machine ("admin" and "system" domains). @@ -60,4 +65,4 @@ pCertsOut: When the return value is not 1, NULL. Otherwise NULL on "no certs fou (including a single match). pOSStatus: Receives the last OSStatus value. */ -extern "C" int32_t AppleCryptoNative_StoreEnumerateMachineRoot(CFArrayRef* pCertsOut, int32_t* pOSStatusOut); +DLLEXPORT int32_t AppleCryptoNative_StoreEnumerateMachineRoot(CFArrayRef* pCertsOut, int32_t* pOSStatusOut); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509.c similarity index 57% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509.c index d120cbc857..f5d51eae58 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509.c @@ -7,27 +7,30 @@ static const int32_t kErrOutItemsNull = -3; static const int32_t kErrOutItemsEmpty = -2; -extern "C" int32_t +typedef const struct OpaqueSecCertificateRef * ConstSecCertificateRef; +typedef const struct OpaqueSecIdentityRef * ConstSecIdentityRef; + +int32_t AppleCryptoNative_X509DemuxAndRetainHandle(CFTypeRef handle, SecCertificateRef* pCertOut, SecIdentityRef* pIdentityOut) { - if (pCertOut != nullptr) - *pCertOut = nullptr; - if (pIdentityOut != nullptr) - *pIdentityOut = nullptr; + if (pCertOut != NULL) + *pCertOut = NULL; + if (pIdentityOut != NULL) + *pIdentityOut = NULL; - if (handle == nullptr || pCertOut == nullptr || pIdentityOut == nullptr) + if (handle == NULL || pCertOut == NULL || pIdentityOut == NULL) return kErrorBadInput; - auto objectType = CFGetTypeID(handle); - void* nonConstHandle = const_cast(handle); + CFTypeID objectType = CFGetTypeID(handle); + void* nonConstHandle = handle; if (objectType == SecIdentityGetTypeID()) { - *pIdentityOut = reinterpret_cast(nonConstHandle); + *pIdentityOut = (ConstSecIdentityRef)nonConstHandle; } else if (objectType == SecCertificateGetTypeID()) { - *pCertOut = reinterpret_cast(nonConstHandle); + *pCertOut = (ConstSecCertificateRef)nonConstHandle; } else { @@ -38,29 +41,29 @@ AppleCryptoNative_X509DemuxAndRetainHandle(CFTypeRef handle, SecCertificateRef* return 1; } -extern "C" int32_t +int32_t AppleCryptoNative_X509GetPublicKey(SecCertificateRef cert, SecKeyRef* pPublicKeyOut, int32_t* pOSStatusOut) { - if (pPublicKeyOut != nullptr) - *pPublicKeyOut = nullptr; - if (pOSStatusOut != nullptr) + if (pPublicKeyOut != NULL) + *pPublicKeyOut = NULL; + if (pOSStatusOut != NULL) *pOSStatusOut = noErr; - if (cert == nullptr || pPublicKeyOut == nullptr || pOSStatusOut == nullptr) + if (cert == NULL || pPublicKeyOut == NULL || pOSStatusOut == NULL) return kErrorBadInput; *pOSStatusOut = SecCertificateCopyPublicKey(cert, pPublicKeyOut); return (*pOSStatusOut == noErr); } -extern "C" PAL_X509ContentType AppleCryptoNative_X509GetContentType(uint8_t* pbData, int32_t cbData) +PAL_X509ContentType AppleCryptoNative_X509GetContentType(uint8_t* pbData, int32_t cbData) { - if (pbData == nullptr || cbData < 0) + if (pbData == NULL || cbData < 0) return PAL_X509Unknown; - CFDataRef cfData = CFDataCreateWithBytesNoCopy(nullptr, pbData, cbData, kCFAllocatorNull); + CFDataRef cfData = CFDataCreateWithBytesNoCopy(NULL, pbData, cbData, kCFAllocatorNull); - if (cfData == nullptr) + if (cfData == NULL) return PAL_X509Unknown; // The sniffing order is: @@ -74,9 +77,9 @@ extern "C" PAL_X509ContentType AppleCryptoNative_X509GetContentType(uint8_t* pbD // // Likewise, if the X509 DER check isn't done first, Apple will report it as // being a PKCS#7. - SecCertificateRef certref = SecCertificateCreateWithData(nullptr, cfData); + SecCertificateRef certref = SecCertificateCreateWithData(NULL, cfData); - if (certref != nullptr) + if (certref != NULL) { CFRelease(certref); return PAL_Certificate; @@ -87,7 +90,7 @@ extern "C" PAL_X509ContentType AppleCryptoNative_X509GetContentType(uint8_t* pbD SecExternalItemType itemType = kSecItemTypeAggregate; SecExternalItemType actualType = itemType; - OSStatus osStatus = SecItemImport(cfData, nullptr, &actualFormat, &actualType, 0, nullptr, nullptr, nullptr); + OSStatus osStatus = SecItemImport(cfData, NULL, &actualFormat, &actualType, 0, NULL, NULL, NULL); if (osStatus == noErr) { @@ -102,7 +105,7 @@ extern "C" PAL_X509ContentType AppleCryptoNative_X509GetContentType(uint8_t* pbD itemType = kSecItemTypeAggregate; actualType = itemType; - osStatus = SecItemImport(cfData, nullptr, &actualFormat, &actualType, 0, nullptr, nullptr, nullptr); + osStatus = SecItemImport(cfData, NULL, &actualFormat, &actualType, 0, NULL, NULL, NULL); if (osStatus == errSecPassphraseRequired) { @@ -111,14 +114,16 @@ extern "C" PAL_X509ContentType AppleCryptoNative_X509GetContentType(uint8_t* pbD itemType = kSecItemTypeAggregate; actualType = itemType; - SecItemImportExportKeyParameters importParams = {}; + SecItemImportExportKeyParameters importParams; + memset(&importParams, 0, sizeof(SecItemImportExportKeyParameters)); + importParams.version = SEC_KEY_IMPORT_EXPORT_PARAMS_VERSION; importParams.passphrase = CFSTR(""); - osStatus = SecItemImport(cfData, nullptr, &actualFormat, &actualType, 0, &importParams, nullptr, nullptr); + osStatus = SecItemImport(cfData, NULL, &actualFormat, &actualType, 0, &importParams, NULL, NULL); CFRelease(importParams.passphrase); - importParams.passphrase = nullptr; + importParams.passphrase = NULL; } if (osStatus == noErr || osStatus == errSecPkcs12VerifyFailure) @@ -134,7 +139,7 @@ extern "C" PAL_X509ContentType AppleCryptoNative_X509GetContentType(uint8_t* pbD itemType = kSecItemTypeCertificate; actualType = itemType; - osStatus = SecItemImport(cfData, nullptr, &actualFormat, &actualType, 0, nullptr, nullptr, nullptr); + osStatus = SecItemImport(cfData, NULL, &actualFormat, &actualType, 0, NULL, NULL, NULL); if (osStatus == noErr) { @@ -149,10 +154,10 @@ extern "C" PAL_X509ContentType AppleCryptoNative_X509GetContentType(uint8_t* pbD static int32_t ProcessCertificateTypeReturn(CFArrayRef items, SecCertificateRef* pCertOut, SecIdentityRef* pIdentityOut) { - assert(pCertOut != nullptr && *pCertOut == nullptr); - assert(pIdentityOut != nullptr && *pIdentityOut == nullptr); + assert(pCertOut != NULL && *pCertOut == NULL); + assert(pIdentityOut != NULL && *pIdentityOut == NULL); - if (items == nullptr) + if (items == NULL) { return kErrOutItemsNull; } @@ -164,25 +169,25 @@ static int32_t ProcessCertificateTypeReturn(CFArrayRef items, SecCertificateRef* return kErrOutItemsEmpty; } - CFTypeRef bestItem = nullptr; + CFTypeRef bestItem = NULL; for (CFIndex i = 0; i < itemCount; i++) { CFTypeRef current = CFArrayGetValueAtIndex(items, i); - auto currentItemType = CFGetTypeID(current); + CFTypeID currentItemType = CFGetTypeID(current); if (currentItemType == SecIdentityGetTypeID()) { bestItem = current; break; } - else if (bestItem == nullptr && currentItemType == SecCertificateGetTypeID()) + else if (bestItem == NULL && currentItemType == SecCertificateGetTypeID()) { bestItem = current; } } - if (bestItem == nullptr) + if (bestItem == NULL) { return -13; } @@ -190,14 +195,14 @@ static int32_t ProcessCertificateTypeReturn(CFArrayRef items, SecCertificateRef* if (CFGetTypeID(bestItem) == SecCertificateGetTypeID()) { CFRetain(bestItem); - *pCertOut = reinterpret_cast(const_cast(bestItem)); + *pCertOut = (ConstSecCertificateRef)bestItem; return 1; } if (CFGetTypeID(bestItem) == SecIdentityGetTypeID()) { CFRetain(bestItem); - *pIdentityOut = reinterpret_cast(const_cast(bestItem)); + *pIdentityOut = (ConstSecIdentityRef)bestItem; return 1; } @@ -205,19 +210,19 @@ static int32_t ProcessCertificateTypeReturn(CFArrayRef items, SecCertificateRef* return -19; } -extern "C" int32_t AppleCryptoNative_X509CopyCertFromIdentity(SecIdentityRef identity, SecCertificateRef* pCertOut) +int32_t AppleCryptoNative_X509CopyCertFromIdentity(SecIdentityRef identity, SecCertificateRef* pCertOut) { - if (pCertOut != nullptr) - *pCertOut = nullptr; + if (pCertOut != NULL) + *pCertOut = NULL; // This function handles null inputs for both identity and cert. return SecIdentityCopyCertificate(identity, pCertOut); } -extern "C" int32_t AppleCryptoNative_X509CopyPrivateKeyFromIdentity(SecIdentityRef identity, SecKeyRef* pPrivateKeyOut) +int32_t AppleCryptoNative_X509CopyPrivateKeyFromIdentity(SecIdentityRef identity, SecKeyRef* pPrivateKeyOut) { - if (pPrivateKeyOut != nullptr) - *pPrivateKeyOut = nullptr; + if (pPrivateKeyOut != NULL) + *pPrivateKeyOut = NULL; // This function handles null inputs for both identity and key return SecIdentityCopyPrivateKey(identity, pPrivateKeyOut); @@ -234,19 +239,21 @@ static int32_t ReadX509(uint8_t* pbData, CFArrayRef* pCollectionOut, int32_t* pOSStatus) { - assert(pbData != nullptr); + assert(pbData != NULL); assert(cbData >= 0); - assert((pCertOut == nullptr) == (pIdentityOut == nullptr)); - assert((pCertOut == nullptr) != (pCollectionOut == nullptr)); + assert((pCertOut == NULL) == (pIdentityOut == NULL)); + assert((pCertOut == NULL) != (pCollectionOut == NULL)); SecExternalFormat dataFormat; SecExternalItemType itemType; int32_t ret = 0; - CFArrayRef outItems = nullptr; - CFMutableArrayRef keyAttributes = nullptr; - SecKeychainRef importKeychain = nullptr; + CFArrayRef outItems = NULL; + CFMutableArrayRef keyAttributes = NULL; + SecKeychainRef importKeychain = NULL; + + SecItemImportExportKeyParameters importParams; + memset(&importParams, 0, sizeof(SecItemImportExportKeyParameters)); - SecItemImportExportKeyParameters importParams = {}; importParams.version = SEC_KEY_IMPORT_EXPORT_PARAMS_VERSION; if (contentType == PAL_Certificate) @@ -267,27 +274,27 @@ static int32_t ReadX509(uint8_t* pbData, importParams.passphrase = cfPfxPassphrase; importKeychain = keychain; - if (keychain == nullptr) + if (keychain == NULL) { return kErrorBadInput; } - // if keyAttributes is nullptr then it uses SENSITIVE | EXTRACTABLE + // if keyAttributes is NULL then it uses SENSITIVE | EXTRACTABLE // so if !exportable was requested, assert SENSITIVE. if (!exportable) { - keyAttributes = CFArrayCreateMutable(nullptr, 9, &kCFTypeArrayCallBacks); + keyAttributes = CFArrayCreateMutable(NULL, 9, &kCFTypeArrayCallBacks); - if (keyAttributes == nullptr) + if (keyAttributes == NULL) { *pOSStatus = errSecAllocate; return 0; } int32_t sensitiveValue = CSSM_KEYATTR_SENSITIVE; - CFNumberRef sensitive = CFNumberCreate(nullptr, kCFNumberSInt32Type, &sensitiveValue); + CFNumberRef sensitive = CFNumberCreate(NULL, kCFNumberSInt32Type, &sensitiveValue); - if (sensitive == nullptr) + if (sensitive == NULL) { CFRelease(keyAttributes); *pOSStatus = errSecAllocate; @@ -306,38 +313,38 @@ static int32_t ReadX509(uint8_t* pbData, return 0; } - CFDataRef cfData = CFDataCreateWithBytesNoCopy(nullptr, pbData, cbData, kCFAllocatorNull); + CFDataRef cfData = CFDataCreateWithBytesNoCopy(NULL, pbData, cbData, kCFAllocatorNull); - if (cfData == nullptr) + if (cfData == NULL) { *pOSStatus = errSecAllocate; } if (*pOSStatus == noErr) { - *pOSStatus = SecItemImport(cfData, nullptr, &dataFormat, &itemType, 0, &importParams, keychain, &outItems); + *pOSStatus = SecItemImport(cfData, NULL, &dataFormat, &itemType, 0, &importParams, keychain, &outItems); } - if (contentType == PAL_Pkcs12 && *pOSStatus == errSecPassphraseRequired && cfPfxPassphrase == nullptr) + if (contentType == PAL_Pkcs12 && *pOSStatus == errSecPassphraseRequired && cfPfxPassphrase == NULL) { - if (outItems != nullptr) + if (outItems != NULL) { CFRelease(outItems); - outItems = nullptr; + outItems = NULL; } // Try again with the empty string passphrase. importParams.passphrase = CFSTR(""); - *pOSStatus = SecItemImport(cfData, nullptr, &dataFormat, &itemType, 0, &importParams, keychain, &outItems); + *pOSStatus = SecItemImport(cfData, NULL, &dataFormat, &itemType, 0, &importParams, keychain, &outItems); CFRelease(importParams.passphrase); - importParams.passphrase = nullptr; + importParams.passphrase = NULL; } if (*pOSStatus == noErr) { - if (pCollectionOut != nullptr) + if (pCollectionOut != NULL) { CFRetain(outItems); *pCollectionOut = outItems; @@ -349,12 +356,12 @@ static int32_t ReadX509(uint8_t* pbData, } } - if (keyAttributes != nullptr) + if (keyAttributes != NULL) { CFRelease(keyAttributes); } - if (outItems != nullptr) + if (outItems != NULL) { // In the event this is returned via pCollectionOut it was already // CFRetain()ed, so always CFRelease here. @@ -365,21 +372,21 @@ static int32_t ReadX509(uint8_t* pbData, return ret; } -extern "C" int32_t AppleCryptoNative_X509ImportCollection(uint8_t* pbData, - int32_t cbData, - PAL_X509ContentType contentType, - CFStringRef cfPfxPassphrase, - SecKeychainRef keychain, - int32_t exportable, - CFArrayRef* pCollectionOut, - int32_t* pOSStatus) +int32_t AppleCryptoNative_X509ImportCollection(uint8_t* pbData, + int32_t cbData, + PAL_X509ContentType contentType, + CFStringRef cfPfxPassphrase, + SecKeychainRef keychain, + int32_t exportable, + CFArrayRef* pCollectionOut, + int32_t* pOSStatus) { - if (pCollectionOut != nullptr) - *pCollectionOut = nullptr; - if (pOSStatus != nullptr) + if (pCollectionOut != NULL) + *pCollectionOut = NULL; + if (pOSStatus != NULL) *pOSStatus = noErr; - if (pbData == nullptr || cbData < 0 || pCollectionOut == nullptr || pOSStatus == nullptr || + if (pbData == NULL || cbData < 0 || pCollectionOut == NULL || pOSStatus == NULL || exportable != !!exportable) { return kErrorBadInput; @@ -390,31 +397,31 @@ extern "C" int32_t AppleCryptoNative_X509ImportCollection(uint8_t* pbData, contentType, cfPfxPassphrase, keychain, - static_cast(exportable), - nullptr, - nullptr, + (bool)exportable, + NULL, + NULL, pCollectionOut, pOSStatus); } -extern "C" int32_t AppleCryptoNative_X509ImportCertificate(uint8_t* pbData, - int32_t cbData, - PAL_X509ContentType contentType, - CFStringRef cfPfxPassphrase, - SecKeychainRef keychain, - int32_t exportable, - SecCertificateRef* pCertOut, - SecIdentityRef* pIdentityOut, - int32_t* pOSStatus) +int32_t AppleCryptoNative_X509ImportCertificate(uint8_t* pbData, + int32_t cbData, + PAL_X509ContentType contentType, + CFStringRef cfPfxPassphrase, + SecKeychainRef keychain, + int32_t exportable, + SecCertificateRef* pCertOut, + SecIdentityRef* pIdentityOut, + int32_t* pOSStatus) { - if (pCertOut != nullptr) - *pCertOut = nullptr; - if (pIdentityOut != nullptr) - *pIdentityOut = nullptr; - if (pOSStatus != nullptr) + if (pCertOut != NULL) + *pCertOut = NULL; + if (pIdentityOut != NULL) + *pIdentityOut = NULL; + if (pOSStatus != NULL) *pOSStatus = noErr; - if (pbData == nullptr || cbData < 0 || pCertOut == nullptr || pIdentityOut == nullptr || pOSStatus == nullptr || + if (pbData == NULL || cbData < 0 || pCertOut == NULL || pIdentityOut == NULL || pOSStatus == NULL || exportable != !!exportable) { return kErrorBadInput; @@ -425,25 +432,25 @@ extern "C" int32_t AppleCryptoNative_X509ImportCertificate(uint8_t* pbData, contentType, cfPfxPassphrase, keychain, - static_cast(exportable), + (bool)exportable, pCertOut, pIdentityOut, - nullptr, + NULL, pOSStatus); } -extern "C" int32_t AppleCryptoNative_X509ExportData(CFArrayRef data, - PAL_X509ContentType type, - CFStringRef cfExportPassphrase, - CFDataRef* pExportOut, - int32_t* pOSStatus) +int32_t AppleCryptoNative_X509ExportData(CFArrayRef data, + PAL_X509ContentType type, + CFStringRef cfExportPassphrase, + CFDataRef* pExportOut, + int32_t* pOSStatus) { - if (pExportOut != nullptr) - *pExportOut = nullptr; - if (pOSStatus != nullptr) + if (pExportOut != NULL) + *pExportOut = NULL; + if (pOSStatus != NULL) *pOSStatus = noErr; - if (data == nullptr || pExportOut == nullptr || pOSStatus == nullptr) + if (data == NULL || pExportOut == NULL || pOSStatus == NULL) { return kErrorBadInput; } @@ -462,7 +469,9 @@ extern "C" int32_t AppleCryptoNative_X509ExportData(CFArrayRef data, return kErrorBadInput; } - SecItemImportExportKeyParameters keyParams = {}; + SecItemImportExportKeyParameters keyParams; + memset(&keyParams, 0, sizeof(SecItemImportExportKeyParameters)); + keyParams.version = SEC_KEY_IMPORT_EXPORT_PARAMS_VERSION; keyParams.passphrase = cfExportPassphrase; @@ -471,18 +480,20 @@ extern "C" int32_t AppleCryptoNative_X509ExportData(CFArrayRef data, return *pOSStatus == noErr; } -extern "C" int32_t AppleCryptoNative_X509GetRawData(SecCertificateRef cert, CFDataRef* ppDataOut, int32_t* pOSStatus) +int32_t AppleCryptoNative_X509GetRawData(SecCertificateRef cert, CFDataRef* ppDataOut, int32_t* pOSStatus) { - if (ppDataOut != nullptr) - *ppDataOut = nullptr; - if (pOSStatus != nullptr) + if (ppDataOut != NULL) + *ppDataOut = NULL; + if (pOSStatus != NULL) *pOSStatus = noErr; - if (cert == nullptr || ppDataOut == nullptr || pOSStatus == nullptr) + if (cert == NULL || ppDataOut == NULL || pOSStatus == NULL) return kErrorBadInput; SecExternalFormat dataFormat = kSecFormatX509Cert; - SecItemImportExportKeyParameters keyParams = {}; + SecItemImportExportKeyParameters keyParams; + memset(&keyParams, 0, sizeof(SecItemImportExportKeyParameters)); + keyParams.version = SEC_KEY_IMPORT_EXPORT_PARAMS_VERSION; *pOSStatus = SecItemExport(cert, dataFormat, 0, &keyParams, ppDataOut); @@ -497,9 +508,11 @@ static OSStatus AddKeyToKeychain(SecKeyRef privateKey, SecKeychainRef targetKeyc // c) Doesn't return/emit the imported key reference. // d) Works on private keys. SecExternalFormat dataFormat = kSecFormatWrappedPKCS8; - CFDataRef exportData = nullptr; + CFDataRef exportData = NULL; + + SecItemImportExportKeyParameters keyParams; + memset(&keyParams, 0, sizeof(SecItemImportExportKeyParameters)); - SecItemImportExportKeyParameters keyParams = {}; keyParams.version = SEC_KEY_IMPORT_EXPORT_PARAMS_VERSION; keyParams.passphrase = CFSTR("ExportImportPassphrase"); @@ -507,47 +520,47 @@ static OSStatus AddKeyToKeychain(SecKeyRef privateKey, SecKeychainRef targetKeyc SecExternalFormat actualFormat = dataFormat; SecExternalItemType actualType = kSecItemTypePrivateKey; - CFArrayRef outItems = nullptr; + CFArrayRef outItems = NULL; if (status == noErr) { status = - SecItemImport(exportData, nullptr, &actualFormat, &actualType, 0, &keyParams, targetKeychain, &outItems); + SecItemImport(exportData, NULL, &actualFormat, &actualType, 0, &keyParams, targetKeychain, &outItems); } - if (exportData != nullptr) + if (exportData != NULL) CFRelease(exportData); CFRelease(keyParams.passphrase); - keyParams.passphrase = nullptr; + keyParams.passphrase = NULL; - if (outItems != nullptr) + if (outItems != NULL) CFRelease(outItems); return status; } -extern "C" int32_t AppleCryptoNative_X509CopyWithPrivateKey(SecCertificateRef cert, - SecKeyRef privateKey, - SecKeychainRef targetKeychain, - SecIdentityRef* pIdentityOut, - int32_t* pOSStatus) +int32_t AppleCryptoNative_X509CopyWithPrivateKey(SecCertificateRef cert, + SecKeyRef privateKey, + SecKeychainRef targetKeychain, + SecIdentityRef* pIdentityOut, + int32_t* pOSStatus) { - if (pIdentityOut != nullptr) - *pIdentityOut = nullptr; - if (pOSStatus != nullptr) + if (pIdentityOut != NULL) + *pIdentityOut = NULL; + if (pOSStatus != NULL) *pOSStatus = noErr; - if (cert == nullptr || privateKey == nullptr || targetKeychain == nullptr || pIdentityOut == nullptr || - pOSStatus == nullptr) + if (cert == NULL || privateKey == NULL || targetKeychain == NULL || pIdentityOut == NULL || + pOSStatus == NULL) { return -1; } - SecKeychainRef keyKeychain = nullptr; + SecKeychainRef keyKeychain = NULL; - OSStatus status = SecKeychainItemCopyKeychain(reinterpret_cast(privateKey), &keyKeychain); - SecKeychainItemRef itemCopy = nullptr; + OSStatus status = SecKeychainItemCopyKeychain((SecKeychainItemRef)privateKey, &keyKeychain); + SecKeychainItemRef itemCopy = NULL; // This only happens with an ephemeral key, so the keychain we're adding it to is temporary. if (status == errSecNoSuchKeychain) @@ -555,51 +568,51 @@ extern "C" int32_t AppleCryptoNative_X509CopyWithPrivateKey(SecCertificateRef ce status = AddKeyToKeychain(privateKey, targetKeychain); } - if (itemCopy != nullptr) + if (itemCopy != NULL) { CFRelease(itemCopy); } - CFMutableDictionaryRef query = nullptr; + CFMutableDictionaryRef query = NULL; if (status == noErr) { query = CFDictionaryCreateMutable( kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); - if (query == nullptr) + if (query == NULL) { status = errSecAllocate; } } - CFArrayRef searchList = nullptr; + CFArrayRef searchList = NULL; if (status == noErr) { searchList = CFArrayCreate( - nullptr, const_cast(reinterpret_cast(&targetKeychain)), 1, &kCFTypeArrayCallBacks); + NULL, (void**)(&targetKeychain), 1, &kCFTypeArrayCallBacks); - if (searchList == nullptr) + if (searchList == NULL) { status = errSecAllocate; } } - CFArrayRef itemMatch = nullptr; + CFArrayRef itemMatch = NULL; if (status == noErr) { itemMatch = CFArrayCreate( - nullptr, const_cast(reinterpret_cast(&cert)), 1, &kCFTypeArrayCallBacks); + NULL, (void**)(&cert), 1, &kCFTypeArrayCallBacks); - if (itemMatch == nullptr) + if (itemMatch == NULL) { status = errSecAllocate; } } - CFTypeRef result = nullptr; + CFTypeRef result = NULL; if (status == noErr) { @@ -610,10 +623,10 @@ extern "C" int32_t AppleCryptoNative_X509CopyWithPrivateKey(SecCertificateRef ce status = SecItemCopyMatching(query, &result); - if (status != noErr && result != nullptr) + if (status != noErr && result != NULL) { CFRelease(result); - result = nullptr; + result = NULL; } bool added = false; @@ -625,12 +638,12 @@ extern "C" int32_t AppleCryptoNative_X509CopyWithPrivateKey(SecCertificateRef ce added = (status == noErr); } - if (result == nullptr && status == noErr) + if (result == NULL && status == noErr) { status = SecItemCopyMatching(query, &result); } - if (result != nullptr && status == noErr) + if (result != NULL && status == noErr) { if (CFGetTypeID(result) != SecIdentityGetTypeID()) @@ -639,7 +652,7 @@ extern "C" int32_t AppleCryptoNative_X509CopyWithPrivateKey(SecCertificateRef ce } else { - SecIdentityRef identity = reinterpret_cast(const_cast(result)); + SecIdentityRef identity = (ConstSecIdentityRef)result; CFRetain(identity); *pIdentityOut = identity; } @@ -658,19 +671,19 @@ extern "C" int32_t AppleCryptoNative_X509CopyWithPrivateKey(SecCertificateRef ce } } - if (result != nullptr) + if (result != NULL) CFRelease(result); - if (itemMatch != nullptr) + if (itemMatch != NULL) CFRelease(itemMatch); - if (searchList != nullptr) + if (searchList != NULL) CFRelease(searchList); - if (query != nullptr) + if (query != NULL) CFRelease(query); - if (keyKeychain != nullptr) + if (keyKeychain != NULL) CFRelease(keyKeychain); *pOSStatus = status; diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509.h index 597ab28256..544a940e50 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509.h @@ -6,6 +6,7 @@ #include "pal_digest.h" #include "pal_seckey.h" +#include "pal_compiler.h" #include @@ -31,7 +32,7 @@ Output: pCertOut: If handle is a certificate, receives handle, otherwise NULL pIdentityut: If handle is an identity, receives handle, otherwise NULL */ -extern "C" int32_t +DLLEXPORT int32_t AppleCryptoNative_X509DemuxAndRetainHandle(CFTypeRef handle, SecCertificateRef* pCertOut, SecIdentityRef* pIdentityOut); /* @@ -43,7 +44,7 @@ Output: pPublicKeyOut: Receives a CFRetain()ed SecKeyRef for the public key pOSStatusOut: Receives the result of SecCertificateCopyPublicKey */ -extern "C" int32_t +DLLEXPORT int32_t AppleCryptoNative_X509GetPublicKey(SecCertificateRef cert, SecKeyRef* pPublicKeyOut, int32_t* pOSStatusOut); /* @@ -51,7 +52,7 @@ Determines the data type of the provided input. Returns the data (format) type of the provided input, PAL_X509Unknown if it cannot be determined. */ -extern "C" PAL_X509ContentType AppleCryptoNative_X509GetContentType(uint8_t* pbData, int32_t cbData); +DLLEXPORT PAL_X509ContentType AppleCryptoNative_X509GetContentType(uint8_t* pbData, int32_t cbData); /* Extract a SecCertificateRef for the certificate from an identity handle. @@ -61,7 +62,7 @@ Returns the result of SecIdentityCopyCertificate. Output: pCertOut: Receives a SecCertificateRef for the certificate associated with the identity */ -extern "C" int32_t AppleCryptoNative_X509CopyCertFromIdentity(SecIdentityRef identity, SecCertificateRef* pCertOut); +DLLEXPORT int32_t AppleCryptoNative_X509CopyCertFromIdentity(SecIdentityRef identity, SecCertificateRef* pCertOut); /* Extract a SecKeyRef for the private key from an identity handle. @@ -71,7 +72,7 @@ Returns the result of SecIdentityCopyPrivateKey Output: pPrivateKeyOut: Receives a SecKeyRef for the private key associated with the identity */ -extern "C" int32_t AppleCryptoNative_X509CopyPrivateKeyFromIdentity(SecIdentityRef identity, SecKeyRef* pPrivateKeyOut); +DLLEXPORT int32_t AppleCryptoNative_X509CopyPrivateKeyFromIdentity(SecIdentityRef identity, SecKeyRef* pPrivateKeyOut); /* Read cbData bytes of data from pbData and interpret it to a collection of certificates (or identities). @@ -89,14 +90,14 @@ pCollectionOut: Receives an array which contains SecCertificateRef, SecIdentityR read out of the provided blob pOSStatus: Receives the output of SecItemImport for the last attempted read */ -extern "C" int32_t AppleCryptoNative_X509ImportCollection(uint8_t* pbData, - int32_t cbData, - PAL_X509ContentType contentType, - CFStringRef cfPfxPassphrase, - SecKeychainRef keychain, - int32_t exportable, - CFArrayRef* pCollectionOut, - int32_t* pOSStatus); +DLLEXPORT int32_t AppleCryptoNative_X509ImportCollection(uint8_t* pbData, + int32_t cbData, + PAL_X509ContentType contentType, + CFStringRef cfPfxPassphrase, + SecKeychainRef keychain, + int32_t exportable, + CFArrayRef* pCollectionOut, + int32_t* pOSStatus); /* Read cbData bytes of data from pbData and interpret it to a single certificate (or identity). @@ -119,15 +120,15 @@ pCertOut: If the best matched value was a certificate, receives the SecCertifica pIdentityOut: If the best matched value was an identity, receives the SecIdentityRef, otherwise receives NULL pOSStatus: Receives the return of the last call to SecItemImport */ -extern "C" int32_t AppleCryptoNative_X509ImportCertificate(uint8_t* pbData, - int32_t cbData, - PAL_X509ContentType contentType, - CFStringRef cfPfxPassphrase, - SecKeychainRef keychain, - int32_t exportable, - SecCertificateRef* pCertOut, - SecIdentityRef* pIdentityOut, - int32_t* pOSStatus); +DLLEXPORT int32_t AppleCryptoNative_X509ImportCertificate(uint8_t* pbData, + int32_t cbData, + PAL_X509ContentType contentType, + CFStringRef cfPfxPassphrase, + SecKeychainRef keychain, + int32_t exportable, + SecCertificateRef* pCertOut, + SecIdentityRef* pIdentityOut, + int32_t* pOSStatus); /* Export the certificates (or identities) in data to the requested format type. @@ -140,7 +141,7 @@ Output: pExportOut: Receives a CFDataRef with the exported blob pOSStatus: Receives the result of SecItemExport */ -extern "C" int32_t AppleCryptoNative_X509ExportData(CFArrayRef data, +DLLEXPORT int32_t AppleCryptoNative_X509ExportData(CFArrayRef data, PAL_X509ContentType type, CFStringRef cfExportPassphrase, CFDataRef* pExportOut, @@ -155,7 +156,7 @@ Output: ppDataOut: Receives a CFDataRef with the exported blob pOSStatus: Receives the result of SecItemExport */ -extern "C" int32_t AppleCryptoNative_X509GetRawData(SecCertificateRef cert, CFDataRef* ppDataOut, int32_t* pOSStatus); +DLLEXPORT int32_t AppleCryptoNative_X509GetRawData(SecCertificateRef cert, CFDataRef* ppDataOut, int32_t* pOSStatus); /* Find a SecIdentityRef for the given cert and private key in the target keychain. @@ -168,8 +169,8 @@ Output: pIdentityOut: Receives the SecIdentityRef of the mated cert/key pair. pOSStatus: Receives the result of the last executed system call. */ -extern "C" int32_t AppleCryptoNative_X509CopyWithPrivateKey(SecCertificateRef cert, - SecKeyRef privateKey, - SecKeychainRef targetKeychain, - SecIdentityRef* pIdentityOut, - int32_t* pOSStatus); +DLLEXPORT int32_t AppleCryptoNative_X509CopyWithPrivateKey(SecCertificateRef cert, + SecKeyRef privateKey, + SecKeychainRef targetKeychain, + SecIdentityRef* pIdentityOut, + int32_t* pOSStatus); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509chain.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509chain.c similarity index 74% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509chain.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509chain.c index 6db3d53e9f..276da31ff8 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509chain.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509chain.c @@ -8,44 +8,44 @@ #define kCFCoreFoundationVersionNumber10_12 1348.00 #endif -extern "C" SecPolicyRef AppleCryptoNative_X509ChainCreateDefaultPolicy() +SecPolicyRef AppleCryptoNative_X509ChainCreateDefaultPolicy() { // Disable on macOS 10.11 and lower due to segfaults within Security.framework. if (kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber10_12) - return nullptr; + return NULL; return SecPolicyCreateBasicX509(); } -extern "C" SecPolicyRef AppleCryptoNative_X509ChainCreateRevocationPolicy() +SecPolicyRef AppleCryptoNative_X509ChainCreateRevocationPolicy() { return SecPolicyCreateRevocation(kSecRevocationUseAnyAvailableMethod | kSecRevocationRequirePositiveResponse); } -extern "C" int32_t +int32_t AppleCryptoNative_X509ChainCreate(CFTypeRef certs, CFTypeRef policies, SecTrustRef* pTrustOut, int32_t* pOSStatus) { - if (pTrustOut != nullptr) - *pTrustOut = nullptr; - if (pOSStatus != nullptr) + if (pTrustOut != NULL) + *pTrustOut = NULL; + if (pOSStatus != NULL) *pOSStatus = noErr; - if (certs == nullptr || policies == nullptr || pTrustOut == nullptr || pOSStatus == nullptr) + if (certs == NULL || policies == NULL || pTrustOut == NULL || pOSStatus == NULL) return -1; *pOSStatus = SecTrustCreateWithCertificates(certs, policies, pTrustOut); return *pOSStatus == noErr; } -extern "C" int32_t AppleCryptoNative_X509ChainEvaluate(SecTrustRef chain, - CFDateRef cfEvaluationTime, - bool allowNetwork, - int32_t* pOSStatus) +int32_t AppleCryptoNative_X509ChainEvaluate(SecTrustRef chain, + CFDateRef cfEvaluationTime, + bool allowNetwork, + int32_t* pOSStatus) { - if (pOSStatus != nullptr) + if (pOSStatus != NULL) *pOSStatus = noErr; - if (chain == nullptr || pOSStatus == nullptr) + if (chain == NULL || pOSStatus == NULL) return -1; *pOSStatus = SecTrustSetVerifyDate(chain, cfEvaluationTime); @@ -85,39 +85,39 @@ extern "C" int32_t AppleCryptoNative_X509ChainEvaluate(SecTrustRef chain, return 1; } -extern "C" int64_t AppleCryptoNative_X509ChainGetChainSize(SecTrustRef chain) +int64_t AppleCryptoNative_X509ChainGetChainSize(SecTrustRef chain) { - if (chain == nullptr) + if (chain == NULL) return -1; return SecTrustGetCertificateCount(chain); } -extern "C" SecCertificateRef AppleCryptoNative_X509ChainGetCertificateAtIndex(SecTrustRef chain, int64_t index) +SecCertificateRef AppleCryptoNative_X509ChainGetCertificateAtIndex(SecTrustRef chain, int64_t index) { - if (chain == nullptr || index < 0) - return nullptr; + if (chain == NULL || index < 0) + return NULL; return SecTrustGetCertificateAtIndex(chain, index); } -extern "C" CFArrayRef AppleCryptoNative_X509ChainGetTrustResults(SecTrustRef chain) +CFArrayRef AppleCryptoNative_X509ChainGetTrustResults(SecTrustRef chain) { - if (chain == nullptr) + if (chain == NULL) { - return nullptr; + return NULL; } CFDictionaryRef detailsAndStuff = SecTrustCopyResult(chain); - CFArrayRef details = nullptr; + CFArrayRef details = NULL; - if (detailsAndStuff != nullptr) + if (detailsAndStuff != NULL) { CFTypeRef detailsPtr = CFDictionaryGetValue(detailsAndStuff, CFSTR("TrustResultDetails")); - if (detailsPtr != nullptr) + if (detailsPtr != NULL) { - details = reinterpret_cast(const_cast(detailsPtr)); + details = (CFArrayRef)detailsPtr; CFRetain(details); } } @@ -131,9 +131,9 @@ static void MergeStatusCodes(CFTypeRef key, CFTypeRef value, void* context) // Windows (and therefore .NET) certificate status codes are defined on an int32_t. // The top 32 bits will be used to convey error information, the bottom 32 bits // as a data aggregator for the status codes. - uint64_t* pStatus = reinterpret_cast(context); + uint64_t* pStatus = (uint64_t*)context; - if (key == nullptr) + if (key == NULL) { return; } @@ -151,10 +151,11 @@ static void MergeStatusCodes(CFTypeRef key, CFTypeRef value, void* context) } (void)value; - CFStringRef keyString = reinterpret_cast(key); + CFStringRef keyString = (CFStringRef)key; if (CFEqual(keyString, CFSTR("NotValidBefore")) || CFEqual(keyString, CFSTR("ValidLeaf")) || - CFEqual(keyString, CFSTR("ValidIntermediates")) || CFEqual(keyString, CFSTR("ValidRoot"))) + CFEqual(keyString, CFSTR("ValidIntermediates")) || CFEqual(keyString, CFSTR("ValidRoot")) || + CFEqual(keyString, CFSTR("TemporalValidity"))) *pStatus |= PAL_X509ChainNotTimeValid; else if (CFEqual(keyString, CFSTR("Revocation"))) *pStatus |= PAL_X509ChainRevoked; @@ -168,8 +169,10 @@ static void MergeStatusCodes(CFTypeRef key, CFTypeRef value, void* context) *pStatus |= PAL_X509ChainExplicitDistrust; else if (CFEqual(keyString, CFSTR("RevocationResponseRequired"))) *pStatus |= PAL_X509ChainRevocationStatusUnknown; + else if (CFEqual(keyString, CFSTR("MissingIntermediate"))) + *pStatus |= PAL_X509ChainPartialChain; else if (CFEqual(keyString, CFSTR("WeakLeaf")) || CFEqual(keyString, CFSTR("WeakIntermediates")) || - CFEqual(keyString, CFSTR("WeakRoot"))) + CFEqual(keyString, CFSTR("WeakRoot")) || CFEqual(keyString, CFSTR("WeakKeySize"))) { // Because we won't report this out of a chain built by .NET on Windows, // don't report it here. @@ -192,19 +195,19 @@ static void MergeStatusCodes(CFTypeRef key, CFTypeRef value, void* context) } } -extern "C" int32_t AppleCryptoNative_X509ChainGetStatusAtIndex(CFArrayRef details, int64_t index, int32_t* pdwStatus) +int32_t AppleCryptoNative_X509ChainGetStatusAtIndex(CFArrayRef details, int64_t index, int32_t* pdwStatus) { - if (pdwStatus != nullptr) + if (pdwStatus != NULL) *pdwStatus = -1; - if (details == nullptr || index < 0 || pdwStatus == nullptr) + if (details == NULL || index < 0 || pdwStatus == NULL) { return -1; } CFTypeRef element = CFArrayGetValueAtIndex(details, index); - if (element == nullptr) + if (element == NULL) { return -2; } @@ -215,14 +218,14 @@ extern "C" int32_t AppleCryptoNative_X509ChainGetStatusAtIndex(CFArrayRef detail } uint64_t status = 0; - CFDictionaryRef statusCodes = reinterpret_cast(const_cast(element)); + CFDictionaryRef statusCodes = (CFDictionaryRef)element; CFDictionaryApplyFunction(statusCodes, MergeStatusCodes, &status); - *pdwStatus = static_cast(status); - return static_cast(status >> 32); + *pdwStatus = (int32_t)status; + return (int32_t)(status >> 32); } -extern "C" int32_t AppleCryptoNative_GetOSStatusForChainStatus(PAL_X509ChainStatusFlags chainStatusFlag) +int32_t AppleCryptoNative_GetOSStatusForChainStatus(PAL_X509ChainStatusFlags chainStatusFlag) { switch (chainStatusFlag) { diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509chain.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509chain.h index 0b03fcbded..f63aaa5d27 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509chain.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509chain.h @@ -6,6 +6,7 @@ #include "pal_digest.h" #include "pal_seckey.h" +#include "pal_compiler.h" #include @@ -40,23 +41,20 @@ enum }; typedef uint32_t PAL_X509ChainStatusFlags; -enum -{ - PAL_X509ChainErrorNone = 0, - PAL_X509ChainErrorUnknownValueType = 0x0001L << 32, - PAL_X509ChainErrorUnknownValue = 0x0002L << 32, -}; +#define PAL_X509ChainErrorNone 0 +#define PAL_X509ChainErrorUnknownValueType 0x0001L << 32 +#define PAL_X509ChainErrorUnknownValue 0x0002L << 32 typedef uint64_t PAL_X509ChainErrorFlags; /* Create a SecPolicyRef representing the basic X.509 policy */ -extern "C" SecPolicyRef AppleCryptoNative_X509ChainCreateDefaultPolicy(); +DLLEXPORT SecPolicyRef AppleCryptoNative_X509ChainCreateDefaultPolicy(void); /* Create a SecPolicyRef which checks for revocation (OCSP or CRL) */ -extern "C" SecPolicyRef AppleCryptoNative_X509ChainCreateRevocationPolicy(); +DLLEXPORT SecPolicyRef AppleCryptoNative_X509ChainCreateRevocationPolicy(void); /* Create a SecTrustRef to build a chain over the specified certificates with the given policies. @@ -71,7 +69,7 @@ Output: pTrustOut: Receives the SecTrustRef to build the chain, in an unbuilt state pOSStatus: Receives the result of SecTrustCreateWithCertificates */ -extern "C" int32_t +DLLEXPORT int32_t AppleCryptoNative_X509ChainCreate(CFTypeRef certs, CFTypeRef policies, SecTrustRef* pTrustOut, int32_t* pOSStatus); /* @@ -85,27 +83,27 @@ state. Note that an untrusted chain building successfully still returns 1. Output: pOSStatus: Receives the result of SecTrustEvaluate */ -extern "C" int32_t AppleCryptoNative_X509ChainEvaluate(SecTrustRef chain, - CFDateRef cfEvaluationTime, - bool allowNetwork, - int32_t* pOSStatus); +DLLEXPORT int32_t AppleCryptoNative_X509ChainEvaluate(SecTrustRef chain, + CFDateRef cfEvaluationTime, + bool allowNetwork, + int32_t* pOSStatus); /* Gets the number of certificates in the chain. */ -extern "C" int64_t AppleCryptoNative_X509ChainGetChainSize(SecTrustRef chain); +DLLEXPORT int64_t AppleCryptoNative_X509ChainGetChainSize(SecTrustRef chain); /* Fetches the SecCertificateRef at a given position in the chain. Position 0 is the End-Entity certificate, postiion 1 is the issuer of position 0, et cetera. */ -extern "C" SecCertificateRef AppleCryptoNative_X509ChainGetCertificateAtIndex(SecTrustRef chain, int64_t index); +DLLEXPORT SecCertificateRef AppleCryptoNative_X509ChainGetCertificateAtIndex(SecTrustRef chain, int64_t index); /* Get a CFRetain()ed array of dictionaries which contain the detailed results for each element in the certificate chain. */ -extern "C" CFArrayRef AppleCryptoNative_X509ChainGetTrustResults(SecTrustRef chain); +DLLEXPORT CFArrayRef AppleCryptoNative_X509ChainGetTrustResults(SecTrustRef chain); /* Get the PAL_X509ChainStatusFlags values for the certificate at the requested position within the @@ -116,7 +114,7 @@ Returns 0 on success, non-zero on error. Output: pdwStatus: Receives a flags value for the various status codes that went awry at the given position */ -extern "C" int32_t AppleCryptoNative_X509ChainGetStatusAtIndex(CFArrayRef details, int64_t index, int32_t* pdwStatus); +DLLEXPORT int32_t AppleCryptoNative_X509ChainGetStatusAtIndex(CFArrayRef details, int64_t index, int32_t* pdwStatus); /* Looks up the equivalent OSStatus code for a given PAL_X509ChainStatusFlags single-bit value. @@ -126,4 +124,4 @@ Returns errSecCoreFoundationUnknown on bad/unmapped input, otherwise the appropr Note that PAL_X509ChainNotTimeValid is an ambiguous code, it could be errSecCertificateExpired or errSecCertificateNotValidYet. A caller should resolve that code via other means. */ -extern "C" int32_t AppleCryptoNative_GetOSStatusForChainStatus(PAL_X509ChainStatusFlags chainStatusFlag); +DLLEXPORT int32_t AppleCryptoNative_GetOSStatusForChainStatus(PAL_X509ChainStatusFlags chainStatusFlag); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt index cb1eafa115..e829db0c58 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt @@ -16,31 +16,32 @@ find_package(OpenSSL REQUIRED) include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR}) set(NATIVECRYPTO_SOURCES - openssl.cpp - pal_asn1.cpp - pal_asn1_print.cpp - pal_bignum.cpp - pal_bio.cpp - pal_dsa.cpp - pal_ecdsa.cpp - pal_ecc_import_export.cpp - pal_eckey.cpp - pal_err.cpp - pal_evp.cpp - pal_evp_pkey.cpp - pal_evp_pkey_dsa.cpp - pal_evp_pkey_eckey.cpp - pal_evp_pkey_rsa.cpp - pal_evp_cipher.cpp - pal_hmac.cpp - pal_pkcs12.cpp - pal_pkcs7.cpp - pal_rsa.cpp - pal_ssl.cpp - pal_x509.cpp - pal_x509_name.cpp - pal_x509_root.cpp - pal_x509ext.cpp + openssl.c + pal_asn1.c + pal_asn1_print.c + pal_bignum.c + pal_bio.c + pal_dsa.c + pal_ecdsa.c + pal_ecc_import_export.c + pal_eckey.c + pal_err.c + pal_evp.c + pal_evp_pkey.c + pal_evp_pkey_dsa.c + pal_evp_pkey_ecdh.c + pal_evp_pkey_eckey.c + pal_evp_pkey_rsa.c + pal_evp_cipher.c + pal_hmac.c + pal_pkcs12.c + pal_pkcs7.c + pal_rsa.c + pal_ssl.c + pal_x509.c + pal_x509_name.c + pal_x509_root.c + pal_x509ext.c ) if (FEATURE_DISTRO_AGNOSTIC_SSL) @@ -49,7 +50,7 @@ if (FEATURE_DISTRO_AGNOSTIC_SSL) endif() list(APPEND NATIVECRYPTO_SOURCES - opensslshim.cpp + opensslshim.c ) add_definitions(-DFEATURE_DISTRO_AGNOSTIC_SSL) endif() diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/openssl.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/openssl.c similarity index 91% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native/openssl.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native/openssl.c index 551ca409e3..dde8297e2e 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/openssl.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/openssl.c @@ -5,6 +5,7 @@ #include "pal_types.h" #include "pal_utilities.h" #include "pal_safecrt.h" +#include "openssl.h" #include "opensslshim.h" #include @@ -14,7 +15,6 @@ #include #include #include -#include // See X509NameType.SimpleName #define NAME_TYPE_SIMPLE 0 @@ -66,7 +66,7 @@ Return values: 1: Data was copied Any negative value: The input buffer size was reported as insufficient. A buffer of size ABS(return) is required. */ -extern "C" int32_t CryptoNative_GetX509Thumbprint(X509* x509, uint8_t* pBuf, int32_t cBuf) +int32_t CryptoNative_GetX509Thumbprint(X509* x509, uint8_t* pBuf, int32_t cBuf) { if (!x509) { @@ -97,7 +97,7 @@ Return values: NULL if the validity cannot be determined, a pointer to the ASN1_TIME structure for the NotBefore value otherwise. */ -extern "C" ASN1_TIME* CryptoNative_GetX509NotBefore(X509* x509) +ASN1_TIME* CryptoNative_GetX509NotBefore(X509* x509) { if (x509 && x509->cert_info && x509->cert_info->validity) { @@ -118,7 +118,7 @@ Return values: NULL if the validity cannot be determined, a pointer to the ASN1_TIME structure for the NotAfter value otherwise. */ -extern "C" ASN1_TIME* CryptoNative_GetX509NotAfter(X509* x509) +ASN1_TIME* CryptoNative_GetX509NotAfter(X509* x509) { if (x509 && x509->cert_info && x509->cert_info->validity) { @@ -139,7 +139,7 @@ Return values: NULL if the validity cannot be determined, a pointer to the ASN1_TIME structure for the NextUpdate value otherwise. */ -extern "C" ASN1_TIME* CryptoNative_GetX509CrlNextUpdate(X509_CRL* crl) +ASN1_TIME* CryptoNative_GetX509CrlNextUpdate(X509_CRL* crl) { if (crl) { @@ -163,12 +163,12 @@ The encoded value of the version, otherwise: 1: X509v2 2: X509v3 */ -extern "C" int32_t CryptoNative_GetX509Version(X509* x509) +int32_t CryptoNative_GetX509Version(X509* x509) { if (x509 && x509->cert_info) { long ver = ASN1_INTEGER_get(x509->cert_info->version); - return static_cast(ver); + return (int32_t)ver; } return -1; @@ -185,7 +185,7 @@ Return values: NULL if the algorithm cannot be determined, otherwise a pointer to the OpenSSL ASN1_OBJECT structure describing the object type. */ -extern "C" ASN1_OBJECT* CryptoNative_GetX509PublicKeyAlgorithm(X509* x509) +ASN1_OBJECT* CryptoNative_GetX509PublicKeyAlgorithm(X509* x509) { if (x509 && x509->cert_info && x509->cert_info->key && x509->cert_info->key->algor) { @@ -206,7 +206,7 @@ Return values: NULL if the algorithm cannot be determined, otherwise a pointer to the OpenSSL ASN1_OBJECT structure describing the object type. */ -extern "C" ASN1_OBJECT* CryptoNative_GetX509SignatureAlgorithm(X509* x509) +ASN1_OBJECT* CryptoNative_GetX509SignatureAlgorithm(X509* x509) { if (x509 && x509->sig_alg && x509->sig_alg->algorithm) { @@ -228,7 +228,7 @@ Return values: 1: Data was copied Any negative value: The input buffer size was reported as insufficient. A buffer of size ABS(return) is required. */ -extern "C" int32_t CryptoNative_GetX509PublicKeyParameterBytes(X509* x509, uint8_t* pBuf, int32_t cBuf) +int32_t CryptoNative_GetX509PublicKeyParameterBytes(X509* x509, uint8_t* pBuf, int32_t cBuf) { if (!x509 || !x509->cert_info || !x509->cert_info->key || !x509->cert_info->key->algor) { @@ -273,7 +273,7 @@ Return values: NULL if the public key cannot be determined, a pointer to the ASN1_BIT_STRING structure representing the public key. */ -extern "C" ASN1_BIT_STRING* CryptoNative_GetX509PublicKeyBytes(X509* x509) +ASN1_BIT_STRING* CryptoNative_GetX509PublicKeyBytes(X509* x509) { if (x509 && x509->cert_info && x509->cert_info->key) { @@ -316,7 +316,7 @@ Remarks: So this function will really work on all of them. */ -extern "C" int32_t CryptoNative_GetAsn1StringBytes(ASN1_STRING* asn1, uint8_t* pBuf, int32_t cBuf) +int32_t CryptoNative_GetAsn1StringBytes(ASN1_STRING* asn1, uint8_t* pBuf, int32_t cBuf) { if (!asn1 || cBuf < 0) { @@ -335,7 +335,7 @@ extern "C" int32_t CryptoNative_GetAsn1StringBytes(ASN1_STRING* asn1, uint8_t* p return -length; } - memcpy_s(pBuf, UnsignedCast(cBuf), asn1->data, UnsignedCast(length)); + memcpy_s(pBuf, Int32ToSizeT(cBuf), asn1->data, Int32ToSizeT(length)); return 1; } @@ -351,7 +351,7 @@ Return values: 1: Data was copied Any negative value: The input buffer size was reported as insufficient. A buffer of size ABS(return) is required. */ -extern "C" int32_t CryptoNative_GetX509NameRawBytes(X509_NAME* x509Name, uint8_t* pBuf, int32_t cBuf) +int32_t CryptoNative_GetX509NameRawBytes(X509_NAME* x509Name, uint8_t* pBuf, int32_t cBuf) { if (!x509Name || !x509Name->bytes || cBuf < 0) { @@ -373,7 +373,7 @@ extern "C" int32_t CryptoNative_GetX509NameRawBytes(X509_NAME* x509Name, uint8_t return 0; } - int length = static_cast(x509Name->bytes->length); + int length = (int)(x509Name->bytes->length); if (length < 0) { @@ -386,7 +386,7 @@ extern "C" int32_t CryptoNative_GetX509NameRawBytes(X509_NAME* x509Name, uint8_t return -length; } - memcpy_s(pBuf, UnsignedCast(cBuf), x509Name->bytes->data, UnsignedCast(length)); + memcpy_s(pBuf, Int32ToSizeT(cBuf), x509Name->bytes->data, Int32ToSizeT(length)); return 1; } @@ -401,7 +401,7 @@ Return values: 0 if the field count cannot be determined, or the count of OIDs present in the EKU. Note that 0 does not always indicate an error, merely that GetX509EkuField should not be called. */ -extern "C" int32_t CryptoNative_GetX509EkuFieldCount(EXTENDED_KEY_USAGE* eku) +int32_t CryptoNative_GetX509EkuFieldCount(EXTENDED_KEY_USAGE* eku) { return sk_ASN1_OBJECT_num(eku); } @@ -417,7 +417,7 @@ Return values: NULL if eku is NULL or loc is out of bounds, otherwise a pointer to the ASN1_OBJECT structure encoding that particular OID. */ -extern "C" ASN1_OBJECT* CryptoNative_GetX509EkuField(EXTENDED_KEY_USAGE* eku, int32_t loc) +ASN1_OBJECT* CryptoNative_GetX509EkuField(EXTENDED_KEY_USAGE* eku, int32_t loc) { return sk_ASN1_OBJECT_value(eku, loc); } @@ -433,7 +433,7 @@ Return values: NULL if the certificate is invalid or no name information could be found, otherwise a pointer to a memory-backed BIO structure which contains the answer to the GetNameInfo query */ -extern "C" BIO* CryptoNative_GetX509NameInfo(X509* x509, int32_t nameType, int32_t forIssuer) +BIO* CryptoNative_GetX509NameInfo(X509* x509, int32_t nameType, int32_t forIssuer) { static const char szOidUpn[] = "1.3.6.1.4.1.311.20.2.3"; @@ -563,7 +563,7 @@ extern "C" BIO* CryptoNative_GetX509NameInfo(X509* x509, int32_t nameType, int32 break; } - STACK_OF(GENERAL_NAME)* altNames = static_cast( + STACK_OF(GENERAL_NAME)* altNames = (STACK_OF(GENERAL_NAME)*)( X509_get_ext_d2i(x509, forIssuer ? NID_issuer_alt_name : NID_subject_alt_name, NULL, NULL)); if (altNames) @@ -729,7 +729,7 @@ static int CheckX509HostnameMatch(ASN1_STRING* candidate, const char* hostname, } // Great, candidateStr is just candidate->data! - candidateStr = reinterpret_cast(candidate->data); + candidateStr = (char*)(candidate->data); // First, verify that the string is alphanumeric, plus hyphens or periods and maybe starting with an asterisk. for (i = 0; i < candidate->length; ++i) @@ -749,7 +749,7 @@ static int CheckX509HostnameMatch(ASN1_STRING* candidate, const char* hostname, return 0; } - return !memcmp(candidateStr, hostname, static_cast(cchHostname)); + return !memcmp(candidateStr, hostname, (size_t)cchHostname); } for (i = 0; i < cchHostname; ++i) @@ -782,7 +782,7 @@ static int CheckX509HostnameMatch(ASN1_STRING* candidate, const char* hostname, return 0; } - return !memcmp(candidateStr + 1, hostname + hostnameFirstDot, static_cast(matchLength)); + return !memcmp(candidateStr + 1, hostname + hostnameFirstDot, (size_t)matchLength); } } @@ -793,7 +793,7 @@ static int CheckX509HostnameMatch(ASN1_STRING* candidate, const char* hostname, return 0; } - return !memcmp(candidate->data, hostname, static_cast(cchHostname)); + return !memcmp(candidate->data, hostname, (size_t)cchHostname); } /* @@ -808,7 +808,7 @@ Return values: 0 if the hostname is not a match Any negative number indicates an error in the arguments. */ -extern "C" int32_t CryptoNative_CheckX509Hostname(X509* x509, const char* hostname, int32_t cchHostname) +int32_t CryptoNative_CheckX509Hostname(X509* x509, const char* hostname, int32_t cchHostname) { if (!x509) return -2; @@ -819,7 +819,7 @@ extern "C" int32_t CryptoNative_CheckX509Hostname(X509* x509, const char* hostna int subjectNid = NID_commonName; int sanGenType = GEN_DNS; - GENERAL_NAMES* san = static_cast( + GENERAL_NAMES* san = (GENERAL_NAMES*)( X509_get_ext_d2i(x509, NID_subject_alt_name, NULL, NULL)); char readSubject = 1; int success = 0; @@ -892,7 +892,7 @@ Return values: 0 if the hostname is not a match Any negative number indicates an error in the arguments. */ -extern "C" int32_t CryptoNative_CheckX509IpAddress( +int32_t CryptoNative_CheckX509IpAddress( X509* x509, const uint8_t* addressBytes, int32_t addressBytesLen, const char* hostname, int32_t cchHostname) { if (!x509) @@ -908,7 +908,7 @@ extern "C" int32_t CryptoNative_CheckX509IpAddress( int subjectNid = NID_commonName; int sanGenType = GEN_IPADD; - GENERAL_NAMES* san = static_cast(X509_get_ext_d2i(x509, NID_subject_alt_name, NULL, NULL)); + GENERAL_NAMES* san = (GENERAL_NAMES*)(X509_get_ext_d2i(x509, NID_subject_alt_name, NULL, NULL)); int success = 0; if (san) @@ -933,7 +933,7 @@ extern "C" int32_t CryptoNative_CheckX509IpAddress( continue; } - if (!memcmp(addressBytes, ipAddr->data, static_cast(addressBytesLen))) + if (!memcmp(addressBytes, ipAddr->data, (size_t)addressBytesLen)) { success = 1; break; @@ -980,7 +980,7 @@ Return values: 0 if the field count cannot be determined, or the count of certificates in STACK_OF(X509) Note that 0 does not always indicate an error, merely that GetX509StackField should not be called. */ -extern "C" int32_t CryptoNative_GetX509StackFieldCount(STACK_OF(X509) * stack) +int32_t CryptoNative_GetX509StackFieldCount(STACK_OF(X509) * stack) { return sk_X509_num(stack); } @@ -996,7 +996,7 @@ Return values: NULL if stack is NULL or loc is out of bounds, otherwise a pointer to the X509 structure encoding that particular element. */ -extern "C" X509* CryptoNative_GetX509StackField(STACK_OF(X509) * stack, int loc) +X509* CryptoNative_GetX509StackField(STACK_OF(X509) * stack, int loc) { return sk_X509_value(stack, loc); } @@ -1008,7 +1008,7 @@ RecursiveFreeX509Stack Used by System.Security.Cryptography.X509Certificates' OpenSslX509ChainProcessor to free a stack when done with it. */ -extern "C" void CryptoNative_RecursiveFreeX509Stack(STACK_OF(X509) * stack) +void CryptoNative_RecursiveFreeX509Stack(STACK_OF(X509) * stack) { sk_X509_pop_free(stack, X509_free); } @@ -1024,7 +1024,7 @@ Return values: 0 if ctx is NULL, if ctx has no X509_VERIFY_PARAM, or the date inputs don't produce a valid time_t; 1 on success. */ -extern "C" int32_t CryptoNative_SetX509ChainVerifyTime(X509_STORE_CTX* ctx, +int32_t CryptoNative_SetX509ChainVerifyTime(X509_STORE_CTX* ctx, int32_t year, int32_t month, int32_t day, @@ -1040,7 +1040,7 @@ extern "C" int32_t CryptoNative_SetX509ChainVerifyTime(X509_STORE_CTX* ctx, time_t verifyTime = MakeTimeT(year, month, day, hour, minute, second, isDst); - if (verifyTime == static_cast(-1)) + if (verifyTime == (time_t)-1) { return 0; } @@ -1067,7 +1067,7 @@ Return values: If bio containns a valid DER-encoded X509 object, a pointer to that X509 structure that was deserialized, otherwise NULL. */ -extern "C" X509* CryptoNative_ReadX509AsDerFromBio(BIO* bio) +X509* CryptoNative_ReadX509AsDerFromBio(BIO* bio) { return d2i_X509_bio(bio, NULL); } @@ -1087,7 +1087,7 @@ behavior on non-file, non-null BIO objects. See also: OpenSSL's BIO_tell */ -extern "C" int32_t CryptoNative_BioTell(BIO* bio) +int32_t CryptoNative_BioTell(BIO* bio) { if (!bio) { @@ -1114,7 +1114,7 @@ otherwise unspecified See also: OpenSSL's BIO_seek */ -extern "C" int32_t CryptoNative_BioSeek(BIO* bio, int32_t ofs) +int32_t CryptoNative_BioSeek(BIO* bio, int32_t ofs) { if (!bio) { @@ -1134,7 +1134,7 @@ of X509* to OpenSSL. Return values: A STACK_OF(X509*) with no comparator. */ -extern "C" STACK_OF(X509) * CryptoNative_NewX509Stack() +STACK_OF(X509) * CryptoNative_NewX509Stack() { return sk_X509_new_null(); } @@ -1150,7 +1150,7 @@ Return values: 1 on success 0 on a NULL stack, or an error within sk_X509_push */ -extern "C" int32_t CryptoNative_PushX509StackField(STACK_OF(X509) * stack, X509* x509) +int32_t CryptoNative_PushX509StackField(STACK_OF(X509) * stack, X509* x509) { if (!stack) { @@ -1171,7 +1171,7 @@ Returns a bool to managed code. 1 for success 0 for failure */ -extern "C" int32_t CryptoNative_GetRandomBytes(uint8_t* buf, int32_t num) +int32_t CryptoNative_GetRandomBytes(uint8_t* buf, int32_t num) { int ret = RAND_bytes(buf, num); @@ -1191,7 +1191,7 @@ Return values: -1 indicates OpenSSL signalled an error, CryptographicException should be raised. -2 indicates an error in the input arguments */ -extern "C" int32_t CryptoNative_LookupFriendlyNameByOid(const char* oidValue, const char** friendlyName) +int32_t CryptoNative_LookupFriendlyNameByOid(const char* oidValue, const char** friendlyName) { ASN1_OBJECT* oid; int nid; @@ -1245,7 +1245,7 @@ extern "C" int32_t CryptoNative_LookupFriendlyNameByOid(const char* oidValue, co static pthread_mutex_t g_initLock = PTHREAD_MUTEX_INITIALIZER; // Set of locks initialized for OpenSSL -static pthread_mutex_t* g_locks = nullptr; +static pthread_mutex_t* g_locks = NULL; /* Function: @@ -1306,7 +1306,7 @@ Return values: 0 on success non-zero on failure */ -extern "C" int32_t CryptoNative_EnsureOpenSslInitialized() +int32_t CryptoNative_EnsureOpenSslInitialized() { int ret = 0; int numLocks = 0; @@ -1315,7 +1315,7 @@ extern "C" int32_t CryptoNative_EnsureOpenSslInitialized() pthread_mutex_lock(&g_initLock); - if (g_locks != nullptr) + if (g_locks != NULL) { // Already initialized; nothing more to do. goto done; @@ -1331,8 +1331,15 @@ extern "C" int32_t CryptoNative_EnsureOpenSslInitialized() } // Create the locks array - g_locks = new (std::nothrow) pthread_mutex_t[numLocks]; - if (g_locks == nullptr) + size_t allocationSize = 0; + if (!multiply_s(sizeof(pthread_mutex_t), (size_t)numLocks, &allocationSize)) + { + ret = 2; + goto done; + } + + g_locks = (pthread_mutex_t*)malloc(allocationSize); + if (g_locks == NULL) { ret = 2; goto done; @@ -1375,13 +1382,13 @@ done: if (ret != 0) { // Cleanup on failure - if (g_locks != nullptr) + if (g_locks != NULL) { for (int i = locksInitialized - 1; i >= 0; i--) { pthread_mutex_destroy(&g_locks[i]); // ignore failures } - delete[] g_locks; + free(g_locks); g_locks = NULL; } } @@ -1400,7 +1407,7 @@ Return values: Textual description of the version on success. "not available" string on failure. */ -extern "C" char* CryptoNative_SSLEayVersion() +char* CryptoNative_SSLEayVersion() { return strdup(SSLeay_version(SSLEAY_VERSION)); } diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/openssl.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/openssl.h new file mode 100644 index 0000000000..2a0a2562b6 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/openssl.h @@ -0,0 +1,70 @@ +// 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. +// + +#pragma once + +#include "pal_compiler.h" +#include +#include + +DLLEXPORT int32_t CryptoNative_GetX509Thumbprint(X509* x509, uint8_t* pBuf, int32_t cBuf); + +DLLEXPORT ASN1_TIME* CryptoNative_GetX509NotBefore(X509* x509); + +DLLEXPORT ASN1_TIME* CryptoNative_GetX509NotAfter(X509* x509); + +DLLEXPORT ASN1_TIME* CryptoNative_GetX509CrlNextUpdate(X509_CRL* crl); + +DLLEXPORT int32_t CryptoNative_GetX509Version(X509* x509); + +DLLEXPORT ASN1_OBJECT* CryptoNative_GetX509PublicKeyAlgorithm(X509* x509); + +DLLEXPORT ASN1_OBJECT* CryptoNative_GetX509SignatureAlgorithm(X509* x509); + +DLLEXPORT int32_t CryptoNative_GetX509PublicKeyParameterBytes(X509* x509, uint8_t* pBuf, int32_t cBuf); + +DLLEXPORT ASN1_BIT_STRING* CryptoNative_GetX509PublicKeyBytes(X509* x509); + +DLLEXPORT int32_t CryptoNative_GetAsn1StringBytes(ASN1_STRING* asn1, uint8_t* pBuf, int32_t cBuf); + +DLLEXPORT int32_t CryptoNative_GetX509NameRawBytes(X509_NAME* x509Name, uint8_t* pBuf, int32_t cBuf); + +DLLEXPORT int32_t CryptoNative_GetX509EkuFieldCount(EXTENDED_KEY_USAGE* eku); + +DLLEXPORT ASN1_OBJECT* CryptoNative_GetX509EkuField(EXTENDED_KEY_USAGE* eku, int32_t loc); + +DLLEXPORT BIO* CryptoNative_GetX509NameInfo(X509* x509, int32_t nameType, int32_t forIssuer); + +DLLEXPORT int32_t CryptoNative_CheckX509Hostname(X509* x509, const char* hostname, int32_t cchHostname); + +DLLEXPORT int32_t CryptoNative_CheckX509IpAddress( + X509* x509, const uint8_t* addressBytes, int32_t addressBytesLen, const char* hostname, int32_t cchHostname); + +DLLEXPORT int32_t CryptoNative_GetX509StackFieldCount(STACK_OF(X509) * stack); + +DLLEXPORT X509* CryptoNative_GetX509StackField(STACK_OF(X509) * stack, int loc); + +DLLEXPORT void CryptoNative_RecursiveFreeX509Stack(STACK_OF(X509) * stack); + +DLLEXPORT int32_t CryptoNative_SetX509ChainVerifyTime( + X509_STORE_CTX* ctx, int32_t year, int32_t month, int32_t day, int32_t hour, int32_t minute, int32_t second, int32_t isDst); + +DLLEXPORT X509* CryptoNative_ReadX509AsDerFromBio(BIO* bio); + +DLLEXPORT int32_t CryptoNative_BioTell(BIO* bio); + +DLLEXPORT int32_t CryptoNative_BioSeek(BIO* bio, int32_t ofs); + +DLLEXPORT STACK_OF(X509) * CryptoNative_NewX509Stack(void); + +DLLEXPORT int32_t CryptoNative_PushX509StackField(STACK_OF(X509) * stack, X509* x509); + +DLLEXPORT int32_t CryptoNative_GetRandomBytes(uint8_t* buf, int32_t num); + +DLLEXPORT int32_t CryptoNative_LookupFriendlyNameByOid(const char* oidValue, const char** friendlyName); + +DLLEXPORT int32_t CryptoNative_EnsureOpenSslInitialized(void); + +DLLEXPORT char* CryptoNative_SSLEayVersion(void); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/opensslshim.c b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/opensslshim.c new file mode 100644 index 0000000000..66807866de --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/opensslshim.c @@ -0,0 +1,87 @@ +// 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. +// + +#include +#include +#include + +#include "opensslshim.h" + +// Define pointers to all the used ICU functions +#define PER_FUNCTION_BLOCK(fn, isRequired) __typeof(fn) fn##_ptr; +FOR_ALL_OPENSSL_FUNCTIONS +#undef PER_FUNCTION_BLOCK + +// x.x.x, considering the max number of decimal digits for each component +#define MaxVersionStringLength 32 +#define SONAME_BASE "libssl.so." + +static void* libssl = NULL; + +static bool OpenLibrary() +{ + // If there is an override of the version specified using the CLR_OPENSSL_VERSION_OVERRIDE + // env variable, try to load that first. + // The format of the value in the env variable is expected to be the version numbers, + // like 1.0.0, 1.0.2 etc. + char* versionOverride = getenv("CLR_OPENSSL_VERSION_OVERRIDE"); + + if ((versionOverride != NULL) && strnlen(versionOverride, MaxVersionStringLength + 1) <= MaxVersionStringLength) + { + char soName[sizeof(SONAME_BASE) + MaxVersionStringLength] = SONAME_BASE; + + strcat(soName, versionOverride); + libssl = dlopen(soName, RTLD_LAZY); + } + + if (libssl == NULL) + { + // Debian 9 has dropped support for SSLv3 and so they have bumped their soname. Let's try it + // before trying the version 1.0.0 to make it less probable that some of our other dependencies + // end up loading conflicting version of libssl. + libssl = dlopen("libssl.so.1.0.2", RTLD_LAZY); + } + + if (libssl == NULL) + { + // Now try the default versioned so naming as described in the OpenSSL doc + libssl = dlopen("libssl.so.1.0.0", RTLD_LAZY); + } + + if (libssl == NULL) + { + // Fedora derived distros use different naming for the version 1.0.0 + libssl = dlopen("libssl.so.10", RTLD_LAZY); + } + + return libssl != NULL; +} + +__attribute__((constructor)) +static void InitializeOpenSSLShim() +{ + if (!OpenLibrary()) + { + fprintf(stderr, "No usable version of the libssl was found\n"); + abort(); + } + + // Get pointers to all the ICU functions that are needed +#define PER_FUNCTION_BLOCK(fn, isRequired) \ + fn##_ptr = (__typeof(fn))(dlsym(libssl, #fn)); \ + if ((fn##_ptr) == NULL && isRequired) { fprintf(stderr, "Cannot get required symbol " #fn " from libssl\n"); abort(); } + + FOR_ALL_OPENSSL_FUNCTIONS +#undef PER_FUNCTION_BLOCK +} + +__attribute__((destructor)) +static void ShutdownOpenSSLShim() +{ + if (libssl != NULL) + { + dlclose(libssl); + } +} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/opensslshim.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/opensslshim.cpp deleted file mode 100644 index 6be0546b81..0000000000 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/opensslshim.cpp +++ /dev/null @@ -1,62 +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. -// - -#include -#include - -#include "opensslshim.h" - -// Define pointers to all the used ICU functions -#define PER_FUNCTION_BLOCK(fn, isRequired) decltype(fn) fn##_ptr; -FOR_ALL_OPENSSL_FUNCTIONS -#undef PER_FUNCTION_BLOCK - -static void* libssl = nullptr; - -bool OpenLibrary() -{ - // First try the default versioned so naming as described in the OpenSSL doc - libssl = dlopen("libssl.so.1.0.0", RTLD_LAZY); - if (libssl == nullptr) - { - // Fedora derived distros use different naming for the version 1.0.0 - libssl = dlopen("libssl.so.10", RTLD_LAZY); - } - - if (libssl == nullptr) - { - // Debian 9 has dropped support for SSLv3 and so they have bumped their soname - libssl = dlopen("libssl.so.1.0.2", RTLD_LAZY); - } - - return libssl != nullptr; -} - -__attribute__((constructor)) -void InitializeOpenSSLShim() -{ - if (!OpenLibrary()) - { - fprintf(stderr, "No usable version of the libssl was found\n"); - abort(); - } - - // Get pointers to all the ICU functions that are needed -#define PER_FUNCTION_BLOCK(fn, isRequired) \ - fn##_ptr = reinterpret_cast(dlsym(libssl, #fn)); \ - if ((fn##_ptr) == NULL && isRequired) { fprintf(stderr, "Cannot get required symbol " #fn " from libssl\n"); abort(); } - - FOR_ALL_OPENSSL_FUNCTIONS -#undef PER_FUNCTION_BLOCK -} - -__attribute__((destructor)) -void ShutdownOpenSSLShim() -{ - if (libssl != nullptr) - { - dlclose(libssl); - } -} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/opensslshim.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/opensslshim.h index 3771d614c2..a844178e57 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/opensslshim.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/opensslshim.h @@ -65,7 +65,7 @@ void SSL_CTX_set_alpn_select_cb(SSL_CTX* ctx, int (*cb) (SSL *ssl, void SSL_get0_alpn_selected(const SSL* ssl, const unsigned char** protocol, unsigned int* len); #endif -#define API_EXISTS(fn) (fn != nullptr) +#define API_EXISTS(fn) (fn != NULL) // List of all functions from the libssl that are used in the System.Security.Cryptography.Native. // Forgetting to add a function here results in build failure with message reporting the function @@ -192,6 +192,11 @@ void SSL_get0_alpn_selected(const SSL* ssl, const unsigned char** protocol, unsi PER_FUNCTION_BLOCK(EVP_MD_CTX_create, true) \ PER_FUNCTION_BLOCK(EVP_MD_CTX_destroy, true) \ PER_FUNCTION_BLOCK(EVP_MD_size, true) \ + PER_FUNCTION_BLOCK(EVP_PKEY_CTX_free, true) \ + PER_FUNCTION_BLOCK(EVP_PKEY_CTX_new, true) \ + PER_FUNCTION_BLOCK(EVP_PKEY_derive_set_peer, true) \ + PER_FUNCTION_BLOCK(EVP_PKEY_derive_init, true) \ + PER_FUNCTION_BLOCK(EVP_PKEY_derive, true) \ PER_FUNCTION_BLOCK(EVP_PKEY_free, true) \ PER_FUNCTION_BLOCK(EVP_PKEY_get1_DSA, true) \ PER_FUNCTION_BLOCK(EVP_PKEY_get1_EC_KEY, true) \ @@ -229,6 +234,7 @@ void SSL_get0_alpn_selected(const SSL* ssl, const unsigned char** protocol, unsi PER_FUNCTION_BLOCK(OBJ_txt2nid, true) \ PER_FUNCTION_BLOCK(OBJ_txt2obj, true) \ PER_FUNCTION_BLOCK(OPENSSL_add_all_algorithms_conf, true) \ + PER_FUNCTION_BLOCK(OPENSSL_cleanse, true) \ PER_FUNCTION_BLOCK(PEM_read_bio_PKCS7, true) \ PER_FUNCTION_BLOCK(PEM_read_bio_X509_AUX, true) \ PER_FUNCTION_BLOCK(PEM_read_bio_X509_CRL, true) \ @@ -248,6 +254,8 @@ void SSL_get0_alpn_selected(const SSL* ssl, const unsigned char** protocol, unsi PER_FUNCTION_BLOCK(RSA_get_method, true) \ PER_FUNCTION_BLOCK(RSA_new, true) \ PER_FUNCTION_BLOCK(RSA_private_decrypt, true) \ + PER_FUNCTION_BLOCK(RSA_private_encrypt, true) \ + PER_FUNCTION_BLOCK(RSA_public_decrypt, true) \ PER_FUNCTION_BLOCK(RSA_public_encrypt, true) \ PER_FUNCTION_BLOCK(RSA_sign, true) \ PER_FUNCTION_BLOCK(RSA_size, true) \ @@ -357,7 +365,7 @@ void SSL_get0_alpn_selected(const SSL* ssl, const unsigned char** protocol, unsi PER_FUNCTION_BLOCK(EC_POINT_set_affine_coordinates_GF2m, false) \ // Declare pointers to all the used OpenSSL functions -#define PER_FUNCTION_BLOCK(fn, isRequired) extern decltype(fn)* fn##_ptr; +#define PER_FUNCTION_BLOCK(fn, isRequired) extern __typeof(fn)* fn##_ptr; FOR_ALL_OPENSSL_FUNCTIONS #undef PER_FUNCTION_BLOCK @@ -484,6 +492,11 @@ FOR_ALL_OPENSSL_FUNCTIONS #define EVP_MD_CTX_create EVP_MD_CTX_create_ptr #define EVP_MD_CTX_destroy EVP_MD_CTX_destroy_ptr #define EVP_MD_size EVP_MD_size_ptr +#define EVP_PKEY_CTX_free EVP_PKEY_CTX_free_ptr +#define EVP_PKEY_CTX_new EVP_PKEY_CTX_new_ptr +#define EVP_PKEY_derive_set_peer EVP_PKEY_derive_set_peer_ptr +#define EVP_PKEY_derive_init EVP_PKEY_derive_init_ptr +#define EVP_PKEY_derive EVP_PKEY_derive_ptr #define EVP_PKEY_free EVP_PKEY_free_ptr #define EVP_PKEY_get1_DSA EVP_PKEY_get1_DSA_ptr #define EVP_PKEY_get1_EC_KEY EVP_PKEY_get1_EC_KEY_ptr @@ -521,6 +534,7 @@ FOR_ALL_OPENSSL_FUNCTIONS #define OBJ_txt2nid OBJ_txt2nid_ptr #define OBJ_txt2obj OBJ_txt2obj_ptr #define OPENSSL_add_all_algorithms_conf OPENSSL_add_all_algorithms_conf_ptr +#define OPENSSL_cleanse OPENSSL_cleanse_ptr #define PEM_read_bio_PKCS7 PEM_read_bio_PKCS7_ptr #define PEM_read_bio_X509_AUX PEM_read_bio_X509_AUX_ptr #define PEM_read_bio_X509_CRL PEM_read_bio_X509_CRL_ptr @@ -540,6 +554,8 @@ FOR_ALL_OPENSSL_FUNCTIONS #define RSA_get_method RSA_get_method_ptr #define RSA_new RSA_new_ptr #define RSA_private_decrypt RSA_private_decrypt_ptr +#define RSA_private_encrypt RSA_private_encrypt_ptr +#define RSA_public_decrypt RSA_public_decrypt_ptr #define RSA_public_encrypt RSA_public_encrypt_ptr #define RSA_sign RSA_sign_ptr #define RSA_size RSA_size_ptr diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_asn1.c b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_asn1.c new file mode 100644 index 0000000000..8a3f2b5798 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_asn1.c @@ -0,0 +1,110 @@ +// 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. + +#include "pal_asn1.h" +#include +#include + +c_static_assert(PAL_NID_undef == NID_undef); +c_static_assert(PAL_NID_X9_62_prime256v1 == NID_X9_62_prime256v1); +c_static_assert(PAL_NID_secp224r1 == NID_secp224r1); +c_static_assert(PAL_NID_secp384r1 == NID_secp384r1); +c_static_assert(PAL_NID_secp521r1 == NID_secp521r1); + +const ASN1_OBJECT* CryptoNative_ObjTxt2Obj(const char* s) +{ + return OBJ_txt2obj(s, true); +} + +int32_t CryptoNative_ObjObj2Txt(char* buf, int32_t buf_len, const ASN1_OBJECT* a) +{ + return OBJ_obj2txt(buf, buf_len, a, true); +} + +const ASN1_OBJECT* CryptoNative_GetObjectDefinitionByName(const char* friendlyName) +{ + int nid = OBJ_ln2nid(friendlyName); + + if (nid == NID_undef) + { + nid = OBJ_sn2nid(friendlyName); + } + + if (nid == NID_undef) + { + return NULL; + } + + return OBJ_nid2obj(nid); +} + +int32_t CryptoNative_ObjSn2Nid(const char* sn) +{ + return OBJ_sn2nid(sn); +} + +ASN1_OBJECT* CryptoNative_ObjNid2Obj(int32_t nid) +{ + return OBJ_nid2obj(nid); +} + +void CryptoNative_Asn1ObjectFree(ASN1_OBJECT* a) +{ + ASN1_OBJECT_free(a); +} + +ASN1_BIT_STRING* CryptoNative_DecodeAsn1BitString(const uint8_t* buf, int32_t len) +{ + if (!buf || !len) + { + return NULL; + } + + return d2i_ASN1_BIT_STRING(NULL, &buf, len); +} + +void CryptoNative_Asn1BitStringFree(ASN1_STRING* a) +{ + ASN1_BIT_STRING_free(a); +} + +ASN1_OCTET_STRING* CryptoNative_DecodeAsn1OctetString(const uint8_t* buf, int32_t len) +{ + if (!buf || !len) + { + return NULL; + } + + return d2i_ASN1_OCTET_STRING(NULL, &buf, len); +} + +ASN1_OCTET_STRING* CryptoNative_Asn1OctetStringNew() +{ + return ASN1_OCTET_STRING_new(); +} + +int32_t CryptoNative_Asn1OctetStringSet(ASN1_OCTET_STRING* s, const uint8_t* data, int32_t len) +{ + return ASN1_OCTET_STRING_set(s, data, len); +} + +void CryptoNative_Asn1OctetStringFree(ASN1_STRING* a) +{ + ASN1_OCTET_STRING_free(a); +} + +void CryptoNative_Asn1StringFree(ASN1_STRING* a) +{ + ASN1_STRING_free(a); +} + +int32_t CryptoNative_GetAsn1IntegerDerSize(ASN1_INTEGER* i) +{ + return i2d_ASN1_INTEGER(i, NULL); +} + +int32_t CryptoNative_EncodeAsn1Integer(ASN1_INTEGER* i, uint8_t* buf) +{ + return i2d_ASN1_INTEGER(i, &buf); +} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_asn1.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_asn1.cpp deleted file mode 100644 index 5429592e57..0000000000 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_asn1.cpp +++ /dev/null @@ -1,108 +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. - -#include "pal_asn1.h" - -static_assert(PAL_NID_undef == NID_undef, ""); -static_assert(PAL_NID_X9_62_prime256v1 == NID_X9_62_prime256v1, ""); -static_assert(PAL_NID_secp224r1 == NID_secp224r1, ""); -static_assert(PAL_NID_secp384r1 == NID_secp384r1, ""); -static_assert(PAL_NID_secp521r1 == NID_secp521r1, ""); - -extern "C" const ASN1_OBJECT* CryptoNative_ObjTxt2Obj(const char* s) -{ - return OBJ_txt2obj(s, true); -} - -extern "C" int32_t CryptoNative_ObjObj2Txt(char* buf, int32_t buf_len, const ASN1_OBJECT* a) -{ - return OBJ_obj2txt(buf, buf_len, a, true); -} - -extern "C" const ASN1_OBJECT* CryptoNative_GetObjectDefinitionByName(const char* friendlyName) -{ - int nid = OBJ_ln2nid(friendlyName); - - if (nid == NID_undef) - { - nid = OBJ_sn2nid(friendlyName); - } - - if (nid == NID_undef) - { - return nullptr; - } - - return OBJ_nid2obj(nid); -} - -extern "C" int32_t CryptoNative_ObjSn2Nid(const char* sn) -{ - return OBJ_sn2nid(sn); -} - -extern "C" ASN1_OBJECT* CryptoNative_ObjNid2Obj(int32_t nid) -{ - return OBJ_nid2obj(nid); -} - -extern "C" void CryptoNative_Asn1ObjectFree(ASN1_OBJECT* a) -{ - ASN1_OBJECT_free(a); -} - -extern "C" ASN1_BIT_STRING* CryptoNative_DecodeAsn1BitString(const uint8_t* buf, int32_t len) -{ - if (!buf || !len) - { - return nullptr; - } - - return d2i_ASN1_BIT_STRING(nullptr, &buf, len); -} - -extern "C" void CryptoNative_Asn1BitStringFree(ASN1_STRING* a) -{ - ASN1_BIT_STRING_free(a); -} - -extern "C" ASN1_OCTET_STRING* CryptoNative_DecodeAsn1OctetString(const uint8_t* buf, int32_t len) -{ - if (!buf || !len) - { - return nullptr; - } - - return d2i_ASN1_OCTET_STRING(nullptr, &buf, len); -} - -extern "C" ASN1_OCTET_STRING* CryptoNative_Asn1OctetStringNew() -{ - return ASN1_OCTET_STRING_new(); -} - -extern "C" int32_t CryptoNative_Asn1OctetStringSet(ASN1_OCTET_STRING* s, const uint8_t* data, int32_t len) -{ - return ASN1_OCTET_STRING_set(s, data, len); -} - -extern "C" void CryptoNative_Asn1OctetStringFree(ASN1_STRING* a) -{ - ASN1_OCTET_STRING_free(a); -} - -extern "C" void CryptoNative_Asn1StringFree(ASN1_STRING* a) -{ - ASN1_STRING_free(a); -} - -extern "C" int32_t CryptoNative_GetAsn1IntegerDerSize(ASN1_INTEGER* i) -{ - return i2d_ASN1_INTEGER(i, nullptr); -} - -extern "C" int32_t CryptoNative_EncodeAsn1Integer(ASN1_INTEGER* i, uint8_t* buf) -{ - return i2d_ASN1_INTEGER(i, &buf); -} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_asn1.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_asn1.h index 6ec1795d25..852a735c3d 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_asn1.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_asn1.h @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. #include "pal_types.h" +#include "pal_compiler.h" #include "opensslshim.h" /* @@ -20,79 +21,79 @@ enum SupportedAlgorithmNids /* Direct shim to OBJ_txt2obj. */ -extern "C" const ASN1_OBJECT* CryptoNative_ObjTxt2Obj(const char* s); +DLLEXPORT const ASN1_OBJECT* CryptoNative_ObjTxt2Obj(const char* s); /* Direct shim to OBJ_obj2txt. */ -extern "C" int32_t CryptoNative_ObjObj2Txt(char* buf, int32_t buf_len, const ASN1_OBJECT* a); +DLLEXPORT int32_t CryptoNative_ObjObj2Txt(char* buf, int32_t buf_len, const ASN1_OBJECT* a); /* Retrieves the ASN1_OBJECT for the specified friendly name. Can return nullptr if there isn't a corresponding shared object. */ -extern "C" const ASN1_OBJECT* CryptoNative_GetObjectDefinitionByName(const char* friendlyName); +DLLEXPORT const ASN1_OBJECT* CryptoNative_GetObjectDefinitionByName(const char* friendlyName); /* Direct shim to OBJ_sn2nid. */ -extern "C" int32_t CryptoNative_ObjSn2Nid(const char* sn); +DLLEXPORT int32_t CryptoNative_ObjSn2Nid(const char* sn); /* Direct shim to OBJ_nid2obj. */ -extern "C" ASN1_OBJECT* CryptoNative_ObjNid2Obj(int32_t nid); +DLLEXPORT ASN1_OBJECT* CryptoNative_ObjNid2Obj(int32_t nid); /* Direct shim to ASN1_OBJECT_free. */ -extern "C" void CryptoNative_Asn1ObjectFree(ASN1_OBJECT* a); +DLLEXPORT void CryptoNative_Asn1ObjectFree(ASN1_OBJECT* a); /* Shims the d2i_ASN1_BIT_STRING method and makes it easier to invoke from managed code. */ -extern "C" ASN1_BIT_STRING* CryptoNative_DecodeAsn1BitString(const uint8_t* buf, int32_t len); +DLLEXPORT ASN1_BIT_STRING* CryptoNative_DecodeAsn1BitString(const uint8_t* buf, int32_t len); /* Direct shim to ASN1_BIT_STRING_free. */ -extern "C" void CryptoNative_Asn1BitStringFree(ASN1_STRING* a); +DLLEXPORT void CryptoNative_Asn1BitStringFree(ASN1_STRING* a); /* Shims the d2i_ASN1_OCTET_STRING method and makes it easier to invoke from managed code. */ -extern "C" ASN1_OCTET_STRING* CryptoNative_DecodeAsn1OctetString(const uint8_t* buf, int32_t len); +DLLEXPORT ASN1_OCTET_STRING* CryptoNative_DecodeAsn1OctetString(const uint8_t* buf, int32_t len); /* Direct shim to ASN1_OCTET_STRING_new. */ -extern "C" ASN1_OCTET_STRING* CryptoNative_Asn1OctetStringNew(); +DLLEXPORT ASN1_OCTET_STRING* CryptoNative_Asn1OctetStringNew(void); /* Direct shim to ASN1_OCTET_STRING_set. */ -extern "C" int32_t CryptoNative_Asn1OctetStringSet(ASN1_OCTET_STRING* s, const uint8_t* data, int32_t len); +DLLEXPORT int32_t CryptoNative_Asn1OctetStringSet(ASN1_OCTET_STRING* s, const uint8_t* data, int32_t len); /* Direct shim to ASN1_OCTET_STRING_free. */ -extern "C" void CryptoNative_Asn1OctetStringFree(ASN1_STRING* a); +DLLEXPORT void CryptoNative_Asn1OctetStringFree(ASN1_STRING* a); /* Direct shim to ASN1_STRING_free. */ -extern "C" void CryptoNative_Asn1StringFree(ASN1_STRING* a); +DLLEXPORT void CryptoNative_Asn1StringFree(ASN1_STRING* a); /* Returns the number of bytes it will take to convert the ASN1_INTEGER to a DER format. */ -extern "C" int32_t CryptoNative_GetAsn1IntegerDerSize(ASN1_INTEGER* i); +DLLEXPORT int32_t CryptoNative_GetAsn1IntegerDerSize(ASN1_INTEGER* i); /* Shims the i2d_ASN1_INTEGER method. Returns the number of bytes written to buf. */ -extern "C" int32_t CryptoNative_EncodeAsn1Integer(ASN1_INTEGER* i, uint8_t* buf); +DLLEXPORT int32_t CryptoNative_EncodeAsn1Integer(ASN1_INTEGER* i, uint8_t* buf); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_asn1_print.c b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_asn1_print.c new file mode 100644 index 0000000000..aca41d839d --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_asn1_print.c @@ -0,0 +1,40 @@ +// 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. + +#include "pal_asn1_print.h" + +c_static_assert(PAL_B_ASN1_NUMERICSTRING == B_ASN1_NUMERICSTRING); +c_static_assert(PAL_B_ASN1_PRINTABLESTRING == B_ASN1_PRINTABLESTRING); +c_static_assert(PAL_B_ASN1_T61STRING == B_ASN1_T61STRING); +c_static_assert(PAL_B_ASN1_VIDEOTEXSTRING == B_ASN1_VIDEOTEXSTRING); +c_static_assert(PAL_B_ASN1_IA5STRING == B_ASN1_IA5STRING); +c_static_assert(PAL_B_ASN1_GRAPHICSTRING == B_ASN1_GRAPHICSTRING); +c_static_assert(PAL_B_ASN1_VISIBLESTRING == B_ASN1_VISIBLESTRING); +c_static_assert(PAL_B_ASN1_GENERALSTRING == B_ASN1_GENERALSTRING); +c_static_assert(PAL_B_ASN1_UNIVERSALSTRING == B_ASN1_UNIVERSALSTRING); +c_static_assert(PAL_B_ASN1_OCTET_STRING == B_ASN1_OCTET_STRING); +c_static_assert(PAL_B_ASN1_BIT_STRING == B_ASN1_BIT_STRING); +c_static_assert(PAL_B_ASN1_BMPSTRING == B_ASN1_BMPSTRING); +c_static_assert(PAL_B_ASN1_UNKNOWN == B_ASN1_UNKNOWN); +c_static_assert(PAL_B_ASN1_UTF8STRING == B_ASN1_UTF8STRING); +c_static_assert(PAL_B_ASN1_UTCTIME == B_ASN1_UTCTIME); +c_static_assert(PAL_B_ASN1_GENERALIZEDTIME == B_ASN1_GENERALIZEDTIME); +c_static_assert(PAL_B_ASN1_SEQUENCE == B_ASN1_SEQUENCE); + +c_static_assert(PAL_ASN1_STRFLGS_UTF8_CONVERT == ASN1_STRFLGS_UTF8_CONVERT); + +ASN1_STRING* CryptoNative_DecodeAsn1TypeBytes(const uint8_t* buf, int32_t len, Asn1StringTypeFlags type) +{ + if (!buf || !len) + { + return NULL; + } + + return d2i_ASN1_type_bytes(NULL, &buf, len, type); +} + +int32_t CryptoNative_Asn1StringPrintEx(BIO* out, ASN1_STRING* str, Asn1StringPrintFlags flags) +{ + return ASN1_STRING_print_ex(out, str, flags); +} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_asn1_print.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_asn1_print.cpp deleted file mode 100644 index ffbfef980d..0000000000 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_asn1_print.cpp +++ /dev/null @@ -1,40 +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. - -#include "pal_asn1_print.h" - -static_assert(PAL_B_ASN1_NUMERICSTRING == B_ASN1_NUMERICSTRING, ""); -static_assert(PAL_B_ASN1_PRINTABLESTRING == B_ASN1_PRINTABLESTRING, ""); -static_assert(PAL_B_ASN1_T61STRING == B_ASN1_T61STRING, ""); -static_assert(PAL_B_ASN1_VIDEOTEXSTRING == B_ASN1_VIDEOTEXSTRING, ""); -static_assert(PAL_B_ASN1_IA5STRING == B_ASN1_IA5STRING, ""); -static_assert(PAL_B_ASN1_GRAPHICSTRING == B_ASN1_GRAPHICSTRING, ""); -static_assert(PAL_B_ASN1_VISIBLESTRING == B_ASN1_VISIBLESTRING, ""); -static_assert(PAL_B_ASN1_GENERALSTRING == B_ASN1_GENERALSTRING, ""); -static_assert(PAL_B_ASN1_UNIVERSALSTRING == B_ASN1_UNIVERSALSTRING, ""); -static_assert(PAL_B_ASN1_OCTET_STRING == B_ASN1_OCTET_STRING, ""); -static_assert(PAL_B_ASN1_BIT_STRING == B_ASN1_BIT_STRING, ""); -static_assert(PAL_B_ASN1_BMPSTRING == B_ASN1_BMPSTRING, ""); -static_assert(PAL_B_ASN1_UNKNOWN == B_ASN1_UNKNOWN, ""); -static_assert(PAL_B_ASN1_UTF8STRING == B_ASN1_UTF8STRING, ""); -static_assert(PAL_B_ASN1_UTCTIME == B_ASN1_UTCTIME, ""); -static_assert(PAL_B_ASN1_GENERALIZEDTIME == B_ASN1_GENERALIZEDTIME, ""); -static_assert(PAL_B_ASN1_SEQUENCE == B_ASN1_SEQUENCE, ""); - -static_assert(PAL_ASN1_STRFLGS_UTF8_CONVERT == ASN1_STRFLGS_UTF8_CONVERT, ""); - -extern "C" ASN1_STRING* CryptoNative_DecodeAsn1TypeBytes(const uint8_t* buf, int32_t len, Asn1StringTypeFlags type) -{ - if (!buf || !len) - { - return nullptr; - } - - return d2i_ASN1_type_bytes(nullptr, &buf, len, type); -} - -extern "C" int32_t CryptoNative_Asn1StringPrintEx(BIO* out, ASN1_STRING* str, Asn1StringPrintFlags flags) -{ - return ASN1_STRING_print_ex(out, str, flags); -} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_asn1_print.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_asn1_print.h index 982506e420..78c092da65 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_asn1_print.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_asn1_print.h @@ -3,12 +3,13 @@ // See the LICENSE file in the project root for more information. #include "pal_types.h" +#include "pal_compiler.h" #include "opensslshim.h" /* Flags for the 'type' parameter of CryptoNative_DecodeAsn1TypeBytes. */ -enum Asn1StringTypeFlags : int32_t +typedef enum { PAL_B_ASN1_NUMERICSTRING = 0x0001, PAL_B_ASN1_PRINTABLESTRING = 0x0002, @@ -27,22 +28,22 @@ enum Asn1StringTypeFlags : int32_t PAL_B_ASN1_UTCTIME = 0x4000, PAL_B_ASN1_GENERALIZEDTIME = 0x8000, PAL_B_ASN1_SEQUENCE = 0x10000, -}; +} Asn1StringTypeFlags; /* Flags for the 'flags' parameter of CryptoNative_Asn1StringPrintEx. */ -enum Asn1StringPrintFlags : uint64_t +typedef enum { PAL_ASN1_STRFLGS_UTF8_CONVERT = 0x10, -}; +} Asn1StringPrintFlags; /* Shims the d2i_ASN1_type_bytes method and makes it easier to invoke from managed code. */ -extern "C" ASN1_STRING* CryptoNative_DecodeAsn1TypeBytes(const uint8_t* buf, int32_t len, Asn1StringTypeFlags type); +DLLEXPORT ASN1_STRING* CryptoNative_DecodeAsn1TypeBytes(const uint8_t* buf, int32_t len, Asn1StringTypeFlags type); /* Direct shim to ASN1_STRING_print_ex. */ -extern "C" int32_t CryptoNative_Asn1StringPrintEx(BIO* out, ASN1_STRING* str, Asn1StringPrintFlags flags); +DLLEXPORT int32_t CryptoNative_Asn1StringPrintEx(BIO* out, ASN1_STRING* str, Asn1StringPrintFlags flags); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_bignum.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_bignum.c similarity index 56% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_bignum.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_bignum.c index bb133d2b62..d9f7453a3c 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_bignum.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_bignum.c @@ -4,25 +4,25 @@ #include "pal_bignum.h" -extern "C" void CryptoNative_BigNumDestroy(BIGNUM* a) +void CryptoNative_BigNumDestroy(BIGNUM* a) { - if (a != nullptr) + if (a != NULL) { BN_clear_free(a); } } -extern "C" BIGNUM* CryptoNative_BigNumFromBinary(const uint8_t* s, int32_t len) +BIGNUM* CryptoNative_BigNumFromBinary(const uint8_t* s, int32_t len) { if (!s || !len) { - return nullptr; + return NULL; } - return BN_bin2bn(s, len, nullptr); + return BN_bin2bn(s, len, NULL); } -extern "C" int32_t CryptoNative_BigNumToBinary(const BIGNUM* a, uint8_t* to) +int32_t CryptoNative_BigNumToBinary(const BIGNUM* a, uint8_t* to) { if (!a || !to) { @@ -32,7 +32,7 @@ extern "C" int32_t CryptoNative_BigNumToBinary(const BIGNUM* a, uint8_t* to) return BN_bn2bin(a, to); } -extern "C" int32_t CryptoNative_GetBigNumBytes(const BIGNUM* a) +int32_t CryptoNative_GetBigNumBytes(const BIGNUM* a) { if (!a) { diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_bignum.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_bignum.h index 19919c8141..79da9b89fb 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_bignum.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_bignum.h @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. #include "pal_types.h" +#include "pal_compiler.h" #include "opensslshim.h" /* @@ -15,19 +16,19 @@ No-op if a is null. The given BIGNUM pointer is invalid after this call. Always succeeds. */ -extern "C" void CryptoNative_BigNumDestroy(BIGNUM* a); +DLLEXPORT void CryptoNative_BigNumDestroy(BIGNUM* a); /* Shims the BN_bin2bn method. */ -extern "C" BIGNUM* CryptoNative_BigNumFromBinary(const uint8_t* s, int32_t len); +DLLEXPORT BIGNUM* CryptoNative_BigNumFromBinary(const uint8_t* s, int32_t len); /* Shims the BN_bn2bin method. */ -extern "C" int32_t CryptoNative_BigNumToBinary(const BIGNUM* a, uint8_t* to); +DLLEXPORT int32_t CryptoNative_BigNumToBinary(const BIGNUM* a, uint8_t* to); /* Returns the number of bytes needed to export a BIGNUM. */ -extern "C" int32_t CryptoNative_GetBigNumBytes(const BIGNUM* a); +DLLEXPORT int32_t CryptoNative_GetBigNumBytes(const BIGNUM* a); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_bio.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_bio.c similarity index 51% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_bio.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_bio.c index b4009d5c40..0e55e62966 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_bio.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_bio.c @@ -6,49 +6,49 @@ #include -extern "C" BIO* CryptoNative_CreateMemoryBio() +BIO* CryptoNative_CreateMemoryBio() { return BIO_new(BIO_s_mem()); } -extern "C" BIO* CryptoNative_BioNewFile(const char* filename, const char* mode) +BIO* CryptoNative_BioNewFile(const char* filename, const char* mode) { return BIO_new_file(filename, mode); } -extern "C" int32_t CryptoNative_BioDestroy(BIO* a) +int32_t CryptoNative_BioDestroy(BIO* a) { return BIO_free(a); } -extern "C" int32_t CryptoNative_BioGets(BIO* b, char* buf, int32_t size) +int32_t CryptoNative_BioGets(BIO* b, char* buf, int32_t size) { return BIO_gets(b, buf, size); } -extern "C" int32_t CryptoNative_BioRead(BIO* b, void* buf, int32_t len) +int32_t CryptoNative_BioRead(BIO* b, void* buf, int32_t len) { return BIO_read(b, buf, len); } -extern "C" int32_t CryptoNative_BioWrite(BIO* b, const void* buf, int32_t len) +int32_t CryptoNative_BioWrite(BIO* b, const void* buf, int32_t len) { return BIO_write(b, buf, len); } -extern "C" int32_t CryptoNative_GetMemoryBioSize(BIO* bio) +int32_t CryptoNative_GetMemoryBioSize(BIO* bio) { - long ret = BIO_get_mem_data(bio, nullptr); + long ret = BIO_get_mem_data(bio, NULL); // BIO_get_mem_data returns the memory size, which will always be // an int32. assert(ret <= INT32_MAX); - return static_cast(ret); + return (int32_t)ret; } -extern "C" int32_t CryptoNative_BioCtrlPending(BIO* bio) +int32_t CryptoNative_BioCtrlPending(BIO* bio) { size_t result = BIO_ctrl_pending(bio); assert(result <= INT32_MAX); - return static_cast(result); + return (int32_t)result; } diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_bio.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_bio.h index 6897dc1403..21a1989095 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_bio.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_bio.h @@ -3,17 +3,18 @@ // See the LICENSE file in the project root for more information. #include "pal_types.h" +#include "pal_compiler.h" #include "opensslshim.h" /* Creates a new memory-backed BIO instance. */ -extern "C" BIO* CryptoNative_CreateMemoryBio(); +DLLEXPORT BIO* CryptoNative_CreateMemoryBio(void); /* Direct shim to BIO_new_file. */ -extern "C" BIO* CryptoNative_BioNewFile(const char* filename, const char* mode); +DLLEXPORT BIO* CryptoNative_BioNewFile(const char* filename, const char* mode); /* Cleans up and deletes a BIO instance. @@ -24,33 +25,33 @@ Implemented by: No-op if a is null. The given BIO pointer is invalid after this call. */ -extern "C" int32_t CryptoNative_BioDestroy(BIO* a); +DLLEXPORT int32_t CryptoNative_BioDestroy(BIO* a); /* Direct shim to BIO_gets. */ -extern "C" int32_t CryptoNative_BioGets(BIO* b, char* buf, int32_t size); +DLLEXPORT int32_t CryptoNative_BioGets(BIO* b, char* buf, int32_t size); /* Direct shim to BIO_read. */ -extern "C" int32_t CryptoNative_BioRead(BIO* b, void* buf, int32_t len); +DLLEXPORT int32_t CryptoNative_BioRead(BIO* b, void* buf, int32_t len); /* Direct shim to BIO_write. */ -extern "C" int32_t CryptoNative_BioWrite(BIO* b, const void* buf, int32_t len); +DLLEXPORT int32_t CryptoNative_BioWrite(BIO* b, const void* buf, int32_t len); /* Gets the size of data available in the BIO. Shims the BIO_get_mem_data method. */ -extern "C" int32_t CryptoNative_GetMemoryBioSize(BIO* bio); +DLLEXPORT int32_t CryptoNative_GetMemoryBioSize(BIO* bio); /* Shims the BIO_ctrl_pending method. Returns the number of pending characters in the BIOs read and write buffers. */ -extern "C" int32_t CryptoNative_BioCtrlPending(BIO* bio); +DLLEXPORT int32_t CryptoNative_BioCtrlPending(BIO* bio); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_dsa.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_dsa.c similarity index 63% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_dsa.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_dsa.c index 50c53e315a..54ef433857 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_dsa.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_dsa.c @@ -5,20 +5,20 @@ #include "pal_dsa.h" #include "pal_utilities.h" -extern "C" int32_t CryptoNative_DsaUpRef(DSA* dsa) +int32_t CryptoNative_DsaUpRef(DSA* dsa) { return DSA_up_ref(dsa); } -extern "C" void CryptoNative_DsaDestroy(DSA* dsa) +void CryptoNative_DsaDestroy(DSA* dsa) { - if (dsa != nullptr) + if (dsa != NULL) { DSA_free(dsa); } } -extern "C" int32_t CryptoNative_DsaGenerateKey(DSA** dsa, int32_t bits) +int32_t CryptoNative_DsaGenerateKey(DSA** dsa, int32_t bits) { *dsa = DSA_new(); if (!dsa) @@ -27,47 +27,47 @@ extern "C" int32_t CryptoNative_DsaGenerateKey(DSA** dsa, int32_t bits) return 0; } - if (!DSA_generate_parameters_ex(*dsa, bits, nullptr, 0, nullptr, nullptr, nullptr) || + if (!DSA_generate_parameters_ex(*dsa, bits, NULL, 0, NULL, NULL, NULL) || !DSA_generate_key(*dsa)) { DSA_free(*dsa); - *dsa = nullptr; + *dsa = NULL; return 0; } return 1; } -extern "C" int32_t CryptoNative_DsaSizeSignature(DSA* dsa) +int32_t CryptoNative_DsaSizeSignature(DSA* dsa) { return DSA_size(dsa); } -extern "C" int32_t CryptoNative_DsaSizeP(DSA* dsa) +int32_t CryptoNative_DsaSizeP(DSA* dsa) { return BN_num_bytes(dsa->p); } -extern "C" int32_t CryptoNative_DsaSizeQ(DSA* dsa) +int32_t CryptoNative_DsaSizeQ(DSA* dsa) { return BN_num_bytes(dsa->q); } -extern "C" int32_t CryptoNative_DsaSign( +int32_t CryptoNative_DsaSign( DSA* dsa, const uint8_t* hash, int32_t hashLength, uint8_t* refsignature, int32_t* outSignatureLength) { - if (outSignatureLength == nullptr || dsa == nullptr) + if (outSignatureLength == NULL || dsa == NULL) { assert(false); return 0; } // DSA_OpenSSL() returns a shared pointer, no need to free/cache. - if (dsa->meth == DSA_OpenSSL() && dsa->priv_key == nullptr) + if (dsa->meth == DSA_OpenSSL() && dsa->priv_key == NULL) { *outSignatureLength = 0; ERR_PUT_error(ERR_LIB_DSA, DSA_F_DSA_DO_SIGN, DSA_R_MISSING_PARAMETERS, __FILE__, __LINE__); @@ -83,11 +83,11 @@ extern "C" int32_t CryptoNative_DsaSign( } assert(unsignedSigLen <= INT32_MAX); - *outSignatureLength = static_cast(unsignedSigLen); + *outSignatureLength = (int32_t)unsignedSigLen; return 1; } -extern "C" int32_t CryptoNative_DsaVerify( +int32_t CryptoNative_DsaVerify( DSA* dsa, const uint8_t* hash, int32_t hashLength, @@ -99,7 +99,8 @@ extern "C" int32_t CryptoNative_DsaVerify( { if (success == -1) { - // Clear the queue, as we don't check the error information + // Clear the queue, as we don't check the error information. + // Managed caller expects the error queue to be cleared in case of error. ERR_clear_error(); } return 0; @@ -108,7 +109,7 @@ extern "C" int32_t CryptoNative_DsaVerify( return 1; } -extern "C" int32_t CryptoNative_GetDsaParameters( +int32_t CryptoNative_GetDsaParameters( const DSA* dsa, BIGNUM** p, int32_t* pLength, BIGNUM** q, int32_t* qLength, @@ -121,11 +122,11 @@ extern "C" int32_t CryptoNative_GetDsaParameters( assert(false); // since these parameters are 'out' parameters in managed code, ensure they are initialized - if (p) *p = nullptr; if (pLength) *pLength = 0; - if (q) *q = nullptr; if (qLength) *qLength = 0; - if (g) *g = nullptr; if (gLength) *gLength = 0; - if (y) *y = nullptr; if (yLength) *yLength = 0; - if (x) *x = nullptr; if (xLength) *xLength = 0; + if (p) *p = NULL; if (pLength) *pLength = 0; + if (q) *q = NULL; if (qLength) *qLength = 0; + if (g) *g = NULL; if (gLength) *gLength = 0; + if (y) *y = NULL; if (yLength) *yLength = 0; + if (x) *x = NULL; if (xLength) *xLength = 0; return 0; } @@ -136,29 +137,34 @@ extern "C" int32_t CryptoNative_GetDsaParameters( // dsa->priv_key is optional *x = dsa->priv_key; - *xLength = (*x == nullptr) ? 0 : BN_num_bytes(*x); + *xLength = (*x == NULL) ? 0 : BN_num_bytes(*x); return 1; } -static void SetDsaParameter(BIGNUM** dsaFieldAddress, uint8_t* buffer, int32_t bufferLength) +static int32_t SetDsaParameter(BIGNUM** dsaFieldAddress, uint8_t* buffer, int32_t bufferLength) { - assert(dsaFieldAddress != nullptr); + assert(dsaFieldAddress != NULL); if (dsaFieldAddress) { if (!buffer || !bufferLength) { - *dsaFieldAddress = nullptr; + *dsaFieldAddress = NULL; + return 1; } else { - BIGNUM* bigNum = BN_bin2bn(buffer, bufferLength, nullptr); + BIGNUM* bigNum = BN_bin2bn(buffer, bufferLength, NULL); *dsaFieldAddress = bigNum; + + return bigNum != NULL; } } + + return 0; } -extern "C" int32_t CryptoNative_DsaKeyCreateByExplicitParameters( +int32_t CryptoNative_DsaKeyCreateByExplicitParameters( DSA** outDsa, uint8_t* p, int32_t pLength, @@ -185,11 +191,10 @@ extern "C" int32_t CryptoNative_DsaKeyCreateByExplicitParameters( DSA* dsa = *outDsa; - SetDsaParameter(&dsa->p, p, pLength); - SetDsaParameter(&dsa->q, q, qLength); - SetDsaParameter(&dsa->g, g, gLength); - SetDsaParameter(&dsa->pub_key, y, yLength); - SetDsaParameter(&dsa->priv_key, x, xLength); - - return 1; + return + SetDsaParameter(&dsa->p, p, pLength) && + SetDsaParameter(&dsa->q, q, qLength) && + SetDsaParameter(&dsa->g, g, gLength) && + SetDsaParameter(&dsa->pub_key, y, yLength) && + SetDsaParameter(&dsa->priv_key, x, xLength); } diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_dsa.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_dsa.h index ede7065992..2e60536ae0 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_dsa.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_dsa.h @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. #include "pal_types.h" +#include "pal_compiler.h" #include "opensslshim.h" /* @@ -10,14 +11,14 @@ Shims the DSA_new method. Returns the new DSA instance. */ -extern "C" DSA* CryptoNative_DsaCreate(); +DLLEXPORT DSA* CryptoNative_DsaCreate(void); /* Shims the DSA_up_ref method. Returns 1 upon success, otherwise 0. */ -extern "C" int32_t CryptoNative_DsaUpRef(DSA* dsa); +DLLEXPORT int32_t CryptoNative_DsaUpRef(DSA* dsa); /* Cleans up and deletes a DSA instance. @@ -28,38 +29,38 @@ No-op if dsa is null. The given DSA pointer is invalid after this call. Always succeeds. */ -extern "C" void CryptoNative_DsaDestroy(DSA* dsa); +DLLEXPORT void CryptoNative_DsaDestroy(DSA* dsa); /* Shims the DSA_generate_key_ex method. Returns 1 upon success, otherwise 0. */ -extern "C" int32_t CryptoNative_DsaGenerateKey(DSA** dsa, int32_t bits); +DLLEXPORT int32_t CryptoNative_DsaGenerateKey(DSA** dsa, int32_t bits); /* Shims the DSA_size method. Returns the size of the ASN.1 encoded signature. */ -extern "C" int32_t CryptoNative_DsaSizeSignature(DSA* dsa); +DLLEXPORT int32_t CryptoNative_DsaSizeSignature(DSA* dsa); /* Returns the size of the p parameter in bytes. */ -extern "C" int32_t CryptoNative_DsaSizeP(DSA* dsa); +DLLEXPORT int32_t CryptoNative_DsaSizeP(DSA* dsa); /* Returns the size of the q parameter in bytes. */ -extern "C" int32_t CryptoNative_DsaSizeQ(DSA* dsa); +DLLEXPORT int32_t CryptoNative_DsaSizeQ(DSA* dsa); /* Shims the DSA_sign method. Returns 1 upon success, otherwise 0. */ -extern "C" int32_t +DLLEXPORT int32_t CryptoNative_DsaSign( DSA* dsa, const uint8_t* hash, @@ -72,7 +73,7 @@ Shims the DSA_verify method. Returns 1 upon success, otherwise 0. */ -extern "C" int32_t +DLLEXPORT int32_t CryptoNative_DsaVerify( DSA* dsa, const uint8_t* hash, @@ -85,7 +86,7 @@ Gets all the parameters from the DSA instance. Returns 1 upon success, otherwise 0. */ -extern "C" int32_t CryptoNative_GetDsaParameters( +DLLEXPORT int32_t CryptoNative_GetDsaParameters( const DSA* dsa, BIGNUM** p, int32_t* pLength, BIGNUM** q, int32_t* qLength, @@ -96,7 +97,7 @@ extern "C" int32_t CryptoNative_GetDsaParameters( /* Sets all the parameters on the DSA instance. */ -extern "C" int32_t CryptoNative_DsaKeyCreateByExplicitParameters( +DLLEXPORT int32_t CryptoNative_DsaKeyCreateByExplicitParameters( DSA** dsa, uint8_t* p, int32_t pLength, diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ecc_import_export.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ecc_import_export.c similarity index 67% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ecc_import_export.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ecc_import_export.c index 7d1c99469a..f605e698ed 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ecc_import_export.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ecc_import_export.c @@ -5,51 +5,51 @@ #include "pal_ecc_import_export.h" #include "pal_utilities.h" -ECCurveType MethodToCurveType(EC_METHOD* method) +static ECCurveType MethodToCurveType(EC_METHOD* method) { if (method == EC_GFp_mont_method()) - return ECCurveType::PrimeMontgomery; + return PrimeMontgomery; int fieldType = EC_METHOD_get_field_type(method); if (fieldType == NID_X9_62_characteristic_two_field) - return ECCurveType::Characteristic2; + return Characteristic2; if (fieldType == NID_X9_62_prime_field) - return ECCurveType::PrimeShortWeierstrass; + return PrimeShortWeierstrass; - return ECCurveType::Unspecified; + return Unspecified; } -const EC_METHOD* CurveTypeToMethod(ECCurveType curveType) +static const EC_METHOD* CurveTypeToMethod(ECCurveType curveType) { - if (curveType == ECCurveType::PrimeShortWeierstrass) + if (curveType == PrimeShortWeierstrass) return EC_GFp_simple_method(); - if (curveType == ECCurveType::PrimeMontgomery) + if (curveType == PrimeMontgomery) return EC_GFp_mont_method(); #if HAVE_OPENSSL_EC2M - if (API_EXISTS(EC_GF2m_simple_method) && (curveType == ECCurveType::Characteristic2)) + if (API_EXISTS(EC_GF2m_simple_method) && (curveType == Characteristic2)) return EC_GF2m_simple_method(); #endif - return nullptr; //Edwards and others + return NULL; //Edwards and others } -extern "C" ECCurveType CryptoNative_EcKeyGetCurveType( +ECCurveType CryptoNative_EcKeyGetCurveType( const EC_KEY* key) { const EC_GROUP* group = EC_KEY_get0_group(key); - if (!group) return ECCurveType::Unspecified; + if (!group) return Unspecified; const EC_METHOD* method = EC_GROUP_method_of(group); - if (!method) return ECCurveType::Unspecified; + if (!method) return Unspecified; - return MethodToCurveType(const_cast(method)); + return MethodToCurveType(method); } -extern "C" int32_t CryptoNative_GetECKeyParameters( +int32_t CryptoNative_GetECKeyParameters( const EC_KEY* key, int32_t includePrivate, BIGNUM** qx, int32_t* cbQx, @@ -65,22 +65,22 @@ extern "C" int32_t CryptoNative_GetECKeyParameters( assert(false); // Since these parameters are 'out' parameters in managed code, ensure they are initialized - if (qx) *qx = nullptr; if (cbQx) *cbQx = 0; - if (qy) *qy = nullptr; if (cbQy) *cbQy = 0; - if (d) *d = nullptr; if (cbD) *cbD = 0; + if (qx) *qx = NULL; if (cbQx) *cbQx = 0; + if (qy) *qy = NULL; if (cbQy) *cbQy = 0; + if (d) *d = NULL; if (cbD) *cbD = 0; return 0; } // Get the public key and curve int rc = 0; - BIGNUM *xBn = nullptr; - BIGNUM *yBn = nullptr; + BIGNUM *xBn = NULL; + BIGNUM *yBn = NULL; ECCurveType curveType = CryptoNative_EcKeyGetCurveType(key); const EC_POINT* Q = EC_KEY_get0_public_key(key); const EC_GROUP* group = EC_KEY_get0_group(key); - if (curveType == ECCurveType::Unspecified || !Q || !group) + if (curveType == Unspecified || !Q || !group) goto error; // Extract qx and qy @@ -90,15 +90,15 @@ extern "C" int32_t CryptoNative_GetECKeyParameters( goto error; #if HAVE_OPENSSL_EC2M - if (API_EXISTS(EC_POINT_get_affine_coordinates_GF2m) && (curveType == ECCurveType::Characteristic2)) + if (API_EXISTS(EC_POINT_get_affine_coordinates_GF2m) && (curveType == Characteristic2)) { - if (!EC_POINT_get_affine_coordinates_GF2m(group, Q, xBn, yBn, nullptr)) + if (!EC_POINT_get_affine_coordinates_GF2m(group, Q, xBn, yBn, NULL)) goto error; } else #endif { - if (!EC_POINT_get_affine_coordinates_GFp(group, Q, xBn, yBn, nullptr)) + if (!EC_POINT_get_affine_coordinates_GFp(group, Q, xBn, yBn, NULL)) goto error; } @@ -109,9 +109,9 @@ extern "C" int32_t CryptoNative_GetECKeyParameters( if (includePrivate) { const BIGNUM* const_bignum_privateKey = EC_KEY_get0_private_key(key); - if (const_bignum_privateKey != nullptr) + if (const_bignum_privateKey != NULL) { - *d = const_cast(const_bignum_privateKey); + *d = const_bignum_privateKey; *cbD = BN_num_bytes(*d); } else @@ -123,7 +123,7 @@ extern "C" int32_t CryptoNative_GetECKeyParameters( else { if (d) - *d = nullptr; + *d = NULL; if (cbD) *cbD = 0; @@ -135,14 +135,14 @@ extern "C" int32_t CryptoNative_GetECKeyParameters( error: *cbQx = *cbQy = 0; *qx = *qy = 0; - if (d) *d = nullptr; + if (d) *d = NULL; if (cbD) *cbD = 0; if (xBn) BN_free(xBn); if (yBn) BN_free(yBn); return rc; } -extern "C" int32_t CryptoNative_GetECCurveParameters( +int32_t CryptoNative_GetECCurveParameters( const EC_KEY* key, int32_t includePrivate, ECCurveType* curveType, @@ -174,29 +174,29 @@ extern "C" int32_t CryptoNative_GetECCurveParameters( assert(false); // Since these parameters are 'out' parameters in managed code, ensure they are initialized - if (p) *p = nullptr; if (cbP) *cbP = 0; - if (a) *a = nullptr; if (cbA) *cbA = 0; - if (b) *b = nullptr; if (cbB) *cbB = 0; - if (gx) *gx = nullptr; if (cbGx) *cbGx = 0; - if (gy) *gy = nullptr; if (cbGy) *cbGy = 0; - if (order) *order = nullptr; if (cbOrder) *cbOrder = 0; - if (cofactor) *cofactor = nullptr; if (cbCofactor) *cbCofactor = 0; - if (seed) *seed = nullptr; if (cbSeed) *cbSeed = 0; + if (p) *p = NULL; if (cbP) *cbP = 0; + if (a) *a = NULL; if (cbA) *cbA = 0; + if (b) *b = NULL; if (cbB) *cbB = 0; + if (gx) *gx = NULL; if (cbGx) *cbGx = 0; + if (gy) *gy = NULL; if (cbGy) *cbGy = 0; + if (order) *order = NULL; if (cbOrder) *cbOrder = 0; + if (cofactor) *cofactor = NULL; if (cbCofactor) *cbCofactor = 0; + if (seed) *seed = NULL; if (cbSeed) *cbSeed = 0; return 0; } - EC_GROUP* group = nullptr; - EC_POINT* G = nullptr; - EC_METHOD* curveMethod = nullptr; - BIGNUM* xBn = nullptr; - BIGNUM* yBn = nullptr; - BIGNUM* pBn = nullptr; - BIGNUM* aBn = nullptr; - BIGNUM* bBn = nullptr; - BIGNUM* orderBn = nullptr; - BIGNUM* cofactorBn = nullptr; - BIGNUM* seedBn = nullptr; + EC_GROUP* group = NULL; + EC_POINT* G = NULL; + EC_METHOD* curveMethod = NULL; + BIGNUM* xBn = NULL; + BIGNUM* yBn = NULL; + BIGNUM* pBn = NULL; + BIGNUM* aBn = NULL; + BIGNUM* bBn = NULL; + BIGNUM* orderBn = NULL; + BIGNUM* cofactorBn = NULL; + BIGNUM* seedBn = NULL; // Exit if CryptoNative_GetECKeyParameters failed if (rc != 1) @@ -213,38 +213,38 @@ extern "C" int32_t CryptoNative_GetECCurveParameters( if (!xBn || !yBn || !pBn || !aBn || !bBn || !orderBn || !cofactorBn) goto error; - group = const_cast(EC_KEY_get0_group(key)); // curve + group = EC_KEY_get0_group(key); // curve if (!group) goto error; - curveMethod = const_cast(EC_GROUP_method_of(group)); + curveMethod = EC_GROUP_method_of(group); if (!curveMethod) goto error; *curveType = MethodToCurveType(curveMethod); - if (*curveType == ECCurveType::Unspecified) + if (*curveType == Unspecified) goto error; // Extract p, a, b #if HAVE_OPENSSL_EC2M - if (API_EXISTS(EC_GROUP_get_curve_GF2m) && (*curveType == ECCurveType::Characteristic2)) + if (API_EXISTS(EC_GROUP_get_curve_GF2m) && (*curveType == Characteristic2)) { // pBn represents the binary polynomial - if (!EC_GROUP_get_curve_GF2m(group, pBn, aBn, bBn, nullptr)) + if (!EC_GROUP_get_curve_GF2m(group, pBn, aBn, bBn, NULL)) goto error; } else #endif { // pBn represents the prime - if (!EC_GROUP_get_curve_GFp(group, pBn, aBn, bBn, nullptr)) + if (!EC_GROUP_get_curve_GFp(group, pBn, aBn, bBn, NULL)) goto error; } // Extract gx and gy - G = const_cast(EC_GROUP_get0_generator(group)); + G = EC_GROUP_get0_generator(group); #if HAVE_OPENSSL_EC2M - if (API_EXISTS(EC_POINT_get_affine_coordinates_GF2m) && (*curveType == ECCurveType::Characteristic2)) + if (API_EXISTS(EC_POINT_get_affine_coordinates_GF2m) && (*curveType == Characteristic2)) { if (!EC_POINT_get_affine_coordinates_GF2m(group, G, xBn, yBn, NULL)) goto error; @@ -257,18 +257,18 @@ extern "C" int32_t CryptoNative_GetECCurveParameters( } // Extract order (n) - if (!EC_GROUP_get_order(group, orderBn, nullptr)) + if (!EC_GROUP_get_order(group, orderBn, NULL)) goto error; // Extract cofactor (h) - if (!EC_GROUP_get_cofactor(group, cofactorBn, nullptr)) + if (!EC_GROUP_get_cofactor(group, cofactorBn, NULL)) goto error; // Extract seed (optional) if (EC_GROUP_get0_seed(group)) { seedBn = BN_bin2bn(EC_GROUP_get0_seed(group), - static_cast(EC_GROUP_get_seed_len(group)), NULL); + (int)EC_GROUP_get_seed_len(group), NULL); *seed = seedBn; *cbSeed = BN_num_bytes(seedBn); @@ -282,7 +282,7 @@ extern "C" int32_t CryptoNative_GetECCurveParameters( } else { - *seed = nullptr; + *seed = NULL; *cbSeed = 0; } @@ -301,14 +301,14 @@ extern "C" int32_t CryptoNative_GetECCurveParameters( error: // Clear out variables from CryptoNative_GetECKeyParameters *cbQx = *cbQy = 0; - *qx = *qy = nullptr; - if (d) *d = nullptr; + *qx = *qy = NULL; + if (d) *d = NULL; if (cbD) *cbD = 0; // Clear our out variables - *curveType = ECCurveType::Unspecified; + *curveType = Unspecified; *cbP = *cbA = *cbB = *cbGx = *cbGy = *cbOrder = *cbCofactor = *cbSeed = 0; - *p = *a = *b = *gx = *gy = *order = *cofactor = *seed = nullptr; + *p = *a = *b = *gx = *gy = *order = *cofactor = *seed = NULL; if (xBn) BN_free(xBn); if (yBn) BN_free(yBn); @@ -323,7 +323,7 @@ exit: return rc; } -extern "C" int32_t CryptoNative_EcKeyCreateByKeyParameters(EC_KEY** key, const char* oid, uint8_t* qx, int32_t qxLength, uint8_t* qy, int32_t qyLength, uint8_t* d, int32_t dLength) +int32_t CryptoNative_EcKeyCreateByKeyParameters(EC_KEY** key, const char* oid, uint8_t* qx, int32_t qxLength, uint8_t* qy, int32_t qyLength, uint8_t* d, int32_t dLength) { if (!key || !oid) { @@ -331,7 +331,7 @@ extern "C" int32_t CryptoNative_EcKeyCreateByKeyParameters(EC_KEY** key, const c return 0; } - *key = nullptr; + *key = NULL; // oid can be friendly name or value int nid = OBJ_txt2nid(oid); @@ -342,15 +342,15 @@ extern "C" int32_t CryptoNative_EcKeyCreateByKeyParameters(EC_KEY** key, const c if (!(*key)) return -1; - BIGNUM* dBn = nullptr; - BIGNUM* qxBn = nullptr; - BIGNUM* qyBn = nullptr; + BIGNUM* dBn = NULL; + BIGNUM* qxBn = NULL; + BIGNUM* qyBn = NULL; // If key values specified, use them, otherwise a key will be generated later if (qx && qy) { - qxBn = BN_bin2bn(qx, qxLength, nullptr); - qyBn = BN_bin2bn(qy, qyLength, nullptr); + qxBn = BN_bin2bn(qx, qxLength, NULL); + qyBn = BN_bin2bn(qy, qyLength, NULL); if (!qxBn || !qyBn) goto error; @@ -360,7 +360,7 @@ extern "C" int32_t CryptoNative_EcKeyCreateByKeyParameters(EC_KEY** key, const c // Set private key (optional) if (d && dLength > 0) { - dBn = BN_bin2bn(d, dLength, nullptr); + dBn = BN_bin2bn(d, dLength, NULL); if (!dBn) goto error; @@ -383,12 +383,12 @@ error: if (*key) { EC_KEY_free(*key); - *key = nullptr; + *key = NULL; } return 0; } -extern "C" EC_KEY* CryptoNative_EcKeyCreateByExplicitParameters( +EC_KEY* CryptoNative_EcKeyCreateByExplicitParameters( ECCurveType curveType, uint8_t* qx, int32_t qxLength, uint8_t* qy, int32_t qyLength, @@ -409,75 +409,75 @@ extern "C" EC_KEY* CryptoNative_EcKeyCreateByExplicitParameters( return 0; } - EC_KEY* key = nullptr; - EC_POINT* G = nullptr; + EC_KEY* key = NULL; + EC_POINT* G = NULL; - BIGNUM* qxBn = nullptr; - BIGNUM* qyBn = nullptr; - BIGNUM* dBn = nullptr; - BIGNUM* pBn = nullptr; // p = either the char2 polynomial or the prime - BIGNUM* aBn = nullptr; - BIGNUM* bBn = nullptr; - BIGNUM* gxBn = nullptr; - BIGNUM* gyBn = nullptr; - BIGNUM* orderBn = nullptr; - BIGNUM* cofactorBn = nullptr; + BIGNUM* qxBn = NULL; + BIGNUM* qyBn = NULL; + BIGNUM* dBn = NULL; + BIGNUM* pBn = NULL; // p = either the char2 polynomial or the prime + BIGNUM* aBn = NULL; + BIGNUM* bBn = NULL; + BIGNUM* gxBn = NULL; + BIGNUM* gyBn = NULL; + BIGNUM* orderBn = NULL; + BIGNUM* cofactorBn = NULL; // Create the group. Explicitly specify the curve type because using EC_GROUP_new_curve_GFp // will default to montgomery curve const EC_METHOD* curveMethod = CurveTypeToMethod(curveType); - if (!curveMethod) return nullptr; + if (!curveMethod) return NULL; EC_GROUP* group = EC_GROUP_new(curveMethod); - if (!group) return nullptr; + if (!group) return NULL; - pBn = BN_bin2bn(p, pLength, nullptr); + pBn = BN_bin2bn(p, pLength, NULL); // At this point we should use 'goto error' since we allocated memory - aBn = BN_bin2bn(a, aLength, nullptr); - bBn = BN_bin2bn(b, bLength, nullptr); + aBn = BN_bin2bn(a, aLength, NULL); + bBn = BN_bin2bn(b, bLength, NULL); #if HAVE_OPENSSL_EC2M - if (API_EXISTS(EC_GROUP_set_curve_GF2m) && (curveType == ECCurveType::Characteristic2)) + if (API_EXISTS(EC_GROUP_set_curve_GF2m) && (curveType == Characteristic2)) { - if (!EC_GROUP_set_curve_GF2m(group, pBn, aBn, bBn, nullptr)) + if (!EC_GROUP_set_curve_GF2m(group, pBn, aBn, bBn, NULL)) goto error; } else #endif { - if (!EC_GROUP_set_curve_GFp(group, pBn, aBn, bBn, nullptr)) + if (!EC_GROUP_set_curve_GFp(group, pBn, aBn, bBn, NULL)) goto error; } // Set generator, order and cofactor G = EC_POINT_new(group); - gxBn = BN_bin2bn(gx, gxLength, nullptr); - gyBn = BN_bin2bn(gy, gyLength, nullptr); + gxBn = BN_bin2bn(gx, gxLength, NULL); + gyBn = BN_bin2bn(gy, gyLength, NULL); #if HAVE_OPENSSL_EC2M - if (API_EXISTS(EC_POINT_set_affine_coordinates_GF2m) && (curveType == ECCurveType::Characteristic2)) + if (API_EXISTS(EC_POINT_set_affine_coordinates_GF2m) && (curveType == Characteristic2)) { - EC_POINT_set_affine_coordinates_GF2m(group, G, gxBn, gyBn, nullptr); + EC_POINT_set_affine_coordinates_GF2m(group, G, gxBn, gyBn, NULL); } else #endif { - EC_POINT_set_affine_coordinates_GFp(group, G, gxBn, gyBn, nullptr); + EC_POINT_set_affine_coordinates_GFp(group, G, gxBn, gyBn, NULL); } - orderBn = BN_bin2bn(order, orderLength, nullptr); - cofactorBn = BN_bin2bn(cofactor, cofactorLength, nullptr); + orderBn = BN_bin2bn(order, orderLength, NULL); + cofactorBn = BN_bin2bn(cofactor, cofactorLength, NULL); EC_GROUP_set_generator(group, G, orderBn, cofactorBn); // Set seed (optional) if (seed && seedLength > 0) { - if (!EC_GROUP_set_seed(group, seed, static_cast(seedLength))) + if (!EC_GROUP_set_seed(group, seed, (size_t)seedLength)) goto error; } // Validate group - if (!EC_GROUP_check(group, nullptr)) + if (!EC_GROUP_check(group, NULL)) goto error; // Create key @@ -491,8 +491,8 @@ extern "C" EC_KEY* CryptoNative_EcKeyCreateByExplicitParameters( // Set the public and private key values if (qx && qy) { - qxBn = BN_bin2bn(qx, qxLength, nullptr); - qyBn = BN_bin2bn(qy, qyLength, nullptr); + qxBn = BN_bin2bn(qx, qxLength, NULL); + qyBn = BN_bin2bn(qy, qyLength, NULL); if (!qxBn || !qyBn) goto error; @@ -502,7 +502,7 @@ extern "C" EC_KEY* CryptoNative_EcKeyCreateByExplicitParameters( // Set private key (optional) if (d && dLength) { - dBn = BN_bin2bn(d, dLength, nullptr); + dBn = BN_bin2bn(d, dLength, NULL); if (!dBn) goto error; @@ -532,5 +532,5 @@ error: if (G) EC_POINT_free(G); if (group) EC_GROUP_free(group); if (key) EC_KEY_free(key); - return nullptr; + return NULL; } diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ecc_import_export.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ecc_import_export.h index b138a080e6..f6fc6e0065 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ecc_import_export.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ecc_import_export.h @@ -3,9 +3,11 @@ // See the LICENSE file in the project root for more information. #include "pal_types.h" +#include "pal_compiler.h" #include "opensslshim.h" -typedef enum : int32_t { +typedef enum +{ Unspecified = 0, PrimeShortWeierstrass = 1, PrimeTwistedEdwards = 2, @@ -17,13 +19,13 @@ typedef enum : int32_t { /* Returns the ECCurveType given the key. */ -extern "C" ECCurveType CryptoNative_EcKeyGetCurveType( +DLLEXPORT ECCurveType CryptoNative_EcKeyGetCurveType( const EC_KEY* key); /* Returns the ECC key parameters. */ -extern "C" int32_t CryptoNative_GetECKeyParameters( +DLLEXPORT int32_t CryptoNative_GetECKeyParameters( const EC_KEY* key, int32_t includePrivate, BIGNUM** qx, int32_t* cbQx, @@ -33,7 +35,7 @@ extern "C" int32_t CryptoNative_GetECKeyParameters( /* Returns the ECC key and curve parameters. */ -extern "C" int32_t CryptoNative_GetECCurveParameters( +DLLEXPORT int32_t CryptoNative_GetECCurveParameters( const EC_KEY* key, int32_t includePrivate, ECCurveType* curveType, @@ -53,7 +55,7 @@ extern "C" int32_t CryptoNative_GetECCurveParameters( Creates the new EC_KEY instance using the curve oid (friendly name or value) and public key parameters. Returns 1 upon success, -1 if oid was not found, otherwise 0. */ -extern "C" int32_t CryptoNative_EcKeyCreateByKeyParameters( +DLLEXPORT int32_t CryptoNative_EcKeyCreateByKeyParameters( EC_KEY** key, const char* oid, uint8_t* qx, int32_t qxLength, @@ -63,7 +65,7 @@ extern "C" int32_t CryptoNative_EcKeyCreateByKeyParameters( /* Returns the new EC_KEY instance using the explicit parameters. */ -extern "C" EC_KEY* CryptoNative_EcKeyCreateByExplicitParameters( +DLLEXPORT EC_KEY* CryptoNative_EcKeyCreateByExplicitParameters( ECCurveType curveType, uint8_t* qx, int32_t qxLength, uint8_t* qy, int32_t qyLength, diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ecdsa.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ecdsa.c similarity index 77% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ecdsa.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ecdsa.c index 1e61f09f9a..27889bbf90 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ecdsa.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ecdsa.c @@ -5,7 +5,7 @@ #include "pal_ecdsa.h" #include "pal_utilities.h" -extern "C" int32_t +int32_t CryptoNative_EcDsaSign(const uint8_t* dgst, int32_t dgstlen, uint8_t* sig, int32_t* siglen, EC_KEY* key) { if (!siglen) @@ -13,19 +13,19 @@ CryptoNative_EcDsaSign(const uint8_t* dgst, int32_t dgstlen, uint8_t* sig, int32 return 0; } - unsigned int unsignedSigLength = UnsignedCast(*siglen); + unsigned int unsignedSigLength = Int32ToUint32(*siglen); int ret = ECDSA_sign(0, dgst, dgstlen, sig, &unsignedSigLength, key); - *siglen = SignedCast(unsignedSigLength); + *siglen = Uint32ToInt32(unsignedSigLength); return ret; } -extern "C" int32_t +int32_t CryptoNative_EcDsaVerify(const uint8_t* dgst, int32_t dgstlen, const uint8_t* sig, int32_t siglen, EC_KEY* key) { return ECDSA_verify(0, dgst, dgstlen, sig, siglen, key); } -extern "C" int32_t CryptoNative_EcDsaSize(const EC_KEY* key) +int32_t CryptoNative_EcDsaSize(const EC_KEY* key) { return ECDSA_size(key); } diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ecdsa.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ecdsa.h index 13ed17bb29..ccc47c9568 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ecdsa.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ecdsa.h @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. #include "pal_types.h" +#include "pal_compiler.h" #include "opensslshim.h" /* @@ -10,7 +11,7 @@ Shims the ECDSA_sign method. Returns 1 on success, otherwise 0. */ -extern "C" int32_t +DLLEXPORT int32_t CryptoNative_EcDsaSign(const uint8_t* dgst, int32_t dgstlen, uint8_t* sig, int32_t* siglen, EC_KEY* key); /* @@ -18,7 +19,7 @@ Shims the ECDSA_verify method. Returns 1 for a correct signature, 0 for an incorrect signature, -1 on error. */ -extern "C" int32_t +DLLEXPORT int32_t CryptoNative_EcDsaVerify(const uint8_t* dgst, int32_t dgstlen, const uint8_t* sig, int32_t siglen, EC_KEY* key); /* @@ -26,4 +27,4 @@ Shims the ECDSA_size method. Returns the maximum length of a DER encoded ECDSA signature created with this key. */ -extern "C" int32_t CryptoNative_EcDsaSize(const EC_KEY* key); +DLLEXPORT int32_t CryptoNative_EcDsaSize(const EC_KEY* key); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_eckey.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_eckey.c similarity index 68% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_eckey.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_eckey.c index 9a5a2a3662..77b598e333 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_eckey.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_eckey.c @@ -6,25 +6,25 @@ #include -extern "C" void CryptoNative_EcKeyDestroy(EC_KEY* r) +void CryptoNative_EcKeyDestroy(EC_KEY* r) { EC_KEY_free(r); } // For backwards compatibility -extern "C" EC_KEY* CryptoNative_EcKeyCreateByCurveName(int32_t nid) +EC_KEY* CryptoNative_EcKeyCreateByCurveName(int32_t nid) { return EC_KEY_new_by_curve_name(nid); } -extern "C" EC_KEY* CryptoNative_EcKeyCreateByOid(const char* oid) +EC_KEY* CryptoNative_EcKeyCreateByOid(const char* oid) { // oid can be friendly name or value int nid = OBJ_txt2nid(oid); return CryptoNative_EcKeyCreateByCurveName(nid); } -extern "C" int32_t CryptoNative_EcKeyGenerateKey(EC_KEY* eckey) +int32_t CryptoNative_EcKeyGenerateKey(EC_KEY* eckey) { if (!EC_KEY_generate_key(eckey)) return 0; @@ -32,12 +32,12 @@ extern "C" int32_t CryptoNative_EcKeyGenerateKey(EC_KEY* eckey) return EC_KEY_check_key(eckey); } -extern "C" int32_t CryptoNative_EcKeyUpRef(EC_KEY* r) +int32_t CryptoNative_EcKeyUpRef(EC_KEY* r) { return EC_KEY_up_ref(r); } -extern "C" int32_t CryptoNative_EcKeyGetSize(const EC_KEY* key, int32_t* keySize) +int32_t CryptoNative_EcKeyGetSize(const EC_KEY* key, int32_t* keySize) { if (!keySize) return 0; @@ -57,15 +57,15 @@ extern "C" int32_t CryptoNative_EcKeyGetSize(const EC_KEY* key, int32_t* keySize } // For backwards compatibility -extern "C" int32_t CryptoNative_EcKeyGetCurveName(const EC_KEY* key) +int32_t CryptoNative_EcKeyGetCurveName(const EC_KEY* key) { - if (key == nullptr) + if (key == NULL) { return NID_undef; } const EC_GROUP* group = EC_KEY_get0_group(key); - if (group == nullptr) + if (group == NULL) { return NID_undef; } @@ -73,7 +73,7 @@ extern "C" int32_t CryptoNative_EcKeyGetCurveName(const EC_KEY* key) return EC_GROUP_get_curve_name(group); } -extern "C" int32_t CryptoNative_EcKeyGetCurveName2(const EC_KEY* key, int32_t* nidName) +int32_t CryptoNative_EcKeyGetCurveName2(const EC_KEY* key, int32_t* nidName) { if (!nidName) return 0; diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_eckey.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_eckey.h index 4f180c9007..a590d356f6 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_eckey.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_eckey.h @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. #include "pal_types.h" +#include "pal_compiler.h" #include "opensslshim.h" /* @@ -14,51 +15,51 @@ No-op if r is null. The given EC_KEY pointer is invalid after this call. Always succeeds. */ -extern "C" void CryptoNative_EcKeyDestroy(EC_KEY* r); +DLLEXPORT void CryptoNative_EcKeyDestroy(EC_KEY* r); /* Shims the EC_KEY_new_by_curve_name method. Returns the new EC_KEY instance. */ -extern "C" EC_KEY* CryptoNative_EcKeyCreateByCurveName(int32_t nid); +DLLEXPORT EC_KEY* CryptoNative_EcKeyCreateByCurveName(int32_t nid); /* Shims the EC_KEY_new_by_curve_name method. Returns the new EC_KEY instance. */ -extern "C" EC_KEY* CryptoNative_EcKeyCreateByOid(const char* oid); +DLLEXPORT EC_KEY* CryptoNative_EcKeyCreateByOid(const char* oid); /* Shims the EC_KEY_generate_key method. Returns 1 upon success, otherwise 0. */ -extern "C" int32_t CryptoNative_EcKeyGenerateKey(EC_KEY* eckey); +DLLEXPORT int32_t CryptoNative_EcKeyGenerateKey(EC_KEY* eckey); /* Shims the EC_KEY_up_ref method. Returns 1 upon success, otherwise 0. */ -extern "C" int32_t CryptoNative_EcKeyUpRef(EC_KEY* r); +DLLEXPORT int32_t CryptoNative_EcKeyUpRef(EC_KEY* r); /* Gets the key size in bits for the specified EC_KEY. Returns 1 upon success, otherwise 0. */ -extern "C" int32_t CryptoNative_EcKeyGetSize(const EC_KEY* key, int32_t* keySize); +DLLEXPORT int32_t CryptoNative_EcKeyGetSize(const EC_KEY* key, int32_t* keySize); /* Gets the NID of the curve name as an oid value for the specified EC_KEY. */ -extern "C" int32_t CryptoNative_EcKeyGetCurveName(const EC_KEY* key); +DLLEXPORT int32_t CryptoNative_EcKeyGetCurveName(const EC_KEY* key); /* Gets the NID of the curve name as an oid value for the specified EC_KEY. Returns 1 upon success, otherwise 0. */ -extern "C" int32_t CryptoNative_EcKeyGetCurveName2(const EC_KEY* key, int32_t* nidName); +DLLEXPORT int32_t CryptoNative_EcKeyGetCurveName2(const EC_KEY* key, int32_t* nidName); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_err.c b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_err.c new file mode 100644 index 0000000000..b8f9ed6a44 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_err.c @@ -0,0 +1,48 @@ +// 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. + +#include "pal_err.h" +#include "pal_utilities.h" + +void CryptoNative_ErrClearError() +{ + ERR_clear_error(); +} + +uint64_t CryptoNative_ErrGetError() +{ + return ERR_get_error(); +} + +uint64_t CryptoNative_ErrGetErrorAlloc(int32_t* isAllocFailure) +{ + unsigned long err = ERR_get_error(); + + if (isAllocFailure) + { + *isAllocFailure = ERR_GET_REASON(err) == ERR_R_MALLOC_FAILURE; + } + + return err; +} + +uint64_t CryptoNative_ErrPeekError() +{ + return ERR_peek_error(); +} + +uint64_t CryptoNative_ErrPeekLastError() +{ + return ERR_peek_last_error(); +} + +const char* CryptoNative_ErrReasonErrorString(uint64_t error) +{ + return ERR_reason_error_string((unsigned long)error); +} + +void CryptoNative_ErrErrorStringN(uint64_t e, char* buf, int32_t len) +{ + ERR_error_string_n((unsigned long)e, buf, Int32ToSizeT(len)); +} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_err.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_err.cpp deleted file mode 100644 index 8985bc9999..0000000000 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_err.cpp +++ /dev/null @@ -1,37 +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. - -#include "pal_err.h" -#include "pal_utilities.h" - -extern "C" uint64_t CryptoNative_ErrGetError() -{ - return ERR_get_error(); -} - -extern "C" uint64_t CryptoNative_ErrPeekError() -{ - return ERR_peek_error(); -} -extern "C" uint64_t CryptoNative_ErrGetErrorAlloc(int32_t* isAllocFailure) -{ - unsigned long err = ERR_get_error(); - - if (isAllocFailure) - { - *isAllocFailure = ERR_GET_REASON(err) == ERR_R_MALLOC_FAILURE; - } - - return err; -} - -extern "C" const char* CryptoNative_ErrReasonErrorString(uint64_t error) -{ - return ERR_reason_error_string(static_cast(error)); -} - -extern "C" void CryptoNative_ErrErrorStringN(uint64_t e, char* buf, int32_t len) -{ - ERR_error_string_n(static_cast(e), buf, UnsignedCast(len)); -} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_err.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_err.h index 7ef05fce5d..eaa4c93898 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_err.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_err.h @@ -2,28 +2,38 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +#include "pal_compiler.h" #include #include "opensslshim.h" +/* +Shims the ERR_clear_error method. +*/ +DLLEXPORT void CryptoNative_ErrClearError(void); + /* Shims the ERR_get_error method. */ -extern "C" uint64_t CryptoNative_ErrGetError(); +DLLEXPORT uint64_t CryptoNative_ErrGetError(void); /* Shim to ERR_get_error which also returns whether the error was caused by an allocation failure. */ -extern "C" uint64_t CryptoNative_ErrGetErrorAlloc(int32_t* isAllocFailure); +DLLEXPORT uint64_t CryptoNative_ErrGetErrorAlloc(int32_t* isAllocFailure); + +DLLEXPORT uint64_t CryptoNative_ErrPeekError(void); + +DLLEXPORT uint64_t CryptoNative_ErrPeekLastError(void); /* Shims the ERR_reason_error_string method. Returns the string for the specified error. */ -extern "C" const char* CryptoNative_ErrReasonErrorString(uint64_t error); +DLLEXPORT const char* CryptoNative_ErrReasonErrorString(uint64_t error); /* Direct shim to ERR_error_string_n. */ -extern "C" void CryptoNative_ErrErrorStringN(uint64_t e, char* buf, int32_t len); +DLLEXPORT void CryptoNative_ErrErrorStringN(uint64_t e, char* buf, int32_t len); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp.c b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp.c new file mode 100644 index 0000000000..f475c41a55 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp.c @@ -0,0 +1,93 @@ +// 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. + +#include "pal_evp.h" + +#include + +#define SUCCESS 1 + +EVP_MD_CTX* CryptoNative_EvpMdCtxCreate(const EVP_MD* type) +{ + EVP_MD_CTX* ctx = EVP_MD_CTX_create(); + if (ctx == NULL) + { + // Allocation failed + return NULL; + } + + int ret = EVP_DigestInit_ex(ctx, type, NULL); + if (!ret) + { + EVP_MD_CTX_destroy(ctx); + return NULL; + } + + return ctx; +} + +void CryptoNative_EvpMdCtxDestroy(EVP_MD_CTX* ctx) +{ + if (ctx != NULL) + { + EVP_MD_CTX_destroy(ctx); + } +} + +int32_t CryptoNative_EvpDigestReset(EVP_MD_CTX* ctx, const EVP_MD* type) +{ + return EVP_DigestInit_ex(ctx, type, NULL); +} + +int32_t CryptoNative_EvpDigestUpdate(EVP_MD_CTX* ctx, const void* d, size_t cnt) +{ + return EVP_DigestUpdate(ctx, d, cnt); +} + +int32_t CryptoNative_EvpDigestFinalEx(EVP_MD_CTX* ctx, uint8_t* md, uint32_t* s) +{ + unsigned int size; + int32_t ret = EVP_DigestFinal_ex(ctx, md, &size); + if (ret == SUCCESS) + { + *s = size; + } + + return ret; +} + +int32_t CryptoNative_EvpMdSize(const EVP_MD* md) +{ + return EVP_MD_size(md); +} + +const EVP_MD* CryptoNative_EvpMd5() +{ + return EVP_md5(); +} + +const EVP_MD* CryptoNative_EvpSha1() +{ + return EVP_sha1(); +} + +const EVP_MD* CryptoNative_EvpSha256() +{ + return EVP_sha256(); +} + +const EVP_MD* CryptoNative_EvpSha384() +{ + return EVP_sha384(); +} + +const EVP_MD* CryptoNative_EvpSha512() +{ + return EVP_sha512(); +} + +int32_t CryptoNative_GetMaxMdSize() +{ + return EVP_MAX_MD_SIZE; +} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp.cpp deleted file mode 100644 index 1fbadce9af..0000000000 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp.cpp +++ /dev/null @@ -1,93 +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. - -#include "pal_evp.h" - -#include - -#define SUCCESS 1 - -extern "C" EVP_MD_CTX* CryptoNative_EvpMdCtxCreate(const EVP_MD* type) -{ - EVP_MD_CTX* ctx = EVP_MD_CTX_create(); - if (ctx == nullptr) - { - // Allocation failed - return nullptr; - } - - int ret = EVP_DigestInit_ex(ctx, type, nullptr); - if (!ret) - { - EVP_MD_CTX_destroy(ctx); - return nullptr; - } - - return ctx; -} - -extern "C" void CryptoNative_EvpMdCtxDestroy(EVP_MD_CTX* ctx) -{ - if (ctx != nullptr) - { - EVP_MD_CTX_destroy(ctx); - } -} - -extern "C" int32_t CryptoNative_EvpDigestReset(EVP_MD_CTX* ctx, const EVP_MD* type) -{ - return EVP_DigestInit_ex(ctx, type, nullptr); -} - -extern "C" int32_t CryptoNative_EvpDigestUpdate(EVP_MD_CTX* ctx, const void* d, size_t cnt) -{ - return EVP_DigestUpdate(ctx, d, cnt); -} - -extern "C" int32_t CryptoNative_EvpDigestFinalEx(EVP_MD_CTX* ctx, uint8_t* md, uint32_t* s) -{ - unsigned int size; - int32_t ret = EVP_DigestFinal_ex(ctx, md, &size); - if (ret == SUCCESS) - { - *s = size; - } - - return ret; -} - -extern "C" int32_t CryptoNative_EvpMdSize(const EVP_MD* md) -{ - return EVP_MD_size(md); -} - -extern "C" const EVP_MD* CryptoNative_EvpMd5() -{ - return EVP_md5(); -} - -extern "C" const EVP_MD* CryptoNative_EvpSha1() -{ - return EVP_sha1(); -} - -extern "C" const EVP_MD* CryptoNative_EvpSha256() -{ - return EVP_sha256(); -} - -extern "C" const EVP_MD* CryptoNative_EvpSha384() -{ - return EVP_sha384(); -} - -extern "C" const EVP_MD* CryptoNative_EvpSha512() -{ - return EVP_sha512(); -} - -extern "C" int32_t CryptoNative_GetMaxMdSize() -{ - return EVP_MAX_MD_SIZE; -} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp.h index 1e0dc4a141..b0d7f9b61b 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp.h @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +#include "pal_compiler.h" #include #include "opensslshim.h" @@ -14,7 +15,7 @@ Implemented by: Returns new EVP_MD_CTX on success, nullptr on failure. */ -extern "C" EVP_MD_CTX* CryptoNative_EvpMdCtxCreate(const EVP_MD* type); +DLLEXPORT EVP_MD_CTX* CryptoNative_EvpMdCtxCreate(const EVP_MD* type); /* Cleans up and deletes an EVP_MD_CTX instance created by EvpMdCtxCreate. @@ -26,12 +27,12 @@ No-op if ctx is null. The given EVP_MD_CTX pointer is invalid after this call. Always succeeds. */ -extern "C" void CryptoNative_EvpMdCtxDestroy(EVP_MD_CTX* ctx); +DLLEXPORT void CryptoNative_EvpMdCtxDestroy(EVP_MD_CTX* ctx); /* Resets an EVP_MD_CTX instance for a new computation. */ -extern "C" int32_t CryptoNative_EvpDigestReset(EVP_MD_CTX* ctx, const EVP_MD* type); +DLLEXPORT int32_t CryptoNative_EvpDigestReset(EVP_MD_CTX* ctx, const EVP_MD* type); /* Function: @@ -39,7 +40,7 @@ EvpDigestUpdate Direct shim to EVP_DigestUpdate. */ -extern "C" int32_t CryptoNative_EvpDigestUpdate(EVP_MD_CTX* ctx, const void* d, size_t cnt); +DLLEXPORT int32_t CryptoNative_EvpDigestUpdate(EVP_MD_CTX* ctx, const void* d, size_t cnt); /* Function: @@ -47,7 +48,7 @@ EvpDigestFinalEx Direct shim to EVP_DigestFinal_ex. */ -extern "C" int32_t CryptoNative_EvpDigestFinalEx(EVP_MD_CTX* ctx, uint8_t* md, uint32_t* s); +DLLEXPORT int32_t CryptoNative_EvpDigestFinalEx(EVP_MD_CTX* ctx, uint8_t* md, uint32_t* s); /* Function: @@ -55,7 +56,7 @@ EvpMdSize Direct shim to EVP_MD_size. */ -extern "C" int32_t CryptoNative_EvpMdSize(const EVP_MD* md); +DLLEXPORT int32_t CryptoNative_EvpMdSize(const EVP_MD* md); /* Function: @@ -63,7 +64,7 @@ EvpMd5 Direct shim to EVP_md5. */ -extern "C" const EVP_MD* CryptoNative_EvpMd5(); +DLLEXPORT const EVP_MD* CryptoNative_EvpMd5(void); /* Function: @@ -71,7 +72,7 @@ EvpSha1 Direct shim to EVP_sha1. */ -extern "C" const EVP_MD* CryptoNative_EvpSha1(); +DLLEXPORT const EVP_MD* CryptoNative_EvpSha1(void); /* Function: @@ -79,7 +80,7 @@ EvpSha256 Direct shim to EVP_sha256. */ -extern "C" const EVP_MD* CryptoNative_EvpSha256(); +DLLEXPORT const EVP_MD* CryptoNative_EvpSha256(void); /* Function: @@ -87,7 +88,7 @@ EvpSha384 Direct shim to EVP_sha384. */ -extern "C" const EVP_MD* CryptoNative_EvpSha384(); +DLLEXPORT const EVP_MD* CryptoNative_EvpSha384(void); /* Function: @@ -95,7 +96,7 @@ EvpSha512 Direct shim to EVP_sha512. */ -extern "C" const EVP_MD* CryptoNative_EvpSha512(); +DLLEXPORT const EVP_MD* CryptoNative_EvpSha512(void); /* Function: @@ -103,4 +104,4 @@ GetMaxMdSize Returns the maxium bytes for a message digest. */ -extern "C" int32_t CryptoNative_GetMaxMdSize(); +DLLEXPORT int32_t CryptoNative_GetMaxMdSize(void); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_cipher.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_cipher.c similarity index 57% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_cipher.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_cipher.c index 1f2e80e114..58a7ce13c9 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_cipher.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_cipher.c @@ -5,76 +5,79 @@ #include "pal_evp_cipher.h" #include -#include #define SUCCESS 1 #define KEEP_CURRENT_DIRECTION -1 -extern "C" EVP_CIPHER_CTX* +EVP_CIPHER_CTX* CryptoNative_EvpCipherCreate(const EVP_CIPHER* type, uint8_t* key, unsigned char* iv, int32_t enc) { return CryptoNative_EvpCipherCreate2(type, key, 0, 0, iv, enc); } -extern "C" EVP_CIPHER_CTX* +EVP_CIPHER_CTX* CryptoNative_EvpCipherCreate2(const EVP_CIPHER* type, uint8_t* key, int32_t keyLength, int32_t effectiveKeyLength, unsigned char* iv, int32_t enc) { - std::unique_ptr ctx(new (std::nothrow) EVP_CIPHER_CTX); - if (ctx == nullptr) + EVP_CIPHER_CTX* ctx = (EVP_CIPHER_CTX*)malloc(sizeof(EVP_CIPHER_CTX)); + if (ctx == NULL) { // Allocation failed - return nullptr; + return NULL; } - EVP_CIPHER_CTX_init(ctx.get()); + EVP_CIPHER_CTX_init(ctx); // Perform partial initialization so we can set the key lengths - int ret = EVP_CipherInit_ex(ctx.get(), type, nullptr, nullptr, nullptr, 0); + int ret = EVP_CipherInit_ex(ctx, type, NULL, NULL, NULL, 0); if (!ret) { - return nullptr; + free(ctx); + return NULL; } if (keyLength > 0) { // Necessary when the default key size is different than current - ret = EVP_CIPHER_CTX_set_key_length(ctx.get(), keyLength / 8); + ret = EVP_CIPHER_CTX_set_key_length(ctx, keyLength / 8); if (!ret) { - return nullptr; + free(ctx); + return NULL; } } if (effectiveKeyLength > 0) { // Necessary for RC2 - ret = EVP_CIPHER_CTX_ctrl(ctx.get(), EVP_CTRL_SET_RC2_KEY_BITS, effectiveKeyLength, nullptr); + ret = EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_SET_RC2_KEY_BITS, effectiveKeyLength, NULL); if (ret <= 0) { - return nullptr; + free(ctx); + return NULL; } } // Perform final initialization specifying the remaining arguments - ret = EVP_CipherInit_ex(ctx.get(), nullptr, nullptr, key, iv, enc); + ret = EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, enc); if (!ret) { - return nullptr; + free(ctx); + return NULL; } - return ctx.release(); + return ctx; } -extern "C" void CryptoNative_EvpCipherDestroy(EVP_CIPHER_CTX* ctx) +void CryptoNative_EvpCipherDestroy(EVP_CIPHER_CTX* ctx) { - if (ctx != nullptr) + if (ctx != NULL) { EVP_CIPHER_CTX_cleanup(ctx); - delete ctx; + free(ctx); } } -extern "C" int32_t CryptoNative_EvpCipherReset(EVP_CIPHER_CTX* ctx) +int32_t CryptoNative_EvpCipherReset(EVP_CIPHER_CTX* ctx) { // EVP_CipherInit_ex with all nulls preserves the algorithm, resets the IV, // and maintains the key. @@ -85,15 +88,15 @@ extern "C" int32_t CryptoNative_EvpCipherReset(EVP_CIPHER_CTX* ctx) // But since we have a different object returned for CreateEncryptor // and CreateDecryptor we don't need to worry about that. - return EVP_CipherInit_ex(ctx, nullptr, nullptr, nullptr, nullptr, KEEP_CURRENT_DIRECTION); + return EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, KEEP_CURRENT_DIRECTION); } -extern "C" int32_t CryptoNative_EvpCipherCtxSetPadding(EVP_CIPHER_CTX* x, int32_t padding) +int32_t CryptoNative_EvpCipherCtxSetPadding(EVP_CIPHER_CTX* x, int32_t padding) { return EVP_CIPHER_CTX_set_padding(x, padding); } -extern "C" int32_t +int32_t CryptoNative_EvpCipherUpdate(EVP_CIPHER_CTX* ctx, uint8_t* out, int32_t* outl, unsigned char* in, int32_t inl) { int outLength; @@ -106,7 +109,7 @@ CryptoNative_EvpCipherUpdate(EVP_CIPHER_CTX* ctx, uint8_t* out, int32_t* outl, u return ret; } -extern "C" int32_t CryptoNative_EvpCipherFinalEx(EVP_CIPHER_CTX* ctx, uint8_t* outm, int32_t* outl) +int32_t CryptoNative_EvpCipherFinalEx(EVP_CIPHER_CTX* ctx, uint8_t* outm, int32_t* outl) { int outLength; int32_t ret = EVP_CipherFinal_ex(ctx, outm, &outLength); @@ -118,62 +121,62 @@ extern "C" int32_t CryptoNative_EvpCipherFinalEx(EVP_CIPHER_CTX* ctx, uint8_t* o return ret; } -extern "C" const EVP_CIPHER* CryptoNative_EvpAes128Ecb() +const EVP_CIPHER* CryptoNative_EvpAes128Ecb() { return EVP_aes_128_ecb(); } -extern "C" const EVP_CIPHER* CryptoNative_EvpAes128Cbc() +const EVP_CIPHER* CryptoNative_EvpAes128Cbc() { return EVP_aes_128_cbc(); } -extern "C" const EVP_CIPHER* CryptoNative_EvpAes192Ecb() +const EVP_CIPHER* CryptoNative_EvpAes192Ecb() { return EVP_aes_192_ecb(); } -extern "C" const EVP_CIPHER* CryptoNative_EvpAes192Cbc() +const EVP_CIPHER* CryptoNative_EvpAes192Cbc() { return EVP_aes_192_cbc(); } -extern "C" const EVP_CIPHER* CryptoNative_EvpAes256Ecb() +const EVP_CIPHER* CryptoNative_EvpAes256Ecb() { return EVP_aes_256_ecb(); } -extern "C" const EVP_CIPHER* CryptoNative_EvpAes256Cbc() +const EVP_CIPHER* CryptoNative_EvpAes256Cbc() { return EVP_aes_256_cbc(); } -extern "C" const EVP_CIPHER* CryptoNative_EvpDesEcb() +const EVP_CIPHER* CryptoNative_EvpDesEcb() { return EVP_des_ecb(); } -extern "C" const EVP_CIPHER* CryptoNative_EvpDesCbc() +const EVP_CIPHER* CryptoNative_EvpDesCbc() { return EVP_des_cbc(); } -extern "C" const EVP_CIPHER* CryptoNative_EvpDes3Ecb() +const EVP_CIPHER* CryptoNative_EvpDes3Ecb() { return EVP_des_ede3(); } -extern "C" const EVP_CIPHER* CryptoNative_EvpDes3Cbc() +const EVP_CIPHER* CryptoNative_EvpDes3Cbc() { return EVP_des_ede3_cbc(); } -extern "C" const EVP_CIPHER* CryptoNative_EvpRC2Ecb() +const EVP_CIPHER* CryptoNative_EvpRC2Ecb() { return EVP_rc2_ecb(); } -extern "C" const EVP_CIPHER* CryptoNative_EvpRC2Cbc() +const EVP_CIPHER* CryptoNative_EvpRC2Cbc() { return EVP_rc2_cbc(); } diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_cipher.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_cipher.h index fb3a6c750e..f95ea8f898 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_cipher.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_cipher.h @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. #include "pal_types.h" +#include "pal_compiler.h" #include "opensslshim.h" /* @@ -15,10 +16,10 @@ Implemented by: Returns new EVP_CIPHER_CTX on success, nullptr on failure. */ -extern "C" EVP_CIPHER_CTX* +DLLEXPORT EVP_CIPHER_CTX* CryptoNative_EvpCipherCreate(const EVP_CIPHER* type, uint8_t* key, unsigned char* iv, int32_t enc); -extern "C" EVP_CIPHER_CTX* +DLLEXPORT EVP_CIPHER_CTX* CryptoNative_EvpCipherCreate2(const EVP_CIPHER* type, uint8_t* key, int32_t keyLength, int32_t effectiveKeyLength, unsigned char* iv, int32_t enc); /* Cleans up and deletes an EVP_CIPHER_CTX instance created by EvpCipherCreate. @@ -31,7 +32,7 @@ No-op if ctx is null. The given EVP_CIPHER_CTX pointer is invalid after this call. Always succeeds. */ -extern "C" void CryptoNative_EvpCipherDestroy(EVP_CIPHER_CTX* ctx); +DLLEXPORT void CryptoNative_EvpCipherDestroy(EVP_CIPHER_CTX* ctx); /* Function: @@ -39,7 +40,7 @@ EvpCipherReset Resets an EVP_CIPHER_CTX instance for a new computation. */ -extern "C" int32_t CryptoNative_EvpCipherReset(EVP_CIPHER_CTX* ctx); +DLLEXPORT int32_t CryptoNative_EvpCipherReset(EVP_CIPHER_CTX* ctx); /* Function: @@ -47,7 +48,7 @@ EvpCipherCtxSetPadding Direct shim to EVP_CIPHER_CTX_set_padding. */ -extern "C" int32_t CryptoNative_EvpCipherCtxSetPadding(EVP_CIPHER_CTX* x, int32_t padding); +DLLEXPORT int32_t CryptoNative_EvpCipherCtxSetPadding(EVP_CIPHER_CTX* x, int32_t padding); /* Function: @@ -55,7 +56,7 @@ EvpCipherUpdate Direct shim to EVP_CipherUpdate. */ -extern "C" int32_t +DLLEXPORT int32_t CryptoNative_EvpCipherUpdate(EVP_CIPHER_CTX* ctx, uint8_t* out, int32_t* outl, unsigned char* in, int32_t inl); /* @@ -64,7 +65,7 @@ EvpCipherFinalEx Direct shim to EVP_CipherFinal_ex. */ -extern "C" int32_t CryptoNative_EvpCipherFinalEx(EVP_CIPHER_CTX* ctx, uint8_t* outm, int32_t* outl); +DLLEXPORT int32_t CryptoNative_EvpCipherFinalEx(EVP_CIPHER_CTX* ctx, uint8_t* outm, int32_t* outl); /* Function: @@ -72,7 +73,7 @@ EvpAes128Ecb Direct shim to EVP_aes_128_ecb. */ -extern "C" const EVP_CIPHER* CryptoNative_EvpAes128Ecb(); +DLLEXPORT const EVP_CIPHER* CryptoNative_EvpAes128Ecb(void); /* Function: @@ -80,7 +81,7 @@ EvpAes128Cbc Direct shim to EVP_aes_128_cbc. */ -extern "C" const EVP_CIPHER* CryptoNative_EvpAes128Cbc(); +DLLEXPORT const EVP_CIPHER* CryptoNative_EvpAes128Cbc(void); /* Function: @@ -88,7 +89,7 @@ EvpAes192Ecb Direct shim to EVP_aes_192_ecb. */ -extern "C" const EVP_CIPHER* CryptoNative_EvpAes192Ecb(); +DLLEXPORT const EVP_CIPHER* CryptoNative_EvpAes192Ecb(void); /* Function: @@ -96,7 +97,7 @@ EvpAes192Cbc Direct shim to EVP_aes_192_cbc. */ -extern "C" const EVP_CIPHER* CryptoNative_EvpAes192Cbc(); +DLLEXPORT const EVP_CIPHER* CryptoNative_EvpAes192Cbc(void); /* Function: @@ -104,7 +105,7 @@ EvpAes256Ecb Direct shim to EVP_aes_256_ecb. */ -extern "C" const EVP_CIPHER* CryptoNative_EvpAes256Ecb(); +DLLEXPORT const EVP_CIPHER* CryptoNative_EvpAes256Ecb(void); /* Function: @@ -112,7 +113,7 @@ EvpAes256Cbc Direct shim to EVP_aes_256_cbc. */ -extern "C" const EVP_CIPHER* CryptoNative_EvpAes256Cbc(); +DLLEXPORT const EVP_CIPHER* CryptoNative_EvpAes256Cbc(void); /* Function: @@ -120,7 +121,7 @@ EvpDes3Ecb Direct shim to EVP_des_ede3. */ -extern "C" const EVP_CIPHER* CryptoNative_EvpDes3Ecb(); +DLLEXPORT const EVP_CIPHER* CryptoNative_EvpDes3Ecb(void); /* Function: @@ -128,7 +129,7 @@ EvpDes3Cbc Direct shim to EVP_des_ede3_cbc. */ -extern "C" const EVP_CIPHER* CryptoNative_EvpDes3Cbc(); +DLLEXPORT const EVP_CIPHER* CryptoNative_EvpDes3Cbc(void); /* Function: @@ -136,7 +137,7 @@ EvpDesEcb Direct shim to EVP_des_ecb. */ -extern "C" const EVP_CIPHER* CryptoNative_EvpDesEcb(); +DLLEXPORT const EVP_CIPHER* CryptoNative_EvpDesEcb(void); /* Function: @@ -144,7 +145,7 @@ EvpDesCbc Direct shim to EVP_des_ede_cbc. */ -extern "C" const EVP_CIPHER* CryptoNative_EvpDesCbc(); +DLLEXPORT const EVP_CIPHER* CryptoNative_EvpDesCbc(void); /* Function: @@ -152,7 +153,7 @@ EvpRC2Ecb Direct shim to EVP_rc2_ecb. */ -extern "C" const EVP_CIPHER* CryptoNative_EvpRC2Ecb(); +DLLEXPORT const EVP_CIPHER* CryptoNative_EvpRC2Ecb(void); /* Function: @@ -160,4 +161,4 @@ EvpRC2Cbc Direct shim to EVP_des_rc2_cbc. */ -extern "C" const EVP_CIPHER* CryptoNative_EvpRC2Cbc(); +DLLEXPORT const EVP_CIPHER* CryptoNative_EvpRC2Cbc(void); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey.c similarity index 68% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey.c index 384030740e..02e8524d96 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey.c @@ -4,20 +4,20 @@ #include "pal_evp_pkey.h" -extern "C" EVP_PKEY* CryptoNative_EvpPkeyCreate() +EVP_PKEY* CryptoNative_EvpPkeyCreate() { return EVP_PKEY_new(); } -extern "C" void CryptoNative_EvpPkeyDestroy(EVP_PKEY* pkey) +void CryptoNative_EvpPkeyDestroy(EVP_PKEY* pkey) { - if (pkey != nullptr) + if (pkey != NULL) { EVP_PKEY_free(pkey); } } -extern "C" int32_t CryptoNative_UpRefEvpPkey(EVP_PKEY* pkey) +int32_t CryptoNative_UpRefEvpPkey(EVP_PKEY* pkey) { if (!pkey) { diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey.h index 1449fda5b4..7baf997d8d 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey.h @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. #include "pal_types.h" +#include "pal_compiler.h" #include "opensslshim.h" /* @@ -10,7 +11,7 @@ Shims the EVP_PKEY_new method. Returns the new EVP_PKEY instance. */ -extern "C" EVP_PKEY* CryptoNative_EvpPkeyCreate(); +DLLEXPORT EVP_PKEY* CryptoNative_EvpPkeyCreate(void); /* Cleans up and deletes a EVP_PKEY instance. @@ -21,7 +22,7 @@ No-op if pkey is null. The given EVP_PKEY pointer is invalid after this call. Always succeeds. */ -extern "C" void CryptoNative_EvpPkeyDestroy(EVP_PKEY* pkey); +DLLEXPORT void CryptoNative_EvpPkeyDestroy(EVP_PKEY* pkey); /* Used by System.Security.Cryptography.X509Certificates' OpenSslX509CertificateReader when @@ -30,4 +31,4 @@ duplicating a private key context as part of duplicating the Pal object. Returns the number (as of this call) of references to the EVP_PKEY. Anything less than 2 is an error, because the key is already in the process of being freed. */ -extern "C" int32_t CryptoNative_UpRefEvpPkey(EVP_PKEY* pkey); +DLLEXPORT int32_t CryptoNative_UpRefEvpPkey(EVP_PKEY* pkey); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_dsa.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_dsa.c similarity index 71% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_dsa.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_dsa.c index 797d21d045..e67642d419 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_dsa.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_dsa.c @@ -4,12 +4,12 @@ #include "pal_evp_pkey_dsa.h" -extern "C" DSA* CryptoNative_EvpPkeyGetDsa(EVP_PKEY* pkey) +DSA* CryptoNative_EvpPkeyGetDsa(EVP_PKEY* pkey) { return EVP_PKEY_get1_DSA(pkey); } -extern "C" int32_t CryptoNative_EvpPkeySetDsa(EVP_PKEY* pkey, DSA* dsa) +int32_t CryptoNative_EvpPkeySetDsa(EVP_PKEY* pkey, DSA* dsa) { return EVP_PKEY_set1_DSA(pkey, dsa); } diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_dsa.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_dsa.h index 79835d27ec..7ea1743809 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_dsa.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_dsa.h @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. #include "pal_types.h" +#include "pal_compiler.h" #include "opensslshim.h" /* @@ -10,7 +11,7 @@ Shims the EVP_PKEY_get1_DSA method. Returns the DSA instance for the EVP_PKEY. */ -extern "C" DSA* CryptoNative_EvpPkeyGetDsa(EVP_PKEY* pkey); +DLLEXPORT DSA* CryptoNative_EvpPkeyGetDsa(EVP_PKEY* pkey); /* Shims the EVP_PKEY_set1_DSA method to set the DSA @@ -18,4 +19,4 @@ instance on the EVP_KEY. Returns 1 upon success, otherwise 0. */ -extern "C" int32_t CryptoNative_EvpPkeySetDsa(EVP_PKEY* pkey, DSA* dsa); +DLLEXPORT int32_t CryptoNative_EvpPkeySetDsa(EVP_PKEY* pkey, DSA* dsa); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_ecdh.c b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_ecdh.c new file mode 100644 index 0000000000..0fd53380fa --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_ecdh.c @@ -0,0 +1,64 @@ +// 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. + +#include "pal_evp_pkey_ecdh.h" + +EVP_PKEY_CTX* CryptoNative_EvpPKeyCtxCreate(EVP_PKEY* pkey, EVP_PKEY* peerkey, uint32_t* secretLength) +{ + if (secretLength != NULL) + *secretLength = 0; + + if (pkey == NULL || peerkey == NULL || secretLength == NULL) + { + return NULL; + } + + /* Create the context for the shared secret derivation */ + EVP_PKEY_CTX* ctx = EVP_PKEY_CTX_new(pkey, NULL); + + if (ctx == NULL) + { + return NULL; + } + + size_t tmpLength = 0; + + /* Initialize, provide the peer public key, and determine the buffer size */ + if (1 != EVP_PKEY_derive_init(ctx) || 1 != EVP_PKEY_derive_set_peer(ctx, peerkey) || + 1 != EVP_PKEY_derive(ctx, NULL, &tmpLength)) + { + EVP_PKEY_CTX_free(ctx); + return NULL; + } + + *secretLength = (uint32_t)tmpLength; + return ctx; +} + +int32_t CryptoNative_EvpPKeyDeriveSecretAgreement(uint8_t* secret, uint32_t secretLength, EVP_PKEY_CTX* ctx) +{ + size_t tmpSize = (size_t)secretLength; + int ret = 0; + + if (secret != NULL && ctx != NULL) + { + ret = EVP_PKEY_derive(ctx, secret, &tmpSize); + + if (ret == 1 && tmpSize != (size_t)secretLength) + { + OPENSSL_cleanse(secret, secretLength); + ret = 0; + } + } + + return ret; +} + +void CryptoNative_EvpPKeyCtxDestroy(EVP_PKEY_CTX* ctx) +{ + if (ctx != NULL) + { + EVP_PKEY_CTX_free(ctx); + } +} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_ecdh.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_ecdh.h new file mode 100644 index 0000000000..e97f4e2603 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_ecdh.h @@ -0,0 +1,13 @@ +// 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. + +#include "pal_types.h" +#include "pal_compiler.h" +#include "opensslshim.h" + +DLLEXPORT EVP_PKEY_CTX* CryptoNative_EvpPKeyCtxCreate(EVP_PKEY* pkey, EVP_PKEY* peerkey, uint32_t* secretLength); + +DLLEXPORT int32_t CryptoNative_EvpPKeyDeriveSecretAgreement(uint8_t* secret, uint32_t secretLength, EVP_PKEY_CTX* ctx); + +DLLEXPORT void CryptoNative_EvpPKeyCtxDestroy(EVP_PKEY_CTX* ctx); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_eckey.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_eckey.c similarity index 70% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_eckey.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_eckey.c index 1c792514e6..305734212e 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_eckey.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_eckey.c @@ -4,12 +4,12 @@ #include "pal_evp_pkey_eckey.h" -extern "C" EC_KEY* CryptoNative_EvpPkeyGetEcKey(EVP_PKEY* pkey) +EC_KEY* CryptoNative_EvpPkeyGetEcKey(EVP_PKEY* pkey) { return EVP_PKEY_get1_EC_KEY(pkey); } -extern "C" int32_t CryptoNative_EvpPkeySetEcKey(EVP_PKEY* pkey, EC_KEY* key) +int32_t CryptoNative_EvpPkeySetEcKey(EVP_PKEY* pkey, EC_KEY* key) { return EVP_PKEY_set1_EC_KEY(pkey, key); } diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_eckey.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_eckey.h index 0b71546cf8..fbeea59bff 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_eckey.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_eckey.h @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. #include "pal_types.h" +#include "pal_compiler.h" #include "opensslshim.h" /* @@ -10,7 +11,7 @@ Shims the EVP_PKEY_get1_EC_KEY method. Returns the EC_KEY instance for the EVP_PKEY. */ -extern "C" EC_KEY* CryptoNative_EvpPkeyGetEcKey(EVP_PKEY* pkey); +DLLEXPORT EC_KEY* CryptoNative_EvpPkeyGetEcKey(EVP_PKEY* pkey); /* Shims the EVP_PKEY_set1_EC_KEY method to set the EC_KEY @@ -18,4 +19,4 @@ instance on the EVP_KEY. Returns 1 upon success, otherwise 0. */ -extern "C" int32_t CryptoNative_EvpPkeySetEcKey(EVP_PKEY* pkey, EC_KEY* key); +DLLEXPORT int32_t CryptoNative_EvpPkeySetEcKey(EVP_PKEY* pkey, EC_KEY* key); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_rsa.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c similarity index 71% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_rsa.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c index c36a830722..e8d961dbd2 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_rsa.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c @@ -4,12 +4,12 @@ #include "pal_evp_pkey_rsa.h" -extern "C" RSA* CryptoNative_EvpPkeyGetRsa(EVP_PKEY* pkey) +RSA* CryptoNative_EvpPkeyGetRsa(EVP_PKEY* pkey) { return EVP_PKEY_get1_RSA(pkey); } -extern "C" int32_t CryptoNative_EvpPkeySetRsa(EVP_PKEY* pkey, RSA* rsa) +int32_t CryptoNative_EvpPkeySetRsa(EVP_PKEY* pkey, RSA* rsa) { return EVP_PKEY_set1_RSA(pkey, rsa); } diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_rsa.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_rsa.h index 3200a6180e..d8ff369670 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_rsa.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_rsa.h @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. #include "pal_types.h" +#include "pal_compiler.h" #include "opensslshim.h" /* @@ -10,7 +11,7 @@ Shims the EVP_PKEY_get1_RSA method. Returns the RSA instance for the EVP_PKEY. */ -extern "C" RSA* CryptoNative_EvpPkeyGetRsa(EVP_PKEY* pkey); +DLLEXPORT RSA* CryptoNative_EvpPkeyGetRsa(EVP_PKEY* pkey); /* Shims the EVP_PKEY_set1_RSA method to set the RSA @@ -18,4 +19,4 @@ instance on the EVP_KEY. Returns 1 upon success, otherwise 0. */ -extern "C" int32_t CryptoNative_EvpPkeySetRsa(EVP_PKEY* pkey, RSA* rsa); +DLLEXPORT int32_t CryptoNative_EvpPkeySetRsa(EVP_PKEY* pkey, RSA* rsa); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_hmac.c b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_hmac.c new file mode 100644 index 0000000000..783850ee6b --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_hmac.c @@ -0,0 +1,88 @@ +// 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. + +#include "pal_config.h" +#include "pal_utilities.h" +#include "pal_hmac.h" + +#include + +HMAC_CTX* CryptoNative_HmacCreate(const uint8_t* key, int32_t keyLen, const EVP_MD* md) +{ + assert(key != NULL || keyLen == 0); + assert(keyLen >= 0); + assert(md != NULL); + + HMAC_CTX* ctx = (HMAC_CTX*)malloc(sizeof(HMAC_CTX)); + if (ctx == NULL) + { + // Allocation failed + return NULL; + } + + // NOTE: We can't pass NULL as empty key since HMAC_Init_ex will interpret + // that as request to reuse the "existing" key. + uint8_t _; + if (keyLen == 0) + key = &_; + + HMAC_CTX_init(ctx); + int ret = HMAC_Init_ex(ctx, key, keyLen, md, NULL); + + if (!ret) + { + free(ctx); + return NULL; + } + + return ctx; +} + +void CryptoNative_HmacDestroy(HMAC_CTX* ctx) +{ + if (ctx != NULL) + { + HMAC_CTX_cleanup(ctx); + free(ctx); + } +} + +int32_t CryptoNative_HmacReset(HMAC_CTX* ctx) +{ + assert(ctx != NULL); + + return HMAC_Init_ex(ctx, NULL, 0, NULL, NULL); +} + +int32_t CryptoNative_HmacUpdate(HMAC_CTX* ctx, const uint8_t* data, int32_t len) +{ + assert(ctx != NULL); + assert(data != NULL || len == 0); + assert(len >= 0); + + if (len < 0) + { + return 0; + } + + return HMAC_Update(ctx, data, Int32ToSizeT(len)); +} + +int32_t CryptoNative_HmacFinal(HMAC_CTX* ctx, uint8_t* md, int32_t* len) +{ + assert(ctx != NULL); + assert(len != NULL); + assert(md != NULL || *len == 0); + assert(*len >= 0); + + if (len == NULL || *len < 0) + { + return 0; + } + + unsigned int unsignedLen = Int32ToUint32(*len); + int ret = HMAC_Final(ctx, md, &unsignedLen); + *len = Uint32ToInt32(unsignedLen); + return ret; +} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_hmac.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_hmac.cpp deleted file mode 100644 index 10eef6809c..0000000000 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_hmac.cpp +++ /dev/null @@ -1,88 +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. - -#include "pal_config.h" -#include "pal_utilities.h" -#include "pal_hmac.h" - -#include -#include - -extern "C" HMAC_CTX* CryptoNative_HmacCreate(const uint8_t* key, int32_t keyLen, const EVP_MD* md) -{ - assert(key != nullptr || keyLen == 0); - assert(keyLen >= 0); - assert(md != nullptr); - - std::unique_ptr ctx(new (std::nothrow) HMAC_CTX); - if (ctx == nullptr) - { - // Allocation failed - return nullptr; - } - - // NOTE: We can't pass nullptr as empty key since HMAC_Init_ex will interpret - // that as request to reuse the "existing" key. - uint8_t _; - if (keyLen == 0) - key = &_; - - HMAC_CTX_init(ctx.get()); - int ret = HMAC_Init_ex(ctx.get(), key, keyLen, md, nullptr); - - if (!ret) - { - return nullptr; - } - - return ctx.release(); -} - -extern "C" void CryptoNative_HmacDestroy(HMAC_CTX* ctx) -{ - if (ctx != nullptr) - { - HMAC_CTX_cleanup(ctx); - delete ctx; - } -} - -extern "C" int32_t CryptoNative_HmacReset(HMAC_CTX* ctx) -{ - assert(ctx != nullptr); - - return HMAC_Init_ex(ctx, nullptr, 0, nullptr, nullptr); -} - -extern "C" int32_t CryptoNative_HmacUpdate(HMAC_CTX* ctx, const uint8_t* data, int32_t len) -{ - assert(ctx != nullptr); - assert(data != nullptr || len == 0); - assert(len >= 0); - - if (len < 0) - { - return 0; - } - - return HMAC_Update(ctx, data, UnsignedCast(len)); -} - -extern "C" int32_t CryptoNative_HmacFinal(HMAC_CTX* ctx, uint8_t* md, int32_t* len) -{ - assert(ctx != nullptr); - assert(len != nullptr); - assert(md != nullptr || *len == 0); - assert(*len >= 0); - - if (len == nullptr || *len < 0) - { - return 0; - } - - unsigned int unsignedLen = UnsignedCast(*len); - int ret = HMAC_Final(ctx, md, &unsignedLen); - *len = SignedCast(unsignedLen); - return ret; -} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_hmac.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_hmac.h index 131e148c00..72862b8b9c 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_hmac.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_hmac.h @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. #include "pal_types.h" +#include "pal_compiler.h" #include "opensslshim.h" // The shim API here is slightly less than 1:1 with underlying API so that: @@ -24,7 +25,7 @@ typedef struct env_md_st EVP_MD; * * Returns new HMAC_CTX on success, nullptr on failure. */ -extern "C" HMAC_CTX* CryptoNative_HmacCreate(const uint8_t* key, int32_t keyLen, const EVP_MD* md); +DLLEXPORT HMAC_CTX* CryptoNative_HmacCreate(const uint8_t* key, int32_t keyLen, const EVP_MD* md); /** * Cleans up and deletes an HMAC_CTX instance created by HmacCreate. @@ -37,14 +38,14 @@ extern "C" HMAC_CTX* CryptoNative_HmacCreate(const uint8_t* key, int32_t keyLen, * The given HMAC_CTX pointer is invalid after this call. * Always succeeds. */ -extern "C" void CryptoNative_HmacDestroy(HMAC_CTX* ctx); +DLLEXPORT void CryptoNative_HmacDestroy(HMAC_CTX* ctx); /** * Resets an HMAC_CTX instance for a new computation, preserving the key and EVP_MD. * * Implemented by passing all null/0 values but ctx to HMAC_Init_ex. */ -extern "C" int32_t CryptoNative_HmacReset(HMAC_CTX* ctx); +DLLEXPORT int32_t CryptoNative_HmacReset(HMAC_CTX* ctx); /** * Appends data to the computation. @@ -53,7 +54,7 @@ extern "C" int32_t CryptoNative_HmacReset(HMAC_CTX* ctx); * * Returns 1 for success or 0 for failure. (Always succeeds on platforms where HMAC_Update returns void.) */ -extern "C" int32_t CryptoNative_HmacUpdate(HMAC_CTX* ctx, const uint8_t* data, int32_t len); +DLLEXPORT int32_t CryptoNative_HmacUpdate(HMAC_CTX* ctx, const uint8_t* data, int32_t len); /** * Finalizes the computation and obtains the result. @@ -62,4 +63,4 @@ extern "C" int32_t CryptoNative_HmacUpdate(HMAC_CTX* ctx, const uint8_t* data, i * * Returns 1 for success or 0 for failure. (Always succeeds on platforms where HMAC_Update returns void.) */ -extern "C" int32_t CryptoNative_HmacFinal(HMAC_CTX* ctx, uint8_t* md, int32_t* len); +DLLEXPORT int32_t CryptoNative_HmacFinal(HMAC_CTX* ctx, uint8_t* md, int32_t* len); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_pkcs12.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_pkcs12.c similarity index 52% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_pkcs12.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_pkcs12.c index 7e48813e03..ea88390191 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_pkcs12.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_pkcs12.c @@ -4,46 +4,46 @@ #include "pal_pkcs12.h" -extern "C" PKCS12* CryptoNative_DecodePkcs12(const uint8_t* buf, int32_t len) +PKCS12* CryptoNative_DecodePkcs12(const uint8_t* buf, int32_t len) { if (!buf || !len) { - return nullptr; + return NULL; } - return d2i_PKCS12(nullptr, &buf, len); + return d2i_PKCS12(NULL, &buf, len); } -extern "C" PKCS12* CryptoNative_DecodePkcs12FromBio(BIO* bio) +PKCS12* CryptoNative_DecodePkcs12FromBio(BIO* bio) { - return d2i_PKCS12_bio(bio, nullptr); + return d2i_PKCS12_bio(bio, NULL); } -extern "C" void CryptoNative_Pkcs12Destroy(PKCS12* p12) +void CryptoNative_Pkcs12Destroy(PKCS12* p12) { - if (p12 != nullptr) + if (p12 != NULL) { PKCS12_free(p12); } } -extern "C" PKCS12* CryptoNative_Pkcs12Create(char* pass, EVP_PKEY* pkey, X509* cert, X509Stack* ca) +PKCS12* CryptoNative_Pkcs12Create(char* pass, EVP_PKEY* pkey, X509* cert, X509Stack* ca) { return PKCS12_create( - pass, nullptr, pkey, cert, ca, NID_undef, NID_undef, PKCS12_DEFAULT_ITER, PKCS12_DEFAULT_ITER, 0); + pass, NULL, pkey, cert, ca, NID_undef, NID_undef, PKCS12_DEFAULT_ITER, PKCS12_DEFAULT_ITER, 0); } -extern "C" int32_t CryptoNative_GetPkcs12DerSize(PKCS12* p12) +int32_t CryptoNative_GetPkcs12DerSize(PKCS12* p12) { - return i2d_PKCS12(p12, nullptr); + return i2d_PKCS12(p12, NULL); } -extern "C" int32_t CryptoNative_EncodePkcs12(PKCS12* p12, uint8_t* buf) +int32_t CryptoNative_EncodePkcs12(PKCS12* p12, uint8_t* buf) { return i2d_PKCS12(p12, &buf); } -extern "C" int32_t CryptoNative_Pkcs12Parse(PKCS12* p12, const char* pass, EVP_PKEY** pkey, X509** cert, X509Stack** ca) +int32_t CryptoNative_Pkcs12Parse(PKCS12* p12, const char* pass, EVP_PKEY** pkey, X509** cert, X509Stack** ca) { int32_t ret = PKCS12_parse(p12, pass, pkey, cert, ca); @@ -60,8 +60,8 @@ extern "C" int32_t CryptoNative_Pkcs12Parse(PKCS12* p12, const char* pass, EVP_P // placed in. // If those handles make it back into managed code they will crash // the coreclr when Disposed. - *pkey = nullptr; - *cert = nullptr; + *pkey = NULL; + *cert = NULL; } return ret; diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_pkcs12.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_pkcs12.h index 9b9960a1a7..b3eb1fce14 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_pkcs12.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_pkcs12.h @@ -3,19 +3,20 @@ // See the LICENSE file in the project root for more information. #include "pal_crypto_types.h" +#include "pal_compiler.h" #include "opensslshim.h" /* Shims the d2i_PKCS12 method and makes it easier to invoke from managed code. */ -extern "C" PKCS12* CryptoNative_DecodePkcs12(const uint8_t* buf, int32_t len); +DLLEXPORT PKCS12* CryptoNative_DecodePkcs12(const uint8_t* buf, int32_t len); /* Shims the d2i_PKCS12_bio method. Returns the new PKCS12 instance. */ -extern "C" PKCS12* CryptoNative_DecodePkcs12FromBio(BIO* bio); +DLLEXPORT PKCS12* CryptoNative_DecodePkcs12FromBio(BIO* bio); /* Cleans up and deletes a PKCS12 instance. @@ -26,32 +27,32 @@ No-op if p12 is null. The given PKCS12 pointer is invalid after this call. Always succeeds. */ -extern "C" void CryptoNative_Pkcs12Destroy(PKCS12* p12); +DLLEXPORT void CryptoNative_Pkcs12Destroy(PKCS12* p12); /* Shims the PKCS12_create method. Returns the new PKCS12 instance. */ -extern "C" PKCS12* CryptoNative_Pkcs12Create(char* pass, EVP_PKEY* pkey, X509* cert, X509Stack* ca); +DLLEXPORT PKCS12* CryptoNative_Pkcs12Create(char* pass, EVP_PKEY* pkey, X509* cert, X509Stack* ca); /* Returns the number of bytes it will take to convert the PKCS12 to a DER format. */ -extern "C" int32_t CryptoNative_GetPkcs12DerSize(PKCS12* p12); +DLLEXPORT int32_t CryptoNative_GetPkcs12DerSize(PKCS12* p12); /* Shims the i2d_PKCS12 method. Returns the number of bytes written to buf. */ -extern "C" int32_t CryptoNative_EncodePkcs12(PKCS12* p12, uint8_t* buf); +DLLEXPORT int32_t CryptoNative_EncodePkcs12(PKCS12* p12, uint8_t* buf); /* Shims the PKCS12_parse method. Returns 1 on success, otherwise 0. */ -extern "C" int32_t +DLLEXPORT int32_t CryptoNative_Pkcs12Parse(PKCS12* p12, const char* pass, EVP_PKEY** pkey, X509** cert, X509Stack** ca); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_pkcs7.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_pkcs7.c similarity index 51% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_pkcs7.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_pkcs7.c index 718d6ccfb4..09c72ed1af 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_pkcs7.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_pkcs7.c @@ -4,53 +4,53 @@ #include "pal_pkcs7.h" -extern "C" PKCS7* CryptoNative_PemReadBioPkcs7(BIO* bp) +PKCS7* CryptoNative_PemReadBioPkcs7(BIO* bp) { - return PEM_read_bio_PKCS7(bp, nullptr, nullptr, nullptr); + return PEM_read_bio_PKCS7(bp, NULL, NULL, NULL); } -extern "C" PKCS7* CryptoNative_DecodePkcs7(const uint8_t* buf, int32_t len) +PKCS7* CryptoNative_DecodePkcs7(const uint8_t* buf, int32_t len) { if (!buf || !len) { - return nullptr; + return NULL; } - return d2i_PKCS7(nullptr, &buf, len); + return d2i_PKCS7(NULL, &buf, len); } -extern "C" PKCS7* CryptoNative_D2IPkcs7Bio(BIO* bp) +PKCS7* CryptoNative_D2IPkcs7Bio(BIO* bp) { - return d2i_PKCS7_bio(bp, nullptr); + return d2i_PKCS7_bio(bp, NULL); } -extern "C" PKCS7* CryptoNative_Pkcs7CreateSigned() +PKCS7* CryptoNative_Pkcs7CreateSigned() { PKCS7* pkcs7 = PKCS7_new(); - if (pkcs7 == nullptr) + if (pkcs7 == NULL) { - return nullptr; + return NULL; } if (!PKCS7_set_type(pkcs7, NID_pkcs7_signed) || !PKCS7_content_new(pkcs7, NID_pkcs7_data)) { PKCS7_free(pkcs7); - return nullptr; + return NULL; } return pkcs7; } -extern "C" void CryptoNative_Pkcs7Destroy(PKCS7* p7) +void CryptoNative_Pkcs7Destroy(PKCS7* p7) { - if (p7 != nullptr) + if (p7 != NULL) { PKCS7_free(p7); } } -extern "C" int32_t CryptoNative_GetPkcs7Certificates(PKCS7* p7, X509Stack** certs) +int32_t CryptoNative_GetPkcs7Certificates(PKCS7* p7, X509Stack** certs) { if (!p7 || !certs) { @@ -70,9 +70,9 @@ extern "C" int32_t CryptoNative_GetPkcs7Certificates(PKCS7* p7, X509Stack** cert return 0; } -extern "C" int32_t CryptoNative_Pkcs7AddCertificate(PKCS7* p7, X509* x509) +int32_t CryptoNative_Pkcs7AddCertificate(PKCS7* p7, X509* x509) { - if (p7 == nullptr || x509 == nullptr) + if (p7 == NULL || x509 == NULL) { return 0; } @@ -80,12 +80,12 @@ extern "C" int32_t CryptoNative_Pkcs7AddCertificate(PKCS7* p7, X509* x509) return PKCS7_add_certificate(p7, x509); } -extern "C" int32_t CryptoNative_GetPkcs7DerSize(PKCS7* p7) +int32_t CryptoNative_GetPkcs7DerSize(PKCS7* p7) { - return i2d_PKCS7(p7, nullptr); + return i2d_PKCS7(p7, NULL); } -extern "C" int32_t CryptoNative_EncodePkcs7(PKCS7* p7, uint8_t* buf) +int32_t CryptoNative_EncodePkcs7(PKCS7* p7, uint8_t* buf) { return i2d_PKCS7(p7, &buf); } diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_pkcs7.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_pkcs7.h index e7921c1be4..59f0914a0d 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_pkcs7.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_pkcs7.h @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. #include "pal_crypto_types.h" +#include "pal_compiler.h" #include "opensslshim.h" /* @@ -12,12 +13,12 @@ Direct shim to PEM_read_bio_PKCS7. Returns the new PKCS7 instance. */ -extern "C" PKCS7* CryptoNative_PemReadBioPkcs7(BIO* bp); +DLLEXPORT PKCS7* CryptoNative_PemReadBioPkcs7(BIO* bp); /* Shims the d2i_PKCS7 method and makes it easier to invoke from managed code. */ -extern "C" PKCS7* CryptoNative_DecodePkcs7(const uint8_t* buf, int32_t len); +DLLEXPORT PKCS7* CryptoNative_DecodePkcs7(const uint8_t* buf, int32_t len); /* Reads a PKCS7 instance in DER format from a BIO. @@ -26,7 +27,7 @@ Direct shim to d2i_PKCS7_bio. Returns the new PKCS7 instance. */ -extern "C" PKCS7* CryptoNative_D2IPkcs7Bio(BIO* bp); +DLLEXPORT PKCS7* CryptoNative_D2IPkcs7Bio(BIO* bp); /* Create a new PKCS7 instance and prepare it to be a signed PKCS7 @@ -34,7 +35,7 @@ with a data payload. Returns the new PKCS7 instance. */ -extern "C" PKCS7* CryptoNative_Pkcs7CreateSigned(); +DLLEXPORT PKCS7* CryptoNative_Pkcs7CreateSigned(void); /* Cleans up and deletes a PKCS7 instance. @@ -45,7 +46,7 @@ No-op if p7 is null. The given PKCS7 pointer is invalid after this call. Always succeeds. */ -extern "C" void CryptoNative_Pkcs7Destroy(PKCS7* p7); +DLLEXPORT void CryptoNative_Pkcs7Destroy(PKCS7* p7); /* Function: @@ -59,22 +60,22 @@ Return values: 1 when the file format is understood, and *certs is assigned to the certificate contents of the structure. */ -extern "C" int32_t CryptoNative_GetPkcs7Certificates(PKCS7* p7, X509Stack** certs); +DLLEXPORT int32_t CryptoNative_GetPkcs7Certificates(PKCS7* p7, X509Stack** certs); /* Shims the PKCS7_add_certificate function and makes it easier to invoke from managed code. */ -extern "C" int32_t CryptoNative_Pkcs7AddCertificate(PKCS7* p7, X509* x509); +DLLEXPORT int32_t CryptoNative_Pkcs7AddCertificate(PKCS7* p7, X509* x509); /* Returns the number of bytes it will take to convert the PKCS7 to a DER format. */ -extern "C" int32_t CryptoNative_GetPkcs7DerSize(PKCS7* p7); +DLLEXPORT int32_t CryptoNative_GetPkcs7DerSize(PKCS7* p7); /* Shims the i2d_PKCS7 method. Returns the number of bytes written to buf. */ -extern "C" int32_t CryptoNative_EncodePkcs7(PKCS7* p7, uint8_t* buf); +DLLEXPORT int32_t CryptoNative_EncodePkcs7(PKCS7* p7, uint8_t* buf); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_rsa.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_rsa.c similarity index 65% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_rsa.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_rsa.c index 18d687bd3d..1f2fad46f4 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_rsa.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_rsa.c @@ -5,44 +5,52 @@ #include "pal_rsa.h" #include "pal_utilities.h" -extern "C" RSA* CryptoNative_RsaCreate() +RSA* CryptoNative_RsaCreate() { return RSA_new(); } -extern "C" int32_t CryptoNative_RsaUpRef(RSA* rsa) +int32_t CryptoNative_RsaUpRef(RSA* rsa) { return RSA_up_ref(rsa); } -extern "C" void CryptoNative_RsaDestroy(RSA* rsa) +void CryptoNative_RsaDestroy(RSA* rsa) { - if (rsa != nullptr) + if (rsa != NULL) { RSA_free(rsa); } } -extern "C" RSA* CryptoNative_DecodeRsaPublicKey(const uint8_t* buf, int32_t len) +RSA* CryptoNative_DecodeRsaPublicKey(const uint8_t* buf, int32_t len) { if (!buf || !len) { - return nullptr; + return NULL; } - return d2i_RSAPublicKey(nullptr, &buf, len); + return d2i_RSAPublicKey(NULL, &buf, len); } static int GetOpenSslPadding(RsaPadding padding) { - assert(padding == Pkcs1 || padding == OaepSHA1); + assert(padding == Pkcs1 || padding == OaepSHA1 || padding == NoPadding); - return padding == Pkcs1 ? RSA_PKCS1_PADDING : RSA_PKCS1_OAEP_PADDING; + switch (padding) + { + case Pkcs1: + return RSA_PKCS1_PADDING; + case OaepSHA1: + return RSA_PKCS1_OAEP_PADDING; + case NoPadding: + return RSA_NO_PADDING; + } } static int HasNoPrivateKey(RSA* rsa) { - if (rsa == nullptr) + if (rsa == NULL) return 1; // Shared pointer, don't free. @@ -51,7 +59,7 @@ static int HasNoPrivateKey(RSA* rsa) // The method has descibed itself as having the private key external to the structure. // That doesn't mean it's actually present, but we can't tell. if (meth->flags & RSA_FLAG_EXT_PKEY) - return 0; + return 0; // In the event that there's a middle-ground where we report failure when success is expected, // one could do something like check if the RSA_METHOD intercepts all private key operations: @@ -64,23 +72,23 @@ static int HasNoPrivateKey(RSA* rsa) // The module is documented as accepting either d or the full set of CRT parameters (p, q, dp, dq, qInv) // So if we see d, we're good. Otherwise, if any of the rest are missing, we're public-only. - if (rsa->d != nullptr) + if (rsa->d != NULL) return 0; - if (rsa->p == nullptr || rsa->q == nullptr || rsa->dmp1 == nullptr || rsa->dmq1 == nullptr || rsa->iqmp == nullptr) + if (rsa->p == NULL || rsa->q == NULL || rsa->dmp1 == NULL || rsa->dmq1 == NULL || rsa->iqmp == NULL) return 1; return 0; } -extern "C" int32_t +int32_t CryptoNative_RsaPublicEncrypt(int32_t flen, const uint8_t* from, uint8_t* to, RSA* rsa, RsaPadding padding) { int openSslPadding = GetOpenSslPadding(padding); return RSA_public_encrypt(flen, from, to, rsa, openSslPadding); } -extern "C" int32_t +int32_t CryptoNative_RsaPrivateDecrypt(int32_t flen, const uint8_t* from, uint8_t* to, RSA* rsa, RsaPadding padding) { if (HasNoPrivateKey(rsa)) @@ -93,20 +101,36 @@ CryptoNative_RsaPrivateDecrypt(int32_t flen, const uint8_t* from, uint8_t* to, R return RSA_private_decrypt(flen, from, to, rsa, openSslPadding); } -extern "C" int32_t CryptoNative_RsaSize(RSA* rsa) +int32_t CryptoNative_RsaSignPrimitive(int32_t flen, const uint8_t* from, uint8_t* to, RSA* rsa) +{ + if (HasNoPrivateKey(rsa)) + { + ERR_PUT_error(ERR_LIB_RSA, RSA_F_RSA_PRIVATE_ENCRYPT, RSA_R_VALUE_MISSING, __FILE__, __LINE__); + return -1; + } + + return RSA_private_encrypt(flen, from, to, rsa, RSA_NO_PADDING); +} + +int32_t CryptoNative_RsaVerificationPrimitive(int32_t flen, const uint8_t* from, uint8_t* to, RSA* rsa) +{ + return RSA_public_decrypt(flen, from, to, rsa, RSA_NO_PADDING); +} + +int32_t CryptoNative_RsaSize(RSA* rsa) { return RSA_size(rsa); } -extern "C" int32_t CryptoNative_RsaGenerateKeyEx(RSA* rsa, int32_t bits, BIGNUM* e) +int32_t CryptoNative_RsaGenerateKeyEx(RSA* rsa, int32_t bits, BIGNUM* e) { - return RSA_generate_key_ex(rsa, bits, e, nullptr); + return RSA_generate_key_ex(rsa, bits, e, NULL); } -extern "C" int32_t +int32_t CryptoNative_RsaSign(int32_t type, const uint8_t* m, int32_t mlen, uint8_t* sigret, int32_t* siglen, RSA* rsa) { - if (siglen == nullptr) + if (siglen == NULL) { assert(false); return 0; @@ -125,26 +149,26 @@ CryptoNative_RsaSign(int32_t type, const uint8_t* m, int32_t mlen, uint8_t* sigr // If the digest itself isn't known then RSA_R_UNKNOWN_ALGORITHM_TYPE will get reported, but // we have to check that the digest size matches what we expect. - if (digest != nullptr && mlen != EVP_MD_size(digest)) + if (digest != NULL && mlen != EVP_MD_size(digest)) { ERR_PUT_error(ERR_LIB_RSA, RSA_F_RSA_SIGN, RSA_R_INVALID_MESSAGE_LENGTH, __FILE__, __LINE__); return 0; } unsigned int unsignedSigLen = 0; - int32_t ret = RSA_sign(type, m, UnsignedCast(mlen), sigret, &unsignedSigLen, rsa); + int32_t ret = RSA_sign(type, m, Int32ToUint32(mlen), sigret, &unsignedSigLen, rsa); assert(unsignedSigLen <= INT32_MAX); - *siglen = static_cast(unsignedSigLen); + *siglen = (int32_t)unsignedSigLen; return ret; } -extern "C" int32_t +int32_t CryptoNative_RsaVerify(int32_t type, const uint8_t* m, int32_t mlen, uint8_t* sigbuf, int32_t siglen, RSA* rsa) { - return RSA_verify(type, m, UnsignedCast(mlen), sigbuf, UnsignedCast(siglen), rsa); + return RSA_verify(type, m, Int32ToUint32(mlen), sigbuf, Int32ToUint32(siglen), rsa); } -extern "C" int32_t CryptoNative_GetRsaParameters(const RSA* rsa, +int32_t CryptoNative_GetRsaParameters(const RSA* rsa, BIGNUM** n, BIGNUM** e, BIGNUM** d, @@ -160,21 +184,21 @@ extern "C" int32_t CryptoNative_GetRsaParameters(const RSA* rsa, // since these parameters are 'out' parameters in managed code, ensure they are initialized if (n) - *n = nullptr; + *n = NULL; if (e) - *e = nullptr; + *e = NULL; if (d) - *d = nullptr; + *d = NULL; if (p) - *p = nullptr; + *p = NULL; if (dmp1) - *dmp1 = nullptr; + *dmp1 = NULL; if (q) - *q = nullptr; + *q = NULL; if (dmq1) - *dmq1 = nullptr; + *dmq1 = NULL; if (iqmp) - *iqmp = nullptr; + *iqmp = NULL; return 0; } @@ -191,24 +215,29 @@ extern "C" int32_t CryptoNative_GetRsaParameters(const RSA* rsa, return 1; } -static void SetRsaParameter(BIGNUM** rsaFieldAddress, uint8_t* buffer, int32_t bufferLength) +static int32_t SetRsaParameter(BIGNUM** rsaFieldAddress, uint8_t* buffer, int32_t bufferLength) { - assert(rsaFieldAddress != nullptr); + assert(rsaFieldAddress != NULL); if (rsaFieldAddress) { if (!buffer || !bufferLength) { - *rsaFieldAddress = nullptr; + *rsaFieldAddress = NULL; + return 1; } else { - BIGNUM* bigNum = BN_bin2bn(buffer, bufferLength, nullptr); + BIGNUM* bigNum = BN_bin2bn(buffer, bufferLength, NULL); *rsaFieldAddress = bigNum; + + return bigNum != NULL; } } + + return 0; } -extern "C" void CryptoNative_SetRsaParameters(RSA* rsa, +int32_t CryptoNative_SetRsaParameters(RSA* rsa, uint8_t* n, int32_t nLength, uint8_t* e, @@ -229,15 +258,16 @@ extern "C" void CryptoNative_SetRsaParameters(RSA* rsa, if (!rsa) { assert(false); - return; + return 0; } - SetRsaParameter(&rsa->n, n, nLength); - SetRsaParameter(&rsa->e, e, eLength); - SetRsaParameter(&rsa->d, d, dLength); - SetRsaParameter(&rsa->p, p, pLength); - SetRsaParameter(&rsa->dmp1, dmp1, dmp1Length); - SetRsaParameter(&rsa->q, q, qLength); - SetRsaParameter(&rsa->dmq1, dmq1, dmq1Length); - SetRsaParameter(&rsa->iqmp, iqmp, iqmpLength); + return + SetRsaParameter(&rsa->n, n, nLength) && + SetRsaParameter(&rsa->e, e, eLength) && + SetRsaParameter(&rsa->d, d, dLength) && + SetRsaParameter(&rsa->p, p, pLength) && + SetRsaParameter(&rsa->dmp1, dmp1, dmp1Length) && + SetRsaParameter(&rsa->q, q, qLength) && + SetRsaParameter(&rsa->dmq1, dmq1, dmq1Length) && + SetRsaParameter(&rsa->iqmp, iqmp, iqmpLength); } diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_rsa.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_rsa.h index 45a4ad6303..83a0e01569 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_rsa.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_rsa.h @@ -3,31 +3,33 @@ // See the LICENSE file in the project root for more information. #include "pal_types.h" +#include "pal_compiler.h" #include "opensslshim.h" /* Padding options for RsaPublicEncrypt and RsaPrivateDecrypt. These values should be kept in sync with Interop.Crypto.RsaPadding. */ -enum RsaPadding : int32_t +typedef enum { Pkcs1 = 0, OaepSHA1 = 1, -}; + NoPadding = 2, +} RsaPadding; /* Shims the RSA_new method. Returns the new RSA instance. */ -extern "C" RSA* CryptoNative_RsaCreate(); +DLLEXPORT RSA* CryptoNative_RsaCreate(void); /* Shims the RSA_up_ref method. Returns 1 upon success, otherwise 0. */ -extern "C" int32_t CryptoNative_RsaUpRef(RSA* rsa); +DLLEXPORT int32_t CryptoNative_RsaUpRef(RSA* rsa); /* Cleans up and deletes a RSA instance. @@ -38,19 +40,19 @@ No-op if rsa is null. The given RSA pointer is invalid after this call. Always succeeds. */ -extern "C" void CryptoNative_RsaDestroy(RSA* rsa); +DLLEXPORT void CryptoNative_RsaDestroy(RSA* rsa); /* Shims the d2i_RSAPublicKey method and makes it easier to invoke from managed code. */ -extern "C" RSA* CryptoNative_DecodeRsaPublicKey(const uint8_t* buf, int32_t len); +DLLEXPORT RSA* CryptoNative_DecodeRsaPublicKey(const uint8_t* buf, int32_t len); /* Shims the RSA_public_encrypt method. Returns the size of the signature, or -1 on error. */ -extern "C" int32_t +DLLEXPORT int32_t CryptoNative_RsaPublicEncrypt(int32_t flen, const uint8_t* from, uint8_t* to, RSA* rsa, RsaPadding padding); /* @@ -58,29 +60,45 @@ Shims the RSA_private_decrypt method. Returns the size of the signature, or -1 on error. */ -extern "C" int32_t +DLLEXPORT int32_t CryptoNative_RsaPrivateDecrypt(int32_t flen, const uint8_t* from, uint8_t* to, RSA* rsa, RsaPadding padding); +/* +Shims RSA_private_encrypt with a fixed value of RSA_NO_PADDING. + +Requires that the input be the size of the key. +Returns the number of bytes written (which should be flen), or -1 on error. +*/ +DLLEXPORT int32_t CryptoNative_RsaSignPrimitive(int32_t flen, const uint8_t* from, uint8_t* to, RSA* rsa); + +/* +Shims RSA_public_decrypt with a fixed value of RSA_NO_PADDING. + +Requires that the input be the size of the key. +Returns the number of bytes written (which should be flen), or -1 on error. +*/ +DLLEXPORT int32_t CryptoNative_RsaVerificationPrimitive(int32_t flen, const uint8_t* from, uint8_t* to, RSA* rsa); + /* Shims the RSA_size method. Returns the RSA modulus size in bytes. */ -extern "C" int32_t CryptoNative_RsaSize(RSA* rsa); +DLLEXPORT int32_t CryptoNative_RsaSize(RSA* rsa); /* Shims the RSA_generate_key_ex method. Returns 1 upon success, otherwise 0. */ -extern "C" int32_t CryptoNative_RsaGenerateKeyEx(RSA* rsa, int32_t bits, BIGNUM* e); +DLLEXPORT int32_t CryptoNative_RsaGenerateKeyEx(RSA* rsa, int32_t bits, BIGNUM* e); /* Shims the RSA_sign method. Returns 1 upon success, otherwise 0. */ -extern "C" int32_t +DLLEXPORT int32_t CryptoNative_RsaSign(int32_t type, const uint8_t* m, int32_t mlen, uint8_t* sigret, int32_t* siglen, RSA* rsa); /* @@ -88,7 +106,7 @@ Shims the RSA_verify method. Returns 1 upon success, otherwise 0. */ -extern "C" int32_t +DLLEXPORT int32_t CryptoNative_RsaVerify(int32_t type, const uint8_t* m, int32_t mlen, uint8_t* sigbuf, int32_t siglen, RSA* rsa); /* @@ -96,7 +114,7 @@ Gets all the parameters from the RSA instance. Returns 1 upon success, otherwise 0. */ -extern "C" int32_t CryptoNative_GetRsaParameters(const RSA* rsa, +DLLEXPORT int32_t CryptoNative_GetRsaParameters(const RSA* rsa, BIGNUM** n, BIGNUM** e, BIGNUM** d, @@ -109,7 +127,7 @@ extern "C" int32_t CryptoNative_GetRsaParameters(const RSA* rsa, /* Sets all the parameters on the RSA instance. */ -extern "C" void CryptoNative_SetRsaParameters(RSA* rsa, +DLLEXPORT int32_t CryptoNative_SetRsaParameters(RSA* rsa, uint8_t* n, int32_t nLength, uint8_t* e, diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ssl.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ssl.c similarity index 58% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ssl.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ssl.c index 3e40d6cb98..c09661c9ec 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ssl.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ssl.c @@ -6,35 +6,36 @@ #include #include +#include -static_assert(PAL_SSL_ERROR_NONE == SSL_ERROR_NONE, ""); -static_assert(PAL_SSL_ERROR_SSL == SSL_ERROR_SSL, ""); -static_assert(PAL_SSL_ERROR_WANT_READ == SSL_ERROR_WANT_READ, ""); -static_assert(PAL_SSL_ERROR_WANT_WRITE == SSL_ERROR_WANT_WRITE, ""); -static_assert(PAL_SSL_ERROR_SYSCALL == SSL_ERROR_SYSCALL, ""); -static_assert(PAL_SSL_ERROR_ZERO_RETURN == SSL_ERROR_ZERO_RETURN, ""); +c_static_assert(PAL_SSL_ERROR_NONE == SSL_ERROR_NONE); +c_static_assert(PAL_SSL_ERROR_SSL == SSL_ERROR_SSL); +c_static_assert(PAL_SSL_ERROR_WANT_READ == SSL_ERROR_WANT_READ); +c_static_assert(PAL_SSL_ERROR_WANT_WRITE == SSL_ERROR_WANT_WRITE); +c_static_assert(PAL_SSL_ERROR_SYSCALL == SSL_ERROR_SYSCALL); +c_static_assert(PAL_SSL_ERROR_ZERO_RETURN == SSL_ERROR_ZERO_RETURN); -extern "C" int32_t CryptoNative_EnsureOpenSslInitialized(); +int32_t CryptoNative_EnsureOpenSslInitialized(void); -extern "C" void CryptoNative_EnsureLibSslInitialized() +void CryptoNative_EnsureLibSslInitialized() { CryptoNative_EnsureOpenSslInitialized(); SSL_library_init(); SSL_load_error_strings(); } -extern "C" const SSL_METHOD* CryptoNative_SslV2_3Method() +const SSL_METHOD* CryptoNative_SslV2_3Method() { const SSL_METHOD* method = SSLv23_method(); - assert(method != nullptr); + assert(method != NULL); return method; } -extern "C" SSL_CTX* CryptoNative_SslCtxCreate(SSL_METHOD* method) +SSL_CTX* CryptoNative_SslCtxCreate(SSL_METHOD* method) { SSL_CTX* ctx = SSL_CTX_new(method); - if (ctx != nullptr) + if (ctx != NULL) { // As of OpenSSL 1.1.0, compression is disabled by default. In case an older build // is used, ensure it's disabled. @@ -56,7 +57,7 @@ static long TrySetECDHNamedCurve(SSL_CTX* ctx) result = SSL_CTX_set_ecdh_auto(ctx, 1); #else EC_KEY *ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); - if (ecdh != nullptr) + if (ecdh != NULL) { result = SSL_CTX_set_tmp_ecdh(ctx, ecdh); EC_KEY_free(ecdh); @@ -66,7 +67,7 @@ static long TrySetECDHNamedCurve(SSL_CTX* ctx) return result; } -extern "C" void CryptoNative_SetProtocolOptions(SSL_CTX* ctx, SslProtocols protocols) +void CryptoNative_SetProtocolOptions(SSL_CTX* ctx, SslProtocols protocols) { // protocols may be 0, meaning system default, in which case let OpenSSL do what OpenSSL wants. if (protocols == 0) @@ -80,13 +81,8 @@ extern "C" void CryptoNative_SetProtocolOptions(SSL_CTX* ctx, SslProtocols proto { protocolOptions |= SSL_OP_NO_SSLv2; } -#ifndef OPENSSL_NO_SSL3 if ((protocols & PAL_SSL_SSL3) != PAL_SSL_SSL3) -#endif { - // If OPENSSL_NO_SSL3 is defined, then ensure we always include - // SSL_OP_NO_SSLv3 in case we end up running against a binary - // which had SSLv3 enabled (we don't want to use SSLv3 in that case). protocolOptions |= SSL_OP_NO_SSLv3; } if ((protocols & PAL_SSL_TLS) != PAL_SSL_TLS) @@ -107,29 +103,33 @@ extern "C" void CryptoNative_SetProtocolOptions(SSL_CTX* ctx, SslProtocols proto #endif SSL_CTX_set_options(ctx, protocolOptions); - TrySetECDHNamedCurve(ctx); + if (TrySetECDHNamedCurve(ctx) == 0) + { + ERR_clear_error(); + } } -extern "C" SSL* CryptoNative_SslCreate(SSL_CTX* ctx) +SSL* CryptoNative_SslCreate(SSL_CTX* ctx) { return SSL_new(ctx); } -extern "C" int32_t CryptoNative_SslGetError(SSL* ssl, int32_t ret) +int32_t CryptoNative_SslGetError(SSL* ssl, int32_t ret) { // This pops off "old" errors left by other operations - // until the first and last error are the same + // until the first error is equal to the last one, // this should be looked at again when OpenSsl 1.1 is migrated to while (ERR_peek_error() != ERR_peek_last_error()) { ERR_get_error(); } - int32_t errorCode = SSL_get_error(ssl, ret); - ERR_clear_error(); - return errorCode; + + // The error queue should be cleaned outside, if done here there will be no info + // for managed exception. + return SSL_get_error(ssl, ret); } -extern "C" void CryptoNative_SslDestroy(SSL* ssl) +void CryptoNative_SslDestroy(SSL* ssl) { if (ssl) { @@ -137,7 +137,7 @@ extern "C" void CryptoNative_SslDestroy(SSL* ssl) } } -extern "C" void CryptoNative_SslCtxDestroy(SSL_CTX* ctx) +void CryptoNative_SslCtxDestroy(SSL_CTX* ctx) { if (ctx) { @@ -145,36 +145,36 @@ extern "C" void CryptoNative_SslCtxDestroy(SSL_CTX* ctx) } } -extern "C" void CryptoNative_SslSetConnectState(SSL* ssl) +void CryptoNative_SslSetConnectState(SSL* ssl) { SSL_set_connect_state(ssl); } -extern "C" void CryptoNative_SslSetAcceptState(SSL* ssl) +void CryptoNative_SslSetAcceptState(SSL* ssl) { SSL_set_accept_state(ssl); } -extern "C" const char* CryptoNative_SslGetVersion(SSL* ssl) +const char* CryptoNative_SslGetVersion(SSL* ssl) { return SSL_get_version(ssl); } -extern "C" int32_t CryptoNative_SslGetFinished(SSL* ssl, void* buf, int32_t count) +int32_t CryptoNative_SslGetFinished(SSL* ssl, void* buf, int32_t count) { - size_t result = SSL_get_finished(ssl, buf, size_t(count)); + size_t result = SSL_get_finished(ssl, buf, (size_t)count); assert(result <= INT32_MAX); - return static_cast(result); + return (int32_t)result; } -extern "C" int32_t CryptoNative_SslGetPeerFinished(SSL* ssl, void* buf, int32_t count) +int32_t CryptoNative_SslGetPeerFinished(SSL* ssl, void* buf, int32_t count) { - size_t result = SSL_get_peer_finished(ssl, buf, size_t(count)); + size_t result = SSL_get_peer_finished(ssl, buf, (size_t)count); assert(result <= INT32_MAX); - return static_cast(result); + return (int32_t)result; } -extern "C" int32_t CryptoNative_SslSessionReused(SSL* ssl) +int32_t CryptoNative_SslSessionReused(SSL* ssl) { return SSL_session_reused(ssl) == 1; } @@ -192,115 +192,115 @@ static bool StringSpanEquals(const char* lhs, const char* rhs, size_t lhsLength) static CipherAlgorithmType MapCipherAlgorithmType(const char* encryption, size_t encryptionLength) { if (StringSpanEquals(encryption, "DES(56)", encryptionLength)) - return CipherAlgorithmType::Des; + return Des; if (StringSpanEquals(encryption, "3DES(168)", encryptionLength)) - return CipherAlgorithmType::TripleDes; + return TripleDes; if (StringSpanEquals(encryption, "RC4(128)", encryptionLength)) - return CipherAlgorithmType::Rc4; + return Rc4; if (StringSpanEquals(encryption, "RC2(128)", encryptionLength)) - return CipherAlgorithmType::Rc2; + return Rc2; if (StringSpanEquals(encryption, "None", encryptionLength)) - return CipherAlgorithmType::Null; + return Null; if (StringSpanEquals(encryption, "IDEA(128)", encryptionLength)) - return CipherAlgorithmType::SSL_IDEA; + return SSL_IDEA; if (StringSpanEquals(encryption, "SEED(128)", encryptionLength)) - return CipherAlgorithmType::SSL_SEED; + return SSL_SEED; if (StringSpanEquals(encryption, "AES(128)", encryptionLength)) - return CipherAlgorithmType::Aes128; + return Aes128; if (StringSpanEquals(encryption, "AES(256)", encryptionLength)) - return CipherAlgorithmType::Aes256; + return Aes256; if (StringSpanEquals(encryption, "Camellia(128)", encryptionLength)) - return CipherAlgorithmType::SSL_CAMELLIA128; + return SSL_CAMELLIA128; if (StringSpanEquals(encryption, "Camellia(256)", encryptionLength)) - return CipherAlgorithmType::SSL_CAMELLIA256; + return SSL_CAMELLIA256; if (StringSpanEquals(encryption, "GOST89(256)", encryptionLength)) - return CipherAlgorithmType::SSL_eGOST2814789CNT; + return SSL_eGOST2814789CNT; if (StringSpanEquals(encryption, "AESGCM(128)", encryptionLength)) - return CipherAlgorithmType::Aes128; + return Aes128; if (StringSpanEquals(encryption, "AESGCM(256)", encryptionLength)) - return CipherAlgorithmType::Aes256; + return Aes256; - return CipherAlgorithmType::None; + return CipherAlgorithmType_None; } static ExchangeAlgorithmType MapExchangeAlgorithmType(const char* keyExchange, size_t keyExchangeLength) { if (StringSpanEquals(keyExchange, "RSA", keyExchangeLength)) - return ExchangeAlgorithmType::RsaKeyX; + return RsaKeyX; if (StringSpanEquals(keyExchange, "DH/RSA", keyExchangeLength)) - return ExchangeAlgorithmType::DiffieHellman; + return DiffieHellman; if (StringSpanEquals(keyExchange, "DH/DSS", keyExchangeLength)) - return ExchangeAlgorithmType::DiffieHellman; + return DiffieHellman; if (StringSpanEquals(keyExchange, "DH", keyExchangeLength)) - return ExchangeAlgorithmType::DiffieHellman; + return DiffieHellman; if (StringSpanEquals(keyExchange, "KRB5", keyExchangeLength)) - return ExchangeAlgorithmType::SSL_kKRB5; + return SSL_kKRB5; if (StringSpanEquals(keyExchange, "ECDH", keyExchangeLength)) - return ExchangeAlgorithmType::SSL_ECDHE; + return SSL_ECDHE; if (StringSpanEquals(keyExchange, "ECDH/RSA", keyExchangeLength)) - return ExchangeAlgorithmType::SSL_ECDH; + return SSL_ECDH; if (StringSpanEquals(keyExchange, "ECDH/ECDSA", keyExchangeLength)) - return ExchangeAlgorithmType::SSL_ECDSA; + return SSL_ECDSA; if (StringSpanEquals(keyExchange, "PSK", keyExchangeLength)) - return ExchangeAlgorithmType::SSL_kPSK; + return SSL_kPSK; if (StringSpanEquals(keyExchange, "GOST", keyExchangeLength)) - return ExchangeAlgorithmType::SSL_kGOST; + return SSL_kGOST; if (StringSpanEquals(keyExchange, "SRP", keyExchangeLength)) - return ExchangeAlgorithmType::SSL_kSRP; + return SSL_kSRP; - return ExchangeAlgorithmType::None; + return ExchangeAlgorithmType_None; } static void GetHashAlgorithmTypeAndSize(const char* mac, size_t macLength, - HashAlgorithmType& dataHashAlg, - DataHashSize& hashKeySize) + HashAlgorithmType* dataHashAlg, + DataHashSize* hashKeySize) { if (StringSpanEquals(mac, "MD5", macLength)) { - dataHashAlg = HashAlgorithmType::Md5; - hashKeySize = DataHashSize::MD5_HashKeySize; + *dataHashAlg = Md5; + *hashKeySize = MD5_HashKeySize; return; } if (StringSpanEquals(mac, "SHA1", macLength)) { - dataHashAlg = HashAlgorithmType::Sha1; - hashKeySize = DataHashSize::SHA1_HashKeySize; + *dataHashAlg = Sha1; + *hashKeySize = SHA1_HashKeySize; return; } if (StringSpanEquals(mac, "GOST94", macLength)) { - dataHashAlg = HashAlgorithmType::SSL_GOST94; - hashKeySize = DataHashSize::GOST_HashKeySize; + *dataHashAlg = SSL_GOST94; + *hashKeySize = GOST_HashKeySize; return; } if (StringSpanEquals(mac, "GOST89", macLength)) { - dataHashAlg = HashAlgorithmType::SSL_GOST89; - hashKeySize = DataHashSize::GOST_HashKeySize; + *dataHashAlg = SSL_GOST89; + *hashKeySize = GOST_HashKeySize; return; } if (StringSpanEquals(mac, "SHA256", macLength)) { - dataHashAlg = HashAlgorithmType::SSL_SHA256; - hashKeySize = DataHashSize::SHA256_HashKeySize; + *dataHashAlg = SSL_SHA256; + *hashKeySize = SHA256_HashKeySize; return; } if (StringSpanEquals(mac, "SHA384", macLength)) { - dataHashAlg = HashAlgorithmType::SSL_SHA384; - hashKeySize = DataHashSize::SHA384_HashKeySize; + *dataHashAlg = SSL_SHA384; + *hashKeySize = SHA384_HashKeySize; return; } if (StringSpanEquals(mac, "AEAD", macLength)) { - dataHashAlg = HashAlgorithmType::SSL_AEAD; - hashKeySize = DataHashSize::Default; + *dataHashAlg = SSL_AEAD; + *hashKeySize = Default; return; } - dataHashAlg = HashAlgorithmType::None; - hashKeySize = DataHashSize::Default; + *dataHashAlg = HashAlgorithmType_None; + *hashKeySize = Default; } /* @@ -310,11 +310,11 @@ Given a keyName string like "Enc=XXX", parses the description string and returns Returns a value indicating whether the pattern starting with keyName was found in description. */ static bool GetDescriptionValue( - const char* description, const char* keyName, size_t keyNameLength, const char** value, size_t& valueLength) + const char* description, const char* keyName, size_t keyNameLength, const char** value, size_t* valueLength) { // search for keyName in description const char* keyNameStart = strstr(description, keyName); - if (keyNameStart != nullptr) + if (keyNameStart != NULL) { // set valueStart to the beginning of the value const char* valueStart = keyNameStart + keyNameLength; @@ -327,55 +327,56 @@ static bool GetDescriptionValue( } *value = valueStart; - valueLength = index; + *valueLength = index; return true; } return false; } +#define descriptionLength 256 + /* Parses the Kx, Enc, and Mac values out of the SSL_CIPHER_description and maps the values to the corresponding .NET enum value. */ static bool GetSslConnectionInfoFromDescription(const SSL_CIPHER* cipher, - CipherAlgorithmType& dataCipherAlg, - ExchangeAlgorithmType& keyExchangeAlg, - HashAlgorithmType& dataHashAlg, - DataHashSize& hashKeySize) + CipherAlgorithmType* dataCipherAlg, + ExchangeAlgorithmType* keyExchangeAlg, + HashAlgorithmType* dataHashAlg, + DataHashSize* hashKeySize) { - const int descriptionLength = 256; - char description[descriptionLength] = {}; + char description[descriptionLength] = { 0 }; SSL_CIPHER_description(cipher, description, descriptionLength - 1); // ensure description is NULL-terminated const char* keyExchange; size_t keyExchangeLength; - if (!GetDescriptionValue(description, "Kx=", 3, &keyExchange, keyExchangeLength)) + if (!GetDescriptionValue(description, "Kx=", 3, &keyExchange, &keyExchangeLength)) { return false; } const char* encryption; size_t encryptionLength; - if (!GetDescriptionValue(description, "Enc=", 4, &encryption, encryptionLength)) + if (!GetDescriptionValue(description, "Enc=", 4, &encryption, &encryptionLength)) { return false; } const char* mac; size_t macLength; - if (!GetDescriptionValue(description, "Mac=", 4, &mac, macLength)) + if (!GetDescriptionValue(description, "Mac=", 4, &mac, &macLength)) { return false; } - keyExchangeAlg = MapExchangeAlgorithmType(keyExchange, keyExchangeLength); - dataCipherAlg = MapCipherAlgorithmType(encryption, encryptionLength); + *keyExchangeAlg = MapExchangeAlgorithmType(keyExchange, keyExchangeLength); + *dataCipherAlg = MapCipherAlgorithmType(encryption, encryptionLength); GetHashAlgorithmTypeAndSize(mac, macLength, dataHashAlg, hashKeySize); return true; } -extern "C" int32_t CryptoNative_GetSslConnectionInfo(SSL* ssl, +int32_t CryptoNative_GetSslConnectionInfo(SSL* ssl, CipherAlgorithmType* dataCipherAlg, ExchangeAlgorithmType* keyExchangeAlg, HashAlgorithmType* dataHashAlg, @@ -396,7 +397,7 @@ extern "C" int32_t CryptoNative_GetSslConnectionInfo(SSL* ssl, } *dataKeySize = cipher->alg_bits; - if (GetSslConnectionInfoFromDescription(cipher, *dataCipherAlg, *keyExchangeAlg, *dataHashAlg, *hashKeySize)) + if (GetSslConnectionInfoFromDescription(cipher, dataCipherAlg, keyExchangeAlg, dataHashAlg, hashKeySize)) { return 1; } @@ -405,104 +406,104 @@ err: assert(false); if (dataCipherAlg) - *dataCipherAlg = CipherAlgorithmType::None; + *dataCipherAlg = CipherAlgorithmType_None; if (keyExchangeAlg) - *keyExchangeAlg = ExchangeAlgorithmType::None; + *keyExchangeAlg = ExchangeAlgorithmType_None; if (dataHashAlg) - *dataHashAlg = HashAlgorithmType::None; + *dataHashAlg = HashAlgorithmType_None; if (dataKeySize) *dataKeySize = 0; if (hashKeySize) - *hashKeySize = DataHashSize::Default; + *hashKeySize = Default; return 0; } -extern "C" int32_t CryptoNative_SslWrite(SSL* ssl, const void* buf, int32_t num) +int32_t CryptoNative_SslWrite(SSL* ssl, const void* buf, int32_t num) { return SSL_write(ssl, buf, num); } -extern "C" int32_t CryptoNative_SslRead(SSL* ssl, void* buf, int32_t num) +int32_t CryptoNative_SslRead(SSL* ssl, void* buf, int32_t num) { return SSL_read(ssl, buf, num); } -extern "C" int32_t CryptoNative_IsSslRenegotiatePending(SSL* ssl) +int32_t CryptoNative_IsSslRenegotiatePending(SSL* ssl) { return SSL_renegotiate_pending(ssl) != 0; } -extern "C" int32_t CryptoNative_SslShutdown(SSL* ssl) +int32_t CryptoNative_SslShutdown(SSL* ssl) { ERR_clear_error(); return SSL_shutdown(ssl); } -extern "C" void CryptoNative_SslSetBio(SSL* ssl, BIO* rbio, BIO* wbio) +void CryptoNative_SslSetBio(SSL* ssl, BIO* rbio, BIO* wbio) { SSL_set_bio(ssl, rbio, wbio); } -extern "C" int32_t CryptoNative_SslDoHandshake(SSL* ssl) +int32_t CryptoNative_SslDoHandshake(SSL* ssl) { ERR_clear_error(); return SSL_do_handshake(ssl); } -extern "C" int32_t CryptoNative_IsSslStateOK(SSL* ssl) +int32_t CryptoNative_IsSslStateOK(SSL* ssl) { return SSL_state(ssl) == SSL_ST_OK; } -extern "C" X509* CryptoNative_SslGetPeerCertificate(SSL* ssl) +X509* CryptoNative_SslGetPeerCertificate(SSL* ssl) { return SSL_get_peer_certificate(ssl); } -extern "C" X509Stack* CryptoNative_SslGetPeerCertChain(SSL* ssl) +X509Stack* CryptoNative_SslGetPeerCertChain(SSL* ssl) { return SSL_get_peer_cert_chain(ssl); } -extern "C" int32_t CryptoNative_SslCtxUseCertificate(SSL_CTX* ctx, X509* x) +int32_t CryptoNative_SslCtxUseCertificate(SSL_CTX* ctx, X509* x) { return SSL_CTX_use_certificate(ctx, x); } -extern "C" int32_t CryptoNative_SslCtxUsePrivateKey(SSL_CTX* ctx, EVP_PKEY* pkey) +int32_t CryptoNative_SslCtxUsePrivateKey(SSL_CTX* ctx, EVP_PKEY* pkey) { return SSL_CTX_use_PrivateKey(ctx, pkey); } -extern "C" int32_t CryptoNative_SslCtxCheckPrivateKey(SSL_CTX* ctx) +int32_t CryptoNative_SslCtxCheckPrivateKey(SSL_CTX* ctx) { return SSL_CTX_check_private_key(ctx); } -extern "C" void CryptoNative_SslCtxSetQuietShutdown(SSL_CTX* ctx) +void CryptoNative_SslCtxSetQuietShutdown(SSL_CTX* ctx) { SSL_CTX_set_quiet_shutdown(ctx, 1); } -extern "C" void CryptoNative_SslSetQuietShutdown(SSL* ssl, int mode) +void CryptoNative_SslSetQuietShutdown(SSL* ssl, int mode) { SSL_set_quiet_shutdown(ssl, mode); } -extern "C" X509NameStack* CryptoNative_SslGetClientCAList(SSL* ssl) +X509NameStack* CryptoNative_SslGetClientCAList(SSL* ssl) { return SSL_get_client_CA_list(ssl); } -extern "C" void CryptoNative_SslCtxSetVerify(SSL_CTX* ctx, SslCtxSetVerifyCallback callback) +void CryptoNative_SslCtxSetVerify(SSL_CTX* ctx, SslCtxSetVerifyCallback callback) { int mode = SSL_VERIFY_PEER; SSL_CTX_set_verify(ctx, mode, callback); } -extern "C" void +void CryptoNative_SslCtxSetCertVerifyCallback(SSL_CTX* ctx, SslCtxSetCertVerifyCallbackCallback callback, void* arg) { SSL_CTX_set_cert_verify_callback(ctx, callback, arg); @@ -511,38 +512,40 @@ CryptoNative_SslCtxSetCertVerifyCallback(SSL_CTX* ctx, SslCtxSetCertVerifyCallba // delimiter ":" is used to allow more than one strings // below string is corresponding to "AllowNoEncryption" #define SSL_TXT_Separator ":" +#define SSL_TXT_Exclusion "!" #define SSL_TXT_AllIncludingNull SSL_TXT_ALL SSL_TXT_Separator SSL_TXT_eNULL +#define SSL_TXT_NotAnon SSL_TXT_Separator SSL_TXT_Exclusion SSL_TXT_aNULL -extern "C" int32_t CryptoNative_SetEncryptionPolicy(SSL_CTX* ctx, EncryptionPolicy policy) +int32_t CryptoNative_SetEncryptionPolicy(SSL_CTX* ctx, EncryptionPolicy policy) { - const char* cipherString = nullptr; + const char* cipherString = NULL; switch (policy) { - case EncryptionPolicy::RequireEncryption: - cipherString = SSL_TXT_ALL; + case RequireEncryption: + cipherString = SSL_TXT_ALL SSL_TXT_NotAnon; break; - case EncryptionPolicy::AllowNoEncryption: + case AllowNoEncryption: cipherString = SSL_TXT_AllIncludingNull; break; - case EncryptionPolicy::NoEncryption: + case NoEncryption: cipherString = SSL_TXT_eNULL; break; } - assert(cipherString != nullptr); + assert(cipherString != NULL); return SSL_CTX_set_cipher_list(ctx, cipherString); } -extern "C" void CryptoNative_SslCtxSetClientCertCallback(SSL_CTX* ctx, SslClientCertCallback callback) +void CryptoNative_SslCtxSetClientCertCallback(SSL_CTX* ctx, SslClientCertCallback callback) { SSL_CTX_set_client_cert_cb(ctx, callback); } -extern "C" int32_t CryptoNative_SslAddExtraChainCert(SSL* ssl, X509* x509) +int32_t CryptoNative_SslAddExtraChainCert(SSL* ssl, X509* x509) { if (!x509 || !ssl) { @@ -558,7 +561,7 @@ extern "C" int32_t CryptoNative_SslAddExtraChainCert(SSL* ssl, X509* x509) return 0; } -extern "C" void CryptoNative_SslCtxSetAlpnSelectCb(SSL_CTX* ctx, SslCtxSetAlpnCallback cb, void* arg) +void CryptoNative_SslCtxSetAlpnSelectCb(SSL_CTX* ctx, SslCtxSetAlpnCallback cb, void* arg) { #if HAVE_OPENSSL_ALPN if (API_EXISTS(SSL_CTX_set_alpn_select_cb)) @@ -572,7 +575,7 @@ extern "C" void CryptoNative_SslCtxSetAlpnSelectCb(SSL_CTX* ctx, SslCtxSetAlpnCa #endif } -extern "C" int32_t CryptoNative_SslCtxSetAlpnProtos(SSL_CTX* ctx, const uint8_t* protos, uint32_t protos_len) +int32_t CryptoNative_SslCtxSetAlpnProtos(SSL_CTX* ctx, const uint8_t* protos, uint32_t protos_len) { #if HAVE_OPENSSL_ALPN if (API_EXISTS(SSL_CTX_set_alpn_protos)) @@ -590,7 +593,7 @@ extern "C" int32_t CryptoNative_SslCtxSetAlpnProtos(SSL_CTX* ctx, const uint8_t* } } -extern "C" void CryptoNative_SslGet0AlpnSelected(SSL* ssl, const uint8_t** protocol, uint32_t* len) +void CryptoNative_SslGet0AlpnSelected(SSL* ssl, const uint8_t** protocol, uint32_t* len) { #if HAVE_OPENSSL_ALPN if (API_EXISTS(SSL_get0_alpn_selected)) @@ -602,13 +605,13 @@ extern "C" void CryptoNative_SslGet0AlpnSelected(SSL* ssl, const uint8_t** proto (void)ssl; #endif { - *protocol = nullptr; + *protocol = NULL; *len = 0; } } -extern "C" int32_t CryptoNative_SslSetTlsExtHostName(SSL* ssl, const uint8_t* name) +int32_t CryptoNative_SslSetTlsExtHostName(SSL* ssl, uint8_t* name) { - return static_cast(SSL_set_tlsext_host_name(ssl, name)); + return (int32_t)SSL_set_tlsext_host_name(ssl, name); } diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ssl.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ssl.h index a5415a17d9..971018b686 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ssl.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_ssl.h @@ -3,12 +3,13 @@ // See the LICENSE file in the project root for more information. #include "pal_crypto_types.h" +#include "pal_compiler.h" #include "opensslshim.h" /* These values should be kept in sync with System.Security.Authentication.SslProtocols. */ -enum SslProtocols : int32_t +typedef enum { PAL_SSL_NONE = 0, PAL_SSL_SSL2 = 12, @@ -16,24 +17,24 @@ enum SslProtocols : int32_t PAL_SSL_TLS = 192, PAL_SSL_TLS11 = 768, PAL_SSL_TLS12 = 3072 -}; +} SslProtocols; /* These values should be kept in sync with System.Net.Security.EncryptionPolicy. */ -enum class EncryptionPolicy : int32_t +typedef enum { RequireEncryption = 0, AllowNoEncryption, NoEncryption -}; +} EncryptionPolicy; /* These values should be kept in sync with System.Security.Authentication.CipherAlgorithmType. */ -enum class CipherAlgorithmType : int32_t +typedef enum { - None = 0, + CipherAlgorithmType_None = 0, Null = 24576, Des = 26113, Rc2 = 26114, @@ -50,14 +51,14 @@ enum class CipherAlgorithmType : int32_t SSL_CAMELLIA256 = 229382, SSL_eGOST2814789CNT = 229383, SSL_SEED = 229384, -}; +} CipherAlgorithmType; /* These values should be kept in sync with System.Security.Authentication.ExchangeAlgorithmType. */ -enum class ExchangeAlgorithmType : int32_t +typedef enum { - None, + ExchangeAlgorithmType_None, RsaSign = 9216, RsaKeyX = 41984, DiffieHellman = 43522, @@ -70,14 +71,14 @@ enum class ExchangeAlgorithmType : int32_t SSL_kGOST = 229391, SSL_kSRP = 229392, SSL_kKRB5 = 229393, -}; +} ExchangeAlgorithmType; /* These values should be kept in sync with System.Security.Authentication.HashAlgorithmType. */ -enum class HashAlgorithmType : int32_t +typedef enum { - None = 0, + HashAlgorithmType_None = 0, Md5 = 32771, Sha1 = 32772, @@ -87,9 +88,9 @@ enum class HashAlgorithmType : int32_t SSL_GOST94 = 229410, SSL_GOST89 = 229411, SSL_AEAD = 229412, -}; +} HashAlgorithmType; -enum class DataHashSize : int32_t +typedef enum { MD5_HashKeySize = 8 * MD5_DIGEST_LENGTH, SHA1_HashKeySize = 8 * SHA_DIGEST_LENGTH, @@ -97,9 +98,9 @@ enum class DataHashSize : int32_t SHA384_HashKeySize = 8 * SHA384_DIGEST_LENGTH, GOST_HashKeySize = 256, Default = 0, -}; +} DataHashSize; -enum SslErrorCode : int32_t +enum SslErrorCode { PAL_SSL_ERROR_NONE = 0, PAL_SSL_ERROR_SSL = 1, @@ -128,40 +129,40 @@ typedef int32_t (*SslCtxSetAlpnCallback)(SSL* ssl, /* Ensures that libssl is correctly initialized and ready to use. */ -extern "C" void CryptoNative_EnsureLibSslInitialized(); +DLLEXPORT void CryptoNative_EnsureLibSslInitialized(void); /* Shims the SSLv23_method method. Returns the requested SSL_METHOD. */ -extern "C" const SSL_METHOD* CryptoNative_SslV2_3Method(); +DLLEXPORT const SSL_METHOD* CryptoNative_SslV2_3Method(void); /* Shims the SSL_CTX_new method. Returns the new SSL_CTX instance. */ -extern "C" SSL_CTX* CryptoNative_SslCtxCreate(SSL_METHOD* method); +DLLEXPORT SSL_CTX* CryptoNative_SslCtxCreate(SSL_METHOD* method); /* Sets the specified protocols in the SSL_CTX options. */ -extern "C" void CryptoNative_SetProtocolOptions(SSL_CTX* ctx, SslProtocols protocols); +DLLEXPORT void CryptoNative_SetProtocolOptions(SSL_CTX* ctx, SslProtocols protocols); /* Shims the SSL_new method. Returns the new SSL instance. */ -extern "C" SSL* CryptoNative_SslCreate(SSL_CTX* ctx); +DLLEXPORT SSL* CryptoNative_SslCreate(SSL_CTX* ctx); /* Shims the SSL_get_error method. Returns the error code for the specified result. */ -extern "C" int32_t CryptoNative_SslGetError(SSL* ssl, int32_t ret); +DLLEXPORT int32_t CryptoNative_SslGetError(SSL* ssl, int32_t ret); /* Cleans up and deletes an SSL instance. @@ -172,7 +173,7 @@ No-op if ssl is null. The given X509 SSL is invalid after this call. Always succeeds. */ -extern "C" void CryptoNative_SslDestroy(SSL* ssl); +DLLEXPORT void CryptoNative_SslDestroy(SSL* ssl); /* Cleans up and deletes an SSL_CTX instance. @@ -183,24 +184,24 @@ No-op if ctx is null. The given X509 SSL_CTX is invalid after this call. Always succeeds. */ -extern "C" void CryptoNative_SslCtxDestroy(SSL_CTX* ctx); +DLLEXPORT void CryptoNative_SslCtxDestroy(SSL_CTX* ctx); /* Shims the SSL_set_connect_state method. */ -extern "C" void CryptoNative_SslSetConnectState(SSL* ssl); +DLLEXPORT void CryptoNative_SslSetConnectState(SSL* ssl); /* Shims the SSL_set_accept_state method. */ -extern "C" void CryptoNative_SslSetAcceptState(SSL* ssl); +DLLEXPORT void CryptoNative_SslSetAcceptState(SSL* ssl); /* Shims the SSL_get_version method. Returns the protocol version string for the SSL instance. */ -extern "C" const char* CryptoNative_SslGetVersion(SSL* ssl); +DLLEXPORT const char* CryptoNative_SslGetVersion(SSL* ssl); /* Returns the connection information for the SSL instance. @@ -208,7 +209,7 @@ Returns the connection information for the SSL instance. Returns 1 upon success, otherwise 0. */ -extern "C" int32_t CryptoNative_GetSslConnectionInfo(SSL* ssl, +DLLEXPORT int32_t CryptoNative_GetSslConnectionInfo(SSL* ssl, CipherAlgorithmType* dataCipherAlg, ExchangeAlgorithmType* keyExchangeAlg, HashAlgorithmType* dataHashAlg, @@ -221,7 +222,7 @@ Shims the SSL_write method. Returns the positive number of bytes written when successful, 0 or a negative number when an error is encountered. */ -extern "C" int32_t CryptoNative_SslWrite(SSL* ssl, const void* buf, int32_t num); +DLLEXPORT int32_t CryptoNative_SslWrite(SSL* ssl, const void* buf, int32_t num); /* Shims the SSL_read method. @@ -229,14 +230,14 @@ Shims the SSL_read method. Returns the positive number of bytes read when successful, 0 or a negative number when an error is encountered. */ -extern "C" int32_t CryptoNative_SslRead(SSL* ssl, void* buf, int32_t num); +DLLEXPORT int32_t CryptoNative_SslRead(SSL* ssl, void* buf, int32_t num); /* Shims the SSL_renegotiate_pending method. Returns 1 when negotiation is requested; 0 once a handshake has finished. */ -extern "C" int32_t CryptoNative_IsSslRenegotiatePending(SSL* ssl); +DLLEXPORT int32_t CryptoNative_IsSslRenegotiatePending(SSL* ssl); /* Shims the SSL_shutdown method. @@ -246,12 +247,12 @@ Returns: 0 if the shutdown is not yet finished; <0 if the shutdown was not successful because a fatal error. */ -extern "C" int32_t CryptoNative_SslShutdown(SSL* ssl); +DLLEXPORT int32_t CryptoNative_SslShutdown(SSL* ssl); /* Shims the SSL_set_bio method. */ -extern "C" void CryptoNative_SslSetBio(SSL* ssl, BIO* rbio, BIO* wbio); +DLLEXPORT void CryptoNative_SslSetBio(SSL* ssl, BIO* rbio, BIO* wbio); /* Shims the SSL_do_handshake method. @@ -262,104 +263,104 @@ Returns: and by the specifications of the TLS/SSL protocol; <0 if the handshake was not successful because of a fatal error. */ -extern "C" int32_t CryptoNative_SslDoHandshake(SSL* ssl); +DLLEXPORT int32_t CryptoNative_SslDoHandshake(SSL* ssl); /* Gets a value indicating whether the SSL_state is SSL_ST_OK. Returns 1 if the state is OK, otherwise 0. */ -extern "C" int32_t CryptoNative_IsSslStateOK(SSL* ssl); +DLLEXPORT int32_t CryptoNative_IsSslStateOK(SSL* ssl); /* Shims the SSL_get_peer_certificate method. Returns the certificate presented by the peer. */ -extern "C" X509* CryptoNative_SslGetPeerCertificate(SSL* ssl); +DLLEXPORT X509* CryptoNative_SslGetPeerCertificate(SSL* ssl); /* Shims the SSL_get_peer_cert_chain method. Returns the certificate chain presented by the peer. */ -extern "C" X509Stack* CryptoNative_SslGetPeerCertChain(SSL* ssl); +DLLEXPORT X509Stack* CryptoNative_SslGetPeerCertChain(SSL* ssl); /* Shims the SSL_CTX_use_certificate method. Returns 1 upon success, otherwise 0. */ -extern "C" int32_t CryptoNative_SslCtxUseCertificate(SSL_CTX* ctx, X509* x); +DLLEXPORT int32_t CryptoNative_SslCtxUseCertificate(SSL_CTX* ctx, X509* x); /* Shims the SSL_CTX_use_PrivateKey method. Returns 1 upon success, otherwise 0. */ -extern "C" int32_t CryptoNative_SslCtxUsePrivateKey(SSL_CTX* ctx, EVP_PKEY* pkey); +DLLEXPORT int32_t CryptoNative_SslCtxUsePrivateKey(SSL_CTX* ctx, EVP_PKEY* pkey); /* Shims the SSL_CTX_check_private_key method. Returns 1 upon success, otherwise 0. */ -extern "C" int32_t CryptoNative_SslCtxCheckPrivateKey(SSL_CTX* ctx); +DLLEXPORT int32_t CryptoNative_SslCtxCheckPrivateKey(SSL_CTX* ctx); /* Shims the SSL_CTX_set_quiet_shutdown method. */ -extern "C" void CryptoNative_SslCtxSetQuietShutdown(SSL_CTX* ctx); +DLLEXPORT void CryptoNative_SslCtxSetQuietShutdown(SSL_CTX* ctx); /* Shims the SSL_set_quiet_shutdown method. */ -extern "C" void CryptoNative_SslSetQuietShutdown(SSL* ctx, int mode); +DLLEXPORT void CryptoNative_SslSetQuietShutdown(SSL* ctx, int mode); /* Shims the SSL_get_client_CA_list method. Returns the list of CA names explicity set. */ -extern "C" X509NameStack* CryptoNative_SslGetClientCAList(SSL* ssl); +DLLEXPORT X509NameStack* CryptoNative_SslGetClientCAList(SSL* ssl); /* Shims the SSL_CTX_set_verify method. */ -extern "C" void CryptoNative_SslCtxSetVerify(SSL_CTX* ctx, SslCtxSetVerifyCallback callback); +DLLEXPORT void CryptoNative_SslCtxSetVerify(SSL_CTX* ctx, SslCtxSetVerifyCallback callback); /* Shims the SSL_CTX_set_cert_verify_callback method. */ -extern "C" void +DLLEXPORT void CryptoNative_SslCtxSetCertVerifyCallback(SSL_CTX* ctx, SslCtxSetCertVerifyCallbackCallback callback, void* arg); /* Sets the specified encryption policy on the SSL_CTX. Returns 1 if any cipher could be selected, and 0 if none were available. */ -extern "C" int32_t CryptoNative_SetEncryptionPolicy(SSL_CTX* ctx, EncryptionPolicy policy); +DLLEXPORT int32_t CryptoNative_SetEncryptionPolicy(SSL_CTX* ctx, EncryptionPolicy policy); /* Shims the SSL_CTX_set_client_cert_cb method */ -extern "C" void CryptoNative_SslCtxSetClientCertCallback(SSL_CTX* ctx, SslClientCertCallback callback); +DLLEXPORT void CryptoNative_SslCtxSetClientCertCallback(SSL_CTX* ctx, SslClientCertCallback callback); /* Shims the SSL_get_finished method. */ -extern "C" int32_t CryptoNative_SslGetFinished(SSL* ssl, void* buf, int32_t count); +DLLEXPORT int32_t CryptoNative_SslGetFinished(SSL* ssl, void* buf, int32_t count); /* Shims the SSL_get_peer_finished method. */ -extern "C" int32_t CryptoNative_SslGetPeerFinished(SSL* ssl, void* buf, int32_t count); +DLLEXPORT int32_t CryptoNative_SslGetPeerFinished(SSL* ssl, void* buf, int32_t count); /* Returns true/false based on if existing ssl session was re-used or not. Shims the SSL_session_reused macro. */ -extern "C" int32_t CryptoNative_SslSessionReused(SSL* ssl); +DLLEXPORT int32_t CryptoNative_SslSessionReused(SSL* ssl); /* adds the given certificate to the extra chain certificates associated with ctx that is associated with the ssl. @@ -367,26 +368,26 @@ adds the given certificate to the extra chain certificates associated with ctx t libssl frees the x509 object. Returns 1 if success and 0 in case of failure */ -extern "C" int32_t CryptoNative_SslAddExtraChainCert(SSL* ssl, X509* x509); +DLLEXPORT int32_t CryptoNative_SslAddExtraChainCert(SSL* ssl, X509* x509); /* Shims the ssl_ctx_set_alpn_select_cb method. */ -extern "C" void CryptoNative_SslCtxSetAlpnSelectCb(SSL_CTX* ctx, SslCtxSetAlpnCallback cb, void *arg); +DLLEXPORT void CryptoNative_SslCtxSetAlpnSelectCb(SSL_CTX* ctx, SslCtxSetAlpnCallback cb, void *arg); /* Shims the ssl_ctx_set_alpn_protos method. Returns 0 on success, non-zero on failure. */ -extern "C" int32_t CryptoNative_SslCtxSetAlpnProtos(SSL_CTX* ctx, const uint8_t* protos, uint32_t protos_len); +DLLEXPORT int32_t CryptoNative_SslCtxSetAlpnProtos(SSL_CTX* ctx, const uint8_t* protos, uint32_t protos_len); /* Shims the ssl_get0_alpn_selected method. */ -extern "C" void CryptoNative_SslGet0AlpnSelected(SSL* ssl, const uint8_t** protocol, uint32_t* len); +DLLEXPORT void CryptoNative_SslGet0AlpnSelected(SSL* ssl, const uint8_t** protocol, uint32_t* len); /* Shims the SSL_set_tlsext_host_name method. */ -extern "C" int32_t CryptoNative_SslSetTlsExtHostName(SSL* ssl, const uint8_t* name); +DLLEXPORT int32_t CryptoNative_SslSetTlsExtHostName(SSL* ssl, uint8_t* name); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509.c b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509.c new file mode 100644 index 0000000000..67e2e2521e --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509.c @@ -0,0 +1,310 @@ +// 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. + +#include "pal_x509.h" + +#include +#include + +c_static_assert(PAL_X509_V_OK == X509_V_OK); +c_static_assert(PAL_X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT); +c_static_assert(PAL_X509_V_ERR_UNABLE_TO_GET_CRL == X509_V_ERR_UNABLE_TO_GET_CRL); +c_static_assert(PAL_X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE == X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE); +c_static_assert(PAL_X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY == X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY); +c_static_assert(PAL_X509_V_ERR_CERT_SIGNATURE_FAILURE == X509_V_ERR_CERT_SIGNATURE_FAILURE); +c_static_assert(PAL_X509_V_ERR_CRL_SIGNATURE_FAILURE == X509_V_ERR_CRL_SIGNATURE_FAILURE); +c_static_assert(PAL_X509_V_ERR_CERT_NOT_YET_VALID == X509_V_ERR_CERT_NOT_YET_VALID); +c_static_assert(PAL_X509_V_ERR_CERT_HAS_EXPIRED == X509_V_ERR_CERT_HAS_EXPIRED); +c_static_assert(PAL_X509_V_ERR_CRL_NOT_YET_VALID == X509_V_ERR_CRL_NOT_YET_VALID); +c_static_assert(PAL_X509_V_ERR_CRL_HAS_EXPIRED == X509_V_ERR_CRL_HAS_EXPIRED); +c_static_assert(PAL_X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD == X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD); +c_static_assert(PAL_X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD == X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD); +c_static_assert(PAL_X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD == X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD); +c_static_assert(PAL_X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD == X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD); +c_static_assert(PAL_X509_V_ERR_OUT_OF_MEM == X509_V_ERR_OUT_OF_MEM); +c_static_assert(PAL_X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT); +c_static_assert(PAL_X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN); +c_static_assert(PAL_X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY); +c_static_assert(PAL_X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE); +c_static_assert(PAL_X509_V_ERR_CERT_CHAIN_TOO_LONG == X509_V_ERR_CERT_CHAIN_TOO_LONG); +c_static_assert(PAL_X509_V_ERR_CERT_REVOKED == X509_V_ERR_CERT_REVOKED); +c_static_assert(PAL_X509_V_ERR_INVALID_CA == X509_V_ERR_INVALID_CA); +c_static_assert(PAL_X509_V_ERR_PATH_LENGTH_EXCEEDED == X509_V_ERR_PATH_LENGTH_EXCEEDED); +c_static_assert(PAL_X509_V_ERR_INVALID_PURPOSE == X509_V_ERR_INVALID_PURPOSE); +c_static_assert(PAL_X509_V_ERR_CERT_UNTRUSTED == X509_V_ERR_CERT_UNTRUSTED); +c_static_assert(PAL_X509_V_ERR_CERT_REJECTED == X509_V_ERR_CERT_REJECTED); +c_static_assert(PAL_X509_V_ERR_KEYUSAGE_NO_CERTSIGN == X509_V_ERR_KEYUSAGE_NO_CERTSIGN); +c_static_assert(PAL_X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER == X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER); +c_static_assert(PAL_X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION == X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION); +c_static_assert(PAL_X509_V_ERR_KEYUSAGE_NO_CRL_SIGN == X509_V_ERR_KEYUSAGE_NO_CRL_SIGN); +c_static_assert(PAL_X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION == X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION); +c_static_assert(PAL_X509_V_ERR_INVALID_NON_CA == X509_V_ERR_INVALID_NON_CA); +c_static_assert(PAL_X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE == X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE); +c_static_assert(PAL_X509_V_ERR_INVALID_EXTENSION == X509_V_ERR_INVALID_EXTENSION); +c_static_assert(PAL_X509_V_ERR_INVALID_POLICY_EXTENSION == X509_V_ERR_INVALID_POLICY_EXTENSION); +c_static_assert(PAL_X509_V_ERR_NO_EXPLICIT_POLICY == X509_V_ERR_NO_EXPLICIT_POLICY); + +EVP_PKEY* CryptoNative_GetX509EvpPublicKey(X509* x509) +{ + if (!x509) + { + return NULL; + } + + // X509_get_X509_PUBKEY returns an interior pointer, so should not be freed + return X509_PUBKEY_get(X509_get_X509_PUBKEY(x509)); +} + +X509_CRL* CryptoNative_DecodeX509Crl(const uint8_t* buf, int32_t len) +{ + if (!buf || !len) + { + return NULL; + } + + return d2i_X509_CRL(NULL, &buf, len); +} + +X509* CryptoNative_DecodeX509(const uint8_t* buf, int32_t len) +{ + if (!buf || !len) + { + return NULL; + } + + return d2i_X509(NULL, &buf, len); +} + +int32_t CryptoNative_GetX509DerSize(X509* x) +{ + return i2d_X509(x, NULL); +} + +int32_t CryptoNative_EncodeX509(X509* x, uint8_t* buf) +{ + return i2d_X509(x, &buf); +} + +void CryptoNative_X509Destroy(X509* a) +{ + if (a != NULL) + { + X509_free(a); + } +} + +X509* CryptoNative_X509Duplicate(X509* x509) +{ + return X509_dup(x509); +} + +X509* CryptoNative_PemReadX509FromBio(BIO* bio) +{ + return PEM_read_bio_X509_AUX(bio, NULL, NULL, NULL); +} + +ASN1_INTEGER* CryptoNative_X509GetSerialNumber(X509* x509) +{ + return X509_get_serialNumber(x509); +} + +X509_NAME* CryptoNative_X509GetIssuerName(X509* x509) +{ + return X509_get_issuer_name(x509); +} + +X509_NAME* CryptoNative_X509GetSubjectName(X509* x509) +{ + return X509_get_subject_name(x509); +} + +int32_t CryptoNative_X509CheckPurpose(X509* x, int32_t id, int32_t ca) +{ + return X509_check_purpose(x, id, ca); +} + +int32_t CryptoNative_X509CheckIssued(X509* issuer, X509* subject) +{ + return X509_check_issued(issuer, subject); +} + +uint64_t CryptoNative_X509IssuerNameHash(X509* x) +{ + return X509_issuer_name_hash(x); +} + +int32_t CryptoNative_X509GetExtCount(X509* x) +{ + return X509_get_ext_count(x); +} + +X509_EXTENSION* CryptoNative_X509GetExt(X509* x, int32_t loc) +{ + return X509_get_ext(x, loc); +} + +ASN1_OBJECT* CryptoNative_X509ExtensionGetOid(X509_EXTENSION* x) +{ + return X509_EXTENSION_get_object(x); +} + +ASN1_OCTET_STRING* CryptoNative_X509ExtensionGetData(X509_EXTENSION* x) +{ + return X509_EXTENSION_get_data(x); +} + +int32_t CryptoNative_X509ExtensionGetCritical(X509_EXTENSION* x) +{ + return X509_EXTENSION_get_critical(x); +} + +X509_STORE* CryptoNative_X509StoreCreate() +{ + return X509_STORE_new(); +} + +void CryptoNative_X509StoreDestory(X509_STORE* v) +{ + if (v != NULL) + { + X509_STORE_free(v); + } +} + +int32_t CryptoNative_X509StoreAddCert(X509_STORE* ctx, X509* x) +{ + return X509_STORE_add_cert(ctx, x); +} + +int32_t CryptoNative_X509StoreAddCrl(X509_STORE* ctx, X509_CRL* x) +{ + return X509_STORE_add_crl(ctx, x); +} + +int32_t CryptoNative_X509StoreSetRevocationFlag(X509_STORE* ctx, X509RevocationFlag revocationFlag) +{ + unsigned long verifyFlags = X509_V_FLAG_CRL_CHECK; + + if (revocationFlag != EndCertificateOnly) + { + verifyFlags |= X509_V_FLAG_CRL_CHECK_ALL; + } + + return X509_STORE_set_flags(ctx, verifyFlags); +} + +X509_STORE_CTX* CryptoNative_X509StoreCtxCreate() +{ + return X509_STORE_CTX_new(); +} + +void CryptoNative_X509StoreCtxDestroy(X509_STORE_CTX* v) +{ + if (v != NULL) + { + X509_STORE_CTX_free(v); + } +} + +int32_t CryptoNative_X509StoreCtxInit(X509_STORE_CTX* ctx, X509_STORE* store, X509* x509, X509Stack* extraStore) +{ + int32_t val = X509_STORE_CTX_init(ctx, store, x509, extraStore); + + if (val != 0) + { + X509_STORE_CTX_set_flags(ctx, X509_V_FLAG_CHECK_SS_SIGNATURE); + } + + return val; +} + +int32_t CryptoNative_X509VerifyCert(X509_STORE_CTX* ctx) +{ + return X509_verify_cert(ctx); +} + +X509Stack* CryptoNative_X509StoreCtxGetChain(X509_STORE_CTX* ctx) +{ + return X509_STORE_CTX_get1_chain(ctx); +} + +X509Stack* CryptoNative_X509StoreCtxGetSharedUntrusted(X509_STORE_CTX* ctx) +{ + return ctx ? ctx->untrusted : NULL; +} + +X509* CryptoNative_X509StoreCtxGetTargetCert(X509_STORE_CTX* ctx) +{ + return ctx ? ctx->cert : NULL; +} + +X509VerifyStatusCode CryptoNative_X509StoreCtxGetError(X509_STORE_CTX* ctx) +{ + return (unsigned int)X509_STORE_CTX_get_error(ctx); +} + +void CryptoNative_X509StoreCtxSetVerifyCallback(X509_STORE_CTX* ctx, X509StoreVerifyCallback callback) +{ + X509_STORE_CTX_set_verify_cb(ctx, callback); +} + +int32_t CryptoNative_X509StoreCtxGetErrorDepth(X509_STORE_CTX* ctx) +{ + return X509_STORE_CTX_get_error_depth(ctx); +} + +const char* CryptoNative_X509VerifyCertErrorString(X509VerifyStatusCode n) +{ + return X509_verify_cert_error_string(n); +} + +void CryptoNative_X509CrlDestroy(X509_CRL* a) +{ + if (a != NULL) + { + X509_CRL_free(a); + } +} + +int32_t CryptoNative_PemWriteBioX509Crl(BIO* bio, X509_CRL* crl) +{ + return PEM_write_bio_X509_CRL(bio, crl); +} + +X509_CRL* CryptoNative_PemReadBioX509Crl(BIO* bio) +{ + return PEM_read_bio_X509_CRL(bio, NULL, NULL, NULL); +} + +int32_t CryptoNative_GetX509SubjectPublicKeyInfoDerSize(X509* x509) +{ + if (!x509) + { + return 0; + } + + // X509_get_X509_PUBKEY returns an interior pointer, so should not be freed + return i2d_X509_PUBKEY(X509_get_X509_PUBKEY(x509), NULL); +} + +int32_t CryptoNative_EncodeX509SubjectPublicKeyInfo(X509* x509, uint8_t* buf) +{ + if (!x509) + { + return 0; + } + + // X509_get_X509_PUBKEY returns an interior pointer, so should not be freed + return i2d_X509_PUBKEY(X509_get_X509_PUBKEY(x509), &buf); +} + +X509* CryptoNative_X509UpRef(X509* x509) +{ + if (x509 != NULL) + { + CRYPTO_add(&x509->references, 1, CRYPTO_LOCK_X509); + } + + return x509; +} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509.cpp deleted file mode 100644 index 3118c9aa2c..0000000000 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509.cpp +++ /dev/null @@ -1,309 +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. - -#include "pal_x509.h" - -#include - -static_assert(PAL_X509_V_OK == X509_V_OK, ""); -static_assert(PAL_X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT, ""); -static_assert(PAL_X509_V_ERR_UNABLE_TO_GET_CRL == X509_V_ERR_UNABLE_TO_GET_CRL, ""); -static_assert(PAL_X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE == X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE, ""); -static_assert(PAL_X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY == X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY, ""); -static_assert(PAL_X509_V_ERR_CERT_SIGNATURE_FAILURE == X509_V_ERR_CERT_SIGNATURE_FAILURE, ""); -static_assert(PAL_X509_V_ERR_CRL_SIGNATURE_FAILURE == X509_V_ERR_CRL_SIGNATURE_FAILURE, ""); -static_assert(PAL_X509_V_ERR_CERT_NOT_YET_VALID == X509_V_ERR_CERT_NOT_YET_VALID, ""); -static_assert(PAL_X509_V_ERR_CERT_HAS_EXPIRED == X509_V_ERR_CERT_HAS_EXPIRED, ""); -static_assert(PAL_X509_V_ERR_CRL_NOT_YET_VALID == X509_V_ERR_CRL_NOT_YET_VALID, ""); -static_assert(PAL_X509_V_ERR_CRL_HAS_EXPIRED == X509_V_ERR_CRL_HAS_EXPIRED, ""); -static_assert(PAL_X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD == X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD, ""); -static_assert(PAL_X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD == X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD, ""); -static_assert(PAL_X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD == X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD, ""); -static_assert(PAL_X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD == X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD, ""); -static_assert(PAL_X509_V_ERR_OUT_OF_MEM == X509_V_ERR_OUT_OF_MEM, ""); -static_assert(PAL_X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT, ""); -static_assert(PAL_X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN, ""); -static_assert(PAL_X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY, ""); -static_assert(PAL_X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, ""); -static_assert(PAL_X509_V_ERR_CERT_CHAIN_TOO_LONG == X509_V_ERR_CERT_CHAIN_TOO_LONG, ""); -static_assert(PAL_X509_V_ERR_CERT_REVOKED == X509_V_ERR_CERT_REVOKED, ""); -static_assert(PAL_X509_V_ERR_INVALID_CA == X509_V_ERR_INVALID_CA, ""); -static_assert(PAL_X509_V_ERR_PATH_LENGTH_EXCEEDED == X509_V_ERR_PATH_LENGTH_EXCEEDED, ""); -static_assert(PAL_X509_V_ERR_INVALID_PURPOSE == X509_V_ERR_INVALID_PURPOSE, ""); -static_assert(PAL_X509_V_ERR_CERT_UNTRUSTED == X509_V_ERR_CERT_UNTRUSTED, ""); -static_assert(PAL_X509_V_ERR_CERT_REJECTED == X509_V_ERR_CERT_REJECTED, ""); -static_assert(PAL_X509_V_ERR_KEYUSAGE_NO_CERTSIGN == X509_V_ERR_KEYUSAGE_NO_CERTSIGN, ""); -static_assert(PAL_X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER == X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER, ""); -static_assert(PAL_X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION == X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION, ""); -static_assert(PAL_X509_V_ERR_KEYUSAGE_NO_CRL_SIGN == X509_V_ERR_KEYUSAGE_NO_CRL_SIGN, ""); -static_assert(PAL_X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION == X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION, ""); -static_assert(PAL_X509_V_ERR_INVALID_NON_CA == X509_V_ERR_INVALID_NON_CA, ""); -static_assert(PAL_X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE == X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE, ""); -static_assert(PAL_X509_V_ERR_INVALID_EXTENSION == X509_V_ERR_INVALID_EXTENSION, ""); -static_assert(PAL_X509_V_ERR_INVALID_POLICY_EXTENSION == X509_V_ERR_INVALID_POLICY_EXTENSION, ""); -static_assert(PAL_X509_V_ERR_NO_EXPLICIT_POLICY == X509_V_ERR_NO_EXPLICIT_POLICY, ""); - -extern "C" EVP_PKEY* CryptoNative_GetX509EvpPublicKey(X509* x509) -{ - if (!x509) - { - return nullptr; - } - - // X509_get_X509_PUBKEY returns an interior pointer, so should not be freed - return X509_PUBKEY_get(X509_get_X509_PUBKEY(x509)); -} - -extern "C" X509_CRL* CryptoNative_DecodeX509Crl(const uint8_t* buf, int32_t len) -{ - if (!buf || !len) - { - return nullptr; - } - - return d2i_X509_CRL(nullptr, &buf, len); -} - -extern "C" X509* CryptoNative_DecodeX509(const uint8_t* buf, int32_t len) -{ - if (!buf || !len) - { - return nullptr; - } - - return d2i_X509(nullptr, &buf, len); -} - -extern "C" int32_t CryptoNative_GetX509DerSize(X509* x) -{ - return i2d_X509(x, nullptr); -} - -extern "C" int32_t CryptoNative_EncodeX509(X509* x, uint8_t* buf) -{ - return i2d_X509(x, &buf); -} - -extern "C" void CryptoNative_X509Destroy(X509* a) -{ - if (a != nullptr) - { - X509_free(a); - } -} - -extern "C" X509* CryptoNative_X509Duplicate(X509* x509) -{ - return X509_dup(x509); -} - -extern "C" X509* CryptoNative_PemReadX509FromBio(BIO* bio) -{ - return PEM_read_bio_X509_AUX(bio, nullptr, nullptr, nullptr); -} - -extern "C" ASN1_INTEGER* CryptoNative_X509GetSerialNumber(X509* x509) -{ - return X509_get_serialNumber(x509); -} - -extern "C" X509_NAME* CryptoNative_X509GetIssuerName(X509* x509) -{ - return X509_get_issuer_name(x509); -} - -extern "C" X509_NAME* CryptoNative_X509GetSubjectName(X509* x509) -{ - return X509_get_subject_name(x509); -} - -extern "C" int32_t CryptoNative_X509CheckPurpose(X509* x, int32_t id, int32_t ca) -{ - return X509_check_purpose(x, id, ca); -} - -extern "C" int32_t CryptoNative_X509CheckIssued(X509* issuer, X509* subject) -{ - return X509_check_issued(issuer, subject); -} - -extern "C" uint64_t CryptoNative_X509IssuerNameHash(X509* x) -{ - return X509_issuer_name_hash(x); -} - -extern "C" int32_t CryptoNative_X509GetExtCount(X509* x) -{ - return X509_get_ext_count(x); -} - -extern "C" X509_EXTENSION* CryptoNative_X509GetExt(X509* x, int32_t loc) -{ - return X509_get_ext(x, loc); -} - -extern "C" ASN1_OBJECT* CryptoNative_X509ExtensionGetOid(X509_EXTENSION* x) -{ - return X509_EXTENSION_get_object(x); -} - -extern "C" ASN1_OCTET_STRING* CryptoNative_X509ExtensionGetData(X509_EXTENSION* x) -{ - return X509_EXTENSION_get_data(x); -} - -extern "C" int32_t CryptoNative_X509ExtensionGetCritical(X509_EXTENSION* x) -{ - return X509_EXTENSION_get_critical(x); -} - -extern "C" X509_STORE* CryptoNative_X509StoreCreate() -{ - return X509_STORE_new(); -} - -extern "C" void CryptoNative_X509StoreDestory(X509_STORE* v) -{ - if (v != nullptr) - { - X509_STORE_free(v); - } -} - -extern "C" int32_t CryptoNative_X509StoreAddCert(X509_STORE* ctx, X509* x) -{ - return X509_STORE_add_cert(ctx, x); -} - -extern "C" int32_t CryptoNative_X509StoreAddCrl(X509_STORE* ctx, X509_CRL* x) -{ - return X509_STORE_add_crl(ctx, x); -} - -extern "C" int32_t CryptoNative_X509StoreSetRevocationFlag(X509_STORE* ctx, X509RevocationFlag revocationFlag) -{ - unsigned long verifyFlags = X509_V_FLAG_CRL_CHECK; - - if (revocationFlag != X509RevocationFlag::EndCertificateOnly) - { - verifyFlags |= X509_V_FLAG_CRL_CHECK_ALL; - } - - return X509_STORE_set_flags(ctx, verifyFlags); -} - -extern "C" X509_STORE_CTX* CryptoNative_X509StoreCtxCreate() -{ - return X509_STORE_CTX_new(); -} - -extern "C" void CryptoNative_X509StoreCtxDestroy(X509_STORE_CTX* v) -{ - if (v != nullptr) - { - X509_STORE_CTX_free(v); - } -} - -extern "C" int32_t CryptoNative_X509StoreCtxInit(X509_STORE_CTX* ctx, X509_STORE* store, X509* x509, X509Stack* extraStore) -{ - int32_t val = X509_STORE_CTX_init(ctx, store, x509, extraStore); - - if (val != 0) - { - X509_STORE_CTX_set_flags(ctx, X509_V_FLAG_CHECK_SS_SIGNATURE); - } - - return val; -} - -extern "C" int32_t CryptoNative_X509VerifyCert(X509_STORE_CTX* ctx) -{ - return X509_verify_cert(ctx); -} - -extern "C" X509Stack* CryptoNative_X509StoreCtxGetChain(X509_STORE_CTX* ctx) -{ - return X509_STORE_CTX_get1_chain(ctx); -} - -extern "C" X509Stack* CryptoNative_X509StoreCtxGetSharedUntrusted(X509_STORE_CTX* ctx) -{ - return ctx ? ctx->untrusted : nullptr; -} - -extern "C" X509* CryptoNative_X509StoreCtxGetTargetCert(X509_STORE_CTX* ctx) -{ - return ctx ? ctx->cert : nullptr; -} - -extern "C" X509VerifyStatusCode CryptoNative_X509StoreCtxGetError(X509_STORE_CTX* ctx) -{ - return static_cast(X509_STORE_CTX_get_error(ctx)); -} - -extern "C" void CryptoNative_X509StoreCtxSetVerifyCallback(X509_STORE_CTX* ctx, X509StoreVerifyCallback callback) -{ - X509_STORE_CTX_set_verify_cb(ctx, callback); -} - -extern "C" int32_t CryptoNative_X509StoreCtxGetErrorDepth(X509_STORE_CTX* ctx) -{ - return X509_STORE_CTX_get_error_depth(ctx); -} - -extern "C" const char* CryptoNative_X509VerifyCertErrorString(X509VerifyStatusCode n) -{ - return X509_verify_cert_error_string(n); -} - -extern "C" void CryptoNative_X509CrlDestroy(X509_CRL* a) -{ - if (a != nullptr) - { - X509_CRL_free(a); - } -} - -extern "C" int32_t CryptoNative_PemWriteBioX509Crl(BIO* bio, X509_CRL* crl) -{ - return PEM_write_bio_X509_CRL(bio, crl); -} - -extern "C" X509_CRL* CryptoNative_PemReadBioX509Crl(BIO* bio) -{ - return PEM_read_bio_X509_CRL(bio, nullptr, nullptr, nullptr); -} - -extern "C" int32_t CryptoNative_GetX509SubjectPublicKeyInfoDerSize(X509* x509) -{ - if (!x509) - { - return 0; - } - - // X509_get_X509_PUBKEY returns an interior pointer, so should not be freed - return i2d_X509_PUBKEY(X509_get_X509_PUBKEY(x509), nullptr); -} - -extern "C" int32_t CryptoNative_EncodeX509SubjectPublicKeyInfo(X509* x509, uint8_t* buf) -{ - if (!x509) - { - return 0; - } - - // X509_get_X509_PUBKEY returns an interior pointer, so should not be freed - return i2d_X509_PUBKEY(X509_get_X509_PUBKEY(x509), &buf); -} - -extern "C" X509* CryptoNative_X509UpRef(X509* x509) -{ - if (x509 != nullptr) - { - CRYPTO_add(&x509->references, 1, CRYPTO_LOCK_X509); - } - - return x509; -} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509.h index d182de6569..79a03da7d3 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509.h @@ -3,24 +3,25 @@ // See the LICENSE file in the project root for more information. #include "pal_crypto_types.h" +#include "pal_compiler.h" #include "opensslshim.h" /* These values should be kept in sync with System.Security.Cryptography.X509Certificates.X509RevocationFlag. */ -enum X509RevocationFlag : int32_t +typedef enum { EndCertificateOnly = 0, EntireChain = 1, ExcludeRoot = 2, -}; +} X509RevocationFlag; /* The error codes used when verifying X509 certificate chains. These values should be kept in sync with Interop.Crypto.X509VerifyStatusCode. */ -enum X509VerifyStatusCode : int32_t +typedef enum { PAL_X509_V_OK = 0, PAL_X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT = 2, @@ -59,7 +60,7 @@ enum X509VerifyStatusCode : int32_t PAL_X509_V_ERR_INVALID_EXTENSION = 41, PAL_X509_V_ERR_INVALID_POLICY_EXTENSION = 42, PAL_X509_V_ERR_NO_EXPLICIT_POLICY = 43, -}; +} X509VerifyStatusCode; typedef int32_t (*X509StoreVerifyCallback)(int32_t, X509_STORE_CTX*); @@ -69,30 +70,30 @@ GetX509EvpPublicKey Returns a EVP_PKEY* equivalent to the public key of the certificate. */ -extern "C" EVP_PKEY* CryptoNative_GetX509EvpPublicKey(X509* x509); +DLLEXPORT EVP_PKEY* CryptoNative_GetX509EvpPublicKey(X509* x509); /* Shims the d2i_X509_CRL method and makes it easier to invoke from managed code. */ -extern "C" X509_CRL* CryptoNative_DecodeX509Crl(const uint8_t* buf, int32_t len); +DLLEXPORT X509_CRL* CryptoNative_DecodeX509Crl(const uint8_t* buf, int32_t len); /* Shims the d2i_X509 method and makes it easier to invoke from managed code. */ -extern "C" X509* CryptoNative_DecodeX509(const uint8_t* buf, int32_t len); +DLLEXPORT X509* CryptoNative_DecodeX509(const uint8_t* buf, int32_t len); /* Returns the number of bytes it will take to convert the X509 to a DER format. */ -extern "C" int32_t CryptoNative_GetX509DerSize(X509* x); +DLLEXPORT int32_t CryptoNative_GetX509DerSize(X509* x); /* Shims the i2d_X509 method. Returns the number of bytes written to buf. */ -extern "C" int32_t CryptoNative_EncodeX509(X509* x, uint8_t* buf); +DLLEXPORT int32_t CryptoNative_EncodeX509(X509* x, uint8_t* buf); /* Cleans up and deletes an X509 instance. @@ -103,196 +104,196 @@ No-op if a is null. The given X509 pointer is invalid after this call. Always succeeds. */ -extern "C" void CryptoNative_X509Destroy(X509* a); +DLLEXPORT void CryptoNative_X509Destroy(X509* a); /* Shims the X509_dup method. Returns the duplicated X509 instance. */ -extern "C" X509* CryptoNative_X509Duplicate(X509* x509); +DLLEXPORT X509* CryptoNative_X509Duplicate(X509* x509); /* Shims the PEM_read_bio_X509_AUX method. Returns the read X509 instance. */ -extern "C" X509* CryptoNative_PemReadX509FromBio(BIO* bio); +DLLEXPORT X509* CryptoNative_PemReadX509FromBio(BIO* bio); /* Shims the X509_get_serialNumber method. Returns the ASN1_INTEGER for the serial number. */ -extern "C" ASN1_INTEGER* CryptoNative_X509GetSerialNumber(X509* x509); +DLLEXPORT ASN1_INTEGER* CryptoNative_X509GetSerialNumber(X509* x509); /* Shims the X509_get_issuer_name method. Returns the ASN1_INTEGER for the issuer name. */ -extern "C" X509_NAME* CryptoNative_X509GetIssuerName(X509* x509); +DLLEXPORT X509_NAME* CryptoNative_X509GetIssuerName(X509* x509); /* Shims the X509_get_subject_name method. Returns the X509_NAME for the subject name. */ -extern "C" X509_NAME* CryptoNative_X509GetSubjectName(X509* x509); +DLLEXPORT X509_NAME* CryptoNative_X509GetSubjectName(X509* x509); /* Shims the X509_check_purpose method. */ -extern "C" int32_t CryptoNative_X509CheckPurpose(X509* x, int32_t id, int32_t ca); +DLLEXPORT int32_t CryptoNative_X509CheckPurpose(X509* x, int32_t id, int32_t ca); /* Shims the X509_check_issued method. */ -extern "C" int32_t CryptoNative_X509CheckIssued(X509* issuer, X509* subject); +DLLEXPORT int32_t CryptoNative_X509CheckIssued(X509* issuer, X509* subject); /* Shims the X509_issuer_name_hash method. */ -extern "C" uint64_t CryptoNative_X509IssuerNameHash(X509* x); +DLLEXPORT uint64_t CryptoNative_X509IssuerNameHash(X509* x); /* Shims the X509_get_ext_count method. */ -extern "C" int32_t CryptoNative_X509GetExtCount(X509* x); +DLLEXPORT int32_t CryptoNative_X509GetExtCount(X509* x); /* Shims the X509_get_ext method. */ -extern "C" X509_EXTENSION* CryptoNative_X509GetExt(X509* x, int32_t loc); +DLLEXPORT X509_EXTENSION* CryptoNative_X509GetExt(X509* x, int32_t loc); /* Shims the X509_EXTENSION_get_object method. */ -extern "C" ASN1_OBJECT* CryptoNative_X509ExtensionGetOid(X509_EXTENSION* x); +DLLEXPORT ASN1_OBJECT* CryptoNative_X509ExtensionGetOid(X509_EXTENSION* x); /* Shims the X509_EXTENSION_get_data method. */ -extern "C" ASN1_OCTET_STRING* CryptoNative_X509ExtensionGetData(X509_EXTENSION* x); +DLLEXPORT ASN1_OCTET_STRING* CryptoNative_X509ExtensionGetData(X509_EXTENSION* x); /* Shims the X509_EXTENSION_get_critical method. */ -extern "C" int32_t CryptoNative_X509ExtensionGetCritical(X509_EXTENSION* x); +DLLEXPORT int32_t CryptoNative_X509ExtensionGetCritical(X509_EXTENSION* x); /* Shims the X509_STORE_new method. */ -extern "C" X509_STORE* CryptoNative_X509StoreCreate(); +DLLEXPORT X509_STORE* CryptoNative_X509StoreCreate(void); /* Shims the X509_STORE_free method. */ -extern "C" void CryptoNative_X509StoreDestory(X509_STORE* v); +DLLEXPORT void CryptoNative_X509StoreDestory(X509_STORE* v); /* Shims the X509_STORE_add_cert method. */ -extern "C" int32_t CryptoNative_X509StoreAddCert(X509_STORE* ctx, X509* x); +DLLEXPORT int32_t CryptoNative_X509StoreAddCert(X509_STORE* ctx, X509* x); /* Shims the X509_STORE_add_crl method. */ -extern "C" int32_t CryptoNative_X509StoreAddCrl(X509_STORE* ctx, X509_CRL* x); +DLLEXPORT int32_t CryptoNative_X509StoreAddCrl(X509_STORE* ctx, X509_CRL* x); /* Sets the correct flags on the X509_STORE for the specified X509RevocationFlag. Shims the X509_STORE_set_flags method. */ -extern "C" int32_t CryptoNative_X509StoreSetRevocationFlag(X509_STORE* ctx, X509RevocationFlag revocationFlag); +DLLEXPORT int32_t CryptoNative_X509StoreSetRevocationFlag(X509_STORE* ctx, X509RevocationFlag revocationFlag); /* Shims the X509_STORE_CTX_new method. */ -extern "C" X509_STORE_CTX* CryptoNative_X509StoreCtxCreate(); +DLLEXPORT X509_STORE_CTX* CryptoNative_X509StoreCtxCreate(void); /* Shims the X509_STORE_CTX_free method. */ -extern "C" void CryptoNative_X509StoreCtxDestroy(X509_STORE_CTX* v); +DLLEXPORT void CryptoNative_X509StoreCtxDestroy(X509_STORE_CTX* v); /* Shims the X509_STORE_CTX_init method. */ -extern "C" int32_t CryptoNative_X509StoreCtxInit(X509_STORE_CTX* ctx, X509_STORE* store, X509* x509, X509Stack* extraStore); +DLLEXPORT int32_t CryptoNative_X509StoreCtxInit(X509_STORE_CTX* ctx, X509_STORE* store, X509* x509, X509Stack* extraStore); /* Shims the X509_verify_cert method. */ -extern "C" int32_t CryptoNative_X509VerifyCert(X509_STORE_CTX* ctx); +DLLEXPORT int32_t CryptoNative_X509VerifyCert(X509_STORE_CTX* ctx); /* Shims the X509_STORE_CTX_get1_chain method. */ -extern "C" X509Stack* CryptoNative_X509StoreCtxGetChain(X509_STORE_CTX* ctx); +DLLEXPORT X509Stack* CryptoNative_X509StoreCtxGetChain(X509_STORE_CTX* ctx); /* Returns the interior pointer to the "untrusted" certificates collection for this X509_STORE_CTX */ -extern "C" X509Stack* CryptoNative_X509StoreCtxGetSharedUntrusted(X509_STORE_CTX* ctx); +DLLEXPORT X509Stack* CryptoNative_X509StoreCtxGetSharedUntrusted(X509_STORE_CTX* ctx); /* Returns the interior pointer to the target certificate for an X509 certificate chain */ -extern "C" X509* CryptoNative_X509StoreCtxGetTargetCert(X509_STORE_CTX* ctx); +DLLEXPORT X509* CryptoNative_X509StoreCtxGetTargetCert(X509_STORE_CTX* ctx); /* Shims the X509_STORE_CTX_get_error method. */ -extern "C" X509VerifyStatusCode CryptoNative_X509StoreCtxGetError(X509_STORE_CTX* ctx); +DLLEXPORT X509VerifyStatusCode CryptoNative_X509StoreCtxGetError(X509_STORE_CTX* ctx); /* Shims the X509_STORE_CTX_get_error_depth method. */ -extern "C" int32_t CryptoNative_X509StoreCtxGetErrorDepth(X509_STORE_CTX* ctx); +DLLEXPORT int32_t CryptoNative_X509StoreCtxGetErrorDepth(X509_STORE_CTX* ctx); /* Shims the X509_STORE_CTX_set_verify_cb function. */ -extern "C" void CryptoNative_X509StoreCtxSetVerifyCallback(X509_STORE_CTX* ctx, X509StoreVerifyCallback callback); +DLLEXPORT void CryptoNative_X509StoreCtxSetVerifyCallback(X509_STORE_CTX* ctx, X509StoreVerifyCallback callback); /* Shims the X509_verify_cert_error_string method. */ -extern "C" const char* CryptoNative_X509VerifyCertErrorString(X509VerifyStatusCode n); +DLLEXPORT const char* CryptoNative_X509VerifyCertErrorString(X509VerifyStatusCode n); /* Shims the X509_CRL_free method. */ -extern "C" void CryptoNative_X509CrlDestroy(X509_CRL* a); +DLLEXPORT void CryptoNative_X509CrlDestroy(X509_CRL* a); /* Shims the PEM_write_bio_X509_CRL method. Returns the number of bytes written. */ -extern "C" int32_t CryptoNative_PemWriteBioX509Crl(BIO* bio, X509_CRL* crl); +DLLEXPORT int32_t CryptoNative_PemWriteBioX509Crl(BIO* bio, X509_CRL* crl); /* Shims the PEM_read_bio_X509_CRL method. The new X509_CRL instance. */ -extern "C" X509_CRL* CryptoNative_PemReadBioX509Crl(BIO* bio); +DLLEXPORT X509_CRL* CryptoNative_PemReadBioX509Crl(BIO* bio); /* Returns the number of bytes it will take to convert the SubjectPublicKeyInfo portion of the X509 to DER format. */ -extern "C" int32_t CryptoNative_GetX509SubjectPublicKeyInfoDerSize(X509* x); +DLLEXPORT int32_t CryptoNative_GetX509SubjectPublicKeyInfoDerSize(X509* x); /* Shims the i2d_X509_PUBKEY method, providing X509_get_X509_PUBKEY(x) as the input. Returns the number of bytes written to buf. */ -extern "C" int32_t CryptoNative_EncodeX509SubjectPublicKeyInfo(X509* x, uint8_t* buf); +DLLEXPORT int32_t CryptoNative_EncodeX509SubjectPublicKeyInfo(X509* x, uint8_t* buf); /* Increases the reference count of the X509*, thereby increasing the number of calls @@ -302,4 +303,4 @@ Unlike X509Duplicate, this modifies an existing object, so no new memory is allo Returns the input value. */ -extern "C" X509* CryptoNative_X509UpRef(X509* x509); +DLLEXPORT X509* CryptoNative_X509UpRef(X509* x509); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509_name.c b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509_name.c new file mode 100644 index 0000000000..8cb1485467 --- /dev/null +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509_name.c @@ -0,0 +1,15 @@ +// 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. + +#include "pal_x509_name.h" + +int32_t CryptoNative_GetX509NameStackFieldCount(X509NameStack* sk) +{ + return sk_X509_NAME_num(sk); +} + +X509_NAME* CryptoNative_GetX509NameStackField(X509NameStack* sk, int32_t loc) +{ + return sk_X509_NAME_value(sk, loc); +} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509_name.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509_name.cpp deleted file mode 100644 index 2195b74906..0000000000 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509_name.cpp +++ /dev/null @@ -1,73 +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. - -#include "pal_x509_name.h" - -extern "C" int32_t CryptoNative_GetX509NameStackFieldCount(X509NameStack* sk) -{ - return sk_X509_NAME_num(sk); -} - -extern "C" X509_NAME* CryptoNative_GetX509NameStackField(X509NameStack* sk, int32_t loc) -{ - return sk_X509_NAME_value(sk, loc); -} - -extern "C" X509_NAME* CryptoNative_DecodeX509Name(const uint8_t* buf, int32_t len) -{ - if (!buf || !len) - { - return nullptr; - } - - return d2i_X509_NAME(nullptr, &buf, len); -} - -extern "C" void CryptoNative_X509NameDestroy(X509_NAME* a) -{ - if (a != nullptr) - { - X509_NAME_free(a); - } -} - -extern "C" STACK_OF(X509_NAME) * CryptoNative_NewX509NameStack() -{ - return sk_X509_NAME_new_null(); -} - -extern "C" int32_t CryptoNative_PushX509NameStackField(STACK_OF(X509_NAME) * stack, X509_NAME* x509Name) -{ - if (!stack) - { - return 0; - } - - return sk_X509_NAME_push(stack, x509Name); -} - -extern "C" void CryptoNative_RecursiveFreeX509NameStack(STACK_OF(X509_NAME) * stack) -{ - sk_X509_NAME_pop_free(stack, X509_NAME_free); -} - -extern "C" int32_t CryptoNative_GetX509NameEntryCount(X509_NAME* x509Name) -{ - return X509_NAME_entry_count(x509Name); -} - -extern "C" X509_NAME_ENTRY* CryptoNative_GetX509NameEntry(X509_NAME* x509Name, int32_t loc) -{ - return X509_NAME_get_entry(x509Name, loc); -} - -extern "C" ASN1_OBJECT* CryptoNative_GetX509NameEntryOid(X509_NAME_ENTRY* nameEntry) -{ - return X509_NAME_ENTRY_get_object(nameEntry); -} - -extern "C" ASN1_STRING* CryptoNative_GetX509NameEntryData(X509_NAME_ENTRY* nameEntry) -{ - return X509_NAME_ENTRY_get_data(nameEntry); -} diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509_name.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509_name.h index 76a77ccc1f..a24fdef4f2 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509_name.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509_name.h @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. #include "pal_crypto_types.h" +#include "pal_compiler.h" #include "opensslshim.h" /* @@ -11,72 +12,9 @@ GetX509NameStackFieldCount Direct shim to sk_X509_NAME_num */ -extern "C" int32_t CryptoNative_GetX509NameStackFieldCount(X509NameStack* sk); +DLLEXPORT int32_t CryptoNative_GetX509NameStackFieldCount(X509NameStack* sk); /* Direct shim to sk_X509_NAME_value */ -extern "C" X509_NAME* CryptoNative_GetX509NameStackField(X509NameStack* sk, int32_t loc); - -/* -Shims the d2i_X509_NAME method and makes it easier to invoke from managed code. -*/ -extern "C" X509_NAME* CryptoNative_DecodeX509Name(const uint8_t* buf, int32_t len); - -/* -Cleans up and deletes an X509_NAME instance. - -Implemented by calling X509_NAME_free. - -No-op if a is null. -The given X509_NAME pointer is invalid after this call. -Always succeeds. -*/ -extern "C" void CryptoNative_X509NameDestroy(X509_NAME* a); - -/* -Function: -NewX509NameStack - -Direct shim to sk_X509_NAME_new_null -*/ -extern "C" STACK_OF(X509_NAME) * CryptoNative_NewX509NameStack(); - -/* -Function: -PushX509NameStackField - -Direct shim to sk_X509_NAME_push -Return values: -1 on success -0 on a NULL stack, or an error within sk_X509_NAME_push -*/ -extern "C" int32_t CryptoNative_PushX509NameStackField(STACK_OF(X509_NAME) * stack, X509_NAME* x509Name); - -/* -Function: -RecursiveFreeX509NameStack - -Direct shim to sk_X509_NAME_pop_free -*/ -extern "C" void CryptoNative_RecursiveFreeX509NameStack(STACK_OF(X509_NAME) * stack); - -/* -Direct shim to X509_NAME_entry_count -*/ -extern "C" int32_t CryptoNative_GetX509NameEntryCount(X509_NAME* x509Name); - -/* -Direct shim to X509_NAME_get_entry -*/ -extern "C" X509_NAME_ENTRY* CryptoNative_GetX509NameEntry(X509_NAME* x509Name, int32_t loc); - -/* -Direct shim to X509_NAME_ENTRY_get_object -*/ -extern "C" ASN1_OBJECT* CryptoNative_GetX509NameEntryOid(X509_NAME_ENTRY* nameEntry); - -/* -Direct shim to X509_NAME_ENTRY_get_data -*/ -extern "C" ASN1_STRING* CryptoNative_GetX509NameEntryData(X509_NAME_ENTRY* nameEntry); +DLLEXPORT X509_NAME* CryptoNative_GetX509NameStackField(X509NameStack* sk, int32_t loc); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509_root.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509_root.c similarity index 82% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509_root.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509_root.c index 2132a81836..1054caec69 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509_root.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509_root.c @@ -6,7 +6,7 @@ #include -extern "C" const char* CryptoNative_GetX509RootStorePath() +const char* CryptoNative_GetX509RootStorePath() { const char* dir = getenv(X509_get_default_cert_dir_env()); @@ -18,7 +18,7 @@ extern "C" const char* CryptoNative_GetX509RootStorePath() return dir; } -extern "C" const char* CryptoNative_GetX509RootStoreFile() +const char* CryptoNative_GetX509RootStoreFile() { const char* file = getenv(X509_get_default_cert_file_env()); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509_root.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509_root.h index ef7ce5262b..f259a505fa 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509_root.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509_root.h @@ -2,17 +2,18 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +#include "pal_compiler.h" #include "opensslshim.h" /* Look up the directory in which all certificate files therein are considered trusted (root or trusted intermediate). */ -extern "C" const char* CryptoNative_GetX509RootStorePath(); +DLLEXPORT const char* CryptoNative_GetX509RootStorePath(void); /* Look up the file in which all certificates are considered trusted (root or trusted intermediate), in addition to those files in the root store path. */ -extern "C" const char* CryptoNative_GetX509RootStoreFile(); +DLLEXPORT const char* CryptoNative_GetX509RootStoreFile(void); diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509ext.cpp b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509ext.c similarity index 67% rename from external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509ext.cpp rename to external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509ext.c index 415602e013..9346952dcd 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509ext.cpp +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509ext.c @@ -4,28 +4,29 @@ #include "pal_x509ext.h" +#include #include -extern "C" X509_EXTENSION* +X509_EXTENSION* CryptoNative_X509ExtensionCreateByObj(ASN1_OBJECT* obj, int32_t isCritical, ASN1_OCTET_STRING* data) { - return X509_EXTENSION_create_by_OBJ(nullptr, obj, isCritical, data); + return X509_EXTENSION_create_by_OBJ(NULL, obj, isCritical, data); } -extern "C" void CryptoNative_X509ExtensionDestroy(X509_EXTENSION* a) +void CryptoNative_X509ExtensionDestroy(X509_EXTENSION* a) { - if (a != nullptr) + if (a != NULL) { X509_EXTENSION_free(a); } } -extern "C" int32_t CryptoNative_X509V3ExtPrint(BIO* out, X509_EXTENSION* ext) +int32_t CryptoNative_X509V3ExtPrint(BIO* out, X509_EXTENSION* ext) { return X509V3_EXT_print(out, ext, X509V3_EXT_DEFAULT, /*indent*/ 0); } -extern "C" int32_t CryptoNative_DecodeX509BasicConstraints2Extension(const uint8_t* encoded, +int32_t CryptoNative_DecodeX509BasicConstraints2Extension(const uint8_t* encoded, int32_t encodedLength, int32_t* certificateAuthority, int32_t* hasPathLengthConstraint, @@ -41,19 +42,19 @@ extern "C" int32_t CryptoNative_DecodeX509BasicConstraints2Extension(const uint8 *pathLengthConstraint = 0; int32_t result = false; - BASIC_CONSTRAINTS* constraints = d2i_BASIC_CONSTRAINTS(nullptr, &encoded, encodedLength); + BASIC_CONSTRAINTS* constraints = d2i_BASIC_CONSTRAINTS(NULL, &encoded, encodedLength); if (constraints) { *certificateAuthority = constraints->ca != 0; - if (constraints->pathlen != nullptr) + if (constraints->pathlen != NULL) { *hasPathLengthConstraint = true; long pathLength = ASN1_INTEGER_get(constraints->pathlen); // pathLengthConstraint needs to be in the Int32 range assert(pathLength <= INT32_MAX); - *pathLengthConstraint = static_cast(pathLength); + *pathLengthConstraint = (int32_t)pathLength; } else { @@ -68,19 +69,19 @@ extern "C" int32_t CryptoNative_DecodeX509BasicConstraints2Extension(const uint8 return result; } -extern "C" EXTENDED_KEY_USAGE* CryptoNative_DecodeExtendedKeyUsage(const uint8_t* buf, int32_t len) +EXTENDED_KEY_USAGE* CryptoNative_DecodeExtendedKeyUsage(const uint8_t* buf, int32_t len) { if (!buf || !len) { - return nullptr; + return NULL; } - return d2i_EXTENDED_KEY_USAGE(nullptr, &buf, len); + return d2i_EXTENDED_KEY_USAGE(NULL, &buf, len); } -extern "C" void CryptoNative_ExtendedKeyUsageDestory(EXTENDED_KEY_USAGE* a) +void CryptoNative_ExtendedKeyUsageDestory(EXTENDED_KEY_USAGE* a) { - if (a != nullptr) + if (a != NULL) { EXTENDED_KEY_USAGE_free(a); } diff --git a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509ext.h b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509ext.h index c68d96650c..166f84d5c0 100644 --- a/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509ext.h +++ b/external/corefx/src/Native/Unix/System.Security.Cryptography.Native/pal_x509ext.h @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. #include "pal_types.h" +#include "pal_compiler.h" #include "opensslshim.h" /* @@ -12,7 +13,7 @@ Implemented by calling X509_EXTENSION_create_by_OBJ Returns new X509_EXTENSION on success, nullptr on failure. */ -extern "C" X509_EXTENSION* +DLLEXPORT X509_EXTENSION* CryptoNative_X509ExtensionCreateByObj(ASN1_OBJECT* obj, int32_t isCritical, ASN1_OCTET_STRING* data); /* @@ -24,14 +25,14 @@ No-op if a is null. The given X509_EXTENSION pointer is invalid after this call. Always succeeds. */ -extern "C" void CryptoNative_X509ExtensionDestroy(X509_EXTENSION* a); +DLLEXPORT void CryptoNative_X509ExtensionDestroy(X509_EXTENSION* a); /* Shims the X509V3_EXT_print method. Returns 1 on success, otherwise 0 if there was an error. */ -extern "C" int32_t CryptoNative_X509V3ExtPrint(BIO* out, X509_EXTENSION* ext); +DLLEXPORT int32_t CryptoNative_X509V3ExtPrint(BIO* out, X509_EXTENSION* ext); /* Decodes the X509 BASIC_CONSTRAINTS information and fills the out variables: @@ -42,7 +43,7 @@ Decodes the X509 BASIC_CONSTRAINTS information and fills the out variables: Returns 1 if the BASIC_CONSTRAINTS information was successfully decoded, otherwise 0. */ -extern "C" int32_t CryptoNative_DecodeX509BasicConstraints2Extension(const uint8_t* encoded, +DLLEXPORT int32_t CryptoNative_DecodeX509BasicConstraints2Extension(const uint8_t* encoded, int32_t encodedLength, int32_t* certificateAuthority, int32_t* hasPathLengthConstraint, @@ -51,7 +52,7 @@ extern "C" int32_t CryptoNative_DecodeX509BasicConstraints2Extension(const uint8 /* Shims the d2i_EXTENDED_KEY_USAGE method and makes it easier to invoke from managed code. */ -extern "C" EXTENDED_KEY_USAGE* CryptoNative_DecodeExtendedKeyUsage(const uint8_t* buf, int32_t len); +DLLEXPORT EXTENDED_KEY_USAGE* CryptoNative_DecodeExtendedKeyUsage(const uint8_t* buf, int32_t len); /* Cleans up and deletes an EXTENDED_KEY_USAGE instance. @@ -62,4 +63,4 @@ No-op if a is null. The given EXTENDED_KEY_USAGE pointer is invalid after this call. Always succeeds. */ -extern "C" void CryptoNative_ExtendedKeyUsageDestory(EXTENDED_KEY_USAGE* a); +DLLEXPORT void CryptoNative_ExtendedKeyUsageDestory(EXTENDED_KEY_USAGE* a); diff --git a/external/corefx/src/Native/Unix/configure.cmake b/external/corefx/src/Native/Unix/configure.cmake index 497dc21738..45cd42af70 100644 --- a/external/corefx/src/Native/Unix/configure.cmake +++ b/external/corefx/src/Native/Unix/configure.cmake @@ -1,746 +1,5 @@ -include(CheckCXXSourceCompiles) -include(CheckCXXSourceRuns) -include(CheckCSourceCompiles) -include(CheckCSourceRuns) -include(CheckFunctionExists) -include(CheckIncludeFiles) -include(CheckPrototypeDefinition) -include(CheckStructHasMember) -include(CheckSymbolExists) -include(CheckTypeSize) - -if (CMAKE_SYSTEM_NAME STREQUAL Linux) - set(PAL_UNIX_NAME \"LINUX\") -elseif (CMAKE_SYSTEM_NAME STREQUAL Darwin) - set(PAL_UNIX_NAME \"OSX\") - - # Xcode's clang does not include /usr/local/include by default, but brew's does. - # This ensures an even playing field. - include_directories(SYSTEM /usr/local/include) -elseif (CMAKE_SYSTEM_NAME STREQUAL FreeBSD) - set(PAL_UNIX_NAME \"FREEBSD\") - include_directories(SYSTEM /usr/local/include) -elseif (CMAKE_SYSTEM_NAME STREQUAL NetBSD) - set(PAL_UNIX_NAME \"NETBSD\") -else () - message(FATAL_ERROR "Unknown platform. Cannot define PAL_UNIX_NAME, used by RuntimeInformation.") -endif () - -# We compile with -Werror, so we need to make sure these code fragments compile without warnings. -set(CMAKE_REQUIRED_FLAGS -Werror) - -# in_pktinfo: Find whether this struct exists -check_include_files( - "sys/socket.h;linux/in.h" - HAVE_LINUX_IN_H) - -if (HAVE_LINUX_IN_H) - set (SOCKET_INCLUDES linux/in.h) -else () - set (SOCKET_INCLUDES netinet/in.h) -endif () - -check_c_source_compiles( - " - #include - #include <${SOCKET_INCLUDES}> - int main() - { - struct in_pktinfo pktinfo; - return 0; - } - " - HAVE_IN_PKTINFO) - -check_c_source_compiles( - " - #include - #include <${SOCKET_INCLUDES}> - int main() - { - struct ip_mreqn mreqn; - return 0; - } - " - HAVE_IP_MREQN) - -# /in_pktinfo - -check_c_source_compiles( - " - #include - int main() - { - struct flock64 l; - return 0; - } - " - HAVE_FLOCK64) - -check_function_exists( - lseek64 - HAVE_LSEEK64) - -check_function_exists( - mmap64 - HAVE_MMAP64) - -check_function_exists( - ftruncate64 - HAVE_FTRUNCATE64) - -check_function_Exists( - posix_fadvise64 - HAVE_POSIX_FADVISE64) - -check_function_exists( - stat64 - HAVE_STAT64) - -check_symbol_exists( - pipe2 - unistd.h - HAVE_PIPE2) - -check_function_exists( - getmntinfo - HAVE_MNTINFO) - -check_function_exists( - strcpy_s - HAVE_STRCPY_S) - -check_function_exists( - strlcpy - HAVE_STRLCPY) - -check_function_exists( - posix_fadvise - HAVE_POSIX_ADVISE) - -check_function_exists( - ioctl - HAVE_IOCTL) - -check_function_exists( - sched_getaffinity - HAVE_SCHED_GETAFFINITY) - -check_function_exists( - sched_setaffinity - HAVE_SCHED_SETAFFINITY) - -check_symbol_exists( - TIOCGWINSZ - "sys/ioctl.h" - HAVE_TIOCGWINSZ) - -check_function_exists( - tcgetattr - HAVE_TCGETATTR) - -check_function_exists( - tcsetattr - HAVE_TCSETATTR) - -check_symbol_exists( - ECHO - "termios.h" - HAVE_ECHO) - -check_symbol_exists( - ICANON - "termios.h" - HAVE_ICANON) - -check_symbol_exists( - TCSANOW - "termios.h" - HAVE_TCSANOW) - -check_struct_has_member( - "struct stat" - st_birthtimespec - "sys/types.h;sys/stat.h" - HAVE_STAT_BIRTHTIME) - -check_struct_has_member( - "struct stat" - st_atimespec - "sys/types.h;sys/stat.h" - HAVE_STAT_TIMESPEC) - -check_struct_has_member( - "struct stat" - st_atim - "sys/types.h;sys/stat.h" - HAVE_STAT_TIM) - -check_struct_has_member( - "struct stat" - st_atimensec - "sys/types.h;sys/stat.h" - HAVE_STAT_NSEC) - -check_struct_has_member( - "struct dirent" - d_namlen - "dirent.h" - HAVE_DIRENT_NAME_LEN) - -check_struct_has_member( - "struct statfs" - f_fstypename - "sys/mount.h" - HAVE_STATFS_FSTYPENAME) - -check_struct_has_member( - "struct statvfs" - f_fstypename - "sys/mount.h" - HAVE_STATVFS_FSTYPENAME) - -# statfs: Find whether this struct exists -if (HAVE_STATFS_FSTYPENAME OR HAVE_STATVFS_FSTYPENAME) - set (STATFS_INCLUDES sys/mount.h) -else () - set (STATFS_INCLUDES sys/statfs.h) -endif () - -set(CMAKE_EXTRA_INCLUDE_FILES ${STATFS_INCLUDES}) -check_type_size( - "struct statfs" - HAVE_STATFS - BUILTIN_TYPES_ONLY) -set(CMAKE_EXTRA_INCLUDE_FILES) # reset CMAKE_EXTRA_INCLUDE_FILES -# /statfs - -check_c_source_compiles( - " - #include - int main() - { - char buffer[1]; - char* c = strerror_r(0, buffer, 0); - return 0; - } - " - HAVE_GNU_STRERROR_R) - -check_c_source_compiles( - " - #include - int main(void) - { - DIR* dir; - struct dirent* entry; - struct dirent* result; - readdir_r(dir, entry, &result); - return 0; - } - " - HAVE_READDIR_R) - -check_c_source_compiles( - " - #include - #include - int main(void) - { - struct kevent event; - void* data; - EV_SET(&event, 0, EVFILT_READ, 0, 0, 0, data); - return 0; - } - " - KEVENT_HAS_VOID_UDATA) - -check_struct_has_member( - "struct fd_set" - fds_bits - "sys/select.h" - HAVE_FDS_BITS) - -check_struct_has_member( - "struct fd_set" - __fds_bits - "sys/select.h" - HAVE_PRIVATE_FDS_BITS) - -check_c_source_compiles( - " - #include - int main() { int i = sendfile(0, 0, 0, 0); return 0; } - " - HAVE_SENDFILE_4) - -check_c_source_compiles( - " - #include - #include - #include - #include - int main() { int i = sendfile(0, 0, 0, NULL, NULL, 0); return 0; } - " - HAVE_SENDFILE_6) - -check_function_exists( - fcopyfile - HAVE_FCOPYFILE) - -check_function_exists( - epoll_create1 - HAVE_EPOLL) - -check_function_exists( - accept4 - HAVE_ACCEPT4) - -check_function_exists( - kqueue - HAVE_KQUEUE) - -check_c_source_compiles( - " - #include - #include - - int main() - { - const void* addr; - socklen_t len; - int type; - struct hostent* result; - char* buffer; - size_t buflen; - struct hostent** entry; - int* error; - gethostbyaddr_r(addr, len, type, result, buffer, buflen, entry, error); - return 0; - } - " - HAVE_GETHOSTBYADDR_R) - -check_c_source_compiles( - " - #include - #include - - int main() - { - const char* hostname; - struct hostent* result; - char* buffer; - size_t buflen; - struct hostent** entry; - int* error; - gethostbyname_r(hostname, result, buffer, buflen, entry, error); - return 0; - } - " - HAVE_GETHOSTBYNAME_R) - -set(CMAKE_REQUIRED_FLAGS "-Werror -Wsign-conversion") -check_c_source_compiles( - " - #include - #include - - int main() - { - const struct sockaddr *addr; - socklen_t addrlen; - char *host; - socklen_t hostlen; - char *serv; - socklen_t servlen; - int flags; - int result = getnameinfo(addr, addrlen, host, hostlen, serv, servlen, flags); - return 0; - } - " - HAVE_GETNAMEINFO_SIGNED_FLAGS) -set(CMAKE_REQUIRED_FLAGS -Werror) - -set(HAVE_SUPPORT_FOR_DUAL_MODE_IPV4_PACKET_INFO 0) -set(HAVE_THREAD_SAFE_GETHOSTBYNAME_AND_GETHOSTBYADDR 0) - -if (CMAKE_SYSTEM_NAME STREQUAL Linux) - if (NOT CLR_CMAKE_PLATFORM_ANDROID) - set(CMAKE_REQUIRED_LIBRARIES rt) - endif () - - set(HAVE_SUPPORT_FOR_DUAL_MODE_IPV4_PACKET_INFO 1) - - if (CLR_CMAKE_PLATFORM_ANDROID) - set(HAVE_THREAD_SAFE_GETHOSTBYNAME_AND_GETHOSTBYADDR 1) - endif() -elseif (CMAKE_SYSTEM_NAME STREQUAL Darwin) - set(HAVE_THREAD_SAFE_GETHOSTBYNAME_AND_GETHOSTBYADDR 1) -endif () - -check_cxx_source_runs( - " - #include - #include - #include - int main() - { - int ret; - struct timespec ts; - ret = clock_gettime(CLOCK_MONOTONIC, &ts); - exit(ret); - } - " - HAVE_CLOCK_MONOTONIC) - -check_cxx_source_runs( - " - #include - #include - #include - int main() - { - int ret; - struct timespec ts; - ret = clock_gettime(CLOCK_REALTIME, &ts); - exit(ret); - } - " - HAVE_CLOCK_REALTIME) - -check_function_exists( - mach_absolute_time - HAVE_MACH_ABSOLUTE_TIME) - -check_function_exists( - mach_timebase_info - HAVE_MACH_TIMEBASE_INFO) - -check_function_exists( - futimes - HAVE_FUTIMES) - -check_function_exists( - futimens - HAVE_FUTIMENS) - -set (PREVIOUS_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) -set (CMAKE_REQUIRED_FLAGS "-Werror -Wsign-conversion") - -check_c_source_compiles( - " - #include - - int main() - { - int fd; - struct sockaddr* addr; - socklen_t addrLen; - - int err = bind(fd, addr, addrLen); - return 0; - } - " - BIND_ADDRLEN_UNSIGNED -) - -check_c_source_compiles( - " - #include - #include - - int main() - { - struct ipv6_mreq opt; - unsigned int index = 0; - opt.ipv6mr_interface = index; - return 0; - } - " - IPV6MR_INTERFACE_UNSIGNED -) - -check_c_source_compiles( - " - #include - - int main() - { - intptr_t fd; - uint32_t wd; - return inotify_rm_watch(fd, wd); - } - " - INOTIFY_RM_WATCH_WD_UNSIGNED) - -set (CMAKE_REQUIRED_FLAGS ${PREVIOUS_CMAKE_REQUIRED_FLAGS}) - -check_c_source_runs( - " - #include - #include - #include - - int main() - { - int fd = shm_open(\"/corefx_configure_shm_open\", O_CREAT | O_RDWR, 0777); - if (fd == -1) - return -1; - - shm_unlink(\"/corefx_configure_shm_open\"); - - // NOTE: PROT_EXEC and MAP_PRIVATE don't work well with shm_open - // on at least the current version of Mac OS X - - if (mmap(nullptr, 1, PROT_EXEC, MAP_PRIVATE, fd, 0) == MAP_FAILED) - return -1; - - return 0; - } - " - HAVE_SHM_OPEN_THAT_WORKS_WELL_ENOUGH_WITH_MMAP) - -check_prototype_definition( - getpriority - "int getpriority(int which, int who)" - 0 - "sys/resource.h" - PRIORITY_REQUIRES_INT_WHO) - -check_prototype_definition( - kevent - "int kevent(int kg, const struct kevent* chagelist, int nchanges, struct kevent* eventlist, int nevents, const struct timespec* timeout)" - 0 - "sys/types.h;sys/event.h" - KEVENT_REQUIRES_INT_PARAMS) - -check_c_source_compiles( - " - #include - #include - #include - - int main() - { - return mkstemps(\"abc\", 3); - } - " - HAVE_MKSTEMPS) - -check_c_source_compiles( - " - #include - #include - #include - - int main() - { - return mkstemp(\"abc\"); - } - " - HAVE_MKSTEMP) - -if (NOT HAVE_MKSTEMPS AND NOT HAVE_MKSTEMP) - message(FATAL_ERROR "Cannot find mkstemp nor mkstemp on this platform.") -endif() - -check_c_source_compiles( - " - #include - #include - #include - #include - #include - int main() { return 0; } - " - HAVE_TCP_VAR_H -) - -check_include_files( - sys/cdefs.h - HAVE_SYS_CDEFS_H) - -if (HAVE_SYS_CDEFS_H) - set(CMAKE_REQUIRED_DEFINITIONS "-DHAVE_SYS_CDEFS_H") -endif() - -# If sys/cdefs is not included on Android, this check will fail because -# __BEGIN_DECLS is not defined -check_c_source_compiles( - " -#ifdef HAVE_SYS_CDEFS_H - #include -#endif - #include - int main() { int x = TCP_ESTABLISHED; return x; } - " - HAVE_TCP_H_TCPSTATE_ENUM -) - -set(CMAKE_REQUIRED_DEFINITIONS) - -check_symbol_exists( - TCPS_ESTABLISHED - "netinet/tcp_fsm.h" - HAVE_TCP_FSM_H -) - -check_cxx_source_compiles( - " - #include - #include - int main() { rt_msghdr* hdr; return 0; } - " - HAVE_RT_MSGHDR -) - -check_include_files( - "sys/types.h;sys/sysctl.h" - HAVE_SYS_SYSCTL_H) - -check_include_files( - linux/rtnetlink.h - HAVE_LINUX_RTNETLINK_H) - -check_function_exists( - getpeereid - HAVE_GETPEEREID) - -check_function_exists( - getdomainname - HAVE_GETDOMAINNAME) - -check_function_exists( - uname - HAVE_UNAME) - -# getdomainname on OSX takes an 'int' instead of a 'size_t' -# check if compiling with 'size_t' would cause a warning -set (PREVIOUS_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) -set (CMAKE_REQUIRED_FLAGS "-Werror -Weverything") -check_c_source_compiles( - " - #include - int main() { size_t namelen = 20; char name[20]; getdomainname(name, namelen); return 0; } - " - HAVE_GETDOMAINNAME_SIZET -) -set (CMAKE_REQUIRED_FLAGS ${PREVIOUS_CMAKE_REQUIRED_FLAGS}) - -check_function_exists( - inotify_init - HAVE_INOTIFY_INIT) - -check_function_exists( - inotify_add_watch - HAVE_INOTIFY_ADD_WATCH) - -check_function_exists( - inotify_rm_watch - HAVE_INOTIFY_RM_WATCH) - -set (HAVE_INOTIFY 0) -if (HAVE_INOTIFY_INIT AND HAVE_INOTIFY_ADD_WATCH AND HAVE_INOTIFY_RM_WATCH) - set (HAVE_INOTIFY 1) -elseif (CMAKE_SYSTEM_NAME STREQUAL Linux) - message(FATAL_ERROR "Cannot find inotify functions on a Linux platform.") -endif() - -check_cxx_source_compiles( - " - #include - int main() { int i = CURLM_ADDED_ALREADY; return 0; } - " - HAVE_CURLM_ADDED_ALREADY) - -check_cxx_source_compiles( - " - #include - int main() { int i = CURL_HTTP_VERSION_2_0; return 0; } - " - HAVE_CURL_HTTP_VERSION_2_0) - -check_cxx_source_compiles( - " - #include - int main() { int i = CURLPIPE_MULTIPLEX; return 0; } - " - HAVE_CURLPIPE_MULTIPLEX) - -check_cxx_source_compiles( - " - #include - int main() - { - int i = CURL_SSLVERSION_TLSv1_0; - i = CURL_SSLVERSION_TLSv1_1; - i = CURL_SSLVERSION_TLSv1_2; - return 0; - } - " - HAVE_CURL_SSLVERSION_TLSv1_012) - -option(HeimdalGssApi "use heimdal implementation of GssApi" OFF) - -if (HeimdalGssApi) - check_include_files( - gssapi/gssapi.h - HAVE_HEIMDAL_HEADERS) -endif() - -check_include_files( - GSS/GSS.h - HAVE_GSSFW_HEADERS) - -if (HAVE_GSSFW_HEADERS) - check_symbol_exists( - GSS_SPNEGO_MECHANISM - "GSS/GSS.h" - HAVE_GSS_SPNEGO_MECHANISM) -else () - check_symbol_exists( - GSS_SPNEGO_MECHANISM - "gssapi/gssapi.h" - HAVE_GSS_SPNEGO_MECHANISM) -endif () - -if (HAVE_GSSFW_HEADERS) - check_symbol_exists( - GSS_KRB5_CRED_NO_CI_FLAGS_X - "GSS/GSS.h" - HAVE_GSS_KRB5_CRED_NO_CI_FLAGS_X) -else () - check_symbol_exists( - GSS_KRB5_CRED_NO_CI_FLAGS_X - "gssapi/gssapi_krb5.h" - HAVE_GSS_KRB5_CRED_NO_CI_FLAGS_X) -endif () - -check_include_files(crt_externs.h HAVE_CRT_EXTERNS_H) - -if (HAVE_CRT_EXTERNS_H) - check_cxx_source_compiles( - " - #include - int main() { char** e = *(_NSGetEnviron()); return 0; } - " - HAVE_NSGETENVIRON) -endif() - -set (CMAKE_REQUIRED_LIBRARIES) - -check_c_source_compiles( - " - #include - int main() - { - uint32_t mask = IN_EXCL_UNLINK; - return 0; - } - " - HAVE_IN_EXCL_UNLINK) - -configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/Common/pal_config.h.in - ${CMAKE_CURRENT_BINARY_DIR}/Common/pal_config.h) +# +# Any change in this file needs to be manually reflected into Mono's configure.ac +# +# The last reviewed revision: 6906dbfe66609dd606c84b09462dc1ce1936ef7e +# \ No newline at end of file diff --git a/external/corefx/src/Native/Windows/probe-win.ps1 b/external/corefx/src/Native/Windows/probe-win.ps1 index f4a94fa40e..55fae6bb12 100644 --- a/external/corefx/src/Native/Windows/probe-win.ps1 +++ b/external/corefx/src/Native/Windows/probe-win.ps1 @@ -6,19 +6,25 @@ function GetCMakeVersions $items = @() $items += @(Get-ChildItem hklm:\SOFTWARE\Wow6432Node\Kitware -ErrorAction SilentlyContinue) $items += @(Get-ChildItem hklm:\SOFTWARE\Kitware -ErrorAction SilentlyContinue) - return $items | where { $_.PSChildName.StartsWith("CMake ") } + return $items | where { $_.PSChildName.StartsWith("CMake") } } function GetCMakeInfo($regKey) { - # This no longer works for versions 3.5+ try { $version = [System.Version] $regKey.PSChildName.Split(' ')[1] } catch { return $null } - $cmakeDir = (Get-ItemProperty $regKey.PSPath).'(default)' + $itemProperty = Get-ItemProperty $regKey.PSPath; + if (Get-Member -inputobject $itemProperty -name "InstallDir" -Membertype Properties) { + $cmakeDir = $itemProperty.InstallDir + } + else { + # For CMake prior to version 3.5 + $cmakeDir = $itemProperty.'(default)' + } $cmakePath = [System.IO.Path]::Combine($cmakeDir, "bin\cmake.exe") if (![System.IO.File]::Exists($cmakePath)) { return $null diff --git a/external/corefx/src/Native/build-native.sh b/external/corefx/src/Native/build-native.sh index 4397f51727..364765134d 100755 --- a/external/corefx/src/Native/build-native.sh +++ b/external/corefx/src/Native/build-native.sh @@ -173,13 +173,8 @@ __ClangMinorVersion=0 __StaticLibLink=0 __PortableBuild=0 -CPUName=$(uname -p) -# Some Linux platforms report unknown for platform, but the arch for machine. -if [ $CPUName == "unknown" ]; then - CPUName=$(uname -m) -fi - -if [ $CPUName == "i686" ]; then +CPUName=$(uname -m) +if [ "$CPUName" == "i686" ]; then __BuildArch=x86 fi diff --git a/external/corefx/src/System.Buffers/pkg/System.Buffers.pkgproj b/external/corefx/src/System.Buffers/pkg/System.Buffers.pkgproj index 6794eed7f5..cb2771fe58 100644 --- a/external/corefx/src/System.Buffers/pkg/System.Buffers.pkgproj +++ b/external/corefx/src/System.Buffers/pkg/System.Buffers.pkgproj @@ -2,8 +2,11 @@ + + netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks) + - net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks) + net45 @@ -11,14 +14,8 @@ therefore it cannot reference NETStandard.Library --> - - - .NETCoreApp;UAP - + + \ No newline at end of file diff --git a/external/corefx/src/System.Buffers/ref/Configurations.props b/external/corefx/src/System.Buffers/ref/Configurations.props index a66f1edba4..feebf8aa9e 100644 --- a/external/corefx/src/System.Buffers/ref/Configurations.props +++ b/external/corefx/src/System.Buffers/ref/Configurations.props @@ -1,9 +1,15 @@  - + netstandard; netstandard1.1; + net45; + + + $(PackageConfigurations); + uap; + netfx; - \ No newline at end of file + diff --git a/external/corefx/src/System.Buffers/ref/System.Buffers.csproj b/external/corefx/src/System.Buffers/ref/System.Buffers.csproj index 4add92447c..1a81944093 100644 --- a/external/corefx/src/System.Buffers/ref/System.Buffers.csproj +++ b/external/corefx/src/System.Buffers/ref/System.Buffers.csproj @@ -3,16 +3,31 @@ {11AE73F7-3532-47B9-8FF6-B4F22D76456C} + + 4.0.2.0 + + + + + + - + + + + + + + \ No newline at end of file diff --git a/external/corefx/src/System.Buffers/src/Configurations.props b/external/corefx/src/System.Buffers/src/Configurations.props index 6544913df5..f8eca1e4fa 100644 --- a/external/corefx/src/System.Buffers/src/Configurations.props +++ b/external/corefx/src/System.Buffers/src/Configurations.props @@ -4,15 +4,13 @@ netstandard1.1; netstandard; - netcoreapp2.0-Windows_NT; - netcoreapp2.0-Unix; - uap-Windows_NT; - uapaot-Windows_NT; $(PackageConfigurations); netcoreapp-Windows_NT; netcoreapp-Unix; + uap-Windows_NT; + uapaot-Windows_NT; diff --git a/external/corefx/src/System.Buffers/src/System.Buffers.csproj b/external/corefx/src/System.Buffers/src/System.Buffers.csproj index 315b84e360..0ac14425d5 100644 --- a/external/corefx/src/System.Buffers/src/System.Buffers.csproj +++ b/external/corefx/src/System.Buffers/src/System.Buffers.csproj @@ -5,17 +5,13 @@ {2ADDB484-6F57-4D71-A3FE-A57EC6329A2B} true $(OutputPath)$(MSBuildProjectName).xml - true + true true - - - - @@ -42,4 +38,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/System.Buffers/src/System/Buffers/ArrayPoolEventSource.cs b/external/corefx/src/System.Buffers/src/System/Buffers/ArrayPoolEventSource.cs index 908229a832..da4fcea6ff 100644 --- a/external/corefx/src/System.Buffers/src/System/Buffers/ArrayPoolEventSource.cs +++ b/external/corefx/src/System.Buffers/src/System/Buffers/ArrayPoolEventSource.cs @@ -34,14 +34,26 @@ namespace System.Buffers internal unsafe void BufferRented(int bufferId, int bufferSize, int poolId, int bucketId) { EventData* payload = stackalloc EventData[4]; - payload[0].Size = sizeof(int); - payload[0].DataPointer = ((IntPtr)(&bufferId)); - payload[1].Size = sizeof(int); - payload[1].DataPointer = ((IntPtr)(&bufferSize)); - payload[2].Size = sizeof(int); - payload[2].DataPointer = ((IntPtr)(&poolId)); - payload[3].Size = sizeof(int); - payload[3].DataPointer = ((IntPtr)(&bucketId)); + payload[0] = new EventData + { + Size = sizeof(int), + DataPointer = ((IntPtr)(&bufferId)) + }; + payload[1] = new EventData + { + Size = sizeof(int), + DataPointer = ((IntPtr)(&bufferSize)) + }; + payload[2] = new EventData + { + Size = sizeof(int), + DataPointer = ((IntPtr)(&poolId)) + }; + payload[3] = new EventData + { + Size = sizeof(int), + DataPointer = ((IntPtr)(&bucketId)) + }; WriteEventCore(1, 4, payload); } @@ -54,16 +66,31 @@ namespace System.Buffers internal unsafe void BufferAllocated(int bufferId, int bufferSize, int poolId, int bucketId, BufferAllocatedReason reason) { EventData* payload = stackalloc EventData[5]; - payload[0].Size = sizeof(int); - payload[0].DataPointer = ((IntPtr)(&bufferId)); - payload[1].Size = sizeof(int); - payload[1].DataPointer = ((IntPtr)(&bufferSize)); - payload[2].Size = sizeof(int); - payload[2].DataPointer = ((IntPtr)(&poolId)); - payload[3].Size = sizeof(int); - payload[3].DataPointer = ((IntPtr)(&bucketId)); - payload[4].Size = sizeof(BufferAllocatedReason); - payload[4].DataPointer = ((IntPtr)(&reason)); + payload[0] = new EventData + { + Size = sizeof(int), + DataPointer = ((IntPtr)(&bufferId)) + }; + payload[1] = new EventData + { + Size = sizeof(int), + DataPointer = ((IntPtr)(&bufferSize)) + }; + payload[2] = new EventData + { + Size = sizeof(int), + DataPointer = ((IntPtr)(&poolId)) + }; + payload[3] = new EventData + { + Size = sizeof(int), + DataPointer = ((IntPtr)(&bucketId)) + }; + payload[4] = new EventData + { + Size = sizeof(BufferAllocatedReason), + DataPointer = ((IntPtr)(&reason)) + }; WriteEventCore(2, 5, payload); } diff --git a/external/corefx/src/System.Buffers/tests/ArrayPool/ArrayPoolTest.cs b/external/corefx/src/System.Buffers/tests/ArrayPool/ArrayPoolTest.cs new file mode 100644 index 0000000000..8f2bd45e5b --- /dev/null +++ b/external/corefx/src/System.Buffers/tests/ArrayPool/ArrayPoolTest.cs @@ -0,0 +1,60 @@ +// 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.Diagnostics.Tracing; +using System.Threading; + +namespace System.Buffers.ArrayPool.Tests +{ + public abstract class ArrayPoolTest : RemoteExecutorTestBase + { + protected const string TrimSwitchName = "DOTNET_SYSTEM_BUFFERS_ARRAYPOOL_TRIMSHARED"; + + protected static class EventIds + { + public const int BufferRented = 1; + public const int BufferAllocated = 2; + public const int BufferReturned = 3; + public const int BufferTrimmed = 4; + public const int BufferTrimPoll = 5; + } + + protected static int RunWithListener(Action body, EventLevel level, Action callback) + { + using (TestEventListener listener = new TestEventListener("System.Buffers.ArrayPoolEventSource", level)) + { + int count = 0; + listener.RunWithCallback(e => + { + Interlocked.Increment(ref count); + callback(e); + }, body); + return count; + } + } + + protected static void RemoteInvokeWithTrimming(Action action, bool trim = false) + { + RemoteInvokeOptions options = new RemoteInvokeOptions(); + options.StartInfo.UseShellExecute = false; + options.StartInfo.EnvironmentVariables.Add(TrimSwitchName, trim.ToString()); + + RemoteInvoke(action).Dispose(); + } + + protected static void RemoteInvokeWithTrimming(Func method, bool trim = false, int timeout = FailWaitTimeoutMilliseconds) + { + RemoteInvokeOptions options = new RemoteInvokeOptions + { + TimeOut = timeout + }; + + options.StartInfo.UseShellExecute = false; + options.StartInfo.EnvironmentVariables.Add(TrimSwitchName, trim.ToString()); + + RemoteInvoke(method, trim.ToString(), options).Dispose(); + } + } +} diff --git a/external/corefx/src/System.Buffers/tests/ArrayPool/CollectionTests.cs b/external/corefx/src/System.Buffers/tests/ArrayPool/CollectionTests.cs new file mode 100644 index 0000000000..c2154e3bc4 --- /dev/null +++ b/external/corefx/src/System.Buffers/tests/ArrayPool/CollectionTests.cs @@ -0,0 +1,194 @@ +// 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.Collections.Generic; +using System.Diagnostics.Tracing; +using System.Linq; +using System.Reflection; +using System.Runtime.InteropServices; +using System.Threading; +using Xunit; + +namespace System.Buffers.ArrayPool.Tests +{ + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public class CollectionTests : ArrayPoolTest + { + [OuterLoop("This is a long running test (over 2 minutes)")] + [Theory, + InlineData(true), + InlineData(false)] + public void BuffersAreCollectedWhenStale(bool trim) + { + RemoteInvokeWithTrimming((trimString) => + { + // Check that our environment is as we expect + Assert.Equal(trimString, Environment.GetEnvironmentVariable(TrimSwitchName)); + + const int BufferCount = 8; + const int BufferSize = 1025; + + // Get the pool and check our trim setting + var pool = ArrayPool.Shared; + bool parsedTrim = ValidateTrimState(pool, trimString); + + List rentedBuffers = new List(); + + // Rent and return a set of buffers + for (int i = 0; i < BufferCount; i++) + { + rentedBuffers.Add(pool.Rent(BufferSize)); + } + for (int i = 0; i < BufferCount; i++) + { + pool.Return(rentedBuffers[i]); + } + + // Rent what we returned and ensure they are the same + for (int i = 0; i < BufferCount; i++) + { + var buffer = pool.Rent(BufferSize); + Assert.Contains(rentedBuffers, item => ReferenceEquals(item, buffer)); + } + for (int i = 0; i < BufferCount; i++) + { + pool.Return(rentedBuffers[i]); + } + + // Now wait a little over a minute and force a GC to get some buffers returned + Console.WriteLine("Waiting a minute for buffers to go stale..."); + Thread.Sleep(61 * 1000); + GC.Collect(2); + GC.WaitForPendingFinalizers(); + bool foundNewBuffer = false; + for (int i = 0; i < BufferCount; i++) + { + var buffer = pool.Rent(BufferSize); + if (!rentedBuffers.Any(item => ReferenceEquals(item, buffer))) + { + foundNewBuffer = true; + } + } + + // Should only have found a new buffer if we're trimming + Assert.Equal(parsedTrim, foundNewBuffer); + return SuccessExitCode; + }, trim, 3 * 60 * 1000); // This test has to wait for the buffers to go stale (give it three minutes) + } + + // This test can cause problems for other tests run in parallel (from other assemblies) as + // it pushes the physical memory usage above 80% temporarily. + [ConditionalTheory(typeof(TestEnvironment), nameof(TestEnvironment.IsStressModeEnabled)), + InlineData(true), + InlineData(false)] + public unsafe void ThreadLocalIsCollectedUnderHighPressure(bool trim) + { + RemoteInvokeWithTrimming((trimString) => + { + // Check that our environment is as we expect + Assert.Equal(trimString, Environment.GetEnvironmentVariable(TrimSwitchName)); + + // Get the pool and check our trim setting + var pool = ArrayPool.Shared; + bool parsedTrim = ValidateTrimState(pool, trimString); + + // Create our buffer, return it, re-rent it and ensure we have the same one + const int BufferSize = 4097; + var buffer = pool.Rent(BufferSize); + pool.Return(buffer); + Assert.Same(buffer, pool.Rent(BufferSize)); + + // Return it and put memory pressure on to get it cleared + pool.Return(buffer); + + const int AllocSize = 1024 * 1024 * 64; + int PageSize = Environment.SystemPageSize; + var pressureMethod = pool.GetType().GetMethod("GetMemoryPressure", BindingFlags.Static | BindingFlags.NonPublic); + do + { + Span native = new Span(Marshal.AllocHGlobal(AllocSize).ToPointer(), AllocSize); + + // Touch the pages to bring them into physical memory + for (int i = 0; i < native.Length; i += PageSize) + { + native[i] = 0xEF; + } + + GC.Collect(2); + } while ((int)pressureMethod.Invoke(null, null) != 2); + + GC.WaitForPendingFinalizers(); + if (parsedTrim) + { + // Should have a new buffer now + Assert.NotSame(buffer, pool.Rent(BufferSize)); + } + else + { + // Disabled, should not have trimmed buffer + Assert.Same(buffer, pool.Rent(BufferSize)); + } + + return SuccessExitCode; + }, trim); + } + + private static bool ValidateTrimState(object pool, string trimString) + { + Assert.StartsWith("TlsOverPerCoreLockedStacksArrayPool", pool.GetType().Name); + bool parsedTrim = bool.Parse(trimString); + var trimField = pool.GetType().GetField("s_trimBuffers", BindingFlags.Static | BindingFlags.NonPublic); + Assert.Equal(parsedTrim, (bool)trimField.GetValue(null)); + return parsedTrim; + } + + [Theory, + InlineData(true), + InlineData(false)] + public void PollingEventFires(bool trim) + { + RemoteInvokeWithTrimming((trimString) => + { + var pool = ArrayPool.Shared; + bool parsedTrim = ValidateTrimState(pool, trimString); + bool pollEventFired = false; + var buffer = pool.Rent(10); + + // Polling doesn't start until the thread locals are created for a pool. + // Try before the return then after. + + RunWithListener(() => + { + GC.Collect(2); + GC.WaitForPendingFinalizers(); + }, + EventLevel.Informational, + e => + { + if (e.EventId == EventIds.BufferTrimPoll) + pollEventFired = true; + }); + + Assert.False(pollEventFired, "collection isn't hooked up until the first item is returned"); + pool.Return(buffer); + + RunWithListener(() => + { + GC.Collect(2); + GC.WaitForPendingFinalizers(); + }, + EventLevel.Informational, + e => + { + if (e.EventId == EventIds.BufferTrimPoll) + pollEventFired = true; + }); + + // Polling events should only fire when trimming is enabled + Assert.Equal(parsedTrim, pollEventFired); + return SuccessExitCode; + }, trim); + } + } +} diff --git a/external/corefx/src/System.Buffers/tests/ArrayPool/UnitTests.cs b/external/corefx/src/System.Buffers/tests/ArrayPool/UnitTests.cs index 72a9e9f203..c642d2d357 100644 --- a/external/corefx/src/System.Buffers/tests/ArrayPool/UnitTests.cs +++ b/external/corefx/src/System.Buffers/tests/ArrayPool/UnitTests.cs @@ -2,7 +2,6 @@ // 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; using System.Collections.Generic; using System.Diagnostics.Tracing; using System.Linq; @@ -12,7 +11,7 @@ using Xunit; namespace System.Buffers.ArrayPool.Tests { - public partial class ArrayPoolUnitTests + public partial class ArrayPoolUnitTests : ArrayPoolTest { private const int MaxEventWaitTimeoutInMs = 200; @@ -399,82 +398,87 @@ namespace System.Buffers.ArrayPool.Tests Assert.Equal(64, pool.Rent(63).Length); // still get original size } - private static int RunWithListener(Action body, EventLevel level, Action callback) - { - using (TestEventListener listener = new TestEventListener("System.Buffers.ArrayPoolEventSource", level)) - { - int count = 0; - listener.RunWithCallback(e => - { - Interlocked.Increment(ref count); - callback(e); - }, body); - return count; - } - } - [Fact] public static void RentBufferFiresRentedDiagnosticEvent() { - ArrayPool pool = ArrayPool.Create(maxArrayLength: 16, maxArraysPerBucket: 1); - - byte[] buffer = pool.Rent(16); - pool.Return(buffer); - - Assert.Equal(1, RunWithListener(() => pool.Rent(16), EventLevel.Verbose, e => + RemoteInvokeWithTrimming(() => { - Assert.Equal(1, e.EventId); - Assert.Equal(buffer.GetHashCode(), e.Payload[0]); - Assert.Equal(buffer.Length, e.Payload[1]); - Assert.Equal(pool.GetHashCode(), e.Payload[2]); - })); + ArrayPool pool = ArrayPool.Create(maxArrayLength: 16, maxArraysPerBucket: 1); + + byte[] buffer = pool.Rent(16); + pool.Return(buffer); + + Assert.Equal(1, RunWithListener(() => pool.Rent(16), EventLevel.Verbose, e => + { + Assert.Equal(1, e.EventId); + Assert.Equal(buffer.GetHashCode(), e.Payload[0]); + Assert.Equal(buffer.Length, e.Payload[1]); + Assert.Equal(pool.GetHashCode(), e.Payload[2]); + })); + }); } [Fact] public static void ReturnBufferFiresDiagnosticEvent() { - ArrayPool pool = ArrayPool.Create(maxArrayLength: 16, maxArraysPerBucket: 1); - byte[] buffer = pool.Rent(16); - Assert.Equal(1, RunWithListener(() => pool.Return(buffer), EventLevel.Verbose, e => + RemoteInvokeWithTrimming(() => { - Assert.Equal(3, e.EventId); - Assert.Equal(buffer.GetHashCode(), e.Payload[0]); - Assert.Equal(buffer.Length, e.Payload[1]); - Assert.Equal(pool.GetHashCode(), e.Payload[2]); - })); + ArrayPool pool = ArrayPool.Create(maxArrayLength: 16, maxArraysPerBucket: 1); + byte[] buffer = pool.Rent(16); + Assert.Equal(1, RunWithListener(() => pool.Return(buffer), EventLevel.Verbose, e => + { + Assert.Equal(3, e.EventId); + Assert.Equal(buffer.GetHashCode(), e.Payload[0]); + Assert.Equal(buffer.Length, e.Payload[1]); + Assert.Equal(pool.GetHashCode(), e.Payload[2]); + })); + }); } [Fact] public static void RentingNonExistentBufferFiresAllocatedDiagnosticEvent() { - ArrayPool pool = ArrayPool.Create(maxArrayLength: 16, maxArraysPerBucket: 1); - Assert.Equal(1, RunWithListener(() => pool.Rent(16), EventLevel.Informational, e => Assert.Equal(2, e.EventId))); + RemoteInvokeWithTrimming(() => + { + ArrayPool pool = ArrayPool.Create(maxArrayLength: 16, maxArraysPerBucket: 1); + Assert.Equal(1, RunWithListener(() => pool.Rent(16), EventLevel.Informational, e => Assert.Equal(2, e.EventId))); + }); } [Fact] public static void RentingBufferOverConfiguredMaximumSizeFiresDiagnosticEvent() { - ArrayPool pool = ArrayPool.Create(maxArrayLength: 16, maxArraysPerBucket: 1); - Assert.Equal(1, RunWithListener(() => pool.Rent(64), EventLevel.Informational, e => Assert.Equal(2, e.EventId))); + RemoteInvokeWithTrimming(() => + { + ArrayPool pool = ArrayPool.Create(maxArrayLength: 16, maxArraysPerBucket: 1); + Assert.Equal(1, RunWithListener(() => pool.Rent(64), EventLevel.Informational, e => Assert.Equal(2, e.EventId))); + }); } [Fact] public static void RentingManyBuffersFiresExpectedDiagnosticEvents() { - ArrayPool pool = ArrayPool.Create(maxArrayLength: 16, maxArraysPerBucket: 10); - var list = new List(); - - Assert.Equal(60, RunWithListener(() => + RemoteInvokeWithTrimming(() => { - for (int i = 0; i < 10; i++) pool.Return(pool.Rent(16)); // 10 rents + 10 allocations, 10 returns - for (int i = 0; i < 10; i++) pool.Return(pool.Rent(0)); // 0 events for empty arrays - for (int i = 0; i < 10; i++) pool.Rent(16); // 10 rents - for (int i = 0; i < 10; i++) pool.Rent(16); // 10 rents + 10 allocations - }, EventLevel.Verbose, list.Add)); + ArrayPool pool = ArrayPool.Create(maxArrayLength: 16, maxArraysPerBucket: 10); + var list = new List(); - Assert.Equal(30, list.Where(e => e.EventId == 1).Count()); // rents - Assert.Equal(20, list.Where(e => e.EventId == 2).Count()); // allocations - Assert.Equal(10, list.Where(e => e.EventId == 3).Count()); // returns + Assert.Equal(60, RunWithListener(() => + { + for (int i = 0; i < 10; i++) + pool.Return(pool.Rent(16)); // 10 rents + 10 allocations, 10 returns + for (int i = 0; i < 10; i++) + pool.Return(pool.Rent(0)); // 0 events for empty arrays + for (int i = 0; i < 10; i++) + pool.Rent(16); // 10 rents + for (int i = 0; i < 10; i++) + pool.Rent(16); // 10 rents + 10 allocations + }, EventLevel.Verbose, list.Add)); + + Assert.Equal(30, list.Where(e => e.EventId == 1).Count()); // rents + Assert.Equal(20, list.Where(e => e.EventId == 2).Count()); // allocations + Assert.Equal(10, list.Where(e => e.EventId == 3).Count()); // returns + }); } [Theory] diff --git a/external/corefx/src/System.Buffers/tests/System.Buffers.Tests.csproj b/external/corefx/src/System.Buffers/tests/System.Buffers.Tests.csproj index 71a002e77a..c72f4d1046 100644 --- a/external/corefx/src/System.Buffers/tests/System.Buffers.Tests.csproj +++ b/external/corefx/src/System.Buffers/tests/System.Buffers.Tests.csproj @@ -3,12 +3,24 @@ {62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C} + true + + + + - - + + + + + + {69e46a6f-9966-45a5-8945-2559fe337827} + RemoteExecutorConsoleApp + + \ No newline at end of file diff --git a/external/corefx/src/System.CodeDom/tests/CSharpCodeGenerationTests.cs.REMOVED.git-id b/external/corefx/src/System.CodeDom/tests/CSharpCodeGenerationTests.cs.REMOVED.git-id index 42d92ccdfe..98578d2bbb 100644 --- a/external/corefx/src/System.CodeDom/tests/CSharpCodeGenerationTests.cs.REMOVED.git-id +++ b/external/corefx/src/System.CodeDom/tests/CSharpCodeGenerationTests.cs.REMOVED.git-id @@ -1 +1 @@ -01442cc94b0a9560697739eba0aa9d4cc89f4e5c \ No newline at end of file +054fcffdfaa0cf2ec310147734080fd7417132b3 \ No newline at end of file diff --git a/external/corefx/src/System.CodeDom/tests/CodeGenerationTests.cs b/external/corefx/src/System.CodeDom/tests/CodeGenerationTests.cs index 79749310f6..0683de03a8 100644 --- a/external/corefx/src/System.CodeDom/tests/CodeGenerationTests.cs +++ b/external/corefx/src/System.CodeDom/tests/CodeGenerationTests.cs @@ -5,6 +5,7 @@ using System.CodeDom.Compiler; using System.Collections.Generic; using System.ComponentModel; +using System.Diagnostics; using System.IO; using System.Reflection; using System.Runtime.Serialization.Formatters.Tests; @@ -13,7 +14,7 @@ using Xunit; namespace System.CodeDom.Tests { - public abstract class CodeGenerationTests + public abstract class CodeGenerationTests : RemoteExecutorTestBase { [Fact] public void Roundtrip_Extension() diff --git a/external/corefx/src/System.CodeDom/tests/System.CodeDom.Tests.csproj b/external/corefx/src/System.CodeDom/tests/System.CodeDom.Tests.csproj index c0c0a2802f..72822c276a 100644 --- a/external/corefx/src/System.CodeDom/tests/System.CodeDom.Tests.csproj +++ b/external/corefx/src/System.CodeDom/tests/System.CodeDom.Tests.csproj @@ -107,5 +107,11 @@ Common\System\Collections\TestBase.NonGeneric.cs + + + {69e46a6f-9966-45a5-8945-2559fe337827} + RemoteExecutorConsoleApp + + diff --git a/external/corefx/src/System.CodeDom/tests/VBCodeGenerationTests.cs.REMOVED.git-id b/external/corefx/src/System.CodeDom/tests/VBCodeGenerationTests.cs.REMOVED.git-id index f29a402402..af37dedeef 100644 --- a/external/corefx/src/System.CodeDom/tests/VBCodeGenerationTests.cs.REMOVED.git-id +++ b/external/corefx/src/System.CodeDom/tests/VBCodeGenerationTests.cs.REMOVED.git-id @@ -1 +1 @@ -c5dbb6995a65fd9a529e5eb73e3616dde60f74d8 \ No newline at end of file +619c2cb9ba0ce3dbd071fad38c2c8c654f85c80e \ No newline at end of file diff --git a/external/corefx/src/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj b/external/corefx/src/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj index e8c7b2cd6a..4f7e2de607 100644 --- a/external/corefx/src/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj +++ b/external/corefx/src/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj @@ -22,6 +22,9 @@ + + Common\System\Collections\Concurrent\ConcurrentQueue_Segment.cs + diff --git a/external/corefx/src/System.Collections.Concurrent/src/System/Collections/Concurrent/BlockingCollection.cs.REMOVED.git-id b/external/corefx/src/System.Collections.Concurrent/src/System/Collections/Concurrent/BlockingCollection.cs.REMOVED.git-id index 18617f15c9..3c8eef1fb5 100644 --- a/external/corefx/src/System.Collections.Concurrent/src/System/Collections/Concurrent/BlockingCollection.cs.REMOVED.git-id +++ b/external/corefx/src/System.Collections.Concurrent/src/System/Collections/Concurrent/BlockingCollection.cs.REMOVED.git-id @@ -1 +1 @@ -ed7f201166fcb8c978d389343127742171668b28 \ No newline at end of file +07d4edf0247b4c3c37223983c8cb6d0d5ee83824 \ No newline at end of file diff --git a/external/corefx/src/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentQueue.cs b/external/corefx/src/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentQueue.cs index c4202e1a2c..3f78e24527 100644 --- a/external/corefx/src/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentQueue.cs +++ b/external/corefx/src/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentQueue.cs @@ -21,7 +21,7 @@ namespace System.Collections.Concurrent [DebuggerDisplay("Count = {Count}")] [DebuggerTypeProxy(typeof(IProducerConsumerCollectionDebugView<>))] [Serializable] - public class ConcurrentQueue : IProducerConsumerCollection, IReadOnlyCollection + public partial class ConcurrentQueue : IProducerConsumerCollection, IReadOnlyCollection { // This implementation provides an unbounded, multi-producer multi-consumer queue // that supports the standard Enqueue/TryDequeue operations, as well as support for @@ -88,7 +88,7 @@ namespace System.Collections.Concurrent int count = c.Count; if (count > length) { - length = Math.Min(RoundUpToPowerOf2(count), MaxSegmentLength); + length = Math.Min(Segment.RoundUpToPowerOf2(count), MaxSegmentLength); } } @@ -589,18 +589,6 @@ namespace System.Collections.Concurrent } } - /// Round the specified value up to the next power of 2, if it isn't one already. - private static int RoundUpToPowerOf2(int i) - { - --i; - i |= i >> 1; - i |= i >> 2; - i |= i >> 4; - i |= i >> 8; - i |= i >> 16; - return i + 1; - } - /// Adds an object to the end of the . /// /// The object to add to the end of the . @@ -812,312 +800,5 @@ namespace System.Collections.Concurrent _tail = _head = new Segment(InitialSegmentLength); } } - - /// - /// Provides a multi-producer, multi-consumer thread-safe bounded segment. When the queue is full, - /// enqueues fail and return false. When the queue is empty, dequeues fail and return null. - /// These segments are linked together to form the unbounded . - /// - [DebuggerDisplay("Capacity = {Capacity}")] - private sealed class Segment - { - // Segment design is inspired by the algorithm outlined at: - // http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue - - /// The array of items in this queue. Each slot contains the item in that slot and its "sequence number". - internal readonly Slot[] _slots; - /// Mask for quickly accessing a position within the queue's array. - internal readonly int _slotsMask; - /// The head and tail positions, with padding to help avoid false sharing contention. - /// Dequeuing happens from the head, enqueuing happens at the tail. - internal PaddedHeadAndTail _headAndTail; // mutable struct: do not make this readonly - - /// Indicates whether the segment has been marked such that dequeues don't overwrite the removed data. - internal bool _preservedForObservation; - /// Indicates whether the segment has been marked such that no additional items may be enqueued. - internal bool _frozenForEnqueues; - /// The segment following this one in the queue, or null if this segment is the last in the queue. - internal Segment _nextSegment; - - /// Creates the segment. - /// - /// The maximum number of elements the segment can contain. Must be a power of 2. - /// - public Segment(int boundedLength) - { - // Validate the length - Debug.Assert(boundedLength >= 2, $"Must be >= 2, got {boundedLength}"); - Debug.Assert((boundedLength & (boundedLength - 1)) == 0, $"Must be a power of 2, got {boundedLength}"); - - // Initialize the slots and the mask. The mask is used as a way of quickly doing "% _slots.Length", - // instead letting us do "& _slotsMask". - _slots = new Slot[boundedLength]; - _slotsMask = boundedLength - 1; - - // Initialize the sequence number for each slot. The sequence number provides a ticket that - // allows dequeuers to know whether they can dequeue and enqueuers to know whether they can - // enqueue. An enqueuer at position N can enqueue when the sequence number is N, and a dequeuer - // for position N can dequeue when the sequence number is N + 1. When an enqueuer is done writing - // at position N, it sets the sequence number to N + 1 so that a dequeuer will be able to dequeue, - // and when a dequeuer is done dequeueing at position N, it sets the sequence number to N + _slots.Length, - // so that when an enqueuer loops around the slots, it'll find that the sequence number at - // position N is N. This also means that when an enqueuer finds that at position N the sequence - // number is < N, there is still a value in that slot, i.e. the segment is full, and when a - // dequeuer finds that the value in a slot is < N + 1, there is nothing currently available to - // dequeue. (It is possible for multiple enqueuers to enqueue concurrently, writing into - // subsequent slots, and to have the first enqueuer take longer, so that the slots for 1, 2, 3, etc. - // may have values, but the 0th slot may still be being filled... in that case, TryDequeue will - // return false.) - for (int i = 0; i < _slots.Length; i++) - { - _slots[i].SequenceNumber = i; - } - } - - /// Gets the number of elements this segment can store. - internal int Capacity => _slots.Length; - - /// Gets the "freeze offset" for this segment. - internal int FreezeOffset => _slots.Length * 2; - - /// - /// Ensures that the segment will not accept any subsequent enqueues that aren't already underway. - /// - /// - /// When we mark a segment as being frozen for additional enqueues, - /// we set the bool, but that's mostly - /// as a small helper to avoid marking it twice. The real marking comes - /// by modifying the Tail for the segment, increasing it by this - /// . This effectively knocks it off the - /// sequence expected by future enqueuers, such that any additional enqueuer - /// will be unable to enqueue due to it not lining up with the expected - /// sequence numbers. This value is chosen specially so that Tail will grow - /// to a value that maps to the same slot but that won't be confused with - /// any other enqueue/dequeue sequence number. - /// - internal void EnsureFrozenForEnqueues() // must only be called while queue's segment lock is held - { - if (!_frozenForEnqueues) // flag used to ensure we don't increase the Tail more than once if frozen more than once - { - _frozenForEnqueues = true; - - // Increase the tail by FreezeOffset, spinning until we're successful in doing so. - var spinner = new SpinWait(); - while (true) - { - int tail = Volatile.Read(ref _headAndTail.Tail); - if (Interlocked.CompareExchange(ref _headAndTail.Tail, tail + FreezeOffset, tail) == tail) - { - break; - } - spinner.SpinOnce(); - } - } - } - - /// Tries to dequeue an element from the queue. - public bool TryDequeue(out T item) - { - // Loop in case of contention... - var spinner = new SpinWait(); - while (true) - { - // Get the head at which to try to dequeue. - int currentHead = Volatile.Read(ref _headAndTail.Head); - int slotsIndex = currentHead & _slotsMask; - - // Read the sequence number for the head position. - int sequenceNumber = Volatile.Read(ref _slots[slotsIndex].SequenceNumber); - - // We can dequeue from this slot if it's been filled by an enqueuer, which - // would have left the sequence number at pos+1. - int diff = sequenceNumber - (currentHead + 1); - if (diff == 0) - { - // We may be racing with other dequeuers. Try to reserve the slot by incrementing - // the head. Once we've done that, no one else will be able to read from this slot, - // and no enqueuer will be able to read from this slot until we've written the new - // sequence number. WARNING: The next few lines are not reliable on a runtime that - // supports thread aborts. If a thread abort were to sneak in after the CompareExchange - // but before the Volatile.Write, enqueuers trying to enqueue into this slot would - // spin indefinitely. If this implementation is ever used on such a platform, this - // if block should be wrapped in a finally / prepared region. - if (Interlocked.CompareExchange(ref _headAndTail.Head, currentHead + 1, currentHead) == currentHead) - { - // Successfully reserved the slot. Note that after the above CompareExchange, other threads - // trying to dequeue from this slot will end up spinning until we do the subsequent Write. - item = _slots[slotsIndex].Item; - if (!Volatile.Read(ref _preservedForObservation)) - { - // If we're preserving, though, we don't zero out the slot, as we need it for - // enumerations, peeking, ToArray, etc. And we don't update the sequence number, - // so that an enqueuer will see it as full and be forced to move to a new segment. - _slots[slotsIndex].Item = default(T); - Volatile.Write(ref _slots[slotsIndex].SequenceNumber, currentHead + _slots.Length); - } - return true; - } - } - else if (diff < 0) - { - // The sequence number was less than what we needed, which means this slot doesn't - // yet contain a value we can dequeue, i.e. the segment is empty. Technically it's - // possible that multiple enqueuers could have written concurrently, with those - // getting later slots actually finishing first, so there could be elements after - // this one that are available, but we need to dequeue in order. So before declaring - // failure and that the segment is empty, we check the tail to see if we're actually - // empty or if we're just waiting for items in flight or after this one to become available. - bool frozen = _frozenForEnqueues; - int currentTail = Volatile.Read(ref _headAndTail.Tail); - if (currentTail - currentHead <= 0 || (frozen && (currentTail - FreezeOffset - currentHead <= 0))) - { - item = default(T); - return false; - } - - // It's possible it could have become frozen after we checked _frozenForEnqueues - // and before reading the tail. That's ok: in that rare race condition, we just - // loop around again. - } - - // Lost a race. Spin a bit, then try again. - spinner.SpinOnce(); - } - } - - /// Tries to peek at an element from the queue, without removing it. - public bool TryPeek(out T result, bool resultUsed) - { - if (resultUsed) - { - // In order to ensure we don't get a torn read on the value, we mark the segment - // as preserving for observation. Additional items can still be enqueued to this - // segment, but no space will be freed during dequeues, such that the segment will - // no longer be reusable. - _preservedForObservation = true; - Interlocked.MemoryBarrier(); - } - - // Loop in case of contention... - var spinner = new SpinWait(); - while (true) - { - // Get the head at which to try to peek. - int currentHead = Volatile.Read(ref _headAndTail.Head); - int slotsIndex = currentHead & _slotsMask; - - // Read the sequence number for the head position. - int sequenceNumber = Volatile.Read(ref _slots[slotsIndex].SequenceNumber); - - // We can peek from this slot if it's been filled by an enqueuer, which - // would have left the sequence number at pos+1. - int diff = sequenceNumber - (currentHead + 1); - if (diff == 0) - { - result = resultUsed ? _slots[slotsIndex].Item : default(T); - return true; - } - else if (diff < 0) - { - // The sequence number was less than what we needed, which means this slot doesn't - // yet contain a value we can peek, i.e. the segment is empty. Technically it's - // possible that multiple enqueuers could have written concurrently, with those - // getting later slots actually finishing first, so there could be elements after - // this one that are available, but we need to peek in order. So before declaring - // failure and that the segment is empty, we check the tail to see if we're actually - // empty or if we're just waiting for items in flight or after this one to become available. - bool frozen = _frozenForEnqueues; - int currentTail = Volatile.Read(ref _headAndTail.Tail); - if (currentTail - currentHead <= 0 || (frozen && (currentTail - FreezeOffset - currentHead <= 0))) - { - result = default(T); - return false; - } - - // It's possible it could have become frozen after we checked _frozenForEnqueues - // and before reading the tail. That's ok: in that rare race condition, we just - // loop around again. - } - - // Lost a race. Spin a bit, then try again. - spinner.SpinOnce(); - } - } - - /// - /// Attempts to enqueue the item. If successful, the item will be stored - /// in the queue and true will be returned; otherwise, the item won't be stored, and false - /// will be returned. - /// - public bool TryEnqueue(T item) - { - // Loop in case of contention... - var spinner = new SpinWait(); - while (true) - { - // Get the tail at which to try to return. - int currentTail = Volatile.Read(ref _headAndTail.Tail); - int slotsIndex = currentTail & _slotsMask; - - // Read the sequence number for the tail position. - int sequenceNumber = Volatile.Read(ref _slots[slotsIndex].SequenceNumber); - - // The slot is empty and ready for us to enqueue into it if its sequence - // number matches the slot. - int diff = sequenceNumber - currentTail; - if (diff == 0) - { - // We may be racing with other enqueuers. Try to reserve the slot by incrementing - // the tail. Once we've done that, no one else will be able to write to this slot, - // and no dequeuer will be able to read from this slot until we've written the new - // sequence number. WARNING: The next few lines are not reliable on a runtime that - // supports thread aborts. If a thread abort were to sneak in after the CompareExchange - // but before the Volatile.Write, other threads will spin trying to access this slot. - // If this implementation is ever used on such a platform, this if block should be - // wrapped in a finally / prepared region. - if (Interlocked.CompareExchange(ref _headAndTail.Tail, currentTail + 1, currentTail) == currentTail) - { - // Successfully reserved the slot. Note that after the above CompareExchange, other threads - // trying to return will end up spinning until we do the subsequent Write. - _slots[slotsIndex].Item = item; - Volatile.Write(ref _slots[slotsIndex].SequenceNumber, currentTail + 1); - return true; - } - } - else if (diff < 0) - { - // The sequence number was less than what we needed, which means this slot still - // contains a value, i.e. the segment is full. Technically it's possible that multiple - // dequeuers could have read concurrently, with those getting later slots actually - // finishing first, so there could be spaces after this one that are available, but - // we need to enqueue in order. - return false; - } - - // Lost a race. Spin a bit, then try again. - spinner.SpinOnce(); - } - } - - /// Represents a slot in the queue. - [StructLayout(LayoutKind.Auto)] - [DebuggerDisplay("Item = {Item}, SequenceNumber = {SequenceNumber}")] - internal struct Slot - { - /// The item. - public T Item; - /// The sequence number for this slot, used to synchronize between enqueuers and dequeuers. - public int SequenceNumber; - } - } - } - - /// Padded head and tail indices, to avoid false sharing between producers and consumers. - [DebuggerDisplay("Head = {Head}, Tail = {Tail}")] - [StructLayout(LayoutKind.Explicit, Size = 384)] // padding before/between/after fields based on worst case cache line size of 128 - internal struct PaddedHeadAndTail - { - [FieldOffset(128)] public int Head; - [FieldOffset(256)] public int Tail; } } diff --git a/external/corefx/src/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableArray_1.Builder.cs b/external/corefx/src/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableArray_1.Builder.cs index 34c0e004a9..482215723c 100644 --- a/external/corefx/src/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableArray_1.Builder.cs +++ b/external/corefx/src/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableArray_1.Builder.cs @@ -127,6 +127,8 @@ namespace System.Collections.Immutable } } + private static void ThrowIndexOutOfRangeException() => throw new IndexOutOfRangeException(); + /// /// Gets or sets the element at the specified index. /// @@ -140,7 +142,7 @@ namespace System.Collections.Immutable { if (index >= this.Count) { - throw new IndexOutOfRangeException(); + ThrowIndexOutOfRangeException(); } return _elements[index]; @@ -150,7 +152,7 @@ namespace System.Collections.Immutable { if (index >= this.Count) { - throw new IndexOutOfRangeException(); + ThrowIndexOutOfRangeException(); } _elements[index] = value; @@ -169,7 +171,7 @@ namespace System.Collections.Immutable { if (index >= this.Count) { - throw new IndexOutOfRangeException(); + ThrowIndexOutOfRangeException(); } return ref this._elements[index]; @@ -247,8 +249,10 @@ namespace System.Collections.Immutable /// The object to add to the . public void Add(T item) { - this.EnsureCapacity(this.Count + 1); - _elements[_count++] = item; + int newCount = _count + 1; + this.EnsureCapacity(newCount); + _elements[_count] = item; + _count = newCount; } /// diff --git a/external/corefx/src/System.Collections.Immutable/src/System/Linq/ImmutableArrayExtensions.cs b/external/corefx/src/System.Collections.Immutable/src/System/Linq/ImmutableArrayExtensions.cs index 4d7e56ab27..c141463d0b 100644 --- a/external/corefx/src/System.Collections.Immutable/src/System/Linq/ImmutableArrayExtensions.cs +++ b/external/corefx/src/System.Collections.Immutable/src/System/Linq/ImmutableArrayExtensions.cs @@ -608,7 +608,7 @@ namespace System.Linq { Requires.NotNull(keySelector, nameof(keySelector)); - var result = new Dictionary(comparer); + var result = new Dictionary(immutableArray.Length, comparer); foreach (var v in immutableArray) { result.Add(keySelector(v), v); diff --git a/external/corefx/src/System.Collections.Specialized/src/MatchingRefApiCompatBaseline.txt b/external/corefx/src/System.Collections.Specialized/src/MatchingRefApiCompatBaseline.txt new file mode 100644 index 0000000000..98aeadefc3 --- /dev/null +++ b/external/corefx/src/System.Collections.Specialized/src/MatchingRefApiCompatBaseline.txt @@ -0,0 +1,2 @@ +# Type exposed publicly in implementation only for serialization purposes +TypesMustExist : Type 'System.Collections.Specialized.ListDictionary.DictionaryNode' does not exist in the implementation but it does exist in the contract. diff --git a/external/corefx/src/System.Collections/ref/System.Collections.cs b/external/corefx/src/System.Collections/ref/System.Collections.cs index e8d4934236..5fad22d437 100644 --- a/external/corefx/src/System.Collections/ref/System.Collections.cs +++ b/external/corefx/src/System.Collections/ref/System.Collections.cs @@ -90,11 +90,14 @@ namespace System.Collections.Generic public void Clear() { } public bool ContainsKey(TKey key) { throw null; } public bool ContainsValue(TValue value) { throw null; } + public int EnsureCapacity(int capacity) { throw null; } public System.Collections.Generic.Dictionary.Enumerator GetEnumerator() { throw null; } public virtual void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } public virtual void OnDeserialization(object sender) { } public bool Remove(TKey key) { throw null; } public bool Remove(TKey key, out TValue value) { throw null; } + public void TrimExcess(int capacity) { } + public void TrimExcess() { } public bool TryAdd(TKey key, TValue value) { throw null; } void System.Collections.Generic.ICollection>.Add(System.Collections.Generic.KeyValuePair keyValuePair) { } bool System.Collections.Generic.ICollection>.Contains(System.Collections.Generic.KeyValuePair keyValuePair) { throw null; } @@ -201,6 +204,7 @@ namespace System.Collections.Generic public void CopyTo(T[] array, int arrayIndex) { } public void CopyTo(T[] array, int arrayIndex, int count) { } public static IEqualityComparer> CreateSetComparer() { throw null; } + public int EnsureCapacity(int capacity) { throw null; } public void ExceptWith(System.Collections.Generic.IEnumerable other) { } public System.Collections.Generic.HashSet.Enumerator GetEnumerator() { throw null; } public virtual void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } diff --git a/external/corefx/src/System.Collections/src/Resources/Strings.resx b/external/corefx/src/System.Collections/src/Resources/Strings.resx index e25845e8fe..8f035d63c2 100644 --- a/external/corefx/src/System.Collections/src/Resources/Strings.resx +++ b/external/corefx/src/System.Collections/src/Resources/Strings.resx @@ -79,6 +79,9 @@ An item with the same key has already been added. Key: {0} + + Operations that change non-concurrent collections must have exclusive access. A concurrent update was performed on this collection and corrupted its state. The collection's state is no longer correct. + Queue empty. diff --git a/external/corefx/src/System.Collections/src/System.Collections.csproj b/external/corefx/src/System.Collections/src/System.Collections.csproj index 3bec193e50..498b244520 100644 --- a/external/corefx/src/System.Collections/src/System.Collections.csproj +++ b/external/corefx/src/System.Collections/src/System.Collections.csproj @@ -7,7 +7,6 @@ true true - @@ -16,6 +15,7 @@ + diff --git a/external/corefx/src/System.Collections/src/System/Collections/Generic/HashSet.cs b/external/corefx/src/System.Collections/src/System/Collections/Generic/HashSet.cs index 2e8c4a44f4..a78da2f3bb 100644 --- a/external/corefx/src/System.Collections/src/System/Collections/Generic/HashSet.cs +++ b/external/corefx/src/System.Collections/src/System/Collections/Generic/HashSet.cs @@ -259,14 +259,23 @@ namespace System.Collections.Generic { if (_buckets != null) { + int collisionCount = 0; int hashCode = InternalGetHashCode(item); + Slot[] slots = _slots; // see note at "HashSet" level describing why "- 1" appears in for loop - for (int i = _buckets[hashCode % _buckets.Length] - 1; i >= 0; i = _slots[i].next) + for (int i = _buckets[hashCode % _buckets.Length] - 1; i >= 0; i = slots[i].next) { - if (_slots[i].hashCode == hashCode && _comparer.Equals(_slots[i].value, item)) + if (slots[i].hashCode == hashCode && _comparer.Equals(slots[i].value, item)) { return true; } + + if (collisionCount >= slots.Length) + { + // The chain of entries forms a loop, which means a concurrent update has happened. + throw new InvalidOperationException(SR.InvalidOperation_ConcurrentOperationsNotSupported); + } + collisionCount++; } } // either _buckets is null or wasn't found @@ -295,26 +304,28 @@ namespace System.Collections.Generic int hashCode = InternalGetHashCode(item); int bucket = hashCode % _buckets.Length; int last = -1; - for (int i = _buckets[bucket] - 1; i >= 0; last = i, i = _slots[i].next) + int collisionCount = 0; + Slot[] slots = _slots; + for (int i = _buckets[bucket] - 1; i >= 0; last = i, i = slots[i].next) { - if (_slots[i].hashCode == hashCode && _comparer.Equals(_slots[i].value, item)) + if (slots[i].hashCode == hashCode && _comparer.Equals(slots[i].value, item)) { if (last < 0) { // first iteration; update buckets - _buckets[bucket] = _slots[i].next + 1; + _buckets[bucket] = slots[i].next + 1; } else { // subsequent iterations; update 'next' pointers - _slots[last].next = _slots[i].next; + slots[last].next = slots[i].next; } - _slots[i].hashCode = -1; + slots[i].hashCode = -1; if (RuntimeHelpers.IsReferenceOrContainsReferences()) { - _slots[i].value = default(T); + slots[i].value = default(T); } - _slots[i].next = _freeList; + slots[i].next = _freeList; _count--; _version++; @@ -329,6 +340,13 @@ namespace System.Collections.Generic } return true; } + + if (collisionCount >= slots.Length) + { + // The chain of entries forms a loop, which means a concurrent update has happened. + throw new InvalidOperationException(SR.InvalidOperation_ConcurrentOperationsNotSupported); + } + collisionCount++; } } // either _buckets is null or wasn't found @@ -1030,6 +1048,24 @@ namespace System.Collections.Generic } } + /// + /// Ensures that the hash set can hold up to 'capacity' entries without any further expansion of its backing storage. + /// + public int EnsureCapacity(int capacity) + { + if (capacity < 0) + throw new ArgumentOutOfRangeException(nameof(capacity)); + int currentCapacity = _slots == null ? 0 : _slots.Length; + if (currentCapacity >= capacity) + return currentCapacity; + if (_buckets == null) + return Initialize(capacity); + + int newSize = HashHelpers.GetPrime(capacity); + SetCapacity(newSize); + return newSize; + } + /// /// Sets the capacity of this list to the size of the list (rounded up to nearest prime), /// unless count is 0, in which case we release references. @@ -1107,7 +1143,7 @@ namespace System.Collections.Generic /// greater than or equal to capacity. /// /// - private void Initialize(int capacity) + private int Initialize(int capacity) { Debug.Assert(_buckets == null, "Initialize was called but _buckets was non-null"); @@ -1115,6 +1151,7 @@ namespace System.Collections.Generic _buckets = new int[size]; _slots = new Slot[size]; + return size; } /// @@ -1145,6 +1182,7 @@ namespace System.Collections.Generic /// private void SetCapacity(int newSize) { + Debug.Assert(HashHelpers.IsPrime(newSize), "New size is not prime!"); Debug.Assert(_buckets != null, "SetCapacity called on a set with no elements"); Slot[] newSlots = new Slot[newSize]; @@ -1179,35 +1217,44 @@ namespace System.Collections.Generic int hashCode = InternalGetHashCode(value); int bucket = hashCode % _buckets.Length; - - for (int i = _buckets[bucket] - 1; i >= 0; i = _slots[i].next) + int collisionCount = 0; + Slot[] slots = _slots; + for (int i = _buckets[bucket] - 1; i >= 0; i = slots[i].next) { - if (_slots[i].hashCode == hashCode && _comparer.Equals(_slots[i].value, value)) + if (slots[i].hashCode == hashCode && _comparer.Equals(slots[i].value, value)) { return false; } + + if (collisionCount >= slots.Length) + { + // The chain of entries forms a loop, which means a concurrent update has happened. + throw new InvalidOperationException(SR.InvalidOperation_ConcurrentOperationsNotSupported); + } + collisionCount++; } int index; if (_freeList >= 0) { index = _freeList; - _freeList = _slots[index].next; + _freeList = slots[index].next; } else { - if (_lastIndex == _slots.Length) + if (_lastIndex == slots.Length) { IncreaseCapacity(); // this will change during resize + slots = _slots; bucket = hashCode % _buckets.Length; } index = _lastIndex; _lastIndex++; } - _slots[index].hashCode = hashCode; - _slots[index].value = value; - _slots[index].next = _buckets[bucket] - 1; + slots[index].hashCode = hashCode; + slots[index].value = value; + slots[index].next = _buckets[bucket] - 1; _buckets[bucket] = index + 1; _count++; _version++; @@ -1359,13 +1406,22 @@ namespace System.Collections.Generic { Debug.Assert(_buckets != null, "_buckets was null; callers should check first"); + int collisionCount = 0; int hashCode = InternalGetHashCode(item); - for (int i = _buckets[hashCode % _buckets.Length] - 1; i >= 0; i = _slots[i].next) + Slot[] slots = _slots; + for (int i = _buckets[hashCode % _buckets.Length] - 1; i >= 0; i = slots[i].next) { - if ((_slots[i].hashCode) == hashCode && _comparer.Equals(_slots[i].value, item)) + if ((slots[i].hashCode) == hashCode && _comparer.Equals(slots[i].value, item)) { return i; } + + if (collisionCount >= slots.Length) + { + // The chain of entries forms a loop, which means a concurrent update has happened. + throw new InvalidOperationException(SR.InvalidOperation_ConcurrentOperationsNotSupported); + } + collisionCount++; } // wasn't found return -1; @@ -1483,34 +1539,44 @@ namespace System.Collections.Generic int hashCode = InternalGetHashCode(value); int bucket = hashCode % _buckets.Length; - for (int i = _buckets[bucket] - 1; i >= 0; i = _slots[i].next) + int collisionCount = 0; + Slot[] slots = _slots; + for (int i = _buckets[bucket] - 1; i >= 0; i = slots[i].next) { - if (_slots[i].hashCode == hashCode && _comparer.Equals(_slots[i].value, value)) + if (slots[i].hashCode == hashCode && _comparer.Equals(slots[i].value, value)) { location = i; return false; //already present } + + if (collisionCount >= slots.Length) + { + // The chain of entries forms a loop, which means a concurrent update has happened. + throw new InvalidOperationException(SR.InvalidOperation_ConcurrentOperationsNotSupported); + } + collisionCount++; } int index; if (_freeList >= 0) { index = _freeList; - _freeList = _slots[index].next; + _freeList = slots[index].next; } else { - if (_lastIndex == _slots.Length) + if (_lastIndex == slots.Length) { IncreaseCapacity(); // this will change during resize + slots = _slots; bucket = hashCode % _buckets.Length; } index = _lastIndex; _lastIndex++; } - _slots[index].hashCode = hashCode; - _slots[index].value = value; - _slots[index].next = _buckets[bucket] - 1; + slots[index].hashCode = hashCode; + slots[index].value = value; + slots[index].next = _buckets[bucket] - 1; _buckets[bucket] = index + 1; _count++; _version++; diff --git a/external/corefx/src/System.Collections/src/System/Collections/Generic/Queue.cs b/external/corefx/src/System.Collections/src/System/Collections/Generic/Queue.cs index 547df798df..24735d8e53 100644 --- a/external/corefx/src/System.Collections/src/System/Collections/Generic/Queue.cs +++ b/external/corefx/src/System.Collections/src/System/Collections/Generic/Queue.cs @@ -236,15 +236,18 @@ namespace System.Collections.Generic // InvalidOperationException. public T Dequeue() { + int head = _head; + T[] array = _array; + if (_size == 0) { ThrowForEmptyQueue(); } - T removed = _array[_head]; + T removed = array[head]; if (RuntimeHelpers.IsReferenceOrContainsReferences()) { - _array[_head] = default(T); + array[head] = default; } MoveNext(ref _head); _size--; @@ -254,16 +257,19 @@ namespace System.Collections.Generic public bool TryDequeue(out T result) { + int head = _head; + T[] array = _array; + if (_size == 0) { - result = default(T); + result = default; return false; } - result = _array[_head]; + result = array[head]; if (RuntimeHelpers.IsReferenceOrContainsReferences()) { - _array[_head] = default(T); + array[head] = default; } MoveNext(ref _head); _size--; @@ -369,10 +375,15 @@ namespace System.Collections.Generic // Increments the index wrapping it if necessary. private void MoveNext(ref int index) { - // It is tempting to use the remainder operator here but it is actually much slower - // than a simple comparison and a rarely taken branch. + // It is tempting to use the remainder operator here but it is actually much slower + // than a simple comparison and a rarely taken branch. + // JIT produces better code than with ternary operator ?: int tmp = index + 1; - index = (tmp == _array.Length) ? 0 : tmp; + if (tmp == _array.Length) + { + tmp = 0; + } + index = tmp; } private void ThrowForEmptyQueue() diff --git a/external/corefx/src/System.Collections/src/System/Collections/Generic/Stack.cs b/external/corefx/src/System.Collections/src/System/Collections/Generic/Stack.cs index 38c5bbb07b..48b33a18e8 100644 --- a/external/corefx/src/System.Collections/src/System/Collections/Generic/Stack.cs +++ b/external/corefx/src/System.Collections/src/System/Collections/Generic/Stack.cs @@ -204,22 +204,28 @@ namespace System.Collections.Generic // is empty, Peek throws an InvalidOperationException. public T Peek() { - if (_size == 0) + int size = _size - 1; + T[] array = _array; + + if ((uint)size >= (uint)array.Length) { ThrowForEmptyStack(); } - return _array[_size - 1]; + return array[size]; } public bool TryPeek(out T result) { - if (_size == 0) + int size = _size - 1; + T[] array = _array; + + if ((uint)size >= (uint)array.Length) { - result = default(T); + result = default; return false; } - result = _array[_size - 1]; + result = array[size]; return true; } @@ -227,33 +233,44 @@ namespace System.Collections.Generic // throws an InvalidOperationException. public T Pop() { - if (_size == 0) + int size = _size - 1; + T[] array = _array; + + // if (_size == 0) is equivalent to if (size == -1), and this case + // is covered with (uint)size, thus allowing bounds check elimination + // https://github.com/dotnet/coreclr/pull/9773 + if ((uint)size >= (uint)array.Length) { ThrowForEmptyStack(); } _version++; - T item = _array[--_size]; + _size = size; + T item = array[size]; if (RuntimeHelpers.IsReferenceOrContainsReferences()) { - _array[_size] = default(T); // Free memory quicker. + array[size] = default; // Free memory quicker. } return item; } public bool TryPop(out T result) { - if (_size == 0) + int size = _size - 1; + T[] array = _array; + + if ((uint)size >= (uint)array.Length) { - result = default(T); + result = default; return false; } _version++; - result = _array[--_size]; + _size = size; + result = array[size]; if (RuntimeHelpers.IsReferenceOrContainsReferences()) { - _array[_size] = default(T); // Free memory quicker. + array[size] = default; // Free memory quicker. } return true; } @@ -261,12 +278,29 @@ namespace System.Collections.Generic // Pushes an item to the top of the stack. public void Push(T item) { - if (_size == _array.Length) + int size = _size; + T[] array = _array; + + if ((uint)size < (uint)array.Length) { - Array.Resize(ref _array, (_array.Length == 0) ? DefaultCapacity : 2 * _array.Length); + array[size] = item; + _version++; + _size = size + 1; } - _array[_size++] = item; + else + { + PushWithResize(item); + } + } + + // Non-inline from Stack.Push to improve its code quality as uncommon path + [MethodImpl(MethodImplOptions.NoInlining)] + private void PushWithResize(T item) + { + Array.Resize(ref _array, (_array.Length == 0) ? DefaultCapacity : 2 * _array.Length); + _array[_size] = item; _version++; + _size++; } // Copies the Stack to an array, in the same order Pop would return the items. diff --git a/external/corefx/src/System.Collections/tests/Generic/Dictionary/Dictionary.Generic.Tests.cs b/external/corefx/src/System.Collections/tests/Generic/Dictionary/Dictionary.Generic.Tests.cs index 3298856b6c..eb8e70f83d 100644 --- a/external/corefx/src/System.Collections/tests/Generic/Dictionary/Dictionary.Generic.Tests.cs +++ b/external/corefx/src/System.Collections/tests/Generic/Dictionary/Dictionary.Generic.Tests.cs @@ -43,8 +43,7 @@ namespace System.Collections.Tests IDictionary source = GenericIDictionaryFactory(count); Dictionary copied = new Dictionary(source, comparer); Assert.Equal(source, copied); - if (typeof(TKey) != typeof(string) || comparer != EqualityComparer.Default) // Dictionary special-cases the default comparer when TKEy=string - Assert.Equal(comparer, copied.Comparer); + Assert.Equal(comparer, copied.Comparer); } [Theory] @@ -55,8 +54,7 @@ namespace System.Collections.Tests IDictionary source = GenericIDictionaryFactory(count); Dictionary copied = new Dictionary(source, comparer); Assert.Equal(source, copied); - if (typeof(TKey) != typeof(string) || comparer != EqualityComparer.Default) // Dictionary special-cases the default comparer when TKEy=string - Assert.Equal(comparer, copied.Comparer); + Assert.Equal(comparer, copied.Comparer); } [Theory] @@ -74,9 +72,7 @@ namespace System.Collections.Tests IEqualityComparer comparer = GetKeyIEqualityComparer(); Dictionary dictionary = new Dictionary(count, comparer); Assert.Equal(0, dictionary.Count); - // Dictionary with TKey string when - if (typeof(TKey) != typeof(string) || comparer != EqualityComparer.Default) // Dictionary special-cases the default comparer when TKEy=string - Assert.Equal(comparer, dictionary.Comparer); + Assert.Equal(comparer, dictionary.Comparer); } #endregion diff --git a/external/corefx/src/System.Collections/tests/Generic/Dictionary/Dictionary.Generic.Tests.netcoreapp.cs b/external/corefx/src/System.Collections/tests/Generic/Dictionary/Dictionary.Generic.Tests.netcoreapp.cs index 991dc5b8ae..9a3b698228 100644 --- a/external/corefx/src/System.Collections/tests/Generic/Dictionary/Dictionary.Generic.Tests.netcoreapp.cs +++ b/external/corefx/src/System.Collections/tests/Generic/Dictionary/Dictionary.Generic.Tests.netcoreapp.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; +using Common.System; using Xunit; namespace System.Collections.Tests @@ -84,5 +85,338 @@ namespace System.Collections.Tests } #endregion + + #region EnsureCapacity + + [Theory] + [MemberData(nameof(ValidCollectionSizes))] + public void EnsureCapacity_Generic_RequestingLargerCapacity_DoesNotInvalidateEnumeration(int count) + { + var dictionary = (Dictionary)(GenericIDictionaryFactory(count)); + var capacity = dictionary.EnsureCapacity(0); + IEnumerator keysEnum = dictionary.Keys.GetEnumerator(); + IEnumerator valuesEnum = dictionary.Values.GetEnumerator(); + IEnumerator keysListEnum = new List(dictionary.Keys).GetEnumerator(); + IEnumerator valuesListEnum = new List(dictionary.Values).GetEnumerator(); + + dictionary.EnsureCapacity(capacity + 1); // Verify EnsureCapacity does not invalidate enumeration + + while(keysEnum.MoveNext()) + { + valuesEnum.MoveNext(); + keysListEnum.MoveNext(); + valuesListEnum.MoveNext(); + Assert.Equal(keysListEnum.Current, keysEnum.Current); + Assert.Equal(valuesListEnum.Current, valuesEnum.Current); + } + } + + [Fact] + public void EnsureCapacity_Generic_NegativeCapacityRequested_Throws() + { + var dictionary = new Dictionary(); + AssertExtensions.Throws("capacity", () => dictionary.EnsureCapacity(-1)); + } + + [Fact] + public void EnsureCapacity_Generic_DictionaryNotInitialized_RequestedZero_ReturnsZero() + { + var dictionary = new Dictionary(); + Assert.Equal(0, dictionary.EnsureCapacity(0)); + } + + [Theory] + [InlineData(1)] + [InlineData(2)] + [InlineData(3)] + [InlineData(4)] + public void EnsureCapacity_Generic_DictionaryNotInitialized_RequestedNonZero_CapacityIsSetToAtLeastTheRequested(int requestedCapacity) + { + var dictionary = new Dictionary(); + Assert.InRange(dictionary.EnsureCapacity(requestedCapacity), requestedCapacity, int.MaxValue); + } + + [Theory] + [InlineData(3)] + [InlineData(7)] + public void EnsureCapacity_Generic_RequestedCapacitySmallerThanCurrent_CapacityUnchanged(int currentCapacity) + { + Dictionary dictionary; + + // assert capacity remains the same when ensuring a capacity smaller or equal than existing + for (int i = 0; i <= currentCapacity; i++) + { + dictionary = new Dictionary(currentCapacity); + Assert.Equal(currentCapacity, dictionary.EnsureCapacity(i)); + } + } + + [Theory] + [InlineData(7)] + public void EnsureCapacity_Generic_ExistingCapacityRequested_SameValueReturned(int capacity) + { + var dictionary = new Dictionary(capacity); + Assert.Equal(capacity, dictionary.EnsureCapacity(capacity)); + + dictionary = (Dictionary)GenericIDictionaryFactory(capacity); + Assert.Equal(capacity, dictionary.EnsureCapacity(capacity)); + } + + [Theory] + [InlineData(0)] + [InlineData(1)] + [InlineData(2)] + [InlineData(3)] + [InlineData(4)] + public void EnsureCapacity_Generic_EnsureCapacityCalledTwice_ReturnsSameValue(int count) + { + var dictionary = (Dictionary)GenericIDictionaryFactory(count); + int capacity = dictionary.EnsureCapacity(0); + Assert.Equal(capacity, dictionary.EnsureCapacity(0)); + + dictionary = (Dictionary)GenericIDictionaryFactory(count); + capacity = dictionary.EnsureCapacity(count); + Assert.Equal(capacity, dictionary.EnsureCapacity(count)); + + dictionary = (Dictionary)GenericIDictionaryFactory(count); + capacity = dictionary.EnsureCapacity(count + 1); + Assert.Equal(capacity, dictionary.EnsureCapacity(count + 1)); + } + + [Theory] + [InlineData(1)] + [InlineData(5)] + [InlineData(7)] + public void EnsureCapacity_Generic_DictionaryNotEmpty_RequestedSmallerThanCount_ReturnsAtLeastSizeOfCount(int count) + { + var dictionary = (Dictionary)GenericIDictionaryFactory(count); + Assert.InRange(dictionary.EnsureCapacity(count - 1), count, int.MaxValue); + } + + [Theory] + [InlineData(7)] + [InlineData(20)] + public void EnsureCapacity_Generic_DictionaryNotEmpty_SetsToAtLeastTheRequested(int count) + { + var dictionary = (Dictionary)GenericIDictionaryFactory(count); + + // get current capacity + int currentCapacity = dictionary.EnsureCapacity(0); + + // assert we can update to a larger capacity + int newCapacity = dictionary.EnsureCapacity(currentCapacity * 2); + Assert.InRange(newCapacity, currentCapacity * 2, int.MaxValue); + } + + [Fact] + public void EnsureCapacity_Generic_CapacityIsSetToPrimeNumberLargerOrEqualToRequested() + { + var dictionary = new Dictionary(); + Assert.Equal(17, dictionary.EnsureCapacity(17)); + + dictionary = new Dictionary(); + Assert.Equal(17, dictionary.EnsureCapacity(15)); + + dictionary = new Dictionary(); + Assert.Equal(17, dictionary.EnsureCapacity(13)); + } + + #endregion + + #region TrimExcess + + [Fact] + public void TrimExcess_Generic_NegativeCapacity_Throw() + { + var dictionary = new Dictionary(); + AssertExtensions.Throws("capacity", () => dictionary.TrimExcess(-1)); + } + + [Theory] + [InlineData(20)] + [InlineData(23)] + public void TrimExcess_Generic_CapacitySmallerThanCount_Throws(int suggestedCapacity) + { + var dictionary = new Dictionary(); + dictionary.Add(GetNewKey(dictionary), CreateTValue(0)); + AssertExtensions.Throws("capacity", () => dictionary.TrimExcess(0)); + + dictionary = new Dictionary(suggestedCapacity); + dictionary.Add(GetNewKey(dictionary), CreateTValue(0)); + AssertExtensions.Throws("capacity", () => dictionary.TrimExcess(0)); + } + + [Fact] + public void TrimExcess_Generic_LargeInitialCapacity_TrimReducesSize() + { + var dictionary = new Dictionary(20); + dictionary.TrimExcess(7); + Assert.Equal(7, dictionary.EnsureCapacity(0)); + } + + [Theory] + [InlineData(20)] + [InlineData(23)] + public void TrimExcess_Generic_TrimToLargerThanExistingCapacity_DoesNothing(int suggestedCapacity) + { + var dictionary = new Dictionary(); + int capacity = dictionary.EnsureCapacity(0); + dictionary.TrimExcess(suggestedCapacity); + Assert.Equal(capacity, dictionary.EnsureCapacity(0)); + + dictionary = new Dictionary(suggestedCapacity/2); + capacity = dictionary.EnsureCapacity(0); + dictionary.TrimExcess(suggestedCapacity); + Assert.Equal(capacity, dictionary.EnsureCapacity(0)); + } + + [Fact] + public void TrimExcess_Generic_DictionaryNotInitialized_CapacityRemainsAsMinPossible() + { + var dictionary = new Dictionary(); + Assert.Equal(0, dictionary.EnsureCapacity(0)); + dictionary.TrimExcess(); + Assert.Equal(0, dictionary.EnsureCapacity(0)); + } + + [Theory] + [InlineData(1)] + [InlineData(85)] + [InlineData(89)] + public void TrimExcess_Generic_ClearThenTrimNonEmptyDictionary_SetsCapacityTo3(int count) + { + Dictionary dictionary = (Dictionary)GenericIDictionaryFactory(count); + Assert.Equal(count, dictionary.Count); + // The smallest possible capacity size after clearing a dictionary is 3 + dictionary.Clear(); + dictionary.TrimExcess(); + Assert.Equal(3, dictionary.EnsureCapacity(0)); + } + + [Theory] + [InlineData(85)] + [InlineData(89)] + public void TrimExcess_NoArguments_TrimsToAtLeastCount(int count) + { + var dictionary = new Dictionary(20); + for (int i = 0; i < count; i++) + { + dictionary.Add(i, 0); + } + dictionary.TrimExcess(); + Assert.InRange(dictionary.EnsureCapacity(0), count, int.MaxValue); + } + + [Theory] + [InlineData(85)] + [InlineData(89)] + public void TrimExcess_WithArguments_OnDictionaryWithManyElementsRemoved_TrimsToAtLeastRequested(int finalCount) + { + const int InitToFinalRatio = 10; + int initialCount = InitToFinalRatio * finalCount; + var dictionary = new Dictionary(initialCount); + Assert.InRange(dictionary.EnsureCapacity(0), initialCount, int.MaxValue); + for (int i = 0; i < initialCount; i++) + { + dictionary.Add(i, 0); + } + for (int i = 0; i < initialCount - finalCount; i++) + { + dictionary.Remove(i); + } + for (int i = InitToFinalRatio; i > 0; i--) + { + dictionary.TrimExcess(i * finalCount); + Assert.InRange(dictionary.EnsureCapacity(0), i * finalCount, int.MaxValue); + } + } + + [Theory] + [InlineData(1000, 900, 5000, 85, 89)] + [InlineData(1000, 400, 5000, 85, 89)] + [InlineData(1000, 900, 500, 85, 89)] + [InlineData(1000, 400, 500, 85, 89)] + [InlineData(1000, 400, 500, 1, 3)] + public void TrimExcess_NoArgument_TrimAfterEachBulkAddOrRemove_TrimsToAtLeastCount(int initialCount, int numRemove, int numAdd, int newCount, int newCapacity) + { + Random random = new Random(32); + var dictionary = new Dictionary(); + dictionary.TrimExcess(); + Assert.InRange(dictionary.EnsureCapacity(0), dictionary.Count, int.MaxValue); + + var initialKeys = new int[initialCount]; + for (int i = 0; i < initialCount; i++) + { + initialKeys[i] = i; + } + random.Shuffle(initialKeys); + foreach (var key in initialKeys) + { + dictionary.Add(key, 0); + } + dictionary.TrimExcess(); + Assert.InRange(dictionary.EnsureCapacity(0), dictionary.Count, int.MaxValue); + + random.Shuffle(initialKeys); + for (int i = 0; i < numRemove; i++) + { + dictionary.Remove(initialKeys[i]); + } + dictionary.TrimExcess(); + Assert.InRange(dictionary.EnsureCapacity(0), dictionary.Count, int.MaxValue); + + var moreKeys = new int[numAdd]; + for (int i = 0; i < numAdd; i++) + { + moreKeys[i] = i + initialCount; + } + random.Shuffle(moreKeys); + foreach (var key in moreKeys) + { + dictionary.Add(key, 0); + } + int currentCount = dictionary.Count; + dictionary.TrimExcess(); + Assert.InRange(dictionary.EnsureCapacity(0), currentCount, int.MaxValue); + + int[] existingKeys = new int[currentCount]; + Array.Copy(initialKeys, numRemove, existingKeys, 0, initialCount - numRemove); + Array.Copy(moreKeys, 0, existingKeys, initialCount - numRemove, numAdd); + random.Shuffle(existingKeys); + for (int i = 0; i < currentCount - newCount; i++) + { + dictionary.Remove(existingKeys[i]); + } + dictionary.TrimExcess(); + int finalCapacity = dictionary.EnsureCapacity(0); + Assert.InRange(finalCapacity, newCount, initialCount); + Assert.Equal(newCapacity, finalCapacity); + } + + [Fact] + public void TrimExcess_DictionaryHasElementsChainedWithSameHashcode_Success() + { + var dictionary = new Dictionary(7); + for (int i = 0; i < 4; i++) + { + dictionary.Add(i.ToString(), 0); + } + var s_64bit = new string[] { "95e85f8e-67a3-4367-974f-dd24d8bb2ca2", "eb3d6fe9-de64-43a9-8f58-bddea727b1ca" }; + var s_32bit = new string[] { "25b1f130-7517-48e3-96b0-9da44e8bfe0e", "ba5a3625-bc38-4bf1-a707-a3cfe2158bae" }; + string[] chained = (Environment.Is64BitProcess ? s_64bit : s_32bit).ToArray(); + dictionary.Add(chained[0], 0); + dictionary.Add(chained[1], 0); + for (int i = 0; i < 4; i++) + { + dictionary.Remove(i.ToString()); + } + dictionary.TrimExcess(3); + Assert.Equal(2, dictionary.Count); + int val; + Assert.True(dictionary.TryGetValue(chained[0], out val)); + Assert.True(dictionary.TryGetValue(chained[1], out val)); + } + + #endregion } } diff --git a/external/corefx/src/System.Collections/tests/Generic/Dictionary/Dictionary.Tests.cs b/external/corefx/src/System.Collections/tests/Generic/Dictionary/Dictionary.Tests.cs index 9f954f6152..9a94334592 100644 --- a/external/corefx/src/System.Collections/tests/Generic/Dictionary/Dictionary.Tests.cs +++ b/external/corefx/src/System.Collections/tests/Generic/Dictionary/Dictionary.Tests.cs @@ -164,6 +164,88 @@ namespace System.Collections.Tests AssertExtensions.Throws("capacity", () => new Dictionary(new NegativeCountDictionary(), EqualityComparer.Default)); } + [Theory] + [InlineData(0)] + [InlineData(1)] + [InlineData(101)] + public void ICollection_NonGeneric_CopyTo_NonContiguousDictionary(int count) + { + ICollection collection = (ICollection)CreateDictionary(count, k => k.ToString()); + KeyValuePair[] array = new KeyValuePair[count]; + collection.CopyTo(array, 0); + int i = 0; + foreach (object obj in collection) + Assert.Equal(array[i++], obj); + } + + [Theory] + [InlineData(0)] + [InlineData(1)] + [InlineData(101)] + public void ICollection_Generic_CopyTo_NonContiguousDictionary(int count) + { + ICollection> collection = CreateDictionary(count, k => k.ToString()); + KeyValuePair[] array = new KeyValuePair[count]; + collection.CopyTo(array, 0); + int i = 0; + foreach (KeyValuePair obj in collection) + Assert.Equal(array[i++], obj); + } + + [Theory] + [InlineData(0)] + [InlineData(1)] + [InlineData(101)] + public void IDictionary_Generic_CopyTo_NonContiguousDictionary(int count) + { + IDictionary collection = CreateDictionary(count, k => k.ToString()); + KeyValuePair[] array = new KeyValuePair[count]; + collection.CopyTo(array, 0); + int i = 0; + foreach (KeyValuePair obj in collection) + Assert.Equal(array[i++], obj); + } + + [Theory] + [InlineData(0)] + [InlineData(1)] + [InlineData(101)] + public void CopyTo_NonContiguousDictionary(int count) + { + Dictionary collection = (Dictionary)CreateDictionary(count, k => k.ToString()); + string[] array = new string[count]; + collection.Keys.CopyTo(array, 0); + int i = 0; + foreach (KeyValuePair obj in collection) + Assert.Equal(array[i++], obj.Key); + + collection.Values.CopyTo(array, 0); + i = 0; + foreach (KeyValuePair obj in collection) + Assert.Equal(array[i++], obj.Key); + } + + [Fact] + public void Remove_NonExistentEntries_DoesNotPreventEnumeration() + { + const string SubKey = "-sub-key"; + var dictionary = new Dictionary(); + dictionary.Add("a", "b"); + dictionary.Add("c", "d"); + foreach (string key in dictionary.Keys) + { + if (dictionary.Remove(key + SubKey)) + break; + } + + dictionary.Add("c" + SubKey, "d"); + foreach (string key in dictionary.Keys) + { + if (dictionary.Remove(key + SubKey)) + break; + } + } + [Theory] [MemberData(nameof(CopyConstructorInt32Data))] public void CopyConstructorInt32(int size, Func keyValueSelector, Func, IDictionary> dictionarySelector) @@ -287,7 +369,10 @@ namespace System.Collections.Tests private static IDictionary CreateDictionary(int size, Func keyValueSelector, IEqualityComparer comparer = null) { - return Enumerable.Range(1, size).ToDictionary(keyValueSelector, keyValueSelector, comparer); + Dictionary dict = Enumerable.Range(0, size + 1).ToDictionary(keyValueSelector, keyValueSelector, comparer); + // Remove first item to reduce Count to size and alter the contiguity of the dictionary + dict.Remove(keyValueSelector(0)); + return dict; } private sealed class DictionarySubclass : Dictionary diff --git a/external/corefx/src/System.Collections/tests/Generic/HashSet/HashSet.Generic.Tests.netcoreapp.cs b/external/corefx/src/System.Collections/tests/Generic/HashSet/HashSet.Generic.Tests.netcoreapp.cs index 6d254360c1..2f9226db0b 100644 --- a/external/corefx/src/System.Collections/tests/Generic/HashSet/HashSet.Generic.Tests.netcoreapp.cs +++ b/external/corefx/src/System.Collections/tests/Generic/HashSet/HashSet.Generic.Tests.netcoreapp.cs @@ -30,6 +30,18 @@ namespace System.Collections.Tests Assert.Equal(capacity + 1, set.Count); } + [Fact] + public void HashSet_Generic_Constructor_Capacity_ToNextPrimeNumber() + { + // Highest pre-computed number + 1. + const int Capacity = 7199370; + var set = new HashSet(Capacity); + + // Assert that the HashTable's capacity is set to the descendant prime number of the given one. + const int NextPrime = 7199371; + Assert.Equal(NextPrime, set.EnsureCapacity(0)); + } + [Fact] public void HashSet_Generic_Constructor_int_Negative_ThrowsArgumentOutOfRangeException() { @@ -127,5 +139,139 @@ namespace System.Collections.Tests } #endregion + + #region EnsureCapacity + + [Theory] + [MemberData(nameof(ValidCollectionSizes))] + public void EnsureCapacity_Generic_RequestingLargerCapacity_DoesNotInvalidateEnumeration(int setLength) + { + HashSet set = (HashSet)(GenericISetFactory(setLength)); + var capacity = set.EnsureCapacity(0); + IEnumerator valuesEnum = set.GetEnumerator(); + IEnumerator valuesListEnum = new List(set).GetEnumerator(); + + set.EnsureCapacity(capacity + 1); // Verify EnsureCapacity does not invalidate enumeration + + while (valuesEnum.MoveNext()) + { + valuesListEnum.MoveNext(); + Assert.Equal(valuesListEnum.Current, valuesEnum.Current); + } + } + + [Fact] + public void EnsureCapacity_Generic_NegativeCapacityRequested_Throws() + { + var set = new HashSet(); + AssertExtensions.Throws("capacity", () => set.EnsureCapacity(-1)); + } + + [Fact] + public void EnsureCapacity_Generic_HashsetNotInitialized_RequestedZero_ReturnsZero() + { + var set = new HashSet(); + Assert.Equal(0, set.EnsureCapacity(0)); + } + + [Theory] + [InlineData(1)] + [InlineData(2)] + [InlineData(3)] + [InlineData(4)] + public void EnsureCapacity_Generic_HashsetNotInitialized_RequestedNonZero_CapacityIsSetToAtLeastTheRequested(int requestedCapacity) + { + var set = new HashSet(); + Assert.InRange(set.EnsureCapacity(requestedCapacity), requestedCapacity, int.MaxValue); + } + + [Theory] + [InlineData(3)] + [InlineData(7)] + public void EnsureCapacity_Generic_RequestedCapacitySmallerThanCurrent_CapacityUnchanged(int currentCapacity) + { + HashSet set; + + // assert capacity remains the same when ensuring a capacity smaller or equal than existing + for (int i = 0; i <= currentCapacity; i++) + { + set = new HashSet(currentCapacity); + Assert.Equal(currentCapacity, set.EnsureCapacity(i)); + } + } + + [Theory] + [InlineData(7)] + [InlineData(89)] + public void EnsureCapacity_Generic_ExistingCapacityRequested_SameValueReturned(int capacity) + { + var set = new HashSet(capacity); + Assert.Equal(capacity, set.EnsureCapacity(capacity)); + + set = (HashSet)GenericISetFactory(capacity); + Assert.Equal(capacity, set.EnsureCapacity(capacity)); + } + + [Theory] + [InlineData(0)] + [InlineData(1)] + [InlineData(2)] + [InlineData(3)] + [InlineData(4)] + public void EnsureCapacity_Generic_EnsureCapacityCalledTwice_ReturnsSameValue(int setLength) + { + HashSet set = (HashSet)GenericISetFactory(setLength); + int capacity = set.EnsureCapacity(0); + Assert.Equal(capacity, set.EnsureCapacity(0)); + + set = (HashSet)GenericISetFactory(setLength); + capacity = set.EnsureCapacity(setLength); + Assert.Equal(capacity, set.EnsureCapacity(setLength)); + + set = (HashSet)GenericISetFactory(setLength); + capacity = set.EnsureCapacity(setLength + 1); + Assert.Equal(capacity, set.EnsureCapacity(setLength + 1)); + } + + [Theory] + [InlineData(1)] + [InlineData(5)] + [InlineData(7)] + [InlineData(8)] + public void EnsureCapacity_Generic_HashsetNotEmpty_RequestedSmallerThanCount_ReturnsAtLeastSizeOfCount(int setLength) + { + HashSet set = (HashSet)GenericISetFactory(setLength); + Assert.InRange(set.EnsureCapacity(setLength - 1), setLength, int.MaxValue); + } + + [Theory] + [InlineData(7)] + [InlineData(20)] + public void EnsureCapacity_Generic_HashsetNotEmpty_SetsToAtLeastTheRequested(int setLength) + { + HashSet set = (HashSet)GenericISetFactory(setLength); + + // get current capacity + int currentCapacity = set.EnsureCapacity(0); + + // assert we can update to a larger capacity + int newCapacity = set.EnsureCapacity(currentCapacity * 2); + Assert.InRange(newCapacity, currentCapacity * 2, int.MaxValue); + } + + [Fact] + public void EnsureCapacity_Generic_CapacityIsSetToPrimeNumberLargerOrEqualToRequested() + { + var set = new HashSet(); + Assert.Equal(17, set.EnsureCapacity(17)); + + set = new HashSet(); + Assert.Equal(17, set.EnsureCapacity(15)); + + set = new HashSet(); + Assert.Equal(17, set.EnsureCapacity(13)); + } + + #endregion } } diff --git a/external/corefx/src/System.Collections/tests/Generic/List/List.Generic.Tests.Misc.cs b/external/corefx/src/System.Collections/tests/Generic/List/List.Generic.Tests.Misc.cs index 1b183d0583..cc18704768 100644 --- a/external/corefx/src/System.Collections/tests/Generic/List/List.Generic.Tests.Misc.cs +++ b/external/corefx/src/System.Collections/tests/Generic/List/List.Generic.Tests.Misc.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; +using System.Linq; using Xunit; namespace System.Collections.Tests @@ -14,6 +15,18 @@ namespace System.Collections.Tests { internal class Driver { + public Func>[] CollectionGenerators { get; } + + public Driver() + { + CollectionGenerators = new Func>[] + { + ConstructTestList, + ConstructTestEnumerable, + ConstructLazyTestEnumerable, + }; + } + #region Insert public void BasicInsert(T[] items, T item, int index, int repeat) @@ -103,7 +116,7 @@ namespace System.Collections.Tests #region InsertRange - public void InsertRangeICollection(T[] itemsX, T[] itemsY, int index, int repeat, Func> constructIEnumerable) + public void InsertRangeIEnumerable(T[] itemsX, T[] itemsY, int index, int repeat, Func> constructIEnumerable) { List list = new List(constructIEnumerable(itemsX)); @@ -159,37 +172,6 @@ namespace System.Collections.Tests } } - public void InsertRangeList(T[] itemsX, T[] itemsY, int index, int repeat, Func> constructIEnumerable) - { - List list = new List(constructIEnumerable(itemsX)); - - for (int i = 0; i < repeat; i++) - { - list.InsertRange(index, new List(constructIEnumerable(itemsY))); - } - - foreach (T item in itemsY) - { - Assert.True(list.Contains(item)); //"Should contain the item." - } - Assert.Equal(list.Count, itemsX.Length + (itemsY.Length * repeat)); //"Should have the same result." - - for (int i = 0; i < index; i++) - { - Assert.Equal(list[i], itemsX[i]); //"Should have the same result." - } - - for (int i = index; i < index + (itemsY.Length * repeat); i++) - { - Assert.Equal(list[i], itemsY[(i - index) % itemsY.Length]); //"Should have the same result." - } - - for (int i = index + (itemsY.Length * repeat); i < list.Count; i++) - { - Assert.Equal(list[i], itemsX[i - (itemsY.Length * repeat)]); //"Should have the same result." - } - } - public void InsertRangeValidations(T[] items, Func> constructIEnumerable) { List list = new List(constructIEnumerable(items)); @@ -202,11 +184,22 @@ namespace System.Collections.Tests Assert.Throws(() => list.InsertRange(0, null)); //"ArgumentNullException expected." } - public IEnumerable ConstructTestCollection(T[] items) + public IEnumerable ConstructTestEnumerable(T[] items) { return items; } + public IEnumerable ConstructLazyTestEnumerable(T[] items) + { + return ConstructTestEnumerable(items) + .Select(item => item); + } + + public IEnumerable ConstructTestList(T[] items) + { + return items.ToList(); + } + #endregion #region GetRange @@ -795,13 +788,15 @@ namespace System.Collections.Tests intArr2[i] = i + 100; } - IntDriver.InsertRangeICollection(new int[0], intArr1, 0, 1, IntDriver.ConstructTestCollection); - IntDriver.InsertRangeICollection(intArr1, intArr2, 0, 1, IntDriver.ConstructTestCollection); - IntDriver.InsertRangeICollection(intArr1, intArr2, 1, 1, IntDriver.ConstructTestCollection); - IntDriver.InsertRangeICollection(intArr1, intArr2, 99, 1, IntDriver.ConstructTestCollection); - IntDriver.InsertRangeICollection(intArr1, intArr2, 100, 1, IntDriver.ConstructTestCollection); - IntDriver.InsertRangeICollection(intArr1, intArr2, 50, 50, IntDriver.ConstructTestCollection); - IntDriver.InsertRangeList(intArr1, intArr2, 0, 1, IntDriver.ConstructTestCollection); + foreach (Func> collectionGenerator in IntDriver.CollectionGenerators) + { + IntDriver.InsertRangeIEnumerable(new int[0], intArr1, 0, 1, collectionGenerator); + IntDriver.InsertRangeIEnumerable(intArr1, intArr2, 0, 1, collectionGenerator); + IntDriver.InsertRangeIEnumerable(intArr1, intArr2, 1, 1, collectionGenerator); + IntDriver.InsertRangeIEnumerable(intArr1, intArr2, 99, 1, collectionGenerator); + IntDriver.InsertRangeIEnumerable(intArr1, intArr2, 100, 1, collectionGenerator); + IntDriver.InsertRangeIEnumerable(intArr1, intArr2, 50, 50, collectionGenerator); + } Driver StringDriver = new Driver(); string[] stringArr1 = new string[100]; @@ -811,17 +806,19 @@ namespace System.Collections.Tests for (int i = 0; i < 10; i++) stringArr2[i] = "SomeTestString" + (i + 100).ToString(); - StringDriver.InsertRangeICollection(new string[0], stringArr1, 0, 1, StringDriver.ConstructTestCollection); - StringDriver.InsertRangeICollection(stringArr1, stringArr2, 0, 1, StringDriver.ConstructTestCollection); - StringDriver.InsertRangeICollection(stringArr1, stringArr2, 1, 1, StringDriver.ConstructTestCollection); - StringDriver.InsertRangeICollection(stringArr1, stringArr2, 99, 1, StringDriver.ConstructTestCollection); - StringDriver.InsertRangeICollection(stringArr1, stringArr2, 100, 1, StringDriver.ConstructTestCollection); - StringDriver.InsertRangeICollection(stringArr1, stringArr2, 50, 50, StringDriver.ConstructTestCollection); - StringDriver.InsertRangeICollection(new string[] { null, null, null, null }, stringArr2, 0, 1, StringDriver.ConstructTestCollection); - StringDriver.InsertRangeICollection(new string[] { null, null, null, null }, stringArr2, 4, 1, StringDriver.ConstructTestCollection); - StringDriver.InsertRangeICollection(new string[] { null, null, null, null }, new string[] { null, null, null, null }, 0, 1, StringDriver.ConstructTestCollection); - StringDriver.InsertRangeICollection(new string[] { null, null, null, null }, new string[] { null, null, null, null }, 4, 50, StringDriver.ConstructTestCollection); - StringDriver.InsertRangeList(stringArr1, stringArr2, 0, 1, StringDriver.ConstructTestCollection); + foreach (Func> collectionGenerator in StringDriver.CollectionGenerators) + { + StringDriver.InsertRangeIEnumerable(new string[0], stringArr1, 0, 1, collectionGenerator); + StringDriver.InsertRangeIEnumerable(stringArr1, stringArr2, 0, 1, collectionGenerator); + StringDriver.InsertRangeIEnumerable(stringArr1, stringArr2, 1, 1, collectionGenerator); + StringDriver.InsertRangeIEnumerable(stringArr1, stringArr2, 99, 1, collectionGenerator); + StringDriver.InsertRangeIEnumerable(stringArr1, stringArr2, 100, 1, collectionGenerator); + StringDriver.InsertRangeIEnumerable(stringArr1, stringArr2, 50, 50, collectionGenerator); + StringDriver.InsertRangeIEnumerable(new string[] { null, null, null, null }, stringArr2, 0, 1, collectionGenerator); + StringDriver.InsertRangeIEnumerable(new string[] { null, null, null, null }, stringArr2, 4, 1, collectionGenerator); + StringDriver.InsertRangeIEnumerable(new string[] { null, null, null, null }, new string[] { null, null, null, null }, 0, 1, collectionGenerator); + StringDriver.InsertRangeIEnumerable(new string[] { null, null, null, null }, new string[] { null, null, null, null }, 4, 50, collectionGenerator); + } } [Fact] @@ -836,8 +833,8 @@ namespace System.Collections.Tests for (int i = 0; i < 100; i++) stringArr1[i] = "SomeTestString" + i.ToString(); - IntDriver.InsertRangeValidations(intArr1, IntDriver.ConstructTestCollection); - StringDriver.InsertRangeValidations(stringArr1, StringDriver.ConstructTestCollection); + IntDriver.InsertRangeValidations(intArr1, IntDriver.ConstructTestEnumerable); + StringDriver.InsertRangeValidations(stringArr1, StringDriver.ConstructTestEnumerable); } [Fact] diff --git a/external/corefx/src/System.Collections/tests/System.Collections.Tests.csproj b/external/corefx/src/System.Collections/tests/System.Collections.Tests.csproj index 6ad8dfb2db..40039d447f 100644 --- a/external/corefx/src/System.Collections/tests/System.Collections.Tests.csproj +++ b/external/corefx/src/System.Collections/tests/System.Collections.Tests.csproj @@ -67,11 +67,14 @@ Common\System\ObjectCloner.cs + + Common\System\RandomExtensions.cs + Common\System\Collections\DictionaryExtensions.cs - System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs + Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs @@ -163,4 +166,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj b/external/corefx/src/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj index 6a31e5cf40..b2cddb4f68 100644 --- a/external/corefx/src/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj +++ b/external/corefx/src/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj @@ -16,7 +16,7 @@ System.ComponentModel.DataAnnotations - + diff --git a/external/corefx/src/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.cs b/external/corefx/src/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.cs index a6ef6b4734..52a440c34a 100644 --- a/external/corefx/src/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.cs +++ b/external/corefx/src/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.cs @@ -204,9 +204,11 @@ namespace System.ComponentModel.DataAnnotations public RangeAttribute(double minimum, double maximum) { } public RangeAttribute(int minimum, int maximum) { } public RangeAttribute(System.Type type, string minimum, string maximum) { } + public bool ConvertValueInInvariantCulture { get { throw null; } set { } } public object Maximum { get { throw null; } } public object Minimum { get { throw null; } } public System.Type OperandType { get { throw null; } } + public bool ParseLimitsInInvariantCulture { get { throw null; } set { } } public override string FormatErrorMessage(string name) { throw null; } public override bool IsValid(object value) { throw null; } } diff --git a/external/corefx/src/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/RangeAttribute.cs b/external/corefx/src/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/RangeAttribute.cs index 4e210c4e37..bc74c78baf 100644 --- a/external/corefx/src/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/RangeAttribute.cs +++ b/external/corefx/src/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/RangeAttribute.cs @@ -70,6 +70,21 @@ namespace System.ComponentModel.DataAnnotations /// public Type OperandType { get; } + /// + /// Determines whether string values for and are parsed in the invariant + /// culture rather than the current culture in effect at the time of the validation. + /// + public bool ParseLimitsInInvariantCulture { get; set; } + + /// + /// Determines whether any conversions necessary from the value being validated to as set + /// by the type parameter of the constructor are carried + /// out in the invariant culture rather than the current culture in effect at the time of the validation. + /// + /// This property has no effects with the constructors with or + /// parameters, for which the invariant culture is always used for any conversions of the validated value. + public bool ConvertValueInInvariantCulture { get; set; } + private Func Conversion { get; set; } private void Initialize(IComparable minimum, IComparable maximum, Func conversion) @@ -192,10 +207,25 @@ namespace System.ComponentModel.DataAnnotations } TypeConverter converter = TypeDescriptor.GetConverter(type); - IComparable min = (IComparable)converter.ConvertFromString((string)minimum); - IComparable max = (IComparable)converter.ConvertFromString((string)maximum); + IComparable min = (IComparable)(ParseLimitsInInvariantCulture + ? converter.ConvertFromInvariantString((string)minimum) + : converter.ConvertFromString((string)minimum)); + IComparable max = (IComparable)(ParseLimitsInInvariantCulture + ? converter.ConvertFromInvariantString((string)maximum) + : converter.ConvertFromString((string)maximum)); + + Func conversion; + if (ConvertValueInInvariantCulture) + { + conversion = value => value?.GetType() == type + ? value + : converter.ConvertFrom(null, CultureInfo.InvariantCulture, value); + } + else + { + conversion = value => value?.GetType() == type ? value : converter.ConvertFrom(value); + } - Func conversion = value => (value != null && value.GetType() == type) ? value : converter.ConvertFrom(value); Initialize(min, max, conversion); } } diff --git a/external/corefx/src/System.ComponentModel.Annotations/tests/RangeAttributeTests.cs b/external/corefx/src/System.ComponentModel.Annotations/tests/RangeAttributeTests.cs index 0a524a49c0..01e263d3ae 100644 --- a/external/corefx/src/System.ComponentModel.Annotations/tests/RangeAttributeTests.cs +++ b/external/corefx/src/System.ComponentModel.Annotations/tests/RangeAttributeTests.cs @@ -3,6 +3,8 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; +using System.Globalization; +using System.Threading; using Xunit; namespace System.ComponentModel.DataAnnotations.Tests @@ -85,6 +87,667 @@ namespace System.ComponentModel.DataAnnotations.Tests yield return new TestCase(stringDoubleRange, new IConvertibleImplementor() { DoubleThrow = new NotSupportedException() }); } + public static IEnumerable DotDecimalRanges() + { + yield return new object[] {typeof(decimal), "1.0", "3.0"}; + yield return new object[] {typeof(double), "1.0", "3.0"}; + } + + public static IEnumerable CommaDecimalRanges() + { + yield return new object[] { typeof(decimal), "1,0", "3,0" }; + yield return new object[] { typeof(double), "1,0", "3,0" }; + } + + public static IEnumerable DotDecimalValidValues() + { + yield return new object[] { typeof(decimal), "1.0", "3.0", "1.0" }; + yield return new object[] { typeof(decimal), "1.0", "3.0", "3.0" }; + yield return new object[] { typeof(decimal), "1.0", "3.0", "2.9999999999999999999999999999999999999999999" }; + yield return new object[] { typeof(decimal), "1.0", "3.0", "2.9999999999999999999999999999" }; + yield return new object[] { typeof(double), "1.0", "3.0", "1.0" }; + yield return new object[] { typeof(double), "1.0", "3.0", "3.0" }; + yield return new object[] { typeof(double), "1.0", "3.0", "2.9999999999999999999999999999999999999999999" }; + yield return new object[] { typeof(double), "1.0", "3.0", "2.99999999999999" }; + } + + public static IEnumerable CommaDecimalValidValues() + { + yield return new object[] { typeof(decimal), "1,0", "3,0", "1,0" }; + yield return new object[] { typeof(decimal), "1,0", "3,0", "3,0" }; + yield return new object[] { typeof(decimal), "1,0", "3,0", "2,9999999999999999999999999999999999999999999" }; + yield return new object[] { typeof(decimal), "1,0", "3,0", "2,9999999999999999999999999999" }; + yield return new object[] { typeof(double), "1,0", "3,0", "1,0" }; + yield return new object[] { typeof(double), "1,0", "3,0", "3,0" }; + yield return new object[] { typeof(double), "1,0", "3,0", "2,99999999999999" }; + } + + public static IEnumerable DotDecimalInvalidValues() + { + yield return new object[] { typeof(decimal), "1.0", "3.0", "9.0" }; + yield return new object[] { typeof(decimal), "1.0", "3.0", "0.1" }; + yield return new object[] { typeof(decimal), "1.0", "3.0", "3.9999999999999999999999999999999999999999999" }; + yield return new object[] { typeof(decimal), "1.0", "3.0", "3.9999999999999999999999999999" }; + yield return new object[] { typeof(double), "1.0", "3.0", "9.0" }; + yield return new object[] { typeof(double), "1.0", "3.0", "0.1" }; + yield return new object[] { typeof(double), "1.0", "3.0", "3.9999999999999999999999999999999999999999999" }; + yield return new object[] { typeof(double), "1.0", "3.0", "3.99999999999999" }; + } + + public static IEnumerable CommaDecimalInvalidValues() + { + yield return new object[] { typeof(decimal), "1,0", "3,0", "9,0" }; + yield return new object[] { typeof(decimal), "1,0", "3,0", "0,1" }; + yield return new object[] { typeof(decimal), "1,0", "3,0", "3,9999999999999999999999999999999999999999999" }; + yield return new object[] { typeof(decimal), "1,0", "3,0", "3,9999999999999999999999999999" }; + yield return new object[] { typeof(double), "1,0", "3,0", "9,0" }; + yield return new object[] { typeof(double), "1,0", "3,0", "0,1" }; + yield return new object[] { typeof(double), "1,0", "3,0", "3,9999999999999999999999999999999999999999999" }; + yield return new object[] { typeof(double), "1,0", "3,0", "3,99999999999999" }; + } + + public static IEnumerable DotDecimalNonStringValidValues() + { + yield return new object[] { typeof(decimal), "1.0", "3.0", 1.0m }; + yield return new object[] { typeof(decimal), "1.0", "3.0", 3.0m }; + yield return new object[] { typeof(decimal), "1.0", "3.0", 2.9999999999999999999999999999m }; + yield return new object[] { typeof(double), "1.0", "3.0", 1.0 }; + yield return new object[] { typeof(double), "1.0", "3.0", 3.0 }; + yield return new object[] { typeof(double), "1.0", "3.0", 2.99999999999999 }; + } + + public static IEnumerable CommaDecimalNonStringValidValues() + { + yield return new object[] { typeof(decimal), "1,0", "3,0", 1.0m }; + yield return new object[] { typeof(decimal), "1,0", "3,0", 3.0m }; + yield return new object[] { typeof(decimal), "1,0", "3,0", 2.9999999999999999999999999999m }; + yield return new object[] { typeof(double), "1,0", "3,0", 1.0 }; + yield return new object[] { typeof(double), "1,0", "3,0", 3.0 }; + yield return new object[] { typeof(double), "1,0", "3,0", 2.99999999999999 }; + } + + private class TempCulture : IDisposable + { + private CultureInfo _original; + + public TempCulture(string culture) + { + Thread currentThread = Thread.CurrentThread; + _original = currentThread.CurrentCulture; + currentThread.CurrentCulture = CultureInfo.GetCultureInfoByIetfLanguageTag(culture); + } + + public void Dispose() + { + Thread.CurrentThread.CurrentCulture = _original; + } + } + + [Theory, MemberData(nameof(DotDecimalRanges)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void ParseDotSeparatorExtremaInCommaSeparatorCultures(Type type, string min, string max) + { + using (new TempCulture("en-US")) + { + Assert.True(new RangeAttribute(type, min, max).IsValid(null)); + } + + using (new TempCulture("fr-FR")) + { + RangeAttribute range = new RangeAttribute(type, min, max); + Assert.Throws(() => range.IsValid(null)); + } + } + + [Theory, MemberData(nameof(DotDecimalRanges)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void ParseDotSeparatorInvariantExtremaInCommaSeparatorCultures(Type type, string min, string max) + { + using (new TempCulture("en-US")) + { + Assert.True( + new RangeAttribute(type, min, max) + { + ParseLimitsInInvariantCulture = true + }.IsValid(null)); + } + + using (new TempCulture("fr-FR")) + { + Assert.True( + new RangeAttribute(type, min, max) + { + ParseLimitsInInvariantCulture = true + }.IsValid(null)); + } + } + + [Theory, MemberData(nameof(CommaDecimalRanges)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void ParseCommaSeparatorExtremaInCommaSeparatorCultures(Type type, string min, string max) + { + using (new TempCulture("en-US")) + { + RangeAttribute range = new RangeAttribute(type, min, max); + Assert.Throws(() => range.IsValid(null)); + } + + using (new TempCulture("fr-FR")) + { + Assert.True(new RangeAttribute(type, min, max).IsValid(null)); + } + } + + [Theory, MemberData(nameof(CommaDecimalRanges)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void ParseCommaSeparatorInvariantExtremaInCommaSeparatorCultures(Type type, string min, string max) + { + using (new TempCulture("en-US")) + { + RangeAttribute range = new RangeAttribute(type, min, max); + Assert.Throws(() => range.IsValid(null)); + } + + using (new TempCulture("fr-FR")) + { + Assert.True(new RangeAttribute(type, min, max).IsValid(null)); + } + } + + [Theory, MemberData(nameof(DotDecimalValidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void DotDecimalExtremaAndValues(Type type, string min, string max, string value) + { + using (new TempCulture("en-US")) + { + Assert.True(new RangeAttribute(type, min, max).IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + RangeAttribute range = new RangeAttribute(type, min, max); + Assert.Throws(() => range.IsValid(value)); + } + } + + [Theory, MemberData(nameof(DotDecimalValidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void DotDecimalExtremaAndValuesInvariantParse(Type type, string min, string max, string value) + { + using (new TempCulture("en-US")) + { + Assert.True( + new RangeAttribute(type, min, max) + { + ParseLimitsInInvariantCulture = true + }.IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ParseLimitsInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + } + + [Theory, MemberData(nameof(DotDecimalValidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void DotDecimalExtremaAndValuesInvariantConvert(Type type, string min, string max, string value) + { + using (new TempCulture("en-US")) + { + Assert.True( + new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true + }.IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + } + + [Theory, MemberData(nameof(DotDecimalValidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void DotDecimalExtremaAndValuesInvariantBoth(Type type, string min, string max, string value) + { + using (new TempCulture("en-US")) + { + Assert.True( + new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true, + ParseLimitsInInvariantCulture = true + }.IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + Assert.True( + new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true, + ParseLimitsInInvariantCulture = true + }.IsValid(value)); + } + } + + [Theory, MemberData(nameof(DotDecimalNonStringValidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void DotDecimalExtremaAndNonStringValues(Type type, string min, string max, object value) + { + using (new TempCulture("en-US")) + { + Assert.True(new RangeAttribute(type, min, max).IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + RangeAttribute range = new RangeAttribute(type, min, max); + Assert.Throws(() => range.IsValid(value)); + } + } + + [Theory, MemberData(nameof(DotDecimalNonStringValidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void DotDecimalExtremaAndNonStringValuesInvariantParse(Type type, string min, string max, object value) + { + using (new TempCulture("en-US")) + { + Assert.True( + new RangeAttribute(type, min, max) + { + ParseLimitsInInvariantCulture = true + }.IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + Assert.True( + new RangeAttribute(type, min, max) + { + ParseLimitsInInvariantCulture = true + }.IsValid(value)); + } + } + + [Theory, MemberData(nameof(DotDecimalNonStringValidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void DotDecimalExtremaAndNonStringValuesInvariantConvert(Type type, string min, string max, object value) + { + using (new TempCulture("en-US")) + { + Assert.True( + new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true + }.IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + } + + [Theory, MemberData(nameof(DotDecimalNonStringValidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void DotDecimalExtremaAndNonStringValuesInvariantBoth(Type type, string min, string max, object value) + { + using (new TempCulture("en-US")) + { + Assert.True( + new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true, + ParseLimitsInInvariantCulture = true + }.IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + Assert.True( + new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true, + ParseLimitsInInvariantCulture = true + }.IsValid(value)); + } + } + + [Theory, MemberData(nameof(CommaDecimalNonStringValidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void CommaDecimalExtremaAndNonStringValues(Type type, string min, string max, object value) + { + using (new TempCulture("en-US")) + { + RangeAttribute range = new RangeAttribute(type, min, max); + Assert.Throws(() => range.IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + Assert.True(new RangeAttribute(type, min, max).IsValid(value)); + } + } + + [Theory, MemberData(nameof(CommaDecimalNonStringValidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void CommaDecimalExtremaAndNonStringValuesInvariantParse(Type type, string min, string max, object value) + { + using (new TempCulture("en-US")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ParseLimitsInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ParseLimitsInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + } + + [Theory, MemberData(nameof(CommaDecimalNonStringValidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void CommaDecimalExtremaAndNonStringValuesInvariantConvert(Type type, string min, string max, object value) + { + using (new TempCulture("en-US")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + Assert.True( + new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true + }.IsValid(value)); + } + } + + [Theory, MemberData(nameof(CommaDecimalNonStringValidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void CommaDecimalExtremaAndNonStringValuesInvariantBoth(Type type, string min, string max, object value) + { + using (new TempCulture("en-US")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true, + ParseLimitsInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true, + ParseLimitsInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + } + + [Theory, MemberData(nameof(DotDecimalInvalidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void DotDecimalExtremaAndInvalidValues(Type type, string min, string max, string value) + { + using (new TempCulture("en-US")) + { + Assert.False(new RangeAttribute(type, min, max).IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + RangeAttribute range = new RangeAttribute(type, min, max); + Assert.Throws(() => range.IsValid(value)); + } + } + + [Theory, MemberData(nameof(DotDecimalInvalidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void DotDecimalExtremaAndInvalidValuesInvariantParse(Type type, string min, string max, string value) + { + using (new TempCulture("en-US")) + { + Assert.False( + new RangeAttribute(type, min, max) + { + ParseLimitsInInvariantCulture = true + }.IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ParseLimitsInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + } + + [Theory, MemberData(nameof(DotDecimalInvalidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void DotDecimalExtremaAndInvalidValuesInvariantConvert(Type type, string min, string max, string value) + { + using (new TempCulture("en-US")) + { + Assert.False( + new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true + }.IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + } + + [Theory, MemberData(nameof(DotDecimalInvalidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void DotDecimalExtremaAndInvalidValuesInvariantBoth(Type type, string min, string max, string value) + { + using (new TempCulture("en-US")) + { + Assert.False( + new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true, + ParseLimitsInInvariantCulture = true + }.IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + Assert.False( + new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true, + ParseLimitsInInvariantCulture = true + }.IsValid(value)); + } + } + + [Theory, MemberData(nameof(CommaDecimalValidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void CommaDecimalExtremaAndValues(Type type, string min, string max, string value) + { + using (new TempCulture("en-US")) + { + RangeAttribute range = new RangeAttribute(type, min, max); + Assert.Throws(() => range.IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + Assert.True(new RangeAttribute(type, min, max).IsValid(value)); + } + } + + [Theory, MemberData(nameof(CommaDecimalValidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void CommaDecimalExtremaAndValuesInvariantParse(Type type, string min, string max, string value) + { + using (new TempCulture("en-US")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ParseLimitsInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ParseLimitsInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + } + + [Theory, MemberData(nameof(CommaDecimalValidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void CommaDecimalExtremaAndValuesInvariantConvert(Type type, string min, string max, string value) + { + using (new TempCulture("en-US")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + } + + [Theory, MemberData(nameof(CommaDecimalValidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void CommaDecimalExtremaAndValuesInvariantBoth(Type type, string min, string max, string value) + { + using (new TempCulture("en-US")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true, + ParseLimitsInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true, + ParseLimitsInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + } + + [Theory, MemberData(nameof(CommaDecimalInvalidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void CommaDecimalExtremaAndInvalidValues(Type type, string min, string max, string value) + { + using (new TempCulture("en-US")) + { + RangeAttribute range = new RangeAttribute(type, min, max); + Assert.Throws(() => range.IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + Assert.False(new RangeAttribute(type, min, max).IsValid(value)); + } + } + + [Theory, MemberData(nameof(CommaDecimalInvalidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void CommaDecimalExtremaAndInvalidValuesInvariantParse(Type type, string min, string max, string value) + { + using (new TempCulture("en-US")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ParseLimitsInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ParseLimitsInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + } + + [Theory, MemberData(nameof(CommaDecimalInvalidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void CommaDecimalExtremaAndInvalidValuesInvariantConvert(Type type, string min, string max, string value) + { + using (new TempCulture("en-US")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + } + + [Theory, MemberData(nameof(CommaDecimalInvalidValues)), SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "2648 not fixed on NetFX")] + public static void CommaDecimalExtremaAndInvalidValuesInvariantBoth(Type type, string min, string max, string value) + { + using (new TempCulture("en-US")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true, + ParseLimitsInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + + using (new TempCulture("fr-FR")) + { + RangeAttribute range = new RangeAttribute(type, min, max) + { + ConvertValueInInvariantCulture = true, + ParseLimitsInInvariantCulture = true + }; + Assert.Throws(() => range.IsValid(value)); + } + } + [Theory] [InlineData(typeof(int), "1", "3")] [InlineData(typeof(double), "1", "3")] diff --git a/external/corefx/src/System.ComponentModel.Annotations/tests/ValidatorTests.cs b/external/corefx/src/System.ComponentModel.Annotations/tests/ValidatorTests.cs index 1997edbcda..c820e38fc8 100644 --- a/external/corefx/src/System.ComponentModel.Annotations/tests/ValidatorTests.cs +++ b/external/corefx/src/System.ComponentModel.Annotations/tests/ValidatorTests.cs @@ -229,7 +229,7 @@ namespace System.ComponentModel.DataAnnotations.Tests var results = new List(); Assert.False(Validator.TryValidateObject(instance, context, results)); - Assert.Equal("The Required field is required.", Assert.Single(results).ErrorMessage); + Assert.Contains("Required", Assert.Single(results).ErrorMessage); } public class RequiredFailure diff --git a/external/corefx/src/System.ComponentModel.Composition/System.ComponentModel.Composition.sln b/external/corefx/src/System.ComponentModel.Composition/System.ComponentModel.Composition.sln index 8bfa5e8779..98f7b86c61 100644 --- a/external/corefx/src/System.ComponentModel.Composition/System.ComponentModel.Composition.sln +++ b/external/corefx/src/System.ComponentModel.Composition/System.ComponentModel.Composition.sln @@ -7,6 +7,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Compo {2D694AC8-A12F-4622-9405-74E20EC40C3A} = {2D694AC8-A12F-4622-9405-74E20EC40C3A} EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Composition.Noop.Assembly", "tests\System.ComponentModel.Composition.Noop.Assembly\System.ComponentModel.Composition.Noop.Assembly.csproj", "{396D6EBF-60BD-4DAF-8783-FB403E070A56}" + ProjectSection(ProjectDependencies) = postProject + {2D694AC8-A12F-4622-9405-74E20EC40C3A} = {2D694AC8-A12F-4622-9405-74E20EC40C3A} + EndProjectSection +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Composition", "src\System.ComponentModel.Composition.csproj", "{2D694AC8-A12F-4622-9405-74E20EC40C3A}" ProjectSection(ProjectDependencies) = postProject {DD3B8052-CE03-4159-8311-1CE1382C51B0} = {DD3B8052-CE03-4159-8311-1CE1382C51B0} @@ -30,6 +35,10 @@ Global {59F4682D-C41D-45A7-9798-16C75525BB1D}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {59F4682D-C41D-45A7-9798-16C75525BB1D}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU {59F4682D-C41D-45A7-9798-16C75525BB1D}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU + {396D6EBF-60BD-4DAF-8783-FB403E070A56}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {396D6EBF-60BD-4DAF-8783-FB403E070A56}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {396D6EBF-60BD-4DAF-8783-FB403E070A56}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {396D6EBF-60BD-4DAF-8783-FB403E070A56}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {2D694AC8-A12F-4622-9405-74E20EC40C3A}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {2D694AC8-A12F-4622-9405-74E20EC40C3A}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {2D694AC8-A12F-4622-9405-74E20EC40C3A}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU @@ -44,6 +53,7 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {59F4682D-C41D-45A7-9798-16C75525BB1D} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} + {396D6EBF-60BD-4DAF-8783-FB403E070A56} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} {2D694AC8-A12F-4622-9405-74E20EC40C3A} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD} {DD3B8052-CE03-4159-8311-1CE1382C51B0} = {2E666815-2EDB-464B-9DF6-380BF4789AD4} EndGlobalSection diff --git a/external/corefx/src/System.ComponentModel.Composition/dir.props b/external/corefx/src/System.ComponentModel.Composition/dir.props index 55b60149d2..95204c770a 100644 --- a/external/corefx/src/System.ComponentModel.Composition/dir.props +++ b/external/corefx/src/System.ComponentModel.Composition/dir.props @@ -3,6 +3,6 @@ 4.0.0.0 - MSFT + ECMA diff --git a/external/corefx/src/System.ComponentModel.Composition/pkg/System.ComponentModel.Composition.pkgproj b/external/corefx/src/System.ComponentModel.Composition/pkg/System.ComponentModel.Composition.pkgproj index 36f9f8d5f9..8b79a972cc 100644 --- a/external/corefx/src/System.ComponentModel.Composition/pkg/System.ComponentModel.Composition.pkgproj +++ b/external/corefx/src/System.ComponentModel.Composition/pkg/System.ComponentModel.Composition.pkgproj @@ -3,16 +3,14 @@ - netcoreapp2.0;net45;$(AllXamarinFrameworks) + uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks) true + - - runtimes/win/lib/net45 - diff --git a/external/corefx/src/System.ComponentModel.Composition/ref/Configurations.props b/external/corefx/src/System.ComponentModel.Composition/ref/Configurations.props index fc9ef9822c..a83fe20d89 100644 --- a/external/corefx/src/System.ComponentModel.Composition/ref/Configurations.props +++ b/external/corefx/src/System.ComponentModel.Composition/ref/Configurations.props @@ -3,6 +3,7 @@ netstandard; + _netfx; diff --git a/external/corefx/src/System.ComponentModel.Composition/ref/System.ComponentModel.Composition.cs b/external/corefx/src/System.ComponentModel.Composition/ref/System.ComponentModel.Composition.cs index aadd04f683..7266b54f08 100644 --- a/external/corefx/src/System.ComponentModel.Composition/ref/System.ComponentModel.Composition.cs +++ b/external/corefx/src/System.ComponentModel.Composition/ref/System.ComponentModel.Composition.cs @@ -5,6 +5,8 @@ // Changes to this file must follow the http://aka.ms/api-review process. // ------------------------------------------------------------------------------ +[assembly: System.Runtime.CompilerServices.TypeForwardedTo(destination: typeof(System.Lazy<,>))] + namespace System.ComponentModel.Composition { public static partial class AdaptationConstants diff --git a/external/corefx/src/System.ComponentModel.Composition/src/Configurations.props b/external/corefx/src/System.ComponentModel.Composition/src/Configurations.props index 43f172907f..884be53cf0 100644 --- a/external/corefx/src/System.ComponentModel.Composition/src/Configurations.props +++ b/external/corefx/src/System.ComponentModel.Composition/src/Configurations.props @@ -7,6 +7,7 @@ $(PackageConfigurations); + _netfx; netcoreapp; uap; diff --git a/external/corefx/src/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj b/external/corefx/src/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj index a69aa4f1f2..cc460628fc 100644 --- a/external/corefx/src/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj +++ b/external/corefx/src/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj @@ -15,6 +15,9 @@ + + + diff --git a/external/corefx/src/System.ComponentModel.Composition/src/System/ComponentModel/Composition/Hosting/AssemblyCatalog.cs b/external/corefx/src/System.ComponentModel.Composition/src/System/ComponentModel/Composition/Hosting/AssemblyCatalog.cs index d501f5c850..f05d654ce2 100644 --- a/external/corefx/src/System.ComponentModel.Composition/src/System/ComponentModel/Composition/Hosting/AssemblyCatalog.cs +++ b/external/corefx/src/System.ComponentModel.Composition/src/System/ComponentModel/Composition/Hosting/AssemblyCatalog.cs @@ -8,6 +8,7 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Contracts; using System.Globalization; +using System.IO; using System.Reflection; using System.Threading; using Microsoft.Internal; @@ -566,7 +567,15 @@ namespace System.ComponentModel.Composition.Hosting assemblyName.CodeBase = codeBase; } - return Assembly.Load(assemblyName); + try + { + return Assembly.Load(assemblyName); + } + //fallback attempt issue https://github.com/dotnet/corefx/issues/27433 + catch (FileNotFoundException) + { + return Assembly.LoadFrom(codeBase); + } } } } diff --git a/external/corefx/src/System.ComponentModel.Composition/src/System/ComponentModel/Composition/Hosting/CompositionContainer.cs b/external/corefx/src/System.ComponentModel.Composition/src/System/ComponentModel/Composition/Hosting/CompositionContainer.cs index 69375e8066..fcd18d14c8 100644 --- a/external/corefx/src/System.ComponentModel.Composition/src/System/ComponentModel/Composition/Hosting/CompositionContainer.cs +++ b/external/corefx/src/System.ComponentModel.Composition/src/System/ComponentModel/Composition/Hosting/CompositionContainer.cs @@ -11,8 +11,6 @@ using System.Diagnostics.Contracts; using System.Threading; using Microsoft.Internal; -[assembly: System.Runtime.CompilerServices.TypeForwardedTo(destination: typeof(System.Lazy<,>))] - namespace System.ComponentModel.Composition.Hosting { public partial class CompositionContainer : ExportProvider, ICompositionService, IDisposable diff --git a/external/corefx/src/System.ComponentModel.Composition/src/TypeForwards.cs b/external/corefx/src/System.ComponentModel.Composition/src/TypeForwards.cs new file mode 100644 index 0000000000..75d9fb1a81 --- /dev/null +++ b/external/corefx/src/System.ComponentModel.Composition/src/TypeForwards.cs @@ -0,0 +1,5 @@ +// 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. + +[assembly: System.Runtime.CompilerServices.TypeForwardedTo(destination: typeof(System.Lazy<,>))] \ No newline at end of file diff --git a/external/corefx/src/System.ComponentModel.Composition/tests/Configurations.props b/external/corefx/src/System.ComponentModel.Composition/tests/Configurations.props index 02721ef2a9..e81ce94290 100644 --- a/external/corefx/src/System.ComponentModel.Composition/tests/Configurations.props +++ b/external/corefx/src/System.ComponentModel.Composition/tests/Configurations.props @@ -4,6 +4,7 @@ netcoreapp; uap; + _netfx; diff --git a/external/corefx/src/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Noop.Assembly/Configurations.props b/external/corefx/src/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Noop.Assembly/Configurations.props new file mode 100644 index 0000000000..77a4b65bc9 --- /dev/null +++ b/external/corefx/src/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Noop.Assembly/Configurations.props @@ -0,0 +1,9 @@ + + + + + netstandard; + netcoreapp; + + + \ No newline at end of file diff --git a/external/corefx/src/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Noop.Assembly/System.ComponentModel.Composition.Noop.Assembly.csproj b/external/corefx/src/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Noop.Assembly/System.ComponentModel.Composition.Noop.Assembly.csproj new file mode 100644 index 0000000000..12c34c5bbb --- /dev/null +++ b/external/corefx/src/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Noop.Assembly/System.ComponentModel.Composition.Noop.Assembly.csproj @@ -0,0 +1,15 @@ + + + + + {396D6EBF-60BD-4DAF-8783-FB403E070A56} + + + + + + + + + + \ No newline at end of file diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/FindTransform.cs b/external/corefx/src/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Noop.Assembly/TestClass.cs similarity index 52% rename from external/corefx/src/System.IO.FileSystem/src/System/IO/FindTransform.cs rename to external/corefx/src/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Noop.Assembly/TestClass.cs index c1b6b71972..75e7475012 100644 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/FindTransform.cs +++ b/external/corefx/src/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Noop.Assembly/TestClass.cs @@ -2,10 +2,10 @@ // 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.IO +namespace System.ComponentModel.Composition.Noop.Assembly { - /// - /// Delegate for transforming raw find data into a result. - /// - internal delegate T FindTransform(ref RawFindData findData); + [Export] + public class TestClass + { + } } diff --git a/external/corefx/src/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj b/external/corefx/src/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj index 72fe4fde46..4fa3445ffb 100644 --- a/external/corefx/src/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj +++ b/external/corefx/src/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj @@ -187,5 +187,15 @@ + + + + + + false + content + PreserveNewest + + - \ No newline at end of file + diff --git a/external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/CompositionContainerTests.cs.REMOVED.git-id b/external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/CompositionContainerTests.cs.REMOVED.git-id index f9814242ae..2c7d2e7114 100644 --- a/external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/CompositionContainerTests.cs.REMOVED.git-id +++ b/external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/CompositionContainerTests.cs.REMOVED.git-id @@ -1 +1 @@ -6c53aba88198595f75a9121aebc3956a65d093c9 \ No newline at end of file +b993820041ed2b2c7094478c736962b23c68fd4e \ No newline at end of file diff --git a/external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/CompositionExceptionTests.cs b/external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/CompositionExceptionTests.cs index 0504111f91..6556d3c75c 100644 --- a/external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/CompositionExceptionTests.cs +++ b/external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/CompositionExceptionTests.cs @@ -400,6 +400,10 @@ namespace System.ComponentModel.Composition private void AssertMessage(CompositionException exception, int rootCauseCount, CultureInfo culture) { + if (PlatformDetection.IsNetNative) + { + return; + } using (StringReader reader = new StringReader(exception.Message)) { string line = reader.ReadLine(); @@ -420,6 +424,10 @@ namespace System.ComponentModel.Composition private void AssertMessage(CompositionException exception, string[] expected) { + if (PlatformDetection.IsNetNative) + { + return; + } using (StringReader reader = new StringReader(exception.Message)) { // Skip header diff --git a/external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/AssemblyCatalogTests.cs b/external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/AssemblyCatalogTests.cs index b3d0ff6e98..b5e8d4cb9e 100644 --- a/external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/AssemblyCatalogTests.cs +++ b/external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/AssemblyCatalogTests.cs @@ -78,35 +78,35 @@ namespace System.ComponentModel.Composition string filename = Path.GetTempFileName(); using (FileStream stream = new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.None)) { - Assert.Throws(() => + if (PlatformDetection.IsWindows) // File locking is Windows specific. { - var catalog = catalogCreator(filename); - }); + Assert.Throws(() => catalogCreator(filename)); + } + else + { + Assert.Throws(() => catalogCreator(filename)); + } } } public static void Constructor_NullFileNameAsCodeBaseArgument_ShouldThrowArgumentNull(Func catalogCreator) { - Assert.Throws("codeBase", () => - { - var catalog = catalogCreator((string)null); - }); + Assert.Throws("codeBase", () => catalogCreator(null)); } public static void Constructor_EmptyFileNameAsCodeBaseArgument_ShouldThrowArgument(Func catalogCreator) { - Assert.Throws("codeBase", () => - { - var catalog = catalogCreator(""); - }); + Assert.Throws("codeBase", () => catalogCreator("")); } public static void Constructor_InvalidFileNameAsCodeBaseArgument_ShouldThrowArgument(Func catalogCreator) { - Assert.Throws(() => - { - var catalog = catalogCreator("??||>"); - }); + Assert.Throws(() => catalogCreator("??||>")); + } + + public static void Constructor_InvalidFileNameAsCodeBaseArgument_ShouldThrowIO(Func catalogCreator) + { + Assert.ThrowsAny(() => catalogCreator("??||>")); } public static void Constructor_DirectoryAsCodeBaseArgument_ShouldThrowFileLoad(Func catalogCreator) @@ -114,35 +114,24 @@ namespace System.ComponentModel.Composition string directory = Environment.GetFolderPath(Environment.SpecialFolder.System); Assert.True(Directory.Exists(directory)); - Assert.Throws(() => - { - var catalog = catalogCreator(directory); - }); + Assert.Throws(() => catalogCreator(directory)); } public static void Constructor_TooLongFileNameAsCodeBaseArgument_ShouldThrowPathTooLong(Func catalogCreator) { Assert.Throws(() => - { - var catalog = catalogCreator(@"c:\This is a very long path\And Just to make sure\We will continue to make it very long\This is a very long path\And Just to make sure\We will continue to make it very long\This is a very long path\And Just to make sure\We will continue to make it very long\myassembly.dll"); - }); + catalogCreator(@"c:\This is a very long path\And Just to make sure\We will continue to make it very long\This is a very long path\And Just to make sure\We will continue to make it very long\This is a very long path\And Just to make sure\We will continue to make it very long\myassembly.dll")); } public static void Constructor_NonAssemblyFileNameAsCodeBaseArgument_ShouldThrowBadImageFormat(Func catalogCreator) { string filename = Path.GetTempFileName(); - Assert.Throws(() => - { - var catalog = catalogCreator(filename); - }); + Assert.Throws(() => catalogCreator(filename)); } public static void Constructor_NonExistentFileNameAsCodeBaseArgument_ShouldThrowFileNotFound(Func catalogCreator) { - Assert.Throws(() => - { - var catalog = catalogCreator(@"FileThat should not ever exist"); - }); + Assert.Throws(() => catalogCreator(@"FileThat should not ever exist")); } // Test Assembly variant of the APIs @@ -160,18 +149,12 @@ namespace System.ComponentModel.Composition public static void Constructor_NullReflectionContextArgument_ShouldThrowArgumentNull(Func catalogCreator) { - AssertExtensions.Throws("reflectionContext", () => - { - var catalog = catalogCreator(null); - }); + AssertExtensions.Throws("reflectionContext", () => catalogCreator(null)); } public static void Constructor_NullDefinitionOriginArgument_ShouldThrowArgumentNull(Func catalogCreator) { - AssertExtensions.Throws("definitionOrigin", () => - { - var catalog = catalogCreator(null); - }); + AssertExtensions.Throws("definitionOrigin", () => catalogCreator(null)); } //========================================================================================================================================= @@ -215,8 +198,8 @@ namespace System.ComponentModel.Composition } [Fact] - [ActiveIssue(25498, TestPlatforms.AnyUnix)] - public void Constructor1_InvalidFileNameAsCodeBaseArgument_ShouldThrowArgument() + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] + public void Constructor1_InvalidFileNameAsCodeBaseArgument_ShouldThrowArgument_Desktop() { AssemblyCatalogConstructorTests.Constructor_InvalidFileNameAsCodeBaseArgument_ShouldThrowArgument((s) => { @@ -224,6 +207,17 @@ namespace System.ComponentModel.Composition }); } + [Fact] + [ActiveIssue(25498)] // Also see https://github.com/dotnet/corefx/issues/27269 + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void Constructor1_InvalidFileNameAsCodeBaseArgument_ShouldThrowIO_Core() + { + AssemblyCatalogConstructorTests.Constructor_InvalidFileNameAsCodeBaseArgument_ShouldThrowIO((s) => + { + return new AssemblyCatalog(s); + }); + } + [Fact] [ActiveIssue(25498)] public void Constructor1_DirectoryAsCodeBaseArgument_ShouldThrowFileLoad() @@ -314,8 +308,8 @@ namespace System.ComponentModel.Composition } [Fact] - [ActiveIssue(25498, TestPlatforms.AnyUnix)] - public void Constructor2_InvalidFileNameAsCodeBaseArgument_ShouldThrowArgument() + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] + public void Constructor2_InvalidFileNameAsCodeBaseArgument_ShouldThrowArgument_Desktop() { AssemblyCatalogConstructorTests.Constructor_InvalidFileNameAsCodeBaseArgument_ShouldThrowArgument((s) => { @@ -323,6 +317,17 @@ namespace System.ComponentModel.Composition }); } + [Fact] + [ActiveIssue(25498)] // Also see https://github.com/dotnet/corefx/issues/27269 + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void Constructor2_InvalidFileNameAsCodeBaseArgument_ShouldThrowArgument() + { + AssemblyCatalogConstructorTests.Constructor_InvalidFileNameAsCodeBaseArgument_ShouldThrowIO((s) => + { + return new AssemblyCatalog(s, new AssemblyCatalogTestsReflectionContext()); + }); + } + [Fact] [ActiveIssue(25498)] public void Constructor2_DirectoryAsCodeBaseArgument_ShouldThrowFileLoad() @@ -412,7 +417,7 @@ namespace System.ComponentModel.Composition } [Fact] - [ActiveIssue(25498, TestPlatforms.AnyUnix)] + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] public void Constructor3_InvalidFileNameAsCodeBaseArgument_ShouldThrowArgument() { AssemblyCatalogConstructorTests.Constructor_InvalidFileNameAsCodeBaseArgument_ShouldThrowArgument((s) => @@ -421,6 +426,17 @@ namespace System.ComponentModel.Composition }); } + [Fact] + [ActiveIssue(25498)] // // Also see https://github.com/dotnet/corefx/issues/27269 + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void Constructor3_InvalidFileNameAsCodeBaseArgument_ShouldThrowIO_Core() + { + AssemblyCatalogConstructorTests.Constructor_InvalidFileNameAsCodeBaseArgument_ShouldThrowIO((s) => + { + return new AssemblyCatalog(s, (ICompositionElement)new AssemblyCatalog(s)); + }); + } + [Fact] [ActiveIssue(25498)] public void Constructor3_DirectoryAsCodeBaseArgument_ShouldThrowFileLoad() @@ -509,8 +525,8 @@ namespace System.ComponentModel.Composition } [Fact] - [ActiveIssue(25498, TestPlatforms.AnyUnix)] - public void Constructor4_InvalidFileNameAsCodeBaseArgument_ShouldThrowArgument() + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] + public void Constructor4_InvalidFileNameAsCodeBaseArgument_ShouldThrowArgument_Desktop() { AssemblyCatalogConstructorTests.Constructor_InvalidFileNameAsCodeBaseArgument_ShouldThrowArgument((s) => { @@ -518,6 +534,17 @@ namespace System.ComponentModel.Composition }); } + [Fact] + [ActiveIssue(25498)] // Also see https://github.com/dotnet/corefx/issues/27269 + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void Constructor4_InvalidFileNameAsCodeBaseArgument_ShouldThrowIO_Core() + { + AssemblyCatalogConstructorTests.Constructor_InvalidFileNameAsCodeBaseArgument_ShouldThrowIO((s) => + { + return new AssemblyCatalog(s, new AssemblyCatalogTestsReflectionContext(), (ICompositionElement)new AssemblyCatalog(s)); + }); + } + [Fact] [ActiveIssue(25498)] public void Constructor4_DirectoryAsCodeBaseArgument_ShouldThrowFileLoad() @@ -780,10 +807,7 @@ namespace System.ComponentModel.Composition catalog.Dispose(); var definition = ImportDefinitionFactory.Create(); - ExceptionAssert.ThrowsDisposed(catalog, () => - { - catalog.GetExports(definition); - }); + ExceptionAssert.ThrowsDisposed(catalog, () => catalog.GetExports(definition)); } [Fact] @@ -792,10 +816,7 @@ namespace System.ComponentModel.Composition { var catalog = CreateAssemblyCatalog(); - AssertExtensions.Throws("definition", () => - { - catalog.GetExports((ImportDefinition)null); - }); + AssertExtensions.Throws("definition", () => catalog.GetExports(null)); } [Fact] @@ -1060,5 +1081,18 @@ namespace System.ComponentModel.Composition Assert.Equal(catalog.DisplayName, catalog.ToString()); } } + + [Fact] + public void NonStaticallyReferencedAssembly() + { + string testAssembly = "System.ComponentModel.Composition.Noop.Assembly.dll"; + var directory = TemporaryFileCopier.GetNewTemporaryDirectory(); + Directory.CreateDirectory(directory); + var finalPath = Path.Combine(directory, testAssembly); + var sourcePath = Path.Combine(Directory.GetCurrentDirectory(), testAssembly); + File.Copy(sourcePath, finalPath); + var assemblyCatalog = new AssemblyCatalog(finalPath); + Assert.NotEmpty(assemblyCatalog); + } } } diff --git a/external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/DirectoryCatalogTests.cs b/external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/DirectoryCatalogTests.cs index 794e77943c..5d7613c369 100644 --- a/external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/DirectoryCatalogTests.cs +++ b/external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/DirectoryCatalogTests.cs @@ -228,16 +228,6 @@ namespace System.ComponentModel.Composition catalog.Dispose(); } - [Fact] - [ActiveIssue(25498, TestPlatforms.AnyUnix)] // typeof(System.IO.DirectoryNotFoundException): Could not find a part of the path '/HOME/HELIXBOT/DOTNETBUILD/WORK/E77C2FB6-5244-4437-8E27-6DD709101152/WORK/D9EBA0EA-A511-4F42-AC8B-AC8054AAF606/UNZIP/HTTP:/MICROSOFT.COM/MYASSEMBLY.DLL'. - public void AddAssembly1_NonExistentUriAsAssemblyFileNameArgument_ShouldNotSupportedException() - { - Assert.Throws(() => - { - var catalog = new DirectoryCatalog("http://microsoft.com/myassembly.dll"); - }); - } - [Fact] public void AddAssembly1_NullPathArgument_ShouldThrowArugmentNull() { @@ -252,16 +242,6 @@ namespace System.ComponentModel.Composition new DirectoryCatalog("")); } - [Fact] - [ActiveIssue(25498, TestPlatforms.AnyUnix)] // typeof(System.IO.DirectoryNotFoundException): Could not find a part of the path '/HOME/HELIXBOT/DOTNETBUILD/WORK/E77C2FB6-5244-4437-8E27-6DD709101152/WORK/D9EBA0EA-A511-4F42-AC8B-AC8054AAF606/UNZIP/*'. - public void AddAssembly1_InvalidPathName_ShouldThrowDirectoryNotFound() - { - Assert.Throws(() => - { - var c1 = new DirectoryCatalog("*"); - }); - } - [Fact] [ActiveIssue(25498)] public void AddAssembly1_TooLongPathNameArgument_ShouldThrowPathTooLongException() @@ -363,6 +343,19 @@ namespace System.ComponentModel.Composition cat.LoadedFiles); } + [Fact] + public void LoadedFiles_NonStaticallyReferencedAssembly() + { + string testAssembly = "System.ComponentModel.Composition.Noop.Assembly.dll"; + var directory = TemporaryFileCopier.GetNewTemporaryDirectory(); + Directory.CreateDirectory(directory); + var finalPath = Path.Combine(directory, testAssembly); + var sourcePath = Path.Combine(Directory.GetCurrentDirectory(), testAssembly); + File.Copy(sourcePath, finalPath); + var catalog = new DirectoryCatalog(directory, "*.dll"); + Assert.NotEmpty(catalog); + } + [Fact] public void Constructor_InvalidAssembly_ShouldBeFine() { diff --git a/external/corefx/src/System.ComponentModel.Primitives/src/FxCopBaseline.cs b/external/corefx/src/System.ComponentModel.Primitives/src/FxCopBaseline.cs index b702751c5d..4175d27701 100644 --- a/external/corefx/src/System.ComponentModel.Primitives/src/FxCopBaseline.cs +++ b/external/corefx/src/System.ComponentModel.Primitives/src/FxCopBaseline.cs @@ -1,3 +1,7 @@ +// 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.CodeAnalysis; [assembly: SuppressMessage("Microsoft.Reliability", "CA2002:DoNotLockOnObjectsWithWeakIdentity", Scope = "member", Target = "System.ComponentModel.Component.#Dispose(System.Boolean)")] diff --git a/external/corefx/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj b/external/corefx/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj index 2d7b02cd61..8ab0533cdf 100644 --- a/external/corefx/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj +++ b/external/corefx/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj @@ -7,8 +7,6 @@ System.ComponentModel.TypeConverter true true - - false diff --git a/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/DesignerOptionService.cs b/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/DesignerOptionService.cs index 9088ef3fd6..4e4358ed03 100644 --- a/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/DesignerOptionService.cs +++ b/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/DesignerOptionService.cs @@ -154,6 +154,7 @@ namespace System.ComponentModel.Design if (Parent != null) { + parent._properties = null; if (Parent._children == null) { Parent._children = new ArrayList(1); diff --git a/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/DesignerAttribute.cs b/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/DesignerAttribute.cs index 05997fdc03..e79b28d7c7 100644 --- a/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/DesignerAttribute.cs +++ b/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/DesignerAttribute.cs @@ -15,6 +15,7 @@ namespace System.ComponentModel /// Specifies the class to use to implement design-time services. /// [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface, AllowMultiple = true, Inherited = true)] + [Conditional("MONO_DESIGNER_ATTRIBUTE")] public sealed class DesignerAttribute : Attribute { private string _typeId; diff --git a/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/MemberDescriptor.cs b/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/MemberDescriptor.cs index 73122b15dc..9ab50a171b 100644 --- a/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/MemberDescriptor.cs +++ b/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/MemberDescriptor.cs @@ -377,16 +377,20 @@ namespace System.ComponentModel list = new List(_attributes); } - var set = new HashSet(); + var map = new Dictionary(); for (int i = 0; i < list.Count;) { - if (set.Add(list[i].TypeId)) + int savedIndex = -1; + object typeId = list[i].TypeId; + if (!map.TryGetValue(typeId, out savedIndex)) { - ++i; + map.Add(typeId, i); + i++; } else { + list[savedIndex] = list[i]; list.RemoveAt(i); } } diff --git a/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/TypeDescriptor.cs.REMOVED.git-id b/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/TypeDescriptor.cs.REMOVED.git-id index 541ae4ea9a..5b5d72a668 100644 --- a/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/TypeDescriptor.cs.REMOVED.git-id +++ b/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/TypeDescriptor.cs.REMOVED.git-id @@ -1 +1 @@ -13607f00315827d545f53022193a2500427b7eab \ No newline at end of file +cc4987c1908502a89e51cb7e96bdab5bd59d8d31 \ No newline at end of file diff --git a/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/UInt16Converter.cs b/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/UInt16Converter.cs index d18a2555e6..0f01295f89 100644 --- a/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/UInt16Converter.cs +++ b/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/UInt16Converter.cs @@ -15,7 +15,7 @@ namespace System.ComponentModel /// /// The Type this converter is targeting (e.g. Int16, UInt32, etc.) /// - internal override Type TargetType => typeof(short); + internal override Type TargetType => typeof(ushort); /// /// Convert the given value to a string using the given radix diff --git a/external/corefx/src/System.ComponentModel.TypeConverter/tests/ArrayConverterTests.cs b/external/corefx/src/System.ComponentModel.TypeConverter/tests/ArrayConverterTests.cs index ca0ca8285e..19e987903e 100644 --- a/external/corefx/src/System.ComponentModel.TypeConverter/tests/ArrayConverterTests.cs +++ b/external/corefx/src/System.ComponentModel.TypeConverter/tests/ArrayConverterTests.cs @@ -2,6 +2,7 @@ // 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.Globalization; using Xunit; namespace System.ComponentModel.Tests @@ -11,11 +12,16 @@ namespace System.ComponentModel.Tests [Fact] public static void ConvertTo_WithContext() { - ConvertTo_WithContext(new object[1, 3] - { - { new int[2] { 1, 2 }, "Int32[] Array", null } - }, - new ArrayConverter()); + RemoteInvoke(() => + { + CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture; + + ConvertTo_WithContext(new object[1, 3] + { + { new int[2] { 1, 2 }, "Int32[] Array", null } + }, + new ArrayConverter()); + }).Dispose(); } } } diff --git a/external/corefx/src/System.ComponentModel.TypeConverter/tests/CollectionConverterTests.cs b/external/corefx/src/System.ComponentModel.TypeConverter/tests/CollectionConverterTests.cs index 74799c5c6e..535464e92d 100644 --- a/external/corefx/src/System.ComponentModel.TypeConverter/tests/CollectionConverterTests.cs +++ b/external/corefx/src/System.ComponentModel.TypeConverter/tests/CollectionConverterTests.cs @@ -2,6 +2,7 @@ // 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.Globalization; using Xunit; namespace System.ComponentModel.Tests @@ -13,11 +14,16 @@ namespace System.ComponentModel.Tests [Fact] public static void ConvertTo_WithContext() { - ConvertTo_WithContext(new object[1, 3] - { - { new Collection1(), "(Collection)", null } - }, - CollectionConverterTests.s_converter); + RemoteInvoke(() => + { + CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture; + + ConvertTo_WithContext(new object[1, 3] + { + { new Collection1(), "(Collection)", null } + }, + CollectionConverterTests.s_converter); + }).Dispose(); } } } diff --git a/external/corefx/src/System.ComponentModel.TypeConverter/tests/CultureInfoConverterTests.cs b/external/corefx/src/System.ComponentModel.TypeConverter/tests/CultureInfoConverterTests.cs index 5581e52c23..f6196037db 100644 --- a/external/corefx/src/System.ComponentModel.TypeConverter/tests/CultureInfoConverterTests.cs +++ b/external/corefx/src/System.ComponentModel.TypeConverter/tests/CultureInfoConverterTests.cs @@ -11,19 +11,16 @@ // using System.ComponentModel.Design.Serialization; +using System.Diagnostics; using System.Globalization; +using System.Runtime.InteropServices; using Xunit; namespace System.ComponentModel.Tests { - public class CultureInfoConverterTest + public class CultureInfoConverterTest : RemoteExecutorTestBase { - private CultureInfoConverter converter; - - public CultureInfoConverterTest() - { - converter = new CultureInfoConverter(); - } + private CultureInfoConverter converter => new CultureInfoConverter(); [Fact] public void CanConvertFrom() @@ -153,13 +150,18 @@ namespace System.ComponentModel.Tests [Fact] public void ConvertFrom_Value_Null() { - NotSupportedException ex = Assert.Throws(() => converter.ConvertFrom(null, CultureInfo.InvariantCulture, (string)null)); - // CultureInfoConverter cannot convert from (null) - Assert.Equal(typeof(NotSupportedException), ex.GetType()); - Assert.Null(ex.InnerException); - Assert.NotNull(ex.Message); - Assert.True(ex.Message.IndexOf(typeof(CultureInfoConverter).Name) != -1); - Assert.True(ex.Message.IndexOf("(null)") != -1); + RemoteInvoke(() => + { + CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture; + + NotSupportedException ex = Assert.Throws(() => converter.ConvertFrom(null, CultureInfo.InvariantCulture, (string)null)); + // CultureInfoConverter cannot convert from (null) + Assert.Equal(typeof(NotSupportedException), ex.GetType()); + Assert.Null(ex.InnerException); + Assert.NotNull(ex.Message); + Assert.True(ex.Message.IndexOf(typeof(CultureInfoConverter).Name) != -1); + Assert.True(ex.Message.IndexOf("(null)") != -1); + }).Dispose(); } [Fact] diff --git a/external/corefx/src/System.ComponentModel.TypeConverter/tests/DateTimeConverterTests.cs b/external/corefx/src/System.ComponentModel.TypeConverter/tests/DateTimeConverterTests.cs index 349f945b4e..0ae2640a47 100644 --- a/external/corefx/src/System.ComponentModel.TypeConverter/tests/DateTimeConverterTests.cs +++ b/external/corefx/src/System.ComponentModel.TypeConverter/tests/DateTimeConverterTests.cs @@ -66,7 +66,7 @@ namespace System.ComponentModel.Tests DateTimeConverterTests.s_converter); return SuccessExitCode; - }); + }).Dispose(); } } } diff --git a/external/corefx/src/System.ComponentModel.TypeConverter/tests/DateTimeOffsetConverterTests.cs b/external/corefx/src/System.ComponentModel.TypeConverter/tests/DateTimeOffsetConverterTests.cs index 2c4712185b..3bea6a9766 100644 --- a/external/corefx/src/System.ComponentModel.TypeConverter/tests/DateTimeOffsetConverterTests.cs +++ b/external/corefx/src/System.ComponentModel.TypeConverter/tests/DateTimeOffsetConverterTests.cs @@ -68,7 +68,7 @@ namespace System.ComponentModel.Tests DateTimeOffsetConverterTests.s_converter); return SuccessExitCode; - }); + }).Dispose(); } } } diff --git a/external/corefx/src/System.ComponentModel.TypeConverter/tests/Design/DesignerOptionServiceTests.cs b/external/corefx/src/System.ComponentModel.TypeConverter/tests/Design/DesignerOptionServiceTests.cs index b44922d2a7..1fb189afaa 100644 --- a/external/corefx/src/System.ComponentModel.TypeConverter/tests/Design/DesignerOptionServiceTests.cs +++ b/external/corefx/src/System.ComponentModel.TypeConverter/tests/Design/DesignerOptionServiceTests.cs @@ -4,12 +4,14 @@ using System.Collections; using System.ComponentModel.DataAnnotations; +using System.Diagnostics; +using System.Globalization; using System.Linq; using Xunit; namespace System.ComponentModel.Design.Tests { - public class DesignerOptionServiceTests + public class DesignerOptionServiceTests : RemoteExecutorTestBase { [Fact] public void CreateOptionCollection_CreateMultipleTimes_ReturnsExpected() @@ -180,13 +182,14 @@ namespace System.ComponentModel.Design.Tests } [Fact] - public void Properties_GetBeforeAddingChild_ReturnsEmpty() + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void Properties_GetBeforeAddingChild_ReturnsNonEmpty() { var service = new TestDesignerOptionService(); Assert.Empty(service.Options.Properties); DesignerOptionService.DesignerOptionCollection options = service.DoCreateOptionCollection(service.Options, "name", "value"); - Assert.Empty(service.Options.Properties); + Assert.NotEmpty(service.Options.Properties); } [Fact] @@ -265,8 +268,13 @@ namespace System.ComponentModel.Design.Tests [Fact] public void DesignerOptionConverter_ConvertToString_ReturnsExpected() { - TypeConverter converter = TypeDescriptor.GetConverter(typeof(DesignerOptionService.DesignerOptionCollection)); - Assert.Equal("(Collection)", converter.ConvertToString(null)); + RemoteInvoke(() => + { + CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture; + + TypeConverter converter = TypeDescriptor.GetConverter(typeof(DesignerOptionService.DesignerOptionCollection)); + Assert.Equal("(Collection)", converter.ConvertToString(null)); + }).Dispose(); } [Fact] diff --git a/external/corefx/src/System.ComponentModel.TypeConverter/tests/MultilineStringConverterTests.cs b/external/corefx/src/System.ComponentModel.TypeConverter/tests/MultilineStringConverterTests.cs index 038f3af1fb..a357b88603 100644 --- a/external/corefx/src/System.ComponentModel.TypeConverter/tests/MultilineStringConverterTests.cs +++ b/external/corefx/src/System.ComponentModel.TypeConverter/tests/MultilineStringConverterTests.cs @@ -2,6 +2,7 @@ // 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.Globalization; using Xunit; namespace System.ComponentModel.Tests @@ -11,11 +12,16 @@ namespace System.ComponentModel.Tests [Fact] public static void ConvertTo_WithContext() { - ConvertTo_WithContext(new object[1, 3] - { - { "any string", "(Text)", null } - }, - new MultilineStringConverter()); + RemoteInvoke(() => + { + CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture; + + ConvertTo_WithContext(new object[1, 3] + { + { "any string", "(Text)", null } + }, + new MultilineStringConverter()); + }).Dispose(); } } } diff --git a/external/corefx/src/System.ComponentModel.TypeConverter/tests/ReferenceConverterTests.cs b/external/corefx/src/System.ComponentModel.TypeConverter/tests/ReferenceConverterTests.cs index 24b49ef60f..1acbae7708 100644 --- a/external/corefx/src/System.ComponentModel.TypeConverter/tests/ReferenceConverterTests.cs +++ b/external/corefx/src/System.ComponentModel.TypeConverter/tests/ReferenceConverterTests.cs @@ -33,11 +33,13 @@ using System.Collections.Generic; using System.ComponentModel.Design; +using System.Diagnostics; +using System.Globalization; using Xunit; namespace System.ComponentModel.Tests { - public class ReferenceConverterTest + public class ReferenceConverterTest : RemoteExecutorTestBase { class TestReferenceService : IReferenceService @@ -197,11 +199,16 @@ namespace System.ComponentModel.Tests [Fact] public void ConvertTo() { + RemoteInvoke(() => + { + CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture; + + ReferenceConverter remoteConverter = new ReferenceConverter(typeof(ITestInterface)); + Assert.Equal("(none)", (string)remoteConverter.ConvertTo(null, null, null, typeof(string))); + }).Dispose(); + ReferenceConverter converter = new ReferenceConverter(typeof(ITestInterface)); string referenceName = "reference name"; - - Assert.Equal("(none)", (string)converter.ConvertTo(null, null, null, typeof(string))); - TestComponent component = new TestComponent(); // no context diff --git a/external/corefx/src/System.ComponentModel.TypeConverter/tests/TypeConverterTests.cs b/external/corefx/src/System.ComponentModel.TypeConverter/tests/TypeConverterTests.cs index 51041e28e9..781d5dca61 100644 --- a/external/corefx/src/System.ComponentModel.TypeConverter/tests/TypeConverterTests.cs +++ b/external/corefx/src/System.ComponentModel.TypeConverter/tests/TypeConverterTests.cs @@ -110,7 +110,7 @@ namespace System.ComponentModel.Tests Assert.NotNull(s); Assert.Equal(FormattableClass.Token, s); return SuccessExitCode; - }); + }).Dispose(); } [Fact] diff --git a/external/corefx/src/System.ComponentModel.TypeConverter/tests/TypeDescriptorTests.cs b/external/corefx/src/System.ComponentModel.TypeConverter/tests/TypeDescriptorTests.cs index 9c78e5ed3a..ef7efcb5a8 100644 --- a/external/corefx/src/System.ComponentModel.TypeConverter/tests/TypeDescriptorTests.cs +++ b/external/corefx/src/System.ComponentModel.TypeConverter/tests/TypeDescriptorTests.cs @@ -160,6 +160,13 @@ namespace System.ComponentModel.Tests Assert.NotEqual(firstAssociatedObject, firstAssociation); } + [Fact] + public void DerivedPropertyAttribute() { + PropertyDescriptor property = TypeDescriptor.GetProperties(typeof(FooBarDerived))["Value"]; + var descriptionAttribute = (DescriptionAttribute)property.Attributes[typeof(DescriptionAttribute)]; + Assert.Equal("Derived", descriptionAttribute.Description); + } + private class InvocationRecordingTypeDescriptionProvider : TypeDescriptionProvider { public bool ReceivedCall { get; private set; } = false; @@ -221,6 +228,18 @@ namespace System.ComponentModel.Tests } } + class FooBarBase + { + [Description("Base")] + public virtual int Value { get; set; } + } + + class FooBarDerived : FooBarBase + { + [Description("Derived")] + public override int Value { get; set; } + } + private static Tuple[] s_typesWithConverters = { new Tuple (typeof(bool), typeof(BooleanConverter)), diff --git a/external/corefx/src/System.ComponentModel.TypeConverter/tests/TypeListConverterTests.cs b/external/corefx/src/System.ComponentModel.TypeConverter/tests/TypeListConverterTests.cs index 208bc4fc03..4940f7c0cb 100644 --- a/external/corefx/src/System.ComponentModel.TypeConverter/tests/TypeListConverterTests.cs +++ b/external/corefx/src/System.ComponentModel.TypeConverter/tests/TypeListConverterTests.cs @@ -36,12 +36,17 @@ namespace System.ComponentModel.Tests [Fact] public static void ConvertTo_WithContext() { - ConvertTo_WithContext(new object[2, 3] - { - { typeof(char), "System.Char", null }, // the base class is not verifying if this type is not in the list - { null, "(none)", CultureInfo.InvariantCulture } - }, - TypeListConverterTests.s_converter); + RemoteInvoke(() => + { + CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture; + + ConvertTo_WithContext(new object[2, 3] + { + { typeof(char), "System.Char", null }, // the base class is not verifying if this type is not in the list + { null, "(none)", CultureInfo.InvariantCulture } + }, + TypeListConverterTests.s_converter); + }).Dispose(); } [Fact] diff --git a/external/corefx/src/System.ComponentModel.TypeConverter/tests/UInt16ConverterTests.cs b/external/corefx/src/System.ComponentModel.TypeConverter/tests/UInt16ConverterTests.cs index 6f2ac18a0b..3747b525ba 100644 --- a/external/corefx/src/System.ComponentModel.TypeConverter/tests/UInt16ConverterTests.cs +++ b/external/corefx/src/System.ComponentModel.TypeConverter/tests/UInt16ConverterTests.cs @@ -41,5 +41,12 @@ namespace System.ComponentModel.Tests }, UInt16ConverterTests.s_converter); } + + [Fact] + public static void ConvertFrom_InvalidValue_ExceptionMessageContainsTypeName() + { + Exception e = Assert.ThrowsAny(() => s_converter.ConvertFrom("badvalue")); + Assert.Contains(typeof(ushort).Name, e.Message); + } } } diff --git a/external/corefx/src/System.Composition.Runtime/src/System/Composition/CompositionContext.cs b/external/corefx/src/System.Composition.Runtime/src/System/Composition/CompositionContext.cs index 1c1fc29b14..7498e135ac 100644 --- a/external/corefx/src/System.Composition.Runtime/src/System/Composition/CompositionContext.cs +++ b/external/corefx/src/System.Composition.Runtime/src/System/Composition/CompositionContext.cs @@ -34,7 +34,7 @@ namespace System.Composition /// public TExport GetExport() { - return GetExport((string)null); + return GetExport(null); } /// @@ -55,13 +55,12 @@ namespace System.Composition /// . /// /// The type of the export to retrieve. - /// Optionally, a discriminator that constrains the selection of the export. /// An instance of the export. /// The export if available, otherwise, null. /// - public bool TryGetExport(Type exportType, string contractName, out object export) + public bool TryGetExport(Type exportType, out object export) { - return TryGetExport(new CompositionContract(exportType, contractName), out export); + return TryGetExport(exportType, null, out export); } /// @@ -69,12 +68,17 @@ namespace System.Composition /// . /// /// The type of the export to retrieve. + /// Optionally, a discriminator that constrains the selection of the export. /// An instance of the export. /// The export if available, otherwise, null. /// - public bool TryGetExport(Type exportType, out object export) + public bool TryGetExport(Type exportType, string contractName, out object export) { - return TryGetExport(exportType, null, out export); + if (TryGetExport(new CompositionContract(exportType, contractName), out export)) + return true; + + export = default; + return false; } /// @@ -87,7 +91,7 @@ namespace System.Composition /// public bool TryGetExport(out TExport export) { - return TryGetExport(null, out export); + return TryGetExport(null, out export); } /// @@ -101,10 +105,9 @@ namespace System.Composition /// public bool TryGetExport(string contractName, out TExport export) { - object untypedExport; - if (!TryGetExport(typeof(TExport), contractName, out untypedExport)) + if (!TryGetExport(typeof(TExport), contractName, out object untypedExport)) { - export = default(TExport); + export = default; return false; } @@ -121,7 +124,7 @@ namespace System.Composition /// public object GetExport(Type exportType) { - return GetExport(exportType, (string)null); + return GetExport(exportType, null); } /// @@ -146,12 +149,10 @@ namespace System.Composition /// public object GetExport(CompositionContract contract) { - object export; - if (!TryGetExport(contract, out export)) - throw new CompositionFailedException( - string.Format(SR.CompositionContext_NoExportFoundForContract, contract)); + if (TryGetExport(contract, out object export)) + return export; - return export; + throw new CompositionFailedException(SR.Format(SR.CompositionContext_NoExportFoundForContract, contract)); } /// @@ -162,7 +163,7 @@ namespace System.Composition /// public IEnumerable GetExports(Type exportType) { - return GetExports(exportType, (string)null); + return GetExports(exportType, null); } /// @@ -192,7 +193,7 @@ namespace System.Composition /// public IEnumerable GetExports() { - return GetExports((string)null); + return GetExports(null); } /// diff --git a/external/corefx/src/System.Composition.Runtime/tests/CompositionContextTests.cs b/external/corefx/src/System.Composition.Runtime/tests/CompositionContextTests.cs index 9455b69591..9e13a77402 100644 --- a/external/corefx/src/System.Composition.Runtime/tests/CompositionContextTests.cs +++ b/external/corefx/src/System.Composition.Runtime/tests/CompositionContextTests.cs @@ -61,9 +61,8 @@ namespace System.Composition.Tests Assert.False(context.TryGetExport(out int export1)); Assert.Equal(0, export1); - // Failure leaks through. Assert.False(context.TryGetExport(typeof(int), out object export2)); - Assert.Equal(10, export2); + Assert.Equal(null, export2); } else { @@ -73,9 +72,8 @@ namespace System.Composition.Tests Assert.False(context.TryGetExport(contractName, out int export1)); Assert.Equal(0, export1); - // Failure leaks through. Assert.False(context.TryGetExport(typeof(int), contractName, out object export2)); - Assert.Equal(10, export2); + Assert.Equal(null, export2); } } } diff --git a/external/corefx/src/System.Composition/tests/ConstraintTests.cs b/external/corefx/src/System.Composition/tests/ConstraintTests.cs index ef26d31153..fd0012a12c 100644 --- a/external/corefx/src/System.Composition/tests/ConstraintTests.cs +++ b/external/corefx/src/System.Composition/tests/ConstraintTests.cs @@ -2,6 +2,8 @@ // 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.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using Xunit; @@ -10,6 +12,8 @@ namespace System.Composition.UnitTests public class ConstraintTests : ContainerTests { public interface IThing { } + public interface IUnrelatedThings : IList, IThing { } + public interface IInheritedThings : IList, IThing where TC : TP { } public interface ICar : IThing { } public interface IBook : IThing { } public interface IHandler where T : IThing { } @@ -26,6 +30,17 @@ namespace System.Composition.UnitTests { } + [Export(typeof(IInheritedThings<,>))] + public class InheritedThings : ObservableCollection, IInheritedThings + where TC : TP + { + } + + [Export(typeof(IUnrelatedThings<,>))] + public class UnrelatedThings : ObservableCollection, IUnrelatedThings + { + } + [Fact] [ActiveIssue(24903, TargetFrameworkMonikers.NetFramework)] public void GenericPartDiscoveryIgnoresAPartAndDoesntThrowAnExceptionWhenItsConstraintOnTypeParameterIsNotAssignableFromTheExportTarget() @@ -50,5 +65,30 @@ namespace System.Composition.UnitTests Assert.Contains(typeof(ThingHandler), handlerTypes); Assert.Contains(typeof(BookHandler), handlerTypes); } + + [Fact] + [ActiveIssue(24903, TargetFrameworkMonikers.NetFramework)] + public void GetExport_ComplexConstraint_ExportSuccessful() + { + CompositionContext container = CreateContainer(typeof(UnrelatedThings<,>)); + var exports = container.GetExports>(); + var types = exports.Select(h => h.GetType()); + + Assert.Equal(1, exports.Count()); + Assert.Contains(typeof(UnrelatedThings), types); + } + + [Fact] + [ActiveIssue(23607)] + [ActiveIssue(24903, TargetFrameworkMonikers.NetFramework)] + public void GetExport_WhereClause_ExportSuccessful() + { + CompositionContext container = CreateContainer(typeof(InheritedThings<,>)); + var exports = container.GetExports>(); + var types = exports.Select(h => h.GetType()); + + Assert.Equal(1, exports.Count()); + Assert.Contains(typeof(InheritedThings), types); + } } } diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj b/external/corefx/src/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj index 948dd3bedd..df12ccf73f 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj +++ b/external/corefx/src/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj @@ -3,8 +3,6 @@ {FD6AA2B9-56DB-4BCC-85E0-7727506562B0} - - netstandard2.0;$(UAPvNextTFM) true @@ -12,9 +10,11 @@ - + + + diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/ref/System.Configuration.cs.REMOVED.git-id b/external/corefx/src/System.Configuration.ConfigurationManager/ref/System.Configuration.cs.REMOVED.git-id index f118ce1e9a..c77c8d1c06 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/ref/System.Configuration.cs.REMOVED.git-id +++ b/external/corefx/src/System.Configuration.ConfigurationManager/ref/System.Configuration.cs.REMOVED.git-id @@ -1 +1 @@ -5124846c60d750bcb536bb4802a339dee73b9d28 \ No newline at end of file +df2016a813e7a5c424756d7375cc553c89d2b8cf \ No newline at end of file diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/src/ApiCompatBaseline.netfx.txt b/external/corefx/src/System.Configuration.ConfigurationManager/src/ApiCompatBaseline.netfx.txt deleted file mode 100644 index f6e50ce077..0000000000 --- a/external/corefx/src/System.Configuration.ConfigurationManager/src/ApiCompatBaseline.netfx.txt +++ /dev/null @@ -1,3 +0,0 @@ -Compat issues with assembly System.Configuration.ConfigurationManager: -InterfacesShouldHaveSameMembers : Implementation interface member 'System.Configuration.Internal.IInternalConfigHost.GetRestrictedPermissions(System.Configuration.Internal.IInternalConfigRecord, System.Security.PermissionSet, System.Boolean)' is not in the contract. -Total Issues: 1 diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/src/MatchingRefApiCompatBaseline.netstandard.txt b/external/corefx/src/System.Configuration.ConfigurationManager/src/MatchingRefApiCompatBaseline.netstandard.txt new file mode 100644 index 0000000000..2e6dadcd82 --- /dev/null +++ b/external/corefx/src/System.Configuration.ConfigurationManager/src/MatchingRefApiCompatBaseline.netstandard.txt @@ -0,0 +1,5 @@ +Compat issues with assembly System.Configuration.ConfigurationManager: +# Cannot remove the serialization constructors because they are needed for serialization +MembersMustExist : Member 'System.Configuration.SettingsAttributeDictionary..ctor(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Configuration.SettingsContext..ctor(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)' does not exist in the implementation but it does exist in the contract. +Total Issues: 2 diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/src/Resources/System.Configuration.ConfigurationManager.rd.xml b/external/corefx/src/System.Configuration.ConfigurationManager/src/Resources/System.Configuration.ConfigurationManager.rd.xml index 987a31bbb6..fdf637c856 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/src/Resources/System.Configuration.ConfigurationManager.rd.xml +++ b/external/corefx/src/System.Configuration.ConfigurationManager/src/Resources/System.Configuration.ConfigurationManager.rd.xml @@ -5,6 +5,8 @@ + + diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj b/external/corefx/src/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj index 6b9ff6aebd..03f10a290a 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj +++ b/external/corefx/src/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj @@ -258,6 +258,7 @@ + diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationSettings.cs b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationSettings.cs index d52e6bdeb3..7ea7cd5d86 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationSettings.cs +++ b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationSettings.cs @@ -8,7 +8,7 @@ namespace System.Configuration { public sealed class ConfigurationSettings { - public ConfigurationSettings() { } + internal ConfigurationSettings() { } [Obsolete("This method is obsolete, it has been replaced by System.Configuration!System.Configuration.ConfigurationManager.AppSettings")] public static NameValueCollection AppSettings diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/DateTimeConfigurationCollection.cs b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/DateTimeConfigurationCollection.cs index 8753785c1a..0587bb3345 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/DateTimeConfigurationCollection.cs +++ b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/DateTimeConfigurationCollection.cs @@ -5,7 +5,7 @@ namespace System.Configuration { [ConfigurationCollection(typeof(DateTimeConfigurationElement))] - public sealed class DateTimeConfigurationCollection : ConfigurationElementCollection + internal sealed class DateTimeConfigurationCollection : ConfigurationElementCollection { private static readonly ConfigurationPropertyCollection s_properties; diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/ImplicitMachineConfigHost.cs b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/ImplicitMachineConfigHost.cs index 16db5162ac..6edbe4d248 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/ImplicitMachineConfigHost.cs +++ b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/ImplicitMachineConfigHost.cs @@ -23,14 +23,14 @@ namespace System.Configuration out string locationConfigPath, IInternalConfigRoot configRoot, params object[] hostInitConfigurationParams) { // Stash the filemap so we can see if the machine config was explicitly specified - _fileMap = (ConfigurationFileMap)hostInitConfigurationParams[0]; + _fileMap = hostInitConfigurationParams[0] as ConfigurationFileMap; base.InitForConfiguration(ref locationSubPath, out configPath, out locationConfigPath, configRoot, hostInitConfigurationParams); } public override void Init(IInternalConfigRoot configRoot, params object[] hostInitParams) { // Stash the filemap so we can see if the machine config was explicitly specified - _fileMap = (ConfigurationFileMap)hostInitParams[0]; + _fileMap = hostInitParams[0] as ConfigurationFileMap; base.Init(configRoot, hostInitParams); } diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/DelegatingConfigHost.cs b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/DelegatingConfigHost.cs index 5d45e6c097..05557ca5a4 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/DelegatingConfigHost.cs +++ b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/DelegatingConfigHost.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.IO; +using System.Security; namespace System.Configuration.Internal { @@ -230,5 +231,11 @@ namespace System.Configuration.Internal public virtual bool IsFullTrustSectionWithoutAptcaAllowed(IInternalConfigRecord configRecord) => true; public virtual IDisposable Impersonate() => new DummyDisposable(); + + public virtual void GetRestrictedPermissions(IInternalConfigRecord configRecord, out PermissionSet permissionSet, out bool isHostReady) + { + permissionSet = new PermissionSet(null); + isHostReady = true; + } } -} \ No newline at end of file +} diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/IInternalConfigHost.cs b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/IInternalConfigHost.cs index fd9de2e209..b45bc31da2 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/IInternalConfigHost.cs +++ b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/IInternalConfigHost.cs @@ -4,6 +4,7 @@ using System.IO; using System.Runtime.InteropServices; +using System.Security; namespace System.Configuration.Internal { @@ -102,5 +103,7 @@ namespace System.Configuration.Internal bool IsFullTrustSectionWithoutAptcaAllowed(IInternalConfigRecord configRecord); IDisposable Impersonate(); + + void GetRestrictedPermissions(IInternalConfigRecord configRecord, out PermissionSet permissionSet, out bool isHostReady); } -} \ No newline at end of file +} diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/IInternalConfigHostPaths.cs b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/IInternalConfigHostPaths.cs index 0bec91956a..d76aedbd3e 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/IInternalConfigHostPaths.cs +++ b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/IInternalConfigHostPaths.cs @@ -6,7 +6,7 @@ using System.Runtime.InteropServices; namespace System.Configuration.Internal { - public interface IInternalConfigHostPaths + internal interface IInternalConfigHostPaths { void RefreshConfigPaths(); bool HasLocalConfig { get; } diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/InternalConfigHost.cs b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/InternalConfigHost.cs index 4fee40ea59..d8cff7ff8e 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/InternalConfigHost.cs +++ b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/InternalConfigHost.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.IO; +using System.Security; namespace System.Configuration.Internal { @@ -303,5 +304,11 @@ namespace System.Configuration.Internal public bool IsFullTrustSectionWithoutAptcaAllowed(IInternalConfigRecord configRecord) => true; public IDisposable Impersonate() => new DummyDisposable(); + + public void GetRestrictedPermissions(IInternalConfigRecord configRecord, out PermissionSet permissionSet, out bool isHostReady) + { + permissionSet = new PermissionSet(null); + isHostReady = true; + } } -} \ No newline at end of file +} diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/WriteFileContext.cs b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/WriteFileContext.cs index 0621afac69..f25103827d 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/WriteFileContext.cs +++ b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/WriteFileContext.cs @@ -5,6 +5,15 @@ using System.IO; using System.Threading; +// The CODEDOM check is here to support frameworks that may not have fully +// incorporated all of corefx, but want to use System.Configuration.ConfigurationManager. +// TempFileCollection was moved in corefx. +#if CODEDOM +using System.CodeDom.Compiler; +#else +using System.IO.Internal; +#endif + namespace System.Configuration.Internal { internal class WriteFileContext @@ -13,14 +22,14 @@ namespace System.Configuration.Internal private const int SavingRetryInterval = 100; // 100 milliseconds private readonly string _templateFilename; - private IO.Internal.TempFileCollection _tempFiles; + private TempFileCollection _tempFiles; internal WriteFileContext(string filename, string templateFilename) { string directoryname = UrlPath.GetDirectoryOrRootName(filename); _templateFilename = templateFilename; - _tempFiles = new IO.Internal.TempFileCollection(directoryname); + _tempFiles = new TempFileCollection(directoryname); try { TempNewFilename = _tempFiles.AddExtension("newcfg"); diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/SectionInformation.cs b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/SectionInformation.cs index 334dc9174f..a19fa80032 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/SectionInformation.cs +++ b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/SectionInformation.cs @@ -584,7 +584,7 @@ namespace System.Configuration // fail silently so that app code can easily loop through sections // and declare all of them? if (force && BaseConfigurationRecord.IsImplicitSection(SectionName)) - throw new ConfigurationErrorsException(SR.Cannot_declare_or_remove_implicit_section); + throw new ConfigurationErrorsException(SR.Format(SR.Cannot_declare_or_remove_implicit_section, SectionName)); if (force && _flags[FlagIsUndeclared]) { @@ -681,4 +681,4 @@ namespace System.Configuration _configRecord.RevertToParent(_configurationSection); } } -} \ No newline at end of file +} diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/SettingValueElement.cs b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/SettingValueElement.cs index 61cd3692a1..8268f68e6f 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/SettingValueElement.cs +++ b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/SettingValueElement.cs @@ -53,7 +53,7 @@ namespace System.Configuration public override int GetHashCode() { - return ValueXml.GetHashCode(); + return ValueXml?.GetHashCode() ?? 0; } protected internal override bool IsModified() diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/TypeUtil.cs b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/TypeUtil.cs index 8c83e42adb..67f16d23b6 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/TypeUtil.cs +++ b/external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/TypeUtil.cs @@ -33,16 +33,6 @@ namespace System.Configuration "mscorlib", "System", - - // TODO: ISSUE #14528 - // System facade isn't currently part of the framework - // package. Once it is added the following locations can - // be removed. There are tests for types from each of - // these locations. - "System.Runtime", - "System.Collections", - "System.Collections.Concurrent", - "System.Collections.Specialized", }; /// @@ -187,4 +177,4 @@ namespace System.Configuration return null; } } -} \ No newline at end of file +} diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/tests/Mono/ConfigurationErrorsExceptionTest.cs b/external/corefx/src/System.Configuration.ConfigurationManager/tests/Mono/ConfigurationErrorsExceptionTest.cs index 6d958e74d6..9d8c52170b 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/tests/Mono/ConfigurationErrorsExceptionTest.cs +++ b/external/corefx/src/System.Configuration.ConfigurationManager/tests/Mono/ConfigurationErrorsExceptionTest.cs @@ -31,6 +31,7 @@ using System; using System.Configuration; using System.Configuration.Internal; using System.IO; +using System.Text.RegularExpressions; using System.Xml; using Xunit; @@ -44,7 +45,12 @@ namespace MonoTests.System.Configuration { ConfigurationErrorsException cee = new ConfigurationErrorsException(); Assert.NotNull(cee.BareMessage); - Assert.True(cee.BareMessage.IndexOf("'" + typeof(ConfigurationErrorsException).FullName + "'") != -1, "#2:" + cee.BareMessage); + + // \p{Pi} any kind of opening quote https://www.compart.com/en/unicode/category/Pi + // \p{Pf} any kind of closing quote https://www.compart.com/en/unicode/category/Pf + // \p{Po} any kind of punctuation character that is not a dash, bracket, quote or connector https://www.compart.com/en/unicode/category/Po + Assert.True(Regex.IsMatch(cee.BareMessage, @"[\p{Pi}\p{Po}]" + Regex.Escape(typeof(ConfigurationErrorsException).FullName) + @"[\p{Pf}\p{Po}]"), "#2:" + cee.BareMessage); + Assert.NotNull(cee.Data); Assert.Equal(0, cee.Data.Count); Assert.Null(cee.Filename); diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/tests/Mono/ConfigurationSectionGroupTest.cs b/external/corefx/src/System.Configuration.ConfigurationManager/tests/Mono/ConfigurationSectionGroupTest.cs index 2cba684d54..758511c8ff 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/tests/Mono/ConfigurationSectionGroupTest.cs +++ b/external/corefx/src/System.Configuration.ConfigurationManager/tests/Mono/ConfigurationSectionGroupTest.cs @@ -46,7 +46,6 @@ namespace MonoTests.System.Configuration } [Fact] - [ActiveIssue(21000, TargetFrameworkMonikers.UapAot)] public void EditAfterAdd() { Config cfg = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None); diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj b/external/corefx/src/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj index b74cdf5517..8a7f27b9a1 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj +++ b/external/corefx/src/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj @@ -90,9 +90,11 @@ + + @@ -104,5 +106,11 @@ + + + {69e46a6f-9966-45a5-8945-2559fe337827} + RemoteExecutorConsoleApp + + \ No newline at end of file diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/ImplicitMachineConfigTests.cs b/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/ImplicitMachineConfigTests.cs index 047d93c6cd..5002173701 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/ImplicitMachineConfigTests.cs +++ b/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/ImplicitMachineConfigTests.cs @@ -2,7 +2,9 @@ // 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; using System.Configuration; +using System.Configuration.Internal; using System.IO; using Xunit; @@ -61,5 +63,24 @@ namespace System.ConfigurationTests Assert.Null(config.AppSettings); } } + + [Fact] + public void EnsureInitWithDifferentOrderHostParams() + { + string assemblyName = PlatformDetection.IsFullFramework ? "System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" : "System.Configuration.ConfigurationManager"; + + // InternalConfigFactory allows you to specify your own host / hostInitParams + // Ensure ImplictMachineConfigHost can init within this process and not throw an Invalid cast exception + using (var temp = new TempConfig(TestData.EmptyConfig)) + { + string typeName = "System.Configuration.Internal.InternalConfigConfigurationFactory, " + assemblyName; + + Type type = Type.GetType(typeName, true); + var configFactory = (IInternalConfigConfigurationFactory) Activator.CreateInstance(type, true); + var config = configFactory.Create(typeof(TempConfigurationHost), "test", new ConfigurationFileMap(temp.ConfigPath), "test"); + + Assert.NotNull(config); + } + } } } diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/SectionGroupsTests.cs b/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/SectionGroupsTests.cs index 89bb630bb2..1154858fd9 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/SectionGroupsTests.cs +++ b/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/SectionGroupsTests.cs @@ -54,7 +54,6 @@ namespace System.ConfigurationTests [Fact] [ActiveIssue("dotnet/corefx #19383", TargetFrameworkMonikers.NetFramework)] - [ActiveIssue(21000, TargetFrameworkMonikers.UapAot)] public void SimpleSectionGroup() { using (var temp = new TempConfig(SimpleSectionGroupConfiguration)) diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/SettingElementTests.cs b/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/SettingElementTests.cs new file mode 100644 index 0000000000..0e50a98f99 --- /dev/null +++ b/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/SettingElementTests.cs @@ -0,0 +1,80 @@ +// 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 Xunit; + +namespace System.Configuration.Tests +{ + public class SettingElementTests + { + [Fact] + public void TestForInequality() + { + var ElementOne = new SettingElement("NotEqualOne", SettingsSerializeAs.String); + var ElementTwo = new SettingElement("NotEqualTwo", SettingsSerializeAs.String); + Assert.False(ElementOne.Equals(ElementTwo)); + } + + [Fact] + public void TestForEquality() + { + var ElementOne = new SettingElement("TheExactSameName", SettingsSerializeAs.String); + var ElementTwo = new SettingElement("TheExactSameName", SettingsSerializeAs.String); + Assert.True(ElementOne.Equals(ElementTwo)); + } + + [Fact] + public void DefaultSettingSerializationIsString() + { + var Element = new SettingElement(); + Assert.Equal(SettingsSerializeAs.String, Element.SerializeAs); + } + + [Fact] + public void DefaultNameIsEmptyString() + { + var Element = new SettingElement(); + Assert.Equal(string.Empty, Element.Name); + } + + [Fact] + public void DefaultValueIsNull() + { + var Element = new SettingElement(); + Assert.Equal(null, Element.Value.CurrentConfiguration); + } + + [Fact] + public void DefaultConstructorEquality() + { + var ElementOne = new SettingElement(); + var ElementTwo = new SettingElement(); + Assert.True(ElementOne.Equals(ElementTwo)); + } + + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Full framework does not have the fix for #27875")] + [Fact] + public void DefaultConstructorEqualHashCodes() + { + var ElementOne = new SettingElement(); + var ElementTwo = new SettingElement(); + Assert.Equal(ElementOne.GetHashCode(), ElementTwo.GetHashCode()); + } + + [Fact] + public void NonDefaultValueHasNonNullHashCode() + { + var Element = new SettingElement("Test", SettingsSerializeAs.Xml) + { + Value = new SettingValueElement + { + ValueXml = new ConfigXmlDocument + { + } + } + }; + Assert.NotNull(Element.GetHashCode()); + } + } +} diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/TempConfigurationHost.cs b/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/TempConfigurationHost.cs new file mode 100644 index 0000000000..304fd32fa0 --- /dev/null +++ b/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/TempConfigurationHost.cs @@ -0,0 +1,90 @@ +using System; +using System.Configuration; +using System.Configuration.Internal; +using System.Reflection; + +public class TempConfigurationHost : DelegatingConfigHost +{ + private static string s_assemblyName = PlatformDetection.IsFullFramework ? "System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" : "System.Configuration.ConfigurationManager"; + private static IInternalConfigConfigurationFactory s_configurationFactory; + + private ConfigurationFileMap _fileMap; + + public TempConfigurationHost() + { + Type type = Type.GetType(InternalHostTypeName, true); + Host = (IInternalConfigHost) Activator.CreateInstance(type, true); + } + + public override void Init(IInternalConfigRoot configRoot, params object[] hostInitParams) + { + Host.Init(configRoot, hostInitParams); + } + + public override void InitForConfiguration(ref string locationSubPath, out string configPath, out string locationConfigPath, + IInternalConfigRoot configRoot, params object[] hostInitConfigurationParams) + { + + Host.Init(configRoot, hostInitConfigurationParams); + + _fileMap = hostInitConfigurationParams[1] as ConfigurationFileMap; + + locationSubPath = ConfigurationFactory.NormalizeLocationSubPath(locationSubPath, null); + configPath = "MACHINE/EXE"; + locationConfigPath = locationSubPath; + } + + public override bool IsTrustedConfigPath(string configPath) + { + return true; + } + + public override bool IsLocationApplicable(string configPath) + { + return true; + } + + public override bool IsFullTrustSectionWithoutAptcaAllowed(IInternalConfigRecord configRecord) + { + return true; + } + + public override bool PrefetchAll(string configPath, string streamName) + { + return false; + } + + public override bool PrefetchSection(string sectionGroupName, string sectionName) + { + return false; + } + + public override string GetStreamName(string configPath) + { + return _fileMap.MachineConfigFilename; + } + + static string InternalConfigConfigurationFactoryTypeName + { + get { return "System.Configuration.Internal.InternalConfigConfigurationFactory, " + s_assemblyName; } + } + + static string InternalHostTypeName + { + get { return "System.Configuration.Internal.InternalConfigHost, " + s_assemblyName; } + } + + static internal IInternalConfigConfigurationFactory ConfigurationFactory + { + get + { + if (s_configurationFactory == null) + { + Type type = Type.GetType(InternalConfigConfigurationFactoryTypeName, true); + s_configurationFactory = (IInternalConfigConfigurationFactory) Activator.CreateInstance(type, true); + } + + return s_configurationFactory; + } + } +} \ No newline at end of file diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/TimeSpanValidatorAttributeTests.cs b/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/TimeSpanValidatorAttributeTests.cs index 4c9ae4abb2..89fe0e07cd 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/TimeSpanValidatorAttributeTests.cs +++ b/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/TimeSpanValidatorAttributeTests.cs @@ -3,11 +3,14 @@ // See the LICENSE file in the project root for more information. using System.Configuration; +using System.Diagnostics; +using System.Globalization; + using Xunit; namespace System.ConfigurationTests { - public class TimeSpanValidatorAttributeTests + public class TimeSpanValidatorAttributeTests : RemoteExecutorTestBase { [Fact] public void MinValueString_GetString() @@ -111,27 +114,41 @@ namespace System.ConfigurationTests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot,"Exception messages are different")] + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Exception messages are different")] public void MinValueString_TooSmall() { - TimeSpanValidatorAttribute attribute = new TimeSpanValidatorAttribute(); + RemoteInvoke(() => + { + CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture; - attribute.MaxValueString = new TimeSpan(2, 2, 2, 2).ToString(); - ArgumentOutOfRangeException result = Assert.Throws(() => attribute.MinValueString = new TimeSpan(3, 3, 3, 3).ToString()); - ArgumentOutOfRangeException expectedException = new ArgumentOutOfRangeException("value", SR.Validator_min_greater_than_max); - Assert.Equal(expectedException.Message, result.Message); + TimeSpanValidatorAttribute attribute = new TimeSpanValidatorAttribute(); + + attribute.MaxValueString = new TimeSpan(2, 2, 2, 2).ToString(); + ArgumentOutOfRangeException result = Assert.Throws(() => + attribute.MinValueString = new TimeSpan(3, 3, 3, 3).ToString()); + ArgumentOutOfRangeException expectedException = + new ArgumentOutOfRangeException("value", SR.Validator_min_greater_than_max); + Assert.Equal(expectedException.Message, result.Message); + }).Dispose(); } [Fact] [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Exception messages are different")] public void MaxValueString_TooBig() { - TimeSpanValidatorAttribute attribute = new TimeSpanValidatorAttribute(); + RemoteInvoke(() => + { + CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture; - attribute.MinValueString = new TimeSpan(2, 2, 2, 2).ToString(); - ArgumentOutOfRangeException result = Assert.Throws(() => attribute.MaxValueString = new TimeSpan(1, 1, 1, 1).ToString()); - ArgumentOutOfRangeException expectedException = new ArgumentOutOfRangeException("value", SR.Validator_min_greater_than_max); - Assert.Equal(expectedException.Message, result.Message); + TimeSpanValidatorAttribute attribute = new TimeSpanValidatorAttribute(); + + attribute.MinValueString = new TimeSpan(2, 2, 2, 2).ToString(); + ArgumentOutOfRangeException result = Assert.Throws(() => + attribute.MaxValueString = new TimeSpan(1, 1, 1, 1).ToString()); + ArgumentOutOfRangeException expectedException = + new ArgumentOutOfRangeException("value", SR.Validator_min_greater_than_max); + Assert.Equal(expectedException.Message, result.Message); + }).Dispose(); } } } diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/TypeUtilTests.cs b/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/TypeUtilTests.cs index 86e9d98b10..4309355d6c 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/TypeUtilTests.cs +++ b/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/TypeUtilTests.cs @@ -8,6 +8,7 @@ using System.Collections.Specialized; using System.Configuration; using System.Configuration.Internal; using System.IO; +using System.Security; using Xunit; namespace System.ConfigurationTests @@ -299,6 +300,11 @@ namespace System.ConfigurationTests { throw new NotImplementedException(); } + + void IInternalConfigHost.GetRestrictedPermissions(IInternalConfigRecord configRecord, out PermissionSet permissionSet, out bool isHostReady) + { + throw new NotImplementedException(); + } } } } diff --git a/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/UriSectionTests.cs b/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/UriSectionTests.cs index d31a9434d5..4ba5bbfbbc 100644 --- a/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/UriSectionTests.cs +++ b/external/corefx/src/System.Configuration.ConfigurationManager/tests/System/Configuration/UriSectionTests.cs @@ -39,7 +39,6 @@ namespace System.ConfigurationTests "; [Fact] - [ActiveIssue(21000, TargetFrameworkMonikers.UapAot)] public void UriSectionIdnIriParsing() { using (var temp = new TempConfig(PlatformDetection.IsFullFramework ? UriSectionConfiguration_NetFX : UriSectionConfiguration_Core)) @@ -52,7 +51,6 @@ namespace System.ConfigurationTests } [Fact] - [ActiveIssue(21000, TargetFrameworkMonikers.UapAot)] public void UriSectionSchemeSettings() { using (var temp = new TempConfig(PlatformDetection.IsFullFramework ? UriSectionConfiguration_NetFX : UriSectionConfiguration_Core)) diff --git a/external/corefx/src/System.Console/src/FxCopBaseline.cs b/external/corefx/src/System.Console/src/FxCopBaseline.cs index c49b860f9b..fd02c4dea9 100644 --- a/external/corefx/src/System.Console/src/FxCopBaseline.cs +++ b/external/corefx/src/System.Console/src/FxCopBaseline.cs @@ -1,3 +1,7 @@ +// 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.CodeAnalysis; [assembly: SuppressMessage("Microsoft.Reliability", "CA2002:DoNotLockOnObjectsWithWeakIdentity", Scope = "member", Target = "System.IO.SyncTextReader.#Dispose(System.Boolean)")] @@ -48,4 +52,4 @@ using System.Diagnostics.CodeAnalysis; [assembly: SuppressMessage("Microsoft.Reliability", "CA2002:DoNotLockOnObjectsWithWeakIdentity", Scope = "member", Target = "System.ConsolePal.#EnsureInitializedCore()")] [assembly: SuppressMessage("Microsoft.Reliability", "CA2002:DoNotLockOnObjectsWithWeakIdentity", Scope = "member", Target = "System.ConsolePal.#WriteStdoutAnsiString(System.String)")] [assembly: SuppressMessage("Microsoft.Reliability", "CA2002:DoNotLockOnObjectsWithWeakIdentity", Scope = "member", Target = "System.ConsolePal.#ForegroundColor")] -[assembly: SuppressMessage("Microsoft.Reliability", "CA2002:DoNotLockOnObjectsWithWeakIdentity", Scope = "member", Target = "System.ConsolePal.#BackgroundColor")] \ No newline at end of file +[assembly: SuppressMessage("Microsoft.Reliability", "CA2002:DoNotLockOnObjectsWithWeakIdentity", Scope = "member", Target = "System.ConsolePal.#BackgroundColor")] diff --git a/external/corefx/src/System.Console/src/Resources/Strings.resx b/external/corefx/src/System.Console/src/Resources/Strings.resx index a094a27e1a..fe296c62fc 100644 --- a/external/corefx/src/System.Console/src/Resources/Strings.resx +++ b/external/corefx/src/System.Console/src/Resources/Strings.resx @@ -258,4 +258,7 @@ The path '{0}' is too long, or a component of the specified path is too long. + + The terminfo database has an invalid magic number: '{0}'. + \ No newline at end of file diff --git a/external/corefx/src/System.Console/src/System.Console.csproj b/external/corefx/src/System.Console/src/System.Console.csproj index 27638b70f8..80830962e9 100644 --- a/external/corefx/src/System.Console/src/System.Console.csproj +++ b/external/corefx/src/System.Console/src/System.Console.csproj @@ -167,8 +167,8 @@ Common\System\IO\EncodingHelper.Windows.cs - - Common\System\IO\Win32Marshal.cs + + Common\CoreLib\System\IO\Win32Marshal.cs @@ -186,8 +186,8 @@ Common\System\IO\PersistedFiles.Names.Unix.cs - - Common\System\IO\StringBuilderCache.cs + + Common\System\Text\StringBuilderCache.cs Common\System\Text\EncodingHelper.Unix.cs @@ -275,6 +275,7 @@ + @@ -282,6 +283,7 @@ + diff --git a/external/corefx/src/System.Console/src/System/Console.cs b/external/corefx/src/System.Console/src/System/Console.cs index 9452d64372..77194f3e9a 100644 --- a/external/corefx/src/System.Console/src/System/Console.cs +++ b/external/corefx/src/System.Console/src/System/Console.cs @@ -22,8 +22,8 @@ namespace System private static bool s_isOutTextWriterRedirected = false; private static bool s_isErrorTextWriterRedirected = false; - private static ConsoleCancelEventHandler _cancelCallbacks; - private static ConsolePal.ControlCHandlerRegistrar _registrar; + private static ConsoleCancelEventHandler s_cancelCallbacks; + private static ConsolePal.ControlCHandlerRegistrar s_registrar; internal static T EnsureInitialized(ref T field, Func initializer) where T : class => LazyInitializer.EnsureInitialized(ref field, ref InternalSyncObject, initializer); @@ -334,13 +334,13 @@ namespace System { lock (InternalSyncObject) { - _cancelCallbacks += value; + s_cancelCallbacks += value; // If we haven't registered our control-C handler, do it. - if (_registrar == null) + if (s_registrar == null) { - _registrar = new ConsolePal.ControlCHandlerRegistrar(); - _registrar.Register(); + s_registrar = new ConsolePal.ControlCHandlerRegistrar(); + s_registrar.Register(); } } } @@ -348,11 +348,11 @@ namespace System { lock (InternalSyncObject) { - _cancelCallbacks -= value; - if (_registrar != null && _cancelCallbacks == null) + s_cancelCallbacks -= value; + if (s_registrar != null && s_cancelCallbacks == null) { - _registrar.Unregister(); - _registrar = null; + s_registrar.Unregister(); + s_registrar = null; } } } @@ -688,68 +688,17 @@ namespace System Out.Write(value); } - private sealed class ControlCDelegateData - { - private readonly ConsoleSpecialKey _controlKey; - private readonly ConsoleCancelEventHandler _cancelCallbacks; - - internal bool Cancel; - internal bool DelegateStarted; - - internal ControlCDelegateData(ConsoleSpecialKey controlKey, ConsoleCancelEventHandler cancelCallbacks) - { - _controlKey = controlKey; - _cancelCallbacks = cancelCallbacks; - } - - // This is the worker delegate that is called on the Threadpool thread to fire the actual events. It sets the DelegateStarted flag so - // the thread that queued the work to the threadpool knows it has started (since it does not want to block indefinitely on the task - // to start). - internal void HandleBreakEvent() - { - DelegateStarted = true; - var args = new ConsoleCancelEventArgs(_controlKey); - _cancelCallbacks(null, args); - Cancel = args.Cancel; - } - } - internal static bool HandleBreakEvent(ConsoleSpecialKey controlKey) { - // The thread that this gets called back on has a very small stack on some systems. There is - // not enough space to handle a managed exception being caught and thrown. So, run a task - // on the threadpool for the actual event callback. - - // To avoid the race condition between remove handler and raising the event - ConsoleCancelEventHandler cancelCallbacks = Console._cancelCallbacks; - if (cancelCallbacks == null) + ConsoleCancelEventHandler handler = s_cancelCallbacks; + if (handler == null) { return false; } - var delegateData = new ControlCDelegateData(controlKey, cancelCallbacks); - Task callBackTask = Task.Factory.StartNew( - d => ((ControlCDelegateData)d).HandleBreakEvent(), - delegateData, - CancellationToken.None, - TaskCreationOptions.DenyChildAttach, - TaskScheduler.Default); - - // Block until the delegate is done. We need to be robust in the face of the task not executing - // but we also want to get control back immediately after it is done and we don't want to give the - // handler a fixed time limit in case it needs to display UI. Wait on the task twice, once with a - // timeout and a second time without if we are sure that the handler actually started. - TimeSpan controlCWaitTime = new TimeSpan(0, 0, 30); // 30 seconds - callBackTask.Wait(controlCWaitTime); - - if (!delegateData.DelegateStarted) - { - Debug.Assert(false, "The task to execute the handler did not start within 30 seconds."); - return false; - } - - callBackTask.Wait(); - return delegateData.Cancel; + var args = new ConsoleCancelEventArgs(controlKey); + handler(null, args); + return args.Cancel; } } } diff --git a/external/corefx/src/System.Console/src/System/ConsoleKeyInfo.cs b/external/corefx/src/System.Console/src/System/ConsoleKeyInfo.cs index 8a1db80b6d..ff254d2a94 100644 --- a/external/corefx/src/System.Console/src/System/ConsoleKeyInfo.cs +++ b/external/corefx/src/System.Console/src/System/ConsoleKeyInfo.cs @@ -4,6 +4,9 @@ namespace System { +#if MONO + [Serializable] +#endif public readonly struct ConsoleKeyInfo { private readonly char _keyChar; diff --git a/external/corefx/src/System.Console/src/System/ConsolePal.Unix.cs b/external/corefx/src/System.Console/src/System/ConsolePal.Unix.cs index 7be909bab5..495296b4d8 100644 --- a/external/corefx/src/System.Console/src/System/ConsolePal.Unix.cs +++ b/external/corefx/src/System.Console/src/System/ConsolePal.Unix.cs @@ -4,6 +4,7 @@ using Microsoft.Win32.SafeHandles; using System.Collections.Generic; +using System.ComponentModel; using System.Diagnostics; using System.IO; using System.Text; @@ -98,6 +99,16 @@ namespace System bool previouslyProcessed; ConsoleKeyInfo keyInfo = StdInReader.ReadKey(out previouslyProcessed); + + // Replace the '\n' char for Enter by '\r' to match Windows behavior. + if (keyInfo.Key == ConsoleKey.Enter && keyInfo.KeyChar == '\n') + { + bool shift = (keyInfo.Modifiers & ConsoleModifiers.Shift) != 0; + bool alt = (keyInfo.Modifiers & ConsoleModifiers.Alt) != 0; + bool control = (keyInfo.Modifiers & ConsoleModifiers.Control) != 0; + keyInfo = new ConsoleKeyInfo('\r', keyInfo.Key, shift, alt, control); + } + if (!intercept && !previouslyProcessed) Console.Write(keyInfo.KeyChar); return keyInfo; } @@ -666,7 +677,7 @@ namespace System // signal handlers, etc. if (!Interop.Sys.InitializeConsole()) { - throw Interop.GetExceptionForIoErrno(Interop.Sys.GetLastErrorInfo()); + throw new Win32Exception(); } // Provide the native lib with the correct code from the terminfo to transition us into @@ -1115,6 +1126,5 @@ namespace System Interop.Sys.UnregisterForCtrl(); } } - } } diff --git a/external/corefx/src/System.Console/src/System/ConsolePal.Windows.cs b/external/corefx/src/System.Console/src/System/ConsolePal.Windows.cs index 2f07290e00..b023652103 100644 --- a/external/corefx/src/System.Console/src/System/ConsolePal.Windows.cs +++ b/external/corefx/src/System.Console/src/System/ConsolePal.Windows.cs @@ -963,14 +963,14 @@ namespace System if (csbi.dwSize.X < csbi.srWindow.Left + width) { if (csbi.srWindow.Left >= short.MaxValue - width) - throw new ArgumentOutOfRangeException(nameof(width), SR.ArgumentOutOfRange_ConsoleWindowBufferSize); + throw new ArgumentOutOfRangeException(nameof(width), SR.Format(SR.ArgumentOutOfRange_ConsoleWindowBufferSize, short.MaxValue - width)); size.X = (short)(csbi.srWindow.Left + width); resizeBuffer = true; } if (csbi.dwSize.Y < csbi.srWindow.Top + height) { if (csbi.srWindow.Top >= short.MaxValue - height) - throw new ArgumentOutOfRangeException(nameof(height), SR.ArgumentOutOfRange_ConsoleWindowBufferSize); + throw new ArgumentOutOfRangeException(nameof(height), SR.Format(SR.ArgumentOutOfRange_ConsoleWindowBufferSize, short.MaxValue - height)); size.Y = (short)(csbi.srWindow.Top + height); resizeBuffer = true; } diff --git a/external/corefx/src/System.Console/src/System/IO/StdInReader.cs b/external/corefx/src/System.Console/src/System/IO/StdInReader.cs index f5f291877b..eda2d9a500 100644 --- a/external/corefx/src/System.Console/src/System/IO/StdInReader.cs +++ b/external/corefx/src/System.Console/src/System/IO/StdInReader.cs @@ -341,7 +341,7 @@ namespace System.IO /// /// Try to intercept the key pressed. /// - /// Unlike Windows Unix has no concept of virtual key codes. + /// Unlike Windows, Unix has no concept of virtual key codes. /// Hence, in case we do not recognize a key, we can't really /// get the ConsoleKey key code associated with it. /// As a result, we try to recognize the key, and if that does diff --git a/external/corefx/src/System.Console/src/System/TermInfo.cs b/external/corefx/src/System.Console/src/System/TermInfo.cs index c84aaf9d03..ffccbf650e 100644 --- a/external/corefx/src/System.Console/src/System/TermInfo.cs +++ b/external/corefx/src/System.Console/src/System/TermInfo.cs @@ -107,6 +107,10 @@ namespace System private readonly int _stringSectionNumOffsets; /// The number of bytes in the strings table of the database. private readonly int _stringTableNumBytes; + /// Whether or not to read the number section as 32-bit integers. + private readonly bool _readAs32Bit; + /// The size of the integers on the number section. + private readonly int _sizeOfInt; /// Extended / user-defined entries in the terminfo database. private readonly Dictionary _extendedStrings; @@ -119,11 +123,14 @@ namespace System _term = term; _data = data; - // See "man term" for the file format. - if (ReadInt16(data, 0) != 0x11A) // magic number octal 0432 - { - throw new InvalidOperationException(SR.IO_TermInfoInvalid); - } + const int MagicLegacyNumber = 0x11A; // magic number octal 0432 for legacy ncurses terminfo + const int Magic32BitNumber = 0x21E; // magic number octal 01036 for new ncruses terminfo + short magic = ReadInt16(data, 0); + _readAs32Bit = + magic == MagicLegacyNumber ? false : + magic == Magic32BitNumber ? true : + throw new InvalidOperationException(SR.Format(SR.IO_TermInfoInvalidMagicNumber, String.Concat("O" + Convert.ToString(magic, 8)))); // magic number was not recognized. Printing the magic number in octal. + _sizeOfInt = (_readAs32Bit) ? 4 : 2; _nameSectionNumBytes = ReadInt16(data, 2); _boolSectionNumBytes = ReadInt16(data, 4); @@ -147,7 +154,7 @@ namespace System // (Note that the extended section also includes other Booleans and numbers, but we don't // have any need for those now, so we don't parse them.) int extendedBeginning = RoundUpToEven(StringsTableOffset + _stringTableNumBytes); - _extendedStrings = ParseExtendedStrings(data, extendedBeginning) ?? new Dictionary(); + _extendedStrings = ParseExtendedStrings(data, extendedBeginning, _readAs32Bit) ?? new Dictionary(); } /// The name of the associated terminfo, if any. @@ -278,7 +285,7 @@ namespace System /// The offset into data where the string offsets section begins. We index into this section /// to find the location within the strings table where a string value exists. /// - private int StringOffsetsOffset { get { return NumbersOffset + (_numberSectionNumShorts * 2); } } + private int StringOffsetsOffset { get { return NumbersOffset + (_numberSectionNumShorts * _sizeOfInt); } } /// The offset into data where the string table exists. private int StringsTableOffset { get { return StringOffsetsOffset + (_stringSectionNumOffsets * 2); } } @@ -346,9 +353,10 @@ namespace System /// defined as the earlier portions, and may not even exist, the parsing is more lenient about /// errors, returning an empty collection rather than throwing. /// - private static Dictionary ParseExtendedStrings(byte[] data, int extendedBeginning) + private static Dictionary ParseExtendedStrings(byte[] data, int extendedBeginning, bool readAs32Bit) { const int ExtendedHeaderSize = 10; + int sizeOfIntValuesInBytes = (readAs32Bit) ? 4 : 2; if (extendedBeginning + ExtendedHeaderSize >= data.Length) { // Exit out as there's no extended information. @@ -357,10 +365,10 @@ namespace System // Read in extended counts, and exit out if we got any incorrect info int extendedBoolCount = ReadInt16(data, extendedBeginning); - int extendedNumberCount = ReadInt16(data, extendedBeginning + 2); - int extendedStringCount = ReadInt16(data, extendedBeginning + 4); - int extendedStringNumOffsets = ReadInt16(data, extendedBeginning + 6); - int extendedStringTableByteSize = ReadInt16(data, extendedBeginning + 8); + int extendedNumberCount = ReadInt16(data, extendedBeginning + (2 * 1)); + int extendedStringCount = ReadInt16(data, extendedBeginning + (2 * 2)); + int extendedStringNumOffsets = ReadInt16(data, extendedBeginning + (2 * 3)); + int extendedStringTableByteSize = ReadInt16(data, extendedBeginning + (2 * 4)); if (extendedBoolCount < 0 || extendedNumberCount < 0 || extendedStringCount < 0 || @@ -380,7 +388,7 @@ namespace System extendedBeginning + // go past the normal data ExtendedHeaderSize + // and past the extended header RoundUpToEven(extendedBoolCount) + // and past all of the extended Booleans - (extendedNumberCount * 2); // and past all of the extended numbers + (extendedNumberCount * sizeOfIntValuesInBytes); // and past all of the extended numbers // Get the location where the extended string table begins. This area contains // null-terminated strings. @@ -447,6 +455,14 @@ namespace System private static int RoundUpToEven(int i) { return i % 2 == 1 ? i + 1 : i; } + /// Read a 16-bit or 32-bit value from the buffer starting at the specified position. + /// The buffer from which to read. + /// The position at which to read. + /// Whether or not to read value as 32-bit. Will read as 16-bit if set to false. + /// The value read. + private static int ReadInt(byte[] buffer, int pos, bool readAs32Bit) => + readAs32Bit ? ReadInt32(buffer, pos) : ReadInt16(buffer, pos); + /// Read a 16-bit value from the buffer starting at the specified position. /// The buffer from which to read. /// The position at which to read. @@ -458,6 +474,18 @@ namespace System ((int)buffer[pos] & 0xff))); } + /// Read a 32-bit value from the buffer starting at the specified position. + /// The buffer from which to read. + /// The position at which to read. + /// The 32-bit value read. + private static int ReadInt32(byte[] buffer, int pos) + { + return (int)((buffer[pos] & 0xff) | + buffer[pos + 1] << 8 | + buffer[pos + 2] << 16 | + buffer[pos + 3] << 24); + } + /// Reads a string from the buffer starting at the specified position. /// The buffer from which to read. /// The position at which to read. diff --git a/external/corefx/src/System.Console/tests/System.Console.Tests.csproj b/external/corefx/src/System.Console/tests/System.Console.Tests.csproj index f78bd81fcf..f53566710c 100644 --- a/external/corefx/src/System.Console/tests/System.Console.Tests.csproj +++ b/external/corefx/src/System.Console/tests/System.Console.Tests.csproj @@ -36,6 +36,11 @@ + + + %(RecursiveDir)%(Filename)%(Extension) + + @@ -55,5 +60,11 @@ RemoteExecutorConsoleApp + + + + + + \ No newline at end of file diff --git a/external/corefx/src/System.Console/tests/TermInfo.cs b/external/corefx/src/System.Console/tests/TermInfo.cs index f5f5945c34..fe5185ad15 100644 --- a/external/corefx/src/System.Console/tests/TermInfo.cs +++ b/external/corefx/src/System.Console/tests/TermInfo.cs @@ -58,6 +58,15 @@ public class TermInfo Assert.True(foundAtLeastOne, "Didn't find any terminfo files"); } + [Fact] + [PlatformSpecific(TestPlatforms.AnyUnix)] // Tests TermInfo + public void VerifyTermInfoSupportsNewAndLegacyNcurses() + { + MethodInfo readDbMethod = typeof(Console).GetTypeInfo().Assembly.GetType(TerminfoDatabaseType).GetTypeInfo().GetDeclaredMethods(ReadDatabaseMethod).Where(m => m.GetParameters().Count() == 2).Single(); + readDbMethod.Invoke(null, new object[] { "xterm", "ncursesFormats" }); // This will throw InvalidOperationException in case we don't support the legacy format + readDbMethod.Invoke(null, new object[] { "screen-256color", "ncursesFormats" }); // This will throw InvalidOperationException if we can't parse the new format + } + [Theory] [PlatformSpecific(TestPlatforms.AnyUnix)] // Tests TermInfo [InlineData("xterm-256color", "\u001B\u005B\u00330m", "\u001B\u005B\u00340m", 0)] diff --git a/external/corefx/src/System.Console/tests/TestData/ncursesFormats/s/screen-256color b/external/corefx/src/System.Console/tests/TestData/ncursesFormats/s/screen-256color new file mode 100644 index 0000000000..75c536ea2c Binary files /dev/null and b/external/corefx/src/System.Console/tests/TestData/ncursesFormats/s/screen-256color differ diff --git a/external/corefx/src/System.Console/tests/TestData/ncursesFormats/x/xterm b/external/corefx/src/System.Console/tests/TestData/ncursesFormats/x/xterm new file mode 100644 index 0000000000..f63104055e Binary files /dev/null and b/external/corefx/src/System.Console/tests/TestData/ncursesFormats/x/xterm differ diff --git a/external/corefx/src/System.Data.Common/ref/System.Data.Common.cs.REMOVED.git-id b/external/corefx/src/System.Data.Common/ref/System.Data.Common.cs.REMOVED.git-id index fec9f79f26..e49a6334b3 100644 --- a/external/corefx/src/System.Data.Common/ref/System.Data.Common.cs.REMOVED.git-id +++ b/external/corefx/src/System.Data.Common/ref/System.Data.Common.cs.REMOVED.git-id @@ -1 +1 @@ -64dd4c072a27ee8181a8b82d38ddca159b09ec9c \ No newline at end of file +ce1f1c68e260f4da0f4f67736ddc321307f2e160 \ No newline at end of file diff --git a/external/corefx/src/System.Data.Common/ref/System.Data.Common.csproj b/external/corefx/src/System.Data.Common/ref/System.Data.Common.csproj index 6dc2f123b3..688a56740c 100644 --- a/external/corefx/src/System.Data.Common/ref/System.Data.Common.csproj +++ b/external/corefx/src/System.Data.Common/ref/System.Data.Common.csproj @@ -3,7 +3,7 @@ {D2DB0D6F-F65E-4174-B31E-27DC03137118} - true + $(NoWarn);0618 @@ -12,17 +12,7 @@ - - - - - - - - - - - + diff --git a/external/corefx/src/System.Data.Common/ref/System.Data.Common.netcoreapp.cs b/external/corefx/src/System.Data.Common/ref/System.Data.Common.netcoreapp.cs deleted file mode 100644 index 94df2006ad..0000000000 --- a/external/corefx/src/System.Data.Common/ref/System.Data.Common.netcoreapp.cs +++ /dev/null @@ -1,22 +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. - -// ------------------------------------------------------------------------------ -// Changes to this file must follow the http://aka.ms/api-review process. -// ------------------------------------------------------------------------------ - -using System.Collections.Generic; - -namespace System.Data.Common -{ - public static partial class DbProviderFactories - { - public static void RegisterFactory(string providerInvariantName, string factoryTypeAssemblyQualifiedName) { throw null; } - public static void RegisterFactory(string providerInvariantName, Type factoryType) { throw null; } - public static void RegisterFactory(string providerInvariantName, DbProviderFactory factory) { throw null; } - public static bool TryGetFactory(string providerInvariantName, out DbProviderFactory factory) { throw null; } - public static bool UnregisterFactory(string providerInvariantName) { throw null; } - public static IEnumerable GetProviderInvariantNames() { throw null; } - } -} diff --git a/external/corefx/src/System.Data.Common/src/MatchingRefApiCompatBaseline.uapaot.txt b/external/corefx/src/System.Data.Common/src/MatchingRefApiCompatBaseline.uapaot.txt new file mode 100644 index 0000000000..a3f04a7468 --- /dev/null +++ b/external/corefx/src/System.Data.Common/src/MatchingRefApiCompatBaseline.uapaot.txt @@ -0,0 +1,2 @@ +#Exposed publicly in only in uapaot implementation to enable reflection on this type +TypesMustExist : Type 'System.Data.DataCommonEventSource' does not exist in the implementation but it does exist in the contract. diff --git a/external/corefx/src/System.Data.Common/src/System/Data/Common/NameValuePermission.cs b/external/corefx/src/System.Data.Common/src/System/Data/Common/NameValuePermission.cs index 1deeb5140d..fa091e2b41 100644 --- a/external/corefx/src/System.Data.Common/src/System/Data/Common/NameValuePermission.cs +++ b/external/corefx/src/System.Data.Common/src/System/Data/Common/NameValuePermission.cs @@ -1,6 +1,6 @@ -//// 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. +// 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.Data.Common //{ diff --git a/external/corefx/src/System.Data.Common/src/System/Data/Common/SqlUDTStorage.cs b/external/corefx/src/System.Data.Common/src/System/Data/Common/SqlUDTStorage.cs index 1ce6e1bf55..20f61490a7 100644 --- a/external/corefx/src/System.Data.Common/src/System/Data/Common/SqlUDTStorage.cs +++ b/external/corefx/src/System.Data.Common/src/System/Data/Common/SqlUDTStorage.cs @@ -7,9 +7,10 @@ using System.Xml; using System.IO; using System.Xml.Serialization; using System.Collections; -using System.Collections.Generic; using System.Diagnostics; using System.Runtime.CompilerServices; +using System.Collections.Concurrent; +using System.Reflection; namespace System.Data.Common { @@ -19,7 +20,7 @@ namespace System.Data.Common private readonly bool _implementsIXmlSerializable = false; private readonly bool _implementsIComparable = false; - private static readonly Dictionary s_typeToNull = new Dictionary(); + private static readonly ConcurrentDictionary s_typeToNull = new ConcurrentDictionary(); public SqlUdtStorage(DataColumn column, Type type) : this(column, type, GetStaticNullForUdtType(type)) @@ -34,36 +35,22 @@ namespace System.Data.Common } // to support oracle types and other INUllable types that have static Null as field - internal static object GetStaticNullForUdtType(Type type) + internal static object GetStaticNullForUdtType(Type type) => s_typeToNull.GetOrAdd(type, t => { - object value; - if (!s_typeToNull.TryGetValue(type, out value)) + PropertyInfo propInfo = type.GetProperty("Null", BindingFlags.Public | BindingFlags.Static); + if (propInfo != null) { - System.Reflection.PropertyInfo propInfo = type.GetProperty("Null", System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static); - if (propInfo != null) - value = propInfo.GetValue(null, null); - else - { - System.Reflection.FieldInfo fieldInfo = type.GetField("Null", System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static); - if (fieldInfo != null) - { - value = fieldInfo.GetValue(null); - } - else - { - throw ExceptionBuilder.INullableUDTwithoutStaticNull(type.AssemblyQualifiedName); - } - } - lock (s_typeToNull) - { - //if(50 < TypeToNull.Count) { - // TypeToNull.Clear(); - //} - s_typeToNull[type] = value; - } + return propInfo.GetValue(null, null); } - return value; - } + + FieldInfo fieldInfo = type.GetField("Null", BindingFlags.Public | BindingFlags.Static); + if (fieldInfo != null) + { + return fieldInfo.GetValue(null); + } + + throw ExceptionBuilder.INullableUDTwithoutStaticNull(type.AssemblyQualifiedName); + }); public override bool IsNull(int record) { diff --git a/external/corefx/src/System.Data.Common/src/System/Data/DataTable.cs.REMOVED.git-id b/external/corefx/src/System.Data.Common/src/System/Data/DataTable.cs.REMOVED.git-id index 3b9447a777..7459b660c8 100644 --- a/external/corefx/src/System.Data.Common/src/System/Data/DataTable.cs.REMOVED.git-id +++ b/external/corefx/src/System.Data.Common/src/System/Data/DataTable.cs.REMOVED.git-id @@ -1 +1 @@ -3079e9ab6fb29508e64831341117dc6ee1503e6d \ No newline at end of file +622bd1e282d0eb4084ab4569add974947a8bd31a \ No newline at end of file diff --git a/external/corefx/src/System.Data.Common/tests/System/Data/Common/DbConnectionStringBuilderTest.cs.REMOVED.git-id b/external/corefx/src/System.Data.Common/tests/System/Data/Common/DbConnectionStringBuilderTest.cs.REMOVED.git-id index 0e1c8d26e4..bf634a1c1c 100644 --- a/external/corefx/src/System.Data.Common/tests/System/Data/Common/DbConnectionStringBuilderTest.cs.REMOVED.git-id +++ b/external/corefx/src/System.Data.Common/tests/System/Data/Common/DbConnectionStringBuilderTest.cs.REMOVED.git-id @@ -1 +1 @@ -e4339d3019d82a73a515da62df5de48290e3fc47 \ No newline at end of file +a703b498eb5617718ace91d381b3eccdeeec2c21 \ No newline at end of file diff --git a/external/corefx/src/System.Data.Common/tests/System/Data/DataColumnTest.cs b/external/corefx/src/System.Data.Common/tests/System/Data/DataColumnTest.cs index dcdbbee6c7..24e50cb707 100644 --- a/external/corefx/src/System.Data.Common/tests/System/Data/DataColumnTest.cs +++ b/external/corefx/src/System.Data.Common/tests/System/Data/DataColumnTest.cs @@ -958,6 +958,32 @@ namespace System.Data.Tests c2.Expression = "SUBSTRING(ISNULL(c1,' '), 1, 10)"; } + [Fact] + public void NonSqlNullableType_RequiresPublicStaticNull() + { + var t = new DataTable(); + var c1 = t.Columns.Add("c1", typeof(NullableTypeWithNullProperty)); + var c2 = t.Columns.Add("c2", typeof(NullableTypeWithNullField)); + Assert.Throws(() => t.Columns.Add("c3", typeof(NullableTypeWithoutNullMember))); + } + + private sealed class NullableTypeWithNullProperty : INullable + { + public bool IsNull => true; + public static NullableTypeWithNullProperty Null { get; } = new NullableTypeWithNullProperty(); + } + + private sealed class NullableTypeWithNullField : INullable + { + public bool IsNull => true; + public static readonly NullableTypeWithNullField Null = new NullableTypeWithNullField(); + } + + private sealed class NullableTypeWithoutNullMember : INullable + { + public bool IsNull => true; + } + private DataColumn MakeColumn(string col, string test) { return new DataColumn() diff --git a/external/corefx/src/System.Data.Common/tests/System/Data/DataColumnTest2.cs b/external/corefx/src/System.Data.Common/tests/System/Data/DataColumnTest2.cs index 15d5d78444..c5494805da 100644 --- a/external/corefx/src/System.Data.Common/tests/System/Data/DataColumnTest2.cs +++ b/external/corefx/src/System.Data.Common/tests/System/Data/DataColumnTest2.cs @@ -608,8 +608,8 @@ namespace System.Data.Tests else str = dr["expr"].ToString(); - if (str == "7.60") - str = "7.6"; + if (str == 7.60m.ToString()) + str = 7.6.ToString(); Assert.Equal(temp, str); } diff --git a/external/corefx/src/System.Data.Common/tests/System/Data/DataRowTest2.cs.REMOVED.git-id b/external/corefx/src/System.Data.Common/tests/System/Data/DataRowTest2.cs.REMOVED.git-id index 1611319a53..6282babc60 100644 --- a/external/corefx/src/System.Data.Common/tests/System/Data/DataRowTest2.cs.REMOVED.git-id +++ b/external/corefx/src/System.Data.Common/tests/System/Data/DataRowTest2.cs.REMOVED.git-id @@ -1 +1 @@ -01aebc8d5d262ad828d0b6fe8593666ead8da3ca \ No newline at end of file +f99c85f71b2d3e16a4785ffc2c94bb84e0306cb7 \ No newline at end of file diff --git a/external/corefx/src/System.Data.Common/tests/System/Data/DataTableReadXmlSchemaTest.cs b/external/corefx/src/System.Data.Common/tests/System/Data/DataTableReadXmlSchemaTest.cs index 54b6234667..2669ee9ed0 100644 --- a/external/corefx/src/System.Data.Common/tests/System/Data/DataTableReadXmlSchemaTest.cs +++ b/external/corefx/src/System.Data.Common/tests/System/Data/DataTableReadXmlSchemaTest.cs @@ -485,7 +485,7 @@ namespace System.Data.Tests Assert.Contains(@"AutoIncrementStep=""-2""", rawSchemaXML); Assert.DoesNotContain("()1", rawSchemaXML); Assert.DoesNotContain("()2", rawSchemaXML); - }); + }).Dispose(); } [Fact] @@ -600,7 +600,7 @@ namespace System.Data.Tests DataColumn rowIDColumn = table.Columns["RowID"]; Assert.Equal(-1, rowIDColumn.AutoIncrementSeed); Assert.Equal(-2, rowIDColumn.AutoIncrementStep); - }); + }).Dispose(); } [Fact] diff --git a/external/corefx/src/System.Data.Common/tests/System/Data/DataTableTest.cs.REMOVED.git-id b/external/corefx/src/System.Data.Common/tests/System/Data/DataTableTest.cs.REMOVED.git-id index bf9eb46b9a..061930b4f3 100644 --- a/external/corefx/src/System.Data.Common/tests/System/Data/DataTableTest.cs.REMOVED.git-id +++ b/external/corefx/src/System.Data.Common/tests/System/Data/DataTableTest.cs.REMOVED.git-id @@ -1 +1 @@ -92f507d88a8a1d43b46a919429994cd922f2f405 \ No newline at end of file +dfe43c60fef200ff651ccad67a59aef6e4de431b \ No newline at end of file diff --git a/external/corefx/src/System.Data.Common/tests/System/Data/DataTableTest2.cs b/external/corefx/src/System.Data.Common/tests/System/Data/DataTableTest2.cs index cf73dbc1fd..21f3e56b73 100644 --- a/external/corefx/src/System.Data.Common/tests/System/Data/DataTableTest2.cs +++ b/external/corefx/src/System.Data.Common/tests/System/Data/DataTableTest2.cs @@ -26,7 +26,7 @@ using System.Collections; using System.Globalization; using System.Collections.Generic; - +using System.Text.RegularExpressions; using Xunit; @@ -267,7 +267,12 @@ namespace System.Data.Tests Assert.Equal(typeof(ArgumentException), ex.GetType()); Assert.Null(ex.InnerException); Assert.NotNull(ex.Message); - Assert.True(ex.Message.IndexOf("'TEST'") != -1); + + // \p{Pi} any kind of opening quote https://www.compart.com/en/unicode/category/Pi + // \p{Pf} any kind of closing quote https://www.compart.com/en/unicode/category/Pf + // \p{Po} any kind of punctuation character that is not a dash, bracket, quote or connector https://www.compart.com/en/unicode/category/Po + Assert.Matches(@"[\p{Pi}\p{Po}]" + "TEST" + @"[\p{Pf}\p{Po}]", ex.Message); + Assert.Null(ex.ParamName); } } @@ -1640,7 +1645,11 @@ namespace System.Data.Tests Assert.Equal(typeof(NoNullAllowedException), ex.GetType()); Assert.Null(ex.InnerException); Assert.NotNull(ex.Message); - Assert.True(ex.Message.IndexOf("'ParentId'") != -1); + + // \p{Pi} any kind of opening quote https://www.compart.com/en/unicode/category/Pi + // \p{Pf} any kind of closing quote https://www.compart.com/en/unicode/category/Pf + // \p{Po} any kind of punctuation character that is not a dash, bracket, quote or connector https://www.compart.com/en/unicode/category/Po + Assert.Matches(@"[\p{Pi}\p{Po}]" + "ParentId" + @"[\p{Pf}\p{Po}]", ex.Message); } DataTable dt1 = DataProvider.CreateUniqueConstraint(); diff --git a/external/corefx/src/System.Data.Common/tests/System/Data/DataTableTest3.cs b/external/corefx/src/System.Data.Common/tests/System/Data/DataTableTest3.cs index 454788334d..fe1f73bfe5 100644 --- a/external/corefx/src/System.Data.Common/tests/System/Data/DataTableTest3.cs +++ b/external/corefx/src/System.Data.Common/tests/System/Data/DataTableTest3.cs @@ -24,6 +24,7 @@ // using System.IO; +using System.Text.RegularExpressions; using Xunit; @@ -645,7 +646,12 @@ namespace System.Data.Tests Assert.Equal(typeof(ArgumentException), ex.GetType()); Assert.Null(ex.InnerException); Assert.NotNull(ex.Message); - Assert.True(ex.Message.IndexOf("'Table1'") != -1); + + // \p{Pi} any kind of opening quote https://www.compart.com/en/unicode/category/Pi + // \p{Pf} any kind of closing quote https://www.compart.com/en/unicode/category/Pf + // \p{Po} any kind of punctuation character that is not a dash, bracket, quote or connector https://www.compart.com/en/unicode/category/Po + Assert.Matches(@"[\p{Pi}\p{Po}]" + "Table1" + @"[\p{Pf}\p{Po}]", ex.Message); + Assert.Null(ex.ParamName); } } diff --git a/external/corefx/src/System.Data.Common/tests/System/Data/DataTableTest4.cs b/external/corefx/src/System.Data.Common/tests/System/Data/DataTableTest4.cs index 56e6da9b58..8917bf5a88 100644 --- a/external/corefx/src/System.Data.Common/tests/System/Data/DataTableTest4.cs +++ b/external/corefx/src/System.Data.Common/tests/System/Data/DataTableTest4.cs @@ -24,6 +24,7 @@ // using System.IO; +using System.Text.RegularExpressions; using System.Xml; using Xunit; @@ -650,7 +651,12 @@ namespace System.Data.Tests Assert.Equal(typeof(ArgumentException), ex.GetType()); Assert.Null(ex.InnerException); Assert.NotNull(ex.Message); - Assert.True(ex.Message.IndexOf("'Table1'") != -1); + + // \p{Pi} any kind of opening quote https://www.compart.com/en/unicode/category/Pi + // \p{Pf} any kind of closing quote https://www.compart.com/en/unicode/category/Pf + // \p{Po} any kind of punctuation character that is not a dash, bracket, quote or connector https://www.compart.com/en/unicode/category/Po + Assert.Matches(@"[\p{Pi}\p{Po}]" + "Table1" + @"[\p{Pf}\p{Po}]", ex.Message); + Assert.Null(ex.ParamName); } } @@ -1520,7 +1526,12 @@ namespace System.Data.Tests Assert.Equal(typeof(ArgumentException), ex.GetType()); Assert.Null(ex.InnerException); Assert.NotNull(ex.Message); - Assert.True(ex.Message.IndexOf("'Table1'") != -1); + + // \p{Pi} any kind of opening quote https://www.compart.com/en/unicode/category/Pi + // \p{Pf} any kind of closing quote https://www.compart.com/en/unicode/category/Pf + // \p{Po} any kind of punctuation character that is not a dash, bracket, quote or connector https://www.compart.com/en/unicode/category/Po + Assert.Matches(@"[\p{Pi}\p{Po}]" + "Table1" + @"[\p{Pf}\p{Po}]", ex.Message); + Assert.Null(ex.ParamName); } } @@ -1699,7 +1710,12 @@ namespace System.Data.Tests Assert.Equal(typeof(ArgumentException), ex.GetType()); Assert.Null(ex.InnerException); Assert.NotNull(ex.Message); - Assert.True(ex.Message.IndexOf("'Table1'") != -1); + + // \p{Pi} any kind of opening quote https://www.compart.com/en/unicode/category/Pi + // \p{Pf} any kind of closing quote https://www.compart.com/en/unicode/category/Pf + // \p{Po} any kind of punctuation character that is not a dash, bracket, quote or connector https://www.compart.com/en/unicode/category/Po + Assert.Matches(@"[\p{Pi}\p{Po}]" + "Table1" + @"[\p{Pf}\p{Po}]", ex.Message); + Assert.Null(ex.ParamName); } } diff --git a/external/corefx/src/System.Data.Common/tests/System/Data/SqlTypes/SqlDecimalTest.cs b/external/corefx/src/System.Data.Common/tests/System/Data/SqlTypes/SqlDecimalTest.cs index 47f709aac4..a44caa4927 100644 --- a/external/corefx/src/System.Data.Common/tests/System/Data/SqlTypes/SqlDecimalTest.cs +++ b/external/corefx/src/System.Data.Common/tests/System/Data/SqlTypes/SqlDecimalTest.cs @@ -253,10 +253,10 @@ Assert.False(true); [Fact] public void AdjustScale() { - Assert.Equal("6464.646400", SqlDecimal.AdjustScale(_test1, 2, false).Value.ToString()); - Assert.Equal("6464.65", SqlDecimal.AdjustScale(_test1, -2, true).Value.ToString()); - Assert.Equal("6464.64", SqlDecimal.AdjustScale(_test1, -2, false).Value.ToString()); - Assert.Equal("10000.000000000000", SqlDecimal.AdjustScale(_test2, 10, false).Value.ToString()); + Assert.Equal(6464.646400m.ToString(), SqlDecimal.AdjustScale(_test1, 2, false).Value.ToString()); + Assert.Equal(6464.65.ToString(), SqlDecimal.AdjustScale(_test1, -2, true).Value.ToString()); + Assert.Equal(6464.64.ToString(), SqlDecimal.AdjustScale(_test1, -2, false).Value.ToString()); + Assert.Equal(10000.000000000000m.ToString(), SqlDecimal.AdjustScale(_test2, 10, false).Value.ToString()); Assert.Equal("79228162514264337593543950335.00", SqlDecimal.AdjustScale(_test5, 2, false).ToString()); try { diff --git a/external/corefx/src/System.Data.Common/tests/System/Data/SqlTypes/SqlDoubleTest.cs b/external/corefx/src/System.Data.Common/tests/System/Data/SqlTypes/SqlDoubleTest.cs index 074e1ec9a5..478b6766b3 100644 --- a/external/corefx/src/System.Data.Common/tests/System/Data/SqlTypes/SqlDoubleTest.cs +++ b/external/corefx/src/System.Data.Common/tests/System/Data/SqlTypes/SqlDoubleTest.cs @@ -30,7 +30,6 @@ using System.Globalization; using System.IO; using System.Xml; using System.Xml.Serialization; - using Xunit; namespace System.Data.Tests.SqlTypes @@ -403,14 +402,14 @@ namespace System.Data.Tests.SqlTypes } // ToSqlString () - Assert.Equal("250", Test1.ToSqlString().Value); - Assert.Equal("0", Test0.ToSqlString().Value); - Assert.Equal("6.4E+65", Test2.ToSqlString().Value); + Assert.Equal(250.ToString(), Test1.ToSqlString().Value); + Assert.Equal(0.ToString(), Test0.ToSqlString().Value); + Assert.Equal(6.4E+65.ToString(), Test2.ToSqlString().Value); // ToString () - Assert.Equal("250", Test1.ToString()); - Assert.Equal("0", Test0.ToString()); - Assert.Equal("6.4E+65", Test2.ToString()); + Assert.Equal(250.ToString(), Test1.ToString()); + Assert.Equal(0.ToString(), Test0.ToString()); + Assert.Equal(6.4E+65.ToString(), Test2.ToString()); } // OPERATORS diff --git a/external/corefx/src/System.Data.Common/tests/System/Data/SqlTypes/SqlMoneyTest.cs b/external/corefx/src/System.Data.Common/tests/System/Data/SqlTypes/SqlMoneyTest.cs index 2b40b21a90..a703fb180c 100644 --- a/external/corefx/src/System.Data.Common/tests/System/Data/SqlTypes/SqlMoneyTest.cs +++ b/external/corefx/src/System.Data.Common/tests/System/Data/SqlTypes/SqlMoneyTest.cs @@ -354,12 +354,12 @@ namespace System.Data.Tests.SqlTypes Assert.Equal((float)6464.6464, _test1.ToSqlSingle().Value); // ToSqlString () - Assert.Equal("6464.6464", _test1.ToSqlString().Value); - Assert.Equal("90000.00", _test2.ToSqlString().Value); + Assert.Equal(6464.6464.ToString(), _test1.ToSqlString().Value); + Assert.Equal(90000.00m.ToString(), _test2.ToSqlString().Value); // ToString () - Assert.Equal("6464.6464", _test1.ToString()); - Assert.Equal("90000.00", _test2.ToString()); + Assert.Equal(6464.6464.ToString(), _test1.ToString()); + Assert.Equal(90000.00m.ToString(), _test2.ToString()); } // OPERATORS diff --git a/external/corefx/src/System.Data.Common/tests/System/Data/SqlTypes/SqlSingleTest.cs b/external/corefx/src/System.Data.Common/tests/System/Data/SqlTypes/SqlSingleTest.cs index c2ec520b03..d235759383 100644 --- a/external/corefx/src/System.Data.Common/tests/System/Data/SqlTypes/SqlSingleTest.cs +++ b/external/corefx/src/System.Data.Common/tests/System/Data/SqlTypes/SqlSingleTest.cs @@ -390,14 +390,14 @@ namespace System.Data.Tests.SqlTypes // ToSqlString () - Assert.Equal("250", Test1.ToSqlString().Value); - Assert.Equal("0", Test0.ToSqlString().Value); - Assert.Equal("6.4E+17", Test2.ToSqlString().Value); + Assert.Equal(250.ToString(), Test1.ToSqlString().Value); + Assert.Equal(0.ToString(), Test0.ToSqlString().Value); + Assert.Equal(6.4E+17.ToString(), Test2.ToSqlString().Value); // ToString () - Assert.Equal("250", Test1.ToString()); - Assert.Equal("0", Test0.ToString()); - Assert.Equal("6.4E+17", Test2.ToString()); + Assert.Equal(250.ToString(), Test1.ToString()); + Assert.Equal(0.ToString(), Test0.ToString()); + Assert.Equal(6.4E+17.ToString(), Test2.ToString()); } // OPERATORS diff --git a/external/corefx/src/System.Data.Common/tests/System/Data/SqlTypes/SqlStringTest.cs b/external/corefx/src/System.Data.Common/tests/System/Data/SqlTypes/SqlStringTest.cs index 9cd1709372..7be8cf7327 100644 --- a/external/corefx/src/System.Data.Common/tests/System/Data/SqlTypes/SqlStringTest.cs +++ b/external/corefx/src/System.Data.Common/tests/System/Data/SqlTypes/SqlStringTest.cs @@ -662,7 +662,7 @@ namespace System.Data.Tests.SqlTypes public void SqlDoubleToSqlString() { SqlDouble TestDouble = new SqlDouble(64E+64); - Assert.Equal("6.4E+65", ((SqlString)TestDouble).Value); + Assert.Equal(6.4E+65.ToString(), ((SqlString)TestDouble).Value); } [Fact] @@ -728,14 +728,14 @@ namespace System.Data.Tests.SqlTypes public void SqlMoneyToSqlString() { SqlMoney TestMoney = new SqlMoney(646464.6464); - Assert.Equal("646464.6464", ((SqlString)TestMoney).Value); + Assert.Equal(646464.6464.ToString(), ((SqlString)TestMoney).Value); } [Fact] public void SqlSingleToSqlString() { SqlSingle TestSingle = new SqlSingle(3E+20); - Assert.Equal("3E+20", ((SqlString)TestSingle).Value); + Assert.Equal(3E+20.ToString(), ((SqlString)TestSingle).Value); } [Fact] diff --git a/external/corefx/src/System.Data.DataSetExtensions/dir.props b/external/corefx/src/System.Data.DataSetExtensions/dir.props index 09d2f14f39..9e190a7dde 100644 --- a/external/corefx/src/System.Data.DataSetExtensions/dir.props +++ b/external/corefx/src/System.Data.DataSetExtensions/dir.props @@ -3,6 +3,6 @@ 4.0.0.0 - MSFT + ECMA \ No newline at end of file diff --git a/external/corefx/src/System.Data.DataSetExtensions/pkg/System.Data.DataSetExtensions.pkgproj b/external/corefx/src/System.Data.DataSetExtensions/pkg/System.Data.DataSetExtensions.pkgproj index ec640ad906..878933ade5 100644 --- a/external/corefx/src/System.Data.DataSetExtensions/pkg/System.Data.DataSetExtensions.pkgproj +++ b/external/corefx/src/System.Data.DataSetExtensions/pkg/System.Data.DataSetExtensions.pkgproj @@ -3,7 +3,7 @@ - netcoreapp2.0;net45;$(AllXamarinFrameworks) + uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks) diff --git a/external/corefx/src/System.Data.DataSetExtensions/src/Configurations.props b/external/corefx/src/System.Data.DataSetExtensions/src/Configurations.props index c398e42e89..77e29493b0 100644 --- a/external/corefx/src/System.Data.DataSetExtensions/src/Configurations.props +++ b/external/corefx/src/System.Data.DataSetExtensions/src/Configurations.props @@ -3,6 +3,7 @@ netstandard; + _netfx; \ No newline at end of file diff --git a/external/corefx/src/System.Data.Odbc/pkg/System.Data.Odbc.pkgproj b/external/corefx/src/System.Data.Odbc/pkg/System.Data.Odbc.pkgproj index c0232ef4ea..e4959eab6e 100644 --- a/external/corefx/src/System.Data.Odbc/pkg/System.Data.Odbc.pkgproj +++ b/external/corefx/src/System.Data.Odbc/pkg/System.Data.Odbc.pkgproj @@ -3,7 +3,7 @@ - net461;netcoreapp2.0;$(AllXamarinFrameworks) + uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks) diff --git a/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionClosed.cs b/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionClosed.cs index 635d3d6b78..619341d2bf 100644 --- a/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionClosed.cs +++ b/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionClosed.cs @@ -3,165 +3,13 @@ // See the LICENSE file in the project root for more information. using System.Data.Common; -using System.Diagnostics; -using System.Threading.Tasks; namespace System.Data.ProviderBase { - internal abstract class DbConnectionClosed : DbConnectionInternal + internal abstract partial class DbConnectionClosed : DbConnectionInternal { - // Construct an "empty" connection - protected DbConnectionClosed(ConnectionState state, bool hidePassword, bool allowSetConnectionString) : base(state, hidePassword, allowSetConnectionString) - { - } + protected override void Activate() => throw ADP.ClosedConnectionError(); - public override string ServerVersion - { - get - { - throw ADP.ClosedConnectionError(); - } - } - - protected override void Activate() - { - throw ADP.ClosedConnectionError(); - } - - public override DbTransaction BeginTransaction(IsolationLevel il) - { - throw ADP.ClosedConnectionError(); - } - - public override void ChangeDatabase(string database) - { - throw ADP.ClosedConnectionError(); - } - - internal override void CloseConnection(DbConnection owningObject, DbConnectionFactory connectionFactory) - { - // not much to do here... - } - - protected override void Deactivate() - { - throw ADP.ClosedConnectionError(); - } - - - protected override DbReferenceCollection CreateReferenceCollection() - { - throw ADP.ClosedConnectionError(); - } - - internal override bool TryOpenConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) - { - return base.TryOpenConnectionInternal(outerConnection, connectionFactory, retry, userOptions); - } } - internal abstract class DbConnectionBusy : DbConnectionClosed - { - protected DbConnectionBusy(ConnectionState state) : base(state, true, false) - { - } - - internal override bool TryOpenConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) - { - throw ADP.ConnectionAlreadyOpen(State); - } - } - - internal sealed class DbConnectionClosedBusy : DbConnectionBusy - { - // Closed Connection, Currently Busy - changing connection string - internal static readonly DbConnectionInternal SingletonInstance = new DbConnectionClosedBusy(); // singleton object - - private DbConnectionClosedBusy() : base(ConnectionState.Closed) - { - } - } - - internal sealed class DbConnectionOpenBusy : DbConnectionBusy - { - // Open Connection, Currently Busy - closing connection - internal static readonly DbConnectionInternal SingletonInstance = new DbConnectionOpenBusy(); // singleton object - - private DbConnectionOpenBusy() : base(ConnectionState.Open) - { - } - } - - internal sealed class DbConnectionClosedConnecting : DbConnectionBusy - { - // Closed Connection, Currently Connecting - - internal static readonly DbConnectionInternal SingletonInstance = new DbConnectionClosedConnecting(); // singleton object - - private DbConnectionClosedConnecting() : base(ConnectionState.Connecting) - { - } - - internal override void CloseConnection(DbConnection owningObject, DbConnectionFactory connectionFactory) - { - connectionFactory.SetInnerConnectionTo(owningObject, DbConnectionClosedPreviouslyOpened.SingletonInstance); - } - - internal override bool TryReplaceConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) - { - return TryOpenConnection(outerConnection, connectionFactory, retry, userOptions); - } - - internal override bool TryOpenConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) - { - if (retry == null || !retry.Task.IsCompleted) - { - // retry is null if this is a synchronous call - - // if someone calls Open or OpenAsync while in this state, - // then the retry task will not be completed - - throw ADP.ConnectionAlreadyOpen(State); - } - - // we are completing an asynchronous open - Debug.Assert(retry.Task.Status == TaskStatus.RanToCompletion, "retry task must be completed successfully"); - DbConnectionInternal openConnection = retry.Task.Result; - if (null == openConnection) - { - connectionFactory.SetInnerConnectionTo(outerConnection, this); - throw ADP.InternalConnectionError(ADP.ConnectionError.GetConnectionReturnsNull); - } - connectionFactory.SetInnerConnectionEvent(outerConnection, openConnection); - - return true; - } - } - - internal sealed class DbConnectionClosedNeverOpened : DbConnectionClosed - { - // Closed Connection, Has Never Been Opened - - internal static readonly DbConnectionInternal SingletonInstance = new DbConnectionClosedNeverOpened(); // singleton object - - private DbConnectionClosedNeverOpened() : base(ConnectionState.Closed, false, true) - { - } - } - - internal sealed class DbConnectionClosedPreviouslyOpened : DbConnectionClosed - { - // Closed Connection, Has Previously Been Opened - - internal static readonly DbConnectionInternal SingletonInstance = new DbConnectionClosedPreviouslyOpened(); // singleton object - - private DbConnectionClosedPreviouslyOpened() : base(ConnectionState.Closed, true, true) - { - } - - internal override bool TryReplaceConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) - { - return TryOpenConnection(outerConnection, connectionFactory, retry, userOptions); - } - } } diff --git a/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionFactory.cs b/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionFactory.cs index cdc19e2681..d7d43f4c55 100644 --- a/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionFactory.cs +++ b/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionFactory.cs @@ -2,7 +2,6 @@ // 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.Collections.Generic; using System.Diagnostics; using System.Data.Common; using System.Threading; @@ -10,143 +9,8 @@ using System.Threading.Tasks; namespace System.Data.ProviderBase { - internal abstract class DbConnectionFactory + internal abstract partial class DbConnectionFactory { - private Dictionary _connectionPoolGroups; - private readonly List _poolsToRelease; - private readonly List _poolGroupsToRelease; - private readonly Timer _pruningTimer; - - private const int PruningDueTime = 4 * 60 * 1000; // 4 minutes - private const int PruningPeriod = 30 * 1000; // thirty seconds - - - // s_pendingOpenNonPooled is an array of tasks used to throttle creation of non-pooled connections to - // a maximum of Environment.ProcessorCount at a time. - private static uint s_pendingOpenNonPooledNext = 0; - private static Task[] s_pendingOpenNonPooled = new Task[Environment.ProcessorCount]; - private static Task s_completedTask; - - protected DbConnectionFactory() - { - _connectionPoolGroups = new Dictionary(); - _poolsToRelease = new List(); - _poolGroupsToRelease = new List(); - _pruningTimer = CreatePruningTimer(); - } - - - public abstract DbProviderFactory ProviderFactory - { - get; - } - - - public void ClearAllPools() - { - Dictionary connectionPoolGroups = _connectionPoolGroups; - foreach (KeyValuePair entry in connectionPoolGroups) - { - DbConnectionPoolGroup poolGroup = entry.Value; - if (null != poolGroup) - { - poolGroup.Clear(); - } - } - } - - public void ClearPool(DbConnection connection) - { - ADP.CheckArgumentNull(connection, nameof(connection)); - - DbConnectionPoolGroup poolGroup = GetConnectionPoolGroup(connection); - if (null != poolGroup) - { - poolGroup.Clear(); - } - } - - public void ClearPool(DbConnectionPoolKey key) - { - Debug.Assert(key != null, "key cannot be null"); - ADP.CheckArgumentNull(key.ConnectionString, nameof(key) + "." + nameof(key.ConnectionString)); - - DbConnectionPoolGroup poolGroup; - Dictionary connectionPoolGroups = _connectionPoolGroups; - if (connectionPoolGroups.TryGetValue(key, out poolGroup)) - { - poolGroup.Clear(); - } - } - - internal virtual DbConnectionPoolProviderInfo CreateConnectionPoolProviderInfo(DbConnectionOptions connectionOptions) - { - return null; - } - - - internal DbConnectionInternal CreateNonPooledConnection(DbConnection owningConnection, DbConnectionPoolGroup poolGroup, DbConnectionOptions userOptions) - { - Debug.Assert(null != owningConnection, "null owningConnection?"); - Debug.Assert(null != poolGroup, "null poolGroup?"); - - DbConnectionOptions connectionOptions = poolGroup.ConnectionOptions; - DbConnectionPoolGroupProviderInfo poolGroupProviderInfo = poolGroup.ProviderInfo; - DbConnectionPoolKey poolKey = poolGroup.PoolKey; - - DbConnectionInternal newConnection = CreateConnection(connectionOptions, poolKey, poolGroupProviderInfo, null, owningConnection, userOptions); - if (null != newConnection) - { - newConnection.MakeNonPooledObject(owningConnection); - } - return newConnection; - } - - internal DbConnectionInternal CreatePooledConnection(DbConnectionPool pool, DbConnection owningObject, DbConnectionOptions options, DbConnectionPoolKey poolKey, DbConnectionOptions userOptions) - { - Debug.Assert(null != pool, "null pool?"); - DbConnectionPoolGroupProviderInfo poolGroupProviderInfo = pool.PoolGroup.ProviderInfo; - - DbConnectionInternal newConnection = CreateConnection(options, poolKey, poolGroupProviderInfo, pool, owningObject, userOptions); - if (null != newConnection) - { - newConnection.MakePooledConnection(pool); - } - return newConnection; - } - - internal virtual DbConnectionPoolGroupProviderInfo CreateConnectionPoolGroupProviderInfo(DbConnectionOptions connectionOptions) - { - return null; - } - - private Timer CreatePruningTimer() - { - TimerCallback callback = new TimerCallback(PruneConnectionPoolGroups); - return new Timer(callback, null, PruningDueTime, PruningPeriod); - } - - protected DbConnectionOptions FindConnectionOptions(DbConnectionPoolKey key) - { - Debug.Assert(key != null, "key cannot be null"); - if (!string.IsNullOrEmpty(key.ConnectionString)) - { - DbConnectionPoolGroup connectionPoolGroup; - Dictionary connectionPoolGroups = _connectionPoolGroups; - if (connectionPoolGroups.TryGetValue(key, out connectionPoolGroup)) - { - return connectionPoolGroup.ConnectionOptions; - } - } - return null; - } - - private static Task GetCompletedTask() - { - Debug.Assert(Monitor.IsEntered(s_pendingOpenNonPooled), $"Expected {nameof(s_pendingOpenNonPooled)} lock to be held."); - return s_completedTask ?? (s_completedTask = Task.FromResult(null)); - } - internal bool TryGetConnection(DbConnection owningConnection, TaskCompletionSource retry, DbConnectionOptions userOptions, DbConnectionInternal oldConnection, out DbConnectionInternal connection) { Debug.Assert(null != owningConnection, "null owningConnection?"); @@ -309,254 +173,6 @@ namespace System.Data.ProviderBase return true; } - - private DbConnectionPool GetConnectionPool(DbConnection owningObject, DbConnectionPoolGroup connectionPoolGroup) - { - // if poolgroup is disabled, it will be replaced with a new entry - - Debug.Assert(null != owningObject, "null owningObject?"); - Debug.Assert(null != connectionPoolGroup, "null connectionPoolGroup?"); - - // It is possible that while the outer connection object has - // been sitting around in a closed and unused state in some long - // running app, the pruner may have come along and remove this - // the pool entry from the master list. If we were to use a - // pool entry in this state, we would create "unmanaged" pools, - // which would be bad. To avoid this problem, we automagically - // re-create the pool entry whenever it's disabled. - - // however, don't rebuild connectionOptions if no pooling is involved - let new connections do that work - if (connectionPoolGroup.IsDisabled && (null != connectionPoolGroup.PoolGroupOptions)) - { - // reusing existing pool option in case user originally used SetConnectionPoolOptions - DbConnectionPoolGroupOptions poolOptions = connectionPoolGroup.PoolGroupOptions; - - // get the string to hash on again - DbConnectionOptions connectionOptions = connectionPoolGroup.ConnectionOptions; - Debug.Assert(null != connectionOptions, "prevent expansion of connectionString"); - - connectionPoolGroup = GetConnectionPoolGroup(connectionPoolGroup.PoolKey, poolOptions, ref connectionOptions); - Debug.Assert(null != connectionPoolGroup, "null connectionPoolGroup?"); - SetConnectionPoolGroup(owningObject, connectionPoolGroup); - } - DbConnectionPool connectionPool = connectionPoolGroup.GetConnectionPool(this); - return connectionPool; - } - - internal DbConnectionPoolGroup GetConnectionPoolGroup(DbConnectionPoolKey key, DbConnectionPoolGroupOptions poolOptions, ref DbConnectionOptions userConnectionOptions) - { - if (string.IsNullOrEmpty(key.ConnectionString)) - { - return (DbConnectionPoolGroup)null; - } - - DbConnectionPoolGroup connectionPoolGroup; - Dictionary connectionPoolGroups = _connectionPoolGroups; - if (!connectionPoolGroups.TryGetValue(key, out connectionPoolGroup) || (connectionPoolGroup.IsDisabled && (null != connectionPoolGroup.PoolGroupOptions))) - { - // If we can't find an entry for the connection string in - // our collection of pool entries, then we need to create a - // new pool entry and add it to our collection. - - DbConnectionOptions connectionOptions = CreateConnectionOptions(key.ConnectionString, userConnectionOptions); - if (null == connectionOptions) - { - throw ADP.InternalConnectionError(ADP.ConnectionError.ConnectionOptionsMissing); - } - - if (null == userConnectionOptions) - { // we only allow one expansion on the connection string - userConnectionOptions = connectionOptions; - } - - // We don't support connection pooling on Win9x - if (null == poolOptions) - { - if (null != connectionPoolGroup) - { - // reusing existing pool option in case user originally used SetConnectionPoolOptions - poolOptions = connectionPoolGroup.PoolGroupOptions; - } - else - { - // Note: may return null for non-pooled connections - poolOptions = CreateConnectionPoolGroupOptions(connectionOptions); - } - } - - - DbConnectionPoolGroup newConnectionPoolGroup = new DbConnectionPoolGroup(connectionOptions, key, poolOptions); - newConnectionPoolGroup.ProviderInfo = CreateConnectionPoolGroupProviderInfo(connectionOptions); - - lock (this) - { - connectionPoolGroups = _connectionPoolGroups; - if (!connectionPoolGroups.TryGetValue(key, out connectionPoolGroup)) - { - // build new dictionary with space for new connection string - Dictionary newConnectionPoolGroups = new Dictionary(1 + connectionPoolGroups.Count); - foreach (KeyValuePair entry in connectionPoolGroups) - { - newConnectionPoolGroups.Add(entry.Key, entry.Value); - } - - // lock prevents race condition with PruneConnectionPoolGroups - newConnectionPoolGroups.Add(key, newConnectionPoolGroup); - connectionPoolGroup = newConnectionPoolGroup; - _connectionPoolGroups = newConnectionPoolGroups; - } - else - { - Debug.Assert(!connectionPoolGroup.IsDisabled, "Disabled pool entry discovered"); - } - } - Debug.Assert(null != connectionPoolGroup, "how did we not create a pool entry?"); - Debug.Assert(null != userConnectionOptions, "how did we not have user connection options?"); - } - else if (null == userConnectionOptions) - { - userConnectionOptions = connectionPoolGroup.ConnectionOptions; - } - return connectionPoolGroup; - } - - - private void PruneConnectionPoolGroups(object state) - { - // First, walk the pool release list and attempt to clear each - // pool, when the pool is finally empty, we dispose of it. If the - // pool isn't empty, it's because there are active connections or - // distributed transactions that need it. - lock (_poolsToRelease) - { - if (0 != _poolsToRelease.Count) - { - DbConnectionPool[] poolsToRelease = _poolsToRelease.ToArray(); - foreach (DbConnectionPool pool in poolsToRelease) - { - if (null != pool) - { - pool.Clear(); - - if (0 == pool.Count) - { - _poolsToRelease.Remove(pool); - } - } - } - } - } - - // Next, walk the pool entry release list and dispose of each - // pool entry when it is finally empty. If the pool entry isn't - // empty, it's because there are active pools that need it. - lock (_poolGroupsToRelease) - { - if (0 != _poolGroupsToRelease.Count) - { - DbConnectionPoolGroup[] poolGroupsToRelease = _poolGroupsToRelease.ToArray(); - foreach (DbConnectionPoolGroup poolGroup in poolGroupsToRelease) - { - if (null != poolGroup) - { - int poolsLeft = poolGroup.Clear(); // may add entries to _poolsToRelease - - if (0 == poolsLeft) - { - _poolGroupsToRelease.Remove(poolGroup); - } - } - } - } - } - - // Finally, we walk through the collection of connection pool entries - // and prune each one. This will cause any empty pools to be put - // into the release list. - lock (this) - { - Dictionary connectionPoolGroups = _connectionPoolGroups; - Dictionary newConnectionPoolGroups = new Dictionary(connectionPoolGroups.Count); - - foreach (KeyValuePair entry in connectionPoolGroups) - { - if (null != entry.Value) - { - Debug.Assert(!entry.Value.IsDisabled, "Disabled pool entry discovered"); - - // entries start active and go idle during prune if all pools are gone - // move idle entries from last prune pass to a queue for pending release - // otherwise process entry which may move it from active to idle - if (entry.Value.Prune()) - { // may add entries to _poolsToRelease - QueuePoolGroupForRelease(entry.Value); - } - else - { - newConnectionPoolGroups.Add(entry.Key, entry.Value); - } - } - } - _connectionPoolGroups = newConnectionPoolGroups; - } - } - - internal void QueuePoolForRelease(DbConnectionPool pool, bool clearing) - { - // Queue the pool up for release -- we'll clear it out and dispose - // of it as the last part of the pruning timer callback so we don't - // do it with the pool entry or the pool collection locked. - Debug.Assert(null != pool, "null pool?"); - - // set the pool to the shutdown state to force all active - // connections to be automatically disposed when they - // are returned to the pool - pool.Shutdown(); - - lock (_poolsToRelease) - { - if (clearing) - { - pool.Clear(); - } - _poolsToRelease.Add(pool); - } - } - - internal void QueuePoolGroupForRelease(DbConnectionPoolGroup poolGroup) - { - Debug.Assert(null != poolGroup, "null poolGroup?"); - - lock (_poolGroupsToRelease) - { - _poolGroupsToRelease.Add(poolGroup); - } - } - - protected virtual DbConnectionInternal CreateConnection(DbConnectionOptions options, DbConnectionPoolKey poolKey, object poolGroupProviderInfo, DbConnectionPool pool, DbConnection owningConnection, DbConnectionOptions userOptions) - { - return CreateConnection(options, poolKey, poolGroupProviderInfo, pool, owningConnection); - } - - protected abstract DbConnectionInternal CreateConnection(DbConnectionOptions options, DbConnectionPoolKey poolKey, object poolGroupProviderInfo, DbConnectionPool pool, DbConnection owningConnection); - - protected abstract DbConnectionOptions CreateConnectionOptions(string connectionString, DbConnectionOptions previous); - - protected abstract DbConnectionPoolGroupOptions CreateConnectionPoolGroupOptions(DbConnectionOptions options); - - internal abstract DbConnectionPoolGroup GetConnectionPoolGroup(DbConnection connection); - - internal abstract DbConnectionInternal GetInnerConnection(DbConnection connection); - - - internal abstract void PermissionDemand(DbConnection outerConnection); - - internal abstract void SetConnectionPoolGroup(DbConnection outerConnection, DbConnectionPoolGroup poolGroup); - - internal abstract void SetInnerConnectionEvent(DbConnection owningObject, DbConnectionInternal to); - - internal abstract bool SetInnerConnectionFrom(DbConnection owningObject, DbConnectionInternal to, DbConnectionInternal from); - - internal abstract void SetInnerConnectionTo(DbConnection owningObject, DbConnectionInternal to); + } } diff --git a/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionInternal.cs b/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionInternal.cs index d58b31ba40..9fd4a2ebce 100644 --- a/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionInternal.cs +++ b/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionInternal.cs @@ -9,168 +9,9 @@ using System.Threading.Tasks; namespace System.Data.ProviderBase { - internal abstract class DbConnectionInternal + internal abstract partial class DbConnectionInternal { - internal static readonly StateChangeEventArgs StateChangeClosed = new StateChangeEventArgs(ConnectionState.Open, ConnectionState.Closed); - internal static readonly StateChangeEventArgs StateChangeOpen = new StateChangeEventArgs(ConnectionState.Closed, ConnectionState.Open); - - private readonly bool _allowSetConnectionString; - private readonly bool _hidePassword; - private readonly ConnectionState _state; - - private readonly WeakReference _owningObject = new WeakReference(null, false); // [usage must be thread safe] the owning object, when not in the pool. (both Pooled and Non-Pooled connections) - - private DbConnectionPool _connectionPool; // the pooler that the connection came from (Pooled connections only) - private DbReferenceCollection _referenceCollection; // collection of objects that we need to notify in some way when we're being deactivated - private int _pooledCount; // [usage must be thread safe] the number of times this object has been pushed into the pool less the number of times it's been popped (0 != inPool) - - private bool _connectionIsDoomed; // true when the connection should no longer be used. - private bool _cannotBePooled; // true when the connection should no longer be pooled. - - private DateTime _createTime; // when the connection was created. - - -#if DEBUG - private int _activateCount; // debug only counter to verify activate/deactivates are in sync. -#endif //DEBUG - - protected DbConnectionInternal() : this(ConnectionState.Open, true, false) - { - } - - // Constructor for internal connections - internal DbConnectionInternal(ConnectionState state, bool hidePassword, bool allowSetConnectionString) - { - _allowSetConnectionString = allowSetConnectionString; - _hidePassword = hidePassword; - _state = state; - } - - internal bool AllowSetConnectionString - { - get - { - return _allowSetConnectionString; - } - } - - internal bool CanBePooled - { - get - { - bool flag = (!_connectionIsDoomed && !_cannotBePooled && !_owningObject.IsAlive); - return flag; - } - } - - - protected internal bool IsConnectionDoomed - { - get - { - return _connectionIsDoomed; - } - } - - internal bool IsEmancipated - { - get - { - // NOTE: There are race conditions between PrePush, PostPop and this - // property getter -- only use this while this object is locked; - // (DbConnectionPool.Clear and ReclaimEmancipatedObjects - // do this for us) - - // The functionality is as follows: - // - // _pooledCount is incremented when the connection is pushed into the pool - // _pooledCount is decremented when the connection is popped from the pool - // _pooledCount is set to -1 when the connection is not pooled (just in case...) - // - // That means that: - // - // _pooledCount > 1 connection is in the pool multiple times (This should not happen) - // _pooledCount == 1 connection is in the pool - // _pooledCount == 0 connection is out of the pool - // _pooledCount == -1 connection is not a pooled connection; we shouldn't be here for non-pooled connections. - // _pooledCount < -1 connection out of the pool multiple times - // - // Now, our job is to return TRUE when the connection is out - // of the pool and it's owning object is no longer around to - // return it. - - bool value = (_pooledCount < 1) && !_owningObject.IsAlive; - return value; - } - } - - internal bool IsInPool - { - get - { - Debug.Assert(_pooledCount <= 1 && _pooledCount >= -1, "Pooled count for object is invalid"); - return (_pooledCount == 1); - } - } - - - protected internal object Owner - { - // We use a weak reference to the owning object so we can identify when - // it has been garbage collected without thowing exceptions. - get - { - return _owningObject.Target; - } - } - - internal DbConnectionPool Pool - { - get - { - return _connectionPool; - } - } - - - protected internal DbReferenceCollection ReferenceCollection - { - get - { - return _referenceCollection; - } - } - - public abstract string ServerVersion - { - get; - } - - // this should be abstract but until it is added to all the providers virtual will have to do - public virtual string ServerVersionNormalized - { - get - { - throw ADP.NotSupported(); - } - } - - public bool ShouldHidePassword - { - get - { - return _hidePassword; - } - } - - public ConnectionState State - { - get - { - return _state; - } - } - + protected abstract void Activate(); internal void ActivateConnection() @@ -187,26 +28,6 @@ namespace System.Data.ProviderBase Activate(); } - internal void AddWeakReference(object value, int tag) - { - if (null == _referenceCollection) - { - _referenceCollection = CreateReferenceCollection(); - if (null == _referenceCollection) - { - throw ADP.InternalError(ADP.InternalErrorCode.CreateReferenceCollectionReturnedNull); - } - } - _referenceCollection.Add(value, tag); - } - - public abstract DbTransaction BeginTransaction(IsolationLevel il); - - public virtual void ChangeDatabase(string value) - { - throw ADP.MethodNotImplemented(); - } - internal virtual void CloseConnection(DbConnection owningObject, DbConnectionFactory connectionFactory) { // The implementation here is the implementation required for the @@ -304,245 +125,10 @@ namespace System.Data.ProviderBase } } - internal virtual void PrepareForReplaceConnection() - { - // By default, there is no preparation required - } - - protected virtual void PrepareForCloseConnection() - { - // By default, there is no preparation required - } - - protected virtual object ObtainAdditionalLocksForClose() - { - return null; // no additional locks in default implementation - } - - protected virtual void ReleaseAdditionalLocksForClose(object lockToken) - { - // no additional locks in default implementation - } - - protected virtual DbReferenceCollection CreateReferenceCollection() - { - throw ADP.InternalError(ADP.InternalErrorCode.AttemptingToConstructReferenceCollectionOnStaticObject); - } - - protected abstract void Deactivate(); - - internal void DeactivateConnection() - { - // Internal method called from the connection pooler so we don't expose - // the Deactivate method publicly. - -#if DEBUG - int activateCount = Interlocked.Decrement(ref _activateCount); - Debug.Assert(0 == activateCount, "activated multiple times?"); -#endif // DEBUG - - - if (!_connectionIsDoomed && Pool.UseLoadBalancing) - { - // If we're not already doomed, check the connection's lifetime and - // doom it if it's lifetime has elapsed. - - DateTime now = DateTime.UtcNow; - if ((now.Ticks - _createTime.Ticks) > Pool.LoadBalanceTimeout.Ticks) - { - DoNotPoolThisConnection(); - } - } - Deactivate(); - } - - public virtual void Dispose() { _connectionPool = null; _connectionIsDoomed = true; } - - protected internal void DoNotPoolThisConnection() - { - _cannotBePooled = true; - } - - /// Ensure that this connection cannot be put back into the pool. - protected internal void DoomThisConnection() - { - _connectionIsDoomed = true; - } - - - internal void MakeNonPooledObject(object owningObject) - { - // Used by DbConnectionFactory to indicate that this object IS NOT part of - // a connection pool. - - _connectionPool = null; - _owningObject.Target = owningObject; - _pooledCount = -1; - } - - internal void MakePooledConnection(DbConnectionPool connectionPool) - { - // Used by DbConnectionFactory to indicate that this object IS part of - // a connection pool. - _createTime = DateTime.UtcNow; - - _connectionPool = connectionPool; - } - - internal void NotifyWeakReference(int message) - { - DbReferenceCollection referenceCollection = ReferenceCollection; - if (null != referenceCollection) - { - referenceCollection.Notify(message); - } - } - - internal virtual void OpenConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory) - { - if (!TryOpenConnection(outerConnection, connectionFactory, null, null)) - { - throw ADP.InternalError(ADP.InternalErrorCode.SynchronousConnectReturnedPending); - } - } - - /// The default implementation is for the open connection objects, and - /// it simply throws. Our private closed-state connection objects - /// override this and do the correct thing. - // User code should either override DbConnectionInternal.Activate when it comes out of the pool - // or override DbConnectionFactory.CreateConnection when the connection is created for non-pooled connections - internal virtual bool TryOpenConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) - { - throw ADP.ConnectionAlreadyOpen(State); - } - - internal virtual bool TryReplaceConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) - { - throw ADP.MethodNotImplemented(); - } - - protected bool TryOpenConnectionInternal(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) - { - // ?->Connecting: prevent set_ConnectionString during Open - if (connectionFactory.SetInnerConnectionFrom(outerConnection, DbConnectionClosedConnecting.SingletonInstance, this)) - { - DbConnectionInternal openConnection = null; - try - { - connectionFactory.PermissionDemand(outerConnection); - if (!connectionFactory.TryGetConnection(outerConnection, retry, userOptions, this, out openConnection)) - { - return false; - } - } - catch - { - // This should occur for all exceptions, even ADP.UnCatchableExceptions. - connectionFactory.SetInnerConnectionTo(outerConnection, this); - throw; - } - if (null == openConnection) - { - connectionFactory.SetInnerConnectionTo(outerConnection, this); - throw ADP.InternalConnectionError(ADP.ConnectionError.GetConnectionReturnsNull); - } - connectionFactory.SetInnerConnectionEvent(outerConnection, openConnection); - } - - return true; - } - - internal void PrePush(object expectedOwner) - { - // Called by DbConnectionPool when we're about to be put into it's pool, we - // take this opportunity to ensure ownership and pool counts are legit. - - // IMPORTANT NOTE: You must have taken a lock on the object before - // you call this method to prevent race conditions with Clear and - // ReclaimEmancipatedObjects. - - //3 // The following tests are retail assertions of things we can't allow to happen. - if (null == expectedOwner) - { - if (null != _owningObject.Target) - { - throw ADP.InternalError(ADP.InternalErrorCode.UnpooledObjectHasOwner); // new unpooled object has an owner - } - } - else if (_owningObject.Target != expectedOwner) - { - throw ADP.InternalError(ADP.InternalErrorCode.UnpooledObjectHasWrongOwner); // unpooled object has incorrect owner - } - if (0 != _pooledCount) - { - throw ADP.InternalError(ADP.InternalErrorCode.PushingObjectSecondTime); // pushing object onto stack a second time - } - _pooledCount++; - _owningObject.Target = null; // NOTE: doing this and checking for InternalError.PooledObjectHasOwner degrades the close by 2% - } - - internal void PostPop(object newOwner) - { - // Called by DbConnectionPool right after it pulls this from it's pool, we - // take this opportunity to ensure ownership and pool counts are legit. - - Debug.Assert(!IsEmancipated, "pooled object not in pool"); - - // When another thread is clearing this pool, it - // will doom all connections in this pool without prejudice which - // causes the following assert to fire, which really mucks up stress - // against checked bits. The assert is benign, so we're commenting - // it out. - //Debug.Assert(CanBePooled, "pooled object is not poolable"); - - // IMPORTANT NOTE: You must have taken a lock on the object before - // you call this method to prevent race conditions with Clear and - // ReclaimEmancipatedObjects. - - if (null != _owningObject.Target) - { - throw ADP.InternalError(ADP.InternalErrorCode.PooledObjectHasOwner); // pooled connection already has an owner! - } - _owningObject.Target = newOwner; - _pooledCount--; - //3 // The following tests are retail assertions of things we can't allow to happen. - if (null != Pool) - { - if (0 != _pooledCount) - { - throw ADP.InternalError(ADP.InternalErrorCode.PooledObjectInPoolMoreThanOnce); // popping object off stack with multiple pooledCount - } - } - else if (-1 != _pooledCount) - { - throw ADP.InternalError(ADP.InternalErrorCode.NonPooledObjectUsedMoreThanOnce); // popping object off stack with multiple pooledCount - } - } - - internal void RemoveWeakReference(object value) - { - DbReferenceCollection referenceCollection = ReferenceCollection; - if (null != referenceCollection) - { - referenceCollection.Remove(value); - } - } - - - /// - /// When overridden in a derived class, will check if the underlying connection is still actually alive - /// - /// If true an exception will be thrown if the connection is dead instead of returning true\false - /// (this allows the caller to have the real reason that the connection is not alive (e.g. network error, etc)) - /// True if the connection is still alive, otherwise false (If not overridden, then always true) - internal virtual bool IsConnectionAlive(bool throwOnException = false) - { - return true; - } } } diff --git a/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionPool.cs b/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionPool.cs index 6ee71c12e0..6dec8d24b5 100644 --- a/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionPool.cs +++ b/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionPool.cs @@ -382,9 +382,11 @@ namespace System.Data.ProviderBase } private Timer CreateCleanupTimer() - { - return (new Timer(new TimerCallback(this.CleanupCallback), null, _cleanupWait, _cleanupWait)); - } + => ADP.UnsafeCreateTimer( + new TimerCallback(CleanupCallback), + null, + _cleanupWait, + _cleanupWait); private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection) { diff --git a/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionPoolGroup.cs b/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionPoolGroup.cs deleted file mode 100644 index 9e0a10c200..0000000000 --- a/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionPoolGroup.cs +++ /dev/null @@ -1,302 +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.Collections.Concurrent; -using System.Data.Common; -using System.Diagnostics; - -namespace System.Data.ProviderBase -{ - // set_ConnectionString calls DbConnectionFactory.GetConnectionPoolGroup - // when not found a new pool entry is created and potentially added - // DbConnectionPoolGroup starts in the Active state - - // Open calls DbConnectionFactory.GetConnectionPool - // if the existing pool entry is Disabled, GetConnectionPoolGroup is called for a new entry - // DbConnectionFactory.GetConnectionPool calls DbConnectionPoolGroup.GetConnectionPool - - // DbConnectionPoolGroup.GetConnectionPool will return pool for the current identity - // or null if identity is restricted or pooling is disabled or state is disabled at time of add - // state changes are Active->Active, Idle->Active - - // DbConnectionFactory.PruneConnectionPoolGroups calls Prune - // which will QueuePoolForRelease on all empty pools - // and once no pools remain, change state from Active->Idle->Disabled - // Once Disabled, factory can remove its reference to the pool entry - - internal sealed class DbConnectionPoolGroup - { - private readonly DbConnectionOptions _connectionOptions; - private readonly DbConnectionPoolKey _poolKey; - private readonly DbConnectionPoolGroupOptions _poolGroupOptions; - private ConcurrentDictionary _poolCollection; - - private int _state; // see PoolGroupState* below - - private DbConnectionPoolGroupProviderInfo _providerInfo; - - // always lock this before changing _state, we don't want to move out of the 'Disabled' state - // PoolGroupStateUninitialized = 0; - private const int PoolGroupStateActive = 1; // initial state, GetPoolGroup from cache, connection Open - private const int PoolGroupStateIdle = 2; // all pools are pruned via Clear - private const int PoolGroupStateDisabled = 4; // factory pool entry pruning method - - internal DbConnectionPoolGroup(DbConnectionOptions connectionOptions, DbConnectionPoolKey key, DbConnectionPoolGroupOptions poolGroupOptions) - { - Debug.Assert(null != connectionOptions, "null connection options"); - - _connectionOptions = connectionOptions; - _poolKey = key; - _poolGroupOptions = poolGroupOptions; - - // always lock this object before changing state - // HybridDictionary does not create any sub-objects until add - // so it is safe to use for non-pooled connection as long as - // we check _poolGroupOptions first - _poolCollection = new ConcurrentDictionary(); - _state = PoolGroupStateActive; - } - - internal DbConnectionOptions ConnectionOptions - { - get - { - return _connectionOptions; - } - } - - internal DbConnectionPoolKey PoolKey - { - get - { - return _poolKey; - } - } - - internal DbConnectionPoolGroupProviderInfo ProviderInfo - { - get - { - return _providerInfo; - } - set - { - _providerInfo = value; - if (null != value) - { - _providerInfo.PoolGroup = this; - } - } - } - - internal bool IsDisabled - { - get - { - return (PoolGroupStateDisabled == _state); - } - } - - - internal DbConnectionPoolGroupOptions PoolGroupOptions - { - get - { - return _poolGroupOptions; - } - } - - - internal int Clear() - { - // must be multi-thread safe with competing calls by Clear and Prune via background thread - // will return the number of connections in the group after clearing has finished - - // First, note the old collection and create a new collection to be used - ConcurrentDictionary oldPoolCollection = null; - lock (this) - { - if (_poolCollection.Count > 0) - { - oldPoolCollection = _poolCollection; - _poolCollection = new ConcurrentDictionary(); - } - } - - // Then, if a new collection was created, release the pools from the old collection - if (oldPoolCollection != null) - { - foreach (var entry in oldPoolCollection) - { - DbConnectionPool pool = entry.Value; - if (pool != null) - { - DbConnectionFactory connectionFactory = pool.ConnectionFactory; - connectionFactory.QueuePoolForRelease(pool, true); - } - } - } - - // Finally, return the pool collection count - this may be non-zero if something was added while we were clearing - return _poolCollection.Count; - } - - internal DbConnectionPool GetConnectionPool(DbConnectionFactory connectionFactory) - { - // When this method returns null it indicates that the connection - // factory should not use pooling. - - // We don't support connection pooling on Win9x; - // PoolGroupOptions will only be null when we're not supposed to pool - // connections. - DbConnectionPool pool = null; - if (null != _poolGroupOptions) - { - DbConnectionPoolIdentity currentIdentity = DbConnectionPoolIdentity.NoIdentity; - - if (_poolGroupOptions.PoolByIdentity) - { - // if we're pooling by identity (because integrated security is - // being used for these connections) then we need to go out and - // search for the connectionPool that matches the current identity. - - currentIdentity = DbConnectionPoolIdentity.GetCurrent(); - - // If the current token is restricted in some way, then we must - // not attempt to pool these connections. - if (currentIdentity.IsRestricted) - { - currentIdentity = null; - } - } - if (null != currentIdentity) - { - if (!_poolCollection.TryGetValue(currentIdentity, out pool)) - { // find the pool - DbConnectionPoolProviderInfo connectionPoolProviderInfo = connectionFactory.CreateConnectionPoolProviderInfo(this.ConnectionOptions); - - // optimistically create pool, but its callbacks are delayed until after actual add - DbConnectionPool newPool = new DbConnectionPool(connectionFactory, this, currentIdentity, connectionPoolProviderInfo); - - lock (this) - { - // Did someone already add it to the list? - if (!_poolCollection.TryGetValue(currentIdentity, out pool)) - { - if (MarkPoolGroupAsActive()) - { - // If we get here, we know for certain that we there isn't - // a pool that matches the current identity, so we have to - // add the optimistically created one - newPool.Startup(); // must start pool before usage - bool addResult = _poolCollection.TryAdd(currentIdentity, newPool); - Debug.Assert(addResult, "No other pool with current identity should exist at this point"); - pool = newPool; - newPool = null; - } - else - { - // else pool entry has been disabled so don't create new pools - Debug.Assert(PoolGroupStateDisabled == _state, "state should be disabled"); - } - } - else - { - // else found an existing pool to use instead - Debug.Assert(PoolGroupStateActive == _state, "state should be active since a pool exists and lock holds"); - } - } - - if (null != newPool) - { - // don't need to call connectionFactory.QueuePoolForRelease(newPool) because - // pool callbacks were delayed and no risk of connections being created - newPool.Shutdown(); - } - } - // the found pool could be in any state - } - } - - if (null == pool) - { - lock (this) - { - // keep the pool entry state active when not pooling - MarkPoolGroupAsActive(); - } - } - return pool; - } - - private bool MarkPoolGroupAsActive() - { - // when getting a connection, make the entry active if it was idle (but not disabled) - // must always lock this before calling - - if (PoolGroupStateIdle == _state) - { - _state = PoolGroupStateActive; - } - return (PoolGroupStateActive == _state); - } - - internal bool Prune() - { - // must only call from DbConnectionFactory.PruneConnectionPoolGroups on background timer thread - // must lock(DbConnectionFactory._connectionPoolGroups.SyncRoot) before calling ReadyToRemove - // to avoid conflict with DbConnectionFactory.CreateConnectionPoolGroup replacing pool entry - lock (this) - { - if (_poolCollection.Count > 0) - { - var newPoolCollection = new ConcurrentDictionary(); - - foreach (var entry in _poolCollection) - { - DbConnectionPool pool = entry.Value; - if (pool != null) - { - // Actually prune the pool if there are no connections in the pool and no errors occurred. - // Empty pool during pruning indicates zero or low activity, but - // an error state indicates the pool needs to stay around to - // throttle new connection attempts. - if ((!pool.ErrorOccurred) && (0 == pool.Count)) - { - // Order is important here. First we remove the pool - // from the collection of pools so no one will try - // to use it while we're processing and finally we put the - // pool into a list of pools to be released when they - // are completely empty. - DbConnectionFactory connectionFactory = pool.ConnectionFactory; - - connectionFactory.QueuePoolForRelease(pool, false); - } - else - { - newPoolCollection.TryAdd(entry.Key, entry.Value); - } - } - } - _poolCollection = newPoolCollection; - } - - // must be pruning thread to change state and no connections - // otherwise pruning thread risks making entry disabled soon after user calls ClearPool - if (0 == _poolCollection.Count) - { - if (PoolGroupStateActive == _state) - { - _state = PoolGroupStateIdle; - } - else if (PoolGroupStateIdle == _state) - { - _state = PoolGroupStateDisabled; - } - } - return (PoolGroupStateDisabled == _state); - } - } - } -} diff --git a/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbMetaDataFactory.cs b/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbMetaDataFactory.cs deleted file mode 100644 index 8c941a5a67..0000000000 --- a/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbMetaDataFactory.cs +++ /dev/null @@ -1,583 +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.Data.Common; -using System.Diagnostics; -using System.Globalization; -using System.IO; - -namespace System.Data.ProviderBase -{ - internal class DbMetaDataFactory - { // V1.2.3300 - private DataSet _metaDataCollectionsDataSet; - private string _normalizedServerVersion; - private string _serverVersionString; - // well known column names - private const string _collectionName = "CollectionName"; - private const string _populationMechanism = "PopulationMechanism"; - private const string _populationString = "PopulationString"; - private const string _maximumVersion = "MaximumVersion"; - private const string _minimumVersion = "MinimumVersion"; - private const string _dataSourceProductVersionNormalized = "DataSourceProductVersionNormalized"; - private const string _dataSourceProductVersion = "DataSourceProductVersion"; - private const string _restrictionDefault = "RestrictionDefault"; - private const string _restrictionNumber = "RestrictionNumber"; - private const string _numberOfRestrictions = "NumberOfRestrictions"; - private const string _restrictionName = "RestrictionName"; - private const string _parameterName = "ParameterName"; - - // population mechanisms - private const string _dataTable = "DataTable"; - private const string _sqlCommand = "SQLCommand"; - private const string _prepareCollection = "PrepareCollection"; - - - public DbMetaDataFactory(Stream xmlStream, string serverVersion, string normalizedServerVersion) - { - ADP.CheckArgumentNull(xmlStream, "xmlStream"); - ADP.CheckArgumentNull(serverVersion, "serverVersion"); - ADP.CheckArgumentNull(normalizedServerVersion, "normalizedServerVersion"); - - LoadDataSetFromXml(xmlStream); - - _serverVersionString = serverVersion; - _normalizedServerVersion = normalizedServerVersion; - } - - protected DataSet CollectionDataSet - { - get - { - return _metaDataCollectionsDataSet; - } - } - - protected string ServerVersion - { - get - { - return _serverVersionString; - } - } - - - protected string ServerVersionNormalized - { - get - { - return _normalizedServerVersion; - } - } - - protected DataTable CloneAndFilterCollection(string collectionName, string[] hiddenColumnNames) - { - DataTable sourceTable; - DataTable destinationTable; - DataColumn[] filteredSourceColumns; - DataColumnCollection destinationColumns; - DataRow newRow; - - sourceTable = _metaDataCollectionsDataSet.Tables[collectionName]; - - if ((sourceTable == null) || (collectionName != sourceTable.TableName)) - { - throw ADP.DataTableDoesNotExist(collectionName); - } - - destinationTable = new DataTable(collectionName); - destinationTable.Locale = CultureInfo.InvariantCulture; - destinationColumns = destinationTable.Columns; - - filteredSourceColumns = FilterColumns(sourceTable, hiddenColumnNames, destinationColumns); - - foreach (DataRow row in sourceTable.Rows) - { - if (SupportedByCurrentVersion(row) == true) - { - newRow = destinationTable.NewRow(); - for (int i = 0; i < destinationColumns.Count; i++) - { - newRow[destinationColumns[i]] = row[filteredSourceColumns[i], DataRowVersion.Current]; - } - destinationTable.Rows.Add(newRow); - newRow.AcceptChanges(); - } - } - - return destinationTable; - } - - public void Dispose() - { - Dispose(true); - } - - protected virtual void Dispose(bool disposing) - { - if (disposing) - { - _normalizedServerVersion = null; - _serverVersionString = null; - _metaDataCollectionsDataSet.Dispose(); - } - } - - private DataTable ExecuteCommand(DataRow requestedCollectionRow, String[] restrictions, DbConnection connection) - { - DataTable metaDataCollectionsTable = _metaDataCollectionsDataSet.Tables[DbMetaDataCollectionNames.MetaDataCollections]; - DataColumn populationStringColumn = metaDataCollectionsTable.Columns[_populationString]; - DataColumn numberOfRestrictionsColumn = metaDataCollectionsTable.Columns[_numberOfRestrictions]; - DataColumn collectionNameColumn = metaDataCollectionsTable.Columns[_collectionName]; - //DataColumn restrictionNameColumn = metaDataCollectionsTable.Columns[_restrictionName]; - - DataTable resultTable = null; - DbCommand command = null; - DataTable schemaTable = null; - - Debug.Assert(requestedCollectionRow != null); - String sqlCommand = requestedCollectionRow[populationStringColumn, DataRowVersion.Current] as string; - int numberOfRestrictions = (int)requestedCollectionRow[numberOfRestrictionsColumn, DataRowVersion.Current]; - String collectionName = requestedCollectionRow[collectionNameColumn, DataRowVersion.Current] as string; - - if ((restrictions != null) && (restrictions.Length > numberOfRestrictions)) - { - throw ADP.TooManyRestrictions(collectionName); - } - - command = connection.CreateCommand(); - command.CommandText = sqlCommand; - command.CommandTimeout = System.Math.Max(command.CommandTimeout, 180); - - for (int i = 0; i < numberOfRestrictions; i++) - { - DbParameter restrictionParameter = command.CreateParameter(); - - - if ((restrictions != null) && (restrictions.Length > i) && (restrictions[i] != null)) - { - restrictionParameter.Value = restrictions[i]; - } - else - { - // This is where we have to assign null to the value of the parameter. - restrictionParameter.Value = DBNull.Value; - } - - restrictionParameter.ParameterName = GetParameterName(collectionName, i + 1); - restrictionParameter.Direction = ParameterDirection.Input; - command.Parameters.Add(restrictionParameter); - } - - DbDataReader reader = null; - try - { - try - { - reader = command.ExecuteReader(); - } - catch (Exception e) - { - if (!ADP.IsCatchableExceptionType(e)) - { - throw; - } - throw ADP.QueryFailed(collectionName, e); - } - - // - - // Build a DataTable from the reader - resultTable = new DataTable(collectionName); - resultTable.Locale = CultureInfo.InvariantCulture; - - schemaTable = reader.GetSchemaTable(); - foreach (DataRow row in schemaTable.Rows) - { - resultTable.Columns.Add(row["ColumnName"] as string, (Type)row["DataType"] as Type); - } - object[] values = new object[resultTable.Columns.Count]; - while (reader.Read()) - { - reader.GetValues(values); - resultTable.Rows.Add(values); - } - } - finally - { - if (reader != null) - { - reader.Dispose(); - reader = null; - } - } - return resultTable; - } - - private DataColumn[] FilterColumns(DataTable sourceTable, string[] hiddenColumnNames, DataColumnCollection destinationColumns) - { - DataColumn newDestinationColumn; - int currentColumn; - DataColumn[] filteredSourceColumns = null; - - int columnCount = 0; - foreach (DataColumn sourceColumn in sourceTable.Columns) - { - if (IncludeThisColumn(sourceColumn, hiddenColumnNames) == true) - { - columnCount++; - } - } - - if (columnCount == 0) - { - throw ADP.NoColumns(); - } - - currentColumn = 0; - filteredSourceColumns = new DataColumn[columnCount]; - - foreach (DataColumn sourceColumn in sourceTable.Columns) - { - if (IncludeThisColumn(sourceColumn, hiddenColumnNames) == true) - { - newDestinationColumn = new DataColumn(sourceColumn.ColumnName, sourceColumn.DataType); - destinationColumns.Add(newDestinationColumn); - filteredSourceColumns[currentColumn] = sourceColumn; - currentColumn++; - } - } - return filteredSourceColumns; - } - - internal DataRow FindMetaDataCollectionRow(string collectionName) - { - bool versionFailure; - bool haveExactMatch; - bool haveMultipleInexactMatches; - string candidateCollectionName; - - DataTable metaDataCollectionsTable = _metaDataCollectionsDataSet.Tables[DbMetaDataCollectionNames.MetaDataCollections]; - if (metaDataCollectionsTable == null) - { - throw ADP.InvalidXml(); - } - - DataColumn collectionNameColumn = metaDataCollectionsTable.Columns[DbMetaDataColumnNames.CollectionName]; - - if ((null == collectionNameColumn) || (typeof(System.String) != collectionNameColumn.DataType)) - { - throw ADP.InvalidXmlMissingColumn(DbMetaDataCollectionNames.MetaDataCollections, DbMetaDataColumnNames.CollectionName); - } - - DataRow requestedCollectionRow = null; - String exactCollectionName = null; - - // find the requested collection - versionFailure = false; - haveExactMatch = false; - haveMultipleInexactMatches = false; - - foreach (DataRow row in metaDataCollectionsTable.Rows) - { - candidateCollectionName = row[collectionNameColumn, DataRowVersion.Current] as string; - if (string.IsNullOrEmpty(candidateCollectionName)) - { - throw ADP.InvalidXmlInvalidValue(DbMetaDataCollectionNames.MetaDataCollections, DbMetaDataColumnNames.CollectionName); - } - - if (ADP.CompareInsensitiveInvariant(candidateCollectionName, collectionName)) - { - if (SupportedByCurrentVersion(row) == false) - { - versionFailure = true; - } - else - { - if (collectionName == candidateCollectionName) - { - if (haveExactMatch == true) - { - throw ADP.CollectionNameIsNotUnique(collectionName); - } - requestedCollectionRow = row; - exactCollectionName = candidateCollectionName; - haveExactMatch = true; - } - else - { - // have an inexact match - ok only if it is the only one - if (exactCollectionName != null) - { - // can't fail here becasue we may still find an exact match - haveMultipleInexactMatches = true; - } - requestedCollectionRow = row; - exactCollectionName = candidateCollectionName; - } - } - } - } - - if (requestedCollectionRow == null) - { - if (versionFailure == false) - { - throw ADP.UndefinedCollection(collectionName); - } - else - { - throw ADP.UnsupportedVersion(collectionName); - } - } - - if ((haveExactMatch == false) && (haveMultipleInexactMatches == true)) - { - throw ADP.AmbigousCollectionName(collectionName); - } - - return requestedCollectionRow; - } - - private void FixUpVersion(DataTable dataSourceInfoTable) - { - Debug.Assert(dataSourceInfoTable.TableName == DbMetaDataCollectionNames.DataSourceInformation); - DataColumn versionColumn = dataSourceInfoTable.Columns[_dataSourceProductVersion]; - DataColumn normalizedVersionColumn = dataSourceInfoTable.Columns[_dataSourceProductVersionNormalized]; - - if ((versionColumn == null) || (normalizedVersionColumn == null)) - { - throw ADP.MissingDataSourceInformationColumn(); - } - - if (dataSourceInfoTable.Rows.Count != 1) - { - throw ADP.IncorrectNumberOfDataSourceInformationRows(); - } - - DataRow dataSourceInfoRow = dataSourceInfoTable.Rows[0]; - - dataSourceInfoRow[versionColumn] = _serverVersionString; - dataSourceInfoRow[normalizedVersionColumn] = _normalizedServerVersion; - dataSourceInfoRow.AcceptChanges(); - } - - - private string GetParameterName(string neededCollectionName, int neededRestrictionNumber) - { - DataTable restrictionsTable = null; - DataColumnCollection restrictionColumns = null; - DataColumn collectionName = null; - DataColumn parameterName = null; - DataColumn restrictionName = null; - DataColumn restrictionNumber = null; ; - string result = null; - - restrictionsTable = _metaDataCollectionsDataSet.Tables[DbMetaDataCollectionNames.Restrictions]; - if (restrictionsTable != null) - { - restrictionColumns = restrictionsTable.Columns; - if (restrictionColumns != null) - { - collectionName = restrictionColumns[_collectionName]; - parameterName = restrictionColumns[_parameterName]; - restrictionName = restrictionColumns[_restrictionName]; - restrictionNumber = restrictionColumns[_restrictionNumber]; - } - } - - if ((parameterName == null) || (collectionName == null) || (restrictionName == null) || (restrictionNumber == null)) - { - throw ADP.MissingRestrictionColumn(); - } - - foreach (DataRow restriction in restrictionsTable.Rows) - { - if (((string)restriction[collectionName] == neededCollectionName) && - ((int)restriction[restrictionNumber] == neededRestrictionNumber) && - (SupportedByCurrentVersion(restriction))) - { - result = (string)restriction[parameterName]; - break; - } - } - - if (result == null) - { - throw ADP.MissingRestrictionRow(); - } - - return result; - } - - public virtual DataTable GetSchema(DbConnection connection, string collectionName, string[] restrictions) - { - Debug.Assert(_metaDataCollectionsDataSet != null); - - // - DataTable metaDataCollectionsTable = _metaDataCollectionsDataSet.Tables[DbMetaDataCollectionNames.MetaDataCollections]; - DataColumn populationMechanismColumn = metaDataCollectionsTable.Columns[_populationMechanism]; - DataColumn collectionNameColumn = metaDataCollectionsTable.Columns[DbMetaDataColumnNames.CollectionName]; - DataRow requestedCollectionRow = null; - DataTable requestedSchema = null; - string[] hiddenColumns; - string exactCollectionName = null; - - requestedCollectionRow = FindMetaDataCollectionRow(collectionName); - exactCollectionName = requestedCollectionRow[collectionNameColumn, DataRowVersion.Current] as string; - - if (ADP.IsEmptyArray(restrictions) == false) - { - for (int i = 0; i < restrictions.Length; i++) - { - if ((restrictions[i] != null) && (restrictions[i].Length > 4096)) - { - // use a non-specific error because no new beta 2 error messages are allowed - // - throw ADP.NotSupported(); - } - } - } - - string populationMechanism = requestedCollectionRow[populationMechanismColumn, DataRowVersion.Current] as string; - switch (populationMechanism) - { - case _dataTable: - if (exactCollectionName == DbMetaDataCollectionNames.MetaDataCollections) - { - hiddenColumns = new string[2]; - hiddenColumns[0] = _populationMechanism; - hiddenColumns[1] = _populationString; - } - else - { - hiddenColumns = null; - } - // none of the datatable collections support restrictions - if (ADP.IsEmptyArray(restrictions) == false) - { - throw ADP.TooManyRestrictions(exactCollectionName); - } - - - requestedSchema = CloneAndFilterCollection(exactCollectionName, hiddenColumns); - - // - - // for the data source infomation table we need to fix up the version columns at run time - // since the version is determined at run time - if (exactCollectionName == DbMetaDataCollectionNames.DataSourceInformation) - { - FixUpVersion(requestedSchema); - } - break; - - case _sqlCommand: - requestedSchema = ExecuteCommand(requestedCollectionRow, restrictions, connection); - break; - - case _prepareCollection: - requestedSchema = PrepareCollection(exactCollectionName, restrictions, connection); - break; - - default: - throw ADP.UndefinedPopulationMechanism(populationMechanism); - } - - return requestedSchema; - } - - private bool IncludeThisColumn(DataColumn sourceColumn, string[] hiddenColumnNames) - { - bool result = true; - string sourceColumnName = sourceColumn.ColumnName; - - switch (sourceColumnName) - { - case _minimumVersion: - case _maximumVersion: - result = false; - break; - - default: - if (hiddenColumnNames == null) - { - break; - } - for (int i = 0; i < hiddenColumnNames.Length; i++) - { - if (hiddenColumnNames[i] == sourceColumnName) - { - result = false; - break; - } - } - break; - } - - return result; - } - - private void LoadDataSetFromXml(Stream XmlStream) - { - _metaDataCollectionsDataSet = new DataSet(); - _metaDataCollectionsDataSet.Locale = System.Globalization.CultureInfo.InvariantCulture; - _metaDataCollectionsDataSet.ReadXml(XmlStream); - } - - protected virtual DataTable PrepareCollection(String collectionName, String[] restrictions, DbConnection connection) - { - throw ADP.NotSupported(); - } - - private bool SupportedByCurrentVersion(DataRow requestedCollectionRow) - { - bool result = true; - DataColumnCollection tableColumns = requestedCollectionRow.Table.Columns; - DataColumn versionColumn; - Object version; - - // check the minimum version first - versionColumn = tableColumns[_minimumVersion]; - if (versionColumn != null) - { - version = requestedCollectionRow[versionColumn]; - if (version != null) - { - if (version != DBNull.Value) - { - if (0 > string.Compare(_normalizedServerVersion, (string)version, StringComparison.OrdinalIgnoreCase)) - { - result = false; - } - } - } - } - - // if the minmum version was ok what about the maximum version - if (result == true) - { - versionColumn = tableColumns[_maximumVersion]; - if (versionColumn != null) - { - version = requestedCollectionRow[versionColumn]; - if (version != null) - { - if (version != DBNull.Value) - { - if (0 < string.Compare(_normalizedServerVersion, (string)version, StringComparison.OrdinalIgnoreCase)) - { - result = false; - } - } - } - } - } - - return result; - } - } -} - - diff --git a/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbReferenceCollection.cs b/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbReferenceCollection.cs deleted file mode 100644 index 442ca95301..0000000000 --- a/external/corefx/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbReferenceCollection.cs +++ /dev/null @@ -1,282 +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.Threading; - -namespace System.Data.ProviderBase -{ - internal abstract class DbReferenceCollection - { - private struct CollectionEntry - { - private int _tag; // information about the reference - private WeakReference _weak; // the reference itself. - - public void NewTarget(int tag, object target) - { - Debug.Assert(!HasTarget, "Entry already has a valid target"); - Debug.Assert(tag != 0, "Bad tag"); - Debug.Assert(target != null, "Invalid target"); - - if (_weak == null) - { - _weak = new WeakReference(target, false); - } - else - { - _weak.Target = target; - } - _tag = tag; - } - - public void RemoveTarget() - { - _tag = 0; - } - - public bool HasTarget - { - get - { - return ((_tag != 0) && (_weak.IsAlive)); - } - } - - public int Tag - { - get - { - return _tag; - } - } - - public object Target - { - get - { - return (_tag == 0 ? null : _weak.Target); - } - } - } - - private const int LockPollTime = 100; // Time to wait (in ms) between attempting to get the _itemLock - private const int DefaultCollectionSize = 20; // Default size for the collection, and the amount to grow every time the collection is full - private CollectionEntry[] _items; // The collection of items we are keeping track of - private readonly object _itemLock; // Used to synchronize access to the _items collection - private int _optimisticCount; // (#ItemsAdded - #ItemsRemoved) - This estimates the number of items that we *should* have (but doesn't take into account item targets being GC'd) - private int _lastItemIndex; // Location of the last item in _items - private volatile bool _isNotifying; // Indicates that the collection is currently being notified (and, therefore, about to be cleared) - - protected DbReferenceCollection() - { - _items = new CollectionEntry[DefaultCollectionSize]; - _itemLock = new object(); - _optimisticCount = 0; - _lastItemIndex = 0; - } - - public abstract void Add(object value, int tag); - - protected void AddItem(object value, int tag) - { - Debug.Assert(null != value && 0 != tag, "AddItem with null value or 0 tag"); - bool itemAdded = false; - - lock (_itemLock) - { - // Try to find a free spot - for (int i = 0; i <= _lastItemIndex; ++i) - { - if (_items[i].Tag == 0) - { - _items[i].NewTarget(tag, value); - Debug.Assert(_items[i].HasTarget, "missing expected target"); - itemAdded = true; - break; - } - } - - // No free spots, can we just add on to the end? - if ((!itemAdded) && (_lastItemIndex + 1 < _items.Length)) - { - _lastItemIndex++; - _items[_lastItemIndex].NewTarget(tag, value); - itemAdded = true; - } - - // If no free spots and no space at the end, try to find a dead item - if (!itemAdded) - { - for (int i = 0; i <= _lastItemIndex; ++i) - { - if (!_items[i].HasTarget) - { - _items[i].NewTarget(tag, value); - Debug.Assert(_items[i].HasTarget, "missing expected target"); - itemAdded = true; - break; - } - } - } - - // If nothing was free, then resize and add to the end - if (!itemAdded) - { - Array.Resize(ref _items, _items.Length * 2); - _lastItemIndex++; - _items[_lastItemIndex].NewTarget(tag, value); - } - - _optimisticCount++; - } - } - - internal T FindItem(int tag, Func filterMethod) where T : class - { - bool lockObtained = false; - try - { - TryEnterItemLock(ref lockObtained); - if (lockObtained) - { - if (_optimisticCount > 0) - { - // Loop through the items - for (int counter = 0; counter <= _lastItemIndex; counter++) - { - // Check tag (should be easiest and quickest) - if (_items[counter].Tag == tag) - { - // NOTE: Check if the returned value is null twice may seem wasteful, but this if for performance - // Since checking for null twice is cheaper than calling both HasTarget and Target OR always attempting to typecast - object value = _items[counter].Target; - if (value != null) - { - // Make sure the item has the correct type and passes the filtering - T tempItem = value as T; - if ((tempItem != null) && (filterMethod(tempItem))) - { - return tempItem; - } - } - } - } - } - } - } - finally - { - ExitItemLockIfNeeded(lockObtained); - } - - // If we got to here, then no item was found, so return null - return null; - } - - public void Notify(int message) - { - bool lockObtained = false; - try - { - TryEnterItemLock(ref lockObtained); - if (lockObtained) - { - try - { - _isNotifying = true; - - // Loop through each live item and notify it - if (_optimisticCount > 0) - { - for (int index = 0; index <= _lastItemIndex; ++index) - { - object value = _items[index].Target; // checks tag & gets target - if (null != value) - { - NotifyItem(message, _items[index].Tag, value); - _items[index].RemoveTarget(); - } - Debug.Assert(!_items[index].HasTarget, "Unexpected target after notifying"); - } - _optimisticCount = 0; - } - - // Shrink collection (if needed) - if (_items.Length > 100) - { - _lastItemIndex = 0; - _items = new CollectionEntry[DefaultCollectionSize]; - } - } - finally - { - _isNotifying = false; - } - } - } - finally - { - ExitItemLockIfNeeded(lockObtained); - } - } - - protected abstract void NotifyItem(int message, int tag, object value); - - public abstract void Remove(object value); - - protected void RemoveItem(object value) - { - Debug.Assert(null != value, "RemoveItem with null"); - - bool lockObtained = false; - try - { - TryEnterItemLock(ref lockObtained); - - if (lockObtained) - { - // Find the value, and then remove the target from our collection - if (_optimisticCount > 0) - { - for (int index = 0; index <= _lastItemIndex; ++index) - { - if (value == _items[index].Target) - { // checks tag & gets target - _items[index].RemoveTarget(); - _optimisticCount--; - break; - } - } - } - } - } - finally - { - ExitItemLockIfNeeded(lockObtained); - } - } - - // This is polling lock that will abandon getting the lock if _isNotifying is set to true - private void TryEnterItemLock(ref bool lockObtained) - { - // Assume that we couldn't take the lock - lockObtained = false; - // Keep trying to take the lock until either we've taken it, or the collection is being notified - while ((!_isNotifying) && (!lockObtained)) - { - Monitor.TryEnter(_itemLock, LockPollTime, ref lockObtained); - } - } - - private void ExitItemLockIfNeeded(bool lockObtained) - { - if (lockObtained) - { - Monitor.Exit(_itemLock); - } - } - } -} - diff --git a/external/corefx/src/System.Data.Odbc/src/MatchingRefApiCompatBaseline.txt b/external/corefx/src/System.Data.Odbc/src/MatchingRefApiCompatBaseline.txt new file mode 100644 index 0000000000..871e84a2eb --- /dev/null +++ b/external/corefx/src/System.Data.Odbc/src/MatchingRefApiCompatBaseline.txt @@ -0,0 +1,6 @@ +# Exposed publicly only in implementation for serialization compat +TypesMustExist : Type 'System.Data.Odbc.ODBC32' does not exist in the implementation but it does exist in the contract. + +# Cannot be exposed in the ref yet as it is new API that doesn't exist in netfx +MembersMustExist : Member 'System.Data.Odbc.OdbcParameter.Offset.get()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Data.Odbc.OdbcParameter.Offset.set(System.Int32)' does not exist in the implementation but it does exist in the contract. diff --git a/external/corefx/src/System.Data.Odbc/src/Resources/System.Data.Odbc.OdbcMetaData.xml b/external/corefx/src/System.Data.Odbc/src/Resources/System.Data.Odbc.OdbcMetaData.xml new file mode 100644 index 0000000000..122abae606 --- /dev/null +++ b/external/corefx/src/System.Data.Odbc/src/Resources/System.Data.Odbc.OdbcMetaData.xml @@ -0,0 +1,1013 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MetaDataCollections + 0 + 0 + DataTable + MetaDataCollections + + + DataSourceInformation + 0 + 0 + PrepareCollection + DataSourceInformation + + + DataTypes + 0 + 0 + PrepareCollection + DataTypes + + + Restrictions + 0 + 0 + DataTable + Restrictions + + + ReservedWords + 0 + 0 + PrepareCollection + ReservedWords + + + Columns + 4 + 4 + PrepareCollection + + + Indexes + 4 + 4 + PrepareCollection + + + Procedures + 4 + 3 + PrepareCollection + + + ProcedureColumns + 4 + 4 + PrepareCollection + + + ProcedureParameters + 4 + 4 + PrepareCollection + + + Tables + 3 + 3 + PrepareCollection + + + Views + 3 + 3 + PrepareCollection + + + Columns + TABLE_CAT + 1 + + + Columns + TABLE_SCHEM + 2 + + + Columns + TABLE_NAME + 3 + + + Columns + COLUMN_NAME + 4 + + + Indexes + TABLE_CAT + 1 + + + Indexes + TABLE_SCHEM + 2 + + + Indexes + TABLE_NAME + 3 + + + Indexes + INDEX_NAME + 4 + + + Procedures + PROCEDURE_CAT + 1 + + + Procedures + PROCEDURE_SCHEM + 2 + + + Procedures + PROCEDURE_NAME + 3 + + + Procedures + PROCEDURE_TYPE + 4 + + + ProcedureColumns + PROCEDURE_CAT + 1 + + + ProcedureColumns + PROCEDURE_SCHE + 2 + + + ProcedureColumns + PROCEDURE_NAME + 3 + + + ProcedureColumns + COLUMN_NAME + 4 + + + ProcedureParameters + PROCEDURE_CAT + 1 + + + ProcedureParameters + PROCEDURE_SCHEM + 2 + + + ProcedureParameters + PROCEDURE_NAME + 3 + + + ProcedureParameters + COLUMN_NAME + 4 + + + Tables + TABLE_CAT + 1 + + + Tables + TABLE_SCHEM + 2 + + + Tables + TABLE_NAME + 3 + + + Views + TABLE_CAT + 1 + + + Views + TABLE_SCHEM + 2 + + + Views + TABLE_NAME + 3 + + + + + + ABSOLUTE + + + ACTION + + + ADA + + + ADD + + + ALL + + + ALLOCATE + + + ALTER + + + AND + + + ANY + + + ARE + + + AS + + + ASC + + + ASSERTION + + + AT + + + AUTHORIZATION + + + AVG + + + BEGIN + + + BETWEEN + + + BIT + + + BIT_LENGTH + + + BOTH + + + BY + + + CASCADE + + + CASCADED + + + CASE + + + CAST + + + CATALOG + + + CHAR + + + CHAR_LENGTH + + + CHARACTER + + + CHARACTER_LENGTH + + + CHECK + + + CLOSE + + + COALESCE + + + COLLATE + + + COLLATION + + + COLUMN + + + COMMIT + + + CONNECT + + + CONNECTION + + + CONSTRAINT + + + CONSTRAINTS + + + CONTINUE + + + CONVERT + + + CORRESPONDING + + + COUNT + + + CREATE + + + CROSS + + + CURRENT + + + CURRENT_DATE + + + CURRENT_TIME + + + CURRENT_TIMESTAMP + + + CURRENT_USER + + + CURSOR + + + DATE + + + DAY + + + DEALLOCATE + + + DEC + + + DECIMAL + + + DECLARE + + + DEFAULT + + + DEFERRABLE + + + DEFERRED + + + DELETE + + + DESC + + + DESCRIBE + + + DESCRIPTOR + + + DIAGNOSTICS + + + DISCONNECT + + + DISTINCT + + + DOMAIN + + + DOUBLE + + + DROP + + + ELSE + + + END + + + END-EXEC + + + ESCAPE + + + EXCEPT + + + EXCEPTION + + + EXEC + + + EXECUTE + + + EXISTS + + + EXTERNAL + + + EXTRACT + + + FALSE + + + FETCH + + + FIRST + + + FLOAT + + + FOR + + + FOREIGN + + + FORTRAN + + + FOUND + + + FROM + + + FULL + + + GET + + + GLOBAL + + + GO + + + GOTO + + + GRANT + + + GROUP + + + HAVING + + + HOUR + + + IDENTITY + + + IMMEDIATE + + + IN + + + INCLUDE + + + INDEX + + + INDICATOR + + + INITIALLY + + + INNER + + + INPUT + + + INSENSITIVE + + + INSERT + + + INT + + + INTEGER + + + INTERSECT + + + INTERVAL + + + INTO + + + IS + + + ISOLATION + + + JOIN + + + KEY + + + LANGUAGE + + + LAST + + + LEADING + + + LEFT + + + LEVEL + + + LIKE + + + LOCAL + + + LOWER + + + MATCH + + + MAX + + + MIN + + + MINUTE + + + MODULE + + + MONTH + + + NAMES + + + NATIONAL + + + NATURAL + + + NCHAR + + + NEXT + + + NO + + + NONE + + + NOT + + + NULL + + + NULLIF + + + NUMERIC + + + OCTET_LENGTH + + + OF + + + ON + + + ONLY + + + OPEN + + + OPTION + + + OR + + + ORDER + + + OUTER + + + OUTPUT + + + OVERLAPS + + + PAD + + + PARTIAL + + + PASCAL + + + POSITION + + + PRECISION + + + PREPARE + + + PRESERVE + + + PRIMARY + + + PRIOR + + + PRIVILEGES + + + PROCEDURE + + + PUBLIC + + + READ + + + REAL + + + REFERENCES + + + RELATIVE + + + RESTRICT + + + REVOKE + + + RIGHT + + + ROLLBACK + + + ROWS + + + SCHEMA + + + SCROLL + + + SECOND + + + SECTION + + + SELECT + + + SESSION + + + SESSION_USER + + + SET + + + SIZE + + + SMALLINT + + + SOME + + + SPACE + + + SQL + + + SQLCA + + + SQLCODE + + + SQLERROR + + + SQLSTATE + + + SQLWARNING + + + SUBSTRING + + + SUM + + + SYSTEM_USER + + + TABLE + + + TEMPORARY + + + THEN + + + TIME + + + TIMESTAMP + + + TIMEZONE_HOUR + + + TIMEZONE_MINUTE + + + TO + + + TRAILING + + + TRANSACTION + + + TRANSLATE + + + TRANSLATION + + + TRIM + + + TRUE + + + UNION + + + UNIQUE + + + UNKNOWN + + + UPDATE + + + UPPER + + + USAGE + + + USER + + + USING + + + VALUE + + + VALUES + + + VARCHAR + + + VARYING + + + VIEW + + + WHEN + + + WHENEVER + + + WHERE + + + WITH + + + WORK + + + WRITE + + + YEAR + + + ZONE + + diff --git a/external/corefx/src/System.Data.Odbc/src/System.Data.Odbc.csproj b/external/corefx/src/System.Data.Odbc/src/System.Data.Odbc.csproj index 9f9a3db2aa..2a3f098d98 100644 --- a/external/corefx/src/System.Data.Odbc/src/System.Data.Odbc.csproj +++ b/external/corefx/src/System.Data.Odbc/src/System.Data.Odbc.csproj @@ -32,6 +32,9 @@ Common\System\Data\Common\AdapterUtil.cs + + System\Data\Common\AdapterUtil.Drivers.cs + @@ -49,24 +52,41 @@ - - Common\System\Data\ProviderBase\FieldNameLookup.cs Common\System\Data\ProviderBase\BasicFieldNameLookup.cs + + System\Data\ProviderBase\DbConnectionInternal.cs + + + System\Data\ProviderBase\DbConnectionFactory.cs + + + System\Data\ProviderBase\DbConnectionPoolGroup.cs + + + System\Data\ProviderBase\TimeoutTimer.cs + + + System\Data\ProviderBase\DbReferenceCollection.cs + + + System\Data\ProviderBase\DbMetaDataFactory.cs + + + System\Data\ProviderBase\DbConnectionClosed.cs + - - @@ -179,6 +199,11 @@ + + + System.Data.Odbc.OdbcMetaData.xml + + diff --git a/external/corefx/src/System.Data.Odbc/src/System/Data/Odbc/OdbcConnectionFactory.cs b/external/corefx/src/System.Data.Odbc/src/System/Data/Odbc/OdbcConnectionFactory.cs index 9d910e748d..1287c54033 100644 --- a/external/corefx/src/System.Data.Odbc/src/System/Data/Odbc/OdbcConnectionFactory.cs +++ b/external/corefx/src/System.Data.Odbc/src/System/Data/Odbc/OdbcConnectionFactory.cs @@ -2,9 +2,11 @@ // 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.Collections.Specialized; using System.Data.Common; using System.Data.ProviderBase; using System.Diagnostics; +using System.IO; namespace System.Data.Odbc { @@ -50,6 +52,36 @@ namespace System.Data.Odbc return new OdbcConnectionPoolGroupProviderInfo(); } + protected override DbMetaDataFactory CreateMetaDataFactory(DbConnectionInternal internalConnection, out bool cacheMetaDataFactory) + { + Debug.Assert(internalConnection != null, "internalConnection may not be null."); + cacheMetaDataFactory = false; + + OdbcConnection odbcOuterConnection = ((OdbcConnectionOpen)internalConnection).OuterConnection; + Debug.Assert(odbcOuterConnection != null, "outer connection may not be null."); + + // get the DBMS Name + object driverName = null; + string stringValue = odbcOuterConnection.GetInfoStringUnhandled(ODBC32.SQL_INFO.DRIVER_NAME); + if (stringValue != null) + { + driverName = stringValue; + } + + Stream XMLStream = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream("System.Data.Odbc.OdbcMetaData.xml"); + cacheMetaDataFactory = true; + + + Debug.Assert(XMLStream != null, "XMLstream may not be null."); + + String versionString = odbcOuterConnection.GetInfoStringUnhandled(ODBC32.SQL_INFO.DBMS_VER); + + return new OdbcMetaDataFactory(XMLStream, + versionString, + versionString, + odbcOuterConnection); + } + internal override DbConnectionPoolGroup GetConnectionPoolGroup(DbConnection connection) { OdbcConnection c = (connection as OdbcConnection); diff --git a/external/corefx/src/System.Data.Odbc/src/System/Data/Odbc/OdbcConnectionHelper.cs b/external/corefx/src/System.Data.Odbc/src/System/Data/Odbc/OdbcConnectionHelper.cs index 481e9e4373..6927b92369 100644 --- a/external/corefx/src/System.Data.Odbc/src/System/Data/Odbc/OdbcConnectionHelper.cs +++ b/external/corefx/src/System.Data.Odbc/src/System/Data/Odbc/OdbcConnectionHelper.cs @@ -175,6 +175,22 @@ namespace System.Data.Odbc partial void RepairInnerConnection(); + override public DataTable GetSchema() + { + return this.GetSchema(DbMetaDataCollectionNames.MetaDataCollections, null); + } + + override public DataTable GetSchema(string collectionName) + { + return this.GetSchema(collectionName, null); + } + + override public DataTable GetSchema(string collectionName, string[] restrictionValues) + { + // NOTE: This is virtual because not all providers may choose to support + // returning schema data + return InnerConnection.GetSchema(ConnectionFactory, PoolGroup, this, collectionName, restrictionValues); + } internal void NotifyWeakReference(int message) { diff --git a/external/corefx/src/System.Data.Odbc/tests/Helpers.cs b/external/corefx/src/System.Data.Odbc/tests/Helpers.cs index 0ab71a1910..126b8657fc 100644 --- a/external/corefx/src/System.Data.Odbc/tests/Helpers.cs +++ b/external/corefx/src/System.Data.Odbc/tests/Helpers.cs @@ -2,12 +2,6 @@ // 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; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.InteropServices; -using System.Text; -using System.Threading.Tasks; namespace System.Data.Odbc.Tests { diff --git a/external/corefx/src/System.Data.Odbc/tests/OdbcConnectionSchemaTests.cs b/external/corefx/src/System.Data.Odbc/tests/OdbcConnectionSchemaTests.cs new file mode 100644 index 0000000000..caf10e3415 --- /dev/null +++ b/external/corefx/src/System.Data.Odbc/tests/OdbcConnectionSchemaTests.cs @@ -0,0 +1,37 @@ +// 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 Xunit; + +namespace System.Data.Odbc.Tests +{ + public class OdbcConnectionSchemaTests + { + [CheckConnStrSetupFact] + public void TestConnectionSchemaOnOpenConnection() + { + string connectionString = DataTestUtility.OdbcConnStr; + + using (OdbcConnection connection = new OdbcConnection(connectionString)) + { + connection.GetSchema(); + connection.Open(); + DataTable schema = connection.GetSchema(); + Assert.NotNull(schema); + + DataTable tableSchema = connection.GetSchema("Tables"); + Assert.NotNull(tableSchema); + } + } + + [Fact] + public void TestConnectionSchemaOnNonOpenConnection() + { + using (OdbcConnection connection = new OdbcConnection(string.Empty)) + { + Assert.Throws(() => connection.GetSchema()); + } + } + } +} diff --git a/external/corefx/src/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj b/external/corefx/src/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj index 287eec667c..361e88a376 100644 --- a/external/corefx/src/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj +++ b/external/corefx/src/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj @@ -16,6 +16,7 @@ + @@ -50,4 +51,4 @@ - + \ No newline at end of file diff --git a/external/corefx/src/System.Data.SqlClient/dir.props b/external/corefx/src/System.Data.SqlClient/dir.props index fbff37a79f..2e27354ae7 100644 --- a/external/corefx/src/System.Data.SqlClient/dir.props +++ b/external/corefx/src/System.Data.SqlClient/dir.props @@ -2,7 +2,7 @@ - 4.3.1.0 + 4.4.0.0 MSFT true diff --git a/external/corefx/src/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj b/external/corefx/src/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj index f02abb8b86..66578cc337 100644 --- a/external/corefx/src/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj +++ b/external/corefx/src/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj @@ -3,13 +3,9 @@ - net461;netcoreapp2.0;$(UAPvNextTFM);$(AllXamarinFrameworks) + net461;netcoreapp2.0;uap10.0.16299;$(UAPvNextTFM);$(AllXamarinFrameworks) - - - runtimes/win/lib/$(UAPvNextTFM) - @@ -19,6 +15,15 @@ net46;netcoreapp1.0 + + + + .NETCoreApp;UAP + diff --git a/external/corefx/src/System.Data.SqlClient/ref/Configurations.props b/external/corefx/src/System.Data.SqlClient/ref/Configurations.props index d9777d8275..c994e0a316 100644 --- a/external/corefx/src/System.Data.SqlClient/ref/Configurations.props +++ b/external/corefx/src/System.Data.SqlClient/ref/Configurations.props @@ -4,6 +4,7 @@ netstandard; netfx; + netcoreapp; \ No newline at end of file diff --git a/external/corefx/src/System.Data.SqlClient/ref/System.Data.SqlClient.NetCoreApp.cs b/external/corefx/src/System.Data.SqlClient/ref/System.Data.SqlClient.NetCoreApp.cs new file mode 100644 index 0000000000..967da8d258 --- /dev/null +++ b/external/corefx/src/System.Data.SqlClient/ref/System.Data.SqlClient.NetCoreApp.cs @@ -0,0 +1,14 @@ +// 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. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the http://aka.ms/api-review process. +// ------------------------------------------------------------------------------ + +namespace System.Data.SqlClient +{ + public partial class SqlDataReader : System.Data.Common.IDbColumnSchemaGenerator + { + public System.Collections.ObjectModel.ReadOnlyCollection GetColumnSchema() { throw null; } + } +} diff --git a/external/corefx/src/System.Data.SqlClient/ref/System.Data.SqlClient.cs b/external/corefx/src/System.Data.SqlClient/ref/System.Data.SqlClient.cs index f84f25ce4f..be6f1cf754 100644 --- a/external/corefx/src/System.Data.SqlClient/ref/System.Data.SqlClient.cs +++ b/external/corefx/src/System.Data.SqlClient/ref/System.Data.SqlClient.cs @@ -158,7 +158,12 @@ namespace Microsoft.SqlServer.Server public SqlMetaData(string name, System.Data.SqlDbType dbType, long maxLength, long locale, System.Data.SqlTypes.SqlCompareOptions compareOptions, bool useServerDefault, bool isUniqueKey, System.Data.SqlClient.SortOrder columnSortOrder, int sortOrdinal) { } public SqlMetaData(string name, System.Data.SqlDbType dbType, string database, string owningSchema, string objectName) { } public SqlMetaData(string name, System.Data.SqlDbType dbType, string database, string owningSchema, string objectName, bool useServerDefault, bool isUniqueKey, System.Data.SqlClient.SortOrder columnSortOrder, int sortOrdinal) { } + public SqlMetaData(string name, System.Data.SqlDbType dbType, System.Type userDefinedType) { } + public SqlMetaData(string name, System.Data.SqlDbType dbType, System.Type userDefinedType, string serverTypeName) { } + public SqlMetaData(string name, System.Data.SqlDbType dbType, System.Type userDefinedType, string serverTypeName, bool useServerDefault, bool isUniqueKey, System.Data.SqlClient.SortOrder columnSortOrder, int sortOrdinal) { } + public System.Data.SqlTypes.SqlCompareOptions CompareOptions { get { throw null; } } + public System.Data.DbType DbType { get { throw null; } } public bool IsUniqueKey { get { throw null; } } public long LocaleId { get { throw null; } } public static long Max { get { throw null; } } @@ -169,6 +174,7 @@ namespace Microsoft.SqlServer.Server public System.Data.SqlClient.SortOrder SortOrder { get { throw null; } } public int SortOrdinal { get { throw null; } } public System.Data.SqlDbType SqlDbType { get { throw null; } } + public System.Type Type{ get { throw null; } } public string TypeName { get { throw null; } } public bool UseServerDefault { get { throw null; } } public string XmlSchemaCollectionDatabase { get { throw null; } } @@ -416,6 +422,9 @@ namespace System.Data.SqlClient public System.Xml.XmlReader ExecuteXmlReader() { throw null; } public System.Threading.Tasks.Task ExecuteXmlReaderAsync() { throw null; } public System.Threading.Tasks.Task ExecuteXmlReaderAsync(System.Threading.CancellationToken cancellationToken) { throw null; } + public System.IAsyncResult BeginExecuteXmlReader() { throw null; } + public System.IAsyncResult BeginExecuteXmlReader(System.AsyncCallback callback, object stateObject) { throw null; } + public System.Xml.XmlReader EndExecuteXmlReader(System.IAsyncResult asyncResult) { throw null; } public override void Prepare() { } public System.Data.Sql.SqlNotificationRequest Notification { get { throw null; } set { } } public void ResetCommandTimeout() { } @@ -451,6 +460,7 @@ namespace System.Data.SqlClient { public SqlConnection() { } public SqlConnection(string connectionString) { } + public SqlConnection(string connectionString, System.Data.SqlClient.SqlCredential credential) { } public System.Guid ClientConnectionId { get { throw null; } } object ICloneable.Clone() { throw null; } public override string ConnectionString { get { throw null; } set { } } @@ -463,6 +473,7 @@ namespace System.Data.SqlClient public override System.Data.ConnectionState State { get { throw null; } } public bool StatisticsEnabled { get { throw null; } set { } } public string WorkstationId { get { throw null; } } + public System.Data.SqlClient.SqlCredential Credential { get { throw null; } set { } } public event System.Data.SqlClient.SqlInfoMessageEventHandler InfoMessage { add { } remove { } } protected override System.Data.Common.DbTransaction BeginDbTransaction(System.Data.IsolationLevel isolationLevel) { throw null; } public new System.Data.SqlClient.SqlTransaction BeginTransaction() { throw null; } @@ -475,10 +486,16 @@ namespace System.Data.SqlClient public override void Close() { } public new System.Data.SqlClient.SqlCommand CreateCommand() { throw null; } protected override System.Data.Common.DbCommand CreateDbCommand() { throw null; } + public override System.Data.DataTable GetSchema() { throw null; } + public override System.Data.DataTable GetSchema(string collectionName) { throw null; } + public override System.Data.DataTable GetSchema(string collectionName, string[] restrictionValues) { throw null; } public override void Open() { } public override System.Threading.Tasks.Task OpenAsync(System.Threading.CancellationToken cancellationToken) { throw null; } public void ResetStatistics() { } public System.Collections.IDictionary RetrieveStatistics() { throw null; } + public static void ChangePassword(string connectionString, string newPassword) { throw null; } + public static void ChangePassword(string connectionString, System.Data.SqlClient.SqlCredential credential, System.Security.SecureString newPassword) { throw null; } + } public sealed partial class SqlConnectionStringBuilder : System.Data.Common.DbConnectionStringBuilder { @@ -678,6 +695,7 @@ namespace System.Data.SqlClient public virtual object GetSqlValue(int i) { throw null; } public virtual int GetSqlValues(object[] values) { throw null; } public virtual System.Data.SqlTypes.SqlXml GetSqlXml(int i) { throw null; } + public override System.Data.DataTable GetSchemaTable() { throw null; } public override System.IO.Stream GetStream(int i) { throw null; } public override string GetString(int i) { throw null; } public override System.IO.TextReader GetTextReader(int i) { throw null; } @@ -686,6 +704,7 @@ namespace System.Data.SqlClient public override int GetValues(object[] values) { throw null; } public virtual System.Xml.XmlReader GetXmlReader(int i) { throw null; } public override bool IsDBNull(int i) { throw null; } + protected internal bool IsCommandBehavior(System.Data.CommandBehavior condition) { throw null; } public override System.Threading.Tasks.Task IsDBNullAsync(int i, System.Threading.CancellationToken cancellationToken) { throw null; } public override bool NextResult() { throw null; } public override System.Threading.Tasks.Task NextResultAsync(System.Threading.CancellationToken cancellationToken) { throw null; } @@ -779,6 +798,8 @@ namespace System.Data.SqlClient { internal SqlParameterCollection() { } public override int Count { get { throw null; } } + public override bool IsFixedSize { get { throw null; } } + public override bool IsReadOnly { get { throw null; } } public new System.Data.SqlClient.SqlParameter this[int index] { get { throw null; } set { } } public new System.Data.SqlClient.SqlParameter this[string parameterName] { get { throw null; } set { } } public override object SyncRoot { get { throw null; } } @@ -830,6 +851,13 @@ namespace System.Data.SqlClient public void Rollback(string transactionName) { } public void Save(string savePointName) { } } + + public sealed class SqlCredential + { + public SqlCredential(string userId, System.Security.SecureString password) { } + public string UserId { get { throw null; } } + public System.Security.SecureString Password { get { throw null; } } + } } namespace System.Data { diff --git a/external/corefx/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj b/external/corefx/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj index 4388a63c5a..e43848066d 100644 --- a/external/corefx/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj +++ b/external/corefx/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj @@ -4,24 +4,35 @@ {D58E8D2B-3331-4660-8DFB-512D66F8EC63} true - - 4.3.1.0 + + - + + + + + + + + + + + + + \ No newline at end of file diff --git a/external/corefx/src/System.Data.SqlClient/src/Configurations.props b/external/corefx/src/System.Data.SqlClient/src/Configurations.props index abd5922776..3be4b316f4 100644 --- a/external/corefx/src/System.Data.SqlClient/src/Configurations.props +++ b/external/corefx/src/System.Data.SqlClient/src/Configurations.props @@ -8,10 +8,14 @@ netstandard1.3; netstandard; netfx-Windows_NT; + netcoreapp; + netcoreapp-Unix; + netcoreapp-Windows_NT; + uap10.0.16299-Windows_NT; + uap-Windows_NT; $(PackageConfigurations) - uap-Windows_NT; \ No newline at end of file diff --git a/external/corefx/src/System.Data.SqlClient/src/MatchingRefApiCompatBaseline.txt b/external/corefx/src/System.Data.SqlClient/src/MatchingRefApiCompatBaseline.txt new file mode 100644 index 0000000000..3cd7225c50 --- /dev/null +++ b/external/corefx/src/System.Data.SqlClient/src/MatchingRefApiCompatBaseline.txt @@ -0,0 +1,10 @@ +# +# netstandard dll has been shipped with IDbColumnSchemaGenerator inherited and SqlDataReader.GetColumnScheme() implemented in source, but not exposed in ref contract. +# Removing SqlDataReader.GetColumnScheme() from netstandard implementation potentially breaks existing customer source code +# that utilizes SqlDataReader.GetColumnScheme() indirectly by casting SqlDataReader to IDbColumnSchemaGenerator type. +# In order to prevent it, the API needs to be kept in public, and following 2 error message should be remaining in this baseline file. +# +Compat issues with assembly System.Data.SqlClient: +CannotRemoveBaseTypeOrInterface : Type 'System.Data.SqlClient.SqlDataReader' does not implement interface 'System.Data.Common.IDbColumnSchemaGenerator' in the implementation but it does in the contract. +MembersMustExist : Member 'System.Data.SqlClient.SqlDataReader.GetColumnSchema()' does not exist in the implementation but it does exist in the contract. +Total Issues: 2 diff --git a/external/corefx/src/System.Data.SqlClient/src/Microsoft/SqlServer/Server/SqlDataRecord.cs b/external/corefx/src/System.Data.SqlClient/src/Microsoft/SqlServer/Server/SqlDataRecord.cs index 241e7450f6..869033de29 100644 --- a/external/corefx/src/System.Data.SqlClient/src/Microsoft/SqlServer/Server/SqlDataRecord.cs +++ b/external/corefx/src/System.Data.SqlClient/src/Microsoft/SqlServer/Server/SqlDataRecord.cs @@ -729,7 +729,7 @@ namespace Microsoft.SqlServer.Server } } - IDataReader System.Data.IDataRecord.GetData (int ordinal) + IDataReader System.Data.IDataRecord.GetData(int ordinal) { throw ADP.NotSupported(); } diff --git a/external/corefx/src/System.Data.SqlClient/src/PinvokeAnalyzerExceptionList.analyzerdata.netcoreapp b/external/corefx/src/System.Data.SqlClient/src/PinvokeAnalyzerExceptionList.analyzerdata.netcoreapp new file mode 100644 index 0000000000..5c0648966d --- /dev/null +++ b/external/corefx/src/System.Data.SqlClient/src/PinvokeAnalyzerExceptionList.analyzerdata.netcoreapp @@ -0,0 +1,44 @@ + +kernel32.dll!LoadLibraryExW +sni.dll!GetSniMaxComposedSpnLength +sni.dll!SNIAddProviderWrapper +sni.dll!SNICheckConnectionWrapper +sni.dll!SNICloseWrapper +sni.dll!SNIGetInfoWrapper +sni.dll!SNIGetLastError +sni.dll!SNIInitialize +sni.dll!SNIOpenSyncExWrapper +sni.dll!SNIOpenWrapper +sni.dll!SNIPacketAllocateWrapper +sni.dll!SNIPacketGetDataWrapper +sni.dll!SNIPacketRelease +sni.dll!SNIPacketResetWrapper +sni.dll!SNIPacketSetData +sni.dll!SNIQueryInfo +sni.dll!SNIReadAsyncWrapper +sni.dll!SNIReadSyncOverAsync +sni.dll!SNIRemoveProviderWrapper +sni.dll!SNISecGenClientContextWrapper +sni.dll!SNISecInitPackage +sni.dll!SNISetInfoWrapper +sni.dll!SNITerminate +sni.dll!SNIWaitForSSLHandshakeToCompleteWrapper +sni.dll!SNIWriteAsyncWrapper +sni.dll!SNIWriteSyncOverAsync +sni.dll!UnmanagedIsTokenRestricted +sspicli.dll!AcceptSecurityContext +sspicli.dll!AcquireCredentialsHandleW +sspicli.dll!ApplyControlToken +sspicli.dll!CompleteAuthToken +sspicli.dll!DecryptMessage +sspicli.dll!DeleteSecurityContext +sspicli.dll!EncryptMessage +sspicli.dll!EnumerateSecurityPackagesW +sspicli.dll!FreeContextBuffer +sspicli.dll!FreeCredentialsHandle +sspicli.dll!InitializeSecurityContextW +sspicli.dll!QueryContextAttributesW +sspicli.dll!QuerySecurityContextToken +sspicli.dll!SetContextAttributesW +sspicli.dll!SspiEncodeStringsAsAuthIdentity +sspicli.dll!SspiFreeAuthIdentity \ No newline at end of file diff --git a/external/corefx/src/System.Data.SqlClient/src/Resources/Strings.resx b/external/corefx/src/System.Data.SqlClient/src/Resources/Strings.resx index cbac126e53..15c8125816 100644 --- a/external/corefx/src/System.Data.SqlClient/src/Resources/Strings.resx +++ b/external/corefx/src/System.Data.SqlClient/src/Resources/Strings.resx @@ -1,5 +1,64 @@  + @@ -431,7 +490,7 @@ Failed to generate SSPI context. - Cannot access Kerberos ticket. Ensure Kerberos has been initialized with 'kinit'. + Cannot authenticate using Kerberos. Ensure Kerberos has been initialized on the client with 'kinit' and a Service Principal Name has been registered for the SQL Server to allow Kerberos authentication. Cannot connect to SQL Server Browser. Ensure SQL Server Browser has been started. @@ -1091,7 +1150,7 @@ TCP Provider - + SQL Network Interfaces @@ -1165,32 +1224,32 @@ The size of column '{0}' is not supported. The size is {1}. - + The metadata XML is invalid. The {1} column of the {0} collection must contain a non-empty string. - + There are multiple collections named '{0}'. - + The metadata XML is invalid. The {0} collection must contain a {1} column and it must be a string column. - + The metadata XML is invalid. - + The schema table contains no columns. - + Unable to build the '{0}' collection because execution of the SQL query failed. See the inner exception for details. - + More restrictions were provided than the requested schema ('{0}') supports. - + The collection '{0}' is missing from the metadata XML. - - The requested collection ({0}) is not defined. + + The requested collection ({0}) is not defined. requested collection ({0}) is not supported by this version of the provider. @@ -1213,4 +1272,28 @@ Unable to build schema collection '{0}'; + + The length of argument '{0}' exceeds its limit of '{1}'. + + + {0} must be marked as read only. + + + Cannot use Credential with UserID, UID, Password, or PWD connection string keywords. + + + Cannot use Credential with Integrated Security connection string keyword. + + + The '{0}' argument must not be null or empty. + + + ChangePassword can only be used with SQL authentication, not with integrated security. + + + ChangePassword requires SQL Server 9.0 or later. + + + The keyword '{0}' must not be specified in the connectionString argument to ChangePassword. + \ No newline at end of file diff --git a/external/corefx/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj b/external/corefx/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj index 86915fc824..22d3bc9747 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj +++ b/external/corefx/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj @@ -6,6 +6,7 @@ System.Data.SqlClient true true + true SR.PlatformNotSupported_DataSqlClient 4.0.0.0 4.1.0.0 @@ -14,6 +15,8 @@ + + @@ -24,7 +27,13 @@ - + + + + + + + @@ -55,6 +64,9 @@ System\Data\Common\AdapterUtil.cs + + System\Data\Common\AdapterUtil.Drivers.cs + @@ -77,18 +89,35 @@ System\Data\Common\NameValuePair.cs + + Common\System\Data\ProviderBase\DbConnectionInternal.cs + + + Common\System\Data\ProviderBase\DbConnectionFactory.cs + + + Common\System\Data\ProviderBase\DbConnectionPoolGroup.cs + + + Common\System\Data\ProviderBase\TimeoutTimer.cs + + + Common\System\Data\ProviderBase\DbReferenceCollection.cs + + + Common\System\Data\ProviderBase\DbMetaDataFactory.cs + + + Common\System\Data\ProviderBase\DbConnectionClosed.cs + - - - - @@ -198,12 +227,13 @@ + - + - + @@ -211,7 +241,7 @@ - + @@ -286,9 +316,6 @@ Common\Interop\Windows\sspicli\SecurityPackageInfo.cs - - Common\System\Net\IntPtrHelper.cs - Common\Interop\Windows\sspicli\SSPIAuthType.cs @@ -406,7 +433,7 @@ - + @@ -420,6 +447,7 @@ + @@ -450,7 +478,7 @@ - + @@ -463,6 +491,13 @@ System.Data.SqlClient.SqlMetaData.xml + + + + + + + - \ No newline at end of file + diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/Common/AdapterUtil.SqlClient.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/Common/AdapterUtil.SqlClient.cs index 8b52cac677..103ba8caec 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/Common/AdapterUtil.SqlClient.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/Common/AdapterUtil.SqlClient.cs @@ -880,5 +880,35 @@ namespace System.Data.Common TraceExceptionAsReturnValue(e); return e; } + + internal static ArgumentException InvalidArgumentLength(string argumentName, int limit) + { + return Argument(SR.GetString(SR.ADP_InvalidArgumentLength, argumentName, limit)); + } + + internal static ArgumentException MustBeReadOnly(string argumentName) + { + return Argument(SR.GetString(SR.ADP_MustBeReadOnly, argumentName)); + } + + internal static InvalidOperationException InvalidMixedUsageOfSecureAndClearCredential() + { + return InvalidOperation(SR.GetString(SR.ADP_InvalidMixedUsageOfSecureAndClearCredential)); + } + + internal static ArgumentException InvalidMixedArgumentOfSecureAndClearCredential() + { + return Argument(SR.GetString(SR.ADP_InvalidMixedUsageOfSecureAndClearCredential)); + } + + internal static InvalidOperationException InvalidMixedUsageOfSecureCredentialAndIntegratedSecurity() + { + return InvalidOperation(SR.GetString(SR.ADP_InvalidMixedUsageOfSecureCredentialAndIntegratedSecurity)); + } + + internal static ArgumentException InvalidMixedArgumentOfSecureCredentialAndIntegratedSecurity() + { + return Argument(SR.GetString(SR.ADP_InvalidMixedUsageOfSecureCredentialAndIntegratedSecurity)); + } } -} \ No newline at end of file +} diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionClosed.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionClosed.cs index 3faa50d468..74f48b852f 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionClosed.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionClosed.cs @@ -2,176 +2,15 @@ // 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.Data.Common; -using System.Diagnostics; -using System.Threading.Tasks; using System.Transactions; - namespace System.Data.ProviderBase { - abstract internal class DbConnectionClosed : DbConnectionInternal + internal abstract partial class DbConnectionClosed : DbConnectionInternal { - // Construct an "empty" connection - protected DbConnectionClosed(ConnectionState state, bool hidePassword, bool allowSetConnectionString) : base(state, hidePassword, allowSetConnectionString) - { - } + protected override void Activate(Transaction transaction) => throw ADP.ClosedConnectionError(); - public override string ServerVersion - { - get - { - throw ADP.ClosedConnectionError(); - } - } - - protected override void Activate(Transaction transaction) - { - throw ADP.ClosedConnectionError(); - } - - public override DbTransaction BeginTransaction(IsolationLevel il) - { - throw ADP.ClosedConnectionError(); - } - - public override void ChangeDatabase(string database) - { - throw ADP.ClosedConnectionError(); - } - - internal override void CloseConnection(DbConnection owningObject, DbConnectionFactory connectionFactory) - { - // not much to do here... - } - - protected override void Deactivate() - { - throw ADP.ClosedConnectionError(); - } - - public override void EnlistTransaction(Transaction transaction) - { - throw ADP.ClosedConnectionError(); - } - - protected override DbReferenceCollection CreateReferenceCollection() - { - throw ADP.ClosedConnectionError(); - } - - internal override bool TryOpenConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) - { - return base.TryOpenConnectionInternal(outerConnection, connectionFactory, retry, userOptions); - } - } - - abstract internal class DbConnectionBusy : DbConnectionClosed - { - protected DbConnectionBusy(ConnectionState state) : base(state, true, false) - { - } - - internal override bool TryOpenConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) - { - throw ADP.ConnectionAlreadyOpen(State); - } - } - - sealed internal class DbConnectionClosedBusy : DbConnectionBusy - { - // Closed Connection, Currently Busy - changing connection string - internal static readonly DbConnectionInternal SingletonInstance = new DbConnectionClosedBusy(); // singleton object - - private DbConnectionClosedBusy() : base(ConnectionState.Closed) - { - } - } - - sealed internal class DbConnectionOpenBusy : DbConnectionBusy - { - // Open Connection, Currently Busy - closing connection - internal static readonly DbConnectionInternal SingletonInstance = new DbConnectionOpenBusy(); // singleton object - - private DbConnectionOpenBusy() : base(ConnectionState.Open) - { - } - } - - sealed internal class DbConnectionClosedConnecting : DbConnectionBusy - { - // Closed Connection, Currently Connecting - - internal static readonly DbConnectionInternal SingletonInstance = new DbConnectionClosedConnecting(); // singleton object - - private DbConnectionClosedConnecting() : base(ConnectionState.Connecting) - { - } - - internal override void CloseConnection(DbConnection owningObject, DbConnectionFactory connectionFactory) - { - connectionFactory.SetInnerConnectionTo(owningObject, DbConnectionClosedPreviouslyOpened.SingletonInstance); - } - - internal override bool TryReplaceConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) - { - return TryOpenConnection(outerConnection, connectionFactory, retry, userOptions); - } - - internal override bool TryOpenConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) - { - if (retry == null || !retry.Task.IsCompleted) - { - // retry is null if this is a synchronous call - - // if someone calls Open or OpenAsync while in this state, - // then the retry task will not be completed - - throw ADP.ConnectionAlreadyOpen(State); - } - - // we are completing an asynchronous open - Debug.Assert(retry.Task.Status == TaskStatus.RanToCompletion, "retry task must be completed successfully"); - DbConnectionInternal openConnection = retry.Task.Result; - if (null == openConnection) - { - connectionFactory.SetInnerConnectionTo(outerConnection, this); - throw ADP.InternalConnectionError(ADP.ConnectionError.GetConnectionReturnsNull); - } - connectionFactory.SetInnerConnectionEvent(outerConnection, openConnection); - - return true; - } - } - - sealed internal class DbConnectionClosedNeverOpened : DbConnectionClosed - { - // Closed Connection, Has Never Been Opened - - internal static readonly DbConnectionInternal SingletonInstance = new DbConnectionClosedNeverOpened(); // singleton object - - private DbConnectionClosedNeverOpened() : base(ConnectionState.Closed, false, true) - { - } - } - - sealed internal class DbConnectionClosedPreviouslyOpened : DbConnectionClosed - { - // Closed Connection, Has Previously Been Opened - - internal static readonly DbConnectionInternal SingletonInstance = new DbConnectionClosedPreviouslyOpened(); // singleton object - - private DbConnectionClosedPreviouslyOpened() : base(ConnectionState.Closed, true, true) - { - } - - internal override bool TryReplaceConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) - { - return TryOpenConnection(outerConnection, connectionFactory, retry, userOptions); - } + public override void EnlistTransaction(Transaction transaction) => throw ADP.ClosedConnectionError(); } } diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionFactory.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionFactory.cs index cf6c3f673a..c343a914db 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionFactory.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionFactory.cs @@ -2,11 +2,6 @@ // 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.Collections.Generic; using System.Diagnostics; using System.Data.Common; using System.Threading; @@ -14,141 +9,8 @@ using System.Threading.Tasks; namespace System.Data.ProviderBase { - internal abstract class DbConnectionFactory + internal abstract partial class DbConnectionFactory { - private Dictionary _connectionPoolGroups; - private readonly List _poolsToRelease; - private readonly List _poolGroupsToRelease; - private readonly Timer _pruningTimer; - private const int PruningDueTime = 4 * 60 * 1000; // 4 minutes - private const int PruningPeriod = 30 * 1000; // thirty seconds - - - // s_pendingOpenNonPooled is an array of tasks used to throttle creation of non-pooled connections to - // a maximum of Environment.ProcessorCount at a time. - private static uint s_pendingOpenNonPooledNext = 0; - private static Task[] s_pendingOpenNonPooled = new Task[Environment.ProcessorCount]; - private static Task s_completedTask; - - protected DbConnectionFactory() - { - _connectionPoolGroups = new Dictionary(); - _poolsToRelease = new List(); - _poolGroupsToRelease = new List(); - _pruningTimer = CreatePruningTimer(); - } - - - abstract public DbProviderFactory ProviderFactory - { - get; - } - - - public void ClearAllPools() - { - Dictionary connectionPoolGroups = _connectionPoolGroups; - foreach (KeyValuePair entry in connectionPoolGroups) - { - DbConnectionPoolGroup poolGroup = entry.Value; - if (null != poolGroup) - { - poolGroup.Clear(); - } - } - } - - public void ClearPool(DbConnection connection) - { - ADP.CheckArgumentNull(connection, nameof(connection)); - - DbConnectionPoolGroup poolGroup = GetConnectionPoolGroup(connection); - if (null != poolGroup) - { - poolGroup.Clear(); - } - } - - public void ClearPool(DbConnectionPoolKey key) - { - Debug.Assert(key != null, "key cannot be null"); - ADP.CheckArgumentNull(key.ConnectionString, nameof(key) + "." + nameof(key.ConnectionString)); - - DbConnectionPoolGroup poolGroup; - Dictionary connectionPoolGroups = _connectionPoolGroups; - if (connectionPoolGroups.TryGetValue(key, out poolGroup)) - { - poolGroup.Clear(); - } - } - - internal virtual DbConnectionPoolProviderInfo CreateConnectionPoolProviderInfo(DbConnectionOptions connectionOptions) - { - return null; - } - - - internal DbConnectionInternal CreateNonPooledConnection(DbConnection owningConnection, DbConnectionPoolGroup poolGroup, DbConnectionOptions userOptions) - { - Debug.Assert(null != owningConnection, "null owningConnection?"); - Debug.Assert(null != poolGroup, "null poolGroup?"); - - DbConnectionOptions connectionOptions = poolGroup.ConnectionOptions; - DbConnectionPoolGroupProviderInfo poolGroupProviderInfo = poolGroup.ProviderInfo; - DbConnectionPoolKey poolKey = poolGroup.PoolKey; - - DbConnectionInternal newConnection = CreateConnection(connectionOptions, poolKey, poolGroupProviderInfo, null, owningConnection, userOptions); - if (null != newConnection) - { - newConnection.MakeNonPooledObject(owningConnection); - } - return newConnection; - } - - internal DbConnectionInternal CreatePooledConnection(DbConnectionPool pool, DbConnection owningObject, DbConnectionOptions options, DbConnectionPoolKey poolKey, DbConnectionOptions userOptions) - { - Debug.Assert(null != pool, "null pool?"); - DbConnectionPoolGroupProviderInfo poolGroupProviderInfo = pool.PoolGroup.ProviderInfo; - - DbConnectionInternal newConnection = CreateConnection(options, poolKey, poolGroupProviderInfo, pool, owningObject, userOptions); - if (null != newConnection) - { - newConnection.MakePooledConnection(pool); - } - return newConnection; - } - - virtual internal DbConnectionPoolGroupProviderInfo CreateConnectionPoolGroupProviderInfo(DbConnectionOptions connectionOptions) - { - return null; - } - - private Timer CreatePruningTimer() - { - TimerCallback callback = new TimerCallback(PruneConnectionPoolGroups); - return new Timer(callback, null, PruningDueTime, PruningPeriod); - } - - protected DbConnectionOptions FindConnectionOptions(DbConnectionPoolKey key) - { - Debug.Assert(key != null, "key cannot be null"); - if (!string.IsNullOrEmpty(key.ConnectionString)) - { - DbConnectionPoolGroup connectionPoolGroup; - Dictionary connectionPoolGroups = _connectionPoolGroups; - if (connectionPoolGroups.TryGetValue(key, out connectionPoolGroup)) - { - return connectionPoolGroup.ConnectionOptions; - } - } - return null; - } - - private static Task GetCompletedTask() - { - Debug.Assert(Monitor.IsEntered(s_pendingOpenNonPooled), $"Expected {nameof(s_pendingOpenNonPooled)} lock to be held."); - return s_completedTask ?? (s_completedTask = Task.FromResult(null)); - } internal bool TryGetConnection(DbConnection owningConnection, TaskCompletionSource retry, DbConnectionOptions userOptions, DbConnectionInternal oldConnection, out DbConnectionInternal connection) { @@ -320,283 +182,5 @@ namespace System.Data.ProviderBase return true; } - - private DbConnectionPool GetConnectionPool(DbConnection owningObject, DbConnectionPoolGroup connectionPoolGroup) - { - // if poolgroup is disabled, it will be replaced with a new entry - - Debug.Assert(null != owningObject, "null owningObject?"); - Debug.Assert(null != connectionPoolGroup, "null connectionPoolGroup?"); - - // It is possible that while the outer connection object has - // been sitting around in a closed and unused state in some long - // running app, the pruner may have come along and remove this - // the pool entry from the master list. If we were to use a - // pool entry in this state, we would create "unmanaged" pools, - // which would be bad. To avoid this problem, we automagically - // re-create the pool entry whenever it's disabled. - - // however, don't rebuild connectionOptions if no pooling is involved - let new connections do that work - if (connectionPoolGroup.IsDisabled && (null != connectionPoolGroup.PoolGroupOptions)) - { - // reusing existing pool option in case user originally used SetConnectionPoolOptions - DbConnectionPoolGroupOptions poolOptions = connectionPoolGroup.PoolGroupOptions; - - // get the string to hash on again - DbConnectionOptions connectionOptions = connectionPoolGroup.ConnectionOptions; - Debug.Assert(null != connectionOptions, "prevent expansion of connectionString"); - - connectionPoolGroup = GetConnectionPoolGroup(connectionPoolGroup.PoolKey, poolOptions, ref connectionOptions); - Debug.Assert(null != connectionPoolGroup, "null connectionPoolGroup?"); - SetConnectionPoolGroup(owningObject, connectionPoolGroup); - } - DbConnectionPool connectionPool = connectionPoolGroup.GetConnectionPool(this); - return connectionPool; - } - - internal DbConnectionPoolGroup GetConnectionPoolGroup(DbConnectionPoolKey key, DbConnectionPoolGroupOptions poolOptions, ref DbConnectionOptions userConnectionOptions) - { - if (string.IsNullOrEmpty(key.ConnectionString)) - { - return (DbConnectionPoolGroup)null; - } - - DbConnectionPoolGroup connectionPoolGroup; - Dictionary connectionPoolGroups = _connectionPoolGroups; - if (!connectionPoolGroups.TryGetValue(key, out connectionPoolGroup) || (connectionPoolGroup.IsDisabled && (null != connectionPoolGroup.PoolGroupOptions))) - { - // If we can't find an entry for the connection string in - // our collection of pool entries, then we need to create a - // new pool entry and add it to our collection. - - DbConnectionOptions connectionOptions = CreateConnectionOptions(key.ConnectionString, userConnectionOptions); - if (null == connectionOptions) - { - throw ADP.InternalConnectionError(ADP.ConnectionError.ConnectionOptionsMissing); - } - - if (null == userConnectionOptions) - { // we only allow one expansion on the connection string - userConnectionOptions = connectionOptions; - } - - // We don't support connection pooling on Win9x - if (null == poolOptions) - { - if (null != connectionPoolGroup) - { - // reusing existing pool option in case user originally used SetConnectionPoolOptions - poolOptions = connectionPoolGroup.PoolGroupOptions; - } - else - { - // Note: may return null for non-pooled connections - poolOptions = CreateConnectionPoolGroupOptions(connectionOptions); - } - } - - lock (this) - { - connectionPoolGroups = _connectionPoolGroups; - if (!connectionPoolGroups.TryGetValue(key, out connectionPoolGroup)) - { - DbConnectionPoolGroup newConnectionPoolGroup = new DbConnectionPoolGroup(connectionOptions, key, poolOptions); - newConnectionPoolGroup.ProviderInfo = CreateConnectionPoolGroupProviderInfo(connectionOptions); - - // build new dictionary with space for new connection string - Dictionary newConnectionPoolGroups = new Dictionary(1 + connectionPoolGroups.Count); - foreach (KeyValuePair entry in connectionPoolGroups) - { - newConnectionPoolGroups.Add(entry.Key, entry.Value); - } - - // lock prevents race condition with PruneConnectionPoolGroups - newConnectionPoolGroups.Add(key, newConnectionPoolGroup); - connectionPoolGroup = newConnectionPoolGroup; - _connectionPoolGroups = newConnectionPoolGroups; - } - else - { - Debug.Assert(!connectionPoolGroup.IsDisabled, "Disabled pool entry discovered"); - } - } - Debug.Assert(null != connectionPoolGroup, "how did we not create a pool entry?"); - Debug.Assert(null != userConnectionOptions, "how did we not have user connection options?"); - } - else if (null == userConnectionOptions) - { - userConnectionOptions = connectionPoolGroup.ConnectionOptions; - } - return connectionPoolGroup; - } - - - private void PruneConnectionPoolGroups(object state) - { - // First, walk the pool release list and attempt to clear each - // pool, when the pool is finally empty, we dispose of it. If the - // pool isn't empty, it's because there are active connections or - // distributed transactions that need it. - lock (_poolsToRelease) - { - if (0 != _poolsToRelease.Count) - { - DbConnectionPool[] poolsToRelease = _poolsToRelease.ToArray(); - foreach (DbConnectionPool pool in poolsToRelease) - { - if (null != pool) - { - pool.Clear(); - - if (0 == pool.Count) - { - _poolsToRelease.Remove(pool); - } - } - } - } - } - - // Next, walk the pool entry release list and dispose of each - // pool entry when it is finally empty. If the pool entry isn't - // empty, it's because there are active pools that need it. - lock (_poolGroupsToRelease) - { - if (0 != _poolGroupsToRelease.Count) - { - DbConnectionPoolGroup[] poolGroupsToRelease = _poolGroupsToRelease.ToArray(); - foreach (DbConnectionPoolGroup poolGroup in poolGroupsToRelease) - { - if (null != poolGroup) - { - int poolsLeft = poolGroup.Clear(); // may add entries to _poolsToRelease - - if (0 == poolsLeft) - { - _poolGroupsToRelease.Remove(poolGroup); - } - } - } - } - } - - // Finally, we walk through the collection of connection pool entries - // and prune each one. This will cause any empty pools to be put - // into the release list. - lock (this) - { - Dictionary connectionPoolGroups = _connectionPoolGroups; - Dictionary newConnectionPoolGroups = new Dictionary(connectionPoolGroups.Count); - - foreach (KeyValuePair entry in connectionPoolGroups) - { - if (null != entry.Value) - { - Debug.Assert(!entry.Value.IsDisabled, "Disabled pool entry discovered"); - - // entries start active and go idle during prune if all pools are gone - // move idle entries from last prune pass to a queue for pending release - // otherwise process entry which may move it from active to idle - if (entry.Value.Prune()) - { // may add entries to _poolsToRelease - QueuePoolGroupForRelease(entry.Value); - } - else - { - newConnectionPoolGroups.Add(entry.Key, entry.Value); - } - } - } - _connectionPoolGroups = newConnectionPoolGroups; - } - } - - internal void QueuePoolForRelease(DbConnectionPool pool, bool clearing) - { - // Queue the pool up for release -- we'll clear it out and dispose - // of it as the last part of the pruning timer callback so we don't - // do it with the pool entry or the pool collection locked. - Debug.Assert(null != pool, "null pool?"); - - // set the pool to the shutdown state to force all active - // connections to be automatically disposed when they - // are returned to the pool - pool.Shutdown(); - - lock (_poolsToRelease) - { - if (clearing) - { - pool.Clear(); - } - _poolsToRelease.Add(pool); - } - } - - internal void QueuePoolGroupForRelease(DbConnectionPoolGroup poolGroup) - { - Debug.Assert(null != poolGroup, "null poolGroup?"); - - lock (_poolGroupsToRelease) - { - _poolGroupsToRelease.Add(poolGroup); - } - } - - virtual protected DbConnectionInternal CreateConnection(DbConnectionOptions options, DbConnectionPoolKey poolKey, object poolGroupProviderInfo, DbConnectionPool pool, DbConnection owningConnection, DbConnectionOptions userOptions) - { - return CreateConnection(options, poolKey, poolGroupProviderInfo, pool, owningConnection); - } - - internal DbMetaDataFactory GetMetaDataFactory(DbConnectionPoolGroup connectionPoolGroup, DbConnectionInternal internalConnection) - { - Debug.Assert(connectionPoolGroup != null, "connectionPoolGroup may not be null."); - - // get the matadatafactory from the pool entry. If it does not already have one - // create one and save it on the pool entry - DbMetaDataFactory metaDataFactory = connectionPoolGroup.MetaDataFactory; - - // consider serializing this so we don't construct multiple metadata factories - // if two threads happen to hit this at the same time. One will be GC'd - if (metaDataFactory == null) - { - bool allowCache = false; - metaDataFactory = CreateMetaDataFactory(internalConnection, out allowCache); - if (allowCache) - { - connectionPoolGroup.MetaDataFactory = metaDataFactory; - } - } - return metaDataFactory; - } - - protected virtual DbMetaDataFactory CreateMetaDataFactory(DbConnectionInternal internalConnection, out bool cacheMetaDataFactory) - { - // providers that support GetSchema must override this with a method that creates a meta data - // factory appropriate for them. - cacheMetaDataFactory = false; - throw ADP.NotSupported(); - } - - abstract protected DbConnectionInternal CreateConnection(DbConnectionOptions options, DbConnectionPoolKey poolKey, object poolGroupProviderInfo, DbConnectionPool pool, DbConnection owningConnection); - - abstract protected DbConnectionOptions CreateConnectionOptions(string connectionString, DbConnectionOptions previous); - - abstract protected DbConnectionPoolGroupOptions CreateConnectionPoolGroupOptions(DbConnectionOptions options); - - abstract internal DbConnectionPoolGroup GetConnectionPoolGroup(DbConnection connection); - - abstract internal DbConnectionInternal GetInnerConnection(DbConnection connection); - - - abstract internal void PermissionDemand(DbConnection outerConnection); - - abstract internal void SetConnectionPoolGroup(DbConnection outerConnection, DbConnectionPoolGroup poolGroup); - - abstract internal void SetInnerConnectionEvent(DbConnection owningObject, DbConnectionInternal to); - - abstract internal bool SetInnerConnectionFrom(DbConnection owningObject, DbConnectionInternal to, DbConnectionInternal from); - - abstract internal void SetInnerConnectionTo(DbConnection owningObject, DbConnectionInternal to); } } diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionInternal.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionInternal.cs index 3ac471cac9..0b08a9c102 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionInternal.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionInternal.cs @@ -3,40 +3,18 @@ // See the LICENSE file in the project root for more information. - -//------------------------------------------------------------------------------ - using System.Data.Common; -using System.Data.SqlClient; using System.Diagnostics; using System.Threading; -using System.Threading.Tasks; using System.Transactions; namespace System.Data.ProviderBase { - internal abstract class DbConnectionInternal + internal abstract partial class DbConnectionInternal { - internal static readonly StateChangeEventArgs StateChangeClosed = new StateChangeEventArgs(ConnectionState.Open, ConnectionState.Closed); - internal static readonly StateChangeEventArgs StateChangeOpen = new StateChangeEventArgs(ConnectionState.Closed, ConnectionState.Open); - - private readonly bool _allowSetConnectionString; - private readonly bool _hidePassword; - private readonly ConnectionState _state; - - private readonly WeakReference _owningObject = new WeakReference(null, false); // [usage must be thread safe] the owning object, when not in the pool. (both Pooled and Non-Pooled connections) - - private DbConnectionPool _connectionPool; // the pooler that the connection came from (Pooled connections only) - private DbReferenceCollection _referenceCollection; // collection of objects that we need to notify in some way when we're being deactivated - private int _pooledCount; // [usage must be thread safe] the number of times this object has been pushed into the pool less the number of times it's been popped (0 != inPool) - - private bool _connectionIsDoomed; // true when the connection should no longer be used. - private bool _cannotBePooled; // true when the connection should no longer be pooled. private bool _isInStasis; - private DateTime _createTime; // when the connection was created. - private Transaction _enlistedTransaction; // [usage must be thread-safe] the transaction that we're enlisted in, either manually or automatically // _enlistedTransaction is a clone, so that transaction information can be queried even if the original transaction object is disposed. @@ -45,39 +23,6 @@ namespace System.Data.ProviderBase // Also, this reference should not be disposed, since we aren't taking ownership of it. private Transaction _enlistedTransactionOriginal; -#if DEBUG - private int _activateCount; // debug only counter to verify activate/deactivates are in sync. -#endif //DEBUG - - protected DbConnectionInternal() : this(ConnectionState.Open, true, false) - { - } - - // Constructor for internal connections - internal DbConnectionInternal(ConnectionState state, bool hidePassword, bool allowSetConnectionString) - { - _allowSetConnectionString = allowSetConnectionString; - _hidePassword = hidePassword; - _state = state; - } - - internal bool AllowSetConnectionString - { - get - { - return _allowSetConnectionString; - } - } - - internal bool CanBePooled - { - get - { - bool flag = (!_connectionIsDoomed && !_cannotBePooled && !_owningObject.IsAlive); - return flag; - } - } - protected internal Transaction EnlistedTransaction { get @@ -237,74 +182,6 @@ namespace System.Data.ProviderBase } } - protected internal bool IsConnectionDoomed - { - get - { - return _connectionIsDoomed; - } - } - - internal bool IsEmancipated - { - get - { - // NOTE: There are race conditions between PrePush, PostPop and this - // property getter -- only use this while this object is locked; - // (DbConnectionPool.Clear and ReclaimEmancipatedObjects - // do this for us) - - // The functionality is as follows: - // - // _pooledCount is incremented when the connection is pushed into the pool - // _pooledCount is decremented when the connection is popped from the pool - // _pooledCount is set to -1 when the connection is not pooled (just in case...) - // - // That means that: - // - // _pooledCount > 1 connection is in the pool multiple times (This should not happen) - // _pooledCount == 1 connection is in the pool - // _pooledCount == 0 connection is out of the pool - // _pooledCount == -1 connection is not a pooled connection; we shouldn't be here for non-pooled connections. - // _pooledCount < -1 connection out of the pool multiple times - // - // Now, our job is to return TRUE when the connection is out - // of the pool and it's owning object is no longer around to - // return it. - - bool value = (_pooledCount < 1) && !_owningObject.IsAlive; - return value; - } - } - - internal bool IsInPool - { - get - { - Debug.Assert(_pooledCount <= 1 && _pooledCount >= -1, "Pooled count for object is invalid"); - return (_pooledCount == 1); - } - } - - - protected internal object Owner - { - // We use a weak reference to the owning object so we can identify when - // it has been garbage collected without thowing exceptions. - get - { - return _owningObject.Target; - } - } - - internal DbConnectionPool Pool - { - get - { - return _connectionPool; - } - } - virtual protected bool ReadyToPrepareTransaction { get @@ -313,44 +190,6 @@ namespace System.Data.ProviderBase } } - protected internal DbReferenceCollection ReferenceCollection - { - get - { - return _referenceCollection; - } - } - - abstract public string ServerVersion - { - get; - } - - // this should be abstract but until it is added to all the providers virtual will have to do - virtual public string ServerVersionNormalized - { - get - { - throw ADP.NotSupported(); - } - } - - public bool ShouldHidePassword - { - get - { - return _hidePassword; - } - } - - public ConnectionState State - { - get - { - return _state; - } - } - abstract protected void Activate(Transaction transaction); internal void ActivateConnection(Transaction transaction) @@ -361,26 +200,6 @@ namespace System.Data.ProviderBase Activate(transaction); } - internal void AddWeakReference(object value, int tag) - { - if (null == _referenceCollection) - { - _referenceCollection = CreateReferenceCollection(); - if (null == _referenceCollection) - { - throw ADP.InternalError(ADP.InternalErrorCode.CreateReferenceCollectionReturnedNull); - } - } - _referenceCollection.Add(value, tag); - } - - abstract public DbTransaction BeginTransaction(IsolationLevel il); - - virtual public void ChangeDatabase(string value) - { - throw ADP.MethodNotImplemented(); - } - internal virtual void CloseConnection(DbConnection owningObject, DbConnectionFactory connectionFactory) { // The implementation here is the implementation required for the @@ -487,57 +306,6 @@ namespace System.Data.ProviderBase } } - virtual internal void PrepareForReplaceConnection() - { - // By default, there is no preparation required - } - - virtual protected void PrepareForCloseConnection() - { - // By default, there is no preparation required - } - - virtual protected object ObtainAdditionalLocksForClose() - { - return null; // no additional locks in default implementation - } - - virtual protected void ReleaseAdditionalLocksForClose(object lockToken) - { - // no additional locks in default implementation - } - - virtual protected DbReferenceCollection CreateReferenceCollection() - { - throw ADP.InternalError(ADP.InternalErrorCode.AttemptingToConstructReferenceCollectionOnStaticObject); - } - - abstract protected void Deactivate(); - - internal void DeactivateConnection() - { - // Internal method called from the connection pooler so we don't expose - // the Deactivate method publicly. - -#if DEBUG - int activateCount = Interlocked.Decrement(ref _activateCount); -#endif // DEBUG - - - if (!_connectionIsDoomed && Pool.UseLoadBalancing) - { - // If we're not already doomed, check the connection's lifetime and - // doom it if it's lifetime has elapsed. - - DateTime now = DateTime.UtcNow; - if ((now.Ticks - _createTime.Ticks) > Pool.LoadBalanceTimeout.Ticks) - { - DoNotPoolThisConnection(); - } - } - Deactivate(); - } - virtual internal void DelegatedTransactionEnded() { // Called by System.Transactions when the delegated transaction has @@ -604,188 +372,9 @@ namespace System.Data.ProviderBase enlistedTransaction.Dispose(); } } - - protected internal void DoNotPoolThisConnection() - { - _cannotBePooled = true; - } - - /// Ensure that this connection cannot be put back into the pool. - protected internal void DoomThisConnection() - { - _connectionIsDoomed = true; - } - + abstract public void EnlistTransaction(Transaction transaction); - protected internal virtual DataTable GetSchema(DbConnectionFactory factory, DbConnectionPoolGroup poolGroup, DbConnection outerConnection, string collectionName, string[] restrictions) - { - Debug.Assert(outerConnection != null, "outerConnection may not be null."); - - DbMetaDataFactory metaDataFactory = factory.GetMetaDataFactory(poolGroup, this); - Debug.Assert(metaDataFactory != null, "metaDataFactory may not be null."); - - return metaDataFactory.GetSchema(outerConnection, collectionName, restrictions); - } - - internal void MakeNonPooledObject(object owningObject) - { - // Used by DbConnectionFactory to indicate that this object IS NOT part of - // a connection pool. - - _connectionPool = null; - _owningObject.Target = owningObject; - _pooledCount = -1; - } - - internal void MakePooledConnection(DbConnectionPool connectionPool) - { - // Used by DbConnectionFactory to indicate that this object IS part of - // a connection pool. - _createTime = DateTime.UtcNow; - - _connectionPool = connectionPool; - } - - internal void NotifyWeakReference(int message) - { - DbReferenceCollection referenceCollection = ReferenceCollection; - if (null != referenceCollection) - { - referenceCollection.Notify(message); - } - } - - internal virtual void OpenConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory) - { - if (!TryOpenConnection(outerConnection, connectionFactory, null, null)) - { - throw ADP.InternalError(ADP.InternalErrorCode.SynchronousConnectReturnedPending); - } - } - - /// The default implementation is for the open connection objects, and - /// it simply throws. Our private closed-state connection objects - /// override this and do the correct thing. - // User code should either override DbConnectionInternal.Activate when it comes out of the pool - // or override DbConnectionFactory.CreateConnection when the connection is created for non-pooled connections - internal virtual bool TryOpenConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) - { - throw ADP.ConnectionAlreadyOpen(State); - } - - internal virtual bool TryReplaceConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) - { - throw ADP.MethodNotImplemented(); - } - - protected bool TryOpenConnectionInternal(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource retry, DbConnectionOptions userOptions) - { - // ?->Connecting: prevent set_ConnectionString during Open - if (connectionFactory.SetInnerConnectionFrom(outerConnection, DbConnectionClosedConnecting.SingletonInstance, this)) - { - DbConnectionInternal openConnection = null; - try - { - connectionFactory.PermissionDemand(outerConnection); - if (!connectionFactory.TryGetConnection(outerConnection, retry, userOptions, this, out openConnection)) - { - return false; - } - } - catch - { - // This should occur for all exceptions, even ADP.UnCatchableExceptions. - connectionFactory.SetInnerConnectionTo(outerConnection, this); - throw; - } - if (null == openConnection) - { - connectionFactory.SetInnerConnectionTo(outerConnection, this); - throw ADP.InternalConnectionError(ADP.ConnectionError.GetConnectionReturnsNull); - } - connectionFactory.SetInnerConnectionEvent(outerConnection, openConnection); - } - - return true; - } - - internal void PrePush(object expectedOwner) - { - // Called by DbConnectionPool when we're about to be put into it's pool, we - // take this opportunity to ensure ownership and pool counts are legit. - - // IMPORTANT NOTE: You must have taken a lock on the object before - // you call this method to prevent race conditions with Clear and - // ReclaimEmancipatedObjects. - - //3 // The following tests are retail assertions of things we can't allow to happen. - if (null == expectedOwner) - { - if (null != _owningObject.Target) - { - throw ADP.InternalError(ADP.InternalErrorCode.UnpooledObjectHasOwner); // new unpooled object has an owner - } - } - else if (_owningObject.Target != expectedOwner) - { - throw ADP.InternalError(ADP.InternalErrorCode.UnpooledObjectHasWrongOwner); // unpooled object has incorrect owner - } - if (0 != _pooledCount) - { - throw ADP.InternalError(ADP.InternalErrorCode.PushingObjectSecondTime); // pushing object onto stack a second time - } - _pooledCount++; - _owningObject.Target = null; // NOTE: doing this and checking for InternalError.PooledObjectHasOwner degrades the close by 2% - } - - internal void PostPop(object newOwner) - { - // Called by DbConnectionPool right after it pulls this from it's pool, we - // take this opportunity to ensure ownership and pool counts are legit. - - Debug.Assert(!IsEmancipated, "pooled object not in pool"); - - // When another thread is clearing this pool, it - // will doom all connections in this pool without prejudice which - // causes the following assert to fire, which really mucks up stress - // against checked bits. The assert is benign, so we're commenting - // it out. - //Debug.Assert(CanBePooled, "pooled object is not poolable"); - - // IMPORTANT NOTE: You must have taken a lock on the object before - // you call this method to prevent race conditions with Clear and - // ReclaimEmancipatedObjects. - - if (null != _owningObject.Target) - { - throw ADP.InternalError(ADP.InternalErrorCode.PooledObjectHasOwner); // pooled connection already has an owner! - } - _owningObject.Target = newOwner; - _pooledCount--; - //3 // The following tests are retail assertions of things we can't allow to happen. - if (null != Pool) - { - if (0 != _pooledCount) - { - throw ADP.InternalError(ADP.InternalErrorCode.PooledObjectInPoolMoreThanOnce); // popping object off stack with multiple pooledCount - } - } - else if (-1 != _pooledCount) - { - throw ADP.InternalError(ADP.InternalErrorCode.NonPooledObjectUsedMoreThanOnce); // popping object off stack with multiple pooledCount - } - } - - internal void RemoveWeakReference(object value) - { - DbReferenceCollection referenceCollection = ReferenceCollection; - if (null != referenceCollection) - { - referenceCollection.Remove(value); - } - } - // Cleanup connection's transaction-specific structures (currently used by Delegated transaction). // This is a separate method because cleanup can be triggered in multiple ways for a delegated // transaction. @@ -876,16 +465,5 @@ namespace System.Data.ProviderBase { _isInStasis = false; } - - /// - /// When overridden in a derived class, will check if the underlying connection is still actually alive - /// - /// If true an exception will be thrown if the connection is dead instead of returning true\false - /// (this allows the caller to have the real reason that the connection is not alive (e.g. network error, etc)) - /// True if the connection is still alive, otherwise false (If not overridden, then always true) - internal virtual bool IsConnectionAlive(bool throwOnException = false) - { - return true; - } } } diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPool.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPool.cs index 99830b6370..ee93b888be 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPool.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPool.cs @@ -413,10 +413,7 @@ namespace System.Data.ProviderBase _objectList = new List(MaxPoolSize); - if (ADP.IsPlatformNT5) - { - _transactedConnectionPool = new TransactedConnectionPool(this); - } + _transactedConnectionPool = new TransactedConnectionPool(this); // initialize irrespective of platform _poolCreateRequest = new WaitCallback(PoolCreateRequest); // used by CleanupCallback _state = State.Running; @@ -664,10 +661,12 @@ namespace System.Data.ProviderBase ReclaimEmancipatedObjects(); } - private Timer CreateCleanupTimer() - { - return (new Timer(new TimerCallback(this.CleanupCallback), null, _cleanupWait, _cleanupWait)); - } + private Timer CreateCleanupTimer() => + ADP.UnsafeCreateTimer( + new TimerCallback(CleanupCallback), + null, + _cleanupWait, + _cleanupWait); private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection) { @@ -728,6 +727,7 @@ namespace System.Data.ProviderBase // timer allocation has to be done out of CER block Timer t = new Timer(new TimerCallback(this.ErrorCallback), null, Timeout.Infinite, Timeout.Infinite); + bool timerIsNotDisposed; try { } finally @@ -1373,9 +1373,19 @@ namespace System.Data.ProviderBase { while (NeedToReplenish) { - // Don't specify any user options because there is no outer connection associated with the new connection - newObj = CreateObject(owningObject: null, userOptions: null, oldConnection: null); - + try + { + // Don't specify any user options because there is no outer connection associated with the new connection + newObj = CreateObject(owningObject: null, userOptions: null, oldConnection: null); + } + catch + { + // Catch all the exceptions occuring during CreateObject so that they + // don't emerge as unhandled on the thread pool and don't crash applications + // The error is handled in CreateObject and surfaced to the caller of the Connection Pool + // using the ErrorEvent. Hence it is OK to swallow all exceptions here. + break; + } // We do not need to check error flag here, since we know if // CreateObject returned null, we are in error case. if (null != newObj) diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/TimeoutTimer.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/TimeoutTimer.cs deleted file mode 100644 index 969f399d34..0000000000 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/TimeoutTimer.cs +++ /dev/null @@ -1,170 +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. - -// -// Class used to manage timeouts in complex system operations. -// - -using System.Data.Common; -using System.Diagnostics; - -namespace System.Data.ProviderBase -{ - // Purpose: - // Manages determining and tracking timeouts - // - // Intended use: - // Call StartXXXXTimeout() to get a timer with the given expiration point - // Get remaining time in appropriate format to pass to subsystem timeouts - // Check for timeout via IsExpired for checks in managed code. - // Simply abandon to GC when done. - internal class TimeoutTimer - { - //------------------- - // Fields - //------------------- - private long _timerExpire; - private bool _isInfiniteTimeout; - - //------------------- - // Timeout-setting methods - //------------------- - - // Get a new timer that will expire in the given number of seconds - // For input, a value of zero seconds indicates infinite timeout - internal static TimeoutTimer StartSecondsTimeout(int seconds) - { - //-------------------- - // Preconditions: None (seconds must conform to SetTimeoutSeconds requirements) - - //-------------------- - // Method body - var timeout = new TimeoutTimer(); - timeout.SetTimeoutSeconds(seconds); - - //--------------------- - // Postconditions - Debug.Assert(timeout != null); // Need a valid timeouttimer if no error - - return timeout; - } - - // Get a new timer that will expire in the given number of milliseconds - // No current need to support infinite milliseconds timeout - internal static TimeoutTimer StartMillisecondsTimeout(long milliseconds) - { - //-------------------- - // Preconditions - Debug.Assert(0 <= milliseconds); - - //-------------------- - // Method body - var timeout = new TimeoutTimer(); - timeout._timerExpire = checked(ADP.TimerCurrent() + (milliseconds * TimeSpan.TicksPerMillisecond)); - timeout._isInfiniteTimeout = false; - - //--------------------- - // Postconditions - Debug.Assert(timeout != null); // Need a valid timeouttimer if no error - - return timeout; - } - - //------------------- - // Methods for changing timeout - //------------------- - - internal void SetTimeoutSeconds(int seconds) - { - //-------------------- - // Preconditions - Debug.Assert(0 <= seconds || InfiniteTimeout == seconds); // no need to support negative seconds at present - - //-------------------- - // Method body - if (InfiniteTimeout == seconds) - { - _isInfiniteTimeout = true; - } - else - { - // Stash current time + timeout - _timerExpire = checked(ADP.TimerCurrent() + ADP.TimerFromSeconds(seconds)); - _isInfiniteTimeout = false; - } - //--------------------- - // Postconditions:None - } - - //------------------- - // Timeout info properties - //------------------- - - // Indicator for infinite timeout when starting a timer - internal static readonly long InfiniteTimeout = 0; - - // Is this timer in an expired state? - internal bool IsExpired - { - get - { - return !IsInfinite && ADP.TimerHasExpired(_timerExpire); - } - } - - // is this an infinite-timeout timer? - internal bool IsInfinite - { - get - { - return _isInfiniteTimeout; - } - } - - // Special accessor for TimerExpire for use when thunking to legacy timeout methods. - internal long LegacyTimerExpire - { - get - { - return (_isInfiniteTimeout) ? Int64.MaxValue : _timerExpire; - } - } - - // Returns milliseconds remaining trimmed to zero for none remaining - // and long.MaxValue for infinite - // This method should be preferred for internal calculations that are not - // yet common enough to code into the TimeoutTimer class itself. - internal long MillisecondsRemaining - { - get - { - //------------------- - // Preconditions: None - - //------------------- - // Method Body - long milliseconds; - if (_isInfiniteTimeout) - { - milliseconds = long.MaxValue; - } - else - { - milliseconds = ADP.TimerRemainingMilliseconds(_timerExpire); - if (0 > milliseconds) - { - milliseconds = 0; - } - } - - //-------------------- - // Postconditions - Debug.Assert(0 <= milliseconds); // This property guarantees no negative return values - - return milliseconds; - } - } - } -} - diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNIHandle.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNIHandle.cs index dcfedc841d..b38cb24116 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNIHandle.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNIHandle.cs @@ -41,7 +41,7 @@ namespace System.Data.SqlClient.SNI /// SNI packet /// Completion callback /// SNI error code - public abstract uint SendAsync(SNIPacket packet, SNIAsyncCallback callback = null); + public abstract uint SendAsync(SNIPacket packet, bool disposePacketAfterSendAsync, SNIAsyncCallback callback = null); /// /// Receive a packet synchronously diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNIMarsConnection.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNIMarsConnection.cs index b0fe68403c..a98dedfbc8 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNIMarsConnection.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNIMarsConnection.cs @@ -95,7 +95,7 @@ namespace System.Data.SqlClient.SNI { lock (this) { - return _lowerHandle.SendAsync(packet, callback); + return _lowerHandle.SendAsync(packet, false, callback); } } @@ -207,8 +207,7 @@ namespace System.Data.SqlClient.SNI }; _dataBytesLeft = (int)_currentHeader.length; - _currentPacket = new SNIPacket(null); - _currentPacket.Allocate((int)_currentHeader.length); + _currentPacket = new SNIPacket((int)_currentHeader.length); } currentHeader = _currentHeader; diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNIMarsHandle.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNIMarsHandle.cs index d3f10192dc..4d079f6ad0 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNIMarsHandle.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNIMarsHandle.cs @@ -100,7 +100,7 @@ namespace System.Data.SqlClient.SNI GetSMUXHeaderBytes(0, (byte)flags, ref headerBytes); } - SNIPacket packet = new SNIPacket(null); + SNIPacket packet = new SNIPacket(); packet.SetData(headerBytes, SNISMUXHeader.HEADER_LENGTH); _connection.Send(packet); @@ -143,9 +143,8 @@ namespace System.Data.SqlClient.SNI byte[] headerBytes = null; GetSMUXHeaderBytes(packet.Length, (byte)SNISMUXFlags.SMUX_DATA, ref headerBytes); - SNIPacket smuxPacket = new SNIPacket(null); + SNIPacket smuxPacket = new SNIPacket(16 + packet.Length); smuxPacket.Description = string.Format("({0}) SMUX packet {1}", packet.Description == null ? "" : packet.Description, xSequenceNumber); - smuxPacket.Allocate(16 + packet.Length); smuxPacket.AppendData(headerBytes, 16); smuxPacket.AppendPacket(packet); @@ -257,7 +256,7 @@ namespace System.Data.SqlClient.SNI /// SNI packet /// Completion callback /// SNI error code - public override uint SendAsync(SNIPacket packet, SNIAsyncCallback callback = null) + public override uint SendAsync(SNIPacket packet, bool disposePacketAfterSendAsync, SNIAsyncCallback callback = null) { lock (this) { diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNINpHandle.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNINpHandle.cs index 657518f1a1..67581e8d32 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNINpHandle.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNINpHandle.cs @@ -22,9 +22,7 @@ namespace System.Data.SqlClient.SNI private readonly string _targetServer; private readonly object _callbackObject; - private readonly TaskScheduler _writeScheduler; - private readonly TaskFactory _writeTaskFactory; - + private Stream _stream; private NamedPipeClientStream _pipeStream; private SslOverTdsStream _sslOverTdsStream; @@ -41,8 +39,6 @@ namespace System.Data.SqlClient.SNI { _targetServer = serverName; _callbackObject = callbackObject; - _writeScheduler = new ConcurrentExclusiveSchedulerPair().ExclusiveScheduler; - _writeTaskFactory = new TaskFactory(_writeScheduler); try { @@ -154,8 +150,7 @@ namespace System.Data.SqlClient.SNI packet = null; try { - packet = new SNIPacket(null); - packet.Allocate(_bufferSize); + packet = new SNIPacket(_bufferSize); packet.ReadFromStream(_stream); if (packet.Length == 0) @@ -179,24 +174,20 @@ namespace System.Data.SqlClient.SNI public override uint ReceiveAsync(ref SNIPacket packet) { - lock (this) + packet = new SNIPacket(_bufferSize); + + try { - packet = new SNIPacket(null); - packet.Allocate(_bufferSize); - - try - { - packet.ReadFromStreamAsync(_stream, _receiveCallback); - return TdsEnums.SNI_SUCCESS_IO_PENDING; - } - catch (ObjectDisposedException ode) - { - return ReportErrorAndReleasePacket(packet, ode); - } - catch (IOException ioe) - { - return ReportErrorAndReleasePacket(packet, ioe); - } + packet.ReadFromStreamAsync(_stream, _receiveCallback); + return TdsEnums.SNI_SUCCESS_IO_PENDING; + } + catch (ObjectDisposedException ode) + { + return ReportErrorAndReleasePacket(packet, ode); + } + catch (IOException ioe) + { + return ReportErrorAndReleasePacket(packet, ioe); } } @@ -220,45 +211,10 @@ namespace System.Data.SqlClient.SNI } } - public override uint SendAsync(SNIPacket packet, SNIAsyncCallback callback = null) + public override uint SendAsync(SNIPacket packet, bool disposePacketAfterSendAsync, SNIAsyncCallback callback = null) { - SNIPacket newPacket = packet; - - _writeTaskFactory.StartNew(() => - { - try - { - lock (this) - { - packet.WriteToStream(_stream); - } - } - catch (Exception e) - { - SNICommon.ReportSNIError(SNIProviders.NP_PROV, SNICommon.InternalExceptionError, e); - - if (callback != null) - { - callback(packet, TdsEnums.SNI_ERROR); - } - else - { - _sendCallback(packet, TdsEnums.SNI_ERROR); - } - - return; - } - - if (callback != null) - { - callback(packet, TdsEnums.SNI_SUCCESS); - } - else - { - _sendCallback(packet, TdsEnums.SNI_SUCCESS); - } - }); - + SNIAsyncCallback cb = callback ?? _sendCallback; + packet.WriteToStreamAsync(_stream, cb, SNIProviders.NP_PROV, disposePacketAfterSendAsync); return TdsEnums.SNI_SUCCESS_IO_PENDING; } @@ -356,4 +312,4 @@ namespace System.Data.SqlClient.SNI } #endif } -} \ No newline at end of file +} diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNIPacket.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNIPacket.cs index 44a8bc63fd..84a47740fa 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNIPacket.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNIPacket.cs @@ -2,6 +2,7 @@ // 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; using System.IO; using System.Threading; using System.Threading.Tasks; @@ -20,13 +21,14 @@ namespace System.Data.SqlClient.SNI private string _description; private SNIAsyncCallback _completionCallback; - /// - /// Constructor - /// - /// Owning SNI handle - public SNIPacket(SNIHandle handle) + private ArrayPool _arrayPool = ArrayPool.Shared; + private bool _isBufferFromArrayPool = false; + + public SNIPacket() { } + + public SNIPacket(int capacity) { - _offset = 0; + Allocate(capacity); } /// @@ -46,46 +48,26 @@ namespace System.Data.SqlClient.SNI } /// - /// Data left to process + /// Length of data left to process /// - public int DataLeft - { - get - { - return _length - _offset; - } - } + public int DataLeft => (_length - _offset); /// /// Length of data /// - public int Length - { - get - { - return _length; - } - } + public int Length => _length; /// /// Packet validity /// - public bool IsInvalid - { - get - { - return _data == null; - } - } + public bool IsInvalid => (_data == null); /// /// Packet data /// public void Dispose() { - _data = null; - _length = 0; - _capacity = 0; + Release(); } /// @@ -109,11 +91,27 @@ namespace System.Data.SqlClient.SNI /// /// Allocate space for data /// - /// Bytes to allocate + /// Length of byte array to be allocated public void Allocate(int capacity) { + if (_data != null && _data.Length < capacity) + { + if (_isBufferFromArrayPool) + { + _arrayPool.Return(_data); + } + _data = null; + } + + if (_data == null) + { + _data = _arrayPool.Rent(capacity); + _isBufferFromArrayPool = true; + } + _capacity = capacity; - _data = new Byte[capacity]; + _length = 0; + _offset = 0; } /// @@ -122,10 +120,11 @@ namespace System.Data.SqlClient.SNI /// Cloned packet public SNIPacket Clone() { - SNIPacket packet = new SNIPacket(null); - packet._data = new byte[_length]; - Buffer.BlockCopy(_data, 0, packet._data, 0, _length); + SNIPacket packet = new SNIPacket(_capacity); + Buffer.BlockCopy(_data, 0, packet._data, 0, _capacity); packet._length = _length; + packet._description = _description; + packet._completionCallback = _completionCallback; return packet; } @@ -133,7 +132,7 @@ namespace System.Data.SqlClient.SNI /// /// Get packet data /// - /// Buffer + /// Buffer /// Data in packet public void GetData(byte[] buffer, ref int dataSize) { @@ -150,8 +149,9 @@ namespace System.Data.SqlClient.SNI { _data = data; _length = length; - _capacity = length; + _capacity = data.Length; _offset = 0; + _isBufferFromArrayPool = false; } /// @@ -208,7 +208,7 @@ namespace System.Data.SqlClient.SNI } Buffer.BlockCopy(_data, _offset, buffer, dataOffset, size); - _offset = _offset + size; + _offset += size; return size; } @@ -217,9 +217,16 @@ namespace System.Data.SqlClient.SNI /// public void Release() { - _length = 0; - _capacity = 0; - _data = null; + if (_data != null) + { + if(_isBufferFromArrayPool) + { + _arrayPool.Return(_data); + } + _data = null; + _capacity = 0; + } + Reset(); } /// @@ -228,7 +235,9 @@ namespace System.Data.SqlClient.SNI public void Reset() { _length = 0; - _data = new byte[_capacity]; + _offset = 0; + _description = null; + _completionCallback = null; } /// @@ -239,10 +248,10 @@ namespace System.Data.SqlClient.SNI public void ReadFromStreamAsync(Stream stream, SNIAsyncCallback callback) { bool error = false; - - stream.ReadAsync(_data, 0, _capacity).ContinueWith(t => + + stream.ReadAsync(_data, 0, _capacity, CancellationToken.None).ContinueWith(t => { - Exception e = t.Exception != null ? t.Exception.InnerException : null; + Exception e = t.Exception?.InnerException; if (e != null) { SNILoadHandle.SingletonInstance.LastError = new SNIError(SNIProviders.TCP_PROV, SNICommon.InternalExceptionError, e); @@ -261,13 +270,13 @@ namespace System.Data.SqlClient.SNI if (error) { - this.Release(); + Release(); } callback(this, error ? TdsEnums.SNI_ERROR : TdsEnums.SNI_SUCCESS); }, CancellationToken.None, - TaskContinuationOptions.DenyChildAttach | TaskContinuationOptions.LongRunning, + TaskContinuationOptions.DenyChildAttach, TaskScheduler.Default); } @@ -289,6 +298,30 @@ namespace System.Data.SqlClient.SNI stream.Write(_data, 0, _length); } + /// + /// Write data to a stream asynchronously + /// + /// Stream to write to + public async void WriteToStreamAsync(Stream stream, SNIAsyncCallback callback, SNIProviders provider, bool disposeAfterWriteAsync = false) + { + uint status = TdsEnums.SNI_SUCCESS; + try + { + await stream.WriteAsync(_data, 0, _length, CancellationToken.None).ConfigureAwait(false); + } + catch (Exception e) + { + SNILoadHandle.SingletonInstance.LastError = new SNIError(provider, SNICommon.InternalExceptionError, e); + status = TdsEnums.SNI_ERROR; + } + callback(this, status); + + if (disposeAfterWriteAsync) + { + Dispose(); + } + } + /// /// Get hash code /// @@ -324,7 +357,7 @@ namespace System.Data.SqlClient.SNI { if (packet != null) { - return object.ReferenceEquals(packet, this); + return ReferenceEquals(packet, this); } return false; diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNIProxy.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNIProxy.cs index a93ff8a044..e0cd0a3dec 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNIProxy.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNIProxy.cs @@ -189,11 +189,11 @@ namespace System.Data.SqlClient.SNI } /// - /// Get packet data + /// Copies data in SNIPacket to given byte array parameter /// - /// SNI packet - /// Buffer - /// Data size + /// SNIPacket object containing data packets + /// Destination byte array where data packets are copied to + /// Length of data packets /// SNI error status public uint PacketGetData(SNIPacket packet, byte[] inBuff, ref uint dataSize) { @@ -238,14 +238,19 @@ namespace System.Data.SqlClient.SNI /// SNI error status public uint WritePacket(SNIHandle handle, SNIPacket packet, bool sync) { + SNIPacket clonedPacket = packet.Clone(); + uint result; if (sync) { - return handle.Send(packet.Clone()); + result = handle.Send(clonedPacket); + clonedPacket.Dispose(); } else { - return handle.SendAsync(packet.Clone()); + result = handle.SendAsync(clonedPacket, true); } + + return result; } /// @@ -339,8 +344,22 @@ namespace System.Data.SqlClient.SNI private static byte[] GetSqlServerSPN(string hostNameOrAddress, string portOrInstanceName) { Debug.Assert(!string.IsNullOrWhiteSpace(hostNameOrAddress)); - IPHostEntry hostEntry = Dns.GetHostEntry(hostNameOrAddress); - string fullyQualifiedDomainName = hostEntry.HostName; + IPHostEntry hostEntry = null; + string fullyQualifiedDomainName; + try + { + hostEntry = Dns.GetHostEntry(hostNameOrAddress); + } + catch (SocketException) + { + // A SocketException can occur while resolving the hostname. + // We will fallback on using hostname from the connection string in the finally block + } + finally + { + // If the DNS lookup failed, then resort to using the user provided hostname to construct the SPN. + fullyQualifiedDomainName = hostEntry?.HostName ?? hostNameOrAddress; + } string serverSpn = SqlServerSpnHeader + "/" + fullyQualifiedDomainName; if (!string.IsNullOrWhiteSpace(portOrInstanceName)) { @@ -426,8 +445,7 @@ namespace System.Data.SqlClient.SNI /// SNI error status public uint ReadAsync(SNIHandle handle, out SNIPacket packet) { - packet = new SNIPacket(null); - + packet = null; return handle.ReceiveAsync(ref packet); } diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs index 47613bf014..11ea8d0eaf 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs @@ -4,13 +4,11 @@ using System.Collections.Generic; using System.ComponentModel; -using System.Diagnostics; using System.IO; using System.Net; using System.Net.Security; using System.Net.Sockets; using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; using System.Security.Authentication; using System.Security.Cryptography.X509Certificates; using System.Threading; @@ -27,9 +25,7 @@ namespace System.Data.SqlClient.SNI private readonly object _callbackObject; private readonly Socket _socket; private NetworkStream _tcpStream; - private readonly TaskScheduler _writeScheduler; - private readonly TaskFactory _writeTaskFactory; - + private Stream _stream; private SslStream _sslStream; private SslOverTdsStream _sslOverTdsStream; @@ -104,8 +100,6 @@ namespace System.Data.SqlClient.SNI /// Callback object public SNITCPHandle(string serverName, int port, long timerExpire, object callbackObject, bool parallel) { - _writeScheduler = new ConcurrentExclusiveSchedulerPair().ExclusiveScheduler; - _writeTaskFactory = new TaskFactory(_writeScheduler); _callbackObject = callbackObject; _targetServer = serverName; @@ -399,7 +393,6 @@ namespace System.Data.SqlClient.SNI _sslStream = null; _sslOverTdsStream.Dispose(); _sslOverTdsStream = null; - _stream = _tcpStream; } @@ -487,8 +480,7 @@ namespace System.Data.SqlClient.SNI return TdsEnums.SNI_WAIT_TIMEOUT; } - packet = new SNIPacket(null); - packet.Allocate(_bufferSize); + packet = new SNIPacket(_bufferSize); packet.ReadFromStream(_stream); if (packet.Length == 0) @@ -542,45 +534,13 @@ namespace System.Data.SqlClient.SNI /// SNI packet /// Completion callback /// SNI error code - public override uint SendAsync(SNIPacket packet, SNIAsyncCallback callback = null) + public override uint SendAsync(SNIPacket packet, bool disposePacketAfterSendAsync, SNIAsyncCallback callback = null) { - SNIPacket newPacket = packet; - - _writeTaskFactory.StartNew(() => + SNIAsyncCallback cb = callback ?? _sendCallback; + lock (this) { - try - { - lock (this) - { - packet.WriteToStream(_stream); - } - } - catch (Exception e) - { - SNILoadHandle.SingletonInstance.LastError = new SNIError(SNIProviders.TCP_PROV, SNICommon.InternalExceptionError, e); - - if (callback != null) - { - callback(packet, TdsEnums.SNI_ERROR); - } - else - { - _sendCallback(packet, TdsEnums.SNI_ERROR); - } - - return; - } - - if (callback != null) - { - callback(packet, TdsEnums.SNI_SUCCESS); - } - else - { - _sendCallback(packet, TdsEnums.SNI_SUCCESS); - } - }); - + packet.WriteToStreamAsync(_stream, cb, SNIProviders.TCP_PROV, disposePacketAfterSendAsync); + } return TdsEnums.SNI_SUCCESS_IO_PENDING; } @@ -591,28 +551,16 @@ namespace System.Data.SqlClient.SNI /// SNI error code public override uint ReceiveAsync(ref SNIPacket packet) { - lock (this) - { - packet = new SNIPacket(null); - packet.Allocate(_bufferSize); + packet = new SNIPacket(_bufferSize); - try - { - packet.ReadFromStreamAsync(_stream, _receiveCallback); - return TdsEnums.SNI_SUCCESS_IO_PENDING; - } - catch (ObjectDisposedException ode) - { - return ReportErrorAndReleasePacket(packet, ode); - } - catch (SocketException se) - { - return ReportErrorAndReleasePacket(packet, se); - } - catch (IOException ioe) - { - return ReportErrorAndReleasePacket(packet, ioe); - } + try + { + packet.ReadFromStreamAsync(_stream, _receiveCallback); + return TdsEnums.SNI_SUCCESS_IO_PENDING; + } + catch (Exception e) when (e is ObjectDisposedException || e is SocketException || e is IOException) + { + return ReportErrorAndReleasePacket(packet, e); } } @@ -680,6 +628,6 @@ namespace System.Data.SqlClient.SNI { _socket.Shutdown(SocketShutdown.Both); } -#endif +#endif } } diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SslOverTdsStream.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SslOverTdsStream.cs index 4d9d9c72e1..cb274689ff 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SslOverTdsStream.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SslOverTdsStream.cs @@ -4,6 +4,8 @@ using System.IO; using System.IO.Pipes; +using System.Threading; +using System.Threading.Tasks; namespace System.Data.SqlClient.SNI { @@ -47,7 +49,44 @@ namespace System.Data.SqlClient.SNI /// Offset /// Byte count /// Bytes read - public override int Read(byte[] buffer, int offset, int count) + public override int Read(byte[] buffer, int offset, int count) => + ReadInternal(buffer, offset, count, CancellationToken.None, async: false).GetAwaiter().GetResult(); + + /// + /// Write Buffer + /// + /// + /// + /// + public override void Write(byte[] buffer, int offset, int count) + => WriteInternal(buffer, offset, count, CancellationToken.None, async: false).Wait(); + + /// + /// Write Buffer Asynchronosly + /// + /// + /// + /// + /// + /// + public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken token) + => WriteInternal(buffer, offset, count, token, async: true); + + /// + /// Read Buffer Asynchronosly + /// + /// + /// + /// + /// + /// + public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken token) + => ReadInternal(buffer, offset, count, token, async: true); + + /// + /// Read Internal is called synchronosly when async is false + /// + private async Task ReadInternal(byte[] buffer, int offset, int count, CancellationToken token, bool async) { int readBytes = 0; byte[] packetData = new byte[count < TdsEnums.HEADER_LEN ? TdsEnums.HEADER_LEN : count]; @@ -59,7 +98,9 @@ namespace System.Data.SqlClient.SNI // Account for split packets while (readBytes < TdsEnums.HEADER_LEN) { - readBytes += _stream.Read(packetData, readBytes, TdsEnums.HEADER_LEN - readBytes); + readBytes += async ? + await _stream.ReadAsync(packetData, readBytes, TdsEnums.HEADER_LEN - readBytes, token).ConfigureAwait(false) : + _stream.Read(packetData, readBytes, TdsEnums.HEADER_LEN - readBytes); } _packetBytes = (packetData[TdsEnums.HEADER_LEN_FIELD_OFFSET] << 8) | packetData[TdsEnums.HEADER_LEN_FIELD_OFFSET + 1]; @@ -72,7 +113,9 @@ namespace System.Data.SqlClient.SNI } } - readBytes = _stream.Read(packetData, 0, count); + readBytes = async ? + await _stream.ReadAsync(packetData, 0, count, token).ConfigureAwait(false) : + _stream.Read(packetData, 0, count); if (_encapsulate) { @@ -84,12 +127,9 @@ namespace System.Data.SqlClient.SNI } /// - /// Write buffer + /// The internal write method calls Sync APIs when Async flag is false /// - /// Buffer - /// Offset - /// Byte count - public override void Write(byte[] buffer, int offset, int count) + private async Task WriteInternal(byte[] buffer, int offset, int count, CancellationToken token, bool async) { int currentCount = 0; int currentOffset = offset; @@ -127,22 +167,44 @@ namespace System.Data.SqlClient.SNI combinedBuffer[6] = 0; combinedBuffer[7] = 0; - for(int i = TdsEnums.HEADER_LEN; i < combinedBuffer.Length; i++) + for (int i = TdsEnums.HEADER_LEN; i < combinedBuffer.Length; i++) { combinedBuffer[i] = buffer[currentOffset + (i - TdsEnums.HEADER_LEN)]; } - _stream.Write(combinedBuffer, 0, combinedBuffer.Length); + if (async) + { + await _stream.WriteAsync(combinedBuffer, 0, combinedBuffer.Length, token).ConfigureAwait(false); + } + else + { + _stream.Write(combinedBuffer, 0, combinedBuffer.Length); + } } else { currentCount = count; count = 0; - _stream.Write(buffer, currentOffset, currentCount); + if (async) + { + await _stream.WriteAsync(buffer, currentOffset, currentCount, token).ConfigureAwait(false); + } + else + { + _stream.Write(buffer, currentOffset, currentCount); + } + } + + if (async) + { + await _stream.FlushAsync().ConfigureAwait(false); + } + else + { + _stream.Flush(); } - _stream.Flush(); currentOffset += currentCount; } } diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlBulkCopy.cs.REMOVED.git-id b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlBulkCopy.cs.REMOVED.git-id index 4440702252..039c236f2a 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlBulkCopy.cs.REMOVED.git-id +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlBulkCopy.cs.REMOVED.git-id @@ -1 +1 @@ -e1d89c9d2a06c8e89a8b4bf216000f8970d48f26 \ No newline at end of file +09a61eaf52bafe950a94c27a787148750ab928d0 \ No newline at end of file diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlCommand.cs.REMOVED.git-id b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlCommand.cs.REMOVED.git-id index 01729a6e39..cbb029cc38 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlCommand.cs.REMOVED.git-id +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlCommand.cs.REMOVED.git-id @@ -1 +1 @@ -eb3ea56a8b8a9c2c2fab5ba555b0ac2aa412b00b \ No newline at end of file +40a20092f6a571ef9598fc7477ff948b5b60cc32 \ No newline at end of file diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlConnection.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlConnection.cs index b2c20ecf28..cde4bb707a 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlConnection.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlConnection.cs @@ -14,6 +14,7 @@ using Microsoft.SqlServer.Server; using System.Reflection; using System.IO; using System.Globalization; +using System.Security; namespace System.Data.SqlClient { @@ -30,6 +31,7 @@ namespace System.Data.SqlClient // root task associated with current async invocation private Tuple, Task> _currentCompletion; + private SqlCredential _credential; private string _connectionString; private int _connectRetryCount; @@ -57,11 +59,43 @@ namespace System.Data.SqlClient CacheConnectionStringProperties(); } + public SqlConnection(string connectionString, SqlCredential credential) : this() + { + ConnectionString = connectionString; + if (credential != null) + { + // The following checks are necessary as setting Credential property will call CheckAndThrowOnInvalidCombinationOfConnectionStringAndSqlCredential + // CheckAndThrowOnInvalidCombinationOfConnectionStringAndSqlCredential it will throw InvalidOperationException rather than Arguemtn exception + // Need to call setter on Credential property rather than setting _credential directly as pool groups need to be checked + SqlConnectionString connectionOptions = (SqlConnectionString)ConnectionOptions; + if (UsesClearUserIdOrPassword(connectionOptions)) + { + throw ADP.InvalidMixedArgumentOfSecureAndClearCredential(); + } + + if (UsesIntegratedSecurity(connectionOptions)) + { + throw ADP.InvalidMixedArgumentOfSecureCredentialAndIntegratedSecurity(); + } + Credential = credential; + } + // else + // credential == null: we should not set "Credential" as this will do additional validation check and + // checking pool groups which is not necessary. All necessary operation is already done by calling "ConnectionString = connectionString" + CacheConnectionStringProperties(); + } + private SqlConnection(SqlConnection connection) { GC.SuppressFinalize(this); CopyFrom(connection); _connectionString = connection._connectionString; + if (connection._credential != null) + { + SecureString password = connection._credential.Password.Copy(); + password.MakeReadOnly(); + _credential = new SqlCredential(connection._credential.UserId, password); + } CacheConnectionStringProperties(); } @@ -143,6 +177,23 @@ namespace System.Data.SqlClient set => _AsyncCommandInProgress = value; } + // Does this connection use Integrated Security? + private bool UsesIntegratedSecurity(SqlConnectionString opt) + { + return opt != null ? opt.IntegratedSecurity : false; + } + + // Does this connection use old style of clear userID or Password in connection string? + private bool UsesClearUserIdOrPassword(SqlConnectionString opt) + { + bool result = false; + if (null != opt) + { + result = (!string.IsNullOrEmpty(opt.UserID) || !string.IsNullOrEmpty(opt.Password)); + } + return result; + } + internal SqlConnectionString.TransactionBindingEnum TransactionBinding { get => ((SqlConnectionString)ConnectionOptions).TransactionBinding; @@ -171,7 +222,12 @@ namespace System.Data.SqlClient } set { - ConnectionString_Set(new SqlConnectionPoolKey(value)); + if (_credential != null) + { + SqlConnectionString connectionOptions = new SqlConnectionString(value); + CheckAndThrowOnInvalidCombinationOfConnectionStringAndSqlCredential(connectionOptions); + } + ConnectionString_Set(new SqlConnectionPoolKey(value, _credential)); _connectionString = value; // Change _connectionString value only after value is validated CacheConnectionStringProperties(); } @@ -306,11 +362,66 @@ namespace System.Data.SqlClient // Note: In Longhorn you'll be able to rename a machine without // rebooting. Therefore, don't cache this machine name. SqlConnectionString constr = (SqlConnectionString)ConnectionOptions; - string result = ((null != constr) ? constr.WorkstationId : string.Empty); + string result = constr?.WorkstationId ?? Environment.MachineName; return result; } } + public SqlCredential Credential + { + get + { + SqlCredential result = _credential; + + // When a connection is connecting or is ever opened, make credential available only if "Persist Security Info" is set to true + // otherwise, return null + SqlConnectionString connectionOptions = (SqlConnectionString)UserConnectionOptions; + if (InnerConnection.ShouldHidePassword && connectionOptions != null && !connectionOptions.PersistSecurityInfo) + { + result = null; + } + + return result; + } + + set + { + // If a connection is connecting or is ever opened, user id/password cannot be set + if (!InnerConnection.AllowSetConnectionString) + { + throw ADP.OpenConnectionPropertySet(nameof(Credential), InnerConnection.State); + } + + // check if the usage of credential has any conflict with the keys used in connection string + if (value != null) + { + CheckAndThrowOnInvalidCombinationOfConnectionStringAndSqlCredential((SqlConnectionString)ConnectionOptions); + } + + _credential = value; + + // Need to call ConnectionString_Set to do proper pool group check + ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, _credential)); + } + } + + // CheckAndThrowOnInvalidCombinationOfConnectionStringAndSqlCredential: check if the usage of credential has any conflict + // with the keys used in connection string + // If there is any conflict, it throws InvalidOperationException + // This is used in the setter of ConnectionString and Credential properties. + private void CheckAndThrowOnInvalidCombinationOfConnectionStringAndSqlCredential(SqlConnectionString connectionOptions) + { + if (UsesClearUserIdOrPassword(connectionOptions)) + { + throw ADP.InvalidMixedUsageOfSecureAndClearCredential(); + } + + if (UsesIntegratedSecurity(connectionOptions)) + { + throw ADP.InvalidMixedUsageOfSecureCredentialAndIntegratedSecurity(); + } + } + protected override DbProviderFactory DbProviderFactory { get => SqlClientFactory.Instance; @@ -542,6 +653,8 @@ namespace System.Data.SqlClient private void DisposeMe(bool disposing) { + _credential = null; + if (!disposing) { // For non-pooled connections we need to make sure that if the SqlConnection was not closed, @@ -1231,6 +1344,108 @@ namespace System.Data.SqlClient } } + + public static void ChangePassword(string connectionString, string newPassword) + { + if (string.IsNullOrEmpty(connectionString)) + { + throw SQL.ChangePasswordArgumentMissing(nameof(newPassword)); + } + if (string.IsNullOrEmpty(newPassword)) + { + throw SQL.ChangePasswordArgumentMissing(nameof(newPassword)); + } + if (TdsEnums.MAXLEN_NEWPASSWORD < newPassword.Length) + { + throw ADP.InvalidArgumentLength(nameof(newPassword), TdsEnums.MAXLEN_NEWPASSWORD); + } + + SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential: null); + + SqlConnectionString connectionOptions = SqlConnectionFactory.FindSqlConnectionOptions(key); + if (connectionOptions.IntegratedSecurity) + { + throw SQL.ChangePasswordConflictsWithSSPI(); + } + if (!string.IsNullOrEmpty(connectionOptions.AttachDBFilename)) + { + throw SQL.ChangePasswordUseOfUnallowedKey(SqlConnectionString.KEY.AttachDBFilename); + } + + ChangePassword(connectionString, connectionOptions, null, newPassword, null); + } + + public static void ChangePassword(string connectionString, SqlCredential credential, SecureString newSecurePassword) + { + if (string.IsNullOrEmpty(connectionString)) + { + throw SQL.ChangePasswordArgumentMissing(nameof(connectionString)); + } + + // check credential; not necessary to check the length of password in credential as the check is done by SqlCredential class + if (credential == null) + { + throw SQL.ChangePasswordArgumentMissing(nameof(credential)); + } + + if (newSecurePassword == null || newSecurePassword.Length == 0) + { + throw SQL.ChangePasswordArgumentMissing(nameof(newSecurePassword)); + } + + if (!newSecurePassword.IsReadOnly()) + { + throw ADP.MustBeReadOnly(nameof(newSecurePassword)); + } + + if (TdsEnums.MAXLEN_NEWPASSWORD < newSecurePassword.Length) + { + throw ADP.InvalidArgumentLength(nameof(newSecurePassword), TdsEnums.MAXLEN_NEWPASSWORD); + } + + SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential); + + SqlConnectionString connectionOptions = SqlConnectionFactory.FindSqlConnectionOptions(key); + + // Check for connection string values incompatible with SqlCredential + if (!string.IsNullOrEmpty(connectionOptions.UserID) || !string.IsNullOrEmpty(connectionOptions.Password)) + { + throw ADP.InvalidMixedArgumentOfSecureAndClearCredential(); + } + + if (connectionOptions.IntegratedSecurity) + { + throw SQL.ChangePasswordConflictsWithSSPI(); + } + + if (!string.IsNullOrEmpty(connectionOptions.AttachDBFilename)) + { + throw SQL.ChangePasswordUseOfUnallowedKey(SqlConnectionString.KEY.AttachDBFilename); + } + + ChangePassword(connectionString, connectionOptions, credential, null, newSecurePassword); + } + + private static void ChangePassword(string connectionString, SqlConnectionString connectionOptions, SqlCredential credential, string newPassword, SecureString newSecurePassword) + { + // note: This is the only case where we directly construct the internal connection, passing in the new password. + // Normally we would simply create a regular connection and open it, but there is no other way to pass the + // new password down to the constructor. This would have an unwanted impact on the connection pool. + SqlInternalConnectionTds con = null; + try + { + con = new SqlInternalConnectionTds(null, connectionOptions, credential, null, newPassword, newSecurePassword, false); + } + finally + { + if (con != null) + con.Dispose(); + } + SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential); + + SqlConnectionFactory.SingletonInstance.ClearPool(key); + } + // // SQL DEBUGGING SUPPORT // diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlConnectionFactory.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlConnectionFactory.cs index d99413f48f..4f82668bf7 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlConnectionFactory.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlConnectionFactory.cs @@ -95,7 +95,7 @@ namespace System.Data.SqlClient // This first connection is established to SqlExpress to get the instance name // of the UserInstance. SqlConnectionString sseopt = new SqlConnectionString(opt, opt.DataSource, userInstance: true, setEnlistValue: false); - sseConnection = new SqlInternalConnectionTds(identity, sseopt, null, false, applyTransientFaultHandling: applyTransientFaultHandling); + sseConnection = new SqlInternalConnectionTds(identity, sseopt, key.Credential, null, "", null, false, applyTransientFaultHandling: applyTransientFaultHandling); // NOTE: Retrieve here. This user instance name will be used below to connect to the Sql Express User Instance. instanceName = sseConnection.InstanceName; @@ -132,7 +132,7 @@ namespace System.Data.SqlClient opt = new SqlConnectionString(opt, instanceName, userInstance: false, setEnlistValue: null); poolGroupProviderInfo = null; // null so we do not pass to constructor below... } - result = new SqlInternalConnectionTds(identity, opt, poolGroupProviderInfo, redirectedUserInstance, userOpt, recoverySessionData, applyTransientFaultHandling: applyTransientFaultHandling); + result = new SqlInternalConnectionTds(identity, opt, key.Credential, poolGroupProviderInfo, "", null, redirectedUserInstance, userOpt, recoverySessionData, applyTransientFaultHandling: applyTransientFaultHandling); return result; } diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlConnectionPoolKey.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlConnectionPoolKey.cs index 6f1eda32b6..17b542e28f 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlConnectionPoolKey.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlConnectionPoolKey.cs @@ -15,14 +15,17 @@ namespace System.Data.SqlClient internal class SqlConnectionPoolKey : DbConnectionPoolKey { private int _hashValue; + private SqlCredential _credential; - internal SqlConnectionPoolKey(string connectionString) : base(connectionString) + internal SqlConnectionPoolKey(string connectionString, SqlCredential credential) : base(connectionString) { + _credential = credential; CalculateHashCode(); } private SqlConnectionPoolKey(SqlConnectionPoolKey key) : base(key) { + _credential = key.Credential; CalculateHashCode(); } @@ -45,13 +48,14 @@ namespace System.Data.SqlClient } } - + internal SqlCredential Credential => _credential; public override bool Equals(object obj) { SqlConnectionPoolKey key = obj as SqlConnectionPoolKey; return (key != null && - ConnectionString == key.ConnectionString); + ConnectionString == key.ConnectionString && + Credential == key.Credential); } public override int GetHashCode() @@ -62,6 +66,14 @@ namespace System.Data.SqlClient private void CalculateHashCode() { _hashValue = base.GetHashCode(); + + if (_credential != null) + { + unchecked + { + _hashValue = _hashValue * 17 + _credential.GetHashCode(); + } + } } } } diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlCredential.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlCredential.cs new file mode 100644 index 0000000000..2f69e23937 --- /dev/null +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlCredential.cs @@ -0,0 +1,51 @@ +// 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.Data.Common; +using System.Security; + +namespace System.Data.SqlClient +{ + public sealed class SqlCredential + { + string _userId; + SecureString _password; + + public SqlCredential(string userId, SecureString password) + { + if (userId == null) + { + throw ADP.ArgumentNull(nameof(userId)); + } + + if (userId.Length > TdsEnums.MAXLEN_USERNAME) + { + throw ADP.InvalidArgumentLength(nameof(userId), TdsEnums.MAXLEN_USERNAME); + } + + if (password == null) + { + throw ADP.ArgumentNull(nameof(password)); + } + + if (password.Length > TdsEnums.MAXLEN_PASSWORD) + { + throw ADP.InvalidArgumentLength(nameof(password), TdsEnums.MAXLEN_PASSWORD); + } + + if (!password.IsReadOnly()) + { + throw ADP.MustBeReadOnly(nameof(password)); + } + + _userId = userId; + _password = password; + } + + public string UserId => _userId; + + public SecureString Password => _password; + + } +} diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlDependencyListener.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlDependencyListener.cs index ce30233356..682f1e0748 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlDependencyListener.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlDependencyListener.cs @@ -612,7 +612,12 @@ internal class SqlDependencyProcessDispatcher : MarshalByRefObject _timeoutParam.Value = _defaultWaitforTimeout; // If success, reset to default for re-queue. AsynchronouslyQueryServiceBrokerQueue(); _errorState = false; - _retryTimer = null; + Timer retryTimer = _retryTimer; + if (retryTimer != null) + { + _retryTimer = null; + retryTimer.Dispose(); + } } } @@ -1470,4 +1475,4 @@ internal class SqlDependencyProcessDispatcher : MarshalByRefObject return stopped; } -} \ No newline at end of file +} diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlDependencyUtils.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlDependencyUtils.cs index a2b2ffffef..5f5663c298 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlDependencyUtils.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlDependencyUtils.cs @@ -80,7 +80,11 @@ namespace System.Data.SqlClient _notificationIdToDependenciesHash = new Dictionary(); _commandHashToNotificationId = new Dictionary(); - _timeoutTimer = new Timer(new TimerCallback(TimeoutTimerCallback), null, Timeout.Infinite, Timeout.Infinite); + _timeoutTimer = ADP.UnsafeCreateTimer( + new TimerCallback(TimeoutTimerCallback), + null, + Timeout.Infinite, + Timeout.Infinite); SubscribeToAppDomainUnload(); } diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlInternalConnectionTds.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlInternalConnectionTds.cs index f5c03bb81c..f75a1a28c6 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlInternalConnectionTds.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlInternalConnectionTds.cs @@ -15,6 +15,7 @@ using System.Threading; using System.Diagnostics.CodeAnalysis; using System.Threading.Tasks; using System.Transactions; +using System.Security; namespace System.Data.SqlClient { @@ -104,6 +105,7 @@ namespace System.Data.SqlClient private readonly SqlConnectionPoolGroupProviderInfo _poolGroupProviderInfo; // will only be null when called for ChangePassword, or creating SSE User Instance private TdsParser _parser; private SqlLoginAck _loginAck; + private SqlCredential _credential; // Connection Resiliency private bool _sessionRecoveryRequested; @@ -301,7 +303,10 @@ namespace System.Data.SqlClient internal SqlInternalConnectionTds( DbConnectionPoolIdentity identity, SqlConnectionString connectionOptions, + SqlCredential credential, object providerInfo, + string newPassword, + SecureString newSecurePassword, bool redirectedUserInstance, SqlConnectionString userConnectionOptions = null, // NOTE: userConnectionOptions may be different to connectionOptions if the connection string has been expanded (see SqlConnectionString.Expand) SessionData reconnectSessionData = null, @@ -332,6 +337,10 @@ namespace System.Data.SqlClient _identity = identity; + Debug.Assert(newSecurePassword != null || newPassword != null, "cannot have both new secure change password and string based change password to be null"); + Debug.Assert(credential == null || (string.IsNullOrEmpty(connectionOptions.UserID) && string.IsNullOrEmpty(connectionOptions.Password)), "cannot mix the new secure password system and the connection string based password"); + + Debug.Assert(credential == null || !connectionOptions.IntegratedSecurity, "Cannot use SqlCredential and Integrated Security"); _poolGroupProviderInfo = (SqlConnectionPoolGroupProviderInfo)providerInfo; _fResetConnection = connectionOptions.ConnectionReset; @@ -342,6 +351,7 @@ namespace System.Data.SqlClient } _timeoutErrorInternal = new SqlConnectionTimeoutErrorInternal(); + _credential = credential; _parserLock.Wait(canReleaseFromAnyThread: false); ThreadHasParserLockForClose = true; // In case of error, let ourselves know that we already own the parser lock @@ -356,7 +366,8 @@ namespace System.Data.SqlClient { try { - OpenLoginEnlist(timeout, connectionOptions, redirectedUserInstance); + OpenLoginEnlist(timeout, connectionOptions, credential, newPassword, newSecurePassword, redirectedUserInstance); + break; } catch (SqlException sqlex) @@ -1053,7 +1064,7 @@ namespace System.Data.SqlClient _parser._physicalStateObj.SniContext = SniContext.Snix_Login; } - private void Login(ServerInfo server, TimeoutTimer timeout) + private void Login(ServerInfo server, TimeoutTimer timeout, string newPassword, SecureString newSecurePassword) { // create a new login record SqlLogin login = new SqlLogin(); @@ -1099,7 +1110,13 @@ namespace System.Data.SqlClient login.useReplication = ConnectionOptions.Replication; login.useSSPI = ConnectionOptions.IntegratedSecurity; login.packetSize = _currentPacketSize; + login.newPassword = newPassword; login.readOnlyIntent = ConnectionOptions.ApplicationIntent == ApplicationIntent.ReadOnly; + login.credential = _credential; + if (newSecurePassword != null) + { + login.newSecurePassword = newSecurePassword; + } TdsEnums.FeatureExtension requestedFeatures = TdsEnums.FeatureExtension.None; if (ConnectionOptions.ConnectRetryCount > 0) @@ -1127,6 +1144,9 @@ namespace System.Data.SqlClient private void OpenLoginEnlist(TimeoutTimer timeout, SqlConnectionString connectionOptions, + SqlCredential credential, + string newPassword, + SecureString newSecurePassword, bool redirectedUserInstance) { bool useFailoverPartner; // should we use primary or secondary first @@ -1160,8 +1180,11 @@ namespace System.Data.SqlClient useFailoverPartner, dataSource, failoverPartner, + newPassword, + newSecurePassword, redirectedUserInstance, connectionOptions, + credential, timeout); } else @@ -1169,8 +1192,11 @@ namespace System.Data.SqlClient _timeoutErrorInternal.SetFailoverScenario(false); // not a failover scenario LoginNoFailover( dataSource, + newPassword, + newSecurePassword, redirectedUserInstance, connectionOptions, + credential, timeout); } _timeoutErrorInternal.EndPhase(SqlConnectionTimeoutErrorPhase.PostLogin); @@ -1210,9 +1236,12 @@ namespace System.Data.SqlClient // Changes to either one should be examined to see if they need to be reflected in the other // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! private void LoginNoFailover(ServerInfo serverInfo, - bool redirectedUserInstance, - SqlConnectionString connectionOptions, - TimeoutTimer timeout) + string newPassword, + SecureString newSecurePassword, + bool redirectedUserInstance, + SqlConnectionString connectionOptions, + SqlCredential credential, + TimeoutTimer timeout) { Debug.Assert(object.ReferenceEquals(connectionOptions, this.ConnectionOptions), "ConnectionOptions argument and property must be the same"); // consider removing the argument int routingAttempts = 0; @@ -1273,8 +1302,10 @@ namespace System.Data.SqlClient try { AttemptOneLogin(serverInfo, + newPassword, + newSecurePassword, !connectionOptions.MultiSubnetFailover, // ignore timeout for SniOpen call unless MSF - connectionOptions.MultiSubnetFailover ? intervalTimer : timeout); + connectionOptions.MultiSubnetFailover ? intervalTimer : timeout); if (connectionOptions.MultiSubnetFailover && null != ServerProvidedFailOverPartner) { @@ -1353,9 +1384,12 @@ namespace System.Data.SqlClient true, // start by using failover partner, since we already failed to connect to the primary serverInfo, ServerProvidedFailOverPartner, - redirectedUserInstance, + newPassword, + newSecurePassword, + redirectedUserInstance, connectionOptions, - timeout); + credential, + timeout); return; // LoginWithFailover successfully connected and handled entire connection setup } @@ -1395,9 +1429,12 @@ namespace System.Data.SqlClient bool useFailoverHost, ServerInfo primaryServerInfo, string failoverHost, - bool redirectedUserInstance, + string newPassword, + SecureString newSecurePassword, + bool redirectedUserInstance, SqlConnectionString connectionOptions, - TimeoutTimer timeout + SqlCredential credential, + TimeoutTimer timeout ) { Debug.Assert(!connectionOptions.MultiSubnetFailover, "MultiSubnetFailover should not be set if failover partner is used"); @@ -1475,7 +1512,9 @@ namespace System.Data.SqlClient // Attempt login. Use timerInterval for attempt timeout unless infinite timeout was requested. AttemptOneLogin( currentServerInfo, - false, // Use timeout in SniOpen + newPassword, + newSecurePassword, + false, // Use timeout in SniOpen intervalTimer, withFailover: true ); @@ -1561,10 +1600,13 @@ namespace System.Data.SqlClient } // Common code path for making one attempt to establish a connection and log in to server. - private void AttemptOneLogin(ServerInfo serverInfo, + private void AttemptOneLogin( + ServerInfo serverInfo, + string newPassword, + SecureString newSecurePassword, bool ignoreSniOpenTimeout, - TimeoutTimer timeout, - bool withFailover = false) + TimeoutTimer timeout, + bool withFailover = false) { _routingInfo = null; // forget routing information @@ -1583,7 +1625,7 @@ namespace System.Data.SqlClient _timeoutErrorInternal.SetAndBeginPhase(SqlConnectionTimeoutErrorPhase.LoginBegin); _parser._physicalStateObj.SniContext = SniContext.Snix_Login; - this.Login(serverInfo, timeout); + this.Login(serverInfo, timeout, newPassword, newSecurePassword); _timeoutErrorInternal.EndPhase(SqlConnectionTimeoutErrorPhase.ProcessConnectionAuth); _timeoutErrorInternal.SetAndBeginPhase(SqlConnectionTimeoutErrorPhase.PostLogin); diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlParameterCollection.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlParameterCollection.cs index 78d0e009a9..75691359df 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlParameterCollection.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlParameterCollection.cs @@ -30,7 +30,8 @@ namespace System.Data.SqlClient _isDirty = value; } } - + public override bool IsFixedSize => ((System.Collections.IList)InnerList).IsFixedSize; + public override bool IsReadOnly => ((System.Collections.IList)InnerList).IsReadOnly; new public SqlParameter this[int index] { get diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlUtil.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlUtil.cs index 8b9470bd97..a649b9eae2 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlUtil.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlUtil.cs @@ -204,6 +204,22 @@ namespace System.Data.SqlClient { return ADP.InvalidOperation(SR.GetString(SR.SQL_InstanceFailure)); } + internal static Exception ChangePasswordArgumentMissing(string argumentName) + { + return ADP.ArgumentNull(SR.GetString(SR.SQL_ChangePasswordArgumentMissing, argumentName)); + } + internal static Exception ChangePasswordConflictsWithSSPI() + { + return ADP.Argument(SR.GetString(SR.SQL_ChangePasswordConflictsWithSSPI)); + } + internal static Exception ChangePasswordRequiresYukon() + { + return ADP.InvalidOperation(SR.GetString(SR.SQL_ChangePasswordRequiresYukon)); + } + static internal Exception ChangePasswordUseOfUnallowedKey(string key) + { + return ADP.InvalidOperation(SR.GetString(SR.SQL_ChangePasswordUseOfUnallowedKey, key)); + } // // Global Transactions. diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParser.cs.REMOVED.git-id b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParser.cs.REMOVED.git-id index dea8f41332..6f08502927 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParser.cs.REMOVED.git-id +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParser.cs.REMOVED.git-id @@ -1 +1 @@ -16e03ce9922cd095766806207ec91890062e8421 \ No newline at end of file +eb9067b8e263568b3c08c06c1e834e231647168e \ No newline at end of file diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParserHelperClasses.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParserHelperClasses.cs index c41adc358a..dc6379b66c 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParserHelperClasses.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParserHelperClasses.cs @@ -11,6 +11,7 @@ using System.Collections.ObjectModel; using System.Data.Common; using System.Data.SqlTypes; using System.Diagnostics; +using System.Security; using System.Text; using Microsoft.SqlServer.Server; @@ -250,9 +251,12 @@ namespace System.Data.SqlClient internal string database = ""; // initial database internal string attachDBFilename = ""; // DB filename to be attached internal bool useReplication = false; // user login for replication + internal string newPassword = ""; // new password for reset password internal bool useSSPI = false; // use integrated security internal int packetSize = SqlConnectionString.DEFAULT.Packet_Size; // packet size internal bool readOnlyIntent = false; // read-only intent + internal SqlCredential credential; // user id and password in SecureString + internal SecureString newSecurePassword; } sealed internal class SqlLoginAck diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParserStateObject.cs.REMOVED.git-id b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParserStateObject.cs.REMOVED.git-id index c1b070e2e7..742958af92 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParserStateObject.cs.REMOVED.git-id +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParserStateObject.cs.REMOVED.git-id @@ -1 +1 @@ -157df9ce5a4be9cdaf09610b797ebf924d476109 \ No newline at end of file +50d0f964ef732cc56a664bd77307f84098218247 \ No newline at end of file diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParserStateObjectManaged.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParserStateObjectManaged.cs index 50d03824fb..02c6602633 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParserStateObjectManaged.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParserStateObjectManaged.cs @@ -125,17 +125,13 @@ namespace System.Data.SqlClient.SNI internal override bool IsFailedHandle() => _sessionHandle.Status != TdsEnums.SNI_SUCCESS; - internal override object ReadSyncOverAsync(int timeoutRemaining, bool isMarsOn, out uint error) + internal override object ReadSyncOverAsync(int timeoutRemaining, out uint error) { SNIHandle handle = Handle; if (handle == null) { throw ADP.ClosedConnectionError(); } - if (isMarsOn) - { - IncrementPendingCallbacks(); - } SNIPacket packet = null; error = SNIProxy.Singleton.ReadSyncOverAsync(handle, out packet, timeoutRemaining); return packet; @@ -166,10 +162,13 @@ namespace System.Data.SqlClient.SNI internal override object CreateAndSetAttentionPacket() { - SNIPacket attnPacket = new SNIPacket(Handle); - _sniAsyncAttnPacket = attnPacket; - SetPacketData(attnPacket, SQL.AttentionHeader, TdsEnums.HEADER_LEN); - return attnPacket; + if (_sniAsyncAttnPacket == null) + { + SNIPacket attnPacket = new SNIPacket(); + SetPacketData(attnPacket, SQL.AttentionHeader, TdsEnums.HEADER_LEN); + _sniAsyncAttnPacket = attnPacket; + } + return _sniAsyncAttnPacket; } internal override uint WritePacket(object packet, bool sync) @@ -268,7 +267,7 @@ namespace System.Data.SqlClient.SNI else { // Failed to take a packet - create a new one - packet = new SNIPacket(sniHandle); + packet = new SNIPacket(); } return packet; } diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParserStateObjectNative.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParserStateObjectNative.cs index bebd574324..01cf8b68d6 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParserStateObjectNative.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParserStateObjectNative.cs @@ -169,7 +169,7 @@ namespace System.Data.SqlClient internal override bool IsFailedHandle() => _sessionHandle.Status != TdsEnums.SNI_SUCCESS; - internal override object ReadSyncOverAsync(int timeoutRemaining, bool isMarsOn, out uint error) + internal override object ReadSyncOverAsync(int timeoutRemaining, out uint error) { SNIHandle handle = Handle; if (handle == null) diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParserStaticMethods.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParserStaticMethods.cs index d62e63218f..9740bb693d 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParserStaticMethods.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParserStaticMethods.cs @@ -41,6 +41,20 @@ namespace System.Data.SqlClient return bObfuscated; } + internal static byte[] ObfuscatePassword(byte[] password) + { + byte bLo; + byte bHi; + + for (int i = 0; i < password.Length; i++) + { + bLo = (byte)(password[i] & 0x0f); + bHi = (byte)(password[i] & 0xf0); + password[i] = (Byte)(((bHi >> 4) | (bLo << 4)) ^ 0xa5); + } + return password; + } + private const int NoProcessId = -1; private static int s_currentProcessId = NoProcessId; internal static int GetCurrentProcessIdForTdsLoginOnly() diff --git a/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/DiagnosticTest.cs b/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/DiagnosticTest.cs index d04c326aaf..ed78353c34 100644 --- a/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/DiagnosticTest.cs +++ b/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/DiagnosticTest.cs @@ -18,7 +18,6 @@ using System.Runtime.CompilerServices; namespace System.Data.SqlClient.Tests { - [ActiveIssue("dotnet/corefx #17925", TestPlatforms.Any)] public class DiagnosticTest : RemoteExecutorTestBase { private const string BadConnectionString = "data source = bad; initial catalog = bad; uid = bad; password = bad; connection timeout = 1;"; @@ -27,7 +26,7 @@ namespace System.Data.SqlClient.Tests public static bool IsConnectionStringConfigured() => s_tcpConnStr != string.Empty; [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot)] // Internals reflection not supported on uapaot + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot | TargetFrameworkMonikers.NetFramework, "Internals reflection not supported on UapAot | Feature not available on Framework")] public void ExecuteScalarTest() { RemoteInvoke(() => @@ -49,7 +48,7 @@ namespace System.Data.SqlClient.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot)] // Internals reflection not supported on uapaot + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot | TargetFrameworkMonikers.NetFramework, "Internals reflection not supported on UapAot | Feature not available on Framework")] public void ExecuteScalarErrorTest() { RemoteInvoke(() => @@ -73,7 +72,7 @@ namespace System.Data.SqlClient.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot)] // Internals reflection not supported on uapaot + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot | TargetFrameworkMonikers.NetFramework, "Internals reflection not supported on UapAot | Feature not available on Framework")] public void ExecuteNonQueryTest() { RemoteInvoke(() => @@ -95,7 +94,7 @@ namespace System.Data.SqlClient.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot)] // Internals reflection not supported on uapaot + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot | TargetFrameworkMonikers.NetFramework, "Internals reflection not supported on UapAot | Feature not available on Framework")] public void ExecuteNonQueryErrorTest() { RemoteInvoke(() => @@ -133,7 +132,7 @@ namespace System.Data.SqlClient.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot)] // Internals reflection not supported on uapaot + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot | TargetFrameworkMonikers.NetFramework, "Internals reflection not supported on UapAot | Feature not available on Framework")] public void ExecuteReaderTest() { RemoteInvoke(() => @@ -156,7 +155,7 @@ namespace System.Data.SqlClient.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot)] // Internals reflection not supported on uapaot + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot | TargetFrameworkMonikers.NetFramework, "Internals reflection not supported on UapAot | Feature not available on Framework")] public void ExecuteReaderErrorTest() { RemoteInvoke(() => @@ -182,7 +181,7 @@ namespace System.Data.SqlClient.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot)] // Internals reflection not supported on uapaot + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot | TargetFrameworkMonikers.NetFramework, "Internals reflection not supported on UapAot | Feature not available on Framework")] public void ExecuteReaderWithCommandBehaviorTest() { RemoteInvoke(() => @@ -205,7 +204,7 @@ namespace System.Data.SqlClient.Tests } [ConditionalFact(nameof(IsConnectionStringConfigured))] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot)] // Internals reflection not supported on uapaot + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot | TargetFrameworkMonikers.NetFramework, "Internals reflection not supported on UapAot | Feature not available on Framework")] public void ExecuteXmlReaderTest() { RemoteInvoke(cs => @@ -228,7 +227,7 @@ namespace System.Data.SqlClient.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot)] // Internals reflection not supported on uapaot + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot | TargetFrameworkMonikers.NetFramework, "Internals reflection not supported on UapAot | Feature not available on Framework")] public void ExecuteXmlReaderErrorTest() { RemoteInvoke(() => @@ -254,7 +253,7 @@ namespace System.Data.SqlClient.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot)] // Internals reflection not supported on uapaot + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot | TargetFrameworkMonikers.NetFramework, "Internals reflection not supported on UapAot | Feature not available on Framework")] public void ExecuteScalarAsyncTest() { RemoteInvoke(() => @@ -276,7 +275,7 @@ namespace System.Data.SqlClient.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot)] // Internals reflection not supported on uapaot + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot | TargetFrameworkMonikers.NetFramework, "Internals reflection not supported on UapAot | Feature not available on Framework")] public void ExecuteScalarAsyncErrorTest() { RemoteInvoke(() => @@ -300,7 +299,7 @@ namespace System.Data.SqlClient.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot)] // Internals reflection not supported on uapaot + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot | TargetFrameworkMonikers.NetFramework, "Internals reflection not supported on UapAot | Feature not available on Framework")] public void ExecuteNonQueryAsyncTest() { RemoteInvoke(() => @@ -322,7 +321,7 @@ namespace System.Data.SqlClient.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot)] // Internals reflection not supported on uapaot + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot | TargetFrameworkMonikers.NetFramework, "Internals reflection not supported on UapAot | Feature not available on Framework")] public void ExecuteNonQueryAsyncErrorTest() { RemoteInvoke(() => @@ -345,7 +344,7 @@ namespace System.Data.SqlClient.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot)] // Internals reflection not supported on uapaot + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot | TargetFrameworkMonikers.NetFramework, "Internals reflection not supported on UapAot | Feature not available on Framework")] public void ExecuteReaderAsyncTest() { RemoteInvoke(() => @@ -368,7 +367,7 @@ namespace System.Data.SqlClient.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot)] // Internals reflection not supported on uapaot + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot | TargetFrameworkMonikers.NetFramework, "Internals reflection not supported on UapAot | Feature not available on Framework")] public void ExecuteReaderAsyncErrorTest() { RemoteInvoke(() => @@ -394,7 +393,7 @@ namespace System.Data.SqlClient.Tests } [ConditionalFact(nameof(IsConnectionStringConfigured))] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot)] // Internals reflection not supported on uapaot + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot | TargetFrameworkMonikers.NetFramework, "Internals reflection not supported on UapAot | Feature not available on Framework")] public void ExecuteXmlReaderAsyncTest() { RemoteInvoke(cs => @@ -417,7 +416,7 @@ namespace System.Data.SqlClient.Tests } [ConditionalFact(nameof(IsConnectionStringConfigured))] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot)] // Internals reflection not supported on uapaot + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot | TargetFrameworkMonikers.NetFramework, "Internals reflection not supported on UapAot | Feature not available on Framework")] public void ExecuteXmlReaderAsyncErrorTest() { RemoteInvoke(cs => @@ -443,7 +442,7 @@ namespace System.Data.SqlClient.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot)] // Internals reflection not supported on uapaot + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot | TargetFrameworkMonikers.NetFramework, "Internals reflection not supported on UapAot | Feature not available on Framework")] public void ConnectionOpenTest() { RemoteInvoke(() => @@ -464,7 +463,7 @@ namespace System.Data.SqlClient.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot)] // Internals reflection not supported on uapaot + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot | TargetFrameworkMonikers.NetFramework, "Internals reflection not supported on UapAot | Feature not available on Framework")] public void ConnectionOpenErrorTest() { RemoteInvoke(() => @@ -481,7 +480,7 @@ namespace System.Data.SqlClient.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot)] // Internals reflection not supported on uapaot + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot | TargetFrameworkMonikers.NetFramework, "Internals reflection not supported on UapAot | Feature not available on Framework")] public void ConnectionOpenAsyncTest() { RemoteInvoke(() => @@ -498,7 +497,7 @@ namespace System.Data.SqlClient.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot)] // Internals reflection not supported on uapaot + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot | TargetFrameworkMonikers.NetFramework, "Internals reflection not supported on UapAot | Feature not available on Framework")] public void ConnectionOpenAsyncErrorTest() { RemoteInvoke(() => diff --git a/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/SqlConnectionBasicTests.cs b/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/SqlConnectionBasicTests.cs index 381a5ec6cd..27758ef22a 100644 --- a/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/SqlConnectionBasicTests.cs +++ b/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/SqlConnectionBasicTests.cs @@ -2,11 +2,9 @@ // 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.Collections.Generic; using System.Data.Common; -using System.Diagnostics; using System.Reflection; -using System.Threading; +using System.Security; using Xunit; namespace System.Data.SqlClient.Tests @@ -14,7 +12,6 @@ namespace System.Data.SqlClient.Tests public class SqlConnectionBasicTests { [Fact] - [ActiveIssue("dotnet/corefx #23435", TestPlatforms.Any)] public void ConnectionTest() { using (TestTdsServer server = TestTdsServer.StartTestServer()) @@ -27,7 +24,6 @@ namespace System.Data.SqlClient.Tests } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer), nameof(PlatformDetection.IsNotArmProcess))] - [ActiveIssue("dotnet/corefx #23435", TestPlatforms.Any)] [PlatformSpecific(TestPlatforms.Windows)] public void IntegratedAuthConnectionTest() { @@ -83,96 +79,89 @@ namespace System.Data.SqlClient.Tests } [Fact] - public void ConnectionTimeoutTestWithThread() + public void ClosedConnectionSchemaRetrieval() { - int timeoutSec = 5; - string connStrNotAvailable = $"Server=tcp:fakeServer,1433;uid=fakeuser;pwd=fakepwd;Connection Timeout={timeoutSec}"; - - List list = new List(); - for (int i = 0; i < 10; ++i) + using (SqlConnection connection = new SqlConnection(string.Empty)) { - list.Add(new ConnectionWorker(connStrNotAvailable)); + Assert.Throws(() => connection.GetSchema()); } - - ConnectionWorker.Start(); - ConnectionWorker.Stop(); - - double theMax = 0; - foreach (ConnectionWorker w in list) - { - if (theMax < w.MaxTimeElapsed) - { - theMax = w.MaxTimeElapsed; - } - } - - int threshold = (timeoutSec + 1) * 1000; - - Console.WriteLine($"ConnectionTimeoutTestWithThread: Elapsed Time {theMax} and threshold {threshold}"); } - public class ConnectionWorker + [Theory] + [InlineData("RandomStringForTargetServer", false, true)] + [InlineData("RandomStringForTargetServer", true, false)] + [InlineData(null, false, false)] + [InlineData("", false, false)] + public void RetrieveWorkstationId(string workstation, bool withDispose, bool shouldMatchSetWorkstationId) { - private static ManualResetEventSlim startEvent = new ManualResetEventSlim(false); - private static List workerList = new List(); - private ManualResetEventSlim doneEvent = new ManualResetEventSlim(false); - private double maxTimeElapsed; - private Thread thread; - private string connectionString; - - public ConnectionWorker(string connectionString) + string connectionString = $"Workstation Id={workstation}"; + SqlConnection conn = new SqlConnection(connectionString); + if(withDispose) { - workerList.Add(this); - this.connectionString = connectionString; - thread = new Thread(new ThreadStart(SqlConnectionOpen)); - thread.Start(); + conn.Dispose(); } + string expected = shouldMatchSetWorkstationId ? workstation : Environment.MachineName; + Assert.Equal(expected, conn.WorkstationId); + } - public double MaxTimeElapsed + [OuterLoop("Can take up to 4 seconds")] + [Fact] + public void ExceptionsWithMinPoolSizeCanBeHandled() + { + string connectionString = $"Data Source={Guid.NewGuid().ToString()};uid=random;pwd=asd;Connect Timeout=2; Min Pool Size=3"; + for (int i = 0; i < 2; i++) { - get + using (SqlConnection connection = new SqlConnection(connectionString)) { - return maxTimeElapsed; + Exception exception = Record.Exception(() => connection.Open()); + Assert.True(exception is InvalidOperationException || exception is SqlException, $"Unexpected exception: {exception}"); } } + } - public static void Start() + [Fact] + public void ConnectionTestInvalidCredentialCombination() + { + var cleartextCredsConnStr = "User=test;Password=test;"; + var sspiConnStr = "Integrated Security=true;"; + var testPassword = new SecureString(); + testPassword.MakeReadOnly(); + var sqlCredential = new SqlCredential(string.Empty, testPassword); + + // Verify that SSPI and cleartext username/password are not in the connection string. + Assert.Throws(() => { new SqlConnection(cleartextCredsConnStr, sqlCredential); }); + + Assert.Throws(() => { new SqlConnection(sspiConnStr, sqlCredential); }); + + // Verify that credential may not be set with cleartext username/password or SSPI. + using (var conn = new SqlConnection(cleartextCredsConnStr)) { - startEvent.Set(); + Assert.Throws(() => { conn.Credential = sqlCredential; }); } - public static void Stop() + using (var conn = new SqlConnection(sspiConnStr)) { - foreach (ConnectionWorker w in workerList) - { - w.doneEvent.Wait(); - } + Assert.Throws(() => { conn.Credential = sqlCredential; }); } - public void SqlConnectionOpen() + // Verify that connection string with username/password or SSPI may not be set with credential present. + using (var conn = new SqlConnection(string.Empty, sqlCredential)) { - startEvent.Wait(); + Assert.Throws(() => { conn.ConnectionString = cleartextCredsConnStr; }); - Stopwatch sw = new Stopwatch(); - using (SqlConnection con = new SqlConnection(connectionString)) - { - sw.Start(); - try - { - con.Open(); - } - catch { } - sw.Stop(); - } - - double elapsed = sw.Elapsed.TotalMilliseconds; - if (maxTimeElapsed < elapsed) - { - maxTimeElapsed = elapsed; - } - - doneEvent.Set(); + Assert.Throws(() => { conn.ConnectionString = sspiConnStr; }); } } + + [Fact] + public void ConnectionTestValidCredentialCombination() + { + var testPassword = new SecureString(); + testPassword.MakeReadOnly(); + var sqlCredential = new SqlCredential(string.Empty, testPassword); + var conn = new SqlConnection(string.Empty, sqlCredential); + + Assert.Equal(sqlCredential, conn.Credential); + } } } diff --git a/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/SqlCredentialTest.cs b/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/SqlCredentialTest.cs new file mode 100644 index 0000000000..9194a6594b --- /dev/null +++ b/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/SqlCredentialTest.cs @@ -0,0 +1,74 @@ +// 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; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Linq; +using System.Security; +using System.Text; +using System.Threading.Tasks; +using Xunit; + +namespace System.Data.SqlClient.Tests +{ + public static class SqlCredentialTest + { + [Fact] + public static void Test_SqlCredential_Password_Requirements() + { + var userId = "user"; + + // Create password with value longer than max allowed length + var longPassword = new SecureString(); + + var genPassword = string.Empty.PadLeft(129, '0'); + genPassword.ToCharArray().ToList().ForEach(c => longPassword.AppendChar(c)); + longPassword.MakeReadOnly(); + + // Verify non-null password requirement + Assert.Throws(() => new SqlCredential(userId, null)); + + // Verify max length requirement + Assert.Throws(() => new SqlCredential(userId, longPassword)); + + // Verify read only password requirement + Assert.Throws(() => new SqlCredential(userId, new SecureString())); + + } + + [Fact] + public static void Test_SqlCredential_UserId_Requirements() + { + var password = new SecureString(); + password.MakeReadOnly(); + + // Create userId longer than max allowed length + var userId = string.Empty.PadLeft(129, '0'); + + // Verify max length requirement + Assert.Throws(() => new SqlCredential(userId, password)); + + // Verify non-null userId requirement + Assert.Throws(() => new SqlCredential(null, password)); + + } + + [Fact] + public static void Test_SqlCredential_Properties() + { + var userId = "user"; + var password = new SecureString(); + password.AppendChar('0'); + password.MakeReadOnly(); + + var credential = new SqlCredential(userId, password); + + Assert.Equal(userId, credential.UserId); + Assert.Equal(password, credential.Password); + + } + + } +} diff --git a/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/SqlDataRecordTest.cs b/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/SqlDataRecordTest.cs index 30e1a9c8a7..6ccfd29094 100644 --- a/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/SqlDataRecordTest.cs +++ b/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/SqlDataRecordTest.cs @@ -3,6 +3,8 @@ // See the LICENSE file in the project root for more information. +using System.Collections; +using System.Collections.Generic; using System.Data.SqlTypes; using Microsoft.SqlServer.Server; using Xunit; @@ -136,6 +138,260 @@ namespace System.Data.SqlClient.Tests Assert.Equal(DBNull.Value, record.GetValue(i)); } } + [Fact] + public void GetDataTypeName_ReturnsMetaDataTypeIfUdtType() + { + SqlMetaData[] metaData = new SqlMetaData[] + { + new SqlMetaData("col1", SqlDbType.Udt, typeof(TestUdt), "sql_TestUdt") + }; + + SqlDataRecord record = new SqlDataRecord(metaData); + + Assert.Equal("System.Data.SqlClient.Tests.TestUdt", record.GetDataTypeName(0)); + } + + [Fact] + public void GetDataTypeName_ReturnsTypeFromMetaTypeIfNotUdt() + { + SqlMetaData[] metaData = new SqlMetaData[] + { + new SqlMetaData("col1", SqlDbType.NVarChar, 50) + }; + + SqlDataRecord record = new SqlDataRecord(metaData); + + Assert.Equal("nvarchar", record.GetDataTypeName(0)); + } + [Fact] + public void GetFieldType_ReturnMetaTypeClassType() + { + SqlMetaData[] metaData = new SqlMetaData[] + { + new SqlMetaData("col1", SqlDbType.NVarChar, 50) + }; + + SqlDataRecord record = new SqlDataRecord(metaData); + + Assert.Equal(typeof(string), record.GetFieldType(0)); + } + + [Fact] + public void GetValues_ThrowsIfNull() + { + SqlMetaData[] metaData = new SqlMetaData[] + { + new SqlMetaData("col1", SqlDbType.NVarChar, 50) + }; + + SqlDataRecord record = new SqlDataRecord(metaData); + + Assert.Throws(() => record.GetValues(null)); + } + + [Fact] + public void GetValues_IfValuesBiggerThanColumnCount_LastArrayItemKeptEmpty() + { + SqlMetaData[] metaData = new SqlMetaData[] + { + new SqlMetaData("col1", SqlDbType.NVarChar, 50), + new SqlMetaData("col2", SqlDbType.Int) + }; + SqlDataRecord record = new SqlDataRecord(metaData); + record.SetString(0, "test"); + record.SetSqlInt32(1, 2); + + object[] values = new object[5]; + int columnCount = record.GetValues(values); + + for (int i = 2; i < 5; i++) + { + Assert.Null(values[i]); + } + Assert.Equal(2, columnCount); + } + + [Fact] + public void GetValues_IfValuesShorterThanColumnCount_FillOnlyFirstColumn() + { + SqlMetaData[] metaData = new SqlMetaData[] + { + new SqlMetaData("col1", SqlDbType.NVarChar, 50), + new SqlMetaData("col2", SqlDbType.Int) + }; + SqlDataRecord record = new SqlDataRecord(metaData); + record.SetString(0, "test"); + record.SetSqlInt32(1, 2); + + object[] values = new object[1]; + int columnCount = record.GetValues(values); + + Assert.Equal("test", values[0]); + Assert.Equal(1, columnCount); + } + + [Fact] + public void GetValues_FillsArrayAndRespectColumnOrder() + { + SqlMetaData[] metaData = new SqlMetaData[] + { + new SqlMetaData("col1", SqlDbType.NVarChar, 50), + new SqlMetaData("col2", SqlDbType.Int) + }; + SqlDataRecord record = new SqlDataRecord(metaData); + record.SetString(0, "test"); + record.SetSqlInt32(1, 2); + + object[] values = new object[2]; + int columnCount = record.GetValues(values); + + Assert.Equal("test", values[0]); + Assert.Equal(2, values[1]); + Assert.Equal(2, columnCount); + } + + [Fact] + public void GetOrdinal_ThrowsAgumentNull_IfNameIsNull() + { + SqlMetaData[] metaData = new SqlMetaData[] + { + new SqlMetaData("col1", SqlDbType.NVarChar, 50), + new SqlMetaData("col2", SqlDbType.Int) + }; + SqlDataRecord record = new SqlDataRecord(metaData); + + Assert.Throws(() => record.GetOrdinal(null)); + } + + [Fact] + public void GetOrdinal_ThrowsOutOfRange_IfNameIsNotAColumn() + { + SqlMetaData[] metaData = new SqlMetaData[] + { + new SqlMetaData("col1", SqlDbType.NVarChar, 50), + new SqlMetaData("col2", SqlDbType.Int) + }; + SqlDataRecord record = new SqlDataRecord(metaData); + + + Assert.Throws(() => record.GetOrdinal("outofrange")); + + Assert.Throws(() => record.GetOrdinal("col1 ")); + + } + + [Fact] + public void GetOrdinal_ReturnsIndexOfColumn() + { + SqlMetaData[] metaData = new SqlMetaData[] + { + new SqlMetaData("col1", SqlDbType.NVarChar, 50), + new SqlMetaData("col2", SqlDbType.Int) + }; + SqlDataRecord record = new SqlDataRecord(metaData); + + Assert.Equal(1, record.GetOrdinal("col2")); + } + [Fact] + public void GetOrdinal_ReturnsIndexOfColumn_CaseInsensitive() + { + SqlMetaData[] metaData = new SqlMetaData[] + { + new SqlMetaData("col1", SqlDbType.NVarChar, 50), + new SqlMetaData("col2", SqlDbType.Int) + }; + SqlDataRecord record = new SqlDataRecord(metaData); + + Assert.Equal(1, record.GetOrdinal("Col2")); + } + + [Fact] + public void GetChar_ThrowsNotSupported() + { + SqlMetaData[] metaData = new SqlMetaData[] + { + new SqlMetaData("col1", SqlDbType.Char, 100) + }; + SqlDataRecord record = new SqlDataRecord(metaData); + record.SetValue(0, 'c'); + Assert.Throws(() => record.GetChar(0)); + } + + [Theory] + [ClassData(typeof(GetXXXBadTypeTestData))] + public void GetXXX_ThrowsIfBadType(Func getXXX) + { + SqlMetaData[] metaData = new SqlMetaData[] + { + new SqlMetaData("col1", SqlDbType.NVarChar, 1) + }; + SqlDataRecord record = new SqlDataRecord(metaData); + record.SetValue(0, "a"); + Assert.Throws(() => getXXX(record)); + + } + + [Theory] + [ClassData(typeof(GetXXXCheckValueTestData))] + public void GetXXX_ReturnValue(SqlDbType dbType, object value, Func getXXX) + { + SqlMetaData[] metaData = new SqlMetaData[] + { + new SqlMetaData("col1", dbType) + }; + SqlDataRecord record = new SqlDataRecord(metaData); + record.SetValue(0, value); + Assert.Equal(value, getXXX(record)); + + } + } + + public class GetXXXBadTypeTestData : IEnumerable + { + public IEnumerator GetEnumerator() + { + yield return new object[] { new Func(r => r.GetGuid(0)) }; + yield return new object[] { new Func(r => r.GetInt16(0)) }; + yield return new object[] { new Func(r => r.GetInt32(0)) }; + yield return new object[] { new Func(r => r.GetInt64(0)) }; + yield return new object[] { new Func(r => r.GetFloat(0)) }; + yield return new object[] { new Func(r => r.GetDouble(0)) }; + yield return new object[] { new Func(r => r.GetDecimal(0)) }; + yield return new object[] { new Func(r => r.GetDateTime(0)) }; + yield return new object[] { new Func(r => r.GetDateTimeOffset(0)) }; + yield return new object[] { new Func(r => r.GetTimeSpan(0)) }; + } + + IEnumerator IEnumerable.GetEnumerator() + { + return GetEnumerator(); + } + } + + public class GetXXXCheckValueTestData : IEnumerable + { + public IEnumerator GetEnumerator() + { + yield return new object[] { SqlDbType.UniqueIdentifier, Guid.NewGuid(), new Func(r => r.GetGuid(0)) }; + yield return new object[] { SqlDbType.SmallInt, (Int16)123, new Func(r => r.GetInt16(0)) }; + yield return new object[] { SqlDbType.Int, 123456, new Func(r => r.GetInt32(0)) }; + yield return new object[] { SqlDbType.BigInt, (Int64)123456789, new Func(r => r.GetInt64(0)) }; + yield return new object[] { SqlDbType.Float, (Double)1.2, new Func(r => r.GetDouble(0)) }; + yield return new object[] { SqlDbType.Real, (Single)1.2, new Func(r => r.GetFloat(0)) }; + yield return new object[] { SqlDbType.Decimal, 1.2m, new Func(r => r.GetDecimal(0)) }; + yield return new object[] { SqlDbType.DateTime, DateTime.Now, new Func(r => r.GetDateTime(0)) }; + yield return new object[] { SqlDbType.DateTimeOffset, new DateTimeOffset(DateTime.Now), new Func(r => r.GetDateTimeOffset(0)) }; + yield return new object[] { SqlDbType.Time, TimeSpan.FromHours(1), new Func(r => r.GetTimeSpan(0)) }; + } + + IEnumerator IEnumerable.GetEnumerator() + { + return GetEnumerator(); + } + } + [SqlUserDefinedType(Format.UserDefined)] + public class TestUdt + { } } diff --git a/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/SqlMetaDataTest.cs b/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/SqlMetaDataTest.cs new file mode 100644 index 0000000000..e3d6ed6b74 --- /dev/null +++ b/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/SqlMetaDataTest.cs @@ -0,0 +1,46 @@ +// 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 Microsoft.SqlServer.Server; +using Xunit; + +namespace System.Data.SqlClient.Tests +{ + public class SqlMetaDataTest + { + + // Test UDT constrtuctor without tvp extended properties + [Fact] + public void UdtConstructorTest() + { + Address address = Address.Parse("123 baker st || Redmond"); + SqlMetaData metaData = new SqlMetaData("col1", SqlDbType.Udt, typeof(Address), "UdtTestDb.dbo.Address"); + Assert.Equal("col1", metaData.Name); + Assert.Equal(SqlDbType.Udt, metaData.SqlDbType); + Assert.Equal(address.GetType(), metaData.Type); + Assert.Equal("UdtTestDb.dbo.Address", metaData.TypeName); + Assert.False(metaData.UseServerDefault); + Assert.False(metaData.IsUniqueKey); + Assert.Equal(SortOrder.Unspecified, metaData.SortOrder); + Assert.Equal(-1, metaData.SortOrdinal); + } + + + // Test UDT constrtuctor with tvp extended properties + [Fact] + public void UdtConstructorWithTvpTest() + { + Address address = Address.Parse("123 baker st || Redmond"); + SqlMetaData metaData = new SqlMetaData("col2", SqlDbType.Udt, typeof(Address), "UdtTestDb.dbo.Address", true, true, SortOrder.Ascending, 0); + Assert.Equal("col2", metaData.Name); + Assert.Equal(SqlDbType.Udt, metaData.SqlDbType); + Assert.Equal(address.GetType(), metaData.Type); + Assert.Equal("UdtTestDb.dbo.Address", metaData.TypeName); + Assert.True(metaData.UseServerDefault); + Assert.True(metaData.IsUniqueKey); + Assert.Equal(SortOrder.Ascending, metaData.SortOrder); + Assert.Equal(0, metaData.SortOrdinal); + } + } +} diff --git a/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj b/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj index 2c4c8a0225..8e60f464cd 100644 --- a/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj +++ b/external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj @@ -14,12 +14,14 @@ + + @@ -30,6 +32,10 @@ + + {d1392b54-998a-4f27-bc17-4ce149117bcc} + Address + TDS.Servers diff --git a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs index 2426927935..2d43534479 100644 --- a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs +++ b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs @@ -60,19 +60,9 @@ namespace System.Data.SqlClient.ManualTesting.Tests return name; } - public static bool IsLocalDBInstalled() - { - string localDBInstallationFlag = Environment.GetEnvironmentVariable("TEST_LOCALDB_INSTALLED"); - if (!string.IsNullOrWhiteSpace(localDBInstallationFlag)) - { - int result; - if (int.TryParse(localDBInstallationFlag.Trim(), out result)) - { - return result == 1; - } - } - return false; - } + public static bool IsLocalDBInstalled() => int.TryParse(Environment.GetEnvironmentVariable("TEST_LOCALDB_INSTALLED"), out int result) ? result == 1 : false; + + public static bool IsIntegratedSecuritySetup() => int.TryParse(Environment.GetEnvironmentVariable("TEST_INTEGRATEDSECURITY_SETUP"), out int result) ? result == 1 : false; private static bool CheckException(Exception ex, string exceptionMessage, bool innerExceptionMustBeNull) where TException : Exception { @@ -151,7 +141,7 @@ namespace System.Data.SqlClient.ManualTesting.Tests return ex; } - public static TException ExpectFailure(Action actionThatFails, string exceptionMessage = null, bool innerExceptionMustBeNull = false, Func customExceptionVerifier = null) where TException : Exception + public static TException ExpectFailure(Action actionThatFails, string[] exceptionMessages, bool innerExceptionMustBeNull = false, Func customExceptionVerifier = null) where TException : Exception { try { @@ -161,14 +151,14 @@ namespace System.Data.SqlClient.ManualTesting.Tests } catch (Exception ex) { - if ((CheckException(ex, exceptionMessage, innerExceptionMustBeNull)) && ((customExceptionVerifier == null) || (customExceptionVerifier(ex as TException)))) + foreach (string exceptionMessage in exceptionMessages) { - return (ex as TException); - } - else - { - throw; + if ((CheckException(ex, exceptionMessage, innerExceptionMustBeNull)) && ((customExceptionVerifier == null) || (customExceptionVerifier(ex as TException)))) + { + return (ex as TException); + } } + throw; } } diff --git a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs index 50784553dd..10a590dffe 100644 --- a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs +++ b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs @@ -18,6 +18,8 @@ namespace System.Data.SqlClient.ManualTesting.Tests // data value and server consts private const string MagicName = "Magic"; + // Use a union statement so that Identity columns don't carry over + private const string _createTableQuery = "select * into {0} from Employees where EmployeeID < 3 union all (select * from Employees where 1 = 0)"; private string _tempTable; private string _tempKey; @@ -567,20 +569,20 @@ namespace System.Data.SqlClient.ManualTesting.Tests [CheckConnStrSetupFact] public void UpdateTest() { - try + using (SqlConnection conn = new SqlConnection(DataTestUtility.TcpConnStr)) + using (SqlCommand cmd = conn.CreateCommand()) + using (SqlDataAdapter adapter = new SqlDataAdapter()) + using (SqlDataAdapter adapterVerify = new SqlDataAdapter()) { - using (SqlConnection conn = new SqlConnection(DataTestUtility.TcpConnStr)) - using (SqlCommand cmd = conn.CreateCommand()) - using (SqlDataAdapter adapter = new SqlDataAdapter()) - using (SqlDataAdapter adapterVerify = new SqlDataAdapter()) + conn.Open(); + + cmd.CommandText = string.Format(_createTableQuery, _tempTable); + cmd.ExecuteNonQuery(); + cmd.CommandText = "alter table " + _tempTable + " add constraint " + _tempKey + " primary key (EmployeeID)"; + cmd.ExecuteNonQuery(); + + try { - conn.Open(); - - cmd.CommandText = string.Format("SELECT EmployeeID, LastName, FirstName, Title, Address, City, Region, PostalCode, Country into {0} from Employees where EmployeeID < 3", _tempTable); - cmd.ExecuteNonQuery(); - cmd.CommandText = "alter table " + _tempTable + " add constraint " + _tempKey + " primary key (EmployeeID)"; - cmd.ExecuteNonQuery(); - PrepareUpdateCommands(adapter, conn, _tempTable); adapter.SelectCommand = new SqlCommand(string.Format("SELECT EmployeeID, LastName, FirstName, Title, Address, City, Region, PostalCode, Country from {0} where EmployeeID < 3", _tempTable), conn); @@ -639,10 +641,10 @@ namespace System.Data.SqlClient.ManualTesting.Tests dataSet.AcceptChanges(); } - } - finally - { - ExecuteNonQueryCommand("DROP TABLE " + _tempTable); + finally + { + ExecuteNonQueryCommand("DROP TABLE " + _tempTable); + } } } @@ -656,15 +658,15 @@ namespace System.Data.SqlClient.ManualTesting.Tests using (SqlDataAdapter adapter = new SqlDataAdapter()) using (SqlDataAdapter adapterVerify = new SqlDataAdapter()) { + conn.Open(); + + cmd.CommandText = string.Format(_createTableQuery, _tempTable); + cmd.ExecuteNonQuery(); + cmd.CommandText = "alter table " + _tempTable + " add constraint " + _tempKey + " primary key (EmployeeID)"; + cmd.ExecuteNonQuery(); + try { - conn.Open(); - - cmd.CommandText = "SELECT EmployeeID, LastName, FirstName, Title, Address, City, Region, PostalCode, Country into " + _tempTable + " from Employees where EmployeeID < 3"; - cmd.ExecuteNonQuery(); - cmd.CommandText = "alter table " + _tempTable + " add constraint " + _tempKey + " primary key (EmployeeID)"; - cmd.ExecuteNonQuery(); - PrepareUpdateCommands(adapter, conn, _tempTable); adapter.SelectCommand = new SqlCommand("SELECT EmployeeID, LastName, FirstName, Title, Address, City, Region, PostalCode, Country FROM " + _tempTable + " WHERE EmployeeID < 3", conn); @@ -762,16 +764,16 @@ namespace System.Data.SqlClient.ManualTesting.Tests string spDropInsert = "DROP PROCEDURE sp_insert" + _tempTable; bool dropSP = false; - try - { - using (SqlDataAdapter adapter = new SqlDataAdapter()) - using (SqlConnection conn = new SqlConnection(DataTestUtility.TcpConnStr)) - using (SqlCommand cmd = new SqlCommand(null, conn)) - using (SqlCommand temp = new SqlCommand("SELECT id, LastName, FirstName into " + _tempTable + " from ident", conn)) - using (SqlCommand tableClean = new SqlCommand("", conn)) - { - ExecuteNonQueryCommand(createIdentTable); + using (SqlDataAdapter adapter = new SqlDataAdapter()) + using (SqlConnection conn = new SqlConnection(DataTestUtility.TcpConnStr)) + using (SqlCommand cmd = new SqlCommand(null, conn)) + using (SqlCommand temp = new SqlCommand("SELECT id, LastName, FirstName into " + _tempTable + " from ident", conn)) + using (SqlCommand tableClean = new SqlCommand("", conn)) + { + ExecuteNonQueryCommand(createIdentTable); + try + { adapter.InsertCommand = new SqlCommand() { CommandText = "sp_insert" + _tempTable, @@ -827,15 +829,15 @@ namespace System.Data.SqlClient.ManualTesting.Tests (i1 != 0) && (i2 != 0) && (i2 == (i1 + 1)), string.Format("FAILED: UpdateRefresh, i2 should equal (i1 + 1). i1: {0}. i2: {1}.", i1, i2)); } - } - finally - { - if (dropSP) + finally { - ExecuteNonQueryCommand(spDropInsert); - ExecuteNonQueryCommand("DROP TABLE " + _tempTable); + if (dropSP) + { + ExecuteNonQueryCommand(spDropInsert); + ExecuteNonQueryCommand("DROP TABLE " + _tempTable); + } + ExecuteNonQueryCommand("DROP TABLE ident"); } - ExecuteNonQueryCommand("DROP TABLE ident"); } } @@ -979,21 +981,20 @@ namespace System.Data.SqlClient.ManualTesting.Tests [CheckConnStrSetupFact] public void AutoGenUpdateTest() { - try + using (SqlConnection conn = new SqlConnection(DataTestUtility.TcpConnStr)) + using (SqlCommand cmd = conn.CreateCommand()) + using (SqlDataAdapter adapter = new SqlDataAdapter()) + using (SqlDataAdapter adapterVerify = new SqlDataAdapter()) { - using (SqlConnection conn = new SqlConnection(DataTestUtility.TcpConnStr)) - using (SqlCommand cmd = conn.CreateCommand()) - using (SqlDataAdapter adapter = new SqlDataAdapter()) - using (SqlDataAdapter adapterVerify = new SqlDataAdapter()) + conn.Open(); + + cmd.CommandText = string.Format(_createTableQuery, _tempTable); + cmd.ExecuteNonQuery(); + cmd.CommandText = "alter table " + _tempTable + " add constraint " + _tempKey + " primary key (EmployeeID)"; + cmd.ExecuteNonQuery(); + + try { - conn.Open(); - - cmd.CommandText = string.Format("SELECT EmployeeID, LastName, FirstName, Title, Address, City, Region, PostalCode, Country into {0} from Employees where EmployeeID < 3", _tempTable); - cmd.ExecuteNonQuery(); - - cmd.CommandText = "alter table " + _tempTable + " add constraint " + _tempKey + " primary key (EmployeeID)"; - cmd.ExecuteNonQuery(); - adapter.SelectCommand = new SqlCommand(string.Format("SELECT EmployeeID, LastName, FirstName, Title, Address, City, Region, PostalCode, Country from {0} where EmployeeID < 3", _tempTable), conn); adapterVerify.SelectCommand = new SqlCommand("SELECT LastName, FirstName FROM " + _tempTable + " where FirstName='" + MagicName + "'", conn); @@ -1041,10 +1042,10 @@ namespace System.Data.SqlClient.ManualTesting.Tests // Verify that set is empty VerifyUpdateRow(adapterVerify, dataSetVerify, 0, _tempTable); } - } - finally - { - ExecuteNonQueryCommand("DROP TABLE " + _tempTable); + finally + { + ExecuteNonQueryCommand("DROP TABLE " + _tempTable); + } } } @@ -1100,16 +1101,15 @@ namespace System.Data.SqlClient.ManualTesting.Tests using (SqlDataAdapter adapter = new SqlDataAdapter()) using (SqlDataAdapter adapterVerify = new SqlDataAdapter()) { + conn.Open(); + + cmd.CommandText = string.Format(_createTableQuery, _tempTable); + cmd.ExecuteNonQuery(); + cmd.CommandText = "alter table " + _tempTable + " add constraint " + _tempKey + " primary key (EmployeeID)"; + cmd.ExecuteNonQuery(); + try { - conn.Open(); - - cmd.CommandText = "SELECT EmployeeID, LastName, FirstName, Title, Address, City, Region, PostalCode, Country into " + _tempTable + " from Employees where EmployeeID < 3"; - cmd.ExecuteNonQuery(); - - cmd.CommandText = "alter table " + _tempTable + " add constraint " + _tempKey + " primary key (EmployeeID)"; - cmd.ExecuteNonQuery(); - adapter.SelectCommand = new SqlCommand("SELECT EmployeeID, LastName, FirstName, Title, Address, City, Region, PostalCode, Country FROM " + _tempTable + " WHERE EmployeeID < 3", conn); adapterVerify.SelectCommand = new SqlCommand("SELECT LastName, FirstName FROM " + _tempTable + " where FirstName='" + MagicName + "'", conn); diff --git a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncTest.cs b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncTest.cs index d96fcf493a..1c47a5cd32 100644 --- a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncTest.cs +++ b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncTest.cs @@ -2,6 +2,7 @@ // 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.Threading.Tasks; using Xunit; @@ -9,87 +10,96 @@ namespace System.Data.SqlClient.ManualTesting.Tests { public static class AsyncTest { - private const int TaskTimeout = 5000; - [CheckConnStrSetupFact] - public static void ExecuteTest() + public static void TestReadAsyncTimeConsumed() { - SqlCommand com = new SqlCommand("select * from Orders"); - SqlConnection con = new SqlConnection(DataTestUtility.TcpConnStr); - - com.Connection = con; - - con.Open(); - - Task readerTask = com.ExecuteReaderAsync(); - bool taskCompleted = readerTask.Wait(TaskTimeout); - Assert.True(taskCompleted, "FAILED: ExecuteReaderAsync Task did not complete successfully."); - - SqlDataReader reader = readerTask.Result; - - int rows; - for (rows = 0; reader.Read(); rows++) ; - - Assert.True(rows == 830, string.Format("FAILED: ExecuteTest reader had wrong number of rows. Expected: {0}. Actual: {1}", 830, rows)); - - reader.Dispose(); - con.Close(); + const string sql = "SET NOCOUNT ON" + + " SELECT 'a'" + + " DECLARE @t DATETIME = SYSDATETIME()" + + " WHILE DATEDIFF(s, @t, SYSDATETIME()) < 20 BEGIN" + + " SELECT 2 x INTO #y" + + " DROP TABLE #y" + + " END" + + " SELECT 'b'"; + Task t = RunReadAsync(sql); + double elapsedSync = RunReadSync(sql); + t.Wait(); + double elapsedAsync = t.Result; + Assert.True(elapsedAsync < elapsedSync, "Asynchronous operation should be finished quicker than synchronous one"); + int limit = 100; + Assert.True(elapsedAsync < limit, $"Asynchronous operation should be finished within {limit}ms"); } - [CheckConnStrSetupFact] - public static void FailureTest() + private static async Task RunReadAsync(string sql) { - bool failure = false; - bool taskCompleted = false; - - SqlCommand com = new SqlCommand("select * from Orders"); - SqlConnection con = new SqlConnection((new SqlConnectionStringBuilder(DataTestUtility.TcpConnStr) { Pooling = false }).ConnectionString); - com.Connection = con; - con.Open(); - - Task nonQueryTask = com.ExecuteNonQueryAsync(); - try + double maxElapsedTimeMillisecond = 0; + using (SqlConnection connection = new SqlConnection(DataTestUtility.TcpConnStr)) { - com.ExecuteNonQueryAsync().Wait(TaskTimeout); - } - catch (AggregateException agrEx) - { - agrEx.Handle( - (ex) => + await connection.OpenAsync(); + using (SqlCommand command = connection.CreateCommand()) + { + command.CommandText = sql; + using (SqlDataReader reader = await command.ExecuteReaderAsync()) { - Assert.True(ex is InvalidOperationException, "FAILED: Thrown exception for ExecuteNonQueryAsync was not an InvalidOperationException"); - failure = true; - return true; - }); + Task t; + Stopwatch stopwatch = new Stopwatch(); + do + { + do + { + stopwatch.Start(); + t = reader.ReadAsync(); + stopwatch.Stop(); + double elased = stopwatch.Elapsed.TotalMilliseconds; + if (maxElapsedTimeMillisecond < elased) + { + maxElapsedTimeMillisecond = elased; + } + } + while (await t); + } + while (reader.NextResult()); + } + } } - Assert.True(failure, "FAILED: No exception thrown after trying second ExecuteNonQueryAsync."); - failure = false; - taskCompleted = nonQueryTask.Wait(TaskTimeout); - Assert.True(taskCompleted, "FAILED: ExecuteNonQueryAsync Task did not complete successfully."); + return maxElapsedTimeMillisecond; + } - Task readerTask = com.ExecuteReaderAsync(); - try + private static double RunReadSync(string sql) + { + double maxElapsedTimeMillisecond = 0; + using (SqlConnection connection = new SqlConnection(DataTestUtility.TcpConnStr)) { - com.ExecuteReaderAsync().Wait(TaskTimeout); - } - catch (AggregateException agrEx) - { - agrEx.Handle( - (ex) => + connection.Open(); + using (SqlCommand command = connection.CreateCommand()) + { + command.CommandText = sql; + using (SqlDataReader reader = command.ExecuteReader()) { - Assert.True(ex is InvalidOperationException, "FAILED: Thrown exception for ExecuteReaderAsync was not an InvalidOperationException: " + ex); - failure = true; - return true; - }); + bool result; + Stopwatch stopwatch = new Stopwatch(); + do + { + do + { + stopwatch.Start(); + result = reader.Read(); + stopwatch.Stop(); + double elased = stopwatch.Elapsed.TotalMilliseconds; + if (maxElapsedTimeMillisecond < elased) + { + maxElapsedTimeMillisecond = elased; + } + } + while (result); + } + while (reader.NextResult()); + } + } } - Assert.True(failure, "FAILED: No exception thrown after trying second ExecuteReaderAsync."); - taskCompleted = readerTask.Wait(TaskTimeout); - Assert.True(taskCompleted, "FAILED: ExecuteReaderAsync Task did not complete successfully."); - - readerTask.Result.Dispose(); - con.Close(); + return maxElapsedTimeMillisecond; } } } \ No newline at end of file diff --git a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/BeginExecAsyncTest.cs b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/BeginExecAsyncTest.cs index a73ccfaacc..79863b5719 100644 --- a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/BeginExecAsyncTest.cs +++ b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/BeginExecAsyncTest.cs @@ -2,31 +2,41 @@ // 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.Threading.Tasks; using Xunit; namespace System.Data.SqlClient.ManualTesting.Tests { public static class BeginExecAsyncTest { - private static string commandText = - "INSERT INTO[dbo].[Shippers] " + - "([CompanyName] " + - ",[Phone]) " + - "VALUES " + - "('Acme Inc.' " + - ",'555-1212'); " + - "WAITFOR DELAY '0:0:3';" + - "DELETE FROM dbo.Shippers WHERE ShipperID > 3;"; - + private static string GenerateCommandText() + { + int suffix = (new Random()).Next(5000); + + string commandText = + $"CREATE TABLE #Shippers{suffix}(" + + $"[ShipperID][int] NULL," + + $"[CompanyName] [nvarchar] (40) NOT NULL," + + $"[Phone] [nvarchar] (24) NULL )" + + $"INSERT INTO #Shippers{suffix}" + + $"([CompanyName] " + + $",[Phone])" + + $"VALUES " + + $"('Acme Inc.' " + + $",'555-1212'); " + + $"WAITFOR DELAY '0:0:3'; " + + $"DELETE FROM #Shippers{suffix} WHERE ShipperID > 3;"; + + return commandText; + } + [CheckConnStrSetupFact] public static void ExecuteTest() { using (SqlConnection connection = new SqlConnection(DataTestUtility.TcpConnStr)) { try - { - SqlCommand command = new SqlCommand(commandText, connection); + { + SqlCommand command = new SqlCommand(GenerateCommandText(), connection); connection.Open(); IAsyncResult result = command.BeginExecuteNonQuery(); @@ -63,7 +73,7 @@ namespace System.Data.SqlClient.ManualTesting.Tests using (SqlConnection connection = new SqlConnection(DataTestUtility.TcpConnStr)) { bool caughtException = false; - SqlCommand command = new SqlCommand(commandText, connection); + SqlCommand command = new SqlCommand(GenerateCommandText(), connection); connection.Open(); //Try to execute a synchronous query on same command diff --git a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/XmlReaderAsyncTest.cs b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/XmlReaderAsyncTest.cs new file mode 100644 index 0000000000..0c6c723cd5 --- /dev/null +++ b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/XmlReaderAsyncTest.cs @@ -0,0 +1,66 @@ +// 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; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml; +using Xunit; + +namespace System.Data.SqlClient.ManualTesting.Tests +{ + public static class XmlReaderAsyncTest + { + private static string commandText = + "SELECT * from dbo.Customers FOR XML AUTO, XMLDATA;"; + + [CheckConnStrSetupFact] + public static void ExecuteTest() + { + using (SqlConnection connection = new SqlConnection(DataTestUtility.TcpConnStr)) + { + SqlCommand command = new SqlCommand(commandText, connection); + connection.Open(); + + IAsyncResult result = command.BeginExecuteXmlReader(); + while (!result.IsCompleted) + { + System.Threading.Thread.Sleep(100); + } + + XmlReader reader = command.EndExecuteXmlReader(result); + + reader.ReadToDescendant("dbo.Customers"); + Assert.Equal("ALFKI", reader["CustomerID"]); + } + } + + [CheckConnStrSetupFact] + public static void ExceptionTest() + { + using (SqlConnection connection = new SqlConnection(DataTestUtility.TcpConnStr)) + { + SqlCommand command = new SqlCommand(commandText, connection); + connection.Open(); + + //Try to execute a synchronous query on same command + IAsyncResult result = command.BeginExecuteXmlReader(); + + Assert.Throws( delegate { command.ExecuteXmlReader(); }); + + while (!result.IsCompleted) + { + System.Threading.Thread.Sleep(100); + } + + XmlReader reader = command.EndExecuteXmlReader(result); + + reader.ReadToDescendant("dbo.Customers"); + Assert.Equal("ALFKI", reader["CustomerID"]); + } + } + } +} diff --git a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/CommandCancelTest/CommandCancelTest.cs b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/CommandCancelTest/CommandCancelTest.cs index 17a28e53ee..1fb522e991 100644 --- a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/CommandCancelTest/CommandCancelTest.cs +++ b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/CommandCancelTest/CommandCancelTest.cs @@ -125,16 +125,17 @@ namespace System.Data.SqlClient.ManualTesting.Tests var command = con.CreateCommand(); command.CommandText = "select * from orders; waitfor delay '00:00:08'; select * from customers"; - Thread rThread1 = new Thread(ExecuteCommandCancelExpected); - Thread rThread2 = new Thread(CancelSharedCommand); Barrier threadsReady = new Barrier(2); object state = new Tuple(async, command, threadsReady); - rThread1.Start(state); - rThread2.Start(state); - rThread1.Join(); - rThread2.Join(); + Task[] tasks = new Task[2]; + tasks[0] = new Task(ExecuteCommandCancelExpected, state); + tasks[1] = new Task(CancelSharedCommand, state); + tasks[0].Start(); + tasks[1].Start(); + Task.WaitAll(tasks, 15 * 1000); + CommandCancelTest.VerifyConnection(command); } } @@ -149,7 +150,7 @@ namespace System.Data.SqlClient.ManualTesting.Tests cmd.CommandText = "WAITFOR DELAY '00:00:30';select * from Customers"; string errorMessage = SystemDataResourceManager.Instance.SQL_Timeout; - DataTestUtility.ExpectFailure(() => cmd.ExecuteReader(), errorMessage); + DataTestUtility.ExpectFailure(() => cmd.ExecuteReader(), new string[] { errorMessage }); VerifyConnection(cmd); } @@ -208,6 +209,8 @@ namespace System.Data.SqlClient.ManualTesting.Tests Barrier threadsReady = stateTuple.Item3; string errorMessage = SystemDataResourceManager.Instance.SQL_OperationCancelled; + string errorMessageSevereFailure = SystemDataResourceManager.Instance.SQL_SevereError; + DataTestUtility.ExpectFailure(() => { threadsReady.SignalAndWait(); @@ -220,7 +223,8 @@ namespace System.Data.SqlClient.ManualTesting.Tests } } while (r.NextResult()); } - }, errorMessage); + }, new string[] { errorMessage, errorMessageSevereFailure }); + } private static void CancelSharedCommand(object state) diff --git a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs index 94569a4800..7d2a176f3c 100644 --- a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs +++ b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs @@ -2,6 +2,9 @@ // 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.Collections.Generic; +using System.Diagnostics; +using System.Threading; using Xunit; namespace System.Data.SqlClient.ManualTesting.Tests @@ -45,5 +48,102 @@ namespace System.Data.SqlClient.ManualTesting.Tests } Assert.True(false, "No non-empty hostname found for the application"); } + + [CheckConnStrSetupFact] + public static void ConnectionTimeoutTestWithThread() + { + const int timeoutSec = 5; + const int numOfTry = 2; + const int numOfThreads = 5; + + SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(DataTestUtility.TcpConnStr); + builder.DataSource = "invalidhost"; + builder.ConnectTimeout = timeoutSec; + string connStrNotAvailable = builder.ConnectionString; + + for (int i = 0; i < numOfThreads; ++i) + { + new ConnectionWorker(connStrNotAvailable, numOfTry); + } + + ConnectionWorker.Start(); + ConnectionWorker.Stop(); + + double timeTotal = 0; + double timeElapsed = 0; + + foreach (ConnectionWorker w in ConnectionWorker.WorkerList) + { + timeTotal += w.TimeElapsed; + } + timeElapsed = timeTotal / Convert.ToDouble(ConnectionWorker.WorkerList.Count); + + int threshold = timeoutSec * numOfTry * 2 * 1000; + + Assert.True(timeElapsed < threshold); + } + + public class ConnectionWorker + { + private static List workerList = new List(); + private ManualResetEventSlim _doneEvent = new ManualResetEventSlim(false); + private double _timeElapsed; + private Thread _thread; + private string _connectionString; + private int _numOfTry; + + public ConnectionWorker(string connectionString, int numOfTry) + { + workerList.Add(this); + _connectionString = connectionString; + _numOfTry = numOfTry; + _thread = new Thread(new ThreadStart(SqlConnectionOpen)); + } + + public static List WorkerList => workerList; + + public double TimeElapsed => _timeElapsed; + + public static void Start() + { + foreach (ConnectionWorker w in workerList) + { + w._thread.Start(); + } + } + + public static void Stop() + { + foreach (ConnectionWorker w in workerList) + { + w._doneEvent.Wait(); + } + } + + public void SqlConnectionOpen() + { + Stopwatch sw = new Stopwatch(); + double totalTime = 0; + for (int i = 0; i < _numOfTry; ++i) + { + using (SqlConnection con = new SqlConnection(_connectionString)) + { + sw.Start(); + try + { + con.Open(); + } + catch { } + sw.Stop(); + } + totalTime += sw.Elapsed.TotalMilliseconds; + sw.Reset(); + } + + _timeElapsed = totalTime / Convert.ToDouble(_numOfTry); + + _doneEvent.Set(); + } + } } } diff --git a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ExceptionTest.cs b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ExceptionTest.cs index fedaf7b403..01388e1051 100644 --- a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ExceptionTest.cs +++ b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ExceptionTest.cs @@ -47,7 +47,22 @@ namespace System.Data.SqlClient.ManualTesting.Tests } } - [CheckConnStrSetupFact] + private static bool EmployeesTableHasFullTextIndex() + { + if (DataTestUtility.TcpConnStr == null) + return false; + + using (SqlConnection conn = new SqlConnection(DataTestUtility.TcpConnStr)) + using (SqlCommand cmd = conn.CreateCommand()) + { + conn.Open(); + cmd.CommandText = "SELECT object_id FROM sys.fulltext_indexes WHERE object_id = object_id('Northwind.dbo.Employees')"; + + return (cmd.ExecuteScalar() != null); + } + } + + [ConditionalFact(nameof(EmployeesTableHasFullTextIndex))] public static void WarningsBeforeRowsTest() { bool hitWarnings = false; diff --git a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/IntegratedAuthenticationTest/IntegratedAuthenticationTest.cs b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/IntegratedAuthenticationTest/IntegratedAuthenticationTest.cs index 7c72323407..ad5919b696 100644 --- a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/IntegratedAuthenticationTest/IntegratedAuthenticationTest.cs +++ b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/IntegratedAuthenticationTest/IntegratedAuthenticationTest.cs @@ -15,7 +15,11 @@ namespace System.Data.SqlClient.ManualTesting.Tests { public static class IntegratedAuthenticationTest { - [CheckConnStrSetupFact] + private static bool IsIntegratedSecurityEnvironmentSet() => DataTestUtility.IsIntegratedSecuritySetup(); + private static bool AreConnectionStringsSetup() => DataTestUtility.AreConnStringsSetup(); + + + [ConditionalFact(nameof(IsIntegratedSecurityEnvironmentSet),nameof(AreConnectionStringsSetup))] public static void IntegratedAuthenticationTestWithConnectionPooling() { SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(DataTestUtility.TcpConnStr); @@ -24,7 +28,7 @@ namespace System.Data.SqlClient.ManualTesting.Tests TryOpenConnectionWithIntegratedAuthentication(builder.ConnectionString); } - [CheckConnStrSetupFact] + [ConditionalFact(nameof(IsIntegratedSecurityEnvironmentSet), nameof(AreConnectionStringsSetup))] public static void IntegratedAuthenticationTestWithOutConnectionPooling() { SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(DataTestUtility.TcpConnStr); diff --git a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlParameterTest_DebugMode.bsl.REMOVED.git-id b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlParameterTest_DebugMode.bsl.REMOVED.git-id index d5ef5c1f71..c54434f5b4 100644 --- a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlParameterTest_DebugMode.bsl.REMOVED.git-id +++ b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlParameterTest_DebugMode.bsl.REMOVED.git-id @@ -1 +1 @@ -92456fd6a2c45777359bbd40c75a47437366ff7f \ No newline at end of file +44ce911eca8f1005f0c5bc051c90849dc607035c \ No newline at end of file diff --git a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlParameterTest_ReleaseMode.bsl.REMOVED.git-id b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlParameterTest_ReleaseMode.bsl.REMOVED.git-id index 7ed5194844..f9636a44c7 100644 --- a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlParameterTest_ReleaseMode.bsl.REMOVED.git-id +++ b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlParameterTest_ReleaseMode.bsl.REMOVED.git-id @@ -1 +1 @@ -9ab83a0dfc4e449417a5d2587d7ea6040d48e1f1 \ No newline at end of file +c28acb4270bc450f8316279c654ef88f53f1060e \ No newline at end of file diff --git a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpTest.cs b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpTest.cs index ec33af81f7..d8bf2d542a 100644 --- a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpTest.cs +++ b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpTest.cs @@ -41,6 +41,7 @@ namespace System.Data.SqlClient.ManualTesting.Tests // data value and server consts private string _connStr; + [ActiveIssue(27858, TestPlatforms.AnyUnix)] [CheckConnStrSetupFact] public void TestMain() { @@ -1115,7 +1116,7 @@ namespace System.Data.SqlClient.ManualTesting.Tests } catch (SqlException se) { - Console.WriteLine("SqlException: {0}", se.Message); + Console.WriteLine("SqlException. Error Code: {0}", se.Number); } catch (InvalidOperationException ioe) { @@ -1625,4 +1626,4 @@ namespace System.Data.SqlClient.ManualTesting.Tests } } -} \ No newline at end of file +} diff --git a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/SqlCredentialTest/SqlCredentialTest.cs b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/SqlCredentialTest/SqlCredentialTest.cs new file mode 100644 index 0000000000..4856ae5552 --- /dev/null +++ b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/SqlCredentialTest/SqlCredentialTest.cs @@ -0,0 +1,157 @@ +// 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; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Data.SqlClient.ManualTesting.Tests; +using System.Linq; +using System.Security; +using System.Text; +using System.Threading.Tasks; +using Xunit; + +namespace System.Data.SqlClient.ManualTesting.Tests +{ + public static class SqlCredentialTest + { + + [CheckConnStrSetupFact] + public static void CreateSqlConnectionWithCredential() + { + var user = "u" + Guid.NewGuid().ToString().Replace("-", ""); + var passStr = "Pax561O$T5K#jD"; + + try + { + createTestUser(user, passStr); + + var csb = new SqlConnectionStringBuilder(DataTestUtility.TcpConnStr); + csb.Remove("User ID"); + csb.Remove("Password"); + csb.IntegratedSecurity = false; + + var password = new SecureString(); + passStr.ToCharArray().ToList().ForEach(x => password.AppendChar(x)); + password.MakeReadOnly(); + + using (var conn = new SqlConnection(csb.ConnectionString, new SqlCredential(user, password))) + using (var cmd = new SqlCommand("SELECT 1;", conn)) + { + conn.Open(); + Assert.Equal(1, cmd.ExecuteScalar()); + } + } + finally + { + dropTestUser(user); + } + } + + [CheckConnStrSetupFact] + public static void SqlConnectionChangePasswordPlaintext() + { + var user = "u" + Guid.NewGuid().ToString().Replace("-", ""); + var pass = "!21Ja3Ims7LI&n"; + var newPass = "fmVCNf@24Dg*8j"; + + try + { + createTestUser(user, pass); + + var csb = new SqlConnectionStringBuilder(DataTestUtility.TcpConnStr); + csb.UserID = user; + csb.Password = pass; + csb.IntegratedSecurity = false; + + // Change password and try opening connection. + SqlConnection.ChangePassword(csb.ConnectionString, newPass); + csb.Password = newPass; + + using (var conn = new SqlConnection(csb.ConnectionString)) + using (var cmd = new SqlCommand("SELECT 1;", conn)) + { + conn.Open(); + Assert.Equal(1, cmd.ExecuteScalar()); + } + } + finally + { + dropTestUser(user); + } + } + + [CheckConnStrSetupFact] + public static void SqlConnectionChangePasswordSecureString() + { + var user = "u" + Guid.NewGuid().ToString().Replace("-", ""); + var passStr = "tcM0qB^izt%3u7"; + var newPassStr = "JSG2e(Vp0WCXE&"; + + try + { + createTestUser(user, passStr); + + var csb = new SqlConnectionStringBuilder(DataTestUtility.TcpConnStr); + csb.Remove("User ID"); + csb.Remove("Password"); + csb.IntegratedSecurity = false; + + var password = new SecureString(); + passStr.ToCharArray().ToList().ForEach(x => password.AppendChar(x)); + password.MakeReadOnly(); + + var newPassword = new SecureString(); + newPassStr.ToCharArray().ToList().ForEach(x => newPassword.AppendChar(x)); + newPassword.MakeReadOnly(); + + // Change password and try opening connection. + SqlConnection.ChangePassword(csb.ConnectionString, new SqlCredential(user, password), newPassword); + + using (var conn = new SqlConnection(csb.ConnectionString, new SqlCredential(user, newPassword))) + using (var cmd = new SqlCommand("SELECT 1;", conn)) + { + conn.Open(); + Assert.Equal(1, cmd.ExecuteScalar()); + } + } + finally + { + dropTestUser(user); + } + } + + private static void createTestUser(string username, string password) + { + // Creates a test user with read permissions. + string createUserCmd = $"CREATE LOGIN {username} WITH PASSWORD = '{password}', CHECK_POLICY=OFF;" + + $"EXEC sp_adduser '{username}', '{username}', 'db_datareader';"; + + using (var conn = new SqlConnection(DataTestUtility.TcpConnStr)) + using (var cmd = new SqlCommand(createUserCmd, conn)) + { + conn.Open(); + cmd.ExecuteNonQuery(); + } + } + + private static void dropTestUser(string username) + { + // Removes a created test user. + string dropUserCmd = $"IF EXISTS (SELECT * FROM sys.schemas WHERE name = '{username}') BEGIN DROP SCHEMA {username} END;" + + $"IF EXISTS (SELECT * FROM sys.database_principals WHERE type = 'S' AND name = '{username}') BEGIN DROP USER {username} END;" + + $"DROP LOGIN {username}"; + + // Pool must be cleared to prevent DROP LOGIN failure. + SqlConnection.ClearAllPools(); + + using (var conn = new SqlConnection(DataTestUtility.TcpConnStr)) + using (var cmd = new SqlCommand(dropUserCmd, conn)) + { + conn.Open(); + cmd.ExecuteNonQuery(); + } + } + } +} diff --git a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs index 44625e1f56..1c8a3d2783 100644 --- a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs +++ b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs @@ -13,9 +13,9 @@ namespace System.Data.SqlClient.ManualTesting.Tests private const int CALLBACK_TIMEOUT = 5000; // milliseconds // Database schema - private readonly string _tableName = "dbo.[SQLDEP_" + Guid.NewGuid().ToString() + "]"; - private readonly string _queueName = "SQLDEP_" + Guid.NewGuid().ToString(); - private readonly string _serviceName = "SQLDEP_" + Guid.NewGuid().ToString(); + private readonly string _tableName = $"dbo.[SQLDEP_{Guid.NewGuid().ToString()}]"; + private readonly string _queueName = $"SQLDEP_{Guid.NewGuid().ToString()}"; + private readonly string _serviceName = $"SQLDEP_{Guid.NewGuid().ToString()}"; private readonly string _schemaQueue; // Connection information used by all tests @@ -27,15 +27,7 @@ namespace System.Data.SqlClient.ManualTesting.Tests _startConnectionString = DataTestUtility.TcpConnStr; _execConnectionString = DataTestUtility.TcpConnStr; - var startBuilder = new SqlConnectionStringBuilder(_startConnectionString); - if (startBuilder.IntegratedSecurity) - { - _schemaQueue = string.Format("[{0}]", _queueName); - } - else - { - _schemaQueue = string.Format("[{0}].[{1}]", startBuilder.UserID, _queueName); - } + _schemaQueue = $"[{_queueName}]"; Setup(); } diff --git a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/System.Data.SqlClient.ManualTesting.Tests.csproj b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/System.Data.SqlClient.ManualTesting.Tests.csproj index 7daecb14b6..cdf01ffc9f 100644 --- a/external/corefx/src/System.Data.SqlClient/tests/ManualTests/System.Data.SqlClient.ManualTesting.Tests.csproj +++ b/external/corefx/src/System.Data.SqlClient/tests/ManualTests/System.Data.SqlClient.ManualTesting.Tests.csproj @@ -13,6 +13,7 @@ + @@ -59,6 +60,7 @@ + diff --git a/external/corefx/src/System.Diagnostics.Debug/tests/DebugTests.cs b/external/corefx/src/System.Diagnostics.Debug/tests/DebugTests.cs index 9af77fd658..192891d2b8 100644 --- a/external/corefx/src/System.Diagnostics.Debug/tests/DebugTests.cs +++ b/external/corefx/src/System.Diagnostics.Debug/tests/DebugTests.cs @@ -201,13 +201,13 @@ namespace System.Diagnostics.Tests } FieldInfo writeCoreHook = typeof(Debug).GetField("s_WriteCore", BindingFlags.Static | BindingFlags.NonPublic); - FieldInfo showAssertDialogHook = typeof(Debug).GetField("s_ShowAssertDialog", BindingFlags.Static | BindingFlags.NonPublic); + FieldInfo showDialogHook = typeof(Debug).GetField("s_ShowDialog", BindingFlags.Static | BindingFlags.NonPublic); var originalWriteCoreHook = writeCoreHook.GetValue(null); writeCoreHook.SetValue(null, new Action(WriteLogger.s_instance.WriteCore)); - var originalShowAssertDialogHook = showAssertDialogHook.GetValue(null); - showAssertDialogHook.SetValue(null, new Action(WriteLogger.s_instance.ShowAssertDialog)); + var originalShowDialogHook = showDialogHook.GetValue(null); + showDialogHook.SetValue(null, new Action(WriteLogger.s_instance.ShowDialog)); try { @@ -228,7 +228,7 @@ namespace System.Diagnostics.Tests finally { writeCoreHook.SetValue(null, originalWriteCoreHook); - showAssertDialogHook.SetValue(null, originalShowAssertDialogHook); + showDialogHook.SetValue(null, originalShowDialogHook); } } @@ -248,9 +248,9 @@ namespace System.Diagnostics.Tests AssertUIOutput = string.Empty; } - public void ShowAssertDialog(string stackTrace, string message, string detailMessage) + public void ShowDialog(string stackTrace, string message, string detailMessage, string errorSource) { - AssertUIOutput += stackTrace + message + detailMessage; + AssertUIOutput += stackTrace + message + detailMessage + errorSource; } public void WriteCore(string message) diff --git a/external/corefx/src/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj b/external/corefx/src/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj index 9217e74da3..93ce39ab4a 100644 --- a/external/corefx/src/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj +++ b/external/corefx/src/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj @@ -1,10 +1,6 @@  - - - 2.8.6 - net46;net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks) diff --git a/external/corefx/src/System.Diagnostics.DiagnosticSource/ref/Configurations.props b/external/corefx/src/System.Diagnostics.DiagnosticSource/ref/Configurations.props index a036c05185..7b5f53ade5 100644 --- a/external/corefx/src/System.Diagnostics.DiagnosticSource/ref/Configurations.props +++ b/external/corefx/src/System.Diagnostics.DiagnosticSource/ref/Configurations.props @@ -2,7 +2,8 @@ - netstandard1.0; + netstandard1.1; + netstandard1.3; net45; diff --git a/external/corefx/src/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj b/external/corefx/src/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj index 130bbaa2b8..ccd74d8b13 100644 --- a/external/corefx/src/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj +++ b/external/corefx/src/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj @@ -13,18 +13,20 @@ - - + + + + - + - + diff --git a/external/corefx/src/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.DateTime.netfx.cs b/external/corefx/src/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.DateTime.netfx.cs index 7093027a7a..f9ecdc0065 100644 --- a/external/corefx/src/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.DateTime.netfx.cs +++ b/external/corefx/src/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.DateTime.netfx.cs @@ -42,6 +42,32 @@ namespace System.Diagnostics private static TimeSync timeSync = new TimeSync(); // sync DateTime and Stopwatch ticks every 2 hours - private static Timer syncTimeUpdater = new Timer(s => { Sync(); }, null, 0, 7200000); + private static Timer syncTimeUpdater = InitalizeSyncTimer(); + + [System.Security.SecuritySafeCritical] + private static Timer InitalizeSyncTimer() + { + Timer timer; + // Don't capture the current ExecutionContext and its AsyncLocals onto the timer causing them to live forever + bool restoreFlow = false; + try + { + if (!ExecutionContext.IsFlowSuppressed()) + { + ExecutionContext.SuppressFlow(); + restoreFlow = true; + } + + timer = new Timer(s => { Sync(); }, null, 0, 7200000); + } + finally + { + // Restore the current ExecutionContext + if (restoreFlow) + ExecutionContext.RestoreFlow(); + } + + return timer; + } } -} \ No newline at end of file +} diff --git a/external/corefx/src/System.Diagnostics.DiagnosticSource/tests/ActivityTests.cs b/external/corefx/src/System.Diagnostics.DiagnosticSource/tests/ActivityTests.cs index acf3ba61ae..7f7744376e 100644 --- a/external/corefx/src/System.Diagnostics.DiagnosticSource/tests/ActivityTests.cs +++ b/external/corefx/src/System.Diagnostics.DiagnosticSource/tests/ActivityTests.cs @@ -431,6 +431,7 @@ namespace System.Diagnostics.Tests } [Fact] + [OuterLoop] // Slighly flaky - https://github.com/dotnet/corefx/issues/23072 public void DiagnosticSourceStartStop() { using (DiagnosticListener listener = new DiagnosticListener("Testing")) diff --git a/external/corefx/src/System.Diagnostics.EventLog/pkg/System.Diagnostics.EventLog.pkgproj b/external/corefx/src/System.Diagnostics.EventLog/pkg/System.Diagnostics.EventLog.pkgproj index b744ffe9d8..f5c4342a14 100644 --- a/external/corefx/src/System.Diagnostics.EventLog/pkg/System.Diagnostics.EventLog.pkgproj +++ b/external/corefx/src/System.Diagnostics.EventLog/pkg/System.Diagnostics.EventLog.pkgproj @@ -3,7 +3,7 @@ - net461;netcoreapp2.0;$(AllXamarinFrameworks) + uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks) diff --git a/external/corefx/src/System.Diagnostics.EventLog/src/System/Diagnostics/EventLog.cs b/external/corefx/src/System.Diagnostics.EventLog/src/System/Diagnostics/EventLog.cs index b8eb8292c4..6a7ab185d8 100644 --- a/external/corefx/src/System.Diagnostics.EventLog/src/System/Diagnostics/EventLog.cs +++ b/external/corefx/src/System.Diagnostics.EventLog/src/System/Diagnostics/EventLog.cs @@ -374,7 +374,7 @@ namespace System.Diagnostics public static void Delete(string logName, string machineName) { if (!SyntaxCheck.CheckMachineName(machineName)) - throw new ArgumentException(SR.InvalidParameterFormat, nameof(machineName)); + throw new ArgumentException(SR.Format(SR.InvalidParameterFormat, nameof(machineName)), nameof(machineName)); if (logName == null || logName.Length == 0) throw new ArgumentException(SR.NoLogName); if (!ValidLogName(logName, false)) @@ -656,7 +656,7 @@ namespace System.Diagnostics throw new ArgumentException(SR.Format(SR.InvalidParameter, nameof(machineName), machineName)); } - string[] logNames = new string[0]; + string[] logNames = null; RegistryKey eventkey = null; try @@ -814,7 +814,7 @@ namespace System.Diagnostics } // If you pass in an empty array UnsafeTryFormatMessage will just pull out the message. - string formatString = UnsafeTryFormatMessage(hModule, messageNum, new string[0]); + string formatString = UnsafeTryFormatMessage(hModule, messageNum, Array.Empty()); if (formatString == null) { diff --git a/external/corefx/src/System.Diagnostics.EventLog/src/System/Diagnostics/EventLogInternal.cs b/external/corefx/src/System.Diagnostics.EventLog/src/System/Diagnostics/EventLogInternal.cs index 0e466d2fea..f7f8501219 100644 --- a/external/corefx/src/System.Diagnostics.EventLog/src/System/Diagnostics/EventLogInternal.cs +++ b/external/corefx/src/System.Diagnostics.EventLog/src/System/Diagnostics/EventLogInternal.cs @@ -677,7 +677,7 @@ namespace System.Diagnostics return null; if (insertionStrings == null) - insertionStrings = new string[0]; + insertionStrings = Array.Empty(); string[] listDll = dllNameList.Split(';'); @@ -1398,7 +1398,7 @@ namespace System.Diagnostics { // check arguments if (strings == null) - strings = new string[0]; + strings = Array.Empty(); if (strings.Length >= 256) throw new ArgumentException(SR.TooManyReplacementStrings); @@ -1413,7 +1413,7 @@ namespace System.Diagnostics throw new ArgumentException(SR.LogEntryTooLong); } if (rawData == null) - rawData = new byte[0]; + rawData = Array.Empty(); if (Source.Length == 0) throw new ArgumentException(SR.NeedSourceToWrite); diff --git a/external/corefx/src/System.Diagnostics.EventLog/tests/EventLogTests/EventLogTests.cs b/external/corefx/src/System.Diagnostics.EventLog/tests/EventLogTests/EventLogTests.cs index 6bf0ff5293..37af67cdcd 100644 --- a/external/corefx/src/System.Diagnostics.EventLog/tests/EventLogTests/EventLogTests.cs +++ b/external/corefx/src/System.Diagnostics.EventLog/tests/EventLogTests/EventLogTests.cs @@ -80,7 +80,9 @@ namespace System.Diagnostics.Tests { using (EventLog eventLog = new EventLog("Application")) { - Assert.Equal("Application", eventLog.LogDisplayName); + Assert.False(string.IsNullOrEmpty(eventLog.LogDisplayName)); + if (CultureInfo.CurrentCulture.Name.Split('-')[0] == "en" ) + Assert.Equal("Application", eventLog.LogDisplayName); } } @@ -109,7 +111,10 @@ namespace System.Diagnostics.Tests using (EventLog eventLog = new EventLog()) { eventLog.Log = "Application"; - Assert.Equal("Application", eventLog.LogDisplayName); + + Assert.False(string.IsNullOrEmpty(eventLog.LogDisplayName)); + if (CultureInfo.CurrentCulture.Name.Split('-')[0] == "en" ) + Assert.Equal("Application", eventLog.LogDisplayName); } } diff --git a/external/corefx/src/System.Diagnostics.PerformanceCounter/pkg/System.Diagnostics.PerformanceCounter.pkgproj b/external/corefx/src/System.Diagnostics.PerformanceCounter/pkg/System.Diagnostics.PerformanceCounter.pkgproj index ba710f6838..fad9022c63 100644 --- a/external/corefx/src/System.Diagnostics.PerformanceCounter/pkg/System.Diagnostics.PerformanceCounter.pkgproj +++ b/external/corefx/src/System.Diagnostics.PerformanceCounter/pkg/System.Diagnostics.PerformanceCounter.pkgproj @@ -3,7 +3,7 @@ - net461;netcoreapp2.0;$(AllXamarinFrameworks) + uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks) diff --git a/external/corefx/src/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/external/corefx/src/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj index 02ec8e70a2..138d77ac21 100644 --- a/external/corefx/src/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj +++ b/external/corefx/src/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj @@ -165,6 +165,7 @@ + diff --git a/external/corefx/src/System.Diagnostics.PerformanceCounter/src/System/Diagnostics/PerformanceCounterLib.cs b/external/corefx/src/System.Diagnostics.PerformanceCounter/src/System/Diagnostics/PerformanceCounterLib.cs index f9c6c51e6b..7c52419dc5 100644 --- a/external/corefx/src/System.Diagnostics.PerformanceCounter/src/System/Diagnostics/PerformanceCounterLib.cs +++ b/external/corefx/src/System.Diagnostics.PerformanceCounter/src/System/Diagnostics/PerformanceCounterLib.cs @@ -50,8 +50,9 @@ namespace System.Diagnostics private string _machineName; private string _perfLcid; - private Hashtable _customCategoryTable; + private static volatile Hashtable s_libraryTable; + private Hashtable _customCategoryTable; private Hashtable _categoryTable; private Hashtable _nameTable; private Hashtable _helpTable; @@ -299,10 +300,17 @@ namespace System.Diagnostics { if (s_libraryTable != null) { - foreach (PerformanceCounterLib library in s_libraryTable.Values) - library.Close(); + //race with GetPerformanceCounterLib + lock (InternalSyncObject) + { + if (s_libraryTable != null) + { + foreach (PerformanceCounterLib library in s_libraryTable.Values) + library.Close(); - s_libraryTable = null; + s_libraryTable = null; + } + } } } @@ -638,14 +646,14 @@ namespace System.Diagnostics RegistryKey baseKey = null; categoryType = PerformanceCounterCategoryType.Unknown; - if (_customCategoryTable == null) - { - Interlocked.CompareExchange(ref _customCategoryTable, new Hashtable(StringComparer.OrdinalIgnoreCase), null); - } + Hashtable table = + _customCategoryTable ?? + Interlocked.CompareExchange(ref _customCategoryTable, new Hashtable(StringComparer.OrdinalIgnoreCase), null) ?? + _customCategoryTable; - if (_customCategoryTable.ContainsKey(category)) + if (table.ContainsKey(category)) { - categoryType = (PerformanceCounterCategoryType)_customCategoryTable[category]; + categoryType = (PerformanceCounterCategoryType)table[category]; return true; } else @@ -674,7 +682,10 @@ namespace System.Diagnostics // In this case we return an 'Unknown' category type and 'false' to indicate the category is *not* custom. // categoryType = PerformanceCounterCategoryType.Unknown; - _customCategoryTable[category] = categoryType; + lock (table) + { + table[category] = categoryType; + } return false; } } @@ -702,8 +713,10 @@ namespace System.Diagnostics if (objectID != null) { int firstID = (int)objectID; - - _customCategoryTable[category] = categoryType; + lock (table) + { + table[category] = categoryType; + } return true; } } @@ -717,6 +730,7 @@ namespace System.Diagnostics baseKey.Close(); } } + return false; } @@ -974,23 +988,21 @@ namespace System.Diagnostics machineName = (machineName == "." ? ComputerName : machineName).ToLowerInvariant(); - if (PerformanceCounterLib.s_libraryTable == null) + //race with CloseAllLibraries + lock (InternalSyncObject) { - lock (InternalSyncObject) - { - if (PerformanceCounterLib.s_libraryTable == null) - PerformanceCounterLib.s_libraryTable = new Hashtable(); - } - } + if (PerformanceCounterLib.s_libraryTable == null) + PerformanceCounterLib.s_libraryTable = new Hashtable(); - string libraryKey = machineName + ":" + lcidString; - if (PerformanceCounterLib.s_libraryTable.Contains(libraryKey)) - return (PerformanceCounterLib)PerformanceCounterLib.s_libraryTable[libraryKey]; - else - { - PerformanceCounterLib library = new PerformanceCounterLib(machineName, lcidString); - PerformanceCounterLib.s_libraryTable[libraryKey] = library; - return library; + string libraryKey = machineName + ":" + lcidString; + if (PerformanceCounterLib.s_libraryTable.Contains(libraryKey)) + return (PerformanceCounterLib)PerformanceCounterLib.s_libraryTable[libraryKey]; + else + { + PerformanceCounterLib library = new PerformanceCounterLib(machineName, lcidString); + PerformanceCounterLib.s_libraryTable[libraryKey] = library; + return library; + } } } diff --git a/external/corefx/src/System.Diagnostics.PerformanceCounter/src/System/Diagnostics/PrivilegedConfigurationManager.cs b/external/corefx/src/System.Diagnostics.PerformanceCounter/src/System/Diagnostics/PrivilegedConfigurationManager.cs index 8cad71ca62..546c6d29f3 100644 --- a/external/corefx/src/System.Diagnostics.PerformanceCounter/src/System/Diagnostics/PrivilegedConfigurationManager.cs +++ b/external/corefx/src/System.Diagnostics.PerformanceCounter/src/System/Diagnostics/PrivilegedConfigurationManager.cs @@ -1,9 +1,6 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -//------------------------------------------------------------------------------ - +// 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.Configuration { diff --git a/external/corefx/src/System.Diagnostics.Process/System.Diagnostics.Process.sln b/external/corefx/src/System.Diagnostics.Process/System.Diagnostics.Process.sln index 5a6ce0aeb1..37b8311026 100644 --- a/external/corefx/src/System.Diagnostics.Process/System.Diagnostics.Process.sln +++ b/external/corefx/src/System.Diagnostics.Process/System.Diagnostics.Process.sln @@ -31,10 +31,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E1114510-844C-4BB2-BBAD-8595BD16E24B}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU - {E1114510-844C-4BB2-BBAD-8595BD16E24B}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU - {E1114510-844C-4BB2-BBAD-8595BD16E24B}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU - {E1114510-844C-4BB2-BBAD-8595BD16E24B}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU + {E1114510-844C-4BB2-BBAD-8595BD16E24B}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU + {E1114510-844C-4BB2-BBAD-8595BD16E24B}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU + {E1114510-844C-4BB2-BBAD-8595BD16E24B}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU + {E1114510-844C-4BB2-BBAD-8595BD16E24B}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU {4E05E43A-1DC9-47C7-8280-13CF4EF741EA}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {4E05E43A-1DC9-47C7-8280-13CF4EF741EA}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {4E05E43A-1DC9-47C7-8280-13CF4EF741EA}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/external/corefx/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.cs b/external/corefx/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.cs index 83f600a4f4..a63a5c19a3 100644 --- a/external/corefx/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.cs +++ b/external/corefx/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.cs @@ -158,6 +158,7 @@ namespace System.Diagnostics public ProcessStartInfo(string fileName) { } public ProcessStartInfo(string fileName, string arguments) { } public string Arguments { get { throw null; } set { } } + public System.Collections.ObjectModel.Collection ArgumentList { get { throw null; } } public bool CreateNoWindow { get { throw null; } set { } } public string Domain { get { throw null; } set { } } [System.ComponentModel.DefaultValueAttribute(null)] diff --git a/external/corefx/src/System.Diagnostics.Process/src/FxCopBaseline.cs b/external/corefx/src/System.Diagnostics.Process/src/FxCopBaseline.cs index 2fed8d3a21..1d3b6208e1 100644 --- a/external/corefx/src/System.Diagnostics.Process/src/FxCopBaseline.cs +++ b/external/corefx/src/System.Diagnostics.Process/src/FxCopBaseline.cs @@ -1,5 +1,11 @@ +// 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.CodeAnalysis; [assembly: SuppressMessage("Microsoft.Reliability", "CA2002:DoNotLockOnObjectsWithWeakIdentity", Scope = "member", Target = "System.Diagnostics.Process.#EnsureWatchingForExit()")] [assembly: SuppressMessage("Microsoft.Reliability", "CA2002:DoNotLockOnObjectsWithWeakIdentity", Scope = "member", Target = "System.Diagnostics.Process.#RaiseOnExited()")] [assembly: SuppressMessage("Microsoft.Reliability", "CA2002:DoNotLockOnObjectsWithWeakIdentity", Scope = "member", Target = "System.Diagnostics.Process.#StopWatchingForExit()")] +[assembly: SuppressMessage("Microsoft.Reliability", "CA2002:DoNotLockOnObjectsWithWeakIdentity", Scope = "member", Target = "System.Diagnostics.Process.#CompletionCallback(System.Object,System.Boolean)")] +[assembly: SuppressMessage("Microsoft.Reliability", "CA2002:DoNotLockOnObjectsWithWeakIdentity", Scope = "member", Target = "System.Diagnostics.Process.Close()")] \ No newline at end of file diff --git a/external/corefx/src/System.Diagnostics.Process/src/Resources/Strings.resx b/external/corefx/src/System.Diagnostics.Process/src/Resources/Strings.resx index d83dfb7010..59e578f4b2 100644 --- a/external/corefx/src/System.Diagnostics.Process/src/Resources/Strings.resx +++ b/external/corefx/src/System.Diagnostics.Process/src/Resources/Strings.resx @@ -312,4 +312,10 @@ StandardInputEncoding is only supported when standard input is redirected. + + User with name '{0}' was not found. + + + Only one of Arguments or ArgumentList may be used. + \ No newline at end of file diff --git a/external/corefx/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj b/external/corefx/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj index 108615fe09..64c0400823 100644 --- a/external/corefx/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj +++ b/external/corefx/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj @@ -47,6 +47,9 @@ + + Common\System\PasteArguments.cs + @@ -288,8 +291,8 @@ - - Common\System\IO\StringBuilderCache.cs + + Common\System\Text\StringBuilderCache.cs Common\System\IO\StringParser.cs @@ -318,6 +321,9 @@ Common\Interop\Unix\Interop.GetPid.cs + + Common\Interop\Unix\Interop.GetPwUid.cs + Common\Interop\Unix\Interop.GetSetPriority.cs @@ -330,6 +336,9 @@ Common\Interop\Unix\Interop.ReadLink.cs + + Common\Interop\Unix\Interop.RegisterForRegisterForSigChld.cs + Common\Interop\Unix\Interop.ResourceLimits.cs @@ -339,6 +348,9 @@ Common\Interop\Unix\Interop.POpen.cs + + Common\Interop\Unix\Interop.WaitId.cs + Common\Interop\Unix\Interop.WaitPid.cs @@ -353,15 +365,6 @@ Common\Interop\Linux\Interop.SchedGetSetAffinity.cs - - Common\System\Collections\Generic\ArrayBuilder.cs - - - Common\System\Collections\Generic\EnumerableHelpers.cs - - - Common\System\Collections\Generic\LargeArrayBuilder.cs - Common\System\Text\ReusableTextReader.cs @@ -436,6 +439,7 @@ + diff --git a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/AsyncStreamReader.cs b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/AsyncStreamReader.cs index 3e5ba46044..a86002e2d1 100644 --- a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/AsyncStreamReader.cs +++ b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/AsyncStreamReader.cs @@ -90,7 +90,7 @@ namespace System.Diagnostics { try { - int bytesRead = await _stream.ReadAsync(_byteBuffer, 0, _byteBuffer.Length, _cts.Token).ConfigureAwait(false); + int bytesRead = await _stream.ReadAsync(new Memory(_byteBuffer), _cts.Token).ConfigureAwait(false); if (bytesRead == 0) break; diff --git a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/Process.Linux.cs b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/Process.Linux.cs index 030c5c50eb..829ea2e9f0 100644 --- a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/Process.Linux.cs +++ b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/Process.Linux.cs @@ -64,34 +64,39 @@ namespace System.Diagnostics /// The converted time. internal static DateTime BootTimeToDateTime(TimeSpan timespanAfterBoot) { - // Use the uptime and the current time to determine the absolute boot time. - DateTime bootTime = DateTime.UtcNow - Uptime; - // And use that to determine the absolute time for timespan. - DateTime dt = bootTime + timespanAfterBoot; + DateTime dt = BootTime + timespanAfterBoot; // The return value is expected to be in the local time zone. // It is converted here (rather than starting with DateTime.Now) to avoid DST issues. return dt.ToLocalTime(); } - /// Gets the elapsed time since the system was booted. - private static TimeSpan Uptime + /// Gets the system boot time. + private static DateTime BootTime { get { - // '/proc/uptime' accounts time a device spends in sleep mode. - const string UptimeFile = Interop.procfs.ProcUptimeFilePath; - string text = File.ReadAllText(UptimeFile); - - double uptimeSeconds = 0; - int length = text.IndexOf(' '); - if (length != -1) + // '/proc/stat -> btime' gets the boot time. + // btime is the time of system boot in seconds since the Unix epoch. + // It includes suspended time and is updated based on the system time (settimeofday). + const string StatFile = Interop.procfs.ProcStatFilePath; + string text = File.ReadAllText(StatFile); + int btimeLineStart = text.IndexOf("\nbtime "); + if (btimeLineStart >= 0) { - Double.TryParse(text.AsReadOnlySpan().Slice(0, length), NumberStyles.AllowDecimalPoint, NumberFormatInfo.InvariantInfo, out uptimeSeconds); + int btimeStart = btimeLineStart + "\nbtime ".Length; + int btimeEnd = text.IndexOf('\n', btimeStart); + if (btimeEnd > btimeStart) + { + if (Int64.TryParse(text.AsSpan(btimeStart, btimeEnd - btimeStart), out long bootTimeSeconds)) + { + return DateTime.UnixEpoch + TimeSpan.FromSeconds(bootTimeSeconds); + } + } } - return TimeSpan.FromSeconds(uptimeSeconds); + return DateTime.UtcNow; } } @@ -191,7 +196,7 @@ namespace System.Diagnostics ulong rsslim = GetStat().rsslim; // rsslim is a ulong, but maxWorkingSet is an IntPtr, so we need to cap rsslim - // at the max size of IntPtr. This often happens when there is no configured + // at the max size of IntPtr. This often happens when there is no configured // rsslim other than ulong.MaxValue, which without these checks would show up // as a maxWorkingSet == -1. switch (IntPtr.Size) diff --git a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/Process.Unix.cs b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/Process.Unix.cs index 7790e8c5fe..6705a44129 100644 --- a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/Process.Unix.cs +++ b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/Process.Unix.cs @@ -18,6 +18,10 @@ namespace System.Diagnostics { private static readonly UTF8Encoding s_utf8NoBom = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false); + private static volatile bool s_sigchildHandlerRegistered = false; + private static readonly object s_sigchildGate = new object(); + private static readonly Interop.Sys.SigChldCallback s_sigChildHandler = OnSigChild; + private static readonly ReaderWriterLockSlim s_processStartLock = new ReaderWriterLockSlim(); /// /// Puts a Process component in state to interact with operating system processes that run in a @@ -80,7 +84,8 @@ namespace System.Diagnostics { // Make sure that we configure the wait state holder for this process object, which we can only do once we have a process ID. Debug.Assert(_haveProcessId, $"{nameof(ConfigureAfterProcessIdSet)} should only be called once a process ID is set"); - GetWaitState(); // lazily initializes the wait state + // Initialize WaitStateHolder for non-child processes + GetWaitState(); } /// @@ -100,12 +105,14 @@ namespace System.Diagnostics _watchingForExit = true; try { - _waitHandle = new ProcessWaitHandle(_processHandle); + _waitHandle = new ProcessWaitHandle(GetWaitState()); _registeredWaitHandle = ThreadPool.RegisterWaitForSingleObject(_waitHandle, - new WaitOrTimerCallback(CompletionCallback), null, -1, true); + new WaitOrTimerCallback(CompletionCallback), _waitHandle, -1, true); } catch { + _waitHandle?.Dispose(); + _waitHandle = null; _watchingForExit = false; throw; } @@ -257,6 +264,8 @@ namespace System.Diagnostics /// The start info with which to start the process. private bool StartCore(ProcessStartInfo startInfo) { + EnsureSigChildHandler(); + string filename; string[] argv; @@ -293,21 +302,44 @@ namespace System.Diagnostics throw new Win32Exception(Interop.Error.ENOENT.Info().RawErrno); } - // Invoke the shim fork/execve routine. It will create pipes for all requested - // redirects, fork a child process, map the pipe ends onto the appropriate stdin/stdout/stderr - // descriptors, and execve to execute the requested process. The shim implementation - // is used to fork/execve as executing managed code in a forked process is not safe (only - // the calling thread will transfer, thread IDs aren't stable across the fork, etc.) - Interop.Sys.ForkAndExecProcess( + bool setCredentials = !string.IsNullOrEmpty(startInfo.UserName); + uint userId = 0; + uint groupId = 0; + if (setCredentials) + { + (userId, groupId) = GetUserAndGroupIds(startInfo); + } + + // Lock to avoid races with OnSigChild + // By using a ReaderWriterLock we allow multiple processes to start concurrently. + s_processStartLock.EnterReadLock(); + try + { + // Invoke the shim fork/execve routine. It will create pipes for all requested + // redirects, fork a child process, map the pipe ends onto the appropriate stdin/stdout/stderr + // descriptors, and execve to execute the requested process. The shim implementation + // is used to fork/execve as executing managed code in a forked process is not safe (only + // the calling thread will transfer, thread IDs aren't stable across the fork, etc.) + Interop.Sys.ForkAndExecProcess( filename, argv, envp, cwd, startInfo.RedirectStandardInput, startInfo.RedirectStandardOutput, startInfo.RedirectStandardError, + setCredentials, userId, groupId, out childPid, out stdinFd, out stdoutFd, out stderrFd); - // Store the child's information into this Process object. - Debug.Assert(childPid >= 0); - SetProcessId(childPid); - SetProcessHandle(new SafeProcessHandle(childPid)); + // Ensure we'll reap this process. + // note: SetProcessId will set this if we don't set it first. + _waitStateHolder = new ProcessWaitState.Holder(childPid, isNewChild: true); + + // Store the child's information into this Process object. + Debug.Assert(childPid >= 0); + SetProcessId(childPid); + SetProcessHandle(new SafeProcessHandle(childPid)); + } + finally + { + s_processStartLock.ExitReadLock(); + } // Configure the parent's ends of the redirection streams. // We use UTF8 encoding without BOM by-default(instead of Console encoding as on Windows) @@ -345,7 +377,6 @@ namespace System.Diagnostics /// Size to use for redirect streams and stream readers/writers. private const int StreamBufferSize = 4096; - /// Converts the filename and arguments information from a ProcessStartInfo into an argv array. /// The ProcessStartInfo. /// alternative resolved path to use as first argument @@ -353,7 +384,7 @@ namespace System.Diagnostics private static string[] ParseArgv(ProcessStartInfo psi, string alternativePath = null) { string argv0 = psi.FileName; // when no alternative path exists, pass filename (instead of resolved path) as argv[0], to match what caller supplied - if (string.IsNullOrEmpty(psi.Arguments) && string.IsNullOrEmpty(alternativePath)) + if (string.IsNullOrEmpty(psi.Arguments) && string.IsNullOrEmpty(alternativePath) && psi.ArgumentList.Count == 0) { return new string[] { argv0 }; } @@ -367,8 +398,16 @@ namespace System.Diagnostics argvList.Add("openURL"); // kfmclient needs OpenURL } } + argvList.Add(argv0); - ParseArgumentsIntoList(psi.Arguments, argvList); + if (!string.IsNullOrEmpty(psi.Arguments)) + { + ParseArgumentsIntoList(psi.Arguments, argvList); + } + else + { + argvList.AddRange(psi.ArgumentList); + } return argvList.ToArray(); } @@ -597,6 +636,94 @@ namespace System.Diagnostics return _waitStateHolder._state; } + private static (uint userId, uint groupId) GetUserAndGroupIds(ProcessStartInfo startInfo) + { + Debug.Assert(!string.IsNullOrEmpty(startInfo.UserName)); + + (uint? userId, uint? groupId) = GetUserAndGroupIds(startInfo.UserName); + + Debug.Assert(userId.HasValue == groupId.HasValue, "userId and groupId both need to have values, or both need to be null."); + if (!userId.HasValue) + { + throw new Win32Exception(SR.Format(SR.UserDoesNotExist, startInfo.UserName)); + } + + return (userId.Value, groupId.Value); + } + + private unsafe static (uint? userId, uint? groupId) GetUserAndGroupIds(string userName) + { + Interop.Sys.Passwd? passwd; + // First try with a buffer that should suffice for 99% of cases. + // Note: on CentOS/RedHat 7.1 systems, getpwnam_r returns 'user not found' if the buffer is too small + // see https://bugs.centos.org/view.php?id=7324 + const int BufLen = Interop.Sys.Passwd.InitialBufferSize; + byte* stackBuf = stackalloc byte[BufLen]; + if (TryGetPasswd(userName, stackBuf, BufLen, out passwd)) + { + if (passwd == null) + { + return (null, null); + } + return (passwd.Value.UserId, passwd.Value.GroupId); + } + + // Fallback to heap allocations if necessary, growing the buffer until + // we succeed. TryGetPasswd will throw if there's an unexpected error. + int lastBufLen = BufLen; + while (true) + { + lastBufLen *= 2; + byte[] heapBuf = new byte[lastBufLen]; + fixed (byte* buf = &heapBuf[0]) + { + if (TryGetPasswd(userName, buf, heapBuf.Length, out passwd)) + { + if (passwd == null) + { + return (null, null); + } + return (passwd.Value.UserId, passwd.Value.GroupId); + } + } + } + } + + private static unsafe bool TryGetPasswd(string name, byte* buf, int bufLen, out Interop.Sys.Passwd? passwd) + { + // Call getpwnam_r to get the passwd struct + Interop.Sys.Passwd tempPasswd; + int error = Interop.Sys.GetPwNamR(name, out tempPasswd, buf, bufLen); + + // If the call succeeds, give back the passwd retrieved + if (error == 0) + { + passwd = tempPasswd; + return true; + } + + // If the current user's entry could not be found, give back null, + // but still return true as false indicates the buffer was too small. + if (error == -1) + { + passwd = null; + return true; + } + + var errorInfo = new Interop.ErrorInfo(error); + + // If the call failed because the buffer was too small, return false to + // indicate the caller should try again with a larger buffer. + if (errorInfo.Error == Interop.Error.ERANGE) + { + passwd = null; + return false; + } + + // Otherwise, fail. + throw new Win32Exception(errorInfo.RawErrno, errorInfo.GetErrorMessage()); + } + public IntPtr MainWindowHandle => IntPtr.Zero; private bool CloseMainWindowCore() => false; @@ -606,5 +733,41 @@ namespace System.Diagnostics public bool Responding => true; private bool WaitForInputIdleCore(int milliseconds) => throw new InvalidOperationException(SR.InputIdleUnkownError); + + private static void EnsureSigChildHandler() + { + if (s_sigchildHandlerRegistered) + { + return; + } + + lock (s_sigchildGate) + { + if (!s_sigchildHandlerRegistered) + { + // Ensure signal handling is setup and register our callback. + if (!Interop.Sys.RegisterForSigChld(s_sigChildHandler)) + { + throw new Win32Exception(); + } + + s_sigchildHandlerRegistered = true; + } + } + } + + private static void OnSigChild(bool reapAll) + { + // Lock to avoid races with Process.Start + s_processStartLock.EnterWriteLock(); + try + { + ProcessWaitState.CheckChildren(reapAll); + } + finally + { + s_processStartLock.ExitWriteLock(); + } + } } } diff --git a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/Process.Win32.cs b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/Process.Win32.cs index ddde5fc6bc..f2f4746546 100644 --- a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/Process.Win32.cs +++ b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/Process.Win32.cs @@ -46,9 +46,21 @@ namespace System.Diagnostics if (startInfo._environmentVariables != null) throw new InvalidOperationException(SR.CantUseEnvVars); + string arguments; + if (startInfo.ArgumentList.Count > 0) + { + StringBuilder sb = new StringBuilder(); + Process.AppendArguments(sb, startInfo.ArgumentList); + arguments = sb.ToString(); + } + else + { + arguments = startInfo.Arguments; + } + fixed (char* fileName = startInfo.FileName.Length > 0 ? startInfo.FileName : null) fixed (char* verb = startInfo.Verb.Length > 0 ? startInfo.Verb : null) - fixed (char* parameters = startInfo.Arguments.Length > 0 ? startInfo.Arguments : null) + fixed (char* parameters = arguments.Length > 0 ? arguments : null) fixed (char* directory = startInfo.WorkingDirectory.Length > 0 ? startInfo.WorkingDirectory : null) { Interop.Shell32.SHELLEXECUTEINFO shellExecuteInfo = new Interop.Shell32.SHELLEXECUTEINFO() @@ -258,7 +270,7 @@ namespace System.Diagnostics return false; } - Interop.User32.PostMessage(mainWindowHandle, WM_CLOSE, IntPtr.Zero, IntPtr.Zero); + Interop.User32.PostMessageW(mainWindowHandle, WM_CLOSE, IntPtr.Zero, IntPtr.Zero); return true; } diff --git a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/Process.Windows.cs b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/Process.Windows.cs index 1b70bc7347..e9cf343d28 100644 --- a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/Process.Windows.cs +++ b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/Process.Windows.cs @@ -126,7 +126,7 @@ namespace System.Diagnostics { _waitHandle = new Interop.Kernel32.ProcessWaitHandle(_processHandle); _registeredWaitHandle = ThreadPool.RegisterWaitForSingleObject(_waitHandle, - new WaitOrTimerCallback(CompletionCallback), null, -1, true); + new WaitOrTimerCallback(CompletionCallback), _waitHandle, -1, true); } catch { @@ -437,7 +437,7 @@ namespace System.Diagnostics /// Starts the process using the supplied start info. /// The start info with which to start the process. - private bool StartWithCreateProcess(ProcessStartInfo startInfo) + private unsafe bool StartWithCreateProcess(ProcessStartInfo startInfo) { // See knowledge base article Q190351 for an explanation of the following code. Noteworthy tricky points: // * The handles are duplicated as non-inheritable before they are passed to CreateProcess so @@ -445,54 +445,61 @@ namespace System.Diagnostics // * CreateProcess allows you to redirect all or none of the standard IO handles, so we use // GetStdHandle for the handles that are not being redirected - StringBuilder commandLine = BuildCommandLine(startInfo.FileName, startInfo.Arguments); - + StringBuilder commandLine = BuildCommandLine(startInfo.FileName, StartInfo.Arguments); + Process.AppendArguments(commandLine, StartInfo.ArgumentList); + Interop.Kernel32.STARTUPINFO startupInfo = new Interop.Kernel32.STARTUPINFO(); Interop.Kernel32.PROCESS_INFORMATION processInfo = new Interop.Kernel32.PROCESS_INFORMATION(); Interop.Kernel32.SECURITY_ATTRIBUTES unused_SecAttrs = new Interop.Kernel32.SECURITY_ATTRIBUTES(); SafeProcessHandle procSH = new SafeProcessHandle(); SafeThreadHandle threadSH = new SafeThreadHandle(); - bool retVal; - int errorCode = 0; // handles used in parent process - SafeFileHandle standardInputWritePipeHandle = null; - SafeFileHandle standardOutputReadPipeHandle = null; - SafeFileHandle standardErrorReadPipeHandle = null; - GCHandle environmentHandle = new GCHandle(); + SafeFileHandle parentInputPipeHandle = null; + SafeFileHandle childInputPipeHandle = null; + SafeFileHandle parentOutputPipeHandle = null; + SafeFileHandle childOutputPipeHandle = null; + SafeFileHandle parentErrorPipeHandle = null; + SafeFileHandle childErrorPipeHandle = null; lock (s_createProcessLock) { try { + startupInfo.cb = sizeof(Interop.Kernel32.STARTUPINFO); + // set up the streams if (startInfo.RedirectStandardInput || startInfo.RedirectStandardOutput || startInfo.RedirectStandardError) { if (startInfo.RedirectStandardInput) { - CreatePipe(out standardInputWritePipeHandle, out startupInfo.hStdInput, true); + CreatePipe(out parentInputPipeHandle, out childInputPipeHandle, true); } else { - startupInfo.hStdInput = new SafeFileHandle(Interop.Kernel32.GetStdHandle(Interop.Kernel32.HandleTypes.STD_INPUT_HANDLE), false); + childInputPipeHandle = new SafeFileHandle(Interop.Kernel32.GetStdHandle(Interop.Kernel32.HandleTypes.STD_INPUT_HANDLE), false); } if (startInfo.RedirectStandardOutput) { - CreatePipe(out standardOutputReadPipeHandle, out startupInfo.hStdOutput, false); + CreatePipe(out parentOutputPipeHandle, out childOutputPipeHandle, false); } else { - startupInfo.hStdOutput = new SafeFileHandle(Interop.Kernel32.GetStdHandle(Interop.Kernel32.HandleTypes.STD_OUTPUT_HANDLE), false); + childOutputPipeHandle = new SafeFileHandle(Interop.Kernel32.GetStdHandle(Interop.Kernel32.HandleTypes.STD_OUTPUT_HANDLE), false); } if (startInfo.RedirectStandardError) { - CreatePipe(out standardErrorReadPipeHandle, out startupInfo.hStdError, false); + CreatePipe(out parentErrorPipeHandle, out childErrorPipeHandle, false); } else { - startupInfo.hStdError = new SafeFileHandle(Interop.Kernel32.GetStdHandle(Interop.Kernel32.HandleTypes.STD_ERROR_HANDLE), false); + childErrorPipeHandle = new SafeFileHandle(Interop.Kernel32.GetStdHandle(Interop.Kernel32.HandleTypes.STD_ERROR_HANDLE), false); } + startupInfo.hStdInput = childInputPipeHandle.DangerousGetHandle(); + startupInfo.hStdOutput = childOutputPipeHandle.DangerousGetHandle(); + startupInfo.hStdError = childErrorPipeHandle.DangerousGetHandle(); + startupInfo.dwFlags = Interop.Advapi32.StartupInfoOptions.STARTF_USESTDHANDLES; } @@ -501,18 +508,19 @@ namespace System.Diagnostics if (startInfo.CreateNoWindow) creationFlags |= Interop.Advapi32.StartupInfoOptions.CREATE_NO_WINDOW; // set up the environment block parameter - IntPtr environmentPtr = (IntPtr)0; + string environmentBlock = null; if (startInfo._environmentVariables != null) { creationFlags |= Interop.Advapi32.StartupInfoOptions.CREATE_UNICODE_ENVIRONMENT; - byte[] environmentBytes = EnvironmentVariablesToByteArray(startInfo._environmentVariables); - environmentHandle = GCHandle.Alloc(environmentBytes, GCHandleType.Pinned); - environmentPtr = environmentHandle.AddrOfPinnedObject(); + environmentBlock = GetEnvironmentVariablesBlock(startInfo._environmentVariables); } string workingDirectory = startInfo.WorkingDirectory; if (workingDirectory == string.Empty) workingDirectory = Directory.GetCurrentDirectory(); + bool retVal; + int errorCode = 0; + if (startInfo.UserName.Length != 0) { if (startInfo.Password != null && startInfo.PasswordInClearText != null) @@ -526,138 +534,105 @@ namespace System.Diagnostics logonFlags = Interop.Advapi32.LogonFlags.LOGON_WITH_PROFILE; } - if (startInfo.Password != null) + fixed (char* passwordInClearTextPtr = startInfo.PasswordInClearText ?? string.Empty) + fixed (char* environmentBlockPtr = environmentBlock) { - IntPtr passwordPtr = Marshal.SecureStringToGlobalAllocUnicode(startInfo.Password); + IntPtr passwordPtr = (startInfo.Password != null) ? + Marshal.SecureStringToGlobalAllocUnicode(startInfo.Password) : IntPtr.Zero; + try { retVal = Interop.Advapi32.CreateProcessWithLogonW( startInfo.UserName, startInfo.Domain, - passwordPtr, + (passwordPtr != IntPtr.Zero) ? passwordPtr : (IntPtr)passwordInClearTextPtr, logonFlags, null, // we don't need this since all the info is in commandLine commandLine, creationFlags, - environmentPtr, + (IntPtr)environmentBlockPtr, workingDirectory, - startupInfo, // pointer to STARTUPINFO - processInfo // pointer to PROCESS_INFORMATION + ref startupInfo, // pointer to STARTUPINFO + ref processInfo // pointer to PROCESS_INFORMATION ); - if (!retVal) errorCode = Marshal.GetLastWin32Error(); } - finally { Marshal.ZeroFreeGlobalAllocUnicode(passwordPtr); } - } - else - { - unsafe + finally { - fixed (char* passwordPtr = startInfo.PasswordInClearText ?? string.Empty) - { - retVal = Interop.Advapi32.CreateProcessWithLogonW( - startInfo.UserName, - startInfo.Domain, - (IntPtr)passwordPtr, - logonFlags, - null, // we don't need this since all the info is in commandLine - commandLine, - creationFlags, - environmentPtr, - workingDirectory, - startupInfo, // pointer to STARTUPINFO - processInfo // pointer to PROCESS_INFORMATION - ); - - } + if (passwordPtr != IntPtr.Zero) + Marshal.ZeroFreeGlobalAllocUnicode(passwordPtr); } - if (!retVal) - errorCode = Marshal.GetLastWin32Error(); - } - if (processInfo.hProcess != IntPtr.Zero && processInfo.hProcess != (IntPtr)INVALID_HANDLE_VALUE) - procSH.InitialSetHandle(processInfo.hProcess); - if (processInfo.hThread != IntPtr.Zero && processInfo.hThread != (IntPtr)INVALID_HANDLE_VALUE) - threadSH.InitialSetHandle(processInfo.hThread); - if (!retVal) - { - if (errorCode == Interop.Errors.ERROR_BAD_EXE_FORMAT || errorCode == Interop.Errors.ERROR_EXE_MACHINE_TYPE_MISMATCH) - { - throw new Win32Exception(errorCode, SR.InvalidApplication); - } - throw new Win32Exception(errorCode); } } else { - retVal = Interop.Kernel32.CreateProcess( + fixed (char* environmentBlockPtr = environmentBlock) + { + retVal = Interop.Kernel32.CreateProcess( null, // we don't need this since all the info is in commandLine commandLine, // pointer to the command line string ref unused_SecAttrs, // address to process security attributes, we don't need to inherit the handle ref unused_SecAttrs, // address to thread security attributes. true, // handle inheritance flag creationFlags, // creation flags - environmentPtr, // pointer to new environment block + (IntPtr)environmentBlockPtr, // pointer to new environment block workingDirectory, // pointer to current directory name - startupInfo, // pointer to STARTUPINFO - processInfo // pointer to PROCESS_INFORMATION + ref startupInfo, // pointer to STARTUPINFO + ref processInfo // pointer to PROCESS_INFORMATION ); - if (!retVal) - errorCode = Marshal.GetLastWin32Error(); - if (processInfo.hProcess != (IntPtr)0 && processInfo.hProcess != (IntPtr)INVALID_HANDLE_VALUE) - procSH.InitialSetHandle(processInfo.hProcess); - if (processInfo.hThread != (IntPtr)0 && processInfo.hThread != (IntPtr)INVALID_HANDLE_VALUE) - threadSH.InitialSetHandle(processInfo.hThread); - - if (!retVal) - { - if (errorCode == Interop.Errors.ERROR_BAD_EXE_FORMAT || errorCode == Interop.Errors.ERROR_EXE_MACHINE_TYPE_MISMATCH) - { - throw new Win32Exception(errorCode, SR.InvalidApplication); - } - throw new Win32Exception(errorCode); + if (!retVal) + errorCode = Marshal.GetLastWin32Error(); } } + + if (processInfo.hProcess != IntPtr.Zero && processInfo.hProcess != (IntPtr)INVALID_HANDLE_VALUE) + procSH.InitialSetHandle(processInfo.hProcess); + if (processInfo.hThread != IntPtr.Zero && processInfo.hThread != (IntPtr)INVALID_HANDLE_VALUE) + threadSH.InitialSetHandle(processInfo.hThread); + + if (!retVal) + { + if (errorCode == Interop.Errors.ERROR_BAD_EXE_FORMAT || errorCode == Interop.Errors.ERROR_EXE_MACHINE_TYPE_MISMATCH) + { + throw new Win32Exception(errorCode, SR.InvalidApplication); + } + throw new Win32Exception(errorCode); + } } finally { - // free environment block - if (environmentHandle.IsAllocated) - { - environmentHandle.Free(); - } + childInputPipeHandle?.Dispose(); + childOutputPipeHandle?.Dispose(); + childErrorPipeHandle?.Dispose(); - startupInfo.Dispose(); + threadSH?.Dispose(); } } if (startInfo.RedirectStandardInput) { Encoding enc = startInfo.StandardInputEncoding ?? GetEncoding((int)Interop.Kernel32.GetConsoleCP()); - _standardInput = new StreamWriter(new FileStream(standardInputWritePipeHandle, FileAccess.Write, 4096, false), enc, 4096); + _standardInput = new StreamWriter(new FileStream(parentInputPipeHandle, FileAccess.Write, 4096, false), enc, 4096); _standardInput.AutoFlush = true; } if (startInfo.RedirectStandardOutput) { Encoding enc = startInfo.StandardOutputEncoding ?? GetEncoding((int)Interop.Kernel32.GetConsoleOutputCP()); - _standardOutput = new StreamReader(new FileStream(standardOutputReadPipeHandle, FileAccess.Read, 4096, false), enc, true, 4096); + _standardOutput = new StreamReader(new FileStream(parentOutputPipeHandle, FileAccess.Read, 4096, false), enc, true, 4096); } if (startInfo.RedirectStandardError) { Encoding enc = startInfo.StandardErrorEncoding ?? GetEncoding((int)Interop.Kernel32.GetConsoleOutputCP()); - _standardError = new StreamReader(new FileStream(standardErrorReadPipeHandle, FileAccess.Read, 4096, false), enc, true, 4096); + _standardError = new StreamReader(new FileStream(parentErrorPipeHandle, FileAccess.Read, 4096, false), enc, true, 4096); } - bool ret = false; - if (!procSH.IsInvalid) - { - SetProcessHandle(procSH); - SetProcessId((int)processInfo.dwProcessId); - threadSH.Dispose(); - ret = true; - } + if (procSH.IsInvalid) + return false; - return ret; + SetProcessHandle(procSH); + SetProcessId((int)processInfo.dwProcessId); + return true; } private static Encoding GetEncoding(int codePage) @@ -900,11 +875,10 @@ namespace System.Diagnostics } } - private static byte[] EnvironmentVariablesToByteArray(IDictionary sd) + private static string GetEnvironmentVariablesBlock(IDictionary sd) { // get the keys string[] keys = new string[sd.Count]; - byte[] envBlock = null; sd.Keys.CopyTo(keys, 0); // sort both by the keys @@ -925,10 +899,8 @@ namespace System.Diagnostics stringBuff.Append(sd[keys[i]]); stringBuff.Append('\0'); } - // an extra null at the end indicates end of list. - stringBuff.Append('\0'); - envBlock = Encoding.Unicode.GetBytes(stringBuff.ToString()); - return envBlock; + // an extra null at the end that indicates end of list will come from the string. + return stringBuff.ToString(); } } } diff --git a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/Process.cs b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/Process.cs index 1509b48003..71fdfc59ac 100644 --- a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/Process.cs +++ b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/Process.cs @@ -3,11 +3,10 @@ // See the LICENSE file in the project root for more information. using Microsoft.Win32.SafeHandles; -using System.Collections.Generic; +using System.Collections.ObjectModel; using System.ComponentModel; using System.Globalization; using System.IO; -using System.Security; using System.Text; using System.Threading; @@ -783,10 +782,20 @@ namespace System.Diagnostics /// This is called from the threadpool when a process exits. /// /// - private void CompletionCallback(object context, bool wasSignaled) + private void CompletionCallback(object waitHandleContext, bool wasSignaled) { - StopWatchingForExit(); - RaiseOnExited(); + Debug.Assert(waitHandleContext != null, "Process.CompletionCallback called with no waitHandleContext"); + lock (this) + { + // Check the exited event that we get from the threadpool + // matches the event we are waiting for. + if (waitHandleContext != _waitHandle) + { + return; + } + StopWatchingForExit(); + RaiseOnExited(); + } } /// @@ -836,7 +845,14 @@ namespace System.Diagnostics { if (_haveProcessHandle) { - StopWatchingForExit(); + // We need to lock to ensure we don't run concurrently with CompletionCallback. + // Without this lock we could reset _raisedOnExited which causes CompletionCallback to + // raise the Exited event a second time for the same process. + lock (this) + { + // This sets _waitHandle to null which causes CompletionCallback to not emit events. + StopWatchingForExit(); + } #if FEATURE_TRACESWITCH Debug.WriteLineIf(_processTracing.TraceVerbose, "Process - CloseHandle(process) in Close()"); #endif @@ -1198,6 +1214,10 @@ namespace System.Diagnostics { throw new InvalidOperationException(SR.StandardErrorEncodingNotAllowed); } + if (!string.IsNullOrEmpty(startInfo.Arguments) && startInfo.ArgumentList.Count > 0) + { + throw new InvalidOperationException(SR.ArgumentAndArgumentListInitialized); + } //Cannot start a new process and store its handle if the object has been disposed, since finalization has been suppressed. if (_disposed) @@ -1467,6 +1487,17 @@ namespace System.Diagnostics } } + private static void AppendArguments(StringBuilder stringBuilder, Collection argumentList) + { + if (argumentList.Count > 0) + { + foreach (string argument in argumentList) + { + PasteArguments.AppendArgument(stringBuilder, argument); + } + } + } + /// /// This enum defines the operation mode for redirected process stream. /// We don't support switching between synchronous mode and asynchronous mode. diff --git a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Linux.cs b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Linux.cs index 61e1d1f2e5..69800f10b0 100644 --- a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Linux.cs +++ b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Linux.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Globalization; using System.IO; +using System.Linq; using System.Text; namespace System.Diagnostics @@ -14,7 +15,7 @@ namespace System.Diagnostics /// Gets the IDs of all processes on the current machine. public static int[] GetProcessIds() { - return EnumerableHelpers.ToArray(EnumerateProcessIds()); + return EnumerateProcessIds().ToArray(); } /// Gets process infos for each process on the specified machine. @@ -207,6 +208,8 @@ namespace System.Diagnostics /// private static ThreadState ProcFsStateToThreadState(char c) { + // Information on these in fs/proc/array.c + // `man proc` does not document them all switch (c) { case 'R': // Running @@ -228,6 +231,9 @@ namespace System.Diagnostics case 'K': // Wakekill return ThreadState.Transition; + case 'I': // Idle + return ThreadState.Ready; + default: Debug.Fail($"Unexpected status character: {c}"); return ThreadState.Unknown; diff --git a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Windows.cs b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Windows.cs index 0498f97fef..5139615db9 100644 --- a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Windows.cs +++ b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Windows.cs @@ -758,7 +758,7 @@ namespace System.Diagnostics // get the threads for current process processInfos[processInfo.ProcessId] = processInfo; - currentPtr = (IntPtr)((long)currentPtr + Marshal.SizeOf(pi)); + currentPtr = (IntPtr)((long)currentPtr + sizeof(SystemProcessInformation)); int i = 0; while (i < pi.NumberOfThreads) { @@ -774,7 +774,7 @@ namespace System.Diagnostics threadInfo._threadWaitReason = NtProcessManager.GetThreadWaitReason((int)ti.WaitReason); processInfo._threadInfoList.Add(threadInfo); - currentPtr = (IntPtr)((long)currentPtr + Marshal.SizeOf(ti)); + currentPtr = (IntPtr)((long)currentPtr + sizeof(SystemThreadInformation)); i++; } } diff --git a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.Unix.cs b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.Unix.cs index 2969b6c89b..d94163318d 100644 --- a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.Unix.cs +++ b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.Unix.cs @@ -14,12 +14,6 @@ namespace System.Diagnostics { private const bool CaseSensitiveEnvironmentVariables = true; - public string UserName - { - get { throw new PlatformNotSupportedException(SR.ProcessStartIdentityNotSupported); } - set { throw new PlatformNotSupportedException(SR.ProcessStartIdentityNotSupported); } - } - public string PasswordInClearText { get { throw new PlatformNotSupportedException(SR.ProcessStartIdentityNotSupported); } diff --git a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.Windows.cs b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.Windows.cs index b504587ee4..53fd3df862 100644 --- a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.Windows.cs +++ b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.Windows.cs @@ -8,17 +8,10 @@ namespace System.Diagnostics { public sealed partial class ProcessStartInfo { - private string _userName; private string _domain; private const bool CaseSensitiveEnvironmentVariables = false; - public string UserName - { - get => _userName ?? string.Empty; - set => _userName = value; - } - public string PasswordInClearText { get; set; } public string Domain diff --git a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.cs b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.cs index d07ade0453..e88549a1a4 100644 --- a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.cs +++ b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.cs @@ -4,6 +4,7 @@ using System.Collections; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Collections.Specialized; using System.ComponentModel; using System.Text; @@ -20,7 +21,9 @@ namespace System.Diagnostics private string _fileName; private string _arguments; private string _directory; + private string _userName; private string _verb; + private Collection _argumentList; private ProcessWindowStyle _windowStyle; internal DictionaryWrapper _environmentVariables; @@ -60,6 +63,18 @@ namespace System.Diagnostics set => _arguments = value; } + public Collection ArgumentList + { + get + { + if (_argumentList == null) + { + _argumentList = new Collection(); + } + return _argumentList; + } + } + public bool CreateNoWindow { get; set; } public StringDictionary EnvironmentVariables => new StringDictionaryWrapper(Environment as DictionaryWrapper); @@ -125,6 +140,12 @@ namespace System.Diagnostics public bool ErrorDialog { get; set; } public IntPtr ErrorDialogParentHandle { get; set; } + public string UserName + { + get => _userName ?? string.Empty; + set => _userName = value; + } + [DefaultValue("")] public string Verb { diff --git a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessWaitHandle.Unix.cs b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessWaitHandle.Unix.cs index 24b6a0a82c..8ce139ca5b 100644 --- a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessWaitHandle.Unix.cs +++ b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessWaitHandle.Unix.cs @@ -9,39 +9,19 @@ namespace System.Diagnostics { internal sealed class ProcessWaitHandle : WaitHandle { - /// - /// Holds a wait state object associated with this handle. - /// - private ProcessWaitState.Holder _waitStateHolder; - - internal ProcessWaitHandle(SafeProcessHandle processHandle) + internal ProcessWaitHandle(ProcessWaitState processWaitState) { - // Get the process ID from the process handle. The handle is just a facade that wraps - // the process ID, and closing the handle won't affect the process or its ID at all. - // So we can grab it, and it's not "dangerous". - int processId = (int)processHandle.DangerousGetHandle(); - - // Create a wait state holder for this process ID. This gives us access to the shared - // wait state associated with this process. - _waitStateHolder = new ProcessWaitState.Holder(processId); - // Get the wait state's event, and use that event's safe wait handle // in place of ours. This will let code register for completion notifications // on this ProcessWaitHandle and be notified when the wait state's handle completes. - ManualResetEvent mre = _waitStateHolder._state.EnsureExitedEvent(); + ManualResetEvent mre = processWaitState.EnsureExitedEvent(); this.SetSafeWaitHandle(mre.GetSafeWaitHandle()); } protected override void Dispose(bool explicitDisposing) { - if (explicitDisposing) - { - if (_waitStateHolder != null) - { - _waitStateHolder.Dispose(); - _waitStateHolder = null; - } - } + // ProcessWaitState will dispose the handle + this.SafeWaitHandle = null; base.Dispose(explicitDisposing); } } diff --git a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessWaitState.Unix.cs b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessWaitState.Unix.cs index cb3d491047..bb5e79ca69 100644 --- a/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessWaitState.Unix.cs +++ b/external/corefx/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessWaitState.Unix.cs @@ -63,9 +63,9 @@ namespace System.Diagnostics { internal ProcessWaitState _state; - internal Holder(int processId) + internal Holder(int processId, bool isNewChild = false) { - _state = ProcessWaitState.AddRef(processId); + _state = ProcessWaitState.AddRef(processId, isNewChild); } ~Holder() @@ -90,28 +90,53 @@ namespace System.Diagnostics } /// - /// Global table that maps process IDs to the associated shared wait state information. + /// Global table that maps process IDs of non-child Processes to the associated shared wait state information. /// private static readonly Dictionary s_processWaitStates = new Dictionary(); + /// + /// Global table that maps process IDs of child Processes to the associated shared wait state information. + /// + private static readonly Dictionary s_childProcessWaitStates = + new Dictionary(); + /// /// Ensures that the mapping table contains an entry for the process ID, /// increments its ref count, and returns it. /// /// The process ID for which we need wait state. /// The wait state object. - internal static ProcessWaitState AddRef(int processId) + internal static ProcessWaitState AddRef(int processId, bool isNewChild) { - lock (s_processWaitStates) + lock (s_childProcessWaitStates) { ProcessWaitState pws; - if (!s_processWaitStates.TryGetValue(processId, out pws)) + if (isNewChild) { - pws = new ProcessWaitState(processId); - s_processWaitStates.Add(processId, pws); + // When the PID is recycled for a new child, we remove the old child. + s_childProcessWaitStates.Remove(processId); + + pws = new ProcessWaitState(processId, isChild: true); + s_childProcessWaitStates.Add(processId, pws); + pws._outstandingRefCount++; // For Holder + pws._outstandingRefCount++; // Decremented in CheckChildren + } + else + { + lock (s_processWaitStates) + { + // We are referencing an existing process. + // This may be a child process, so we check s_childProcessWaitStates too. + if (!s_childProcessWaitStates.TryGetValue(processId, out pws) && + !s_processWaitStates.TryGetValue(processId, out pws)) + { + pws = new ProcessWaitState(processId, isChild: false); + s_processWaitStates.Add(processId, pws); + } + pws._outstandingRefCount++; + } } - pws._outstandingRefCount++; return pws; } } @@ -123,16 +148,22 @@ namespace System.Diagnostics internal void ReleaseRef() { ProcessWaitState pws; - lock (ProcessWaitState.s_processWaitStates) + Dictionary waitStates = _isChild ? s_childProcessWaitStates : s_processWaitStates; + lock (waitStates) { - bool foundState = ProcessWaitState.s_processWaitStates.TryGetValue(_processId, out pws); + bool foundState = waitStates.TryGetValue(_processId, out pws); Debug.Assert(foundState); if (foundState) { - --pws._outstandingRefCount; - if (pws._outstandingRefCount == 0) + --_outstandingRefCount; + if (_outstandingRefCount == 0) { - s_processWaitStates.Remove(_processId); + // The dictionary may contain a different ProcessWaitState if the pid was recycled. + if (pws == this) + { + waitStates.Remove(_processId); + } + pws = this; } else { @@ -151,6 +182,8 @@ namespace System.Diagnostics private readonly object _gate = new object(); /// ID of the associated process. private readonly int _processId; + /// Associated process is a child process. + private readonly bool _isChild; /// If a wait operation is in progress, the Task that represents it; otherwise, null. private Task _waitInProgress; @@ -171,10 +204,11 @@ namespace System.Diagnostics /// Initialize the wait state object. /// The associated process' ID. - private ProcessWaitState(int processId) + private ProcessWaitState(int processId, bool isChild) { Debug.Assert(processId >= 0); _processId = processId; + _isChild = isChild; } /// Releases managed resources used by the ProcessWaitState. @@ -218,13 +252,16 @@ namespace System.Diagnostics _exitedEvent = new ManualResetEvent(initialState: _exited); if (!_exited) { - // If we haven't exited, we need to spin up an asynchronous operation that - // will completed the exitedEvent when the other process exits. If there's already - // another operation underway, then we'll just tack ours onto the end of it. - _waitInProgress = _waitInProgress == null ? - WaitForExitAsync() : - _waitInProgress.ContinueWith((_, state) => ((ProcessWaitState)state).WaitForExitAsync(), - this, CancellationToken.None, TaskContinuationOptions.None, TaskScheduler.Default).Unwrap(); + if (!_isChild) + { + // If we haven't exited, we need to spin up an asynchronous operation that + // will completed the exitedEvent when the other process exits. If there's already + // another operation underway, then we'll just tack ours onto the end of it. + _waitInProgress = _waitInProgress == null ? + WaitForExitAsync() : + _waitInProgress.ContinueWith((_, state) => ((ProcessWaitState)state).WaitForExitAsync(), + this, CancellationToken.None, TaskContinuationOptions.None, TaskScheduler.Default).Unwrap(); + } } } return _exitedEvent; @@ -264,7 +301,7 @@ namespace System.Diagnostics } // Is another wait operation in progress? If so, then we haven't exited, - // and that task owns the right to call CheckForExit. + // and that task owns the right to call CheckForNonChildExit. if (_waitInProgress != null) { exitCode = null; @@ -273,7 +310,7 @@ namespace System.Diagnostics // We don't know if we've exited, but no one else is currently // checking, so check. - CheckForExit(); + CheckForNonChildExit(); // We now have an up-to-date snapshot for whether we've exited, // and if we have, what the exit code is (if we were able to find out). @@ -282,78 +319,40 @@ namespace System.Diagnostics } } - private void CheckForExit(bool blockingAllowed = false) + private void CheckForNonChildExit() { Debug.Assert(Monitor.IsEntered(_gate)); - Debug.Assert(!blockingAllowed); // see "PERF NOTE" comment in WaitForExit - - // Try to get the state of the (child) process - int status; - int waitResult = Interop.Sys.WaitPid(_processId, out status, - blockingAllowed ? Interop.Sys.WaitPidOptions.None : Interop.Sys.WaitPidOptions.WNOHANG); - - if (waitResult == _processId) + if (!_isChild) { - // Process has exited - if (Interop.Sys.WIfExited(status)) + // We won't be able to get an exit code, but we'll at least be able to determine if the process is + // still running. + int killResult = Interop.Sys.Kill(_processId, Interop.Sys.Signals.None); // None means don't send a signal + if (killResult == 0) { - _exitCode = Interop.Sys.WExitStatus(status); + // Process is still running. This could also be a defunct process that has completed + // its work but still has an entry in the processes table due to its parent not yet + // having waited on it to clean it up. + return; } - else if (Interop.Sys.WIfSignaled(status)) + else // error from kill { - const int ExitCodeSignalOffset = 128; - _exitCode = ExitCodeSignalOffset + Interop.Sys.WTermSig(status); - } - SetExited(); - return; - } - else if (waitResult == 0) - { - // Process is still running - return; - } - else if (waitResult == -1) - { - // Something went wrong, e.g. it's not a child process, - // or waitpid was already called for this child, or - // that the call was interrupted by a signal. - Interop.Error errno = Interop.Sys.GetLastError(); - if (errno == Interop.Error.ECHILD) - { - // waitpid was used with a non-child process. We won't be - // able to get an exit code, but we'll at least be able - // to determine if the process is still running (assuming - // there's not a race on its id). - int killResult = Interop.Sys.Kill(_processId, Interop.Sys.Signals.None); // None means don't send a signal - if (killResult == 0) + Interop.Error errno = Interop.Sys.GetLastError(); + if (errno == Interop.Error.ESRCH) { - // Process is still running. This could also be a defunct process that has completed - // its work but still has an entry in the processes table due to its parent not yet - // having waited on it to clean it up. + // Couldn't find the process; assume it's exited + SetExited(); return; } - else // error from kill + else if (errno == Interop.Error.EPERM) { - errno = Interop.Sys.GetLastError(); - if (errno == Interop.Error.ESRCH) - { - // Couldn't find the process; assume it's exited - SetExited(); - return; - } - else if (errno == Interop.Error.EPERM) - { - // Don't have permissions to the process; assume it's alive - return; - } - else Debug.Fail("Unexpected errno value from kill"); + // Don't have permissions to the process; assume it's alive + return; } + else Debug.Fail("Unexpected errno value from kill"); } - else Debug.Fail("Unexpected errno value from waitpid"); - } - else Debug.Fail("Unexpected process ID from waitpid."); - SetExited(); + SetExited(); + } } /// Waits for the associated process to exit. @@ -363,21 +362,8 @@ namespace System.Diagnostics { Debug.Assert(!Monitor.IsEntered(_gate)); - // Track the time the we start waiting. - long startTime = Stopwatch.GetTimestamp(); - - // Polling loop - while (true) + if (_isChild) { - bool createdTask = false; - CancellationTokenSource cts = null; - Task waitTask; - - // We're in a polling loop... determine how much time remains - int remainingTimeout = millisecondsTimeout == Timeout.Infinite ? - Timeout.Infinite : - (int)Math.Max(millisecondsTimeout - ((Stopwatch.GetTimestamp() - startTime) / (double)Stopwatch.Frequency * 1000), 0); - lock (_gate) { // If we already know that the process exited, we're done. @@ -385,75 +371,93 @@ namespace System.Diagnostics { return true; } + } + ManualResetEvent exitEvent = EnsureExitedEvent(); + return exitEvent.WaitOne(millisecondsTimeout); + } + else + { + // Track the time the we start waiting. + long startTime = Stopwatch.GetTimestamp(); - // If a timeout of 0 was supplied, then we simply need to poll - // to see if the process has already exited. - if (remainingTimeout == 0) + // Polling loop + while (true) + { + bool createdTask = false; + CancellationTokenSource cts = null; + Task waitTask; + + // We're in a polling loop... determine how much time remains + int remainingTimeout = millisecondsTimeout == Timeout.Infinite ? + Timeout.Infinite : + (int)Math.Max(millisecondsTimeout - ((Stopwatch.GetTimestamp() - startTime) / (double)Stopwatch.Frequency * 1000), 0); + + lock (_gate) { - // If there's currently a wait-in-progress, then we know the other process - // hasn't exited (barring races and the polling interval). - if (_waitInProgress != null) + // If we already know that the process exited, we're done. + if (_exited) { - return false; + return true; } - // No one else is checking for the process' exit... so check. - // We're currently holding the _gate lock, so we don't want to - // allow CheckForExit to block indefinitely. - CheckForExit(); - return _exited; - } + // If a timeout of 0 was supplied, then we simply need to poll + // to see if the process has already exited. + if (remainingTimeout == 0) + { + // If there's currently a wait-in-progress, then we know the other process + // hasn't exited (barring races and the polling interval). + if (_waitInProgress != null) + { + return false; + } - // The process has not yet exited (or at least we don't know it yet) - // so we need to wait for it to exit, outside of the lock. - // If there's already a wait in progress, we'll do so later - // by waiting on that existing task. Otherwise, we'll spin up - // such a task. - if (_waitInProgress != null) + // No one else is checking for the process' exit... so check. + // We're currently holding the _gate lock, so we don't want to + // allow CheckForNonChildExit to block indefinitely. + CheckForNonChildExit(); + return _exited; + } + + // The process has not yet exited (or at least we don't know it yet) + // so we need to wait for it to exit, outside of the lock. + // If there's already a wait in progress, we'll do so later + // by waiting on that existing task. Otherwise, we'll spin up + // such a task. + if (_waitInProgress != null) + { + waitTask = _waitInProgress; + } + else + { + createdTask = true; + CancellationToken token = remainingTimeout == Timeout.Infinite ? + CancellationToken.None : + (cts = new CancellationTokenSource(remainingTimeout)).Token; + waitTask = WaitForExitAsync(token); + } + } // lock(_gate) + + if (createdTask) { - waitTask = _waitInProgress; + // We created this task, and it'll get canceled automatically after our timeout. + // This Wait should only wake up when either the process has exited or the timeout + // has expired. Either way, we'll loop around again; if the process exited, that'll + // be caught first thing in the loop where we check _exited, and if it didn't exit, + // our remaining time will be zero, so we'll do a quick remaining check and bail. + waitTask.Wait(); + cts?.Dispose(); } else { - createdTask = true; - CancellationToken token = remainingTimeout == Timeout.Infinite ? - CancellationToken.None : - (cts = new CancellationTokenSource(remainingTimeout)).Token; - waitTask = WaitForExitAsync(token); - - // PERF NOTE: - // At the moment, we never call CheckForExit(true) (which in turn allows - // waitpid to block until the child has completed) because we currently call it while - // holding the _gate lock. This is probably unnecessary in some situations, and in particular - // here if remainingTimeout == Timeout.Infinite. In that case, we should be able to set - // _waitInProgress to be a TaskCompletionSource task, and then below outside of the lock - // we could do a CheckForExit(blockingAllowed:true) and complete the TaskCompletionSource - // after that. We would just need to make sure that there's no risk of the other state - // on this instance experiencing torn reads. + // It's someone else's task. We'll wait for it to complete. This could complete + // either because our remainingTimeout expired or because the task completed, + // which could happen because the process exited or because whoever created + // that task gave it a timeout. In any case, we'll loop around again, and the loop + // will catch these cases, potentially issuing another wait to make up any + // remaining time. + waitTask.Wait(remainingTimeout); } - } // lock(_gate) - - if (createdTask) - { - // We created this task, and it'll get canceled automatically after our timeout. - // This Wait should only wake up when either the process has exited or the timeout - // has expired. Either way, we'll loop around again; if the process exited, that'll - // be caught first thing in the loop where we check _exited, and if it didn't exit, - // our remaining time will be zero, so we'll do a quick remaining check and bail. - waitTask.Wait(); - cts?.Dispose(); } - else - { - // It's someone else's task. We'll wait for it to complete. This could complete - // either because our remainingTimeout expired or because the task completed, - // which could happen because the process exited or because whoever created - // that task gave it a timeout. In any case, we'll loop around again, and the loop - // will catch these cases, potentially issuing another wait to make up any - // remaining time. - waitTask.Wait(remainingTimeout); - } - } } @@ -464,8 +468,9 @@ namespace System.Diagnostics { Debug.Assert(Monitor.IsEntered(_gate)); Debug.Assert(_waitInProgress == null); + Debug.Assert(!_isChild); - return _waitInProgress = Task.Run(async delegate // Task.Run used because of potential blocking in CheckForExit + return _waitInProgress = Task.Run(async delegate // Task.Run used because of potential blocking in CheckForNonChildExit { // Arbitrary values chosen to balance delays with polling overhead. Start with fast polling // to handle quickly completing processes, but fall back to longer polling to minimize @@ -483,9 +488,9 @@ namespace System.Diagnostics { if (!_exited) { - CheckForExit(); + CheckForNonChildExit(); } - if (_exited) // may have been updated by CheckForExit + if (_exited) // may have been updated by CheckForNonChildExit { return; } @@ -511,5 +516,131 @@ namespace System.Diagnostics }); } + private bool TryReapChild() + { + lock (_gate) + { + if (_exited) + { + return false; + } + + // Try to get the state of the child process + int exitCode; + int waitResult = Interop.Sys.WaitPidExitedNoHang(_processId, out exitCode); + + if (waitResult == _processId) + { + _exitCode = exitCode; + + SetExited(); + return true; + } + else if (waitResult == 0) + { + // Process is still running + } + else + { + // Unexpected. + int errorCode = Marshal.GetLastWin32Error(); + Environment.FailFast("Error while reaping child. errno = " + errorCode); + } + return false; + } + } + + internal static void CheckChildren(bool reapAll) + { + // This is called on SIGCHLD from a native thread. + // A lock in Process ensures no new processes are spawned while we are checking. + lock (s_childProcessWaitStates) + { + bool checkAll = false; + + // Check terminated processes. + int pid; + do + { + // Find a process that terminated without reaping it yet. + pid = Interop.Sys.WaitIdAnyExitedNoHangNoWait(); + if (pid > 0) + { + if (s_childProcessWaitStates.TryGetValue(pid, out ProcessWaitState pws)) + { + // Known Process. + if (pws.TryReapChild()) + { + pws.ReleaseRef(); + } + } + else + { + // unlikely: This is not a managed Process, so we are not responsible for reaping. + // Fall back to checking all Processes. + checkAll = true; + break; + } + } + else if (pid == 0) + { + // No more terminated children. + } + else + { + // Unexpected. + int errorCode = Marshal.GetLastWin32Error(); + Environment.FailFast("Error while checking for terminated children. errno = " + errorCode); + } + } while (pid > 0); + + if (checkAll) + { + // We track things to unref so we don't invalidate our iterator by changing s_childProcessWaitStates. + ProcessWaitState firstToRemove = null; + List additionalToRemove = null; + foreach (KeyValuePair kv in s_childProcessWaitStates) + { + ProcessWaitState pws = kv.Value; + if (pws.TryReapChild()) + { + if (firstToRemove == null) + { + firstToRemove = pws; + } + else + { + if (additionalToRemove == null) + { + additionalToRemove = new List(); + } + additionalToRemove.Add(pws); + } + } + } + + if (firstToRemove != null) + { + firstToRemove.ReleaseRef(); + if (additionalToRemove != null) + { + foreach (ProcessWaitState pws in additionalToRemove) + { + pws.ReleaseRef(); + } + } + } + } + + if (reapAll) + { + do + { + int exitCode; + pid = Interop.Sys.WaitPidExitedNoHang(-1, out exitCode); + } while (pid > 0); + } + } + } } } diff --git a/external/corefx/src/System.Diagnostics.Process/tests/ProcessStartInfoTests.cs b/external/corefx/src/System.Diagnostics.Process/tests/ProcessStartInfoTests.cs index d028b3828f..dafe42f025 100644 --- a/external/corefx/src/System.Diagnostics.Process/tests/ProcessStartInfoTests.cs +++ b/external/corefx/src/System.Diagnostics.Process/tests/ProcessStartInfoTests.cs @@ -343,28 +343,21 @@ namespace System.Diagnostics.Tests } [Fact] - public void TestWorkingDirectoryProperty() + public void TestWorkingDirectoryPropertyDefaultCase() { CreateDefaultProcess(); - + // check defaults Assert.Equal(string.Empty, _process.StartInfo.WorkingDirectory); + } - Process p = CreateProcessLong(); - p.StartInfo.WorkingDirectory = Directory.GetCurrentDirectory(); - - try - { - p.Start(); - Assert.Equal(Directory.GetCurrentDirectory(), p.StartInfo.WorkingDirectory); - } - finally - { - if (!p.HasExited) - p.Kill(); - - Assert.True(p.WaitForExit(WaitInMS)); - } + [Fact] + public void TestWorkingDirectoryPropertyInChildProcess() + { + string workingDirectory = string.IsNullOrEmpty(Environment.SystemDirectory) ? TestDirectory : Environment.SystemDirectory ; + Assert.NotEqual(workingDirectory, Directory.GetCurrentDirectory()); + var psi = new ProcessStartInfo { WorkingDirectory = workingDirectory }; + RemoteInvoke(wd => { Assert.Equal(wd, Directory.GetCurrentDirectory()); return SuccessExitCode; }, workingDirectory, new RemoteInvokeOptions { StartInfo = psi }).Dispose(); } [ActiveIssue(12696)] @@ -498,7 +491,7 @@ namespace System.Diagnostics.Tests Assert.Equal("NewValue", kvpaOrdered[2].Value); psi.EnvironmentVariables.Remove("NewKey3"); - Assert.False(psi.Environment.Contains(new KeyValuePair("NewKey3", "NewValue3"))); + Assert.False(psi.Environment.Contains(new KeyValuePair("NewKey3", "NewValue3"))); } [Fact] @@ -603,7 +596,7 @@ namespace System.Diagnostics.Tests // modify the registry. return; } - + tempKey.Key.SetValue("", 123); var info = new ProcessStartInfo { FileName = FileName }; @@ -626,7 +619,7 @@ namespace System.Diagnostics.Tests // modify the registry. return; } - + tempKey.Key.SetValue("", "nosuchshell"); var info = new ProcessStartInfo { FileName = FileName }; @@ -653,7 +646,7 @@ namespace System.Diagnostics.Tests } extensionKey.Key.SetValue("", SubKeyValue); - + shellKey.Key.CreateSubKey("verb1"); shellKey.Key.CreateSubKey("NEW"); shellKey.Key.CreateSubKey("new"); @@ -746,7 +739,7 @@ namespace System.Diagnostics.Tests Assert.Throws(() => { string stringout = environmentVariables["NewKey99"]; - }); + }); //Exception not thrown with invalid key Assert.Throws(() => @@ -887,22 +880,12 @@ namespace System.Diagnostics.Tests [InlineData(null)] [InlineData("")] [InlineData("domain")] - [PlatformSpecific(TestPlatforms.Windows)] - public void UserName_SetWindows_GetReturnsExpected(string userName) + public void UserName_Set_GetReturnsExpected(string userName) { var info = new ProcessStartInfo { UserName = userName }; Assert.Equal(userName ?? string.Empty, info.UserName); } - [Fact] - [PlatformSpecific(TestPlatforms.AnyUnix)] - public void UserName_GetSetUnix_ThrowsPlatformNotSupportedException() - { - var info = new ProcessStartInfo(); - Assert.Throws(() => info.UserName); - Assert.Throws(() => info.UserName = "username"); - } - [Theory] [InlineData(null)] [InlineData("")] @@ -954,7 +937,10 @@ namespace System.Diagnostics.Tests FileName = @"http://www.microsoft.com" }; - Process.Start(info); // Returns null after navigating browser + using (var p = Process.Start(info)) + { + Assert.NotNull(p); + } } [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // No Notepad on Nano @@ -994,6 +980,7 @@ namespace System.Diagnostics.Tests } } } + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer), // Nano does not support UseShellExecute nameof(PlatformDetection.IsNotWindows8x))] // https://github.com/dotnet/corefx/issues/20388 [OuterLoop("Launches notepad")] @@ -1004,6 +991,9 @@ namespace System.Diagnostics.Tests [ActiveIssue("https://github.com/dotnet/corefx/issues/20204", TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] public void StartInfo_TextFile_ShellExecute() { + if (Thread.CurrentThread.CurrentCulture.ToString() != "en-US") + return; // [ActiveIssue(https://github.com/dotnet/corefx/issues/28953)] + string tempFile = GetTestFilePath() + ".txt"; File.WriteAllText(tempFile, $"StartInfo_TextFile_ShellExecute"); @@ -1085,7 +1075,6 @@ namespace System.Diagnostics.Tests return sb.ToString(); } - [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsWindowsNanoServer))] public void ShellExecute_Nano_Fails_Start() { @@ -1118,6 +1107,7 @@ namespace System.Diagnostics.Tests private const int ERROR_FILE_NOT_FOUND = 0x2; private const int ERROR_BAD_EXE_FORMAT = 0xC1; + [Theory] [MemberData(nameof(UseShellExecute))] [PlatformSpecific(TestPlatforms.Windows)] public void StartInfo_BadVerb(bool useShellExecute) @@ -1132,6 +1122,7 @@ namespace System.Diagnostics.Tests Assert.Equal(ERROR_FILE_NOT_FOUND, Assert.Throws(() => Process.Start(info)).NativeErrorCode); } + [Theory] [MemberData(nameof(UseShellExecute))] [PlatformSpecific(TestPlatforms.Windows)] public void StartInfo_BadExe(bool useShellExecute) diff --git a/external/corefx/src/System.Diagnostics.Process/tests/ProcessStartInfoTests.netcoreapp.cs b/external/corefx/src/System.Diagnostics.Process/tests/ProcessStartInfoTests.netcoreapp.cs new file mode 100644 index 0000000000..3d730f4152 --- /dev/null +++ b/external/corefx/src/System.Diagnostics.Process/tests/ProcessStartInfoTests.netcoreapp.cs @@ -0,0 +1,74 @@ +// 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.IO; +using Xunit; + +namespace System.Diagnostics.Tests +{ + public partial class ProcessStartInfoTests + { + [Fact] + public void UnintializedArgumentList() + { + ProcessStartInfo psi = new ProcessStartInfo(); + Assert.Equal(0, psi.ArgumentList.Count); + + psi = new ProcessStartInfo("filename", "-arg1 -arg2"); + Assert.Equal(0, psi.ArgumentList.Count); + } + + [Fact] + public void InitializeWithArgumentList() + { + ProcessStartInfo psi = new ProcessStartInfo("filename"); + psi.ArgumentList.Add("arg1"); + psi.ArgumentList.Add("arg2"); + + Assert.Equal(2, psi.ArgumentList.Count); + Assert.Equal("arg1", psi.ArgumentList[0]); + Assert.Equal("arg2", psi.ArgumentList[1]); + } + + [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // No Notepad on Nano + [MemberData(nameof(UseShellExecute))] + [OuterLoop("Launches notepad")] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "WaitForInputIdle, ProcessName, and MainWindowTitle are not supported on UAP")] + public void StartInfo_NotepadWithContent_withArgumentList(bool useShellExecute) + { + string tempFile = GetTestFilePath() + ".txt"; + File.WriteAllText(tempFile, $"StartInfo_NotepadWithContent({useShellExecute})"); + + ProcessStartInfo info = new ProcessStartInfo + { + UseShellExecute = useShellExecute, + FileName = @"notepad.exe", + Arguments = null, + WindowStyle = ProcessWindowStyle.Minimized + }; + + info.ArgumentList.Add(tempFile); + + using (var process = Process.Start(info)) + { + Assert.True(process != null, $"Could not start {info.FileName} {info.Arguments} UseShellExecute={info.UseShellExecute}"); + + try + { + process.WaitForInputIdle(); // Give the file a chance to load + Assert.Equal("notepad", process.ProcessName); + + // On some Windows versions, the file extension is not included in the title + Assert.StartsWith(Path.GetFileNameWithoutExtension(tempFile), process.MainWindowTitle); + } + finally + { + if (process != null && !process.HasExited) + process.Kill(); + } + } + } + } +} diff --git a/external/corefx/src/System.Diagnostics.Process/tests/ProcessTestBase.NonUap.cs b/external/corefx/src/System.Diagnostics.Process/tests/ProcessTestBase.NonUap.cs index 3af496e8d1..3ce842e0e5 100644 --- a/external/corefx/src/System.Diagnostics.Process/tests/ProcessTestBase.NonUap.cs +++ b/external/corefx/src/System.Diagnostics.Process/tests/ProcessTestBase.NonUap.cs @@ -15,7 +15,12 @@ namespace System.Diagnostics.Tests protected Process CreateProcessLong() { - return CreateProcess(RemotelyInvokable.LongWait); + return CreateSleepProcess(RemotelyInvokable.WaitInMS); + } + + protected Process CreateSleepProcess(int durationMs) + { + return CreateProcess(RemotelyInvokable.Sleep, durationMs.ToString()); } protected Process CreateProcessPortable(Func func) diff --git a/external/corefx/src/System.Diagnostics.Process/tests/ProcessTestBase.Uap.cs b/external/corefx/src/System.Diagnostics.Process/tests/ProcessTestBase.Uap.cs index 7b38bce3c5..b8f32f9360 100644 --- a/external/corefx/src/System.Diagnostics.Process/tests/ProcessTestBase.Uap.cs +++ b/external/corefx/src/System.Diagnostics.Process/tests/ProcessTestBase.Uap.cs @@ -16,7 +16,12 @@ namespace System.Diagnostics.Tests protected Process CreateProcessLong() { - return CreateProcessForUap(RemotelyInvokable.LongWait); + return CreateSleepProcess(RemotelyInvokable.WaitInMS); + } + + protected Process CreateSleepProcess(int durationMs) + { + return CreateProcessForUap(RemotelyInvokable.Sleep, durationMs.ToString()); } protected Process CreateProcessPortable(Func func) @@ -60,9 +65,9 @@ namespace System.Diagnostics.Tests throw new Exception($"Method needs to be defined in {nameof(RemotelyInvokable)} class."); } - if (method.Name == nameof(RemotelyInvokable.LongWait)) + if (method.Name == nameof(RemotelyInvokable.Sleep)) { - return CreateLongWaitingProcess(); + return CreateSleepProcess(int.Parse(args[0])); } MethodInfo uapMethod = GetMethodForUap(method); @@ -80,21 +85,5 @@ namespace System.Diagnostics.Tests AddProcessForDispose(p); return p; } - - private Process CreateLongWaitingProcess() - { - // timeout.exe does not work as expected on uap - var p = new Process() - { - StartInfo = new ProcessStartInfo() - { - FileName = RunnerName, - Arguments = "/K" - } - }; - - AddProcessForDispose(p); - return p; - } } } diff --git a/external/corefx/src/System.Diagnostics.Process/tests/ProcessTestBase.cs b/external/corefx/src/System.Diagnostics.Process/tests/ProcessTestBase.cs index 55dd145af3..7ed082dd5d 100644 --- a/external/corefx/src/System.Diagnostics.Process/tests/ProcessTestBase.cs +++ b/external/corefx/src/System.Diagnostics.Process/tests/ProcessTestBase.cs @@ -51,14 +51,24 @@ namespace System.Diagnostics.Tests protected Process CreateProcess(Func method = null) { - Process p = RemoteInvoke(method ?? (() => SuccessExitCode), new RemoteInvokeOptions { Start = false }).Process; + Process p = null; + using (RemoteInvokeHandle handle = RemoteInvoke(method ?? (() => SuccessExitCode), new RemoteInvokeOptions { Start = false })) + { + p = handle.Process; + handle.Process = null; + } AddProcessForDispose(p); return p; } protected Process CreateProcess(Func method, string arg) { - Process p = RemoteInvoke(method, arg, new RemoteInvokeOptions { Start = false }).Process; + Process p = null; + using (RemoteInvokeHandle handle = RemoteInvoke(method, arg, new RemoteInvokeOptions { Start = false })) + { + p = handle.Process; + handle.Process = null; + } AddProcessForDispose(p); return p; } diff --git a/external/corefx/src/System.Diagnostics.Process/tests/ProcessTests.Unix.cs b/external/corefx/src/System.Diagnostics.Process/tests/ProcessTests.Unix.cs index e6ccb41268..226aa0e273 100644 --- a/external/corefx/src/System.Diagnostics.Process/tests/ProcessTests.Unix.cs +++ b/external/corefx/src/System.Diagnostics.Process/tests/ProcessTests.Unix.cs @@ -2,12 +2,15 @@ // 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.Collections; using System.Collections.Generic; using System.ComponentModel; using System.IO; using System.Linq; +using System.Reflection; using System.Runtime.InteropServices; using System.Threading; +using System.Threading.Tasks; using System.Security; using Xunit; using Xunit.NetCore.Extensions; @@ -101,6 +104,25 @@ namespace System.Diagnostics.Tests } } + [Fact] + [OuterLoop] + public void ProcessStart_UseShellExecute_OnUnix_OpenMissingFile_DoesNotThrow() + { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && + s_allowedProgramsToRun.FirstOrDefault(program => IsProgramInstalled(program)) == null) + { + return; + } + string fileToOpen = Path.Combine(Environment.CurrentDirectory, "_no_such_file.TXT"); + using (var px = Process.Start(new ProcessStartInfo { UseShellExecute = true, FileName = fileToOpen })) + { + Assert.NotNull(px); + px.Kill(); + px.WaitForExit(); + Assert.True(px.HasExited); + } + } + [Theory, InlineData(true), InlineData(false)] [OuterLoop("Opens program")] public void ProcessStart_UseShellExecute_OnUnix_SuccessWhenProgramInstalled(bool isFolder) @@ -133,7 +155,7 @@ namespace System.Diagnostics.Tests } } - [Theory, InlineData("nano"), InlineData("vi")] + [Theory, InlineData("vi")] [PlatformSpecific(TestPlatforms.Linux)] [OuterLoop("Opens program")] public void ProcessStart_OpenFileOnLinux_UsesSpecifiedProgram(string programToOpenWith) @@ -156,6 +178,31 @@ namespace System.Diagnostics.Tests } } + [Theory, InlineData("vi")] + [PlatformSpecific(TestPlatforms.Linux)] + [OuterLoop("Opens program")] + public void ProcessStart_OpenFileOnLinux_UsesSpecifiedProgramUsingArgumentList(string programToOpenWith) + { + if (IsProgramInstalled(programToOpenWith)) + { + string fileToOpen = GetTestFilePath() + ".txt"; + File.WriteAllText(fileToOpen, $"{nameof(ProcessStart_OpenFileOnLinux_UsesSpecifiedProgramUsingArgumentList)}"); + ProcessStartInfo psi = new ProcessStartInfo(programToOpenWith); + psi.ArgumentList.Add(fileToOpen); + using (var px = Process.Start(psi)) + { + Assert.Equal(programToOpenWith, px.ProcessName); + px.Kill(); + px.WaitForExit(); + Assert.True(px.HasExited); + } + } + else + { + Console.WriteLine($"Program specified to open file with {programToOpenWith} is not installed on this machine."); + } + } + [Theory, InlineData("/usr/bin/open"), InlineData("/usr/bin/nano")] [PlatformSpecific(TestPlatforms.OSX)] [OuterLoop("Opens program")] @@ -202,6 +249,34 @@ namespace System.Diagnostics.Tests } } + public static TheoryData StartOSXProcessWithArgumentList => new TheoryData + { + { new string[] { "-a", "Safari" } }, + { new string[] { "-a", "\"Google Chrome\"" } } + }; + + [Theory, + MemberData(nameof(StartOSXProcessWithArgumentList))] + [PlatformSpecific(TestPlatforms.OSX)] + [OuterLoop("Opens browser")] + public void ProcessStart_UseShellExecuteTrue_OpenUrl_SuccessfullyReadsArgument(string[] argumentList) + { + var startInfo = new ProcessStartInfo { UseShellExecute = true, FileName = "https://github.com/dotnet/corefx"}; + + foreach (string item in argumentList) + { + startInfo.ArgumentList.Add(item); + } + + using (var px = Process.Start(startInfo)) + { + Assert.NotNull(px); + px.Kill(); + px.WaitForExit(); + Assert.True(px.HasExited); + } + } + [Fact] [Trait(XunitConstants.Category, XunitConstants.RequiresElevation)] public void TestPriorityClassUnix() @@ -304,9 +379,341 @@ namespace System.Diagnostics.Tests } } + [Fact] + public void TestStartWithNonExistingUserThrows() + { + Process p = CreateProcessPortable(RemotelyInvokable.Dummy); + p.StartInfo.UserName = "DoesNotExist"; + Assert.Throws(() => p.Start()); + } + + [Fact] + public void TestExitCodeKilledChild() + { + using (Process p = CreateProcessLong()) + { + p.Start(); + p.Kill(); + p.WaitForExit(); + + // SIGKILL may change per platform + const int SIGKILL = 9; // Linux, macOS, FreeBSD, ... + Assert.Equal(128 + SIGKILL, p.ExitCode); + } + } + + /// + /// Tests when running as a normal user and starting a new process as the same user + /// works as expected. + /// + [Fact] + public void TestStartWithNormalUser() + { + TestStartWithUserName(GetCurrentRealUserName()); + } + + /// + /// Tests when running as root and starting a new process as a normal user, + /// the new process doesn't have elevated privileges. + /// + [Fact] + [OuterLoop("Needs sudo access")] + [Trait(XunitConstants.Category, XunitConstants.RequiresElevation)] + public void TestStartWithRootUser() + { + RunTestAsSudo(TestStartWithUserName, GetCurrentRealUserName()); + } + + public static int TestStartWithUserName(string realUserName) + { + Assert.NotNull(realUserName); + Assert.NotEqual("root", realUserName); + + using (ProcessTests testObject = new ProcessTests()) + { + using (Process p = testObject.CreateProcessPortable(GetCurrentEffectiveUserId)) + { + p.StartInfo.UserName = realUserName; + Assert.True(p.Start()); + + p.WaitForExit(); + + // since the process was started with the current real user, even if this test + // was run with 'sudo', the child process will be run as the normal real user. + // Assert that the effective user of the child process was never 'root' + // and was the real user of this process. + Assert.NotEqual(0, p.ExitCode); + } + + return 0; + } + } + + public static int GetCurrentEffectiveUserId() + { + return (int)geteuid(); + } + + private static string GetCurrentRealUserName() + { + string realUserName = geteuid() == 0 ? + Environment.GetEnvironmentVariable("SUDO_USER") : + Environment.UserName; + + Assert.NotNull(realUserName); + Assert.NotEqual("root", realUserName); + + return realUserName; + } + + /// + /// Tests when running as root and starting a new process as a normal user, + /// the new process can't elevate back to root. + /// + [Fact] + [OuterLoop("Needs sudo access")] + [Trait(XunitConstants.Category, XunitConstants.RequiresElevation)] + public void TestStartWithRootUserCannotElevate() + { + RunTestAsSudo(TestStartWithUserNameCannotElevate, GetCurrentRealUserName()); + } + + /// + /// Tests whether child processes are reaped (cleaning up OS resources) + /// when they terminate. + /// + [Fact] + [PlatformSpecific(TestPlatforms.Linux)] // Test uses Linux specific '/proc' filesystem + public async Task TestChildProcessCleanup() + { + using (Process process = CreateShortProcess()) + { + process.Start(); + bool processReaped = await TryWaitProcessReapedAsync(process.Id, timeoutMs: 30000); + Assert.True(processReaped); + } + } + + /// + /// Tests whether child processes are reaped (cleaning up OS resources) + /// when they terminate after the Process was Disposed. + /// + [Theory] + [InlineData(false, false)] + [InlineData(false, true)] + [InlineData(true, false)] + [InlineData(true, true)] + [PlatformSpecific(TestPlatforms.Linux)] // Test uses Linux specific '/proc' filesystem + public async Task TestChildProcessCleanupAfterDispose(bool shortProcess, bool enableEvents) + { + // We test using a long and short process. The long process will terminate after Dispose, + // The short process will terminate at the same time, possibly revealing race conditions. + int processId = -1; + using (Process process = shortProcess ? CreateShortProcess() : CreateSleepProcess(durationMs: 500)) + { + process.Start(); + processId = process.Id; + if (enableEvents) + { + // Dispose will disable the Exited event. + // We enable it to check this doesn't cause issues for process reaping. + process.EnableRaisingEvents = true; + } + } + bool processReaped = await TryWaitProcessReapedAsync(processId, timeoutMs: 30000); + Assert.True(processReaped); + } + + private static Process CreateShortProcess() + { + Process process = new Process(); + process.StartInfo.FileName = "uname"; + return process; + } + + private static async Task TryWaitProcessReapedAsync(int pid, int timeoutMs) + { + const int SleepTimeMs = 50; + // When the process is reaped, the '/proc/' directory to disappears. + bool procPidExists = true; + for (int attempt = 0; attempt < (timeoutMs / SleepTimeMs); attempt++) + { + procPidExists = Directory.Exists("/proc/" + pid); + if (procPidExists) + { + await Task.Delay(SleepTimeMs); + } + else + { + break; + } + } + return !procPidExists; + } + + /// + /// Tests the ProcessWaitState reference count drops to zero. + /// + [Fact] + [PlatformSpecific(TestPlatforms.AnyUnix)] // Test validates Unix implementation + public async Task TestProcessWaitStateReferenceCount() + { + using (var exitedEventSemaphore = new SemaphoreSlim(0, 1)) + { + object waitState = null; + int processId = -1; + // Process takes a reference + using (var process = CreateShortProcess()) + { + process.EnableRaisingEvents = true; + // Exited event takes a reference + process.Exited += (o,e) => exitedEventSemaphore.Release(); + process.Start(); + + processId = process.Id; + waitState = GetProcessWaitState(process); + + process.WaitForExit(); + + Assert.False(GetWaitStateDictionary(childDictionary: false).Contains(processId)); + Assert.True(GetWaitStateDictionary(childDictionary: true).Contains(processId)); + } + exitedEventSemaphore.Wait(); + + // Child reaping holds a reference too + int referenceCount = -1; + const int SleepTimeMs = 50; + for (int i = 0; i < (30000 / SleepTimeMs); i++) + { + referenceCount = GetWaitStateReferenceCount(waitState); + if (referenceCount == 0) + { + break; + } + else + { + // Process was reaped but ProcessWaitState not unrefed yet + await Task.Delay(SleepTimeMs); + } + } + Assert.Equal(0, referenceCount); + + Assert.Equal(0, GetWaitStateReferenceCount(waitState)); + Assert.False(GetWaitStateDictionary(childDictionary: false).Contains(processId)); + Assert.False(GetWaitStateDictionary(childDictionary: true).Contains(processId)); + } + } + + /// + /// Verifies a new Process instance can refer to a process with a recycled pid + /// for which there is still an existing Process instance. + /// + [ConditionalFact(typeof(TestEnvironment), nameof(TestEnvironment.IsStressModeEnabled))] + public void TestProcessRecycledPid() + { + const int LinuxPidMaxDefault = 32768; + var processes = new Dictionary(LinuxPidMaxDefault); + bool foundRecycled = false; + for (int i = 0; i < int.MaxValue; i++) + { + var process = CreateProcessLong(); + process.Start(); + + foundRecycled = processes.ContainsKey(process.Id); + + process.Kill(); + process.WaitForExit(); + + if (foundRecycled) + { + break; + } + else + { + processes.Add(process.Id, process); + } + } + + Assert.True(foundRecycled); + } + + private static IDictionary GetWaitStateDictionary(bool childDictionary) + { + Assembly assembly = typeof(Process).Assembly; + Type waitStateType = assembly.GetType("System.Diagnostics.ProcessWaitState"); + FieldInfo dictionaryField = waitStateType.GetField(childDictionary ? "s_childProcessWaitStates" : "s_processWaitStates", BindingFlags.NonPublic | BindingFlags.Static); + return (IDictionary)dictionaryField.GetValue(null); + } + + private static object GetProcessWaitState(Process p) + { + MethodInfo getWaitState = typeof(Process).GetMethod("GetWaitState", BindingFlags.NonPublic | BindingFlags.Instance); + return getWaitState.Invoke(p, null); + } + + private static int GetWaitStateReferenceCount(object waitState) + { + FieldInfo referenCountField = waitState.GetType().GetField("_outstandingRefCount", BindingFlags.NonPublic | BindingFlags.Instance); + return (int)referenCountField.GetValue(waitState); + } + + public static int TestStartWithUserNameCannotElevate(string realUserName) + { + Assert.NotNull(realUserName); + Assert.NotEqual("root", realUserName); + + using (ProcessTests testObject = new ProcessTests()) + { + using (Process p = testObject.CreateProcessPortable(SetEffectiveUserIdToRoot)) + { + p.StartInfo.UserName = realUserName; + Assert.True(p.Start()); + + p.WaitForExit(); + + // seteuid(0) should not have succeeded, thus the exit code should be non-zero + Assert.NotEqual(0, p.ExitCode); + } + + return 0; + } + } + + public static int SetEffectiveUserIdToRoot() + { + return seteuid(0); + } + + private void RunTestAsSudo(Func testMethod, string arg) + { + RemoteInvokeOptions options = new RemoteInvokeOptions() + { + Start = false, + RunAsSudo = true + }; + Process p = null; + using (RemoteInvokeHandle handle = RemoteInvoke(testMethod, arg, options)) + { + p = handle.Process; + handle.Process = null; + } + AddProcessForDispose(p); + + p.Start(); + p.WaitForExit(); + + Assert.Equal(0, p.ExitCode); + } + [DllImport("libc")] private static extern int chmod(string path, int mode); - private readonly string[] s_allowedProgramsToRun = new string[] { "xdg-open", "gnome-open", "kfmclient" }; + [DllImport("libc")] + private static extern uint geteuid(); + + [DllImport("libc")] + private static extern int seteuid(uint euid); + + private static readonly string[] s_allowedProgramsToRun = new string[] { "xdg-open", "gnome-open", "kfmclient" }; } } diff --git a/external/corefx/src/System.Diagnostics.Process/tests/ProcessTests.cs b/external/corefx/src/System.Diagnostics.Process/tests/ProcessTests.cs index 1dbd3f5385..fd6641c935 100644 --- a/external/corefx/src/System.Diagnostics.Process/tests/ProcessTests.cs +++ b/external/corefx/src/System.Diagnostics.Process/tests/ProcessTests.cs @@ -122,19 +122,19 @@ namespace System.Diagnostics.Tests [Fact] public void ProcessStart_TryExitCommandAsFileName_ThrowsWin32Exception() { - Win32Exception e = Assert.Throws(() => Process.Start(new ProcessStartInfo { UseShellExecute = false, FileName = "exit", Arguments = "42" })); + Assert.Throws(() => Process.Start(new ProcessStartInfo { UseShellExecute = false, FileName = "exit", Arguments = "42" })); } [Fact] public void ProcessStart_UseShellExecuteFalse_FilenameIsUrl_ThrowsWin32Exception() { - Win32Exception e = Assert.Throws(() => Process.Start(new ProcessStartInfo { UseShellExecute = false, FileName = "https://www.github.com/corefx" })); + Assert.Throws(() => Process.Start(new ProcessStartInfo { UseShellExecute = false, FileName = "https://www.github.com/corefx" })); } [Fact] public void ProcessStart_TryOpenFolder_UseShellExecuteIsFalse_ThrowsWin32Exception() { - Win32Exception e = Assert.Throws(() => Process.Start(new ProcessStartInfo { UseShellExecute = false, FileName = Path.GetTempPath() })); + Assert.Throws(() => Process.Start(new ProcessStartInfo { UseShellExecute = false, FileName = Path.GetTempPath() })); } [Fact] @@ -176,13 +176,12 @@ namespace System.Diagnostics.Tests [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.HasWindowsShell))] [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "not supported on UAP")] [OuterLoop("Launches File Explorer")] - public void ProcessStart_UseShellExecuteTrue_OpenMissingFile_Throws() + public void ProcessStart_UseShellExecute_OnWindows_OpenMissingFile_Throws() { string fileToOpen = Path.Combine(Environment.CurrentDirectory, "_no_such_file.TXT"); - Win32Exception e = Assert.Throws(() => Process.Start(new ProcessStartInfo { UseShellExecute = true, FileName = fileToOpen })); + Assert.Throws(() => Process.Start(new ProcessStartInfo { UseShellExecute = true, FileName = fileToOpen })); } - [PlatformSpecific(TestPlatforms.Windows)] [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.HasWindowsShell))] [InlineData(true)] [InlineData(false)] @@ -686,7 +685,7 @@ namespace System.Diagnostics.Tests [Fact] public void TestProcessStartTime() { - TimeSpan allowedWindow = TimeSpan.FromSeconds(1); + TimeSpan allowedWindow = TimeSpan.FromSeconds(3); for (int i = 0; i < 2; i++) { @@ -716,6 +715,20 @@ namespace System.Diagnostics.Tests } } + [Fact] + [PlatformSpecific(~TestPlatforms.OSX)] + public void ProcessStartTime_Deterministic_Across_Instances() + { + CreateDefaultProcess(); + for (int i = 0; i < 10; ++i) + { + using (var p = Process.GetProcessById(_process.Id)) + { + Assert.Equal(_process.StartTime, p.StartTime); + } + } + } + [Fact] public void ExitTime_GetNotStarted_ThrowsInvalidOperationException() { @@ -922,9 +935,11 @@ namespace System.Diagnostics.Tests } [Fact] + [ActiveIssue(26720, TargetFrameworkMonikers.Uap)] public void GetProcesses_InvalidMachineName_ThrowsInvalidOperationException() { - Assert.Throws(() => Process.GetProcesses(Guid.NewGuid().ToString())); + Type exceptionType = PlatformDetection.IsWindows ? typeof(InvalidOperationException) : typeof(PlatformNotSupportedException); + Assert.Throws(exceptionType, () => Process.GetProcesses(Guid.NewGuid().ToString())); } [Fact] @@ -1609,19 +1624,20 @@ namespace System.Diagnostics.Tests [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Retrieving information about local processes is not supported on uap")] public void Process_StartTest() { - string currentProcessName = GetCurrentProcessName(); + string name = "xcopy.exe"; string userName = string.Empty; string domain = "thisDomain"; SecureString password = AsSecureString("Value"); - Process p = Process.Start(currentProcessName, userName, password, domain); // This writes junk to the Console but with this overload, we can't prevent that. - Assert.NotNull(p); - Assert.Equal(currentProcessName, p.StartInfo.FileName); - Assert.Equal(userName, p.StartInfo.UserName); - Assert.Same(password, p.StartInfo.Password); - Assert.Equal(domain, p.StartInfo.Domain); - - Assert.True(p.WaitForExit(WaitInMS)); + using (Process p = Process.Start(name, userName, password, domain)) // This writes junk to the Console but with this overload, we can't prevent that. + { + Assert.NotNull(p); + Assert.Equal(name, p.StartInfo.FileName); + Assert.Equal(userName, p.StartInfo.UserName); + Assert.Same(password, p.StartInfo.Password); + Assert.Equal(domain, p.StartInfo.Domain); + Assert.True(p.WaitForExit(WaitInMS)); + } password.Dispose(); } @@ -1635,15 +1651,16 @@ namespace System.Diagnostics.Tests string domain = Environment.UserDomainName; string arguments = "-xml testResults.xml"; SecureString password = AsSecureString("Value"); - - Process p = Process.Start(currentProcessName, arguments, userName, password, domain); - Assert.NotNull(p); - Assert.Equal(currentProcessName, p.StartInfo.FileName); - Assert.Equal(arguments, p.StartInfo.Arguments); - Assert.Equal(userName, p.StartInfo.UserName); - Assert.Same(password, p.StartInfo.Password); - Assert.Equal(domain, p.StartInfo.Domain); - p.Kill(); + using (Process p = Process.Start(currentProcessName, arguments, userName, password, domain)) + { + Assert.NotNull(p); + Assert.Equal(currentProcessName, p.StartInfo.FileName); + Assert.Equal(arguments, p.StartInfo.Arguments); + Assert.Equal(userName, p.StartInfo.UserName); + Assert.Same(password, p.StartInfo.Password); + Assert.Equal(domain, p.StartInfo.Domain); + p.Kill(); + } password.Dispose(); } diff --git a/external/corefx/src/System.Diagnostics.Process/tests/ProcessTests.netcoreapp.cs b/external/corefx/src/System.Diagnostics.Process/tests/ProcessTests.netcoreapp.cs index 9ef9cbdd4e..f0bbd00d17 100644 --- a/external/corefx/src/System.Diagnostics.Process/tests/ProcessTests.netcoreapp.cs +++ b/external/corefx/src/System.Diagnostics.Process/tests/ProcessTests.netcoreapp.cs @@ -2,11 +2,7 @@ // 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; -using System.Collections.Generic; -using System.Linq; using System.Text; -using System.Threading.Tasks; using Xunit; namespace System.Diagnostics.Tests @@ -40,5 +36,88 @@ namespace System.Diagnostics.Tests Assert.Same(encoding, process.StandardInput.Encoding); } + + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] + public void StartProcessWithArgumentList() + { + ProcessStartInfo psi = new ProcessStartInfo(GetCurrentProcessName()); + psi.ArgumentList.Add("arg1"); + psi.ArgumentList.Add("arg2"); + + Process testProcess = CreateProcess(); + testProcess.StartInfo = psi; + + try + { + testProcess.Start(); + Assert.Equal(string.Empty, testProcess.StartInfo.Arguments); + } + finally + { + if (!testProcess.HasExited) + testProcess.Kill(); + + Assert.True(testProcess.WaitForExit(WaitInMS)); + } + } + + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] + public void StartProcessWithSameArgumentList() + { + ProcessStartInfo psi = new ProcessStartInfo(GetCurrentProcessName()); + psi.ArgumentList.Add("arg1"); + psi.ArgumentList.Add("arg2"); + + Process testProcess = CreateProcess(); + Process secondTestProcess = CreateProcess(); + testProcess.StartInfo = psi; + try + { + testProcess.Start(); + Assert.Equal(string.Empty, testProcess.StartInfo.Arguments); + secondTestProcess.StartInfo = psi; + secondTestProcess.Start(); + Assert.Equal(string.Empty, secondTestProcess.StartInfo.Arguments); + } + finally + { + if (!testProcess.HasExited) + testProcess.Kill(); + + Assert.True(testProcess.WaitForExit(WaitInMS)); + + if (!secondTestProcess.HasExited) + secondTestProcess.Kill(); + + Assert.True(testProcess.WaitForExit(WaitInMS)); + } + } + + [Fact] + public void BothArgumentCtorAndArgumentListSet() + { + ProcessStartInfo psi = new ProcessStartInfo(GetCurrentProcessName(), "arg3"); + psi.ArgumentList.Add("arg1"); + psi.ArgumentList.Add("arg2"); + + Process testProcess = CreateProcess(); + testProcess.StartInfo = psi; + Assert.Throws(() => testProcess.Start()); + } + + [Fact] + public void BothArgumentSetAndArgumentListSet() + { + ProcessStartInfo psi = new ProcessStartInfo(GetCurrentProcessName()); + psi.Arguments = "arg3"; + psi.ArgumentList.Add("arg1"); + psi.ArgumentList.Add("arg2"); + + Process testProcess = CreateProcess(); + testProcess.StartInfo = psi; + Assert.Throws(() => testProcess.Start()); + } } } diff --git a/external/corefx/src/System.Diagnostics.Process/tests/ProcessThreadTests.cs b/external/corefx/src/System.Diagnostics.Process/tests/ProcessThreadTests.cs index cda6074d3f..df00d40b03 100644 --- a/external/corefx/src/System.Diagnostics.Process/tests/ProcessThreadTests.cs +++ b/external/corefx/src/System.Diagnostics.Process/tests/ProcessThreadTests.cs @@ -90,7 +90,7 @@ namespace System.Diagnostics.Tests [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Retrieving information about local processes is not supported on uap")] public async Task TestStartTimeProperty() { - TimeSpan allowedWindow = TimeSpan.FromSeconds(1); + TimeSpan allowedWindow = TimeSpan.FromSeconds(2); using (Process p = Process.GetCurrentProcess()) { @@ -129,7 +129,8 @@ namespace System.Diagnostics.Tests p.Refresh(); try { - Assert.Contains(p.Threads.Cast(), t => t.StartTime.ToUniversalTime() >= curTime - allowedWindow); + var newest = p.Threads.Cast().OrderBy(t => t.StartTime.ToUniversalTime()).Last(); + Assert.InRange(newest.StartTime.ToUniversalTime(), curTime - allowedWindow, DateTime.Now.ToUniversalTime() + allowedWindow); } catch (InvalidOperationException) { diff --git a/external/corefx/src/System.Diagnostics.Process/tests/RemotelyInvokable.cs b/external/corefx/src/System.Diagnostics.Process/tests/RemotelyInvokable.cs index 4d0ba8d3d5..0b0b93991a 100644 --- a/external/corefx/src/System.Diagnostics.Process/tests/RemotelyInvokable.cs +++ b/external/corefx/src/System.Diagnostics.Process/tests/RemotelyInvokable.cs @@ -35,9 +35,9 @@ namespace System.Diagnostics.Tests return SuccessExitCode; } - public static int LongWait() + public static int Sleep(string duration) { - Thread.Sleep(WaitInMS); + Thread.Sleep(int.Parse(duration)); return SuccessExitCode; } diff --git a/external/corefx/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj b/external/corefx/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj index fd381bccd9..c427fd0ddc 100644 --- a/external/corefx/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj +++ b/external/corefx/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj @@ -6,6 +6,10 @@ true $(DefineConstants);TargetsWindows + + + + @@ -45,6 +49,7 @@ + @@ -54,5 +59,17 @@ RemoteExecutorConsoleApp + + + + Common\System\PasteArguments.Windows.cs + + + + + + Common\System\PasteArguments.Unix.cs + + \ No newline at end of file diff --git a/external/corefx/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj b/external/corefx/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj index 39130ab370..3e0635d18e 100644 --- a/external/corefx/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj +++ b/external/corefx/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj @@ -35,7 +35,7 @@ - + @@ -57,4 +57,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/System.Diagnostics.StackTrace/src/System/Diagnostics/StackTraceSymbols.CoreCLR.cs b/external/corefx/src/System.Diagnostics.StackTrace/src/System/Diagnostics/StackTraceSymbols.CoreCLR.cs index 3542fdbeaf..29dad032dd 100644 --- a/external/corefx/src/System.Diagnostics.StackTrace/src/System/Diagnostics/StackTraceSymbols.CoreCLR.cs +++ b/external/corefx/src/System.Diagnostics.StackTrace/src/System/Diagnostics/StackTraceSymbols.CoreCLR.cs @@ -2,7 +2,7 @@ // 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.Collections.Generic; +using System.Collections.Concurrent; using System.IO; using System.Reflection.Metadata; using System.Reflection.Metadata.Ecma335; @@ -12,14 +12,14 @@ namespace System.Diagnostics { internal class StackTraceSymbols : IDisposable { - private readonly Dictionary _metadataCache; + private readonly ConcurrentDictionary _metadataCache; /// /// Create an instance of this class. /// public StackTraceSymbols() { - _metadataCache = new Dictionary(); + _metadataCache = new ConcurrentDictionary(); } /// @@ -29,7 +29,7 @@ namespace System.Diagnostics { foreach (MetadataReaderProvider provider in _metadataCache.Values) { - provider.Dispose(); + provider?.Dispose(); } _metadataCache.Clear(); @@ -123,20 +123,21 @@ namespace System.Diagnostics MetadataReaderProvider provider; if (_metadataCache.TryGetValue(cacheKey, out provider)) { - return provider.GetMetadataReader(); + return provider?.GetMetadataReader(); } provider = (inMemoryPdbAddress != IntPtr.Zero) ? TryOpenReaderForInMemoryPdb(inMemoryPdbAddress, inMemoryPdbSize) : TryOpenReaderFromAssemblyFile(assemblyPath, loadedPeAddress, loadedPeSize); + // This may fail as another thread might have beaten us to it, but it doesn't matter + _metadataCache.TryAdd(cacheKey, provider); + if (provider == null) { return null; } - _metadataCache.Add(cacheKey, provider); - // The reader has already been open, so this doesn't throw: return provider.GetMetadataReader(); } diff --git a/external/corefx/src/System.Diagnostics.StackTrace/tests/StackFrameTests.cs b/external/corefx/src/System.Diagnostics.StackTrace/tests/StackFrameTests.cs index 4587f058e0..5fb5edaa5d 100644 --- a/external/corefx/src/System.Diagnostics.StackTrace/tests/StackFrameTests.cs +++ b/external/corefx/src/System.Diagnostics.StackTrace/tests/StackFrameTests.cs @@ -85,6 +85,7 @@ namespace System.Diagnostics.Tests [InlineData(null, StackFrame.OFFSET_UNKNOWN)] [InlineData("", 0)] [InlineData("FileName", 1)] + [ActiveIssue(28853, TargetFrameworkMonikers.NetFramework)] public void Ctor_Filename_LineNumber(string fileName, int lineNumber) { var stackFrame = new StackFrame(fileName, lineNumber); @@ -99,6 +100,7 @@ namespace System.Diagnostics.Tests [InlineData(null, StackFrame.OFFSET_UNKNOWN, 0)] [InlineData("", 0, StackFrame.OFFSET_UNKNOWN)] [InlineData("FileName", 1, 2)] + [ActiveIssue(28853, TargetFrameworkMonikers.NetFramework)] public void Ctor_Filename_LineNumber_ColNumber(string fileName, int lineNumber, int columnNumber) { var stackFrame = new StackFrame(fileName, lineNumber, columnNumber); diff --git a/external/corefx/src/System.Diagnostics.StackTrace/tests/StackTraceTests.cs b/external/corefx/src/System.Diagnostics.StackTrace/tests/StackTraceTests.cs index fcd19de108..d703b1c79b 100644 --- a/external/corefx/src/System.Diagnostics.StackTrace/tests/StackTraceTests.cs +++ b/external/corefx/src/System.Diagnostics.StackTrace/tests/StackTraceTests.cs @@ -274,20 +274,20 @@ namespace System.Diagnostics.Tests { // Debug mode and Release mode give different results. #if DEBUG - yield return new object[] { new StackTrace(InvokeException()), " at System.Diagnostics.Tests.StackTraceTests.ThrowException()" }; + yield return new object[] { new StackTrace(InvokeException()), "System.Diagnostics.Tests.StackTraceTests.ThrowException()" }; yield return new object[] { new StackTrace(new Exception()), "" }; - yield return new object[] { NoParameters(), " at System.Diagnostics.Tests.StackTraceTests.NoParameters()" }; - yield return new object[] { OneParameter(1), " at System.Diagnostics.Tests.StackTraceTests.OneParameter(Int32 x)" }; - yield return new object[] { TwoParameters(1, null), " at System.Diagnostics.Tests.StackTraceTests.TwoParameters(Int32 x, String y)" }; - yield return new object[] { Generic(), " at System.Diagnostics.Tests.StackTraceTests.Generic[T]()" }; - yield return new object[] { Generic(), " at System.Diagnostics.Tests.StackTraceTests.Generic[T,U]()" }; - yield return new object[] { new ClassWithConstructor().StackTrace, " at System.Diagnostics.Tests.StackTraceTests.ClassWithConstructor..ctor()" }; + yield return new object[] { NoParameters(), "System.Diagnostics.Tests.StackTraceTests.NoParameters()" }; + yield return new object[] { OneParameter(1), "System.Diagnostics.Tests.StackTraceTests.OneParameter(Int32 x)" }; + yield return new object[] { TwoParameters(1, null), "System.Diagnostics.Tests.StackTraceTests.TwoParameters(Int32 x, String y)" }; + yield return new object[] { Generic(), "System.Diagnostics.Tests.StackTraceTests.Generic[T]()" }; + yield return new object[] { Generic(), "System.Diagnostics.Tests.StackTraceTests.Generic[T,U]()" }; + yield return new object[] { new ClassWithConstructor().StackTrace, "System.Diagnostics.Tests.StackTraceTests.ClassWithConstructor..ctor()" }; // Methods belonging to the System.Diagnostics namespace are ignored. - yield return new object[] { InvokeIgnoredMethod(), " at System.Diagnostics.Tests.StackTraceTests.InvokeIgnoredMethod()" }; + yield return new object[] { InvokeIgnoredMethod(), "System.Diagnostics.Tests.StackTraceTests.InvokeIgnoredMethod()" }; #endif - yield return new object[] { InvokeIgnoredMethodWithException(), " at System.Diagnostics.Ignored.MethodWithException()" }; + yield return new object[] { InvokeIgnoredMethodWithException(), "System.Diagnostics.Ignored.MethodWithException()" }; } [Fact] @@ -309,7 +309,7 @@ namespace System.Diagnostics.Tests else { string toString = stackTrace.ToString(); - Assert.StartsWith(expectedToString, toString); + Assert.Contains(expectedToString, toString); Assert.EndsWith(Environment.NewLine, toString); string[] frames = toString.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries); diff --git a/external/corefx/src/System.Diagnostics.TextWriterTraceListener/src/FxCopBaseline.cs b/external/corefx/src/System.Diagnostics.TextWriterTraceListener/src/FxCopBaseline.cs index 9be0eb534a..d7c7e4f0a4 100644 --- a/external/corefx/src/System.Diagnostics.TextWriterTraceListener/src/FxCopBaseline.cs +++ b/external/corefx/src/System.Diagnostics.TextWriterTraceListener/src/FxCopBaseline.cs @@ -1,3 +1,7 @@ +// 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.CodeAnalysis; [assembly: SuppressMessage("Microsoft.Reliability", "CA2002:DoNotLockOnObjectsWithWeakIdentity", Scope = "member", Target = "System.Diagnostics.DelimitedListTraceListener.#set_Delimiter(System.String)")] diff --git a/external/corefx/src/System.Diagnostics.TraceSource/src/FxCopBaseline.cs b/external/corefx/src/System.Diagnostics.TraceSource/src/FxCopBaseline.cs index 8a2b79b4a3..89cdfb87de 100644 --- a/external/corefx/src/System.Diagnostics.TraceSource/src/FxCopBaseline.cs +++ b/external/corefx/src/System.Diagnostics.TraceSource/src/FxCopBaseline.cs @@ -1,3 +1,7 @@ +// 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.CodeAnalysis; [assembly: SuppressMessage("Microsoft.Reliability", "CA2002:DoNotLockOnObjectsWithWeakIdentity", Scope = "member", Target = "System.Diagnostics.TraceInternal.#Flush()")] diff --git a/external/corefx/src/System.Diagnostics.TraceSource/src/System/Diagnostics/TraceInternal.cs b/external/corefx/src/System.Diagnostics.TraceSource/src/System/Diagnostics/TraceInternal.cs index 6638d2a1f6..8291d995b6 100644 --- a/external/corefx/src/System.Diagnostics.TraceSource/src/System/Diagnostics/TraceInternal.cs +++ b/external/corefx/src/System.Diagnostics.TraceSource/src/System/Diagnostics/TraceInternal.cs @@ -56,7 +56,7 @@ namespace System.Diagnostics { if (s_appName == null) { - s_appName = Assembly.GetEntryAssembly().GetName().Name; + s_appName = Assembly.GetEntryAssembly()?.GetName().Name ?? string.Empty; } return s_appName; } diff --git a/external/corefx/src/System.Diagnostics.TraceSource/tests/TraceClassTests.cs b/external/corefx/src/System.Diagnostics.TraceSource/tests/TraceClassTests.cs index c5d6b9b926..d6b2787ee0 100644 --- a/external/corefx/src/System.Diagnostics.TraceSource/tests/TraceClassTests.cs +++ b/external/corefx/src/System.Diagnostics.TraceSource/tests/TraceClassTests.cs @@ -354,7 +354,16 @@ namespace System.Diagnostics.TraceSourceTests [Fact] public void TraceTest02() { + String newLine = Environment.NewLine; var textTL = new TestTextTraceListener(); + Trace.Listeners.Clear(); + Trace.Listeners.Add(textTL); + Trace.IndentLevel = 0; + Trace.Fail(""); + textTL.Flush(); + var fail = textTL.Output.TrimEnd(newLine.ToCharArray()); + + textTL = new TestTextTraceListener(); // We have to clear the listeners list on Trace since there is a trace listener by default with AssertUiEnabled = true in Desktop and that will pop up an assert window with Trace.Fail Trace.Listeners.Clear(); Trace.Listeners.Add(textTL); @@ -377,8 +386,8 @@ namespace System.Diagnostics.TraceSourceTests Trace.Unindent(); Trace.WriteLine("Message end."); textTL.Flush(); - String newLine = Environment.NewLine; - var expected = "Message start." + newLine + " This message should be indented.This should not be indented." + newLine + " Fail: This failure is reported with a detailed message" + newLine + " Fail: " + newLine + " Fail: This assert is reported" + newLine + "Message end." + newLine; + newLine = Environment.NewLine; + var expected = "Message start." + newLine + " This message should be indented.This should not be indented." + newLine + " " + fail + "This failure is reported with a detailed message" + newLine + " " + fail + newLine + " " + fail + "This assert is reported" + newLine + "Message end." + newLine; Assert.Equal(expected, textTL.Output); } } diff --git a/external/corefx/src/System.Diagnostics.TraceSource/tests/TraceEventCacheClassTests.cs b/external/corefx/src/System.Diagnostics.TraceSource/tests/TraceEventCacheClassTests.cs index 2ff2864e5e..832ba7208c 100644 --- a/external/corefx/src/System.Diagnostics.TraceSource/tests/TraceEventCacheClassTests.cs +++ b/external/corefx/src/System.Diagnostics.TraceSource/tests/TraceEventCacheClassTests.cs @@ -60,7 +60,7 @@ namespace System.Diagnostics.TraceSourceTests public void CallstackTest_ContainsExpectedFrames() { var cache = new TraceEventCache(); - Assert.Contains("at System.Environment.get_StackTrace()", cache.Callstack); + Assert.Contains("System.Environment.get_StackTrace()", cache.Callstack); } [Fact] diff --git a/external/corefx/src/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln b/external/corefx/src/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln index f8890b0fe9..5c15363217 100644 --- a/external/corefx/src/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln +++ b/external/corefx/src/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7E0E1B11-FF70-461E-99F7-C0AF252C0C60}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU - {7E0E1B11-FF70-461E-99F7-C0AF252C0C60}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU - {7E0E1B11-FF70-461E-99F7-C0AF252C0C60}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU - {7E0E1B11-FF70-461E-99F7-C0AF252C0C60}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU + {7E0E1B11-FF70-461E-99F7-C0AF252C0C60}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU + {7E0E1B11-FF70-461E-99F7-C0AF252C0C60}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU + {7E0E1B11-FF70-461E-99F7-C0AF252C0C60}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU + {7E0E1B11-FF70-461E-99F7-C0AF252C0C60}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU {EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU {EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU {EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU diff --git a/external/corefx/src/System.Diagnostics.Tracing/src/System/Diagnostics/Tracing/EventCounter.cs b/external/corefx/src/System.Diagnostics.Tracing/src/System/Diagnostics/Tracing/EventCounter.cs index 88ab685723..fdc05c5c69 100644 --- a/external/corefx/src/System.Diagnostics.Tracing/src/System/Diagnostics/Tracing/EventCounter.cs +++ b/external/corefx/src/System.Diagnostics.Tracing/src/System/Diagnostics/Tracing/EventCounter.cs @@ -407,7 +407,24 @@ namespace System.Diagnostics.Tracing _pollingIntervalInMilliseconds = (int)(pollingIntervalInSeconds * 1000); DisposeTimer(); _timeStampSinceCollectionStarted = DateTime.UtcNow; - _pollingTimer = new Timer(OnTimer, null, _pollingIntervalInMilliseconds, _pollingIntervalInMilliseconds); + // Don't capture the current ExecutionContext and its AsyncLocals onto the timer causing them to live forever + bool restoreFlow = false; + try + { + if (!ExecutionContext.IsFlowSuppressed()) + { + ExecutionContext.SuppressFlow(); + restoreFlow = true; + } + + _pollingTimer = new Timer(s => ((EventCounterGroup)s).OnTimer(null), this, _pollingIntervalInMilliseconds, _pollingIntervalInMilliseconds); + } + finally + { + // Restore the current ExecutionContext + if (restoreFlow) + ExecutionContext.RestoreFlow(); + } } // Always fire the timer event (so you see everything up to this time). OnTimer(null); diff --git a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/FuzzyTests.cs.REMOVED.git-id b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/FuzzyTests.cs.REMOVED.git-id index 4f7403c86d..bf1704a006 100644 --- a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/FuzzyTests.cs.REMOVED.git-id +++ b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/FuzzyTests.cs.REMOVED.git-id @@ -1 +1 @@ -bb586b47b4037bb121d1552ff1fceefad32b929c \ No newline at end of file +d149194d014719351966086d13bc2f8dcd7b84a7 \ No newline at end of file diff --git a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/Harness/EventTestHarness.cs b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/Harness/EventTestHarness.cs index fc1b1de920..70af9720f3 100644 --- a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/Harness/EventTestHarness.cs +++ b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/Harness/EventTestHarness.cs @@ -141,7 +141,7 @@ namespace BasicEventSourceTests } catch (Exception e) { - if (e is EventSourceException) + if ((e is EventSourceException) && (e.InnerException != null)) e = e.InnerException; LogWriteLine("Exception thrown: {0}", e.Message); diff --git a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/Harness/Listeners.cs b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/Harness/Listeners.cs index e56fc8b2b2..061dc25f00 100644 --- a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/Harness/Listeners.cs +++ b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/Harness/Listeners.cs @@ -2,7 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. +#if USE_ETW +using Microsoft.Diagnostics.Tracing; using Microsoft.Diagnostics.Tracing.Session; #endif using System; @@ -136,14 +137,14 @@ namespace BasicEventSourceTests { if (i != 0) sb.Append(','); - sb.Append(PayloadString(i, null)); + sb.Append(PayloadString(i, PayloadNames[i])); } sb.Append(')'); return sb.ToString(); } } -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. +#if USE_ETW /**************************************************************************/ /* Concrete implementation of the Listener abstraction */ @@ -165,7 +166,7 @@ namespace BasicEventSourceTests // Today you have to be Admin to turn on ETW events (anyone can write ETW events). if (TraceEventSession.IsElevated() != true) { - throw new ApplicationException("Need to be elevated to run. "); + throw new Exception("Need to be elevated to run. "); } if (dataFileName == null) @@ -214,6 +215,12 @@ namespace BasicEventSourceTests public override void Dispose() { + if(_disposed) + { + return; + } + + _disposed = true; _session.Flush(); Thread.Sleep(1010); // Let it drain. _session.Dispose(); // This also will kill the real time thread @@ -225,7 +232,6 @@ namespace BasicEventSourceTests Debug.WriteLine("Processing data file " + Path.GetFullPath(_dataFileName)); // Parse all the events as best we can, and also send unhandled events there as well. - traceEventSource.Registered.All += OnEventHelper; traceEventSource.Dynamic.All += OnEventHelper; traceEventSource.UnhandledEvents += OnEventHelper; // Process all the events in the file. @@ -238,12 +244,23 @@ namespace BasicEventSourceTests #region private private void OnEventHelper(TraceEvent data) { + // Ignore EventTrace events. + if (data.ProviderGuid == EventTraceProviderID) + return; + + // Ignore kernel events. + if (data.ProviderGuid == KernelProviderID) + return; + // Ignore manifest events. if ((int)data.ID == 0xFFFE) return; this.OnEvent(new EtwEvent(data)); } + private static readonly Guid EventTraceProviderID = new Guid("9e814aad-3204-11d2-9a82-006008a86939"); + private static readonly Guid KernelProviderID = new Guid("9e814aad-3204-11d2-9a82-006008a86939"); + /// /// EtwEvent implements the 'Event' abstraction for ETW events (it has a TraceEvent in it) /// @@ -273,6 +290,7 @@ namespace BasicEventSourceTests #endregion } + private bool _disposed; private string _dataFileName; private volatile TraceEventSession _session; #endregion @@ -334,6 +352,12 @@ namespace BasicEventSourceTests public override void Dispose() { + if (_disposed) + { + return; + } + + _disposed = true; EventTestHarness.LogWriteLine("Disposing Listener"); _listener.Dispose(); } @@ -438,5 +462,7 @@ namespace BasicEventSourceTests return _data.Payload[propertyIndex]; } } + + private bool _disposed; } } diff --git a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/LoudListener.cs b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/LoudListener.cs index 7f26da5868..88801bccda 100644 --- a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/LoudListener.cs +++ b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/LoudListener.cs @@ -30,5 +30,10 @@ namespace BasicEventSourceTests Debug.Write(string.Format(" (activity {0}{1}) ", eventData.ActivityId, eventData.RelatedActivityId != null ? "->" + eventData.RelatedActivityId : "")); Debug.WriteLine(string.Format(" ({0}).", eventData.Payload != null ? string.Join(", ", eventData.Payload) : "")); } + + public static EventWrittenEventArgs LastEvent + { + get { return t_lastEvent; } + } } } diff --git a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestEventCounter.cs b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestEventCounter.cs index cbd86c5e84..f8396e2c69 100644 --- a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestEventCounter.cs +++ b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestEventCounter.cs @@ -8,7 +8,7 @@ using Microsoft.Diagnostics.Tracing; #else using System.Diagnostics.Tracing; #endif -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue https://github.com/dotnet/corefx/issues/4864 +#if USE_ETW using Microsoft.Diagnostics.Tracing.Session; #endif using Xunit; @@ -25,6 +25,12 @@ namespace BasicEventSourceTests { public class TestEventCounter { +#if USE_ETW + // Specifies whether the process is elevated or not. + private static readonly Lazy s_isElevated = new Lazy(() => AdminHelpers.IsProcessElevated()); + private static bool IsProcessElevated => s_isElevated.Value; +#endif // USE_ETW + private sealed class MyEventSource : EventSource { private EventCounter _requestCounter; @@ -52,6 +58,7 @@ namespace BasicEventSourceTests [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, reason: "https://github.com/dotnet/corefx/issues/23661")] #endif [ActiveIssue("https://github.com/dotnet/corefx/issues/22791", TargetFrameworkMonikers.UapAot)] + [ActiveIssue("https://github.com/dotnet/corefx/issues/25029")] public void Test_Write_Metric_EventListener() { using (var listener = new EventListenerListener()) @@ -61,7 +68,8 @@ namespace BasicEventSourceTests } #if USE_ETW - [Fact] + [ConditionalFact(nameof(IsProcessElevated))] + [ActiveIssue("https://github.com/dotnet/corefx/issues/27106")] public void Test_Write_Metric_ETW() { diff --git a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestShutdown.cs b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestShutdown.cs index b88408d1cd..d02791f070 100644 --- a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestShutdown.cs +++ b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestShutdown.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -13,7 +14,8 @@ using Microsoft.Diagnostics.Tracing; using System.Diagnostics.Tracing; #endif using Xunit; -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. +#if USE_ETW +using Microsoft.Diagnostics.Tracing; using Microsoft.Diagnostics.Tracing.Session; #endif using System.IO; @@ -23,7 +25,9 @@ namespace BasicEventSourceTests { public class TestShutdown { -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. + + // TODO: Depends on desktop APIs (AppDomainSetup and Evidence). +#if USE_ETW && FALSE /// /// Test for manifest event being logged during AD/Process shutdown during EventSource Dispose(bool) method. /// @@ -89,7 +93,6 @@ namespace BasicEventSourceTests }; // Parse all the events as best we can, and also send unhandled events there as well. - traceEventSource.Registered.All += onEvent; traceEventSource.Dynamic.All += onEvent; traceEventSource.UnhandledEvent += onEvent; traceEventSource.Process(); diff --git a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestUtilities.cs b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestUtilities.cs index 42970594d2..8ef33bc161 100644 --- a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestUtilities.cs +++ b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestUtilities.cs @@ -15,6 +15,10 @@ namespace BasicEventSourceTests { internal class TestUtilities { + // Specifies whether the process is elevated or not. + private static readonly Lazy s_isElevated = new Lazy(() => AdminHelpers.IsProcessElevated()); + internal static bool IsProcessElevated => s_isElevated.Value; + /// /// Confirms that there are no EventSources running. /// diff --git a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsManifestNegative.cs b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsManifestNegative.cs index 922168d8b8..a23f456437 100644 --- a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsManifestNegative.cs +++ b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsManifestNegative.cs @@ -104,9 +104,9 @@ namespace BasicEventSourceTests () => EventSource.GenerateManifest(typeof(Sdt.TooManyChannelsEventSource), string.Empty)); #endif -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. - e = AssertExtensions.Throws(GetResourceString("EventSource_EventWithAdminChannelMustHaveMessage", "WriteInteger", "Admin"), - () => EventSource.GenerateManifest(typeof(Sdt.EventWithAdminChannelNoMessageEventSource), string.Empty, strictOptions)); +#if USE_ETW + e = AssertExtensions.Throws(null, () => EventSource.GenerateManifest(typeof(Sdt.EventWithAdminChannelNoMessageEventSource), string.Empty, strictOptions)); + AsserExceptionStringsEqual(() => GetResourceString("EventSource_EventWithAdminChannelMustHaveMessage", "WriteInteger", "Admin"), e); #endif // USE_ETW e = AssertExtensions.Throws(null, () => EventSource.GenerateManifest(typeof(Sdt.ReservedOpcodeEventSource), string.Empty, strictOptions)); diff --git a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsUserErrors.cs b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsUserErrors.cs index 046b5e4935..5070cf7900 100644 --- a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsUserErrors.cs +++ b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsUserErrors.cs @@ -74,35 +74,39 @@ namespace BasicEventSourceTests [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Depends on inspecting IL at runtime.")] public void Test_BadEventSource_MismatchedIds() { -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. +#if USE_ETW // We expect only one session to be on when running the test but if a ETW session was left - // hanging, it will confuse the EventListener tests. - EtwListener.EnsureStopped(); + // hanging, it will confuse the EventListener tests. + if(TestUtilities.IsProcessElevated) + { + EtwListener.EnsureStopped(); + } #endif // USE_ETW TestUtilities.CheckNoEventSourcesRunning("Start"); var onStartups = new bool[] { false, true }; - - var listenerGenerators = new Func[] - { - () => new EventListenerListener(), -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. - () => new EtwListener() + + var listenerGenerators = new List>(); + listenerGenerators.Add(() => new EventListenerListener()); +#if USE_ETW + if(TestUtilities.IsProcessElevated) + { + listenerGenerators.Add(() => new EtwListener()); + } #endif // USE_ETW - }; - var settings = new EventSourceSettings[] { EventSourceSettings.Default, EventSourceSettings.EtwSelfDescribingEventFormat }; + var settings = new EventSourceSettings[] { EventSourceSettings.Default, EventSourceSettings.EtwSelfDescribingEventFormat }; - // For every interesting combination, run the test and see that we get a nice failure message. - foreach (bool onStartup in onStartups) + // For every interesting combination, run the test and see that we get a nice failure message. + foreach (bool onStartup in onStartups) + { + foreach (Func listenerGenerator in listenerGenerators) + { + foreach (EventSourceSettings setting in settings) { - foreach (Func listenerGenerator in listenerGenerators) - { - foreach (EventSourceSettings setting in settings) - { - Test_Bad_EventSource_Startup(onStartup, listenerGenerator(), setting); - } - } + Test_Bad_EventSource_Startup(onStartup, listenerGenerator(), setting); + } + } } TestUtilities.CheckNoEventSourcesRunning("Stop"); diff --git a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWrite.cs b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWrite.cs index 5743bbe8d8..e7c037bed7 100644 --- a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWrite.cs +++ b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWrite.cs @@ -13,7 +13,7 @@ using Microsoft.Diagnostics.Tracing; using System.Diagnostics.Tracing; #endif using Xunit; -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. +#if USE_ETW using Microsoft.Diagnostics.Tracing.Session; #endif using System.Diagnostics; @@ -32,6 +32,12 @@ namespace BasicEventSourceTests public class TestsWrite { +#if USE_ETW + // Specifies whether the process is elevated or not. + private static readonly Lazy s_isElevated = new Lazy(() => AdminHelpers.IsProcessElevated()); + private static bool IsProcessElevated => s_isElevated.Value; +#endif // USE_ETW + [EventData] private struct PartB_UserInfo { @@ -63,12 +69,12 @@ namespace BasicEventSourceTests Test_Write_T(new EventListenerListener(true)); } -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. +#if USE_ETW /// /// Tests the EventSource.Write[T] method (can only use the self-describing mechanism). /// Tests the ETW code path /// - [Fact] + [ConditionalFact(nameof(IsProcessElevated))] public void Test_Write_T_ETW() { using (var listener = new EtwListener()) @@ -380,6 +386,27 @@ namespace BasicEventSourceTests Assert.Equal(evt.PayloadValue(1, "b"), ""); })); +#if USE_ETW + // This test only applies to ETW and will fail on EventListeners due to different behavior + // for strings with embedded NULL characters. + if (listener is EtwListener) + { + tests.Add(new SubTest("Write/Basic/WriteOfTWithEmbeddedNullString", + delegate () + { + string nullString = null; + logger.Write("EmbeddedNullStringEvent", new { a = "Hello" + '\0' + "World!", b = nullString }); + }, + delegate (Event evt) + { + Assert.Equal(logger.Name, evt.ProviderName); + Assert.Equal("EmbeddedNullStringEvent", evt.EventName); + Assert.Equal(evt.PayloadValue(0, "a"), "Hello"); + Assert.Equal(evt.PayloadValue(1, "b"), ""); + })); + } +#endif // USE_ETW + Guid activityId = new Guid("00000000-0000-0000-0000-000000000001"); Guid relActivityId = new Guid("00000000-0000-0000-0000-000000000002"); tests.Add(new SubTest("Write/Basic/WriteOfTWithOptios", @@ -414,21 +441,25 @@ namespace BasicEventSourceTests /// [Fact] [ActiveIssue("dotnet/corefx #18806", TargetFrameworkMonikers.NetFramework)] + [ActiveIssue("https://github.com/dotnet/corefx/issues/27106")] public void Test_Write_T_In_Manifest_Serialization() { using (var eventListener = new EventListenerListener()) { -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. - using (var etwListener = new EtwListener()) +#if USE_ETW + EtwListener etwListener = null; #endif + try { - var listenerGenerators = new Func[] + var listenerGenerators = new List>(); + listenerGenerators.Add(() => eventListener); +#if USE_ETW + if(IsProcessElevated) { - () => eventListener, -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. - () => etwListener + etwListener = new EtwListener(); + listenerGenerators.Add(() => etwListener); + } #endif // USE_ETW - }; foreach (Func listenerGenerator in listenerGenerators) { @@ -453,6 +484,15 @@ namespace BasicEventSourceTests Assert.Equal("hi", (string)_event.PayloadValue(1, "arg2")); } } + finally + { +#if USE_ETW + if(etwListener != null) + { + etwListener.Dispose(); + } +#endif // USE_ETW + } } } diff --git a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWriteEvent.cs b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWriteEvent.cs index 080f6d7242..173fa3eb9a 100644 --- a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWriteEvent.cs +++ b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWriteEvent.cs @@ -24,12 +24,16 @@ namespace BasicEventSourceTests { public class TestsWriteEvent { -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. +#if USE_ETW + // Specifies whether the process is elevated or not. + private static readonly Lazy s_isElevated = new Lazy(() => AdminHelpers.IsProcessElevated()); + private static bool IsProcessElevated => s_isElevated.Value; + /// /// Tests WriteEvent using the manifest based mechanism. /// Tests the ETW path. /// - [Fact] + [ConditionalFact(nameof(IsProcessElevated))] public void Test_WriteEvent_Manifest_ETW() { using (var listener = new EtwListener()) @@ -62,12 +66,12 @@ namespace BasicEventSourceTests { Test_WriteEvent(new EventListenerListener(true), false); } -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. +#if USE_ETW /// /// Tests WriteEvent using the self-describing mechanism. /// Tests both the ETW and TraceListener paths. /// - [Fact] + [ConditionalFact(nameof(IsProcessElevated))] public void Test_WriteEvent_SelfDescribing_ETW() { using (var listener = new EtwListener()) @@ -156,23 +160,26 @@ namespace BasicEventSourceTests Assert.Equal(evt.PayloadValue(0, "arg1"), "one"); Assert.Equal(evt.PayloadValue(1, "arg2"), "two"); })); -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. +#if USE_ETW /*************************************************************************/ - tests.Add(new SubTest("Write/Basic/EventWithManyTypeArgs", - delegate () - { - logger.EventWithManyTypeArgs("Hello", 1, 2, 3, 'a', 4, 5, 6, 7, - (float)10.0, (double)11.0, logger.Guid); - }, - delegate (Event evt) - { - Assert.Equal(logger.Name, evt.ProviderName); - Assert.Equal("EventWithManyTypeArgs", evt.EventName); - Assert.Equal("Hello", evt.PayloadValue(0, "msg")); - Assert.Equal((float)10.0, evt.PayloadValue(9, "f")); - Assert.Equal((double)11.0, evt.PayloadValue(10, "d")); - Assert.Equal(logger.Guid, evt.PayloadValue(11, "guid")); - })); + if(IsProcessElevated) + { + tests.Add(new SubTest("Write/Basic/EventWithManyTypeArgs", + delegate () + { + logger.EventWithManyTypeArgs("Hello", 1, 2, 3, 'a', 4, 5, 6, 7, + (float)10.0, (double)11.0, logger.Guid); + }, + delegate (Event evt) + { + Assert.Equal(logger.Name, evt.ProviderName); + Assert.Equal("EventWithManyTypeArgs", evt.EventName); + Assert.Equal("Hello", evt.PayloadValue(0, "msg")); + Assert.Equal((float)10.0, evt.PayloadValue(9, "f")); + Assert.Equal((double)11.0, evt.PayloadValue(10, "d")); + Assert.Equal(logger.Guid, evt.PayloadValue(11, "guid")); + })); + } #endif // USE_ETW /*************************************************************************/ tests.Add(new SubTest("Write/Basic/EventWith7Strings", @@ -200,29 +207,32 @@ namespace BasicEventSourceTests Assert.Equal("s0", (string)evt.PayloadValue(0, "s0")); Assert.Equal("s8", (string)evt.PayloadValue(8, "s8")); })); -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. +#if USE_ETW /*************************************************************************/ - tests.Add(new SubTest("Write/Activity/EventWithXferWeirdArgs", - delegate () - { - var actid = Guid.NewGuid(); - logger.EventWithXferWeirdArgs(actid, - (IntPtr)128, - true, - SdtEventSources.MyLongEnum.LongVal1); - }, - delegate (Event evt) - { - Assert.Equal(logger.Name, evt.ProviderName); + if(IsProcessElevated) + { + tests.Add(new SubTest("Write/Activity/EventWithXferWeirdArgs", + delegate () + { + var actid = Guid.NewGuid(); + logger.EventWithXferWeirdArgs(actid, + (IntPtr)128, + true, + SdtEventSources.MyLongEnum.LongVal1); + }, + delegate (Event evt) + { + Assert.Equal(logger.Name, evt.ProviderName); - // We log EventWithXferWeirdArgs in one case and - // WorkWeirdArgs/Send in the other - Assert.True(evt.EventName.Contains("WeirdArgs")); + // We log EventWithXferWeirdArgs in one case and + // WorkWeirdArgs/Send in the other + Assert.True(evt.EventName.Contains("WeirdArgs")); - Assert.Equal("128", evt.PayloadValue(0, "iptr").ToString()); - Assert.Equal(true, (bool)evt.PayloadValue(1, "b")); - Assert.Equal((long)SdtEventSources.MyLongEnum.LongVal1, (long)evt.PayloadValue(2, "le")); - })); + Assert.Equal("128", evt.PayloadValue(0, "iptr").ToString()); + Assert.Equal(true, (bool)evt.PayloadValue(1, "b")); + Assert.Equal((long)SdtEventSources.MyLongEnum.LongVal1, ((IConvertible)evt.PayloadValue(2, "le")).ToInt64(null)); + })); + } #endif // USE_ETW /*************************************************************************/ /*************************** ENUM TESTING *******************************/ @@ -239,7 +249,7 @@ namespace BasicEventSourceTests Assert.Equal(logger.Name, evt.ProviderName); Assert.Equal("EventEnum", evt.EventName); - Assert.Equal(1, (int)evt.PayloadValue(0, "x")); + Assert.Equal(1, ((IConvertible)evt.PayloadValue(0, "x")).ToInt32(null)); if (evt.IsEtw && !useSelfDescribingEvents) Assert.Equal("Blue", evt.PayloadString(0, "x")); })); @@ -254,7 +264,7 @@ namespace BasicEventSourceTests Assert.Equal(logger.Name, evt.ProviderName); Assert.Equal("EventEnum1", evt.EventName); - Assert.Equal(1, (int)evt.PayloadValue(0, "x")); + Assert.Equal(1, ((IConvertible)evt.PayloadValue(0, "x")).ToInt32(null)); if (evt.IsEtw && !useSelfDescribingEvents) Assert.Equal("Blue", evt.PayloadString(0, "x")); })); @@ -363,7 +373,12 @@ namespace BasicEventSourceTests Assert.Equal("", evt.PayloadValue(2, null)); })); - if (useSelfDescribingEvents) + // Self-describing ETW does not support NULL arguments. + if (useSelfDescribingEvents +#if USE_ETW + && !(listener is EtwListener) +#endif // USE_ETW + ) { tests.Add(new SubTest("WriteEvent/Basic/EventVarArgsWithString", delegate () { logger.EventVarArgsWithString(1, 2, 12, null); }, @@ -430,12 +445,12 @@ namespace BasicEventSourceTests } } -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. +#if USE_ETW /// /// Tests sending complex data (class, arrays etc) from WriteEvent /// Tests the EventListener case /// - [Fact] + [ConditionalFact(nameof(IsProcessElevated))] public void Test_WriteEvent_ComplexData_SelfDescribing_ETW() { using (var listener = new EtwListener()) @@ -519,13 +534,13 @@ namespace BasicEventSourceTests Test_WriteEvent_ByteArray(false, new EventListenerListener(true)); } -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. +#if USE_ETW /// /// Tests sending complex data (class, arrays etc) from WriteEvent /// Uses Manifest format /// Tests the EventListener case /// - [Fact] + [ConditionalFact(nameof(IsProcessElevated))] public void Test_WriteEvent_ByteArray_Manifest_ETW() { using (var listener = new EtwListener()) @@ -549,13 +564,13 @@ namespace BasicEventSourceTests } } -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. +#if USE_ETW /// /// Tests sending complex data (class, arrays etc) from WriteEvent /// Uses Self-Describing format /// Tests the EventListener case /// - [Fact] + [ConditionalFact(nameof(IsProcessElevated))] public void Test_WriteEvent_ByteArray_SelfDescribing_ETW() { using (var listener = new EtwListener()) @@ -647,6 +662,8 @@ namespace BasicEventSourceTests Assert.Equal(1000, (long)evt.PayloadValue(1, "lng")); })); + /* TODO: NULL byte array does not seem to be supported. + * An EventSourceMessage event is written for this case. tests.Add(new SubTest("Write/Array/EventWithNullByteArray", delegate () { @@ -664,6 +681,7 @@ namespace BasicEventSourceTests Assert.Equal(0, (int)evt.PayloadValue(1, "n")); } })); + */ tests.Add(new SubTest("Write/Array/EventWithEmptyByteArray", delegate () diff --git a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWriteEventToListener.cs b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWriteEventToListener.cs index 4cbc1c20d1..3278fe67b7 100644 --- a/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWriteEventToListener.cs +++ b/external/corefx/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWriteEventToListener.cs @@ -19,6 +19,12 @@ namespace BasicEventSourceTests { public class TestsWriteEventToListener { +#if USE_ETW + // Specifies whether the process is elevated or not. + private static readonly Lazy s_isElevated = new Lazy(() => AdminHelpers.IsProcessElevated()); + private static bool IsProcessElevated => s_isElevated.Value; +#endif // USE_ETW + [Fact] [ActiveIssue("dotnet/corefx #19462", TargetFrameworkMonikers.NetFramework)] public void Test_WriteEvent_ArgsBasicTypes() @@ -38,7 +44,7 @@ namespace BasicEventSourceTests Assert.Equal(1, LoudListener.t_lastEvent.EventId); Assert.Equal(0, LoudListener.t_lastEvent.Payload.Count); - #region Validate "int" arguments +#region Validate "int" arguments log.EventI(10); Assert.Equal(2, LoudListener.t_lastEvent.EventId); Assert.Equal(1, LoudListener.t_lastEvent.Payload.Count); @@ -56,9 +62,9 @@ namespace BasicEventSourceTests Assert.Equal(10, (int)LoudListener.t_lastEvent.Payload[0]); Assert.Equal(11, (int)LoudListener.t_lastEvent.Payload[1]); Assert.Equal(12, (int)LoudListener.t_lastEvent.Payload[2]); - #endregion +#endregion - #region Validate "long" arguments +#region Validate "long" arguments log.EventL(10); Assert.Equal(5, LoudListener.t_lastEvent.EventId); Assert.Equal(1, LoudListener.t_lastEvent.Payload.Count); @@ -77,9 +83,9 @@ namespace BasicEventSourceTests Assert.Equal(11, (long)LoudListener.t_lastEvent.Payload[1]); Assert.Equal(12, (long)LoudListener.t_lastEvent.Payload[2]); - #endregion +#endregion - #region Validate "string" arguments +#region Validate "string" arguments log.EventS("10"); Assert.Equal(8, LoudListener.t_lastEvent.EventId); Assert.Equal(1, LoudListener.t_lastEvent.Payload.Count); @@ -97,17 +103,17 @@ namespace BasicEventSourceTests Assert.Equal("10", (string)LoudListener.t_lastEvent.Payload[0]); Assert.Equal("11", (string)LoudListener.t_lastEvent.Payload[1]); Assert.Equal("12", (string)LoudListener.t_lastEvent.Payload[2]); - #endregion +#endregion - #region Validate byte array arguments +#region Validate byte array arguments byte[] arr = new byte[20]; log.EventWithByteArray(arr); Assert.Equal(52, LoudListener.t_lastEvent.EventId); Assert.Equal(1, LoudListener.t_lastEvent.Payload.Count); Assert.Equal(arr.Length, ((byte[])LoudListener.t_lastEvent.Payload[0]).Length); - #endregion +#endregion - #region Validate mixed type arguments +#region Validate mixed type arguments log.EventSI("10", 11); Assert.Equal(11, LoudListener.t_lastEvent.EventId); Assert.Equal(2, LoudListener.t_lastEvent.Payload.Count); @@ -126,9 +132,9 @@ namespace BasicEventSourceTests Assert.Equal("10", (string)LoudListener.t_lastEvent.Payload[0]); Assert.Equal(11, (int)LoudListener.t_lastEvent.Payload[1]); Assert.Equal(12, (int)LoudListener.t_lastEvent.Payload[2]); - #endregion +#endregion - #region Validate enums/flags +#region Validate enums/flags log.EventEnum(MyColor.Blue); Assert.Equal(19, LoudListener.t_lastEvent.EventId); Assert.Equal(1, LoudListener.t_lastEvent.Payload.Count); @@ -148,16 +154,16 @@ namespace BasicEventSourceTests Assert.Equal(22, LoudListener.t_lastEvent.EventId); Assert.Equal(1, LoudListener.t_lastEvent.Payload.Count); Assert.Equal(MyFlags.Flag1, (MyFlags)LoudListener.t_lastEvent.Payload[0]); - #endregion +#endregion -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. - #region Validate DateTime +#if USE_ETW +#region Validate DateTime DateTime now = DateTime.Now; log.EventDateTime(now); Assert.Equal(24, LoudListener.LastEvent.EventId); Assert.Equal(1, LoudListener.LastEvent.Payload.Count); Assert.Equal((DateTime)LoudListener.LastEvent.Payload[0], now); - #endregion +#endregion #endif // USE_ETW } } @@ -178,7 +184,7 @@ namespace BasicEventSourceTests EventSource.SendCommand(log, EventCommand.SendManifest, options); Guid guid = Guid.NewGuid(); -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. +#if USE_ETW log.EventWithManyTypeArgs("Hello", 0, 0, 0, 'a', 0, 0, 0, 0, (float)10.0, (double)11.0, guid); Assert.Equal(25, LoudListener.LastEvent.EventId); Assert.Equal(12, LoudListener.LastEvent.Payload.Count); @@ -206,7 +212,7 @@ namespace BasicEventSourceTests Assert.Equal(9, LoudListener.t_lastEvent.Payload.Count); Assert.Equal("s0", (string)LoudListener.t_lastEvent.Payload[0]); Assert.Equal("s8", (string)LoudListener.t_lastEvent.Payload[8]); -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. +#if USE_ETW log.EventWithWeirdArgs(IntPtr.Zero, true, MyLongEnum.LongVal1 /*, 9999999999999999999999999999m*/); Assert.Equal(30, LoudListener.LastEvent.EventId); Assert.Equal(3 /*4*/, LoudListener.LastEvent.Payload.Count); @@ -255,14 +261,14 @@ namespace BasicEventSourceTests TestUtilities.CheckNoEventSourcesRunning("Stop"); } -#if USE_ETW // TODO: Enable when TraceEvent is available on CoreCLR. GitHub issue #4864. - [Fact] +#if USE_ETW + [ConditionalFact(nameof(IsProcessElevated))] public void Test_WriteEvent_TransferEvents() { TestUtilities.CheckNoEventSourcesRunning("Start"); using (var log = new EventSourceTest()) { - using (var el = new LoudListener()) + using (var el = new LoudListener(log)) { Guid actid = Guid.NewGuid(); log.LogTaskScheduled(actid, "Hello from a test"); @@ -352,7 +358,7 @@ namespace BasicEventSourceTests TestUtilities.CheckNoEventSourcesRunning("Stop"); } -#if FEATURE_ETLEVENTS +#if FEATURE_ETLEVENTS [Fact] public void Test_EventSourceCreatedEvents_BeforeListener() { diff --git a/external/corefx/src/System.Diagnostics.Tracing/tests/Configurations.props b/external/corefx/src/System.Diagnostics.Tracing/tests/Configurations.props index 8b803e0772..1040c9ba37 100644 --- a/external/corefx/src/System.Diagnostics.Tracing/tests/Configurations.props +++ b/external/corefx/src/System.Diagnostics.Tracing/tests/Configurations.props @@ -2,8 +2,8 @@ - netcoreapp; - netstandard; + netcoreapp-Windows_NT; + netcoreapp-Unix; \ No newline at end of file diff --git a/external/corefx/src/System.Diagnostics.Tracing/tests/CustomEventSources/EventSourceTest.cs b/external/corefx/src/System.Diagnostics.Tracing/tests/CustomEventSources/EventSourceTest.cs index 6261ab7a4a..725a8d831b 100644 --- a/external/corefx/src/System.Diagnostics.Tracing/tests/CustomEventSources/EventSourceTest.cs +++ b/external/corefx/src/System.Diagnostics.Tracing/tests/CustomEventSources/EventSourceTest.cs @@ -137,13 +137,12 @@ namespace SdtEventSources public void EventDateTime(DateTime dt) { WriteEvent(24, dt); } [Event(25, Keywords = Keywords.HasNoArgs, Level = EventLevel.Informational)] - public void EventWithManyTypeArgs(string msg, long l, uint ui, UInt64 ui64, + public void EventWithManyTypeArgs(string msg, long l, uint ui, UInt64 ui64, char c, byte b, sbyte sb, short sh, ushort ush, float f, double d, Guid guid) { if (IsEnabled(EventLevel.Informational, Keywords.HasNoArgs)) - // 4.5 EventSource does not support "Char" type - WriteEvent(25, msg, l, ui, ui64, b, sb, sh, ush, f, d, guid); + WriteEvent(25, msg, l, ui, ui64, c, b, sb, sh, ush, f, d, guid); } [Event(26)] diff --git a/external/corefx/src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj b/external/corefx/src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj index 5974d34e8f..a91cb646a1 100644 --- a/external/corefx/src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj +++ b/external/corefx/src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj @@ -5,12 +5,13 @@ {7E0E1B11-FF70-461E-99F7-C0AF252C0C60} $(DefineConstants);FEATURE_ETLEVENTS $(DefineConstants);FEATURE_EVENTCOUNTER_DISPOSE + $(DefineConstants);USE_ETW true - - - - + + + + @@ -38,6 +39,9 @@ + + + diff --git a/external/corefx/src/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj b/external/corefx/src/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj index 4850709dd0..52501241de 100644 --- a/external/corefx/src/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj +++ b/external/corefx/src/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj @@ -3,7 +3,7 @@ - netcoreapp2.0;net45;$(AllXamarinFrameworks) + uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks) diff --git a/external/corefx/src/System.DirectoryServices.AccountManagement/src/Configurations.props b/external/corefx/src/System.DirectoryServices.AccountManagement/src/Configurations.props index 94ac07fdab..e322371832 100644 --- a/external/corefx/src/System.DirectoryServices.AccountManagement/src/Configurations.props +++ b/external/corefx/src/System.DirectoryServices.AccountManagement/src/Configurations.props @@ -8,6 +8,7 @@ $(PackageConfigurations); netcoreapp-Windows_NT; + _netfx; diff --git a/external/corefx/src/System.DirectoryServices.AccountManagement/src/Resources/Strings.resx b/external/corefx/src/System.DirectoryServices.AccountManagement/src/Resources/Strings.resx index 204ccbc8ad..7c6023b69c 100644 --- a/external/corefx/src/System.DirectoryServices.AccountManagement/src/Resources/Strings.resx +++ b/external/corefx/src/System.DirectoryServices.AccountManagement/src/Resources/Strings.resx @@ -447,9 +447,6 @@ Empty string is not supported by the property {0} for this store type. - - {0} cannot be null or empty. - The server could not be contacted. @@ -499,6 +496,6 @@ Unknown error (0x{0}) - System.DirectoryServices.AccountManagement is not supported on this platform. + System.DirectoryServices.AccountManagement is not supported on this platform. \ No newline at end of file diff --git a/external/corefx/src/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/Principal.cs b/external/corefx/src/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/Principal.cs index 20b17a6762..c49b628d79 100644 --- a/external/corefx/src/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/Principal.cs +++ b/external/corefx/src/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/Principal.cs @@ -125,7 +125,7 @@ namespace System.DirectoryServices.AccountManagement set { if (null == value || 0 == value.Length) - throw new ArgumentNullException(String.Format(CultureInfo.CurrentCulture, SR.InvalidNullArgument, PropertyNames.PrincipalSamAccountName)); + throw new ArgumentNullException(PropertyNames.PrincipalSamAccountName); if (!GetStoreCtxToUse().IsValidProperty(this, PropertyNames.PrincipalSamAccountName)) throw new InvalidOperationException(SR.InvalidPropertyForStore); @@ -245,7 +245,7 @@ namespace System.DirectoryServices.AccountManagement set { if (null == value || 0 == value.Length) - throw new ArgumentNullException(String.Format(CultureInfo.CurrentCulture, SR.InvalidNullArgument, PropertyNames.PrincipalName)); + throw new ArgumentNullException(PropertyNames.PrincipalName); if (!GetStoreCtxToUse().IsValidProperty(this, PropertyNames.PrincipalName)) throw new InvalidOperationException(SR.InvalidPropertyForStore); @@ -635,7 +635,7 @@ namespace System.DirectoryServices.AccountManagement } else if (this.unpersisted) { - return new object[0]; + return Array.Empty(); } else { @@ -645,7 +645,7 @@ namespace System.DirectoryServices.AccountManagement int valCount = de.Properties[attribute].Count; if (valCount == 0) - return new object[0]; + return Array.Empty(); else { object[] objectArray = new object[valCount]; diff --git a/external/corefx/src/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/PrincipalSearcher.cs b/external/corefx/src/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/PrincipalSearcher.cs index 7f8c9b3e05..cadd51de0a 100644 --- a/external/corefx/src/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/PrincipalSearcher.cs +++ b/external/corefx/src/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/PrincipalSearcher.cs @@ -23,7 +23,7 @@ namespace System.DirectoryServices.AccountManagement public PrincipalSearcher(Principal queryFilter) { if (null == queryFilter) - throw new ArgumentException(String.Format(CultureInfo.CurrentCulture, SR.InvalidNullArgument, "queryFilter")); + throw new ArgumentException(nameof(queryFilter)); _ctx = queryFilter.Context; this.QueryFilter = queryFilter; // use property to enforce "no persisted principals" check @@ -56,7 +56,7 @@ namespace System.DirectoryServices.AccountManagement set { if (null == value) - throw new ArgumentNullException(String.Format(CultureInfo.CurrentCulture, SR.InvalidNullArgument, "queryFilter")); + throw new ArgumentNullException(nameof(QueryFilter)); CheckDisposed(); Debug.Assert(value.Context != null); diff --git a/external/corefx/src/System.DirectoryServices.AccountManagement/tests/ComputerPrincipalTest.cs b/external/corefx/src/System.DirectoryServices.AccountManagement/tests/ComputerPrincipalTest.cs index c5a9230b84..092441335a 100644 --- a/external/corefx/src/System.DirectoryServices.AccountManagement/tests/ComputerPrincipalTest.cs +++ b/external/corefx/src/System.DirectoryServices.AccountManagement/tests/ComputerPrincipalTest.cs @@ -35,7 +35,7 @@ namespace System.DirectoryServices.AccountManagement.Tests public void Ctor_EmptySamAccountName_ThrowsArgumentNullException() { var context = new PrincipalContext(ContextType.Machine); - AssertExtensions.Throws("Principal.SamAccountName cannot be null or empty.", () => new ComputerPrincipal(context, string.Empty, "password", enabled: true)); + AssertExtensions.Throws("Principal.SamAccountName", null, () => new ComputerPrincipal(context, string.Empty, "password", enabled: true)); } [Fact] diff --git a/external/corefx/src/System.DirectoryServices.AccountManagement/tests/Configurations.props b/external/corefx/src/System.DirectoryServices.AccountManagement/tests/Configurations.props index d88b0bf51e..51d1fc2309 100644 --- a/external/corefx/src/System.DirectoryServices.AccountManagement/tests/Configurations.props +++ b/external/corefx/src/System.DirectoryServices.AccountManagement/tests/Configurations.props @@ -3,6 +3,7 @@ netcoreapp-Windows_NT; + netfx; diff --git a/external/corefx/src/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj b/external/corefx/src/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj index abacbd2f86..bdad4811ed 100644 --- a/external/corefx/src/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj +++ b/external/corefx/src/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj @@ -6,6 +6,8 @@ + + @@ -14,18 +16,14 @@ - - + Common\DirectoryServices\LdapConfiguration.cs - - PreserveNewest - \ No newline at end of file diff --git a/external/corefx/src/System.DirectoryServices.AccountManagement/tests/testobj.cs b/external/corefx/src/System.DirectoryServices.AccountManagement/tests/testobj.cs index 71eb00ea01..6ca7ceb45a 100644 --- a/external/corefx/src/System.DirectoryServices.AccountManagement/tests/testobj.cs +++ b/external/corefx/src/System.DirectoryServices.AccountManagement/tests/testobj.cs @@ -1,6 +1,8 @@ -/*++ +// 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. -Copyright (c) 2004 Microsoft Corporation +/*++ Module Name: @@ -11,10 +13,6 @@ Abstract: Exposes test hooks. Only present in TESTHOOK builds. - -History: - - 06-May-2004 MattRim Created --*/ diff --git a/external/corefx/src/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj b/external/corefx/src/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj index 7f056cb3a0..55c341f2ad 100644 --- a/external/corefx/src/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj +++ b/external/corefx/src/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj @@ -3,7 +3,7 @@ - netcoreapp2.0;net45;$(AllXamarinFrameworks) + uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks) diff --git a/external/corefx/src/System.DirectoryServices.Protocols/src/Configurations.props b/external/corefx/src/System.DirectoryServices.Protocols/src/Configurations.props index 94ac07fdab..e322371832 100644 --- a/external/corefx/src/System.DirectoryServices.Protocols/src/Configurations.props +++ b/external/corefx/src/System.DirectoryServices.Protocols/src/Configurations.props @@ -8,6 +8,7 @@ $(PackageConfigurations); netcoreapp-Windows_NT; + _netfx; diff --git a/external/corefx/src/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/BerConverter.cs b/external/corefx/src/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/BerConverter.cs index 42a2ca8d01..354170ec3d 100644 --- a/external/corefx/src/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/BerConverter.cs +++ b/external/corefx/src/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/BerConverter.cs @@ -22,7 +22,7 @@ namespace System.DirectoryServices.Protocols byte[] encodingResult = null; // value is allowed to be null in certain scenario, so if it is null, just set it to empty array. if (value == null) - value = new object[0]; + value = Array.Empty(); Debug.WriteLine("Begin encoding\n"); @@ -235,7 +235,7 @@ namespace System.DirectoryServices.Protocols if (binaryValue == null || binaryValue.bv_len == 0) { - encodingResult = new byte[0]; + encodingResult = Array.Empty(); } else { diff --git a/external/corefx/src/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/DirectoryControl.cs b/external/corefx/src/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/DirectoryControl.cs index 679a970f21..0ef7370eb9 100644 --- a/external/corefx/src/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/DirectoryControl.cs +++ b/external/corefx/src/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/DirectoryControl.cs @@ -634,7 +634,7 @@ namespace System.DirectoryServices.Protocols public class SortRequestControl : DirectoryControl { - private SortKey[] _keys = new SortKey[0]; + private SortKey[] _keys = Array.Empty(); public SortRequestControl(params SortKey[] sortKeys) : base("1.2.840.113556.1.4.473", null, true, true) { if (sortKeys == null) diff --git a/external/corefx/src/System.DirectoryServices.Protocols/tests/Configurations.props b/external/corefx/src/System.DirectoryServices.Protocols/tests/Configurations.props index d8cd9ec843..808952d28a 100644 --- a/external/corefx/src/System.DirectoryServices.Protocols/tests/Configurations.props +++ b/external/corefx/src/System.DirectoryServices.Protocols/tests/Configurations.props @@ -3,6 +3,7 @@ netcoreapp-Windows_NT; + netfx; diff --git a/external/corefx/src/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj b/external/corefx/src/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj index 9d293444d1..7351989446 100644 --- a/external/corefx/src/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj +++ b/external/corefx/src/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj @@ -6,6 +6,8 @@ + + @@ -50,7 +52,6 @@ - Common\DirectoryServices\LdapConfiguration.cs diff --git a/external/corefx/src/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj b/external/corefx/src/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj index c750a9d9c5..989e59c013 100644 --- a/external/corefx/src/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj +++ b/external/corefx/src/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj @@ -3,7 +3,7 @@ - netcoreapp2.0;net45;$(AllXamarinFrameworks) + uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks) diff --git a/external/corefx/src/System.DirectoryServices/src/Configurations.props b/external/corefx/src/System.DirectoryServices/src/Configurations.props index 94ac07fdab..e322371832 100644 --- a/external/corefx/src/System.DirectoryServices/src/Configurations.props +++ b/external/corefx/src/System.DirectoryServices/src/Configurations.props @@ -8,6 +8,7 @@ $(PackageConfigurations); netcoreapp-Windows_NT; + _netfx; diff --git a/external/corefx/src/System.DirectoryServices/src/System/DirectoryServices/DirectorySearcher.cs b/external/corefx/src/System.DirectoryServices/src/System/DirectoryServices/DirectorySearcher.cs index 8895609a8d..6f94c2f87a 100644 --- a/external/corefx/src/System.DirectoryServices/src/System/DirectoryServices/DirectorySearcher.cs +++ b/external/corefx/src/System.DirectoryServices/src/System/DirectoryServices/DirectorySearcher.cs @@ -671,7 +671,7 @@ namespace System.DirectoryServices else { adsSearch.ExecuteSearch(Filter, null, -1, out resultsHandle); - properties = new string[0]; + properties = Array.Empty(); } SearchResultCollection result = new SearchResultCollection(clonedRoot, resultsHandle, properties, this); diff --git a/external/corefx/src/System.DirectoryServices/src/System/DirectoryServices/DirectorySynchronization.cs b/external/corefx/src/System.DirectoryServices/src/System/DirectoryServices/DirectorySynchronization.cs index 7f0a090b59..d8adadad2b 100644 --- a/external/corefx/src/System.DirectoryServices/src/System/DirectoryServices/DirectorySynchronization.cs +++ b/external/corefx/src/System.DirectoryServices/src/System/DirectoryServices/DirectorySynchronization.cs @@ -9,7 +9,7 @@ namespace System.DirectoryServices public class DirectorySynchronization { private DirectorySynchronizationOptions _option = DirectorySynchronizationOptions.None; - private byte[] _cookie = new byte[0]; + private byte[] _cookie = Array.Empty(); public DirectorySynchronization() { diff --git a/external/corefx/src/System.DirectoryServices/src/System/DirectoryServices/DirectoryVirtualListViewContext.cs b/external/corefx/src/System.DirectoryServices/src/System/DirectoryServices/DirectoryVirtualListViewContext.cs index b3c239367b..a25af4d769 100644 --- a/external/corefx/src/System.DirectoryServices/src/System/DirectoryServices/DirectoryVirtualListViewContext.cs +++ b/external/corefx/src/System.DirectoryServices/src/System/DirectoryServices/DirectoryVirtualListViewContext.cs @@ -8,7 +8,7 @@ namespace System.DirectoryServices { internal readonly byte[] _context; - public DirectoryVirtualListViewContext() : this(new byte[0]) + public DirectoryVirtualListViewContext() : this(null) { } @@ -16,7 +16,7 @@ namespace System.DirectoryServices { if (context == null) { - _context = new byte[0]; + _context = Array.Empty(); } else { diff --git a/external/corefx/src/System.DirectoryServices/src/System/DirectoryServices/ResultPropertyCollection.cs b/external/corefx/src/System.DirectoryServices/src/System/DirectoryServices/ResultPropertyCollection.cs index 7e93bb160b..7ed4132e11 100644 --- a/external/corefx/src/System.DirectoryServices/src/System/DirectoryServices/ResultPropertyCollection.cs +++ b/external/corefx/src/System.DirectoryServices/src/System/DirectoryServices/ResultPropertyCollection.cs @@ -30,7 +30,7 @@ namespace System.DirectoryServices } else { - return new ResultPropertyValueCollection(new object[0]); + return new ResultPropertyValueCollection(Array.Empty()); } } } diff --git a/external/corefx/src/System.DirectoryServices/src/System/DirectoryServices/SchemaNameCollection.cs b/external/corefx/src/System.DirectoryServices/src/System/DirectoryServices/SchemaNameCollection.cs index 4b1d26e5c3..7097d57c60 100644 --- a/external/corefx/src/System.DirectoryServices/src/System/DirectoryServices/SchemaNameCollection.cs +++ b/external/corefx/src/System.DirectoryServices/src/System/DirectoryServices/SchemaNameCollection.cs @@ -103,8 +103,7 @@ namespace System.DirectoryServices /// public void Clear() { - object[] newValues = new object[0]; - _propSetter(newValues); + _propSetter(Array.Empty()); } /// @@ -128,7 +127,7 @@ namespace System.DirectoryServices { object value = _propGetter(); if (value == null) - return new object[0]; + return Array.Empty(); else return (object[])value; } diff --git a/external/corefx/src/System.DirectoryServices/tests/Configurations.props b/external/corefx/src/System.DirectoryServices/tests/Configurations.props index d8cd9ec843..808952d28a 100644 --- a/external/corefx/src/System.DirectoryServices/tests/Configurations.props +++ b/external/corefx/src/System.DirectoryServices/tests/Configurations.props @@ -3,6 +3,7 @@ netcoreapp-Windows_NT; + netfx; diff --git a/external/corefx/src/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj b/external/corefx/src/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj index 3d0cd83653..d0ab8c21b0 100644 --- a/external/corefx/src/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj +++ b/external/corefx/src/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj @@ -7,6 +7,8 @@ + + @@ -21,7 +23,6 @@ - Common\DirectoryServices\LdapConfiguration.cs @@ -31,11 +32,9 @@ PreserveNewest - - + - \ No newline at end of file diff --git a/external/corefx/src/System.DirectoryServices/tests/System/DirectoryServices/ActiveDirectory/ForestTests.cs b/external/corefx/src/System.DirectoryServices/tests/System/DirectoryServices/ActiveDirectory/ForestTests.cs index 3b4cbacfae..1cf2af3eb5 100644 --- a/external/corefx/src/System.DirectoryServices/tests/System/DirectoryServices/ActiveDirectory/ForestTests.cs +++ b/external/corefx/src/System.DirectoryServices/tests/System/DirectoryServices/ActiveDirectory/ForestTests.cs @@ -64,6 +64,7 @@ namespace System.DirectoryServices.ActiveDirectory.Tests exception is ActiveDirectoryOperationException, $"We got unrecognized exception {exception}"); + // The result of validation is cached, so repeat this to make sure it's cached properly. exception = Record.Exception(() => Forest.GetForest(context)); Assert.NotNull(exception); diff --git a/external/corefx/src/System.DirectoryServices/tests/System/DirectoryServices/PropertyCollectionTests.cs b/external/corefx/src/System.DirectoryServices/tests/System/DirectoryServices/PropertyCollectionTests.cs index 53948ea064..5443754207 100644 --- a/external/corefx/src/System.DirectoryServices/tests/System/DirectoryServices/PropertyCollectionTests.cs +++ b/external/corefx/src/System.DirectoryServices/tests/System/DirectoryServices/PropertyCollectionTests.cs @@ -82,8 +82,8 @@ namespace System.DirectoryServices.Tests using (var entry = new DirectoryEntry()) { PropertyCollection properties = entry.Properties; - AssertExtensions.Throws("Number was less than the array's lower bound in the first dimension.", () => properties.CopyTo(new PropertyValueCollection[0], -1)); - AssertExtensions.Throws("Number was less than the array's lower bound in the first dimension.", () => ((ICollection)properties).CopyTo(new PropertyValueCollection[0], -1)); + AssertExtensions.Throws("Number was less than the array's lower bound in the first dimension.", null, () => properties.CopyTo(new PropertyValueCollection[0], -1)); + AssertExtensions.Throws("Number was less than the array's lower bound in the first dimension.", null, () => ((ICollection)properties).CopyTo(new PropertyValueCollection[0], -1)); } } diff --git a/external/corefx/src/System.Drawing.Common/pkg/System.Drawing.Common.pkgproj b/external/corefx/src/System.Drawing.Common/pkg/System.Drawing.Common.pkgproj index 1fe84ed429..a0f5151c08 100644 --- a/external/corefx/src/System.Drawing.Common/pkg/System.Drawing.Common.pkgproj +++ b/external/corefx/src/System.Drawing.Common/pkg/System.Drawing.Common.pkgproj @@ -3,7 +3,7 @@ - net461;netcoreapp2.0;$(AllXamarinFrameworks) + uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks) diff --git a/external/corefx/src/System.Drawing.Common/ref/System.Drawing.Common.cs.REMOVED.git-id b/external/corefx/src/System.Drawing.Common/ref/System.Drawing.Common.cs.REMOVED.git-id index 5592a07574..a124fc68d6 100644 --- a/external/corefx/src/System.Drawing.Common/ref/System.Drawing.Common.cs.REMOVED.git-id +++ b/external/corefx/src/System.Drawing.Common/ref/System.Drawing.Common.cs.REMOVED.git-id @@ -1 +1 @@ -715ca992e720f4592a2778f74e70789fe2c1a6e8 \ No newline at end of file +a9a23343120be4ebfb927e7a6bd53e1631a4d716 \ No newline at end of file diff --git a/external/corefx/src/System.Drawing.Common/src/PinvokeAnalyzerExceptionList.analyzerdata b/external/corefx/src/System.Drawing.Common/src/PinvokeAnalyzerExceptionList.analyzerdata new file mode 100644 index 0000000000..4147d127f5 --- /dev/null +++ b/external/corefx/src/System.Drawing.Common/src/PinvokeAnalyzerExceptionList.analyzerdata @@ -0,0 +1,65 @@ +comdlg32.dll!PrintDlg +comdlg32.dll!PrintDlg +gdi32.dll!AbortDoc +gdi32.dll!AddFontResourceEx +gdi32.dll!BitBlt +gdi32.dll!CombineRgn +gdi32.dll!CreateCompatibleBitmap +gdi32.dll!CreateCompatibleDC +gdi32.dll!CreateCompatibleDC +gdi32.dll!CreateDC +gdi32.dll!CreateDIBSection +gdi32.dll!CreateFontIndirect +gdi32.dll!CreateIC +gdi32.dll!CreateRectRgn +gdi32.dll!CreateRectRgn +gdi32.dll!DeleteDC +gdi32.dll!DeleteDC +gdi32.dll!DeleteObject +gdi32.dll!DeleteObject +gdi32.dll!EndDoc +gdi32.dll!EndPage +gdi32.dll!ExtEscape +gdi32.dll!ExtEscape +gdi32.dll!GetClipRgn +gdi32.dll!GetClipRgn +gdi32.dll!GetCurrentObject +gdi32.dll!GetDeviceCaps +gdi32.dll!GetDIBits +gdi32.dll!GetObject +gdi32.dll!GetObject +gdi32.dll!GetObjectType +gdi32.dll!GetPaletteEntries +gdi32.dll!GetRgnBox +gdi32.dll!GetStockObject +gdi32.dll!IntersectClipRect +gdi32.dll!OffsetViewportOrgEx +gdi32.dll!ResetDC +gdi32.dll!RestoreDC +gdi32.dll!SaveDC +gdi32.dll!SelectClipRgn +gdi32.dll!SelectClipRgn +gdi32.dll!SelectObject +gdi32.dll!StartDoc +gdi32.dll!StartPage +kernel32.dll!RtlMoveMemory +shell32.dll!ExtractAssociatedIcon +user32.dll!CopyImage +user32.dll!CreateIconFromResourceEx +user32.dll!DestroyIcon +user32.dll!DrawIconEx +user32.dll!GetDC +user32.dll!GetDC +user32.dll!GetIconInfo +user32.dll!GetSysColor +user32.dll!GetSystemMetrics +user32.dll!LoadIcon +user32.dll!ReleaseDC +user32.dll!ReleaseDC +user32.dll!SystemParametersInfo +user32.dll!SystemParametersInfo +user32.dll!WindowFromDC +winspool.drv!DeviceCapabilities +winspool.drv!DocumentProperties +winspool.drv!DocumentProperties +winspool.drv!EnumPrinters diff --git a/external/corefx/src/System.Drawing.Common/src/System.Drawing.Common.csproj b/external/corefx/src/System.Drawing.Common/src/System.Drawing.Common.csproj index 0fddb02bd9..24386b8700 100644 --- a/external/corefx/src/System.Drawing.Common/src/System.Drawing.Common.csproj +++ b/external/corefx/src/System.Drawing.Common/src/System.Drawing.Common.csproj @@ -6,11 +6,10 @@ {191B3618-FECD-4ABD-9D6B-5AC90DC33621} $(DefineConstants);DRAWING_NAMESPACE true - - false CS0618 - $(DefineConstants);FEATURE_WINDOWS_SYSTEM_COLORS + $(DefineConstants);FEATURE_WINDOWS_SYSTEM_COLORS;FEATURE_SYSTEM_EVENTS $(DefineConstants);CORECLR;NETCORE + $(DefineConstants);netcoreapp20 true SR.PlatformNotSupported_Drawing @@ -36,10 +35,12 @@ - + + + @@ -51,7 +52,6 @@ - @@ -133,7 +133,9 @@ + + @@ -212,14 +214,12 @@ - + - - @@ -227,6 +227,7 @@ + @@ -293,7 +294,6 @@ - @@ -315,6 +315,7 @@ + @@ -351,6 +352,7 @@ + @@ -377,4 +379,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Bitmap.Unix.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Bitmap.Unix.cs index ab4b8742ff..7900600148 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Bitmap.Unix.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Bitmap.Unix.cs @@ -46,7 +46,6 @@ using System.ComponentModel; namespace System.Drawing { - [Serializable] #if !NETCORE [Editor ("System.Drawing.Design.BitmapEditor, " + Consts.AssemblySystem_Drawing_Design, typeof (System.Drawing.Design.UITypeEditor))] #endif @@ -86,11 +85,6 @@ namespace System.Drawing nativeImage = InitFromStream(s); } - - private Bitmap(SerializationInfo info, StreamingContext context) - : base(info, context) - { - } #endregion private void ValidateBitmap(IntPtr bitmap) diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/BufferedGraphicsManager.Unix.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/BufferedGraphicsManager.Unix.cs index 60f9abc8d9..7f194df6ea 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/BufferedGraphicsManager.Unix.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/BufferedGraphicsManager.Unix.cs @@ -31,7 +31,7 @@ namespace System.Drawing { - public sealed class BufferedGraphicsManager + public static class BufferedGraphicsManager { private static BufferedGraphicsContext graphics_context; @@ -40,10 +40,6 @@ namespace System.Drawing graphics_context = new BufferedGraphicsContext(); } - private BufferedGraphicsManager() - { - } - public static BufferedGraphicsContext Current { get { return graphics_context; } diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/ColorConverter.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/ColorConverter.cs index decb4ee064..88242805d1 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/ColorConverter.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/ColorConverter.cs @@ -1,11 +1,7 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -//------------------------------------------------------------------------------ +// 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.Drawing { using System.Runtime.Serialization.Formatters; using System.Runtime.InteropServices; diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/ColorTranslator.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/ColorTranslator.cs index 8bf006b9d2..fe45c4fbd1 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/ColorTranslator.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/ColorTranslator.cs @@ -10,7 +10,7 @@ namespace System.Drawing /// /// Translates colors to and from GDI+ objects. /// - public sealed class ColorTranslator + public static class ColorTranslator { private const int Win32RedShift = 0; private const int Win32GreenShift = 8; diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/IPropertyValueUIService.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/IPropertyValueUIService.cs index 062e900e5e..d1234c1695 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/IPropertyValueUIService.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/IPropertyValueUIService.cs @@ -1,11 +1,7 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -//------------------------------------------------------------------------------ +// 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.Drawing.Design { using System.Diagnostics; diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/IToolboxItemProvider.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/IToolboxItemProvider.cs index 15aa59a514..2dfebabdc0 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/IToolboxItemProvider.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/IToolboxItemProvider.cs @@ -1,8 +1,6 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -//------------------------------------------------------------------------------ +// 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.Drawing.Design { diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/IToolboxService.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/IToolboxService.cs index b8ff1bdd2b..d3894a7459 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/IToolboxService.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/IToolboxService.cs @@ -1,8 +1,6 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -//------------------------------------------------------------------------------ +// 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. /* */ diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/IToolboxUser.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/IToolboxUser.cs index 7d2cb9de3b..b804d7a1dc 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/IToolboxUser.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/IToolboxUser.cs @@ -1,8 +1,6 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -//------------------------------------------------------------------------------ +// 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. /* */ diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/PaintValueEventArgs.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/PaintValueEventArgs.cs index 5c45524e23..958d7119bf 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/PaintValueEventArgs.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/PaintValueEventArgs.cs @@ -1,8 +1,6 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -//------------------------------------------------------------------------------ +// 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. /* */ diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/PropertyValueUIHandler.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/PropertyValueUIHandler.cs index a7c3621adf..1d630336e3 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/PropertyValueUIHandler.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/PropertyValueUIHandler.cs @@ -1,8 +1,6 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -//------------------------------------------------------------------------------ +// 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. /* */ diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/PropertyValueUIItem.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/PropertyValueUIItem.cs index 298f7a73a1..9854a00310 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/PropertyValueUIItem.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/PropertyValueUIItem.cs @@ -1,8 +1,6 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -//------------------------------------------------------------------------------ +// 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. /* */ diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/PropertyValueUIItemInvokeHandler.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/PropertyValueUIItemInvokeHandler.cs index 62a44bd40a..d70b799534 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/PropertyValueUIItemInvokeHandler.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/PropertyValueUIItemInvokeHandler.cs @@ -1,8 +1,6 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -//------------------------------------------------------------------------------ +// 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. /* */ diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxComponentsCreatedEventArgs.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxComponentsCreatedEventArgs.cs index f21ce8ba14..f79373e834 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxComponentsCreatedEventArgs.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxComponentsCreatedEventArgs.cs @@ -1,8 +1,6 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -//------------------------------------------------------------------------------ +// 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.Drawing.Design { using System; diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxComponentsCreatedEventHandler.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxComponentsCreatedEventHandler.cs index fa34f68446..183923cfe0 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxComponentsCreatedEventHandler.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxComponentsCreatedEventHandler.cs @@ -1,8 +1,6 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -//------------------------------------------------------------------------------ +// 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.Drawing.Design { using System; diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxComponentsCreatingEventArgs.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxComponentsCreatingEventArgs.cs index 12247e2ae5..6e2ccd8261 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxComponentsCreatingEventArgs.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxComponentsCreatingEventArgs.cs @@ -1,8 +1,6 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -//------------------------------------------------------------------------------ +// 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.Drawing.Design { using System; diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxComponentsCreatingEventHandler.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxComponentsCreatingEventHandler.cs index 6c5ddef5a6..573951d9b6 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxComponentsCreatingEventHandler.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxComponentsCreatingEventHandler.cs @@ -1,8 +1,6 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -//------------------------------------------------------------------------------ +// 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.Drawing.Design { using System; diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxItem.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxItem.cs index 8fde796ad4..ecac2d25bf 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxItem.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxItem.cs @@ -1,11 +1,7 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -//------------------------------------------------------------------------------ +// 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.Drawing.Design { using System.Configuration.Assemblies; using System.Runtime.InteropServices; diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxItemCollection.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxItemCollection.cs index 3cfd526cb1..a076399bd2 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxItemCollection.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxItemCollection.cs @@ -1,9 +1,7 @@ -// ------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -// ------------------------------------------------------------------------------ -// +// 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.Drawing.Design { using System; diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxItemCreatorCallback.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxItemCreatorCallback.cs index 077759427e..ef11d48406 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxItemCreatorCallback.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxItemCreatorCallback.cs @@ -1,11 +1,7 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -//------------------------------------------------------------------------------ +// 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.Drawing.Design { /// diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/UITypeEditor.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/UITypeEditor.cs index 4d1498c604..18defcfd05 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/UITypeEditor.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/UITypeEditor.cs @@ -1,11 +1,7 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -//------------------------------------------------------------------------------ +// 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.Drawing.Design { using System.Runtime.InteropServices; using System.ComponentModel; diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/UITypeEditorEditStyle.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/UITypeEditorEditStyle.cs index 49a3f6cd80..8667cc902d 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/UITypeEditorEditStyle.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Design/UITypeEditorEditStyle.cs @@ -1,11 +1,7 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -//------------------------------------------------------------------------------ +// 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.Drawing.Design { using System.Diagnostics; diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Drawing2D/AdjustableArrowCap.Unix.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Drawing2D/AdjustableArrowCap.Unix.cs index f265fe244a..318d4ccbe1 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Drawing2D/AdjustableArrowCap.Unix.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Drawing2D/AdjustableArrowCap.Unix.cs @@ -8,7 +8,7 @@ namespace System.Drawing.Drawing2D { public sealed partial class AdjustableArrowCap : CustomLineCap { - public override object Clone() + internal override object CoreClone() { IntPtr clonedCap; int status = SafeNativeMethods.Gdip.GdipCloneCustomLineCap(new HandleRef(this, nativeCap), out clonedCap); diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Drawing2D/CustomLineCap.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Drawing2D/CustomLineCap.cs index a9c75acd0f..f449be7b39 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Drawing2D/CustomLineCap.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Drawing2D/CustomLineCap.cs @@ -74,7 +74,12 @@ namespace System.Drawing.Drawing2D ~CustomLineCap() => Dispose(false); - public virtual object Clone() + public object Clone() + { + return CoreClone(); + } + + internal virtual object CoreClone() { IntPtr clonedCap; int status = SafeNativeMethods.Gdip.GdipCloneCustomLineCap(new HandleRef(this, nativeCap), out clonedCap); diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Drawing2D/GraphicsPath.Unix.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Drawing2D/GraphicsPath.Unix.cs index 1260c98a5c..bcc999cbe6 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Drawing2D/GraphicsPath.Unix.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Drawing2D/GraphicsPath.Unix.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information. // // System.Drawing.Drawing2D.GraphicsPath.cs // diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Font.Unix.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Font.Unix.cs index 56ff789861..322b8f129b 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Font.Unix.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Font.Unix.cs @@ -40,12 +40,11 @@ using System.ComponentModel; namespace System.Drawing { - [Serializable] #if !NETCORE [Editor ("System.Drawing.Design.FontEditor, " + Consts.AssemblySystem_Drawing_Design, typeof (System.Drawing.Design.UITypeEditor))] [TypeConverter (typeof (FontConverter))] #endif - public sealed class Font : MarshalByRefObject, ISerializable, ICloneable, IDisposable + public sealed partial class Font : MarshalByRefObject, ISerializable, ICloneable, IDisposable { private IntPtr fontObject = IntPtr.Zero; private string systemFontName; @@ -79,29 +78,6 @@ namespace System.Drawing SafeNativeMethods.Gdip.CheckStatus(status); } - private Font(SerializationInfo info, StreamingContext context) - { - string name; - float size; - FontStyle style; - GraphicsUnit unit; - - name = (string)info.GetValue("Name", typeof(string)); - size = (float)info.GetValue("Size", typeof(float)); - style = (FontStyle)info.GetValue("Style", typeof(FontStyle)); - unit = (GraphicsUnit)info.GetValue("Unit", typeof(GraphicsUnit)); - - CreateFont(name, size, style, unit, DefaultCharSet, false); - } - - void ISerializable.GetObjectData(SerializationInfo si, StreamingContext context) - { - si.AddValue("Name", Name); - si.AddValue("Size", Size); - si.AddValue("Style", Style); - si.AddValue("Unit", Unit); - } - ~Font() { Dispose(); diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/FontFamily.Unix.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/FontFamily.Unix.cs new file mode 100644 index 0000000000..277da4cad1 --- /dev/null +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/FontFamily.Unix.cs @@ -0,0 +1,30 @@ +// 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.Drawing +{ + /// + /// Abstracts a group of type faces having a similar basic design but having certain variation in styles. + /// + public sealed partial class FontFamily : MarshalByRefObject, IDisposable + { + public override bool Equals(object obj) + { + if (obj == this) + { + return true; + } + + // if obj = null then (obj is FontFamily) = false. + if (!(obj is FontFamily otherFamily)) + { + return false; + } + + // In unix FontFamily objects are not singleton so they don't share the same native pointer, + // the best we have to know if they are the same is FontFamily.Name which gets resolved from the native pointer. + return Name.Equals(otherFamily.Name, StringComparison.Ordinal); + } + } +} diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/FontFamily.Windows.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/FontFamily.Windows.cs new file mode 100644 index 0000000000..196f58c5d8 --- /dev/null +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/FontFamily.Windows.cs @@ -0,0 +1,30 @@ +// 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.Drawing +{ + /// + /// Abstracts a group of type faces having a similar basic design but having certain variation in styles. + /// + public sealed partial class FontFamily : MarshalByRefObject, IDisposable + { + public override bool Equals(object obj) + { + if (obj == this) + { + return true; + } + + // if obj = null then (obj is FontFamily) = false. + if (!(obj is FontFamily otherFamily)) + { + return false; + } + + // We can safely use the ptr to the native GDI+ FontFamily because in windows it is common to + // all objects of the same family (singleton RO object). + return otherFamily.NativeFamily == NativeFamily; + } + } +} diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/FontFamily.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/FontFamily.cs index f77dce68a9..4228c63a36 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/FontFamily.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/FontFamily.cs @@ -14,7 +14,7 @@ namespace System.Drawing /// /// Abstracts a group of type faces having a similar basic design but having certain variation in styles. /// - public sealed class FontFamily : MarshalByRefObject, IDisposable + public sealed partial class FontFamily : MarshalByRefObject, IDisposable { private const int NeutralLanguage = 0; private IntPtr _nativeFamily; @@ -132,23 +132,6 @@ namespace System.Drawing internal IntPtr NativeFamily => _nativeFamily; - public override bool Equals(object obj) - { - if (obj == this) - { - return true; - } - - if (!(obj is FontFamily otherFamily)) - { - return false; - } - - // We can safely use the ptr to the native GDI+ FontFamily because it is common to - // all objects of the same family (singleton RO object). - return otherFamily.NativeFamily == NativeFamily; - } - /// /// Converts this to a human-readable string. /// diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Graphics.Unix.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Graphics.Unix.cs index 1392545af8..c7d8c1caf5 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Graphics.Unix.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Graphics.Unix.cs @@ -1777,7 +1777,7 @@ namespace System.Drawing public Region[] MeasureCharacterRanges(string text, Font font, RectangleF layoutRect, StringFormat stringFormat) { if ((text == null) || (text.Length == 0)) - return new Region[0]; + return Array.Empty(); if (font == null) throw new ArgumentNullException("font"); @@ -1787,7 +1787,7 @@ namespace System.Drawing int regcount = stringFormat.GetMeasurableCharacterRangeCount(); if (regcount == 0) - return new Region[0]; + return Array.Empty(); IntPtr[] native_regions = new IntPtr[regcount]; Region[] regions = new Region[regcount]; diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Icon.Unix.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Icon.Unix.cs index 119dcaef77..f6dc345738 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Icon.Unix.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Icon.Unix.cs @@ -466,7 +466,7 @@ namespace System.Drawing IconImage ii = new IconImage(); ii.iconHeader = bih; - ii.iconColors = new uint[0]; // no palette + ii.iconColors = Array.Empty(); // no palette int xor_size = (((bih.biBitCount * bitmap.Width + 31) & ~31) >> 3) * bitmap.Height; ii.iconXOR = new byte[xor_size]; int p = 0; diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Image.Unix.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Image.Unix.cs index 5771f95371..45bd3b1fce 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Image.Unix.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Image.Unix.cs @@ -44,7 +44,6 @@ using System.Reflection; namespace System.Drawing { - [Serializable] #if !NETCORE [Editor ("System.Drawing.Design.ImageEditor, " + Consts.AssemblySystem_Drawing_Design, typeof (System.Drawing.Design.UITypeEditor))] [TypeConverter (typeof(ImageConverter))] @@ -61,45 +60,6 @@ namespace System.Drawing { } -#if NETCORE - protected Image(SerializationInfo info, StreamingContext context) -#else - internal Image (SerializationInfo info, StreamingContext context) -#endif - { - foreach (SerializationEntry serEnum in info) - { - if (String.Compare(serEnum.Name, "Data", true) == 0) - { - byte[] bytes = (byte[])serEnum.Value; - - if (bytes != null) - { - MemoryStream ms = new MemoryStream(bytes); - nativeImage = InitFromStream(ms); - } - } - } - } - - // FIXME - find out how metafiles (another decoder-only codec) are handled - void ISerializable.GetObjectData(SerializationInfo si, StreamingContext context) - { - using (MemoryStream ms = new MemoryStream()) - { - // Icon is a decoder-only codec - if (RawFormat.Equals(ImageFormat.Icon)) - { - Save(ms, ImageFormat.Png); - } - else - { - Save(ms, RawFormat); - } - si.AddValue("Data", ms.ToArray()); - } - } - // public methods // static public static Image FromFile(string filename) diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Image.Windows.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Image.Windows.cs index c0b8f1a69c..1e4ed87891 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Image.Windows.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Image.Windows.cs @@ -866,7 +866,7 @@ namespace System.Drawing Debug.Assert(count >= 0, "FrameDimensionsList returns bad count"); if (count <= 0) { - return new Guid[0]; + return Array.Empty(); } int size = (int)Marshal.SizeOf(typeof(Guid)); @@ -1059,7 +1059,7 @@ namespace System.Drawing throw SafeNativeMethods.Gdip.StatusException(status); if (size == 0 || count == 0) - return new PropertyItem[0]; + return Array.Empty(); IntPtr propdata = Marshal.AllocHGlobal(size); try diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystemInfo.Win32.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Internal/ISystemEventTracker.cs similarity index 60% rename from external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystemInfo.Win32.cs rename to external/corefx/src/System.Drawing.Common/src/System/Drawing/Internal/ISystemEventTracker.cs index da72a66f64..9e2f7b9c2a 100644 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystemInfo.Win32.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Internal/ISystemEventTracker.cs @@ -2,13 +2,10 @@ // 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.IO +namespace System.Drawing.Internal { - partial class FileSystemInfo + internal interface ISystemColorTracker { - internal void Invalidate() - { - _dataInitialized = -1; - } + void OnSystemColorChanged(); } } diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Internal/SystemColorTracker.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Internal/SystemColorTracker.cs new file mode 100644 index 0000000000..3353700afb --- /dev/null +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Internal/SystemColorTracker.cs @@ -0,0 +1,152 @@ +// 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.ComponentModel; +using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; +using System.Runtime.InteropServices; +using Microsoft.Win32; + +namespace System.Drawing.Internal +{ + // Keeps track of objects that need to be notified of system color change events. + // Mostly this means maintaining a list of weak references. + internal static class SystemColorTracker + { + // when I tried the self host, it went over 500 but never over 1000. + private static int INITIAL_SIZE = 200; + // If it gets this big, I seriously miscalculated the performance of this object. + private static int WARNING_SIZE = 100000; + private static float EXPAND_THRESHOLD = 0.75f; + private static int EXPAND_FACTOR = 2; + + private static WeakReference[] list = new WeakReference[INITIAL_SIZE]; + private static int count = 0; + private static bool addedTracker; + private static object lockObject = new object(); + + internal static void Add(ISystemColorTracker obj) + { + lock (lockObject) + { + Debug.Assert(list != null, "List is null"); + Debug.Assert(list.Length > 0, "INITIAL_SIZE was initialized after list"); + + if (list.Length == count) + { + GarbageCollectList(); + } + + if (!addedTracker) + { + addedTracker = true; + SystemEvents.UserPreferenceChanged += new UserPreferenceChangedEventHandler(OnUserPreferenceChanged); + } + + // Strictly speaking, we should grab a lock on this class. But since the chances + // of a problem are so low, the consequences so minimal (something will get accidentally dropped + // from the list), and the performance of locking so lousy, we'll risk it. + int index = count; + count++; + + // COM+ takes forever to Finalize() weak references, so it pays to reuse them. + if (list[index] == null) + list[index] = new WeakReference(obj); + else + { + Debug.Assert(list[index].Target == null, "Trying to reuse a weak reference that isn't broken yet: list[" + index + "], length =" + list.Length); + list[index].Target = obj; + } + } + } + + private static void CleanOutBrokenLinks() + { + // Partition the list -- valid references in the low indices, broken references in the high indices. + // This is taken straight out of Sedgewick (p. 118 on quicksort). + + // Basic idea is to find a broken reference on the left side of the list, and swap it with + // a valid reference on the right + int right = list.Length - 1; + int left = 0; + + int length = list.Length; + + // Loop invariant: everything to the left of "left" is a valid reference, + // and anything to the right of "right" is broken. + for (;;) + { + while (left < length && list[left].Target != null) + left++; + while (right >= 0 && list[right].Target == null) + right--; + + if (left >= right) + { + count = left; + break; + } + + WeakReference temp = list[left]; + list[left] = list[right]; + list[right] = temp; + + left++; + right--; + } + + Debug.Assert(count >= 0 && count <= list.Length, "count not a legal index into list"); + +#if DEBUG + // Check loop invariant. + + // We'd like to assert that any index < count contains a valid pointer, + // but since garbage collection can happen at any time, it may have been broken + // after we partitioned it. + // + // for (int i = 0; i < count; i++) { + // Debug.Assert(list[i].Target != null, "Null found on the left side of the list"); + // } + + for (int i = count; i < list.Length; i++) + { + Debug.Assert(list[i].Target == null, "Partitioning didn't work"); + } +#endif + } + + private static void GarbageCollectList() + { + CleanOutBrokenLinks(); + + if (count / (float)list.Length > EXPAND_THRESHOLD) + { + WeakReference[] newList = new WeakReference[list.Length * EXPAND_FACTOR]; + list.CopyTo(newList, 0); + list = newList; + + Debug.Assert(list.Length < WARNING_SIZE, "SystemColorTracker is using way more memory than expected."); + } + } + + private static void OnUserPreferenceChanged(object sender, UserPreferenceChangedEventArgs e) + { + + // Update pens and brushes + if (e.Category == UserPreferenceCategory.Color) + { + for (int i = 0; i < count; i++) + { + Debug.Assert(list[i] != null, "null value in active part of list"); + ISystemColorTracker tracker = (ISystemColorTracker)list[i].Target; + if (tracker != null) + { + // If object still around + tracker.OnSystemColorChanged(); + } + } + } + } + } +} diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Pen.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Pen.cs index 16cc0071da..bdafdab046 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Pen.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Pen.cs @@ -15,6 +15,9 @@ namespace System.Drawing /// Defines an object used to draw lines and curves. /// public sealed partial class Pen : MarshalByRefObject, ICloneable, IDisposable +#if FEATURE_SYSTEM_EVENTS + , ISystemColorTracker +#endif { #if FINALIZATION_WATCH private string allocationSite = Graphics.GetAllocationStack(); @@ -60,6 +63,13 @@ namespace System.Drawing SafeNativeMethods.Gdip.CheckStatus(status); SetNativePen(pen); + +#if FEATURE_SYSTEM_EVENTS + if (ColorUtil.IsSystemColor(_color)) + { + SystemColorTracker.Add(this); + } +#endif } /// @@ -570,6 +580,15 @@ namespace System.Drawing Color oldColor = _color; _color = value; InternalSetColor(value); + +#if FEATURE_SYSTEM_EVENTS + // NOTE: We never remove pens from the active list, so if someone is + // changing their pen colors a lot, this could be a problem. + if (ColorUtil.IsSystemColor(value) && !ColorUtil.IsSystemColor(oldColor)) + { + SystemColorTracker.Add(this); + } +#endif } } } @@ -748,7 +767,7 @@ namespace System.Drawing } else if (DashStyle == DashStyle.Solid) { - pattern = new float[0]; + pattern = Array.Empty(); } else { @@ -838,5 +857,15 @@ namespace System.Drawing SafeNativeMethods.Gdip.CheckStatus(status); } } + +#if FEATURE_SYSTEM_EVENTS + void ISystemColorTracker.OnSystemColorChanged() + { + if (NativePen != IntPtr.Zero) + { + InternalSetColor(_color); + } + } +#endif } } diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/PointConverter.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/PointConverter.cs index 5fad16e358..016f25933b 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/PointConverter.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/PointConverter.cs @@ -1,11 +1,7 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -//------------------------------------------------------------------------------ +// 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.Drawing { using System.Runtime.Serialization.Formatters; using System.Runtime.InteropServices; diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Windows.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Windows.cs index ccc03bea84..8e1084b911 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Windows.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Windows.cs @@ -1079,7 +1079,7 @@ namespace System.Drawing.Printing int count = FastDeviceCapabilities(SafeNativeMethods.DC_PAPERNAMES, IntPtr.Zero, -1, printerName); if (count == -1) - return new PaperSize[0]; + return Array.Empty(); int stringSize = Marshal.SystemDefaultCharSize * 64; IntPtr namesBuffer = Marshal.AllocCoTaskMem(checked(stringSize * count)); FastDeviceCapabilities(SafeNativeMethods.DC_PAPERNAMES, namesBuffer, -1, printerName); @@ -1123,7 +1123,7 @@ namespace System.Drawing.Printing int count = FastDeviceCapabilities(SafeNativeMethods.DC_BINNAMES, IntPtr.Zero, -1, printerName); if (count == -1) - return new PaperSource[0]; + return Array.Empty(); // Contrary to documentation, DeviceCapabilities returns char[count, 24], // not char[count][24] diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrintingPermission.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrintingPermission.cs deleted file mode 100644 index f20f1b2a93..0000000000 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrintingPermission.cs +++ /dev/null @@ -1,220 +0,0 @@ -/* - * Copyright (c) 2000 Microsoft Corporation. All Rights Reserved. - * Microsoft Confidential. - */ - -namespace System.Drawing.Printing { - using System; - using System.Security; - using System.Security.Permissions; - using System.IO; - using System.Runtime.Serialization; - using System.Reflection; - using System.Collections; - using System.Globalization; - using System.Diagnostics.CodeAnalysis; - - /// - /// - /// Controls the ability to use the printer. This class cannot be inherited. - /// - [Serializable] - public sealed class PrintingPermission : CodeAccessPermission, IUnrestrictedPermission { - private PrintingPermissionLevel printingLevel; - - /// - /// - /// Initializes a new instance of the PrintingPermission class with either fully restricted - /// or unrestricted access, as specified. - /// - public PrintingPermission(PermissionState state) { - if (state == PermissionState.Unrestricted) { - printingLevel = PrintingPermissionLevel.AllPrinting; - } - else if (state == PermissionState.None) { - printingLevel = PrintingPermissionLevel.NoPrinting; - } - else { - throw new ArgumentException(SR.Format(SR.InvalidPermissionState)); - } - } - - /// - /// - /// [To be supplied.] - /// - public PrintingPermission(PrintingPermissionLevel printingLevel) { - VerifyPrintingLevel(printingLevel); - - this.printingLevel = printingLevel; - } - - /// - /// - /// [To be supplied.] - /// - public PrintingPermissionLevel Level { - get { - return printingLevel; - } - - set { - VerifyPrintingLevel(value); - printingLevel = value; - } - } - - private static void VerifyPrintingLevel(PrintingPermissionLevel level) { - if (level < PrintingPermissionLevel.NoPrinting || level > PrintingPermissionLevel.AllPrinting) { - throw new ArgumentException(SR.Format(SR.InvalidPermissionLevel)); - } - } - - - //------------------------------------------------------ - // - // CODEACCESSPERMISSION IMPLEMENTATION - // - //------------------------------------------------------ - - /// - /// - /// Gets a - /// value indicating whether permission is unrestricted. - /// - public bool IsUnrestricted() { - return printingLevel == PrintingPermissionLevel.AllPrinting; - } - - //------------------------------------------------------ - // - // IPERMISSION IMPLEMENTATION - // - //------------------------------------------------------ - - /// - /// - /// Determines whether the current permission object is a subset of - /// the specified permission. - /// - public override bool IsSubsetOf(IPermission target) { - if (target == null) { - return printingLevel == PrintingPermissionLevel.NoPrinting; - } - - PrintingPermission operand = target as PrintingPermission; - if(operand == null) { - throw new ArgumentException(SR.Format(SR.TargetNotPrintingPermission)); - } - return this.printingLevel <= operand.printingLevel; - } - - /// - /// - /// Creates and returns a permission that is the intersection of the current - /// permission object and a target permission object. - /// - public override IPermission Intersect(IPermission target) { - if (target == null) { - return null; - } - - PrintingPermission operand = target as PrintingPermission; - if(operand == null) { - throw new ArgumentException(SR.Format(SR.TargetNotPrintingPermission)); - } - PrintingPermissionLevel isectLevels = printingLevel < operand.printingLevel ? printingLevel : operand.printingLevel; - if (isectLevels == PrintingPermissionLevel.NoPrinting) - return null; - else - return new PrintingPermission(isectLevels); - } - - /// - /// - /// Creates a permission that is the union of the permission object - /// and the target parameter permission object. - /// - public override IPermission Union(IPermission target) { - if (target == null) { - return this.Copy(); - } - - PrintingPermission operand = target as PrintingPermission; - if(operand == null) { - throw new ArgumentException(SR.Format(SR.TargetNotPrintingPermission)); - } - PrintingPermissionLevel isectLevels = printingLevel > operand.printingLevel ? printingLevel : operand.printingLevel; - if (isectLevels == PrintingPermissionLevel.NoPrinting) - return null; - else - return new PrintingPermission(isectLevels); - } - - /// - /// - /// Creates and returns an identical copy of the current permission - /// object. - /// - [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity")] - public override IPermission Copy() { - return new PrintingPermission(this.printingLevel); - } - - - /// - /// - /// Creates an XML encoding of the security object and its current - /// state. - /// - public override SecurityElement ToXml() { - SecurityElement securityElement = new SecurityElement("IPermission"); - - securityElement.AddAttribute("class", this.GetType().FullName + ", " + this.GetType().Module.Assembly.FullName.Replace('\"', '\'')); - securityElement.AddAttribute("version", "1"); - if (!IsUnrestricted()) { - securityElement.AddAttribute("Level", Enum.GetName(typeof(PrintingPermissionLevel), printingLevel)); - } - else { - securityElement.AddAttribute("Unrestricted", "true"); - } - return securityElement; - } - - /// - /// - /// Reconstructs a security object with a specified state from an XML - /// encoding. - /// - [SuppressMessage("Microsoft.Performance", "CA1808:AvoidCallsThatBoxValueTypes")] - public override void FromXml(SecurityElement esd) { - if (esd == null) { - throw new ArgumentNullException("esd"); - } - - String className = esd.Attribute("class"); - - if (className == null || className.IndexOf(this.GetType().FullName) == -1) { - throw new ArgumentException(SR.Format(SR.InvalidClassName)); - } - - String unrestricted = esd.Attribute("Unrestricted"); - - if (unrestricted != null && String.Equals(unrestricted, "true", StringComparison.OrdinalIgnoreCase)) - { - printingLevel = PrintingPermissionLevel.AllPrinting; - return; - } - - printingLevel = PrintingPermissionLevel.NoPrinting; - - String printing = esd.Attribute("Level"); - - if (printing != null) - { - printingLevel = (PrintingPermissionLevel)Enum.Parse(typeof(PrintingPermissionLevel), printing); - } - } - } -} - diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrintingPermissionAttribute.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrintingPermissionAttribute.cs deleted file mode 100644 index bef5b5502b..0000000000 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrintingPermissionAttribute.cs +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2000 Microsoft Corporation. All Rights Reserved. - * Microsoft Confidential. - */ - -namespace System.Drawing.Printing { - using System; - using System.Security; - using System.Security.Permissions; - using System.IO; - using System.Runtime.Serialization; - using System.Reflection; - using System.Collections; - using System.Diagnostics.CodeAnalysis; - - /// - [AttributeUsage(AttributeTargets.All, AllowMultiple = true)] - public sealed class PrintingPermissionAttribute : CodeAccessSecurityAttribute { - PrintingPermissionLevel level; - - /// - public PrintingPermissionAttribute(SecurityAction action) : base(action) { - } - - - /// - public PrintingPermissionLevel Level { - get { - return level; - } - - set { - if (value < PrintingPermissionLevel.NoPrinting || value > PrintingPermissionLevel.AllPrinting) { - throw new ArgumentException(SR.Format(SR.PrintingPermissionAttributeInvalidPermissionLevel), "value"); - } - level = value; - } - } - - /// - [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity")] - public override IPermission CreatePermission() { - if (Unrestricted) { - return new PrintingPermission(PermissionState.Unrestricted); - } - else { - return new PrintingPermission(level); - } - } - } -} diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrintingPermissionLevel.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrintingPermissionLevel.cs deleted file mode 100644 index 971074cec4..0000000000 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrintingPermissionLevel.cs +++ /dev/null @@ -1,58 +0,0 @@ -/* - * PrintingPermission.cool - * - * Copyright (c) 2000 Microsoft Corporation. All Rights Reserved. - * Microsoft Confidential. - */ - -namespace System.Drawing.Printing { - using System; - - /// - /// - /// Specifies the type of printing that code is allowed to do. - /// - [Serializable] - public enum PrintingPermissionLevel { - /** - * No printing use allowed at all. - */ - /// - /// - /// Users have no ability to use any printers. - /// - NoPrinting = 0x0, - - /** - * Only allow safe printing use. - */ - /// - /// - /// Users can only use safe printing to print from a restricted dialog box. - /// - SafePrinting = 0x01, - - /** - * Use of the default printer allowed. - */ - /// - /// - /// Users can print programmically to the default printer along with safe printing through - /// a less restricted dialog box. - /// - DefaultPrinting = 0x02, - - /** - * All windows and all event may be used. - */ - /// - /// - /// - /// Users have full access to all printers on the network. - /// - /// - AllPrinting = 0x03, - - } -} - diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/RectangleConverter.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/RectangleConverter.cs index 32746ca795..d2d9790070 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/RectangleConverter.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/RectangleConverter.cs @@ -1,11 +1,7 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -//------------------------------------------------------------------------------ +// 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.Drawing { using System.Runtime.Serialization.Formatters; using System.Runtime.InteropServices; diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/SizeConverter.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/SizeConverter.cs index ba37bc593d..de0ce315c7 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/SizeConverter.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/SizeConverter.cs @@ -1,11 +1,7 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -//------------------------------------------------------------------------------ +// 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.Drawing { using System.Runtime.Serialization.Formatters; using System.Runtime.InteropServices; diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/SolidBrush.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/SolidBrush.cs index 4922d7c1dd..6c3e1365aa 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/SolidBrush.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/SolidBrush.cs @@ -7,7 +7,14 @@ using System.Runtime.InteropServices; namespace System.Drawing { +#if FEATURE_SYSTEM_EVENTS + using System.Drawing.Internal; +#endif + public sealed class SolidBrush : Brush +#if FEATURE_SYSTEM_EVENTS + , ISystemColorTracker +#endif { // GDI+ doesn't understand system colors, so we need to cache the value here. private Color _color = Color.Empty; @@ -22,6 +29,13 @@ namespace System.Drawing SafeNativeMethods.Gdip.CheckStatus(status); SetNativeBrushInternal(nativeBrush); + +#if FEATURE_SYSTEM_EVENTS + if (ColorUtil.IsSystemColor(_color)) + { + SystemColorTracker.Add(this); + } +#endif } internal SolidBrush(Color color, bool immutable) : this(color) @@ -87,6 +101,15 @@ namespace System.Drawing { Color oldColor = _color; InternalSetColor(value); + +#if FEATURE_SYSTEM_EVENTS + // NOTE: We never remove brushes from the active list, so if someone is + // changing their brush colors a lot, this could be a problem. + if (ColorUtil.IsSystemColor(value) && !ColorUtil.IsSystemColor(oldColor)) + { + SystemColorTracker.Add(this); + } +#endif } } } @@ -99,6 +122,16 @@ namespace System.Drawing _color = value; } + +#if FEATURE_SYSTEM_EVENTS + void ISystemColorTracker.OnSystemColorChanged() + { + if (NativeBrush != IntPtr.Zero) + { + InternalSetColor(_color); + } + } +#endif } } diff --git a/external/corefx/src/System.Drawing.Common/src/System/Drawing/SystemIcons.Unix.cs b/external/corefx/src/System.Drawing.Common/src/System/Drawing/SystemIcons.Unix.cs index 2516f81bfa..b9108ef632 100644 --- a/external/corefx/src/System.Drawing.Common/src/System/Drawing/SystemIcons.Unix.cs +++ b/external/corefx/src/System.Drawing.Common/src/System/Drawing/SystemIcons.Unix.cs @@ -36,7 +36,7 @@ namespace System.Drawing // LAME: I don't see why the "old" (win 2.x) names were exposed in the fx :| - public sealed class SystemIcons + public static class SystemIcons { static Icon[] icons; @@ -70,10 +70,6 @@ namespace System.Drawing #endif } - private SystemIcons() - { - } - // note: same as WinLogo (for Mono) public static Icon Application { diff --git a/external/corefx/src/System.Drawing.Common/tests/BitmapTests.cs b/external/corefx/src/System.Drawing.Common/tests/BitmapTests.cs index fee3341b55..51af0ba368 100644 --- a/external/corefx/src/System.Drawing.Common/tests/BitmapTests.cs +++ b/external/corefx/src/System.Drawing.Common/tests/BitmapTests.cs @@ -322,7 +322,7 @@ namespace System.Drawing.Tests [ConditionalFact(Helpers.GdiplusIsAvailable)] public void Ctor_NullGraphics_ThrowsArgumentNullException() { - AssertExtensions.Throws("g", "Value of 'null' is not valid for 'g'.", () => new Bitmap(1, 1, null)); + AssertExtensions.Throws("g", null, () => new Bitmap(1, 1, null)); } [ConditionalFact(Helpers.GdiplusIsAvailable)] diff --git a/external/corefx/src/System.Drawing.Common/tests/FontFamilyTests.cs b/external/corefx/src/System.Drawing.Common/tests/FontFamilyTests.cs index ad60729124..71c9f0063a 100644 --- a/external/corefx/src/System.Drawing.Common/tests/FontFamilyTests.cs +++ b/external/corefx/src/System.Drawing.Common/tests/FontFamilyTests.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Drawing.Text; -using System.Globalization; using Xunit; namespace System.Drawing.Tests @@ -57,7 +56,6 @@ namespace System.Drawing.Tests [ActiveIssue(20884, TestPlatforms.AnyUnix)] [ConditionalTheory(Helpers.GdiplusIsAvailable)] [InlineData(null)] - [InlineData("")] [InlineData("NoSuchFont")] [InlineData("Serif")] public void Ctor_NoSuchFontName_ThrowsArgumentException(string name) diff --git a/external/corefx/src/System.Drawing.Common/tests/FontTests.cs b/external/corefx/src/System.Drawing.Common/tests/FontTests.cs index e742cedcf1..5a7b2a3810 100644 --- a/external/corefx/src/System.Drawing.Common/tests/FontTests.cs +++ b/external/corefx/src/System.Drawing.Common/tests/FontTests.cs @@ -16,6 +16,51 @@ namespace System.Drawing.Tests yield return new object[] { FontFamily.GenericSerif, float.MaxValue }; } + public static IEnumerable FontFamily_Equals_SameFamily_TestData() + { + yield return new object[] { FontFamily.GenericMonospace, 1 }; + yield return new object[] { FontFamily.GenericSerif, float.MaxValue }; + yield return new object[] { FontFamily.GenericSansSerif, 10 }; + } + + public static IEnumerable FontFamily_Equals_DifferentFamily_TestData() + { + yield return new object[] { FontFamily.GenericMonospace, FontFamily.GenericSerif }; + yield return new object[] { FontFamily.GenericSansSerif, FontFamily.GenericSerif }; + yield return new object[] { FontFamily.GenericSansSerif, FontFamily.GenericMonospace }; + } + + [ConditionalTheory(Helpers.GdiplusIsAvailable)] + [MemberData(nameof(FontFamily_Equals_SameFamily_TestData))] + public void Font_Equals_SameFontFamily(FontFamily fontFamily, float size) + { + using (var font1 = new Font(fontFamily, size)) + using (var font2 = new Font(fontFamily, size)) + { + Assert.True(font1.Equals(font2)); + } + } + + [ConditionalTheory(Helpers.GdiplusIsAvailable)] + [MemberData(nameof(FontFamily_Equals_DifferentFamily_TestData))] + public void Font_Equals_DifferentFontFamily(FontFamily fontFamily1, FontFamily fontFamily2) + { + using (var font1 = new Font(fontFamily1, 9)) + using (var font2 = new Font(fontFamily2, 9)) + { + // In some Linux distros all the default fonts live under the same family (Fedora, Centos, Redhat) + if (font1.FontFamily.GetHashCode() != font2.FontFamily.GetHashCode()) + Assert.False(font1.Equals(font2)); + } + } + + [ConditionalFact(Helpers.GdiplusIsAvailable)] + public void FontFamily_Equals_NullObject() + { + FontFamily nullFamily = null; + Assert.False(FontFamily.GenericMonospace.Equals(nullFamily)); + } + [ActiveIssue(20884, TestPlatforms.AnyUnix)] [ConditionalTheory(Helpers.GdiplusIsAvailable)] [MemberData(nameof(Ctor_Family_Size_TestData))] @@ -302,20 +347,6 @@ namespace System.Drawing.Tests } } - [ActiveIssue(20884, TestPlatforms.AnyUnix)] - [ConditionalTheory(Helpers.GdiplusIsAvailable)] - [InlineData(null)] - [InlineData("")] - [InlineData("NoSuchFont")] - [InlineData("Serif")] - public void Ctor_NoSuchFamilyName_SetsFamilyToGenericSansSerif(string familyName) - { - using (var font = new Font(familyName, 10)) - { - Assert.Equal("Microsoft Sans Serif", font.FontFamily.Name); - } - } - [ConditionalFact(Helpers.GdiplusIsAvailable)] public void Ctor_NullFont_ThrowsNullReferenceException() { diff --git a/external/corefx/src/System.Drawing.Common/tests/Imaging/EncoderParameterTests.cs b/external/corefx/src/System.Drawing.Common/tests/Imaging/EncoderParameterTests.cs index b59d2b309e..03893ce999 100644 --- a/external/corefx/src/System.Drawing.Common/tests/Imaging/EncoderParameterTests.cs +++ b/external/corefx/src/System.Drawing.Common/tests/Imaging/EncoderParameterTests.cs @@ -318,7 +318,7 @@ namespace System.Drawing.Imaging.Tests [InlineData(int.MinValue)] public void Ctor_Encoder_NegativeNumberOfValues_Type_Value_OutOfMemoryException(int numberOfValues) { - if (numberOfValues == -1 && PlatformDetection.IsUbuntu1710) // [ActiveIssue(24274)] + if (numberOfValues == -1 && PlatformDetection.IsUbuntu1710OrHigher) // [ActiveIssue(24274)] return; IntPtr anyValue = IntPtr.Zero; diff --git a/external/corefx/src/System.Drawing.Common/tests/Imaging/MetafileTests.cs b/external/corefx/src/System.Drawing.Common/tests/Imaging/MetafileTests.cs index 443a4df835..283784291a 100644 --- a/external/corefx/src/System.Drawing.Common/tests/Imaging/MetafileTests.cs +++ b/external/corefx/src/System.Drawing.Common/tests/Imaging/MetafileTests.cs @@ -90,7 +90,7 @@ namespace System.Drawing.Imaging.Tests [ActiveIssue(20884, TestPlatforms.AnyUnix)] [ConditionalTheory(Helpers.GdiplusIsAvailable)] - [InlineData(@"fileNo*-//\\#@(found")] + [InlineData("bad\0name")] [InlineData("")] public void Ctor_InvalidPath_ThrowsArgumentException(string path) { @@ -464,7 +464,7 @@ namespace System.Drawing.Imaging.Tests [ActiveIssue(20884, TestPlatforms.AnyUnix)] [ConditionalTheory(Helpers.GdiplusIsAvailable)] - [InlineData(@"fileNo*-//\\#@(found")] + [InlineData("bad\0path")] [InlineData("")] public void Ctor_InvalidPathI_ThrowsArgumentException(string fileName) { @@ -749,7 +749,7 @@ namespace System.Drawing.Imaging.Tests [ActiveIssue(20884, TestPlatforms.AnyUnix)] [ConditionalTheory(Helpers.GdiplusIsAvailable)] - [InlineData(@"fileNo*-//\\#@(found")] + [InlineData("bad\0path")] [InlineData("")] public void Ctor_InvalidPathII_ThrowsArgumentException(string fileName) { @@ -940,7 +940,7 @@ namespace System.Drawing.Imaging.Tests [ActiveIssue(20884, TestPlatforms.AnyUnix)] [ConditionalTheory(Helpers.GdiplusIsAvailable)] - [InlineData(@"fileNo*-//\\#@(found")] + [InlineData("bad\0path")] [InlineData("")] public void Static_GetMetafileHeader_InvalidPath_ThrowsArgumentException(string fileName) { diff --git a/external/corefx/src/System.Drawing.Common/tests/Printing/PrintDocumentTests.cs b/external/corefx/src/System.Drawing.Common/tests/Printing/PrintDocumentTests.cs index de604b044b..aa8e61f48c 100644 --- a/external/corefx/src/System.Drawing.Common/tests/Printing/PrintDocumentTests.cs +++ b/external/corefx/src/System.Drawing.Common/tests/Printing/PrintDocumentTests.cs @@ -256,8 +256,6 @@ namespace System.Drawing.Printing.Tests break; } - Assert.False(pageSettings.Landscape); - Assert.Equal(PaperSourceKind.FormSource, pageSettings.PaperSource.Kind); Assert.Equal(PrinterResolutionKind.Custom, pageSettings.PrinterResolution.Kind); Assert.True(pageSettings.PrinterSettings.IsDefaultPrinter); } diff --git a/external/corefx/src/System.Drawing.Common/tests/Printing/PrinterSettingsTests.cs b/external/corefx/src/System.Drawing.Common/tests/Printing/PrinterSettingsTests.cs index 9569246895..ec6ab61f6b 100644 --- a/external/corefx/src/System.Drawing.Common/tests/Printing/PrinterSettingsTests.cs +++ b/external/corefx/src/System.Drawing.Common/tests/Printing/PrinterSettingsTests.cs @@ -55,7 +55,7 @@ namespace System.Drawing.Printing.Tests public void Copies_Default_ReturnsExpected() { var printerSettings = new PrinterSettings(); - Assert.Equal(1, printerSettings.Copies); + int copies = printerSettings.Copies; } [ConditionalTheory(Helpers.GdiplusIsAvailable)] @@ -396,7 +396,7 @@ namespace System.Drawing.Printing.Tests public void IsDirectPrintingSupported_ImageFormatSupported_ReturnsExpected(ImageFormat imageFormat) { var printerSettings = new PrinterSettings(); - Assert.Equal(true, printerSettings.IsDirectPrintingSupported(imageFormat)); + bool supported = printerSettings.IsDirectPrintingSupported(imageFormat); } public static IEnumerable IsDirectPrintingSupported_ImageFormatNotSupported_TestData() @@ -436,7 +436,7 @@ namespace System.Drawing.Printing.Tests public void SupportsColor_ReturnsExpected() { var printerSettings = new PrinterSettings(); - Assert.Equal(true, printerSettings.SupportsColor); + bool supportsColor = printerSettings.SupportsColor; } [Theory] @@ -579,11 +579,13 @@ namespace System.Drawing.Printing.Tests } [ActiveIssue(20884, TestPlatforms.AnyUnix)] - [ConditionalFact(Helpers.GdiplusIsAvailable)] + [ConditionalFact(typeof(PrinterSettingsTests), nameof(CanTestSetHdevmode_IntPtr_Success))] public void SetHdevmode_IntPtr_Success() { - var printerSettings = new PrinterSettings() { Copies = 3 }; - var newPrinterSettings = new PrinterSettings() { Copies = 6 }; + string printerName = GetNameOfTestPrinterSuitableForDevModeTesting(); + var printerSettings = new PrinterSettings() { PrinterName = printerName, Copies = 3 }; + var newPrinterSettings = new PrinterSettings() { PrinterName = printerName, Copies = 6 }; + IntPtr handle = printerSettings.GetHdevmode(); newPrinterSettings.SetHdevmode(handle); Assert.Equal(printerSettings.Copies, newPrinterSettings.Copies); @@ -591,6 +593,28 @@ namespace System.Drawing.Printing.Tests Assert.Equal(printerSettings.Duplex, newPrinterSettings.Duplex); } + public static bool CanTestSetHdevmode_IntPtr_Success => Helpers.GetGdiplusIsAvailable() && GetNameOfTestPrinterSuitableForDevModeTesting() != null; + + private static string GetNameOfTestPrinterSuitableForDevModeTesting() + { + foreach (string candidate in s_TestPrinterNames) + { + PrinterSettings printerSettings = new PrinterSettings() { PrinterName = candidate }; + if (printerSettings.IsValid) + return candidate; + } + return null; + } + + private static readonly string[] s_TestPrinterNames = + { + // Our method of testing this api requires a printer that supports multi-copy printing, collating and duplex settings. Not all printers + // support these so rather than trust the machine running the test to have configured such a printer as the default, use the name of + // a known compliant printer that ships with Windows 10. + "Microsoft Print to PDF", + "Microsoft XPS Document Writer", // Backup for older Windows + }; + [ActiveIssue(20884, TestPlatforms.AnyUnix)] [ConditionalFact(Helpers.GdiplusIsAvailable)] public void GetHdevmode_Zero_ThrowsArgumentException() diff --git a/external/corefx/src/System.Drawing.Primitives/src/PinvokeAnalyzerExceptionList.analyzerdata b/external/corefx/src/System.Drawing.Primitives/src/PinvokeAnalyzerExceptionList.analyzerdata new file mode 100644 index 0000000000..f34a4770cf --- /dev/null +++ b/external/corefx/src/System.Drawing.Primitives/src/PinvokeAnalyzerExceptionList.analyzerdata @@ -0,0 +1 @@ +user32.dll!GetSysColor diff --git a/external/corefx/src/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj b/external/corefx/src/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj index fdc487ae3b..032f8247d1 100644 --- a/external/corefx/src/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj +++ b/external/corefx/src/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj @@ -7,8 +7,6 @@ System.Drawing.Primitives {8F472B93-574C-4AEC-9D28-6C2360A55BBF} $(DefineConstants);FEATURE_WINDOWS_SYSTEM_COLORS - - false diff --git a/external/corefx/src/System.Drawing.Primitives/tests/DataContractSerializerTests.cs b/external/corefx/src/System.Drawing.Primitives/tests/DataContractSerializerTests.cs new file mode 100644 index 0000000000..86fe8d44a0 --- /dev/null +++ b/external/corefx/src/System.Drawing.Primitives/tests/DataContractSerializerTests.cs @@ -0,0 +1,146 @@ +// 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; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Xunit; +using System.Runtime.Serialization.Tests; +using System.Drawing; + +namespace System.Drawing.Primitives.Tests +{ + public class DataContractSerializerTests + { + [Fact] + public static void DCS_Point() + { + var objs = new Point[] + { + new Point(0,0), + new Point(1,2), + new Point(new Size(1,2)) + }; + var serializedStrings = new string[] + { + @"00", + @"12", + @"12" + }; + for (int i = 0; i < objs.Length; i++) + { + Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(objs[i], serializedStrings[i]), objs[i]); + } + } + + [Fact] + public static void DCS_PointF() + { + var objs = new PointF[] + { + new PointF(0, 0), + new PointF(1,2), + new PointF(1.5000f,-1.5000f) + }; + var serializedStrings = new string[] + { + @"00", + @"12", + @"1.5-1.5" + }; + for (int i = 0; i < objs.Length; i++) + { + Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(objs[i], serializedStrings[i]), objs[i]); + } + } + + [Fact] + public static void DCS_Rectangle() + { + var objs = new Rectangle[] + { + new Rectangle(0, 0, 0, 0), + new Rectangle(1, 2, 1, 2), + new Rectangle(new Point(1,2), new Size(1,2)), + new Rectangle(1, -2, 1, -2) + }; + var serializedStrings = new string[] + { + @"0000", + @"2112", + @"2112", + @"-211-2" + }; + for (int i = 0; i < objs.Length; i++) + { + Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(objs[i], serializedStrings[i]), objs[i]); + } + } + + [Fact] + public static void DCS_RectangleF() + { + var objs = new RectangleF[] + { + new RectangleF(0, 0, 0, 0), + new RectangleF(new PointF(1.5000f,2.5000f), new SizeF(1.5000f,2.5000f)), + new RectangleF(1.50001f, -2.5000f, 1.5000f, -2.5000f) + }; + var serializedStrings = new string[] + { + @"0000", + @"2.51.51.52.5", + @"-2.51.51.50001-2.5" + }; + for (int i = 0; i < objs.Length; i++) + { + Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(objs[i], serializedStrings[i]), objs[i]); + } + } + + [Fact] + public static void DCS_Size() + { + var objs = new Size[] + { + new Size(0,0), + new Size(new Point(1,2)), + new Size(1,2) + }; + var serializedStrings = new string[] + { + @"00", + @"21", + @"21" + }; + for (int i = 0; i < objs.Length; i++) + { + Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(objs[i], serializedStrings[i]), objs[i]); + } + } + + [Fact] + public static void DCS_SizeF() + { + var objs = new SizeF[] + { + new SizeF(0,0), + new SizeF(new PointF(1.5000f,-2.5000f)), + new SizeF(1.5000f,-2.5000f) + }; + var serializedStrings = new string[] + { + @"00", + @"-2.51.5", + @"-2.51.5" + }; + for (int i = 0; i < objs.Length; i++) + { + Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(objs[i], serializedStrings[i]), objs[i]); + } + } + } +} diff --git a/external/corefx/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj b/external/corefx/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj index 3349020d86..a22538b184 100644 --- a/external/corefx/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj +++ b/external/corefx/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj @@ -11,6 +11,7 @@ + @@ -21,6 +22,8 @@ Common\System\Diagnostics\DebuggerAttributes.cs + + diff --git a/external/corefx/src/System.Globalization.Calendars/tests/CalendarHelpers.cs b/external/corefx/src/System.Globalization.Calendars/tests/CalendarHelpers.cs index 3551a4ad03..6f6d6eecc0 100644 --- a/external/corefx/src/System.Globalization.Calendars/tests/CalendarHelpers.cs +++ b/external/corefx/src/System.Globalization.Calendars/tests/CalendarHelpers.cs @@ -344,7 +344,7 @@ namespace System.Globalization.Tests // Day is invalid Assert.Throws(() => calendar.ToDateTime(year, month, -1, hour, minute, second, millisecond, era)); Assert.Throws(() => calendar.ToDateTime(year, month, 0, hour, minute, second, millisecond, era)); - Assert.Throws(() => calendar.ToDateTime(year, month, calendar.GetDaysInMonth(year, month, era) + 1, minute, second, millisecond, era)); + Assert.Throws(() => calendar.ToDateTime(year, month, calendar.GetDaysInMonth(year, month, era) + 1, hour, minute, second, millisecond, era)); // Hour is invalid Assert.Throws(() => calendar.ToDateTime(year, month, day, -1, minute, second, millisecond, era)); diff --git a/external/corefx/src/System.Globalization.Calendars/tests/JapaneseCalendar/JapaneseCalendarEras.cs b/external/corefx/src/System.Globalization.Calendars/tests/JapaneseCalendar/JapaneseCalendarEras.cs index f1d99090fa..18804c16f3 100644 --- a/external/corefx/src/System.Globalization.Calendars/tests/JapaneseCalendar/JapaneseCalendarEras.cs +++ b/external/corefx/src/System.Globalization.Calendars/tests/JapaneseCalendar/JapaneseCalendarEras.cs @@ -11,7 +11,17 @@ namespace System.Globalization.Tests [Fact] public void Eras() { - Assert.Equal(new int[] { 4, 3, 2, 1 }, new JapaneseCalendar().Eras); + int[] eras = new JapaneseCalendar().Eras; + int noOfEras = eras.Length; + + Assert.True(noOfEras >= 4); + + // eras should be [ noOfEras, noOfEras - 1, ..., 1 ] + Assert.Equal(noOfEras, eras[0]); + for (int i = 0; i < noOfEras; i++) + { + Assert.Equal(noOfEras - i, eras[i]); + } } } } diff --git a/external/corefx/src/System.Globalization.Calendars/tests/Misc/MiscCalendars.cs b/external/corefx/src/System.Globalization.Calendars/tests/Misc/MiscCalendars.cs index 1db11ee247..ba37f53920 100644 --- a/external/corefx/src/System.Globalization.Calendars/tests/Misc/MiscCalendars.cs +++ b/external/corefx/src/System.Globalization.Calendars/tests/Misc/MiscCalendars.cs @@ -40,7 +40,7 @@ namespace System.Globalization.Tests public static void JapaneseTest() { JapaneseCalendar jCal = new JapaneseCalendar(); - DateTime dTest = jCal.ToDateTime(1, 1, 8, 0, 0, 0, 0); + DateTime dTest = jCal.ToDateTime(1, 1, 8, 0, 0, 0, 0, 4); Assert.Equal(dTest, new DateTime(1989, 1, 8)); } } diff --git a/external/corefx/src/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj b/external/corefx/src/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj index 286fca0138..d54d23056b 100644 --- a/external/corefx/src/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj +++ b/external/corefx/src/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj @@ -8,19 +8,12 @@ - + - - - - + - - - - \ No newline at end of file diff --git a/external/corefx/src/System.Globalization.Extensions/ref/System.Globalization.Extensions.netfx.cs b/external/corefx/src/System.Globalization.Extensions/ref/System.Globalization.Extensions.netfx.cs deleted file mode 100644 index bdb68e8d21..0000000000 --- a/external/corefx/src/System.Globalization.Extensions/ref/System.Globalization.Extensions.netfx.cs +++ /dev/null @@ -1,25 +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. - -[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Text.NormalizationForm))] -[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Globalization.IdnMapping))] - -namespace System -{ - public static class StringNormalizationExtensions - { - public static bool IsNormalized(this string value) { return default(bool); } - public static bool IsNormalized(this string value, System.Text.NormalizationForm normalizationForm) { return default(bool); } - public static String Normalize(this string value) { return default(string); } - public static String Normalize(this string value, System.Text.NormalizationForm normalizationForm) { return default(string); } - } -} - -namespace System.Globalization -{ - public static partial class GlobalizationExtensions - { - public static StringComparer GetStringComparer(this CompareInfo compareInfo, CompareOptions options) { return default(StringComparer); } - } -} diff --git a/external/corefx/src/System.Globalization.Extensions/src/ApiCompatBaseline.netfx.txt b/external/corefx/src/System.Globalization.Extensions/src/ApiCompatBaseline.netfx.txt deleted file mode 100644 index 00cbe9f3a4..0000000000 --- a/external/corefx/src/System.Globalization.Extensions/src/ApiCompatBaseline.netfx.txt +++ /dev/null @@ -1,4 +0,0 @@ -# This one is needed because when ApiCompat looks for the type, it will first check the v4.6.x targetting pack and find the System.Runtime.Extensions file -# which is not the latest (the one we just built) and it will load that instead of the one built inside CoreFx. -TypesMustExist : Type 'System.StringNormalizationExtensions' does not exist in the implementation but it does exist in the contract. -TypesMustExist : Type 'System.Globalization.GlobalizationExtensions' does not exist in the implementation but it does exist in the contract. diff --git a/external/corefx/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj b/external/corefx/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj index f8bf84548b..5422665637 100644 --- a/external/corefx/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj +++ b/external/corefx/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj @@ -9,7 +9,6 @@ true {2B96AA10-84C0-4927-8611-8D2474B990E8} true - true @@ -17,21 +16,9 @@ - - - - - - - - + - - - - - \ No newline at end of file diff --git a/external/corefx/src/System.Globalization.Extensions/src/System/Globalization/Extensions.cs b/external/corefx/src/System.Globalization.Extensions/src/System/Globalization/Extensions.cs deleted file mode 100644 index bf48d06e06..0000000000 --- a/external/corefx/src/System.Globalization.Extensions/src/System/Globalization/Extensions.cs +++ /dev/null @@ -1,98 +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; -using System.Diagnostics; - -namespace System.Globalization -{ - public static class GlobalizationExtensions - { - public static StringComparer GetStringComparer(this CompareInfo compareInfo, CompareOptions options) - { - if (compareInfo == null) - { - throw new ArgumentNullException(nameof(compareInfo)); - } - - if (options == CompareOptions.Ordinal) - { - return StringComparer.Ordinal; - } - - if (options == CompareOptions.OrdinalIgnoreCase) - { - return StringComparer.OrdinalIgnoreCase; - } - - if ((options & CultureAwareComparer.ValidCompareMaskOffFlags) != 0) - { - throw new ArgumentException(SR.Argument_InvalidFlag, nameof(options)); - } - - return new CultureAwareComparer(compareInfo, options); - } - } - - [Serializable] - internal sealed class CultureAwareComparer : StringComparer - { - internal const CompareOptions ValidCompareMaskOffFlags = - ~(CompareOptions.IgnoreCase | CompareOptions.IgnoreSymbols | CompareOptions.IgnoreNonSpace | - CompareOptions.IgnoreWidth | CompareOptions.IgnoreKanaType | CompareOptions.StringSort); - - private readonly CompareInfo _compareInfo; - private readonly CompareOptions _options; - - internal CultureAwareComparer(CompareInfo compareInfo, CompareOptions options) - { - Debug.Assert((options & ValidCompareMaskOffFlags) == 0); - _compareInfo = compareInfo; - _options = options; - } - - public override int Compare(string x, string y) - { - if (Object.ReferenceEquals(x, y)) return 0; - if (x == null) return -1; - if (y == null) return 1; - return _compareInfo.Compare(x, y, _options); - } - - public override bool Equals(string x, string y) - { - if (Object.ReferenceEquals(x, y)) return true; - if (x == null || y == null) return false; - - return (_compareInfo.Compare(x, y, _options) == 0); - } - - public override int GetHashCode(string obj) - { - if (obj == null) - { - throw new ArgumentNullException(nameof(obj)); - } - - // StringSort used in compare operation and not with the hashing - return _compareInfo.GetHashCode(obj, _options & (~CompareOptions.StringSort)); - } - - // Equals method for the comparer itself. - public override bool Equals(object obj) - { - CultureAwareComparer comparer = obj as CultureAwareComparer; - return - comparer != null && - _options == comparer._options && - _compareInfo.Equals(comparer._compareInfo); - } - - public override int GetHashCode() - { - return _compareInfo.GetHashCode() ^ ((int)_options & 0x7FFFFFFF); - } - } -} - diff --git a/external/corefx/src/System.Globalization.Extensions/src/System/StringNormalizationExtensions.netfx.cs b/external/corefx/src/System.Globalization.Extensions/src/System/StringNormalizationExtensions.netfx.cs deleted file mode 100644 index 02cfa407ae..0000000000 --- a/external/corefx/src/System.Globalization.Extensions/src/System/StringNormalizationExtensions.netfx.cs +++ /dev/null @@ -1,29 +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 -{ - public static class StringNormalizationExtensions - { - public static bool IsNormalized(this string value) - { - return value.IsNormalized(); - } - - public static bool IsNormalized(this string value, System.Text.NormalizationForm normalizationForm) - { - return value.IsNormalized(normalizationForm); - } - - public static String Normalize(this string value) - { - return value.Normalize(); - } - - public static String Normalize(this string value, System.Text.NormalizationForm normalizationForm) - { - return value.Normalize(normalizationForm); - } - } -} diff --git a/external/corefx/src/System.Globalization.Extensions/tests/IdnMapping/IdnMappingGetAsciiTests.cs b/external/corefx/src/System.Globalization.Extensions/tests/IdnMapping/IdnMappingGetAsciiTests.cs index 977f74d0f0..020f0ef947 100644 --- a/external/corefx/src/System.Globalization.Extensions/tests/IdnMapping/IdnMappingGetAsciiTests.cs +++ b/external/corefx/src/System.Globalization.Extensions/tests/IdnMapping/IdnMappingGetAsciiTests.cs @@ -84,6 +84,17 @@ namespace System.Globalization.Tests Assert.Equal(expected, new IdnMapping().GetAscii(unicode, index, count)); } + [SkipOnTargetFramework(~TargetFrameworkMonikers.Netcoreapp, "Optimization in .NET Core")] + [Theory] + [InlineData("www.microsoft.com")] + [InlineData("bing.com")] + public void GetAscii_NoTranslationNeeded_ResultIsSameObjectAsInput(string input) + { + Assert.Same(input, new IdnMapping().GetAscii(input)); + Assert.NotSame(input, new IdnMapping().GetAscii(input.Substring(1))); + Assert.NotSame(input, new IdnMapping().GetAscii(input.Substring(0, input.Length - 1))); + } + [Fact] public void TestGetAsciiWithDot() { diff --git a/external/corefx/src/System.Globalization.Extensions/tests/IdnMapping/IdnMappingGetUnicodeTests.cs b/external/corefx/src/System.Globalization.Extensions/tests/IdnMapping/IdnMappingGetUnicodeTests.cs index 142d30c535..3022b3a869 100644 --- a/external/corefx/src/System.Globalization.Extensions/tests/IdnMapping/IdnMappingGetUnicodeTests.cs +++ b/external/corefx/src/System.Globalization.Extensions/tests/IdnMapping/IdnMappingGetUnicodeTests.cs @@ -59,6 +59,17 @@ namespace System.Globalization.Tests Assert.Equal(expected, new IdnMapping().GetUnicode(ascii, index, count)); } + [SkipOnTargetFramework(~TargetFrameworkMonikers.Netcoreapp, "Optimization in .NET Core")] + [Theory] + [InlineData("www.microsoft.com")] + [InlineData("bing.com")] + public void GetUnicode_NoTranslationNeeded_ResultIsSameObjectAsInput(string input) + { + Assert.Same(input, new IdnMapping().GetUnicode(input)); + Assert.NotSame(input, new IdnMapping().GetUnicode(input.Substring(1))); + Assert.NotSame(input, new IdnMapping().GetUnicode(input.Substring(0, input.Length - 1))); + } + public static IEnumerable GetUnicode_Invalid_TestData() { // Ascii is null diff --git a/external/corefx/src/System.Globalization/System.Globalization.sln b/external/corefx/src/System.Globalization/System.Globalization.sln index 8b0c64a0bd..5fc9a81913 100644 --- a/external/corefx/src/System.Globalization/System.Globalization.sln +++ b/external/corefx/src/System.Globalization/System.Globalization.sln @@ -36,10 +36,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {484C92C6-6D2C-45BC-A5E2-4A12BA228E1E}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {484C92C6-6D2C-45BC-A5E2-4A12BA228E1E}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {484C92C6-6D2C-45BC-A5E2-4A12BA228E1E}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {484C92C6-6D2C-45BC-A5E2-4A12BA228E1E}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU + {484C92C6-6D2C-45BC-A5E2-4A12BA228E1E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {484C92C6-6D2C-45BC-A5E2-4A12BA228E1E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {484C92C6-6D2C-45BC-A5E2-4A12BA228E1E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {484C92C6-6D2C-45BC-A5E2-4A12BA228E1E}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {9A8926D9-1D4C-4069-8965-A626F6CA8C29}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {9A8926D9-1D4C-4069-8965-A626F6CA8C29}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {9A8926D9-1D4C-4069-8965-A626F6CA8C29}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/external/corefx/src/System.Globalization/tests/CharUnicodeInfo/CharUnicodeInfoTestData.cs b/external/corefx/src/System.Globalization/tests/CharUnicodeInfo/CharUnicodeInfoTestData.cs index 51d5a3714e..a71c4d9cd4 100644 --- a/external/corefx/src/System.Globalization/tests/CharUnicodeInfo/CharUnicodeInfoTestData.cs +++ b/external/corefx/src/System.Globalization/tests/CharUnicodeInfo/CharUnicodeInfoTestData.cs @@ -30,7 +30,7 @@ namespace System.Globalization.Tests private static int s_rangeMinCodePoint; private static void Parse(List testCases, string line) { - // Data is in the format: + // Data is in the format: // code-value; // character-name; // general-category; @@ -48,7 +48,7 @@ namespace System.Globalization.Tests int codePoint = int.Parse(charValueString, NumberStyles.HexNumber); Parse(testCases, codePoint, charCategoryString, numericValueString); - + if (charName.EndsWith("First>")) { s_rangeMinCodePoint = codePoint; @@ -110,7 +110,8 @@ namespace System.Globalization.Tests { Utf32CodeValue = codeValueRepresentation, GeneralCategory = generalCategory, - NumericValue = numericValue + NumericValue = numericValue, + CodePoint = codePoint }); } @@ -144,6 +145,7 @@ namespace System.Globalization.Tests public class CharUnicodeInfoTestCase { public string Utf32CodeValue { get; set; } + public int CodePoint { get; set; } public UnicodeCategory GeneralCategory { get; set; } public double NumericValue { get; set; } } diff --git a/external/corefx/src/System.Globalization/tests/CharUnicodeInfo/CharUnicodeInfoTests.cs b/external/corefx/src/System.Globalization/tests/CharUnicodeInfo/CharUnicodeInfoTests.cs index 8cbe2f920a..74f09fac2f 100644 --- a/external/corefx/src/System.Globalization/tests/CharUnicodeInfo/CharUnicodeInfoTests.cs +++ b/external/corefx/src/System.Globalization/tests/CharUnicodeInfo/CharUnicodeInfoTests.cs @@ -20,6 +20,9 @@ namespace System.Globalization.Tests } // Test the string overload for a surrogate pair or a single char GetUnicodeCategory(testCase.Utf32CodeValue, new UnicodeCategory[] { testCase.GeneralCategory }); +#if netcoreapp + Assert.Equal(testCase.GeneralCategory, CharUnicodeInfo.GetUnicodeCategory(testCase.CodePoint)); +#endif // netcoreapp } } @@ -123,65 +126,65 @@ namespace System.Globalization.Tests return $"CodeValue: {((int)ch).ToString("X")}; Expected: {expected}; Actual: {actual}"; } - public static string s_numericsCodepoints = + public static string s_numericsCodepoints = "\u0030\u0031\u0032\u0033\u0034\u0035\u0036\u0037\u0038\u0039" + - "\u0660\u0661\u0662\u0663\u0664\u0665\u0666\u0667\u0668\u0669" + + "\u0660\u0661\u0662\u0663\u0664\u0665\u0666\u0667\u0668\u0669" + "\u06f0\u06f1\u06f2\u06f3\u06f4\u06f5\u06f6\u06f7\u06f8\u06f9" + - "\u07c0\u07c1\u07c2\u07c3\u07c4\u07c5\u07c6\u07c7\u07c8\u07c9" + + "\u07c0\u07c1\u07c2\u07c3\u07c4\u07c5\u07c6\u07c7\u07c8\u07c9" + "\u0966\u0967\u0968\u0969\u096a\u096b\u096c\u096d\u096e\u096f" + - "\u09e6\u09e7\u09e8\u09e9\u09ea\u09eb\u09ec\u09ed\u09ee\u09ef" + - "\u0a66\u0a67\u0a68\u0a69\u0a6a\u0a6b\u0a6c\u0a6d\u0a6e\u0a6f" + - "\u0ae6\u0ae7\u0ae8\u0ae9\u0aea\u0aeb\u0aec\u0aed\u0aee\u0aef" + - "\u0b66\u0b67\u0b68\u0b69\u0b6a\u0b6b\u0b6c\u0b6d\u0b6e\u0b6f" + - "\u0be6\u0be7\u0be8\u0be9\u0bea\u0beb\u0bec\u0bed\u0bee\u0bef" + - "\u0c66\u0c67\u0c68\u0c69\u0c6a\u0c6b\u0c6c\u0c6d\u0c6e\u0c6f" + - "\u0ce6\u0ce7\u0ce8\u0ce9\u0cea\u0ceb\u0cec\u0ced\u0cee\u0cef" + - "\u0d66\u0d67\u0d68\u0d69\u0d6a\u0d6b\u0d6c\u0d6d\u0d6e\u0d6f" + - "\u0e50\u0e51\u0e52\u0e53\u0e54\u0e55\u0e56\u0e57\u0e58\u0e59" + - "\u0ed0\u0ed1\u0ed2\u0ed3\u0ed4\u0ed5\u0ed6\u0ed7\u0ed8\u0ed9" + - "\u0f20\u0f21\u0f22\u0f23\u0f24\u0f25\u0f26\u0f27\u0f28\u0f29" + - "\u1040\u1041\u1042\u1043\u1044\u1045\u1046\u1047\u1048\u1049" + - "\u1090\u1091\u1092\u1093\u1094\u1095\u1096\u1097\u1098\u1099" + - "\u17e0\u17e1\u17e2\u17e3\u17e4\u17e5\u17e6\u17e7\u17e8\u17e9" + - "\u1810\u1811\u1812\u1813\u1814\u1815\u1816\u1817\u1818\u1819" + - "\u1946\u1947\u1948\u1949\u194a\u194b\u194c\u194d\u194e\u194f" + - "\u19d0\u19d1\u19d2\u19d3\u19d4\u19d5\u19d6\u19d7\u19d8\u19d9" + - "\u1a80\u1a81\u1a82\u1a83\u1a84\u1a85\u1a86\u1a87\u1a88\u1a89" + - "\u1a90\u1a91\u1a92\u1a93\u1a94\u1a95\u1a96\u1a97\u1a98\u1a99" + - "\u1b50\u1b51\u1b52\u1b53\u1b54\u1b55\u1b56\u1b57\u1b58\u1b59" + - "\u1bb0\u1bb1\u1bb2\u1bb3\u1bb4\u1bb5\u1bb6\u1bb7\u1bb8\u1bb9" + - "\u1c40\u1c41\u1c42\u1c43\u1c44\u1c45\u1c46\u1c47\u1c48\u1c49" + - "\u1c50\u1c51\u1c52\u1c53\u1c54\u1c55\u1c56\u1c57\u1c58\u1c59" + - "\ua620\ua621\ua622\ua623\ua624\ua625\ua626\ua627\ua628\ua629" + - "\ua8d0\ua8d1\ua8d2\ua8d3\ua8d4\ua8d5\ua8d6\ua8d7\ua8d8\ua8d9" + - "\ua900\ua901\ua902\ua903\ua904\ua905\ua906\ua907\ua908\ua909" + - "\ua9d0\ua9d1\ua9d2\ua9d3\ua9d4\ua9d5\ua9d6\ua9d7\ua9d8\ua9d9" + - "\uaa50\uaa51\uaa52\uaa53\uaa54\uaa55\uaa56\uaa57\uaa58\uaa59" + - "\uabf0\uabf1\uabf2\uabf3\uabf4\uabf5\uabf6\uabf7\uabf8\uabf9" + + "\u09e6\u09e7\u09e8\u09e9\u09ea\u09eb\u09ec\u09ed\u09ee\u09ef" + + "\u0a66\u0a67\u0a68\u0a69\u0a6a\u0a6b\u0a6c\u0a6d\u0a6e\u0a6f" + + "\u0ae6\u0ae7\u0ae8\u0ae9\u0aea\u0aeb\u0aec\u0aed\u0aee\u0aef" + + "\u0b66\u0b67\u0b68\u0b69\u0b6a\u0b6b\u0b6c\u0b6d\u0b6e\u0b6f" + + "\u0be6\u0be7\u0be8\u0be9\u0bea\u0beb\u0bec\u0bed\u0bee\u0bef" + + "\u0c66\u0c67\u0c68\u0c69\u0c6a\u0c6b\u0c6c\u0c6d\u0c6e\u0c6f" + + "\u0ce6\u0ce7\u0ce8\u0ce9\u0cea\u0ceb\u0cec\u0ced\u0cee\u0cef" + + "\u0d66\u0d67\u0d68\u0d69\u0d6a\u0d6b\u0d6c\u0d6d\u0d6e\u0d6f" + + "\u0e50\u0e51\u0e52\u0e53\u0e54\u0e55\u0e56\u0e57\u0e58\u0e59" + + "\u0ed0\u0ed1\u0ed2\u0ed3\u0ed4\u0ed5\u0ed6\u0ed7\u0ed8\u0ed9" + + "\u0f20\u0f21\u0f22\u0f23\u0f24\u0f25\u0f26\u0f27\u0f28\u0f29" + + "\u1040\u1041\u1042\u1043\u1044\u1045\u1046\u1047\u1048\u1049" + + "\u1090\u1091\u1092\u1093\u1094\u1095\u1096\u1097\u1098\u1099" + + "\u17e0\u17e1\u17e2\u17e3\u17e4\u17e5\u17e6\u17e7\u17e8\u17e9" + + "\u1810\u1811\u1812\u1813\u1814\u1815\u1816\u1817\u1818\u1819" + + "\u1946\u1947\u1948\u1949\u194a\u194b\u194c\u194d\u194e\u194f" + + "\u19d0\u19d1\u19d2\u19d3\u19d4\u19d5\u19d6\u19d7\u19d8\u19d9" + + "\u1a80\u1a81\u1a82\u1a83\u1a84\u1a85\u1a86\u1a87\u1a88\u1a89" + + "\u1a90\u1a91\u1a92\u1a93\u1a94\u1a95\u1a96\u1a97\u1a98\u1a99" + + "\u1b50\u1b51\u1b52\u1b53\u1b54\u1b55\u1b56\u1b57\u1b58\u1b59" + + "\u1bb0\u1bb1\u1bb2\u1bb3\u1bb4\u1bb5\u1bb6\u1bb7\u1bb8\u1bb9" + + "\u1c40\u1c41\u1c42\u1c43\u1c44\u1c45\u1c46\u1c47\u1c48\u1c49" + + "\u1c50\u1c51\u1c52\u1c53\u1c54\u1c55\u1c56\u1c57\u1c58\u1c59" + + "\ua620\ua621\ua622\ua623\ua624\ua625\ua626\ua627\ua628\ua629" + + "\ua8d0\ua8d1\ua8d2\ua8d3\ua8d4\ua8d5\ua8d6\ua8d7\ua8d8\ua8d9" + + "\ua900\ua901\ua902\ua903\ua904\ua905\ua906\ua907\ua908\ua909" + + "\ua9d0\ua9d1\ua9d2\ua9d3\ua9d4\ua9d5\ua9d6\ua9d7\ua9d8\ua9d9" + + "\uaa50\uaa51\uaa52\uaa53\uaa54\uaa55\uaa56\uaa57\uaa58\uaa59" + + "\uabf0\uabf1\uabf2\uabf3\uabf4\uabf5\uabf6\uabf7\uabf8\uabf9" + "\uff10\uff11\uff12\uff13\uff14\uff15\uff16\uff17\uff18\uff19"; - public static string s_nonNumericsCodepoints = + public static string s_nonNumericsCodepoints = "abcdefghijklmnopqrstuvwxyz" + - "\u1369\u136a\u136b\u136c\u136d\u136e\u136f\u1370\u1371\u1372\u1373" + + "\u1369\u136a\u136b\u136c\u136d\u136e\u136f\u1370\u1371\u1372\u1373" + "\u1374\u1375\u1376\u1377\u1378\u1379\u137a\u137b\u137c\u137d"; public static string s_numericNonDecimalCodepoints = - "\u00b2\u00b3\u00b9\u1369\u136a\u136b\u136c\u136d\u136e\u136f\u1370" + - "\u1371\u19da\u2070\u2074\u2075\u2076\u2077\u2078\u2079\u2080\u2081" + - "\u2082\u2083\u2084\u2085\u2086\u2087\u2088\u2089\u2460\u2461\u2462" + - "\u2463\u2464\u2465\u2466\u2467\u2468\u2474\u2475\u2476\u2477\u2478" + - "\u2479\u247a\u247b\u247c\u2488\u2489\u248a\u248b\u248c\u248d\u248e" + - "\u248f\u2490\u24ea\u24f5\u24f6\u24f7\u24f8\u24f9\u24fa\u24fb\u24fc" + + "\u00b2\u00b3\u00b9\u1369\u136a\u136b\u136c\u136d\u136e\u136f\u1370" + + "\u1371\u19da\u2070\u2074\u2075\u2076\u2077\u2078\u2079\u2080\u2081" + + "\u2082\u2083\u2084\u2085\u2086\u2087\u2088\u2089\u2460\u2461\u2462" + + "\u2463\u2464\u2465\u2466\u2467\u2468\u2474\u2475\u2476\u2477\u2478" + + "\u2479\u247a\u247b\u247c\u2488\u2489\u248a\u248b\u248c\u248d\u248e" + + "\u248f\u2490\u24ea\u24f5\u24f6\u24f7\u24f8\u24f9\u24fa\u24fb\u24fc" + "\u24fd\u24ff\u2776\u2777\u2778\u2779\u277a\u277b\u277c\u277d\u277e" + "\u2780\u2781\u2782\u2783\u2784\u2785\u2786\u2787\u2788\u278a\u278b" + "\u278c\u278d\u278e\u278f\u2790\u2791\u2792"; public static int [] s_numericNonDecimalValues = new int [] - { - 2, 3, 1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 0, 4, 5, 6, 7, 8, 9, 0, 1, 2, - 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7, - 8, 9, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, - 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, + { + 2, 3, 1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 0, 4, 5, 6, 7, 8, 9, 0, 1, 2, + 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7, + 8, 9, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, + 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; @@ -195,7 +198,7 @@ namespace System.Globalization.Tests { Assert.Equal(j, CharUnicodeInfo.GetDecimalDigitValue(s_numericsCodepoints[i + j])); Assert.Equal(j, CharUnicodeInfo.GetDecimalDigitValue(s_numericsCodepoints, i + j)); - } + } } } diff --git a/external/corefx/src/System.Globalization/tests/Configurations.props b/external/corefx/src/System.Globalization/tests/Configurations.props index ee7fd3a3db..d4273b555c 100644 --- a/external/corefx/src/System.Globalization/tests/Configurations.props +++ b/external/corefx/src/System.Globalization/tests/Configurations.props @@ -3,6 +3,7 @@ netstandard; + netcoreapp; uap-Windows_NT; diff --git a/external/corefx/src/System.Globalization/tests/CultureInfo/CultureInfoAll.cs b/external/corefx/src/System.Globalization/tests/CultureInfo/CultureInfoAll.cs index 4975ebb041..6da81e6eee 100644 --- a/external/corefx/src/System.Globalization/tests/CultureInfo/CultureInfoAll.cs +++ b/external/corefx/src/System.Globalization/tests/CultureInfo/CultureInfoAll.cs @@ -629,7 +629,6 @@ namespace System.Globalization.Tests } [Fact] - [ActiveIssue("TFS 444333 - Should ExceptionMiniaturizer exempt CultureNotFoundException.InvalidCultureName from being optimized away?", TargetFrameworkMonikers.UapAot)] public void CultureNotFoundExceptionTest() { AssertExtensions.Throws("name", () => new CultureInfo("!@#$%^&*()")); diff --git a/external/corefx/src/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoTests.cs b/external/corefx/src/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoTests.cs index accea71829..45273ca420 100644 --- a/external/corefx/src/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoTests.cs +++ b/external/corefx/src/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoTests.cs @@ -59,12 +59,12 @@ namespace System.Globalization.Tests expectedFormattedString = formattedTime.Replace(timeSep, dtfi.TimeSeparator); Assert.Equal(expectedFormattedString, d.ToString("HH:mm:ss", dtfi)); } - + [Theory] [MemberData(nameof(DateTimeFormatInfo_TestData))] public void NativeCalendarNameTest(DateTimeFormatInfo dtfi, Calendar calendar, string nativeCalendarName) { - try + try { dtfi.Calendar = calendar; Assert.Equal(nativeCalendarName, dtfi.NativeCalendarName); @@ -77,8 +77,8 @@ namespace System.Globalization.Tests Assert.True(calendar is PersianCalendar, "Exception can occur only with PersianCalendar"); } else // !PlatformDetection.IsWindows - { - Assert.True(calendar is HijriCalendar || calendar is UmAlQuraCalendar || calendar is ThaiBuddhistCalendar || + { + Assert.True(calendar is HijriCalendar || calendar is UmAlQuraCalendar || calendar is ThaiBuddhistCalendar || calendar is HebrewCalendar || calendar is KoreanCalendar, "failed to set the calendar on DTFI"); } } @@ -131,7 +131,35 @@ namespace System.Globalization.Tests for (DayOfWeek day=DayOfWeek.Sunday; day <= DayOfWeek.Saturday; day++) { Assert.Equal(shortestDayNames[(int) day], dtfi.GetShortestDayName(day)); - } + } + } + + [Fact] + public void TestHebrewMonths() + { + CultureInfo ci = new CultureInfo("he-IL"); + ci.DateTimeFormat.Calendar = new HebrewCalendar(); + + Assert.Equal(13, ci.DateTimeFormat.MonthNames.Length); + Assert.Equal(13, ci.DateTimeFormat.MonthGenitiveNames.Length); + Assert.Equal(13, ci.DateTimeFormat.AbbreviatedMonthNames.Length); + Assert.Equal(13, ci.DateTimeFormat.AbbreviatedMonthGenitiveNames.Length); + + DateTime dt = ci.DateTimeFormat.Calendar.ToDateTime(5779, 1, 1, 0, 0, 0, 0); // leap year + for (int i = 0; i < 13; i++) + { + string formatted = dt.ToString(ci.DateTimeFormat.LongDatePattern, ci); + Assert.Equal(dt, DateTime.ParseExact(formatted, ci.DateTimeFormat.LongDatePattern, ci)); + dt = ci.DateTimeFormat.Calendar.AddMonths(dt, 1); + } + + dt = ci.DateTimeFormat.Calendar.ToDateTime(5778, 1, 1, 0, 0, 0, 0); // non leap year + for (int i = 0; i < 12; i++) + { + string formatted = dt.ToString(ci.DateTimeFormat.LongDatePattern, ci); + Assert.Equal(dt, DateTime.ParseExact(formatted, ci.DateTimeFormat.LongDatePattern, ci)); + dt = ci.DateTimeFormat.Calendar.AddMonths(dt, 1); + } } } } diff --git a/external/corefx/src/System.Globalization/tests/Invariant/InvariantMode.cs b/external/corefx/src/System.Globalization/tests/Invariant/InvariantMode.cs index ed232637c2..a6c4854f81 100644 --- a/external/corefx/src/System.Globalization/tests/Invariant/InvariantMode.cs +++ b/external/corefx/src/System.Globalization/tests/Invariant/InvariantMode.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; +using System.Collections; using System.Text; using Xunit; @@ -71,7 +72,7 @@ namespace System.Globalization.Tests yield return new object[] { "a", "A", 0, 1, CompareOptions.Ordinal, -1 }; yield return new object[] { "abc", "aBc", 0, 3, CompareOptions.Ordinal, -1 }; - // Ordinal with numbers and + // Ordinal with numbers and yield return new object[] { "a", "1", 0, 1, CompareOptions.Ordinal, -1 }; yield return new object[] { "1", "1", 0, 1, CompareOptions.Ordinal, 0 }; yield return new object[] { "1", "!", 0, 1, CompareOptions.Ordinal, -1 }; @@ -144,7 +145,7 @@ namespace System.Globalization.Tests yield return new object[] { "foobardzsdzs", "rddzs", 11, 12, CompareOptions.None, -1 }; yield return new object[] { "foobardzsdzs", "rddzs", 11, 12, CompareOptions.Ordinal, -1 }; - // Turkish + // Turkish yield return new object[] { "Hi", "I", 1, 2, CompareOptions.None, -1 }; yield return new object[] { "Hi", "I", 1, 2, CompareOptions.IgnoreCase, 1 }; yield return new object[] { "Hi", "\u0130", 1, 2, CompareOptions.None, -1 }; @@ -190,7 +191,7 @@ namespace System.Globalization.Tests yield return new object[] { "dzsdzsfoobar", "ddzsf", CompareOptions.Ordinal, false }; yield return new object[] { "dzsdzsfoobar", "ddzsf", CompareOptions.Ordinal, false }; - // Turkish + // Turkish yield return new object[] { "interesting", "I", CompareOptions.None, false }; yield return new object[] { "interesting", "I", CompareOptions.IgnoreCase, true }; yield return new object[] { "interesting", "\u0130", CompareOptions.None, false }; @@ -227,7 +228,7 @@ namespace System.Globalization.Tests yield return new object[] { "foobardzsdzs", "rddzs", CompareOptions.Ordinal, false }; yield return new object[] { "foobardzsdzs", "rddzs", CompareOptions.None, false }; - // Turkish + // Turkish yield return new object[] { "Hi", "I", CompareOptions.None, false }; yield return new object[] { "Hi", "I", CompareOptions.IgnoreCase, true }; yield return new object[] { "Hi", "\u0130", CompareOptions.None, false }; @@ -245,7 +246,7 @@ namespace System.Globalization.Tests yield return new object[] { "More Test's", "Tests", CompareOptions.IgnoreSymbols, false }; yield return new object[] { "More Test's", "Tests", CompareOptions.None, false }; - // Platform differences + // Platform differences yield return new object[] { "foobardzsdzs", "rddzs", CompareOptions.None, false }; } @@ -374,10 +375,10 @@ namespace System.Globalization.Tests yield return new object[] { "this \t HaS \t somE \t TABS", "THIS \t HAS \t SOME \t TABS", true }; yield return new object[] { "embedded\0NuLL\0Byte\0", "EMBEDDED\0NULL\0BYTE\0", true }; - + // LATIN SMALL LETTER O WITH ACUTE, which has an upper case variant. yield return new object[] { "\u00F3", "\u00D3", false }; - + // SNOWMAN, which does not have an upper case variant. yield return new object[] { "\u2603", "\u2603", true }; @@ -438,7 +439,7 @@ namespace System.Globalization.Tests { yield return new object[] { "xn--yda", 0, 7, "\u0101" }; yield return new object[] { "axn--ydab", 1, 7, "\u0101" }; - + yield return new object[] { "xn--aa-cla", 0, 10, "\u0101\u0061a" }; yield return new object[] { "xn--ab-dla", 0, 10, "\u0061\u0101\u0062" }; yield return new object[] { "xn--ab-ela", 0, 10, "\u0061\u0062\u0101" }; @@ -453,10 +454,10 @@ namespace System.Globalization.Tests yield return new object[] { "abc.xn--d9juau41awczczp.xn--de-jg4avhby1noc0d", 0, 45, "\u0061\u0062\u0063.\u305D\u306E\u30B9\u30D4\u30FC\u30C9\u3067.\u30D1\u30D5\u30A3\u30FC\u0064\u0065\u30EB\u30F3\u30D0" }; // Fully qualified domain name // Embedded domain name conversion (NLS + only)(Priority 1) - // Per the spec [7], "The index and count parameters (when provided) allow the - // conversion to be done on a larger string where the domain name is embedded - // (such as a URI or IRI). The output string is only the converted FQDN or - // label, not the whole input string (if the input string contains more + // Per the spec [7], "The index and count parameters (when provided) allow the + // conversion to be done on a larger string where the domain name is embedded + // (such as a URI or IRI). The output string is only the converted FQDN or + // label, not the whole input string (if the input string contains more // character than the substring to convert)." // Fully Qualified Domain Name (Label1.Label2.Label3) yield return new object[] { "abc.xn--d9juau41awczczp.xn--de-jg4avhby1noc0d", 0, 45, "\u0061\u0062\u0063.\u305D\u306E\u30B9\u30D4\u30FC\u30C9\u3067.\u30D1\u30D5\u30A3\u30FC\u0064\u0065\u30EB\u30F3\u30D0" }; @@ -476,7 +477,7 @@ namespace System.Globalization.Tests // // DateTimeInfo - // + // Assert.Equal(CultureInfo.InvariantCulture.DateTimeFormat.AbbreviatedDayNames, ci.DateTimeFormat.AbbreviatedDayNames); Assert.Equal(CultureInfo.InvariantCulture.DateTimeFormat.AbbreviatedMonthGenitiveNames, ci.DateTimeFormat.AbbreviatedMonthGenitiveNames); @@ -523,7 +524,7 @@ namespace System.Globalization.Tests // // Culture data - // + // Assert.True(ci.Calendar is GregorianCalendar); @@ -692,7 +693,7 @@ namespace System.Globalization.Tests } } - + [Theory] [MemberData(nameof(Compare_TestData))] public void TestCompare(string source, string value, CompareOptions options, int result) @@ -784,5 +785,14 @@ namespace System.Globalization.Tests } Assert.Equal(expected, new IdnMapping().GetUnicode(ascii, index, count)); } + + [Fact] + public void TestHashing() + { + StringComparer cultureComparer = StringComparer.Create(CultureInfo.GetCultureInfo("tr-TR"), true); + StringComparer ordinalComparer = StringComparer.OrdinalIgnoreCase; + string turkishString = "i\u0130"; + Assert.Equal(ordinalComparer.GetHashCode(turkishString), cultureComparer.GetHashCode(turkishString)); + } } } \ No newline at end of file diff --git a/external/corefx/src/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyNegativePattern.cs b/external/corefx/src/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyNegativePattern.cs index c6960c612a..1e436d29c5 100644 --- a/external/corefx/src/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyNegativePattern.cs +++ b/external/corefx/src/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyNegativePattern.cs @@ -13,7 +13,7 @@ namespace System.Globalization.Tests public static IEnumerable CurrencyNegativePattern_TestData() { yield return new object[] { NumberFormatInfo.InvariantInfo, new int[] { 0 } }; - yield return new object[] { CultureInfo.GetCultureInfo("bg-BG").NumberFormat, new int[] { 8 } }; + yield return new object[] { CultureInfo.GetCultureInfo("bg-BG").NumberFormat, new int[] { 0, 8 } }; } [Theory] diff --git a/external/corefx/src/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoData.cs b/external/corefx/src/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoData.cs index 675de22d56..e6500c9741 100644 --- a/external/corefx/src/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoData.cs +++ b/external/corefx/src/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoData.cs @@ -39,10 +39,14 @@ namespace System.Globalization.Tests { return (PlatformDetection.WindowsVersion < 10) ? new int[] { 3 } : new int[] { 6, 3 }; } - if (PlatformDetection.ICUVersion.Major >= 59) + if (PlatformDetection.ICUVersion.Major == 59 || PlatformDetection.ICUVersion.Major == 58) { return new int[] { 8 }; } + else if (PlatformDetection.ICUVersion.Major > 59) + { + return new int[] { 1 }; + } else { return new int[] { 1, 0 }; diff --git a/external/corefx/src/System.Globalization/tests/RegionInfo/RegionInfoTests.Properties.cs b/external/corefx/src/System.Globalization/tests/RegionInfo/RegionInfoTests.Properties.cs index f3f607da1c..b88677a39a 100644 --- a/external/corefx/src/System.Globalization/tests/RegionInfo/RegionInfoTests.Properties.cs +++ b/external/corefx/src/System.Globalization/tests/RegionInfo/RegionInfoTests.Properties.cs @@ -101,22 +101,22 @@ namespace System.Globalization.Tests yield return new object[] { 0x409, 244, "US Dollar", "US Dollar", "\u0055\u0053\u0020\u0044\u006f\u006c\u006c\u0061\u0072", "USA", "USA" }; yield return new object[] { 0x411, 122, "Japanese Yen", "Japanese Yen", PlatformDetection.IsWindows ? "\u5186" : "\u65e5\u672c\u5186", "JPN", "JPN" }; yield return new object[] { 0x804, 45, "Chinese Yuan", "PRC Yuan Renminbi", "\u4eba\u6c11\u5e01", "CHN", "CHN" }; - yield return new object[] { 0x401, 205, "Saudi Riyal", "Saudi Riyal", PlatformDetection.IsWindows ? - "\u0631\u064a\u0627\u0644\u00a0\u0633\u0639\u0648\u062f\u064a" : - "\u0631\u064a\u0627\u0644\u0020\u0633\u0639\u0648\u062f\u064a", + yield return new object[] { 0x401, 205, "Saudi Riyal", "Saudi Riyal", PlatformDetection.IsWindows ? + "\u0631\u064a\u0627\u0644\u00a0\u0633\u0639\u0648\u062f\u064a" : + "\u0631\u064a\u0627\u0644\u0020\u0633\u0639\u0648\u062f\u064a", "SAU", "SAU" }; yield return new object[] { 0x412, 134, "South Korean Won", "Korean Won", PlatformDetection.IsWindows ? "\uc6d0" : "\ub300\ud55c\ubbfc\uad6d\u0020\uc6d0", "KOR", "KOR" }; - yield return new object[] { 0x40d, 117, "Israeli New Shekel", "Israeli New Sheqel", - PlatformDetection.IsWindows || PlatformDetection.ICUVersion.Major >= 59 ? "\u05e9\u05e7\u05dc\u0020\u05d7\u05d3\u05e9" : "\u05e9\u05f4\u05d7", "ISR", "ISR" }; + yield return new object[] { 0x40d, 117, "Israeli New Shekel", "Israeli New Sheqel", + PlatformDetection.IsWindows || PlatformDetection.ICUVersion.Major >= 58 ? "\u05e9\u05e7\u05dc\u0020\u05d7\u05d3\u05e9" : "\u05e9\u05f4\u05d7", "ISR", "ISR" }; } - + [Theory] [MemberData(nameof(RegionInfo_TestData))] public void MiscTest(int lcid, int geoId, string currencyEnglishName, string alternativeCurrencyEnglishName, string currencyNativeName, string threeLetterISORegionName, string threeLetterWindowsRegionName) { RegionInfo ri = new RegionInfo(lcid); // create it with lcid Assert.Equal(geoId, ri.GeoId); - Assert.True(currencyEnglishName.Equals(ri.CurrencyEnglishName) || + Assert.True(currencyEnglishName.Equals(ri.CurrencyEnglishName) || alternativeCurrencyEnglishName.Equals(ri.CurrencyEnglishName), "Wrong currency English Name"); Assert.Equal(currencyNativeName, ri.CurrencyNativeName); Assert.Equal(threeLetterISORegionName, ri.ThreeLetterISORegionName); diff --git a/external/corefx/src/System.Globalization/tests/System.Globalization.Tests.csproj b/external/corefx/src/System.Globalization/tests/System.Globalization.Tests.csproj index c2d018ce07..370125fa28 100644 --- a/external/corefx/src/System.Globalization/tests/System.Globalization.Tests.csproj +++ b/external/corefx/src/System.Globalization/tests/System.Globalization.Tests.csproj @@ -5,9 +5,12 @@ true {484C92C6-6D2C-45BC-A5E2-4A12BA228E1E} $(DefineConstants);uap + $(DefineConstants);netcoreapp + + diff --git a/external/corefx/src/System.IO.Compression.Brotli/System.IO.Compression.Brotli.sln b/external/corefx/src/System.IO.Compression.Brotli/System.IO.Compression.Brotli.sln index 3ed36c84f9..6f2cf74076 100644 --- a/external/corefx/src/System.IO.Compression.Brotli/System.IO.Compression.Brotli.sln +++ b/external/corefx/src/System.IO.Compression.Brotli/System.IO.Compression.Brotli.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27019.1 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression.Brotli.Tests", "tests\System.IO.Compression.Brotli.Tests.csproj", "{BC2E1649-291D-412E-9529-EDDA94FA7AD6}" ProjectSection(ProjectDependencies) = postProject @@ -35,10 +35,10 @@ Global {BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU {BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU {BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU - {1341F8C8-637A-49A1-BE0F-13867A634929}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU - {1341F8C8-637A-49A1-BE0F-13867A634929}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU - {1341F8C8-637A-49A1-BE0F-13867A634929}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU - {1341F8C8-637A-49A1-BE0F-13867A634929}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU + {1341F8C8-637A-49A1-BE0F-13867A634929}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU + {1341F8C8-637A-49A1-BE0F-13867A634929}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU + {1341F8C8-637A-49A1-BE0F-13867A634929}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU + {1341F8C8-637A-49A1-BE0F-13867A634929}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU {5471BFE8-8071-466F-838E-5ADAA779E742}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU {5471BFE8-8071-466F-838E-5ADAA779E742}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU {5471BFE8-8071-466F-838E-5ADAA779E742}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU @@ -57,7 +57,4 @@ Global {5471BFE8-8071-466F-838E-5ADAA779E742} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD} {4ADD9456-A929-4254-B8A2-16FC628ABFDA} = {2E666815-2EDB-464B-9DF6-380BF4789AD4} EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {75F1E532-877F-4DA2-A21D-C8C20EBAD777} - EndGlobalSection EndGlobal diff --git a/external/corefx/src/System.IO.Compression.Brotli/ref/System.IO.Compression.Brotli.cs b/external/corefx/src/System.IO.Compression.Brotli/ref/System.IO.Compression.Brotli.cs index 4c4b0b407e..dd1990703e 100644 --- a/external/corefx/src/System.IO.Compression.Brotli/ref/System.IO.Compression.Brotli.cs +++ b/external/corefx/src/System.IO.Compression.Brotli/ref/System.IO.Compression.Brotli.cs @@ -39,13 +39,13 @@ namespace System.IO.Compression public override void Flush() { } public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState) { throw null; } public override int EndRead(IAsyncResult asyncResult) { throw null; } - public override int Read(byte[] array, int offset, int count) { throw null; } - public override System.Threading.Tasks.Task ReadAsync(byte[] array, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } + public override int Read(byte[] buffer, int offset, int count) { throw null; } + public override System.Threading.Tasks.Task ReadAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } public override void SetLength(long value) { } - public override IAsyncResult BeginWrite(byte[] array, int offset, int count, AsyncCallback asyncCallback, object asyncState) { throw null; } + public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState) { throw null; } public override void EndWrite(IAsyncResult asyncResult) { } - public override void Write(byte[] array, int offset, int count) { } - public override System.Threading.Tasks.Task WriteAsync(byte[] array, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } + public override void Write(byte[] buffer, int offset, int count) { } + public override System.Threading.Tasks.Task WriteAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } } } diff --git a/external/corefx/src/System.IO.Compression.Brotli/src/System/IO/Compression/dec/BrotliStream.Decompress.cs b/external/corefx/src/System.IO.Compression.Brotli/src/System/IO/Compression/dec/BrotliStream.Decompress.cs index 4e15f1c625..efed64e712 100644 --- a/external/corefx/src/System.IO.Compression.Brotli/src/System/IO/Compression/dec/BrotliStream.Decompress.cs +++ b/external/corefx/src/System.IO.Compression.Brotli/src/System/IO/Compression/dec/BrotliStream.Decompress.cs @@ -18,7 +18,7 @@ namespace System.IO.Compression return Read(new Span(buffer, offset, count)); } - public override int Read(Span destination) + public override int Read(Span buffer) { if (_mode != CompressionMode.Decompress) throw new InvalidOperationException(SR.BrotliStream_Compress_UnsupportedOperation); @@ -27,7 +27,7 @@ namespace System.IO.Compression Span source = Span.Empty; OperationStatus lastResult = OperationStatus.DestinationTooSmall; // We want to continue calling Decompress until we're either out of space for output or until Decompress indicates it is finished. - while (destination.Length > 0 && lastResult != OperationStatus.Done) + while (buffer.Length > 0 && lastResult != OperationStatus.Done) { int bytesConsumed = 0; int bytesWritten = 0; @@ -53,7 +53,7 @@ namespace System.IO.Compression source = new Span(_buffer, 0, readBytes); } - lastResult = _decoder.Decompress(source, destination, out bytesConsumed, out bytesWritten); + lastResult = _decoder.Decompress(source, buffer, out bytesConsumed, out bytesWritten); if (lastResult == OperationStatus.InvalidData) throw new InvalidOperationException(SR.BrotliStream_Decompress_InvalidData); if (bytesConsumed > 0) @@ -61,7 +61,7 @@ namespace System.IO.Compression if (bytesWritten > 0) { totalWritten += bytesWritten; - destination = destination.Slice(bytesWritten); + buffer = buffer.Slice(bytesWritten); } } @@ -74,13 +74,13 @@ namespace System.IO.Compression public override int EndRead(IAsyncResult asyncResult) => TaskToApm.End(asyncResult); - public override Task ReadAsync(byte[] array, int offset, int count, CancellationToken cancellationToken) + public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) { - ValidateParameters(array, offset, count); - return ReadAsync(new Memory(array, offset, count), cancellationToken).AsTask(); + ValidateParameters(buffer, offset, count); + return ReadAsync(new Memory(buffer, offset, count), cancellationToken).AsTask(); } - public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default(CancellationToken)) + public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default(CancellationToken)) { if (_mode != CompressionMode.Decompress) throw new InvalidOperationException(SR.BrotliStream_Compress_UnsupportedOperation); @@ -91,10 +91,10 @@ namespace System.IO.Compression { return new ValueTask(Task.FromCanceled(cancellationToken)); } - return FinishReadAsyncMemory(destination, cancellationToken); + return FinishReadAsyncMemory(buffer, cancellationToken); } - private async ValueTask FinishReadAsyncMemory(Memory destination, CancellationToken cancellationToken) + private async ValueTask FinishReadAsyncMemory(Memory buffer, CancellationToken cancellationToken) { AsyncOperationStarting(); try @@ -103,7 +103,7 @@ namespace System.IO.Compression Memory source = Memory.Empty; OperationStatus lastResult = OperationStatus.DestinationTooSmall; // We want to continue calling Decompress until we're either out of space for output or until Decompress indicates it is finished. - while (destination.Length > 0 && lastResult != OperationStatus.Done) + while (buffer.Length > 0 && lastResult != OperationStatus.Done) { int bytesConsumed = 0; @@ -113,7 +113,7 @@ namespace System.IO.Compression { int readBytes = 0; int iter = 0; - while (readBytes < _buffer.Length && ((iter = await _stream.ReadAsync(_buffer, readBytes, _buffer.Length - readBytes, cancellationToken).ConfigureAwait(false)) > 0)) + while (readBytes < _buffer.Length && ((iter = await _stream.ReadAsync(new Memory(_buffer, readBytes, _buffer.Length - readBytes), cancellationToken).ConfigureAwait(false)) > 0)) { readBytes += iter; if (readBytes > _buffer.Length) @@ -131,7 +131,7 @@ namespace System.IO.Compression } cancellationToken.ThrowIfCancellationRequested(); - lastResult = _decoder.Decompress(source, destination, out bytesConsumed, out bytesWritten); + lastResult = _decoder.Decompress(source, buffer, out bytesConsumed, out bytesWritten); if (lastResult == OperationStatus.InvalidData) throw new InvalidOperationException(SR.BrotliStream_Decompress_InvalidData); if (bytesConsumed > 0) @@ -139,7 +139,7 @@ namespace System.IO.Compression if (bytesWritten > 0) { totalWritten += bytesWritten; - destination = destination.Slice(bytesWritten); + buffer = buffer.Slice(bytesWritten); } } diff --git a/external/corefx/src/System.IO.Compression.Brotli/src/System/IO/Compression/enc/BrotliStream.Compress.cs b/external/corefx/src/System.IO.Compression.Brotli/src/System/IO/Compression/enc/BrotliStream.Compress.cs index 5f2ecd1b6b..0770c46989 100644 --- a/external/corefx/src/System.IO.Compression.Brotli/src/System/IO/Compression/enc/BrotliStream.Compress.cs +++ b/external/corefx/src/System.IO.Compression.Brotli/src/System/IO/Compression/enc/BrotliStream.Compress.cs @@ -24,12 +24,12 @@ namespace System.IO.Compression WriteCore(new ReadOnlySpan(buffer, offset, count)); } - public override void Write(ReadOnlySpan source) + public override void Write(ReadOnlySpan buffer) { - WriteCore(source); + WriteCore(buffer); } - internal void WriteCore(ReadOnlySpan source, bool isFinalBlock = false) + internal void WriteCore(ReadOnlySpan buffer, bool isFinalBlock = false) { if (_mode != CompressionMode.Compress) throw new InvalidOperationException(SR.BrotliStream_Decompress_UnsupportedOperation); @@ -41,41 +41,41 @@ namespace System.IO.Compression { int bytesConsumed = 0; int bytesWritten = 0; - lastResult = _encoder.Compress(source, output, out bytesConsumed, out bytesWritten, isFinalBlock); + lastResult = _encoder.Compress(buffer, output, out bytesConsumed, out bytesWritten, isFinalBlock); if (lastResult == OperationStatus.InvalidData) throw new InvalidOperationException(SR.BrotliStream_Compress_InvalidData); if (bytesWritten > 0) _stream.Write(output.Slice(0, bytesWritten)); if (bytesConsumed > 0) - source = source.Slice(bytesConsumed); + buffer = buffer.Slice(bytesConsumed); } } - public override IAsyncResult BeginWrite(byte[] array, int offset, int count, AsyncCallback asyncCallback, object asyncState) => - TaskToApm.Begin(WriteAsync(array, offset, count, CancellationToken.None), asyncCallback, asyncState); + public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState) => + TaskToApm.Begin(WriteAsync(buffer, offset, count, CancellationToken.None), asyncCallback, asyncState); public override void EndWrite(IAsyncResult asyncResult) => TaskToApm.End(asyncResult); - public override Task WriteAsync(byte[] array, int offset, int count, CancellationToken cancellationToken) + public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) { - ValidateParameters(array, offset, count); - return WriteAsync(new ReadOnlyMemory(array, offset, count), cancellationToken); + ValidateParameters(buffer, offset, count); + return WriteAsync(new ReadOnlyMemory(buffer, offset, count), cancellationToken).AsTask(); } - public override Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default(CancellationToken)) + public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken = default(CancellationToken)) { if (_mode != CompressionMode.Compress) throw new InvalidOperationException(SR.BrotliStream_Decompress_UnsupportedOperation); EnsureNoActiveAsyncOperation(); EnsureNotDisposed(); - return cancellationToken.IsCancellationRequested ? + return new ValueTask(cancellationToken.IsCancellationRequested ? Task.FromCanceled(cancellationToken) : - WriteAsyncMemoryCore(source, cancellationToken); + WriteAsyncMemoryCore(buffer, cancellationToken)); } - private async Task WriteAsyncMemoryCore(ReadOnlyMemory source, CancellationToken cancellationToken) + private async Task WriteAsyncMemoryCore(ReadOnlyMemory buffer, CancellationToken cancellationToken) { AsyncOperationStarting(); try @@ -86,13 +86,13 @@ namespace System.IO.Compression Memory output = new Memory(_buffer); int bytesConsumed = 0; int bytesWritten = 0; - lastResult = _encoder.Compress(source, output, out bytesConsumed, out bytesWritten, isFinalBlock: false); + lastResult = _encoder.Compress(buffer, output, out bytesConsumed, out bytesWritten, isFinalBlock: false); if (lastResult == OperationStatus.InvalidData) throw new InvalidOperationException(SR.BrotliStream_Compress_InvalidData); if (bytesConsumed > 0) - source = source.Slice(bytesConsumed); + buffer = buffer.Slice(bytesConsumed); if (bytesWritten > 0) - await _stream.WriteAsync(_buffer, 0, bytesWritten, cancellationToken).ConfigureAwait(false); + await _stream.WriteAsync(new ReadOnlyMemory(_buffer, 0, bytesWritten), cancellationToken).ConfigureAwait(false); } } finally diff --git a/external/corefx/src/System.IO.Compression.Brotli/tests/CompressionStreamUnitTests.Brotli.cs b/external/corefx/src/System.IO.Compression.Brotli/tests/CompressionStreamUnitTests.Brotli.cs index e7323ff936..84db45dc53 100644 --- a/external/corefx/src/System.IO.Compression.Brotli/tests/CompressionStreamUnitTests.Brotli.cs +++ b/external/corefx/src/System.IO.Compression.Brotli/tests/CompressionStreamUnitTests.Brotli.cs @@ -33,10 +33,6 @@ namespace System.IO.Compression } } - [Fact] - [OuterLoop("Test takes ~12 seconds to run")] - public override void Dispose_WithUnfinishedWriteAsync() { base.Dispose_WithUnfinishedWriteAsync(); } - [Fact] [OuterLoop("Test takes ~6 seconds to run")] public override void FlushAsync_DuringWriteAsync() { base.FlushAsync_DuringWriteAsync(); } diff --git a/external/corefx/src/System.IO.Compression.Brotli/tests/Performance/BrotliPerfTests.cs b/external/corefx/src/System.IO.Compression.Brotli/tests/Performance/BrotliPerfTests.cs index f0ee2b7d22..410b6cc14b 100644 --- a/external/corefx/src/System.IO.Compression.Brotli/tests/Performance/BrotliPerfTests.cs +++ b/external/corefx/src/System.IO.Compression.Brotli/tests/Performance/BrotliPerfTests.cs @@ -12,67 +12,48 @@ namespace System.IO.Compression { protected override string CompressedTestFile(string uncompressedPath) => Path.Combine("BrotliTestData", Path.GetFileName(uncompressedPath) + ".br"); - public static IEnumerable CanterburyCorpus_WithCompressionLevel() + public static IEnumerable UncompressedTestFiles_WithCompressionLevel() { foreach (CompressionLevel compressionLevel in Enum.GetValues(typeof(CompressionLevel))) { - foreach (object[] canterburyWithoutLevel in CanterburyCorpus()) + foreach (object[] testFile in UncompressedTestFiles()) { - yield return new object[] { canterburyWithoutLevel[0], canterburyWithoutLevel[1], compressionLevel }; + yield return new object[] { testFile[0], compressionLevel }; } } } - public static IEnumerable CanterburyCorpus() - { - foreach (int innerIterations in new int[] { 1, 10 }) - { - foreach (var fileName in UncompressedTestFiles()) - { - yield return new object[] { innerIterations, fileName[0] }; - } - } - } - - [Benchmark] - [MemberData(nameof(CanterburyCorpus_WithCompressionLevel))] - public void Compress_Canterbury_WithState(int innerIterations, string uncompressedFileName, CompressionLevel compressLevel) + [Benchmark(InnerIterationCount=10)] // limits the max iterations to 100 + [MemberData(nameof(UncompressedTestFiles_WithCompressionLevel))] + public void Compress_Canterbury_WithState(string uncompressedFileName, CompressionLevel compressLevel) { byte[] bytes = File.ReadAllBytes(uncompressedFileName); ReadOnlySpan uncompressedData = new ReadOnlySpan(bytes); int maxCompressedSize = BrotliEncoder.GetMaxCompressedLength(bytes.Length); - List compressedDataArrays = new List(innerIterations); + byte[] compressedDataArray = new byte[maxCompressedSize]; foreach (var iteration in Benchmark.Iterations) { - for (int i = 0; i < innerIterations; i++) - { - compressedDataArrays.Add(new byte[maxCompressedSize]); - } using (iteration.StartMeasurement()) + using (BrotliEncoder encoder = new BrotliEncoder()) { - for (int i = 0; i < innerIterations; i++) + Span output = new Span(compressedDataArray); + ReadOnlySpan input = uncompressedData; + while (!input.IsEmpty && !output.IsEmpty) { - using (BrotliEncoder encoder = new BrotliEncoder()) - { - Span output = new Span(compressedDataArrays[i]); - ReadOnlySpan input = uncompressedData; - while (!input.IsEmpty && !output.IsEmpty) - { - encoder.Compress(input, output, out int bytesConsumed, out int written, isFinalBlock:false); - input = input.Slice(bytesConsumed); - output = output.Slice(written); - } - encoder.Compress(input, output, out int bytesConsumed2, out int written2, isFinalBlock: true); - } + encoder.Compress(input, output, out int bytesConsumed, out int written, isFinalBlock:false); + input = input.Slice(bytesConsumed); + output = output.Slice(written); } + encoder.Compress(input, output, out int bytesConsumed2, out int written2, isFinalBlock: true); } } } - [Benchmark] - [MemberData(nameof(CanterburyCorpus))] - public void Decompress_Canterbury_WithState(int innerIterations, string uncompressedFileName) + [Benchmark(InnerIterationCount=100)] + [MemberData(nameof(UncompressedTestFiles))] + public void Decompress_Canterbury_WithState(string uncompressedFileName) { + int innerIterations = (int)Benchmark.InnerIterationCount; byte[] compressedBytes = File.ReadAllBytes(CompressedTestFile(uncompressedFileName)); ReadOnlySpan compressedData = new ReadOnlySpan(compressedBytes); List uncompressedDataArrays = new List(innerIterations); @@ -102,27 +83,20 @@ namespace System.IO.Compression } } - [Benchmark] - [MemberData(nameof(CanterburyCorpus_WithCompressionLevel))] - public void Compress_Canterbury_WithoutState(int innerIterations, string uncompressedFileName, CompressionLevel compressLevel) + [Benchmark(InnerIterationCount=10)] // limits the max iterations to 100 + [MemberData(nameof(UncompressedTestFiles_WithCompressionLevel))] + public void Compress_Canterbury_WithoutState(string uncompressedFileName, CompressionLevel compressLevel) { byte[] bytes = File.ReadAllBytes(uncompressedFileName); ReadOnlySpan uncompressedData = new ReadOnlySpan(bytes); int maxCompressedSize = BrotliEncoder.GetMaxCompressedLength(bytes.Length); - List compressedDataArrays = new List(innerIterations); + byte[] compressedDataArray = new byte[maxCompressedSize]; int compressLevelBrotli = compressLevel == CompressionLevel.Optimal ? 11 : compressLevel == CompressionLevel.Fastest ? 1 : 0; foreach (var iteration in Benchmark.Iterations) { - for (int i = 0; i < innerIterations; i++) - { - compressedDataArrays.Add(new byte[maxCompressedSize]); - } using (iteration.StartMeasurement()) { - for (int i = 0; i < innerIterations; i++) - { - Assert.True(BrotliEncoder.TryCompress(uncompressedData, compressedDataArrays[i], out int bytesWritten, compressLevelBrotli, 22)); - } + Assert.True(BrotliEncoder.TryCompress(uncompressedData, compressedDataArray, out int bytesWritten, compressLevelBrotli, 22)); } } } @@ -131,10 +105,11 @@ namespace System.IO.Compression /// The perf tests for the instant decompression aren't exactly indicative of real-world scenarios since they require you to know /// either the exact figure or the upper bound of the uncompressed size of your given compressed data. /// - [Benchmark] - [MemberData(nameof(CanterburyCorpus))] - public void Decompress_Canterbury_WithoutState(int innerIterations, string uncompressedFileName) + [Benchmark(InnerIterationCount=100)] + [MemberData(nameof(UncompressedTestFiles))] + public void Decompress_Canterbury_WithoutState(string uncompressedFileName) { + int innerIterations = (int)Benchmark.InnerIterationCount; byte[] compressedBytes = File.ReadAllBytes(CompressedTestFile(uncompressedFileName)); ReadOnlySpan compressedData = new ReadOnlySpan(compressedBytes); int uncompressedSize = (int)new FileInfo(uncompressedFileName).Length; @@ -153,6 +128,6 @@ namespace System.IO.Compression } } } - } + } } } diff --git a/external/corefx/src/System.IO.Compression.ZipFile/tests/ZipFileInvalidFileTests.cs b/external/corefx/src/System.IO.Compression.ZipFile/tests/ZipFileInvalidFileTests.cs index 9adfacdf30..53de201339 100644 --- a/external/corefx/src/System.IO.Compression.ZipFile/tests/ZipFileInvalidFileTests.cs +++ b/external/corefx/src/System.IO.Compression.ZipFile/tests/ZipFileInvalidFileTests.cs @@ -243,6 +243,7 @@ namespace System.IO.Compression.Tests /// when an attempt is made to extract them. /// [Theory] + [ActiveIssue(27269)] [InlineData("WindowsInvalid_FromUnix", null)] [InlineData("WindowsInvalid_FromWindows", null)] [InlineData("NullCharFileName_FromWindows", "path")] diff --git a/external/corefx/src/System.IO.Compression/System.IO.Compression.sln b/external/corefx/src/System.IO.Compression/System.IO.Compression.sln index e993165139..a96259a4ec 100644 --- a/external/corefx/src/System.IO.Compression/System.IO.Compression.sln +++ b/external/corefx/src/System.IO.Compression/System.IO.Compression.sln @@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression.Tests", "tests\System.IO.Compression.Tests.csproj", "{BC2E1649-291D-412E-9529-EDDA94FA7AD6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression.Tests", "tests\System.IO.Compression.Tests.csproj", "{17DA7FB5-4370-4385-9A02-FFEF9F482903}" ProjectSection(ProjectDependencies) = postProject - {5471BFE8-8071-466F-838E-5ADAA779E742} = {5471BFE8-8071-466F-838E-5ADAA779E742} + {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870} = {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression.Performance.Tests", "tests\Performance\System.IO.Compression.Performance.Tests.csproj", "{1341F8C8-637A-49A1-BE0F-13867A634929}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression.Performance.Tests", "tests\Performance\System.IO.Compression.Performance.Tests.csproj", "{13C0F956-FB7B-4882-A411-39B8E22463D2}" ProjectSection(ProjectDependencies) = postProject - {5471BFE8-8071-466F-838E-5ADAA779E742} = {5471BFE8-8071-466F-838E-5ADAA779E742} + {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870} = {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression", "src\System.IO.Compression.csproj", "{5471BFE8-8071-466F-838E-5ADAA779E742}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression", "src\System.IO.Compression.csproj", "{E9ED0A04-23A8-4F8B-82C1-2B18AF74C870}" ProjectSection(ProjectDependencies) = postProject - {4ADD9456-A929-4254-B8A2-16FC628ABFDA} = {4ADD9456-A929-4254-B8A2-16FC628ABFDA} + {7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43} = {7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression", "ref\System.IO.Compression.csproj", "{4ADD9456-A929-4254-B8A2-16FC628ABFDA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression", "ref\System.IO.Compression.csproj", "{7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}" EndProject @@ -31,30 +31,30 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU - {BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU - {BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU - {BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU - {1341F8C8-637A-49A1-BE0F-13867A634929}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU - {1341F8C8-637A-49A1-BE0F-13867A634929}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU - {1341F8C8-637A-49A1-BE0F-13867A634929}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU - {1341F8C8-637A-49A1-BE0F-13867A634929}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU - {5471BFE8-8071-466F-838E-5ADAA779E742}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU - {5471BFE8-8071-466F-838E-5ADAA779E742}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU - {5471BFE8-8071-466F-838E-5ADAA779E742}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU - {5471BFE8-8071-466F-838E-5ADAA779E742}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU - {4ADD9456-A929-4254-B8A2-16FC628ABFDA}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU - {4ADD9456-A929-4254-B8A2-16FC628ABFDA}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU - {4ADD9456-A929-4254-B8A2-16FC628ABFDA}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU - {4ADD9456-A929-4254-B8A2-16FC628ABFDA}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU + {17DA7FB5-4370-4385-9A02-FFEF9F482903}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU + {17DA7FB5-4370-4385-9A02-FFEF9F482903}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU + {17DA7FB5-4370-4385-9A02-FFEF9F482903}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU + {17DA7FB5-4370-4385-9A02-FFEF9F482903}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU + {13C0F956-FB7B-4882-A411-39B8E22463D2}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {13C0F956-FB7B-4882-A411-39B8E22463D2}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {13C0F956-FB7B-4882-A411-39B8E22463D2}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {13C0F956-FB7B-4882-A411-39B8E22463D2}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU + {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU + {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU + {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU + {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU + {7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {BC2E1649-291D-412E-9529-EDDA94FA7AD6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} - {1341F8C8-637A-49A1-BE0F-13867A634929} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} - {5471BFE8-8071-466F-838E-5ADAA779E742} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD} - {4ADD9456-A929-4254-B8A2-16FC628ABFDA} = {2E666815-2EDB-464B-9DF6-380BF4789AD4} + {17DA7FB5-4370-4385-9A02-FFEF9F482903} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} + {13C0F956-FB7B-4882-A411-39B8E22463D2} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} + {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD} + {7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43} = {2E666815-2EDB-464B-9DF6-380BF4789AD4} EndGlobalSection EndGlobal diff --git a/external/corefx/src/System.IO.Compression/ref/System.IO.Compression.csproj b/external/corefx/src/System.IO.Compression/ref/System.IO.Compression.csproj index aa2e71eca6..246b287407 100644 --- a/external/corefx/src/System.IO.Compression/ref/System.IO.Compression.csproj +++ b/external/corefx/src/System.IO.Compression/ref/System.IO.Compression.csproj @@ -2,7 +2,7 @@ - {4ADD9456-A929-4254-B8A2-16FC628ABFDA} + {7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43} true diff --git a/external/corefx/src/System.IO.Compression/src/MatchingRefApiCompatBaseline.txt b/external/corefx/src/System.IO.Compression/src/MatchingRefApiCompatBaseline.txt new file mode 100644 index 0000000000..d6c2289aa7 --- /dev/null +++ b/external/corefx/src/System.IO.Compression/src/MatchingRefApiCompatBaseline.txt @@ -0,0 +1,2 @@ +# Exposed publicly only in implementation for serialization compat +TypesMustExist : Type 'System.IO.Compression.ZLibException' does not exist in the implementation but it does exist in the contract. diff --git a/external/corefx/src/System.IO.Compression/src/System.IO.Compression.csproj b/external/corefx/src/System.IO.Compression/src/System.IO.Compression.csproj index 9cacdec02a..ea2cc95909 100644 --- a/external/corefx/src/System.IO.Compression/src/System.IO.Compression.csproj +++ b/external/corefx/src/System.IO.Compression/src/System.IO.Compression.csproj @@ -4,7 +4,7 @@ System.IO.Compression Library - {5471BFE8-8071-466F-838E-5ADAA779E742} + {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870} true true @@ -58,9 +58,6 @@ - - Common\System\IO\PathInternal.cs - Common\System\IO\StreamHelpers.CopyValidation.cs diff --git a/external/corefx/src/System.IO.Compression/src/System/IO/Compression/DeflateZLib/DeflateStream.cs b/external/corefx/src/System.IO.Compression/src/System/IO/Compression/DeflateZLib/DeflateStream.cs index b0ec44a643..853afde461 100644 --- a/external/corefx/src/System.IO.Compression/src/System/IO/Compression/DeflateZLib/DeflateStream.cs +++ b/external/corefx/src/System.IO.Compression/src/System/IO/Compression/DeflateZLib/DeflateStream.cs @@ -199,7 +199,7 @@ namespace System.IO.Compression flushSuccessful = _deflater.Flush(_buffer, out compressedBytes); if (flushSuccessful) { - await _stream.WriteAsync(_buffer, 0, compressedBytes, cancellationToken).ConfigureAwait(false); + await _stream.WriteAsync(new ReadOnlyMemory(_buffer, 0, compressedBytes), cancellationToken).ConfigureAwait(false); } Debug.Assert(flushSuccessful == (compressedBytes > 0)); } while (flushSuccessful); @@ -237,22 +237,22 @@ namespace System.IO.Compression return ReadCore(new Span(array, offset, count)); } - public override int Read(Span destination) + public override int Read(Span buffer) { if (GetType() != typeof(DeflateStream)) { // DeflateStream is not sealed, and a derived type may have overridden Read(byte[], int, int) prior // to this Read(Span) overload being introduced. In that case, this Read(Span) overload // should use the behavior of Read(byte[],int,int) overload. - return base.Read(destination); + return base.Read(buffer); } else { - return ReadCore(destination); + return ReadCore(buffer); } } - internal int ReadCore(Span destination) + internal int ReadCore(Span buffer) { EnsureDecompressionMode(); EnsureNotDisposed(); @@ -262,9 +262,9 @@ namespace System.IO.Compression while (true) { - int bytesRead = _inflater.Inflate(destination.Slice(totalRead)); + int bytesRead = _inflater.Inflate(buffer.Slice(totalRead)); totalRead += bytesRead; - if (totalRead == destination.Length) + if (totalRead == buffer.Length) { break; } @@ -355,21 +355,21 @@ namespace System.IO.Compression return ReadAsyncMemory(new Memory(array, offset, count), cancellationToken).AsTask(); } - public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default(CancellationToken)) + public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default(CancellationToken)) { if (GetType() != typeof(DeflateStream)) { // Ensure that existing streams derived from DeflateStream and that override ReadAsync(byte[],...) // get their existing behaviors when the newer Memory-based overload is used. - return base.ReadAsync(destination, cancellationToken); + return base.ReadAsync(buffer, cancellationToken); } else { - return ReadAsyncMemory(destination, cancellationToken); + return ReadAsyncMemory(buffer, cancellationToken); } } - internal ValueTask ReadAsyncMemory(Memory destination, CancellationToken cancellationToken) + internal ValueTask ReadAsyncMemory(Memory buffer, CancellationToken cancellationToken) { EnsureDecompressionMode(); EnsureNoActiveAsyncOperation(); @@ -387,7 +387,7 @@ namespace System.IO.Compression try { // Try to read decompressed data in output buffer - int bytesRead = _inflater.Inflate(destination.Span); + int bytesRead = _inflater.Inflate(buffer.Span); if (bytesRead != 0) { // If decompression output buffer is not empty, return immediately. @@ -404,7 +404,7 @@ namespace System.IO.Compression // the end of the stream, we need to get more data from the base stream ValueTask readTask = _stream.ReadAsync(_buffer, cancellationToken); cleanup = false; - return FinishReadAsyncMemory(readTask, destination, cancellationToken); + return FinishReadAsyncMemory(readTask, buffer, cancellationToken); } finally { @@ -417,7 +417,7 @@ namespace System.IO.Compression } private async ValueTask FinishReadAsyncMemory( - ValueTask readTask, Memory destination, CancellationToken cancellationToken) + ValueTask readTask, Memory buffer, CancellationToken cancellationToken) { try { @@ -442,7 +442,7 @@ namespace System.IO.Compression // Feed the data from base stream into decompression engine _inflater.SetInput(_buffer, 0, bytesRead); - bytesRead = _inflater.Inflate(destination.Span); + bytesRead = _inflater.Inflate(buffer.Span); if (bytesRead == 0 && !_inflater.Finished()) { @@ -468,22 +468,22 @@ namespace System.IO.Compression WriteCore(new ReadOnlySpan(array, offset, count)); } - public override void Write(ReadOnlySpan source) + public override void Write(ReadOnlySpan buffer) { if (GetType() != typeof(DeflateStream)) { // DeflateStream is not sealed, and a derived type may have overridden Write(byte[], int, int) prior // to this Write(ReadOnlySpan) overload being introduced. In that case, this Write(ReadOnlySpan) overload // should use the behavior of Write(byte[],int,int) overload. - base.Write(source); + base.Write(buffer); } else { - WriteCore(source); + WriteCore(buffer); } } - internal void WriteCore(ReadOnlySpan source) + internal void WriteCore(ReadOnlySpan buffer) { EnsureCompressionMode(); EnsureNotDisposed(); @@ -494,9 +494,9 @@ namespace System.IO.Compression unsafe { // Pass new bytes through deflater and write them too: - fixed (byte* bufferPtr = &MemoryMarshal.GetReference(source)) + fixed (byte* bufferPtr = &MemoryMarshal.GetReference(buffer)) { - _deflater.SetInput(bufferPtr, source.Length); + _deflater.SetInput(bufferPtr, buffer.Length); WriteDeflaterOutput(); _wroteBytes = true; } @@ -643,35 +643,35 @@ namespace System.IO.Compression public override Task WriteAsync(byte[] array, int offset, int count, CancellationToken cancellationToken) { ValidateParameters(array, offset, count); - return WriteAsyncMemory(new ReadOnlyMemory(array, offset, count), cancellationToken); + return WriteAsyncMemory(new ReadOnlyMemory(array, offset, count), cancellationToken).AsTask(); } - public override Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken) + public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken) { if (GetType() != typeof(DeflateStream)) { // Ensure that existing streams derived from DeflateStream and that override WriteAsync(byte[],...) // get their existing behaviors when the newer Memory-based overload is used. - return base.WriteAsync(source, cancellationToken); + return base.WriteAsync(buffer, cancellationToken); } else { - return WriteAsyncMemory(source, cancellationToken); + return WriteAsyncMemory(buffer, cancellationToken); } } - internal Task WriteAsyncMemory(ReadOnlyMemory source, CancellationToken cancellationToken) + internal ValueTask WriteAsyncMemory(ReadOnlyMemory buffer, CancellationToken cancellationToken) { EnsureCompressionMode(); EnsureNoActiveAsyncOperation(); EnsureNotDisposed(); - return cancellationToken.IsCancellationRequested ? + return new ValueTask(cancellationToken.IsCancellationRequested ? Task.FromCanceled(cancellationToken) : - WriteAsyncMemoryCore(source, cancellationToken); + WriteAsyncMemoryCore(buffer, cancellationToken)); } - private async Task WriteAsyncMemoryCore(ReadOnlyMemory source, CancellationToken cancellationToken) + private async Task WriteAsyncMemoryCore(ReadOnlyMemory buffer, CancellationToken cancellationToken) { AsyncOperationStarting(); try @@ -679,7 +679,7 @@ namespace System.IO.Compression await WriteDeflaterOutputAsync(cancellationToken).ConfigureAwait(false); // Pass new bytes through deflater - _deflater.SetInput(source); + _deflater.SetInput(buffer); await WriteDeflaterOutputAsync(cancellationToken).ConfigureAwait(false); @@ -701,7 +701,7 @@ namespace System.IO.Compression int compressedBytes = _deflater.GetDeflateOutput(_buffer); if (compressedBytes > 0) { - await _stream.WriteAsync(_buffer, 0, compressedBytes, cancellationToken).ConfigureAwait(false); + await _stream.WriteAsync(new ReadOnlyMemory(_buffer, 0, compressedBytes), cancellationToken).ConfigureAwait(false); } } } @@ -732,7 +732,6 @@ namespace System.IO.Compression private readonly Stream _destination; private readonly CancellationToken _cancellationToken; private byte[] _arrayPoolBuffer; - private int _arrayPoolBufferHighWaterMark; public CopyToAsyncStream(DeflateStream deflateStream, Stream destination, int bufferSize, CancellationToken cancellationToken) { @@ -757,8 +756,7 @@ namespace System.IO.Compression int bytesRead = _deflateStream._inflater.Inflate(_arrayPoolBuffer, 0, _arrayPoolBuffer.Length); if (bytesRead > 0) { - if (bytesRead > _arrayPoolBufferHighWaterMark) _arrayPoolBufferHighWaterMark = bytesRead; - await _destination.WriteAsync(_arrayPoolBuffer, 0, bytesRead, _cancellationToken).ConfigureAwait(false); + await _destination.WriteAsync(new ReadOnlyMemory(_arrayPoolBuffer, 0, bytesRead), _cancellationToken).ConfigureAwait(false); } else break; } @@ -770,8 +768,7 @@ namespace System.IO.Compression { _deflateStream.AsyncOperationCompleting(); - Array.Clear(_arrayPoolBuffer, 0, _arrayPoolBufferHighWaterMark); // clear only the most we used - ArrayPool.Shared.Return(_arrayPoolBuffer, clearArray: false); + ArrayPool.Shared.Return(_arrayPoolBuffer); _arrayPoolBuffer = null; } } @@ -787,7 +784,7 @@ namespace System.IO.Compression } else if (count > buffer.Length - offset) { - // The source stream is either malicious or poorly implemented and returned a number of + // The buffer stream is either malicious or poorly implemented and returned a number of // bytes larger than the buffer supplied to it. throw new InvalidDataException(SR.GenericInvalidData); } @@ -795,14 +792,13 @@ namespace System.IO.Compression // Feed the data from base stream into the decompression engine. _deflateStream._inflater.SetInput(buffer, offset, count); - // While there's more decompressed data available, forward it to the destination stream. + // While there's more decompressed data available, forward it to the buffer stream. while (true) { - int bytesRead = _deflateStream._inflater.Inflate(_arrayPoolBuffer, 0, _arrayPoolBuffer.Length); + int bytesRead = _deflateStream._inflater.Inflate(new Span(_arrayPoolBuffer)); if (bytesRead > 0) { - if (bytesRead > _arrayPoolBufferHighWaterMark) _arrayPoolBufferHighWaterMark = bytesRead; - await _destination.WriteAsync(_arrayPoolBuffer, 0, bytesRead, cancellationToken).ConfigureAwait(false); + await _destination.WriteAsync(new ReadOnlyMemory(_arrayPoolBuffer, 0, bytesRead), cancellationToken).ConfigureAwait(false); } else break; } diff --git a/external/corefx/src/System.IO.Compression/src/System/IO/Compression/DeflateZLib/Deflater.cs b/external/corefx/src/System.IO.Compression/src/System/IO/Compression/DeflateZLib/Deflater.cs index fc3b8ad7aa..11a7d11247 100644 --- a/external/corefx/src/System.IO.Compression/src/System/IO/Compression/DeflateZLib/Deflater.cs +++ b/external/corefx/src/System.IO.Compression/src/System/IO/Compression/DeflateZLib/Deflater.cs @@ -91,8 +91,6 @@ namespace System.IO.Compression internal unsafe void SetInput(ReadOnlyMemory inputBuffer) { Debug.Assert(NeedsInput(), "We have something left in previous input!"); - Debug.Assert(!_inputBufferHandle.HasPointer); - if (0 == inputBuffer.Length) { return; @@ -100,7 +98,7 @@ namespace System.IO.Compression lock (SyncLock) { - _inputBufferHandle = inputBuffer.Retain(pin: true); + _inputBufferHandle = inputBuffer.Pin(); _zlibStream.NextIn = (IntPtr)_inputBufferHandle.Pointer; _zlibStream.AvailIn = (uint)inputBuffer.Length; @@ -111,7 +109,6 @@ namespace System.IO.Compression { Debug.Assert(NeedsInput(), "We have something left in previous input!"); Debug.Assert(inputBufferPtr != null); - Debug.Assert(!_inputBufferHandle.HasPointer); if (count == 0) { @@ -182,7 +179,6 @@ namespace System.IO.Compression Debug.Assert(null != outputBuffer, "Can't pass in a null output buffer!"); Debug.Assert(outputBuffer.Length > 0, "Can't pass in an empty output buffer!"); Debug.Assert(NeedsInput(), "We have something left in previous input!"); - Debug.Assert(!_inputBufferHandle.HasPointer); // Note: we require that NeedsInput() == true, i.e. that 0 == _zlibStream.AvailIn. diff --git a/external/corefx/src/System.IO.Compression/src/System/IO/Compression/GZipStream.cs b/external/corefx/src/System.IO.Compression/src/System/IO/Compression/GZipStream.cs index 4796b9b39b..6c5640db18 100644 --- a/external/corefx/src/System.IO.Compression/src/System/IO/Compression/GZipStream.cs +++ b/external/corefx/src/System.IO.Compression/src/System/IO/Compression/GZipStream.cs @@ -84,19 +84,19 @@ namespace System.IO.Compression return _deflateStream.Read(array, offset, count); } - public override int Read(Span destination) + public override int Read(Span buffer) { if (GetType() != typeof(GZipStream)) { // GZipStream is not sealed, and a derived type may have overridden Read(byte[], int, int) prior // to this Read(Span) overload being introduced. In that case, this Read(Span) overload // should use the behavior of Read(byte[],int,int) overload. - return base.Read(destination); + return base.Read(buffer); } else { CheckDeflateStream(); - return _deflateStream.ReadCore(destination); + return _deflateStream.ReadCore(buffer); } } @@ -112,19 +112,19 @@ namespace System.IO.Compression _deflateStream.Write(array, offset, count); } - public override void Write(ReadOnlySpan source) + public override void Write(ReadOnlySpan buffer) { if (GetType() != typeof(GZipStream)) { // GZipStream is not sealed, and a derived type may have overridden Write(byte[], int, int) prior // to this Write(ReadOnlySpan) overload being introduced. In that case, this Write(ReadOnlySpan) overload // should use the behavior of Write(byte[],int,int) overload. - base.Write(source); + base.Write(buffer); } else { CheckDeflateStream(); - _deflateStream.WriteCore(source); + _deflateStream.WriteCore(buffer); } } @@ -158,19 +158,19 @@ namespace System.IO.Compression return _deflateStream.ReadAsync(array, offset, count, cancellationToken); } - public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default(CancellationToken)) + public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default(CancellationToken)) { if (GetType() != typeof(GZipStream)) { // GZipStream is not sealed, and a derived type may have overridden ReadAsync(byte[], int, int) prior // to this ReadAsync(Memory) overload being introduced. In that case, this ReadAsync(Memory) overload // should use the behavior of ReadAsync(byte[],int,int) overload. - return base.ReadAsync(destination, cancellationToken); + return base.ReadAsync(buffer, cancellationToken); } else { CheckDeflateStream(); - return _deflateStream.ReadAsyncMemory(destination, cancellationToken); + return _deflateStream.ReadAsyncMemory(buffer, cancellationToken); } } @@ -180,19 +180,19 @@ namespace System.IO.Compression return _deflateStream.WriteAsync(array, offset, count, cancellationToken); } - public override Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default(CancellationToken)) + public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken = default(CancellationToken)) { if (GetType() != typeof(GZipStream)) { // GZipStream is not sealed, and a derived type may have overridden WriteAsync(byte[], int, int) prior // to this WriteAsync(ReadOnlyMemory) overload being introduced. In that case, this // WriteAsync(ReadOnlyMemory) overload should use the behavior of Write(byte[],int,int) overload. - return base.WriteAsync(source, cancellationToken); + return base.WriteAsync(buffer, cancellationToken); } else { CheckDeflateStream(); - return _deflateStream.WriteAsyncMemory(source, cancellationToken); + return _deflateStream.WriteAsyncMemory(buffer, cancellationToken); } } diff --git a/external/corefx/src/System.IO.Compression/src/System/IO/Compression/PositionPreservingWriteOnlyStreamWrapper.netcoreapp.cs b/external/corefx/src/System.IO.Compression/src/System/IO/Compression/PositionPreservingWriteOnlyStreamWrapper.netcoreapp.cs index 1c5aa7b6e2..c2cef7afb2 100644 --- a/external/corefx/src/System.IO.Compression/src/System/IO/Compression/PositionPreservingWriteOnlyStreamWrapper.netcoreapp.cs +++ b/external/corefx/src/System.IO.Compression/src/System/IO/Compression/PositionPreservingWriteOnlyStreamWrapper.netcoreapp.cs @@ -9,16 +9,16 @@ namespace System.IO.Compression { internal sealed partial class PositionPreservingWriteOnlyStreamWrapper : Stream { - public override void Write(ReadOnlySpan source) + public override void Write(ReadOnlySpan buffer) { - _position += source.Length; - _stream.Write(source); + _position += buffer.Length; + _stream.Write(buffer); } - public override Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default(CancellationToken)) + public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken = default(CancellationToken)) { - _position += source.Length; - return _stream.WriteAsync(source, cancellationToken); + _position += buffer.Length; + return _stream.WriteAsync(buffer, cancellationToken); } } } diff --git a/external/corefx/src/System.IO.Compression/tests/CompressionStreamUnitTests.Deflate.cs b/external/corefx/src/System.IO.Compression/tests/CompressionStreamUnitTests.Deflate.cs index 39e713de65..4fa26680b8 100644 --- a/external/corefx/src/System.IO.Compression/tests/CompressionStreamUnitTests.Deflate.cs +++ b/external/corefx/src/System.IO.Compression/tests/CompressionStreamUnitTests.Deflate.cs @@ -72,7 +72,7 @@ namespace System.IO.Compression ms.Position = 0; using (var compressor = new DerivedDeflateStream(ms, CompressionMode.Compress, leaveOpen: true)) { - compressor.WriteAsync(new ReadOnlyMemory(new byte[1])).Wait(); + compressor.WriteAsync(new ReadOnlyMemory(new byte[1])).AsTask().Wait(); Assert.True(compressor.WriteArrayInvoked); } } diff --git a/external/corefx/src/System.IO.Compression/tests/CompressionStreamUnitTests.Gzip.cs b/external/corefx/src/System.IO.Compression/tests/CompressionStreamUnitTests.Gzip.cs index 002c83cc87..387b1a87fc 100644 --- a/external/corefx/src/System.IO.Compression/tests/CompressionStreamUnitTests.Gzip.cs +++ b/external/corefx/src/System.IO.Compression/tests/CompressionStreamUnitTests.Gzip.cs @@ -57,7 +57,7 @@ namespace System.IO.Compression ms.Position = 0; using (var compressor = new DerivedGZipStream(ms, CompressionMode.Compress, leaveOpen: true)) { - compressor.WriteAsync(new ReadOnlyMemory(new byte[1])).Wait(); + compressor.WriteAsync(new ReadOnlyMemory(new byte[1])).AsTask().Wait(); Assert.True(compressor.WriteArrayInvoked); } } diff --git a/external/corefx/src/System.IO.Compression/tests/Performance/System.IO.Compression.Performance.Tests.csproj b/external/corefx/src/System.IO.Compression/tests/Performance/System.IO.Compression.Performance.Tests.csproj index 762e2f3a7b..12e663a783 100644 --- a/external/corefx/src/System.IO.Compression/tests/Performance/System.IO.Compression.Performance.Tests.csproj +++ b/external/corefx/src/System.IO.Compression/tests/Performance/System.IO.Compression.Performance.Tests.csproj @@ -4,7 +4,7 @@ System.IO.Compression.Performance.Tests true - {1341F8C8-637A-49A1-BE0F-13867A634929} + {13C0F956-FB7B-4882-A411-39B8E22463D2} diff --git a/external/corefx/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj b/external/corefx/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj index 7e69ef58b8..f04dd273bc 100644 --- a/external/corefx/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj +++ b/external/corefx/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj @@ -2,8 +2,8 @@ - {BC2E1649-291D-412E-9529-EDDA94FA7AD6} - $(DefineConstants);netcoreapp;STREAM_MEMORY_OVERLOADS_AVAILABLE + {17DA7FB5-4370-4385-9A02-FFEF9F482903} + $(DefineConstants);netcoreapp;STREAM_MEMORY_OVERLOADS_AVAILABLE @@ -72,4 +72,4 @@ - + \ No newline at end of file diff --git a/external/corefx/src/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj b/external/corefx/src/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj index fdc93492c8..5802294f6d 100644 --- a/external/corefx/src/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj +++ b/external/corefx/src/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj @@ -11,6 +11,12 @@ netcore50 + + + \ No newline at end of file diff --git a/external/corefx/src/System.IO.FileSystem.AccessControl/src/Configurations.props b/external/corefx/src/System.IO.FileSystem.AccessControl/src/Configurations.props index 9648129983..d8d7acfe61 100644 --- a/external/corefx/src/System.IO.FileSystem.AccessControl/src/Configurations.props +++ b/external/corefx/src/System.IO.FileSystem.AccessControl/src/Configurations.props @@ -3,8 +3,8 @@ netstandard; + netstandard-Windows_NT; netfx-Windows_NT; - netcoreapp2.0-Windows_NT; $(PackageConfigurations); diff --git a/external/corefx/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj b/external/corefx/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj index 1073ac3180..aeb88dbb94 100644 --- a/external/corefx/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj +++ b/external/corefx/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj @@ -7,19 +7,19 @@ System.IO.FileSystem.AccessControl {D77FBA6C-1AA6-45A4-93E2-97A370672C53} - true + true true - SR.PlatformNotSupported_AccessControl + SR.PlatformNotSupported_AccessControl - - + + - + Common\Interop\Windows\Interop.Errors.cs diff --git a/external/corefx/src/System.IO.FileSystem.AccessControl/tests/DirectoryObjectSecurityTests.cs b/external/corefx/src/System.IO.FileSystem.AccessControl/tests/DirectoryObjectSecurityTests.cs index 126bf39127..a0777ee2ca 100644 --- a/external/corefx/src/System.IO.FileSystem.AccessControl/tests/DirectoryObjectSecurityTests.cs +++ b/external/corefx/src/System.IO.FileSystem.AccessControl/tests/DirectoryObjectSecurityTests.cs @@ -1,5 +1,6 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// 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.DirectoryServices; using System.Security.Principal; @@ -93,7 +94,6 @@ namespace System.Security.AccessControl Assert.NotNull(ruleCollection); } - [Fact] public void RemoveAuditRuleAll_InvalidObjectAuditRule() { @@ -106,18 +106,16 @@ namespace System.Security.AccessControl { var descriptor = new CommonSecurityDescriptor(true, true, string.Empty); var customObjectSecurity = new CustomDirectoryObjectSecurity(descriptor); - var objectTypeGuid = Guid.NewGuid(); - var identityReference = new NTAccount(@"NT AUTHORITY\SYSTEM"); var customAuditRuleReadWrite = new CustomAuditRule ( - identityReference, ReadWriteAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, ReadWriteAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AuditFlags.Success ); var customAuditRuleSynchronize = new CustomAuditRule ( - new NTAccount(@"NT AUTHORITY\SYSTEM"), SynchronizeAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, SynchronizeAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AuditFlags.Success ); @@ -147,9 +145,8 @@ namespace System.Security.AccessControl var customObjectSecurity = new CustomDirectoryObjectSecurity(descriptor); var objectTypeGuid = Guid.NewGuid(); - var identityReference = new NTAccount(@"NT AUTHORITY\SYSTEM"); var customAuditRuleReadWrite = new CustomAuditRule( - identityReference, ReadWriteAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, ReadWriteAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AuditFlags.Success ); @@ -170,28 +167,23 @@ namespace System.Security.AccessControl { var descriptor = new CommonSecurityDescriptor(true, true, string.Empty); var customObjectSecurity = new CustomDirectoryObjectSecurity(descriptor); - var objectTypeGuid = Guid.NewGuid(); - var identityReference = new NTAccount(@"NT AUTHORITY\SYSTEM"); + var customAuditRuleReadWrite = new CustomAuditRule( - identityReference, ReadWriteAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, ReadWriteAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AuditFlags.Success ); var customAuditRuleWrite = new CustomAuditRule( - identityReference, WriteAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, WriteAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AuditFlags.Success ); customObjectSecurity.AddAuditRule(customAuditRuleReadWrite); + Assert.Contains(customAuditRuleReadWrite, customObjectSecurity.GetAuditRules(true, true, typeof(System.Security.Principal.NTAccount)).Cast()); + customObjectSecurity.RemoveAuditRuleSpecific(customAuditRuleWrite); - - AuthorizationRuleCollection ruleCollection = - customObjectSecurity - .GetAuditRules(true, true, typeof(System.Security.Principal.NTAccount)); - - List existingRules = ruleCollection.Cast().ToList(); - Assert.True(existingRules.Contains(customAuditRuleReadWrite)); + Assert.Contains(customAuditRuleReadWrite, customObjectSecurity.GetAuditRules(true, true, typeof(System.Security.Principal.NTAccount)).Cast()); } [Fact] @@ -206,16 +198,15 @@ namespace System.Security.AccessControl { var descriptor = new CommonSecurityDescriptor(true, true, string.Empty); var customObjectSecurity = new CustomDirectoryObjectSecurity(descriptor); - - var identity = new NTAccount(@"NT AUTHORITY\SYSTEM"); var objectType = Guid.NewGuid(); + var customAuditRuleWrite = new CustomAuditRule( - identity, WriteAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, WriteAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectType, Guid.NewGuid(), AuditFlags.Success ); var customAuditRuleReadWrite = new CustomAuditRule( - identity, ReadWriteAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, ReadWriteAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectType, Guid.NewGuid(), AuditFlags.Success ); customObjectSecurity.AddAuditRule(customAuditRuleReadWrite); @@ -232,7 +223,7 @@ namespace System.Security.AccessControl existingRules.Any( x => x.AccessMaskValue == ReadAccessMask && x.AuditFlags == AuditFlags.Success && - x.IdentityReference == identity + x.IdentityReference == Helpers.s_LocalSystemNTAccount ) ); } @@ -249,29 +240,24 @@ namespace System.Security.AccessControl { var descriptor = new CommonSecurityDescriptor(true, true, string.Empty); var customObjectSecurity = new CustomDirectoryObjectSecurity(descriptor); - var objectTypeGuid = Guid.NewGuid(); - var identityReference = new NTAccount(@"NT AUTHORITY\SYSTEM"); + var customAuditRuleReadWrite = new CustomAuditRule( - identityReference, ReadWriteAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, ReadWriteAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AuditFlags.Success ); var customAuditRuleRead = new CustomAuditRule( - new NTAccount(@"NT AUTHORITY\SYSTEM"), ReadAccessMask, true, InheritanceFlags.None, + new SecurityIdentifier(WellKnownSidType.LocalSystemSid, null).Translate(typeof(NTAccount)), ReadAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AuditFlags.Success ); customObjectSecurity.AddAuditRule(customAuditRuleReadWrite); customObjectSecurity.SetAuditRule(customAuditRuleRead); - AuthorizationRuleCollection ruleCollection = - customObjectSecurity - .GetAuditRules(true, true, typeof(System.Security.Principal.NTAccount)); - - List existingRules = ruleCollection.Cast().ToList(); - Assert.False(existingRules.Contains(customAuditRuleReadWrite)); - Assert.True(existingRules.Contains(customAuditRuleRead)); + var existingRules = customObjectSecurity.GetAuditRules(true, true, typeof(System.Security.Principal.NTAccount)).Cast().ToList(); + Assert.DoesNotContain(customAuditRuleReadWrite, existingRules); + Assert.Contains(customAuditRuleRead, existingRules); } [Fact] @@ -288,26 +274,24 @@ namespace System.Security.AccessControl var customObjectSecurity = new CustomDirectoryObjectSecurity(descriptor); var customAuditRuleRead = new CustomAuditRule( - new NTAccount(@"NT AUTHORITY\Network Service"), ReadAccessMask, true, InheritanceFlags.None, + new SecurityIdentifier(WellKnownSidType.NetworkServiceSid, null).Translate(typeof(NTAccount)), ReadAccessMask, true, InheritanceFlags.None, PropagationFlags.None, Guid.NewGuid(), Guid.NewGuid(), AuditFlags.Success ); var customAuditRuleReadAttribute = new CustomAuditRule( - new NTAccount(@"NT AUTHORITY\SYSTEM"), ReadAttributeAccessMask, true, InheritanceFlags.None, + new SecurityIdentifier(WellKnownSidType.LocalSystemSid, null).Translate(typeof(NTAccount)), ReadAttributeAccessMask, true, InheritanceFlags.None, PropagationFlags.None, Guid.NewGuid(), Guid.NewGuid(), AuditFlags.Success ); customObjectSecurity.AddAuditRule(customAuditRuleRead); customObjectSecurity.AddAuditRule(customAuditRuleReadAttribute); - AuthorizationRuleCollection ruleCollection = - customObjectSecurity - .GetAuditRules(true, true, typeof(System.Security.Principal.NTAccount)); + AuthorizationRuleCollection ruleCollection = customObjectSecurity.GetAuditRules(true, true, typeof(System.Security.Principal.NTAccount)); Assert.NotNull(ruleCollection); List addedRules = ruleCollection.Cast().ToList(); - Assert.True(addedRules.Contains(customAuditRuleRead)); - Assert.True(addedRules.Contains(customAuditRuleReadAttribute)); + Assert.Contains(customAuditRuleRead, addedRules); + Assert.Contains(customAuditRuleReadAttribute, addedRules); } [Fact] @@ -322,17 +306,15 @@ namespace System.Security.AccessControl { var descriptor = new CommonSecurityDescriptor(true, true, string.Empty); var customObjectSecurity = new CustomDirectoryObjectSecurity(descriptor); - var objectTypeGuid = Guid.NewGuid(); - var identityReference = new NTAccount(@"NT AUTHORITY\SYSTEM"); - + var customAccessRuleReadWrite = new CustomAccessRule( - identityReference, ReadWriteAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, ReadWriteAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AccessControlType.Allow ); var customAccessRuleWrite = new CustomAccessRule( - identityReference, WriteAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, WriteAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AccessControlType.Allow ); @@ -340,19 +322,15 @@ namespace System.Security.AccessControl bool result = customObjectSecurity.RemoveAccessRule(customAccessRuleWrite); Assert.Equal(true, result); - AuthorizationRuleCollection ruleCollection = - customObjectSecurity - .GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)); + AuthorizationRuleCollection ruleCollection = customObjectSecurity.GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)); Assert.NotNull(ruleCollection); - List existingRules = ruleCollection.Cast().ToList(); - Assert.True( - existingRules.Any( - x => x.IdentityReference == identityReference && - x.AccessControlType == customAccessRuleReadWrite.AccessControlType && - x.AccessMaskValue == ReadAccessMask - )); + Assert.Contains(ruleCollection.Cast(), x => + x.IdentityReference == Helpers.s_LocalSystemNTAccount && + x.AccessControlType == customAccessRuleReadWrite.AccessControlType && + x.AccessMaskValue == ReadAccessMask + ); } [Fact] @@ -362,34 +340,29 @@ namespace System.Security.AccessControl var customObjectSecurity = new CustomDirectoryObjectSecurity(descriptor); int readDataAndAttribute = ReadAccessMask | ReadAttributeAccessMask; - var identityReference = new NTAccount(@"NT AUTHORITY\SYSTEM"); var objectTypeGuid = Guid.NewGuid(); + var customAccessRuleReadDataAndAttribute = new CustomAccessRule( - identityReference, readDataAndAttribute, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, readDataAndAttribute, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AccessControlType.Deny ); var customAccessRuleRead = new CustomAccessRule( - identityReference, ReadAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, ReadAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AccessControlType.Deny ); customObjectSecurity.AddAccessRule(customAccessRuleReadDataAndAttribute); customObjectSecurity.RemoveAccessRule(customAccessRuleRead); - AuthorizationRuleCollection ruleCollection = - customObjectSecurity - .GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)); - + AuthorizationRuleCollection ruleCollection = customObjectSecurity.GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)); Assert.NotNull(ruleCollection); - List existingRules = ruleCollection.Cast().ToList(); - Assert.True( - existingRules.Any( - x => x.IdentityReference == identityReference && - x.AccessControlType == AccessControlType.Deny && - x.AccessMaskValue == ReadAttributeAccessMask - )); + Assert.Contains(ruleCollection.Cast(), x => + x.IdentityReference == Helpers.s_LocalSystemNTAccount && + x.AccessControlType == AccessControlType.Deny && + x.AccessMaskValue == ReadAttributeAccessMask + ); } [Fact] @@ -404,12 +377,10 @@ namespace System.Security.AccessControl { var descriptor = new CommonSecurityDescriptor(true, true, string.Empty); var customObjectSecurity = new CustomDirectoryObjectSecurity(descriptor); - var objectTypeGuid = Guid.NewGuid(); - var identityReference = new NTAccount(@"NT AUTHORITY\SYSTEM"); - + var customAccessRuleReadWrite = new CustomAccessRule( - identityReference, ReadWriteAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, ReadWriteAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AccessControlType.Allow ); @@ -429,29 +400,22 @@ namespace System.Security.AccessControl { var descriptor = new CommonSecurityDescriptor(true, true, string.Empty); var customObjectSecurity = new CustomDirectoryObjectSecurity(descriptor); - var objectTypeGuid = Guid.NewGuid(); - var identityReference = new NTAccount(@"NT AUTHORITY\SYSTEM"); var customAccessRuleReadWrite = new CustomAccessRule( - identityReference, ReadWriteAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, ReadWriteAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AccessControlType.Deny ); var customAccessRuleRead = new CustomAccessRule( - new NTAccount(@"NT AUTHORITY\SYSTEM"), ReadAccessMask, true, InheritanceFlags.None, + new SecurityIdentifier(WellKnownSidType.LocalSystemSid, null).Translate(typeof(NTAccount)), ReadAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AccessControlType.Deny ); customObjectSecurity.AddAccessRule(customAccessRuleReadWrite); customObjectSecurity.RemoveAccessRuleSpecific(customAccessRuleRead); - AuthorizationRuleCollection ruleCollection = - customObjectSecurity - .GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)); - - List existingRules = ruleCollection.Cast().ToList(); - Assert.True(existingRules.Contains(customAccessRuleReadWrite)); + Assert.Contains(customAccessRuleReadWrite, customObjectSecurity.GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)).Cast()); } [Fact] @@ -466,16 +430,15 @@ namespace System.Security.AccessControl { var descriptor = new CommonSecurityDescriptor(true, true, string.Empty); var customObjectSecurity = new CustomDirectoryObjectSecurity(descriptor); - var objectTypeGuid = Guid.NewGuid(); - var identityReference = new NTAccount(@"NT AUTHORITY\SYSTEM"); + var customAccessRuleReadWrite = new CustomAccessRule( - identityReference, ReadWriteAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, ReadWriteAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AccessControlType.Allow ); var customAccessRuleSynchronize = new CustomAccessRule( - identityReference, SynchronizeAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, SynchronizeAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AccessControlType.Allow ); @@ -498,11 +461,10 @@ namespace System.Security.AccessControl { var descriptor = new CommonSecurityDescriptor(true, true, string.Empty); var customObjectSecurity = new CustomDirectoryObjectSecurity(descriptor); - var objectTypeGuid = Guid.NewGuid(); - var identityReference = new NTAccount(@"NT AUTHORITY\SYSTEM"); + var customAccessRuleReadWrite = new CustomAccessRule( - identityReference, ReadWriteAccessMask, true, InheritanceFlags.ObjectInherit, + Helpers.s_LocalSystemNTAccount, ReadWriteAccessMask, true, InheritanceFlags.ObjectInherit, PropagationFlags.InheritOnly, objectTypeGuid, Guid.NewGuid(), AccessControlType.Deny ); @@ -515,16 +477,15 @@ namespace System.Security.AccessControl { var descriptor = new CommonSecurityDescriptor(true, true, string.Empty); var customObjectSecurity = new CustomDirectoryObjectSecurity(descriptor); - var objectTypeGuid = Guid.NewGuid(); - var identityReference = new NTAccount(@"NT AUTHORITY\SYSTEM"); + var customAccessRuleReadWrite = new CustomAccessRule( - identityReference, ReadWriteAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, ReadWriteAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AccessControlType.Deny ); var customAccessRuleSynchronize = new CustomAccessRule( - identityReference, SynchronizeAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, SynchronizeAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AccessControlType.Deny ); @@ -554,36 +515,36 @@ namespace System.Security.AccessControl { var descriptor = new CommonSecurityDescriptor(true, true, string.Empty); var customObjectSecurity = new CustomDirectoryObjectSecurity(descriptor); - var objectTypeGuid = Guid.NewGuid(); - var identityReference = new NTAccount(@"NT AUTHORITY\SYSTEM"); + var customAccessRuleReadWrite = new CustomAccessRule( - identityReference, ReadWriteAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, ReadWriteAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AccessControlType.Deny ); var customAccessRuleNetworkService = new CustomAccessRule( - new NTAccount(@"NT AUTHORITY\NetworkService"), SynchronizeAccessMask, true, InheritanceFlags.None, + Helpers.s_NetworkServiceNTAccount, SynchronizeAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AccessControlType.Allow ); var customAccessRuleRead = new CustomAccessRule( - new NTAccount(@"NT AUTHORITY\SYSTEM"), ReadAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, ReadAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AccessControlType.Allow ); customObjectSecurity.AddAccessRule(customAccessRuleReadWrite); + Assert.Contains(customAccessRuleReadWrite, customObjectSecurity.GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)).Cast()); + customObjectSecurity.AddAccessRule(customAccessRuleNetworkService); + List existingRules = customObjectSecurity.GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)).Cast().ToList(); + Assert.Contains(customAccessRuleReadWrite, existingRules); + Assert.Contains(customAccessRuleNetworkService, existingRules); + customObjectSecurity.ResetAccessRule(customAccessRuleRead); - - AuthorizationRuleCollection ruleCollection = - customObjectSecurity - .GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)); - - List existingRules = ruleCollection.Cast().ToList(); - Assert.False(existingRules.Contains(customAccessRuleReadWrite)); - Assert.False(existingRules.Contains(customAccessRuleNetworkService)); - Assert.True(existingRules.Contains(customAccessRuleRead)); + existingRules = customObjectSecurity.GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)).Cast().ToList(); + Assert.DoesNotContain(customAccessRuleReadWrite, existingRules); + Assert.Contains(customAccessRuleNetworkService, existingRules); + Assert.Contains(customAccessRuleRead, existingRules); } [Fact] @@ -591,36 +552,36 @@ namespace System.Security.AccessControl { var descriptor = new CommonSecurityDescriptor(true, true, string.Empty); var customObjectSecurity = new CustomDirectoryObjectSecurity(descriptor); - var objectTypeGuid = Guid.NewGuid(); - var identityReference = new NTAccount(@"NT AUTHORITY\SYSTEM"); + var customAccessRuleReadWrite = new CustomAccessRule( - identityReference, ReadWriteAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, ReadWriteAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AccessControlType.Deny ); var customAccessRuleNetworkService = new CustomAccessRule( - new NTAccount(@"NT AUTHORITY\NetworkService"), SynchronizeAccessMask, true, InheritanceFlags.None, + Helpers.s_NetworkServiceNTAccount, SynchronizeAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AccessControlType.Allow ); var customAccessRuleWrite = new CustomAccessRule( - new NTAccount(@"NT AUTHORITY\SYSTEM"), WriteAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, WriteAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AccessControlType.Deny ); customObjectSecurity.AddAccessRule(customAccessRuleReadWrite); + Assert.Contains(customAccessRuleReadWrite, customObjectSecurity.GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)).Cast()); + customObjectSecurity.AddAccessRule(customAccessRuleNetworkService); + List existingRules = customObjectSecurity.GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)).Cast().ToList(); + Assert.Contains(customAccessRuleReadWrite, existingRules); + Assert.Contains(customAccessRuleNetworkService, existingRules); + customObjectSecurity.ResetAccessRule(customAccessRuleWrite); - - AuthorizationRuleCollection ruleCollection = - customObjectSecurity - .GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)); - - List existingRules = ruleCollection.Cast().ToList(); - Assert.False(existingRules.Contains(customAccessRuleReadWrite)); - Assert.False(existingRules.Contains(customAccessRuleNetworkService)); - Assert.True(existingRules.Contains(customAccessRuleWrite)); + existingRules = customObjectSecurity.GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)).Cast().ToList(); + Assert.DoesNotContain(customAccessRuleReadWrite, existingRules); + Assert.Contains(customAccessRuleNetworkService, existingRules); + Assert.Contains(customAccessRuleWrite, existingRules); } [Fact] @@ -635,29 +596,25 @@ namespace System.Security.AccessControl { var descriptor = new CommonSecurityDescriptor(true, true, string.Empty); var customObjectSecurity = new CustomDirectoryObjectSecurity(descriptor); - var objectTypeGuid = Guid.NewGuid(); - var identityReference = new NTAccount(@"NT AUTHORITY\SYSTEM"); + var customAccessRuleReadWrite = new CustomAccessRule( - identityReference, ReadWriteAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, ReadWriteAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AccessControlType.Allow ); var customAccessRuleRead = new CustomAccessRule( - new NTAccount(@"NT AUTHORITY\SYSTEM"), ReadAccessMask, true, InheritanceFlags.None, + new SecurityIdentifier(WellKnownSidType.LocalSystemSid, null).Translate(typeof(NTAccount)), ReadAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AccessControlType.Allow ); customObjectSecurity.AddAccessRule(customAccessRuleReadWrite); customObjectSecurity.SetAccessRule(customAccessRuleRead); - AuthorizationRuleCollection ruleCollection = - customObjectSecurity - .GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)); + List existingRules = customObjectSecurity.GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)).Cast().ToList(); - List existingRules = ruleCollection.Cast().ToList(); - Assert.False(existingRules.Contains(customAccessRuleReadWrite)); - Assert.True(existingRules.Contains(customAccessRuleRead)); + Assert.DoesNotContain(customAccessRuleReadWrite, existingRules); + Assert.Contains(customAccessRuleRead, existingRules); } [Fact] @@ -665,30 +622,25 @@ namespace System.Security.AccessControl { var descriptor = new CommonSecurityDescriptor(true, true, string.Empty); var customObjectSecurity = new CustomDirectoryObjectSecurity(descriptor); - var objectTypeGuid = Guid.NewGuid(); - var identityReference = new NTAccount(@"NT AUTHORITY\SYSTEM"); + var customAccessRuleReadWrite = new CustomAccessRule( - identityReference, ReadWriteAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, ReadWriteAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AccessControlType.Deny ); var customAccessRuleRead = new CustomAccessRule( - new NTAccount(@"NT AUTHORITY\SYSTEM"), ReadAccessMask, true, InheritanceFlags.None, + new SecurityIdentifier(WellKnownSidType.LocalSystemSid, null).Translate(typeof(NTAccount)), ReadAccessMask, true, InheritanceFlags.None, PropagationFlags.None, objectTypeGuid, Guid.NewGuid(), AccessControlType.Deny ); customObjectSecurity.AddAccessRule(customAccessRuleReadWrite); + Assert.Contains(customAccessRuleReadWrite, customObjectSecurity.GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)).Cast()); + customObjectSecurity.SetAccessRule(customAccessRuleRead); - - AuthorizationRuleCollection ruleCollection = - customObjectSecurity - .GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)); - - List existingRules = ruleCollection.Cast().ToList(); - - Assert.False(existingRules.Contains(customAccessRuleReadWrite)); - Assert.True(existingRules.Contains(customAccessRuleRead)); + var existingRules = customObjectSecurity.GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)).Cast().ToList(); + Assert.DoesNotContain(customAccessRuleReadWrite, existingRules); + Assert.Contains(customAccessRuleRead, existingRules); } [Fact] @@ -705,26 +657,23 @@ namespace System.Security.AccessControl var customObjectSecurity = new CustomDirectoryObjectSecurity(descriptor); var customAccessRuleAllow = new CustomAccessRule( - new NTAccount(@"NT AUTHORITY\Network Service"), ReadAccessMask, true, InheritanceFlags.None, + Helpers.s_NetworkServiceNTAccount, ReadAccessMask, true, InheritanceFlags.None, PropagationFlags.None, Guid.NewGuid(), Guid.NewGuid(), AccessControlType.Allow ); var customAccessRuleDeny = new CustomAccessRule( - new NTAccount(@"NT AUTHORITY\SYSTEM"), ReadAccessMask, true, InheritanceFlags.None, + Helpers.s_LocalSystemNTAccount, ReadAccessMask, true, InheritanceFlags.None, PropagationFlags.None, Guid.NewGuid(), Guid.NewGuid(), AccessControlType.Deny ); customObjectSecurity.AddAccessRule(customAccessRuleAllow); customObjectSecurity.AddAccessRule(customAccessRuleDeny); - AuthorizationRuleCollection ruleCollection = - customObjectSecurity - .GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)); - + AuthorizationRuleCollection ruleCollection = customObjectSecurity.GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)); Assert.NotNull(ruleCollection); List addedRules = ruleCollection.Cast().ToList(); - Assert.True(addedRules.Contains(customAccessRuleAllow)); - Assert.True(addedRules.Contains(customAccessRuleDeny)); + Assert.Contains(customAccessRuleAllow, addedRules); + Assert.Contains(customAccessRuleDeny, addedRules); } private class CustomDirectoryObjectSecurity : DirectoryObjectSecurity diff --git a/external/corefx/src/System.IO.FileSystem.AccessControl/tests/FileSystemAccessRuleTests.cs b/external/corefx/src/System.IO.FileSystem.AccessControl/tests/FileSystemAccessRuleTests.cs index 23d8adebcb..611a59dfdc 100644 --- a/external/corefx/src/System.IO.FileSystem.AccessControl/tests/FileSystemAccessRuleTests.cs +++ b/external/corefx/src/System.IO.FileSystem.AccessControl/tests/FileSystemAccessRuleTests.cs @@ -1,5 +1,6 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// 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.Security.AccessControl; using System.Security.Principal; @@ -12,10 +13,9 @@ namespace System.IO [Fact] public void FileSystemAccessRule_Returns_Valid_Object() { - var identity = new SecurityIdentifier(WellKnownSidType.WorldSid, null); - var accessRule = new FileSystemAccessRule(identity, FileSystemRights.AppendData, AccessControlType.Allow); + var accessRule = new FileSystemAccessRule(Helpers.s_WorldSidNTAccount, FileSystemRights.AppendData, AccessControlType.Allow); var expectedFileSystemRights = FileSystemRights.AppendData | FileSystemRights.Synchronize; - Assert.Equal(identity, accessRule.IdentityReference); + Assert.Equal(Helpers.s_WorldSidNTAccount, accessRule.IdentityReference); Assert.Equal(expectedFileSystemRights, accessRule.FileSystemRights); Assert.Equal(AccessControlType.Allow, accessRule.AccessControlType); Assert.Equal(PropagationFlags.None, accessRule.PropagationFlags); @@ -25,16 +25,14 @@ namespace System.IO [Fact] public void FileSystemAccessRule_InvalidFileSystemRights() { - var identity = new SecurityIdentifier(WellKnownSidType.WorldSid, null); AssertExtensions.Throws("fileSystemRights", () => - new FileSystemAccessRule(identity, (FileSystemRights)(-1), AccessControlType.Allow)); + new FileSystemAccessRule(Helpers.s_WorldSidNTAccount, (FileSystemRights)(-1), AccessControlType.Allow)); } [Fact] public void FileSystemAccessRule_AcessControlTypeDeny_Returns_Valid_Object() { - var identity = new SecurityIdentifier(WellKnownSidType.WorldSid, null); - var accessRule = new FileSystemAccessRule(identity, FileSystemRights.AppendData, AccessControlType.Deny); + var accessRule = new FileSystemAccessRule(Helpers.s_WorldSidNTAccount, FileSystemRights.AppendData, AccessControlType.Deny); var expectedFileSystemRights = FileSystemRights.AppendData & ~FileSystemRights.Synchronize; Assert.Equal(expectedFileSystemRights, accessRule.FileSystemRights); Assert.Equal(AccessControlType.Deny, accessRule.AccessControlType); @@ -43,8 +41,7 @@ namespace System.IO [Fact] public void FileSystemAccessRule_FileSystemRightsFullControl_Returns_Valid_Object() { - var identity = new SecurityIdentifier(WellKnownSidType.WorldSid, null); - var accessRule = new FileSystemAccessRule(identity, FileSystemRights.FullControl, AccessControlType.Deny); + var accessRule = new FileSystemAccessRule(Helpers.s_WorldSidNTAccount, FileSystemRights.FullControl, AccessControlType.Deny); Assert.Equal(FileSystemRights.FullControl, accessRule.FileSystemRights); Assert.Equal(AccessControlType.Deny, accessRule.AccessControlType); } @@ -65,8 +62,7 @@ namespace System.IO [Fact] public void FileSystemAccessRule_InhertianceFlag_PropagationFlag_Returns_Valid_Object() { - var identity = new SecurityIdentifier(WellKnownSidType.WorldSid, null); - var accessRule = new FileSystemAccessRule(identity, FileSystemRights.AppendData, + var accessRule = new FileSystemAccessRule(Helpers.s_WorldSidNTAccount, FileSystemRights.AppendData, InheritanceFlags.ContainerInherit, PropagationFlags.NoPropagateInherit, AccessControlType.Allow); diff --git a/external/corefx/src/System.IO.FileSystem.AccessControl/tests/FileSystemAclExtensionsTests.cs b/external/corefx/src/System.IO.FileSystem.AccessControl/tests/FileSystemAclExtensionsTests.cs index 09f663147b..db275f4b27 100644 --- a/external/corefx/src/System.IO.FileSystem.AccessControl/tests/FileSystemAclExtensionsTests.cs +++ b/external/corefx/src/System.IO.FileSystem.AccessControl/tests/FileSystemAclExtensionsTests.cs @@ -1,5 +1,6 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// 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.Security.AccessControl; using Xunit; diff --git a/external/corefx/src/System.IO.FileSystem.AccessControl/tests/FileSystemAuditRuleTests.cs b/external/corefx/src/System.IO.FileSystem.AccessControl/tests/FileSystemAuditRuleTests.cs index 00d87a8860..dfd1902abd 100644 --- a/external/corefx/src/System.IO.FileSystem.AccessControl/tests/FileSystemAuditRuleTests.cs +++ b/external/corefx/src/System.IO.FileSystem.AccessControl/tests/FileSystemAuditRuleTests.cs @@ -1,6 +1,6 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - +// 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.Security.Principal; using Xunit; @@ -12,9 +12,8 @@ namespace System.Security.AccessControl [Fact] public void ObjectInitialization_IdentityReference_FileSystemRights_AuditFlags_Success() { - var identity = new SecurityIdentifier(WellKnownSidType.WorldSid, null); - var auditRule = new FileSystemAuditRule(identity, FileSystemRights.ReadData, AuditFlags.Failure); - Assert.Equal(auditRule.IdentityReference, identity); + var auditRule = new FileSystemAuditRule(Helpers.s_WorldSidNTAccount, FileSystemRights.ReadData, AuditFlags.Failure); + Assert.Equal(auditRule.IdentityReference, Helpers.s_WorldSidNTAccount); Assert.Equal(auditRule.FileSystemRights, FileSystemRights.ReadData); Assert.Equal(auditRule.AuditFlags, AuditFlags.Failure); } @@ -41,7 +40,6 @@ namespace System.Security.AccessControl public void ObjectInitialization_InvalidFileSystemRights() { var fileSystemRights = (FileSystemRights)(-1); - var identity = new SecurityIdentifier(WellKnownSidType.WorldSid, null); AssertExtensions.Throws("fileSystemRights", () => new FileSystemAuditRule(@"MYDOMAIN\MyAccount", fileSystemRights, AuditFlags.Failure)); } diff --git a/external/corefx/src/System.IO.FileSystem.AccessControl/tests/FileSystemSecurityTests.cs b/external/corefx/src/System.IO.FileSystem.AccessControl/tests/FileSystemSecurityTests.cs index 14e223b228..d8b9baab98 100644 --- a/external/corefx/src/System.IO.FileSystem.AccessControl/tests/FileSystemSecurityTests.cs +++ b/external/corefx/src/System.IO.FileSystem.AccessControl/tests/FileSystemSecurityTests.cs @@ -1,5 +1,6 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// 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; using System.Collections.Generic; @@ -24,7 +25,7 @@ namespace System.IO [Fact] public void AddAccessRule_Succeeds() { - var accessRule = new FileSystemAccessRule(@"NT AUTHORITY\SYSTEM", + var accessRule = new FileSystemAccessRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.AppendData, AccessControlType.Allow); var fileSecurity = new FileSecurity(); fileSecurity.AddAccessRule(accessRule); @@ -32,7 +33,7 @@ namespace System.IO fileSecurity.GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)); Assert.Equal(1, rules.Count); var actualAddedRule = (FileSystemAccessRule)rules[0]; - Assert.Equal(accessRule.IdentityReference, actualAddedRule.IdentityReference); + Assert.Equal(new SecurityIdentifier(WellKnownSidType.LocalSystemSid, null).Translate(typeof(NTAccount)), actualAddedRule.IdentityReference); Assert.Equal(accessRule.FileSystemRights, actualAddedRule.FileSystemRights); Assert.Equal(accessRule.AccessControlType, actualAddedRule.AccessControlType); } @@ -47,11 +48,11 @@ namespace System.IO [Fact] public void SetAccessRule_Succeeds() { - var accessRuleRead = new FileSystemAccessRule(@"NT AUTHORITY\SYSTEM", + var accessRuleRead = new FileSystemAccessRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.Read, AccessControlType.Allow); var fileSecurity = new FileSecurity(); fileSecurity.AddAccessRule(accessRuleRead); - var accessRuleWrite = new FileSystemAccessRule(@"NT AUTHORITY\SYSTEM", + var accessRuleWrite = new FileSystemAccessRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.Write, AccessControlType.Allow); //Changing the value of file system rights from "read" to "write". fileSecurity.SetAccessRule(accessRuleWrite); @@ -67,11 +68,12 @@ namespace System.IO [Fact] public void SetAccessRule_IgnoreExistingRule_Succeeds() { - var accessRuleRead = new FileSystemAccessRule(@"NT AUTHORITY\SYSTEM", + var accessRuleRead = new FileSystemAccessRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.Read, AccessControlType.Allow); var fileSecurity = new FileSecurity(); fileSecurity.AddAccessRule(accessRuleRead); - var newAccessRule = new FileSystemAccessRule(@"NT AUTHORITY\Network Service", + + var newAccessRule = new FileSystemAccessRule(Helpers.s_NetworkServiceNTAccount, FileSystemRights.Write, AccessControlType.Allow); fileSecurity.SetAccessRule(newAccessRule); @@ -80,9 +82,9 @@ namespace System.IO Assert.Equal(2, rules.Count); var existingAccessRule = (FileSystemAccessRule)rules[0]; - Assert.Equal(new NTAccount(@"NT AUTHORITY\SYSTEM"), existingAccessRule.IdentityReference); + Assert.Equal(new SecurityIdentifier(WellKnownSidType.LocalSystemSid, null).Translate(typeof(NTAccount)), existingAccessRule.IdentityReference); existingAccessRule = (FileSystemAccessRule)rules[1]; - Assert.Equal(new NTAccount(@"NT AUTHORITY\Network Service"), existingAccessRule.IdentityReference); + Assert.Equal(Helpers.s_NetworkServiceNTAccount, existingAccessRule.IdentityReference); } [Fact] @@ -95,11 +97,11 @@ namespace System.IO [Fact] public void ResetSetAccessRule_Succeeds() { - var accessRuleRead = new FileSystemAccessRule(@"NT AUTHORITY\SYSTEM", + var accessRuleRead = new FileSystemAccessRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.Read, AccessControlType.Allow); - var accessRuleAppendData = new FileSystemAccessRule(@"NT AUTHORITY\SYSTEM", + var accessRuleAppendData = new FileSystemAccessRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.AppendData, AccessControlType.Deny); - var accessRuleWrite = new FileSystemAccessRule(@"NT AUTHORITY\SYSTEM", + var accessRuleWrite = new FileSystemAccessRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.Write, AccessControlType.Allow); var fileSecurity = new FileSecurity(); @@ -127,7 +129,7 @@ namespace System.IO [Fact] public void RemoveAccessRule_Succeeds() { - var accessRule = new FileSystemAccessRule(@"NT AUTHORITY\SYSTEM", + var accessRule = new FileSystemAccessRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.Read | FileSystemRights.Write, AccessControlType.Allow); var fileSecurity = new FileSecurity(); @@ -136,7 +138,7 @@ namespace System.IO fileSecurity.GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)); Assert.Equal(1, rules.Count); //Removing the "write" access right. - Assert.True(fileSecurity.RemoveAccessRule(new FileSystemAccessRule(@"NT AUTHORITY\SYSTEM", + Assert.True(fileSecurity.RemoveAccessRule(new FileSystemAccessRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.Write, AccessControlType.Allow))); rules = fileSecurity.GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)); @@ -148,12 +150,12 @@ namespace System.IO [Fact] public void RemoveAccessRule_IdenticalRule_Succeeds() { - var accessRule = new FileSystemAccessRule(@"NT AUTHORITY\SYSTEM", + var accessRule = new FileSystemAccessRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.Read | FileSystemRights.Write, AccessControlType.Allow); var fileSecurity = new FileSecurity(); fileSecurity.AddAccessRule(accessRule); - Assert.True(fileSecurity.RemoveAccessRule(new FileSystemAccessRule(@"NT AUTHORITY\SYSTEM", + Assert.True(fileSecurity.RemoveAccessRule(new FileSystemAccessRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.Read | FileSystemRights.Write, AccessControlType.Allow))); var rules = fileSecurity.GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)); @@ -163,9 +165,9 @@ namespace System.IO [Fact] public void RemoveAccessRule_NoMatchableRules_Succeeds() { - var accessRuleAppendData = new FileSystemAccessRule(@"NT AUTHORITY\SYSTEM", FileSystemRights.AppendData, + var accessRuleAppendData = new FileSystemAccessRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.AppendData, AccessControlType.Allow); - var accessRuleWrite = new FileSystemAccessRule(@"NT AUTHORITY\SYSTEM", + var accessRuleWrite = new FileSystemAccessRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.Write, AccessControlType.Deny); var fileSecurity = new FileSecurity(); @@ -175,7 +177,7 @@ namespace System.IO fileSecurity.GetAccessRules(true, true, typeof(System.Security.Principal.NTAccount)); Assert.Equal(1, rules.Count); var remainingRule = (FileSystemAccessRule)rules[0]; - Assert.Equal(new NTAccount(@"NT AUTHORITY\SYSTEM"), accessRuleAppendData.IdentityReference); + Assert.Equal(Helpers.s_LocalSystemNTAccount, accessRuleAppendData.IdentityReference); Assert.Equal(accessRuleAppendData.FileSystemRights, remainingRule.FileSystemRights); Assert.Equal(AccessControlType.Allow, remainingRule.AccessControlType); } @@ -190,10 +192,10 @@ namespace System.IO [Fact] public void RemoveAccessRuleSpecific_NoMatchingRules_Succeeds() { - var accessRuleReadWrite = new FileSystemAccessRule(@"NT AUTHORITY\SYSTEM", + var accessRuleReadWrite = new FileSystemAccessRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.Read | FileSystemRights.Write, AccessControlType.Allow); - var accessRuleWrite = new FileSystemAccessRule(@"NT AUTHORITY\SYSTEM", + var accessRuleWrite = new FileSystemAccessRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.Write, AccessControlType.Allow); var fileSecurity = new FileSecurity(); @@ -210,7 +212,7 @@ namespace System.IO [Fact] public void RemoveAccessRuleSpecific_Succeeds() { - var accessRule = new FileSystemAccessRule(@"NT AUTHORITY\SYSTEM", FileSystemRights.AppendData + var accessRule = new FileSystemAccessRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.AppendData | FileSystemRights.Write, AccessControlType.Allow); var fileSecurity = new FileSecurity(); fileSecurity.AddAccessRule(accessRule); @@ -232,15 +234,15 @@ namespace System.IO [Fact] public void RemoveAccessRuleAll_Succeeds() { - var accessRuleAppendData = new FileSystemAccessRule(@"NT AUTHORITY\SYSTEM", FileSystemRights.AppendData, + var accessRuleAppendData = new FileSystemAccessRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.AppendData, AccessControlType.Allow); - var accessRuleRead = new FileSystemAccessRule(@"NT AUTHORITY\SYSTEM", + var accessRuleRead = new FileSystemAccessRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.Read, AccessControlType.Allow); - var accessRuleWrite = new FileSystemAccessRule(@"NT AUTHORITY\SYSTEM", + var accessRuleWrite = new FileSystemAccessRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.Write, AccessControlType.Allow); - var accessRuleReadPermissionDeny = new FileSystemAccessRule(@"NT AUTHORITY\SYSTEM", + var accessRuleReadPermissionDeny = new FileSystemAccessRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.ReadPermissions, AccessControlType.Deny); - var accessRuleReadNetworkService = new FileSystemAccessRule(@"NT AUTHORITY\Network Service", + var accessRuleReadNetworkService = new FileSystemAccessRule(Helpers.s_NetworkServiceNTAccount, FileSystemRights.Read, AccessControlType.Allow); var fileSecurity = new FileSecurity(); @@ -255,18 +257,18 @@ namespace System.IO Assert.Equal(2, rules.Count); var existingAccessRule = (FileSystemAccessRule)rules[0]; - Assert.Equal(new NTAccount(@"NT AUTHORITY\SYSTEM"), existingAccessRule.IdentityReference); + Assert.Equal(new SecurityIdentifier(WellKnownSidType.LocalSystemSid, null).Translate(typeof(NTAccount)), existingAccessRule.IdentityReference); Assert.Equal(AccessControlType.Deny, existingAccessRule.AccessControlType); Assert.Equal(FileSystemRights.ReadPermissions, existingAccessRule.FileSystemRights); existingAccessRule = (FileSystemAccessRule)rules[1]; - Assert.Equal(new NTAccount(@"NT AUTHORITY\Network Service"), existingAccessRule.IdentityReference); + Assert.Equal(Helpers.s_NetworkServiceNTAccount, existingAccessRule.IdentityReference); Assert.Equal(AccessControlType.Allow, existingAccessRule.AccessControlType); } [Fact] public void AccessRuleType_Returns_Valid_Object() { - var accessRule = new FileSystemAccessRule(@"NT AUTHORITY\SYSTEM", FileSystemRights.AppendData, + var accessRule = new FileSystemAccessRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.AppendData, AccessControlType.Allow); var fileSecurity = new FileSecurity(); fileSecurity.AddAccessRule(accessRule); @@ -277,7 +279,7 @@ namespace System.IO [Fact] public void AddAuditRule_Succeeds() { - var auditRule = new FileSystemAuditRule(@"NT AUTHORITY\SYSTEM", + var auditRule = new FileSystemAuditRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.AppendData, AuditFlags.Success); var fileSecurity = new FileSecurity(); fileSecurity.AddAuditRule(auditRule); @@ -285,7 +287,7 @@ namespace System.IO fileSecurity.GetAuditRules(true, true, typeof(System.Security.Principal.NTAccount)); Assert.Equal(1, auditRules.Count); var actualAddedRule = (FileSystemAuditRule)auditRules[0]; - Assert.Equal(new NTAccount(@"NT AUTHORITY\SYSTEM"), actualAddedRule.IdentityReference); + Assert.Equal(Helpers.s_LocalSystemNTAccount, actualAddedRule.IdentityReference); Assert.Equal(AuditFlags.Success, actualAddedRule.AuditFlags); Assert.Equal(FileSystemRights.AppendData, actualAddedRule.FileSystemRights); } @@ -293,11 +295,11 @@ namespace System.IO [Fact] public void SetAuditRule_Succeeds() { - var auditRuleAppendData = new FileSystemAuditRule(@"NT AUTHORITY\SYSTEM", + var auditRuleAppendData = new FileSystemAuditRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.AppendData, AuditFlags.Success); - var auditRuleNetworkService = new FileSystemAuditRule(@"NT AUTHORITY\Network Service", + var auditRuleNetworkService = new FileSystemAuditRule(Helpers.s_NetworkServiceNTAccount, FileSystemRights.CreateFiles, AuditFlags.Failure); - var auditRuleDelete = new FileSystemAuditRule(@"NT AUTHORITY\SYSTEM", + var auditRuleDelete = new FileSystemAuditRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.Delete, AuditFlags.Success); var fileSecurity = new FileSecurity(); @@ -308,11 +310,11 @@ namespace System.IO Assert.Equal(2, auditRules.Count); var firstAuditRule = (FileSystemAuditRule)auditRules[0]; - Assert.Equal(new NTAccount(@"NT AUTHORITY\SYSTEM"), firstAuditRule.IdentityReference); + Assert.Equal(new SecurityIdentifier(WellKnownSidType.LocalSystemSid, null).Translate(typeof(NTAccount)), firstAuditRule.IdentityReference); Assert.Equal(AuditFlags.Success, firstAuditRule.AuditFlags); Assert.Equal(FileSystemRights.Delete, firstAuditRule.FileSystemRights); var secondAuditRule = (FileSystemAuditRule)auditRules[1]; - Assert.Equal(new NTAccount(@"NT AUTHORITY\Network Service"), secondAuditRule.IdentityReference); + Assert.Equal(Helpers.s_NetworkServiceNTAccount, secondAuditRule.IdentityReference); Assert.Equal(AuditFlags.Failure, secondAuditRule.AuditFlags); Assert.Equal(FileSystemRights.CreateFiles, secondAuditRule.FileSystemRights); } @@ -320,7 +322,7 @@ namespace System.IO [Fact] public void RemoveAuditRule_Succeeds() { - var auditRule = new FileSystemAuditRule(@"NT AUTHORITY\SYSTEM", + var auditRule = new FileSystemAuditRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.Read | FileSystemRights.Write, AuditFlags.Failure); var fileSecurity = new FileSecurity(); @@ -328,7 +330,7 @@ namespace System.IO AuthorizationRuleCollection rules = fileSecurity.GetAuditRules(true, true, typeof(System.Security.Principal.NTAccount)); Assert.Equal(1, rules.Count); - Assert.True(fileSecurity.RemoveAuditRule(new FileSystemAuditRule(@"NT AUTHORITY\SYSTEM", + Assert.True(fileSecurity.RemoveAuditRule(new FileSystemAuditRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.Write, AuditFlags.Failure))); rules = fileSecurity.GetAuditRules(true, true, typeof(System.Security.Principal.NTAccount)); @@ -336,15 +338,15 @@ namespace System.IO var existingRule = (FileSystemAuditRule)rules[0]; Assert.Equal(FileSystemRights.Read, existingRule.FileSystemRights); Assert.Equal(AuditFlags.Failure, existingRule.AuditFlags); - Assert.Equal(new NTAccount(@"NT AUTHORITY\SYSTEM"), existingRule.IdentityReference); + Assert.Equal(new SecurityIdentifier(WellKnownSidType.LocalSystemSid, null).Translate(typeof(NTAccount)), existingRule.IdentityReference); } [Fact] public void RemoveAuditRuleSpecific_Succeeds() { - var auditRuleReadWrite = new FileSystemAuditRule(@"NT AUTHORITY\SYSTEM", + var auditRuleReadWrite = new FileSystemAuditRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.Write | FileSystemRights.Read, AuditFlags.Success); - var auditRuleNetworkService = new FileSystemAuditRule(@"NT AUTHORITY\Network Service", + var auditRuleNetworkService = new FileSystemAuditRule(Helpers.s_NetworkServiceNTAccount, FileSystemRights.Read, AuditFlags.Failure); var fileSecurity = new FileSecurity(); @@ -355,7 +357,7 @@ namespace System.IO fileSecurity.GetAuditRules(true, true, typeof(System.Security.Principal.NTAccount)); Assert.Equal(1, rules.Count); var existingAuditRule = (FileSystemAuditRule)rules[0]; - Assert.Equal(new NTAccount(@"NT AUTHORITY\Network Service"), existingAuditRule.IdentityReference); + Assert.Equal(Helpers.s_NetworkServiceNTAccount, existingAuditRule.IdentityReference); Assert.Equal(FileSystemRights.Read, existingAuditRule.FileSystemRights); Assert.Equal(AuditFlags.Failure, existingAuditRule.AuditFlags); } @@ -363,11 +365,11 @@ namespace System.IO [Fact] public void RemoveAuditRuleSpecific_NoMatchingRules_Succeeds() { - var auditRuleReadWrite = new FileSystemAuditRule(@"NT AUTHORITY\SYSTEM", + var auditRuleReadWrite = new FileSystemAuditRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.Write | FileSystemRights.Read, AuditFlags.Success); var fileSecurity = new FileSecurity(); fileSecurity.AddAuditRule(auditRuleReadWrite); - fileSecurity.RemoveAuditRuleSpecific(new FileSystemAuditRule(@"NT AUTHORITY\SYSTEM", + fileSecurity.RemoveAuditRuleSpecific(new FileSystemAuditRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.Write, AuditFlags.Success)); AuthorizationRuleCollection rules = fileSecurity.GetAuditRules(true, true, typeof(System.Security.Principal.NTAccount)); @@ -379,11 +381,11 @@ namespace System.IO [Fact] public void RemoveAuditRuleAll_Succeeds() { - var auditRuleAppend = new FileSystemAuditRule(@"NT AUTHORITY\SYSTEM", FileSystemRights.AppendData, + var auditRuleAppend = new FileSystemAuditRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.AppendData, AuditFlags.Success); - var auditRuleWrite = new FileSystemAuditRule(@"NT AUTHORITY\SYSTEM", + var auditRuleWrite = new FileSystemAuditRule(Helpers.s_LocalSystemNTAccount, FileSystemRights.Write, AuditFlags.Success); - var auditRuleNetworkService = new FileSystemAuditRule(@"NT AUTHORITY\Network Service", + var auditRuleNetworkService = new FileSystemAuditRule(Helpers.s_NetworkServiceNTAccount, FileSystemRights.Read, AuditFlags.Failure); var fileSecurity = new FileSecurity(); @@ -395,7 +397,7 @@ namespace System.IO Assert.Equal(1, rules.Count); var existingAuditRule = (FileSystemAuditRule)rules[0]; - Assert.Equal(new NTAccount(@"NT AUTHORITY\Network Service"), existingAuditRule.IdentityReference); + Assert.Equal(Helpers.s_NetworkServiceNTAccount, existingAuditRule.IdentityReference); Assert.Equal(FileSystemRights.Read, existingAuditRule.FileSystemRights); Assert.Equal(AuditFlags.Failure, existingAuditRule.AuditFlags); } diff --git a/external/corefx/src/System.IO.FileSystem.AccessControl/tests/Helpers.cs b/external/corefx/src/System.IO.FileSystem.AccessControl/tests/Helpers.cs new file mode 100644 index 0000000000..2c3f30e2d9 --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem.AccessControl/tests/Helpers.cs @@ -0,0 +1,15 @@ +// 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.Security.Principal; + +namespace System.Security.AccessControl +{ + public static class Helpers + { + public static IdentityReference s_LocalSystemNTAccount = new SecurityIdentifier(WellKnownSidType.LocalSystemSid, null).Translate(typeof(NTAccount)); + public static IdentityReference s_NetworkServiceNTAccount = new SecurityIdentifier(WellKnownSidType.NetworkServiceSid, null).Translate(typeof(NTAccount)); + public static IdentityReference s_WorldSidNTAccount = new SecurityIdentifier(WellKnownSidType.WorldSid, null); + } +} diff --git a/external/corefx/src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj b/external/corefx/src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj index 3a42f3e7b1..e8c6c3acd4 100644 --- a/external/corefx/src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj +++ b/external/corefx/src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj @@ -20,6 +20,7 @@ + \ No newline at end of file diff --git a/external/corefx/src/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj b/external/corefx/src/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj index 056e32b1d7..a928d8f486 100644 --- a/external/corefx/src/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj +++ b/external/corefx/src/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj @@ -20,9 +20,6 @@ Common\System\HResults.cs - - Common\System\IO\PathInternal.cs - Common\System\IO\PathInternal.CaseSensitivity.cs @@ -63,8 +60,8 @@ Common\Interop\Windows\Interop.FormatMessage.cs - - Common\System\IO\Win32Marshal.cs + + Common\CoreLib\System\IO\Win32Marshal.cs Common\System\IO\DriveInfoInternal.Win32.cs @@ -101,6 +98,7 @@ + diff --git a/external/corefx/src/System.IO.FileSystem.DriveInfo/src/System/IO/DriveInfo.Windows.cs b/external/corefx/src/System.IO.FileSystem.DriveInfo/src/System/IO/DriveInfo.Windows.cs index 361cbbe601..39a84e9e6a 100644 --- a/external/corefx/src/System.IO.FileSystem.DriveInfo/src/System/IO/DriveInfo.Windows.cs +++ b/external/corefx/src/System.IO.FileSystem.DriveInfo/src/System/IO/DriveInfo.Windows.cs @@ -24,7 +24,7 @@ namespace System.IO name = Path.GetPathRoot(driveName); // Disallow null or empty drive letters and UNC paths if (name == null || name.Length == 0 || name.StartsWith("\\\\", StringComparison.Ordinal)) - throw new ArgumentException(SR.Arg_MustBeDriveLetterOrRootDir); + throw new ArgumentException(SR.Arg_MustBeDriveLetterOrRootDir, nameof(driveName)); } // We want to normalize to have a trailing backslash so we don't have two equivalent forms and // because some Win32 API don't work without it. @@ -37,7 +37,7 @@ namespace System.IO // On Windows this means it's between A and Z, ignoring case. char letter = driveName[0]; if (!((letter >= 'A' && letter <= 'Z') || (letter >= 'a' && letter <= 'z'))) - throw new ArgumentException(SR.Arg_MustBeDriveLetterOrRootDir); + throw new ArgumentException(SR.Arg_MustBeDriveLetterOrRootDir, nameof(driveName)); return name; } diff --git a/external/corefx/src/System.IO.FileSystem.DriveInfo/tests/DriveInfo.Windows.Tests.cs b/external/corefx/src/System.IO.FileSystem.DriveInfo/tests/DriveInfo.Windows.Tests.cs index c1ff89a3b8..612e905faa 100644 --- a/external/corefx/src/System.IO.FileSystem.DriveInfo/tests/DriveInfo.Windows.Tests.cs +++ b/external/corefx/src/System.IO.FileSystem.DriveInfo/tests/DriveInfo.Windows.Tests.cs @@ -17,22 +17,22 @@ namespace System.IO.FileSystem.DriveInfoTests public class DriveInfoWindowsTests { [Theory] - [InlineData(":", null)] - [InlineData("://", null)] - [InlineData(@":\", null)] - [InlineData(":/", null)] - [InlineData(@":\\", null)] - [InlineData("Az", null)] - [InlineData("1", null)] - [InlineData("a1", null)] - [InlineData(@"\\share", null)] - [InlineData(@"\\", null)] - [InlineData("c ", null)] - [InlineData("", "path")] - [InlineData(" c", null)] - public void Ctor_InvalidPath_ThrowsArgumentException(string driveName, string paramName) + [InlineData(":")] + [InlineData("://")] + [InlineData(@":\")] + [InlineData(":/")] + [InlineData(@":\\")] + [InlineData("Az")] + [InlineData("1")] + [InlineData("a1")] + [InlineData(@"\\share")] + [InlineData(@"\\")] + [InlineData("c ")] + [InlineData("")] + [InlineData(" c")] + public void Ctor_InvalidPath_ThrowsArgumentException(string driveName) { - AssertExtensions.Throws(paramName, null, () => new DriveInfo(driveName)); + AssertExtensions.Throws("driveName", null, () => new DriveInfo(driveName)); } [Fact] diff --git a/external/corefx/src/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj b/external/corefx/src/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj index 734563e601..c797318179 100644 --- a/external/corefx/src/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj +++ b/external/corefx/src/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj @@ -24,14 +24,10 @@ - - - Common\System\IO\PathInternal.cs - Common\System\IO\PathInternal.CaseSensitivity.cs @@ -150,6 +146,7 @@ + @@ -165,4 +162,4 @@ - + \ No newline at end of file diff --git a/external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs b/external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs index 8eff45a82a..f0f9e0a994 100644 --- a/external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs +++ b/external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs @@ -5,6 +5,7 @@ using System.ComponentModel; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; +using System.IO.Enumeration; using System.Threading; using System.Threading.Tasks; @@ -22,7 +23,6 @@ namespace System.IO /// Listens to the system directory change notifications and /// raises events when a directory or file within a directory changes. /// - public partial class FileSystemWatcher : Component, ISupportInitialize { /// @@ -89,14 +89,14 @@ namespace System.IO public FileSystemWatcher() { _directory = string.Empty; - _filter = "*.*"; + _filter = "*"; } /// /// Initializes a new instance of the class, /// given the specified directory to monitor. /// - public FileSystemWatcher(string path) : this(path, "*.*") + public FileSystemWatcher(string path) : this(path, "*") { } @@ -109,9 +109,6 @@ namespace System.IO if (path == null) throw new ArgumentNullException(nameof(path)); - if (filter == null) - throw new ArgumentNullException(nameof(filter)); - // Early check for directory parameter so that an exception can be thrown as early as possible. if (path.Length == 0) throw new ArgumentException(SR.Format(SR.InvalidDirName, path), nameof(path)); @@ -120,7 +117,10 @@ namespace System.IO throw new ArgumentException(SR.Format(SR.InvalidDirName_NotExists, path), nameof(path)); _directory = path; - _filter = filter; + _filter = filter ?? throw new ArgumentNullException(nameof(filter)); + + if (_filter == "*.*") + _filter = "*"; } /// @@ -193,13 +193,13 @@ namespace System.IO { if (string.IsNullOrEmpty(value)) { - // Skip the string compare for "*.*" since it has no case-insensitive representation that differs from + // Skip the string compare for "*" since it has no case-insensitive representation that differs from // the case-sensitive representation. - _filter = "*.*"; + _filter = "*"; } else if (!string.Equals(_filter, value, PathInternal.StringComparison)) { - _filter = value; + _filter = value == "*.*" ? "*" : value; } } } @@ -267,7 +267,7 @@ namespace System.IO /// /// Gets or sets the path of the directory to watch. - /// + /// public string Path { get @@ -404,10 +404,10 @@ namespace System.IO /// private bool MatchPattern(string relativePath) { - string name = System.IO.Path.GetFileName(relativePath); - return name != null ? - PatternMatcher.StrictMatchPattern(_filter, name) : - false; + ReadOnlySpan name = IO.Path.GetFileName(relativePath.AsSpan()); + return name.Length > 0 + ? FileSystemName.MatchesSimpleExpression(_filter, name, ignoreCase: !PathInternal.IsCaseSensitive) + : false; } /// @@ -662,7 +662,6 @@ namespace System.IO { return _synchronizingObject; } - set { _synchronizingObject = value; diff --git a/external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/PatternMatcher.cs b/external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/PatternMatcher.cs deleted file mode 100644 index 91f18a3640..0000000000 --- a/external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/PatternMatcher.cs +++ /dev/null @@ -1,505 +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.IO -{ - internal static class PatternMatcher - { - /// - /// Private constants (directly from C header files) - /// - private const int MATCHES_ARRAY_SIZE = 16; - private const char ANSI_DOS_STAR = '>'; - private const char ANSI_DOS_QM = '<'; - private const char DOS_DOT = '"'; - - /// - /// Tells whether a given name matches the expression given with a strict (i.e. UNIX like) - /// semantics. This code is a port of unmanaged code. Original code comment follows: - /// - /// Routine Description: - /// - /// This routine compares a Dbcs name and an expression and tells the caller - /// if the name is in the language defined by the expression. The input name - /// cannot contain wildcards, while the expression may contain wildcards. - /// - /// Expression wild cards are evaluated as shown in the nondeterministic - /// finite automatons below. Note that ~* and ~? are DOS_STAR and DOS_QM. - /// - /// - /// ~* is DOS_STAR, ~? is DOS_QM, and ~. is DOS_DOT - /// - /// - /// S - /// <-----< - /// X | | e Y - /// X * Y == (0)----->-(1)->-----(2)-----(3) - /// - /// - /// S-. - /// <-----< - /// X | | e Y - /// X ~* Y == (0)----->-(1)->-----(2)-----(3) - /// - /// - /// - /// X S S Y - /// X ?? Y == (0)---(1)---(2)---(3)---(4) - /// - /// - /// - /// X . . Y - /// X ~.~. Y == (0)---(1)----(2)------(3)---(4) - /// | |________| - /// | ^ | - /// |_______________| - /// ^EOF or .^ - /// - /// - /// X S-. S-. Y - /// X ~?~? Y == (0)---(1)-----(2)-----(3)---(4) - /// | |________| - /// | ^ | - /// |_______________| - /// ^EOF or .^ - /// - /// - /// - /// where S is any single character - /// - /// S-. is any single character except the final . - /// - /// e is a null character transition - /// - /// EOF is the end of the name string - /// - /// In words: - /// - /// * matches 0 or more characters. - /// - /// ? matches exactly 1 character. - /// - /// DOS_STAR matches 0 or more characters until encountering and matching - /// the final . in the name. - /// - /// DOS_QM matches any single character, or upon encountering a period or - /// end of name string, advances the expression to the end of the - /// set of contiguous DOS_QMs. - /// - /// DOS_DOT matches either a . or zero characters beyond name string. - /// - /// Arguments: - /// - /// Expression - Supplies the input expression to check against - /// - /// Name - Supplies the input name to check for. - /// - /// Return Value: - /// - /// BOOLEAN - TRUE if Name is an element in the set of strings denoted - /// by the input Expression and FALSE otherwise. - /// - /// - public static bool StrictMatchPattern(string expression, string name) - { - // - // The idea behind the algorithm is pretty simple. We keep track of - // all possible locations in the regular expression that are matching - // the name. If when the name has been exhausted one of the locations - // in the expression is also just exhausted, the name is in the language - // defined by the regular expression. - // - - if (name == null || name.Length == 0 || expression == null || expression.Length == 0) - { - return false; - } - - // - // Special case by far the most common wild card search of * or *.* - // - - if (expression.Equals("*") || expression.Equals("*.*")) - { - return true; - } - - // If this class is ever exposed for generic use, - // we need to make sure that name doesn't contain wildcards. Currently - // the only component that calls this method is FileSystemWatcher and - // it will never pass a name that contains a wildcard. - - - // - // Also special case expressions of the form *X. With this and the prior - // case we have covered virtually all normal queries. - // - if (expression[0] == '*' && expression.IndexOf('*', 1) == -1) - { - int rightLength = expression.Length - 1; - // if name is shorter that the stuff to the right of * in expression, we don't - // need to do the string compare, otherwise we compare rightlength characters - // and the end of both strings. - if (name.Length >= rightLength && - string.Compare(expression, 1, name, name.Length - rightLength, rightLength, PathInternal.StringComparison) == 0) - { - return true; - } - } - - // - // Walk through the name string, picking off characters. We go one - // character beyond the end because some wild cards are able to match - // zero characters beyond the end of the string. - // - // With each new name character we determine a new set of states that - // match the name so far. We use two arrays that we swap back and forth - // for this purpose. One array lists the possible expression states for - // all name characters up to but not including the current one, and other - // array is used to build up the list of states considering the current - // name character as well. The arrays are then switched and the process - // repeated. - // - // There is not a one-to-one correspondence between state number and - // offset into the expression. This is evident from the NFAs in the - // initial comment to this function. State numbering is not continuous. - // This allows a simple conversion between state number and expression - // offset. Each character in the expression can represent one or two - // states. * and DOS_STAR generate two states: ExprOffset*2 and - // ExprOffset*2 + 1. All other expression characters can produce only - // a single state. Thus ExprOffset = State/2. - // - // - // Here is a short description of the variables involved: - // - // NameOffset - The offset of the current name char being processed. - // - // ExprOffset - The offset of the current expression char being processed. - // - // SrcCount - Prior match being investigated with current name char - // - // DestCount - Next location to put a matching assuming current name char - // - // NameFinished - Allows one more iteration through the Matches array - // after the name is exhausted (to come *s for example) - // - // PreviousDestCount - This is used to prevent entry duplication, see comment - // - // PreviousMatches - Holds the previous set of matches (the Src array) - // - // CurrentMatches - Holds the current set of matches (the Dest array) - // - // AuxBuffer, LocalBuffer - the storage for the Matches arrays - // - - // - // Set up the initial variables - // - int nameOffset; - int exprOffset; - int length; - - int srcCount; - int destCount; - int previousDestCount; - int matchesCount; - - char nameChar = '\0'; - char exprChar = '\0'; - - int[] previousMatches = new int[MATCHES_ARRAY_SIZE]; - int[] currentMatches = new int[MATCHES_ARRAY_SIZE]; - - int maxState; - int currentState; - - bool nameFinished = false; - - previousMatches[0] = 0; - matchesCount = 1; - - nameOffset = 0; - maxState = expression.Length * 2; - - while (!nameFinished) - { - if (nameOffset < name.Length) - { - nameChar = name[nameOffset]; - nameOffset++; - } - else - { - nameFinished = true; - - // - // if we have already exhausted the expression, C#. Don't - // continue. - // - if (previousMatches[matchesCount - 1] == maxState) - { - break; - } - } - - // - // Now, for each of the previous stored expression matches, see what - // we can do with this name character. - // - srcCount = 0; - destCount = 0; - previousDestCount = 0; - - while (srcCount < matchesCount) - { - // - // We have to carry on our expression analysis as far as possible - // for each character of name, so we loop here until the - // expression stops matching. A clue here is that expression - // cases that can match zero or more characters end with a - // continue, while those that can accept only a single character - // end with a break. - // - exprOffset = ((previousMatches[srcCount++] + 1) / 2); - length = 0; - - while (true) - { - if (exprOffset == expression.Length) - { - break; - } - - // - // The first time through the loop we don't want - // to increment ExprOffset. - // - - exprOffset += length; - - currentState = exprOffset * 2; - - if (exprOffset == expression.Length) - { - currentMatches[destCount++] = maxState; - break; - } - - exprChar = expression[exprOffset]; - length = 1; - - // - // We may be about to exhaust the local - // space for ExpressionMatches[][], so we have to allocate - // some pool if this is the case. - // - - if (destCount >= MATCHES_ARRAY_SIZE - 2) - { - int newSize = currentMatches.Length * 2; - int[] tmp = new int[newSize]; - Array.Copy(currentMatches, 0, tmp, 0, currentMatches.Length); - currentMatches = tmp; - - tmp = new int[newSize]; - Array.Copy(previousMatches, 0, tmp, 0, previousMatches.Length); - previousMatches = tmp; - } - - // - // * matches any character zero or more times. - // - - if (exprChar == '*') - { - currentMatches[destCount++] = currentState; - currentMatches[destCount++] = (currentState + 1); - continue; - } - - // - // DOS_STAR matches any character except . zero or more times. - // - - if (exprChar == ANSI_DOS_STAR) - { - bool iCanEatADot = false; - - // - // If we are at a period, determine if we are allowed to - // consume it, i.e. make sure it is not the last one. - // - if (!nameFinished && (nameChar == '.')) - { - char tmpChar; - int offset; - - int nameLength = name.Length; - for (offset = nameOffset; offset < nameLength; offset++) - { - tmpChar = name[offset]; - length = 1; - - if (tmpChar == '.') - { - iCanEatADot = true; - break; - } - } - } - - if (nameFinished || (nameChar != '.') || iCanEatADot) - { - currentMatches[destCount++] = currentState; - currentMatches[destCount++] = (currentState + 1); - continue; - } - else - { - // - // We are at a period. We can only match zero - // characters (i.e. the epsilon transition). - // - currentMatches[destCount++] = (currentState + 1); - continue; - } - } - - // - // The following expression characters all match by consuming - // a character, thus force the expression, and thus state - // forward. - // - currentState += length * 2; - - // - // DOS_QM is the most complicated. If the name is finished, - // we can match zero characters. If this name is a '.', we - // don't match, but look at the next expression. Otherwise - // we match a single character. - // - if (exprChar == ANSI_DOS_QM) - { - if (nameFinished || (nameChar == '.')) - { - continue; - } - - currentMatches[destCount++] = currentState; - break; - } - - // - // A DOS_DOT can match either a period, or zero characters - // beyond the end of name. - // - if (exprChar == DOS_DOT) - { - if (nameFinished) - { - continue; - } - - if (nameChar == '.') - { - currentMatches[destCount++] = currentState; - break; - } - } - - // - // From this point on a name character is required to even - // continue, let alone make a match. - // - if (nameFinished) - { - break; - } - - // - // If this expression was a '?' we can match it once. - // - if (exprChar == '?') - { - currentMatches[destCount++] = currentState; - break; - } - - // - // Finally, check if the expression char matches the name char - // - - if (PathInternal.IsCaseSensitive ? - (exprChar == nameChar) : - (char.ToUpperInvariant(exprChar) == char.ToUpperInvariant(nameChar))) - { - currentMatches[destCount++] = currentState; - break; - } - - // - // The expression didn't match so go look at the next - // previous match. - // - - break; - } - - - // - // Prevent duplication in the destination array. - // - // Each of the arrays is monotonically increasing and non- - // duplicating, thus we skip over any source element in the src - // array if we just added the same element to the destination - // array. This guarantees non-duplication in the dest. array. - // - - if ((srcCount < matchesCount) && (previousDestCount < destCount)) - { - while (previousDestCount < destCount) - { - int previousLength = previousMatches.Length; - while ((srcCount < previousLength) && (previousMatches[srcCount] < currentMatches[previousDestCount])) - { - srcCount += 1; - } - previousDestCount += 1; - } - } - } - - // - // If we found no matches in the just finished iteration, it's time - // to bail. - // - - if (destCount == 0) - { - return false; - } - - // - // Swap the meaning the two arrays - // - - { - int[] tmp; - - tmp = previousMatches; - - previousMatches = currentMatches; - - currentMatches = tmp; - } - - matchesCount = destCount; - } - - currentState = previousMatches[matchesCount - 1]; - - return currentState == maxState; - } - } -} diff --git a/external/corefx/src/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.unit.cs b/external/corefx/src/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.unit.cs index 1f227a52ba..cce848e614 100644 --- a/external/corefx/src/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.unit.cs +++ b/external/corefx/src/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.unit.cs @@ -25,7 +25,6 @@ namespace System.IO.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "Not working")] public void FileSystemWatcher_NewFileInfoAction_TriggersNothing() { using (var testDirectory = new TempDirectory(GetTestFilePath())) @@ -70,8 +69,8 @@ namespace System.IO.Tests [Fact] public void FileSystemWatcher_ctor() { - string path = String.Empty; - string pattern = "*.*"; + string path = string.Empty; + string pattern = PlatformDetection.IsFullFramework ? "*.*" : "*"; using (FileSystemWatcher watcher = new FileSystemWatcher()) ValidateDefaults(watcher, path, pattern); } @@ -80,7 +79,7 @@ namespace System.IO.Tests public void FileSystemWatcher_ctor_path() { string path = @"."; - string pattern = "*.*"; + string pattern = PlatformDetection.IsFullFramework ? "*.*" : "*"; using (FileSystemWatcher watcher = new FileSystemWatcher(path)) ValidateDefaults(watcher, path, pattern); } @@ -183,7 +182,6 @@ namespace System.IO.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "Not working")] public void FileSystemWatcher_EnableRaisingEvents() { using (var testDirectory = new TempDirectory(GetTestFilePath())) @@ -220,14 +218,14 @@ namespace System.IO.Tests { FileSystemWatcher watcher = new FileSystemWatcher(); - Assert.Equal("*.*", watcher.Filter); + Assert.Equal(PlatformDetection.IsFullFramework ? "*.*" : "*", watcher.Filter); - // Null and empty should be mapped to "*.*" + // Null and empty should be mapped to "*" watcher.Filter = null; - Assert.Equal("*.*", watcher.Filter); + Assert.Equal(PlatformDetection.IsFullFramework ? "*.*" : "*", watcher.Filter); - watcher.Filter = String.Empty; - Assert.Equal("*.*", watcher.Filter); + watcher.Filter = string.Empty; + Assert.Equal(PlatformDetection.IsFullFramework ? "*.*" : "*", watcher.Filter); watcher.Filter = " "; Assert.Equal(" ", watcher.Filter); @@ -245,7 +243,7 @@ namespace System.IO.Tests RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) { // expect no change for OrdinalIgnoreCase-equal strings - // it's unclear why desktop does this but preserve it for compat + // it's unclear why desktop does this but preserve it for compat watcher.Filter = "ABC.DLL"; Assert.Equal("abc.dll", watcher.Filter); } @@ -596,7 +594,6 @@ namespace System.IO.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "Not working")] public void FileSystemWatcher_StopCalledOnBackgroundThreadDoesNotDeadlock() { // Check the case where Stop or Dispose (they do the same thing) is called from diff --git a/external/corefx/src/System.IO.FileSystem.Watcher/tests/InternalBufferOverflowException.cs b/external/corefx/src/System.IO.FileSystem.Watcher/tests/InternalBufferOverflowException.cs index 9f1c014c0b..0cadf4d03a 100644 --- a/external/corefx/src/System.IO.FileSystem.Watcher/tests/InternalBufferOverflowException.cs +++ b/external/corefx/src/System.IO.FileSystem.Watcher/tests/InternalBufferOverflowException.cs @@ -36,11 +36,5 @@ namespace System.IO.Tests Assert.Equal(message, ide.Message); Assert.Same(innerException, ide.InnerException); } - - [Fact] - public static void ExceptionRoundtrips() - { - BinaryFormatterHelpers.AssertRoundtrips(new InternalBufferOverflowException()); - } } } diff --git a/external/corefx/src/System.IO.FileSystem/ref/System.IO.FileSystem.cs b/external/corefx/src/System.IO.FileSystem/ref/System.IO.FileSystem.cs index e4ba63826d..8f0ee01b28 100644 --- a/external/corefx/src/System.IO.FileSystem/ref/System.IO.FileSystem.cs +++ b/external/corefx/src/System.IO.FileSystem/ref/System.IO.FileSystem.cs @@ -20,12 +20,15 @@ namespace System.IO public static System.Collections.Generic.IEnumerable EnumerateDirectories(string path) { throw null; } public static System.Collections.Generic.IEnumerable EnumerateDirectories(string path, string searchPattern) { throw null; } public static System.Collections.Generic.IEnumerable EnumerateDirectories(string path, string searchPattern, System.IO.SearchOption searchOption) { throw null; } + public static System.Collections.Generic.IEnumerable EnumerateDirectories(string path, string searchPattern, System.IO.EnumerationOptions enumerationOptions) { throw null; } public static System.Collections.Generic.IEnumerable EnumerateFiles(string path) { throw null; } public static System.Collections.Generic.IEnumerable EnumerateFiles(string path, string searchPattern) { throw null; } public static System.Collections.Generic.IEnumerable EnumerateFiles(string path, string searchPattern, System.IO.SearchOption searchOption) { throw null; } + public static System.Collections.Generic.IEnumerable EnumerateFiles(string path, string searchPattern, System.IO.EnumerationOptions enumerationOptions) { throw null; } public static System.Collections.Generic.IEnumerable EnumerateFileSystemEntries(string path) { throw null; } public static System.Collections.Generic.IEnumerable EnumerateFileSystemEntries(string path, string searchPattern) { throw null; } public static System.Collections.Generic.IEnumerable EnumerateFileSystemEntries(string path, string searchPattern, System.IO.SearchOption searchOption) { throw null; } + public static System.Collections.Generic.IEnumerable EnumerateFileSystemEntries(string path, string searchPattern, System.IO.EnumerationOptions enumerationOptions) { throw null; } public static bool Exists(string path) { throw null; } public static System.DateTime GetCreationTime(string path) { throw null; } public static System.DateTime GetCreationTimeUtc(string path) { throw null; } @@ -33,13 +36,16 @@ namespace System.IO public static string[] GetDirectories(string path) { throw null; } public static string[] GetDirectories(string path, string searchPattern) { throw null; } public static string[] GetDirectories(string path, string searchPattern, System.IO.SearchOption searchOption) { throw null; } + public static string[] GetDirectories(string path, string searchPattern, System.IO.EnumerationOptions enumerationOptions) { throw null; } public static string GetDirectoryRoot(string path) { throw null; } public static string[] GetFiles(string path) { throw null; } public static string[] GetFiles(string path, string searchPattern) { throw null; } public static string[] GetFiles(string path, string searchPattern, System.IO.SearchOption searchOption) { throw null; } + public static string[] GetFiles(string path, string searchPattern, System.IO.EnumerationOptions enumerationOptions) { throw null; } public static string[] GetFileSystemEntries(string path) { throw null; } public static string[] GetFileSystemEntries(string path, string searchPattern) { throw null; } public static string[] GetFileSystemEntries(string path, string searchPattern, System.IO.SearchOption searchOption) { throw null; } + public static string[] GetFileSystemEntries(string path, string searchPattern, System.IO.EnumerationOptions enumerationOptions) { throw null; } public static System.DateTime GetLastAccessTime(string path) { throw null; } public static System.DateTime GetLastAccessTimeUtc(string path) { throw null; } public static System.DateTime GetLastWriteTime(string path) { throw null; } @@ -67,23 +73,29 @@ namespace System.IO public override void Delete() { } public void Delete(bool recursive) { } public System.Collections.Generic.IEnumerable EnumerateDirectories() { throw null; } + public System.Collections.Generic.IEnumerable EnumerateDirectories(string searchPattern, System.IO.EnumerationOptions enumerationOptions) { throw null; } + public System.Collections.Generic.IEnumerable EnumerateFileSystemInfos(string searchPattern, System.IO.EnumerationOptions enumerationOptions) { throw null; } public System.Collections.Generic.IEnumerable EnumerateDirectories(string searchPattern) { throw null; } - public System.Collections.Generic.IEnumerable EnumerateDirectories(string searchPattern, System.IO.SearchOption searchOption) { throw null; } public System.Collections.Generic.IEnumerable EnumerateFiles() { throw null; } public System.Collections.Generic.IEnumerable EnumerateFiles(string searchPattern) { throw null; } public System.Collections.Generic.IEnumerable EnumerateFiles(string searchPattern, System.IO.SearchOption searchOption) { throw null; } + public System.Collections.Generic.IEnumerable EnumerateFiles(string searchPattern, System.IO.EnumerationOptions enumerationOptions) { throw null; } public System.Collections.Generic.IEnumerable EnumerateFileSystemInfos() { throw null; } public System.Collections.Generic.IEnumerable EnumerateFileSystemInfos(string searchPattern) { throw null; } public System.Collections.Generic.IEnumerable EnumerateFileSystemInfos(string searchPattern, System.IO.SearchOption searchOption) { throw null; } + public System.Collections.Generic.IEnumerable EnumerateDirectories(string searchPattern, System.IO.SearchOption searchOption) { throw null; } public System.IO.DirectoryInfo[] GetDirectories() { throw null; } public System.IO.DirectoryInfo[] GetDirectories(string searchPattern) { throw null; } public System.IO.DirectoryInfo[] GetDirectories(string searchPattern, System.IO.SearchOption searchOption) { throw null; } + public System.IO.DirectoryInfo[] GetDirectories(string searchPattern, System.IO.EnumerationOptions enumerationOptions) { throw null; } public System.IO.FileInfo[] GetFiles() { throw null; } public System.IO.FileInfo[] GetFiles(string searchPattern) { throw null; } public System.IO.FileInfo[] GetFiles(string searchPattern, System.IO.SearchOption searchOption) { throw null; } + public System.IO.FileInfo[] GetFiles(string searchPattern, System.IO.EnumerationOptions enumerationOptions) { throw null; } public System.IO.FileSystemInfo[] GetFileSystemInfos() { throw null; } public System.IO.FileSystemInfo[] GetFileSystemInfos(string searchPattern) { throw null; } public System.IO.FileSystemInfo[] GetFileSystemInfos(string searchPattern, System.IO.SearchOption searchOption) { throw null; } + public System.IO.FileSystemInfo[] GetFileSystemInfos(string searchPattern, System.IO.EnumerationOptions enumerationOptions) { throw null; } public void MoveTo(string destDirName) { } public override string ToString() { throw null; } } @@ -211,4 +223,83 @@ namespace System.IO AllDirectories = 1, TopDirectoryOnly = 0, } + public enum MatchType + { + Simple, + Win32 + } + public enum MatchCasing + { + PlatformDefault, + CaseSensitive, + CaseInsensitive + } + public class EnumerationOptions + { + public EnumerationOptions() { } + public bool RecurseSubdirectories { get { throw null; } set { } } + public bool IgnoreInaccessible { get { throw null; } set { } } + public int BufferSize { get { throw null; } set { } } + public FileAttributes AttributesToSkip { get { throw null; } set { } } + public MatchType MatchType { get { throw null; } set { } } + public MatchCasing MatchCasing { get { throw null; } set { } } + public bool ReturnSpecialDirectories { get { throw null; } set { } } + } +} +namespace System.IO.Enumeration +{ + public ref struct FileSystemEntry + { + public ReadOnlySpan Directory { get { throw null; } } + public ReadOnlySpan RootDirectory { get { throw null; } } + public ReadOnlySpan OriginalRootDirectory { get { throw null; } } + public ReadOnlySpan FileName { get { throw null; } } + public FileAttributes Attributes { get { throw null; } } + public long Length { get { throw null; } } + public DateTimeOffset CreationTimeUtc { get { throw null; } } + public DateTimeOffset LastAccessTimeUtc { get { throw null; } } + public DateTimeOffset LastWriteTimeUtc { get { throw null; } } + public bool IsDirectory { get { throw null; } } + public bool IsHidden { get { throw null; } } + public FileSystemInfo ToFileSystemInfo() { throw null; } + public string ToSpecifiedFullPath() { throw null; } + public string ToFullPath() { throw null; } + } + public abstract class FileSystemEnumerator : Runtime.ConstrainedExecution.CriticalFinalizerObject, Collections.Generic.IEnumerator + { + public FileSystemEnumerator(string directory, EnumerationOptions options = null) { } + + protected virtual bool ShouldIncludeEntry(ref FileSystemEntry entry) { throw null; } + protected virtual bool ShouldRecurseIntoEntry(ref FileSystemEntry entry) { throw null; } + protected abstract TResult TransformEntry(ref FileSystemEntry entry); + protected virtual void OnDirectoryFinished(ReadOnlySpan directory) { throw null; } + protected virtual bool ContinueOnError(int error) { throw null; } + + public TResult Current { get { throw null; } } + object System.Collections.IEnumerator.Current { get { throw null; } } + public bool MoveNext() { throw null; } + public void Reset() { throw null; } + public void Dispose() { throw null; } + protected virtual void Dispose(bool disposing) { throw null; } + } + public class FileSystemEnumerable : Collections.Generic.IEnumerable + { + public FileSystemEnumerable(string directory, FindTransform transform, EnumerationOptions options = null) { } + + public FindPredicate ShouldRecursePredicate { get { throw null; } set { } } + public FindPredicate ShouldIncludePredicate { get { throw null; } set { } } + + public Collections.Generic.IEnumerator GetEnumerator() { throw null; } + Collections.IEnumerator Collections.IEnumerable.GetEnumerator() { throw null; } + + + public delegate bool FindPredicate(ref FileSystemEntry entry); + public delegate TResult FindTransform(ref FileSystemEntry entry); + } + public static class FileSystemName + { + public static string TranslateWin32Expression(string expression) { throw null; } + public static bool MatchesWin32Expression(ReadOnlySpan expression, ReadOnlySpan name, bool ignoreCase = true) { throw null; } + public static bool MatchesSimpleExpression(ReadOnlySpan expression, ReadOnlySpan name, bool ignoreCase = true) { throw null; } + } } diff --git a/external/corefx/src/System.IO.FileSystem/src/MatchingRefApiCompatBaseline.txt b/external/corefx/src/System.IO.FileSystem/src/MatchingRefApiCompatBaseline.txt new file mode 100644 index 0000000000..57008615ab --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/src/MatchingRefApiCompatBaseline.txt @@ -0,0 +1,8 @@ +Compat issues with assembly System.IO.FileSystem: +# These are now virtual in the implementation, which should be ok. +CannotMakeMemberAbstract : Member 'System.IO.FileSystemInfo.Exists' is abstract in the implementation but is not abstract in the contract. +CannotMakeMemberAbstract : Member 'System.IO.FileSystemInfo.Name' is abstract in the implementation but is not abstract in the contract. +CannotMakeMemberAbstract : Member 'System.IO.FileSystemInfo.Exists.get()' is abstract in the implementation but is not abstract in the contract. +CannotMakeMemberAbstract : Member 'System.IO.FileSystemInfo.Name.get()' is abstract in the implementation but is not abstract in the contract. +# C# generates backing fields for fixed buffers as public. +TypesMustExist : Type 'System.IO.Enumeration.FileSystemEntry.<_fileNameBuffer>e__FixedBuffer' does not exist in the implementation but it does exist in the contract. \ No newline at end of file diff --git a/external/corefx/src/System.IO.FileSystem/src/Microsoft/Win32/SafeHandles/SafeFindHandle.Windows.cs b/external/corefx/src/System.IO.FileSystem/src/Microsoft/Win32/SafeHandles/SafeFindHandle.Windows.cs index c9c118c1b5..dc02183f43 100644 --- a/external/corefx/src/System.IO.FileSystem/src/Microsoft/Win32/SafeHandles/SafeFindHandle.Windows.cs +++ b/external/corefx/src/System.IO.FileSystem/src/Microsoft/Win32/SafeHandles/SafeFindHandle.Windows.cs @@ -3,10 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using System.Security; using System.Runtime.InteropServices; -using System.Runtime.CompilerServices; -using Microsoft.Win32; namespace Microsoft.Win32.SafeHandles { diff --git a/external/corefx/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj b/external/corefx/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj index 3bf4354198..df9ff7154e 100644 --- a/external/corefx/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj +++ b/external/corefx/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj @@ -7,6 +7,7 @@ true true true + true $(NoWarn);414 @@ -18,63 +19,43 @@ - - + + + + + + + + - - - - Common\System\Collections\Generic\ArrayBuilder.cs - - - Common\System\Collections\Generic\EnumerableHelpers.cs - - - Common\System\Collections\Generic\LargeArrayBuilder.cs - - - Common\System\IO\StringBuilderCache.cs - - - Common\System\Text\ValueStringBuilder.cs - - - Common\System\IO\PathInternal.cs + + Common\CoreLib\System\Text\ValueStringBuilder.cs Common\System\IO\PathInternal.CaseSensitivity.cs - - Common\System\Threading\Tasks\TaskToApm.cs - Common\System\IO\StreamHelpers.CopyValidation.cs + + Common\CoreLib\System\IO\PathInternal.cs + - + - - - - - - - - - - + @@ -95,11 +76,11 @@ Common\System\IO\DriveInfoInternal.Win32.cs - - Common\System\IO\PathInternal.Windows.cs + + Common\CoreLib\System\IO\PathInternal.Windows.cs - - Common\System\IO\Win32Marshal.cs + + Common\CoreLib\System\IO\Win32Marshal.cs Common\Interop\Windows\Interop.BOOL.cs @@ -107,51 +88,9 @@ Common\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs - - Common\Interop\Windows\Interop.SecurityOptions.cs - - - Common\Interop\Windows\Interop.FileTypes.cs - - - Common\Interop\Windows\Interop.GetFileType.cs - - - Common\Interop\Windows\Interop.FlushFileBuffers.cs - - - Common\Interop\Windows\Interop.SetEndOfFile.cs - - - Common\Interop\Windows\Interop.SetFilePointerEx.cs - - - Common\Interop\Windows\Interop.CancelIoEx.cs - - - Common\Interop\Windows\Interop.ReadFile_NativeOverlapped.cs - - - Common\Interop\Windows\Interop.WriteFile_NativeOverlapped.cs - - - Common\Interop\Windows\Interop.ReadFile_IntPtr.cs - - - Common\Interop\Windows\Interop.WriteFile_IntPtr.cs - Common\Interop\Windows\Interop.SetFileInformationByHandle.cs - - Common\Interop\Windows\Interop.GetCurrentDirectory.cs - - - Common\Interop\Windows\Interop.SetCurrentDirectory.cs - - - Common\Interop\Windows\Interop.GetLongPathName.cs - Common\Interop\Windows\Interop.FindNextFile.cs @@ -188,7 +127,6 @@ Common\Interop\Windows\Interop.GET_FILEEX_INFO_LEVELS.cs - Common\Interop\Windows\Interop.SetThreadErrorMode.cs @@ -246,7 +184,7 @@ - + Common\Interop\Windows\Interop.CreateFile.cs @@ -262,6 +200,9 @@ Common\Interop\Windows\Interop.NtQueryDirectoryFile.cs + + Common\Interop\Windows\Interop.NtCreateFile.cs + Common\Interop\Windows\Interop.FILE_INFORMATION_CLASS.cs @@ -274,7 +215,7 @@ - + Common\Interop\Windows\Interop.CreateFile2.cs @@ -290,9 +231,10 @@ - + + + - Common\Interop\Unix\Interop.Libraries.cs @@ -306,30 +248,12 @@ Common\Interop\Unix\Interop.ChMod.cs - - Common\Interop\Unix\Interop.Close.cs - Common\Interop\Unix\Interop.CopyFile.cs - - Common\Interop\Unix\Interop.FTruncate.cs - - - Common\Interop\Unix\Interop.GetCwd.cs - - - Common\Interop\Unix\Interop.Open.cs - - - Common\Interop\Unix\Interop.OpenFlags.cs - Common\Interop\Unix\Interop.MkDir.cs - - Common\Interop\Unix\Interop.PathConf.cs - Common\Interop\Unix\Interop.Permissions.cs @@ -345,36 +269,18 @@ Common\Interop\Unix\Interop.Stat.cs + + Common\Interop\Unix\Interop.Stat.Span.cs + Common\Interop\Unix\Interop.ReadDir.cs - - Common\Interop\Unix\Interop.Access.cs - - - Common\Interop\Unix\Interop.ChDir.cs - - - Common\Interop\Unix\Interop.FLock.cs - - - Common\Interop\Unix\Interop.FnMatch.cs - - - Common\Interop\Unix\Interop.FSync.cs - - - Common\Interop\Unix\Interop.LSeek.cs - Common\Interop\Unix\Interop.Link.cs Common\Interop\Unix\Interop.MountPoints.cs - - Common\Interop\Unix\Interop.PosixFAdvise.cs - Common\Interop\Unix\Interop.Read.cs @@ -384,27 +290,25 @@ Common\Interop\Unix\Interop.RmDir.cs - - Common\Interop\Unix\Interop.Write.cs - Common\Interop\Unix\Interop.UTime.cs - - Common\Microsoft\Win32\SafeHandles\SafeDirectoryHandle.Unix.cs - - - Common\System\IO\PathInternal.Unix.cs + + Common\CoreLib\System\IO\PathInternal.Unix.cs Common\System\IO\DriveInfoInternal.Unix.cs + + Common\System\Text\ValueUtf8Converter.cs + + @@ -419,4 +323,4 @@ - + \ No newline at end of file diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/CharSpanExtensions.Unix.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/CharSpanExtensions.Unix.cs deleted file mode 100644 index a1fae54777..0000000000 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/CharSpanExtensions.Unix.cs +++ /dev/null @@ -1,38 +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; -using System.Runtime.InteropServices; - -namespace System.IO -{ - internal static partial class CharSpanExtensions - { - internal static unsafe bool EqualsOrdinal(ReadOnlySpan first, ReadOnlySpan second, bool ignoreCase = false) - { - if (first.Length != second.Length) - return false; - - if (!ignoreCase) - return first.SequenceEqual(second); - - fixed (char* fp = &MemoryMarshal.GetReference(first)) - fixed (char* sp = &MemoryMarshal.GetReference(second)) - { - char* f = fp; - char* s = sp; - - for (int i = 0; i < first.Length; i++) - { - if (*f != *s && char.ToUpperInvariant(*f) != char.ToUpperInvariant(*s)) - return false; - f++; - s++; - } - } - - return true; - } - } -} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/CharSpanExtensions.Windows.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/CharSpanExtensions.Windows.cs deleted file mode 100644 index 0503635038..0000000000 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/CharSpanExtensions.Windows.cs +++ /dev/null @@ -1,44 +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.Runtime.InteropServices; -using System.Runtime.CompilerServices; - -namespace System.IO -{ - internal static partial class CharSpanExtensions - { - [MethodImpl(MethodImplOptions.AggressiveInlining)] - internal static unsafe int CompareOrdinal(ReadOnlySpan first, ReadOnlySpan second, bool ignoreCase = false) - { - int result = Interop.Kernel32.CompareStringOrdinal( - ref MemoryMarshal.GetReference(first), - first.Length, - ref MemoryMarshal.GetReference(second), - second.Length, - ignoreCase); - - if (result == 0) - throw Win32Marshal.GetExceptionForWin32Error(Marshal.GetLastWin32Error()); - - // CSTR_LESS_THAN 1 // string 1 less than string 2 - // CSTR_EQUAL 2 // string 1 equal to string 2 - // CSTR_GREATER_THAN 3 // string 1 greater than string 2 - - return result - 2; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - internal static bool EqualsOrdinal(ReadOnlySpan first, ReadOnlySpan second, bool ignoreCase = false) - { - if (first.Length != second.Length) - return false; - - if (!ignoreCase) - return first.SequenceEqual(second); - - return CompareOrdinal(first, second, ignoreCase) == 0; - } - } -} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/CharSpanExtensions.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/CharSpanExtensions.cs deleted file mode 100644 index 80c6ba4160..0000000000 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/CharSpanExtensions.cs +++ /dev/null @@ -1,24 +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.IO -{ - internal static partial class CharSpanExtensions - { - public static bool EndsWithOrdinal(this ReadOnlySpan span, ReadOnlySpan value, bool ignoreCase = false) - { - if (value.Length == 0) - return true; - else if (value.Length > span.Length) - return false; - - span = span.Slice(span.Length - value.Length); - - if (ignoreCase == false) - return span.SequenceEqual(value); - - return EqualsOrdinal(span, value, ignoreCase); - } - } -} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/Directory.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/Directory.cs index 5f4b32550e..93e2d57c00 100644 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/Directory.cs +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/Directory.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; -using System.Diagnostics; -using System.Security; +using System.IO.Enumeration; +using System.Linq; namespace System.IO { @@ -40,26 +40,7 @@ namespace System.IO return new DirectoryInfo(fullPath, null); } - // Input to this method should already be fullpath. This method will ensure that we append - // the trailing slash only when appropriate. - internal static string EnsureTrailingDirectorySeparator(string fullPath) - { - string fullPathWithTrailingDirectorySeparator; - - if (!PathHelpers.EndsInDirectorySeparator(fullPath)) - fullPathWithTrailingDirectorySeparator = fullPath + PathHelpers.DirectorySeparatorCharAsString; - else - fullPathWithTrailingDirectorySeparator = fullPath; - - return fullPathWithTrailingDirectorySeparator; - } - - // Tests if the given path refers to an existing DirectoryInfo on disk. - // - // Your application must have Read permission to the directory's - // contents. - // public static bool Exists(string path) { try @@ -74,8 +55,6 @@ namespace System.IO return FileSystem.DirectoryExists(fullPath); } catch (ArgumentException) { } - catch (NotSupportedException) { } // Security can throw this on ":" - catch (SecurityException) { } catch (IOException) { } catch (UnauthorizedAccessException) { } @@ -148,286 +127,94 @@ namespace System.IO return File.GetLastAccessTimeUtc(path); } - // Returns an array of filenames in the DirectoryInfo specified by path - public static string[] GetFiles(string path) - { - if (path == null) - throw new ArgumentNullException(nameof(path)); + public static string[] GetFiles(string path) => GetFiles(path, "*", enumerationOptions: EnumerationOptions.Compatible); - return InternalGetFiles(path, "*", SearchOption.TopDirectoryOnly); - } + public static string[] GetFiles(string path, string searchPattern) => GetFiles(path, searchPattern, enumerationOptions: EnumerationOptions.Compatible); - // Returns an array of Files in the current DirectoryInfo matching the - // given search pattern (i.e. "*.txt"). - public static string[] GetFiles(string path, string searchPattern) - { - if (path == null) - throw new ArgumentNullException(nameof(path)); - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); - - return InternalGetFiles(path, searchPattern, SearchOption.TopDirectoryOnly); - } - - // Returns an array of Files in the current DirectoryInfo matching the - // given search pattern (i.e. "*.txt") and search option public static string[] GetFiles(string path, string searchPattern, SearchOption searchOption) - { - if (path == null) - throw new ArgumentNullException(nameof(path)); - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); - if ((searchOption != SearchOption.TopDirectoryOnly) && (searchOption != SearchOption.AllDirectories)) - throw new ArgumentOutOfRangeException(nameof(searchOption), SR.ArgumentOutOfRange_Enum); + => GetFiles(path, searchPattern, EnumerationOptions.FromSearchOption(searchOption)); - return InternalGetFiles(path, searchPattern, searchOption); - } + public static string[] GetFiles(string path, string searchPattern, EnumerationOptions enumerationOptions) + => InternalEnumeratePaths(path, searchPattern, SearchTarget.Files, enumerationOptions).ToArray(); - // Returns an array of Files in the current DirectoryInfo matching the - // given search pattern (i.e. "*.txt") and search option - private static string[] InternalGetFiles(string path, string searchPattern, SearchOption searchOption) - { - Debug.Assert(path != null); - Debug.Assert(searchPattern != null); - Debug.Assert(searchOption == SearchOption.AllDirectories || searchOption == SearchOption.TopDirectoryOnly); + public static string[] GetDirectories(string path) => GetDirectories(path, "*", enumerationOptions: EnumerationOptions.Compatible); - return InternalGetFileDirectoryNames(path, path, searchPattern, true, false, searchOption); - } + public static string[] GetDirectories(string path, string searchPattern) => GetDirectories(path, searchPattern, enumerationOptions: EnumerationOptions.Compatible); - // Returns an array of Directories in the current directory. - public static string[] GetDirectories(string path) - { - if (path == null) - throw new ArgumentNullException(nameof(path)); - - return InternalGetDirectories(path, "*", SearchOption.TopDirectoryOnly); - } - - // Returns an array of Directories in the current DirectoryInfo matching the - // given search criteria (i.e. "*.txt"). - public static string[] GetDirectories(string path, string searchPattern) - { - if (path == null) - throw new ArgumentNullException(nameof(path)); - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); - - return InternalGetDirectories(path, searchPattern, SearchOption.TopDirectoryOnly); - } - - // Returns an array of Directories in the current DirectoryInfo matching the - // given search criteria (i.e. "*.txt"). public static string[] GetDirectories(string path, string searchPattern, SearchOption searchOption) - { - if (path == null) - throw new ArgumentNullException(nameof(path)); - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); - if ((searchOption != SearchOption.TopDirectoryOnly) && (searchOption != SearchOption.AllDirectories)) - throw new ArgumentOutOfRangeException(nameof(searchOption), SR.ArgumentOutOfRange_Enum); + => GetDirectories(path, searchPattern, EnumerationOptions.FromSearchOption(searchOption)); - return InternalGetDirectories(path, searchPattern, searchOption); - } + public static string[] GetDirectories(string path, string searchPattern, EnumerationOptions enumerationOptions) + => InternalEnumeratePaths(path, searchPattern, SearchTarget.Directories, enumerationOptions).ToArray(); - // Returns an array of Directories in the current DirectoryInfo matching the - // given search criteria (i.e. "*.txt"). - private static string[] InternalGetDirectories(string path, string searchPattern, SearchOption searchOption) - { - Debug.Assert(path != null); - Debug.Assert(searchPattern != null); - Debug.Assert(searchOption == SearchOption.AllDirectories || searchOption == SearchOption.TopDirectoryOnly); + public static string[] GetFileSystemEntries(string path) => GetFileSystemEntries(path, "*", enumerationOptions: EnumerationOptions.Compatible); - return InternalGetFileDirectoryNames(path, path, searchPattern, false, true, searchOption); - } + public static string[] GetFileSystemEntries(string path, string searchPattern) => GetFileSystemEntries(path, searchPattern, enumerationOptions: EnumerationOptions.Compatible); - // Returns an array of strongly typed FileSystemInfo entries in the path - public static string[] GetFileSystemEntries(string path) - { - if (path == null) - throw new ArgumentNullException(nameof(path)); - - return InternalGetFileSystemEntries(path, "*", SearchOption.TopDirectoryOnly); - } - - // Returns an array of strongly typed FileSystemInfo entries in the path with the - // given search criteria (i.e. "*.txt"). We disallow .. as a part of the search criteria - public static string[] GetFileSystemEntries(string path, string searchPattern) - { - if (path == null) - throw new ArgumentNullException(nameof(path)); - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); - - return InternalGetFileSystemEntries(path, searchPattern, SearchOption.TopDirectoryOnly); - } - - // Returns an array of strongly typed FileSystemInfo entries in the path with the - // given search criteria (i.e. "*.txt"). We disallow .. as a part of the search criteria public static string[] GetFileSystemEntries(string path, string searchPattern, SearchOption searchOption) - { - if (path == null) - throw new ArgumentNullException(nameof(path)); - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); - if ((searchOption != SearchOption.TopDirectoryOnly) && (searchOption != SearchOption.AllDirectories)) - throw new ArgumentOutOfRangeException(nameof(searchOption), SR.ArgumentOutOfRange_Enum); + => GetFileSystemEntries(path, searchPattern, EnumerationOptions.FromSearchOption(searchOption)); - return InternalGetFileSystemEntries(path, searchPattern, searchOption); - } + public static string[] GetFileSystemEntries(string path, string searchPattern, EnumerationOptions enumerationOptions) + => InternalEnumeratePaths(path, searchPattern, SearchTarget.Both, enumerationOptions).ToArray(); - private static string[] InternalGetFileSystemEntries(string path, string searchPattern, SearchOption searchOption) - { - Debug.Assert(path != null); - Debug.Assert(searchPattern != null); - Debug.Assert(searchOption == SearchOption.AllDirectories || searchOption == SearchOption.TopDirectoryOnly); - - return InternalGetFileDirectoryNames(path, path, searchPattern, true, true, searchOption); - } - - // Returns fully qualified user path of dirs/files that matches the search parameters. - // For recursive search this method will search through all the sub dirs and execute - // the given search criteria against every dir. - // For all the dirs/files returned, it will then demand path discovery permission for - // their parent folders (it will avoid duplicate permission checks) - internal static string[] InternalGetFileDirectoryNames(string path, string userPathOriginal, string searchPattern, bool includeFiles, bool includeDirs, SearchOption searchOption) - { - Debug.Assert(path != null); - Debug.Assert(userPathOriginal != null); - Debug.Assert(searchPattern != null); - Debug.Assert(searchOption == SearchOption.AllDirectories || searchOption == SearchOption.TopDirectoryOnly); - - IEnumerable enumerable = FileSystem.EnumeratePaths(path, searchPattern, searchOption, - (includeFiles ? SearchTarget.Files : 0) | (includeDirs ? SearchTarget.Directories : 0)); - return EnumerableHelpers.ToArray(enumerable); - } - - public static IEnumerable EnumerateDirectories(string path) - { - if (path == null) - throw new ArgumentNullException(nameof(path)); - - return InternalEnumerateDirectories(path, "*", SearchOption.TopDirectoryOnly); - } - - public static IEnumerable EnumerateDirectories(string path, string searchPattern) + internal static IEnumerable InternalEnumeratePaths( + string path, + string searchPattern, + SearchTarget searchTarget, + EnumerationOptions options) { if (path == null) throw new ArgumentNullException(nameof(path)); if (searchPattern == null) throw new ArgumentNullException(nameof(searchPattern)); - return InternalEnumerateDirectories(path, searchPattern, SearchOption.TopDirectoryOnly); + FileSystemEnumerableFactory.NormalizeInputs(ref path, ref searchPattern, options); + + switch (searchTarget) + { + case SearchTarget.Files: + return FileSystemEnumerableFactory.UserFiles(path, searchPattern, options); + case SearchTarget.Directories: + return FileSystemEnumerableFactory.UserDirectories(path, searchPattern, options); + case SearchTarget.Both: + return FileSystemEnumerableFactory.UserEntries(path, searchPattern, options); + default: + throw new ArgumentOutOfRangeException(nameof(searchTarget)); + } } + public static IEnumerable EnumerateDirectories(string path) => EnumerateDirectories(path, "*", enumerationOptions: EnumerationOptions.Compatible); + + public static IEnumerable EnumerateDirectories(string path, string searchPattern) => EnumerateDirectories(path, searchPattern, enumerationOptions: EnumerationOptions.Compatible); + public static IEnumerable EnumerateDirectories(string path, string searchPattern, SearchOption searchOption) - { - if (path == null) - throw new ArgumentNullException(nameof(path)); - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); - if ((searchOption != SearchOption.TopDirectoryOnly) && (searchOption != SearchOption.AllDirectories)) - throw new ArgumentOutOfRangeException(nameof(searchOption), SR.ArgumentOutOfRange_Enum); + => EnumerateDirectories(path, searchPattern, EnumerationOptions.FromSearchOption(searchOption)); - return InternalEnumerateDirectories(path, searchPattern, searchOption); - } + public static IEnumerable EnumerateDirectories(string path, string searchPattern, EnumerationOptions enumerationOptions) + => InternalEnumeratePaths(path, searchPattern, SearchTarget.Directories, enumerationOptions); - private static IEnumerable InternalEnumerateDirectories(string path, string searchPattern, SearchOption searchOption) - { - Debug.Assert(path != null); - Debug.Assert(searchPattern != null); - Debug.Assert(searchOption == SearchOption.AllDirectories || searchOption == SearchOption.TopDirectoryOnly); - - return EnumerateFileSystemNames(path, searchPattern, searchOption, false, true); - } - - public static IEnumerable EnumerateFiles(string path) - { - if (path == null) - throw new ArgumentNullException(nameof(path)); - - return InternalEnumerateFiles(path, "*", SearchOption.TopDirectoryOnly); - } + public static IEnumerable EnumerateFiles(string path) => EnumerateFiles(path, "*", enumerationOptions: EnumerationOptions.Compatible); public static IEnumerable EnumerateFiles(string path, string searchPattern) - { - if (path == null) - throw new ArgumentNullException(nameof(path)); - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); - - return InternalEnumerateFiles(path, searchPattern, SearchOption.TopDirectoryOnly); - } + => EnumerateFiles(path, searchPattern, enumerationOptions: EnumerationOptions.Compatible); public static IEnumerable EnumerateFiles(string path, string searchPattern, SearchOption searchOption) - { - if (path == null) - throw new ArgumentNullException(nameof(path)); - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); - if ((searchOption != SearchOption.TopDirectoryOnly) && (searchOption != SearchOption.AllDirectories)) - throw new ArgumentOutOfRangeException(nameof(searchOption), SR.ArgumentOutOfRange_Enum); + => EnumerateFiles(path, searchPattern, EnumerationOptions.FromSearchOption(searchOption)); - return InternalEnumerateFiles(path, searchPattern, searchOption); - } - - private static IEnumerable InternalEnumerateFiles(string path, string searchPattern, SearchOption searchOption) - { - Debug.Assert(path != null); - Debug.Assert(searchPattern != null); - Debug.Assert(searchOption == SearchOption.AllDirectories || searchOption == SearchOption.TopDirectoryOnly); - - return EnumerateFileSystemNames(path, searchPattern, searchOption, true, false); - } + public static IEnumerable EnumerateFiles(string path, string searchPattern, EnumerationOptions enumerationOptions) + => InternalEnumeratePaths(path, searchPattern, SearchTarget.Files, enumerationOptions); public static IEnumerable EnumerateFileSystemEntries(string path) - { - if (path == null) - throw new ArgumentNullException(nameof(path)); - - return InternalEnumerateFileSystemEntries(path, "*", SearchOption.TopDirectoryOnly); - } + => EnumerateFileSystemEntries(path, "*", enumerationOptions: EnumerationOptions.Compatible); public static IEnumerable EnumerateFileSystemEntries(string path, string searchPattern) - { - if (path == null) - throw new ArgumentNullException(nameof(path)); - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); - - return InternalEnumerateFileSystemEntries(path, searchPattern, SearchOption.TopDirectoryOnly); - } + => EnumerateFileSystemEntries(path, searchPattern, enumerationOptions: EnumerationOptions.Compatible); public static IEnumerable EnumerateFileSystemEntries(string path, string searchPattern, SearchOption searchOption) - { - if (path == null) - throw new ArgumentNullException(nameof(path)); - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); - if ((searchOption != SearchOption.TopDirectoryOnly) && (searchOption != SearchOption.AllDirectories)) - throw new ArgumentOutOfRangeException(nameof(searchOption), SR.ArgumentOutOfRange_Enum); + => EnumerateFileSystemEntries(path, searchPattern, EnumerationOptions.FromSearchOption(searchOption)); - return InternalEnumerateFileSystemEntries(path, searchPattern, searchOption); - } - - private static IEnumerable InternalEnumerateFileSystemEntries(string path, string searchPattern, SearchOption searchOption) - { - Debug.Assert(path != null); - Debug.Assert(searchPattern != null); - Debug.Assert(searchOption == SearchOption.AllDirectories || searchOption == SearchOption.TopDirectoryOnly); - - return EnumerateFileSystemNames(path, searchPattern, searchOption, true, true); - } - - private static IEnumerable EnumerateFileSystemNames(string path, string searchPattern, SearchOption searchOption, - bool includeFiles, bool includeDirs) - { - Debug.Assert(path != null); - Debug.Assert(searchPattern != null); - Debug.Assert(searchOption == SearchOption.AllDirectories || searchOption == SearchOption.TopDirectoryOnly); - - return FileSystem.EnumeratePaths(path, searchPattern, searchOption, - (includeFiles ? SearchTarget.Files : 0) | (includeDirs ? SearchTarget.Directories : 0)); - } + public static IEnumerable EnumerateFileSystemEntries(string path, string searchPattern, EnumerationOptions enumerationOptions) + => InternalEnumeratePaths(path, searchPattern, SearchTarget.Both, enumerationOptions); public static string GetDirectoryRoot(string path) { @@ -446,17 +233,7 @@ namespace System.IO return path.Substring(0, PathInternal.GetRootLength(path)); } - /*===============================CurrentDirectory=============================== - **Action: Provides a getter and setter for the current directory. The original - ** current DirectoryInfo is the one from which the process was started. - **Returns: The current DirectoryInfo (from the getter). Void from the setter. - **Arguments: The current DirectoryInfo to which to switch to the setter. - **Exceptions: - ==============================================================================*/ - public static string GetCurrentDirectory() - { - return FileSystem.GetCurrentDirectory(); - } + public static string GetCurrentDirectory() => Environment.CurrentDirectory; public static void SetCurrentDirectory(string path) { @@ -465,9 +242,7 @@ namespace System.IO if (path.Length == 0) throw new ArgumentException(SR.Argument_PathEmpty, nameof(path)); - string fulldestDirName = Path.GetFullPath(path); - - FileSystem.SetCurrentDirectory(fulldestDirName); + Environment.CurrentDirectory = Path.GetFullPath(path); } public static void Move(string sourceDirName, string destDirName) @@ -483,10 +258,10 @@ namespace System.IO throw new ArgumentException(SR.Argument_EmptyFileName, nameof(destDirName)); string fullsourceDirName = Path.GetFullPath(sourceDirName); - string sourcePath = EnsureTrailingDirectorySeparator(fullsourceDirName); + string sourcePath = PathInternal.EnsureTrailingSeparator(fullsourceDirName); string fulldestDirName = Path.GetFullPath(destDirName); - string destPath = EnsureTrailingDirectorySeparator(fulldestDirName); + string destPath = PathInternal.EnsureTrailingSeparator(fulldestDirName); StringComparison pathComparison = PathInternal.StringComparison; diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/DirectoryInfo.Windows.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/DirectoryInfo.Windows.cs deleted file mode 100644 index 1c1ebd0197..0000000000 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/DirectoryInfo.Windows.cs +++ /dev/null @@ -1,18 +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.IO -{ - partial class DirectoryInfo - { - internal unsafe DirectoryInfo(string fullPath, string fileName, ref RawFindData findData) - : this(fullPath, fileName: fileName, isNormalized: true) - { - Debug.Assert(fileName.Equals(Path.GetFileName(fullPath))); - Init(findData._info); - } - } -} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs index 006bbc115b..9f94d2bc19 100644 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs @@ -4,17 +4,17 @@ using System.Collections.Generic; using System.Diagnostics; +using System.IO.Enumeration; +using System.Linq; namespace System.IO { [Serializable] public sealed partial class DirectoryInfo : FileSystemInfo { - private string _name; - public DirectoryInfo(string path) { - Init(originalPath: PathHelpers.ShouldReviseDirectoryPathToCurrent(path) ? "." : path, + Init(originalPath: path, fullPath: Path.GetFullPath(path), isNormalized: true); } @@ -30,328 +30,155 @@ namespace System.IO OriginalPath = originalPath ?? throw new ArgumentNullException("path"); fullPath = fullPath ?? originalPath; - Debug.Assert(!isNormalized || !PathInternal.IsPartiallyQualified(fullPath), "should be fully qualified if normalized"); fullPath = isNormalized ? fullPath : Path.GetFullPath(fullPath); - _name = fileName ?? (PathHelpers.IsRoot(fullPath) ? + _name = fileName ?? (PathInternal.IsRoot(fullPath) ? fullPath : - Path.GetFileName(PathHelpers.TrimEndingDirectorySeparator(fullPath))); + Path.GetFileName(PathInternal.TrimEndingDirectorySeparator(fullPath.AsSpan()))).ToString(); FullPath = fullPath; - DisplayPath = PathHelpers.ShouldReviseDirectoryPathToCurrent(originalPath) ? "." : originalPath; } - public override string Name => _name; - public DirectoryInfo Parent { get { - string s = FullPath; - - // FullPath might end in either "parent\child" or "parent\child", and in either case we want + // FullPath might end in either "parent\child" or "parent\child\", and in either case we want // the parent of child, not the child. Trim off an ending directory separator if there is one, // but don't mangle the root. - if (!PathHelpers.IsRoot(s)) - { - s = PathHelpers.TrimEndingDirectorySeparator(s); - } - - string parentName = Path.GetDirectoryName(s); + string parentName = Path.GetDirectoryName(PathInternal.IsRoot(FullPath) ? FullPath : PathInternal.TrimEndingDirectorySeparator(FullPath)); return parentName != null ? new DirectoryInfo(parentName, null) : null; } } - public DirectoryInfo CreateSubdirectory(string path) { if (path == null) throw new ArgumentNullException(nameof(path)); + if (PathInternal.IsEffectivelyEmpty(path)) + throw new ArgumentException(SR.Argument_PathEmpty, nameof(path)); + if (Path.IsPathRooted(path)) + throw new ArgumentException(SR.Arg_Path2IsRooted, nameof(path)); - return CreateSubdirectoryHelper(path); - } + string fullPath = Path.GetFullPath(Path.Combine(FullPath, path)); - private DirectoryInfo CreateSubdirectoryHelper(string path) - { - Debug.Assert(path != null); - - PathHelpers.ThrowIfEmptyOrRootedPath(path); - - string newDirs = Path.Combine(FullPath, path); - string fullPath = Path.GetFullPath(newDirs); - - if (0 != string.Compare(FullPath, 0, fullPath, 0, FullPath.Length, PathInternal.StringComparison)) + if (fullPath.Length < FullPath.Length + || (fullPath.Length > FullPath.Length && !PathInternal.IsDirectorySeparator(fullPath[FullPath.Length])) + || string.Compare(FullPath, 0, fullPath, 0, FullPath.Length, PathInternal.StringComparison) != 0) { - throw new ArgumentException(SR.Format(SR.Argument_InvalidSubPath, path, DisplayPath), nameof(path)); + throw new ArgumentException(SR.Format(SR.Argument_InvalidSubPath, path, FullPath), nameof(path)); } FileSystem.CreateDirectory(fullPath); - - // Check for read permission to directory we hand back by calling this constructor. return new DirectoryInfo(fullPath); } - public void Create() - { - FileSystem.CreateDirectory(FullPath); - } - - // Tests if the given path refers to an existing DirectoryInfo on disk. - // - // Your application must have Read permission to the directory's - // contents. - // - public override bool Exists - { - get - { - try - { - return ExistsCore; - } - catch - { - return false; - } - } - } - - // Returns an array of Files in the current DirectoryInfo matching the - // given search criteria (i.e. "*.txt"). - public FileInfo[] GetFiles(string searchPattern) - { - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); - - return InternalGetFiles(searchPattern, SearchOption.TopDirectoryOnly); - } - - // Returns an array of Files in the current DirectoryInfo matching the - // given search criteria (i.e. "*.txt"). - public FileInfo[] GetFiles(string searchPattern, SearchOption searchOption) - { - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); - if ((searchOption != SearchOption.TopDirectoryOnly) && (searchOption != SearchOption.AllDirectories)) - throw new ArgumentOutOfRangeException(nameof(searchOption), SR.ArgumentOutOfRange_Enum); - - return InternalGetFiles(searchPattern, searchOption); - } - - // Returns an array of Files in the current DirectoryInfo matching the - // given search criteria (i.e. "*.txt"). - private FileInfo[] InternalGetFiles(string searchPattern, SearchOption searchOption) - { - Debug.Assert(searchPattern != null); - Debug.Assert(searchOption == SearchOption.AllDirectories || searchOption == SearchOption.TopDirectoryOnly); - - IEnumerable enumerable = (IEnumerable)FileSystem.EnumerateFileSystemInfos(FullPath, searchPattern, searchOption, SearchTarget.Files); - return EnumerableHelpers.ToArray(enumerable); - } + public void Create() => FileSystem.CreateDirectory(FullPath); // Returns an array of Files in the DirectoryInfo specified by path - public FileInfo[] GetFiles() - { - return InternalGetFiles("*", SearchOption.TopDirectoryOnly); - } + public FileInfo[] GetFiles() => GetFiles("*", enumerationOptions: EnumerationOptions.Compatible); - // Returns an array of Directories in the current directory. - public DirectoryInfo[] GetDirectories() - { - return InternalGetDirectories("*", SearchOption.TopDirectoryOnly); - } + // Returns an array of Files in the current DirectoryInfo matching the + // given search criteria (i.e. "*.txt"). + public FileInfo[] GetFiles(string searchPattern) => GetFiles(searchPattern, enumerationOptions: EnumerationOptions.Compatible); + + public FileInfo[] GetFiles(string searchPattern, SearchOption searchOption) + => GetFiles(searchPattern, EnumerationOptions.FromSearchOption(searchOption)); + + public FileInfo[] GetFiles(string searchPattern, EnumerationOptions enumerationOptions) + => ((IEnumerable)InternalEnumerateInfos(FullPath, searchPattern, SearchTarget.Files, enumerationOptions)).ToArray(); + + // Returns an array of strongly typed FileSystemInfo entries which will contain a listing + // of all the files and directories. + public FileSystemInfo[] GetFileSystemInfos() => GetFileSystemInfos("*", enumerationOptions: EnumerationOptions.Compatible); // Returns an array of strongly typed FileSystemInfo entries in the path with the // given search criteria (i.e. "*.txt"). public FileSystemInfo[] GetFileSystemInfos(string searchPattern) - { - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); + => GetFileSystemInfos(searchPattern, enumerationOptions: EnumerationOptions.Compatible); - return InternalGetFileSystemInfos(searchPattern, SearchOption.TopDirectoryOnly); - } - - // Returns an array of strongly typed FileSystemInfo entries in the path with the - // given search criteria (i.e. "*.txt"). public FileSystemInfo[] GetFileSystemInfos(string searchPattern, SearchOption searchOption) - { - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); - if ((searchOption != SearchOption.TopDirectoryOnly) && (searchOption != SearchOption.AllDirectories)) - throw new ArgumentOutOfRangeException(nameof(searchOption), SR.ArgumentOutOfRange_Enum); + => GetFileSystemInfos(searchPattern, EnumerationOptions.FromSearchOption(searchOption)); - return InternalGetFileSystemInfos(searchPattern, searchOption); - } + public FileSystemInfo[] GetFileSystemInfos(string searchPattern, EnumerationOptions enumerationOptions) + => InternalEnumerateInfos(FullPath, searchPattern, SearchTarget.Both, enumerationOptions).ToArray(); - // Returns an array of strongly typed FileSystemInfo entries in the path with the - // given search criteria (i.e. "*.txt"). - private FileSystemInfo[] InternalGetFileSystemInfos(string searchPattern, SearchOption searchOption) - { - Debug.Assert(searchPattern != null); - Debug.Assert(searchOption == SearchOption.AllDirectories || searchOption == SearchOption.TopDirectoryOnly); - - IEnumerable enumerable = FileSystem.EnumerateFileSystemInfos(FullPath, searchPattern, searchOption, SearchTarget.Both); - return EnumerableHelpers.ToArray(enumerable); - } - - // Returns an array of strongly typed FileSystemInfo entries which will contain a listing - // of all the files and directories. - public FileSystemInfo[] GetFileSystemInfos() - { - return InternalGetFileSystemInfos("*", SearchOption.TopDirectoryOnly); - } + // Returns an array of Directories in the current directory. + public DirectoryInfo[] GetDirectories() => GetDirectories("*", enumerationOptions: EnumerationOptions.Compatible); // Returns an array of Directories in the current DirectoryInfo matching the - // given search criteria (i.e. "System*" could match the System & System32 - // directories). - public DirectoryInfo[] GetDirectories(string searchPattern) - { - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); + // given search criteria (i.e. "System*" could match the System & System32 directories). + public DirectoryInfo[] GetDirectories(string searchPattern) => GetDirectories(searchPattern, enumerationOptions: EnumerationOptions.Compatible); - return InternalGetDirectories(searchPattern, SearchOption.TopDirectoryOnly); - } - - // Returns an array of Directories in the current DirectoryInfo matching the - // given search criteria (i.e. "System*" could match the System & System32 - // directories). public DirectoryInfo[] GetDirectories(string searchPattern, SearchOption searchOption) - { - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); - if ((searchOption != SearchOption.TopDirectoryOnly) && (searchOption != SearchOption.AllDirectories)) - throw new ArgumentOutOfRangeException(nameof(searchOption), SR.ArgumentOutOfRange_Enum); + => GetDirectories(searchPattern, EnumerationOptions.FromSearchOption(searchOption)); - return InternalGetDirectories(searchPattern, searchOption); - } - - // Returns an array of Directories in the current DirectoryInfo matching the - // given search criteria (i.e. "System*" could match the System & System32 - // directories). - private DirectoryInfo[] InternalGetDirectories(string searchPattern, SearchOption searchOption) - { - Debug.Assert(searchPattern != null); - Debug.Assert(searchOption == SearchOption.AllDirectories || searchOption == SearchOption.TopDirectoryOnly); - - IEnumerable enumerable = (IEnumerable)FileSystem.EnumerateFileSystemInfos(FullPath, searchPattern, searchOption, SearchTarget.Directories); - return EnumerableHelpers.ToArray(enumerable); - } + public DirectoryInfo[] GetDirectories(string searchPattern, EnumerationOptions enumerationOptions) + => ((IEnumerable)InternalEnumerateInfos(FullPath, searchPattern, SearchTarget.Directories, enumerationOptions)).ToArray(); public IEnumerable EnumerateDirectories() - { - return InternalEnumerateDirectories("*", SearchOption.TopDirectoryOnly); - } + => EnumerateDirectories("*", enumerationOptions: EnumerationOptions.Compatible); public IEnumerable EnumerateDirectories(string searchPattern) - { - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); - - return InternalEnumerateDirectories(searchPattern, SearchOption.TopDirectoryOnly); - } + => EnumerateDirectories(searchPattern, enumerationOptions: EnumerationOptions.Compatible); public IEnumerable EnumerateDirectories(string searchPattern, SearchOption searchOption) - { - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); - if ((searchOption != SearchOption.TopDirectoryOnly) && (searchOption != SearchOption.AllDirectories)) - throw new ArgumentOutOfRangeException(nameof(searchOption), SR.ArgumentOutOfRange_Enum); + => EnumerateDirectories(searchPattern, EnumerationOptions.FromSearchOption(searchOption)); - return InternalEnumerateDirectories(searchPattern, searchOption); - } - - private IEnumerable InternalEnumerateDirectories(string searchPattern, SearchOption searchOption) - { - Debug.Assert(searchPattern != null); - Debug.Assert(searchOption == SearchOption.AllDirectories || searchOption == SearchOption.TopDirectoryOnly); - - return (IEnumerable)FileSystem.EnumerateFileSystemInfos(FullPath, searchPattern, searchOption, SearchTarget.Directories); - } + public IEnumerable EnumerateDirectories(string searchPattern, EnumerationOptions enumerationOptions) + => (IEnumerable)InternalEnumerateInfos(FullPath, searchPattern, SearchTarget.Directories, enumerationOptions); public IEnumerable EnumerateFiles() - { - return InternalEnumerateFiles("*", SearchOption.TopDirectoryOnly); - } + => EnumerateFiles("*", enumerationOptions: EnumerationOptions.Compatible); - public IEnumerable EnumerateFiles(string searchPattern) - { - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); - - return InternalEnumerateFiles(searchPattern, SearchOption.TopDirectoryOnly); - } + public IEnumerable EnumerateFiles(string searchPattern) => EnumerateFiles(searchPattern, enumerationOptions: EnumerationOptions.Compatible); public IEnumerable EnumerateFiles(string searchPattern, SearchOption searchOption) - { - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); - if ((searchOption != SearchOption.TopDirectoryOnly) && (searchOption != SearchOption.AllDirectories)) - throw new ArgumentOutOfRangeException(nameof(searchOption), SR.ArgumentOutOfRange_Enum); + => EnumerateFiles(searchPattern, EnumerationOptions.FromSearchOption(searchOption)); - return InternalEnumerateFiles(searchPattern, searchOption); - } + public IEnumerable EnumerateFiles(string searchPattern, EnumerationOptions enumerationOptions) + => (IEnumerable)InternalEnumerateInfos(FullPath, searchPattern, SearchTarget.Files, enumerationOptions); - private IEnumerable InternalEnumerateFiles(string searchPattern, SearchOption searchOption) - { - Debug.Assert(searchPattern != null); - Debug.Assert(searchOption == SearchOption.AllDirectories || searchOption == SearchOption.TopDirectoryOnly); - - return (IEnumerable)FileSystem.EnumerateFileSystemInfos(FullPath, searchPattern, searchOption, SearchTarget.Files); - } - - public IEnumerable EnumerateFileSystemInfos() - { - return InternalEnumerateFileSystemInfos("*", SearchOption.TopDirectoryOnly); - } + public IEnumerable EnumerateFileSystemInfos() => EnumerateFileSystemInfos("*", enumerationOptions: EnumerationOptions.Compatible); public IEnumerable EnumerateFileSystemInfos(string searchPattern) - { - if (searchPattern == null) - throw new ArgumentNullException(nameof(searchPattern)); - - return InternalEnumerateFileSystemInfos(searchPattern, SearchOption.TopDirectoryOnly); - } + => EnumerateFileSystemInfos(searchPattern, enumerationOptions: EnumerationOptions.Compatible); public IEnumerable EnumerateFileSystemInfos(string searchPattern, SearchOption searchOption) + => EnumerateFileSystemInfos(searchPattern, EnumerationOptions.FromSearchOption(searchOption)); + + public IEnumerable EnumerateFileSystemInfos(string searchPattern, EnumerationOptions enumerationOptions) + => InternalEnumerateInfos(FullPath, searchPattern, SearchTarget.Both, enumerationOptions); + + internal static IEnumerable InternalEnumerateInfos( + string path, + string searchPattern, + SearchTarget searchTarget, + EnumerationOptions options) { + Debug.Assert(path != null); if (searchPattern == null) throw new ArgumentNullException(nameof(searchPattern)); - if ((searchOption != SearchOption.TopDirectoryOnly) && (searchOption != SearchOption.AllDirectories)) - throw new ArgumentOutOfRangeException(nameof(searchOption), SR.ArgumentOutOfRange_Enum); - return InternalEnumerateFileSystemInfos(searchPattern, searchOption); - } + FileSystemEnumerableFactory.NormalizeInputs(ref path, ref searchPattern, options); - private IEnumerable InternalEnumerateFileSystemInfos(string searchPattern, SearchOption searchOption) - { - Debug.Assert(searchPattern != null); - Debug.Assert(searchOption == SearchOption.AllDirectories || searchOption == SearchOption.TopDirectoryOnly); - - return FileSystem.EnumerateFileSystemInfos(FullPath, searchPattern, searchOption, SearchTarget.Both); - } - - // Returns the root portion of the given path. The resulting string - // consists of those rightmost characters of the path that constitute the - // root of the path. Possible patterns for the resulting string are: An - // empty string (a relative path on the current drive), "\" (an absolute - // path on the current drive), "X:" (a relative path on a given drive, - // where X is the drive letter), "X:\" (an absolute path on a given drive), - // and "\\server\share" (a UNC path for a given server and share name). - // The resulting string is null if path is null. - // - - public DirectoryInfo Root - { - get + switch (searchTarget) { - string rootPath = Path.GetPathRoot(FullPath); - - return new DirectoryInfo(rootPath); + case SearchTarget.Directories: + return FileSystemEnumerableFactory.DirectoryInfos(path, searchPattern, options); + case SearchTarget.Files: + return FileSystemEnumerableFactory.FileInfos(path, searchPattern, options); + case SearchTarget.Both: + return FileSystemEnumerableFactory.FileSystemInfos(path, searchPattern, options); + default: + throw new ArgumentException(SR.ArgumentOutOfRange_Enum, nameof(searchTarget)); } } + public DirectoryInfo Root => new DirectoryInfo(Path.GetPathRoot(FullPath)); + public void MoveTo(string destDirName) { if (destDirName == null) @@ -360,24 +187,17 @@ namespace System.IO throw new ArgumentException(SR.Argument_EmptyFileName, nameof(destDirName)); string destination = Path.GetFullPath(destDirName); - string destinationWithSeparator = destination; - if (destinationWithSeparator[destinationWithSeparator.Length - 1] != Path.DirectorySeparatorChar) - destinationWithSeparator = destinationWithSeparator + PathHelpers.DirectorySeparatorCharAsString; - string fullSourcePath; - if (FullPath.Length > 0 && FullPath[FullPath.Length - 1] == Path.DirectorySeparatorChar) - fullSourcePath = FullPath; - else - fullSourcePath = FullPath + PathHelpers.DirectorySeparatorCharAsString; + string destinationWithSeparator = PathInternal.EnsureTrailingSeparator(destination); + string sourceWithSeparator = PathInternal.EnsureTrailingSeparator(FullPath); - StringComparison pathComparison = PathInternal.StringComparison; - if (string.Equals(fullSourcePath, destinationWithSeparator, pathComparison)) + if (string.Equals(sourceWithSeparator, destinationWithSeparator, PathInternal.StringComparison)) throw new IOException(SR.IO_SourceDestMustBeDifferent); - string sourceRoot = Path.GetPathRoot(fullSourcePath); + string sourceRoot = Path.GetPathRoot(sourceWithSeparator); string destinationRoot = Path.GetPathRoot(destinationWithSeparator); - if (!string.Equals(sourceRoot, destinationRoot, pathComparison)) + if (!string.Equals(sourceRoot, destinationRoot, PathInternal.StringComparison)) throw new IOException(SR.IO_SourceDestMustHaveSameRoot); // Windows will throw if the source file/directory doesn't exist, we preemptively check @@ -385,7 +205,7 @@ namespace System.IO if (!Exists && !FileSystem.FileExists(FullPath)) throw new DirectoryNotFoundException(SR.Format(SR.IO_PathNotFound_Path, FullPath)); - if (FileSystem.DirectoryExists(destinationWithSeparator)) + if (FileSystem.DirectoryExists(destination)) throw new IOException(SR.Format(SR.IO_AlreadyExists_Name, destinationWithSeparator)); FileSystem.MoveDirectory(FullPath, destination); @@ -399,22 +219,8 @@ namespace System.IO Invalidate(); } - public override void Delete() - { - FileSystem.RemoveDirectory(FullPath, false); - } + public override void Delete() => FileSystem.RemoveDirectory(FullPath, recursive: false); - public void Delete(bool recursive) - { - FileSystem.RemoveDirectory(FullPath, recursive); - } - - /// - /// Returns the original path. Use FullPath or Name properties for the path / directory name. - /// - public override string ToString() - { - return DisplayPath; - } + public void Delete(bool recursive) => FileSystem.RemoveDirectory(FullPath, recursive); } } diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEntry.Unix.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEntry.Unix.cs new file mode 100644 index 0000000000..90179923ca --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEntry.Unix.cs @@ -0,0 +1,150 @@ +// 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.IO.Enumeration +{ + /// + /// Lower level view of FileSystemInfo used for processing and filtering find results. + /// + public unsafe ref partial struct FileSystemEntry + { + private const int FileNameBufferSize = 256; + internal Interop.Sys.DirectoryEntry _directoryEntry; + private FileStatus _status; + private Span _pathBuffer; + private ReadOnlySpan _fullPath; + private ReadOnlySpan _fileName; + private fixed char _fileNameBuffer[FileNameBufferSize]; + private FileAttributes _initialAttributes; + + internal static FileAttributes Initialize( + ref FileSystemEntry entry, + Interop.Sys.DirectoryEntry directoryEntry, + ReadOnlySpan directory, + ReadOnlySpan rootDirectory, + ReadOnlySpan originalRootDirectory, + Span pathBuffer) + { + entry._directoryEntry = directoryEntry; + entry.Directory = directory; + entry.RootDirectory = rootDirectory; + entry.OriginalRootDirectory = originalRootDirectory; + entry._pathBuffer = pathBuffer; + entry._fullPath = ReadOnlySpan.Empty; + entry._fileName = ReadOnlySpan.Empty; + + // IMPORTANT: Attribute logic must match the logic in FileStatus + + bool isDirectory = false; + if (directoryEntry.InodeType == Interop.Sys.NodeType.DT_DIR) + { + // We know it's a directory. + isDirectory = true; + } + else if ((directoryEntry.InodeType == Interop.Sys.NodeType.DT_LNK + || directoryEntry.InodeType == Interop.Sys.NodeType.DT_UNKNOWN) + && (Interop.Sys.Stat(entry.FullPath, out Interop.Sys.FileStatus targetStatus) >= 0 + || Interop.Sys.LStat(entry.FullPath, out targetStatus) >= 0)) + { + // Symlink or unknown: Stat to it to see if we can resolve it to a directory. If Stat fails, + // it could be because the symlink is broken, we don't have permissions, etc., in which + // case fall back to using LStat to evaluate based on the symlink itself. + isDirectory = (targetStatus.Mode & Interop.Sys.FileTypes.S_IFMT) == Interop.Sys.FileTypes.S_IFDIR; + } + + entry._status = default; + FileStatus.Initialize(ref entry._status, isDirectory); + + FileAttributes attributes = default; + if (directoryEntry.InodeType == Interop.Sys.NodeType.DT_LNK) + attributes |= FileAttributes.ReparsePoint; + if (isDirectory) + attributes |= FileAttributes.Directory; + if (directoryEntry.Name[0] == '.') + attributes |= FileAttributes.Hidden; + + if (attributes == default) + attributes = FileAttributes.Normal; + + entry._initialAttributes = attributes; + return attributes; + } + + private ReadOnlySpan FullPath + { + get + { + if (_fullPath.Length == 0) + { + Debug.Assert(Directory.Length + FileName.Length < _pathBuffer.Length, + $"directory ({Directory.Length} chars) & name ({Directory.Length} chars) too long for buffer ({_pathBuffer.Length} chars)"); + Path.TryJoin(Directory, FileName, _pathBuffer, out int charsWritten); + Debug.Assert(charsWritten > 0, "didn't write any chars to buffer"); + _fullPath = _pathBuffer.Slice(0, charsWritten); + } + return _fullPath; + } + } + + public ReadOnlySpan FileName + { + get + { + if (_directoryEntry.NameLength != 0 && _fileName.Length == 0) + { + fixed (char* c = _fileNameBuffer) + { + Span buffer = new Span(c, FileNameBufferSize); + _fileName = _directoryEntry.GetName(buffer); + } + } + + return _fileName; + } + } + + /// + /// The full path of the directory this entry resides in. + /// + public ReadOnlySpan Directory { get; private set; } + + /// + /// The full path of the root directory used for the enumeration. + /// + public ReadOnlySpan RootDirectory { get; private set; } + + /// + /// The root directory for the enumeration as specified in the constructor. + /// + public ReadOnlySpan OriginalRootDirectory { get; private set; } + + // Windows never fails getting attributes, length, or time as that information comes back + // with the native enumeration struct. As such we must not throw here. + + public FileAttributes Attributes + // It would be hard to rationalize if the attributes change after our initial find. + => _initialAttributes | (_status.IsReadOnly(FullPath, continueOnError: true) ? FileAttributes.ReadOnly : 0); + + public long Length => _status.GetLength(FullPath, continueOnError: true); + public DateTimeOffset CreationTimeUtc => _status.GetCreationTime(FullPath, continueOnError: true); + public DateTimeOffset LastAccessTimeUtc => _status.GetLastAccessTime(FullPath, continueOnError: true); + public DateTimeOffset LastWriteTimeUtc => _status.GetLastWriteTime(FullPath, continueOnError: true); + public bool IsDirectory => _status.InitiallyDirectory; + public bool IsHidden => _directoryEntry.Name[0] == '.'; + + public FileSystemInfo ToFileSystemInfo() + { + string fullPath = ToFullPath(); + return FileSystemInfo.Create(fullPath, new string(FileName), ref _status); + } + + /// + /// Returns the full path of the find result. + /// + public string ToFullPath() => + new string(FullPath); + } +} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEntry.Windows.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEntry.Windows.cs new file mode 100644 index 0000000000..92754c684a --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEntry.Windows.cs @@ -0,0 +1,84 @@ +// 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.IO.Enumeration +{ + /// + /// Lower level view of FileSystemInfo used for processing and filtering find results. + /// + public unsafe ref partial struct FileSystemEntry + { + internal static void Initialize( + ref FileSystemEntry entry, + Interop.NtDll.FILE_FULL_DIR_INFORMATION* info, + ReadOnlySpan directory, + ReadOnlySpan rootDirectory, + ReadOnlySpan originalRootDirectory) + { + entry._info = info; + entry.Directory = directory; + entry.RootDirectory = rootDirectory; + entry.OriginalRootDirectory = originalRootDirectory; + } + + internal unsafe Interop.NtDll.FILE_FULL_DIR_INFORMATION* _info; + + /// + /// The full path of the directory this entry resides in. + /// + public ReadOnlySpan Directory { get; private set; } + + /// + /// The full path of the root directory used for the enumeration. + /// + public ReadOnlySpan RootDirectory { get; private set; } + + /// + /// The root directory for the enumeration as specified in the constructor. + /// + public ReadOnlySpan OriginalRootDirectory { get; private set; } + + /// + /// The file name for this entry. + /// + public ReadOnlySpan FileName => _info->FileName; + + /// + /// The attributes for this entry. + /// + public FileAttributes Attributes => _info->FileAttributes; + + /// + /// The length of file in bytes. + /// + public long Length => _info->EndOfFile; + + /// + /// The creation time for the entry or the oldest available time stamp if the + /// operating system does not support creation time stamps. + /// + public DateTimeOffset CreationTimeUtc => _info->CreationTime.ToDateTimeOffset(); + public DateTimeOffset LastAccessTimeUtc => _info->LastAccessTime.ToDateTimeOffset(); + public DateTimeOffset LastWriteTimeUtc => _info->LastWriteTime.ToDateTimeOffset(); + + /// + /// Returns true if this entry is a directory. + /// + public bool IsDirectory => (Attributes & FileAttributes.Directory) != 0; + + /// + /// Returns true if the file has the hidden attribute. + /// + public bool IsHidden => (Attributes & FileAttributes.Hidden) != 0; + + public FileSystemInfo ToFileSystemInfo() + => FileSystemInfo.Create(Path.Join(Directory, FileName), ref this); + + /// + /// Returns the full path of the find result. + /// + public string ToFullPath() => + Path.Join(Directory, FileName); + } +} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEntry.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEntry.cs new file mode 100644 index 0000000000..1c1650c632 --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEntry.cs @@ -0,0 +1,43 @@ +// 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.IO.Enumeration +{ + public ref partial struct FileSystemEntry + { + /// + /// Returns the full path for find results, based on the initially provided path. + /// + public string ToSpecifiedFullPath() + { + // We want to provide the enumerated segment of the path appended to the originally specified path. This is + // the behavior of the various Directory APIs that return a list of strings. + // + // RootDirectory has the final separator trimmed, OriginalRootDirectory does not. Our legacy behavior would + // effectively account for this by appending subdirectory names as it recursed. As such we need to trim one + // separator when combining with the relative path (Directory.Slice(RootDirectory.Length)). + // + // Original => Root => Directory => FileName => relativePath => Specified + // C:\foo C:\foo C:\foo bar "" C:\foo\bar + // C:\foo\ C:\foo C:\foo bar "" C:\foo\bar + // C:\foo/ C:\foo C:\foo bar "" C:\foo/bar + // C:\foo\\ C:\foo C:\foo bar "" C:\foo\\bar + // C:\foo C:\foo C:\foo\bar jar "bar" C:\foo\bar\jar + // C:\foo\ C:\foo C:\foo\bar jar "bar" C:\foo\bar\jar + // C:\foo/ C:\foo C:\foo\bar jar "bar" C:\foo/bar\jar + + + // If we're at the top level directory the Directory and RootDirectory will be identical. As there are no + // trailing slashes in play, once we're in a subdirectory, slicing off the root will leave us with an + // initial separator. We need to trim that off if it exists, but it isn't needed if the original root + // didn't have a separator. Join() would handle it if we did trim it, not doing so is an optimization. + + ReadOnlySpan relativePath = Directory.Slice(RootDirectory.Length); + if (PathInternal.EndsInDirectorySeparator(OriginalRootDirectory) && PathInternal.StartsWithDirectorySeparator(relativePath)) + relativePath = relativePath.Slice(1); + + return Path.Join(OriginalRootDirectory, relativePath, FileName); + } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerable.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerable.cs new file mode 100644 index 0000000000..861a8fa616 --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerable.cs @@ -0,0 +1,69 @@ +// 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.Collections; +using System.Collections.Generic; +using System.Threading; + +namespace System.IO.Enumeration +{ + /// + /// Enumerable that allows utilizing custom filter predicates and tranform delegates. + /// + public class FileSystemEnumerable : IEnumerable + { + private DelegateEnumerator _enumerator; + private readonly FindTransform _transform; + private readonly EnumerationOptions _options; + private readonly string _directory; + + public FileSystemEnumerable(string directory, FindTransform transform, EnumerationOptions options = null) + { + _directory = directory ?? throw new ArgumentNullException(nameof(directory)); + _transform = transform ?? throw new ArgumentNullException(nameof(transform)); + _options = options ?? EnumerationOptions.Default; + + // We need to create the enumerator up front to ensure that we throw I/O exceptions for + // the root directory on creation of the enumerable. + _enumerator = new DelegateEnumerator(this); + } + + public FindPredicate ShouldIncludePredicate { get; set; } + public FindPredicate ShouldRecursePredicate { get; set; } + + public IEnumerator GetEnumerator() + { + return Interlocked.Exchange(ref _enumerator, null) ?? new DelegateEnumerator(this); + } + + IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); + + /// + /// Delegate for filtering out find results. + /// + public delegate bool FindPredicate(ref FileSystemEntry entry); + + /// + /// Delegate for transforming raw find data into a result. + /// + public delegate TResult FindTransform(ref FileSystemEntry entry); + + private sealed class DelegateEnumerator : FileSystemEnumerator + { + private readonly FileSystemEnumerable _enumerable; + + public DelegateEnumerator(FileSystemEnumerable enumerable) + : base(enumerable._directory, enumerable._options) + { + _enumerable = enumerable; + } + + protected override TResult TransformEntry(ref FileSystemEntry entry) => _enumerable._transform(ref entry); + protected override bool ShouldRecurseIntoEntry(ref FileSystemEntry entry) + => _enumerable.ShouldRecursePredicate?.Invoke(ref entry) ?? true; + protected override bool ShouldIncludeEntry(ref FileSystemEntry entry) + => _enumerable.ShouldIncludePredicate?.Invoke(ref entry) ?? true; + } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerableFactory.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerableFactory.cs new file mode 100644 index 0000000000..68eb97cea2 --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerableFactory.cs @@ -0,0 +1,173 @@ +// 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 ref the project root for more information. + +using System.Collections.Generic; + +namespace System.IO.Enumeration +{ + internal static class FileSystemEnumerableFactory + { + // These all have special meaning in DOS name matching. '\' is the escaping character (which conveniently + // is the directory separator and cannot be part of any path segment in Windows). The other three are the + // special case wildcards that we'll convert some * and ? into. They're also valid as filenames on Unix, + // which is not true in Windows and as such we'll escape any that occur on the input string. + private readonly static char[] s_unixEscapeChars = { '\\', '"', '<', '>' }; + + internal static void NormalizeInputs(ref string directory, ref string expression, EnumerationOptions options) + { + if (Path.IsPathRooted(expression)) + throw new ArgumentException(SR.Arg_Path2IsRooted, nameof(expression)); + + // We always allowed breaking the passed ref directory and filter to be separated + // any way the user wanted. Looking for "C:\foo\*.cs" could be passed as "C:\" and + // "foo\*.cs" or "C:\foo" and "*.cs", for example. As such we need to combine and + // split the inputs if the expression contains a directory separator. + // + // We also allowed for expression to be "foo\" which would translate to "foo\*". + + ReadOnlySpan directoryName = Path.GetDirectoryName(expression.AsSpan()); + + if (directoryName.Length != 0) + { + // Need to fix up the input paths + directory = Path.Join(directory, directoryName); + expression = expression.Substring(directoryName.Length + 1); + } + + switch (options.MatchType) + { + case MatchType.Win32: + if (string.IsNullOrEmpty(expression) || expression == "." || expression == "*.*") + { + // Historically we always treated "." as "*" + expression = "*"; + } + else + { + if (Path.DirectorySeparatorChar != '\\' && expression.IndexOfAny(s_unixEscapeChars) != -1) + { + // Backslash isn't the default separator, need to escape (e.g. Unix) + expression = expression.Replace("\\", "\\\\"); + + // Also need to escape the other special wild characters ('"', '<', and '>') + expression = expression.Replace("\"", "\\\""); + expression = expression.Replace(">", "\\>"); + expression = expression.Replace("<", "\\<"); + } + + // Need to convert the expression to match Win32 behavior + expression = FileSystemName.TranslateWin32Expression(expression); + } + break; + case MatchType.Simple: + break; + default: + throw new ArgumentOutOfRangeException(nameof(options)); + } + } + + private static bool MatchesPattern(string expression, ReadOnlySpan name, EnumerationOptions options) + { + bool ignoreCase = (options.MatchCasing == MatchCasing.PlatformDefault && !PathInternal.IsCaseSensitive) + || options.MatchCasing == MatchCasing.CaseInsensitive; + + switch (options.MatchType) + { + case MatchType.Simple: + return FileSystemName.MatchesSimpleExpression(expression, name, ignoreCase); + case MatchType.Win32: + return FileSystemName.MatchesWin32Expression(expression, name, ignoreCase); + default: + throw new ArgumentOutOfRangeException(nameof(options)); + } + } + + internal static IEnumerable UserFiles(string directory, + string expression, + EnumerationOptions options) + { + return new FileSystemEnumerable( + directory, + (ref FileSystemEntry entry) => entry.ToSpecifiedFullPath(), + options) + { + ShouldIncludePredicate = (ref FileSystemEntry entry) => + !entry.IsDirectory && MatchesPattern(expression, entry.FileName, options) + }; + } + + internal static IEnumerable UserDirectories(string directory, + string expression, + EnumerationOptions options) + { + return new FileSystemEnumerable( + directory, + (ref FileSystemEntry entry) => entry.ToSpecifiedFullPath(), + options) + { + ShouldIncludePredicate = (ref FileSystemEntry entry) => + entry.IsDirectory && MatchesPattern(expression, entry.FileName, options) + }; + } + + internal static IEnumerable UserEntries(string directory, + string expression, + EnumerationOptions options) + { + return new FileSystemEnumerable( + directory, + (ref FileSystemEntry entry) => entry.ToSpecifiedFullPath(), + options) + { + ShouldIncludePredicate = (ref FileSystemEntry entry) => + MatchesPattern(expression, entry.FileName, options) + }; + } + + internal static IEnumerable FileInfos( + string directory, + string expression, + EnumerationOptions options) + { + return new FileSystemEnumerable( + directory, + (ref FileSystemEntry entry) => (FileInfo)entry.ToFileSystemInfo(), + options) + { + ShouldIncludePredicate = (ref FileSystemEntry entry) => + !entry.IsDirectory && MatchesPattern(expression, entry.FileName, options) + }; + } + + internal static IEnumerable DirectoryInfos( + string directory, + string expression, + EnumerationOptions options) + { + return new FileSystemEnumerable( + directory, + (ref FileSystemEntry entry) => (DirectoryInfo)entry.ToFileSystemInfo(), + options) + { + ShouldIncludePredicate = (ref FileSystemEntry entry) => + entry.IsDirectory && MatchesPattern(expression, entry.FileName, options) + }; + } + + internal static IEnumerable FileSystemInfos( + string directory, + string expression, + EnumerationOptions options) + { + return new FileSystemEnumerable( + directory, + (ref FileSystemEntry entry) => entry.ToFileSystemInfo(), + options) + { + ShouldIncludePredicate = (ref FileSystemEntry entry) => + MatchesPattern(expression, entry.FileName, options) + }; + } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerator.Unix.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerator.Unix.cs new file mode 100644 index 0000000000..26f6d7f6f3 --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerator.Unix.cs @@ -0,0 +1,230 @@ +// 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; +using System.Collections.Generic; +using System.Runtime.ConstrainedExecution; +using System.Threading; + +namespace System.IO.Enumeration +{ + public unsafe abstract partial class FileSystemEnumerator : CriticalFinalizerObject, IEnumerator + { + // The largest supported path on Unix is 4K bytes of UTF-8 (most only support 1K) + private const int StandardBufferSize = 4096; + + private readonly string _originalRootDirectory; + private readonly string _rootDirectory; + private readonly EnumerationOptions _options; + + private readonly object _lock = new object(); + + private string _currentPath; + private IntPtr _directoryHandle; + private bool _lastEntryFound; + private Queue _pending; + + private Interop.Sys.DirectoryEntry _entry; + private TResult _current; + + // Used for creating full paths + private char[] _pathBuffer; + // Used to get the raw entry data + private byte[] _entryBuffer; + + /// + /// Encapsulates a find operation. + /// + /// The directory to search in. + /// Enumeration options to use. + public FileSystemEnumerator(string directory, EnumerationOptions options = null) + { + _originalRootDirectory = directory ?? throw new ArgumentNullException(nameof(directory)); + _rootDirectory = PathInternal.TrimEndingDirectorySeparator(Path.GetFullPath(directory)); + _options = options ?? EnumerationOptions.Default; + + // We need to initialize the directory handle up front to ensure + // we immediately throw IO exceptions for missing directory/etc. + _directoryHandle = CreateDirectoryHandle(_rootDirectory); + if (_directoryHandle == IntPtr.Zero) + _lastEntryFound = true; + + _currentPath = _rootDirectory; + + try + { + _pathBuffer = ArrayPool.Shared.Rent(StandardBufferSize); + int size = Interop.Sys.ReadBufferSize; + _entryBuffer = size > 0 ? ArrayPool.Shared.Rent(size) : null; + } + catch + { + // Close the directory handle right away if we fail to allocate + CloseDirectoryHandle(); + throw; + } + } + + private bool InternalContinueOnError(int error) + => (_options.IgnoreInaccessible && IsAccessError(error)) || ContinueOnError(error); + + private static bool IsAccessError(int error) + => error == (int)Interop.Error.EACCES || error == (int)Interop.Error.EBADF + || error == (int)Interop.Error.EPERM; + + private IntPtr CreateDirectoryHandle(string path) + { + IntPtr handle = Interop.Sys.OpenDir(path); + if (handle == IntPtr.Zero) + { + Interop.ErrorInfo info = Interop.Sys.GetLastErrorInfo(); + if (InternalContinueOnError(info.RawErrno)) + { + return IntPtr.Zero; + } + throw Interop.GetExceptionForIoErrno(info, path, isDirectory: true); + } + return handle; + } + + private void CloseDirectoryHandle() + { + IntPtr handle = Interlocked.Exchange(ref _directoryHandle, IntPtr.Zero); + if (handle != IntPtr.Zero) + Interop.Sys.CloseDir(handle); + } + + public bool MoveNext() + { + if (_lastEntryFound) + return false; + + FileSystemEntry entry = default; + + lock (_lock) + { + if (_lastEntryFound) + return false; + + // If HAVE_READDIR_R is defined for the platform FindNextEntry depends on _entryBuffer being fixed since + // _entry will point to a string in the middle of the array. If the array is not fixed GC can move it after + // the native call and _entry will point to a bogus file name. + fixed (byte* _ = _entryBuffer) + { + do + { + FindNextEntry(); + if (_lastEntryFound) + return false; + + FileAttributes attributes = FileSystemEntry.Initialize( + ref entry, _entry, _currentPath, _rootDirectory, _originalRootDirectory, new Span(_pathBuffer)); + bool isDirectory = (attributes & FileAttributes.Directory) != 0; + + bool isSpecialDirectory = false; + if (isDirectory) + { + // Subdirectory found + if (_entry.Name[0] == '.' && (_entry.Name[1] == 0 || (_entry.Name[1] == '.' && _entry.Name[2] == 0))) + { + // "." or "..", don't process unless the option is set + if (!_options.ReturnSpecialDirectories) + continue; + isSpecialDirectory = true; + } + } + + if (!isSpecialDirectory && _options.AttributesToSkip != 0) + { + if ((_options.AttributesToSkip & FileAttributes.ReadOnly) != 0) + { + // ReadOnly is the only attribute that requires hitting entry.Attributes (which hits the disk) + attributes = entry.Attributes; + } + + if ((_options.AttributesToSkip & attributes) != 0) + { + continue; + } + } + + if (isDirectory && !isSpecialDirectory) + { + if (_options.RecurseSubdirectories && ShouldRecurseIntoEntry(ref entry)) + { + // Recursion is on and the directory was accepted, Queue it + if (_pending == null) + _pending = new Queue(); + _pending.Enqueue(Path.Join(_currentPath, entry.FileName)); + } + } + + if (ShouldIncludeEntry(ref entry)) + { + _current = TransformEntry(ref entry); + return true; + } + } while (true); + } + } + } + + private unsafe void FindNextEntry() + { + Span buffer = _entryBuffer == null ? Span.Empty : new Span(_entryBuffer); + int result = Interop.Sys.ReadDir(_directoryHandle, buffer, ref _entry); + switch (result) + { + case -1: + // End of directory + DirectoryFinished(); + break; + case 0: + // Success + break; + default: + // Error + if (InternalContinueOnError(result)) + { + DirectoryFinished(); + break; + } + else + { + throw Interop.GetExceptionForIoErrno(new Interop.ErrorInfo(result), _currentPath, isDirectory: true); + } + } + } + + private void DequeueNextDirectory() + { + _currentPath = _pending.Dequeue(); + _directoryHandle = CreateDirectoryHandle(_currentPath); + } + + private void InternalDispose(bool disposing) + { + // It is possible to fail to allocate the lock, but the finalizer will still run + if (_lock != null) + { + lock(_lock) + { + _lastEntryFound = true; + _pending = null; + + CloseDirectoryHandle(); + + if (_pathBuffer != null) + ArrayPool.Shared.Return(_pathBuffer); + _pathBuffer = null; + if (_entryBuffer != null) + ArrayPool.Shared.Return(_entryBuffer); + _entryBuffer = null; + } + } + + Dispose(disposing); + } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerator.Win32.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerator.Win32.cs new file mode 100644 index 0000000000..3376e3f5e4 --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerator.Win32.cs @@ -0,0 +1,78 @@ +// 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.IO.Enumeration +{ + public partial class FileSystemEnumerator + { + /// 'true' if new data was found + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private unsafe bool GetData() + { + Debug.Assert(_directoryHandle != (IntPtr)(-1) && _directoryHandle != IntPtr.Zero && !_lastEntryFound); + + int status = Interop.NtDll.NtQueryDirectoryFile( + FileHandle: _directoryHandle, + Event: IntPtr.Zero, + ApcRoutine: IntPtr.Zero, + ApcContext: IntPtr.Zero, + IoStatusBlock: out Interop.NtDll.IO_STATUS_BLOCK statusBlock, + FileInformation: _buffer, + Length: (uint)_buffer.Length, + FileInformationClass: Interop.NtDll.FILE_INFORMATION_CLASS.FileFullDirectoryInformation, + ReturnSingleEntry: Interop.BOOLEAN.FALSE, + FileName: null, + RestartScan: Interop.BOOLEAN.FALSE); + + switch ((uint)status) + { + case Interop.StatusOptions.STATUS_NO_MORE_FILES: + DirectoryFinished(); + return false; + case Interop.StatusOptions.STATUS_SUCCESS: + Debug.Assert(statusBlock.Information.ToInt64() != 0); + return true; + default: + int error = (int)Interop.NtDll.RtlNtStatusToDosError(status); + + // Note that there are many NT status codes that convert to ERROR_ACCESS_DENIED. + if ((error == Interop.Errors.ERROR_ACCESS_DENIED && _options.IgnoreInaccessible) || ContinueOnError(error)) + { + DirectoryFinished(); + return false; + } + throw Win32Marshal.GetExceptionForWin32Error(error, _currentPath); + } + } + + private IntPtr CreateRelativeDirectoryHandle(ReadOnlySpan relativePath, string fullPath) + { + (int status, IntPtr handle) = Interop.NtDll.CreateFile( + relativePath, + _directoryHandle, + Interop.NtDll.CreateDisposition.FILE_OPEN, + Interop.NtDll.DesiredAccess.FILE_LIST_DIRECTORY | Interop.NtDll.DesiredAccess.SYNCHRONIZE, + createOptions: Interop.NtDll.CreateOptions.FILE_SYNCHRONOUS_IO_NONALERT | Interop.NtDll.CreateOptions.FILE_DIRECTORY_FILE + | Interop.NtDll.CreateOptions.FILE_OPEN_FOR_BACKUP_INTENT); + + switch ((uint)status) + { + case Interop.StatusOptions.STATUS_SUCCESS: + return handle; + default: + int error = (int)Interop.NtDll.RtlNtStatusToDosError(status); + + // Note that there are many NT status codes that convert to ERROR_ACCESS_DENIED. + if ((error == Interop.Errors.ERROR_ACCESS_DENIED && _options.IgnoreInaccessible) || ContinueOnError(error)) + { + return IntPtr.Zero; + } + throw Win32Marshal.GetExceptionForWin32Error(error, fullPath); + } + } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/FindEnumerable.WinRT.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerator.WinRT.cs similarity index 53% rename from external/corefx/src/System.IO.FileSystem/src/System/IO/FindEnumerable.WinRT.cs rename to external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerator.WinRT.cs index 61e8b05d4d..b2ad37fac4 100644 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/FindEnumerable.WinRT.cs +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerator.WinRT.cs @@ -5,12 +5,12 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace System.IO +namespace System.IO.Enumeration { - internal partial class FindEnumerable + public partial class FileSystemEnumerator { [MethodImpl(MethodImplOptions.AggressiveInlining)] - public unsafe bool GetData() + private unsafe bool GetData() { if (!Interop.Kernel32.GetFileInformationByHandleEx( _directoryHandle, @@ -24,12 +24,26 @@ namespace System.IO case Interop.Errors.ERROR_NO_MORE_FILES: DirectoryFinished(); return false; - default: - throw Win32Marshal.GetExceptionForWin32Error(error, _currentPath); + case Interop.Errors.ERROR_ACCESS_DENIED: + if (_options.IgnoreInaccessible) + { + return false; + } + break; } + + if (!ContinueOnError(error)) + throw Win32Marshal.GetExceptionForWin32Error(error, _currentPath); } return true; } + + private IntPtr CreateRelativeDirectoryHandle(ReadOnlySpan relativePath, string fullPath) + { + // We don't have access to any APIs that allow us to pass in a base handle in UAP, + // just call our "normal" handle open. + return CreateDirectoryHandle(fullPath); + } } } diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerator.Windows.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerator.Windows.cs new file mode 100644 index 0000000000..a04e230644 --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerator.Windows.cs @@ -0,0 +1,234 @@ +// 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; +using System.Collections.Generic; +using System.Runtime.ConstrainedExecution; +using System.Runtime.InteropServices; +using System.Threading; + +namespace System.IO.Enumeration +{ + public unsafe abstract partial class FileSystemEnumerator : CriticalFinalizerObject, IEnumerator + { + private const int StandardBufferSize = 4096; + + // We need to have enough room for at least a single entry. The filename alone can be 512 bytes, we'll ensure we have + // a reasonable buffer for all of the other metadata as well. + private const int MinimumBufferSize = 1024; + + private readonly string _originalRootDirectory; + private readonly string _rootDirectory; + private readonly EnumerationOptions _options; + + private readonly object _lock = new object(); + + private Interop.NtDll.FILE_FULL_DIR_INFORMATION* _entry; + private TResult _current; + + private byte[] _buffer; + private IntPtr _directoryHandle; + private string _currentPath; + private bool _lastEntryFound; + private Queue<(IntPtr Handle, string Path)> _pending; + private GCHandle _pinnedBuffer; + + /// + /// Encapsulates a find operation. + /// + /// The directory to search in. + /// Enumeration options to use. + public FileSystemEnumerator(string directory, EnumerationOptions options = null) + { + _originalRootDirectory = directory ?? throw new ArgumentNullException(nameof(directory)); + _rootDirectory = PathInternal.TrimEndingDirectorySeparator(Path.GetFullPath(directory)); + _options = options ?? EnumerationOptions.Default; + + // We'll only suppress the media insertion prompt on the topmost directory as that is the + // most likely scenario and we don't want to take the perf hit for large enumerations. + // (We weren't consistent with how we handled this historically.) + using (new DisableMediaInsertionPrompt()) + { + // We need to initialize the directory handle up front to ensure + // we immediately throw IO exceptions for missing directory/etc. + _directoryHandle = CreateDirectoryHandle(_rootDirectory); + if (_directoryHandle == IntPtr.Zero) + _lastEntryFound = true; + } + + _currentPath = _rootDirectory; + + int requestedBufferSize = _options.BufferSize; + int bufferSize = requestedBufferSize <= 0 ? StandardBufferSize + : Math.Max(MinimumBufferSize, requestedBufferSize); + + try + { + _buffer = ArrayPool.Shared.Rent(bufferSize); + _pinnedBuffer = GCHandle.Alloc(_buffer, GCHandleType.Pinned); + } + catch + { + // Close the directory handle right away if we fail to allocate + CloseDirectoryHandle(); + throw; + } + } + + private void CloseDirectoryHandle() + { + // As handles can be reused we want to be extra careful to close handles only once + IntPtr handle = Interlocked.Exchange(ref _directoryHandle, IntPtr.Zero); + if (handle != IntPtr.Zero) + Interop.Kernel32.CloseHandle(handle); + } + + /// + /// Simple wrapper to allow creating a file handle for an existing directory. + /// + private IntPtr CreateDirectoryHandle(string path) + { + IntPtr handle = Interop.Kernel32.CreateFile_IntPtr( + path, + Interop.Kernel32.FileOperations.FILE_LIST_DIRECTORY, + FileShare.ReadWrite | FileShare.Delete, + FileMode.Open, + Interop.Kernel32.FileOperations.FILE_FLAG_BACKUP_SEMANTICS); + + if (handle == IntPtr.Zero || handle == (IntPtr)(-1)) + { + int error = Marshal.GetLastWin32Error(); + + if ((error == Interop.Errors.ERROR_ACCESS_DENIED && + _options.IgnoreInaccessible) || ContinueOnError(error)) + { + return IntPtr.Zero; + } + + if (error == Interop.Errors.ERROR_FILE_NOT_FOUND) + { + // Historically we throw directory not found rather than file not found + error = Interop.Errors.ERROR_PATH_NOT_FOUND; + } + + throw Win32Marshal.GetExceptionForWin32Error(error, path); + } + + return handle; + } + + public bool MoveNext() + { + if (_lastEntryFound) + return false; + + FileSystemEntry entry = default; + + lock (_lock) + { + if (_lastEntryFound) + return false; + + do + { + FindNextEntry(); + if (_lastEntryFound) + return false; + + // Calling the constructor inside the try block would create a second instance on the stack. + FileSystemEntry.Initialize(ref entry, _entry, _currentPath, _rootDirectory, _originalRootDirectory); + + // Skip specified attributes + if ((_entry->FileAttributes & _options.AttributesToSkip) != 0) + continue; + + if ((_entry->FileAttributes & FileAttributes.Directory) != 0) + { + // Subdirectory found + if (!(_entry->FileName.Length > 2 || _entry->FileName[0] != '.' || (_entry->FileName.Length == 2 && _entry->FileName[1] != '.'))) + { + // "." or "..", don't process unless the option is set + if (!_options.ReturnSpecialDirectories) + continue; + } + else if (_options.RecurseSubdirectories && ShouldRecurseIntoEntry(ref entry)) + { + // Recursion is on and the directory was accepted, Queue it + string subDirectory = Path.Join(_currentPath, _entry->FileName); + IntPtr subDirectoryHandle = CreateRelativeDirectoryHandle(_entry->FileName, subDirectory); + if (subDirectoryHandle != IntPtr.Zero) + { + try + { + if (_pending == null) + _pending = new Queue<(IntPtr, string)>(); + _pending.Enqueue((subDirectoryHandle, subDirectory)); + } + catch + { + // Couldn't queue the handle, close it and rethrow + Interop.Kernel32.CloseHandle(subDirectoryHandle); + throw; + } + } + } + } + + if (ShouldIncludeEntry(ref entry)) + { + _current = TransformEntry(ref entry); + return true; + } + } while (true); + } + } + + private unsafe void FindNextEntry() + { + _entry = Interop.NtDll.FILE_FULL_DIR_INFORMATION.GetNextInfo(_entry); + if (_entry != null) + return; + + // We need more data + if (GetData()) + _entry = (Interop.NtDll.FILE_FULL_DIR_INFORMATION*)_pinnedBuffer.AddrOfPinnedObject(); + } + + private void DequeueNextDirectory() + { + (_directoryHandle, _currentPath) = _pending.Dequeue(); + } + + private void InternalDispose(bool disposing) + { + // It is possible to fail to allocate the lock, but the finalizer will still run + if (_lock != null) + { + lock (_lock) + { + _lastEntryFound = true; + + CloseDirectoryHandle(); + + if (_pending != null) + { + while (_pending.Count > 0) + Interop.Kernel32.CloseHandle(_pending.Dequeue().Handle); + _pending = null; + } + + if (_pinnedBuffer.IsAllocated) + _pinnedBuffer.Free(); + + if (_buffer != null) + ArrayPool.Shared.Return(_buffer); + + _buffer = null; + } + } + + Dispose(disposing); + } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerator.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerator.cs new file mode 100644 index 0000000000..716c15d7c8 --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerator.cs @@ -0,0 +1,89 @@ +// 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.Collections; +using System.Collections.Generic; +using System.Runtime.ConstrainedExecution; + +namespace System.IO.Enumeration +{ + public unsafe abstract partial class FileSystemEnumerator : CriticalFinalizerObject, IEnumerator + { + /// + /// Return true if the given file system entry should be included in the results. + /// + protected virtual bool ShouldIncludeEntry(ref FileSystemEntry entry) => true; + + /// + /// Return true if the directory entry given should be recursed into. + /// + protected virtual bool ShouldRecurseIntoEntry(ref FileSystemEntry entry) => true; + + /// + /// Generate the result type from the current entry; + /// + protected abstract TResult TransformEntry(ref FileSystemEntry entry); + + /// + /// Called whenever the end of a directory is reached. + /// + /// The path of the directory that finished. + protected virtual void OnDirectoryFinished(ReadOnlySpan directory) { } + + /// + /// Called when a native API returns an error. Return true to continue, or false + /// to throw the default exception for the given error. + /// + /// The native error code. + protected virtual bool ContinueOnError(int error) => false; + + public TResult Current => _current; + + object IEnumerator.Current => Current; + + private void DirectoryFinished() + { + _entry = default; + + // Close the handle now that we're done + CloseDirectoryHandle(); + OnDirectoryFinished(_currentPath); + + if (_pending == null || _pending.Count == 0) + { + _lastEntryFound = true; + } + else + { + // Grab the next directory to parse + DequeueNextDirectory(); + FindNextEntry(); + } + } + + public void Reset() + { + throw new NotSupportedException(); + } + + public void Dispose() + { + InternalDispose(disposing: true); + GC.SuppressFinalize(this); + } + + /// + /// Override for any additional cleanup. + /// + /// True if called while disposing. False if called from finalizer. + protected virtual void Dispose(bool disposing) + { + } + + ~FileSystemEnumerator() + { + InternalDispose(disposing: false); + } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/DosMatcher.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemName.cs similarity index 63% rename from external/corefx/src/System.IO.FileSystem/src/System/IO/DosMatcher.cs rename to external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemName.cs index b1f677efb6..8bdb6e54ce 100644 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/DosMatcher.cs +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemName.cs @@ -5,9 +5,12 @@ using System; using System.Text; -namespace System.IO +namespace System.IO.Enumeration { - internal static class DosMatcher + /// + /// Provides methods for matching file system names. + /// + public static class FileSystemName { // [MS - FSA] 2.1.4.4 Algorithm for Determining if a FileName Is in an Expression // https://msdn.microsoft.com/en-us/library/ff469270.aspx @@ -16,17 +19,22 @@ namespace System.IO '\"', '<', '>', '*', '?' }; + private static readonly char[] s_simpleWildcardChars = + { + '*', '?' + }; + /// /// Change '*' and '?' to '<', '>' and '"' to match Win32 behavior. For compatibility, Windows /// changes some wildcards to provide a closer match to historical DOS 8.3 filename matching. /// - internal static string TranslateExpression(string expression) + public static string TranslateWin32Expression(string expression) { if (string.IsNullOrEmpty(expression) || expression == "*" || expression == "*.*") return "*"; bool modified = false; - Span stackSpace = stackalloc char[expression.Length]; + Span stackSpace = stackalloc char[32]; ValueStringBuilder sb = new ValueStringBuilder(stackSpace); int length = expression.Length; for (int i = 0; i < length; i++) @@ -36,10 +44,9 @@ namespace System.IO { case '.': modified = true; - if (i > 1 && i == length - 1 && expression[i - 1] == '*') + if (i >= 1 && i == length - 1 && expression[i - 1] == '*') { - sb.Length--; - sb.Append('<'); // DOS_STAR (ends in *.) + sb[sb.Length - 1] = '<'; // DOS_STAR (ends in *.) } else if (i < length - 1 && (expression[i + 1] == '?' || expression[i + 1] == '*')) { @@ -64,7 +71,8 @@ namespace System.IO } /// - /// Return true if the given expression matches the given name. + /// Return true if the given expression matches the given name. Supports the following wildcards: + /// '*', '?', '<', '>', '"'. The backslash character '\' escapes. /// /// The expression to match with, such as "*.foo". /// The name to check against the expression. @@ -74,16 +82,85 @@ namespace System.IO /// of RtlIsNameInExpression, which defines the rules for matching DOS wildcards ('*', '?', '<', '>', '"'). /// /// Like PatternMatcher, matching will not line up with Win32 behavior unless you transform the expression - /// using + /// using /// - internal static bool MatchPattern(string expression, ReadOnlySpan name, bool ignoreCase = true) + public static bool MatchesWin32Expression(ReadOnlySpan expression, ReadOnlySpan name, bool ignoreCase = true) + { + return MatchPattern(expression, name, ignoreCase, useExtendedWildcards: true); + } + + /// + /// Return true if the given expression matches the given name. '*' and '?' are wildcards, '\' escapes. + /// + public static bool MatchesSimpleExpression(ReadOnlySpan expression, ReadOnlySpan name, bool ignoreCase = true) + { + return MatchPattern(expression, name, ignoreCase, useExtendedWildcards: false); + } + + // Matching routine description + // ============================ + // (copied from native impl) + // + // This routine compares a Dbcs name and an expression and tells the caller + // if the name is in the language defined by the expression. The input name + // cannot contain wildcards, while the expression may contain wildcards. + // + // Expression wild cards are evaluated as shown in the nondeterministic + // finite automatons below. Note that ~* and ~? are DOS_STAR and DOS_QM. + // + // ~* is DOS_STAR, ~? is DOS_QM, and ~. is DOS_DOT + // + // S + // <-----< + // X | | e Y + // X * Y == (0)----->-(1)->-----(2)-----(3) + // + // S-. + // <-----< + // X | | e Y + // X ~* Y == (0)----->-(1)->-----(2)-----(3) + // + // X S S Y + // X ?? Y == (0)---(1)---(2)---(3)---(4) + // + // X . . Y + // X ~.~. Y == (0)---(1)----(2)------(3)---(4) + // | |________| + // | ^ | + // |_______________| + // ^EOF or .^ + // + // X S-. S-. Y + // X ~?~? Y == (0)---(1)-----(2)-----(3)---(4) + // | |________| + // | ^ | + // |_______________| + // ^EOF or .^ + // + // where S is any single character + // S-. is any single character except the final . + // e is a null character transition + // EOF is the end of the name string + // + // In words: + // + // * matches 0 or more characters. + // ? matches exactly 1 character. + // DOS_STAR matches 0 or more characters until encountering and matching + // the final . in the name. + // DOS_QM matches any single character, or upon encountering a period or + // end of name string, advances the expression to the end of the + // set of contiguous DOS_QMs. + // DOS_DOT matches either a . or zero characters beyond name string. + + private static bool MatchPattern(ReadOnlySpan expression, ReadOnlySpan name, bool ignoreCase, bool useExtendedWildcards) { // The idea behind the algorithm is pretty simple. We keep track of all possible locations // in the regular expression that are matching the name. When the name has been exhausted, // if one of the locations in the expression is also just exhausted, the name is in the // language defined by the regular expression. - if (string.IsNullOrEmpty(expression) || name.Length == 0) + if (expression.Length == 0 || name.Length == 0) return false; if (expression[0] == '*') @@ -92,16 +169,17 @@ namespace System.IO if (expression.Length == 1) return true; - if (expression.IndexOfAny(s_wildcardChars, startIndex: 1) == -1) + ReadOnlySpan expressionEnd = expression.Slice(1); + if (expressionEnd.IndexOfAny(useExtendedWildcards ? s_wildcardChars : s_simpleWildcardChars) == -1) { // Handle the special case of a single starting *, which essentially means "ends with" // If the name doesn't have enough characters to match the remaining expression, it can't be a match. - if (name.Length < expression.Length - 1) + if (name.Length < expressionEnd.Length) return false; - // See if we end with the expression (minus the *, of course) - return name.EndsWithOrdinal(expression.AsReadOnlySpan().Slice(1), ignoreCase); + // See if we end with the expression + return name.EndsWith(expressionEnd, ignoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal); } } @@ -117,13 +195,34 @@ namespace System.IO char expressionChar; Span temp = stackalloc int[0]; - Span priorMatches = stackalloc int[16]; Span currentMatches = stackalloc int[16]; + Span priorMatches = stackalloc int[16]; + priorMatches[0] = 0; int maxState = expression.Length * 2; int currentState; bool nameFinished = false; + // Walk through the name string, picking off characters. We go one + // character beyond the end because some wild cards are able to match + // zero characters beyond the end of the string. + // + // With each new name character we determine a new set of states that + // match the name so far. We use two arrays that we swap back and forth + // for this purpose. One array lists the possible expression states for + // all name characters up to but not including the current one, and other + // array is used to build up the list of states considering the current + // name character as well. The arrays are then switched and the process + // repeated. + // + // There is not a one-to-one correspondence between state number and + // offset into the expression. State numbering is not continuous. + // This allows a simple conversion between state number and expression + // offset. Each character in the expression can represent one or two + // states. * and DOS_STAR generate two states: expressionOffset * 2 and + // expressionOffset * 2 + 1. All other expression characters can produce + // only a single state. Thus expressionOffset = currentState / 2. + while (!nameFinished) { if (nameOffset < name.Length) @@ -177,7 +276,7 @@ namespace System.IO // '*' matches any character zero or more times. goto MatchZeroOrMore; } - else if (expressionChar == '<') + else if (useExtendedWildcards && expressionChar == '<') { // '<' (DOS_STAR) matches any character except '.' zero or more times. @@ -210,11 +309,11 @@ namespace System.IO } else { - // The following expression characters all match by consuming - // a character, thus force the expression, and thus state forward. + // The remaining expression characters all match by consuming a character, + // so we need to force the expression and state forward. currentState += 2; - if (expressionChar == '>') + if (useExtendedWildcards && expressionChar == '>') { // '>' (DOS_QM) is the most complicated. If the name is finished, // we can match zero characters. If this name is a '.', we @@ -226,7 +325,7 @@ namespace System.IO currentMatches[currentMatch++] = currentState; goto ExpressionFinished; } - else if (expressionChar == '"') + else if (useExtendedWildcards && expressionChar == '"') { // A '"' (DOS_DOT) can match either a period, or zero characters // beyond the end of name. @@ -242,6 +341,19 @@ namespace System.IO } else { + if (expressionChar == '\\') + { + // Escape character, try to move the expression forward again and match literally. + if (++expressionOffset == expression.Length) + { + currentMatches[currentMatch++] = maxState; + goto ExpressionFinished; + } + + currentState = expressionOffset * 2 + 2; + expressionChar = expression[expressionOffset]; + } + // From this point on a name character is required to even // continue, let alone make a match. if (nameFinished) goto ExpressionFinished; @@ -259,7 +371,6 @@ namespace System.IO currentMatches[currentMatch++] = currentState; } - // The expression didn't match so move to the next prior match. goto ExpressionFinished; } } diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/EnumerationOptions.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/EnumerationOptions.cs new file mode 100644 index 0000000000..d78e8368e3 --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/EnumerationOptions.cs @@ -0,0 +1,99 @@ +// 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.IO +{ + public class EnumerationOptions + { + /// + /// For internal use. These are the options we want to use if calling the existing Directory/File APIs where you don't + /// explicitly specify EnumerationOptions. + /// + internal static EnumerationOptions Compatible { get; } = new EnumerationOptions + { MatchType = MatchType.Win32, AttributesToSkip = 0, IgnoreInaccessible = false }; + + private static EnumerationOptions CompatibleRecursive { get; } = new EnumerationOptions + { RecurseSubdirectories = true, MatchType = MatchType.Win32, AttributesToSkip = 0, IgnoreInaccessible = false }; + + /// + /// Internal singleton for default options. + /// + internal static EnumerationOptions Default { get; } = new EnumerationOptions(); + + /// + /// Default constructor. Constructs the options class with recommended default options. + /// + public EnumerationOptions() + { + IgnoreInaccessible = true; + AttributesToSkip = FileAttributes.Hidden | FileAttributes.System; + } + + /// + /// Converts SearchOptions to FindOptions. Throws if undefined SearchOption. + /// + internal static EnumerationOptions FromSearchOption(SearchOption searchOption) + { + if ((searchOption != SearchOption.TopDirectoryOnly) && (searchOption != SearchOption.AllDirectories)) + throw new ArgumentOutOfRangeException(nameof(searchOption), SR.ArgumentOutOfRange_Enum); + + return searchOption == SearchOption.AllDirectories ? CompatibleRecursive : Compatible; + } + + /// + /// Should we recurse into subdirectories while enumerating? + /// Default is false. + /// + public bool RecurseSubdirectories { get; set; } + + /// + /// Skip files/directories when access is denied (e.g. AccessDeniedException/SecurityException). + /// Default is true. + /// + public bool IgnoreInaccessible { get; set; } + + /// + /// Suggested buffer size, in bytes. Default is 0 (no suggestion). + /// + /// + /// Not all platforms use user allocated buffers, and some require either fixed buffers or a + /// buffer that has enough space to return a full result. One scenario where this option is + /// useful is with remote share enumeration on Windows. Having a large buffer may result in + /// better performance as more results can be batched over the wire (e.g. over a network + /// share). A "large" buffer, for example, would be 16K. Typical is 4K. + /// + /// We will not use the suggested buffer size if it has no meaning for the native APIs on the + /// current platform or if it would be too small for getting at least a single result. + /// + public int BufferSize { get; set; } + + /// + /// Skip entries with the given attributes. Default is FileAttributes.Hidden | FileAttributes.System. + /// + public FileAttributes AttributesToSkip { get; set; } + + /// + /// For APIs that allow specifying a match expression this will allow you to specify how + /// to interpret the match expression. + /// + /// + /// The default is simple matching where '*' is always 0 or more characters and '?' is a single character. + /// + public MatchType MatchType { get; set; } + + + /// + /// For APIs that allow specifying a match expression this will allow you to specify case matching behavior. + /// + /// + /// Default is to match platform defaults, which are gleaned from the case sensitivity of the temporary folder. + /// + public MatchCasing MatchCasing { get; set; } + + /// + /// Set to true to return "." and ".." directory entries. + /// + public bool ReturnSpecialDirectories { get; set; } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/File.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/File.cs index bb12bf26f4..2225e2df4d 100644 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/File.cs +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/File.cs @@ -5,7 +5,6 @@ using System.Buffers; using System.Collections.Generic; using System.Diagnostics; -using System.Security; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -16,6 +15,7 @@ namespace System.IO // routines such as Delete, etc. public static class File { + private const int MaxByteArrayLength = 0x7FFFFFC7; private static Encoding s_UTF8NoBOM; internal const int DefaultBufferSize = 4096; @@ -44,39 +44,18 @@ namespace System.IO return new StreamWriter(path, append: true); } - - // Copies an existing file to a new file. An exception is raised if the - // destination file already exists. Use the - // Copy(string, string, boolean) method to allow - // overwriting an existing file. - // - // The caller must have certain FileIOPermissions. The caller must have - // Read permission to sourceFileName and Create - // and Write permissions to destFileName. - // + /// + /// Copies an existing file to a new file. + /// An exception is raised if the destination file already exists. + /// public static void Copy(string sourceFileName, string destFileName) - { - if (sourceFileName == null) - throw new ArgumentNullException(nameof(sourceFileName), SR.ArgumentNull_FileName); - if (destFileName == null) - throw new ArgumentNullException(nameof(destFileName), SR.ArgumentNull_FileName); - if (sourceFileName.Length == 0) - throw new ArgumentException(SR.Argument_EmptyFileName, nameof(sourceFileName)); - if (destFileName.Length == 0) - throw new ArgumentException(SR.Argument_EmptyFileName, nameof(destFileName)); + => Copy(sourceFileName, destFileName, overwrite: false); - InternalCopy(sourceFileName, destFileName, false); - } - - // Copies an existing file to a new file. If overwrite is - // false, then an IOException is thrown if the destination file - // already exists. If overwrite is true, the file is - // overwritten. - // - // The caller must have certain FileIOPermissions. The caller must have - // Read permission to sourceFileName - // and Write permissions to destFileName. - // + /// + /// Copies an existing file to a new file. + /// If is false, an exception will be + /// raised if the destination exists. Otherwise it will be overwritten. + /// public static void Copy(string sourceFileName, string destFileName, bool overwrite) { if (sourceFileName == null) @@ -88,36 +67,13 @@ namespace System.IO if (destFileName.Length == 0) throw new ArgumentException(SR.Argument_EmptyFileName, nameof(destFileName)); - InternalCopy(sourceFileName, destFileName, overwrite); + FileSystem.CopyFile(Path.GetFullPath(sourceFileName), Path.GetFullPath(destFileName), overwrite); } - /// - /// Note: This returns the fully qualified name of the destination file. - /// - internal static string InternalCopy(string sourceFileName, string destFileName, bool overwrite) - { - Debug.Assert(sourceFileName != null); - Debug.Assert(destFileName != null); - Debug.Assert(sourceFileName.Length > 0); - Debug.Assert(destFileName.Length > 0); - - string fullSourceFileName = Path.GetFullPath(sourceFileName); - string fullDestFileName = Path.GetFullPath(destFileName); - - FileSystem.CopyFile(fullSourceFileName, fullDestFileName, overwrite); - - return fullDestFileName; - } - - // Creates a file in a particular path. If the file exists, it is replaced. // The file is opened with ReadWrite access and cannot be opened by another // application until it has been closed. An IOException is thrown if the // directory specified doesn't exist. - // - // Your application must have Create, Read, and Write permissions to - // the file. - // public static FileStream Create(string path) { return Create(path, DefaultBufferSize); @@ -127,48 +83,30 @@ namespace System.IO // The file is opened with ReadWrite access and cannot be opened by another // application until it has been closed. An IOException is thrown if the // directory specified doesn't exist. - // - // Your application must have Create, Read, and Write permissions to - // the file. - // public static FileStream Create(string path, int bufferSize) - { - return new FileStream(path, FileMode.Create, FileAccess.ReadWrite, FileShare.None, bufferSize); - } + => new FileStream(path, FileMode.Create, FileAccess.ReadWrite, FileShare.None, bufferSize); public static FileStream Create(string path, int bufferSize, FileOptions options) - { - return new FileStream(path, FileMode.Create, FileAccess.ReadWrite, - FileShare.None, bufferSize, options); - } + => new FileStream(path, FileMode.Create, FileAccess.ReadWrite, FileShare.None, bufferSize, options); // Deletes a file. The file specified by the designated path is deleted. // If the file does not exist, Delete succeeds without throwing // an exception. // - // On NT, Delete will fail for a file that is open for normal I/O - // or a file that is memory mapped. - // - // Your application must have Delete permission to the target file. - // + // On Windows, Delete will fail for a file that is open for normal I/O + // or a file that is memory mapped. public static void Delete(string path) { if (path == null) throw new ArgumentNullException(nameof(path)); - string fullPath = Path.GetFullPath(path); - - FileSystem.DeleteFile(fullPath); + FileSystem.DeleteFile(Path.GetFullPath(path)); } - - // Tests if a file exists. The result is true if the file + // Tests whether a file exists. The result is true if the file // given by the specified path exists; otherwise, the result is // false. Note that if path describes a directory, // Exists will return true. - // - // Your application must have Read permission for the target directory. - // public static bool Exists(string path) { try @@ -179,6 +117,7 @@ namespace System.IO return false; path = Path.GetFullPath(path); + // After normalizing, check whether path ends in directory separator. // Otherwise, FillAttributeInfo removes it and we may return a false positive. // GetFullPath should never return null @@ -188,22 +127,15 @@ namespace System.IO return false; } - return InternalExists(path); + return FileSystem.FileExists(path); } catch (ArgumentException) { } - catch (NotSupportedException) { } // Security can throw this on ":" - catch (SecurityException) { } catch (IOException) { } catch (UnauthorizedAccessException) { } return false; } - internal static bool InternalExists(string path) - { - return FileSystem.FileExists(path); - } - public static FileStream Open(string path, FileMode mode) { return Open(path, mode, (mode == FileMode.Append ? FileAccess.Write : FileAccess.ReadWrite), FileShare.None); @@ -387,18 +319,21 @@ namespace System.IO } public static byte[] ReadAllBytes(string path) - { - return InternalReadAllBytes(path); - } - - private static byte[] InternalReadAllBytes(string path) { // bufferSize == 1 used to avoid unnecessary buffer in FileStream using (FileStream fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, bufferSize: 1)) { long fileLength = fs.Length; if (fileLength > int.MaxValue) + { throw new IOException(SR.IO_FileTooLong2GB); + } + else if (fileLength == 0) + { + // Some file systems (e.g. procfs on Linux) return 0 for length even when there's content. + // Thus we need to assume 0 doesn't mean empty. + return ReadAllBytesUnknownLength(fs); + } int index = 0; int count = (int)fileLength; @@ -415,6 +350,50 @@ namespace System.IO } } + private static byte[] ReadAllBytesUnknownLength(FileStream fs) + { + byte[] rentedArray = null; + Span buffer = stackalloc byte[512]; + try + { + int bytesRead = 0; + while (true) + { + if (bytesRead == buffer.Length) + { + uint newLength = (uint)buffer.Length * 2; + if (newLength > MaxByteArrayLength) + { + newLength = (uint)Math.Max(MaxByteArrayLength, buffer.Length + 1); + } + + byte[] tmp = ArrayPool.Shared.Rent((int)newLength); + buffer.CopyTo(tmp); + if (rentedArray != null) + { + ArrayPool.Shared.Return(rentedArray); + } + buffer = rentedArray = tmp; + } + + Debug.Assert(bytesRead < buffer.Length); + int n = fs.Read(buffer.Slice(bytesRead)); + if (n == 0) + { + return buffer.Slice(0, bytesRead).ToArray(); + } + bytesRead += n; + } + } + finally + { + if (rentedArray != null) + { + ArrayPool.Shared.Return(rentedArray); + } + } + } + public static void WriteAllBytes(string path, byte[] bytes) { if (path == null) @@ -643,7 +622,7 @@ namespace System.IO string fullSourceFileName = Path.GetFullPath(sourceFileName); string fullDestFileName = Path.GetFullPath(destFileName); - if (!InternalExists(fullSourceFileName)) + if (!FileSystem.FileExists(fullSourceFileName)) { throw new FileNotFoundException(SR.Format(SR.IO_FileNotFound_FileName, fullSourceFileName), fullSourceFileName); } @@ -723,23 +702,21 @@ namespace System.IO Debug.Assert(encoding != null); char[] buffer = null; - StringBuilder sb = null; StreamReader sr = AsyncStreamReader(path, encoding); try { cancellationToken.ThrowIfCancellationRequested(); - sb = StringBuilderCache.Acquire(); buffer = ArrayPool.Shared.Rent(sr.CurrentEncoding.GetMaxCharCount(DefaultBufferSize)); + StringBuilder sb = new StringBuilder(); for (;;) { - int read = await sr.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false); + int read = await sr.ReadAsync(new Memory(buffer), cancellationToken).ConfigureAwait(false); if (read == 0) { return sb.ToString(); } sb.Append(buffer, 0, read); - cancellationToken.ThrowIfCancellationRequested(); } } finally @@ -749,11 +726,6 @@ namespace System.IO { ArrayPool.Shared.Return(buffer); } - - if (sb != null) - { - StringBuilderCache.Release(sb); - } } } @@ -790,31 +762,23 @@ namespace System.IO return Task.FromCanceled(cancellationToken); } - FileStream fs = new FileStream( - path, FileMode.Open, FileAccess.Read, FileShare.Read, DefaultBufferSize, + var fs = new FileStream( + path, FileMode.Open, FileAccess.Read, FileShare.Read, bufferSize: 1, // bufferSize == 1 used to avoid unnecessary buffer in FileStream FileOptions.Asynchronous | FileOptions.SequentialScan); bool returningInternalTask = false; try { long fileLength = fs.Length; - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - if (fileLength > int.MaxValue) { return Task.FromException(new IOException(SR.IO_FileTooLong2GB)); } - if (fileLength == 0) - { - return Task.FromResult(Array.Empty()); - } - returningInternalTask = true; - return InternalReadAllBytesAsync(fs, (int)fileLength, cancellationToken); + return fileLength > 0 ? + InternalReadAllBytesAsync(fs, (int)fileLength, cancellationToken) : + InternalReadAllBytesUnknownLengthAsync(fs, cancellationToken); } finally { @@ -833,7 +797,7 @@ namespace System.IO byte[] bytes = new byte[count]; do { - int n = await fs.ReadAsync(bytes, index, count - index, cancellationToken).ConfigureAwait(false); + int n = await fs.ReadAsync(new Memory(bytes, index, count - index), cancellationToken).ConfigureAwait(false); if (n == 0) { throw Error.GetEndOfFile(); @@ -846,6 +810,44 @@ namespace System.IO } } + private static async Task InternalReadAllBytesUnknownLengthAsync(FileStream fs, CancellationToken cancellationToken) + { + byte[] rentedArray = ArrayPool.Shared.Rent(512); + try + { + int bytesRead = 0; + while (true) + { + if (bytesRead == rentedArray.Length) + { + uint newLength = (uint)rentedArray.Length * 2; + if (newLength > MaxByteArrayLength) + { + newLength = (uint)Math.Max(MaxByteArrayLength, rentedArray.Length + 1); + } + + byte[] tmp = ArrayPool.Shared.Rent((int)newLength); + Buffer.BlockCopy(rentedArray, 0, tmp, 0, bytesRead); + ArrayPool.Shared.Return(rentedArray); + rentedArray = tmp; + } + + Debug.Assert(bytesRead < rentedArray.Length); + int n = await fs.ReadAsync(rentedArray.AsMemory(bytesRead), cancellationToken).ConfigureAwait(false); + if (n == 0) + { + return rentedArray.AsSpan(0, bytesRead).ToArray(); + } + bytesRead += n; + } + } + finally + { + fs.Dispose(); + ArrayPool.Shared.Return(rentedArray); + } + } + public static Task WriteAllBytesAsync(string path, byte[] bytes, CancellationToken cancellationToken = default(CancellationToken)) { if (path == null) @@ -867,7 +869,7 @@ namespace System.IO using (FileStream fs = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.Read, DefaultBufferSize, FileOptions.Asynchronous | FileOptions.SequentialScan)) { - await fs.WriteAsync(bytes, 0, bytes.Length, cancellationToken).ConfigureAwait(false); + await fs.WriteAsync(new ReadOnlyMemory(bytes), cancellationToken).ConfigureAwait(false); await fs.FlushAsync(cancellationToken).ConfigureAwait(false); } } @@ -960,8 +962,7 @@ namespace System.IO { int batchSize = Math.Min(DefaultBufferSize, count - index); contents.CopyTo(index, buffer, 0, batchSize); - cancellationToken.ThrowIfCancellationRequested(); - await sw.WriteAsync(buffer, 0, batchSize).ConfigureAwait(false); + await sw.WriteAsync(new ReadOnlyMemory(buffer, 0, batchSize), cancellationToken).ConfigureAwait(false); index += batchSize; } diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/FileInfo.Windows.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/FileInfo.Windows.cs deleted file mode 100644 index cec962f3f4..0000000000 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/FileInfo.Windows.cs +++ /dev/null @@ -1,18 +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.IO -{ - partial class FileInfo - { - internal unsafe FileInfo(string fullPath, string fileName, ref RawFindData findData) - : this(fullPath, fileName: fileName, isNormalized: true) - { - Debug.Assert(fileName.Equals(Path.GetFileName(fullPath))); - Init(findData._info); - } - } -} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/FileInfo.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/FileInfo.cs index 45d85da99f..45b019f127 100644 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/FileInfo.cs +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/FileInfo.cs @@ -12,8 +12,6 @@ namespace System.IO [Serializable] public sealed partial class FileInfo : FileSystemInfo { - private string _name; - private FileInfo() { } public FileInfo(string fileName) @@ -31,12 +29,6 @@ namespace System.IO FullPath = isNormalized ? fullPath ?? originalPath : Path.GetFullPath(fullPath); _name = fileName ?? Path.GetFileName(originalPath); - DisplayPath = originalPath; - } - - public override string Name - { - get { return _name; } } public long Length @@ -45,22 +37,14 @@ namespace System.IO { if ((Attributes & FileAttributes.Directory) == FileAttributes.Directory) { - throw new FileNotFoundException(SR.Format(SR.IO_FileNotFound_FileName, DisplayPath), DisplayPath); + throw new FileNotFoundException(SR.Format(SR.IO_FileNotFound_FileName, FullPath), FullPath); } return LengthCore; } } - /* Returns the name of the directory that the file is in */ - public string DirectoryName - { - get - { - return Path.GetDirectoryName(FullPath); - } - } + public string DirectoryName => Path.GetDirectoryName(FullPath); - /* Creates an instance of the parent directory */ public DirectoryInfo Directory { get @@ -88,50 +72,16 @@ namespace System.IO } public StreamReader OpenText() - { - return new StreamReader(FullPath, Encoding.UTF8, detectEncodingFromByteOrderMarks: true); - } + => new StreamReader(NormalizedPath, Encoding.UTF8, detectEncodingFromByteOrderMarks: true); public StreamWriter CreateText() - { - return new StreamWriter(FullPath, append: false); - } + => new StreamWriter(NormalizedPath, append: false); public StreamWriter AppendText() - { - return new StreamWriter(FullPath, append: true); - } + => new StreamWriter(NormalizedPath, append: true); + public FileInfo CopyTo(string destFileName) => CopyTo(destFileName, overwrite: false); - // Copies an existing file to a new file. An exception is raised if the - // destination file already exists. Use the - // Copy(string, string, boolean) method to allow - // overwriting an existing file. - // - // The caller must have certain FileIOPermissions. The caller must have - // Read permission to sourceFileName - // and Write permissions to destFileName. - // - public FileInfo CopyTo(string destFileName) - { - if (destFileName == null) - throw new ArgumentNullException(nameof(destFileName), SR.ArgumentNull_FileName); - if (destFileName.Length == 0) - throw new ArgumentException(SR.Argument_EmptyFileName, nameof(destFileName)); - - return new FileInfo(File.InternalCopy(FullPath, destFileName, false), isNormalized: true); - } - - - // Copies an existing file to a new file. If overwrite is - // false, then an IOException is thrown if the destination file - // already exists. If overwrite is true, the file is - // overwritten. - // - // The caller must have certain FileIOPermissions. The caller must have - // Read permission to sourceFileName and Create - // and Write permissions to destFileName. - // public FileInfo CopyTo(string destFileName, bool overwrite) { if (destFileName == null) @@ -139,85 +89,32 @@ namespace System.IO if (destFileName.Length == 0) throw new ArgumentException(SR.Argument_EmptyFileName, nameof(destFileName)); - return new FileInfo(File.InternalCopy(FullPath, destFileName, overwrite), isNormalized: true); + string destinationPath = Path.GetFullPath(destFileName); + FileSystem.CopyFile(FullPath, destinationPath, overwrite); + return new FileInfo(destinationPath, isNormalized: true); } - public FileStream Create() - { - return File.Create(FullPath); - } + public FileStream Create() => File.Create(NormalizedPath); - // Deletes a file. The file specified by the designated path is deleted. - // If the file does not exist, Delete succeeds without throwing - // an exception. - // - // On NT, Delete will fail for a file that is open for normal I/O - // or a file that is memory mapped. On Win95, the file will be - // deleted irregardless of whether the file is being used. - // - // Your application must have Delete permission to the target file. - // - public override void Delete() - { - FileSystem.DeleteFile(FullPath); - } + public override void Delete() => FileSystem.DeleteFile(FullPath); - // Tests if the given file exists. The result is true if the file - // given by the specified path exists; otherwise, the result is - // false. - // - // Your application must have Read permission for the target directory. - public override bool Exists - { - get - { - try - { - return ExistsCore; - } - catch - { - return false; - } - } - } - - // User must explicitly specify opening a new file or appending to one. public FileStream Open(FileMode mode) - { - return Open(mode, (mode == FileMode.Append ? FileAccess.Write : FileAccess.ReadWrite), FileShare.None); - } + => Open(mode, (mode == FileMode.Append ? FileAccess.Write : FileAccess.ReadWrite), FileShare.None); public FileStream Open(FileMode mode, FileAccess access) - { - return Open(mode, access, FileShare.None); - } + => Open(mode, access, FileShare.None); public FileStream Open(FileMode mode, FileAccess access, FileShare share) - { - return new FileStream(FullPath, mode, access, share); - } + => new FileStream(NormalizedPath, mode, access, share); public FileStream OpenRead() - { - return new FileStream(FullPath, FileMode.Open, FileAccess.Read, - FileShare.Read, 4096, false); - } + => new FileStream(NormalizedPath, FileMode.Open, FileAccess.Read, FileShare.Read, 4096, false); public FileStream OpenWrite() - { - return new FileStream(FullPath, FileMode.OpenOrCreate, - FileAccess.Write, FileShare.None); - } + => new FileStream(NormalizedPath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.None); // Moves a given file to a new location and potentially a new file name. // This method does work across volumes. - // - // The caller must have certain FileIOPermissions. The caller must - // have Read and Write permission to - // sourceFileName and Write - // permissions to destFileName. - // public void MoveTo(string destFileName) { if (destFileName == null) @@ -231,50 +128,40 @@ namespace System.IO // as it does on Windows.These checks can be removed if a solution to #2460 is // found that doesn't require validity checks before making an API call. if (!new DirectoryInfo(Path.GetDirectoryName(FullName)).Exists) - { throw new DirectoryNotFoundException(SR.Format(SR.IO_PathNotFound_Path, FullName)); - } + if (!Exists) - { throw new FileNotFoundException(SR.Format(SR.IO_FileNotFound_FileName, FullName), FullName); - } FileSystem.MoveFile(FullPath, fullDestFileName); FullPath = fullDestFileName; OriginalPath = destFileName; _name = Path.GetFileName(fullDestFileName); - DisplayPath = destFileName; + // Flush any cached information about the file. Invalidate(); } public FileInfo Replace(string destinationFileName, string destinationBackupFileName) - { - return Replace(destinationFileName, destinationBackupFileName, ignoreMetadataErrors: false); - } + => Replace(destinationFileName, destinationBackupFileName, ignoreMetadataErrors: false); public FileInfo Replace(string destinationFileName, string destinationBackupFileName, bool ignoreMetadataErrors) { - File.Replace(FullPath, destinationFileName, destinationBackupFileName, ignoreMetadataErrors); + if (destinationFileName == null) + throw new ArgumentNullException(nameof(destinationFileName)); + + FileSystem.ReplaceFile( + FullPath, + Path.GetFullPath(destinationFileName), + destinationBackupFileName != null ? Path.GetFullPath(destinationBackupFileName) : null, + ignoreMetadataErrors); + return new FileInfo(destinationFileName); } - // Returns the display path - public override string ToString() - { - return DisplayPath; - } - - public void Decrypt() - { - File.Decrypt(FullPath); - } - - public void Encrypt() - { - File.Encrypt(FullPath); - } + public void Decrypt() => File.Decrypt(FullPath); + public void Encrypt() => File.Encrypt(FullPath); } } diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/FileStatus.Unix.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/FileStatus.Unix.cs new file mode 100644 index 0000000000..1c9337b210 --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/FileStatus.Unix.cs @@ -0,0 +1,277 @@ +// 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.IO +{ + internal struct FileStatus + { + private const int NanosecondsPerTick = 100; + + // The last cached stat information about the file + private Interop.Sys.FileStatus _fileStatus; + + // -1 if _fileStatus isn't initialized, 0 if _fileStatus was initialized with no + // errors, or the errno error code. + private int _fileStatusInitialized; + + // We track intent of creation to know whether or not we want to (1) create a + // DirectoryInfo around this status struct or (2) actually are part of a DirectoryInfo. + internal bool InitiallyDirectory { get; private set; } + + // Is a directory as of the last refresh + internal bool _isDirectory; + + // Exists as of the last refresh + private bool _exists; + + internal static void Initialize( + ref FileStatus status, + bool isDirectory) + { + status.InitiallyDirectory = isDirectory; + status._fileStatusInitialized = -1; + } + + internal void Invalidate() => _fileStatusInitialized = -1; + + internal bool IsReadOnly(ReadOnlySpan path, bool continueOnError = false) + { + EnsureStatInitialized(path, continueOnError); + Interop.Sys.Permissions readBit, writeBit; + if (_fileStatus.Uid == Interop.Sys.GetEUid()) + { + // User effectively owns the file + readBit = Interop.Sys.Permissions.S_IRUSR; + writeBit = Interop.Sys.Permissions.S_IWUSR; + } + else if (_fileStatus.Gid == Interop.Sys.GetEGid()) + { + // User belongs to a group that effectively owns the file + readBit = Interop.Sys.Permissions.S_IRGRP; + writeBit = Interop.Sys.Permissions.S_IWGRP; + } + else + { + // Others permissions + readBit = Interop.Sys.Permissions.S_IROTH; + writeBit = Interop.Sys.Permissions.S_IWOTH; + } + + return ((_fileStatus.Mode & (int)readBit) != 0 && // has read permission + (_fileStatus.Mode & (int)writeBit) == 0); // but not write permission + } + + public FileAttributes GetAttributes(ReadOnlySpan path, ReadOnlySpan fileName) + { + // IMPORTANT: Attribute logic must match the logic in FileSystemEntry + + EnsureStatInitialized(path); + + if (!_exists) + return (FileAttributes)(-1); + + FileAttributes attributes = default; + + if (IsReadOnly(path)) + attributes |= FileAttributes.ReadOnly; + + if ((_fileStatus.Mode & Interop.Sys.FileTypes.S_IFMT) == Interop.Sys.FileTypes.S_IFLNK) + attributes |= FileAttributes.ReparsePoint; + + if (_isDirectory) + attributes |= FileAttributes.Directory; + + // If the filename starts with a period, it's hidden. + if (fileName.Length > 0 && fileName[0] == '.') + attributes |= FileAttributes.Hidden; + + return attributes != default ? attributes : FileAttributes.Normal; + } + + public void SetAttributes(string path, FileAttributes attributes) + { + // Validate that only flags from the attribute are being provided. This is an + // approximation for the validation done by the Win32 function. + const FileAttributes allValidFlags = + FileAttributes.Archive | FileAttributes.Compressed | FileAttributes.Device | + FileAttributes.Directory | FileAttributes.Encrypted | FileAttributes.Hidden | + FileAttributes.Hidden | FileAttributes.IntegrityStream | FileAttributes.Normal | + FileAttributes.NoScrubData | FileAttributes.NotContentIndexed | FileAttributes.Offline | + FileAttributes.ReadOnly | FileAttributes.ReparsePoint | FileAttributes.SparseFile | + FileAttributes.System | FileAttributes.Temporary; + if ((attributes & ~allValidFlags) != 0) + { + // Using constant string for argument to match historical throw + throw new ArgumentException(SR.Arg_InvalidFileAttrs, "Attributes"); + } + + EnsureStatInitialized(path); + + if (!_exists) + FileSystemInfo.ThrowNotFound(path); + + // The only thing we can reasonably change is whether the file object is readonly by changing permissions. + + int newMode = _fileStatus.Mode; + if ((attributes & FileAttributes.ReadOnly) != 0) + { + // Take away all write permissions from user/group/everyone + newMode &= ~(int)(Interop.Sys.Permissions.S_IWUSR | Interop.Sys.Permissions.S_IWGRP | Interop.Sys.Permissions.S_IWOTH); + } + else if ((newMode & (int)Interop.Sys.Permissions.S_IRUSR) != 0) + { + // Give write permission to the owner if the owner has read permission + newMode |= (int)Interop.Sys.Permissions.S_IWUSR; + } + + // Change the permissions on the file + if (newMode != _fileStatus.Mode) + { + Interop.CheckIo(Interop.Sys.ChMod(path, newMode), path, InitiallyDirectory); + } + + _fileStatusInitialized = -1; + } + + internal bool GetExists(ReadOnlySpan path) + { + if (_fileStatusInitialized == -1) + Refresh(path); + + return _exists && InitiallyDirectory == _isDirectory; + } + + internal DateTimeOffset GetCreationTime(ReadOnlySpan path, bool continueOnError = false) + { + EnsureStatInitialized(path, continueOnError); + if (!_exists) + return DateTimeOffset.FromFileTime(0); + + if ((_fileStatus.Flags & Interop.Sys.FileStatusFlags.HasBirthTime) != 0) + return UnixTimeToDateTimeOffset(_fileStatus.BirthTime, _fileStatus.BirthTimeNsec); + + // fall back to the oldest time we have in between change and modify time + if (_fileStatus.MTime < _fileStatus.CTime || + (_fileStatus.MTime == _fileStatus.CTime && _fileStatus.MTimeNsec < _fileStatus.CTimeNsec)) + return UnixTimeToDateTimeOffset(_fileStatus.MTime, _fileStatus.MTimeNsec); + + return UnixTimeToDateTimeOffset(_fileStatus.CTime, _fileStatus.CTimeNsec); + } + + internal void SetCreationTime(string path, DateTimeOffset time) + { + // There isn't a reliable way to set this; however, we can't just do nothing since the + // FileSystemWatcher specifically looks for this call to make a Metadata Change, so we + // should set the LastAccessTime of the file to cause the metadata change we need. + SetLastAccessTime(path, time); + } + + internal DateTimeOffset GetLastAccessTime(ReadOnlySpan path, bool continueOnError = false) + { + EnsureStatInitialized(path, continueOnError); + if (!_exists) + return DateTimeOffset.FromFileTime(0); + return UnixTimeToDateTimeOffset(_fileStatus.ATime, _fileStatus.ATimeNsec); + } + + internal void SetLastAccessTime(string path, DateTimeOffset time) + => SetAccessWriteTimes(path, time.ToUnixTimeSeconds(), null); + + internal DateTimeOffset GetLastWriteTime(ReadOnlySpan path, bool continueOnError = false) + { + EnsureStatInitialized(path, continueOnError); + if (!_exists) + return DateTimeOffset.FromFileTime(0); + return UnixTimeToDateTimeOffset(_fileStatus.MTime, _fileStatus.MTimeNsec); + } + + internal void SetLastWriteTime(string path, DateTimeOffset time) + => SetAccessWriteTimes(path, null, time.ToUnixTimeSeconds()); + + private DateTimeOffset UnixTimeToDateTimeOffset(long seconds, long nanoseconds) + { + return DateTimeOffset.FromUnixTimeSeconds(seconds).AddTicks(nanoseconds / NanosecondsPerTick).ToLocalTime(); + } + + private void SetAccessWriteTimes(string path, long? accessTime, long? writeTime) + { + // force a refresh so that we have an up-to-date times for values not being overwritten + _fileStatusInitialized = -1; + EnsureStatInitialized(path); + Interop.Sys.UTimBuf buf; + // we use utime() not utimensat() so we drop the subsecond part + buf.AcTime = accessTime ?? _fileStatus.ATime; + buf.ModTime = writeTime ?? _fileStatus.MTime; + Interop.CheckIo(Interop.Sys.UTime(path, ref buf), path, InitiallyDirectory); + _fileStatusInitialized = -1; + } + + internal long GetLength(ReadOnlySpan path, bool continueOnError = false) + { + EnsureStatInitialized(path, continueOnError); + return _fileStatus.Size; + } + + public void Refresh(ReadOnlySpan path) + { + // This should not throw, instead we store the result so that we can throw it + // when someone actually accesses a property. + + // Use lstat to get the details on the object, without following symlinks. + // If it is a symlink, then subsequently get details on the target of the symlink, + // storing those results separately. We only report failure if the initial + // lstat fails, as a broken symlink should still report info on exists, attributes, etc. + _isDirectory = false; + path = PathInternal.TrimEndingDirectorySeparator(path); + int result = Interop.Sys.LStat(path, out _fileStatus); + if (result < 0) + { + Interop.ErrorInfo errorInfo = Interop.Sys.GetLastErrorInfo(); + + // This should never set the error if the file can't be found. + // (see the Windows refresh passing returnErrorOnNotFound: false). + if (errorInfo.Error == Interop.Error.ENOENT + || errorInfo.Error == Interop.Error.ENOTDIR) + { + _fileStatusInitialized = 0; + _exists = false; + } + else + { + _fileStatusInitialized = errorInfo.RawErrno; + } + return; + } + + _exists = true; + + // IMPORTANT: Is directory logic must match the logic in FileSystemEntry + _isDirectory = (_fileStatus.Mode & Interop.Sys.FileTypes.S_IFMT) == Interop.Sys.FileTypes.S_IFDIR; + + // If we're a symlink, attempt to check the target to see if it is a directory + if ((_fileStatus.Mode & Interop.Sys.FileTypes.S_IFMT) == Interop.Sys.FileTypes.S_IFLNK && + Interop.Sys.Stat(path, out Interop.Sys.FileStatus targetStatus) >= 0) + { + _isDirectory = (targetStatus.Mode & Interop.Sys.FileTypes.S_IFMT) == Interop.Sys.FileTypes.S_IFDIR; + } + + _fileStatusInitialized = 0; + } + + internal void EnsureStatInitialized(ReadOnlySpan path, bool continueOnError = false) + { + if (_fileStatusInitialized == -1) + { + Refresh(path); + } + + if (_fileStatusInitialized != 0 && !continueOnError) + { + int errno = _fileStatusInitialized; + _fileStatusInitialized = -1; + throw Interop.GetExceptionForIoErrno(new Interop.ErrorInfo(errno), new string(path)); + } + } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystem.Unix.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystem.Unix.cs index 955d568322..d272734f96 100644 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystem.Unix.cs +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystem.Unix.cs @@ -2,11 +2,8 @@ // 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.Collections; using System.Collections.Generic; using System.Diagnostics; -using System.Runtime.InteropServices; -using System.Threading; namespace System.IO { @@ -104,7 +101,8 @@ namespace System.IO if (errorInfo.Error == Interop.Error.EXDEV || // rename fails across devices / mount points errorInfo.Error == Interop.Error.EPERM || // permissions might not allow creating hard links even if a copy would work errorInfo.Error == Interop.Error.EOPNOTSUPP || // links aren't supported by the source file system - errorInfo.Error == Interop.Error.EMLINK) // too many hard links to the source file + errorInfo.Error == Interop.Error.EMLINK || // too many hard links to the source file + errorInfo.Error == Interop.Error.ENOSYS) // the file system doesn't support link { CopyFile(sourceFullPath, destFullPath, overwrite: false); } @@ -163,7 +161,7 @@ namespace System.IO // Input allows trailing separators in order to match Windows behavior // Unix does not accept trailing separators, so must be trimmed - if (!FileExists(PathHelpers.TrimEndingDirectorySeparator(fullPath), + if (!FileExists(PathInternal.TrimEndingDirectorySeparator(fullPath), Interop.Sys.FileTypes.S_IFREG, out fileExistsError) && fileExistsError.Error == Interop.Error.ENOENT) { @@ -186,7 +184,7 @@ namespace System.IO int length = fullPath.Length; // We need to trim the trailing slash or the code will try to create 2 directories of the same name. - if (length >= 2 && PathHelpers.EndsInDirectorySeparator(fullPath)) + if (length >= 2 && PathInternal.EndsInDirectorySeparator(fullPath)) { length--; } @@ -293,11 +291,11 @@ namespace System.IO // This surfaces as a IOException, if we let it go beyond here it would // give DirectoryNotFound. - if (PathHelpers.EndsInDirectorySeparator(sourceFullPath)) + if (PathInternal.EndsInDirectorySeparator(sourceFullPath)) throw new IOException(SR.Format(SR.IO_PathNotFound_Path, sourceFullPath)); // ... but it doesn't care if the destination has a trailing separator. - destFullPath = PathHelpers.TrimEndingDirectorySeparator(destFullPath); + destFullPath = PathInternal.TrimEndingDirectorySeparator(destFullPath); } if (Interop.Sys.Rename(sourceFullPath, destFullPath) < 0) @@ -337,7 +335,7 @@ namespace System.IO { try { - foreach (string item in EnumeratePaths(directory.FullName, "*", SearchOption.TopDirectoryOnly, SearchTarget.Both)) + foreach (string item in Directory.EnumerateFileSystemEntries(directory.FullName)) { if (!ShouldIgnoreDirectory(Path.GetFileName(item))) { @@ -416,7 +414,7 @@ namespace System.IO // Input allows trailing separators in order to match Windows behavior // Unix does not accept trailing separators, so must be trimmed - return FileExists(PathHelpers.TrimEndingDirectorySeparator(fullPath), Interop.Sys.FileTypes.S_IFREG, out ignored); + return FileExists(PathInternal.TrimEndingDirectorySeparator(fullPath), Interop.Sys.FileTypes.S_IFREG, out ignored); } private static bool FileExists(string fullPath, int fileType, out Interop.ErrorInfo errorInfo) @@ -444,249 +442,6 @@ namespace System.IO ((fileinfo.Mode & Interop.Sys.FileTypes.S_IFMT) == Interop.Sys.FileTypes.S_IFDIR); } - public static IEnumerable EnumeratePaths(string path, string searchPattern, SearchOption searchOption, SearchTarget searchTarget) - { - return new FileSystemEnumerable(path, searchPattern, searchOption, searchTarget, (p, _) => p); - } - - public static IEnumerable EnumerateFileSystemInfos(string fullPath, string searchPattern, SearchOption searchOption, SearchTarget searchTarget) - { - switch (searchTarget) - { - case SearchTarget.Files: - return new FileSystemEnumerable(fullPath, searchPattern, searchOption, searchTarget, (path, isDir) => - { - var info = new FileInfo(path, null); - info.Refresh(); - return info; - }); - case SearchTarget.Directories: - return new FileSystemEnumerable(fullPath, searchPattern, searchOption, searchTarget, (path, isDir) => - { - var info = new DirectoryInfo(path, null); - info.Refresh(); - return info; - }); - default: - return new FileSystemEnumerable(fullPath, searchPattern, searchOption, searchTarget, (path, isDir) => - { - var info = isDir ? - (FileSystemInfo)new DirectoryInfo(path, null) : - (FileSystemInfo)new FileInfo(path, null); - info.Refresh(); - return info; - }); - } - } - - private sealed class FileSystemEnumerable : IEnumerable - { - private readonly PathPair _initialDirectory; - private readonly string _searchPattern; - private readonly SearchOption _searchOption; - private readonly bool _includeFiles; - private readonly bool _includeDirectories; - private readonly Func _translateResult; - private IEnumerator _firstEnumerator; - - internal FileSystemEnumerable( - string userPath, string searchPattern, - SearchOption searchOption, SearchTarget searchTarget, - Func translateResult) - { - // Basic validation of the input path - if (userPath == null) - { - throw new ArgumentNullException("path"); - } - if (string.IsNullOrEmpty(userPath)) - { - throw new ArgumentException(SR.Argument_EmptyPath, "path"); - } - - // Validate and normalize the search pattern. If after doing so it's empty, - // matching Win32 behavior we can skip all additional validation and effectively - // return an empty enumerable. - searchPattern = NormalizeSearchPattern(searchPattern); - if (searchPattern.Length > 0) - { - PathHelpers.ThrowIfEmptyOrRootedPath(searchPattern); - - // If the search pattern contains any paths, make sure we factor those into - // the user path, and then trim them off. - int lastSlash = searchPattern.LastIndexOf(Path.DirectorySeparatorChar); - if (lastSlash >= 0) - { - if (lastSlash >= 1) - { - userPath = Path.Combine(userPath, searchPattern.Substring(0, lastSlash)); - } - searchPattern = searchPattern.Substring(lastSlash + 1); - } - - // Typically we shouldn't see either of these cases, an upfront check is much faster - foreach (char c in searchPattern) - { - if (c == '\\' || c == '[') - { - // We need to escape any escape characters in the search pattern - searchPattern = searchPattern.Replace(@"\", @"\\"); - - // And then escape '[' to prevent it being picked up as a wildcard - searchPattern = searchPattern.Replace(@"[", @"\["); - break; - } - } - - string fullPath = Path.GetFullPath(userPath); - - // Store everything for the enumerator - _initialDirectory = new PathPair(userPath, fullPath); - _searchPattern = searchPattern; - _searchOption = searchOption; - _includeFiles = (searchTarget & SearchTarget.Files) != 0; - _includeDirectories = (searchTarget & SearchTarget.Directories) != 0; - _translateResult = translateResult; - } - - // Open the first enumerator so that any errors are propagated synchronously. - _firstEnumerator = Enumerate(); - } - - public IEnumerator GetEnumerator() - { - return Interlocked.Exchange(ref _firstEnumerator, null) ?? Enumerate(); - } - - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } - - private IEnumerator Enumerate() - { - return Enumerate( - _initialDirectory.FullPath != null ? - OpenDirectory(_initialDirectory.FullPath) : - null); - } - - private IEnumerator Enumerate(Microsoft.Win32.SafeHandles.SafeDirectoryHandle dirHandle) - { - if (dirHandle == null) - { - // Empty search - yield break; - } - - Debug.Assert(!dirHandle.IsInvalid); - Debug.Assert(!dirHandle.IsClosed); - - // Maintain a stack of the directories to explore, in the case of SearchOption.AllDirectories - // Lazily-initialized only if we find subdirectories that will be explored. - Stack toExplore = null; - PathPair dirPath = _initialDirectory; - while (dirHandle != null) - { - try - { - // Read each entry from the enumerator - Interop.Sys.DirectoryEntry dirent; - while (Interop.Sys.ReadDir(dirHandle, out dirent) == 0) - { - // Get from the dir entry whether the entry is a file or directory. - // We classify everything as a file unless we know it to be a directory. - bool isDir; - if (dirent.InodeType == Interop.Sys.NodeType.DT_DIR) - { - // We know it's a directory. - isDir = true; - } - else if (dirent.InodeType == Interop.Sys.NodeType.DT_LNK || dirent.InodeType == Interop.Sys.NodeType.DT_UNKNOWN) - { - // It's a symlink or unknown: stat to it to see if we can resolve it to a directory. - // If we can't (e.g. symlink to a file, broken symlink, etc.), we'll just treat it as a file. - Interop.ErrorInfo errnoIgnored; - isDir = DirectoryExists(Path.Combine(dirPath.FullPath, dirent.InodeName), out errnoIgnored); - } - else - { - // Otherwise, treat it as a file. This includes regular files, FIFOs, etc. - isDir = false; - } - - // Yield the result if the user has asked for it. In the case of directories, - // always explore it by pushing it onto the stack, regardless of whether - // we're returning directories. - if (isDir) - { - if (!ShouldIgnoreDirectory(dirent.InodeName)) - { - string userPath = null; - if (_searchOption == SearchOption.AllDirectories) - { - if (toExplore == null) - { - toExplore = new Stack(); - } - userPath = Path.Combine(dirPath.UserPath, dirent.InodeName); - toExplore.Push(new PathPair(userPath, Path.Combine(dirPath.FullPath, dirent.InodeName))); - } - if (_includeDirectories && - Interop.Sys.FnMatch(_searchPattern, dirent.InodeName, Interop.Sys.FnMatchFlags.FNM_NONE) == 0) - { - yield return _translateResult(userPath ?? Path.Combine(dirPath.UserPath, dirent.InodeName), /*isDirectory*/true); - } - } - } - else if (_includeFiles && - Interop.Sys.FnMatch(_searchPattern, dirent.InodeName, Interop.Sys.FnMatchFlags.FNM_NONE) == 0) - { - yield return _translateResult(Path.Combine(dirPath.UserPath, dirent.InodeName), /*isDirectory*/false); - } - } - } - finally - { - // Close the directory enumerator - dirHandle.Dispose(); - dirHandle = null; - } - - if (toExplore != null && toExplore.Count > 0) - { - // Open the next directory. - dirPath = toExplore.Pop(); - dirHandle = OpenDirectory(dirPath.FullPath); - } - } - } - - private static string NormalizeSearchPattern(string searchPattern) - { - if (searchPattern == "." || searchPattern == "*.*") - { - searchPattern = "*"; - } - else if (PathHelpers.EndsInDirectorySeparator(searchPattern)) - { - searchPattern += "*"; - } - - return searchPattern; - } - - private static Microsoft.Win32.SafeHandles.SafeDirectoryHandle OpenDirectory(string fullPath) - { - Microsoft.Win32.SafeHandles.SafeDirectoryHandle handle = Interop.Sys.OpenDir(fullPath); - if (handle.IsInvalid) - { - throw Interop.GetExceptionForIoErrno(Interop.Sys.GetLastErrorInfo(), fullPath, isDirectory: true); - } - return handle; - } - } - /// Determines whether the specified directory name should be ignored. /// The name to evaluate. /// true if the name is "." or ".."; otherwise, false. @@ -695,16 +450,6 @@ namespace System.IO return name == "." || name == ".."; } - public static string GetCurrentDirectory() - { - return Interop.Sys.GetCwd(); - } - - public static void SetCurrentDirectory(string fullPath) - { - Interop.CheckIo(Interop.Sys.ChDir(fullPath), fullPath, isDirectory:true); - } - public static FileAttributes GetAttributes(string fullPath) { FileAttributes attributes = new FileInfo(fullPath, null).Attributes; @@ -762,13 +507,6 @@ namespace System.IO info.LastWriteTimeCore = time; } - public static FileSystemInfo GetFileSystemInfo(string fullPath, bool asDirectory) - { - return asDirectory ? - (FileSystemInfo)new DirectoryInfo(fullPath, null) : - (FileSystemInfo)new FileInfo(fullPath, null); - } - public static string[] GetLogicalDrives() { return DriveInfoInternal.GetLogicalDrives(); diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystem.Windows.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystem.Windows.cs index 84f8e6ff87..a3e1a50d4c 100644 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystem.Windows.cs +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystem.Windows.cs @@ -66,7 +66,7 @@ namespace System.IO List stackDir = new List(); // Attempt to figure out which directories don't exist, and only - // create the ones we need. Note that InternalExists may fail due + // create the ones we need. Note that FileExists may fail due // to Win32 ACL's preventing us from seeing a directory, and this // isn't threadsafe. @@ -75,7 +75,7 @@ namespace System.IO int length = fullPath.Length; // We need to trim the trailing slash or the code will try to create 2 directories of the same name. - if (length >= 2 && PathHelpers.EndsInDirectorySeparator(fullPath)) + if (length >= 2 && PathInternal.EndsInDirectorySeparator(fullPath)) length--; int lengthRoot = PathInternal.GetRootLength(fullPath); @@ -120,7 +120,7 @@ namespace System.IO int currentError = Marshal.GetLastWin32Error(); // While we tried to avoid creating directories that don't // exist above, there are at least two cases that will - // cause us to see ERROR_ALREADY_EXISTS here. InternalExists + // cause us to see ERROR_ALREADY_EXISTS here. FileExists // can fail because we didn't have permission to the // directory. Secondly, another thread or process could // create the directory between the time we check and the @@ -131,7 +131,7 @@ namespace System.IO else { // If there's a file in this directory's place, or if we have ERROR_ACCESS_DENIED when checking if the directory already exists throw. - if (File.InternalExists(name) || (!DirectoryExists(name, out currentError) && currentError == Interop.Errors.ERROR_ACCESS_DENIED)) + if (FileExists(name) || (!DirectoryExists(name, out currentError) && currentError == Interop.Errors.ERROR_ACCESS_DENIED)) { firstError = currentError; errorString = name; @@ -183,38 +183,6 @@ namespace System.IO && ((data.dwFileAttributes & Interop.Kernel32.FileAttributes.FILE_ATTRIBUTE_DIRECTORY) != 0); } - public static IEnumerable EnumeratePaths(string fullPath, string searchPattern, SearchOption searchOption, SearchTarget searchTarget) - { - FindEnumerableFactory.NormalizeInputs(ref fullPath, ref searchPattern); - switch (searchTarget) - { - case SearchTarget.Files: - return FindEnumerableFactory.UserFiles(fullPath, searchPattern, searchOption == SearchOption.AllDirectories); - case SearchTarget.Directories: - return FindEnumerableFactory.UserDirectories(fullPath, searchPattern, searchOption == SearchOption.AllDirectories); - case SearchTarget.Both: - return FindEnumerableFactory.UserEntries(fullPath, searchPattern, searchOption == SearchOption.AllDirectories); - default: - throw new ArgumentOutOfRangeException(nameof(searchTarget)); - } - } - - public static IEnumerable EnumerateFileSystemInfos(string fullPath, string searchPattern, SearchOption searchOption, SearchTarget searchTarget) - { - FindEnumerableFactory.NormalizeInputs(ref fullPath, ref searchPattern); - switch (searchTarget) - { - case SearchTarget.Directories: - return FindEnumerableFactory.DirectoryInfos(fullPath, searchPattern, searchOption == SearchOption.AllDirectories); - case SearchTarget.Files: - return FindEnumerableFactory.FileInfos(fullPath, searchPattern, searchOption == SearchOption.AllDirectories); - case SearchTarget.Both: - return FindEnumerableFactory.FileSystemInfos(fullPath, searchPattern, searchOption == SearchOption.AllDirectories); - default: - throw new ArgumentException(SR.ArgumentOutOfRange_Enum, nameof(searchTarget)); - } - } - /// /// Returns 0 on success, otherwise a Win32 error code. Note that /// classes should use -1 as the uninitialized state for dataInitialized. @@ -225,7 +193,7 @@ namespace System.IO int errorCode = Interop.Errors.ERROR_SUCCESS; // Neither GetFileAttributes or FindFirstFile like trailing separators - path = path.TrimEnd(PathHelpers.DirectorySeparatorChars); + path = PathInternal.TrimEndingDirectorySeparator(path); using (DisableMediaInsertionPrompt.Create()) { @@ -291,36 +259,6 @@ namespace System.IO return (FileAttributes)data.dwFileAttributes; } - public static string GetCurrentDirectory() - { - StringBuilder sb = StringBuilderCache.Acquire(Interop.Kernel32.MAX_PATH + 1); - if (Interop.Kernel32.GetCurrentDirectory(sb.Capacity, sb) == 0) - throw Win32Marshal.GetExceptionForLastWin32Error(); - string currentDirectory = sb.ToString(); - // Note that if we have somehow put our command prompt into short - // file name mode (i.e. by running edlin or a DOS grep, etc), then - // this will return a short file name. - if (currentDirectory.IndexOf('~') >= 0) - { - int r = Interop.Kernel32.GetLongPathName(currentDirectory, sb, sb.Capacity); - if (r == 0 || r >= Interop.Kernel32.MAX_PATH) - { - int errorCode = Marshal.GetLastWin32Error(); - if (r >= Interop.Kernel32.MAX_PATH) - errorCode = Interop.Errors.ERROR_FILENAME_EXCED_RANGE; - if (errorCode != Interop.Errors.ERROR_FILE_NOT_FOUND && - errorCode != Interop.Errors.ERROR_PATH_NOT_FOUND && - errorCode != Interop.Errors.ERROR_INVALID_FUNCTION && // by design - enough said. - errorCode != Interop.Errors.ERROR_ACCESS_DENIED) - throw Win32Marshal.GetExceptionForWin32Error(errorCode); - } - currentDirectory = sb.ToString(); - } - StringBuilderCache.Release(sb); - - return currentDirectory; - } - public static DateTimeOffset GetCreationTime(string fullPath) { Interop.Kernel32.WIN32_FILE_ATTRIBUTE_DATA data = new Interop.Kernel32.WIN32_FILE_ATTRIBUTE_DATA(); @@ -417,34 +355,56 @@ namespace System.IO public static void RemoveDirectory(string fullPath, bool recursive) { - // Do not recursively delete through reparse points. - if (!recursive || IsReparsePoint(fullPath)) + if (!recursive) { RemoveDirectoryInternal(fullPath, topLevel: true); return; } + Interop.Kernel32.WIN32_FIND_DATA findData = new Interop.Kernel32.WIN32_FIND_DATA(); + GetFindData(fullPath, ref findData); + if (IsNameSurrogateReparsePoint(ref findData)) + { + // Don't recurse + RemoveDirectoryInternal(fullPath, topLevel: true); + return; + } + // We want extended syntax so we can delete "extended" subdirectories and files // (most notably ones with trailing whitespace or periods) fullPath = PathInternal.EnsureExtendedPrefix(fullPath); - - Interop.Kernel32.WIN32_FIND_DATA findData = new Interop.Kernel32.WIN32_FIND_DATA(); RemoveDirectoryRecursive(fullPath, ref findData, topLevel: true); } - private static bool IsReparsePoint(string fullPath) + private static void GetFindData(string fullPath, ref Interop.Kernel32.WIN32_FIND_DATA findData) { - Interop.Kernel32.WIN32_FILE_ATTRIBUTE_DATA data = new Interop.Kernel32.WIN32_FILE_ATTRIBUTE_DATA(); - int errorCode = FillAttributeInfo(fullPath, ref data, returnErrorOnNotFound: true); - if (errorCode != Interop.Errors.ERROR_SUCCESS) + using (SafeFindHandle handle = Interop.Kernel32.FindFirstFile(PathInternal.TrimEndingDirectorySeparator(fullPath), ref findData)) { - // File not found doesn't make much sense coming from a directory delete. - if (errorCode == Interop.Errors.ERROR_FILE_NOT_FOUND) - errorCode = Interop.Errors.ERROR_PATH_NOT_FOUND; - throw Win32Marshal.GetExceptionForWin32Error(errorCode, fullPath); + if (handle.IsInvalid) + { + int errorCode = Marshal.GetLastWin32Error(); + // File not found doesn't make much sense coming from a directory delete. + if (errorCode == Interop.Errors.ERROR_FILE_NOT_FOUND) + errorCode = Interop.Errors.ERROR_PATH_NOT_FOUND; + throw Win32Marshal.GetExceptionForWin32Error(errorCode, fullPath); + } } + } - return (((FileAttributes)data.dwFileAttributes & FileAttributes.ReparsePoint) != 0); + private static bool IsNameSurrogateReparsePoint(ref Interop.Kernel32.WIN32_FIND_DATA data) + { + // Name surrogates are reparse points that point to other named entities local to the file system. + // Reparse points can be used for other types of files, notably OneDrive placeholder files. We + // should treat reparse points that are not name surrogates as any other directory, e.g. recurse + // into them. Surrogates should just be detached. + // + // See + // https://github.com/dotnet/corefx/issues/24250 + // https://msdn.microsoft.com/en-us/library/windows/desktop/aa365511.aspx + // https://msdn.microsoft.com/en-us/library/windows/desktop/aa365197.aspx + + return ((FileAttributes)data.dwFileAttributes & FileAttributes.ReparsePoint) != 0 + && (data.dwReserved0 & 0x20000000) != 0; // IsReparseTagNameSurrogate } private static void RemoveDirectoryRecursive(string fullPath, ref Interop.Kernel32.WIN32_FIND_DATA findData, bool topLevel) @@ -452,7 +412,7 @@ namespace System.IO int errorCode; Exception exception = null; - using (SafeFindHandle handle = Interop.Kernel32.FindFirstFile(Directory.EnsureTrailingDirectorySeparator(fullPath) + "*", ref findData)) + using (SafeFindHandle handle = Interop.Kernel32.FindFirstFile(Path.Join(fullPath, "*"), ref findData)) { if (handle.IsInvalid) throw Win32Marshal.GetExceptionForLastWin32Error(fullPath); @@ -481,9 +441,10 @@ namespace System.IO continue; string fileName = findData.cFileName.GetStringFromFixedBuffer(); - if ((findData.dwFileAttributes & (int)FileAttributes.ReparsePoint) == 0) + + if (!IsNameSurrogateReparsePoint(ref findData)) { - // Not a reparse point, recurse. + // Not a reparse point, or the reparse point isn't a name surrogate, recurse. try { RemoveDirectoryRecursive( @@ -499,12 +460,13 @@ namespace System.IO } else { - // Reparse point, don't recurse, just remove. (dwReserved0 is documented for this flag) + // Name surrogate reparse point, don't recurse, simply remove the directory. + // If a mount point, we have to delete the mount point first. if (findData.dwReserved0 == Interop.Kernel32.IOReparseOptions.IO_REPARSE_TAG_MOUNT_POINT) { // Mount point. Unmount using full path plus a trailing '\'. // (Note: This doesn't remove the underlying directory) - string mountPoint = Path.Combine(fullPath, fileName + PathHelpers.DirectorySeparatorCharAsString); + string mountPoint = Path.Join(fullPath, fileName, PathInternal.DirectorySeparatorCharAsString); if (!Interop.Kernel32.DeleteVolumeMountPoint(mountPoint) && exception == null) { errorCode = Marshal.GetLastWin32Error(); @@ -594,20 +556,6 @@ namespace System.IO } } - public static void SetCurrentDirectory(string fullPath) - { - if (!Interop.Kernel32.SetCurrentDirectory(fullPath)) - { - // If path doesn't exist, this sets last error to 2 (File - // not Found). LEGACY: This may potentially have worked correctly - // on Win9x, maybe. - int errorCode = Marshal.GetLastWin32Error(); - if (errorCode == Interop.Errors.ERROR_FILE_NOT_FOUND) - errorCode = Interop.Errors.ERROR_PATH_NOT_FOUND; - throw Win32Marshal.GetExceptionForWin32Error(errorCode, fullPath); - } - } - public static void SetLastAccessTime(string fullPath, DateTimeOffset time, bool asDirectory) { using (SafeFileHandle handle = OpenHandle(fullPath, asDirectory)) diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystemInfo.Unix.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystemInfo.Unix.cs index 6e3733e8a8..aac479e6e1 100644 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystemInfo.Unix.cs +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystemInfo.Unix.cs @@ -2,105 +2,69 @@ // 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.IO { partial class FileSystemInfo { - private const int NanosecondsPerTick = 100; + private FileStatus _fileStatus; - /// The last cached stat information about the file. - private Interop.Sys.FileStatus _fileStatus; - /// true if represents a symlink and the target of that symlink is a directory. - private bool _targetOfSymlinkIsDirectory; - - /// - /// Exists as a path as of last refresh. - /// - private bool _exists; - - /// - /// Whether we've successfully cached a stat structure. - /// -1 if we need to refresh _fileStatus, 0 if we've successfully cached one, - /// or any other value that serves as an errno error code from the - /// last time we tried and failed to refresh _fileStatus. - /// - private int _fileStatusInitialized = -1; - - internal void Invalidate() + protected FileSystemInfo() { - _fileStatusInitialized = -1; + FileStatus.Initialize(ref _fileStatus, this is DirectoryInfo); + } + + internal static unsafe FileSystemInfo Create(string fullPath, string fileName, ref FileStatus fileStatus) + { + FileSystemInfo info = fileStatus.InitiallyDirectory + ? (FileSystemInfo)new DirectoryInfo(fullPath, fileName: fileName, isNormalized: true) + : new FileInfo(fullPath, fileName: fileName, isNormalized: true); + + Debug.Assert(!PathInternal.IsPartiallyQualified(fullPath), $"'{fullPath}' should be fully qualified when constructed from directory enumeration"); + + info.Init(ref fileStatus); + return info; + } + + internal void Invalidate() => _fileStatus.Invalidate(); + + internal unsafe void Init(ref FileStatus fileStatus) + { + _fileStatus = fileStatus; + _fileStatus.EnsureStatInitialized(FullPath); } public FileAttributes Attributes { - get - { - EnsureStatInitialized(); - - if (!_exists) - return (FileAttributes)(-1); - - FileAttributes attrs = default(FileAttributes); - - if (IsDirectoryAssumesInitialized) // this is the one attribute where we follow symlinks - { - attrs |= FileAttributes.Directory; - } - if (IsReadOnlyAssumesInitialized) - { - attrs |= FileAttributes.ReadOnly; - } - if (IsSymlinkAssumesInitialized) - { - attrs |= FileAttributes.ReparsePoint; - } - - // If the filename starts with a period, it's hidden. Or if this is a directory ending in a slash, - // if the directory name starts with a period, it's hidden. - string fileName = Path.GetFileName(FullPath); - if (string.IsNullOrEmpty(fileName)) - { - fileName = Path.GetFileName(Path.GetDirectoryName(FullPath)); - } - if (!string.IsNullOrEmpty(fileName) && fileName[0] == '.') - { - attrs |= FileAttributes.Hidden; - } - - return attrs != default(FileAttributes) ? - attrs : - FileAttributes.Normal; - } - set - { - // Validate that only flags from the attribute are being provided. This is an - // approximation for the validation done by the Win32 function. - const FileAttributes allValidFlags = - FileAttributes.Archive | FileAttributes.Compressed | FileAttributes.Device | - FileAttributes.Directory | FileAttributes.Encrypted | FileAttributes.Hidden | - FileAttributes.Hidden | FileAttributes.IntegrityStream | FileAttributes.Normal | - FileAttributes.NoScrubData | FileAttributes.NotContentIndexed | FileAttributes.Offline | - FileAttributes.ReadOnly | FileAttributes.ReparsePoint | FileAttributes.SparseFile | - FileAttributes.System | FileAttributes.Temporary; - if ((value & ~allValidFlags) != 0) - { - throw new ArgumentException(SR.Arg_InvalidFileAttrs, nameof(value)); - } - - // The only thing we can reasonably change is whether the file object is readonly, - // just changing its permissions accordingly. - EnsureStatInitialized(); - - if (!_exists) - { - ThrowNotFound(FullPath); - } - - IsReadOnlyAssumesInitialized = (value & FileAttributes.ReadOnly) != 0; - _fileStatusInitialized = -1; - } + get => _fileStatus.GetAttributes(FullPath, Name); + set => _fileStatus.SetAttributes(FullPath, value); } + internal bool ExistsCore => _fileStatus.GetExists(FullPath); + + internal DateTimeOffset CreationTimeCore + { + get => _fileStatus.GetCreationTime(FullPath); + set => _fileStatus.SetCreationTime(FullPath, value); + } + + internal DateTimeOffset LastAccessTimeCore + { + get => _fileStatus.GetLastAccessTime(FullPath); + set => _fileStatus.SetLastAccessTime(FullPath, value); + } + + internal DateTimeOffset LastWriteTimeCore + { + get => _fileStatus.GetLastWriteTime(FullPath); + set => _fileStatus.SetLastWriteTime(FullPath, value); + } + + internal long LengthCore => _fileStatus.GetLength(FullPath); + + public void Refresh() => _fileStatus.Refresh(FullPath); + internal static void ThrowNotFound(string path) { // Windows distinguishes between whether the directory or the file isn't found, @@ -111,220 +75,11 @@ namespace System.IO // being manipulated concurrently with these checks) is that we throw a // FileNotFoundException instead of DirectoryNotFoundException. - bool directoryError = !Directory.Exists(Path.GetDirectoryName(PathHelpers.TrimEndingDirectorySeparator(path))); - throw Interop.GetExceptionForIoErrno(new Interop.ErrorInfo(Interop.Error.ENOENT), path, directoryError); + bool directoryError = !Directory.Exists(Path.GetDirectoryName(PathInternal.TrimEndingDirectorySeparator(path))); + throw Interop.GetExceptionForIoErrno(new Interop.ErrorInfo(Interop.Error.ENOENT), path, directoryError); } - /// Gets whether stat reported this system object as a directory. - private bool IsDirectoryAssumesInitialized => - (_fileStatus.Mode & Interop.Sys.FileTypes.S_IFMT) == Interop.Sys.FileTypes.S_IFDIR || - (IsSymlinkAssumesInitialized && _targetOfSymlinkIsDirectory); - - /// Gets whether stat reported this system object as a symlink. - private bool IsSymlinkAssumesInitialized => - (_fileStatus.Mode & Interop.Sys.FileTypes.S_IFMT) == Interop.Sys.FileTypes.S_IFLNK; - - /// - /// Gets or sets whether the file is read-only. This is based on the read/write/execute - /// permissions of the object. - /// - private bool IsReadOnlyAssumesInitialized - { - get - { - Interop.Sys.Permissions readBit, writeBit; - if (_fileStatus.Uid == Interop.Sys.GetEUid()) // does the user effectively own the file? - { - readBit = Interop.Sys.Permissions.S_IRUSR; - writeBit = Interop.Sys.Permissions.S_IWUSR; - } - else if (_fileStatus.Gid == Interop.Sys.GetEGid()) // does the user belong to a group that effectively owns the file? - { - readBit = Interop.Sys.Permissions.S_IRGRP; - writeBit = Interop.Sys.Permissions.S_IWGRP; - } - else // everyone else - { - readBit = Interop.Sys.Permissions.S_IROTH; - writeBit = Interop.Sys.Permissions.S_IWOTH; - } - - return - (_fileStatus.Mode & (int)readBit) != 0 && // has read permission - (_fileStatus.Mode & (int)writeBit) == 0; // but not write permission - } - set - { - int newMode = _fileStatus.Mode; - if (value) // true if going from writable to readable, false if going from readable to writable - { - // Take away all write permissions from user/group/everyone - newMode &= ~(int)(Interop.Sys.Permissions.S_IWUSR | Interop.Sys.Permissions.S_IWGRP | Interop.Sys.Permissions.S_IWOTH); - } - else if ((newMode & (int)Interop.Sys.Permissions.S_IRUSR) != 0) - { - // Give write permission to the owner if the owner has read permission - newMode |= (int)Interop.Sys.Permissions.S_IWUSR; - } - - // Change the permissions on the file - if (newMode != _fileStatus.Mode) - { - bool isDirectory = this is DirectoryInfo; - Interop.CheckIo(Interop.Sys.ChMod(FullPath, newMode), FullPath, isDirectory); - } - } - } - - internal bool ExistsCore - { - get - { - if (_fileStatusInitialized == -1) - { - Refresh(); - } - - return - _exists && - (this is DirectoryInfo) == IsDirectoryAssumesInitialized; - } - } - - internal DateTimeOffset CreationTimeCore - { - get - { - EnsureStatInitialized(); - if (!_exists) - return DateTimeOffset.FromFileTime(0); - - if ((_fileStatus.Flags & Interop.Sys.FileStatusFlags.HasBirthTime) != 0) - return UnixTimeToDateTimeOffset(_fileStatus.BirthTime, _fileStatus.BirthTimeNsec); - - // fall back to the oldest time we have in between change and modify time - if (_fileStatus.MTime < _fileStatus.CTime || - (_fileStatus.MTime == _fileStatus.CTime && _fileStatus.MTimeNsec < _fileStatus.CTimeNsec)) - return UnixTimeToDateTimeOffset(_fileStatus.MTime, _fileStatus.MTimeNsec); - - return UnixTimeToDateTimeOffset(_fileStatus.CTime, _fileStatus.CTimeNsec); - } - set - { - // There isn't a reliable way to set this; however, we can't just do nothing since the - // FileSystemWatcher specifically looks for this call to make a Metadata Change, so we - // should set the LastAccessTime of the file to cause the metadata change we need. - LastAccessTime = LastAccessTime; - } - } - - internal DateTimeOffset LastAccessTimeCore - { - get - { - EnsureStatInitialized(); - if (!_exists) - return DateTimeOffset.FromFileTime(0); - return UnixTimeToDateTimeOffset(_fileStatus.ATime, _fileStatus.ATimeNsec); - } - set { SetAccessWriteTimes(value.ToUnixTimeSeconds(), null); } - } - - internal DateTimeOffset LastWriteTimeCore - { - get - { - EnsureStatInitialized(); - if (!_exists) - return DateTimeOffset.FromFileTime(0); - return UnixTimeToDateTimeOffset(_fileStatus.MTime, _fileStatus.MTimeNsec); - } - set { SetAccessWriteTimes(null, value.ToUnixTimeSeconds()); } - } - - private DateTimeOffset UnixTimeToDateTimeOffset(long seconds, long nanoseconds) - { - return DateTimeOffset.FromUnixTimeSeconds(seconds).AddTicks(nanoseconds / NanosecondsPerTick).ToLocalTime(); - } - - private void SetAccessWriteTimes(long? accessTime, long? writeTime) - { - _fileStatusInitialized = -1; // force a refresh so that we have an up-to-date times for values not being overwritten - EnsureStatInitialized(); - Interop.Sys.UTimBuf buf; - // we use utime() not utimensat() so we drop the subsecond part - buf.AcTime = accessTime ?? _fileStatus.ATime; - buf.ModTime = writeTime ?? _fileStatus.MTime; - bool isDirectory = this is DirectoryInfo; - Interop.CheckIo(Interop.Sys.UTime(FullPath, ref buf), FullPath, isDirectory); - _fileStatusInitialized = -1; - } - - internal long LengthCore - { - get - { - EnsureStatInitialized(); - return _fileStatus.Size; - } - } - - public void Refresh() - { - // This should not throw, instead we store the result so that we can throw it - // when someone actually accesses a property. - - // Use lstat to get the details on the object, without following symlinks. - // If it is a symlink, then subsequently get details on the target of the symlink, - // storing those results separately. We only report failure if the initial - // lstat fails, as a broken symlink should still report info on exists, attributes, etc. - _targetOfSymlinkIsDirectory = false; - string path = PathHelpers.TrimEndingDirectorySeparator(FullPath); - int result = Interop.Sys.LStat(path, out _fileStatus); - if (result < 0) - { - Interop.ErrorInfo errorInfo = Interop.Sys.GetLastErrorInfo(); - - // This should never set the error if the file can't be found. - // (see the Windows refresh passing returnErrorOnNotFound: false). - if (errorInfo.Error == Interop.Error.ENOENT - || errorInfo.Error == Interop.Error.ENOTDIR) - { - _fileStatusInitialized = 0; - _exists = false; - } - else - { - _fileStatusInitialized = errorInfo.RawErrno; - } - return; - } - - _exists = true; - - Interop.Sys.FileStatus targetStatus; - if ((_fileStatus.Mode & Interop.Sys.FileTypes.S_IFMT) == Interop.Sys.FileTypes.S_IFLNK && - Interop.Sys.Stat(path, out targetStatus) >= 0) - { - _targetOfSymlinkIsDirectory = (targetStatus.Mode & Interop.Sys.FileTypes.S_IFMT) == Interop.Sys.FileTypes.S_IFDIR; - } - - _fileStatusInitialized = 0; - } - - private void EnsureStatInitialized() - { - if (_fileStatusInitialized == -1) - { - Refresh(); - } - - if (_fileStatusInitialized != 0) - { - int errno = _fileStatusInitialized; - _fileStatusInitialized = -1; - throw Interop.GetExceptionForIoErrno(new Interop.ErrorInfo(errno), FullPath); - } - } + // There is no special handling for Unix- see Windows code for the reason we do this + internal string NormalizedPath => FullPath; } } diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystemInfo.Windows.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystemInfo.Windows.cs index 41e08650dd..01bd52e5e6 100644 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystemInfo.Windows.cs +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystemInfo.Windows.cs @@ -2,7 +2,8 @@ // 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.Security; +using System.Diagnostics; +using System.IO.Enumeration; namespace System.IO { @@ -13,10 +14,31 @@ namespace System.IO // Cache any error retrieving the file/directory information // We use this field in conjunction with the Refresh method which should never throw. - // If we succeed we store a zero, on failure we store the HResult so that we can + // If we succeed we store a zero, on failure we store the error code so that we can // throw an appropriate error when attempting to access the cached info. private int _dataInitialized = -1; + protected FileSystemInfo() + { + } + + internal static unsafe FileSystemInfo Create(string fullPath, ref FileSystemEntry findData) + { + FileSystemInfo info = findData.IsDirectory + ? (FileSystemInfo) new DirectoryInfo(fullPath, fileName: new string(findData.FileName), isNormalized: true) + : new FileInfo(fullPath, fileName: new string(findData.FileName), isNormalized: true); + + Debug.Assert(!PathInternal.IsPartiallyQualified(fullPath), $"'{fullPath}' should be fully qualified when constructed from directory enumeration"); + + info.Init(findData._info); + return info; + } + + internal void Invalidate() + { + _dataInitialized = -1; + } + internal unsafe void Init(Interop.NtDll.FILE_FULL_DIR_INFORMATION* info) { _data.dwFileAttributes = (int)info->FileAttributes; @@ -128,5 +150,10 @@ namespace System.IO // when someone actually accesses a property _dataInitialized = FileSystem.FillAttributeInfo(FullPath, ref _data, returnErrorOnNotFound: false); } + + // If we're opened around a enumerated path that ends in a period or space we need to be able to + // act on the path normally (open streams/writers/etc.) + internal string NormalizedPath + => PathInternal.EndsWithPeriodOrSpace(FullPath) ? PathInternal.EnsureExtendedPrefix(FullPath) : FullPath; } } diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystemInfo.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystemInfo.cs index 5d2e18e0df..9f243dd765 100644 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystemInfo.cs +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystemInfo.cs @@ -2,27 +2,18 @@ // 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; -using System.Collections; -using System.Security; -using Microsoft.Win32; -using System.Text; -using System.Runtime.InteropServices; using System.Runtime.Serialization; -using System.Runtime.Versioning; namespace System.IO { [Serializable] public abstract partial class FileSystemInfo : MarshalByRefObject, ISerializable { + // FullPath and OriginalPath are documented fields protected string FullPath; // fully qualified path of the file or directory protected string OriginalPath; // path passed in by the user - private string _displayPath = ""; // path that can be displayed to the user - protected FileSystemInfo() - { - } + internal string _name; protected FileSystemInfo(SerializationInfo info, StreamingContext context) { @@ -35,19 +26,12 @@ namespace System.IO } // Full path of the directory/file - public virtual string FullName - { - get - { - return FullPath; - } - } + public virtual string FullName => FullPath; public string Extension { get { - // GetFullPathInternal would have already stripped out the terminating "." if present. int length = FullPath.Length; for (int i = length; --i >= 0;) { @@ -61,17 +45,22 @@ namespace System.IO } } - // For files name of the file is returned, for directories the last directory in hierarchy is returned if possible, - // otherwise the fully qualified name s returned - public abstract string Name - { - get; - } + public virtual string Name => _name; // Whether a file/directory exists - public abstract bool Exists + public virtual bool Exists { - get; + get + { + try + { + return ExistsCore; + } + catch + { + return false; + } + } } // Delete a file/directory @@ -79,94 +68,44 @@ namespace System.IO public DateTime CreationTime { - get - { - // depends on the security check in get_CreationTimeUtc - return CreationTimeUtc.ToLocalTime(); - } - set - { - CreationTimeUtc = value.ToUniversalTime(); - } + get => CreationTimeUtc.ToLocalTime(); + set => CreationTimeUtc = value.ToUniversalTime(); } public DateTime CreationTimeUtc { - get - { - return CreationTimeCore.UtcDateTime; - } - - set - { - CreationTimeCore = File.GetUtcDateTimeOffset(value); - } + get => CreationTimeCore.UtcDateTime; + set => CreationTimeCore = File.GetUtcDateTimeOffset(value); } public DateTime LastAccessTime { - get - { - // depends on the security check in get_LastAccessTimeUtc - return LastAccessTimeUtc.ToLocalTime(); - } - set - { - LastAccessTimeUtc = value.ToUniversalTime(); - } + get => LastAccessTimeUtc.ToLocalTime(); + set => LastAccessTimeUtc = value.ToUniversalTime(); } public DateTime LastAccessTimeUtc { - get - { - return LastAccessTimeCore.UtcDateTime; - } - - set - { - LastAccessTimeCore = File.GetUtcDateTimeOffset(value); - } + get => LastAccessTimeCore.UtcDateTime; + set => LastAccessTimeCore = File.GetUtcDateTimeOffset(value); } public DateTime LastWriteTime { - get - { - // depends on the security check in get_LastWriteTimeUtc - return LastWriteTimeUtc.ToLocalTime(); - } - - set - { - LastWriteTimeUtc = value.ToUniversalTime(); - } + get => LastWriteTimeUtc.ToLocalTime(); + set => LastWriteTimeUtc = value.ToUniversalTime(); } public DateTime LastWriteTimeUtc { - get - { - return LastWriteTimeCore.UtcDateTime; - } - - set - { - LastWriteTimeCore = File.GetUtcDateTimeOffset(value); - } + get => LastWriteTimeCore.UtcDateTime; + set => LastWriteTimeCore = File.GetUtcDateTimeOffset(value); } - internal string DisplayPath - { - get - { - return _displayPath; - } - set - { - _displayPath = value; - } - } + /// + /// Returns the original path. Use FullName or Name properties for the full path or file/directory name. + /// + public override string ToString() => OriginalPath ?? string.Empty; } } diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/FindEnumerable.Win32.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/FindEnumerable.Win32.cs deleted file mode 100644 index a978d7cb85..0000000000 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/FindEnumerable.Win32.cs +++ /dev/null @@ -1,43 +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.IO -{ - internal partial class FindEnumerable - { - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public unsafe bool GetData() - { - Debug.Assert(_directoryHandle != (IntPtr)(-1) && _directoryHandle != IntPtr.Zero && !_lastEntryFound); - - int status = Interop.NtDll.NtQueryDirectoryFile( - FileHandle: _directoryHandle, - Event: IntPtr.Zero, - ApcRoutine: IntPtr.Zero, - ApcContext: IntPtr.Zero, - IoStatusBlock: out Interop.NtDll.IO_STATUS_BLOCK statusBlock, - FileInformation: _buffer, - Length: (uint)_buffer.Length, - FileInformationClass: Interop.NtDll.FILE_INFORMATION_CLASS.FileFullDirectoryInformation, - ReturnSingleEntry: Interop.BOOLEAN.FALSE, - FileName: null, - RestartScan: Interop.BOOLEAN.FALSE); - - switch ((uint)status) - { - case Interop.StatusOptions.STATUS_NO_MORE_FILES: - DirectoryFinished(); - return false; - case Interop.StatusOptions.STATUS_SUCCESS: - Debug.Assert(statusBlock.Information.ToInt64() != 0); - return true; - default: - throw Win32Marshal.GetExceptionForWin32Error((int)Interop.NtDll.RtlNtStatusToDosError(status), _currentPath); - } - } - } -} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/FindEnumerable.Windows.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/FindEnumerable.Windows.cs deleted file mode 100644 index 7e64e97373..0000000000 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/FindEnumerable.Windows.cs +++ /dev/null @@ -1,251 +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; -using System.Collections; -using System.Collections.Generic; -using System.Runtime.CompilerServices; -using System.Runtime.ConstrainedExecution; -using System.Runtime.InteropServices; -using System.Threading; - -namespace System.IO -{ - internal unsafe partial class FindEnumerable : CriticalFinalizerObject, IEnumerable, IEnumerator - { - private readonly string _originalFullPath; - private readonly string _originalUserPath; - private readonly bool _recursive; - private readonly FindTransform _transform; - private readonly FindPredicate _predicate; - private readonly TState _state; - - private object _lock = new object(); - private int _enumeratorCreated; - - private Interop.NtDll.FILE_FULL_DIR_INFORMATION* _info; - private TResult _current; - - private byte[] _buffer; - private IntPtr _directoryHandle; - private string _currentPath; - private bool _lastEntryFound; - private Queue<(IntPtr Handle, string Path)> _pending; - private GCHandle _pinnedBuffer; - - /// - /// Encapsulates a find operation. - /// - /// The directory to search in. - public FindEnumerable( - string directory, - FindTransform transform, - FindPredicate predicate, - TState state = default, - bool recursive = false) - { - _originalUserPath = directory; - _originalFullPath = Path.GetFullPath(directory); - _recursive = recursive; - _predicate = predicate ?? throw new ArgumentNullException(nameof(predicate)); - _transform = transform ?? throw new ArgumentNullException(nameof(transform)); - _state = state; - Initialize(); - } - - private FindEnumerable( - string originalUserPath, - string originalFullPath, - FindTransform transform, - FindPredicate predicate, - TState state, - bool recursive) - { - _originalUserPath = originalUserPath; - _originalFullPath = originalFullPath; - _predicate = predicate; - _transform = transform; - _state = state; - _recursive = recursive; - Initialize(); - } - - /// - /// Simple wrapper to allow creating a file handle for an existing directory. - /// - public static IntPtr CreateDirectoryHandle(string path) - { - IntPtr handle = Interop.Kernel32.CreateFile_IntPtr( - path, - Interop.Kernel32.FileOperations.FILE_LIST_DIRECTORY, - FileShare.ReadWrite | FileShare.Delete, - FileMode.Open, - Interop.Kernel32.FileOperations.FILE_FLAG_BACKUP_SEMANTICS); - - if (handle == IntPtr.Zero || handle == (IntPtr)(-1)) - { - // Historically we throw directory not found rather than file not found - int error = Marshal.GetLastWin32Error(); - if (error == Interop.Errors.ERROR_FILE_NOT_FOUND) - error = Interop.Errors.ERROR_PATH_NOT_FOUND; - - throw Win32Marshal.GetExceptionForWin32Error(error, path); - } - - return handle; - } - - public IEnumerator GetEnumerator() - { - if (Interlocked.Exchange(ref _enumeratorCreated, 1) == 0) - { - return this; - } - else - { - return new FindEnumerable(_originalUserPath, _originalFullPath, _transform, _predicate, _state, _recursive); - } - } - - private void Initialize() - { - _currentPath = _originalFullPath; - _buffer = ArrayPool.Shared.Rent(4096); - _pinnedBuffer = GCHandle.Alloc(_buffer, GCHandleType.Pinned); - if (_recursive) - _pending = new Queue<(IntPtr, string)>(); - _directoryHandle = CreateDirectoryHandle(_originalFullPath); - } - - IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); - - public TResult Current => _current; - - object IEnumerator.Current => Current; - - public bool MoveNext() - { - if (_lastEntryFound) - return false; - - lock (_lock) - { - if (_lastEntryFound) - return false; - - RawFindData findData = default; - do - { - FindNextFile(); - if (!_lastEntryFound && _info != null) - { - // If needed, stash any subdirectories to process later - if (_recursive && (_info->FileAttributes & FileAttributes.Directory) != 0 - && !PathHelpers.IsDotOrDotDot(_info->FileName)) - { - string subDirectory = PathHelpers.CombineNoChecks(_currentPath, _info->FileName); - IntPtr subDirectoryHandle = CreateDirectoryHandle(subDirectory); - try - { - // It is possible this might allocate and run out of memory - _pending.Enqueue((subDirectoryHandle, subDirectory)); - } - catch - { - Interop.Kernel32.CloseHandle(subDirectoryHandle); - throw; - } - } - - findData = new RawFindData(_info, _currentPath, _originalFullPath, _originalUserPath); - } - } while (!_lastEntryFound && !_predicate(ref findData, _state)); - - if (!_lastEntryFound) - _current = _transform(ref findData); - - return !_lastEntryFound; - } - } - - private unsafe void FindNextFile() - { - Interop.NtDll.FILE_FULL_DIR_INFORMATION* info = _info; - if (info != null && info->NextEntryOffset != 0) - { - // We're already in a buffer and have another entry - _info = (Interop.NtDll.FILE_FULL_DIR_INFORMATION*)((byte*)info + info->NextEntryOffset); - return; - } - - // We need more data - if (GetData()) - _info = (Interop.NtDll.FILE_FULL_DIR_INFORMATION*)_pinnedBuffer.AddrOfPinnedObject(); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void DirectoryFinished() - { - _info = null; - if (_pending == null || _pending.Count == 0) - { - _lastEntryFound = true; - } - else - { - // Grab the next directory to parse - Interop.Kernel32.CloseHandle(_directoryHandle); - (_directoryHandle, _currentPath) = _pending.Dequeue(); - FindNextFile(); - } - } - - public void Reset() - { - throw new NotSupportedException(); - } - - public void Dispose() - { - Dispose(disposing: true); - GC.SuppressFinalize(this); - } - - protected void Dispose(bool disposing) - { - // It is possible to fail to allocate the lock, but the finalizer will still run - if (_lock != null) - { - lock (_lock) - { - _lastEntryFound = true; - - // Don't ever close a valid handle twice as they can be reused- set to zero to ensure this - Interop.Kernel32.CloseHandle(_directoryHandle); - _directoryHandle = IntPtr.Zero; - - if (_recursive && _pending != null) - { - while (_pending.Count > 0) - Interop.Kernel32.CloseHandle(_pending.Dequeue().Handle); - _pending = null; - } - - if (_pinnedBuffer.IsAllocated) - _pinnedBuffer.Free(); - - if (_buffer != null) - ArrayPool.Shared.Return(_buffer); - - _buffer = null; - } - } - } - - ~FindEnumerable() - { - Dispose(disposing: false); - } - } -} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/FindEnumerableFactory.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/FindEnumerableFactory.cs deleted file mode 100644 index 1202ac7372..0000000000 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/FindEnumerableFactory.cs +++ /dev/null @@ -1,138 +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.IO -{ - internal static class FindEnumerableFactory - { - internal static void NormalizeInputs(ref string directory, ref string expression) - { - if (PathHelpers.IsPathRooted(expression)) - throw new ArgumentException(SR.Arg_Path2IsRooted, nameof(expression)); - - // We always allowed breaking the passed in directory and filter to be separated - // any way the user wanted. Looking for "C:\foo\*.cs" could be passed as "C:\" and - // "foo\*.cs" or "C:\foo" and "*.cs", for example. As such we need to combine and - // split the inputs if the expression contains a directory separator. - // - // We also allowed for expression to be "foo\" which would translate to "foo\*". - - ReadOnlySpan directoryName = PathHelpers.GetDirectoryNameNoChecks(expression.AsReadOnlySpan()); - - if (directoryName.Length != 0) - { - // Need to fix up the input paths - directory = PathHelpers.CombineNoChecks(directory, directoryName); - expression = expression.Substring(directoryName.Length + 1); - } - - // Historically we always treated "." as "*" - if (string.IsNullOrEmpty(expression) || expression == "." || expression == "*.*") - expression = "*"; - } - - internal static FindEnumerable UserFiles(string directory, - string expression = "*", - bool recursive = false) - { - return new FindEnumerable( - directory, - (ref RawFindData findData) => FindTransforms.AsUserFullPath(ref findData), - (ref RawFindData findData, string expr) => - { - return FindPredicates.NotDotOrDotDot(ref findData) - && !FindPredicates.IsDirectory(ref findData) - && DosMatcher.MatchPattern(expr, findData.FileName, ignoreCase: true); - }, - DosMatcher.TranslateExpression(expression), - recursive); - } - - internal static FindEnumerable UserDirectories(string directory, - string expression = "*", - bool recursive = false) - { - return new FindEnumerable( - directory, - (ref RawFindData findData) => FindTransforms.AsUserFullPath(ref findData), - (ref RawFindData findData, string expr) => - { - return FindPredicates.NotDotOrDotDot(ref findData) - && FindPredicates.IsDirectory(ref findData) - && DosMatcher.MatchPattern(expr, findData.FileName, ignoreCase: true); - }, - DosMatcher.TranslateExpression(expression), - recursive); - } - - internal static FindEnumerable UserEntries(string directory, - string expression = "*", - bool recursive = false) - { - return new FindEnumerable( - directory, - (ref RawFindData findData) => FindTransforms.AsUserFullPath(ref findData), - (ref RawFindData findData, string expr) => - { - return FindPredicates.NotDotOrDotDot(ref findData) - && DosMatcher.MatchPattern(expr, findData.FileName, ignoreCase: true); - }, - DosMatcher.TranslateExpression(expression), - recursive); - } - - internal static FindEnumerable FileInfos( - string directory, - string expression = "*", - bool recursive = false) - { - return new FindEnumerable( - directory, - (ref RawFindData findData) => FindTransforms.AsFileInfo(ref findData), - (ref RawFindData findData, string expr) => - { - return FindPredicates.NotDotOrDotDot(ref findData) - && !FindPredicates.IsDirectory(ref findData) - && DosMatcher.MatchPattern(expr, findData.FileName, ignoreCase: true); - }, - DosMatcher.TranslateExpression(expression), - recursive); - } - - internal static FindEnumerable DirectoryInfos( - string directory, - string expression = "*", - bool recursive = false) - { - return new FindEnumerable( - directory, - (ref RawFindData findData) => FindTransforms.AsDirectoryInfo(ref findData), - (ref RawFindData findData, string expr) => - { - return FindPredicates.NotDotOrDotDot(ref findData) - && FindPredicates.IsDirectory(ref findData) - && DosMatcher.MatchPattern(expr, findData.FileName, ignoreCase: true); - }, - DosMatcher.TranslateExpression(expression), - recursive); - } - - internal static FindEnumerable FileSystemInfos( - string directory, - string expression = "*", - bool recursive = false) - { - return new FindEnumerable( - directory, - (ref RawFindData findData) => FindTransforms.AsFileSystemInfo(ref findData), - (ref RawFindData findData, string expr) => - { - return FindPredicates.NotDotOrDotDot(ref findData) - && DosMatcher.MatchPattern(expr, findData.FileName, ignoreCase: true); - }, - DosMatcher.TranslateExpression(expression), - recursive); - } - } -} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/FindPredicate.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/FindPredicate.cs deleted file mode 100644 index 2e52eda3db..0000000000 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/FindPredicate.cs +++ /dev/null @@ -1,11 +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.IO -{ - /// - /// Interface for filtering out find results. - /// - internal delegate bool FindPredicate(ref RawFindData findData, TState state); -} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/FindPredicates.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/FindPredicates.cs deleted file mode 100644 index 9d90aed377..0000000000 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/FindPredicates.cs +++ /dev/null @@ -1,18 +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.IO -{ - internal static partial class FindPredicates - { - internal static bool NotDotOrDotDot(ref RawFindData findData) => !PathHelpers.IsDotOrDotDot(findData.FileName); - - internal static bool IsDirectory(ref RawFindData findData) - { - FileAttributes attributes = findData.Attributes; - return attributes != (FileAttributes)(-1) - && (attributes & FileAttributes.Directory) != 0; - } - } -} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/FindTransforms.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/FindTransforms.cs deleted file mode 100644 index db0590a35e..0000000000 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/FindTransforms.cs +++ /dev/null @@ -1,40 +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.IO -{ - internal static partial class FindTransforms - { - internal static DirectoryInfo AsDirectoryInfo(ref RawFindData findData) - { - string fileName = new string(findData.FileName); - return new DirectoryInfo(PathHelpers.CombineNoChecks(findData.Directory, fileName), fileName, ref findData); - } - - internal static FileInfo AsFileInfo(ref RawFindData findData) - { - string fileName = new string(findData.FileName); - return new FileInfo(PathHelpers.CombineNoChecks(findData.Directory, fileName), fileName, ref findData); - } - - internal static FileSystemInfo AsFileSystemInfo(ref RawFindData findData) - { - string fileName = new string(findData.FileName); - string fullPath = PathHelpers.CombineNoChecks(findData.Directory, fileName); - - return (findData.Attributes & FileAttributes.Directory) != 0 - ? (FileSystemInfo)new DirectoryInfo(fullPath, fileName, ref findData) - : (FileSystemInfo)new FileInfo(fullPath, fileName, ref findData); - } - - /// - /// Returns the full path for find results, based off of the initially provided path. - /// - internal static string AsUserFullPath(ref RawFindData findData) - { - ReadOnlySpan subdirectory = findData.Directory.AsReadOnlySpan().Slice(findData.OriginalDirectory.Length); - return PathHelpers.CombineNoChecks(findData.OriginalUserDirectory, subdirectory, findData.FileName); - } - } -} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/MatchCasing.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/MatchCasing.cs new file mode 100644 index 0000000000..d8dfbfcc36 --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/MatchCasing.cs @@ -0,0 +1,24 @@ +// 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.IO +{ + public enum MatchCasing + { + /// + /// Match the default casing for the given platform + /// + PlatformDefault, + + /// + /// Match respecting character casing + /// + CaseSensitive, + + /// + /// Match ignoring character casing + /// + CaseInsensitive + } +} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/MatchType.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/MatchType.cs new file mode 100644 index 0000000000..0bdf89b3c7 --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/src/System/IO/MatchType.cs @@ -0,0 +1,20 @@ +// 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.IO +{ + public enum MatchType + { + /// + /// Match using '*' and '?' wildcards. + /// + Simple, + + /// + /// Match using Win32 DOS style matching semantics. '*', '?', '<', '>', and '"' + /// are all considered wildcards. + /// + Win32 + } +} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/PathHelpers.Unix.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/PathHelpers.Unix.cs deleted file mode 100644 index 47dcd9b46d..0000000000 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/PathHelpers.Unix.cs +++ /dev/null @@ -1,21 +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.IO -{ - internal static partial class PathHelpers - { - internal static bool ShouldReviseDirectoryPathToCurrent(string path) - { - // Unlike on Windows, there are no special cases on Unix where we'd want to ignore - // user-provided path and instead automatically use the current directory. - return false; - } - - internal static string TrimEndingDirectorySeparator(string path) => - path.Length > 1 && PathInternal.IsDirectorySeparator(path[path.Length - 1]) ? // exclude root "/" - path.Substring(0, path.Length - 1) : - path; - } -} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/PathHelpers.Windows.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/PathHelpers.Windows.cs deleted file mode 100644 index 990527577b..0000000000 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/PathHelpers.Windows.cs +++ /dev/null @@ -1,48 +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.Runtime.InteropServices; - -namespace System.IO -{ - internal static partial class PathInternal - { - internal static unsafe int GetRootLength(ReadOnlySpan path) - { - fixed (char* p = &MemoryMarshal.GetReference(path)) - { - return (int)GetRootLength(p, (uint)path.Length); - } - } - } - - internal static partial class PathHelpers - { - internal static bool ShouldReviseDirectoryPathToCurrent(string path) - { - // In situations where this method is invoked, ":" should be special-cased - // to instead go to the current directory. - return path != null && path.Length == 2 && path[1] == ':'; - } - - internal static string TrimEndingDirectorySeparator(string path) => - EndsInDirectorySeparator(path) ? - path.Substring(0, path.Length - 1) : - path; - - public static bool IsPathRooted(string path) - { - // Want to avoid PathInternal.CheckInvalidPathChars on Path.IsPathRooted - - if (path != null) - { - int length = path.Length; - if ((length >= 1 && PathInternal.IsDirectorySeparator(path[0])) || - (length >= 2 && PathInternal.IsValidDriveChar(path[0]) && path[1] == Path.VolumeSeparatorChar)) - return true; - } - return false; - } - } -} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/PathHelpers.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/PathHelpers.cs deleted file mode 100644 index dc574c7833..0000000000 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/PathHelpers.cs +++ /dev/null @@ -1,192 +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.Runtime.InteropServices; - -namespace System.IO -{ - // Helper methods related to paths. Some of these are copies of - // internal members of System.IO.Path from System.Runtime.Extensions.dll. - internal static partial class PathHelpers - { - // Array of the separator chars - internal static readonly char[] DirectorySeparatorChars = new char[] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar }; - - // string-representation of the directory-separator character, used when appending the character to another - // string so as to avoid the boxing of the character when calling string.Concat(..., object). - internal static readonly string DirectorySeparatorCharAsString = Path.DirectorySeparatorChar.ToString(); - - // System.IO.Path has both public Combine and internal InternalCombine - // members. InternalCombine performs these extra validations on the second - // argument. This provides a convenient helper to maintain this extra - // validation when porting code from Path.InternalCombine to Path.Combine. - internal static void ThrowIfEmptyOrRootedPath(string path2) - { - if (path2 == null) - throw new ArgumentNullException(nameof(path2)); - if (path2.Length == 0) - throw new ArgumentException(SR.Argument_PathEmpty, nameof(path2)); - if (Path.IsPathRooted(path2)) - throw new ArgumentException(SR.Arg_Path2IsRooted, nameof(path2)); - } - - internal static bool IsRoot(string path) - { - return path.Length == PathInternal.GetRootLength(path); - } - - internal static bool EndsInDirectorySeparator(string path) - { - return path.Length > 0 && PathInternal.IsDirectorySeparator(path[path.Length - 1]); - } - - /// - /// Combines two paths. Does no validation of paths, only concatenates the paths - /// and places a directory separator between them if needed. - /// - internal static string CombineNoChecks(string first, ReadOnlySpan second) - { - if (string.IsNullOrEmpty(first)) - return second.Length == 0 - ? string.Empty - : new string(second); - - if (second.Length == 0) - return first; - - return CombineNoChecksInternal(first.AsReadOnlySpan(), second); - } - - /// - /// Combines two paths. Does no validation of paths, only concatenates the paths - /// and places a directory separator between them if needed. - /// - internal static string CombineNoChecks(ReadOnlySpan first, ReadOnlySpan second) - { - if (first.Length == 0) - return second.Length == 0 - ? string.Empty - : new string(second); - - if (second.Length == 0) - return new string(first); - - return CombineNoChecksInternal(first, second); - } - - /// - /// Combines three paths. Does no validation of paths, only concatenates the paths - /// and places a directory separator between them if needed. - /// - internal static string CombineNoChecks(string first, ReadOnlySpan second, ReadOnlySpan third) - { - if (string.IsNullOrEmpty(first)) - return CombineNoChecks(second, third); - - if (second.Length == 0) - return CombineNoChecks(first, third); - - if (third.Length == 0) - return CombineNoChecks(first, second); - - return CombineNoChecksInternal(first.AsReadOnlySpan(), second, third); - } - - /// - /// Combines two paths. Does no validation of paths, only concatenates the paths - /// and places a directory separator between them if needed. - /// - internal unsafe static string CombineNoChecks(string first, string second) - { - if (string.IsNullOrEmpty(first)) - return string.IsNullOrEmpty(second) ? string.Empty : second; - - if (string.IsNullOrEmpty(second)) - return first; - - return CombineNoChecksInternal(first.AsReadOnlySpan(), second.AsReadOnlySpan()); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private unsafe static string CombineNoChecksInternal(ReadOnlySpan first, ReadOnlySpan second) - { - Debug.Assert(first.Length > 0 && second.Length > 0, "should have dealt with empty paths"); - - bool hasSeparator = PathInternal.IsDirectorySeparator(first[first.Length - 1]) - || PathInternal.IsDirectorySeparator(second[0]); - - fixed (char* f = &MemoryMarshal.GetReference(first), s = &MemoryMarshal.GetReference(second)) - { - return string.Create( - first.Length + second.Length + (hasSeparator ? 0 : 1), - (First: (IntPtr)f, FirstLength: first.Length, Second: (IntPtr)s, SecondLength: second.Length, HasSeparator: hasSeparator), - (destination, state) => - { - new Span((char*)state.First, state.FirstLength).CopyTo(destination); - if (!state.HasSeparator) - destination[state.FirstLength] = Path.DirectorySeparatorChar; - new Span((char*)state.Second, state.SecondLength).CopyTo(destination.Slice(state.FirstLength + (state.HasSeparator ? 0 : 1))); - }); - } - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private unsafe static string CombineNoChecksInternal(ReadOnlySpan first, ReadOnlySpan second, ReadOnlySpan third) - { - Debug.Assert(first.Length > 0 && second.Length > 0 && third.Length > 0, "should have dealt with empty paths"); - - bool firstHasSeparator = PathInternal.IsDirectorySeparator(first[first.Length - 1]) - || PathInternal.IsDirectorySeparator(second[0]); - bool thirdHasSeparator = PathInternal.IsDirectorySeparator(second[second.Length - 1]) - || PathInternal.IsDirectorySeparator(third[0]); - - fixed (char* f = &MemoryMarshal.GetReference(first), s = &MemoryMarshal.GetReference(second), t = &MemoryMarshal.GetReference(third)) - { - return string.Create( - first.Length + second.Length + third.Length + (firstHasSeparator ? 0 : 1) + (thirdHasSeparator ? 0 : 1), - (First: (IntPtr)f, FirstLength: first.Length, Second: (IntPtr)s, SecondLength: second.Length, - Third: (IntPtr)t, ThirdLength: third.Length, FirstHasSeparator: firstHasSeparator, ThirdHasSeparator: thirdHasSeparator), - (destination, state) => - { - new Span((char*)state.First, state.FirstLength).CopyTo(destination); - if (!state.FirstHasSeparator) - destination[state.FirstLength] = Path.DirectorySeparatorChar; - new Span((char*)state.Second, state.SecondLength).CopyTo(destination.Slice(state.FirstLength + (state.FirstHasSeparator ? 0 : 1))); - if (!state.ThirdHasSeparator) - destination[destination.Length - state.ThirdLength - 1] = Path.DirectorySeparatorChar; - new Span((char*)state.Third, state.ThirdLength).CopyTo(destination.Slice(destination.Length - state.ThirdLength)); - }); - } - } - - /// - /// Returns true if the file name is "." or ".." - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static unsafe bool IsDotOrDotDot(ReadOnlySpan fileName) - { - return !(fileName.Length > 2 - || fileName[0] != '.' - || (fileName.Length == 2 && fileName[1] != '.')); - } - - public static ReadOnlySpan GetDirectoryNameNoChecks(ReadOnlySpan path) - { - if (path.Length == 0) - return ReadOnlySpan.Empty; - - int root = PathInternal.GetRootLength(path); - int i = path.Length; - if (i > root) - { - while (i > root && !PathInternal.IsDirectorySeparator(path[--i])) ; - return path.Slice(0, i); - } - - return ReadOnlySpan.Empty; - } - } -} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/PathPair.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/PathPair.cs deleted file mode 100644 index dfef1bcc11..0000000000 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/PathPair.cs +++ /dev/null @@ -1,18 +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.IO -{ - internal readonly struct PathPair - { - internal readonly string UserPath; - internal readonly string FullPath; - - internal PathPair(string userPath, string fullPath) - { - UserPath = userPath; - FullPath = fullPath; - } - } -} diff --git a/external/corefx/src/System.IO.FileSystem/src/System/IO/RawFindData.cs b/external/corefx/src/System.IO.FileSystem/src/System/IO/RawFindData.cs deleted file mode 100644 index 2f8ab43e42..0000000000 --- a/external/corefx/src/System.IO.FileSystem/src/System/IO/RawFindData.cs +++ /dev/null @@ -1,33 +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.IO -{ - /// - /// Used for processing and filtering find results. - /// - internal unsafe ref struct RawFindData - { - internal RawFindData(Interop.NtDll.FILE_FULL_DIR_INFORMATION* info, string directory, string originalDirectory, string originalUserDirectory) - { - _info = info; - Directory = directory; - OriginalDirectory = originalDirectory; - OriginalUserDirectory = originalUserDirectory; - } - - internal unsafe Interop.NtDll.FILE_FULL_DIR_INFORMATION* _info; - public string Directory { get; private set; } - public string OriginalDirectory { get; private set; } - public string OriginalUserDirectory { get; private set; } - - public ReadOnlySpan FileName => _info->FileName; - public FileAttributes Attributes => _info->FileAttributes; - public long Length => _info->EndOfFile; - - public DateTime CreationTimeUtc => _info->CreationTime.ToDateTimeUtc(); - public DateTime LastAccessTimeUtc => _info->LastAccessTime.ToDateTimeUtc(); - public DateTime LastWriteTimeUtc => _info->LastWriteTime.ToDateTimeUtc(); - } -} diff --git a/external/corefx/src/System.IO.FileSystem/tests/Base/BaseGetSetTimes.cs b/external/corefx/src/System.IO.FileSystem/tests/Base/BaseGetSetTimes.cs index f650ae07f3..865cde2ad8 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/Base/BaseGetSetTimes.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/Base/BaseGetSetTimes.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; +using System.Threading; using Xunit; namespace System.IO.Tests @@ -15,6 +16,8 @@ namespace System.IO.Tests public abstract T GetExistingItem(); public abstract T GetMissingItem(); + public abstract string GetItemPath(T item); + public abstract IEnumerable TimeFunctions(bool requiresRoundtripping = false); public class TimeFunction : Tuple @@ -68,19 +71,35 @@ namespace System.IO.Tests } [Fact] - [ActiveIssue(26349, TestPlatforms.AnyUnix)] - public void TimesIncludeMillisecondPart() + [PlatformSpecific(TestPlatforms.Linux)] // Windows tested below, and OSX does not currently support millisec granularity + public void TimesIncludeMillisecondPart_Linux() { T item = GetExistingItem(); + + string driveFormat = new DriveInfo(GetItemPath(item)).DriveFormat; + Assert.All(TimeFunctions(), (function) => { var msec = 0; - for (int i = 0; i < 3; i++) + for (int i = 0; i < 5; i++) { - msec = function.Getter(item).Millisecond; + DateTime time = function.Getter(item); + msec = time.Millisecond; + if (msec != 0) break; + // This case should only happen 1/1000 times, unless the OS/Filesystem does + // not support millisecond granularity. + + // If it's 1/1000, or low granularity, this may help: + Thread.Sleep(1234); + + // If it's the OS/Filesystem often returns 0 for the millisecond part, this may + // help prove it. This should only be written 1/1000 runs, unless the test is going to + // fail. + Console.WriteLine($"## TimesIncludeMillisecondPart got a file time of {time.ToString("o")} on {driveFormat}"); + item = GetExistingItem(); // try a new file/directory } @@ -88,6 +107,49 @@ namespace System.IO.Tests }); } + + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] // Breaking out Windows as it passes no problem there + public void TimesIncludeMillisecondPart_Windows() + { + T item = GetExistingItem(); + Assert.All(TimeFunctions(), (function) => + { + var msec = 0; + for (int i = 0; i < 5; i++) + { + DateTime time = function.Getter(item); + msec = time.Millisecond; + if (msec != 0) + break; + + // This case should only happen 1/1000 times, unless the OS/Filesystem does + // not support millisecond granularity. + + // If it's 1/1000, or low granularity, this may help: + Thread.Sleep(1234); + + item = GetExistingItem(); // try a new file/directory + } + + Assert.NotEqual(0, msec); + }); + } + + [Fact] + // OSX does not currently support millisec granularity: use this test as a canary to flag + // if this ever changes so we can enable the actual test + [PlatformSpecific(TestPlatforms.OSX)] + public void TimesIncludeMillisecondPart_OSX() + { + T item = GetExistingItem(); + Assert.All(TimeFunctions(), (function) => + { + DateTime time = function.Getter(item); + Assert.Equal(0, time.Millisecond); + }); + } + protected void ValidateSetTimes(T item, DateTime beforeTime, DateTime afterTime) { Assert.All(TimeFunctions(), (function) => diff --git a/external/corefx/src/System.IO.FileSystem/tests/Base/FileGetSetAttributes.cs b/external/corefx/src/System.IO.FileSystem/tests/Base/FileGetSetAttributes.cs index bdb4cee984..59d784fbe9 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/Base/FileGetSetAttributes.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/Base/FileGetSetAttributes.cs @@ -12,12 +12,12 @@ namespace System.IO.Tests [Theory] [InlineData(FileAttributes.ReadOnly)] [InlineData(FileAttributes.Normal)] - [PlatformSpecific(TestPlatforms.AnyUnix)] // Unix valid file attributes - public void UnixAttributeSetting(FileAttributes attr) + [PlatformSpecific(TestPlatforms.AnyUnix)] + public void SettingAttributes_Unix(FileAttributes attributes) { string path = CreateItem(); - SetAttributes(path, attr); - Assert.Equal(attr, GetAttributes(path)); + SetAttributes(path, attributes); + Assert.Equal(attributes, GetAttributes(path)); SetAttributes(path, 0); } @@ -29,12 +29,12 @@ namespace System.IO.Tests [InlineData(FileAttributes.Normal)] [InlineData(FileAttributes.Temporary)] [InlineData(FileAttributes.ReadOnly | FileAttributes.Hidden)] - [PlatformSpecific(TestPlatforms.Windows)] // Valid Windows file attribute - public void WindowsAttributeSetting(FileAttributes attr) + [PlatformSpecific(TestPlatforms.Windows)] + public void SettingAttributes_Windows(FileAttributes attributes) { string path = CreateItem(); - SetAttributes(path, attr); - Assert.Equal(attr, GetAttributes(path)); + SetAttributes(path, attributes); + Assert.Equal(attributes, GetAttributes(path)); SetAttributes(path, 0); } @@ -44,11 +44,11 @@ namespace System.IO.Tests [InlineData(FileAttributes.SparseFile)] [InlineData(FileAttributes.ReparsePoint)] [InlineData(FileAttributes.Compressed)] - [PlatformSpecific(TestPlatforms.AnyUnix)] // Unix invalid file attributes - public void UnixInvalidAttributes(FileAttributes attr) + [PlatformSpecific(TestPlatforms.AnyUnix)] + public void SettingInvalidAttributes_Unix(FileAttributes attributes) { string path = CreateItem(); - SetAttributes(path, attr); + SetAttributes(path, attributes); Assert.Equal(FileAttributes.Normal, GetAttributes(path)); } @@ -58,11 +58,36 @@ namespace System.IO.Tests [InlineData(FileAttributes.SparseFile)] [InlineData(FileAttributes.ReparsePoint)] [InlineData(FileAttributes.Compressed)] - [PlatformSpecific(TestPlatforms.Windows)] // Invalid Windows file attributes - public void WindowsInvalidAttributes(FileAttributes attr) + [PlatformSpecific(TestPlatforms.Windows)] + public void SettingInvalidAttributes_Windows(FileAttributes attributes) { string path = CreateItem(); - SetAttributes(path, attr); + SetAttributes(path, attributes); + Assert.Equal(FileAttributes.Normal, GetAttributes(path)); + } + + [Theory, + InlineData(":bar"), + InlineData(":bar:$DATA")] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void GettingAndSettingAttributes_AlternateDataStream_Windows(string streamName) + { + string path = CreateItem(); + streamName = path + streamName; + File.Create(streamName); + + FileAttributes attributes = GetAttributes(streamName); + Assert.NotEqual((FileAttributes)0, attributes); + Assert.NotEqual((FileAttributes)(-1), attributes); + + // Attributes are shared for the file and all streams + SetAttributes(streamName, FileAttributes.Hidden); + Assert.Equal(FileAttributes.Hidden, GetAttributes(streamName)); + Assert.Equal(FileAttributes.Hidden, GetAttributes(path)); + + SetAttributes(path, FileAttributes.Normal); + Assert.Equal(FileAttributes.Normal, GetAttributes(streamName)); Assert.Equal(FileAttributes.Normal, GetAttributes(path)); } } diff --git a/external/corefx/src/System.IO.FileSystem/tests/Base/StaticGetSetTimes.cs b/external/corefx/src/System.IO.FileSystem/tests/Base/StaticGetSetTimes.cs index 6444ff203f..12ee8997fd 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/Base/StaticGetSetTimes.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/Base/StaticGetSetTimes.cs @@ -10,6 +10,8 @@ namespace System.IO.Tests { public override string GetMissingItem() => GetTestFilePath(); + public override string GetItemPath(string item) => item; + [Fact] public void NullPath_ThrowsArgumentNullException() { diff --git a/external/corefx/src/System.IO.FileSystem/tests/Directory/CreateDirectory.cs b/external/corefx/src/System.IO.FileSystem/tests/Directory/CreateDirectory.cs index bfd60bb977..021a05b949 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/Directory/CreateDirectory.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/Directory/CreateDirectory.cs @@ -34,14 +34,20 @@ namespace System.IO.Tests } [Theory, MemberData(nameof(PathsWithInvalidCharacters))] - public void PathWithInvalidCharactersAsPath_ThrowsArgumentException(string invalidPath) + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] + public void PathWithInvalidCharactersAsPath_Desktop(string invalidPath) { - if (invalidPath.Equals(@"\\?\") && !PathFeatures.IsUsingLegacyPathNormalization()) - AssertExtensions.ThrowsAny(() => Create(invalidPath)); - else if (invalidPath.Contains(@"\\?\") && !PathFeatures.IsUsingLegacyPathNormalization()) - Assert.Throws(() => Create(invalidPath)); + Assert.Throws(() => Create(invalidPath)); + } + + [Theory, MemberData(nameof(PathsWithInvalidCharacters))] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void PathWithInvalidCharactersAsPath_Core(string invalidPath) + { + if (invalidPath.Contains('\0')) + Assert.Throws("path", () => Create(invalidPath)); else - Assert.Throws(() => Create(invalidPath)); + Assert.Throws(() => Create(invalidPath)); } [Fact] @@ -203,11 +209,28 @@ namespace System.IO.Tests #region PlatformSpecific [Theory, MemberData(nameof(PathsWithInvalidColons))] - [PlatformSpecific(TestPlatforms.Windows)] // invalid colons throws ArgumentException - [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Versions of netfx older than 4.6.2 throw an ArgumentException instead of NotSupportedException. Until all of our machines run netfx against the actual latest version, these will fail.")] - public void PathWithInvalidColons_ThrowsNotSupportedException(string invalidPath) + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] + public void PathWithInvalidColons_ThrowsNotSupportedException_Desktop(string invalidPath) { - Assert.Throws(() => Create(invalidPath)); + if (PathFeatures.IsUsingLegacyPathNormalization()) + { + Assert.Throws(() => Create(invalidPath)); + } + else + { + Assert.Throws(() => Create(invalidPath)); + } + } + + [Theory, MemberData(nameof(PathsWithInvalidColons))] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void PathsWithInvalidColons_ThrowIOException_Core(string invalidPath) + { + // You can't actually create a directory with a colon in it. It was a preemptive + // check, now we let the OS give us failures on usage. + Assert.ThrowsAny(() => Create(invalidPath)); } [ConditionalFact(nameof(AreAllLongPathsAvailable))] @@ -308,13 +331,32 @@ namespace System.IO.Tests } [Theory, - MemberData(nameof(WhiteSpace))] - [PlatformSpecific(TestPlatforms.Windows)] // whitespace as path throws ArgumentException on Windows - public void WindowsWhiteSpaceAsPath_ThrowsArgumentException(string path) + MemberData(nameof(SimpleWhiteSpace))] + [PlatformSpecific(TestPlatforms.Windows)] + public void WindowsSimpleWhiteSpaceAsPath_ThrowsArgumentException(string path) { Assert.Throws(() => Create(path)); } + [Theory, + MemberData(nameof(ControlWhiteSpace))] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] + public void WindowsControlWhiteSpaceAsPath_ThrowsArgumentException_Desktop(string path) + { + Assert.Throws(() => Create(path)); + } + + [Theory, + MemberData(nameof(ControlWhiteSpace))] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void WindowsWhiteSpaceAsPath_ThrowsIOException_Core(string path) + { + Assert.Throws(() => Create(path)); + } + + [Theory, MemberData(nameof(WhiteSpace))] [PlatformSpecific(TestPlatforms.AnyUnix)] // whitespace as path allowed @@ -397,13 +439,23 @@ namespace System.IO.Tests } [Theory, - MemberData(nameof(PathsWithAlternativeDataStreams))] + MemberData(nameof(PathsWithColons))] [PlatformSpecific(TestPlatforms.Windows)] // alternate data streams - public void PathWithAlternateDataStreams_ThrowsNotSupportedException(string path) + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] + public void PathWithColons_ThrowsNotSupportedException_Desktop(string path) { Assert.Throws(() => Create(path)); } + [Theory, + MemberData(nameof(PathsWithColons))] + [PlatformSpecific(TestPlatforms.Windows)] // alternate data streams + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void PathWithColons_ThrowsIOException_Core(string path) + { + Assert.ThrowsAny(() => Create(Path.Combine(TestDirectory, path))); + } + [Theory, MemberData(nameof(PathsWithReservedDeviceNames))] [PlatformSpecific(TestPlatforms.Windows)] // device name prefixes @@ -424,19 +476,38 @@ namespace System.IO.Tests [Theory, MemberData(nameof(UncPathsWithoutShareName))] - [PlatformSpecific(TestPlatforms.Windows)] // UNC shares - public void UncPathWithoutShareNameAsPath_ThrowsArgumentException(string path) + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] + public void UncPathWithoutShareNameAsPath_ThrowsArgumentException_Desktop(string path) { Assert.Throws(() => Create(path)); } + [Theory, + MemberData(nameof(UncPathsWithoutShareName))] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void UncPathWithoutShareNameAsPath_ThrowsIOException_Core(string path) + { + Assert.ThrowsAny(() => Create(path)); + } + [Fact] - [PlatformSpecific(TestPlatforms.Windows)] // UNC shares - public void UNCPathWithOnlySlashes() + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] + public void UNCPathWithOnlySlashes_Desktop() { Assert.Throws(() => Create("//")); } + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void UNCPathWithOnlySlashes_Core() + { + Assert.ThrowsAny(() => Create("//")); + } + [Fact] [PlatformSpecific(TestPlatforms.Windows)] // drive labels [ActiveIssue(20117, TargetFrameworkMonikers.Uap)] diff --git a/external/corefx/src/System.IO.FileSystem/tests/Directory/Delete.cs b/external/corefx/src/System.IO.FileSystem/tests/Directory/Delete.cs index 98ab80c3ef..52f5b9dfad 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/Directory/Delete.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/Directory/Delete.cs @@ -208,7 +208,7 @@ namespace System.IO.Tests [Trait(XunitConstants.Category, XunitConstants.RequiresElevation)] public void Unix_NotFoundDirectory_ReadOnlyVolume() { - if (PlatformDetection.IsRedHatFamily6) + if (PlatformDetection.IsRedHatFamily6 || PlatformDetection.IsAlpine) return; // [ActiveIssue(https://github.com/dotnet/corefx/issues/21920)] ReadOnly_FileSystemHelper(readOnlyDirectory => diff --git a/external/corefx/src/System.IO.FileSystem/tests/Directory/EnumerableTests.cs b/external/corefx/src/System.IO.FileSystem/tests/Directory/EnumerableTests.cs index e9c6028c56..7d604b6f1f 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/Directory/EnumerableTests.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/Directory/EnumerableTests.cs @@ -32,6 +32,17 @@ namespace System.IO.Tests } } + [Fact] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void EnumerateDirectories_NonBreakingSpace() + { + DirectoryInfo rootDirectory = Directory.CreateDirectory(GetTestFilePath()); + DirectoryInfo subDirectory1 = rootDirectory.CreateSubdirectory("\u00A0"); + DirectoryInfo subDirectory2 = subDirectory1.CreateSubdirectory(GetTestFileName()); + + FSAssert.EqualWhenOrdered(new string[] { subDirectory1.FullName, subDirectory2.FullName }, Directory.EnumerateDirectories(rootDirectory.FullName, string.Empty, SearchOption.AllDirectories)); + } + class ThreadSafeRepro { volatile IEnumerator _enumerator; diff --git a/external/corefx/src/System.IO.FileSystem/tests/Directory/Exists.cs b/external/corefx/src/System.IO.FileSystem/tests/Directory/Exists.cs index d4e80bf9db..1db1170158 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/Directory/Exists.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/Directory/Exists.cs @@ -375,11 +375,24 @@ namespace System.IO.Tests Assert.False(result); } + // Not all drives may be accessible (locked, no rights, etc.), and as such would return false. + // eg. Create a new volume, bitlocker it, and lock it. This new volume is no longer accessible + // and any attempt to access this drive will return false. + // We just care that we can access an accessible drive directly, we don't care which one. [Fact] [PlatformSpecific(TestPlatforms.Windows)] // drive labels - public void NonExistentDriveAsPath_ReturnsFalse() + public void DriveAsPath() { Assert.False(Exists(IOServices.GetNonExistentDrive())); + Assert.Contains(IOServices.GetReadyDrives(), drive => Exists(drive)); + } + + [ConditionalFact(nameof(UsingNewNormalization))] + [PlatformSpecific(TestPlatforms.Windows)] // drive labels + public void ExtendedDriveAsPath() + { + Assert.False(Exists(IOInputs.ExtendedPrefix + IOServices.GetNonExistentDrive())); + Assert.Contains(IOServices.GetReadyDrives(), drive => Exists(IOInputs.ExtendedPrefix + drive)); } [Fact] diff --git a/external/corefx/src/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str.cs b/external/corefx/src/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str.cs index 8a4175705a..01402a222b 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str.cs @@ -11,7 +11,7 @@ namespace System.IO.Tests { #region Utilities - public static TheoryData WindowsInvalidUnixValid = new TheoryData { " ", " ", "\n", ">", "<", "\t" }; + protected virtual bool TestFiles { get { return true; } } // True if the virtual GetEntries mmethod returns files protected virtual bool TestDirectories { get { return true; } } // True if the virtual GetEntries mmethod returns Directories @@ -175,42 +175,125 @@ namespace System.IO.Tests } } + [Fact] + public void HiddenFilesAreReturned() + { + // Note that APIs that take EnumerationOptions do NOT find hidden files by default + + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + FileInfo fileOne = new FileInfo(Path.Combine(testDirectory.FullName, GetTestFileName())); + + // Put a period in front to make it hidden on Unix + FileInfo fileTwo = new FileInfo(Path.Combine(testDirectory.FullName, "." + GetTestFileName())); + fileOne.Create().Dispose(); + fileTwo.Create().Dispose(); + if (PlatformDetection.IsWindows) + fileTwo.Attributes = fileTwo.Attributes | FileAttributes.Hidden; + + if (TestFiles) + { + FSAssert.EqualWhenOrdered(new string[] { fileOne.FullName, fileTwo.FullName }, GetEntries(testDirectory.FullName)); + } + else + { + Assert.Empty(GetEntries(testDirectory.FullName)); + } + } + #endregion #region PlatformSpecific [Fact] - public void InvalidPath() + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] + public void InvalidPath_Desktop() { foreach (char invalid in Path.GetInvalidFileNameChars()) { - if (invalid == '/' || invalid == '\\') + string badPath = string.Format($"{TestDirectory}{Path.DirectorySeparatorChar}te{invalid}st"); + switch (invalid) { - Assert.Throws(() => GetEntries(Path.Combine(TestDirectory, string.Format("te{0}st", invalid.ToString())))); + case '/': + case '\\': + Assert.Throws(() => GetEntries(badPath)); + break; + case ':': + Assert.Throws(() => GetEntries(badPath)); + break; + case '\0': + Assert.Throws(() => GetEntries(badPath)); + break; + default: + Assert.Throws(() => GetEntries(badPath)); + break; } - else if (invalid == ':') + } + } + + [Fact] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void InvalidPath_Core() + { + foreach (char invalid in Path.GetInvalidFileNameChars()) + { + string badPath = string.Format($"{TestDirectory}{Path.DirectorySeparatorChar}te{invalid}st"); + switch (invalid) { - if (FileSystemDebugInfo.IsCurrentDriveNTFS()) - Assert.Throws(() => GetEntries(Path.Combine(TestDirectory, string.Format("te{0}st", invalid.ToString())))); - } - else - { - Assert.Throws(() => GetEntries(Path.Combine(TestDirectory, string.Format("te{0}st", invalid.ToString())))); + case '/': + case '\\': + case ':': + Assert.Throws(() => GetEntries(badPath)); + break; + case '\0': + Assert.Throws(() => GetEntries(badPath)); + break; + default: + Assert.Throws(() => GetEntries(badPath)); + break; } } } [Theory, - MemberData(nameof(WindowsInvalidUnixValid))] - [PlatformSpecific(TestPlatforms.Windows)] // Windows-only Invalid chars in path - public void WindowsInvalidCharsPath(string invalid) + InlineData(" "), + InlineData(" ")] + [PlatformSpecific(TestPlatforms.Windows)] + public void WindowsWhitespaceOnlyPath(string invalid) { - Assert.Throws(() => GetEntries(invalid)); } [Theory, - MemberData(nameof(WindowsInvalidUnixValid))] + InlineData("\n"), + InlineData(">"), + InlineData("<"), + InlineData("\t")] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] + public void WindowsInvalidCharsPath_Desktop(string invalid) + { + Assert.Throws(() => GetEntries(invalid)); + } + + [Theory, + InlineData("\n"), + InlineData(">"), + InlineData("<"), + InlineData("\t")] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void WindowsInvalidCharsPath_Core(string invalid) + { + Assert.Throws(() => GetEntries(invalid)); + } + + [Theory, + InlineData(" "), + InlineData(" "), + InlineData("\n"), + InlineData(">"), + InlineData("<"), + InlineData("\t")] [PlatformSpecific(TestPlatforms.AnyUnix)] // Unix-only valid chars in file path public void UnixValidCharsFilePath(string valid) { @@ -226,7 +309,12 @@ namespace System.IO.Tests } [Theory, - MemberData(nameof(WindowsInvalidUnixValid))] + InlineData(" "), + InlineData(" "), + InlineData("\n"), + InlineData(">"), + InlineData("<"), + InlineData("\t")] [PlatformSpecific(TestPlatforms.AnyUnix)] // Windows-only invalid chars in directory path public void UnixValidCharsDirectoryPath(string valid) { diff --git a/external/corefx/src/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str.cs b/external/corefx/src/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str.cs index a352bf6529..e96881bc46 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str.cs @@ -985,7 +985,12 @@ namespace System.IO.Tests } [Theory, - MemberData(nameof(WindowsInvalidUnixValid))] + InlineData(" "), + InlineData(" "), + InlineData("\n"), + InlineData(">"), + InlineData("<"), + InlineData("\t")] [PlatformSpecific(TestPlatforms.AnyUnix)] // Unix-valid chars in file search patterns public void UnixSearchPatternFileValidChar(string valid) { @@ -999,7 +1004,12 @@ namespace System.IO.Tests } [Theory, - MemberData(nameof(WindowsInvalidUnixValid))] + InlineData(" "), + InlineData(" "), + InlineData("\n"), + InlineData(">"), + InlineData("<"), + InlineData("\t")] [PlatformSpecific(TestPlatforms.AnyUnix)] // Unix-valid chars in directory search patterns public void UnixSearchPatternDirectoryValidChar(string valid) { diff --git a/external/corefx/src/System.IO.FileSystem/tests/Directory/GetFiles.cs b/external/corefx/src/System.IO.FileSystem/tests/Directory/GetFiles.cs index 79c22762df..7a8a36bde6 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/Directory/GetFiles.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/Directory/GetFiles.cs @@ -147,6 +147,8 @@ namespace System.IO.Tests public class Directory_GetFiles_str_str_so : Directory_GetFileSystemEntries_str_str_so { + public virtual bool IsDirectoryInfo => false; + protected override bool TestFiles { get { return true; } } protected override bool TestDirectories { get { return false; } } @@ -164,5 +166,32 @@ namespace System.IO.Tests { return Directory.GetFiles(path, searchPattern, option); } + + [Theory, MemberData(nameof(TrailingSeparators))] + public void DirectoryWithTrailingSeparators(string trailing) + { + // When getting strings back we should retain the root path as specified for Directory. + // DirectoryInfo returns the normalized full path in all cases. + + // Add the trailing separator up front for Directory as we want to validate against + // the path _with_ the separator on it. Creation doesn't care about trailing, and + // Path.Combine doesn't change the existing separators, it just adds the canonical + // separator if needed. + string root = GetTestFilePath() + (IsDirectoryInfo ? "" : trailing); + string rootFile = Path.Combine(root, GetTestFileName()); + string subDirectory = Path.Combine(root, GetTestFileName()); + string nestedFile = Path.Combine(subDirectory, GetTestFileName()); + + Directory.CreateDirectory(subDirectory); + File.Create(rootFile).Dispose(); + File.Create(nestedFile).Dispose(); + + // Add the trailing separator if we haven't (for DI) so we can validate that we + // either retain (D) or don't retain (DI) the separators as we specified them. + // Note that some of the cases actually match canonical (one standard separator) + // so they never change. + string[] files = GetEntries(root + (IsDirectoryInfo ? trailing : ""), "*", SearchOption.AllDirectories); + FSAssert.EqualWhenOrdered(new string[] { rootFile, nestedFile }, files); + } } } diff --git a/external/corefx/src/System.IO.FileSystem/tests/Directory/Move.cs b/external/corefx/src/System.IO.FileSystem/tests/Directory/Move.cs index 8c21954c03..1da296c1c3 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/Directory/Move.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/Directory/Move.cs @@ -242,8 +242,9 @@ namespace System.IO.Tests } [Fact] - [PlatformSpecific(TestPlatforms.Windows)] // Wild characters in path, wild chars are normal chars on Unix - public void WindowsWildCharacterPath() + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] + public void WindowsWildCharacterPath_Desktop() { Assert.Throws(() => Move("*", GetTestFilePath())); Assert.Throws(() => Move(TestDirectory, "*")); @@ -251,6 +252,17 @@ namespace System.IO.Tests Assert.Throws(() => Move(TestDirectory, "*Test")); } + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void WindowsWildCharacterPath_Core() + { + Assert.ThrowsAny(() => Move(Path.Combine(TestDirectory, "*"), GetTestFilePath())); + Assert.ThrowsAny(() => Move(TestDirectory, Path.Combine(TestDirectory, "*"))); + Assert.ThrowsAny(() => Move(TestDirectory, Path.Combine(TestDirectory, "Test*t"))); + Assert.ThrowsAny(() => Move(TestDirectory, Path.Combine(TestDirectory, "*Test"))); + } + [Fact] [PlatformSpecific(TestPlatforms.AnyUnix)] // Wild characters in path are allowed public void UnixWildCharacterPath() @@ -278,17 +290,13 @@ namespace System.IO.Tests } [Fact] - [PlatformSpecific(TestPlatforms.Windows)] // Whitespace path causes ArgumentException - public void WindowsWhitespacePath() + [PlatformSpecific(TestPlatforms.Windows)] + public void WindowsEmptyPath() { DirectoryInfo testDir = Directory.CreateDirectory(GetTestFilePath()); Assert.Throws(() => Move(testDir.FullName, " ")); - Assert.Throws(() => Move(testDir.FullName, "\n")); Assert.Throws(() => Move(testDir.FullName, "")); - Assert.Throws(() => Move(testDir.FullName, ">")); - Assert.Throws(() => Move(testDir.FullName, "<")); Assert.Throws(() => Move(testDir.FullName, "\0")); - Assert.Throws(() => Move(testDir.FullName, "\t")); } [Fact] diff --git a/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/CreateSubdirectory.cs b/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/CreateSubdirectory.cs index 6122cb1f5c..75af106c41 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/CreateSubdirectory.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/CreateSubdirectory.cs @@ -140,27 +140,40 @@ namespace System.IO.Tests [Theory, MemberData(nameof(ControlWhiteSpace))] - [PlatformSpecific(TestPlatforms.Windows)] // Control whitespace in path throws ArgumentException - public void WindowsControlWhiteSpace(string component) + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] + public void WindowsControlWhiteSpace_Desktop(string component) + { + Assert.Throws(() => new DirectoryInfo(TestDirectory).CreateSubdirectory(component)); + } + + [Theory, + MemberData(nameof(ControlWhiteSpace))] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void WindowsControlWhiteSpace_Core(string component) + { + Assert.Throws(() => new DirectoryInfo(TestDirectory).CreateSubdirectory(component)); + } + + [Theory, + MemberData(nameof(SimpleWhiteSpace))] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + [PlatformSpecific(TestPlatforms.Windows)] + public void WindowsSimpleWhiteSpaceThrowsException(string component) { - // CreateSubdirectory will throw when passed a path with control whitespace e.g. "\t" - string path = IOServices.RemoveTrailingSlash(GetTestFileName()); Assert.Throws(() => new DirectoryInfo(TestDirectory).CreateSubdirectory(component)); } [Theory, MemberData(nameof(SimpleWhiteSpace))] - [PlatformSpecific(TestPlatforms.Windows)] // Simple whitespace is trimmed in path + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] // Simple whitespace is trimmed in path public void WindowsSimpleWhiteSpace(string component) { - // CreateSubdirectory trims all simple whitespace, returning us the parent directory - // that called CreateSubdirectory - string path = IOServices.RemoveTrailingSlash(GetTestFileName()); DirectoryInfo result = new DirectoryInfo(TestDirectory).CreateSubdirectory(component); Assert.True(Directory.Exists(result.FullName)); Assert.Equal(TestDirectory, IOServices.RemoveTrailingSlash(result.FullName)); - } [Theory, @@ -170,7 +183,6 @@ namespace System.IO.Tests { new DirectoryInfo(TestDirectory).CreateSubdirectory(path); Assert.True(Directory.Exists(Path.Combine(TestDirectory, path))); - } [Theory, @@ -207,6 +219,16 @@ namespace System.IO.Tests Assert.Throws(() => testDir.CreateSubdirectory("//")); } + [Fact] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void ParentDirectoryNameAsPrefixShouldThrow() + { + string randomName = GetTestFileName(); + DirectoryInfo di = Directory.CreateDirectory(Path.Combine(TestDirectory, randomName)); + + Assert.Throws(() => di.CreateSubdirectory(Path.Combine("..", randomName + "abc", GetTestFileName()))); + } + #endregion } } diff --git a/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/EnumerableAPIs.cs b/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/EnumerableAPIs.cs index 8be99d828c..dd1875a2d5 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/EnumerableAPIs.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/EnumerableAPIs.cs @@ -32,6 +32,8 @@ namespace System.IO.Tests public class DirectoryInfo_EnumerateFiles_str_str_so : Directory_GetFiles_str_str_so { + public override bool IsDirectoryInfo => true; + public override string[] GetEntries(string path) { return ((new DirectoryInfo(path).EnumerateFiles("*", SearchOption.TopDirectoryOnly).Select(x => x.FullName)).ToArray()); diff --git a/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/Exists.cs b/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/Exists.cs index d54f799cf0..be9e7e2641 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/Exists.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/Exists.cs @@ -37,6 +37,12 @@ namespace System.IO.Tests Assert.True(di.Exists); } + [Fact] + public void Root() + { + Assert.True(new DirectoryInfo(Path.GetPathRoot(Directory.GetCurrentDirectory())).Exists); + } + [Fact] public void DotPath() { diff --git a/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/GetFiles.cs b/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/GetFiles.cs index 85fef80609..13970ae34d 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/GetFiles.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/GetFiles.cs @@ -30,6 +30,8 @@ namespace System.IO.Tests public class DirectoryInfo_GetFiles_str_so : Directory_GetFiles_str_str_so { + public override bool IsDirectoryInfo => true; + public override string[] GetEntries(string path) { return ((new DirectoryInfo(path).GetFiles("*", SearchOption.TopDirectoryOnly).Select(x => x.FullName)).ToArray()); diff --git a/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/GetSetTimes.cs b/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/GetSetTimes.cs index 927c770d61..779be70df6 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/GetSetTimes.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/GetSetTimes.cs @@ -12,6 +12,8 @@ namespace System.IO.Tests public override DirectoryInfo GetMissingItem() => new DirectoryInfo(GetTestFilePath()); + public override string GetItemPath(DirectoryInfo item) => item.FullName; + public override void InvokeCreate(DirectoryInfo item) => item.Create(); public override IEnumerable TimeFunctions(bool requiresRoundtripping = false) diff --git a/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/ToString.cs b/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/ToString.cs index 732c71ee62..de2ea39621 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/ToString.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/DirectoryInfo/ToString.cs @@ -38,12 +38,28 @@ namespace System.IO.Tests } [Fact] + [SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp)] [PlatformSpecific(TestPlatforms.Windows)] // Drive letter only - public void DriveOnlyReturnsPeriod_Windows() + public void DriveOnlyReturnsPeriod_Windows_Desktop() { string path = @"C:"; var info = new DirectoryInfo(path); Assert.Equal(".", info.ToString()); } + + [Fact] + [SkipOnTargetFramework(~TargetFrameworkMonikers.Netcoreapp)] + [PlatformSpecific(TestPlatforms.Windows)] // Drive letter only + public void DriveOnlyReturnsPeriod_Windows_Core() + { + // This was likely a limited trust hack that was strangely implemented. + // Getting the current directory for a specified drive relative path + // doesn't make a lot of sense. There is no reason to hide original paths + // when in full trust. + string path = @"C:"; + var info = new DirectoryInfo(path); + Assert.Equal("C:", info.ToString()); + } + } } diff --git a/external/corefx/src/System.IO.FileSystem/tests/Enumeration/AttributeTests.netcoreapp.cs b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/AttributeTests.netcoreapp.cs new file mode 100644 index 0000000000..2ba62dfb42 --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/AttributeTests.netcoreapp.cs @@ -0,0 +1,141 @@ +// 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.Collections.Generic; +using System.IO.Enumeration; +using Xunit; + +namespace System.IO.Tests.Enumeration +{ + public class AttributeTests : FileSystemTest + { + private class DefaultFileAttributes : FileSystemEnumerator + { + public DefaultFileAttributes(string directory, EnumerationOptions options) + : base(directory, options) + { + } + + protected override bool ContinueOnError(int error) + { + Assert.False(true, $"Should not have errored {error}"); + return false; + } + + protected override bool ShouldIncludeEntry(ref FileSystemEntry entry) + => !entry.IsDirectory; + + protected override string TransformEntry(ref FileSystemEntry entry) + { + string path = entry.ToFullPath(); + File.Delete(path); + + // Attributes require a stat call on Unix- ensure that we have the right attributes + // even if the returned file is deleted. + Assert.Equal(FileAttributes.Normal, entry.Attributes); + Assert.Equal(path, entry.ToFullPath()); + return new string(entry.FileName); + } + } + + [Fact] + public void FileAttributesAreExpected() + { + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + FileInfo fileOne = new FileInfo(Path.Combine(testDirectory.FullName, GetTestFileName())); + + fileOne.Create().Dispose(); + + if (PlatformDetection.IsWindows) + { + // Archive should always be set on a new file. Clear it and other expected flags to + // see that we get "Normal" as the default when enumerating. + + Assert.True((fileOne.Attributes & FileAttributes.Archive) != 0); + fileOne.Attributes &= ~(FileAttributes.Archive | FileAttributes.NotContentIndexed); + } + + using (var enumerator = new DefaultFileAttributes(testDirectory.FullName, new EnumerationOptions())) + { + Assert.True(enumerator.MoveNext()); + Assert.Equal(fileOne.Name, enumerator.Current); + Assert.False(enumerator.MoveNext()); + } + } + + private class DefaultDirectoryAttributes : FileSystemEnumerator + { + public DefaultDirectoryAttributes(string directory, EnumerationOptions options) + : base(directory, options) + { + } + + protected override bool ShouldIncludeEntry(ref FileSystemEntry entry) + => entry.IsDirectory; + + protected override bool ContinueOnError(int error) + { + Assert.False(true, $"Should not have errored {error}"); + return false; + } + + protected override string TransformEntry(ref FileSystemEntry entry) + { + string path = entry.ToFullPath(); + Directory.Delete(path); + + // Attributes require a stat call on Unix- ensure that we have the right attributes + // even if the returned directory is deleted. + Assert.Equal(FileAttributes.Directory, entry.Attributes); + Assert.Equal(path, entry.ToFullPath()); + return new string(entry.FileName); + } + } + + [Fact] + public void DirectoryAttributesAreExpected() + { + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + DirectoryInfo subDirectory = Directory.CreateDirectory(Path.Combine(testDirectory.FullName, GetTestFileName())); + + if (PlatformDetection.IsWindows) + { + // Clear possible extra flags to see that we get Directory + subDirectory.Attributes &= ~FileAttributes.NotContentIndexed; + } + + using (var enumerator = new DefaultDirectoryAttributes(testDirectory.FullName, new EnumerationOptions())) + { + Assert.True(enumerator.MoveNext()); + Assert.Equal(subDirectory.Name, enumerator.Current); + Assert.False(enumerator.MoveNext()); + } + } + + [Fact] + public void IsHiddenAttribute() + { + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + FileInfo fileOne = new FileInfo(Path.Combine(testDirectory.FullName, GetTestFileName())); + + // Put a period in front to make it hidden on Unix + FileInfo fileTwo = new FileInfo(Path.Combine(testDirectory.FullName, "." + GetTestFileName())); + + fileOne.Create().Dispose(); + fileTwo.Create().Dispose(); + if (PlatformDetection.IsWindows) + fileTwo.Attributes = fileTwo.Attributes | FileAttributes.Hidden; + + IEnumerable enumerable = new FileSystemEnumerable( + testDirectory.FullName, + (ref FileSystemEntry entry) => entry.ToFullPath(), + new EnumerationOptions() { AttributesToSkip = 0 }) + { + ShouldIncludePredicate = (ref FileSystemEntry entry) => entry.IsHidden + }; + + Assert.Equal(new string[] { fileTwo.FullName }, enumerable); + } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/tests/Enumeration/ConstructionTests.netcoreapp.cs b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/ConstructionTests.netcoreapp.cs new file mode 100644 index 0000000000..4f453200ee --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/ConstructionTests.netcoreapp.cs @@ -0,0 +1,46 @@ +// 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.IO.Enumeration; +using Xunit; + +namespace System.IO.Tests.Enumeration +{ + public class ConstructionTests : FileSystemTest + { + [Fact] + public void Enumerable_NullTransformThrows() + { + AssertExtensions.Throws("transform", + () => new FileSystemEnumerable(TestDirectory, transform: null)); + } + + [Fact] + public void Enumerable_NullDirectoryThrows() + { + AssertExtensions.Throws("directory", + () => new FileSystemEnumerable(null, null)); + } + + private class TestEnumerator : FileSystemEnumerator + { + public TestEnumerator(string directory, EnumerationOptions options) + : base(directory, options) + { + } + + protected override string TransformEntry(ref FileSystemEntry entry) + { + throw new NotImplementedException(); + } + } + + [Fact] + public void Enumerator_NullDirectoryThrows() + { + AssertExtensions.Throws("directory", + () => new TestEnumerator(null, null)); + } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/tests/Enumeration/ErrorHandlingTests.netcoreapp.cs b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/ErrorHandlingTests.netcoreapp.cs new file mode 100644 index 0000000000..1414156cf3 --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/ErrorHandlingTests.netcoreapp.cs @@ -0,0 +1,71 @@ +// 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.IO.Enumeration; +using Xunit; + +namespace System.IO.Tests +{ + public class ErrorHandlingTests : FileSystemTest + { + private class IgnoreErrors : FileSystemEnumerator + { + public IgnoreErrors(string directory) + : base(directory) + { } + + public int ErrorCount { get; private set; } + public string DirectoryFinished { get; private set; } + + protected override string TransformEntry(ref FileSystemEntry entry) + => entry.FileName.ToString(); + + protected override bool ContinueOnError(int error) + { + ErrorCount++; + return true; + } + + protected override void OnDirectoryFinished(ReadOnlySpan directory) + => DirectoryFinished = directory.ToString(); + } + + [Fact] + public void OpenErrorDoesNotHappenAgainOnMoveNext() + { + // What we're checking for here is that we don't try to enumerate when we + // couldn't even open the root directory (e.g. open the handle again, try + // to get data, etc.) + using (IgnoreErrors ie = new IgnoreErrors(Path.GetRandomFileName())) + { + Assert.Equal(1, ie.ErrorCount); + Assert.False(ie.MoveNext()); + Assert.Equal(1, ie.ErrorCount); + + // Since we didn't start, the directory shouldn't finish. + Assert.Null(ie.DirectoryFinished); + } + } + + [Fact] + public void DeleteDirectoryAfterOpening() + { + // We shouldn't prevent the directory from being deleted, even though we've + // opened (and are holding) the handle. On Windows this means we've opened + // the handle with file share of delete. + DirectoryInfo info = Directory.CreateDirectory(GetTestFilePath()); + using (IgnoreErrors ie = new IgnoreErrors(info.FullName)) + { + Assert.Equal(0, ie.ErrorCount); + Directory.Delete(info.FullName); + Assert.False(ie.MoveNext()); + + // This doesn't cause an error as the directory is still valid until the + // the enumerator is closed (as we have an open handle) + Assert.Equal(0, ie.ErrorCount); + Assert.Equal(info.FullName, ie.DirectoryFinished); + } + } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/tests/Enumeration/ExampleTests.netcoreapp.cs b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/ExampleTests.netcoreapp.cs new file mode 100644 index 0000000000..9db4f452d1 --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/ExampleTests.netcoreapp.cs @@ -0,0 +1,141 @@ +// 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.Collections.Generic; +using System.IO.Enumeration; +using System.Linq; +using Xunit; + +namespace System.IO.Tests.Enumeration +{ + // For tests that cover examples from documentation, blog posts, etc. While these overlap with + // existing tests, having explicit coverage here is extra insurance we are covering the + // examples we've given out publicly. + public class ExampleTests : FileSystemTest + { + [Fact] + public void GetFileNamesEnumerable() + { + // https://blogs.msdn.microsoft.com/jeremykuhne/2018/03/09/custom-directory-enumeration-in-net-core-2-1/ + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + File.Create(Path.Join(testDirectory.FullName, "one")).Dispose(); + File.Create(Path.Join(testDirectory.FullName, "two")).Dispose(); + Directory.CreateDirectory(Path.Join(testDirectory.FullName, "three")); + + IEnumerable fileNames = + new FileSystemEnumerable( + testDirectory.FullName, + (ref FileSystemEntry entry) => entry.FileName.ToString()) + { + ShouldIncludePredicate = (ref FileSystemEntry entry) => !entry.IsDirectory + }; + + FSAssert.EqualWhenOrdered(new string[] { "one", "two" }, fileNames); + } + + private static IEnumerable GetFilesWithExtensions(string directory, + bool recursive, params string[] extensions) + { + return new FileSystemEnumerable( + directory, + (ref FileSystemEntry entry) => (FileInfo)entry.ToFileSystemInfo(), + new EnumerationOptions() { RecurseSubdirectories = recursive }) + { + ShouldIncludePredicate = (ref FileSystemEntry entry) => + { + if (entry.IsDirectory) + return false; + foreach (string extension in extensions) + { + if (Path.GetExtension(entry.FileName).SequenceEqual(extension)) + return true; + } + return false; + } + }; + } + + [Fact] + public void TestGetFilesWithExtensions() + { + // https://blogs.msdn.microsoft.com/jeremykuhne/2018/03/09/custom-directory-enumeration-in-net-core-2-1/ + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + File.Create(Path.Join(testDirectory.FullName, "file.one")).Dispose(); + File.Create(Path.Join(testDirectory.FullName, "file.two")).Dispose(); + File.Create(Path.Join(testDirectory.FullName, "file.three")).Dispose(); + DirectoryInfo subDirectory = testDirectory.CreateSubdirectory("three.one"); + File.Create(Path.Join(subDirectory.FullName, "subfile.one")).Dispose(); + + FSAssert.EqualWhenOrdered( + new string[] { "file.one", "file.three" }, + GetFilesWithExtensions(testDirectory.FullName, false, ".one", ".three").Select(f => f.Name)); + + FSAssert.EqualWhenOrdered( + new string[] { "file.one", "file.three", "subfile.one" }, + GetFilesWithExtensions(testDirectory.FullName, true, ".one", ".three").Select(f => f.Name)); + } + + private static int CountFiles(string directory, bool recursive) + { + return (new FileSystemEnumerable( + directory, + (ref FileSystemEntry entry) => 1, + new EnumerationOptions() { RecurseSubdirectories = recursive }) + { + ShouldIncludePredicate = (ref FileSystemEntry entry) => !entry.IsDirectory + }).Count(); + } + + [Fact] + public void TestCountFiles() + { + // https://blogs.msdn.microsoft.com/jeremykuhne/2018/03/09/custom-directory-enumeration-in-net-core-2-1/ + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + File.Create(Path.Join(testDirectory.FullName, "file.one")).Dispose(); + File.Create(Path.Join(testDirectory.FullName, "file.two")).Dispose(); + File.Create(Path.Join(testDirectory.FullName, "file.three")).Dispose(); + DirectoryInfo subDirectory = testDirectory.CreateSubdirectory("three.one"); + File.Create(Path.Join(subDirectory.FullName, "subfile.one")).Dispose(); + + Assert.Equal(3, CountFiles(testDirectory.FullName, false)); + + Assert.Equal(4, CountFiles(testDirectory.FullName, true)); + } + + private static long CountFileBytes(string directory, bool recursive) + { + return (new FileSystemEnumerable( + directory, + (ref FileSystemEntry entry) => entry.Length, + new EnumerationOptions() { RecurseSubdirectories = recursive }) + { + ShouldIncludePredicate = (ref FileSystemEntry entry) => !entry.IsDirectory + }).Sum(); + } + + [Fact] + public void TestCountFileBytes() + { + // https://blogs.msdn.microsoft.com/jeremykuhne/2018/03/09/custom-directory-enumeration-in-net-core-2-1/ + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + FileInfo firstFile = new FileInfo(Path.Join(testDirectory.FullName, "file.one")); + using (var writer = firstFile.CreateText()) + { + for (int i = 0; i < 100; i++) + writer.WriteLine("The quick brown fox jumped over the lazy dog."); + } + + firstFile.CopyTo(Path.Join(testDirectory.FullName, "file.two")); + firstFile.CopyTo(Path.Join(testDirectory.FullName, "file.three")); + DirectoryInfo subDirectory = testDirectory.CreateSubdirectory("three.one"); + firstFile.CopyTo(Path.Join(subDirectory.FullName, "subfile.one")); + + firstFile.Refresh(); + Assert.True(firstFile.Length > 0, "The file we wrote should have a length."); + Assert.Equal(firstFile.Length * 3, CountFileBytes(testDirectory.FullName, false)); + + Assert.Equal(firstFile.Length * 4, CountFileBytes(testDirectory.FullName, true)); + } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/tests/Enumeration/FileSystemNameTests.netcoreapp.cs b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/FileSystemNameTests.netcoreapp.cs new file mode 100644 index 0000000000..a199d2c298 --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/FileSystemNameTests.netcoreapp.cs @@ -0,0 +1,154 @@ +// 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.IO.Enumeration; +using Xunit; + +namespace System.IO.Tests +{ + public class FileSystemNameTests + { + [Theory, + MemberData(nameof(SimpleMatchData)), + MemberData(nameof(EscapedSimpleMatchData)), + MemberData(nameof(Win32MatchData)), + MemberData(nameof(EscapedWin32MatchData))] + public static void Win32Match(string expression, string name, bool ignoreCase, bool expected) + { + Assert.Equal(expected, FileSystemName.MatchesWin32Expression(expression, name.AsSpan(), ignoreCase)); + } + + [Theory, + MemberData(nameof(SimpleMatchData)), + MemberData(nameof(EscapedSimpleMatchData))] + public static void SimpleMatch(string expression, string name, bool ignoreCase, bool expected) + { + Assert.Equal(expected, FileSystemName.MatchesSimpleExpression(expression, name.AsSpan(), ignoreCase)); + } + + public static TheoryData EscapedSimpleMatchData => new TheoryData + { + // Trailing escape matches as it is considered "invisible" + { "\\", "\\", false, true }, + { "\\", "\\", true, true }, + { "\\\\", "\\", false, true }, + { "\\\\", "\\", true, true }, + + { "\\*", "a", false, false }, + { "\\*", "a", true, false }, + { "\\*", "*", false, true }, + { "\\*", "*", true, true }, + { "*\\*", "***", false, true }, + { "*\\*", "***", true, true }, + { "*\\*", "ABC*", false, true }, + { "*\\*", "ABC*", true, true }, + { "*\\*", "***A", false, false }, + { "*\\*", "***A", true, false }, + { "*\\*", "ABC*A", false, false }, + { "*\\*", "ABC*A", true, false }, + }; + + public static TheoryData EscapedWin32MatchData => new TheoryData + { + { "\\\"", "a", false, false }, + { "\\\"", "a", true, false }, + { "\\\"", "\"", false, true }, + { "\\\"", "\"", true, true }, + }; + + public static TheoryData SimpleMatchData => new TheoryData + { + { null, "", false, false }, + { null, "", true, false }, + { "*", "", false, false }, + { "*", "", true, false }, + { "*", "ab", false, true }, + { "*", "AB", true, true }, + { "*foo", "foo", false, true }, + { "*foo", "foo", true, true }, + { "*foo", "FOO", false, false }, + { "*foo", "FOO", true, true }, + { "*foo", "nofoo", true, true }, + { "*foo", "NoFOO", true, true }, + { "*foo", "noFOO", false, false }, + { @"*", @"foo.txt", true, true }, + { @".", @"foo.txt", true, false }, + { @".", @"footxt", true, false }, + { @"*.*", @"foo.txt", true, true }, + { @"*.*", @"foo.", true, true }, + { @"*.*", @".foo", true, true }, + { @"*.*", @"footxt", true, false }, + }; + + public static TheoryData Win32MatchData => new TheoryData + { + { "<\"*", @"footxt", true, true }, // DOS equivalent of *.* + { "<\"*", @"foo.txt", true, true }, // DOS equivalent of *.* + { "<\"*", @".foo", true, true }, // DOS equivalent of *.* + { "<\"*", @"foo.", true, true }, // DOS equivalent of *.* + { ">\">", @"a.b", true, true }, // DOS equivalent of ?.? + { ">\">", @"a.", true, true }, // DOS equivalent of ?.? + { ">\">", @"a", true, true }, // DOS equivalent of ?.? + { ">\">", @"ab", true, false }, // DOS equivalent of ?.? + { ">\">", @"a.bc", true, false }, // DOS equivalent of ?.? + { ">\">", @"ab.c", true, false }, // DOS equivalent of ?.? + { ">>\">>", @"a.b", true, true }, // DOS equivalent of ??.?? + { ">>\"\">>", @"a.b", true, false }, // Not possible to do from DOS ??""?? + { ">>\">>", @"a.bc", true, true }, // DOS equivalent of ??.?? + { ">>\">>", @"ab.ba", true, true }, // DOS equivalent of ??.?? + { ">>\">>", @"ab.", true, true }, // DOS equivalent of ??.?? + { ">>\"\"\">>", @"ab.", true, true }, // Not possible to do from DOS ??"""?? + { ">>b\">>", @"ab.ba", true, false }, // DOS equivalent of ??b.?? + { "a>>\">>", @"ab.ba", true, true }, // DOS equivalent of a??.?? + { ">>\">>a", @"ab.ba", true, false }, // DOS equivalent of ??.??a + { ">>\"b>>", @"ab.ba", true, true }, // DOS equivalent of ??.b?? + { ">>\"b>>", @"ab.b", true, true }, // DOS equivalent of ??.b?? + { ">>b.>>", @"ab.ba", true, false }, + { "a>>.>>", @"ab.ba", true, true }, + { ">>.>>a", @"ab.ba", true, false }, + { ">>.b>>", @"ab.ba", true, true }, + { ">>.b>>", @"ab.b", true, true }, + { ">>\">>\">>", @"ab.ba", true, true }, // DOS equivalent of ??.??.?? (The last " is an optional period) + { ">>\">>\">>", @"abba", true, false }, // DOS equivalent of ??.??.?? (The first " isn't, so this doesn't match) + { ">>\"ab\"ba", @"ab.ba", true, false }, // DOS equivalent of ??.ab.ba + { "ab\"ba\">>", @"ab.ba", true, true }, // DOS equivalent of ab.ba.?? + { "ab\">>\"ba", @"ab.ba", true, false }, // DOS equivalent of ab.??.ba + { ">>\">>\">>>", @"ab.ba.cab", true, true }, // DOS equivalent of ??.??.??? + { "a>>\"b>>\"c>>>", @"ab.ba.cab", true, true }, // DOS equivalent of a??.b??.c??? + { @"<", @"a", true, true }, // DOS equivalent of *. + { @"<", @"a.", true, true }, // DOS equivalent of *. + { @"<", @"a. ", true, false }, // DOS equivalent of *. + { @"<", @"a.b", true, false }, // DOS equivalent of *. + { @"foo<", @"foo.", true, true }, // DOS equivalent of foo*. + { @"foo<", @"foo. ", true, false }, // DOS equivalent of foo*. + { @"<<", @"a.b", true, true }, + { @"<<", @"a.b.c", true, true }, + { "<\"", @"a.b.c", true, false }, + { @"<.", @"a", true, false }, + { @"<.", @"a.", true, true }, + { @"<.", @"a.b", true, false }, + }; + + [Theory, + InlineData("", "*"), + InlineData("*.*", "*"), + InlineData("*", "*"), + InlineData(".", "."), + InlineData("?", ">"), + InlineData("*.", "<"), + InlineData("?.?", ">\">"), + InlineData("foo*.", "foo<")] + public void TranslateExpression(string expression, string expected) + { + Assert.Equal(expected, FileSystemName.TranslateWin32Expression(expression)); + } + + [Fact] + public void TranslateVeryLongExpression() + { + string longString = new string('a', 10_000_000); + Assert.Equal(longString, FileSystemName.TranslateWin32Expression(longString)); + } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/tests/Enumeration/IncludePredicateTests.netcoreapp.cs b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/IncludePredicateTests.netcoreapp.cs new file mode 100644 index 0000000000..0a6737e064 --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/IncludePredicateTests.netcoreapp.cs @@ -0,0 +1,55 @@ +// 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.Collections.Generic; +using System.IO.Enumeration; +using System.Linq; +using Xunit; + +namespace System.IO.Tests.Enumeration +{ + public abstract class IncludePredicateTests : FileSystemTest + { + public static IEnumerable GetFileFullPathsWithExtension(string directory, + bool recursive, params string[] extensions) + { + return new FileSystemEnumerable( + directory, + (ref FileSystemEntry entry) => entry.ToFullPath(), + new EnumerationOptions() { RecurseSubdirectories = recursive }) + { + ShouldIncludePredicate = (ref FileSystemEntry entry) => + { + if (entry.IsDirectory) return false; + foreach (string extension in extensions) + { + if (Path.GetExtension(entry.FileName).EndsWith(extension)) + return true; + } + return false; + } + }; + } + + [Fact] + public void CustomExtensionMatch() + { + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + DirectoryInfo testSubdirectory = Directory.CreateDirectory(Path.Combine(testDirectory.FullName, "Subdirectory")); + FileInfo fileOne = new FileInfo(Path.Combine(testDirectory.FullName, "fileone.htm")); + FileInfo fileTwo = new FileInfo(Path.Combine(testDirectory.FullName, "filetwo.html")); + FileInfo fileThree = new FileInfo(Path.Combine(testSubdirectory.FullName, "filethree.doc")); + FileInfo fileFour = new FileInfo(Path.Combine(testSubdirectory.FullName, "filefour.docx")); + + fileOne.Create().Dispose(); + fileTwo.Create().Dispose(); + fileThree.Create().Dispose(); + fileFour.Create().Dispose(); + + string[] paths = GetFileFullPathsWithExtension(testDirectory.FullName, true, ".htm", ".doc").ToArray(); + + FSAssert.EqualWhenOrdered(new string[] { fileOne.FullName, fileThree.FullName }, paths); + } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/tests/Enumeration/MatchCasingTests.netcoreapp.cs b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/MatchCasingTests.netcoreapp.cs new file mode 100644 index 0000000000..00a74055ab --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/MatchCasingTests.netcoreapp.cs @@ -0,0 +1,60 @@ +// 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.IO.Enumeration; +using System.Linq; +using Xunit; + +namespace System.IO.Tests.Enumeration +{ + public abstract class MatchCasingTests : FileSystemTest + { + protected abstract string[] GetPaths(string directory, string pattern, EnumerationOptions options); + + [Fact] + public void MatchCase() + { + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + DirectoryInfo testSubdirectory = Directory.CreateDirectory(Path.Combine(testDirectory.FullName, "Subdirectory")); + FileInfo fileOne = new FileInfo(Path.Combine(testDirectory.FullName, "FileOne")); + FileInfo fileTwo = new FileInfo(Path.Combine(testDirectory.FullName, "FileTwo")); + FileInfo fileThree = new FileInfo(Path.Combine(testSubdirectory.FullName, "FileThree")); + FileInfo fileFour = new FileInfo(Path.Combine(testSubdirectory.FullName, "FileFour")); + + fileOne.Create().Dispose(); + fileTwo.Create().Dispose(); + fileThree.Create().Dispose(); + fileFour.Create().Dispose(); + + string[] paths = GetPaths(testDirectory.FullName, "file*", new EnumerationOptions { MatchCasing = MatchCasing.CaseSensitive, RecurseSubdirectories = true }); + + Assert.Empty(paths); + + paths = GetPaths(testDirectory.FullName, "file*", new EnumerationOptions { MatchCasing = MatchCasing.CaseInsensitive, RecurseSubdirectories = true }); + FSAssert.EqualWhenOrdered(new string[] { fileOne.FullName, fileTwo.FullName, fileThree.FullName, fileFour.FullName }, paths); + + paths = GetPaths(testDirectory.FullName, "FileT*", new EnumerationOptions { MatchCasing = MatchCasing.CaseSensitive, RecurseSubdirectories = true }); + FSAssert.EqualWhenOrdered(new string[] { fileTwo.FullName, fileThree.FullName }, paths); + + paths = GetPaths(testDirectory.FullName, "File???", new EnumerationOptions { MatchCasing = MatchCasing.CaseSensitive, RecurseSubdirectories = true }); + FSAssert.EqualWhenOrdered(new string[] { fileOne.FullName, fileTwo.FullName }, paths); + } + } + + public class MatchCasingTests_Directory_GetFiles : MatchCasingTests + { + protected override string[] GetPaths(string directory, string pattern, EnumerationOptions options) + { + return Directory.GetFiles(directory, pattern, options); + } + } + + public class MatchCasingTests_DirectoryInfo_GetFiles : MatchCasingTests + { + protected override string[] GetPaths(string directory, string pattern, EnumerationOptions options) + { + return new DirectoryInfo(directory).GetFiles(pattern, options).Select(i => i.FullName).ToArray(); + } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/tests/Enumeration/MatchTypesTests.netcoreapp.cs b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/MatchTypesTests.netcoreapp.cs new file mode 100644 index 0000000000..49b8e1b9e0 --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/MatchTypesTests.netcoreapp.cs @@ -0,0 +1,80 @@ +// 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.Linq; +using Xunit; + +namespace System.IO.Tests.Enumeration +{ + public abstract class MatchTypesTests : FileSystemTest + { + protected abstract string[] GetPaths(string directory, string pattern, EnumerationOptions options); + + [Fact] + public void QuestionMarkBehavior() + { + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + FileInfo fileOne = new FileInfo(Path.Combine(testDirectory.FullName, "a.one")); + FileInfo fileTwo = new FileInfo(Path.Combine(testDirectory.FullName, "ab.two")); + FileInfo fileThree = new FileInfo(Path.Combine(testDirectory.FullName, "abc.three")); + + fileOne.Create().Dispose(); + fileTwo.Create().Dispose(); + fileThree.Create().Dispose(); + + // Question marks collapse to periods in Win32 + string[] paths = GetPaths(testDirectory.FullName, "a??.*", new EnumerationOptions { MatchType = MatchType.Win32 }); + FSAssert.EqualWhenOrdered(new string[] { fileOne.FullName, fileTwo.FullName, fileThree.FullName }, paths); + + paths = GetPaths(testDirectory.FullName, "*.?????", new EnumerationOptions { MatchType = MatchType.Win32 }); + FSAssert.EqualWhenOrdered(new string[] { fileOne.FullName, fileTwo.FullName, fileThree.FullName }, paths); + + // Simple, one question mark is one character + paths = GetPaths(testDirectory.FullName, "a??.*", new EnumerationOptions { MatchType = MatchType.Simple }); + FSAssert.EqualWhenOrdered(new string[] { fileThree.FullName }, paths); + + paths = GetPaths(testDirectory.FullName, "*.?????", new EnumerationOptions { MatchType = MatchType.Simple }); + FSAssert.EqualWhenOrdered(new string[] { fileThree.FullName }, paths); + } + + [Fact] + public void StarDotBehavior() + { + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + FileInfo fileOne = new FileInfo(Path.Combine(testDirectory.FullName, "one")); + FileInfo fileTwo = new FileInfo(Path.Combine(testDirectory.FullName, "one.two")); + string fileThree = Path.Combine(testDirectory.FullName, "three."); + + fileOne.Create().Dispose(); + fileTwo.Create().Dispose(); + + // Need extended device syntax to create a name with a trailing dot. + File.Create(PlatformDetection.IsWindows ? @"\\?\" + fileThree : fileThree).Dispose(); + + // *. means any file without an extension + string[] paths = GetPaths(testDirectory.FullName, "*.", new EnumerationOptions { MatchType = MatchType.Win32 }); + FSAssert.EqualWhenOrdered(new string[] { fileOne.FullName, fileThree }, paths); + + // Simple, anything with a trailing period + paths = GetPaths(testDirectory.FullName, "*.", new EnumerationOptions { MatchType = MatchType.Simple }); + FSAssert.EqualWhenOrdered(new string[] { fileThree }, paths); + } + } + + public class MatchTypesTests_Directory_GetFiles : MatchTypesTests + { + protected override string[] GetPaths(string directory, string pattern, EnumerationOptions options) + { + return Directory.GetFiles(directory, pattern, options); + } + } + + public class MatchTypesTests_DirectoryInfo_GetFiles : MatchTypesTests + { + protected override string[] GetPaths(string directory, string pattern, EnumerationOptions options) + { + return new DirectoryInfo(directory).GetFiles(pattern, options).Select(i => i.FullName).ToArray(); + } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/tests/Enumeration/PatternTransformTests.netcoreapp.cs b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/PatternTransformTests.netcoreapp.cs new file mode 100644 index 0000000000..9cb33e5853 --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/PatternTransformTests.netcoreapp.cs @@ -0,0 +1,126 @@ +// 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.Linq; +using Xunit; + +namespace System.IO.Tests.Enumeration +{ + public class PatternTransformTests_Directory : FileSystemTest + { + protected virtual string[] GetFiles(string directory, string pattern) + { + return Directory.GetFiles(directory, pattern); + } + + protected virtual string[] GetFiles(string directory, string pattern, EnumerationOptions options) + { + return Directory.GetFiles(directory, pattern, options); + } + + [Theory, + InlineData("."), + InlineData("*.*")] + public void GetFiles_WildcardPatternIsTranslated(string pattern) + { + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + FileInfo fileOne = new FileInfo(Path.Combine(testDirectory.FullName, "File.One")); + FileInfo fileTwo = new FileInfo(Path.Combine(testDirectory.FullName, "FileTwo")); + fileOne.Create().Dispose(); + fileTwo.Create().Dispose(); + string[] results = GetFiles(testDirectory.FullName, pattern); + FSAssert.EqualWhenOrdered(new string[] { fileOne.FullName, fileTwo.FullName }, results); + + results = GetFiles(testDirectory.FullName, pattern, new EnumerationOptions { MatchType = MatchType.Win32 }); + FSAssert.EqualWhenOrdered(new string[] { fileOne.FullName, fileTwo.FullName }, results); + } + + [Fact] + public void GetFiles_WildcardPatternIsNotTranslated() + { + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + FileInfo fileOne = new FileInfo(Path.Combine(testDirectory.FullName, "File.One")); + FileInfo fileTwo = new FileInfo(Path.Combine(testDirectory.FullName, "FileTwo")); + fileOne.Create().Dispose(); + fileTwo.Create().Dispose(); + string[] results = GetFiles(testDirectory.FullName, ".", new EnumerationOptions()); + Assert.Empty(results); + + results = GetFiles(testDirectory.FullName, "*.*", new EnumerationOptions()); + Assert.Equal(new string[] { fileOne.FullName }, results); + } + + [Fact] + public void GetFiles_EmptyPattern() + { + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + FileInfo fileOne = new FileInfo(Path.Combine(testDirectory.FullName, "File.One")); + FileInfo fileTwo = new FileInfo(Path.Combine(testDirectory.FullName, "FileTwo")); + fileOne.Create().Dispose(); + fileTwo.Create().Dispose(); + + // We allow for expression to be "foo\" which would translate to "foo\*". + string[] results = GetFiles(testDirectory.Parent.FullName, testDirectory.Name + Path.DirectorySeparatorChar); + FSAssert.EqualWhenOrdered(new string[] { fileOne.FullName, fileTwo.FullName }, results); + + results = GetFiles(testDirectory.Parent.FullName, testDirectory.Name + Path.AltDirectorySeparatorChar); + FSAssert.EqualWhenOrdered(new string[] { fileOne.FullName, fileTwo.FullName }, results); + + results = GetFiles(testDirectory.FullName, string.Empty); + FSAssert.EqualWhenOrdered(new string[] { fileOne.FullName, fileTwo.FullName }, results); + } + + [Fact] + [PlatformSpecific(TestPlatforms.AnyUnix)] + public void GetFiles_EmptyPattern_Unix() + { + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + FileInfo fileOne = new FileInfo(Path.Combine(testDirectory.FullName, "File\\One")); + FileInfo fileTwo = new FileInfo(Path.Combine(testDirectory.FullName, "FileTwo")); + fileOne.Create().Dispose(); + fileTwo.Create().Dispose(); + + // We allow for expression to be "foo\" which would translate to "foo\*". On Unix we should not be + // considering the backslash as a directory separator. + string[] results = GetFiles(testDirectory.FullName, "File\\One"); + Assert.Equal(new string[] { fileOne.FullName }, results); + } + + [Fact] + [PlatformSpecific(TestPlatforms.AnyUnix)] + public void GetFiles_ExtendedDosWildcards_Unix() + { + // The extended wildcards ('"', '<', and '>') should not be considered on Unix, even when doing DOS style matching. + // Getting these behaviors requires using the FileSystemEnumerable/Enumerator directly. + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + FileInfo fileOne = new FileInfo(Path.Combine(testDirectory.FullName, "File\"One")); + FileInfo fileTwo = new FileInfo(Path.Combine(testDirectory.FullName, "FileThree")); + fileOne.Create().Dispose(); + fileTwo.Create().Dispose(); + fileThree.Create().Dispose(); + + string[] results = GetFiles(testDirectory.FullName, "*\"*"); + Assert.Equal(new string[] { fileOne.FullName }, results); + results = GetFiles(testDirectory.FullName, "*<*"); + Assert.Equal(new string[] { fileTwo.FullName }, results); + results = GetFiles(testDirectory.FullName, "*>*"); + Assert.Equal(new string[] { fileThree.FullName }, results); + } + } + + public class PatternTransformTests_DirectoryInfo : PatternTransformTests_Directory + { + + protected override string[] GetFiles(string directory, string pattern) + { + return new DirectoryInfo(directory).GetFiles(pattern).Select(i => i.FullName).ToArray(); + } + + protected override string[] GetFiles(string directory, string pattern, EnumerationOptions options) + { + return new DirectoryInfo(directory).GetFiles(pattern, options).Select(i => i.FullName).ToArray(); + } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/tests/Enumeration/RootTests.netcoreapp.cs b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/RootTests.netcoreapp.cs new file mode 100644 index 0000000000..91b1376ede --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/RootTests.netcoreapp.cs @@ -0,0 +1,59 @@ +// 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.IO.Enumeration; +using Xunit; + +namespace System.IO.Tests.Enumeration +{ + public class RootTests + { + private class DirectoryRecursed : FileSystemEnumerator + { + public string LastDirectory { get; private set; } + + public DirectoryRecursed(string directory, EnumerationOptions options) + : base(directory, options) + { + } + + protected override bool ShouldIncludeEntry(ref FileSystemEntry entry) + => !entry.IsDirectory; + + protected override string TransformEntry(ref FileSystemEntry entry) + => entry.ToFullPath(); + + protected override bool ShouldRecurseIntoEntry(ref FileSystemEntry entry) + { + LastDirectory = new string(entry.Directory); + return false; + } + } + + [Fact] + public void CanRecurseFromRoot() + { + string root = Path.GetPathRoot(Path.GetTempPath()); + + using (var recursed = new DirectoryRecursed(root, new EnumerationOptions { AttributesToSkip = FileAttributes.System, RecurseSubdirectories = true })) + { + while (recursed.MoveNext()) + { + if (recursed.LastDirectory != null) + { + Assert.Equal(root, recursed.LastDirectory); + return; + } + + // Should start with the root and shouldn't have a separator after the root + Assert.StartsWith(root, recursed.Current); + Assert.True(recursed.Current.LastIndexOf(Path.DirectorySeparatorChar) < root.Length, + $"should have no separators pasth the root '{root}' in in '{recursed.Current}'"); + } + + Assert.NotNull(recursed.LastDirectory); + } + } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/tests/Enumeration/SkipAttributeTests.netcoreapp.cs b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/SkipAttributeTests.netcoreapp.cs new file mode 100644 index 0000000000..39e4d84324 --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/SkipAttributeTests.netcoreapp.cs @@ -0,0 +1,107 @@ +// 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.IO.Enumeration; +using System.Linq; +using Xunit; + +namespace System.IO.Tests.Enumeration +{ + public class SkipAttributeTests : FileSystemTest + { + protected virtual string[] GetPaths(string directory, EnumerationOptions options) + { + return new FileSystemEnumerable( + directory, + (ref FileSystemEntry entry) => entry.ToFullPath(), + options) + { + ShouldIncludePredicate = (ref FileSystemEntry entry) => { return !entry.IsDirectory; } + }.ToArray(); + } + + [Fact] + public void SkippingHiddenFiles() + { + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + DirectoryInfo testSubdirectory = Directory.CreateDirectory(Path.Combine(testDirectory.FullName, GetTestFileName())); + FileInfo fileOne = new FileInfo(Path.Combine(testDirectory.FullName, GetTestFileName())); + + // Put a period in front to make it hidden on Unix + FileInfo fileTwo = new FileInfo(Path.Combine(testDirectory.FullName, "." + GetTestFileName())); + FileInfo fileThree = new FileInfo(Path.Combine(testSubdirectory.FullName, GetTestFileName())); + FileInfo fileFour = new FileInfo(Path.Combine(testSubdirectory.FullName, "." + GetTestFileName())); + + fileOne.Create().Dispose(); + fileTwo.Create().Dispose(); + if (PlatformDetection.IsWindows) + fileTwo.Attributes = fileTwo.Attributes | FileAttributes.Hidden; + fileThree.Create().Dispose(); + fileFour.Create().Dispose(); + if (PlatformDetection.IsWindows) + fileFour.Attributes = fileTwo.Attributes | FileAttributes.Hidden; + + // Default EnumerationOptions is to skip hidden + string[] paths = GetPaths(testDirectory.FullName, new EnumerationOptions()); + Assert.Equal(new string[] { fileOne.FullName }, paths); + + paths = GetPaths(testDirectory.FullName, new EnumerationOptions { AttributesToSkip = 0 }); + FSAssert.EqualWhenOrdered(new string[] { fileOne.FullName, fileTwo.FullName }, paths); + + paths = GetPaths(testDirectory.FullName, new EnumerationOptions { RecurseSubdirectories = true }); + Assert.Equal(new string[] { fileOne.FullName, fileThree.FullName }, paths); + + if (PlatformDetection.IsWindows) + { + // Shouldn't recurse into the subdirectory now that it is hidden + testSubdirectory.Attributes = testSubdirectory.Attributes | FileAttributes.Hidden; + } + else + { + Directory.Move(testSubdirectory.FullName, Path.Combine(testDirectory.FullName, "." + testSubdirectory.Name)); + } + + paths = GetPaths(testDirectory.FullName, new EnumerationOptions { RecurseSubdirectories = true }); + Assert.Equal(new string[] { fileOne.FullName }, paths); + } + + [Fact] + public void SkipComesFirst() + { + // If skip comes first we shouldn't find ourselves recursing. + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + DirectoryInfo testSubdirectory = Directory.CreateDirectory(Path.Combine(testDirectory.FullName, GetTestFileName())); + + FileInfo fileOne = new FileInfo(Path.Combine(testDirectory.FullName, GetTestFileName())); + FileInfo fileTwo = new FileInfo(Path.Combine(testDirectory.FullName, GetTestFileName())); + + FileInfo fileThree = new FileInfo(Path.Combine(testSubdirectory.FullName, GetTestFileName())); + FileInfo fileFour = new FileInfo(Path.Combine(testSubdirectory.FullName, GetTestFileName())); + + fileOne.Create().Dispose(); + fileTwo.Create().Dispose(); + fileThree.Create().Dispose(); + fileFour.Create().Dispose(); + + string[] paths = GetPaths(testDirectory.FullName, new EnumerationOptions { AttributesToSkip = FileAttributes.Directory, RecurseSubdirectories = true }); + FSAssert.EqualWhenOrdered(new string[] { fileOne.FullName, fileTwo.FullName }, paths); + } + } + + public class SkipAttributeTests_Directory_GetFiles : SkipAttributeTests + { + protected override string[] GetPaths(string directory, EnumerationOptions options) + { + return Directory.GetFiles(directory, "*", options); + } + } + + public class SkipAttributeTests_DirectoryInfo_GetFiles : SkipAttributeTests + { + protected override string[] GetPaths(string directory, EnumerationOptions options) + { + return new DirectoryInfo(directory).GetFiles("*", options).Select(i => i.FullName).ToArray(); + } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/tests/Enumeration/SpecialDirectoryTests.netcoreapp.cs b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/SpecialDirectoryTests.netcoreapp.cs new file mode 100644 index 0000000000..5043190cff --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/SpecialDirectoryTests.netcoreapp.cs @@ -0,0 +1,76 @@ +// 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.Collections.Generic; +using System.IO.Enumeration; +using System.Linq; +using Xunit; + +namespace System.IO.Tests.Enumeration +{ + + public class SpecialDirectoryTests : FileSystemTest + { + private class DirectoryRecursed : FileSystemEnumerator + { + public int ShouldRecurseCalls { get; private set; } + + public DirectoryRecursed(string directory, EnumerationOptions options) + : base(directory, options) + { + } + + protected override string TransformEntry(ref FileSystemEntry entry) + =>new string(entry.FileName); + + protected override bool ShouldRecurseIntoEntry(ref FileSystemEntry entry) + { + ShouldRecurseCalls++; + return base.ShouldRecurseIntoEntry(ref entry); + } + } + + [Fact] + public void SpecialDirectoriesAreNotUpForRecursion() + { + using (var recursed = new DirectoryRecursed(TestDirectory, new EnumerationOptions { ReturnSpecialDirectories = true, RecurseSubdirectories = true, AttributesToSkip = 0 })) + { + List results = new List(); + while (recursed.MoveNext()) + results.Add(recursed.Current); + + Assert.Equal(0, recursed.ShouldRecurseCalls); + Assert.Contains("..", results); + } + } + } + + public class SpecialDirectoryTests_Enumerable : FileSystemTest + { + protected virtual string[] GetNames(string directory, EnumerationOptions options) + { + return new FileSystemEnumerable( + directory, + (ref FileSystemEntry entry) => new string(entry.FileName), + options).ToArray(); + } + + [Fact] + public void SkippingHiddenFiles() + { + // Files that begin with periods are considered hidden on Unix + string[] paths = GetNames(TestDirectory, new EnumerationOptions { ReturnSpecialDirectories = true, AttributesToSkip = 0 }); + Assert.Contains(".", paths); + Assert.Contains("..", paths); + } + } + + public class SpecialDirectoryTests_DirectoryInfo_GetDirectories : SpecialDirectoryTests_Enumerable + { + protected override string[] GetNames(string directory, EnumerationOptions options) + { + return new DirectoryInfo(directory).GetDirectories("*", options).Select(i => i.Name).ToArray(); + } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/tests/Enumeration/TrimmedPaths.netcoreapp.cs b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/TrimmedPaths.netcoreapp.cs new file mode 100644 index 0000000000..ed73117634 --- /dev/null +++ b/external/corefx/src/System.IO.FileSystem/tests/Enumeration/TrimmedPaths.netcoreapp.cs @@ -0,0 +1,284 @@ +// 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.Linq; +using Xunit; + +namespace System.IO.Tests.Enumeration +{ + public class TrimmedPaths : FileSystemTest + { + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] + public void TrimmedPathsAreFound_Windows() + { + // Trailing spaces and periods are eaten when normalizing in Windows, making them impossible + // to access without using the \\?\ device syntax. We should, however, be able to find them + // and retain the filename in the info classes and string results. + + DirectoryInfo directory = Directory.CreateDirectory(GetTestFilePath()); + File.Create(@"\\?\" + Path.Combine(directory.FullName, "Trailing space ")).Dispose(); + File.Create(@"\\?\" + Path.Combine(directory.FullName, "Trailing period.")).Dispose(); + + FileInfo[] files = directory.GetFiles(); + Assert.Equal(2, files.Count()); + FSAssert.EqualWhenOrdered(new string[] { "Trailing space ", "Trailing period." }, files.Select(f => f.Name)); + + var paths = Directory.GetFiles(directory.FullName); + Assert.Equal(2, paths.Count()); + FSAssert.EqualWhenOrdered(new string[] { "Trailing space ", "Trailing period." }, paths.Select(p => Path.GetFileName(p))); + } + + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] + public void TrimmedPathsDeletion_Windows() + { + // Trailing spaces and periods are eaten when normalizing in Windows, making them impossible + // to access without using the \\?\ device syntax. We should, however, be able to delete them + // from the info class. + + DirectoryInfo directory = Directory.CreateDirectory(GetTestFilePath()); + File.Create(@"\\?\" + Path.Combine(directory.FullName, "Trailing space ")).Dispose(); + File.Create(@"\\?\" + Path.Combine(directory.FullName, "Trailing period.")).Dispose(); + + // With just a path name, the trailing space/period will get eaten, so we + // can't delete without prepending- they won't "exist". + var paths = Directory.GetFiles(directory.FullName); + Assert.All(paths, p => Assert.False(File.Exists(p))); + + FileInfo[] files = directory.GetFiles(); + Assert.Equal(2, files.Count()); + Assert.All(files, f => Assert.True(f.Exists)); + foreach (FileInfo f in files) + f.Refresh(); + Assert.All(files, f => Assert.True(f.Exists)); + foreach (FileInfo f in files) + { + f.Delete(); + f.Refresh(); + } + Assert.All(files, f => Assert.False(f.Exists)); + + foreach (FileInfo f in files) + { + f.Create().Dispose(); + f.Refresh(); + } + Assert.All(files, f => Assert.True(f.Exists)); + } + + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] + public void TrimmedPathsOpen_Windows() + { + // Trailing spaces and periods are eaten when normalizing in Windows, making them impossible + // to access without using the \\?\ device syntax. We should, however, be able to open them + // from the info class when enumerating. + + DirectoryInfo directory = Directory.CreateDirectory(GetTestFilePath()); + string fileOne = Path.Join(directory.FullName, "Trailing space "); + string fileTwo = Path.Join(directory.FullName, "Trailing period."); + File.Create(@"\\?\" + fileOne).Dispose(); + File.Create(@"\\?\" + fileTwo).Dispose(); + + FileInfo[] files = directory.GetFiles(); + Assert.Equal(2, files.Length); + foreach (FileInfo fi in directory.GetFiles()) + { + // Shouldn't throw hitting any of the Open overloads + using (FileStream stream = fi.Open(FileMode.Open)) + { } + using (FileStream stream = fi.Open(FileMode.Open, FileAccess.Read)) + { } + using (FileStream stream = fi.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) + { } + using (FileStream stream = fi.OpenRead()) + { } + using (FileStream stream = fi.OpenWrite()) + { } + } + } + + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] + public void TrimmedPathsText_Windows() + { + // Trailing spaces and periods are eaten when normalizing in Windows, making them impossible + // to access without using the \\?\ device syntax. We should, however, be able to open readers + // and writers from the the info class when enumerating. + + DirectoryInfo directory = Directory.CreateDirectory(GetTestFilePath()); + string fileOne = Path.Join(directory.FullName, "Trailing space "); + string fileTwo = Path.Join(directory.FullName, "Trailing period."); + File.WriteAllText(@"\\?\" + fileOne, "space"); + File.WriteAllText(@"\\?\" + fileTwo, "period"); + + FileInfo[] files = directory.GetFiles(); + Assert.Equal(2, files.Length); + foreach (FileInfo fi in directory.GetFiles()) + { + using (StreamReader reader = fi.OpenText()) + { + string content = reader.ReadToEnd(); + if (fi.FullName.EndsWith(fileOne)) + { + Assert.Equal("space", content); + } + else if (fi.FullName.EndsWith(fileTwo)) + { + Assert.Equal("period", content); + } + else + { + Assert.False(true, $"Unexpected name '{fi.FullName}'"); + } + } + + using (StreamWriter writer = fi.CreateText()) + { + writer.Write("foo"); + } + + using (StreamReader reader = fi.OpenText()) + { + Assert.Equal("foo", reader.ReadToEnd()); + } + + using (StreamWriter writer = fi.AppendText()) + { + writer.Write("bar"); + } + + using (StreamReader reader = fi.OpenText()) + { + Assert.Equal("foobar", reader.ReadToEnd()); + } + } + } + + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] + public void TrimmedPathsCopyTo_Windows() + { + // Trailing spaces and periods are eaten when normalizing in Windows, making them impossible + // to access without using the \\?\ device syntax. We should, however, be able to copy them + // without the special syntax from the info class when enumerating. + + DirectoryInfo directory = Directory.CreateDirectory(GetTestFilePath()); + string fileOne = Path.Join(directory.FullName, "Trailing space "); + string fileTwo = Path.Join(directory.FullName, "Trailing period."); + File.Create(@"\\?\" + fileOne).Dispose(); + File.Create(@"\\?\" + fileTwo).Dispose(); + + FileInfo[] files = directory.GetFiles(); + Assert.Equal(2, files.Length); + foreach (FileInfo fi in directory.GetFiles()) + { + FileInfo newInfo = fi.CopyTo(Path.Join(directory.FullName, GetTestFileName())); + Assert.True(newInfo.Exists); + FileInfo newerInfo = fi.CopyTo(Path.Join(directory.FullName, GetTestFileName()), overwrite: true); + Assert.True(newerInfo.Exists); + } + + Assert.Equal(6, directory.GetFiles().Length); + } + + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] + public void TrimmedPathsReplace_Windows() + { + // Trailing spaces and periods are eaten when normalizing in Windows, making them impossible + // to access without using the \\?\ device syntax. We should, however, be able to replace them + // from the info class when enumerating. + + DirectoryInfo directory = Directory.CreateDirectory(GetTestFilePath()); + string fileOne = Path.Join(directory.FullName, "Trailing space "); + string fileTwo = Path.Join(directory.FullName, "Trailing period."); + File.WriteAllText(@"\\?\" + fileOne, "space"); + File.WriteAllText(@"\\?\" + fileTwo, "period"); + + FileInfo[] files = directory.GetFiles(); + Assert.Equal(2, files.Length); + + FileInfo destination = new FileInfo(Path.Join(directory.FullName, GetTestFileName())); + destination.Create().Dispose(); + + foreach (FileInfo fi in files) + { + fi.Replace(destination.FullName, null); + using (StreamReader reader = destination.OpenText()) + { + string content = reader.ReadToEnd(); + if (fi.FullName.EndsWith(fileOne)) + { + Assert.Equal("space", content); + } + else if (fi.FullName.EndsWith(fileTwo)) + { + Assert.Equal("period", content); + } + else + { + Assert.False(true, $"Unexpected name '{fi.FullName}'"); + } + } + } + } + + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] + public void TrimmedPathsMoveTo_Windows() + { + // Trailing spaces and periods are eaten when normalizing in Windows, making them impossible + // to access without using the \\?\ device syntax. We should, however, be able to move them + // without the special syntax from the info class when enumerating. + + DirectoryInfo directory = Directory.CreateDirectory(GetTestFilePath()); + DirectoryInfo spaceDirectory = Directory.CreateDirectory(Path.Join(@"\\?\", directory.FullName, "Trailing space ")); + DirectoryInfo periodDirectory = Directory.CreateDirectory(Path.Join(@"\\?\", directory.FullName, "Trailing period.")); + string spaceFile = Path.Join(spaceDirectory.FullName, "space"); + string periodFile = Path.Join(periodDirectory.FullName, "period"); + File.Create(spaceFile).Dispose(); + File.Create(periodFile).Dispose(); + + DirectoryInfo[] directories = directory.GetDirectories(); + Assert.Equal(2, directories.Length); + foreach (DirectoryInfo di in directories) + { + if (di.Name == "Trailing space ") + { + di.MoveTo(Path.Join(directory.FullName, "WasSpace")); + } + else if (di.Name == "Trailing period.") + { + di.MoveTo(Path.Join(directory.FullName, "WasPeriod")); + } + else + { + Assert.False(true, $"Found unexpected name '{di.Name}'"); + } + } + + directories = directory.GetDirectories(); + Assert.Equal(2, directories.Length); + foreach (DirectoryInfo di in directories) + { + if (di.Name == "WasSpace") + { + FileInfo fi = di.GetFiles().Single(); + Assert.Equal("space", fi.Name); + } + else if (di.Name == "WasPeriod") + { + FileInfo fi = di.GetFiles().Single(); + Assert.Equal("period", fi.Name); + } + else + { + Assert.False(true, $"Found unexpected name '{di.Name}'"); + } + } + } + } +} diff --git a/external/corefx/src/System.IO.FileSystem/tests/FSAssert.cs b/external/corefx/src/System.IO.FileSystem/tests/FSAssert.cs index 9fbefaa874..10125d8537 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/FSAssert.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/FSAssert.cs @@ -2,6 +2,8 @@ // 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.Collections.Generic; +using System.Linq; using System.Threading; using System.Threading.Tasks; using Xunit; @@ -62,5 +64,10 @@ namespace System.IO.Tests Assert.NotNull(tce); Assert.Equal(ct, tce.CancellationToken); } + + public static void EqualWhenOrdered(IEnumerable expected, IEnumerable actual) + { + Assert.Equal(expected.OrderBy(e => e).Select(o => o), actual.OrderBy(a => a).Select(o => o)); + } } } diff --git a/external/corefx/src/System.IO.FileSystem/tests/File/Copy.cs b/external/corefx/src/System.IO.FileSystem/tests/File/Copy.cs index 036dedae6a..1caca2aae1 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/File/Copy.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/File/Copy.cs @@ -4,23 +4,17 @@ using System.Collections.Generic; using System.Linq; -using System.Runtime.InteropServices; using Xunit; namespace System.IO.Tests { public partial class File_Copy_str_str : FileSystemTest { - #region Utilities - - public static TheoryData WindowsInvalidUnixValid = new TheoryData { " ", " ", "\n", ">", "<", "\t" }; public virtual void Copy(string source, string dest) { File.Copy(source, dest); } - #endregion - #region UniversalTests [Fact] @@ -160,10 +154,11 @@ namespace System.IO.Tests #region PlatformSpecific - [Theory, - MemberData(nameof(WindowsInvalidUnixValid))] - [PlatformSpecific(TestPlatforms.Windows)] // Whitespace path throws ArgumentException - public void WindowsWhitespacePath(string invalid) + [Theory, + InlineData(" "), + InlineData(" ")] + [PlatformSpecific(TestPlatforms.Windows)] + public void WindowsAllSpacePath(string invalid) { string testFile = GetTestFilePath(); File.Create(testFile).Dispose(); @@ -173,24 +168,92 @@ namespace System.IO.Tests } [Theory, - MemberData(nameof(WindowsInvalidUnixValid))] - [PlatformSpecific(TestPlatforms.AnyUnix)] // Whitespace path allowed - public void UnixWhitespacePath(string valid) + InlineData("\n"), + InlineData(">"), + InlineData("<"), + InlineData("\t")] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] + public void WindowsInvalidCharsPath_Desktop(string invalid) { string testFile = GetTestFilePath(); File.Create(testFile).Dispose(); + Assert.Throws(() => Copy(testFile, invalid)); + Assert.Throws(() => Copy(invalid, testFile)); + } + + [Theory, + InlineData("\n"), + InlineData(">"), + InlineData("<"), + InlineData("\t")] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void WindowsInvalidCharsPath_Core(string invalid) + { + string testFile = GetTestFilePath(); + File.Create(testFile).Dispose(); + + Assert.Throws(() => Copy(testFile, invalid)); + Assert.Throws(() => Copy(invalid, testFile)); + } + + [Theory, + InlineData(" "), + InlineData(" "), + InlineData("\n"), + InlineData(">"), + InlineData("<"), + InlineData("\t")] + [PlatformSpecific(TestPlatforms.AnyUnix)] + public void UnixInvalidWindowsPaths(string valid) + { + // Unix allows whitespaces paths that aren't valid on Windows + string testFile = GetTestFilePath(); + File.Create(testFile).Dispose(); + Copy(testFile, Path.Combine(TestDirectory, valid)); Assert.True(File.Exists(testFile)); Assert.True(File.Exists(Path.Combine(TestDirectory, valid))); } + + [Theory, + InlineData("", ":bar"), + InlineData("", ":bar:$DATA"), + InlineData("::$DATA", ":bar"), + InlineData("::$DATA", ":bar:$DATA")] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void WindowsAlternateDataStream(string defaultStream, string alternateStream) + { + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + string testFile = Path.Combine(testDirectory.FullName, GetTestFileName()); + string testFileDefaultStream = testFile + defaultStream; + string testFileAlternateStream = testFile + alternateStream; + + // Copy the default stream into an alternate stream + File.WriteAllText(testFileDefaultStream, "Foo"); + Copy(testFileDefaultStream, testFileAlternateStream); + Assert.Equal(testFile, testDirectory.GetFiles().Single().FullName); + Assert.Equal("Foo", File.ReadAllText(testFileDefaultStream)); + Assert.Equal("Foo", File.ReadAllText(testFileAlternateStream)); + + // Copy another file over the alternate stream + string testFile2 = Path.Combine(testDirectory.FullName, GetTestFileName()); + string testFile2DefaultStream = testFile2 + defaultStream; + File.WriteAllText(testFile2DefaultStream, "Bar"); + Assert.Throws(() => Copy(testFile2DefaultStream, testFileAlternateStream)); + + // This always throws as you can't copy an alternate stream out (oddly) + Assert.Throws(() => Copy(testFileAlternateStream, testFile2)); + Assert.Throws(() => Copy(testFileAlternateStream, testFile2 + alternateStream)); + } #endregion } public class File_Copy_str_str_b : File_Copy_str_str { - #region Utilities - public override void Copy(string source, string dest) { File.Copy(source, dest, false); @@ -201,10 +264,6 @@ namespace System.IO.Tests File.Copy(source, dest, overwrite); } - #endregion - - #region UniversalTests - [Fact] public void OverwriteTrue() { @@ -257,6 +316,38 @@ namespace System.IO.Tests } } - #endregion + [Theory, + InlineData("", ":bar"), + InlineData("", ":bar:$DATA"), + InlineData("::$DATA", ":bar"), + InlineData("::$DATA", ":bar:$DATA")] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void WindowsAlternateDataStreamOverwrite(string defaultStream, string alternateStream) + { + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + string testFile = Path.Combine(testDirectory.FullName, GetTestFileName()); + string testFileDefaultStream = testFile + defaultStream; + string testFileAlternateStream = testFile + alternateStream; + + // Copy the default stream into an alternate stream + File.WriteAllText(testFileDefaultStream, "Foo"); + Copy(testFileDefaultStream, testFileAlternateStream); + Assert.Equal(testFile, testDirectory.GetFiles().Single().FullName); + Assert.Equal("Foo", File.ReadAllText(testFileDefaultStream)); + Assert.Equal("Foo", File.ReadAllText(testFileAlternateStream)); + + // Copy another file over the alternate stream + string testFile2 = Path.Combine(testDirectory.FullName, GetTestFileName()); + string testFile2DefaultStream = testFile2 + defaultStream; + File.WriteAllText(testFile2DefaultStream, "Bar"); + Copy(testFile2DefaultStream, testFileAlternateStream, overwrite: true); + Assert.Equal("Foo", File.ReadAllText(testFileDefaultStream)); + Assert.Equal("Bar", File.ReadAllText(testFileAlternateStream)); + + // This always throws as you can't copy an alternate stream out (oddly) + Assert.Throws(() => Copy(testFileAlternateStream, testFile2, overwrite: true)); + Assert.Throws(() => Copy(testFileAlternateStream, testFile2 + alternateStream, overwrite: true)); + } } } diff --git a/external/corefx/src/System.IO.FileSystem/tests/File/Create.cs b/external/corefx/src/System.IO.FileSystem/tests/File/Create.cs index d53ac85512..c910e735b3 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/File/Create.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/File/Create.cs @@ -8,15 +8,11 @@ namespace System.IO.Tests { public class File_Create_str : FileSystemTest { - #region Utilities - public virtual FileStream Create(string path) { return File.Create(path); } - #endregion - #region UniversalTests [Fact] @@ -201,8 +197,9 @@ namespace System.IO.Tests } [Fact] - [PlatformSpecific(TestPlatforms.Windows)] // Invalid file name with wildcard characters on Windows - public void WindowsWildCharacterPath() + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] + public void WindowsWildCharacterPath_Desktop() { DirectoryInfo testDir = Directory.CreateDirectory(GetTestFilePath()); Assert.Throws(() => Create(Path.Combine(testDir.FullName, "dls;d", "442349-0", "v443094(*)(+*$#$*", new string(Path.DirectorySeparatorChar, 3)))); @@ -211,20 +208,53 @@ namespace System.IO.Tests Assert.Throws(() => Create(Path.Combine(testDir.FullName, "*Tes*t"))); } + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void WindowsWildCharacterPath_Core() + { + DirectoryInfo testDir = Directory.CreateDirectory(GetTestFilePath()); + Assert.ThrowsAny(() => Create(Path.Combine(testDir.FullName, "dls;d", "442349-0", "v443094(*)(+*$#$*", new string(Path.DirectorySeparatorChar, 3)))); + Assert.ThrowsAny(() => Create(Path.Combine(testDir.FullName, "*"))); + Assert.ThrowsAny(() => Create(Path.Combine(testDir.FullName, "Test*t"))); + Assert.ThrowsAny(() => Create(Path.Combine(testDir.FullName, "*Tes*t"))); + } + [Theory, InlineData(" "), - InlineData(" "), + InlineData(""), + InlineData("\0"), + InlineData(" ")] + [PlatformSpecific(TestPlatforms.Windows)] + public void WindowsEmptyPath(string path) + { + Assert.Throws(() => Create(path)); + } + + [Theory, InlineData("\n"), InlineData(">"), InlineData("<"), - InlineData("\0"), InlineData("\t")] - [PlatformSpecific(TestPlatforms.Windows)] // Invalid file name with whitespace on Windows - public void WindowsWhitespacePath(string path) + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] + public void WindowsInvalidPath_Desktop(string path) { Assert.Throws(() => Create(path)); } + [Theory, + InlineData("\n"), + InlineData(">"), + InlineData("<"), + InlineData("\t")] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void WindowsInvalidPath_Core(string path) + { + Assert.ThrowsAny(() => Create(Path.Combine(TestDirectory, path))); + } + [Fact] [PlatformSpecific(TestPlatforms.AnyUnix)] public void CreateNullThrows_Unix() @@ -249,6 +279,49 @@ namespace System.IO.Tests } } + [Theory, + InlineData(":bar"), + InlineData(":bar:$DATA"), + InlineData("::$DATA")] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void WindowsAlternateDataStream(string streamName) + { + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + streamName = Path.Combine(testDirectory.FullName, GetTestFileName()) + streamName; + using (Create(streamName)) + { + Assert.True(File.Exists(streamName)); + } + } + + [Theory, + InlineData(":bar"), + InlineData(":bar:$DATA")] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void WindowsAlternateDataStream_OnExisting(string streamName) + { + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + + // On closed file + string fileName = Path.Combine(testDirectory.FullName, GetTestFileName()); + Create(fileName).Dispose(); + streamName = fileName + streamName; + using (Create(streamName)) + { + Assert.True(File.Exists(streamName)); + } + + // On open file + fileName = Path.Combine(testDirectory.FullName, GetTestFileName()); + using (Create(fileName)) + using (Create(streamName)) + { + Assert.True(File.Exists(streamName)); + } + } + #endregion } diff --git a/external/corefx/src/System.IO.FileSystem/tests/File/Delete.cs b/external/corefx/src/System.IO.FileSystem/tests/File/Delete.cs index 398833f102..1dd95f6040 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/File/Delete.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/File/Delete.cs @@ -2,7 +2,6 @@ // 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 Xunit; using Xunit.NetCore.Extensions; @@ -10,8 +9,6 @@ namespace System.IO.Tests { public class File_Delete : FileSystemTest { - #region Utilities - public virtual void Delete(string path) { File.Delete(path); @@ -24,8 +21,6 @@ namespace System.IO.Tests return ret; } - #endregion - #region UniversalTests [Fact] @@ -129,7 +124,7 @@ namespace System.IO.Tests [Trait(XunitConstants.Category, XunitConstants.RequiresElevation)] public void Unix_NonExistentPath_ReadOnlyVolume() { - if (PlatformDetection.IsRedHatFamily6) + if (PlatformDetection.IsRedHatFamily6 || PlatformDetection.IsAlpine) return; // [ActiveIssue(https://github.com/dotnet/corefx/issues/21920)] ReadOnly_FileSystemHelper(readOnlyDirectory => @@ -144,7 +139,7 @@ namespace System.IO.Tests [Trait(XunitConstants.Category, XunitConstants.RequiresElevation)] public void Unix_ExistingDirectory_ReadOnlyVolume() { - if (PlatformDetection.IsRedHatFamily6) + if (PlatformDetection.IsRedHatFamily6 || PlatformDetection.IsAlpine) return; // [ActiveIssue(https://github.com/dotnet/corefx/issues/21920)] ReadOnly_FileSystemHelper(readOnlyDirectory => @@ -199,6 +194,24 @@ namespace System.IO.Tests Assert.False(testFile.Exists); } + [Theory, + InlineData(":bar"), + InlineData(":bar:$DATA")] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void WindowsDeleteAlternateDataStream(string streamName) + { + FileInfo testFile = Create(GetTestFilePath()); + testFile.Create().Dispose(); + streamName = testFile.FullName + streamName; + File.Create(streamName).Dispose(); + Assert.True(File.Exists(streamName)); + Delete(streamName); + Assert.False(File.Exists(streamName)); + testFile.Refresh(); + Assert.True(testFile.Exists); + } + #endregion } } diff --git a/external/corefx/src/System.IO.FileSystem/tests/File/Exists.cs b/external/corefx/src/System.IO.FileSystem/tests/File/Exists.cs index e1be14a175..24eec6c5cb 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/File/Exists.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/File/Exists.cs @@ -231,7 +231,7 @@ namespace System.IO.Tests [Theory, - MemberData(nameof(PathsWithAlternativeDataStreams))] + MemberData(nameof(PathsWithColons))] [PlatformSpecific(TestPlatforms.Windows)] // alternate data stream public void PathWithAlternateDataStreams_ReturnsFalse(string component) { diff --git a/external/corefx/src/System.IO.FileSystem/tests/File/GetSetAttributes.cs b/external/corefx/src/System.IO.FileSystem/tests/File/GetSetAttributes.cs index d290ce7971..7a115ad80b 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/File/GetSetAttributes.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/File/GetSetAttributes.cs @@ -18,6 +18,20 @@ namespace System.IO.Tests Assert.Throws(() => GetAttributes(GetTestFilePath() + trailingChar)); } + // Getting only throws for File, not FileInfo + [Theory, + InlineData(":bar"), + InlineData(":bar:$DATA")] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void GetAttributes_MissingAlternateDataStream_Windows(string streamName) + { + string path = CreateItem(); + streamName = path + streamName; + + Assert.Throws(() => GetAttributes(streamName)); + } + [Theory, MemberData(nameof(TrailingCharacters))] public void GetAttributes_MissingDirectory(char trailingChar) { diff --git a/external/corefx/src/System.IO.FileSystem/tests/File/Move.cs b/external/corefx/src/System.IO.FileSystem/tests/File/Move.cs index bc1199e122..304094a999 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/File/Move.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/File/Move.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using Xunit; +using System.Linq; namespace System.IO.Tests { @@ -44,17 +45,26 @@ namespace System.IO.Tests } [Theory, MemberData(nameof(PathsWithInvalidCharacters))] - public void PathWithIllegalCharacters(string invalidPath) + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] + public void PathWithIllegalCharacters_Desktop(string invalidPath) { FileInfo testFile = new FileInfo(GetTestFilePath()); testFile.Create().Dispose(); - // Under legacy normalization we kick \\?\ paths back as invalid with ArgumentException - // New style we don't prevalidate \\?\ at all - if (invalidPath.Contains(@"\\?\") && !PathFeatures.IsUsingLegacyPathNormalization()) - Assert.Throws(() => Move(testFile.FullName, invalidPath)); - else + Assert.Throws(() => Move(testFile.FullName, invalidPath)); + } + + [Theory, MemberData(nameof(PathsWithInvalidCharacters))] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void PathWithIllegalCharacters_Core(string invalidPath) + { + FileInfo testFile = new FileInfo(GetTestFilePath()); + testFile.Create().Dispose(); + + if (invalidPath.Contains('\0'.ToString())) Assert.Throws(() => Move(testFile.FullName, invalidPath)); + else + Assert.ThrowsAny(() => Move(testFile.FullName, invalidPath)); } [Fact] @@ -225,17 +235,35 @@ namespace System.IO.Tests [Theory, MemberData(nameof(PathsWithInvalidColons))] [PlatformSpecific(TestPlatforms.Windows)] - [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Versions of netfx older than 4.6.2 throw an ArgumentException instead of NotSupportedException. Until all of our machines run netfx against the actual latest version, these will fail.")] - public void WindowsPathWithIllegalColons(string invalidPath) + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] + public void WindowsPathWithIllegalColons_Desktop(string invalidPath) { FileInfo testFile = new FileInfo(GetTestFilePath()); testFile.Create().Dispose(); - Assert.Throws(() => Move(testFile.FullName, invalidPath)); + if (PathFeatures.IsUsingLegacyPathNormalization()) + { + Assert.Throws(() => Move(testFile.FullName, invalidPath)); + } + else + { + Assert.Throws(() => Move(testFile.FullName, invalidPath)); + } + } + + [Theory, MemberData(nameof(PathsWithInvalidColons))] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void WindowsPathWithIllegalColons_Core(string invalidPath) + { + FileInfo testFile = new FileInfo(GetTestFilePath()); + testFile.Create().Dispose(); + Assert.ThrowsAny(() => Move(testFile.FullName, testFile.DirectoryName + Path.DirectorySeparatorChar + invalidPath)); } [Fact] - [PlatformSpecific(TestPlatforms.Windows)] // Wild characters in path throw ArgumentException - public void WindowsWildCharacterPath() + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] + public void WindowsWildCharacterPath_Desktop() { Assert.Throws(() => Move("*", GetTestFilePath())); Assert.Throws(() => Move(GetTestFilePath(), "*")); @@ -243,6 +271,18 @@ namespace System.IO.Tests Assert.Throws(() => Move(GetTestFilePath(), "*Test")); } + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void WindowsWildCharacterPath_Core() + { + Assert.Throws(() => Move(Path.Combine(TestDirectory, "*"), GetTestFilePath())); + Assert.Throws(() => Move(GetTestFilePath(), Path.Combine(TestDirectory, "*"))); + Assert.Throws(() => Move(GetTestFilePath(), Path.Combine(TestDirectory, "Test*t"))); + Assert.Throws(() => Move(GetTestFilePath(), Path.Combine(TestDirectory, "*Test"))); + } + + [Fact] [PlatformSpecific(TestPlatforms.AnyUnix)] // Wild characters in path are allowed public void UnixWildCharacterPath() @@ -268,9 +308,29 @@ namespace System.IO.Tests } [Theory, - MemberData(nameof(WhiteSpace))] - [PlatformSpecific(TestPlatforms.Windows)] // Whitespace in path throws ArgumentException - public void WindowsWhitespacePath(string whitespace) + MemberData(nameof(ControlWhiteSpace))] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] + public void WindowsControlPath_Desktop(string whitespace) + { + FileInfo testFile = new FileInfo(GetTestFilePath()); + Assert.Throws(() => Move(testFile.FullName, whitespace)); + } + + [Theory, + MemberData(nameof(ControlWhiteSpace))] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void WindowsControlPath_Core(string whitespace) + { + FileInfo testFile = new FileInfo(GetTestFilePath()); + Assert.ThrowsAny(() => Move(testFile.FullName, Path.Combine(TestDirectory, whitespace))); + } + + [Theory, + MemberData(nameof(SimpleWhiteSpace))] + [PlatformSpecific(TestPlatforms.Windows)] + public void WindowsSimpleWhitespacePath(string whitespace) { FileInfo testFile = new FileInfo(GetTestFilePath()); Assert.Throws(() => Move(testFile.FullName, whitespace)); @@ -289,6 +349,29 @@ namespace System.IO.Tests } + [Theory, + InlineData("", ":bar"), + InlineData("", ":bar:$DATA"), + InlineData("::$DATA", ":bar"), + InlineData("::$DATA", ":bar:$DATA")] + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void WindowsAlternateDataStreamMove(string defaultStream, string alternateStream) + { + DirectoryInfo testDirectory = Directory.CreateDirectory(GetTestFilePath()); + string testFile = Path.Combine(testDirectory.FullName, GetTestFileName()); + string testFileDefaultStream = testFile + defaultStream; + string testFileAlternateStream = testFile + alternateStream; + + // Cannot move into an alternate stream + File.WriteAllText(testFileDefaultStream, "Foo"); + Assert.Throws(() => Move(testFileDefaultStream, testFileAlternateStream)); + + // Cannot move out of an alternate stream + File.WriteAllText(testFileAlternateStream, "Bar"); + string testFile2 = Path.Combine(testDirectory.FullName, GetTestFileName()); + Assert.Throws(() => Move(testFileAlternateStream, testFile2)); + } #endregion } } diff --git a/external/corefx/src/System.IO.FileSystem/tests/File/ReadWriteAllBytes.cs b/external/corefx/src/System.IO.FileSystem/tests/File/ReadWriteAllBytes.cs index 7764cdfe5b..b92e5201bd 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/File/ReadWriteAllBytes.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/File/ReadWriteAllBytes.cs @@ -4,6 +4,7 @@ using System.Runtime.InteropServices; using System.Text; +using System.Threading.Tasks; using Xunit; namespace System.IO.Tests @@ -120,5 +121,57 @@ namespace System.IO.Tests File.SetAttributes(path, FileAttributes.Normal); } } + + [Fact] + public void EmptyFile_ReturnsEmptyArray() + { + string path = GetTestFilePath(); + File.Create(path).Dispose(); + Assert.Equal(0, File.ReadAllBytes(path).Length); + } + + [Theory] + [PlatformSpecific(TestPlatforms.Linux)] + [InlineData("/proc/cmdline")] + [InlineData("/proc/version")] + [InlineData("/proc/filesystems")] + public void ProcFs_EqualsReadAllText(string path) + { + byte[] bytes = null; + string text = null; + + const int NumTries = 3; // some of these could theoretically change between reads, so allow retries just in case + for (int i = 1; i <= NumTries; i++) + { + try + { + bytes = File.ReadAllBytes(path); + text = File.ReadAllText(path); + Assert.Equal(text, Encoding.UTF8.GetString(bytes)); + } + catch when (i < NumTries) { } + } + } + + [Theory] + [PlatformSpecific(TestPlatforms.Linux)] + public void ReadAllBytes_ProcFs_Uptime_ContainsTwoNumbers() + { + string text = Encoding.UTF8.GetString(File.ReadAllBytes("/proc/uptime")); + string[] parts = text.Split(new [] { ' ' }, StringSplitOptions.RemoveEmptyEntries); + Assert.Equal(2, parts.Length); + Assert.True(double.TryParse(parts[0].Trim(), out _)); + Assert.True(double.TryParse(parts[1].Trim(), out _)); + } + + [Theory] + [PlatformSpecific(TestPlatforms.Linux)] + [InlineData("/proc/meminfo")] + [InlineData("/proc/stat")] + [InlineData("/proc/cpuinfo")] + public void ProcFs_NotEmpty(string path) + { + Assert.InRange(File.ReadAllBytes(path).Length, 1, int.MaxValue); + } } } diff --git a/external/corefx/src/System.IO.FileSystem/tests/File/ReadWriteAllBytesAsync.cs b/external/corefx/src/System.IO.FileSystem/tests/File/ReadWriteAllBytesAsync.cs index 47b3d71ccc..fa2a8faa7f 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/File/ReadWriteAllBytesAsync.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/File/ReadWriteAllBytesAsync.cs @@ -134,5 +134,57 @@ namespace System.IO.Tests File.SetAttributes(path, FileAttributes.Normal); } } + + [Fact] + public async Task EmptyFile_ReturnsEmptyArray() + { + string path = GetTestFilePath(); + File.Create(path).Dispose(); + Assert.Equal(0, (await File.ReadAllBytesAsync(path)).Length); + } + + [Theory] + [PlatformSpecific(TestPlatforms.Linux)] + [InlineData("/proc/cmdline")] + [InlineData("/proc/version")] + [InlineData("/proc/filesystems")] + public async Task ProcFs_EqualsReadAllText(string path) + { + byte[] bytes = null; + string text = null; + + const int NumTries = 3; // some of these could theoretically change between reads, so allow retries just in case + for (int i = 1; i <= NumTries; i++) + { + try + { + bytes = await File.ReadAllBytesAsync(path); + text = await File.ReadAllTextAsync(path); + Assert.Equal(text, Encoding.UTF8.GetString(bytes)); + } + catch when (i < NumTries) { } + } + } + + [Theory] + [PlatformSpecific(TestPlatforms.Linux)] + public async Task ReadAllBytes_ProcFs_Uptime_ContainsTwoNumbers() + { + string text = Encoding.UTF8.GetString(await File.ReadAllBytesAsync("/proc/uptime")); + string[] parts = text.Split(' ', StringSplitOptions.RemoveEmptyEntries); + Assert.Equal(2, parts.Length); + Assert.True(double.TryParse(parts[0].Trim(), out _)); + Assert.True(double.TryParse(parts[1].Trim(), out _)); + } + + [Theory] + [PlatformSpecific(TestPlatforms.Linux)] + [InlineData("/proc/meminfo")] + [InlineData("/proc/stat")] + [InlineData("/proc/cpuinfo")] + public async Task ProcFs_NotEmpty(string path) + { + Assert.InRange((await File.ReadAllBytesAsync(path)).Length, 1, int.MaxValue); + } } } diff --git a/external/corefx/src/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs b/external/corefx/src/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs index ed38b89719..d88fa6ea00 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs @@ -19,6 +19,8 @@ namespace System.IO.Tests public override FileInfo GetMissingItem() => new FileInfo(GetTestFilePath()); + public override string GetItemPath(FileInfo item) => item.FullName; + public override void InvokeCreate(FileInfo item) => item.Create(); public override IEnumerable TimeFunctions(bool requiresRoundtripping = false) diff --git a/external/corefx/src/System.IO.FileSystem/tests/FileInfo/Open.cs b/external/corefx/src/System.IO.FileSystem/tests/FileInfo/Open.cs index c5df42fd5e..b9b35f51c2 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/FileInfo/Open.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/FileInfo/Open.cs @@ -13,22 +13,22 @@ namespace System.IO.Tests return new FileInfo(path).Open(mode); } - [Fact] + [Theory, MemberData(nameof(StreamSpecifiers))] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "FileInfo.Open(string, filemode) on netfx always uses FileAccess.ReadWrite instead of choosing a FileAccess based on the FileMode. This bug was fixed in netcoreapp.")] - public override void FileModeAppend() + public override void FileModeAppend(string streamSpecifier) { - using (FileStream fs = CreateFileStream(GetTestFilePath(), FileMode.Append)) + using (FileStream fs = CreateFileStream(GetTestFilePath() + streamSpecifier, FileMode.Append)) { Assert.Equal(false, fs.CanRead); Assert.Equal(true, fs.CanWrite); } } - [Fact] + [Theory, MemberData(nameof(StreamSpecifiers))] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "FileInfo.Open(string, filemode) on netfx always uses FileAccess.ReadWrite instead of choosing a FileAccess based on the FileMode. This bug was fixed in netcoreapp.")] - public override void FileModeAppendExisting() + public override void FileModeAppendExisting(string streamSpecifier) { - string fileName = GetTestFilePath(); + string fileName = GetTestFilePath() + streamSpecifier; using (FileStream fs = CreateFileStream(fileName, FileMode.Create)) { fs.WriteByte(0); diff --git a/external/corefx/src/System.IO.FileSystem/tests/FileStream/Dispose.cs b/external/corefx/src/System.IO.FileSystem/tests/FileStream/Dispose.cs index 026a82b910..edee857a62 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/FileStream/Dispose.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/FileStream/Dispose.cs @@ -4,6 +4,7 @@ using Microsoft.Win32.SafeHandles; using System; +using System.Diagnostics; using System.IO; using Xunit; @@ -45,6 +46,11 @@ namespace System.IO.Tests : base(path, mode) { } + public MyFileStream(SafeFileHandle handle, FileAccess access, Action disposeMethod) : base(handle, access) + { + DisposeMethod = disposeMethod; + } + public Action DisposeMethod { get; set; } protected override void Dispose(bool disposing) @@ -58,6 +64,92 @@ namespace System.IO.Tests } } + + [Fact] + public void Dispose_CallsVirtualDisposeTrueArg_ThrowsDuringFlushWriteBuffer_DisposeThrows() + { + RemoteInvoke(() => + { + string fileName = GetTestFilePath(); + using (FileStream fscreate = new FileStream(fileName, FileMode.Create)) + { + fscreate.WriteByte(0); + } + bool writeDisposeInvoked = false; + Action writeDisposeMethod = _ => writeDisposeInvoked = true; + using (var fsread = new FileStream(fileName, FileMode.Open, FileAccess.Read)) + { + Action act = () => // separate method to avoid JIT lifetime-extension issues + { + using (var fswrite = new MyFileStream(fsread.SafeFileHandle, FileAccess.Write, writeDisposeMethod)) + { + fswrite.WriteByte(0); + + // Normal dispose should call Dispose(true). Throws due to FS trying to flush write buffer + Assert.Throws(() => fswrite.Dispose()); + Assert.True(writeDisposeInvoked, "Expected Dispose(true) to be called from Dispose()"); + writeDisposeInvoked = false; + + // Only throws on first Dispose call + fswrite.Dispose(); + Assert.True(writeDisposeInvoked, "Expected Dispose(true) to be called from Dispose()"); + writeDisposeInvoked = false; + } + Assert.True(writeDisposeInvoked, "Expected Dispose(true) to be called from Dispose() again"); + writeDisposeInvoked = false; + }; + act(); + + for (int i = 0; i < 2; i++) + { + GC.Collect(); + GC.WaitForPendingFinalizers(); + } + Assert.False(writeDisposeInvoked, "Expected finalizer to have been suppressed"); + } + return SuccessExitCode; + }).Dispose(); + } + + [Fact] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Missing fix for https://github.com/dotnet/coreclr/pull/16250")] + public void NoDispose_CallsVirtualDisposeFalseArg_ThrowsDuringFlushWriteBuffer_FinalizerWontThrow() + { + RemoteInvoke(() => + { + string fileName = GetTestFilePath(); + using (FileStream fscreate = new FileStream(fileName, FileMode.Create)) + { + fscreate.WriteByte(0); + } + bool writeDisposeInvoked = false; + Action writeDisposeMethod = (disposing) => + { + writeDisposeInvoked = true; + Assert.False(disposing, "Expected false arg to Dispose(bool)"); + }; + using (var fsread = new FileStream(fileName, FileMode.Open, FileAccess.Read)) + { + Action act = () => // separate method to avoid JIT lifetime-extension issues + { + var fswrite = new MyFileStream(fsread.SafeFileHandle, FileAccess.Write, writeDisposeMethod); + fswrite.WriteByte(0); + }; + act(); + + // Dispose is not getting called here. + // instead, make sure finalizer gets called and doesnt throw exception + for (int i = 0; i < 2; i++) + { + GC.Collect(); + GC.WaitForPendingFinalizers(); + } + Assert.True(writeDisposeInvoked, "Expected finalizer to be invoked but not throw exception"); + } + return SuccessExitCode; + }).Dispose(); + } + [Fact] public void Dispose_CallsVirtualDispose_TrueArg() { diff --git a/external/corefx/src/System.IO.FileSystem/tests/FileStream/Name.cs b/external/corefx/src/System.IO.FileSystem/tests/FileStream/Name.cs index 88fe39c402..d4dde6ed22 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/FileStream/Name.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/FileStream/Name.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System; +using System.Globalization; using System.IO; using Xunit; @@ -39,11 +40,16 @@ namespace System.IO.Tests [Fact] public void NameReturnsUnknownForHandle() { - using (FileStream fs = new FileStream(GetTestFilePath(), FileMode.Create, FileAccess.ReadWrite)) - using (FileStream fsh = new FileStream(fs.SafeFileHandle, FileAccess.ReadWrite)) + RemoteInvoke(() => { - Assert.Equal("[Unknown]", fsh.Name); - } + CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture; + + using (FileStream fs = new FileStream(GetTestFilePath(), FileMode.Create, FileAccess.ReadWrite)) + using (FileStream fsh = new FileStream(fs.SafeFileHandle, FileAccess.ReadWrite)) + { + Assert.Equal("[Unknown]", fsh.Name); + } + }).Dispose(); } } } diff --git a/external/corefx/src/System.IO.FileSystem/tests/FileStream/ReadWriteSpan.netcoreapp.cs b/external/corefx/src/System.IO.FileSystem/tests/FileStream/ReadWriteSpan.netcoreapp.cs index 272b19769e..187c7788be 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/FileStream/ReadWriteSpan.netcoreapp.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/FileStream/ReadWriteSpan.netcoreapp.cs @@ -2,6 +2,7 @@ // 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; using System.Linq; using System.Threading; using System.Threading.Tasks; @@ -187,6 +188,20 @@ namespace System.IO.Tests } } + [Fact] + public async Task NonEmptyFile_CustomMemoryManager_ReadAsync_GetsExpectedData() + { + string fileName = GetTestFilePath(); + File.WriteAllBytes(fileName, TestBuffer); + + using (var fs = CreateFileStream(fileName, FileMode.Open)) + using (var buffer = new NativeMemoryManager(TestBuffer.Length)) + { + Assert.Equal(TestBuffer.Length, await fs.ReadAsync(buffer.Memory)); + Assert.Equal(TestBuffer, buffer.Memory.ToArray()); + } + } + [Fact] public void ReadOnly_WriteAsync_Throws() { @@ -238,24 +253,49 @@ namespace System.IO.Tests Assert.Equal(TestBuffer, buffer); } } + + [Fact] + public async Task NonEmptyWriteAsync_CustomMemoryManager_WritesExpectedData() + { + using (var mem = new NativeMemoryManager(TestBuffer.Length)) + using (var fs = CreateFileStream(GetTestFilePath(), FileMode.Create)) + { + new Memory(TestBuffer).CopyTo(mem.Memory); + + await fs.WriteAsync(mem.Memory); + Assert.Equal(TestBuffer.Length, fs.Length); + Assert.Equal(TestBuffer.Length, fs.Position); + + fs.Position = 0; + var buffer = new byte[TestBuffer.Length]; + Assert.Equal(TestBuffer.Length, await fs.ReadAsync(new Memory(buffer))); + Assert.Equal(TestBuffer, buffer); + } + } } public class Sync_FileStream_ReadWrite_Span : FileStream_ReadWrite_Span { protected override FileStream CreateFileStream(string path, FileMode mode, FileAccess access) => - new FileStream(path, mode, access, FileShare.None, 0x1000, FileOptions.None); + new FileStream(path, mode, access, FileShare.None, bufferSize: 0x1000, FileOptions.None); } public class Async_FileStream_ReadWrite_Span : FileStream_ReadWrite_Span { protected override FileStream CreateFileStream(string path, FileMode mode, FileAccess access) => - new FileStream(path, mode, access, FileShare.None, 0x1000, FileOptions.Asynchronous); + new FileStream(path, mode, access, FileShare.None, bufferSize: 0x1000, FileOptions.Asynchronous); + } + + public class Async_NoBuffer_FileStream_ReadWrite_Span : FileStream_ReadWrite_Span + { + protected override FileStream CreateFileStream(string path, FileMode mode, FileAccess access) => + new FileStream(path, mode, access, FileShare.None, bufferSize: 1, FileOptions.Asynchronous); } public sealed class Sync_DerivedFileStream_ReadWrite_Span : Sync_FileStream_ReadWrite_Span { protected override FileStream CreateFileStream(string path, FileMode mode, FileAccess access) => - new DerivedFileStream(path, mode, access, FileShare.None, 0x1000, FileOptions.None); + new DerivedFileStream(path, mode, access, FileShare.None, bufferSize: 0x1000, FileOptions.None); [Fact] public void CallSpanReadWriteOnDerivedFileStream_ArrayMethodsUsed() @@ -299,7 +339,7 @@ namespace System.IO.Tests public sealed class Async_DerivedFileStream_ReadWrite_Span : Async_FileStream_ReadWrite_Span { protected override FileStream CreateFileStream(string path, FileMode mode, FileAccess access) => - new DerivedFileStream(path, mode, access, FileShare.None, 0x1000, FileOptions.Asynchronous); + new DerivedFileStream(path, mode, access, FileShare.None, bufferSize: 0x1000, FileOptions.Asynchronous); } internal sealed class DerivedFileStream : FileStream diff --git a/external/corefx/src/System.IO.FileSystem/tests/FileStream/WriteAsync.cs b/external/corefx/src/System.IO.FileSystem/tests/FileStream/WriteAsync.cs index fa1f45095d..a80eb79fbb 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/FileStream/WriteAsync.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/FileStream/WriteAsync.cs @@ -388,35 +388,30 @@ namespace System.IO.Tests string writeFileName = GetTestFilePath(); do { - // Create a new token that expires between 100-1000ms - CancellationTokenSource tokenSource = new CancellationTokenSource(); - tokenSource.CancelAfter(rand.Next(100, 1000)); + + int totalBytesWritten = 0; using (var stream = new FileStream(writeFileName, FileMode.Create, FileAccess.Write)) { do { - try - { - // 20%: random write size - int bytesToWrite = (rand.NextDouble() < 0.2 ? rand.Next(16, MaximumWriteSize) : NormalWriteSize); + // 20%: random write size + int bytesToWrite = (rand.NextDouble() < 0.2 ? rand.Next(16, MaximumWriteSize) : NormalWriteSize); - if (rand.NextDouble() < 0.1) - { - // 10%: Sync write - stream.Write(dataToWrite, 0, bytesToWrite); - } - else - { - // 90%: Async write - await WriteAsync(stream, dataToWrite, 0, bytesToWrite, tokenSource.Token); - } - } - catch (TaskCanceledException) + if (rand.NextDouble() < 0.1) { - Assert.True(tokenSource.Token.IsCancellationRequested, "Received cancellation exception before token expired"); + // 10%: Sync write + stream.Write(dataToWrite, 0, bytesToWrite); } - } while (!tokenSource.Token.IsCancellationRequested); + else + { + // 90%: Async write + await WriteAsync(stream, dataToWrite, 0, bytesToWrite); + } + + totalBytesWritten += bytesToWrite; + // Cap written bytes at 10 million to avoid writing too much to disk + } while (totalBytesWritten < 10_000_000); } } while (DateTime.UtcNow - testStartTime <= testRunTime); } diff --git a/external/corefx/src/System.IO.FileSystem/tests/FileStream/ctor_str_fm.cs b/external/corefx/src/System.IO.FileSystem/tests/FileStream/ctor_str_fm.cs index 2f9655ac5e..45791fe767 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/FileStream/ctor_str_fm.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/FileStream/ctor_str_fm.cs @@ -51,17 +51,39 @@ namespace System.IO.Tests Assert.Throws(() => CreateFileStream(path, FileMode.Open)); } - [Fact] - public void FileModeCreate() + + public static TheoryData StreamSpecifiers { - using (CreateFileStream(GetTestFilePath(), FileMode.Create)) - { } + get + { + TheoryData data = new TheoryData(); + data.Add(""); + + if (PlatformDetection.IsWindows && PlatformDetection.IsNetCore) + { + data.Add("::$DATA"); // Same as default stream (e.g. main file) + data.Add(":bar"); // $DATA isn't necessary + data.Add(":bar:$DATA"); // $DATA can be explicitly specified + } + + return data; + } } - [Fact] - public void FileModeCreateExisting() + [Theory, MemberData(nameof(StreamSpecifiers))] + public void FileModeCreate(string streamSpecifier) { - string fileName = GetTestFilePath(); + string fileName = GetTestFilePath() + streamSpecifier; + using (CreateFileStream(fileName, FileMode.Create)) + { + Assert.True(File.Exists(fileName)); + } + } + + [Theory, MemberData(nameof(StreamSpecifiers))] + public void FileModeCreateExisting(string streamSpecifier) + { + string fileName = GetTestFilePath() + streamSpecifier; using (FileStream fs = CreateFileStream(fileName, FileMode.Create)) { fs.WriteByte(0); @@ -77,17 +99,20 @@ namespace System.IO.Tests } } - [Fact] - public void FileModeCreateNew() + [Theory, MemberData(nameof(StreamSpecifiers))] + public void FileModeCreateNew(string streamSpecifier) { - using (CreateFileStream(GetTestFilePath(), FileMode.CreateNew)) - { } + string fileName = GetTestFilePath() + streamSpecifier; + using (CreateFileStream(fileName, FileMode.CreateNew)) + { + Assert.True(File.Exists(fileName)); + } } - [Fact] - public void FileModeCreateNewExistingThrows() + [Theory, MemberData(nameof(StreamSpecifiers))] + public void FileModeCreateNewExistingThrows(string streamSpecifier) { - string fileName = GetTestFilePath(); + string fileName = GetTestFilePath() + streamSpecifier; using (FileStream fs = CreateFileStream(fileName, FileMode.CreateNew)) { fs.WriteByte(0); @@ -98,18 +123,18 @@ namespace System.IO.Tests Assert.Throws(() => CreateFileStream(fileName, FileMode.CreateNew)); } - [Fact] - public void FileModeOpenThrows() + [Theory, MemberData(nameof(StreamSpecifiers))] + public void FileModeOpenThrows(string streamSpecifier) { - string fileName = GetTestFilePath(); + string fileName = GetTestFilePath() + streamSpecifier; FileNotFoundException fnfe = Assert.Throws(() => CreateFileStream(fileName, FileMode.Open)); Assert.Equal(fileName, fnfe.FileName); } - [Fact] - public void FileModeOpenExisting() + [Theory, MemberData(nameof(StreamSpecifiers))] + public void FileModeOpenExisting(string streamSpecifier) { - string fileName = GetTestFilePath(); + string fileName = GetTestFilePath() + streamSpecifier; using (FileStream fs = CreateFileStream(fileName, FileMode.Create)) { fs.WriteByte(0); @@ -125,17 +150,20 @@ namespace System.IO.Tests } } - [Fact] - public void FileModeOpenOrCreate() + [Theory, MemberData(nameof(StreamSpecifiers))] + public void FileModeOpenOrCreate(string streamSpecifier) { - using (CreateFileStream(GetTestFilePath(), FileMode.OpenOrCreate)) - {} + string fileName = GetTestFilePath() + streamSpecifier; + using (CreateFileStream(fileName, FileMode.OpenOrCreate)) + { + Assert.True(File.Exists(fileName)); + } } - [Fact] - public void FileModeOpenOrCreateExisting() + [Theory, MemberData(nameof(StreamSpecifiers))] + public void FileModeOpenOrCreateExisting(string streamSpecifier) { - string fileName = GetTestFilePath(); + string fileName = GetTestFilePath() + streamSpecifier; using (FileStream fs = CreateFileStream(fileName, FileMode.Create)) { fs.WriteByte(0); @@ -151,18 +179,18 @@ namespace System.IO.Tests } } - [Fact] - public void FileModeTruncateThrows() + [Theory, MemberData(nameof(StreamSpecifiers))] + public void FileModeTruncateThrows(string streamSpecifier) { - string fileName = GetTestFilePath(); + string fileName = GetTestFilePath() + streamSpecifier; FileNotFoundException fnfe = Assert.Throws(() => CreateFileStream(fileName, FileMode.Truncate)); Assert.Equal(fileName, fnfe.FileName); } - [Fact] - public void FileModeTruncateExisting() + [Theory, MemberData(nameof(StreamSpecifiers))] + public void FileModeTruncateExisting(string streamSpecifier) { - string fileName = GetTestFilePath(); + string fileName = GetTestFilePath() + streamSpecifier; using (FileStream fs = CreateFileStream(fileName, FileMode.Create)) { fs.WriteByte(0); @@ -178,20 +206,20 @@ namespace System.IO.Tests } } - [Fact] - public virtual void FileModeAppend() + [Theory, MemberData(nameof(StreamSpecifiers))] + public virtual void FileModeAppend(string streamSpecifier) { - using (FileStream fs = CreateFileStream(GetTestFilePath(), FileMode.Append)) + using (FileStream fs = CreateFileStream(GetTestFilePath() + streamSpecifier, FileMode.Append)) { Assert.Equal(false, fs.CanRead); Assert.Equal(true, fs.CanWrite); } } - [Fact] - public virtual void FileModeAppendExisting() + [Theory, MemberData(nameof(StreamSpecifiers))] + public virtual void FileModeAppendExisting(string streamSpecifier) { - string fileName = GetTestFilePath(); + string fileName = GetTestFilePath() + streamSpecifier; using (FileStream fs = CreateFileStream(fileName, FileMode.Create)) { fs.WriteByte(0); diff --git a/external/corefx/src/System.IO.FileSystem/tests/FileSystemTest.cs b/external/corefx/src/System.IO.FileSystem/tests/FileSystemTest.cs index 4e593f27b8..ff21035632 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/FileSystemTest.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/FileSystemTest.cs @@ -28,11 +28,31 @@ namespace System.IO.Tests public static TheoryData WhiteSpace = IOInputs.GetWhiteSpace().ToTheoryData(); public static TheoryData UncPathsWithoutShareName = IOInputs.GetUncPathsWithoutShareName().ToTheoryData(); public static TheoryData PathsWithReservedDeviceNames = IOInputs.GetPathsWithReservedDeviceNames().ToTheoryData(); - public static TheoryData PathsWithAlternativeDataStreams = IOInputs.GetPathsWithAlternativeDataStreams().ToTheoryData(); + public static TheoryData PathsWithColons = IOInputs.GetPathsWithColons().ToTheoryData(); public static TheoryData PathsWithComponentLongerThanMaxComponent = IOInputs.GetPathsWithComponentLongerThanMaxComponent().ToTheoryData(); public static TheoryData ControlWhiteSpace = IOInputs.GetControlWhiteSpace().ToTheoryData(); public static TheoryData NonControlWhiteSpace = IOInputs.GetNonControlWhiteSpace().ToTheoryData(); + public static TheoryData TrailingSeparators + { + get + { + var data = new TheoryData() + { + "", + "" + Path.DirectorySeparatorChar, + "" + Path.DirectorySeparatorChar + Path.DirectorySeparatorChar + }; + + if (PlatformDetection.IsWindows) + { + data.Add("" + Path.AltDirectorySeparatorChar); + } + + return data; + } + } + /// /// In some cases (such as when running without elevated privileges), /// the symbolic link may fail to create. Only run this test if it creates diff --git a/external/corefx/src/System.IO.FileSystem/tests/Performance/Perf.Directory.cs b/external/corefx/src/System.IO.FileSystem/tests/Performance/Perf.Directory.cs index 508275dc12..7a70751425 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/Performance/Perf.Directory.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/Performance/Perf.Directory.cs @@ -2,7 +2,9 @@ // 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.Text; using Microsoft.Xunit.Performance; +using Xunit; namespace System.IO.Tests { @@ -55,5 +57,89 @@ namespace System.IO.Tests // Teardown Directory.Delete(testFile); } + + public string GetTestDeepFilePath(int depth) + { + string directory = Path.DirectorySeparatorChar + "a"; + StringBuilder sb = new StringBuilder(depth * 2); + for (int i = 0; i < depth; i++) + { + sb.Append(directory); + } + + return sb.ToString(); + } + + public static TheoryData RecursiveDepthData + { + get + { + var data = new TheoryData(); + data.Add(10, 100); + + // Length of the path can be 260 characters on netfx. + if (AreAllLongPathsAvailable) + { + data.Add(100, 10); + // Most Unix distributions have a maximum path length of 1024 characters (1024 UTF-8 bytes). + if (PlatformDetection.IsWindows) + data.Add(1000, 1); + } + + return data; + } + } + + [Benchmark] + [MemberData(nameof(RecursiveDepthData))] + [OuterLoop("Takes a lot of time to finish")] + public void RecursiveCreateDirectoryTest(int depth, int times) + { + // Setup + string rootDirectory = GetTestFilePath(); + string path = GetTestDeepFilePath(depth); + + foreach (var iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < times; i++) + { + Directory.CreateDirectory(rootDirectory + Path.DirectorySeparatorChar + i + path); + } + } + // TearDown For each iteration + Directory.Delete(rootDirectory, recursive: true); + } + } + + [Benchmark] + [MemberData(nameof(RecursiveDepthData))] + [OuterLoop("Takes a lot of time to finish")] + public void RecursiveDeleteDirectoryTest(int depth, int times) + { + // Setup + string rootDirectory = GetTestFilePath(); + string path = GetTestDeepFilePath(depth); + + foreach (var iteration in Benchmark.Iterations) + { + // Setup For each Iteration + for (int i = 0; i < times; i++) + { + Directory.CreateDirectory(rootDirectory + Path.DirectorySeparatorChar + i + path); + } + + using (iteration.StartMeasurement()) + { + for (int i = 0; i < times; i++) + { + Directory.Delete(rootDirectory + Path.DirectorySeparatorChar + i, recursive: true); + } + } + } + // TearDown + Directory.Delete(rootDirectory, recursive: true); + } } } diff --git a/external/corefx/src/System.IO.FileSystem/tests/Performance/System.IO.FileSystem.Performance.Tests.csproj b/external/corefx/src/System.IO.FileSystem/tests/Performance/System.IO.FileSystem.Performance.Tests.csproj index afcd6a3da8..4d758dda6f 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/Performance/System.IO.FileSystem.Performance.Tests.csproj +++ b/external/corefx/src/System.IO.FileSystem/tests/Performance/System.IO.FileSystem.Performance.Tests.csproj @@ -37,5 +37,8 @@ PerfRunner + + + \ No newline at end of file diff --git a/external/corefx/src/System.IO.FileSystem/tests/PortedCommon/IOInputs.cs b/external/corefx/src/System.IO.FileSystem/tests/PortedCommon/IOInputs.cs index 10fbbd8138..68dfcd7fa1 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/PortedCommon/IOInputs.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/PortedCommon/IOInputs.cs @@ -152,7 +152,7 @@ internal static class IOInputs } } - public static IEnumerable GetPathsWithAlternativeDataStreams() + public static IEnumerable GetPathsWithColons() { yield return @"AA:"; yield return @"AAA:"; diff --git a/external/corefx/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj b/external/corefx/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj index fb99199ad1..3a25873cb3 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj +++ b/external/corefx/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj @@ -54,6 +54,19 @@ + + + + + + + + + + + + + @@ -164,6 +177,9 @@ + + Common\System\Buffers\NativeMemoryManager.cs + Common\System\IO\TempFile.cs @@ -182,5 +198,8 @@ + + + \ No newline at end of file diff --git a/external/corefx/src/System.IO.FileSystem/tests/TestData.cs b/external/corefx/src/System.IO.FileSystem/tests/TestData.cs index 3ca4af5160..69b4373bd9 100644 --- a/external/corefx/src/System.IO.FileSystem/tests/TestData.cs +++ b/external/corefx/src/System.IO.FileSystem/tests/TestData.cs @@ -57,25 +57,12 @@ internal static class TestData { get { - TheoryData data = new TheoryData(); - - // NOTE: That I/O treats "file"/http" specially and throws ArgumentException. - // Otherwise, it treats all other urls as alternative data streams - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) // alternate data streams, drive labels, etc. + TheoryData data = new TheoryData { - data.Add("\0"); - data.Add("middle\0path"); - data.Add("trailing\0"); - data.Add(@"\\?\"); - data.Add(@"\\?\UNC\"); - data.Add(@"\\?\UNC\LOCALHOST"); - } - else - { - data.Add("\0"); - data.Add("middle\0path"); - data.Add("trailing\0"); - } + "\0", + "middle\0path", + "trailing\0" + }; foreach (char c in s_invalidFileNameChars) { diff --git a/external/corefx/src/System.IO.IsolatedStorage/src/System/IO/IsolatedStorage/IsolatedStorage.cs b/external/corefx/src/System.IO.IsolatedStorage/src/System/IO/IsolatedStorage/IsolatedStorage.cs index 9441cad2b5..c1b5b1c51d 100644 --- a/external/corefx/src/System.IO.IsolatedStorage/src/System/IO/IsolatedStorage/IsolatedStorage.cs +++ b/external/corefx/src/System.IO.IsolatedStorage/src/System/IO/IsolatedStorage/IsolatedStorage.cs @@ -108,7 +108,7 @@ namespace System.IO.IsolatedStorage public IsolatedStorageScope Scope { - get; protected set; + get; private set; } protected virtual char SeparatorExternal @@ -128,7 +128,7 @@ namespace System.IO.IsolatedStorage public abstract void Remove(); - protected string IdentityHash + internal string IdentityHash { get; private set; } diff --git a/external/corefx/src/System.IO.IsolatedStorage/src/System/IO/IsolatedStorage/IsolatedStorageFileStream.cs b/external/corefx/src/System.IO.IsolatedStorage/src/System/IO/IsolatedStorage/IsolatedStorageFileStream.cs index f68a2273b1..84f558894a 100644 --- a/external/corefx/src/System.IO.IsolatedStorage/src/System/IO/IsolatedStorage/IsolatedStorageFileStream.cs +++ b/external/corefx/src/System.IO.IsolatedStorage/src/System/IO/IsolatedStorage/IsolatedStorageFileStream.cs @@ -247,6 +247,11 @@ namespace System.IO.IsolatedStorage return _fs.ReadAsync(buffer, offset, count, cancellationToken); } + public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken) + { + return _fs.ReadAsync(buffer, cancellationToken); + } + public override int ReadByte() { return _fs.ReadByte(); @@ -269,6 +274,11 @@ namespace System.IO.IsolatedStorage return _fs.WriteAsync(buffer, offset, count, cancellationToken); } + public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken) + { + return _fs.WriteAsync(buffer, cancellationToken); + } + public override void WriteByte(byte value) { _fs.WriteByte(value); diff --git a/external/corefx/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj b/external/corefx/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj index b047d4849e..ffa00defea 100644 --- a/external/corefx/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj +++ b/external/corefx/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj @@ -117,8 +117,8 @@ Common\Interop\Windows\Interop.VirtualQuery.cs - - Common\System\IO\Win32Marshal.cs + + Common\CoreLib\System\IO\Win32Marshal.cs @@ -180,6 +180,7 @@ + diff --git a/external/corefx/src/System.IO.MemoryMappedFiles/tests/MemoryMappedFilesTestsBase.cs b/external/corefx/src/System.IO.MemoryMappedFiles/tests/MemoryMappedFilesTestsBase.cs index 34def238d0..08af21a06c 100644 --- a/external/corefx/src/System.IO.MemoryMappedFiles/tests/MemoryMappedFilesTestsBase.cs +++ b/external/corefx/src/System.IO.MemoryMappedFiles/tests/MemoryMappedFilesTestsBase.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using System.Text; using Xunit; namespace System.IO.MemoryMappedFiles.Tests diff --git a/external/corefx/src/System.IO.MemoryMappedFiles/tests/Performance/System.IO.MemoryMappedFiles.Performance.Tests.csproj b/external/corefx/src/System.IO.MemoryMappedFiles/tests/Performance/System.IO.MemoryMappedFiles.Performance.Tests.csproj index 7d0243f7d1..47c01fdc5f 100644 --- a/external/corefx/src/System.IO.MemoryMappedFiles/tests/Performance/System.IO.MemoryMappedFiles.Performance.Tests.csproj +++ b/external/corefx/src/System.IO.MemoryMappedFiles/tests/Performance/System.IO.MemoryMappedFiles.Performance.Tests.csproj @@ -14,8 +14,8 @@ - - Common\System\IO\StringBuilderCache.cs + + Common\System\Text\StringBuilderCache.cs Common\System\IO\TempFile.cs @@ -38,4 +38,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj b/external/corefx/src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj index 50e1d85d95..5fcf033f27 100644 --- a/external/corefx/src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj +++ b/external/corefx/src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj @@ -20,8 +20,8 @@ - - Common\System\IO\StringBuilderCache.cs + + Common\System\Text\StringBuilderCache.cs Common\System\IO\TempFile.cs diff --git a/external/corefx/src/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj b/external/corefx/src/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj index fe55a2b7ef..cc486349ee 100644 --- a/external/corefx/src/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj +++ b/external/corefx/src/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj @@ -6,6 +6,12 @@ net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks) + + + \ No newline at end of file diff --git a/external/corefx/src/System.IO.Packaging/src/System.IO.Packaging.csproj b/external/corefx/src/System.IO.Packaging/src/System.IO.Packaging.csproj index 39eccd6686..bb1acf530b 100644 --- a/external/corefx/src/System.IO.Packaging/src/System.IO.Packaging.csproj +++ b/external/corefx/src/System.IO.Packaging/src/System.IO.Packaging.csproj @@ -7,8 +7,6 @@ System.IO.Packaging true true - - netstandard2.0;$(UAPvNextTFM) $(DefineConstants);FEATURE_SERIALIZATION @@ -19,9 +17,6 @@ - - - diff --git a/external/corefx/src/System.IO.Packaging/src/System/IO/Packaging/PartBasedPackageProperties.cs b/external/corefx/src/System.IO.Packaging/src/System/IO/Packaging/PartBasedPackageProperties.cs index 6ad4b12f51..895ca09476 100644 --- a/external/corefx/src/System.IO.Packaging/src/System/IO/Packaging/PartBasedPackageProperties.cs +++ b/external/corefx/src/System.IO.Packaging/src/System/IO/Packaging/PartBasedPackageProperties.cs @@ -313,13 +313,16 @@ namespace System.IO.Packaging // Make sure there is a part to write to and that it contains // the expected start markup. - EnsureXmlWriter(); + Stream zipStream = null; + EnsureXmlWriter(ref zipStream); // Write the property elements and clear _dirty. SerializeDirtyProperties(); // add closing markup and close the writer. CloseXmlWriter(); + Debug.Assert(_xmlWriter == null); + zipStream?.Dispose(); } // Invoked from Package.Close. @@ -670,14 +673,15 @@ namespace System.IO.Packaging // Make sure there is a part to write to and that it contains // the expected start markup. - private void EnsureXmlWriter() + private void EnsureXmlWriter(ref Stream zipStream) { if (_xmlWriter != null) return; EnsurePropertyPart(); // Should succeed or throw an exception. - Stream writerStream = new IgnoreFlushAndCloseStream(_propertyPart.GetStream(FileMode.Create, FileAccess.Write)); + zipStream = _propertyPart.GetStream(FileMode.Create, FileAccess.Write); + Stream writerStream = new IgnoreFlushAndCloseStream(zipStream); _xmlWriter = XmlWriter.Create(writerStream, new XmlWriterSettings { Encoding = System.Text.Encoding.UTF8 }); WriteXmlStartTagsForPackageProperties(); } diff --git a/external/corefx/src/System.IO.Packaging/tests/Tests.cs.REMOVED.git-id b/external/corefx/src/System.IO.Packaging/tests/Tests.cs.REMOVED.git-id index 90aa8d0d7a..8a04d29ca6 100644 --- a/external/corefx/src/System.IO.Packaging/tests/Tests.cs.REMOVED.git-id +++ b/external/corefx/src/System.IO.Packaging/tests/Tests.cs.REMOVED.git-id @@ -1 +1 @@ -00b5395c859aa603f90ee2e93d565f828161af22 \ No newline at end of file +0988c9650f6a2359f42e44e5f49c74e78848d143 \ No newline at end of file diff --git a/external/corefx/src/System.IO.Pipelines/System.IO.Pipelines.sln b/external/corefx/src/System.IO.Pipelines/System.IO.Pipelines.sln new file mode 100644 index 0000000000..dbce1e3723 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/System.IO.Pipelines.sln @@ -0,0 +1,50 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Pipelines.Tests", "tests\System.IO.Pipelines.Tests.csproj", "{9E984EB2-827E-4029-9647-FB5F8B67C553}" + ProjectSection(ProjectDependencies) = postProject + {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977} = {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Pipelines", "src\System.IO.Pipelines.csproj", "{1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}" + ProjectSection(ProjectDependencies) = postProject + {9C524CA0-92FF-437B-B568-BCE8A794A69A} = {9C524CA0-92FF-437B-B568-BCE8A794A69A} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Pipelines", "ref\System.IO.Pipelines.csproj", "{9C524CA0-92FF-437B-B568-BCE8A794A69A}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9E984EB2-827E-4029-9647-FB5F8B67C553}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {9E984EB2-827E-4029-9647-FB5F8B67C553}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {9E984EB2-827E-4029-9647-FB5F8B67C553}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {9E984EB2-827E-4029-9647-FB5F8B67C553}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU + {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU + {9C524CA0-92FF-437B-B568-BCE8A794A69A}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {9C524CA0-92FF-437B-B568-BCE8A794A69A}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {9C524CA0-92FF-437B-B568-BCE8A794A69A}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {9C524CA0-92FF-437B-B568-BCE8A794A69A}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {9E984EB2-827E-4029-9647-FB5F8B67C553} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} + {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD} + {9C524CA0-92FF-437B-B568-BCE8A794A69A} = {2E666815-2EDB-464B-9DF6-380BF4789AD4} + EndGlobalSection +EndGlobal diff --git a/external/corefx/src/System.IO.Pipelines/dir.props b/external/corefx/src/System.IO.Pipelines/dir.props new file mode 100644 index 0000000000..4356decc45 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/dir.props @@ -0,0 +1,8 @@ + + + + + 4.0.0.0 + Open + + \ No newline at end of file diff --git a/external/corefx/src/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj b/external/corefx/src/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj new file mode 100644 index 0000000000..80de0bf401 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj @@ -0,0 +1,11 @@ + + + + + + net46;netcore50;netcoreapp1.0;$(UAPvNextTFM);$(AllXamarinFrameworks) + + + + + diff --git a/external/corefx/src/System.IO.Pipelines/ref/Configurations.props b/external/corefx/src/System.IO.Pipelines/ref/Configurations.props new file mode 100644 index 0000000000..2b1f9ae5c4 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/ref/Configurations.props @@ -0,0 +1,12 @@ + + + + + netstandard1.3; + + + $(PackageConfigurations); + netstandard; + + + diff --git a/external/corefx/src/System.IO.Pipelines/ref/System.IO.Pipelines.cs b/external/corefx/src/System.IO.Pipelines/ref/System.IO.Pipelines.cs new file mode 100644 index 0000000000..ba3b46a707 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/ref/System.IO.Pipelines.cs @@ -0,0 +1,80 @@ +// 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. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the http://aka.ms/api-review process. +// ------------------------------------------------------------------------------ + +namespace System.IO.Pipelines +{ + public partial struct FlushResult + { + private int _dummy; + public FlushResult(bool isCanceled, bool isCompleted) { throw null; } + public bool IsCanceled { get { throw null; } } + public bool IsCompleted { get { throw null; } } + } + public partial interface IDuplexPipe + { + System.IO.Pipelines.PipeReader Input { get; } + System.IO.Pipelines.PipeWriter Output { get; } + } + public sealed partial class Pipe + { + public Pipe() { } + public Pipe(System.IO.Pipelines.PipeOptions options) { } + public System.IO.Pipelines.PipeReader Reader { get { throw null; } } + public System.IO.Pipelines.PipeWriter Writer { get { throw null; } } + public void Reset() { } + } + public partial class PipeOptions + { + public PipeOptions(System.Buffers.MemoryPool pool = null, System.IO.Pipelines.PipeScheduler readerScheduler = null, System.IO.Pipelines.PipeScheduler writerScheduler = null, long pauseWriterThreshold = (long)32768, long resumeWriterThreshold = (long)16384, int minimumSegmentSize = 2048, bool useSynchronizationContext = true) { } + public static System.IO.Pipelines.PipeOptions Default { get { throw null; } } + public int MinimumSegmentSize { get { throw null; } } + public long PauseWriterThreshold { get { throw null; } } + public System.Buffers.MemoryPool Pool { get { throw null; } } + public System.IO.Pipelines.PipeScheduler ReaderScheduler { get { throw null; } } + public long ResumeWriterThreshold { get { throw null; } } + public bool UseSynchronizationContext { get { throw null; } } + public System.IO.Pipelines.PipeScheduler WriterScheduler { get { throw null; } } + } + public abstract partial class PipeReader + { + protected PipeReader() { } + public abstract void AdvanceTo(System.SequencePosition consumed); + public abstract void AdvanceTo(System.SequencePosition consumed, System.SequencePosition examined); + public abstract void CancelPendingRead(); + public abstract void Complete(System.Exception exception = null); + public abstract void OnWriterCompleted(System.Action callback, object state); + public abstract System.Threading.Tasks.ValueTask ReadAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + public abstract bool TryRead(out System.IO.Pipelines.ReadResult result); + } + public abstract partial class PipeScheduler + { + protected PipeScheduler() { } + public static System.IO.Pipelines.PipeScheduler Inline { get { throw null; } } + public static System.IO.Pipelines.PipeScheduler ThreadPool { get { throw null; } } + public abstract void Schedule(System.Action action, object state); + } + public abstract partial class PipeWriter : System.Buffers.IBufferWriter + { + protected PipeWriter() { } + public abstract void Advance(int bytes); + public abstract void CancelPendingFlush(); + public abstract void Complete(System.Exception exception = null); + public abstract System.Threading.Tasks.ValueTask FlushAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + public abstract System.Memory GetMemory(int sizeHint = 0); + public abstract System.Span GetSpan(int sizeHint = 0); + public abstract void OnReaderCompleted(System.Action callback, object state); + public virtual System.Threading.Tasks.ValueTask WriteAsync(System.ReadOnlyMemory source, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + } + public partial struct ReadResult + { + private object _dummy; + public ReadResult(System.Buffers.ReadOnlySequence buffer, bool isCanceled, bool isCompleted) { throw null; } + public System.Buffers.ReadOnlySequence Buffer { get { throw null; } } + public bool IsCanceled { get { throw null; } } + public bool IsCompleted { get { throw null; } } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/ref/System.IO.Pipelines.csproj b/external/corefx/src/System.IO.Pipelines/ref/System.IO.Pipelines.csproj new file mode 100644 index 0000000000..a3dc0912f2 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/ref/System.IO.Pipelines.csproj @@ -0,0 +1,24 @@ + + + + + {9C524CA0-92FF-437B-B568-BCE8A794A69A} + + + + + + + + + + + + + + + + + + + diff --git a/external/corefx/src/System.IO.Pipelines/src/Configurations.props b/external/corefx/src/System.IO.Pipelines/src/Configurations.props new file mode 100644 index 0000000000..7eb3ac6025 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/Configurations.props @@ -0,0 +1,10 @@ + + + + + netstandard1.3; + netstandard; + netcoreapp; + + + diff --git a/external/corefx/src/System.IO.Pipelines/src/Properties/InternalsVisibleTo.cs b/external/corefx/src/System.IO.Pipelines/src/Properties/InternalsVisibleTo.cs new file mode 100644 index 0000000000..9bb191bf7b --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/Properties/InternalsVisibleTo.cs @@ -0,0 +1,7 @@ +// 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.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("System.IO.Pipelines.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010015c01ae1f50e8cc09ba9eac9147cf8fd9fce2cfe9f8dce4f7301c4132ca9fb50ce8cbf1df4dc18dd4d210e4345c744ecb3365ed327efdbc52603faa5e21daa11234c8c4a73e51f03bf192544581ebe107adee3a34928e39d04e524a9ce729d5090bfd7dad9d10c722c0def9ccc08ff0a03790e48bcd1f9b6c476063e1966a1c4")] diff --git a/external/corefx/src/System.IO.Pipelines/src/Resources/Strings.resx b/external/corefx/src/System.IO.Pipelines/src/Resources/Strings.resx new file mode 100644 index 0000000000..d923f06339 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/Resources/Strings.resx @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Pipe is already advanced past provided cursor. + + + Advancing examined to the end would cause pipe to deadlock because FlushAsync is waiting. + + + Can't advance past buffer size. + + + Can't complete reader while reading. + + + Can't complete writer while writing. + + + Concurrent reads or writes are not supported. + + + Can't GetResult unless awaiter is completed. + + + No reading operation to complete. + + + No writing operation. Make sure GetMemory() was called. + + + Both reader and writer has to be completed to be able to reset the pipe. + + + Reading is not allowed after reader was completed. + + + Reading is already in progress. + + + Writing is not allowed after writer was completed. + + \ No newline at end of file diff --git a/external/corefx/src/System.IO.Pipelines/src/System.IO.Pipelines.csproj b/external/corefx/src/System.IO.Pipelines/src/System.IO.Pipelines.csproj new file mode 100644 index 0000000000..df44a756ed --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System.IO.Pipelines.csproj @@ -0,0 +1,60 @@ + + + + + {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977} + $(OutputPath)$(MSBuildProjectName).xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/BufferSegment.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/BufferSegment.cs new file mode 100644 index 0000000000..659aa71638 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/BufferSegment.cs @@ -0,0 +1,114 @@ +// 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; +using System.Diagnostics; + +namespace System.IO.Pipelines +{ + internal sealed class BufferSegment : ReadOnlySequenceSegment + { + private IMemoryOwner _memoryOwner; + private BufferSegment _next; + private int _end; + + /// + /// The Start represents the offset into AvailableMemory where the range of "active" bytes begins. At the point when the block is leased + /// the Start is guaranteed to be equal to 0. The value of Start may be assigned anywhere between 0 and + /// AvailableMemory.Length, and must be equal to or less than End. + /// + public int Start { get; private set; } + + /// + /// The End represents the offset into AvailableMemory where the range of "active" bytes ends. At the point when the block is leased + /// the End is guaranteed to be equal to Start. The value of Start may be assigned anywhere between 0 and + /// Buffer.Length, and must be equal to or less than End. + /// + public int End + { + get => _end; + set + { + Debug.Assert(value - Start <= AvailableMemory.Length); + + _end = value; + Memory = AvailableMemory.Slice(Start, _end - Start); + } + } + + /// + /// Reference to the next block of data when the overall "active" bytes spans multiple blocks. At the point when the block is + /// leased Next is guaranteed to be null. Start, End, and Next are used together in order to create a linked-list of discontiguous + /// working memory. The "active" memory is grown when bytes are copied in, End is increased, and Next is assigned. The "active" + /// memory is shrunk when bytes are consumed, Start is increased, and blocks are returned to the pool. + /// + public BufferSegment NextSegment + { + get => _next; + set + { + _next = value; + Next = value; + } + } + + public void SetMemory(IMemoryOwner memoryOwner) + { + SetMemory(memoryOwner, 0, 0); + } + + public void SetMemory(IMemoryOwner memoryOwner, int start, int end, bool readOnly = false) + { + _memoryOwner = memoryOwner; + + AvailableMemory = _memoryOwner.Memory; + + ReadOnly = readOnly; + RunningIndex = 0; + Start = start; + End = end; + NextSegment = null; + } + + public void ResetMemory() + { + _memoryOwner.Dispose(); + _memoryOwner = null; + AvailableMemory = default; + } + + internal IMemoryOwner MemoryOwner => _memoryOwner; + + public Memory AvailableMemory { get; private set; } + + public int Length => End - Start; + + /// + /// If true, data should not be written into the backing block after the End offset. Data between start and end should never be modified + /// since this would break cloning. + /// + public bool ReadOnly { get; private set; } + + /// + /// The amount of writable bytes in this segment. It is the amount of bytes between Length and End + /// + public int WritableBytes => AvailableMemory.Length - End; + + public void SetNext(BufferSegment segment) + { + Debug.Assert(segment != null); + Debug.Assert(Next == null); + + NextSegment = segment; + + segment = this; + + while (segment.Next != null) + { + segment.NextSegment.RunningIndex = segment.RunningIndex + segment.Length; + segment = segment.NextSegment; + } + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/CompletionData.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/CompletionData.cs new file mode 100644 index 0000000000..9420eccec4 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/CompletionData.cs @@ -0,0 +1,24 @@ +// 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.Threading; + +namespace System.IO.Pipelines +{ + internal readonly struct CompletionData + { + public Action Completion { get; } + public object CompletionState { get; } + public ExecutionContext ExecutionContext { get; } + public SynchronizationContext SynchronizationContext { get; } + + public CompletionData(Action completion, object completionState, ExecutionContext executionContext, SynchronizationContext synchronizationContext) + { + Completion = completion; + CompletionState = completionState; + ExecutionContext = executionContext; + SynchronizationContext = synchronizationContext; + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/FlushResult.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/FlushResult.cs new file mode 100644 index 0000000000..5eab31c0bd --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/FlushResult.cs @@ -0,0 +1,42 @@ +// 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.IO.Pipelines +{ + /// + /// Result returned by call + /// + public struct FlushResult + { + internal ResultFlags _resultFlags; + + /// + /// Creates a new instance of setting and flags + /// + public FlushResult(bool isCanceled, bool isCompleted) + { + _resultFlags = ResultFlags.None; + + if (isCanceled) + { + _resultFlags |= ResultFlags.Canceled; + } + + if (isCompleted) + { + _resultFlags |= ResultFlags.Completed; + } + } + + /// + /// True if the current operation was canceled, otherwise false. + /// + public bool IsCanceled => (_resultFlags & ResultFlags.Canceled) != 0; + + /// + /// True if the is complete otherwise false + /// + public bool IsCompleted => (_resultFlags & ResultFlags.Completed) != 0; + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/IDuplexPipe.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/IDuplexPipe.cs new file mode 100644 index 0000000000..20f1e67e69 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/IDuplexPipe.cs @@ -0,0 +1,22 @@ +// 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.IO.Pipelines +{ + /// + /// Defines a class that provides a duplex pipe from which data can be read from and written to. + /// + public interface IDuplexPipe + { + /// + /// Gets the half of the duplex pipe. + /// + PipeReader Input { get; } + + /// + /// Gets the half of the duplex pipe. + /// + PipeWriter Output { get; } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/InlineScheduler.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/InlineScheduler.cs new file mode 100644 index 0000000000..b77041c294 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/InlineScheduler.cs @@ -0,0 +1,14 @@ +// 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.IO.Pipelines +{ + internal sealed class InlineScheduler : PipeScheduler + { + public override void Schedule(Action action, object state) + { + action(state); + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/Pipe.DefaultPipeReader.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/Pipe.DefaultPipeReader.cs new file mode 100644 index 0000000000..f11b5db7d0 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/Pipe.DefaultPipeReader.cs @@ -0,0 +1,46 @@ +// 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.Threading; +using System.Threading.Tasks; +using System.Threading.Tasks.Sources; + +namespace System.IO.Pipelines +{ + /// + /// Default and implementation. + /// + public sealed partial class Pipe + { + private sealed class DefaultPipeReader : PipeReader, IValueTaskSource + { + private readonly Pipe _pipe; + + public DefaultPipeReader(Pipe pipe) + { + _pipe = pipe; + } + + public override bool TryRead(out ReadResult result) => _pipe.TryRead(out result); + + public override ValueTask ReadAsync(CancellationToken cancellationToken = default) => _pipe.ReadAsync(cancellationToken); + + public override void AdvanceTo(SequencePosition consumed) => _pipe.AdvanceReader(consumed); + + public override void AdvanceTo(SequencePosition consumed, SequencePosition examined) => _pipe.AdvanceReader(consumed, examined); + + public override void CancelPendingRead() => _pipe.CancelPendingRead(); + + public override void Complete(Exception exception = null) => _pipe.CompleteReader(exception); + + public override void OnWriterCompleted(Action callback, object state) => _pipe.OnWriterCompleted(callback, state); + + public ValueTaskSourceStatus GetStatus(short token) => _pipe.GetReadAsyncStatus(); + + public ReadResult GetResult(short token) => _pipe.GetReadAsyncResult(); + + public void OnCompleted(Action continuation, object state, short token, ValueTaskSourceOnCompletedFlags flags) => _pipe.OnReadAsyncCompleted(continuation, state, flags); + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/Pipe.DefaultPipeWriter.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/Pipe.DefaultPipeWriter.cs new file mode 100644 index 0000000000..ca92cb718d --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/Pipe.DefaultPipeWriter.cs @@ -0,0 +1,46 @@ +// 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.Threading; +using System.Threading.Tasks; +using System.Threading.Tasks.Sources; + +namespace System.IO.Pipelines +{ + /// + /// Default and implementation. + /// + public sealed partial class Pipe + { + private sealed class DefaultPipeWriter : PipeWriter, IValueTaskSource + { + private readonly Pipe _pipe; + + public DefaultPipeWriter(Pipe pipe) + { + _pipe = pipe; + } + + public override void Complete(Exception exception = null) => _pipe.CompleteWriter(exception); + + public override void CancelPendingFlush() => _pipe.CancelPendingFlush(); + + public override void OnReaderCompleted(Action callback, object state) => _pipe.OnReaderCompleted(callback, state); + + public override ValueTask FlushAsync(CancellationToken cancellationToken = default) => _pipe.FlushAsync(cancellationToken); + + public override void Advance(int bytes) => _pipe.Advance(bytes); + + public override Memory GetMemory(int sizeHint = 0) => _pipe.GetMemory(sizeHint); + + public override Span GetSpan(int sizeHint = 0) => _pipe.GetMemory(sizeHint).Span; + + public ValueTaskSourceStatus GetStatus(short token) => _pipe.GetFlushAsyncStatus(); + + public FlushResult GetResult(short token) => _pipe.GetFlushAsyncResult(); + + public void OnCompleted(Action continuation, object state, short token, ValueTaskSourceOnCompletedFlags flags) => _pipe.OnFlushAsyncCompleted(continuation, state, flags); + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/Pipe.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/Pipe.cs new file mode 100644 index 0000000000..96aaefb967 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/Pipe.cs @@ -0,0 +1,895 @@ +// 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; +using System.Diagnostics; +using System.Runtime.CompilerServices; +using System.Threading; +using System.Threading.Tasks; +using System.Threading.Tasks.Sources; + +namespace System.IO.Pipelines +{ + /// + /// Default and implementation. + /// + public sealed partial class Pipe + { + internal const int SegmentPoolSize = 16; + + private static readonly Action s_signalReaderAwaitable = state => ((Pipe)state).ReaderCancellationRequested(); + private static readonly Action s_signalWriterAwaitable = state => ((Pipe)state).WriterCancellationRequested(); + private static readonly Action s_invokeCompletionCallbacks = state => ((PipeCompletionCallbacks)state).Execute(); + + // These callbacks all point to the same methods but are different delegate types + private static readonly ContextCallback s_executionContextCallback = ExecuteWithExecutionContext; + private static readonly ContextCallback s_executionContextRawCallback = ExecuteWithoutExecutionContext; + private static readonly SendOrPostCallback s_syncContextExecutionContextCallback = ExecuteWithExecutionContext; + private static readonly SendOrPostCallback s_syncContextExecuteWithoutExecutionContextCallback = ExecuteWithoutExecutionContext; + private static readonly Action s_scheduleWithExecutionContextCallback = ExecuteWithExecutionContext; + + // This sync objects protects the following state: + // 1. _commitHead & _commitHeadIndex + // 2. _length + // 3. _readerAwaitable & _writerAwaitable + private readonly object _sync = new object(); + + private readonly MemoryPool _pool; + private readonly int _minimumSegmentSize; + private readonly long _pauseWriterThreshold; + private readonly long _resumeWriterThreshold; + + private readonly PipeScheduler _readerScheduler; + private readonly PipeScheduler _writerScheduler; + + private readonly BufferSegment[] _bufferSegmentPool; + + private readonly DefaultPipeReader _reader; + private readonly DefaultPipeWriter _writer; + + private long _length; + private long _currentWriteLength; + + private int _pooledSegmentCount; + + private PipeAwaitable _readerAwaitable; + private PipeAwaitable _writerAwaitable; + + private PipeCompletion _writerCompletion; + private PipeCompletion _readerCompletion; + + // The read head which is the extent of the IPipelineReader's consumed bytes + private BufferSegment _readHead; + private int _readHeadIndex; + + // The commit head which is the extent of the bytes available to the IPipelineReader to consume + private BufferSegment _commitHead; + private int _commitHeadIndex; + + // The write head which is the extent of the IPipelineWriter's written bytes + private BufferSegment _writingHead; + + private PipeReaderState _readingState; + + private bool _disposed; + + internal long Length => _length; + + /// + /// Initializes the using as options. + /// + public Pipe() : this(PipeOptions.Default) + { + } + + /// + /// Initializes the with the specified . + /// + public Pipe(PipeOptions options) + { + if (options == null) + { + ThrowHelper.ThrowArgumentNullException(ExceptionArgument.options); + } + + _bufferSegmentPool = new BufferSegment[SegmentPoolSize]; + + _readingState = default; + _readerCompletion = default; + _writerCompletion = default; + + _pool = options.Pool; + _minimumSegmentSize = options.MinimumSegmentSize; + _pauseWriterThreshold = options.PauseWriterThreshold; + _resumeWriterThreshold = options.ResumeWriterThreshold; + _readerScheduler = options.ReaderScheduler; + _writerScheduler = options.WriterScheduler; + var useSynchronizationContext = options.UseSynchronizationContext; + _readerAwaitable = new PipeAwaitable(completed: false, useSynchronizationContext); + _writerAwaitable = new PipeAwaitable(completed: true, useSynchronizationContext); + _reader = new DefaultPipeReader(this); + _writer = new DefaultPipeWriter(this); + } + + private void ResetState() + { + _readerCompletion.Reset(); + _writerCompletion.Reset(); + _commitHeadIndex = 0; + _currentWriteLength = 0; + _length = 0; + } + + internal Memory GetMemory(int sizeHint) + { + if (_writerCompletion.IsCompleted) + { + ThrowHelper.ThrowInvalidOperationException_NoWritingAllowed(); + } + + if (sizeHint < 0) + { + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.minimumSize); + } + + lock (_sync) + { + BufferSegment segment = _writingHead ?? AllocateWriteHeadUnsynchronized(sizeHint); + + int bytesLeftInBuffer = segment.WritableBytes; + + // If inadequate bytes left or if the segment is readonly + if (bytesLeftInBuffer == 0 || bytesLeftInBuffer < sizeHint || segment.ReadOnly) + { + BufferSegment nextSegment = CreateSegmentUnsynchronized(); + nextSegment.SetMemory(_pool.Rent(GetSegmentSize(sizeHint))); + + segment.SetNext(nextSegment); + + _writingHead = nextSegment; + } + } + + return _writingHead.AvailableMemory.Slice(_writingHead.End, _writingHead.WritableBytes); + } + + private BufferSegment AllocateWriteHeadUnsynchronized(int sizeHint) + { + BufferSegment segment = null; + + if (_commitHead != null && !_commitHead.ReadOnly) + { + // Try to return the tail so the calling code can append to it + int remaining = _commitHead.WritableBytes; + + if (sizeHint <= remaining && remaining > 0) + { + // Free tail space of the right amount, use that + segment = _commitHead; + } + } + + if (segment == null) + { + // No free tail space, allocate a new segment + segment = CreateSegmentUnsynchronized(); + segment.SetMemory(_pool.Rent(GetSegmentSize(sizeHint))); + } + + if (_commitHead == null) + { + // No previous writes have occurred + _commitHead = segment; + } + else if (segment != _commitHead && _commitHead.Next == null) + { + // Append the segment to the commit head if writes have been committed + // and it isn't the same segment (unused tail space) + _commitHead.SetNext(segment); + } + + // Set write head to assigned segment + _writingHead = segment; + + return segment; + } + + private int GetSegmentSize(int sizeHint) + { + // First we need to handle case where hint is smaller than minimum segment size + var adjustedToMinimumSize = Math.Max(_minimumSegmentSize, sizeHint); + // After that adjust it to fit into pools max buffer size + var adjustedToMaximumSize = Math.Min(_pool.MaxBufferSize, adjustedToMinimumSize); + return adjustedToMaximumSize; + } + + private BufferSegment CreateSegmentUnsynchronized() + { + if (_pooledSegmentCount > 0) + { + _pooledSegmentCount--; + return _bufferSegmentPool[_pooledSegmentCount]; + } + + return new BufferSegment(); + } + + private void ReturnSegmentUnsynchronized(BufferSegment segment) + { + if (_pooledSegmentCount < _bufferSegmentPool.Length) + { + _bufferSegmentPool[_pooledSegmentCount] = segment; + _pooledSegmentCount++; + } + } + + internal bool CommitUnsynchronized() + { + if (_writingHead == null) + { + // Nothing written to commit + return true; + } + + if (_readHead == null) + { + // Update the head to point to the head of the buffer. + // This happens if we called alloc(0) then write + _readHead = _commitHead; + _readHeadIndex = 0; + } + + // Always move the commit head to the write head + var bytesWritten = _currentWriteLength; + _commitHead = _writingHead; + _commitHeadIndex = _writingHead.End; + _length += bytesWritten; + + // Do not reset if reader is complete + if (_pauseWriterThreshold > 0 && + _length >= _pauseWriterThreshold && + !_readerCompletion.IsCompleted) + { + _writerAwaitable.Reset(); + } + + // Clear the writing state + _writingHead = null; + _currentWriteLength = 0; + + return bytesWritten == 0; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + internal void Advance(int bytesWritten) + { + if (_writingHead == null) + { + ThrowHelper.ThrowInvalidOperationException_NotWritingNoAlloc(); + } + + if (bytesWritten > 0) + { + Debug.Assert(!_writingHead.ReadOnly); + Debug.Assert(_writingHead.Next == null); + + Memory buffer = _writingHead.AvailableMemory; + + if (_writingHead.End > buffer.Length - bytesWritten) + { + ThrowHelper.ThrowInvalidOperationException_AdvancingPastBufferSize(); + } + + _writingHead.End += bytesWritten; + _currentWriteLength += bytesWritten; + } + else if (bytesWritten < 0) + { + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.bytesWritten); + } + + // and if zero, just do nothing; don't need to validate tail etc + } + + internal ValueTask FlushAsync(CancellationToken cancellationToken) + { + CompletionData completionData; + CancellationTokenRegistration cancellationTokenRegistration; + ValueTask result; + lock (_sync) + { + var wasEmpty = CommitUnsynchronized(); + + // AttachToken before completing reader awaiter in case cancellationToken is already completed + cancellationTokenRegistration = _writerAwaitable.AttachToken(cancellationToken, s_signalWriterAwaitable, this); + + // Complete reader only if new data was pushed into the pipe + if (!wasEmpty) + { + _readerAwaitable.Complete(out completionData); + } + else + { + completionData = default; + } + + // I couldn't find a way for flush to induce backpressure deadlock + // if it always adds new data to pipe and wakes up the reader but assert anyway + Debug.Assert(_writerAwaitable.IsCompleted || _readerAwaitable.IsCompleted); + + // If the writer is completed (which it will be most of the time) the return a completed ValueTask + if (_writerAwaitable.IsCompleted) + { + var flushResult = new FlushResult(); + GetFlushResult(ref flushResult); + result = new ValueTask(flushResult); + } + else + { + // Otherwise it's async + result = new ValueTask(_writer, token: 0); + } + } + + cancellationTokenRegistration.Dispose(); + + TrySchedule(_readerScheduler, completionData); + + return result; + } + + internal void CompleteWriter(Exception exception) + { + CompletionData completionData; + PipeCompletionCallbacks completionCallbacks; + bool readerCompleted; + + lock (_sync) + { + // Commit any pending buffers + CommitUnsynchronized(); + + completionCallbacks = _writerCompletion.TryComplete(exception); + _readerAwaitable.Complete(out completionData); + readerCompleted = _readerCompletion.IsCompleted; + } + + if (completionCallbacks != null) + { + TrySchedule(_readerScheduler, s_invokeCompletionCallbacks, completionCallbacks); + } + + TrySchedule(_readerScheduler, completionData); + + if (readerCompleted) + { + CompletePipe(); + } + } + + internal void AdvanceReader(in SequencePosition consumed) + { + AdvanceReader(consumed, consumed); + } + + internal void AdvanceReader(in SequencePosition consumed, in SequencePosition examined) + { + // If the reader is completed + if (_readerCompletion.IsCompleted) + { + ThrowHelper.ThrowInvalidOperationException_NoReadingAllowed(); + } + + // TODO: Use new SequenceMarshal.TryGetReadOnlySequenceSegment to get the correct data + // directly casting only works because the type value in ReadOnlySequenceSegment is 0 + AdvanceReader((BufferSegment)consumed.GetObject(), consumed.GetInteger(), (BufferSegment)examined.GetObject(), examined.GetInteger()); + } + + internal void AdvanceReader(BufferSegment consumedSegment, int consumedIndex, BufferSegment examinedSegment, int examinedIndex) + { + BufferSegment returnStart = null; + BufferSegment returnEnd = null; + + CompletionData completionData = default; + + lock (_sync) + { + var examinedEverything = false; + if (examinedSegment == _commitHead) + { + examinedEverything = _commitHead != null ? examinedIndex == _commitHeadIndex - _commitHead.Start : examinedIndex == 0; + } + + if (consumedSegment != null) + { + if (_readHead == null) + { + ThrowHelper.ThrowInvalidOperationException_AdvanceToInvalidCursor(); + return; + } + + returnStart = _readHead; + returnEnd = consumedSegment; + + // Check if we crossed _maximumSizeLow and complete backpressure + long consumedBytes = new ReadOnlySequence(returnStart, _readHeadIndex, consumedSegment, consumedIndex).Length; + long oldLength = _length; + _length -= consumedBytes; + + if (oldLength >= _resumeWriterThreshold && + _length < _resumeWriterThreshold) + { + _writerAwaitable.Complete(out completionData); + } + + // Check if we consumed entire last segment + // if we are going to return commit head we need to check that there is no writing operation that + // might be using tailspace + if (consumedIndex == returnEnd.Length && _writingHead != returnEnd) + { + BufferSegment nextBlock = returnEnd.NextSegment; + if (_commitHead == returnEnd) + { + _commitHead = nextBlock; + _commitHeadIndex = 0; + } + + _readHead = nextBlock; + _readHeadIndex = 0; + returnEnd = nextBlock; + } + else + { + _readHead = consumedSegment; + _readHeadIndex = consumedIndex; + } + } + + // We reset the awaitable to not completed if we've examined everything the producer produced so far + // but only if writer is not completed yet + if (examinedEverything && !_writerCompletion.IsCompleted) + { + // Prevent deadlock where reader awaits new data and writer await backpressure + if (!_writerAwaitable.IsCompleted) + { + ThrowHelper.ThrowInvalidOperationException_BackpressureDeadlock(); + } + _readerAwaitable.Reset(); + } + + while (returnStart != null && returnStart != returnEnd) + { + returnStart.ResetMemory(); + ReturnSegmentUnsynchronized(returnStart); + returnStart = returnStart.NextSegment; + } + + _readingState.End(); + } + + TrySchedule(_writerScheduler, completionData); + } + + internal void CompleteReader(Exception exception) + { + PipeCompletionCallbacks completionCallbacks; + CompletionData completionData; + bool writerCompleted; + + lock (_sync) + { + // If we're reading, treat clean up that state before continuting + if (_readingState.IsActive) + { + _readingState.End(); + } + + // REVIEW: We should consider cleaning up all of the allocated memory + // on the reader side now. + + completionCallbacks = _readerCompletion.TryComplete(exception); + _writerAwaitable.Complete(out completionData); + writerCompleted = _writerCompletion.IsCompleted; + } + + if (completionCallbacks != null) + { + TrySchedule(_writerScheduler, s_invokeCompletionCallbacks, completionCallbacks); + } + + TrySchedule(_writerScheduler, completionData); + + if (writerCompleted) + { + CompletePipe(); + } + } + + internal void OnWriterCompleted(Action callback, object state) + { + if (callback == null) + { + ThrowHelper.ThrowArgumentNullException(ExceptionArgument.callback); + } + + PipeCompletionCallbacks completionCallbacks; + lock (_sync) + { + completionCallbacks = _writerCompletion.AddCallback(callback, state); + } + + if (completionCallbacks != null) + { + TrySchedule(_readerScheduler, s_invokeCompletionCallbacks, completionCallbacks); + } + } + + internal void CancelPendingRead() + { + CompletionData completionData; + lock (_sync) + { + _readerAwaitable.Cancel(out completionData); + } + TrySchedule(_readerScheduler, completionData); + } + + internal void CancelPendingFlush() + { + CompletionData completionData; + lock (_sync) + { + _writerAwaitable.Cancel(out completionData); + } + TrySchedule(_writerScheduler, completionData); + } + + internal void OnReaderCompleted(Action callback, object state) + { + if (callback == null) + { + ThrowHelper.ThrowArgumentNullException(ExceptionArgument.callback); + } + + PipeCompletionCallbacks completionCallbacks; + lock (_sync) + { + completionCallbacks = _readerCompletion.AddCallback(callback, state); + } + + if (completionCallbacks != null) + { + TrySchedule(_writerScheduler, s_invokeCompletionCallbacks, completionCallbacks); + } + } + + internal ValueTask ReadAsync(CancellationToken token) + { + CancellationTokenRegistration cancellationTokenRegistration; + if (_readerCompletion.IsCompleted) + { + ThrowHelper.ThrowInvalidOperationException_NoReadingAllowed(); + } + + ValueTask result; + lock (_sync) + { + cancellationTokenRegistration = _readerAwaitable.AttachToken(token, s_signalReaderAwaitable, this); + + // If the awaitable is already complete then return the value result directly + if (_readerAwaitable.IsCompleted) + { + var readResult = new ReadResult(); + GetReadResult(ref readResult); + result = new ValueTask(readResult); + } + else + { + // Otherwise it's async + result = new ValueTask(_reader, token: 0); + } + } + cancellationTokenRegistration.Dispose(); + + return result; + } + + internal bool TryRead(out ReadResult result) + { + lock (_sync) + { + if (_readerCompletion.IsCompleted) + { + ThrowHelper.ThrowInvalidOperationException_NoReadingAllowed(); + } + + result = new ReadResult(); + if (_length > 0 || _readerAwaitable.IsCompleted) + { + GetReadResult(ref result); + return true; + } + + if (_readerAwaitable.HasContinuation) + { + ThrowHelper.ThrowInvalidOperationException_AlreadyReading(); + } + return false; + } + } + + private static void TrySchedule(PipeScheduler scheduler, Action action, object state) + { + if (action != null) + { + scheduler.Schedule(action, state); + } + } + + private static void TrySchedule(PipeScheduler scheduler, in CompletionData completionData) + { + // Nothing to do + if (completionData.Completion == null) + { + return; + } + + // Ultimately, we need to call either + // 1. The sync context with a delegate + // 2. The scheduler with a delegate + // That delegate and state will either be the action passed in directly + // or it will be that specified delegate wrapped in ExecutionContext.Run + + if (completionData.SynchronizationContext == null) + { + // We don't have a SynchronizationContext so execute on the specified scheduler + if (completionData.ExecutionContext == null) + { + // We can run directly, this should be the default fast path + scheduler.Schedule(completionData.Completion, completionData.CompletionState); + return; + } + + // We also have to run on the specified execution context so run the scheduler and execute the + // delegate on the execution context + scheduler.Schedule(s_scheduleWithExecutionContextCallback, completionData); + } + else + { + if (completionData.ExecutionContext == null) + { + // We need to box the struct here since there's no generic overload for state + completionData.SynchronizationContext.Post(s_syncContextExecuteWithoutExecutionContextCallback, completionData); + } + else + { + // We need to execute the callback with the execution context + completionData.SynchronizationContext.Post(s_syncContextExecutionContextCallback, completionData); + } + } + } + + private static void ExecuteWithoutExecutionContext(object state) + { + CompletionData completionData = (CompletionData)state; + completionData.Completion(completionData.CompletionState); + } + + private static void ExecuteWithExecutionContext(object state) + { + CompletionData completionData = (CompletionData)state; + Debug.Assert(completionData.ExecutionContext != null); + ExecutionContext.Run(completionData.ExecutionContext, s_executionContextRawCallback, state); + } + + private void CompletePipe() + { + lock (_sync) + { + if (_disposed) + { + return; + } + + _disposed = true; + // Return all segments + // if _readHead is null we need to try return _commitHead + // because there might be a block allocated for writing + BufferSegment segment = _readHead ?? _commitHead; + while (segment != null) + { + BufferSegment returnSegment = segment; + segment = segment.NextSegment; + + returnSegment.ResetMemory(); + } + + _writingHead = null; + _readHead = null; + _commitHead = null; + } + } + + internal ValueTaskSourceStatus GetReadAsyncStatus() + { + if (_readerAwaitable.IsCompleted) + { + if (_writerCompletion.IsFaulted) + { + return ValueTaskSourceStatus.Faulted; + } + + return ValueTaskSourceStatus.Succeeded; + } + return ValueTaskSourceStatus.Pending; + } + + internal void OnReadAsyncCompleted(Action continuation, object state, ValueTaskSourceOnCompletedFlags flags) + { + CompletionData completionData; + bool doubleCompletion; + lock (_sync) + { + _readerAwaitable.OnCompleted(continuation, state, flags, out completionData, out doubleCompletion); + } + if (doubleCompletion) + { + Writer.Complete(ThrowHelper.CreateInvalidOperationException_NoConcurrentOperation()); + } + TrySchedule(_readerScheduler, completionData); + } + + internal ReadResult GetReadAsyncResult() + { + if (!_readerAwaitable.IsCompleted) + { + ThrowHelper.ThrowInvalidOperationException_GetResultNotCompleted(); + } + + var result = new ReadResult(); + lock (_sync) + { + GetReadResult(ref result); + } + return result; + } + + private void GetReadResult(ref ReadResult result) + { + if (_writerCompletion.IsCompletedOrThrow()) + { + result._resultFlags |= ResultFlags.Completed; + } + + bool isCanceled = _readerAwaitable.ObserveCancelation(); + if (isCanceled) + { + result._resultFlags |= ResultFlags.Canceled; + } + + // No need to read end if there is no head + BufferSegment head = _readHead; + + if (head != null) + { + // Reading commit head shared with writer + result._resultBuffer = new ReadOnlySequence(head, _readHeadIndex, _commitHead, _commitHeadIndex - _commitHead.Start); + } + + if (isCanceled) + { + _readingState.BeginTentative(); + } + else + { + _readingState.Begin(); + } + } + + internal ValueTaskSourceStatus GetFlushAsyncStatus() + { + if (_writerAwaitable.IsCompleted) + { + if (_readerCompletion.IsFaulted) + { + return ValueTaskSourceStatus.Faulted; + } + + return ValueTaskSourceStatus.Succeeded; + } + return ValueTaskSourceStatus.Pending; + } + + internal FlushResult GetFlushAsyncResult() + { + var result = new FlushResult(); + lock (_sync) + { + if (!_writerAwaitable.IsCompleted) + { + ThrowHelper.ThrowInvalidOperationException_GetResultNotCompleted(); + } + + GetFlushResult(ref result); + } + + return result; + } + + private void GetFlushResult(ref FlushResult result) + { + // Change the state from to be canceled -> observed + if (_writerAwaitable.ObserveCancelation()) + { + result._resultFlags |= ResultFlags.Canceled; + } + if (_readerCompletion.IsCompletedOrThrow()) + { + result._resultFlags |= ResultFlags.Completed; + } + } + + internal void OnFlushAsyncCompleted(Action continuation, object state, ValueTaskSourceOnCompletedFlags flags) + { + CompletionData completionData; + bool doubleCompletion; + lock (_sync) + { + _writerAwaitable.OnCompleted(continuation, state, flags, out completionData, out doubleCompletion); + } + if (doubleCompletion) + { + Reader.Complete(ThrowHelper.CreateInvalidOperationException_NoConcurrentOperation()); + } + TrySchedule(_writerScheduler, completionData); + } + + private void ReaderCancellationRequested() + { + CompletionData completionData; + lock (_sync) + { + _readerAwaitable.Cancel(out completionData); + } + TrySchedule(_readerScheduler, completionData); + } + + private void WriterCancellationRequested() + { + CompletionData completionData; + lock (_sync) + { + _writerAwaitable.Cancel(out completionData); + } + TrySchedule(_writerScheduler, completionData); + } + + /// + /// Gets the for this pipe. + /// + public PipeReader Reader => _reader; + + /// + /// Gets the for this pipe. + /// + public PipeWriter Writer => _writer; + + /// + /// Resets the pipe + /// + public void Reset() + { + lock (_sync) + { + if (!_disposed) + { + ThrowHelper.ThrowInvalidOperationException_ResetIncompleteReaderWriter(); + } + + _disposed = false; + ResetState(); + } + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeAwaitable.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeAwaitable.cs new file mode 100644 index 0000000000..8bb16cfccc --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeAwaitable.cs @@ -0,0 +1,179 @@ +// 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 System.Threading.Tasks.Sources; + +namespace System.IO.Pipelines +{ + [DebuggerDisplay("CanceledState: {_canceledState}, IsCompleted: {IsCompleted}")] + internal struct PipeAwaitable + { + private static readonly Action s_awaitableIsCompleted = _ => { }; + private static readonly Action s_awaitableIsNotCompleted = _ => { }; + + private CanceledState _canceledState; + private Action _completion; + private object _completionState; + private CancellationToken _cancellationToken; + private CancellationTokenRegistration _cancellationTokenRegistration; + private SynchronizationContext _synchronizationContext; + private ExecutionContext _executionContext; + private bool _useSynchronizationContext; + + public PipeAwaitable(bool completed, bool useSynchronizationContext) + { + _canceledState = CanceledState.NotCanceled; + _completion = completed ? s_awaitableIsCompleted : s_awaitableIsNotCompleted; + _completionState = null; + _cancellationTokenRegistration = default; + _synchronizationContext = null; + _executionContext = null; + _useSynchronizationContext = useSynchronizationContext; + } + + public bool IsCompleted => ReferenceEquals(_completion, s_awaitableIsCompleted); + + public bool HasContinuation => !ReferenceEquals(_completion, s_awaitableIsNotCompleted); + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public CancellationTokenRegistration AttachToken(CancellationToken cancellationToken, Action callback, object state) + { + CancellationTokenRegistration oldRegistration = default; + if (!cancellationToken.Equals(_cancellationToken)) + { + oldRegistration = _cancellationTokenRegistration; + _cancellationToken = cancellationToken; + if (_cancellationToken.CanBeCanceled) + { + _cancellationToken.ThrowIfCancellationRequested(); + _cancellationTokenRegistration = _cancellationToken.Register(callback, state); + } + } + return oldRegistration; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public void Complete(out CompletionData completionData) + { + Action currentCompletion = _completion; + _completion = s_awaitableIsCompleted; + + completionData = default; + + if (!ReferenceEquals(currentCompletion, s_awaitableIsCompleted) && + !ReferenceEquals(currentCompletion, s_awaitableIsNotCompleted)) + { + completionData = new CompletionData(currentCompletion, _completionState, _executionContext, _synchronizationContext); + } + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public void Reset() + { + if (ReferenceEquals(_completion, s_awaitableIsCompleted) && + _canceledState < CanceledState.CancellationPreRequested) + { + _completion = s_awaitableIsNotCompleted; + _completionState = null; + _synchronizationContext = null; + _executionContext = null; + } + + // Change the state from observed -> not cancelled. + // We only want to reset the cancelled state if it was observed + if (_canceledState == CanceledState.CancelationObserved) + { + _canceledState = CanceledState.NotCanceled; + } + } + + public void OnCompleted(Action continuation, object state, ValueTaskSourceOnCompletedFlags flags, out CompletionData completionData, out bool doubleCompletion) + { + completionData = default; + + doubleCompletion = false; + Action awaitableState = _completion; + if (ReferenceEquals(awaitableState, s_awaitableIsNotCompleted)) + { + _completion = continuation; + _completionState = state; + + // Capture the SynchronizationContext if there's any and we're allowing capture (from pipe options) + if (_useSynchronizationContext && (flags & ValueTaskSourceOnCompletedFlags.UseSchedulingContext) != 0) + { + SynchronizationContext sc = SynchronizationContext.Current; + if (sc != null && sc.GetType() != typeof(SynchronizationContext)) + { + _synchronizationContext = SynchronizationContext.Current; + } + } + + // Capture the execution context + if ((flags & ValueTaskSourceOnCompletedFlags.FlowExecutionContext) != 0) + { + _executionContext = ExecutionContext.Capture(); + } + } + + if (ReferenceEquals(awaitableState, s_awaitableIsCompleted)) + { + completionData = new CompletionData(continuation, state, _executionContext, _synchronizationContext); + return; + } + + if (!ReferenceEquals(awaitableState, s_awaitableIsNotCompleted)) + { + doubleCompletion = true; + completionData = new CompletionData(continuation, state, _executionContext, _synchronizationContext); + } + } + + public void Cancel(out CompletionData completionData) + { + Complete(out completionData); + _canceledState = completionData.Completion == null ? + CanceledState.CancellationPreRequested : + CanceledState.CancellationRequested; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public bool ObserveCancelation() + { + if (_canceledState == CanceledState.NotCanceled) + { + return false; + } + + bool isPrerequested = _canceledState == CanceledState.CancellationPreRequested; + + if (_canceledState >= CanceledState.CancellationPreRequested) + { + _canceledState = CanceledState.CancelationObserved; + + // Do not reset awaitable if we were not awaiting in the first place + if (!isPrerequested) + { + Reset(); + } + + _cancellationToken.ThrowIfCancellationRequested(); + + return true; + } + + return false; + } + + private enum CanceledState + { + NotCanceled = 0, + CancelationObserved = 1, + CancellationPreRequested = 2, + CancellationRequested = 3, + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeCompletion.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeCompletion.cs new file mode 100644 index 0000000000..b9b582c658 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeCompletion.cs @@ -0,0 +1,120 @@ +// 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; +using System.Diagnostics; +using System.Runtime.CompilerServices; +using System.Runtime.ExceptionServices; + +namespace System.IO.Pipelines +{ + [DebuggerDisplay("IsCompleted: {" + nameof(IsCompleted) + "}")] + internal struct PipeCompletion + { + private static readonly ArrayPool s_completionCallbackPool = ArrayPool.Shared; + private static readonly Exception s_completedNoException = new Exception(); + + private const int InitialCallbacksSize = 1; + + private Exception _exception; + + private PipeCompletionCallback[] _callbacks; + private int _callbackCount; + + public bool IsCompleted => _exception != null; + + public bool IsFaulted => IsCompleted && _exception != s_completedNoException; + + public PipeCompletionCallbacks TryComplete(Exception exception = null) + { + if (_exception == null) + { + // Set the exception object to the exception passed in or a sentinel value + _exception = exception ?? s_completedNoException; + } + return GetCallbacks(); + } + + public PipeCompletionCallbacks AddCallback(Action callback, object state) + { + if (_callbacks == null) + { + _callbacks = s_completionCallbackPool.Rent(InitialCallbacksSize); + } + + int newIndex = _callbackCount; + _callbackCount++; + + if (newIndex == _callbacks.Length) + { + PipeCompletionCallback[] newArray = s_completionCallbackPool.Rent(_callbacks.Length * 2); + Array.Copy(_callbacks, newArray, _callbacks.Length); + s_completionCallbackPool.Return(_callbacks, clearArray: true); + _callbacks = newArray; + } + + _callbacks[newIndex].Callback = callback; + _callbacks[newIndex].State = state; + + if (IsCompleted) + { + return GetCallbacks(); + } + + return null; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public bool IsCompletedOrThrow() + { + if (_exception == null) + { + return false; + } + + if (_exception != s_completedNoException) + { + ThrowLatchedException(); + } + + return true; + } + + private PipeCompletionCallbacks GetCallbacks() + { + Debug.Assert(IsCompleted); + if (_callbackCount == 0) + { + return null; + } + + var callbacks = new PipeCompletionCallbacks(s_completionCallbackPool, + _callbackCount, + _exception == s_completedNoException ? null : _exception, + _callbacks); + + _callbacks = null; + _callbackCount = 0; + return callbacks; + } + + public void Reset() + { + Debug.Assert(IsCompleted); + Debug.Assert(_callbacks == null); + _exception = null; + } + + [MethodImpl(MethodImplOptions.NoInlining)] + private void ThrowLatchedException() + { + ExceptionDispatchInfo.Capture(_exception).Throw(); + } + + public override string ToString() + { + return $"{nameof(IsCompleted)}: {IsCompleted}"; + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeCompletionCallback.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeCompletionCallback.cs new file mode 100644 index 0000000000..6647ad6b39 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeCompletionCallback.cs @@ -0,0 +1,12 @@ +// 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.IO.Pipelines +{ + internal struct PipeCompletionCallback + { + public Action Callback; + public object State; + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeCompletionCallbacks.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeCompletionCallbacks.cs new file mode 100644 index 0000000000..e8e87baf15 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeCompletionCallbacks.cs @@ -0,0 +1,64 @@ +// 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; +using System.Collections.Generic; + +namespace System.IO.Pipelines +{ + internal sealed class PipeCompletionCallbacks + { + private readonly ArrayPool _pool; + private readonly int _count; + private readonly Exception _exception; + private readonly PipeCompletionCallback[] _callbacks; + + public PipeCompletionCallbacks(ArrayPool pool, int count, Exception exception, PipeCompletionCallback[] callbacks) + { + _pool = pool; + _count = count; + _exception = exception; + _callbacks = callbacks; + } + + public void Execute() + { + if (_callbacks == null || _count == 0) + { + return; + } + + try + { + List exceptions = null; + + for (int i = 0; i < _count; i++) + { + PipeCompletionCallback callback = _callbacks[i]; + try + { + callback.Callback(_exception, callback.State); + } + catch (Exception ex) + { + if (exceptions == null) + { + exceptions = new List(); + } + exceptions.Add(ex); + } + } + + if (exceptions != null) + { + throw new AggregateException(exceptions); + } + } + finally + { + _pool.Return(_callbacks, clearArray: true); + } + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeOptions.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeOptions.cs new file mode 100644 index 0000000000..bddbdaaab8 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeOptions.cs @@ -0,0 +1,93 @@ +// 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; +using System.Threading; + +namespace System.IO.Pipelines +{ + /// + /// Represents a set of options + /// + public class PipeOptions + { + private const int DefaultMinimumSegmentSize = 2048; + + private const int DefaultResumeWriterThreshold = DefaultMinimumSegmentSize * Pipe.SegmentPoolSize / 2; + + private const int DefaultPauseWriterThreshold = DefaultMinimumSegmentSize * Pipe.SegmentPoolSize; + + /// + /// Default instance of + /// + public static PipeOptions Default { get; } = new PipeOptions(); + + /// + /// Creates a new instance of + /// + public PipeOptions( + MemoryPool pool = null, + PipeScheduler readerScheduler = null, + PipeScheduler writerScheduler = null, + long pauseWriterThreshold = DefaultPauseWriterThreshold, + long resumeWriterThreshold = DefaultResumeWriterThreshold, + int minimumSegmentSize = DefaultMinimumSegmentSize, + bool useSynchronizationContext = true) + { + if (pauseWriterThreshold < 0) + { + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.pauseWriterThreshold); + } + + if (resumeWriterThreshold < 0 && resumeWriterThreshold > pauseWriterThreshold) + { + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.resumeWriterThreshold); + } + + Pool = pool ?? MemoryPool.Shared; + ReaderScheduler = readerScheduler ?? PipeScheduler.ThreadPool; + WriterScheduler = writerScheduler ?? PipeScheduler.ThreadPool; + PauseWriterThreshold = pauseWriterThreshold; + ResumeWriterThreshold = resumeWriterThreshold; + MinimumSegmentSize = minimumSegmentSize; + UseSynchronizationContext = useSynchronizationContext; + } + + /// + /// Gets a value that determines if asynchronous callbacks should be executed on the they were captured on. + /// This takes precedence over the schedulers specified in and . + /// + public bool UseSynchronizationContext { get; } + + /// + /// Gets amount of bytes in when starts blocking + /// + public long PauseWriterThreshold { get; } + + /// + /// Gets amount of bytes in when stops blocking + /// + public long ResumeWriterThreshold { get; } + + /// + /// Gets minimum size of segment requested from + /// + public int MinimumSegmentSize { get; } + + /// + /// Gets the used to execute callbacks + /// + public PipeScheduler WriterScheduler { get; } + + /// + /// Gets the used to execute callbacks + /// + public PipeScheduler ReaderScheduler { get; } + + /// + /// Gets the instances used for buffer management + /// + public MemoryPool Pool { get; } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeReader.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeReader.cs new file mode 100644 index 0000000000..90276358ca --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeReader.cs @@ -0,0 +1,66 @@ +// 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.Threading; +using System.Threading.Tasks; + +namespace System.IO.Pipelines +{ + /// + /// Defines a class that provides access to a read side of pipe. + /// + public abstract class PipeReader + { + /// + /// Attempt to synchronously read data the . + /// + /// The + /// True if data was available, or if the call was canceled or the writer was completed. + /// If the pipe returns false, there's no need to call . + public abstract bool TryRead(out ReadResult result); + + /// + /// Asynchronously reads a sequence of bytes from the current . + /// + /// A representing the asynchronous read operation. + public abstract ValueTask ReadAsync(CancellationToken cancellationToken = default); + + /// + /// Moves forward the pipeline's read cursor to after the consumed data. + /// + /// Marks the extent of the data that has been successfully processed. + /// + /// The memory for the consumed data will be released and no longer available. + /// The examined data communicates to the pipeline when it should signal more data is available. + /// + public abstract void AdvanceTo(SequencePosition consumed); + + /// + /// Moves forward the pipeline's read cursor to after the consumed data. + /// + /// Marks the extent of the data that has been successfully processed. + /// Marks the extent of the data that has been read and examined. + /// + /// The memory for the consumed data will be released and no longer available. + /// The examined data communicates to the pipeline when it should signal more data is available. + /// + public abstract void AdvanceTo(SequencePosition consumed, SequencePosition examined); + + /// + /// Cancel to currently pending or if none is pending next call to , without completing the . + /// + public abstract void CancelPendingRead(); + + /// + /// Signal to the producer that the consumer is done reading. + /// + /// Optional indicating a failure that's causing the pipeline to complete. + public abstract void Complete(Exception exception = null); + + /// + /// Cancel the pending operation. If there is none, cancels next operation, without completing the . + /// + public abstract void OnWriterCompleted(Action callback, object state); + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeReaderState.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeReaderState.cs new file mode 100644 index 0000000000..caffd36437 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeReaderState.cs @@ -0,0 +1,59 @@ +// 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.IO.Pipelines +{ + [DebuggerDisplay("State: {_state}")] + internal struct PipeReaderState + { + private State _state; + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public void Begin() + { + // Inactive and Tentative are allowed + if (_state == State.Active) + { + ThrowHelper.ThrowInvalidOperationException_AlreadyReading(); + } + + _state = State.Active; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public void BeginTentative() + { + // Inactive and Tentative are allowed + if (_state == State.Active) + { + ThrowHelper.ThrowInvalidOperationException_AlreadyReading(); + } + + _state = State.Tentative; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public void End() + { + if (_state == State.Inactive) + { + ThrowHelper.ThrowInvalidOperationException_NoReadToComplete(); + } + + _state = State.Inactive; + } + + public bool IsActive => _state == State.Active; + + internal enum State: byte + { + Inactive = 1, + Active = 2, + Tentative = 3 + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeScheduler.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeScheduler.cs new file mode 100644 index 0000000000..832671a4a8 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeScheduler.cs @@ -0,0 +1,30 @@ +// 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.IO.Pipelines +{ + /// + /// Abstraction for running and callbacks and continuations + /// + public abstract class PipeScheduler + { + private static readonly ThreadPoolScheduler s_threadPoolScheduler = new ThreadPoolScheduler(); + private static readonly InlineScheduler s_inlineScheduler = new InlineScheduler(); + + /// + /// The implementation that queues callbacks to thread pool + /// + public static PipeScheduler ThreadPool => s_threadPoolScheduler; + + /// + /// The implementation that runs callbacks inline + /// + public static PipeScheduler Inline => s_inlineScheduler; + + /// + /// Requests to be run on scheduler with being passed in + /// + public abstract void Schedule(Action action, object state); + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeWriter.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeWriter.cs new file mode 100644 index 0000000000..f8d203e0c8 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/PipeWriter.cs @@ -0,0 +1,55 @@ +// 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; +using System.Threading; +using System.Threading.Tasks; + +namespace System.IO.Pipelines +{ + /// + /// Defines a class that provides a pipeline to which data can be written. + /// + public abstract class PipeWriter : IBufferWriter + { + /// + /// Marks the as being complete, meaning no more items will be written to it. + /// + /// Optional indicating a failure that's causing the pipeline to complete. + public abstract void Complete(Exception exception = null); + + /// + /// Cancel the pending operation. If there is none, cancels next operation, without completing the . + /// + public abstract void CancelPendingFlush(); + + /// + /// Registers a callback that gets executed when the side of the pipe is completed + /// + public abstract void OnReaderCompleted(Action callback, object state); + + /// + /// Makes bytes written available to and runs continuation. + /// + public abstract ValueTask FlushAsync(CancellationToken cancellationToken = default); + + /// + public abstract void Advance(int bytes); + + /// + public abstract Memory GetMemory(int sizeHint = 0); + + /// + public abstract Span GetSpan(int sizeHint = 0); + + /// + /// Writes to the pipe and makes data accessible to + /// + public virtual ValueTask WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default) + { + this.Write(source.Span); + return FlushAsync(cancellationToken); + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/ReadResult.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/ReadResult.cs new file mode 100644 index 0000000000..7c587f199e --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/ReadResult.cs @@ -0,0 +1,50 @@ +// 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; + +namespace System.IO.Pipelines +{ + /// + /// The result of a call. + /// + public struct ReadResult + { + internal ReadOnlySequence _resultBuffer; + internal ResultFlags _resultFlags; + + /// + /// Creates a new instance of setting and flags + /// + public ReadResult(ReadOnlySequence buffer, bool isCanceled, bool isCompleted) + { + _resultBuffer = buffer; + _resultFlags = ResultFlags.None; + + if (isCompleted) + { + _resultFlags |= ResultFlags.Completed; + } + if (isCanceled) + { + _resultFlags |= ResultFlags.Canceled; + } + } + + /// + /// The that was read + /// + public ReadOnlySequence Buffer => _resultBuffer; + + /// + /// True if the current operation was canceled, otherwise false. + /// + public bool IsCanceled => (_resultFlags & ResultFlags.Canceled) != 0; + + /// + /// True if the is complete + /// + public bool IsCompleted => (_resultFlags & ResultFlags.Completed) != 0; + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/ResultFlags.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/ResultFlags.cs new file mode 100644 index 0000000000..7a0453ccd8 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/ResultFlags.cs @@ -0,0 +1,14 @@ +// 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.IO.Pipelines +{ + [Flags] + internal enum ResultFlags : byte + { + None = 0x0, + Canceled = 0x1, + Completed = 0x2 + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/ThreadPoolScheduler.netcoreapp.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/ThreadPoolScheduler.netcoreapp.cs new file mode 100644 index 0000000000..0b2d9c74cd --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/ThreadPoolScheduler.netcoreapp.cs @@ -0,0 +1,17 @@ +// 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.Threading; +using System.Threading.Tasks; + +namespace System.IO.Pipelines +{ + internal sealed class ThreadPoolScheduler : PipeScheduler + { + public override void Schedule(Action action, object state) + { + System.Threading.ThreadPool.QueueUserWorkItem(action, state, preferLocal: false); + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/ThreadPoolScheduler.netstandard.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/ThreadPoolScheduler.netstandard.cs new file mode 100644 index 0000000000..19b1885035 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/ThreadPoolScheduler.netstandard.cs @@ -0,0 +1,22 @@ +// 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.Threading; +using System.Threading.Tasks; + +namespace System.IO.Pipelines +{ + internal sealed class ThreadPoolScheduler : PipeScheduler + { + public override void Schedule(Action action, object state) + { + System.Threading.ThreadPool.QueueUserWorkItem(s => + { + var tuple = (Tuple, object>)s; + tuple.Item1(tuple.Item2); + }, + Tuple.Create(action, state)); + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/ThreadPoolScheduler.netstandard1.3.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/ThreadPoolScheduler.netstandard1.3.cs new file mode 100644 index 0000000000..3c22e3affc --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/ThreadPoolScheduler.netstandard1.3.cs @@ -0,0 +1,17 @@ +// 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.Threading; +using System.Threading.Tasks; + +namespace System.IO.Pipelines +{ + internal sealed class ThreadPoolScheduler : PipeScheduler + { + public override void Schedule(Action action, object state) + { + Task.Factory.StartNew(action, state, CancellationToken.None, TaskCreationOptions.DenyChildAttach, TaskScheduler.Default); + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/ThrowHelper.cs b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/ThrowHelper.cs new file mode 100644 index 0000000000..7f4c7c66aa --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/src/System/IO/Pipelines/ThrowHelper.cs @@ -0,0 +1,74 @@ +// 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.Runtime.CompilerServices; + +namespace System.IO.Pipelines +{ + internal static class ThrowHelper + { + internal static void ThrowArgumentOutOfRangeException(ExceptionArgument argument) => throw CreateArgumentOutOfRangeException(argument); + [MethodImpl(MethodImplOptions.NoInlining)] + private static Exception CreateArgumentOutOfRangeException(ExceptionArgument argument) => new ArgumentOutOfRangeException(argument.ToString()); + + internal static void ThrowArgumentNullException(ExceptionArgument argument) => throw CreateArgumentNullException(argument); + [MethodImpl(MethodImplOptions.NoInlining)] + private static Exception CreateArgumentNullException(ExceptionArgument argument) => new ArgumentNullException(argument.ToString()); + + public static void ThrowInvalidOperationException_NotWritingNoAlloc() { throw CreateInvalidOperationException_NotWritingNoAlloc(); } + [MethodImpl(MethodImplOptions.NoInlining)] + public static Exception CreateInvalidOperationException_NotWritingNoAlloc() => new InvalidOperationException(SR.NoWritingOperation); + + public static void ThrowInvalidOperationException_AlreadyReading() => throw CreateInvalidOperationException_AlreadyReading(); + [MethodImpl(MethodImplOptions.NoInlining)] + public static Exception CreateInvalidOperationException_AlreadyReading() => new InvalidOperationException(SR.ReadingIsInProgress); + + public static void ThrowInvalidOperationException_NoReadToComplete() => throw CreateInvalidOperationException_NoReadToComplete(); + [MethodImpl(MethodImplOptions.NoInlining)] + public static Exception CreateInvalidOperationException_NoReadToComplete() => new InvalidOperationException(SR.NoReadingOperationToComplete); + + public static void ThrowInvalidOperationException_NoConcurrentOperation() => throw CreateInvalidOperationException_NoConcurrentOperation(); + [MethodImpl(MethodImplOptions.NoInlining)] + public static Exception CreateInvalidOperationException_NoConcurrentOperation() => new InvalidOperationException(SR.ConcurrentOperationsNotSupported); + + public static void ThrowInvalidOperationException_GetResultNotCompleted() => throw CreateInvalidOperationException_GetResultNotCompleted(); + [MethodImpl(MethodImplOptions.NoInlining)] + public static Exception CreateInvalidOperationException_GetResultNotCompleted() => new InvalidOperationException(SR.GetResultBeforeCompleted); + + public static void ThrowInvalidOperationException_NoWritingAllowed() => throw CreateInvalidOperationException_NoWritingAllowed(); + + [MethodImpl(MethodImplOptions.NoInlining)] + public static Exception CreateInvalidOperationException_NoWritingAllowed() => new InvalidOperationException(SR.WritingAfterCompleted); + + public static void ThrowInvalidOperationException_NoReadingAllowed() => throw CreateInvalidOperationException_NoReadingAllowed(); + [MethodImpl(MethodImplOptions.NoInlining)] + public static Exception CreateInvalidOperationException_NoReadingAllowed() => new InvalidOperationException(SR.ReadingAfterCompleted); + + public static void ThrowInvalidOperationException_AdvancingPastBufferSize() => throw CreateInvalidOperationException_AdvancingPastBufferSize(); + [MethodImpl(MethodImplOptions.NoInlining)] + public static Exception CreateInvalidOperationException_AdvancingPastBufferSize() => new InvalidOperationException(SR.CannotAdvancePastCurrentBufferSize); + + public static void ThrowInvalidOperationException_BackpressureDeadlock() => throw CreateInvalidOperationException_BackpressureDeadlock(); + [MethodImpl(MethodImplOptions.NoInlining)] + public static Exception CreateInvalidOperationException_BackpressureDeadlock() => new InvalidOperationException(SR.BackpressureDeadlock); + + public static void ThrowInvalidOperationException_AdvanceToInvalidCursor() => throw CreateInvalidOperationException_AdvanceToInvalidCursor(); + [MethodImpl(MethodImplOptions.NoInlining)] + public static Exception CreateInvalidOperationException_AdvanceToInvalidCursor() => new InvalidOperationException(SR.AdvanceToInvalidCursor); + + public static void ThrowInvalidOperationException_ResetIncompleteReaderWriter() => throw CreateInvalidOperationException_ResetIncompleteReaderWriter(); + [MethodImpl(MethodImplOptions.NoInlining)] + public static Exception CreateInvalidOperationException_ResetIncompleteReaderWriter() => new InvalidOperationException(SR.ReaderAndWriterHasToBeCompleted); + } + + internal enum ExceptionArgument + { + minimumSize, + bytesWritten, + callback, + options, + pauseWriterThreshold, + resumeWriterThreshold + } +} diff --git a/external/corefx/src/System.IO.Pipelines/tests/BackpressureTests.cs b/external/corefx/src/System.IO.Pipelines/tests/BackpressureTests.cs new file mode 100644 index 0000000000..a4e67f057d --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/tests/BackpressureTests.cs @@ -0,0 +1,191 @@ +// 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.Threading.Tasks; +using Xunit; + +namespace System.IO.Pipelines.Tests +{ + public class BackpressureTests : IDisposable + { + private const int PauseWriterThreshold = 64; + private const int ResumeWriterThreshold = 32; + + public BackpressureTests() + { + _pool = new TestMemoryPool(); + _pipe = new Pipe(new PipeOptions(_pool, resumeWriterThreshold: ResumeWriterThreshold, pauseWriterThreshold: PauseWriterThreshold, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + } + + public void Dispose() + { + _pipe.Writer.Complete(); + _pipe.Reader.Complete(); + _pool?.Dispose(); + } + + private readonly TestMemoryPool _pool; + + private readonly Pipe _pipe; + + [Fact] + public void AdvanceThrowsIfFlushActiveAndNotConsumedPastThreshold() + { + PipeWriter writableBuffer = _pipe.Writer.WriteEmpty(PauseWriterThreshold); + ValueTask flushAsync = writableBuffer.FlushAsync(); + Assert.False(flushAsync.IsCompleted); + + ReadResult result = _pipe.Reader.ReadAsync().GetAwaiter().GetResult(); + SequencePosition consumed = result.Buffer.GetPosition(31); + Assert.Throws(() => _pipe.Reader.AdvanceTo(consumed, result.Buffer.End)); + + _pipe.Reader.AdvanceTo(result.Buffer.End, result.Buffer.End); + } + + [Fact] + public async Task AdvanceThrowsIfFlushActiveAndNotConsumedPastThresholdWhenFlushIsCanceled() + { + // Write over the threshold and cancel pending flush + _pipe.Writer.WriteEmpty(PauseWriterThreshold); + var task = _pipe.Writer.FlushAsync().AsTask(); + _pipe.Writer.CancelPendingFlush(); + + await task; + + // Examine to the end without releasing backpressure + var result = await _pipe.Reader.ReadAsync(); + Assert.Throws(() => _pipe.Reader.AdvanceTo(result.Buffer.Start, result.Buffer.End)); + } + + [Fact] + public void FlushAsyncAwaitableCompletesWhenReaderAdvancesUnderLow() + { + PipeWriter writableBuffer = _pipe.Writer.WriteEmpty(PauseWriterThreshold); + ValueTask flushAsync = writableBuffer.FlushAsync(); + + Assert.False(flushAsync.IsCompleted); + + ReadResult result = _pipe.Reader.ReadAsync().GetAwaiter().GetResult(); + SequencePosition consumed = result.Buffer.GetPosition(33); + _pipe.Reader.AdvanceTo(consumed, consumed); + + Assert.True(flushAsync.IsCompleted); + FlushResult flushResult = flushAsync.GetAwaiter().GetResult(); + Assert.False(flushResult.IsCompleted); + } + + [Fact] + public void FlushAsyncAwaitableDoesNotCompletesWhenReaderAdvancesUnderHight() + { + PipeWriter writableBuffer = _pipe.Writer.WriteEmpty(PauseWriterThreshold); + ValueTask flushAsync = writableBuffer.FlushAsync(); + + Assert.False(flushAsync.IsCompleted); + + ReadResult result = _pipe.Reader.ReadAsync().GetAwaiter().GetResult(); + SequencePosition consumed = result.Buffer.GetPosition(ResumeWriterThreshold); + _pipe.Reader.AdvanceTo(consumed, consumed); + + Assert.False(flushAsync.IsCompleted); + } + + [Fact] + public void FlushAsyncAwaitableResetsOnCommit() + { + PipeWriter writableBuffer = _pipe.Writer.WriteEmpty(PauseWriterThreshold); + ValueTask flushAsync = writableBuffer.FlushAsync(); + + Assert.False(flushAsync.IsCompleted); + + ReadResult result = _pipe.Reader.ReadAsync().GetAwaiter().GetResult(); + SequencePosition consumed = result.Buffer.GetPosition(33); + _pipe.Reader.AdvanceTo(consumed, consumed); + + Assert.True(flushAsync.IsCompleted); + FlushResult flushResult = flushAsync.GetAwaiter().GetResult(); + Assert.False(flushResult.IsCompleted); + + writableBuffer = _pipe.Writer.WriteEmpty(PauseWriterThreshold); + flushAsync = writableBuffer.FlushAsync(); + + Assert.False(flushAsync.IsCompleted); + } + + [Fact] + public void FlushAsyncReturnsCompletedIfReaderCompletes() + { + PipeWriter writableBuffer = _pipe.Writer.WriteEmpty(PauseWriterThreshold); + ValueTask flushAsync = writableBuffer.FlushAsync(); + + Assert.False(flushAsync.IsCompleted); + + _pipe.Reader.Complete(); + + Assert.True(flushAsync.IsCompleted); + FlushResult flushResult = flushAsync.GetAwaiter().GetResult(); + Assert.True(flushResult.IsCompleted); + + writableBuffer = _pipe.Writer.WriteEmpty(PauseWriterThreshold); + flushAsync = writableBuffer.FlushAsync(); + flushResult = flushAsync.GetAwaiter().GetResult(); + + Assert.True(flushResult.IsCompleted); + Assert.True(flushAsync.IsCompleted); + } + + [Fact] + public async Task FlushAsyncReturnsCompletedIfReaderCompletesWithoutAdvance() + { + PipeWriter writableBuffer = _pipe.Writer.WriteEmpty(PauseWriterThreshold); + ValueTask flushAsync = writableBuffer.FlushAsync(); + + Assert.False(flushAsync.IsCompleted); + + ReadResult result = await _pipe.Reader.ReadAsync(); + _pipe.Reader.Complete(); + + Assert.True(flushAsync.IsCompleted); + FlushResult flushResult = flushAsync.GetAwaiter().GetResult(); + Assert.True(flushResult.IsCompleted); + + writableBuffer = _pipe.Writer.WriteEmpty(PauseWriterThreshold); + flushAsync = writableBuffer.FlushAsync(); + flushResult = flushAsync.GetAwaiter().GetResult(); + + Assert.True(flushResult.IsCompleted); + Assert.True(flushAsync.IsCompleted); + } + + [Fact] + public void FlushAsyncReturnsCompletedTaskWhenSizeLessThenLimit() + { + PipeWriter writableBuffer = _pipe.Writer.WriteEmpty(ResumeWriterThreshold); + ValueTask flushAsync = writableBuffer.FlushAsync(); + Assert.True(flushAsync.IsCompleted); + FlushResult flushResult = flushAsync.GetAwaiter().GetResult(); + Assert.False(flushResult.IsCompleted); + } + + [Fact] + public void FlushAsyncReturnsNonCompletedSizeWhenCommitOverTheLimit() + { + PipeWriter writableBuffer = _pipe.Writer.WriteEmpty(PauseWriterThreshold); + ValueTask flushAsync = writableBuffer.FlushAsync(); + Assert.False(flushAsync.IsCompleted); + } + + [Fact] + public async Task FlushAsyncThrowsIfReaderCompletedWithException() + { + _pipe.Reader.Complete(new InvalidOperationException("Reader failed")); + + PipeWriter writableBuffer = _pipe.Writer.WriteEmpty(PauseWriterThreshold); + InvalidOperationException invalidOperationException = + await Assert.ThrowsAsync(async () => await writableBuffer.FlushAsync()); + Assert.Equal("Reader failed", invalidOperationException.Message); + invalidOperationException = await Assert.ThrowsAsync(async () => await writableBuffer.FlushAsync()); + Assert.Equal("Reader failed", invalidOperationException.Message); + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/tests/Configurations.props b/external/corefx/src/System.IO.Pipelines/tests/Configurations.props new file mode 100644 index 0000000000..91e5be2dd0 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/tests/Configurations.props @@ -0,0 +1,10 @@ + + + + + netcoreapp; + netfx-Windows_NT; + uap-Windows_NT; + + + diff --git a/external/corefx/src/System.IO.Pipelines/tests/FlushAsyncCancellationTests.cs b/external/corefx/src/System.IO.Pipelines/tests/FlushAsyncCancellationTests.cs new file mode 100644 index 0000000000..8640404276 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/tests/FlushAsyncCancellationTests.cs @@ -0,0 +1,339 @@ +// 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; +using System.Runtime.CompilerServices; +using System.Threading; +using System.Threading.Tasks; +using Xunit; + +namespace System.IO.Pipelines.Tests +{ + public class FlushAsyncCancellationTests : PipeTest + { + [Fact] + public void FlushAsyncCancellationDeadlock() + { + var cts = new CancellationTokenSource(); + var cts2 = new CancellationTokenSource(); + + PipeWriter buffer = Pipe.Writer.WriteEmpty(MaximumSizeHigh); + + var e = new ManualResetEventSlim(); + + ValueTaskAwaiter awaiter = buffer.FlushAsync(cts.Token).GetAwaiter(); + awaiter.OnCompleted( + () => { + // We are on cancellation thread and need to wait untill another FlushAsync call + // takes pipe state lock + e.Wait(); + + // Make sure we had enough time to reach _cancellationTokenRegistration.Dispose + Thread.Sleep(100); + + // Try to take pipe state lock + buffer.FlushAsync(); + }); + + // Start a thread that would run cancellation calbacks + Task cancellationTask = Task.Run(() => cts.Cancel()); + // Start a thread that would call FlushAsync with different token + // and block on _cancellationTokenRegistration.Dispose + Task blockingTask = Task.Run( + () => { + e.Set(); + buffer.FlushAsync(cts2.Token); + }); + + bool completed = Task.WhenAll(cancellationTask, blockingTask).Wait(TimeSpan.FromSeconds(10)); + Assert.True(completed); + } + + [Fact] + public async Task FlushAsyncCancellationE2E() + { + var cts = new CancellationTokenSource(); + var cancelled = false; + + Func taskFunc = async () => { + try + { + Pipe.Writer.WriteEmpty(MaximumSizeHigh); + await Pipe.Writer.FlushAsync(cts.Token); + } + catch (OperationCanceledException) + { + cancelled = true; + await Pipe.Writer.FlushAsync(); + } + }; + + Task task = taskFunc(); + + cts.Cancel(); + + ReadResult result = await Pipe.Reader.ReadAsync(); + Assert.Equal(new byte[MaximumSizeHigh], result.Buffer.ToArray()); + Pipe.Reader.AdvanceTo(result.Buffer.End); + await task; + Assert.True(cancelled); + } + + [Fact] + public void FlushAsyncCompletedAfterPreCancellation() + { + PipeWriter writableBuffer = Pipe.Writer.WriteEmpty(1); + + Pipe.Writer.CancelPendingFlush(); + + ValueTask flushAsync = writableBuffer.FlushAsync(); + + Assert.True(flushAsync.IsCompleted); + + FlushResult flushResult = flushAsync.GetAwaiter().GetResult(); + + Assert.True(flushResult.IsCanceled); + + flushAsync = writableBuffer.FlushAsync(); + + Assert.True(flushAsync.IsCompleted); + } + + [Fact] + public void FlushAsyncNotCompletedAfterCancellation() + { + var onCompletedCalled = false; + PipeWriter writableBuffer = Pipe.Writer.WriteEmpty(MaximumSizeHigh); + + ValueTaskAwaiter awaitable = writableBuffer.FlushAsync().GetAwaiter(); + + Assert.False(awaitable.IsCompleted); + awaitable.OnCompleted( + () => { + onCompletedCalled = true; + Assert.True(awaitable.IsCompleted); + + FlushResult flushResult = awaitable.GetResult(); + + Assert.True(flushResult.IsCanceled); + + awaitable = writableBuffer.FlushAsync().GetAwaiter(); + Assert.False(awaitable.IsCompleted); + }); + + Pipe.Writer.CancelPendingFlush(); + Assert.True(onCompletedCalled); + } + + [Fact] + public void FlushAsyncNotCompletedAfterCancellationTokenCanceled() + { + var onCompletedCalled = false; + var cts = new CancellationTokenSource(); + PipeWriter writableBuffer = Pipe.Writer.WriteEmpty(MaximumSizeHigh); + + ValueTaskAwaiter awaitable = writableBuffer.FlushAsync(cts.Token).GetAwaiter(); + + Assert.False(awaitable.IsCompleted); + awaitable.OnCompleted( + () => { + onCompletedCalled = true; + Assert.True(awaitable.IsCompleted); + + Assert.Throws(() => awaitable.GetResult()); + + awaitable = writableBuffer.FlushAsync().GetAwaiter(); + Assert.False(awaitable.IsCompleted); + }); + + cts.Cancel(); + Assert.True(onCompletedCalled); + } + + [Fact] + public void FlushAsyncReturnsCanceledIfCanceledBeforeFlush() + { + PipeWriter writableBuffer = Pipe.Writer.WriteEmpty(MaximumSizeHigh); + + Pipe.Writer.CancelPendingFlush(); + + ValueTask flushAsync = writableBuffer.FlushAsync(); + + Assert.True(flushAsync.IsCompleted); + FlushResult flushResult = flushAsync.GetAwaiter().GetResult(); + Assert.True(flushResult.IsCanceled); + } + + [Fact] + public void FlushAsyncReturnsCanceledIfFlushCanceled() + { + PipeWriter writableBuffer = Pipe.Writer.WriteEmpty(MaximumSizeHigh); + ValueTask flushAsync = writableBuffer.FlushAsync(); + + Assert.False(flushAsync.IsCompleted); + + Pipe.Writer.CancelPendingFlush(); + + Assert.True(flushAsync.IsCompleted); + FlushResult flushResult = flushAsync.GetAwaiter().GetResult(); + Assert.True(flushResult.IsCanceled); + } + + [Fact] + public void FlushAsyncReturnsIsCancelOnCancelPendingFlushAfterGetResult() + { + PipeWriter writableBuffer = Pipe.Writer.WriteEmpty(MaximumSizeHigh); + ValueTaskAwaiter awaitable = writableBuffer.FlushAsync().GetAwaiter(); + + Assert.False(awaitable.IsCompleted); + awaitable.OnCompleted(() => { }); + + Pipe.Writer.CancelPendingFlush(); + Pipe.Reader.AdvanceTo(Pipe.Reader.ReadAsync().GetAwaiter().GetResult().Buffer.End); + + Assert.True(awaitable.IsCompleted); + + FlushResult result = awaitable.GetResult(); + Assert.True(result.IsCanceled); + } + + [Fact] + public void FlushAsyncReturnsIsCancelOnCancelPendingFlushBeforeGetResult() + { + PipeWriter writableBuffer = Pipe.Writer.WriteEmpty(MaximumSizeHigh); + ValueTaskAwaiter awaitable = writableBuffer.FlushAsync().GetAwaiter(); + + Assert.False(awaitable.IsCompleted); + awaitable.OnCompleted(() => { }); + + Pipe.Reader.AdvanceTo(Pipe.Reader.ReadAsync().GetAwaiter().GetResult().Buffer.End); + Pipe.Writer.CancelPendingFlush(); + + Assert.True(awaitable.IsCompleted); + + FlushResult result = awaitable.GetResult(); + Assert.True(result.IsCanceled); + } + + [Fact] + public void FlushAsyncThrowsIfPassedCanceledCancellationToken() + { + var cancellationTokenSource = new CancellationTokenSource(); + cancellationTokenSource.Cancel(); + + Assert.Throws(() => Pipe.Writer.FlushAsync(cancellationTokenSource.Token)); + } + + [Fact] + public async Task FlushAsyncWithNewCancellationTokenNotAffectedByPrevious() + { + var cancellationTokenSource1 = new CancellationTokenSource(); + PipeWriter buffer = Pipe.Writer.WriteEmpty(10); + await buffer.FlushAsync(cancellationTokenSource1.Token); + + cancellationTokenSource1.Cancel(); + + var cancellationTokenSource2 = new CancellationTokenSource(); + buffer = Pipe.Writer.WriteEmpty(10); + // Verifying that ReadAsync does not throw + await buffer.FlushAsync(cancellationTokenSource2.Token); + } + + [Fact] + public void GetResultThrowsIfFlushAsyncCanceledAfterOnCompleted() + { + var onCompletedCalled = false; + var cancellationTokenSource = new CancellationTokenSource(); + PipeWriter buffer = Pipe.Writer.WriteEmpty(MaximumSizeHigh); + + ValueTaskAwaiter awaiter = buffer.FlushAsync(cancellationTokenSource.Token).GetAwaiter(); + + awaiter.OnCompleted( + () => { + onCompletedCalled = true; + Assert.Throws(() => awaiter.GetResult()); + }); + + bool awaiterIsCompleted = awaiter.IsCompleted; + + cancellationTokenSource.Cancel(); + + Assert.False(awaiterIsCompleted); + Assert.True(onCompletedCalled); + } + + [Fact] + public void GetResultThrowsIfFlushAsyncCanceledBeforeOnCompleted() + { + var onCompletedCalled = false; + var cancellationTokenSource = new CancellationTokenSource(); + PipeWriter buffer = Pipe.Writer.WriteEmpty(MaximumSizeHigh); + + ValueTaskAwaiter awaiter = buffer.FlushAsync(cancellationTokenSource.Token).GetAwaiter(); + bool awaiterIsCompleted = awaiter.IsCompleted; + + cancellationTokenSource.Cancel(); + + awaiter.OnCompleted( + () => { + onCompletedCalled = true; + Assert.Throws(() => awaiter.GetResult()); + }); + + Assert.False(awaiterIsCompleted); + Assert.True(onCompletedCalled); + } + + [Fact] + public void GetResultThrowsIfFlushAsyncTokenFiredAfterCancelPending() + { + var onCompletedCalled = false; + var cancellationTokenSource = new CancellationTokenSource(); + PipeWriter buffer = Pipe.Writer.WriteEmpty(MaximumSizeHigh); + + ValueTaskAwaiter awaiter = buffer.FlushAsync(cancellationTokenSource.Token).GetAwaiter(); + bool awaiterIsCompleted = awaiter.IsCompleted; + + Pipe.Writer.CancelPendingFlush(); + cancellationTokenSource.Cancel(); + + awaiter.OnCompleted( + () => { + onCompletedCalled = true; + Assert.Throws(() => awaiter.GetResult()); + }); + + Assert.False(awaiterIsCompleted); + Assert.True(onCompletedCalled); + } + + [Fact] + public async Task FlushAsyncThrowsIfPassedCanceledCancellationTokenAndPipeIsAbleToComplete() + { + var cancellationTokenSource = new CancellationTokenSource(); + cancellationTokenSource.Cancel(); + + // AsTask is important here, it validates that we are calling completion callback + // and not only setting IsCompleted flag + var task = Pipe.Reader.ReadAsync().AsTask(); + + await Assert.ThrowsAsync(async () => await Pipe.Writer.FlushAsync(cancellationTokenSource.Token)); + + Pipe.Writer.Complete(); + + Assert.True(task.IsCompleted); + Assert.True(task.Result.IsCompleted); + } + } + + public static class TestWriterExtensions + { + public static PipeWriter WriteEmpty(this PipeWriter writer, int count) + { + writer.GetSpan(count).Slice(0, count).Fill(0); + writer.Advance(count); + return writer; + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/tests/FlushAsyncCompletionTests.cs b/external/corefx/src/System.IO.Pipelines/tests/FlushAsyncCompletionTests.cs new file mode 100644 index 0000000000..7579adc707 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/tests/FlushAsyncCompletionTests.cs @@ -0,0 +1,37 @@ +// 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; +using System.Threading.Tasks; +using Xunit; + +namespace System.IO.Pipelines.Tests +{ + public class FlushAsyncCompletionTests : PipeTest + { + [Fact] + public void AwaitingFlushAsyncAwaitableTwiceCompletesReaderWithException() + { + async Task Await(ValueTask a) + { + await a; + } + + PipeWriter writeBuffer = Pipe.Writer; + writeBuffer.Write(new byte[MaximumSizeHigh]); + ValueTask awaitable = writeBuffer.FlushAsync(); + + Task task1 = Await(awaitable); + Task task2 = Await(awaitable); + + Assert.Equal(true, task1.IsCompleted); + Assert.Equal(true, task1.IsFaulted); + Assert.Equal("Concurrent reads or writes are not supported.", task1.Exception.InnerExceptions[0].Message); + + Assert.Equal(true, task2.IsCompleted); + Assert.Equal(true, task2.IsFaulted); + Assert.Equal("Concurrent reads or writes are not supported.", task2.Exception.InnerExceptions[0].Message); + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/tests/FlushResultTests.cs b/external/corefx/src/System.IO.Pipelines/tests/FlushResultTests.cs new file mode 100644 index 0000000000..50ac67edcb --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/tests/FlushResultTests.cs @@ -0,0 +1,24 @@ +// 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 Xunit; + +namespace System.IO.Pipelines.Tests +{ + public class FlushResultTests + { + [InlineData(true, true)] + [InlineData(true, false)] + [InlineData(false, true)] + [InlineData(false, false)] + [Theory] + public void FlushResultCanBeConstructed(bool cancelled, bool completed) + { + var result = new FlushResult(cancelled, completed); + + Assert.Equal(cancelled, result.IsCanceled); + Assert.Equal(completed, result.IsCompleted); + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/tests/PipeCompletionCallbacksTests.cs b/external/corefx/src/System.IO.Pipelines/tests/PipeCompletionCallbacksTests.cs new file mode 100644 index 0000000000..9a23b4197f --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/tests/PipeCompletionCallbacksTests.cs @@ -0,0 +1,487 @@ +// 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.Runtime.CompilerServices; +using System.Threading.Tasks; +using Xunit; + +namespace System.IO.Pipelines.Tests +{ + public class PipeCompletionCallbacksTests : IDisposable + { + public PipeCompletionCallbacksTests() + { + _pool = new TestMemoryPool(); + } + + public void Dispose() + { + _pool.Dispose(); + } + + private readonly TestMemoryPool _pool; + + private class TestScheduler : PipeScheduler + { + public int CallCount { get; set; } + + public Exception LastException { get; set; } + + public override void Schedule(Action action, object state) + { + CallCount++; + try + { + action(state); + } + catch (Exception e) + { + LastException = e; + } + } + } + + [Fact] + public void CompletingReaderFromWriterCallbackWorks() + { + var callbackRan = false; + var pipe = new Pipe(new PipeOptions(_pool, pauseWriterThreshold: 5, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + + pipe.Writer.OnReaderCompleted((exception, state) => { pipe.Writer.Complete(); }, null); + + pipe.Reader.OnWriterCompleted((exception, state) => { callbackRan = true; }, null); + + pipe.Reader.Complete(); + Assert.True(callbackRan); + } + + [Fact] + public void CompletingWriterFromReaderCallbackWorks() + { + var callbackRan = false; + var pipe = new Pipe(new PipeOptions(_pool, pauseWriterThreshold: 5, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + + pipe.Reader.OnWriterCompleted((exception, state) => { pipe.Reader.Complete(); }, null); + + pipe.Writer.OnReaderCompleted((exception, state) => { callbackRan = true; }, null); + + pipe.Writer.Complete(); + Assert.True(callbackRan); + } + + [Fact] + public void OnReaderCompletedContinuesOnException() + { + var callbackState1 = new object(); + var callbackState2 = new object(); + var exception1 = new Exception(); + var exception2 = new Exception(); + + var counter = 0; + + var pipe = new Pipe(new PipeOptions(_pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + pipe.Writer.OnReaderCompleted( + (exception, state) => + { + Assert.Equal(callbackState1, state); + Assert.Equal(0, counter); + counter++; + throw exception1; + }, callbackState1); + + pipe.Writer.OnReaderCompleted( + (exception, state) => + { + Assert.Equal(callbackState2, state); + Assert.Equal(1, counter); + counter++; + throw exception2; + }, callbackState2); + + var aggregateException = Assert.Throws(() => pipe.Reader.Complete()); + Assert.Equal(exception1, aggregateException.InnerExceptions[0]); + Assert.Equal(exception2, aggregateException.InnerExceptions[1]); + Assert.Equal(2, counter); + } + + [Fact] + public void OnReaderCompletedExceptionSurfacesToWriterScheduler() + { + var exception = new Exception(); + var scheduler = new TestScheduler(); + var pipe = new Pipe(new PipeOptions(_pool, writerScheduler: scheduler, readerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + pipe.Writer.OnReaderCompleted((e, state) => throw exception, null); + pipe.Reader.Complete(); + + Assert.Equal(1, scheduler.CallCount); + var aggregateException = Assert.IsType(scheduler.LastException); + Assert.Equal(aggregateException.InnerExceptions[0], exception); + } + + [Fact] + public void OnReaderCompletedExecutesOnSchedulerIfCompleted() + { + var callbackRan = false; + var scheduler = new TestScheduler(); + var pipe = new Pipe(new PipeOptions(_pool, writerScheduler: scheduler, readerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + pipe.Reader.Complete(); + + pipe.Writer.OnReaderCompleted( + (exception, state) => + { + Assert.Null(exception); + callbackRan = true; + }, null); + + Assert.True(callbackRan); + Assert.Equal(1, scheduler.CallCount); + } + + [Fact] + public void OnReaderCompletedIsDetachedDuringReset() + { + var callbackRan = false; + var scheduler = new TestScheduler(); + var pipe = new Pipe(new PipeOptions(_pool, writerScheduler: scheduler, readerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + pipe.Writer.OnReaderCompleted((exception, state) => { callbackRan = true; }, null); + + pipe.Reader.Complete(); + pipe.Writer.Complete(); + pipe.Reset(); + + Assert.True(callbackRan); + callbackRan = false; + + pipe.Reader.Complete(); + pipe.Writer.Complete(); + + Assert.Equal(1, scheduler.CallCount); + Assert.False(callbackRan); + } + + [Fact] + public void OnReaderCompletedPassesException() + { + var callbackRan = false; + var pipe = new Pipe(new PipeOptions(_pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + var readerException = new Exception(); + + pipe.Writer.OnReaderCompleted( + (exception, state) => + { + callbackRan = true; + Assert.Same(readerException, exception); + }, null); + pipe.Reader.Complete(readerException); + + Assert.True(callbackRan); + } + + [Fact] + public void OnReaderCompletedPassesState() + { + var callbackRan = false; + var callbackState = new object(); + var pipe = new Pipe(new PipeOptions(_pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + pipe.Writer.OnReaderCompleted( + (exception, state) => + { + Assert.Equal(callbackState, state); + callbackRan = true; + }, callbackState); + pipe.Reader.Complete(); + + Assert.True(callbackRan); + } + + [Fact] + public void OnReaderCompletedRanBeforeFlushContinuation() + { + var callbackRan = false; + var continuationRan = false; + var pipe = new Pipe(new PipeOptions(_pool, pauseWriterThreshold: 5, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + + pipe.Writer.OnReaderCompleted( + (exception, state) => + { + Assert.False(continuationRan); + callbackRan = true; + }, null); + + PipeWriter buffer = pipe.Writer.WriteEmpty(10); + ValueTaskAwaiter awaiter = buffer.FlushAsync().GetAwaiter(); + + Assert.False(awaiter.IsCompleted); + awaiter.OnCompleted(() => { continuationRan = true; }); + pipe.Reader.Complete(); + + Assert.True(callbackRan); + pipe.Writer.Complete(); + } + + [Fact] + public void OnReaderCompletedRunsInRegistrationOrder() + { + var callbackState1 = new object(); + var callbackState2 = new object(); + var callbackState3 = new object(); + var counter = 0; + + var pipe = new Pipe(new PipeOptions(_pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + pipe.Writer.OnReaderCompleted( + (exception, state) => + { + Assert.Equal(callbackState1, state); + Assert.Equal(0, counter); + counter++; + }, callbackState1); + + pipe.Writer.OnReaderCompleted( + (exception, state) => + { + Assert.Equal(callbackState2, state); + Assert.Equal(1, counter); + counter++; + }, callbackState2); + + pipe.Writer.OnReaderCompleted( + (exception, state) => + { + Assert.Equal(callbackState3, state); + Assert.Equal(2, counter); + counter++; + }, callbackState3); + + pipe.Reader.Complete(); + + Assert.Equal(3, counter); + } + + [Fact] + public void OnReaderCompletedThrowsWithNullCallback() + { + var pipe = new Pipe(new PipeOptions(_pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + + Assert.Throws(() => pipe.Writer.OnReaderCompleted(null, null)); + } + + [Fact] + public void OnReaderCompletedUsingWriterScheduler() + { + var callbackRan = false; + var scheduler = new TestScheduler(); + var pipe = new Pipe(new PipeOptions(_pool, writerScheduler: scheduler, readerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + pipe.Writer.OnReaderCompleted((exception, state) => { callbackRan = true; }, null); + pipe.Reader.Complete(); + + Assert.True(callbackRan); + Assert.Equal(1, scheduler.CallCount); + } + + [Fact] + public void OnWriterCompletedContinuesOnException() + { + var callbackState1 = new object(); + var callbackState2 = new object(); + var exception1 = new Exception(); + var exception2 = new Exception(); + + var counter = 0; + + var pipe = new Pipe(new PipeOptions(_pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + pipe.Reader.OnWriterCompleted( + (exception, state) => + { + Assert.Equal(callbackState1, state); + Assert.Equal(0, counter); + counter++; + throw exception1; + }, callbackState1); + + pipe.Reader.OnWriterCompleted( + (exception, state) => + { + Assert.Equal(callbackState2, state); + Assert.Equal(1, counter); + counter++; + throw exception2; + }, callbackState2); + + var aggregateException = Assert.Throws(() => pipe.Writer.Complete()); + Assert.Equal(exception1, aggregateException.InnerExceptions[0]); + Assert.Equal(exception2, aggregateException.InnerExceptions[1]); + Assert.Equal(2, counter); + } + + [Fact] + public void OnWriterCompletedExceptionSurfacesToReaderScheduler() + { + var exception = new Exception(); + var scheduler = new TestScheduler(); + var pipe = new Pipe(new PipeOptions(_pool, scheduler, PipeScheduler.Inline, useSynchronizationContext: false)); + pipe.Reader.OnWriterCompleted((e, state) => throw exception, null); + pipe.Writer.Complete(); + + Assert.Equal(1, scheduler.CallCount); + var aggregateException = Assert.IsType(scheduler.LastException); + Assert.Equal(aggregateException.InnerExceptions[0], exception); + } + + [Fact] + public void OnWriterCompletedExecutedSchedulerIfCompleted() + { + var callbackRan = false; + var scheduler = new TestScheduler(); + var pipe = new Pipe(new PipeOptions(_pool, scheduler, PipeScheduler.Inline, useSynchronizationContext: false)); + pipe.Writer.Complete(); + + pipe.Reader.OnWriterCompleted( + (exception, state) => + { + Assert.Null(exception); + callbackRan = true; + }, null); + + Assert.True(callbackRan); + Assert.Equal(1, scheduler.CallCount); + } + + [Fact] + public void OnWriterCompletedIsDetachedDuringReset() + { + var callbackRan = false; + var scheduler = new TestScheduler(); + var pipe = new Pipe(new PipeOptions(_pool, scheduler, PipeScheduler.Inline, useSynchronizationContext: false)); + pipe.Reader.OnWriterCompleted((exception, state) => { callbackRan = true; }, null); + pipe.Reader.Complete(); + pipe.Writer.Complete(); + pipe.Reset(); + + Assert.True(callbackRan); + callbackRan = false; + + pipe.Reader.Complete(); + pipe.Writer.Complete(); + + Assert.Equal(1, scheduler.CallCount); + Assert.False(callbackRan); + } + + [Fact] + public void OnWriterCompletedPassesException() + { + var callbackRan = false; + var pipe = new Pipe(new PipeOptions(_pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + var readerException = new Exception(); + + pipe.Reader.OnWriterCompleted( + (exception, state) => + { + callbackRan = true; + Assert.Same(readerException, exception); + }, null); + pipe.Writer.Complete(readerException); + + Assert.True(callbackRan); + } + + [Fact] + public void OnWriterCompletedPassesState() + { + var callbackRan = false; + var callbackState = new object(); + var pipe = new Pipe(new PipeOptions(_pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + pipe.Reader.OnWriterCompleted( + (exception, state) => + { + Assert.Equal(callbackState, state); + callbackRan = true; + }, callbackState); + pipe.Writer.Complete(); + + Assert.True(callbackRan); + } + + [Fact] + public void OnWriterCompletedRanBeforeReadContinuation() + { + var callbackRan = false; + var continuationRan = false; + var pipe = new Pipe(new PipeOptions(_pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + + pipe.Reader.OnWriterCompleted( + (exception, state) => + { + callbackRan = true; + Assert.False(continuationRan); + }, null); + + ValueTask awaiter = pipe.Reader.ReadAsync(); + Assert.False(awaiter.IsCompleted); + awaiter.GetAwaiter().OnCompleted(() => { continuationRan = true; }); + pipe.Writer.Complete(); + + Assert.True(callbackRan); + } + + [Fact] + public void OnWriterCompletedRunsInRegistrationOrder() + { + var callbackState1 = new object(); + var callbackState2 = new object(); + var callbackState3 = new object(); + var counter = 0; + + var pipe = new Pipe(new PipeOptions(_pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + pipe.Reader.OnWriterCompleted( + (exception, state) => + { + Assert.Equal(callbackState1, state); + Assert.Equal(0, counter); + counter++; + }, callbackState1); + + pipe.Reader.OnWriterCompleted( + (exception, state) => + { + Assert.Equal(callbackState2, state); + Assert.Equal(1, counter); + counter++; + }, callbackState2); + + pipe.Reader.OnWriterCompleted( + (exception, state) => + { + Assert.Equal(callbackState3, state); + Assert.Equal(2, counter); + counter++; + }, callbackState3); + + pipe.Writer.Complete(); + + Assert.Equal(3, counter); + } + + [Fact] + public void OnWriterCompletedThrowsWithNullCallback() + { + var pipe = new Pipe(new PipeOptions(_pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + + Assert.Throws(() => pipe.Reader.OnWriterCompleted(null, null)); + } + + [Fact] + public void OnWriterCompletedUsingReaderScheduler() + { + var callbackRan = false; + var scheduler = new TestScheduler(); + var pipe = new Pipe(new PipeOptions(_pool, scheduler, PipeScheduler.Inline, useSynchronizationContext: false)); + pipe.Reader.OnWriterCompleted((exception, state) => { callbackRan = true; }, null); + pipe.Writer.Complete(); + + Assert.True(callbackRan); + Assert.Equal(1, scheduler.CallCount); + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/tests/PipeLengthTests.cs b/external/corefx/src/System.IO.Pipelines/tests/PipeLengthTests.cs new file mode 100644 index 0000000000..252098d20a --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/tests/PipeLengthTests.cs @@ -0,0 +1,101 @@ +// 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.Threading.Tasks; +using Xunit; + +namespace System.IO.Pipelines.Tests +{ + public class PipeLengthTests : IDisposable + { + public PipeLengthTests() + { + _pool = new TestMemoryPool(); + _pipe = new Pipe(new PipeOptions(_pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, pauseWriterThreshold: 0, resumeWriterThreshold: 0, useSynchronizationContext: false)); + } + + public void Dispose() + { + _pipe.Writer.Complete(); + _pipe.Reader.Complete(); + _pool?.Dispose(); + } + + private readonly TestMemoryPool _pool; + + private readonly Pipe _pipe; + + [Fact] + public async Task ByteByByteTest() + { + for (var i = 1; i <= 1024 * 1024; i++) + { + _pipe.Writer.GetMemory(100); + _pipe.Writer.Advance(1); + await _pipe.Writer.FlushAsync(); + + Assert.Equal(i, _pipe.Length); + } + + await _pipe.Writer.FlushAsync(); + + for (int i = 1024 * 1024 - 1; i >= 0; i--) + { + ReadResult result = await _pipe.Reader.ReadAsync(); + SequencePosition consumed = result.Buffer.Slice(1).Start; + + Assert.Equal(i + 1, result.Buffer.Length); + + _pipe.Reader.AdvanceTo(consumed, consumed); + + Assert.Equal(i, _pipe.Length); + } + } + + [Fact] + public async Task LengthCorrectAfterAlloc0AdvanceFlush() + { + _pipe.Writer.GetMemory(0); + _pipe.Writer.WriteEmpty(10); + await _pipe.Writer.FlushAsync(); + + Assert.Equal(10, _pipe.Length); + } + + [Fact] + public async Task LengthCorrectAfterAllocAdvanceFlush() + { + PipeWriter writableBuffer = _pipe.Writer.WriteEmpty(10); + await writableBuffer.FlushAsync(); + + Assert.Equal(10, _pipe.Length); + } + + [Fact] + public async Task LengthDecreasedAfterReadAdvanceConsume() + { + _pipe.Writer.GetMemory(100); + _pipe.Writer.Advance(10); + await _pipe.Writer.FlushAsync(); + + ReadResult result = await _pipe.Reader.ReadAsync(); + SequencePosition consumed = result.Buffer.Slice(5).Start; + _pipe.Reader.AdvanceTo(consumed, consumed); + + Assert.Equal(5, _pipe.Length); + } + + [Fact] + public async Task LengthNotChangeAfterReadAdvanceExamine() + { + PipeWriter writableBuffer = _pipe.Writer.WriteEmpty(10); + await writableBuffer.FlushAsync(); + + ReadResult result = await _pipe.Reader.ReadAsync(); + _pipe.Reader.AdvanceTo(result.Buffer.Start, result.Buffer.End); + + Assert.Equal(10, _pipe.Length); + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/tests/PipeOptionsTests.cs b/external/corefx/src/System.IO.Pipelines/tests/PipeOptionsTests.cs new file mode 100644 index 0000000000..5e6202faff --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/tests/PipeOptionsTests.cs @@ -0,0 +1,23 @@ +// 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 Xunit; + +namespace System.IO.Pipelines.Tests +{ + public class PipeOptionsTests + { + [Fact] + public void DefaultPauseWriterThresholdIsSet() + { + Assert.Equal(32768, PipeOptions.Default.PauseWriterThreshold); + } + + [Fact] + public void DefaultResumeWriterThresholdIsSet() + { + Assert.Equal(16384, PipeOptions.Default.ResumeWriterThreshold); + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/tests/PipePoolTests.cs b/external/corefx/src/System.IO.Pipelines/tests/PipePoolTests.cs new file mode 100644 index 0000000000..cf564903cc --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/tests/PipePoolTests.cs @@ -0,0 +1,214 @@ +// 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; +using System.Threading.Tasks; +using Xunit; + +namespace System.IO.Pipelines.Tests +{ + public class PipePoolTests + { + private class DisposeTrackingBufferPool : TestMemoryPool + { + public int DisposedBlocks { get; set; } + public int CurrentlyRentedBlocks { get; set; } + + public override IMemoryOwner Rent(int size) + { + return new DisposeTrackingMemoryManager(new byte[size], this); + } + + protected override void Dispose(bool disposing) + { + } + + private class DisposeTrackingMemoryManager : MemoryManager + { + private byte[] _array; + + private readonly DisposeTrackingBufferPool _bufferPool; + + public DisposeTrackingMemoryManager(byte[] array, DisposeTrackingBufferPool bufferPool) + { + _array = array; + _bufferPool = bufferPool; + _bufferPool.CurrentlyRentedBlocks++; + } + + public override Memory Memory => CreateMemory(_array.Length); + + public bool IsDisposed => _array == null; + + public override MemoryHandle Pin(int elementIndex = 0) + { + throw new NotImplementedException(); + } + + public override void Unpin() + { + throw new NotImplementedException(); + } + + protected override bool TryGetArray(out ArraySegment segment) + { + if (IsDisposed) + throw new ObjectDisposedException(nameof(DisposeTrackingBufferPool)); + segment = new ArraySegment(_array); + return true; + } + + protected override void Dispose(bool disposing) + { + _bufferPool.DisposedBlocks++; + _bufferPool.CurrentlyRentedBlocks--; + + _array = null; + } + + public override Span GetSpan() + { + if (IsDisposed) + throw new ObjectDisposedException(nameof(DisposeTrackingBufferPool)); + return _array; + } + } + } + + [Fact] + public async Task AdvanceToEndReturnsAllBlocks() + { + var pool = new DisposeTrackingBufferPool(); + + var writeSize = 512; + + var pipe = new Pipe(new PipeOptions(pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + while (pool.CurrentlyRentedBlocks != 3) + { + PipeWriter writableBuffer = pipe.Writer.WriteEmpty(writeSize); + await writableBuffer.FlushAsync(); + } + + ReadResult readResult = await pipe.Reader.ReadAsync(); + pipe.Reader.AdvanceTo(readResult.Buffer.End); + + Assert.Equal(0, pool.CurrentlyRentedBlocks); + Assert.Equal(3, pool.DisposedBlocks); + } + + [Fact] + public async Task CanWriteAfterReturningMultipleBlocks() + { + var pool = new DisposeTrackingBufferPool(); + + var writeSize = 512; + + var pipe = new Pipe(new PipeOptions(pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + + // Write two blocks + Memory buffer = pipe.Writer.GetMemory(writeSize); + pipe.Writer.Advance(buffer.Length); + pipe.Writer.GetMemory(buffer.Length); + pipe.Writer.Advance(writeSize); + await pipe.Writer.FlushAsync(); + + Assert.Equal(2, pool.CurrentlyRentedBlocks); + + // Read everything + ReadResult readResult = await pipe.Reader.ReadAsync(); + pipe.Reader.AdvanceTo(readResult.Buffer.End); + + // Try writing more + await pipe.Writer.WriteAsync(new byte[writeSize]); + + Assert.Equal(1, pool.CurrentlyRentedBlocks); + Assert.Equal(2, pool.DisposedBlocks); + } + + [Fact] + public async Task MultipleCompleteReaderWriterCauseDisposeOnlyOnce() + { + var pool = new DisposeTrackingBufferPool(); + + var readerWriter = new Pipe(new PipeOptions(pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + await readerWriter.Writer.WriteAsync(new byte[] { 1 }); + + readerWriter.Writer.Complete(); + readerWriter.Reader.Complete(); + Assert.Equal(1, pool.DisposedBlocks); + + readerWriter.Writer.Complete(); + readerWriter.Reader.Complete(); + Assert.Equal(1, pool.DisposedBlocks); + } + + [Fact] + public async Task RentsMinimumSegmentSize() + { + var pool = new DisposeTrackingBufferPool(); + var writeSize = 512; + + var pipe = new Pipe(new PipeOptions(pool, minimumSegmentSize: 2020, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + + Memory buffer = pipe.Writer.GetMemory(writeSize); + int allocatedSize = buffer.Length; + pipe.Writer.Advance(buffer.Length); + buffer = pipe.Writer.GetMemory(1); + int ensuredSize = buffer.Length; + await pipe.Writer.FlushAsync(); + + pipe.Reader.Complete(); + pipe.Writer.Complete(); + + Assert.Equal(2020, ensuredSize); + Assert.Equal(2020, allocatedSize); + } + + [Fact] + public void ReturnsWriteHeadOnComplete() + { + var pool = new DisposeTrackingBufferPool(); + var pipe = new Pipe(new PipeOptions(pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + pipe.Writer.GetMemory(512); + + pipe.Reader.Complete(); + pipe.Writer.Complete(); + Assert.Equal(0, pool.CurrentlyRentedBlocks); + Assert.Equal(1, pool.DisposedBlocks); + } + + [Fact] + public void ReturnsWriteHeadWhenRequestingLargerBlock() + { + var pool = new DisposeTrackingBufferPool(); + var pipe = new Pipe(new PipeOptions(pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + pipe.Writer.GetMemory(512); + pipe.Writer.GetMemory(4096); + + pipe.Reader.Complete(); + pipe.Writer.Complete(); + Assert.Equal(0, pool.CurrentlyRentedBlocks); + Assert.Equal(2, pool.DisposedBlocks); + } + + [Fact] + public async Task WriteDuringReadIsNotReturned() + { + var pool = new DisposeTrackingBufferPool(); + + var writeSize = 512; + + var pipe = new Pipe(new PipeOptions(pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + await pipe.Writer.WriteAsync(new byte[writeSize]); + + pipe.Writer.GetMemory(writeSize); + ReadResult readResult = await pipe.Reader.ReadAsync(); + pipe.Reader.AdvanceTo(readResult.Buffer.End); + pipe.Writer.Write(new byte[writeSize]); + await pipe.Writer.FlushAsync(); + + Assert.Equal(1, pool.CurrentlyRentedBlocks); + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/tests/PipeReaderWriterFacts.cs b/external/corefx/src/System.IO.Pipelines/tests/PipeReaderWriterFacts.cs new file mode 100644 index 0000000000..f25f08b2a2 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/tests/PipeReaderWriterFacts.cs @@ -0,0 +1,814 @@ +// 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; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using Xunit; + +namespace System.IO.Pipelines.Tests +{ + public class PipelineReaderWriterFacts : IDisposable + { + public PipelineReaderWriterFacts() + { + _pool = new TestMemoryPool(); + _pipe = new Pipe(new PipeOptions(_pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + } + + public void Dispose() + { + _pipe.Writer.Complete(); + _pipe.Reader.Complete(); + _pool?.Dispose(); + } + + private readonly Pipe _pipe; + + private readonly TestMemoryPool _pool; + + [Fact] + public async Task CanReadAndWrite() + { + byte[] bytes = Encoding.ASCII.GetBytes("Hello World"); + + await _pipe.Writer.WriteAsync(bytes); + ReadResult result = await _pipe.Reader.ReadAsync(); + ReadOnlySequence buffer = result.Buffer; + + Assert.Equal(11, buffer.Length); + Assert.True(buffer.IsSingleSegment); + var array = new byte[11]; + buffer.First.Span.CopyTo(array); + Assert.Equal("Hello World", Encoding.ASCII.GetString(array)); + + _pipe.Reader.AdvanceTo(buffer.End); + } + + [Fact] + public async Task AdvanceResetsCommitHeadIndex() + { + _pipe.Writer.GetMemory(1); + _pipe.Writer.Advance(100); + await _pipe.Writer.FlushAsync(); + + // Advance to the end + ReadResult readResult = await _pipe.Reader.ReadAsync(); + _pipe.Reader.AdvanceTo(readResult.Buffer.End); + + // Try reading, it should block + ValueTask awaitable = _pipe.Reader.ReadAsync(); + Assert.False(awaitable.IsCompleted); + + _pipe.Writer.Write(new byte[1]); + await _pipe.Writer.FlushAsync(); + + Assert.True(awaitable.IsCompleted); + + // Advance to the end should reset awaitable + readResult = await awaitable; + _pipe.Reader.AdvanceTo(readResult.Buffer.End); + + // Try reading, it should block + awaitable = _pipe.Reader.ReadAsync(); + Assert.False(awaitable.IsCompleted); + } + + [Fact] + public async Task AdvanceShouldResetStateIfReadCanceled() + { + _pipe.Reader.CancelPendingRead(); + + ReadResult result = await _pipe.Reader.ReadAsync(); + ReadOnlySequence buffer = result.Buffer; + _pipe.Reader.AdvanceTo(buffer.End); + + Assert.False(result.IsCompleted); + Assert.True(result.IsCanceled); + Assert.True(buffer.IsEmpty); + + ValueTask awaitable = _pipe.Reader.ReadAsync(); + Assert.False(awaitable.IsCompleted); + } + + [Fact] + public async Task AdvanceToInvalidCursorThrows() + { + await _pipe.Writer.WriteAsync(new byte[100]); + + ReadResult result = await _pipe.Reader.ReadAsync(); + ReadOnlySequence buffer = result.Buffer; + + _pipe.Reader.AdvanceTo(buffer.End); + + _pipe.Reader.CancelPendingRead(); + result = await _pipe.Reader.ReadAsync(); + Assert.Throws(() => _pipe.Reader.AdvanceTo(buffer.End)); + _pipe.Reader.AdvanceTo(result.Buffer.End); + } + + [Fact] + public async Task AdvanceWithGetPositionCrossingIntoWriteHeadWorks() + { + // Create two blocks + Memory memory = _pipe.Writer.GetMemory(1); + _pipe.Writer.Advance(memory.Length); + memory = _pipe.Writer.GetMemory(1); + _pipe.Writer.Advance(memory.Length); + await _pipe.Writer.FlushAsync(); + + // Read single block + ReadResult readResult = await _pipe.Reader.ReadAsync(); + + // Allocate more memory + memory = _pipe.Writer.GetMemory(1); + + // Create position that would cross into write head + ReadOnlySequence buffer = readResult.Buffer; + SequencePosition position = buffer.GetPosition(buffer.Length); + + // Return everything + _pipe.Reader.AdvanceTo(position); + + // Advance writer + _pipe.Writer.Advance(memory.Length); + } + + [Fact] + public async Task CompleteReaderAfterFlushWithoutAdvancingDoesNotThrow() + { + await _pipe.Writer.WriteAsync(new byte[10]); + ReadResult result = await _pipe.Reader.ReadAsync(); + ReadOnlySequence buffer = result.Buffer; + + _pipe.Reader.Complete(); + } + + [Fact] + public async Task ResetAfterCompleteReaderAndWriterWithoutAdvancingClearsEverything() + { + _pipe.Writer.WriteEmpty(4094); + _pipe.Writer.WriteEmpty(4094); + await _pipe.Writer.FlushAsync(); + ReadResult result = await _pipe.Reader.ReadAsync(); + ReadOnlySequence buffer = result.Buffer; + + SequenceMarshal.TryGetReadOnlySequenceSegment( + buffer, + out ReadOnlySequenceSegment start, + out int startIndex, + out ReadOnlySequenceSegment end, + out int endIndex); + + var startSegment = (BufferSegment)start; + var endSegment = (BufferSegment)end; + Assert.NotNull(startSegment.MemoryOwner); + Assert.NotNull(endSegment.MemoryOwner); + + _pipe.Reader.Complete(); + + // Nothing cleaned up + Assert.NotNull(startSegment.MemoryOwner); + Assert.NotNull(endSegment.MemoryOwner); + + _pipe.Writer.Complete(); + + // Should be cleaned up now + Assert.Null(startSegment.MemoryOwner); + Assert.Null(endSegment.MemoryOwner); + + _pipe.Reset(); + } + + [Fact] + public async Task AdvanceAfterCompleteThrows() + { + await _pipe.Writer.WriteAsync(new byte[1]); + ReadResult result = await _pipe.Reader.ReadAsync(); + ReadOnlySequence buffer = result.Buffer; + + _pipe.Reader.Complete(); + + var exception = Assert.Throws(() => _pipe.Reader.AdvanceTo(buffer.End)); + Assert.Equal("Reading is not allowed after reader was completed.", exception.Message); + } + + [Fact] + public void FlushAsync_ReturnsCompletedTaskWhenMaxSizeIfZero() + { + PipeWriter writableBuffer = _pipe.Writer.WriteEmpty(1); + ValueTask flushTask = writableBuffer.FlushAsync(); + Assert.True(flushTask.IsCompleted); + + writableBuffer = _pipe.Writer.WriteEmpty(1); + flushTask = writableBuffer.FlushAsync(); + Assert.True(flushTask.IsCompleted); + } + + [Fact] + public async Task FlushAsync_ThrowsIfWriterReaderWithException() + { + void ThrowTestException() + { + try + { + throw new InvalidOperationException("Reader exception"); + } + catch (Exception e) + { + _pipe.Reader.Complete(e); + } + } + + ThrowTestException(); + + InvalidOperationException invalidOperationException = + await Assert.ThrowsAsync(async () => await _pipe.Writer.FlushAsync()); + + Assert.Equal("Reader exception", invalidOperationException.Message); + Assert.Contains("ThrowTestException", invalidOperationException.StackTrace); + + invalidOperationException = await Assert.ThrowsAsync(async () => await _pipe.Writer.FlushAsync()); + Assert.Equal("Reader exception", invalidOperationException.Message); + Assert.Contains("ThrowTestException", invalidOperationException.StackTrace); + } + + [Fact] + public async Task HelloWorldAcrossTwoBlocks() + { + // block 1 -> block2 + // [padding..hello] -> [ world ] + PipeWriter writeBuffer = _pipe.Writer; + var blockSize = _pipe.Writer.GetMemory().Length; + + byte[] paddingBytes = Enumerable.Repeat((byte)'a', blockSize - 5).ToArray(); + byte[] bytes = Encoding.ASCII.GetBytes("Hello World"); + + writeBuffer.Write(paddingBytes); + writeBuffer.Write(bytes); + await writeBuffer.FlushAsync(); + + ReadResult result = await _pipe.Reader.ReadAsync(); + ReadOnlySequence buffer = result.Buffer; + Assert.False(buffer.IsSingleSegment); + ReadOnlySequence helloBuffer = buffer.Slice(blockSize - 5); + Assert.False(helloBuffer.IsSingleSegment); + var memory = new List>(); + foreach (ReadOnlyMemory m in helloBuffer) + { + memory.Add(m); + } + + List> spans = memory; + _pipe.Reader.AdvanceTo(buffer.Start, buffer.Start); + + Assert.Equal(2, memory.Count); + var helloBytes = new byte[spans[0].Length]; + spans[0].Span.CopyTo(helloBytes); + var worldBytes = new byte[spans[1].Length]; + spans[1].Span.CopyTo(worldBytes); + Assert.Equal("Hello", Encoding.ASCII.GetString(helloBytes)); + Assert.Equal(" World", Encoding.ASCII.GetString(worldBytes)); + } + + [Fact] + public async Task ReadAsync_ThrowsIfWriterCompletedWithException() + { + void ThrowTestException() + { + try + { + throw new InvalidOperationException("Writer exception"); + } + catch (Exception e) + { + _pipe.Writer.Complete(e); + } + } + + ThrowTestException(); + + InvalidOperationException invalidOperationException = + await Assert.ThrowsAsync(async () => await _pipe.Reader.ReadAsync()); + + Assert.Equal("Writer exception", invalidOperationException.Message); + Assert.Contains("ThrowTestException", invalidOperationException.StackTrace); + + invalidOperationException = await Assert.ThrowsAsync(async () => await _pipe.Reader.ReadAsync()); + Assert.Equal("Writer exception", invalidOperationException.Message); + Assert.Contains("ThrowTestException", invalidOperationException.StackTrace); + } + + [Fact] + public async Task ReaderShouldNotGetUnflushedBytes() + { + // Write 10 and flush + PipeWriter buffer = _pipe.Writer; + buffer.Write(new byte[] { 0, 0, 0, 10 }); + await buffer.FlushAsync(); + + // Write 9 + buffer = _pipe.Writer; + buffer.Write(new byte[] { 0, 0, 0, 9 }); + + // Write 8 + buffer.Write(new byte[] { 0, 0, 0, 8 }); + + // Make sure we don't see it yet + ReadResult result = await _pipe.Reader.ReadAsync(); + ReadOnlySequence reader = result.Buffer; + + Assert.Equal(4, reader.Length); + Assert.Equal(new byte[] { 0, 0, 0, 10 }, reader.ToArray()); + + // Don't move + _pipe.Reader.AdvanceTo(reader.Start); + + // Now flush + await buffer.FlushAsync(); + + reader = (await _pipe.Reader.ReadAsync()).Buffer; + + Assert.Equal(12, reader.Length); + Assert.Equal(new byte[] { 0, 0, 0, 10 }, reader.Slice(0, 4).ToArray()); + Assert.Equal(new byte[] { 0, 0, 0, 9 }, reader.Slice(4, 4).ToArray()); + Assert.Equal(new byte[] { 0, 0, 0, 8 }, reader.Slice(8, 4).ToArray()); + + _pipe.Reader.AdvanceTo(reader.Start, reader.Start); + } + + [Fact] + public async Task ReaderShouldNotGetUnflushedBytesWhenOverflowingSegments() + { + // Fill the block with stuff leaving 5 bytes at the end + Memory buffer = _pipe.Writer.GetMemory(); + + int len = buffer.Length; + // Fill the buffer with garbage + // block 1 -> block2 + // [padding..hello] -> [ world ] + byte[] paddingBytes = Enumerable.Repeat((byte)'a', len - 5).ToArray(); + _pipe.Writer.Write(paddingBytes); + await _pipe.Writer.FlushAsync(); + + // Write 10 and flush + _pipe.Writer.Write(new byte[] { 0, 0, 0, 10 }); + + // Write 9 + _pipe.Writer.Write(new byte[] { 0, 0, 0, 9 }); + + // Write 8 + _pipe.Writer.Write(new byte[] { 0, 0, 0, 8 }); + + // Make sure we don't see it yet + ReadResult result = await _pipe.Reader.ReadAsync(); + ReadOnlySequence reader = result.Buffer; + + Assert.Equal(len - 5, reader.Length); + + // Don't move + _pipe.Reader.AdvanceTo(reader.End); + + // Now flush + await _pipe.Writer.FlushAsync(); + + reader = (await _pipe.Reader.ReadAsync()).Buffer; + + Assert.Equal(12, reader.Length); + Assert.Equal(new byte[] { 0, 0, 0, 10 }, reader.Slice(0, 4).ToArray()); + Assert.Equal(new byte[] { 0, 0, 0, 9 }, reader.Slice(4, 4).ToArray()); + Assert.Equal(new byte[] { 0, 0, 0, 8 }, reader.Slice(8, 4).ToArray()); + + _pipe.Reader.AdvanceTo(reader.Start, reader.Start); + } + + [Fact] + public async Task ReaderShouldNotGetUnflushedBytesWithAppend() + { + // Write 10 and flush + PipeWriter buffer = _pipe.Writer; + buffer.Write(new byte[] { 0, 0, 0, 10 }); + await buffer.FlushAsync(); + + // Write Hello to another pipeline and get the buffer + byte[] bytes = Encoding.ASCII.GetBytes("Hello"); + + var c2 = new Pipe(new PipeOptions(_pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline)); + await c2.Writer.WriteAsync(bytes); + ReadResult result = await c2.Reader.ReadAsync(); + ReadOnlySequence c2Buffer = result.Buffer; + + Assert.Equal(bytes.Length, c2Buffer.Length); + + // Write 9 to the buffer + buffer = _pipe.Writer; + buffer.Write(new byte[] { 0, 0, 0, 9 }); + + // Append the data from the other pipeline + foreach (ReadOnlyMemory memory in c2Buffer) + { + buffer.Write(memory.Span); + } + + // Mark it as consumed + c2.Reader.AdvanceTo(c2Buffer.End); + + // Now read and make sure we only see the comitted data + result = await _pipe.Reader.ReadAsync(); + ReadOnlySequence reader = result.Buffer; + + Assert.Equal(4, reader.Length); + Assert.Equal(new byte[] { 0, 0, 0, 10 }, reader.Slice(0, 4).ToArray()); + + // Consume nothing + _pipe.Reader.AdvanceTo(reader.Start); + + // Flush the second set of writes + await buffer.FlushAsync(); + + reader = (await _pipe.Reader.ReadAsync()).Buffer; + + // int, int, "Hello" + Assert.Equal(13, reader.Length); + Assert.Equal(new byte[] { 0, 0, 0, 10 }, reader.Slice(0, 4).ToArray()); + Assert.Equal(new byte[] { 0, 0, 0, 9 }, reader.Slice(4, 4).ToArray()); + Assert.Equal("Hello", Encoding.ASCII.GetString(reader.Slice(8).ToArray())); + + _pipe.Reader.AdvanceTo(reader.Start, reader.Start); + } + + [Theory] + [InlineData(true)] + [InlineData(false)] + public async Task ReadAsyncOnCompletedCapturesTheExecutionContext(bool useSynchronizationContext) + { + var pipe = new Pipe(new PipeOptions(useSynchronizationContext: useSynchronizationContext)); + + SynchronizationContext previous = SynchronizationContext.Current; + var sc = new CustomSynchronizationContext(); + + if (useSynchronizationContext) + { + SynchronizationContext.SetSynchronizationContext(sc); + } + + try + { + AsyncLocal val = new AsyncLocal(); + var tcs = new TaskCompletionSource(); + val.Value = 10; + + pipe.Reader.ReadAsync().GetAwaiter().OnCompleted(() => + { + tcs.TrySetResult(val.Value); + }); + + val.Value = 20; + + pipe.Writer.WriteEmpty(100); + // Don't run any code on our fake sync context + await pipe.Writer.FlushAsync().ConfigureAwait(false); + + if (useSynchronizationContext) + { + Assert.Equal(1, sc.Callbacks.Count); + sc.Callbacks[0].Item1(sc.Callbacks[0].Item2); + } + + int value = await tcs.Task.ConfigureAwait(false); + Assert.Equal(10, value); + } + finally + { + if (useSynchronizationContext) + { + SynchronizationContext.SetSynchronizationContext(previous); + } + + pipe.Reader.Complete(); + pipe.Writer.Complete(); + } + } + + [Theory] + [InlineData(true)] + [InlineData(false)] + public async Task FlushAsyncOnCompletedCapturesTheExecutionContextAndSyncContext(bool useSynchronizationContext) + { + var pipe = new Pipe(new PipeOptions(useSynchronizationContext: useSynchronizationContext, pauseWriterThreshold: 20, resumeWriterThreshold: 10)); + + SynchronizationContext previous = SynchronizationContext.Current; + var sc = new CustomSynchronizationContext(); + + if (useSynchronizationContext) + { + SynchronizationContext.SetSynchronizationContext(sc); + } + + try + { + AsyncLocal val = new AsyncLocal(); + var tcs = new TaskCompletionSource(); + val.Value = 10; + + pipe.Writer.WriteEmpty(20); + pipe.Writer.FlushAsync().GetAwaiter().OnCompleted(() => + { + tcs.TrySetResult(val.Value); + }); + + val.Value = 20; + + // Don't run any code on our fake sync context + ReadResult result = await pipe.Reader.ReadAsync().ConfigureAwait(false); + pipe.Reader.AdvanceTo(result.Buffer.End); + + if (useSynchronizationContext) + { + Assert.Equal(1, sc.Callbacks.Count); + sc.Callbacks[0].Item1(sc.Callbacks[0].Item2); + } + + int value = await tcs.Task.ConfigureAwait(false); + Assert.Equal(10, value); + } + finally + { + if (useSynchronizationContext) + { + SynchronizationContext.SetSynchronizationContext(previous); + } + + pipe.Reader.Complete(); + pipe.Writer.Complete(); + } + } + + [Fact] + public async Task ReadingCanBeCanceled() + { + var cts = new CancellationTokenSource(); + cts.Token.Register(() => { _pipe.Writer.Complete(new OperationCanceledException(cts.Token)); }); + + Task ignore = Task.Run( + async () => + { + await Task.Delay(1000); + cts.Cancel(); + }); + + await Assert.ThrowsAsync( + async () => + { + ReadResult result = await _pipe.Reader.ReadAsync(); + ReadOnlySequence buffer = result.Buffer; + }); + } + + [Fact] + public async Task SyncReadThenAsyncRead() + { + PipeWriter buffer = _pipe.Writer; + buffer.Write(Encoding.ASCII.GetBytes("Hello World")); + await buffer.FlushAsync(); + + bool gotData = _pipe.Reader.TryRead(out ReadResult result); + Assert.True(gotData); + + Assert.Equal("Hello World", Encoding.ASCII.GetString(result.Buffer.ToArray())); + + _pipe.Reader.AdvanceTo(result.Buffer.GetPosition(6)); + + result = await _pipe.Reader.ReadAsync(); + + Assert.Equal("World", Encoding.ASCII.GetString(result.Buffer.ToArray())); + + _pipe.Reader.AdvanceTo(result.Buffer.End); + } + + [Fact] + public void ThrowsOnAllocAfterCompleteWriter() + { + _pipe.Writer.Complete(); + + Assert.Throws(() => _pipe.Writer.GetMemory()); + } + + [Fact] + public void ThrowsOnReadAfterCompleteReader() + { + _pipe.Reader.Complete(); + + Assert.Throws(() => _pipe.Reader.ReadAsync()); + } + + [Fact] + public void TryReadAfterCancelPendingReadReturnsTrue() + { + _pipe.Reader.CancelPendingRead(); + + bool gotData = _pipe.Reader.TryRead(out ReadResult result); + + Assert.True(result.IsCanceled); + + _pipe.Reader.AdvanceTo(result.Buffer.End); + } + + [Fact] + public void TryReadAfterCloseWriterWithExceptionThrows() + { + _pipe.Writer.Complete(new Exception("wow")); + + var ex = Assert.Throws(() => _pipe.Reader.TryRead(out ReadResult result)); + Assert.Equal("wow", ex.Message); + } + + [Fact] + public void TryReadAfterReaderCompleteThrows() + { + _pipe.Reader.Complete(); + + Assert.Throws(() => _pipe.Reader.TryRead(out ReadResult result)); + } + + [Fact] + public void TryReadAfterWriterCompleteReturnsTrue() + { + _pipe.Writer.Complete(); + + bool gotData = _pipe.Reader.TryRead(out ReadResult result); + + Assert.True(result.IsCompleted); + + _pipe.Reader.AdvanceTo(result.Buffer.End); + } + + [Fact] + public void WhenTryReadReturnsFalseDontNeedToCallAdvance() + { + bool gotData = _pipe.Reader.TryRead(out ReadResult result); + Assert.False(gotData); + _pipe.Reader.AdvanceTo(default); + } + + [Fact] + public async Task WritingDataMakesDataReadableViaPipeline() + { + byte[] bytes = Encoding.ASCII.GetBytes("Hello World"); + + await _pipe.Writer.WriteAsync(bytes); + ReadResult result = await _pipe.Reader.ReadAsync(); + ReadOnlySequence buffer = result.Buffer; + + Assert.Equal(11, buffer.Length); + Assert.True(buffer.IsSingleSegment); + var array = new byte[11]; + buffer.First.Span.CopyTo(array); + Assert.Equal("Hello World", Encoding.ASCII.GetString(array)); + + _pipe.Reader.AdvanceTo(buffer.Start, buffer.Start); + } + + [Fact] + public async Task DoubleAsyncReadThrows() + { + ValueTask readTask1 = _pipe.Reader.ReadAsync(); + ValueTask readTask2 = _pipe.Reader.ReadAsync(); + + var task1 = Assert.ThrowsAsync(async () => await readTask1); + var task2 = Assert.ThrowsAsync(async () => await readTask2); + + var exception1 = await task1; + var exception2 = await task2; + + Assert.Equal("Concurrent reads or writes are not supported.", exception1.Message); + Assert.Equal("Concurrent reads or writes are not supported.", exception2.Message); + } + + [Fact] + public void GetResultBeforeCompletedThrows() + { + ValueTask awaiter = _pipe.Reader.ReadAsync(); + + Assert.Throws(() => awaiter.GetAwaiter().GetResult()); + } + + [Fact] + public async Task CompleteAfterAdvanceCommits() + { + _pipe.Writer.WriteEmpty(4); + + _pipe.Writer.Complete(); + + var result = await _pipe.Reader.ReadAsync(); + Assert.Equal(4, result.Buffer.Length); + _pipe.Reader.AdvanceTo(result.Buffer.End); + } + + [Fact] + public async Task AdvanceWithoutReadThrows() + { + await _pipe.Writer.WriteAsync(new byte[3]); + ReadResult readResult = await _pipe.Reader.ReadAsync(); + _pipe.Reader.AdvanceTo(readResult.Buffer.Start); + + InvalidOperationException exception = Assert.Throws(() => _pipe.Reader.AdvanceTo(readResult.Buffer.End)); + Assert.Equal("No reading operation to complete.", exception.Message); + } + + [Fact] + public async Task TryReadAfterReadAsyncThrows() + { + await _pipe.Writer.WriteAsync(new byte[3]); + ReadResult readResult = await _pipe.Reader.ReadAsync(); + + Assert.Throws(() => _pipe.Reader.TryRead(out _)); + _pipe.Reader.AdvanceTo(readResult.Buffer.Start); + } + + [Fact] + public void GetMemoryZeroReturnsNonEmpty() + { + Assert.True(_pipe.Writer.GetMemory(0).Length > 0); + } + + [Fact] + public async Task ReadAsyncWithDataReadyReturnsTaskWithValue() + { + _pipe.Writer.WriteEmpty(10); + await _pipe.Writer.FlushAsync(); + var task = _pipe.Reader.ReadAsync(); + Assert.True(IsTaskWithResult(task)); + } + + [Fact] + public void CancelledReadAsyncReturnsTaskWithValue() + { + _pipe.Reader.CancelPendingRead(); + var task = _pipe.Reader.ReadAsync(); + Assert.True(IsTaskWithResult(task)); + } + + [Fact] + public void FlushAsyncWithoutBackpressureReturnsTaskWithValue() + { + _pipe.Writer.WriteEmpty(10); + var task = _pipe.Writer.FlushAsync(); + Assert.True(IsTaskWithResult(task)); + } + + [Fact] + public void CancelledFlushAsyncReturnsTaskWithValue() + { + _pipe.Writer.CancelPendingFlush(); + var task = _pipe.Writer.FlushAsync(); + Assert.True(IsTaskWithResult(task)); + } + + [Fact] + public void EmptyFlushAsyncDoesntWakeUpReader() + { + ValueTask task = _pipe.Reader.ReadAsync(); + _pipe.Writer.FlushAsync(); + + Assert.False(task.IsCompleted); + } + + [Fact] + public async Task EmptyFlushAsyncDoesntWakeUpReaderAfterAdvance() + { + await _pipe.Writer.WriteAsync(new byte[10]); + + ReadResult result = await _pipe.Reader.ReadAsync(); + _pipe.Reader.AdvanceTo(result.Buffer.Start, result.Buffer.End); + + ValueTask task = _pipe.Reader.ReadAsync(); + + await _pipe.Writer.FlushAsync(); + + Assert.False(task.IsCompleted); + } + + private bool IsTaskWithResult(ValueTask task) + { + return task == new ValueTask(task.Result); + } + + private sealed class CustomSynchronizationContext : SynchronizationContext + { + public List> Callbacks = new List>(); + + public override void Post(SendOrPostCallback d, object state) + { + Callbacks.Add(Tuple.Create(d, state)); + } + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/tests/PipeResetTests.cs b/external/corefx/src/System.IO.Pipelines/tests/PipeResetTests.cs new file mode 100644 index 0000000000..566d6237e8 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/tests/PipeResetTests.cs @@ -0,0 +1,82 @@ +// 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; +using System.Threading.Tasks; +using Xunit; + +namespace System.IO.Pipelines.Tests +{ + public class PipeResetTests : IDisposable + { + public PipeResetTests() + { + _pool = new TestMemoryPool(); + _pipe = new Pipe(new PipeOptions(_pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + } + + public void Dispose() + { + _pipe.Writer.Complete(); + _pipe.Reader.Complete(); + _pool?.Dispose(); + } + + private readonly TestMemoryPool _pool; + + private readonly Pipe _pipe; + + [Fact] + public async Task LengthIsReseted() + { + var source = new byte[] { 1, 2, 3 }; + + await _pipe.Writer.WriteAsync(source); + + _pipe.Reader.Complete(); + _pipe.Writer.Complete(); + + _pipe.Reset(); + + Assert.Equal(0, _pipe.Length); + } + + [Fact] + public async Task ReadsAndWritesAfterReset() + { + var source = new byte[] { 1, 2, 3 }; + + await _pipe.Writer.WriteAsync(source); + ReadResult result = await _pipe.Reader.ReadAsync(); + + Assert.Equal(source, result.Buffer.ToArray()); + _pipe.Reader.AdvanceTo(result.Buffer.End); + + _pipe.Reader.Complete(); + _pipe.Writer.Complete(); + + _pipe.Reset(); + + await _pipe.Writer.WriteAsync(source); + result = await _pipe.Reader.ReadAsync(); + + Assert.Equal(source, result.Buffer.ToArray()); + _pipe.Reader.AdvanceTo(result.Buffer.End); + } + + [Fact] + public void ResetThrowsIfReaderNotCompleted() + { + _pipe.Writer.Complete(); + Assert.Throws(() => _pipe.Reset()); + } + + [Fact] + public void ResetThrowsIfWriterNotCompleted() + { + _pipe.Reader.Complete(); + Assert.Throws(() => _pipe.Reset()); + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/tests/PipeTest.cs b/external/corefx/src/System.IO.Pipelines/tests/PipeTest.cs new file mode 100644 index 0000000000..909b945fb3 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/tests/PipeTest.cs @@ -0,0 +1,38 @@ +// 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.IO.Pipelines.Tests +{ + public abstract class PipeTest : IDisposable + { + protected const int MaximumSizeHigh = 65; + + protected const int MaximumSizeLow = 6; + + private readonly TestMemoryPool _pool; + + protected Pipe Pipe; + + protected PipeTest(int pauseWriterThreshold = MaximumSizeHigh, int resumeWriterThreshold = MaximumSizeLow) + { + _pool = new TestMemoryPool(); + Pipe = new Pipe( + new PipeOptions( + _pool, + pauseWriterThreshold: pauseWriterThreshold, + resumeWriterThreshold: resumeWriterThreshold, + readerScheduler: PipeScheduler.Inline, + writerScheduler: PipeScheduler.Inline, + useSynchronizationContext: false + )); + } + + public void Dispose() + { + Pipe.Writer.Complete(); + Pipe.Reader.Complete(); + _pool.Dispose(); + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/tests/PipeWriterTests.cs b/external/corefx/src/System.IO.Pipelines/tests/PipeWriterTests.cs new file mode 100644 index 0000000000..d60841d673 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/tests/PipeWriterTests.cs @@ -0,0 +1,199 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Buffers; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Xunit; + +namespace System.IO.Pipelines.Tests +{ + public class PipeWriterTests : PipeTest + { + public PipeWriterTests() : base(0, 0) + { + } + + private byte[] Read() + { + Pipe.Writer.FlushAsync().GetAwaiter().GetResult(); + ReadResult readResult = Pipe.Reader.ReadAsync().GetAwaiter().GetResult(); + byte[] data = readResult.Buffer.ToArray(); + Pipe.Reader.AdvanceTo(readResult.Buffer.End); + return data; + } + + [Theory] + [InlineData(3, -1, 0)] + [InlineData(3, 0, -1)] + [InlineData(3, 0, 4)] + [InlineData(3, 4, 0)] + [InlineData(3, -1, -1)] + [InlineData(3, 4, 4)] + public void ThrowsForInvalidParameters(int arrayLength, int offset, int length) + { + PipeWriter writer = Pipe.Writer; + var array = new byte[arrayLength]; + for (var i = 0; i < array.Length; i++) + { + array[i] = (byte)(i + 1); + } + + writer.Write(new Span(array, 0, 0)); + writer.Write(new Span(array, array.Length, 0)); + + try + { + writer.Write(new Span(array, offset, length)); + Assert.True(false); + } + catch (Exception ex) + { + Assert.True(ex is ArgumentOutOfRangeException); + } + + writer.Write(new Span(array, 0, array.Length)); + Assert.Equal(array, Read()); + } + + [Theory] + [InlineData(0, 0, 3)] + [InlineData(0, 1, 2)] + [InlineData(0, 2, 1)] + [InlineData(0, 1, 1)] + [InlineData(1, 0, 3)] + [InlineData(1, 1, 2)] + [InlineData(1, 2, 1)] + [InlineData(1, 1, 1)] + public void CanWriteWithOffsetAndLenght(int alloc, int offset, int length) + { + PipeWriter writer = Pipe.Writer; + var array = new byte[] { 1, 2, 3 }; + + writer.Write(new Span(array, offset, length)); + + Assert.Equal(array.Skip(offset).Take(length).ToArray(), Read()); + } + + [Fact] + public void CanWriteIntoHeadlessBuffer() + { + PipeWriter writer = Pipe.Writer; + + writer.Write(new byte[] { 1, 2, 3 }); + Assert.Equal(new byte[] { 1, 2, 3 }, Read()); + } + + [Fact] + public void CanWriteMultipleTimes() + { + PipeWriter writer = Pipe.Writer; + + writer.Write(new byte[] { 1 }); + writer.Write(new byte[] { 2 }); + writer.Write(new byte[] { 3 }); + + Assert.Equal(new byte[] { 1, 2, 3 }, Read()); + } + + [Fact] + public void CanWriteOverTheBlockLength() + { + Memory memory = Pipe.Writer.GetMemory(); + PipeWriter writer = Pipe.Writer; + + IEnumerable source = Enumerable.Range(0, memory.Length).Select(i => (byte)i); + byte[] expectedBytes = source.Concat(source).Concat(source).ToArray(); + + writer.Write(expectedBytes); + + Assert.Equal(expectedBytes, Read()); + } + + [Fact] + public void EnsureAllocatesSpan() + { + PipeWriter writer = Pipe.Writer; + var span = writer.GetSpan(10); + + Assert.True(span.Length >= 10); + // 0 byte Flush would not complete the reader so we complete. + Pipe.Writer.Complete(); + Assert.Equal(new byte[] { }, Read()); + } + + [Fact] + public void SlicesSpanAndAdvancesAfterWrite() + { + int initialLength = Pipe.Writer.GetSpan(3).Length; + + PipeWriter writer = Pipe.Writer; + + writer.Write(new byte[] { 1, 2, 3 }); + Span span = Pipe.Writer.GetSpan(); + + Assert.Equal(initialLength - 3, span.Length); + Assert.Equal(new byte[] { 1, 2, 3 }, Read()); + } + + [Theory] + [InlineData(5)] + [InlineData(50)] + [InlineData(500)] + [InlineData(5000)] + [InlineData(50000)] + public async Task WriteLargeDataBinary(int length) + { + var data = new byte[length]; + new Random(length).NextBytes(data); + PipeWriter output = Pipe.Writer; + output.Write(data); + await output.FlushAsync(); + + ReadResult result = await Pipe.Reader.ReadAsync(); + ReadOnlySequence input = result.Buffer; + Assert.Equal(data, input.ToArray()); + Pipe.Reader.AdvanceTo(input.End); + } + + [Fact] + public async Task CanWriteNothingToBuffer() + { + PipeWriter buffer = Pipe.Writer; + buffer.GetMemory(0); + buffer.Advance(0); // doing nothing, the hard way + await buffer.FlushAsync(); + } + + [Fact] + public void EmptyWriteDoesNotThrow() + { + Pipe.Writer.Write(new byte[0]); + } + + [Fact] + public void ThrowsOnAdvanceOverMemorySize() + { + Memory buffer = Pipe.Writer.GetMemory(1); + var exception = Assert.Throws(() => Pipe.Writer.Advance(buffer.Length + 1)); + Assert.Equal("Can't advance past buffer size.", exception.Message); + } + + [Fact] + public void ThrowsOnAdvanceWithNoMemory() + { + PipeWriter buffer = Pipe.Writer; + var exception = Assert.Throws(() => buffer.Advance(1)); + Assert.Equal("No writing operation. Make sure GetMemory() was called.", exception.Message); + } + + [Fact] + public void GetMemory_AdjustsToPoolMaxBufferSize() + { + PipeWriter buffer = Pipe.Writer; + var memory = buffer.GetMemory(int.MaxValue); + Assert.True(memory.Length >= 4096); + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/tests/ReadAsyncCancellationTests.cs b/external/corefx/src/System.IO.Pipelines/tests/ReadAsyncCancellationTests.cs new file mode 100644 index 0000000000..ea486a30fd --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/tests/ReadAsyncCancellationTests.cs @@ -0,0 +1,434 @@ +// 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; +using System.Runtime.CompilerServices; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using Xunit; + +namespace System.IO.Pipelines.Tests +{ + public class ReadAsyncCancellationTests : PipeTest + { + [Fact] + public async Task AdvanceShouldResetStateIfReadCanceled() + { + Pipe.Reader.CancelPendingRead(); + + ReadResult result = await Pipe.Reader.ReadAsync(); + ReadOnlySequence buffer = result.Buffer; + Pipe.Reader.AdvanceTo(buffer.End); + + Assert.False(result.IsCompleted); + Assert.True(result.IsCanceled); + Assert.True(buffer.IsEmpty); + + ValueTask awaitable = Pipe.Reader.ReadAsync(); + Assert.False(awaitable.IsCompleted); + } + + [Fact] + public async Task CancellingBeforeAdvance() + { + byte[] bytes = Encoding.ASCII.GetBytes("Hello World"); + PipeWriter output = Pipe.Writer; + output.Write(bytes); + await output.FlushAsync(); + + ReadResult result = await Pipe.Reader.ReadAsync(); + ReadOnlySequence buffer = result.Buffer; + + Assert.Equal(11, buffer.Length); + Assert.False(result.IsCanceled); + Assert.True(buffer.IsSingleSegment); + var array = new byte[11]; + buffer.First.Span.CopyTo(array); + Assert.Equal("Hello World", Encoding.ASCII.GetString(array)); + + Pipe.Reader.CancelPendingRead(); + + Pipe.Reader.AdvanceTo(buffer.End); + + ValueTask awaitable = Pipe.Reader.ReadAsync(); + + Assert.True(awaitable.IsCompleted); + + result = await awaitable; + + Assert.True(result.IsCanceled); + + Pipe.Reader.AdvanceTo(result.Buffer.Start, result.Buffer.Start); + } + + [Fact] + public async Task CancellingPendingAfterReadAsync() + { + byte[] bytes = Encoding.ASCII.GetBytes("Hello World"); + PipeWriter output = Pipe.Writer; + output.Write(bytes); + + Func taskFunc = async () => { + ReadResult result = await Pipe.Reader.ReadAsync(); + ReadOnlySequence buffer = result.Buffer; + Pipe.Reader.AdvanceTo(buffer.End); + + Assert.False(result.IsCompleted); + Assert.True(result.IsCanceled); + Assert.True(buffer.IsEmpty); + + await output.FlushAsync(); + + result = await Pipe.Reader.ReadAsync(); + buffer = result.Buffer; + + Assert.Equal(11, buffer.Length); + Assert.True(buffer.IsSingleSegment); + Assert.False(result.IsCanceled); + var array = new byte[11]; + buffer.First.Span.CopyTo(array); + Assert.Equal("Hello World", Encoding.ASCII.GetString(array)); + Pipe.Reader.AdvanceTo(result.Buffer.End, result.Buffer.End); + + Pipe.Reader.Complete(); + }; + + Task task = taskFunc(); + + Pipe.Reader.CancelPendingRead(); + + await task; + + Pipe.Writer.Complete(); + } + + [Fact] + public async Task CancellingPendingReadBeforeReadAsync() + { + Pipe.Reader.CancelPendingRead(); + + ReadResult result = await Pipe.Reader.ReadAsync(); + ReadOnlySequence buffer = result.Buffer; + Pipe.Reader.AdvanceTo(buffer.End); + + Assert.False(result.IsCompleted); + Assert.True(result.IsCanceled); + Assert.True(buffer.IsEmpty); + + byte[] bytes = Encoding.ASCII.GetBytes("Hello World"); + PipeWriter output = Pipe.Writer; + output.Write(bytes); + await output.FlushAsync(); + + result = await Pipe.Reader.ReadAsync(); + buffer = result.Buffer; + + Assert.Equal(11, buffer.Length); + Assert.False(result.IsCanceled); + Assert.True(buffer.IsSingleSegment); + var array = new byte[11]; + buffer.First.Span.CopyTo(array); + Assert.Equal("Hello World", Encoding.ASCII.GetString(array)); + + Pipe.Reader.AdvanceTo(buffer.Start, buffer.Start); + } + + [Fact] + public void FlushAsyncCancellationDeadlock() + { + var cts = new CancellationTokenSource(); + var cts2 = new CancellationTokenSource(); + var e = new ManualResetEventSlim(); + + ValueTaskAwaiter awaiter = Pipe.Reader.ReadAsync(cts.Token).GetAwaiter(); + awaiter.OnCompleted( + () => { + // We are on cancellation thread and need to wait untill another ReadAsync call + // takes pipe state lock + e.Wait(); + // Make sure we had enough time to reach _cancellationTokenRegistration.Dispose + Thread.Sleep(100); + // Try to take pipe state lock + Pipe.Reader.ReadAsync(); + }); + + // Start a thread that would run cancellation calbacks + Task cancellationTask = Task.Run(() => cts.Cancel()); + // Start a thread that would call ReadAsync with different token + // and block on _cancellationTokenRegistration.Dispose + Task blockingTask = Task.Run( + () => { + e.Set(); + Pipe.Reader.ReadAsync(cts2.Token); + }); + + bool completed = Task.WhenAll(cancellationTask, blockingTask).Wait(TimeSpan.FromSeconds(10)); + Assert.True(completed); + } + + [Fact] + public void GetResultThrowsIfFlushAsyncTokenFiredAfterCancelPending() + { + var onCompletedCalled = false; + var cancellationTokenSource = new CancellationTokenSource(); + + ValueTaskAwaiter awaiter = Pipe.Reader.ReadAsync(cancellationTokenSource.Token).GetAwaiter(); + bool awaiterIsCompleted = awaiter.IsCompleted; + + cancellationTokenSource.Cancel(); + Pipe.Reader.CancelPendingRead(); + + awaiter.OnCompleted( + () => { + onCompletedCalled = true; + Assert.Throws(() => awaiter.GetResult()); + }); + + Assert.False(awaiterIsCompleted); + Assert.True(onCompletedCalled); + } + + [Fact] + public void GetResultThrowsIfReadAsyncCanceledAfterOnCompleted() + { + var onCompletedCalled = false; + var cancellationTokenSource = new CancellationTokenSource(); + + ValueTaskAwaiter awaiter = Pipe.Reader.ReadAsync(cancellationTokenSource.Token).GetAwaiter(); + bool awaiterIsCompleted = awaiter.IsCompleted; + awaiter.OnCompleted( + () => { + onCompletedCalled = true; + Assert.Throws(() => awaiter.GetResult()); + }); + + cancellationTokenSource.Cancel(); + + Assert.False(awaiterIsCompleted); + Assert.True(onCompletedCalled); + } + + [Fact] + public void GetResultThrowsIfReadAsyncCanceledBeforeOnCompleted() + { + var onCompletedCalled = false; + var cancellationTokenSource = new CancellationTokenSource(); + + ValueTaskAwaiter awaiter = Pipe.Reader.ReadAsync(cancellationTokenSource.Token).GetAwaiter(); + bool awaiterIsCompleted = awaiter.IsCompleted; + + cancellationTokenSource.Cancel(); + + awaiter.OnCompleted( + () => { + onCompletedCalled = true; + Assert.Throws(() => awaiter.GetResult()); + }); + + Assert.False(awaiterIsCompleted); + Assert.True(onCompletedCalled); + } + + [Fact] + public async Task ReadAsyncCancellationE2E() + { + var cts = new CancellationTokenSource(); + var e = new AutoResetEvent(false); + var cancelled = false; + + Func taskFunc = async () => { + try + { + ReadResult result = await Pipe.Reader.ReadAsync(cts.Token); + } + catch (OperationCanceledException) + { + cancelled = true; + ReadResult result = await Pipe.Reader.ReadAsync(); + Assert.Equal(new byte[] { 1, 2, 3 }, result.Buffer.ToArray()); + Pipe.Reader.AdvanceTo(result.Buffer.End); + } + }; + + Task task = taskFunc(); + + cts.Cancel(); + + await Pipe.Writer.WriteAsync(new byte[] { 1, 2, 3 }); + await task; + Assert.True(cancelled); + } + + [Fact] + public void ReadAsyncCompletedAfterPreCancellation() + { + Pipe.Reader.CancelPendingRead(); + Pipe.Writer.WriteAsync(new byte[] { 1, 2, 3 }).GetAwaiter().GetResult(); + + ValueTaskAwaiter awaitable = Pipe.Reader.ReadAsync().GetAwaiter(); + + Assert.True(awaitable.IsCompleted); + + ReadResult result = awaitable.GetResult(); + + Assert.True(result.IsCanceled); + + awaitable = Pipe.Reader.ReadAsync().GetAwaiter(); + + Assert.True(awaitable.IsCompleted); + + Pipe.Reader.AdvanceTo(awaitable.GetResult().Buffer.End); + } + + [Fact] + public void ReadAsyncNotCompletedAfterCancellation() + { + var onCompletedCalled = false; + ValueTaskAwaiter awaitable = Pipe.Reader.ReadAsync().GetAwaiter(); + + Assert.False(awaitable.IsCompleted); + awaitable.OnCompleted( + () => { + onCompletedCalled = true; + Assert.True(awaitable.IsCompleted); + + ReadResult readResult = awaitable.GetResult(); + Assert.True(readResult.IsCanceled); + + awaitable = Pipe.Reader.ReadAsync().GetAwaiter(); + Assert.False(awaitable.IsCompleted); + }); + + Pipe.Reader.CancelPendingRead(); + Assert.True(onCompletedCalled); + } + + [Fact] + public void ReadAsyncNotCompletedAfterCancellationTokenCanceled() + { + var onCompletedCalled = false; + var cts = new CancellationTokenSource(); + ValueTaskAwaiter awaitable = Pipe.Reader.ReadAsync(cts.Token).GetAwaiter(); + + Assert.False(awaitable.IsCompleted); + awaitable.OnCompleted( + () => { + onCompletedCalled = true; + Assert.True(awaitable.IsCompleted); + + Assert.Throws(() => awaitable.GetResult()); + + awaitable = Pipe.Reader.ReadAsync().GetAwaiter(); + Assert.False(awaitable.IsCompleted); + }); + + cts.Cancel(); + Assert.True(onCompletedCalled); + } + + [Fact] + public void ReadAsyncReturnsIsCancelOnCancelPendingReadAfterGetResult() + { + ValueTaskAwaiter awaitable = Pipe.Reader.ReadAsync().GetAwaiter(); + + Assert.False(awaitable.IsCompleted); + awaitable.OnCompleted(() => { }); + + Pipe.Writer.WriteAsync(new byte[] { }); + Pipe.Reader.CancelPendingRead(); + + Assert.True(awaitable.IsCompleted); + + ReadResult result = awaitable.GetResult(); + Assert.True(result.IsCanceled); + } + + [Fact] + public void ReadAsyncReturnsIsCancelOnCancelPendingReadBeforeGetResult() + { + ValueTaskAwaiter awaitable = Pipe.Reader.ReadAsync().GetAwaiter(); + + Assert.False(awaitable.IsCompleted); + awaitable.OnCompleted(() => { }); + + Pipe.Writer.WriteAsync(new byte[] { }); + Pipe.Reader.CancelPendingRead(); + + Assert.True(awaitable.IsCompleted); + + ReadResult result = awaitable.GetResult(); + Assert.True(result.IsCanceled); + } + + [Fact] + public void ReadAsyncThrowsIfPassedCanceledCancellationToken() + { + var cancellationTokenSource = new CancellationTokenSource(); + cancellationTokenSource.Cancel(); + + Assert.Throws(() => Pipe.Reader.ReadAsync(cancellationTokenSource.Token)); + } + + [Fact] + public async Task ReadAsyncWithNewCancellationTokenNotAffectedByPrevious() + { + await Pipe.Writer.WriteAsync(new byte[] { 0 }); + + var cancellationTokenSource1 = new CancellationTokenSource(); + ReadResult result = await Pipe.Reader.ReadAsync(cancellationTokenSource1.Token); + Pipe.Reader.AdvanceTo(result.Buffer.Start); + + cancellationTokenSource1.Cancel(); + var cancellationTokenSource2 = new CancellationTokenSource(); + + // Verifying that ReadAsync does not throw + result = await Pipe.Reader.ReadAsync(cancellationTokenSource2.Token); + Pipe.Reader.AdvanceTo(result.Buffer.Start); + } + + [Fact] + public async Task ReadingCanBeCanceled() + { + var cts = new CancellationTokenSource(); + cts.Token.Register(() => { Pipe.Writer.Complete(new OperationCanceledException(cts.Token)); }); + + Task ignore = Task.Run( + async () => { + await Task.Delay(1000); + cts.Cancel(); + }); + + await Assert.ThrowsAsync( + async () => { + ReadResult result = await Pipe.Reader.ReadAsync(); + ReadOnlySequence buffer = result.Buffer; + }); + } + + [Fact] + public async Task WriteAndCancellingPendingReadBeforeReadAsync() + { + byte[] bytes = Encoding.ASCII.GetBytes("Hello World"); + PipeWriter output = Pipe.Writer; + output.Write(bytes); + await output.FlushAsync(); + + Pipe.Reader.CancelPendingRead(); + + ReadResult result = await Pipe.Reader.ReadAsync(); + ReadOnlySequence buffer = result.Buffer; + + Assert.False(result.IsCompleted); + Assert.True(result.IsCanceled); + Assert.False(buffer.IsEmpty); + Assert.Equal(11, buffer.Length); + Assert.True(buffer.IsSingleSegment); + var array = new byte[11]; + buffer.First.Span.CopyTo(array); + Assert.Equal("Hello World", Encoding.ASCII.GetString(array)); + Pipe.Reader.AdvanceTo(buffer.End, buffer.End); + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/tests/ReadAsyncCompletionTests.cs b/external/corefx/src/System.IO.Pipelines/tests/ReadAsyncCompletionTests.cs new file mode 100644 index 0000000000..fc11059b00 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/tests/ReadAsyncCompletionTests.cs @@ -0,0 +1,34 @@ +// 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.Threading.Tasks; +using Xunit; + +namespace System.IO.Pipelines.Tests +{ + public class ReadAsyncCompletionTests : PipeTest + { + [Fact] + public void AwaitingReadAsyncAwaitableTwiceCompletesWriterWithException() + { + async Task Await(ValueTask a) + { + await a; + } + + ValueTask awaitable = Pipe.Reader.ReadAsync(); + + Task task1 = Await(awaitable); + Task task2 = Await(awaitable); + + Assert.Equal(true, task1.IsCompleted); + Assert.Equal(true, task1.IsFaulted); + Assert.Equal("Concurrent reads or writes are not supported.", task1.Exception.InnerExceptions[0].Message); + + Assert.Equal(true, task2.IsCompleted); + Assert.Equal(true, task2.IsFaulted); + Assert.Equal("Concurrent reads or writes are not supported.", task2.Exception.InnerExceptions[0].Message); + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/tests/ReadResultTests.cs b/external/corefx/src/System.IO.Pipelines/tests/ReadResultTests.cs new file mode 100644 index 0000000000..61ab268807 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/tests/ReadResultTests.cs @@ -0,0 +1,27 @@ +// 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; +using Xunit; + +namespace System.IO.Pipelines.Tests +{ + public class ReadResultTests + { + [InlineData(true, true)] + [InlineData(true, false)] + [InlineData(false, true)] + [InlineData(false, false)] + [Theory] + public void ReadResultCanBeConstructed(bool cancelled, bool completed) + { + var buffer = new ReadOnlySequence(new byte[] { 1, 2, 3 }); + var result = new ReadResult(buffer, cancelled, completed); + + Assert.Equal(new byte[] { 1, 2, 3 }, result.Buffer.ToArray()); + Assert.Equal(cancelled, result.IsCanceled); + Assert.Equal(completed, result.IsCompleted); + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/tests/SchedulerFacts.cs b/external/corefx/src/System.IO.Pipelines/tests/SchedulerFacts.cs new file mode 100644 index 0000000000..6b033db9e9 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/tests/SchedulerFacts.cs @@ -0,0 +1,568 @@ +// 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; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using Xunit; + +namespace System.IO.Pipelines.Tests +{ + public class SchedulerFacts + { + private class ThreadScheduler : PipeScheduler, IDisposable + { + private readonly BlockingCollection _work = new BlockingCollection(); + + public ThreadScheduler() + { + Thread = new Thread(Work) { IsBackground = true }; + Thread.Start(); + } + + public Thread Thread { get; } + + public void Dispose() + { + _work.CompleteAdding(); + } + + public override void Schedule(Action action, object state) + { + _work.Add(() => action(state)); + } + + private void Work(object state) + { + foreach (Action callback in _work.GetConsumingEnumerable()) + { + callback(); + } + } + } + + [Fact] + public async Task UseSynchronizationContextFalseIgnoresSyncContextForReaderScheduler() + { + SynchronizationContext previous = SynchronizationContext.Current; + var sc = new CustomSynchronizationContext(); + try + { + SynchronizationContext.SetSynchronizationContext(sc); + + var pipe = new Pipe(new PipeOptions(useSynchronizationContext: false)); + + Func doRead = async () => + { + ReadResult result = await pipe.Reader.ReadAsync(); + + pipe.Reader.AdvanceTo(result.Buffer.End, result.Buffer.End); + + pipe.Reader.Complete(); + }; + + // This needs to run on the current SynchronizationContext + Task reading = doRead(); + + PipeWriter buffer = pipe.Writer; + buffer.Write(Encoding.UTF8.GetBytes("Hello World")); + + // Don't run code on our sync context (we just want to make sure the callbacks) + // are scheduled on the sync context + await buffer.FlushAsync().ConfigureAwait(false); + + // Nothing posted to the sync context + Assert.Equal(0, sc.Callbacks.Count); + + pipe.Writer.Complete(); + + // Don't run code on our sync context + await reading.ConfigureAwait(false); + } + finally + { + SynchronizationContext.SetSynchronizationContext(previous); + } + } + + [Fact] + public async Task DefaultReaderSchedulerRunsOnSynchronizationContext() + { + SynchronizationContext previous = SynchronizationContext.Current; + var sc = new CustomSynchronizationContext(); + try + { + SynchronizationContext.SetSynchronizationContext(sc); + + var pipe = new Pipe(); + + Func doRead = async () => + { + ReadResult result = await pipe.Reader.ReadAsync(); + + pipe.Reader.AdvanceTo(result.Buffer.End, result.Buffer.End); + + pipe.Reader.Complete(); + }; + + // This needs to run on the current SynchronizationContext + Task reading = doRead(); + + PipeWriter buffer = pipe.Writer; + buffer.Write(Encoding.UTF8.GetBytes("Hello World")); + + // Don't run code on our sync context (we just want to make sure the callbacks) + // are scheduled on the sync context + await buffer.FlushAsync().ConfigureAwait(false); + + Assert.Equal(1, sc.Callbacks.Count); + sc.Callbacks[0].Item1(sc.Callbacks[0].Item2); + + pipe.Writer.Complete(); + + // Don't run code on our sync context + await reading.ConfigureAwait(false); + } + finally + { + SynchronizationContext.SetSynchronizationContext(previous); + } + } + + [Fact] + public async Task DefaultReaderSchedulerIgnoresSyncContextIfConfigureAwaitFalse() + { + // Get off the xunit sync context + + var previous = SynchronizationContext.Current; + try + { + var sc = new CustomSynchronizationContext(); + SynchronizationContext.SetSynchronizationContext(sc); + + var pipe = new Pipe(); + + Func doRead = async () => + { + ReadResult result = await pipe.Reader.ReadAsync().ConfigureAwait(false); + + Assert.True(Thread.CurrentThread.IsThreadPoolThread); + + pipe.Reader.AdvanceTo(result.Buffer.End, result.Buffer.End); + + pipe.Reader.Complete(); + }; + + // This needs to run on the current SynchronizationContext + Task reading = doRead(); + + PipeWriter buffer = pipe.Writer; + buffer.Write(Encoding.UTF8.GetBytes("Hello World")); + + // We don't want to run any code on our fake sync context + await buffer.FlushAsync().ConfigureAwait(false); + + // Nothing posted to the sync context + Assert.Equal(0, sc.Callbacks.Count); + + pipe.Writer.Complete(); + + // We don't want to run any code on our fake sync context + await reading.ConfigureAwait(false); + } + finally + { + SynchronizationContext.SetSynchronizationContext(previous); + } + + } + + [Fact] + public async Task DefaultReaderSchedulerRunsOnThreadPool() + { + var pipe = new Pipe(new PipeOptions(useSynchronizationContext: false)); + + Func doRead = async () => + { + Assert.False(Thread.CurrentThread.IsThreadPoolThread, "We started on the thread pool"); + + ReadResult result = await pipe.Reader.ReadAsync(); + + Assert.True(Thread.CurrentThread.IsThreadPoolThread); + + pipe.Reader.AdvanceTo(result.Buffer.End, result.Buffer.End); + + pipe.Reader.Complete(); + }; + + Task reading = ExecuteOnNonThreadPoolThread(doRead); + + PipeWriter buffer = pipe.Writer; + buffer.Write(Encoding.UTF8.GetBytes("Hello World")); + await buffer.FlushAsync(); + + pipe.Writer.Complete(); + + await reading; + } + + [Fact] + public async Task DefaultWriterSchedulerRunsOnThreadPool() + { + using (var pool = new TestMemoryPool()) + { + var pipe = new Pipe( + new PipeOptions( + pool, + resumeWriterThreshold: 32, + pauseWriterThreshold: 64, + useSynchronizationContext: false + )); + + Func doWrite = async () => + { + Assert.False(Thread.CurrentThread.IsThreadPoolThread, "We started on the thread pool"); + + PipeWriter writableBuffer = pipe.Writer.WriteEmpty(64); + ValueTask flushAsync = writableBuffer.FlushAsync(); + + Assert.False(flushAsync.IsCompleted); + + await flushAsync; + + pipe.Writer.Complete(); + + Assert.True(Thread.CurrentThread.IsThreadPoolThread); + }; + + Task writing = ExecuteOnNonThreadPoolThread(doWrite); + + ReadResult result = await pipe.Reader.ReadAsync(); + + pipe.Reader.AdvanceTo(result.Buffer.End, result.Buffer.End); + + pipe.Reader.Complete(); + + await writing; + } + } + + [Fact] + public async Task UseSynchronizationContextFalseIgnoresSyncContextForWriterScheduler() + { + SynchronizationContext previous = SynchronizationContext.Current; + var sc = new CustomSynchronizationContext(); + try + { + SynchronizationContext.SetSynchronizationContext(sc); + + using (var pool = new TestMemoryPool()) + { + var pipe = new Pipe( + new PipeOptions( + pool, + resumeWriterThreshold: 32, + pauseWriterThreshold: 64, + useSynchronizationContext: false + )); + + Func doWrite = async () => + { + PipeWriter writableBuffer = pipe.Writer.WriteEmpty(64); + ValueTask flushAsync = writableBuffer.FlushAsync(); + + Assert.False(flushAsync.IsCompleted); + + await flushAsync; + + pipe.Writer.Complete(); + }; + + Task writing = doWrite(); + + // Don't run on our bogus sync context + ReadResult result = await pipe.Reader.ReadAsync().ConfigureAwait(false); + + pipe.Reader.AdvanceTo(result.Buffer.End, result.Buffer.End); + + // Nothing scheduled on the sync context + Assert.Equal(0, sc.Callbacks.Count); + + pipe.Reader.Complete(); + + // Don't run on our bogus sync context + await writing.ConfigureAwait(false); + } + } + finally + { + SynchronizationContext.SetSynchronizationContext(previous); + } + } + + [Fact] + public async Task DefaultWriterSchedulerRunsOnSynchronizationContext() + { + SynchronizationContext previous = SynchronizationContext.Current; + var sc = new CustomSynchronizationContext(); + try + { + SynchronizationContext.SetSynchronizationContext(sc); + + using (var pool = new TestMemoryPool()) + { + var pipe = new Pipe( + new PipeOptions( + pool, + resumeWriterThreshold: 32, + pauseWriterThreshold: 64 + )); + + Func doWrite = async () => + { + PipeWriter writableBuffer = pipe.Writer.WriteEmpty(64); + ValueTask flushAsync = writableBuffer.FlushAsync(); + + Assert.False(flushAsync.IsCompleted); + + await flushAsync; + + pipe.Writer.Complete(); + + Assert.Same(SynchronizationContext.Current, sc); + }; + + Task writing = doWrite(); + + // Don't run on our bogus sync context + ReadResult result = await pipe.Reader.ReadAsync().ConfigureAwait(false); + + pipe.Reader.AdvanceTo(result.Buffer.End, result.Buffer.End); + + Assert.Equal(1, sc.Callbacks.Count); + sc.Callbacks[0].Item1(sc.Callbacks[0].Item2); + + pipe.Reader.Complete(); + + // Don't run on our bogus sync context + await writing.ConfigureAwait(false); + } + } + finally + { + SynchronizationContext.SetSynchronizationContext(previous); + } + } + + [Fact] + public async Task DefaultWriterSchedulerIgnoresSynchronizationContext() + { + SynchronizationContext previous = SynchronizationContext.Current; + var sc = new CustomSynchronizationContext(); + try + { + SynchronizationContext.SetSynchronizationContext(sc); + + using (var pool = new TestMemoryPool()) + { + var pipe = new Pipe( + new PipeOptions( + pool, + resumeWriterThreshold: 32, + pauseWriterThreshold: 64 + )); + + PipeWriter writableBuffer = pipe.Writer.WriteEmpty(64); + ValueTask flushAsync = writableBuffer.FlushAsync(); + + Assert.False(flushAsync.IsCompleted); + + Func doWrite = async () => + { + await flushAsync.ConfigureAwait(false); + + pipe.Writer.Complete(); + + Assert.NotSame(SynchronizationContext.Current, sc); + }; + + Task writing = doWrite(); + + // Don't run on our bogus sync context + ReadResult result = await pipe.Reader.ReadAsync().ConfigureAwait(false); + + pipe.Reader.AdvanceTo(result.Buffer.End, result.Buffer.End); + + Assert.Equal(0, sc.Callbacks.Count); + + pipe.Reader.Complete(); + + // Don't run on our bogus sync context + await writing.ConfigureAwait(false); + } + } + finally + { + SynchronizationContext.SetSynchronizationContext(previous); + } + } + + [Fact] + public async Task FlushCallbackRunsOnWriterScheduler() + { + using (var pool = new TestMemoryPool()) + { + using (var scheduler = new ThreadScheduler()) + { + var pipe = new Pipe( + new PipeOptions( + pool, + resumeWriterThreshold: 32, + pauseWriterThreshold: 64, + readerScheduler: PipeScheduler.Inline, + writerScheduler: scheduler, + useSynchronizationContext: false)); + + PipeWriter writableBuffer = pipe.Writer.WriteEmpty(64); + ValueTask flushAsync = writableBuffer.FlushAsync(); + + Assert.False(flushAsync.IsCompleted); + + Func doWrite = async () => + { + int oid = Thread.CurrentThread.ManagedThreadId; + + Assert.False(Thread.CurrentThread.IsThreadPoolThread, "We started on the thread pool"); + + await flushAsync; + + Assert.NotEqual(oid, Thread.CurrentThread.ManagedThreadId); + + pipe.Writer.Complete(); + + Assert.Equal(Thread.CurrentThread.ManagedThreadId, scheduler.Thread.ManagedThreadId); + }; + + Task writing = ExecuteOnNonThreadPoolThread(doWrite); + + ReadResult result = await pipe.Reader.ReadAsync(); + + pipe.Reader.AdvanceTo(result.Buffer.End, result.Buffer.End); + + pipe.Reader.Complete(); + + await writing; + } + } + } + + [Fact] + public async Task ReadAsyncCallbackRunsOnReaderScheduler() + { + using (var pool = new TestMemoryPool()) + { + using (var scheduler = new ThreadScheduler()) + { + var pipe = new Pipe(new PipeOptions(pool, scheduler, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + + Func doRead = async () => + { + int oid = Thread.CurrentThread.ManagedThreadId; + + Assert.False(Thread.CurrentThread.IsThreadPoolThread, "We started on the thread pool"); + + ReadResult result = await pipe.Reader.ReadAsync(); + + Assert.NotEqual(oid, Thread.CurrentThread.ManagedThreadId); + + Assert.Equal(Thread.CurrentThread.ManagedThreadId, scheduler.Thread.ManagedThreadId); + + pipe.Reader.AdvanceTo(result.Buffer.End, result.Buffer.End); + + pipe.Reader.Complete(); + }; + + Task reading = ExecuteOnNonThreadPoolThread(doRead); + + PipeWriter buffer = pipe.Writer; + buffer.Write(Encoding.UTF8.GetBytes("Hello World")); + await buffer.FlushAsync(); + + await reading; + } + } + } + + [Fact] + public async Task ThreadPoolScheduler_SchedulesOnThreadPool() + { + var pipe = new Pipe(new PipeOptions(readerScheduler: PipeScheduler.ThreadPool, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false)); + + async Task DoRead() + { + int oid = Thread.CurrentThread.ManagedThreadId; + + // Make sure we aren't on a thread pool thread + Assert.False(Thread.CurrentThread.IsThreadPoolThread, "We started on the thread pool"); + + ValueTask task = pipe.Reader.ReadAsync(); + + Assert.False(task.IsCompleted, "Task completed synchronously"); + + ReadResult result = await task; + + Assert.NotEqual(oid, Thread.CurrentThread.ManagedThreadId); + Assert.True(Thread.CurrentThread.IsThreadPoolThread); + pipe.Reader.AdvanceTo(result.Buffer.End, result.Buffer.End); + pipe.Reader.Complete(); + } + + bool callbackRan = false; + + // Wait start the thread and wait for it to finish + Task reading = ExecuteOnNonThreadPoolThread(DoRead); + + PipeWriter buffer = pipe.Writer; + pipe.Writer.OnReaderCompleted((state, exception) => + { + callbackRan = true; + Assert.True(Thread.CurrentThread.IsThreadPoolThread); + }, + null); + + buffer.Write(Encoding.UTF8.GetBytes("Hello World")); + await buffer.FlushAsync(); + + await reading; + + Assert.True(callbackRan); + } + + private Task ExecuteOnNonThreadPoolThread(Func func) + { + // Starts the execution of a task on a non thread pool thread + Task task = null; + var thread = new Thread(() => + { + task = func(); + }); + thread.Start(); + thread.Join(); + return task; + } + + private sealed class CustomSynchronizationContext : SynchronizationContext + { + public List> Callbacks = new List>(); + + public override void Post(SendOrPostCallback d, object state) + { + Callbacks.Add(Tuple.Create(d, state)); + } + } + } +} diff --git a/external/corefx/src/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj b/external/corefx/src/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj new file mode 100644 index 0000000000..31b08144e7 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj @@ -0,0 +1,42 @@ + + + + + {9E984EB2-827E-4029-9647-FB5F8B67C553} + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/external/corefx/src/System.IO.Pipelines/tests/TestMemoryPool.cs b/external/corefx/src/System.IO.Pipelines/tests/TestMemoryPool.cs new file mode 100644 index 0000000000..d1819c3925 --- /dev/null +++ b/external/corefx/src/System.IO.Pipelines/tests/TestMemoryPool.cs @@ -0,0 +1,138 @@ +// 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; +using System.Diagnostics; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Threading; + +namespace System.IO.Pipelines +{ + public class TestMemoryPool: MemoryPool + { + private MemoryPool _pool = Shared; + + private bool _disposed; + + public override IMemoryOwner Rent(int minBufferSize = -1) + { + CheckDisposed(); + return new PooledMemory(_pool.Rent(minBufferSize), this); + } + + protected override void Dispose(bool disposing) + { + _disposed = true; + } + + public override int MaxBufferSize => 4096; + + internal void CheckDisposed() + { + if (_disposed) + { + throw new ObjectDisposedException(nameof(TestMemoryPool)); + } + } + + private class PooledMemory : MemoryManager + { + private IMemoryOwner _owner; + + private readonly TestMemoryPool _pool; + + private int _referenceCount; + + private bool _returned; + + private string _leaser; + + public PooledMemory(IMemoryOwner owner, TestMemoryPool pool) + { + _owner = owner; + _pool = pool; + _leaser = Environment.StackTrace; + _referenceCount = 1; + } + + ~PooledMemory() + { + Debug.Assert(_returned, "Block being garbage collected instead of returned to pool" + Environment.NewLine + _leaser); + } + + protected override void Dispose(bool disposing) + { + _pool.CheckDisposed(); + } + + public override MemoryHandle Pin(int elementIndex = 0) + { + _pool.CheckDisposed(); + Interlocked.Increment(ref _referenceCount); + + if (!MemoryMarshal.TryGetArray(_owner.Memory, out ArraySegment segment)) + { + throw new InvalidOperationException(); + } + + unsafe + { + try + { + if ((uint)elementIndex > (uint)segment.Count) + { + throw new ArgumentOutOfRangeException(nameof(elementIndex)); + } + + GCHandle handle = GCHandle.Alloc(segment.Array, GCHandleType.Pinned); + + return new MemoryHandle(Unsafe.Add(((void*)handle.AddrOfPinnedObject()), elementIndex + segment.Offset), handle, this); + } + catch + { + Unpin(); + throw; + } + } + } + + public override void Unpin() + { + _pool.CheckDisposed(); + + int newRefCount = Interlocked.Decrement(ref _referenceCount); + + if (newRefCount < 0) + throw new InvalidOperationException(); + + if (newRefCount == 0) + { + _returned = true; + } + } + + protected override bool TryGetArray(out ArraySegment segment) + { + _pool.CheckDisposed(); + return MemoryMarshal.TryGetArray(_owner.Memory, out segment); + } + + public override Memory Memory + { + get + { + _pool.CheckDisposed(); + return _owner.Memory; + } + } + + public override Span GetSpan() + { + _pool.CheckDisposed(); + return _owner.Memory.Span; + } + } + } +} diff --git a/external/corefx/src/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln b/external/corefx/src/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln index e1624750a0..1452260fa5 100644 --- a/external/corefx/src/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln +++ b/external/corefx/src/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln @@ -30,10 +30,10 @@ Global {A0356E61-19E1-4722-A53D-5D2616E16312}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU {A0356E61-19E1-4722-A53D-5D2616E16312}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU {A0356E61-19E1-4722-A53D-5D2616E16312}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU - {40059634-BB03-4A6F-8657-CCE2D376BC8B}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU - {40059634-BB03-4A6F-8657-CCE2D376BC8B}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU - {40059634-BB03-4A6F-8657-CCE2D376BC8B}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU - {40059634-BB03-4A6F-8657-CCE2D376BC8B}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU + {40059634-BB03-4A6F-8657-CCE2D376BC8B}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU + {40059634-BB03-4A6F-8657-CCE2D376BC8B}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU + {40059634-BB03-4A6F-8657-CCE2D376BC8B}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU + {40059634-BB03-4A6F-8657-CCE2D376BC8B}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU {994DCE47-4CF6-479D-AB1D-4EA6A2809C34}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU {994DCE47-4CF6-479D-AB1D-4EA6A2809C34}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU {994DCE47-4CF6-479D-AB1D-4EA6A2809C34}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU diff --git a/external/corefx/src/System.IO.Pipes.AccessControl/dir.props b/external/corefx/src/System.IO.Pipes.AccessControl/dir.props index 884a835fb0..8162e77906 100644 --- a/external/corefx/src/System.IO.Pipes.AccessControl/dir.props +++ b/external/corefx/src/System.IO.Pipes.AccessControl/dir.props @@ -4,5 +4,8 @@ 4.0.3.0 MSFT + true + false + true \ No newline at end of file diff --git a/external/corefx/src/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.pkgproj b/external/corefx/src/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.pkgproj index 107007637e..fa080f3657 100644 --- a/external/corefx/src/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.pkgproj +++ b/external/corefx/src/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.pkgproj @@ -3,7 +3,7 @@ - net461;netcoreapp2.0;$(AllXamarinFrameworks) + net461;netcoreapp2.0;$(UAPvNextTFM);$(AllXamarinFrameworks) @@ -11,6 +11,10 @@ netcore50 + + + runtimes/win/lib/$(UAPvNextTFM) + \ No newline at end of file diff --git a/external/corefx/src/System.IO.Pipes.AccessControl/src/Configurations.props b/external/corefx/src/System.IO.Pipes.AccessControl/src/Configurations.props index 353d21cf4a..ed3e7308d4 100644 --- a/external/corefx/src/System.IO.Pipes.AccessControl/src/Configurations.props +++ b/external/corefx/src/System.IO.Pipes.AccessControl/src/Configurations.props @@ -1,10 +1,15 @@  - + netfx-Windows_NT; + netcoreapp-Windows_NT; netstandard-Windows_NT; netstandard; + + + $(PackageConfigurations); + uap-Windows_NT; - \ No newline at end of file + \ No newline at end of file diff --git a/external/corefx/src/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj b/external/corefx/src/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj index 15b3bcf8c4..d159299881 100644 --- a/external/corefx/src/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj +++ b/external/corefx/src/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj @@ -4,32 +4,42 @@ System.IO.Pipes.AccessControl {40059634-BB03-4A6F-8657-CCE2D376BC8B} - true + false + true SR.PlatformNotSupported_AccessControl - true + true - + + - - - - - - + + + + + + + + - + - + + + + + + + \ No newline at end of file diff --git a/external/corefx/src/System.IO.Pipes/ref/System.IO.Pipes.cs b/external/corefx/src/System.IO.Pipes/ref/System.IO.Pipes.cs index 6e234afd8a..2b0142f143 100644 --- a/external/corefx/src/System.IO.Pipes/ref/System.IO.Pipes.cs +++ b/external/corefx/src/System.IO.Pipes/ref/System.IO.Pipes.cs @@ -90,6 +90,7 @@ namespace System.IO.Pipes public enum PipeOptions { Asynchronous = 1073741824, + CurrentUserOnly = 536870912, None = 0, WriteThrough = -2147483648, } diff --git a/external/corefx/src/System.IO.Pipes/src/MatchingRefApiCompatBaseline.txt b/external/corefx/src/System.IO.Pipes/src/MatchingRefApiCompatBaseline.txt new file mode 100644 index 0000000000..f9ce3480d6 --- /dev/null +++ b/external/corefx/src/System.IO.Pipes/src/MatchingRefApiCompatBaseline.txt @@ -0,0 +1,6 @@ +# Exposed public in System.IO.Pipes.AccessControl but implemented in System.IO.Pipes +TypesMustExist : Type 'System.IO.Pipes.PipeAccessRights' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.IO.Pipes.PipeAccessRule' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.IO.Pipes.PipeAuditRule' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.IO.Pipes.PipesAclExtensions' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.IO.Pipes.PipeSecurity' does not exist in the implementation but it does exist in the contract. diff --git a/external/corefx/src/System.IO.Pipes/src/Resources/Strings.resx b/external/corefx/src/System.IO.Pipes/src/Resources/Strings.resx index d9d9e05e7a..6b39e62d7f 100644 --- a/external/corefx/src/System.IO.Pipes/src/Resources/Strings.resx +++ b/external/corefx/src/System.IO.Pipes/src/Resources/Strings.resx @@ -120,12 +120,18 @@ Non negative number is required. + + Invalid PipeAccessRights value. + Offset and length were out of bounds for the array or count is greater than the number of elements from index to the end of the source collection. pipeName cannot be an empty string. + + This flag may not be set on a pipe. + serverName cannot be an empty string. Use \\\".\\\" for current machine. @@ -201,6 +207,9 @@ The file '{0}' already exists. + + Pipe is broken. + IO operation was aborted unexpectedly. @@ -258,8 +267,8 @@ Access to remote named pipes is not supported on this platform. - - The name of a pipe on this platform must only include characters valid in file names. + + The name of a pipe on this platform must be a valid file name or a valid absolute path to a file name. Cannot access a closed Stream. @@ -273,4 +282,10 @@ The path '{0}' is too long, or a component of the specified path is too long. + + Could not connect to the pipe because it was not owned by the current user. + + + Client connection (user id {0}) was refused because it was not owned by the current user (id {1}). + \ No newline at end of file diff --git a/external/corefx/src/System.IO.Pipes/src/System.IO.Pipes.csproj b/external/corefx/src/System.IO.Pipes/src/System.IO.Pipes.csproj index 9a83ec00fe..ed271aa461 100644 --- a/external/corefx/src/System.IO.Pipes/src/System.IO.Pipes.csproj +++ b/external/corefx/src/System.IO.Pipes/src/System.IO.Pipes.csproj @@ -7,6 +7,7 @@ true $(DefineConstants) true + true @@ -131,15 +132,20 @@ Common\Interop\Windows\Interop.ImpersonateNamedPipeClient.cs - - Common\System\IO\Win32Marshal.cs + + Common\CoreLib\System\IO\Win32Marshal.cs + + + + + @@ -203,7 +209,7 @@ Common\Interop\Unix\Interop.OpenFlags.cs - + Common\Interop\Unix\Interop.Permissions.cs @@ -254,8 +260,15 @@ + + + + + + + diff --git a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/AnonymousPipeServerStream.Unix.cs b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/AnonymousPipeServerStream.Unix.cs index 2ba5605ddc..0580eeb11b 100644 --- a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/AnonymousPipeServerStream.Unix.cs +++ b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/AnonymousPipeServerStream.Unix.cs @@ -30,7 +30,7 @@ namespace System.IO.Pipes // bufferSize is just advisory and ignored if platform does not support setting pipe capacity via fcntl. if (bufferSize > 0 && Interop.Sys.Fcntl.CanGetSetPipeSz) { - CheckPipeCall(Interop.Sys.Fcntl.SetPipeSz(serverHandle, bufferSize)); + Interop.Sys.Fcntl.SetPipeSz(serverHandle, bufferSize); // advisory, ignore errors } // We're connected. Finish initialization using the newly created handles. diff --git a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.Unix.cs b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.Unix.cs index bd609d2f0b..d15862dded 100644 --- a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.Unix.cs +++ b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.Unix.cs @@ -3,7 +3,9 @@ // See the LICENSE file in the project root for more information. using Microsoft.Win32.SafeHandles; +using System.ComponentModel; using System.Diagnostics.CodeAnalysis; +using System.Runtime.InteropServices; using System.Net.Sockets; using System.Security; using System.Threading; @@ -49,6 +51,17 @@ namespace System.IO.Pipes } } + try + { + ValidateRemotePipeUser(clientHandle); + } + catch (Exception) + { + clientHandle.Dispose(); + socket.Dispose(); + throw; + } + InitializeHandle(clientHandle, isExposed: false, isAsync: (_pipeOptions & PipeOptions.Asynchronous) != 0); State = PipeState.Connected; return true; @@ -84,6 +97,23 @@ namespace System.IO.Pipes } } + private void ValidateRemotePipeUser(SafePipeHandle handle) + { + if (!IsCurrentUserOnly) + return; + + uint userId = Interop.Sys.GetEUid(); + if (Interop.Sys.GetPeerID(handle, out uint serverOwner) == -1) + { + throw CreateExceptionForLastError(); + } + + if (userId != serverOwner) + { + throw new UnauthorizedAccessException(SR.UnauthorizedAccess_NotOwnedByCurrentUser); + } + } + // ----------------------------- // ---- PAL layer ends here ---- // ----------------------------- diff --git a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.Windows.cs b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.Windows.cs index 286e510eee..472d9a9ea7 100644 --- a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.Windows.cs +++ b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.Windows.cs @@ -2,12 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.Win32.SafeHandles; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -using System.Security; using System.Security.Principal; using System.Threading; +using Microsoft.Win32.SafeHandles; namespace System.IO.Pipes { @@ -25,7 +24,10 @@ namespace System.IO.Pipes { Interop.Kernel32.SECURITY_ATTRIBUTES secAttrs = PipeStream.GetSecAttrs(_inheritability); - int _pipeFlags = (int)_pipeOptions; + // PipeOptions.CurrentUserOnly is special since it doesn't match directly to a corresponding Win32 valid flag. + // Remove it, while keeping others untouched since historically this has been used as a way to pass flags to + // CreateNamedPipeClient that were not defined in the enumeration. + int _pipeFlags = (int)(_pipeOptions & ~PipeOptions.CurrentUserOnly); if (_impersonationLevel != TokenImpersonationLevel.None) { _pipeFlags |= Interop.Kernel32.SecurityOptions.SECURITY_SQOS_PRESENT; @@ -99,10 +101,10 @@ namespace System.IO.Pipes } } - // Success! + // Success! InitializeHandle(handle, false, (_pipeOptions & PipeOptions.Asynchronous) != 0); State = PipeState.Connected; - + ValidateRemotePipeUser(); return true; } @@ -129,6 +131,24 @@ namespace System.IO.Pipes } } + private void ValidateRemotePipeUser() + { + if (!IsCurrentUserOnly) + return; + + PipeSecurity accessControl = this.GetAccessControl(); + IdentityReference remoteOwnerSid = accessControl.GetOwner(typeof(SecurityIdentifier)); + using (WindowsIdentity currentIdentity = WindowsIdentity.GetCurrent()) + { + SecurityIdentifier currentUserSid = currentIdentity.Owner; + if (remoteOwnerSid != currentUserSid) + { + State = PipeState.Closed; + throw new UnauthorizedAccessException(SR.UnauthorizedAccess_NotOwnedByCurrentUser); + } + } + } + // ----------------------------- // ---- PAL layer ends here ---- // ----------------------------- diff --git a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.cs b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.cs index cb5bda0977..80767b60bb 100644 --- a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.cs +++ b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.cs @@ -7,6 +7,7 @@ using System.Security; using System.Security.Principal; using System.Threading; using System.Threading.Tasks; +using System.Diagnostics; namespace System.IO.Pipes { @@ -72,7 +73,7 @@ namespace System.IO.Pipes { throw new ArgumentException(SR.Argument_EmptyServerName); } - if ((options & ~(PipeOptions.WriteThrough | PipeOptions.Asynchronous)) != 0) + if ((options & ~(PipeOptions.WriteThrough | PipeOptions.Asynchronous | PipeOptions.CurrentUserOnly)) != 0) { throw new ArgumentOutOfRangeException(nameof(options), SR.ArgumentOutOfRange_OptionsInvalid); } @@ -84,6 +85,10 @@ namespace System.IO.Pipes { throw new ArgumentOutOfRangeException(nameof(inheritability), SR.ArgumentOutOfRange_HandleInheritabilityNoneOrInheritable); } + if ((options & PipeOptions.CurrentUserOnly) != 0) + { + IsCurrentUserOnly = true; + } _normalizedPipePath = GetPipePath(serverName, pipeName); _direction = direction; diff --git a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeServerStream.Unix.cs b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeServerStream.Unix.cs index e2e5b7a88f..c4d755a50c 100644 --- a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeServerStream.Unix.cs +++ b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeServerStream.Unix.cs @@ -41,7 +41,9 @@ namespace System.IO.Pipes // We don't have a good way to enforce maxNumberOfServerInstances across processes; we only factor it in // for streams created in this process. Between processes, we behave similarly to maxNumberOfServerInstances == 1, // in that the second process to come along and create a stream will find the pipe already in existence and will fail. - _instance = SharedServer.Get(GetPipePath(".", pipeName), maxNumberOfServerInstances); + _instance = SharedServer.Get( + GetPipePath(".", pipeName), + (maxNumberOfServerInstances == MaxAllowedServerInstances) ? int.MaxValue : maxNumberOfServerInstances); _direction = direction; _options = options; @@ -83,8 +85,25 @@ namespace System.IO.Pipes private void HandleAcceptedSocket(Socket acceptedSocket) { var serverHandle = new SafePipeHandle(acceptedSocket); + try { + if (IsCurrentUserOnly) + { + uint serverEUID = Interop.Sys.GetEUid(); + + uint peerID; + if (Interop.Sys.GetPeerID(serverHandle, out peerID) == -1) + { + throw CreateExceptionForLastError(_instance?.PipeName); + } + + if (serverEUID != peerID) + { + throw new UnauthorizedAccessException(string.Format(SR.UnauthorizedAccess_ClientIsNotCurrentUser, peerID, serverEUID)); + } + } + ConfigureSocket(acceptedSocket, serverHandle, _direction, _inBufferSize, _outBufferSize, _inheritability); } catch @@ -128,7 +147,7 @@ namespace System.IO.Pipes return name; } - throw CreateExceptionForLastError(); + throw CreateExceptionForLastError(_instance?.PipeName); } public override int InBufferSize @@ -171,13 +190,13 @@ namespace System.IO.Pipes uint peerID; if (Interop.Sys.GetPeerID(handle, out peerID) == -1) { - throw CreateExceptionForLastError(); + throw CreateExceptionForLastError(_instance?.PipeName); } // set the effective userid of the current (server) process to the clientid if (Interop.Sys.SetEUid(peerID) == -1) { - throw CreateExceptionForLastError(); + throw CreateExceptionForLastError(_instance?.PipeName); } try @@ -191,14 +210,6 @@ namespace System.IO.Pipes } } - private Exception CreateExceptionForLastError() - { - Interop.ErrorInfo error = Interop.Sys.GetLastErrorInfo(); - return error.Error == Interop.Error.ENOTSUP ? - new PlatformNotSupportedException(SR.Format(SR.PlatformNotSupported_OperatingSystemError, nameof(Interop.Error.ENOTSUP))) : - Interop.GetExceptionForIoErrno(error, _instance?.PipeName); - } - /// Shared resources for NamedPipeServerStreams in the same process created for the same path. private sealed class SharedServer { diff --git a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeServerStream.Windows.cs b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeServerStream.Windows.cs index 5f8fe4215d..4a418aca5e 100644 --- a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeServerStream.Windows.cs +++ b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeServerStream.Windows.cs @@ -2,16 +2,16 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.Win32.SafeHandles; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; -using System.Runtime.InteropServices; using System.Runtime.CompilerServices; -using System.Security; -using System.Security.Permissions; +using System.Runtime.InteropServices; +using System.Security.AccessControl; +using System.Security.Principal; using System.Text; using System.Threading; using System.Threading.Tasks; +using Microsoft.Win32.SafeHandles; namespace System.IO.Pipes { @@ -39,6 +39,28 @@ namespace System.IO.Pipes throw new ArgumentOutOfRangeException(nameof(pipeName), SR.ArgumentOutOfRange_AnonymousReserved); } + PipeSecurity pipeSecurity = null; + + if (IsCurrentUserOnly) + { + using (WindowsIdentity currentIdentity = WindowsIdentity.GetCurrent()) + { + SecurityIdentifier identifier = currentIdentity.Owner; + + // Grant full control to the owner so multiple servers can be opened. + // Full control is the default per MSDN docs for CreateNamedPipe. + PipeAccessRule rule = new PipeAccessRule(identifier, PipeAccessRights.FullControl, AccessControlType.Allow); + pipeSecurity = new PipeSecurity(); + + pipeSecurity.AddAccessRule(rule); + pipeSecurity.SetOwner(identifier); + } + + // PipeOptions.CurrentUserOnly is special since it doesn't match directly to a corresponding Win32 valid flag. + // Remove it, while keeping others untouched since historically this has been used as a way to pass flags to CreateNamedPipe + // that were not defined in the enumeration. + options &= ~PipeOptions.CurrentUserOnly; + } int openMode = ((int)direction) | (maxNumberOfServerInstances == 1 ? Interop.Kernel32.FileOperations.FILE_FLAG_FIRST_PIPE_INSTANCE : 0) | @@ -53,16 +75,27 @@ namespace System.IO.Pipes maxNumberOfServerInstances = 255; } - Interop.Kernel32.SECURITY_ATTRIBUTES secAttrs = PipeStream.GetSecAttrs(inheritability); - SafePipeHandle handle = Interop.Kernel32.CreateNamedPipe(fullPipeName, openMode, pipeModes, - maxNumberOfServerInstances, outBufferSize, inBufferSize, 0, ref secAttrs); - - if (handle.IsInvalid) + var pinningHandle = new GCHandle(); + try { - throw Win32Marshal.GetExceptionForLastWin32Error(); - } + Interop.Kernel32.SECURITY_ATTRIBUTES secAttrs = PipeStream.GetSecAttrs(inheritability, pipeSecurity, ref pinningHandle); + SafePipeHandle handle = Interop.Kernel32.CreateNamedPipe(fullPipeName, openMode, pipeModes, + maxNumberOfServerInstances, outBufferSize, inBufferSize, 0, ref secAttrs); - InitializeHandle(handle, false, (options & PipeOptions.Asynchronous) != 0); + if (handle.IsInvalid) + { + throw Win32Marshal.GetExceptionForLastWin32Error(); + } + + InitializeHandle(handle, false, (options & PipeOptions.Asynchronous) != 0); + } + finally + { + if (pinningHandle.IsAllocated) + { + pinningHandle.Free(); + } + } } // This will wait until the client calls Connect(). If we return from this method, we guarantee that diff --git a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeServerStream.cs b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeServerStream.cs index 28476c4d77..32c867a942 100644 --- a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeServerStream.cs +++ b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeServerStream.cs @@ -7,6 +7,7 @@ using System.Diagnostics.CodeAnalysis; using System.Security; using System.Threading; using System.Threading.Tasks; +using System.Diagnostics; namespace System.IO.Pipes { @@ -88,7 +89,7 @@ namespace System.IO.Pipes { throw new ArgumentException(SR.Argument_NeedNonemptyPipeName); } - if ((options & ~(PipeOptions.WriteThrough | PipeOptions.Asynchronous)) != 0) + if ((options & ~(PipeOptions.WriteThrough | PipeOptions.Asynchronous | PipeOptions.CurrentUserOnly)) != 0) { throw new ArgumentOutOfRangeException(nameof(options), SR.ArgumentOutOfRange_OptionsInvalid); } @@ -112,8 +113,13 @@ namespace System.IO.Pipes throw new ArgumentOutOfRangeException(nameof(inheritability), SR.ArgumentOutOfRange_HandleInheritabilityNoneOrInheritable); } + if ((options & PipeOptions.CurrentUserOnly) != 0) + { + IsCurrentUserOnly = true; + } + Create(pipeName, direction, maxNumberOfServerInstances, transmissionMode, - options, inBufferSize, outBufferSize, inheritability); + options, inBufferSize, outBufferSize, inheritability); } // Create a NamedPipeServerStream from an existing server pipe handle. diff --git a/external/corefx/src/System.IO.Pipes.AccessControl/src/System/IO/PipeAccessRights.cs b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeAccessRights.cs similarity index 100% rename from external/corefx/src/System.IO.Pipes.AccessControl/src/System/IO/PipeAccessRights.cs rename to external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeAccessRights.cs diff --git a/external/corefx/src/System.IO.Pipes.AccessControl/src/System/IO/PipeAccessRule.cs b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeAccessRule.cs similarity index 100% rename from external/corefx/src/System.IO.Pipes.AccessControl/src/System/IO/PipeAccessRule.cs rename to external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeAccessRule.cs diff --git a/external/corefx/src/System.IO.Pipes.AccessControl/src/System/IO/PipeAuditRule.cs b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeAuditRule.cs similarity index 100% rename from external/corefx/src/System.IO.Pipes.AccessControl/src/System/IO/PipeAuditRule.cs rename to external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeAuditRule.cs diff --git a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeCompletionSource.cs b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeCompletionSource.cs index c0d462cd4a..ab7fd35d1b 100644 --- a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeCompletionSource.cs +++ b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeCompletionSource.cs @@ -40,7 +40,7 @@ namespace System.IO.Pipes _threadPoolBinding = handle; _state = NoResult; - _pinnedMemory = bufferToPin.Retain(pin: true); + _pinnedMemory = bufferToPin.Pin(); _overlapped = _threadPoolBinding.AllocateNativeOverlapped((errorCode, numBytes, pOverlapped) => { var completionSource = (PipeCompletionSource)ThreadPoolBoundHandle.GetNativeOverlappedState(pOverlapped); diff --git a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeOptions.cs b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeOptions.cs index 4a36fda29b..6dc1e802ba 100644 --- a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeOptions.cs +++ b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeOptions.cs @@ -10,5 +10,6 @@ namespace System.IO.Pipes None = 0x0, WriteThrough = unchecked((int)0x80000000), Asynchronous = unchecked((int)0x40000000), // corresponds to FILE_FLAG_OVERLAPPED + CurrentUserOnly = unchecked((int)0x20000000) } } diff --git a/external/corefx/src/System.IO.Pipes.AccessControl/src/System/IO/PipeSecurity.cs b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeSecurity.cs similarity index 100% rename from external/corefx/src/System.IO.Pipes.AccessControl/src/System/IO/PipeSecurity.cs rename to external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeSecurity.cs diff --git a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Unix.cs b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Unix.cs index 1f4d2a9e26..0c001c710a 100644 --- a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Unix.cs +++ b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Unix.cs @@ -8,6 +8,7 @@ using System.Diagnostics.CodeAnalysis; using System.Net.Sockets; using System.Runtime.InteropServices; using System.Security; +using System.IO; using System.Threading; using System.Threading.Tasks; @@ -25,6 +26,9 @@ namespace System.IO.Pipes /// Characters that can't be used in a pipe's name. private static readonly char[] s_invalidFileNameChars = Path.GetInvalidFileNameChars(); + /// Characters that can't be used in an absolute path pipe's name. + private static readonly char[] s_invalidPathNameChars = Path.GetInvalidPathChars(); + /// Prefix to prepend to all pipe names. private static readonly string s_pipePrefix = Path.Combine(Path.GetTempPath(), "CoreFxPipe_"); @@ -42,16 +46,27 @@ namespace System.IO.Pipes throw new ArgumentOutOfRangeException(nameof(pipeName), SR.ArgumentOutOfRange_AnonymousReserved); } - if (pipeName.IndexOfAny(s_invalidFileNameChars) >= 0) + // Since pipes are stored as files in the system we support either an absolute path to a file name + // or a file name. The support of absolute path was added to allow working around the limited + // length available for the pipe name when concatenated with the temp path, while being + // cross-platform with Windows (which has only '\' as an invalid char). + if (Path.IsPathRooted(pipeName)) { - // Since pipes are stored as files in the file system, we don't support - // pipe names that are actually paths or that otherwise have invalid - // filename characters in them. - throw new PlatformNotSupportedException(SR.PlatformNotSupproted_InvalidNameChars); + if (pipeName.IndexOfAny(s_invalidPathNameChars) >= 0 || pipeName[pipeName.Length - 1] == Path.DirectorySeparatorChar) + throw new PlatformNotSupportedException(SR.PlatformNotSupported_InvalidPipeNameChars); + + // Caller is in full control of file location. + return pipeName; } - // Return the pipe path. The pipe is created directly under %TMPDIR%. We previously - // didn't put it into a subdirectory because it only existed on disk for the duration + if (pipeName.IndexOfAny(s_invalidFileNameChars) >= 0) + { + throw new PlatformNotSupportedException(SR.PlatformNotSupported_InvalidPipeNameChars); + } + + // The pipe is created directly under Path.GetTempPath() with "CoreFXPipe_" prefix. + // + // We previously didn't put it into a subdirectory because it only existed on disk for the duration // between when the server started listening in WaitForConnection and when the client // connected, after which the pipe was deleted. We now create the pipe when the // server stream is created, which leaves it on disk longer, but we can't change the @@ -205,7 +220,7 @@ namespace System.IO.Pipes } // Issue the asynchronous read. - return await (destination.TryGetArray(out ArraySegment buffer) ? + return await (MemoryMarshal.TryGetArray(destination, out ArraySegment buffer) ? socket.ReceiveAsync(buffer, SocketFlags.None) : socket.ReceiveAsync(destination.ToArray(), SocketFlags.None)).ConfigureAwait(false); } @@ -364,12 +379,14 @@ namespace System.IO.Pipes /// semaphore. Since we don't delegate to the base stream for Read/WriteAsync due /// to having specialized support for cancellation, we do the same serialization here. /// +#if !MONO private SemaphoreSlim _asyncActiveSemaphore; private SemaphoreSlim EnsureAsyncActiveSemaphoreInitialized() { return LazyInitializer.EnsureInitialized(ref _asyncActiveSemaphore, () => new SemaphoreSlim(1, 1)); } +#endif private static void CreateDirectory(string directoryPath) { @@ -473,5 +490,13 @@ namespace System.IO.Pipes break; } } + + internal static Exception CreateExceptionForLastError(string pipeName = null) + { + Interop.ErrorInfo error = Interop.Sys.GetLastErrorInfo(); + return error.Error == Interop.Error.ENOTSUP ? + new PlatformNotSupportedException(SR.Format(SR.PlatformNotSupported_OperatingSystemError, nameof(Interop.Error.ENOTSUP))) : + Interop.GetExceptionForIoErrno(error, pipeName); + } } } diff --git a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Windows.cs b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Windows.cs index 7f5e654bc8..fdcaa423ff 100644 --- a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Windows.cs +++ b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Windows.cs @@ -5,7 +5,7 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -using System.Security; +using System.Security.Principal; using System.Threading; using System.Threading.Tasks; using Microsoft.Win32.SafeHandles; @@ -412,6 +412,31 @@ namespace System.IO.Pipes return secAttrs; } + internal static unsafe Interop.Kernel32.SECURITY_ATTRIBUTES GetSecAttrs(HandleInheritability inheritability, PipeSecurity pipeSecurity, ref GCHandle pinningHandle) + { + Interop.Kernel32.SECURITY_ATTRIBUTES secAttrs = default(Interop.Kernel32.SECURITY_ATTRIBUTES); + secAttrs.nLength = (uint)sizeof(Interop.Kernel32.SECURITY_ATTRIBUTES); + + if ((inheritability & HandleInheritability.Inheritable) != 0) + { + secAttrs.bInheritHandle = Interop.BOOL.TRUE; + } + + if (pipeSecurity != null) + { + byte[] securityDescriptor = pipeSecurity.GetSecurityDescriptorBinaryForm(); + pinningHandle = GCHandle.Alloc(securityDescriptor, GCHandleType.Pinned); + fixed (byte* pSecurityDescriptor = securityDescriptor) + { + secAttrs.lpSecurityDescriptor = (IntPtr)pSecurityDescriptor; + } + } + + return secAttrs; + } + + + /// /// Determine pipe read mode from Win32 /// diff --git a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeStream.cs b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeStream.cs index 74fe15ed63..f4c0339dc4 100644 --- a/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeStream.cs +++ b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeStream.cs @@ -20,6 +20,7 @@ namespace System.IO.Pipes private bool _canRead; private bool _canWrite; private bool _isAsync; + private bool _isCurrentUserOnly; private bool _isMessageComplete; private bool _isFromExistingHandle; private bool _isHandleExposed; @@ -125,11 +126,11 @@ namespace System.IO.Pipes return ReadCore(new Span(buffer, offset, count)); } - public override int Read(Span destination) + public override int Read(Span buffer) { if (_isAsync) { - return base.Read(destination); + return base.Read(buffer); } if (!CanRead) @@ -138,7 +139,7 @@ namespace System.IO.Pipes } CheckReadOperations(); - return ReadCore(destination); + return ReadCore(buffer); } public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) @@ -170,11 +171,11 @@ namespace System.IO.Pipes return ReadAsyncCore(new Memory(buffer, offset, count), cancellationToken); } - public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default(CancellationToken)) + public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default(CancellationToken)) { if (!_isAsync) { - return base.ReadAsync(destination, cancellationToken); + return base.ReadAsync(buffer, cancellationToken); } if (!CanRead) @@ -189,13 +190,13 @@ namespace System.IO.Pipes CheckReadOperations(); - if (destination.Length == 0) + if (buffer.Length == 0) { UpdateMessageCompletion(false); return new ValueTask(0); } - return new ValueTask(ReadAsyncCore(destination, cancellationToken)); + return new ValueTask(ReadAsyncCore(buffer, cancellationToken)); } public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) @@ -232,11 +233,11 @@ namespace System.IO.Pipes WriteCore(new ReadOnlySpan(buffer, offset, count)); } - public override void Write(ReadOnlySpan source) + public override void Write(ReadOnlySpan buffer) { if (_isAsync) { - base.Write(source); + base.Write(buffer); return; } @@ -246,7 +247,7 @@ namespace System.IO.Pipes } CheckWriteOperations(); - WriteCore(source); + WriteCore(buffer); } public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) @@ -277,11 +278,11 @@ namespace System.IO.Pipes return WriteAsyncCore(new ReadOnlyMemory(buffer, offset, count), cancellationToken); } - public override Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default(CancellationToken)) + public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken = default(CancellationToken)) { if (!_isAsync) { - return base.WriteAsync(source, cancellationToken); + return base.WriteAsync(buffer, cancellationToken); } if (!CanWrite) @@ -291,17 +292,17 @@ namespace System.IO.Pipes if (cancellationToken.IsCancellationRequested) { - return Task.FromCanceled(cancellationToken); + return new ValueTask(Task.FromCanceled(cancellationToken)); } CheckWriteOperations(); - if (source.Length == 0) + if (buffer.Length == 0) { - return Task.CompletedTask; + return default; } - return WriteAsyncCore(source, cancellationToken); + return new ValueTask(WriteAsyncCore(buffer, cancellationToken)); } public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) @@ -630,5 +631,17 @@ namespace System.IO.Pipes _state = value; } } + + internal bool IsCurrentUserOnly + { + get + { + return _isCurrentUserOnly; + } + set + { + _isCurrentUserOnly = value; + } + } } } diff --git a/external/corefx/src/System.IO.Pipes.AccessControl/src/System/IO/PipesAclExtensions.cs b/external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipesAclExtensions.cs similarity index 100% rename from external/corefx/src/System.IO.Pipes.AccessControl/src/System/IO/PipesAclExtensions.cs rename to external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipesAclExtensions.cs diff --git a/external/corefx/src/System.IO.Pipes/tests/AnonymousPipeTests/AnonymousPipeTest.CrossProcess.cs b/external/corefx/src/System.IO.Pipes/tests/AnonymousPipeTests/AnonymousPipeTest.CrossProcess.cs index c07b10c625..a57347c99e 100644 --- a/external/corefx/src/System.IO.Pipes/tests/AnonymousPipeTests/AnonymousPipeTest.CrossProcess.cs +++ b/external/corefx/src/System.IO.Pipes/tests/AnonymousPipeTests/AnonymousPipeTest.CrossProcess.cs @@ -17,7 +17,7 @@ namespace System.IO.Pipes.Tests // Then spawn another process to communicate with. using (var outbound = new AnonymousPipeServerStream(PipeDirection.Out, HandleInheritability.Inheritable)) using (var inbound = new AnonymousPipeServerStream(PipeDirection.In, HandleInheritability.Inheritable)) - using (var remote = RemoteInvoke(PingPong_OtherProcess, outbound.GetClientHandleAsString(), inbound.GetClientHandleAsString())) + using (var remote = RemoteInvoke(new Func(PingPong_OtherProcess), outbound.GetClientHandleAsString(), inbound.GetClientHandleAsString())) { // Close our local copies of the handles now that we've passed them of to the other process outbound.DisposeLocalCopyOfClientHandle(); diff --git a/external/corefx/src/System.IO.Pipes/tests/AnonymousPipeTests/AnonymousPipeTest.Specific.cs b/external/corefx/src/System.IO.Pipes/tests/AnonymousPipeTests/AnonymousPipeTest.Specific.cs index 2006587e71..00d0478a32 100644 --- a/external/corefx/src/System.IO.Pipes/tests/AnonymousPipeTests/AnonymousPipeTest.Specific.cs +++ b/external/corefx/src/System.IO.Pipes/tests/AnonymousPipeTests/AnonymousPipeTest.Specific.cs @@ -86,9 +86,10 @@ namespace System.IO.Pipes.Tests // On Linux, setting the buffer size of the server will also set the buffer size of the // client, regardless of the direction of the flow - int desiredBufferSize; - using (var server = new AnonymousPipeServerStream(PipeDirection.Out)) + int desiredBufferSize = 4096; + using (var server = new AnonymousPipeServerStream(PipeDirection.Out, HandleInheritability.None, desiredBufferSize)) { + Assert.Equal(desiredBufferSize, server.OutBufferSize); desiredBufferSize = server.OutBufferSize * 2; Assert.True(desiredBufferSize > 0); } diff --git a/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.CreateClient.cs b/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.CreateClient.cs index 98293f9c65..3eaff2f4d5 100644 --- a/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.CreateClient.cs +++ b/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.CreateClient.cs @@ -75,6 +75,10 @@ namespace System.IO.Pipes.Tests Assert.Throws(() => new NamedPipeClientStream("foobar" + hostName, "foobar")); Assert.Throws(() => new NamedPipeClientStream(hostName, "foobar" + Path.GetInvalidFileNameChars()[0])); + Assert.Throws(() => new NamedPipeClientStream(hostName, "/tmp/foo\0bar")); + Assert.Throws(() => new NamedPipeClientStream(hostName, "/tmp/foobar/")); + Assert.Throws(() => new NamedPipeClientStream(hostName, "/")); + Assert.Throws(() => new NamedPipeClientStream(hostName, "\0")); } [Theory] diff --git a/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.CrossProcess.cs b/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.CrossProcess.cs index 482d5f5910..bb3455b57b 100644 --- a/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.CrossProcess.cs +++ b/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.CrossProcess.cs @@ -22,7 +22,7 @@ namespace System.IO.Pipes.Tests // another process with which to communicate using (var outbound = new NamedPipeServerStream(outName, PipeDirection.Out)) using (var inbound = new NamedPipeClientStream(".", inName, PipeDirection.In)) - using (RemoteInvoke(PingPong_OtherProcess, outName, inName)) + using (RemoteInvoke(new Func(PingPong_OtherProcess), outName, inName)) { // Wait for both pipes to be connected Task.WaitAll(outbound.WaitForConnectionAsync(), inbound.ConnectAsync()); @@ -48,7 +48,7 @@ namespace System.IO.Pipes.Tests // another process with which to communicate using (var outbound = new NamedPipeServerStream(outName, PipeDirection.Out)) using (var inbound = new NamedPipeClientStream(".", inName, PipeDirection.In)) - using (RemoteInvoke(PingPong_OtherProcess, outName, inName)) + using (RemoteInvoke(new Func(PingPong_OtherProcess), outName, inName)) { // Wait for both pipes to be connected await Task.WhenAll(outbound.WaitForConnectionAsync(), inbound.ConnectAsync()); diff --git a/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.CurrentUserOnly.netcoreapp.Unix.cs b/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.CurrentUserOnly.netcoreapp.Unix.cs new file mode 100644 index 0000000000..efe976c974 --- /dev/null +++ b/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.CurrentUserOnly.netcoreapp.Unix.cs @@ -0,0 +1,65 @@ +// 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.Threading; +using System.Threading.Tasks; +using Xunit; +using Xunit.NetCore.Extensions; + +namespace System.IO.Pipes.Tests +{ + /// + /// Negative tests for PipeOptions.CurrentUserOnly in Unix. + /// + public class NamedPipeTest_CurrentUserOnly_Unix : RemoteExecutorTestBase + { + [Theory] + [OuterLoop("Needs sudo access")] + [Trait(XunitConstants.Category, XunitConstants.RequiresElevation)] + [InlineData(PipeOptions.None, PipeOptions.None)] + [InlineData(PipeOptions.None, PipeOptions.CurrentUserOnly)] + [InlineData(PipeOptions.CurrentUserOnly, PipeOptions.None)] + [InlineData(PipeOptions.CurrentUserOnly, PipeOptions.CurrentUserOnly)] + public async Task Connection_UnderDifferentUsers_BehavesAsExpected( + PipeOptions serverPipeOptions, PipeOptions clientPipeOptions) + { + // Use an absolute path, otherwise, the test can fail if the remote invoker and test runner have + // different working and/or temp directories. + string pipeName = "/tmp/" + Path.GetRandomFileName(); + using (var server = new NamedPipeServerStream( + pipeName, PipeDirection.InOut, 1, PipeTransmissionMode.Byte, serverPipeOptions | PipeOptions.Asynchronous)) + { + Task serverTask = server.WaitForConnectionAsync(CancellationToken.None); + + using (RemoteInvoke( + new Func(ConnectClientFromRemoteInvoker), + pipeName, + clientPipeOptions == PipeOptions.CurrentUserOnly ? "true" : "false", + new RemoteInvokeOptions { RunAsSudo = true })) + { + } + + if (serverPipeOptions == PipeOptions.CurrentUserOnly) + await Assert.ThrowsAsync(() => serverTask); + else + await serverTask; + } + } + + private static int ConnectClientFromRemoteInvoker(string pipeName, string isCurrentUserOnly) + { + PipeOptions pipeOptions = bool.Parse(isCurrentUserOnly) ? PipeOptions.CurrentUserOnly : PipeOptions.None; + using (var client = new NamedPipeClientStream(".", pipeName, PipeDirection.InOut, pipeOptions)) + { + if (pipeOptions == PipeOptions.CurrentUserOnly) + Assert.Throws(() => client.Connect()); + else + client.Connect(); + } + + return SuccessExitCode; + } + } +} diff --git a/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.CurrentUserOnly.netcoreapp.Windows.cs b/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.CurrentUserOnly.netcoreapp.Windows.cs new file mode 100644 index 0000000000..175cbb3d25 --- /dev/null +++ b/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.CurrentUserOnly.netcoreapp.Windows.cs @@ -0,0 +1,190 @@ +// 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 Microsoft.Win32.SafeHandles; +using System.ComponentModel; +using System.DirectoryServices.AccountManagement; +using System.Runtime.InteropServices; +using System.Security.Cryptography; +using System.Security.Principal; +using System.Threading; +using System.Threading.Tasks; +using Xunit; + +namespace System.IO.Pipes.Tests +{ + // Class to be used as xUnit fixture to avoid creating the user, an relatively slow operation (couple of seconds), multiple times. + public class TestAccountImpersonator : IDisposable + { + private const string TestAccountName = "CorFxTst0uZa"; // Random suffix to avoid matching any other account by accident, but const to avoid leaking it. + private SafeAccessTokenHandle _testAccountTokenHandle; + + public TestAccountImpersonator() + { + string testAccountPassword; + using (RandomNumberGenerator rng = new RNGCryptoServiceProvider()) + { + var randomBytes = new byte[33]; + rng.GetBytes(randomBytes); + + // Add special chars to ensure it satisfies password requirements. + testAccountPassword = Convert.ToBase64String(randomBytes) + "_-As@!%*(1)4#2"; + } + + DateTime accountExpirationDate = DateTime.UtcNow + TimeSpan.FromMinutes(2); + using (var principalCtx = new PrincipalContext(ContextType.Machine)) + { + bool needToCreate = false; + using (var foundUserPrincipal = UserPrincipal.FindByIdentity(principalCtx, TestAccountName)) + { + if (foundUserPrincipal == null) + { + needToCreate = true; + } + else + { + // Somehow the account leaked from previous runs, however, password is lost, reset it. + foundUserPrincipal.SetPassword(testAccountPassword); + foundUserPrincipal.AccountExpirationDate = accountExpirationDate; + foundUserPrincipal.Save(); + } + } + + if (needToCreate) + { + using (var userPrincipal = new UserPrincipal(principalCtx)) + { + userPrincipal.SetPassword(testAccountPassword); + userPrincipal.AccountExpirationDate = accountExpirationDate; + userPrincipal.Name = TestAccountName; + userPrincipal.DisplayName = TestAccountName; + userPrincipal.Description = TestAccountName; + userPrincipal.Save(); + } + } + } + + const int LOGON32_PROVIDER_DEFAULT = 0; + const int LOGON32_LOGON_INTERACTIVE = 2; + + if (!LogonUser(TestAccountName, ".", testAccountPassword, LOGON32_LOGON_INTERACTIVE, LOGON32_PROVIDER_DEFAULT, out _testAccountTokenHandle)) + { + _testAccountTokenHandle = null; + throw new Exception($"Failed to get SafeAccessTokenHandle for test account {TestAccountName}", new Win32Exception()); + } + } + + public void Dispose() + { + if (_testAccountTokenHandle == null) + return; + + _testAccountTokenHandle.Dispose(); + _testAccountTokenHandle = null; + + using (var principalCtx = new PrincipalContext(ContextType.Machine)) + using (var userPrincipal = UserPrincipal.FindByIdentity(principalCtx, TestAccountName)) + { + if (userPrincipal == null) + throw new Exception($"Failed to get user principal to delete test account {TestAccountName}"); + + try + { + userPrincipal.Delete(); + } + catch (InvalidOperationException) + { + // TODO: Investigate, it always throw this exception with "Can't delete object already deleted", but it actually deletes it. + } + } + } + + // This method asserts if it impersonates the current identity, i.e.: it ensures that an actual impersonation happens + public void RunImpersonated(Action action) + { + using (WindowsIdentity serverIdentity = WindowsIdentity.GetCurrent()) + { + WindowsIdentity.RunImpersonated(_testAccountTokenHandle, () => + { + using (WindowsIdentity clientIdentity = WindowsIdentity.GetCurrent()) + Assert.NotEqual(serverIdentity.Name, clientIdentity.Name); + + action(); + }); + } + } + + [DllImport("advapi32.dll", SetLastError = true, CharSet = CharSet.Unicode)] + private static extern bool LogonUser(string userName, string domain, string password, int logonType, int logonProvider, out SafeAccessTokenHandle safeAccessTokenHandle); + } + + /// + /// Negative tests for PipeOptions.CurrentUserOnly in Windows. + /// + public class NamedPipeTest_CurrentUserOnly_Windows : NamedPipeTestBase, IClassFixture + { + public static bool IsAdminOnSupportedWindowsVersions => PlatformDetection.IsWindowsAndElevated + && !PlatformDetection.IsWindows7 + && !PlatformDetection.IsWindowsNanoServer; + + private TestAccountImpersonator _testAccountImpersonator; + + public NamedPipeTest_CurrentUserOnly_Windows(TestAccountImpersonator testAccountImpersonator) + { + _testAccountImpersonator = testAccountImpersonator; + } + + [OuterLoop] + [ConditionalTheory(nameof(IsAdminOnSupportedWindowsVersions))] + [InlineData(PipeOptions.None, PipeOptions.None)] + [InlineData(PipeOptions.None, PipeOptions.CurrentUserOnly)] + [InlineData(PipeOptions.CurrentUserOnly, PipeOptions.None)] + [InlineData(PipeOptions.CurrentUserOnly, PipeOptions.CurrentUserOnly)] + public void Connection_UnderDifferentUsers_BehavesAsExpected( + PipeOptions serverPipeOptions, PipeOptions clientPipeOptions) + { + string name = GetUniquePipeName(); + using (var cts = new CancellationTokenSource()) + using (var server = new NamedPipeServerStream(name, PipeDirection.InOut, 1, PipeTransmissionMode.Byte, serverPipeOptions | PipeOptions.Asynchronous)) + { + Task serverTask = server.WaitForConnectionAsync(cts.Token); + + _testAccountImpersonator.RunImpersonated(() => + { + using (var client = new NamedPipeClientStream(".", name, PipeDirection.InOut, clientPipeOptions)) + { + Assert.Throws(() => client.Connect()); + } + }); + + // Server is expected to not have received any request. + cts.Cancel(); + AggregateException e = Assert.Throws(() => serverTask.Wait(10_000)); + Assert.IsType(typeof(TaskCanceledException), e.InnerException); + } + } + + [OuterLoop] + [ConditionalFact(nameof(IsAdminOnSupportedWindowsVersions))] + public void Allow_Connection_UnderDifferentUsers_ForClientReading() + { + string name = GetUniquePipeName(); + using (var server = new NamedPipeServerStream( + name, PipeDirection.InOut, 1, PipeTransmissionMode.Byte, PipeOptions.Asynchronous)) + { + Task serverTask = server.WaitForConnectionAsync(CancellationToken.None); + + _testAccountImpersonator.RunImpersonated(() => + { + using (var client = new NamedPipeClientStream(".", name, PipeDirection.In)) + { + client.Connect(10_000); + } + }); + + Assert.True(serverTask.Wait(10_000)); + } + } + } +} diff --git a/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.CurrentUserOnly.netcoreapp.cs b/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.CurrentUserOnly.netcoreapp.cs new file mode 100644 index 0000000000..08b9836b18 --- /dev/null +++ b/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.CurrentUserOnly.netcoreapp.cs @@ -0,0 +1,154 @@ +// 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.Collections.Generic; +using System.Threading.Tasks; +using Xunit; + +namespace System.IO.Pipes.Tests +{ + /// + /// Tests for the constructors for NamedPipeClientStream + /// + public class NamedPipeTest_CurrentUserOnly : NamedPipeTestBase + { + [Fact] + public static void CreateClient_CurrentUserOnly() + { + // Should not throw. + new NamedPipeClientStream(".", GetUniquePipeName(), PipeDirection.InOut, PipeOptions.CurrentUserOnly).Dispose(); + } + + [Fact] + public static void CreateServer_CurrentUserOnly() + { + // Should not throw. + new NamedPipeServerStream(GetUniquePipeName(), PipeDirection.InOut, 2, PipeTransmissionMode.Byte, PipeOptions.CurrentUserOnly).Dispose(); + } + + [Fact] + public static void CreateServer_ConnectClient() + { + string name = GetUniquePipeName(); + using (var server = new NamedPipeServerStream(name, PipeDirection.InOut, 1, PipeTransmissionMode.Byte, PipeOptions.CurrentUserOnly)) + { + using (var client = new NamedPipeClientStream(".", name, PipeDirection.InOut, PipeOptions.CurrentUserOnly)) + { + // Should not fail to connect since both, the server and client have the same owner. + client.Connect(); + } + } + } + + [Fact] + public static void CreateServer_ConnectClient_UsingUnixAbsolutePath() + { + string name = Path.Combine("/tmp", GetUniquePipeName()); + using (var server = new NamedPipeServerStream(name, PipeDirection.InOut, 1, PipeTransmissionMode.Byte, PipeOptions.CurrentUserOnly)) + { + using (var client = new NamedPipeClientStream(".", name, PipeDirection.InOut, PipeOptions.CurrentUserOnly)) + { + client.Connect(); + } + } + } + + [Theory] + [InlineData(PipeOptions.None, PipeOptions.CurrentUserOnly)] + [InlineData(PipeOptions.CurrentUserOnly, PipeOptions.None)] + public static void Connection_UnderSameUser_SingleSide_CurrentUserOnly_Works(PipeOptions serverPipeOptions, PipeOptions clientPipeOptions) + { + string name = GetUniquePipeName(); + using (var server = new NamedPipeServerStream(name, PipeDirection.InOut, 1, PipeTransmissionMode.Byte, serverPipeOptions)) + using (var client = new NamedPipeClientStream(".", name, PipeDirection.InOut, clientPipeOptions)) + { + Task[] tasks = new[] + { + Task.Run(() => server.WaitForConnection()), + Task.Run(() => client.Connect()) + }; + + Assert.True(Task.WaitAll(tasks, 20_000)); + } + } + + [Fact] + public static void CreateMultipleServers_ConnectMultipleClients() + { + string name1 = GetUniquePipeName(); + string name2 = GetUniquePipeName(); + string name3 = GetUniquePipeName(); + using (var server1 = new NamedPipeServerStream(name1, PipeDirection.InOut, 1, PipeTransmissionMode.Byte, PipeOptions.CurrentUserOnly)) + using (var server2 = new NamedPipeServerStream(name2, PipeDirection.InOut, 1, PipeTransmissionMode.Byte, PipeOptions.CurrentUserOnly)) + using (var server3 = new NamedPipeServerStream(name3, PipeDirection.InOut, 1, PipeTransmissionMode.Byte, PipeOptions.CurrentUserOnly)) + { + using (var client1 = new NamedPipeClientStream(".", name1, PipeDirection.InOut, PipeOptions.CurrentUserOnly)) + using (var client2 = new NamedPipeClientStream(".", name2, PipeDirection.InOut, PipeOptions.CurrentUserOnly)) + using (var client3 = new NamedPipeClientStream(".", name3, PipeDirection.InOut, PipeOptions.CurrentUserOnly)) + { + client1.Connect(); + client2.Connect(); + client3.Connect(); + } + } + } + + [Fact] + public static void CreateMultipleServers_ConnectMultipleClients_MultipleThreads() + { + List tasks = new List(); + for (int i = 0; i < 3; i++) + { + tasks.Add(Task.Run(() => + { + var name = GetUniquePipeName(); + using (var server = new NamedPipeServerStream(name, PipeDirection.InOut, 1, PipeTransmissionMode.Byte, PipeOptions.CurrentUserOnly)) + { + using (var client = new NamedPipeClientStream(".", name, PipeDirection.InOut, PipeOptions.CurrentUserOnly)) + { + // Should not fail to connect since both, the server and client have the same owner. + client.Connect(); + } + } + })); + } + + Task.WaitAll(tasks.ToArray()); + } + + [Theory] + [InlineData(PipeOptions.CurrentUserOnly)] + [InlineData(PipeOptions.None)] + public static void CreateMultipleConcurrentServers_ConnectMultipleClients(PipeOptions extraPipeOptions) + { + var pipeServers = new NamedPipeServerStream[5]; + var pipeClients = new NamedPipeClientStream[pipeServers.Length]; + + try + { + string pipeName = GetUniquePipeName(); + for (var i = 0; i < pipeServers.Length; i++) + { + pipeServers[i] = new NamedPipeServerStream( + pipeName, + PipeDirection.InOut, + NamedPipeServerStream.MaxAllowedServerInstances, + PipeTransmissionMode.Byte, + PipeOptions.Asynchronous | PipeOptions.WriteThrough | extraPipeOptions); + + pipeClients[i] = new NamedPipeClientStream(".", pipeName, PipeDirection.InOut, PipeOptions.Asynchronous | extraPipeOptions); + pipeClients[i].Connect(15_000); + } + } + finally + { + for (var i = 0; i < pipeServers.Length; i++) + { + pipeServers[i]?.Dispose(); + pipeClients[i]?.Dispose(); + } + } + } + } +} diff --git a/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.RunAsClient.Unix.cs b/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.RunAsClient.Unix.cs index e998490e2f..fd3e9b62ad 100644 --- a/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.RunAsClient.Unix.cs +++ b/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.RunAsClient.Unix.cs @@ -31,7 +31,7 @@ namespace System.IO.Pipes.Tests { string pipeName = Path.GetRandomFileName(); uint pairID = (uint)(Math.Abs(new Random(5125123).Next())); - RemoteInvoke(ServerConnectAsId, pipeName, pairID.ToString()).Dispose(); + RemoteInvoke(new Func(ServerConnectAsId), pipeName, pairID.ToString()).Dispose(); } private static int ServerConnectAsId(string pipeName, string pairIDString) @@ -39,7 +39,7 @@ namespace System.IO.Pipes.Tests uint pairID = uint.Parse(pairIDString); Assert.NotEqual(-1, seteuid(pairID)); using (var outbound = new NamedPipeServerStream(pipeName, PipeDirection.Out)) - using (var handle = RemoteInvoke(ClientConnectAsID, pipeName, pairIDString)) + using (var handle = RemoteInvoke(new Func(ClientConnectAsID), pipeName, pairIDString)) { // Connect as the unpriveleged user, but RunAsClient as the superuser outbound.WaitForConnection(); diff --git a/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.Specific.cs b/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.Specific.cs index 8bbc323110..eef4cddd5b 100644 --- a/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.Specific.cs +++ b/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.Specific.cs @@ -91,7 +91,7 @@ namespace System.IO.Pipes.Tests while (clients.Count > 0) { Task firstClient = Task.WhenAny(clients); - await WhenAllOrAnyFailed(ServerWaitReadAndWriteAsync(), firstClient); + await new Task[] { ServerWaitReadAndWriteAsync(), firstClient }.WhenAllOrAnyFailed(); clients.Remove(firstClient.Result); } @@ -173,11 +173,11 @@ namespace System.IO.Pipes.Tests Task[] serverWaits = (from server in servers select server.WaitForConnectionAsync()).ToArray(); Task[] clientWaits = (from client in clients select client.ConnectAsync()).ToArray(); - await WhenAllOrAnyFailed(serverWaits.Concat(clientWaits).ToArray()); + await serverWaits.Concat(clientWaits).ToArray().WhenAllOrAnyFailed(); Task[] serverSends = (from server in servers select server.WriteAsync(new byte[1], 0, 1)).ToArray(); Task[] clientReceives = (from client in clients select client.ReadAsync(new byte[1], 0, 1)).ToArray(); - await WhenAllOrAnyFailed(serverSends.Concat(clientReceives).ToArray()); + await serverSends.Concat(clientReceives).ToArray().WhenAllOrAnyFailed(); } finally { @@ -193,33 +193,6 @@ namespace System.IO.Pipes.Tests } } - private static Task WhenAllOrAnyFailed(params Task[] tasks) - { - int remaining = tasks.Length; - var tcs = new TaskCompletionSource(); - foreach (Task t in tasks) - { - t.ContinueWith(a => - { - if (a.IsFaulted) - { - tcs.TrySetException(a.Exception.InnerExceptions); - Interlocked.Decrement(ref remaining); - } - else if (a.IsCanceled) - { - tcs.TrySetCanceled(); - Interlocked.Decrement(ref remaining); - } - else if (Interlocked.Decrement(ref remaining) == 0) - { - tcs.TrySetResult(true); - } - }, CancellationToken.None, TaskContinuationOptions.None, TaskScheduler.Default); - } - return tcs.Task; - } - [Theory] [InlineData(PipeOptions.None)] [InlineData(PipeOptions.Asynchronous)] diff --git a/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.UnixDomainSockets.cs b/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.UnixDomainSockets.cs new file mode 100644 index 0000000000..2d21107f9f --- /dev/null +++ b/external/corefx/src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.UnixDomainSockets.cs @@ -0,0 +1,55 @@ +// 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.Net.Sockets; +using System.Threading.Tasks; +using Xunit; + +namespace System.IO.Pipes.Tests +{ + public class NamedPipeTest_UnixDomainSockets : NamedPipeTestBase + { + [Fact] + [PlatformSpecific(TestPlatforms.AnyUnix)] + public void NamedPipeServer_Connects_With_UnixDomainSocketEndPointClient() + { + string pipeName = Path.Combine("/tmp", "pipe-tests-corefx-" + Path.GetRandomFileName()); + var endPoint = new UnixDomainSocketEndPoint(pipeName); + + using (var pipeServer = new NamedPipeServerStream(pipeName, PipeDirection.InOut, 1, PipeTransmissionMode.Byte, PipeOptions.CurrentUserOnly)) + using (var sockectClient = new Socket(AddressFamily.Unix, SocketType.Stream, ProtocolType.Unspecified)) + { + sockectClient.Connect(endPoint); + Assert.True(File.Exists(pipeName)); + } + + Assert.False(File.Exists(pipeName)); + } + + [Fact] + [PlatformSpecific(TestPlatforms.AnyUnix)] + public async Task NamedPipeClient_Connects_With_UnixDomainSocketEndPointServer() + { + string pipeName = Path.Combine("/tmp", "pipe-tests-corefx-" + Path.GetRandomFileName()); + var endPoint = new UnixDomainSocketEndPoint(pipeName); + + using (var socketServer = new Socket(AddressFamily.Unix, SocketType.Stream, ProtocolType.Unspecified)) + using (var pipeClient = new NamedPipeClientStream(".", pipeName, PipeDirection.InOut, PipeOptions.None)) + { + socketServer.Bind(endPoint); + socketServer.Listen(1); + + var pipeConnectTask = pipeClient.ConnectAsync(15_000); + using (Socket accepted = socketServer.Accept()) + { + await pipeConnectTask; + Assert.True(File.Exists(pipeName)); + } + } + + Assert.True(File.Exists(pipeName)); + try { File.Delete(pipeName); } catch { } + } + } +} diff --git a/external/corefx/src/System.IO.Pipes/tests/PipeTest.Read.netcoreapp.cs b/external/corefx/src/System.IO.Pipes/tests/PipeTest.Read.netcoreapp.cs index ecaedc9c73..0b1bf32e1b 100644 --- a/external/corefx/src/System.IO.Pipes/tests/PipeTest.Read.netcoreapp.cs +++ b/external/corefx/src/System.IO.Pipes/tests/PipeTest.Read.netcoreapp.cs @@ -88,7 +88,7 @@ namespace System.IO.Pipes.Tests byte[] sent = new byte[] { 123, 0, 5 }; byte[] received = new byte[] { 0, 0, 0 }; - Task write = pair.writeablePipe.WriteAsync(new ReadOnlyMemory(sent)); + ValueTask write = pair.writeablePipe.WriteAsync(new ReadOnlyMemory(sent)); Assert.Equal(sent.Length, await pair.readablePipe.ReadAsync(new Memory(received, 0, sent.Length))); Assert.Equal(sent, received); await write; @@ -112,7 +112,7 @@ namespace System.IO.Pipes.Tests for (int iter = 0; iter < iterations; iter++) { rand.NextBytes(writeBuffer); - Task writerTask = pair.writeablePipe.WriteAsync(new ReadOnlyMemory(writeBuffer), cancellationToken); + ValueTask writerTask = pair.writeablePipe.WriteAsync(new ReadOnlyMemory(writeBuffer), cancellationToken); int totalRead = 0; while (totalRead < writeBuffer.Length) diff --git a/external/corefx/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj b/external/corefx/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj index d9cd837ac6..bd32558c0f 100644 --- a/external/corefx/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj +++ b/external/corefx/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj @@ -15,8 +15,6 @@ - - @@ -24,6 +22,7 @@ + @@ -32,12 +31,26 @@ - - + + + Common\System\Threading\Tasks\TaskTimeoutExtensions.cs + + + + + + + + + + + + + @@ -55,4 +68,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/System.IO.Ports/pkg/System.IO.Ports.pkgproj b/external/corefx/src/System.IO.Ports/pkg/System.IO.Ports.pkgproj index 44d2950271..a9ddafcac1 100644 --- a/external/corefx/src/System.IO.Ports/pkg/System.IO.Ports.pkgproj +++ b/external/corefx/src/System.IO.Ports/pkg/System.IO.Ports.pkgproj @@ -6,9 +6,9 @@ net461;netcoreapp2.0;$(AllXamarinFrameworks);$(UAPvNextTFM) - runtimes/win/lib/$(UAPvNextTFM) + runtimes/win/lib/uap10.0.16299 - + diff --git a/external/corefx/src/System.IO.Ports/src/System.IO.Ports.csproj b/external/corefx/src/System.IO.Ports/src/System.IO.Ports.csproj index c5f4f027aa..1a710accc0 100644 --- a/external/corefx/src/System.IO.Ports/src/System.IO.Ports.csproj +++ b/external/corefx/src/System.IO.Ports/src/System.IO.Ports.csproj @@ -6,6 +6,7 @@ {187503F4-BEF9-4369-A1B2-E3DC5D564E4E} true SR.PlatformNotSupported_IOPorts + $(DefineConstants);NOSPAN true diff --git a/external/corefx/src/System.IO/tests/BufferedStream/BufferedStreamTests.netcoreapp.cs b/external/corefx/src/System.IO/tests/BufferedStream/BufferedStreamTests.netcoreapp.cs index 7ead9aa31e..51a1be459f 100644 --- a/external/corefx/src/System.IO/tests/BufferedStream/BufferedStreamTests.netcoreapp.cs +++ b/external/corefx/src/System.IO/tests/BufferedStream/BufferedStreamTests.netcoreapp.cs @@ -83,7 +83,7 @@ namespace System.IO.Tests using (var bs = new BufferedStream(new MemoryStream())) { Assert.Equal(TaskStatus.Canceled, bs.ReadAsync(new byte[1], new CancellationToken(true)).AsTask().Status); - Assert.Equal(TaskStatus.Canceled, bs.WriteAsync(new byte[1], new CancellationToken(true)).Status); + Assert.Equal(TaskStatus.Canceled, bs.WriteAsync(new byte[1], new CancellationToken(true)).AsTask().Status); } } } diff --git a/external/corefx/src/System.IO/tests/Stream/Stream.ReadWriteSpan.netcoreapp.cs b/external/corefx/src/System.IO/tests/Stream/Stream.ReadWriteSpan.netcoreapp.cs index 6bdea544b0..c25418c06f 100644 --- a/external/corefx/src/System.IO/tests/Stream/Stream.ReadWriteSpan.netcoreapp.cs +++ b/external/corefx/src/System.IO/tests/Stream/Stream.ReadWriteSpan.netcoreapp.cs @@ -115,7 +115,7 @@ namespace System.IO.Tests return Task.FromResult(10); }); - using (var totalNativeMemory = new NativeOwnedMemory(30)) + using (var totalNativeMemory = new NativeMemoryManager(30)) { Memory totalMemory = totalNativeMemory.Memory; Memory targetMemory = totalMemory.Slice(5, 20); @@ -174,7 +174,7 @@ namespace System.IO.Tests return Task.CompletedTask; }); - using (var nativeMemory = new NativeOwnedMemory(10)) + using (var nativeMemory = new NativeMemoryManager(10)) { Memory memory = nativeMemory.Memory; memory.Span[2] = 0; diff --git a/external/corefx/src/System.IO/tests/StringWriter/StringWriterTests.cs b/external/corefx/src/System.IO/tests/StringWriter/StringWriterTests.cs index 4155c9d0c3..34a89b0f68 100644 --- a/external/corefx/src/System.IO/tests/StringWriter/StringWriterTests.cs +++ b/external/corefx/src/System.IO/tests/StringWriter/StringWriterTests.cs @@ -4,6 +4,7 @@ using Xunit; using System; +using System.Diagnostics; using System.Globalization; using System.IO; using System.Text; @@ -11,7 +12,7 @@ using System.Threading.Tasks; namespace System.IO.Tests { - public partial class StringWriterTests + public partial class StringWriterTests : RemoteExecutorTestBase { static int[] iArrInvalidValues = new int[] { -1, -2, -100, -1000, -10000, -100000, -1000000, -10000000, -100000000, -1000000000, int.MinValue, short.MinValue }; static int[] iArrLargeValues = new int[] { int.MaxValue, int.MaxValue - 1, int.MaxValue / 2, int.MaxValue / 10, int.MaxValue / 100 }; @@ -291,10 +292,9 @@ namespace System.IO.Tests [Fact] public static void TestWriteMisc() { - CultureInfo old = CultureInfo.CurrentCulture; - CultureInfo.CurrentCulture = new CultureInfo("en-US"); // floating-point formatting comparison depends on culture - try + RemoteInvoke(() => { + CultureInfo.CurrentCulture = new CultureInfo("en-US"); // floating-point formatting comparison depends on culture var sw = new StringWriter(); sw.Write(true); @@ -308,11 +308,7 @@ namespace System.IO.Tests sw.Write((ulong)ulong.MaxValue); Assert.Equal("Truea1234.013452342.0123456-92233720368547758081234.5429496729518446744073709551615", sw.ToString()); - } - finally - { - CultureInfo.CurrentCulture = old; - } + }).Dispose(); } [Fact] @@ -326,10 +322,9 @@ namespace System.IO.Tests [Fact] public static void TestWriteLineMisc() { - CultureInfo old = CultureInfo.CurrentCulture; - CultureInfo.CurrentCulture = new CultureInfo("en-US"); // floating-point formatting comparison depends on culture - try + RemoteInvoke(() => { + CultureInfo.CurrentCulture = new CultureInfo("en-US"); // floating-point formatting comparison depends on culture var sw = new StringWriter(); sw.WriteLine((bool)false); sw.WriteLine((char)'B'); @@ -342,11 +337,7 @@ namespace System.IO.Tests Assert.Equal( string.Format("False{0}B{0}987{0}875634{0}1.23457{0}45634563{0}18446744073709551615{0}", Environment.NewLine), sw.ToString()); - } - finally - { - CultureInfo.CurrentCulture = old; - } + }).Dispose(); } [Fact] diff --git a/external/corefx/src/System.IO/tests/System.IO.Tests.csproj b/external/corefx/src/System.IO/tests/System.IO.Tests.csproj index 7a2412da95..a1a7f7cc49 100644 --- a/external/corefx/src/System.IO/tests/System.IO.Tests.csproj +++ b/external/corefx/src/System.IO/tests/System.IO.Tests.csproj @@ -57,8 +57,8 @@ - - Common\System\Buffers\NativeOwnedMemory.cs + + Common\System\Buffers\NativeMemoryManager.cs Common\System\IO\CallTrackingStream.cs @@ -77,6 +77,12 @@ + + + {69e46a6f-9966-45a5-8945-2559fe337827} + RemoteExecutorConsoleApp + + diff --git a/external/corefx/src/System.Json/src/System.Json.csproj b/external/corefx/src/System.Json/src/System.Json.csproj index 4f12ea9374..3f4919b253 100644 --- a/external/corefx/src/System.Json/src/System.Json.csproj +++ b/external/corefx/src/System.Json/src/System.Json.csproj @@ -31,6 +31,7 @@ + \ No newline at end of file diff --git a/external/corefx/src/System.Json/src/System/Json/JsonObject.cs b/external/corefx/src/System.Json/src/System/Json/JsonObject.cs index 465c62f643..d228c7f366 100644 --- a/external/corefx/src/System.Json/src/System/Json/JsonObject.cs +++ b/external/corefx/src/System.Json/src/System/Json/JsonObject.cs @@ -114,35 +114,7 @@ namespace System.Json public override void Save(Stream stream) { - if (stream == null) - { - throw new ArgumentNullException(nameof(stream)); - } - - stream.WriteByte((byte)'{'); - - foreach (JsonPair pair in _map) - { - stream.WriteByte((byte)'"'); - byte[] bytes = Encoding.UTF8.GetBytes(EscapeString(pair.Key)); - stream.Write(bytes, 0, bytes.Length); - stream.WriteByte((byte)'"'); - stream.WriteByte((byte)','); - stream.WriteByte((byte)' '); - if (pair.Value == null) - { - stream.WriteByte((byte)'n'); - stream.WriteByte((byte)'u'); - stream.WriteByte((byte)'l'); - stream.WriteByte((byte)'l'); - } - else - { - pair.Value.Save(stream); - } - } - - stream.WriteByte((byte)'}'); + base.Save(stream); } public bool TryGetValue(string key, out JsonValue value) => _map.TryGetValue(key, out value); diff --git a/external/corefx/src/System.Json/src/System/Json/JsonValue.cs b/external/corefx/src/System.Json/src/System/Json/JsonValue.cs index 3204527da6..4fdae75c4d 100644 --- a/external/corefx/src/System.Json/src/System/Json/JsonValue.cs +++ b/external/corefx/src/System.Json/src/System/Json/JsonValue.cs @@ -15,6 +15,8 @@ namespace System.Json { public abstract class JsonValue : IEnumerable { + private static readonly UTF8Encoding s_encoding = new UTF8Encoding(false, true); + public static JsonValue Load(Stream stream) { if (stream == null) @@ -122,7 +124,10 @@ namespace System.Json throw new ArgumentNullException(nameof(stream)); } - Save(new StreamWriter(stream)); + using (StreamWriter writer = new StreamWriter(stream, s_encoding, 1024, true)) + { + Save(writer); + } } public virtual void Save(TextWriter textWriter) diff --git a/external/corefx/src/System.Json/tests/JsonObjectTests.cs b/external/corefx/src/System.Json/tests/JsonObjectTests.cs index 3849144a0f..5a39fcc744 100644 --- a/external/corefx/src/System.Json/tests/JsonObjectTests.cs +++ b/external/corefx/src/System.Json/tests/JsonObjectTests.cs @@ -270,7 +270,7 @@ namespace System.Json.Tests { obj.Save(stream); string result = Encoding.UTF8.GetString(stream.ToArray()); - Assert.Equal("{\"key\", true\"key2\", null}", result); + Assert.Equal("{\"key\": true, \"key2\": null}", result); } } diff --git a/external/corefx/src/System.Json/tests/JsonValueTests.cs b/external/corefx/src/System.Json/tests/JsonValueTests.cs index 34fa1d42d5..221a2ade70 100644 --- a/external/corefx/src/System.Json/tests/JsonValueTests.cs +++ b/external/corefx/src/System.Json/tests/JsonValueTests.cs @@ -432,7 +432,22 @@ namespace System.Json.Tests using (MemoryStream stream = new MemoryStream()) { value.Save(stream); - Assert.Empty(stream.ToArray()); + string json = Encoding.UTF8.GetString(stream.ToArray()); + Assert.True(stream.CanWrite); + Assert.Equal("Hello", json); + } + } + + [Fact] + public void Save_TextWriter() + { + JsonSubValue value = new JsonSubValue(); + + using (StringWriter writer = new StringWriter()) + { + value.Save(writer); + string json = writer.ToString(); + Assert.Equal("Hello", json); } } diff --git a/external/corefx/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj b/external/corefx/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj index 46f8cdee0b..7259a0bbe5 100644 --- a/external/corefx/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj +++ b/external/corefx/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj @@ -13,10 +13,10 @@ $(DefineConstants);FEATURE_COMPILE $(DefineConstants);FEATURE_INTERPRET - - + + @@ -41,12 +41,6 @@ Common\System\Collections\Generic\ArrayBuilder.cs - - Common\System\Collections\Generic\EnumerableHelpers.cs - - - Common\System\Collections\Generic\LargeArrayBuilder.cs - diff --git a/external/corefx/src/System.Linq.Expressions/src/System/Dynamic/DynamicMetaObject.cs b/external/corefx/src/System.Linq.Expressions/src/System/Dynamic/DynamicMetaObject.cs index 81d6fe8901..a583e50461 100644 --- a/external/corefx/src/System.Linq.Expressions/src/System/Dynamic/DynamicMetaObject.cs +++ b/external/corefx/src/System.Linq.Expressions/src/System/Dynamic/DynamicMetaObject.cs @@ -43,10 +43,13 @@ namespace System.Dynamic public DynamicMetaObject(Expression expression, BindingRestrictions restrictions, object value) : this(expression, restrictions) { - Value = value; - HasValue = true; + _value = value; } + // having sentinel value means having no value. (this way we do not need a separate hasValue field) + private static readonly object s_noValueSentinel = new object(); + private readonly object _value = s_noValueSentinel; + /// /// The expression representing the during the dynamic binding process. /// @@ -60,12 +63,12 @@ namespace System.Dynamic /// /// The runtime value represented by this . /// - public object Value { get; } + public object Value => HasValue ? _value : null; /// /// Gets a value indicating whether the has the runtime value. /// - public bool HasValue { get; } + public bool HasValue => _value != s_noValueSentinel; /// /// Gets the of the runtime value or null if the has no value associated with it. diff --git a/external/corefx/src/System.Linq.Expressions/src/System/Dynamic/UpdateDelegates.Generated.cs b/external/corefx/src/System.Linq.Expressions/src/System/Dynamic/UpdateDelegates.Generated.cs index 930539e27b..8f158b24b5 100644 --- a/external/corefx/src/System.Linq.Expressions/src/System/Dynamic/UpdateDelegates.Generated.cs +++ b/external/corefx/src/System.Linq.Expressions/src/System/Dynamic/UpdateDelegates.Generated.cs @@ -24,7 +24,7 @@ namespace System.Dynamic // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -48,6 +48,7 @@ namespace System.Dynamic if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return result; } @@ -82,6 +83,7 @@ namespace System.Dynamic result = rule(site, arg0); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -123,6 +125,7 @@ namespace System.Dynamic result = rule(site, arg0); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -167,7 +170,7 @@ namespace System.Dynamic // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -191,6 +194,7 @@ namespace System.Dynamic if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return result; } @@ -225,6 +229,7 @@ namespace System.Dynamic result = rule(site, arg0, arg1); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -266,6 +271,7 @@ namespace System.Dynamic result = rule(site, arg0, arg1); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -310,7 +316,7 @@ namespace System.Dynamic // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -334,6 +340,7 @@ namespace System.Dynamic if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return result; } @@ -368,6 +375,7 @@ namespace System.Dynamic result = rule(site, arg0, arg1, arg2); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -409,6 +417,7 @@ namespace System.Dynamic result = rule(site, arg0, arg1, arg2); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -453,7 +462,7 @@ namespace System.Dynamic // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -477,6 +486,7 @@ namespace System.Dynamic if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return result; } @@ -511,6 +521,7 @@ namespace System.Dynamic result = rule(site, arg0, arg1, arg2, arg3); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -552,6 +563,7 @@ namespace System.Dynamic result = rule(site, arg0, arg1, arg2, arg3); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -596,7 +608,7 @@ namespace System.Dynamic // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -620,6 +632,7 @@ namespace System.Dynamic if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return result; } @@ -654,6 +667,7 @@ namespace System.Dynamic result = rule(site, arg0, arg1, arg2, arg3, arg4); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -695,6 +709,7 @@ namespace System.Dynamic result = rule(site, arg0, arg1, arg2, arg3, arg4); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -739,7 +754,7 @@ namespace System.Dynamic // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -763,6 +778,7 @@ namespace System.Dynamic if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return result; } @@ -797,6 +813,7 @@ namespace System.Dynamic result = rule(site, arg0, arg1, arg2, arg3, arg4, arg5); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -838,6 +855,7 @@ namespace System.Dynamic result = rule(site, arg0, arg1, arg2, arg3, arg4, arg5); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -882,7 +900,7 @@ namespace System.Dynamic // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -906,6 +924,7 @@ namespace System.Dynamic if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return result; } @@ -940,6 +959,7 @@ namespace System.Dynamic result = rule(site, arg0, arg1, arg2, arg3, arg4, arg5, arg6); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -981,6 +1001,7 @@ namespace System.Dynamic result = rule(site, arg0, arg1, arg2, arg3, arg4, arg5, arg6); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -1025,7 +1046,7 @@ namespace System.Dynamic // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -1049,6 +1070,7 @@ namespace System.Dynamic if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return result; } @@ -1083,6 +1105,7 @@ namespace System.Dynamic result = rule(site, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -1124,6 +1147,7 @@ namespace System.Dynamic result = rule(site, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -1168,7 +1192,7 @@ namespace System.Dynamic // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -1192,6 +1216,7 @@ namespace System.Dynamic if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return result; } @@ -1226,6 +1251,7 @@ namespace System.Dynamic result = rule(site, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -1267,6 +1293,7 @@ namespace System.Dynamic result = rule(site, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -1311,7 +1338,7 @@ namespace System.Dynamic // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -1335,6 +1362,7 @@ namespace System.Dynamic if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return result; } @@ -1369,6 +1397,7 @@ namespace System.Dynamic result = rule(site, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -1410,6 +1439,7 @@ namespace System.Dynamic result = rule(site, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -1453,7 +1483,7 @@ namespace System.Dynamic // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -1477,6 +1507,7 @@ namespace System.Dynamic if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return; } @@ -1511,6 +1542,7 @@ namespace System.Dynamic rule(site, arg0); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } @@ -1552,6 +1584,7 @@ namespace System.Dynamic rule(site, arg0); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } @@ -1595,7 +1628,7 @@ namespace System.Dynamic // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -1619,6 +1652,7 @@ namespace System.Dynamic if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return; } @@ -1653,6 +1687,7 @@ namespace System.Dynamic rule(site, arg0, arg1); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } @@ -1694,6 +1729,7 @@ namespace System.Dynamic rule(site, arg0, arg1); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } @@ -1737,7 +1773,7 @@ namespace System.Dynamic // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -1761,6 +1797,7 @@ namespace System.Dynamic if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return; } @@ -1795,6 +1832,7 @@ namespace System.Dynamic rule(site, arg0, arg1, arg2); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } @@ -1836,6 +1874,7 @@ namespace System.Dynamic rule(site, arg0, arg1, arg2); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } @@ -1879,7 +1918,7 @@ namespace System.Dynamic // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -1903,6 +1942,7 @@ namespace System.Dynamic if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return; } @@ -1937,6 +1977,7 @@ namespace System.Dynamic rule(site, arg0, arg1, arg2, arg3); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } @@ -1978,6 +2019,7 @@ namespace System.Dynamic rule(site, arg0, arg1, arg2, arg3); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } @@ -2021,7 +2063,7 @@ namespace System.Dynamic // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -2045,6 +2087,7 @@ namespace System.Dynamic if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return; } @@ -2079,6 +2122,7 @@ namespace System.Dynamic rule(site, arg0, arg1, arg2, arg3, arg4); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } @@ -2120,6 +2164,7 @@ namespace System.Dynamic rule(site, arg0, arg1, arg2, arg3, arg4); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } @@ -2163,7 +2208,7 @@ namespace System.Dynamic // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -2187,6 +2232,7 @@ namespace System.Dynamic if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return; } @@ -2221,6 +2267,7 @@ namespace System.Dynamic rule(site, arg0, arg1, arg2, arg3, arg4, arg5); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } @@ -2262,6 +2309,7 @@ namespace System.Dynamic rule(site, arg0, arg1, arg2, arg3, arg4, arg5); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } @@ -2305,7 +2353,7 @@ namespace System.Dynamic // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -2329,6 +2377,7 @@ namespace System.Dynamic if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return; } @@ -2363,6 +2412,7 @@ namespace System.Dynamic rule(site, arg0, arg1, arg2, arg3, arg4, arg5, arg6); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } @@ -2404,6 +2454,7 @@ namespace System.Dynamic rule(site, arg0, arg1, arg2, arg3, arg4, arg5, arg6); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } @@ -2447,7 +2498,7 @@ namespace System.Dynamic // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -2471,6 +2522,7 @@ namespace System.Dynamic if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return; } @@ -2505,6 +2557,7 @@ namespace System.Dynamic rule(site, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } @@ -2546,6 +2599,7 @@ namespace System.Dynamic rule(site, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } @@ -2589,7 +2643,7 @@ namespace System.Dynamic // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -2613,6 +2667,7 @@ namespace System.Dynamic if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return; } @@ -2647,6 +2702,7 @@ namespace System.Dynamic rule(site, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } @@ -2688,6 +2744,7 @@ namespace System.Dynamic rule(site, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } @@ -2731,7 +2788,7 @@ namespace System.Dynamic // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -2755,6 +2812,7 @@ namespace System.Dynamic if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return; } @@ -2789,6 +2847,7 @@ namespace System.Dynamic rule(site, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } @@ -2830,6 +2889,7 @@ namespace System.Dynamic rule(site, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } diff --git a/external/corefx/src/System.Linq.Expressions/src/System/Dynamic/UpdateDelegates.Generated.tt b/external/corefx/src/System.Linq.Expressions/src/System/Dynamic/UpdateDelegates.Generated.tt index c7c6b5da45..7a1ab2161c 100644 --- a/external/corefx/src/System.Linq.Expressions/src/System/Dynamic/UpdateDelegates.Generated.tt +++ b/external/corefx/src/System.Linq.Expressions/src/System/Dynamic/UpdateDelegates.Generated.tt @@ -38,7 +38,7 @@ for (int i = 1; i <= 10; i++) // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -62,6 +62,7 @@ for (int i = 1; i <= 10; i++) if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return result; } @@ -96,6 +97,7 @@ for (int i = 1; i <= 10; i++) result = rule(<#=ruleInvocationArguments#>); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -137,6 +139,7 @@ for (int i = 1; i <= 10; i++) result = rule(<#=ruleInvocationArguments#>); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return result; } } @@ -191,7 +194,7 @@ for (int i = 1; i <= 10; i++) // // Create matchmaker and its site. We'll need them regardless. // - site = CallSiteOps.CreateMatchmaker(@this); + site = @this.GetMatchmaker(); // // Level 1 cache lookup @@ -215,6 +218,7 @@ for (int i = 1; i <= 10; i++) if (CallSiteOps.GetMatch(site)) { CallSiteOps.UpdateRules(@this, i); + @this.ReleaseMatchmaker(site); return; } @@ -249,6 +253,7 @@ for (int i = 1; i <= 10; i++) rule(<#=ruleInvocationArguments#>); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } @@ -290,6 +295,7 @@ for (int i = 1; i <= 10; i++) rule(<#=ruleInvocationArguments#>); if (CallSiteOps.GetMatch(site)) { + @this.ReleaseMatchmaker(site); return; } } diff --git a/external/corefx/src/System.Linq.Expressions/src/System/Dynamic/Utils/CollectionExtensions.cs b/external/corefx/src/System.Linq.Expressions/src/System/Dynamic/Utils/CollectionExtensions.cs index 701809b06b..af8ad7557a 100644 --- a/external/corefx/src/System.Linq.Expressions/src/System/Dynamic/Utils/CollectionExtensions.cs +++ b/external/corefx/src/System.Linq.Expressions/src/System/Dynamic/Utils/CollectionExtensions.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; +using System.Linq; using System.Runtime.CompilerServices; namespace System.Dynamic.Utils @@ -74,7 +75,7 @@ namespace System.Dynamic.Utils return builder.ToReadOnlyCollection(); } - T[] array = EnumerableHelpers.ToArray(enumerable); + T[] array = enumerable.ToArray(); return array.Length == 0 ? EmptyReadOnlyCollection.Instance : new TrueReadOnlyCollection(array); diff --git a/external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/BinaryExpression.cs.REMOVED.git-id b/external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/BinaryExpression.cs.REMOVED.git-id index 08c8209578..286e82c0ac 100644 --- a/external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/BinaryExpression.cs.REMOVED.git-id +++ b/external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/BinaryExpression.cs.REMOVED.git-id @@ -1 +1 @@ -60d45b933bc489e12a2bb109d4ae0f88f5a0cec6 \ No newline at end of file +87a7ed9e4bcbdd043686b5217fa7074509f94168 \ No newline at end of file diff --git a/external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSite.cs b/external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSite.cs index ad42af2882..5ad8d72026 100644 --- a/external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSite.cs +++ b/external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSite.cs @@ -8,6 +8,7 @@ using System.Dynamic; using System.Dynamic.Utils; using System.Linq.Expressions; using System.Reflection; +using System.Threading; using static System.Linq.Expressions.CachedReflectionInfo; namespace System.Runtime.CompilerServices @@ -149,6 +150,11 @@ namespace System.Runtime.CompilerServices /// internal T[] Rules; + /// + /// an instance of matchmaker site to opportunistically reuse when site is polymorphic + /// + internal CallSite _cachedMatchmaker; + // Cached update delegate for all sites with a given T private static T s_cachedUpdate; @@ -172,6 +178,30 @@ namespace System.Runtime.CompilerServices return new CallSite(); } + internal CallSite GetMatchmaker() + { + // check if we have a cached matchmaker and attempt to atomically grab it. + var matchmaker = _cachedMatchmaker; + if (matchmaker != null) + { + matchmaker = Interlocked.Exchange(ref _cachedMatchmaker, null); + Debug.Assert(matchmaker?._match != false, "cached site should be set up for matchmaking"); + } + + return matchmaker ?? new CallSite() { _match = true }; + } + + internal void ReleaseMatchmaker(CallSite matchMaker) + { + // If "Rules" has not been created, this is the first (and likely the only) Update of the site. + // 90% sites stay monomorphic and will never need a matchmaker again. + // Otherwise store the matchmaker for the future use. + if (Rules != null) + { + _cachedMatchmaker = matchMaker; + } + } + /// /// Creates an instance of the dynamic call site, initialized with the binder responsible for the /// runtime binding of the dynamic operations at this call site. diff --git a/external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/RuleCache.cs b/external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/RuleCache.cs index 3d4d12b9de..414c54cc74 100644 --- a/external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/RuleCache.cs +++ b/external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/RuleCache.cs @@ -113,9 +113,9 @@ namespace System.Runtime.CompilerServices else { newRules = new T[newLength]; + Array.Copy(rules, 0, newRules, 0, InsertPosition); } - Array.Copy(rules, 0, newRules, 0, InsertPosition); newRules[InsertPosition] = item; Array.Copy(rules, InsertPosition, newRules, InsertPosition + 1, newLength - InsertPosition - 1); return newRules; diff --git a/external/corefx/src/System.Linq.Expressions/tests/BinaryOperators/Arithmetic/BinaryMultiplyTests.cs b/external/corefx/src/System.Linq.Expressions/tests/BinaryOperators/Arithmetic/BinaryMultiplyTests.cs index 7134ea755b..3914674629 100644 --- a/external/corefx/src/System.Linq.Expressions/tests/BinaryOperators/Arithmetic/BinaryMultiplyTests.cs +++ b/external/corefx/src/System.Linq.Expressions/tests/BinaryOperators/Arithmetic/BinaryMultiplyTests.cs @@ -576,5 +576,87 @@ namespace System.Linq.Expressions.Tests BinaryExpression e2 = Expression.MultiplyChecked(Expression.Parameter(typeof(int), "a"), Expression.Parameter(typeof(int), "b")); Assert.Equal("(a * b)", e2.ToString()); } + + // Simulate VB-style overloading of exponentiation operation + public struct VBStyleExponentiation + { + public VBStyleExponentiation(double value) => Value = value; + + public double Value { get; } + + public static implicit operator VBStyleExponentiation(double value) => new VBStyleExponentiation(value); + + public static VBStyleExponentiation op_Exponent(VBStyleExponentiation x, VBStyleExponentiation y) => Math.Pow(x.Value, y.Value); + } + + [Theory, ClassData(typeof(CompilationTypes))] + public static void VBStyleOperatorOverloading(bool useInterpreter) + { + var b = Expression.Parameter(typeof(VBStyleExponentiation)); + var e = Expression.Parameter(typeof(VBStyleExponentiation)); + var func = Expression.Lambda>( + Expression.Power(b, e), b, e).Compile(useInterpreter); + Assert.Equal(8.0, func(2.0, 3.0).Value); + Assert.Equal(10000.0, func(10.0, 4.0).Value); + } + + [Theory, ClassData(typeof(CompilationTypes))] + public static void VBStyleOperatorOverloadingLifted(bool useInterpreter) + { + var b = Expression.Parameter(typeof(VBStyleExponentiation?)); + var e = Expression.Parameter(typeof(VBStyleExponentiation?)); + var func = Expression.Lambda>( + Expression.Power(b, e), b, e).Compile(useInterpreter); + Assert.Equal(8.0, func(2.0, 3.0).Value.Value); + Assert.Equal(10000.0, func(10.0, 4.0).Value.Value); + Assert.Null(func(2.0, null)); + Assert.Null(func(null, 2.0)); + Assert.Null(func(null, null)); + } + + // Simulate F#-style overloading of exponentiation operation + public struct FSStyleExponentiation + { + public FSStyleExponentiation(double value) => Value = value; + + public static implicit operator FSStyleExponentiation(double value) => new FSStyleExponentiation(value); + + public double Value { get; } + + public static FSStyleExponentiation op_Exponentiation(FSStyleExponentiation x, FSStyleExponentiation y) + => new FSStyleExponentiation(Math.Pow(x.Value, y.Value)); + } + + [Theory, ClassData(typeof(CompilationTypes))] + public static void FSStyleOperatorOverloading(bool useInterpreter) + { + var b = Expression.Parameter(typeof(FSStyleExponentiation)); + var e = Expression.Parameter(typeof(FSStyleExponentiation)); + var func = Expression.Lambda>( + Expression.Power(b, e), b, e).Compile(useInterpreter); + Assert.Equal(8.0, func(2.0, 3.0).Value); + Assert.Equal(10000.0, func(10.0, 4.0).Value); + } + + [Theory, ClassData(typeof(CompilationTypes))] + public static void FSStyleOperatorOverloadingLifted(bool useInterpreter) + { + var b = Expression.Parameter(typeof(FSStyleExponentiation?)); + var e = Expression.Parameter(typeof(FSStyleExponentiation?)); + var func = Expression.Lambda>( + Expression.Power(b, e), b, e).Compile(useInterpreter); + Assert.Equal(8.0, func(2.0, 3.0).Value.Value); + Assert.Equal(10000.0, func(10.0, 4.0).Value.Value); + Assert.Null(func(2.0, null)); + Assert.Null(func(null, 2.0)); + Assert.Null(func(null, null)); + } + + [Fact] + public static void ExponentiationNotSupported() + { + ConstantExpression arg = Expression.Constant(""); + Assert.Throws(() => Expression.Power(arg, arg)); + } } } diff --git a/external/corefx/src/System.Linq.Expressions/tests/Dynamic/CallSiteCachingTests.cs b/external/corefx/src/System.Linq.Expressions/tests/Dynamic/CallSiteCachingTests.cs new file mode 100644 index 0000000000..0c4fa20e8e --- /dev/null +++ b/external/corefx/src/System.Linq.Expressions/tests/Dynamic/CallSiteCachingTests.cs @@ -0,0 +1,126 @@ +// 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.Collections.Generic; +using System.Dynamic; +using System.Linq.Expressions; +using Microsoft.CSharp.RuntimeBinder; +using Xunit; + +namespace System.Runtime.CompilerServices.Tests +{ + public class CallSiteCachingTests + { + [Fact] + public void InlineCache() + { + var callSite = CallSite>.Create(Binder.GetMember(CSharpBinderFlags.None, "A", typeof(CallSiteCachingTests), new CSharpArgumentInfo[1] + { + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null) + })); + + var initialTarget = callSite.Target; + Assert.Equal((object)initialTarget, callSite.Update); + + object newExpando = CallSiteCachingTests.GetNewExpando(123); + callSite.Target(callSite, newExpando); + + var newTarget = callSite.Target; + + for (int i = 0; i < 10; i++) + { + callSite.Target(callSite, newExpando); + + // rule should not be changing + Assert.Equal((object)newTarget, callSite.Target); + } + } + + [Fact] + public void L1Cache() + { + var callSite = CallSite>.Create(Binder.GetMember(CSharpBinderFlags.None, "A", typeof(CallSiteCachingTests), new CSharpArgumentInfo[1] + { + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null) + })); + + ObjAndRule[] t = new ObjAndRule[200]; + + for (int i = 0; i < 10; i++) + { + object newExpando = CallSiteCachingTests.GetNewExpando(i); + callSite.Target(callSite, newExpando); + + t[i].obj = newExpando; + t[i].rule = callSite.Target; + + if (i > 0) + { + // must not reuse rules for new expandos + Assert.NotEqual((object)t[i].rule, t[i - 1].rule); + } + } + + for (int i = 0; i < 10; i++) + { + var L1 = CallSiteOps.GetRules((dynamic)callSite); + + // L1 must contain rules + Assert.Equal((object)t[9 - i].rule, L1[i]); + } + } + + [Fact] + public void L2Cache() + { + var callSite = CallSite>.Create(Binder.GetMember(CSharpBinderFlags.None, "A", typeof(CallSiteCachingTests), new CSharpArgumentInfo[1] + { + CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null) + })); + + ObjAndRule[] t = new ObjAndRule[200]; + + for (int i = 0; i < 100; i++) + { + object newExpando = CallSiteCachingTests.GetNewExpando(i); + callSite.Target(callSite, newExpando); + + t[i].obj = newExpando; + t[i].rule = callSite.Target; + + if (i > 0) + { + // must not reuse rules for new expandos + Assert.NotEqual((object)t[i].rule, t[i - 1].rule); + } + } + + for (int i = 0; i < 100; i++) + { + object newExpando = CallSiteCachingTests.GetNewExpando(i); + callSite.Target(callSite, newExpando); + + // must reuse rules from L2 cache + Assert.Equal((object)t[i].rule, callSite.Target); + } + } + + private static dynamic GetNewExpando(int i) + { + dynamic e = new ExpandoObject(); + e.A = i; + + var d = e as IDictionary; + d.Add(i.ToString(), i); + + return e; + } + + private struct ObjAndRule + { + public object obj; + public object rule; + } + } +} diff --git a/external/corefx/src/System.Linq.Expressions/tests/Dynamic/ExpandoObjectTests.cs b/external/corefx/src/System.Linq.Expressions/tests/Dynamic/ExpandoObjectTests.cs index 851ae6ef16..5494717b6e 100644 --- a/external/corefx/src/System.Linq.Expressions/tests/Dynamic/ExpandoObjectTests.cs +++ b/external/corefx/src/System.Linq.Expressions/tests/Dynamic/ExpandoObjectTests.cs @@ -64,7 +64,7 @@ namespace System.Dynamic.Tests Assert.Equal(Enumerable.Repeat(new KeyValuePair("key", 2), 1), eo); } - [Fact, ActiveIssue(13541)] + [Fact] public void DictionaryMatchesProperties() { dynamic eo = new ExpandoObject(); diff --git a/external/corefx/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj b/external/corefx/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj index 3eb4ab20e1..d266ec33b7 100644 --- a/external/corefx/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj +++ b/external/corefx/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj @@ -12,10 +12,10 @@ $(DefineConstants);FEATURE_INTERPRET false - - + + @@ -130,6 +130,7 @@ + diff --git a/external/corefx/src/System.Linq.Expressions/tests/Variables/ParameterTests.cs b/external/corefx/src/System.Linq.Expressions/tests/Variables/ParameterTests.cs index a417e5d43d..4a5219ebe0 100644 --- a/external/corefx/src/System.Linq.Expressions/tests/Variables/ParameterTests.cs +++ b/external/corefx/src/System.Linq.Expressions/tests/Variables/ParameterTests.cs @@ -310,7 +310,6 @@ namespace System.Linq.Expressions.Tests } [Theory] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "This test causes a fail fast on uapaot: https://github.com/dotnet/corefx/issues/19129")] [MemberData(nameof(ReadAndWriteRefCases))] public void ReadAndWriteRefParameters(bool useInterpreter, object value, object increment, object result) { diff --git a/external/corefx/src/System.Linq.Parallel/tests/ParallelEnumerableTests.cs b/external/corefx/src/System.Linq.Parallel/tests/ParallelEnumerableTests.cs index f9b2e3b088..475399b9ba 100644 --- a/external/corefx/src/System.Linq.Parallel/tests/ParallelEnumerableTests.cs +++ b/external/corefx/src/System.Linq.Parallel/tests/ParallelEnumerableTests.cs @@ -259,7 +259,6 @@ namespace System.Linq.Parallel.Tests [Theory] [MemberData(nameof(EmptyData))] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "This causes assertion failure on UAPAoT")] public static void Empty(T def) { Assert.Empty(ParallelEnumerable.Empty()); diff --git a/external/corefx/src/System.Linq/src/MatchingRefApiCompatBaseline.txt b/external/corefx/src/System.Linq/src/MatchingRefApiCompatBaseline.txt new file mode 100644 index 0000000000..332d6f77da --- /dev/null +++ b/external/corefx/src/System.Linq/src/MatchingRefApiCompatBaseline.txt @@ -0,0 +1,2 @@ +# Exposed publicly in the implementation to enable reflection for data-binding scenarios. +TypesMustExist : Type 'System.Linq.Grouping' does not exist in the implementation but it does exist in the contract. diff --git a/external/corefx/src/System.Linq/tests/ConsistencyTests.cs b/external/corefx/src/System.Linq/tests/ConsistencyTests.cs index 843505fd51..ea02f4f0fe 100644 --- a/external/corefx/src/System.Linq/tests/ConsistencyTests.cs +++ b/external/corefx/src/System.Linq/tests/ConsistencyTests.cs @@ -16,22 +16,7 @@ namespace System.Linq.Tests [Fact] public static void MatchSequencePattern() { - // If a change to Enumerable has required a change to the exception list in this test - // make the same change at src/System.Linq.Queryable/tests/Queryable.cs. - MethodInfo enumerableNotInQueryable = GetMissingExtensionMethod( - typeof(Enumerable), - typeof(Queryable), - new[] { - nameof(Enumerable.ToLookup), - nameof(Enumerable.ToDictionary), - nameof(Enumerable.ToArray), - nameof(Enumerable.AsEnumerable), - nameof(Enumerable.ToList), - "Fold", - "LeftJoin", - "ToHashSet" - } - ); + MethodInfo enumerableNotInQueryable = GetMissingExtensionMethod(typeof(Enumerable), typeof(Queryable), GetExcludedMethods()); Assert.True(enumerableNotInQueryable == null, string.Format("Enumerable method {0} not defined by Queryable", enumerableNotInQueryable)); @@ -46,6 +31,34 @@ namespace System.Linq.Tests Assert.True(queryableNotInEnumerable == null, string.Format("Queryable method {0} not defined by Enumerable", queryableNotInEnumerable)); } + // If a change to Enumerable has required a change to the exception list in this test + // make the same change at src/System.Linq.Queryable/tests/Queryable.cs. + private static IEnumerable GetExcludedMethods() + { + IEnumerable result = new[] + { + nameof(Enumerable.ToLookup), + nameof(Enumerable.ToDictionary), + nameof(Enumerable.ToArray), + nameof(Enumerable.AsEnumerable), + nameof(Enumerable.ToList), + "Fold", + "LeftJoin", + "ToHashSet" + }; + + if (PlatformDetection.IsFullFramework) + { + result = result.Concat(new[] + { + nameof(Enumerable.Append), + nameof(Enumerable.Prepend) + }); + } + + return result; + } + private static MethodInfo GetMissingExtensionMethod(Type a, Type b, IEnumerable excludedMethods) { var dex = new HashSet(excludedMethods); diff --git a/external/corefx/src/System.Management/pkg/System.Management.pkgproj b/external/corefx/src/System.Management/pkg/System.Management.pkgproj index 1079d8066e..57d4110584 100644 --- a/external/corefx/src/System.Management/pkg/System.Management.pkgproj +++ b/external/corefx/src/System.Management/pkg/System.Management.pkgproj @@ -3,7 +3,7 @@ - netcoreapp2.0;net45;$(AllXamarinFrameworks) + uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks) diff --git a/external/corefx/src/System.Management/src/Configurations.props b/external/corefx/src/System.Management/src/Configurations.props index 94ac07fdab..e322371832 100644 --- a/external/corefx/src/System.Management/src/Configurations.props +++ b/external/corefx/src/System.Management/src/Configurations.props @@ -8,6 +8,7 @@ $(PackageConfigurations); netcoreapp-Windows_NT; + _netfx; diff --git a/external/corefx/src/System.Management/src/System/Management/ManagementDateTime.cs b/external/corefx/src/System.Management/src/System/Management/ManagementDateTime.cs index d4f60011bf..e9224d44ec 100644 --- a/external/corefx/src/System.Management/src/System/Management/ManagementDateTime.cs +++ b/external/corefx/src/System.Management/src/System/Management/ManagementDateTime.cs @@ -117,113 +117,94 @@ namespace System.Management int hour = DateTime.MinValue.Hour; int minute = DateTime.MinValue.Minute; int second = DateTime.MinValue.Second; - int millisec = 0; string dmtf = dmtfDate; - DateTime datetime = DateTime.MinValue; - + // If the string passed is empty or null then throw // an exception if(dmtf == null) { - throw new System.ArgumentOutOfRangeException("dmtfDate"); + throw new ArgumentOutOfRangeException(nameof(dmtfDate)); } if (dmtf.Length == 0) { - throw new System.ArgumentOutOfRangeException("dmtfDate"); + throw new ArgumentOutOfRangeException(nameof(dmtfDate)); } // if the length of the string is not equal to the // standard length of the DMTF datetime then throw an exception if(dmtf.Length != SIZEOFDMTFDATETIME) { - throw new System.ArgumentOutOfRangeException("dmtfDate"); + throw new ArgumentOutOfRangeException(nameof(dmtfDate)); } - IFormatProvider frmInt32 = (IFormatProvider)CultureInfo.InvariantCulture.GetFormat(typeof(System.Int32)); - System.Int64 ticks = 0; + IFormatProvider frmInt32 = (IFormatProvider)CultureInfo.InvariantCulture.GetFormat(typeof(int)); + long ticks = 0; + int utcOffset = 0; try { - - string tempString = System.String.Empty; - tempString = dmtf.Substring(0, 4); + var tempString = dmtf.Substring(0, 4); if (("****" != tempString)) { - year = System.Int32.Parse(tempString,frmInt32); + year = int.Parse(tempString,frmInt32); } tempString = dmtf.Substring(4, 2); if (("**" != tempString)) { - month = System.Int32.Parse(tempString,frmInt32); + month = int.Parse(tempString,frmInt32); } tempString = dmtf.Substring(6, 2); if (("**" != tempString)) { - day = System.Int32.Parse(tempString,frmInt32); + day = int.Parse(tempString,frmInt32); } tempString = dmtf.Substring(8, 2); if (("**" != tempString)) { - hour = System.Int32.Parse(tempString,frmInt32); + hour = int.Parse(tempString,frmInt32); } tempString = dmtf.Substring(10, 2); if (("**" != tempString)) { - minute = System.Int32.Parse(tempString,frmInt32); + minute = int.Parse(tempString,frmInt32); } tempString = dmtf.Substring(12, 2); if (("**" != tempString)) { - second = System.Int32.Parse(tempString,frmInt32); + second = int.Parse(tempString,frmInt32); } tempString = dmtf.Substring(15, 6); if (("******" != tempString)) { - ticks = (System.Int64.Parse(tempString,(IFormatProvider)CultureInfo.InvariantCulture.GetFormat(typeof(System.Int64)))) * (System.TimeSpan.TicksPerMillisecond/1000); + ticks = (long.Parse(tempString,(IFormatProvider)CultureInfo.InvariantCulture.GetFormat(typeof(Int64)))) * (TimeSpan.TicksPerMillisecond/1000); } - if( year < 0 || month < 0 || day < 0 || hour < 0 || minute < 0 || second < 0 || ticks < 0) + tempString = dmtf.Substring(22, 3); + if (("***" != tempString)) { - throw new System.ArgumentOutOfRangeException("dmtfDate"); + tempString = dmtf.Substring(21, 4); + utcOffset = int.Parse(tempString,frmInt32); } + if( year < 0 || month < 0 || day < 0 || hour < 0 || minute < 0 || second < 0 || ticks < 0) + { + throw new ArgumentOutOfRangeException(nameof(dmtfDate)); + } } catch { - throw new System.ArgumentOutOfRangeException("dmtfDate"); + throw new ArgumentOutOfRangeException(nameof(dmtfDate)); } // Construct a new System.DateTime object - datetime = new System.DateTime(year, month, day, hour, minute, second, millisec); + var datetime = new DateTime(year, month, day, hour, minute, second, 0, DateTimeKind.Utc); // Then add the ticks calculated from the microseconds datetime = datetime.AddTicks(ticks); - - // Adjust the UTC time to reflect the current zone time - System.TimeZone curZone = System.TimeZone.CurrentTimeZone; - System.TimeSpan tickOffset = curZone.GetUtcOffset(datetime); - long OffsetMins = tickOffset.Ticks / System.TimeSpan.TicksPerMinute; - - // Adjusting the DateTime for the current UTC - int UTCOffset = 0; - string tempString1 = dmtf.Substring(22, 3); - long OffsetToBeAdjusted = 0; - if (("***" != tempString1)) - { - tempString1 = dmtf.Substring(21, 4); - try - { - UTCOffset = System.Int32.Parse(tempString1,frmInt32); - } - catch - { - throw new System.ArgumentOutOfRangeException(); - } + // Then subtruct offset in minutes + datetime = datetime.AddMinutes(-utcOffset); - OffsetToBeAdjusted = UTCOffset-OffsetMins; - - // We have to substract the minutes from the time - datetime = datetime.AddMinutes(OffsetToBeAdjusted * -1); - - } + // Convert to local Time + datetime = datetime.ToLocalTime(); + return datetime; } diff --git a/external/corefx/src/System.Management/src/System/Management/WMIGenerator.cs.REMOVED.git-id b/external/corefx/src/System.Management/src/System/Management/WMIGenerator.cs.REMOVED.git-id index a419e4a1d2..0581b6bd2c 100644 --- a/external/corefx/src/System.Management/src/System/Management/WMIGenerator.cs.REMOVED.git-id +++ b/external/corefx/src/System.Management/src/System/Management/WMIGenerator.cs.REMOVED.git-id @@ -1 +1 @@ -b6f5b57f2cf8b9bcb3dde5f1544189673d9b0d5a \ No newline at end of file +31a5a674b8d94ad9303e6b7d6f009ad44ffd358c \ No newline at end of file diff --git a/external/corefx/src/System.Management/tests/Configurations.props b/external/corefx/src/System.Management/tests/Configurations.props index d8cd9ec843..808952d28a 100644 --- a/external/corefx/src/System.Management/tests/Configurations.props +++ b/external/corefx/src/System.Management/tests/Configurations.props @@ -3,6 +3,7 @@ netcoreapp-Windows_NT; + netfx; diff --git a/external/corefx/src/System.Management/tests/System.Management.Tests.csproj b/external/corefx/src/System.Management/tests/System.Management.Tests.csproj index 01552f8893..d9b2e2a218 100644 --- a/external/corefx/src/System.Management/tests/System.Management.Tests.csproj +++ b/external/corefx/src/System.Management/tests/System.Management.Tests.csproj @@ -6,6 +6,8 @@ + + diff --git a/external/corefx/src/System.Management/tests/System/Management/ManagementDateTimeConverterTests.cs b/external/corefx/src/System.Management/tests/System/Management/ManagementDateTimeConverterTests.cs index d2cdfffaf7..a35b9f59a0 100644 --- a/external/corefx/src/System.Management/tests/System/Management/ManagementDateTimeConverterTests.cs +++ b/external/corefx/src/System.Management/tests/System/Management/ManagementDateTimeConverterTests.cs @@ -11,15 +11,16 @@ namespace System.Management.Tests [ConditionalFact(typeof(WmiTestHelper), nameof(WmiTestHelper.IsWmiSupported))] public void DateTime_RoundTrip() { - var date = new DateTime(2002, 4, 8, 14, 18, 35, 978, DateTimeKind.Utc); - var dmtfDate = "20020408141835.978000+000"; + var date = new DateTime(2002, 4, 8, 14, 18, 35, 978, DateTimeKind.Utc).AddMinutes(150); + var dmtfDate = "20020408141835.978000-150"; + var dmtfDateExpected = "20020408164835.978000+000"; DateTime convertedDate = ManagementDateTimeConverter.ToDateTime(dmtfDate).ToUniversalTime(); Assert.Equal(date, convertedDate); // Converting System.DateTime to DMTF datetime string convertedDmtfDate = ManagementDateTimeConverter.ToDmtfDateTime(date); - Assert.Equal(dmtfDate, convertedDmtfDate); + Assert.Equal(dmtfDateExpected, convertedDmtfDate); } [ConditionalFact(typeof(WmiTestHelper), nameof(WmiTestHelper.IsWmiSupported))] diff --git a/external/corefx/src/System.Memory/System.Memory.sln b/external/corefx/src/System.Memory/System.Memory.sln index 402cbd12a0..d6455179a9 100644 --- a/external/corefx/src/System.Memory/System.Memory.sln +++ b/external/corefx/src/System.Memory/System.Memory.sln @@ -31,10 +31,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU + {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {18482C55-6B57-41E8-BBC4-383B9E2C7AA2}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {18482C55-6B57-41E8-BBC4-383B9E2C7AA2}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {18482C55-6B57-41E8-BBC4-383B9E2C7AA2}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/external/corefx/src/System.Memory/dir.props b/external/corefx/src/System.Memory/dir.props index 87260a1999..8070137a60 100644 --- a/external/corefx/src/System.Memory/dir.props +++ b/external/corefx/src/System.Memory/dir.props @@ -3,6 +3,9 @@ 4.0.1.0 + + 4.1.0.0 Open true true diff --git a/external/corefx/src/System.Memory/pkg/System.Memory.pkgproj b/external/corefx/src/System.Memory/pkg/System.Memory.pkgproj index ff57701606..0820e90440 100644 --- a/external/corefx/src/System.Memory/pkg/System.Memory.pkgproj +++ b/external/corefx/src/System.Memory/pkg/System.Memory.pkgproj @@ -7,15 +7,9 @@ net45;netcore45;wpa81;netcoreapp1.0;$(AllXamarinFrameworks) - - - - .NETCoreApp;UAP - + + + \ No newline at end of file diff --git a/external/corefx/src/System.Memory/ref/Configurations.props b/external/corefx/src/System.Memory/ref/Configurations.props index 41873b4f7e..1cfab47109 100644 --- a/external/corefx/src/System.Memory/ref/Configurations.props +++ b/external/corefx/src/System.Memory/ref/Configurations.props @@ -1,11 +1,14 @@  - + netstandard1.1; netstandard; - netcoreapp; + + + $(PackageConfigurations); uap; + netcoreapp; diff --git a/external/corefx/src/System.Memory/ref/System.Memory.cs b/external/corefx/src/System.Memory/ref/System.Memory.cs index 529d181270..8509ed5a10 100644 --- a/external/corefx/src/System.Memory/ref/System.Memory.cs +++ b/external/corefx/src/System.Memory/ref/System.Memory.cs @@ -9,30 +9,39 @@ namespace System { public static partial class MemoryExtensions { - public static System.ReadOnlySpan AsBytes(this System.ReadOnlySpan source) where T : struct { throw null; } - public static System.Span AsBytes(this System.Span source) where T : struct { throw null; } - public static System.ReadOnlyMemory AsReadOnlyMemory(this string text) { throw null; } - public static System.ReadOnlyMemory AsReadOnlyMemory(this string text, int start) { throw null; } - public static System.ReadOnlyMemory AsReadOnlyMemory(this string text, int start, int length) { throw null; } - public static System.ReadOnlyMemory AsReadOnlyMemory(this System.Memory memory) { throw null; } - public static System.ReadOnlySpan AsReadOnlySpan(this string text) { throw null; } - public static System.ReadOnlySpan AsReadOnlySpan(this string text, int start) { throw null; } - public static System.ReadOnlySpan AsReadOnlySpan(this string text, int start, int length) { throw null; } - public static System.ReadOnlySpan AsReadOnlySpan(this System.ArraySegment arraySegment) { throw null; } - public static System.ReadOnlySpan AsReadOnlySpan(this System.Span span) { throw null; } - public static System.ReadOnlySpan AsReadOnlySpan(this T[] array) { throw null; } - public static System.Span AsSpan(this System.ArraySegment arraySegment) { throw null; } + public static System.ReadOnlyMemory AsMemory(this string text) { throw null; } + public static System.ReadOnlyMemory AsMemory(this string text, int start) { throw null; } + public static System.ReadOnlyMemory AsMemory(this string text, int start, int length) { throw null; } + public static System.Memory AsMemory(this System.ArraySegment segment) { throw null; } + public static System.Memory AsMemory(this System.ArraySegment segment, int start) { throw null; } + public static System.Memory AsMemory(this System.ArraySegment segment, int start, int length) { throw null; } + public static System.Memory AsMemory(this T[] array) { throw null; } + public static System.Memory AsMemory(this T[] array, int start) { throw null; } + public static System.Memory AsMemory(this T[] array, int start, int length) { throw null; } + public static System.ReadOnlySpan AsSpan(this string text) { throw null; } + public static System.ReadOnlySpan AsSpan(this string text, int start) { throw null; } + public static System.ReadOnlySpan AsSpan(this string text, int start, int length) { throw null; } + public static System.Span AsSpan(this System.ArraySegment segment) { throw null; } + public static System.Span AsSpan(this System.ArraySegment segment, int start) { throw null; } + public static System.Span AsSpan(this System.ArraySegment segment, int start, int length) { throw null; } public static System.Span AsSpan(this T[] array) { throw null; } + public static System.Span AsSpan(this T[] array, int start) { throw null; } + public static System.Span AsSpan(this T[] array, int start, int length) { throw null; } public static int BinarySearch(this System.ReadOnlySpan span, System.IComparable comparable) { throw null; } public static int BinarySearch(this System.Span span, System.IComparable comparable) { throw null; } public static int BinarySearch(this System.ReadOnlySpan span, T value, TComparer comparer) where TComparer : System.Collections.Generic.IComparer { throw null; } public static int BinarySearch(this System.ReadOnlySpan span, TComparable comparable) where TComparable : System.IComparable { throw null; } public static int BinarySearch(this System.Span span, T value, TComparer comparer) where TComparer : System.Collections.Generic.IComparer { throw null; } public static int BinarySearch(this System.Span span, TComparable comparable) where TComparable : System.IComparable { throw null; } - public static void CopyTo(this T[] array, System.Memory destination) { } - public static void CopyTo(this T[] array, System.Span destination) { } + public static int CompareTo(this System.ReadOnlySpan span, System.ReadOnlySpan other, System.StringComparison comparisonType) { throw null; } + public static bool Contains(this System.ReadOnlySpan span, System.ReadOnlySpan value, System.StringComparison comparisonType) { throw null; } + public static void CopyTo(this T[] source, System.Memory destination) { } + public static void CopyTo(this T[] source, System.Span destination) { } + public static bool EndsWith(this System.ReadOnlySpan span, System.ReadOnlySpan value, System.StringComparison comparisonType) { throw null; } public static bool EndsWith(this System.ReadOnlySpan span, System.ReadOnlySpan value) where T : System.IEquatable { throw null; } public static bool EndsWith(this System.Span span, System.ReadOnlySpan value) where T : System.IEquatable { throw null; } + public static bool Equals(this System.ReadOnlySpan span, System.ReadOnlySpan other, System.StringComparison comparisonType) { throw null; } + public static int IndexOf(this System.ReadOnlySpan span, System.ReadOnlySpan value, System.StringComparison comparisonType) { throw null; } public static int IndexOfAny(this System.ReadOnlySpan span, System.ReadOnlySpan values) where T : System.IEquatable { throw null; } public static int IndexOfAny(this System.ReadOnlySpan span, T value0, T value1) where T : System.IEquatable { throw null; } public static int IndexOfAny(this System.ReadOnlySpan span, T value0, T value1, T value2) where T : System.IEquatable { throw null; } @@ -43,6 +52,7 @@ namespace System public static int IndexOf(this System.ReadOnlySpan span, T value) where T : System.IEquatable { throw null; } public static int IndexOf(this System.Span span, System.ReadOnlySpan value) where T : System.IEquatable { throw null; } public static int IndexOf(this System.Span span, T value) where T : System.IEquatable { throw null; } + public static bool IsWhiteSpace(this System.ReadOnlySpan span) { throw null; } public static int LastIndexOfAny(this System.ReadOnlySpan span, System.ReadOnlySpan values) where T : System.IEquatable { throw null; } public static int LastIndexOfAny(this System.ReadOnlySpan span, T value0, T value1) where T : System.IEquatable { throw null; } public static int LastIndexOfAny(this System.ReadOnlySpan span, T value0, T value1, T value2) where T : System.IEquatable { throw null; } @@ -53,24 +63,36 @@ namespace System public static int LastIndexOf(this System.ReadOnlySpan span, T value) where T : System.IEquatable { throw null; } public static int LastIndexOf(this System.Span span, System.ReadOnlySpan value) where T : System.IEquatable { throw null; } public static int LastIndexOf(this System.Span span, T value) where T : System.IEquatable { throw null; } - public static System.ReadOnlySpan NonPortableCast(this System.ReadOnlySpan source) where TFrom : struct where TTo : struct { throw null; } - public static System.Span NonPortableCast(this System.Span source) where TFrom : struct where TTo : struct { throw null; } - public static bool Overlaps(this System.ReadOnlySpan first, System.ReadOnlySpan second) { throw null; } - public static bool Overlaps(this System.ReadOnlySpan first, System.ReadOnlySpan second, out int elementOffset) { throw null; } - public static bool Overlaps(this System.Span first, System.ReadOnlySpan second) { throw null; } - public static bool Overlaps(this System.Span first, System.ReadOnlySpan second, out int elementOffset) { throw null; } + public static bool Overlaps(this System.ReadOnlySpan span, System.ReadOnlySpan other) { throw null; } + public static bool Overlaps(this System.ReadOnlySpan span, System.ReadOnlySpan other, out int elementOffset) { throw null; } + public static bool Overlaps(this System.Span span, System.ReadOnlySpan other) { throw null; } + public static bool Overlaps(this System.Span span, System.ReadOnlySpan other, out int elementOffset) { throw null; } public static void Reverse(this System.Span span) { } - public static int SequenceCompareTo(this System.ReadOnlySpan first, System.ReadOnlySpan second) where T : System.IComparable { throw null; } - public static int SequenceCompareTo(this System.Span first, System.ReadOnlySpan second) where T : System.IComparable { throw null; } - public static bool SequenceEqual(this System.ReadOnlySpan first, System.ReadOnlySpan second) where T : System.IEquatable { throw null; } - public static bool SequenceEqual(this System.Span first, System.ReadOnlySpan second) where T : System.IEquatable { throw null; } + public static int SequenceCompareTo(this System.ReadOnlySpan span, System.ReadOnlySpan other) where T : System.IComparable { throw null; } + public static int SequenceCompareTo(this System.Span span, System.ReadOnlySpan other) where T : System.IComparable { throw null; } + public static bool SequenceEqual(this System.ReadOnlySpan span, System.ReadOnlySpan other) where T : System.IEquatable { throw null; } + public static bool SequenceEqual(this System.Span span, System.ReadOnlySpan other) where T : System.IEquatable { throw null; } + public static bool StartsWith(this System.ReadOnlySpan span, System.ReadOnlySpan value, System.StringComparison comparisonType) { throw null; } public static bool StartsWith(this System.ReadOnlySpan span, System.ReadOnlySpan value) where T : System.IEquatable { throw null; } public static bool StartsWith(this System.Span span, System.ReadOnlySpan value) where T : System.IEquatable { throw null; } - public static bool TryGetString(this System.ReadOnlyMemory readOnlyMemory, out string text, out int start, out int length) { throw null; } + public static int ToLower(this System.ReadOnlySpan source, System.Span destination, System.Globalization.CultureInfo culture) { throw null; } + public static int ToLowerInvariant(this System.ReadOnlySpan source, System.Span destination) { throw null; } + public static int ToUpper(this System.ReadOnlySpan source, System.Span destination, System.Globalization.CultureInfo culture) { throw null; } + public static int ToUpperInvariant(this System.ReadOnlySpan source, System.Span destination) { throw null; } + public static System.ReadOnlySpan Trim(this System.ReadOnlySpan span) { throw null; } + public static System.ReadOnlySpan Trim(this System.ReadOnlySpan span, char trimChar) { throw null; } + public static System.ReadOnlySpan Trim(this System.ReadOnlySpan span, System.ReadOnlySpan trimChars) { throw null; } + public static System.ReadOnlySpan TrimEnd(this System.ReadOnlySpan span) { throw null; } + public static System.ReadOnlySpan TrimEnd(this System.ReadOnlySpan span, char trimChar) { throw null; } + public static System.ReadOnlySpan TrimEnd(this System.ReadOnlySpan span, System.ReadOnlySpan trimChars) { throw null; } + public static System.ReadOnlySpan TrimStart(this System.ReadOnlySpan span) { throw null; } + public static System.ReadOnlySpan TrimStart(this System.ReadOnlySpan span, char trimChar) { throw null; } + public static System.ReadOnlySpan TrimStart(this System.ReadOnlySpan span, System.ReadOnlySpan trimChars) { throw null; } } public readonly partial struct Memory { private readonly object _dummy; + private readonly int _dummyPrimitive; public Memory(T[] array) { throw null; } public Memory(T[] array, int start, int length) { throw null; } public static System.Memory Empty { get { throw null; } } @@ -83,19 +105,20 @@ namespace System public override bool Equals(object obj) { throw null; } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public override int GetHashCode() { throw null; } - public static implicit operator System.Memory (System.ArraySegment arraySegment) { throw null; } + public static implicit operator System.Memory (System.ArraySegment segment) { throw null; } public static implicit operator System.ReadOnlyMemory (System.Memory memory) { throw null; } public static implicit operator System.Memory (T[] array) { throw null; } - public System.Buffers.MemoryHandle Retain(bool pin=false) { throw null; } + public System.Buffers.MemoryHandle Pin() { throw null; } public System.Memory Slice(int start) { throw null; } public System.Memory Slice(int start, int length) { throw null; } public T[] ToArray() { throw null; } + public override string ToString() { throw null; } public bool TryCopyTo(System.Memory destination) { throw null; } - public bool TryGetArray(out System.ArraySegment arraySegment) { throw null; } } public readonly partial struct ReadOnlyMemory { private readonly object _dummy; + private readonly int _dummyPrimitive; public ReadOnlyMemory(T[] array) { throw null; } public ReadOnlyMemory(T[] array, int start, int length) { throw null; } public static System.ReadOnlyMemory Empty { get { throw null; } } @@ -108,17 +131,19 @@ namespace System public bool Equals(System.ReadOnlyMemory other) { throw null; } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public override int GetHashCode() { throw null; } - public static implicit operator System.ReadOnlyMemory (System.ArraySegment arraySegment) { throw null; } + public static implicit operator System.ReadOnlyMemory (System.ArraySegment segment) { throw null; } public static implicit operator System.ReadOnlyMemory (T[] array) { throw null; } - public System.Buffers.MemoryHandle Retain(bool pin=false) { throw null; } + public System.Buffers.MemoryHandle Pin() { throw null; } public System.ReadOnlyMemory Slice(int start) { throw null; } public System.ReadOnlyMemory Slice(int start, int length) { throw null; } public T[] ToArray() { throw null; } + public override string ToString() { throw null; } public bool TryCopyTo(System.Memory destination) { throw null; } } public readonly ref partial struct ReadOnlySpan { private readonly object _dummy; + private readonly int _dummyPrimitive; [System.CLSCompliantAttribute(false)] public unsafe ReadOnlySpan(void* pointer, int length) { throw null; } public ReadOnlySpan(T[] array) { throw null; } @@ -129,32 +154,50 @@ namespace System public int Length { get { throw null; } } public void CopyTo(System.Span destination) { } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] - public static System.ReadOnlySpan DangerousCreate(object obj, ref T objectData, int length) { throw null; } - [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] [System.ObsoleteAttribute("Equals() on ReadOnlySpan will always throw an exception. Use == instead.")] public override bool Equals(object obj) { throw null; } public System.ReadOnlySpan.Enumerator GetEnumerator() { throw null; } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] [System.ObsoleteAttribute("GetHashCode() on ReadOnlySpan will always throw an exception.")] public override int GetHashCode() { throw null; } + [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] + public ref readonly T GetPinnableReference() { throw null; } public static bool operator ==(System.ReadOnlySpan left, System.ReadOnlySpan right) { throw null; } - public static implicit operator System.ReadOnlySpan (System.ArraySegment arraySegment) { throw null; } + public static implicit operator System.ReadOnlySpan (System.ArraySegment segment) { throw null; } public static implicit operator System.ReadOnlySpan (T[] array) { throw null; } public static bool operator !=(System.ReadOnlySpan left, System.ReadOnlySpan right) { throw null; } public System.ReadOnlySpan Slice(int start) { throw null; } public System.ReadOnlySpan Slice(int start, int length) { throw null; } public T[] ToArray() { throw null; } + public override string ToString() { throw null; } public bool TryCopyTo(System.Span destination) { throw null; } public ref partial struct Enumerator { private object _dummy; + private int _dummyPrimitive; public ref readonly T Current { get { throw null; } } public bool MoveNext() { throw null; } } } + public readonly partial struct SequencePosition : System.IEquatable + { + private readonly object _dummy; + private readonly int _dummyPrimitive; + public SequencePosition(object @object, int integer) { throw null; } + [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] + public override bool Equals(object obj) { throw null; } + public bool Equals(System.SequencePosition other) { throw null; } + [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] + public override int GetHashCode() { throw null; } + [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] + public int GetInteger() { throw null; } + [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] + public object GetObject() { throw null; } + } public readonly ref partial struct Span { private readonly object _dummy; + private readonly int _dummyPrimitive; [System.CLSCompliantAttribute(false)] public unsafe Span(void* pointer, int length) { throw null; } public Span(T[] array) { throw null; } @@ -166,8 +209,6 @@ namespace System public void Clear() { } public void CopyTo(System.Span destination) { } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] - public static System.Span DangerousCreate(object obj, ref T objectData, int length) { throw null; } - [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] [System.ObsoleteAttribute("Equals() on Span will always throw an exception. Use == instead.")] public override bool Equals(object obj) { throw null; } public void Fill(T value) { } @@ -175,18 +216,22 @@ namespace System [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] [System.ObsoleteAttribute("GetHashCode() on Span will always throw an exception.")] public override int GetHashCode() { throw null; } + [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] + public ref T GetPinnableReference() { throw null; } public static bool operator ==(System.Span left, System.Span right) { throw null; } - public static implicit operator System.Span (System.ArraySegment arraySegment) { throw null; } + public static implicit operator System.Span (System.ArraySegment segment) { throw null; } public static implicit operator System.ReadOnlySpan (System.Span span) { throw null; } public static implicit operator System.Span (T[] array) { throw null; } public static bool operator !=(System.Span left, System.Span right) { throw null; } public System.Span Slice(int start) { throw null; } public System.Span Slice(int start, int length) { throw null; } public T[] ToArray() { throw null; } + public override string ToString() { throw null; } public bool TryCopyTo(System.Span destination) { throw null; } public ref partial struct Enumerator { private object _dummy; + private int _dummyPrimitive; public ref T Current { get { throw null; } } public bool MoveNext() { throw null; } } @@ -194,21 +239,60 @@ namespace System } namespace System.Buffers { - public partial interface IRetainable + public static partial class BuffersExtensions { - bool Release(); - void Retain(); + public static void CopyTo(this in System.Buffers.ReadOnlySequence source, System.Span destination) { } + public static System.Nullable PositionOf(this in System.Buffers.ReadOnlySequence source, T value) where T : System.IEquatable { throw null; } + public static T[] ToArray(this in System.Buffers.ReadOnlySequence sequence) { throw null; } + public static void Write(this System.Buffers.IBufferWriter writer, System.ReadOnlySpan value) { } + } + public partial interface IBufferWriter + { + void Advance(int count); + System.Memory GetMemory(int sizeHint = 0); + System.Span GetSpan(int sizeHint = 0); + } + public partial interface IMemoryOwner : System.IDisposable + { + System.Memory Memory { get; } + } + public partial interface IPinnable + { + System.Buffers.MemoryHandle Pin(int elementIndex); + void Unpin(); } public partial struct MemoryHandle : System.IDisposable { private object _dummy; + private int _dummyPrimitive; [System.CLSCompliantAttribute(false)] - public unsafe MemoryHandle(System.Buffers.IRetainable retainable, void* pointer=null, System.Runtime.InteropServices.GCHandle handle=default(System.Runtime.InteropServices.GCHandle)) { throw null; } - public bool HasPointer { get { throw null; } } + public unsafe MemoryHandle(void* pointer, System.Runtime.InteropServices.GCHandle handle = default(System.Runtime.InteropServices.GCHandle), System.Buffers.IPinnable pinnable = null) { throw null; } [System.CLSCompliantAttribute(false)] public unsafe void* Pointer { get { throw null; } } public void Dispose() { } } + public abstract partial class MemoryManager : System.Buffers.IMemoryOwner, System.Buffers.IPinnable, System.IDisposable + { + protected MemoryManager() { } + public virtual System.Memory Memory { get { throw null; } } + protected Memory CreateMemory(int length) { throw null; } + protected Memory CreateMemory(int start, int length) { throw null; } + protected abstract void Dispose(bool disposing); + public abstract System.Span GetSpan(); + public abstract System.Buffers.MemoryHandle Pin(int elementIndex = 0); + void System.IDisposable.Dispose() { } + protected internal virtual bool TryGetArray(out System.ArraySegment segment) { throw null; } + public abstract void Unpin(); + } + public abstract partial class MemoryPool : System.IDisposable + { + protected MemoryPool() { } + public abstract int MaxBufferSize { get; } + public static System.Buffers.MemoryPool Shared { get { throw null; } } + public void Dispose() { } + protected abstract void Dispose(bool disposing); + public abstract System.Buffers.IMemoryOwner Rent(int minBufferSize = -1); + } public enum OperationStatus { DestinationTooSmall = 1, @@ -216,27 +300,57 @@ namespace System.Buffers InvalidData = 3, NeedMoreData = 2, } - public abstract partial class OwnedMemory : System.Buffers.IRetainable, System.IDisposable + public abstract partial class ReadOnlySequenceSegment { - protected OwnedMemory() { } - public abstract bool IsDisposed { get; } - protected abstract bool IsRetained { get; } - public abstract int Length { get; } - public System.Memory Memory { get { throw null; } } - public abstract System.Span Span { get; } - public void Dispose() { } - protected abstract void Dispose(bool disposing); - public abstract System.Buffers.MemoryHandle Pin(int offset=0); - public abstract bool Release(); - public abstract void Retain(); - protected internal abstract bool TryGetArray(out System.ArraySegment arraySegment); + protected ReadOnlySequenceSegment() { } + public System.ReadOnlyMemory Memory { get { throw null; } protected set { } } + public System.Buffers.ReadOnlySequenceSegment Next { get { throw null; } protected set { } } + public long RunningIndex { get { throw null; } protected set { } } + } + public readonly partial struct ReadOnlySequence + { + private readonly object _dummy; + private readonly int _dummyPrimitive; + public static readonly System.Buffers.ReadOnlySequence Empty; + public ReadOnlySequence(System.Buffers.ReadOnlySequenceSegment startSegment, int startIndex, System.Buffers.ReadOnlySequenceSegment endSegment, int endIndex) { throw null; } + public ReadOnlySequence(System.ReadOnlyMemory memory) { throw null; } + public ReadOnlySequence(T[] array) { throw null; } + public ReadOnlySequence(T[] array, int start, int length) { throw null; } + public System.SequencePosition End { get { throw null; } } + public System.ReadOnlyMemory First { get { throw null; } } + public bool IsEmpty { get { throw null; } } + public bool IsSingleSegment { get { throw null; } } + public long Length { get { throw null; } } + public System.SequencePosition Start { get { throw null; } } + public System.Buffers.ReadOnlySequence.Enumerator GetEnumerator() { throw null; } + public System.SequencePosition GetPosition(long offset) { throw null; } + public System.SequencePosition GetPosition(long offset, System.SequencePosition origin) { throw null; } + public System.Buffers.ReadOnlySequence Slice(int start, int length) { throw null; } + public System.Buffers.ReadOnlySequence Slice(int start, System.SequencePosition end) { throw null; } + public System.Buffers.ReadOnlySequence Slice(long start) { throw null; } + public System.Buffers.ReadOnlySequence Slice(long start, long length) { throw null; } + public System.Buffers.ReadOnlySequence Slice(long start, System.SequencePosition end) { throw null; } + public System.Buffers.ReadOnlySequence Slice(System.SequencePosition start) { throw null; } + public System.Buffers.ReadOnlySequence Slice(System.SequencePosition start, int length) { throw null; } + public System.Buffers.ReadOnlySequence Slice(System.SequencePosition start, long length) { throw null; } + public System.Buffers.ReadOnlySequence Slice(System.SequencePosition start, System.SequencePosition end) { throw null; } + public override string ToString() { throw null; } + public bool TryGet(ref System.SequencePosition position, out System.ReadOnlyMemory memory, bool advance = true) { throw null; } + public partial struct Enumerator + { + private object _dummy; + private int _dummyPrimitive; + public Enumerator(in System.Buffers.ReadOnlySequence sequence) { throw null; } + public System.ReadOnlyMemory Current { get { throw null; } } + public bool MoveNext() { throw null; } + } } public readonly partial struct StandardFormat : System.IEquatable { - private readonly int _dummy; + private readonly int _dummyPrimitive; public const byte MaxPrecision = (byte)99; public const byte NoPrecision = (byte)255; - public StandardFormat(char symbol, byte precision=(byte)255) { throw null; } + public StandardFormat(char symbol, byte precision = (byte)255) { throw null; } public bool HasPrecision { get { throw null; } } public bool IsDefault { get { throw null; } } public byte Precision { get { throw null; } } @@ -256,25 +370,24 @@ namespace System.Buffers.Binary { public static partial class BinaryPrimitives { - public static short ReadInt16BigEndian(System.ReadOnlySpan buffer) { throw null; } - public static short ReadInt16LittleEndian(System.ReadOnlySpan buffer) { throw null; } - public static int ReadInt32BigEndian(System.ReadOnlySpan buffer) { throw null; } - public static int ReadInt32LittleEndian(System.ReadOnlySpan buffer) { throw null; } - public static long ReadInt64BigEndian(System.ReadOnlySpan buffer) { throw null; } - public static long ReadInt64LittleEndian(System.ReadOnlySpan buffer) { throw null; } - public static T ReadMachineEndian(System.ReadOnlySpan buffer) where T : struct { throw null; } + public static short ReadInt16BigEndian(System.ReadOnlySpan source) { throw null; } + public static short ReadInt16LittleEndian(System.ReadOnlySpan source) { throw null; } + public static int ReadInt32BigEndian(System.ReadOnlySpan source) { throw null; } + public static int ReadInt32LittleEndian(System.ReadOnlySpan source) { throw null; } + public static long ReadInt64BigEndian(System.ReadOnlySpan source) { throw null; } + public static long ReadInt64LittleEndian(System.ReadOnlySpan source) { throw null; } [System.CLSCompliantAttribute(false)] - public static ushort ReadUInt16BigEndian(System.ReadOnlySpan buffer) { throw null; } + public static ushort ReadUInt16BigEndian(System.ReadOnlySpan source) { throw null; } [System.CLSCompliantAttribute(false)] - public static ushort ReadUInt16LittleEndian(System.ReadOnlySpan buffer) { throw null; } + public static ushort ReadUInt16LittleEndian(System.ReadOnlySpan source) { throw null; } [System.CLSCompliantAttribute(false)] - public static uint ReadUInt32BigEndian(System.ReadOnlySpan buffer) { throw null; } + public static uint ReadUInt32BigEndian(System.ReadOnlySpan source) { throw null; } [System.CLSCompliantAttribute(false)] - public static uint ReadUInt32LittleEndian(System.ReadOnlySpan buffer) { throw null; } + public static uint ReadUInt32LittleEndian(System.ReadOnlySpan source) { throw null; } [System.CLSCompliantAttribute(false)] - public static ulong ReadUInt64BigEndian(System.ReadOnlySpan buffer) { throw null; } + public static ulong ReadUInt64BigEndian(System.ReadOnlySpan source) { throw null; } [System.CLSCompliantAttribute(false)] - public static ulong ReadUInt64LittleEndian(System.ReadOnlySpan buffer) { throw null; } + public static ulong ReadUInt64LittleEndian(System.ReadOnlySpan source) { throw null; } public static byte ReverseEndianness(byte value) { throw null; } public static short ReverseEndianness(short value) { throw null; } public static int ReverseEndianness(int value) { throw null; } @@ -287,130 +400,150 @@ namespace System.Buffers.Binary public static uint ReverseEndianness(uint value) { throw null; } [System.CLSCompliantAttribute(false)] public static ulong ReverseEndianness(ulong value) { throw null; } - public static bool TryReadInt16BigEndian(System.ReadOnlySpan buffer, out short value) { throw null; } - public static bool TryReadInt16LittleEndian(System.ReadOnlySpan buffer, out short value) { throw null; } - public static bool TryReadInt32BigEndian(System.ReadOnlySpan buffer, out int value) { throw null; } - public static bool TryReadInt32LittleEndian(System.ReadOnlySpan buffer, out int value) { throw null; } - public static bool TryReadInt64BigEndian(System.ReadOnlySpan buffer, out long value) { throw null; } - public static bool TryReadInt64LittleEndian(System.ReadOnlySpan buffer, out long value) { throw null; } - public static bool TryReadMachineEndian(System.ReadOnlySpan buffer, out T value) where T : struct { throw null; } + public static bool TryReadInt16BigEndian(System.ReadOnlySpan source, out short value) { throw null; } + public static bool TryReadInt16LittleEndian(System.ReadOnlySpan source, out short value) { throw null; } + public static bool TryReadInt32BigEndian(System.ReadOnlySpan source, out int value) { throw null; } + public static bool TryReadInt32LittleEndian(System.ReadOnlySpan source, out int value) { throw null; } + public static bool TryReadInt64BigEndian(System.ReadOnlySpan source, out long value) { throw null; } + public static bool TryReadInt64LittleEndian(System.ReadOnlySpan source, out long value) { throw null; } [System.CLSCompliantAttribute(false)] - public static bool TryReadUInt16BigEndian(System.ReadOnlySpan buffer, out ushort value) { throw null; } + public static bool TryReadUInt16BigEndian(System.ReadOnlySpan source, out ushort value) { throw null; } [System.CLSCompliantAttribute(false)] - public static bool TryReadUInt16LittleEndian(System.ReadOnlySpan buffer, out ushort value) { throw null; } + public static bool TryReadUInt16LittleEndian(System.ReadOnlySpan source, out ushort value) { throw null; } [System.CLSCompliantAttribute(false)] - public static bool TryReadUInt32BigEndian(System.ReadOnlySpan buffer, out uint value) { throw null; } + public static bool TryReadUInt32BigEndian(System.ReadOnlySpan source, out uint value) { throw null; } [System.CLSCompliantAttribute(false)] - public static bool TryReadUInt32LittleEndian(System.ReadOnlySpan buffer, out uint value) { throw null; } + public static bool TryReadUInt32LittleEndian(System.ReadOnlySpan source, out uint value) { throw null; } [System.CLSCompliantAttribute(false)] - public static bool TryReadUInt64BigEndian(System.ReadOnlySpan buffer, out ulong value) { throw null; } + public static bool TryReadUInt64BigEndian(System.ReadOnlySpan source, out ulong value) { throw null; } [System.CLSCompliantAttribute(false)] - public static bool TryReadUInt64LittleEndian(System.ReadOnlySpan buffer, out ulong value) { throw null; } - public static bool TryWriteInt16BigEndian(System.Span buffer, short value) { throw null; } - public static bool TryWriteInt16LittleEndian(System.Span buffer, short value) { throw null; } - public static bool TryWriteInt32BigEndian(System.Span buffer, int value) { throw null; } - public static bool TryWriteInt32LittleEndian(System.Span buffer, int value) { throw null; } - public static bool TryWriteInt64BigEndian(System.Span buffer, long value) { throw null; } - public static bool TryWriteInt64LittleEndian(System.Span buffer, long value) { throw null; } - public static bool TryWriteMachineEndian(System.Span buffer, ref T value) where T : struct { throw null; } + public static bool TryReadUInt64LittleEndian(System.ReadOnlySpan source, out ulong value) { throw null; } + public static bool TryWriteInt16BigEndian(System.Span destination, short value) { throw null; } + public static bool TryWriteInt16LittleEndian(System.Span destination, short value) { throw null; } + public static bool TryWriteInt32BigEndian(System.Span destination, int value) { throw null; } + public static bool TryWriteInt32LittleEndian(System.Span destination, int value) { throw null; } + public static bool TryWriteInt64BigEndian(System.Span destination, long value) { throw null; } + public static bool TryWriteInt64LittleEndian(System.Span destination, long value) { throw null; } [System.CLSCompliantAttribute(false)] - public static bool TryWriteUInt16BigEndian(System.Span buffer, ushort value) { throw null; } + public static bool TryWriteUInt16BigEndian(System.Span destination, ushort value) { throw null; } [System.CLSCompliantAttribute(false)] - public static bool TryWriteUInt16LittleEndian(System.Span buffer, ushort value) { throw null; } + public static bool TryWriteUInt16LittleEndian(System.Span destination, ushort value) { throw null; } [System.CLSCompliantAttribute(false)] - public static bool TryWriteUInt32BigEndian(System.Span buffer, uint value) { throw null; } + public static bool TryWriteUInt32BigEndian(System.Span destination, uint value) { throw null; } [System.CLSCompliantAttribute(false)] - public static bool TryWriteUInt32LittleEndian(System.Span buffer, uint value) { throw null; } + public static bool TryWriteUInt32LittleEndian(System.Span destination, uint value) { throw null; } [System.CLSCompliantAttribute(false)] - public static bool TryWriteUInt64BigEndian(System.Span buffer, ulong value) { throw null; } + public static bool TryWriteUInt64BigEndian(System.Span destination, ulong value) { throw null; } [System.CLSCompliantAttribute(false)] - public static bool TryWriteUInt64LittleEndian(System.Span buffer, ulong value) { throw null; } - public static void WriteInt16BigEndian(System.Span buffer, short value) { } - public static void WriteInt16LittleEndian(System.Span buffer, short value) { } - public static void WriteInt32BigEndian(System.Span buffer, int value) { } - public static void WriteInt32LittleEndian(System.Span buffer, int value) { } - public static void WriteInt64BigEndian(System.Span buffer, long value) { } - public static void WriteInt64LittleEndian(System.Span buffer, long value) { } - public static void WriteMachineEndian(System.Span buffer, ref T value) where T : struct { } + public static bool TryWriteUInt64LittleEndian(System.Span destination, ulong value) { throw null; } + public static void WriteInt16BigEndian(System.Span destination, short value) { } + public static void WriteInt16LittleEndian(System.Span destination, short value) { } + public static void WriteInt32BigEndian(System.Span destination, int value) { } + public static void WriteInt32LittleEndian(System.Span destination, int value) { } + public static void WriteInt64BigEndian(System.Span destination, long value) { } + public static void WriteInt64LittleEndian(System.Span destination, long value) { } [System.CLSCompliantAttribute(false)] - public static void WriteUInt16BigEndian(System.Span buffer, ushort value) { } + public static void WriteUInt16BigEndian(System.Span destination, ushort value) { } [System.CLSCompliantAttribute(false)] - public static void WriteUInt16LittleEndian(System.Span buffer, ushort value) { } + public static void WriteUInt16LittleEndian(System.Span destination, ushort value) { } [System.CLSCompliantAttribute(false)] - public static void WriteUInt32BigEndian(System.Span buffer, uint value) { } + public static void WriteUInt32BigEndian(System.Span destination, uint value) { } [System.CLSCompliantAttribute(false)] - public static void WriteUInt32LittleEndian(System.Span buffer, uint value) { } + public static void WriteUInt32LittleEndian(System.Span destination, uint value) { } [System.CLSCompliantAttribute(false)] - public static void WriteUInt64BigEndian(System.Span buffer, ulong value) { } + public static void WriteUInt64BigEndian(System.Span destination, ulong value) { } [System.CLSCompliantAttribute(false)] - public static void WriteUInt64LittleEndian(System.Span buffer, ulong value) { } + public static void WriteUInt64LittleEndian(System.Span destination, ulong value) { } } } namespace System.Buffers.Text { public static partial class Base64 { - public static System.Buffers.OperationStatus DecodeFromUtf8(System.ReadOnlySpan utf8, System.Span bytes, out int consumed, out int written, bool isFinalBlock=true) { throw null; } - public static System.Buffers.OperationStatus DecodeFromUtf8InPlace(System.Span buffer, out int written) { throw null; } - public static System.Buffers.OperationStatus EncodeToUtf8(System.ReadOnlySpan bytes, System.Span utf8, out int consumed, out int written, bool isFinalBlock=true) { throw null; } - public static System.Buffers.OperationStatus EncodeToUtf8InPlace(System.Span buffer, int dataLength, out int written) { throw null; } + public static System.Buffers.OperationStatus DecodeFromUtf8(System.ReadOnlySpan utf8, System.Span bytes, out int bytesConsumed, out int bytesWritten, bool isFinalBlock = true) { throw null; } + public static System.Buffers.OperationStatus DecodeFromUtf8InPlace(System.Span buffer, out int bytesWritten) { throw null; } + public static System.Buffers.OperationStatus EncodeToUtf8(System.ReadOnlySpan bytes, System.Span utf8, out int bytesConsumed, out int bytesWritten, bool isFinalBlock = true) { throw null; } + public static System.Buffers.OperationStatus EncodeToUtf8InPlace(System.Span buffer, int dataLength, out int bytesWritten) { throw null; } public static int GetMaxDecodedFromUtf8Length(int length) { throw null; } public static int GetMaxEncodedToUtf8Length(int length) { throw null; } } public static partial class Utf8Formatter { - public static bool TryFormat(bool value, System.Span buffer, out int bytesWritten, System.Buffers.StandardFormat format=default(System.Buffers.StandardFormat)) { throw null; } - public static bool TryFormat(byte value, System.Span buffer, out int bytesWritten, System.Buffers.StandardFormat format=default(System.Buffers.StandardFormat)) { throw null; } - public static bool TryFormat(System.DateTime value, System.Span buffer, out int bytesWritten, System.Buffers.StandardFormat format=default(System.Buffers.StandardFormat)) { throw null; } - public static bool TryFormat(System.DateTimeOffset value, System.Span buffer, out int bytesWritten, System.Buffers.StandardFormat format=default(System.Buffers.StandardFormat)) { throw null; } - public static bool TryFormat(decimal value, System.Span buffer, out int bytesWritten, System.Buffers.StandardFormat format=default(System.Buffers.StandardFormat)) { throw null; } - public static bool TryFormat(double value, System.Span buffer, out int bytesWritten, System.Buffers.StandardFormat format=default(System.Buffers.StandardFormat)) { throw null; } - public static bool TryFormat(System.Guid value, System.Span buffer, out int bytesWritten, System.Buffers.StandardFormat format=default(System.Buffers.StandardFormat)) { throw null; } - public static bool TryFormat(short value, System.Span buffer, out int bytesWritten, System.Buffers.StandardFormat format=default(System.Buffers.StandardFormat)) { throw null; } - public static bool TryFormat(int value, System.Span buffer, out int bytesWritten, System.Buffers.StandardFormat format=default(System.Buffers.StandardFormat)) { throw null; } - public static bool TryFormat(long value, System.Span buffer, out int bytesWritten, System.Buffers.StandardFormat format=default(System.Buffers.StandardFormat)) { throw null; } + public static bool TryFormat(bool value, System.Span destination, out int bytesWritten, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; } + public static bool TryFormat(byte value, System.Span destination, out int bytesWritten, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; } + public static bool TryFormat(System.DateTime value, System.Span destination, out int bytesWritten, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; } + public static bool TryFormat(System.DateTimeOffset value, System.Span destination, out int bytesWritten, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; } + public static bool TryFormat(decimal value, System.Span destination, out int bytesWritten, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; } + public static bool TryFormat(double value, System.Span destination, out int bytesWritten, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; } + public static bool TryFormat(System.Guid value, System.Span destination, out int bytesWritten, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; } + public static bool TryFormat(short value, System.Span destination, out int bytesWritten, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; } + public static bool TryFormat(int value, System.Span destination, out int bytesWritten, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; } + public static bool TryFormat(long value, System.Span destination, out int bytesWritten, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; } [System.CLSCompliantAttribute(false)] - public static bool TryFormat(sbyte value, System.Span buffer, out int bytesWritten, System.Buffers.StandardFormat format=default(System.Buffers.StandardFormat)) { throw null; } - public static bool TryFormat(float value, System.Span buffer, out int bytesWritten, System.Buffers.StandardFormat format=default(System.Buffers.StandardFormat)) { throw null; } - public static bool TryFormat(System.TimeSpan value, System.Span buffer, out int bytesWritten, System.Buffers.StandardFormat format=default(System.Buffers.StandardFormat)) { throw null; } + public static bool TryFormat(sbyte value, System.Span destination, out int bytesWritten, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; } + public static bool TryFormat(float value, System.Span destination, out int bytesWritten, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; } + public static bool TryFormat(System.TimeSpan value, System.Span destination, out int bytesWritten, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; } [System.CLSCompliantAttribute(false)] - public static bool TryFormat(ushort value, System.Span buffer, out int bytesWritten, System.Buffers.StandardFormat format=default(System.Buffers.StandardFormat)) { throw null; } + public static bool TryFormat(ushort value, System.Span destination, out int bytesWritten, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; } [System.CLSCompliantAttribute(false)] - public static bool TryFormat(uint value, System.Span buffer, out int bytesWritten, System.Buffers.StandardFormat format=default(System.Buffers.StandardFormat)) { throw null; } + public static bool TryFormat(uint value, System.Span destination, out int bytesWritten, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; } [System.CLSCompliantAttribute(false)] - public static bool TryFormat(ulong value, System.Span buffer, out int bytesWritten, System.Buffers.StandardFormat format=default(System.Buffers.StandardFormat)) { throw null; } + public static bool TryFormat(ulong value, System.Span destination, out int bytesWritten, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; } } public static partial class Utf8Parser { - public static bool TryParse(System.ReadOnlySpan text, out bool value, out int bytesConsumed, char standardFormat='\0') { throw null; } - public static bool TryParse(System.ReadOnlySpan text, out byte value, out int bytesConsumed, char standardFormat='\0') { throw null; } - public static bool TryParse(System.ReadOnlySpan text, out System.DateTime value, out int bytesConsumed, char standardFormat='\0') { throw null; } - public static bool TryParse(System.ReadOnlySpan text, out System.DateTimeOffset value, out int bytesConsumed, char standardFormat='\0') { throw null; } - public static bool TryParse(System.ReadOnlySpan text, out decimal value, out int bytesConsumed, char standardFormat='\0') { throw null; } - public static bool TryParse(System.ReadOnlySpan text, out double value, out int bytesConsumed, char standardFormat='\0') { throw null; } - public static bool TryParse(System.ReadOnlySpan text, out System.Guid value, out int bytesConsumed, char standardFormat='\0') { throw null; } - public static bool TryParse(System.ReadOnlySpan text, out short value, out int bytesConsumed, char standardFormat='\0') { throw null; } - public static bool TryParse(System.ReadOnlySpan text, out int value, out int bytesConsumed, char standardFormat='\0') { throw null; } - public static bool TryParse(System.ReadOnlySpan text, out long value, out int bytesConsumed, char standardFormat='\0') { throw null; } + public static bool TryParse(System.ReadOnlySpan source, out bool value, out int bytesConsumed, char standardFormat = '\0') { throw null; } + public static bool TryParse(System.ReadOnlySpan source, out byte value, out int bytesConsumed, char standardFormat = '\0') { throw null; } + public static bool TryParse(System.ReadOnlySpan source, out System.DateTime value, out int bytesConsumed, char standardFormat = '\0') { throw null; } + public static bool TryParse(System.ReadOnlySpan source, out System.DateTimeOffset value, out int bytesConsumed, char standardFormat = '\0') { throw null; } + public static bool TryParse(System.ReadOnlySpan source, out decimal value, out int bytesConsumed, char standardFormat = '\0') { throw null; } + public static bool TryParse(System.ReadOnlySpan source, out double value, out int bytesConsumed, char standardFormat = '\0') { throw null; } + public static bool TryParse(System.ReadOnlySpan source, out System.Guid value, out int bytesConsumed, char standardFormat = '\0') { throw null; } + public static bool TryParse(System.ReadOnlySpan source, out short value, out int bytesConsumed, char standardFormat = '\0') { throw null; } + public static bool TryParse(System.ReadOnlySpan source, out int value, out int bytesConsumed, char standardFormat = '\0') { throw null; } + public static bool TryParse(System.ReadOnlySpan source, out long value, out int bytesConsumed, char standardFormat = '\0') { throw null; } [System.CLSCompliantAttribute(false)] - public static bool TryParse(System.ReadOnlySpan text, out sbyte value, out int bytesConsumed, char standardFormat='\0') { throw null; } - public static bool TryParse(System.ReadOnlySpan text, out float value, out int bytesConsumed, char standardFormat='\0') { throw null; } - public static bool TryParse(System.ReadOnlySpan text, out System.TimeSpan value, out int bytesConsumed, char standardFormat='\0') { throw null; } + public static bool TryParse(System.ReadOnlySpan source, out sbyte value, out int bytesConsumed, char standardFormat = '\0') { throw null; } + public static bool TryParse(System.ReadOnlySpan source, out float value, out int bytesConsumed, char standardFormat = '\0') { throw null; } + public static bool TryParse(System.ReadOnlySpan source, out System.TimeSpan value, out int bytesConsumed, char standardFormat = '\0') { throw null; } [System.CLSCompliantAttribute(false)] - public static bool TryParse(System.ReadOnlySpan text, out ushort value, out int bytesConsumed, char standardFormat='\0') { throw null; } + public static bool TryParse(System.ReadOnlySpan source, out ushort value, out int bytesConsumed, char standardFormat = '\0') { throw null; } [System.CLSCompliantAttribute(false)] - public static bool TryParse(System.ReadOnlySpan text, out uint value, out int bytesConsumed, char standardFormat='\0') { throw null; } + public static bool TryParse(System.ReadOnlySpan source, out uint value, out int bytesConsumed, char standardFormat = '\0') { throw null; } [System.CLSCompliantAttribute(false)] - public static bool TryParse(System.ReadOnlySpan text, out ulong value, out int bytesConsumed, char standardFormat='\0') { throw null; } + public static bool TryParse(System.ReadOnlySpan source, out ulong value, out int bytesConsumed, char standardFormat = '\0') { throw null; } } } namespace System.Runtime.InteropServices { public static partial class MemoryMarshal { - public static System.Memory AsMemory(System.ReadOnlyMemory readOnlyMemory) { throw null; } + public static System.ReadOnlySpan AsBytes(System.ReadOnlySpan span) where T : struct { throw null; } + public static System.Span AsBytes(System.Span span) where T : struct { throw null; } + public static System.Memory AsMemory(System.ReadOnlyMemory memory) { throw null; } + public static System.ReadOnlySpan Cast(System.ReadOnlySpan span) where TFrom : struct where TTo : struct { throw null; } + public static System.Span Cast(System.Span span) where TFrom : struct where TTo : struct { throw null; } + public static System.Memory CreateFromPinnedArray(T[] array, int start, int length) { throw null; } +#if !FEATURE_PORTABLE_SPAN + public static System.ReadOnlySpan CreateReadOnlySpan(ref T reference, int length) { throw null; } + public static System.Span CreateSpan(ref T reference, int length) { throw null; } +#endif public static ref T GetReference(System.ReadOnlySpan span) { throw null; } public static ref T GetReference(System.Span span) { throw null; } - public static bool TryGetArray(System.ReadOnlyMemory readOnlyMemory, out System.ArraySegment arraySegment) { throw null; } + public static T Read(System.ReadOnlySpan source) where T : struct { throw null; } + public static System.Collections.Generic.IEnumerable ToEnumerable(System.ReadOnlyMemory memory) { throw null; } + public static bool TryGetArray(System.ReadOnlyMemory memory, out System.ArraySegment segment) { throw null; } + public static bool TryGetMemoryManager(System.ReadOnlyMemory memory, out TManager manager) where TManager : System.Buffers.MemoryManager { throw null; } + public static bool TryGetMemoryManager(System.ReadOnlyMemory memory, out TManager manager, out int start, out int length) where TManager : System.Buffers.MemoryManager { throw null; } + public static bool TryGetString(System.ReadOnlyMemory memory, out string text, out int start, out int length) { throw null; } + public static bool TryRead(System.ReadOnlySpan source, out T value) where T : struct { throw null; } + public static bool TryWrite(System.Span destination, ref T value) where T : struct { throw null; } + public static void Write(System.Span destination, ref T value) where T : struct { } + } + public static partial class SequenceMarshal + { + public static bool TryGetArray(System.Buffers.ReadOnlySequence sequence, out System.ArraySegment segment) { throw null; } + public static bool TryGetReadOnlyMemory(System.Buffers.ReadOnlySequence sequence, out System.ReadOnlyMemory memory) { throw null; } + public static bool TryGetReadOnlySequenceSegment(System.Buffers.ReadOnlySequence sequence, out System.Buffers.ReadOnlySequenceSegment startSegment, out int startIndex, out System.Buffers.ReadOnlySequenceSegment endSegment, out int endIndex) { throw null; } } } diff --git a/external/corefx/src/System.Memory/ref/System.Memory.csproj b/external/corefx/src/System.Memory/ref/System.Memory.csproj index 2acd7aa17c..9f008fdcbd 100644 --- a/external/corefx/src/System.Memory/ref/System.Memory.csproj +++ b/external/corefx/src/System.Memory/ref/System.Memory.csproj @@ -7,13 +7,14 @@ $(NoWarn);0809 true + $(DefineConstants);FEATURE_PORTABLE_SPAN + + - - @@ -24,8 +25,9 @@ + - + \ No newline at end of file diff --git a/external/corefx/src/System.Memory/src/Configurations.props b/external/corefx/src/System.Memory/src/Configurations.props index 3026f5c782..887720fc93 100644 --- a/external/corefx/src/System.Memory/src/Configurations.props +++ b/external/corefx/src/System.Memory/src/Configurations.props @@ -1,12 +1,15 @@  - + netstandard1.1; netstandard; + + + $(PackageConfigurations); + uap-Windows_NT; netcoreapp-Windows_NT; netcoreapp-Unix; - uap-Windows_NT; - \ No newline at end of file + diff --git a/external/corefx/src/System.Memory/src/Resources/Strings.resx b/external/corefx/src/System.Memory/src/Resources/Strings.resx index 219d3c94c5..40db9b75e0 100644 --- a/external/corefx/src/System.Memory/src/Resources/Strings.resx +++ b/external/corefx/src/System.Memory/src/Resources/Strings.resx @@ -1,17 +1,17 @@  - @@ -117,10 +117,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + Equals() on Span and ReadOnlySpan is not supported. Use operator== instead. - + GetHashCode() on Span and ReadOnlySpan is not supported. @@ -150,4 +150,10 @@ Overlapping spans have mismatching alignment. - + + End position was not reached during enumeration. + + + Unexpected segment type. + + \ No newline at end of file diff --git a/external/corefx/src/System.Memory/src/System.Memory.csproj b/external/corefx/src/System.Memory/src/System.Memory.csproj index 0f67b7ee9c..3f9e4974cf 100644 --- a/external/corefx/src/System.Memory/src/System.Memory.csproj +++ b/external/corefx/src/System.Memory/src/System.Memory.csproj @@ -9,6 +9,7 @@ $(DefineConstants);netstandard;FEATURE_PORTABLE_SPAN $(DefineConstants);netcoreapp $(DefineConstants);netstandard11 + true @@ -21,20 +22,26 @@ - - - - + + + + + + + + + + - + @@ -88,6 +95,7 @@ + @@ -96,32 +104,45 @@ - - - + - + + + + + + + + + - + - - - + + + - + + + Common\System\Collections\HashHelpers.cs + Common\System\NotImplemented.cs + + Common\System\MutableDecimal.cs + + @@ -130,16 +151,28 @@ + - - - + + + System\MemoryExtensions.Fast.cs + + + System\Runtime\InteropServices\MemoryMarshal.Fast.cs + + + System\ReadOnlySpan.Fast.cs + + + System\Span.Fast.cs + + - \ No newline at end of file + diff --git a/external/corefx/src/System.Memory/src/System/Buffers/ArrayMemoryPool.ArrayMemoryPoolBuffer.cs b/external/corefx/src/System.Memory/src/System/Buffers/ArrayMemoryPool.ArrayMemoryPoolBuffer.cs new file mode 100644 index 0000000000..a5b68a25b0 --- /dev/null +++ b/external/corefx/src/System.Memory/src/System/Buffers/ArrayMemoryPool.ArrayMemoryPoolBuffer.cs @@ -0,0 +1,51 @@ +// 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.Runtime.InteropServices; + +#if !netstandard +using Internal.Runtime.CompilerServices; +#else +using System.Runtime.CompilerServices; +#endif + +namespace System.Buffers +{ + internal sealed partial class ArrayMemoryPool : MemoryPool + { + private sealed class ArrayMemoryPoolBuffer : IMemoryOwner + { + private T[] _array; + + public ArrayMemoryPoolBuffer(int size) + { + _array = ArrayPool.Shared.Rent(size); + } + + public Memory Memory + { + get + { + T[] array = _array; + if (array == null) + { + ThrowHelper.ThrowObjectDisposedException_ArrayMemoryPoolBuffer(); + } + + return new Memory(array); + } + } + + public void Dispose() + { + T[] array = _array; + if (array != null) + { + _array = null; + ArrayPool.Shared.Return(array); + } + } + } + } +} diff --git a/external/corefx/src/System.Memory/src/System/Buffers/ArrayMemoryPool.cs b/external/corefx/src/System.Memory/src/System/Buffers/ArrayMemoryPool.cs new file mode 100644 index 0000000000..3846fe364a --- /dev/null +++ b/external/corefx/src/System.Memory/src/System/Buffers/ArrayMemoryPool.cs @@ -0,0 +1,30 @@ +// 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. + +#if !netstandard && !MONO +using Internal.Runtime.CompilerServices; +#else +using System.Runtime.CompilerServices; +#endif + +namespace System.Buffers +{ + internal sealed partial class ArrayMemoryPool : MemoryPool + { + private const int s_maxBufferSize = int.MaxValue; + public sealed override int MaxBufferSize => s_maxBufferSize; + + public sealed override IMemoryOwner Rent(int minimumBufferSize = -1) + { + if (minimumBufferSize == -1) + minimumBufferSize = 1 + (4095 / Unsafe.SizeOf()); + else if (((uint)minimumBufferSize) > s_maxBufferSize) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.minimumBufferSize); + + return new ArrayMemoryPoolBuffer(minimumBufferSize); + } + + protected sealed override void Dispose(bool disposing) { } // ArrayMemoryPool is a shared pool so Dispose() would be a nop even if there were native resources to dispose. + } +} diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Binary/Reader.cs b/external/corefx/src/System.Memory/src/System/Buffers/Binary/Reader.cs index 599bcf27f8..ae3acdf00d 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Binary/Reader.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Binary/Reader.cs @@ -3,11 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -#if !netstandard -using Internal.Runtime.CompilerServices; -#endif namespace System.Buffers.Binary { @@ -127,62 +122,5 @@ namespace System.Buffers.Binary return ((ulong)ReverseEndianness((uint)value) << 32) + ReverseEndianness((uint)(value >> 32)); } - - /// - /// Reads a structure of type T out of a read-only span of bytes. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static T ReadMachineEndian(ReadOnlySpan buffer) - where T : struct - { -#if netstandard - if (SpanHelpers.IsReferenceOrContainsReferences()) - { - ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(T)); - } -#else - if (RuntimeHelpers.IsReferenceOrContainsReferences()) - { - ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(T)); - } -#endif - if (Unsafe.SizeOf() > buffer.Length) - { - ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.length); - } - return Unsafe.ReadUnaligned(ref MemoryMarshal.GetReference(buffer)); - } - - /// - /// Reads a structure of type T out of a span of bytes. - /// If the span is too small to contain the type T, return false. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryReadMachineEndian(ReadOnlySpan buffer, out T value) - where T : struct - { -#if netstandard - if (SpanHelpers.IsReferenceOrContainsReferences()) - { - ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(T)); - } -#else - if (RuntimeHelpers.IsReferenceOrContainsReferences()) - { - ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(T)); - } -#endif - if (Unsafe.SizeOf() > (uint)buffer.Length) - { -#if __MonoCS__ - value = default(T); -#else - value = default; -#endif - return false; - } - value = Unsafe.ReadUnaligned(ref MemoryMarshal.GetReference(buffer)); - return true; - } } } diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Binary/ReaderBigEndian.cs b/external/corefx/src/System.Memory/src/System/Buffers/Binary/ReaderBigEndian.cs index 54cef4eb1f..b45dd8913d 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Binary/ReaderBigEndian.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Binary/ReaderBigEndian.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; namespace System.Buffers.Binary { @@ -12,9 +13,9 @@ namespace System.Buffers.Binary /// Reads an Int16 out of a read-only span of bytes as big endian. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static short ReadInt16BigEndian(ReadOnlySpan buffer) + public static short ReadInt16BigEndian(ReadOnlySpan source) { - short result = ReadMachineEndian(buffer); + short result = MemoryMarshal.Read(source); if (BitConverter.IsLittleEndian) { result = ReverseEndianness(result); @@ -26,9 +27,9 @@ namespace System.Buffers.Binary /// Reads an Int32 out of a read-only span of bytes as big endian. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static int ReadInt32BigEndian(ReadOnlySpan buffer) + public static int ReadInt32BigEndian(ReadOnlySpan source) { - int result = ReadMachineEndian(buffer); + int result = MemoryMarshal.Read(source); if (BitConverter.IsLittleEndian) { result = ReverseEndianness(result); @@ -40,9 +41,9 @@ namespace System.Buffers.Binary /// Reads an Int64 out of a read-only span of bytes as big endian. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static long ReadInt64BigEndian(ReadOnlySpan buffer) + public static long ReadInt64BigEndian(ReadOnlySpan source) { - long result = ReadMachineEndian(buffer); + long result = MemoryMarshal.Read(source); if (BitConverter.IsLittleEndian) { result = ReverseEndianness(result); @@ -55,9 +56,9 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ushort ReadUInt16BigEndian(ReadOnlySpan buffer) + public static ushort ReadUInt16BigEndian(ReadOnlySpan source) { - ushort result = ReadMachineEndian(buffer); + ushort result = MemoryMarshal.Read(source); if (BitConverter.IsLittleEndian) { result = ReverseEndianness(result); @@ -70,9 +71,9 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static uint ReadUInt32BigEndian(ReadOnlySpan buffer) + public static uint ReadUInt32BigEndian(ReadOnlySpan source) { - uint result = ReadMachineEndian(buffer); + uint result = MemoryMarshal.Read(source); if (BitConverter.IsLittleEndian) { result = ReverseEndianness(result); @@ -85,9 +86,9 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ulong ReadUInt64BigEndian(ReadOnlySpan buffer) + public static ulong ReadUInt64BigEndian(ReadOnlySpan source) { - ulong result = ReadMachineEndian(buffer); + ulong result = MemoryMarshal.Read(source); if (BitConverter.IsLittleEndian) { result = ReverseEndianness(result); @@ -100,9 +101,9 @@ namespace System.Buffers.Binary /// If the span is too small to contain an Int16, return false. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryReadInt16BigEndian(ReadOnlySpan buffer, out short value) + public static bool TryReadInt16BigEndian(ReadOnlySpan source, out short value) { - bool success = TryReadMachineEndian(buffer, out value); + bool success = MemoryMarshal.TryRead(source, out value); if (BitConverter.IsLittleEndian) { value = ReverseEndianness(value); @@ -115,9 +116,9 @@ namespace System.Buffers.Binary /// If the span is too small to contain an Int32, return false. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryReadInt32BigEndian(ReadOnlySpan buffer, out int value) + public static bool TryReadInt32BigEndian(ReadOnlySpan source, out int value) { - bool success = TryReadMachineEndian(buffer, out value); + bool success = MemoryMarshal.TryRead(source, out value); if (BitConverter.IsLittleEndian) { value = ReverseEndianness(value); @@ -130,9 +131,9 @@ namespace System.Buffers.Binary /// If the span is too small to contain an Int64, return false. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryReadInt64BigEndian(ReadOnlySpan buffer, out long value) + public static bool TryReadInt64BigEndian(ReadOnlySpan source, out long value) { - bool success = TryReadMachineEndian(buffer, out value); + bool success = MemoryMarshal.TryRead(source, out value); if (BitConverter.IsLittleEndian) { value = ReverseEndianness(value); @@ -146,9 +147,9 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryReadUInt16BigEndian(ReadOnlySpan buffer, out ushort value) + public static bool TryReadUInt16BigEndian(ReadOnlySpan source, out ushort value) { - bool success = TryReadMachineEndian(buffer, out value); + bool success = MemoryMarshal.TryRead(source, out value); if (BitConverter.IsLittleEndian) { value = ReverseEndianness(value); @@ -162,9 +163,9 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryReadUInt32BigEndian(ReadOnlySpan buffer, out uint value) + public static bool TryReadUInt32BigEndian(ReadOnlySpan source, out uint value) { - bool success = TryReadMachineEndian(buffer, out value); + bool success = MemoryMarshal.TryRead(source, out value); if (BitConverter.IsLittleEndian) { value = ReverseEndianness(value); @@ -178,9 +179,9 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryReadUInt64BigEndian(ReadOnlySpan buffer, out ulong value) + public static bool TryReadUInt64BigEndian(ReadOnlySpan source, out ulong value) { - bool success = TryReadMachineEndian(buffer, out value); + bool success = MemoryMarshal.TryRead(source, out value); if (BitConverter.IsLittleEndian) { value = ReverseEndianness(value); diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Binary/ReaderLittleEndian.cs b/external/corefx/src/System.Memory/src/System/Buffers/Binary/ReaderLittleEndian.cs index 17cebf1f27..bd832f8995 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Binary/ReaderLittleEndian.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Binary/ReaderLittleEndian.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; namespace System.Buffers.Binary { @@ -12,9 +13,9 @@ namespace System.Buffers.Binary /// Reads an Int16 out of a read-only span of bytes as little endian. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static short ReadInt16LittleEndian(ReadOnlySpan buffer) + public static short ReadInt16LittleEndian(ReadOnlySpan source) { - short result = ReadMachineEndian(buffer); + short result = MemoryMarshal.Read(source); if (!BitConverter.IsLittleEndian) { result = ReverseEndianness(result); @@ -26,9 +27,9 @@ namespace System.Buffers.Binary /// Reads an Int32 out of a read-only span of bytes as little endian. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static int ReadInt32LittleEndian(ReadOnlySpan buffer) + public static int ReadInt32LittleEndian(ReadOnlySpan source) { - int result = ReadMachineEndian(buffer); + int result = MemoryMarshal.Read(source); if (!BitConverter.IsLittleEndian) { result = ReverseEndianness(result); @@ -40,9 +41,9 @@ namespace System.Buffers.Binary /// Reads an Int64 out of a read-only span of bytes as little endian. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static long ReadInt64LittleEndian(ReadOnlySpan buffer) + public static long ReadInt64LittleEndian(ReadOnlySpan source) { - long result = ReadMachineEndian(buffer); + long result = MemoryMarshal.Read(source); if (!BitConverter.IsLittleEndian) { result = ReverseEndianness(result); @@ -55,9 +56,9 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ushort ReadUInt16LittleEndian(ReadOnlySpan buffer) + public static ushort ReadUInt16LittleEndian(ReadOnlySpan source) { - ushort result = ReadMachineEndian(buffer); + ushort result = MemoryMarshal.Read(source); if (!BitConverter.IsLittleEndian) { result = ReverseEndianness(result); @@ -70,9 +71,9 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static uint ReadUInt32LittleEndian(ReadOnlySpan buffer) + public static uint ReadUInt32LittleEndian(ReadOnlySpan source) { - uint result = ReadMachineEndian(buffer); + uint result = MemoryMarshal.Read(source); if (!BitConverter.IsLittleEndian) { result = ReverseEndianness(result); @@ -85,9 +86,9 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ulong ReadUInt64LittleEndian(ReadOnlySpan buffer) + public static ulong ReadUInt64LittleEndian(ReadOnlySpan source) { - ulong result = ReadMachineEndian(buffer); + ulong result = MemoryMarshal.Read(source); if (!BitConverter.IsLittleEndian) { result = ReverseEndianness(result); @@ -100,9 +101,9 @@ namespace System.Buffers.Binary /// If the span is too small to contain an Int16, return false. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryReadInt16LittleEndian(ReadOnlySpan buffer, out short value) + public static bool TryReadInt16LittleEndian(ReadOnlySpan source, out short value) { - bool success = TryReadMachineEndian(buffer, out value); + bool success = MemoryMarshal.TryRead(source, out value); if (!BitConverter.IsLittleEndian) { value = ReverseEndianness(value); @@ -115,9 +116,9 @@ namespace System.Buffers.Binary /// If the span is too small to contain an Int32, return false. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryReadInt32LittleEndian(ReadOnlySpan buffer, out int value) + public static bool TryReadInt32LittleEndian(ReadOnlySpan source, out int value) { - bool success = TryReadMachineEndian(buffer, out value); + bool success = MemoryMarshal.TryRead(source, out value); if (!BitConverter.IsLittleEndian) { value = ReverseEndianness(value); @@ -130,9 +131,9 @@ namespace System.Buffers.Binary /// If the span is too small to contain an Int64, return false. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryReadInt64LittleEndian(ReadOnlySpan buffer, out long value) + public static bool TryReadInt64LittleEndian(ReadOnlySpan source, out long value) { - bool success = TryReadMachineEndian(buffer, out value); + bool success = MemoryMarshal.TryRead(source, out value); if (!BitConverter.IsLittleEndian) { value = ReverseEndianness(value); @@ -146,9 +147,9 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryReadUInt16LittleEndian(ReadOnlySpan buffer, out ushort value) + public static bool TryReadUInt16LittleEndian(ReadOnlySpan source, out ushort value) { - bool success = TryReadMachineEndian(buffer, out value); + bool success = MemoryMarshal.TryRead(source, out value); if (!BitConverter.IsLittleEndian) { value = ReverseEndianness(value); @@ -162,9 +163,9 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryReadUInt32LittleEndian(ReadOnlySpan buffer, out uint value) + public static bool TryReadUInt32LittleEndian(ReadOnlySpan source, out uint value) { - bool success = TryReadMachineEndian(buffer, out value); + bool success = MemoryMarshal.TryRead(source, out value); if (!BitConverter.IsLittleEndian) { value = ReverseEndianness(value); @@ -178,9 +179,9 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryReadUInt64LittleEndian(ReadOnlySpan buffer, out ulong value) + public static bool TryReadUInt64LittleEndian(ReadOnlySpan source, out ulong value) { - bool success = TryReadMachineEndian(buffer, out value); + bool success = MemoryMarshal.TryRead(source, out value); if (!BitConverter.IsLittleEndian) { value = ReverseEndianness(value); diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Binary/Writer.cs b/external/corefx/src/System.Memory/src/System/Buffers/Binary/Writer.cs deleted file mode 100644 index fe59623138..0000000000 --- a/external/corefx/src/System.Memory/src/System/Buffers/Binary/Writer.cs +++ /dev/null @@ -1,69 +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.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -#if !netstandard -using Internal.Runtime.CompilerServices; -#endif - -namespace System.Buffers.Binary -{ - public static partial class BinaryPrimitives - { - /// - /// Writes a structure of type T into a span of bytes. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void WriteMachineEndian(Span buffer, ref T value) - where T : struct - { -#if netstandard - if (SpanHelpers.IsReferenceOrContainsReferences()) - { - ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(T)); - } -#else - if (RuntimeHelpers.IsReferenceOrContainsReferences()) - { - ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(T)); - } -#endif - if ((uint)Unsafe.SizeOf() > (uint)buffer.Length) - { - ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.length); - } - Unsafe.WriteUnaligned(ref MemoryMarshal.GetReference(buffer), value); - } - - /// - /// Writes a structure of type T into a span of bytes. - /// If the span is too small to contain the type T, return false. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryWriteMachineEndian(Span buffer, ref T value) - where T : struct - { -#if netstandard - if (SpanHelpers.IsReferenceOrContainsReferences()) - { - ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(T)); - } -#else - if (RuntimeHelpers.IsReferenceOrContainsReferences()) - { - ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(T)); - } -#endif - if (Unsafe.SizeOf() > (uint)buffer.Length) - { - return false; - } - Unsafe.WriteUnaligned(ref MemoryMarshal.GetReference(buffer), value); - return true; - } - } -} - diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Binary/WriterBigEndian.cs b/external/corefx/src/System.Memory/src/System/Buffers/Binary/WriterBigEndian.cs index fa7228ba3b..78be9b5a03 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Binary/WriterBigEndian.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Binary/WriterBigEndian.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; namespace System.Buffers.Binary { @@ -12,39 +13,39 @@ namespace System.Buffers.Binary /// Writes an Int16 into a span of bytes as big endian. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void WriteInt16BigEndian(Span buffer, short value) + public static void WriteInt16BigEndian(Span destination, short value) { if (BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - WriteMachineEndian(buffer, ref value); + MemoryMarshal.Write(destination, ref value); } /// /// Writes an Int32 into a span of bytes as big endian. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void WriteInt32BigEndian(Span buffer, int value) + public static void WriteInt32BigEndian(Span destination, int value) { if (BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - WriteMachineEndian(buffer, ref value); + MemoryMarshal.Write(destination, ref value); } /// /// Writes an Int64 into a span of bytes as big endian. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void WriteInt64BigEndian(Span buffer, long value) + public static void WriteInt64BigEndian(Span destination, long value) { if (BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - WriteMachineEndian(buffer, ref value); + MemoryMarshal.Write(destination, ref value); } /// @@ -52,13 +53,13 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void WriteUInt16BigEndian(Span buffer, ushort value) + public static void WriteUInt16BigEndian(Span destination, ushort value) { if (BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - WriteMachineEndian(buffer, ref value); + MemoryMarshal.Write(destination, ref value); } /// @@ -66,13 +67,13 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void WriteUInt32BigEndian(Span buffer, uint value) + public static void WriteUInt32BigEndian(Span destination, uint value) { if (BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - WriteMachineEndian(buffer, ref value); + MemoryMarshal.Write(destination, ref value); } /// @@ -80,13 +81,13 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void WriteUInt64BigEndian(Span buffer, ulong value) + public static void WriteUInt64BigEndian(Span destination, ulong value) { if (BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - WriteMachineEndian(buffer, ref value); + MemoryMarshal.Write(destination, ref value); } /// @@ -94,13 +95,13 @@ namespace System.Buffers.Binary /// If the span is too small to contain the value, return false. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryWriteInt16BigEndian(Span buffer, short value) + public static bool TryWriteInt16BigEndian(Span destination, short value) { if (BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - return TryWriteMachineEndian(buffer, ref value); + return MemoryMarshal.TryWrite(destination, ref value); } /// @@ -108,13 +109,13 @@ namespace System.Buffers.Binary /// If the span is too small to contain the value, return false. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryWriteInt32BigEndian(Span buffer, int value) + public static bool TryWriteInt32BigEndian(Span destination, int value) { if (BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - return TryWriteMachineEndian(buffer, ref value); + return MemoryMarshal.TryWrite(destination, ref value); } /// @@ -122,13 +123,13 @@ namespace System.Buffers.Binary /// If the span is too small to contain the value, return false. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryWriteInt64BigEndian(Span buffer, long value) + public static bool TryWriteInt64BigEndian(Span destination, long value) { if (BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - return TryWriteMachineEndian(buffer, ref value); + return MemoryMarshal.TryWrite(destination, ref value); } /// @@ -137,13 +138,13 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryWriteUInt16BigEndian(Span buffer, ushort value) + public static bool TryWriteUInt16BigEndian(Span destination, ushort value) { if (BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - return TryWriteMachineEndian(buffer, ref value); + return MemoryMarshal.TryWrite(destination, ref value); } /// @@ -152,13 +153,13 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryWriteUInt32BigEndian(Span buffer, uint value) + public static bool TryWriteUInt32BigEndian(Span destination, uint value) { if (BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - return TryWriteMachineEndian(buffer, ref value); + return MemoryMarshal.TryWrite(destination, ref value); } /// @@ -167,13 +168,13 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryWriteUInt64BigEndian(Span buffer, ulong value) + public static bool TryWriteUInt64BigEndian(Span destination, ulong value) { if (BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - return TryWriteMachineEndian(buffer, ref value); + return MemoryMarshal.TryWrite(destination, ref value); } } } diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Binary/WriterLittleEndian.cs b/external/corefx/src/System.Memory/src/System/Buffers/Binary/WriterLittleEndian.cs index 22bbe070eb..5d63ee5f0b 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Binary/WriterLittleEndian.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Binary/WriterLittleEndian.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; namespace System.Buffers.Binary { @@ -12,39 +13,39 @@ namespace System.Buffers.Binary /// Writes an Int16 into a span of bytes as little endian. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void WriteInt16LittleEndian(Span buffer, short value) + public static void WriteInt16LittleEndian(Span destination, short value) { if (!BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - WriteMachineEndian(buffer, ref value); + MemoryMarshal.Write(destination, ref value); } /// /// Writes an Int32 into a span of bytes as little endian. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void WriteInt32LittleEndian(Span buffer, int value) + public static void WriteInt32LittleEndian(Span destination, int value) { if (!BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - WriteMachineEndian(buffer, ref value); + MemoryMarshal.Write(destination, ref value); } /// /// Writes an Int64 into a span of bytes as little endian. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void WriteInt64LittleEndian(Span buffer, long value) + public static void WriteInt64LittleEndian(Span destination, long value) { if (!BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - WriteMachineEndian(buffer, ref value); + MemoryMarshal.Write(destination, ref value); } /// @@ -52,13 +53,13 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void WriteUInt16LittleEndian(Span buffer, ushort value) + public static void WriteUInt16LittleEndian(Span destination, ushort value) { if (!BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - WriteMachineEndian(buffer, ref value); + MemoryMarshal.Write(destination, ref value); } /// @@ -66,13 +67,13 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void WriteUInt32LittleEndian(Span buffer, uint value) + public static void WriteUInt32LittleEndian(Span destination, uint value) { if (!BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - WriteMachineEndian(buffer, ref value); + MemoryMarshal.Write(destination, ref value); } /// @@ -80,13 +81,13 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void WriteUInt64LittleEndian(Span buffer, ulong value) + public static void WriteUInt64LittleEndian(Span destination, ulong value) { if (!BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - WriteMachineEndian(buffer, ref value); + MemoryMarshal.Write(destination, ref value); } /// @@ -94,13 +95,13 @@ namespace System.Buffers.Binary /// If the span is too small to contain the value, return false. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryWriteInt16LittleEndian(Span buffer, short value) + public static bool TryWriteInt16LittleEndian(Span destination, short value) { if (!BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - return TryWriteMachineEndian(buffer, ref value); + return MemoryMarshal.TryWrite(destination, ref value); } /// @@ -108,13 +109,13 @@ namespace System.Buffers.Binary /// If the span is too small to contain the value, return false. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryWriteInt32LittleEndian(Span buffer, int value) + public static bool TryWriteInt32LittleEndian(Span destination, int value) { if (!BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - return TryWriteMachineEndian(buffer, ref value); + return MemoryMarshal.TryWrite(destination, ref value); } /// @@ -122,13 +123,13 @@ namespace System.Buffers.Binary /// If the span is too small to contain the value, return false. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryWriteInt64LittleEndian(Span buffer, long value) + public static bool TryWriteInt64LittleEndian(Span destination, long value) { if (!BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - return TryWriteMachineEndian(buffer, ref value); + return MemoryMarshal.TryWrite(destination, ref value); } /// @@ -137,13 +138,13 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryWriteUInt16LittleEndian(Span buffer, ushort value) + public static bool TryWriteUInt16LittleEndian(Span destination, ushort value) { if (!BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - return TryWriteMachineEndian(buffer, ref value); + return MemoryMarshal.TryWrite(destination, ref value); } /// @@ -152,13 +153,13 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryWriteUInt32LittleEndian(Span buffer, uint value) + public static bool TryWriteUInt32LittleEndian(Span destination, uint value) { if (!BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - return TryWriteMachineEndian(buffer, ref value); + return MemoryMarshal.TryWrite(destination, ref value); } /// @@ -167,13 +168,13 @@ namespace System.Buffers.Binary /// [CLSCompliant(false)] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool TryWriteUInt64LittleEndian(Span buffer, ulong value) + public static bool TryWriteUInt64LittleEndian(Span destination, ulong value) { if (!BitConverter.IsLittleEndian) { value = ReverseEndianness(value); } - return TryWriteMachineEndian(buffer, ref value); + return MemoryMarshal.TryWrite(destination, ref value); } } } diff --git a/external/corefx/src/System.Memory/src/System/Buffers/BuffersExtensions.cs b/external/corefx/src/System.Memory/src/System/Buffers/BuffersExtensions.cs new file mode 100644 index 0000000000..fc3f0eab19 --- /dev/null +++ b/external/corefx/src/System.Memory/src/System/Buffers/BuffersExtensions.cs @@ -0,0 +1,146 @@ +// 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.Runtime.CompilerServices; + +namespace System.Buffers +{ + /// + /// Extension methods for + /// + public static class BuffersExtensions + { + /// + /// Returns position of first occurrence of item in the + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static SequencePosition? PositionOf(in this ReadOnlySequence source, T value) where T : IEquatable + { + if (source.IsSingleSegment) + { + int index = source.First.Span.IndexOf(value); + if (index != -1) + { + return source.GetPosition(index); + } + + return null; + } + else + { + return PositionOfMultiSegment(source, value); + } + } + + private static SequencePosition? PositionOfMultiSegment(in ReadOnlySequence source, T value) where T : IEquatable + { + SequencePosition position = source.Start; + SequencePosition result = position; + while (source.TryGet(ref position, out ReadOnlyMemory memory)) + { + int index = memory.Span.IndexOf(value); + if (index != -1) + { + return source.GetPosition(index, result); + } + else if (position.GetObject() == null) + { + break; + } + + result = position; + } + + return null; + } + + /// + /// Copy the to the specified . + /// + /// The source . + /// The destination . + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void CopyTo(in this ReadOnlySequence source, Span destination) + { + if (source.Length > destination.Length) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.destination); + + if (source.IsSingleSegment) + { + source.First.Span.CopyTo(destination); + } + else + { + CopyToMultiSegment(source, destination); + } + } + + private static void CopyToMultiSegment(in ReadOnlySequence sequence, Span destination) + { + SequencePosition position = sequence.Start; + while (sequence.TryGet(ref position, out ReadOnlyMemory memory)) + { + ReadOnlySpan span = memory.Span; + span.CopyTo(destination); + if (position.GetObject() != null) + { + destination = destination.Slice(span.Length); + } + else + { + break; + } + } + } + + /// + /// Converts the to an array + /// + public static T[] ToArray(in this ReadOnlySequence sequence) + { + var array = new T[sequence.Length]; + sequence.CopyTo(array); + return array; + } + + /// + /// Writes contents of to + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void Write(this IBufferWriter writer, ReadOnlySpan value) + { + Span destination = writer.GetSpan(); + + // Fast path, try copying to the available memory directly + if (value.Length <= destination.Length) + { + value.CopyTo(destination); + writer.Advance(value.Length); + } + else + { + WriteMultiSegment(writer, value, destination); + } + } + + private static void WriteMultiSegment(IBufferWriter writer, in ReadOnlySpan source, Span destination) + { + ReadOnlySpan input = source; + while (true) + { + int writeSize = Math.Min(destination.Length, input.Length); + input.Slice(0, writeSize).CopyTo(destination); + writer.Advance(writeSize); + input = input.Slice(writeSize); + if (input.Length > 0) + { + destination = writer.GetSpan(input.Length); + continue; + } + + return; + } + } + } +} diff --git a/external/corefx/src/System.Memory/src/System/Buffers/IBufferWriter.cs b/external/corefx/src/System.Memory/src/System/Buffers/IBufferWriter.cs new file mode 100644 index 0000000000..de5ea408db --- /dev/null +++ b/external/corefx/src/System.Memory/src/System/Buffers/IBufferWriter.cs @@ -0,0 +1,28 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +namespace System.Buffers +{ + /// + /// Represents a sink + /// + public interface IBufferWriter + { + /// + /// Notifies that amount of data was written to / + /// + void Advance(int count); + + /// + /// Requests the that is at least in size if possible, otherwise returns maximum available memory. + /// If is equal to 0, currently available memory would get returned. + /// + Memory GetMemory(int sizeHint = 0); + + /// + /// Requests the that is at least in size if possible, otherwise returns maximum available memory. + /// If is equal to 0, currently available memory would get returned. + /// + Span GetSpan(int sizeHint = 0); + } +} diff --git a/external/corefx/src/System.Memory/src/System/Buffers/MemoryPool.cs b/external/corefx/src/System.Memory/src/System/Buffers/MemoryPool.cs new file mode 100644 index 0000000000..72dc890ecd --- /dev/null +++ b/external/corefx/src/System.Memory/src/System/Buffers/MemoryPool.cs @@ -0,0 +1,50 @@ +// 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.Buffers +{ + /// + /// Represents a pool of memory blocks. + /// + public abstract class MemoryPool : IDisposable + { + private static readonly MemoryPool s_shared = new ArrayMemoryPool(); + + /// + /// Returns a singleton instance of a MemoryPool based on arrays. + /// + public static MemoryPool Shared => s_shared; + + /// + /// Returns a memory block capable of holding at least elements of T. + /// + /// If -1 is passed, this is set to a default value for the pool. + public abstract IMemoryOwner Rent(int minBufferSize = -1); + + /// + /// Returns the maximum buffer size supported by this pool. + /// + public abstract int MaxBufferSize { get; } + + /// + /// Constructs a new instance of a memory pool. + /// + protected MemoryPool() { } + + /// + /// Frees all resources used by the memory pool. + /// + public void Dispose() + { + Dispose(true); + GC.SuppressFinalize(this); + } + + /// + /// Frees all resources used by the memory pool. + /// + /// + protected abstract void Dispose(bool disposing); + } +} diff --git a/external/corefx/src/System.Memory/src/System/Buffers/ReadOnlySequence.cs b/external/corefx/src/System.Memory/src/System/Buffers/ReadOnlySequence.cs new file mode 100644 index 0000000000..eeb9394702 --- /dev/null +++ b/external/corefx/src/System.Memory/src/System/Buffers/ReadOnlySequence.cs @@ -0,0 +1,596 @@ +// 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.Diagnostics.Private; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +#if !FEATURE_PORTABLE_SPAN +using Internal.Runtime.CompilerServices; +#endif // FEATURE_PORTABLE_SPAN + +namespace System.Buffers +{ + /// + /// Represents a sequence that can read a sequential series of . + /// + [DebuggerTypeProxy(typeof(ReadOnlySequenceDebugView<>))] + [DebuggerDisplay("{ToString(),raw}")] + public readonly partial struct ReadOnlySequence + { + private readonly SequencePosition _sequenceStart; + private readonly SequencePosition _sequenceEnd; + + /// + /// Returns empty + /// +#if FEATURE_PORTABLE_SPAN + public static readonly ReadOnlySequence Empty = new ReadOnlySequence(SpanHelpers.PerTypeValues.EmptyArray); +#else + public static readonly ReadOnlySequence Empty = new ReadOnlySequence(Array.Empty()); +#endif // FEATURE_PORTABLE_SPAN + + /// + /// Length of the . + /// + public long Length => GetLength(); + + /// + /// Determines if the is empty. + /// + public bool IsEmpty => Length == 0; + + /// + /// Determines if the contains a single segment. + /// + public bool IsSingleSegment + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + get => _sequenceStart.GetObject() == _sequenceEnd.GetObject(); + } + + /// + /// Gets from the first segment. + /// + public ReadOnlyMemory First => GetFirstBuffer(); + + /// + /// A position to the start of the . + /// + public SequencePosition Start => _sequenceStart; + + /// + /// A position to the end of the + /// + public SequencePosition End => _sequenceEnd; + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private ReadOnlySequence(object startSegment, int startIndexAndFlags, object endSegment, int endIndexAndFlags) + { + // Used by SliceImpl to create new ReadOnlySequence + + // startSegment and endSegment can be null for default ReadOnlySequence only + Debug.Assert((startSegment != null && endSegment != null) || + (startSegment == null && endSegment == null && startIndexAndFlags == 0 && endIndexAndFlags == 0)); + + _sequenceStart = new SequencePosition(startSegment, startIndexAndFlags); + _sequenceEnd = new SequencePosition(endSegment, endIndexAndFlags); + } + + /// + /// Creates an instance of from linked memory list represented by start and end segments + /// and corresponding indexes in them. + /// + public ReadOnlySequence(ReadOnlySequenceSegment startSegment, int startIndex, ReadOnlySequenceSegment endSegment, int endIndex) + { + if (startSegment == null || + endSegment == null || + (startSegment != endSegment && startSegment.RunningIndex > endSegment.RunningIndex) || + (uint)startSegment.Memory.Length < (uint)startIndex || + (uint)endSegment.Memory.Length < (uint)endIndex || + (startSegment == endSegment && endIndex < startIndex)) + ThrowHelper.ThrowArgumentValidationException(startSegment, startIndex, endSegment); + + _sequenceStart = new SequencePosition(startSegment, ReadOnlySequence.SegmentToSequenceStart(startIndex)); + _sequenceEnd = new SequencePosition(endSegment, ReadOnlySequence.SegmentToSequenceEnd(endIndex)); + } + + /// + /// Creates an instance of from the . + /// + public ReadOnlySequence(T[] array) + { + if (array == null) + ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array); + + _sequenceStart = new SequencePosition(array, ReadOnlySequence.ArrayToSequenceStart(0)); + _sequenceEnd = new SequencePosition(array, ReadOnlySequence.ArrayToSequenceEnd(array.Length)); + } + + /// + /// Creates an instance of from the , start and index. + /// + public ReadOnlySequence(T[] array, int start, int length) + { + if (array == null || + (uint)start > (uint)array.Length || + (uint)length > (uint)(array.Length - start)) + ThrowHelper.ThrowArgumentValidationException(array, start); + + _sequenceStart = new SequencePosition(array, ReadOnlySequence.ArrayToSequenceStart(start)); + _sequenceEnd = new SequencePosition(array, ReadOnlySequence.ArrayToSequenceEnd(start + length)); + } + + /// + /// Creates an instance of from the . + /// Consumer is expected to manage lifetime of memory until is not used anymore. + /// + public ReadOnlySequence(ReadOnlyMemory memory) + { + if (MemoryMarshal.TryGetMemoryManager(memory, out MemoryManager manager, out int index, out int length)) + { + _sequenceStart = new SequencePosition(manager, ReadOnlySequence.MemoryManagerToSequenceStart(index)); + _sequenceEnd = new SequencePosition(manager, ReadOnlySequence.MemoryManagerToSequenceEnd(length)); + } + else if (MemoryMarshal.TryGetArray(memory, out ArraySegment segment)) + { + T[] array = segment.Array; + int start = segment.Offset; + _sequenceStart = new SequencePosition(array, ReadOnlySequence.ArrayToSequenceStart(start)); + _sequenceEnd = new SequencePosition(array, ReadOnlySequence.ArrayToSequenceEnd(start + segment.Count)); + } + else if (typeof(T) == typeof(char)) + { + if (!MemoryMarshal.TryGetString(((ReadOnlyMemory)(object)memory), out string text, out int start, out length)) + ThrowHelper.ThrowInvalidOperationException(); + + _sequenceStart = new SequencePosition(text, ReadOnlySequence.StringToSequenceStart(start)); + _sequenceEnd = new SequencePosition(text, ReadOnlySequence.StringToSequenceEnd(start + length)); + } + else + { + // Should never be reached + ThrowHelper.ThrowInvalidOperationException(); + _sequenceStart = default; + _sequenceEnd = default; + } + } + + /// + /// Forms a slice out of the given , beginning at , with items + /// + /// The index at which to begin this slice. + /// The length of the slice + public ReadOnlySequence Slice(long start, long length) + { + if (start < 0 || length < 0) + ThrowHelper.ThrowStartOrEndArgumentValidationException(start); + + SequencePosition begin; + SequencePosition end; + + int startIndex = GetIndex(_sequenceStart); + int endIndex = GetIndex(_sequenceEnd); + + object startObject = _sequenceStart.GetObject(); + object endObject = _sequenceEnd.GetObject(); + + if (startObject != endObject) + { + Debug.Assert(startObject != null); + var startSegment = (ReadOnlySequenceSegment)startObject; + + int currentLength = startSegment.Memory.Length - startIndex; + + // Position in start segment + if (currentLength > start) + { + startIndex += (int)start; + begin = new SequencePosition(startObject, startIndex); + + end = GetEndPosition(startSegment, startObject, startIndex, endObject, endIndex, length); + } + else + { + if (currentLength < 0) + ThrowHelper.ThrowArgumentOutOfRangeException_PositionOutOfRange(); + + begin = SeekMultiSegment(startSegment.Next, endObject, endIndex, start - currentLength, ExceptionArgument.start); + + int beginIndex = GetIndex(begin); + object beginObject = begin.GetObject(); + + if (beginObject != endObject) + { + Debug.Assert(beginObject != null); + end = GetEndPosition((ReadOnlySequenceSegment)beginObject, beginObject, beginIndex, endObject, endIndex, length); + } + else + { + if (endIndex - beginIndex < length) + ThrowHelper.ThrowStartOrEndArgumentValidationException(0); // Passing value >= 0 means throw exception on length argument + + end = new SequencePosition(beginObject, beginIndex + (int)length); + } + } + } + else + { + if (endIndex - startIndex < start) + ThrowHelper.ThrowStartOrEndArgumentValidationException(-1); // Passing value < 0 means throw exception on start argument + + startIndex += (int)start; + begin = new SequencePosition(startObject, startIndex); + + if (endIndex - startIndex < length) + ThrowHelper.ThrowStartOrEndArgumentValidationException(0); // Passing value >= 0 means throw exception on length argument + + end = new SequencePosition(startObject, startIndex + (int)length); + } + + return SliceImpl(begin, end); + } + + /// + /// Forms a slice out of the given , beginning at , ending at (inclusive). + /// + /// The index at which to begin this slice. + /// The end (inclusive) of the slice + public ReadOnlySequence Slice(long start, SequencePosition end) + { + if (start < 0) + ThrowHelper.ThrowStartOrEndArgumentValidationException(start); + + uint sliceEndIndex = (uint)GetIndex(end); + object sliceEndObject = end.GetObject(); + + uint startIndex = (uint)GetIndex(_sequenceStart); + object startObject = _sequenceStart.GetObject(); + + uint endIndex = (uint)GetIndex(_sequenceEnd); + object endObject = _sequenceEnd.GetObject(); + + // Single-Segment Sequence + if (startObject == endObject) + { + if (!InRange(sliceEndIndex, startIndex, endIndex)) + { + ThrowHelper.ThrowArgumentOutOfRangeException_PositionOutOfRange(); + } + + if (sliceEndIndex - startIndex < start) + ThrowHelper.ThrowStartOrEndArgumentValidationException(-1); // Passing value < 0 means throw exception on start argument + + goto FoundInFirstSegment; + } + + // Multi-Segment Sequence + var startSegment = (ReadOnlySequenceSegment)startObject; + ulong startRange = (ulong)(startSegment.RunningIndex + startIndex); + ulong sliceRange = (ulong)(((ReadOnlySequenceSegment)sliceEndObject).RunningIndex + sliceEndIndex); + + // This optimization works because we know sliceEndIndex, startIndex, and endIndex are all >= 0 + Debug.Assert(sliceEndIndex >= 0 && startIndex >= 0 && endIndex >= 0); + if (!InRange( + sliceRange, + startRange, + (ulong)(((ReadOnlySequenceSegment)endObject).RunningIndex + endIndex))) + { + ThrowHelper.ThrowArgumentOutOfRangeException_PositionOutOfRange(); + } + + if (startRange + (ulong)start > sliceRange) + { + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); + } + + int currentLength = startSegment.Memory.Length - (int)startIndex; + + // Position not in startSegment + if (currentLength <= start) + { + if (currentLength < 0) + ThrowHelper.ThrowArgumentOutOfRangeException_PositionOutOfRange(); + + // End of segment. Move to start of next. + SequencePosition begin = SeekMultiSegment(startSegment.Next, sliceEndObject, (int)sliceEndIndex, start - currentLength, ExceptionArgument.start); + return SliceImpl(begin, end); + } + + FoundInFirstSegment: + // startIndex + start <= int.MaxValue + Debug.Assert(start <= int.MaxValue - startIndex); + return SliceImpl(new SequencePosition(startObject, (int)startIndex + (int)start), end); + } + + /// + /// Forms a slice out of the given , beginning at , with items + /// + /// The starting (inclusive) at which to begin this slice. + /// The length of the slice + public ReadOnlySequence Slice(SequencePosition start, long length) + { + // Check start before length + uint sliceStartIndex = (uint)GetIndex(start); + object sliceStartObject = start.GetObject(); + + uint startIndex = (uint)GetIndex(_sequenceStart); + object startObject = _sequenceStart.GetObject(); + + uint endIndex = (uint)GetIndex(_sequenceEnd); + object endObject = _sequenceEnd.GetObject(); + + // Single-Segment Sequence + if (startObject == endObject) + { + if (!InRange(sliceStartIndex, startIndex, endIndex)) + { + ThrowHelper.ThrowArgumentOutOfRangeException_PositionOutOfRange(); + } + + if (length < 0) + // Passing value >= 0 means throw exception on length argument + ThrowHelper.ThrowStartOrEndArgumentValidationException(0); + + if (endIndex - sliceStartIndex < length) + ThrowHelper.ThrowStartOrEndArgumentValidationException(0); + + goto FoundInFirstSegment; + } + + // Multi-Segment Sequence + var sliceStartSegment = (ReadOnlySequenceSegment)sliceStartObject; + ulong sliceRange = (ulong)((sliceStartSegment.RunningIndex + sliceStartIndex)); + ulong startRange = (ulong)(((ReadOnlySequenceSegment)startObject).RunningIndex + startIndex); + ulong endRange = (ulong)(((ReadOnlySequenceSegment)endObject).RunningIndex + endIndex); + + // This optimization works because we know sliceStartIndex, startIndex, and endIndex are all >= 0 + Debug.Assert(sliceStartIndex >= 0 && startIndex >= 0 && endIndex >= 0); + if (!InRange(sliceRange, startRange, endRange)) + { + ThrowHelper.ThrowArgumentOutOfRangeException_PositionOutOfRange(); + } + + if (length < 0) + // Passing value >= 0 means throw exception on length argument + ThrowHelper.ThrowStartOrEndArgumentValidationException(0); + + if (sliceRange + (ulong)length > endRange) + { + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.length); + } + + int currentLength = sliceStartSegment.Memory.Length - (int)sliceStartIndex; + + // Position not in startSegment + if (currentLength < length) + { + if (currentLength < 0) + ThrowHelper.ThrowArgumentOutOfRangeException_PositionOutOfRange(); + + // End of segment. Move to start of next. + SequencePosition end = SeekMultiSegment(sliceStartSegment.Next, endObject, (int)endIndex, length - currentLength, ExceptionArgument.length); + return SliceImpl(start, end); + } + + FoundInFirstSegment: + // sliceStartIndex + length <= int.MaxValue + Debug.Assert(length <= int.MaxValue - sliceStartIndex); + return SliceImpl(start, new SequencePosition(sliceStartObject, (int)sliceStartIndex + (int)length)); + } + + /// + /// Forms a slice out of the given , beginning at , with items + /// + /// The index at which to begin this slice. + /// The length of the slice + public ReadOnlySequence Slice(int start, int length) => Slice((long)start, length); + + /// + /// Forms a slice out of the given , beginning at , ending at (inclusive). + /// + /// The index at which to begin this slice. + /// The end (inclusive) of the slice + public ReadOnlySequence Slice(int start, SequencePosition end) => Slice((long)start, end); + + /// + /// Forms a slice out of the given , beginning at ', with items + /// + /// The starting (inclusive) at which to begin this slice. + /// The length of the slice + public ReadOnlySequence Slice(SequencePosition start, int length) => Slice(start, (long)length); + + /// + /// Forms a slice out of the given , beginning at , ending at (inclusive). + /// + /// The starting (inclusive) at which to begin this slice. + /// The ending (inclusive) of the slice + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public ReadOnlySequence Slice(SequencePosition start, SequencePosition end) + { + BoundsCheck((uint)GetIndex(start), start.GetObject(), (uint)GetIndex(end), end.GetObject()); + return SliceImpl(start, end); + } + + /// + /// Forms a slice out of the given , beginning at , ending at the existing 's end. + /// + /// The starting (inclusive) at which to begin this slice. + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public ReadOnlySequence Slice(SequencePosition start) + { + BoundsCheck(start); + return SliceImpl(start, _sequenceEnd); + } + + /// + /// Forms a slice out of the given , beginning at , ending at the existing 's end. + /// + /// The start index at which to begin this slice. + public ReadOnlySequence Slice(long start) + { + if (start < 0) + ThrowHelper.ThrowStartOrEndArgumentValidationException(start); + + if (start == 0) + return this; + + SequencePosition begin = Seek(_sequenceStart, _sequenceEnd, start, ExceptionArgument.start); + return SliceImpl(begin, _sequenceEnd); + } + + /// + public override string ToString() + { + if (typeof(T) == typeof(char)) + { + ReadOnlySequence localThis = this; + ReadOnlySequence charSequence = Unsafe.As, ReadOnlySequence>(ref localThis); + + if (SequenceMarshal.TryGetString(charSequence, out string text, out int start, out int length)) + { + return text.Substring(start, length); + } + + if (Length < int.MaxValue) + { +#if !FEATURE_PORTABLE_SPAN + return string.Create((int)Length, charSequence, (span, sequence) => + { + foreach (ReadOnlyMemory readOnlyMemory in sequence) + { + ReadOnlySpan sourceSpan = readOnlyMemory.Span; + sourceSpan.CopyTo(span); + span = span.Slice(sourceSpan.Length); + } + }); +#else + return new string(charSequence.ToArray()); +#endif + } + } + + return string.Format("System.Buffers.ReadOnlySequence<{0}>[{1}]", typeof(T).Name, Length); + } + + /// + /// Returns an enumerator over the + /// + public Enumerator GetEnumerator() => new Enumerator(this); + + /// + /// Returns a new at an from the start of the sequence. + /// + public SequencePosition GetPosition(long offset) => GetPosition(offset, _sequenceStart); + + /// + /// Returns a new at an from the + /// + public SequencePosition GetPosition(long offset, SequencePosition origin) + { + if (offset < 0) + ThrowHelper.ThrowArgumentOutOfRangeException_OffsetOutOfRange(); + + return Seek(origin, _sequenceEnd, offset, ExceptionArgument.offset); + } + + /// + /// Tries to retrieve next segment after and return its contents in . + /// Returns false if end of was reached otherwise true. + /// Sets to the beginning of next segment if is set to true. + /// + public bool TryGet(ref SequencePosition position, out ReadOnlyMemory memory, bool advance = true) + { + bool result = TryGetBuffer(position, out memory, out SequencePosition next); + if (advance) + { + position = next; + } + + return result; + } + + /// + /// An enumerator over the + /// + public struct Enumerator + { + private readonly ReadOnlySequence _sequence; + private SequencePosition _next; + private ReadOnlyMemory _currentMemory; + + /// Initialize the enumerator. + /// The to enumerate. + public Enumerator(in ReadOnlySequence sequence) + { + _currentMemory = default; + _next = sequence.Start; + _sequence = sequence; + } + + /// + /// The current + /// + public ReadOnlyMemory Current => _currentMemory; + + /// + /// Moves to the next in the + /// + /// + public bool MoveNext() + { + if (_next.GetObject() == null) + { + return false; + } + + return _sequence.TryGet(ref _next, out _currentMemory); + } + } + + private enum SequenceType + { + MultiSegment = 0x00, + Array = 0x1, + MemoryManager = 0x2, + String = 0x3, + Empty = 0x4 + } + } + + internal static class ReadOnlySequence + { + public const int FlagBitMask = 1 << 31; + public const int IndexBitMask = ~FlagBitMask; + + public const int SegmentStartMask = 0; + public const int SegmentEndMask = 0; + + public const int ArrayStartMask = 0; + public const int ArrayEndMask = FlagBitMask; + + public const int MemoryManagerStartMask = FlagBitMask; + public const int MemoryManagerEndMask = 0; + + public const int StringStartMask = FlagBitMask; + public const int StringEndMask = FlagBitMask; + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static int SegmentToSequenceStart(int startIndex) => startIndex | SegmentStartMask; + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static int SegmentToSequenceEnd(int endIndex) => endIndex | SegmentEndMask; + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static int ArrayToSequenceStart(int startIndex) => startIndex | ArrayStartMask; + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static int ArrayToSequenceEnd(int endIndex) => endIndex | ArrayEndMask; + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static int MemoryManagerToSequenceStart(int startIndex) => startIndex | MemoryManagerStartMask; + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static int MemoryManagerToSequenceEnd(int endIndex) => endIndex | MemoryManagerEndMask; + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static int StringToSequenceStart(int startIndex) => startIndex | StringStartMask; + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static int StringToSequenceEnd(int endIndex) => endIndex | StringEndMask; + } +} diff --git a/external/corefx/src/System.Memory/src/System/Buffers/ReadOnlySequenceDebugView.cs b/external/corefx/src/System.Memory/src/System/Buffers/ReadOnlySequenceDebugView.cs new file mode 100644 index 0000000000..18eb503de4 --- /dev/null +++ b/external/corefx/src/System.Memory/src/System/Buffers/ReadOnlySequenceDebugView.cs @@ -0,0 +1,50 @@ +// 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 +{ + internal sealed class ReadOnlySequenceDebugView + { + private readonly T[] _array; + + private readonly ReadOnlySequenceDebugViewSegments _segments; + + public ReadOnlySequenceDebugView(ReadOnlySequence sequence) + { + _array = sequence.ToArray(); + + var segmentCount = 0; + foreach (var _ in sequence) + { + segmentCount++; + } + + var segments = new ReadOnlyMemory[segmentCount]; + int i = 0; + foreach (ReadOnlyMemory readOnlyMemory in sequence) + { + segments[i] = readOnlyMemory; + i++; + } + _segments = new ReadOnlySequenceDebugViewSegments() + { + Segments = segments + }; + } + + public ReadOnlySequenceDebugViewSegments BufferSegments => _segments; + + [DebuggerBrowsable(DebuggerBrowsableState.RootHidden)] + public T[] Items => _array; + + [DebuggerDisplay("Count: {Segments.Length}", Name = "Segments")] + public struct ReadOnlySequenceDebugViewSegments + { + [DebuggerBrowsable(DebuggerBrowsableState.RootHidden)] + public ReadOnlyMemory[] Segments { get; set; } + } + } +} diff --git a/external/corefx/src/System.Memory/src/System/Buffers/ReadOnlySequenceSegment.cs b/external/corefx/src/System.Memory/src/System/Buffers/ReadOnlySequenceSegment.cs new file mode 100644 index 0000000000..b04e84c6a5 --- /dev/null +++ b/external/corefx/src/System.Memory/src/System/Buffers/ReadOnlySequenceSegment.cs @@ -0,0 +1,27 @@ +// 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.Buffers +{ + /// + /// Represents a linked list of nodes. + /// + public abstract class ReadOnlySequenceSegment + { + /// + /// The value for current node. + /// + public ReadOnlyMemory Memory { get; protected set; } + + /// + /// The next node. + /// + public ReadOnlySequenceSegment Next { get; protected set; } + + /// + /// The sum of node length before current. + /// + public long RunningIndex { get; protected set; } + } +} diff --git a/external/corefx/src/System.Memory/src/System/Buffers/ReadOnlySequence_helpers.cs b/external/corefx/src/System.Memory/src/System/Buffers/ReadOnlySequence_helpers.cs new file mode 100644 index 0000000000..b63ad1d1f7 --- /dev/null +++ b/external/corefx/src/System.Memory/src/System/Buffers/ReadOnlySequence_helpers.cs @@ -0,0 +1,474 @@ +// 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.Private; +using System.Runtime.CompilerServices; + +#if !netstandard +using Internal.Runtime.CompilerServices; +#endif + +namespace System.Buffers +{ + public readonly partial struct ReadOnlySequence + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + internal bool TryGetBuffer(in SequencePosition position, out ReadOnlyMemory memory, out SequencePosition next) + { + object positionObject = position.GetObject(); + next = default; + + if (positionObject == null) + { + memory = default; + return false; + } + + SequenceType type = GetSequenceType(); + object endObject = _sequenceEnd.GetObject(); + int startIndex = GetIndex(position); + int endIndex = GetIndex(_sequenceEnd); + + if (type == SequenceType.MultiSegment) + { + Debug.Assert(positionObject is ReadOnlySequenceSegment); + + ReadOnlySequenceSegment startSegment = (ReadOnlySequenceSegment)positionObject; + + if (startSegment != endObject) + { + ReadOnlySequenceSegment nextSegment = startSegment.Next; + + if (nextSegment == null) + ThrowHelper.ThrowInvalidOperationException_EndPositionNotReached(); + + next = new SequencePosition(nextSegment, 0); + memory = startSegment.Memory.Slice(startIndex); + } + else + { + memory = startSegment.Memory.Slice(startIndex, endIndex - startIndex); + } + } + else + { + if (positionObject != endObject) + ThrowHelper.ThrowInvalidOperationException_EndPositionNotReached(); + + if (type == SequenceType.Array) + { + Debug.Assert(positionObject is T[]); + + memory = new ReadOnlyMemory((T[])positionObject, startIndex, endIndex - startIndex); + } + else if (typeof(T) == typeof(char) && type == SequenceType.String) + { + Debug.Assert(positionObject is string); + + memory = (ReadOnlyMemory)(object)((string)positionObject).AsMemory(startIndex, endIndex - startIndex); + } + else // type == SequenceType.MemoryManager + { + Debug.Assert(type == SequenceType.MemoryManager); + Debug.Assert(positionObject is MemoryManager); + + memory = ((MemoryManager)positionObject).Memory.Slice(startIndex, endIndex - startIndex); + } + } + + return true; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private ReadOnlyMemory GetFirstBuffer() + { + object startObject = _sequenceStart.GetObject(); + + if (startObject == null) + return default; + + int startIndex = _sequenceStart.GetInteger(); + int endIndex = _sequenceEnd.GetInteger(); + + bool isMultiSegment = startObject != _sequenceEnd.GetObject(); + + // The highest bit of startIndex and endIndex are used to infer the sequence type + // The code below is structured this way for performance reasons and is equivalent to the following: + // SequenceType type = GetSequenceType(); + // if (type == SequenceType.MultiSegment) { ... } + // else if (type == SequenceType.Array) { ... } + // else if (type == SequenceType.String){ ... } + // else if (type == SequenceType.MemoryManager) { ... } + + // Highest bit of startIndex: A = startIndex >> 31 + // Highest bit of endIndex: B = endIndex >> 31 + + if (startIndex >= 0) + { + // A == 0 && B == 0 means SequenceType.MultiSegment + // A == 0 && B == 1 means SequenceType.Array + + if (endIndex >= 0) // SequenceType.MultiSegment + { + ReadOnlyMemory memory = ((ReadOnlySequenceSegment)startObject).Memory; + if (isMultiSegment) + { + return memory.Slice(startIndex); + } + return memory.Slice(startIndex, endIndex - startIndex); + } + else // endIndex < 0, SequenceType.Array + { + if (isMultiSegment) + ThrowHelper.ThrowInvalidOperationException_EndPositionNotReached(); + + return new ReadOnlyMemory((T[])startObject, startIndex, (endIndex & ReadOnlySequence.IndexBitMask) - startIndex); + } + } + else // startIndex < 0 + { + if (isMultiSegment) + ThrowHelper.ThrowInvalidOperationException_EndPositionNotReached(); + + // A == 1 && B == 1 means SequenceType.String + // A == 1 && B == 0 means SequenceType.MemoryManager + + // The type == char check here is redundant. However, we still have it to allow + // the JIT to see when that the code is unreachable and eliminate it. + if (typeof(T) == typeof(char) && endIndex < 0) // SequenceType.String + { + // No need to remove the FlagBitMask since (endIndex - startIndex) == (endIndex & ReadOnlySequence.IndexBitMask) - (startIndex & ReadOnlySequence.IndexBitMask) + return (ReadOnlyMemory)(object)((string)startObject).AsMemory((startIndex & ReadOnlySequence.IndexBitMask), endIndex - startIndex); + } + else // endIndex >= 0, SequenceType.MemoryManager + { + startIndex &= ReadOnlySequence.IndexBitMask; + return ((MemoryManager)startObject).Memory.Slice(startIndex, endIndex - startIndex); + } + } + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private SequencePosition Seek(in SequencePosition start, in SequencePosition end, long offset, ExceptionArgument argument) + { + int startIndex = GetIndex(start); + int endIndex = GetIndex(end); + + object startObject = start.GetObject(); + object endObject = end.GetObject(); + + if (startObject != endObject) + { + Debug.Assert(startObject != null); + var startSegment = (ReadOnlySequenceSegment)startObject; + + int currentLength = startSegment.Memory.Length - startIndex; + + // Position in start segment, defer to single segment seek + if (currentLength > offset) + goto IsSingleSegment; + + if (currentLength < 0) + ThrowHelper.ThrowArgumentOutOfRangeException_PositionOutOfRange(); + + // End of segment. Move to start of next. + return SeekMultiSegment(startSegment.Next, endObject, endIndex, offset - currentLength, argument); + } + + Debug.Assert(startObject == endObject); + + if (endIndex - startIndex < offset) + ThrowHelper.ThrowArgumentOutOfRangeException(argument); + + // Single segment Seek + IsSingleSegment: + return new SequencePosition(startObject, startIndex + (int)offset); + } + + [MethodImpl(MethodImplOptions.NoInlining)] + private static SequencePosition SeekMultiSegment(ReadOnlySequenceSegment currentSegment, object endObject, int endIndex, long offset, ExceptionArgument argument) + { + Debug.Assert(currentSegment != null); + Debug.Assert(offset >= 0); + + while (currentSegment != null && currentSegment != endObject) + { + int memoryLength = currentSegment.Memory.Length; + + // Fully contained in this segment + if (memoryLength > offset) + goto FoundSegment; + + // Move to next + offset -= memoryLength; + currentSegment = currentSegment.Next; + } + + // Hit the end of the segments but didn't reach the count + if (currentSegment == null || endIndex < offset) + ThrowHelper.ThrowArgumentOutOfRangeException(argument); + + FoundSegment: + return new SequencePosition(currentSegment, (int)offset); + } + + private void BoundsCheck(in SequencePosition position) + { + uint sliceStartIndex = (uint)GetIndex(position); + uint startIndex = (uint)GetIndex(_sequenceStart); + uint endIndex = (uint)GetIndex(_sequenceEnd); + + object startObject = _sequenceStart.GetObject(); + object endObject = _sequenceEnd.GetObject(); + + // Single-Segment Sequence + if (startObject == endObject) + { + if (!InRange(sliceStartIndex, startIndex, endIndex)) + { + ThrowHelper.ThrowArgumentOutOfRangeException_PositionOutOfRange(); + } + } + else + { + // Multi-Segment Sequence + // Storing this in a local since it is used twice within InRange() + ulong startRange = (ulong)(((ReadOnlySequenceSegment)startObject).RunningIndex + startIndex); + if (!InRange( + (ulong)(((ReadOnlySequenceSegment)position.GetObject()).RunningIndex + sliceStartIndex), + startRange, + (ulong)(((ReadOnlySequenceSegment)endObject).RunningIndex + endIndex))) + { + ThrowHelper.ThrowArgumentOutOfRangeException_PositionOutOfRange(); + } + } + } + + private void BoundsCheck(uint sliceStartIndex, object sliceStartObject, uint sliceEndIndex, object sliceEndObject) + { + uint startIndex = (uint)GetIndex(_sequenceStart); + uint endIndex = (uint)GetIndex(_sequenceEnd); + + object startObject = _sequenceStart.GetObject(); + object endObject = _sequenceEnd.GetObject(); + + // Single-Segment Sequence + if (startObject == endObject) + { + if (sliceStartObject != sliceEndObject || + sliceStartObject != startObject || + sliceStartIndex > sliceEndIndex || + sliceStartIndex < startIndex || + sliceEndIndex > endIndex) + { + ThrowHelper.ThrowArgumentOutOfRangeException_PositionOutOfRange(); + } + } + else + { + // Multi-Segment Sequence + // This optimization works because we know sliceStartIndex, sliceEndIndex, startIndex, and endIndex are all >= 0 + Debug.Assert(sliceStartIndex >= 0 && startIndex >= 0 && endIndex >= 0); + + ulong sliceStartRange = (ulong)(((ReadOnlySequenceSegment)sliceStartObject).RunningIndex + sliceStartIndex); + ulong sliceEndRange = (ulong)(((ReadOnlySequenceSegment)sliceEndObject).RunningIndex + sliceEndIndex); + + if (sliceStartRange > sliceEndRange) + ThrowHelper.ThrowArgumentOutOfRangeException_PositionOutOfRange(); + + if (sliceStartRange < (ulong)(((ReadOnlySequenceSegment)startObject).RunningIndex + startIndex) + || sliceEndRange > (ulong)(((ReadOnlySequenceSegment)endObject).RunningIndex + endIndex)) + { + ThrowHelper.ThrowArgumentOutOfRangeException_PositionOutOfRange(); + } + } + } + + private static SequencePosition GetEndPosition(ReadOnlySequenceSegment startSegment, object startObject, int startIndex, object endObject, int endIndex, long length) + { + int currentLength = startSegment.Memory.Length - startIndex; + + if (currentLength > length) + { + return new SequencePosition(startObject, startIndex + (int)length); + } + + if (currentLength < 0) + ThrowHelper.ThrowArgumentOutOfRangeException_PositionOutOfRange(); + + return SeekMultiSegment(startSegment.Next, endObject, endIndex, length - currentLength, ExceptionArgument.length); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private SequenceType GetSequenceType() + { + // We take high order bits of two indexes and move them + // to a first and second position to convert to SequenceType + + // if (start < 0 and end < 0) + // start >> 31 = -1, end >> 31 = -1 + // 2 * (-1) + (-1) = -3, result = (SequenceType)3 + + // if (start < 0 and end >= 0) + // start >> 31 = -1, end >> 31 = 0 + // 2 * (-1) + 0 = -2, result = (SequenceType)2 + + // if (start >= 0 and end >= 0) + // start >> 31 = 0, end >> 31 = 0 + // 2 * 0 + 0 = 0, result = (SequenceType)0 + + // if (start >= 0 and end < 0) + // start >> 31 = 0, end >> 31 = -1 + // 2 * 0 + (-1) = -1, result = (SequenceType)1 + + return (SequenceType)(-(2 * (_sequenceStart.GetInteger() >> 31) + (_sequenceEnd.GetInteger() >> 31))); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static int GetIndex(in SequencePosition position) => position.GetInteger() & ReadOnlySequence.IndexBitMask; + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private ReadOnlySequence SliceImpl(in SequencePosition start, in SequencePosition end) + { + // In this method we reset high order bits from indices + // of positions that were passed in + // and apply type bits specific for current ReadOnlySequence type + + return new ReadOnlySequence( + start.GetObject(), + GetIndex(start) | (_sequenceStart.GetInteger() & ReadOnlySequence.FlagBitMask), + end.GetObject(), + GetIndex(end) | (_sequenceEnd.GetInteger() & ReadOnlySequence.FlagBitMask) + ); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private long GetLength() + { + int startIndex = GetIndex(_sequenceStart); + int endIndex = GetIndex(_sequenceEnd); + object startObject = _sequenceStart.GetObject(); + object endObject = _sequenceEnd.GetObject(); + + if (startObject != endObject) + { + var startSegment = (ReadOnlySequenceSegment)startObject; + var endSegment = (ReadOnlySequenceSegment)endObject; + // (End offset) - (start offset) + return (endSegment.RunningIndex + endIndex) - (startSegment.RunningIndex + startIndex); + } + + // Single segment length + return endIndex - startIndex; + } + + internal bool TryGetReadOnlySequenceSegment(out ReadOnlySequenceSegment startSegment, out int startIndex, out ReadOnlySequenceSegment endSegment, out int endIndex) + { + object startObject = _sequenceStart.GetObject(); + + // Default or not MultiSegment + if (startObject == null || GetSequenceType() != SequenceType.MultiSegment) + { + startSegment = null; + startIndex = 0; + endSegment = null; + endIndex = 0; + return false; + } + + Debug.Assert(_sequenceEnd.GetObject() != null); + + startSegment = (ReadOnlySequenceSegment)startObject; + startIndex = GetIndex(_sequenceStart); + endSegment = (ReadOnlySequenceSegment)_sequenceEnd.GetObject(); + endIndex = GetIndex(_sequenceEnd); + return true; + } + + internal bool TryGetArray(out ArraySegment segment) + { + if (GetSequenceType() != SequenceType.Array) + { + segment = default; + return false; + } + + Debug.Assert(_sequenceStart.GetObject() != null); + + int startIndex = GetIndex(_sequenceStart); + segment = new ArraySegment((T[])_sequenceStart.GetObject(), startIndex, GetIndex(_sequenceEnd) - startIndex); + return true; + } + + internal bool TryGetString(out string text, out int start, out int length) + { + if (typeof(T) != typeof(char) || GetSequenceType() != SequenceType.String) + { + start = 0; + length = 0; + text = null; + return false; + } + + Debug.Assert(_sequenceStart.GetObject() != null); + + start = GetIndex(_sequenceStart); + length = GetIndex(_sequenceEnd) - start; + text = (string)_sequenceStart.GetObject(); + return true; + } + + private static bool InRange(uint value, uint start, uint end) + { + // _sequenceStart and _sequenceEnd must be well-formed + Debug.Assert(start <= int.MaxValue); + Debug.Assert(end <= int.MaxValue); + Debug.Assert(start <= end); + + // The case, value > int.MaxValue, is invalid, and hence it shouldn't be in the range. + // If value > int.MaxValue, it is invariably greater than both 'start' and 'end'. + // In that case, the experession simplifies to value <= end, which will return false. + + // The case, value < start, is invalid. + // In that case, (value - start) would underflow becoming larger than int.MaxValue. + // (end - start) can never underflow and hence must be within 0 and int.MaxValue. + // So, we will correctly return false. + + // The case, value > end, is invalid. + // In that case, the expression simplifies to value <= end, which will return false. + // This is because end > start & value > end implies value > start as well. + + // In all other cases, value is valid, and we return true. + + // Equivalent to: return (start <= value && value <= start) + return (value - start) <= (end - start); + } + + private static bool InRange(ulong value, ulong start, ulong end) + { + // _sequenceStart and _sequenceEnd must be well-formed + Debug.Assert(start <= long.MaxValue); + Debug.Assert(end <= long.MaxValue); + Debug.Assert(start <= end); + + // The case, value > long.MaxValue, is invalid, and hence it shouldn't be in the range. + // If value > long.MaxValue, it is invariably greater than both 'start' and 'end'. + // In that case, the experession simplifies to value <= end, which will return false. + + // The case, value < start, is invalid. + // In that case, (value - start) would underflow becoming larger than long.MaxValue. + // (end - start) can never underflow and hence must be within 0 and long.MaxValue. + // So, we will correctly return false. + + // The case, value > end, is invalid. + // In that case, the expression simplifies to value <= end, which will return false. + // This is because end > start & value > end implies value > start as well. + + // In all other cases, value is valid, and we return true. + + // Equivalent to: return (start <= value && value <= start) + return (value - start) <= (end - start); + } + } +} diff --git a/external/corefx/src/System.Memory/src/System/Buffers/StandardFormat.cs b/external/corefx/src/System.Memory/src/System/Buffers/StandardFormat.cs index 58c6514d3c..3354f6d7f2 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/StandardFormat.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/StandardFormat.cs @@ -103,7 +103,7 @@ namespace System.Buffers /// /// Converts a classic .NET format string into a StandardFormat /// - public static StandardFormat Parse(string format) => format == null ? default : Parse(MemoryExtensions.AsReadOnlySpan(format)); //@todo: Change back to extension syntax once the ambiguous reference with CoreLib is eliminated. + public static StandardFormat Parse(string format) => format == null ? default : Parse(format.AsSpan()); /// /// Returns true if both the Symbol and Precision are equal. diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Base64Decoder.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Base64Decoder.cs index 8070b9a2a3..29525d5c97 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Base64Decoder.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Base64Decoder.cs @@ -19,8 +19,8 @@ namespace System.Buffers.Text /// /// The input span which contains UTF-8 encoded text in base 64 that needs to be decoded. /// The output span which contains the result of the operation, i.e. the decoded binary data. - /// The number of input bytes consumed during the operation. This can be used to slice the input for subsequent calls, if necessary. - /// The number of bytes written into the output span. This can be used to slice the output for subsequent calls, if necessary. + /// The number of input bytes consumed during the operation. This can be used to slice the input for subsequent calls, if necessary. + /// The number of bytes written into the output span. This can be used to slice the output for subsequent calls, if necessary. /// True (default) when the input span contains the entire data to decode. /// Set to false only if it is known that the input span contains partial data with more data to follow. /// It returns the OperationStatus enum values: @@ -30,7 +30,7 @@ namespace System.Buffers.Text /// - InvalidData - if the input contains bytes outside of the expected base 64 range, or if it contains invalid/more than two padding characters, /// or if the input is incomplete (i.e. not a multiple of 4) and isFinalBlock is true. /// - public static OperationStatus DecodeFromUtf8(ReadOnlySpan utf8, Span bytes, out int consumed, out int written, bool isFinalBlock = true) + public static OperationStatus DecodeFromUtf8(ReadOnlySpan utf8, Span bytes, out int bytesConsumed, out int bytesWritten, bool isFinalBlock = true) { ref byte srcBytes = ref MemoryMarshal.GetReference(utf8); ref byte destBytes = ref MemoryMarshal.GetReference(bytes); @@ -148,25 +148,25 @@ namespace System.Buffers.Text goto InvalidExit; DoneExit: - consumed = sourceIndex; - written = destIndex; + bytesConsumed = sourceIndex; + bytesWritten = destIndex; return OperationStatus.Done; DestinationSmallExit: if (srcLength != utf8.Length && isFinalBlock) goto InvalidExit; // if input is not a multiple of 4, and there is no more data, return invalid data instead - consumed = sourceIndex; - written = destIndex; + bytesConsumed = sourceIndex; + bytesWritten = destIndex; return OperationStatus.DestinationTooSmall; NeedMoreExit: - consumed = sourceIndex; - written = destIndex; + bytesConsumed = sourceIndex; + bytesWritten = destIndex; return OperationStatus.NeedMoreData; InvalidExit: - consumed = sourceIndex; - written = destIndex; + bytesConsumed = sourceIndex; + bytesWritten = destIndex; return OperationStatus.InvalidData; } @@ -191,7 +191,7 @@ namespace System.Buffers.Text /// If the input is not a multiple of 4, it will not decode any. /// /// The input span which contains the base 64 text data that needs to be decoded. - /// The number of bytes written into the buffer. + /// The number of bytes written into the buffer. /// It returns the OperationStatus enum values: /// - Done - on successful processing of the entire input span /// - InvalidData - if the input contains bytes outside of the expected base 64 range, or if it contains invalid/more than two padding characters, @@ -200,7 +200,7 @@ namespace System.Buffers.Text /// It does not return NeedMoreData since this method tramples the data in the buffer and /// hence can only be called once with all the data in the buffer. /// - public static OperationStatus DecodeFromUtf8InPlace(Span buffer, out int written) + public static OperationStatus DecodeFromUtf8InPlace(Span buffer, out int bytesWritten) { int bufferLength = buffer.Length; int sourceIndex = 0; @@ -277,11 +277,11 @@ namespace System.Buffers.Text } DoneExit: - written = destIndex; + bytesWritten = destIndex; return OperationStatus.Done; InvalidExit: - written = destIndex; + bytesWritten = destIndex; return OperationStatus.InvalidData; } diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Base64Encoder.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Base64Encoder.cs index fab5542c03..9b0a8222d0 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Base64Encoder.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Base64Encoder.cs @@ -21,8 +21,8 @@ namespace System.Buffers.Text /// /// The input span which contains binary data that needs to be encoded. /// The output span which contains the result of the operation, i.e. the UTF-8 encoded text in base 64. - /// The number of input bytes consumed during the operation. This can be used to slice the input for subsequent calls, if necessary. - /// The number of bytes written into the output span. This can be used to slice the output for subsequent calls, if necessary. + /// The number of input bytes consumed during the operation. This can be used to slice the input for subsequent calls, if necessary. + /// The number of bytes written into the output span. This can be used to slice the output for subsequent calls, if necessary. /// True (default) when the input span contains the entire data to decode. /// Set to false only if it is known that the input span contains partial data with more data to follow. /// It returns the OperationStatus enum values: @@ -31,7 +31,7 @@ namespace System.Buffers.Text /// - NeedMoreData - only if isFinalBlock is false, otherwise the output is padded if the input is not a multiple of 3 /// It does not return InvalidData since that is not possible for base 64 encoding. /// - public static OperationStatus EncodeToUtf8(ReadOnlySpan bytes, Span utf8, out int consumed, out int written, bool isFinalBlock = true) + public static OperationStatus EncodeToUtf8(ReadOnlySpan bytes, Span utf8, out int bytesConsumed, out int bytesWritten, bool isFinalBlock = true) { ref byte srcBytes = ref MemoryMarshal.GetReference(bytes); ref byte destBytes = ref MemoryMarshal.GetReference(utf8); @@ -66,7 +66,7 @@ namespace System.Buffers.Text if (maxSrcLength != srcLength - 2) goto DestinationSmallExit; - if (isFinalBlock != true) + if (!isFinalBlock) goto NeedMoreDataExit; if (sourceIndex == srcLength - 1) @@ -84,18 +84,18 @@ namespace System.Buffers.Text sourceIndex += 2; } - consumed = sourceIndex; - written = destIndex; + bytesConsumed = sourceIndex; + bytesWritten = destIndex; return OperationStatus.Done; NeedMoreDataExit: - consumed = sourceIndex; - written = destIndex; + bytesConsumed = sourceIndex; + bytesWritten = destIndex; return OperationStatus.NeedMoreData; DestinationSmallExit: - consumed = sourceIndex; - written = destIndex; + bytesConsumed = sourceIndex; + bytesWritten = destIndex; return OperationStatus.DestinationTooSmall; } @@ -108,7 +108,7 @@ namespace System.Buffers.Text [MethodImpl(MethodImplOptions.AggressiveInlining)] public static int GetMaxEncodedToUtf8Length(int length) { - if (length < 0 || length > MaximumEncodeLength) + if ((uint)length > MaximumEncodeLength) ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.length); return (((length + 2) / 3) * 4); @@ -122,20 +122,20 @@ namespace System.Buffers.Text /// It needs to be large enough to fit the result of the operation. /// The amount of binary data contained within the buffer that needs to be encoded /// (and needs to be smaller than the buffer length). - /// The number of bytes written into the buffer. + /// The number of bytes written into the buffer. /// It returns the OperationStatus enum values: /// - Done - on successful processing of the entire buffer /// - DestinationTooSmall - if there is not enough space in the buffer beyond dataLength to fit the result of encoding the input /// It does not return NeedMoreData since this method tramples the data in the buffer and hence can only be called once with all the data in the buffer. /// It does not return InvalidData since that is not possible for base 64 encoding. /// - public static OperationStatus EncodeToUtf8InPlace(Span buffer, int dataLength, out int written) + public static OperationStatus EncodeToUtf8InPlace(Span buffer, int dataLength, out int bytesWritten) { int encodedLength = GetMaxEncodedToUtf8Length(dataLength); if (buffer.Length < encodedLength) goto FalseExit; - int leftover = dataLength - dataLength / 3 * 3; // how many bytes after packs of 3 + int leftover = dataLength - (dataLength / 3) * 3; // how many bytes after packs of 3 int destinationIndex = encodedLength - 4; int sourceIndex = dataLength - leftover; @@ -170,11 +170,11 @@ namespace System.Buffers.Text sourceIndex -= 3; } - written = encodedLength; + bytesWritten = encodedLength; return OperationStatus.Done; FalseExit: - written = 0; + bytesWritten = 0; return OperationStatus.DestinationTooSmall; } @@ -228,6 +228,6 @@ namespace System.Buffers.Text private const byte EncodingPad = (byte)'='; // '=', for padding - private const int MaximumEncodeLength = (int.MaxValue >> 2) * 3; // 1610612733 + private const int MaximumEncodeLength = (int.MaxValue / 4) * 3; // 1610612733 } } diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/FormattingHelpers.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/FormattingHelpers.cs index 86079ed871..a12d8d4475 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/FormattingHelpers.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/FormattingHelpers.cs @@ -3,18 +3,15 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.CompilerServices; -#if !netstandard -using Internal.Runtime.CompilerServices; -#endif - namespace System.Buffers.Text { // All the helper methods in this class assume that the by-ref is valid and that there is // enough space to fit the items that will be written into the underlying memory. The calling // code must have already done all the necessary validation. - internal static class FormattingHelpers + internal static partial class FormattingHelpers { // A simple lookup table for converting numbers to hex. internal const string HexTableLower = "0123456789abcdef"; @@ -26,7 +23,11 @@ namespace System.Buffers.Text /// has not been initialized, returns the provided fallback symbol. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] +#if !__MonoCS__ public static char GetSymbolOrDefault(in StandardFormat format, char defaultSymbol) +#else + public static char GetSymbolOrDefault(StandardFormat format, char defaultSymbol) +#endif { // This is equivalent to the line below, but it is written in such a way // that the JIT is able to perform more optimizations. @@ -276,126 +277,6 @@ namespace System.Buffers.Text return zeroCount; } - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static int CountDigits(ulong value) - { - int digits = 1; - uint part; - if (value >= 10000000) - { - if (value >= 100000000000000) - { - part = (uint)(value / 100000000000000); - digits += 14; - } - else - { - part = (uint)(value / 10000000); - digits += 7; - } - } - else - { - part = (uint)value; - } - - if (part < 10) - { - // no-op - } - else if (part < 100) - { - digits += 1; - } - else if (part < 1000) - { - digits += 2; - } - else if (part < 10000) - { - digits += 3; - } - else if (part < 100000) - { - digits += 4; - } - else if (part < 1000000) - { - digits += 5; - } - else - { - Debug.Assert(part < 10000000); - digits += 6; - } - - return digits; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static int CountDigits(uint value) - { - int digits = 1; - if (value >= 100000) - { - value = value / 100000; - digits += 5; - } - - if (value < 10) - { - // no-op - } - else if (value < 100) - { - digits += 1; - } - else if (value < 1000) - { - digits += 2; - } - else if (value < 10000) - { - digits += 3; - } - else - { - Debug.Assert(value < 100000); - digits += 4; - } - - return digits; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static int CountHexDigits(ulong value) - { - // TODO: When x86 intrinsic support comes online, experiment with implementing this using lzcnt. - // return 16 - (int)((uint)Lzcnt.LeadingZeroCount(value | 1) >> 3); - - int digits = 1; - - if (value > 0xFFFFFFFF) - { - digits += 8; - value >>= 0x20; - } - if (value > 0xFFFF) - { - digits += 4; - value >>= 0x10; - } - if (value > 0xFF) - { - digits += 2; - value >>= 0x8; - } - if (value > 0xF) - digits++; - - return digits; - } - #endregion Character counting helper methods } } diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Boolean.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Boolean.cs index d9cb3b7004..e5bc21918e 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Boolean.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Boolean.cs @@ -12,7 +12,7 @@ namespace System.Buffers.Text /// Formats a Boolean as a UTF8 string. /// /// Value to format - /// Buffer to write the UTF8-formatted value to + /// Buffer to write the UTF8-formatted value to /// Receives the length of the formatted text in bytes /// The standard format to use /// @@ -27,7 +27,7 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryFormat(bool value, Span buffer, out int bytesWritten, StandardFormat format = default) + public static bool TryFormat(bool value, Span destination, out int bytesWritten, StandardFormat format = default) { char symbol = FormattingHelpers.GetSymbolOrDefault(format, 'G'); @@ -39,7 +39,7 @@ namespace System.Buffers.Text // constant value is passed to this routine, which means the compiler can reverse endianness // at compile time instead of runtime if necessary. const uint TrueValueUppercase = ('T' << 24) + ('r' << 16) + ('u' << 8) + ('e' << 0); - if (!BinaryPrimitives.TryWriteUInt32BigEndian(buffer, TrueValueUppercase)) + if (!BinaryPrimitives.TryWriteUInt32BigEndian(destination, TrueValueUppercase)) { goto BufferTooSmall; } @@ -47,7 +47,7 @@ namespace System.Buffers.Text else if (symbol == 'l') { const uint TrueValueLowercase = ('t' << 24) + ('r' << 16) + ('u' << 8) + ('e' << 0); - if (!BinaryPrimitives.TryWriteUInt32BigEndian(buffer, TrueValueLowercase)) + if (!BinaryPrimitives.TryWriteUInt32BigEndian(destination, TrueValueLowercase)) { goto BufferTooSmall; } @@ -66,30 +66,30 @@ namespace System.Buffers.Text { // This check can't be performed earlier because we need to throw if an invalid symbol is // provided, even if the buffer is too small. - if ((uint)4 >= (uint)buffer.Length) + if ((uint)4 >= (uint)destination.Length) { goto BufferTooSmall; } const uint FalsValueUppercase = ('F' << 24) + ('a' << 16) + ('l' << 8) + ('s' << 0); - BinaryPrimitives.WriteUInt32BigEndian(buffer, FalsValueUppercase); + BinaryPrimitives.WriteUInt32BigEndian(destination, FalsValueUppercase); } else if (symbol == 'l') { - if ((uint)4 >= (uint)buffer.Length) + if ((uint)4 >= (uint)destination.Length) { goto BufferTooSmall; } const uint FalsValueLowercase = ('f' << 24) + ('a' << 16) + ('l' << 8) + ('s' << 0); - BinaryPrimitives.WriteUInt32BigEndian(buffer, FalsValueLowercase); + BinaryPrimitives.WriteUInt32BigEndian(destination, FalsValueLowercase); } else { goto BadFormat; } - buffer[4] = (byte)'e'; + destination[4] = (byte)'e'; bytesWritten = 5; return true; } diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Date.G.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Date.G.cs index 7915ec5c51..7aad6fef0f 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Date.G.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Date.G.cs @@ -19,7 +19,7 @@ namespace System.Buffers.Text // -------------------------- // 05/25/2017 10:30:15 -08:00 // - private static bool TryFormatDateTimeG(DateTime value, TimeSpan offset, Span buffer, out int bytesWritten) + private static bool TryFormatDateTimeG(DateTime value, TimeSpan offset, Span destination, out int bytesWritten) { const int MinimumBytesNeeded = 19; @@ -30,7 +30,7 @@ namespace System.Buffers.Text bytesRequired += 7; // Space['+'|'-']hh:mm } - if (buffer.Length < bytesRequired) + if (destination.Length < bytesRequired) { bytesWritten = 0; return false; @@ -39,28 +39,28 @@ namespace System.Buffers.Text bytesWritten = bytesRequired; // Hoist most of the bounds checks on buffer. - { var unused = buffer[MinimumBytesNeeded - 1]; } + { var unused = destination[MinimumBytesNeeded - 1]; } // TODO: Introduce an API which can parse DateTime instances efficiently, pulling out // all their properties (Month, Day, etc.) in one shot. This would help avoid the // duplicate work that implicitly results from calling these properties individually. - FormattingHelpers.WriteTwoDecimalDigits((uint)value.Month, buffer, 0); - buffer[2] = Utf8Constants.Slash; + FormattingHelpers.WriteTwoDecimalDigits((uint)value.Month, destination, 0); + destination[2] = Utf8Constants.Slash; - FormattingHelpers.WriteTwoDecimalDigits((uint)value.Day, buffer, 3); - buffer[5] = Utf8Constants.Slash; + FormattingHelpers.WriteTwoDecimalDigits((uint)value.Day, destination, 3); + destination[5] = Utf8Constants.Slash; - FormattingHelpers.WriteFourDecimalDigits((uint)value.Year, buffer, 6); - buffer[10] = Utf8Constants.Space; + FormattingHelpers.WriteFourDecimalDigits((uint)value.Year, destination, 6); + destination[10] = Utf8Constants.Space; - FormattingHelpers.WriteTwoDecimalDigits((uint)value.Hour, buffer, 11); - buffer[13] = Utf8Constants.Colon; + FormattingHelpers.WriteTwoDecimalDigits((uint)value.Hour, destination, 11); + destination[13] = Utf8Constants.Colon; - FormattingHelpers.WriteTwoDecimalDigits((uint)value.Minute, buffer, 14); - buffer[16] = Utf8Constants.Colon; + FormattingHelpers.WriteTwoDecimalDigits((uint)value.Minute, destination, 14); + destination[16] = Utf8Constants.Colon; - FormattingHelpers.WriteTwoDecimalDigits((uint)value.Second, buffer, 17); + FormattingHelpers.WriteTwoDecimalDigits((uint)value.Second, destination, 17); if (offset != Utf8Constants.s_nullUtcOffset) { @@ -79,11 +79,11 @@ namespace System.Buffers.Text // Writing the value backward allows the JIT to optimize by // performing a single bounds check against buffer. - FormattingHelpers.WriteTwoDecimalDigits((uint)offset.Minutes, buffer, 24); - buffer[23] = Utf8Constants.Colon; - FormattingHelpers.WriteTwoDecimalDigits((uint)offset.Hours, buffer, 21); - buffer[20] = sign; - buffer[19] = Utf8Constants.Space; + FormattingHelpers.WriteTwoDecimalDigits((uint)offset.Minutes, destination, 24); + destination[23] = Utf8Constants.Colon; + FormattingHelpers.WriteTwoDecimalDigits((uint)offset.Hours, destination, 21); + destination[20] = sign; + destination[19] = Utf8Constants.Space; } return true; diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Date.L.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Date.L.cs index a25737774a..396fcc386f 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Date.L.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Date.L.cs @@ -12,11 +12,11 @@ namespace System.Buffers.Text // ----------------------------- // tue, 03 jan 2017 08:08:05 gmt // - private static bool TryFormatDateTimeL(DateTime value, Span buffer, out int bytesWritten) + private static bool TryFormatDateTimeL(DateTime value, Span destination, out int bytesWritten) { // Writing the check in this fashion elides all bounds checks on 'buffer' // for the remainder of the method. - if ((uint)28 >= (uint)buffer.Length) + if ((uint)28 >= (uint)destination.Length) { bytesWritten = 0; return false; @@ -24,40 +24,40 @@ namespace System.Buffers.Text var dayAbbrev = DayAbbreviationsLowercase[(int)value.DayOfWeek]; - buffer[0] = (byte)dayAbbrev; + destination[0] = (byte)dayAbbrev; dayAbbrev >>= 8; - buffer[1] = (byte)dayAbbrev; + destination[1] = (byte)dayAbbrev; dayAbbrev >>= 8; - buffer[2] = (byte)dayAbbrev; - buffer[3] = Utf8Constants.Comma; - buffer[4] = Utf8Constants.Space; + destination[2] = (byte)dayAbbrev; + destination[3] = Utf8Constants.Comma; + destination[4] = Utf8Constants.Space; - FormattingHelpers.WriteTwoDecimalDigits((uint)value.Day, buffer, 5); - buffer[7] = Utf8Constants.Space; + FormattingHelpers.WriteTwoDecimalDigits((uint)value.Day, destination, 5); + destination[7] = Utf8Constants.Space; var monthAbbrev = MonthAbbreviationsLowercase[value.Month - 1]; - buffer[8] = (byte)monthAbbrev; + destination[8] = (byte)monthAbbrev; monthAbbrev >>= 8; - buffer[9] = (byte)monthAbbrev; + destination[9] = (byte)monthAbbrev; monthAbbrev >>= 8; - buffer[10] = (byte)monthAbbrev; - buffer[11] = Utf8Constants.Space; + destination[10] = (byte)monthAbbrev; + destination[11] = Utf8Constants.Space; - FormattingHelpers.WriteFourDecimalDigits((uint)value.Year, buffer, 12); - buffer[16] = Utf8Constants.Space; + FormattingHelpers.WriteFourDecimalDigits((uint)value.Year, destination, 12); + destination[16] = Utf8Constants.Space; - FormattingHelpers.WriteTwoDecimalDigits((uint)value.Hour, buffer, 17); - buffer[19] = Utf8Constants.Colon; + FormattingHelpers.WriteTwoDecimalDigits((uint)value.Hour, destination, 17); + destination[19] = Utf8Constants.Colon; - FormattingHelpers.WriteTwoDecimalDigits((uint)value.Minute, buffer, 20); - buffer[22] = Utf8Constants.Colon; + FormattingHelpers.WriteTwoDecimalDigits((uint)value.Minute, destination, 20); + destination[22] = Utf8Constants.Colon; - FormattingHelpers.WriteTwoDecimalDigits((uint)value.Second, buffer, 23); - buffer[25] = Utf8Constants.Space; + FormattingHelpers.WriteTwoDecimalDigits((uint)value.Second, destination, 23); + destination[25] = Utf8Constants.Space; - buffer[26] = GMT1Lowercase; - buffer[27] = GMT2Lowercase; - buffer[28] = GMT3Lowercase; + destination[26] = GMT1Lowercase; + destination[27] = GMT2Lowercase; + destination[28] = GMT3Lowercase; bytesWritten = 29; return true; diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Date.O.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Date.O.cs index 24e7256268..5a2a7bfadb 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Date.O.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Date.O.cs @@ -15,7 +15,7 @@ namespace System.Buffers.Text // 2017-06-12T05:30:45.7680000Z (Z is short for "+00:00" but also distinguishes DateTimeKind.Utc from DateTimeKind.Local) // 2017-06-12T05:30:45.7680000 (interpreted as local time wrt to current time zone) // - private static bool TryFormatDateTimeO(DateTime value, TimeSpan offset, Span buffer, out int bytesWritten) + private static bool TryFormatDateTimeO(DateTime value, TimeSpan offset, Span destination, out int bytesWritten) { const int MinimumBytesNeeded = 27; @@ -40,7 +40,7 @@ namespace System.Buffers.Text bytesRequired += 6; } - if (buffer.Length < bytesRequired) + if (destination.Length < bytesRequired) { bytesWritten = 0; return false; @@ -49,27 +49,27 @@ namespace System.Buffers.Text bytesWritten = bytesRequired; // Hoist most of the bounds checks on buffer. - { var unused = buffer[MinimumBytesNeeded - 1]; } + { var unused = destination[MinimumBytesNeeded - 1]; } - FormattingHelpers.WriteFourDecimalDigits((uint)value.Year, buffer, 0); - buffer[4] = Utf8Constants.Minus; + FormattingHelpers.WriteFourDecimalDigits((uint)value.Year, destination, 0); + destination[4] = Utf8Constants.Minus; - FormattingHelpers.WriteTwoDecimalDigits((uint)value.Month, buffer, 5); - buffer[7] = Utf8Constants.Minus; + FormattingHelpers.WriteTwoDecimalDigits((uint)value.Month, destination, 5); + destination[7] = Utf8Constants.Minus; - FormattingHelpers.WriteTwoDecimalDigits((uint)value.Day, buffer, 8); - buffer[10] = TimeMarker; + FormattingHelpers.WriteTwoDecimalDigits((uint)value.Day, destination, 8); + destination[10] = TimeMarker; - FormattingHelpers.WriteTwoDecimalDigits((uint)value.Hour, buffer, 11); - buffer[13] = Utf8Constants.Colon; + FormattingHelpers.WriteTwoDecimalDigits((uint)value.Hour, destination, 11); + destination[13] = Utf8Constants.Colon; - FormattingHelpers.WriteTwoDecimalDigits((uint)value.Minute, buffer, 14); - buffer[16] = Utf8Constants.Colon; + FormattingHelpers.WriteTwoDecimalDigits((uint)value.Minute, destination, 14); + destination[16] = Utf8Constants.Colon; - FormattingHelpers.WriteTwoDecimalDigits((uint)value.Second, buffer, 17); - buffer[19] = Utf8Constants.Period; + FormattingHelpers.WriteTwoDecimalDigits((uint)value.Second, destination, 17); + destination[19] = Utf8Constants.Period; - FormattingHelpers.WriteDigits((uint)((ulong)value.Ticks % (ulong)TimeSpan.TicksPerSecond), buffer.Slice(20, 7)); + FormattingHelpers.WriteDigits((uint)((ulong)value.Ticks % (ulong)TimeSpan.TicksPerSecond), destination.Slice(20, 7)); if (kind == DateTimeKind.Local) { @@ -88,15 +88,15 @@ namespace System.Buffers.Text // Writing the value backward allows the JIT to optimize by // performing a single bounds check against buffer. - FormattingHelpers.WriteTwoDecimalDigits((uint)offset.Minutes, buffer, 31); - buffer[30] = Utf8Constants.Colon; - FormattingHelpers.WriteTwoDecimalDigits((uint)offset.Hours, buffer, 28); - buffer[27] = sign; + FormattingHelpers.WriteTwoDecimalDigits((uint)offset.Minutes, destination, 31); + destination[30] = Utf8Constants.Colon; + FormattingHelpers.WriteTwoDecimalDigits((uint)offset.Hours, destination, 28); + destination[27] = sign; } else if (kind == DateTimeKind.Utc) { - buffer[27] = UtcMarker; + destination[27] = UtcMarker; } return true; diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Date.R.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Date.R.cs index 738eb62a28..a3a5d991a2 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Date.R.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Date.R.cs @@ -12,11 +12,11 @@ namespace System.Buffers.Text // ----------------------------- // Tue, 03 Jan 2017 08:08:05 GMT // - private static bool TryFormatDateTimeR(DateTime value, Span buffer, out int bytesWritten) + private static bool TryFormatDateTimeR(DateTime value, Span destination, out int bytesWritten) { // Writing the check in this fashion elides all bounds checks on 'buffer' // for the remainder of the method. - if ((uint)28 >= (uint)buffer.Length) + if ((uint)28 >= (uint)destination.Length) { bytesWritten = 0; return false; @@ -24,40 +24,40 @@ namespace System.Buffers.Text var dayAbbrev = DayAbbreviations[(int)value.DayOfWeek]; - buffer[0] = (byte)dayAbbrev; + destination[0] = (byte)dayAbbrev; dayAbbrev >>= 8; - buffer[1] = (byte)dayAbbrev; + destination[1] = (byte)dayAbbrev; dayAbbrev >>= 8; - buffer[2] = (byte)dayAbbrev; - buffer[3] = Utf8Constants.Comma; - buffer[4] = Utf8Constants.Space; + destination[2] = (byte)dayAbbrev; + destination[3] = Utf8Constants.Comma; + destination[4] = Utf8Constants.Space; - FormattingHelpers.WriteTwoDecimalDigits((uint)value.Day, buffer, 5); - buffer[7] = Utf8Constants.Space; + FormattingHelpers.WriteTwoDecimalDigits((uint)value.Day, destination, 5); + destination[7] = Utf8Constants.Space; var monthAbbrev = MonthAbbreviations[value.Month - 1]; - buffer[8] = (byte)monthAbbrev; + destination[8] = (byte)monthAbbrev; monthAbbrev >>= 8; - buffer[9] = (byte)monthAbbrev; + destination[9] = (byte)monthAbbrev; monthAbbrev >>= 8; - buffer[10] = (byte)monthAbbrev; - buffer[11] = Utf8Constants.Space; + destination[10] = (byte)monthAbbrev; + destination[11] = Utf8Constants.Space; - FormattingHelpers.WriteFourDecimalDigits((uint)value.Year, buffer, 12); - buffer[16] = Utf8Constants.Space; + FormattingHelpers.WriteFourDecimalDigits((uint)value.Year, destination, 12); + destination[16] = Utf8Constants.Space; - FormattingHelpers.WriteTwoDecimalDigits((uint)value.Hour, buffer, 17); - buffer[19] = Utf8Constants.Colon; + FormattingHelpers.WriteTwoDecimalDigits((uint)value.Hour, destination, 17); + destination[19] = Utf8Constants.Colon; - FormattingHelpers.WriteTwoDecimalDigits((uint)value.Minute, buffer, 20); - buffer[22] = Utf8Constants.Colon; + FormattingHelpers.WriteTwoDecimalDigits((uint)value.Minute, destination, 20); + destination[22] = Utf8Constants.Colon; - FormattingHelpers.WriteTwoDecimalDigits((uint)value.Second, buffer, 23); - buffer[25] = Utf8Constants.Space; + FormattingHelpers.WriteTwoDecimalDigits((uint)value.Second, destination, 23); + destination[25] = Utf8Constants.Space; - buffer[26] = GMT1; - buffer[27] = GMT2; - buffer[28] = GMT3; + destination[26] = GMT1; + destination[27] = GMT2; + destination[28] = GMT3; bytesWritten = 29; return true; diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Date.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Date.cs index 3e52d0a4fa..6b188ff117 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Date.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Date.cs @@ -77,7 +77,7 @@ namespace System.Buffers.Text /// Formats a DateTimeOffset as a UTF8 string. /// /// Value to format - /// Buffer to write the UTF8-formatted value to + /// Buffer to write the UTF8-formatted value to /// Receives the length of the formatted text in bytes /// The standard format to use /// @@ -95,7 +95,7 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryFormat(DateTimeOffset value, Span buffer, out int bytesWritten, StandardFormat format = default) + public static bool TryFormat(DateTimeOffset value, Span destination, out int bytesWritten, StandardFormat format = default) { TimeSpan offset = Utf8Constants.s_nullUtcOffset; char symbol = format.Symbol; @@ -108,16 +108,16 @@ namespace System.Buffers.Text switch (symbol) { case 'R': - return TryFormatDateTimeR(value.UtcDateTime, buffer, out bytesWritten); + return TryFormatDateTimeR(value.UtcDateTime, destination, out bytesWritten); case 'l': - return TryFormatDateTimeL(value.UtcDateTime, buffer, out bytesWritten); + return TryFormatDateTimeL(value.UtcDateTime, destination, out bytesWritten); case 'O': - return TryFormatDateTimeO(value.DateTime, value.Offset, buffer, out bytesWritten); + return TryFormatDateTimeO(value.DateTime, value.Offset, destination, out bytesWritten); case 'G': - return TryFormatDateTimeG(value.DateTime, offset, buffer, out bytesWritten); + return TryFormatDateTimeG(value.DateTime, offset, destination, out bytesWritten); default: return ThrowHelper.TryFormatThrowFormatException(out bytesWritten); @@ -128,7 +128,7 @@ namespace System.Buffers.Text /// Formats a DateTime as a UTF8 string. /// /// Value to format - /// Buffer to write the UTF8-formatted value to + /// Buffer to write the UTF8-formatted value to /// Receives the length of the formatted text in bytes /// The standard format to use /// @@ -145,23 +145,23 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryFormat(DateTime value, Span buffer, out int bytesWritten, StandardFormat format = default) + public static bool TryFormat(DateTime value, Span destination, out int bytesWritten, StandardFormat format = default) { char symbol = FormattingHelpers.GetSymbolOrDefault(format, 'G'); switch (symbol) { case 'R': - return TryFormatDateTimeR(value, buffer, out bytesWritten); + return TryFormatDateTimeR(value, destination, out bytesWritten); case 'l': - return TryFormatDateTimeL(value, buffer, out bytesWritten); + return TryFormatDateTimeL(value, destination, out bytesWritten); case 'O': - return TryFormatDateTimeO(value, Utf8Constants.s_nullUtcOffset, buffer, out bytesWritten); + return TryFormatDateTimeO(value, Utf8Constants.s_nullUtcOffset, destination, out bytesWritten); case 'G': - return TryFormatDateTimeG(value, Utf8Constants.s_nullUtcOffset, buffer, out bytesWritten); + return TryFormatDateTimeG(value, Utf8Constants.s_nullUtcOffset, destination, out bytesWritten); default: return ThrowHelper.TryFormatThrowFormatException(out bytesWritten); diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Decimal.E.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Decimal.E.cs index 840e766d49..3379c04c47 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Decimal.E.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Decimal.E.cs @@ -3,12 +3,13 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; namespace System.Buffers.Text { public static partial class Utf8Formatter { - private static bool TryFormatDecimalE(ref NumberBuffer number, Span buffer, out int bytesWritten, byte precision, byte exponentSymbol) + private static bool TryFormatDecimalE(ref NumberBuffer number, Span destination, out int bytesWritten, byte precision, byte exponentSymbol) { const int NumExponentDigits = 3; @@ -22,7 +23,7 @@ namespace System.Buffers.Text + 2 // 'E' or 'e' followed by '+' or '-' + NumExponentDigits; // exponent digits - if (buffer.Length < numBytesNeeded) + if (destination.Length < numBytesNeeded) { bytesWritten = 0; return false; @@ -32,7 +33,7 @@ namespace System.Buffers.Text int srcIndex = 0; if (number.IsNegative) { - buffer[dstIndex++] = Utf8Constants.Minus; + destination[dstIndex++] = Utf8Constants.Minus; } // @@ -42,19 +43,19 @@ namespace System.Buffers.Text byte firstDigit = digits[srcIndex]; if (firstDigit == 0) { - buffer[dstIndex++] = (byte)'0'; // Special case: number before the decimal point is exactly 0: Number does not store the zero in this case. + destination[dstIndex++] = (byte)'0'; // Special case: number before the decimal point is exactly 0: Number does not store the zero in this case. exponent = 0; } else { - buffer[dstIndex++] = firstDigit; + destination[dstIndex++] = firstDigit; srcIndex++; exponent = scale - 1; } if (precision > 0) { - buffer[dstIndex++] = Utf8Constants.Period; + destination[dstIndex++] = Utf8Constants.Period; // // Emit digits after the decimal point. @@ -67,34 +68,34 @@ namespace System.Buffers.Text { while (numDigitsEmitted++ < precision) { - buffer[dstIndex++] = (byte)'0'; + destination[dstIndex++] = (byte)'0'; } break; } - buffer[dstIndex++] = digit; + destination[dstIndex++] = digit; srcIndex++; numDigitsEmitted++; } } // Emit the exponent symbol - buffer[dstIndex++] = exponentSymbol; + destination[dstIndex++] = exponentSymbol; if (exponent >= 0) { - buffer[dstIndex++] = Utf8Constants.Plus; + destination[dstIndex++] = Utf8Constants.Plus; } else { - buffer[dstIndex++] = Utf8Constants.Minus; + destination[dstIndex++] = Utf8Constants.Minus; exponent = -exponent; } Debug.Assert(exponent < Number.DECIMAL_PRECISION, "If you're trying to reuse this routine for double/float, you'll need to review the code carefully for Decimal-specific assumptions."); // Emit exactly three digits for the exponent. - buffer[dstIndex++] = (byte)'0'; // The exponent for Decimal can never exceed 28 (let alone 99) - buffer[dstIndex++] = (byte)((exponent / 10) + '0'); - buffer[dstIndex++] = (byte)((exponent % 10) + '0'); + destination[dstIndex++] = (byte)'0'; // The exponent for Decimal can never exceed 28 (let alone 99) + destination[dstIndex++] = (byte)((exponent / 10) + '0'); + destination[dstIndex++] = (byte)((exponent % 10) + '0'); Debug.Assert(dstIndex == numBytesNeeded); bytesWritten = numBytesNeeded; diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Decimal.F.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Decimal.F.cs index d26ea4bd3e..fbede07af9 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Decimal.F.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Decimal.F.cs @@ -3,12 +3,13 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; namespace System.Buffers.Text { public static partial class Utf8Formatter { - private static bool TryFormatDecimalF(ref NumberBuffer number, Span buffer, out int bytesWritten, byte precision) + private static bool TryFormatDecimalF(ref NumberBuffer number, Span destination, out int bytesWritten, byte precision) { int scale = number.Scale; ReadOnlySpan digits = number.Digits; @@ -18,7 +19,7 @@ namespace System.Buffers.Text + ((scale <= 0) ? 1 : scale) // digits before the decimal point (minimum 1) + ((precision == 0) ? 0 : (precision + 1)); // if specified precision != 0, the decimal point and the digits after the decimal point (padded with zeroes if needed) - if (buffer.Length < numBytesNeeded) + if (destination.Length < numBytesNeeded) { bytesWritten = 0; return false; @@ -28,7 +29,7 @@ namespace System.Buffers.Text int dstIndex = 0; if (number.IsNegative) { - buffer[dstIndex++] = Utf8Constants.Minus; + destination[dstIndex++] = Utf8Constants.Minus; } // @@ -36,7 +37,7 @@ namespace System.Buffers.Text // if (scale <= 0) { - buffer[dstIndex++] = (byte)'0'; // The integer portion is 0 and not stored. The formatter, however, needs to emit it. + destination[dstIndex++] = (byte)'0'; // The integer portion is 0 and not stored. The formatter, however, needs to emit it. } else { @@ -48,19 +49,19 @@ namespace System.Buffers.Text int numTrailingZeroes = scale - srcIndex; for (int i = 0; i < numTrailingZeroes; i++) { - buffer[dstIndex++] = (byte)'0'; + destination[dstIndex++] = (byte)'0'; } break; } - buffer[dstIndex++] = digit; + destination[dstIndex++] = digit; srcIndex++; } } if (precision > 0) { - buffer[dstIndex++] = Utf8Constants.Period; + destination[dstIndex++] = Utf8Constants.Period; // // Emit digits after the decimal point. @@ -71,7 +72,7 @@ namespace System.Buffers.Text int numLeadingZeroesToEmit = Math.Min((int)precision, -scale); for (int i = 0; i < numLeadingZeroesToEmit; i++) { - buffer[dstIndex++] = (byte)'0'; + destination[dstIndex++] = (byte)'0'; } numDigitsEmitted += numLeadingZeroesToEmit; } @@ -83,11 +84,11 @@ namespace System.Buffers.Text { while (numDigitsEmitted++ < precision) { - buffer[dstIndex++] = (byte)'0'; + destination[dstIndex++] = (byte)'0'; } break; } - buffer[dstIndex++] = digit; + destination[dstIndex++] = digit; srcIndex++; numDigitsEmitted++; } diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Decimal.G.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Decimal.G.cs index 213d319800..56aa88b355 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Decimal.G.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Decimal.G.cs @@ -3,13 +3,14 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.CompilerServices; namespace System.Buffers.Text { public static partial class Utf8Formatter { - private static bool TryFormatDecimalG(ref NumberBuffer number, Span buffer, out int bytesWritten) + private static bool TryFormatDecimalG(ref NumberBuffer number, Span destination, out int bytesWritten) { int scale = number.Scale; ReadOnlySpan digits = number.Digits; @@ -35,7 +36,7 @@ namespace System.Buffers.Text numBytesNeeded++; // And the minus sign. } - if (buffer.Length < numBytesNeeded) + if (destination.Length < numBytesNeeded) { bytesWritten = 0; return false; @@ -46,7 +47,7 @@ namespace System.Buffers.Text if (number.IsNegative) { - buffer[dstIndex++] = Utf8Constants.Minus; + destination[dstIndex++] = Utf8Constants.Minus; } // @@ -54,7 +55,7 @@ namespace System.Buffers.Text // if (scale <= 0) { - buffer[dstIndex++] = (byte)'0'; // The integer portion is 0 and not stored. The formatter, however, needs to emit it. + destination[dstIndex++] = (byte)'0'; // The integer portion is 0 and not stored. The formatter, however, needs to emit it. } else { @@ -66,19 +67,19 @@ namespace System.Buffers.Text int numTrailingZeroes = scale - srcIndex; for (int i = 0; i < numTrailingZeroes; i++) { - buffer[dstIndex++] = (byte)'0'; + destination[dstIndex++] = (byte)'0'; } break; } - buffer[dstIndex++] = digit; + destination[dstIndex++] = digit; srcIndex++; } } if (isFraction) { - buffer[dstIndex++] = Utf8Constants.Period; + destination[dstIndex++] = Utf8Constants.Period; // // Emit digits after the decimal point. @@ -88,14 +89,14 @@ namespace System.Buffers.Text int numLeadingZeroesToEmit = -scale; for (int i = 0; i < numLeadingZeroesToEmit; i++) { - buffer[dstIndex++] = (byte)'0'; + destination[dstIndex++] = (byte)'0'; } } byte digit; while ((digit = digits[srcIndex++]) != 0) { - buffer[dstIndex++] = digit; + destination[dstIndex++] = digit; } } diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Decimal.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Decimal.cs index af292ae952..791d36d9cc 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Decimal.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Decimal.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; namespace System.Buffers.Text { @@ -12,7 +13,7 @@ namespace System.Buffers.Text /// Formats a Decimal as a UTF8 string. /// /// Value to format - /// Buffer to write the UTF8-formatted value to + /// Buffer to write the UTF8-formatted value to /// Receives the length of the formatted text in bytes /// The standard format to use /// @@ -28,7 +29,7 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryFormat(decimal value, Span buffer, out int bytesWritten, StandardFormat format = default) + public static bool TryFormat(decimal value, Span destination, out int bytesWritten, StandardFormat format = default) { if (format.IsDefault) { @@ -48,7 +49,7 @@ namespace System.Buffers.Text { number.IsNegative = false; // For Decimals, -0 must print as normal 0. } - bool success = TryFormatDecimalG(ref number, buffer, out bytesWritten); + bool success = TryFormatDecimalG(ref number, destination, out bytesWritten); #if DEBUG // This DEBUG segment exists to close a code coverage hole inside TryFormatDecimalG(). Because we don't call RoundNumber() on this path, we have no way to feed // TryFormatDecimalG() a number where trailing zeros before the decimal point have been cropped. So if the chance comes up, we'll crop the zeroes @@ -67,13 +68,13 @@ namespace System.Buffers.Text number.CheckConsistency(); - byte[] buffer2 = new byte[buffer.Length]; + byte[] buffer2 = new byte[destination.Length]; bool success2 = TryFormatDecimalG(ref number, buffer2, out int bytesWritten2); Debug.Assert(success2); Debug.Assert(bytesWritten2 == bytesWritten); for (int i = 0; i < bytesWritten; i++) { - Debug.Assert(buffer[i] == buffer2[i]); + Debug.Assert(destination[i] == buffer2[i]); } } @@ -90,7 +91,7 @@ namespace System.Buffers.Text byte precision = (format.Precision == StandardFormat.NoPrecision) ? (byte)2 : format.Precision; Number.RoundNumber(ref number, number.Scale + precision); Debug.Assert(!(number.Digits[0] == 0 && number.IsNegative)); // For Decimals, -0 must print as normal 0. As it happens, Number.RoundNumber already ensures this invariant. - return TryFormatDecimalF(ref number, buffer, out bytesWritten, precision); + return TryFormatDecimalF(ref number, destination, out bytesWritten, precision); } case 'e': @@ -101,7 +102,7 @@ namespace System.Buffers.Text byte precision = (format.Precision == StandardFormat.NoPrecision) ? (byte)6 : format.Precision; Number.RoundNumber(ref number, precision + 1); Debug.Assert(!(number.Digits[0] == 0 && number.IsNegative)); // For Decimals, -0 must print as normal 0. As it happens, Number.RoundNumber already ensures this invariant. - return TryFormatDecimalE(ref number, buffer, out bytesWritten, precision, exponentSymbol: (byte)format.Symbol); + return TryFormatDecimalE(ref number, destination, out bytesWritten, precision, exponentSymbol: (byte)format.Symbol); } default: diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Float.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Float.cs index 3354c572ae..ac5b96dbf4 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Float.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Float.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; using System.Globalization; namespace System.Buffers.Text @@ -13,7 +14,7 @@ namespace System.Buffers.Text /// Formats a Double as a UTF8 string. /// /// Value to format - /// Buffer to write the UTF8-formatted value to + /// Buffer to write the UTF8-formatted value to /// Receives the length of the formatted text in bytes /// The standard format to use /// @@ -29,16 +30,16 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryFormat(double value, Span buffer, out int bytesWritten, StandardFormat format = default) + public static bool TryFormat(double value, Span destination, out int bytesWritten, StandardFormat format = default) { - return TryFormatFloatingPoint(value, buffer, out bytesWritten, format); + return TryFormatFloatingPoint(value, destination, out bytesWritten, format); } /// /// Formats a Single as a UTF8 string. /// /// Value to format - /// Buffer to write the UTF8-formatted value to + /// Buffer to write the UTF8-formatted value to /// Receives the length of the formatted text in bytes /// The standard format to use /// @@ -54,9 +55,9 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryFormat(float value, Span buffer, out int bytesWritten, StandardFormat format = default) + public static bool TryFormat(float value, Span destination, out int bytesWritten, StandardFormat format = default) { - return TryFormatFloatingPoint(value, buffer, out bytesWritten, format); + return TryFormatFloatingPoint(value, destination, out bytesWritten, format); } // @@ -65,7 +66,7 @@ namespace System.Buffers.Text // be preferable not to have another version of that lying around. Until we really hit a scenario where floating point formatting needs the perf, we'll // make do with this. // - private static bool TryFormatFloatingPoint(T value, Span buffer, out int bytesWritten, StandardFormat format) where T : IFormattable + private static bool TryFormatFloatingPoint(T value, Span destination, out int bytesWritten, StandardFormat format) where T : IFormattable { if (format.IsDefault) { @@ -93,7 +94,7 @@ namespace System.Buffers.Text string formatString = format.ToString(); string utf16Text = value.ToString(formatString, CultureInfo.InvariantCulture); int length = utf16Text.Length; - if (length > buffer.Length) + if (length > destination.Length) { bytesWritten = 0; return false; @@ -102,7 +103,7 @@ namespace System.Buffers.Text for (int i = 0; i < length; i++) { Debug.Assert(utf16Text[i] < 128, "A culture-invariant ToString() of a floating point expected to produce ASCII characters only."); - buffer[i] = (byte)(utf16Text[i]); + destination[i] = (byte)(utf16Text[i]); } bytesWritten = length; diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Guid.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Guid.cs index 009f8c66b5..c9a6efbaed 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Guid.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Guid.cs @@ -24,7 +24,7 @@ namespace System.Buffers.Text /// Formats a Guid as a UTF8 string. /// /// Value to format - /// Buffer to write the UTF8-formatted value to + /// Buffer to write the UTF8-formatted value to /// Receives the length of the formatted text in bytes /// The standard format to use /// @@ -41,7 +41,7 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryFormat(Guid value, Span buffer, out int bytesWritten, StandardFormat format = default) + public static bool TryFormat(Guid value, Span destination, out int bytesWritten, StandardFormat format = default) { const int INSERT_DASHES = unchecked((int)0x80000000); const int NO_DASHES = 0; @@ -86,7 +86,7 @@ namespace System.Buffers.Text // At this point, the low byte of flags contains the minimum required length - if ((byte)flags > buffer.Length) + if ((byte)flags > destination.Length) { bytesWritten = 0; return false; @@ -99,8 +99,8 @@ namespace System.Buffers.Text if ((byte)flags != 0) { - buffer[0] = (byte)flags; - buffer = buffer.Slice(1); + destination[0] = (byte)flags; + destination = destination.Slice(1); } flags >>= 8; @@ -117,75 +117,75 @@ namespace System.Buffers.Text // because it may have an observeable side effect (throwing). // We use 8 instead of 7 so that we also capture the dash if we're asked to insert one. - { var unused = buffer[8]; } - FormattingHelpers.WriteHexByte(guidAsBytes.Byte03, buffer, 0, FormattingHelpers.HexCasing.Lowercase); - FormattingHelpers.WriteHexByte(guidAsBytes.Byte02, buffer, 2, FormattingHelpers.HexCasing.Lowercase); - FormattingHelpers.WriteHexByte(guidAsBytes.Byte01, buffer, 4, FormattingHelpers.HexCasing.Lowercase); - FormattingHelpers.WriteHexByte(guidAsBytes.Byte00, buffer, 6, FormattingHelpers.HexCasing.Lowercase); + { var unused = destination[8]; } + FormattingHelpers.WriteHexByte(guidAsBytes.Byte03, destination, 0, FormattingHelpers.HexCasing.Lowercase); + FormattingHelpers.WriteHexByte(guidAsBytes.Byte02, destination, 2, FormattingHelpers.HexCasing.Lowercase); + FormattingHelpers.WriteHexByte(guidAsBytes.Byte01, destination, 4, FormattingHelpers.HexCasing.Lowercase); + FormattingHelpers.WriteHexByte(guidAsBytes.Byte00, destination, 6, FormattingHelpers.HexCasing.Lowercase); if (flags < 0 /* use dash? */) { - buffer[8] = Dash; - buffer = buffer.Slice(9); + destination[8] = Dash; + destination = destination.Slice(9); } else { - buffer = buffer.Slice(8); + destination = destination.Slice(8); } - { var unused = buffer[4]; } - FormattingHelpers.WriteHexByte(guidAsBytes.Byte05, buffer, 0, FormattingHelpers.HexCasing.Lowercase); - FormattingHelpers.WriteHexByte(guidAsBytes.Byte04, buffer, 2, FormattingHelpers.HexCasing.Lowercase); + { var unused = destination[4]; } + FormattingHelpers.WriteHexByte(guidAsBytes.Byte05, destination, 0, FormattingHelpers.HexCasing.Lowercase); + FormattingHelpers.WriteHexByte(guidAsBytes.Byte04, destination, 2, FormattingHelpers.HexCasing.Lowercase); if (flags < 0 /* use dash? */) { - buffer[4] = Dash; - buffer = buffer.Slice(5); + destination[4] = Dash; + destination = destination.Slice(5); } else { - buffer = buffer.Slice(4); + destination = destination.Slice(4); } - { var unused = buffer[4]; } - FormattingHelpers.WriteHexByte(guidAsBytes.Byte07, buffer, 0, FormattingHelpers.HexCasing.Lowercase); - FormattingHelpers.WriteHexByte(guidAsBytes.Byte06, buffer, 2, FormattingHelpers.HexCasing.Lowercase); + { var unused = destination[4]; } + FormattingHelpers.WriteHexByte(guidAsBytes.Byte07, destination, 0, FormattingHelpers.HexCasing.Lowercase); + FormattingHelpers.WriteHexByte(guidAsBytes.Byte06, destination, 2, FormattingHelpers.HexCasing.Lowercase); if (flags < 0 /* use dash? */) { - buffer[4] = Dash; - buffer = buffer.Slice(5); + destination[4] = Dash; + destination = destination.Slice(5); } else { - buffer = buffer.Slice(4); + destination = destination.Slice(4); } - { var unused = buffer[4]; } - FormattingHelpers.WriteHexByte(guidAsBytes.Byte08, buffer, 0, FormattingHelpers.HexCasing.Lowercase); - FormattingHelpers.WriteHexByte(guidAsBytes.Byte09, buffer, 2, FormattingHelpers.HexCasing.Lowercase); + { var unused = destination[4]; } + FormattingHelpers.WriteHexByte(guidAsBytes.Byte08, destination, 0, FormattingHelpers.HexCasing.Lowercase); + FormattingHelpers.WriteHexByte(guidAsBytes.Byte09, destination, 2, FormattingHelpers.HexCasing.Lowercase); if (flags < 0 /* use dash? */) { - buffer[4] = Dash; - buffer = buffer.Slice(5); + destination[4] = Dash; + destination = destination.Slice(5); } else { - buffer = buffer.Slice(4); + destination = destination.Slice(4); } - { var unused = buffer[11]; } // can't hoist bounds check on the final brace (if exists) - FormattingHelpers.WriteHexByte(guidAsBytes.Byte10, buffer, 0, FormattingHelpers.HexCasing.Lowercase); - FormattingHelpers.WriteHexByte(guidAsBytes.Byte11, buffer, 2, FormattingHelpers.HexCasing.Lowercase); - FormattingHelpers.WriteHexByte(guidAsBytes.Byte12, buffer, 4, FormattingHelpers.HexCasing.Lowercase); - FormattingHelpers.WriteHexByte(guidAsBytes.Byte13, buffer, 6, FormattingHelpers.HexCasing.Lowercase); - FormattingHelpers.WriteHexByte(guidAsBytes.Byte14, buffer, 8, FormattingHelpers.HexCasing.Lowercase); - FormattingHelpers.WriteHexByte(guidAsBytes.Byte15, buffer, 10, FormattingHelpers.HexCasing.Lowercase); + { var unused = destination[11]; } // can't hoist bounds check on the final brace (if exists) + FormattingHelpers.WriteHexByte(guidAsBytes.Byte10, destination, 0, FormattingHelpers.HexCasing.Lowercase); + FormattingHelpers.WriteHexByte(guidAsBytes.Byte11, destination, 2, FormattingHelpers.HexCasing.Lowercase); + FormattingHelpers.WriteHexByte(guidAsBytes.Byte12, destination, 4, FormattingHelpers.HexCasing.Lowercase); + FormattingHelpers.WriteHexByte(guidAsBytes.Byte13, destination, 6, FormattingHelpers.HexCasing.Lowercase); + FormattingHelpers.WriteHexByte(guidAsBytes.Byte14, destination, 8, FormattingHelpers.HexCasing.Lowercase); + FormattingHelpers.WriteHexByte(guidAsBytes.Byte15, destination, 10, FormattingHelpers.HexCasing.Lowercase); if ((byte)flags != 0) { - buffer[12] = (byte)flags; + destination[12] = (byte)flags; } return true; diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Signed.D.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Signed.D.cs index b4d772a1ff..7532f0cf15 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Signed.D.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Signed.D.cs @@ -2,13 +2,8 @@ // 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; -#if !netstandard -using Internal.Runtime.CompilerServices; -#endif - namespace System.Buffers.Text { /// @@ -17,39 +12,16 @@ namespace System.Buffers.Text public static partial class Utf8Formatter { [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static bool TryFormatInt64D(long value, byte precision, Span buffer, out int bytesWritten) + private static bool TryFormatInt64D(long value, byte precision, Span destination, out int bytesWritten) { bool insertNegationSign = false; if (value < 0) { insertNegationSign = true; value = -value; - if (value < 0) - { - Debug.Assert(value == Int64.MinValue); - return TryFormatInt64D_MinValue(precision, buffer, out bytesWritten); - } } - return TryFormatUInt64D((ulong)value, precision, buffer, insertNegationSign, out bytesWritten); - } - - [MethodImpl(MethodImplOptions.NoInlining)] - private static bool TryFormatInt64D_MinValue(byte precision, Span buffer, out int bytesWritten) - { - // Int64.MinValue must be treated specially since its two's complement negation doesn't fit into 64 bits. - // Instead, we'll perform one's complement negation and fix up the +1 later (-x := ~x + 1). - // Int64.MinValue = -9,223,372,036,854,775,808 - // Int64.MaxValue = 9,223,372,036,854,775,807 - - bool retVal = TryFormatUInt64D((ulong)Int64.MaxValue, precision, buffer, insertNegationSign: true, out int tempBytesWritten); - if (retVal) - { - buffer[tempBytesWritten - 1]++; // bump the last ASCII '7' to an '8' - } - - bytesWritten = tempBytesWritten; - return retVal; + return TryFormatUInt64D((ulong)value, precision, destination, insertNegationSign, out bytesWritten); } } } diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Signed.Default.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Signed.Default.cs index 4555c70078..7142d3bf4f 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Signed.Default.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Signed.Default.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.CompilerServices; namespace System.Buffers.Text @@ -13,36 +14,36 @@ namespace System.Buffers.Text public static partial class Utf8Formatter { [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static bool TryFormatInt64Default(long value, Span buffer, out int bytesWritten) + private static bool TryFormatInt64Default(long value, Span destination, out int bytesWritten) { if ((ulong)value < 10) { - return TryFormatUInt32SingleDigit((uint)value, buffer, out bytesWritten); + return TryFormatUInt32SingleDigit((uint)value, destination, out bytesWritten); } if (IntPtr.Size == 8) // x64 { - return TryFormatInt64MultipleDigits(value, buffer, out bytesWritten); + return TryFormatInt64MultipleDigits(value, destination, out bytesWritten); } else // x86 { if (value <= int.MaxValue && value >= int.MinValue) { - return TryFormatInt32MultipleDigits((int)value, buffer, out bytesWritten); + return TryFormatInt32MultipleDigits((int)value, destination, out bytesWritten); } else { if (value <= (long)Utf8Constants.BillionMaxUIntValue && value >= -(long)Utf8Constants.BillionMaxUIntValue) { return value < 0 ? - TryFormatInt64MoreThanNegativeBillionMaxUInt(-value, buffer, out bytesWritten) : - TryFormatUInt64LessThanBillionMaxUInt((ulong)value, buffer, out bytesWritten); + TryFormatInt64MoreThanNegativeBillionMaxUInt(-value, destination, out bytesWritten) : + TryFormatUInt64LessThanBillionMaxUInt((ulong)value, destination, out bytesWritten); } else { return value < 0 ? - TryFormatInt64LessThanNegativeBillionMaxUInt(-value, buffer, out bytesWritten) : - TryFormatUInt64MoreThanBillionMaxUInt((ulong)value, buffer, out bytesWritten); + TryFormatInt64LessThanNegativeBillionMaxUInt(-value, destination, out bytesWritten) : + TryFormatUInt64MoreThanBillionMaxUInt((ulong)value, destination, out bytesWritten); } } } @@ -50,65 +51,65 @@ namespace System.Buffers.Text // TODO: Use this instead of TryFormatInt64Default to format numbers less than int.MaxValue [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static bool TryFormatInt32Default(int value, Span buffer, out int bytesWritten) + private static bool TryFormatInt32Default(int value, Span destination, out int bytesWritten) { if ((uint)value < 10) { - return TryFormatUInt32SingleDigit((uint)value, buffer, out bytesWritten); + return TryFormatUInt32SingleDigit((uint)value, destination, out bytesWritten); } - return TryFormatInt32MultipleDigits(value, buffer, out bytesWritten); + return TryFormatInt32MultipleDigits(value, destination, out bytesWritten); } [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static bool TryFormatInt32MultipleDigits(int value, Span buffer, out int bytesWritten) + private static bool TryFormatInt32MultipleDigits(int value, Span destination, out int bytesWritten) { if (value < 0) { value = -value; int digitCount = FormattingHelpers.CountDigits((uint)value); // WriteDigits does not do bounds checks - if (digitCount >= buffer.Length) + if (digitCount >= destination.Length) { bytesWritten = 0; return false; } - buffer[0] = Utf8Constants.Minus; + destination[0] = Utf8Constants.Minus; bytesWritten = digitCount + 1; - FormattingHelpers.WriteDigits((uint)value, buffer.Slice(1, digitCount)); + FormattingHelpers.WriteDigits((uint)value, destination.Slice(1, digitCount)); return true; } else { - return TryFormatUInt32MultipleDigits((uint)value, buffer, out bytesWritten); + return TryFormatUInt32MultipleDigits((uint)value, destination, out bytesWritten); } } [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static bool TryFormatInt64MultipleDigits(long value, Span buffer, out int bytesWritten) + private static bool TryFormatInt64MultipleDigits(long value, Span destination, out int bytesWritten) { if (value < 0) { value = -value; int digitCount = FormattingHelpers.CountDigits((ulong)value); // WriteDigits does not do bounds checks - if (digitCount >= buffer.Length) + if (digitCount >= destination.Length) { bytesWritten = 0; return false; } - buffer[0] = Utf8Constants.Minus; + destination[0] = Utf8Constants.Minus; bytesWritten = digitCount + 1; - FormattingHelpers.WriteDigits((ulong)value, buffer.Slice(1, digitCount)); + FormattingHelpers.WriteDigits((ulong)value, destination.Slice(1, digitCount)); return true; } else { - return TryFormatUInt64MultipleDigits((ulong)value, buffer, out bytesWritten); + return TryFormatUInt64MultipleDigits((ulong)value, destination, out bytesWritten); } } // Split long into two parts that can each fit in a uint - {1-10 digits}{9 digits} - private static bool TryFormatInt64MoreThanNegativeBillionMaxUInt(long value, Span buffer, out int bytesWritten) + private static bool TryFormatInt64MoreThanNegativeBillionMaxUInt(long value, Span destination, out int bytesWritten) { uint overNineDigits = (uint)(value / Utf8Constants.Billion); uint lastNineDigits = (uint)(value - (overNineDigits * Utf8Constants.Billion)); @@ -117,20 +118,20 @@ namespace System.Buffers.Text Debug.Assert(digitCountOverNineDigits >= 1 && digitCountOverNineDigits <= 10); int digitCount = digitCountOverNineDigits + 9; // WriteDigits does not do bounds checks - if (digitCount >= buffer.Length) + if (digitCount >= destination.Length) { bytesWritten = 0; return false; } - buffer[0] = Utf8Constants.Minus; + destination[0] = Utf8Constants.Minus; bytesWritten = digitCount + 1; - FormattingHelpers.WriteDigits(overNineDigits, buffer.Slice(1, digitCountOverNineDigits)); - FormattingHelpers.WriteDigits(lastNineDigits, buffer.Slice(digitCountOverNineDigits + 1, 9)); + FormattingHelpers.WriteDigits(overNineDigits, destination.Slice(1, digitCountOverNineDigits)); + FormattingHelpers.WriteDigits(lastNineDigits, destination.Slice(digitCountOverNineDigits + 1, 9)); return true; } // Split long into three parts that can each fit in a uint - {1 digit}{9 digits}{9 digits} - private static bool TryFormatInt64LessThanNegativeBillionMaxUInt(long value, Span buffer, out int bytesWritten) + private static bool TryFormatInt64LessThanNegativeBillionMaxUInt(long value, Span destination, out int bytesWritten) { // value can still be negative if value == long.MinValue // Therefore, cast to ulong, since (ulong)value actually equals abs(long.MinValue) @@ -143,16 +144,16 @@ namespace System.Buffers.Text Debug.Assert(digitCountOverEighteenDigits == 1); int digitCount = digitCountOverEighteenDigits + 18; // WriteDigits does not do bounds checks - if (digitCount >= buffer.Length) + if (digitCount >= destination.Length) { bytesWritten = 0; return false; } - buffer[0] = Utf8Constants.Minus; + destination[0] = Utf8Constants.Minus; bytesWritten = digitCount + 1; - FormattingHelpers.WriteDigits(overEighteenDigits, buffer.Slice(1, digitCountOverEighteenDigits)); - FormattingHelpers.WriteDigits(middleNineDigits, buffer.Slice(digitCountOverEighteenDigits + 1, 9)); - FormattingHelpers.WriteDigits(lastNineDigits, buffer.Slice(digitCountOverEighteenDigits + 1 + 9, 9)); + FormattingHelpers.WriteDigits(overEighteenDigits, destination.Slice(1, digitCountOverEighteenDigits)); + FormattingHelpers.WriteDigits(middleNineDigits, destination.Slice(digitCountOverEighteenDigits + 1, 9)); + FormattingHelpers.WriteDigits(lastNineDigits, destination.Slice(digitCountOverEighteenDigits + 1 + 9, 9)); return true; } } diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Signed.N.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Signed.N.cs index 2fcd472715..1c01b8d60d 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Signed.N.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Signed.N.cs @@ -2,13 +2,8 @@ // 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; -#if !netstandard -using Internal.Runtime.CompilerServices; -#endif - namespace System.Buffers.Text { /// @@ -17,39 +12,16 @@ namespace System.Buffers.Text public static partial class Utf8Formatter { [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static bool TryFormatInt64N(long value, byte precision, Span buffer, out int bytesWritten) + private static bool TryFormatInt64N(long value, byte precision, Span destination, out int bytesWritten) { bool insertNegationSign = false; if (value < 0) { insertNegationSign = true; value = -value; - if (value < 0) - { - Debug.Assert(value == Int64.MinValue); - return TryFormatInt64N_MinValue(precision, buffer, out bytesWritten); - } } - return TryFormatUInt64N((ulong)value, precision, buffer, insertNegationSign, out bytesWritten); - } - - [MethodImpl(MethodImplOptions.NoInlining)] - private static bool TryFormatInt64N_MinValue(byte precision, Span buffer, out int bytesWritten) - { - // Int64.MinValue must be treated specially since its two's complement negation doesn't fit into 64 bits. - // Instead, we'll perform one's complement negation and fix up the +1 later (-x := ~x + 1). - // Int64.MinValue = -9,223,372,036,854,775,808 (26 digits, including minus and commas) - // Int64.MaxValue = 9,223,372,036,854,775,807 - - bool retVal = TryFormatUInt64N((ulong)Int64.MaxValue, precision, buffer, insertNegationSign: true, out int tempBytesWritten); - if (retVal) - { - buffer[25]++; // bump the last ASCII '7' to an '8' - } - - bytesWritten = tempBytesWritten; - return retVal; + return TryFormatUInt64N((ulong)value, precision, destination, insertNegationSign, out bytesWritten); } } } diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Signed.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Signed.cs index 2ef45f8a0c..87966ca358 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Signed.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Signed.cs @@ -15,11 +15,11 @@ namespace System.Buffers.Text // Common worker for all signed integer TryFormat overloads // [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static bool TryFormatInt64(long value, ulong mask, Span buffer, out int bytesWritten, StandardFormat format) + private static bool TryFormatInt64(long value, ulong mask, Span destination, out int bytesWritten, StandardFormat format) { if (format.IsDefault) { - return TryFormatInt64Default(value, buffer, out bytesWritten); + return TryFormatInt64Default(value, destination, out bytesWritten); } switch (format.Symbol) @@ -28,21 +28,21 @@ namespace System.Buffers.Text case 'g': if (format.HasPrecision) throw new NotSupportedException(SR.Argument_GWithPrecisionNotSupported); // With a precision, 'G' can produce exponential format, even for integers. - return TryFormatInt64D(value, format.Precision, buffer, out bytesWritten); + return TryFormatInt64D(value, format.Precision, destination, out bytesWritten); case 'd': case 'D': - return TryFormatInt64D(value, format.Precision, buffer, out bytesWritten); + return TryFormatInt64D(value, format.Precision, destination, out bytesWritten); case 'n': case 'N': - return TryFormatInt64N(value, format.Precision, buffer, out bytesWritten); + return TryFormatInt64N(value, format.Precision, destination, out bytesWritten); case 'x': - return TryFormatUInt64X((ulong)value & mask, format.Precision, true, buffer, out bytesWritten); + return TryFormatUInt64X((ulong)value & mask, format.Precision, true, destination, out bytesWritten); case 'X': - return TryFormatUInt64X((ulong)value & mask, format.Precision, false, buffer, out bytesWritten); + return TryFormatUInt64X((ulong)value & mask, format.Precision, false, destination, out bytesWritten); default: return ThrowHelper.TryFormatThrowFormatException(out bytesWritten); diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Unsigned.D.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Unsigned.D.cs index 5fef90e11b..9cb8d64bc0 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Unsigned.D.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Unsigned.D.cs @@ -9,7 +9,7 @@ namespace System.Buffers.Text /// public static partial class Utf8Formatter { - private static bool TryFormatUInt64D(ulong value, byte precision, Span buffer, bool insertNegationSign, out int bytesWritten) + private static bool TryFormatUInt64D(ulong value, byte precision, Span destination, bool insertNegationSign, out int bytesWritten) { // Calculate the actual digit count and the number of padding zeroes requested. // From all of this we can get the required buffer length. @@ -28,7 +28,7 @@ namespace System.Buffers.Text requiredBufferLength++; } - if (requiredBufferLength > buffer.Length) + if (requiredBufferLength > destination.Length) { bytesWritten = 0; return false; @@ -38,15 +38,15 @@ namespace System.Buffers.Text if (insertNegationSign) { - buffer[0] = Utf8Constants.Minus; - buffer = buffer.Slice(1); + destination[0] = Utf8Constants.Minus; + destination = destination.Slice(1); } if (leadingZeroCount > 0) { - FormattingHelpers.FillWithAsciiZeros(buffer.Slice(0, leadingZeroCount)); + FormattingHelpers.FillWithAsciiZeros(destination.Slice(0, leadingZeroCount)); } - FormattingHelpers.WriteDigits(value, buffer.Slice(leadingZeroCount, digitCount)); + FormattingHelpers.WriteDigits(value, destination.Slice(leadingZeroCount, digitCount)); return true; } diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Unsigned.Default.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Unsigned.Default.cs index 237cf1eae5..0e48837915 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Unsigned.Default.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Unsigned.Default.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.CompilerServices; namespace System.Buffers.Text @@ -13,32 +14,32 @@ namespace System.Buffers.Text public static partial class Utf8Formatter { [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static bool TryFormatUInt64Default(ulong value, Span buffer, out int bytesWritten) + private static bool TryFormatUInt64Default(ulong value, Span destination, out int bytesWritten) { if (value < 10) { - return TryFormatUInt32SingleDigit((uint)value, buffer, out bytesWritten); + return TryFormatUInt32SingleDigit((uint)value, destination, out bytesWritten); } if (IntPtr.Size == 8) // x64 { - return TryFormatUInt64MultipleDigits(value, buffer, out bytesWritten); + return TryFormatUInt64MultipleDigits(value, destination, out bytesWritten); } else // x86 { if (value <= uint.MaxValue) { - return TryFormatUInt32MultipleDigits((uint)value, buffer, out bytesWritten); + return TryFormatUInt32MultipleDigits((uint)value, destination, out bytesWritten); } else { if (value <= Utf8Constants.BillionMaxUIntValue) { - return TryFormatUInt64LessThanBillionMaxUInt(value, buffer, out bytesWritten); + return TryFormatUInt64LessThanBillionMaxUInt(value, destination, out bytesWritten); } else { - return TryFormatUInt64MoreThanBillionMaxUInt(value, buffer, out bytesWritten); + return TryFormatUInt64MoreThanBillionMaxUInt(value, destination, out bytesWritten); } } } @@ -46,73 +47,73 @@ namespace System.Buffers.Text // TODO: Use this instead of TryFormatUInt64Default to format numbers less than uint.MaxValue [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static bool TryFormatUInt32Default(uint value, Span buffer, out int bytesWritten) + private static bool TryFormatUInt32Default(uint value, Span destination, out int bytesWritten) { if (value < 10) { - return TryFormatUInt32SingleDigit(value, buffer, out bytesWritten); + return TryFormatUInt32SingleDigit(value, destination, out bytesWritten); } - return TryFormatUInt32MultipleDigits(value, buffer, out bytesWritten); + return TryFormatUInt32MultipleDigits(value, destination, out bytesWritten); } [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static bool TryFormatUInt32SingleDigit(uint value, Span buffer, out int bytesWritten) + private static bool TryFormatUInt32SingleDigit(uint value, Span destination, out int bytesWritten) { - if (buffer.Length == 0) + if (destination.Length == 0) { bytesWritten = 0; return false; } - buffer[0] = (byte)('0' + value); + destination[0] = (byte)('0' + value); bytesWritten = 1; return true; } [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static bool TryFormatUInt32MultipleDigits(uint value, Span buffer, out int bytesWritten) + private static bool TryFormatUInt32MultipleDigits(uint value, Span destination, out int bytesWritten) { int digitCount = FormattingHelpers.CountDigits(value); // WriteDigits does not do bounds checks - if (digitCount > buffer.Length) + if (digitCount > destination.Length) { bytesWritten = 0; return false; } bytesWritten = digitCount; - FormattingHelpers.WriteDigits(value, buffer.Slice(0, digitCount)); + FormattingHelpers.WriteDigits(value, destination.Slice(0, digitCount)); return true; } [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static bool TryFormatUInt64SingleDigit(ulong value, Span buffer, out int bytesWritten) + private static bool TryFormatUInt64SingleDigit(ulong value, Span destination, out int bytesWritten) { - if (buffer.Length == 0) + if (destination.Length == 0) { bytesWritten = 0; return false; } - buffer[0] = (byte)('0' + value); + destination[0] = (byte)('0' + value); bytesWritten = 1; return true; } [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static bool TryFormatUInt64MultipleDigits(ulong value, Span buffer, out int bytesWritten) + private static bool TryFormatUInt64MultipleDigits(ulong value, Span destination, out int bytesWritten) { int digitCount = FormattingHelpers.CountDigits(value); // WriteDigits does not do bounds checks - if (digitCount > buffer.Length) + if (digitCount > destination.Length) { bytesWritten = 0; return false; } bytesWritten = digitCount; - FormattingHelpers.WriteDigits(value, buffer.Slice(0, digitCount)); + FormattingHelpers.WriteDigits(value, destination.Slice(0, digitCount)); return true; } // Split ulong into two parts that can each fit in a uint - {1-10 digits}{9 digits} - private static bool TryFormatUInt64LessThanBillionMaxUInt(ulong value, Span buffer, out int bytesWritten) + private static bool TryFormatUInt64LessThanBillionMaxUInt(ulong value, Span destination, out int bytesWritten) { uint overNineDigits = (uint)(value / Utf8Constants.Billion); uint lastNineDigits = (uint)(value - (overNineDigits * Utf8Constants.Billion)); @@ -121,19 +122,19 @@ namespace System.Buffers.Text Debug.Assert(digitCountOverNineDigits >= 1 && digitCountOverNineDigits <= 10); int digitCount = digitCountOverNineDigits + 9; // WriteDigits does not do bounds checks - if (digitCount > buffer.Length) + if (digitCount > destination.Length) { bytesWritten = 0; return false; } bytesWritten = digitCount; - FormattingHelpers.WriteDigits(overNineDigits, buffer.Slice(0, digitCountOverNineDigits)); - FormattingHelpers.WriteDigits(lastNineDigits, buffer.Slice(digitCountOverNineDigits, 9)); + FormattingHelpers.WriteDigits(overNineDigits, destination.Slice(0, digitCountOverNineDigits)); + FormattingHelpers.WriteDigits(lastNineDigits, destination.Slice(digitCountOverNineDigits, 9)); return true; } // Split ulong into three parts that can each fit in a uint - {1-2 digits}{9 digits}{9 digits} - private static bool TryFormatUInt64MoreThanBillionMaxUInt(ulong value, Span buffer, out int bytesWritten) + private static bool TryFormatUInt64MoreThanBillionMaxUInt(ulong value, Span destination, out int bytesWritten) { ulong overNineDigits = value / Utf8Constants.Billion; uint lastNineDigits = (uint)(value - (overNineDigits * Utf8Constants.Billion)); @@ -144,15 +145,15 @@ namespace System.Buffers.Text Debug.Assert(digitCountOverEighteenDigits >= 1 && digitCountOverEighteenDigits <= 2); int digitCount = digitCountOverEighteenDigits + 18; // WriteDigits does not do bounds checks - if (digitCount > buffer.Length) + if (digitCount > destination.Length) { bytesWritten = 0; return false; } bytesWritten = digitCount; - FormattingHelpers.WriteDigits(overEighteenDigits, buffer.Slice(0, digitCountOverEighteenDigits)); - FormattingHelpers.WriteDigits(middleNineDigits, buffer.Slice(digitCountOverEighteenDigits, 9)); - FormattingHelpers.WriteDigits(lastNineDigits, buffer.Slice(digitCountOverEighteenDigits + 9, 9)); + FormattingHelpers.WriteDigits(overEighteenDigits, destination.Slice(0, digitCountOverEighteenDigits)); + FormattingHelpers.WriteDigits(middleNineDigits, destination.Slice(digitCountOverEighteenDigits, 9)); + FormattingHelpers.WriteDigits(lastNineDigits, destination.Slice(digitCountOverEighteenDigits + 9, 9)); return true; } } diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Unsigned.N.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Unsigned.N.cs index e3b2b7a05e..ce21c0d3dd 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Unsigned.N.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Unsigned.N.cs @@ -9,7 +9,7 @@ namespace System.Buffers.Text /// public static partial class Utf8Formatter { - private static bool TryFormatUInt64N(ulong value, byte precision, Span buffer, bool insertNegationSign, out int bytesWritten) + private static bool TryFormatUInt64N(ulong value, byte precision, Span destination, bool insertNegationSign, out int bytesWritten) { // Calculate the actual digit count, number of group separators required, and the // number of trailing zeros requested. From all of this we can get the required @@ -30,7 +30,7 @@ namespace System.Buffers.Text requiredBufferLength++; } - if (requiredBufferLength > buffer.Length) + if (requiredBufferLength > destination.Length) { bytesWritten = 0; return false; @@ -40,16 +40,16 @@ namespace System.Buffers.Text if (insertNegationSign) { - buffer[0] = Utf8Constants.Minus; - buffer = buffer.Slice(1); + destination[0] = Utf8Constants.Minus; + destination = destination.Slice(1); } - FormattingHelpers.WriteDigitsWithGroupSeparator(value, buffer.Slice(0, digitCount + commaCount)); + FormattingHelpers.WriteDigitsWithGroupSeparator(value, destination.Slice(0, digitCount + commaCount)); if (trailingZeroCount > 0) { - buffer[digitCount + commaCount] = Utf8Constants.Period; - FormattingHelpers.FillWithAsciiZeros(buffer.Slice(digitCount + commaCount + 1, trailingZeroCount)); + destination[digitCount + commaCount] = Utf8Constants.Period; + FormattingHelpers.FillWithAsciiZeros(destination.Slice(digitCount + commaCount + 1, trailingZeroCount)); } return true; diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Unsigned.X.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Unsigned.X.cs index 5a8209f8b1..4cf4d52b5c 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Unsigned.X.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Unsigned.X.cs @@ -9,14 +9,14 @@ namespace System.Buffers.Text /// public static partial class Utf8Formatter { - private static bool TryFormatUInt64X(ulong value, byte precision, bool useLower, Span buffer, out int bytesWritten) + private static bool TryFormatUInt64X(ulong value, byte precision, bool useLower, Span destination, out int bytesWritten) { int actualDigitCount = FormattingHelpers.CountHexDigits(value); int computedOutputLength = (precision == StandardFormat.NoPrecision) ? actualDigitCount : Math.Max(precision, actualDigitCount); - if (buffer.Length < computedOutputLength) + if (destination.Length < computedOutputLength) { bytesWritten = 0; return false; @@ -35,9 +35,9 @@ namespace System.Buffers.Text // casing output lengths of 2, 4, 8, and 16 and running them down optimized // code paths. - while ((uint)(--computedOutputLength) < (uint)buffer.Length) + while ((uint)(--computedOutputLength) < (uint)destination.Length) { - buffer[computedOutputLength] = (byte)hexTable[(int)value & 0xf]; + destination[computedOutputLength] = (byte)hexTable[(int)value & 0xf]; value >>= 4; } return true; diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Unsigned.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Unsigned.cs index 2a95f17241..b143061a58 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Unsigned.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.Unsigned.cs @@ -15,11 +15,11 @@ namespace System.Buffers.Text // Common worker for all unsigned integer TryFormat overloads // [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static bool TryFormatUInt64(ulong value, Span buffer, out int bytesWritten, StandardFormat format) + private static bool TryFormatUInt64(ulong value, Span destination, out int bytesWritten, StandardFormat format) { if (format.IsDefault) { - return TryFormatUInt64Default(value, buffer, out bytesWritten); + return TryFormatUInt64Default(value, destination, out bytesWritten); } switch (format.Symbol) @@ -28,21 +28,21 @@ namespace System.Buffers.Text case 'g': if (format.HasPrecision) throw new NotSupportedException(SR.Argument_GWithPrecisionNotSupported); // With a precision, 'G' can produce exponential format, even for integers. - return TryFormatUInt64D(value, format.Precision, buffer, insertNegationSign: false, out bytesWritten); + return TryFormatUInt64D(value, format.Precision, destination, insertNegationSign: false, out bytesWritten); case 'd': case 'D': - return TryFormatUInt64D(value, format.Precision, buffer, insertNegationSign: false, out bytesWritten); + return TryFormatUInt64D(value, format.Precision, destination, insertNegationSign: false, out bytesWritten); case 'n': case 'N': - return TryFormatUInt64N(value, format.Precision, buffer, insertNegationSign: false, out bytesWritten); + return TryFormatUInt64N(value, format.Precision, destination, insertNegationSign: false, out bytesWritten); case 'x': - return TryFormatUInt64X(value, format.Precision, true /* useLower */, buffer, out bytesWritten); + return TryFormatUInt64X(value, format.Precision, true /* useLower */, destination, out bytesWritten); case 'X': - return TryFormatUInt64X(value, format.Precision, false /* useLower */, buffer, out bytesWritten); + return TryFormatUInt64X(value, format.Precision, false /* useLower */, destination, out bytesWritten); default: return ThrowHelper.TryFormatThrowFormatException(out bytesWritten); diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.cs index a25155cab9..3b83fb7512 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.cs @@ -13,7 +13,7 @@ namespace System.Buffers.Text /// Formats a Byte as a UTF8 string. /// /// Value to format - /// Buffer to write the UTF8-formatted value to + /// Buffer to write the UTF8-formatted value to /// Receives the length of the formatted text in bytes /// The standard format to use /// @@ -30,14 +30,14 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryFormat(byte value, Span buffer, out int bytesWritten, StandardFormat format = default) - => TryFormatUInt64(value, buffer, out bytesWritten, format); + public static bool TryFormat(byte value, Span destination, out int bytesWritten, StandardFormat format = default) + => TryFormatUInt64(value, destination, out bytesWritten, format); /// /// Formats an SByte as a UTF8 string. /// /// Value to format - /// Buffer to write the UTF8-formatted value to + /// Buffer to write the UTF8-formatted value to /// Receives the length of the formatted text in bytes /// The standard format to use /// @@ -55,14 +55,14 @@ namespace System.Buffers.Text /// System.FormatException if the format is not valid for this data type. /// [CLSCompliant(false)] - public static bool TryFormat(sbyte value, Span buffer, out int bytesWritten, StandardFormat format = default) - => TryFormatInt64(value, 0xff, buffer, out bytesWritten, format); + public static bool TryFormat(sbyte value, Span destination, out int bytesWritten, StandardFormat format = default) + => TryFormatInt64(value, 0xff, destination, out bytesWritten, format); /// /// Formats a Unt16 as a UTF8 string. /// /// Value to format - /// Buffer to write the UTF8-formatted value to + /// Buffer to write the UTF8-formatted value to /// Receives the length of the formatted text in bytes /// The standard format to use /// @@ -80,14 +80,14 @@ namespace System.Buffers.Text /// System.FormatException if the format is not valid for this data type. /// [CLSCompliant(false)] - public static bool TryFormat(ushort value, Span buffer, out int bytesWritten, StandardFormat format = default) - => TryFormatUInt64(value, buffer, out bytesWritten, format); + public static bool TryFormat(ushort value, Span destination, out int bytesWritten, StandardFormat format = default) + => TryFormatUInt64(value, destination, out bytesWritten, format); /// /// Formats an Int16 as a UTF8 string. /// /// Value to format - /// Buffer to write the UTF8-formatted value to + /// Buffer to write the UTF8-formatted value to /// Receives the length of the formatted text in bytes /// The standard format to use /// @@ -104,14 +104,14 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryFormat(short value, Span buffer, out int bytesWritten, StandardFormat format = default) - => TryFormatInt64(value, 0xffff, buffer, out bytesWritten, format); + public static bool TryFormat(short value, Span destination, out int bytesWritten, StandardFormat format = default) + => TryFormatInt64(value, 0xffff, destination, out bytesWritten, format); /// /// Formats a UInt32 as a UTF8 string. /// /// Value to format - /// Buffer to write the UTF8-formatted value to + /// Buffer to write the UTF8-formatted value to /// Receives the length of the formatted text in bytes /// The standard format to use /// @@ -129,14 +129,14 @@ namespace System.Buffers.Text /// System.FormatException if the format is not valid for this data type. /// [CLSCompliant(false)] - public static bool TryFormat(uint value, Span buffer, out int bytesWritten, StandardFormat format = default) - => TryFormatUInt64(value, buffer, out bytesWritten, format); + public static bool TryFormat(uint value, Span destination, out int bytesWritten, StandardFormat format = default) + => TryFormatUInt64(value, destination, out bytesWritten, format); /// /// Formats an Int32 as a UTF8 string. /// /// Value to format - /// Buffer to write the UTF8-formatted value to + /// Buffer to write the UTF8-formatted value to /// Receives the length of the formatted text in bytes /// The standard format to use /// @@ -153,14 +153,14 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryFormat(int value, Span buffer, out int bytesWritten, StandardFormat format = default) - => TryFormatInt64(value, 0xffffffff, buffer, out bytesWritten, format); + public static bool TryFormat(int value, Span destination, out int bytesWritten, StandardFormat format = default) + => TryFormatInt64(value, 0xffffffff, destination, out bytesWritten, format); /// /// Formats a UInt64 as a UTF8 string. /// /// Value to format - /// Buffer to write the UTF8-formatted value to + /// Buffer to write the UTF8-formatted value to /// Receives the length of the formatted text in bytes /// The standard format to use /// @@ -178,14 +178,14 @@ namespace System.Buffers.Text /// System.FormatException if the format is not valid for this data type. /// [CLSCompliant(false)] - public static bool TryFormat(ulong value, Span buffer, out int bytesWritten, StandardFormat format = default) - => TryFormatUInt64(value, buffer, out bytesWritten, format); + public static bool TryFormat(ulong value, Span destination, out int bytesWritten, StandardFormat format = default) + => TryFormatUInt64(value, destination, out bytesWritten, format); /// /// Formats an Int64 as a UTF8 string. /// /// Value to format - /// Buffer to write the UTF8-formatted value to + /// Buffer to write the UTF8-formatted value to /// Receives the length of the formatted text in bytes /// The standard format to use /// @@ -202,7 +202,7 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryFormat(long value, Span buffer, out int bytesWritten, StandardFormat format = default) - => TryFormatInt64(value, 0xffffffffffffffff, buffer, out bytesWritten, format); + public static bool TryFormat(long value, Span destination, out int bytesWritten, StandardFormat format = default) + => TryFormatInt64(value, 0xffffffffffffffff, destination, out bytesWritten, format); } } diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.TimeSpan.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.TimeSpan.cs index 2c8dacaa66..a887c3ef1f 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.TimeSpan.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.TimeSpan.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; namespace System.Buffers.Text { @@ -12,7 +13,7 @@ namespace System.Buffers.Text /// Formats a TimeSpan as a UTF8 string. /// /// Value to format - /// Buffer to write the UTF8-formatted value to + /// Buffer to write the UTF8-formatted value to /// Receives the length of the formatted text in bytes /// The standard format to use /// @@ -28,7 +29,7 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryFormat(TimeSpan value, Span buffer, out int bytesWritten, StandardFormat format = default) + public static bool TryFormat(TimeSpan value, Span destination, out int bytesWritten, StandardFormat format = default) { char symbol = FormattingHelpers.GetSymbolOrDefault(format, 'c'); @@ -171,7 +172,7 @@ AfterComputeFraction: requiredOutputLength++; // for the leading '-' sign } - if (buffer.Length < requiredOutputLength) + if (destination.Length < requiredOutputLength) { bytesWritten = 0; return false; @@ -184,32 +185,32 @@ AfterComputeFraction: // Write leading '-' if necessary if (value.Ticks < 0) { - buffer[idx++] = Utf8Constants.Minus; + destination[idx++] = Utf8Constants.Minus; } // Write day (and separator) if necessary if (dayDigits > 0) { - FormattingHelpers.WriteDigits(days, buffer.Slice(idx, dayDigits)); + FormattingHelpers.WriteDigits(days, destination.Slice(idx, dayDigits)); idx += dayDigits; - buffer[idx++] = (symbol == 'c') ? Utf8Constants.Period : Utf8Constants.Colon; + destination[idx++] = (symbol == 'c') ? Utf8Constants.Period : Utf8Constants.Colon; } // Write "[h]h:mm:ss" - FormattingHelpers.WriteDigits(hours, buffer.Slice(idx, hourDigits)); + FormattingHelpers.WriteDigits(hours, destination.Slice(idx, hourDigits)); idx += hourDigits; - buffer[idx++] = Utf8Constants.Colon; - FormattingHelpers.WriteDigits((uint)minutes, buffer.Slice(idx, 2)); + destination[idx++] = Utf8Constants.Colon; + FormattingHelpers.WriteDigits((uint)minutes, destination.Slice(idx, 2)); idx += 2; - buffer[idx++] = Utf8Constants.Colon; - FormattingHelpers.WriteDigits((uint)seconds, buffer.Slice(idx, 2)); + destination[idx++] = Utf8Constants.Colon; + FormattingHelpers.WriteDigits((uint)seconds, destination.Slice(idx, 2)); idx += 2; // Write fraction (and separator) if necessary if (fractionDigits > 0) { - buffer[idx++] = Utf8Constants.Period; - FormattingHelpers.WriteDigits(fraction, buffer.Slice(idx, fractionDigits)); + destination[idx++] = Utf8Constants.Period; + FormattingHelpers.WriteDigits(fraction, destination.Slice(idx, fractionDigits)); idx += fractionDigits; } diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Boolean.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Boolean.cs index 51567ba04c..20b627eb33 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Boolean.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Boolean.cs @@ -9,7 +9,7 @@ namespace System.Buffers.Text /// /// Parses a Boolean at the start of a Utf8 string. /// - /// The Utf8 string to parse + /// The Utf8 string to parse /// Receives the parsed value /// On a successful parse, receives the length in bytes of the substring that was parsed /// Expected format of the Utf8 string @@ -25,29 +25,29 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryParse(ReadOnlySpan text, out bool value, out int bytesConsumed, char standardFormat = default) + public static bool TryParse(ReadOnlySpan source, out bool value, out int bytesConsumed, char standardFormat = default) { if (!(standardFormat == default(char) || standardFormat == 'G' || standardFormat == 'l')) return ThrowHelper.TryParseThrowFormatException(out value, out bytesConsumed); - if (text.Length >= 4) + if (source.Length >= 4) { - if ((text[0] == 'T' || text[0] == 't') && - (text[1] == 'R' || text[1] == 'r') && - (text[2] == 'U' || text[2] == 'u') && - (text[3] == 'E' || text[3] == 'e')) + if ((source[0] == 'T' || source[0] == 't') && + (source[1] == 'R' || source[1] == 'r') && + (source[2] == 'U' || source[2] == 'u') && + (source[3] == 'E' || source[3] == 'e')) { bytesConsumed = 4; value = true; return true; } - if (text.Length >= 5) + if (source.Length >= 5) { - if ((text[0] == 'F' || text[0] == 'f') && - (text[1] == 'A' || text[1] == 'a') && - (text[2] == 'L' || text[2] == 'l') && - (text[3] == 'S' || text[3] == 's') && - (text[4] == 'E' || text[4] == 'e')) + if ((source[0] == 'F' || source[0] == 'f') && + (source[1] == 'A' || source[1] == 'a') && + (source[2] == 'L' || source[2] == 'l') && + (source[3] == 'S' || source[3] == 's') && + (source[4] == 'E' || source[4] == 'e')) { bytesConsumed = 5; value = false; diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.Default.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.Default.cs index 73c21c8535..73578ea88c 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.Default.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.Default.cs @@ -14,30 +14,30 @@ namespace System.Buffers.Text // -------------------------- // 05/25/2017 10:30:15 -08:00 // - private static bool TryParseDateTimeOffsetDefault(ReadOnlySpan text, out DateTimeOffset value, out int bytesConsumed) + private static bool TryParseDateTimeOffsetDefault(ReadOnlySpan source, out DateTimeOffset value, out int bytesConsumed) { - if (text.Length < 26) + if (source.Length < 26) { bytesConsumed = 0; value = default; return false; } - if (!TryParseDateTimeG(text, out DateTime dateTime, out _, out _)) + if (!TryParseDateTimeG(source, out DateTime dateTime, out _, out _)) { bytesConsumed = 0; value = default; return false; } - if (text[19] != Utf8Constants.Space) + if (source[19] != Utf8Constants.Space) { bytesConsumed = 0; value = default; return false; } - byte sign = text[20]; + byte sign = source[20]; if (sign != Utf8Constants.Plus && sign != Utf8Constants.Minus) { bytesConsumed = 0; @@ -47,8 +47,8 @@ namespace System.Buffers.Text int offsetHours; { - uint digit1 = text[21] - 48u; // '0' - uint digit2 = text[22] - 48u; // '0' + uint digit1 = source[21] - 48u; // '0' + uint digit2 = source[22] - 48u; // '0' if (digit1 > 9 || digit2 > 9) { @@ -60,7 +60,7 @@ namespace System.Buffers.Text offsetHours = (int)(digit1 * 10 + digit2); } - if (text[23] != Utf8Constants.Colon) + if (source[23] != Utf8Constants.Colon) { bytesConsumed = 0; value = default; @@ -69,8 +69,8 @@ namespace System.Buffers.Text int offsetMinutes; { - uint digit1 = text[24] - 48u; // '0' - uint digit2 = text[25] - 48u; // '0' + uint digit1 = source[24] - 48u; // '0' + uint digit2 = source[25] - 48u; // '0' if (digit1 > 9 || digit2 > 9) { diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.G.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.G.cs index 4850bbbab8..0550c6a25b 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.G.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.G.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; namespace System.Buffers.Text { @@ -15,9 +16,9 @@ namespace System.Buffers.Text // --------------------------------- // 05/25/2017 10:30:15 // - private static bool TryParseDateTimeG(ReadOnlySpan text, out DateTime value, out DateTimeOffset valueAsOffset, out int bytesConsumed) + private static bool TryParseDateTimeG(ReadOnlySpan source, out DateTime value, out DateTimeOffset valueAsOffset, out int bytesConsumed) { - if (text.Length < 19) + if (source.Length < 19) { bytesConsumed = 0; value = default; @@ -27,8 +28,8 @@ namespace System.Buffers.Text int month; { - uint digit1 = text[0] - 48u; // '0' - uint digit2 = text[1] - 48u; // '0' + uint digit1 = source[0] - 48u; // '0' + uint digit2 = source[1] - 48u; // '0' if (digit1 > 9 || digit2 > 9) { @@ -41,7 +42,7 @@ namespace System.Buffers.Text month = (int)(digit1 * 10 + digit2); } - if (text[2] != Utf8Constants.Slash) + if (source[2] != Utf8Constants.Slash) { bytesConsumed = 0; value = default; @@ -51,8 +52,8 @@ namespace System.Buffers.Text int day; { - uint digit1 = text[3] - 48u; // '0' - uint digit2 = text[4] - 48u; // '0' + uint digit1 = source[3] - 48u; // '0' + uint digit2 = source[4] - 48u; // '0' if (digit1 > 9 || digit2 > 9) { @@ -65,7 +66,7 @@ namespace System.Buffers.Text day = (int)(digit1 * 10 + digit2); } - if (text[5] != Utf8Constants.Slash) + if (source[5] != Utf8Constants.Slash) { bytesConsumed = 0; value = default; @@ -75,10 +76,10 @@ namespace System.Buffers.Text int year; { - uint digit1 = text[6] - 48u; // '0' - uint digit2 = text[7] - 48u; // '0' - uint digit3 = text[8] - 48u; // '0' - uint digit4 = text[9] - 48u; // '0' + uint digit1 = source[6] - 48u; // '0' + uint digit2 = source[7] - 48u; // '0' + uint digit3 = source[8] - 48u; // '0' + uint digit4 = source[9] - 48u; // '0' if (digit1 > 9 || digit2 > 9 || digit3 > 9 || digit4 > 9) { @@ -91,7 +92,7 @@ namespace System.Buffers.Text year = (int)(digit1 * 1000 + digit2 * 100 + digit3 * 10 + digit4); } - if (text[10] != Utf8Constants.Space) + if (source[10] != Utf8Constants.Space) { bytesConsumed = 0; value = default; @@ -101,8 +102,8 @@ namespace System.Buffers.Text int hour; { - uint digit1 = text[11] - 48u; // '0' - uint digit2 = text[12] - 48u; // '0' + uint digit1 = source[11] - 48u; // '0' + uint digit2 = source[12] - 48u; // '0' if (digit1 > 9 || digit2 > 9) { @@ -115,7 +116,7 @@ namespace System.Buffers.Text hour = (int)(digit1 * 10 + digit2); } - if (text[13] != Utf8Constants.Colon) + if (source[13] != Utf8Constants.Colon) { bytesConsumed = 0; value = default; @@ -125,8 +126,8 @@ namespace System.Buffers.Text int minute; { - uint digit1 = text[14] - 48u; // '0' - uint digit2 = text[15] - 48u; // '0' + uint digit1 = source[14] - 48u; // '0' + uint digit2 = source[15] - 48u; // '0' if (digit1 > 9 || digit2 > 9) { @@ -139,7 +140,7 @@ namespace System.Buffers.Text minute = (int)(digit1 * 10 + digit2); } - if (text[16] != Utf8Constants.Colon) + if (source[16] != Utf8Constants.Colon) { bytesConsumed = 0; value = default; @@ -149,8 +150,8 @@ namespace System.Buffers.Text int second; { - uint digit1 = text[17] - 48u; // '0' - uint digit2 = text[18] - 48u; // '0' + uint digit1 = source[17] - 48u; // '0' + uint digit2 = source[18] - 48u; // '0' if (digit1 > 9 || digit2 > 9) { diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.Helpers.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.Helpers.cs index b284ba5488..62fea7bd51 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.Helpers.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.Helpers.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; namespace System.Buffers.Text { diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.O.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.O.cs index a3028fe984..47ac3af2ef 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.O.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.O.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; namespace System.Buffers.Text { @@ -17,9 +18,9 @@ namespace System.Buffers.Text // 2017-06-12T05:30:45.7680000Z (Z is short for "+00:00" but also distinguishes DateTimeKind.Utc from DateTimeKind.Local) // 2017-06-12T05:30:45.7680000 (interpreted as local time wrt to current time zone) // - private static bool TryParseDateTimeOffsetO(ReadOnlySpan text, out DateTimeOffset value, out int bytesConsumed, out DateTimeKind kind) + private static bool TryParseDateTimeOffsetO(ReadOnlySpan source, out DateTimeOffset value, out int bytesConsumed, out DateTimeKind kind) { - if (text.Length < 27) + if (source.Length < 27) { value = default; bytesConsumed = 0; @@ -29,10 +30,10 @@ namespace System.Buffers.Text int year; { - uint digit1 = text[0] - 48u; // '0' - uint digit2 = text[1] - 48u; // '0' - uint digit3 = text[2] - 48u; // '0' - uint digit4 = text[3] - 48u; // '0' + uint digit1 = source[0] - 48u; // '0' + uint digit2 = source[1] - 48u; // '0' + uint digit3 = source[2] - 48u; // '0' + uint digit4 = source[3] - 48u; // '0' if (digit1 > 9 || digit2 > 9 || digit3 > 9 || digit4 > 9) { @@ -45,7 +46,7 @@ namespace System.Buffers.Text year = (int)(digit1 * 1000 + digit2 * 100 + digit3 * 10 + digit4); } - if (text[4] != Utf8Constants.Hyphen) + if (source[4] != Utf8Constants.Hyphen) { value = default; bytesConsumed = 0; @@ -55,8 +56,8 @@ namespace System.Buffers.Text int month; { - uint digit1 = text[5] - 48u; // '0' - uint digit2 = text[6] - 48u; // '0' + uint digit1 = source[5] - 48u; // '0' + uint digit2 = source[6] - 48u; // '0' if (digit1 > 9 || digit2 > 9) { @@ -69,7 +70,7 @@ namespace System.Buffers.Text month = (int)(digit1 * 10 + digit2); } - if (text[7] != Utf8Constants.Hyphen) + if (source[7] != Utf8Constants.Hyphen) { value = default; bytesConsumed = 0; @@ -79,8 +80,8 @@ namespace System.Buffers.Text int day; { - uint digit1 = text[8] - 48u; // '0' - uint digit2 = text[9] - 48u; // '0' + uint digit1 = source[8] - 48u; // '0' + uint digit2 = source[9] - 48u; // '0' if (digit1 > 9 || digit2 > 9) { @@ -93,7 +94,7 @@ namespace System.Buffers.Text day = (int)(digit1 * 10 + digit2); } - if (text[10] != 'T') + if (source[10] != 'T') { value = default; bytesConsumed = 0; @@ -103,8 +104,8 @@ namespace System.Buffers.Text int hour; { - uint digit1 = text[11] - 48u; // '0' - uint digit2 = text[12] - 48u; // '0' + uint digit1 = source[11] - 48u; // '0' + uint digit2 = source[12] - 48u; // '0' if (digit1 > 9 || digit2 > 9) { @@ -117,7 +118,7 @@ namespace System.Buffers.Text hour = (int)(digit1 * 10 + digit2); } - if (text[13] != Utf8Constants.Colon) + if (source[13] != Utf8Constants.Colon) { value = default; bytesConsumed = 0; @@ -127,8 +128,8 @@ namespace System.Buffers.Text int minute; { - uint digit1 = text[14] - 48u; // '0' - uint digit2 = text[15] - 48u; // '0' + uint digit1 = source[14] - 48u; // '0' + uint digit2 = source[15] - 48u; // '0' if (digit1 > 9 || digit2 > 9) { @@ -141,7 +142,7 @@ namespace System.Buffers.Text minute = (int)(digit1 * 10 + digit2); } - if (text[16] != Utf8Constants.Colon) + if (source[16] != Utf8Constants.Colon) { value = default; bytesConsumed = 0; @@ -151,8 +152,8 @@ namespace System.Buffers.Text int second; { - uint digit1 = text[17] - 48u; // '0' - uint digit2 = text[18] - 48u; // '0' + uint digit1 = source[17] - 48u; // '0' + uint digit2 = source[18] - 48u; // '0' if (digit1 > 9 || digit2 > 9) { @@ -165,7 +166,7 @@ namespace System.Buffers.Text second = (int)(digit1 * 10 + digit2); } - if (text[19] != Utf8Constants.Period) + if (source[19] != Utf8Constants.Period) { value = default; bytesConsumed = 0; @@ -175,13 +176,13 @@ namespace System.Buffers.Text int fraction; { - uint digit1 = text[20] - 48u; // '0' - uint digit2 = text[21] - 48u; // '0' - uint digit3 = text[22] - 48u; // '0' - uint digit4 = text[23] - 48u; // '0' - uint digit5 = text[24] - 48u; // '0' - uint digit6 = text[25] - 48u; // '0' - uint digit7 = text[26] - 48u; // '0' + uint digit1 = source[20] - 48u; // '0' + uint digit2 = source[21] - 48u; // '0' + uint digit3 = source[22] - 48u; // '0' + uint digit4 = source[23] - 48u; // '0' + uint digit5 = source[24] - 48u; // '0' + uint digit6 = source[25] - 48u; // '0' + uint digit7 = source[26] - 48u; // '0' if (digit1 > 9 || digit2 > 9 || digit3 > 9 || digit4 > 9 || digit5 > 9 || digit6 > 9 || digit7 > 9) { @@ -194,7 +195,7 @@ namespace System.Buffers.Text fraction = (int)(digit1 * 1000000 + digit2 * 100000 + digit3 * 10000 + digit4 * 1000 + digit5 * 100 + digit6 * 10 + digit7); } - byte offsetChar = (text.Length <= 27) ? default : text[27]; + byte offsetChar = (source.Length <= 27) ? default : source[27]; if (offsetChar != 'Z' && offsetChar != Utf8Constants.Plus && offsetChar != Utf8Constants.Minus) { if (!TryCreateDateTimeOffsetInterpretingDataAsLocalTime(year: year, month: month, day: day, hour: hour, minute: minute, second: second, fraction: fraction, out value)) @@ -226,7 +227,7 @@ namespace System.Buffers.Text } Debug.Assert(offsetChar == Utf8Constants.Plus || offsetChar == Utf8Constants.Minus); - if (text.Length < 33) + if (source.Length < 33) { value = default; bytesConsumed = 0; @@ -236,8 +237,8 @@ namespace System.Buffers.Text int offsetHours; { - uint digit1 = text[28] - 48u; // '0' - uint digit2 = text[29] - 48u; // '0' + uint digit1 = source[28] - 48u; // '0' + uint digit2 = source[29] - 48u; // '0' if (digit1 > 9 || digit2 > 9) { @@ -250,7 +251,7 @@ namespace System.Buffers.Text offsetHours = (int)(digit1 * 10 + digit2); } - if (text[30] != Utf8Constants.Colon) + if (source[30] != Utf8Constants.Colon) { value = default; bytesConsumed = 0; @@ -260,8 +261,8 @@ namespace System.Buffers.Text int offsetMinutes; { - uint digit1 = text[31] - 48u; // '0' - uint digit2 = text[32] - 48u; // '0' + uint digit1 = source[31] - 48u; // '0' + uint digit2 = source[32] - 48u; // '0' if (digit1 > 9 || digit2 > 9) { diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.R.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.R.cs index af70ca62e5..316bee01b4 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.R.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.R.cs @@ -13,9 +13,9 @@ namespace System.Buffers.Text // ----------------------------- // Tue, 03 Jan 2017 08:08:05 GMT // - private static bool TryParseDateTimeOffsetR(ReadOnlySpan text, uint caseFlipXorMask, out DateTimeOffset dateTimeOffset, out int bytesConsumed) + private static bool TryParseDateTimeOffsetR(ReadOnlySpan source, uint caseFlipXorMask, out DateTimeOffset dateTimeOffset, out int bytesConsumed) { - if (text.Length < 29) + if (source.Length < 29) { bytesConsumed = 0; dateTimeOffset = default; @@ -24,10 +24,10 @@ namespace System.Buffers.Text DayOfWeek dayOfWeek; { - uint dow0 = text[0] ^ caseFlipXorMask; - uint dow1 = text[1]; - uint dow2 = text[2]; - uint comma = text[3]; + uint dow0 = source[0] ^ caseFlipXorMask; + uint dow1 = source[1]; + uint dow2 = source[2]; + uint comma = source[3]; uint dowString = (dow0 << 24) | (dow1 << 16) | (dow2 << 8) | comma; switch (dowString) { @@ -45,7 +45,7 @@ namespace System.Buffers.Text } } - if (text[4] != Utf8Constants.Space) + if (source[4] != Utf8Constants.Space) { bytesConsumed = 0; dateTimeOffset = default; @@ -54,8 +54,8 @@ namespace System.Buffers.Text int day; { - uint digit1 = text[5] - 48u; // '0' - uint digit2 = text[6] - 48u; // '0' + uint digit1 = source[5] - 48u; // '0' + uint digit2 = source[6] - 48u; // '0' if (digit1 > 9 || digit2 > 9) { @@ -67,7 +67,7 @@ namespace System.Buffers.Text day = (int)(digit1 * 10 + digit2); } - if (text[7] != Utf8Constants.Space) + if (source[7] != Utf8Constants.Space) { bytesConsumed = 0; dateTimeOffset = default; @@ -76,10 +76,10 @@ namespace System.Buffers.Text int month; { - uint mon0 = text[8] ^ caseFlipXorMask; - uint mon1 = text[9]; - uint mon2 = text[10]; - uint space = text[11]; + uint mon0 = source[8] ^ caseFlipXorMask; + uint mon1 = source[9]; + uint mon2 = source[10]; + uint space = source[11]; uint monthString = (mon0 << 24) | (mon1 << 16) | (mon2 << 8) | space; switch (monthString) { @@ -104,10 +104,10 @@ namespace System.Buffers.Text int year; { - uint digit1 = text[12] - 48u; // '0' - uint digit2 = text[13] - 48u; // '0' - uint digit3 = text[14] - 48u; // '0' - uint digit4 = text[15] - 48u; // '0' + uint digit1 = source[12] - 48u; // '0' + uint digit2 = source[13] - 48u; // '0' + uint digit3 = source[14] - 48u; // '0' + uint digit4 = source[15] - 48u; // '0' if (digit1 > 9 || digit2 > 9 || digit3 > 9 || digit4 > 9) { @@ -119,7 +119,7 @@ namespace System.Buffers.Text year = (int)(digit1 * 1000 + digit2 * 100 + digit3 * 10 + digit4); } - if (text[16] != Utf8Constants.Space) + if (source[16] != Utf8Constants.Space) { bytesConsumed = 0; dateTimeOffset = default; @@ -128,8 +128,8 @@ namespace System.Buffers.Text int hour; { - uint digit1 = text[17] - 48u; // '0' - uint digit2 = text[18] - 48u; // '0' + uint digit1 = source[17] - 48u; // '0' + uint digit2 = source[18] - 48u; // '0' if (digit1 > 9 || digit2 > 9) { @@ -141,7 +141,7 @@ namespace System.Buffers.Text hour = (int)(digit1 * 10 + digit2); } - if (text[19] != Utf8Constants.Colon) + if (source[19] != Utf8Constants.Colon) { bytesConsumed = 0; dateTimeOffset = default; @@ -150,8 +150,8 @@ namespace System.Buffers.Text int minute; { - uint digit1 = text[20] - 48u; // '0' - uint digit2 = text[21] - 48u; // '0' + uint digit1 = source[20] - 48u; // '0' + uint digit2 = source[21] - 48u; // '0' if (digit1 > 9 || digit2 > 9) { @@ -163,7 +163,7 @@ namespace System.Buffers.Text minute = (int)(digit1 * 10 + digit2); } - if (text[22] != Utf8Constants.Colon) + if (source[22] != Utf8Constants.Colon) { bytesConsumed = 0; dateTimeOffset = default; @@ -172,8 +172,8 @@ namespace System.Buffers.Text int second; { - uint digit1 = text[23] - 48u; // '0' - uint digit2 = text[24] - 48u; // '0' + uint digit1 = source[23] - 48u; // '0' + uint digit2 = source[24] - 48u; // '0' if (digit1 > 9 || digit2 > 9) { @@ -186,10 +186,10 @@ namespace System.Buffers.Text } { - uint space = text[25]; - uint g = text[26] ^ caseFlipXorMask; - uint m = text[27] ^ caseFlipXorMask; - uint t = text[28] ^ caseFlipXorMask; + uint space = source[25]; + uint g = source[26] ^ caseFlipXorMask; + uint m = source[27] ^ caseFlipXorMask; + uint t = source[28] ^ caseFlipXorMask; uint gmtString = (space << 24) | (g << 16) | (m << 8) | t; if (gmtString != 0x20474d54 /* ' GMT' */) { diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.cs index d69ff7ce13..c0b306bf5d 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Date.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; namespace System.Buffers.Text { @@ -11,7 +12,7 @@ namespace System.Buffers.Text /// /// Parses a DateTime at the start of a Utf8 string. /// - /// The Utf8 string to parse + /// The Utf8 string to parse /// Receives the parsed value /// On a successful parse, receives the length in bytes of the substring that was parsed /// Expected format of the Utf8 string @@ -30,13 +31,13 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryParse(ReadOnlySpan text, out DateTime value, out int bytesConsumed, char standardFormat = default) + public static bool TryParse(ReadOnlySpan source, out DateTime value, out int bytesConsumed, char standardFormat = default) { switch (standardFormat) { case 'R': { - if (!TryParseDateTimeOffsetR(text, NoFlipCase, out DateTimeOffset dateTimeOffset, out bytesConsumed)) + if (!TryParseDateTimeOffsetR(source, NoFlipCase, out DateTimeOffset dateTimeOffset, out bytesConsumed)) { value = default; return false; @@ -47,7 +48,7 @@ namespace System.Buffers.Text case 'l': { - if (!TryParseDateTimeOffsetR(text, FlipCase, out DateTimeOffset dateTimeOffset, out bytesConsumed)) + if (!TryParseDateTimeOffsetR(source, FlipCase, out DateTimeOffset dateTimeOffset, out bytesConsumed)) { value = default; return false; @@ -65,7 +66,7 @@ namespace System.Buffers.Text // 2017-06-12T05:30:45.7680000+00:00 - Local // 2017-06-12T05:30:45.7680000Z - Utc - if (!TryParseDateTimeOffsetO(text, out DateTimeOffset dateTimeOffset, out bytesConsumed, out DateTimeKind kind)) + if (!TryParseDateTimeOffsetO(source, out DateTimeOffset dateTimeOffset, out bytesConsumed, out DateTimeKind kind)) { value = default; bytesConsumed = 0; @@ -89,9 +90,9 @@ namespace System.Buffers.Text return true; } - case (default): + case default(char): case 'G': - return TryParseDateTimeG(text, out value, out _, out bytesConsumed); + return TryParseDateTimeG(source, out value, out _, out bytesConsumed); default: return ThrowHelper.TryParseThrowFormatException(out value, out bytesConsumed); @@ -101,7 +102,7 @@ namespace System.Buffers.Text /// /// Parses a DateTimeOffset at the start of a Utf8 string. /// - /// The Utf8 string to parse + /// The Utf8 string to parse /// Receives the parsed value /// On a successful parse, receives the length in bytes of the substring that was parsed /// Expected format of the Utf8 string @@ -119,24 +120,24 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryParse(ReadOnlySpan text, out DateTimeOffset value, out int bytesConsumed, char standardFormat = default) + public static bool TryParse(ReadOnlySpan source, out DateTimeOffset value, out int bytesConsumed, char standardFormat = default) { switch (standardFormat) { case 'R': - return TryParseDateTimeOffsetR(text, NoFlipCase, out value, out bytesConsumed); + return TryParseDateTimeOffsetR(source, NoFlipCase, out value, out bytesConsumed); case 'l': - return TryParseDateTimeOffsetR(text, FlipCase, out value, out bytesConsumed); + return TryParseDateTimeOffsetR(source, FlipCase, out value, out bytesConsumed); case 'O': - return TryParseDateTimeOffsetO(text, out value, out bytesConsumed, out _); + return TryParseDateTimeOffsetO(source, out value, out bytesConsumed, out _); - case (default): - return TryParseDateTimeOffsetDefault(text, out value, out bytesConsumed); + case default(char): + return TryParseDateTimeOffsetDefault(source, out value, out bytesConsumed); case 'G': - return TryParseDateTimeG(text, out DateTime _, out value, out bytesConsumed); + return TryParseDateTimeG(source, out DateTime _, out value, out bytesConsumed); default: return ThrowHelper.TryParseThrowFormatException(out value, out bytesConsumed); diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Decimal.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Decimal.cs index 59f74bb847..c0f1e0c040 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Decimal.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Decimal.cs @@ -9,7 +9,7 @@ namespace System.Buffers.Text /// /// Parses a Decimal at the start of a Utf8 string. /// - /// The Utf8 string to parse + /// The Utf8 string to parse /// Receives the parsed value /// On a successful parse, receives the length in bytes of the substring that was parsed /// Expected format of the Utf8 string @@ -26,12 +26,12 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryParse(ReadOnlySpan text, out decimal value, out int bytesConsumed, char standardFormat = default) + public static bool TryParse(ReadOnlySpan source, out decimal value, out int bytesConsumed, char standardFormat = default) { ParseNumberOptions options; switch (standardFormat) { - case (default): + case default(char): case 'G': case 'g': case 'E': @@ -49,7 +49,7 @@ namespace System.Buffers.Text } NumberBuffer number = default; - if (!TryParseNumber(text, ref number, out bytesConsumed, options, out bool textUsedExponentNotation)) + if (!TryParseNumber(source, ref number, out bytesConsumed, options, out bool textUsedExponentNotation)) { value = default; return false; diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Float.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Float.cs index 0b0e25e22d..b00ae277ee 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Float.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Float.cs @@ -9,7 +9,7 @@ namespace System.Buffers.Text /// /// Parses a Single at the start of a Utf8 string. /// - /// The Utf8 string to parse + /// The Utf8 string to parse /// Receives the parsed value /// On a successful parse, receives the length in bytes of the substring that was parsed /// Expected format of the Utf8 string @@ -26,9 +26,9 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryParse(ReadOnlySpan text, out float value, out int bytesConsumed, char standardFormat = default) + public static bool TryParse(ReadOnlySpan source, out float value, out int bytesConsumed, char standardFormat = default) { - if (TryParseNormalAsFloatingPoint(text, out double d, out bytesConsumed, standardFormat)) + if (TryParseNormalAsFloatingPoint(source, out double d, out bytesConsumed, standardFormat)) { value = (float)d; if (float.IsInfinity(value)) @@ -40,13 +40,13 @@ namespace System.Buffers.Text return true; } - return TryParseAsSpecialFloatingPoint(text, float.PositiveInfinity, float.NegativeInfinity, float.NaN, out value, out bytesConsumed); + return TryParseAsSpecialFloatingPoint(source, float.PositiveInfinity, float.NegativeInfinity, float.NaN, out value, out bytesConsumed); } /// /// Parses a Double at the start of a Utf8 string. /// - /// The Utf8 string to parse + /// The Utf8 string to parse /// Receives the parsed value /// On a successful parse, receives the length in bytes of the substring that was parsed /// Expected format of the Utf8 string @@ -63,23 +63,23 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryParse(ReadOnlySpan text, out double value, out int bytesConsumed, char standardFormat = default) + public static bool TryParse(ReadOnlySpan source, out double value, out int bytesConsumed, char standardFormat = default) { - if (TryParseNormalAsFloatingPoint(text, out value, out bytesConsumed, standardFormat)) + if (TryParseNormalAsFloatingPoint(source, out value, out bytesConsumed, standardFormat)) return true; - return TryParseAsSpecialFloatingPoint(text, double.PositiveInfinity, double.NegativeInfinity, double.NaN, out value, out bytesConsumed); + return TryParseAsSpecialFloatingPoint(source, double.PositiveInfinity, double.NegativeInfinity, double.NaN, out value, out bytesConsumed); } // // Attempt to parse the regular floating points (the ones without names like "Infinity" and "NaN") // - private static bool TryParseNormalAsFloatingPoint(ReadOnlySpan text, out double value, out int bytesConsumed, char standardFormat) + private static bool TryParseNormalAsFloatingPoint(ReadOnlySpan source, out double value, out int bytesConsumed, char standardFormat) { ParseNumberOptions options; switch (standardFormat) { - case (default): + case default(char): case 'G': case 'g': case 'E': @@ -97,7 +97,7 @@ namespace System.Buffers.Text } NumberBuffer number = default; - if (!TryParseNumber(text, ref number, out bytesConsumed, options, out bool textUsedExponentNotation)) + if (!TryParseNumber(source, ref number, out bytesConsumed, options, out bool textUsedExponentNotation)) { value = default; return false; @@ -128,29 +128,29 @@ namespace System.Buffers.Text // // Assuming the text doesn't look like a normal floating point, we attempt to parse it as one the special floating point values. // - private static bool TryParseAsSpecialFloatingPoint(ReadOnlySpan text, T positiveInfinity, T negativeInfinity, T nan, out T value, out int bytesConsumed) + private static bool TryParseAsSpecialFloatingPoint(ReadOnlySpan source, T positiveInfinity, T negativeInfinity, T nan, out T value, out int bytesConsumed) { - if (text.Length >= 8 && - text[0] == 'I' && text[1] == 'n' && text[2] == 'f' && text[3] == 'i' && - text[4] == 'n' && text[5] == 'i' && text[6] == 't' && text[7] == 'y') + if (source.Length >= 8 && + source[0] == 'I' && source[1] == 'n' && source[2] == 'f' && source[3] == 'i' && + source[4] == 'n' && source[5] == 'i' && source[6] == 't' && source[7] == 'y') { value = positiveInfinity; bytesConsumed = 8; return true; } - if (text.Length >= 9 && - text[0] == Utf8Constants.Minus && - text[1] == 'I' && text[2] == 'n' && text[3] == 'f' && text[4] == 'i' && - text[5] == 'n' && text[6] == 'i' && text[7] == 't' && text[8] == 'y') + if (source.Length >= 9 && + source[0] == Utf8Constants.Minus && + source[1] == 'I' && source[2] == 'n' && source[3] == 'f' && source[4] == 'i' && + source[5] == 'n' && source[6] == 'i' && source[7] == 't' && source[8] == 'y') { value = negativeInfinity; bytesConsumed = 9; return true; } - if (text.Length >= 3 && - text[0] == 'N' && text[1] == 'a' && text[2] == 'N') + if (source.Length >= 3 && + source[0] == 'N' && source[1] == 'a' && source[2] == 'N') { value = nan; bytesConsumed = 3; diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Guid.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Guid.cs index baefe25905..17dec828bc 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Guid.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Guid.cs @@ -9,7 +9,7 @@ namespace System.Buffers.Text /// /// Parses a Guid at the start of a Utf8 string. /// - /// The Utf8 string to parse + /// The Utf8 string to parse /// Receives the parsed value /// On a successful parse, receives the length in bytes of the substring that was parsed /// Expected format of the Utf8 string @@ -27,19 +27,19 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryParse(ReadOnlySpan text, out Guid value, out int bytesConsumed, char standardFormat = default) + public static bool TryParse(ReadOnlySpan source, out Guid value, out int bytesConsumed, char standardFormat = default) { switch (standardFormat) { - case (default): + case default(char): case 'D': - return TryParseGuidCore(text, false, ' ', ' ', out value, out bytesConsumed); + return TryParseGuidCore(source, false, ' ', ' ', out value, out bytesConsumed); case 'B': - return TryParseGuidCore(text, true, '{', '}', out value, out bytesConsumed); + return TryParseGuidCore(source, true, '{', '}', out value, out bytesConsumed); case 'P': - return TryParseGuidCore(text, true, '(', ')', out value, out bytesConsumed); + return TryParseGuidCore(source, true, '(', ')', out value, out bytesConsumed); case 'N': - return TryParseGuidN(text, out value, out bytesConsumed); + return TryParseGuidN(source, out value, out bytesConsumed); default: return ThrowHelper.TryParseThrowFormatException(out value, out bytesConsumed); } @@ -97,11 +97,11 @@ namespace System.Buffers.Text } // {8-4-4-4-12}, where number is the number of hex digits, and {/} are ends. - private static bool TryParseGuidCore(ReadOnlySpan text, bool ends, char begin, char end, out Guid value, out int bytesConsumed) + private static bool TryParseGuidCore(ReadOnlySpan source, bool ends, char begin, char end, out Guid value, out int bytesConsumed) { int expectedCodingUnits = 36 + (ends ? 2 : 0); // 32 hex digits + 4 delimiters + 2 optional ends - if (text.Length < expectedCodingUnits) + if (source.Length < expectedCodingUnits) { value = default; bytesConsumed = 0; @@ -110,17 +110,17 @@ namespace System.Buffers.Text if (ends) { - if (text[0] != begin) + if (source[0] != begin) { value = default; bytesConsumed = 0; return false; } - text = text.Slice(1); // skip begining + source = source.Slice(1); // skip begining } - if (!TryParseUInt32X(text, out uint i1, out int justConsumed)) + if (!TryParseUInt32X(source, out uint i1, out int justConsumed)) { value = default; bytesConsumed = 0; @@ -134,16 +134,16 @@ namespace System.Buffers.Text return false; // 8 digits } - if (text[justConsumed] != '-') + if (source[justConsumed] != '-') { value = default; bytesConsumed = 0; return false; } - text = text.Slice(9); // justConsumed + 1 for delimiter + source = source.Slice(9); // justConsumed + 1 for delimiter - if (!TryParseUInt16X(text, out ushort i2, out justConsumed)) + if (!TryParseUInt16X(source, out ushort i2, out justConsumed)) { value = default; bytesConsumed = 0; @@ -157,16 +157,16 @@ namespace System.Buffers.Text return false; // 4 digits } - if (text[justConsumed] != '-') + if (source[justConsumed] != '-') { value = default; bytesConsumed = 0; return false; } - text = text.Slice(5); // justConsumed + 1 for delimiter + source = source.Slice(5); // justConsumed + 1 for delimiter - if (!TryParseUInt16X(text, out ushort i3, out justConsumed)) + if (!TryParseUInt16X(source, out ushort i3, out justConsumed)) { value = default; bytesConsumed = 0; @@ -180,16 +180,16 @@ namespace System.Buffers.Text return false; // 4 digits } - if (text[justConsumed] != '-') + if (source[justConsumed] != '-') { value = default; bytesConsumed = 0; return false; } - text = text.Slice(5); // justConsumed + 1 for delimiter + source = source.Slice(5); // justConsumed + 1 for delimiter - if (!TryParseUInt16X(text, out ushort i4, out justConsumed)) + if (!TryParseUInt16X(source, out ushort i4, out justConsumed)) { value = default; bytesConsumed = 0; @@ -203,16 +203,16 @@ namespace System.Buffers.Text return false; // 4 digits } - if (text[justConsumed] != '-') + if (source[justConsumed] != '-') { value = default; bytesConsumed = 0; return false; } - text = text.Slice(5);// justConsumed + 1 for delimiter + source = source.Slice(5);// justConsumed + 1 for delimiter - if (!TryParseUInt64X(text, out ulong i5, out justConsumed)) + if (!TryParseUInt64X(source, out ulong i5, out justConsumed)) { value = default; bytesConsumed = 0; @@ -226,7 +226,7 @@ namespace System.Buffers.Text return false; // 12 digits } - if (ends && text[justConsumed] != end) + if (ends && source[justConsumed] != end) { value = default; bytesConsumed = 0; diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Signed.D.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Signed.D.cs index b5f7649181..bf1871a1c9 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Signed.D.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Signed.D.cs @@ -6,28 +6,28 @@ namespace System.Buffers.Text { public static partial class Utf8Parser { - private static bool TryParseSByteD(ReadOnlySpan text, out sbyte value, out int bytesConsumed) + private static bool TryParseSByteD(ReadOnlySpan source, out sbyte value, out int bytesConsumed) { - if (text.Length < 1) + if (source.Length < 1) goto FalseExit; int sign = 1; int index = 0; - int num = text[index]; + int num = source[index]; if (num == '-') { sign = -1; index++; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto FalseExit; - num = text[index]; + num = source[index]; } else if (num == '+') { index++; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto FalseExit; - num = text[index]; + num = source[index]; } int answer = 0; @@ -39,9 +39,9 @@ namespace System.Buffers.Text do { index++; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; } while (num == '0'); if (!ParserHelpers.IsDigit(num)) goto Done; @@ -50,18 +50,18 @@ namespace System.Buffers.Text answer = num - '0'; index++; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; // Potential overflow - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; @@ -71,9 +71,9 @@ namespace System.Buffers.Text if ((uint)answer > (uint)sbyte.MaxValue + (-1 * sign + 1) / 2) goto FalseExit; // Overflow - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - if (!ParserHelpers.IsDigit(text[index])) + if (!ParserHelpers.IsDigit(source[index])) goto Done; // Guaranteed overflow @@ -91,28 +91,28 @@ namespace System.Buffers.Text return true; } - private static bool TryParseInt16D(ReadOnlySpan text, out short value, out int bytesConsumed) + private static bool TryParseInt16D(ReadOnlySpan source, out short value, out int bytesConsumed) { - if (text.Length < 1) + if (source.Length < 1) goto FalseExit; int sign = 1; int index = 0; - int num = text[index]; + int num = source[index]; if (num == '-') { sign = -1; index++; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto FalseExit; - num = text[index]; + num = source[index]; } else if (num == '+') { index++; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto FalseExit; - num = text[index]; + num = source[index]; } int answer = 0; @@ -124,9 +124,9 @@ namespace System.Buffers.Text do { index++; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; } while (num == '0'); if (!ParserHelpers.IsDigit(num)) goto Done; @@ -135,34 +135,34 @@ namespace System.Buffers.Text answer = num - '0'; index++; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; // Potential overflow - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; @@ -172,9 +172,9 @@ namespace System.Buffers.Text if ((uint)answer > (uint)short.MaxValue + (-1 * sign + 1) / 2) goto FalseExit; // Overflow - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - if (!ParserHelpers.IsDigit(text[index])) + if (!ParserHelpers.IsDigit(source[index])) goto Done; // Guaranteed overflow @@ -192,28 +192,28 @@ namespace System.Buffers.Text return true; } - private static bool TryParseInt32D(ReadOnlySpan text, out int value, out int bytesConsumed) + private static bool TryParseInt32D(ReadOnlySpan source, out int value, out int bytesConsumed) { - if (text.Length < 1) + if (source.Length < 1) goto FalseExit; int sign = 1; int index = 0; - int num = text[index]; + int num = source[index]; if (num == '-') { sign = -1; index++; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto FalseExit; - num = text[index]; + num = source[index]; } else if (num == '+') { index++; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto FalseExit; - num = text[index]; + num = source[index]; } int answer = 0; @@ -225,9 +225,9 @@ namespace System.Buffers.Text do { index++; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; } while (num == '0'); if (!ParserHelpers.IsDigit(num)) goto Done; @@ -236,74 +236,74 @@ namespace System.Buffers.Text answer = num - '0'; index++; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; // Potential overflow - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; @@ -315,9 +315,9 @@ namespace System.Buffers.Text if ((uint)answer > (uint)int.MaxValue + (-1 * sign + 1) / 2) goto FalseExit; // Overflow - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - if (!ParserHelpers.IsDigit(text[index])) + if (!ParserHelpers.IsDigit(source[index])) goto Done; // Guaranteed overflow @@ -335,9 +335,9 @@ namespace System.Buffers.Text return true; } - private static bool TryParseInt64D(ReadOnlySpan text, out long value, out int bytesConsumed) + private static bool TryParseInt64D(ReadOnlySpan source, out long value, out int bytesConsumed) { - if (text.Length < 1) + if (source.Length < 1) { bytesConsumed = 0; value = default; @@ -346,23 +346,23 @@ namespace System.Buffers.Text int indexOfFirstDigit = 0; int sign = 1; - if (text[0] == '-') + if (source[0] == '-') { indexOfFirstDigit = 1; sign = -1; - if (text.Length <= indexOfFirstDigit) + if (source.Length <= indexOfFirstDigit) { bytesConsumed = 0; value = default; return false; } } - else if (text[0] == '+') + else if (source[0] == '+') { indexOfFirstDigit = 1; - if (text.Length <= indexOfFirstDigit) + if (source.Length <= indexOfFirstDigit) { bytesConsumed = 0; value = default; @@ -373,7 +373,7 @@ namespace System.Buffers.Text int overflowLength = ParserHelpers.Int64OverflowLength + indexOfFirstDigit; // Parse the first digit separately. If invalid here, we need to return false. - long firstDigit = text[indexOfFirstDigit] - 48; // '0' + long firstDigit = source[indexOfFirstDigit] - 48; // '0' if (firstDigit < 0 || firstDigit > 9) { bytesConsumed = 0; @@ -382,12 +382,12 @@ namespace System.Buffers.Text } ulong parsedValue = (ulong)firstDigit; - if (text.Length < overflowLength) + if (source.Length < overflowLength) { // Length is less than Parsers.Int64OverflowLength; overflow is not possible - for (int index = indexOfFirstDigit + 1; index < text.Length; index++) + for (int index = indexOfFirstDigit + 1; index < source.Length; index++) { - long nextDigit = text[index] - 48; // '0' + long nextDigit = source[index] - 48; // '0' if (nextDigit < 0 || nextDigit > 9) { bytesConsumed = index; @@ -403,7 +403,7 @@ namespace System.Buffers.Text // digits. There may be no overflow after Parsers.Int64OverflowLength if there are leading zeroes. for (int index = indexOfFirstDigit + 1; index < overflowLength - 1; index++) { - long nextDigit = text[index] - 48; // '0' + long nextDigit = source[index] - 48; // '0' if (nextDigit < 0 || nextDigit > 9) { bytesConsumed = index; @@ -412,9 +412,9 @@ namespace System.Buffers.Text } parsedValue = parsedValue * 10 + (ulong)nextDigit; } - for (int index = overflowLength - 1; index < text.Length; index++) + for (int index = overflowLength - 1; index < source.Length; index++) { - long nextDigit = text[index] - 48; // '0' + long nextDigit = source[index] - 48; // '0' if (nextDigit < 0 || nextDigit > 9) { bytesConsumed = index; @@ -435,7 +435,7 @@ namespace System.Buffers.Text } } - bytesConsumed = text.Length; + bytesConsumed = source.Length; value = ((long)parsedValue) * sign; return true; } diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Signed.N.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Signed.N.cs index 66aa994f6d..e087041598 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Signed.N.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Signed.N.cs @@ -6,24 +6,378 @@ namespace System.Buffers.Text { public static partial class Utf8Parser { - private static bool TryParseSByteN(ReadOnlySpan text, out sbyte value, out int bytesConsumed) + private static bool TryParseSByteN(ReadOnlySpan source, out sbyte value, out int bytesConsumed) { - throw NotImplemented.ActiveIssue("https://github.com/dotnet/corefx/issues/24986"); + if (source.Length < 1) + goto FalseExit; + + int sign = 1; + int index = 0; + int c = source[index]; + if (c == '-') + { + sign = -1; + index++; + if ((uint)index >= (uint)source.Length) + goto FalseExit; + c = source[index]; + } + else if (c == '+') + { + index++; + if ((uint)index >= (uint)source.Length) + goto FalseExit; + c = source[index]; + } + + int answer; + + // Handle the first digit (or period) as a special case. This ensures some compatible edge-case behavior with the classic parse routines + // (at least one digit must precede any commas, and a string without any digits prior to the decimal point must have at least + // one digit after the decimal point.) + if (c == Utf8Constants.Period) + goto FractionalPartWithoutLeadingDigits; + if (!ParserHelpers.IsDigit(c)) + goto FalseExit; + answer = c - '0'; + + for (; ; ) + { + index++; + if ((uint)index >= (uint)source.Length) + goto Done; + + c = source[index]; + if (c == Utf8Constants.Comma) + continue; + + if (c == Utf8Constants.Period) + goto FractionalDigits; + + if (!ParserHelpers.IsDigit(c)) + goto Done; + + answer = answer * 10 + c - '0'; + + // if sign < 0, (-1 * sign + 1) / 2 = 1 + // else, (-1 * sign + 1) / 2 = 0 + if (answer > sbyte.MaxValue + (-1 * sign + 1) / 2) + goto FalseExit; // Overflow + } + +FractionalPartWithoutLeadingDigits: // If we got here, we found a decimal point before we found any digits. This is legal as long as there's at least one zero after the decimal point. + answer = 0; + index++; + if ((uint)index >= (uint)source.Length) + goto FalseExit; + if (source[index] != '0') + goto FalseExit; + +FractionalDigits: // "N" format allows a fractional portion despite being an integer format but only if the post-fraction digits are all 0. + do + { + index++; + if ((uint)index >= (uint)source.Length) + goto Done; + c = source[index]; + } + while (c == '0'); + + if (ParserHelpers.IsDigit(c)) + goto FalseExit; // The fractional portion contained a non-zero digit. Treat this as an error, not an early termination. + goto Done; + +FalseExit: + bytesConsumed = default; + value = default; + return false; + +Done: + bytesConsumed = index; + value = (sbyte)(answer * sign); + return true; } - private static bool TryParseInt16N(ReadOnlySpan text, out short value, out int bytesConsumed) + private static bool TryParseInt16N(ReadOnlySpan source, out short value, out int bytesConsumed) { - throw NotImplemented.ActiveIssue("https://github.com/dotnet/corefx/issues/24986"); + if (source.Length < 1) + goto FalseExit; + + int sign = 1; + int index = 0; + int c = source[index]; + if (c == '-') + { + sign = -1; + index++; + if ((uint)index >= (uint)source.Length) + goto FalseExit; + c = source[index]; + } + else if (c == '+') + { + index++; + if ((uint)index >= (uint)source.Length) + goto FalseExit; + c = source[index]; + } + + int answer; + + // Handle the first digit (or period) as a special case. This ensures some compatible edge-case behavior with the classic parse routines + // (at least one digit must precede any commas, and a string without any digits prior to the decimal point must have at least + // one digit after the decimal point.) + if (c == Utf8Constants.Period) + goto FractionalPartWithoutLeadingDigits; + if (!ParserHelpers.IsDigit(c)) + goto FalseExit; + answer = c - '0'; + + for (; ; ) + { + index++; + if ((uint)index >= (uint)source.Length) + goto Done; + + c = source[index]; + if (c == Utf8Constants.Comma) + continue; + + if (c == Utf8Constants.Period) + goto FractionalDigits; + + if (!ParserHelpers.IsDigit(c)) + goto Done; + + answer = answer * 10 + c - '0'; + + // if sign < 0, (-1 * sign + 1) / 2 = 1 + // else, (-1 * sign + 1) / 2 = 0 + if (answer > short.MaxValue + (-1 * sign + 1) / 2) + goto FalseExit; // Overflow + } + +FractionalPartWithoutLeadingDigits: // If we got here, we found a decimal point before we found any digits. This is legal as long as there's at least one zero after the decimal point. + answer = 0; + index++; + if ((uint)index >= (uint)source.Length) + goto FalseExit; + if (source[index] != '0') + goto FalseExit; + +FractionalDigits: // "N" format allows a fractional portion despite being an integer format but only if the post-fraction digits are all 0. + do + { + index++; + if ((uint)index >= (uint)source.Length) + goto Done; + c = source[index]; + } + while (c == '0'); + + if (ParserHelpers.IsDigit(c)) + goto FalseExit; // The fractional portion contained a non-zero digit. Treat this as an error, not an early termination. + goto Done; + +FalseExit: + bytesConsumed = default; + value = default; + return false; + +Done: + bytesConsumed = index; + value = (short)(answer * sign); + return true; } - private static bool TryParseInt32N(ReadOnlySpan text, out int value, out int bytesConsumed) + private static bool TryParseInt32N(ReadOnlySpan source, out int value, out int bytesConsumed) { - throw NotImplemented.ActiveIssue("https://github.com/dotnet/corefx/issues/24986"); + if (source.Length < 1) + goto FalseExit; + + int sign = 1; + int index = 0; + int c = source[index]; + if (c == '-') + { + sign = -1; + index++; + if ((uint)index >= (uint)source.Length) + goto FalseExit; + c = source[index]; + } + else if (c == '+') + { + index++; + if ((uint)index >= (uint)source.Length) + goto FalseExit; + c = source[index]; + } + + int answer; + + // Handle the first digit (or period) as a special case. This ensures some compatible edge-case behavior with the classic parse routines + // (at least one digit must precede any commas, and a string without any digits prior to the decimal point must have at least + // one digit after the decimal point.) + if (c == Utf8Constants.Period) + goto FractionalPartWithoutLeadingDigits; + if (!ParserHelpers.IsDigit(c)) + goto FalseExit; + answer = c - '0'; + + for (; ; ) + { + index++; + if ((uint)index >= (uint)source.Length) + goto Done; + + c = source[index]; + if (c == Utf8Constants.Comma) + continue; + + if (c == Utf8Constants.Period) + goto FractionalDigits; + + if (!ParserHelpers.IsDigit(c)) + goto Done; + + if (((uint)answer) > int.MaxValue / 10) + goto FalseExit; + + answer = answer * 10 + c - '0'; + + // if sign < 0, (-1 * sign + 1) / 2 = 1 + // else, (-1 * sign + 1) / 2 = 0 + if ((uint)answer > (uint)int.MaxValue + (-1 * sign + 1) / 2) + goto FalseExit; // Overflow + } + +FractionalPartWithoutLeadingDigits: // If we got here, we found a decimal point before we found any digits. This is legal as long as there's at least one zero after the decimal point. + answer = 0; + index++; + if ((uint)index >= (uint)source.Length) + goto FalseExit; + if (source[index] != '0') + goto FalseExit; + +FractionalDigits: // "N" format allows a fractional portion despite being an integer format but only if the post-fraction digits are all 0. + do + { + index++; + if ((uint)index >= (uint)source.Length) + goto Done; + c = source[index]; + } + while (c == '0'); + + if (ParserHelpers.IsDigit(c)) + goto FalseExit; // The fractional portion contained a non-zero digit. Treat this as an error, not an early termination. + goto Done; + +FalseExit: + bytesConsumed = default; + value = default; + return false; + +Done: + bytesConsumed = index; + value = answer * sign; + return true; } - private static bool TryParseInt64N(ReadOnlySpan text, out long value, out int bytesConsumed) + private static bool TryParseInt64N(ReadOnlySpan source, out long value, out int bytesConsumed) { - throw NotImplemented.ActiveIssue("https://github.com/dotnet/corefx/issues/24986"); + if (source.Length < 1) + goto FalseExit; + + int sign = 1; + int index = 0; + int c = source[index]; + if (c == '-') + { + sign = -1; + index++; + if ((uint)index >= (uint)source.Length) + goto FalseExit; + c = source[index]; + } + else if (c == '+') + { + index++; + if ((uint)index >= (uint)source.Length) + goto FalseExit; + c = source[index]; + } + + long answer; + + // Handle the first digit (or period) as a special case. This ensures some compatible edge-case behavior with the classic parse routines + // (at least one digit must precede any commas, and a string without any digits prior to the decimal point must have at least + // one digit after the decimal point.) + if (c == Utf8Constants.Period) + goto FractionalPartWithoutLeadingDigits; + if (!ParserHelpers.IsDigit(c)) + goto FalseExit; + answer = c - '0'; + + for (; ; ) + { + index++; + if ((uint)index >= (uint)source.Length) + goto Done; + + c = source[index]; + if (c == Utf8Constants.Comma) + continue; + + if (c == Utf8Constants.Period) + goto FractionalDigits; + + if (!ParserHelpers.IsDigit(c)) + goto Done; + + if (((ulong)answer) > long.MaxValue / 10) + goto FalseExit; + + answer = answer * 10 + c - '0'; + + // if sign < 0, (-1 * sign + 1) / 2 = 1 + // else, (-1 * sign + 1) / 2 = 0 + if ((ulong)answer > (ulong)(long.MaxValue + (-1 * sign + 1) / 2)) + goto FalseExit; // Overflow + } + +FractionalPartWithoutLeadingDigits: // If we got here, we found a decimal point before we found any digits. This is legal as long as there's at least one zero after the decimal point. + answer = 0; + index++; + if ((uint)index >= (uint)source.Length) + goto FalseExit; + if (source[index] != '0') + goto FalseExit; + +FractionalDigits: // "N" format allows a fractional portion despite being an integer format but only if the post-fraction digits are all 0. + do + { + index++; + if ((uint)index >= (uint)source.Length) + goto Done; + c = source[index]; + } + while (c == '0'); + + if (ParserHelpers.IsDigit(c)) + goto FalseExit; // The fractional portion contained a non-zero digit. Treat this as an error, not an early termination. + goto Done; + +FalseExit: + bytesConsumed = default; + value = default; + return false; + +Done: + bytesConsumed = index; + value = answer * sign; + return true; } } } diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Signed.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Signed.cs index e7f5009684..94a19389b2 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Signed.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Signed.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -#if !netstandard +#if !netstandard && !MONO using Internal.Runtime.CompilerServices; #else using System.Runtime.CompilerServices; @@ -18,7 +18,7 @@ namespace System.Buffers.Text /// /// Parses a SByte at the start of a Utf8 string. /// - /// The Utf8 string to parse + /// The Utf8 string to parse /// Receives the parsed value /// On a successful parse, receives the length in bytes of the substring that was parsed /// Expected format of the Utf8 string @@ -37,25 +37,25 @@ namespace System.Buffers.Text /// System.FormatException if the format is not valid for this data type. /// [CLSCompliant(false)] - public static bool TryParse(ReadOnlySpan text, out sbyte value, out int bytesConsumed, char standardFormat = default) + public static bool TryParse(ReadOnlySpan source, out sbyte value, out int bytesConsumed, char standardFormat = default) { switch (standardFormat) { - case (default): + case default(char): case 'g': case 'G': case 'd': case 'D': - return TryParseSByteD(text, out value, out bytesConsumed); + return TryParseSByteD(source, out value, out bytesConsumed); case 'n': case 'N': - return TryParseSByteN(text, out value, out bytesConsumed); + return TryParseSByteN(source, out value, out bytesConsumed); case 'x': case 'X': value = default; - return TryParseByteX(text, out Unsafe.As(ref value), out bytesConsumed); + return TryParseByteX(source, out Unsafe.As(ref value), out bytesConsumed); default: return ThrowHelper.TryParseThrowFormatException(out value, out bytesConsumed); @@ -65,7 +65,7 @@ namespace System.Buffers.Text /// /// Parses an Int16 at the start of a Utf8 string. /// - /// The Utf8 string to parse + /// The Utf8 string to parse /// Receives the parsed value /// On a successful parse, receives the length in bytes of the substring that was parsed /// Expected format of the Utf8 string @@ -83,25 +83,25 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryParse(ReadOnlySpan text, out short value, out int bytesConsumed, char standardFormat = default) + public static bool TryParse(ReadOnlySpan source, out short value, out int bytesConsumed, char standardFormat = default) { switch (standardFormat) { - case (default): + case default(char): case 'g': case 'G': case 'd': case 'D': - return TryParseInt16D(text, out value, out bytesConsumed); + return TryParseInt16D(source, out value, out bytesConsumed); case 'n': case 'N': - return TryParseInt16N(text, out value, out bytesConsumed); + return TryParseInt16N(source, out value, out bytesConsumed); case 'x': case 'X': value = default; - return TryParseUInt16X(text, out Unsafe.As(ref value), out bytesConsumed); + return TryParseUInt16X(source, out Unsafe.As(ref value), out bytesConsumed); default: return ThrowHelper.TryParseThrowFormatException(out value, out bytesConsumed); @@ -111,7 +111,7 @@ namespace System.Buffers.Text /// /// Parses an Int32 at the start of a Utf8 string. /// - /// The Utf8 string to parse + /// The Utf8 string to parse /// Receives the parsed value /// On a successful parse, receives the length in bytes of the substring that was parsed /// Expected format of the Utf8 string @@ -129,25 +129,25 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryParse(ReadOnlySpan text, out int value, out int bytesConsumed, char standardFormat = default) + public static bool TryParse(ReadOnlySpan source, out int value, out int bytesConsumed, char standardFormat = default) { switch (standardFormat) { - case (default): + case default(char): case 'g': case 'G': case 'd': case 'D': - return TryParseInt32D(text, out value, out bytesConsumed); + return TryParseInt32D(source, out value, out bytesConsumed); case 'n': case 'N': - return TryParseInt32N(text, out value, out bytesConsumed); + return TryParseInt32N(source, out value, out bytesConsumed); case 'x': case 'X': value = default; - return TryParseUInt32X(text, out Unsafe.As(ref value), out bytesConsumed); + return TryParseUInt32X(source, out Unsafe.As(ref value), out bytesConsumed); default: return ThrowHelper.TryParseThrowFormatException(out value, out bytesConsumed); @@ -157,7 +157,7 @@ namespace System.Buffers.Text /// /// Parses an Int64 at the start of a Utf8 string. /// - /// The Utf8 string to parse + /// The Utf8 string to parse /// Receives the parsed value /// On a successful parse, receives the length in bytes of the substring that was parsed /// Expected format of the Utf8 string @@ -175,25 +175,25 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryParse(ReadOnlySpan text, out long value, out int bytesConsumed, char standardFormat = default) + public static bool TryParse(ReadOnlySpan source, out long value, out int bytesConsumed, char standardFormat = default) { switch (standardFormat) { - case (default): + case default(char): case 'g': case 'G': case 'd': case 'D': - return TryParseInt64D(text, out value, out bytesConsumed); + return TryParseInt64D(source, out value, out bytesConsumed); case 'n': case 'N': - return TryParseInt64N(text, out value, out bytesConsumed); + return TryParseInt64N(source, out value, out bytesConsumed); case 'x': case 'X': value = default; - return TryParseUInt64X(text, out Unsafe.As(ref value), out bytesConsumed); + return TryParseUInt64X(source, out Unsafe.As(ref value), out bytesConsumed); default: return ThrowHelper.TryParseThrowFormatException(out value, out bytesConsumed); diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Unsigned.D.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Unsigned.D.cs index 99aeceddd3..46753f5c57 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Unsigned.D.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Unsigned.D.cs @@ -6,13 +6,13 @@ namespace System.Buffers.Text { public static partial class Utf8Parser { - private static bool TryParseByteD(ReadOnlySpan text, out byte value, out int bytesConsumed) + private static bool TryParseByteD(ReadOnlySpan source, out byte value, out int bytesConsumed) { - if (text.Length < 1) + if (source.Length < 1) goto FalseExit; int index = 0; - int num = text[index]; + int num = source[index]; int answer = 0; if (ParserHelpers.IsDigit(num)) @@ -22,9 +22,9 @@ namespace System.Buffers.Text do { index++; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; } while (num == '0'); if (!ParserHelpers.IsDigit(num)) goto Done; @@ -33,18 +33,18 @@ namespace System.Buffers.Text answer = num - '0'; index++; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; // Potential overflow - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; @@ -52,9 +52,9 @@ namespace System.Buffers.Text if ((uint)answer > byte.MaxValue) goto FalseExit; // Overflow - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - if (!ParserHelpers.IsDigit(text[index])) + if (!ParserHelpers.IsDigit(source[index])) goto Done; // Guaranteed overflow @@ -72,13 +72,13 @@ namespace System.Buffers.Text return true; } - private static bool TryParseUInt16D(ReadOnlySpan text, out ushort value, out int bytesConsumed) + private static bool TryParseUInt16D(ReadOnlySpan source, out ushort value, out int bytesConsumed) { - if (text.Length < 1) + if (source.Length < 1) goto FalseExit; int index = 0; - int num = text[index]; + int num = source[index]; int answer = 0; if (ParserHelpers.IsDigit(num)) @@ -88,9 +88,9 @@ namespace System.Buffers.Text do { index++; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; } while (num == '0'); if (!ParserHelpers.IsDigit(num)) goto Done; @@ -99,34 +99,34 @@ namespace System.Buffers.Text answer = num - '0'; index++; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; // Potential overflow - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; @@ -134,9 +134,9 @@ namespace System.Buffers.Text if ((uint)answer > ushort.MaxValue) goto FalseExit; // Overflow - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - if (!ParserHelpers.IsDigit(text[index])) + if (!ParserHelpers.IsDigit(source[index])) goto Done; // Guaranteed overflow @@ -154,13 +154,13 @@ namespace System.Buffers.Text return true; } - private static bool TryParseUInt32D(ReadOnlySpan text, out uint value, out int bytesConsumed) + private static bool TryParseUInt32D(ReadOnlySpan source, out uint value, out int bytesConsumed) { - if (text.Length < 1) + if (source.Length < 1) goto FalseExit; int index = 0; - int num = text[index]; + int num = source[index]; int answer = 0; if (ParserHelpers.IsDigit(num)) @@ -170,9 +170,9 @@ namespace System.Buffers.Text do { index++; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; } while (num == '0'); if (!ParserHelpers.IsDigit(num)) goto Done; @@ -181,74 +181,74 @@ namespace System.Buffers.Text answer = num - '0'; index++; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; answer = 10 * answer + num - '0'; // Potential overflow - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - num = text[index]; + num = source[index]; if (!ParserHelpers.IsDigit(num)) goto Done; index++; @@ -256,9 +256,9 @@ namespace System.Buffers.Text goto FalseExit; // Overflow answer = answer * 10 + num - '0'; - if ((uint)index >= (uint)text.Length) + if ((uint)index >= (uint)source.Length) goto Done; - if (!ParserHelpers.IsDigit(text[index])) + if (!ParserHelpers.IsDigit(source[index])) goto Done; // Guaranteed overflow @@ -276,9 +276,9 @@ namespace System.Buffers.Text return true; } - private static bool TryParseUInt64D(ReadOnlySpan text, out ulong value, out int bytesConsumed) + private static bool TryParseUInt64D(ReadOnlySpan source, out ulong value, out int bytesConsumed) { - if (text.Length < 1) + if (source.Length < 1) { bytesConsumed = 0; value = default; @@ -286,7 +286,7 @@ namespace System.Buffers.Text } // Parse the first digit separately. If invalid here, we need to return false. - ulong firstDigit = text[0] - 48u; // '0' + ulong firstDigit = source[0] - 48u; // '0' if (firstDigit > 9) { bytesConsumed = 0; @@ -295,12 +295,12 @@ namespace System.Buffers.Text } ulong parsedValue = firstDigit; - if (text.Length < ParserHelpers.Int64OverflowLength) + if (source.Length < ParserHelpers.Int64OverflowLength) { // Length is less than Parsers.Int64OverflowLength; overflow is not possible - for (int index = 1; index < text.Length; index++) + for (int index = 1; index < source.Length; index++) { - ulong nextDigit = text[index] - 48u; // '0' + ulong nextDigit = source[index] - 48u; // '0' if (nextDigit > 9) { bytesConsumed = index; @@ -316,7 +316,7 @@ namespace System.Buffers.Text // digits. There may be no overflow after Parsers.Int64OverflowLength if there are leading zeroes. for (int index = 1; index < ParserHelpers.Int64OverflowLength - 1; index++) { - ulong nextDigit = text[index] - 48u; // '0' + ulong nextDigit = source[index] - 48u; // '0' if (nextDigit > 9) { bytesConsumed = index; @@ -325,9 +325,9 @@ namespace System.Buffers.Text } parsedValue = parsedValue * 10 + nextDigit; } - for (int index = ParserHelpers.Int64OverflowLength - 1; index < text.Length; index++) + for (int index = ParserHelpers.Int64OverflowLength - 1; index < source.Length; index++) { - ulong nextDigit = text[index] - 48u; // '0' + ulong nextDigit = source[index] - 48u; // '0' if (nextDigit > 9) { bytesConsumed = index; @@ -346,7 +346,7 @@ namespace System.Buffers.Text } } - bytesConsumed = text.Length; + bytesConsumed = source.Length; value = parsedValue; return true; } diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Unsigned.N.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Unsigned.N.cs index 0990336af3..bb535fb6cb 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Unsigned.N.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Unsigned.N.cs @@ -9,24 +9,328 @@ namespace System.Buffers.Text // public static partial class Utf8Parser { - private static bool TryParseByteN(ReadOnlySpan text, out byte value, out int bytesConsumed) + private static bool TryParseByteN(ReadOnlySpan source, out byte value, out int bytesConsumed) { - throw NotImplemented.ActiveIssue("https://github.com/dotnet/corefx/issues/24986"); + if (source.Length < 1) + goto FalseExit; + + int index = 0; + int c = source[index]; + if (c == '+') + { + index++; + if ((uint)index >= (uint)source.Length) + goto FalseExit; + c = source[index]; + } + + int answer; + + // Handle the first digit (or period) as a special case. This ensures some compatible edge-case behavior with the classic parse routines + // (at least one digit must precede any commas, and a string without any digits prior to the decimal point must have at least + // one digit after the decimal point.) + if (c == Utf8Constants.Period) + goto FractionalPartWithoutLeadingDigits; + if (!ParserHelpers.IsDigit(c)) + goto FalseExit; + answer = c - '0'; + + for (; ; ) + { + index++; + if ((uint)index >= (uint)source.Length) + goto Done; + + c = source[index]; + if (c == Utf8Constants.Comma) + continue; + + if (c == Utf8Constants.Period) + goto FractionalDigits; + + if (!ParserHelpers.IsDigit(c)) + goto Done; + + answer = answer * 10 + c - '0'; + + if (answer > byte.MaxValue) + goto FalseExit; // Overflow + } + +FractionalPartWithoutLeadingDigits: // If we got here, we found a decimal point before we found any digits. This is legal as long as there's at least one zero after the decimal point. + answer = 0; + index++; + if ((uint)index >= (uint)source.Length) + goto FalseExit; + if (source[index] != '0') + goto FalseExit; + +FractionalDigits: // "N" format allows a fractional portion despite being an integer format but only if the post-fraction digits are all 0. + do + { + index++; + if ((uint)index >= (uint)source.Length) + goto Done; + c = source[index]; + } + while (c == '0'); + + if (ParserHelpers.IsDigit(c)) + goto FalseExit; // The fractional portion contained a non-zero digit. Treat this as an error, not an early termination. + goto Done; + +FalseExit: + bytesConsumed = default; + value = default; + return false; + +Done: + bytesConsumed = index; + value = (byte)answer; + return true; } - private static bool TryParseUInt16N(ReadOnlySpan text, out ushort value, out int bytesConsumed) + private static bool TryParseUInt16N(ReadOnlySpan source, out ushort value, out int bytesConsumed) { - throw NotImplemented.ActiveIssue("https://github.com/dotnet/corefx/issues/24986"); + if (source.Length < 1) + goto FalseExit; + + int index = 0; + int c = source[index]; + if (c == '+') + { + index++; + if ((uint)index >= (uint)source.Length) + goto FalseExit; + c = source[index]; + } + + int answer; + + // Handle the first digit (or period) as a special case. This ensures some compatible edge-case behavior with the classic parse routines + // (at least one digit must precede any commas, and a string without any digits prior to the decimal point must have at least + // one digit after the decimal point.) + if (c == Utf8Constants.Period) + goto FractionalPartWithoutLeadingDigits; + if (!ParserHelpers.IsDigit(c)) + goto FalseExit; + answer = c - '0'; + + for (; ; ) + { + index++; + if ((uint)index >= (uint)source.Length) + goto Done; + + c = source[index]; + if (c == Utf8Constants.Comma) + continue; + + if (c == Utf8Constants.Period) + goto FractionalDigits; + + if (!ParserHelpers.IsDigit(c)) + goto Done; + + answer = answer * 10 + c - '0'; + + if (answer > ushort.MaxValue) + goto FalseExit; // Overflow + } + +FractionalPartWithoutLeadingDigits: // If we got here, we found a decimal point before we found any digits. This is legal as long as there's at least one zero after the decimal point. + answer = 0; + index++; + if ((uint)index >= (uint)source.Length) + goto FalseExit; + if (source[index] != '0') + goto FalseExit; + +FractionalDigits: // "N" format allows a fractional portion despite being an integer format but only if the post-fraction digits are all 0. + do + { + index++; + if ((uint)index >= (uint)source.Length) + goto Done; + c = source[index]; + } + while (c == '0'); + + if (ParserHelpers.IsDigit(c)) + goto FalseExit; // The fractional portion contained a non-zero digit. Treat this as an error, not an early termination. + goto Done; + +FalseExit: + bytesConsumed = default; + value = default; + return false; + +Done: + bytesConsumed = index; + value = (ushort)answer; + return true; } - private static bool TryParseUInt32N(ReadOnlySpan text, out uint value, out int bytesConsumed) + private static bool TryParseUInt32N(ReadOnlySpan source, out uint value, out int bytesConsumed) { - throw NotImplemented.ActiveIssue("https://github.com/dotnet/corefx/issues/24986"); + if (source.Length < 1) + goto FalseExit; + + int index = 0; + int c = source[index]; + if (c == '+') + { + index++; + if ((uint)index >= (uint)source.Length) + goto FalseExit; + c = source[index]; + } + + int answer; + + // Handle the first digit (or period) as a special case. This ensures some compatible edge-case behavior with the classic parse routines + // (at least one digit must precede any commas, and a string without any digits prior to the decimal point must have at least + // one digit after the decimal point.) + if (c == Utf8Constants.Period) + goto FractionalPartWithoutLeadingDigits; + if (!ParserHelpers.IsDigit(c)) + goto FalseExit; + answer = c - '0'; + + for (; ; ) + { + index++; + if ((uint)index >= (uint)source.Length) + goto Done; + + c = source[index]; + if (c == Utf8Constants.Comma) + continue; + + if (c == Utf8Constants.Period) + goto FractionalDigits; + + if (!ParserHelpers.IsDigit(c)) + goto Done; + + if (((uint)answer) > uint.MaxValue / 10 || (((uint)answer) == uint.MaxValue / 10 && c > '5')) + goto FalseExit; // Overflow + + answer = answer * 10 + c - '0'; + } + +FractionalPartWithoutLeadingDigits: // If we got here, we found a decimal point before we found any digits. This is legal as long as there's at least one zero after the decimal point. + answer = 0; + index++; + if ((uint)index >= (uint)source.Length) + goto FalseExit; + if (source[index] != '0') + goto FalseExit; + +FractionalDigits: // "N" format allows a fractional portion despite being an integer format but only if the post-fraction digits are all 0. + do + { + index++; + if ((uint)index >= (uint)source.Length) + goto Done; + c = source[index]; + } + while (c == '0'); + + if (ParserHelpers.IsDigit(c)) + goto FalseExit; // The fractional portion contained a non-zero digit. Treat this as an error, not an early termination. + goto Done; + +FalseExit: + bytesConsumed = default; + value = default; + return false; + +Done: + bytesConsumed = index; + value = (uint)answer; + return true; } - private static bool TryParseUInt64N(ReadOnlySpan text, out ulong value, out int bytesConsumed) + private static bool TryParseUInt64N(ReadOnlySpan source, out ulong value, out int bytesConsumed) { - throw NotImplemented.ActiveIssue("https://github.com/dotnet/corefx/issues/24986"); + if (source.Length < 1) + goto FalseExit; + + int index = 0; + int c = source[index]; + if (c == '+') + { + index++; + if ((uint)index >= (uint)source.Length) + goto FalseExit; + c = source[index]; + } + + long answer; + + // Handle the first digit (or period) as a special case. This ensures some compatible edge-case behavior with the classic parse routines + // (at least one digit must precede any commas, and a string without any digits prior to the decimal point must have at least + // one digit after the decimal point.) + if (c == Utf8Constants.Period) + goto FractionalPartWithoutLeadingDigits; + if (!ParserHelpers.IsDigit(c)) + goto FalseExit; + answer = c - '0'; + + for (; ; ) + { + index++; + if ((uint)index >= (uint)source.Length) + goto Done; + + c = source[index]; + if (c == Utf8Constants.Comma) + continue; + + if (c == Utf8Constants.Period) + goto FractionalDigits; + + if (!ParserHelpers.IsDigit(c)) + goto Done; + + if (((ulong)answer) > ulong.MaxValue / 10 || (((ulong)answer) == ulong.MaxValue / 10 && c > '5')) + goto FalseExit; // Overflow + + answer = answer * 10 + c - '0'; + } + +FractionalPartWithoutLeadingDigits: // If we got here, we found a decimal point before we found any digits. This is legal as long as there's at least one zero after the decimal point. + answer = 0; + index++; + if ((uint)index >= (uint)source.Length) + goto FalseExit; + if (source[index] != '0') + goto FalseExit; + +FractionalDigits: // "N" format allows a fractional portion despite being an integer format but only if the post-fraction digits are all 0. + do + { + index++; + if ((uint)index >= (uint)source.Length) + goto Done; + c = source[index]; + } + while (c == '0'); + + if (ParserHelpers.IsDigit(c)) + goto FalseExit; // The fractional portion contained a non-zero digit. Treat this as an error, not an early termination. + goto Done; + +FalseExit: + bytesConsumed = default; + value = default; + return false; + +Done: + bytesConsumed = index; + value = (ulong)answer; + return true; } } } diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Unsigned.X.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Unsigned.X.cs index 0e320a229a..7e7867a56f 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Unsigned.X.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Unsigned.X.cs @@ -6,9 +6,9 @@ namespace System.Buffers.Text { public static partial class Utf8Parser { - private static bool TryParseByteX(ReadOnlySpan text, out byte value, out int bytesConsumed) + private static bool TryParseByteX(ReadOnlySpan source, out byte value, out int bytesConsumed) { - if (text.Length < 1) + if (source.Length < 1) { bytesConsumed = 0; value = default; @@ -21,7 +21,7 @@ namespace System.Buffers.Text byte[] hexLookup = ParserHelpers.s_hexLookup; // Parse the first digit separately. If invalid here, we need to return false. - nextCharacter = text[0]; + nextCharacter = source[0]; nextDigit = hexLookup[nextCharacter]; if (nextDigit == 0xFF) { @@ -31,12 +31,12 @@ namespace System.Buffers.Text } uint parsedValue = nextDigit; - if (text.Length <= ParserHelpers.ByteOverflowLengthHex) + if (source.Length <= ParserHelpers.ByteOverflowLengthHex) { // Length is less than or equal to Parsers.ByteOverflowLengthHex; overflow is not possible - for (int index = 1; index < text.Length; index++) + for (int index = 1; index < source.Length; index++) { - nextCharacter = text[index]; + nextCharacter = source[index]; nextDigit = hexLookup[nextCharacter]; if (nextDigit == 0xFF) { @@ -53,7 +53,7 @@ namespace System.Buffers.Text // digits. There may be no overflow after Parsers.ByteOverflowLengthHex if there are leading zeroes. for (int index = 1; index < ParserHelpers.ByteOverflowLengthHex; index++) { - nextCharacter = text[index]; + nextCharacter = source[index]; nextDigit = hexLookup[nextCharacter]; if (nextDigit == 0xFF) { @@ -63,9 +63,9 @@ namespace System.Buffers.Text } parsedValue = (parsedValue << 4) + nextDigit; } - for (int index = ParserHelpers.ByteOverflowLengthHex; index < text.Length; index++) + for (int index = ParserHelpers.ByteOverflowLengthHex; index < source.Length; index++) { - nextCharacter = text[index]; + nextCharacter = source[index]; nextDigit = hexLookup[nextCharacter]; if (nextDigit == 0xFF) { @@ -84,14 +84,14 @@ namespace System.Buffers.Text } } - bytesConsumed = text.Length; + bytesConsumed = source.Length; value = (byte)(parsedValue); return true; } - private static bool TryParseUInt16X(ReadOnlySpan text, out ushort value, out int bytesConsumed) + private static bool TryParseUInt16X(ReadOnlySpan source, out ushort value, out int bytesConsumed) { - if (text.Length < 1) + if (source.Length < 1) { bytesConsumed = 0; value = default; @@ -104,7 +104,7 @@ namespace System.Buffers.Text byte[] hexLookup = ParserHelpers.s_hexLookup; // Parse the first digit separately. If invalid here, we need to return false. - nextCharacter = text[0]; + nextCharacter = source[0]; nextDigit = hexLookup[nextCharacter]; if (nextDigit == 0xFF) { @@ -114,12 +114,12 @@ namespace System.Buffers.Text } uint parsedValue = nextDigit; - if (text.Length <= ParserHelpers.Int16OverflowLengthHex) + if (source.Length <= ParserHelpers.Int16OverflowLengthHex) { // Length is less than or equal to Parsers.Int16OverflowLengthHex; overflow is not possible - for (int index = 1; index < text.Length; index++) + for (int index = 1; index < source.Length; index++) { - nextCharacter = text[index]; + nextCharacter = source[index]; nextDigit = hexLookup[nextCharacter]; if (nextDigit == 0xFF) { @@ -136,7 +136,7 @@ namespace System.Buffers.Text // digits. There may be no overflow after Parsers.Int16OverflowLengthHex if there are leading zeroes. for (int index = 1; index < ParserHelpers.Int16OverflowLengthHex; index++) { - nextCharacter = text[index]; + nextCharacter = source[index]; nextDigit = hexLookup[nextCharacter]; if (nextDigit == 0xFF) { @@ -146,9 +146,9 @@ namespace System.Buffers.Text } parsedValue = (parsedValue << 4) + nextDigit; } - for (int index = ParserHelpers.Int16OverflowLengthHex; index < text.Length; index++) + for (int index = ParserHelpers.Int16OverflowLengthHex; index < source.Length; index++) { - nextCharacter = text[index]; + nextCharacter = source[index]; nextDigit = hexLookup[nextCharacter]; if (nextDigit == 0xFF) { @@ -167,14 +167,14 @@ namespace System.Buffers.Text } } - bytesConsumed = text.Length; + bytesConsumed = source.Length; value = (ushort)(parsedValue); return true; } - private static bool TryParseUInt32X(ReadOnlySpan text, out uint value, out int bytesConsumed) + private static bool TryParseUInt32X(ReadOnlySpan source, out uint value, out int bytesConsumed) { - if (text.Length < 1) + if (source.Length < 1) { bytesConsumed = 0; value = default; @@ -187,7 +187,7 @@ namespace System.Buffers.Text byte[] hexLookup = ParserHelpers.s_hexLookup; // Parse the first digit separately. If invalid here, we need to return false. - nextCharacter = text[0]; + nextCharacter = source[0]; nextDigit = hexLookup[nextCharacter]; if (nextDigit == 0xFF) { @@ -197,12 +197,12 @@ namespace System.Buffers.Text } uint parsedValue = nextDigit; - if (text.Length <= ParserHelpers.Int32OverflowLengthHex) + if (source.Length <= ParserHelpers.Int32OverflowLengthHex) { // Length is less than or equal to Parsers.Int32OverflowLengthHex; overflow is not possible - for (int index = 1; index < text.Length; index++) + for (int index = 1; index < source.Length; index++) { - nextCharacter = text[index]; + nextCharacter = source[index]; nextDigit = hexLookup[nextCharacter]; if (nextDigit == 0xFF) { @@ -219,7 +219,7 @@ namespace System.Buffers.Text // digits. There may be no overflow after Parsers.Int32OverflowLengthHex if there are leading zeroes. for (int index = 1; index < ParserHelpers.Int32OverflowLengthHex; index++) { - nextCharacter = text[index]; + nextCharacter = source[index]; nextDigit = hexLookup[nextCharacter]; if (nextDigit == 0xFF) { @@ -229,9 +229,9 @@ namespace System.Buffers.Text } parsedValue = (parsedValue << 4) + nextDigit; } - for (int index = ParserHelpers.Int32OverflowLengthHex; index < text.Length; index++) + for (int index = ParserHelpers.Int32OverflowLengthHex; index < source.Length; index++) { - nextCharacter = text[index]; + nextCharacter = source[index]; nextDigit = hexLookup[nextCharacter]; if (nextDigit == 0xFF) { @@ -250,14 +250,14 @@ namespace System.Buffers.Text } } - bytesConsumed = text.Length; + bytesConsumed = source.Length; value = parsedValue; return true; } - private static bool TryParseUInt64X(ReadOnlySpan text, out ulong value, out int bytesConsumed) + private static bool TryParseUInt64X(ReadOnlySpan source, out ulong value, out int bytesConsumed) { - if (text.Length < 1) + if (source.Length < 1) { bytesConsumed = 0; value = default; @@ -270,7 +270,7 @@ namespace System.Buffers.Text byte[] hexLookup = ParserHelpers.s_hexLookup; // Parse the first digit separately. If invalid here, we need to return false. - nextCharacter = text[0]; + nextCharacter = source[0]; nextDigit = hexLookup[nextCharacter]; if (nextDigit == 0xFF) { @@ -280,12 +280,12 @@ namespace System.Buffers.Text } ulong parsedValue = nextDigit; - if (text.Length <= ParserHelpers.Int64OverflowLengthHex) + if (source.Length <= ParserHelpers.Int64OverflowLengthHex) { // Length is less than or equal to Parsers.Int64OverflowLengthHex; overflow is not possible - for (int index = 1; index < text.Length; index++) + for (int index = 1; index < source.Length; index++) { - nextCharacter = text[index]; + nextCharacter = source[index]; nextDigit = hexLookup[nextCharacter]; if (nextDigit == 0xFF) { @@ -302,7 +302,7 @@ namespace System.Buffers.Text // digits. There may be no overflow after Parsers.Int64OverflowLengthHex if there are leading zeroes. for (int index = 1; index < ParserHelpers.Int64OverflowLengthHex; index++) { - nextCharacter = text[index]; + nextCharacter = source[index]; nextDigit = hexLookup[nextCharacter]; if (nextDigit == 0xFF) { @@ -312,9 +312,9 @@ namespace System.Buffers.Text } parsedValue = (parsedValue << 4) + nextDigit; } - for (int index = ParserHelpers.Int64OverflowLengthHex; index < text.Length; index++) + for (int index = ParserHelpers.Int64OverflowLengthHex; index < source.Length; index++) { - nextCharacter = text[index]; + nextCharacter = source[index]; nextDigit = hexLookup[nextCharacter]; if (nextDigit == 0xFF) { @@ -333,7 +333,7 @@ namespace System.Buffers.Text } } - bytesConsumed = text.Length; + bytesConsumed = source.Length; value = parsedValue; return true; } diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Unsigned.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Unsigned.cs index 78dfdebcd9..ae23c29d04 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Unsigned.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Unsigned.cs @@ -9,7 +9,7 @@ namespace System.Buffers.Text /// /// Parses a Byte at the start of a Utf8 string. /// - /// The Utf8 string to parse + /// The Utf8 string to parse /// Receives the parsed value /// On a successful parse, receives the length in bytes of the substring that was parsed /// Expected format of the Utf8 string @@ -27,24 +27,24 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryParse(ReadOnlySpan text, out byte value, out int bytesConsumed, char standardFormat = default) + public static bool TryParse(ReadOnlySpan source, out byte value, out int bytesConsumed, char standardFormat = default) { switch (standardFormat) { - case (default): + case default(char): case 'g': case 'G': case 'd': case 'D': - return TryParseByteD(text, out value, out bytesConsumed); + return TryParseByteD(source, out value, out bytesConsumed); case 'n': case 'N': - return TryParseByteN(text, out value, out bytesConsumed); + return TryParseByteN(source, out value, out bytesConsumed); case 'x': case 'X': - return TryParseByteX(text, out value, out bytesConsumed); + return TryParseByteX(source, out value, out bytesConsumed); default: return ThrowHelper.TryParseThrowFormatException(out value, out bytesConsumed); @@ -54,7 +54,7 @@ namespace System.Buffers.Text /// /// Parses a UInt16 at the start of a Utf8 string. /// - /// The Utf8 string to parse + /// The Utf8 string to parse /// Receives the parsed value /// On a successful parse, receives the length in bytes of the substring that was parsed /// Expected format of the Utf8 string @@ -73,24 +73,24 @@ namespace System.Buffers.Text /// System.FormatException if the format is not valid for this data type. /// [CLSCompliant(false)] - public static bool TryParse(ReadOnlySpan text, out ushort value, out int bytesConsumed, char standardFormat = default) + public static bool TryParse(ReadOnlySpan source, out ushort value, out int bytesConsumed, char standardFormat = default) { switch (standardFormat) { - case (default): + case default(char): case 'g': case 'G': case 'd': case 'D': - return TryParseUInt16D(text, out value, out bytesConsumed); + return TryParseUInt16D(source, out value, out bytesConsumed); case 'n': case 'N': - return TryParseUInt16N(text, out value, out bytesConsumed); + return TryParseUInt16N(source, out value, out bytesConsumed); case 'x': case 'X': - return TryParseUInt16X(text, out value, out bytesConsumed); + return TryParseUInt16X(source, out value, out bytesConsumed); default: return ThrowHelper.TryParseThrowFormatException(out value, out bytesConsumed); @@ -100,7 +100,7 @@ namespace System.Buffers.Text /// /// Parses a UInt32 at the start of a Utf8 string. /// - /// The Utf8 string to parse + /// The Utf8 string to parse /// Receives the parsed value /// On a successful parse, receives the length in bytes of the substring that was parsed /// Expected format of the Utf8 string @@ -119,24 +119,24 @@ namespace System.Buffers.Text /// System.FormatException if the format is not valid for this data type. /// [CLSCompliant(false)] - public static bool TryParse(ReadOnlySpan text, out uint value, out int bytesConsumed, char standardFormat = default) + public static bool TryParse(ReadOnlySpan source, out uint value, out int bytesConsumed, char standardFormat = default) { switch (standardFormat) { - case (default): + case default(char): case 'g': case 'G': case 'd': case 'D': - return TryParseUInt32D(text, out value, out bytesConsumed); + return TryParseUInt32D(source, out value, out bytesConsumed); case 'n': case 'N': - return TryParseUInt32N(text, out value, out bytesConsumed); + return TryParseUInt32N(source, out value, out bytesConsumed); case 'x': case 'X': - return TryParseUInt32X(text, out value, out bytesConsumed); + return TryParseUInt32X(source, out value, out bytesConsumed); default: return ThrowHelper.TryParseThrowFormatException(out value, out bytesConsumed); @@ -146,7 +146,7 @@ namespace System.Buffers.Text /// /// Parses a UInt64 at the start of a Utf8 string. /// - /// The Utf8 string to parse + /// The Utf8 string to parse /// Receives the parsed value /// On a successful parse, receives the length in bytes of the substring that was parsed /// Expected format of the Utf8 string @@ -165,24 +165,24 @@ namespace System.Buffers.Text /// System.FormatException if the format is not valid for this data type. /// [CLSCompliant(false)] - public static bool TryParse(ReadOnlySpan text, out ulong value, out int bytesConsumed, char standardFormat = default) + public static bool TryParse(ReadOnlySpan source, out ulong value, out int bytesConsumed, char standardFormat = default) { switch (standardFormat) { - case (default): + case default(char): case 'g': case 'G': case 'd': case 'D': - return TryParseUInt64D(text, out value, out bytesConsumed); + return TryParseUInt64D(source, out value, out bytesConsumed); case 'n': case 'N': - return TryParseUInt64N(text, out value, out bytesConsumed); + return TryParseUInt64N(source, out value, out bytesConsumed); case 'x': case 'X': - return TryParseUInt64X(text, out value, out bytesConsumed); + return TryParseUInt64X(source, out value, out bytesConsumed); default: return ThrowHelper.TryParseThrowFormatException(out value, out bytesConsumed); diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Number.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Number.cs index 4f45a5c2c2..8658bd56a3 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Number.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Number.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; namespace System.Buffers.Text { @@ -14,13 +15,13 @@ namespace System.Buffers.Text AllowExponent = 0x00000001, } - private static bool TryParseNumber(ReadOnlySpan text, ref NumberBuffer number, out int bytesConsumed, ParseNumberOptions options, out bool textUsedExponentNotation) + private static bool TryParseNumber(ReadOnlySpan source, ref NumberBuffer number, out int bytesConsumed, ParseNumberOptions options, out bool textUsedExponentNotation) { Debug.Assert(number.Digits[0] == 0 && number.Scale == 0 && !number.IsNegative, "Number not initialized to default(NumberBuffer)"); textUsedExponentNotation = false; - if (text.Length == 0) + if (source.Length == 0) { bytesConsumed = 0; return false; @@ -32,7 +33,7 @@ namespace System.Buffers.Text int dstIndex = 0; // Consume the leading sign if any. - byte c = text[srcIndex]; + byte c = source[srcIndex]; switch (c) { case Utf8Constants.Minus: @@ -41,12 +42,12 @@ namespace System.Buffers.Text case Utf8Constants.Plus: srcIndex++; - if (srcIndex == text.Length) + if (srcIndex == source.Length) { bytesConsumed = 0; return false; } - c = text[srcIndex]; + c = source[srcIndex]; break; default: @@ -56,15 +57,15 @@ namespace System.Buffers.Text int startIndexDigitsBeforeDecimal = srcIndex; // Throw away any leading zeroes - while (srcIndex != text.Length) + while (srcIndex != source.Length) { - c = text[srcIndex]; + c = source[srcIndex]; if (c != '0') break; srcIndex++; } - if (srcIndex == text.Length) + if (srcIndex == source.Length) { digits[0] = 0; number.Scale = 0; @@ -74,9 +75,9 @@ namespace System.Buffers.Text } int startIndexNonLeadingDigitsBeforeDecimal = srcIndex; - while (srcIndex != text.Length) + while (srcIndex != source.Length) { - c = text[srcIndex]; + c = source[srcIndex]; if ((c - 48u) > 9) break; srcIndex++; @@ -87,11 +88,11 @@ namespace System.Buffers.Text Debug.Assert(dstIndex == 0); int numNonLeadingDigitsBeforeDecimalToCopy = Math.Min(numNonLeadingDigitsBeforeDecimal, NumberBuffer.BufferSize - 1); - text.Slice(startIndexNonLeadingDigitsBeforeDecimal, numNonLeadingDigitsBeforeDecimalToCopy).CopyTo(digits); + source.Slice(startIndexNonLeadingDigitsBeforeDecimal, numNonLeadingDigitsBeforeDecimalToCopy).CopyTo(digits); dstIndex = numNonLeadingDigitsBeforeDecimalToCopy; number.Scale = numNonLeadingDigitsBeforeDecimal; - if (srcIndex == text.Length) + if (srcIndex == source.Length) { bytesConsumed = srcIndex; number.CheckConsistency(); @@ -107,9 +108,9 @@ namespace System.Buffers.Text srcIndex++; int startIndexDigitsAfterDecimal = srcIndex; - while (srcIndex != text.Length) + while (srcIndex != source.Length) { - c = text[srcIndex]; + c = source[srcIndex]; if ((c - 48u) > 9) break; srcIndex++; @@ -120,7 +121,7 @@ namespace System.Buffers.Text if (dstIndex == 0) { // Not copied any digits to the Number struct yet. This means we must continue discarding leading zeroes even though they appeared after the decimal point. - while (startIndexOfDigitsAfterDecimalToCopy < srcIndex && text[startIndexOfDigitsAfterDecimalToCopy] == '0') + while (startIndexOfDigitsAfterDecimalToCopy < srcIndex && source[startIndexOfDigitsAfterDecimalToCopy] == '0') { number.Scale--; startIndexOfDigitsAfterDecimalToCopy++; @@ -128,11 +129,11 @@ namespace System.Buffers.Text } int numDigitsAfterDecimalToCopy = Math.Min(srcIndex - startIndexOfDigitsAfterDecimalToCopy, NumberBuffer.BufferSize - dstIndex - 1); - text.Slice(startIndexOfDigitsAfterDecimalToCopy, numDigitsAfterDecimalToCopy).CopyTo(digits.Slice(dstIndex)); + source.Slice(startIndexOfDigitsAfterDecimalToCopy, numDigitsAfterDecimalToCopy).CopyTo(digits.Slice(dstIndex)); dstIndex += numDigitsAfterDecimalToCopy; // We "should" really NUL terminate, but there are multiple places we'd have to do this and it is a precondition that the caller pass in a fully zero=initialized Number. - if (srcIndex == text.Length) + if (srcIndex == source.Length) { if (numDigitsBeforeDecimal == 0 && numDigitsAfterDecimal == 0) { @@ -172,14 +173,14 @@ namespace System.Buffers.Text return false; } - if (srcIndex == text.Length) + if (srcIndex == source.Length) { bytesConsumed = 0; return false; } bool exponentIsNegative = false; - c = text[srcIndex]; + c = source[srcIndex]; switch (c) { case Utf8Constants.Minus: @@ -188,19 +189,19 @@ namespace System.Buffers.Text case Utf8Constants.Plus: srcIndex++; - if (srcIndex == text.Length) + if (srcIndex == source.Length) { bytesConsumed = 0; return false; } - c = text[srcIndex]; + c = source[srcIndex]; break; default: break; } - if (!Utf8Parser.TryParseUInt32D(text.Slice(srcIndex), out uint absoluteExponent, out int bytesConsumedByExponent)) + if (!Utf8Parser.TryParseUInt32D(source.Slice(srcIndex), out uint absoluteExponent, out int bytesConsumedByExponent)) { bytesConsumed = 0; return false; diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.TimeSpan.BigG.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.TimeSpan.BigG.cs index 6c4d2265fa..6bcb4d5277 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.TimeSpan.BigG.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.TimeSpan.BigG.cs @@ -6,19 +6,19 @@ namespace System.Buffers.Text { public static partial class Utf8Parser { - private static bool TryParseTimeSpanBigG(ReadOnlySpan text, out TimeSpan value, out int bytesConsumed) + private static bool TryParseTimeSpanBigG(ReadOnlySpan source, out TimeSpan value, out int bytesConsumed) { int srcIndex = 0; byte c = default; - while (srcIndex != text.Length) + while (srcIndex != source.Length) { - c = text[srcIndex]; + c = source[srcIndex]; if (!(c == ' ' || c == '\t')) break; srcIndex++; } - if (srcIndex == text.Length) + if (srcIndex == source.Length) { value = default; bytesConsumed = 0; @@ -30,7 +30,7 @@ namespace System.Buffers.Text { isNegative = true; srcIndex++; - if (srcIndex == text.Length) + if (srcIndex == source.Length) { value = default; bytesConsumed = 0; @@ -38,7 +38,7 @@ namespace System.Buffers.Text } } - if (!TryParseUInt32D(text.Slice(srcIndex), out uint days, out int justConsumed)) + if (!TryParseUInt32D(source.Slice(srcIndex), out uint days, out int justConsumed)) { value = default; bytesConsumed = 0; @@ -46,14 +46,14 @@ namespace System.Buffers.Text } srcIndex += justConsumed; - if (srcIndex == text.Length || text[srcIndex++] != Utf8Constants.Colon) + if (srcIndex == source.Length || source[srcIndex++] != Utf8Constants.Colon) { value = default; bytesConsumed = 0; return false; } - if (!TryParseUInt32D(text.Slice(srcIndex), out uint hours, out justConsumed)) + if (!TryParseUInt32D(source.Slice(srcIndex), out uint hours, out justConsumed)) { value = default; bytesConsumed = 0; @@ -61,14 +61,14 @@ namespace System.Buffers.Text } srcIndex += justConsumed; - if (srcIndex == text.Length || text[srcIndex++] != Utf8Constants.Colon) + if (srcIndex == source.Length || source[srcIndex++] != Utf8Constants.Colon) { value = default; bytesConsumed = 0; return false; } - if (!TryParseUInt32D(text.Slice(srcIndex), out uint minutes, out justConsumed)) + if (!TryParseUInt32D(source.Slice(srcIndex), out uint minutes, out justConsumed)) { value = default; bytesConsumed = 0; @@ -76,14 +76,14 @@ namespace System.Buffers.Text } srcIndex += justConsumed; - if (srcIndex == text.Length || text[srcIndex++] != Utf8Constants.Colon) + if (srcIndex == source.Length || source[srcIndex++] != Utf8Constants.Colon) { value = default; bytesConsumed = 0; return false; } - if (!TryParseUInt32D(text.Slice(srcIndex), out uint seconds, out justConsumed)) + if (!TryParseUInt32D(source.Slice(srcIndex), out uint seconds, out justConsumed)) { value = default; bytesConsumed = 0; @@ -91,14 +91,14 @@ namespace System.Buffers.Text } srcIndex += justConsumed; - if (srcIndex == text.Length || text[srcIndex++] != Utf8Constants.Period) + if (srcIndex == source.Length || source[srcIndex++] != Utf8Constants.Period) { value = default; bytesConsumed = 0; return false; } - if (!TryParseTimeSpanFraction(text.Slice(srcIndex), out uint fraction, out justConsumed)) + if (!TryParseTimeSpanFraction(source.Slice(srcIndex), out uint fraction, out justConsumed)) { value = default; bytesConsumed = 0; @@ -118,7 +118,7 @@ namespace System.Buffers.Text // There cannot legally be a sixth number. If the next character is a period or colon, treat this as a error as it's likely // to indicate the start of a sixth number. Otherwise, treat as end of parse with data left over. // - if (srcIndex != text.Length && (text[srcIndex] == Utf8Constants.Period || text[srcIndex] == Utf8Constants.Colon)) + if (srcIndex != source.Length && (source[srcIndex] == Utf8Constants.Period || source[srcIndex] == Utf8Constants.Colon)) { value = default; bytesConsumed = 0; diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.TimeSpan.C.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.TimeSpan.C.cs index 5f50f3ec2e..d0a28969be 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.TimeSpan.C.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.TimeSpan.C.cs @@ -6,10 +6,10 @@ namespace System.Buffers.Text { public static partial class Utf8Parser { - private static bool TryParseTimeSpanC(ReadOnlySpan text, out TimeSpan value, out int bytesConsumed) + private static bool TryParseTimeSpanC(ReadOnlySpan source, out TimeSpan value, out int bytesConsumed) { TimeSpanSplitter s = default; - if (!s.TrySplitTimeSpan(text, periodUsedToSeparateDay: true, out bytesConsumed)) + if (!s.TrySplitTimeSpan(source, periodUsedToSeparateDay: true, out bytesConsumed)) { value = default; return false; diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.TimeSpan.LittleG.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.TimeSpan.LittleG.cs index ebf885ce9f..19208b9eac 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.TimeSpan.LittleG.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.TimeSpan.LittleG.cs @@ -6,10 +6,10 @@ namespace System.Buffers.Text { public static partial class Utf8Parser { - private static bool TryParseTimeSpanLittleG(ReadOnlySpan text, out TimeSpan value, out int bytesConsumed) + private static bool TryParseTimeSpanLittleG(ReadOnlySpan source, out TimeSpan value, out int bytesConsumed) { TimeSpanSplitter s = default; - if (!s.TrySplitTimeSpan(text, periodUsedToSeparateDay: false, out bytesConsumed)) + if (!s.TrySplitTimeSpan(source, periodUsedToSeparateDay: false, out bytesConsumed)) { value = default; return false; diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.TimeSpan.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.TimeSpan.cs index e971718fbb..bc0ce2e372 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.TimeSpan.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.TimeSpan.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; namespace System.Buffers.Text { @@ -11,7 +12,7 @@ namespace System.Buffers.Text /// /// Parses a TimeSpan at the start of a Utf8 string. /// - /// The Utf8 string to parse + /// The Utf8 string to parse /// Receives the parsed value /// On a successful parse, receives the length in bytes of the substring that was parsed /// Expected format of the Utf8 string @@ -28,21 +29,21 @@ namespace System.Buffers.Text /// /// System.FormatException if the format is not valid for this data type. /// - public static bool TryParse(ReadOnlySpan text, out TimeSpan value, out int bytesConsumed, char standardFormat = default) + public static bool TryParse(ReadOnlySpan source, out TimeSpan value, out int bytesConsumed, char standardFormat = default) { switch (standardFormat) { - case (default): + case default(char): case 'c': case 't': case 'T': - return TryParseTimeSpanC(text, out value, out bytesConsumed); + return TryParseTimeSpanC(source, out value, out bytesConsumed); case 'G': - return TryParseTimeSpanBigG(text, out value, out bytesConsumed); + return TryParseTimeSpanBigG(source, out value, out bytesConsumed); case 'g': - return TryParseTimeSpanLittleG(text, out value, out bytesConsumed); + return TryParseTimeSpanLittleG(source, out value, out bytesConsumed); default: return ThrowHelper.TryParseThrowFormatException(out value, out bytesConsumed); @@ -53,18 +54,18 @@ namespace System.Buffers.Text /// Parse the fraction portion of a TimeSpan. Must be 1..7 digits. If fewer than 7, zeroes are implied to the right. If more than 7, the TimeSpan /// parser rejects the string (even if the extra digits are all zeroes.) /// - private static bool TryParseTimeSpanFraction(ReadOnlySpan text, out uint value, out int bytesConsumed) + private static bool TryParseTimeSpanFraction(ReadOnlySpan source, out uint value, out int bytesConsumed) { int srcIndex = 0; - if (srcIndex == text.Length) + if (srcIndex == source.Length) { value = default; bytesConsumed = 0; return false; } - uint digit = text[srcIndex] - 48u; // '0' + uint digit = source[srcIndex] - 48u; // '0' if (digit > 9) { value = default; @@ -76,9 +77,9 @@ namespace System.Buffers.Text uint fraction = digit; int digitCount = 1; - while (srcIndex != text.Length) + while (srcIndex != source.Length) { - digit = text[srcIndex] - 48u; // '0' + digit = source[srcIndex] - 48u; // '0' if (digit > 9) break; srcIndex++; diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.TimeSpanSplitter.cs b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.TimeSpanSplitter.cs index eb76509ee1..d8ea39fbd7 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.TimeSpanSplitter.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Text/Utf8Parser/Utf8Parser.TimeSpanSplitter.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; namespace System.Buffers.Text { @@ -33,21 +34,21 @@ namespace System.Buffers.Text // (So a value of 0x01010200 means the string parsed as "nn:nn:nn.nnnnnnn") public uint Separators; - public bool TrySplitTimeSpan(ReadOnlySpan text, bool periodUsedToSeparateDay, out int bytesConsumed) + public bool TrySplitTimeSpan(ReadOnlySpan source, bool periodUsedToSeparateDay, out int bytesConsumed) { int srcIndex = 0; byte c = default; // Unlike many other data types, TimeSpan allow leading whitespace. - while (srcIndex != text.Length) + while (srcIndex != source.Length) { - c = text[srcIndex]; + c = source[srcIndex]; if (!(c == ' ' || c == '\t')) break; srcIndex++; } - if (srcIndex == text.Length) + if (srcIndex == source.Length) { bytesConsumed = 0; return false; @@ -58,7 +59,7 @@ namespace System.Buffers.Text { IsNegative = true; srcIndex++; - if (srcIndex == text.Length) + if (srcIndex == source.Length) { bytesConsumed = 0; return false; @@ -71,7 +72,7 @@ namespace System.Buffers.Text // // Timespan has to start with a number - parse the first one. // - if (!TryParseUInt32D(text.Slice(srcIndex), out V1, out int justConsumed)) + if (!TryParseUInt32D(source.Slice(srcIndex), out V1, out int justConsumed)) { bytesConsumed = 0; return false; @@ -85,7 +86,7 @@ namespace System.Buffers.Text // the fraction is always the fourth component at earliest, so if we do see a period at this stage, always parse the integer as a regular integer, not as // a fraction. // - result = ParseComponent(text, neverParseAsFraction: periodUsedToSeparateDay, ref srcIndex, out V2); + result = ParseComponent(source, neverParseAsFraction: periodUsedToSeparateDay, ref srcIndex, out V2); if (result == ComponentParseResult.ParseFailure) { bytesConsumed = 0; @@ -105,7 +106,7 @@ namespace System.Buffers.Text // // Split out the third number (if any) // - result = ParseComponent(text, false, ref srcIndex, out V3); + result = ParseComponent(source, false, ref srcIndex, out V3); if (result == ComponentParseResult.ParseFailure) { bytesConsumed = 0; @@ -125,7 +126,7 @@ namespace System.Buffers.Text // // Split out the fourth number (if any) // - result = ParseComponent(text, false, ref srcIndex, out V4); + result = ParseComponent(source, false, ref srcIndex, out V4); if (result == ComponentParseResult.ParseFailure) { bytesConsumed = 0; @@ -145,7 +146,7 @@ namespace System.Buffers.Text // // Split out the fifth number (if any) // - result = ParseComponent(text, false, ref srcIndex, out V5); + result = ParseComponent(source, false, ref srcIndex, out V5); if (result == ComponentParseResult.ParseFailure) { bytesConsumed = 0; @@ -166,7 +167,7 @@ namespace System.Buffers.Text // There cannot legally be a sixth number. If the next character is a period or colon, treat this as a error as it's likely // to indicate the start of a sixth number. Otherwise, treat as end of parse with data left over. // - if (srcIndex != text.Length && (text[srcIndex] == Utf8Constants.Period || text[srcIndex] == Utf8Constants.Colon)) + if (srcIndex != source.Length && (source[srcIndex] == Utf8Constants.Period || source[srcIndex] == Utf8Constants.Colon)) { bytesConsumed = 0; return false; @@ -179,20 +180,20 @@ namespace System.Buffers.Text // // Look for a separator followed by an unsigned integer. // - private static ComponentParseResult ParseComponent(ReadOnlySpan text, bool neverParseAsFraction, ref int srcIndex, out uint value) + private static ComponentParseResult ParseComponent(ReadOnlySpan source, bool neverParseAsFraction, ref int srcIndex, out uint value) { - if (srcIndex == text.Length) + if (srcIndex == source.Length) { value = default; return ComponentParseResult.NoMoreData; } - byte c = text[srcIndex]; + byte c = source[srcIndex]; if (c == Utf8Constants.Colon || (c == Utf8Constants.Period && neverParseAsFraction)) { srcIndex++; - if (!TryParseUInt32D(text.Slice(srcIndex), out value, out int bytesConsumed)) + if (!TryParseUInt32D(source.Slice(srcIndex), out value, out int bytesConsumed)) { value = default; return ComponentParseResult.ParseFailure; @@ -205,7 +206,7 @@ namespace System.Buffers.Text { srcIndex++; - if (!TryParseTimeSpanFraction(text.Slice(srcIndex), out value, out int bytesConsumed)) + if (!TryParseTimeSpanFraction(source.Slice(srcIndex), out value, out int bytesConsumed)) { value = default; return ComponentParseResult.ParseFailure; diff --git a/external/corefx/src/System.Memory/src/System/MemoryExtensions.Fast.cs b/external/corefx/src/System.Memory/src/System/MemoryExtensions.Fast.cs deleted file mode 100644 index d232c7e13d..0000000000 --- a/external/corefx/src/System.Memory/src/System/MemoryExtensions.Fast.cs +++ /dev/null @@ -1,145 +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.Runtime.CompilerServices; - -namespace System -{ - /// - /// Extension methods for Span{T}, Memory{T}, and friends. - /// - public static partial class MemoryExtensions - { - /// - /// Casts a Span of one primitive type to Span of bytes. - /// That type may not contain pointers or references. This is checked at runtime in order to preserve type safety. - /// - /// The source slice, of type . - /// - /// Thrown when contains pointers. - /// - /// - /// Thrown if the Length property of the new Span would exceed Int32.MaxValue. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static Span AsBytes(this Span source) where T : struct => Span.AsBytes(source); - - /// - /// Casts a ReadOnlySpan of one primitive type to ReadOnlySpan of bytes. - /// That type may not contain pointers or references. This is checked at runtime in order to preserve type safety. - /// - /// The source slice, of type . - /// - /// Thrown when contains pointers. - /// - /// - /// Thrown if the Length property of the new Span would exceed Int32.MaxValue. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ReadOnlySpan AsBytes(this ReadOnlySpan source) where T : struct => Span.AsBytes(source); - - /// - /// Creates a new readonly span over the portion of the target string. - /// - /// The target string. - /// Thrown when is null. - public static ReadOnlySpan AsReadOnlySpan(this string text) => Span.AsReadOnlySpan(text); - - /// - /// Creates a new readonly span over the portion of the target string. - /// - /// The target string. - /// The index at which to begin this slice. - /// Thrown when is null. - /// - /// Thrown when the specified index is not in range (<0 or >text.Length). - /// - public static ReadOnlySpan AsReadOnlySpan(this string text, int start) => Span.AsReadOnlySpan(text, start); - - /// - /// Creates a new readonly span over the portion of the target string. - /// - /// The target string. - /// The index at which to begin this slice. - /// The desired length for the slice (exclusive). - /// Thrown when is null. - /// - /// Thrown when the specified index or is not in range. - /// - public static ReadOnlySpan AsReadOnlySpan(this string text, int start, int length) => Span.AsReadOnlySpan(text, start, length); - - /// Creates a new over the portion of the target string. - /// The target string. - /// Thrown when is a null reference (Nothing in Visual Basic). - public static ReadOnlyMemory AsReadOnlyMemory(this string text) => Span.AsReadOnlyMemory(text); - - /// Creates a new over the portion of the target string. - /// The target string. - /// The index at which to begin this slice. - /// Thrown when is a null reference (Nothing in Visual Basic). - /// - /// Thrown when the specified index is not in range (<0 or >text.Length). - /// - public static ReadOnlyMemory AsReadOnlyMemory(this string text, int start) => Span.AsReadOnlyMemory(text, start); - - /// Creates a new over the portion of the target string. - /// The target string. - /// The index at which to begin this slice. - /// The desired length for the slice (exclusive). - /// Thrown when is a null reference (Nothing in Visual Basic). - /// - /// Thrown when the specified index or is not in range. - /// - public static ReadOnlyMemory AsReadOnlyMemory(this string text, int start, int length) => Span.AsReadOnlyMemory(text, start, length); - - /// Attempts to get the underlying from a . - /// The memory that may be wrapping a object. - /// The string. - /// The starting location in . - /// The number of items in . - /// - public static bool TryGetString(this ReadOnlyMemory readOnlyMemory, out string text, out int start, out int length) => - Span.TryGetString(readOnlyMemory, out text, out start, out length); - - /// - /// Casts a Span of one primitive type to another primitive type . - /// These types may not contain pointers or references. This is checked at runtime in order to preserve type safety. - /// - /// - /// Supported only for platforms that support misaligned memory access. - /// - /// The source slice, of type . - /// - /// Thrown when or contains pointers. - /// - /// - /// Thrown if the Length property of the new Span would exceed Int32.MaxValue. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static Span NonPortableCast(this Span source) - where TFrom : struct - where TTo : struct - => Span.NonPortableCast(source); - - /// - /// Casts a ReadOnlySpan of one primitive type to another primitive type . - /// These types may not contain pointers or references. This is checked at runtime in order to preserve type safety. - /// - /// - /// Supported only for platforms that support misaligned memory access. - /// - /// The source slice, of type . - /// - /// Thrown when or contains pointers. - /// - /// - /// Thrown if the Length property of the new Span would exceed Int32.MaxValue. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ReadOnlySpan NonPortableCast(this ReadOnlySpan source) - where TFrom : struct - where TTo : struct - => Span.NonPortableCast(source); - } -} diff --git a/external/corefx/src/System.Memory/src/System/MemoryExtensions.Portable.cs b/external/corefx/src/System.Memory/src/System/MemoryExtensions.Portable.cs index dc3ffad9ba..f0227f97fe 100644 --- a/external/corefx/src/System.Memory/src/System/MemoryExtensions.Portable.cs +++ b/external/corefx/src/System.Memory/src/System/MemoryExtensions.Portable.cs @@ -2,8 +2,10 @@ // 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.Diagnostics.Private; +using System.Globalization; using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; namespace System { @@ -13,59 +15,274 @@ namespace System public static partial class MemoryExtensions { /// - /// Casts a Span of one primitive type to Span of bytes. - /// That type may not contain pointers or references. This is checked at runtime in order to preserve type safety. + /// Creates a new span over the portion of the target array. /// - /// The source slice, of type . - /// - /// Thrown when contains pointers. - /// - /// - /// Thrown if the Length property of the new Span would exceed Int32.MaxValue. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static Span AsBytes(this Span source) - where T : struct - { - if (SpanHelpers.IsReferenceOrContainsReferences()) - ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(T)); + public static Span AsSpan(this T[] array, int start) => Span.Create(array, start); - int newLength = checked(source.Length * Unsafe.SizeOf()); - return new Span(Unsafe.As>(source.Pinnable), source.ByteOffset, newLength); + /// + /// Returns a value indicating whether the specified occurs within the . + /// The source span. + /// The value to seek within the source span. + /// One of the enumeration values that determines how the and are compared. + /// + public static bool Contains(this ReadOnlySpan span, ReadOnlySpan value, StringComparison comparisonType) + => (IndexOf(span, value, comparisonType) >= 0); + + /// + /// Determines whether this and the specified span have the same characters + /// when compared using the specified option. + /// The source span. + /// The value to compare with the source span. + /// One of the enumeration values that determines how the and are compared. + /// + public static bool Equals(this ReadOnlySpan span, ReadOnlySpan other, StringComparison comparisonType) + { + if (comparisonType == StringComparison.Ordinal) + { + return span.SequenceEqual(other); + } + else if (comparisonType == StringComparison.OrdinalIgnoreCase) + { + if (span.Length != other.Length) + return false; + return EqualsOrdinalIgnoreCase(span, other); + } + + return span.ToString().Equals(other.ToString(), comparisonType); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static bool EqualsOrdinalIgnoreCase(ReadOnlySpan span, ReadOnlySpan other) + { + Debug.Assert(span.Length == other.Length); + if (other.Length == 0) // span.Length == other.Length == 0 + return true; + return (CompareToOrdinalIgnoreCase(span, other) == 0); } /// - /// Casts a ReadOnlySpan of one primitive type to ReadOnlySpan of bytes. - /// That type may not contain pointers or references. This is checked at runtime in order to preserve type safety. + /// Compares the specified and using the specified , + /// and returns an integer that indicates their relative position in the sort order. + /// The source span. + /// The value to compare with the source span. + /// One of the enumeration values that determines how the and are compared. /// - /// The source slice, of type . - /// - /// Thrown when contains pointers. - /// - /// - /// Thrown if the Length property of the new Span would exceed Int32.MaxValue. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ReadOnlySpan AsBytes(this ReadOnlySpan source) - where T : struct + public static int CompareTo(this ReadOnlySpan span, ReadOnlySpan other, StringComparison comparisonType) { - if (SpanHelpers.IsReferenceOrContainsReferences()) - ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(T)); + if (comparisonType == StringComparison.Ordinal) + { + return span.SequenceCompareTo(other); + } + else if (comparisonType == StringComparison.OrdinalIgnoreCase) + { + return CompareToOrdinalIgnoreCase(span, other); + } - int newLength = checked(source.Length * Unsafe.SizeOf()); - return new ReadOnlySpan(Unsafe.As>(source.Pinnable), source.ByteOffset, newLength); + return string.Compare(span.ToString(), other.ToString(), comparisonType); + } + + // Borrowed from https://github.com/dotnet/coreclr/blob/master/src/mscorlib/shared/System/Globalization/CompareInfo.cs#L539 + private static unsafe int CompareToOrdinalIgnoreCase(ReadOnlySpan strA, ReadOnlySpan strB) + { + int length = Math.Min(strA.Length, strB.Length); + int range = length; + + fixed (char* ap = &MemoryMarshal.GetReference(strA)) + fixed (char* bp = &MemoryMarshal.GetReference(strB)) + { + char* a = ap; + char* b = bp; + + while (length != 0 && (*a <= 0x7F) && (*b <= 0x7F)) + { + int charA = *a; + int charB = *b; + + if (charA == charB) + { + a++; b++; + length--; + continue; + } + + // uppercase both chars - notice that we need just one compare per char + if ((uint)(charA - 'a') <= 'z' - 'a') charA -= 0x20; + if ((uint)(charB - 'a') <= 'z' - 'a') charB -= 0x20; + + // Return the (case-insensitive) difference between them. + if (charA != charB) + return charA - charB; + + // Next char + a++; b++; + length--; + } + + if (length == 0) + return strA.Length - strB.Length; + + range -= length; + + return string.Compare(strA.Slice(range).ToString(), strB.Slice(range).ToString(), StringComparison.OrdinalIgnoreCase); + } + } + + /// + /// Reports the zero-based index of the first occurrence of the specified in the current . + /// The source span. + /// The value to seek within the source span. + /// One of the enumeration values that determines how the and are compared. + /// + public static int IndexOf(this ReadOnlySpan span, ReadOnlySpan value, StringComparison comparisonType) + { + if (comparisonType == StringComparison.Ordinal) + { + return span.IndexOf(value); + } + + return span.ToString().IndexOf(value.ToString(), comparisonType); + } + + /// + /// Copies the characters from the source span into the destination, converting each character to lowercase, + /// using the casing rules of the specified culture. + /// + /// The source span. + /// The destination span which contains the transformed characters. + /// An object that supplies culture-specific casing rules. + /// If the source and destinations overlap, this method behaves as if the original values are in + /// a temporary location before the destination is overwritten. + /// + /// Thrown when is null. + /// + public static int ToLower(this ReadOnlySpan source, Span destination, CultureInfo culture) + { + if (culture == null) + ThrowHelper.ThrowArgumentNullException(ExceptionArgument.culture); + + // Assuming that changing case does not affect length + if (destination.Length < source.Length) + return -1; + + string sourceString = source.ToString(); +#if !netstandard11 + string resultString = sourceString.ToLower(culture); +#else + string resultString = culture.TextInfo.ToLower(sourceString); +#endif + Debug.Assert(sourceString.Length == resultString.Length); + resultString.AsSpan().CopyTo(destination); + return source.Length; + } + + /// + /// Copies the characters from the source span into the destination, converting each character to lowercase, + /// using the casing rules of the invariant culture. + /// + /// The source span. + /// The destination span which contains the transformed characters. + /// If the source and destinations overlap, this method behaves as if the original values are in + /// a temporary location before the destination is overwritten. + public static int ToLowerInvariant(this ReadOnlySpan source, Span destination) + => ToLower(source, destination, CultureInfo.InvariantCulture); + + /// + /// Copies the characters from the source span into the destination, converting each character to uppercase, + /// using the casing rules of the specified culture. + /// + /// The source span. + /// The destination span which contains the transformed characters. + /// An object that supplies culture-specific casing rules. + /// If the source and destinations overlap, this method behaves as if the original values are in + /// a temporary location before the destination is overwritten. + /// + /// Thrown when is null. + /// + public static int ToUpper(this ReadOnlySpan source, Span destination, CultureInfo culture) + { + if (culture == null) + ThrowHelper.ThrowArgumentNullException(ExceptionArgument.culture); + + // Assuming that changing case does not affect length + if (destination.Length < source.Length) + return -1; + + string sourceString = source.ToString(); +#if !netstandard11 + string resultString = sourceString.ToUpper(culture); +#else + string resultString = culture.TextInfo.ToUpper(sourceString); +#endif + Debug.Assert(sourceString.Length == resultString.Length); + resultString.AsSpan().CopyTo(destination); + return source.Length; + } + + /// + /// Copies the characters from the source span into the destination, converting each character to uppercase + /// using the casing rules of the invariant culture. + /// + /// The source span. + /// The destination span which contains the transformed characters. + /// If the source and destinations overlap, this method behaves as if the original values are in + /// a temporary location before the destination is overwritten. + public static int ToUpperInvariant(this ReadOnlySpan source, Span destination) + => ToUpper(source, destination, CultureInfo.InvariantCulture); + + /// + /// Determines whether the end of the matches the specified when compared using the specified option. + /// + /// The source span. + /// The sequence to compare to the end of the source span. + /// One of the enumeration values that determines how the and are compared. + public static bool EndsWith(this ReadOnlySpan span, ReadOnlySpan value, StringComparison comparisonType) + { + if (comparisonType == StringComparison.Ordinal) + { + return span.EndsWith(value); + } + else if (comparisonType == StringComparison.OrdinalIgnoreCase) + { + return value.Length <= span.Length && EqualsOrdinalIgnoreCase(span.Slice(span.Length - value.Length), value); + } + + string sourceString = span.ToString(); + string valueString = value.ToString(); + return sourceString.EndsWith(valueString, comparisonType); + } + + /// + /// Determines whether the beginning of the matches the specified when compared using the specified option. + /// + /// The source span. + /// The sequence to compare to the beginning of the source span. + /// One of the enumeration values that determines how the and are compared. + public static bool StartsWith(this ReadOnlySpan span, ReadOnlySpan value, StringComparison comparisonType) + { + if (comparisonType == StringComparison.Ordinal) + { + return span.StartsWith(value); + } + else if (comparisonType == StringComparison.OrdinalIgnoreCase) + { + return value.Length <= span.Length && EqualsOrdinalIgnoreCase(span.Slice(0, value.Length), value); + } + + string sourceString = span.ToString(); + string valueString = value.ToString(); + return sourceString.StartsWith(valueString, comparisonType); } /// /// Creates a new readonly span over the portion of the target string. /// /// The target string. - /// Thrown when is null. + /// Returns default when is null. [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ReadOnlySpan AsReadOnlySpan(this string text) + public static ReadOnlySpan AsSpan(this string text) { if (text == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text); + return default; return new ReadOnlySpan(Unsafe.As>(text), StringAdjustment, text.Length); } @@ -75,15 +292,19 @@ namespace System /// /// The target string. /// The index at which to begin this slice. - /// Thrown when is null. + /// Returns default when is null. /// /// Thrown when the specified index is not in range (<0 or >text.Length). /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ReadOnlySpan AsReadOnlySpan(this string text, int start) + public static ReadOnlySpan AsSpan(this string text, int start) { if (text == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text); + { + if (start != 0) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); + return default; + } if ((uint)start > (uint)text.Length) ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); @@ -96,15 +317,19 @@ namespace System /// The target string. /// The index at which to begin this slice. /// The desired length for the slice (exclusive). - /// Thrown when is null. + /// Returns default when is null. /// /// Thrown when the specified index or is not in range. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ReadOnlySpan AsReadOnlySpan(this string text, int start, int length) + public static ReadOnlySpan AsSpan(this string text, int start, int length) { if (text == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text); + { + if (start != 0 || length != 0) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); + return default; + } if ((uint)start > (uint)text.Length || (uint)length > (uint)(text.Length - start)) ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); @@ -113,11 +338,11 @@ namespace System /// Creates a new over the portion of the target string. /// The target string. - /// Thrown when is a null reference (Nothing in Visual Basic). - public static ReadOnlyMemory AsReadOnlyMemory(this string text) + /// Returns default when is null. + public static ReadOnlyMemory AsMemory(this string text) { if (text == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text); + return default; return new ReadOnlyMemory(text, 0, text.Length); } @@ -125,14 +350,18 @@ namespace System /// Creates a new over the portion of the target string. /// The target string. /// The index at which to begin this slice. - /// Thrown when is a null reference (Nothing in Visual Basic). + /// Returns default when is null. /// /// Thrown when the specified index is not in range (<0 or >text.Length). /// - public static ReadOnlyMemory AsReadOnlyMemory(this string text, int start) + public static ReadOnlyMemory AsMemory(this string text, int start) { if (text == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text); + { + if (start != 0) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); + return default; + } if ((uint)start > (uint)text.Length) ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); @@ -143,102 +372,24 @@ namespace System /// The target string. /// The index at which to begin this slice. /// The desired length for the slice (exclusive). - /// Thrown when is a null reference (Nothing in Visual Basic). + /// Returns default when is null. /// /// Thrown when the specified index or is not in range. /// - public static ReadOnlyMemory AsReadOnlyMemory(this string text, int start, int length) + public static ReadOnlyMemory AsMemory(this string text, int start, int length) { if (text == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text); + { + if (start != 0 || length != 0) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); + return default; + } if ((uint)start > (uint)text.Length || (uint)length > (uint)(text.Length - start)) ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); return new ReadOnlyMemory(text, start, length); } - /// Attempts to get the underlying from a . - /// The memory that may be wrapping a object. - /// The string. - /// The starting location in . - /// The number of items in . - /// - public static bool TryGetString(this ReadOnlyMemory readOnlyMemory, out string text, out int start, out int length) - { - if (readOnlyMemory.GetObjectStartLength(out int offset, out int count) is string s) - { - text = s; - start = offset; - length = count; - return true; - } - else - { - text = null; - start = 0; - length = 0; - return false; - } - } - - /// - /// Casts a Span of one primitive type to another primitive type . - /// These types may not contain pointers or references. This is checked at runtime in order to preserve type safety. - /// - /// - /// Supported only for platforms that support misaligned memory access. - /// - /// The source slice, of type . - /// - /// Thrown when or contains pointers. - /// - /// - /// Thrown if the Length property of the new Span would exceed Int32.MaxValue. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static Span NonPortableCast(this Span source) - where TFrom : struct - where TTo : struct - { - if (SpanHelpers.IsReferenceOrContainsReferences()) - ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(TFrom)); - - if (SpanHelpers.IsReferenceOrContainsReferences()) - ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(TTo)); - - int newLength = checked((int)((long)source.Length * Unsafe.SizeOf() / Unsafe.SizeOf())); - return new Span(Unsafe.As>(source.Pinnable), source.ByteOffset, newLength); - } - - /// - /// Casts a ReadOnlySpan of one primitive type to another primitive type . - /// These types may not contain pointers or references. This is checked at runtime in order to preserve type safety. - /// - /// - /// Supported only for platforms that support misaligned memory access. - /// - /// The source slice, of type . - /// - /// Thrown when or contains pointers. - /// - /// - /// Thrown if the Length property of the new Span would exceed Int32.MaxValue. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ReadOnlySpan NonPortableCast(this ReadOnlySpan source) - where TFrom : struct - where TTo : struct - { - if (SpanHelpers.IsReferenceOrContainsReferences()) - ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(TFrom)); - - if (SpanHelpers.IsReferenceOrContainsReferences()) - ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(TTo)); - - int newLength = checked((int)((long)source.Length * Unsafe.SizeOf() / Unsafe.SizeOf())); - return new ReadOnlySpan(Unsafe.As>(source.Pinnable), source.ByteOffset, newLength); - } - internal static readonly IntPtr StringAdjustment = MeasureStringAdjustment(); private static IntPtr MeasureStringAdjustment() diff --git a/external/corefx/src/System.Memory/src/System/NUint.cs b/external/corefx/src/System.Memory/src/System/NUint.cs new file mode 100644 index 0000000000..d7ec5d4f50 --- /dev/null +++ b/external/corefx/src/System.Memory/src/System/NUint.cs @@ -0,0 +1,35 @@ +// 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.Runtime.CompilerServices; + +namespace System +{ + // + // A makeshift native uint type for build configurations that don't build 32/64-bit specific binaries (and hence, can't alias them to UInt32/UInt64 via an ifdef.) + // + // Note that .NET Framework x86 JIT inliner is only capable of inlining of limited number of NUInt operations per method. Do not use this type heavily + // in code that needs to be fast on .NET Framework x86. + // + internal unsafe struct NUInt + { + private readonly void* _value; + + private NUInt(uint value) => _value = (void*)value; + private NUInt(ulong value) => _value = (void*)value; + + public static implicit operator NUInt(uint value) => new NUInt(value); + public static implicit operator IntPtr(NUInt value) => (IntPtr)value._value; + + public static explicit operator NUInt(int value) => new NUInt((uint)value); + + public static explicit operator void* (NUInt value) => value._value; + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static NUInt operator *(NUInt left, NUInt right) + { + return (sizeof(IntPtr) == 4) ? new NUInt(((uint)left._value) * (uint)right._value) : new NUInt(((ulong)left._value) * (ulong)right._value); + } + } +} diff --git a/external/corefx/src/System.Memory/src/System/Number/Number.FormatAndParse.cs b/external/corefx/src/System.Memory/src/System/Number/Number.FormatAndParse.cs index 3e79dfcd16..bddc2610b3 100644 --- a/external/corefx/src/System.Memory/src/System/Number/Number.FormatAndParse.cs +++ b/external/corefx/src/System.Memory/src/System/Number/Number.FormatAndParse.cs @@ -3,9 +3,10 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; using System.Buffers.Text; -#if !netstandard +#if !netstandard && !MONO using Internal.Runtime.CompilerServices; #else using System.Runtime.CompilerServices; @@ -15,7 +16,11 @@ using System.Runtime.CompilerServices; // This code is copied almost verbatim from the same-named file in CoreRT with mechanical changes to Span-ify it. // +#if MONO +namespace System.Buffers.Text +#else namespace System +#endif { internal static partial class Number { @@ -25,22 +30,19 @@ namespace System internal static bool NumberBufferToDouble(ref NumberBuffer number, out double value) { double d = NumberToDouble(ref number); - - uint e = DoubleHelper.Exponent(d); - ulong m = DoubleHelper.Mantissa(d); - if (e == 0x7FF) + if (!Double.IsFinite(d)) { value = default; return false; } - if (e == 0 && m == 0) + if (d == 0.0) { - d = 0; + // normalize -0.0 to 0.0 + d = 0.0; } value = d; - return true; } @@ -512,23 +514,5 @@ namespace System return *(double*)&val; } - - private static class DoubleHelper - { - public static unsafe uint Exponent(double d) - { - return (*((uint*)&d + 1) >> 20) & 0x000007ff; - } - - public static unsafe ulong Mantissa(double d) - { - return (*((uint*)&d)) | ((ulong)(*((uint*)&d + 1) & 0x000fffff) << 32); - } - - public static unsafe bool Sign(double d) - { - return (*((uint*)&d + 1) >> 31) != 0; - } - } } } diff --git a/external/corefx/src/System.Memory/src/System/Number/Number.NumberBuffer.cs b/external/corefx/src/System.Memory/src/System/Number/Number.NumberBuffer.cs index 6137f27527..d22ad7abd6 100644 --- a/external/corefx/src/System.Memory/src/System/Number/Number.NumberBuffer.cs +++ b/external/corefx/src/System.Memory/src/System/Number/Number.NumberBuffer.cs @@ -6,13 +6,17 @@ using System.Diagnostics; using System.Text; using System.Runtime.InteropServices; -#if !netstandard +#if !netstandard && !MONO using Internal.Runtime.CompilerServices; #else using System.Runtime.CompilerServices; #endif +#if MONO +namespace System.Buffers.Text +#else namespace System +#endif { // // This is a port of the Number/NumberBuffer structure from CoreRT (which in turn was a C#-ized port of the NUMBER struct inside CoreCLR.) diff --git a/external/corefx/src/System.Memory/src/System/Number/Number.cs b/external/corefx/src/System.Memory/src/System/Number/Number.cs index a30ae75750..a1f84e3416 100644 --- a/external/corefx/src/System.Memory/src/System/Number/Number.cs +++ b/external/corefx/src/System.Memory/src/System/Number/Number.cs @@ -6,7 +6,11 @@ // This code is copied almost verbatim from the same-named file in CoreRT with mechanical changes to Span-ify it. // +#if MONO +namespace System.Buffers.Text +#else namespace System +#endif { internal static partial class Number { diff --git a/external/corefx/src/System.Memory/src/System/ReadOnlySpan.cs b/external/corefx/src/System.Memory/src/System/ReadOnlySpan.Portable.cs similarity index 66% rename from external/corefx/src/System.Memory/src/System/ReadOnlySpan.cs rename to external/corefx/src/System.Memory/src/System/ReadOnlySpan.Portable.cs index 4137248c8d..fef0d583a1 100644 --- a/external/corefx/src/System.Memory/src/System/ReadOnlySpan.cs +++ b/external/corefx/src/System.Memory/src/System/ReadOnlySpan.Portable.cs @@ -20,22 +20,26 @@ namespace System /// ReadOnlySpan represents a contiguous region of arbitrary memory. Unlike arrays, it can point to either managed /// or native memory, or to memory allocated on the stack. It is type- and memory-safe. /// +#if !MONO [DebuggerTypeProxy(typeof(SpanDebugView<>))] - [DebuggerDisplay("{DebuggerDisplay,nq}")] - public readonly ref struct ReadOnlySpan + [DebuggerDisplay("{ToString(),raw}")] +#endif + public readonly ref partial struct ReadOnlySpan { /// /// Creates a new read-only span over the entirety of the target array. /// /// The target array. - /// Thrown when is a null - /// reference (Nothing in Visual Basic). + /// Returns default when is null. /// Thrown when is covariant and array's type is not exactly T[]. [MethodImpl(MethodImplOptions.AggressiveInlining)] public ReadOnlySpan(T[] array) { if (array == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array); + { + this = default; + return; // returns default + } _length = array.Length; _pinnable = Unsafe.As>(array); @@ -49,8 +53,7 @@ namespace System /// The target array. /// The index at which to begin the read-only span. /// The number of items in the read-only span. - /// Thrown when is a null - /// reference (Nothing in Visual Basic). + /// Returns default when is null. /// Thrown when is covariant and array's type is not exactly T[]. /// /// Thrown when the specified or end index is not in the range (<0 or >=Length). @@ -59,7 +62,12 @@ namespace System public ReadOnlySpan(T[] array, int start, int length) { if (array == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array); + { + if (start != 0 || length != 0) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); + this = default; + return; // returns default + } if ((uint)start > (uint)array.Length || (uint)length > (uint)(array.Length - start)) ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); @@ -96,26 +104,6 @@ namespace System _byteOffset = new IntPtr(pointer); } - /// - /// Create a new read-only span over a portion of a regular managed object. This can be useful - /// if part of a managed object represents a "fixed array." This is dangerous because neither the - /// is checked, nor being null, nor the fact that - /// "rawPointer" actually lies within . - /// - /// The managed object that contains the data to span over. - /// A reference to data within that object. - /// The number of elements the memory contains. - [MethodImpl(MethodImplOptions.AggressiveInlining)] -#if !MONO - [EditorBrowsable(EditorBrowsableState.Never)] -#endif - public static ReadOnlySpan DangerousCreate(object obj, ref T objectData, int length) - { - Pinnable pinnable = Unsafe.As>(obj); - IntPtr byteOffset = Unsafe.ByteOffset(ref pinnable.Data, ref objectData); - return new ReadOnlySpan(pinnable, byteOffset, length); - } - // Constructor for internal use only. [MethodImpl(MethodImplOptions.AggressiveInlining)] internal ReadOnlySpan(Pinnable pinnable, IntPtr byteOffset, int length) @@ -127,19 +115,6 @@ namespace System _byteOffset = byteOffset; } - //Debugger Display = {T[length]} - private string DebuggerDisplay => string.Format("{{{0}[{1}]}}", typeof(T).Name, _length); - - /// - /// The number of items in the read-only span. - /// - public int Length => _length; - - /// - /// Returns true if Length is 0. - /// - public bool IsEmpty => _length == 0; - /// /// Returns the specified element of the read-only span. /// @@ -163,6 +138,26 @@ namespace System } } + /// + /// Returns a reference to the 0th element of the Span. If the Span is empty, returns null reference. + /// It can be used for pinning and is required to support the use of span within a fixed statement. + /// +#if !MONO + [EditorBrowsable(EditorBrowsableState.Never)] +#endif + public unsafe ref readonly T GetPinnableReference() + { + if (_length != 0) + { + if (_pinnable == null) + { + return ref Unsafe.AsRef(_byteOffset.ToPointer()); + } + return ref Unsafe.AddByteOffset(ref _pinnable.Data, _byteOffset); + } + return ref Unsafe.AsRef(null); + } + /// /// Copies the contents of this read-only span into destination span. If the source /// and destinations overlap, this method behaves as if the original values in @@ -215,52 +210,33 @@ namespace System } /// - /// Returns false if left and right point at the same memory and have the same length. Note that - /// this does *not* check to see if the *contents* are equal. + /// For , returns a new instance of string that represents the characters pointed to by the span. + /// Otherwise, returns a with the name of the type and the number of elements. /// - public static bool operator !=(ReadOnlySpan left, ReadOnlySpan right) => !(left == right); - - /// - /// This method is not supported as spans cannot be boxed. To compare two spans, use operator==. - /// - /// Always thrown by this method. - /// - /// - [Obsolete("Equals() on ReadOnlySpan will always throw an exception. Use == instead.")] -#if !MONO - [EditorBrowsable(EditorBrowsableState.Never)] -#endif - public override bool Equals(object obj) + public override string ToString() { - throw new NotSupportedException(SR.CannotCallEqualsOnSpan); + if (typeof(T) == typeof(char)) + { + // If this wraps a string and represents the full length of the string, just return the wrapped string. + if (_byteOffset == MemoryExtensions.StringAdjustment) + { + object obj = Unsafe.As(_pinnable); // minimize chances the compilers will optimize away the 'is' check + if (obj is string str && _length == str.Length) + { + return str; + } + } + + // Otherwise, copy the data to a new string. + unsafe + { + fixed (char* src = &Unsafe.As(ref DangerousGetPinnableReference())) + return new string(src, 0, _length); + } + } + return string.Format("System.ReadOnlySpan<{0}>[{1}]", typeof(T).Name, _length); } - /// - /// This method is not supported as spans cannot be boxed. - /// - /// Always thrown by this method. - /// - /// - [Obsolete("GetHashCode() on ReadOnlySpan will always throw an exception.")] -#if !MONO - [EditorBrowsable(EditorBrowsableState.Never)] -#endif - public override int GetHashCode() - { - throw new NotSupportedException(SR.CannotCallGetHashCodeOnSpan); - } - - /// - /// Defines an implicit conversion of an array to a - /// - public static implicit operator ReadOnlySpan(T[] array) => array != null ? new ReadOnlySpan(array) : default; - - /// - /// Defines an implicit conversion of a to a - /// - public static implicit operator ReadOnlySpan(ArraySegment arraySegment) - => arraySegment.Array != null ? new ReadOnlySpan(arraySegment.Array, arraySegment.Offset, arraySegment.Count) : default; - /// /// Forms a slice out of the given read-only span, beginning at 'start'. /// @@ -312,11 +288,6 @@ namespace System return result; } - /// - /// Returns a 0-length read-only span whose base is the null pointer. - /// - public static ReadOnlySpan Empty => default(ReadOnlySpan); - /// /// This method is obsolete, use System.Runtime.InteropServices.MemoryMarshal.GetReference instead. /// Returns a reference to the 0th element of the Span. If the Span is empty, returns a reference to the location where the 0th element @@ -334,61 +305,6 @@ namespace System return ref Unsafe.AddByteOffset(ref _pinnable.Data, _byteOffset); } - /// Gets an enumerator for this span. - public Enumerator GetEnumerator() => new Enumerator(this); - - /// Enumerates the elements of a . - public ref struct Enumerator - { - /// The span being enumerated. - private readonly ReadOnlySpan _span; - /// The next index to yield. - private int _index; - - /// Initialize the enumerator. - /// The span to enumerate. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - internal Enumerator(ReadOnlySpan span) - { - _span = span; - _index = -1; - } - - /// Advances the enumerator to the next element of the span. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public bool MoveNext() - { - int index = _index + 1; - if (index < _span.Length) - { - _index = index; - return true; - } - - return false; - } - - /// Gets the element at the current position of the enumerator. - public ref readonly T Current - { - [MethodImpl(MethodImplOptions.AggressiveInlining)] - get - { - // TODO https://github.com/dotnet/corefx/issues/24105: - // Change this to simply be: - // get => ref _span[_index]; - // once ReadOnlySpan's indexer returns ref readonly. - - if ((uint)_index >= (uint)_span.Length) - { - ThrowHelper.ThrowIndexOutOfRangeException(); - } - - return ref Unsafe.Add(ref _span.DangerousGetPinnableReference(), _index); - } - } - } - // These expose the internal representation for Span-related apis use only. internal Pinnable Pinnable => _pinnable; internal IntPtr ByteOffset => _byteOffset; diff --git a/external/corefx/src/System.Memory/src/System/Runtime/InteropServices/MemoryMarshal.Portable.cs b/external/corefx/src/System.Memory/src/System/Runtime/InteropServices/MemoryMarshal.Portable.cs new file mode 100644 index 0000000000..caedd29ceb --- /dev/null +++ b/external/corefx/src/System.Memory/src/System/Runtime/InteropServices/MemoryMarshal.Portable.cs @@ -0,0 +1,145 @@ +// 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.Runtime.CompilerServices; + +namespace System.Runtime.InteropServices +{ + /// + /// Provides a collection of methods for interoperating with , , + /// , and . + /// + public static partial class MemoryMarshal + { + /// + /// Casts a Span of one primitive type to Span of bytes. + /// That type may not contain pointers or references. This is checked at runtime in order to preserve type safety. + /// + /// The source slice, of type . + /// + /// Thrown when contains pointers. + /// + /// + /// Thrown if the Length property of the new Span would exceed Int32.MaxValue. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Span AsBytes(Span span) + where T : struct + { + if (SpanHelpers.IsReferenceOrContainsReferences()) + ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(T)); + + int newLength = checked(span.Length * Unsafe.SizeOf()); + return new Span(Unsafe.As>(span.Pinnable), span.ByteOffset, newLength); + } + + /// + /// Casts a ReadOnlySpan of one primitive type to ReadOnlySpan of bytes. + /// That type may not contain pointers or references. This is checked at runtime in order to preserve type safety. + /// + /// The source slice, of type . + /// + /// Thrown when contains pointers. + /// + /// + /// Thrown if the Length property of the new Span would exceed Int32.MaxValue. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ReadOnlySpan AsBytes(ReadOnlySpan span) + where T : struct + { + if (SpanHelpers.IsReferenceOrContainsReferences()) + ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(T)); + + int newLength = checked(span.Length * Unsafe.SizeOf()); + return new ReadOnlySpan(Unsafe.As>(span.Pinnable), span.ByteOffset, newLength); + } + + /// Creates a from a . + /// The . + /// A representing the same memory as the , but writable. + /// + /// must be used with extreme caution. is used + /// to represent immutable data and other memory that is not meant to be written to; instances created + /// by should not be written to. The method exists to enable variables typed + /// as but only used for reading to store a . + /// + public static Memory AsMemory(ReadOnlyMemory memory) => + Unsafe.As, Memory>(ref memory); + + /// + /// Returns a reference to the 0th element of the Span. If the Span is empty, returns a reference to the location where the 0th element + /// would have been stored. Such a reference can be used for pinning but must never be dereferenced. + /// + public static ref T GetReference(Span span) + { + if (span.Pinnable == null) + unsafe { return ref Unsafe.AsRef(span.ByteOffset.ToPointer()); } + else + return ref Unsafe.AddByteOffset(ref span.Pinnable.Data, span.ByteOffset); + } + + /// + /// Returns a reference to the 0th element of the ReadOnlySpan. If the Span is empty, returns a reference to the location where the 0th element + /// would have been stored. Such a reference can be used for pinning but must never be dereferenced. + /// + public static ref T GetReference(ReadOnlySpan span) + { + if (span.Pinnable == null) + unsafe { return ref Unsafe.AsRef(span.ByteOffset.ToPointer()); } + else + return ref Unsafe.AddByteOffset(ref span.Pinnable.Data, span.ByteOffset); + } + + /// + /// Casts a Span of one primitive type to another primitive type . + /// These types may not contain pointers or references. This is checked at runtime in order to preserve type safety. + /// + /// + /// Supported only for platforms that support misaligned memory access. + /// + /// The source slice, of type . + /// + /// Thrown when or contains pointers. + /// + public static Span Cast(Span span) + where TFrom : struct + where TTo : struct + { + if (SpanHelpers.IsReferenceOrContainsReferences()) + ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(TFrom)); + + if (SpanHelpers.IsReferenceOrContainsReferences()) + ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(TTo)); + + int newLength = checked((int)((long)span.Length * Unsafe.SizeOf() / Unsafe.SizeOf())); + return new Span(Unsafe.As>(span.Pinnable), span.ByteOffset, newLength); + } + + /// + /// Casts a ReadOnlySpan of one primitive type to another primitive type . + /// These types may not contain pointers or references. This is checked at runtime in order to preserve type safety. + /// + /// + /// Supported only for platforms that support misaligned memory access. + /// + /// The source slice, of type . + /// + /// Thrown when or contains pointers. + /// + public static ReadOnlySpan Cast(ReadOnlySpan span) + where TFrom : struct + where TTo : struct + { + if (SpanHelpers.IsReferenceOrContainsReferences()) + ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(TFrom)); + + if (SpanHelpers.IsReferenceOrContainsReferences()) + ThrowHelper.ThrowArgumentException_InvalidTypeWithPointersNotSupported(typeof(TTo)); + + int newLength = checked((int)((long)span.Length * Unsafe.SizeOf() / Unsafe.SizeOf())); + return new ReadOnlySpan(Unsafe.As>(span.Pinnable), span.ByteOffset, newLength); + } + } +} diff --git a/external/corefx/src/System.Memory/src/System/Runtime/InteropServices/SequenceMarshal.cs b/external/corefx/src/System.Memory/src/System/Runtime/InteropServices/SequenceMarshal.cs new file mode 100644 index 0000000000..8335a4144b --- /dev/null +++ b/external/corefx/src/System.Memory/src/System/Runtime/InteropServices/SequenceMarshal.cs @@ -0,0 +1,61 @@ +// 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; + +namespace System.Runtime.InteropServices +{ + /// + /// Provides a collection of methods for interoperating with + /// + public static partial class SequenceMarshal + { + /// + /// Get from the underlying . + /// If unable to get the , return false. + /// + public static bool TryGetReadOnlySequenceSegment(ReadOnlySequence sequence, + out ReadOnlySequenceSegment startSegment, + out int startIndex, + out ReadOnlySequenceSegment endSegment, + out int endIndex) + { + return sequence.TryGetReadOnlySequenceSegment(out startSegment, out startIndex, out endSegment, out endIndex); + } + + /// + /// Get an array segment from the underlying . + /// If unable to get the array segment, return false with a default array segment. + /// + public static bool TryGetArray(ReadOnlySequence sequence, out ArraySegment segment) + { + return sequence.TryGetArray(out segment); + } + + /// + /// Get from the underlying . + /// If unable to get the , return false. + /// + public static bool TryGetReadOnlyMemory(ReadOnlySequence sequence, out ReadOnlyMemory memory) + { + if (!sequence.IsSingleSegment) + { + memory = default; + return false; + } + + memory = sequence.First; + return true; + } + + /// + /// Get from the underlying . + /// If unable to get the , return false. + /// + internal static bool TryGetString(ReadOnlySequence sequence, out string text, out int start, out int length) + { + return sequence.TryGetString(out text, out start, out length); + } + } +} diff --git a/external/corefx/src/System.Memory/src/System/SequencePosition.cs b/external/corefx/src/System.Memory/src/System/SequencePosition.cs new file mode 100644 index 0000000000..ba5b3bd41c --- /dev/null +++ b/external/corefx/src/System.Memory/src/System/SequencePosition.cs @@ -0,0 +1,67 @@ +// 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.Numerics.Hashing; +#if !MONO +using System.ComponentModel; +#endif + +namespace System +{ + /// + /// Represents position in non-contiguous set of memory. + /// Properties of this type should not be interpreted by anything but the type that created it. + /// + public readonly struct SequencePosition : IEquatable + { + private readonly object _object; + private readonly int _integer; + + /// + /// Creates new + /// + public SequencePosition(object @object, int integer) + { + _object = @object; + _integer = integer; + } + + /// + /// Returns object part of this + /// +#if !MONO + [EditorBrowsable(EditorBrowsableState.Never)] +#endif + public object GetObject() => _object; + + /// + /// Returns integer part of this + /// +#if !MONO + [EditorBrowsable(EditorBrowsableState.Never)] +#endif + public int GetInteger() => _integer; + + /// + /// Indicates whether the current is equal to another . + /// equality does not guarantee that they point to the same location in + /// + public bool Equals(SequencePosition other) => _integer == other._integer && object.Equals(this._object, other._object); + + /// + /// Indicates whether the current is equal to another . + /// equality does not guarantee that they point to the same location in + /// +#if !MONO + [EditorBrowsable(EditorBrowsableState.Never)] +#endif + public override bool Equals(object obj) => obj is SequencePosition other && this.Equals(other); + + /// +#if !MONO + [EditorBrowsable(EditorBrowsableState.Never)] +#endif + public override int GetHashCode() => HashHelpers.Combine(_object?.GetHashCode() ?? 0, _integer); + } +} diff --git a/external/corefx/src/System.Memory/src/System/Span.cs b/external/corefx/src/System.Memory/src/System/Span.Portable.cs similarity index 75% rename from external/corefx/src/System.Memory/src/System/Span.cs rename to external/corefx/src/System.Memory/src/System/Span.Portable.cs index bd0060d6ad..4f3435c3d0 100644 --- a/external/corefx/src/System.Memory/src/System/Span.cs +++ b/external/corefx/src/System.Memory/src/System/Span.Portable.cs @@ -20,22 +20,26 @@ namespace System /// Span represents a contiguous region of arbitrary memory. Unlike arrays, it can point to either managed /// or native memory, or to memory allocated on the stack. It is type- and memory-safe. /// +#if !MONO [DebuggerTypeProxy(typeof(SpanDebugView<>))] - [DebuggerDisplay("{DebuggerDisplay,nq}")] - public readonly ref struct Span + [DebuggerDisplay("{ToString(),raw}")] +#endif + public readonly ref partial struct Span { /// /// Creates a new span over the entirety of the target array. /// /// The target array. - /// Thrown when is a null - /// reference (Nothing in Visual Basic). + /// Returns default when is null. /// Thrown when is covariant and array's type is not exactly T[]. [MethodImpl(MethodImplOptions.AggressiveInlining)] public Span(T[] array) { if (array == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array); + { + this = default; + return; // returns default + } if (default(T) == null && array.GetType() != typeof(T[])) ThrowHelper.ThrowArrayTypeMismatchException(); @@ -44,6 +48,28 @@ namespace System _byteOffset = SpanHelpers.PerTypeValues.ArrayAdjustment; } + // This is a constructor that takes an array and start but not length. The reason we expose it as a static method as a constructor + // is to mirror the actual api shape. This overload of the constructor was removed from the api surface area due to possible + // confusion with other overloads that take an int parameter that don't represent a start index. + [MethodImpl(MethodImplOptions.AggressiveInlining)] + internal static Span Create(T[] array, int start) + { + if (array == null) + { + if (start != 0) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); + return default; + } + if (default(T) == null && array.GetType() != typeof(T[])) + ThrowHelper.ThrowArrayTypeMismatchException(); + if ((uint)start > (uint)array.Length) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); + + IntPtr byteOffset = SpanHelpers.PerTypeValues.ArrayAdjustment.Add(start); + int length = array.Length - start; + return new Span(pinnable: Unsafe.As>(array), byteOffset: byteOffset, length: length); + } + /// /// Creates a new span over the portion of the target array beginning /// at 'start' index and ending at 'end' index (exclusive). @@ -51,8 +77,7 @@ namespace System /// The target array. /// The index at which to begin the span. /// The number of items in the span. - /// Thrown when is a null - /// reference (Nothing in Visual Basic). + /// Returns default when is null. /// Thrown when is covariant and array's type is not exactly T[]. /// /// Thrown when the specified or end index is not in the range (<0 or >=Length). @@ -61,7 +86,12 @@ namespace System public Span(T[] array, int start, int length) { if (array == null) - ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array); + { + if (start != 0 || length != 0) + ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start); + this = default; + return; // returns default + } if (default(T) == null && array.GetType() != typeof(T[])) ThrowHelper.ThrowArrayTypeMismatchException(); if ((uint)start > (uint)array.Length || (uint)length > (uint)(array.Length - start)) @@ -100,26 +130,6 @@ namespace System _byteOffset = new IntPtr(pointer); } - /// - /// Create a new span over a portion of a regular managed object. This can be useful - /// if part of a managed object represents a "fixed array." This is dangerous because neither the - /// is checked, nor being null, nor the fact that - /// "rawPointer" actually lies within . - /// - /// The managed object that contains the data to span over. - /// A reference to data within that object. - /// The number of elements the memory contains. - [MethodImpl(MethodImplOptions.AggressiveInlining)] -#if !MONO - [EditorBrowsable(EditorBrowsableState.Never)] -#endif - public static Span DangerousCreate(object obj, ref T objectData, int length) - { - Pinnable pinnable = Unsafe.As>(obj); - IntPtr byteOffset = Unsafe.ByteOffset(ref pinnable.Data, ref objectData); - return new Span(pinnable, byteOffset, length); - } - // Constructor for internal use only. [MethodImpl(MethodImplOptions.AggressiveInlining)] internal Span(Pinnable pinnable, IntPtr byteOffset, int length) @@ -131,19 +141,6 @@ namespace System _byteOffset = byteOffset; } - //Debugger Display = {T[length]} - private string DebuggerDisplay => string.Format("{{{0}[{1}]}}", typeof(T).Name, _length); - - /// - /// The number of items in the span. - /// - public int Length => _length; - - /// - /// Returns true if Length is 0. - /// - public bool IsEmpty => _length == 0; - /// /// Returns a reference to specified element of the Span. /// @@ -167,6 +164,26 @@ namespace System } } + /// + /// Returns a reference to the 0th element of the Span. If the Span is empty, returns null reference. + /// It can be used for pinning and is required to support the use of span within a fixed statement. + /// +#if !MONO + [EditorBrowsable(EditorBrowsableState.Never)] +#endif + public unsafe ref T GetPinnableReference() + { + if (_length != 0) + { + if (_pinnable == null) + { + return ref Unsafe.AsRef(_byteOffset.ToPointer()); + } + return ref Unsafe.AddByteOffset(ref _pinnable.Data, _byteOffset); + } + return ref Unsafe.AsRef(null); + } + /// /// Clears the contents of this span. /// @@ -321,58 +338,28 @@ namespace System return left._length == right._length && Unsafe.AreSame(ref left.DangerousGetPinnableReference(), ref right.DangerousGetPinnableReference()); } - /// - /// Returns false if left and right point at the same memory and have the same length. Note that - /// this does *not* check to see if the *contents* are equal. - /// - public static bool operator !=(Span left, Span right) => !(left == right); - - /// - /// This method is not supported as spans cannot be boxed. To compare two spans, use operator==. - /// - /// Always thrown by this method. - /// - /// - [Obsolete("Equals() on Span will always throw an exception. Use == instead.")] -#if !MONO - [EditorBrowsable(EditorBrowsableState.Never)] -#endif - public override bool Equals(object obj) - { - throw new NotSupportedException(SR.CannotCallEqualsOnSpan); - } - - /// - /// This method is not supported as spans cannot be boxed. - /// - /// Always thrown by this method. - /// - /// - [Obsolete("GetHashCode() on Span will always throw an exception.")] -#if !MONO - [EditorBrowsable(EditorBrowsableState.Never)] -#endif - public override int GetHashCode() - { - throw new NotSupportedException(SR.CannotCallGetHashCodeOnSpan); - } - - /// - /// Defines an implicit conversion of an array to a - /// - public static implicit operator Span(T[] array) => array != null ? new Span(array) : default; - - /// - /// Defines an implicit conversion of a to a - /// - public static implicit operator Span(ArraySegment arraySegment) - => arraySegment.Array != null ? new Span(arraySegment.Array, arraySegment.Offset, arraySegment.Count) : default; - /// /// Defines an implicit conversion of a to a /// public static implicit operator ReadOnlySpan(Span span) => new ReadOnlySpan(span._pinnable, span._byteOffset, span._length); + /// + /// For , returns a new instance of string that represents the characters pointed to by the span. + /// Otherwise, returns a with the name of the type and the number of elements. + /// + public override string ToString() + { + if (typeof(T) == typeof(char)) + { + unsafe + { + fixed (char* src = &Unsafe.As(ref DangerousGetPinnableReference())) + return new string(src, 0, _length); + } + } + return string.Format("System.Span<{0}>[{1}]", typeof(T).Name, _length); + } + /// /// Forms a slice out of the given span, beginning at 'start'. /// @@ -424,11 +411,6 @@ namespace System return result; } - /// - /// Returns a 0-length span whose base is the null pointer. - /// - public static Span Empty => default(Span); - /// /// This method is obsolete, use System.Runtime.InteropServices.MemoryMarshal.GetReference instead. /// Returns a reference to the 0th element of the Span. If the Span is empty, returns a reference to the location where the 0th element @@ -446,48 +428,6 @@ namespace System return ref Unsafe.AddByteOffset(ref _pinnable.Data, _byteOffset); } - /// Gets an enumerator for this span. - public Enumerator GetEnumerator() => new Enumerator(this); - - /// Enumerates the elements of a . - public ref struct Enumerator - { - /// The span being enumerated. - private readonly Span _span; - /// The next index to yield. - private int _index; - - /// Initialize the enumerator. - /// The span to enumerate. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - internal Enumerator(Span span) - { - _span = span; - _index = -1; - } - - /// Advances the enumerator to the next element of the span. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public bool MoveNext() - { - int index = _index + 1; - if (index < _span.Length) - { - _index = index; - return true; - } - - return false; - } - - /// Gets the element at the current position of the enumerator. - public ref T Current - { - [MethodImpl(MethodImplOptions.AggressiveInlining)] - get => ref _span[_index]; - } - } - // These expose the internal representation for Span-related apis use only. internal Pinnable Pinnable => _pinnable; internal IntPtr ByteOffset => _byteOffset; diff --git a/external/corefx/src/System.Memory/src/System/SpanDebugView.cs b/external/corefx/src/System.Memory/src/System/SpanDebugView.cs deleted file mode 100644 index 2633028322..0000000000 --- a/external/corefx/src/System.Memory/src/System/SpanDebugView.cs +++ /dev/null @@ -1,62 +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.Reflection; -using System.Runtime.CompilerServices; - -namespace System -{ - internal sealed class SpanDebugView - { - private readonly T[] _pinnable; - private readonly IntPtr _byteOffset; - private readonly int _length; - - public SpanDebugView(Span collection) - { - _pinnable = (T[])(object)collection.Pinnable; - _byteOffset = collection.ByteOffset; - _length = collection.Length; - } - - public SpanDebugView(ReadOnlySpan collection) - { - _pinnable = (T[])(object)collection.Pinnable; - _byteOffset = collection.ByteOffset; - _length = collection.Length; - } - - [DebuggerBrowsable(DebuggerBrowsableState.RootHidden)] - public unsafe T[] Items - { - get - { - int elementSize = typeof(T).GetTypeInfo().IsValueType ? Unsafe.SizeOf() : IntPtr.Size;//Workaround to VIL bug where Unsafe.SizeOf where T is a class, returns the size of its fields instead of IntPtr.Size - T[] result = new T[_length]; - - if (_pinnable == null) - { - byte* source = (byte*)_byteOffset.ToPointer(); - - for (int i = 0; i < result.Length; i++) - { - result[i] = Unsafe.Read(source); - source = source + elementSize; - } - } - else - { - long byteOffsetInt = _byteOffset.ToInt64(); - long arrayAdjustment = SpanHelpers.PerTypeValues.ArrayAdjustment.ToInt64(); - int sourceIndex = (int)((byteOffsetInt - arrayAdjustment) / elementSize); - - Array.Copy(_pinnable, sourceIndex, result, 0, _length); - } - - return result; - } - } - } -} diff --git a/external/corefx/src/System.Memory/src/System/SpanHelpers.Clear.cs b/external/corefx/src/System.Memory/src/System/SpanHelpers.Clear.cs deleted file mode 100644 index 34676e5611..0000000000 --- a/external/corefx/src/System.Memory/src/System/SpanHelpers.Clear.cs +++ /dev/null @@ -1,156 +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.Runtime.InteropServices; -using System.Runtime.CompilerServices; - -#if !netstandard -using Internal.Runtime.CompilerServices; -#endif - -namespace System -{ - internal static partial class SpanHelpers - { - public unsafe static void ClearLessThanPointerSized(byte* ptr, UIntPtr byteLength) - { - if (sizeof(UIntPtr) == sizeof(uint)) - { - Unsafe.InitBlockUnaligned(ptr, 0, (uint)byteLength); - } - else - { - // PERF: Optimize for common case of length <= uint.MaxValue - ulong bytesRemaining = (ulong)byteLength; - uint bytesToClear = (uint)(bytesRemaining & uint.MaxValue); - Unsafe.InitBlockUnaligned(ptr, 0, bytesToClear); - bytesRemaining -= bytesToClear; - ptr += bytesToClear; - // Clear any bytes > uint.MaxValue - while (bytesRemaining > 0) - { - bytesToClear = (bytesRemaining >= uint.MaxValue) ? uint.MaxValue : (uint)bytesRemaining; - Unsafe.InitBlockUnaligned(ptr, 0, bytesToClear); - ptr += bytesToClear; - bytesRemaining -= bytesToClear; - } - } - } - - public static unsafe void ClearLessThanPointerSized(ref byte b, UIntPtr byteLength) - { - if (sizeof(UIntPtr) == sizeof(uint)) - { - Unsafe.InitBlockUnaligned(ref b, 0, (uint)byteLength); - } - else - { - // PERF: Optimize for common case of length <= uint.MaxValue - ulong bytesRemaining = (ulong)byteLength; - uint bytesToClear = (uint)(bytesRemaining & uint.MaxValue); - Unsafe.InitBlockUnaligned(ref b, 0, bytesToClear); - bytesRemaining -= bytesToClear; - long byteOffset = bytesToClear; - // Clear any bytes > uint.MaxValue - while (bytesRemaining > 0) - { - bytesToClear = (bytesRemaining >= uint.MaxValue) ? uint.MaxValue : (uint)bytesRemaining; - ref byte bOffset = ref Unsafe.Add(ref b, (IntPtr)byteOffset); - Unsafe.InitBlockUnaligned(ref bOffset, 0, bytesToClear); - byteOffset += bytesToClear; - bytesRemaining -= bytesToClear; - } - } - } - - public unsafe static void ClearPointerSizedWithoutReferences(ref byte b, UIntPtr byteLength) - { - // TODO: Perhaps do switch casing to improve small size perf - - var i = IntPtr.Zero; - while (i.LessThanEqual(byteLength - sizeof(Reg64))) - { - Unsafe.As(ref Unsafe.Add(ref b, i)) = default(Reg64); - i += sizeof(Reg64); - } - if (i.LessThanEqual(byteLength - sizeof(Reg32))) - { - Unsafe.As(ref Unsafe.Add(ref b, i)) = default(Reg32); - i += sizeof(Reg32); - } - if (i.LessThanEqual(byteLength - sizeof(Reg16))) - { - Unsafe.As(ref Unsafe.Add(ref b, i)) = default(Reg16); - i += sizeof(Reg16); - } - if (i.LessThanEqual(byteLength - sizeof(long))) - { - Unsafe.As(ref Unsafe.Add(ref b, i)) = 0; - i += sizeof(long); - } - // JIT: Should elide this if 64-bit - if (sizeof(IntPtr) == sizeof(int)) - { - if (i.LessThanEqual(byteLength - sizeof(int))) - { - Unsafe.As(ref Unsafe.Add(ref b, i)) = 0; - i += sizeof(int); - } - } - } - - public static void ClearPointerSizedWithReferences(ref IntPtr ip, UIntPtr pointerSizeLength) - { - // TODO: Perhaps do switch casing to improve small size perf - - var i = IntPtr.Zero; - var n = IntPtr.Zero; - while ((n = i + 8).LessThanEqual(pointerSizeLength)) - { - Unsafe.Add(ref ip, i + 0) = default(IntPtr); - Unsafe.Add(ref ip, i + 1) = default(IntPtr); - Unsafe.Add(ref ip, i + 2) = default(IntPtr); - Unsafe.Add(ref ip, i + 3) = default(IntPtr); - Unsafe.Add(ref ip, i + 4) = default(IntPtr); - Unsafe.Add(ref ip, i + 5) = default(IntPtr); - Unsafe.Add(ref ip, i + 6) = default(IntPtr); - Unsafe.Add(ref ip, i + 7) = default(IntPtr); - i = n; - } - if ((n = i + 4).LessThanEqual(pointerSizeLength)) - { - Unsafe.Add(ref ip, i + 0) = default(IntPtr); - Unsafe.Add(ref ip, i + 1) = default(IntPtr); - Unsafe.Add(ref ip, i + 2) = default(IntPtr); - Unsafe.Add(ref ip, i + 3) = default(IntPtr); - i = n; - } - if ((n = i + 2).LessThanEqual(pointerSizeLength)) - { - Unsafe.Add(ref ip, i + 0) = default(IntPtr); - Unsafe.Add(ref ip, i + 1) = default(IntPtr); - i = n; - } - if ((i + 1).LessThanEqual(pointerSizeLength)) - { - Unsafe.Add(ref ip, i) = default(IntPtr); - } - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private unsafe static bool LessThanEqual(this IntPtr index, UIntPtr length) - { - return (sizeof(UIntPtr) == sizeof(uint)) - ? (int)index <= (int)length - : (long)index <= (long)length; - } - - [StructLayout(LayoutKind.Sequential, Size = 64)] - private struct Reg64 { } - [StructLayout(LayoutKind.Sequential, Size = 32)] - private struct Reg32 { } - [StructLayout(LayoutKind.Sequential, Size = 16)] - private struct Reg16 { } - } -} diff --git a/external/corefx/src/System.Memory/src/System/SpanHelpers.cs b/external/corefx/src/System.Memory/src/System/SpanHelpers.cs index 4289fa95e3..e2d154d8da 100644 --- a/external/corefx/src/System.Memory/src/System/SpanHelpers.cs +++ b/external/corefx/src/System.Memory/src/System/SpanHelpers.cs @@ -156,6 +156,146 @@ namespace System return false; } + public unsafe static void ClearLessThanPointerSized(byte* ptr, UIntPtr byteLength) + { + if (sizeof(UIntPtr) == sizeof(uint)) + { + Unsafe.InitBlockUnaligned(ptr, 0, (uint)byteLength); + } + else + { + // PERF: Optimize for common case of length <= uint.MaxValue + ulong bytesRemaining = (ulong)byteLength; + uint bytesToClear = (uint)(bytesRemaining & uint.MaxValue); + Unsafe.InitBlockUnaligned(ptr, 0, bytesToClear); + bytesRemaining -= bytesToClear; + ptr += bytesToClear; + // Clear any bytes > uint.MaxValue + while (bytesRemaining > 0) + { + bytesToClear = (bytesRemaining >= uint.MaxValue) ? uint.MaxValue : (uint)bytesRemaining; + Unsafe.InitBlockUnaligned(ptr, 0, bytesToClear); + ptr += bytesToClear; + bytesRemaining -= bytesToClear; + } + } + } + + public static unsafe void ClearLessThanPointerSized(ref byte b, UIntPtr byteLength) + { + if (sizeof(UIntPtr) == sizeof(uint)) + { + Unsafe.InitBlockUnaligned(ref b, 0, (uint)byteLength); + } + else + { + // PERF: Optimize for common case of length <= uint.MaxValue + ulong bytesRemaining = (ulong)byteLength; + uint bytesToClear = (uint)(bytesRemaining & uint.MaxValue); + Unsafe.InitBlockUnaligned(ref b, 0, bytesToClear); + bytesRemaining -= bytesToClear; + long byteOffset = bytesToClear; + // Clear any bytes > uint.MaxValue + while (bytesRemaining > 0) + { + bytesToClear = (bytesRemaining >= uint.MaxValue) ? uint.MaxValue : (uint)bytesRemaining; + ref byte bOffset = ref Unsafe.Add(ref b, (IntPtr)byteOffset); + Unsafe.InitBlockUnaligned(ref bOffset, 0, bytesToClear); + byteOffset += bytesToClear; + bytesRemaining -= bytesToClear; + } + } + } + + public unsafe static void ClearPointerSizedWithoutReferences(ref byte b, UIntPtr byteLength) + { + // TODO: Perhaps do switch casing to improve small size perf + + var i = IntPtr.Zero; + while (i.LessThanEqual(byteLength - sizeof(Reg64))) + { + Unsafe.As(ref Unsafe.Add(ref b, i)) = default(Reg64); + i += sizeof(Reg64); + } + if (i.LessThanEqual(byteLength - sizeof(Reg32))) + { + Unsafe.As(ref Unsafe.Add(ref b, i)) = default(Reg32); + i += sizeof(Reg32); + } + if (i.LessThanEqual(byteLength - sizeof(Reg16))) + { + Unsafe.As(ref Unsafe.Add(ref b, i)) = default(Reg16); + i += sizeof(Reg16); + } + if (i.LessThanEqual(byteLength - sizeof(long))) + { + Unsafe.As(ref Unsafe.Add(ref b, i)) = 0; + i += sizeof(long); + } + // JIT: Should elide this if 64-bit + if (sizeof(IntPtr) == sizeof(int)) + { + if (i.LessThanEqual(byteLength - sizeof(int))) + { + Unsafe.As(ref Unsafe.Add(ref b, i)) = 0; + i += sizeof(int); + } + } + } + + public static void ClearPointerSizedWithReferences(ref IntPtr ip, UIntPtr pointerSizeLength) + { + // TODO: Perhaps do switch casing to improve small size perf + + var i = IntPtr.Zero; + var n = IntPtr.Zero; + while ((n = i + 8).LessThanEqual(pointerSizeLength)) + { + Unsafe.Add(ref ip, i + 0) = default(IntPtr); + Unsafe.Add(ref ip, i + 1) = default(IntPtr); + Unsafe.Add(ref ip, i + 2) = default(IntPtr); + Unsafe.Add(ref ip, i + 3) = default(IntPtr); + Unsafe.Add(ref ip, i + 4) = default(IntPtr); + Unsafe.Add(ref ip, i + 5) = default(IntPtr); + Unsafe.Add(ref ip, i + 6) = default(IntPtr); + Unsafe.Add(ref ip, i + 7) = default(IntPtr); + i = n; + } + if ((n = i + 4).LessThanEqual(pointerSizeLength)) + { + Unsafe.Add(ref ip, i + 0) = default(IntPtr); + Unsafe.Add(ref ip, i + 1) = default(IntPtr); + Unsafe.Add(ref ip, i + 2) = default(IntPtr); + Unsafe.Add(ref ip, i + 3) = default(IntPtr); + i = n; + } + if ((n = i + 2).LessThanEqual(pointerSizeLength)) + { + Unsafe.Add(ref ip, i + 0) = default(IntPtr); + Unsafe.Add(ref ip, i + 1) = default(IntPtr); + i = n; + } + if ((i + 1).LessThanEqual(pointerSizeLength)) + { + Unsafe.Add(ref ip, i) = default(IntPtr); + } + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private unsafe static bool LessThanEqual(this IntPtr index, UIntPtr length) + { + return (sizeof(UIntPtr) == sizeof(uint)) + ? (int)index <= (int)length + : (long)index <= (long)length; + } + + [StructLayout(LayoutKind.Sequential, Size = 64)] + private struct Reg64 { } + [StructLayout(LayoutKind.Sequential, Size = 32)] + private struct Reg32 { } + [StructLayout(LayoutKind.Sequential, Size = 16)] + private struct Reg16 { } + public static class PerTypeValues { // diff --git a/external/corefx/src/System.Memory/src/System/ThrowHelper.cs b/external/corefx/src/System.Memory/src/System/ThrowHelper.cs index 81d3f793c9..50ce979336 100644 --- a/external/corefx/src/System.Memory/src/System/ThrowHelper.cs +++ b/external/corefx/src/System.Memory/src/System/ThrowHelper.cs @@ -60,13 +60,33 @@ namespace System [MethodImpl(MethodImplOptions.NoInlining)] private static Exception CreateArgumentOutOfRangeException_SymbolDoesNotFit() { return new ArgumentOutOfRangeException("symbol", SR.Argument_BadFormatSpecifier); } + internal static void ThrowInvalidOperationException() { throw CreateInvalidOperationException(); } + [MethodImpl(MethodImplOptions.NoInlining)] + private static Exception CreateInvalidOperationException() { return new InvalidOperationException(); } + internal static void ThrowInvalidOperationException_OutstandingReferences() { throw CreateInvalidOperationException_OutstandingReferences(); } [MethodImpl(MethodImplOptions.NoInlining)] private static Exception CreateInvalidOperationException_OutstandingReferences() { return new InvalidOperationException(SR.OutstandingReferences); } - internal static void ThrowObjectDisposedException_MemoryDisposed(string objectName) { throw CreateObjectDisposedException_MemoryDisposed(objectName); } + internal static void ThrowInvalidOperationException_UnexpectedSegmentType() { throw CreateInvalidOperationException_UnexpectedSegmentType(); } [MethodImpl(MethodImplOptions.NoInlining)] - private static Exception CreateObjectDisposedException_MemoryDisposed(string objectName) { return new ObjectDisposedException(objectName, SR.MemoryDisposed); } + private static Exception CreateInvalidOperationException_UnexpectedSegmentType() { return new InvalidOperationException(SR.UnexpectedSegmentType); } + + internal static void ThrowInvalidOperationException_EndPositionNotReached() { throw CreateInvalidOperationException_EndPositionNotReached(); } + [MethodImpl(MethodImplOptions.NoInlining)] + private static Exception CreateInvalidOperationException_EndPositionNotReached() { return new InvalidOperationException(SR.EndPositionNotReached); } + + internal static void ThrowArgumentOutOfRangeException_PositionOutOfRange() { throw CreateArgumentOutOfRangeException_PositionOutOfRange(); } + [MethodImpl(MethodImplOptions.NoInlining)] + private static Exception CreateArgumentOutOfRangeException_PositionOutOfRange() { return new ArgumentOutOfRangeException("position"); } + + internal static void ThrowArgumentOutOfRangeException_OffsetOutOfRange() { throw CreateArgumentOutOfRangeException_OffsetOutOfRange(); } + [MethodImpl(MethodImplOptions.NoInlining)] + private static Exception CreateArgumentOutOfRangeException_OffsetOutOfRange() { return new ArgumentOutOfRangeException(nameof(ExceptionArgument.offset)); } + + internal static void ThrowObjectDisposedException_ArrayMemoryPoolBuffer() { throw CreateObjectDisposedException_ArrayMemoryPoolBuffer(); } + [MethodImpl(MethodImplOptions.NoInlining)] + private static Exception CreateObjectDisposedException_ArrayMemoryPoolBuffer() { return new ObjectDisposedException("ArrayMemoryPoolBuffer"); } internal static void ThrowFormatException_BadFormatSpecifier() { throw CreateFormatException_BadFormatSpecifier(); } [MethodImpl(MethodImplOptions.NoInlining)] @@ -76,6 +96,10 @@ namespace System [MethodImpl(MethodImplOptions.NoInlining)] private static Exception CreateArgumentException_OverlapAlignmentMismatch() { return new ArgumentException(SR.Argument_OverlapAlignmentMismatch); } + internal static void ThrowNotSupportedException() { throw CreateThrowNotSupportedException(); } + [MethodImpl(MethodImplOptions.NoInlining)] + private static Exception CreateThrowNotSupportedException() { return new NotSupportedException(); } + // // Enable use of ThrowHelper from TryFormat() routines without introducing dozens of non-code-coveraged "bytesWritten = 0; return false" boilerplate. // @@ -96,19 +120,72 @@ namespace System ThrowHelper.ThrowFormatException_BadFormatSpecifier(); return false; } + + // + // ReadOnlySequence .ctor validation Throws coalesced to enable inlining of the .ctor + // + public static void ThrowArgumentValidationException(ReadOnlySequenceSegment startSegment, int startIndex, ReadOnlySequenceSegment endSegment) + => throw CreateArgumentValidationException(startSegment, startIndex, endSegment); + + private static Exception CreateArgumentValidationException(ReadOnlySequenceSegment startSegment, int startIndex, ReadOnlySequenceSegment endSegment) + { + if (startSegment == null) + return CreateArgumentNullException(ExceptionArgument.startSegment); + else if (endSegment == null) + return CreateArgumentNullException(ExceptionArgument.endSegment); + else if (startSegment != endSegment && startSegment.RunningIndex > endSegment.RunningIndex) + return CreateArgumentOutOfRangeException(ExceptionArgument.endSegment); + else if ((uint)startSegment.Memory.Length < (uint)startIndex) + return CreateArgumentOutOfRangeException(ExceptionArgument.startIndex); + else + return CreateArgumentOutOfRangeException(ExceptionArgument.endIndex); + } + + public static void ThrowArgumentValidationException(Array array, int start) + => throw CreateArgumentValidationException(array, start); + + private static Exception CreateArgumentValidationException(Array array, int start) + { + if (array == null) + return CreateArgumentNullException(ExceptionArgument.array); + else if ((uint)start > (uint)array.Length) + return CreateArgumentOutOfRangeException(ExceptionArgument.start); + else + return CreateArgumentOutOfRangeException(ExceptionArgument.length); + } + + // + // ReadOnlySequence Slice validation Throws coalesced to enable inlining of the Slice + // + public static void ThrowStartOrEndArgumentValidationException(long start) + => throw CreateStartOrEndArgumentValidationException(start); + + private static Exception CreateStartOrEndArgumentValidationException(long start) + { + if (start < 0) + return CreateArgumentOutOfRangeException(ExceptionArgument.start); + return CreateArgumentOutOfRangeException(ExceptionArgument.length); + } + } #if !MONO internal enum ExceptionArgument { - array, length, start, - text, - obj, - ownedMemory, - pointer, + minimumBufferSize, + elementIndex, comparable, - comparer + comparer, + destination, + offset, + startSegment, + endSegment, + startIndex, + endIndex, + array, + culture, + manager } #endif } diff --git a/external/corefx/src/System.Memory/tests/Base64/Base64DecoderUnitTests.cs b/external/corefx/src/System.Memory/tests/Base64/Base64DecoderUnitTests.cs index 15a6733060..3c159ddee4 100644 --- a/external/corefx/src/System.Memory/tests/Base64/Base64DecoderUnitTests.cs +++ b/external/corefx/src/System.Memory/tests/Base64/Base64DecoderUnitTests.cs @@ -410,7 +410,7 @@ namespace System.Buffers.Text.Tests for (int value = 0; value < 256; value++) { - Span sourceBytes = testBytes.AsSpan().Slice(0, value + 1); + Span sourceBytes = testBytes.AsSpan(0, value + 1); Span buffer = new byte[Base64.GetMaxEncodedToUtf8Length(sourceBytes.Length)]; Assert.Equal(OperationStatus.Done, Base64.EncodeToUtf8(sourceBytes, buffer, out int consumed, out int written)); diff --git a/external/corefx/src/System.Memory/tests/Base64/Base64EncoderUnitTests.cs b/external/corefx/src/System.Memory/tests/Base64/Base64EncoderUnitTests.cs index c3f5335106..1628f17257 100644 --- a/external/corefx/src/System.Memory/tests/Base64/Base64EncoderUnitTests.cs +++ b/external/corefx/src/System.Memory/tests/Base64/Base64EncoderUnitTests.cs @@ -2,6 +2,7 @@ // 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.SpanTests; using System.Text; using Xunit; @@ -20,7 +21,7 @@ namespace System.Buffers.Text.Tests for (int value = 0; value < 256; value++) { - Span sourceBytes = bytes.AsSpan().Slice(0, value + 1); + Span sourceBytes = bytes.AsSpan(0, value + 1); Span encodedBytes = new byte[Base64.GetMaxEncodedToUtf8Length(sourceBytes.Length)]; Assert.Equal(OperationStatus.Done, Base64.EncodeToUtf8(sourceBytes, encodedBytes, out int consumed, out int encodedBytesCount)); Assert.Equal(sourceBytes.Length, consumed); @@ -75,20 +76,44 @@ namespace System.Buffers.Text.Tests [OuterLoop] public void EncodeTooLargeSpan() { + + if (IntPtr.Size < 8) + return; + + bool allocatedFirst = false; + bool allocatedSecond = false; + IntPtr memBlockFirst = IntPtr.Zero; + IntPtr memBlockSecond = IntPtr.Zero; + // int.MaxValue - (int.MaxValue % 4) => 2147483644, largest multiple of 4 less than int.MaxValue // CLR default limit of 2 gigabytes (GB). + // 1610612734, larger than MaximumEncodeLength, requires output buffer of size 2147483648 (which is > int.MaxValue) + const int sourceCount = (int.MaxValue >> 2) * 3 + 1; + const int encodedCount = 2000000000; + try { - // 1610612734, larger than MaximumEncodeLength, requires output buffer of size 2147483648 (which is > int.MaxValue) - Span source = new byte[(int.MaxValue >> 2) * 3 + 1]; - Span encodedBytes = new byte[2000000000]; - Assert.Equal(OperationStatus.DestinationTooSmall, Base64.EncodeToUtf8(source, encodedBytes, out int consumed, out int encodedBytesCount)); - Assert.Equal((encodedBytes.Length >> 2) * 3, consumed); // encoding 1500000000 bytes fits into buffer of 2000000000 bytes - Assert.Equal(encodedBytes.Length, encodedBytesCount); + allocatedFirst = AllocationHelper.TryAllocNative((IntPtr)sourceCount, out memBlockFirst); + allocatedSecond = AllocationHelper.TryAllocNative((IntPtr)encodedCount, out memBlockSecond); + if (allocatedFirst && allocatedSecond) + { + unsafe + { + var source = new Span(memBlockFirst.ToPointer(), sourceCount); + var encodedBytes = new Span(memBlockSecond.ToPointer(), encodedCount); + + Assert.Equal(OperationStatus.DestinationTooSmall, Base64.EncodeToUtf8(source, encodedBytes, out int consumed, out int encodedBytesCount)); + Assert.Equal((encodedBytes.Length >> 2) * 3, consumed); // encoding 1500000000 bytes fits into buffer of 2000000000 bytes + Assert.Equal(encodedBytes.Length, encodedBytesCount); + } + } } - catch (OutOfMemoryException) + finally { - // do nothing + if (allocatedFirst) + AllocationHelper.ReleaseNative(ref memBlockFirst); + if (allocatedSecond) + AllocationHelper.ReleaseNative(ref memBlockSecond); } } diff --git a/external/corefx/src/System.Memory/tests/Binary/BinaryReaderUnitTests.cs b/external/corefx/src/System.Memory/tests/Binary/BinaryReaderUnitTests.cs index 7a3bc0d4c0..92db3ff275 100644 --- a/external/corefx/src/System.Memory/tests/Binary/BinaryReaderUnitTests.cs +++ b/external/corefx/src/System.Memory/tests/Binary/BinaryReaderUnitTests.cs @@ -24,12 +24,12 @@ namespace System.Buffers.Binary.Tests span = new Span(&value, 8); } - Assert.Equal(0x11, ReadMachineEndian(span)); - Assert.True(TryReadMachineEndian(span, out byte byteValue)); + Assert.Equal(0x11, MemoryMarshal.Read(span)); + Assert.True(MemoryMarshal.TryRead(span, out byte byteValue)); Assert.Equal(0x11, byteValue); - Assert.Equal(0x11, ReadMachineEndian(span)); - Assert.True(TryReadMachineEndian(span, out byte sbyteValue)); + Assert.Equal(0x11, MemoryMarshal.Read(span)); + Assert.True(MemoryMarshal.TryRead(span, out byte sbyteValue)); Assert.Equal(0x11, byteValue); Assert.Equal(0x1122, ReadUInt16BigEndian(span)); @@ -93,12 +93,12 @@ namespace System.Buffers.Binary.Tests span = new ReadOnlySpan(&value, 8); } - Assert.Equal(0x11, ReadMachineEndian(span)); - Assert.True(TryReadMachineEndian(span, out byte byteValue)); + Assert.Equal(0x11, MemoryMarshal.Read(span)); + Assert.True(MemoryMarshal.TryRead(span, out byte byteValue)); Assert.Equal(0x11, byteValue); - Assert.Equal(0x11, ReadMachineEndian(span)); - Assert.True(TryReadMachineEndian(span, out byte sbyteValue)); + Assert.Equal(0x11, MemoryMarshal.Read(span)); + Assert.True(MemoryMarshal.TryRead(span, out byte sbyteValue)); Assert.Equal(0x11, byteValue); Assert.Equal(0x1122, ReadUInt16BigEndian(span)); @@ -155,27 +155,27 @@ namespace System.Buffers.Binary.Tests { Span span = new byte[] { 1 }; - Assert.Equal(1, ReadMachineEndian(span)); - Assert.True(TryReadMachineEndian(span, out byte byteValue)); + Assert.Equal(1, MemoryMarshal.Read(span)); + Assert.True(MemoryMarshal.TryRead(span, out byte byteValue)); Assert.Equal(1, byteValue); - TestHelpers.AssertThrows(span, (_span) => ReadMachineEndian(_span)); - Assert.False(TryReadMachineEndian(span, out short shortValue)); - TestHelpers.AssertThrows(span, (_span) => ReadMachineEndian(_span)); - Assert.False(TryReadMachineEndian(span, out int intValue)); - TestHelpers.AssertThrows(span, (_span) => ReadMachineEndian(_span)); - Assert.False(TryReadMachineEndian(span, out long longValue)); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Read(_span)); + Assert.False(MemoryMarshal.TryRead(span, out short shortValue)); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Read(_span)); + Assert.False(MemoryMarshal.TryRead(span, out int intValue)); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Read(_span)); + Assert.False(MemoryMarshal.TryRead(span, out long longValue)); - TestHelpers.AssertThrows(span, (_span) => ReadMachineEndian(_span)); - Assert.False(TryReadMachineEndian(span, out ushort ushortValue)); - TestHelpers.AssertThrows(span, (_span) => ReadMachineEndian(_span)); - Assert.False(TryReadMachineEndian(span, out uint uintValue)); - TestHelpers.AssertThrows(span, (_span) => ReadMachineEndian(_span)); - Assert.False(TryReadMachineEndian(span, out ulong ulongValue)); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Read(_span)); + Assert.False(MemoryMarshal.TryRead(span, out ushort ushortValue)); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Read(_span)); + Assert.False(MemoryMarshal.TryRead(span, out uint uintValue)); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Read(_span)); + Assert.False(MemoryMarshal.TryRead(span, out ulong ulongValue)); Span largeSpan = new byte[100]; - TestHelpers.AssertThrows(largeSpan, (_span) => ReadMachineEndian(_span)); - TestHelpers.AssertThrows(largeSpan, (_span) => TryReadMachineEndian(_span, out TestHelpers.TestValueTypeWithReference stringValue)); + TestHelpers.AssertThrows(largeSpan, (_span) => MemoryMarshal.Read(_span)); + TestHelpers.AssertThrows(largeSpan, (_span) => MemoryMarshal.TryRead(_span, out TestHelpers.TestValueTypeWithReference stringValue)); } [Fact] @@ -183,27 +183,27 @@ namespace System.Buffers.Binary.Tests { ReadOnlySpan span = new byte[] { 1 }; - Assert.Equal(1, ReadMachineEndian(span)); - Assert.True(TryReadMachineEndian(span, out byte byteValue)); + Assert.Equal(1, MemoryMarshal.Read(span)); + Assert.True(MemoryMarshal.TryRead(span, out byte byteValue)); Assert.Equal(1, byteValue); - TestHelpers.AssertThrows(span, (_span) => ReadMachineEndian(_span)); - Assert.False(TryReadMachineEndian(span, out short shortValue)); - TestHelpers.AssertThrows(span, (_span) => ReadMachineEndian(_span)); - Assert.False(TryReadMachineEndian(span, out int intValue)); - TestHelpers.AssertThrows(span, (_span) => ReadMachineEndian(_span)); - Assert.False(TryReadMachineEndian(span, out long longValue)); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Read(_span)); + Assert.False(MemoryMarshal.TryRead(span, out short shortValue)); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Read(_span)); + Assert.False(MemoryMarshal.TryRead(span, out int intValue)); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Read(_span)); + Assert.False(MemoryMarshal.TryRead(span, out long longValue)); - TestHelpers.AssertThrows(span, (_span) => ReadMachineEndian(_span)); - Assert.False(TryReadMachineEndian(span, out ushort ushortValue)); - TestHelpers.AssertThrows(span, (_span) => ReadMachineEndian(_span)); - Assert.False(TryReadMachineEndian(span, out uint uintValue)); - TestHelpers.AssertThrows(span, (_span) => ReadMachineEndian(_span)); - Assert.False(TryReadMachineEndian(span, out ulong ulongValue)); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Read(_span)); + Assert.False(MemoryMarshal.TryRead(span, out ushort ushortValue)); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Read(_span)); + Assert.False(MemoryMarshal.TryRead(span, out uint uintValue)); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Read(_span)); + Assert.False(MemoryMarshal.TryRead(span, out ulong ulongValue)); ReadOnlySpan largeSpan = new byte[100]; - TestHelpers.AssertThrows(largeSpan, (_span) => ReadMachineEndian(_span)); - TestHelpers.AssertThrows(largeSpan, (_span) => TryReadMachineEndian(_span, out TestHelpers.TestValueTypeWithReference stringValue)); + TestHelpers.AssertThrows(largeSpan, (_span) => MemoryMarshal.Read(_span)); + TestHelpers.AssertThrows(largeSpan, (_span) => MemoryMarshal.TryRead(_span, out TestHelpers.TestValueTypeWithReference stringValue)); } [Fact] @@ -375,7 +375,7 @@ namespace System.Buffers.Binary.Tests ReadOnlySpan readOnlySpanBE = new ReadOnlySpan(spanBE.ToArray()); - TestHelpers.TestStructExplicit readStructAndReverse = ReadMachineEndian(spanBE); + TestHelpers.TestStructExplicit readStructAndReverse = MemoryMarshal.Read(spanBE); if (BitConverter.IsLittleEndian) { readStructAndReverse.S0 = ReverseEndianness(readStructAndReverse.S0); @@ -408,7 +408,7 @@ namespace System.Buffers.Binary.Tests UL1 = ReadUInt64BigEndian(spanBE.Slice(48)) }; - TestHelpers.TestStructExplicit readStructAndReverseFromReadOnlySpan = ReadMachineEndian(readOnlySpanBE); + TestHelpers.TestStructExplicit readStructAndReverseFromReadOnlySpan = MemoryMarshal.Read(readOnlySpanBE); if (BitConverter.IsLittleEndian) { readStructAndReverseFromReadOnlySpan.S0 = ReverseEndianness(readStructAndReverseFromReadOnlySpan.S0); diff --git a/external/corefx/src/System.Memory/tests/Binary/BinaryWriterUnitTests.cs b/external/corefx/src/System.Memory/tests/Binary/BinaryWriterUnitTests.cs index efd6d2be2f..766fc521f2 100644 --- a/external/corefx/src/System.Memory/tests/Binary/BinaryWriterUnitTests.cs +++ b/external/corefx/src/System.Memory/tests/Binary/BinaryWriterUnitTests.cs @@ -2,6 +2,7 @@ // 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.Runtime.InteropServices; using Xunit; using static System.Buffers.Binary.BinaryPrimitives; @@ -18,51 +19,51 @@ namespace System.Buffers.Binary.Tests Span span = new byte[8]; byte byteValue = 0x11; - WriteMachineEndian(span, ref byteValue); + MemoryMarshal.Write(span, ref byteValue); TestHelpers.Validate(span, byteValue); - Assert.True(TryWriteMachineEndian(span, ref byteValue)); + Assert.True(MemoryMarshal.TryWrite(span, ref byteValue)); TestHelpers.Validate(span, byteValue); sbyte sbyteValue = 0x11; - WriteMachineEndian(span, ref sbyteValue); + MemoryMarshal.Write(span, ref sbyteValue); TestHelpers.Validate(span, sbyteValue); - Assert.True(TryWriteMachineEndian(span, ref sbyteValue)); + Assert.True(MemoryMarshal.TryWrite(span, ref sbyteValue)); TestHelpers.Validate(span, sbyteValue); ushort ushortValue = 0x1122; - WriteMachineEndian(span, ref ushortValue); + MemoryMarshal.Write(span, ref ushortValue); TestHelpers.Validate(span, ushortValue); - Assert.True(TryWriteMachineEndian(span, ref ushortValue)); + Assert.True(MemoryMarshal.TryWrite(span, ref ushortValue)); TestHelpers.Validate(span, ushortValue); uint uintValue = 0x11223344; - WriteMachineEndian(span, ref uintValue); + MemoryMarshal.Write(span, ref uintValue); TestHelpers.Validate(span, uintValue); - Assert.True(TryWriteMachineEndian(span, ref uintValue)); + Assert.True(MemoryMarshal.TryWrite(span, ref uintValue)); TestHelpers.Validate(span, uintValue); ulong ulongValue = 0x1122334455667788; - WriteMachineEndian(span, ref ulongValue); + MemoryMarshal.Write(span, ref ulongValue); TestHelpers.Validate(span, ulongValue); - Assert.True(TryWriteMachineEndian(span, ref ulongValue)); + Assert.True(MemoryMarshal.TryWrite(span, ref ulongValue)); TestHelpers.Validate(span, ulongValue); short shortValue = 0x1122; - WriteMachineEndian(span, ref shortValue); + MemoryMarshal.Write(span, ref shortValue); TestHelpers.Validate(span, shortValue); - Assert.True(TryWriteMachineEndian(span, ref shortValue)); + Assert.True(MemoryMarshal.TryWrite(span, ref shortValue)); TestHelpers.Validate(span, shortValue); int intValue = 0x11223344; - WriteMachineEndian(span, ref intValue); + MemoryMarshal.Write(span, ref intValue); TestHelpers.Validate(span, intValue); - Assert.True(TryWriteMachineEndian(span, ref intValue)); + Assert.True(MemoryMarshal.TryWrite(span, ref intValue)); TestHelpers.Validate(span, intValue); long longValue = 0x1122334455667788; - WriteMachineEndian(span, ref longValue); + MemoryMarshal.Write(span, ref longValue); TestHelpers.Validate(span, longValue); - Assert.True(TryWriteMachineEndian(span, ref longValue)); + Assert.True(MemoryMarshal.TryWrite(span, ref longValue)); TestHelpers.Validate(span, longValue); } @@ -270,41 +271,41 @@ namespace System.Buffers.Binary.Tests Span span = new byte[1]; - WriteMachineEndian(span, ref byteValue); - byte read = ReadMachineEndian(span); + MemoryMarshal.Write(span, ref byteValue); + byte read = MemoryMarshal.Read(span); Assert.Equal(byteValue, read); span.Clear(); - Assert.True(TryWriteMachineEndian(span, ref byteValue)); - read = ReadMachineEndian(span); + Assert.True(MemoryMarshal.TryWrite(span, ref byteValue)); + read = MemoryMarshal.Read(span); Assert.Equal(byteValue, read); - WriteMachineEndian(span, ref sbyteValue); - sbyte readSbyte = ReadMachineEndian(span); + MemoryMarshal.Write(span, ref sbyteValue); + sbyte readSbyte = MemoryMarshal.Read(span); Assert.Equal(sbyteValue, readSbyte); span.Clear(); - Assert.True(TryWriteMachineEndian(span, ref sbyteValue)); - readSbyte = ReadMachineEndian(span); + Assert.True(MemoryMarshal.TryWrite(span, ref sbyteValue)); + readSbyte = MemoryMarshal.Read(span); Assert.Equal(sbyteValue, readSbyte); - TestHelpers.AssertThrows(span, (_span) => WriteMachineEndian(_span, ref shortValue)); - Assert.False(TryWriteMachineEndian(span, ref shortValue)); - TestHelpers.AssertThrows(span, (_span) => WriteMachineEndian(_span, ref intValue)); - Assert.False(TryWriteMachineEndian(span, ref intValue)); - TestHelpers.AssertThrows(span, (_span) => WriteMachineEndian(_span, ref longValue)); - Assert.False(TryWriteMachineEndian(span, ref longValue)); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Write(_span, ref shortValue)); + Assert.False(MemoryMarshal.TryWrite(span, ref shortValue)); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Write(_span, ref intValue)); + Assert.False(MemoryMarshal.TryWrite(span, ref intValue)); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Write(_span, ref longValue)); + Assert.False(MemoryMarshal.TryWrite(span, ref longValue)); - TestHelpers.AssertThrows(span, (_span) => WriteMachineEndian(_span, ref ushortValue)); - Assert.False(TryWriteMachineEndian(span, ref ushortValue)); - TestHelpers.AssertThrows(span, (_span) => WriteMachineEndian(_span, ref uintValue)); - Assert.False(TryWriteMachineEndian(span, ref uintValue)); - TestHelpers.AssertThrows(span, (_span) => WriteMachineEndian(_span, ref ulongValue)); - Assert.False(TryWriteMachineEndian(span, ref ulongValue)); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Write(_span, ref ushortValue)); + Assert.False(MemoryMarshal.TryWrite(span, ref ushortValue)); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Write(_span, ref uintValue)); + Assert.False(MemoryMarshal.TryWrite(span, ref uintValue)); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Write(_span, ref ulongValue)); + Assert.False(MemoryMarshal.TryWrite(span, ref ulongValue)); var structValue = new TestHelpers.TestValueTypeWithReference { I = 1, S = "1" }; - TestHelpers.AssertThrows(span, (_span) => WriteMachineEndian(_span, ref structValue)); - TestHelpers.AssertThrows(span, (_span) => TryWriteMachineEndian(_span, ref structValue)); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Write(_span, ref structValue)); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.TryWrite(_span, ref structValue)); } } } diff --git a/external/corefx/src/System.Memory/tests/Configurations.props b/external/corefx/src/System.Memory/tests/Configurations.props index 78953dfc88..30b6227d79 100644 --- a/external/corefx/src/System.Memory/tests/Configurations.props +++ b/external/corefx/src/System.Memory/tests/Configurations.props @@ -3,6 +3,8 @@ netstandard; + netcoreapp; + uap; diff --git a/external/corefx/src/System.Memory/tests/Memory/AsMemory.cs b/external/corefx/src/System.Memory/tests/Memory/AsMemory.cs new file mode 100644 index 0000000000..b6d1653bbf --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Memory/AsMemory.cs @@ -0,0 +1,122 @@ +// 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 Xunit; + +namespace System.MemoryTests +{ + public static class AsMemory + { + [Theory] + [InlineData(0, 0)] + [InlineData(3, 0)] + [InlineData(3, 1)] + [InlineData(3, 2)] + [InlineData(3, 3)] + [InlineData(10, 0)] + [InlineData(10, 3)] + [InlineData(10, 10)] + public static void ArrayAsMemoryWithStart(int length, int start) + { + int[] a = new int[length]; + Memory m = a.AsMemory(start); + Assert.Equal(length - start, m.Length); + if (start != length) + { + m.Span[0] = 42; + Assert.Equal(42, a[start]); + } + } + + [Theory] + [InlineData(0, 0)] + [InlineData(3, 0)] + [InlineData(3, 1)] + [InlineData(3, 2)] + [InlineData(3, 3)] + [InlineData(10, 0)] + [InlineData(10, 3)] + [InlineData(10, 10)] + public static void ArraySegmentAsMemoryWithStart(int length, int start) + { + const int segmentOffset = 5; + + int[] a = new int[length + segmentOffset]; + ArraySegment segment = new ArraySegment(a, 5, length); + Memory m = segment.AsMemory(start); + Assert.Equal(length - start, m.Length); + if (m.Length != 0) + { + m.Span[0] = 42; + Assert.Equal(42, a[segmentOffset + start]); + } + } + + [Theory] + [InlineData(0, 0, 0)] + [InlineData(3, 0, 3)] + [InlineData(3, 1, 2)] + [InlineData(3, 2, 1)] + [InlineData(3, 3, 0)] + [InlineData(10, 0, 5)] + [InlineData(10, 3, 2)] + public static void ArrayAsMemoryWithStartAndLength(int length, int start, int subLength) + { + int[] a = new int[length]; + Memory m = a.AsMemory(start, subLength); + Assert.Equal(subLength, m.Length); + if (subLength != 0) + { + m.Span[0] = 42; + Assert.Equal(42, a[start]); + } + } + + [Theory] + [InlineData(0, 0, 0)] + [InlineData(3, 0, 3)] + [InlineData(3, 1, 2)] + [InlineData(3, 2, 1)] + [InlineData(3, 3, 0)] + [InlineData(10, 0, 5)] + [InlineData(10, 3, 2)] + public static void ArraySegmentAsMemoryWithStartAndLength(int length, int start, int subLength) + { + const int segmentOffset = 5; + + int[] a = new int[length + segmentOffset]; + ArraySegment segment = new ArraySegment(a, segmentOffset, length); + Memory m = segment.AsMemory(start, subLength); + Assert.Equal(subLength, m.Length); + if (subLength != 0) + { + m.Span[0] = 42; + Assert.Equal(42, a[segmentOffset + start]); + } + } + + [Theory] + [InlineData(0, -1)] + [InlineData(0, 1)] + [InlineData(5, 6)] + public static void ArrayAsMemoryWithStartNegative(int length, int start) + { + int[] a = new int[length]; + Assert.Throws(() => a.AsMemory(start)); + } + + [Theory] + [InlineData(0, -1, 0)] + [InlineData(0, 1, 0)] + [InlineData(0, 0, -1)] + [InlineData(0, 0, 1)] + [InlineData(5, 6, 0)] + [InlineData(5, 3, 3)] + public static void ArrayAsMemoryWithStartAndLengthNegative(int length, int start, int subLength) + { + int[] a = new int[length]; + Assert.Throws(() => a.AsMemory(start, subLength)); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/Memory/AsReadOnlyMemory.cs b/external/corefx/src/System.Memory/tests/Memory/AsReadOnlyMemory.cs deleted file mode 100644 index 60eba35496..0000000000 --- a/external/corefx/src/System.Memory/tests/Memory/AsReadOnlyMemory.cs +++ /dev/null @@ -1,28 +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 Xunit; - -namespace System.MemoryTests -{ - public static class AsReadOnlyMemory - { - [Fact] - public static void EmptyMemoryAsReadOnlyMemory() - { - Memory memory = default; - Assert.True(memory.AsReadOnlyMemory().IsEmpty); - } - - [Fact] - public static void MemoryAsReadOnlyMemory() - { - int[] a = { 19, -17 }; - Memory memory = new Memory(a); - ReadOnlyMemory readOnlyMemory = memory.AsReadOnlyMemory(); - - readOnlyMemory.Validate(a); - } - } -} diff --git a/external/corefx/src/System.Memory/tests/Memory/CtorArray.cs b/external/corefx/src/System.Memory/tests/Memory/CtorArray.cs index d5b153768f..fe60e41ffb 100644 --- a/external/corefx/src/System.Memory/tests/Memory/CtorArray.cs +++ b/external/corefx/src/System.Memory/tests/Memory/CtorArray.cs @@ -71,8 +71,22 @@ namespace System.MemoryTests [Fact] public static void CtorArrayNullArray() { - Assert.Throws(() => new Memory(null)); - Assert.Throws(() => new Memory(null, 0, 0)); + var memory = new Memory(null); + memory.Validate(); + Assert.Equal(default, memory); + + memory = new Memory((int[])null, 0, 0); + memory.Validate(); + Assert.Equal(default, memory); + } + + [Fact] + public static void CtorArrayNullArrayNonZeroStartAndLength() + { + Assert.Throws(() => new Memory((int[])null, 1, 0)); + Assert.Throws(() => new Memory((int[])null, 0, 1)); + Assert.Throws(() => new Memory((int[])null, 1, 1)); + Assert.Throws(() => new Memory((int[])null, -1, -1)); } [Fact] diff --git a/external/corefx/src/System.Memory/tests/Memory/CustomMemoryForTest.cs b/external/corefx/src/System.Memory/tests/Memory/CustomMemoryForTest.cs index c8180303ee..7decf00aeb 100644 --- a/external/corefx/src/System.Memory/tests/Memory/CustomMemoryForTest.cs +++ b/external/corefx/src/System.Memory/tests/Memory/CustomMemoryForTest.cs @@ -9,52 +9,70 @@ using System.Threading; namespace System.MemoryTests { - public class CustomMemoryForTest : OwnedMemory + public class CustomMemoryForTest : MemoryManager { private bool _disposed; private int _referenceCount; private int _noReferencesCalledCount; private T[] _array; + private readonly int _offset; + private readonly int _length; - public CustomMemoryForTest(T[] array) + public CustomMemoryForTest(T[] array) : this(array, 0, array.Length) + { + } + + public CustomMemoryForTest(T[] array, int offset, int length) { _array = array; + _offset = offset; + _length = length; } public int OnNoRefencesCalledCount => _noReferencesCalledCount; - public override int Length => _array.Length; + public bool IsDisposed => _disposed; - public override bool IsDisposed => _disposed; + protected bool IsRetained => _referenceCount > 0; - protected override bool IsRetained => _referenceCount > 0; - - public override Span Span - { - get - { - if (IsDisposed) - throw new ObjectDisposedException(nameof(CustomMemoryForTest)); - return new Span(_array, 0, _array.Length); - } - } - - public override MemoryHandle Pin(int offset = 0) - { - unsafe - { - Retain(); - if (offset < 0 || offset > _array.Length) throw new ArgumentOutOfRangeException(nameof(offset)); - var handle = GCHandle.Alloc(_array, GCHandleType.Pinned); - return new MemoryHandle(this, Unsafe.Add((void*)handle.AddrOfPinnedObject(), offset), handle); - } - } - - protected override bool TryGetArray(out ArraySegment arraySegment) + public override Span GetSpan() { if (IsDisposed) throw new ObjectDisposedException(nameof(CustomMemoryForTest)); - arraySegment = new ArraySegment(_array); + return new Span(_array, _offset, _length); + } + + public override MemoryHandle Pin(int elementIndex = 0) + { + unsafe + { + if (IsDisposed) + throw new ObjectDisposedException(nameof(CustomMemoryForTest)); + Interlocked.Increment(ref _referenceCount); + + try + { + if ((uint)elementIndex > (uint)(_array.Length - _offset)) + { + throw new ArgumentOutOfRangeException(nameof(elementIndex)); + } + + var handle = GCHandle.Alloc(_array, GCHandleType.Pinned); + return new MemoryHandle(Unsafe.Add((void*)handle.AddrOfPinnedObject(), _offset + elementIndex), handle, this); + } + catch + { + Unpin(); + throw; + } + } + } + + protected override bool TryGetArray(out ArraySegment segment) + { + if (IsDisposed) + throw new ObjectDisposedException(nameof(CustomMemoryForTest)); + segment = new ArraySegment(_array, _offset, _length); return true; } @@ -72,14 +90,7 @@ namespace System.MemoryTests } - public override void Retain() - { - if (IsDisposed) - throw new ObjectDisposedException(nameof(CustomMemoryForTest)); - Interlocked.Increment(ref _referenceCount); - } - - public override bool Release() + public override void Unpin() { int newRefCount = Interlocked.Decrement(ref _referenceCount); @@ -89,10 +100,12 @@ namespace System.MemoryTests if (newRefCount == 0) { _noReferencesCalledCount++; - return false; } - return true; } + + public Memory CreateMemoryForTest(int length) => CreateMemory(length); + + public Memory CreateMemoryForTest(int start, int length) => CreateMemory(start, length); } } diff --git a/external/corefx/src/System.Memory/tests/Memory/MemoryManager.cs b/external/corefx/src/System.Memory/tests/Memory/MemoryManager.cs new file mode 100644 index 0000000000..aa007bd8fa --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Memory/MemoryManager.cs @@ -0,0 +1,171 @@ +// 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; +using Xunit; + +namespace System.MemoryTests +{ + // + // Tests for Memory.ctor(MemoryManager, int , int) + // + public static partial class MemoryTests + { + [Fact] + public static void MemoryFromMemoryManagerInt() + { + int[] a = { 91, 92, -93, 94 }; + MemoryManager manager = new CustomMemoryForTest(a); + Memory memory = manager.Memory; + memory.Validate(91, 92, -93, 94); + memory.Slice(0, 4).Validate(91, 92, -93, 94); + memory.Slice(1, 0).Validate(); + memory.Slice(1, 1).Validate(92); + memory.Slice(1, 2).Validate(92, -93); + memory.Slice(2, 2).Validate(-93, 94); + memory.Slice(4, 0).Validate(); + } + + [Fact] + public static void MemoryManagerMemoryCtorInvalid() + { + int[] a = { 91, 92, -93, 94 }; + CustomMemoryForTest manager = new CustomMemoryForTest(a); + + Assert.Throws(() => manager.Memory.Slice(a.Length + 1)); + Assert.Throws(() => manager.Memory.Slice(0, a.Length + 1)); + Assert.Throws(() => manager.Memory.Slice(a.Length + 1, 0)); + Assert.Throws(() => manager.Memory.Slice(1, a.Length)); + + Assert.Throws(() => manager.CreateMemoryForTest(-1)); + Assert.Throws(() => manager.CreateMemoryForTest(0, -1)); + Assert.Throws(() => manager.CreateMemoryForTest(-1, 0)); + Assert.Throws(() => manager.CreateMemoryForTest(-1, -1)); + } + + [Fact] + public static void ReadOnlyMemoryFromMemoryFromMemoryManagerInt() + { + int[] a = { 91, 92, -93, 94 }; + MemoryManager manager = new CustomMemoryForTest(a); + ReadOnlyMemory readOnlyMemory = manager.Memory; + readOnlyMemory.Validate(91, 92, -93, 94); + readOnlyMemory.Slice(0, 4).Validate(91, 92, -93, 94); + readOnlyMemory.Slice(1, 0).Validate(); + readOnlyMemory.Slice(1, 1).Validate(92); + readOnlyMemory.Slice(1, 2).Validate(92, -93); + readOnlyMemory.Slice(2, 2).Validate(-93, 94); + readOnlyMemory.Slice(4, 0).Validate(); + } + + [Fact] + public static void MemoryFromMemoryManagerLong() + { + long[] a = { 91, -92, 93, 94, -95 }; + MemoryManager manager = new CustomMemoryForTest(a); + Memory memory = manager.Memory; + memory.Validate(91, -92, 93, 94, -95); + memory.Slice(0, 5).Validate(91, -92, 93, 94, -95); + memory.Slice(1, 0).Validate(); + memory.Slice(1, 1).Validate(-92); + memory.Slice(1, 2).Validate(-92, 93); + memory.Slice(2, 3).Validate(93, 94, -95); + memory.Slice(5, 0).Validate(); + } + + [Fact] + public static void MemoryFromMemoryManagerObject() + { + object o1 = new object(); + object o2 = new object(); + object[] a = { o1, o2 }; + MemoryManager manager = new CustomMemoryForTest(a); + Memory memory = manager.Memory; + memory.ValidateReferenceType(o1, o2); + } + + [Fact] + public static void ImplicitReadOnlyMemoryFromMemoryManager() + { + long[] a = { 91, -92, 93, 94, -95 }; + MemoryManager manager = new CustomMemoryForTest(a); + Memory memory = manager.Memory; + CastReadOnly(memory, 91, -92, 93, 94, -95); + } + + [Fact] + public static void MemoryManagerDispose() + { + int[] a = { 91, 92, -93, 94 }; + CustomMemoryForTest manager; + using (manager = new CustomMemoryForTest(a)) + { + Assert.False(manager.IsDisposed); + } + Assert.True(manager.IsDisposed); + } + + [Fact] + public static void MemoryManagerPinEmptyArray() + { + int[] a = { }; + MemoryManager manager = new CustomMemoryForTest(a); + MemoryHandle handle = manager.Pin(); + unsafe + { + Assert.True(handle.Pointer != null); + } + } + + [Fact] + public static void MemoryManagerPinArray() + { + int[] array = { 1, 2, 3, 4, 5 }; + MemoryManager manager = new CustomMemoryForTest(array); + MemoryHandle handle = manager.Pin(); + unsafe + { + int* pointer = (int*)handle.Pointer; + Assert.True(pointer != null); + + GC.Collect(); + + for (int i = 0; i < manager.Memory.Length; i++) + { + Assert.Equal(array[i], pointer[i]); + } + } + handle.Dispose(); + } + + [Fact] + [OuterLoop] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Desktop framework doesn't support large arrays by default.")] + public static void MemoryManagerPinLargeArray() + { + // Early-out: we can only run this test on 64-bit platforms. + if (IntPtr.Size == 4) + { + return; + } + + int[] array = new int[0x2000_0000]; // will produce array with total byte length > 2 GB + MemoryManager manager = new CustomMemoryForTest(array); + Assert.Throws(() => manager.Pin(int.MinValue)); + } + + [Fact] + public static void SpanFromMemoryManagerAfterDispose() + { + int[] a = { 91, 92, -93, 94 }; + MemoryManager manager; + using (manager = new CustomMemoryForTest(a)) + { + + } + Assert.Throws(() => manager.GetSpan()); + } + } +} + diff --git a/external/corefx/src/System.Memory/tests/Memory/OwnedMemory.cs b/external/corefx/src/System.Memory/tests/Memory/OwnedMemory.cs deleted file mode 100644 index e1249ed0cf..0000000000 --- a/external/corefx/src/System.Memory/tests/Memory/OwnedMemory.cs +++ /dev/null @@ -1,152 +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; -using Xunit; - -namespace System.MemoryTests -{ - // - // Tests for internal Memory.ctor(OwnedMemory, int , int) - // - public static partial class MemoryTests - { - [Fact] - public static void MemoryFromOwnedMemoryInt() - { - int[] a = { 91, 92, -93, 94 }; - OwnedMemory owner = new CustomMemoryForTest(a); - Memory memory = owner.Memory; - memory.Validate(91, 92, -93, 94); - memory.Slice(0, 4).Validate(91, 92, -93, 94); - memory.Slice(1, 0).Validate(); - memory.Slice(1, 1).Validate(92); - memory.Slice(1, 2).Validate(92, -93); - memory.Slice(2, 2).Validate(-93, 94); - memory.Slice(4, 0).Validate(); - } - - [Fact] - public static void ReadOnlyMemoryFromMemoryFromOwnedMemoryInt() - { - int[] a = { 91, 92, -93, 94 }; - OwnedMemory owner = new CustomMemoryForTest(a); - ReadOnlyMemory readOnlyMemory = owner.Memory; - readOnlyMemory.Validate(91, 92, -93, 94); - readOnlyMemory.Slice(0, 4).Validate(91, 92, -93, 94); - readOnlyMemory.Slice(1, 0).Validate(); - readOnlyMemory.Slice(1, 1).Validate(92); - readOnlyMemory.Slice(1, 2).Validate(92, -93); - readOnlyMemory.Slice(2, 2).Validate(-93, 94); - readOnlyMemory.Slice(4, 0).Validate(); - } - - [Fact] - public static void MemoryFromOwnedMemoryLong() - { - long[] a = { 91, -92, 93, 94, -95 }; - OwnedMemory owner = new CustomMemoryForTest(a); - Memory memory = owner.Memory; - memory.Validate(91, -92, 93, 94, -95); - memory.Slice(0, 5).Validate(91, -92, 93, 94, -95); - memory.Slice(1, 0).Validate(); - memory.Slice(1, 1).Validate(-92); - memory.Slice(1, 2).Validate(-92, 93); - memory.Slice(2, 3).Validate(93, 94, -95); - memory.Slice(5, 0).Validate(); - } - - [Fact] - public static void MemoryFromOwnedMemoryObject() - { - object o1 = new object(); - object o2 = new object(); - object[] a = { o1, o2 }; - OwnedMemory owner = new CustomMemoryForTest(a); - Memory memory = owner.Memory; - memory.ValidateReferenceType(o1, o2); - } - - [Fact] - public static void ImplicitReadOnlyMemoryFromOwnedMemory() - { - long[] a = { 91, -92, 93, 94, -95 }; - OwnedMemory owner = new CustomMemoryForTest(a); - Memory memory = owner.Memory; - CastReadOnly(memory, 91, -92, 93, 94, -95); - } - - [Fact] - public static void OwnedMemoryDispose() - { - int[] a = { 91, 92, -93, 94 }; - OwnedMemory owner = new CustomMemoryForTest(a); - Assert.False(owner.IsDisposed); - owner.Dispose(); - Assert.True(owner.IsDisposed); - } - - [Fact] - public static void OwnedMemoryPinEmptyArray() - { - int[] a = {}; - OwnedMemory owner = new CustomMemoryForTest(a); - MemoryHandle handle = owner.Pin(); - Assert.True(handle.HasPointer); - } - - [Fact] - public static void OwnedMemoryPinArray() - { - int[] array = { 1, 2, 3, 4, 5 }; - OwnedMemory owner = new CustomMemoryForTest(array); - MemoryHandle handle = owner.Pin(); - Assert.True(handle.HasPointer); - unsafe - { - int* pointer = (int*)handle.Pointer; - - GC.Collect(); - - for (int i = 0; i < owner.Memory.Length; i++) - { - Assert.Equal(array[i], pointer[i]); - } - } - handle.Dispose(); - } - - [Fact] - public static void MemoryFromOwnedMemoryAfterDispose() - { - int[] a = { 91, 92, -93, 94 }; - OwnedMemory owner = new CustomMemoryForTest(a); - owner.Dispose(); - Assert.Throws(() => owner.Memory); - } - - [Fact] - public static void DisposeOwnedMemoryAfterRetain() - { - int[] a = { 91, 92, -93, 94 }; - OwnedMemory owner = new CustomMemoryForTest(a); - owner.Retain(); - Assert.Throws(() => owner.Dispose()); - owner.Release(); - } - - [Fact] - public static void DisposeOwnedMemoryAfterRetainAndRelease() - { - int[] a = { 91, 92, -93, 94 }; - OwnedMemory owner = new CustomMemoryForTest(a); - owner.Retain(); - owner.Release(); - owner.Dispose(); - Assert.True(owner.IsDisposed); - } - } - -} - diff --git a/external/corefx/src/System.Memory/tests/Memory/Retain.cs b/external/corefx/src/System.Memory/tests/Memory/Pin.cs similarity index 55% rename from external/corefx/src/System.Memory/tests/Memory/Retain.cs rename to external/corefx/src/System.Memory/tests/Memory/Pin.cs index 4286685a0d..a52af07006 100644 --- a/external/corefx/src/System.Memory/tests/Memory/Retain.cs +++ b/external/corefx/src/System.Memory/tests/Memory/Pin.cs @@ -9,31 +9,16 @@ namespace System.MemoryTests { public static partial class MemoryTests { - [Fact] - public static void MemoryRetainWithoutPinning() + public static void MemoryPin() { int[] array = { 1, 2, 3, 4, 5 }; Memory memory = array; - MemoryHandle handle = memory.Retain(); - Assert.False(handle.HasPointer); - unsafe - { - Assert.True(handle.Pointer == null); - } - handle.Dispose(); - } - - [Fact] - public static void MemoryRetainWithPinning() - { - int[] array = { 1, 2, 3, 4, 5 }; - Memory memory = array; - MemoryHandle handle = memory.Retain(pin: true); - Assert.True(handle.HasPointer); + MemoryHandle handle = memory.Pin(); unsafe { int* pointer = (int*)handle.Pointer; + Assert.True(pointer != null); GC.Collect(); @@ -46,17 +31,41 @@ namespace System.MemoryTests } [Fact] - public static void MemoryRetainWithPinningAndSlice() + public static void MemoryFromEmptyArrayPin() + { + Memory memory = new int[0]; + MemoryHandle handle = memory.Pin(); + unsafe + { + Assert.True(handle.Pointer != null); + } + handle.Dispose(); + } + + [Fact] + public static void DefaultMemoryPin() + { + Memory memory = default; + MemoryHandle handle = memory.Pin(); + unsafe + { + Assert.True(handle.Pointer == null); + } + handle.Dispose(); + } + + [Fact] + public static void MemoryPinAndSlice() { int[] array = { 1, 2, 3, 4, 5 }; Memory memory = array; memory = memory.Slice(1); - MemoryHandle handle = memory.Retain(pin: true); + MemoryHandle handle = memory.Pin(); Span span = memory.Span; - Assert.True(handle.HasPointer); unsafe { int* pointer = (int*)handle.Pointer; + Assert.True(pointer != null); GC.Collect(); @@ -74,31 +83,16 @@ namespace System.MemoryTests } [Fact] - public static void OwnedMemoryRetainWithoutPinning() + public static void MemoryManagerPin() { int[] array = { 1, 2, 3, 4, 5 }; - OwnedMemory owner = new CustomMemoryForTest(array); - Memory memory = owner.Memory; - MemoryHandle handle = memory.Retain(); - Assert.False(handle.HasPointer); - unsafe - { - Assert.True(handle.Pointer == null); - } - handle.Dispose(); - } - - [Fact] - public static void OwnedMemoryRetainWithPinning() - { - int[] array = { 1, 2, 3, 4, 5 }; - OwnedMemory owner = new CustomMemoryForTest(array); - Memory memory = owner.Memory; - MemoryHandle handle = memory.Retain(pin: true); - Assert.True(handle.HasPointer); + MemoryManager manager = new CustomMemoryForTest(array); + Memory memory = manager.Memory; + MemoryHandle handle = memory.Pin(); unsafe { int* pointer = (int*)handle.Pointer; + Assert.True(pointer != null); GC.Collect(); @@ -111,34 +105,17 @@ namespace System.MemoryTests } [Fact] - public static void MemoryFromEmptyArrayRetainWithPinning() - { - Memory memory = new int[0]; - MemoryHandle handle = memory.Retain(pin: true); - Assert.True(handle.HasPointer); - unsafe - { - int* pointer = (int*)handle.Pointer; - - GC.Collect(); - - Assert.True(pointer != null); - } - handle.Dispose(); - } - - [Fact] - public static void OwnedMemoryRetainWithPinningAndSlice() + public static void MemoryManagerPinAndSlice() { int[] array = { 1, 2, 3, 4, 5 }; - OwnedMemory owner = new CustomMemoryForTest(array); - Memory memory = owner.Memory.Slice(1); - MemoryHandle handle = memory.Retain(pin: true); + MemoryManager manager = new CustomMemoryForTest(array); + Memory memory = manager.Memory.Slice(1); + MemoryHandle handle = memory.Pin(); Span span = memory.Span; - Assert.True(handle.HasPointer); unsafe { int* pointer = (int*)handle.Pointer; + Assert.True(pointer != null); GC.Collect(); @@ -154,20 +131,5 @@ namespace System.MemoryTests } handle.Dispose(); } - - [Theory] - [InlineData(true)] - [InlineData(false)] - public static void DefaultMemoryRetain(bool pin) - { - Memory memory = default; - MemoryHandle handle = memory.Retain(pin: pin); - Assert.False(handle.HasPointer); - unsafe - { - Assert.True(handle.Pointer == null); - } - handle.Dispose(); - } } } diff --git a/external/corefx/src/System.Memory/tests/Memory/Slice.cs b/external/corefx/src/System.Memory/tests/Memory/Slice.cs index c047472175..16e330cf3b 100644 --- a/external/corefx/src/System.Memory/tests/Memory/Slice.cs +++ b/external/corefx/src/System.Memory/tests/Memory/Slice.cs @@ -19,11 +19,11 @@ namespace System.MemoryTests Assert.Equal(4, memory.Length); Assert.True(Unsafe.AreSame(ref a[6], ref MemoryMarshal.GetReference(memory.Span))); - OwnedMemory owner = new CustomMemoryForTest(a); - Memory memoryFromOwner = owner.Memory.Slice(6); + MemoryManager manager = new CustomMemoryForTest(a); + Memory memoryFromManager = manager.Memory.Slice(6); - Assert.Equal(4, memoryFromOwner.Length); - Assert.True(Unsafe.AreSame(ref a[6], ref MemoryMarshal.GetReference(memoryFromOwner.Span))); + Assert.Equal(4, memoryFromManager.Length); + Assert.True(Unsafe.AreSame(ref a[6], ref MemoryMarshal.GetReference(memoryFromManager.Span))); } [Fact] @@ -34,11 +34,11 @@ namespace System.MemoryTests Assert.Equal(0, memory.Length); Assert.True(Unsafe.AreSame(ref a[a.Length - 1], ref Unsafe.Subtract(ref MemoryMarshal.GetReference(memory.Span), 1))); - OwnedMemory owner = new CustomMemoryForTest(a); - Memory memoryFromOwner = owner.Memory.Slice(a.Length); + MemoryManager manager = new CustomMemoryForTest(a); + Memory memoryFromManager = manager.Memory.Slice(a.Length); - Assert.Equal(0, memoryFromOwner.Length); - Assert.True(Unsafe.AreSame(ref a[a.Length - 1], ref Unsafe.Subtract(ref MemoryMarshal.GetReference(memoryFromOwner.Span), 1))); + Assert.Equal(0, memoryFromManager.Length); + Assert.True(Unsafe.AreSame(ref a[a.Length - 1], ref Unsafe.Subtract(ref MemoryMarshal.GetReference(memoryFromManager.Span), 1))); } [Fact] @@ -49,11 +49,11 @@ namespace System.MemoryTests Assert.Equal(5, memory.Length); Assert.True(Unsafe.AreSame(ref a[3], ref MemoryMarshal.GetReference(memory.Span))); - OwnedMemory owner = new CustomMemoryForTest(a); - Memory memoryFromOwner = owner.Memory.Slice(3, 5); + MemoryManager manager = new CustomMemoryForTest(a); + Memory memoryFromManager = manager.Memory.Slice(3, 5); - Assert.Equal(5, memoryFromOwner.Length); - Assert.True(Unsafe.AreSame(ref a[3], ref MemoryMarshal.GetReference(memoryFromOwner.Span))); + Assert.Equal(5, memoryFromManager.Length); + Assert.True(Unsafe.AreSame(ref a[3], ref MemoryMarshal.GetReference(memoryFromManager.Span))); } [Fact] @@ -64,11 +64,11 @@ namespace System.MemoryTests Assert.Equal(6, memory.Length); Assert.True(Unsafe.AreSame(ref a[4], ref MemoryMarshal.GetReference(memory.Span))); - OwnedMemory owner = new CustomMemoryForTest(a); - Memory memoryFromOwner = owner.Memory.Slice(4, 6); + MemoryManager manager = new CustomMemoryForTest(a); + Memory memoryFromManager = manager.Memory.Slice(4, 6); - Assert.Equal(6, memoryFromOwner.Length); - Assert.True(Unsafe.AreSame(ref a[4], ref MemoryMarshal.GetReference(memoryFromOwner.Span))); + Assert.Equal(6, memoryFromManager.Length); + Assert.True(Unsafe.AreSame(ref a[4], ref MemoryMarshal.GetReference(memoryFromManager.Span))); } [Fact] @@ -79,11 +79,11 @@ namespace System.MemoryTests Assert.Equal(0, memory.Length); Assert.True(Unsafe.AreSame(ref a[a.Length - 1], ref Unsafe.Subtract(ref MemoryMarshal.GetReference(memory.Span), 1))); - OwnedMemory owner = new CustomMemoryForTest(a); - Memory memoryFromOwner = owner.Memory.Slice(a.Length, 0); + MemoryManager manager = new CustomMemoryForTest(a); + Memory memoryFromManager = manager.Memory.Slice(a.Length, 0); - Assert.Equal(0, memoryFromOwner.Length); - Assert.True(Unsafe.AreSame(ref a[a.Length - 1], ref Unsafe.Subtract(ref MemoryMarshal.GetReference(memoryFromOwner.Span), 1))); + Assert.Equal(0, memoryFromManager.Length); + Assert.True(Unsafe.AreSame(ref a[a.Length - 1], ref Unsafe.Subtract(ref MemoryMarshal.GetReference(memoryFromManager.Span), 1))); } [Fact] @@ -98,8 +98,8 @@ namespace System.MemoryTests Assert.Throws(() => new Memory(a).Slice(a.Length + 1, 0)); Assert.Throws(() => new Memory(a).Slice(a.Length, 1)); - OwnedMemory owner = new CustomMemoryForTest(a); - Memory memory = owner.Memory; + MemoryManager manager = new CustomMemoryForTest(a); + Memory memory = manager.Memory; Assert.Throws(() => memory.Slice(-1)); Assert.Throws(() => memory.Slice(a.Length + 1)); diff --git a/external/corefx/src/System.Memory/tests/Memory/Span.cs b/external/corefx/src/System.Memory/tests/Memory/Span.cs index 607a56a82e..55956dd6ab 100644 --- a/external/corefx/src/System.Memory/tests/Memory/Span.cs +++ b/external/corefx/src/System.Memory/tests/Memory/Span.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Buffers; +using System.Runtime.InteropServices; using Xunit; namespace System.MemoryTests @@ -21,8 +22,8 @@ namespace System.MemoryTests memory = new Memory(a, 0, a.Length); memory.Span.Validate(91, 92, -93, 94); - OwnedMemory owner = new CustomMemoryForTest(a); - owner.Memory.Span.Validate(91, 92, -93, 94); + MemoryManager manager = new CustomMemoryForTest(a); + manager.Memory.Span.Validate(91, 92, -93, 94); } [Fact] @@ -37,8 +38,24 @@ namespace System.MemoryTests memory = new Memory(a, 0, a.Length); memory.Span.Validate(91, -92, 93, 94, -95); - OwnedMemory owner = new CustomMemoryForTest(a); - owner.Memory.Span.Validate(91, -92, 93, 94, -95); + MemoryManager manager = new CustomMemoryForTest(a); + manager.Memory.Span.Validate(91, -92, 93, 94, -95); + } + + [Fact] + public static void SpanFromCtorArrayChar() + { + char[] a = { '1', '2', '3', '4', '-' }; + Memory memory; + + memory = new Memory(a); + memory.Span.Validate('1', '2', '3', '4', '-'); + + memory = new Memory(a, 0, a.Length); + memory.Span.Validate('1', '2', '3', '4', '-'); + + MemoryManager manager = new CustomMemoryForTest(a); + manager.Memory.Span.Validate('1', '2', '3', '4', '-'); } [Fact] @@ -55,8 +72,21 @@ namespace System.MemoryTests memory = new Memory(a, 0, a.Length); memory.Span.ValidateReferenceType(o1, o2); - OwnedMemory owner = new CustomMemoryForTest(a); - owner.Memory.Span.ValidateReferenceType(o1, o2); + MemoryManager manager = new CustomMemoryForTest(a); + manager.Memory.Span.ValidateReferenceType(o1, o2); + } + + [Fact] + public static void SpanFromStringAsMemory() + { + string a = "1234-"; + ReadOnlyMemory memory; + + memory = a.AsMemory(); + MemoryMarshal.AsMemory(memory).Span.Validate('1', '2', '3', '4', '-'); + + memory = a.AsMemory(0, a.Length); + MemoryMarshal.AsMemory(memory).Span.Validate('1', '2', '3', '4', '-'); } [Fact] @@ -71,8 +101,8 @@ namespace System.MemoryTests memory = new Memory(empty, 0, empty.Length); memory.Span.ValidateNonNullEmpty(); - OwnedMemory owner = new CustomMemoryForTest(empty); - owner.Memory.Span.Validate(); + MemoryManager manager = new CustomMemoryForTest(empty); + manager.Memory.Span.Validate(); } [Fact] @@ -90,8 +120,8 @@ namespace System.MemoryTests memory = new Memory(aAsIntArray, 0, aAsIntArray.Length); memory.Span.Validate(42, -1); - OwnedMemory owner = new CustomMemoryForTest(aAsIntArray); - owner.Memory.Span.Validate(42, -1); + MemoryManager manager = new CustomMemoryForTest(aAsIntArray); + manager.Memory.Span.Validate(42, -1); } [Fact] @@ -106,5 +136,28 @@ namespace System.MemoryTests Assert.True(spanObject.SequenceEqual(default)); } + [Fact] + public static void TornMemory_Array_SpanThrowsIfOutOfBounds() + { + Memory memory; + + memory = TestHelpers.DangerousCreateMemory(new int[4], 0, 5); + Assert.Throws(() => memory.Span.DontBox()); + + memory = TestHelpers.DangerousCreateMemory(new int[4], 3, 2); + Assert.Throws(() => memory.Span.DontBox()); + } + + [Fact] + public static void TornMemory_String_SpanThrowsIfOutOfBounds() + { + Memory memory; + + memory = TestHelpers.DangerousCreateMemory("1234", 0, 5); + Assert.Throws(() => memory.Span.DontBox()); + + memory = TestHelpers.DangerousCreateMemory("1234", 3, 2); + Assert.Throws(() => memory.Span.DontBox()); + } } } diff --git a/external/corefx/src/System.Memory/tests/Memory/Strings.cs b/external/corefx/src/System.Memory/tests/Memory/Strings.cs index fd0f2fd26a..b711179cd1 100644 --- a/external/corefx/src/System.Memory/tests/Memory/Strings.cs +++ b/external/corefx/src/System.Memory/tests/Memory/Strings.cs @@ -22,7 +22,7 @@ namespace System.MemoryTests [MemberData(nameof(StringInputs))] public static void Memory_ToArray_Roundtrips(string input) { - ReadOnlyMemory readonlyMemory = input.AsReadOnlyMemory(); + ReadOnlyMemory readonlyMemory = input.AsMemory(); Memory m = MemoryMarshal.AsMemory(readonlyMemory); Assert.Equal(input, new string(m.ToArray())); } @@ -31,7 +31,7 @@ namespace System.MemoryTests [MemberData(nameof(StringInputs))] public static void Memory_Span_Roundtrips(string input) { - ReadOnlyMemory readonlyMemory = input.AsReadOnlyMemory(); + ReadOnlyMemory readonlyMemory = input.AsMemory(); Memory m = MemoryMarshal.AsMemory(readonlyMemory); ReadOnlySpan s = m.Span; Assert.Equal(input, new string(s.ToArray())); @@ -49,7 +49,7 @@ namespace System.MemoryTests [InlineData("0123456789", 5, 3)] public static void Memory_Slice_MatchesSubstring(string input, int offset, int count) { - ReadOnlyMemory readonlyMemory = input.AsReadOnlyMemory(); + ReadOnlyMemory readonlyMemory = input.AsMemory(); Memory m = MemoryMarshal.AsMemory(readonlyMemory); Assert.Equal(input.Substring(offset, count), new string(m.Slice(offset, count).ToArray())); Assert.Equal(input.Substring(offset, count), new string(m.Slice(offset, count).Span.ToArray())); @@ -57,18 +57,13 @@ namespace System.MemoryTests } [Fact] - public static unsafe void Memory_Retain_ExpectedPointerValue() + public static unsafe void Memory_Pin_ExpectedPointerValue() { string input = "0123456789"; - ReadOnlyMemory readonlyMemory = input.AsReadOnlyMemory(); + ReadOnlyMemory readonlyMemory = input.AsMemory(); Memory m = MemoryMarshal.AsMemory(readonlyMemory); - using (MemoryHandle h = m.Retain(pin: false)) - { - Assert.Equal(IntPtr.Zero, (IntPtr)h.Pointer); - } - - using (MemoryHandle h = m.Retain(pin: true)) + using (MemoryHandle h = m.Pin()) { GC.Collect(); fixed (char* ptr = input) @@ -81,8 +76,8 @@ namespace System.MemoryTests [Fact] public static void Memory_EqualsAndGetHashCode_ExpectedResults() { - ReadOnlyMemory readonlyMemory1 = new string('a', 4).AsReadOnlyMemory(); - ReadOnlyMemory readonlyMemory2 = new string('a', 4).AsReadOnlyMemory(); + ReadOnlyMemory readonlyMemory1 = new string('a', 4).AsMemory(); + ReadOnlyMemory readonlyMemory2 = new string('a', 4).AsMemory(); Memory m1 = MemoryMarshal.AsMemory(readonlyMemory1); Memory m2 = MemoryMarshal.AsMemory(readonlyMemory2); diff --git a/external/corefx/src/System.Memory/tests/Memory/ToString.cs b/external/corefx/src/System.Memory/tests/Memory/ToString.cs new file mode 100644 index 0000000000..98be45eee6 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Memory/ToString.cs @@ -0,0 +1,130 @@ +// 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; +using System.Runtime.InteropServices; +using Xunit; + +namespace System.MemoryTests +{ + public static partial class MemoryTests + { + [Fact] + public static void ToStringInt() + { + int[] a = { 91, 92, 93 }; + var memory = new Memory(a); + Assert.Equal("System.Memory[3]", memory.ToString()); + Assert.Equal("System.Memory[1]", memory.Slice(1, 1).ToString()); + Assert.Equal("System.Span[3]", memory.Span.ToString()); + } + + [Fact] + public static void ToStringInt_Empty() + { + var memory = new Memory(); + Assert.Equal("System.Memory[0]", memory.ToString()); + Assert.Equal("System.Memory[0]", Memory.Empty.ToString()); + Assert.Equal("System.Span[0]", memory.Span.ToString()); + } + + [Fact] + public static void ToStringChar() + { + char[] a = { 'a', 'b', 'c' }; + var memory = new Memory(a); + Assert.Equal("abc", memory.ToString()); + Assert.Equal("b", memory.Slice(1, 1).ToString()); + Assert.Equal("abc", memory.Span.ToString()); + } + + [Fact] + public static void ToStringChar_Empty() + { + var memory = new Memory(); + Assert.Equal("", memory.ToString()); + Assert.Equal("", Memory.Empty.ToString()); + Assert.Equal("", memory.Span.ToString()); + } + + [Fact] + public static void ToStringMemoryFromReadOnlyMemory() + { + string testString = "abcdefg"; + Memory memory = MemoryMarshal.AsMemory(testString.AsMemory()); + Assert.Equal(testString, memory.ToString()); + Assert.Equal(testString.Substring(1, 1), memory.Slice(1, 1).ToString()); + Assert.Equal(testString, memory.Span.ToString()); + } + + [Fact] + public static void ToStringForMemoryOfString() + { + string[] a = { "a", "b", "c" }; + var memory = new Memory(a); + Assert.Equal("System.Memory[3]", memory.ToString()); + Assert.Equal("System.Memory[1]", memory.Slice(1, 1).ToString()); + Assert.Equal("System.Span[3]", memory.Span.ToString()); + } + + [Fact] + public static void ToStringFromMemoryFromMemoryManager() + { + int[] a = { 91, 92, -93, 94 }; + MemoryManager intManager = new CustomMemoryForTest(a); + Assert.Equal("System.Memory[4]", intManager.Memory.ToString()); + + intManager = new CustomMemoryForTest(Array.Empty()); + Assert.Equal("System.Memory[0]", intManager.Memory.ToString()); + + char[] charArray = { '1', '2', '-', '4' }; + MemoryManager charManager = new CustomMemoryForTest(charArray); + Assert.Equal("12-4", charManager.Memory.ToString()); + + charManager = new CustomMemoryForTest(Array.Empty()); + Assert.Equal("", charManager.Memory.ToString()); + + string[] strArray = { "91", "92", "-93", "94" }; + MemoryManager strManager = new CustomMemoryForTest(strArray); + Assert.Equal("System.Memory[4]", strManager.Memory.ToString()); + + strManager = new CustomMemoryForTest(Array.Empty()); + Assert.Equal("System.Memory[0]", strManager.Memory.ToString()); + } + + [Fact] + public static void ToStringMemoryOverFullStringReturnsOriginal() + { + string original = TestHelpers.BuildString(10, 42); + + ReadOnlyMemory readOnlyMemory = original.AsMemory(); + Memory memory = MemoryMarshal.AsMemory(readOnlyMemory); + + string returnedString = memory.ToString(); + string returnedStringUsingSlice = memory.Slice(0, original.Length).ToString(); + + string subString1 = memory.Slice(1).ToString(); + string subString2 = memory.Slice(0, 2).ToString(); + string subString3 = memory.Slice(1, 2).ToString(); + + Assert.Equal(original, returnedString); + Assert.Equal(original, returnedStringUsingSlice); + + Assert.Equal(original.Substring(1), subString1); + Assert.Equal(original.Substring(0, 2), subString2); + Assert.Equal(original.Substring(1, 2), subString3); + + Assert.Same(original, returnedString); + Assert.Same(original, returnedStringUsingSlice); + + Assert.NotSame(original, subString1); + Assert.NotSame(original, subString2); + Assert.NotSame(original, subString3); + + Assert.NotSame(subString1, subString2); + Assert.NotSame(subString1, subString3); + Assert.NotSame(subString2, subString3); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/Memory/TryGetArray.cs b/external/corefx/src/System.Memory/tests/Memory/TryGetArray.cs deleted file mode 100644 index fdd92e8906..0000000000 --- a/external/corefx/src/System.Memory/tests/Memory/TryGetArray.cs +++ /dev/null @@ -1,49 +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; -using Xunit; - -namespace System.MemoryTests -{ - public static partial class MemoryTests - { - [Fact] - public static void MemoryTryGetArray() - { - int[] array = new int[10]; - Memory memory = array; - Assert.True(memory.TryGetArray(out ArraySegment segment)); - Assert.Equal(array.Length, segment.Count); - - for (int i = segment.Offset; i < segment.Count + segment.Offset; i++) - { - Assert.Equal(array[i], segment.Array[i]); - } - } - - [Fact] - public static void TryGetArrayFromDefaultMemory() - { - Memory memory = default; - Assert.False(memory.TryGetArray(out ArraySegment segment)); - Assert.True(segment.Equals(default)); - } - - [Fact] - public static void OwnedMemoryTryGetArray() - { - int[] array = new int[10]; - OwnedMemory owner = new CustomMemoryForTest(array); - Memory memory = owner.Memory; - Assert.True(memory.TryGetArray(out ArraySegment segment)); - Assert.Equal(array.Length, segment.Count); - - for (int i = segment.Offset; i < segment.Count + segment.Offset; i++) - { - Assert.Equal(array[i], segment.Array[i]); - } - } - } -} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/AsBytes.cs b/external/corefx/src/System.Memory/tests/MemoryMarshal/AsBytesReadOnlySpan.cs similarity index 58% rename from external/corefx/src/System.Memory/tests/ReadOnlySpan/AsBytes.cs rename to external/corefx/src/System.Memory/tests/MemoryMarshal/AsBytesReadOnlySpan.cs index 66aad3d6cf..c4c54f49aa 100644 --- a/external/corefx/src/System.Memory/tests/ReadOnlySpan/AsBytes.cs +++ b/external/corefx/src/System.Memory/tests/MemoryMarshal/AsBytesReadOnlySpan.cs @@ -8,24 +8,24 @@ using System.Runtime.InteropServices; namespace System.SpanTests { - public static partial class ReadOnlySpanTests + public static partial class MemoryMarshalTests { [Fact] - public static void AsBytesUIntToByte() + public static void ReadOnlySpan_AsBytesUIntToByte() { uint[] a = { 0x44332211, 0x88776655 }; ReadOnlySpan span = new ReadOnlySpan(a); - ReadOnlySpan asBytes = span.AsBytes(); + ReadOnlySpan asBytes = MemoryMarshal.AsBytes(span); Assert.True(Unsafe.AreSame(ref Unsafe.As(ref Unsafe.AsRef(in MemoryMarshal.GetReference(span))), ref Unsafe.AsRef(in MemoryMarshal.GetReference(asBytes)))); asBytes.Validate(0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88); } [Fact] - public static void AsBytesContainsReferences() + public static void ReadOnlySpan_AsBytesContainsReferences() { - ReadOnlySpan span = new ReadOnlySpan(Array.Empty()); - TestHelpers.AssertThrows(span, (_span) => _span.AsBytes().DontBox()); + ReadOnlySpan span = new ReadOnlySpan(Array.Empty()); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.AsBytes(_span).DontBox()); } } } diff --git a/external/corefx/src/System.Memory/tests/Span/AsBytes.cs b/external/corefx/src/System.Memory/tests/MemoryMarshal/AsBytesSpan.cs similarity index 58% rename from external/corefx/src/System.Memory/tests/Span/AsBytes.cs rename to external/corefx/src/System.Memory/tests/MemoryMarshal/AsBytesSpan.cs index dbbe885aaa..099a43bc18 100644 --- a/external/corefx/src/System.Memory/tests/Span/AsBytes.cs +++ b/external/corefx/src/System.Memory/tests/MemoryMarshal/AsBytesSpan.cs @@ -8,24 +8,24 @@ using System.Runtime.InteropServices; namespace System.SpanTests { - public static partial class SpanTests + public static partial class MemoryMarshalTests { [Fact] - public static void AsBytesUIntToByte() + public static void Span_AsBytesUIntToByte() { uint[] a = { 0x44332211, 0x88776655 }; Span span = new Span(a); - Span asBytes = span.AsBytes(); + Span asBytes = MemoryMarshal.AsBytes(span); Assert.True(Unsafe.AreSame(ref Unsafe.As(ref MemoryMarshal.GetReference(span)), ref MemoryMarshal.GetReference(asBytes))); asBytes.Validate(0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88); } [Fact] - public static void AsBytesContainsReferences() + public static void Span_AsBytesContainsReferences() { - Span span = new Span(Array.Empty()); - TestHelpers.AssertThrows(span, (_span) => _span.AsBytes().DontBox()); + Span span = new Span(Array.Empty()); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.AsBytes(_span).DontBox()); } } } diff --git a/external/corefx/src/System.Memory/tests/MemoryMarshal/AsMemory.cs b/external/corefx/src/System.Memory/tests/MemoryMarshal/AsMemory.cs index 0d9e9fc08b..40990d08cb 100644 --- a/external/corefx/src/System.Memory/tests/MemoryMarshal/AsMemory.cs +++ b/external/corefx/src/System.Memory/tests/MemoryMarshal/AsMemory.cs @@ -34,39 +34,39 @@ namespace System.MemoryTests yield return new object[] { ReadOnlyMemory.Empty }; yield return new object[] { new ReadOnlyMemory(new char[10], 1, 3) }; yield return new object[] { (ReadOnlyMemory)new CustomMemoryForTest(new char[10]).Memory }; - yield return new object[] { "12345".AsReadOnlyMemory() }; + yield return new object[] { "12345".AsMemory() }; } [Theory] [MemberData(nameof(ReadOnlyMemoryInt32Instances))] - public static void AsMemory_Roundtrips(ReadOnlyMemory readOnlyMemory) => AsMemory_Roundtrips_Core(readOnlyMemory); + public static void AsMemory_Roundtrips(ReadOnlyMemory readOnlyMemory) => AsMemory_Roundtrips_Core(readOnlyMemory, true); [Theory] [MemberData(nameof(ReadOnlyMemoryObjectInstances))] - public static void AsMemory_Roundtrips(ReadOnlyMemory readOnlyMemory) => AsMemory_Roundtrips_Core(readOnlyMemory); + public static void AsMemory_Roundtrips(ReadOnlyMemory readOnlyMemory) => AsMemory_Roundtrips_Core(readOnlyMemory, false); [Theory] [MemberData(nameof(ReadOnlyMemoryCharInstances))] public static void AsMemory_Roundtrips(ReadOnlyMemory readOnlyMemory) { - AsMemory_Roundtrips_Core(readOnlyMemory); + AsMemory_Roundtrips_Core(readOnlyMemory, true); Memory memory = MemoryMarshal.AsMemory(readOnlyMemory); ReadOnlyMemory readOnlyClone = memory; // TryGetString - bool gotString1 = readOnlyMemory.TryGetString(out string text1, out int start1, out int length1); - Assert.Equal(gotString1, readOnlyClone.TryGetString(out string text2, out int start2, out int length2)); + bool gotString1 = MemoryMarshal.TryGetString(readOnlyMemory, out string text1, out int start1, out int length1); + Assert.Equal(gotString1, MemoryMarshal.TryGetString(readOnlyClone, out string text2, out int start2, out int length2)); Assert.Same(text1, text2); Assert.Equal(start1, start2); Assert.Equal(length1, length2); if (gotString1) { - Assert.False(memory.TryGetArray(out ArraySegment array)); + Assert.False(MemoryMarshal.TryGetArray(memory, out ArraySegment array)); } } - private static unsafe void AsMemory_Roundtrips_Core(ReadOnlyMemory readOnlyMemory) + private static unsafe void AsMemory_Roundtrips_Core(ReadOnlyMemory readOnlyMemory, bool canBePinned) { Memory memory = MemoryMarshal.AsMemory(readOnlyMemory); ReadOnlyMemory readOnlyClone = memory; @@ -81,18 +81,22 @@ namespace System.MemoryTests Assert.True(readOnlyMemory.Span == memory.Span); // TryGetArray - Assert.True(MemoryMarshal.TryGetArray(readOnlyMemory, out ArraySegment array1) == memory.TryGetArray(out ArraySegment array2)); + Assert.True(MemoryMarshal.TryGetArray(readOnlyMemory, out ArraySegment array1) + == MemoryMarshal.TryGetArray(memory, out ArraySegment array2)); Assert.Same(array1.Array, array2.Array); Assert.Equal(array1.Offset, array2.Offset); Assert.Equal(array1.Count, array2.Count); - // Retain - using (MemoryHandle readOnlyMemoryHandle = readOnlyMemory.Retain()) - using (MemoryHandle readOnlyCloneHandle = readOnlyMemory.Retain()) - using (MemoryHandle memoryHandle = readOnlyMemory.Retain()) + if (canBePinned) { - Assert.Equal((IntPtr)readOnlyMemoryHandle.Pointer, (IntPtr)readOnlyCloneHandle.Pointer); - Assert.Equal((IntPtr)readOnlyMemoryHandle.Pointer, (IntPtr)memoryHandle.Pointer); + // Pin + using (MemoryHandle readOnlyMemoryHandle = readOnlyMemory.Pin()) + using (MemoryHandle readOnlyCloneHandle = readOnlyMemory.Pin()) + using (MemoryHandle memoryHandle = readOnlyMemory.Pin()) + { + Assert.Equal((IntPtr)readOnlyMemoryHandle.Pointer, (IntPtr)readOnlyCloneHandle.Pointer); + Assert.Equal((IntPtr)readOnlyMemoryHandle.Pointer, (IntPtr)memoryHandle.Pointer); + } } } } diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/NonPortableCast.cs b/external/corefx/src/System.Memory/tests/MemoryMarshal/CastReadOnlySpan.cs similarity index 57% rename from external/corefx/src/System.Memory/tests/ReadOnlySpan/NonPortableCast.cs rename to external/corefx/src/System.Memory/tests/MemoryMarshal/CastReadOnlySpan.cs index 1153e66bf5..26b738ef60 100644 --- a/external/corefx/src/System.Memory/tests/ReadOnlySpan/NonPortableCast.cs +++ b/external/corefx/src/System.Memory/tests/MemoryMarshal/CastReadOnlySpan.cs @@ -8,51 +8,51 @@ using System.Runtime.InteropServices; namespace System.SpanTests { - public static partial class ReadOnlySpanTests + public static partial class MemoryMarshalTests { [Fact] - public static void NonPortableCastUIntToUShort() + public static void CastReadOnlySpanUIntToUShort() { uint[] a = { 0x44332211, 0x88776655 }; ReadOnlySpan span = new ReadOnlySpan(a); - ReadOnlySpan asUShort = span.NonPortableCast(); + ReadOnlySpan asUShort = MemoryMarshal.Cast(span); Assert.True(Unsafe.AreSame(ref Unsafe.As(ref Unsafe.AsRef(in MemoryMarshal.GetReference(span))), ref Unsafe.AsRef(in MemoryMarshal.GetReference(asUShort)))); asUShort.Validate(0x2211, 0x4433, 0x6655, 0x8877); } [Fact] - public static void NonPortableCastShortToLong() + public static void CastReadOnlySpanShortToLong() { short[] a = { 0x1234, 0x2345, 0x3456, 0x4567, 0x5678 }; ReadOnlySpan span = new ReadOnlySpan(a); - ReadOnlySpan asLong = span.NonPortableCast(); + ReadOnlySpan asLong = MemoryMarshal.Cast(span); Assert.True(Unsafe.AreSame(ref Unsafe.As(ref MemoryMarshal.GetReference(span)), ref MemoryMarshal.GetReference(asLong))); asLong.Validate(0x4567345623451234); } [Fact] - public static unsafe void NonPortableCastOverflow() + public static unsafe void CastReadOnlySpanOverflow() { ReadOnlySpan span = new ReadOnlySpan(null, Int32.MaxValue); - TestHelpers.AssertThrows(span, (_span) => _span.NonPortableCast().DontBox()); - TestHelpers.AssertThrows(span, (_span) => _span.NonPortableCast().DontBox()); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Cast(_span).DontBox()); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Cast(_span).DontBox()); } [Fact] - public static void NonPortableCastToTypeContainsReferences() + public static void CastReadOnlySpanToTypeContainsReferences() { ReadOnlySpan span = new ReadOnlySpan(Array.Empty()); - TestHelpers.AssertThrows(span, (_span) => _span.NonPortableCast().DontBox()); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Cast(_span).DontBox()); } [Fact] - public static void NonPortableCastFromTypeContainsReferences() + public static void CastReadOnlySpanFromTypeContainsReferences() { - ReadOnlySpan span = new ReadOnlySpan(Array.Empty()); - TestHelpers.AssertThrows(span, (_span) => _span.NonPortableCast().DontBox()); + ReadOnlySpan span = new ReadOnlySpan(Array.Empty()); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Cast(_span).DontBox()); } } } diff --git a/external/corefx/src/System.Memory/tests/Span/NonPortableCast.cs b/external/corefx/src/System.Memory/tests/MemoryMarshal/CastSpan.cs similarity index 50% rename from external/corefx/src/System.Memory/tests/Span/NonPortableCast.cs rename to external/corefx/src/System.Memory/tests/MemoryMarshal/CastSpan.cs index 81b0bf6e45..d58ff78aba 100644 --- a/external/corefx/src/System.Memory/tests/Span/NonPortableCast.cs +++ b/external/corefx/src/System.Memory/tests/MemoryMarshal/CastSpan.cs @@ -8,51 +8,63 @@ using System.Runtime.InteropServices; namespace System.SpanTests { - public static partial class SpanTests + public static partial class MemoryMarshalTests { + [Fact] - public static void NonPortableCastUIntToUShort() + public static void CastSpanUIntToUShort() { uint[] a = { 0x44332211, 0x88776655 }; Span span = new Span(a); - Span asUShort = span.NonPortableCast(); + Span asUShort = MemoryMarshal.Cast(span); Assert.True(Unsafe.AreSame(ref Unsafe.As(ref MemoryMarshal.GetReference(span)), ref MemoryMarshal.GetReference(asUShort))); asUShort.Validate(0x2211, 0x4433, 0x6655, 0x8877); } + struct EmptyStruct { } + [Fact] - public static void NonPortableCastShortToLong() + public static void CastSpanToEmptyStruct() + { + Span span = new Span(new uint[] { 1 }); + Span emptyspan = MemoryMarshal.Cast(span); + Assert.Equal(1, Unsafe.SizeOf()); + Assert.Equal(4, emptyspan.Length); + } + + [Fact] + public static void CastSpanShortToLong() { short[] a = { 0x1234, 0x2345, 0x3456, 0x4567, 0x5678 }; Span span = new Span(a); - Span asLong = span.NonPortableCast(); + Span asLong = MemoryMarshal.Cast(span); Assert.True(Unsafe.AreSame(ref Unsafe.As(ref MemoryMarshal.GetReference(span)), ref MemoryMarshal.GetReference(asLong))); asLong.Validate(0x4567345623451234); } [Fact] - public static unsafe void NonPortableCastOverflow() + public static unsafe void CastSpanOverflow() { Span span = new Span(null, Int32.MaxValue); - TestHelpers.AssertThrows(span, (_span) => _span.NonPortableCast().DontBox()); - TestHelpers.AssertThrows(span, (_span) => _span.NonPortableCast().DontBox()); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Cast(_span).DontBox()); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Cast(_span).DontBox()); } [Fact] - public static void NonPortableCastToTypeContainsReferences() + public static void CastSpanToTypeContainsReferences() { Span span = new Span(Array.Empty()); - TestHelpers.AssertThrows(span, (_span) => _span.NonPortableCast().DontBox()); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Cast(_span).DontBox()); } [Fact] - public static void NonPortableCastFromTypeContainsReferences() + public static void CastSpanFromTypeContainsReferences() { - Span span = new Span(Array.Empty()); - TestHelpers.AssertThrows(span, (_span) => _span.NonPortableCast().DontBox()); + Span span = new Span(Array.Empty()); + TestHelpers.AssertThrows(span, (_span) => MemoryMarshal.Cast(_span).DontBox()); } } } diff --git a/external/corefx/src/System.Memory/tests/MemoryMarshal/CreateFromPinnedArray.cs b/external/corefx/src/System.Memory/tests/MemoryMarshal/CreateFromPinnedArray.cs new file mode 100644 index 0000000000..2756bf723f --- /dev/null +++ b/external/corefx/src/System.Memory/tests/MemoryMarshal/CreateFromPinnedArray.cs @@ -0,0 +1,151 @@ +// 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 Xunit; +using System.Runtime.InteropServices; +using System.Runtime.CompilerServices; +using System.Buffers; + +namespace System.SpanTests +{ + public static partial class MemoryMarshalTests + { + [Fact] + public static void CreateFromPinnedArrayInt() + { + int[] a = { 90, 91, 92, 93, 94, 95, 96, 97, 98 }; + Memory pinnedMemory = MemoryMarshal.CreateFromPinnedArray(a, 3, 2); + pinnedMemory.Validate(93, 94); + } + + [Fact] + public static void CreateFromPinnedArrayLong() + { + long[] a = { 90, 91, 92, 93, 94, 95, 96, 97, 98 }; + Memory pinnedMemory = MemoryMarshal.CreateFromPinnedArray(a, 4, 3); + pinnedMemory.Validate(94, 95, 96); + } + + [Fact] + public static void CreateFromPinnedArrayString() + { + string[] a = { "90", "91", "92", "93", "94", "95", "96", "97", "98" }; + Memory pinnedMemory = MemoryMarshal.CreateFromPinnedArray(a, 4, 3); + pinnedMemory.Validate("94", "95", "96"); + } + + [Fact] + public static void CreateFromPinnedArrayWithStartAndLengthRangeExtendsToEndOfArray() + { + long[] a = { 90, 91, 92, 93, 94, 95, 96, 97, 98 }; + Memory pinnedMemory = MemoryMarshal.CreateFromPinnedArray(a, 4, 5); + pinnedMemory.Validate(94, 95, 96, 97, 98); + } + + [Fact] + public static void CreateFromPinnedArrayZeroLength() + { + int[] empty = Array.Empty(); + Memory memory = MemoryMarshal.CreateFromPinnedArray(empty, 0, empty.Length); + memory.Validate(); + } + + [Fact] + public static void CreateFromPinnedArrayNullArray() + { + Memory memory = MemoryMarshal.CreateFromPinnedArray((int[])null, 0, 0); + memory.Validate(); + Assert.Equal(default, memory); + } + + + [Fact] + public static void CreateFromPinnedArrayNullArrayNonZeroStartAndLength() + { + Assert.Throws(() => MemoryMarshal.CreateFromPinnedArray((int[])null, 1, 0)); + Assert.Throws(() => MemoryMarshal.CreateFromPinnedArray((int[])null, 0, 1)); + Assert.Throws(() => MemoryMarshal.CreateFromPinnedArray((int[])null, 1, 1)); + Assert.Throws(() => MemoryMarshal.CreateFromPinnedArray((int[])null, -1, -1)); + } + + [Fact] + public static void CreateFromPinnedArrayWrongArrayType() + { + // Cannot pass variant array, if array type is not a valuetype. + string[] a = { "Hello" }; + Assert.Throws(() => MemoryMarshal.CreateFromPinnedArray(a, 0, a.Length)); + } + + [Fact] + public static void CreateFromPinnedArrayWrongValueType() + { + // Can pass variant array, if array type is a valuetype. + uint[] a = { 42u, 0xffffffffu }; + int[] aAsIntArray = (int[])(object)a; + + Memory memory = MemoryMarshal.CreateFromPinnedArray(aAsIntArray, 0, aAsIntArray.Length); + memory.Validate(42, -1); + } + + [Fact] + public static void CreateFromPinnedArrayWithNegativeStartAndLength() + { + int[] a = new int[3]; + Assert.Throws(() => MemoryMarshal.CreateFromPinnedArray(a, -1, 0)); + } + + [Fact] + public static void CreateFromPinnedArrayWithStartTooLargeAndLength() + { + int[] a = new int[3]; + Assert.Throws(() => MemoryMarshal.CreateFromPinnedArray(a, 4, 0)); + } + + [Fact] + public static void CreateFromPinnedArrayWithStartAndNegativeLength() + { + int[] a = new int[3]; + Assert.Throws(() => MemoryMarshal.CreateFromPinnedArray(a, 0, -1)); + } + + [Fact] + public static void CreateFromPinnedArrayWithStartAndLengthTooLarge() + { + int[] a = new int[3]; + Assert.Throws(() => MemoryMarshal.CreateFromPinnedArray(a, 3, 1)); + Assert.Throws(() => MemoryMarshal.CreateFromPinnedArray(a, 2, 2)); + Assert.Throws(() => MemoryMarshal.CreateFromPinnedArray(a, 1, 3)); + Assert.Throws(() => MemoryMarshal.CreateFromPinnedArray(a, 0, 4)); + Assert.Throws(() => MemoryMarshal.CreateFromPinnedArray(a, int.MaxValue, int.MaxValue)); + } + + [Fact] + public static void CreateFromPinnedArrayWithStartAndLengthBothEqual() + { + // Valid for start to equal the array length. This returns an empty memory that starts "just past the array." + int[] a = { 91, 92, 93 }; + Memory pinnedMemory = MemoryMarshal.CreateFromPinnedArray(a, 3, 0); + pinnedMemory.Validate(); + } + + [Fact] + public static unsafe void CreateFromPinnedArrayVerifyPinning() + { + int[] pinnedArray = { 90, 91, 92, 93, 94, 95, 96, 97, 98 }; + GCHandle pinnedGCHandle = GCHandle.Alloc(pinnedArray, GCHandleType.Pinned); + + Memory pinnedMemory = MemoryMarshal.CreateFromPinnedArray(pinnedArray, 0, 2); + void* pinnedPtr = Unsafe.AsPointer(ref MemoryMarshal.GetReference(pinnedMemory.Span)); + void* memoryHandlePinnedPtr = pinnedMemory.Pin().Pointer; + + GC.Collect(); + GC.Collect(2); + + Assert.Equal((int)pinnedPtr, (int)Unsafe.AsPointer(ref MemoryMarshal.GetReference(pinnedMemory.Span))); + Assert.Equal((int)memoryHandlePinnedPtr, (int)pinnedGCHandle.AddrOfPinnedObject().ToPointer()); + + pinnedGCHandle.Free(); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/DangerousCreate.cs b/external/corefx/src/System.Memory/tests/MemoryMarshal/CreateReadOnlySpan.cs similarity index 55% rename from external/corefx/src/System.Memory/tests/ReadOnlySpan/DangerousCreate.cs rename to external/corefx/src/System.Memory/tests/MemoryMarshal/CreateReadOnlySpan.cs index e9feb2f935..347e0503e3 100644 --- a/external/corefx/src/System.Memory/tests/ReadOnlySpan/DangerousCreate.cs +++ b/external/corefx/src/System.Memory/tests/MemoryMarshal/CreateReadOnlySpan.cs @@ -10,10 +10,10 @@ using static System.TestHelpers; namespace System.SpanTests { - public static partial class ReadOnlySpanTests + public static partial class MemoryMarshalTests { [Fact] - public static void DangerousCreate1() + public static void CreateReadOnlySpan() { TestClass testClass = new TestClass { @@ -23,11 +23,21 @@ namespace System.SpanTests C3 = 'd', C4 = 'e' }; - ReadOnlySpan span = ReadOnlySpan.DangerousCreate(testClass, ref testClass.C1, 3); + ReadOnlySpan span = MemoryMarshal.CreateReadOnlySpan(ref testClass.C1, 3); span.Validate('b', 'c', 'd'); ref char pc1 = ref Unsafe.AsRef(in MemoryMarshal.GetReference(span)); Assert.True(Unsafe.AreSame(ref testClass.C1, ref pc1)); } + + [Fact] + public static void ReadOnlySpanGetReferencePointerCreateReadOnlySpan() + { + TestClass testClass = new TestClass(); + ReadOnlySpan span = MemoryMarshal.CreateReadOnlySpan(ref testClass.C1, 3); + + ref char pinnableReference = ref Unsafe.AsRef(in MemoryMarshal.GetReference(span)); + Assert.True(Unsafe.AreSame(ref testClass.C1, ref pinnableReference)); + } } } diff --git a/external/corefx/src/System.Memory/tests/Span/DangerousCreate.cs b/external/corefx/src/System.Memory/tests/MemoryMarshal/CreateSpan.cs similarity index 58% rename from external/corefx/src/System.Memory/tests/Span/DangerousCreate.cs rename to external/corefx/src/System.Memory/tests/MemoryMarshal/CreateSpan.cs index ad6e968b8b..05672a6ae9 100644 --- a/external/corefx/src/System.Memory/tests/Span/DangerousCreate.cs +++ b/external/corefx/src/System.Memory/tests/MemoryMarshal/CreateSpan.cs @@ -10,10 +10,10 @@ using static System.TestHelpers; namespace System.SpanTests { - public static partial class SpanTests + public static partial class MemoryMarshalTests { [Fact] - public static void DangerousCreate1() + public static void CreateSpan() { TestClass testClass = new TestClass { @@ -23,11 +23,22 @@ namespace System.SpanTests C3 = 'd', C4 = 'e' }; - Span span = Span.DangerousCreate(testClass, ref testClass.C1, 3); + Span span = MemoryMarshal.CreateSpan(ref testClass.C1, 3); span.Validate('b', 'c', 'd'); ref char pc1 = ref MemoryMarshal.GetReference(span); Assert.True(Unsafe.AreSame(ref testClass.C1, ref pc1)); } + + [Fact] + public static void SpanGetReferencePointerCreateSpan() + { + TestClass testClass = new TestClass(); + Span span = MemoryMarshal.CreateSpan(ref testClass.C1, 3); + + ref char pinnableReference = ref MemoryMarshal.GetReference(span); + Assert.True(Unsafe.AreSame(ref testClass.C1, ref pinnableReference)); + } + } } diff --git a/external/corefx/src/System.Memory/tests/MemoryMarshal/GetReference.cs b/external/corefx/src/System.Memory/tests/MemoryMarshal/GetReference.cs index 3993b353e0..1f5efc24f8 100644 --- a/external/corefx/src/System.Memory/tests/MemoryMarshal/GetReference.cs +++ b/external/corefx/src/System.Memory/tests/MemoryMarshal/GetReference.cs @@ -46,16 +46,6 @@ namespace System.SpanTests } } - [Fact] - public static void SpanGetReferencePointerDangerousCreate1() - { - TestClass testClass = new TestClass(); - Span span = Span.DangerousCreate(testClass, ref testClass.C1, 3); - - ref char pinnableReference = ref MemoryMarshal.GetReference(span); - Assert.True(Unsafe.AreSame(ref testClass.C1, ref pinnableReference)); - } - [Fact] public static void SpanGetReferenceEmpty() { @@ -101,16 +91,6 @@ namespace System.SpanTests } } - [Fact] - public static void ReadOnlySpanGetReferencePointerDangerousCreate1() - { - TestClass testClass = new TestClass(); - ReadOnlySpan span = ReadOnlySpan.DangerousCreate(testClass, ref testClass.C1, 3); - - ref char pinnableReference = ref Unsafe.AsRef(in MemoryMarshal.GetReference(span)); - Assert.True(Unsafe.AreSame(ref testClass.C1, ref pinnableReference)); - } - [Fact] public static void ReadOnlySpanGetReferenceEmpty() { diff --git a/external/corefx/src/System.Memory/tests/MemoryMarshal/ToEnumerable.cs b/external/corefx/src/System.Memory/tests/MemoryMarshal/ToEnumerable.cs new file mode 100644 index 0000000000..afb86d69a7 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/MemoryMarshal/ToEnumerable.cs @@ -0,0 +1,90 @@ +// 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.Collections.Generic; +using Xunit; +using System.Linq; +using System.Runtime.InteropServices; + +namespace System.MemoryTests +{ + public static partial class MemoryTests + { + [Fact] + public static void ToEnumerable() + { + int[] a = { 91, 92, 93 }; + var memory = new Memory(a); + IEnumerable copy = MemoryMarshal.ToEnumerable(memory); + Assert.Equal(a, copy); + } + + [Fact] + public static void ToEnumerableWithIndex() + { + int[] a = { 91, 92, 93, 94, 95 }; + var memory = new Memory(a); + IEnumerable copy = MemoryMarshal.ToEnumerable(memory.Slice(2)); + + Assert.Equal(new int[] { 93, 94, 95 }, copy); + } + + [Fact] + public static void ToEnumerableWithIndexAndLength() + { + int[] a = { 91, 92, 93 }; + var memory = new Memory(a, 1, 1); + IEnumerable copy = MemoryMarshal.ToEnumerable(memory); + Assert.Equal(new int[] { 92 }, copy); + } + + [Fact] + public static void ToEnumerableEmpty() + { + Memory memory = Memory.Empty; + IEnumerable copy = MemoryMarshal.ToEnumerable(memory); + Assert.Equal(0, copy.Count()); + } + + [Fact] + public static void ToEnumerableDefault() + { + Memory memory = default; + IEnumerable copy = MemoryMarshal.ToEnumerable(memory); + Assert.Equal(0, copy.Count()); + } + + [Fact] + public static void ToEnumerableForEach() + { + int[] a = { 91, 92, 93 }; + var memory = new Memory(a); + int index = 0; + foreach (int curr in MemoryMarshal.ToEnumerable(memory)) + { + Assert.Equal(a[index++], curr); + } + } + + [Fact] + public static void ToEnumerableGivenToExistingConstructor() + { + int[] a = { 91, 92, 93 }; + var memory = new Memory(a); + IEnumerable enumer = MemoryMarshal.ToEnumerable(memory); + var li = new List(enumer); + Assert.Equal(a, li); + } + + [Fact] + public static void ToEnumerableSameAsIEnumerator() + { + int[] a = { 91, 92, 93 }; + var memory = new Memory(a); + IEnumerable enumer = MemoryMarshal.ToEnumerable(memory); + IEnumerator enumerat = enumer.GetEnumerator(); + Assert.Same(enumer, enumerat); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/MemoryMarshal/TryGetArray.cs b/external/corefx/src/System.Memory/tests/MemoryMarshal/TryGetArray.cs index ebdc2ce438..045d5e9a7c 100644 --- a/external/corefx/src/System.Memory/tests/MemoryMarshal/TryGetArray.cs +++ b/external/corefx/src/System.Memory/tests/MemoryMarshal/TryGetArray.cs @@ -28,16 +28,16 @@ namespace System.MemoryTests public static void TryGetArrayFromDefaultMemory() { ReadOnlyMemory memory = default; - Assert.False(MemoryMarshal.TryGetArray(memory, out ArraySegment segment)); - Assert.True(segment.Equals(default)); + Assert.True(MemoryMarshal.TryGetArray(memory, out ArraySegment segment)); + Assert.Equal(0, segment.Array.Length); } [Fact] - public static void OwnedMemoryTryGetArray() + public static void MemoryManagerTryGetArray() { int[] array = new int[10]; - OwnedMemory owner = new CustomMemoryForTest(array); - ReadOnlyMemory memory = owner.Memory; + MemoryManager manager = new CustomMemoryForTest(array); + ReadOnlyMemory memory = manager.Memory; Assert.True(MemoryMarshal.TryGetArray(memory, out ArraySegment segment)); Assert.Equal(array.Length, segment.Count); @@ -46,5 +46,40 @@ namespace System.MemoryTests Assert.Equal(array[i], segment.Array[i]); } } + + [Fact] + public static void TryGetArrayFromEmptyMemory() + { + int[] array = new int[0]; + ReadOnlyMemory memory = array; + + Assert.True(MemoryMarshal.TryGetArray(memory, out ArraySegment segment)); + Assert.Same(array, segment.Array); + Assert.Equal(0, segment.Array.Length); + + Assert.True(MemoryMarshal.TryGetArray(ReadOnlyMemory.Empty, out ArraySegment byteSegment)); + Assert.Equal(0, byteSegment.Array.Length); + } + + [Fact] + public static void TryGetArrayFromEmptyMemoryManager() + { + int[] array = new int[0]; + MemoryManager manager = new CustomMemoryForTest(array); + + Assert.True(MemoryMarshal.TryGetArray(manager.Memory, out ArraySegment segment)); + Assert.Same(array, segment.Array); + Assert.Equal(0, segment.Array.Length); + } + + [Fact] + public static void TryGetArrayFromEmptyNonRetrievableMemoryManager() + { + using (var manager = new NativeMemoryManager(0)) + { + Assert.True(MemoryMarshal.TryGetArray(manager.Memory, out ArraySegment segment)); + Assert.Equal(0, segment.Array.Length); + } + } } } diff --git a/external/corefx/src/System.Memory/tests/MemoryMarshal/TryGetMemoryManager.cs b/external/corefx/src/System.Memory/tests/MemoryMarshal/TryGetMemoryManager.cs new file mode 100644 index 0000000000..607f2191ca --- /dev/null +++ b/external/corefx/src/System.Memory/tests/MemoryMarshal/TryGetMemoryManager.cs @@ -0,0 +1,88 @@ +// 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; +using System.Runtime.InteropServices; +using Xunit; + +namespace System.MemoryTests +{ + public static partial class MemoryMarshalTests + { + [Fact] + public static void TryGetMemoryManagerFromDefaultMemory() + { + ReadOnlyMemory memory = default; + Assert.False(MemoryMarshal.TryGetMemoryManager(memory, out MemoryManager manager)); + Assert.Null(manager); + } + + [Fact] + public static void TryGetMemoryManager() + { + int[] array = new int[10]; + MemoryManager originalManager = new CustomMemoryForTest(array); + ReadOnlyMemory memory = originalManager.Memory; + + Assert.True(MemoryMarshal.TryGetMemoryManager(memory, out CustomMemoryForTest customManager)); + Assert.Same(originalManager, customManager); + + Assert.True(MemoryMarshal.TryGetMemoryManager(memory, out MemoryManager manager)); + Assert.Same(originalManager, manager); + + Assert.False(MemoryMarshal.TryGetMemoryManager(memory, out OtherMemoryForTest notManager)); + Assert.Null(notManager); + } + + [Fact] + public static void TryGetMemoryManagerFromDefaultMemory_IndexLength() + { + ReadOnlyMemory memory = default; + Assert.False(MemoryMarshal.TryGetMemoryManager(memory, out MemoryManager manager, out int index, out int length)); + Assert.Equal(0, index); + Assert.Equal(0, length); + Assert.Null(manager); + } + + [Fact] + public static void TryGetMemoryManager_IndexLength() + { + int[] array = new int[10]; + MemoryManager originalManager = new CustomMemoryForTest(array); + ReadOnlyMemory memory = originalManager.Memory; + + for (int i = 0; i < array.Length; i++) + { + Assert.True(MemoryMarshal.TryGetMemoryManager(memory.Slice(i), out CustomMemoryForTest customOwner, out int index, out int length)); + Assert.Same(originalManager, customOwner); + Assert.Equal(i, index); + Assert.Equal(array.Length - i, length); + } + + for (int i = 0; i < array.Length; i++) + { + Assert.True(MemoryMarshal.TryGetMemoryManager(memory.Slice(i), out MemoryManager manager, out int index, out int length)); + Assert.Same(originalManager, manager); + Assert.Equal(i, index); + Assert.Equal(array.Length - i, length); + } + + for (int i = 0; i < array.Length; i++) + { + Assert.False(MemoryMarshal.TryGetMemoryManager(memory.Slice(i), out OtherMemoryForTest notManager, out int index, out int length)); + Assert.Null(notManager); + } + } + + internal class OtherMemoryForTest : MemoryManager + { + public OtherMemoryForTest() { } + + public override Span GetSpan() => throw new NotImplementedException(); + public override MemoryHandle Pin(int elementIndex = 0) => throw new NotImplementedException(); + protected override void Dispose(bool disposing) => throw new NotImplementedException(); + public override void Unpin() => throw new NotImplementedException(); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/MemoryMarshal/TryGetString.cs b/external/corefx/src/System.Memory/tests/MemoryMarshal/TryGetString.cs new file mode 100644 index 0000000000..02c55569f2 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/MemoryMarshal/TryGetString.cs @@ -0,0 +1,73 @@ +// 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 Xunit; +using System.Runtime.InteropServices; + +namespace System.MemoryTests +{ + public static partial class MemoryMarshalTests + { + [Fact] + public static void ReadOnlyMemory_TryGetString_Roundtrips() + { + string input = "0123456789"; + ReadOnlyMemory m = input.AsMemory(); + Assert.False(m.IsEmpty); + + Assert.True(MemoryMarshal.TryGetString(m, out string text, out int start, out int length)); + Assert.Same(input, text); + Assert.Equal(0, start); + Assert.Equal(input.Length, length); + + m = m.Slice(1); + Assert.True(MemoryMarshal.TryGetString(m, out text, out start, out length)); + Assert.Same(input, text); + Assert.Equal(1, start); + Assert.Equal(input.Length - 1, length); + + m = m.Slice(1); + Assert.True(MemoryMarshal.TryGetString(m, out text, out start, out length)); + Assert.Same(input, text); + Assert.Equal(2, start); + Assert.Equal(input.Length - 2, length); + + m = m.Slice(3, 2); + Assert.True(MemoryMarshal.TryGetString(m, out text, out start, out length)); + Assert.Same(input, text); + Assert.Equal(5, start); + Assert.Equal(2, length); + + m = m.Slice(m.Length); + Assert.True(MemoryMarshal.TryGetString(m, out text, out start, out length)); + Assert.Same(input, text); + Assert.Equal(7, start); + Assert.Equal(0, length); + + m = m.Slice(0); + Assert.True(MemoryMarshal.TryGetString(m, out text, out start, out length)); + Assert.Same(input, text); + Assert.Equal(7, start); + Assert.Equal(0, length); + + m = m.Slice(0, 0); + Assert.True(MemoryMarshal.TryGetString(m, out text, out start, out length)); + Assert.Same(input, text); + Assert.Equal(7, start); + Assert.Equal(0, length); + + Assert.True(m.IsEmpty); + } + + [Fact] + public static void Array_TryGetString_ReturnsFalse() + { + ReadOnlyMemory m = new char[10]; + Assert.False(MemoryMarshal.TryGetString(m, out string text, out int start, out int length)); + Assert.Null(text); + Assert.Equal(0, start); + Assert.Equal(0, length); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/MemoryPool/MemoryPool.cs b/external/corefx/src/System.Memory/tests/MemoryPool/MemoryPool.cs new file mode 100644 index 0000000000..9e2312f65b --- /dev/null +++ b/external/corefx/src/System.Memory/tests/MemoryPool/MemoryPool.cs @@ -0,0 +1,248 @@ +// 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; +using System.Collections.Generic; +using System.Runtime.InteropServices; +using System.Runtime.CompilerServices; +using Xunit; + +namespace System.MemoryTests +{ + public static partial class MemoryPoolTests + { + [Fact] + public static void ThereIsOnlyOneSharedPool() + { + MemoryPool mp1 = MemoryPool.Shared; + MemoryPool mp2 = MemoryPool.Shared; + Assert.Same(mp1, mp2); + } + + [Fact] + public static void DisposingTheSharedPoolIsANop() + { + MemoryPool mp = MemoryPool.Shared; + mp.Dispose(); + mp.Dispose(); + using (IMemoryOwner block = mp.Rent(10)) + { + Assert.True(block.Memory.Length >= 10); + } + } + + [Fact] + public static void RentWithTooLargeASize() + { + MemoryPool pool = MemoryPool.Shared; + Assert.Throws(() => pool.Rent(pool.MaxBufferSize + 1)); + } + + [Fact] + public static void MemoryPoolSpan() + { + MemoryPool pool = MemoryPool.Shared; + using (IMemoryOwner block = pool.Rent(10)) + { + Memory memory = block.Memory; + Span sp = memory.Span; + Assert.Equal(memory.Length, sp.Length); + Assert.True(MemoryMarshal.TryGetArray(memory, out ArraySegment arraySegment)); + using (MemoryHandle newMemoryHandle = memory.Pin()) + { + unsafe + { + void* pSpan = Unsafe.AsPointer(ref MemoryMarshal.GetReference(sp)); + Assert.Equal((IntPtr)newMemoryHandle.Pointer, (IntPtr)pSpan); + } + } + } + } + + + [Theory] + [InlineData(0)] + [InlineData(3)] + [InlineData(10)] + public static void MemoryPoolPin(int elementIndex) + { + MemoryPool pool = MemoryPool.Shared; + using (IMemoryOwner block = pool.Rent(10)) + { + Memory memory = block.Memory; + Span sp = memory.Span; + Assert.Equal(memory.Length, sp.Length); + Assert.True(MemoryMarshal.TryGetArray(memory, out ArraySegment segment)); + using (MemoryHandle newMemoryHandle = memory.Slice(elementIndex).Pin()) + { + unsafe + { + void* pSpan = Unsafe.AsPointer(ref MemoryMarshal.GetReference(sp.Slice(elementIndex))); + Assert.Equal((IntPtr)pSpan, ((IntPtr)newMemoryHandle.Pointer)); + } + } + } + } + + [Theory] + [InlineData(-1)] + [InlineData(int.MinValue)] + public static void MemoryPoolPinBadOffset(int elementIndex) + { + MemoryPool pool = MemoryPool.Shared; + IMemoryOwner block = pool.Rent(10); + Memory memory = block.Memory; + Span sp = memory.Span; + Assert.Equal(memory.Length, sp.Length); + Assert.Throws(() => memory.Slice(elementIndex).Pin()); + } + + [Fact] + public static void MemoryPoolPinOffsetAtEnd() + { + MemoryPool pool = MemoryPool.Shared; + IMemoryOwner block = pool.Rent(10); + Memory memory = block.Memory; + Span sp = memory.Span; + Assert.Equal(memory.Length, sp.Length); + + int elementIndex = memory.Length; + Assert.True(MemoryMarshal.TryGetArray(memory, out ArraySegment segment)); + using (MemoryHandle newMemoryHandle = memory.Slice(elementIndex).Pin()) + { + unsafe + { + void* pSpan = Unsafe.AsPointer(ref MemoryMarshal.GetReference(sp.Slice(elementIndex))); + Assert.Equal((IntPtr)pSpan, ((IntPtr)newMemoryHandle.Pointer)); + } + } + } + + [Fact] + public static void MemoryPoolPinBadOffsetTooLarge() + { + MemoryPool pool = MemoryPool.Shared; + IMemoryOwner block = pool.Rent(10); + Memory memory = block.Memory; + Span sp = memory.Span; + Assert.Equal(memory.Length, sp.Length); + + int elementIndex = memory.Length + 1; + Assert.True(MemoryMarshal.TryGetArray(memory, out ArraySegment segment)); + Assert.Throws(() => memory.Slice(elementIndex).Pin()); + } + + [Fact] + public static void EachRentalIsUniqueUntilDisposed() + { + MemoryPool pool = MemoryPool.Shared; + List> priorBlocks = new List>(); + + Random r = new Random(42); + List testInputs = new List(); + for (int i = 0; i < 100; i++) + { + testInputs.Add((Math.Abs(r.Next() % 1000)) + 1); + } + + foreach (int minBufferSize in testInputs) + { + IMemoryOwner newBlock = pool.Rent(minBufferSize); + Memory memory = newBlock.Memory; + Assert.True(memory.Length >= minBufferSize); + Assert.True(MemoryMarshal.TryGetArray(newBlock.Memory, out ArraySegment newArraySegment)); + foreach (IMemoryOwner prior in priorBlocks) + { + Assert.True(MemoryMarshal.TryGetArray(prior.Memory, out ArraySegment priorArraySegment)); + using (MemoryHandle priorMemoryHandle = prior.Memory.Pin()) + { + using (MemoryHandle newMemoryHandle = newBlock.Memory.Pin()) + { + unsafe + { + Assert.NotEqual((IntPtr)priorMemoryHandle.Pointer, (IntPtr)newMemoryHandle.Pointer); + } + } + } + } + priorBlocks.Add(newBlock); + } + + foreach (IMemoryOwner prior in priorBlocks) + { + Assert.True(MemoryMarshal.TryGetArray(prior.Memory, out ArraySegment priorArraySegment)); + prior.Dispose(); + } + } + + [Fact] + public static void RentWithDefaultSize() + { + using (IMemoryOwner block = MemoryPool.Shared.Rent(minBufferSize: -1)) + { + Assert.True(block.Memory.Length >= 1); + } + + using (IMemoryOwner block = MemoryPool.Shared.Rent(minBufferSize: -1)) + { + Assert.True(block.Memory.Length >= 1); + block.Dispose(); // intentional double dispose + } + } + + [Theory] + [MemberData(nameof(BadSizes))] + public static void RentBadSizes(int badSize) + { + MemoryPool pool = MemoryPool.Shared; + Assert.Throws(() => pool.Rent(minBufferSize: badSize)); + } + + public static IEnumerable BadSizes + { + get + { + yield return new object[] { -2 }; + yield return new object[] { int.MinValue }; + } + } + + [Fact] + public static void MemoryPoolTryGetArray() + { + using (IMemoryOwner block = MemoryPool.Shared.Rent(42)) + { + Memory memory = block.Memory; + bool success = MemoryMarshal.TryGetArray(memory, out ArraySegment arraySegment); + Assert.True(success); + Assert.Equal(memory.Length, arraySegment.Count); + unsafe + { + Assert.True(MemoryMarshal.TryGetArray(memory, out arraySegment)); + fixed (int* pArray = arraySegment.Array) + { + void* pSpan = Unsafe.AsPointer(ref MemoryMarshal.GetReference(memory.Span)); + Assert.Equal((IntPtr)pSpan, (IntPtr)pArray); + } + } + } + } + + [Fact] + public static void ExtraDisposesAreIgnored() + { + IMemoryOwner block = MemoryPool.Shared.Rent(42); + block.Dispose(); + block.Dispose(); + } + + [Fact] + public static void NoMemoryAfterDispose() + { + IMemoryOwner block = MemoryPool.Shared.Rent(42); + block.Dispose(); + Assert.Throws(() => block.Memory); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ParsersAndFormatters/Parser/ParserTests.2gbOverflow.cs b/external/corefx/src/System.Memory/tests/ParsersAndFormatters/Parser/ParserTests.2gbOverflow.cs index 6981d9ab8c..a47934c671 100644 --- a/external/corefx/src/System.Memory/tests/ParsersAndFormatters/Parser/ParserTests.2gbOverflow.cs +++ b/external/corefx/src/System.Memory/tests/ParsersAndFormatters/Parser/ParserTests.2gbOverflow.cs @@ -93,20 +93,11 @@ namespace System.Buffers.Text.Tests { get { - yield return new ParserTestData("0", 0, 'D', expectedSuccess: true) { ExpectedBytesConsumed = TwoGiB }; - yield return new ParserTestData("2", 2, 'D', expectedSuccess: true) { ExpectedBytesConsumed = TwoGiB }; - yield return new ParserTestData("21", 21, 'D', expectedSuccess: true) { ExpectedBytesConsumed = TwoGiB }; - yield return new ParserTestData("+2", 2, 'D', expectedSuccess: true) { ExpectedBytesConsumed = TwoGiB }; yield return new ParserTestData("-2", -2, 'D', expectedSuccess: true) { ExpectedBytesConsumed = TwoGiB }; yield return new ParserTestData("2147483647", 2147483647, 'D', expectedSuccess: true) { ExpectedBytesConsumed = TwoGiB }; - yield return new ParserTestData("-2147483648", -2147483648, 'D', expectedSuccess: true) { ExpectedBytesConsumed = TwoGiB }; yield return new ParserTestData("2147483648", default, 'D', expectedSuccess: false); - yield return new ParserTestData("-2147483649", default, 'D', expectedSuccess: false); yield return new ParserTestData("12345abcdefg1", 12345, 'D', expectedSuccess: true) { ExpectedBytesConsumed = TwoGiB - 8 }; - yield return new ParserTestData("1234145abcdefg1", 1234145, 'D', expectedSuccess: true) { ExpectedBytesConsumed = TwoGiB - 8 }; yield return new ParserTestData("abcdefghijklmnop1", 0, 'D', expectedSuccess: true) { ExpectedBytesConsumed = TwoGiB - 17 }; - yield return new ParserTestData("1147483648", 1147483648, 'D', expectedSuccess: true) { ExpectedBytesConsumed = TwoGiB }; - yield return new ParserTestData("-1147483649", -1147483649, 'D', expectedSuccess: true) { ExpectedBytesConsumed = TwoGiB }; } } } diff --git a/external/corefx/src/System.Memory/tests/ParsersAndFormatters/Parser/ParserTests.cs b/external/corefx/src/System.Memory/tests/ParsersAndFormatters/Parser/ParserTests.cs index 1da5faf7a1..3024f6b2b4 100644 --- a/external/corefx/src/System.Memory/tests/ParsersAndFormatters/Parser/ParserTests.cs +++ b/external/corefx/src/System.Memory/tests/ParsersAndFormatters/Parser/ParserTests.cs @@ -131,30 +131,6 @@ namespace System.Buffers.Text.Tests ReadOnlySpan utf8Text = text.ToUtf8Span(); Utf8Parser.TryParse(utf8Text, out DateTimeOffset dto, out int bytesConsumed, formatSymbol); } - - [Theory] - [MemberData(nameof(TestData.IntegerTypesTheoryData), MemberType = typeof(TestData))] - public static void FakeTestParserIntegerN(Type integerType) - { - // - // [ActiveIssue("https://github.com/dotnet/corefx/issues/24986 - UTF8Parser parsing integers with 'N' format not implemented.")] - // - // This "test" may look ludicrous but it serves two useful purposes: - // - // - It maintains Utf8Parser code coverage at 100% so that endless dev cycles aren't wasted drilling down into it to inspect for code coverage regressions. - // - // - As a guide to enabling the 'N' tests when the parsing is implemented. - // - try - { - TryParseUtf8(integerType, Array.Empty(), out _, out _, 'N'); - Assert.False(true, - $"Thank you for implementing the TryParse 'N' format. You can now disable this test and change {nameof(TestData.IsParsingImplemented)}() so it no longer suppresses 'N' testing."); - } - catch (NotImplementedException) - { - } - } } } diff --git a/external/corefx/src/System.Memory/tests/ParsersAndFormatters/Parser/TestData.Parser.Integer.cs b/external/corefx/src/System.Memory/tests/ParsersAndFormatters/Parser/TestData.Parser.Integer.cs index 8e12d876b3..e5fe562305 100644 --- a/external/corefx/src/System.Memory/tests/ParsersAndFormatters/Parser/TestData.Parser.Integer.cs +++ b/external/corefx/src/System.Memory/tests/ParsersAndFormatters/Parser/TestData.Parser.Integer.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Linq; +using System.Globalization; using System.Numerics; using System.Collections.Generic; @@ -212,8 +213,8 @@ namespace System.Buffers.Text.Tests for (int offset = -20; offset <= 0; offset++) { BigInteger bigValue = maxValue + offset; - string textD = bigValue.ToString("D"); - string text = bigValue.ToString(format.Symbol.ToString()); + string textD = bigValue.ToString("D", CultureInfo.InvariantCulture); + string text = bigValue.ToString(format.Symbol.ToString(), CultureInfo.InvariantCulture); T expectedValue = (T)(Convert.ChangeType(textD, typeof(T))); yield return new ParserTestData(text, expectedValue, format.Symbol, expectedSuccess: true); } @@ -222,13 +223,13 @@ namespace System.Buffers.Text.Tests for (int offset = 1; offset <= 20; offset++) { BigInteger bigValue = maxValue + offset; - string text = bigValue.ToString(format.Symbol.ToString()); + string text = bigValue.ToString(format.Symbol.ToString(), CultureInfo.InvariantCulture); yield return new ParserTestData(text, default, format.Symbol, expectedSuccess: false); } { BigInteger bigValue = maxValue * 10; - string text = bigValue.ToString(format.Symbol.ToString()); + string text = bigValue.ToString(format.Symbol.ToString(), CultureInfo.InvariantCulture); yield return new ParserTestData(text, default, format.Symbol, expectedSuccess: false); } @@ -238,8 +239,8 @@ namespace System.Buffers.Text.Tests for (int offset = 0; offset <= 20; offset++) { BigInteger bigValue = minValue + offset; - string textD = bigValue.ToString("D"); - string text = bigValue.ToString(format.Symbol.ToString()); + string textD = bigValue.ToString("D", CultureInfo.InvariantCulture); + string text = bigValue.ToString(format.Symbol.ToString(), CultureInfo.InvariantCulture); T expectedValue = (T)(Convert.ChangeType(textD, typeof(T))); yield return new ParserTestData(text, expectedValue, format.Symbol, expectedSuccess: true); } @@ -248,18 +249,95 @@ namespace System.Buffers.Text.Tests for (int offset = -20; offset <= -1; offset++) { BigInteger bigValue = minValue + offset; - string text = bigValue.ToString(format.Symbol.ToString()); + string text = bigValue.ToString(format.Symbol.ToString(), CultureInfo.InvariantCulture); yield return new ParserTestData(text, default, format.Symbol, expectedSuccess: false); } { BigInteger bigValue = minValue * 10; - string text = bigValue.ToString(format.Symbol.ToString()); + string text = bigValue.ToString(format.Symbol.ToString(), CultureInfo.InvariantCulture); yield return new ParserTestData(text, default, format.Symbol, expectedSuccess: false); } } } + + if (format.Symbol == 'N' || format.Symbol == 'n') + { + // "N" format parsing + foreach (ParserTestData testData in TestDataForNFormat.ConvertTestDataForNFormat()) + { + yield return testData; + } + } } } + + // Test data specific to the "N" format. This set is up-converted and reused for all the integer types. + // Non-N-specific issues like overflow and underflow detection are already covered by GeneralIntegerParserTestData(). + private static IEnumerable> TestDataForNFormat + { + get + { + yield return new ParserTestData("12,3", 123, 'N', expectedSuccess: true); + yield return new ParserTestData("1,0,4", 104, 'N', expectedSuccess: true); + + yield return new ParserTestData("1,,23", 123, 'N', expectedSuccess: true); // Comma placement is completely flexible. + yield return new ParserTestData("+1,,23", 123, 'N', expectedSuccess: true); // Comma placement is completely flexible. + yield return new ParserTestData("-1,,23", -123, 'N', expectedSuccess: true); // Comma placement is completely flexible. + + yield return new ParserTestData(",234", default, 'N', expectedSuccess: false); // Leading comma not allowed. + yield return new ParserTestData("+,234", default, 'N', expectedSuccess: false); // Leading comma not allowed. + yield return new ParserTestData("-,234", default, 'N', expectedSuccess: false); // Leading comma not allowed. + + yield return new ParserTestData("104,", 104, 'N', expectedSuccess: true); // Trailing comma is allowed. + yield return new ParserTestData("104,,", 104, 'N', expectedSuccess: true); // Trailing comma is allowed. + yield return new ParserTestData("104,.00", 104, 'N', expectedSuccess: true); // Trailing comma is allowed. + + yield return new ParserTestData(".", default, 'N', expectedSuccess: false); // Standalone period not allowed. + yield return new ParserTestData(".0", 0, 'N', expectedSuccess: true); // But missing digits on either side allowed (as long as not both) + yield return new ParserTestData("5.", 5, 'N', expectedSuccess: true); // But missing digits on either side allowed (as long as not both) + + yield return new ParserTestData("+", default, 'N', expectedSuccess: false); // Standalone sign symbol not allowed + yield return new ParserTestData("-", default, 'N', expectedSuccess: false); // Standalone sign symbol not allowed + + yield return new ParserTestData("2.000000000000000000000000000000000", 2, 'N', expectedSuccess: true); // Decimal portion allowed as long as its 0. + yield return new ParserTestData("2.000000000000000000000000000000001", default, 'N', expectedSuccess: false); + yield return new ParserTestData(".1", default, 'N', expectedSuccess: false); + + yield return new ParserTestData("2.0,0", 2, 'N', expectedSuccess: true) { ExpectedBytesConsumed = 3 }; // Commas must appear before the decimal point, not after. + } + } + + private static IEnumerable> ConvertTestDataForNFormat(this IEnumerable> testData) => testData.Select(td => td.ConvertTestDataForNFormat()); + + private static ParserTestData ConvertTestDataForNFormat(this ParserTestData testData) + { + Type t = typeof(T); + bool isSignedType = t == typeof(sbyte) || t == typeof(short) || t == typeof(int) || t == typeof(long); + if (testData.ExpectedValue < 0 && !isSignedType) + return new ParserTestData(testData.Text, default, testData.FormatSymbol, expectedSuccess: false); // Unsigned parsers will never produce negative values. + + T convertedValue; + if (t == typeof(sbyte)) + convertedValue = (T)(object)testData.ExpectedValue; + else if (t == typeof(byte)) + convertedValue = (T)(object)Convert.ToByte(testData.ExpectedValue); + else if (t == typeof(short)) + convertedValue = (T)(object)Convert.ToInt16(testData.ExpectedValue); + else if (t == typeof(ushort)) + convertedValue = (T)(object)Convert.ToUInt16(testData.ExpectedValue); + else if (t == typeof(int)) + convertedValue = (T)(object)Convert.ToInt32(testData.ExpectedValue); + else if (t == typeof(uint)) + convertedValue = (T)(object)Convert.ToUInt32(testData.ExpectedValue); + else if (t == typeof(long)) + convertedValue = (T)(object)Convert.ToInt64(testData.ExpectedValue); + else if (t == typeof(ulong)) + convertedValue = (T)(object)Convert.ToUInt64(testData.ExpectedValue); + else + throw new Exception("Not an integer type: " + t); + + return new ParserTestData(testData.Text, convertedValue, testData.FormatSymbol, testData.ExpectedSuccess) { ExpectedBytesConsumed = testData.ExpectedBytesConsumed }; + } } } diff --git a/external/corefx/src/System.Memory/tests/ParsersAndFormatters/Parser/TestData.Parser.TimeSpan.cs b/external/corefx/src/System.Memory/tests/ParsersAndFormatters/Parser/TestData.Parser.TimeSpan.cs index 74fb809744..a471a90785 100644 --- a/external/corefx/src/System.Memory/tests/ParsersAndFormatters/Parser/TestData.Parser.TimeSpan.cs +++ b/external/corefx/src/System.Memory/tests/ParsersAndFormatters/Parser/TestData.Parser.TimeSpan.cs @@ -4,6 +4,7 @@ using System.Text; using System.Linq; +using System.Globalization; using System.Collections.Generic; namespace System.Buffers.Text.Tests @@ -45,7 +46,7 @@ namespace System.Buffers.Text.Tests StringBuilder sb = new StringBuilder(); for (int i = 0; i < numComponents; i++) { - sb.Append((20 + i).ToString()); + sb.Append((20 + i).ToString("D", CultureInfo.InvariantCulture)); if (i != numComponents - 1) { char separator = ((separatorMask & (1 << i)) != 0) ? '.' : ':'; diff --git a/external/corefx/src/System.Memory/tests/ParsersAndFormatters/PseudoDateTime.cs b/external/corefx/src/System.Memory/tests/ParsersAndFormatters/PseudoDateTime.cs index e546f3e809..36e2a8648e 100644 --- a/external/corefx/src/System.Memory/tests/ParsersAndFormatters/PseudoDateTime.cs +++ b/external/corefx/src/System.Memory/tests/ParsersAndFormatters/PseudoDateTime.cs @@ -2,6 +2,8 @@ // 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.Globalization; + namespace System.Buffers.Text.Tests { // @@ -38,9 +40,9 @@ namespace System.Buffers.Text.Tests if (Fraction != 0) return null; - return Month.ToString("D2") + "/" + Day.ToString("D2") + "/" + Year.ToString("D4") + - " " + Hour.ToString("D2") + ":" + Minute.ToString("D2") + ":" + Second.ToString("D2") + - " " + (OffsetNegative ? "-" : "+") + OffsetHours.ToString("D2") + ":" + OffsetMinutes.ToString("D2"); + return Month.ToString("D2", CultureInfo.InvariantCulture) + "/" + Day.ToString("D2", CultureInfo.InvariantCulture) + "/" + Year.ToString("D4", CultureInfo.InvariantCulture) + + " " + Hour.ToString("D2", CultureInfo.InvariantCulture) + ":" + Minute.ToString("D2", CultureInfo.InvariantCulture) + ":" + Second.ToString("D2", CultureInfo.InvariantCulture) + + " " + (OffsetNegative ? "-" : "+") + OffsetHours.ToString("D2", CultureInfo.InvariantCulture) + ":" + OffsetMinutes.ToString("D2", CultureInfo.InvariantCulture); } } @@ -53,8 +55,8 @@ namespace System.Buffers.Text.Tests if (OffsetHours != 0 || OffsetMinutes != 0) return null; - return Month.ToString("D2") + "/" + Day.ToString("D2") + "/" + Year.ToString("D4") + - " " + Hour.ToString("D2") + ":" + Minute.ToString("D2") + ":" + Second.ToString("D2"); + return Month.ToString("D2", CultureInfo.InvariantCulture) + "/" + Day.ToString("D2", CultureInfo.InvariantCulture) + "/" + Year.ToString("D4", CultureInfo.InvariantCulture) + + " " + Hour.ToString("D2", CultureInfo.InvariantCulture) + ":" + Minute.ToString("D2", CultureInfo.InvariantCulture) + ":" + Second.ToString("D2", CultureInfo.InvariantCulture); } } @@ -94,8 +96,8 @@ namespace System.Buffers.Text.Tests monthAbbrevation = "Jan"; } - return dayAbbreviation + ", " + Day.ToString("D2") + " " + monthAbbrevation + " " + Year.ToString("D4") + " " - + Hour.ToString("D2") + ":" + Minute.ToString("D2") + ":" + Second.ToString("D2") + " " + return dayAbbreviation + ", " + Day.ToString("D2", CultureInfo.InvariantCulture) + " " + monthAbbrevation + " " + Year.ToString("D4", CultureInfo.InvariantCulture) + " " + + Hour.ToString("D2", CultureInfo.InvariantCulture) + ":" + Minute.ToString("D2", CultureInfo.InvariantCulture) + ":" + Second.ToString("D2", CultureInfo.InvariantCulture) + " " + "GMT"; } } @@ -109,8 +111,8 @@ namespace System.Buffers.Text.Tests if (OffsetHours != 0 || OffsetMinutes != 0) return null; - return Year.ToString("D4") + "-" + Month.ToString("D2") + "-" + Day.ToString("D2") + "T" - + Hour.ToString("D2") + ":" + Minute.ToString("D2") + ":" + Second.ToString("D2") + return Year.ToString("D4", CultureInfo.InvariantCulture) + "-" + Month.ToString("D2", CultureInfo.InvariantCulture) + "-" + Day.ToString("D2", CultureInfo.InvariantCulture) + "T" + + Hour.ToString("D2", CultureInfo.InvariantCulture) + ":" + Minute.ToString("D2", CultureInfo.InvariantCulture) + ":" + Second.ToString("D2", CultureInfo.InvariantCulture) + "." + Fraction.ToString("D7"); } } @@ -120,10 +122,10 @@ namespace System.Buffers.Text.Tests { get { - return Year.ToString("D4") + "-" + Month.ToString("D2") + "-" + Day.ToString("D2") + "T" - + Hour.ToString("D2") + ":" + Minute.ToString("D2") + ":" + Second.ToString("D2") - + "." + Fraction.ToString("D7") - + (OffsetNegative ? "-" : "+") + OffsetHours.ToString("D2") + ":" + OffsetMinutes.ToString("D2"); + return Year.ToString("D4", CultureInfo.InvariantCulture) + "-" + Month.ToString("D2", CultureInfo.InvariantCulture) + "-" + Day.ToString("D2", CultureInfo.InvariantCulture) + "T" + + Hour.ToString("D2", CultureInfo.InvariantCulture) + ":" + Minute.ToString("D2", CultureInfo.InvariantCulture) + ":" + Second.ToString("D2", CultureInfo.InvariantCulture) + + "." + Fraction.ToString("D7", CultureInfo.InvariantCulture) + + (OffsetNegative ? "-" : "+") + OffsetHours.ToString("D2", CultureInfo.InvariantCulture) + ":" + OffsetMinutes.ToString("D2", CultureInfo.InvariantCulture); } } diff --git a/external/corefx/src/System.Memory/tests/ParsersAndFormatters/StandardFormatTests.cs b/external/corefx/src/System.Memory/tests/ParsersAndFormatters/StandardFormatTests.cs index 4bdc5f918b..326bb0f08b 100644 --- a/external/corefx/src/System.Memory/tests/ParsersAndFormatters/StandardFormatTests.cs +++ b/external/corefx/src/System.Memory/tests/ParsersAndFormatters/StandardFormatTests.cs @@ -39,7 +39,7 @@ namespace System.Buffers.Text.Tests [InlineData("", default(char), default(byte))] public static void StandardFormatParseSpan(string formatString, char expectedSymbol, byte expectedPrecision) { - ReadOnlySpan span = formatString.AsReadOnlySpan(); + ReadOnlySpan span = formatString.AsSpan(); StandardFormat format = StandardFormat.Parse(span); Assert.Equal(expectedSymbol, format.Symbol); Assert.Equal(expectedPrecision, format.Precision); diff --git a/external/corefx/src/System.Memory/tests/ParsersAndFormatters/SupportedFormats.cs b/external/corefx/src/System.Memory/tests/ParsersAndFormatters/SupportedFormats.cs index 929e9e2867..736b2dc79a 100644 --- a/external/corefx/src/System.Memory/tests/ParsersAndFormatters/SupportedFormats.cs +++ b/external/corefx/src/System.Memory/tests/ParsersAndFormatters/SupportedFormats.cs @@ -29,13 +29,11 @@ namespace System.Buffers.Text.Tests public static bool IsParsingImplemented(this SupportedFormat f) => f.IsParsingImplemented(typeof(T)); // - // Used to disable automatic generation of ParserTestData from FormatterTestData + // Used to disable automatic generation of ParserTestData from FormatterTestData. Useful for bringing up new + // formats as you can use this shutoff valve to bring up formatting without having to bring up parsing at the same time. // public static bool IsParsingImplemented(this SupportedFormat f, Type t) { - if (IntegerTypes.Contains(t) && (f.Symbol == 'N' || f.Symbol == 'n')) - return false; - return true; } diff --git a/external/corefx/src/System.Memory/tests/ParsersAndFormatters/TestData.cs b/external/corefx/src/System.Memory/tests/ParsersAndFormatters/TestData.cs index f30e4f23b6..2f0a571410 100644 --- a/external/corefx/src/System.Memory/tests/ParsersAndFormatters/TestData.cs +++ b/external/corefx/src/System.Memory/tests/ParsersAndFormatters/TestData.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Linq; +using System.Globalization; using System.Collections.Generic; namespace System.Buffers.Text.Tests @@ -219,6 +220,7 @@ namespace System.Buffers.Text.Tests { get { +#if !MONO foreach (long l in Int64TestData) { yield return l; @@ -244,6 +246,10 @@ namespace System.Buffers.Text.Tests yield return 0.00m; yield return -1.00m; yield return -0.00m; +#else + // See https://github.com/mono/mono/issues/8710 for details. + yield break; +#endif } } @@ -397,16 +403,16 @@ namespace System.Buffers.Text.Tests yield return "0.000045"; yield return "000000123.000045"; - yield return decimal.MinValue.ToString("G"); - yield return decimal.MaxValue.ToString("G"); + yield return decimal.MinValue.ToString("G", CultureInfo.InvariantCulture); + yield return decimal.MaxValue.ToString("G", CultureInfo.InvariantCulture); - yield return float.MinValue.ToString("G9"); - yield return float.MaxValue.ToString("G9"); - yield return float.Epsilon.ToString("G9"); + yield return float.MinValue.ToString("G9", CultureInfo.InvariantCulture); + yield return float.MaxValue.ToString("G9", CultureInfo.InvariantCulture); + yield return float.Epsilon.ToString("G9", CultureInfo.InvariantCulture); - yield return double.MinValue.ToString("G17"); - yield return double.MaxValue.ToString("G17"); - yield return double.Epsilon.ToString("G9"); + yield return double.MinValue.ToString("G17", CultureInfo.InvariantCulture); + yield return double.MaxValue.ToString("G17", CultureInfo.InvariantCulture); + yield return double.Epsilon.ToString("G9", CultureInfo.InvariantCulture); yield return "1e"; yield return "1e+"; diff --git a/external/corefx/src/System.Memory/tests/ParsersAndFormatters/TestUtils.cs b/external/corefx/src/System.Memory/tests/ParsersAndFormatters/TestUtils.cs index f02f6fefdf..c7cbd788f1 100644 --- a/external/corefx/src/System.Memory/tests/ParsersAndFormatters/TestUtils.cs +++ b/external/corefx/src/System.Memory/tests/ParsersAndFormatters/TestUtils.cs @@ -62,7 +62,7 @@ namespace System.Buffers.Text.Tests string sign = isNegative ? "-" : "+"; - return "[" + sign + dec.ToString("G") + ", scale=" + scale + "]"; + return "[" + sign + dec.ToString("G", CultureInfo.InvariantCulture) + ", scale=" + scale + "]"; } else if (value is TimeSpan timeSpan) { diff --git a/external/corefx/src/System.Memory/tests/Performance/Perf.MemorySlice.cs b/external/corefx/src/System.Memory/tests/Performance/Perf.Memory.Slice.cs similarity index 98% rename from external/corefx/src/System.Memory/tests/Performance/Perf.MemorySlice.cs rename to external/corefx/src/System.Memory/tests/Performance/Perf.Memory.Slice.cs index 27cecdef49..f12c371c57 100644 --- a/external/corefx/src/System.Memory/tests/Performance/Perf.MemorySlice.cs +++ b/external/corefx/src/System.Memory/tests/Performance/Perf.Memory.Slice.cs @@ -123,7 +123,7 @@ namespace System.Memory.Tests public static void ReadOnlyMemory_Byte_TryGetArray() { ReadOnlyMemory memory = new byte[1]; - ArraySegment result; + ArraySegment result = default; foreach (BenchmarkIteration iteration in Benchmark.Iterations) { @@ -144,7 +144,7 @@ namespace System.Memory.Tests public static void ReadOnlyMemory_Char_TryGetArray() { ReadOnlyMemory memory = new char[1]; - ArraySegment result; + ArraySegment result = default; foreach (BenchmarkIteration iteration in Benchmark.Iterations) { diff --git a/external/corefx/src/System.Memory/tests/Performance/Perf.Memory.Span.cs b/external/corefx/src/System.Memory/tests/Performance/Perf.Memory.Span.cs new file mode 100644 index 0000000000..f2db92e0f4 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Performance/Perf.Memory.Span.cs @@ -0,0 +1,166 @@ +// 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; +using System.MemoryTests; +using Microsoft.Xunit.Performance; +using Xunit; + +namespace System.Memory.Tests +{ + public class Perf_Memory_Span + { + private const int InnerCount = 1_000_000; + + [Benchmark(InnerIterationCount = InnerCount)] + public static void SpanFromDefaultIntegerMemory() + { + Memory memory = default; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + Span span = memory.Span; + } + } + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + public static void SpanFromIntegerArrayBackedMemory() + { + int[] a = { 91, 92, -93, 94 }; + var memory = new Memory(a); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + Span span = memory.Span; + } + } + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + public static void SpanFromCharArrayBackedMemory() + { + char[] a = "9192-9394".ToCharArray(); + var memory = new Memory(a); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + Span span = memory.Span; + } + } + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + public static void SpanFromObjectArrayBackedMemory() + { + object o1 = new object(); + object o2 = new object(); + object[] a = { o1, o2 }; + var memory = new Memory(a); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + Span span = memory.Span; + } + } + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + public static void SpanFromStringBackedMemory() + { + string a = "9192-9394"; + ReadOnlyMemory memory = a.AsMemory(); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySpan span = memory.Span; + } + } + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + public static void SpanFromIntegerMemoryManager() + { + int[] a = { 91, 92, -93, 94 }; + var memory = new Memory(a); + MemoryManager manager = new CustomMemoryForTest(a); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + Span span = manager.Memory.Span; + } + } + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + public static void SpanFromCharMemoryManager() + { + char[] a = "9192-9394".ToCharArray(); + var memory = new Memory(a); + MemoryManager manager = new CustomMemoryForTest(a); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + Span span = manager.Memory.Span; + } + } + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + public static void SpanFromObjectMemoryManager() + { + object o1 = new object(); + object o2 = new object(); + object[] a = { o1, o2 }; + var memory = new Memory(a); + MemoryManager manager = new CustomMemoryForTest(a); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + Span span = manager.Memory.Span; + } + } + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/Performance/Perf.ReadOnlySequence.Enumerator.cs b/external/corefx/src/System.Memory/tests/Performance/Perf.ReadOnlySequence.Enumerator.cs new file mode 100644 index 0000000000..4d6d45c188 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Performance/Perf.ReadOnlySequence.Enumerator.cs @@ -0,0 +1,301 @@ +// 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.Memory.Tests; +using System.MemoryTests; +using Microsoft.Xunit.Performance; +using Xunit; + +namespace System.Buffers.Tests +{ + public class Perf_ReadOnlySequence_Enumerator + { + private const int InnerCount = 100_000; + volatile static int _volatileInt = 0; + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_Array(int bufSize, int bufOffset) + { + var buffer = new ReadOnlySequence(new byte[bufSize], bufOffset, bufSize - 2 * bufOffset); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + foreach(ReadOnlyMemory memory in buffer) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_Memory(int bufSize, int bufOffset) + { + var manager = new CustomMemoryForTest(new byte[bufSize], bufOffset, bufSize - 2 * bufOffset); + var buffer = new ReadOnlySequence(manager.Memory); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + foreach(ReadOnlyMemory memory in buffer) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_SingleSegment(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new byte[bufSize]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment1, bufSize - bufOffset); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + foreach(ReadOnlyMemory memory in buffer) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount / 10)] + [InlineData(10_000, 100)] + private static void Byte_MultiSegment(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new byte[bufSize / 10]); + BufferSegment segment2 = segment1; + for (int j = 0; j < 10; j++) + segment2 = segment2.Append(new byte[bufSize / 10]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment2, bufSize / 10 - bufOffset); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + foreach(ReadOnlyMemory memory in buffer) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + private static void Byte_Empty() + { + ReadOnlySequence buffer = ReadOnlySequence.Empty; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + foreach(ReadOnlyMemory memory in buffer) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + private static void Byte_Default() + { + ReadOnlySequence buffer = default; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + foreach(ReadOnlyMemory memory in buffer) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Char_Array(int bufSize, int bufOffset) + { + var buffer = new ReadOnlySequence(new char[bufSize], bufOffset, bufSize - 2 * bufOffset); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + foreach(ReadOnlyMemory memory in buffer) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Char_Memory(int bufSize, int bufOffset) + { + var manager = new CustomMemoryForTest(new char[bufSize], bufOffset, bufSize - 2 * bufOffset); + var buffer = new ReadOnlySequence(manager.Memory); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + foreach(ReadOnlyMemory memory in buffer) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Char_SingleSegment(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new char[bufSize]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment1, bufSize - bufOffset); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + foreach(ReadOnlyMemory memory in buffer) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount / 10)] + [InlineData(10_000, 100)] + private static void Char_MultiSegment(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new char[bufSize / 10]); + BufferSegment segment2 = segment1; + for (int j = 0; j < 10; j++) + segment2 = segment2.Append(new char[bufSize / 10]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment2, bufSize / 10 - bufOffset); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + foreach(ReadOnlyMemory memory in buffer) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void String(int bufSize, int bufOffset) + { + ReadOnlyMemory strMemory = new string('a', bufSize).AsMemory(); + strMemory = strMemory.Slice(bufOffset, bufSize - bufOffset); + var buffer = new ReadOnlySequence(strMemory); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + foreach(ReadOnlyMemory memory in buffer) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + private static void Char_Empty() + { + ReadOnlySequence buffer = ReadOnlySequence.Empty; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + foreach(ReadOnlyMemory memory in buffer) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + private static void Char_Default() + { + ReadOnlySequence buffer = default; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + foreach(ReadOnlyMemory memory in buffer) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + } +} diff --git a/external/corefx/src/System.Memory/tests/Performance/Perf.ReadOnlySequence.First.cs b/external/corefx/src/System.Memory/tests/Performance/Perf.ReadOnlySequence.First.cs new file mode 100644 index 0000000000..3d5b69e1bf --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Performance/Perf.ReadOnlySequence.First.cs @@ -0,0 +1,302 @@ +// 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.Memory.Tests; +using System.MemoryTests; +using Microsoft.Xunit.Performance; +using Xunit; + +namespace System.Buffers.Tests +{ + public class Perf_ReadOnlySequence_First + { + private const int InnerCount = 100_000; + volatile static int _volatileInt = 0; + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_Array(int bufSize, int bufOffset) + { + var buffer = new ReadOnlySequence(new byte[bufSize], bufOffset, bufSize - 2 * bufOffset); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlyMemory first = buffer.First; + localInt ^= first.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_Memory(int bufSize, int bufOffset) + { + var manager = new CustomMemoryForTest(new byte[bufSize], bufOffset, bufSize - 2 * bufOffset); + var buffer = new ReadOnlySequence(manager.Memory); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlyMemory first = buffer.First; + localInt ^= first.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_SingleSegment(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new byte[bufSize]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment1, bufSize - bufOffset); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlyMemory first = buffer.First; + localInt ^= first.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_MultiSegment(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new byte[bufSize / 10]); + BufferSegment segment2 = segment1; + for (int j = 0; j < 10; j++) + segment2 = segment2.Append(new byte[bufSize / 10]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment2, bufSize / 10 - bufOffset); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlyMemory first = buffer.First; + localInt ^= first.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + private static void Byte_Empty() + { + ReadOnlySequence buffer = ReadOnlySequence.Empty; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlyMemory first = buffer.First; + localInt ^= first.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + private static void Byte_Default() + { + ReadOnlySequence buffer = default; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlyMemory first = buffer.First; + localInt ^= first.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Char_Array(int bufSize, int bufOffset) + { + var buffer = new ReadOnlySequence(new char[bufSize], bufOffset, bufSize - 2 * bufOffset); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlyMemory first = buffer.First; + localInt ^= first.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Char_Memory(int bufSize, int bufOffset) + { + var manager = new CustomMemoryForTest(new char[bufSize], bufOffset, bufSize - 2 * bufOffset); + var buffer = new ReadOnlySequence(manager.Memory); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlyMemory first = buffer.First; + localInt ^= first.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Char_SingleSegment(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new char[bufSize]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment1, bufSize - bufOffset); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlyMemory first = buffer.First; + localInt ^= first.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Char_MultiSegment(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new char[bufSize / 10]); + BufferSegment segment2 = segment1; + for (int j = 0; j < 10; j++) + segment2 = segment2.Append(new char[bufSize / 10]); + + var buffer = new ReadOnlySequence(segment1, bufOffset, segment2, bufSize / 10 - bufOffset); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlyMemory first = buffer.First; + localInt ^= first.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void String(int bufSize, int bufOffset) + { + ReadOnlyMemory memory = new string('a', bufSize).AsMemory(); + memory = memory.Slice(bufOffset, bufSize - 2 * bufOffset); + var buffer = new ReadOnlySequence(memory); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlyMemory first = buffer.First; + localInt ^= first.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + private static void Char_Empty() + { + ReadOnlySequence buffer = ReadOnlySequence.Empty; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlyMemory first = buffer.First; + localInt ^= first.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + private static void Char_Default() + { + ReadOnlySequence buffer = default; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlyMemory first = buffer.First; + localInt ^= first.Length; + } + } + _volatileInt = localInt; + } + } + + } +} diff --git a/external/corefx/src/System.Memory/tests/Performance/Perf.ReadOnlySequence.GetPosition.cs b/external/corefx/src/System.Memory/tests/Performance/Perf.ReadOnlySequence.GetPosition.cs new file mode 100644 index 0000000000..17cfb18cc3 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Performance/Perf.ReadOnlySequence.GetPosition.cs @@ -0,0 +1,215 @@ +// 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.Memory.Tests; +using Microsoft.Xunit.Performance; +using Xunit; + +namespace System.Buffers.Tests +{ + public class Rerf_ReadOnlySequence_GetPosition + { + private const int InnerCount = 10_000; + volatile static int _volatileInt = 0; + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_Array(int bufSize, int bufOffset) + { + var buffer = new ReadOnlySequence(new byte[bufSize], bufOffset, bufSize - 2 * bufOffset); + int offset = (int)buffer.Length / 10; + SequencePosition end = buffer.GetPosition(0, buffer.End); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + SequencePosition pos = buffer.Start; + while (!pos.Equals(end)) + { + pos = buffer.GetPosition(offset, pos); + localInt ^= pos.GetInteger(); + } + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_MultiSegment(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new byte[bufSize / 10]); + BufferSegment segment2 = segment1; + for (int j = 0; j < 10; j++) + segment2 = segment2.Append(new byte[bufSize / 10]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment2, bufSize / 10 - bufOffset); + int offset = (int)buffer.Length / 10; + SequencePosition end = buffer.GetPosition(0, buffer.End); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + SequencePosition pos = buffer.Start; + while (!pos.Equals(end)) + { + pos = buffer.GetPosition(offset, pos); + localInt ^= pos.GetInteger(); + } + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount * 10)] + private static void Byte_Empty() + { + ReadOnlySequence buffer = ReadOnlySequence.Empty; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + SequencePosition pos = buffer.GetPosition(0); + localInt ^= pos.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount * 10)] + private static void Byte_Default() + { + ReadOnlySequence buffer = default; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + SequencePosition pos = buffer.GetPosition(0); + localInt ^= pos.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Char_MultiSegment(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new char[bufSize / 10]); + BufferSegment segment2 = segment1; + for (int j = 0; j < 10; j++) + segment2 = segment2.Append(new char[bufSize / 10]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment2, bufSize / 10 - bufOffset); + int offset = (int)buffer.Length / 10; + SequencePosition end = buffer.GetPosition(0, buffer.End); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + SequencePosition pos = buffer.Start; + while (!pos.Equals(end)) + { + pos = buffer.GetPosition(offset, pos); + localInt ^= pos.GetInteger(); + } + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void String(int bufSize, int bufOffset) + { + ReadOnlyMemory memory = new string('a', bufSize).AsMemory(); + memory = memory.Slice(bufOffset, bufSize - 2 * bufOffset); + var buffer = new ReadOnlySequence(memory); + int offset = (int)buffer.Length / 10; + SequencePosition end = buffer.GetPosition(0, buffer.End); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + SequencePosition pos = buffer.Start; + while (!pos.Equals(end)) + { + pos = buffer.GetPosition(offset, pos); + localInt ^= pos.GetInteger(); + } + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount * 10)] + private static void Char_Empty() + { + ReadOnlySequence buffer = ReadOnlySequence.Empty; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + SequencePosition p = buffer.GetPosition(0); + localInt ^= p.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount * 10)] + private static void Char_Default() + { + ReadOnlySequence buffer = default; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + SequencePosition p = buffer.GetPosition(0); + localInt ^= p.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + } +} diff --git a/external/corefx/src/System.Memory/tests/Performance/Perf.ReadOnlySequence.Slice.cs b/external/corefx/src/System.Memory/tests/Performance/Perf.ReadOnlySequence.Slice.cs new file mode 100644 index 0000000000..3723eff0ef --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Performance/Perf.ReadOnlySequence.Slice.cs @@ -0,0 +1,766 @@ +// 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.Memory.Tests; +using System.MemoryTests; +using Microsoft.Xunit.Performance; +using Xunit; + +namespace System.Buffers.Tests +{ + public class Perf_ReadOnlySequence_Slice + { + private const int InnerCount = 100_000; + volatile static int _volatileInt = 0; + + #region Byte_Array + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_Array_Long(int bufSize, int bufOffset) + { + var buffer = new ReadOnlySequence(new byte[bufSize], bufOffset, bufSize - 2 * bufOffset); + long offset = buffer.Length / 10; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(offset); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_Array_LongLong(int bufSize, int bufOffset) + { + var buffer = new ReadOnlySequence(new byte[bufSize], bufOffset, bufSize - 2 * bufOffset); + long offset = buffer.Length / 20; + long sliceLen = buffer.Length - 2 * offset; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(offset, sliceLen); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_Array_LongPos(int bufSize, int bufOffset) + { + var buffer = new ReadOnlySequence(new byte[bufSize], bufOffset, bufSize - 2 * bufOffset); + long offset = buffer.Length / 20; + SequencePosition end = buffer.GetPosition(0, buffer.End); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(offset, end); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_Array_Pos(int bufSize, int bufOffset) + { + var buffer = new ReadOnlySequence(new byte[bufSize], bufOffset, bufSize - 2 * bufOffset); + SequencePosition start = buffer.GetPosition(0); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(start); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_Array_PosLong(int bufSize, int bufOffset) + { + var buffer = new ReadOnlySequence(new byte[bufSize], bufOffset, bufSize - 2 * bufOffset); + long sliceLen = buffer.Length; + SequencePosition start = buffer.GetPosition(0); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(start, sliceLen); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_Array_PosPos(int bufSize, int bufOffset) + { + var buffer = new ReadOnlySequence(new byte[bufSize], bufOffset, bufSize - 2 * bufOffset); + SequencePosition start = buffer.GetPosition(0); + SequencePosition end = buffer.GetPosition(0, buffer.End); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(start, end); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + #endregion + + #region Byte_Memory + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_Memory_Long(int bufSize, int bufOffset) + { + var manager = new CustomMemoryForTest(new byte[bufSize], bufOffset, bufSize - 2 * bufOffset); + var buffer = new ReadOnlySequence(manager.Memory); + long offset = buffer.Length / 10; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(offset); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_Memory_LongLong(int bufSize, int bufOffset) + { + var manager = new CustomMemoryForTest(new byte[bufSize], bufOffset, bufSize - 2 * bufOffset); + var buffer = new ReadOnlySequence(manager.Memory); + long offset = buffer.Length / 20; + long sliceLen = buffer.Length - 2 * offset; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(offset, sliceLen); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_Memory_LongPos(int bufSize, int bufOffset) + { + var manager = new CustomMemoryForTest(new byte[bufSize], bufOffset, bufSize - 2 * bufOffset); + var buffer = new ReadOnlySequence(manager.Memory); + long offset = buffer.Length / 20; + SequencePosition end = buffer.GetPosition(0, buffer.End); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(offset, end); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_Memory_Pos(int bufSize, int bufOffset) + { + var manager = new CustomMemoryForTest(new byte[bufSize], bufOffset, bufSize - 2 * bufOffset); + var buffer = new ReadOnlySequence(manager.Memory); + SequencePosition start = buffer.GetPosition(0); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(start); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_Memory_PosLong(int bufSize, int bufOffset) + { + var manager = new CustomMemoryForTest(new byte[bufSize], bufOffset, bufSize - 2 * bufOffset); + var buffer = new ReadOnlySequence(manager.Memory); + long sliceLen = buffer.Length; + SequencePosition start = buffer.GetPosition(0); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(start, sliceLen); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_Memory_PosPos(int bufSize, int bufOffset) + { + var manager = new CustomMemoryForTest(new byte[bufSize], bufOffset, bufSize - 2 * bufOffset); + var buffer = new ReadOnlySequence(manager.Memory); + SequencePosition start = buffer.GetPosition(0); + SequencePosition end = buffer.GetPosition(0, buffer.End); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(start, end); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + #endregion + + #region Byte_SingleSegment + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_SingleSegment_Long(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new byte[bufSize]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment1, bufSize - bufOffset); + long offset = buffer.Length / 10; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(offset); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_SingleSegment_LongLong(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new byte[bufSize]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment1, bufSize - bufOffset); + long offset = buffer.Length / 20; + long sliceLen = buffer.Length - 2 * offset; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(offset, sliceLen); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_SingleSegment_LongPos(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new byte[bufSize]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment1, bufSize - bufOffset); + long offset = buffer.Length / 20; + SequencePosition end = buffer.GetPosition(0, buffer.End); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(offset, end); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_SingleSegment_Pos(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new byte[bufSize]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment1, bufSize - bufOffset); + SequencePosition start = buffer.GetPosition(0); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(start); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_SingleSegment_PosLong(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new byte[bufSize]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment1, bufSize - bufOffset); + long sliceLen = buffer.Length; + SequencePosition start = buffer.GetPosition(0); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(start, sliceLen); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_SingleSegment_PosPos(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new byte[bufSize]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment1, bufSize - bufOffset); + SequencePosition start = buffer.GetPosition(0); + SequencePosition end = buffer.GetPosition(0, buffer.End); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(start, end); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + #endregion + + #region Byte_MultiSegment + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_MultiSegment_Long(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new byte[bufSize / 10]); + BufferSegment segment2 = segment1; + for (int j = 0; j < 10; j++) + segment2 = segment2.Append(new byte[bufSize / 10]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment2, bufSize / 10 - bufOffset); + long offset = buffer.Length / 10; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(offset); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_MultiSegment_LongLong(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new byte[bufSize / 10]); + BufferSegment segment2 = segment1; + for (int j = 0; j < 10; j++) + segment2 = segment2.Append(new byte[bufSize / 10]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment2, bufSize / 10 - bufOffset); + long offset = buffer.Length / 20; + long sliceLen = buffer.Length - 2 * offset; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(offset, sliceLen); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_MultiSegment_LongPos(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new byte[bufSize / 10]); + BufferSegment segment2 = segment1; + for (int j = 0; j < 10; j++) + segment2 = segment2.Append(new byte[bufSize / 10]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment2, bufSize / 10 - bufOffset); + long offset = buffer.Length / 20; + SequencePosition end = buffer.GetPosition(0, buffer.End); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(offset, end); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_MultiSegment_Pos(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new byte[bufSize / 10]); + BufferSegment segment2 = segment1; + for (int j = 0; j < 10; j++) + segment2 = segment2.Append(new byte[bufSize / 10]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment2, bufSize / 10 - bufOffset); + SequencePosition start = buffer.GetPosition(0); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(start); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_MultiSegment_PosLong(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new byte[bufSize / 10]); + BufferSegment segment2 = segment1; + for (int j = 0; j < 10; j++) + segment2 = segment2.Append(new byte[bufSize / 10]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment2, bufSize / 10 - bufOffset); + long sliceLen = buffer.Length; + SequencePosition start = buffer.GetPosition(0); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(start, sliceLen); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_MultiSegment_PosPos(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new byte[bufSize / 10]); + BufferSegment segment2 = segment1; + for (int j = 0; j < 10; j++) + segment2 = segment2.Append(new byte[bufSize / 10]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment2, bufSize / 10 - bufOffset); + SequencePosition start = buffer.GetPosition(0); + SequencePosition end = buffer.GetPosition(0, buffer.End); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(start, end); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + #endregion + + #region String + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void String_Long(int bufSize, int bufOffset) + { + ReadOnlyMemory memory = new string('a', bufSize).AsMemory(); + memory = memory.Slice(bufOffset, bufSize - 2 * bufOffset); + var buffer = new ReadOnlySequence(memory); + long offset = buffer.Length / 10; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(offset); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void String_LongLong(int bufSize, int bufOffset) + { + ReadOnlyMemory memory = new string('a', bufSize).AsMemory(); + memory = memory.Slice(bufOffset, bufSize - 2 * bufOffset); + var buffer = new ReadOnlySequence(memory); + long offset = buffer.Length / 20; + long sliceLen = buffer.Length - 2 * offset; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(offset, sliceLen); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void String_LongPos(int bufSize, int bufOffset) + { + ReadOnlyMemory memory = new string('a', bufSize).AsMemory(); + memory = memory.Slice(bufOffset, bufSize - 2 * bufOffset); + var buffer = new ReadOnlySequence(memory); + long offset = buffer.Length / 20; + SequencePosition end = buffer.GetPosition(0, buffer.End); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(offset, end); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void String_Pos(int bufSize, int bufOffset) + { + ReadOnlyMemory memory = new string('a', bufSize).AsMemory(); + memory = memory.Slice(bufOffset, bufSize - 2 * bufOffset); + var buffer = new ReadOnlySequence(memory); + SequencePosition start = buffer.GetPosition(0); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(start); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void String_PosLong(int bufSize, int bufOffset) + { + ReadOnlyMemory memory = new string('a', bufSize).AsMemory(); + memory = memory.Slice(bufOffset, bufSize - 2 * bufOffset); + var buffer = new ReadOnlySequence(memory); + long sliceLen = buffer.Length; + SequencePosition start = buffer.GetPosition(0); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(start, sliceLen); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void String_PosPos(int bufSize, int bufOffset) + { + ReadOnlyMemory memory = new string('a', bufSize).AsMemory(); + memory = memory.Slice(bufOffset, bufSize - 2 * bufOffset); + var buffer = new ReadOnlySequence(memory); + SequencePosition start = buffer.GetPosition(0); + SequencePosition end = buffer.GetPosition(0, buffer.End); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + ReadOnlySequence temp = buffer.Slice(start, end); + localInt ^= temp.Start.GetInteger(); + } + } + _volatileInt = localInt; + } + } + + #endregion + + } +} diff --git a/external/corefx/src/System.Memory/tests/Performance/Perf.ReadOnlySequence.TryGet.cs b/external/corefx/src/System.Memory/tests/Performance/Perf.ReadOnlySequence.TryGet.cs new file mode 100644 index 0000000000..2d761181f9 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Performance/Perf.ReadOnlySequence.TryGet.cs @@ -0,0 +1,314 @@ +// 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.Memory.Tests; +using System.MemoryTests; +using Microsoft.Xunit.Performance; +using Xunit; + +namespace System.Buffers.Tests +{ + public class Perf_ReadOnlySequence_TryGet + { + private const int InnerCount = 100_000; + volatile static int _volatileInt = 0; + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_Array(int bufSize, int bufOffset) + { + var buffer = new ReadOnlySequence(new byte[bufSize], bufOffset, bufSize - 2 * bufOffset); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + SequencePosition p = buffer.Start; + while (buffer.TryGet(ref p, out ReadOnlyMemory memory)) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_Memory(int bufSize, int bufOffset) + { + var manager = new CustomMemoryForTest(new byte[bufSize], bufOffset, bufSize - 2 * bufOffset); + var buffer = new ReadOnlySequence(manager.Memory); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + SequencePosition p = buffer.Start; + while (buffer.TryGet(ref p, out ReadOnlyMemory memory)) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Byte_SingleSegment(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new byte[bufSize]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment1, bufSize - bufOffset); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + SequencePosition p = buffer.Start; + while (buffer.TryGet(ref p, out ReadOnlyMemory memory)) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount / 10)] + [InlineData(10_000, 100)] + private static void Byte_MultiSegment(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new byte[bufSize / 10]); + BufferSegment segment2 = segment1; + for (int j = 0; j < 10; j++) + segment2 = segment2.Append(new byte[bufSize / 10]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment2, bufSize / 10 - bufOffset); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + SequencePosition p = buffer.Start; + while (buffer.TryGet(ref p, out ReadOnlyMemory memory)) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + private static void Byte_Empty() + { + ReadOnlySequence buffer = ReadOnlySequence.Empty; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + SequencePosition p = buffer.Start; + while (buffer.TryGet(ref p, out ReadOnlyMemory memory)) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + private static void Byte_Default() + { + ReadOnlySequence buffer = default; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + SequencePosition p = buffer.Start; + while (buffer.TryGet(ref p, out ReadOnlyMemory memory)) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Char_Array(int bufSize, int bufOffset) + { + var buffer = new ReadOnlySequence(new char[bufSize], bufOffset, bufSize - 2 * bufOffset); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + SequencePosition p = buffer.Start; + while (buffer.TryGet(ref p, out ReadOnlyMemory memory)) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Char_Memory(int bufSize, int bufOffset) + { + var manager = new CustomMemoryForTest(new char[bufSize], bufOffset, bufSize - 2 * bufOffset); + var buffer = new ReadOnlySequence(manager.Memory); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + SequencePosition p = buffer.Start; + while (buffer.TryGet(ref p, out ReadOnlyMemory memory)) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void Char_SingleSegment(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new char[bufSize]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment1, bufSize - bufOffset); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + SequencePosition p = buffer.Start; + while (buffer.TryGet(ref p, out ReadOnlyMemory memory)) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount / 10)] + [InlineData(10_000, 100)] + private static void Char_MultiSegment(int bufSize, int bufOffset) + { + var segment1 = new BufferSegment(new char[bufSize / 10]); + BufferSegment segment2 = segment1; + for (int j = 0; j < 10; j++) + segment2 = segment2.Append(new char[bufSize / 10]); + var buffer = new ReadOnlySequence(segment1, bufOffset, segment2, bufSize / 10 - bufOffset); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + SequencePosition p = buffer.Start; + while (buffer.TryGet(ref p, out ReadOnlyMemory memory)) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [InlineData(10_000, 100)] + private static void String(int bufSize, int bufOffset) + { + ReadOnlyMemory strMemory = new string('a', bufSize).AsMemory(); + strMemory = strMemory.Slice(bufOffset, bufSize - bufOffset); + var buffer = new ReadOnlySequence(strMemory); + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + SequencePosition p = buffer.Start; + while (buffer.TryGet(ref p, out ReadOnlyMemory memory)) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + private static void Char_Empty() + { + ReadOnlySequence buffer = ReadOnlySequence.Empty; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + SequencePosition p = buffer.Start; + while (buffer.TryGet(ref p, out ReadOnlyMemory memory)) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + private static void Char_Default() + { + ReadOnlySequence buffer = default; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + int localInt = 0; + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + SequencePosition p = buffer.Start; + while (buffer.TryGet(ref p, out ReadOnlyMemory memory)) + localInt ^= memory.Length; + } + } + _volatileInt = localInt; + } + } + + } +} diff --git a/external/corefx/src/System.Memory/tests/Performance/Perf.Span.BinaryReadAndWrite.cs b/external/corefx/src/System.Memory/tests/Performance/Perf.Span.BinaryReadAndWrite.cs index 1e0e9f278c..78f536b98a 100644 --- a/external/corefx/src/System.Memory/tests/Performance/Perf.Span.BinaryReadAndWrite.cs +++ b/external/corefx/src/System.Memory/tests/Performance/Perf.Span.BinaryReadAndWrite.cs @@ -5,6 +5,7 @@ using Microsoft.Xunit.Performance; using Xunit; using System.Net; +using System.Runtime.InteropServices; using static System.Buffers.Binary.BinaryPrimitives; @@ -26,7 +27,7 @@ namespace System.Buffers.Binary.Tests { for (int i = 0; i < Benchmark.InnerIterationCount; i++) { - readStruct = ReadMachineEndian(spanBE); + readStruct = MemoryMarshal.Read(spanBE); if (BitConverter.IsLittleEndian) { readStruct.S0 = ReverseEndianness(readStruct.S0); @@ -61,7 +62,7 @@ namespace System.Buffers.Binary.Tests { for (int i = 0; i < Benchmark.InnerIterationCount; i++) { - readStruct = ReadMachineEndian(spanLE); + readStruct = MemoryMarshal.Read(spanLE); if (!BitConverter.IsLittleEndian) { readStruct.S0 = ReverseEndianness(readStruct.S0); diff --git a/external/corefx/src/System.Memory/tests/Performance/Perf.Span.Clear.cs b/external/corefx/src/System.Memory/tests/Performance/Perf.Span.Clear.cs index 8557482041..65179cd1f8 100644 --- a/external/corefx/src/System.Memory/tests/Performance/Perf.Span.Clear.cs +++ b/external/corefx/src/System.Memory/tests/Performance/Perf.Span.Clear.cs @@ -9,7 +9,9 @@ namespace System.Memory.Tests { public class Perf_Span_Clear { - [Benchmark] + private const int NumIters = 10000; + + [Benchmark(InnerIterationCount = NumIters)] [InlineData(0)] [InlineData(1)] [InlineData(2)] @@ -41,7 +43,47 @@ namespace System.Memory.Tests { using (iteration.StartMeasurement()) { - for (int i = 0; i < 10000; i++) + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + span.Clear(); + } + } + } + } + + [Benchmark(InnerIterationCount = NumIters)] + [InlineData(0)] + [InlineData(1)] + [InlineData(2)] + [InlineData(3)] + [InlineData(4)] + [InlineData(5)] + [InlineData(6)] + [InlineData(7)] + [InlineData(8)] + [InlineData(9)] + [InlineData(10)] + [InlineData(11)] + [InlineData(12)] + [InlineData(13)] + [InlineData(14)] + [InlineData(15)] + [InlineData(16)] + [InlineData(32)] + [InlineData(64)] + [InlineData(100)] + [InlineData(1000)] + [InlineData(10000)] + [InlineData(100000)] + public void References(int size) + { + var a = new object[size]; + var span = new Span(a); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) { span.Clear(); } diff --git a/external/corefx/src/System.Memory/tests/Performance/Perf.Span.IndexOf.cs b/external/corefx/src/System.Memory/tests/Performance/Perf.Span.IndexOf.cs index dd678920f4..b260183cc3 100644 --- a/external/corefx/src/System.Memory/tests/Performance/Perf.Span.IndexOf.cs +++ b/external/corefx/src/System.Memory/tests/Performance/Perf.Span.IndexOf.cs @@ -2,6 +2,7 @@ // 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.Runtime.InteropServices; using Microsoft.Xunit.Performance; using Xunit; @@ -44,7 +45,7 @@ namespace System.Memory.Tests { Span charSpan = new char[size]; charSpan[size / 2] = '5'; - Span byteSpan = charSpan.AsBytes(); + Span byteSpan = MemoryMarshal.AsBytes(charSpan); int index = 0; foreach (BenchmarkIteration iteration in Benchmark.Iterations) @@ -120,7 +121,7 @@ namespace System.Memory.Tests { Span charSpan = new char[size]; charSpan[size / 2] = '5'; - Span byteSpan = charSpan.AsBytes(); + Span byteSpan = MemoryMarshal.AsBytes(charSpan); int index = 0; foreach (BenchmarkIteration iteration in Benchmark.Iterations) diff --git a/external/corefx/src/System.Memory/tests/Performance/Perf.Span.IndexOfAny.cs b/external/corefx/src/System.Memory/tests/Performance/Perf.Span.IndexOfAny.cs index 26c5f5bf95..f4a78276f5 100644 --- a/external/corefx/src/System.Memory/tests/Performance/Perf.Span.IndexOfAny.cs +++ b/external/corefx/src/System.Memory/tests/Performance/Perf.Span.IndexOfAny.cs @@ -2,6 +2,7 @@ // 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.Runtime.InteropServices; using Microsoft.Xunit.Performance; using Xunit; @@ -44,7 +45,7 @@ namespace System.Memory.Tests { Span charSpan = new char[size]; charSpan[size / 2] = '5'; - Span byteSpan = charSpan.AsBytes(); + Span byteSpan = MemoryMarshal.AsBytes(charSpan); int index = 0; foreach (BenchmarkIteration iteration in Benchmark.Iterations) @@ -118,7 +119,7 @@ namespace System.Memory.Tests { Span charSpan = new char[size]; charSpan[size / 2] = '5'; - Span byteSpan = charSpan.AsBytes(); + Span byteSpan = MemoryMarshal.AsBytes(charSpan); int index = 0; foreach (BenchmarkIteration iteration in Benchmark.Iterations) @@ -193,7 +194,7 @@ namespace System.Memory.Tests { Span charSpan = new char[size]; charSpan[size / 2] = '5'; - Span byteSpan = charSpan.AsBytes(); + Span byteSpan = MemoryMarshal.AsBytes(charSpan); ReadOnlySpan values = new ReadOnlySpan(new byte[] { 53, 54, 55, 56 }); // '5' = 53 int index = 0; @@ -219,7 +220,7 @@ namespace System.Memory.Tests { Span charSpan = new char[size]; charSpan[size / 2] = '5'; - Span byteSpan = charSpan.AsBytes(); + Span byteSpan = MemoryMarshal.AsBytes(charSpan); ReadOnlySpan values = new ReadOnlySpan(new byte[] { 54, 55, 56, 57 }); // '5' = 53 int index = 0; @@ -245,7 +246,7 @@ namespace System.Memory.Tests { Span charSpan = new char[size]; charSpan[size / 2] = '5'; - Span byteSpan = charSpan.AsBytes(); + Span byteSpan = MemoryMarshal.AsBytes(charSpan); ReadOnlySpan values = new ReadOnlySpan(new byte[] { 54, 55, 56, 53 }); // '5' = 53 int index = 0; diff --git a/external/corefx/src/System.Memory/tests/Performance/System.Memory.Performance.Tests.csproj b/external/corefx/src/System.Memory/tests/Performance/System.Memory.Performance.Tests.csproj index 692fb4e62b..28249af672 100644 --- a/external/corefx/src/System.Memory/tests/Performance/System.Memory.Performance.Tests.csproj +++ b/external/corefx/src/System.Memory/tests/Performance/System.Memory.Performance.Tests.csproj @@ -10,6 +10,13 @@ + + + + + + + @@ -18,7 +25,6 @@ - @@ -26,6 +32,12 @@ Common\System\PerfUtils.cs + + Common\System\MemoryTests\CustomMemoryForTest.cs + + + Common\System\Memory\Tests\BufferSegment.cs + diff --git a/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/BufferSegment.cs b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/BufferSegment.cs new file mode 100644 index 0000000000..345585f315 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/BufferSegment.cs @@ -0,0 +1,26 @@ +// 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; + +namespace System.Memory.Tests +{ + internal class BufferSegment : ReadOnlySequenceSegment + { + public BufferSegment(ReadOnlyMemory memory) + { + Memory = memory; + } + + public BufferSegment Append(ReadOnlyMemory memory) + { + var segment = new BufferSegment(memory) + { + RunningIndex = RunningIndex + Memory.Length + }; + Next = segment; + return segment; + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceFactory.byte.cs b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceFactory.byte.cs new file mode 100644 index 0000000000..35a63cd40f --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceFactory.byte.cs @@ -0,0 +1,138 @@ +// 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; +using System.Collections.Generic; +using System.Linq; + +namespace System.Memory.Tests +{ + public abstract class ReadOnlySequenceFactory + { + public static ReadOnlySequenceFactory ArrayFactory { get; } = new ArrayTestSequenceFactory(); + public static ReadOnlySequenceFactory MemoryFactory { get; } = new MemoryTestSequenceFactory(); + public static ReadOnlySequenceFactory SingleSegmentFactory { get; } = new SingleSegmentTestSequenceFactory(); + public static ReadOnlySequenceFactory SegmentPerItemFactory { get; } = new BytePerSegmentTestSequenceFactory(); + public static ReadOnlySequenceFactory SplitInThree { get; } = new SplitInThreeSegmentsTestSequenceFactory(); + + public abstract ReadOnlySequence CreateOfSize(int size); + public abstract ReadOnlySequence CreateWithContent(T[] data); + + internal class ArrayTestSequenceFactory : ReadOnlySequenceFactory + { + public override ReadOnlySequence CreateOfSize(int size) + { + return new ReadOnlySequence(new T[size + 20], 10, size); + } + + public override ReadOnlySequence CreateWithContent(T[] data) + { + var startSegment = new T[data.Length + 20]; + Array.Copy(data, 0, startSegment, 10, data.Length); + return new ReadOnlySequence(startSegment, 10, data.Length); + } + } + + internal class MemoryTestSequenceFactory : ReadOnlySequenceFactory + { + public override ReadOnlySequence CreateOfSize(int size) + { + return CreateWithContent(new T[size]); + } + + public override ReadOnlySequence CreateWithContent(T[] data) + { + var startSegment = new T[data.Length + 20]; + Array.Copy(data, 0, startSegment, 10, data.Length); + return new ReadOnlySequence(new Memory(startSegment, 10, data.Length)); + } + } + + internal class SingleSegmentTestSequenceFactory : ReadOnlySequenceFactory + { + public override ReadOnlySequence CreateOfSize(int size) + { + return CreateWithContent(new T[size]); + } + + public override ReadOnlySequence CreateWithContent(T[] data) + { + return CreateSegments(data); + } + } + + internal class BytePerSegmentTestSequenceFactory : ReadOnlySequenceFactory + { + public override ReadOnlySequence CreateOfSize(int size) + { + return CreateWithContent(new T[size]); + } + + public override ReadOnlySequence CreateWithContent(T[] data) + { + var segments = new List(); + + segments.Add(Array.Empty()); + foreach (var b in data) + { + segments.Add(new[] { b }); + segments.Add(Array.Empty()); + } + + return CreateSegments(segments.ToArray()); + } + } + + internal class SplitInThreeSegmentsTestSequenceFactory : ReadOnlySequenceFactory + { + public override ReadOnlySequence CreateOfSize(int size) + { + return CreateWithContent(new T[size]); + } + + public override ReadOnlySequence CreateWithContent(T[] data) + { + var third = data.Length / 3; + + return CreateSegments( + data.AsSpan(0, third).ToArray(), + data.AsSpan(third, third).ToArray(), + data.AsSpan(2 * third, data.Length - 2 * third).ToArray()); + } + } + + public static ReadOnlySequence CreateSegments(params T[][] inputs) => CreateSegments((IEnumerable)inputs); + + public static ReadOnlySequence CreateSegments(IEnumerable inputs) + { + if (inputs == null || inputs.Count() == 0) + { + throw new InvalidOperationException(); + } + + BufferSegment last = null; + BufferSegment first = null; + foreach(T[] input in inputs) + { + int length = input.Length; + int dataOffset = length / 2; + var items = new T[length * 2]; + input.CopyTo(items, dataOffset); + Memory memory = new Memory(items, dataOffset, length); + + if (first == null) + { + first = new BufferSegment(memory); + last = first; + } + else + { + last = last.Append(memory); + } + } + + return new ReadOnlySequence(first, 0, last, last.Memory.Length); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceFactory.char.cs b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceFactory.char.cs new file mode 100644 index 0000000000..0002e634a5 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceFactory.char.cs @@ -0,0 +1,49 @@ +// 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; +using System.Collections.Generic; +using System.Linq; +using System.MemoryTests; +using System.Text; + +namespace System.Memory.Tests +{ + public abstract class ReadOnlySequenceFactoryChar + { + public static ReadOnlySequenceFactory StringFactory { get; } = new StringTestSequenceFactory(); + + internal class StringTestSequenceFactory : ReadOnlySequenceFactory + { + static string s_stringData = InitalizeStringData(); + + static string InitalizeStringData() + { + IEnumerable ascii = Enumerable.Range(' ', (char)0x7f - ' '); + + return new string(ascii.Concat(ascii) + .Concat(ascii) + .Concat(ascii) + .Concat(ascii) + .Concat(ascii) + .Concat(ascii) + .Select(c => (char)c) + .ToArray()); + } + + public override ReadOnlySequence CreateOfSize(int size) + { + return new ReadOnlySequence(s_stringData.AsMemory(10, size)); + } + + public override ReadOnlySequence CreateWithContent(char[] data) + { + var startSegment = new char[data.Length + 20]; + Array.Copy(data, 0, startSegment, 10, data.Length); + var text = new string(startSegment); + return new ReadOnlySequence(text.AsMemory(10, data.Length)); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.Common.byte.cs b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.Common.byte.cs new file mode 100644 index 0000000000..deaff6e975 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.Common.byte.cs @@ -0,0 +1,112 @@ +// 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; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using Xunit; + +namespace System.Memory.Tests +{ + public class ReadOnlySequenceTestsCommonByte: ReadOnlySequenceTestsCommon + { + #region Constructor + + [Fact] + public void Ctor_Array_Offset() + { + var buffer = new ReadOnlySequence(new byte[] { 1, 2, 3, 4, 5 }, 2, 3); + Assert.Equal(buffer.ToArray(), new byte[] { 3, 4, 5 }); + } + + [Fact] + public void Ctor_Array_NoOffset() + { + var buffer = new ReadOnlySequence(new byte[] { 1, 2, 3, 4, 5 }); + Assert.Equal(buffer.ToArray(), new byte[] { 1, 2, 3, 4, 5 }); + } + + [Fact] + public void Ctor_Memory() + { + var memory = new ReadOnlyMemory(new byte[] { 1, 2, 3, 4, 5 }); + var buffer = new ReadOnlySequence(memory.Slice(2, 3)); + Assert.Equal(new byte[] { 3, 4, 5 }, buffer.ToArray()); + } + + #endregion + + [Fact] + public void HelloWorldAcrossTwoBlocks() + { + // block 1 -> block2 + // [padding..hello] -> [ world ] + const int blockSize = 4096; + + byte[] items = Encoding.ASCII.GetBytes("Hello World"); + byte[] firstItems = Enumerable.Repeat((byte)'a', blockSize - 5).Concat(items.Take(5)).ToArray(); + byte[] secondItems = items.Skip(5).Concat(Enumerable.Repeat((byte)'a', blockSize - (items.Length - 5))).ToArray(); + + var firstSegment = new BufferSegment(firstItems); + BufferSegment secondSegment = firstSegment.Append(secondItems); + + var buffer = new ReadOnlySequence(firstSegment, 0, secondSegment, items.Length - 5); + Assert.False(buffer.IsSingleSegment); + ReadOnlySequence helloBuffer = buffer.Slice(blockSize - 5); + Assert.False(helloBuffer.IsSingleSegment); + var memory = new List>(); + foreach (ReadOnlyMemory m in helloBuffer) + { + memory.Add(m); + } + + List> spans = memory; + + Assert.Equal(2, memory.Count); + var helloBytes = new byte[spans[0].Length]; + spans[0].Span.CopyTo(helloBytes); + var worldBytes = new byte[spans[1].Length]; + spans[1].Span.CopyTo(worldBytes); + Assert.Equal("Hello", Encoding.ASCII.GetString(helloBytes)); + Assert.Equal(" World", Encoding.ASCII.GetString(worldBytes)); + } + + [Fact] + public static void SliceStartPositionAndLength() + { + var segment1 = new BufferSegment(new byte[10]); + BufferSegment segment2 = segment1.Append(new byte[10]); + + var buffer = new ReadOnlySequence(segment1, 0, segment2, 10); + + ReadOnlySequence sliced = buffer.Slice(buffer.GetPosition(10), 10); + Assert.Equal(10, sliced.Length); + + Assert.Equal(segment2, sliced.Start.GetObject()); + Assert.Equal(segment2, sliced.End.GetObject()); + + Assert.Equal(0, sliced.Start.GetInteger()); + Assert.Equal(10, sliced.End.GetInteger()); + } + + [Fact] + public static void SliceStartAndEndPosition() + { + var segment1 = new BufferSegment(new byte[10]); + BufferSegment segment2 = segment1.Append(new byte[10]); + + var buffer = new ReadOnlySequence(segment1, 0, segment2, 10); + + ReadOnlySequence sliced = buffer.Slice(10, buffer.GetPosition(20)); + Assert.Equal(10, sliced.Length); + + Assert.Equal(segment2, sliced.Start.GetObject()); + Assert.Equal(segment2, sliced.End.GetObject()); + + Assert.Equal(0, sliced.Start.GetInteger()); + Assert.Equal(10, sliced.End.GetInteger()); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.Common.char.cs b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.Common.char.cs new file mode 100644 index 0000000000..f42d140297 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.Common.char.cs @@ -0,0 +1,84 @@ +// 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; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using Xunit; + +namespace System.Memory.Tests +{ + public class ReadOnlySequenceTestsCommonChar: ReadOnlySequenceTestsCommon + { + #region Constructor + + [Fact] + public void Ctor_Array_Offset() + { + var buffer = new ReadOnlySequence(new char[] { (char)1, (char)2, (char)3, (char)4, (char)5 }, 2, 3); + Assert.Equal(buffer.ToArray(), new char[] { (char)3, (char)4, (char)5 }); + } + + [Fact] + public void Ctor_Array_NoOffset() + { + var buffer = new ReadOnlySequence(new char[] { (char)1, (char)2, (char)3, (char)4, (char)5 }); + Assert.Equal(buffer.ToArray(), new char[] { (char)1, (char)2, (char)3, (char)4, (char)5 }); + } + + [Fact] + public void Ctor_Memory() + { + var memory = new ReadOnlyMemory(new char[] { (char)1, (char)2, (char)3, (char)4, (char)5 }); + var buffer = new ReadOnlySequence(memory.Slice(2, 3)); + Assert.Equal(new char[] { (char)3, (char)4, (char)5 }, buffer.ToArray()); + } + + [Fact] + public void Ctor_String() + { + ReadOnlyMemory memory = "12345".AsMemory(); + var buffer = new ReadOnlySequence(memory.Slice(2, 3)); + Assert.Equal("12345".Substring(2, 3).ToArray(), buffer.ToArray()); + } + + #endregion + + [Fact] + public void HelloWorldAcrossTwoBlocks() + { + // block 1 -> block2 + // [padding..hello] -> [ world ] + const int blockSize = 4096; + + string items = "Hello World"; + string firstItems = new string('a', blockSize - 5) + items.Substring(0, 5); + string secondItems = items.Substring(5) + new string('a', blockSize - (items.Length - 5)); + + var firstSegment = new BufferSegment(firstItems.AsMemory()); + BufferSegment secondSegment = firstSegment.Append(secondItems.AsMemory()); + + var buffer = new ReadOnlySequence(firstSegment, 0, secondSegment, items.Length - 5); + Assert.False(buffer.IsSingleSegment); + ReadOnlySequence helloBuffer = buffer.Slice(blockSize - 5); + Assert.False(helloBuffer.IsSingleSegment); + var memory = new List>(); + foreach (ReadOnlyMemory m in helloBuffer) + { + memory.Add(m); + } + + List> spans = memory; + + Assert.Equal(2, memory.Count); + var helloBytes = new char[spans[0].Length]; + spans[0].Span.CopyTo(helloBytes); + var worldBytes = new char[spans[1].Length]; + spans[1].Span.CopyTo(worldBytes); + Assert.Equal("Hello", new string(helloBytes)); + Assert.Equal(" World", new string(worldBytes)); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.Common.cs b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.Common.cs new file mode 100644 index 0000000000..685388b48e --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.Common.cs @@ -0,0 +1,421 @@ +// 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; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using Xunit; + +namespace System.Memory.Tests +{ + public abstract class ReadOnlySequenceTestsCommon + { + #region Position + + [Fact] + public void SegmentStartIsConsideredInBoundsCheck() + { + // 0 50 100 0 50 100 + // [ ##############] -> [############## ] + // ^c1 ^c2 + var bufferSegment1 = new BufferSegment(new T[49]); + BufferSegment bufferSegment2 = bufferSegment1.Append(new T[50]); + + var buffer = new ReadOnlySequence(bufferSegment1, 0, bufferSegment2, 50); + + SequencePosition c1 = buffer.GetPosition(25); // segment 1 index 75 + SequencePosition c2 = buffer.GetPosition(55); // segment 2 index 5 + + ReadOnlySequence sliced = buffer.Slice(c1, c2); + Assert.Equal(30, sliced.Length); + + c1 = buffer.GetPosition(25, buffer.Start); // segment 1 index 75 + c2 = buffer.GetPosition(55, buffer.Start); // segment 2 index 5 + + sliced = buffer.Slice(c1, c2); + Assert.Equal(30, sliced.Length); + } + + [Fact] + public void GetPositionPrefersNextSegment() + { + BufferSegment bufferSegment1 = new BufferSegment(new T[50]); + BufferSegment bufferSegment2 = bufferSegment1.Append(new T[0]); + + ReadOnlySequence buffer = new ReadOnlySequence(bufferSegment1, 0, bufferSegment2, 0); + + SequencePosition c1 = buffer.GetPosition(50); + + Assert.Equal(0, c1.GetInteger()); + Assert.Equal(bufferSegment2, c1.GetObject()); + + c1 = buffer.GetPosition(50, buffer.Start); + + Assert.Equal(0, c1.GetInteger()); + Assert.Equal(bufferSegment2, c1.GetObject()); + } + + [Fact] + public void GetPositionDoesNotCrossOutsideBuffer() + { + var bufferSegment1 = new BufferSegment(new T[100]); + BufferSegment bufferSegment2 = bufferSegment1.Append(new T[100]); + BufferSegment bufferSegment3 = bufferSegment2.Append(new T[0]); + + var buffer = new ReadOnlySequence(bufferSegment1, 0, bufferSegment2, 100); + + SequencePosition c1 = buffer.GetPosition(200); + + Assert.Equal(100, c1.GetInteger()); + Assert.Equal(bufferSegment2, c1.GetObject()); + + c1 = buffer.GetPosition(200, buffer.Start); + + Assert.Equal(100, c1.GetInteger()); + Assert.Equal(bufferSegment2, c1.GetObject()); + } + + [Fact] + public void CheckEndReachableDoesNotCrossPastEnd() + { + var bufferSegment1 = new BufferSegment(new T[100]); + BufferSegment bufferSegment2 = bufferSegment1.Append(new T[100]); + BufferSegment bufferSegment3 = bufferSegment2.Append(new T[100]); + BufferSegment bufferSegment4 = bufferSegment3.Append(new T[100]); + + var buffer = new ReadOnlySequence(bufferSegment1, 0, bufferSegment4, 100); + + SequencePosition c1 = buffer.GetPosition(200); + + Assert.Equal(0, c1.GetInteger()); + Assert.Equal(bufferSegment3, c1.GetObject()); + + ReadOnlySequence seq = buffer.Slice(0, c1); + Assert.Equal(200, seq.Length); + + c1 = buffer.GetPosition(200, buffer.Start); + + Assert.Equal(0, c1.GetInteger()); + Assert.Equal(bufferSegment3, c1.GetObject()); + + seq = buffer.Slice(0, c1); + Assert.Equal(200, seq.Length); + } + + #endregion + + #region First + + [Fact] + public void CanGetFirst() + { + var bufferSegment1 = new BufferSegment(new T[100]); + BufferSegment bufferSegment2 = bufferSegment1.Append(new T[100]); + BufferSegment bufferSegment3 = bufferSegment2.Append(new T[100]); + BufferSegment bufferSegment4 = bufferSegment3.Append(new T[200]); + + var buffer = new ReadOnlySequence(bufferSegment1, 0, bufferSegment4, 200); + + Assert.Equal(500, buffer.Length); + int length = 500; + + for (int s = 0; s < 3; s++) + { + for (int i = 100; i > 0; i--) + { + Assert.Equal(i, buffer.First.Length); + buffer = buffer.Slice(1); + length--; + Assert.Equal(length, buffer.Length); + } + } + + Assert.Equal(200, buffer.Length); + + for (int i = 200; i > 0; i--) + { + Assert.Equal(i, buffer.First.Length); + buffer = buffer.Slice(1); + length--; + Assert.Equal(length, buffer.Length); + } + + Assert.Equal(0, buffer.Length); + Assert.Equal(0, buffer.First.Length); + } + + #endregion + + #region EmptySegments + + [Fact] + public void SeekSkipsEmptySegments() + { + var bufferSegment1 = new BufferSegment(new T[100]); + BufferSegment bufferSegment2 = bufferSegment1.Append(new T[0]); + BufferSegment bufferSegment3 = bufferSegment2.Append(new T[0]); + BufferSegment bufferSegment4 = bufferSegment3.Append(new T[100]); + + var buffer = new ReadOnlySequence(bufferSegment1, 0, bufferSegment4, 100); + + SequencePosition c1 = buffer.GetPosition(100); + + Assert.Equal(0, c1.GetInteger()); + Assert.Equal(bufferSegment4, c1.GetObject()); + + c1 = buffer.GetPosition(100, buffer.Start); + + Assert.Equal(0, c1.GetInteger()); + Assert.Equal(bufferSegment4, c1.GetObject()); + } + + [Fact] + public void TryGetReturnsEmptySegments() + { + var bufferSegment1 = new BufferSegment(new T[0]); + BufferSegment bufferSegment2 = bufferSegment1.Append(new T[0]); + BufferSegment bufferSegment3 = bufferSegment2.Append(new T[0]); + BufferSegment bufferSegment4 = bufferSegment3.Append(new T[0]); + + var buffer = new ReadOnlySequence(bufferSegment1, 0, bufferSegment3, 0); + + var start = buffer.Start; + Assert.True(buffer.TryGet(ref start, out var memory)); + Assert.Equal(0, memory.Length); + Assert.True(buffer.TryGet(ref start, out memory)); + Assert.Equal(0, memory.Length); + Assert.True(buffer.TryGet(ref start, out memory)); + Assert.Equal(0, memory.Length); + Assert.False(buffer.TryGet(ref start, out memory)); + } + + [Fact] + public void SeekEmptySkipDoesNotCrossPastEnd() + { + var bufferSegment1 = new BufferSegment(new T[100]); + BufferSegment bufferSegment2 = bufferSegment1.Append(new T[0]); + BufferSegment bufferSegment3 = bufferSegment2.Append(new T[0]); + BufferSegment bufferSegment4 = bufferSegment3.Append(new T[100]); + + var buffer = new ReadOnlySequence(bufferSegment1, 0, bufferSegment2, 0); + + SequencePosition c1 = buffer.GetPosition(100); + + Assert.Equal(0, c1.GetInteger()); + Assert.Equal(bufferSegment2, c1.GetObject()); + + c1 = buffer.GetPosition(100, buffer.Start); + + Assert.Equal(0, c1.GetInteger()); + Assert.Equal(bufferSegment2, c1.GetObject()); + + // Go out of bounds for segment + Assert.Throws(() => c1 = buffer.GetPosition(150, buffer.Start)); + Assert.Throws(() => c1 = buffer.GetPosition(250, buffer.Start)); + } + + [Fact] + public void SeekEmptySkipDoesNotCrossPastEndWithExtraChainedBlocks() + { + var bufferSegment1 = new BufferSegment(new T[100]); + BufferSegment bufferSegment2 = bufferSegment1.Append(new T[0]); + BufferSegment bufferSegment3 = bufferSegment2.Append(new T[0]); + BufferSegment bufferSegment4 = bufferSegment3.Append(new T[100]); + BufferSegment bufferSegment5 = bufferSegment4.Append(new T[0]); + BufferSegment bufferSegment6 = bufferSegment5.Append(new T[100]); + + var buffer = new ReadOnlySequence(bufferSegment1, 0, bufferSegment2, 0); + + SequencePosition c1 = buffer.GetPosition(100); + + Assert.Equal(0, c1.GetInteger()); + Assert.Equal(bufferSegment2, c1.GetObject()); + + c1 = buffer.GetPosition(100, buffer.Start); + + Assert.Equal(0, c1.GetInteger()); + Assert.Equal(bufferSegment2, c1.GetObject()); + + // Go out of bounds for segment + Assert.Throws(() => c1 = buffer.GetPosition(150, buffer.Start)); + Assert.Throws(() => c1 = buffer.GetPosition(250, buffer.Start)); + } + + #endregion + + #region TryGet + + [Fact] + public void TryGetStopsAtEnd() + { + var bufferSegment1 = new BufferSegment(new T[100]); + BufferSegment bufferSegment2 = bufferSegment1.Append(new T[100]); + BufferSegment bufferSegment3 = bufferSegment2.Append(new T[100]); + BufferSegment bufferSegment4 = bufferSegment3.Append(new T[100]); + BufferSegment bufferSegment5 = bufferSegment4.Append(new T[100]); + + var buffer = new ReadOnlySequence(bufferSegment1, 0, bufferSegment3, 100); + + var start = buffer.Start; + Assert.True(buffer.TryGet(ref start, out var memory)); + Assert.Equal(100, memory.Length); + Assert.True(buffer.TryGet(ref start, out memory)); + Assert.Equal(100, memory.Length); + Assert.True(buffer.TryGet(ref start, out memory)); + Assert.Equal(100, memory.Length); + Assert.False(buffer.TryGet(ref start, out memory)); + } + + [Fact] + public void TryGetStopsAtEndWhenEndIsLastItemOfFull() + { + var bufferSegment1 = new BufferSegment(new T[100]); + BufferSegment bufferSegment2 = bufferSegment1.Append(new T[100]); + + var buffer = new ReadOnlySequence(bufferSegment1, 0, bufferSegment1, 100); + + SequencePosition start = buffer.Start; + Assert.True(buffer.TryGet(ref start, out ReadOnlyMemory memory)); + Assert.Equal(100, memory.Length); + Assert.False(buffer.TryGet(ref start, out memory)); + } + + [Fact] + public void TryGetStopsAtEndWhenEndIsFirstItemOfFull() + { + var bufferSegment1 = new BufferSegment(new T[100]); + BufferSegment bufferSegment2 = bufferSegment1.Append(new T[100]); + + var buffer = new ReadOnlySequence(bufferSegment1, 0, bufferSegment2, 0); + + SequencePosition start = buffer.Start; + Assert.True(buffer.TryGet(ref start, out ReadOnlyMemory memory)); + Assert.Equal(100, memory.Length); + Assert.True(buffer.TryGet(ref start, out memory)); + Assert.Equal(0, memory.Length); + Assert.False(buffer.TryGet(ref start, out memory)); + } + + [Fact] + public void TryGetStopsAtEndWhenEndIsFirstItemOfEmpty() + { + var bufferSegment1 = new BufferSegment(new T[100]); + BufferSegment bufferSegment2 = bufferSegment1.Append(new T[0]); + + var buffer = new ReadOnlySequence(bufferSegment1, 0, bufferSegment2, 0); + + SequencePosition start = buffer.Start; + Assert.True(buffer.TryGet(ref start, out ReadOnlyMemory memory)); + Assert.Equal(100, memory.Length); + Assert.True(buffer.TryGet(ref start, out memory)); + Assert.Equal(0, memory.Length); + Assert.False(buffer.TryGet(ref start, out memory)); + } + + #endregion + + #region Enumerable + + [Fact] + public void EnumerableStopsAtEndWhenEndIsLastItemOfFull() + { + var bufferSegment1 = new BufferSegment(new T[100]); + BufferSegment bufferSegment2 = bufferSegment1.Append(new T[100]); + + var buffer = new ReadOnlySequence(bufferSegment1, 0, bufferSegment1, 100); + + List sizes = new List(); + foreach (ReadOnlyMemory memory in buffer) + { + sizes.Add(memory.Length); + } + + Assert.Equal(1, sizes.Count); + Assert.Equal(new[] { 100 }, sizes); + } + + [Fact] + public void EnumerableStopsAtEndWhenEndIsFirstItemOfFull() + { + var bufferSegment1 = new BufferSegment(new T[100]); + BufferSegment bufferSegment2 = bufferSegment1.Append(new T[100]); + + var buffer = new ReadOnlySequence(bufferSegment1, 0, bufferSegment2, 0); + + List sizes = new List(); + foreach (ReadOnlyMemory memory in buffer) + { + sizes.Add(memory.Length); + } + + Assert.Equal(2, sizes.Count); + Assert.Equal(new[] { 100, 0 }, sizes); + } + + [Fact] + public void EnumerableStopsAtEndWhenEndIsFirstItemOfEmpty() + { + var bufferSegment1 = new BufferSegment(new T[100]); + BufferSegment bufferSegment2 = bufferSegment1.Append(new T[0]); + + var buffer = new ReadOnlySequence(bufferSegment1, 0, bufferSegment2, 0); + + List sizes = new List(); + foreach (ReadOnlyMemory memory in buffer) + { + sizes.Add(memory.Length); + } + + Assert.Equal(2, sizes.Count); + Assert.Equal(new[] { 100, 0 }, sizes); + } + + #endregion + + #region Constructor + + [Fact] + public void Ctor_Array_ValidatesArguments() + { + Assert.Throws(() => new ReadOnlySequence(new T[5], 6, 0)); + Assert.Throws(() => new ReadOnlySequence(new T[5], 4, 2)); + Assert.Throws(() => new ReadOnlySequence(new T[5], -4, 0)); + Assert.Throws(() => new ReadOnlySequence(new T[5], 4, -2)); + Assert.Throws(() => new ReadOnlySequence(null, 4, 2)); + } + + [Fact] + public void Ctor_SingleSegment_ValidatesArguments() + { + var segment = new BufferSegment(new T[5]); + + Assert.Throws(() => new ReadOnlySequence(null, 2, segment, 3)); + Assert.Throws(() => new ReadOnlySequence(segment, 2, null, 3)); + Assert.Throws(() => new ReadOnlySequence(segment, 6, segment, 3)); + Assert.Throws(() => new ReadOnlySequence(segment, 2, segment, 6)); + Assert.Throws(() => new ReadOnlySequence(segment, -1, segment, 0)); + Assert.Throws(() => new ReadOnlySequence(segment, 0, segment, -1)); + Assert.Throws(() => new ReadOnlySequence(segment, 3, segment, 2)); + } + + [Fact] + public void Ctor_MultiSegments_ValidatesArguments() + { + var segment1 = new BufferSegment(new T[5]); + BufferSegment segment2 = segment1.Append(new T[5]); + + Assert.Throws(() => new ReadOnlySequence(null, 5, segment2, 3)); + Assert.Throws(() => new ReadOnlySequence(segment1, 2, null, 3)); + Assert.Throws(() => new ReadOnlySequence(segment1, 6, segment2, 3)); + Assert.Throws(() => new ReadOnlySequence(segment1, 2, segment2, 6)); + Assert.Throws(() => new ReadOnlySequence(segment1, -1, segment2, 0)); + Assert.Throws(() => new ReadOnlySequence(segment1, 0, segment2, -1)); + Assert.Throws(() => new ReadOnlySequence(segment2, 2, segment1, 3)); + } + + #endregion + + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.Default.cs b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.Default.cs new file mode 100644 index 0000000000..2a9efc3937 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.Default.cs @@ -0,0 +1,191 @@ +// 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; +using Xunit; + +namespace System.Memory.Tests +{ + public class ReadOnlySequenceTestsDefault + { + #region Constructor + + [Fact] + public void Default_Constructor() + { + ReadOnlySequence buffer = default; + Assert.Equal(default, buffer.Start); + Assert.Equal(default, buffer.End); + Assert.True(buffer.IsEmpty); + Assert.True(buffer.IsSingleSegment); + Assert.Equal(0, buffer.Length); + Assert.True(buffer.First.IsEmpty); + Assert.Equal($"System.Buffers.ReadOnlySequence<{typeof(byte).Name}>[0]", buffer.ToString()); + } + + #endregion + + #region GetPosition + + [Fact] + public void Default_GetPosition() + { + ReadOnlySequence buffer = default; + SequencePosition position = default; + + Assert.Equal(position, buffer.GetPosition(0)); + Assert.Equal(position, buffer.GetPosition(0, buffer.Start)); + Assert.Equal(position, buffer.GetPosition(0, buffer.End)); + } + + [Fact] + public void Default_GetPositionPositive() + { + ReadOnlySequence buffer = default; + Assert.Throws("offset", () => buffer.GetPosition(1)); + Assert.Throws("offset", () => buffer.GetPosition(1, buffer.Start)); + Assert.Throws("offset", () => buffer.GetPosition(1, buffer.End)); + } + + [Fact] + public void Default_GetPositionNegative() + { + ReadOnlySequence buffer = default; + Assert.Throws("offset", () => buffer.GetPosition(-1)); + Assert.Throws("offset", () => buffer.GetPosition(-1, buffer.Start)); + Assert.Throws("offset", () => buffer.GetPosition(-1, buffer.End)); + } + + #endregion + + #region Slice + + [Fact] + public void Default_Slice() + { + ReadOnlySequence buffer = default; + Assert.Equal(buffer, buffer.Slice(0, 0)); + Assert.Equal(buffer, buffer.Slice(0, buffer.End)); + Assert.Equal(buffer, buffer.Slice(0)); + Assert.Equal(buffer, buffer.Slice(0L, 0L)); + Assert.Equal(buffer, buffer.Slice(0L, buffer.End)); + Assert.Equal(buffer, buffer.Slice(buffer.Start)); + Assert.Equal(buffer, buffer.Slice(buffer.Start, 0)); + Assert.Equal(buffer, buffer.Slice(buffer.Start, 0L)); + Assert.Equal(buffer, buffer.Slice(buffer.Start, buffer.End)); + } + + [Fact] + public void Default_SlicePositiveStart() + { + ReadOnlySequence buffer = default; + Assert.Throws("start", () => buffer.Slice(1, 0)); + Assert.Throws("start", () => buffer.Slice(1, 0)); + Assert.Throws("start", () => buffer.Slice(1, buffer.End)); + Assert.Throws("start", () => buffer.Slice(1)); + Assert.Throws("start", () => buffer.Slice(1L, 0L)); + Assert.Throws("start", () => buffer.Slice(1L, buffer.End)); + } + + [Fact] + public void Default_SliceNegativeStart() + { + ReadOnlySequence buffer = default; + Assert.Throws("start", () => buffer.Slice(-1, 0)); + Assert.Throws("start", () => buffer.Slice(-1, -1)); + Assert.Throws("start", () => buffer.Slice(-1, buffer.End)); + Assert.Throws("start", () => buffer.Slice(-1)); + Assert.Throws("start", () => buffer.Slice(-1L, 0L)); + Assert.Throws("start", () => buffer.Slice(-1L, -1L)); + Assert.Throws("start", () => buffer.Slice(-1L, buffer.End)); + } + + [Fact] + public void Default_SlicePositiveLength() + { + ReadOnlySequence buffer = default; + Assert.Throws("length", () => buffer.Slice(0, 1)); + Assert.Throws("length", () => buffer.Slice(0L, 1L)); + Assert.Throws("length", () => buffer.Slice(buffer.Start, 1)); + Assert.Throws("length", () => buffer.Slice(buffer.Start, 1L)); + } + + [Fact] + public void Default_SliceNegativeLength() + { + ReadOnlySequence buffer = default; + Assert.Throws("length", () => buffer.Slice(0, -1)); + Assert.Throws("length", () => buffer.Slice(0L, -1L)); + Assert.Throws("length", () => buffer.Slice(buffer.Start, -1)); + Assert.Throws("length", () => buffer.Slice(buffer.Start, -1L)); + } + + #endregion + + #region Enumerator + + [Fact] + public void Default_Enumerator() + { + ReadOnlySequence buffer = default; + ReadOnlySequence.Enumerator enumerator = buffer.GetEnumerator(); + { + Assert.Equal(default, enumerator.Current); + Assert.False(enumerator.MoveNext()); + } + enumerator = new ReadOnlySequence.Enumerator(default); + { + Assert.Equal(default, enumerator.Current); + Assert.False(enumerator.MoveNext()); + } + } + + #endregion + + #region TryGet + + [Fact] + public void Default_TryGet() + { + ReadOnlySequence buffer = default; + ReadOnlyMemory memory; + + SequencePosition c1 = buffer.Start; + Assert.False(buffer.TryGet(ref c1, out memory, false)); + Assert.Equal(null, c1.GetObject()); + Assert.True(memory.IsEmpty); + + Assert.False(buffer.TryGet(ref c1, out memory, true)); + Assert.Equal(null, c1.GetObject()); + Assert.True(memory.IsEmpty); + + Assert.False(buffer.TryGet(ref c1, out memory, false)); + Assert.Equal(null, c1.GetObject()); + Assert.True(memory.IsEmpty); + + Assert.False(buffer.TryGet(ref c1, out memory, true)); + Assert.Equal(null, c1.GetObject()); + Assert.True(memory.IsEmpty); + + c1 = buffer.End; + Assert.False(buffer.TryGet(ref c1, out memory, false)); + Assert.Equal(null, c1.GetObject()); + Assert.True(memory.IsEmpty); + + Assert.False(buffer.TryGet(ref c1, out memory, true)); + Assert.Equal(null, c1.GetObject()); + Assert.True(memory.IsEmpty); + + Assert.False(buffer.TryGet(ref c1, out memory, false)); + Assert.Equal(null, c1.GetObject()); + Assert.True(memory.IsEmpty); + + Assert.False(buffer.TryGet(ref c1, out memory, true)); + Assert.Equal(null, c1.GetObject()); + Assert.True(memory.IsEmpty); + } + + #endregion + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.Empty.cs b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.Empty.cs new file mode 100644 index 0000000000..962bec799e --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.Empty.cs @@ -0,0 +1,216 @@ +// 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; +using Xunit; + +namespace System.Memory.Tests +{ + public class ReadOnlySequenceTestsEmpty + { + #region Constructor + + [Fact] + public void Empty_Constructor() + { + ReadOnlySequence buffer = ReadOnlySequence.Empty; + Assert.Equal(buffer.Start.GetObject(), buffer.End.GetObject()); + Assert.Equal(0, buffer.Start.GetInteger() & int.MaxValue); + Assert.Equal(0, buffer.End.GetInteger() & int.MaxValue); + Assert.True(buffer.IsEmpty); + Assert.True(buffer.IsSingleSegment); + Assert.Equal(0, buffer.Length); + Assert.True(buffer.First.IsEmpty); + Assert.Equal($"System.Buffers.ReadOnlySequence<{typeof(byte).Name}>[0]", buffer.ToString()); + } + + #endregion + + #region GetPosition + + [Fact] + public void Empty_GetPosition() + { + ReadOnlySequence buffer = ReadOnlySequence.Empty; + SequencePosition position = new SequencePosition(buffer.Start.GetObject(), 0); + + Assert.Equal(position, buffer.GetPosition(0)); + Assert.Equal(position, buffer.GetPosition(0, buffer.Start)); + Assert.Equal(position, buffer.GetPosition(0, buffer.End)); + } + + [Fact] + public void Empty_GetPositionPositive() + { + ReadOnlySequence buffer = ReadOnlySequence.Empty; + Assert.Throws("offset", () => buffer.GetPosition(1)); + Assert.Throws("offset", () => buffer.GetPosition(1, buffer.Start)); + Assert.Throws("offset", () => buffer.GetPosition(1, buffer.End)); + } + + [Fact] + public void Empty_GetPositionNegative() + { + ReadOnlySequence buffer = ReadOnlySequence.Empty; + Assert.Throws("offset", () => buffer.GetPosition(-1)); + Assert.Throws("offset", () => buffer.GetPosition(-1, buffer.Start)); + Assert.Throws("offset", () => buffer.GetPosition(-1, buffer.End)); + } + + #endregion + + #region Slice + + [Fact] + public void Empty_Slice() + { + ReadOnlySequence buffer = ReadOnlySequence.Empty; + Assert.Equal(buffer, buffer.Slice(0, 0)); + Assert.Equal(buffer, buffer.Slice(0, buffer.End)); + Assert.Equal(buffer, buffer.Slice(0)); + Assert.Equal(buffer, buffer.Slice(0L, 0L)); + Assert.Equal(buffer, buffer.Slice(0L, buffer.End)); + Assert.Equal(buffer, buffer.Slice(buffer.Start)); + Assert.Equal(buffer, buffer.Slice(buffer.Start, 0)); + Assert.Equal(buffer, buffer.Slice(buffer.Start, 0L)); + Assert.Equal(buffer, buffer.Slice(buffer.Start, buffer.End)); + } + + [Fact] + public void Empty_SlicePositiveStart() + { + ReadOnlySequence buffer = ReadOnlySequence.Empty; + Assert.Throws("start", () => buffer.Slice(1, 0)); + Assert.Throws("start", () => buffer.Slice(1, 0)); + Assert.Throws("start", () => buffer.Slice(1, buffer.End)); + Assert.Throws("start", () => buffer.Slice(1)); + Assert.Throws("start", () => buffer.Slice(1L, 0L)); + Assert.Throws("start", () => buffer.Slice(1L, buffer.End)); + } + + [Fact] + public void Empty_SliceNegativeStart() + { + ReadOnlySequence buffer = ReadOnlySequence.Empty; + Assert.Throws("start", () => buffer.Slice(-1, 0)); + Assert.Throws("start", () => buffer.Slice(-1, -1)); + Assert.Throws("start", () => buffer.Slice(-1, buffer.End)); + Assert.Throws("start", () => buffer.Slice(-1)); + Assert.Throws("start", () => buffer.Slice(-1L, 0L)); + Assert.Throws("start", () => buffer.Slice(-1L, -1L)); + Assert.Throws("start", () => buffer.Slice(-1L, buffer.End)); + } + + [Fact] + public void Empty_SlicePositiveLength() + { + ReadOnlySequence buffer = ReadOnlySequence.Empty; + Assert.Throws("length", () => buffer.Slice(0, 1)); + Assert.Throws("length", () => buffer.Slice(0L, 1L)); + Assert.Throws("length", () => buffer.Slice(buffer.Start, 1)); + Assert.Throws("length", () => buffer.Slice(buffer.Start, 1L)); + } + + [Fact] + public void Empty_SliceNegativeLength() + { + ReadOnlySequence buffer = ReadOnlySequence.Empty; + Assert.Throws("length", () => buffer.Slice(0, -1)); + Assert.Throws("length", () => buffer.Slice(0L, -1L)); + Assert.Throws("length", () => buffer.Slice(buffer.Start, -1)); + Assert.Throws("length", () => buffer.Slice(buffer.Start, -1L)); + } + + #endregion + + #region Enumerator + + [Fact] + public void Empty_Enumerator() + { + ReadOnlySequence buffer = ReadOnlySequence.Empty; + ReadOnlySequence.Enumerator enumerator = buffer.GetEnumerator(); + { + Assert.Equal(default, enumerator.Current); + Assert.True(enumerator.MoveNext()); + ReadOnlyMemory memory = enumerator.Current; + Assert.True(memory.IsEmpty); + + Assert.False(enumerator.MoveNext()); + } + enumerator = new ReadOnlySequence.Enumerator(buffer); + { + Assert.Equal(default, enumerator.Current); + Assert.True(enumerator.MoveNext()); + ReadOnlyMemory memory = enumerator.Current; + Assert.True(memory.IsEmpty); + + Assert.False(enumerator.MoveNext()); + } + } + + #endregion + + #region TryGet + + [Fact] + public void Empty_TryGet() + { + ReadOnlySequence buffer = ReadOnlySequence.Empty; + ReadOnlyMemory memory; + + SequencePosition c1 = buffer.Start; + Assert.True(buffer.TryGet(ref c1, out memory, false)); + Assert.Equal(buffer.Start, c1); + Assert.True(memory.IsEmpty); + + Assert.True(buffer.TryGet(ref c1, out memory, true)); + Assert.Equal(null, c1.GetObject()); + Assert.True(memory.IsEmpty); + + Assert.False(buffer.TryGet(ref c1, out memory, false)); + Assert.Equal(null, c1.GetObject()); + Assert.True(memory.IsEmpty); + + Assert.False(buffer.TryGet(ref c1, out memory, true)); + Assert.Equal(null, c1.GetObject()); + Assert.True(memory.IsEmpty); + + Assert.False(buffer.TryGet(ref c1, out memory, false)); + Assert.Equal(null, c1.GetObject()); + Assert.True(memory.IsEmpty); + + Assert.False(buffer.TryGet(ref c1, out memory, true)); + Assert.Equal(null, c1.GetObject()); + Assert.True(memory.IsEmpty); + + c1 = buffer.End; + Assert.True(buffer.TryGet(ref c1, out memory, false)); + Assert.Equal(buffer.End, c1); + Assert.True(memory.IsEmpty); + + Assert.True(buffer.TryGet(ref c1, out memory, true)); + Assert.Equal(null, c1.GetObject()); + Assert.True(memory.IsEmpty); + + Assert.False(buffer.TryGet(ref c1, out memory, false)); + Assert.Equal(null, c1.GetObject()); + Assert.True(memory.IsEmpty); + + Assert.False(buffer.TryGet(ref c1, out memory, true)); + Assert.Equal(null, c1.GetObject()); + Assert.True(memory.IsEmpty); + + Assert.False(buffer.TryGet(ref c1, out memory, false)); + Assert.Equal(null, c1.GetObject()); + Assert.True(memory.IsEmpty); + + Assert.False(buffer.TryGet(ref c1, out memory, true)); + Assert.Equal(null, c1.GetObject()); + Assert.True(memory.IsEmpty); + } + + #endregion + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.TryGet.cs b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.TryGet.cs new file mode 100644 index 0000000000..2cf994a7e3 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.TryGet.cs @@ -0,0 +1,104 @@ +// 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; +using System.MemoryTests; +using System.Runtime.InteropServices; +using Xunit; + +namespace System.Memory.Tests +{ + public class ReadOnlySequenceTryGetTests + { + [Fact] + public void Ctor_Array_Offset() + { + var buffer = new ReadOnlySequence(new byte[] { 1, 2, 3, 4, 5 }, 2, 3); + + Assert.True(SequenceMarshal.TryGetArray(buffer, out ArraySegment array)); + Assert.Equal(2, array.Offset); + Assert.Equal(3, array.Count); + + Assert.False(SequenceMarshal.TryGetReadOnlySequenceSegment(buffer, out _, out _, out _, out _)); + + // Array can be retrieved with TryGetReadOnlyMemory + Assert.True(SequenceMarshal.TryGetReadOnlyMemory(buffer, out ReadOnlyMemory newMemory)); + Assert.Equal(new byte[] { 3, 4, 5 }, newMemory.ToArray()); + } + + [Fact] + public void Ctor_Memory() + { + var memory = new ReadOnlyMemory(new byte[] { 1, 2, 3, 4, 5 }); + var buffer = new ReadOnlySequence(memory.Slice(2, 3)); + + Assert.True(SequenceMarshal.TryGetReadOnlyMemory(buffer, out ReadOnlyMemory newMemory)); + Assert.Equal(new byte[] { 3, 4, 5 }, newMemory.ToArray()); + + Assert.False(SequenceMarshal.TryGetReadOnlySequenceSegment(buffer, out ReadOnlySequenceSegment startSegment, out int startIndex, out ReadOnlySequenceSegment endSegment, out int endIndex)); + + // Memory is internally decomposed to its container so it would be accessible via TryGetArray + Assert.True(SequenceMarshal.TryGetArray(buffer, out ArraySegment array)); + Assert.Equal(2, array.Offset); + Assert.Equal(3, array.Count); + } + + + [Fact] + public void Ctor_Memory_String() + { + var text = "Hello"; + var memory = text.AsMemory(); + var buffer = new ReadOnlySequence(memory.Slice(2, 3)); + + Assert.True(SequenceMarshal.TryGetReadOnlyMemory(buffer, out ReadOnlyMemory newMemory)); + Assert.Equal(text.Substring(2, 3).ToCharArray(), newMemory.ToArray()); + + Assert.False(SequenceMarshal.TryGetReadOnlySequenceSegment(buffer, out ReadOnlySequenceSegment startSegment, out int startIndex, out ReadOnlySequenceSegment endSegment, out int endIndex)); + Assert.False(SequenceMarshal.TryGetArray(buffer, out _)); + } + + [Fact] + public void Ctor_IMemoryList_SingleBlock() + { + var memoryListSegment = new BufferSegment(new byte[] { 1, 2, 3, 4, 5 }); + + var buffer = new ReadOnlySequence(memoryListSegment, 2, memoryListSegment, 5); + + Assert.True(SequenceMarshal.TryGetReadOnlySequenceSegment(buffer, out ReadOnlySequenceSegment startSegment, out int startIndex, out ReadOnlySequenceSegment endSegment, out int endIndex)); + Assert.Equal(startSegment, memoryListSegment); + Assert.Equal(endSegment, memoryListSegment); + + Assert.Equal(2, startIndex); + Assert.Equal(5, endIndex); + + Assert.False(SequenceMarshal.TryGetArray(buffer, out _)); + + // Single block can be retrieved with TryGetReadOnlyMemory + Assert.True(SequenceMarshal.TryGetReadOnlyMemory(buffer, out ReadOnlyMemory newMemory)); + Assert.Equal(new byte[] { 3, 4, 5 }, newMemory.ToArray()); + } + + [Fact] + public void Ctor_IMemoryList_MultiBlock() + { + var memoryListSegment1 = new BufferSegment(new byte[] { 1, 2, 3 }); + var memoryListSegment2 = memoryListSegment1.Append(new byte[] { 4, 5 }); + + var buffer = new ReadOnlySequence(memoryListSegment1, 2, memoryListSegment2, 1); + + Assert.True(SequenceMarshal.TryGetReadOnlySequenceSegment(buffer, out ReadOnlySequenceSegment startSegment, out int startIndex, out ReadOnlySequenceSegment endSegment, out int endIndex)); + Assert.Equal(startSegment, memoryListSegment1); + Assert.Equal(endSegment, memoryListSegment2); + + Assert.Equal(2, startIndex); + Assert.Equal(1, endIndex); + + Assert.False(SequenceMarshal.TryGetArray(buffer, out _)); + + // Multi-block can't be retrieved with TryGetReadOnlyMemory + Assert.False(SequenceMarshal.TryGetReadOnlyMemory(buffer, out _)); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.byte.cs b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.byte.cs new file mode 100644 index 0000000000..18d2eedadf --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.byte.cs @@ -0,0 +1,309 @@ +// 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; +using System.Linq; +using System.Text; +using Xunit; + +namespace System.Memory.Tests +{ + public abstract class ReadOnlySequenceTestsByte + { + public class Array : ReadOnlySequenceTestsByte + { + public Array() : base(ReadOnlySequenceFactory.ArrayFactory) { } + } + + public class Memory : ReadOnlySequenceTestsByte + { + public Memory() : base(ReadOnlySequenceFactory.MemoryFactory) { } + } + + public class SingleSegment : ReadOnlySequenceTestsByte + { + public SingleSegment() : base(ReadOnlySequenceFactory.SingleSegmentFactory) { } + } + + public class SegmentPerByte : ReadOnlySequenceTestsByte + { + public SegmentPerByte() : base(ReadOnlySequenceFactory.SegmentPerItemFactory) { } + } + + public class SplitInThreeSegments : ReadOnlySequenceTestsByte + { + public SplitInThreeSegments() : base(ReadOnlySequenceFactory.SplitInThree) { } + } + + internal ReadOnlySequenceFactory Factory { get; } + + internal ReadOnlySequenceTestsByte(ReadOnlySequenceFactory factory) + { + Factory = factory; + } + + [Fact] + public void EmptyIsCorrect() + { + ReadOnlySequence buffer = Factory.CreateOfSize(0); + Assert.Equal(0, buffer.Length); + Assert.True(buffer.IsEmpty); + } + + [Theory] + [InlineData(1)] + [InlineData(8)] + public void LengthIsCorrect(int length) + { + ReadOnlySequence buffer = Factory.CreateOfSize(length); + Assert.Equal(length, buffer.Length); + } + + [Theory] + [InlineData(1)] + [InlineData(8)] + public void ToArrayIsCorrect(int length) + { + byte[] data = Enumerable.Range(0, length).Select(i => (byte)i).ToArray(); + ReadOnlySequence buffer = Factory.CreateWithContent(data); + Assert.Equal(length, buffer.Length); + Assert.Equal(data, buffer.ToArray()); + } + + [Fact] + public void ToStringIsCorrect() + { + ReadOnlySequence buffer = Factory.CreateWithContent(Enumerable.Range(0, 255).Select(i => (byte)i).ToArray()); + Assert.Equal("System.Buffers.ReadOnlySequence[255]", buffer.ToString()); + } + + [Theory] + [MemberData(nameof(ValidSliceCases))] + public void Slice_Works(Func, ReadOnlySequence> func) + { + ReadOnlySequence buffer = Factory.CreateWithContent(new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }); + ReadOnlySequence slice = func(buffer); + Assert.Equal(new byte[] { 5, 6, 7, 8, 9 }, slice.ToArray()); + } + + [Theory] + [MemberData(nameof(OutOfRangeSliceCases))] + public void ReadOnlyBufferDoesNotAllowSlicingOutOfRange(Action> fail) + { + ReadOnlySequence buffer = Factory.CreateOfSize(100); + Assert.Throws(() => fail(buffer)); + } + + [Fact] + public void ReadOnlyBufferGetPosition_MovesPosition() + { + ReadOnlySequence buffer = Factory.CreateOfSize(100); + + SequencePosition position = buffer.GetPosition(65); + Assert.Equal(buffer.Slice(position).Length, 35); + + position = buffer.GetPosition(65, buffer.Start); + Assert.Equal(buffer.Slice(position).Length, 35); + } + + [Fact] + public void ReadOnlyBufferGetPosition_ChecksBounds() + { + ReadOnlySequence buffer = Factory.CreateOfSize(100); + Assert.Throws(() => buffer.GetPosition(101)); + Assert.Throws(() => buffer.GetPosition(101, buffer.Start)); + } + + [Fact] + public void ReadOnlyBufferGetPosition_DoesNotAlowNegative() + { + ReadOnlySequence buffer = Factory.CreateOfSize(20); + Assert.Throws(() => buffer.GetPosition(-1)); + Assert.Throws(() => buffer.GetPosition(-1, buffer.Start)); + } + + [Fact] + public void ReadOnlyBufferSlice_ChecksEnd() + { + ReadOnlySequence buffer = Factory.CreateOfSize(100); + Assert.Throws(() => buffer.Slice(70, buffer.Start)); + } + + [Fact] + public void SliceToTheEndWorks() + { + ReadOnlySequence buffer = Factory.CreateOfSize(10); + Assert.True(buffer.Slice(buffer.End).IsEmpty); + } + + [Theory] + [InlineData("a", 'a', 0)] + [InlineData("ab", 'a', 0)] + [InlineData("aab", 'a', 0)] + [InlineData("acab", 'a', 0)] + [InlineData("acab", 'c', 1)] + [InlineData("abcdefghijklmnopqrstuvwxyz", 'l', 11)] + [InlineData("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz", 'l', 11)] + [InlineData("aaaaaaaaaaacmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz", 'm', 12)] + [InlineData("aaaaaaaaaaarmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz", 'r', 11)] + [InlineData("/localhost:5000/PATH/%2FPATH2/ HTTP/1.1", '%', 21)] + [InlineData("/localhost:5000/PATH/%2FPATH2/?key=value HTTP/1.1", '%', 21)] + [InlineData("/localhost:5000/PATH/PATH2/?key=value HTTP/1.1", '?', 27)] + [InlineData("/localhost:5000/PATH/PATH2/ HTTP/1.1", ' ', 27)] + public void PositionOf_ReturnsPosition(string raw, char searchFor, int expectIndex) + { + ReadOnlySequence buffer = Factory.CreateWithContent(Encoding.ASCII.GetBytes(raw)); + SequencePosition? result = buffer.PositionOf((byte)searchFor); + + Assert.NotNull(result); + Assert.Equal(buffer.Slice(result.Value).ToArray(), Encoding.ASCII.GetBytes(raw.Substring(expectIndex))); + } + + [Fact] + public void PositionOf_ReturnsNullIfNotFound() + { + ReadOnlySequence buffer = Factory.CreateWithContent(new byte[] { 1, 2, 3 }); + SequencePosition? result = buffer.PositionOf((byte)4); + + Assert.Null(result); + } + + [Fact] + public void CopyTo_ThrowsWhenSourceLargerThenDestination() + { + ReadOnlySequence buffer = Factory.CreateOfSize(10); + + Assert.Throws(() => + { + Span span = new byte[5]; + buffer.CopyTo(span); + }); + } + + public static TheoryData, ReadOnlySequence>> ValidSliceCases => new TheoryData, ReadOnlySequence>> + { + b => b.Slice(5), + b => b.Slice(0).Slice(5), + b => b.Slice(5, 5), + b => b.Slice(b.GetPosition(5), 5), + b => b.Slice(5, b.GetPosition(10)), + b => b.Slice(b.GetPosition(5), b.GetPosition(10)), + b => b.Slice(b.GetPosition(5, b.Start), 5), + b => b.Slice(5, b.GetPosition(10, b.Start)), + b => b.Slice(b.GetPosition(5, b.Start), b.GetPosition(10, b.Start)), + + b => b.Slice((long)5), + b => b.Slice((long)5, 5), + b => b.Slice(b.GetPosition(5), (long)5), + b => b.Slice((long)5, b.GetPosition(10)), + b => b.Slice(b.GetPosition(5, b.Start), (long)5), + b => b.Slice((long)5, b.GetPosition(10, b.Start)), + }; + + public static TheoryData>> OutOfRangeSliceCases => new TheoryData>> + { + // negative start + b => b.Slice(-1), // no length + b => b.Slice(-1, -1), // negative length + b => b.Slice(-1, 0), // zero length + b => b.Slice(-1, 1), // positive length + b => b.Slice(-1, 101), // after end length + b => b.Slice(-1, b.Start), // to start + b => b.Slice(-1, b.End), // to end + + // zero start + b => b.Slice(0, -1), // negative length + b => b.Slice(0, 101), // after end length + + // end start + b => b.Slice(100, -1), // negative length + b => b.Slice(100, 1), // after end length + b => b.Slice(100, b.Start), // to start + + // After end start + b => b.Slice(101), // no length + b => b.Slice(101, -1), // negative length + b => b.Slice(101, 0), // zero length + b => b.Slice(101, 1), // after end length + b => b.Slice(101, b.Start), // to start + b => b.Slice(101, b.End), // to end + + // At Start start + b => b.Slice(b.Start, -1), // negative length + b => b.Slice(b.Start, 101), // after end length + + // At End start + b => b.Slice(b.End, -1), // negative length + b => b.Slice(b.End, 1), // after end length + b => b.Slice(b.End, b.Start), // to start + + // Slice at begin + b => b.Slice(0, 70).Slice(0, b.End), // to after end + b => b.Slice(0, 70).Slice(b.Start, b.End), // to after end + // from after end + b => b.Slice(0, 70).Slice(b.End), + b => b.Slice(0, 70).Slice(b.End, -1), // negative length + b => b.Slice(0, 70).Slice(b.End, 0), // zero length + b => b.Slice(0, 70).Slice(b.End, 1), // after end length + b => b.Slice(0, 70).Slice(b.End, b.Start), // to start + b => b.Slice(0, 70).Slice(b.End, b.End), // to after end + + // Slice at begin + b => b.Slice(b.Start, 70).Slice(0, b.End), // to after end + b => b.Slice(b.Start, 70).Slice(b.Start, b.End), // to after end + // from after end + b => b.Slice(b.Start, 70).Slice(b.End), + b => b.Slice(b.Start, 70).Slice(b.End, -1), // negative length + b => b.Slice(b.Start, 70).Slice(b.End, 0), // zero length + b => b.Slice(b.Start, 70).Slice(b.End, 1), // after end length + b => b.Slice(b.Start, 70).Slice(b.End, b.Start), // to start + b => b.Slice(b.Start, 70).Slice(b.End, b.End), // to after end + + // Slice at middle + b => b.Slice(30, 40).Slice(0, b.Start), // to before start + b => b.Slice(30, 40).Slice(0, b.End), // to after end + // from before start + b => b.Slice(30, 40).Slice(b.Start), + b => b.Slice(30, 40).Slice(b.Start, -1), // negative length + b => b.Slice(30, 40).Slice(b.Start, 0), // zero length + b => b.Slice(30, 40).Slice(b.Start, 1), // positive length + b => b.Slice(30, 40).Slice(b.Start, 41), // after end length + b => b.Slice(30, 40).Slice(b.Start, b.Start), // to before start + b => b.Slice(30, 40).Slice(b.Start, b.End), // to after end + // from after end + b => b.Slice(30, 40).Slice(b.End), + b => b.Slice(b.Start, 70).Slice(b.End, -1), // negative length + b => b.Slice(b.Start, 70).Slice(b.End, 0), // zero length + b => b.Slice(b.Start, 70).Slice(b.End, 1), // after end length + b => b.Slice(30, 40).Slice(b.End, b.Start), // to before start + b => b.Slice(30, 40).Slice(b.End, b.End), // to after end + + // Slice at end + b => b.Slice(70, 30).Slice(0, b.Start), // to before start + // from before start + b => b.Slice(30, 40).Slice(b.Start), + b => b.Slice(30, 40).Slice(b.Start, -1), // negative length + b => b.Slice(30, 40).Slice(b.Start, 0), // zero length + b => b.Slice(30, 40).Slice(b.Start, 1), // positive length + b => b.Slice(30, 40).Slice(b.Start, 31), // after end length + b => b.Slice(30, 40).Slice(b.Start, b.Start), // to before start + b => b.Slice(30, 40).Slice(b.Start, b.End), // to end + // from end + b => b.Slice(70, 30).Slice(b.End, b.Start), // to before start + + // Slice at end + b => b.Slice(70, 30).Slice(0, b.Start), // to before start + // from before start + b => b.Slice(30, 40).Slice(b.Start), + b => b.Slice(30, 40).Slice(b.Start, -1), // negative length + b => b.Slice(30, 40).Slice(b.Start, 0), // zero length + b => b.Slice(30, 40).Slice(b.Start, 1), // positive length + b => b.Slice(30, 40).Slice(b.Start, 31), // after end length + b => b.Slice(30, 40).Slice(b.Start, b.Start), // to before start + b => b.Slice(30, 40).Slice(b.Start, b.End), // to end + // from end + b => b.Slice(70, 30).Slice(b.End, b.Start), // to before start + }; + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.char.cs b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.char.cs new file mode 100644 index 0000000000..006ef3843a --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.char.cs @@ -0,0 +1,312 @@ +// 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; +using System.Linq; +using System.Text; +using Xunit; + +namespace System.Memory.Tests +{ + public abstract class ReadOnlySequenceTestsChar + { + public class Array : ReadOnlySequenceTestsChar + { + public Array() : base(ReadOnlySequenceFactory.ArrayFactory) { } + } + + public class String : ReadOnlySequenceTestsChar + { + public String() : base(ReadOnlySequenceFactoryChar.StringFactory) { } + } + + public class Memory : ReadOnlySequenceTestsChar + { + public Memory() : base(ReadOnlySequenceFactory.MemoryFactory) { } + } + + public class SingleSegment : ReadOnlySequenceTestsChar + { + public SingleSegment() : base(ReadOnlySequenceFactory.SingleSegmentFactory) { } + } + + public class SegmentPerChar : ReadOnlySequenceTestsChar + { + public SegmentPerChar() : base(ReadOnlySequenceFactory.SegmentPerItemFactory) { } + } + + public class SplitInThreeSegments : ReadOnlySequenceTestsChar + { + public SplitInThreeSegments() : base(ReadOnlySequenceFactory.SplitInThree) { } + } + + internal ReadOnlySequenceFactory Factory { get; } + + internal ReadOnlySequenceTestsChar(ReadOnlySequenceFactory factory) + { + Factory = factory; + } + + [Fact] + public void EmptyIsCorrect() + { + ReadOnlySequence buffer = Factory.CreateOfSize(0); + Assert.Equal(0, buffer.Length); + Assert.True(buffer.IsEmpty); + } + + [Theory] + [InlineData(1)] + [InlineData(8)] + public void LengthIsCorrect(int length) + { + ReadOnlySequence buffer = Factory.CreateOfSize(length); + Assert.Equal(length, buffer.Length); + } + + [Theory] + [InlineData(1)] + [InlineData(8)] + public void ToArrayIsCorrect(int length) + { + char[] data = Enumerable.Range(0, length).Select(i => (char)i).ToArray(); + ReadOnlySequence buffer = Factory.CreateWithContent(data); + Assert.Equal(length, buffer.Length); + Assert.Equal(data, buffer.ToArray()); + } + + [Fact] + public void ToStringIsCorrect() + { + char[] array = Enumerable.Range(0, 255).Select(i => (char)i).ToArray(); + ReadOnlySequence buffer = Factory.CreateWithContent(array); + Assert.Equal(array, buffer.ToString()); + } + + [Theory] + [MemberData(nameof(ValidSliceCases))] + public void Slice_Works(Func, ReadOnlySequence> func) + { + ReadOnlySequence buffer = Factory.CreateWithContent(new char[] { (char)0, (char)1, (char)2, (char)3, (char)4, (char)5, (char)6, (char)7, (char)8, (char)9 }); + ReadOnlySequence slice = func(buffer); + Assert.Equal(new char[] { (char)5, (char)6, (char)7, (char)8, (char)9 }, slice.ToArray()); + } + + [Theory] + [MemberData(nameof(OutOfRangeSliceCases))] + public void ReadOnlyBufferDoesNotAllowSlicingOutOfRange(Action> fail) + { + ReadOnlySequence buffer = Factory.CreateOfSize(100); + Assert.Throws(() => fail(buffer)); + } + + [Fact] + public void ReadOnlyBufferGetPosition_MovesPosition() + { + ReadOnlySequence buffer = Factory.CreateOfSize(100); + SequencePosition position = buffer.GetPosition(65); + Assert.Equal(buffer.Slice(position).Length, 35); + position = buffer.GetPosition(65, buffer.Start); + Assert.Equal(buffer.Slice(position).Length, 35); + } + + [Fact] + public void ReadOnlyBufferGetPosition_ChecksBounds() + { + ReadOnlySequence buffer = Factory.CreateOfSize(100); + Assert.Throws(() => buffer.GetPosition(101)); + Assert.Throws(() => buffer.GetPosition(101, buffer.Start)); + } + + [Fact] + public void ReadOnlyBufferGetPosition_DoesNotAlowNegative() + { + ReadOnlySequence buffer = Factory.CreateOfSize(20); + Assert.Throws(() => buffer.GetPosition(-1)); + Assert.Throws(() => buffer.GetPosition(-1, buffer.Start)); + } + + public void ReadOnlyBufferSlice_ChecksEnd() + { + ReadOnlySequence buffer = Factory.CreateOfSize(100); + Assert.Throws(() => buffer.Slice(70, buffer.Start)); + } + + [Fact] + public void SliceToTheEndWorks() + { + ReadOnlySequence buffer = Factory.CreateOfSize(10); + Assert.True(buffer.Slice(buffer.End).IsEmpty); + } + + [Theory] + [InlineData("a", 'a', 0)] + [InlineData("ab", 'a', 0)] + [InlineData("aab", 'a', 0)] + [InlineData("acab", 'a', 0)] + [InlineData("acab", 'c', 1)] + [InlineData("abcdefghijklmnopqrstuvwxyz", 'l', 11)] + [InlineData("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz", 'l', 11)] + [InlineData("aaaaaaaaaaacmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz", 'm', 12)] + [InlineData("aaaaaaaaaaarmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz", 'r', 11)] + [InlineData("/localhost:5000/PATH/%2FPATH2/ HTTP/1.1", '%', 21)] + [InlineData("/localhost:5000/PATH/%2FPATH2/?key=value HTTP/1.1", '%', 21)] + [InlineData("/localhost:5000/PATH/PATH2/?key=value HTTP/1.1", '?', 27)] + [InlineData("/localhost:5000/PATH/PATH2/ HTTP/1.1", ' ', 27)] + public void PositionOf_ReturnsPosition(string raw, char searchFor, int expectIndex) + { + ReadOnlySequence buffer = Factory.CreateWithContent(raw.ToCharArray()); + SequencePosition? result = buffer.PositionOf((char)searchFor); + + Assert.NotNull(result); + Assert.Equal(buffer.Slice(result.Value).ToArray(), raw.Substring(expectIndex)); + } + + [Fact] + public void PositionOf_ReturnsNullIfNotFound() + { + ReadOnlySequence buffer = Factory.CreateWithContent(new char[] { (char)1, (char)2, (char)3 }); + SequencePosition? result = buffer.PositionOf((char)4); + + Assert.Null(result); + } + + [Fact] + public void CopyTo_ThrowsWhenSourceLargerThenDestination() + { + ReadOnlySequence buffer = Factory.CreateOfSize(10); + + Assert.Throws(() => + { + Span span = new char[5]; + buffer.CopyTo(span); + }); + } + + public static TheoryData, ReadOnlySequence>> ValidSliceCases => new TheoryData, ReadOnlySequence>> + { + b => b.Slice(5), + b => b.Slice(0).Slice(5), + b => b.Slice(5, 5), + b => b.Slice(b.GetPosition(5), 5), + b => b.Slice(5, b.GetPosition(10)), + b => b.Slice(b.GetPosition(5), b.GetPosition(10)), + b => b.Slice(b.GetPosition(5, b.Start), 5), + b => b.Slice(5, b.GetPosition(10, b.Start)), + b => b.Slice(b.GetPosition(5, b.Start), b.GetPosition(10, b.Start)), + + b => b.Slice((long)5), + b => b.Slice((long)5, 5), + b => b.Slice(b.GetPosition(5), (long)5), + b => b.Slice((long)5, b.GetPosition(10)), + b => b.Slice(b.GetPosition(5, b.Start), (long)5), + b => b.Slice((long)5, b.GetPosition(10, b.Start)), + }; + + public static TheoryData>> OutOfRangeSliceCases => new TheoryData>> + { + // negative start + b => b.Slice(-1), // no length + b => b.Slice(-1, -1), // negative length + b => b.Slice(-1, 0), // zero length + b => b.Slice(-1, 1), // positive length + b => b.Slice(-1, 101), // after end length + b => b.Slice(-1, b.Start), // to start + b => b.Slice(-1, b.End), // to end + + // zero start + b => b.Slice(0, -1), // negative length + b => b.Slice(0, 101), // after end length + + // end start + b => b.Slice(100, -1), // negative length + b => b.Slice(100, 1), // after end length + b => b.Slice(100, b.Start), // to start + + // After end start + b => b.Slice(101), // no length + b => b.Slice(101, -1), // negative length + b => b.Slice(101, 0), // zero length + b => b.Slice(101, 1), // after end length + b => b.Slice(101, b.Start), // to start + b => b.Slice(101, b.End), // to end + + // At Start start + b => b.Slice(b.Start, -1), // negative length + b => b.Slice(b.Start, 101), // after end length + + // At End start + b => b.Slice(b.End, -1), // negative length + b => b.Slice(b.End, 1), // after end length + b => b.Slice(b.End, b.Start), // to start + + // Slice at begin + b => b.Slice(0, 70).Slice(0, b.End), // to after end + b => b.Slice(0, 70).Slice(b.Start, b.End), // to after end + // from after end + b => b.Slice(0, 70).Slice(b.End), + b => b.Slice(0, 70).Slice(b.End, -1), // negative length + b => b.Slice(0, 70).Slice(b.End, 0), // zero length + b => b.Slice(0, 70).Slice(b.End, 1), // after end length + b => b.Slice(0, 70).Slice(b.End, b.Start), // to start + b => b.Slice(0, 70).Slice(b.End, b.End), // to after end + + // Slice at begin + b => b.Slice(b.Start, 70).Slice(0, b.End), // to after end + b => b.Slice(b.Start, 70).Slice(b.Start, b.End), // to after end + // from after end + b => b.Slice(b.Start, 70).Slice(b.End), + b => b.Slice(b.Start, 70).Slice(b.End, -1), // negative length + b => b.Slice(b.Start, 70).Slice(b.End, 0), // zero length + b => b.Slice(b.Start, 70).Slice(b.End, 1), // after end length + b => b.Slice(b.Start, 70).Slice(b.End, b.Start), // to start + b => b.Slice(b.Start, 70).Slice(b.End, b.End), // to after end + + // Slice at middle + b => b.Slice(30, 40).Slice(0, b.Start), // to before start + b => b.Slice(30, 40).Slice(0, b.End), // to after end + // from before start + b => b.Slice(30, 40).Slice(b.Start), + b => b.Slice(30, 40).Slice(b.Start, -1), // negative length + b => b.Slice(30, 40).Slice(b.Start, 0), // zero length + b => b.Slice(30, 40).Slice(b.Start, 1), // positive length + b => b.Slice(30, 40).Slice(b.Start, 41), // after end length + b => b.Slice(30, 40).Slice(b.Start, b.Start), // to before start + b => b.Slice(30, 40).Slice(b.Start, b.End), // to after end + // from after end + b => b.Slice(30, 40).Slice(b.End), + b => b.Slice(b.Start, 70).Slice(b.End, -1), // negative length + b => b.Slice(b.Start, 70).Slice(b.End, 0), // zero length + b => b.Slice(b.Start, 70).Slice(b.End, 1), // after end length + b => b.Slice(30, 40).Slice(b.End, b.Start), // to before start + b => b.Slice(30, 40).Slice(b.End, b.End), // to after end + + // Slice at end + b => b.Slice(70, 30).Slice(0, b.Start), // to before start + // from before start + b => b.Slice(30, 40).Slice(b.Start), + b => b.Slice(30, 40).Slice(b.Start, -1), // negative length + b => b.Slice(30, 40).Slice(b.Start, 0), // zero length + b => b.Slice(30, 40).Slice(b.Start, 1), // positive length + b => b.Slice(30, 40).Slice(b.Start, 31), // after end length + b => b.Slice(30, 40).Slice(b.Start, b.Start), // to before start + b => b.Slice(30, 40).Slice(b.Start, b.End), // to end + // from end + b => b.Slice(70, 30).Slice(b.End, b.Start), // to before start + + // Slice at end + b => b.Slice(70, 30).Slice(0, b.Start), // to before start + // from before start + b => b.Slice(30, 40).Slice(b.Start), + b => b.Slice(30, 40).Slice(b.Start, -1), // negative length + b => b.Slice(30, 40).Slice(b.Start, 0), // zero length + b => b.Slice(30, 40).Slice(b.Start, 1), // positive length + b => b.Slice(30, 40).Slice(b.Start, 31), // after end length + b => b.Slice(30, 40).Slice(b.Start, b.Start), // to before start + b => b.Slice(30, 40).Slice(b.Start, b.End), // to end + // from end + b => b.Slice(70, 30).Slice(b.End, b.Start), // to before start + }; + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/SequencePosition.cs b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/SequencePosition.cs new file mode 100644 index 0000000000..2db7ebf0eb --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlyBuffer/SequencePosition.cs @@ -0,0 +1,56 @@ +// 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 Xunit; + +namespace System.Memory.Tests +{ + public class SequencePostionTests + { + [Fact] + public void ComparisonMembers_NotNullSegment() + { + var segment = new object(); + var position = new SequencePosition(segment, 2); + var position2 = new SequencePosition(segment, 2); + + Assert.True(position.Equals(position2)); + Assert.True(position.Equals((object)position2)); + Assert.Equal(position.GetHashCode(), position2.GetHashCode()); + } + + [Fact] + public void ComparisonMembers_NullSegment() + { + var position = new SequencePosition(null, 2); + var position2 = new SequencePosition(null, 2); + + Assert.True(position.Equals(position2)); + Assert.True(position.Equals((object)position2)); + Assert.Equal(position.GetHashCode(), position2.GetHashCode()); + } + + [Fact] + public void ComparisonMembers_IntSegment() + { + var position = new SequencePosition(2, 2); + var position2 = new SequencePosition(2, 2); + + Assert.True(position.Equals(position2)); + Assert.True(position.Equals((object)position2)); + Assert.Equal(position.GetHashCode(), position2.GetHashCode()); + } + + [Fact] + public void ComparisonMembers_NotEquals() + { + var position = new SequencePosition(null, 2); + var position2 = new SequencePosition(2, 2); + + Assert.False(position.Equals(position2)); + Assert.False(position.Equals((object)position2)); + Assert.NotEqual(position.GetHashCode(), position2.GetHashCode()); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlyMemory/CtorArray.cs b/external/corefx/src/System.Memory/tests/ReadOnlyMemory/CtorArray.cs index 046398c076..6fd20a453d 100644 --- a/external/corefx/src/System.Memory/tests/ReadOnlyMemory/CtorArray.cs +++ b/external/corefx/src/System.Memory/tests/ReadOnlyMemory/CtorArray.cs @@ -72,8 +72,22 @@ namespace System.MemoryTests [Fact] public static void CtorArrayNullArray() { - Assert.Throws(() => new ReadOnlyMemory(null)); - Assert.Throws(() => new ReadOnlyMemory(null, 0, 0)); + var memory = new ReadOnlyMemory(null); + memory.Validate(); + Assert.Equal(default, memory); + + memory = new ReadOnlyMemory(null, 0, 0); + memory.Validate(); + Assert.Equal(default, memory); + } + + [Fact] + public static void CtorArrayNullArrayNonZeroStartAndLength() + { + Assert.Throws(() => new ReadOnlyMemory(null, 1, 0)); + Assert.Throws(() => new ReadOnlyMemory(null, 0, 1)); + Assert.Throws(() => new ReadOnlyMemory(null, 1, 1)); + Assert.Throws(() => new ReadOnlyMemory(null, -1, -1)); } [Fact] diff --git a/external/corefx/src/System.Memory/tests/ReadOnlyMemory/Retain.cs b/external/corefx/src/System.Memory/tests/ReadOnlyMemory/Pin.cs similarity index 55% rename from external/corefx/src/System.Memory/tests/ReadOnlyMemory/Retain.cs rename to external/corefx/src/System.Memory/tests/ReadOnlyMemory/Pin.cs index 386211195a..0fb69de3e5 100644 --- a/external/corefx/src/System.Memory/tests/ReadOnlyMemory/Retain.cs +++ b/external/corefx/src/System.Memory/tests/ReadOnlyMemory/Pin.cs @@ -9,31 +9,16 @@ namespace System.MemoryTests { public static partial class ReadOnlyMemoryTests { - [Fact] - public static void MemoryRetainWithoutPinning() + public static void MemoryPin() { int[] array = { 1, 2, 3, 4, 5 }; ReadOnlyMemory memory = array; - MemoryHandle handle = memory.Retain(); - Assert.False(handle.HasPointer); - unsafe - { - Assert.True(handle.Pointer == null); - } - handle.Dispose(); - } - - [Fact] - public static void MemoryRetainWithPinning() - { - int[] array = { 1, 2, 3, 4, 5 }; - ReadOnlyMemory memory = array; - MemoryHandle handle = memory.Retain(pin: true); - Assert.True(handle.HasPointer); + MemoryHandle handle = memory.Pin(); unsafe { int* pointer = (int*)handle.Pointer; + Assert.True(pointer != null); GC.Collect(); @@ -46,34 +31,41 @@ namespace System.MemoryTests } [Fact] - public static void MemoryFromEmptyArrayRetainWithPinning() + public static void MemoryFromEmptyArrayPin() { ReadOnlyMemory memory = new int[0]; - MemoryHandle handle = memory.Retain(pin: true); - Assert.True(handle.HasPointer); + MemoryHandle handle = memory.Pin(); unsafe { - int* pointer = (int*)handle.Pointer; - - GC.Collect(); - - Assert.True(pointer != null); + Assert.True(handle.Pointer != null); } handle.Dispose(); } [Fact] - public static void MemoryRetainWithPinningAndSlice() + public static void DefaultMemoryPin() + { + ReadOnlyMemory memory = default; + MemoryHandle handle = memory.Pin(); + unsafe + { + Assert.True(handle.Pointer == null); + } + handle.Dispose(); + } + + [Fact] + public static void MemoryPinAndSlice() { int[] array = { 1, 2, 3, 4, 5 }; ReadOnlyMemory memory = array; memory = memory.Slice(1); - MemoryHandle handle = memory.Retain(pin: true); + MemoryHandle handle = memory.Pin(); ReadOnlySpan span = memory.Span; - Assert.True(handle.HasPointer); unsafe { int* pointer = (int*)handle.Pointer; + Assert.True(pointer != null); GC.Collect(); @@ -91,31 +83,16 @@ namespace System.MemoryTests } [Fact] - public static void OwnedMemoryRetainWithoutPinning() + public static void MemoryManagerPin() { int[] array = { 1, 2, 3, 4, 5 }; - OwnedMemory owner = new CustomMemoryForTest(array); - ReadOnlyMemory memory = owner.Memory; - MemoryHandle handle = memory.Retain(); - Assert.False(handle.HasPointer); - unsafe - { - Assert.True(handle.Pointer == null); - } - handle.Dispose(); - } - - [Fact] - public static void OwnedMemoryRetainWithPinning() - { - int[] array = { 1, 2, 3, 4, 5 }; - OwnedMemory owner = new CustomMemoryForTest(array); - ReadOnlyMemory memory = owner.Memory; - MemoryHandle handle = memory.Retain(pin: true); - Assert.True(handle.HasPointer); + MemoryManager manager = new CustomMemoryForTest(array); + ReadOnlyMemory memory = manager.Memory; + MemoryHandle handle = memory.Pin(); unsafe { int* pointer = (int*)handle.Pointer; + Assert.True(pointer != null); GC.Collect(); @@ -128,17 +105,17 @@ namespace System.MemoryTests } [Fact] - public static void OwnedMemoryRetainWithPinningAndSlice() + public static void MemoryManagerPinAndSlice() { int[] array = { 1, 2, 3, 4, 5 }; - OwnedMemory owner = new CustomMemoryForTest(array); - ReadOnlyMemory memory = owner.Memory.Slice(1); - MemoryHandle handle = memory.Retain(pin: true); + MemoryManager manager = new CustomMemoryForTest(array); + ReadOnlyMemory memory = manager.Memory.Slice(1); + MemoryHandle handle = memory.Pin(); ReadOnlySpan span = memory.Span; - Assert.True(handle.HasPointer); unsafe { int* pointer = (int*)handle.Pointer; + Assert.True(pointer != null); GC.Collect(); @@ -154,20 +131,5 @@ namespace System.MemoryTests } handle.Dispose(); } - - [Theory] - [InlineData(true)] - [InlineData(false)] - public static void DefaultMemoryRetain(bool pin) - { - ReadOnlyMemory memory = default; - MemoryHandle handle = memory.Retain(pin: pin); - Assert.False(handle.HasPointer); - unsafe - { - Assert.True(handle.Pointer == null); - } - handle.Dispose(); - } } } diff --git a/external/corefx/src/System.Memory/tests/ReadOnlyMemory/Slice.cs b/external/corefx/src/System.Memory/tests/ReadOnlyMemory/Slice.cs index 70404ecca4..dbeb91d62e 100644 --- a/external/corefx/src/System.Memory/tests/ReadOnlyMemory/Slice.cs +++ b/external/corefx/src/System.Memory/tests/ReadOnlyMemory/Slice.cs @@ -19,11 +19,11 @@ namespace System.MemoryTests Assert.Equal(4, memory.Length); Assert.True(Unsafe.AreSame(ref a[6], ref Unsafe.AsRef(in MemoryMarshal.GetReference(memory.Span)))); - OwnedMemory owner = new CustomMemoryForTest(a); - ReadOnlyMemory memoryFromOwner = ((ReadOnlyMemory)owner.Memory).Slice(6); + MemoryManager manager = new CustomMemoryForTest(a); + ReadOnlyMemory memoryFromManager = ((ReadOnlyMemory)manager.Memory).Slice(6); - Assert.Equal(4, memoryFromOwner.Length); - Assert.True(Unsafe.AreSame(ref a[6], ref Unsafe.AsRef(in MemoryMarshal.GetReference(memoryFromOwner.Span)))); + Assert.Equal(4, memoryFromManager.Length); + Assert.True(Unsafe.AreSame(ref a[6], ref Unsafe.AsRef(in MemoryMarshal.GetReference(memoryFromManager.Span)))); } [Fact] @@ -34,11 +34,11 @@ namespace System.MemoryTests Assert.Equal(0, memory.Length); Assert.True(Unsafe.AreSame(ref a[a.Length - 1], ref Unsafe.Subtract(ref Unsafe.AsRef(in MemoryMarshal.GetReference(memory.Span)), 1))); - OwnedMemory owner = new CustomMemoryForTest(a); - ReadOnlyMemory memoryFromOwner = ((ReadOnlyMemory)owner.Memory).Slice(a.Length); + MemoryManager manager = new CustomMemoryForTest(a); + ReadOnlyMemory memoryFromManager = ((ReadOnlyMemory)manager.Memory).Slice(a.Length); - Assert.Equal(0, memoryFromOwner.Length); - Assert.True(Unsafe.AreSame(ref a[a.Length - 1], ref Unsafe.Subtract(ref Unsafe.AsRef(in MemoryMarshal.GetReference(memoryFromOwner.Span)), 1))); + Assert.Equal(0, memoryFromManager.Length); + Assert.True(Unsafe.AreSame(ref a[a.Length - 1], ref Unsafe.Subtract(ref Unsafe.AsRef(in MemoryMarshal.GetReference(memoryFromManager.Span)), 1))); } [Fact] @@ -49,11 +49,11 @@ namespace System.MemoryTests Assert.Equal(5, memory.Length); Assert.True(Unsafe.AreSame(ref a[3], ref Unsafe.AsRef(in MemoryMarshal.GetReference(memory.Span)))); - OwnedMemory owner = new CustomMemoryForTest(a); - ReadOnlyMemory memoryFromOwner = ((ReadOnlyMemory)owner.Memory).Slice(3, 5); + MemoryManager manager = new CustomMemoryForTest(a); + ReadOnlyMemory memoryFromManager = ((ReadOnlyMemory)manager.Memory).Slice(3, 5); - Assert.Equal(5, memoryFromOwner.Length); - Assert.True(Unsafe.AreSame(ref a[3], ref Unsafe.AsRef(in MemoryMarshal.GetReference(memoryFromOwner.Span)))); + Assert.Equal(5, memoryFromManager.Length); + Assert.True(Unsafe.AreSame(ref a[3], ref Unsafe.AsRef(in MemoryMarshal.GetReference(memoryFromManager.Span)))); } [Fact] @@ -64,11 +64,11 @@ namespace System.MemoryTests Assert.Equal(6, memory.Length); Assert.True(Unsafe.AreSame(ref a[4], ref Unsafe.AsRef(in MemoryMarshal.GetReference(memory.Span)))); - OwnedMemory owner = new CustomMemoryForTest(a); - ReadOnlyMemory memoryFromOwner = ((ReadOnlyMemory)owner.Memory).Slice(4, 6); + MemoryManager manager = new CustomMemoryForTest(a); + ReadOnlyMemory memoryFromManager = ((ReadOnlyMemory)manager.Memory).Slice(4, 6); - Assert.Equal(6, memoryFromOwner.Length); - Assert.True(Unsafe.AreSame(ref a[4], ref Unsafe.AsRef(in MemoryMarshal.GetReference(memoryFromOwner.Span)))); + Assert.Equal(6, memoryFromManager.Length); + Assert.True(Unsafe.AreSame(ref a[4], ref Unsafe.AsRef(in MemoryMarshal.GetReference(memoryFromManager.Span)))); } [Fact] @@ -79,11 +79,11 @@ namespace System.MemoryTests Assert.Equal(0, memory.Length); Assert.True(Unsafe.AreSame(ref a[a.Length - 1], ref Unsafe.Subtract(ref Unsafe.AsRef(in MemoryMarshal.GetReference(memory.Span)), 1))); - OwnedMemory owner = new CustomMemoryForTest(a); - ReadOnlyMemory memoryFromOwner = ((ReadOnlyMemory)owner.Memory).Slice(a.Length, 0); + MemoryManager manager = new CustomMemoryForTest(a); + ReadOnlyMemory memoryFromManager = ((ReadOnlyMemory)manager.Memory).Slice(a.Length, 0); - Assert.Equal(0, memoryFromOwner.Length); - Assert.True(Unsafe.AreSame(ref a[a.Length - 1], ref Unsafe.Subtract(ref Unsafe.AsRef(in MemoryMarshal.GetReference(memoryFromOwner.Span)), 1))); + Assert.Equal(0, memoryFromManager.Length); + Assert.True(Unsafe.AreSame(ref a[a.Length - 1], ref Unsafe.Subtract(ref Unsafe.AsRef(in MemoryMarshal.GetReference(memoryFromManager.Span)), 1))); } [Fact] @@ -98,8 +98,8 @@ namespace System.MemoryTests Assert.Throws(() => new ReadOnlyMemory(a).Slice(a.Length + 1, 0)); Assert.Throws(() => new ReadOnlyMemory(a).Slice(a.Length, 1)); - OwnedMemory owner = new CustomMemoryForTest(a); - ReadOnlyMemory memory = owner.Memory; + MemoryManager manager = new CustomMemoryForTest(a); + ReadOnlyMemory memory = manager.Memory; Assert.Throws(() => memory.Slice(-1)); Assert.Throws(() => memory.Slice(a.Length + 1)); diff --git a/external/corefx/src/System.Memory/tests/ReadOnlyMemory/Span.cs b/external/corefx/src/System.Memory/tests/ReadOnlyMemory/Span.cs index 65029dc03b..728c65e2e1 100644 --- a/external/corefx/src/System.Memory/tests/ReadOnlyMemory/Span.cs +++ b/external/corefx/src/System.Memory/tests/ReadOnlyMemory/Span.cs @@ -21,8 +21,8 @@ namespace System.MemoryTests memory = new ReadOnlyMemory(a, 0, a.Length); memory.Span.Validate(91, 92, -93, 94); - OwnedMemory owner = new CustomMemoryForTest(a); - ((ReadOnlyMemory)owner.Memory).Span.Validate(91, 92, -93, 94); + MemoryManager manager = new CustomMemoryForTest(a); + ((ReadOnlyMemory)manager.Memory).Span.Validate(91, 92, -93, 94); } [Fact] @@ -37,8 +37,24 @@ namespace System.MemoryTests memory = new ReadOnlyMemory(a, 0, a.Length); memory.Span.Validate(91, -92, 93, 94, -95); - OwnedMemory owner = new CustomMemoryForTest(a); - ((ReadOnlyMemory)owner.Memory).Span.Validate(91, -92, 93, 94, -95); + MemoryManager manager = new CustomMemoryForTest(a); + ((ReadOnlyMemory)manager.Memory).Span.Validate(91, -92, 93, 94, -95); + } + + [Fact] + public static void SpanFromCtorArrayChar() + { + char[] a = { '1', '2', '3', '4', '-' }; + ReadOnlyMemory memory; + + memory = new ReadOnlyMemory(a); + memory.Span.Validate('1', '2', '3', '4', '-'); + + memory = new ReadOnlyMemory(a, 0, a.Length); + memory.Span.Validate('1', '2', '3', '4', '-'); + + MemoryManager manager = new CustomMemoryForTest(a); + ((ReadOnlyMemory)manager.Memory).Span.Validate('1', '2', '3', '4', '-'); } [Fact] @@ -55,8 +71,21 @@ namespace System.MemoryTests memory = new ReadOnlyMemory(a, 0, a.Length); memory.Span.ValidateReferenceType(o1, o2); - OwnedMemory owner = new CustomMemoryForTest(a); - ((ReadOnlyMemory)owner.Memory).Span.ValidateReferenceType(o1, o2); + MemoryManager manager = new CustomMemoryForTest(a); + ((ReadOnlyMemory)manager.Memory).Span.ValidateReferenceType(o1, o2); + } + + [Fact] + public static void SpanFromStringAsMemory() + { + string a = "1234-"; + ReadOnlyMemory memory; + + memory = a.AsMemory(); + memory.Span.Validate('1', '2', '3', '4', '-'); + + memory = a.AsMemory(0, a.Length); + memory.Span.Validate('1', '2', '3', '4', '-'); } [Fact] @@ -71,8 +100,8 @@ namespace System.MemoryTests memory = new ReadOnlyMemory(empty, 0, empty.Length); memory.Span.ValidateNonNullEmpty(); - OwnedMemory owner = new CustomMemoryForTest(empty); - ((ReadOnlyMemory)owner.Memory).Span.Validate(); + MemoryManager manager = new CustomMemoryForTest(empty); + ((ReadOnlyMemory)manager.Memory).Span.Validate(); } [Fact] @@ -90,8 +119,8 @@ namespace System.MemoryTests memory = new ReadOnlyMemory(aAsIntArray, 0, aAsIntArray.Length); memory.Span.Validate(42, -1); - OwnedMemory owner = new CustomMemoryForTest(aAsIntArray); - ((ReadOnlyMemory)owner.Memory).Span.Validate(42, -1); + MemoryManager manager = new CustomMemoryForTest(aAsIntArray); + ((ReadOnlyMemory)manager.Memory).Span.Validate(42, -1); } [Fact] @@ -106,5 +135,28 @@ namespace System.MemoryTests Assert.True(spanObject.SequenceEqual(default)); } + [Fact] + public static void TornMemory_Array_SpanThrowsIfOutOfBounds() + { + ReadOnlyMemory memory; + + memory = TestHelpers.DangerousCreateReadOnlyMemory(new int[4], 0, 5); + Assert.Throws(() => memory.Span.DontBox()); + + memory = TestHelpers.DangerousCreateReadOnlyMemory(new int[4], 3, 2); + Assert.Throws(() => memory.Span.DontBox()); + } + + [Fact] + public static void TornMemory_String_SpanThrowsIfOutOfBounds() + { + ReadOnlyMemory memory; + + memory = TestHelpers.DangerousCreateReadOnlyMemory("1234", 0, 5); + Assert.Throws(() => memory.Span.DontBox()); + + memory = TestHelpers.DangerousCreateReadOnlyMemory("1234", 3, 2); + Assert.Throws(() => memory.Span.DontBox()); + } } } diff --git a/external/corefx/src/System.Memory/tests/ReadOnlyMemory/Strings.cs b/external/corefx/src/System.Memory/tests/ReadOnlyMemory/Strings.cs index 592f398987..ce46365c7d 100644 --- a/external/corefx/src/System.Memory/tests/ReadOnlyMemory/Strings.cs +++ b/external/corefx/src/System.Memory/tests/ReadOnlyMemory/Strings.cs @@ -20,17 +20,17 @@ namespace System.MemoryTests [Theory] [MemberData(nameof(StringInputs))] - public static void AsReadOnlyMemory_ToArray_Roundtrips(string input) + public static void AsMemory_ToArray_Roundtrips(string input) { - ReadOnlyMemory m = input.AsReadOnlyMemory(); + ReadOnlyMemory m = input.AsMemory(); Assert.Equal(input, new string(m.ToArray())); } [Theory] [MemberData(nameof(StringInputs))] - public static void AsReadOnlyMemory_Span_Roundtrips(string input) + public static void AsMemory_Span_Roundtrips(string input) { - ReadOnlyMemory m = input.AsReadOnlyMemory(); + ReadOnlyMemory m = input.AsMemory(); ReadOnlySpan s = m.Span; Assert.Equal(input, new string(s.ToArray())); } @@ -45,87 +45,48 @@ namespace System.MemoryTests [InlineData("0123456789", 9, 1)] [InlineData("0123456789", 1, 8)] [InlineData("0123456789", 5, 3)] - public static void AsReadOnlyMemory_Slice_MatchesSubstring(string input, int offset, int count) + public static void AsMemory_Slice_MatchesSubstring(string input, int offset, int count) { - ReadOnlyMemory m = input.AsReadOnlyMemory(); + ReadOnlyMemory m = input.AsMemory(); Assert.Equal(input.Substring(offset, count), new string(m.Slice(offset, count).ToArray())); Assert.Equal(input.Substring(offset, count), new string(m.Slice(offset, count).Span.ToArray())); Assert.Equal(input.Substring(offset), new string(m.Slice(offset).ToArray())); } [Fact] - public static void AsReadOnlyMemory_NullString_Throws() + public static void AsMemory_NullString_Default() { - AssertExtensions.Throws("text", () => ((string)null).AsReadOnlyMemory()); - AssertExtensions.Throws("text", () => ((string)null).AsReadOnlyMemory(0)); - AssertExtensions.Throws("text", () => ((string)null).AsReadOnlyMemory(0, 0)); + ReadOnlyMemory m = ((string)null).AsMemory(); + m.Validate(); + Assert.Equal(default, m); + + m = ((string)null).AsMemory(0); + m.Validate(); + Assert.Equal(default, m); + + m = ((string)null).AsMemory(0, 0); + m.Validate(); + Assert.Equal(default, m); } [Fact] - public static void AsReadOnlyMemory_TryGetString_Roundtrips() + public static void NullAsMemoryNonZeroStartAndLength() { - string input = "0123456789"; - ReadOnlyMemory m = input.AsReadOnlyMemory(); - Assert.False(m.IsEmpty); + string str = null; - Assert.True(m.TryGetString(out string text, out int start, out int length)); - Assert.Same(input, text); - Assert.Equal(0, start); - Assert.Equal(input.Length, length); + Assert.Throws(() => str.AsMemory(1)); + Assert.Throws(() => str.AsMemory(-1)); - m = m.Slice(1); - Assert.True(m.TryGetString(out text, out start, out length)); - Assert.Same(input, text); - Assert.Equal(1, start); - Assert.Equal(input.Length - 1, length); - - m = m.Slice(1); - Assert.True(m.TryGetString(out text, out start, out length)); - Assert.Same(input, text); - Assert.Equal(2, start); - Assert.Equal(input.Length - 2, length); - - m = m.Slice(3, 2); - Assert.True(m.TryGetString(out text, out start, out length)); - Assert.Same(input, text); - Assert.Equal(5, start); - Assert.Equal(2, length); - - m = m.Slice(m.Length); - Assert.True(m.TryGetString(out text, out start, out length)); - Assert.Same(input, text); - Assert.Equal(7, start); - Assert.Equal(0, length); - - m = m.Slice(0); - Assert.True(m.TryGetString(out text, out start, out length)); - Assert.Same(input, text); - Assert.Equal(7, start); - Assert.Equal(0, length); - - m = m.Slice(0, 0); - Assert.True(m.TryGetString(out text, out start, out length)); - Assert.Same(input, text); - Assert.Equal(7, start); - Assert.Equal(0, length); - - Assert.True(m.IsEmpty); + Assert.Throws(() => str.AsMemory(0, 1)); + Assert.Throws(() => str.AsMemory(1, 0)); + Assert.Throws(() => str.AsMemory(1, 1)); + Assert.Throws(() => str.AsMemory(-1, -1)); } [Fact] - public static void Array_TryGetString_ReturnsFalse() + public static void AsMemory_TryGetArray_ReturnsFalse() { - ReadOnlyMemory m = new char[10]; - Assert.False(m.TryGetString(out string text, out int start, out int length)); - Assert.Null(text); - Assert.Equal(0, start); - Assert.Equal(0, length); - } - - [Fact] - public static void AsReadOnlyMemory_TryGetArray_ReturnsFalse() - { - ReadOnlyMemory m = "0123456789".AsReadOnlyMemory(); + ReadOnlyMemory m = "0123456789".AsMemory(); Assert.False(MemoryMarshal.TryGetArray(m, out ArraySegment array)); Assert.Null(array.Array); Assert.Equal(0, array.Offset); @@ -133,17 +94,12 @@ namespace System.MemoryTests } [Fact] - public static unsafe void AsReadOnlyMemory_Retain_ExpectedPointerValue() + public static unsafe void AsMemory_Pin_ExpectedPointerValue() { string input = "0123456789"; - ReadOnlyMemory m = input.AsReadOnlyMemory(); + ReadOnlyMemory m = input.AsMemory(); - using (MemoryHandle h = m.Retain(pin: false)) - { - Assert.Equal(IntPtr.Zero, (IntPtr)h.Pointer); - } - - using (MemoryHandle h = m.Retain(pin: true)) + using (MemoryHandle h = m.Pin()) { GC.Collect(); fixed (char* ptr = input) @@ -155,28 +111,28 @@ namespace System.MemoryTests [Theory] [MemberData(nameof(TestHelpers.StringSliceTestData), MemberType = typeof(TestHelpers))] - public static unsafe void AsReadOnlyMemory_PointerAndLength(string text, int start, int length) + public static unsafe void AsMemory_StartAndLength(string text, int start, int length) { ReadOnlyMemory m; if (start == -1) { start = 0; length = text.Length; - m = text.AsReadOnlyMemory(); + m = text.AsMemory(); } else if (length == -1) { length = text.Length - start; - m = text.AsReadOnlyMemory(start); + m = text.AsMemory(start); } else { - m = text.AsReadOnlyMemory(start, length); + m = text.AsMemory(start, length); } Assert.Equal(length, m.Length); - using (MemoryHandle h = m.Retain(pin: true)) + using (MemoryHandle h = m.Pin()) { fixed (char* pText = text) { @@ -189,23 +145,23 @@ namespace System.MemoryTests [Theory] [MemberData(nameof(TestHelpers.StringSlice2ArgTestOutOfRangeData), MemberType = typeof(TestHelpers))] - public static unsafe void AsReadOnlyMemory_2Arg_OutOfRange(string text, int start) + public static unsafe void AsMemory_2Arg_OutOfRange(string text, int start) { - AssertExtensions.Throws("start", () => text.AsReadOnlyMemory(start)); + AssertExtensions.Throws("start", () => text.AsMemory(start)); } [Theory] [MemberData(nameof(TestHelpers.StringSlice3ArgTestOutOfRangeData), MemberType = typeof(TestHelpers))] - public static unsafe void AsReadOnlyMemory_3Arg_OutOfRange(string text, int start, int length) + public static unsafe void AsMemory_3Arg_OutOfRange(string text, int start, int length) { - AssertExtensions.Throws("start", () => text.AsReadOnlyMemory(start, length)); + AssertExtensions.Throws("start", () => text.AsMemory(start, length)); } [Fact] - public static void AsReadOnlyMemory_EqualsAndGetHashCode_ExpectedResults() + public static void AsMemory_EqualsAndGetHashCode_ExpectedResults() { - ReadOnlyMemory m1 = new string('a', 4).AsReadOnlyMemory(); - ReadOnlyMemory m2 = new string('a', 4).AsReadOnlyMemory(); + ReadOnlyMemory m1 = new string('a', 4).AsMemory(); + ReadOnlyMemory m2 = new string('a', 4).AsMemory(); Assert.True(m1.Span.SequenceEqual(m2.Span)); Assert.True(m1.Equals(m1)); diff --git a/external/corefx/src/System.Memory/tests/ReadOnlyMemory/ToString.cs b/external/corefx/src/System.Memory/tests/ReadOnlyMemory/ToString.cs new file mode 100644 index 0000000000..4ce511a219 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlyMemory/ToString.cs @@ -0,0 +1,128 @@ +// 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; +using Xunit; + +namespace System.MemoryTests +{ + public static partial class ReadOnlyMemoryTests + { + [Fact] + public static void ToStringInt() + { + int[] a = { 91, 92, 93 }; + var memory = new ReadOnlyMemory(a); + Assert.Equal("System.ReadOnlyMemory[3]", memory.ToString()); + Assert.Equal("System.ReadOnlyMemory[1]", memory.Slice(1, 1).ToString()); + Assert.Equal("System.ReadOnlySpan[3]", memory.Span.ToString()); + } + + [Fact] + public static void ToStringInt_Empty() + { + var memory = new ReadOnlyMemory(); + Assert.Equal("System.ReadOnlyMemory[0]", memory.ToString()); + Assert.Equal("System.ReadOnlyMemory[0]", ReadOnlyMemory.Empty.ToString()); + Assert.Equal("System.ReadOnlySpan[0]", memory.Span.ToString()); + } + + [Fact] + public static void ToStringChar() + { + char[] a = { 'a', 'b', 'c' }; + var memory = new ReadOnlyMemory(a); + Assert.Equal("abc", memory.ToString()); + Assert.Equal("b", memory.Slice(1, 1).ToString()); + Assert.Equal("abc", memory.Span.ToString()); + } + + [Fact] + public static void ToStringChar_Empty() + { + var memory = new ReadOnlyMemory(); + Assert.Equal("", memory.ToString()); + Assert.Equal("", ReadOnlyMemory.Empty.ToString()); + Assert.Equal("", memory.Span.ToString()); + } + + [Fact] + public static void ToStringMemoryFromReadOnlyMemory() + { + string testString = "abcdefg"; + ReadOnlyMemory memory = testString.AsMemory(); + Assert.Equal(testString, memory.ToString()); + Assert.Equal(testString.Substring(1, 1), memory.Slice(1, 1).ToString()); + Assert.Equal(testString, memory.Span.ToString()); + } + + [Fact] + public static void ToStringForMemoryOfString() + { + string[] a = { "a", "b", "c" }; + var memory = new ReadOnlyMemory(a); + Assert.Equal("System.ReadOnlyMemory[3]", memory.ToString()); + Assert.Equal("System.ReadOnlyMemory[1]", memory.Slice(1, 1).ToString()); + Assert.Equal("System.ReadOnlySpan[3]", memory.Span.ToString()); + } + + [Fact] + public static void ToStringFromMemoryFromMemoryManager() + { + int[] a = { 91, 92, -93, 94 }; + MemoryManager intManager = new CustomMemoryForTest(a); + Assert.Equal("System.ReadOnlyMemory[4]", ((ReadOnlyMemory)intManager.Memory).ToString()); + + intManager = new CustomMemoryForTest(Array.Empty()); + Assert.Equal("System.ReadOnlyMemory[0]", ((ReadOnlyMemory)intManager.Memory).ToString()); + + char[] charArray = { '1', '2', '-', '4' }; + MemoryManager charManager = new CustomMemoryForTest(charArray); + Assert.Equal("12-4", ((ReadOnlyMemory)charManager.Memory).ToString()); + + charManager = new CustomMemoryForTest(Array.Empty()); + Assert.Equal("", ((ReadOnlyMemory)charManager.Memory).ToString()); + + string[] strArray = { "91", "92", "-93", "94" }; + MemoryManager strManager = new CustomMemoryForTest(strArray); + Assert.Equal("System.ReadOnlyMemory[4]", ((ReadOnlyMemory)strManager.Memory).ToString()); + + strManager = new CustomMemoryForTest(Array.Empty()); + Assert.Equal("System.ReadOnlyMemory[0]", ((ReadOnlyMemory)strManager.Memory).ToString()); + } + + [Fact] + public static void ToStringMemoryOverFullStringReturnsOriginal() + { + string original = TestHelpers.BuildString(10, 42); + + ReadOnlyMemory memory = original.AsMemory(); + + string returnedString = memory.ToString(); + string returnedStringUsingSlice = memory.Slice(0, original.Length).ToString(); + + string subString1 = memory.Slice(1).ToString(); + string subString2 = memory.Slice(0, 2).ToString(); + string subString3 = memory.Slice(1, 2).ToString(); + + Assert.Equal(original, returnedString); + Assert.Equal(original, returnedStringUsingSlice); + + Assert.Equal(original.Substring(1), subString1); + Assert.Equal(original.Substring(0, 2), subString2); + Assert.Equal(original.Substring(1, 2), subString3); + + Assert.Same(original, returnedString); + Assert.Same(original, returnedStringUsingSlice); + + Assert.NotSame(original, subString1); + Assert.NotSame(original, subString2); + Assert.NotSame(original, subString3); + + Assert.NotSame(subString1, subString2); + Assert.NotSame(subString1, subString3); + Assert.NotSame(subString2, subString3); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/AsReadOnlySpan.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/AsReadOnlySpan.cs deleted file mode 100644 index 71dfa9b417..0000000000 --- a/external/corefx/src/System.Memory/tests/ReadOnlySpan/AsReadOnlySpan.cs +++ /dev/null @@ -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.Runtime.InteropServices; -using System.Runtime.CompilerServices; -using Xunit; - -namespace System.SpanTests -{ - public static partial class ReadOnlySpanTests - { - [Fact] - public static void IntArrayAsReadOnlySpan() - { - int[] a = { 19, -17 }; - ReadOnlySpan spanInt = a.AsReadOnlySpan(); - spanInt.Validate(19, -17); - } - - [Fact] - public static void LongArrayAsReadOnlySpan() - { - long[] b = { 1, -3, 7, -15, 31 }; - ReadOnlySpan spanLong = b.AsReadOnlySpan(); - spanLong.Validate(1, -3, 7, -15, 31); - } - - [Fact] - public static void ObjectArrayAsReadOnlySpan() - { - object o1 = new object(); - object o2 = new object(); - object[] c = { o1, o2 }; - ReadOnlySpan spanObject = c.AsReadOnlySpan(); - spanObject.ValidateReferenceType(o1, o2); - } - - [Fact] - public static void NullArrayAsReadOnlySpan() - { - int[] a = null; - Assert.Throws(() => a.AsReadOnlySpan().DontBox()); - } - - [Fact] - public static void EmptyArrayAsReadOnlySpan() - { - int[] empty = Array.Empty(); - ReadOnlySpan span = empty.AsReadOnlySpan(); - span.ValidateNonNullEmpty(); - } - - [Fact] - public static void IntArraySegmentAsSpan() - { - int[] a = { 19, -17 }; - ArraySegment segmentInt = new ArraySegment(a, 1, 1); - ReadOnlySpan spanInt = segmentInt.AsReadOnlySpan(); - spanInt.Validate(-17); - } - - [Fact] - public static void LongArraySegmentAsSpan() - { - long[] b = { 1, -3, 7, -15, 31 }; - ArraySegment segmentLong = new ArraySegment(b, 1, 3); - ReadOnlySpan spanLong = segmentLong.AsReadOnlySpan(); - spanLong.Validate(-3, 7, -15); - } - - [Fact] - public static void ObjectArraySegmentAsSpan() - { - object o1 = new object(); - object o2 = new object(); - object o3 = new object(); - object o4 = new object(); - object[] c = { o1, o2, o3, o4 }; - ArraySegment segmentObject = new ArraySegment(c, 0, 2); - ReadOnlySpan spanObject = segmentObject.AsReadOnlySpan(); - spanObject.ValidateReferenceType(o1, o2); - } - - [Fact] - public static void ZeroLengthArraySegmentAsReadOnlySpan() - { - int[] empty = Array.Empty(); - ArraySegment emptySegment = new ArraySegment(empty); - ReadOnlySpan span = emptySegment.AsReadOnlySpan(); - span.ValidateNonNullEmpty(); - - int[] a = { 19, -17 }; - ArraySegment segmentInt = new ArraySegment(a, 1, 0); - ReadOnlySpan spanInt = segmentInt.AsReadOnlySpan(); - spanInt.ValidateNonNullEmpty(); - } - - [Fact] - public static void StringAsReadOnlySpanNullary() - { - string s = "Hello"; - ReadOnlySpan span = s.AsReadOnlySpan(); - char[] expected = s.ToCharArray(); - span.Validate(expected); - } - - [Fact] - public static void StringAsReadOnlySpanEmptyString() - { - string s = ""; - ReadOnlySpan span = s.AsReadOnlySpan(); - span.ValidateNonNullEmpty(); - } - - [Fact] - public static void StringAsReadOnlySpanNullChecked() - { - string s = null; - Assert.Throws(() => s.AsReadOnlySpan().DontBox()); - Assert.Throws(() => s.AsReadOnlySpan(0).DontBox()); - Assert.Throws(() => s.AsReadOnlySpan(0, 0).DontBox()); - } - - [Fact] - public static void EmptySpanAsReadOnlySpan() - { - Span span = default; - Assert.True(span.AsReadOnlySpan().IsEmpty); - } - - [Fact] - public static void SpanAsReadOnlySpan() - { - int[] a = { 19, -17 }; - Span span = new Span(a); - ReadOnlySpan readOnlySpan = span.AsReadOnlySpan(); - - readOnlySpan.Validate(a); - } - - [Theory] - [MemberData(nameof(TestHelpers.StringSliceTestData), MemberType = typeof(TestHelpers))] - public static unsafe void AsReadOnlySpan_PointerAndLength(string text, int start, int length) - { - ReadOnlySpan span; - if (start == -1) - { - start = 0; - length = text.Length; - span = text.AsReadOnlySpan(); - } - else if (length == -1) - { - length = text.Length - start; - span = text.AsReadOnlySpan(start); - } - else - { - span = text.AsReadOnlySpan(start, length); - } - - Assert.Equal(length, span.Length); - - fixed (char* pText = text) - { - char* expected = pText + start; - void* actual = Unsafe.AsPointer(ref MemoryMarshal.GetReference(span)); - Assert.Equal((IntPtr)expected, (IntPtr)actual); - } - } - - [Theory] - [MemberData(nameof(TestHelpers.StringSlice2ArgTestOutOfRangeData), MemberType = typeof(TestHelpers))] - public static unsafe void AsReadOnlySpan_2Arg_OutOfRange(string text, int start) - { - AssertExtensions.Throws("start", () => text.AsReadOnlySpan(start).DontBox()); - } - - [Theory] - [MemberData(nameof(TestHelpers.StringSlice3ArgTestOutOfRangeData), MemberType = typeof(TestHelpers))] - public static unsafe void AsReadOnlySpan_3Arg_OutOfRange(string text, int start, int length) - { - AssertExtensions.Throws("start", () => text.AsReadOnlySpan(start, length).DontBox()); - } - } -} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/AsSpan.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/AsSpan.cs new file mode 100644 index 0000000000..a6349d6c1b --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/AsSpan.cs @@ -0,0 +1,106 @@ +// 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.Runtime.InteropServices; +using System.Runtime.CompilerServices; +using Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void StringAsSpanNullary() + { + string s = "Hello"; + ReadOnlySpan span = s.AsSpan(); + char[] expected = s.ToCharArray(); + span.Validate(expected); + } + + [Fact] + public static void StringAsSpanEmptyString() + { + string s = ""; + ReadOnlySpan span = s.AsSpan(); + span.ValidateNonNullEmpty(); + } + + [Fact] + public static void StringAsSpanNullChecked() + { + string s = null; + ReadOnlySpan span = s.AsSpan(); + span.Validate(); + Assert.True(span == default); + + span = s.AsSpan(0); + span.Validate(); + Assert.True(span == default); + + span = s.AsSpan(0, 0); + span.Validate(); + Assert.True(span == default); + } + + [Fact] + public static void StringAsSpanNullNonZeroStartAndLength() + { + string str = null; + + Assert.Throws(() => str.AsSpan(1).DontBox()); + Assert.Throws(() => str.AsSpan(-1).DontBox()); + + Assert.Throws(() => str.AsSpan(0, 1).DontBox()); + Assert.Throws(() => str.AsSpan(1, 0).DontBox()); + Assert.Throws(() => str.AsSpan(1, 1).DontBox()); + Assert.Throws(() => str.AsSpan(-1, -1).DontBox()); + } + + [Theory] + [MemberData(nameof(TestHelpers.StringSliceTestData), MemberType = typeof(TestHelpers))] + public static unsafe void AsSpan_StartAndLength(string text, int start, int length) + { + ReadOnlySpan span; + if (start == -1) + { + start = 0; + length = text.Length; + span = text.AsSpan(); + } + else if (length == -1) + { + length = text.Length - start; + span = text.AsSpan(start); + } + else + { + span = text.AsSpan(start, length); + } + + Assert.Equal(length, span.Length); + + fixed (char* pText = text) + { + char* expected = pText + start; + void* actual = Unsafe.AsPointer(ref MemoryMarshal.GetReference(span)); + Assert.Equal((IntPtr)expected, (IntPtr)actual); + } + } + + [Theory] + [MemberData(nameof(TestHelpers.StringSlice2ArgTestOutOfRangeData), MemberType = typeof(TestHelpers))] + public static unsafe void AsSpan_2Arg_OutOfRange(string text, int start) + { + AssertExtensions.Throws("start", () => text.AsSpan(start).DontBox()); + } + + [Theory] + [MemberData(nameof(TestHelpers.StringSlice3ArgTestOutOfRangeData), MemberType = typeof(TestHelpers))] + public static unsafe void AsSpan_3Arg_OutOfRange(string text, int start, int length) + { + AssertExtensions.Throws("start", () => text.AsSpan(start, length).DontBox()); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/CompareTo.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/CompareTo.cs new file mode 100644 index 0000000000..6c3d38b151 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/CompareTo.cs @@ -0,0 +1,281 @@ +// 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.Globalization; +using System.Threading; +using Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void ZeroLengthCompareTo_StringComparison() + { + char[] a = { '4', '5', '6' }; + + var span = new ReadOnlySpan(a); + var slice = new ReadOnlySpan(a, 2, 0); + Assert.True(0 < span.CompareTo(slice, StringComparison.Ordinal)); + + Assert.True(0 < span.CompareTo(slice, StringComparison.CurrentCulture)); + Assert.True(0 < span.CompareTo(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(0 < span.CompareTo(slice, StringComparison.InvariantCulture)); + Assert.True(0 < span.CompareTo(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(0 < span.CompareTo(slice, StringComparison.OrdinalIgnoreCase)); + + span = new ReadOnlySpan(a, 1, 0); + Assert.Equal(0, span.CompareTo(slice, StringComparison.Ordinal)); + + Assert.Equal(0, span.CompareTo(slice, StringComparison.CurrentCulture)); + Assert.Equal(0, span.CompareTo(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.Equal(0, span.CompareTo(slice, StringComparison.InvariantCulture)); + Assert.Equal(0, span.CompareTo(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.Equal(0, span.CompareTo(slice, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void SameSpanCompareTo_StringComparison() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a); + Assert.Equal(0, span.CompareTo(span, StringComparison.Ordinal)); + + Assert.Equal(0, span.CompareTo(span, StringComparison.CurrentCulture)); + Assert.Equal(0, span.CompareTo(span, StringComparison.CurrentCultureIgnoreCase)); + Assert.Equal(0, span.CompareTo(span, StringComparison.InvariantCulture)); + Assert.Equal(0, span.CompareTo(span, StringComparison.InvariantCultureIgnoreCase)); + Assert.Equal(0, span.CompareTo(span, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void LengthMismatchCompareTo_StringComparison() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a, 0, 2); + var slice = new ReadOnlySpan(a, 0, 3); + Assert.True(0 > span.CompareTo(slice, StringComparison.Ordinal)); + + Assert.True(0 > span.CompareTo(slice, StringComparison.CurrentCulture)); + Assert.True(0 > span.CompareTo(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(0 > span.CompareTo(slice, StringComparison.InvariantCulture)); + Assert.True(0 > span.CompareTo(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(0 > span.CompareTo(slice, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void CompareToOverlappingMatch_StringComparison() + { + char[] a = { '4', '5', '6', '5', '6', '5' }; + var span = new ReadOnlySpan(a, 1, 3); + var slice = new ReadOnlySpan(a, 3, 3); + Assert.Equal(0, span.CompareTo(slice, StringComparison.Ordinal)); + + Assert.Equal(0, span.CompareTo(slice, StringComparison.CurrentCulture)); + Assert.Equal(0, span.CompareTo(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.Equal(0, span.CompareTo(slice, StringComparison.InvariantCulture)); + Assert.Equal(0, span.CompareTo(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.Equal(0, span.CompareTo(slice, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void CompareToMatchDifferentSpans_StringComparison() + { + char[] a = { '4', '5', '6', '7' }; + char[] b = { '4', '5', '6' }; + var span = new ReadOnlySpan(a, 0, 3); + var slice = new ReadOnlySpan(b, 0, 3); + Assert.Equal(0, span.CompareTo(slice, StringComparison.Ordinal)); + + Assert.Equal(0, span.CompareTo(slice, StringComparison.CurrentCulture)); + Assert.Equal(0, span.CompareTo(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.Equal(0, span.CompareTo(slice, StringComparison.InvariantCulture)); + Assert.Equal(0, span.CompareTo(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.Equal(0, span.CompareTo(slice, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void CompareToNoMatch_StringComparison() + { + for (int length = 1; length < 150; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new char[length]; + var second = new char[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (char)(i + 1); + } + + second[mismatchIndex] = (char)(second[mismatchIndex] + 1); + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + Assert.True(0 > firstSpan.CompareTo(secondSpan, StringComparison.Ordinal)); + + // Due to differences in the implementation, the exact result of CompareTo will not necessarily match with string.Compare. + // However, the sign will match, which is what defines correctness. + Assert.Equal( + Math.Sign(string.Compare(firstSpan.ToString(), secondSpan.ToString(), StringComparison.OrdinalIgnoreCase)), + Math.Sign(firstSpan.CompareTo(secondSpan, StringComparison.OrdinalIgnoreCase))); + + Assert.Equal( + string.Compare(firstSpan.ToString(), secondSpan.ToString(), StringComparison.CurrentCulture), + firstSpan.CompareTo(secondSpan, StringComparison.CurrentCulture)); + Assert.Equal( + string.Compare(firstSpan.ToString(), secondSpan.ToString(), StringComparison.CurrentCultureIgnoreCase), + firstSpan.CompareTo(secondSpan, StringComparison.CurrentCultureIgnoreCase)); + Assert.Equal( + string.Compare(firstSpan.ToString(), secondSpan.ToString(), StringComparison.InvariantCulture), + firstSpan.CompareTo(secondSpan, StringComparison.InvariantCulture)); + Assert.Equal( + string.Compare(firstSpan.ToString(), secondSpan.ToString(), StringComparison.InvariantCultureIgnoreCase), + firstSpan.CompareTo(secondSpan, StringComparison.InvariantCultureIgnoreCase)); + } + } + } + + [Fact] + public static void MakeSureNoCompareToChecksGoOutOfRange_StringComparison() + { + for (int length = 0; length < 100; length++) + { + var first = new char[length + 2]; + first[0] = (char)99; + first[length + 1] = (char)99; + var second = new char[length + 2]; + second[0] = (char)100; + second[length + 1] = (char)100; + var span1 = new ReadOnlySpan(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + Assert.Equal(0, span1.CompareTo(span2, StringComparison.Ordinal)); + + Assert.Equal(0, span1.CompareTo(span2, StringComparison.CurrentCulture)); + Assert.Equal(0, span1.CompareTo(span2, StringComparison.CurrentCultureIgnoreCase)); + Assert.Equal(0, span1.CompareTo(span2, StringComparison.InvariantCulture)); + Assert.Equal(0, span1.CompareTo(span2, StringComparison.InvariantCultureIgnoreCase)); + Assert.Equal(0, span1.CompareTo(span2, StringComparison.OrdinalIgnoreCase)); + } + } + + [Fact] + public static void CompareToUnknownComparisonType_StringComparison() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a); + TestHelpers.AssertThrows(span, (_span) => _span.CompareTo(_span, StringComparison.CurrentCulture - 1)); + TestHelpers.AssertThrows(span, (_span) => _span.CompareTo(_span, StringComparison.OrdinalIgnoreCase + 1)); + TestHelpers.AssertThrows(span, (_span) => _span.CompareTo(_span, (StringComparison)6)); + } + + [Theory] + // CurrentCulture + [InlineData("Hello", 0, "Hello", 0, 5, StringComparison.CurrentCulture, 0)] + [InlineData("Hello", 0, "Goodbye", 0, 5, StringComparison.CurrentCulture, 1)] + [InlineData("Goodbye", 0, "Hello", 0, 5, StringComparison.CurrentCulture, -1)] + [InlineData("HELLO", 2, "hello", 2, 3, StringComparison.CurrentCulture, 1)] + [InlineData("hello", 2, "HELLO", 2, 3, StringComparison.CurrentCulture, -1)] + [InlineData("Hello", 2, "Hello", 2, 3, StringComparison.CurrentCulture, 0)] + [InlineData("Hello", 2, "Goodbye", 2, 3, StringComparison.CurrentCulture, -1)] + [InlineData("A", 0, "B", 0, 1, StringComparison.CurrentCulture, -1)] + [InlineData("B", 0, "A", 0, 1, StringComparison.CurrentCulture, 1)] + // CurrentCultureIgnoreCase + [InlineData("HELLO", 0, "hello", 0, 5, StringComparison.CurrentCultureIgnoreCase, 0)] + [InlineData("Hello", 0, "Hello", 0, 5, StringComparison.CurrentCultureIgnoreCase, 0)] + [InlineData("Hello", 2, "Hello", 2, 3, StringComparison.CurrentCultureIgnoreCase, 0)] + [InlineData("Hello", 2, "Yellow", 2, 3, StringComparison.CurrentCultureIgnoreCase, 0)] + [InlineData("Hello", 0, "Goodbye", 0, 5, StringComparison.CurrentCultureIgnoreCase, 1)] + [InlineData("Goodbye", 0, "Hello", 0, 5, StringComparison.CurrentCultureIgnoreCase, -1)] + [InlineData("HELLO", 2, "hello", 2, 3, StringComparison.CurrentCultureIgnoreCase, 0)] + [InlineData("Hello", 2, "Goodbye", 2, 3, StringComparison.CurrentCultureIgnoreCase, -1)] + // InvariantCulture + [InlineData("Hello", 0, "Hello", 0, 5, StringComparison.InvariantCulture, 0)] + [InlineData("Hello", 0, "Goodbye", 0, 5, StringComparison.InvariantCulture, 1)] + [InlineData("Goodbye", 0, "Hello", 0, 5, StringComparison.InvariantCulture, -1)] + [InlineData("HELLO", 2, "hello", 2, 3, StringComparison.InvariantCulture, 1)] + [InlineData("hello", 2, "HELLO", 2, 3, StringComparison.InvariantCulture, -1)] + // InvariantCultureIgnoreCase + [InlineData("HELLO", 0, "hello", 0, 5, StringComparison.InvariantCultureIgnoreCase, 0)] + [InlineData("Hello", 0, "Hello", 0, 5, StringComparison.InvariantCultureIgnoreCase, 0)] + [InlineData("Hello", 2, "Hello", 2, 3, StringComparison.InvariantCultureIgnoreCase, 0)] + [InlineData("Hello", 2, "Yellow", 2, 3, StringComparison.InvariantCultureIgnoreCase, 0)] + [InlineData("Hello", 0, "Goodbye", 0, 5, StringComparison.InvariantCultureIgnoreCase, 1)] + [InlineData("Goodbye", 0, "Hello", 0, 5, StringComparison.InvariantCultureIgnoreCase, -1)] + [InlineData("HELLO", 2, "hello", 2, 3, StringComparison.InvariantCultureIgnoreCase, 0)] + [InlineData("Hello", 2, "Goodbye", 2, 3, StringComparison.InvariantCultureIgnoreCase, -1)] + // Ordinal + [InlineData("Hello", 0, "Hello", 0, 5, StringComparison.Ordinal, 0)] + [InlineData("Hello", 0, "Goodbye", 0, 5, StringComparison.Ordinal, 1)] + [InlineData("Goodbye", 0, "Hello", 0, 5, StringComparison.Ordinal, -1)] + [InlineData("Hello", 2, "Hello", 2, 3, StringComparison.Ordinal, 0)] + [InlineData("HELLO", 2, "hello", 2, 3, StringComparison.Ordinal, -1)] + [InlineData("Hello", 2, "Goodbye", 2, 3, StringComparison.Ordinal, -1)] + [InlineData("Hello", 0, "Hello", 0, 0, StringComparison.Ordinal, 0)] + [InlineData("Hello", 0, "Hello", 0, 5, StringComparison.Ordinal, 0)] + [InlineData("Hello", 0, "Hello", 0, 3, StringComparison.Ordinal, 0)] + [InlineData("Hello", 2, "Hello", 2, 3, StringComparison.Ordinal, 0)] + [InlineData("Hello", 0, "He" + SoftHyphen + "llo", 0, 5, StringComparison.Ordinal, -1)] + [InlineData("Hello", 0, "-==-", 3, 5, StringComparison.Ordinal, 0)] + [InlineData("\uD83D\uDD53Hello\uD83D\uDD50", 1, "\uD83D\uDD53Hello\uD83D\uDD54", 1, 7, StringComparison.Ordinal, 0)] // Surrogate split + [InlineData("Hello", 0, "Hello123", 0, int.MaxValue, StringComparison.Ordinal, -1)] // Recalculated length, second string longer + [InlineData("Hello123", 0, "Hello", 0, int.MaxValue, StringComparison.Ordinal, 1)] // Recalculated length, first string longer + [InlineData("---aaaaaaaaaaa", 3, "+++aaaaaaaaaaa", 3, 100, StringComparison.Ordinal, 0)] // Equal long alignment 2, equal compare + [InlineData("aaaaaaaaaaaaaa", 3, "aaaxaaaaaaaaaa", 3, 100, StringComparison.Ordinal, -1)] // Equal long alignment 2, different compare at n=1 + [InlineData("-aaaaaaaaaaaaa", 1, "+aaaaaaaaaaaaa", 1, 100, StringComparison.Ordinal, 0)] // Equal long alignment 6, equal compare + [InlineData("aaaaaaaaaaaaaa", 1, "axaaaaaaaaaaaa", 1, 100, StringComparison.Ordinal, -1)] // Equal long alignment 6, different compare at n=1 + [InlineData("aaaaaaaaaaaaaa", 0, "aaaaaaaaaaaaaa", 0, 100, StringComparison.Ordinal, 0)] // Equal long alignment 4, equal compare + [InlineData("aaaaaaaaaaaaaa", 0, "xaaaaaaaaaaaaa", 0, 100, StringComparison.Ordinal, -1)] // Equal long alignment 4, different compare at n=1 + [InlineData("aaaaaaaaaaaaaa", 0, "axaaaaaaaaaaaa", 0, 100, StringComparison.Ordinal, -1)] // Equal long alignment 4, different compare at n=2 + [InlineData("--aaaaaaaaaaaa", 2, "++aaaaaaaaaaaa", 2, 100, StringComparison.Ordinal, 0)] // Equal long alignment 0, equal compare + [InlineData("aaaaaaaaaaaaaa", 2, "aaxaaaaaaaaaaa", 2, 100, StringComparison.Ordinal, -1)] // Equal long alignment 0, different compare at n=1 + [InlineData("aaaaaaaaaaaaaa", 2, "aaaxaaaaaaaaaa", 2, 100, StringComparison.Ordinal, -1)] // Equal long alignment 0, different compare at n=2 + [InlineData("aaaaaaaaaaaaaa", 2, "aaaaxaaaaaaaaa", 2, 100, StringComparison.Ordinal, -1)] // Equal long alignment 0, different compare at n=3 + [InlineData("aaaaaaaaaaaaaa", 2, "aaaaaxaaaaaaaa", 2, 100, StringComparison.Ordinal, -1)] // Equal long alignment 0, different compare at n=4 + [InlineData("aaaaaaaaaaaaaa", 2, "aaaaaaxaaaaaaa", 2, 100, StringComparison.Ordinal, -1)] // Equal long alignment 0, different compare at n=5 + [InlineData("aaaaaaaaaaaaaa", 0, "+aaaaaaaaaaaaa", 1, 13, StringComparison.Ordinal, 0)] // Different int alignment, equal compare + [InlineData("aaaaaaaaaaaaaa", 0, "aaaaaaaaaaaaax", 1, 100, StringComparison.Ordinal, -1)] // Different int alignment + [InlineData("aaaaaaaaaaaaaa", 1, "aaaxaaaaaaaaaa", 3, 100, StringComparison.Ordinal, -1)] // Different long alignment, abs of 4, one of them is 2, different at n=1 + [InlineData("-aaaaaaaaaaaaa", 1, "++++aaaaaaaaaa", 4, 10, StringComparison.Ordinal, 0)] // Different long alignment, equal compare + [InlineData("aaaaaaaaaaaaaa", 1, "aaaaaaaaaaaaax", 4, 100, StringComparison.Ordinal, -1)] // Different long alignment + [InlineData("\0", 0, "", 0, 1, StringComparison.Ordinal, 1)] // Same memory layout, except for m_stringLength (m_firstChars are both 0) + [InlineData("\0\0", 0, "", 0, 2, StringComparison.Ordinal, 1)] // Same as above, except m_stringLength for one is 2 + [InlineData("", 0, "\0b", 0, 2, StringComparison.Ordinal, -1)] // strA's second char != strB's second char codepath + [InlineData("", 0, "b", 0, 1, StringComparison.Ordinal, -1)] // Should hit strA.m_firstChar != strB.m_firstChar codepath + [InlineData("abcxxxxxxxxxxxxxxxxxxxxxx", 0, "abdxxxxxxxxxxxxxxx", 0, int.MaxValue, StringComparison.Ordinal, -1)] // 64-bit: first long compare is different + [InlineData("abcdefgxxxxxxxxxxxxxxxxxx", 0, "abcdefhxxxxxxxxxxx", 0, int.MaxValue, StringComparison.Ordinal, -1)] // 64-bit: second long compare is different + [InlineData("abcdefghijkxxxxxxxxxxxxxx", 0, "abcdefghijlxxxxxxx", 0, int.MaxValue, StringComparison.Ordinal, -1)] // 64-bit: third long compare is different + [InlineData("abcdexxxxxxxxxxxxxxxxxxxx", 0, "abcdfxxxxxxxxxxxxx", 0, int.MaxValue, StringComparison.Ordinal, -1)] // 32-bit: second int compare is different + [InlineData("abcdefghixxxxxxxxxxxxxxxx", 0, "abcdefghjxxxxxxxxx", 0, int.MaxValue, StringComparison.Ordinal, -1)] // 32-bit: fourth int compare is different + // OrdinalIgnoreCase + [InlineData("HELLO", 0, "hello", 0, 5, StringComparison.OrdinalIgnoreCase, 0)] + [InlineData("Hello", 0, "Hello", 0, 5, StringComparison.OrdinalIgnoreCase, 0)] + [InlineData("Hello", 2, "Hello", 2, 3, StringComparison.OrdinalIgnoreCase, 0)] + [InlineData("Hello", 2, "Yellow", 2, 3, StringComparison.OrdinalIgnoreCase, 0)] + [InlineData("Hello", 0, "Goodbye", 0, 5, StringComparison.OrdinalIgnoreCase, 1)] + [InlineData("Goodbye", 0, "Hello", 0, 5, StringComparison.OrdinalIgnoreCase, -1)] + [InlineData("HELLO", 2, "hello", 2, 3, StringComparison.OrdinalIgnoreCase, 0)] + [InlineData("Hello", 2, "Goodbye", 2, 3, StringComparison.OrdinalIgnoreCase, -1)] + [InlineData("A", 0, "x", 0, 1, StringComparison.OrdinalIgnoreCase, -1)] + [InlineData("a", 0, "X", 0, 1, StringComparison.OrdinalIgnoreCase, -1)] + [InlineData("[", 0, "A", 0, 1, StringComparison.OrdinalIgnoreCase, 1)] + [InlineData("[", 0, "a", 0, 1, StringComparison.OrdinalIgnoreCase, 1)] + [InlineData("\\", 0, "A", 0, 1, StringComparison.OrdinalIgnoreCase, 1)] + [InlineData("\\", 0, "a", 0, 1, StringComparison.OrdinalIgnoreCase, 1)] + [InlineData("]", 0, "A", 0, 1, StringComparison.OrdinalIgnoreCase, 1)] + [InlineData("]", 0, "a", 0, 1, StringComparison.OrdinalIgnoreCase, 1)] + [InlineData("^", 0, "A", 0, 1, StringComparison.OrdinalIgnoreCase, 1)] + [InlineData("^", 0, "a", 0, 1, StringComparison.OrdinalIgnoreCase, 1)] + [InlineData("_", 0, "A", 0, 1, StringComparison.OrdinalIgnoreCase, 1)] + [InlineData("_", 0, "a", 0, 1, StringComparison.OrdinalIgnoreCase, 1)] + [InlineData("`", 0, "A", 0, 1, StringComparison.OrdinalIgnoreCase, 1)] + [InlineData("`", 0, "a", 0, 1, StringComparison.OrdinalIgnoreCase, 1)] + public static void Compare(string strA, int indexA, string strB, int indexB, int length, StringComparison comparisonType, int expected) + { + ReadOnlySpan span = length <= (strA.Length - indexA) ? strA.AsSpan(indexA, length) : strA.AsSpan(indexA); + ReadOnlySpan value = length <= (strB.Length - indexB) ? strB.AsSpan(indexB, length) : strB.AsSpan(indexB); + Assert.Equal(expected, Math.Sign(span.CompareTo(value, comparisonType))); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/Contains.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/Contains.cs new file mode 100644 index 0000000000..a38f904966 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/Contains.cs @@ -0,0 +1,181 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void ZeroLengthContains_StringComparison() + { + var a = new char[3]; + + var span = new ReadOnlySpan(a); + var slice = new ReadOnlySpan(a, 2, 0); + Assert.True(span.Contains(slice, StringComparison.Ordinal)); + + Assert.True(span.Contains(slice, StringComparison.CurrentCulture)); + Assert.True(span.Contains(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span.Contains(slice, StringComparison.InvariantCulture)); + Assert.True(span.Contains(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span.Contains(slice, StringComparison.OrdinalIgnoreCase)); + + span = ReadOnlySpan.Empty; + Assert.True(span.Contains(slice, StringComparison.Ordinal)); + + Assert.True(span.Contains(slice, StringComparison.CurrentCulture)); + Assert.True(span.Contains(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span.Contains(slice, StringComparison.InvariantCulture)); + Assert.True(span.Contains(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span.Contains(slice, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void SameSpanContains_StringComparison() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a); + Assert.True(span.Contains(span, StringComparison.Ordinal)); + + Assert.True(span.Contains(span, StringComparison.CurrentCulture)); + Assert.True(span.Contains(span, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span.Contains(span, StringComparison.InvariantCulture)); + Assert.True(span.Contains(span, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span.Contains(span, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void LengthMismatchContains_StringComparison() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a, 0, 2); + var slice = new ReadOnlySpan(a, 0, 3); + Assert.False(span.Contains(slice, StringComparison.Ordinal)); + + Assert.False(span.Contains(slice, StringComparison.CurrentCulture)); + Assert.False(span.Contains(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.False(span.Contains(slice, StringComparison.InvariantCulture)); + Assert.False(span.Contains(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.False(span.Contains(slice, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void ContainsMatch_StringComparison() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a, 0, 3); + var slice = new ReadOnlySpan(a, 0, 2); + Assert.True(span.Contains(slice, StringComparison.Ordinal)); + + Assert.True(span.Contains(slice, StringComparison.CurrentCulture)); + Assert.True(span.Contains(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span.Contains(slice, StringComparison.InvariantCulture)); + Assert.True(span.Contains(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span.Contains(slice, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void ContainsMatchDifferentSpans_StringComparison() + { + char[] a = { '4', '5', '6', '7' }; + char[] b = { '4', '5', '6' }; + var span = new ReadOnlySpan(a, 0, 3); + var slice = new ReadOnlySpan(b, 0, 3); + Assert.True(span.Contains(slice, StringComparison.Ordinal)); + + Assert.True(span.Contains(slice, StringComparison.CurrentCulture)); + Assert.True(span.Contains(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span.Contains(slice, StringComparison.InvariantCulture)); + Assert.True(span.Contains(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span.Contains(slice, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void ContainsNoMatch_StringComparison() + { + for (int length = 1; length < 150; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new char[length]; + var second = new char[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (char)(i + 1); + } + + second[mismatchIndex] = (char)(second[mismatchIndex] + 1); + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + Assert.False(firstSpan.Contains(secondSpan, StringComparison.Ordinal)); + + Assert.False(firstSpan.Contains(secondSpan, StringComparison.OrdinalIgnoreCase)); + + // Different behavior depending on OS + Assert.Equal( + firstSpan.ToString().StartsWith(secondSpan.ToString(), StringComparison.CurrentCulture), + firstSpan.Contains(secondSpan, StringComparison.CurrentCulture)); + Assert.Equal( + firstSpan.ToString().StartsWith(secondSpan.ToString(), StringComparison.CurrentCulture), + firstSpan.Contains(secondSpan, StringComparison.CurrentCulture)); + Assert.Equal( + firstSpan.ToString().StartsWith(secondSpan.ToString(), StringComparison.InvariantCulture), + firstSpan.Contains(secondSpan, StringComparison.InvariantCulture)); + Assert.Equal( + firstSpan.ToString().StartsWith(secondSpan.ToString(), StringComparison.InvariantCultureIgnoreCase), + firstSpan.Contains(secondSpan, StringComparison.InvariantCultureIgnoreCase)); + } + } + } + + [Fact] + public static void MakeSureNoContainsChecksGoOutOfRange_StringComparison() + { + for (int length = 0; length < 100; length++) + { + var first = new char[length + 2]; + first[0] = (char)99; + first[length + 1] = (char)99; + var second = new char[length + 2]; + second[0] = (char)100; + second[length + 1] = (char)100; + var span1 = new ReadOnlySpan(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + Assert.True(span1.Contains(span2, StringComparison.Ordinal)); + + Assert.True(span1.Contains(span2, StringComparison.CurrentCulture)); + Assert.True(span1.Contains(span2, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span1.Contains(span2, StringComparison.InvariantCulture)); + Assert.True(span1.Contains(span2, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span1.Contains(span2, StringComparison.OrdinalIgnoreCase)); + } + } + + [Fact] + public static void ContainsUnknownComparisonType_StringComparison() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a); + TestHelpers.AssertThrows(span, (_span) => _span.Contains(_span, StringComparison.CurrentCulture - 1)); + TestHelpers.AssertThrows(span, (_span) => _span.Contains(_span, StringComparison.OrdinalIgnoreCase + 1)); + TestHelpers.AssertThrows(span, (_span) => _span.Contains(_span, (StringComparison)6)); + } + + [Theory] + [InlineData("Hello", "ello", true)] + [InlineData("Hello", "ELL", false)] + [InlineData("Hello", "Larger Hello", false)] + [InlineData("Hello", "Goodbye", false)] + [InlineData("", "", true)] + [InlineData("", "hello", false)] + [InlineData("Hello", "", true)] + public static void Contains(string s, string value, bool expected) + { + Assert.Equal(expected, s.AsSpan().Contains(value.AsSpan(), StringComparison.Ordinal)); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/CopyTo.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/CopyTo.cs index c138032c8a..481ce6cc88 100644 --- a/external/corefx/src/System.Memory/tests/ReadOnlySpan/CopyTo.cs +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/CopyTo.cs @@ -188,5 +188,36 @@ namespace System.SpanTests } } } + + [Fact] + public static void CopyToVaryingSizes() + { + const int MaxLength = 2048; + + var rng = new Random(); + byte[] inputArray = new byte[MaxLength]; + ReadOnlySpan inputSpan = inputArray; + Span outputSpan = new byte[MaxLength]; + Span allZerosSpan = new byte[MaxLength]; + + // Test all inputs from size 0 .. MaxLength (inclusive) to make sure we don't have + // gaps in our Memmove logic. + for (int i = 0; i <= MaxLength; i++) + { + // Arrange + + rng.NextBytes(inputArray); + outputSpan.Clear(); + + // Act + + inputSpan.Slice(0, i).CopyTo(outputSpan); + + // Assert + + Assert.True(inputSpan.Slice(0, i).SequenceEqual(outputSpan.Slice(0, i))); // src successfully copied to dst + Assert.True(outputSpan.Slice(i).SequenceEqual(allZerosSpan.Slice(i))); // no other part of dst was overwritten + } + } } } diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/CtorArray.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/CtorArray.cs index ea8f3ba831..5a5129ea6c 100644 --- a/external/corefx/src/System.Memory/tests/ReadOnlySpan/CtorArray.cs +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/CtorArray.cs @@ -72,8 +72,22 @@ namespace System.SpanTests [Fact] public static void CtorArrayNullArray() { - Assert.Throws(() => new ReadOnlySpan(null).DontBox()); - Assert.Throws(() => new ReadOnlySpan(null, 0, 0).DontBox()); + var span = new ReadOnlySpan(null); + span.Validate(); + Assert.True(span == default); + + span = new ReadOnlySpan(null, 0, 0); + span.Validate(); + Assert.True(span == default); + } + + [Fact] + public static void CtorArrayNullArrayNonZeroStartAndLength() + { + Assert.Throws(() => new ReadOnlySpan(null, 1, 0).DontBox()); + Assert.Throws(() => new ReadOnlySpan(null, 0, 1).DontBox()); + Assert.Throws(() => new ReadOnlySpan(null, 1, 1).DontBox()); + Assert.Throws(() => new ReadOnlySpan(null, -1, -1).DontBox()); } [Fact] diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/CtorPointerInt.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/CtorPointerInt.cs index ee7b74f1cc..9cd75b18d5 100644 --- a/external/corefx/src/System.Memory/tests/ReadOnlySpan/CtorPointerInt.cs +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/CtorPointerInt.cs @@ -60,20 +60,8 @@ namespace System.SpanTests new ReadOnlySpan((void*)null, 0); new ReadOnlySpan((void*)null, 0); AssertExtensions.Throws(null, () => new ReadOnlySpan((void*)null, 0).DontBox()); - AssertExtensions.Throws(null, () => new ReadOnlySpan((void*)null, 0).DontBox()); + AssertExtensions.Throws(null, () => new ReadOnlySpan((void*)null, 0).DontBox()); } } - - private struct StructWithReferences - { - public int I; - public InnerStruct Inner; - } - - private struct InnerStruct - { - public int J; - public object O; - } } } diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/EndsWith.StringComparison.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/EndsWith.StringComparison.cs new file mode 100644 index 0000000000..40a3b3d9ec --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/EndsWith.StringComparison.cs @@ -0,0 +1,348 @@ +// 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.Globalization; +using System.Threading; +using Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void ZeroLengthEndsWith_StringComparison() + { + var a = new char[3]; + + var span = new ReadOnlySpan(a); + var slice = new ReadOnlySpan(a, 2, 0); + Assert.True(span.EndsWith(slice, StringComparison.Ordinal)); + + Assert.True(span.EndsWith(slice, StringComparison.CurrentCulture)); + Assert.True(span.EndsWith(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span.EndsWith(slice, StringComparison.InvariantCulture)); + Assert.True(span.EndsWith(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span.EndsWith(slice, StringComparison.OrdinalIgnoreCase)); + + span = ReadOnlySpan.Empty; + Assert.True(span.EndsWith(slice, StringComparison.Ordinal)); + + Assert.True(span.EndsWith(slice, StringComparison.CurrentCulture)); + Assert.True(span.EndsWith(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span.EndsWith(slice, StringComparison.InvariantCulture)); + Assert.True(span.EndsWith(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span.EndsWith(slice, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void SameSpanEndsWith_StringComparison() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a); + Assert.True(span.EndsWith(span, StringComparison.Ordinal)); + + Assert.True(span.EndsWith(span, StringComparison.CurrentCulture)); + Assert.True(span.EndsWith(span, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span.EndsWith(span, StringComparison.InvariantCulture)); + Assert.True(span.EndsWith(span, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span.EndsWith(span, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void LengthMismatchEndsWith_StringComparison() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a, 0, 2); + var slice = new ReadOnlySpan(a, 0, 3); + Assert.False(span.EndsWith(slice, StringComparison.Ordinal)); + + Assert.False(span.EndsWith(slice, StringComparison.CurrentCulture)); + Assert.False(span.EndsWith(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.False(span.EndsWith(slice, StringComparison.InvariantCulture)); + Assert.False(span.EndsWith(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.False(span.EndsWith(slice, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void EndsWithMatch_StringComparison() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a, 0, 3); + var slice = new ReadOnlySpan(a, 1, 2); + Assert.True(span.EndsWith(slice, StringComparison.Ordinal)); + + Assert.True(span.EndsWith(slice, StringComparison.CurrentCulture)); + Assert.True(span.EndsWith(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span.EndsWith(slice, StringComparison.InvariantCulture)); + Assert.True(span.EndsWith(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span.EndsWith(slice, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void EndsWithMatchDifferentSpans_StringComparison() + { + char[] a = { '7', '4', '5', '6' }; + char[] b = { '4', '5', '6' }; + var span = new ReadOnlySpan(a, 1, 3); + var slice = new ReadOnlySpan(b, 0, 3); + Assert.True(span.EndsWith(slice, StringComparison.Ordinal)); + + Assert.True(span.EndsWith(slice, StringComparison.CurrentCulture)); + Assert.True(span.EndsWith(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span.EndsWith(slice, StringComparison.InvariantCulture)); + Assert.True(span.EndsWith(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span.EndsWith(slice, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void EndsWithNoMatch_StringComparison() + { + for (int length = 1; length < 150; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new char[length]; + var second = new char[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (char)(i + 1); + } + + second[mismatchIndex] = (char)(second[mismatchIndex] + 1); + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + Assert.False(firstSpan.EndsWith(secondSpan, StringComparison.Ordinal)); + + Assert.False(firstSpan.EndsWith(secondSpan, StringComparison.OrdinalIgnoreCase)); + + // Different behavior depending on OS + Assert.Equal( + firstSpan.ToString().EndsWith(secondSpan.ToString(), StringComparison.CurrentCulture), + firstSpan.EndsWith(secondSpan, StringComparison.CurrentCulture)); + Assert.Equal( + firstSpan.ToString().EndsWith(secondSpan.ToString(), StringComparison.CurrentCultureIgnoreCase), + firstSpan.EndsWith(secondSpan, StringComparison.CurrentCultureIgnoreCase)); + Assert.Equal( + firstSpan.ToString().EndsWith(secondSpan.ToString(), StringComparison.InvariantCulture), + firstSpan.EndsWith(secondSpan, StringComparison.InvariantCulture)); + Assert.Equal( + firstSpan.ToString().EndsWith(secondSpan.ToString(), StringComparison.InvariantCultureIgnoreCase), + firstSpan.EndsWith(secondSpan, StringComparison.InvariantCultureIgnoreCase)); + } + } + } + + [Fact] + public static void MakeSureNoEndsWithChecksGoOutOfRange_StringComparison() + { + for (int length = 0; length < 100; length++) + { + var first = new char[length + 2]; + first[0] = (char)99; + first[length + 1] = (char)99; + var second = new char[length + 2]; + second[0] = (char)100; + second[length + 1] = (char)100; + var span1 = new ReadOnlySpan(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + Assert.True(span1.EndsWith(span2, StringComparison.Ordinal)); + + Assert.True(span1.EndsWith(span2, StringComparison.CurrentCulture)); + Assert.True(span1.EndsWith(span2, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span1.EndsWith(span2, StringComparison.InvariantCulture)); + Assert.True(span1.EndsWith(span2, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span1.EndsWith(span2, StringComparison.OrdinalIgnoreCase)); + } + } + + [Fact] + public static void EndsWithUnknownComparisonType_StringComparison() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a); + TestHelpers.AssertThrows(span, (_span) => _span.EndsWith(_span, StringComparison.CurrentCulture - 1)); + TestHelpers.AssertThrows(span, (_span) => _span.EndsWith(_span, StringComparison.OrdinalIgnoreCase + 1)); + TestHelpers.AssertThrows(span, (_span) => _span.EndsWith(_span, (StringComparison)6)); + } + + [Fact] + public static void EndsWithMatchNonOrdinal_StringComparison() + { + ReadOnlySpan span = new char[] { 'd', 'a', 'b', 'c' }; + ReadOnlySpan value = new char[] { 'a', 'B', 'c' }; + Assert.False(span.EndsWith(value, StringComparison.Ordinal)); + Assert.True(span.EndsWith(value, StringComparison.OrdinalIgnoreCase)); + + CultureInfo backupCulture = CultureInfo.CurrentCulture; + + Thread.CurrentThread.CurrentCulture = new CultureInfo("el-GR"); + + span = new char[] { '\u03b4', '\u03b1', '\u03b2', '\u03b3' }; // δαβγ + value = new char[] { '\u03b1', '\u03b2', '\u03b3' }; // αβγ + + Assert.True(span.EndsWith(value, StringComparison.CurrentCulture)); + Assert.True(span.EndsWith(value, StringComparison.CurrentCultureIgnoreCase)); + + value = new char[] { '\u03b1', '\u0392', '\u03b3' }; // αΒγ + Assert.False(span.EndsWith(value, StringComparison.CurrentCulture)); + Assert.True(span.EndsWith(value, StringComparison.CurrentCultureIgnoreCase)); + + Thread.CurrentThread.CurrentCulture = backupCulture; + + span = new char[] { '\u03b4', '\u0069', '\u00df', '\u0049' }; // δißI + value = new char[] { '\u0069', '\u0073', '\u0073', '\u0049' }; // issI + + Assert.False(span.EndsWith(value, StringComparison.Ordinal)); + // Different behavior depending on OS - True on Windows, False on Unix + Assert.Equal( + span.ToString().EndsWith(value.ToString(), StringComparison.InvariantCulture), + span.EndsWith(value, StringComparison.InvariantCulture)); + Assert.Equal( + span.ToString().EndsWith(value.ToString(), StringComparison.InvariantCultureIgnoreCase), + span.EndsWith(value, StringComparison.InvariantCultureIgnoreCase)); + + value = new char[] { '\u0049', '\u0073', '\u0073', '\u0049' }; // IssI + Assert.False(span.EndsWith(value, StringComparison.OrdinalIgnoreCase)); + Assert.False(span.EndsWith(value, StringComparison.InvariantCulture)); + // Different behavior depending on OS - True on Windows, False on Unix + Assert.Equal( + span.ToString().EndsWith(value.ToString(), StringComparison.InvariantCultureIgnoreCase), + span.EndsWith(value, StringComparison.InvariantCultureIgnoreCase)); + } + + [Fact] + public static void EndsWithNoMatchNonOrdinal_StringComparison() + { + ReadOnlySpan span = new char[] { 'd', 'a', 'b', 'c' }; + ReadOnlySpan value = new char[] { 'a', 'D', 'c' }; + Assert.False(span.EndsWith(value, StringComparison.Ordinal)); + Assert.False(span.EndsWith(value, StringComparison.OrdinalIgnoreCase)); + + CultureInfo backupCulture = CultureInfo.CurrentCulture; + + Thread.CurrentThread.CurrentCulture = new CultureInfo("el-GR"); + + span = new char[] { '\u03b4', '\u03b1', '\u03b2', '\u03b3' }; // δαβγ + value = new char[] { '\u03b1', '\u03b4', '\u03b3' }; // αδγ + + Assert.False(span.EndsWith(value, StringComparison.CurrentCulture)); + Assert.False(span.EndsWith(value, StringComparison.CurrentCultureIgnoreCase)); + + value = new char[] { '\u03b1', '\u0394', '\u03b3' }; // αΔγ + Assert.False(span.EndsWith(value, StringComparison.CurrentCulture)); + Assert.False(span.EndsWith(value, StringComparison.CurrentCultureIgnoreCase)); + + Thread.CurrentThread.CurrentCulture = backupCulture; + + span = new char[] { '\u03b4', '\u0069', '\u00df', '\u0049' }; // δißI + value = new char[] { '\u0069', '\u03b4', '\u03b4', '\u0049' }; // iδδI + + Assert.False(span.EndsWith(value, StringComparison.Ordinal)); + Assert.False(span.EndsWith(value, StringComparison.InvariantCulture)); + Assert.False(span.EndsWith(value, StringComparison.InvariantCultureIgnoreCase)); + + value = new char[] { '\u0049', '\u03b4', '\u03b4', '\u0049' }; // IδδI + Assert.False(span.EndsWith(value, StringComparison.OrdinalIgnoreCase)); + Assert.False(span.EndsWith(value, StringComparison.InvariantCulture)); + Assert.False(span.EndsWith(value, StringComparison.InvariantCultureIgnoreCase)); + } + + [Theory(Skip="Mono issue")] + // CurrentCulture + [InlineData("", "Foo", StringComparison.CurrentCulture, false)] + [InlineData("Hello", "llo", StringComparison.CurrentCulture, true)] + [InlineData("Hello", "Hello", StringComparison.CurrentCulture, true)] + [InlineData("Hello", "", StringComparison.CurrentCulture, true)] + [InlineData("Hello", "HELLO", StringComparison.CurrentCulture, false)] + [InlineData("Hello", "Abc", StringComparison.CurrentCulture, false)] + [InlineData("Hello", "llo" + SoftHyphen, StringComparison.CurrentCulture, true)] + [InlineData("", "", StringComparison.CurrentCulture, true)] + [InlineData("", "a", StringComparison.CurrentCulture, false)] + // CurrentCultureIgnoreCase + [InlineData("Hello", "llo", StringComparison.CurrentCultureIgnoreCase, true)] + [InlineData("Hello", "Hello", StringComparison.CurrentCultureIgnoreCase, true)] + [InlineData("Hello", "", StringComparison.CurrentCultureIgnoreCase, true)] + [InlineData("Hello", "LLO", StringComparison.CurrentCultureIgnoreCase, true)] + [InlineData("Hello", "Abc", StringComparison.CurrentCultureIgnoreCase, false)] + [InlineData("Hello", "llo" + SoftHyphen, StringComparison.CurrentCultureIgnoreCase, true)] + [InlineData("", "", StringComparison.CurrentCultureIgnoreCase, true)] + [InlineData("", "a", StringComparison.CurrentCultureIgnoreCase, false)] + // InvariantCulture + [InlineData("", "Foo", StringComparison.InvariantCulture, false)] + [InlineData("Hello", "llo", StringComparison.InvariantCulture, true)] + [InlineData("Hello", "Hello", StringComparison.InvariantCulture, true)] + [InlineData("Hello", "", StringComparison.InvariantCulture, true)] + [InlineData("Hello", "HELLO", StringComparison.InvariantCulture, false)] + [InlineData("Hello", "Abc", StringComparison.InvariantCulture, false)] + [InlineData("Hello", "llo" + SoftHyphen, StringComparison.InvariantCulture, true)] + [InlineData("", "", StringComparison.InvariantCulture, true)] + [InlineData("", "a", StringComparison.InvariantCulture, false)] + // InvariantCultureIgnoreCase + [InlineData("Hello", "llo", StringComparison.InvariantCultureIgnoreCase, true)] + [InlineData("Hello", "Hello", StringComparison.InvariantCultureIgnoreCase, true)] + [InlineData("Hello", "", StringComparison.InvariantCultureIgnoreCase, true)] + [InlineData("Hello", "LLO", StringComparison.InvariantCultureIgnoreCase, true)] + [InlineData("Hello", "Abc", StringComparison.InvariantCultureIgnoreCase, false)] + [InlineData("Hello", "llo" + SoftHyphen, StringComparison.InvariantCultureIgnoreCase, true)] + [InlineData("", "", StringComparison.InvariantCultureIgnoreCase, true)] + [InlineData("", "a", StringComparison.InvariantCultureIgnoreCase, false)] + // Ordinal + [InlineData("Hello", "o", StringComparison.Ordinal, true)] + [InlineData("Hello", "llo", StringComparison.Ordinal, true)] + [InlineData("Hello", "Hello", StringComparison.Ordinal, true)] + [InlineData("Hello", "Larger Hello", StringComparison.Ordinal, false)] + [InlineData("Hello", "", StringComparison.Ordinal, true)] + [InlineData("Hello", "LLO", StringComparison.Ordinal, false)] + [InlineData("Hello", "Abc", StringComparison.Ordinal, false)] + [InlineData("Hello", "llo" + SoftHyphen, StringComparison.Ordinal, false)] + [InlineData("", "", StringComparison.Ordinal, true)] + [InlineData("", "a", StringComparison.Ordinal, false)] + // OrdinalIgnoreCase + [InlineData("Hello", "llo", StringComparison.OrdinalIgnoreCase, true)] + [InlineData("Hello", "Hello", StringComparison.OrdinalIgnoreCase, true)] + [InlineData("Hello", "Larger Hello", StringComparison.OrdinalIgnoreCase, false)] + [InlineData("Hello", "", StringComparison.OrdinalIgnoreCase, true)] + [InlineData("Hello", "LLO", StringComparison.OrdinalIgnoreCase, true)] + [InlineData("Hello", "Abc", StringComparison.OrdinalIgnoreCase, false)] + [InlineData("Hello", "llo" + SoftHyphen, StringComparison.OrdinalIgnoreCase, false)] + [InlineData("", "", StringComparison.OrdinalIgnoreCase, true)] + [InlineData("", "a", StringComparison.OrdinalIgnoreCase, false)] + public static void EndsWith(string s, string value, StringComparison comparisonType, bool expected) + { + Assert.Equal(expected, s.AsSpan().EndsWith(value.AsSpan(), comparisonType)); + } + + [Theory] + [InlineData(StringComparison.Ordinal)] + [InlineData(StringComparison.OrdinalIgnoreCase)] + public static void EndsWith_NullInStrings(StringComparison comparison) + { + Assert.True("\0test".AsSpan().EndsWith("test".AsSpan(), comparison)); + Assert.True("te\0st".AsSpan().EndsWith("e\0st".AsSpan(), comparison)); + Assert.False("te\0st".AsSpan().EndsWith("test".AsSpan(), comparison)); + Assert.False("test\0".AsSpan().EndsWith("test".AsSpan(), comparison)); + Assert.False("test".AsSpan().EndsWith("\0st".AsSpan(), comparison)); + } + + // NOTE: This is by design. Unix ignores the null characters (i.e. null characters have no weights for the string comparison). + // For desired behavior, use ordinal comparison instead of linguistic comparison. + // This is a known difference between Windows and Unix (https://github.com/dotnet/coreclr/issues/2051). + [Theory] + [SkipOnTargetFramework(TargetFrameworkMonikers.Mono)] + [PlatformSpecific(TestPlatforms.Windows)] + [InlineData(StringComparison.CurrentCulture)] + [InlineData(StringComparison.CurrentCultureIgnoreCase)] + [InlineData(StringComparison.InvariantCulture)] + [InlineData(StringComparison.InvariantCultureIgnoreCase)] + public static void EndsWith_NullInStrings_NonOrdinal(StringComparison comparison) + { + Assert.True("\0test".AsSpan().EndsWith("test".AsSpan(), comparison)); + Assert.True("te\0st".AsSpan().EndsWith("e\0st".AsSpan(), comparison)); + Assert.False("te\0st".AsSpan().EndsWith("test".AsSpan(), comparison)); + Assert.False("test\0".AsSpan().EndsWith("test".AsSpan(), comparison)); + Assert.False("test".AsSpan().EndsWith("\0st".AsSpan(), comparison)); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/EndsWith.char.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/EndsWith.char.cs new file mode 100644 index 0000000000..b8c2752a9d --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/EndsWith.char.cs @@ -0,0 +1,104 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void ZeroLengthEndsWith_Char() + { + var a = new char[3]; + + var span = new ReadOnlySpan(a); + var slice = new ReadOnlySpan(a, 2, 0); + bool b = span.EndsWith(slice); + Assert.True(b); + } + + [Fact] + public static void SameSpanEndsWith_Char() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a); + bool b = span.EndsWith(span); + Assert.True(b); + } + + [Fact] + public static void LengthMismatchEndsWith_Char() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a, 0, 2); + var slice = new ReadOnlySpan(a, 0, 3); + bool b = span.EndsWith(slice); + Assert.False(b); + } + + [Fact] + public static void EndsWithMatch_Char() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a, 0, 3); + var slice = new ReadOnlySpan(a, 1, 2); + bool b = span.EndsWith(slice); + Assert.True(b); + } + + [Fact] + public static void EndsWithMatchDifferentSpans_Char() + { + char[] a = { '4', '5', '6' }; + char[] b = { '4', '5', '6' }; + var span = new ReadOnlySpan(a, 0, 3); + var slice = new ReadOnlySpan(b, 0, 3); + bool c = span.EndsWith(slice); + Assert.True(c); + } + + [Fact] + public static void EndsWithNoMatch_Char() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new char[length]; + var second = new char[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (char)(i + 1); + } + + second[mismatchIndex] = (char)(second[mismatchIndex] + 1); + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + bool b = firstSpan.EndsWith(secondSpan); + Assert.False(b); + } + } + } + + [Fact] + public static void MakeSureNoEndsWithChecksGoOutOfRange_Char() + { + for (int length = 0; length < 100; length++) + { + var first = new char[length + 2]; + first[0] = '9'; + first[length + 1] = '9'; + var second = new char[length + 2]; + second[0] = 'a'; + second[length + 1] = 'a'; + var span1 = new ReadOnlySpan(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + bool b = span1.EndsWith(span2); + Assert.True(b); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/EndsWith.long.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/EndsWith.long.cs new file mode 100644 index 0000000000..ea1be8ec65 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/EndsWith.long.cs @@ -0,0 +1,104 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void ZeroLengthEndsWith_Long() + { + var a = new long[3]; + + var span = new ReadOnlySpan(a); + var slice = new ReadOnlySpan(a, 2, 0); + bool b = span.EndsWith(slice); + Assert.True(b); + } + + [Fact] + public static void SameSpanEndsWith_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + var span = new ReadOnlySpan(a); + bool b = span.EndsWith(span); + Assert.True(b); + } + + [Fact] + public static void LengthMismatchEndsWith_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + var span = new ReadOnlySpan(a, 0, 2); + var slice = new ReadOnlySpan(a, 0, 3); + bool b = span.EndsWith(slice); + Assert.False(b); + } + + [Fact] + public static void EndsWithMatch_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + var span = new ReadOnlySpan(a, 0, 3); + var slice = new ReadOnlySpan(a, 1, 2); + bool b = span.EndsWith(slice); + Assert.True(b); + } + + [Fact] + public static void EndsWithMatchDifferentSpans_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + long[] b = { 488238291, 52498989823, 619890289890 }; + var span = new ReadOnlySpan(a, 0, 3); + var slice = new ReadOnlySpan(b, 0, 3); + bool c = span.EndsWith(slice); + Assert.True(c); + } + + [Fact] + public static void EndsWithNoMatch_Long() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new long[length]; + var second = new long[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (long)(i + 1); + } + + second[mismatchIndex] = (long)(second[mismatchIndex] + 1); + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + bool b = firstSpan.EndsWith(secondSpan); + Assert.False(b); + } + } + } + + [Fact] + public static void MakeSureNoEndsWithChecksGoOutOfRange_Long() + { + for (int length = 0; length < 100; length++) + { + var first = new long[length + 2]; + first[0] = 99; + first[length + 1] = 99; + var second = new long[length + 2]; + second[0] = 100; + second[length + 1] = 100; + var span1 = new ReadOnlySpan(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + bool b = span1.EndsWith(span2); + Assert.True(b); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/Equals.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/Equals.cs new file mode 100644 index 0000000000..28523bec82 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/Equals.cs @@ -0,0 +1,262 @@ +// 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.Collections.Generic; +using System.Globalization; +using System.Runtime.InteropServices; +using System.Threading; +using Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void ZeroLengthEquals_StringComparison() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a); + var slice = new ReadOnlySpan(a, 2, 0); + Assert.False(span.Equals(slice, StringComparison.Ordinal)); + + Assert.False(span.Equals(slice, StringComparison.CurrentCulture)); + Assert.False(span.Equals(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.False(span.Equals(slice, StringComparison.InvariantCulture)); + Assert.False(span.Equals(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.False(span.Equals(slice, StringComparison.OrdinalIgnoreCase)); + + span = new ReadOnlySpan(a, 1, 0); + Assert.True(span.Equals(slice, StringComparison.Ordinal)); + + Assert.True(span.Equals(slice, StringComparison.CurrentCulture)); + Assert.True(span.Equals(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span.Equals(slice, StringComparison.InvariantCulture)); + Assert.True(span.Equals(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span.Equals(slice, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void SameSpanEquals_StringComparison() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a); + Assert.True(span.Equals(span, StringComparison.Ordinal)); + + Assert.True(span.Equals(span, StringComparison.CurrentCulture)); + Assert.True(span.Equals(span, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span.Equals(span, StringComparison.InvariantCulture)); + Assert.True(span.Equals(span, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span.Equals(span, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void LengthMismatchEquals_StringComparison() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a, 0, 2); + var slice = new ReadOnlySpan(a, 0, 3); + Assert.False(span.Equals(slice, StringComparison.Ordinal)); + + Assert.False(span.Equals(slice, StringComparison.CurrentCulture)); + Assert.False(span.Equals(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.False(span.Equals(slice, StringComparison.InvariantCulture)); + Assert.False(span.Equals(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.False(span.Equals(slice, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void EqualsOverlappingMatch_StringComparison() + { + char[] a = { '4', '5', '6', '5', '6', '5' }; + var span = new ReadOnlySpan(a, 1, 3); + var slice = new ReadOnlySpan(a, 3, 3); + Assert.True(span.Equals(slice, StringComparison.Ordinal)); + + Assert.True(span.Equals(slice, StringComparison.CurrentCulture)); + Assert.True(span.Equals(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span.Equals(slice, StringComparison.InvariantCulture)); + Assert.True(span.Equals(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span.Equals(slice, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void EqualsMatchDifferentSpans_StringComparison() + { + char[] a = { '4', '5', '6', '7' }; + char[] b = { '4', '5', '6' }; + var span = new ReadOnlySpan(a, 0, 3); + var slice = new ReadOnlySpan(b, 0, 3); + Assert.True(span.Equals(slice, StringComparison.Ordinal)); + + Assert.True(span.Equals(slice, StringComparison.CurrentCulture)); + Assert.True(span.Equals(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span.Equals(slice, StringComparison.InvariantCulture)); + Assert.True(span.Equals(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span.Equals(slice, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void EqualsNoMatch_StringComparison() + { + for (int length = 1; length < 150; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new char[length]; + var second = new char[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (char)(i + 1); + } + + second[mismatchIndex] = (char)(second[mismatchIndex] + 1); + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + Assert.False(firstSpan.Equals(secondSpan, StringComparison.Ordinal)); + + Assert.False(firstSpan.Equals(secondSpan, StringComparison.OrdinalIgnoreCase)); + + // Different behavior depending on OS + Assert.Equal( + firstSpan.ToString().Equals(secondSpan.ToString(), StringComparison.CurrentCulture), + firstSpan.Equals(secondSpan, StringComparison.CurrentCulture)); + Assert.Equal( + firstSpan.ToString().Equals(secondSpan.ToString(), StringComparison.CurrentCultureIgnoreCase), + firstSpan.Equals(secondSpan, StringComparison.CurrentCultureIgnoreCase)); + Assert.Equal( + firstSpan.ToString().Equals(secondSpan.ToString(), StringComparison.InvariantCulture), + firstSpan.Equals(secondSpan, StringComparison.InvariantCulture)); + Assert.Equal( + firstSpan.ToString().Equals(secondSpan.ToString(), StringComparison.InvariantCultureIgnoreCase), + firstSpan.Equals(secondSpan, StringComparison.InvariantCultureIgnoreCase)); + } + } + } + + [Fact] + public static void MakeSureNoEqualsChecksGoOutOfRange_StringComparison() + { + for (int length = 0; length < 100; length++) + { + var first = new char[length + 2]; + first[0] = (char)99; + first[length + 1] = (char)99; + var second = new char[length + 2]; + second[0] = (char)100; + second[length + 1] = (char)100; + var span1 = new ReadOnlySpan(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + Assert.True(span1.Equals(span2, StringComparison.Ordinal)); + + Assert.True(span1.Equals(span2, StringComparison.CurrentCulture)); + Assert.True(span1.Equals(span2, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span1.Equals(span2, StringComparison.InvariantCulture)); + Assert.True(span1.Equals(span2, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span1.Equals(span2, StringComparison.OrdinalIgnoreCase)); + } + } + + [Fact] + public static void EqualsUnknownComparisonType_StringComparison() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a); + TestHelpers.AssertThrows(span, (_span) => _span.Equals(_span, StringComparison.CurrentCulture - 1)); + TestHelpers.AssertThrows(span, (_span) => _span.Equals(_span, StringComparison.OrdinalIgnoreCase + 1)); + TestHelpers.AssertThrows(span, (_span) => _span.Equals(_span, (StringComparison)6)); + } + + [Theory(Skip="Mono issue")] + // CurrentCulture + [InlineData("Hello", "Hello", StringComparison.CurrentCulture, true)] + [InlineData("Hello", "hello", StringComparison.CurrentCulture, false)] + [InlineData("Hello", "Helloo", StringComparison.CurrentCulture, false)] + [InlineData("Hello", "Hell", StringComparison.CurrentCulture, false)] + [InlineData("Hello", SoftHyphen + "Hello" + SoftHyphen, StringComparison.CurrentCulture, true)] + [InlineData("Hello", "", StringComparison.CurrentCulture, false)] + [InlineData("", "Hello", StringComparison.CurrentCulture, false)] + [InlineData("", "", StringComparison.CurrentCulture, true)] + // CurrentCultureIgnoreCase + [InlineData("Hello", "Hello", StringComparison.CurrentCultureIgnoreCase, true)] + [InlineData("Hello", "hello", StringComparison.CurrentCultureIgnoreCase, true)] + [InlineData("Hello", "helloo", StringComparison.CurrentCultureIgnoreCase, false)] + [InlineData("Hello", "hell", StringComparison.CurrentCultureIgnoreCase, false)] + [InlineData("Hello", SoftHyphen + "Hello" + SoftHyphen, StringComparison.CurrentCulture, true)] + [InlineData("Hello", "", StringComparison.CurrentCultureIgnoreCase, false)] + [InlineData("", "Hello", StringComparison.CurrentCultureIgnoreCase, false)] + [InlineData("", "", StringComparison.CurrentCultureIgnoreCase, true)] + // InvariantCulture + [InlineData("Hello", "Hello", StringComparison.InvariantCulture, true)] + [InlineData("Hello", "hello", StringComparison.InvariantCulture, false)] + [InlineData("Hello", "Helloo", StringComparison.InvariantCulture, false)] + [InlineData("Hello", "Hell", StringComparison.InvariantCulture, false)] + [InlineData("Hello", SoftHyphen + "Hello" + SoftHyphen, StringComparison.CurrentCulture, true)] + [InlineData("Hello", "", StringComparison.InvariantCulture, false)] + [InlineData("", "Hello", StringComparison.InvariantCulture, false)] + [InlineData("", "", StringComparison.InvariantCulture, true)] + // InvariantCultureIgnoreCase + [InlineData("Hello", "Hello", StringComparison.InvariantCultureIgnoreCase, true)] + [InlineData("Hello", "hello", StringComparison.InvariantCultureIgnoreCase, true)] + [InlineData("Hello", "Helloo", StringComparison.InvariantCultureIgnoreCase, false)] + [InlineData("Hello", "Hell", StringComparison.InvariantCultureIgnoreCase, false)] + [InlineData("Hello", SoftHyphen + "Hello" + SoftHyphen, StringComparison.CurrentCulture, true)] + [InlineData("Hello", "", StringComparison.InvariantCultureIgnoreCase, false)] + [InlineData("", "Hello", StringComparison.InvariantCultureIgnoreCase, false)] + [InlineData("", "", StringComparison.InvariantCultureIgnoreCase, true)] + // Ordinal + [InlineData("Hello", "Hello", StringComparison.Ordinal, true)] + [InlineData("Hello", "hello", StringComparison.Ordinal, false)] + [InlineData("Hello", "Helloo", StringComparison.Ordinal, false)] + [InlineData("Hello", "Hell", StringComparison.Ordinal, false)] + [InlineData("Hello", SoftHyphen + "Hello" + SoftHyphen, StringComparison.Ordinal, false)] + [InlineData("Hello", "", StringComparison.Ordinal, false)] + [InlineData("", "Hello", StringComparison.Ordinal, false)] + [InlineData("", "", StringComparison.Ordinal, true)] + // OridinalIgnoreCase + [InlineData("Hello", "Hello", StringComparison.OrdinalIgnoreCase, true)] + [InlineData("HELLO", "hello", StringComparison.OrdinalIgnoreCase, true)] + [InlineData("Hello", "Helloo", StringComparison.OrdinalIgnoreCase, false)] + [InlineData("Hello", "Hell", StringComparison.OrdinalIgnoreCase, false)] + [InlineData("Hello", SoftHyphen + "Hello" + SoftHyphen, StringComparison.OrdinalIgnoreCase, false)] + [InlineData("\u1234\u5678", "\u1234\u5678", StringComparison.OrdinalIgnoreCase, true)] + [InlineData("\u1234\u5678", "\u1234\u5679", StringComparison.OrdinalIgnoreCase, false)] + [InlineData("\u1234\u5678", "\u1235\u5678", StringComparison.OrdinalIgnoreCase, false)] + [InlineData("\u1234\u5678", "\u1234", StringComparison.OrdinalIgnoreCase, false)] + [InlineData("\u1234\u5678", "\u1234\u56789\u1234", StringComparison.OrdinalIgnoreCase, false)] + [InlineData("Hello", "", StringComparison.OrdinalIgnoreCase, false)] + [InlineData("", "Hello", StringComparison.OrdinalIgnoreCase, false)] + [InlineData("", "", StringComparison.OrdinalIgnoreCase, true)] + public static void Equals(string s1, string s2, StringComparison comparisonType, bool expected) + { + Assert.Equal(expected, s1.AsSpan().Equals(s2.AsSpan(), comparisonType)); + } + + public static IEnumerable Equals_EncyclopaediaData() + { + yield return new object[] { StringComparison.CurrentCulture, false }; + yield return new object[] { StringComparison.CurrentCultureIgnoreCase, false }; + yield return new object[] { StringComparison.Ordinal, false }; + yield return new object[] { StringComparison.OrdinalIgnoreCase, false }; + + // Windows and ICU disagree about how these strings compare in the default locale. + yield return new object[] { StringComparison.InvariantCulture, PlatformDetection.IsWindows }; + yield return new object[] { StringComparison.InvariantCultureIgnoreCase, PlatformDetection.IsWindows }; + } + + [Theory(Skip="Mono issue")] + [MemberData(nameof(Equals_EncyclopaediaData))] + public static void Equals_Encyclopaedia_ReturnsExpected(StringComparison comparison, bool expected) + { + string source = "encyclop\u00e6dia"; + string target = "encyclopaedia"; + CultureInfo backupCulture = CultureInfo.CurrentCulture; + + Thread.CurrentThread.CurrentCulture = new CultureInfo("se-SE"); + Assert.Equal(expected, source.AsSpan().Equals(target.AsSpan(), comparison)); + + Thread.CurrentThread.CurrentCulture = backupCulture; + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/GetPinnableReference.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/GetPinnableReference.cs new file mode 100644 index 0000000000..a6b915ba72 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/GetPinnableReference.cs @@ -0,0 +1,86 @@ +// 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.Runtime.CompilerServices; +using Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void GetPinnableReferenceArray() + { + int[] a = { 91, 92, 93, 94, 95 }; + ReadOnlySpan span = new ReadOnlySpan(a, 1, 3); + ref int pinnableReference = ref Unsafe.AsRef(in span.GetPinnableReference()); + Assert.True(Unsafe.AreSame(ref a[1], ref pinnableReference)); + } + + // Enable this test once we use C# 7.3 (https://github.com/dotnet/corefx/issues/29084) + //[Fact] + //public static unsafe void UsingSpanInFixed() + //{ + // byte[] a = { 91, 92, 93, 94, 95 }; + // ReadOnlySpan span = a; + // fixed (byte* ptr = span) + // { + // for (int i = 0; i < span.Length; i++) + // { + // Assert.Equal(a[i], ptr[i]); + // } + // } + //} + // + //[Fact] + //public static unsafe void UsingEmptySpanInFixed() + //{ + // ReadOnlySpan span = ReadOnlySpan.Empty; + // fixed (int* ptr = span) + // { + // Assert.True(ptr == null); + // } + + // ReadOnlySpan spanFromEmptyArray = Array.Empty(); + // fixed (int* ptr = spanFromEmptyArray) + // { + // Assert.True(ptr == null); + // } + //} + + [Fact] + public static unsafe void GetPinnableReferenceArrayPastEnd() + { + // The only real difference between GetPinnableReference() and "ref span[0]" is that + // GetPinnableReference() of a zero-length won't throw an IndexOutOfRange but instead return a null ref. + + int[] a = { 91, 92, 93, 94, 95 }; + ReadOnlySpan span = new ReadOnlySpan(a, a.Length, 0); + ref int pinnableReference = ref Unsafe.AsRef(in span.GetPinnableReference()); + ref int expected = ref Unsafe.AsRef(null); + Assert.True(Unsafe.AreSame(ref expected, ref pinnableReference)); + } + + [Fact] + public static unsafe void GetPinnableReferencePointer() + { + int i = 42; + ReadOnlySpan span = new ReadOnlySpan(&i, 1); + ref int pinnableReference = ref Unsafe.AsRef(in span.GetPinnableReference()); + Assert.True(Unsafe.AreSame(ref i, ref pinnableReference)); + } + + [Fact] + public static unsafe void GetPinnableReferenceEmpty() + { + ReadOnlySpan span = ReadOnlySpan.Empty; + ref int pinnableReference = ref Unsafe.AsRef(in span.GetPinnableReference()); + Assert.True(Unsafe.AreSame(ref Unsafe.AsRef(null), ref pinnableReference)); + + ReadOnlySpan spanFromEmptyArray = Array.Empty(); + pinnableReference = ref Unsafe.AsRef(in spanFromEmptyArray.GetPinnableReference()); + Assert.True(Unsafe.AreSame(ref Unsafe.AsRef(null), ref pinnableReference)); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/IndexOf.byte.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/IndexOf.byte.cs index d587c3738c..29a6e16413 100644 --- a/external/corefx/src/System.Memory/tests/ReadOnlySpan/IndexOf.byte.cs +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/IndexOf.byte.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Numerics; -using System.Text; using Xunit; namespace System.SpanTests diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/IndexOf.charSpan.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/IndexOf.charSpan.cs new file mode 100644 index 0000000000..278ffe857c --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/IndexOf.charSpan.cs @@ -0,0 +1,409 @@ +// 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.Collections.Generic; +using System.Globalization; +using System.Threading; +using Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Theory] + [InlineData("Hello", 'l', 0, 5, 2)] + [InlineData("Hello", 'x', 0, 5, -1)] + [InlineData("Hello", 'l', 1, 4, 2)] + [InlineData("Hello", 'l', 3, 2, 3)] + [InlineData("Hello", 'l', 4, 1, -1)] + [InlineData("Hello", 'x', 1, 4, -1)] + [InlineData("Hello", 'l', 3, 0, -1)] + [InlineData("Hello", 'l', 0, 2, -1)] + [InlineData("Hello", 'l', 0, 3, 2)] + [InlineData("Hello", 'l', 4, 1, -1)] + [InlineData("Hello", 'x', 1, 4, -1)] + [InlineData("Hello", 'o', 5, 0, -1)] + [InlineData("H" + SoftHyphen + "ello", 'e', 0, 3, 2)] + [InlineData("\ud800\udfff", '\ud800', 0, 1, 0)] // Surrogate characters + [InlineData("ABCDEFGHIJKLMNOPQRSTUVWXYZ", 'A', 0, 26, 0)] + [InlineData("ABCDEFGHIJKLMNOPQRSTUVWXYZ", 'B', 1, 25, 1)] + [InlineData("ABCDEFGHIJKLMNOPQRSTUVWXYZ", 'C', 2, 24, 2)] + [InlineData("ABCDEFGHIJKLMNOPQRSTUVWXYZ", 'D', 3, 23, 3)] + [InlineData("ABCDEFGHIJKLMNOPQRSTUVWXYZ", 'G', 2, 24, 6)] + [InlineData("ABCDEFGHIJKLMNOPQRSTUVWXYZ", 'K', 2, 24, 10)] + [InlineData("ABCDEFGHIJKLMNOPQRSTUVWXYZ", 'O', 2, 24, 14)] + [InlineData("ABCDEFGHIJKLMNOPQRSTUVWXYZ", 'P', 2, 24, 15)] + [InlineData("ABCDEFGHIJKLMNOPQRSTUVWXYZ", 'Q', 2, 24, 16)] + [InlineData("ABCDEFGHIJKLMNOPQRSTUVWXYZ", 'R', 2, 24, 17)] + [InlineData("________\u8080\u8080\u8080________", '\u0080', 0, 19, -1)] + [InlineData("________\u8000\u8000\u8000________", '\u0080', 0, 19, -1)] + [InlineData("__\u8080\u8000\u0080______________", '\u0080', 0, 19, 4)] + [InlineData("__\u8080\u8000__\u0080____________", '\u0080', 0, 19, 6)] + [InlineData("__________________________________", '\ufffd', 0, 34, -1)] + [InlineData("____________________________\ufffd", '\ufffd', 0, 29, 28)] + [InlineData("ABCDEFGHIJKLM", 'M', 0, 13, 12)] + [InlineData("ABCDEFGHIJKLMN", 'N', 0, 14, 13)] + [InlineData("ABCDEFGHIJKLMNOPQRSTUVWXYZ", '@', 0, 26, -1)] + [InlineData("ABCDEFGHIJKLMNOPQRSTUVWXY", '@', 0, 25, -1)] + [InlineData("ABCDEFGHIJKLMNOPQRSTUVWXYZ#", '@', 0, 27, -1)] + [InlineData("_____________\u807f", '\u007f', 0, 14, -1)] + [InlineData("_____________\u807f__", '\u007f', 0, 16, -1)] + [InlineData("_____________\u807f\u007f_", '\u007f', 0, 16, 14)] + [InlineData("__\u807f_______________", '\u007f', 0, 18, -1)] + [InlineData("__\u807f___\u007f___________", '\u007f', 0, 18, 6)] + [InlineData("ABCDEFGHIJKLMN", 'N', 2, 11, -1)] + [InlineData("!@#$%^&", '%', 0, 7, 4)] + [InlineData("!@#$", '!', 0, 4, 0)] + [InlineData("!@#$", '@', 0, 4, 1)] + [InlineData("!@#$", '#', 0, 4, 2)] + [InlineData("!@#$", '$', 0, 4, 3)] + [InlineData("!@#$%^&*", '%', 0, 8, 4)] + public static void IndexOf_SingleLetter(string s, char target, int startIndex, int count, int expected) + { + bool safeForCurrentCulture = + IsSafeForCurrentCultureComparisons(s) + && IsSafeForCurrentCultureComparisons(target.ToString()); + + ReadOnlySpan span = s.AsSpan(); + var charArray = new char[1]; + charArray[0] = target; + ReadOnlySpan targetSpan = charArray; + + int expectedFromSpan = expected == -1 ? expected : expected - startIndex; + + if (count + startIndex == s.Length) + { + if (startIndex == 0) + { + Assert.Equal(expectedFromSpan, span.IndexOf(targetSpan, StringComparison.Ordinal)); + Assert.Equal(expectedFromSpan, span.IndexOf(targetSpan, StringComparison.OrdinalIgnoreCase)); + + // To be safe we only want to run CurrentCulture comparisons if + // we know the results will not vary depending on location + if (safeForCurrentCulture) + { + Assert.Equal(expectedFromSpan, span.IndexOf(targetSpan, StringComparison.CurrentCulture)); + } + } + + Assert.Equal(expectedFromSpan, span.Slice(startIndex).IndexOf(targetSpan, StringComparison.Ordinal)); + Assert.Equal(expectedFromSpan, span.Slice(startIndex).IndexOf(targetSpan, StringComparison.OrdinalIgnoreCase)); + + if (safeForCurrentCulture) + { + Assert.Equal(expectedFromSpan, span.Slice(startIndex).IndexOf(targetSpan, StringComparison.CurrentCulture)); + } + } + Assert.Equal(expectedFromSpan, span.Slice(startIndex, count).IndexOf(targetSpan, StringComparison.Ordinal)); + Assert.Equal(expectedFromSpan, span.Slice(startIndex, count).IndexOf(targetSpan, StringComparison.OrdinalIgnoreCase)); + + if (safeForCurrentCulture) + { + Assert.Equal(expectedFromSpan, span.Slice(startIndex, count).IndexOf(targetSpan, StringComparison.CurrentCulture)); + } + } + + private static bool IsSafeForCurrentCultureComparisons(string str) + { + for (int i = 0; i < str.Length; i++) + { + char c = str[i]; + // We only want ASCII chars that you can see + // No controls, no delete, nothing >= 0x80 + if (c < 0x20 || c == 0x7f || c >= 0x80) + { + return false; + } + } + return true; + } + + + // NOTE: This is by design. Unix ignores the null characters (i.e. null characters have no weights for the string comparison). + // For desired behavior, use ordinal comparison instead of linguistic comparison. + // This is a known difference between Windows and Unix (https://github.com/dotnet/coreclr/issues/2051). + [Theory] + [PlatformSpecific(TestPlatforms.Windows)] + [InlineData("He\0lo", "He\0lo", 0)] + [InlineData("He\0lo", "He\0", 0)] + [InlineData("He\0lo", "\0", 2)] + [InlineData("He\0lo", "\0lo", 2)] + [InlineData("He\0lo", "lo", 3)] + [InlineData("Hello", "lo\0", -1)] + [InlineData("Hello", "\0lo", -1)] + [InlineData("Hello", "l\0o", -1)] + public static void IndexOf_NullInStrings(string s, string value, int expected) + { + Assert.Equal(expected, s.AsSpan().IndexOf(value.AsSpan(), StringComparison.Ordinal)); + } + + [Theory] + [MemberData(nameof(AllSubstringsAndComparisons), new object[] { "abcde" })] + public static void IndexOf_AllSubstrings(string s, string value, int startIndex, StringComparison comparison) + { + bool ignoringCase = comparison == StringComparison.OrdinalIgnoreCase || comparison == StringComparison.CurrentCultureIgnoreCase; + + // First find the substring. We should be able to with all comparison types. + Assert.Equal(startIndex, s.AsSpan().IndexOf(value.AsSpan(), comparison)); // in the whole string + Assert.Equal(0, s.AsSpan(startIndex).IndexOf(value.AsSpan(), comparison)); // starting at substring + if (startIndex > 0) + { + Assert.Equal(1, s.AsSpan(startIndex - 1).IndexOf(value.AsSpan(), comparison)); // starting just before substring + } + Assert.Equal(-1, s.AsSpan(startIndex + 1).IndexOf(value.AsSpan(), comparison)); // starting just after start of substring + + // Shouldn't be able to find the substring if the count is less than substring's length + Assert.Equal(-1, s.AsSpan(0, value.Length - 1).IndexOf(value.AsSpan(), comparison)); + + // Now double the source. Make sure we find the first copy of the substring. + int halfLen = s.Length; + s += s; + Assert.Equal(startIndex, s.AsSpan().IndexOf(value.AsSpan(), comparison)); + + // Now change the case of a letter. + s = s.ToUpperInvariant(); + Assert.Equal(ignoringCase ? startIndex : -1, s.AsSpan().IndexOf(value.AsSpan(), comparison)); + } + + public static IEnumerable AllSubstringsAndComparisons(string source) + { + var comparisons = new StringComparison[] + { + StringComparison.CurrentCulture, + StringComparison.CurrentCultureIgnoreCase, + StringComparison.Ordinal, + StringComparison.OrdinalIgnoreCase + }; + + foreach (StringComparison comparison in comparisons) + { + for (int i = 0; i <= source.Length; i++) + { + for (int subLen = source.Length - i; subLen > 0; subLen--) + { + yield return new object[] { source, source.Substring(i, subLen), i, comparison }; + } + } + } + } + + [Fact(Skip="Mono issue")] + public static void IndexOf_TurkishI_TurkishCulture() + { + CultureInfo backupCulture = CultureInfo.CurrentCulture; + + Thread.CurrentThread.CurrentCulture = new CultureInfo("tr-TR"); + + string str = "Turkish I \u0131s TROUBL\u0130NG!"; + string valueString = "\u0130"; + ReadOnlySpan s = str.AsSpan(); + ReadOnlySpan value = valueString.AsSpan(); + Assert.Equal(19, s.IndexOf(value, StringComparison.CurrentCulture)); + Assert.Equal(4, s.IndexOf(value, StringComparison.CurrentCultureIgnoreCase)); + Assert.Equal(19, s.IndexOf(value, StringComparison.Ordinal)); + Assert.Equal(19, s.IndexOf(value, StringComparison.OrdinalIgnoreCase)); + + valueString = "\u0131"; + value = valueString.AsSpan(); + Assert.Equal(10, s.IndexOf(value, StringComparison.CurrentCulture)); + Assert.Equal(8, s.IndexOf(value, StringComparison.CurrentCultureIgnoreCase)); + Assert.Equal(10, s.IndexOf(value, StringComparison.Ordinal)); + Assert.Equal(10, s.IndexOf(value, StringComparison.OrdinalIgnoreCase)); + + Thread.CurrentThread.CurrentCulture = backupCulture; + } + + [Fact] + public static void IndexOf_TurkishI_InvariantCulture() + { + CultureInfo backupCulture = CultureInfo.CurrentCulture; + + Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; + + string str = "Turkish I \u0131s TROUBL\u0130NG!"; + string valueString = "\u0130"; + ReadOnlySpan s = str.AsSpan(); + ReadOnlySpan value = valueString.AsSpan(); + + Assert.Equal(19, s.IndexOf(value, StringComparison.CurrentCulture)); + Assert.Equal(19, s.IndexOf(value, StringComparison.CurrentCultureIgnoreCase)); + + valueString = "\u0131"; + value = valueString.AsSpan(); + Assert.Equal(10, s.IndexOf(value, StringComparison.CurrentCulture)); + Assert.Equal(10, s.IndexOf(value, StringComparison.CurrentCultureIgnoreCase)); + + Thread.CurrentThread.CurrentCulture = backupCulture; + } + + [Fact(Skip="Mono issue")] + public static void IndexOf_TurkishI_EnglishUSCulture() + { + CultureInfo backupCulture = CultureInfo.CurrentCulture; + + Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US"); + + string str = "Turkish I \u0131s TROUBL\u0130NG!"; + string valueString = "\u0130"; + ReadOnlySpan s = str.AsSpan(); + ReadOnlySpan value = valueString.AsSpan(); + + Assert.Equal(19, s.IndexOf(value, StringComparison.CurrentCulture)); + Assert.Equal(19, s.IndexOf(value, StringComparison.CurrentCultureIgnoreCase)); + + valueString = "\u0131"; + value = valueString.AsSpan(); + Assert.Equal(10, s.IndexOf(value, StringComparison.CurrentCulture)); + Assert.Equal(10, s.IndexOf(value, StringComparison.CurrentCultureIgnoreCase)); + + Thread.CurrentThread.CurrentCulture = backupCulture; + } + + [Fact(Skip="Mono issue")] + public static void IndexOf_HungarianDoubleCompression_HungarianCulture() + { + string str = "dzsdzs"; + string valueString = "ddzs"; + + ReadOnlySpan s = str.AsSpan(); + ReadOnlySpan value = valueString.AsSpan(); + + CultureInfo backupCulture = CultureInfo.CurrentCulture; + + Thread.CurrentThread.CurrentCulture = new CultureInfo("hu-HU"); + /* + There are differences between Windows and ICU regarding contractions. + Windows has equal contraction collation weights, including case (target="Ddzs" same behavior as "ddzs"). + ICU has different contraction collation weights, depending on locale collation rules. + If CurrentCultureIgnoreCase is specified, ICU will use 'secondary' collation rules + which ignore the contraction collation weights (defined as 'tertiary' rules) + */ + Assert.Equal(PlatformDetection.IsWindows ? 0 : -1, s.IndexOf(value, StringComparison.CurrentCulture)); + + Assert.Equal(0, s.IndexOf(value, StringComparison.CurrentCultureIgnoreCase)); + Assert.Equal(-1, s.IndexOf(value, StringComparison.Ordinal)); + Assert.Equal(-1, s.IndexOf(value, StringComparison.OrdinalIgnoreCase)); + + Thread.CurrentThread.CurrentCulture = backupCulture; + } + + [Fact] + public static void IndexOf_HungarianDoubleCompression_InvariantCulture() + { + string str = "dzsdzs"; + string valueString = "ddzs"; + + ReadOnlySpan s = str.AsSpan(); + ReadOnlySpan value = valueString.AsSpan(); + + CultureInfo backupCulture = CultureInfo.CurrentCulture; + + Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; + Assert.Equal(-1, s.IndexOf(value, StringComparison.CurrentCulture)); + Assert.Equal(-1, s.IndexOf(value, StringComparison.CurrentCultureIgnoreCase)); + + Thread.CurrentThread.CurrentCulture = backupCulture; + } + + [Fact] + public static void IndexOf_EquivalentDiacritics_EnglishUSCulture() + { + string str = "Exhibit a\u0300\u00C0"; + string valueString = "\u00C0"; + + ReadOnlySpan s = str.AsSpan(); + ReadOnlySpan value = valueString.AsSpan(); + + CultureInfo backupCulture = CultureInfo.CurrentCulture; + + Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US"); + Assert.Equal(10, s.IndexOf(value, StringComparison.CurrentCulture)); + Assert.Equal(8, s.IndexOf(value, StringComparison.CurrentCultureIgnoreCase)); + Assert.Equal(10, s.IndexOf(value, StringComparison.Ordinal)); + Assert.Equal(10, s.IndexOf(value, StringComparison.OrdinalIgnoreCase)); + + valueString = "a\u0300"; // this diacritic combines with preceding character + value = valueString.AsSpan(); + Assert.Equal(8, s.IndexOf(value, StringComparison.CurrentCulture)); + Assert.Equal(8, s.IndexOf(value, StringComparison.CurrentCultureIgnoreCase)); + Assert.Equal(8, s.IndexOf(value, StringComparison.Ordinal)); + Assert.Equal(8, s.IndexOf(value, StringComparison.OrdinalIgnoreCase)); + + Thread.CurrentThread.CurrentCulture = backupCulture; + } + + [Fact] + public static void IndexOf_EquivalentDiacritics_InvariantCulture() + { + string str = "Exhibit a\u0300\u00C0"; + string valueString = "\u00C0"; + + ReadOnlySpan s = str.AsSpan(); + ReadOnlySpan value = valueString.AsSpan(); + + CultureInfo backupCulture = CultureInfo.CurrentCulture; + + Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; + Assert.Equal(10, s.IndexOf(value, StringComparison.CurrentCulture)); + Assert.Equal(8, s.IndexOf(value, StringComparison.CurrentCultureIgnoreCase)); + + valueString = "a\u0300"; // this diacritic combines with preceding character + value = valueString.AsSpan(); + Assert.Equal(8, s.IndexOf(value, StringComparison.CurrentCulture)); + Assert.Equal(8, s.IndexOf(value, StringComparison.CurrentCultureIgnoreCase)); + + Thread.CurrentThread.CurrentCulture = backupCulture; + } + + [Fact(Skip="Mono issue")] + public static void IndexOf_CyrillicE_EnglishUSCulture() + { + string str = "Foo\u0400Bar"; + string valueString = "\u0400"; + + ReadOnlySpan s = str.AsSpan(); + ReadOnlySpan value = valueString.AsSpan(); + + CultureInfo backupCulture = CultureInfo.CurrentCulture; + + Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US"); + Assert.Equal(3, s.IndexOf(value, StringComparison.CurrentCulture)); + Assert.Equal(3, s.IndexOf(value, StringComparison.CurrentCultureIgnoreCase)); + Assert.Equal(3, s.IndexOf(value, StringComparison.Ordinal)); + Assert.Equal(3, s.IndexOf(value, StringComparison.OrdinalIgnoreCase)); + + valueString = "bar"; + value = valueString.AsSpan(); + Assert.Equal(-1, s.IndexOf(value, StringComparison.CurrentCulture)); + Assert.Equal(4, s.IndexOf(value, StringComparison.CurrentCultureIgnoreCase)); + Assert.Equal(-1, s.IndexOf(value, StringComparison.Ordinal)); + Assert.Equal(4, s.IndexOf(value, StringComparison.OrdinalIgnoreCase)); + + Thread.CurrentThread.CurrentCulture = backupCulture; + } + + [Fact(Skip="Mono issue")] + public static void IndexOf_CyrillicE_InvariantCulture() + { + string str = "Foo\u0400Bar"; + string valueString = "\u0400"; + + ReadOnlySpan s = str.AsSpan(); + ReadOnlySpan value = valueString.AsSpan(); + + CultureInfo backupCulture = CultureInfo.CurrentCulture; + + Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; + Assert.Equal(3, s.IndexOf(value, StringComparison.CurrentCulture)); + Assert.Equal(3, s.IndexOf(value, StringComparison.CurrentCultureIgnoreCase)); + + valueString = "bar"; + value = valueString.AsSpan(); + Assert.Equal(-1, s.IndexOf(value, StringComparison.CurrentCulture)); + Assert.Equal(4, s.IndexOf(value, StringComparison.CurrentCultureIgnoreCase)); + + Thread.CurrentThread.CurrentCulture = backupCulture; + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/IndexOfAny.byte.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/IndexOfAny.byte.cs index d9a15cec68..358cf6e4a5 100644 --- a/external/corefx/src/System.Memory/tests/ReadOnlySpan/IndexOfAny.byte.cs +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/IndexOfAny.byte.cs @@ -2,7 +2,6 @@ // 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.Numerics; using System.Text; using Xunit; diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/IndexOfSequence.char.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/IndexOfSequence.char.cs index eedc14ac0c..9841b76fa1 100644 --- a/external/corefx/src/System.Memory/tests/ReadOnlySpan/IndexOfSequence.char.cs +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/IndexOfSequence.char.cs @@ -15,6 +15,7 @@ namespace System.SpanTests ReadOnlySpan value = new ReadOnlySpan(new char[] { '5', '1', '7' }); int index = span.IndexOf(value); Assert.Equal(0, index); + Assert.Equal(index, span.IndexOf(value, StringComparison.Ordinal)); } [Fact] @@ -24,6 +25,7 @@ namespace System.SpanTests ReadOnlySpan value = new ReadOnlySpan(new char[] { '2', '3' }); int index = span.IndexOf(value); Assert.Equal(1, index); + Assert.Equal(index, span.IndexOf(value, StringComparison.Ordinal)); } [Fact] @@ -33,6 +35,7 @@ namespace System.SpanTests ReadOnlySpan value = new ReadOnlySpan(new char[] { '7', '7', '8' }); int index = span.IndexOf(value); Assert.Equal(10, index); + Assert.Equal(index, span.IndexOf(value, StringComparison.Ordinal)); } [Fact] @@ -42,6 +45,7 @@ namespace System.SpanTests ReadOnlySpan value = new ReadOnlySpan(new char[] { '7', '7', '8', 'X' }); int index = span.IndexOf(value); Assert.Equal(-1, index); + Assert.Equal(index, span.IndexOf(value, StringComparison.Ordinal)); } [Fact] @@ -51,6 +55,7 @@ namespace System.SpanTests ReadOnlySpan value = new ReadOnlySpan(new char[] { 'X', '7', '8', '9' }); int index = span.IndexOf(value); Assert.Equal(-1, index); + Assert.Equal(index, span.IndexOf(value, StringComparison.Ordinal)); } [Fact] @@ -60,6 +65,7 @@ namespace System.SpanTests ReadOnlySpan value = new ReadOnlySpan(new char[] { '3', '4', '5' }); int index = span.IndexOf(value); Assert.Equal(3, index); + Assert.Equal(index, span.IndexOf(value, StringComparison.Ordinal)); } [Fact] @@ -69,6 +75,7 @@ namespace System.SpanTests ReadOnlySpan value = new ReadOnlySpan(new char[] { '3', '4', '5' }); int index = span.IndexOf(value); Assert.Equal(-1, index); + Assert.Equal(index, span.IndexOf(value, StringComparison.Ordinal)); } [Fact] @@ -79,6 +86,7 @@ namespace System.SpanTests ReadOnlySpan value = new ReadOnlySpan(Array.Empty()); int index = span.IndexOf(value); Assert.Equal(0, index); + Assert.Equal(index, span.IndexOf(value, StringComparison.Ordinal)); } [Fact] @@ -88,6 +96,7 @@ namespace System.SpanTests ReadOnlySpan value = new ReadOnlySpan(new char[] { '1', '2', '3' }); int index = span.IndexOf(value); Assert.Equal(-1, index); + Assert.Equal(index, span.IndexOf(value, StringComparison.Ordinal)); } [Fact] @@ -98,6 +107,7 @@ namespace System.SpanTests ReadOnlySpan value = new ReadOnlySpan(new char[] { '2' }); int index = span.IndexOf(value); Assert.Equal(2, index); + Assert.Equal(index, span.IndexOf(value, StringComparison.Ordinal)); } [Fact] @@ -108,6 +118,7 @@ namespace System.SpanTests ReadOnlySpan value = new ReadOnlySpan(new char[] { '5' }); int index = span.IndexOf(value); Assert.Equal(5, index); + Assert.Equal(index, span.IndexOf(value, StringComparison.Ordinal)); } [Fact] @@ -118,6 +129,7 @@ namespace System.SpanTests ReadOnlySpan value = new ReadOnlySpan(new char[] { '5' }); int index = span.IndexOf(value); Assert.Equal(-1, index); + Assert.Equal(index, span.IndexOf(value, StringComparison.Ordinal)); } } } diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/IsWhiteSpace.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/IsWhiteSpace.cs new file mode 100644 index 0000000000..ddcd1f9da5 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/IsWhiteSpace.cs @@ -0,0 +1,113 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + private static readonly char[] s_whiteSpaceCharacters = { '\u0009', '\u000a', '\u000b', '\u000c', '\u000d', '\u0020', '\u0085', '\u00a0', '\u1680' }; + + [Fact] + public static void ZeroLengthIsWhiteSpace() + { + var span = new ReadOnlySpan(Array.Empty()); + bool result = span.IsWhiteSpace(); + Assert.Equal(string.IsNullOrWhiteSpace(""), result); + } + + [Fact] + public static void IsWhiteSpaceTrueLatin1() + { + Random rand = new Random(42); + for (int length = 0; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = s_whiteSpaceCharacters[rand.Next(0, s_whiteSpaceCharacters.Length - 1)]; + } + var span = new Span(a); + bool result = ((ReadOnlySpan)span).IsWhiteSpace(); + Assert.Equal(string.IsNullOrWhiteSpace(new string(a)), result); + + for (int i = 0; i < s_whiteSpaceCharacters.Length - 1; i++) + { + span.Fill(s_whiteSpaceCharacters[i]); + Assert.Equal(string.IsNullOrWhiteSpace(new string(span.ToArray())), ((ReadOnlySpan)span).IsWhiteSpace()); + } + } + } + + [Fact] + public static void IsWhiteSpaceTrue() + { + Random rand = new Random(42); + for (int length = 0; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = s_whiteSpaceCharacters[rand.Next(0, s_whiteSpaceCharacters.Length)]; + } + var span = new ReadOnlySpan(a); + bool result = span.IsWhiteSpace(); + Assert.Equal(string.IsNullOrWhiteSpace(new string(span.ToArray())), result); + } + } + + [Fact] + public static void IsWhiteSpaceFalse() + { + Random rand = new Random(42); + for (int length = 1; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = s_whiteSpaceCharacters[rand.Next(0, s_whiteSpaceCharacters.Length)]; + } + var span = new Span(a); + + // first character is not a white-space character + a[0] = 'a'; + bool result = ((ReadOnlySpan)span).IsWhiteSpace(); + Assert.Equal(string.IsNullOrWhiteSpace(new string(span.ToArray())), result); + a[0] = ' '; + + // last character is not a white-space character + a[length - 1] = 'a'; + result = ((ReadOnlySpan)span).IsWhiteSpace(); + Assert.Equal(string.IsNullOrWhiteSpace(new string(span.ToArray())), result); + a[length - 1] = ' '; + + // character in the middle is not a white-space character + a[length/2] = 'a'; + result = ((ReadOnlySpan)span).IsWhiteSpace(); + Assert.Equal(string.IsNullOrWhiteSpace(new string(span.ToArray())), result); + a[length/2] = ' '; + + // no character is a white-space character + span.Fill('a'); + result = ((ReadOnlySpan)span).IsWhiteSpace(); + Assert.Equal(string.IsNullOrWhiteSpace(new string(span.ToArray())), result); + } + } + + [Fact] + public static void MakeSureNoIsWhiteSpaceChecksGoOutOfRange() + { + for (int length = 3; length < 64; length++) + { + char[] first = new char[length]; + first[0] = ' '; + first[length - 1] = ' '; + var span = new ReadOnlySpan(first, 1, length - 2); + bool result = span.IsWhiteSpace(); + Assert.Equal(string.IsNullOrWhiteSpace(new string(span.ToArray())), result); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/Overlaps.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/Overlaps.cs index ed572d9f36..150cf90f00 100644 --- a/external/corefx/src/System.Memory/tests/ReadOnlySpan/Overlaps.cs +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/Overlaps.cs @@ -2,6 +2,7 @@ // 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.Runtime.InteropServices; using Xunit; namespace System.SpanTests @@ -30,10 +31,10 @@ namespace System.SpanTests { int[] a = new int[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 }; - ReadOnlySpan source = a.AsReadOnlySpan().Slice(7, 5); + ReadOnlySpan source = a.AsSpan(7, 5); - Span expected = new int[a.Length].AsSpan().Slice(i, 5); - Span actual = a.AsSpan().Slice(i, 5); + Span expected = new int[a.Length].AsSpan(i, 5); + Span actual = a.AsSpan(i, 5); DoubleEachElementForwards(source, expected); DoubleEachElementForwards(source, actual); @@ -49,11 +50,10 @@ namespace System.SpanTests { int[] a = new int[] { 1, 2, 3, 4, 5, 6 }; - ReadOnlySpan source = a.AsReadOnlySpan().AsBytes() - .Slice(2, 5 * sizeof(int)) - .NonPortableCast(); + ReadOnlySpan bytes = MemoryMarshal.AsBytes(a); + ReadOnlySpan source = MemoryMarshal.Cast(bytes.Slice(2, 5 * sizeof(int))); - Span actual = a.AsSpan().Slice(0, 5); + Span actual = a.AsSpan(0, 5); DoubleEachElementForwards(source, actual); }); @@ -62,11 +62,10 @@ namespace System.SpanTests { int[] a = new int[] { 1, 2, 3, 4, 5, 6 }; - ReadOnlySpan source = a.AsReadOnlySpan().AsBytes() - .Slice(2, 5 * sizeof(int)) - .NonPortableCast(); + ReadOnlySpan bytes = MemoryMarshal.AsBytes(a); + ReadOnlySpan source = MemoryMarshal.Cast(bytes.Slice(2, 5 * sizeof(int))); - Span actual = a.AsSpan().Slice(1, 5); + Span actual = a.AsSpan(1, 5); DoubleEachElementForwards(source, actual); }); @@ -94,10 +93,10 @@ namespace System.SpanTests { int[] a = new int[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 }; - ReadOnlySpan source = a.AsReadOnlySpan().Slice(7, 5); + ReadOnlySpan source = a.AsSpan(7, 5); - Span expected = new int[a.Length].AsSpan().Slice(i, 5); - Span actual = a.AsSpan().Slice(i, 5); + Span expected = new int[a.Length].AsSpan(i, 5); + Span actual = a.AsSpan(i, 5); DoubleEachElementBackwards(source, expected); DoubleEachElementBackwards(source, actual); @@ -113,11 +112,10 @@ namespace System.SpanTests { int[] a = new int[] { 1, 2, 3, 4, 5, 6 }; - ReadOnlySpan source = a.AsReadOnlySpan().AsBytes() - .Slice(2, 5 * sizeof(int)) - .NonPortableCast(); + ReadOnlySpan bytes = MemoryMarshal.AsBytes(a); + ReadOnlySpan source = MemoryMarshal.Cast(bytes.Slice(2, 5 * sizeof(int))); - Span actual = a.AsSpan().Slice(0, 5); + Span actual = a.AsSpan(0, 5); DoubleEachElementBackwards(source, actual); }); @@ -126,11 +124,10 @@ namespace System.SpanTests { int[] a = new int[] { 1, 2, 3, 4, 5, 6 }; - ReadOnlySpan source = a.AsReadOnlySpan().AsBytes() - .Slice(2, 5 * sizeof(int)) - .NonPortableCast(); + ReadOnlySpan bytes = MemoryMarshal.AsBytes(a); + ReadOnlySpan source = MemoryMarshal.Cast(bytes.Slice(2, 5 * sizeof(int))); - Span actual = a.AsSpan().Slice(1, 5); + Span actual = a.AsSpan(1, 5); DoubleEachElementBackwards(source, actual); }); @@ -141,7 +138,10 @@ namespace System.SpanTests { byte[] a = new byte[16]; - Assert.True(a.AsReadOnlySpan().Slice(0, 12).Overlaps(a.AsReadOnlySpan().Slice(8, 8), out int elementOffset)); + ReadOnlySpan span1 = a.AsSpan(0, 12); + ReadOnlySpan span2 = a.AsSpan(8, 8); + + Assert.True(span1.Overlaps(span2, out int elementOffset)); Assert.Equal(8, elementOffset); } @@ -150,7 +150,10 @@ namespace System.SpanTests { Guid[] a = new Guid[16]; - Assert.True(a.AsReadOnlySpan().Slice(0, 12).Overlaps(a.AsReadOnlySpan().Slice(8, 8), out int elementOffset)); + ReadOnlySpan span1 = a.AsSpan(0, 12); + ReadOnlySpan span2 = a.AsSpan(8, 8); + + Assert.True(span1.Overlaps(span2, out int elementOffset)); Assert.Equal(8, elementOffset); } diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/SequenceCompareTo.T.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/SequenceCompareTo.T.cs new file mode 100644 index 0000000000..0924295bdc --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/SequenceCompareTo.T.cs @@ -0,0 +1,273 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void OnSequenceCompareToOfEqualSpansMakeSureEveryElementIsCompared() + { + for (int length = 0; length < 100; length++) + { + var log = new TIntLog(); + + var first = new TInt[length]; + var second = new TInt[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = new TInt(10 * (i + 1), log); + } + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.Equal(0, result); + + // Make sure each element of the array was compared once. (Strictly speaking, it would not be illegal for + // SequenceCompareTo to compare an element more than once but that would be a non-optimal implementation and + // a red flag. So we'll stick with the stricter test.) + Assert.Equal(first.Length, log.Count); + foreach (TInt elem in first) + { + int numCompares = log.CountCompares(elem.Value, elem.Value); + Assert.True(numCompares == 1, $"Expected {numCompares} == 1 for element {elem.Value}."); + } + } + } + + [Fact] + public static void SequenceCompareToSingleMismatch() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var log = new TIntLog(); + + var first = new TInt[length]; + var second = new TInt[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = new TInt(10 * (i + 1), log); + } + + second[mismatchIndex] = new TInt(second[mismatchIndex].Value + 1, log); + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + Assert.Equal(1, log.CountCompares(first[mismatchIndex].Value, second[mismatchIndex].Value)); + + result = secondSpan.SequenceCompareTo(firstSpan); // adds to log.CountCompares + Assert.True(result > 0); + Assert.Equal(2, log.CountCompares(first[mismatchIndex].Value, second[mismatchIndex].Value)); + } + } + } + + [Fact] + public static void SequenceCompareToNoMatch() + { + for (int length = 1; length < 32; length++) + { + var log = new TIntLog(); + + var first = new TInt[length]; + var second = new TInt[length]; + + for (int i = 0; i < length; i++) + { + first[i] = new TInt(i + 1, log); + second[i] = new TInt(length + i + 1, log); + } + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + Assert.Equal(1, log.CountCompares(firstSpan[0].Value, secondSpan[0].Value)); + + result = secondSpan.SequenceCompareTo(firstSpan); // adds to log.CountCompares + Assert.True(result > 0); + Assert.Equal(2, log.CountCompares(firstSpan[0].Value, secondSpan[0].Value)); + } + } + + [Fact] + public static void MakeSureNoSequenceCompareToChecksGoOutOfRange() + { + const int GuardValue = 77777; + const int GuardLength = 50; + + Action checkForOutOfRangeAccess = + delegate (int x, int y) + { + if (x == GuardValue || y == GuardValue) + throw new Exception("Detected out of range access in IndexOf()"); + }; + + for (int length = 0; length < 100; length++) + { + var first = new TInt[GuardLength + length + GuardLength]; + var second = new TInt[GuardLength + length + GuardLength]; + for (int i = 0; i < first.Length; i++) + { + first[i] = second[i] = new TInt(GuardValue, checkForOutOfRangeAccess); + } + + for (int i = 0; i < length; i++) + { + first[GuardLength + i] = second[GuardLength + i] = new TInt(10 * (i + 1), checkForOutOfRangeAccess); + } + + var firstSpan = new ReadOnlySpan(first, GuardLength, length); + var secondSpan = new ReadOnlySpan(second, GuardLength, length); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.Equal(0, result); + } + } + + [Fact] + public static void ZeroLengthSequenceCompareTo_String() + { + var a = new string[3]; + + var first = new ReadOnlySpan(a, 1, 0); + var second = new ReadOnlySpan(a, 2, 0); + int result = first.SequenceCompareTo(second); + Assert.Equal(0, result); + } + + [Fact] + public static void SameSpanSequenceCompareTo_String() + { + string[] a = { "fourth", "fifth", "sixth" }; + var span = new ReadOnlySpan(a); + int result = span.SequenceCompareTo(span); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArrayImplicit_String() + { + string[] a = { "fourth", "fifth", "sixth" }; + var first = new ReadOnlySpan(a, 0, 3); + int result = first.SequenceCompareTo(a); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArraySegmentImplicit_String() + { + string[] src = { "first", "second", "third" }; + string[] dst = { "fifth", "first", "second", "third", "tenth" }; + var segment = new ArraySegment(dst, 1, 3); + + var first = new ReadOnlySpan(src, 0, 3); + int result = first.SequenceCompareTo(segment); + Assert.Equal(0, result); + } + + [Fact] + public static void LengthMismatchSequenceCompareTo_String() + { + string[] a = { "fourth", "fifth", "sixth" }; + var first = new ReadOnlySpan(a, 0, 2); + var second = new ReadOnlySpan(a, 0, 3); + int result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + + // one sequence is empty + first = new Span(a, 1, 0); + + result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + } + + [Fact] + public static void SequenceCompareToWithSingleMismatch_String() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new string[length]; + var second = new string[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = $"item {i + 1}"; + } + + second[mismatchIndex] = (string)(second[mismatchIndex] + 1); + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result > 0); + } + } + } + + [Fact] + public static void SequenceCompareToNoMatch_string() + { + for (int length = 1; length < 32; length++) + { + var first = new string[length]; + var second = new string[length]; + + for (int i = 0; i < length; i++) + { + first[i] = $"item {i + 1}"; + second[i] = $"item {int.MaxValue - i}"; + } + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result > 0); + } + } + + [Fact] + public static void MakeSureNoSequenceCompareToChecksGoOutOfRange_string() + { + for (int length = 0; length < 100; length++) + { + var first = new string[length + 2]; + first[0] = "99"; + for (int k = 1; k <= length; k++) + first[k] = string.Empty; + first[length + 1] = "99"; + + var second = new string[length + 2]; + second[0] = "100"; + for (int k = 1; k <= length; k++) + second[k] = string.Empty; + second[length + 1] = "100"; + + var span1 = new ReadOnlySpan(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + int result = span1.SequenceCompareTo(span2); + Assert.Equal(0, result); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/SequenceCompareTo.bool.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/SequenceCompareTo.bool.cs new file mode 100644 index 0000000000..964492edbd --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/SequenceCompareTo.bool.cs @@ -0,0 +1,149 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void ZeroLengthSequenceCompareTo_Bool() + { + var a = new bool[3]; + + var first = new ReadOnlySpan(a, 1, 0); + var second = new ReadOnlySpan(a, 2, 0); + int result = first.SequenceCompareTo(second); + Assert.Equal(0, result); + } + + [Fact] + public static void SameSpanSequenceCompareTo_Bool() + { + bool[] a = { true, true, false }; + var span = new ReadOnlySpan(a); + int result = span.SequenceCompareTo(span); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArrayImplicit_Bool() + { + bool[] a = { true, true, false }; + var first = new ReadOnlySpan(a, 0, 3); + int result = first.SequenceCompareTo(a); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArraySegmentImplicit_Bool() + { + bool[] src = { true, true, true}; + bool[] dst = { false, true, true, true, false }; + var segment = new ArraySegment(dst, 1, 3); + + var first = new ReadOnlySpan(src, 0, 3); + int result = first.SequenceCompareTo(segment); + Assert.Equal(0, result); + } + + [Fact] + public static void LengthMismatchSequenceCompareTo_Bool() + { + bool[] a = { true, true, false }; + var first = new ReadOnlySpan(a, 0, 2); + var second = new ReadOnlySpan(a, 0, 3); + int result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + + // one sequence is empty + first = new ReadOnlySpan(a, 1, 0); + + result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + } + + [Fact] + public static void SequenceCompareToWithSingleMismatch_Bool() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new bool[length]; + var second = new bool[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = true; + } + + second[mismatchIndex] = !second[mismatchIndex]; + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result > 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result < 0); + } + } + } + + [Fact] + public static void SequenceCompareToNoMatch_Bool() + { + for (int length = 1; length < 32; length++) + { + var first = new bool[length]; + var second = new bool[length]; + + for (int i = 0; i < length; i++) + { + first[i] = (i % 2 != 0); + second[i] = (i % 2 == 0); + } + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result > 0); + } + } + + [Fact] + public static void MakeSureNoSequenceCompareToChecksGoOutOfRange_Bool() + { + for (int length = 0; length < 100; length++) + { + var first = new bool[length + 2]; + first[0] = true; + for (int k = 1; k <= length; k++) + first[k] = false; + first[length + 1] = true; + + var second = new bool[length + 2]; + second[0] = false; + for (int k = 1; k <= length; k++) + second[k] = false; + second[length + 1] = false; + + var span1 = new ReadOnlySpan(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + int result = span1.SequenceCompareTo(span2); + Assert.Equal(0, result); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/SequenceCompareTo.byte.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/SequenceCompareTo.byte.cs new file mode 100644 index 0000000000..9accd0826e --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/SequenceCompareTo.byte.cs @@ -0,0 +1,145 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void ZeroLengthSequenceCompareTo_Byte() + { + var a = new byte[3]; + + var first = new ReadOnlySpan(a, 1, 0); + var second = new ReadOnlySpan(a, 2, 0); + int result = first.SequenceCompareTo(second); + Assert.Equal(0, result); + } + + [Fact] + public static void SameSpanSequenceCompareTo_Byte() + { + byte[] a = { 4, 5, 6 }; + var span = new ReadOnlySpan(a); + int result = span.SequenceCompareTo(span); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArrayImplicit_Byte() + { + byte[] a = { 4, 5, 6 }; + var first = new ReadOnlySpan(a, 0, 3); + int result = first.SequenceCompareTo(a); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArraySegmentImplicit_Byte() + { + byte[] src = { 1, 2, 3 }; + byte[] dst = { 5, 1, 2, 3, 10 }; + var segment = new ArraySegment(dst, 1, 3); + + var first = new ReadOnlySpan(src, 0, 3); + int result = first.SequenceCompareTo(segment); + Assert.Equal(0, result); + } + + [Fact] + public static void LengthMismatchSequenceCompareTo_Byte() + { + byte[] a = { 4, 5, 6 }; + var first = new ReadOnlySpan(a, 0, 2); + var second = new ReadOnlySpan(a, 0, 3); + int result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + + // one sequence is empty + first = new ReadOnlySpan(a, 1, 0); + + result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + } + + [Fact] + public static void SequenceCompareToWithSingleMismatch_Byte() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new byte[length]; + var second = new byte[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (byte)(i + 1); + } + + second[mismatchIndex] = (byte)(second[mismatchIndex] + 1); + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result > 0); + } + } + } + + [Fact] + public static void SequenceCompareToNoMatch_Byte() + { + for (int length = 1; length < 32; length++) + { + var first = new byte[length]; + var second = new byte[length]; + + for (int i = 0; i < length; i++) + { + first[i] = (byte)(i + 1); + second[i] = (byte)(byte.MaxValue - i); + } + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result > 0); + } + } + + [Fact] + public static void MakeSureNoSequenceCompareToChecksGoOutOfRange_Byte() + { + for (int length = 0; length < 100; length++) + { + var first = new byte[length + 2]; + first[0] = 99; + first[length + 1] = 99; + + var second = new byte[length + 2]; + second[0] = 100; + second[length + 1] = 100; + + var span1 = new ReadOnlySpan(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + int result = span1.SequenceCompareTo(span2); + Assert.Equal(0, result); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/SequenceCompareTo.char.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/SequenceCompareTo.char.cs new file mode 100644 index 0000000000..2e176223f8 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/SequenceCompareTo.char.cs @@ -0,0 +1,145 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void ZeroLengthSequenceCompareTo_Char() + { + var a = new char[3]; + + var first = new ReadOnlySpan(a, 1, 0); + var second = new ReadOnlySpan(a, 2, 0); + int result = first.SequenceCompareTo(second); + Assert.Equal(0, result); + } + + [Fact] + public static void SameSpanSequenceCompareTo_Char() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a); + int result = span.SequenceCompareTo(span); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArrayImplicit_Char() + { + char[] a = { '4', '5', '6' }; + var first = new ReadOnlySpan(a, 0, 3); + int result = first.SequenceCompareTo(a); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArraySegmentImplicit_Char() + { + char[] src = { '1', '2', '3' }; + char[] dst = { '5', '1', '2', '3', '9' }; + var segment = new ArraySegment(dst, 1, 3); + + var first = new ReadOnlySpan(src, 0, 3); + int result = first.SequenceCompareTo(segment); + Assert.Equal(0, result); + } + + [Fact] + public static void LengthMismatchSequenceCompareTo_Char() + { + char[] a = { '4', '5', '6' }; + var first = new ReadOnlySpan(a, 0, 2); + var second = new ReadOnlySpan(a, 0, 3); + int result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + + // one sequence is empty + first = new ReadOnlySpan(a, 1, 0); + + result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + } + + [Fact] + public static void SequenceCompareToWithSingleMismatch_Char() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new char[length]; + var second = new char[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (char)(i + 1); + } + + second[mismatchIndex] = (char)(second[mismatchIndex] + 1); + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result > 0); + } + } + } + + [Fact] + public static void SequenceCompareToNoMatch_Char() + { + for (int length = 1; length < 32; length++) + { + var first = new char[length]; + var second = new char[length]; + + for (int i = 0; i < length; i++) + { + first[i] = (char)(i + 1); + second[i] = (char)(char.MaxValue - i); + } + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result > 0); + } + } + + [Fact] + public static void MakeSureNoSequenceCompareToChecksGoOutOfRange_Char() + { + for (int length = 0; length < 100; length++) + { + var first = new char[length + 2]; + first[0] = '8'; + first[length + 1] = '8'; + + var second = new char[length + 2]; + second[0] = '9'; + second[length + 1] = '9'; + + var span1 = new ReadOnlySpan(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + int result = span1.SequenceCompareTo(span2); + Assert.Equal(0, result); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/SequenceCompareTo.int.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/SequenceCompareTo.int.cs new file mode 100644 index 0000000000..743ba7bd8f --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/SequenceCompareTo.int.cs @@ -0,0 +1,145 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void ZeroLengthSequenceCompareTo_Int() + { + var a = new int[3]; + + var first = new ReadOnlySpan(a, 1, 0); + var second = new ReadOnlySpan(a, 2, 0); + int result = first.SequenceCompareTo(second); + Assert.Equal(0, result); + } + + [Fact] + public static void SameSpanSequenceCompareTo_Int() + { + int[] a = { 851227, 28052014, 429104168 }; + var span = new ReadOnlySpan(a); + int result = span.SequenceCompareTo(span); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArrayImplicit_Int() + { + int[] a = { 851227, 28052014, 429104168 }; + var first = new ReadOnlySpan(a, 0, 3); + int result = first.SequenceCompareTo(a); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArraySegmentImplicit_Int() + { + int[] src = { 851227, 28052014, 429104168 }; + int[] dst = { 5, 851227, 28052014, 429104168, 10 }; + var segment = new ArraySegment(dst, 1, 3); + + var first = new ReadOnlySpan(src, 0, 3); + int result = first.SequenceCompareTo(segment); + Assert.Equal(0, result); + } + + [Fact] + public static void LengthMismatchSequenceCompareTo_Int() + { + int[] a = { 851227, 28052014, 429104168 }; + var first = new ReadOnlySpan(a, 0, 2); + var second = new ReadOnlySpan(a, 0, 3); + int result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + + // one sequence is empty + first = new ReadOnlySpan(a, 1, 0); + + result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + } + + [Fact] + public static void SequenceCompareToWithSingleMismatch_Int() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new int[length]; + var second = new int[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (int)(i + 1); + } + + second[mismatchIndex] = (int)(second[mismatchIndex] + 1); + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result > 0); + } + } + } + + [Fact] + public static void SequenceCompareToNoMatch_Int() + { + for (int length = 1; length < 32; length++) + { + var first = new int[length]; + var second = new int[length]; + + for (int i = 0; i < length; i++) + { + first[i] = (int)(i + 1); + second[i] = (int)(int.MaxValue - i); + } + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result > 0); + } + } + + [Fact] + public static void MakeSureNoSequenceCompareToChecksGoOutOfRange_Int() + { + for (int length = 0; length < 100; length++) + { + var first = new int[length + 2]; + first[0] = 99; + first[length + 1] = 99; + + var second = new int[length + 2]; + second[0] = 100; + second[length + 1] = 100; + + var span1 = new ReadOnlySpan(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + int result = span1.SequenceCompareTo(span2); + Assert.Equal(0, result); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/SequenceCompareTo.long.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/SequenceCompareTo.long.cs new file mode 100644 index 0000000000..a0c75d3dd5 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/SequenceCompareTo.long.cs @@ -0,0 +1,145 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void ZeroLengthSequenceCompareTo_Long() + { + var a = new long[3]; + + var first = new ReadOnlySpan(a, 1, 0); + var second = new ReadOnlySpan(a, 2, 0); + int result = first.SequenceCompareTo(second); + Assert.Equal(0, result); + } + + [Fact] + public static void SameSpanSequenceCompareTo_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + var span = new ReadOnlySpan(a); + int result = span.SequenceCompareTo(span); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArrayImplicit_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + var first = new ReadOnlySpan(a, 0, 3); + int result = first.SequenceCompareTo(a); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArraySegmentImplicit_Long() + { + long[] src = { 1989089123, 234523454235, 3123213231 }; + long[] dst = { 5, 1989089123, 234523454235, 3123213231, 10 }; + var segment = new ArraySegment(dst, 1, 3); + + var first = new ReadOnlySpan(src, 0, 3); + int result = first.SequenceCompareTo(segment); + Assert.Equal(0, result); + } + + [Fact] + public static void LengthMismatchSequenceCompareTo_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + var first = new ReadOnlySpan(a, 0, 2); + var second = new ReadOnlySpan(a, 0, 3); + int result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + + // one sequence is empty + first = new ReadOnlySpan(a, 1, 0); + + result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + } + + [Fact] + public static void SequenceCompareToWithSingleMismatch_Long() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new long[length]; + var second = new long[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (long)(i + 1); + } + + second[mismatchIndex] = (long)(second[mismatchIndex] + 1); + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result > 0); + } + } + } + + [Fact] + public static void SequenceCompareToNoMatch_Long() + { + for (int length = 1; length < 32; length++) + { + var first = new long[length]; + var second = new long[length]; + + for (int i = 0; i < length; i++) + { + first[i] = (long)(i + 1); + second[i] = (long)(long.MaxValue - i); + } + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result > 0); + } + } + + [Fact] + public static void MakeSureNoSequenceCompareToChecksGoOutOfRange_Long() + { + for (int length = 0; length < 100; length++) + { + var first = new long[length + 2]; + first[0] = 99; + first[length + 1] = 99; + + var second = new long[length + 2]; + second[0] = 100; + second[length + 1] = 100; + + var span1 = new Span(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + int result = span1.SequenceCompareTo(span2); + Assert.Equal(0, result); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/SequenceEqual.long.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/SequenceEqual.long.cs new file mode 100644 index 0000000000..b276916e59 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/SequenceEqual.long.cs @@ -0,0 +1,104 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void ZeroLengthSequenceEqual_Long() + { + long[] a = new long[3]; + + ReadOnlySpan first = new ReadOnlySpan(a, 1, 0); + ReadOnlySpan second = new ReadOnlySpan(a, 2, 0); + bool b = first.SequenceEqual(second); + Assert.True(b); + } + + [Fact] + public static void SameSpanSequenceEqual_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + ReadOnlySpan span = new ReadOnlySpan(a); + bool b = span.SequenceEqual(span); + Assert.True(b); + } + + [Fact] + public static void SequenceEqualArrayImplicit_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + ReadOnlySpan first = new ReadOnlySpan(a, 0, 3); + bool b = first.SequenceEqual(a); + Assert.True(b); + } + + [Fact] + public static void SequenceEqualArraySegmentImplicit_Long() + { + long[] src = { 1989089123, 234523454235, 3123213231 }; + long[] dst = { 5, 1989089123, 234523454235, 3123213231, 10 }; + ArraySegment segment = new ArraySegment(dst, 1, 3); + + ReadOnlySpan first = new ReadOnlySpan(src, 0, 3); + bool b = first.SequenceEqual(segment); + Assert.True(b); + } + + [Fact] + public static void LengthMismatchSequenceEqual_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + ReadOnlySpan first = new ReadOnlySpan(a, 0, 3); + ReadOnlySpan second = new ReadOnlySpan(a, 0, 2); + bool b = first.SequenceEqual(second); + Assert.False(b); + } + + [Fact] + public static void SequenceEqualNoMatch_Long() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + long[] first = new long[length]; + long[] second = new long[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (byte)(i + 1); + } + + second[mismatchIndex] = (byte)(second[mismatchIndex] + 1); + + ReadOnlySpan firstSpan = new ReadOnlySpan(first); + ReadOnlySpan secondSpan = new ReadOnlySpan(second); + bool b = firstSpan.SequenceEqual(secondSpan); + Assert.False(b); + } + } + } + + [Fact] + public static void MakeSureNoSequenceEqualChecksGoOutOfRange_Long() + { + for (int length = 0; length < 100; length++) + { + long[] first = new long[length + 2]; + first[0] = 99; + first[length + 1] = 99; + long[] second = new long[length + 2]; + second[0] = 100; + second[length + 1] = 100; + ReadOnlySpan span1 = new ReadOnlySpan(first, 1, length); + ReadOnlySpan span2 = new ReadOnlySpan(second, 1, length); + bool b = span1.SequenceEqual(span2); + Assert.True(b); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/StartsWith.StringComparison.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/StartsWith.StringComparison.cs new file mode 100644 index 0000000000..dc1d71f1bd --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/StartsWith.StringComparison.cs @@ -0,0 +1,356 @@ +// 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.Globalization; +using System.Threading; +using Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + private const string SoftHyphen = "\u00AD"; + + [Fact] + public static void ZeroLengthStartsWith_StringComparison() + { + var a = new char[3]; + + var span = new ReadOnlySpan(a); + var slice = new ReadOnlySpan(a, 2, 0); + Assert.True(span.StartsWith(slice, StringComparison.Ordinal)); + + Assert.True(span.StartsWith(slice, StringComparison.CurrentCulture)); + Assert.True(span.StartsWith(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span.StartsWith(slice, StringComparison.InvariantCulture)); + Assert.True(span.StartsWith(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span.StartsWith(slice, StringComparison.OrdinalIgnoreCase)); + + span = ReadOnlySpan.Empty; + Assert.True(span.StartsWith(slice, StringComparison.Ordinal)); + + Assert.True(span.StartsWith(slice, StringComparison.CurrentCulture)); + Assert.True(span.StartsWith(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span.StartsWith(slice, StringComparison.InvariantCulture)); + Assert.True(span.StartsWith(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span.StartsWith(slice, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void SameSpanStartsWith_StringComparison() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a); + Assert.True(span.StartsWith(span, StringComparison.Ordinal)); + + Assert.True(span.StartsWith(span, StringComparison.CurrentCulture)); + Assert.True(span.StartsWith(span, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span.StartsWith(span, StringComparison.InvariantCulture)); + Assert.True(span.StartsWith(span, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span.StartsWith(span, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void LengthMismatchStartsWith_StringComparison() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a, 0, 2); + var slice = new ReadOnlySpan(a, 0, 3); + Assert.False(span.StartsWith(slice, StringComparison.Ordinal)); + + Assert.False(span.StartsWith(slice, StringComparison.CurrentCulture)); + Assert.False(span.StartsWith(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.False(span.StartsWith(slice, StringComparison.InvariantCulture)); + Assert.False(span.StartsWith(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.False(span.StartsWith(slice, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void StartsWithMatch_StringComparison() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a, 0, 3); + var slice = new ReadOnlySpan(a, 0, 2); + Assert.True(span.StartsWith(slice, StringComparison.Ordinal)); + + Assert.True(span.StartsWith(slice, StringComparison.CurrentCulture)); + Assert.True(span.StartsWith(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span.StartsWith(slice, StringComparison.InvariantCulture)); + Assert.True(span.StartsWith(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span.StartsWith(slice, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void StartsWithMatchDifferentSpans_StringComparison() + { + char[] a = { '4', '5', '6', '7' }; + char[] b = { '4', '5', '6' }; + var span = new ReadOnlySpan(a, 0, 3); + var slice = new ReadOnlySpan(b, 0, 3); + Assert.True(span.StartsWith(slice, StringComparison.Ordinal)); + + Assert.True(span.StartsWith(slice, StringComparison.CurrentCulture)); + Assert.True(span.StartsWith(slice, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span.StartsWith(slice, StringComparison.InvariantCulture)); + Assert.True(span.StartsWith(slice, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span.StartsWith(slice, StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public static void StartsWithNoMatch_StringComparison() + { + for (int length = 1; length < 150; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new char[length]; + var second = new char[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (char)(i + 1); + } + + second[mismatchIndex] = (char)(second[mismatchIndex] + 1); + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + Assert.False(firstSpan.StartsWith(secondSpan, StringComparison.Ordinal)); + + Assert.False(firstSpan.StartsWith(secondSpan, StringComparison.OrdinalIgnoreCase)); + + // Different behavior depending on OS + Assert.Equal( + firstSpan.ToString().StartsWith(secondSpan.ToString(), StringComparison.CurrentCulture), + firstSpan.StartsWith(secondSpan, StringComparison.CurrentCulture)); + Assert.Equal( + firstSpan.ToString().StartsWith(secondSpan.ToString(), StringComparison.CurrentCultureIgnoreCase), + firstSpan.StartsWith(secondSpan, StringComparison.CurrentCultureIgnoreCase)); + Assert.Equal( + firstSpan.ToString().StartsWith(secondSpan.ToString(), StringComparison.InvariantCulture), + firstSpan.StartsWith(secondSpan, StringComparison.InvariantCulture)); + Assert.Equal( + firstSpan.ToString().StartsWith(secondSpan.ToString(), StringComparison.InvariantCultureIgnoreCase), + firstSpan.StartsWith(secondSpan, StringComparison.InvariantCultureIgnoreCase)); + } + } + } + + [Fact] + public static void MakeSureNoStartsWithChecksGoOutOfRange_StringComparison() + { + for (int length = 0; length < 100; length++) + { + var first = new char[length + 2]; + first[0] = (char)99; + first[length + 1] = (char)99; + var second = new char[length + 2]; + second[0] = (char)100; + second[length + 1] = (char)100; + var span1 = new ReadOnlySpan(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + Assert.True(span1.StartsWith(span2, StringComparison.Ordinal)); + + Assert.True(span1.StartsWith(span2, StringComparison.CurrentCulture)); + Assert.True(span1.StartsWith(span2, StringComparison.CurrentCultureIgnoreCase)); + Assert.True(span1.StartsWith(span2, StringComparison.InvariantCulture)); + Assert.True(span1.StartsWith(span2, StringComparison.InvariantCultureIgnoreCase)); + Assert.True(span1.StartsWith(span2, StringComparison.OrdinalIgnoreCase)); + } + } + + [Fact] + public static void StartsWithUnknownComparisonType_StringComparison() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a); + TestHelpers.AssertThrows(span, (_span) => _span.StartsWith(_span, StringComparison.CurrentCulture - 1)); + TestHelpers.AssertThrows(span, (_span) => _span.StartsWith(_span, StringComparison.OrdinalIgnoreCase + 1)); + TestHelpers.AssertThrows(span, (_span) => _span.StartsWith(_span, (StringComparison)6)); + } + + [Fact] + public static void StartsWithMatchNonOrdinal_StringComparison() + { + ReadOnlySpan span = new char[] { 'a', 'b', 'c', 'd' }; + ReadOnlySpan value = new char[] { 'a', 'B', 'c' }; + Assert.False(span.StartsWith(value, StringComparison.Ordinal)); + Assert.True(span.StartsWith(value, StringComparison.OrdinalIgnoreCase)); + + CultureInfo backupCulture = CultureInfo.CurrentCulture; + + Thread.CurrentThread.CurrentCulture = new CultureInfo("el-GR"); + + span = new char[] { '\u03b1', '\u03b2', '\u03b3', '\u03b4' }; // αβγδ + value = new char[] { '\u03b1', '\u03b2', '\u03b3' }; // αβγ + + Assert.True(span.StartsWith(value, StringComparison.CurrentCulture)); + Assert.True(span.StartsWith(value, StringComparison.CurrentCultureIgnoreCase)); + + value = new char[] { '\u03b1', '\u0392', '\u03b3' }; // αΒγ + Assert.False(span.StartsWith(value, StringComparison.CurrentCulture)); + Assert.True(span.StartsWith(value, StringComparison.CurrentCultureIgnoreCase)); + + Thread.CurrentThread.CurrentCulture = backupCulture; + + span = new char[] { '\u0069', '\u00df', '\u0049', '\u03b4' }; // ißIδ + value = new char[] { '\u0069', '\u0073', '\u0073', '\u0049' }; // issI + + Assert.False(span.StartsWith(value, StringComparison.Ordinal)); + // Different behavior depending on OS - True on Windows, False on Unix + Assert.Equal( + span.ToString().StartsWith(value.ToString(), StringComparison.InvariantCulture), + span.StartsWith(value, StringComparison.InvariantCulture)); + Assert.Equal( + span.ToString().StartsWith(value.ToString(), StringComparison.InvariantCultureIgnoreCase), + span.StartsWith(value, StringComparison.InvariantCultureIgnoreCase)); + + value = new char[] { '\u0049', '\u0073', '\u0073', '\u0049' }; // IssI + Assert.False(span.StartsWith(value, StringComparison.OrdinalIgnoreCase)); + Assert.False(span.StartsWith(value, StringComparison.InvariantCulture)); + // Different behavior depending on OS - True on Windows, False on Unix + Assert.Equal( + span.ToString().StartsWith(value.ToString(), StringComparison.InvariantCultureIgnoreCase), + span.StartsWith(value, StringComparison.InvariantCultureIgnoreCase)); + } + + [Fact] + public static void StartsWithNoMatchNonOrdinal_StringComparison() + { + ReadOnlySpan span = new char[] { 'a', 'b', 'c', 'd' }; + ReadOnlySpan value = new char[] { 'a', 'D', 'c' }; + Assert.False(span.StartsWith(value, StringComparison.Ordinal)); + Assert.False(span.StartsWith(value, StringComparison.OrdinalIgnoreCase)); + + CultureInfo backupCulture = CultureInfo.CurrentCulture; + + Thread.CurrentThread.CurrentCulture = new CultureInfo("el-GR"); + + span = new char[] { '\u03b1', '\u03b2', '\u03b3', '\u03b4' }; // αβγδ + value = new char[] { '\u03b1', '\u03b4', '\u03b3' }; // αδγ + + Assert.False(span.StartsWith(value, StringComparison.CurrentCulture)); + Assert.False(span.StartsWith(value, StringComparison.CurrentCultureIgnoreCase)); + + value = new char[] { '\u03b1', '\u0394', '\u03b3' }; // αΔγ + Assert.False(span.StartsWith(value, StringComparison.CurrentCulture)); + Assert.False(span.StartsWith(value, StringComparison.CurrentCultureIgnoreCase)); + + Thread.CurrentThread.CurrentCulture = backupCulture; + + span = new char[] { '\u0069', '\u00df', '\u0049', '\u03b4' }; // ißIδ + value = new char[] { '\u0069', '\u03b4', '\u03b4', '\u0049' }; // iδδI + + Assert.False(span.StartsWith(value, StringComparison.Ordinal)); + Assert.False(span.StartsWith(value, StringComparison.InvariantCulture)); + Assert.False(span.StartsWith(value, StringComparison.InvariantCultureIgnoreCase)); + + value = new char[] { '\u0049', '\u03b4', '\u03b4', '\u0049' }; // IδδI + Assert.False(span.StartsWith(value, StringComparison.OrdinalIgnoreCase)); + Assert.False(span.StartsWith(value, StringComparison.InvariantCulture)); + Assert.False(span.StartsWith(value, StringComparison.InvariantCultureIgnoreCase)); + } + + [Theory(Skip="Mono issue")] + // CurrentCulture + [InlineData("Hello", "Hel", StringComparison.CurrentCulture, true)] + [InlineData("Hello", "Hello", StringComparison.CurrentCulture, true)] + [InlineData("Hello", "", StringComparison.CurrentCulture, true)] + [InlineData("Hello", "HELLO", StringComparison.CurrentCulture, false)] + [InlineData("Hello", "Abc", StringComparison.CurrentCulture, false)] + [InlineData("Hello", SoftHyphen + "Hel", StringComparison.CurrentCulture, true)] + [InlineData("", "", StringComparison.CurrentCulture, true)] + [InlineData("", "hello", StringComparison.CurrentCulture, false)] + // CurrentCultureIgnoreCase + [InlineData("Hello", "Hel", StringComparison.CurrentCultureIgnoreCase, true)] + [InlineData("Hello", "Hello", StringComparison.CurrentCultureIgnoreCase, true)] + [InlineData("Hello", "", StringComparison.CurrentCultureIgnoreCase, true)] + [InlineData("Hello", "HEL", StringComparison.CurrentCultureIgnoreCase, true)] + [InlineData("Hello", "Abc", StringComparison.CurrentCultureIgnoreCase, false)] + [InlineData("Hello", SoftHyphen + "Hel", StringComparison.CurrentCultureIgnoreCase, true)] + [InlineData("", "", StringComparison.CurrentCultureIgnoreCase, true)] + [InlineData("", "hello", StringComparison.CurrentCultureIgnoreCase, false)] + // InvariantCulture + [InlineData("Hello", "Hel", StringComparison.InvariantCulture, true)] + [InlineData("Hello", "Hello", StringComparison.InvariantCulture, true)] + [InlineData("Hello", "", StringComparison.InvariantCulture, true)] + [InlineData("Hello", "HELLO", StringComparison.InvariantCulture, false)] + [InlineData("Hello", "Abc", StringComparison.InvariantCulture, false)] + [InlineData("Hello", SoftHyphen + "Hel", StringComparison.InvariantCulture, true)] + [InlineData("", "", StringComparison.InvariantCulture, true)] + [InlineData("", "hello", StringComparison.InvariantCulture, false)] + // InvariantCultureIgnoreCase + [InlineData("Hello", "Hel", StringComparison.InvariantCultureIgnoreCase, true)] + [InlineData("Hello", "Hello", StringComparison.InvariantCultureIgnoreCase, true)] + [InlineData("Hello", "", StringComparison.InvariantCultureIgnoreCase, true)] + [InlineData("Hello", "HEL", StringComparison.InvariantCultureIgnoreCase, true)] + [InlineData("Hello", "Abc", StringComparison.InvariantCultureIgnoreCase, false)] + [InlineData("Hello", SoftHyphen + "Hel", StringComparison.InvariantCultureIgnoreCase, true)] + [InlineData("", "", StringComparison.InvariantCultureIgnoreCase, true)] + [InlineData("", "hello", StringComparison.InvariantCultureIgnoreCase, false)] + // Ordinal + [InlineData("Hello", "H", StringComparison.Ordinal, true)] + [InlineData("Hello", "Hel", StringComparison.Ordinal, true)] + [InlineData("Hello", "Hello", StringComparison.Ordinal, true)] + [InlineData("Hello", "Hello Larger", StringComparison.Ordinal, false)] + [InlineData("Hello", "", StringComparison.Ordinal, true)] + [InlineData("Hello", "HEL", StringComparison.Ordinal, false)] + [InlineData("Hello", "Abc", StringComparison.Ordinal, false)] + [InlineData("Hello", SoftHyphen + "Hel", StringComparison.Ordinal, false)] + [InlineData("", "", StringComparison.Ordinal, true)] + [InlineData("", "hello", StringComparison.Ordinal, false)] + [InlineData("abcdefghijklmnopqrstuvwxyz", "abcdefghijklmnopqrstuvwxyz", StringComparison.Ordinal, true)] + [InlineData("abcdefghijklmnopqrstuvwxyz", "abcdefghijklmnopqrstuvwx", StringComparison.Ordinal, true)] + [InlineData("abcdefghijklmnopqrstuvwxyz", "abcdefghijklm", StringComparison.Ordinal, true)] + [InlineData("abcdefghijklmnopqrstuvwxyz", "ab_defghijklmnopqrstu", StringComparison.Ordinal, false)] + [InlineData("abcdefghijklmnopqrstuvwxyz", "abcdef_hijklmn", StringComparison.Ordinal, false)] + [InlineData("abcdefghijklmnopqrstuvwxyz", "abcdefghij_lmn", StringComparison.Ordinal, false)] + [InlineData("abcdefghijklmnopqrstuvwxyz", "a", StringComparison.Ordinal, true)] + [InlineData("abcdefghijklmnopqrstuvwxyz", "abcdefghijklmnopqrstuvwxyza", StringComparison.Ordinal, false)] + // OrdinalIgnoreCase + [InlineData("Hello", "Hel", StringComparison.OrdinalIgnoreCase, true)] + [InlineData("Hello", "Hello", StringComparison.OrdinalIgnoreCase, true)] + [InlineData("Hello", "Hello Larger", StringComparison.OrdinalIgnoreCase, false)] + [InlineData("Hello", "", StringComparison.OrdinalIgnoreCase, true)] + [InlineData("Hello", "HEL", StringComparison.OrdinalIgnoreCase, true)] + [InlineData("Hello", "Abc", StringComparison.OrdinalIgnoreCase, false)] + [InlineData("Hello", SoftHyphen + "Hel", StringComparison.OrdinalIgnoreCase, false)] + [InlineData("", "", StringComparison.OrdinalIgnoreCase, true)] + [InlineData("", "hello", StringComparison.OrdinalIgnoreCase, false)] + public static void StartsWith(string s, string value, StringComparison comparisonType, bool expected) + { + Assert.Equal(expected, s.AsSpan().StartsWith(value.AsSpan(), comparisonType)); + } + + [Theory(Skip="Mono issue")] + [InlineData(StringComparison.Ordinal)] + [InlineData(StringComparison.OrdinalIgnoreCase)] + public static void StartsWith_NullInStrings(StringComparison comparison) + { + Assert.False("\0test".AsSpan().StartsWith("test".AsSpan(), comparison)); + Assert.False("te\0st".AsSpan().StartsWith("test".AsSpan(), comparison)); + Assert.True("te\0st".AsSpan().StartsWith("te\0s".AsSpan(), comparison)); + Assert.True("test\0".AsSpan().StartsWith("test".AsSpan(), comparison)); + Assert.False("test".AsSpan().StartsWith("te\0".AsSpan(), comparison)); + } + + // NOTE: This is by design. Unix ignores the null characters (i.e. null characters have no weights for the string comparison). + // For desired behavior, use ordinal comparison instead of linguistic comparison. + // This is a known difference between Windows and Unix (https://github.com/dotnet/coreclr/issues/2051). + [Theory] + [SkipOnTargetFramework(TargetFrameworkMonikers.Mono)] + [PlatformSpecific(TestPlatforms.Windows)] + [InlineData(StringComparison.CurrentCulture)] + [InlineData(StringComparison.CurrentCultureIgnoreCase)] + [InlineData(StringComparison.InvariantCulture)] + [InlineData(StringComparison.InvariantCultureIgnoreCase)] + public static void StartsWith_NullInStrings_NonOrdinal(StringComparison comparison) + { + Assert.False("\0test".AsSpan().StartsWith("test".AsSpan(), comparison)); + Assert.False("te\0st".AsSpan().StartsWith("test".AsSpan(), comparison)); + Assert.True("te\0st".AsSpan().StartsWith("te\0s".AsSpan(), comparison)); + Assert.True("test\0".AsSpan().StartsWith("test".AsSpan(), comparison)); + Assert.False("test".AsSpan().StartsWith("te\0".AsSpan(), comparison)); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/StartsWith.char.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/StartsWith.char.cs new file mode 100644 index 0000000000..4b92c4960c --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/StartsWith.char.cs @@ -0,0 +1,104 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void ZeroLengthStartsWith_Char() + { + var a = new char[3]; + + var span = new ReadOnlySpan(a); + var slice = new ReadOnlySpan(a, 2, 0); + bool b = span.StartsWith(slice); + Assert.True(b); + } + + [Fact] + public static void SameSpanStartsWith_Char() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a); + bool b = span.StartsWith(span); + Assert.True(b); + } + + [Fact] + public static void LengthMismatchStartsWith_Char() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a, 0, 2); + var slice = new ReadOnlySpan(a, 0, 3); + bool b = span.StartsWith(slice); + Assert.False(b); + } + + [Fact] + public static void StartsWithMatch_Char() + { + char[] a = { '4', '5', '6' }; + var span = new ReadOnlySpan(a, 0, 3); + var slice = new ReadOnlySpan(a, 0, 2); + bool b = span.StartsWith(slice); + Assert.True(b); + } + + [Fact] + public static void StartsWithMatchDifferentSpans_Char() + { + char[] a = { '4', '5', '6' }; + char[] b = { '4', '5', '6' }; + var span = new Span(a, 0, 3); + var slice = new ReadOnlySpan(b, 0, 3); + bool c = span.StartsWith(slice); + Assert.True(c); + } + + [Fact] + public static void StartsWithNoMatch_Char() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new char[length]; + var second = new char[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (char)(i + 1); + } + + second[mismatchIndex] = (char)(second[mismatchIndex] + 1); + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + bool b = firstSpan.StartsWith(secondSpan); + Assert.False(b); + } + } + } + + [Fact] + public static void MakeSureNoStartsWithChecksGoOutOfRange_Char() + { + for (int length = 0; length < 100; length++) + { + var first = new char[length + 2]; + first[0] = '9'; + first[length + 1] = '9'; + var second = new char[length + 2]; + second[0] = 'a'; + second[length + 1] = 'a'; + var span1 = new ReadOnlySpan(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + bool b = span1.StartsWith(span2); + Assert.True(b); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/StartsWith.long.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/StartsWith.long.cs new file mode 100644 index 0000000000..c7e2d9c3b9 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/StartsWith.long.cs @@ -0,0 +1,104 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void ZeroLengthStartsWith_Long() + { + var a = new long[3]; + + var span = new ReadOnlySpan(a); + var slice = new ReadOnlySpan(a, 2, 0); + bool b = span.StartsWith(slice); + Assert.True(b); + } + + [Fact] + public static void SameSpanStartsWith_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + var span = new ReadOnlySpan(a); + bool b = span.StartsWith(span); + Assert.True(b); + } + + [Fact] + public static void LengthMismatchStartsWith_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + var span = new ReadOnlySpan(a, 0, 2); + var slice = new ReadOnlySpan(a, 0, 3); + bool b = span.StartsWith(slice); + Assert.False(b); + } + + [Fact] + public static void StartsWithMatch_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + var span = new ReadOnlySpan(a, 0, 3); + var slice = new ReadOnlySpan(a, 0, 2); + bool b = span.StartsWith(slice); + Assert.True(b); + } + + [Fact] + public static void StartsWithMatchDifferentSpans_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + long[] b = { 488238291, 52498989823, 619890289890 }; + var span = new ReadOnlySpan(a, 0, 3); + var slice = new ReadOnlySpan(b, 0, 3); + bool c = span.StartsWith(slice); + Assert.True(c); + } + + [Fact] + public static void StartsWithNoMatch_Long() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new long[length]; + var second = new long[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (long)(i + 1); + } + + second[mismatchIndex] = (long)(second[mismatchIndex] + 1); + + var firstSpan = new ReadOnlySpan(first); + var secondSpan = new ReadOnlySpan(second); + bool b = firstSpan.StartsWith(secondSpan); + Assert.False(b); + } + } + } + + [Fact] + public static void MakeSureNoStartsWithChecksGoOutOfRange_Long() + { + for (int length = 0; length < 100; length++) + { + var first = new long[length + 2]; + first[0] = 99; + first[length + 1] = 99; + var second = new long[length + 2]; + second[0] = 100; + second[length + 1] = 100; + var span1 = new ReadOnlySpan(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + bool b = span1.StartsWith(span2); + Assert.True(b); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/ToLower.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/ToLower.cs new file mode 100644 index 0000000000..86981c18c4 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/ToLower.cs @@ -0,0 +1,310 @@ +// 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.Collections.Generic; +using System.Globalization; +using Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void ZeroLengthToLower() + { + char[] expectedSource = { 'a', 'B', 'c' }; + char[] a = { 'a', 'B', 'c' }; + var source = new ReadOnlySpan(a, 2, 0); + + var expectedDestination = new char[1] { 'a' }; + Span destination = new char[1] { 'a' }; + + Assert.Equal(source.Length, source.ToLower(destination, CultureInfo.CurrentCulture)); + Assert.Equal(source.Length, source.ToLowerInvariant(destination)); + Assert.Equal(expectedDestination, destination.ToArray()); + Assert.Equal(expectedSource, a); + + source = ReadOnlySpan.Empty; + Assert.Equal(source.Length, source.ToLower(destination, CultureInfo.CurrentCulture)); + Assert.Equal(source.Length, source.ToLowerInvariant(destination)); + Assert.Equal(expectedDestination, destination.ToArray()); + Assert.Equal(expectedSource, a); + } + + [Fact] + public static void SameSpanToLower() + { + var expected = new char[3] { 'a', 'b', 'c' }; + var a = new char[3] { 'a', 'B', 'c' }; + { + ReadOnlySpan source = a; + Span destination = a; + Assert.Equal(source.Length, source.ToLower(destination, CultureInfo.CurrentCulture)); + Assert.Equal(expected, destination.ToArray()); + Assert.Equal(expected, source.ToArray()); + } + { + ReadOnlySpan source = a; + Span destination = a; + Assert.Equal(source.Length, source.ToLowerInvariant(destination)); + Assert.Equal(expected, destination.ToArray()); + Assert.Equal(expected, source.ToArray()); + } + } + + [Fact] + public static void ToLowerOverlapping() + { + var expectedSource = new char[3] { 'B', 'c', 'b' }; + var expectedDestination = new char[3] { 'b', 'c', 'b' }; + + { + char[] a = { 'a', 'B', 'c', 'B', 'c', 'B' }; + var source = new ReadOnlySpan(a, 1, 3); + var destination = new Span(a, 3, 3); + Assert.Equal(source.Length, source.ToLower(destination, CultureInfo.CurrentCulture)); + Assert.Equal(expectedDestination, destination.ToArray()); + Assert.Equal(expectedSource, source.ToArray()); + } + { + char[] a = { 'a', 'B', 'c', 'B', 'c', 'B' }; + var source = new ReadOnlySpan(a, 1, 3); + var destination = new Span(a, 3, 3); + Assert.Equal(source.Length, source.ToLowerInvariant(destination)); + Assert.Equal(expectedDestination, destination.ToArray()); + Assert.Equal(expectedSource, source.ToArray()); + } + } + + [Fact] + public static void LengthMismatchToLower() + { + { + var expectedSource = new char[3] { 'a', 'B', 'c' }; + ReadOnlySpan source = new char[3] { 'a', 'B', 'c' }; + + var expectedDestination = new char[1] { 'a' }; + Span destination = new char[1] { 'a' }; + + Assert.Equal(-1, source.ToLower(destination, CultureInfo.CurrentCulture)); + Assert.Equal(-1, source.ToLowerInvariant(destination)); + + Assert.Equal(expectedDestination, destination.ToArray()); + Assert.Equal(expectedSource, source.ToArray()); + } + + { + var expectedSource = new char[3] { 'a', 'B', 'c' }; + ReadOnlySpan source = new char[3] { 'a', 'B', 'c' }; + + var expectedDestination = new char[4] { 'a', 'b', 'c', 'D' }; + Span destination = new char[4] { 'x', 'Y', 'z', 'D' }; + + Assert.Equal(source.Length, source.ToLower(destination, CultureInfo.CurrentCulture)); + Assert.Equal(source.Length, source.ToLowerInvariant(destination)); + + Assert.Equal(expectedDestination, destination.ToArray()); + Assert.Equal(expectedSource, source.ToArray()); + } + } + + [Fact] + public static void ToLower() + { + var expectedSource = new char[3] { 'a', 'B', 'c' }; + var expectedDestination = new char[3] { 'a', 'b', 'c' }; + + { + ReadOnlySpan source = new char[3] { 'a', 'B', 'c' }; + Span destination = new char[3] { 'x', 'Y', 'z' }; + + Assert.Equal(source.Length, source.ToLower(destination, CultureInfo.CurrentCulture)); + Assert.Equal(expectedDestination, destination.ToArray()); + Assert.Equal(expectedSource, source.ToArray()); + } + + { + ReadOnlySpan source = new char[3] { 'a', 'B', 'c' }; + Span destination = new char[3] { 'x', 'Y', 'z' }; + + Assert.Equal(source.Length, source.ToLowerInvariant(destination)); + Assert.Equal(expectedDestination, destination.ToArray()); + Assert.Equal(expectedSource, source.ToArray()); + } + } + + [Fact] + public static void MakeSureNoToLowerChecksGoOutOfRange() + { + for (int length = 0; length < 100; length++) + { + var first = new char[length + 2]; + var second = new char[length + 2]; + + for (int i = 0; i < first.Length; i++) + { + first[i] = 'A'; + second[i] = 'B'; + } + + first[0] = 'Z'; + first[length + 1] = 'Z'; + + second[0] = 'Y'; + second[length + 1] = 'Y'; + + var expectedSource = new char[length]; + var expectedDestination = new char[length]; + for (int i = 0; i < length; i++) + { + expectedSource[i] = 'A'; + expectedDestination[i] = 'a'; + } + + var source = new ReadOnlySpan(first, 1, length); + var destination = new Span(second, 1, length); + Assert.Equal(source.Length, source.ToLower(destination, CultureInfo.CurrentCulture)); + Assert.Equal(source.Length, source.ToLowerInvariant(destination)); + Assert.Equal(expectedDestination, destination.ToArray()); + Assert.Equal(expectedSource, source.ToArray()); + + Assert.Equal('Z', first[0]); + Assert.Equal('Z', first[length + 1]); + Assert.Equal('Y', second[0]); + Assert.Equal('Y', second[length + 1]); + } + } + + [Fact] + public static void ToLowerNullCulture() + { + ReadOnlySpan source = new char[3] { 'a', 'B', 'c' }; + Span destination = new char[3] { 'a', 'B', 'c' }; + + try + { + source.ToLower(destination, null); + Assert.False(true, "Expected exception: " + typeof(ArgumentNullException).GetType()); + } + catch (ArgumentNullException) + { + } + catch (Exception wrongException) + { + Assert.False(true, "Wrong exception thrown: Expected " + typeof(ArgumentNullException).GetType() + ": Actual: " + wrongException.GetType()); + } + } + + [Theory] + [InlineData("HELLO", "hello")] + [InlineData("hello", "hello")] + [InlineData("", "")] + public static void ToLower(string s, string expected) + { + ReadOnlySpan source = s.AsSpan(); + Span destination = new char[source.Length]; + Assert.Equal(source.Length, source.ToLower(destination, CultureInfo.CurrentCulture)); + Assert.Equal(expected, destination.ToString()); + } + + private static IEnumerable ToLower_Culture_TestData() + { + yield return new object[] { "H\u0049 World", "h\u0131 world", new CultureInfo("tr-TR") }; + yield return new object[] { "H\u0130 World", "h\u0069 world", new CultureInfo("tr-TR") }; + yield return new object[] { "H\u0131 World", "h\u0131 world", new CultureInfo("tr-TR") }; + + yield return new object[] { "H\u0049 World", "h\u0069 world", new CultureInfo("en-US") }; + yield return new object[] { "H\u0130 World", "h\u0069 world", new CultureInfo("en-US") }; + yield return new object[] { "H\u0131 World", "h\u0131 world", new CultureInfo("en-US") }; + + yield return new object[] { "H\u0049 World", "h\u0069 world", CultureInfo.InvariantCulture }; + yield return new object[] { "H\u0130 World", "h\u0130 world", CultureInfo.InvariantCulture }; + yield return new object[] { "H\u0131 World", "h\u0131 world", CultureInfo.InvariantCulture }; + } + + [Theory(Skip="Mono issue")] + [MemberData(nameof(ToLower_Culture_TestData))] + public static void Test_ToLower_Culture(string actual, string expected, CultureInfo culture) + { + ReadOnlySpan source = actual.AsSpan(); + Span destination = new char[source.Length]; + Assert.Equal(source.Length, source.ToLower(destination, culture)); + Assert.Equal(expected, destination.ToString()); + } + + [Theory] + [InlineData("HELLO", "hello")] + [InlineData("hello", "hello")] + [InlineData("", "")] + public static void ToLowerInvariant(string s, string expected) + { + ReadOnlySpan source = s.AsSpan(); + Span destination = new char[source.Length]; + Assert.Equal(source.Length, source.ToLowerInvariant(destination)); + Assert.Equal(expected, destination.ToString()); + } + + [Fact] + public static void ToLowerToUpperInvariant_ASCII() + { + var asciiChars = new char[128]; + var asciiCharsUpper = new char[128]; + var asciiCharsLower = new char[128]; + + for (int i = 0; i < asciiChars.Length; i++) + { + char c = (char)i; + asciiChars[i] = c; + + // Purposefully avoiding char.ToUpper/ToLower here so as not to use the same thing we're testing. + asciiCharsLower[i] = (c >= 'A' && c <= 'Z') ? (char)(c - 'A' + 'a') : c; + asciiCharsUpper[i] = (c >= 'a' && c <= 'z') ? (char)(c - 'a' + 'A') : c; + } + + ReadOnlySpan source = asciiChars; + var ascii = new string(asciiChars); + Span destinationLower = new char[source.Length]; + Span destinationUpper = new char[source.Length]; + + Assert.Equal(source.Length, source.ToLowerInvariant(destinationLower)); + Assert.Equal(source.Length, source.ToUpperInvariant(destinationUpper)); + + Assert.Equal(ascii.ToLowerInvariant(), destinationLower.ToString()); + Assert.Equal(ascii.ToUpperInvariant(), destinationUpper.ToString()); + + Assert.Equal(ascii, source.ToString()); + } + + public static IEnumerable UpperLowerCasing_TestData() + { + //lower, upper, Culture + yield return new object[] { "abcd", "ABCD", "en-US" }; + yield return new object[] { "latin i", "LATIN I", "en-US" }; + yield return new object[] { "turky \u0131", "TURKY I", "tr-TR" }; + yield return new object[] { "turky i", "TURKY \u0130", "tr-TR" }; + yield return new object[] { "\ud801\udc29", PlatformDetection.IsWindows7 ? "\ud801\udc29" : "\ud801\udc01", "en-US" }; + } + + [Theory(Skip="Mono issue")] + [MemberData(nameof(UpperLowerCasing_TestData))] + public static void CasingTest(string lowerForm, string upperForm, string cultureName) + { + CultureInfo ci = CultureInfo.GetCultureInfo(cultureName); + + ReadOnlySpan sourceLower = lowerForm.AsSpan(); + ReadOnlySpan sourceUpper = upperForm.AsSpan(); + Span destinationLower = new char[sourceUpper.Length]; + Span destinationUpper = new char[sourceLower.Length]; + + Assert.Equal(sourceUpper.Length, sourceUpper.ToLower(destinationLower, ci)); + Assert.Equal(sourceLower.Length, sourceLower.ToUpper(destinationUpper, ci)); + + Assert.Equal(upperForm.ToLower(ci), destinationLower.ToString()); + Assert.Equal(lowerForm.ToUpper(ci), destinationUpper.ToString()); + + Assert.Equal(lowerForm, sourceLower.ToString()); + Assert.Equal(upperForm, sourceUpper.ToString()); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/ToString.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/ToString.cs new file mode 100644 index 0000000000..90428084b5 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/ToString.cs @@ -0,0 +1,107 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void ToStringInt() + { + int[] a = { 91, 92, 93 }; + var span = new ReadOnlySpan(a); + Assert.Equal("System.ReadOnlySpan[3]", span.ToString()); + } + + [Fact] + public static void ToStringInt_Empty() + { + var span = new ReadOnlySpan(); + Assert.Equal("System.ReadOnlySpan[0]", span.ToString()); + } + + [Fact] + public static void ToStringChar() + { + char[] a = { 'a', 'b', 'c' }; + var span = new ReadOnlySpan(a); + Assert.Equal("abc", span.ToString()); + + string testString = "abcdefg"; + ReadOnlySpan readOnlySpan = testString.AsSpan(); + Assert.Equal(testString, readOnlySpan.ToString()); + } + + [Fact] + public static void ToStringChar_Empty() + { + var span = new ReadOnlySpan(); + Assert.Equal("", span.ToString()); + } + + [Fact] + public static void ToStringForSpanOfString() + { + string[] a = { "a", "b", "c" }; + var span = new ReadOnlySpan(a); + Assert.Equal("System.ReadOnlySpan[3]", span.ToString()); + } + + [Fact] + public static void ToStringFromString() + { + string orig = "hello world"; + Assert.Equal(orig, orig.AsSpan().ToString()); + Assert.Equal(orig.Substring(0, 5), orig.AsSpan(0, 5).ToString()); + Assert.Equal(orig.Substring(5), orig.AsSpan(5).ToString()); + Assert.Equal(orig.Substring(1, 3), orig.AsSpan(1, 3).ToString()); + } + + [Fact] + public static void ToStringSpanOverSubstringDoesNotReturnOriginal() + { + string original = TestHelpers.BuildString(10, 42); + ReadOnlySpan span = original.AsSpan(); + + string returnedString = span.ToString(); + string returnedStringUsingSlice = span.Slice(0, original.Length).ToString(); + + string subString1 = span.Slice(1).ToString(); + string subString2 = span.Slice(0, 2).ToString(); + string subString3 = span.Slice(1, 2).ToString(); + + Assert.Equal(original, returnedString); + Assert.Equal(original, returnedStringUsingSlice); + + Assert.Equal(original.Substring(1), subString1); + Assert.Equal(original.Substring(0, 2), subString2); + Assert.Equal(original.Substring(1, 2), subString3); + + Assert.NotSame(original, subString1); + Assert.NotSame(original, subString2); + Assert.NotSame(original, subString3); + + Assert.NotSame(subString1, subString2); + Assert.NotSame(subString1, subString3); + Assert.NotSame(subString2, subString3); + } + + // This test is only relevant for portable span + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework, "Optimization only applies to portable span.")] + [Fact] + public static void ToStringSpanOverFullStringReturnsOriginal() + { + string original = TestHelpers.BuildString(10, 42); + ReadOnlySpan span = original.AsSpan(); + + string returnedString = span.ToString(); + string returnedStringUsingSlice = span.Slice(0, original.Length).ToString(); + + Assert.Same(original, returnedString); + Assert.Same(original, returnedStringUsingSlice); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/ToUpper.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/ToUpper.cs new file mode 100644 index 0000000000..23dbaa7551 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/ToUpper.cs @@ -0,0 +1,329 @@ +// 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.Collections.Generic; +using System.Globalization; +using Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void ZeroLengthToUpper() + { + char[] expectedSource = { 'a', 'B', 'c' }; + char[] a = { 'a', 'B', 'c' }; + var source = new ReadOnlySpan(a, 2, 0); + + var expectedDestination = new char[1] { 'a' }; + Span destination = new char[1] { 'a' }; + + Assert.Equal(source.Length, source.ToUpper(destination, CultureInfo.CurrentCulture)); + Assert.Equal(source.Length, source.ToUpperInvariant(destination)); + Assert.Equal(expectedDestination, destination.ToArray()); + Assert.Equal(expectedSource, a); + + source = ReadOnlySpan.Empty; + Assert.Equal(source.Length, source.ToUpper(destination, CultureInfo.CurrentCulture)); + Assert.Equal(source.Length, source.ToUpperInvariant(destination)); + Assert.Equal(expectedDestination, destination.ToArray()); + Assert.Equal(expectedSource, a); + } + + [Fact] + public static void SameSpanToUpper() + { + var expected = new char[3] { 'A', 'B', 'C' }; + var a = new char[3] { 'a', 'B', 'c' }; + { + ReadOnlySpan source = a; + Span destination = a; + Assert.Equal(source.Length, source.ToUpper(destination, CultureInfo.CurrentCulture)); + Assert.Equal(expected, destination.ToArray()); + Assert.Equal(expected, source.ToArray()); + } + { + ReadOnlySpan source = a; + Span destination = a; + Assert.Equal(source.Length, source.ToUpperInvariant(destination)); + Assert.Equal(expected, destination.ToArray()); + Assert.Equal(expected, source.ToArray()); + } + } + + [Fact] + public static void ToUpperOverlapping() + { + var expectedSource = new char[3] { 'b', 'C', 'B' }; + var expectedDestination = new char[3] { 'B', 'C', 'B' }; + + { + char[] a = { 'a', 'b', 'C', 'b', 'C', 'b' }; + var source = new ReadOnlySpan(a, 1, 3); + var destination = new Span(a, 3, 3); + Assert.Equal(source.Length, source.ToUpper(destination, CultureInfo.CurrentCulture)); + Assert.Equal(expectedDestination, destination.ToArray()); + Assert.Equal(expectedSource, source.ToArray()); + } + { + char[] a = { 'a', 'b', 'C', 'b', 'C', 'b' }; + var source = new ReadOnlySpan(a, 1, 3); + var destination = new Span(a, 3, 3); + Assert.Equal(source.Length, source.ToUpperInvariant(destination)); + Assert.Equal(expectedDestination, destination.ToArray()); + Assert.Equal(expectedSource, source.ToArray()); + } + } + + [Fact] + public static void LengthMismatchToUpper() + { + { + var expectedSource = new char[3] { 'a', 'B', 'c' }; + ReadOnlySpan source = new char[3] { 'a', 'B', 'c' }; + + var expectedDestination = new char[1] { 'a' }; + Span destination = new char[1] { 'a' }; + + Assert.Equal(-1, source.ToUpper(destination, CultureInfo.CurrentCulture)); + Assert.Equal(-1, source.ToUpperInvariant(destination)); + + Assert.Equal(expectedDestination, destination.ToArray()); + Assert.Equal(expectedSource, source.ToArray()); + } + + { + var expectedSource = new char[3] { 'a', 'B', 'c' }; + ReadOnlySpan source = new char[3] { 'a', 'B', 'c' }; + + var expectedDestination = new char[4] { 'A', 'B', 'C', 'd' }; + Span destination = new char[4] { 'x', 'Y', 'z', 'd' }; + + Assert.Equal(source.Length, source.ToUpper(destination, CultureInfo.CurrentCulture)); + Assert.Equal(source.Length, source.ToUpperInvariant(destination)); + + Assert.Equal(expectedDestination, destination.ToArray()); + Assert.Equal(expectedSource, source.ToArray()); + } + } + + [Fact] + public static void ToUpper() + { + var expectedSource = new char[3] { 'a', 'B', 'c' }; + var expectedDestination = new char[3] { 'A', 'B', 'C' }; + + { + ReadOnlySpan source = new char[3] { 'a', 'B', 'c' }; + Span destination = new char[3] { 'x', 'Y', 'z' }; + + Assert.Equal(source.Length, source.ToUpper(destination, CultureInfo.CurrentCulture)); + Assert.Equal(expectedDestination, destination.ToArray()); + Assert.Equal(expectedSource, source.ToArray()); + } + + { + ReadOnlySpan source = new char[3] { 'a', 'B', 'c' }; + Span destination = new char[3] { 'x', 'Y', 'z' }; + + Assert.Equal(source.Length, source.ToUpperInvariant(destination)); + Assert.Equal(expectedDestination, destination.ToArray()); + Assert.Equal(expectedSource, source.ToArray()); + } + } + + [Fact] + public static void MakeSureNoToUpperChecksGoOutOfRange() + { + for (int length = 0; length < 100; length++) + { + var first = new char[length + 2]; + var second = new char[length + 2]; + + for (int i = 0; i < first.Length; i++) + { + first[i] = 'a'; + second[i] = 'b'; + } + + first[0] = 'z'; + first[length + 1] = 'z'; + + second[0] = 'y'; + second[length + 1] = 'y'; + + var expectedSource = new char[length]; + var expectedDestination = new char[length]; + for (int i = 0; i < length; i++) + { + expectedSource[i] = 'a'; + expectedDestination[i] = 'A'; + } + + var source = new ReadOnlySpan(first, 1, length); + var destination = new Span(second, 1, length); + Assert.Equal(source.Length, source.ToUpper(destination, CultureInfo.CurrentCulture)); + Assert.Equal(source.Length, source.ToUpperInvariant(destination)); + Assert.Equal(expectedDestination, destination.ToArray()); + Assert.Equal(expectedSource, source.ToArray()); + + Assert.Equal('z', first[0]); + Assert.Equal('z', first[length + 1]); + Assert.Equal('y', second[0]); + Assert.Equal('y', second[length + 1]); + } + } + + [Fact] + public static void ToUpperNullCulture() + { + ReadOnlySpan source = new char[3] { 'a', 'B', 'c' }; + Span destination = new char[3] { 'a', 'B', 'c' }; + + try + { + source.ToUpper(destination, null); + Assert.False(true, "Expected exception: " + typeof(ArgumentNullException).GetType()); + } + catch (ArgumentNullException) + { + } + catch (Exception wrongException) + { + Assert.False(true, "Wrong exception thrown: Expected " + typeof(ArgumentNullException).GetType() + ": Actual: " + wrongException.GetType()); + } + } + + [Theory] + [InlineData("hello", "HELLO")] + [InlineData("HELLO", "HELLO")] + [InlineData("", "")] + public static void ToUpper(string s, string expected) + { + ReadOnlySpan source = s.AsSpan(); + Span destination = new char[source.Length]; + Assert.Equal(source.Length, source.ToUpper(destination, CultureInfo.CurrentCulture)); + Assert.Equal(expected, destination.ToString()); + } + + private static IEnumerable ToUpper_Culture_TestData() + { + yield return new object[] { "h\u0069 world", "H\u0130 WORLD", new CultureInfo("tr-TR") }; + yield return new object[] { "h\u0130 world", "H\u0130 WORLD", new CultureInfo("tr-TR") }; + yield return new object[] { "h\u0131 world", "H\u0049 WORLD", new CultureInfo("tr-TR") }; + + yield return new object[] { "h\u0069 world", "H\u0049 WORLD", new CultureInfo("en-US") }; + yield return new object[] { "h\u0130 world", "H\u0130 WORLD", new CultureInfo("en-US") }; + yield return new object[] { "h\u0131 world", "H\u0049 WORLD", new CultureInfo("en-US") }; + + yield return new object[] { "h\u0069 world", "H\u0049 WORLD", CultureInfo.InvariantCulture }; + yield return new object[] { "h\u0130 world", "H\u0130 WORLD", CultureInfo.InvariantCulture }; + yield return new object[] { "h\u0131 world", "H\u0131 WORLD", CultureInfo.InvariantCulture }; + } + + [Theory(Skip="Mono issue")] + [MemberData(nameof(ToUpper_Culture_TestData))] + public static void Test_ToUpper_Culture(string actual, string expected, CultureInfo culture) + { + ReadOnlySpan source = actual.AsSpan(); + Span destination = new char[source.Length]; + Assert.Equal(source.Length, source.ToUpper(destination, culture)); + Assert.Equal(expected, destination.ToString()); + } + + [Theory(Skip="Mono issue")] + public static void ToUpper_TurkishI_TurkishCulture() + { + CultureInfo culture = new CultureInfo("tr-TR"); + + string s = "H\u0069 World"; + string expected = "H\u0130 WORLD"; + ReadOnlySpan source = s.AsSpan(); + Span destination = new char[source.Length]; + Assert.Equal(source.Length, source.ToUpper(destination, culture)); + Assert.Equal(expected, destination.ToString()); + + s = "H\u0130 World"; + expected = "H\u0130 WORLD"; + source = s.AsSpan(); + destination = new char[source.Length]; + Assert.Equal(source.Length, source.ToUpper(destination, culture)); + Assert.Equal(expected, destination.ToString()); + + s = "H\u0131 World"; + expected = "H\u0049 WORLD"; + source = s.AsSpan(); + destination = new char[source.Length]; + Assert.Equal(source.Length, source.ToUpper(destination, culture)); + Assert.Equal(expected, destination.ToString()); + } + + [Theory(Skip="Mono issue")] + public static void ToUpper_TurkishI_EnglishUSCulture() + { + CultureInfo culture = new CultureInfo("en-US"); + + string s = "H\u0069 World"; + string expected = "H\u0049 WORLD"; + ReadOnlySpan source = s.AsSpan(); + Span destination = new char[source.Length]; + Assert.Equal(source.Length, source.ToUpper(destination, culture)); + Assert.Equal(expected, destination.ToString()); + + s = "H\u0130 World"; + expected = "H\u0130 WORLD"; + source = s.AsSpan(); + destination = new char[source.Length]; + Assert.Equal(source.Length, source.ToUpper(destination, culture)); + Assert.Equal(expected, destination.ToString()); + + s = "H\u0131 World"; + expected = "H\u0049 WORLD"; + source = s.AsSpan(); + destination = new char[source.Length]; + Assert.Equal(source.Length, source.ToUpper(destination, culture)); + Assert.Equal(expected, destination.ToString()); + } + + [Theory(Skip="Mono issue")] + public static void ToUpper_TurkishI_InvariantCulture() + { + CultureInfo culture = CultureInfo.InvariantCulture; + + string s = "H\u0069 World"; + string expected = "H\u0049 WORLD"; + ReadOnlySpan source = s.AsSpan(); + Span destination = new char[source.Length]; + Assert.Equal(source.Length, source.ToUpper(destination, culture)); + Assert.Equal(expected, destination.ToString()); + + s = "H\u0130 World"; + expected = "H\u0130 WORLD"; + source = s.AsSpan(); + destination = new char[source.Length]; + Assert.Equal(source.Length, source.ToUpper(destination, culture)); + Assert.Equal(expected, destination.ToString()); + + s = "H\u0131 World"; + expected = "H\u0131 WORLD"; + source = s.AsSpan(); + destination = new char[source.Length]; + Assert.Equal(source.Length, source.ToUpper(destination, culture)); + Assert.Equal(expected, destination.ToString()); + } + + [Theory] + [InlineData("hello", "HELLO")] + [InlineData("HELLO", "HELLO")] + [InlineData("", "")] + public static void ToUpperInvariant(string s, string expected) + { + ReadOnlySpan source = s.AsSpan(); + Span destination = new char[source.Length]; + Assert.Equal(source.Length, source.ToUpperInvariant(destination)); + Assert.Equal(expected, destination.ToString()); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/TrimAnyCharacter.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/TrimAnyCharacter.cs new file mode 100644 index 0000000000..c1975616a0 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/TrimAnyCharacter.cs @@ -0,0 +1,169 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void ZeroLengthTrimCharacter() + { + ReadOnlySpan span = new ReadOnlySpan(Array.Empty()); + Assert.True(span.SequenceEqual(span.Trim('a'))); + Assert.True(span.SequenceEqual(span.TrimStart('a'))); + Assert.True(span.SequenceEqual(span.TrimEnd('a'))); + } + + [Fact] + public static void NoTrimCharacter() + { + for (int length = 0; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = 'b'; + } + ReadOnlySpan span = new ReadOnlySpan(a); + Assert.True(span.SequenceEqual(span.Trim('a'))); + Assert.True(span.SequenceEqual(span.TrimStart('a'))); + Assert.True(span.SequenceEqual(span.TrimEnd('a'))); + } + } + + [Fact] + public static void OnlyTrimCharacter() + { + for (int length = 0; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = 'a'; + } + ReadOnlySpan span = new ReadOnlySpan(a); + Assert.True(ReadOnlySpan.Empty.SequenceEqual(span.Trim('a'))); + Assert.True(ReadOnlySpan.Empty.SequenceEqual(span.TrimStart('a'))); + Assert.True(ReadOnlySpan.Empty.SequenceEqual(span.TrimEnd('a'))); + } + } + + [Fact] + public static void TrimCharacterAtStart() + { + for (int length = 2; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = 'b'; + } + a[0] = 'a'; + ReadOnlySpan span = new ReadOnlySpan(a); + Assert.True(span.Slice(1).SequenceEqual(span.Trim('a'))); + Assert.True(span.Slice(1).SequenceEqual(span.TrimStart('a'))); + Assert.True(span.SequenceEqual(span.TrimEnd('a'))); + } + } + + [Fact] + public static void TrimCharacterAtEnd() + { + for (int length = 2; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = 'b'; + } + a[length - 1] = 'a'; + ReadOnlySpan span = new ReadOnlySpan(a); + Assert.True(span.Slice(0, length - 1).SequenceEqual(span.Trim('a'))); + Assert.True(span.SequenceEqual(span.TrimStart('a'))); + Assert.True(span.Slice(0, length - 1).SequenceEqual(span.TrimEnd('a'))); + } + } + + [Fact] + public static void TrimCharacterAtStartAndEnd() + { + for (int length = 3; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = 'b'; + } + a[0] = 'a'; + a[length - 1] = 'a'; + ReadOnlySpan span = new ReadOnlySpan(a); + Assert.True(span.Slice(1, length - 2).SequenceEqual(span.Trim('a'))); + Assert.True(span.Slice(1).SequenceEqual(span.TrimStart('a'))); + Assert.True(span.Slice(0, length - 1).SequenceEqual(span.TrimEnd('a'))); + } + } + + [Fact] + public static void TrimCharacterInMiddle() + { + for (int length = 3; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = 'b'; + } + a[1] = 'a'; + ReadOnlySpan span = new ReadOnlySpan(a); + Assert.True(span.SequenceEqual(span.Trim('a'))); + Assert.True(span.SequenceEqual(span.TrimStart('a'))); + Assert.True(span.SequenceEqual(span.TrimEnd('a'))); + } + } + + [Fact] + public static void TrimCharacterMultipleTimes() + { + for (int length = 3; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = 'b'; + } + a[0] = 'a'; + a[length - 1] = 'a'; + ReadOnlySpan span = new ReadOnlySpan(a); + ReadOnlySpan trimResult = span.Trim('a'); + ReadOnlySpan trimStartResult = span.TrimStart('a'); + ReadOnlySpan trimEndResult = span.TrimEnd('a'); + Assert.True(span.Slice(1, length - 2).SequenceEqual(trimResult)); + Assert.True(span.Slice(1).SequenceEqual(trimStartResult)); + Assert.True(span.Slice(0, length - 1).SequenceEqual(trimEndResult)); + + // 2nd attempt should do nothing + Assert.True(trimResult.SequenceEqual(trimResult.Trim('a'))); + Assert.True(trimStartResult.SequenceEqual(trimStartResult.TrimStart('a'))); + Assert.True(trimEndResult.SequenceEqual(trimEndResult.TrimEnd('a'))); + } + } + + [Fact] + public static void MakeSureNoTrimCharacterChecksGoOutOfRange() + { + for (int length = 3; length < 64; length++) + { + char[] first = new char[length]; + first[0] = 'a'; + first[length - 1] = 'a'; + var span = new ReadOnlySpan(first, 1, length - 2); + Assert.True(span.SequenceEqual(span.Trim('a'))); + Assert.True(span.SequenceEqual(span.TrimStart('a'))); + Assert.True(span.SequenceEqual(span.TrimEnd('a'))); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/TrimManyCharacters.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/TrimManyCharacters.cs new file mode 100644 index 0000000000..afade2c2c8 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/TrimManyCharacters.cs @@ -0,0 +1,263 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void ZeroLengthTrimCharacters() + { + ReadOnlySpan span = new ReadOnlySpan(Array.Empty()); + ReadOnlySpan trimChars = new ReadOnlySpan(Array.Empty()); + Assert.True(span.SequenceEqual(span.Trim(trimChars))); + Assert.True(span.SequenceEqual(span.TrimStart(trimChars))); + Assert.True(span.SequenceEqual(span.TrimEnd(trimChars))); + + char[] chars = { 'a', 'b', 'c', 'd', 'e' }; + trimChars = new ReadOnlySpan(chars); + Assert.True(span.SequenceEqual(span.Trim(trimChars))); + Assert.True(span.SequenceEqual(span.TrimStart(trimChars))); + Assert.True(span.SequenceEqual(span.TrimEnd(trimChars))); + + ReadOnlySpan stringSpan = "".AsSpan(); + ReadOnlySpan trimCharsFromString = "abcde".AsSpan(); + Assert.True(stringSpan.SequenceEqual(stringSpan.Trim(trimCharsFromString))); + Assert.True(stringSpan.SequenceEqual(stringSpan.TrimStart(trimCharsFromString))); + Assert.True(stringSpan.SequenceEqual(stringSpan.TrimEnd(trimCharsFromString))); + } + + [Fact] + public static void NoTrimCharacters() + { + ReadOnlySpan trimChars = new ReadOnlySpan(Array.Empty()); + for (int length = 0; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = 'f'; + } + ReadOnlySpan span = new ReadOnlySpan(a); + Assert.True(span.SequenceEqual(span.Trim(trimChars))); + Assert.True(span.SequenceEqual(span.TrimStart(trimChars))); + Assert.True(span.SequenceEqual(span.TrimEnd(trimChars))); + } + + char[] chars = { 'a', 'b', 'c', 'd', 'e' }; + for (int length = 0; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = 'f'; + } + ReadOnlySpan span = new ReadOnlySpan(a); + Assert.True(span.SequenceEqual(span.Trim(chars))); + Assert.True(span.SequenceEqual(span.TrimStart(chars))); + Assert.True(span.SequenceEqual(span.TrimEnd(chars))); + } + + ReadOnlySpan stringSpan = "ffghifhig".AsSpan(); + ReadOnlySpan trimCharsFromString = "abcde".AsSpan(); + Assert.True(stringSpan.SequenceEqual(stringSpan.Trim(trimCharsFromString))); + Assert.True(stringSpan.SequenceEqual(stringSpan.TrimStart(trimCharsFromString))); + Assert.True(stringSpan.SequenceEqual(stringSpan.TrimEnd(trimCharsFromString))); + } + + [Fact] + public static void OnlyTrimCharacters() + { + char[] chars = { 'a', 'b', 'c', 'd', 'e' }; + for (int length = 0; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = chars[i % chars.Length]; + } + ReadOnlySpan span = new ReadOnlySpan(a); + Assert.True(ReadOnlySpan.Empty.SequenceEqual(span.Trim(chars)), "G: " + length); + Assert.True(ReadOnlySpan.Empty.SequenceEqual(span.TrimStart(chars)), "H: " + length); + Assert.True(ReadOnlySpan.Empty.SequenceEqual(span.TrimEnd(chars)), "I: " + length); + } + + ReadOnlySpan stringSpan = "babedebcabba".AsSpan(); + ReadOnlySpan trimChars = "abcde".AsSpan(); + Assert.True(ReadOnlySpan.Empty.SequenceEqual(stringSpan.Trim(trimChars)), "J"); + Assert.True(ReadOnlySpan.Empty.SequenceEqual(stringSpan.TrimStart(trimChars)), "K"); + Assert.True(ReadOnlySpan.Empty.SequenceEqual(stringSpan.TrimEnd(trimChars)), "L"); + } + + [Fact] + public static void TrimCharactersAtStart() + { + char[] chars = { 'a', 'b', 'c', 'd', 'e' }; + for (int length = 2; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = 'f'; + } + a[0] = 'c'; + ReadOnlySpan span = new ReadOnlySpan(a); + Assert.True(span.Slice(1).SequenceEqual(span.Trim(chars)), "A: " + length); + Assert.True(span.Slice(1).SequenceEqual(span.TrimStart(chars)), "B: " + length); + Assert.True(span.SequenceEqual(span.TrimEnd(chars)), "C: " + length); + } + + ReadOnlySpan stringSpan = "babffffff".AsSpan(); + ReadOnlySpan trimChars = "abcde".AsSpan(); + Assert.True(stringSpan.Slice(3).SequenceEqual(stringSpan.Trim(trimChars)), "D"); + Assert.True(stringSpan.Slice(3).SequenceEqual(stringSpan.TrimStart(trimChars)), "E"); + Assert.True(stringSpan.SequenceEqual(stringSpan.TrimEnd(trimChars)), "F"); + } + + [Fact] + public static void TrimCharactersAtEnd() + { + char[] chars = { 'a', 'b', 'c', 'd', 'e' }; + for (int length = 2; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = 'f'; + } + a[length - 1] = 'c'; + ReadOnlySpan span = new ReadOnlySpan(a); + Assert.True(span.Slice(0, length - 1).SequenceEqual(span.Trim(chars))); + Assert.True(span.SequenceEqual(span.TrimStart(chars))); + Assert.True(span.Slice(0, length - 1).SequenceEqual(span.TrimEnd(chars))); + } + + ReadOnlySpan stringSpan = "fffffcced".AsSpan(); + ReadOnlySpan trimChars = "abcde".AsSpan(); + Assert.True(stringSpan.Slice(0, 5).SequenceEqual(stringSpan.Trim(trimChars))); + Assert.True(stringSpan.SequenceEqual(stringSpan.TrimStart(trimChars))); + Assert.True(stringSpan.Slice(0, 5).SequenceEqual(stringSpan.TrimEnd(trimChars))); + } + + [Fact] + public static void TrimCharactersAtStartAndEnd() + { + char[] chars = { 'a', 'b', 'c', 'd', 'e' }; + for (int length = 3; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = 'f'; + } + a[0] = 'c'; + a[length - 1] = 'c'; + ReadOnlySpan span = new ReadOnlySpan(a); + Assert.True(span.Slice(1, length - 2).SequenceEqual(span.Trim(chars))); + Assert.True(span.Slice(1).SequenceEqual(span.TrimStart(chars))); + Assert.True(span.Slice(0, length - 1).SequenceEqual(span.TrimEnd(chars))); + } + + ReadOnlySpan stringSpan = "ccedafffffbdaa".AsSpan(); + ReadOnlySpan trimChars = "abcde".AsSpan(); + Assert.True(stringSpan.Slice(5, 5).SequenceEqual(stringSpan.Trim(trimChars))); + Assert.True(stringSpan.Slice(5).SequenceEqual(stringSpan.TrimStart(trimChars))); + Assert.True(stringSpan.Slice(0, 10).SequenceEqual(stringSpan.TrimEnd(trimChars))); + } + + [Fact] + public static void TrimCharactersInMiddle() + { + char[] chars = { 'a', 'b', 'c', 'd', 'e' }; + for (int length = chars.Length + 2; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = 'f'; + } + Array.Copy(chars, 0, a, 1, chars.Length); + ReadOnlySpan span = new ReadOnlySpan(a); + Assert.True(span.SequenceEqual(span.Trim(chars))); + Assert.True(span.SequenceEqual(span.TrimStart(chars))); + Assert.True(span.SequenceEqual(span.TrimEnd(chars))); + } + + ReadOnlySpan stringSpan = "fabbacddeeddef".AsSpan(); + ReadOnlySpan trimChars = "abcde".AsSpan(); + Assert.True(stringSpan.SequenceEqual(stringSpan.Trim(trimChars))); + Assert.True(stringSpan.SequenceEqual(stringSpan.TrimStart(trimChars))); + Assert.True(stringSpan.SequenceEqual(stringSpan.TrimEnd(trimChars))); + } + + [Fact] + public static void TrimCharactersMultipleTimes() + { + char[] chars = { 'a', 'b', 'c', 'd', 'e' }; + for (int length = 3; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = 'f'; + } + a[0] = 'c'; + a[length - 1] = 'c'; + ReadOnlySpan span = new ReadOnlySpan(a); + ReadOnlySpan trimResult = span.Trim(chars); + ReadOnlySpan trimStartResult = span.TrimStart(chars); + ReadOnlySpan trimEndResult = span.TrimEnd(chars); + Assert.True(span.Slice(1, length - 2).SequenceEqual(trimResult)); + Assert.True(span.Slice(1).SequenceEqual(trimStartResult)); + Assert.True(span.Slice(0, length - 1).SequenceEqual(trimEndResult)); + + // 2nd attempt should do nothing + Assert.True(trimResult.SequenceEqual(trimResult.Trim(chars))); + Assert.True(trimStartResult.SequenceEqual(trimStartResult.TrimStart(chars))); + Assert.True(trimEndResult.SequenceEqual(trimEndResult.TrimEnd(chars))); + } + + ReadOnlySpan stringSpan = "ccedafffffbdaa".AsSpan(); + ReadOnlySpan trimChars = "abcde".AsSpan(); + + ReadOnlySpan trimStringResult = stringSpan.Trim(trimChars); + ReadOnlySpan trimStartStringResult = stringSpan.TrimStart(trimChars); + ReadOnlySpan trimEndStringResult = stringSpan.TrimEnd(trimChars); + Assert.True(stringSpan.Slice(5, 5).SequenceEqual(trimStringResult)); + Assert.True(stringSpan.Slice(5).SequenceEqual(trimStartStringResult)); + Assert.True(stringSpan.Slice(0, 10).SequenceEqual(trimEndStringResult)); + + // 2nd attempt should do nothing + Assert.True(trimStringResult.SequenceEqual(trimStringResult.Trim(trimChars))); + Assert.True(trimStartStringResult.SequenceEqual(trimStartStringResult.TrimStart(trimChars))); + Assert.True(trimEndStringResult.SequenceEqual(trimEndStringResult.TrimEnd(trimChars))); + } + + [Fact] + public static void MakeSureNoTrimCharactersChecksGoOutOfRange() + { + char[] chars = { 'a', 'b', 'c', 'd', 'e' }; + for (int length = 3; length < 64; length++) + { + char[] first = new char[length]; + first[0] = 'f'; + first[length - 1] = 'f'; + var span = new ReadOnlySpan(first, 1, length - 2); + Assert.Equal(span.ToArray().Length, span.Trim(chars).ToArray().Length); + Assert.True(span.SequenceEqual(span.Trim(chars)), "A : " + span.Length); + Assert.True(span.SequenceEqual(span.TrimStart(chars)), "B :" + span.Length); + Assert.True(span.SequenceEqual(span.TrimEnd(chars))); + } + + string testString = "afghijklmnopqrstfe"; + ReadOnlySpan stringSpan = testString.AsSpan(1, testString.Length - 2); + ReadOnlySpan trimChars = "abcde".AsSpan(); + Assert.True(stringSpan.SequenceEqual(stringSpan.Trim(trimChars))); + Assert.True(stringSpan.SequenceEqual(stringSpan.TrimStart(trimChars))); + Assert.True(stringSpan.SequenceEqual(stringSpan.TrimEnd(trimChars))); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/ReadOnlySpan/TrimWhiteSpace.cs b/external/corefx/src/System.Memory/tests/ReadOnlySpan/TrimWhiteSpace.cs new file mode 100644 index 0000000000..15c94f9603 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/ReadOnlySpan/TrimWhiteSpace.cs @@ -0,0 +1,169 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class ReadOnlySpanTests + { + [Fact] + public static void ZeroLengthTrim() + { + ReadOnlySpan span = new ReadOnlySpan(Array.Empty()); + Assert.True(span.SequenceEqual(span.Trim())); + Assert.True(span.SequenceEqual(span.TrimStart())); + Assert.True(span.SequenceEqual(span.TrimEnd())); + } + + [Fact] + public static void NoWhiteSpaceTrim() + { + for (int length = 0; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = 'a'; + } + ReadOnlySpan span = new ReadOnlySpan(a); + Assert.True(span.SequenceEqual(span.Trim())); + Assert.True(span.SequenceEqual(span.TrimStart())); + Assert.True(span.SequenceEqual(span.TrimEnd())); + } + } + + [Fact] + public static void OnlyWhiteSpaceTrim() + { + for (int length = 0; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = ' '; + } + ReadOnlySpan span = new ReadOnlySpan(a); + Assert.True(ReadOnlySpan.Empty.SequenceEqual(span.Trim())); + Assert.True(ReadOnlySpan.Empty.SequenceEqual(span.TrimStart())); + Assert.True(ReadOnlySpan.Empty.SequenceEqual(span.TrimEnd())); + } + } + + [Fact] + public static void WhiteSpaceAtStartTrim() + { + for (int length = 2; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = 'a'; + } + a[0] = ' '; + ReadOnlySpan span = new ReadOnlySpan(a); + Assert.True(span.Slice(1).SequenceEqual(span.Trim())); + Assert.True(span.Slice(1).SequenceEqual(span.TrimStart())); + Assert.True(span.SequenceEqual(span.TrimEnd())); + } + } + + [Fact] + public static void WhiteSpaceAtEndTrim() + { + for (int length = 2; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = 'a'; + } + a[length - 1] = ' '; + ReadOnlySpan span = new ReadOnlySpan(a); + Assert.True(span.Slice(0, length - 1).SequenceEqual(span.Trim())); + Assert.True(span.SequenceEqual(span.TrimStart())); + Assert.True(span.Slice(0, length - 1).SequenceEqual(span.TrimEnd())); + } + } + + [Fact] + public static void WhiteSpaceAtStartAndEndTrim() + { + for (int length = 3; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = 'a'; + } + a[0] = ' '; + a[length - 1] = ' '; + ReadOnlySpan span = new ReadOnlySpan(a); + Assert.True(span.Slice(1, length - 2).SequenceEqual(span.Trim())); + Assert.True(span.Slice(1).SequenceEqual(span.TrimStart())); + Assert.True(span.Slice(0, length - 1).SequenceEqual(span.TrimEnd())); + } + } + + [Fact] + public static void WhiteSpaceInMiddleTrim() + { + for (int length = 3; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = 'a'; + } + a[1] = ' '; + ReadOnlySpan span = new ReadOnlySpan(a); + Assert.True(span.SequenceEqual(span.Trim())); + Assert.True(span.SequenceEqual(span.TrimStart())); + Assert.True(span.SequenceEqual(span.TrimEnd())); + } + } + + [Fact] + public static void TrimWhiteSpaceMultipleTimes() + { + for (int length = 3; length < 32; length++) + { + char[] a = new char[length]; + for (int i = 0; i < length; i++) + { + a[i] = 'a'; + } + a[0] = ' '; + a[length - 1] = ' '; + ReadOnlySpan span = new ReadOnlySpan(a); + ReadOnlySpan trimResult = span.Trim(); + ReadOnlySpan trimStartResult = span.TrimStart(); + ReadOnlySpan trimEndResult = span.TrimEnd(); + Assert.True(span.Slice(1, length - 2).SequenceEqual(trimResult)); + Assert.True(span.Slice(1).SequenceEqual(trimStartResult)); + Assert.True(span.Slice(0, length - 1).SequenceEqual(trimEndResult)); + + // 2nd attempt should do nothing + Assert.True(trimResult.SequenceEqual(trimResult.Trim())); + Assert.True(trimStartResult.SequenceEqual(trimStartResult.TrimStart())); + Assert.True(trimEndResult.SequenceEqual(trimEndResult.TrimEnd())); + } + } + + [Fact] + public static void MakeSureNoTrimChecksGoOutOfRange() + { + for (int length = 3; length < 64; length++) + { + char[] first = new char[length]; + first[0] = ' '; + first[length - 1] = ' '; + var span = new ReadOnlySpan(first, 1, length - 2); + Assert.True(span.SequenceEqual(span.Trim())); + Assert.True(span.SequenceEqual(span.TrimStart())); + Assert.True(span.SequenceEqual(span.TrimEnd())); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/Resources/System.Memory.Tests.rd.xml b/external/corefx/src/System.Memory/tests/Resources/System.Memory.Tests.rd.xml index 7931c600d4..6dd7780ad6 100644 --- a/external/corefx/src/System.Memory/tests/Resources/System.Memory.Tests.rd.xml +++ b/external/corefx/src/System.Memory/tests/Resources/System.Memory.Tests.rd.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/external/corefx/src/System.Memory/tests/Span/AsSpan.cs b/external/corefx/src/System.Memory/tests/Span/AsSpan.cs index 63befe61c1..07d040fd90 100644 --- a/external/corefx/src/System.Memory/tests/Span/AsSpan.cs +++ b/external/corefx/src/System.Memory/tests/Span/AsSpan.cs @@ -35,7 +35,16 @@ namespace System.SpanTests } [Fact] - public static void ZeroLengthArrayAsSpan() + public static void NullArrayAsSpan() + { + int[] a = null; + Span span = a.AsSpan(); + span.Validate(); + Assert.True(span == default); + } + + [Fact] + public static void EmptyArrayAsSpan() { int[] empty = Array.Empty(); Span span = empty.AsSpan(); @@ -86,5 +95,116 @@ namespace System.SpanTests Span spanInt = segmentInt.AsSpan(); spanInt.ValidateNonNullEmpty(); } + + [Theory] + [InlineData(0, 0)] + [InlineData(3, 0)] + [InlineData(3, 1)] + [InlineData(3, 2)] + [InlineData(3, 3)] + [InlineData(10, 0)] + [InlineData(10, 3)] + [InlineData(10, 10)] + public static void ArrayAsSpanWithStart(int length, int start) + { + int[] a = new int[length]; + Span s = a.AsSpan(start); + Assert.Equal(length - start, s.Length); + if (start != length) + { + s[0] = 42; + Assert.Equal(42, a[start]); + } + } + + [Theory] + [InlineData(0, 0)] + [InlineData(3, 0)] + [InlineData(3, 1)] + [InlineData(3, 2)] + [InlineData(3, 3)] + [InlineData(10, 0)] + [InlineData(10, 3)] + [InlineData(10, 10)] + public static void ArraySegmentAsSpanWithStart(int length, int start) + { + const int segmentOffset = 5; + + int[] a = new int[length + segmentOffset]; + ArraySegment segment = new ArraySegment(a, 5, length); + Span s = segment.AsSpan(start); + Assert.Equal(length - start, s.Length); + if (s.Length != 0) + { + s[0] = 42; + Assert.Equal(42, a[segmentOffset + start]); + } + } + + [Theory] + [InlineData(0, 0, 0)] + [InlineData(3, 0, 3)] + [InlineData(3, 1, 2)] + [InlineData(3, 2, 1)] + [InlineData(3, 3, 0)] + [InlineData(10, 0, 5)] + [InlineData(10, 3, 2)] + public static void ArrayAsSpanWithStartAndLength(int length, int start, int subLength) + { + int[] a = new int[length]; + Span s = a.AsSpan(start, subLength); + Assert.Equal(subLength, s.Length); + if (subLength != 0) + { + s[0] = 42; + Assert.Equal(42, a[start]); + } + } + + [Theory] + [InlineData(0, 0, 0)] + [InlineData(3, 0, 3)] + [InlineData(3, 1, 2)] + [InlineData(3, 2, 1)] + [InlineData(3, 3, 0)] + [InlineData(10, 0, 5)] + [InlineData(10, 3, 2)] + public static void ArraySegmentAsSpanWithStartAndLength(int length, int start, int subLength) + { + const int segmentOffset = 5; + + int[] a = new int[length + segmentOffset]; + ArraySegment segment = new ArraySegment(a, segmentOffset, length); + Span s = segment.AsSpan(start, subLength); + Assert.Equal(subLength, s.Length); + if (subLength != 0) + { + s[0] = 42; + Assert.Equal(42, a[segmentOffset + start]); + } + } + + [Theory] + [InlineData(0, -1)] + [InlineData(0, 1)] + [InlineData(5, 6)] + public static void ArrayAsSpanWithStartNegative(int length, int start) + { + int[] a = new int[length]; + Assert.Throws(() => a.AsSpan(start)); + } + + [Theory] + [InlineData(0, -1, 0)] + [InlineData(0, 1, 0)] + [InlineData(0, 0, -1)] + [InlineData(0, 0, 1)] + [InlineData(5, 6, 0)] + [InlineData(5, 3, 3)] + public static void ArrayAsSpanWithStartAndLengthNegative(int length, int start, int subLength) + { + int[] a = new int[length]; + Assert.Throws(() => a.AsSpan(start, subLength)); + } } } diff --git a/external/corefx/src/System.Memory/tests/Span/Clear.cs b/external/corefx/src/System.Memory/tests/Span/Clear.cs index 117146191f..5f7c75ca0b 100644 --- a/external/corefx/src/System.Memory/tests/Span/Clear.cs +++ b/external/corefx/src/System.Memory/tests/Span/Clear.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using Xunit; +using System.Linq; using System.Runtime.CompilerServices; using static System.TestHelpers; @@ -198,6 +199,31 @@ namespace System.SpanTests Assert.Equal(expected, actual); } + [Fact] + public static void ClearReferenceTypeSlice() + { + // A string array [ ""1", ..., "20" ] + string[] baseline = Enumerable.Range(1, 20).Select(i => i.ToString()).ToArray(); + + for (int i = 0; i < 16; i++) + { + // Going to clear array.Slice(1, i) manually, + // then compare it against array.Slice(1, i).Clear(). + // Test is written this way to allow detecting overrunning bounds. + + string[] expected = (string[])baseline.Clone(); + for (int j = 1; j <= i; j++) + { + expected[j] = null; + } + + string[] actual = (string[])baseline.Clone(); + actual.AsSpan(1, i).Clear(); + + Assert.Equal(expected, actual); + } + } + [Fact] public static void ClearEnumType() { @@ -249,20 +275,14 @@ namespace System.SpanTests try { - ref int data = ref Unsafe.AsRef(memory.ToPointer()); - - int initial = 5; - for (int i = 0; i < length; i++) - { - Unsafe.Add(ref data, i) = initial; - } - Span span = new Span(memory.ToPointer(), length); + span.Fill(5); // Act span.Clear(); // Assert using custom code for perf and to avoid allocating extra memory + ref int data = ref Unsafe.AsRef(memory.ToPointer()); for (int i = 0; i < length; i++) { var actual = Unsafe.Add(ref data, i); diff --git a/external/corefx/src/System.Memory/tests/Span/CopyTo.cs b/external/corefx/src/System.Memory/tests/Span/CopyTo.cs index d1db216a1b..5dc60cf3cf 100644 --- a/external/corefx/src/System.Memory/tests/Span/CopyTo.cs +++ b/external/corefx/src/System.Memory/tests/Span/CopyTo.cs @@ -257,5 +257,36 @@ namespace System.SpanTests } } } + + [Fact] + public static void CopyToVaryingSizes() + { + const int MaxLength = 2048; + + var rng = new Random(); + byte[] inputArray = new byte[MaxLength]; + Span inputSpan = inputArray; + Span outputSpan = new byte[MaxLength]; + Span allZerosSpan = new byte[MaxLength]; + + // Test all inputs from size 0 .. MaxLength (inclusive) to make sure we don't have + // gaps in our Memmove logic. + for (int i = 0; i <= MaxLength; i++) + { + // Arrange + + rng.NextBytes(inputArray); + outputSpan.Clear(); + + // Act + + inputSpan.Slice(0, i).CopyTo(outputSpan); + + // Assert + + Assert.True(inputSpan.Slice(0, i).SequenceEqual(outputSpan.Slice(0, i))); // src successfully copied to dst + Assert.True(outputSpan.Slice(i).SequenceEqual(allZerosSpan.Slice(i))); // no other part of dst was overwritten + } + } } } diff --git a/external/corefx/src/System.Memory/tests/Span/CtorArray.cs b/external/corefx/src/System.Memory/tests/Span/CtorArray.cs index 6105a99748..b2f725c767 100644 --- a/external/corefx/src/System.Memory/tests/Span/CtorArray.cs +++ b/external/corefx/src/System.Memory/tests/Span/CtorArray.cs @@ -71,8 +71,22 @@ namespace System.SpanTests [Fact] public static void CtorArrayNullArray() { - Assert.Throws(() => new Span(null).DontBox()); - Assert.Throws(() => new Span(null, 0, 0).DontBox()); + var span = new Span(null); + span.Validate(); + Assert.True(span == default); + + span = new Span(null, 0, 0); + span.Validate(); + Assert.True(span == default); + } + + [Fact] + public static void CtorArrayNullArrayNonZeroStartAndLength() + { + Assert.Throws(() => new Span(null, 1, 0).DontBox()); + Assert.Throws(() => new Span(null, 0, 1).DontBox()); + Assert.Throws(() => new Span(null, 1, 1).DontBox()); + Assert.Throws(() => new Span(null, -1, -1).DontBox()); } [Fact] diff --git a/external/corefx/src/System.Memory/tests/Span/CtorPointerInt.cs b/external/corefx/src/System.Memory/tests/Span/CtorPointerInt.cs index 9194da2fca..b4c802a347 100644 --- a/external/corefx/src/System.Memory/tests/Span/CtorPointerInt.cs +++ b/external/corefx/src/System.Memory/tests/Span/CtorPointerInt.cs @@ -60,20 +60,8 @@ namespace System.SpanTests new Span((void*)null, 0); new Span((void*)null, 0); AssertExtensions.Throws(null, () => new Span((void*)null, 0).DontBox()); - AssertExtensions.Throws(null, () => new Span((void*)null, 0).DontBox()); + AssertExtensions.Throws(null, () => new Span((void*)null, 0).DontBox()); } } - - private struct StructWithReferences - { - public int I; - public InnerStruct Inner; - } - - private struct InnerStruct - { - public int J; - public object O; - } } } diff --git a/external/corefx/src/System.Memory/tests/Span/EndsWith.char.cs b/external/corefx/src/System.Memory/tests/Span/EndsWith.char.cs new file mode 100644 index 0000000000..b291fa9422 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Span/EndsWith.char.cs @@ -0,0 +1,104 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class SpanTests + { + [Fact] + public static void ZeroLengthEndsWith_Char() + { + var a = new char[3]; + + var span = new Span(a); + var slice = new ReadOnlySpan(a, 2, 0); + bool b = span.EndsWith(slice); + Assert.True(b); + } + + [Fact] + public static void SameSpanEndsWith_Char() + { + char[] a = { '4', '5', '6' }; + var span = new Span(a); + bool b = span.EndsWith(span); + Assert.True(b); + } + + [Fact] + public static void LengthMismatchEndsWith_Char() + { + char[] a = { '4', '5', '6' }; + var span = new Span(a, 0, 2); + var slice = new ReadOnlySpan(a, 0, 3); + bool b = span.EndsWith(slice); + Assert.False(b); + } + + [Fact] + public static void EndsWithMatch_Char() + { + char[] a = { '4', '5', '6' }; + var span = new Span(a, 0, 3); + var slice = new ReadOnlySpan(a, 1, 2); + bool b = span.EndsWith(slice); + Assert.True(b); + } + + [Fact] + public static void EndsWithMatchDifferentSpans_Char() + { + char[] a = { '4', '5', '6' }; + char[] b = { '4', '5', '6' }; + var span = new Span(a, 0, 3); + var slice = new ReadOnlySpan(b, 0, 3); + bool c = span.EndsWith(slice); + Assert.True(c); + } + + [Fact] + public static void EndsWithNoMatch_Char() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new char[length]; + var second = new char[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (char)(i + 1); + } + + second[mismatchIndex] = (char)(second[mismatchIndex] + 1); + + var firstSpan = new Span(first); + var secondSpan = new ReadOnlySpan(second); + bool b = firstSpan.EndsWith(secondSpan); + Assert.False(b); + } + } + } + + [Fact] + public static void MakeSureNoEndsWithChecksGoOutOfRange_Char() + { + for (int length = 0; length < 100; length++) + { + var first = new char[length + 2]; + first[0] = '9'; + first[length + 1] = '9'; + var second = new char[length + 2]; + second[0] = 'a'; + second[length + 1] = 'a'; + var span1 = new Span(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + bool b = span1.EndsWith(span2); + Assert.True(b); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/Span/EndsWith.long.cs b/external/corefx/src/System.Memory/tests/Span/EndsWith.long.cs new file mode 100644 index 0000000000..7145b0d2e6 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Span/EndsWith.long.cs @@ -0,0 +1,104 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class SpanTests + { + [Fact] + public static void ZeroLengthEndsWith_Long() + { + var a = new long[3]; + + var span = new Span(a); + var slice = new ReadOnlySpan(a, 2, 0); + bool b = span.EndsWith(slice); + Assert.True(b); + } + + [Fact] + public static void SameSpanEndsWith_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + var span = new Span(a); + bool b = span.EndsWith(span); + Assert.True(b); + } + + [Fact] + public static void LengthMismatchEndsWith_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + var span = new Span(a, 0, 2); + var slice = new ReadOnlySpan(a, 0, 3); + bool b = span.EndsWith(slice); + Assert.False(b); + } + + [Fact] + public static void EndsWithMatch_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + var span = new Span(a, 0, 3); + var slice = new ReadOnlySpan(a, 1, 2); + bool b = span.EndsWith(slice); + Assert.True(b); + } + + [Fact] + public static void EndsWithMatchDifferentSpans_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + long[] b = { 488238291, 52498989823, 619890289890 }; + var span = new Span(a, 0, 3); + var slice = new ReadOnlySpan(b, 0, 3); + bool c = span.EndsWith(slice); + Assert.True(c); + } + + [Fact] + public static void EndsWithNoMatch_Long() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new long[length]; + var second = new long[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (long)(i + 1); + } + + second[mismatchIndex] = (long)(second[mismatchIndex] + 1); + + var firstSpan = new Span(first); + var secondSpan = new ReadOnlySpan(second); + bool b = firstSpan.EndsWith(secondSpan); + Assert.False(b); + } + } + } + + [Fact] + public static void MakeSureNoEndsWithChecksGoOutOfRange_Long() + { + for (int length = 0; length < 100; length++) + { + var first = new long[length + 2]; + first[0] = 99; + first[length + 1] = 99; + var second = new long[length + 2]; + second[0] = 100; + second[length + 1] = 100; + var span1 = new Span(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + bool b = span1.EndsWith(span2); + Assert.True(b); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/Span/GetPinnableReference.cs b/external/corefx/src/System.Memory/tests/Span/GetPinnableReference.cs new file mode 100644 index 0000000000..8fc959ba61 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Span/GetPinnableReference.cs @@ -0,0 +1,86 @@ +// 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.Runtime.CompilerServices; +using Xunit; + +namespace System.SpanTests +{ + public static partial class SpanTests + { + [Fact] + public static void GetPinnableReferenceArray() + { + int[] a = { 91, 92, 93, 94, 95 }; + Span span = new Span(a, 1, 3); + ref int pinnableReference = ref span.GetPinnableReference(); + Assert.True(Unsafe.AreSame(ref a[1], ref pinnableReference)); + } + + // Enable this test once we use C# 7.3 (https://github.com/dotnet/corefx/issues/29084) + //[Fact] + //public static unsafe void UsingSpanInFixed() + //{ + // byte[] a = { 91, 92, 93, 94, 95 }; + // Span span = a; + // fixed (byte* ptr = span) + // { + // for (int i = 0; i < span.Length; i++) + // { + // Assert.Equal(a[i], ptr[i]); + // } + // } + //} + // + //[Fact] + //public static unsafe void UsingEmptySpanInFixed() + //{ + // Span span = Span.Empty; + // fixed (int* ptr = span) + // { + // Assert.True(ptr == null); + // } + + // Span spanFromEmptyArray = Array.Empty(); + // fixed (int* ptr = spanFromEmptyArray) + // { + // Assert.True(ptr == null); + // } + //} + + [Fact] + public static unsafe void GetPinnableReferenceArrayPastEnd() + { + // The only real difference between GetPinnableReference() and "ref span[0]" is that + // GetPinnableReference() of a zero-length won't throw an IndexOutOfRange but instead return a null ref. + + int[] a = { 91, 92, 93, 94, 95 }; + Span span = new Span(a, a.Length, 0); + ref int pinnableReference = ref span.GetPinnableReference(); + ref int expected = ref Unsafe.AsRef(null); + Assert.True(Unsafe.AreSame(ref expected, ref pinnableReference)); + } + + [Fact] + public static unsafe void GetPinnableReferencePointer() + { + int i = 42; + Span span = new Span(&i, 1); + ref int pinnableReference = ref span.GetPinnableReference(); + Assert.True(Unsafe.AreSame(ref i, ref pinnableReference)); + } + + [Fact] + public static unsafe void GetPinnableReferenceEmpty() + { + Span span = Span.Empty; + ref int pinnableReference = ref span.GetPinnableReference(); + Assert.True(Unsafe.AreSame(ref Unsafe.AsRef(null), ref pinnableReference)); + + span = Array.Empty(); + pinnableReference = ref span.GetPinnableReference(); + Assert.True(Unsafe.AreSame(ref Unsafe.AsRef(null), ref pinnableReference)); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/Span/IndexOf.byte.cs b/external/corefx/src/System.Memory/tests/Span/IndexOf.byte.cs index 7bdad8d391..03f92fef2f 100644 --- a/external/corefx/src/System.Memory/tests/Span/IndexOf.byte.cs +++ b/external/corefx/src/System.Memory/tests/Span/IndexOf.byte.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Numerics; -using System.Text; using Xunit; namespace System.SpanTests diff --git a/external/corefx/src/System.Memory/tests/Span/IndexOfAny.byte.cs b/external/corefx/src/System.Memory/tests/Span/IndexOfAny.byte.cs index 61b1da24d5..d87c526294 100644 --- a/external/corefx/src/System.Memory/tests/Span/IndexOfAny.byte.cs +++ b/external/corefx/src/System.Memory/tests/Span/IndexOfAny.byte.cs @@ -2,7 +2,6 @@ // 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.Numerics; using System.Text; using Xunit; diff --git a/external/corefx/src/System.Memory/tests/Span/Overlaps.cs b/external/corefx/src/System.Memory/tests/Span/Overlaps.cs new file mode 100644 index 0000000000..ce85c95c82 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Span/Overlaps.cs @@ -0,0 +1,991 @@ +// 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.Runtime.InteropServices; +using Xunit; + +namespace System.SpanTests +{ + public static partial class SpanTests + { + private static void DoubleEachElementForwards(Span source, Span destination) + { + if (source.Length != destination.Length) + throw new ArgumentException(); + + // This loop below moves forwards, so if there is an overlap and destination starts + // after source then the loop will overwrite unread data without making a copy first. + + if (source.Overlaps(destination, out int elementOffset) && elementOffset > 0) + source = source.ToArray(); + + for (int i = 0; i < source.Length; i++) + destination[i] = 2 * source[i]; + } + + [Fact] + public static void TestAlignedForwards() + { + for (int i = 0; i < 14; i++) + { + int[] a = new int[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 }; + + Span source = a.AsSpan(7, 5); + + Span expected = new int[a.Length].AsSpan(i, 5); + Span actual = a.AsSpan(i, 5); + + DoubleEachElementForwards(source, expected); + DoubleEachElementForwards(source, actual); + + Assert.Equal(expected.ToArray(), actual.ToArray()); + } + } + + [Fact] + public static void TestUnalignedForwards() + { + Assert.Throws(() => + { + int[] a = new int[] { 1, 2, 3, 4, 5, 6 }; + + Span bytes = MemoryMarshal.AsBytes(a.AsSpan()); + Span source = MemoryMarshal.Cast(bytes.Slice(2, 5 * sizeof(int))); + + Span actual = a.AsSpan(0, 5); + + DoubleEachElementForwards(source, actual); + }); + + Assert.Throws(() => + { + int[] a = new int[] { 1, 2, 3, 4, 5, 6 }; + + Span bytes = MemoryMarshal.AsBytes(a.AsSpan()); + Span source = MemoryMarshal.Cast(bytes.Slice(2, 5 * sizeof(int))); + + Span actual = a.AsSpan(1, 5); + + DoubleEachElementForwards(source, actual); + }); + } + + private static void DoubleEachElementBackwards(Span source, Span destination) + { + if (source.Length != destination.Length) + throw new ArgumentException(); + + // This loop below moves backwards, so if there is an overlap and destination starts + // before source then the loop will overwrite unread data without making a copy first. + + if (source.Overlaps(destination, out int elementOffset) && elementOffset < 0) + source = source.ToArray(); + + for (int i = source.Length - 1; i >= 0; i--) + destination[i] = 2 * source[i]; + } + + [Fact] + public static void TestAlignedBackwards() + { + for (int i = 0; i < 14; i++) + { + int[] a = new int[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 }; + + Span source = a.AsSpan(7, 5); + + Span expected = new int[a.Length].AsSpan(i, 5); + Span actual = a.AsSpan(i, 5); + + DoubleEachElementBackwards(source, expected); + DoubleEachElementBackwards(source, actual); + + Assert.Equal(expected.ToArray(), actual.ToArray()); + } + } + + [Fact] + public static void TestUnalignedBackwards() + { + Assert.Throws(() => + { + int[] a = new int[] { 1, 2, 3, 4, 5, 6 }; + + Span bytes = MemoryMarshal.AsBytes(a.AsSpan()); + Span source = MemoryMarshal.Cast(bytes.Slice(2, 5 * sizeof(int))); + + Span actual = a.AsSpan(0, 5); + + DoubleEachElementBackwards(source, actual); + }); + + Assert.Throws(() => + { + int[] a = new int[] { 1, 2, 3, 4, 5, 6 }; + + Span bytes = MemoryMarshal.AsBytes(a.AsSpan()); + Span source = MemoryMarshal.Cast(bytes.Slice(2, 5 * sizeof(int))); + + Span actual = a.AsSpan(1, 5); + + DoubleEachElementBackwards(source, actual); + }); + } + + [Fact] + public static void SizeOf1Overlaps() + { + byte[] a = new byte[16]; + + Assert.True(a.AsSpan(0, 12).Overlaps(a.AsSpan(8, 8), out int elementOffset)); + Assert.Equal(8, elementOffset); + } + + [Fact] + public static void SizeOf16Overlaps() + { + Guid[] a = new Guid[16]; + + Assert.True(a.AsSpan(0, 12).Overlaps(a.AsSpan(8, 8), out int elementOffset)); + Assert.Equal(8, elementOffset); + } + + // + // The following tests were all generated with this (otherwise unused) method: + // + private static string GenerateOverlapsTests() + { + const int count = 4; + string result = ""; + + for (int x1 = 0; x1 < count; x1++) + { + for (int x2 = x1; x2 < count; x2++) + { + for (int y1 = 0; y1 < count; y1++) + { + for (int y2 = y1; y2 < count; y2++) + { + bool expected = (x1 < x2) && (y1 < y2) && (x1 < y2) && (y1 < x2); + + result += $"[InlineData({x1 * 100}, {x2 * 100}, {y1 * 100}, {y2 * 100}, {(expected ? "true" : "false")})]\r\n"; + } + } + } + } + + return result; + } + + // + // 0 + // first: | + // second: | + // 0 + // + [InlineData(0, 0, 0, 0, false)] + + // + // 0 + // first: | + // second: [---------) + // 0 100 + // + [InlineData(0, 0, 0, 100, false)] + + // + // 0 + // first: | + // second: [-------------------) + // 0 200 + // + [InlineData(0, 0, 0, 200, false)] + + // + // 0 + // first: | + // second: [-----------------------------) + // 0 300 + // + [InlineData(0, 0, 0, 300, false)] + + // + // 0 + // first: | + // second: | + // 100 + // + [InlineData(0, 0, 100, 100, false)] + + // + // 0 + // first: | + // second: [---------) + // 100 200 + // + [InlineData(0, 0, 100, 200, false)] + + // + // 0 + // first: | + // second: [-------------------) + // 100 300 + // + [InlineData(0, 0, 100, 300, false)] + + // + // 0 + // first: | + // second: | + // 200 + // + [InlineData(0, 0, 200, 200, false)] + + // + // 0 + // first: | + // second: [---------) + // 200 300 + // + [InlineData(0, 0, 200, 300, false)] + + // + // 0 + // first: | + // second: | + // 300 + // + [InlineData(0, 0, 300, 300, false)] + + // + // 0 100 + // first: [---------) + // second: | + // 0 + // + [InlineData(0, 100, 0, 0, false)] + + // + // 0 100 + // first: [---------) + // second: [---------) + // 0 100 + // + [InlineData(0, 100, 0, 100, true)] + + // + // 0 100 + // first: [---------) + // second: [-------------------) + // 0 200 + // + [InlineData(0, 100, 0, 200, true)] + + // + // 0 100 + // first: [---------) + // second: [-----------------------------) + // 0 300 + // + [InlineData(0, 100, 0, 300, true)] + + // + // 0 100 + // first: [---------) + // second: | + // 100 + // + [InlineData(0, 100, 100, 100, false)] + + // + // 0 100 + // first: [---------) + // second: [---------) + // 100 200 + // + [InlineData(0, 100, 100, 200, false)] + + // + // 0 100 + // first: [---------) + // second: [-------------------) + // 100 300 + // + [InlineData(0, 100, 100, 300, false)] + + // + // 0 100 + // first: [---------) + // second: | + // 200 + // + [InlineData(0, 100, 200, 200, false)] + + // + // 0 100 + // first: [---------) + // second: [---------) + // 200 300 + // + [InlineData(0, 100, 200, 300, false)] + + // + // 0 100 + // first: [---------) + // second: | + // 300 + // + [InlineData(0, 100, 300, 300, false)] + + // + // 0 200 + // first: [-------------------) + // second: | + // 0 + // + [InlineData(0, 200, 0, 0, false)] + + // + // 0 200 + // first: [-------------------) + // second: [---------) + // 0 100 + // + [InlineData(0, 200, 0, 100, true)] + + // + // 0 200 + // first: [-------------------) + // second: [-------------------) + // 0 200 + // + [InlineData(0, 200, 0, 200, true)] + + // + // 0 200 + // first: [-------------------) + // second: [-----------------------------) + // 0 300 + // + [InlineData(0, 200, 0, 300, true)] + + // + // 0 200 + // first: [-------------------) + // second: | + // 100 + // + [InlineData(0, 200, 100, 100, false)] + + // + // 0 200 + // first: [-------------------) + // second: [---------) + // 100 200 + // + [InlineData(0, 200, 100, 200, true)] + + // + // 0 200 + // first: [-------------------) + // second: [-------------------) + // 100 300 + // + [InlineData(0, 200, 100, 300, true)] + + // + // 0 200 + // first: [-------------------) + // second: | + // 200 + // + [InlineData(0, 200, 200, 200, false)] + + // + // 0 200 + // first: [-------------------) + // second: [---------) + // 200 300 + // + [InlineData(0, 200, 200, 300, false)] + + // + // 0 200 + // first: [-------------------) + // second: | + // 300 + // + [InlineData(0, 200, 300, 300, false)] + + // + // 0 300 + // first: [-----------------------------) + // second: | + // 0 + // + [InlineData(0, 300, 0, 0, false)] + + // + // 0 300 + // first: [-----------------------------) + // second: [---------) + // 0 100 + // + [InlineData(0, 300, 0, 100, true)] + + // + // 0 300 + // first: [-----------------------------) + // second: [-------------------) + // 0 200 + // + [InlineData(0, 300, 0, 200, true)] + + // + // 0 300 + // first: [-----------------------------) + // second: [-----------------------------) + // 0 300 + // + [InlineData(0, 300, 0, 300, true)] + + // + // 0 300 + // first: [-----------------------------) + // second: | + // 100 + // + [InlineData(0, 300, 100, 100, false)] + + // + // 0 300 + // first: [-----------------------------) + // second: [---------) + // 100 200 + // + [InlineData(0, 300, 100, 200, true)] + + // + // 0 300 + // first: [-----------------------------) + // second: [-------------------) + // 100 300 + // + [InlineData(0, 300, 100, 300, true)] + + // + // 0 300 + // first: [-----------------------------) + // second: | + // 200 + // + [InlineData(0, 300, 200, 200, false)] + + // + // 0 300 + // first: [-----------------------------) + // second: [---------) + // 200 300 + // + [InlineData(0, 300, 200, 300, true)] + + // + // 0 300 + // first: [-----------------------------) + // second: | + // 300 + // + [InlineData(0, 300, 300, 300, false)] + + // + // 100 + // first: | + // second: | + // 0 + // + [InlineData(100, 100, 0, 0, false)] + + // + // 100 + // first: | + // second: [---------) + // 0 100 + // + [InlineData(100, 100, 0, 100, false)] + + // + // 100 + // first: | + // second: [-------------------) + // 0 200 + // + [InlineData(100, 100, 0, 200, false)] + + // + // 100 + // first: | + // second: [-----------------------------) + // 0 300 + // + [InlineData(100, 100, 0, 300, false)] + + // + // 100 + // first: | + // second: | + // 100 + // + [InlineData(100, 100, 100, 100, false)] + + // + // 100 + // first: | + // second: [---------) + // 100 200 + // + [InlineData(100, 100, 100, 200, false)] + + // + // 100 + // first: | + // second: [-------------------) + // 100 300 + // + [InlineData(100, 100, 100, 300, false)] + + // + // 100 + // first: | + // second: | + // 200 + // + [InlineData(100, 100, 200, 200, false)] + + // + // 100 + // first: | + // second: [---------) + // 200 300 + // + [InlineData(100, 100, 200, 300, false)] + + // + // 100 + // first: | + // second: | + // 300 + // + [InlineData(100, 100, 300, 300, false)] + + // + // 100 200 + // first: [---------) + // second: | + // 0 + // + [InlineData(100, 200, 0, 0, false)] + + // + // 100 200 + // first: [---------) + // second: [---------) + // 0 100 + // + [InlineData(100, 200, 0, 100, false)] + + // + // 100 200 + // first: [---------) + // second: [-------------------) + // 0 200 + // + [InlineData(100, 200, 0, 200, true)] + + // + // 100 200 + // first: [---------) + // second: [-----------------------------) + // 0 300 + // + [InlineData(100, 200, 0, 300, true)] + + // + // 100 200 + // first: [---------) + // second: | + // 100 + // + [InlineData(100, 200, 100, 100, false)] + + // + // 100 200 + // first: [---------) + // second: [---------) + // 100 200 + // + [InlineData(100, 200, 100, 200, true)] + + // + // 100 200 + // first: [---------) + // second: [-------------------) + // 100 300 + // + [InlineData(100, 200, 100, 300, true)] + + // + // 100 200 + // first: [---------) + // second: | + // 200 + // + [InlineData(100, 200, 200, 200, false)] + + // + // 100 200 + // first: [---------) + // second: [---------) + // 200 300 + // + [InlineData(100, 200, 200, 300, false)] + + // + // 100 200 + // first: [---------) + // second: | + // 300 + // + [InlineData(100, 200, 300, 300, false)] + + // + // 100 300 + // first: [-------------------) + // second: | + // 0 + // + [InlineData(100, 300, 0, 0, false)] + + // + // 100 300 + // first: [-------------------) + // second: [---------) + // 0 100 + // + [InlineData(100, 300, 0, 100, false)] + + // + // 100 300 + // first: [-------------------) + // second: [-------------------) + // 0 200 + // + [InlineData(100, 300, 0, 200, true)] + + // + // 100 300 + // first: [-------------------) + // second: [-----------------------------) + // 0 300 + // + [InlineData(100, 300, 0, 300, true)] + + // + // 100 300 + // first: [-------------------) + // second: | + // 100 + // + [InlineData(100, 300, 100, 100, false)] + + // + // 100 300 + // first: [-------------------) + // second: [---------) + // 100 200 + // + [InlineData(100, 300, 100, 200, true)] + + // + // 100 300 + // first: [-------------------) + // second: [-------------------) + // 100 300 + // + [InlineData(100, 300, 100, 300, true)] + + // + // 100 300 + // first: [-------------------) + // second: | + // 200 + // + [InlineData(100, 300, 200, 200, false)] + + // + // 100 300 + // first: [-------------------) + // second: [---------) + // 200 300 + // + [InlineData(100, 300, 200, 300, true)] + + // + // 100 300 + // first: [-------------------) + // second: | + // 300 + // + [InlineData(100, 300, 300, 300, false)] + + // + // 200 + // first: | + // second: | + // 0 + // + [InlineData(200, 200, 0, 0, false)] + + // + // 200 + // first: | + // second: [---------) + // 0 100 + // + [InlineData(200, 200, 0, 100, false)] + + // + // 200 + // first: | + // second: [-------------------) + // 0 200 + // + [InlineData(200, 200, 0, 200, false)] + + // + // 200 + // first: | + // second: [-----------------------------) + // 0 300 + // + [InlineData(200, 200, 0, 300, false)] + + // + // 200 + // first: | + // second: | + // 100 + // + [InlineData(200, 200, 100, 100, false)] + + // + // 200 + // first: | + // second: [---------) + // 100 200 + // + [InlineData(200, 200, 100, 200, false)] + + // + // 200 + // first: | + // second: [-------------------) + // 100 300 + // + [InlineData(200, 200, 100, 300, false)] + + // + // 200 + // first: | + // second: | + // 200 + // + [InlineData(200, 200, 200, 200, false)] + + // + // 200 + // first: | + // second: [---------) + // 200 300 + // + [InlineData(200, 200, 200, 300, false)] + + // + // 200 + // first: | + // second: | + // 300 + // + [InlineData(200, 200, 300, 300, false)] + + // + // 200 300 + // first: [---------) + // second: | + // 0 + // + [InlineData(200, 300, 0, 0, false)] + + // + // 200 300 + // first: [---------) + // second: [---------) + // 0 100 + // + [InlineData(200, 300, 0, 100, false)] + + // + // 200 300 + // first: [---------) + // second: [-------------------) + // 0 200 + // + [InlineData(200, 300, 0, 200, false)] + + // + // 200 300 + // first: [---------) + // second: [-----------------------------) + // 0 300 + // + [InlineData(200, 300, 0, 300, true)] + + // + // 200 300 + // first: [---------) + // second: | + // 100 + // + [InlineData(200, 300, 100, 100, false)] + + // + // 200 300 + // first: [---------) + // second: [---------) + // 100 200 + // + [InlineData(200, 300, 100, 200, false)] + + // + // 200 300 + // first: [---------) + // second: [-------------------) + // 100 300 + // + [InlineData(200, 300, 100, 300, true)] + + // + // 200 300 + // first: [---------) + // second: | + // 200 + // + [InlineData(200, 300, 200, 200, false)] + + // + // 200 300 + // first: [---------) + // second: [---------) + // 200 300 + // + [InlineData(200, 300, 200, 300, true)] + + // + // 200 300 + // first: [---------) + // second: | + // 300 + // + [InlineData(200, 300, 300, 300, false)] + + // + // 300 + // first: | + // second: | + // 0 + // + [InlineData(300, 300, 0, 0, false)] + + // + // 300 + // first: | + // second: [---------) + // 0 100 + // + [InlineData(300, 300, 0, 100, false)] + + // + // 300 + // first: | + // second: [-------------------) + // 0 200 + // + [InlineData(300, 300, 0, 200, false)] + + // + // 300 + // first: | + // second: [-----------------------------) + // 0 300 + // + [InlineData(300, 300, 0, 300, false)] + + // + // 300 + // first: | + // second: | + // 100 + // + [InlineData(300, 300, 100, 100, false)] + + // + // 300 + // first: | + // second: [---------) + // 100 200 + // + [InlineData(300, 300, 100, 200, false)] + + // + // 300 + // first: | + // second: [-------------------) + // 100 300 + // + [InlineData(300, 300, 100, 300, false)] + + // + // 300 + // first: | + // second: | + // 200 + // + [InlineData(300, 300, 200, 200, false)] + + // + // 300 + // first: | + // second: [---------) + // 200 300 + // + [InlineData(300, 300, 200, 300, false)] + + // + // 300 + // first: | + // second: | + // 300 + // + [InlineData(300, 300, 300, 300, false)] + + [Theory] + public static void Overlap(int x1, int y1, int x2, int y2, bool expected) + { + Span a = new int[300]; + + Assert.Equal(expected, a.Slice(x1, y1 - x1).Overlaps(a.Slice(x2, y2 - x2))); + Assert.Equal(expected, a.Slice(x1, y1 - x1).Overlaps(a.Slice(x2, y2 - x2), out int elementOffset)); + Assert.Equal(expected ? x2 - x1 : 0, elementOffset); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/Span/Reflection.cs b/external/corefx/src/System.Memory/tests/Span/Reflection.cs new file mode 100644 index 0000000000..652e0f161e --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Span/Reflection.cs @@ -0,0 +1,186 @@ +// 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 Xunit; +using System.Buffers; +using System.Buffers.Binary; +using System.Reflection; +using System.Runtime.InteropServices; +using System.MemoryTests; + +namespace System.SpanTests +{ + public static partial class SpanTests + { + // Calling Span APIs via Reflection is not supported yet. + // These tests check that using reflection results in graceful failures. See https://github.com/dotnet/coreclr/issues/17296 + // These tests are only relevant for fast span. + + [Fact] + public static void MemoryExtensions_StaticReturningReadOnlySpan() + { + Type type = typeof(MemoryExtensions); + + MethodInfo method = type.GetMethod(nameof(MemoryExtensions.AsSpan), new Type[] { typeof(string) }); + Assert.Throws(() => method.Invoke(null, new object[] { "Hello" })); + + method = type.GetMethod(nameof(MemoryExtensions.AsSpan), new Type[] { typeof(string), typeof(int), typeof(int) }); + Assert.Throws(() => method.Invoke(null, new object[] { "Hello", 1, 1 })); + } + + [Fact] + public static void MemoryExtensions_StaticWithSpanArguments() + { + Type type = typeof(MemoryExtensions); + + MethodInfo method = type.GetMethod(nameof(MemoryExtensions.CompareTo)); + + int result = (int)method.Invoke(null, new object[] { default, default, StringComparison.Ordinal }); + Assert.Equal(0, result); + } + + [Fact] + public static void BinaryPrimitives_StaticWithSpanArgument() + { + Type type = typeof(BinaryPrimitives); + + MethodInfo method = type.GetMethod(nameof(BinaryPrimitives.ReadInt16LittleEndian)); + Assert.Throws(() => method.Invoke(null, new object[] { default })); + + method = type.GetMethod(nameof(BinaryPrimitives.TryReadInt16LittleEndian)); + bool result = (bool)method.Invoke(null, new object[] { default, null }); + Assert.False(result); + } + + [Fact] + public static void MemoryMarshal_GenericStaticReturningSpan() + { + Type type = typeof(MemoryMarshal); + + int value = 0; + ref int refInt = ref value; + + MethodInfo method = type.GetMethod(nameof(MemoryMarshal.CreateSpan)).MakeGenericMethod((refInt.GetType())); + Assert.Throws(() => method.Invoke(null, new object[] { null, 0 })); + } + + [Fact] + public static void Span_Constructor() + { + Type type = typeof(Span); + + ConstructorInfo ctor = type.GetConstructor(new Type[] { typeof(int[]) }); + Assert.Throws(() => ctor.Invoke(new object[] { new int[10] })); + + ctor = type.GetConstructor(new Type[] { typeof(int[]), typeof(int), typeof(int) }); + Assert.Throws(() => ctor.Invoke(new object[] { new int[10], 1, 1 })); + + ctor = type.GetConstructor(new Type[] { typeof(void*), typeof(int) }); + Assert.Throws(() => ctor.Invoke(new object[] { null, 1 })); + } + + [Fact] + public static void Span_Property() + { + Type type = typeof(Span); + + PropertyInfo property = type.GetProperty(nameof(Span.Empty)); + Assert.Throws(() => property.GetValue(default)); + } + + [Fact] + public static void Span_StaticOperator() + { + Type type = typeof(Span); + + MethodInfo method = type.GetMethod("op_Equality"); + Assert.Throws(() => method.Invoke(null, new object[] { default, default })); + + method = type.GetMethod("op_Inequality"); + Assert.Throws(() => method.Invoke(null, new object[] { default, default })); + } + + [Fact] + public static void Span_InstanceMethod() + { + Type type = typeof(Span); + + MethodInfo method = type.GetMethod(nameof(Span.CopyTo), new Type[] { typeof(Span) }); + Assert.Throws(() => method.Invoke(default, new object[] { default })); + } + + [Fact] + public static void ReadOnlySpan_Constructor() + { + Type type = typeof(ReadOnlySpan); + + ConstructorInfo ctor = type.GetConstructor(new Type[] { typeof(int[]) }); + Assert.Throws(() => ctor.Invoke(new object[] { new int[10] })); + + ctor = type.GetConstructor(new Type[] { typeof(int[]), typeof(int), typeof(int) }); + Assert.Throws(() => ctor.Invoke(new object[] { new int[10], 1, 1 })); + + ctor = type.GetConstructor(new Type[] { typeof(void*), typeof(int) }); + Assert.Throws(() => ctor.Invoke(new object[] { null, 1 })); + } + + [Fact] + public static void ReadOnlySpan_Property() + { + Type type = typeof(ReadOnlySpan); + + PropertyInfo property = type.GetProperty(nameof(ReadOnlySpan.Empty)); + Assert.Throws(() => property.GetValue(default)); + } + + [Fact] + public static void ReadOnlySpan_Operator() + { + Type type = typeof(ReadOnlySpan); + + MethodInfo method = type.GetMethod("op_Equality"); + Assert.Throws(() => method.Invoke(null, new object[] { default, default })); + + method = type.GetMethod("op_Inequality"); + Assert.Throws(() => method.Invoke(null, new object[] { default, default })); + } + + [Fact] + public static void ReadOnlySpan_InstanceMethod() + { + Type type = typeof(ReadOnlySpan); + + MethodInfo method = type.GetMethod(nameof(ReadOnlySpan.CopyTo), new Type[] { typeof(Span) }); + Assert.Throws(() => method.Invoke(default, new object[] { default })); + } + + [Fact] + public static void Memory_PropertyReturningSpan() + { + Type type = typeof(Memory); + + PropertyInfo property = type.GetProperty(nameof(Memory.Span)); + Assert.Throws(() => property.GetValue(null)); + } + + [Fact] + public static void ReadOnlyMemory_PropertyReturningReadOnlySpan() + { + Type type = typeof(ReadOnlyMemory); + + PropertyInfo property = type.GetProperty(nameof(ReadOnlyMemory.Span)); + Assert.Throws(() => property.GetValue(null)); + } + + [Fact] + public static void MemoryManager_MethodReturningSpan() + { + Type type = typeof(MemoryManager); + + MemoryManager manager = new CustomMemoryForTest(new int[10]); + MethodInfo method = type.GetMethod(nameof(MemoryManager.GetSpan), BindingFlags.Public | BindingFlags.Instance); + Assert.Throws(() => method.Invoke(manager, null)); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/Span/Reverse.cs b/external/corefx/src/System.Memory/tests/Span/Reverse.cs index 7123f0869d..a0d51a5c08 100644 --- a/external/corefx/src/System.Memory/tests/Span/Reverse.cs +++ b/external/corefx/src/System.Memory/tests/Span/Reverse.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Xunit; -using System.Runtime.CompilerServices; using static System.TestHelpers; namespace System.SpanTests @@ -21,7 +20,7 @@ namespace System.SpanTests span = actual; span.Slice(2, 0).Reverse(); - + Assert.Equal(expected, span.ToArray()); } @@ -43,7 +42,7 @@ namespace System.SpanTests [Fact] public static void ReverseByte() { - for(int length = 0; length < byte.MaxValue; length++) + for (int length = 0; length < byte.MaxValue; length++) { var actual = new byte[length]; for (int i = 0; i < length; i++) @@ -110,7 +109,7 @@ namespace System.SpanTests IntPtr[] expectedFull = new IntPtr[length]; Array.Copy(actualFull, expectedFull, length); Array.Reverse(expectedFull, offset, length - offset); - + var expectedSpan = new Span(expectedFull, offset, length - offset); var actualSpan = new Span(actualFull, offset, length - offset); actualSpan.Reverse(); diff --git a/external/corefx/src/System.Memory/tests/Span/SequenceCompareTo.T.cs b/external/corefx/src/System.Memory/tests/Span/SequenceCompareTo.T.cs index 493b4e2e2f..ed8d66e10e 100644 --- a/external/corefx/src/System.Memory/tests/Span/SequenceCompareTo.T.cs +++ b/external/corefx/src/System.Memory/tests/Span/SequenceCompareTo.T.cs @@ -8,48 +8,6 @@ namespace System.SpanTests { public static partial class SpanTests { - [Fact] - public static void ZeroLengthSequenceCompareTo() - { - int[] a = new int[3]; - - Span first = new Span(a, 1, 0); - Span second = new Span(a, 2, 0); - int result = first.SequenceCompareTo(second); - Assert.Equal(0, result); - } - - [Fact] - public static void SameSpanSequenceCompareTo() - { - int[] a = { 4, 5, 6 }; - Span span = new Span(a); - int result = span.SequenceCompareTo(span); - Assert.Equal(0, result); - } - - [Fact] - public static void LengthMismatchSequenceCompareTo() - { - int[] a = { 4, 5, 6 }; - Span first = new Span(a, 0, 2); - Span second = new Span(a, 0, 3); - int result = first.SequenceCompareTo(second); - Assert.True(result < 0); - - result = second.SequenceCompareTo(first); - Assert.True(result > 0); - - // one sequence is empty - first = new Span(a, 1, 0); - - result = first.SequenceCompareTo(second); - Assert.True(result < 0); - - result = second.SequenceCompareTo(first); - Assert.True(result > 0); - } - [Fact] public static void OnSequenceCompareToOfEqualSpansMakeSureEveryElementIsCompared() { @@ -173,5 +131,143 @@ namespace System.SpanTests Assert.Equal(0, result); } } + + [Fact] + public static void ZeroLengthSequenceCompareTo_String() + { + var a = new string[3]; + + var first = new Span(a, 1, 0); + var second = new Span(a, 2, 0); + int result = first.SequenceCompareTo(second); + Assert.Equal(0, result); + } + + [Fact] + public static void SameSpanSequenceCompareTo_String() + { + string[] a = { "fourth", "fifth", "sixth" }; + var span = new Span(a); + int result = span.SequenceCompareTo(span); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArrayImplicit_String() + { + string[] a = { "fourth", "fifth", "sixth" }; + var first = new Span(a, 0, 3); + int result = first.SequenceCompareTo(a); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArraySegmentImplicit_String() + { + string[] src = { "first", "second", "third" }; + string[] dst = { "fifth", "first", "second", "third", "tenth" }; + var segment = new ArraySegment(dst, 1, 3); + + var first = new Span(src, 0, 3); + int result = first.SequenceCompareTo(segment); + Assert.Equal(0, result); + } + + [Fact] + public static void LengthMismatchSequenceCompareTo_String() + { + string[] a = { "fourth", "fifth", "sixth" }; + var first = new Span(a, 0, 2); + var second = new Span(a, 0, 3); + int result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + + // one sequence is empty + first = new Span(a, 1, 0); + + result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + } + + [Fact] + public static void SequenceCompareToWithSingleMismatch_String() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new string[length]; + var second = new string[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = $"item {i + 1}"; + } + + second[mismatchIndex] = (string)(second[mismatchIndex] + 1); + + var firstSpan = new Span(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result > 0); + } + } + } + + [Fact] + public static void SequenceCompareToNoMatch_string() + { + for (int length = 1; length < 32; length++) + { + var first = new string[length]; + var second = new string[length]; + + for (int i = 0; i < length; i++) + { + first[i] = $"item {i + 1}"; + second[i] = $"item {int.MaxValue - i}"; + } + + var firstSpan = new Span(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result > 0); + } + } + + [Fact] + public static void MakeSureNoSequenceCompareToChecksGoOutOfRange_string() + { + for (int length = 0; length < 100; length++) + { + var first = new string[length + 2]; + first[0] = "99"; + for (int k = 1; k <= length; k++) + first[k] = string.Empty; + first[length + 1] = "99"; + + var second = new string[length + 2]; + second[0] = "100"; + for (int k = 1; k <= length; k++) + second[k] = string.Empty; + second[length + 1] = "100"; + + var span1 = new Span(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + int result = span1.SequenceCompareTo(span2); + Assert.Equal(0, result); + } + } } } diff --git a/external/corefx/src/System.Memory/tests/Span/SequenceCompareTo.bool.cs b/external/corefx/src/System.Memory/tests/Span/SequenceCompareTo.bool.cs new file mode 100644 index 0000000000..01f8ee2f7d --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Span/SequenceCompareTo.bool.cs @@ -0,0 +1,149 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class SpanTests + { + [Fact] + public static void ZeroLengthSequenceCompareTo_Bool() + { + var a = new bool[3]; + + var first = new Span(a, 1, 0); + var second = new ReadOnlySpan(a, 2, 0); + int result = first.SequenceCompareTo(second); + Assert.Equal(0, result); + } + + [Fact] + public static void SameSpanSequenceCompareTo_Bool() + { + bool[] a = { true, true, false }; + var span = new Span(a); + int result = span.SequenceCompareTo(span); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArrayImplicit_Bool() + { + bool[] a = { true, true, false }; + var first = new Span(a, 0, 3); + int result = first.SequenceCompareTo(a); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArraySegmentImplicit_Bool() + { + bool[] src = { true, true, true}; + bool[] dst = { false, true, true, true, false }; + var segment = new ArraySegment(dst, 1, 3); + + var first = new Span(src, 0, 3); + int result = first.SequenceCompareTo(segment); + Assert.Equal(0, result); + } + + [Fact] + public static void LengthMismatchSequenceCompareTo_Bool() + { + bool[] a = { true, true, false }; + var first = new Span(a, 0, 2); + var second = new Span(a, 0, 3); + int result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + + // one sequence is empty + first = new Span(a, 1, 0); + + result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + } + + [Fact] + public static void SequenceCompareToWithSingleMismatch_Bool() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new bool[length]; + var second = new bool[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = true; + } + + second[mismatchIndex] = !second[mismatchIndex]; + + var firstSpan = new Span(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result > 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result < 0); + } + } + } + + [Fact] + public static void SequenceCompareToNoMatch_Bool() + { + for (int length = 1; length < 32; length++) + { + var first = new bool[length]; + var second = new bool[length]; + + for (int i = 0; i < length; i++) + { + first[i] = (i % 2 != 0); + second[i] = (i % 2 == 0); + } + + var firstSpan = new Span(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result > 0); + } + } + + [Fact] + public static void MakeSureNoSequenceCompareToChecksGoOutOfRange_Bool() + { + for (int length = 0; length < 100; length++) + { + var first = new bool[length + 2]; + first[0] = true; + for (int k = 1; k <= length; k++) + first[k] = false; + first[length + 1] = true; + + var second = new bool[length + 2]; + second[0] = false; + for (int k = 1; k <= length; k++) + second[k] = false; + second[length + 1] = false; + + var span1 = new Span(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + int result = span1.SequenceCompareTo(span2); + Assert.Equal(0, result); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/Span/SequenceCompareTo.byte.cs b/external/corefx/src/System.Memory/tests/Span/SequenceCompareTo.byte.cs index 4eab6a68ef..73f3728fa1 100644 --- a/external/corefx/src/System.Memory/tests/Span/SequenceCompareTo.byte.cs +++ b/external/corefx/src/System.Memory/tests/Span/SequenceCompareTo.byte.cs @@ -105,7 +105,7 @@ namespace System.SpanTests { byte[] first = new byte[length]; byte[] second = new byte[length]; - + for (int i = 0; i < length; i++) { first[i] = (byte)(i + 1); diff --git a/external/corefx/src/System.Memory/tests/Span/SequenceCompareTo.char.cs b/external/corefx/src/System.Memory/tests/Span/SequenceCompareTo.char.cs new file mode 100644 index 0000000000..c45d0eb9c9 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Span/SequenceCompareTo.char.cs @@ -0,0 +1,145 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class SpanTests + { + [Fact] + public static void ZeroLengthSequenceCompareTo_Char() + { + var a = new char[3]; + + var first = new Span(a, 1, 0); + var second = new ReadOnlySpan(a, 2, 0); + int result = first.SequenceCompareTo(second); + Assert.Equal(0, result); + } + + [Fact] + public static void SameSpanSequenceCompareTo_Char() + { + char[] a = { '4', '5', '6' }; + var span = new Span(a); + int result = span.SequenceCompareTo(span); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArrayImplicit_Char() + { + char[] a = { '4', '5', '6' }; + var first = new Span(a, 0, 3); + int result = first.SequenceCompareTo(a); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArraySegmentImplicit_Char() + { + char[] src = { '1', '2', '3' }; + char[] dst = { '5', '1', '2', '3', '9' }; + var segment = new ArraySegment(dst, 1, 3); + + var first = new Span(src, 0, 3); + int result = first.SequenceCompareTo(segment); + Assert.Equal(0, result); + } + + [Fact] + public static void LengthMismatchSequenceCompareTo_Char() + { + char[] a = { '4', '5', '6' }; + var first = new Span(a, 0, 2); + var second = new Span(a, 0, 3); + int result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + + // one sequence is empty + first = new Span(a, 1, 0); + + result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + } + + [Fact] + public static void SequenceCompareToWithSingleMismatch_Char() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new char[length]; + var second = new char[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (char)(i + 1); + } + + second[mismatchIndex] = (char)(second[mismatchIndex] + 1); + + var firstSpan = new Span(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result > 0); + } + } + } + + [Fact] + public static void SequenceCompareToNoMatch_Char() + { + for (int length = 1; length < 32; length++) + { + var first = new char[length]; + var second = new char[length]; + + for (int i = 0; i < length; i++) + { + first[i] = (char)(i + 1); + second[i] = (char)(char.MaxValue - i); + } + + var firstSpan = new Span(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result > 0); + } + } + + [Fact] + public static void MakeSureNoSequenceCompareToChecksGoOutOfRange_Char() + { + for (int length = 0; length < 100; length++) + { + var first = new char[length + 2]; + first[0] = '8'; + first[length + 1] = '8'; + + var second = new char[length + 2]; + second[0] = '9'; + second[length + 1] = '9'; + + var span1 = new Span(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + int result = span1.SequenceCompareTo(span2); + Assert.Equal(0, result); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/Span/SequenceCompareTo.int.cs b/external/corefx/src/System.Memory/tests/Span/SequenceCompareTo.int.cs new file mode 100644 index 0000000000..9e0433ffcb --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Span/SequenceCompareTo.int.cs @@ -0,0 +1,145 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class SpanTests + { + [Fact] + public static void ZeroLengthSequenceCompareTo_Int() + { + var a = new int[3]; + + var first = new Span(a, 1, 0); + var second = new ReadOnlySpan(a, 2, 0); + int result = first.SequenceCompareTo(second); + Assert.Equal(0, result); + } + + [Fact] + public static void SameSpanSequenceCompareTo_Int() + { + int[] a = { 851227, 28052014, 429104168 }; + var span = new Span(a); + int result = span.SequenceCompareTo(span); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArrayImplicit_Int() + { + int[] a = { 851227, 28052014, 429104168 }; + var first = new Span(a, 0, 3); + int result = first.SequenceCompareTo(a); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArraySegmentImplicit_Int() + { + int[] src = { 851227, 28052014, 429104168 }; + int[] dst = { 5, 851227, 28052014, 429104168, 10 }; + var segment = new ArraySegment(dst, 1, 3); + + var first = new Span(src, 0, 3); + int result = first.SequenceCompareTo(segment); + Assert.Equal(0, result); + } + + [Fact] + public static void LengthMismatchSequenceCompareTo_Int() + { + int[] a = { 851227, 28052014, 429104168 }; + var first = new Span(a, 0, 2); + var second = new Span(a, 0, 3); + int result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + + // one sequence is empty + first = new Span(a, 1, 0); + + result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + } + + [Fact] + public static void SequenceCompareToWithSingleMismatch_Int() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new int[length]; + var second = new int[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (int)(i + 1); + } + + second[mismatchIndex] = (int)(second[mismatchIndex] + 1); + + var firstSpan = new Span(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result > 0); + } + } + } + + [Fact] + public static void SequenceCompareToNoMatch_Int() + { + for (int length = 1; length < 32; length++) + { + var first = new int[length]; + var second = new int[length]; + + for (int i = 0; i < length; i++) + { + first[i] = (int)(i + 1); + second[i] = (int)(int.MaxValue - i); + } + + var firstSpan = new Span(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result > 0); + } + } + + [Fact] + public static void MakeSureNoSequenceCompareToChecksGoOutOfRange_Int() + { + for (int length = 0; length < 100; length++) + { + var first = new int[length + 2]; + first[0] = 99; + first[length + 1] = 99; + + var second = new int[length + 2]; + second[0] = 100; + second[length + 1] = 100; + + var span1 = new Span(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + int result = span1.SequenceCompareTo(span2); + Assert.Equal(0, result); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/Span/SequenceCompareTo.long.cs b/external/corefx/src/System.Memory/tests/Span/SequenceCompareTo.long.cs new file mode 100644 index 0000000000..87610a2027 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Span/SequenceCompareTo.long.cs @@ -0,0 +1,145 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class SpanTests + { + [Fact] + public static void ZeroLengthSequenceCompareTo_Long() + { + var a = new long[3]; + + var first = new Span(a, 1, 0); + var second = new ReadOnlySpan(a, 2, 0); + int result = first.SequenceCompareTo(second); + Assert.Equal(0, result); + } + + [Fact] + public static void SameSpanSequenceCompareTo_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + var span = new Span(a); + int result = span.SequenceCompareTo(span); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArrayImplicit_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + var first = new Span(a, 0, 3); + int result = first.SequenceCompareTo(a); + Assert.Equal(0, result); + } + + [Fact] + public static void SequenceCompareToArraySegmentImplicit_Long() + { + long[] src = { 1989089123, 234523454235, 3123213231 }; + long[] dst = { 5, 1989089123, 234523454235, 3123213231, 10 }; + var segment = new ArraySegment(dst, 1, 3); + + var first = new Span(src, 0, 3); + int result = first.SequenceCompareTo(segment); + Assert.Equal(0, result); + } + + [Fact] + public static void LengthMismatchSequenceCompareTo_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + var first = new Span(a, 0, 2); + var second = new Span(a, 0, 3); + int result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + + // one sequence is empty + first = new Span(a, 1, 0); + + result = first.SequenceCompareTo(second); + Assert.True(result < 0); + + result = second.SequenceCompareTo(first); + Assert.True(result > 0); + } + + [Fact] + public static void SequenceCompareToWithSingleMismatch_Long() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new long[length]; + var second = new long[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (long)(i + 1); + } + + second[mismatchIndex] = (long)(second[mismatchIndex] + 1); + + var firstSpan = new Span(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result > 0); + } + } + } + + [Fact] + public static void SequenceCompareToNoMatch_Long() + { + for (int length = 1; length < 32; length++) + { + var first = new long[length]; + var second = new long[length]; + + for (int i = 0; i < length; i++) + { + first[i] = (long)(i + 1); + second[i] = (long)(long.MaxValue - i); + } + + var firstSpan = new Span(first); + var secondSpan = new ReadOnlySpan(second); + int result = firstSpan.SequenceCompareTo(secondSpan); + Assert.True(result < 0); + + result = secondSpan.SequenceCompareTo(firstSpan); + Assert.True(result > 0); + } + } + + [Fact] + public static void MakeSureNoSequenceCompareToChecksGoOutOfRange_Long() + { + for (int length = 0; length < 100; length++) + { + var first = new long[length + 2]; + first[0] = 99; + first[length + 1] = 99; + + var second = new long[length + 2]; + second[0] = 100; + second[length + 1] = 100; + + var span1 = new Span(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + int result = span1.SequenceCompareTo(span2); + Assert.Equal(0, result); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/Span/SequenceEqual.long.cs b/external/corefx/src/System.Memory/tests/Span/SequenceEqual.long.cs new file mode 100644 index 0000000000..1a8660bad8 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Span/SequenceEqual.long.cs @@ -0,0 +1,104 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class SpanTests + { + [Fact] + public static void ZeroLengthSequenceEqual_Long() + { + long[] a = new long[3]; + + Span first = new Span(a, 1, 0); + Span second = new Span(a, 2, 0); + bool b = first.SequenceEqual(second); + Assert.True(b); + } + + [Fact] + public static void SameSpanSequenceEqual_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + Span span = new Span(a); + bool b = span.SequenceEqual(span); + Assert.True(b); + } + + [Fact] + public static void SequenceEqualArrayImplicit_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + Span first = new Span(a, 0, 3); + bool b = first.SequenceEqual(a); + Assert.True(b); + } + + [Fact] + public static void SequenceEqualArraySegmentImplicit_Long() + { + long[] src = { 1989089123, 234523454235, 3123213231 }; + long[] dst = { 5, 1989089123, 234523454235, 3123213231, 10 }; + ArraySegment segment = new ArraySegment(dst, 1, 3); + + Span first = new Span(src, 0, 3); + bool b = first.SequenceEqual(segment); + Assert.True(b); + } + + [Fact] + public static void LengthMismatchSequenceEqual_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + Span first = new Span(a, 0, 3); + Span second = new Span(a, 0, 2); + bool b = first.SequenceEqual(second); + Assert.False(b); + } + + [Fact] + public static void SequenceEqualNoMatch_Long() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + long[] first = new long[length]; + long[] second = new long[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (byte)(i + 1); + } + + second[mismatchIndex] = (byte)(second[mismatchIndex] + 1); + + Span firstSpan = new Span(first); + ReadOnlySpan secondSpan = new ReadOnlySpan(second); + bool b = firstSpan.SequenceEqual(secondSpan); + Assert.False(b); + } + } + } + + [Fact] + public static void MakeSureNoSequenceEqualChecksGoOutOfRange_Long() + { + for (int length = 0; length < 100; length++) + { + long[] first = new long[length + 2]; + first[0] = 99; + first[length + 1] = 99; + long[] second = new long[length + 2]; + second[0] = 100; + second[length + 1] = 100; + Span span1 = new Span(first, 1, length); + ReadOnlySpan span2 = new ReadOnlySpan(second, 1, length); + bool b = span1.SequenceEqual(span2); + Assert.True(b); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/Span/StartsWith.char.cs b/external/corefx/src/System.Memory/tests/Span/StartsWith.char.cs new file mode 100644 index 0000000000..ececb4a38c --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Span/StartsWith.char.cs @@ -0,0 +1,104 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class SpanTests + { + [Fact] + public static void ZeroLengthStartsWith_Char() + { + var a = new char[3]; + + var span = new Span(a); + var slice = new ReadOnlySpan(a, 2, 0); + bool b = span.StartsWith(slice); + Assert.True(b); + } + + [Fact] + public static void SameSpanStartsWith_Char() + { + char[] a = { '4', '5', '6' }; + var span = new Span(a); + bool b = span.StartsWith(span); + Assert.True(b); + } + + [Fact] + public static void LengthMismatchStartsWith_Char() + { + char[] a = { '4', '5', '6' }; + var span = new Span(a, 0, 2); + var slice = new ReadOnlySpan(a, 0, 3); + bool b = span.StartsWith(slice); + Assert.False(b); + } + + [Fact] + public static void StartsWithMatch_Char() + { + char[] a = { '4', '5', '6' }; + var span = new Span(a, 0, 3); + var slice = new ReadOnlySpan(a, 0, 2); + bool b = span.StartsWith(slice); + Assert.True(b); + } + + [Fact] + public static void StartsWithMatchDifferentSpans_Char() + { + char[] a = { '4', '5', '6' }; + char[] b = { '4', '5', '6' }; + var span = new Span(a, 0, 3); + var slice = new ReadOnlySpan(b, 0, 3); + bool c = span.StartsWith(slice); + Assert.True(c); + } + + [Fact] + public static void StartsWithNoMatch_Char() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new char[length]; + var second = new char[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (char)(i + 1); + } + + second[mismatchIndex] = (char)(second[mismatchIndex] + 1); + + var firstSpan = new Span(first); + var secondSpan = new ReadOnlySpan(second); + bool b = firstSpan.StartsWith(secondSpan); + Assert.False(b); + } + } + } + + [Fact] + public static void MakeSureNoStartsWithChecksGoOutOfRange_Char() + { + for (int length = 0; length < 100; length++) + { + var first = new char[length + 2]; + first[0] = '9'; + first[length + 1] = '9'; + var second = new char[length + 2]; + second[0] = 'a'; + second[length + 1] = 'a'; + var span1 = new Span(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + bool b = span1.StartsWith(span2); + Assert.True(b); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/Span/StartsWith.long.cs b/external/corefx/src/System.Memory/tests/Span/StartsWith.long.cs new file mode 100644 index 0000000000..a3d7d4c46a --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Span/StartsWith.long.cs @@ -0,0 +1,104 @@ +// 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 Xunit; + +namespace System.SpanTests +{ + public static partial class SpanTests + { + [Fact] + public static void ZeroLengthStartsWith_Long() + { + var a = new long[3]; + + var span = new Span(a); + var slice = new ReadOnlySpan(a, 2, 0); + bool b = span.StartsWith(slice); + Assert.True(b); + } + + [Fact] + public static void SameSpanStartsWith_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + var span = new Span(a); + bool b = span.StartsWith(span); + Assert.True(b); + } + + [Fact] + public static void LengthMismatchStartsWith_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + var span = new Span(a, 0, 2); + var slice = new ReadOnlySpan(a, 0, 3); + bool b = span.StartsWith(slice); + Assert.False(b); + } + + [Fact] + public static void StartsWithMatch_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + var span = new Span(a, 0, 3); + var slice = new ReadOnlySpan(a, 0, 2); + bool b = span.StartsWith(slice); + Assert.True(b); + } + + [Fact] + public static void StartsWithMatchDifferentSpans_Long() + { + long[] a = { 488238291, 52498989823, 619890289890 }; + long[] b = { 488238291, 52498989823, 619890289890 }; + var span = new Span(a, 0, 3); + var slice = new ReadOnlySpan(b, 0, 3); + bool c = span.StartsWith(slice); + Assert.True(c); + } + + [Fact] + public static void StartsWithNoMatch_Long() + { + for (int length = 1; length < 32; length++) + { + for (int mismatchIndex = 0; mismatchIndex < length; mismatchIndex++) + { + var first = new long[length]; + var second = new long[length]; + for (int i = 0; i < length; i++) + { + first[i] = second[i] = (long)(i + 1); + } + + second[mismatchIndex] = (long)(second[mismatchIndex] + 1); + + var firstSpan = new Span(first); + var secondSpan = new ReadOnlySpan(second); + bool b = firstSpan.StartsWith(secondSpan); + Assert.False(b); + } + } + } + + [Fact] + public static void MakeSureNoStartsWithChecksGoOutOfRange_Long() + { + for (int length = 0; length < 100; length++) + { + var first = new long[length + 2]; + first[0] = 99; + first[length + 1] = 99; + var second = new long[length + 2]; + second[0] = 100; + second[length + 1] = 100; + var span1 = new Span(first, 1, length); + var span2 = new ReadOnlySpan(second, 1, length); + bool b = span1.StartsWith(span2); + Assert.True(b); + } + } + } +} diff --git a/external/corefx/src/System.Memory/tests/Span/ToString.cs b/external/corefx/src/System.Memory/tests/Span/ToString.cs new file mode 100644 index 0000000000..1875a91d79 --- /dev/null +++ b/external/corefx/src/System.Memory/tests/Span/ToString.cs @@ -0,0 +1,95 @@ +// 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.Runtime.InteropServices; +using Xunit; + +namespace System.SpanTests +{ + public static partial class SpanTests + { + [Fact] + public static void ToStringInt() + { + int[] a = { 91, 92, 93 }; + var span = new Span(a); + Assert.Equal("System.Span[3]", span.ToString()); + } + + [Fact] + public static void ToStringInt_Empty() + { + var span = new Span(); + Assert.Equal("System.Span[0]", span.ToString()); + } + + [Fact] + public static unsafe void ToStringChar() + { + char[] a = { 'a', 'b', 'c' }; + var span = new Span(a); + Assert.Equal("abc", span.ToString()); + + string testString = "abcdefg"; + ReadOnlySpan readOnlySpan = testString.AsSpan(); + + fixed (void* ptr = &MemoryMarshal.GetReference(readOnlySpan)) + { + var temp = new Span(ptr, readOnlySpan.Length); + Assert.Equal(testString, temp.ToString()); + } + } + + [Fact] + public static void ToStringChar_Empty() + { + var span = new Span(); + Assert.Equal("", span.ToString()); + } + + [Fact] + public static void ToStringForSpanOfString() + { + string[] a = { "a", "b", "c" }; + var span = new Span(a); + Assert.Equal("System.Span[3]", span.ToString()); + } + + [Fact] + public static void ToStringSpanOverFullStringDoesNotReturnOriginal() + { + string original = TestHelpers.BuildString(10, 42); + + ReadOnlyMemory readOnlyMemory = original.AsMemory(); + Memory memory = MemoryMarshal.AsMemory(readOnlyMemory); + + Span span = memory.Span; + + string returnedString = span.ToString(); + string returnedStringUsingSlice = span.Slice(0, original.Length).ToString(); + + string subString1 = span.Slice(1).ToString(); + string subString2 = span.Slice(0, 2).ToString(); + string subString3 = span.Slice(1, 2).ToString(); + + Assert.Equal(original, returnedString); + Assert.Equal(original, returnedStringUsingSlice); + + Assert.Equal(original.Substring(1), subString1); + Assert.Equal(original.Substring(0, 2), subString2); + Assert.Equal(original.Substring(1, 2), subString3); + + Assert.NotSame(original, returnedString); + Assert.NotSame(original, returnedStringUsingSlice); + + Assert.NotSame(original, subString1); + Assert.NotSame(original, subString2); + Assert.NotSame(original, subString3); + + Assert.NotSame(subString1, subString2); + Assert.NotSame(subString1, subString3); + Assert.NotSame(subString2, subString3); + } + } +} diff --git a/external/corefx/src/System.Memory/tests/System.Memory.Tests.csproj b/external/corefx/src/System.Memory/tests/System.Memory.Tests.csproj index df4a91e183..8eac2b8914 100644 --- a/external/corefx/src/System.Memory/tests/System.Memory.Tests.csproj +++ b/external/corefx/src/System.Memory/tests/System.Memory.Tests.csproj @@ -4,17 +4,31 @@ true {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F} + true + + + + + + + + + + + + + + - @@ -22,89 +36,131 @@ - + + + - - + - + - + - + - + - + + - + - + + + + + + - + + + + - - + + + + + + + + + + + + + - + + + + + - - + + - + - + + - + - + - + - + + + + + + + + - + + + + + + + + + + - + @@ -113,18 +169,29 @@ - - + + - + + + + + + + + + + + + @@ -134,19 +201,17 @@ - + + - - - @@ -176,6 +241,14 @@ + + + Common\System\Buffers\NativeMemoryManager.cs + + + Common\System\MutableDecimal.cs + + diff --git a/external/corefx/src/System.Memory/tests/TestHelpers.cs b/external/corefx/src/System.Memory/tests/TestHelpers.cs index a4829d7fc3..283b7dde59 100644 --- a/external/corefx/src/System.Memory/tests/TestHelpers.cs +++ b/external/corefx/src/System.Memory/tests/TestHelpers.cs @@ -8,6 +8,8 @@ using System.Runtime.InteropServices; using System.Runtime.CompilerServices; using static System.Buffers.Binary.BinaryPrimitives; +using System.Text; +using System.Reflection; namespace System { @@ -141,7 +143,7 @@ namespace System // This space intentionally left blank. } - public static void Validate(this Memory memory, params T[] expected) where T : struct, IEquatable + public static void Validate(this Memory memory, params T[] expected) where T : IEquatable { Assert.True(memory.Span.SequenceEqual(expected)); } @@ -157,7 +159,7 @@ namespace System } } - public static void Validate(this ReadOnlyMemory memory, params T[] expected) where T : struct, IEquatable + public static void Validate(this ReadOnlyMemory memory, params T[] expected) where T : IEquatable { Assert.True(memory.Span.SequenceEqual(expected)); } @@ -175,7 +177,7 @@ namespace System public static void Validate(Span span, T value) where T : struct { - T read = ReadMachineEndian(span); + T read = MemoryMarshal.Read(span); Assert.Equal(value, read); span.Clear(); } @@ -238,6 +240,17 @@ namespace System return spanLE; } + public static string BuildString(int length, int seed) + { + Random rnd = new Random(seed); + var builder = new StringBuilder(); + for (int i = 0; i < length; i++) + { + builder.Append((char)rnd.Next(65, 91)); + } + return builder.ToString(); + } + [StructLayout(LayoutKind.Explicit)] public struct TestStructExplicit { @@ -285,6 +298,20 @@ namespace System public string S; } +#pragma warning disable 0649 //Field 'SpanTests.InnerStruct.J' is never assigned to, and will always have its default value 0 + internal struct StructWithReferences + { + public int I; + public InnerStruct Inner; + } + + internal struct InnerStruct + { + public int J; + public object O; + } +#pragma warning restore 0649 //Field 'SpanTests.InnerStruct.J' is never assigned to, and will always have its default value 0 + public enum TestEnum { e0, @@ -366,6 +393,22 @@ namespace System } } } + + /// Creates a with the specified values in its backing field. + public static Memory DangerousCreateMemory(object obj, int offset, int length) + { + Memory mem = default; + object boxedMemory = mem; + + typeof(Memory).GetField("_object", BindingFlags.Instance | BindingFlags.NonPublic).SetValue(boxedMemory, obj); + typeof(Memory).GetField("_index", BindingFlags.Instance | BindingFlags.NonPublic).SetValue(boxedMemory, offset); + typeof(Memory).GetField("_length", BindingFlags.Instance | BindingFlags.NonPublic).SetValue(boxedMemory, length); + + return (Memory)boxedMemory; + } + + /// Creates a with the specified values in its backing field. + public static ReadOnlyMemory DangerousCreateReadOnlyMemory(object obj, int offset, int length) => + DangerousCreateMemory(obj, offset, length); } } - diff --git a/external/corefx/src/System.Net.Http.WinHttpHandler/src/Resources/Strings.resx b/external/corefx/src/System.Net.Http.WinHttpHandler/src/Resources/Strings.resx index 846190e58d..5ce718aaab 100644 --- a/external/corefx/src/System.Net.Http.WinHttpHandler/src/Resources/Strings.resx +++ b/external/corefx/src/System.Net.Http.WinHttpHandler/src/Resources/Strings.resx @@ -121,6 +121,9 @@ The stream was already consumed. It cannot be read again. + + Error {0} calling {1}, '{2}'. + WinHttpHandler is only supported on .NET Framework and .NET Core runtimes on Windows. It is not supported for Windows Store Applications (UWP) or Unix platforms. diff --git a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj index 78b6c50387..6ae87d4fb2 100644 --- a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj +++ b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj @@ -10,6 +10,7 @@ false true + true @@ -42,6 +43,7 @@ + diff --git a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.msbuild b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.msbuild index eca0378858..043e9c4bd8 100644 --- a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.msbuild +++ b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.msbuild @@ -23,7 +23,6 @@ - @@ -33,6 +32,7 @@ + diff --git a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpAuthHelper.cs b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpAuthHelper.cs index 0635ed2ec2..ab716d47ad 100644 --- a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpAuthHelper.cs +++ b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpAuthHelper.cs @@ -102,7 +102,7 @@ namespace System.Net.Http // But we can validate with assert. Debug.Assert(authTarget == Interop.WinHttp.WINHTTP_AUTH_TARGET_SERVER); - serverAuthScheme = ChooseAuthScheme(supportedSchemes); + serverAuthScheme = ChooseAuthScheme(supportedSchemes, state.RequestMessage.RequestUri, state.ServerCredentials); if (serverAuthScheme != 0) { if (SetWinHttpCredential( @@ -155,7 +155,7 @@ namespace System.Net.Http // But we can validate with assert. Debug.Assert(authTarget == Interop.WinHttp.WINHTTP_AUTH_TARGET_PROXY); - proxyAuthScheme = ChooseAuthScheme(supportedSchemes); + proxyAuthScheme = ChooseAuthScheme(supportedSchemes, state.Proxy.GetProxy(state.RequestMessage.RequestUri), proxyCreds); state.RetryRequest = true; break; @@ -296,7 +296,7 @@ namespace System.Net.Http Interop.WinHttp.WINHTTP_OPTION_AUTOLOGON_POLICY, ref optionData)) { - WinHttpException.ThrowExceptionUsingLastError(); + WinHttpException.ThrowExceptionUsingLastError(nameof(Interop.WinHttp.WinHttpSetOption)); } } @@ -365,17 +365,22 @@ namespace System.Net.Http password, IntPtr.Zero)) { - WinHttpException.ThrowExceptionUsingLastError(); + WinHttpException.ThrowExceptionUsingLastError(nameof(Interop.WinHttp.WinHttpSetCredentials)); } return true; } - private static uint ChooseAuthScheme(uint supportedSchemes) + private static uint ChooseAuthScheme(uint supportedSchemes, Uri uri, ICredentials credentials) { + if (credentials == null) + { + return 0; + } + foreach (uint authScheme in s_authSchemePriorityOrder) { - if ((supportedSchemes & authScheme) != 0) + if ((supportedSchemes & authScheme) != 0 && credentials.GetCredential(uri, s_authSchemeStringMapping[authScheme]) != null) { return authScheme; } diff --git a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpCertificateHelper.cs b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpCertificateHelper.cs index ca315bcf41..58ad3f46d1 100644 --- a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpCertificateHelper.cs +++ b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpCertificateHelper.cs @@ -55,11 +55,11 @@ namespace System.Net.Http unsafe { var cppStruct = new Interop.Crypt32.CERT_CHAIN_POLICY_PARA(); - cppStruct.cbSize = (uint)Marshal.SizeOf(); + cppStruct.cbSize = (uint)sizeof(Interop.Crypt32.CERT_CHAIN_POLICY_PARA); cppStruct.dwFlags = 0; var eppStruct = new Interop.Crypt32.SSL_EXTRA_CERT_CHAIN_POLICY_PARA(); - eppStruct.cbSize = (uint)Marshal.SizeOf(); + eppStruct.cbSize = (uint)sizeof(Interop.Crypt32.SSL_EXTRA_CERT_CHAIN_POLICY_PARA); eppStruct.dwAuthType = Interop.Crypt32.AuthType.AUTHTYPE_SERVER; cppStruct.pvExtraPolicyPara = &eppStruct; diff --git a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpCookieContainerAdapter.cs b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpCookieContainerAdapter.cs index 824d9cc776..5455255a49 100644 --- a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpCookieContainerAdapter.cs +++ b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpCookieContainerAdapter.cs @@ -61,7 +61,7 @@ namespace System.Net.Http int lastError = Marshal.GetLastWin32Error(); if (lastError != Interop.WinHttp.ERROR_WINHTTP_HEADER_NOT_FOUND) { - throw WinHttpException.CreateExceptionUsingError(lastError); + throw WinHttpException.CreateExceptionUsingError(lastError, nameof(Interop.WinHttp.WinHttpAddRequestHeaders)); } } @@ -76,7 +76,7 @@ namespace System.Net.Http (uint)cookieHeader.Length, Interop.WinHttp.WINHTTP_ADDREQ_FLAG_ADD)) { - WinHttpException.ThrowExceptionUsingLastError(); + WinHttpException.ThrowExceptionUsingLastError(nameof(Interop.WinHttp.WinHttpAddRequestHeaders)); } } } diff --git a/external/corefx/src/Common/src/System/Net/Http/WinHttpException.cs b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpException.cs similarity index 76% rename from external/corefx/src/Common/src/System/Net/Http/WinHttpException.cs rename to external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpException.cs index d77e347135..bb7956762f 100644 --- a/external/corefx/src/Common/src/System/Net/Http/WinHttpException.cs +++ b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpException.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.ComponentModel; +using System.Diagnostics; using System.Runtime.ExceptionServices; using System.Runtime.InteropServices; @@ -39,37 +40,41 @@ namespace System.Net.Http } } - public static void ThrowExceptionUsingLastError() + public static void ThrowExceptionUsingLastError(string nameOfCalledFunction) { - throw CreateExceptionUsingLastError(); + throw CreateExceptionUsingLastError(nameOfCalledFunction); } - public static WinHttpException CreateExceptionUsingLastError() + public static WinHttpException CreateExceptionUsingLastError(string nameOfCalledFunction) { int lastError = Marshal.GetLastWin32Error(); - return CreateExceptionUsingError(lastError); + return CreateExceptionUsingError(lastError, nameOfCalledFunction); } - public static WinHttpException CreateExceptionUsingError(int error) + public static WinHttpException CreateExceptionUsingError(int error, string nameOfCalledFunction) { - var e = new WinHttpException(error, GetErrorMessage(error)); + var e = new WinHttpException(error, GetErrorMessage(error, nameOfCalledFunction)); ExceptionStackTrace.AddCurrentStack(e); return e; } - public static WinHttpException CreateExceptionUsingError(int error, Exception innerException) + public static WinHttpException CreateExceptionUsingError(int error, string nameOfCalledFunction, Exception innerException) { - var e = new WinHttpException(error, GetErrorMessage(error), innerException); + var e = new WinHttpException(error, GetErrorMessage(error, nameOfCalledFunction), innerException); ExceptionStackTrace.AddCurrentStack(e); return e; } - public static string GetErrorMessage(int error) + public static string GetErrorMessage(int error, string nameOfCalledFunction) { + Debug.Assert(!string.IsNullOrEmpty(nameOfCalledFunction)); + // Look up specific error message in WINHTTP.DLL since it is not listed in default system resources // and thus can't be found by default .Net interop. IntPtr moduleHandle = Interop.Kernel32.GetModuleHandle(Interop.Libraries.WinHttp); - return Interop.Kernel32.GetMessage(moduleHandle, error); + string httpError = Interop.Kernel32.GetMessage(moduleHandle, error); + + return SR.Format(SR.net_http_winhttp_error, error, nameOfCalledFunction, httpError); } } } diff --git a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpHandler.cs b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpHandler.cs index aab6a125c8..b4e6458718 100644 --- a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpHandler.cs +++ b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpHandler.cs @@ -194,8 +194,6 @@ namespace System.Net.Http set { - SecurityProtocol.ThrowOnNotAllowed(value, allowNone: true); - CheckDisposedOrStarted(); _sslProtocols = value; } @@ -661,7 +659,7 @@ namespace System.Net.Http (uint)requestHeadersBuffer.Length, Interop.WinHttp.WINHTTP_ADDREQ_FLAG_ADD)) { - WinHttpException.ThrowExceptionUsingLastError(); + WinHttpException.ThrowExceptionUsingLastError(nameof(Interop.WinHttp.WinHttpAddRequestHeaders)); } } @@ -728,7 +726,7 @@ namespace System.Net.Http WinHttpTraceHelper.Trace("WinHttpHandler.EnsureSessionHandleExists: error={0}", lastError); if (lastError != Interop.WinHttp.ERROR_INVALID_PARAMETER) { - ThrowOnInvalidHandle(sessionHandle); + ThrowOnInvalidHandle(sessionHandle, nameof(Interop.WinHttp.WinHttpOpen)); } // We must be running on a platform earlier than Win8.1/Win2K12R2 which doesn't support @@ -741,7 +739,7 @@ namespace System.Net.Http _proxyHelper.ManualSettingsOnly ? _proxyHelper.Proxy : Interop.WinHttp.WINHTTP_NO_PROXY_NAME, _proxyHelper.ManualSettingsOnly ? _proxyHelper.ProxyBypass : Interop.WinHttp.WINHTTP_NO_PROXY_BYPASS, (int)Interop.WinHttp.WINHTTP_FLAG_ASYNC); - ThrowOnInvalidHandle(sessionHandle); + ThrowOnInvalidHandle(sessionHandle, nameof(Interop.WinHttp.WinHttpOpen)); } uint optionAssuredNonBlockingTrue = 1; // TRUE @@ -757,7 +755,7 @@ namespace System.Net.Http int lastError = Marshal.GetLastWin32Error(); if (lastError != Interop.WinHttp.ERROR_WINHTTP_INVALID_OPTION) { - throw WinHttpException.CreateExceptionUsingError(lastError); + throw WinHttpException.CreateExceptionUsingError(lastError, nameof(Interop.WinHttp.WinHttpSetOption)); } } @@ -788,7 +786,7 @@ namespace System.Net.Http state.RequestMessage.RequestUri.Host, (ushort)state.RequestMessage.RequestUri.Port, 0); - ThrowOnInvalidHandle(connectHandle); + ThrowOnInvalidHandle(connectHandle, nameof(Interop.WinHttp.WinHttpConnect)); connectHandle.SetParentHandle(_sessionHandle); // Try to use the requested version if a known/supported version was explicitly requested. @@ -821,7 +819,7 @@ namespace System.Net.Http Interop.WinHttp.WINHTTP_NO_REFERER, Interop.WinHttp.WINHTTP_DEFAULT_ACCEPT_TYPES, flags); - ThrowOnInvalidHandle(state.RequestHandle); + ThrowOnInvalidHandle(state.RequestHandle, nameof(Interop.WinHttp.WinHttpOpenRequest)); state.RequestHandle.SetParentHandle(connectHandle); // Set callback function. @@ -888,6 +886,16 @@ namespace System.Net.Http HttpResponseMessage responseMessage = WinHttpResponseParser.CreateResponseMessage(state, _doManualDecompressionCheck); state.Tcs.TrySetResult(responseMessage); + + // HttpStatusCode cast is needed for 308 Moved Permenantly, which we support but is not included in NetStandard status codes. + if (WinHttpTraceHelper.IsTraceEnabled() && + ((responseMessage.StatusCode >= HttpStatusCode.MultipleChoices && responseMessage.StatusCode <= HttpStatusCode.SeeOther) || + (responseMessage.StatusCode >= HttpStatusCode.RedirectKeepVerb && responseMessage.StatusCode <= (HttpStatusCode)308)) && + state.RequestMessage.RequestUri.Scheme == Uri.UriSchemeHttps && responseMessage.Headers.Location?.Scheme == Uri.UriSchemeHttp) + { + WinHttpTraceHelper.Trace("WinHttpHandler.SendAsync: Insecure https to http redirect from {0} to {1} blocked.", + state.RequestMessage.RequestUri.ToString(), responseMessage.Headers.Location.ToString()); + } } catch (Exception ex) { @@ -919,6 +927,18 @@ namespace System.Net.Http uint optionData = 0; SslProtocols sslProtocols = (_sslProtocols == SslProtocols.None) ? SecurityProtocol.DefaultSecurityProtocols : _sslProtocols; + +#pragma warning disable 0618 // SSL2/SSL3 are deprecated + if ((sslProtocols & SslProtocols.Ssl2) != 0) + { + optionData |= Interop.WinHttp.WINHTTP_FLAG_SECURE_PROTOCOL_SSL2; + } + + if ((sslProtocols & SslProtocols.Ssl3) != 0) + { + optionData |= Interop.WinHttp.WINHTTP_FLAG_SECURE_PROTOCOL_SSL3; + } +#pragma warning restore 0618 if ((sslProtocols & SslProtocols.Tls) != 0) { @@ -947,7 +967,7 @@ namespace System.Net.Http (int)_sendTimeout.TotalMilliseconds, (int)_receiveHeadersTimeout.TotalMilliseconds)) { - WinHttpException.ThrowExceptionUsingLastError(); + WinHttpException.ThrowExceptionUsingLastError(nameof(Interop.WinHttp.WinHttpSetTimeouts)); } } @@ -1204,7 +1224,7 @@ namespace System.Net.Http option, ref optionData)) { - WinHttpException.ThrowExceptionUsingLastError(); + WinHttpException.ThrowExceptionUsingLastError(nameof(Interop.WinHttp.WinHttpSetOption)); } } @@ -1217,7 +1237,7 @@ namespace System.Net.Http optionData, (uint)optionData.Length)) { - WinHttpException.ThrowExceptionUsingLastError(); + WinHttpException.ThrowExceptionUsingLastError(nameof(Interop.WinHttp.WinHttpSetOption)); } } @@ -1234,7 +1254,7 @@ namespace System.Net.Http optionData, optionSize)) { - WinHttpException.ThrowExceptionUsingLastError(); + WinHttpException.ThrowExceptionUsingLastError(nameof(Interop.WinHttp.WinHttpSetOption)); } } @@ -1304,18 +1324,18 @@ namespace System.Net.Http int lastError = Marshal.GetLastWin32Error(); if (lastError != Interop.WinHttp.ERROR_INVALID_HANDLE) // Ignore error if handle was already closed. { - throw WinHttpException.CreateExceptionUsingError(lastError); + throw WinHttpException.CreateExceptionUsingError(lastError, nameof(Interop.WinHttp.WinHttpSetStatusCallback)); } } } - private void ThrowOnInvalidHandle(SafeWinHttpHandle handle) + private void ThrowOnInvalidHandle(SafeWinHttpHandle handle, string nameOfCalledFunction) { if (handle.IsInvalid) { int lastError = Marshal.GetLastWin32Error(); WinHttpTraceHelper.Trace("WinHttpHandler.ThrowOnInvalidHandle: error={0}", lastError); - throw WinHttpException.CreateExceptionUsingError(lastError); + throw WinHttpException.CreateExceptionUsingError(lastError, nameOfCalledFunction); } } @@ -1333,11 +1353,13 @@ namespace System.Net.Http 0, state.ToIntPtr())) { - // Dispose (which will unpin) the state object. Since this failed, WinHTTP won't associate - // our context value (state object) to the request handle. And thus we won't get HANDLE_CLOSING - // notifications which would normally cause the state object to be unpinned and disposed. + // WinHTTP doesn't always associate our context value (state object) to the request handle. + // And thus we might not get a HANDLE_CLOSING notification which would normally cause the + // state object to be unpinned and disposed. So, we manually dispose the request handle and + // state object here. + state.RequestHandle.Dispose(); state.Dispose(); - WinHttpException.ThrowExceptionUsingLastError(); + WinHttpException.ThrowExceptionUsingLastError(nameof(Interop.WinHttp.WinHttpSendRequest)); } } @@ -1361,7 +1383,7 @@ namespace System.Net.Http { if (!Interop.WinHttp.WinHttpReceiveResponse(state.RequestHandle, IntPtr.Zero)) { - throw WinHttpException.CreateExceptionUsingLastError(); + throw WinHttpException.CreateExceptionUsingLastError(nameof(Interop.WinHttp.WinHttpReceiveResponse)); } } diff --git a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs index 995f306435..4d2a989667 100644 --- a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs +++ b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs @@ -110,8 +110,19 @@ namespace System.Net.Http } catch (Exception ex) { - Interop.WinHttp.WinHttpCloseHandle(handle); state.SavedException = ex; + if (state.RequestHandle != null) + { + // Since we got a fatal error processing the request callback, + // we need to close the WinHttp request handle in order to + // abort the currently executing WinHttp async operation. + // + // We must always call Dispose() against the SafeWinHttpHandle + // wrapper and never close directly the raw WinHttp handle. + // The SafeWinHttpHandle wrapper is thread-safe and guarantees + // calling the underlying WinHttpCloseHandle() function only once. + state.RequestHandle.Dispose(); + } } } @@ -214,6 +225,10 @@ namespace System.Net.Http { state.ServerCredentials = null; } + + // Similarly, we need to clear any Auth headers that were added to the request manually or + // through the default headers. + ResetAuthRequestHeaders(state); } private static void OnRequestSendingRequest(WinHttpRequestState state) @@ -256,7 +271,7 @@ namespace System.Net.Http return; } - throw WinHttpException.CreateExceptionUsingError(lastError); + throw WinHttpException.CreateExceptionUsingError(lastError, "WINHTTP_CALLBACK_STATUS_SENDING_REQUEST/WinHttpQueryOption"); } // Get any additional certificates sent from the remote server during the TLS/SSL handshake. @@ -291,7 +306,7 @@ namespace System.Net.Http catch (Exception ex) { throw WinHttpException.CreateExceptionUsingError( - (int)Interop.WinHttp.ERROR_WINHTTP_SECURE_FAILURE, ex); + (int)Interop.WinHttp.ERROR_WINHTTP_SECURE_FAILURE, "X509Chain.Build", ex); } finally { @@ -306,7 +321,7 @@ namespace System.Net.Http if (!result) { throw WinHttpException.CreateExceptionUsingError( - (int)Interop.WinHttp.ERROR_WINHTTP_SECURE_FAILURE); + (int)Interop.WinHttp.ERROR_WINHTTP_SECURE_FAILURE, "ServerCertificateValidationCallback"); } } } @@ -317,7 +332,7 @@ namespace System.Net.Http Debug.Assert(state != null, "OnRequestError: state is null"); - Exception innerException = WinHttpException.CreateExceptionUsingError(unchecked((int)asyncResult.dwError)); + Exception innerException = WinHttpException.CreateExceptionUsingError(unchecked((int)asyncResult.dwError), "WINHTTP_CALLBACK_STATUS_REQUEST_ERROR"); switch (unchecked((uint)asyncResult.dwResult.ToInt32())) { @@ -404,5 +419,25 @@ namespace System.Net.Http break; } } + + private static void ResetAuthRequestHeaders(WinHttpRequestState state) + { + const string AuthHeaderNameWithColon = "Authorization:"; + SafeWinHttpHandle requestHandle = state.RequestHandle; + + // Clear auth headers. + if (!Interop.WinHttp.WinHttpAddRequestHeaders( + requestHandle, + AuthHeaderNameWithColon, + (uint)AuthHeaderNameWithColon.Length, + Interop.WinHttp.WINHTTP_ADDREQ_FLAG_REPLACE)) + { + int lastError = Marshal.GetLastWin32Error(); + if (lastError != Interop.WinHttp.ERROR_WINHTTP_HEADER_NOT_FOUND) + { + throw WinHttpException.CreateExceptionUsingError(lastError, "WINHTTP_CALLBACK_STATUS_REDIRECT/WinHttpAddRequestHeaders"); + } + } + } } } diff --git a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestStream.cs b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestStream.cs index a1fc3aef65..034fc56427 100644 --- a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestStream.cs +++ b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestStream.cs @@ -249,7 +249,7 @@ namespace System.Net.Http IntPtr.Zero)) { _state.TcsInternalWriteDataToRequestStream.TrySetException( - new IOException(SR.net_http_io_write, WinHttpException.CreateExceptionUsingLastError())); + new IOException(SR.net_http_io_write, WinHttpException.CreateExceptionUsingLastError(nameof(Interop.WinHttp.WinHttpWriteData)))); } } diff --git a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpResponseParser.cs b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpResponseParser.cs index 16af2adecc..18e655f06b 100644 --- a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpResponseParser.cs +++ b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpResponseParser.cs @@ -92,7 +92,7 @@ namespace System.Net.Http } } - response.Content = new NoWriteNoSeekStreamContent(decompressedStream, state.CancellationToken); + response.Content = new NoWriteNoSeekStreamContent(decompressedStream); response.RequestMessage = request; // Parse raw response headers and place them into response message. @@ -127,7 +127,7 @@ namespace System.Net.Http ref resultSize, IntPtr.Zero)) { - WinHttpException.ThrowExceptionUsingLastError(); + WinHttpException.ThrowExceptionUsingLastError(nameof(Interop.WinHttp.WinHttpQueryHeaders)); } return result; @@ -189,7 +189,7 @@ namespace System.Net.Http return GetResponseHeader(requestHandle, infoLevel, ref buffer, ref index, out headerValue); } - throw WinHttpException.CreateExceptionUsingError(lastError); + throw WinHttpException.CreateExceptionUsingError(lastError, nameof(Interop.WinHttp.WinHttpQueryHeaders)); } /// @@ -216,7 +216,7 @@ namespace System.Net.Http Debug.Assert(lastError != Interop.WinHttp.ERROR_INSUFFICIENT_BUFFER, "buffer must be of sufficient size."); - throw WinHttpException.CreateExceptionUsingError(lastError); + throw WinHttpException.CreateExceptionUsingError(lastError, nameof(Interop.WinHttp.WinHttpQueryHeaders)); } } @@ -240,7 +240,7 @@ namespace System.Net.Http if (lastError != Interop.WinHttp.ERROR_INSUFFICIENT_BUFFER) { - throw WinHttpException.CreateExceptionUsingError(lastError); + throw WinHttpException.CreateExceptionUsingError(lastError, nameof(Interop.WinHttp.WinHttpQueryHeaders)); } } diff --git a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpResponseStream.cs b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpResponseStream.cs index 2c3af3458c..a6aa8e4448 100644 --- a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpResponseStream.cs +++ b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpResponseStream.cs @@ -121,7 +121,7 @@ namespace System.Net.Http { if (!Interop.WinHttp.WinHttpQueryDataAvailable(_requestHandle, IntPtr.Zero)) { - throw new IOException(SR.net_http_io_read, WinHttpException.CreateExceptionUsingLastError()); + throw new IOException(SR.net_http_io_read, WinHttpException.CreateExceptionUsingLastError(nameof(Interop.WinHttp.WinHttpQueryDataAvailable))); } } int bytesAvailable = await _state.LifecycleAwaitable; @@ -137,7 +137,7 @@ namespace System.Net.Http { if (!Interop.WinHttp.WinHttpReadData(_requestHandle, Marshal.UnsafeAddrOfPinnedArrayElement(buffer, 0), (uint)Math.Min(bytesAvailable, buffer.Length), IntPtr.Zero)) { - throw new IOException(SR.net_http_io_read, WinHttpException.CreateExceptionUsingLastError()); + throw new IOException(SR.net_http_io_read, WinHttpException.CreateExceptionUsingLastError(nameof(Interop.WinHttp.WinHttpReadData))); } } int bytesRead = await _state.LifecycleAwaitable; @@ -222,7 +222,7 @@ namespace System.Net.Http Debug.Assert(!_requestHandle.IsInvalid); if (!Interop.WinHttp.WinHttpQueryDataAvailable(_requestHandle, IntPtr.Zero)) { - throw new IOException(SR.net_http_io_read, WinHttpException.CreateExceptionUsingLastError()); + throw new IOException(SR.net_http_io_read, WinHttpException.CreateExceptionUsingLastError(nameof(Interop.WinHttp.WinHttpQueryDataAvailable))); } } @@ -237,7 +237,7 @@ namespace System.Net.Http (uint)Math.Min(bytesAvailable, count), IntPtr.Zero)) { - throw new IOException(SR.net_http_io_read, WinHttpException.CreateExceptionUsingLastError()); + throw new IOException(SR.net_http_io_read, WinHttpException.CreateExceptionUsingLastError(nameof(Interop.WinHttp.WinHttpReadData))); } } diff --git a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpTraceHelper.cs b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpTraceHelper.cs index 07aaa39f84..5e2ff60b43 100644 --- a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpTraceHelper.cs +++ b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpTraceHelper.cs @@ -138,14 +138,14 @@ namespace System.Net.Http uint apiIndex = (uint)asyncResult.dwResult.ToInt32(); uint error = asyncResult.dwError; - + string apiName = GetNameFromApiIndex(apiIndex); WriteLine( "{0}: api={1}, error={2}({3}) \"{4}\"", message, - GetNameFromApiIndex(apiIndex), + apiName, GetNameFromError(error), error, - WinHttpException.GetErrorMessage((int)error)); + WinHttpException.GetErrorMessage((int)error, apiName)); } private static void WriteLine(string message) diff --git a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinInetProxyHelper.cs b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinInetProxyHelper.cs index 10ddb5afa4..ab82918cab 100644 --- a/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinInetProxyHelper.cs +++ b/external/corefx/src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinInetProxyHelper.cs @@ -14,6 +14,9 @@ namespace System.Net.Http internal class WinInetProxyHelper { private bool _useProxy = false; + private bool _autoDetectionFailed; + private int _lastTimeAutoDetectionFailed; // Environment.TickCount units (milliseconds). + private const int _recentAutoDetectionInterval = 120_000; // 2 minutes in milliseconds. public WinInetProxyHelper() { @@ -79,6 +82,10 @@ namespace System.Net.Http public string ProxyBypass { get; set; } + public bool RecentAutoDetectionFailure => + _autoDetectionFailed && + Environment.TickCount - _lastTimeAutoDetectionFailed <= _recentAutoDetectionInterval; + public bool GetProxyForUrl( SafeWinHttpHandle sessionHandle, Uri uri, @@ -123,6 +130,7 @@ namespace System.Net.Http var repeat = false; do { + _autoDetectionFailed = false; if (Interop.WinHttp.WinHttpGetProxyForUrl( sessionHandle, uri.AbsoluteUri, @@ -131,7 +139,7 @@ namespace System.Net.Http { WinHttpTraceHelper.Trace("WinInetProxyHelper.GetProxyForUrl: Using autoconfig proxy settings"); useProxy = true; - + break; } else @@ -154,6 +162,12 @@ namespace System.Net.Http } else { + if (lastError == Interop.WinHttp.ERROR_WINHTTP_AUTODETECTION_FAILED) + { + _autoDetectionFailed = true; + _lastTimeAutoDetectionFailed = Environment.TickCount; + } + break; } } diff --git a/external/corefx/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/WinHttpHandlerTest.cs b/external/corefx/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/WinHttpHandlerTest.cs index c15e689386..cf5812a1d7 100644 --- a/external/corefx/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/WinHttpHandlerTest.cs +++ b/external/corefx/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/WinHttpHandlerTest.cs @@ -16,6 +16,8 @@ using Xunit.Abstractions; // WinHttpHandler is a class and not a namespace and can't be part of namespace paths. namespace System.Net.Http.WinHttpHandlerFunctional.Tests { + using Configuration = System.Net.Test.Common.Configuration; + // Note: Disposing the HttpClient object automatically disposes the handler within. So, it is not necessary // to separately Dispose (or have a 'using' statement) for the handler. [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "WinHttpHandler not supported on UAP")] @@ -113,6 +115,25 @@ namespace System.Net.Http.WinHttpHandlerFunctional.Tests } } + [Fact] + public async Task SendAsync_GetUsingChunkedEncoding_ThrowsHttpRequestException() + { + // WinHTTP doesn't support GET requests with a request body that uses + // chunked encoding. This test pins this behavior and verifies that the + // error handling is working correctly. + var server = new Uri("http://www.microsoft.com"); // No network I/O actually happens. + var request = new HttpRequestMessage(HttpMethod.Get, server); + request.Content = new StringContent("Request body"); + request.Headers.TransferEncodingChunked = true; + + var handler = new WinHttpHandler(); + using (HttpClient client = new HttpClient(handler)) + { + HttpRequestException ex = await Assert.ThrowsAsync(() => client.SendAsync(request)); + _output.WriteLine(ex.ToString()); + } + } + public static bool JsonMessageContainsKeyValue(string message, string key, string value) { // TODO: Merge with System.Net.Http TestHelper class as part of GitHub Issue #4989. diff --git a/external/corefx/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj b/external/corefx/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj index 871e66692e..31adaf06e1 100644 --- a/external/corefx/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj +++ b/external/corefx/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj @@ -73,9 +73,6 @@ Common\System\Net\Http\NoWriteNoSeekStreamContent.cs - - Common\System\Net\Http\WinHttpException.cs - Common\System\Net\Security\CertificateHelper.cs @@ -103,6 +100,9 @@ ProductionCode\WinHttpCookieContainerAdapter.cs + + ProductionCode\WinHttpException.cs + ProductionCode\WinHttpHandler.cs diff --git a/external/corefx/src/System.Net.Http.WinHttpHandler/tests/UnitTests/WinHttpHandlerTest.cs b/external/corefx/src/System.Net.Http.WinHttpHandler/tests/UnitTests/WinHttpHandlerTest.cs index 7b4eb0eb42..bc5d9f1fdf 100644 --- a/external/corefx/src/System.Net.Http.WinHttpHandler/tests/UnitTests/WinHttpHandlerTest.cs +++ b/external/corefx/src/System.Net.Http.WinHttpHandler/tests/UnitTests/WinHttpHandlerTest.cs @@ -435,15 +435,6 @@ namespace System.Net.Http.WinHttpHandlerUnitTests handler.ReceiveHeadersTimeout = Timeout.InfiniteTimeSpan; } - [Theory] - [ClassData(typeof(SslProtocolSupport.UnsupportedSslProtocolsTestData))] - public void SslProtocols_SetUsingUnsupported_Throws(SslProtocols protocol) - { - var handler = new WinHttpHandler(); - - Assert.Throws(() => { handler.SslProtocols = protocol; }); - } - [Theory] [ClassData(typeof(SslProtocolSupport.SupportedSslProtocolsTestData))] public void SslProtocols_SetUsingSupported_Success(SslProtocols protocol) @@ -460,33 +451,27 @@ namespace System.Net.Http.WinHttpHandlerUnitTests handler.SslProtocols = SslProtocols.None; } - [Fact] - public void SslProtocols_SetUsingInvalidEnum_Throws() - { - var handler = new WinHttpHandler(); - - Assert.Throws(() => { handler.SslProtocols = (SslProtocols)4096; }); - } - - [Fact] - public void SslProtocols_SetUsingValidEnums_ExpectedWinHttpHandleSettings() + [Theory] + [InlineData( + SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12, + Interop.WinHttp.WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 | + Interop.WinHttp.WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 | + Interop.WinHttp.WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2)] +#pragma warning disable 0618 + [InlineData( + SslProtocols.Ssl2 | SslProtocols.Ssl3, + Interop.WinHttp.WINHTTP_FLAG_SECURE_PROTOCOL_SSL2 | + Interop.WinHttp.WINHTTP_FLAG_SECURE_PROTOCOL_SSL3)] +#pragma warning restore 0618 + public void SslProtocols_SetUsingValidEnums_ExpectedWinHttpHandleSettings( + SslProtocols specified, uint expectedProtocols) { var handler = new WinHttpHandler(); SendRequestHelper.Send( handler, - delegate - { - handler.SslProtocols = - SslProtocols.Tls | - SslProtocols.Tls11 | - SslProtocols.Tls12; - }); + delegate { handler.SslProtocols = specified; }); - uint expectedProtocols = - Interop.WinHttp.WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 | - Interop.WinHttp.WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 | - Interop.WinHttp.WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2; Assert.Equal(expectedProtocols, APICallHistory.WinHttpOptionSecureProtocols); } diff --git a/external/corefx/src/System.Net.Http/ref/System.Net.Http.cs b/external/corefx/src/System.Net.Http/ref/System.Net.Http.cs index 5bfa47a7e3..02cb8fa668 100644 --- a/external/corefx/src/System.Net.Http/ref/System.Net.Http.cs +++ b/external/corefx/src/System.Net.Http/ref/System.Net.Http.cs @@ -236,6 +236,34 @@ namespace System.Net.Http protected override System.Threading.Tasks.Task SerializeToStreamAsync(System.IO.Stream stream, System.Net.TransportContext context) => throw null; protected internal override bool TryComputeLength(out long length) => throw null; } +#if !uap + public sealed class SocketsHttpHandler : HttpMessageHandler + { + public SocketsHttpHandler() { } + public bool AllowAutoRedirect { get { throw null; } set { } } + public System.Net.DecompressionMethods AutomaticDecompression { get { throw null; } set { } } + public System.TimeSpan ConnectTimeout { get; set; } + public System.Net.CookieContainer CookieContainer { get { throw null; } set { } } + public System.Net.ICredentials Credentials { get { throw null; } set { } } + public System.Net.ICredentials DefaultProxyCredentials { get { throw null; } set { } } + public System.TimeSpan Expect100ContinueTimeout { get; set; } + public int MaxAutomaticRedirections { get { throw null; } set { } } + public int MaxConnectionsPerServer { get { throw null; } set { } } + public int MaxResponseDrainSize { get { throw null; } set { } } + public int MaxResponseHeadersLength { get { throw null; } set { } } + public bool PreAuthenticate { get { throw null; } set { } } + public System.TimeSpan PooledConnectionIdleTimeout { get { throw null; } set { } } + public System.TimeSpan PooledConnectionLifetime { get { throw null; } set { } } + public System.Collections.Generic.IDictionary Properties { get { throw null; } } + public System.Net.IWebProxy Proxy { get { throw null; } set { } } + public System.TimeSpan ResponseDrainTimeout { get { throw null; } set { } } + public System.Net.Security.SslClientAuthenticationOptions SslOptions { get { throw null; } set { } } + public bool UseCookies { get { throw null; } set { } } + public bool UseProxy { get { throw null; } set { } } + protected override void Dispose(bool disposing) { } + protected internal override System.Threading.Tasks.Task SendAsync(System.Net.Http.HttpRequestMessage request, System.Threading.CancellationToken cancellationToken) { throw null; } + } +#endif public partial class StreamContent : System.Net.Http.HttpContent { public StreamContent(System.IO.Stream content) { } diff --git a/external/corefx/src/System.Net.Http/ref/System.Net.Http.csproj b/external/corefx/src/System.Net.Http/ref/System.Net.Http.csproj index bc043b82d7..874d233f8b 100644 --- a/external/corefx/src/System.Net.Http/ref/System.Net.Http.csproj +++ b/external/corefx/src/System.Net.Http/ref/System.Net.Http.csproj @@ -3,6 +3,7 @@ {132BF813-FC40-4D39-8B6F-E55D7633F0ED} + $(DefineConstants);uap @@ -16,6 +17,7 @@ + diff --git a/external/corefx/src/System.Net.Http/src/ILLinkTrim.xml b/external/corefx/src/System.Net.Http/src/ILLinkTrim.xml index bfe2004834..3957caf8ea 100644 --- a/external/corefx/src/System.Net.Http/src/ILLinkTrim.xml +++ b/external/corefx/src/System.Net.Http/src/ILLinkTrim.xml @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/System.Net.Http/src/MatchingRefApiCompatBaseline.uap.txt b/external/corefx/src/System.Net.Http/src/MatchingRefApiCompatBaseline.uap.txt new file mode 100644 index 0000000000..a6fe8a354e --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/MatchingRefApiCompatBaseline.uap.txt @@ -0,0 +1,4 @@ +Compat issues with assembly System.Net.Http: +TypesMustExist : Type 'System.Net.Internal.Cookie' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.Net.Internal.CookieException' does not exist in the implementation but it does exist in the contract. +Total Issues: 2 diff --git a/external/corefx/src/System.Net.Http/src/Resources/Strings.resx b/external/corefx/src/System.Net.Http/src/Resources/Strings.resx index ae1716b441..b8cdb1d8a1 100644 --- a/external/corefx/src/System.Net.Http/src/Resources/Strings.resx +++ b/external/corefx/src/System.Net.Http/src/Resources/Strings.resx @@ -336,6 +336,9 @@ The HTTP response headers length exceeded the set limit of {0} bytes. + + Non-negative number required. + Positive number required. @@ -348,14 +351,20 @@ Can not access a closed Stream. - - The handler does not support custom handling of certificates with this combination of libcurl ({0}) and its SSL backend ("{1}"). + + The handler does not support custom handling of certificates with this combination of libcurl ({0}) and its SSL backend ("{1}"). An SSL backend based on "{2}" is required. Consider using System.Net.Http.SocketsHttpHandler. - - The handler does not support client authentication certificates with this combination of libcurl ({0}) and its SSL backend ("{1}"). + + The handler does not support custom handling of certificates on this operating system. Consider using System.Net.Http.SocketsHttpHandler. - - The handler does not support changing revocation settings with this combination of libcurl ({0}) and its SSL backend ("{1}"). + + The handler does not support client authentication certificates with this combination of libcurl ({0}) and its SSL backend ("{1}"). An SSL backend based on "{2}" is required. Consider using System.Net.Http.SocketsHttpHandler. + + + The handler does not support client authentication certificates on this operating system. Consider using System.Net.Http.SocketsHttpHandler. + + + The handler does not support changing revocation settings with this combination of libcurl ({0}) and its SSL backend ("{1}"). An SSL backend based on "{2}" is required. Consider using System.Net.Http.SocketsHttpHandler. Using this feature requires Windows 10 Version 1607. @@ -363,9 +372,6 @@ Client certificate was not found in the personal (\"MY\") certificate store. In UWP, client certificates are only supported if they have been added to that certificate store. - - The maximum number of redirects was exceeded. - Only the 'http' scheme is allowed for proxies. @@ -378,6 +384,9 @@ HTTP 1.0 does not support chunking. + + Request HttpVersion 0.X is not supported. Use 1.0 or above. + An attempt was made to move the position before the beginning of the stream. @@ -387,4 +396,61 @@ The path '{0}' is too long, or a component of the specified path is too long. - \ No newline at end of file + + CONNECT request must contain Host header. + + + Error {0} calling {1}, '{2}'. + + + This method is not implemented by this class. + + + {0} returned {1}. + + + {0} failed with error {1}. + + + This operation cannot be performed on a completed asynchronous result object. + + + The specified value is not valid in the '{0}' enumeration. + + + Protocol error: A received message contains a valid signature but it was not encrypted as required by the effective Protection Level. + + + The requested security package is not supported. + + + '{0}' is not a supported handle type. + + + Authentication failed because the connection could not be reused. + + + Server implementation is not supported + + + Requested protection level is not supported with the gssapi implementation currently installed. + + + Insufficient buffer space. Required: {0} Actual: {1}. + + + GSSAPI operation failed with error - {0} ({1}). + + + GSSAPI operation failed with status: {0} (Minor status: {1}). + + + No support for channel binding on operating systems other than Windows. + + + NTLM authentication is not possible with default credentials on this platform. + + + Target name should be non empty if default credentials are passed. + + diff --git a/external/corefx/src/System.Net.Http/src/System.Net.Http.csproj b/external/corefx/src/System.Net.Http/src/System.Net.Http.csproj index a0d6e505a1..416e515ce9 100644 --- a/external/corefx/src/System.Net.Http/src/System.Net.Http.csproj +++ b/external/corefx/src/System.Net.Http/src/System.Net.Http.csproj @@ -10,6 +10,7 @@ $(NoWarn);0436 true $(DefineConstants);HTTP_DLL + true @@ -105,45 +106,226 @@ Common\System\Net\HttpVersionInternal.cs + + Common\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs + Common\System\IO\DelegatingStream.cs Common\System\IO\ReadOnlyMemoryStream.cs - - Common\System\IO\StringBuilderCache.cs + + Common\System\Text\StringBuilderCache.cs Common\System\Net\Logging\NetEventSource.Common.cs - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Common\System\Collections\Concurrent\ConcurrentQueue_Segment.cs + + + Common\System\Net\NTAuthentication.Common.cs + + + Common\System\Net\ContextFlagsPal.cs + + + Common\System\Net\LazyAsyncResult.cs + + + Common\System\Net\ContextAwareResult.cs + + + Common\System\Net\SecurityStatusPal.cs + + + Common\System\Net\Security\SecurityBuffer.cs + + + Common\System\Net\Security\SecurityBufferType.cs + + + Common\System\Net\Security\SSPIHandleCache.cs + + + Common\System\Net\Security\NetEventSource.Security.cs + + + Common\System\Net\ExceptionCheck.cs + + + Common\System\Collections\Generic\BidirectionalDictionary.cs + + + Common\System\NotImplemented.cs + + + Common\System\Net\NegotiationInfoClass.cs + + + Common\System\Net\InternalException.cs + + + Common\System\Net\Logging\DebugThreadTracking.cs + + + Common\System\Net\DebugSafeHandle.cs + + + Common\System\Net\DebugCriticalHandleMinusOneIsInvalid.cs + + + Common\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs + + + + + + + + Common\System\Net\ContextAwareResult.Unix.cs + + + Common\System\Net\ContextFlagsAdapterPal.Unix.cs + + + Common\System\Net\Security\Unix\SafeFreeCredentials.cs + + + Common\System\Net\Security\Unix\SafeDeleteContext.cs + + + Common\System\Net\Security\NegotiateStreamPal.Unix.cs + + + Common\Microsoft\Win32\SafeHandles\GssSafeHandles.cs + + + Common\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs + + + Common\System\Net\Security\Unix\SafeFreeNegoCredentials.cs + + + Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs + + + Common\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs + + + Common\System\Net\Security\Unix\SafeDeleteNegoContext.cs + + + + + + + Common\Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs + + + Common\System\Net\Security\SecurityContextTokenHandle.cs + + + Common\System\Net\ContextAwareResult.Windows.cs + + + Common\System\Net\SecurityStatusAdapterPal.Windows.cs + + + Common\System\Net\ContextFlagsAdapterPal.Windows.cs + + + Common\System\Net\Security\NegotiateStreamPal.Windows.cs + + + Common\System\Net\Security\NetEventSource.Security.Windows.cs + + + Common\Interop\Windows\sspicli\SecPkgContext_Bindings.cs + + + Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs + + + Common\Interop\Windows\kernel32\Interop.CloseHandle.cs + + + Common\Interop\Windows\sspicli\SecPkgContext_StreamSizes.cs + + + Common\Interop\Windows\sspicli\SecPkgContext_NegotiationInfoW.cs + + + Common\Interop\Windows\sspicli\NegotiationInfoClass.cs + + + Common\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs + + + Common\Interop\Windows\sspicli\SSPISecureChannelType.cs + + + Common\Interop\Windows\sspicli\SSPIInterface.cs + + + Common\Interop\Windows\sspicli\SSPIAuthType.cs + + + Common\Interop\Windows\sspicli\SecurityPackageInfoClass.cs + + + Common\Interop\Windows\sspicli\SecurityPackageInfo.cs + + + Common\Interop\Windows\sspicli\SecPkgContext_Sizes.cs + + + Common\Interop\Windows\sspicli\SafeDeleteContext.cs + + + Common\Interop\Windows\sspicli\GlobalSSPI.cs + + + Common\Interop\Windows\sspicli\Interop.SSPI.cs + + + Common\Interop\Windows\sspicli\SecuritySafeHandles.cs + + + Common\Interop\Windows\sspicli\SSPIWrapper.cs + @@ -174,9 +356,10 @@ Common\System\Net\Mail\WhitespaceReader.cs - + + + true + - - - - - - + + + + + + Common\Interop\Unix\StrongToWeakReference.cs @@ -290,6 +474,12 @@ Common\System\Net\Http\TlsCertificateExtensions + + Common\System\Net\Security\CertificateHelper.cs + + + Common\System\Net\Security\CertificateHelper.Unix.cs + Common\System\Threading\Tasks\TaskToApm.cs @@ -340,9 +530,6 @@ Common\Microsoft\Win32\SafeHandles\SafeX509Handles.Unix.cs - - Common\Microsoft\Win32\SafeHandles\SafeX509NameHandle.Unix.cs - Common\Microsoft\Win32\SafeHandles\X509ExtensionSafeHandles.Unix.cs @@ -358,11 +545,11 @@ Common\System\Net\Security\CertificateValidation.Unix.cs - - + + - + @@ -416,6 +603,7 @@ + @@ -423,14 +611,17 @@ + + + @@ -438,9 +629,11 @@ + + - \ No newline at end of file + diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/ByteArrayHelpers.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/ByteArrayHelpers.cs index 8ae15c6ce6..5ee60dab6a 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/ByteArrayHelpers.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/ByteArrayHelpers.cs @@ -3,8 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; -using System.Runtime.InteropServices; -using System.Text; namespace System { @@ -41,14 +39,5 @@ namespace System return true; } - - internal static unsafe string GetStringFromByteSpan(ReadOnlySpan bytes) - { - // TODO #22431: Use new Span-based Encoding overload when available - fixed (byte* p = &MemoryMarshal.GetReference(bytes)) - { - return Encoding.ASCII.GetString(p, bytes.Length); - } - } } } diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Unix/CurlException.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlException.cs similarity index 100% rename from external/corefx/src/System.Net.Http/src/System/Net/Http/Unix/CurlException.cs rename to external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlException.cs diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Unix/CurlHandler.ClientCertificateProvider.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.ClientCertificateProvider.cs similarity index 100% rename from external/corefx/src/System.Net.Http/src/System/Net/Http/Unix/CurlHandler.ClientCertificateProvider.cs rename to external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.ClientCertificateProvider.cs diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Unix/CurlHandler.CurlResponseMessage.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.CurlResponseMessage.cs similarity index 96% rename from external/corefx/src/System.Net.Http/src/System/Net/Http/Unix/CurlHandler.CurlResponseMessage.cs rename to external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.CurlResponseMessage.cs index 1fafd9681d..7be1c4af7e 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Unix/CurlHandler.CurlResponseMessage.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.CurlResponseMessage.cs @@ -22,7 +22,7 @@ namespace System.Net.Http Debug.Assert(easy != null, "Expected non-null EasyRequest"); RequestMessage = easy._requestMessage; ResponseStream = new CurlResponseStream(easy); - Content = new NoWriteNoSeekStreamContent(ResponseStream, CancellationToken.None); + Content = new NoWriteNoSeekStreamContent(ResponseStream); // On Windows, we pass the equivalent of the easy._cancellationToken // in to StreamContent's ctor. This in turn passes that token through @@ -253,11 +253,11 @@ namespace System.Net.Http return ReadAsync(new Memory(buffer, offset, count), cancellationToken).AsTask(); } - public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default) + public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default) { CheckDisposed(); - EventSourceTrace("Buffer: {0}", destination.Length); + EventSourceTrace("Buffer: {0}", buffer.Length); // Check for cancellation if (cancellationToken.IsCancellationRequested) @@ -290,7 +290,7 @@ namespace System.Net.Http // Quick check for if no data was actually requested. We do this after the check // for errors so that we can still fail the read and transfer the exception if we should. - if (destination.Length == 0) + if (buffer.Length == 0) { return new ValueTask(0); } @@ -298,8 +298,8 @@ namespace System.Net.Http // If there's any data left over from a previous call, grab as much as we can. if (_remainingDataCount > 0) { - int bytesToCopy = Math.Min(destination.Length, _remainingDataCount); - new Span(_remainingData, _remainingDataOffset, bytesToCopy).CopyTo(destination.Span); + int bytesToCopy = Math.Min(buffer.Length, _remainingDataCount); + new Span(_remainingData, _remainingDataOffset, bytesToCopy).CopyTo(buffer.Span); _remainingDataOffset += bytesToCopy; _remainingDataCount -= bytesToCopy; @@ -332,7 +332,7 @@ namespace System.Net.Http // the cancellation token. Dispose on the registration won't return until the action // associated with the registration has completed, but if that action is currently // executing and is blocked on the lock that's held while calling Dispose... deadlock. - var crs = new CancelableReadState(destination, this); + var crs = new CancelableReadState(buffer, this, cancellationToken); crs._registration = cancellationToken.Register(s1 => { ((CancelableReadState)s1)._stream.EventSourceTrace("Cancellation invoked. Queueing work item to cancel read state"); @@ -341,11 +341,11 @@ namespace System.Net.Http var crsRef = (CancelableReadState)s2; lock (crsRef._stream._lockObject) { - Debug.Assert(crsRef._registration.Token.IsCancellationRequested, "We should only be here if cancellation was requested."); + Debug.Assert(crsRef._token.IsCancellationRequested, "We should only be here if cancellation was requested."); if (crsRef._stream._pendingReadRequest == crsRef) { crsRef._stream.EventSourceTrace("Canceling"); - crsRef.TrySetCanceled(crsRef._registration.Token); + crsRef.TrySetCanceled(crsRef._token); crsRef._stream.ClearPendingReadRequest(); } } @@ -356,7 +356,7 @@ namespace System.Net.Http else { // The token isn't cancelable. Just create a normal read state. - _pendingReadRequest = new ReadState(destination); + _pendingReadRequest = new ReadState(buffer); } _easy._associatedMultiAgent.RequestUnpause(_easy); @@ -516,11 +516,13 @@ namespace System.Net.Http private sealed class CancelableReadState : ReadState { internal readonly CurlResponseStream _stream; + internal readonly CancellationToken _token; internal CancellationTokenRegistration _registration; - internal CancelableReadState(Memory buffer, CurlResponseStream responseStream) : base(buffer) + internal CancelableReadState(Memory buffer, CurlResponseStream responseStream, CancellationToken cancellationToken) : base(buffer) { _stream = responseStream; + _token = cancellationToken; } } } diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Unix/CurlHandler.EasyRequest.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.EasyRequest.cs similarity index 97% rename from external/corefx/src/System.Net.Http/src/System/Net/Http/Unix/CurlHandler.EasyRequest.cs rename to external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.EasyRequest.cs index b6dc5eba69..47996113d1 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Unix/CurlHandler.EasyRequest.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.EasyRequest.cs @@ -113,7 +113,7 @@ namespace System.Net.Http SetProxyOptions(_requestMessage.RequestUri); SetCredentialsOptions(_handler._useDefaultCredentials ? GetDefaultCredentialAndAuth() : _handler.GetCredentials(_requestMessage.RequestUri)); SetCookieOption(_requestMessage.RequestUri); - SetRequestHeaders(); + SetRequestHeaders(copyAuthHeaders:true); SetSslOptions(); EventSourceTrace("Done configuring request."); @@ -300,6 +300,8 @@ namespace System.Net.Http // and when enabled has a measurably negative impact on latency in key scenarios // (e.g. POST'ing small-ish data). SetCurlOption(CURLoption.CURLOPT_TCP_NODELAY, 1L); + // Enable TCP keep-alive. + SetCurlOption(CURLoption.CURLOPT_TCP_KEEPALIVE, 1L); } private void SetMultithreading() @@ -370,6 +372,11 @@ namespace System.Net.Http { SetCookieOption(newUri); } + + if (newUri.Scheme == Uri.UriSchemeHttp && _requestMessage.RequestUri.Scheme == Uri.UriSchemeHttps) + { + EventSourceTrace("Insecure https to http redirect: {0}", (_requestMessage.RequestUri, newUri)); + } } // Set up the new credentials, either for the new Uri if we were able to get it, @@ -378,7 +385,7 @@ namespace System.Net.Http // Set the headers again. This is a workaround for libcurl's limitation in handling // headers with empty values. - SetRequestHeaders(); + SetRequestHeaders(copyAuthHeaders:false); } private void SetContentLength(CURLoption lengthOption) @@ -504,10 +511,11 @@ namespace System.Net.Http { // Try to use the requested version, if a known version was explicitly requested. // If an unknown version was requested, we simply use libcurl's default. + // Only allow HTTP/2 when making https requests. var curlVersion = (v.Major == 1 && v.Minor == 1) ? Interop.Http.CurlHttpVersion.CURL_HTTP_VERSION_1_1 : (v.Major == 1 && v.Minor == 0) ? Interop.Http.CurlHttpVersion.CURL_HTTP_VERSION_1_0 : - (v.Major == 2 && v.Minor == 0) ? Interop.Http.CurlHttpVersion.CURL_HTTP_VERSION_2_0 : + (v.Major == 2 && v.Minor == 0) ? Interop.Http.CurlHttpVersion.CURL_HTTP_VERSION_2TLS : Interop.Http.CurlHttpVersion.CURL_HTTP_VERSION_NONE; if (curlVersion != Interop.Http.CurlHttpVersion.CURL_HTTP_VERSION_NONE) @@ -698,7 +706,7 @@ namespace System.Net.Http } } - internal void SetRequestHeaders() + internal void SetRequestHeaders(bool copyAuthHeaders) { var slist = new SafeCurlSListHandle(); @@ -706,7 +714,7 @@ namespace System.Net.Http if (_requestMessage.Content != null) { // Add content request headers - AddRequestHeaders(_requestMessage.Content.Headers, slist); + AddRequestHeaders(_requestMessage.Content.Headers, slist, copyAuthHeaders); suppressContentType = _requestMessage.Content.Headers.ContentType == null; } else @@ -721,7 +729,7 @@ namespace System.Net.Http } // Add request headers - AddRequestHeaders(_requestMessage.Headers, slist); + AddRequestHeaders(_requestMessage.Headers, slist, copyAuthHeaders); // Since libcurl always adds a Transfer-Encoding header, we need to explicitly block // it if caller specifically does not want to set the header @@ -846,11 +854,12 @@ namespace System.Net.Http return Interop.Http.RegisterSslCtxCallback(_easyHandle, callback, userPointer, ref _callbackHandle); } - private static void AddRequestHeaders(HttpHeaders headers, SafeCurlSListHandle handle) + private static void AddRequestHeaders(HttpHeaders headers, SafeCurlSListHandle handle, bool copyAuthHeaders) { foreach (KeyValuePair> header in headers) { - if (string.Equals(header.Key, HttpKnownHeaderNames.ContentLength, StringComparison.OrdinalIgnoreCase)) + if (string.Equals(header.Key, HttpKnownHeaderNames.ContentLength, StringComparison.OrdinalIgnoreCase) || + (!copyAuthHeaders && string.Equals(header.Key, HttpKnownHeaderNames.Authorization, StringComparison.OrdinalIgnoreCase))) { // avoid overriding libcurl's handling via INFILESIZE/POSTFIELDSIZE continue; diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Unix/CurlHandler.MultiAgent.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.MultiAgent.cs similarity index 99% rename from external/corefx/src/System.Net.Http/src/System/Net/Http/Unix/CurlHandler.MultiAgent.cs rename to external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.MultiAgent.cs index 797f5cd4b7..bd254ea46d 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Unix/CurlHandler.MultiAgent.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.MultiAgent.cs @@ -753,6 +753,10 @@ namespace System.Net.Http CURLMcode removeResult = Interop.Http.MultiRemoveHandle(_multiHandle, activeRequest.EasyHandle); Debug.Assert(removeResult == CURLMcode.CURLM_OK, "Failed to remove easy handle"); // ignore cleanup errors in release +#if !SYSNETHTTP_NO_OPENSSL + Interop.Crypto.ErrClearError(); // Ensure that no SSL errors were left on the queue by libcurl. +#endif + // Release the associated GCHandle so that it's not kept alive forever if (gcHandlePtr != IntPtr.Zero) { @@ -999,6 +1003,12 @@ namespace System.Net.Http // our redirect limit, etc.), this will have been unnecessary work in reconfiguring the easy handle, but // nothing incorrect, as we'll tear down the handle once the request finishes, anyway, and all of the configuration // we're doing is about initiating a new request. + if ((int)response.StatusCode >= 301 && (int)response.StatusCode <= 303) + { + // ISSUE: 25163 + // Ideally we want to avoid modifying the users request message. + easy._requestMessage.Headers.TransferEncodingChunked = false; + } easy.SetPossibleRedirectForLocationHeader(headerValue); } else if (string.Equals(headerName, HttpKnownHeaderNames.SetCookie, StringComparison.OrdinalIgnoreCase)) diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Unix/CurlHandler.SslProvider.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.SslProvider.Linux.cs similarity index 86% rename from external/corefx/src/System.Net.Http/src/System/Net/Http/Unix/CurlHandler.SslProvider.cs rename to external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.SslProvider.Linux.cs index 993d28b2f8..55e583e137 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Unix/CurlHandler.SslProvider.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.SslProvider.Linux.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.IO; using System.Net.Security; using System.Runtime.InteropServices; using System.Security.Authentication; @@ -24,6 +25,8 @@ namespace System.Net.Http private static readonly Interop.Http.SslCtxCallback s_sslCtxCallback = SslCtxCallback; private static readonly Interop.Ssl.AppVerifyCallback s_sslVerifyCallback = VerifyCertChain; private static readonly Oid s_serverAuthOid = new Oid("1.3.6.1.5.5.7.3.1"); + private static string _sslCaPath; + private static string _sslCaInfo; internal static void SetSslOptions(EasyRequest easy, ClientCertificateOption clientCertOption) { @@ -101,25 +104,64 @@ namespace System.Net.Http } } + private static void GetSslCaLocations(out string path, out string info) + { + // We only provide curl option values when SSL_CERT_FILE or SSL_CERT_DIR is set. + // When that is the case, we set the options so curl ends up using the same certificates as the + // X509 machine store. + path = _sslCaPath; + info = _sslCaInfo; + + if (path == null || info == null) + { + bool hasEnvironmentVariables = Environment.GetEnvironmentVariable("SSL_CERT_FILE") != null || + Environment.GetEnvironmentVariable("SSL_CERT_DIR") != null; + + if (hasEnvironmentVariables) + { + path = Interop.Crypto.GetX509RootStorePath(); + if (!Directory.Exists(path)) + { + // X509 store ignores non-existing. + path = string.Empty; + } + + info = Interop.Crypto.GetX509RootStoreFile(); + if (!File.Exists(info)) + { + // X509 store ignores non-existing. + info = string.Empty; + } + } + else + { + path = string.Empty; + info = string.Empty; + } + _sslCaPath = path; + _sslCaInfo = info; + } + } + private static void SetSslOptionsForCertificateStore(EasyRequest easy) { // Support specifying certificate directory/bundle via environment variables: SSL_CERT_DIR, SSL_CERT_FILE. - string sslCertDir = Environment.GetEnvironmentVariable("SSL_CERT_DIR"); - if (sslCertDir != null) + GetSslCaLocations(out string sslCaPath, out string sslCaInfo); + + if (sslCaPath != string.Empty) { - easy.SetCurlOption(Interop.Http.CURLoption.CURLOPT_CAPATH, sslCertDir); + easy.SetCurlOption(Interop.Http.CURLoption.CURLOPT_CAPATH, sslCaPath); // https proxy support requires libcurl 7.52.0+ - easy.TrySetCurlOption(Interop.Http.CURLoption.CURLOPT_PROXY_CAPATH, sslCertDir); + easy.TrySetCurlOption(Interop.Http.CURLoption.CURLOPT_PROXY_CAPATH, sslCaPath); } - string sslCertFile = Environment.GetEnvironmentVariable("SSL_CERT_FILE"); - if (sslCertFile != null) + if (sslCaInfo != string.Empty) { - easy.SetCurlOption(Interop.Http.CURLoption.CURLOPT_CAINFO, sslCertFile); + easy.SetCurlOption(Interop.Http.CURLoption.CURLOPT_CAINFO, sslCaInfo); // https proxy support requires libcurl 7.52.0+ - easy.TrySetCurlOption(Interop.Http.CURLoption.CURLOPT_PROXY_CAINFO, sslCertFile); + easy.TrySetCurlOption(Interop.Http.CURLoption.CURLOPT_PROXY_CAINFO, sslCaInfo); } } @@ -127,12 +169,12 @@ namespace System.Net.Http { if (certProvider != null) { - throw new PlatformNotSupportedException(SR.Format(SR.net_http_libcurl_clientcerts_notsupported, CurlVersionDescription, CurlSslVersionDescription)); + throw new PlatformNotSupportedException(SR.Format(SR.net_http_libcurl_clientcerts_notsupported_sslbackend, CurlVersionDescription, CurlSslVersionDescription, Interop.Http.OpenSsl10Description)); } if (easy._handler.CheckCertificateRevocationList) { - throw new PlatformNotSupportedException(SR.Format(SR.net_http_libcurl_revocation_notsupported, CurlVersionDescription, CurlSslVersionDescription)); + throw new PlatformNotSupportedException(SR.Format(SR.net_http_libcurl_revocation_notsupported_sslbackend, CurlVersionDescription, CurlSslVersionDescription, Interop.Http.OpenSsl10Description)); } if (easy._handler.ServerCertificateCustomValidationCallback != null) @@ -145,7 +187,7 @@ namespace System.Net.Http } else { - throw new PlatformNotSupportedException(SR.Format(SR.net_http_libcurl_callback_notsupported, CurlVersionDescription, CurlSslVersionDescription)); + throw new PlatformNotSupportedException(SR.Format(SR.net_http_libcurl_callback_notsupported_sslbackend, CurlVersionDescription, CurlSslVersionDescription, Interop.Http.OpenSsl10Description)); } } else @@ -167,16 +209,21 @@ namespace System.Net.Http return; } - // We explicitly disallow choosing SSL2/3. Make sure they were filtered out. - Debug.Assert((protocols & ~SecurityProtocol.AllowedSecurityProtocols) == 0, - "Disallowed protocols should have been filtered out."); - // libcurl supports options for either enabling all of the TLS1.* protocols or enabling - // just one of them; it doesn't currently support enabling two of the three, e.g. you can't + // just one protocol; it doesn't currently support enabling two of the three, e.g. you can't // pick TLS1.1 and TLS1.2 but not TLS1.0, but you can select just TLS1.2. Interop.Http.CurlSslVersion curlSslVersion; switch (protocols) { +#pragma warning disable 0618 // SSL2/3 are deprecated + case SslProtocols.Ssl2: + curlSslVersion = Interop.Http.CurlSslVersion.CURL_SSLVERSION_SSLv2; + break; + case SslProtocols.Ssl3: + curlSslVersion = Interop.Http.CurlSslVersion.CURL_SSLVERSION_SSLv3; + break; +#pragma warning restore 0618 + case SslProtocols.Tls: curlSslVersion = Interop.Http.CurlSslVersion.CURL_SSLVERSION_TLSv1_0; break; diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/OSX/CurlHandler.SslProvider.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.SslProvider.OSX.cs similarity index 88% rename from external/corefx/src/System.Net.Http/src/System/Net/Http/OSX/CurlHandler.SslProvider.cs rename to external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.SslProvider.OSX.cs index 134cfec0dc..42b83fc6a3 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/OSX/CurlHandler.SslProvider.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.SslProvider.OSX.cs @@ -29,11 +29,7 @@ namespace System.Net.Http // only via writing it to a file and letting it load the PFX. // This would require that a) we write said file, and b) that it contaminate the default // keychain (because their PFX loader loads to the default keychain). - throw new PlatformNotSupportedException( - SR.Format( - SR.net_http_libcurl_clientcerts_notsupported, - CurlVersionDescription, - CurlSslVersionDescription)); + throw new PlatformNotSupportedException(SR.net_http_libcurl_clientcerts_notsupported_os); } // Revocation checking is always on for darwinssl (SecureTransport). @@ -44,9 +40,10 @@ namespace System.Net.Http { throw new PlatformNotSupportedException( SR.Format( - SR.net_http_libcurl_revocation_notsupported, + SR.net_http_libcurl_revocation_notsupported_sslbackend, CurlVersionDescription, - CurlSslVersionDescription)); + CurlSslVersionDescription, + Interop.Http.SecureTransportDescription)); } if (easy._handler.ServerCertificateCustomValidationCallback != null) @@ -87,11 +84,7 @@ namespace System.Net.Http } else { - throw new PlatformNotSupportedException( - SR.Format( - SR.net_http_libcurl_callback_notsupported, - CurlVersionDescription, - CurlSslVersionDescription)); + throw new PlatformNotSupportedException(SR.net_http_libcurl_callback_notsupported_os); } } @@ -108,16 +101,21 @@ namespace System.Net.Http return; } - // We explicitly disallow choosing SSL2/3. Make sure they were filtered out. - Debug.Assert((protocols & ~SecurityProtocol.AllowedSecurityProtocols) == 0, - "Disallowed protocols should have been filtered out."); - // libcurl supports options for either enabling all of the TLS1.* protocols or enabling - // just one of them; it doesn't currently support enabling two of the three, e.g. you can't + // just one protocol; it doesn't currently support enabling two of the three, e.g. you can't // pick TLS1.1 and TLS1.2 but not TLS1.0, but you can select just TLS1.2. Interop.Http.CurlSslVersion curlSslVersion; switch (protocols) { +#pragma warning disable 0618 // SSL2/3 are deprecated + case SslProtocols.Ssl2: + curlSslVersion = Interop.Http.CurlSslVersion.CURL_SSLVERSION_SSLv2; + break; + case SslProtocols.Ssl3: + curlSslVersion = Interop.Http.CurlSslVersion.CURL_SSLVERSION_SSLv3; + break; +#pragma warning restore 0618 + case SslProtocols.Tls: curlSslVersion = Interop.Http.CurlSslVersion.CURL_SSLVERSION_TLSv1_0; break; diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Unix/CurlHandler.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.cs similarity index 98% rename from external/corefx/src/System.Net.Http/src/System/Net/Http/Unix/CurlHandler.cs rename to external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.cs index 88eae1bf51..ba51560b68 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Unix/CurlHandler.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.cs @@ -218,10 +218,6 @@ namespace System.Net.Http } } - internal bool SupportsProxy => true; - - internal bool SupportsRedirectConfiguration => true; - internal bool UseProxy { get { return _useProxy; } @@ -312,7 +308,6 @@ namespace System.Net.Http get { return _sslProtocols; } set { - SecurityProtocol.ThrowOnNotAllowed(value, allowNone: true); CheckDisposedOrStarted(); _sslProtocols = value; } @@ -465,7 +460,9 @@ namespace System.Net.Http if (request.Headers.TransferEncodingChunked.GetValueOrDefault() && (request.Content == null)) { - throw new InvalidOperationException(SR.net_http_chunked_not_allowed_with_empty_content); + return Task.FromException( + new HttpRequestException(SR.net_http_client_execution_error, + new InvalidOperationException(SR.net_http_chunked_not_allowed_with_empty_content))); } if (_useCookies && _cookieContainer == null) @@ -769,6 +766,8 @@ namespace System.Net.Http // Deal with conflict between 'Content-Length' vs. 'Transfer-Encoding: chunked' semantics. // libcurl adds a Transfer-Encoding header by default and the request fails if both are set. + // ISSUE: 25163 + // Ideally we want to avoid modifying the users request message. if (requestContent.Headers.ContentLength.HasValue) { if (chunkedMode) diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Unix/CurlResponseHeaderReader.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlResponseHeaderReader.cs similarity index 100% rename from external/corefx/src/System.Net.Http/src/System/Net/Http/Unix/CurlResponseHeaderReader.cs rename to external/corefx/src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlResponseHeaderReader.cs diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/DiagnosticsHandler.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/DiagnosticsHandler.cs index 69663bb74f..3ddb71c87a 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/DiagnosticsHandler.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/DiagnosticsHandler.cs @@ -92,10 +92,12 @@ namespace System.Net.Http } } - Task responseTask = base.SendAsync(request, cancellationToken); + Task responseTask = null; try { - await responseTask.ConfigureAwait(false); + responseTask = base.SendAsync(request, cancellationToken); + + return await responseTask.ConfigureAwait(false); } catch (TaskCanceledException) { @@ -120,12 +122,12 @@ namespace System.Net.Http { s_diagnosticListener.StopActivity(activity, new { - Response = responseTask.Status == TaskStatus.RanToCompletion ? responseTask.Result : null, + Response = responseTask?.Status == TaskStatus.RanToCompletion ? responseTask.Result : null, //If request is failed or cancelled, there is no reponse, therefore no information about request; //pass the request in the payload, so consumers can have it in Stop for failed/canceled requests //and not retain all requests in Start Request = request, - RequestTaskStatus = responseTask.Status + RequestTaskStatus = responseTask?.Status ?? TaskStatus.Faulted }); } // Try to write System.Net.Http.Response event (deprecated) @@ -135,15 +137,14 @@ namespace System.Net.Http s_diagnosticListener.Write(DiagnosticsHandlerLoggingStrings.ResponseWriteNameDeprecated, new { - Response = responseTask.Status == TaskStatus.RanToCompletion ? responseTask.Result : null, + Response = responseTask?.Status == TaskStatus.RanToCompletion ? responseTask.Result : null, LoggingRequestId = loggingRequestId, TimeStamp = timestamp, - RequestTaskStatus = responseTask.Status + RequestTaskStatus = responseTask?.Status ?? TaskStatus.Faulted } ); } } - return responseTask.Result; } #region private @@ -153,4 +154,4 @@ namespace System.Net.Http #endregion } -} \ No newline at end of file +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/AuthenticationHeaderValue.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/AuthenticationHeaderValue.cs index 48caee22bb..fadc33d606 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/AuthenticationHeaderValue.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/AuthenticationHeaderValue.cs @@ -136,8 +136,19 @@ namespace System.Net.Http.Headers return 0; } - AuthenticationHeaderValue result = new AuthenticationHeaderValue(); - result._scheme = input.Substring(startIndex, schemeLength); + var result = new AuthenticationHeaderValue(); + string targetScheme = null; + switch (schemeLength) + { + // Avoid allocating a scheme string for the most common cases. + case 5: targetScheme = "Basic"; break; + case 6: targetScheme = "Digest"; break; + case 4: targetScheme = "NTLM"; break; + case 9: targetScheme = "Negotiate"; break; + } + result._scheme = targetScheme != null && string.CompareOrdinal(input, startIndex, targetScheme, 0, schemeLength) == 0 ? + targetScheme : + result._scheme = input.Substring(startIndex, schemeLength); int current = startIndex + schemeLength; int whitespaceLength = HttpRuleParser.GetWhitespaceLength(input, current); diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/HeaderDescriptor.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/HeaderDescriptor.cs index 16b268a73e..a820229d08 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/HeaderDescriptor.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/HeaderDescriptor.cs @@ -31,6 +31,7 @@ namespace System.Net.Http.Headers public string Name => _headerName; public HttpHeaderParser Parser => _knownHeader?.Parser; public HttpHeaderType HeaderType => _knownHeader == null ? HttpHeaderType.Custom : _knownHeader.HeaderType; + public KnownHeader KnownHeader => _knownHeader; public bool Equals(HeaderDescriptor other) => _knownHeader == null ? @@ -81,7 +82,7 @@ namespace System.Net.Http.Headers return false; } - descriptor = new HeaderDescriptor(ByteArrayHelpers.GetStringFromByteSpan(headerName)); + descriptor = new HeaderDescriptor(HttpRuleParser.GetTokenString(headerName)); return true; } @@ -112,7 +113,7 @@ namespace System.Net.Http.Headers } } - return ByteArrayHelpers.GetStringFromByteSpan(headerValue); + return HttpRuleParser.DefaultHttpEncoding.GetString(headerValue); } } } diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/HttpHeaderParser.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/HttpHeaderParser.cs index bc50cad559..ca9c27ec52 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/HttpHeaderParser.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/HttpHeaderParser.cs @@ -8,9 +8,6 @@ using System.Diagnostics.Contracts; namespace System.Net.Http.Headers { -#if DEBUG - [ContractClass(typeof(HttpHeaderParserContract))] -#endif internal abstract class HttpHeaderParser { internal const string DefaultSeparator = ", "; @@ -91,25 +88,4 @@ namespace System.Net.Http.Headers return value.ToString(); } } - -#if DEBUG - [ContractClassFor(typeof(HttpHeaderParser))] - internal abstract class HttpHeaderParserContract : HttpHeaderParser - { - public HttpHeaderParserContract() - : base(false) - { - } - - public override bool TryParseValue(string value, object storeValue, ref int index, out object parsedValue) - { - // Index may be value.Length (e.g. both 0). This may be allowed for some headers (e.g. Accept but not - // allowed by others (e.g. Content-Length). The parser has to decide if this is valid or not. - Debug.Assert((value == null) || ((index >= 0) && (index <= value.Length))); - - parsedValue = null; - return false; - } - } -#endif } diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/HttpHeaders.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/HttpHeaders.cs index c6c2930023..c59c013131 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/HttpHeaders.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/HttpHeaders.cs @@ -380,9 +380,61 @@ namespace System.Net.Http.Headers } } -#endregion + // The following is the same general code as the above GetEnumerator, but returning the + // HeaderDescriptor and values string[], rather than the key name and a values enumerable. -#region IEnumerable Members + internal IEnumerable> GetHeaderDescriptorsAndValues() + { + return _headerStore != null && _headerStore.Count > 0 ? + GetHeaderDescriptorsAndValuesCore() : + Array.Empty>(); + } + + private IEnumerable> GetHeaderDescriptorsAndValuesCore() + { + List invalidHeaders = null; + + foreach (var header in _headerStore) + { + HeaderDescriptor descriptor = header.Key; + HeaderStoreItemInfo info = header.Value; + + // Make sure we parse all raw values before returning the result. Note that this has to be + // done before we calculate the array length (next line): A raw value may contain a list of + // values. + if (!ParseRawHeaderValues(descriptor, info, false)) + { + // We have an invalid header value (contains invalid newline chars). Mark it as "to-be-deleted" + // and skip this header. + if (invalidHeaders == null) + { + invalidHeaders = new List(); + } + invalidHeaders.Add(descriptor); + } + else + { + string[] values = GetValuesAsStrings(descriptor, info); + yield return new KeyValuePair(descriptor, values); + } + } + + // While we were enumerating headers, we also parsed header values. If during parsing it turned out that + // the header value was invalid (contains invalid newline chars), remove the header from the store after + // completing the enumeration. + if (invalidHeaders != null) + { + Debug.Assert(_headerStore != null); + foreach (HeaderDescriptor invalidheaderInfo in invalidHeaders) + { + _headerStore.Remove(invalidheaderInfo); + } + } + } + + #endregion + + #region IEnumerable Members Collections.IEnumerator Collections.IEnumerable.GetEnumerator() { @@ -968,13 +1020,13 @@ namespace System.Net.Http.Headers { case StoreLocation.Raw: currentStoreValue = info.RawValue; - AddValueToStoreValue(info, value, ref currentStoreValue); + AddValueToStoreValue(value, ref currentStoreValue); info.RawValue = currentStoreValue; break; case StoreLocation.Invalid: currentStoreValue = info.InvalidValue; - AddValueToStoreValue(info, value, ref currentStoreValue); + AddValueToStoreValue(value, ref currentStoreValue); info.InvalidValue = currentStoreValue; break; @@ -983,7 +1035,7 @@ namespace System.Net.Http.Headers "Header value types must not derive from List since this type is used internally to store " + "lists of values. So we would not be able to distinguish between a single value and a list of values."); currentStoreValue = info.ParsedValue; - AddValueToStoreValue(info, value, ref currentStoreValue); + AddValueToStoreValue(value, ref currentStoreValue); info.ParsedValue = currentStoreValue; break; @@ -993,8 +1045,7 @@ namespace System.Net.Http.Headers } } - private static void AddValueToStoreValue(HeaderStoreItemInfo info, object value, - ref object currentStoreValue) where T : class + private static void AddValueToStoreValue(object value, ref object currentStoreValue) where T : class { // If there is no value set yet, then add current item as value (we don't create a list // if not required). If 'info.Value' is already assigned then make sure 'info.Value' is a @@ -1010,7 +1061,7 @@ namespace System.Net.Http.Headers if (storeValues == null) { storeValues = new List(2); - Debug.Assert(value is T); + Debug.Assert(currentStoreValue is T); storeValues.Add(currentStoreValue as T); currentStoreValue = storeValues; } diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/KnownHeader.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/KnownHeader.cs index d71e240950..8b3821a45e 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/KnownHeader.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/KnownHeader.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Text; namespace System.Net.Http.Headers { @@ -12,34 +13,38 @@ namespace System.Net.Http.Headers private readonly HttpHeaderType _headerType; private readonly HttpHeaderParser _parser; private readonly string[] _knownValues; + private readonly byte[] _asciiBytesWithColonSpace; + + public KnownHeader(string name) : this(name, HttpHeaderType.Custom, null) + { + Debug.Assert(!string.IsNullOrEmpty(name)); + Debug.Assert(HttpRuleParser.GetTokenLength(name, 0) == name.Length); + } public KnownHeader(string name, HttpHeaderType headerType, HttpHeaderParser parser, string[] knownValues = null) { Debug.Assert(!string.IsNullOrEmpty(name)); Debug.Assert(HttpRuleParser.GetTokenLength(name, 0) == name.Length); - Debug.Assert(headerType != HttpHeaderType.Custom); - Debug.Assert(parser != null); + Debug.Assert((headerType == HttpHeaderType.Custom) == (parser == null)); + Debug.Assert(knownValues == null || headerType != HttpHeaderType.Custom); _name = name; _headerType = headerType; _parser = parser; _knownValues = knownValues; - } - public KnownHeader(string name) - { - Debug.Assert(!string.IsNullOrEmpty(name)); - Debug.Assert(HttpRuleParser.GetTokenLength(name, 0) == name.Length); - - _name = name; - _headerType = HttpHeaderType.Custom; - _parser = null; + _asciiBytesWithColonSpace = new byte[name.Length + 2]; // + 2 for ':' and ' ' + int asciiBytes = Encoding.ASCII.GetBytes(name, _asciiBytesWithColonSpace); + Debug.Assert(asciiBytes == name.Length); + _asciiBytesWithColonSpace[_asciiBytesWithColonSpace.Length - 2] = (byte)':'; + _asciiBytesWithColonSpace[_asciiBytesWithColonSpace.Length - 1] = (byte)' '; } public string Name => _name; public HttpHeaderParser Parser => _parser; public HttpHeaderType HeaderType => _headerType; public string[] KnownValues => _knownValues; + public byte[] AsciiBytesWithColonSpace => _asciiBytesWithColonSpace; public HeaderDescriptor Descriptor => new HeaderDescriptor(this); } } diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/KnownHeaders.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/KnownHeaders.cs index 2d1d035bf0..fb22756f1e 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/KnownHeaders.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/KnownHeaders.cs @@ -62,6 +62,7 @@ namespace System.Net.Http.Headers public static readonly KnownHeader ProxyAuthenticate = new KnownHeader("Proxy-Authenticate", HttpHeaderType.Response, GenericHeaderParser.MultipleValueAuthenticationParser); public static readonly KnownHeader ProxyAuthorization = new KnownHeader("Proxy-Authorization", HttpHeaderType.Request, GenericHeaderParser.SingleValueAuthenticationParser); public static readonly KnownHeader ProxyConnection = new KnownHeader("Proxy-Connection"); + public static readonly KnownHeader ProxySupport = new KnownHeader("Proxy-Support"); public static readonly KnownHeader PublicKeyPins = new KnownHeader("Public-Key-Pins"); public static readonly KnownHeader Range = new KnownHeader("Range", HttpHeaderType.Request, GenericHeaderParser.RangeParser); public static readonly KnownHeader Referer = new KnownHeader("Referer", HttpHeaderType.Request, UriHeaderParser.RelativeOrAbsoluteUriParser); // NB: The spelling-mistake "Referer" for "Referrer" must be matched. @@ -248,6 +249,7 @@ namespace System.Net.Http.Headers case 'T': case 't': return ContentRange; // Conten[t]-Range case 'E': case 'e': return IfNoneMatch; // If-Non[e]-Match case 'O': case 'o': return LastModified; // Last-M[o]dified + case 'S': case 's': return ProxySupport; // Proxy-[S]upport } break; diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/MediaTypeHeaderValue.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/MediaTypeHeaderValue.cs index 48d441b5ca..3607debd92 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/MediaTypeHeaderValue.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/Headers/MediaTypeHeaderValue.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Text; namespace System.Net.Http.Headers { diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClient.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClient.cs index 1bcac19a93..6f199b2b74 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClient.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClient.cs @@ -452,8 +452,18 @@ namespace System.Net.Http cts = _pendingRequestsCts; } - // Initiate the send - Task sendTask = base.SendAsync(request, cts.Token); + // Initiate the send. + Task sendTask; + try + { + sendTask = base.SendAsync(request, cts.Token); + } + catch + { + HandleFinishSendAsyncCleanup(cts, disposeCts); + throw; + } + return completionOption == HttpCompletionOption.ResponseContentRead ? FinishSendAsyncBuffered(sendTask, request, cts, disposeCts) : FinishSendAsyncUnbuffered(sendTask, request, cts, disposeCts); @@ -475,7 +485,7 @@ namespace System.Net.Http // Buffer the response content if we've been asked to and we have a Content to buffer. if (response.Content != null) { - await response.Content.LoadIntoBufferAsync(_maxResponseContentBufferSize).ConfigureAwait(false); + await response.Content.LoadIntoBufferAsync(_maxResponseContentBufferSize, cts.Token).ConfigureAwait(false); } if (NetEventSource.IsEnabled) NetEventSource.ClientSendCompleted(this, response, request); diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClientHandler.Unix.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClientHandler.Unix.cs index 1ab67fabd1..581e9db931 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClientHandler.Unix.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClientHandler.Unix.cs @@ -15,15 +15,19 @@ namespace System.Net.Http { // Only one of these two handlers will be initialized. private readonly CurlHandler _curlHandler; - private readonly ManagedHandler _managedHandler; + private readonly SocketsHttpHandler _socketsHttpHandler; private readonly DiagnosticsHandler _diagnosticsHandler; + private ClientCertificateOption _clientCertificateOptions; - public HttpClientHandler() + public HttpClientHandler() : this(UseSocketsHttpHandler) { } + + private HttpClientHandler(bool useSocketsHttpHandler) // used by parameterless ctor and as hook for testing { - if (UseManagedHandler) + if (useSocketsHttpHandler) { - _managedHandler = new ManagedHandler(); - _diagnosticsHandler = new DiagnosticsHandler(_managedHandler); + _socketsHttpHandler = new SocketsHttpHandler(); + _diagnosticsHandler = new DiagnosticsHandler(_socketsHttpHandler); + ClientCertificateOptions = ClientCertificateOption.Manual; } else { @@ -36,26 +40,20 @@ namespace System.Net.Http { if (disposing) { - ((HttpMessageHandler)_curlHandler ?? _managedHandler).Dispose(); + ((HttpMessageHandler)_curlHandler ?? _socketsHttpHandler).Dispose(); } base.Dispose(disposing); } - public virtual bool SupportsAutomaticDecompression => _curlHandler != null ? - _curlHandler.SupportsAutomaticDecompression : - _managedHandler.SupportsAutomaticDecompression; + public virtual bool SupportsAutomaticDecompression => _curlHandler == null || _curlHandler.SupportsAutomaticDecompression; - public virtual bool SupportsProxy => _curlHandler != null ? - _curlHandler.SupportsProxy : - _managedHandler.SupportsProxy; + public virtual bool SupportsProxy => true; - public virtual bool SupportsRedirectConfiguration => _curlHandler != null ? - _curlHandler.SupportsRedirectConfiguration : - _managedHandler.SupportsRedirectConfiguration; + public virtual bool SupportsRedirectConfiguration => true; public bool UseCookies { - get => _curlHandler != null ? _curlHandler.UseCookies : _managedHandler.UseCookies; + get => _curlHandler != null ? _curlHandler.UseCookies : _socketsHttpHandler.UseCookies; set { if (_curlHandler != null) @@ -64,14 +62,14 @@ namespace System.Net.Http } else { - _managedHandler.UseCookies = value; + _socketsHttpHandler.UseCookies = value; } } } public CookieContainer CookieContainer { - get => _curlHandler != null ? _curlHandler.CookieContainer : _managedHandler.CookieContainer; + get => _curlHandler != null ? _curlHandler.CookieContainer : _socketsHttpHandler.CookieContainer; set { if (_curlHandler != null) @@ -80,14 +78,24 @@ namespace System.Net.Http } else { - _managedHandler.CookieContainer = value; + _socketsHttpHandler.CookieContainer = value; } } } public ClientCertificateOption ClientCertificateOptions { - get => _curlHandler != null ? _curlHandler.ClientCertificateOptions : _managedHandler.ClientCertificateOptions; + get + { + if (_curlHandler != null) + { + return _curlHandler.ClientCertificateOptions; + } + else + { + return _clientCertificateOptions; + } + } set { if (_curlHandler != null) @@ -96,18 +104,56 @@ namespace System.Net.Http } else { - _managedHandler.ClientCertificateOptions = value; + switch (value) + { + case ClientCertificateOption.Manual: + ThrowForModifiedManagedSslOptionsIfStarted(); + _clientCertificateOptions = value; + _socketsHttpHandler.SslOptions.LocalCertificateSelectionCallback = (sender, targetHost, localCertificates, remoteCertificate, acceptableIssuers) => CertificateHelper.GetEligibleClientCertificate(ClientCertificates); + break; + + case ClientCertificateOption.Automatic: + ThrowForModifiedManagedSslOptionsIfStarted(); + _clientCertificateOptions = value; + _socketsHttpHandler.SslOptions.LocalCertificateSelectionCallback = (sender, targetHost, localCertificates, remoteCertificate, acceptableIssuers) => CertificateHelper.GetEligibleClientCertificate(); + break; + + default: + throw new ArgumentOutOfRangeException(nameof(value)); + } } } } - public X509CertificateCollection ClientCertificates => _curlHandler != null ? - _curlHandler.ClientCertificates : - _managedHandler.ClientCertificates; + public X509CertificateCollection ClientCertificates + { + get + { + if (_curlHandler != null) + { + return _curlHandler.ClientCertificates; + } + else + { + if (ClientCertificateOptions != ClientCertificateOption.Manual) + { + throw new InvalidOperationException(SR.Format(SR.net_http_invalid_enable_first, nameof(ClientCertificateOptions), nameof(ClientCertificateOption.Manual))); + } + + return _socketsHttpHandler.SslOptions.ClientCertificates ?? + (_socketsHttpHandler.SslOptions.ClientCertificates = new X509CertificateCollection()); + } + } + } public Func ServerCertificateCustomValidationCallback { - get => _curlHandler != null ? _curlHandler.ServerCertificateCustomValidationCallback : _managedHandler.ServerCertificateCustomValidationCallback; + get + { + return _curlHandler != null ? + _curlHandler.ServerCertificateCustomValidationCallback : + (_socketsHttpHandler.SslOptions.RemoteCertificateValidationCallback?.Target as ConnectHelper.CertificateCallbackMapper)?.FromHttpClientHandler; + } set { if (_curlHandler != null) @@ -116,14 +162,17 @@ namespace System.Net.Http } else { - _managedHandler.ServerCertificateCustomValidationCallback = value; + ThrowForModifiedManagedSslOptionsIfStarted(); + _socketsHttpHandler.SslOptions.RemoteCertificateValidationCallback = value != null ? + new ConnectHelper.CertificateCallbackMapper(value).ForSocketsHttpHandler : + null; } } } public bool CheckCertificateRevocationList { - get => _curlHandler != null ? _curlHandler.CheckCertificateRevocationList : _managedHandler.CheckCertificateRevocationList; + get => _curlHandler != null ? _curlHandler.CheckCertificateRevocationList : _socketsHttpHandler.SslOptions.CertificateRevocationCheckMode == X509RevocationMode.Online; set { if (_curlHandler != null) @@ -132,14 +181,15 @@ namespace System.Net.Http } else { - _managedHandler.CheckCertificateRevocationList = value; + ThrowForModifiedManagedSslOptionsIfStarted(); + _socketsHttpHandler.SslOptions.CertificateRevocationCheckMode = value ? X509RevocationMode.Online : X509RevocationMode.NoCheck; } } } public SslProtocols SslProtocols { - get => _curlHandler != null ? _curlHandler.SslProtocols : _managedHandler.SslProtocols; + get => _curlHandler != null ? _curlHandler.SslProtocols : _socketsHttpHandler.SslOptions.EnabledSslProtocols; set { if (_curlHandler != null) @@ -148,14 +198,15 @@ namespace System.Net.Http } else { - _managedHandler.SslProtocols = value; + ThrowForModifiedManagedSslOptionsIfStarted(); + _socketsHttpHandler.SslOptions.EnabledSslProtocols = value; } } } public DecompressionMethods AutomaticDecompression { - get => _curlHandler != null ? _curlHandler.AutomaticDecompression : _managedHandler.AutomaticDecompression; + get => _curlHandler != null ? _curlHandler.AutomaticDecompression : _socketsHttpHandler.AutomaticDecompression; set { if (_curlHandler != null) @@ -164,14 +215,14 @@ namespace System.Net.Http } else { - _managedHandler.AutomaticDecompression = value; + _socketsHttpHandler.AutomaticDecompression = value; } } } public bool UseProxy { - get => _curlHandler != null ? _curlHandler.UseProxy : _managedHandler.UseProxy; + get => _curlHandler != null ? _curlHandler.UseProxy : _socketsHttpHandler.UseProxy; set { if (_curlHandler != null) @@ -180,14 +231,14 @@ namespace System.Net.Http } else { - _managedHandler.UseProxy = value; + _socketsHttpHandler.UseProxy = value; } } } public IWebProxy Proxy { - get => _curlHandler != null ? _curlHandler.Proxy : _managedHandler.Proxy; + get => _curlHandler != null ? _curlHandler.Proxy : _socketsHttpHandler.Proxy; set { if (_curlHandler != null) @@ -196,14 +247,14 @@ namespace System.Net.Http } else { - _managedHandler.Proxy = value; + _socketsHttpHandler.Proxy = value; } } } public ICredentials DefaultProxyCredentials { - get => _curlHandler != null ? _curlHandler.DefaultProxyCredentials : _managedHandler.DefaultProxyCredentials; + get => _curlHandler != null ? _curlHandler.DefaultProxyCredentials : _socketsHttpHandler.DefaultProxyCredentials; set { if (_curlHandler != null) @@ -212,14 +263,14 @@ namespace System.Net.Http } else { - _managedHandler.DefaultProxyCredentials = value; + _socketsHttpHandler.DefaultProxyCredentials = value; } } } public bool PreAuthenticate { - get => _curlHandler != null ? _curlHandler.PreAuthenticate : _managedHandler.PreAuthenticate; + get => _curlHandler != null ? _curlHandler.PreAuthenticate : _socketsHttpHandler.PreAuthenticate; set { if (_curlHandler != null) @@ -228,14 +279,15 @@ namespace System.Net.Http } else { - _managedHandler.PreAuthenticate = value; + _socketsHttpHandler.PreAuthenticate = value; } } } public bool UseDefaultCredentials { - get => _curlHandler != null ? _curlHandler.UseDefaultCredentials : _managedHandler.UseDefaultCredentials; + // Either read variable from curlHandler or compare .Credentials as socketsHttpHandler does not have separate prop. + get => _curlHandler != null ? _curlHandler.UseDefaultCredentials : _socketsHttpHandler.Credentials == CredentialCache.DefaultCredentials; set { if (_curlHandler != null) @@ -244,14 +296,25 @@ namespace System.Net.Http } else { - _managedHandler.UseDefaultCredentials = value; + if (value) + { + _socketsHttpHandler.Credentials = CredentialCache.DefaultCredentials; + } + else + { + if (_socketsHttpHandler.Credentials == CredentialCache.DefaultCredentials) + { + // Only clear out the Credentials property if it was a DefaultCredentials. + _socketsHttpHandler.Credentials = null; + } + } } } } public ICredentials Credentials { - get => _curlHandler != null ? _curlHandler.Credentials : _managedHandler.Credentials; + get => _curlHandler != null ? _curlHandler.Credentials : _socketsHttpHandler.Credentials; set { if (_curlHandler != null) @@ -260,14 +323,14 @@ namespace System.Net.Http } else { - _managedHandler.Credentials = value; + _socketsHttpHandler.Credentials = value; } } } public bool AllowAutoRedirect { - get => _curlHandler != null ? _curlHandler.AllowAutoRedirect : _managedHandler.AllowAutoRedirect; + get => _curlHandler != null ? _curlHandler.AllowAutoRedirect : _socketsHttpHandler.AllowAutoRedirect; set { if (_curlHandler != null) @@ -276,14 +339,14 @@ namespace System.Net.Http } else { - _managedHandler.AllowAutoRedirect = value; + _socketsHttpHandler.AllowAutoRedirect = value; } } } public int MaxAutomaticRedirections { - get => _curlHandler != null ? _curlHandler.MaxAutomaticRedirections : _managedHandler.MaxAutomaticRedirections; + get => _curlHandler != null ? _curlHandler.MaxAutomaticRedirections : _socketsHttpHandler.MaxAutomaticRedirections; set { if (_curlHandler != null) @@ -292,14 +355,14 @@ namespace System.Net.Http } else { - _managedHandler.MaxAutomaticRedirections = value; + _socketsHttpHandler.MaxAutomaticRedirections = value; } } } public int MaxConnectionsPerServer { - get => _curlHandler != null ? _curlHandler.MaxConnectionsPerServer : _managedHandler.MaxConnectionsPerServer; + get => _curlHandler != null ? _curlHandler.MaxConnectionsPerServer : _socketsHttpHandler.MaxConnectionsPerServer; set { if (_curlHandler != null) @@ -308,14 +371,14 @@ namespace System.Net.Http } else { - _managedHandler.MaxConnectionsPerServer = value; + _socketsHttpHandler.MaxConnectionsPerServer = value; } } } public int MaxResponseHeadersLength { - get => _curlHandler != null ? _curlHandler.MaxResponseHeadersLength : _managedHandler.MaxResponseHeadersLength; + get => _curlHandler != null ? _curlHandler.MaxResponseHeadersLength : _socketsHttpHandler.MaxResponseHeadersLength; set { if (_curlHandler != null) @@ -324,18 +387,18 @@ namespace System.Net.Http } else { - _managedHandler.MaxResponseHeadersLength = value; + _socketsHttpHandler.MaxResponseHeadersLength = value; } } } - public IDictionary Properties => _curlHandler != null ? + public IDictionary Properties => _curlHandler != null ? _curlHandler.Properties : - _managedHandler.Properties; + _socketsHttpHandler.Properties; protected internal override Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) => DiagnosticsHandler.IsEnabled() ? _diagnosticsHandler.SendAsync(request, cancellationToken) : _curlHandler != null ? _curlHandler.SendAsync(request, cancellationToken) : - _managedHandler.SendAsync(request, cancellationToken); + _socketsHttpHandler.SendAsync(request, cancellationToken); } } diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClientHandler.Windows.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClientHandler.Windows.cs index 7893fba575..5ce147043f 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClientHandler.Windows.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClientHandler.Windows.cs @@ -3,8 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; -using System.Globalization; -using System.Net.Http.Headers; using System.Net.Security; using System.Security.Authentication; using System.Security.Cryptography.X509Certificates; @@ -18,16 +16,21 @@ namespace System.Net.Http public partial class HttpClientHandler : HttpMessageHandler { private readonly WinHttpHandler _winHttpHandler; - private readonly ManagedHandler _managedHandler; + private readonly SocketsHttpHandler _socketsHttpHandler; private readonly DiagnosticsHandler _diagnosticsHandler; private bool _useProxy; + private ClientCertificateOption _clientCertificateOptions; - public HttpClientHandler() + public HttpClientHandler() : this(UseSocketsHttpHandler) { } + + private HttpClientHandler(bool useSocketsHttpHandler) // used by parameterless ctor and as hook for testing { - if (UseManagedHandler) + if (useSocketsHttpHandler) { - _managedHandler = new ManagedHandler(); - _diagnosticsHandler = new DiagnosticsHandler(_managedHandler); + _socketsHttpHandler = new SocketsHttpHandler(); + _diagnosticsHandler = new DiagnosticsHandler(_socketsHttpHandler); + ClientCertificateOptions = ClientCertificateOption.Manual; + } else { @@ -62,7 +65,7 @@ namespace System.Net.Http if (disposing && !_disposed) { _disposed = true; - ((HttpMessageHandler)_winHttpHandler ?? _managedHandler).Dispose(); + ((HttpMessageHandler)_winHttpHandler ?? _socketsHttpHandler).Dispose(); } base.Dispose(disposing); @@ -74,7 +77,7 @@ namespace System.Net.Http public bool UseCookies { - get => _winHttpHandler != null ? _winHttpHandler.CookieUsePolicy == CookieUsePolicy.UseSpecifiedCookieContainer : _managedHandler.UseCookies; + get => _winHttpHandler != null ? _winHttpHandler.CookieUsePolicy == CookieUsePolicy.UseSpecifiedCookieContainer : _socketsHttpHandler.UseCookies; set { if (_winHttpHandler != null) @@ -83,14 +86,14 @@ namespace System.Net.Http } else { - _managedHandler.UseCookies = value; + _socketsHttpHandler.UseCookies = value; } } } public CookieContainer CookieContainer { - get => _winHttpHandler != null ? _winHttpHandler.CookieContainer : _managedHandler.CookieContainer; + get => _winHttpHandler != null ? _winHttpHandler.CookieContainer : _socketsHttpHandler.CookieContainer; set { if (_winHttpHandler != null) @@ -99,30 +102,14 @@ namespace System.Net.Http } else { - _managedHandler.CookieContainer = value; - } - } - } - - public ClientCertificateOption ClientCertificateOptions - { - get => _winHttpHandler != null ? _winHttpHandler.ClientCertificateOption : _managedHandler.ClientCertificateOptions; - set - { - if (_winHttpHandler != null) - { - _winHttpHandler.ClientCertificateOption = value; - } - else - { - _managedHandler.ClientCertificateOptions = value; + _socketsHttpHandler.CookieContainer = value; } } } public DecompressionMethods AutomaticDecompression { - get => _winHttpHandler != null ? _winHttpHandler.AutomaticDecompression : _managedHandler.AutomaticDecompression; + get => _winHttpHandler != null ? _winHttpHandler.AutomaticDecompression : _socketsHttpHandler.AutomaticDecompression; set { if (_winHttpHandler != null) @@ -131,14 +118,14 @@ namespace System.Net.Http } else { - _managedHandler.AutomaticDecompression = value; + _socketsHttpHandler.AutomaticDecompression = value; } } } public bool UseProxy { - get => _winHttpHandler != null ? _useProxy : _managedHandler.UseProxy; + get => _winHttpHandler != null ? _useProxy : _socketsHttpHandler.UseProxy; set { if (_winHttpHandler != null) @@ -147,14 +134,14 @@ namespace System.Net.Http } else { - _managedHandler.UseProxy = value; + _socketsHttpHandler.UseProxy = value; } } } public IWebProxy Proxy { - get => _winHttpHandler != null ? _winHttpHandler.Proxy : _managedHandler.Proxy; + get => _winHttpHandler != null ? _winHttpHandler.Proxy : _socketsHttpHandler.Proxy; set { if (_winHttpHandler != null) @@ -163,14 +150,14 @@ namespace System.Net.Http } else { - _managedHandler.Proxy = value; + _socketsHttpHandler.Proxy = value; } } } public ICredentials DefaultProxyCredentials { - get => _winHttpHandler != null ? _winHttpHandler.DefaultProxyCredentials : _managedHandler.DefaultProxyCredentials; + get => _winHttpHandler != null ? _winHttpHandler.DefaultProxyCredentials : _socketsHttpHandler.DefaultProxyCredentials; set { if (_winHttpHandler != null) @@ -179,14 +166,14 @@ namespace System.Net.Http } else { - _managedHandler.DefaultProxyCredentials = value; + _socketsHttpHandler.DefaultProxyCredentials = value; } } } public bool PreAuthenticate { - get => _winHttpHandler != null ? _winHttpHandler.PreAuthenticate : _managedHandler.PreAuthenticate; + get => _winHttpHandler != null ? _winHttpHandler.PreAuthenticate : _socketsHttpHandler.PreAuthenticate; set { if (_winHttpHandler != null) @@ -195,7 +182,7 @@ namespace System.Net.Http } else { - _managedHandler.PreAuthenticate = value; + _socketsHttpHandler.PreAuthenticate = value; } } } @@ -204,10 +191,12 @@ namespace System.Net.Http { // WinHttpHandler doesn't have a separate UseDefaultCredentials property. There // is just a ServerCredentials property. So, we need to map the behavior. + // Do the same for SocketsHttpHandler.Credentials. // // This property only affect .ServerCredentials and not .DefaultProxyCredentials. - get => _winHttpHandler != null ? _winHttpHandler.ServerCredentials == CredentialCache.DefaultCredentials : _managedHandler.UseDefaultCredentials; + get => _winHttpHandler != null ? _winHttpHandler.ServerCredentials == CredentialCache.DefaultCredentials : + _socketsHttpHandler.Credentials == CredentialCache.DefaultCredentials; set { if (_winHttpHandler != null) @@ -227,14 +216,25 @@ namespace System.Net.Http } else { - _managedHandler.UseDefaultCredentials = value; + if (value) + { + _socketsHttpHandler.Credentials = CredentialCache.DefaultCredentials; + } + else + { + if (_socketsHttpHandler.Credentials == CredentialCache.DefaultCredentials) + { + // Only clear out the Credentials property if it was a DefaultCredentials. + _socketsHttpHandler.Credentials = null; + } + } } } } public ICredentials Credentials { - get => _winHttpHandler != null ? _winHttpHandler.ServerCredentials : _managedHandler.Credentials; + get => _winHttpHandler != null ? _winHttpHandler.ServerCredentials : _socketsHttpHandler.Credentials; set { if (_winHttpHandler != null) @@ -243,14 +243,14 @@ namespace System.Net.Http } else { - _managedHandler.Credentials = value; + _socketsHttpHandler.Credentials = value; } } } public bool AllowAutoRedirect { - get => _winHttpHandler != null ? _winHttpHandler.AutomaticRedirection : _managedHandler.AllowAutoRedirect; + get => _winHttpHandler != null ? _winHttpHandler.AutomaticRedirection : _socketsHttpHandler.AllowAutoRedirect; set { if (_winHttpHandler != null) @@ -259,14 +259,14 @@ namespace System.Net.Http } else { - _managedHandler.AllowAutoRedirect = value; + _socketsHttpHandler.AllowAutoRedirect = value; } } } public int MaxAutomaticRedirections { - get => _winHttpHandler != null ? _winHttpHandler.MaxAutomaticRedirections : _managedHandler.MaxAutomaticRedirections; + get => _winHttpHandler != null ? _winHttpHandler.MaxAutomaticRedirections : _socketsHttpHandler.MaxAutomaticRedirections; set { if (_winHttpHandler != null) @@ -275,14 +275,14 @@ namespace System.Net.Http } else { - _managedHandler.MaxAutomaticRedirections = value; + _socketsHttpHandler.MaxAutomaticRedirections = value; } } } public int MaxConnectionsPerServer { - get => _winHttpHandler != null ? _winHttpHandler.MaxConnectionsPerServer : _managedHandler.MaxConnectionsPerServer; + get => _winHttpHandler != null ? _winHttpHandler.MaxConnectionsPerServer : _socketsHttpHandler.MaxConnectionsPerServer; set { if (_winHttpHandler != null) @@ -291,14 +291,14 @@ namespace System.Net.Http } else { - _managedHandler.MaxConnectionsPerServer = value; + _socketsHttpHandler.MaxConnectionsPerServer = value; } } } public int MaxResponseHeadersLength { - get => _winHttpHandler != null ? _winHttpHandler.MaxResponseHeadersLength : _managedHandler.MaxResponseHeadersLength; + get => _winHttpHandler != null ? _winHttpHandler.MaxResponseHeadersLength : _socketsHttpHandler.MaxResponseHeadersLength; set { if (_winHttpHandler != null) @@ -307,18 +307,82 @@ namespace System.Net.Http } else { - _managedHandler.MaxResponseHeadersLength = value; + _socketsHttpHandler.MaxResponseHeadersLength = value; + } + } + } + + public ClientCertificateOption ClientCertificateOptions + { + get + { + if (_winHttpHandler != null) + { + return _winHttpHandler.ClientCertificateOption; + } + else + { + return _clientCertificateOptions; + } + } + set + { + if (_winHttpHandler != null) + { + _winHttpHandler.ClientCertificateOption = value; + } + else + { + switch (value) + { + case ClientCertificateOption.Manual: + ThrowForModifiedManagedSslOptionsIfStarted(); + _clientCertificateOptions = value; + _socketsHttpHandler.SslOptions.LocalCertificateSelectionCallback = (sender, targetHost, localCertificates, remoteCertificate, acceptableIssuers) => CertificateHelper.GetEligibleClientCertificate(ClientCertificates); + break; + + case ClientCertificateOption.Automatic: + ThrowForModifiedManagedSslOptionsIfStarted(); + _clientCertificateOptions = value; + _socketsHttpHandler.SslOptions.LocalCertificateSelectionCallback = (sender, targetHost, localCertificates, remoteCertificate, acceptableIssuers) => CertificateHelper.GetEligibleClientCertificate(); + break; + + default: + throw new ArgumentOutOfRangeException(nameof(value)); + } + } + } + } + + public X509CertificateCollection ClientCertificates + { + get + { + if (_winHttpHandler != null) + { + return _winHttpHandler.ClientCertificates; + } + else + { + if (ClientCertificateOptions != ClientCertificateOption.Manual) + { + throw new InvalidOperationException(SR.Format(SR.net_http_invalid_enable_first, nameof(ClientCertificateOptions), nameof(ClientCertificateOption.Manual))); + } + + return _socketsHttpHandler.SslOptions.ClientCertificates ?? + (_socketsHttpHandler.SslOptions.ClientCertificates = new X509CertificateCollection()); } } } - public X509CertificateCollection ClientCertificates => _winHttpHandler != null ? - _winHttpHandler.ClientCertificates : - _managedHandler.ClientCertificates; - public Func ServerCertificateCustomValidationCallback { - get => _winHttpHandler != null ? _winHttpHandler.ServerCertificateValidationCallback : _managedHandler.ServerCertificateCustomValidationCallback; + get + { + return _winHttpHandler != null ? + _winHttpHandler.ServerCertificateValidationCallback : + (_socketsHttpHandler.SslOptions.RemoteCertificateValidationCallback?.Target as ConnectHelper.CertificateCallbackMapper)?.FromHttpClientHandler; + } set { if (_winHttpHandler != null) @@ -327,14 +391,17 @@ namespace System.Net.Http } else { - _managedHandler.ServerCertificateCustomValidationCallback = value; + ThrowForModifiedManagedSslOptionsIfStarted(); + _socketsHttpHandler.SslOptions.RemoteCertificateValidationCallback = value != null ? + new ConnectHelper.CertificateCallbackMapper(value).ForSocketsHttpHandler : + null; } } } public bool CheckCertificateRevocationList { - get => _winHttpHandler != null ? _winHttpHandler.CheckCertificateRevocationList : _managedHandler.CheckCertificateRevocationList; + get => _winHttpHandler != null ? _winHttpHandler.CheckCertificateRevocationList : _socketsHttpHandler.SslOptions.CertificateRevocationCheckMode == X509RevocationMode.Online; set { if (_winHttpHandler != null) @@ -343,14 +410,15 @@ namespace System.Net.Http } else { - _managedHandler.CheckCertificateRevocationList = value; + ThrowForModifiedManagedSslOptionsIfStarted(); + _socketsHttpHandler.SslOptions.CertificateRevocationCheckMode = value ? X509RevocationMode.Online : X509RevocationMode.NoCheck; } } } public SslProtocols SslProtocols { - get => _winHttpHandler != null ? _winHttpHandler.SslProtocols : _managedHandler.SslProtocols; + get => _winHttpHandler != null ? _winHttpHandler.SslProtocols : _socketsHttpHandler.SslOptions.EnabledSslProtocols; set { if (_winHttpHandler != null) @@ -359,16 +427,16 @@ namespace System.Net.Http } else { - _managedHandler.SslProtocols = value; + ThrowForModifiedManagedSslOptionsIfStarted(); + _socketsHttpHandler.SslOptions.EnabledSslProtocols = value; } } } - public IDictionary Properties => _winHttpHandler != null ? + public IDictionary Properties => _winHttpHandler != null ? _winHttpHandler.Properties : - _managedHandler.Properties; + _socketsHttpHandler.Properties; - protected internal override Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) { @@ -411,7 +479,7 @@ namespace System.Net.Http { return DiagnosticsHandler.IsEnabled() ? _diagnosticsHandler.SendAsync(request, cancellationToken) : - _managedHandler.SendAsync(request, cancellationToken); + _socketsHttpHandler.SendAsync(request, cancellationToken); } } } diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClientHandler.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClientHandler.cs index 119644a254..3080369d59 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClientHandler.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClientHandler.cs @@ -5,53 +5,35 @@ using System.Diagnostics; using System.Net.Security; using System.Security.Cryptography.X509Certificates; -using System.Threading; namespace System.Net.Http { public partial class HttpClientHandler : HttpMessageHandler { // This partial implementation contains members common to all HttpClientHandler implementations. - private const string ManagedHandlerSettingName = "COMPlus_UseManagedHttpClientHandler"; - private const string AppCtxManagedHandlerSettingName = "System.Net.Http.UseManagedHttpClientHandler"; + private const string SocketsHttpHandlerEnvironmentVariableSettingName = "DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER"; + private const string SocketsHttpHandlerAppCtxSettingName = "System.Net.Http.UseSocketsHttpHandler"; - private static LocalDataStoreSlot s_useManagedHandlerSlot; - - private static bool UseManagedHandler + private static bool UseSocketsHttpHandler { get { - // Check the environment variable to see if it's been set to true. If it has, use the managed handler. - if (Environment.GetEnvironmentVariable(ManagedHandlerSettingName) == "true") + // First check for the AppContext switch, giving it priority over over the environment variable. + if (AppContext.TryGetSwitch(SocketsHttpHandlerAppCtxSettingName, out bool useSocketsHttpHandler)) { - return true; + return useSocketsHttpHandler; } - if (AppContext.TryGetSwitch(AppCtxManagedHandlerSettingName, out bool isManagedEnabled) && isManagedEnabled) + // AppContext switch wasn't used. Check the environment variable to determine which handler should be used. + string envVar = Environment.GetEnvironmentVariable(SocketsHttpHandlerEnvironmentVariableSettingName); + if (envVar != null && (envVar.Equals("false", StringComparison.OrdinalIgnoreCase) || envVar.Equals("0"))) { - return true; + // Use WinHttpHandler on Windows and CurlHandler on Unix. + return false; } - // Then check whether a thread local has been set with the same name. - // If it's been set to a Boolean true, also use the managed handler. - LocalDataStoreSlot slot = LazyInitializer.EnsureInitialized(ref s_useManagedHandlerSlot, () => - { - LocalDataStoreSlot local = Thread.GetNamedDataSlot(ManagedHandlerSettingName); - if (local == null) - { - try - { - local = Thread.AllocateNamedDataSlot(ManagedHandlerSettingName); - } - catch (ArgumentException) - { - local = Thread.GetNamedDataSlot(ManagedHandlerSettingName); - } - } - return local; - }); - Debug.Assert(slot != null); - return Thread.GetData(slot) is bool result && result; + // Default to using SocketsHttpHandler. + return true; } } diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClientHandler.netcoreapp.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClientHandler.netcoreapp.cs new file mode 100644 index 0000000000..8296f917ae --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClientHandler.netcoreapp.cs @@ -0,0 +1,24 @@ +// 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.Collections.Generic; +using System.Net.Security; +using System.Security.Authentication; +using System.Security.Cryptography.X509Certificates; +using System.Threading; +using System.Threading.Tasks; + +namespace System.Net.Http +{ + // This partial implementation contains members common to NetCoreApp + public partial class HttpClientHandler : HttpMessageHandler + { + private void ThrowForModifiedManagedSslOptionsIfStarted() + { + // Hack to trigger an InvalidOperationException if a property that's stored on + // SslOptions is changed, since SslOptions itself does not do any such checks. + _socketsHttpHandler.SslOptions = _socketsHttpHandler.SslOptions; + } + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpContent.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpContent.cs index 191c5f422b..740347a083 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpContent.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpContent.cs @@ -143,7 +143,12 @@ namespace System.Net.Http internal bool TryGetBuffer(out ArraySegment buffer) { - return _bufferedContent != null && _bufferedContent.TryGetBuffer(out buffer); + if (_bufferedContent != null) + { + return _bufferedContent.TryGetBuffer(out buffer); + } + buffer = default; + return false; } protected HttpContent() @@ -299,7 +304,18 @@ namespace System.Net.Http protected abstract Task SerializeToStreamAsync(Stream stream, TransportContext context); - public Task CopyToAsync(Stream stream, TransportContext context) + // TODO #9071: Expose this publicly. Until it's public, only sealed or internal types should override it, and then change + // their SerializeToStreamAsync implementation to delegate to this one. They need to be sealed as otherwise an external + // type could derive from it and override SerializeToStreamAsync(stream, context) further, at which point when + // HttpClient calls SerializeToStreamAsync(stream, context, cancellationToken), their custom override will be skipped. + internal virtual Task SerializeToStreamAsync(Stream stream, TransportContext context, CancellationToken cancellationToken) => + SerializeToStreamAsync(stream, context); + + public Task CopyToAsync(Stream stream, TransportContext context) => + CopyToAsync(stream, context, CancellationToken.None); + + // TODO #9071: Expose this publicly. + internal Task CopyToAsync(Stream stream, TransportContext context, CancellationToken cancellationToken) { CheckDisposed(); if (stream == null) @@ -309,19 +325,17 @@ namespace System.Net.Http try { - Task task = null; ArraySegment buffer; if (TryGetBuffer(out buffer)) { - task = stream.WriteAsync(buffer.Array, buffer.Offset, buffer.Count); + return CopyToAsyncCore(stream.WriteAsync(new ReadOnlyMemory(buffer.Array, buffer.Offset, buffer.Count), cancellationToken)); } else { - task = SerializeToStreamAsync(stream, context); + Task task = SerializeToStreamAsync(stream, context, cancellationToken); CheckTaskNotNull(task); + return CopyToAsyncCore(new ValueTask(task)); } - - return CopyToAsyncCore(task); } catch (Exception e) when (StreamCopyExceptionNeedsWrapping(e)) { @@ -329,7 +343,7 @@ namespace System.Net.Http } } - private static async Task CopyToAsyncCore(Task copyTask) + private static async Task CopyToAsyncCore(ValueTask copyTask) { try { @@ -354,7 +368,10 @@ namespace System.Net.Http // No "CancellationToken" parameter needed since canceling the CTS will close the connection, resulting // in an exception being thrown while we're buffering. // If buffering is used without a connection, it is supposed to be fast, thus no cancellation required. - public Task LoadIntoBufferAsync(long maxBufferSize) + public Task LoadIntoBufferAsync(long maxBufferSize) => + LoadIntoBufferAsync(maxBufferSize, CancellationToken.None); + + internal Task LoadIntoBufferAsync(long maxBufferSize, CancellationToken cancellationToken) { CheckDisposed(); if (maxBufferSize > HttpContent.MaxBufferSize) @@ -382,7 +399,7 @@ namespace System.Net.Http try { - Task task = SerializeToStreamAsync(tempBuffer, null); + Task task = SerializeToStreamAsync(tempBuffer, null, cancellationToken); CheckTaskNotNull(task); return LoadIntoBufferAsyncCore(task, tempBuffer); } @@ -719,6 +736,12 @@ namespace System.Net.Http return base.WriteAsync(buffer, offset, count, cancellationToken); } + public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken) + { + CheckSize(buffer.Length); + return base.WriteAsync(buffer, cancellationToken); + } + public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) { CheckSize(count); @@ -851,11 +874,11 @@ namespace System.Net.Http _length += count; } - public override void Write(ReadOnlySpan source) + public override void Write(ReadOnlySpan buffer) { - EnsureCapacity(_length + source.Length); - source.CopyTo(new Span(_buffer, _length, source.Length)); - _length += source.Length; + EnsureCapacity(_length + buffer.Length); + buffer.CopyTo(new Span(_buffer, _length, buffer.Length)); + _length += buffer.Length; } public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) @@ -864,10 +887,10 @@ namespace System.Net.Http return Task.CompletedTask; } - public override Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default) + public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken = default) { - Write(source.Span); - return Task.CompletedTask; + Write(buffer.Span); + return default; } public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState) => diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpMethod.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpMethod.cs index 8abe00eceb..fbe6b1aca8 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpMethod.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpMethod.cs @@ -19,9 +19,7 @@ namespace System.Net.Http private static readonly HttpMethod s_optionsMethod = new HttpMethod("OPTIONS"); private static readonly HttpMethod s_traceMethod = new HttpMethod("TRACE"); private static readonly HttpMethod s_patchMethod = new HttpMethod("PATCH"); - - // Don't expose CONNECT as static property, since it's used by the transport to connect to a proxy. - // CONNECT is not used by users directly. + private static readonly HttpMethod s_connectMethod = new HttpMethod("CONNECT"); public static HttpMethod Get { @@ -63,6 +61,14 @@ namespace System.Net.Http get { return s_patchMethod; } } + // Don't expose CONNECT as static property, since it's used by the transport to connect to a proxy. + // CONNECT is not used by users directly. + + internal static HttpMethod Connect + { + get { return s_connectMethod; } + } + public string Method { get { return _method; } diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpResponseMessage.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpResponseMessage.cs index 3e368add2a..9df1d1c989 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpResponseMessage.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpResponseMessage.cs @@ -36,6 +36,8 @@ namespace System.Net.Http } } + internal void SetVersionWithoutValidation(Version value) => _version = value; + public HttpContent Content { get { return _content; } @@ -74,6 +76,8 @@ namespace System.Net.Http } } + internal void SetStatusCodeWithoutValidation(HttpStatusCode value) => _statusCode = value; + public string ReasonPhrase { get @@ -97,6 +101,8 @@ namespace System.Net.Http } } + internal void SetReasonPhraseWithoutValidation(string value) => _reasonPhrase = value; + public HttpResponseHeaders Headers { get diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpRuleParser.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpRuleParser.cs index e104353ebe..8f8961030b 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpRuleParser.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpRuleParser.cs @@ -143,6 +143,13 @@ namespace System.Net.Http return true; } + internal static string GetTokenString(ReadOnlySpan input) + { + Debug.Assert(IsToken(input)); + + return Encoding.ASCII.GetString(input); + } + internal static int GetWhitespaceLength(string input, int startIndex) { Debug.Assert(input != null); diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpUtilities.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpUtilities.cs index 6bd04526a1..81452d118a 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpUtilities.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpUtilities.cs @@ -14,23 +14,32 @@ namespace System.Net.Http { internal static class HttpUtilities { - internal static Version DefaultRequestVersion => -#if uap - HttpVersionInternal.Version20; -#else - HttpVersionInternal.Version11; -#endif + internal static Version DefaultRequestVersion => HttpVersionInternal.Version20; + internal static Version DefaultResponseVersion => HttpVersionInternal.Version11; internal static bool IsHttpUri(Uri uri) { Debug.Assert(uri != null); - - string scheme = uri.Scheme; - return string.Equals("http", scheme, StringComparison.OrdinalIgnoreCase) || - string.Equals("https", scheme, StringComparison.OrdinalIgnoreCase); + return IsSupportedScheme(uri.Scheme); } + internal static bool IsSupportedScheme(string scheme) => + IsSupportedNonSecureScheme(scheme) || + IsSupportedSecureScheme(scheme); + + internal static bool IsSupportedNonSecureScheme(string scheme) => + string.Equals(scheme, "http", StringComparison.OrdinalIgnoreCase) || IsNonSecureWebSocketScheme(scheme); + + internal static bool IsSupportedSecureScheme(string scheme) => + string.Equals(scheme, "https", StringComparison.OrdinalIgnoreCase) || IsSecureWebSocketScheme(scheme); + + internal static bool IsNonSecureWebSocketScheme(string scheme) => + string.Equals(scheme, "ws", StringComparison.OrdinalIgnoreCase); + + internal static bool IsSecureWebSocketScheme(string scheme) => + string.Equals(scheme, "wss", StringComparison.OrdinalIgnoreCase); + // Always specify TaskScheduler.Default to prevent us from using a user defined TaskScheduler.Current. // // Since we're not doing any CPU and/or I/O intensive operations, continue on the same thread. @@ -42,4 +51,4 @@ namespace System.Net.Http TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default); } } -} +} \ No newline at end of file diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/AuthenticateAndRedirectHandler.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/AuthenticateAndRedirectHandler.cs deleted file mode 100644 index 24f4201eb9..0000000000 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/AuthenticateAndRedirectHandler.cs +++ /dev/null @@ -1,228 +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.Net.Http.Headers; -using System.Threading; -using System.Threading.Tasks; - -namespace System.Net.Http -{ - internal sealed partial class AuthenticateAndRedirectHandler : HttpMessageHandler - { - private readonly HttpMessageHandler _innerHandler; - private readonly bool _preAuthenticate; - private readonly ICredentials _credentials; - private readonly bool _allowRedirect; - private readonly int _maxAutomaticRedirections; - - public AuthenticateAndRedirectHandler(bool preAuthenticate, ICredentials credentials, bool allowRedirect, int maxAutomaticRedirections, HttpMessageHandler innerHandler) - { - Debug.Assert(innerHandler != null); - - _preAuthenticate = preAuthenticate; - _credentials = credentials; - _allowRedirect = allowRedirect; - - if (allowRedirect && maxAutomaticRedirections < 0) - { - throw new ArgumentOutOfRangeException(nameof(maxAutomaticRedirections)); - } - - _maxAutomaticRedirections = maxAutomaticRedirections; - _innerHandler = innerHandler; - } - - protected internal override async Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) - { - HttpResponseMessage response; - uint redirectCount = 0; - while (true) - { - // Just as with WinHttpHandler and CurlHandler, for security reasons, we drop the server credential if it is - // anything other than a CredentialCache on redirection. We allow credentials in a CredentialCache since they - // are specifically tied to URIs. - ICredentials currentCredential = redirectCount > 0 ? _credentials as CredentialCache : _credentials; - - if (currentCredential != null && _preAuthenticate) - { - AuthenticationHelper.TrySetBasicAuthToken(request, currentCredential); - } - - response = await _innerHandler.SendAsync(request, cancellationToken).ConfigureAwait(false); - - if (currentCredential != null && response.StatusCode == HttpStatusCode.Unauthorized) - { - AuthenticationHeaderValue selectedAuth = GetSupportedAuthScheme(response.Headers.WwwAuthenticate); - if (selectedAuth != null) - { - switch (selectedAuth.Scheme) - { - case AuthenticationHelper.Digest: - // Update digest response with new parameter from WWWAuthenticate - var digestResponse = new AuthenticationHelper.DigestResponse(selectedAuth.Parameter); - if (await AuthenticationHelper.TrySetDigestAuthToken(request, currentCredential, digestResponse, HttpKnownHeaderNames.Authorization).ConfigureAwait(false)) - { - response.Dispose(); - response = await _innerHandler.SendAsync(request, cancellationToken).ConfigureAwait(false); - - // Retry in case of nonce timeout in server. - if (response.StatusCode == HttpStatusCode.Unauthorized) - { - foreach (AuthenticationHeaderValue ahv in response.Headers.WwwAuthenticate) - { - if (ahv.Scheme == AuthenticationHelper.Digest) - { - digestResponse = new AuthenticationHelper.DigestResponse(ahv.Parameter); - if (AuthenticationHelper.IsServerNonceStale(digestResponse) && - await AuthenticationHelper.TrySetDigestAuthToken(request, currentCredential, digestResponse, HttpKnownHeaderNames.Authorization).ConfigureAwait(false)) - { - response.Dispose(); - response = await _innerHandler.SendAsync(request, cancellationToken).ConfigureAwait(false); - } - - break; - } - } - } - } - break; - - case AuthenticationHelper.Basic: - if (_preAuthenticate) - { - // We already tried these credentials via preauthentication, so no need to try again - break; - } - - if (AuthenticationHelper.TrySetBasicAuthToken(request, currentCredential)) - { - response.Dispose(); - response = await _innerHandler.SendAsync(request, cancellationToken).ConfigureAwait(false); - } - break; - } - } - } - - if (!RequestNeedsRedirect(response)) - { - break; - } - - // Clear the authorization header, if the request requires redirect. - request.Headers.Authorization = null; - - Uri location = response.Headers.Location; - if (location == null) - { - // No location header. Nothing to redirect to. - break; - } - - if (!location.IsAbsoluteUri) - { - location = new Uri(request.RequestUri, location); - } - - // Disallow automatic redirection from secure to non-secure schemes - bool allowed = - (HttpUtilities.IsSupportedNonSecureScheme(request.RequestUri.Scheme) && HttpUtilities.IsSupportedScheme(location.Scheme)) || - (HttpUtilities.IsSupportedSecureScheme(request.RequestUri.Scheme) && HttpUtilities.IsSupportedSecureScheme(location.Scheme)); - if (!allowed) - { - break; - } - - redirectCount++; - if (redirectCount > _maxAutomaticRedirections) - { - throw new HttpRequestException(SR.net_http_max_redirects); - } - - // Set up for the automatic redirect - request.RequestUri = location; - - if (RequestRequiresForceGet(response.StatusCode, request.Method)) - { - request.Method = HttpMethod.Get; - request.Content = null; - } - - // Do the redirect. - response.Dispose(); - } - - return response; - } - - private bool RequestNeedsRedirect(HttpResponseMessage response) - { - // Return if redirect is not requested. - if (!_allowRedirect) - return false; - - bool needRedirect = false; - switch (response.StatusCode) - { - case HttpStatusCode.Moved: - case HttpStatusCode.Found: - case HttpStatusCode.SeeOther: - case HttpStatusCode.TemporaryRedirect: - needRedirect = true; - break; - - case HttpStatusCode.MultipleChoices: - needRedirect = response.Headers.Location != null; // Don't redirect if no Location specified - break; - } - - return needRedirect; - } - - private static bool RequestRequiresForceGet(HttpStatusCode statusCode, HttpMethod requestMethod) - { - if (statusCode == HttpStatusCode.Moved || - statusCode == HttpStatusCode.Found || - statusCode == HttpStatusCode.SeeOther || - statusCode == HttpStatusCode.MultipleChoices) - { - return requestMethod == HttpMethod.Post; - } - - return false; - } - - private static AuthenticationHeaderValue GetSupportedAuthScheme(HttpHeaderValueCollection authenticateValues) - { - AuthenticationHeaderValue basicAuthenticationHeaderValue = null; - - // Only Digest and Basic auth supported, ignore others. - foreach (AuthenticationHeaderValue ahv in authenticateValues) - { - if (ahv.Scheme == AuthenticationHelper.Digest) - { - return ahv; - } - else if (ahv.Scheme == AuthenticationHelper.Basic) - { - basicAuthenticationHeaderValue = ahv; - } - } - - return basicAuthenticationHeaderValue; - } - - protected override void Dispose(bool disposing) - { - if (disposing) - { - _innerHandler.Dispose(); - } - - base.Dispose(disposing); - } - } -} - diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/AuthenticationHelper.Basic.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/AuthenticationHelper.Basic.cs deleted file mode 100644 index 1e55050131..0000000000 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/AuthenticationHelper.Basic.cs +++ /dev/null @@ -1,49 +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.Net.Http.Headers; -using System.Text; - -namespace System.Net.Http -{ - internal partial class AuthenticationHelper - { - public const string Basic = "Basic"; - - public static bool TrySetBasicAuthToken(HttpRequestMessage request, ICredentials credentials) - { - NetworkCredential credential = credentials.GetCredential(request.RequestUri, Basic); - if (credential == null) - { - return false; - } - - request.Headers.Authorization = new AuthenticationHeaderValue(Basic, GetBasicTokenForCredential(credential)); - return true; - } - - public static string GetBasicTokenForCredential(NetworkCredential credential) - { - if (credential.UserName.IndexOf(':') != -1) - { - // TODO #23135: What's the right way to handle this? - throw new NotImplementedException($"Basic auth: can't handle ':' in username \"{credential.UserName}\""); - } - - string userPass = credential.UserName + ":" + credential.Password; - if (!string.IsNullOrEmpty(credential.Domain)) - { - if (credential.Domain.IndexOf(':') != -1) - { - // TODO #23135: What's the right way to handle this? - throw new NotImplementedException($"Basic auth: can't handle ':' in domain \"{credential.Domain}\""); - } - - userPass = credential.Domain + "\\" + userPass; - } - - return Convert.ToBase64String(Encoding.UTF8.GetBytes(userPass)); - } - } -} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/ChunkedEncodingReadStream.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/ChunkedEncodingReadStream.cs deleted file mode 100644 index 9b8b5670eb..0000000000 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/ChunkedEncodingReadStream.cs +++ /dev/null @@ -1,159 +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.IO; -using System.Threading; -using System.Threading.Tasks; - -namespace System.Net.Http -{ - internal sealed partial class HttpConnection - { - private sealed class ChunkedEncodingReadStream : HttpContentReadStream - { - private ulong _chunkBytesRemaining; - - public ChunkedEncodingReadStream(HttpConnection connection) - : base(connection) - { - _chunkBytesRemaining = 0; - } - - private async Task TryGetNextChunk(CancellationToken cancellationToken) - { - Debug.Assert(_chunkBytesRemaining == 0); - - // Start of chunk, read chunk size. - ulong chunkSize = ParseHexSize(await _connection.ReadNextLineAsync(cancellationToken).ConfigureAwait(false)); - _chunkBytesRemaining = chunkSize; - - if (chunkSize > 0) - { - return true; - } - - // Indicates end of response body. We expect final CRLF after this. - await _connection.ReadCrLfAsync(cancellationToken).ConfigureAwait(false); - _connection.ReturnConnectionToPool(); - _connection = null; - return false; - } - - private ulong ParseHexSize(ArraySegment line) - { - ulong size = 0; - try - { - for (int i = 0; i < line.Count; i++) - { - char c = (char)line[i]; - if ((uint)(c - '0') <= '9' - '0') - { - size = checked(size * 16 + ((ulong)c - '0')); - } - else if ((uint)(c - 'a') <= ('f' - 'a')) - { - size = checked(size * 16 + ((ulong)c - 'a' + 10)); - } - else if ((uint)(c - 'A') <= ('F' - 'A')) - { - size = checked(size * 16 + ((ulong)c - 'A' + 10)); - } - else - { - if (c == '\r' && i > 0) - { - break; - } - throw new IOException(SR.net_http_invalid_response); - } - } - } - catch (OverflowException e) - { - throw new IOException(SR.net_http_invalid_response, e); - } - return size; - } - - private async Task ConsumeChunkBytes(ulong bytesConsumed, CancellationToken cancellationToken) - { - Debug.Assert(bytesConsumed <= _chunkBytesRemaining); - _chunkBytesRemaining -= bytesConsumed; - if (_chunkBytesRemaining == 0) - { - await _connection.ReadCrLfAsync(cancellationToken).ConfigureAwait(false); - } - } - - public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - ValidateBufferArgs(buffer, offset, count); - return ReadAsync(new Memory(buffer, offset, count)).AsTask(); - } - - public override async ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default) - { - if (_connection == null || destination.Length == 0) - { - // Response body fully consumed or the caller didn't ask for any data - return 0; - } - - if (_chunkBytesRemaining == 0) - { - if (!await TryGetNextChunk(cancellationToken).ConfigureAwait(false)) - { - // End of response body - return 0; - } - } - - if (_chunkBytesRemaining < (ulong)destination.Length) - { - destination = destination.Slice(0, (int)_chunkBytesRemaining); - } - - int bytesRead = await _connection.ReadAsync(destination, cancellationToken).ConfigureAwait(false); - - if (bytesRead <= 0) - { - // Unexpected end of response stream - throw new IOException(SR.net_http_invalid_response); - } - - await ConsumeChunkBytes((ulong)bytesRead, cancellationToken).ConfigureAwait(false); - - return bytesRead; - } - - public override async Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken) - { - if (destination == null) - { - throw new ArgumentNullException(nameof(destination)); - } - - if (_connection == null) - { - // Response body fully consumed - return; - } - - if (_chunkBytesRemaining > 0) - { - await _connection.CopyToAsync(destination, _chunkBytesRemaining, cancellationToken).ConfigureAwait(false); - await ConsumeChunkBytes(_chunkBytesRemaining, cancellationToken).ConfigureAwait(false); - } - - while (await TryGetNextChunk(cancellationToken).ConfigureAwait(false)) - { - await _connection.CopyToAsync(destination, _chunkBytesRemaining, cancellationToken).ConfigureAwait(false); - await ConsumeChunkBytes(_chunkBytesRemaining, cancellationToken).ConfigureAwait(false); - } - } - } - } -} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/ChunkedEncodingWriteStream.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/ChunkedEncodingWriteStream.cs deleted file mode 100644 index 16fad17c4d..0000000000 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/ChunkedEncodingWriteStream.cs +++ /dev/null @@ -1,91 +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.Threading; -using System.Threading.Tasks; - -namespace System.Net.Http -{ - internal sealed partial class HttpConnection : IDisposable - { - private sealed class ChunkedEncodingWriteStream : HttpContentWriteStream - { - private static readonly byte[] s_finalChunkBytes = { (byte)'0', (byte)'\r', (byte)'\n', (byte)'\r', (byte)'\n' }; - - public ChunkedEncodingWriteStream(HttpConnection connection, CancellationToken cancellationToken) : - base(connection, cancellationToken) - { - } - - public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken ignored) - { - ValidateBufferArgs(buffer, offset, count); - return WriteAsync(new Memory(buffer, offset, count), ignored); - } - - public override Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default) - { - if (source.Length == 0) - { - // Don't write if nothing was given, especially since we don't want to accidentally send a 0 chunk, - // which would indicate end of body. Instead, just ensure no content is stuck in the buffer. - return _connection.FlushAsync(RequestCancellationToken); - } - - if (_connection._currentRequest == null) - { - // Avoid sending anything if the response has already completed, in which case there's no point - // sending further data (this might happen, for example, on a redirect.) - return Task.CompletedTask; - } - - return WriteChunkAsync(source); - } - - private async Task WriteChunkAsync(ReadOnlyMemory source) - { - // Write chunk length -- hex representation of count - bool digitWritten = false; - for (int i = 7; i >= 0; i--) - { - int shift = i * 4; - int mask = 0xF << shift; - int digit = (source.Length & mask) >> shift; - if (digitWritten || digit != 0) - { - await _connection.WriteByteAsync((byte)(digit < 10 ? '0' + digit : 'A' + digit - 10), RequestCancellationToken).ConfigureAwait(false); - digitWritten = true; - } - } - - // End chunk length - await _connection.WriteTwoBytesAsync((byte)'\r', (byte)'\n', RequestCancellationToken).ConfigureAwait(false); - - // Write chunk contents - await _connection.WriteAsync(source, RequestCancellationToken).ConfigureAwait(false); - await _connection.WriteTwoBytesAsync((byte)'\r', (byte)'\n', RequestCancellationToken).ConfigureAwait(false); - - // Flush the chunk. This is reasonable from the standpoint of having just written a standalone piece - // of data, but is also necessary to support duplex communication, where a CopyToAsync is taking the - // data from content and writing it here; if there was no flush, we might not send the data until the - // source was empty, and it might be kept open to enable subsequent communication. And it's necessary - // in general for at least the first write, as we need to ensure if it's the entirety of the content - // and if all of the headers and content fit in the write buffer that we've actually sent the request. - await _connection.FlushAsync(RequestCancellationToken).ConfigureAwait(false); - } - - public override Task FlushAsync(CancellationToken ignored) - { - return _connection.FlushAsync(RequestCancellationToken); - } - - public override async Task FinishAsync() - { - // Send 0 byte chunk to indicate end, then final CrLf - await _connection.WriteBytesAsync(s_finalChunkBytes, RequestCancellationToken).ConfigureAwait(false); - _connection = null; - } - } - } -} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/ConnectHelper.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/ConnectHelper.cs deleted file mode 100644 index 3d64d2d660..0000000000 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/ConnectHelper.cs +++ /dev/null @@ -1,100 +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.IO; -using System.Net.Sockets; -using System.Runtime.CompilerServices; -using System.Threading; -using System.Threading.Tasks; - -namespace System.Net.Http -{ - internal static class ConnectHelper - { - public static async ValueTask ConnectAsync(string host, int port, CancellationToken cancellationToken) - { - try - { - // Rather than creating a new Socket and calling ConnectAsync on it, we use the static - // Socket.ConnectAsync with a SocketAsyncEventArgs, as we can then use Socket.CancelConnectAsync - // to cancel it if needed. - using (var saea = new BuilderAndCancellationTokenSocketAsyncEventArgs(cancellationToken)) - { - // Configure which server to which to connect. - saea.RemoteEndPoint = IPAddress.TryParse(host, out IPAddress address) ? - (EndPoint)new IPEndPoint(address, port) : - new DnsEndPoint(host, port); - - // Hook up a callback that'll complete the Task when the operation completes. - saea.Completed += (s, e) => - { - var csaea = (BuilderAndCancellationTokenSocketAsyncEventArgs)e; - switch (e.SocketError) - { - case SocketError.Success: - csaea.Builder.SetResult(); - break; - case SocketError.OperationAborted: - case SocketError.ConnectionAborted: - if (cancellationToken.IsCancellationRequested) - { - csaea.Builder.SetException(new OperationCanceledException(csaea.CancellationToken)); - break; - } - goto default; - default: - csaea.Builder.SetException(new SocketException((int)e.SocketError)); - break; - } - }; - - // Initiate the connection. - if (Socket.ConnectAsync(SocketType.Stream, ProtocolType.Tcp, saea)) - { - // Connect completing asynchronously. Enable it to be canceled and wait for it. - using (cancellationToken.Register(s => Socket.CancelConnectAsync((SocketAsyncEventArgs)s), saea)) - { - await saea.Builder.Task.ConfigureAwait(false); - } - } - else if (saea.SocketError != SocketError.Success) - { - // Connect completed synchronously but unsuccessfully. - throw new SocketException((int)saea.SocketError); - } - - Debug.Assert(saea.SocketError == SocketError.Success, $"Expected Success, got {saea.SocketError}."); - Debug.Assert(saea.ConnectSocket != null, "Expected non-null socket"); - Debug.Assert(saea.ConnectSocket.Connected, "Expected socket to be connected"); - - // Configure the socket and return a stream for it. - Socket socket = saea.ConnectSocket; - socket.NoDelay = true; - return new NetworkStream(socket, ownsSocket: true); - } - } - catch (SocketException se) - { - throw new HttpRequestException(se.Message, se); - } - } - - /// SocketAsyncEventArgs that carries with it additional state for a Task builder and a CancellationToken. - private sealed class BuilderAndCancellationTokenSocketAsyncEventArgs : SocketAsyncEventArgs - { - public AsyncTaskMethodBuilder Builder { get; } - public CancellationToken CancellationToken { get; } - - public BuilderAndCancellationTokenSocketAsyncEventArgs(CancellationToken cancellationToken) - { - var b = new AsyncTaskMethodBuilder(); - var ignored = b.Task; // force initialization - Builder = b; - - CancellationToken = cancellationToken; - } - } - } -} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/ConnectionCloseReadStream.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/ConnectionCloseReadStream.cs deleted file mode 100644 index ac4cb984c1..0000000000 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/ConnectionCloseReadStream.cs +++ /dev/null @@ -1,67 +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.IO; -using System.Threading; -using System.Threading.Tasks; - -namespace System.Net.Http -{ - internal sealed partial class HttpConnection : IDisposable - { - private sealed class ConnectionCloseReadStream : HttpContentReadStream - { - public ConnectionCloseReadStream(HttpConnection connection) - : base(connection) - { - } - - public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - ValidateBufferArgs(buffer, offset, count); - return ReadAsync(new Memory(buffer, offset, count), cancellationToken).AsTask(); - } - - public override async ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default) - { - if (_connection == null || destination.Length == 0) - { - // Response body fully consumed or the caller didn't ask for any data - return 0; - } - - int bytesRead = await _connection.ReadAsync(destination, cancellationToken).ConfigureAwait(false); - if (bytesRead == 0) - { - // We cannot reuse this connection, so close it. - _connection.Dispose(); - _connection = null; - return 0; - } - - return bytesRead; - } - - public override async Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken) - { - if (destination == null) - { - throw new ArgumentNullException(nameof(destination)); - } - - if (_connection == null) - { - // Response body fully consumed - return; - } - - await _connection.CopyToAsync(destination, cancellationToken).ConfigureAwait(false); - - // We cannot reuse this connection, so close it. - _connection.Dispose(); - _connection = null; - } - } - } -} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/ContentLengthReadStream.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/ContentLengthReadStream.cs deleted file mode 100644 index d7b9f739bc..0000000000 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/ContentLengthReadStream.cs +++ /dev/null @@ -1,88 +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.IO; -using System.Threading; -using System.Threading.Tasks; - -namespace System.Net.Http -{ - internal sealed partial class HttpConnection : IDisposable - { - private sealed class ContentLengthReadStream : HttpContentReadStream - { - private ulong _contentBytesRemaining; - - public ContentLengthReadStream(HttpConnection connection, ulong contentLength) - : base(connection) - { - Debug.Assert(contentLength > 0, "Caller should have checked for 0."); - _contentBytesRemaining = contentLength; - } - - public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - ValidateBufferArgs(buffer, offset, count); - return ReadAsync(new Memory(buffer, offset, count), cancellationToken).AsTask(); - } - - public override async ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default) - { - if (_connection == null || destination.Length == 0) - { - // Response body fully consumed or the caller didn't ask for any data - return 0; - } - - Debug.Assert(_contentBytesRemaining > 0); - - if ((ulong)destination.Length > _contentBytesRemaining) - { - destination = destination.Slice(0, (int)_contentBytesRemaining); - } - - int bytesRead = await _connection.ReadAsync(destination, cancellationToken).ConfigureAwait(false); - - if (bytesRead <= 0) - { - // Unexpected end of response stream - throw new IOException(SR.net_http_invalid_response); - } - - Debug.Assert((ulong)bytesRead <= _contentBytesRemaining); - _contentBytesRemaining -= (ulong)bytesRead; - - if (_contentBytesRemaining == 0) - { - // End of response body - _connection.ReturnConnectionToPool(); - _connection = null; - } - - return bytesRead; - } - - public override async Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken) - { - if (destination == null) - { - throw new ArgumentNullException(nameof(destination)); - } - - if (_connection == null) - { - // Response body fully consumed - return; - } - - await _connection.CopyToAsync(destination, _contentBytesRemaining, cancellationToken).ConfigureAwait(false); - - _contentBytesRemaining = 0; - _connection.ReturnConnectionToPool(); - _connection = null; - } - } - } -} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/ContentLengthWriteStream.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/ContentLengthWriteStream.cs deleted file mode 100644 index de00dd7468..0000000000 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/ContentLengthWriteStream.cs +++ /dev/null @@ -1,52 +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.Threading; -using System.Threading.Tasks; - -namespace System.Net.Http -{ - internal sealed partial class HttpConnection : IDisposable - { - private sealed class ContentLengthWriteStream : HttpContentWriteStream - { - public ContentLengthWriteStream(HttpConnection connection, CancellationToken cancellationToken) : - base(connection, cancellationToken) - { - } - - public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken ignored) - { - ValidateBufferArgs(buffer, offset, count); - return WriteAsync(new ReadOnlyMemory(buffer, offset, count), ignored); - } - - public override Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default) - { - if (_connection._currentRequest == null) - { - // Avoid sending anything if the response has already completed, in which case there's no point - // sending further data (this might happen, for example, on a redirect.) - return Task.CompletedTask; - } - - // Have the connection write the data, skipping the buffer. Importantly, this will - // force a flush of anything already in the buffer, i.e. any remaining request headers - // that are still buffered. - return _connection.WriteWithoutBufferingAsync(source, RequestCancellationToken); - } - - public override Task FlushAsync(CancellationToken ignored) - { - return _connection.FlushAsync(RequestCancellationToken); - } - - public override Task FinishAsync() - { - _connection = null; - return Task.CompletedTask; - } - } - } -} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/CookieHandler.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/CookieHandler.cs deleted file mode 100644 index 99277d0867..0000000000 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/CookieHandler.cs +++ /dev/null @@ -1,56 +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.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; - -namespace System.Net.Http -{ - internal sealed class CookieHandler : HttpMessageHandler - { - private readonly HttpMessageHandler _innerHandler; - private readonly CookieContainer _cookieContainer; - - public CookieHandler(CookieContainer cookieContainer, HttpMessageHandler innerHandler) - { - _innerHandler = innerHandler ?? throw new ArgumentNullException(nameof(innerHandler)); - _cookieContainer = cookieContainer ?? throw new ArgumentNullException(nameof(cookieContainer)); - } - - protected internal override async Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) - { - // Add cookies to request, if any - string cookieHeader = _cookieContainer.GetCookieHeader(request.RequestUri); - if (!string.IsNullOrEmpty(cookieHeader)) - { - request.Headers.Add(HttpKnownHeaderNames.Cookie, cookieHeader); - } - - HttpResponseMessage response = await _innerHandler.SendAsync(request, cancellationToken).ConfigureAwait(false); - - // Handle Set-Cookie - IEnumerable setCookies; - if (response.Headers.TryGetValues(HttpKnownHeaderNames.SetCookie, out setCookies)) - { - foreach (string setCookie in setCookies) - { - _cookieContainer.SetCookies(response.RequestMessage.RequestUri, setCookie); - } - } - - return response; - } - - protected override void Dispose(bool disposing) - { - if (disposing) - { - _innerHandler.Dispose(); - } - - base.Dispose(disposing); - } - } -} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpConnection.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpConnection.cs deleted file mode 100644 index cc083ad605..0000000000 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpConnection.cs +++ /dev/null @@ -1,1198 +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.Collections.Generic; -using System.Diagnostics; -using System.Globalization; -using System.IO; -using System.Net.Http.Headers; -using System.Net.Security; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Text; -using System.Threading; -using System.Threading.Tasks; - -namespace System.Net.Http -{ - internal sealed partial class HttpConnection : IDisposable - { - /// Default size of the read buffer used for the connection. - private const int InitialReadBufferSize = -#if DEBUG - 10; -#else - 4096; -#endif - /// Default size of the write buffer used for the connection. - private const int InitialWriteBufferSize = InitialReadBufferSize; - /// - /// Delay after which we'll send the request payload for ExpectContinue if - /// the server hasn't yet responded. - /// - private const int Expect100TimeoutMilliseconds = 1000; - /// - /// Size after which we'll close the connection rather than send the payload in response - /// to final error status code sent by the server when using Expect: 100-continue. - /// - private const int Expect100ErrorSendThreshold = 1024; - - private static readonly byte[] s_contentLength0NewlineAsciiBytes = Encoding.ASCII.GetBytes("Content-Length: 0\r\n"); - private static readonly byte[] s_spaceHttp10NewlineAsciiBytes = Encoding.ASCII.GetBytes(" HTTP/1.0\r\n"); - private static readonly byte[] s_spaceHttp11NewlineAsciiBytes = Encoding.ASCII.GetBytes(" HTTP/1.1\r\n"); - private static readonly byte[] s_hostKeyAndSeparator = Encoding.ASCII.GetBytes(HttpKnownHeaderNames.Host + ": "); - - private readonly HttpConnectionPool _pool; - private readonly HttpConnectionKey _key; - private readonly Stream _stream; - private readonly TransportContext _transportContext; - private readonly bool _usingProxy; - private readonly byte[] _idnHostAsciiBytes; - - private HttpRequestMessage _currentRequest; - private Task _sendRequestContentTask; - private readonly byte[] _writeBuffer; - private int _writeOffset; - private Exception _pendingException; - - private Task _readAheadTask; - private byte[] _readBuffer; - private int _readOffset; - private int _readLength; - - private bool _connectionClose; // Connection: close was seen on last response - private int _disposed; // 1 yes, 0 no - - public HttpConnection( - HttpConnectionPool pool, - HttpConnectionKey key, - string requestIdnHost, - Stream stream, - TransportContext transportContext, - bool usingProxy) - { - Debug.Assert(pool != null); - Debug.Assert(stream != null); - - _pool = pool; - _key = key; - _stream = stream; - _transportContext = transportContext; - _usingProxy = usingProxy; - if (requestIdnHost != null) - { - _idnHostAsciiBytes = Encoding.ASCII.GetBytes(requestIdnHost); - } - - _writeBuffer = new byte[InitialWriteBufferSize]; - _readBuffer = new byte[InitialReadBufferSize]; - - if (NetEventSource.IsEnabled) - { - if (_stream is SslStream sslStream) - { - Trace( - $"Secure connection created to {key.Host}:{key.Port}. " + - $"SslProtocol:{sslStream.SslProtocol}, " + - $"CipherAlgorithm:{sslStream.CipherAlgorithm}, CipherStrength:{sslStream.CipherStrength}, " + - $"HashAlgorithm:{sslStream.HashAlgorithm}, HashStrength:{sslStream.HashStrength}, " + - $"KeyExchangeAlgorithm:{sslStream.KeyExchangeAlgorithm}, KeyExchangeStrength:{sslStream.KeyExchangeStrength}, " + - $"LocalCert:{sslStream.LocalCertificate}, RemoteCert:{sslStream.RemoteCertificate}"); - } - else - { - Trace($"Connection created to {key.Host}:{key.Port}."); - } - } - } - - public void Dispose() - { - // Ensure we're only disposed once. Dispose could be called concurrently, for example, - // if the request and the response were running concurrently and both incurred an exception. - if (Interlocked.Exchange(ref _disposed, 1) == 0) - { - if (NetEventSource.IsEnabled) Trace("Connection closing."); - _pool.DecrementConnectionCount(); - _stream.Dispose(); - } - } - - public bool ReadAheadCompleted - { - get - { - Debug.Assert(_readAheadTask != null, $"{nameof(_readAheadTask)} should have been initialized"); - return _readAheadTask.IsCompleted; - } - } - - private async Task WriteHeadersAsync(HttpHeaders headers, CancellationToken cancellationToken) - { - foreach (KeyValuePair> header in headers) - { - await WriteAsciiStringAsync(header.Key, cancellationToken).ConfigureAwait(false); - await WriteTwoBytesAsync((byte)':', (byte)' ', cancellationToken).ConfigureAwait(false); - - var values = (string[])header.Value; // typed as IEnumerable, but always a string[] - Debug.Assert(values.Length > 0, "No values for header??"); - if (values.Length > 0) - { - await WriteStringAsync(values[0], cancellationToken).ConfigureAwait(false); - for (int i = 1; i < values.Length; i++) - { - await WriteTwoBytesAsync((byte)',', (byte)' ', cancellationToken).ConfigureAwait(false); - await WriteStringAsync(values[i], cancellationToken).ConfigureAwait(false); - } - } - - await WriteTwoBytesAsync((byte)'\r', (byte)'\n', cancellationToken).ConfigureAwait(false); - } - } - - private async Task WriteHostHeaderAsync(Uri uri, CancellationToken cancellationToken) - { - await WriteBytesAsync(s_hostKeyAndSeparator, cancellationToken).ConfigureAwait(false); - - await (_idnHostAsciiBytes != null ? - WriteBytesAsync(_idnHostAsciiBytes, cancellationToken) : - WriteAsciiStringAsync(uri.IdnHost, cancellationToken)).ConfigureAwait(false); - - if (!uri.IsDefaultPort) - { - await WriteByteAsync((byte)':', cancellationToken).ConfigureAwait(false); - await WriteFormattedInt32Async(uri.Port, cancellationToken).ConfigureAwait(false); - } - - await WriteTwoBytesAsync((byte)'\r', (byte)'\n', cancellationToken).ConfigureAwait(false); - } - - private Task WriteFormattedInt32Async(int value, CancellationToken cancellationToken) - { - const int MaxFormattedInt32Length = 10; // number of digits in int.MaxValue.ToString() - - // If the maximum possible number of digits fits in our buffer, we can format synchronously - if (_writeOffset <= _writeBuffer.Length - MaxFormattedInt32Length) - { - if (value == 0) - { - _writeBuffer[_writeOffset++] = (byte)'0'; - } - else - { - int initialOffset = _writeOffset; - while (value > 0) - { - value = Math.DivRem(value, 10, out int digit); - _writeBuffer[_writeOffset++] = (byte)('0' + digit); - } - Array.Reverse(_writeBuffer, initialOffset, _writeOffset - initialOffset); - } - return Task.CompletedTask; - } - - // Otherwise, do it the slower way. - return WriteAsciiStringAsync(value.ToString(CultureInfo.InvariantCulture), cancellationToken); - } - - public async Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) - { - TaskCompletionSource allowExpect100ToContinue = null; - Debug.Assert(_currentRequest == null, $"Expected null {nameof(_currentRequest)}."); - _currentRequest = request; - try - { - bool isHttp10 = request.Version.Major == 1 && request.Version.Minor == 0; - - // Send the request. - if (NetEventSource.IsEnabled) Trace($"Sending request: {request}"); - - // Add headers to define content transfer, if not present - if (request.Content != null && - (!request.HasHeaders || request.Headers.TransferEncodingChunked != true) && - request.Content.Headers.ContentLength == null) - { - // We have content, but neither Transfer-Encoding or Content-Length is set. - request.Headers.TransferEncodingChunked = true; - } - - if (isHttp10 && request.HasHeaders && request.Headers.TransferEncodingChunked == true) - { - // HTTP 1.0 does not support chunking - throw new NotSupportedException(SR.net_http_unsupported_chunking); - } - - // Write request line - await WriteStringAsync(request.Method.Method, cancellationToken).ConfigureAwait(false); - await WriteByteAsync((byte)' ', cancellationToken).ConfigureAwait(false); - await WriteStringAsync( - _usingProxy ? request.RequestUri.AbsoluteUri : request.RequestUri.PathAndQuery, - cancellationToken).ConfigureAwait(false); - - // fall-back to 1.1 for all versions other than 1.0 - await WriteBytesAsync(isHttp10 ? s_spaceHttp10NewlineAsciiBytes : s_spaceHttp11NewlineAsciiBytes, - cancellationToken).ConfigureAwait(false); - - // Write request headers - if (request.HasHeaders) - { - await WriteHeadersAsync(request.Headers, cancellationToken).ConfigureAwait(false); - } - - if (request.Content == null) - { - // Write out Content-Length: 0 header to indicate no body, - // unless this is a method that never has a body. - if (request.Method != HttpMethod.Get && request.Method != HttpMethod.Head) - { - await WriteBytesAsync(s_contentLength0NewlineAsciiBytes, cancellationToken).ConfigureAwait(false); - } - } - else - { - // Write content headers - await WriteHeadersAsync(request.Content.Headers, cancellationToken).ConfigureAwait(false); - } - - // Write special additional headers. If a host isn't in the headers list, then a Host header - // wasn't sent, so as it's required by HTTP 1.1 spec, send one based on the Request Uri. - if (!request.HasHeaders || request.Headers.Host == null) - { - await WriteHostHeaderAsync(request.RequestUri, cancellationToken).ConfigureAwait(false); - } - - // CRLF for end of headers. - await WriteTwoBytesAsync((byte)'\r', (byte)'\n', cancellationToken).ConfigureAwait(false); - - Debug.Assert(_sendRequestContentTask == null); - if (request.Content == null) - { - // We have nothing more to send, so flush out any headers we haven't yet sent. - await FlushAsync(cancellationToken).ConfigureAwait(false); - } - else - { - // Asynchronously send the body if there is one. This can run concurrently with receiving - // the response. The write content streams will handle ensuring appropriate flushes are done - // to ensure the headers and content are sent. - bool transferEncodingChunked = request.HasHeaders && request.Headers.TransferEncodingChunked == true; - HttpContentWriteStream stream = transferEncodingChunked ? (HttpContentWriteStream) - new ChunkedEncodingWriteStream(this, cancellationToken) : - new ContentLengthWriteStream(this, cancellationToken); - - if (!request.HasHeaders || request.Headers.ExpectContinue != true) - { - // Start the copy from the request. We do this here in case it synchronously throws - // an exception, e.g. StreamContent throwing for non-rewindable content, and because if - // we did it in SendRequestContentAsync, that exception would get trapped in the returned - // task... at that point, we might get stuck waiting to receive a response from the server - // that'll never come, as the server is still expecting us to send data. - _sendRequestContentTask = SendRequestContentAsync(request.Content.CopyToAsync(stream, _transportContext), stream); - } - else - { - // We're sending an Expect: 100-continue header. We need to flush headers so that the server receives - // all of them, and we need to do so before initiating the send, as once we do that, it effectively - // owns the right to write, and we don't want to concurrently be accessing the write buffer. - await FlushAsync(cancellationToken).ConfigureAwait(false); - - // Create a TCS we'll use to block the request content from being sent, and create a timer that's used - // as a fail-safe to unblock the request content if we don't hear back from the server in a timely manner. - // Then kick off the request. The TCS' result indicates whether content should be sent or not. - allowExpect100ToContinue = new TaskCompletionSource(); - var expect100Timer = new Timer( - s => ((TaskCompletionSource)s).TrySetResult(true), - allowExpect100ToContinue, TimeSpan.FromMilliseconds(Expect100TimeoutMilliseconds), Timeout.InfiniteTimeSpan); - _sendRequestContentTask = SendRequestContentWithExpect100ContinueAsync(request, allowExpect100ToContinue.Task, stream, expect100Timer); - } - } - - // Parse the response status line. - var response = new HttpResponseMessage() { RequestMessage = request, Content = new HttpConnectionContent(CancellationToken.None) }; - ParseStatusLine(await ReadNextLineAsync(cancellationToken).ConfigureAwait(false), response); - - // If we sent an Expect: 100-continue header, handle the response accordingly. - if (allowExpect100ToContinue != null) - { - if ((int)response.StatusCode >= 300 && - (request.Content.Headers.ContentLength == null || request.Content.Headers.ContentLength.GetValueOrDefault() > Expect100ErrorSendThreshold)) - { - // For error final status codes, try to avoid sending the payload if its size is unknown or if it's known to be "big". - // If we already sent a header detailing the size of the payload, if we then don't send that payload, the server may wait - // for it and assume that the next request on the connection is actually this request's payload. Thus we mark the connection - // to be closed. However, we may have also lost a race condition with the Expect: 100-continue timeout, so if it turns out - // we've already started sending the payload (we weren't able to cancel it), then we don't need to force close the connection. - allowExpect100ToContinue.TrySetResult(false); - if (!allowExpect100ToContinue.Task.Result) // if Result is true, the timeout already expired and we started sending content - { - _connectionClose = true; - } - } - else - { - // For any success or informational status codes (including 100 continue), send the payload. - allowExpect100ToContinue.TrySetResult(true); - - // And if this was 100 continue, deal with the extra headers. - if (response.StatusCode == HttpStatusCode.Continue) - { - // We got our continue header. Read the subsequent \r\n and parse the additional status line. - if (!LineIsEmpty(await ReadNextLineAsync(cancellationToken).ConfigureAwait(false))) - { - ThrowInvalidHttpResponse(); - } - - ParseStatusLine(await ReadNextLineAsync(cancellationToken).ConfigureAwait(false), response); - } - } - } - - // Parse the response headers. - while (true) - { - ArraySegment line = await ReadNextLineAsync(cancellationToken).ConfigureAwait(false); - if (LineIsEmpty(line)) - { - break; - } - ParseHeaderNameValue(line, response); - } - - // Determine whether we need to force close the connection when the request/response has completed. - if (response.Headers.ConnectionClose.GetValueOrDefault()) - { - _connectionClose = true; - } - - // Before creating the response stream, check to see if we're done sending any content, - // and propagate any exceptions that may have occurred. The most common case is that - // the server won't send back response content until it's received the whole request, - // so the majority of the time this task will be complete. - Task sendRequestContentTask = _sendRequestContentTask; - if (sendRequestContentTask != null && sendRequestContentTask.IsCompleted) - { - sendRequestContentTask.GetAwaiter().GetResult(); - _sendRequestContentTask = null; - } - - // Create the response stream. - HttpContentReadStream responseStream; - if (request.Method == HttpMethod.Head || (int)response.StatusCode == 204 || (int)response.StatusCode == 304) - { - responseStream = EmptyReadStream.Instance; - ReturnConnectionToPool(); - } - else if (response.Content.Headers.ContentLength != null) - { - long contentLength = response.Content.Headers.ContentLength.GetValueOrDefault(); - if (contentLength <= 0) - { - responseStream = EmptyReadStream.Instance; - ReturnConnectionToPool(); - } - else - { - responseStream = new ContentLengthReadStream(this, (ulong)contentLength); - } - } - else if (response.Headers.TransferEncodingChunked == true) - { - responseStream = new ChunkedEncodingReadStream(this); - } - else - { - responseStream = new ConnectionCloseReadStream(this); - } - ((HttpConnectionContent)response.Content).SetStream(responseStream); - - if (NetEventSource.IsEnabled) Trace($"Received response: {response}"); - return response; - } - catch (Exception error) - { - // Make sure to complete the allowExpect100ToContinue task if it exists. - allowExpect100ToContinue?.TrySetResult(false); - - if (NetEventSource.IsEnabled) Trace($"Error sending request: {error}"); - Dispose(); - - if (_pendingException != null) - { - // If we incurred an exception in non-linear control flow such that - // the exception didn't bubble up here (e.g. concurrent sending of - // the request content), use that error instead. - throw new HttpRequestException(SR.net_http_client_execution_error, _pendingException); - } - - // Otherwise, propagate this exception, wrapping it if necessary to - // match exception type expectations. - if (error is InvalidOperationException || error is IOException) - { - throw new HttpRequestException(SR.net_http_client_execution_error, error); - } - throw; - } - } - - private static bool LineIsEmpty(ArraySegment line) - { - Debug.Assert(line.Count >= 2, "Lines should always be \r\n terminated."); - return line.Count == 2; - } - - private async Task SendRequestContentAsync(Task copyTask, HttpContentWriteStream stream) - { - try - { - // Wait for all of the data to be copied to the server. - await copyTask.ConfigureAwait(false); - - // Finish the content; with a chunked upload, this includes writing the terminating chunk. - await stream.FinishAsync().ConfigureAwait(false); - - // Flush any content that might still be buffered. - await FlushAsync(stream.RequestCancellationToken).ConfigureAwait(false); - } - catch (Exception e) - { - _pendingException = e; - if (NetEventSource.IsEnabled) Trace($"Error while sending request content: {e}"); - Dispose(); - throw; - } - } - - private async Task SendRequestContentWithExpect100ContinueAsync( - HttpRequestMessage request, Task allowExpect100ToContinueTask, HttpContentWriteStream stream, Timer expect100Timer) - { - // Wait until we receive a trigger notification that it's ok to continue sending content. - // This will come either when the timer fires or when we receive a response status line from the server. - bool sendRequestContent = await allowExpect100ToContinueTask.ConfigureAwait(false); - - // Clean up the timer; it's no longer needed. - expect100Timer.Dispose(); - - // Send the content if we're supposed to. Otherwise, we're done. - if (sendRequestContent) - { - if (NetEventSource.IsEnabled) Trace($"Sending request content for Expect: 100-continue."); - await SendRequestContentAsync(request.Content.CopyToAsync(stream, _transportContext), stream).ConfigureAwait(false); - } - else - { - if (NetEventSource.IsEnabled) Trace($"Canceling request content for Expect: 100-continue."); - } - } - - // TODO: Remove this overload once https://github.com/dotnet/roslyn/issues/17287 is addressed - // and the compiler doesn't lift the span temporary from the call site into the async state - // machine in debug builds. - private void ParseStatusLine(ArraySegment line, HttpResponseMessage response) => - ParseStatusLine((Span)line, response); - - private void ParseStatusLine(Span line, HttpResponseMessage response) - { - if (line.Length < 14 || // "HTTP/1.1 123\r\n" with optional phrase before the crlf - line[0] != 'H' || - line[1] != 'T' || - line[2] != 'T' || - line[3] != 'P' || - line[4] != '/' || - line[8] != ' ') - { - ThrowInvalidHttpResponse(); - } - - // Set the response HttpVersion and status code - byte majorVersion = line[5], minorVersion = line[7]; - byte status1 = line[9], status2 = line[10], status3 = line[11]; - if (!IsDigit(majorVersion) || line[6] != (byte)'.' || !IsDigit(minorVersion) || - !IsDigit(status1) || !IsDigit(status2) || !IsDigit(status3)) - { - ThrowInvalidHttpResponse(); - } - response.Version = - (majorVersion == '1' && minorVersion == '1') ? HttpVersionInternal.Version11 : - (majorVersion == '1' && minorVersion == '0') ? HttpVersionInternal.Version10 : - (majorVersion == '2' && minorVersion == '0') ? HttpVersionInternal.Version20 : - HttpVersionInternal.Unknown; - response.StatusCode = - (HttpStatusCode)(100 * (status1 - '0') + 10 * (status2 - '0') + (status3 - '0')); - - // Parse (optional) reason phrase - byte c = line[12]; - if (c == '\r') - { - response.ReasonPhrase = string.Empty; - } - else if (c != ' ') - { - ThrowInvalidHttpResponse(); - } - else - { - Span reasonBytes = line.Slice(13, line.Length - 13 - 2); // 2 == \r\n ending trimmed off - string knownReasonPhrase = HttpStatusDescription.Get(response.StatusCode); - if (knownReasonPhrase != null && EqualsOrdinal(knownReasonPhrase, reasonBytes)) - { - response.ReasonPhrase = knownReasonPhrase; - } - else - { - unsafe - { - try - { - fixed (byte* reasonPtr = &MemoryMarshal.GetReference(reasonBytes)) - { - response.ReasonPhrase = Encoding.ASCII.GetString(reasonPtr, reasonBytes.Length); - } - } - catch (FormatException e) - { - ThrowInvalidHttpResponse(e); - } - } - } - } - } - - // TODO: Remove this overload once https://github.com/dotnet/roslyn/issues/17287 is addressed - // and the compiler doesn't lift the span temporary from the call site into the async state - // machine in debug builds. - private void ParseHeaderNameValue(ArraySegment line, HttpResponseMessage response) => - ParseHeaderNameValue((Span)line, response); - - private void ParseHeaderNameValue(Span line, HttpResponseMessage response) - { - int pos = 0; - while (line[pos] != (byte)':' && line[pos] != (byte)' ') - { - pos++; - if (pos == line.Length) - { - // Ignore invalid header line that doesn't contain ':'. - return; - } - } - - if (pos == 0) - { - // Ignore invalid empty header name. - return; - } - - // CONSIDER: trailing whitespace? - - if (!HeaderDescriptor.TryGet(line.Slice(0, pos), out HeaderDescriptor descriptor)) - { - // Ignore invalid header name - return; - } - - // Eat any trailing whitespace - while (line[pos] == (byte)' ') - { - pos++; - if (pos == line.Length) - { - // Ignore invalid header line that doesn't contain ':'. - return; - } - } - - if (line[pos++] != ':') - { - // Ignore invalid header line that doesn't contain ':'. - return; - } - - // Skip whitespace after colon - while (pos < line.Length && (line[pos] == (byte)' ' || line[pos] == '\t')) - { - pos++; - } - - string headerValue = descriptor.GetHeaderValue(line.Slice(pos, line.Length - pos - 2)); // trim trailing \r\n - - // Note we ignore the return value from TryAddWithoutValidation; - // if the header can't be added, we silently drop it. - if (descriptor.HeaderType == HttpHeaderType.Content) - { - response.Content.Headers.TryAddWithoutValidation(descriptor, headerValue); - } - else - { - response.Headers.TryAddWithoutValidation(descriptor, headerValue); - } - } - - private static bool IsDigit(byte c) => (uint)(c - '0') <= '9' - '0'; - - private void WriteToBuffer(ReadOnlyMemory source) - { - Debug.Assert(source.Length <= _writeBuffer.Length - _writeOffset); - source.Span.CopyTo(new Span(_writeBuffer, _writeOffset, source.Length)); - _writeOffset += source.Length; - } - - private async Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken) - { - int remaining = _writeBuffer.Length - _writeOffset; - - if (source.Length <= remaining) - { - // Fits in current write buffer. Just copy and return. - WriteToBuffer(source); - return; - } - - if (_writeOffset != 0) - { - // Fit what we can in the current write buffer and flush it. - WriteToBuffer(source.Slice(0, remaining)); - source = source.Slice(remaining); - await FlushAsync(cancellationToken).ConfigureAwait(false); - } - - if (source.Length >= _writeBuffer.Length) - { - // Large write. No sense buffering this. Write directly to stream. - // CONSIDER: May want to be a bit smarter here? Think about how large writes should work... - await WriteToStreamAsync(source, cancellationToken).ConfigureAwait(false); - } - else - { - // Copy remainder into buffer - WriteToBuffer(source); - } - } - - private Task WriteWithoutBufferingAsync(ReadOnlyMemory source, CancellationToken cancellationToken) - { - if (_writeOffset == 0) - { - // There's nothing in the write buffer we need to flush. - // Just write the supplied data out to the stream. - return WriteToStreamAsync(source, cancellationToken); - } - - int remaining = _writeBuffer.Length - _writeOffset; - if (source.Length <= remaining) - { - // There's something already in the write buffer, but the content - // we're writing can also fit after it in the write buffer. Copy - // the content to the write buffer and then flush it, so that we - // can do a single send rather than two. - WriteToBuffer(source); - return FlushAsync(cancellationToken); - } - - // There's data in the write buffer and the data we're writing doesn't fit after it. - // Do two writes, one to flush the buffer and then another to write the supplied content. - return FlushThenWriteWithoutBufferingAsync(source, cancellationToken); - } - - private async Task FlushThenWriteWithoutBufferingAsync(ReadOnlyMemory source, CancellationToken cancellationToken) - { - await FlushAsync(cancellationToken).ConfigureAwait(false); - await WriteToStreamAsync(source, cancellationToken).ConfigureAwait(false); - } - - private Task WriteByteAsync(byte b, CancellationToken cancellationToken) - { - if (_writeOffset < _writeBuffer.Length) - { - _writeBuffer[_writeOffset++] = b; - return Task.CompletedTask; - } - return WriteByteSlowAsync(b, cancellationToken); - } - - private async Task WriteByteSlowAsync(byte b, CancellationToken cancellationToken) - { - Debug.Assert(_writeOffset == _writeBuffer.Length); - await WriteToStreamAsync(_writeBuffer, cancellationToken).ConfigureAwait(false); - - _writeBuffer[0] = b; - _writeOffset = 1; - } - - private Task WriteTwoBytesAsync(byte b1, byte b2, CancellationToken cancellationToken) - { - if (_writeOffset <= _writeBuffer.Length - 2) - { - byte[] buffer = _writeBuffer; - buffer[_writeOffset++] = b1; - buffer[_writeOffset++] = b2; - return Task.CompletedTask; - } - return WriteTwoBytesSlowAsync(b1, b2, cancellationToken); - } - - private async Task WriteTwoBytesSlowAsync(byte b1, byte b2, CancellationToken cancellationToken) - { - await WriteByteAsync(b1, cancellationToken).ConfigureAwait(false); - await WriteByteAsync(b2, cancellationToken).ConfigureAwait(false); - } - - private Task WriteBytesAsync(byte[] bytes, CancellationToken cancellationToken) - { - if (_writeOffset <= _writeBuffer.Length - bytes.Length) - { - Buffer.BlockCopy(bytes, 0, _writeBuffer, _writeOffset, bytes.Length); - _writeOffset += bytes.Length; - return Task.CompletedTask; - } - return WriteBytesSlowAsync(bytes, cancellationToken); - } - - private async Task WriteBytesSlowAsync(byte[] bytes, CancellationToken cancellationToken) - { - int offset = 0; - while (true) - { - int remaining = bytes.Length - offset; - int toCopy = Math.Min(remaining, _writeBuffer.Length - _writeOffset); - Buffer.BlockCopy(bytes, offset, _writeBuffer, _writeOffset, toCopy); - _writeOffset += toCopy; - offset += toCopy; - - Debug.Assert(offset <= bytes.Length, $"Expected {nameof(offset)} to be <= {bytes.Length}, got {offset}"); - Debug.Assert(_writeOffset <= _writeBuffer.Length, $"Expected {nameof(_writeOffset)} to be <= {_writeBuffer.Length}, got {_writeOffset}"); - if (offset == bytes.Length) - { - break; - } - else if (_writeOffset == _writeBuffer.Length) - { - await WriteToStreamAsync(_writeBuffer, cancellationToken).ConfigureAwait(false); - _writeOffset = 0; - } - } - } - - private Task WriteStringAsync(string s, CancellationToken cancellationToken) - { - // If there's enough space in the buffer to just copy all of the string's bytes, do so. - // Unlike WriteAsciiStringAsync, validate each char along the way. - int offset = _writeOffset; - if (s.Length <= _writeBuffer.Length - offset) - { - byte[] writeBuffer = _writeBuffer; - foreach (char c in s) - { - if ((c & 0xFF80) != 0) - { - throw new HttpRequestException(SR.net_http_request_invalid_char_encoding); - } - writeBuffer[offset++] = (byte)c; - } - _writeOffset = offset; - return Task.CompletedTask; - } - - // Otherwise, fall back to doing a normal slow string write; we could optimize away - // the extra checks later, but the case where we cross a buffer boundary should be rare. - return WriteStringAsyncSlow(s, cancellationToken); - } - - private Task WriteAsciiStringAsync(string s, CancellationToken cancellationToken) - { - // If there's enough space in the buffer to just copy all of the string's bytes, do so. - int offset = _writeOffset; - if (s.Length <= _writeBuffer.Length - offset) - { - byte[] writeBuffer = _writeBuffer; - foreach (char c in s) - { - writeBuffer[offset++] = (byte)c; - } - _writeOffset = offset; - return Task.CompletedTask; - } - - // Otherwise, fall back to doing a normal slow string write; we could optimize away - // the extra checks later, but the case where we cross a buffer boundary should be rare. - return WriteStringAsyncSlow(s, cancellationToken); - } - - private async Task WriteStringAsyncSlow(string s, CancellationToken cancellationToken) - { - for (int i = 0; i < s.Length; i++) - { - char c = s[i]; - if ((c & 0xFF80) != 0) - { - throw new HttpRequestException(SR.net_http_request_invalid_char_encoding); - } - await WriteByteAsync((byte)c, cancellationToken).ConfigureAwait(false); - } - } - - private Task FlushAsync(CancellationToken cancellationToken) - { - if (_writeOffset > 0) - { - Task t = WriteToStreamAsync(new ReadOnlyMemory(_writeBuffer, 0, _writeOffset), cancellationToken); - _writeOffset = 0; - return t; - } - return Task.CompletedTask; - } - - private Task WriteToStreamAsync(ReadOnlyMemory source, CancellationToken cancellationToken) - { - if (NetEventSource.IsEnabled) Trace($"Writing {source.Length} bytes."); - return _stream.WriteAsync(source, cancellationToken); - } - - private async ValueTask> ReadNextLineAsync(CancellationToken cancellationToken) - { - int searchOffset = 0; - while (true) - { - int startIndex = _readOffset + searchOffset; - int length = _readLength - startIndex; - int crPos = Array.IndexOf(_readBuffer, (byte)'\r', startIndex, length); - if (crPos < 0) - { - // Couldn't find a \r. Read more. - searchOffset = length; - await FillAsync(cancellationToken).ConfigureAwait(false); - } - else if (crPos + 1 >= _readLength) - { - // We found a \r, but we don't have enough data buffered to read the \n. - searchOffset = length - 1; - await FillAsync(cancellationToken).ConfigureAwait(false); - } - else if (_readBuffer[crPos + 1] == '\n') - { - // We found a \r\n. Return the data up to and including it. - int lineLength = crPos - _readOffset + 2; - var result = new ArraySegment(_readBuffer, _readOffset, lineLength); - _readOffset += lineLength; - return result; - } - else - { - ThrowInvalidHttpResponse(); - } - } - } - - private async Task ReadCrLfAsync(CancellationToken cancellationToken) - { - while (_readLength - _readOffset < 2) - { - // We have fewer than 2 chars buffered. Get more. - await FillAsync(cancellationToken).ConfigureAwait(false); - } - - // We expect \r\n. If so, consume them. If not, it's an error. - if (_readBuffer[_readOffset] != '\r' || _readBuffer[_readOffset + 1] != '\n') - { - ThrowInvalidHttpResponse(); - } - - _readOffset += 2; - } - - // Throws IOException on EOF. This is only called when we expect more data. - private async Task FillAsync(CancellationToken cancellationToken) - { - int remaining = _readLength - _readOffset; - Debug.Assert(remaining >= 0); - - if (remaining == 0) - { - // No data in the buffer. Simply reset the offset and length to 0 to allow - // the whole buffer to be filled. - _readOffset = _readLength = 0; - } - else if (_readOffset > 0) - { - // There's some data in the buffer but it's not at the beginning. Shift it - // down to make room for more. - Buffer.BlockCopy(_readBuffer, _readOffset, _readBuffer, 0, remaining); - _readOffset = 0; - _readLength = remaining; - } - else if (remaining == _readBuffer.Length) - { - // The whole buffer is full, but the caller is still requesting more data, - // so increase the size of the buffer. - Debug.Assert(_readOffset == 0); - Debug.Assert(_readLength == _readBuffer.Length); - - byte[] newReadBuffer = new byte[_readBuffer.Length * 2]; - Buffer.BlockCopy(_readBuffer, 0, newReadBuffer, 0, remaining); - _readBuffer = newReadBuffer; - _readOffset = 0; - _readLength = remaining; - } - - // When the connection was put back into the pool, a pre-emptive read was performed - // into the read buffer. That read should not complete prior to us using the - // connection again, as that would mean the connection was either closed or had - // erroneous data sent on it by the server in response to no request from us. - // We need to consume that read prior to issuing another read request. - Task t = _readAheadTask; - int bytesRead; - if (t != null) - { - Debug.Assert(_readOffset == 0); - Debug.Assert(_readLength == 0); - _readAheadTask = null; - bytesRead = await t.ConfigureAwait(false); - } - else - { - ValueTask vt = _stream.ReadAsync(new Memory(_readBuffer, _readLength, _readBuffer.Length - _readLength), cancellationToken); - bytesRead = vt.IsCompletedSuccessfully ? vt.Result : await vt.AsTask().ConfigureAwait(false); - } - - if (NetEventSource.IsEnabled) Trace($"Received {bytesRead} bytes."); - if (bytesRead == 0) - { - throw new IOException(SR.net_http_invalid_response); - } - _readLength += bytesRead; - } - - private void ReadFromBuffer(Span buffer) - { - Debug.Assert(buffer.Length <= _readLength - _readOffset); - - new Span(_readBuffer, _readOffset, buffer.Length).CopyTo(buffer); - _readOffset += buffer.Length; - } - - private async ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken) - { - // This is called when reading the response body - - int remaining = _readLength - _readOffset; - if (remaining > 0) - { - // We have data in the read buffer. Return it to the caller. - if (destination.Length <= remaining) - { - ReadFromBuffer(destination.Span); - return destination.Length; - } - else - { - ReadFromBuffer(destination.Span.Slice(0, remaining)); - return remaining; - } - } - - // No data in read buffer. - // Do an unbuffered read directly against the underlying stream. - Debug.Assert(_readAheadTask == null, "Read ahead task should have been consumed as part of the headers."); - int count = await _stream.ReadAsync(destination, cancellationToken).ConfigureAwait(false); - if (NetEventSource.IsEnabled) Trace($"Received {count} bytes."); - return count; - } - - private async Task CopyFromBufferAsync(Stream destination, int count, CancellationToken cancellationToken) - { - Debug.Assert(count <= _readLength - _readOffset); - - if (NetEventSource.IsEnabled) Trace($"Copying {count} bytes to stream."); - await destination.WriteAsync(_readBuffer, _readOffset, count, cancellationToken).ConfigureAwait(false); - _readOffset += count; - } - - private async Task CopyToAsync(Stream destination, CancellationToken cancellationToken) - { - Debug.Assert(destination != null); - - int remaining = _readLength - _readOffset; - if (remaining > 0) - { - await CopyFromBufferAsync(destination, remaining, cancellationToken).ConfigureAwait(false); - } - - while (true) - { - _readOffset = 0; - - // Don't use FillAsync here as it will throw on EOF. - Debug.Assert(_readAheadTask == null); - _readLength = await _stream.ReadAsync(_readBuffer, cancellationToken).ConfigureAwait(false); - if (_readLength == 0) - { - // End of stream - break; - } - - await CopyFromBufferAsync(destination, _readLength, cancellationToken).ConfigureAwait(false); - } - } - - // Copy *exactly* [length] bytes into destination; throws on end of stream. - private async Task CopyToAsync(Stream destination, ulong length, CancellationToken cancellationToken) - { - Debug.Assert(destination != null); - Debug.Assert(length > 0); - - int remaining = _readLength - _readOffset; - if (remaining > 0) - { - if ((ulong)remaining > length) - { - remaining = (int)length; - } - await CopyFromBufferAsync(destination, remaining, cancellationToken).ConfigureAwait(false); - - length -= (ulong)remaining; - if (length == 0) - { - return; - } - } - - while (true) - { - await FillAsync(cancellationToken).ConfigureAwait(false); - - remaining = (ulong)_readLength < length ? _readLength : (int)length; - await CopyFromBufferAsync(destination, remaining, cancellationToken).ConfigureAwait(false); - - length -= (ulong)remaining; - if (length == 0) - { - return; - } - } - } - - private void ReturnConnectionToPool() - { - Debug.Assert(_readAheadTask == null, "Expected a previous initial read to already be consumed."); - Debug.Assert(_currentRequest != null, "Expected the connection to be associated with a request."); - - // Disassociate the connection from a request. If there's an in-flight request content still - // being sent, it'll see this nulled out and stop sending. Also clear out other request-specific content. - _currentRequest = null; - _pendingException = null; - - // Check to see if we're still sending request content. - Task sendRequestContentTask = _sendRequestContentTask; - if (sendRequestContentTask != null) - { - if (!sendRequestContentTask.IsCompleted) - { - // We're still transferring request content. Only put the connection back into the - // pool when we're done transferring. - if (NetEventSource.IsEnabled) Trace("Still transferring request content. Delaying returning connection to pool."); - sendRequestContentTask.ContinueWith((_, state) => - { - var innerConnection = (HttpConnection)state; - if (NetEventSource.IsEnabled) innerConnection.Trace("Request content send completed."); - innerConnection.ReturnConnectionToPoolCore(); - }, this, CancellationToken.None, TaskContinuationOptions.None, TaskScheduler.Default); - return; - } - - // We're done transferring request content. Check whether we incurred an exception, - // and if we did, propagate it to our caller. - if (!sendRequestContentTask.IsCompletedSuccessfully) - { - sendRequestContentTask.GetAwaiter().GetResult(); - } - } - - ReturnConnectionToPoolCore(); - } - - private void ReturnConnectionToPoolCore() - { - Debug.Assert(_sendRequestContentTask == null || _sendRequestContentTask.IsCompleted); - Debug.Assert(_writeOffset == 0, "Everything in write buffer should have been flushed."); - - if (NetEventSource.IsEnabled) - { - if (_connectionClose) - { - Trace("Server requested connection be closed."); - } - if (_sendRequestContentTask != null && _sendRequestContentTask.IsFaulted) - { - Trace($"Sending request content incurred an exception: {_sendRequestContentTask.Exception.InnerException}"); - } - } - - // If server told us it's closing the connection, don't put this back in the pool. - // And if we incurred an error while transferring request content, also skip the pool. - if (!_connectionClose && - (_sendRequestContentTask == null || _sendRequestContentTask.IsCompletedSuccessfully)) - { - try - { - // Null out the associated request before the connection is potentially reused by another. - _currentRequest = null; - _sendRequestContentTask = null; - - // When putting a connection back into the pool, we initiate a pre-emptive - // read on the stream. When the connection is subsequently taken out of the - // pool, this can be used in place of the first read on the stream that would - // otherwise be done. But by doing it now, we can check the status of the read - // at any point to understand if the connection has been closed or if errant data - // has been sent on the connection by the server, either of which would mean we - // should close the connection and not use it for subsequent requests. - _readAheadTask = _stream.ReadAsync(_readBuffer, 0, _readBuffer.Length); - - // Put connection back in the pool. - _pool.ReturnConnection(this); - return; - } - catch - { - // If reading throws, eat the error and don't pool the connection. - } - } - - // We're not putting the connection back in the pool. Dispose it. - Dispose(); - } - - private static bool EqualsOrdinal(string left, Span right) - { - Debug.Assert(left != null, "Expected non-null string"); - - if (left.Length != right.Length) - { - return false; - } - - for (int i = 0; i < left.Length; i++) - { - if (left[i] != right[i]) - { - return false; - } - } - - return true; - } - - public override string ToString() => $"{nameof(HttpConnection)}(Host:{_key.Host})"; // Description for diagnostic purposes - - private static void ThrowInvalidHttpResponse() => throw new HttpRequestException(SR.net_http_invalid_response); - - private static void ThrowInvalidHttpResponse(Exception innerException) => throw new HttpRequestException(SR.net_http_invalid_response, innerException); - - internal void Trace(string message, [CallerMemberName] string memberName = null) => - NetEventSource.Log.HandlerMessage( - _pool?.GetHashCode() ?? 0, // pool ID - GetHashCode(), // connection ID - _currentRequest?.GetHashCode() ?? 0, // request ID - memberName, // method name - ToString() + ": " + message); // message - } -} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpConnectionHandler.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpConnectionHandler.cs deleted file mode 100644 index 7f926e7aa6..0000000000 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpConnectionHandler.cs +++ /dev/null @@ -1,154 +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.IO; -using System.Net.Security; -using System.Security.Authentication; -using System.Security.Cryptography.X509Certificates; -using System.Threading; -using System.Threading.Tasks; - -namespace System.Net.Http -{ - internal sealed class HttpConnectionHandler : HttpMessageHandler - { - private readonly HttpConnectionSettings _settings; - private readonly HttpConnectionPools _connectionPools; - - public HttpConnectionHandler(HttpConnectionSettings settings) - { - _settings = settings; - _connectionPools = new HttpConnectionPools(settings._maxConnectionsPerServer); - } - - protected internal override Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) - { - var key = new HttpConnectionKey(request.RequestUri); - - HttpConnectionPool pool = _connectionPools.GetOrAddPool(key); - ValueTask connectionTask = pool.GetConnectionAsync( - (state, ct) => state.handler.CreateConnection(state.request, state.key, state.pool, ct), - (handler: this, request: request, key: key, pool: pool), cancellationToken); - - return connectionTask.IsCompletedSuccessfully ? - connectionTask.Result.SendAsync(request, cancellationToken) : - SendAsyncWithAwaitedConnection(connectionTask, request, cancellationToken); - } - - private async Task SendAsyncWithAwaitedConnection( - ValueTask connectionTask, HttpRequestMessage request, CancellationToken cancellationToken) - { - HttpConnection connection = await connectionTask.ConfigureAwait(false); - return await connection.SendAsync(request, cancellationToken).ConfigureAwait(false); - } - - private async ValueTask EstablishSslConnection(string host, HttpRequestMessage request, Stream stream, CancellationToken cancellationToken) - { - RemoteCertificateValidationCallback callback = null; - if (_settings._serverCertificateCustomValidationCallback != null) - { - callback = (object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors) => - { - try - { - return _settings._serverCertificateCustomValidationCallback(request, certificate as X509Certificate2, chain, sslPolicyErrors); - } - catch (Exception e) - { - throw new HttpRequestException(SR.net_http_ssl_connection_failed, e); - } - }; - } - - var sslStream = new SslStream(stream); - - try - { - await sslStream.AuthenticateAsClientAsync(new SslClientAuthenticationOptions - { - TargetHost = host, - ClientCertificates = _settings._clientCertificates, - EnabledSslProtocols = _settings._sslProtocols, - CertificateRevocationCheckMode = _settings._checkCertificateRevocationList ? X509RevocationMode.Online : X509RevocationMode.NoCheck, - RemoteCertificateValidationCallback = callback - }, cancellationToken).ConfigureAwait(false); - } - catch (Exception e) - { - sslStream.Dispose(); - if (e is AuthenticationException || e is IOException) - { - throw new HttpRequestException(SR.net_http_ssl_connection_failed, e); - } - throw; - } - - return sslStream; - } - - private async ValueTask CreateConnection( - HttpRequestMessage request, HttpConnectionKey key, HttpConnectionPool pool, CancellationToken cancellationToken) - { - Uri uri = request.RequestUri; - - Stream stream = await ConnectHelper.ConnectAsync(uri.IdnHost, uri.Port, cancellationToken).ConfigureAwait(false); - - TransportContext transportContext = null; - - if (uri.Scheme == UriScheme.Https) - { - // Get the appropriate host name to use for the SSL connection, allowing a host header to override. - string host = request.Headers.Host; - if (host == null) - { - // No host header, use the host from the Uri. - host = uri.IdnHost; - } - else - { - // There is a host header. Use it, but first see if we need to trim off a port. - int colonPos = host.IndexOf(':'); - if (colonPos >= 0) - { - // There is colon, which could either be a port separator or a separator in - // an IPv6 address. See if this is an IPv6 address; if it's not, use everything - // before the colon as the host name, and if it is, use everything before the last - // colon iff the last colon is after the end of the IPv6 address (otherwise it's a - // part of the address). - int ipV6AddressEnd = host.IndexOf(']'); - if (ipV6AddressEnd == -1) - { - host = host.Substring(0, colonPos); - } - else - { - colonPos = host.LastIndexOf(':'); - if (colonPos > ipV6AddressEnd) - { - host = host.Substring(0, colonPos); - } - } - } - } - - // Establish the connection using the parsed host name. - SslStream sslStream = await EstablishSslConnection(host, request, stream, cancellationToken).ConfigureAwait(false); - stream = sslStream; - transportContext = sslStream.TransportContext; - } - - return new HttpConnection(pool, key, uri.IdnHost, stream, transportContext, false); - } - - protected override void Dispose(bool disposing) - { - if (disposing) - { - _connectionPools.Dispose(); - } - - base.Dispose(disposing); - } - } -} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpConnectionKey.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpConnectionKey.cs deleted file mode 100644 index 7633841c07..0000000000 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpConnectionKey.cs +++ /dev/null @@ -1,40 +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.Net.Http -{ - internal readonly struct HttpConnectionKey : IEquatable - { - public readonly bool UsingSSL; - public readonly string Host; - public readonly int Port; - - public HttpConnectionKey(Uri uri) - { - UsingSSL = - uri.Scheme == UriScheme.Http ? false : - uri.Scheme == UriScheme.Https ? true : - throw new ArgumentException(SR.net_http_client_http_baseaddress_required, nameof(uri)); - - Host = uri.Host; - Port = uri.Port; - } - - public override int GetHashCode() => - UsingSSL.GetHashCode() << 16 ^ Host.GetHashCode() ^ Port.GetHashCode(); - - public override bool Equals(object obj) => - obj != null && - obj is HttpConnectionKey && - Equals((HttpConnectionKey)obj); - - public bool Equals(HttpConnectionKey other) => - UsingSSL == other.UsingSSL && - Host == other.Host && - Port == other.Port; - - public static bool operator ==(HttpConnectionKey key1, HttpConnectionKey key2) => key1.Equals(key2); - public static bool operator !=(HttpConnectionKey key1, HttpConnectionKey key2) => !key1.Equals(key2); - } -} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpConnectionPools.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpConnectionPools.cs deleted file mode 100644 index d1d043b543..0000000000 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpConnectionPools.cs +++ /dev/null @@ -1,138 +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.Collections.Concurrent; -using System.Collections.Generic; -using System.Threading; - -namespace System.Net.Http -{ - /// Provides a set of connection pools, each for its own endpoint. - internal sealed class HttpConnectionPools : IDisposable - { - /// How frequently an operation should be initiated to clean out old pools and connections in those pools. - private const int CleanPoolTimeoutMilliseconds = -#if DEBUG - 1_000; -#else - 30_000; -#endif - /// The pools, indexed by endpoint. - private readonly ConcurrentDictionary _pools; - /// Timer used to initiate cleaning of the pools. - private readonly Timer _cleaningTimer; - /// The maximum number of connections allowed per pool. indicates unlimited. - private readonly int _maxConnectionsPerServer; - /// - /// Keeps track of whether or not the cleanup timer is running. It helps us avoid the expensive - /// call. - /// - private bool _timerIsRunning; - /// Object used to synchronize access to state in the pool. - private object SyncObj => _pools; - - /// Initializes the pools. - /// The maximum number of connections allowed per pool. indicates unlimited. - public HttpConnectionPools(int maxConnectionsPerServer) - { - _maxConnectionsPerServer = maxConnectionsPerServer; - _pools = new ConcurrentDictionary(); - // Start out with the timer not running, since we have no pools. - - // Don't capture the current ExecutionContext and its AsyncLocals onto the timer causing them to live forever - bool restoreFlow = false; - try - { - if (!ExecutionContext.IsFlowSuppressed()) - { - ExecutionContext.SuppressFlow(); - restoreFlow = true; - } - - _cleaningTimer = new Timer(s => ((HttpConnectionPools)s).RemoveStalePools(), this, Timeout.Infinite, Timeout.Infinite); - } - finally - { - // Restore the current ExecutionContext - if (restoreFlow) - ExecutionContext.RestoreFlow(); - } - } - - /// Gets a pool for the specified endpoint, adding one if none existed. - /// The endpoint for the pool. - /// The retrieved pool. - public HttpConnectionPool GetOrAddPool(HttpConnectionKey key) - { - HttpConnectionPool pool; - while (!_pools.TryGetValue(key, out pool)) - { - pool = new HttpConnectionPool(_maxConnectionsPerServer); - if (_pools.TryAdd(key, pool)) - { - // We need to ensure the cleanup timer is running if it isn't - // already now that we added a new connection pool. - lock (SyncObj) - { - if (!_timerIsRunning) - { - _cleaningTimer.Change(CleanPoolTimeoutMilliseconds, CleanPoolTimeoutMilliseconds); - _timerIsRunning = true; - } - } - break; - } - } - - return pool; - } - - /// Disposes of the pools, disposing of each individual pool. - public void Dispose() - { - _cleaningTimer.Dispose(); - foreach (KeyValuePair pool in _pools) - { - pool.Value.Dispose(); - } - } - - /// Removes unusable connections from each pool, and removes stale pools entirely. - private void RemoveStalePools() - { - // Iterate through each pool in the set of pools. For each, ask it to clear out - // any unusable connections (e.g. those which have expired, those which have been closed, etc.) - // The pool may detect that it's empty and long unused, in which case it'll dispose of itself, - // such that any connections returned to the pool to be cached will be disposed of. In such - // a case, we also remove the pool from the set of pools to avoid a leak. - foreach (KeyValuePair entry in _pools) - { - if (entry.Value.CleanCacheAndDisposeIfUnused()) - { - _pools.TryRemove(entry.Key, out HttpConnectionPool _); - } - } - - // Stop running the timer if we don't have any pools to clean up. - lock (SyncObj) - { - if (_pools.IsEmpty) - { - _cleaningTimer.Change(Timeout.Infinite, Timeout.Infinite); - _timerIsRunning = false; - } - } - - // NOTE: There is a possible race condition with regards to a pool getting cleaned up at the same - // time it's about to be used for another request. The timer cleanup could start running, see that - // a pool is empty, and initiate its disposal. Concurrently, the pools could hand out the pool - // to a request looking to get a connection, because the pool may not have been removed yet - // from the pools. Worst case here is that connection will end up getting returned to an - // already disposed pool, in which case the connection will also end up getting disposed rather - // than reused. This should be a rare occurrence, so for now we don't worry about it. In the - // future, there are a variety of possible ways to address it, such as allowing connections to - // be returned to pools they weren't associated with. - } - } -} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpConnectionSettings.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpConnectionSettings.cs deleted file mode 100644 index 866044af87..0000000000 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpConnectionSettings.cs +++ /dev/null @@ -1,43 +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.Collections.Generic; -using System.Net.Security; -using System.Security.Authentication; -using System.Security.Cryptography.X509Certificates; - -namespace System.Net.Http -{ - /// Provides a state bag of settings for configuring HTTP connections. - internal sealed class HttpConnectionSettings - { - internal DecompressionMethods _automaticDecompression = HttpHandlerDefaults.DefaultAutomaticDecompression; - - internal bool _useCookies = HttpHandlerDefaults.DefaultUseCookies; - internal CookieContainer _cookieContainer; - - internal bool _useProxy = HttpHandlerDefaults.DefaultUseProxy; - internal IWebProxy _proxy; - internal ICredentials _defaultProxyCredentials; - - internal bool _preAuthenticate = HttpHandlerDefaults.DefaultPreAuthenticate; - internal bool _useDefaultCredentials = HttpHandlerDefaults.DefaultUseDefaultCredentials; - internal ICredentials _credentials; - - internal bool _allowAutoRedirect = HttpHandlerDefaults.DefaultAutomaticRedirection; - internal int _maxAutomaticRedirections = HttpHandlerDefaults.DefaultMaxAutomaticRedirections; - - internal int _maxConnectionsPerServer = HttpHandlerDefaults.DefaultMaxConnectionsPerServer; - internal int _maxResponseHeadersLength = HttpHandlerDefaults.DefaultMaxResponseHeadersLength; - - internal ClientCertificateOption _clientCertificateOptions = HttpHandlerDefaults.DefaultClientCertificateOption; - internal X509CertificateCollection _clientCertificates; - - internal Func _serverCertificateCustomValidationCallback; - internal bool _checkCertificateRevocationList = false; - internal SslProtocols _sslProtocols = SslProtocols.None; - - internal IDictionary _properties; - } -} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpContentDuplexStream.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpContentDuplexStream.cs deleted file mode 100644 index 022e876067..0000000000 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpContentDuplexStream.cs +++ /dev/null @@ -1,34 +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.IO; -using System.Threading; - -namespace System.Net.Http -{ - internal abstract class HttpContentDuplexStream : HttpContentStream - { - public HttpContentDuplexStream(HttpConnection connection) : base(connection) - { - } - - public override bool CanRead => true; - public override bool CanWrite => true; - - public override void Flush() => FlushAsync().GetAwaiter().GetResult(); - - public override int Read(byte[] buffer, int offset, int count) - { - ValidateBufferArgs(buffer, offset, count); - return ReadAsync(new Memory(buffer, offset, count), CancellationToken.None).GetAwaiter().GetResult(); - } - - public override void Write(byte[] buffer, int offset, int count) => - WriteAsync(buffer, offset, count, CancellationToken.None).GetAwaiter().GetResult(); - - public override void CopyTo(Stream destination, int bufferSize) => - CopyToAsync(destination, bufferSize, CancellationToken.None).GetAwaiter().GetResult(); - } -} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpContentReadStream.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpContentReadStream.cs deleted file mode 100644 index c277cf8df7..0000000000 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpContentReadStream.cs +++ /dev/null @@ -1,60 +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.IO; -using System.Threading; - -namespace System.Net.Http -{ - internal abstract class HttpContentReadStream : HttpContentStream - { - protected HttpConnection _connection; - - public HttpContentReadStream(HttpConnection connection) - { - _connection = connection; - } - - public override bool CanRead => true; - public override bool CanSeek => false; - public override bool CanWrite => false; - - public override long Length => throw new NotSupportedException(); - - public override long Position - { - get { throw new NotSupportedException(); } - set { throw new NotSupportedException(); } - } - - public override void Flush() => throw new NotSupportedException(); - - public override long Seek(long offset, SeekOrigin origin) => throw new NotSupportedException(); - - public override void SetLength(long value) => throw new NotSupportedException(); - - public override void Write(byte[] buffer, int offset, int count) => throw new NotSupportedException(); - - public override int Read(byte[] buffer, int offset, int count) - { - ValidateBufferArgs(buffer, offset, count); - return ReadAsync(new Memory(buffer, offset, count), CancellationToken.None).GetAwaiter().GetResult(); - } - - public override void CopyTo(Stream destination, int bufferSize) => - CopyToAsync(destination, bufferSize, CancellationToken.None).GetAwaiter().GetResult(); - - protected override void Dispose(bool disposing) - { - if (_connection != null) - { - // We haven't finished reading the body, so close the connection. - _connection.Dispose(); - _connection = null; - } - - base.Dispose(disposing); - } - } -} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpContentStream.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpContentStream.cs deleted file mode 100644 index 991ea06bc0..0000000000 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpContentStream.cs +++ /dev/null @@ -1,29 +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.IO; - -namespace System.Net.Http -{ - internal abstract class HttpContentStream : Stream - { - protected static void ValidateBufferArgs(byte[] buffer, int offset, int count) - { - if (buffer == null) - { - throw new ArgumentNullException(nameof(buffer)); - } - - if ((uint)offset > buffer.Length) - { - throw new ArgumentOutOfRangeException(nameof(offset)); - } - - if ((uint)count > buffer.Length - offset) - { - throw new ArgumentOutOfRangeException(nameof(count)); - } - } - } -} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpContentWriteStream.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpContentWriteStream.cs deleted file mode 100644 index a998366083..0000000000 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpContentWriteStream.cs +++ /dev/null @@ -1,70 +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.IO; -using System.Threading; -using System.Threading.Tasks; - -namespace System.Net.Http -{ - internal abstract class HttpContentWriteStream : HttpContentStream - { - protected HttpConnection _connection; - - public HttpContentWriteStream(HttpConnection connection, CancellationToken cancellationToken) - { - Debug.Assert(connection != null); - _connection = connection; - RequestCancellationToken = cancellationToken; - } - - /// Cancellation token associated with the send operation. - /// - /// Because of how this write stream is used, the CancellationToken passed into the individual - /// stream operations will be the default non-cancelable token and can be ignored. Instead, - /// this token is used. - /// - internal CancellationToken RequestCancellationToken { get; } - - public override bool CanRead => false; - public override bool CanSeek => false; - public override bool CanWrite => true; - - public override long Length => throw new NotSupportedException(); - - public override long Position - { - get { throw new NotSupportedException(); } - set { throw new NotSupportedException(); } - } - - public override void Flush() => FlushAsync().GetAwaiter().GetResult(); - - public override long Seek(long offset, SeekOrigin origin) => throw new NotSupportedException(); - - public override void SetLength(long value) => throw new NotSupportedException(); - - public override int Read(byte[] buffer, int offset, int count) => throw new NotSupportedException(); - - public override void Write(byte[] buffer, int offset, int count) => - WriteAsync(buffer, offset, count, CancellationToken.None).GetAwaiter().GetResult(); - - public abstract Task FinishAsync(); - - protected override void Dispose(bool disposing) - { - if (disposing) - { - if (_connection != null) - { - _connection.Dispose(); - _connection = null; - } - } - - base.Dispose(disposing); - } - } -} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpProxyConnectionHandler.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpProxyConnectionHandler.cs deleted file mode 100644 index bd5718de4c..0000000000 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpProxyConnectionHandler.cs +++ /dev/null @@ -1,196 +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.IO; -using System.Net.Http.Headers; -using System.Threading; -using System.Threading.Tasks; - -namespace System.Net.Http -{ - internal sealed class HttpProxyConnectionHandler : HttpMessageHandler - { - private readonly HttpMessageHandler _innerHandler; - private readonly IWebProxy _proxy; - private readonly ICredentials _defaultCredentials; - private readonly HttpConnectionPools _connectionPools; - private bool _disposed; - - public HttpProxyConnectionHandler(HttpConnectionSettings settings, HttpMessageHandler innerHandler) - { - Debug.Assert(innerHandler != null); - Debug.Assert(settings._useProxy); - Debug.Assert(settings._proxy != null || s_proxyFromEnvironment.Value != null); - - _innerHandler = innerHandler; - _proxy = settings._proxy ?? new PassthroughWebProxy(s_proxyFromEnvironment.Value); - _defaultCredentials = settings._defaultProxyCredentials; - _connectionPools = new HttpConnectionPools(settings._maxConnectionsPerServer); - } - - protected internal override Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) - { - Uri proxyUri = null; - try - { - if (!_proxy.IsBypassed(request.RequestUri)) - { - proxyUri = _proxy.GetProxy(request.RequestUri); - } - } - catch (Exception) - { - // Eat any exception from the IWebProxy and just treat it as no proxy. - // This matches the behavior of other handlers. - } - - return proxyUri == null ? - _innerHandler.SendAsync(request, cancellationToken) : - SendWithProxyAsync(proxyUri, request, cancellationToken); - } - - private async Task SendWithProxyAsync( - Uri proxyUri, HttpRequestMessage request, CancellationToken cancellationToken) - { - if (proxyUri.Scheme != UriScheme.Http) - { - throw new InvalidOperationException(SR.net_http_invalid_proxy_scheme); - } - - if (request.RequestUri.Scheme == UriScheme.Https) - { - // TODO #23136: Implement SSL tunneling through proxy - throw new NotImplementedException("no support for SSL tunneling through proxy"); - } - - HttpConnection connection = await GetOrCreateConnection(request, proxyUri, cancellationToken).ConfigureAwait(false); - - HttpResponseMessage response = await connection.SendAsync(request, cancellationToken).ConfigureAwait(false); - - // Handle proxy authentication - if (response.StatusCode == HttpStatusCode.ProxyAuthenticationRequired) - { - foreach (AuthenticationHeaderValue h in response.Headers.ProxyAuthenticate) - { - // We only support Basic auth, ignore others - if (h.Scheme == AuthenticationHelper.Basic) - { - NetworkCredential credential = - _proxy.Credentials?.GetCredential(proxyUri, AuthenticationHelper.Basic) ?? - _defaultCredentials?.GetCredential(proxyUri, AuthenticationHelper.Basic); - - if (credential != null) - { - response.Dispose(); - - request.Headers.ProxyAuthorization = new AuthenticationHeaderValue(AuthenticationHelper.Basic, - AuthenticationHelper.GetBasicTokenForCredential(credential)); - - connection = await GetOrCreateConnection(request, proxyUri, cancellationToken).ConfigureAwait(false); - response = await connection.SendAsync(request, cancellationToken).ConfigureAwait(false); - } - - break; - } - else if (h.Scheme == AuthenticationHelper.Digest) - { - NetworkCredential credential = - _proxy.Credentials?.GetCredential(proxyUri, AuthenticationHelper.Digest) ?? - _defaultCredentials?.GetCredential(proxyUri, AuthenticationHelper.Digest); - - if (credential != null) - { - // Update digest response with new parameter from Proxy-Authenticate - AuthenticationHelper.DigestResponse digestResponse = new AuthenticationHelper.DigestResponse(h.Parameter); - - if (await AuthenticationHelper.TrySetDigestAuthToken(request, credential, digestResponse, HttpKnownHeaderNames.ProxyAuthorization).ConfigureAwait(false)) - { - response.Dispose(); - response = await _innerHandler.SendAsync(request, cancellationToken).ConfigureAwait(false); - - // Retry in case of nonce timeout in server. - if (response.StatusCode == HttpStatusCode.Unauthorized) - { - foreach (AuthenticationHeaderValue ahv in response.Headers.ProxyAuthenticate) - { - if (ahv.Scheme == AuthenticationHelper.Digest) - { - digestResponse = new AuthenticationHelper.DigestResponse(ahv.Parameter); - if (AuthenticationHelper.IsServerNonceStale(digestResponse) && - await AuthenticationHelper.TrySetDigestAuthToken(request, credential, digestResponse, HttpKnownHeaderNames.ProxyAuthorization).ConfigureAwait(false)) - { - response.Dispose(); - response = await _innerHandler.SendAsync(request, cancellationToken).ConfigureAwait(false); - } - - break; - } - } - } - } - - break; - } - } - } - } - - return response; - } - - private ValueTask GetOrCreateConnection(HttpRequestMessage request, Uri proxyUri, CancellationToken cancellationToken) - { - var key = new HttpConnectionKey(proxyUri); - HttpConnectionPool pool = _connectionPools.GetOrAddPool(key); - return pool.GetConnectionAsync(async (state, ct) => - { - Stream stream = await ConnectHelper.ConnectAsync(state.proxyUri.IdnHost, state.proxyUri.Port, ct).ConfigureAwait(false); - return new HttpConnection(state.pool, state.key, null, stream, null, true); - }, (pool: pool, key: key, request: request, proxyUri: proxyUri), cancellationToken); - } - - protected override void Dispose(bool disposing) - { - if (disposing && !_disposed) - { - _disposed = true; - _connectionPools.Dispose(); - } - - base.Dispose(disposing); - } - - public static bool EnvironmentProxyConfigured => s_proxyFromEnvironment.Value != null; - - private static readonly Lazy s_proxyFromEnvironment = new Lazy(() => - { - // http_proxy is standard on Unix, used e.g. by libcurl. - // TODO #23150: We should support the full array of environment variables here, - // including no_proxy, all_proxy, etc. - - string proxyString = Environment.GetEnvironmentVariable("http_proxy"); - if (!string.IsNullOrWhiteSpace(proxyString)) - { - Uri proxyFromEnvironment; - if (Uri.TryCreate(proxyString, UriKind.Absolute, out proxyFromEnvironment) || - Uri.TryCreate(Uri.UriSchemeHttp + Uri.SchemeDelimiter + proxyString, UriKind.Absolute, out proxyFromEnvironment)) - { - return proxyFromEnvironment; - } - } - - return null; - }); - - private sealed class PassthroughWebProxy : IWebProxy - { - private readonly Uri _proxyUri; - public PassthroughWebProxy(Uri proxyUri) => _proxyUri = proxyUri; - public ICredentials Credentials { get => null; set { } } - public Uri GetProxy(Uri destination) => _proxyUri; - public bool IsBypassed(Uri host) => false; - } - } -} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/README.md b/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/README.md deleted file mode 100644 index c7d6a588ab..0000000000 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/README.md +++ /dev/null @@ -1,3 +0,0 @@ -#### Enabling the ManagedHandler - -The shipping version of HttpClientHandler is a wrapper for WinHTTP on Windows and libcurl on Unix. This directory contains a managed implementation that's still under development and that's not intended for production use. By default it's disabled, and the WinHTTP/libcurl versions will be used. However, by setting the "COMPlus_UseManagedHttpClientHandler" environment variable to "true", this managed implementation will be used. \ No newline at end of file diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/RawConnectionStream.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/RawConnectionStream.cs deleted file mode 100644 index 375006bacd..0000000000 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/RawConnectionStream.cs +++ /dev/null @@ -1,78 +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.IO; -using System.Threading; -using System.Threading.Tasks; - -namespace System.Net.Http -{ - internal sealed partial class HttpConnection : IDisposable - { - private sealed class RawConnectionStream : HttpContentDuplexStream - { - public RawConnectionStream(HttpConnection connection) : base(connection) - { - } - - public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - ValidateBufferArgs(buffer, offset, count); - return ReadAsync(new Memory(buffer, offset, count), cancellationToken).AsTask(); - } - - public override async ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default) - { - if (_connection == null || destination.Length == 0) - { - // Response body fully consumed or the caller didn't ask for any data - return 0; - } - - int bytesRead = await _connection.ReadAsync(destination, cancellationToken).ConfigureAwait(false); - if (bytesRead == 0) - { - // We cannot reuse this connection, so close it. - _connection.Dispose(); - _connection = null; - return 0; - } - - return bytesRead; - } - - public override async Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken) - { - if (destination == null) - { - throw new ArgumentNullException(nameof(destination)); - } - - if (_connection != null) // null if response body fully consumed - { - await _connection.CopyToAsync(destination, cancellationToken).ConfigureAwait(false); - - // We cannot reuse this connection, so close it. - _connection.Dispose(); - _connection = null; - } - } - - public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - ValidateBufferArgs(buffer, offset, count); - return WriteAsync(new ReadOnlyMemory(buffer, offset, count), cancellationToken); - } - - public override Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default) => - _connection == null ? Task.FromException(new IOException(SR.net_http_io_write)) : - source.Length > 0 ? _connection.WriteWithoutBufferingAsync(source, cancellationToken) : - Task.CompletedTask; - - public override Task FlushAsync(CancellationToken cancellationToken) => - _connection != null ? _connection.FlushAsync(cancellationToken) : - Task.CompletedTask; - } - } -} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/MultipartContent.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/MultipartContent.cs index 40216b5a27..32b0d647e6 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/MultipartContent.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/MultipartContent.cs @@ -275,10 +275,10 @@ namespace System.Net.Http return scratch.ToString(); } - private static Task EncodeStringToStreamAsync(Stream stream, string input) + private static ValueTask EncodeStringToStreamAsync(Stream stream, string input) { byte[] buffer = HttpRuleParser.DefaultHttpEncoding.GetBytes(input); - return stream.WriteAsync(buffer, 0, buffer.Length); + return stream.WriteAsync(new ReadOnlyMemory(buffer)); } private static Stream EncodeStringToNewStream(string input) @@ -417,9 +417,9 @@ namespace System.Net.Http } } - public override int Read(Span destination) + public override int Read(Span buffer) { - if (destination.Length == 0) + if (buffer.Length == 0) { return 0; } @@ -428,7 +428,7 @@ namespace System.Net.Http { if (_current != null) { - int bytesRead = _current.Read(destination); + int bytesRead = _current.Read(buffer); if (bytesRead != 0) { _position += bytesRead; @@ -453,8 +453,8 @@ namespace System.Net.Http return ReadAsyncPrivate(new Memory(buffer, offset, count), cancellationToken).AsTask(); } - public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default) => - ReadAsyncPrivate(destination, cancellationToken); + public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default) => + ReadAsyncPrivate(buffer, cancellationToken); public override IAsyncResult BeginRead(byte[] array, int offset, int count, AsyncCallback asyncCallback, object asyncState) => TaskToApm.Begin(ReadAsync(array, offset, count, CancellationToken.None), asyncCallback, asyncState); @@ -462,9 +462,9 @@ namespace System.Net.Http public override int EndRead(IAsyncResult asyncResult) => TaskToApm.End(asyncResult); - public async ValueTask ReadAsyncPrivate(Memory destination, CancellationToken cancellationToken) + public async ValueTask ReadAsyncPrivate(Memory buffer, CancellationToken cancellationToken) { - if (destination.Length == 0) + if (buffer.Length == 0) { return 0; } @@ -473,7 +473,7 @@ namespace System.Net.Http { if (_current != null) { - int bytesRead = await _current.ReadAsync(destination, cancellationToken).ConfigureAwait(false); + int bytesRead = await _current.ReadAsync(buffer, cancellationToken).ConfigureAwait(false); if (bytesRead != 0) { _position += bytesRead; @@ -581,9 +581,9 @@ namespace System.Net.Http public override void Flush() { } public override void SetLength(long value) { throw new NotSupportedException(); } public override void Write(byte[] buffer, int offset, int count) { throw new NotSupportedException(); } - public override void Write(ReadOnlySpan source) { throw new NotSupportedException(); } + public override void Write(ReadOnlySpan buffer) { throw new NotSupportedException(); } public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) { throw new NotSupportedException(); } - public override Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default) { throw new NotSupportedException(); } + public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken = default) { throw new NotSupportedException(); } } #endregion Serialization } diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/NetEventSource.Http.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/NetEventSource.Http.cs index f4020a804d..8735970c8e 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/NetEventSource.Http.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/NetEventSource.Http.cs @@ -63,6 +63,7 @@ namespace System.Net [Event(HandlerMessageId, Keywords = Keywords.Debug, Level = EventLevel.Verbose)] public void HandlerMessage(int handlerId, int workerId, int requestId, string memberName, string message) => WriteEvent(HandlerMessageId, handlerId, workerId, requestId, memberName, message); + //Console.WriteLine($"{handlerId}/{workerId}/{requestId}: ({memberName}): {message}"); // uncomment for debugging only [NonEvent] private unsafe void WriteEvent(int eventId, int arg1, int arg2, int arg3, string arg4, string arg5) @@ -78,20 +79,31 @@ namespace System.Net const int NumEventDatas = 5; var descrs = stackalloc EventData[NumEventDatas]; - descrs[0].DataPointer = (IntPtr)(&arg1); - descrs[0].Size = sizeof(int); - - descrs[1].DataPointer = (IntPtr)(&arg2); - descrs[1].Size = sizeof(int); - - descrs[2].DataPointer = (IntPtr)(&arg3); - descrs[2].Size = sizeof(int); - - descrs[3].DataPointer = (IntPtr)string4Bytes; - descrs[3].Size = ((arg4.Length + 1) * 2); - - descrs[4].DataPointer = (IntPtr)string5Bytes; - descrs[4].Size = ((arg5.Length + 1) * 2); + descrs[0] = new EventData + { + DataPointer = (IntPtr)(&arg1), + Size = sizeof(int) + }; + descrs[1] = new EventData + { + DataPointer = (IntPtr)(&arg2), + Size = sizeof(int) + }; + descrs[2] = new EventData + { + DataPointer = (IntPtr)(&arg3), + Size = sizeof(int) + }; + descrs[3] = new EventData + { + DataPointer = (IntPtr)string4Bytes, + Size = ((arg4.Length + 1) * 2) + }; + descrs[4] = new EventData + { + DataPointer = (IntPtr)string5Bytes, + Size = ((arg5.Length + 1) * 2) + }; WriteEventCore(eventId, NumEventDatas, descrs); } diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/ReadOnlyMemoryContent.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/ReadOnlyMemoryContent.cs index 0a9588d71a..77f713593b 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/ReadOnlyMemoryContent.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/ReadOnlyMemoryContent.cs @@ -4,6 +4,7 @@ using System.IO; using System.Runtime.InteropServices; +using System.Threading; using System.Threading.Tasks; namespace System.Net.Http @@ -24,7 +25,10 @@ namespace System.Net.Http } protected override Task SerializeToStreamAsync(Stream stream, TransportContext context) => - stream.WriteAsync(_content); + stream.WriteAsync(_content).AsTask(); + + internal override Task SerializeToStreamAsync(Stream stream, TransportContext context, CancellationToken cancellationToken) => + stream.WriteAsync(_content, cancellationToken).AsTask(); protected internal override bool TryComputeLength(out long length) { diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/AuthenticationHelper.Digest.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/AuthenticationHelper.Digest.cs similarity index 81% rename from external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/AuthenticationHelper.Digest.cs rename to external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/AuthenticationHelper.Digest.cs index 3f0b911689..0b7516b296 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/AuthenticationHelper.Digest.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/AuthenticationHelper.Digest.cs @@ -15,8 +15,6 @@ namespace System.Net.Http { internal partial class AuthenticationHelper { - public const string Digest = "Digest"; - // Define digest constants private const string Qop = "qop"; private const string Auth = "auth"; @@ -42,35 +40,6 @@ namespace System.Net.Http // 48='0', 65='A', 97='a' private static int[] s_alphaNumChooser = new int[] { 48, 65, 97 }; - // Define a random number generator for cnonce - private static RandomNumberGenerator s_rng = RandomNumberGenerator.Create(); - - public async static Task TrySetDigestAuthToken(HttpRequestMessage request, ICredentials credentials, DigestResponse digestResponse, string authHeader) - { - NetworkCredential credential = credentials.GetCredential(request.RequestUri, Digest); - if (credential == null) - { - return false; - } - - string parameter = await GetDigestTokenForCredential(credential, request, digestResponse).ConfigureAwait(false); - - // Any errors in obtaining parameter return false - if (string.IsNullOrEmpty(parameter)) - return false; - - if (authHeader == HttpKnownHeaderNames.Authorization) - { - request.Headers.Authorization = new AuthenticationHeaderValue(Digest, parameter); - } - else if (authHeader == HttpKnownHeaderNames.ProxyAuthorization) - { - request.Headers.ProxyAuthorization = new AuthenticationHeaderValue(Digest, parameter); - } - - return true; - } - public static async Task GetDigestTokenForCredential(NetworkCredential credential, HttpRequestMessage request, DigestResponse digestResponse) { StringBuilder sb = StringBuilderCache.Acquire(); @@ -81,7 +50,10 @@ namespace System.Net.Http if (digestResponse.Parameters.TryGetValue(Algorithm, out algorithm)) { if (algorithm != Sha256 && algorithm != Md5 && algorithm != Sha256Sess && algorithm != MD5Sess) + { + if (NetEventSource.IsEnabled) NetEventSource.Error(digestResponse, "Algorithm not supported: {algorithm}"); return null; + } } else { @@ -92,17 +64,21 @@ namespace System.Net.Http string nonce; if (!digestResponse.Parameters.TryGetValue(Nonce, out nonce)) { + if (NetEventSource.IsEnabled) NetEventSource.Error(digestResponse, "Nonce missing"); return null; } + // opaque token may or may not exist string opaque; - if (!digestResponse.Parameters.TryGetValue(Opaque, out opaque)) + digestResponse.Parameters.TryGetValue(Opaque, out opaque); + + string realm; + if (!digestResponse.Parameters.TryGetValue(Realm, out realm)) { + if (NetEventSource.IsEnabled) NetEventSource.Error(digestResponse, "Realm missing"); return null; } - string realm = digestResponse.Parameters.ContainsKey(Realm) ? digestResponse.Parameters[Realm] : string.Empty; - // Add username string userhash; if (digestResponse.Parameters.TryGetValue(UserHash, out userhash) && userhash == "true") @@ -162,9 +138,8 @@ namespace System.Net.Http // Calculate response string a1 = credential.UserName + ":" + realm + ":" + credential.Password; - if (algorithm == Sha256Sess || algorithm == MD5Sess) + if (algorithm.IndexOf("sess") != -1) { - algorithm = algorithm == Sha256Sess ? Sha256 : Md5; a1 = ComputeHash(a1, algorithm) + ":" + nonce + ":" + cnonce; } @@ -189,7 +164,10 @@ namespace System.Net.Http sb.AppendKeyValue(Algorithm, algorithm, includeQuotes: false); // Add opaque - sb.AppendKeyValue(Opaque, opaque); + if (opaque != null) + { + sb.AppendKeyValue(Opaque, opaque); + } // Add qop sb.AppendKeyValue(Qop, qop, includeQuotes: false); @@ -213,7 +191,7 @@ namespace System.Net.Http { const int Length = 16; Span randomNumbers = stackalloc byte[Length * 2]; - s_rng.GetBytes(randomNumbers); + RandomNumberGenerator.Fill(randomNumbers); StringBuilder sb = StringBuilderCache.Acquire(Length); for (int i = 0; i < randomNumbers.Length;) @@ -231,15 +209,22 @@ namespace System.Net.Http { // Disable MD5 insecure warning. #pragma warning disable CA5351 - using (HashAlgorithm hash = algorithm == Sha256 ? SHA256.Create() : (HashAlgorithm)MD5.Create()) + using (HashAlgorithm hash = algorithm.Contains(Sha256) ? SHA256.Create() : (HashAlgorithm)MD5.Create()) #pragma warning restore CA5351 { - Encoding enc = Encoding.UTF8; - byte[] result = hash.ComputeHash(enc.GetBytes(data)); + Span result = stackalloc byte[hash.HashSize / 8]; // HashSize is in bits + bool hashComputed = hash.TryComputeHash(Encoding.UTF8.GetBytes(data), result, out int bytesWritten); + Debug.Assert(hashComputed && bytesWritten == result.Length); StringBuilder sb = StringBuilderCache.Acquire(result.Length * 2); - foreach (byte b in result) - sb.Append(b.ToString("x2")); + + Span byteX2 = stackalloc char[2]; + for (int i = 0; i < result.Length; i++) + { + bool formatted = result[i].TryFormat(byteX2, out int charsWritten, "x2"); + Debug.Assert(formatted && charsWritten == 2); + sb.Append(byteX2); + } return StringBuilderCache.GetStringAndRelease(sb); } @@ -252,7 +237,8 @@ namespace System.Net.Http internal DigestResponse(string challenge) { - Parse(challenge); + if (!string.IsNullOrEmpty(challenge)) + Parse(challenge); } private static bool CharIsSpaceOrTab(char ch) @@ -260,6 +246,13 @@ namespace System.Net.Http return ch == ' ' || ch == '\t'; } + private static bool MustValueBeQuoted(string key) + { + // As per the RFC, these string must be quoted for historical reasons. + return key.Equals(Realm, StringComparison.OrdinalIgnoreCase) || key.Equals(Nonce, StringComparison.OrdinalIgnoreCase) || + key.Equals(Opaque, StringComparison.OrdinalIgnoreCase) || key.Equals(Qop, StringComparison.OrdinalIgnoreCase); + } + private string GetNextKey(string data, int currentIndex, out int parsedIndex) { // Skip leading space or tab. @@ -315,7 +308,7 @@ namespace System.Net.Http return data.Substring(start, length); } - private string GetNextValue(string data, int currentIndex, out int parsedIndex) + private string GetNextValue(string data, int currentIndex, bool expectQuotes, out int parsedIndex) { Debug.Assert(currentIndex < data.Length && !CharIsSpaceOrTab(data[currentIndex])); @@ -327,6 +320,12 @@ namespace System.Net.Http currentIndex++; } + if (expectQuotes && !quotedValue) + { + parsedIndex = currentIndex; + return null; + } + StringBuilder sb = StringBuilderCache.Acquire(); while (currentIndex < data.Length && ((quotedValue && data[currentIndex] != '"') || (!quotedValue && data[currentIndex] != ','))) { @@ -347,6 +346,14 @@ namespace System.Net.Http } } + // Skip the quote. + if (quotedValue) + currentIndex++; + + // Skip any whitespace. + while (currentIndex < data.Length && CharIsSpaceOrTab(data[currentIndex])) + currentIndex++; + // Return if this is last value. if (currentIndex == data.Length) { @@ -354,11 +361,15 @@ namespace System.Net.Http return StringBuilderCache.GetStringAndRelease(sb); } - // Skip the end quote or ',' or space or tab. - currentIndex++; + // A key-value pair should end with ',' + if (data[currentIndex++] != ',') + { + parsedIndex = currentIndex; + return null; + } - // Skip space and tab and , - while (currentIndex < data.Length && (CharIsSpaceOrTab(data[currentIndex]) || data[currentIndex] == ',')) + // Skip space and tab + while (currentIndex < data.Length && CharIsSpaceOrTab(data[currentIndex])) { currentIndex++; } @@ -380,7 +391,11 @@ namespace System.Net.Http break; // Get the value. - string value = GetNextValue(challenge, parsedIndex, out parsedIndex); + string value = GetNextValue(challenge, parsedIndex, MustValueBeQuoted(key), out parsedIndex); + // Ensure value is valid. + if (string.IsNullOrEmpty(value)) + break; + // Add the key-value pair to Parameters. Parameters.Add(key, value); } diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/AuthenticationHelper.NtAuth.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/AuthenticationHelper.NtAuth.cs new file mode 100644 index 0000000000..16540e7d68 --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/AuthenticationHelper.NtAuth.cs @@ -0,0 +1,107 @@ +// 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.Collections.Generic; +using System.Net.Http.Headers; +using System.Threading; +using System.Threading.Tasks; +using System.Security.Authentication.ExtendedProtection; + +namespace System.Net.Http +{ + internal partial class AuthenticationHelper + { + private static Task InnerSendAsync(HttpRequestMessage request, bool isProxyAuth, HttpConnection connection, CancellationToken cancellationToken) + { + return isProxyAuth ? + connection.SendAsyncCore(request, cancellationToken) : + connection.SendWithNtProxyAuthAsync(request, cancellationToken); + } + + private static bool ProxySupportsConnectionAuth(HttpResponseMessage response) + { + if (!response.Headers.TryGetValues(KnownHeaders.ProxySupport.Descriptor, out IEnumerable values)) + { + return false; + } + + foreach (string v in values) + { + if (v == "Session-Based-Authentication") + { + return true; + } + } + + return false; + } + + private static async Task SendWithNtAuthAsync(HttpRequestMessage request, Uri authUri, ICredentials credentials, bool isProxyAuth, HttpConnection connection, CancellationToken cancellationToken) + { + HttpResponseMessage response = await InnerSendAsync(request, isProxyAuth, connection, cancellationToken).ConfigureAwait(false); + + if (!isProxyAuth && connection.UsingProxy && !ProxySupportsConnectionAuth(response)) + { + // Proxy didn't indicate that it supports connection-based auth, so we can't proceed. + if (NetEventSource.IsEnabled) + { + NetEventSource.Error(connection, $"Proxy doesn't support connection-based auth, uri={authUri}"); + } + return response; + } + + if (TryGetAuthenticationChallenge(response, isProxyAuth, authUri, credentials, out AuthenticationChallenge challenge)) + { + if (challenge.AuthenticationType == AuthenticationType.Negotiate || + challenge.AuthenticationType == AuthenticationType.Ntlm) + { + string challengeData = challenge.ChallengeData; + + string spn = "HTTP/" + authUri.IdnHost; + ChannelBinding channelBinding = connection.TransportContext?.GetChannelBinding(ChannelBindingKind.Endpoint); + NTAuthentication authContext = new NTAuthentication(isServer:false, challenge.SchemeName, challenge.Credential, spn, ContextFlagsPal.Connection, channelBinding); + try + { + while (true) + { + string challengeResponse = authContext.GetOutgoingBlob(challengeData); + if (challengeResponse == null) + { + // Response indicated denial even after login, so stop processing and return current response. + break; + } + + await connection.DrainResponseAsync(response).ConfigureAwait(false); + + SetRequestAuthenticationHeaderValue(request, new AuthenticationHeaderValue(challenge.SchemeName, challengeResponse), isProxyAuth); + + response = await InnerSendAsync(request, isProxyAuth, connection, cancellationToken).ConfigureAwait(false); + if (authContext.IsCompleted || !TryGetRepeatedChallenge(response, challenge.SchemeName, isProxyAuth, out challengeData)) + { + break; + } + } + } + finally + { + authContext.CloseContext(); + } + } + } + + return response; + } + + public static Task SendWithNtProxyAuthAsync(HttpRequestMessage request, Uri proxyUri, ICredentials proxyCredentials, HttpConnection connection, CancellationToken cancellationToken) + { + return SendWithNtAuthAsync(request, proxyUri, proxyCredentials, isProxyAuth:true, connection, cancellationToken); + } + + public static Task SendWithNtConnectionAuthAsync(HttpRequestMessage request, ICredentials credentials, HttpConnection connection, CancellationToken cancellationToken) + { + return SendWithNtAuthAsync(request, request.RequestUri, credentials, isProxyAuth:false, connection, cancellationToken); + } + } +} + diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/AuthenticationHelper.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/AuthenticationHelper.cs new file mode 100644 index 0000000000..316d00dba4 --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/AuthenticationHelper.cs @@ -0,0 +1,289 @@ +// 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.Net.Http.Headers; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace System.Net.Http +{ + internal partial class AuthenticationHelper + { + private const string BasicScheme = "Basic"; + private const string DigestScheme = "Digest"; + private const string NtlmScheme = "NTLM"; + private const string NegotiateScheme = "Negotiate"; + + private enum AuthenticationType + { + Basic, + Digest, + Ntlm, + Negotiate + } + + private readonly struct AuthenticationChallenge + { + public AuthenticationType AuthenticationType { get; } + public string SchemeName { get; } + public NetworkCredential Credential { get; } + public string ChallengeData { get; } + + public AuthenticationChallenge(AuthenticationType authenticationType, string schemeName, NetworkCredential credential, string challenge) + { + AuthenticationType = authenticationType; + SchemeName = schemeName; + Credential = credential; + ChallengeData = challenge; + } + } + + private static bool TryGetChallengeDataForScheme(string scheme, HttpHeaderValueCollection authenticationHeaderValues, out string challengeData) + { + foreach (AuthenticationHeaderValue ahv in authenticationHeaderValues) + { + if (StringComparer.OrdinalIgnoreCase.Equals(scheme, ahv.Scheme)) + { + // Note, a valid challenge can have challengeData == null + challengeData = ahv.Parameter; + return true; + } + } + + challengeData = null; + return false; + } + + private static bool TryGetValidAuthenticationChallengeForScheme(string scheme, AuthenticationType authenticationType, Uri uri, ICredentials credentials, + HttpHeaderValueCollection authenticationHeaderValues, out AuthenticationChallenge challenge) + { + challenge = default; + + if (!TryGetChallengeDataForScheme(scheme, authenticationHeaderValues, out string challengeData)) + { + return false; + } + + NetworkCredential credential = credentials.GetCredential(uri, scheme); + if (credential == null) + { + // We have no credential for this auth type, so we can't respond to the challenge. + // We'll continue to look for a different auth type that we do have a credential for. + return false; + } + + challenge = new AuthenticationChallenge(authenticationType, scheme, credential, challengeData); + return true; + } + + private static bool TryGetAuthenticationChallenge(HttpResponseMessage response, bool isProxyAuth, Uri authUri, ICredentials credentials, out AuthenticationChallenge challenge) + { + if (!IsAuthenticationChallenge(response, isProxyAuth)) + { + challenge = default; + return false; + } + + // Try to get a valid challenge for the schemes we support, in priority order. + HttpHeaderValueCollection authenticationHeaderValues = GetResponseAuthenticationHeaderValues(response, isProxyAuth); + return + TryGetValidAuthenticationChallengeForScheme(NegotiateScheme, AuthenticationType.Negotiate, authUri, credentials, authenticationHeaderValues, out challenge) || + TryGetValidAuthenticationChallengeForScheme(NtlmScheme, AuthenticationType.Ntlm, authUri, credentials, authenticationHeaderValues, out challenge) || + TryGetValidAuthenticationChallengeForScheme(DigestScheme, AuthenticationType.Digest, authUri, credentials, authenticationHeaderValues, out challenge) || + TryGetValidAuthenticationChallengeForScheme(BasicScheme, AuthenticationType.Basic, authUri, credentials, authenticationHeaderValues, out challenge); + } + + private static bool TryGetRepeatedChallenge(HttpResponseMessage response, string scheme, bool isProxyAuth, out string challengeData) + { + challengeData = null; + + if (!IsAuthenticationChallenge(response, isProxyAuth)) + { + return false; + } + + if (!TryGetChallengeDataForScheme(scheme, GetResponseAuthenticationHeaderValues(response, isProxyAuth), out challengeData)) + { + // We got another challenge status code, but couldn't find the challenge for the scheme we're handling currently. + // Just stop processing auth. + return false; + } + + return true; + } + + private static bool IsAuthenticationChallenge(HttpResponseMessage response, bool isProxyAuth) + { + return isProxyAuth ? + response.StatusCode == HttpStatusCode.ProxyAuthenticationRequired : + response.StatusCode == HttpStatusCode.Unauthorized; + } + + private static HttpHeaderValueCollection GetResponseAuthenticationHeaderValues(HttpResponseMessage response, bool isProxyAuth) + { + return isProxyAuth ? + response.Headers.ProxyAuthenticate : + response.Headers.WwwAuthenticate; + } + + private static void SetRequestAuthenticationHeaderValue(HttpRequestMessage request, AuthenticationHeaderValue headerValue, bool isProxyAuth) + { + if (isProxyAuth) + { + request.Headers.ProxyAuthorization = headerValue; + } + else + { + request.Headers.Authorization = headerValue; + } + } + + private static void SetBasicAuthToken(HttpRequestMessage request, NetworkCredential credential, bool isProxyAuth) + { + string authString = !string.IsNullOrEmpty(credential.Domain) ? + credential.Domain + "\\" + credential.UserName + ":" + credential.Password : + credential.UserName + ":" + credential.Password; + + string base64AuthString = Convert.ToBase64String(Encoding.UTF8.GetBytes(authString)); + + SetRequestAuthenticationHeaderValue(request, new AuthenticationHeaderValue(BasicScheme, base64AuthString), isProxyAuth); + } + + private static async Task TrySetDigestAuthToken(HttpRequestMessage request, NetworkCredential credential, DigestResponse digestResponse, bool isProxyAuth) + { + string parameter = await GetDigestTokenForCredential(credential, request, digestResponse).ConfigureAwait(false); + + // Any errors in obtaining parameter return false and we don't proceed with auth + if (string.IsNullOrEmpty(parameter)) + { + return false; + } + + var headerValue = new AuthenticationHeaderValue(DigestScheme, parameter); + SetRequestAuthenticationHeaderValue(request, headerValue, isProxyAuth); + return true; + } + + private static Task InnerSendAsync(HttpRequestMessage request, bool isProxyAuth, bool doRequestAuth, HttpConnectionPool pool, CancellationToken cancellationToken) + { + return isProxyAuth ? + pool.SendWithRetryAsync(request, doRequestAuth, cancellationToken) : + pool.SendWithProxyAuthAsync(request, doRequestAuth, cancellationToken); + } + + private static async Task SendWithAuthAsync(HttpRequestMessage request, Uri authUri, ICredentials credentials, bool preAuthenticate, bool isProxyAuth, bool doRequestAuth, HttpConnectionPool pool, CancellationToken cancellationToken) + { + // If preauth is enabled and this isn't proxy auth, try to get a basic credential from the + // preauth credentials cache, and if successful, set an auth header for it onto the request. + // Currently we only support preauth for Basic. + bool performedBasicPreauth = false; + if (preAuthenticate) + { + Debug.Assert(pool.PreAuthCredentials != null); + NetworkCredential credential; + lock (pool.PreAuthCredentials) // TODO #28045: Get rid of this lock. + { + // Just look for basic credentials. If in the future we support preauth + // for other schemes, this will need to search in order of precedence. + Debug.Assert(pool.PreAuthCredentials.GetCredential(authUri, NegotiateScheme) == null); + Debug.Assert(pool.PreAuthCredentials.GetCredential(authUri, NtlmScheme) == null); + Debug.Assert(pool.PreAuthCredentials.GetCredential(authUri, DigestScheme) == null); + credential = pool.PreAuthCredentials.GetCredential(authUri, BasicScheme); + } + + if (credential != null) + { + SetBasicAuthToken(request, credential, isProxyAuth); + performedBasicPreauth = true; + } + } + + HttpResponseMessage response = await InnerSendAsync(request, isProxyAuth, doRequestAuth, pool, cancellationToken).ConfigureAwait(false); + + if (TryGetAuthenticationChallenge(response, isProxyAuth, authUri, credentials, out AuthenticationChallenge challenge)) + { + switch (challenge.AuthenticationType) + { + case AuthenticationType.Digest: + var digestResponse = new DigestResponse(challenge.ChallengeData); + if (await TrySetDigestAuthToken(request, challenge.Credential, digestResponse, isProxyAuth).ConfigureAwait(false)) + { + response.Dispose(); + response = await InnerSendAsync(request, isProxyAuth, doRequestAuth, pool, cancellationToken).ConfigureAwait(false); + + // Retry in case of nonce timeout in server. + if (TryGetRepeatedChallenge(response, challenge.SchemeName, isProxyAuth, out string challengeData)) + { + digestResponse = new DigestResponse(challengeData); + if (IsServerNonceStale(digestResponse) && + await TrySetDigestAuthToken(request, challenge.Credential, digestResponse, isProxyAuth).ConfigureAwait(false)) + { + response.Dispose(); + response = await InnerSendAsync(request, isProxyAuth, doRequestAuth, pool, cancellationToken).ConfigureAwait(false); + } + } + } + break; + + case AuthenticationType.Basic: + if (performedBasicPreauth) + { + break; + } + + response.Dispose(); + SetBasicAuthToken(request, challenge.Credential, isProxyAuth); + response = await InnerSendAsync(request, isProxyAuth, doRequestAuth, pool, cancellationToken).ConfigureAwait(false); + + if (preAuthenticate) + { + switch (response.StatusCode) + { + case HttpStatusCode.ProxyAuthenticationRequired: + case HttpStatusCode.Unauthorized: + break; + + default: + lock (pool.PreAuthCredentials) // TODO #28045: Get rid of this lock. + { + try + { + if (NetEventSource.IsEnabled) + { + NetEventSource.Info(pool.PreAuthCredentials, $"Adding Basic credential to cache, uri={authUri}, username={challenge.Credential.UserName}"); + } + pool.PreAuthCredentials.Add(authUri, BasicScheme, challenge.Credential); + } + catch (ArgumentException) + { + // The credential already existed. + if (NetEventSource.IsEnabled) + { + NetEventSource.Info(pool.PreAuthCredentials, $"Basic credential present in cache, uri={authUri}, username={challenge.Credential.UserName}"); + } + } + } + break; + } + } + break; + } + } + + return response; + } + + public static Task SendWithProxyAuthAsync(HttpRequestMessage request, Uri proxyUri, ICredentials proxyCredentials, bool doRequestAuth, HttpConnectionPool pool, CancellationToken cancellationToken) + { + return SendWithAuthAsync(request, proxyUri, proxyCredentials, preAuthenticate:false, isProxyAuth:true, doRequestAuth, pool, cancellationToken); + } + + public static Task SendWithRequestAuthAsync(HttpRequestMessage request, ICredentials credentials, bool preAuthenticate, HttpConnectionPool pool, CancellationToken cancellationToken) + { + return SendWithAuthAsync(request, request.RequestUri, credentials, preAuthenticate, isProxyAuth:false, doRequestAuth:true, pool, cancellationToken); + } + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/CancellationHelper.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/CancellationHelper.cs new file mode 100644 index 0000000000..e13dc68092 --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/CancellationHelper.cs @@ -0,0 +1,46 @@ +// 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.Threading; +using System.Threading.Tasks; + +namespace System.Net.Http +{ + /// Provides utilities related to cancellation. + internal static class CancellationHelper + { + /// The default message used by . + private static readonly string s_cancellationMessage = new OperationCanceledException().Message; // use same message as the default ctor + + /// Determines whether to wrap an in a cancellation exception. + /// The exception. + /// The that may have triggered the exception. + /// true if the exception should be wrapped; otherwise, false. + internal static bool ShouldWrapInOperationCanceledException(Exception exception, CancellationToken cancellationToken) => + !(exception is OperationCanceledException) && cancellationToken.IsCancellationRequested; + + /// Creates a cancellation exception. + /// The inner exception to wrap. May be null. + /// The that triggered the cancellation. + /// The cancellation exception. + internal static Exception CreateOperationCanceledException(Exception innerException, CancellationToken cancellationToken) => + new TaskCanceledException(s_cancellationMessage, innerException, cancellationToken); // TCE for compatibility with other handlers that use TaskCompletionSource.TrySetCanceled() + + /// Throws a cancellation exception. + /// The inner exception to wrap. May be null. + /// The that triggered the cancellation. + private static void ThrowOperationCanceledException(Exception innerException, CancellationToken cancellationToken) => + throw CreateOperationCanceledException(innerException, cancellationToken); + + /// Throws a cancellation exception if cancellation has been requested via . + /// The token to check for a cancellation request. + internal static void ThrowIfCancellationRequested(CancellationToken cancellationToken) + { + if (cancellationToken.IsCancellationRequested) + { + ThrowOperationCanceledException(innerException:null, cancellationToken); + } + } + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ChunkedEncodingReadStream.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ChunkedEncodingReadStream.cs new file mode 100644 index 0000000000..fdf7d48e56 --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ChunkedEncodingReadStream.cs @@ -0,0 +1,412 @@ +// 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.Text; +using System.Diagnostics; +using System.IO; +using System.Threading; +using System.Threading.Tasks; + +namespace System.Net.Http +{ + internal partial class HttpConnection + { + private sealed class ChunkedEncodingReadStream : HttpContentReadStream + { + /// How long a chunk indicator is allowed to be. + /// + /// While most chunks indicators will contain no more than ulong.MaxValue.ToString("X").Length characters, + /// "chunk extensions" are allowed. We place a limit on how long a line can be to avoid OOM issues if an + /// infinite chunk length is sent. This value is arbitrary and can be changed as needed. + /// + private const int MaxChunkBytesAllowed = 16*1024; + /// How long a trailing header can be. This value is arbitrary and can be changed as needed. + private const int MaxTrailingHeaderLength = 16*1024; + /// The number of bytes remaining in the chunk. + private ulong _chunkBytesRemaining; + /// The current state of the parsing state machine for the chunked response. + private ParsingState _state = ParsingState.ExpectChunkHeader; + + public ChunkedEncodingReadStream(HttpConnection connection) : base(connection) { } + + public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken) + { + if (cancellationToken.IsCancellationRequested) + { + // Cancellation requested. + return new ValueTask(Task.FromCanceled(cancellationToken)); + } + + if (_connection == null || buffer.Length == 0) + { + // Response body fully consumed or the caller didn't ask for any data. + return new ValueTask(0); + } + + // Try to consume from data we already have in the buffer. + int bytesRead = ReadChunksFromConnectionBuffer(buffer.Span, cancellationRegistration: default); + if (bytesRead > 0) + { + return new ValueTask(bytesRead); + } + + // We may have just consumed the remainder of the response (with no actual data + // available), so check again. + if (_connection == null) + { + Debug.Assert(_state == ParsingState.Done); + return new ValueTask(0); + } + + // Nothing available to consume. Fall back to I/O. + return ReadAsyncCore(buffer, cancellationToken); + } + + private async ValueTask ReadAsyncCore(Memory buffer, CancellationToken cancellationToken) + { + // Should only be called if ReadChunksFromConnectionBuffer returned 0. + + Debug.Assert(_connection != null); + Debug.Assert(buffer.Length > 0); + + CancellationTokenRegistration ctr = _connection.RegisterCancellation(cancellationToken); + try + { + while (true) + { + if (_connection == null) + { + // Fully consumed the response in ReadChunksFromConnectionBuffer. + return 0; + } + + if (_state == ParsingState.ExpectChunkData && + buffer.Length >= _connection.ReadBufferSize && + _chunkBytesRemaining >= (ulong)_connection.ReadBufferSize) + { + // As an optimization, we skip going through the connection's read buffer if both + // the remaining chunk data and the buffer are both at least as large + // as the connection buffer. That avoids an unnecessary copy while still reading + // the maximum amount we'd otherwise read at a time. + Debug.Assert(_connection.RemainingBuffer.Length == 0); + int bytesRead = await _connection.ReadAsync(buffer.Slice(0, (int)Math.Min((ulong)buffer.Length, _chunkBytesRemaining))).ConfigureAwait(false); + if (bytesRead == 0) + { + throw new IOException(SR.net_http_invalid_response); + } + _chunkBytesRemaining -= (ulong)bytesRead; + if (_chunkBytesRemaining == 0) + { + _state = ParsingState.ExpectChunkTerminator; + } + return bytesRead; + } + + // We're only here if we need more data to make forward progress. + await _connection.FillAsync().ConfigureAwait(false); + + // Now that we have more, see if we can get any response data, and if + // we can we're done. + int bytesCopied = ReadChunksFromConnectionBuffer(buffer.Span, ctr); + if (bytesCopied > 0) + { + return bytesCopied; + } + } + } + catch (Exception exc) when (CancellationHelper.ShouldWrapInOperationCanceledException(exc, cancellationToken)) + { + throw CancellationHelper.CreateOperationCanceledException(exc, cancellationToken); + } + finally + { + ctr.Dispose(); + } + } + + public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken) + { + ValidateCopyToArgs(this, destination, bufferSize); + + return + cancellationToken.IsCancellationRequested ? Task.FromCanceled(cancellationToken) : + _connection == null ? Task.CompletedTask : + CopyToAsyncCore(destination, cancellationToken); + } + + private async Task CopyToAsyncCore(Stream destination, CancellationToken cancellationToken) + { + CancellationTokenRegistration ctr = _connection.RegisterCancellation(cancellationToken); + try + { + while (true) + { + while (true) + { + ReadOnlyMemory bytesRead = ReadChunkFromConnectionBuffer(int.MaxValue, ctr); + if (bytesRead.Length == 0) + { + break; + } + await destination.WriteAsync(bytesRead, cancellationToken).ConfigureAwait(false); + } + + if (_connection == null) + { + // Fully consumed the response. + return; + } + + await _connection.FillAsync().ConfigureAwait(false); + } + } + catch (Exception exc) when (CancellationHelper.ShouldWrapInOperationCanceledException(exc, cancellationToken)) + { + throw CancellationHelper.CreateOperationCanceledException(exc, cancellationToken); + } + finally + { + ctr.Dispose(); + } + } + + private int ReadChunksFromConnectionBuffer(Span buffer, CancellationTokenRegistration cancellationRegistration) + { + int totalBytesRead = 0; + while (buffer.Length > 0) + { + ReadOnlyMemory bytesRead = ReadChunkFromConnectionBuffer(buffer.Length, cancellationRegistration); + Debug.Assert(bytesRead.Length <= buffer.Length); + if (bytesRead.Length == 0) + { + break; + } + + totalBytesRead += bytesRead.Length; + bytesRead.Span.CopyTo(buffer); + buffer = buffer.Slice(bytesRead.Length); + } + return totalBytesRead; + } + + private ReadOnlyMemory ReadChunkFromConnectionBuffer(int maxBytesToRead, CancellationTokenRegistration cancellationRegistration) + { + Debug.Assert(maxBytesToRead > 0); + + try + { + ReadOnlySpan currentLine; + switch (_state) + { + case ParsingState.ExpectChunkHeader: + Debug.Assert(_chunkBytesRemaining == 0, $"Expected {nameof(_chunkBytesRemaining)} == 0, got {_chunkBytesRemaining}"); + + // Read the chunk header line. + _connection._allowedReadLineBytes = MaxChunkBytesAllowed; + if (!_connection.TryReadNextLine(out currentLine)) + { + // Could not get a whole line, so we can't parse the chunk header. + return default; + } + + // Parse the hex value from it. + if (!Utf8Parser.TryParse(currentLine, out ulong chunkSize, out int bytesConsumed, 'X')) + { + throw new IOException(SR.net_http_invalid_response); + } + _chunkBytesRemaining = chunkSize; + + // If there's a chunk extension after the chunk size, validate it. + if (bytesConsumed != currentLine.Length) + { + ValidateChunkExtension(currentLine.Slice(bytesConsumed)); + } + + // Proceed to handle the chunk. If there's data in it, go read it. + // Otherwise, finish handling the response. + if (chunkSize > 0) + { + _state = ParsingState.ExpectChunkData; + goto case ParsingState.ExpectChunkData; + } + else + { + _state = ParsingState.ConsumeTrailers; + goto case ParsingState.ConsumeTrailers; + } + + case ParsingState.ExpectChunkData: + Debug.Assert(_chunkBytesRemaining > 0); + + ReadOnlyMemory connectionBuffer = _connection.RemainingBuffer; + if (connectionBuffer.Length == 0) + { + return default; + } + + int bytesToConsume = Math.Min(maxBytesToRead, (int)Math.Min((ulong)connectionBuffer.Length, _chunkBytesRemaining)); + Debug.Assert(bytesToConsume > 0); + + _connection.ConsumeFromRemainingBuffer(bytesToConsume); + _chunkBytesRemaining -= (ulong)bytesToConsume; + if (_chunkBytesRemaining == 0) + { + _state = ParsingState.ExpectChunkTerminator; + } + + return connectionBuffer.Slice(0, bytesToConsume); + + case ParsingState.ExpectChunkTerminator: + Debug.Assert(_chunkBytesRemaining == 0, $"Expected {nameof(_chunkBytesRemaining)} == 0, got {_chunkBytesRemaining}"); + + _connection._allowedReadLineBytes = MaxChunkBytesAllowed; + if (!_connection.TryReadNextLine(out currentLine)) + { + return default; + } + + if (currentLine.Length != 0) + { + ThrowInvalidHttpResponse(); + } + + _state = ParsingState.ExpectChunkHeader; + goto case ParsingState.ExpectChunkHeader; + + case ParsingState.ConsumeTrailers: + Debug.Assert(_chunkBytesRemaining == 0, $"Expected {nameof(_chunkBytesRemaining)} == 0, got {_chunkBytesRemaining}"); + + while (true) + { + _connection._allowedReadLineBytes = MaxTrailingHeaderLength; + if (!_connection.TryReadNextLine(out currentLine)) + { + break; + } + + if (currentLine.IsEmpty) + { + // Dispose of the registration and then check whether cancellation has been + // requested. This is necessary to make determinstic a race condition between + // cancellation being requested and unregistering from the token. Otherwise, + // it's possible cancellation could be requested just before we unregister and + // we then return a connection to the pool that has been or will be disposed + // (e.g. if a timer is used and has already queued its callback but the + // callback hasn't yet run). + cancellationRegistration.Dispose(); + CancellationHelper.ThrowIfCancellationRequested(cancellationRegistration.Token); + + _state = ParsingState.Done; + _connection.CompleteResponse(); + _connection = null; + break; + } + } + + return default; + + default: + case ParsingState.Done: // shouldn't be called once we're done + Debug.Fail($"Unexpected state: {_state}"); + if (NetEventSource.IsEnabled) + { + NetEventSource.Error(this, $"Unexpected state: {_state}"); + } + + return default; + } + } + catch (Exception) + { + // Ensure we don't try to read from the connection again (in particular, for draining) + _connection.Dispose(); + _connection = null; + throw; + } + } + + private static void ValidateChunkExtension(ReadOnlySpan lineAfterChunkSize) + { + // Until we see the ';' denoting the extension, the line after the chunk size + // must contain only tabs and spaces. After the ';', anything goes. + for (int i = 0; i < lineAfterChunkSize.Length; i++) + { + byte c = lineAfterChunkSize[i]; + if (c == ';') + { + break; + } + else if (c != ' ' && c != '\t') // not called out in the RFC, but WinHTTP allows it + { + throw new IOException(SR.net_http_invalid_response); + } + } + } + + private enum ParsingState : byte + { + ExpectChunkHeader, + ExpectChunkData, + ExpectChunkTerminator, + ConsumeTrailers, + Done + } + + public override bool NeedsDrain => (_connection != null); + + public override async Task DrainAsync(int maxDrainBytes) + { + Debug.Assert(_connection != null); + + CancellationTokenSource cts = null; + CancellationTokenRegistration ctr = default; + try + { + int drainedBytes = 0; + while (true) + { + drainedBytes += _connection.RemainingBuffer.Length; + while (true) + { + ReadOnlyMemory bytesRead = ReadChunkFromConnectionBuffer(int.MaxValue, ctr); + if (bytesRead.Length == 0) + { + break; + } + } + + // When ReadChunkFromConnectionBuffer reads the final chunk, it will clear out _connection + // and return the connection to the pool. + if (_connection == null) + { + return true; + } + + if (drainedBytes >= maxDrainBytes) + { + return false; + } + + if (cts == null) // only create the drain timer if we have to go async + { + TimeSpan drainTime = _connection._pool.Settings._maxResponseDrainTime; + if (drainTime != Timeout.InfiniteTimeSpan) + { + cts = new CancellationTokenSource((int)drainTime.TotalMilliseconds); + ctr = cts.Token.Register(s => ((HttpConnection)s).Dispose(), _connection); + } + } + + await _connection.FillAsync().ConfigureAwait(false); + } + } + finally + { + ctr.Dispose(); + cts?.Dispose(); + } + } + } + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ChunkedEncodingWriteStream.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ChunkedEncodingWriteStream.cs new file mode 100644 index 0000000000..54bb5cfc4c --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ChunkedEncodingWriteStream.cs @@ -0,0 +1,57 @@ +// 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.Threading; +using System.Threading.Tasks; + +namespace System.Net.Http +{ + internal partial class HttpConnection : IDisposable + { + private sealed class ChunkedEncodingWriteStream : HttpContentWriteStream + { + private static readonly byte[] s_finalChunkBytes = { (byte)'0', (byte)'\r', (byte)'\n', (byte)'\r', (byte)'\n' }; + + public ChunkedEncodingWriteStream(HttpConnection connection) : base(connection) + { + } + + public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken ignored) + { + Debug.Assert(_connection._currentRequest != null); + + // The token is ignored because it's coming from SendAsync and the only operations + // here are those that are already covered by the token having been registered with + // to close the connection. + + ValueTask task = buffer.Length == 0 ? + // Don't write if nothing was given, especially since we don't want to accidentally send a 0 chunk, + // which would indicate end of body. Instead, just ensure no content is stuck in the buffer. + _connection.FlushAsync() : + new ValueTask(WriteChunkAsync(buffer)); + + return task; + } + + private async Task WriteChunkAsync(ReadOnlyMemory buffer) + { + // Write chunk length in hex followed by \r\n + await _connection.WriteHexInt32Async(buffer.Length).ConfigureAwait(false); + await _connection.WriteTwoBytesAsync((byte)'\r', (byte)'\n').ConfigureAwait(false); + + // Write chunk contents followed by \r\n + await _connection.WriteAsync(buffer).ConfigureAwait(false); + await _connection.WriteTwoBytesAsync((byte)'\r', (byte)'\n').ConfigureAwait(false); + } + + public override async Task FinishAsync() + { + // Send 0 byte chunk to indicate end, then final CrLf + await _connection.WriteBytesAsync(s_finalChunkBytes).ConfigureAwait(false); + _connection = null; + } + } + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ConnectHelper.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ConnectHelper.cs new file mode 100644 index 0000000000..4047af354a --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ConnectHelper.cs @@ -0,0 +1,193 @@ +// 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.Collections.Concurrent; +using System.Diagnostics; +using System.IO; +using System.Net.Security; +using System.Net.Sockets; +using System.Runtime.CompilerServices; +using System.Security.Cryptography.X509Certificates; +using System.Threading; +using System.Threading.Tasks; + +namespace System.Net.Http +{ + internal static class ConnectHelper + { + /// Pool of event args to use to establish connections. + private static readonly ConcurrentQueue.Segment s_connectEventArgs = + new ConcurrentQueue.Segment( + ConcurrentQueue.Segment.RoundUpToPowerOf2(Math.Max(2, Environment.ProcessorCount))); + + /// + /// Helper type used by HttpClientHandler when wrapping SocketsHttpHandler to map its + /// certificate validation callback to the one used by SslStream. + /// + internal sealed class CertificateCallbackMapper + { + public readonly Func FromHttpClientHandler; + public readonly RemoteCertificateValidationCallback ForSocketsHttpHandler; + + public CertificateCallbackMapper(Func fromHttpClientHandler) + { + FromHttpClientHandler = fromHttpClientHandler; + ForSocketsHttpHandler = (object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors) => + FromHttpClientHandler(sender as HttpRequestMessage, certificate as X509Certificate2, chain, sslPolicyErrors); + } + } + + public static async ValueTask<(Socket, Stream)> ConnectAsync(string host, int port, CancellationToken cancellationToken) + { + // Rather than creating a new Socket and calling ConnectAsync on it, we use the static + // Socket.ConnectAsync with a SocketAsyncEventArgs, as we can then use Socket.CancelConnectAsync + // to cancel it if needed. Rent or allocate one. + ConnectEventArgs saea; + if (!s_connectEventArgs.TryDequeue(out saea)) + { + saea = new ConnectEventArgs(); + } + + try + { + saea.Initialize(cancellationToken); + + // Configure which server to which to connect. + saea.RemoteEndPoint = new DnsEndPoint(host, port); + + // Initiate the connection. + if (Socket.ConnectAsync(SocketType.Stream, ProtocolType.Tcp, saea)) + { + // Connect completing asynchronously. Enable it to be canceled and wait for it. + using (cancellationToken.Register(s => Socket.CancelConnectAsync((SocketAsyncEventArgs)s), saea)) + { + await saea.Builder.Task.ConfigureAwait(false); + } + } + else if (saea.SocketError != SocketError.Success) + { + // Connect completed synchronously but unsuccessfully. + throw new SocketException((int)saea.SocketError); + } + + Debug.Assert(saea.SocketError == SocketError.Success, $"Expected Success, got {saea.SocketError}."); + Debug.Assert(saea.ConnectSocket != null, "Expected non-null socket"); + + // Configure the socket and return a stream for it. + Socket socket = saea.ConnectSocket; + socket.NoDelay = true; + return (socket, new NetworkStream(socket, ownsSocket: true)); + } + catch (Exception error) + { + throw CancellationHelper.ShouldWrapInOperationCanceledException(error, cancellationToken) ? + CancellationHelper.CreateOperationCanceledException(error, cancellationToken) : + new HttpRequestException(error.Message, error); + } + finally + { + // Pool the event args, or if the pool is full, dispose of it. + saea.Clear(); + if (!s_connectEventArgs.TryEnqueue(saea)) + { + saea.Dispose(); + } + } + } + + /// SocketAsyncEventArgs that carries with it additional state for a Task builder and a CancellationToken. + private sealed class ConnectEventArgs : SocketAsyncEventArgs + { + public AsyncTaskMethodBuilder Builder { get; private set; } + public CancellationToken CancellationToken { get; private set; } + + public void Initialize(CancellationToken cancellationToken) + { + CancellationToken = cancellationToken; + var b = new AsyncTaskMethodBuilder(); + var ignored = b.Task; // force initialization + Builder = b; + } + + public void Clear() => CancellationToken = default; + + protected override void OnCompleted(SocketAsyncEventArgs _) + { + switch (SocketError) + { + case SocketError.Success: + Builder.SetResult(); + break; + + case SocketError.OperationAborted: + case SocketError.ConnectionAborted: + if (CancellationToken.IsCancellationRequested) + { + Builder.SetException(CancellationHelper.CreateOperationCanceledException(null, CancellationToken)); + break; + } + goto default; + + default: + Builder.SetException(new SocketException((int)SocketError)); + break; + } + } + } + + public static ValueTask EstablishSslConnectionAsync(SslClientAuthenticationOptions sslOptions, HttpRequestMessage request, Stream stream, CancellationToken cancellationToken) + { + // If there's a cert validation callback, and if it came from HttpClientHandler, + // wrap the original delegate in order to change the sender to be the request message (expected by HttpClientHandler's delegate). + RemoteCertificateValidationCallback callback = sslOptions.RemoteCertificateValidationCallback; + if (callback != null && callback.Target is CertificateCallbackMapper mapper) + { + sslOptions = sslOptions.ShallowClone(); // Clone as we're about to mutate it and don't want to affect the cached copy + Func localFromHttpClientHandler = mapper.FromHttpClientHandler; + HttpRequestMessage localRequest = request; + sslOptions.RemoteCertificateValidationCallback = (object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors) => + localFromHttpClientHandler(localRequest, certificate as X509Certificate2, chain, sslPolicyErrors); + } + + // Create the SslStream, authenticate, and return it. + return EstablishSslConnectionAsyncCore(stream, sslOptions, cancellationToken); + } + + private static async ValueTask EstablishSslConnectionAsyncCore(Stream stream, SslClientAuthenticationOptions sslOptions, CancellationToken cancellationToken) + { + SslStream sslStream = new SslStream(stream); + + // TODO #25206 and #24430: Register/IsCancellationRequested should be removable once SslStream auth and sockets respect cancellation. + CancellationTokenRegistration ctr = cancellationToken.Register(s => ((Stream)s).Dispose(), stream); + try + { + await sslStream.AuthenticateAsClientAsync(sslOptions, cancellationToken).ConfigureAwait(false); + } + catch (Exception e) + { + sslStream.Dispose(); + + if (CancellationHelper.ShouldWrapInOperationCanceledException(e, cancellationToken)) + { + throw CancellationHelper.CreateOperationCanceledException(e, cancellationToken); + } + + throw new HttpRequestException(SR.net_http_ssl_connection_failed, e); + } + finally + { + ctr.Dispose(); + } + + // Handle race condition if cancellation happens after SSL auth completes but before the registration is disposed + if (cancellationToken.IsCancellationRequested) + { + sslStream.Dispose(); + throw CancellationHelper.CreateOperationCanceledException(null, cancellationToken); + } + + return sslStream; + } + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ConnectionCloseReadStream.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ConnectionCloseReadStream.cs new file mode 100644 index 0000000000..1506cdf2b8 --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ConnectionCloseReadStream.cs @@ -0,0 +1,129 @@ +// 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.IO; +using System.Threading; +using System.Threading.Tasks; + +namespace System.Net.Http +{ + internal partial class HttpConnection : IDisposable + { + private sealed class ConnectionCloseReadStream : HttpContentReadStream + { + public ConnectionCloseReadStream(HttpConnection connection) : base(connection) + { + } + + public override async ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken) + { + CancellationHelper.ThrowIfCancellationRequested(cancellationToken); + + if (_connection == null || buffer.Length == 0) + { + // Response body fully consumed or the caller didn't ask for any data + return 0; + } + + ValueTask readTask = _connection.ReadAsync(buffer); + int bytesRead; + if (readTask.IsCompletedSuccessfully) + { + bytesRead = readTask.Result; + } + else + { + CancellationTokenRegistration ctr = _connection.RegisterCancellation(cancellationToken); + try + { + bytesRead = await readTask.ConfigureAwait(false); + } + catch (Exception exc) when (CancellationHelper.ShouldWrapInOperationCanceledException(exc, cancellationToken)) + { + throw CancellationHelper.CreateOperationCanceledException(exc, cancellationToken); + } + finally + { + ctr.Dispose(); + } + } + + if (bytesRead == 0) + { + // If cancellation is requested and tears down the connection, it could cause the read + // to return 0, which would otherwise signal the end of the data, but that would lead + // the caller to think that it actually received all of the data, rather than it ending + // early due to cancellation. So we prioritize cancellation in this race condition, and + // if we read 0 bytes and then find that cancellation has requested, we assume cancellation + // was the cause and throw. + CancellationHelper.ThrowIfCancellationRequested(cancellationToken); + + // We cannot reuse this connection, so close it. + _connection.Dispose(); + _connection = null; + return 0; + } + + return bytesRead; + } + + public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken) + { + ValidateCopyToArgs(this, destination, bufferSize); + + if (cancellationToken.IsCancellationRequested) + { + return Task.FromCanceled(cancellationToken); + } + + if (_connection == null) + { + // null if response body fully consumed + return Task.CompletedTask; + } + + Task copyTask = _connection.CopyToUntilEofAsync(destination, bufferSize, cancellationToken); + if (copyTask.IsCompletedSuccessfully) + { + Finish(); + return Task.CompletedTask; + } + + return CompleteCopyToAsync(copyTask, cancellationToken); + } + + private async Task CompleteCopyToAsync(Task copyTask, CancellationToken cancellationToken) + { + CancellationTokenRegistration ctr = _connection.RegisterCancellation(cancellationToken); + try + { + await copyTask.ConfigureAwait(false); + } + catch (Exception exc) when (CancellationHelper.ShouldWrapInOperationCanceledException(exc, cancellationToken)) + { + throw CancellationHelper.CreateOperationCanceledException(exc, cancellationToken); + } + finally + { + ctr.Dispose(); + } + + // If cancellation is requested and tears down the connection, it could cause the copy + // to end early but think it ended successfully. So we prioritize cancellation in this + // race condition, and if we find after the copy has completed that cancellation has + // been requested, we assume the copy completed due to cancellation and throw. + CancellationHelper.ThrowIfCancellationRequested(cancellationToken); + + Finish(); + } + + private void Finish() + { + // We cannot reuse this connection, so close it. + _connection.Dispose(); + _connection = null; + } + } + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ContentLengthReadStream.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ContentLengthReadStream.cs new file mode 100644 index 0000000000..cbf51b0424 --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ContentLengthReadStream.cs @@ -0,0 +1,216 @@ +// 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.IO; +using System.Threading; +using System.Threading.Tasks; + +namespace System.Net.Http +{ + internal partial class HttpConnection : IDisposable + { + private sealed class ContentLengthReadStream : HttpContentReadStream + { + private ulong _contentBytesRemaining; + + public ContentLengthReadStream(HttpConnection connection, ulong contentLength) : base(connection) + { + Debug.Assert(contentLength > 0, "Caller should have checked for 0."); + _contentBytesRemaining = contentLength; + } + + public override async ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken) + { + CancellationHelper.ThrowIfCancellationRequested(cancellationToken); + + if (_connection == null || buffer.Length == 0) + { + // Response body fully consumed or the caller didn't ask for any data + return 0; + } + + Debug.Assert(_contentBytesRemaining > 0); + + if ((ulong)buffer.Length > _contentBytesRemaining) + { + buffer = buffer.Slice(0, (int)_contentBytesRemaining); + } + + ValueTask readTask = _connection.ReadAsync(buffer); + int bytesRead; + if (readTask.IsCompletedSuccessfully) + { + bytesRead = readTask.Result; + } + else + { + CancellationTokenRegistration ctr = _connection.RegisterCancellation(cancellationToken); + try + { + bytesRead = await readTask.ConfigureAwait(false); + } + catch (Exception exc) when (CancellationHelper.ShouldWrapInOperationCanceledException(exc, cancellationToken)) + { + throw CancellationHelper.CreateOperationCanceledException(exc, cancellationToken); + } + finally + { + ctr.Dispose(); + } + } + + if (bytesRead <= 0) + { + // A cancellation request may have caused the EOF. + CancellationHelper.ThrowIfCancellationRequested(cancellationToken); + + // Unexpected end of response stream. + throw new IOException(SR.net_http_invalid_response); + } + + Debug.Assert((ulong)bytesRead <= _contentBytesRemaining); + _contentBytesRemaining -= (ulong)bytesRead; + + if (_contentBytesRemaining == 0) + { + // End of response body + _connection.CompleteResponse(); + _connection = null; + } + + return bytesRead; + } + + public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken) + { + ValidateCopyToArgs(this, destination, bufferSize); + + if (cancellationToken.IsCancellationRequested) + { + return Task.FromCanceled(cancellationToken); + } + + if (_connection == null) + { + // null if response body fully consumed + return Task.CompletedTask; + } + + Task copyTask = _connection.CopyToExactLengthAsync(destination, _contentBytesRemaining, cancellationToken); + if (copyTask.IsCompletedSuccessfully) + { + Finish(); + return Task.CompletedTask; + } + + return CompleteCopyToAsync(copyTask, cancellationToken); + } + + private async Task CompleteCopyToAsync(Task copyTask, CancellationToken cancellationToken) + { + CancellationTokenRegistration ctr = _connection.RegisterCancellation(cancellationToken); + try + { + await copyTask.ConfigureAwait(false); + } + catch (Exception exc) when (CancellationHelper.ShouldWrapInOperationCanceledException(exc, cancellationToken)) + { + throw CancellationHelper.CreateOperationCanceledException(exc, cancellationToken); + } + finally + { + ctr.Dispose(); + } + + Finish(); + } + + private void Finish() + { + _contentBytesRemaining = 0; + _connection.CompleteResponse(); + _connection = null; + } + + // Based on ReadChunkFromConnectionBuffer; perhaps we should refactor into a common routine. + private ReadOnlyMemory ReadFromConnectionBuffer(int maxBytesToRead) + { + Debug.Assert(maxBytesToRead > 0); + Debug.Assert(_contentBytesRemaining > 0); + + ReadOnlyMemory connectionBuffer = _connection.RemainingBuffer; + if (connectionBuffer.Length == 0) + { + return default; + } + + int bytesToConsume = Math.Min(maxBytesToRead, (int)Math.Min((ulong)connectionBuffer.Length, _contentBytesRemaining)); + Debug.Assert(bytesToConsume > 0); + + _connection.ConsumeFromRemainingBuffer(bytesToConsume); + _contentBytesRemaining -= (ulong)bytesToConsume; + + return connectionBuffer.Slice(0, bytesToConsume); + } + + public override bool NeedsDrain => (_connection != null); + + public override async Task DrainAsync(int maxDrainBytes) + { + Debug.Assert(_connection != null); + Debug.Assert(_contentBytesRemaining > 0); + + ReadFromConnectionBuffer(int.MaxValue); + if (_contentBytesRemaining == 0) + { + Finish(); + return true; + } + + if (_contentBytesRemaining > (ulong)maxDrainBytes) + { + return false; + } + + CancellationTokenSource cts = null; + CancellationTokenRegistration ctr = default; + TimeSpan drainTime = _connection._pool.Settings._maxResponseDrainTime; + if (drainTime != Timeout.InfiniteTimeSpan) + { + cts = new CancellationTokenSource((int)drainTime.TotalMilliseconds); + ctr = cts.Token.Register(s => ((HttpConnection)s).Dispose(), _connection); + } + try + { + while (true) + { + await _connection.FillAsync().ConfigureAwait(false); + ReadFromConnectionBuffer(int.MaxValue); + if (_contentBytesRemaining == 0) + { + // Dispose of the registration and then check whether cancellation has been + // requested. This is necessary to make determinstic a race condition between + // cancellation being requested and unregistering from the token. Otherwise, + // it's possible cancellation could be requested just before we unregister and + // we then return a connection to the pool that has been or will be disposed + // (e.g. if a timer is used and has already queued its callback but the + // callback hasn't yet run). + ctr.Dispose(); + CancellationHelper.ThrowIfCancellationRequested(ctr.Token); + + Finish(); + return true; + } + } + } + finally + { + ctr.Dispose(); + cts?.Dispose(); + } + } + } + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ContentLengthWriteStream.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ContentLengthWriteStream.cs new file mode 100644 index 0000000000..3c79ead168 --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ContentLengthWriteStream.cs @@ -0,0 +1,36 @@ +// 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.Threading; +using System.Threading.Tasks; + +namespace System.Net.Http +{ + internal partial class HttpConnection : IDisposable + { + private sealed class ContentLengthWriteStream : HttpContentWriteStream + { + public ContentLengthWriteStream(HttpConnection connection) : base(connection) + { + } + + public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken ignored) // token ignored as it comes from SendAsync + { + Debug.Assert(_connection._currentRequest != null); + + // Have the connection write the data, skipping the buffer. Importantly, this will + // force a flush of anything already in the buffer, i.e. any remaining request headers + // that are still buffered. + return new ValueTask(_connection.WriteAsync(buffer)); + } + + public override Task FinishAsync() + { + _connection = null; + return Task.CompletedTask; + } + } + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/CookieHelper.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/CookieHelper.cs new file mode 100644 index 0000000000..024359e247 --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/CookieHelper.cs @@ -0,0 +1,41 @@ +// 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.Net.Http.Headers; +using System.Diagnostics; +using System.Collections.Generic; + +namespace System.Net.Http +{ + internal static class CookieHelper + { + public static void ProcessReceivedCookies(HttpResponseMessage response, CookieContainer cookieContainer) + { + IEnumerable values; + if (response.Headers.TryGetValues(KnownHeaders.SetCookie.Descriptor, out values)) + { + // The header values are always a string[] + var valuesArray = (string[])values; + Debug.Assert(valuesArray.Length > 0, "No values for header??"); + + Uri requestUri = response.RequestMessage.RequestUri; + for (int i = 0; i < valuesArray.Length; i++) + { + try + { + cookieContainer.SetCookies(requestUri, valuesArray[i]); + } + catch (CookieException) + { + // Ignore invalid Set-Cookie header and continue processing. + if (NetEventSource.IsEnabled) + { + NetEventSource.Error(response, $"Invalid Set-Cookie '{valuesArray[i]}' ignored."); + } + } + } + } + } + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/DecompressionHandler.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/DecompressionHandler.cs similarity index 86% rename from external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/DecompressionHandler.cs rename to external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/DecompressionHandler.cs index 261ae26af7..cbfb0b97a8 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/DecompressionHandler.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/DecompressionHandler.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; +using System.Diagnostics; using System.IO; using System.IO.Compression; using System.Net.Http.Headers; @@ -18,17 +19,16 @@ namespace System.Net.Http private const string s_gzip = "gzip"; private const string s_deflate = "deflate"; - private static StringWithQualityHeaderValue s_gzipHeaderValue = new StringWithQualityHeaderValue(s_gzip); - private static StringWithQualityHeaderValue s_deflateHeaderValue = new StringWithQualityHeaderValue(s_deflate); + private static readonly StringWithQualityHeaderValue s_gzipHeaderValue = new StringWithQualityHeaderValue(s_gzip); + private static readonly StringWithQualityHeaderValue s_deflateHeaderValue = new StringWithQualityHeaderValue(s_deflate); public DecompressionHandler(DecompressionMethods decompressionMethods, HttpMessageHandler innerHandler) { - _innerHandler = innerHandler ?? throw new ArgumentNullException(nameof(innerHandler)); - if (decompressionMethods == DecompressionMethods.None) - { - throw new ArgumentOutOfRangeException(nameof(decompressionMethods)); - } + Debug.Assert(decompressionMethods != DecompressionMethods.None); + Debug.Assert(innerHandler != null); + _decompressionMethods = decompressionMethods; + _innerHandler = innerHandler; } internal bool GZipEnabled => (_decompressionMethods & DecompressionMethods.GZip) != 0; @@ -108,11 +108,14 @@ namespace System.Net.Http protected abstract Stream GetDecompressedStream(Stream originalStream); - protected override async Task SerializeToStreamAsync(Stream stream, TransportContext context) + protected override Task SerializeToStreamAsync(Stream stream, TransportContext context) => + SerializeToStreamAsync(stream, context, CancellationToken.None); + + internal override async Task SerializeToStreamAsync(Stream stream, TransportContext context, CancellationToken cancellationToken) { using (Stream decompressedStream = await CreateContentReadStreamAsync().ConfigureAwait(false)) { - await decompressedStream.CopyToAsync(stream).ConfigureAwait(false); + await decompressedStream.CopyToAsync(stream, cancellationToken).ConfigureAwait(false); } } diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/EmptyReadStream.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/EmptyReadStream.cs similarity index 69% rename from external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/EmptyReadStream.cs rename to external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/EmptyReadStream.cs index 2de314374d..f965c92add 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/EmptyReadStream.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/EmptyReadStream.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace System.Net.Http { - internal sealed partial class HttpConnection : IDisposable + internal partial class HttpConnection : IDisposable { private sealed class EmptyReadStream : HttpContentReadStream { @@ -20,13 +20,12 @@ namespace System.Net.Http protected override void Dispose(bool disposing) { /* nop */ } public override void Close() { /* nop */ } - public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - ValidateBufferArgs(buffer, offset, count); - return s_zeroTask; - } + public override int ReadByte() => -1; - public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default) => + public override int Read(Span buffer) => 0; + + public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken) => + cancellationToken.IsCancellationRequested ? new ValueTask(Task.FromCanceled(cancellationToken)) : new ValueTask(0); } } diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpAuthenticatedConnectionHandler.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpAuthenticatedConnectionHandler.cs new file mode 100644 index 0000000000..eb0eb3d959 --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpAuthenticatedConnectionHandler.cs @@ -0,0 +1,35 @@ +// 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.Threading; +using System.Threading.Tasks; + +namespace System.Net.Http +{ + internal sealed class HttpAuthenticatedConnectionHandler : HttpMessageHandler + { + private readonly HttpConnectionPoolManager _poolManager; + + public HttpAuthenticatedConnectionHandler(HttpConnectionPoolManager poolManager) + { + _poolManager = poolManager; + } + + protected internal override Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) + { + return _poolManager.SendAsync(request, doRequestAuth:true, cancellationToken); + } + + protected override void Dispose(bool disposing) + { + if (disposing) + { + _poolManager.Dispose(); + } + + base.Dispose(disposing); + } + } + +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnection.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnection.cs new file mode 100644 index 0000000000..e568bc8732 --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnection.cs @@ -0,0 +1,1620 @@ +// 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.Text; +using System.Collections.Generic; +using System.Diagnostics; +using System.Globalization; +using System.IO; +using System.Net.Http.Headers; +using System.Net.Security; +using System.Net.Sockets; +using System.Runtime.CompilerServices; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace System.Net.Http +{ + internal partial class HttpConnection : IDisposable + { + /// Default size of the read buffer used for the connection. + private const int InitialReadBufferSize = +#if DEBUG + 10; +#else + 4096; +#endif + /// Default size of the write buffer used for the connection. + private const int InitialWriteBufferSize = InitialReadBufferSize; + /// + /// Size after which we'll close the connection rather than send the payload in response + /// to final error status code sent by the server when using Expect: 100-continue. + /// + private const int Expect100ErrorSendThreshold = 1024; + + private static readonly byte[] s_contentLength0NewlineAsciiBytes = Encoding.ASCII.GetBytes("Content-Length: 0\r\n"); + private static readonly byte[] s_spaceHttp10NewlineAsciiBytes = Encoding.ASCII.GetBytes(" HTTP/1.0\r\n"); + private static readonly byte[] s_spaceHttp11NewlineAsciiBytes = Encoding.ASCII.GetBytes(" HTTP/1.1\r\n"); + private static readonly byte[] s_httpSchemeAndDelimiter = Encoding.ASCII.GetBytes(Uri.UriSchemeHttp + Uri.SchemeDelimiter); + private static readonly byte[] s_http1DotBytes = Encoding.ASCII.GetBytes("HTTP/1."); + private static readonly ulong s_http10Bytes = BitConverter.ToUInt64(Encoding.ASCII.GetBytes("HTTP/1.0")); + private static readonly ulong s_http11Bytes = BitConverter.ToUInt64(Encoding.ASCII.GetBytes("HTTP/1.1")); + + private readonly HttpConnectionPool _pool; + private readonly Socket _socket; // used for polling; _stream should be used for all reading/writing. _stream owns disposal. + private readonly Stream _stream; + private readonly TransportContext _transportContext; + private readonly bool _usingProxy; + private readonly WeakReference _weakThisRef; + + private HttpRequestMessage _currentRequest; + private readonly byte[] _writeBuffer; + private int _writeOffset; + private int _allowedReadLineBytes; + + private ValueTask? _readAheadTask; + private int _readAheadTaskLock = 0; // 0 == free, 1 == held + private byte[] _readBuffer; + private int _readOffset; + private int _readLength; + + private bool _inUse; + private bool _canRetry; + private bool _connectionClose; // Connection: close was seen on last response + private int _disposed; // 1 yes, 0 no + + public HttpConnection( + HttpConnectionPool pool, + Socket socket, + Stream stream, + TransportContext transportContext) + { + Debug.Assert(pool != null); + Debug.Assert(stream != null); + + _pool = pool; + _socket = socket; // may be null in cases where we couldn't easily get the underlying socket + _stream = stream; + _transportContext = transportContext; + _usingProxy = pool.UsingProxy; + + _writeBuffer = new byte[InitialWriteBufferSize]; + _readBuffer = new byte[InitialReadBufferSize]; + + _weakThisRef = new WeakReference(this); + + if (NetEventSource.IsEnabled) + { + if (pool.IsSecure) + { + var sslStream = (SslStream)_stream; + Trace( + $"Secure connection created to {pool}. " + + $"SslProtocol:{sslStream.SslProtocol}, " + + $"CipherAlgorithm:{sslStream.CipherAlgorithm}, CipherStrength:{sslStream.CipherStrength}, " + + $"HashAlgorithm:{sslStream.HashAlgorithm}, HashStrength:{sslStream.HashStrength}, " + + $"KeyExchangeAlgorithm:{sslStream.KeyExchangeAlgorithm}, KeyExchangeStrength:{sslStream.KeyExchangeStrength}, " + + $"LocalCert:{sslStream.LocalCertificate}, RemoteCert:{sslStream.RemoteCertificate}"); + } + else + { + Trace($"Connection created to {pool}."); + } + } + } + + public void Dispose() => Dispose(disposing: true); + + protected void Dispose(bool disposing) + { + // Ensure we're only disposed once. Dispose could be called concurrently, for example, + // if the request and the response were running concurrently and both incurred an exception. + if (Interlocked.Exchange(ref _disposed, 1) == 0) + { + if (NetEventSource.IsEnabled) Trace("Connection closing."); + _pool.DecrementConnectionCount(); + if (disposing) + { + GC.SuppressFinalize(this); + _stream.Dispose(); + + // Eat any exceptions from the read-ahead task. We don't need to log, as we expect + // failures from this task due to closing the connection while a read is in progress. + ValueTask? readAheadTask = ConsumeReadAheadTask(); + if (readAheadTask != null) + { + IgnoreExceptionsAsync(readAheadTask.GetValueOrDefault()); + } + } + } + } + + /// Awaits a task, ignoring any resulting exceptions. + private static async void IgnoreExceptionsAsync(ValueTask task) + { + try { await task.ConfigureAwait(false); } catch { } + } + + /// Do a non-blocking poll to see whether the connection has data available or has been closed. + /// If we don't have direct access to the underlying socket, we instead use a read-ahead task. + public bool PollRead() + { + if (_socket != null) // may be null if we don't have direct access to the socket + { + try + { + return _socket.Poll(0, SelectMode.SelectRead); + } + catch (Exception e) when (e is SocketException || e is ObjectDisposedException) + { + // Poll can throw when used on a closed socket. + return true; + } + } + else + { + return EnsureReadAheadAndPollRead(); + } + } + + /// + /// Issues a read-ahead on the connection, which will serve both as the first read on the + /// response as well as a polling indication of whether the connection is usable. + /// + /// true if there's data available on the connection or it's been closed; otherwise, false. + public bool EnsureReadAheadAndPollRead() + { + try + { + Debug.Assert(_readAheadTask == null || _socket == null, "Should only already have a read-ahead task if we don't have a socket to poll"); + if (_readAheadTask == null) + { + _readAheadTask = _stream.ReadAsync(new Memory(_readBuffer)); + } + } + catch (Exception error) + { + // If reading throws, eat the error and don't pool the connection. + if (NetEventSource.IsEnabled) Trace($"Error performing read ahead: {error}"); + Dispose(); + _readAheadTask = new ValueTask(0); + } + + return _readAheadTask.Value.IsCompleted; // equivalent to polling + } + + private ValueTask? ConsumeReadAheadTask() + { + if (Interlocked.CompareExchange(ref _readAheadTaskLock, 1, 0) == 0) + { + ValueTask? t = _readAheadTask; + _readAheadTask = null; + Volatile.Write(ref _readAheadTaskLock, 0); + return t; + } + + // We couldn't get the lock, which means it must already be held + // by someone else who will consume the task. + return null; + } + + public bool IsNewConnection + { + get + { + // This is only valid when we are not actually processing a request. + Debug.Assert(_currentRequest == null); + return (_readAheadTask == null); + } + } + + public bool CanRetry + { + get + { + // Should only be called when we have been disposed. + Debug.Assert(_disposed != 0); + return _canRetry; + } + } + + public DateTimeOffset CreationTime { get; } = DateTimeOffset.UtcNow; + + public TransportContext TransportContext => _transportContext; + + public bool UsingProxy => _usingProxy; + + private int ReadBufferSize => _readBuffer.Length; + + private ReadOnlyMemory RemainingBuffer => new ReadOnlyMemory(_readBuffer, _readOffset, _readLength - _readOffset); + + private void ConsumeFromRemainingBuffer(int bytesToConsume) + { + Debug.Assert(bytesToConsume <= _readLength - _readOffset, $"{bytesToConsume} > {_readLength} - {_readOffset}"); + _readOffset += bytesToConsume; + } + + private async Task WriteHeadersAsync(HttpHeaders headers, string cookiesFromContainer) + { + foreach (KeyValuePair header in headers.GetHeaderDescriptorsAndValues()) + { + if (header.Key.KnownHeader != null) + { + await WriteBytesAsync(header.Key.KnownHeader.AsciiBytesWithColonSpace).ConfigureAwait(false); + } + else + { + await WriteAsciiStringAsync(header.Key.Name).ConfigureAwait(false); + await WriteTwoBytesAsync((byte)':', (byte)' ').ConfigureAwait(false); + } + + Debug.Assert(header.Value.Length > 0, "No values for header??"); + if (header.Value.Length > 0) + { + await WriteStringAsync(header.Value[0]).ConfigureAwait(false); + + if (cookiesFromContainer != null && header.Key.KnownHeader == KnownHeaders.Cookie) + { + await WriteTwoBytesAsync((byte)';', (byte)' ').ConfigureAwait(false); + await WriteStringAsync(cookiesFromContainer).ConfigureAwait(false); + + cookiesFromContainer = null; + } + + // Some headers such as User-Agent and Server use space as a separator (see: ProductInfoHeaderParser) + if (header.Value.Length > 1) + { + HttpHeaderParser parser = header.Key.Parser; + string separator = HttpHeaderParser.DefaultSeparator; + if (parser != null && parser.SupportsMultipleValues) + { + separator = parser.Separator; + } + + for (int i = 1; i < header.Value.Length; i++) + { + await WriteAsciiStringAsync(separator).ConfigureAwait(false); + await WriteStringAsync(header.Value[i]).ConfigureAwait(false); + } + } + } + + await WriteTwoBytesAsync((byte)'\r', (byte)'\n').ConfigureAwait(false); + } + + if (cookiesFromContainer != null) + { + await WriteAsciiStringAsync(HttpKnownHeaderNames.Cookie).ConfigureAwait(false); + await WriteTwoBytesAsync((byte)':', (byte)' ').ConfigureAwait(false); + await WriteStringAsync(cookiesFromContainer).ConfigureAwait(false); + await WriteTwoBytesAsync((byte)'\r', (byte)'\n').ConfigureAwait(false); + } + } + + private async Task WriteHostHeaderAsync(Uri uri) + { + await WriteBytesAsync(KnownHeaders.Host.AsciiBytesWithColonSpace).ConfigureAwait(false); + + if (_pool.HostHeaderValueBytes != null) + { + Debug.Assert(!_pool.UsingProxy); + await WriteBytesAsync(_pool.HostHeaderValueBytes).ConfigureAwait(false); + } + else + { + Debug.Assert(_pool.UsingProxy); + + // TODO: #28863 Uri.IdnHost is missing '[', ']' characters around IPv6 address. + // So, we need to add them manually for now. + if (uri.HostNameType == UriHostNameType.IPv6) + { + await WriteByteAsync((byte)'[').ConfigureAwait(false); + await WriteAsciiStringAsync(uri.IdnHost).ConfigureAwait(false); + await WriteByteAsync((byte)']').ConfigureAwait(false); + } + else + { + await WriteAsciiStringAsync(uri.IdnHost).ConfigureAwait(false); + } + + if (!uri.IsDefaultPort) + { + await WriteByteAsync((byte)':').ConfigureAwait(false); + await WriteDecimalInt32Async(uri.Port).ConfigureAwait(false); + } + } + + await WriteTwoBytesAsync((byte)'\r', (byte)'\n').ConfigureAwait(false); + } + + private Task WriteDecimalInt32Async(int value) + { + // Try to format into our output buffer directly. + if (Utf8Formatter.TryFormat(value, new Span(_writeBuffer, _writeOffset, _writeBuffer.Length - _writeOffset), out int bytesWritten)) + { + _writeOffset += bytesWritten; + return Task.CompletedTask; + } + + // If we don't have enough room, do it the slow way. + return WriteAsciiStringAsync(value.ToString()); + } + + private Task WriteHexInt32Async(int value) + { + // Try to format into our output buffer directly. + if (Utf8Formatter.TryFormat(value, new Span(_writeBuffer, _writeOffset, _writeBuffer.Length - _writeOffset), out int bytesWritten, 'X')) + { + _writeOffset += bytesWritten; + return Task.CompletedTask; + } + + // If we don't have enough room, do it the slow way. + return WriteAsciiStringAsync(value.ToString("X", CultureInfo.InvariantCulture)); + } + + public async Task SendAsyncCore(HttpRequestMessage request, CancellationToken cancellationToken) + { + TaskCompletionSource allowExpect100ToContinue = null; + Debug.Assert(_currentRequest == null, $"Expected null {nameof(_currentRequest)}."); + Debug.Assert(RemainingBuffer.Length == 0, "Unexpected data in read buffer"); + + _currentRequest = request; + bool isConnectMethod = (request.Method == HttpMethod.Connect); + + Debug.Assert(!_canRetry); + _canRetry = true; + + // Send the request. + if (NetEventSource.IsEnabled) Trace($"Sending request: {request}"); + CancellationTokenRegistration cancellationRegistration = RegisterCancellation(cancellationToken); + try + { + // Write request line + await WriteStringAsync(request.Method.Method).ConfigureAwait(false); + await WriteByteAsync((byte)' ').ConfigureAwait(false); + + if (isConnectMethod) + { + // RFC 7231 #section-4.3.6. + // Write only CONNECT foo.com:345 HTTP/1.1 + if (!request.HasHeaders || request.Headers.Host == null) + { + throw new HttpRequestException(SR.net_http_request_no_host); + } + await WriteAsciiStringAsync(request.Headers.Host).ConfigureAwait(false); + } + else + { + if (_usingProxy) + { + // Proxied requests contain full URL + Debug.Assert(request.RequestUri.Scheme == Uri.UriSchemeHttp); + await WriteBytesAsync(s_httpSchemeAndDelimiter).ConfigureAwait(false); + + // TODO: #28863 Uri.IdnHost is missing '[', ']' characters around IPv6 address. + // So, we need to add them manually for now. + if (request.RequestUri.HostNameType == UriHostNameType.IPv6) + { + await WriteByteAsync((byte)'[').ConfigureAwait(false); + await WriteAsciiStringAsync(request.RequestUri.IdnHost).ConfigureAwait(false); + await WriteByteAsync((byte)']').ConfigureAwait(false); + } + else + { + await WriteAsciiStringAsync(request.RequestUri.IdnHost).ConfigureAwait(false); + } + + if (!request.RequestUri.IsDefaultPort) + { + await WriteByteAsync((byte)':').ConfigureAwait(false); + await WriteDecimalInt32Async(request.RequestUri.Port).ConfigureAwait(false); + } + } + await WriteStringAsync(request.RequestUri.GetComponents(UriComponents.PathAndQuery | UriComponents.Fragment, UriFormat.UriEscaped)).ConfigureAwait(false); + } + + // Fall back to 1.1 for all versions other than 1.0 + Debug.Assert(request.Version.Major >= 0 && request.Version.Minor >= 0); // guaranteed by Version class + bool isHttp10 = request.Version.Minor == 0 && request.Version.Major == 1; + await WriteBytesAsync(isHttp10 ? s_spaceHttp10NewlineAsciiBytes : s_spaceHttp11NewlineAsciiBytes).ConfigureAwait(false); + + // Determine cookies to send + string cookiesFromContainer = null; + if (_pool.Settings._useCookies) + { + cookiesFromContainer = _pool.Settings._cookieContainer.GetCookieHeader(request.RequestUri); + if (cookiesFromContainer == "") + { + cookiesFromContainer = null; + } + } + + // Write request headers + if (request.HasHeaders || cookiesFromContainer != null) + { + await WriteHeadersAsync(request.Headers, cookiesFromContainer).ConfigureAwait(false); + } + + if (request.Content == null) + { + // Write out Content-Length: 0 header to indicate no body, + // unless this is a method that never has a body. + if (request.Method != HttpMethod.Get && request.Method != HttpMethod.Head && !isConnectMethod) + { + await WriteBytesAsync(s_contentLength0NewlineAsciiBytes).ConfigureAwait(false); + } + } + else + { + // Write content headers + await WriteHeadersAsync(request.Content.Headers, cookiesFromContainer: null).ConfigureAwait(false); + } + + // Write special additional headers. If a host isn't in the headers list, then a Host header + // wasn't sent, so as it's required by HTTP 1.1 spec, send one based on the Request Uri. + if (!request.HasHeaders || request.Headers.Host == null) + { + await WriteHostHeaderAsync(request.RequestUri).ConfigureAwait(false); + } + + // CRLF for end of headers. + await WriteTwoBytesAsync((byte)'\r', (byte)'\n').ConfigureAwait(false); + + Task sendRequestContentTask = null; + if (request.Content == null) + { + // We have nothing more to send, so flush out any headers we haven't yet sent. + await FlushAsync().ConfigureAwait(false); + } + else + { + // Send the body if there is one. We prefer to serialize the sending of the content before + // we try to receive any response, but if ExpectContinue has been set, we allow the sending + // to run concurrently until we receive the final status line, at which point we wait for it. + if (!request.HasHeaders || request.Headers.ExpectContinue != true) + { + await SendRequestContentAsync(request, CreateRequestContentStream(request), cancellationToken).ConfigureAwait(false); + } + else + { + // We're sending an Expect: 100-continue header. We need to flush headers so that the server receives + // all of them, and we need to do so before initiating the send, as once we do that, it effectively + // owns the right to write, and we don't want to concurrently be accessing the write buffer. + await FlushAsync().ConfigureAwait(false); + + // Create a TCS we'll use to block the request content from being sent, and create a timer that's used + // as a fail-safe to unblock the request content if we don't hear back from the server in a timely manner. + // Then kick off the request. The TCS' result indicates whether content should be sent or not. + allowExpect100ToContinue = new TaskCompletionSource(); + var expect100Timer = new Timer( + s => ((TaskCompletionSource)s).TrySetResult(true), + allowExpect100ToContinue, _pool.Settings._expect100ContinueTimeout, Timeout.InfiniteTimeSpan); + sendRequestContentTask = SendRequestContentWithExpect100ContinueAsync( + request, allowExpect100ToContinue.Task, CreateRequestContentStream(request), expect100Timer, cancellationToken); + } + } + + // Start to read response. + _allowedReadLineBytes = (int)Math.Min(int.MaxValue, _pool.Settings._maxResponseHeadersLength * 1024L); + + // We should not have any buffered data here; if there was, it should have been treated as an error + // by the previous request handling. (Note we do not support HTTP pipelining.) + Debug.Assert(_readOffset == _readLength); + + // When the connection was taken out of the pool, a pre-emptive read was performed + // into the read buffer. We need to consume that read prior to issuing another read. + ValueTask? t = ConsumeReadAheadTask(); + if (t != null) + { + int bytesRead = await t.GetValueOrDefault().ConfigureAwait(false); + if (NetEventSource.IsEnabled) Trace($"Received {bytesRead} bytes."); + + if (bytesRead == 0) + { + throw new IOException(SR.net_http_invalid_response); + } + + _readOffset = 0; + _readLength = bytesRead; + } + + // The request is no longer retryable; either we received data from the _readAheadTask, + // or there was no _readAheadTask because this is the first request on the connection. + // (We may have already set this as well if we sent request content.) + _canRetry = false; + + // Parse the response status line. + var response = new HttpResponseMessage() { RequestMessage = request, Content = new HttpConnectionResponseContent() }; + ParseStatusLine(await ReadNextResponseHeaderLineAsync().ConfigureAwait(false), response); + + // If we sent an Expect: 100-continue header, handle the response accordingly. + if (allowExpect100ToContinue != null) + { + if ((int)response.StatusCode >= 300 && + (request.Content.Headers.ContentLength == null || request.Content.Headers.ContentLength.GetValueOrDefault() > Expect100ErrorSendThreshold)) + { + // For error final status codes, try to avoid sending the payload if its size is unknown or if it's known to be "big". + // If we already sent a header detailing the size of the payload, if we then don't send that payload, the server may wait + // for it and assume that the next request on the connection is actually this request's payload. Thus we mark the connection + // to be closed. However, we may have also lost a race condition with the Expect: 100-continue timeout, so if it turns out + // we've already started sending the payload (we weren't able to cancel it), then we don't need to force close the connection. + allowExpect100ToContinue.TrySetResult(false); + if (!allowExpect100ToContinue.Task.Result) // if Result is true, the timeout already expired and we started sending content + { + _connectionClose = true; + } + } + else + { + // For any success or informational status codes (including 100 continue), send the payload. + allowExpect100ToContinue.TrySetResult(true); + + // And if this was 100 continue, deal with the extra headers. + if (response.StatusCode == HttpStatusCode.Continue) + { + // We got our continue header. Read the subsequent empty line and parse the additional status line. + if (!LineIsEmpty(await ReadNextResponseHeaderLineAsync().ConfigureAwait(false))) + { + ThrowInvalidHttpResponse(); + } + + ParseStatusLine(await ReadNextResponseHeaderLineAsync().ConfigureAwait(false), response); + } + } + } + + // Now that we've received our final status line, wait for the request content to fully send. + // In most common scenarios, the server won't send back a response until all of the request + // content has been received, so this task should generally already be complete. + if (sendRequestContentTask != null) + { + await sendRequestContentTask.ConfigureAwait(false); + sendRequestContentTask = null; + } + + // Parse the response headers. + while (true) + { + ArraySegment line = await ReadNextResponseHeaderLineAsync(foldedHeadersAllowed: true).ConfigureAwait(false); + if (LineIsEmpty(line)) + { + break; + } + ParseHeaderNameValue(line, response); + } + + // Determine whether we need to force close the connection when the request/response has completed. + if (response.Headers.ConnectionClose.GetValueOrDefault()) + { + _connectionClose = true; + } + + // We're about to create the response stream, at which point responsibility for canceling + // the remainder of the response lies with the stream. Thus we dispose of our registration + // here (if an exception has occurred or does occur while creating/returning the stream, + // we'll still dispose of it in the catch below as part of Dispose'ing the connection). + cancellationRegistration.Dispose(); + CancellationHelper.ThrowIfCancellationRequested(cancellationToken); // in case cancellation may have disposed of the stream + + // Create the response stream. + HttpContentStream responseStream; + if (request.Method == HttpMethod.Head || response.StatusCode == HttpStatusCode.NoContent || response.StatusCode == HttpStatusCode.NotModified) + { + responseStream = EmptyReadStream.Instance; + CompleteResponse(); + } + else if (isConnectMethod && response.StatusCode == HttpStatusCode.OK) + { + // Successful response to CONNECT does not have body. + // What ever comes next should be opaque. + responseStream = new RawConnectionStream(this); + // Don't put connection back to the pool if we upgraded to tunnel. + // We cannot use it for normal HTTP requests any more. + _connectionClose = true; + + } + else if (response.Content.Headers.ContentLength != null) + { + long contentLength = response.Content.Headers.ContentLength.GetValueOrDefault(); + if (contentLength <= 0) + { + responseStream = EmptyReadStream.Instance; + CompleteResponse(); + } + else + { + responseStream = new ContentLengthReadStream(this, (ulong)contentLength); + } + } + else if (response.Headers.TransferEncodingChunked == true) + { + responseStream = new ChunkedEncodingReadStream(this); + } + else if (response.StatusCode == HttpStatusCode.SwitchingProtocols) + { + responseStream = new RawConnectionStream(this); + } + else + { + responseStream = new ConnectionCloseReadStream(this); + } + ((HttpConnectionResponseContent)response.Content).SetStream(responseStream); + + if (NetEventSource.IsEnabled) Trace($"Received response: {response}"); + + // Process Set-Cookie headers. + if (_pool.Settings._useCookies) + { + CookieHelper.ProcessReceivedCookies(response, _pool.Settings._cookieContainer); + } + + return response; + } + catch (Exception error) + { + // Clean up the cancellation registration in case we're still registered. + cancellationRegistration.Dispose(); + + // Make sure to complete the allowExpect100ToContinue task if it exists. + allowExpect100ToContinue?.TrySetResult(false); + + if (NetEventSource.IsEnabled) Trace($"Error sending request: {error}"); + Dispose(); + + // At this point, we're going to throw an exception; we just need to + // determine which exception to throw. + + if (CancellationHelper.ShouldWrapInOperationCanceledException(error, cancellationToken)) + { + // Cancellation was requested, so assume that the failure is due to + // the cancellation request. This is a bit unorthodox, as usually we'd + // prioritize a non-OperationCanceledException over a cancellation + // request to avoid losing potentially pertinent information. But given + // the cancellation design where we tear down the underlying connection upon + // a cancellation request, which can then result in a myriad of different + // exceptions (argument exceptions, object disposed exceptions, socket exceptions, + // etc.), as a middle ground we treat it as cancellation, but still propagate the + // original information as the inner exception, for diagnostic purposes. + throw CancellationHelper.CreateOperationCanceledException(error, cancellationToken); + } + else if (error is InvalidOperationException || error is IOException) + { + // If it's an InvalidOperationException or an IOException, for consistency + // with other handlers we wrap the exception in an HttpRequestException. + throw new HttpRequestException(SR.net_http_client_execution_error, error); + } + else + { + // Otherwise, just allow the original exception to propagate. + throw; + } + } + } + + public Task SendWithNtProxyAuthAsync(HttpRequestMessage request, CancellationToken cancellationToken) + { + if (_pool.UsingProxy && _pool.ProxyCredentials != null) + { + return AuthenticationHelper.SendWithNtProxyAuthAsync(request, _pool.ProxyUri, _pool.ProxyCredentials, this, cancellationToken); + } + + return SendAsyncCore(request, cancellationToken); + } + + public Task SendAsync(HttpRequestMessage request, bool doRequestAuth, CancellationToken cancellationToken) + { + if (doRequestAuth && _pool.Settings._credentials != null) + { + return AuthenticationHelper.SendWithNtConnectionAuthAsync(request, _pool.Settings._credentials, this, cancellationToken); + } + + return SendWithNtProxyAuthAsync(request, cancellationToken); + } + + private HttpContentWriteStream CreateRequestContentStream(HttpRequestMessage request) + { + bool requestTransferEncodingChunked = request.HasHeaders && request.Headers.TransferEncodingChunked == true; + HttpContentWriteStream requestContentStream = requestTransferEncodingChunked ? (HttpContentWriteStream) + new ChunkedEncodingWriteStream(this) : + new ContentLengthWriteStream(this); + return requestContentStream; + } + + private CancellationTokenRegistration RegisterCancellation(CancellationToken cancellationToken) + { + // Cancellation design: + // - We register with the SendAsync CancellationToken for the duration of the SendAsync operation. + // - We register with the Read/Write/CopyToAsync methods on the response stream for each such individual operation. + // - The registration disposes of the connection, tearing it down and causing any pending operations to wake up. + // - Because such a tear down can result in a variety of different exception types, we check for a cancellation + // request and prioritize that over other exceptions, wrapping the actual exception as an inner of an OCE. + // - A weak reference to this HttpConnection is stored in the cancellation token, to prevent the token from + // artificially keeping this connection alive. + return cancellationToken.Register(s => + { + var weakThisRef = (WeakReference)s; + if (weakThisRef.TryGetTarget(out HttpConnection strongThisRef)) + { + if (NetEventSource.IsEnabled) strongThisRef.Trace("Cancellation requested. Disposing of the connection."); + strongThisRef.Dispose(); + } + }, _weakThisRef); + } + + private static bool LineIsEmpty(ArraySegment line) => line.Count == 0; + + private async Task SendRequestContentAsync(HttpRequestMessage request, HttpContentWriteStream stream, CancellationToken cancellationToken) + { + // Now that we're sending content, prohibit retries on this connection. + _canRetry = false; + + // Copy all of the data to the server. + await request.Content.CopyToAsync(stream, _transportContext, cancellationToken).ConfigureAwait(false); + + // Finish the content; with a chunked upload, this includes writing the terminating chunk. + await stream.FinishAsync().ConfigureAwait(false); + + // Flush any content that might still be buffered. + await FlushAsync().ConfigureAwait(false); + } + + private async Task SendRequestContentWithExpect100ContinueAsync( + HttpRequestMessage request, Task allowExpect100ToContinueTask, HttpContentWriteStream stream, Timer expect100Timer, CancellationToken cancellationToken) + { + // Wait until we receive a trigger notification that it's ok to continue sending content. + // This will come either when the timer fires or when we receive a response status line from the server. + bool sendRequestContent = await allowExpect100ToContinueTask.ConfigureAwait(false); + + // Clean up the timer; it's no longer needed. + expect100Timer.Dispose(); + + // Send the content if we're supposed to. Otherwise, we're done. + if (sendRequestContent) + { + if (NetEventSource.IsEnabled) Trace($"Sending request content for Expect: 100-continue."); + await SendRequestContentAsync(request, stream, cancellationToken).ConfigureAwait(false); + } + else + { + if (NetEventSource.IsEnabled) Trace($"Canceling request content for Expect: 100-continue."); + } + } + + // TODO: Remove this overload once https://github.com/dotnet/csharplang/issues/1331 is addressed + // and the compiler doesn't prevent using spans in async methods. + private static void ParseStatusLine(ArraySegment line, HttpResponseMessage response) => + ParseStatusLine((Span)line, response); + + private static void ParseStatusLine(Span line, HttpResponseMessage response) + { + // We sent the request version as either 1.0 or 1.1. + // We expect a response version of the form 1.X, where X is a single digit as per RFC. + + // Validate the beginning of the status line and set the response version. + const int MinStatusLineLength = 12; // "HTTP/1.x 123" + if (line.Length < MinStatusLineLength || line[8] != ' ') + { + ThrowInvalidHttpResponse(); + } + + ulong first8Bytes = BitConverter.ToUInt64(line); + if (first8Bytes == s_http11Bytes) + { + response.SetVersionWithoutValidation(HttpVersion.Version11); + } + else if (first8Bytes == s_http10Bytes) + { + response.SetVersionWithoutValidation(HttpVersion.Version10); + } + else + { + byte minorVersion = line[7]; + if (IsDigit(minorVersion) && + line.Slice(0, 7).SequenceEqual(s_http1DotBytes)) + { + response.SetVersionWithoutValidation(new Version(1, minorVersion - '0')); + } + else + { + ThrowInvalidHttpResponse(); + } + } + + // Set the status code + byte status1 = line[9], status2 = line[10], status3 = line[11]; + if (!IsDigit(status1) || !IsDigit(status2) || !IsDigit(status3)) + { + ThrowInvalidHttpResponse(); + } + response.SetStatusCodeWithoutValidation((HttpStatusCode)(100 * (status1 - '0') + 10 * (status2 - '0') + (status3 - '0'))); + + // Parse (optional) reason phrase + if (line.Length == MinStatusLineLength) + { + response.SetReasonPhraseWithoutValidation(string.Empty); + } + else if (line[MinStatusLineLength] == ' ') + { + Span reasonBytes = line.Slice(MinStatusLineLength + 1); + string knownReasonPhrase = HttpStatusDescription.Get(response.StatusCode); + if (knownReasonPhrase != null && EqualsOrdinal(knownReasonPhrase, reasonBytes)) + { + response.SetReasonPhraseWithoutValidation(knownReasonPhrase); + } + else + { + try + { + response.ReasonPhrase = HttpRuleParser.DefaultHttpEncoding.GetString(reasonBytes); + } + catch (FormatException error) + { + ThrowInvalidHttpResponse(error); + } + } + } + else + { + ThrowInvalidHttpResponse(); + } + } + + // TODO: Remove this overload once https://github.com/dotnet/csharplang/issues/1331 is addressed + // and the compiler doesn't prevent using spans in async methods. + private static void ParseHeaderNameValue(ArraySegment line, HttpResponseMessage response) => + ParseHeaderNameValue((Span)line, response); + + private static void ParseHeaderNameValue(Span line, HttpResponseMessage response) + { + Debug.Assert(line.Length > 0); + + int pos = 0; + while (line[pos] != (byte)':' && line[pos] != (byte)' ') + { + pos++; + if (pos == line.Length) + { + // Invalid header line that doesn't contain ':'. + ThrowInvalidHttpResponse(); + } + } + + if (pos == 0) + { + // Invalid empty header name. + ThrowInvalidHttpResponse(); + } + + if (!HeaderDescriptor.TryGet(line.Slice(0, pos), out HeaderDescriptor descriptor)) + { + // Invalid header name + ThrowInvalidHttpResponse(); + } + + // Eat any trailing whitespace + while (line[pos] == (byte)' ') + { + pos++; + if (pos == line.Length) + { + // Invalid header line that doesn't contain ':'. + ThrowInvalidHttpResponse(); + } + } + + if (line[pos++] != ':') + { + // Invalid header line that doesn't contain ':'. + ThrowInvalidHttpResponse(); + } + + // Skip whitespace after colon + while (pos < line.Length && (line[pos] == (byte)' ' || line[pos] == (byte)'\t')) + { + pos++; + } + + string headerValue = descriptor.GetHeaderValue(line.Slice(pos)); + + // Note we ignore the return value from TryAddWithoutValidation; + // if the header can't be added, we silently drop it. + if (descriptor.HeaderType == HttpHeaderType.Content) + { + response.Content.Headers.TryAddWithoutValidation(descriptor, headerValue); + } + else + { + response.Headers.TryAddWithoutValidation(descriptor, headerValue); + } + } + + private static bool IsDigit(byte c) => (uint)(c - '0') <= '9' - '0'; + + private void WriteToBuffer(ReadOnlyMemory source) + { + Debug.Assert(source.Length <= _writeBuffer.Length - _writeOffset); + source.Span.CopyTo(new Span(_writeBuffer, _writeOffset, source.Length)); + _writeOffset += source.Length; + } + + private async Task WriteAsync(ReadOnlyMemory source) + { + int remaining = _writeBuffer.Length - _writeOffset; + + if (source.Length <= remaining) + { + // Fits in current write buffer. Just copy and return. + WriteToBuffer(source); + return; + } + + if (_writeOffset != 0) + { + // Fit what we can in the current write buffer and flush it. + WriteToBuffer(source.Slice(0, remaining)); + source = source.Slice(remaining); + await FlushAsync().ConfigureAwait(false); + } + + if (source.Length >= _writeBuffer.Length) + { + // Large write. No sense buffering this. Write directly to stream. + // TODO #27362: CONSIDER: May want to be a bit smarter here? Think about how large writes should work... + await WriteToStreamAsync(source).ConfigureAwait(false); + } + else + { + // Copy remainder into buffer + WriteToBuffer(source); + } + } + + private ValueTask WriteWithoutBufferingAsync(ReadOnlyMemory source) + { + if (_writeOffset == 0) + { + // There's nothing in the write buffer we need to flush. + // Just write the supplied data out to the stream. + return WriteToStreamAsync(source); + } + + int remaining = _writeBuffer.Length - _writeOffset; + if (source.Length <= remaining) + { + // There's something already in the write buffer, but the content + // we're writing can also fit after it in the write buffer. Copy + // the content to the write buffer and then flush it, so that we + // can do a single send rather than two. + WriteToBuffer(source); + return FlushAsync(); + } + + // There's data in the write buffer and the data we're writing doesn't fit after it. + // Do two writes, one to flush the buffer and then another to write the supplied content. + return new ValueTask(FlushThenWriteWithoutBufferingAsync(source)); + } + + private async Task FlushThenWriteWithoutBufferingAsync(ReadOnlyMemory source) + { + await FlushAsync().ConfigureAwait(false); + await WriteToStreamAsync(source).ConfigureAwait(false); + } + + private Task WriteByteAsync(byte b) + { + if (_writeOffset < _writeBuffer.Length) + { + _writeBuffer[_writeOffset++] = b; + return Task.CompletedTask; + } + return WriteByteSlowAsync(b); + } + + private async Task WriteByteSlowAsync(byte b) + { + Debug.Assert(_writeOffset == _writeBuffer.Length); + await WriteToStreamAsync(_writeBuffer).ConfigureAwait(false); + + _writeBuffer[0] = b; + _writeOffset = 1; + } + + private Task WriteTwoBytesAsync(byte b1, byte b2) + { + if (_writeOffset <= _writeBuffer.Length - 2) + { + byte[] buffer = _writeBuffer; + buffer[_writeOffset++] = b1; + buffer[_writeOffset++] = b2; + return Task.CompletedTask; + } + return WriteTwoBytesSlowAsync(b1, b2); + } + + private async Task WriteTwoBytesSlowAsync(byte b1, byte b2) + { + await WriteByteAsync(b1).ConfigureAwait(false); + await WriteByteAsync(b2).ConfigureAwait(false); + } + + private Task WriteBytesAsync(byte[] bytes) + { + if (_writeOffset <= _writeBuffer.Length - bytes.Length) + { + Buffer.BlockCopy(bytes, 0, _writeBuffer, _writeOffset, bytes.Length); + _writeOffset += bytes.Length; + return Task.CompletedTask; + } + return WriteBytesSlowAsync(bytes); + } + + private async Task WriteBytesSlowAsync(byte[] bytes) + { + int offset = 0; + while (true) + { + int remaining = bytes.Length - offset; + int toCopy = Math.Min(remaining, _writeBuffer.Length - _writeOffset); + Buffer.BlockCopy(bytes, offset, _writeBuffer, _writeOffset, toCopy); + _writeOffset += toCopy; + offset += toCopy; + + Debug.Assert(offset <= bytes.Length, $"Expected {nameof(offset)} to be <= {bytes.Length}, got {offset}"); + Debug.Assert(_writeOffset <= _writeBuffer.Length, $"Expected {nameof(_writeOffset)} to be <= {_writeBuffer.Length}, got {_writeOffset}"); + if (offset == bytes.Length) + { + break; + } + else if (_writeOffset == _writeBuffer.Length) + { + await WriteToStreamAsync(_writeBuffer).ConfigureAwait(false); + _writeOffset = 0; + } + } + } + + private Task WriteStringAsync(string s) + { + // If there's enough space in the buffer to just copy all of the string's bytes, do so. + // Unlike WriteAsciiStringAsync, validate each char along the way. + int offset = _writeOffset; + if (s.Length <= _writeBuffer.Length - offset) + { + byte[] writeBuffer = _writeBuffer; + foreach (char c in s) + { + if ((c & 0xFF80) != 0) + { + throw new HttpRequestException(SR.net_http_request_invalid_char_encoding); + } + writeBuffer[offset++] = (byte)c; + } + _writeOffset = offset; + return Task.CompletedTask; + } + + // Otherwise, fall back to doing a normal slow string write; we could optimize away + // the extra checks later, but the case where we cross a buffer boundary should be rare. + return WriteStringAsyncSlow(s); + } + + private Task WriteAsciiStringAsync(string s) + { + // If there's enough space in the buffer to just copy all of the string's bytes, do so. + int offset = _writeOffset; + if (s.Length <= _writeBuffer.Length - offset) + { + byte[] writeBuffer = _writeBuffer; + foreach (char c in s) + { + writeBuffer[offset++] = (byte)c; + } + _writeOffset = offset; + return Task.CompletedTask; + } + + // Otherwise, fall back to doing a normal slow string write; we could optimize away + // the extra checks later, but the case where we cross a buffer boundary should be rare. + return WriteStringAsyncSlow(s); + } + + private async Task WriteStringAsyncSlow(string s) + { + for (int i = 0; i < s.Length; i++) + { + char c = s[i]; + if ((c & 0xFF80) != 0) + { + throw new HttpRequestException(SR.net_http_request_invalid_char_encoding); + } + await WriteByteAsync((byte)c).ConfigureAwait(false); + } + } + + private ValueTask FlushAsync() + { + if (_writeOffset > 0) + { + ValueTask t = WriteToStreamAsync(new ReadOnlyMemory(_writeBuffer, 0, _writeOffset)); + _writeOffset = 0; + return t; + } + return default; + } + + private ValueTask WriteToStreamAsync(ReadOnlyMemory source) + { + if (NetEventSource.IsEnabled) Trace($"Writing {source.Length} bytes."); + return _stream.WriteAsync(source); + } + + private bool TryReadNextLine(out ReadOnlySpan line) + { + var buffer = new ReadOnlySpan(_readBuffer, _readOffset, _readLength - _readOffset); + int length = buffer.IndexOf((byte)'\n'); + if (length < 0) + { + if (_allowedReadLineBytes < buffer.Length) + { + ThrowInvalidHttpResponse(); + } + + line = default; + return false; + } + + int bytesConsumed = length + 1; + _readOffset += bytesConsumed; + _allowedReadLineBytes -= bytesConsumed; + ThrowIfExceededAllowedReadLineBytes(); + + line = buffer.Slice(0, length > 0 && buffer[length - 1] == '\r' ? length - 1 : length); + return true; + } + + private async ValueTask> ReadNextResponseHeaderLineAsync(bool foldedHeadersAllowed = false) + { + int previouslyScannedBytes = 0; + while (true) + { + int scanOffset = _readOffset + previouslyScannedBytes; + int lfIndex = Array.IndexOf(_readBuffer, (byte)'\n', scanOffset, _readLength - scanOffset); + if (lfIndex >= 0) + { + int startIndex = _readOffset; + int length = lfIndex - startIndex; + if (lfIndex > 0 && _readBuffer[lfIndex - 1] == '\r') + { + length--; + } + + // If this isn't the ending header, we need to account for the possibility + // of folded headers, which per RFC2616 are headers split across multiple + // lines, where the continuation line begins with a space or horizontal tab. + // The feature was deprecated in RFC 7230 3.2.4, but some servers still use it. + if (foldedHeadersAllowed && length > 0) + { + // If the newline is the last character we've buffered, we need at least + // one more character in order to see whether it's space/tab, in which + // case it's a folded header. + if (lfIndex + 1 == _readLength) + { + // The LF is at the end of the buffer, so we need to read more + // to determine whether there's a continuation. We'll read + // and then loop back around again, but to avoid needing to + // rescan the whole header, reposition to one character before + // the newline so that we'll find it quickly. + int backPos = _readBuffer[lfIndex - 1] == '\r' ? lfIndex - 2 : lfIndex - 1; + Debug.Assert(backPos >= 0); + previouslyScannedBytes = backPos - _readOffset; + _allowedReadLineBytes -= backPos - scanOffset; + ThrowIfExceededAllowedReadLineBytes(); + await FillAsync().ConfigureAwait(false); + continue; + } + + // We have at least one more character we can look at. + Debug.Assert(lfIndex + 1 < _readLength); + char nextChar = (char)_readBuffer[lfIndex + 1]; + if (nextChar == ' ' || nextChar == '\t') + { + // The next header is a continuation. + + // Folded headers are only allowed within header field values, not within header field names, + // so if we haven't seen a colon, this is invalid. + if (Array.IndexOf(_readBuffer, (byte)':', _readOffset, lfIndex - _readOffset) == -1) + { + ThrowInvalidHttpResponse(); + } + + // When we return the line, we need the interim newlines filtered out. According + // to RFC 7230 3.2.4, a valid approach to dealing with them is to "replace each + // received obs-fold with one or more SP octets prior to interpreting the field + // value or forwarding the message downstream", so that's what we do. + _readBuffer[lfIndex] = (byte)' '; + if (_readBuffer[lfIndex - 1] == '\r') + { + _readBuffer[lfIndex - 1] = (byte)' '; + } + + // Update how much we've read, and simply go back to search for the next newline. + previouslyScannedBytes = (lfIndex + 1 - _readOffset); + _allowedReadLineBytes -= (lfIndex + 1 - scanOffset); + ThrowIfExceededAllowedReadLineBytes(); + continue; + } + + // Not at the end of a header with a continuation. + } + + // Advance read position past the LF + _allowedReadLineBytes -= lfIndex + 1 - scanOffset; + ThrowIfExceededAllowedReadLineBytes(); + _readOffset = lfIndex + 1; + + return new ArraySegment(_readBuffer, startIndex, length); + } + + // Couldn't find LF. Read more. Note this may cause _readOffset to change. + previouslyScannedBytes = _readLength - _readOffset; + _allowedReadLineBytes -= _readLength - scanOffset; + ThrowIfExceededAllowedReadLineBytes(); + await FillAsync().ConfigureAwait(false); + } + } + + private void ThrowIfExceededAllowedReadLineBytes() + { + if (_allowedReadLineBytes < 0) + { + ThrowInvalidHttpResponse(); + } + } + + // Throws IOException on EOF. This is only called when we expect more data. + private async Task FillAsync() + { + Debug.Assert(_readAheadTask == null); + + int remaining = _readLength - _readOffset; + Debug.Assert(remaining >= 0); + + if (remaining == 0) + { + // No data in the buffer. Simply reset the offset and length to 0 to allow + // the whole buffer to be filled. + _readOffset = _readLength = 0; + } + else if (_readOffset > 0) + { + // There's some data in the buffer but it's not at the beginning. Shift it + // down to make room for more. + Buffer.BlockCopy(_readBuffer, _readOffset, _readBuffer, 0, remaining); + _readOffset = 0; + _readLength = remaining; + } + else if (remaining == _readBuffer.Length) + { + // The whole buffer is full, but the caller is still requesting more data, + // so increase the size of the buffer. + Debug.Assert(_readOffset == 0); + Debug.Assert(_readLength == _readBuffer.Length); + + byte[] newReadBuffer = new byte[_readBuffer.Length * 2]; + Buffer.BlockCopy(_readBuffer, 0, newReadBuffer, 0, remaining); + _readBuffer = newReadBuffer; + _readOffset = 0; + _readLength = remaining; + } + + int bytesRead = await _stream.ReadAsync(new Memory(_readBuffer, _readLength, _readBuffer.Length - _readLength)).ConfigureAwait(false); + + if (NetEventSource.IsEnabled) Trace($"Received {bytesRead} bytes."); + if (bytesRead == 0) + { + throw new IOException(SR.net_http_invalid_response); + } + + _readLength += bytesRead; + } + + private void ReadFromBuffer(Span buffer) + { + Debug.Assert(buffer.Length <= _readLength - _readOffset); + + new Span(_readBuffer, _readOffset, buffer.Length).CopyTo(buffer); + _readOffset += buffer.Length; + } + + private async ValueTask ReadAsync(Memory destination) + { + // This is called when reading the response body. + + int remaining = _readLength - _readOffset; + if (remaining > 0) + { + // We have data in the read buffer. Return it to the caller. + if (destination.Length <= remaining) + { + ReadFromBuffer(destination.Span); + return destination.Length; + } + else + { + ReadFromBuffer(destination.Span.Slice(0, remaining)); + return remaining; + } + } + + // No data in read buffer. + // Do an unbuffered read directly against the underlying stream. + Debug.Assert(_readAheadTask == null, "Read ahead task should have been consumed as part of the headers."); + int count = await _stream.ReadAsync(destination).ConfigureAwait(false); + if (NetEventSource.IsEnabled) Trace($"Received {count} bytes."); + return count; + } + + private ValueTask ReadBufferedAsync(Memory destination) + { + // If the caller provided buffer, and thus the amount of data desired to be read, + // is larger than the internal buffer, there's no point going through the internal + // buffer, so just do an unbuffered read. + return destination.Length >= _readBuffer.Length ? + ReadAsync(destination) : + ReadBufferedAsyncCore(destination); + } + + private async ValueTask ReadBufferedAsyncCore(Memory destination) + { + // This is called when reading the response body. + + int remaining = _readLength - _readOffset; + if (remaining > 0) + { + // We have data in the read buffer. Return it to the caller. + if (destination.Length <= remaining) + { + ReadFromBuffer(destination.Span); + return destination.Length; + } + else + { + ReadFromBuffer(destination.Span.Slice(0, remaining)); + return remaining; + } + } + + // No data in read buffer. + _readOffset = _readLength = 0; + + // Do a buffered read directly against the underlying stream. + Debug.Assert(_readAheadTask == null, "Read ahead task should have been consumed as part of the headers."); + int bytesRead = await _stream.ReadAsync(_readBuffer.AsMemory()).ConfigureAwait(false); + if (NetEventSource.IsEnabled) Trace($"Received {bytesRead} bytes."); + _readLength = bytesRead; + + // Hand back as much data as we can fit. + int bytesToCopy = Math.Min(bytesRead, destination.Length); + _readBuffer.AsSpan(0, bytesToCopy).CopyTo(destination.Span); + _readOffset = bytesToCopy; + return bytesToCopy; + } + + private async Task CopyFromBufferAsync(Stream destination, int count, CancellationToken cancellationToken) + { + Debug.Assert(count <= _readLength - _readOffset); + + if (NetEventSource.IsEnabled) Trace($"Copying {count} bytes to stream."); + await destination.WriteAsync(new ReadOnlyMemory(_readBuffer, _readOffset, count), cancellationToken).ConfigureAwait(false); + _readOffset += count; + } + + private Task CopyToUntilEofAsync(Stream destination, int bufferSize, CancellationToken cancellationToken) + { + Debug.Assert(destination != null); + + int remaining = _readLength - _readOffset; + return remaining > 0 ? + CopyToUntilEofWithExistingBufferedDataAsync(destination, cancellationToken) : + _stream.CopyToAsync(destination, bufferSize, cancellationToken); + } + + private async Task CopyToUntilEofWithExistingBufferedDataAsync(Stream destination, CancellationToken cancellationToken) + { + int remaining = _readLength - _readOffset; + Debug.Assert(remaining > 0); + + await CopyFromBufferAsync(destination, remaining, cancellationToken).ConfigureAwait(false); + _readLength = _readOffset = 0; + + await _stream.CopyToAsync(destination).ConfigureAwait(false); + } + + // Copy *exactly* [length] bytes into destination; throws on end of stream. + private async Task CopyToExactLengthAsync(Stream destination, ulong length, CancellationToken cancellationToken) + { + Debug.Assert(destination != null); + Debug.Assert(length > 0); + + int remaining = _readLength - _readOffset; + if (remaining > 0) + { + if ((ulong)remaining > length) + { + remaining = (int)length; + } + await CopyFromBufferAsync(destination, remaining, cancellationToken).ConfigureAwait(false); + + length -= (ulong)remaining; + if (length == 0) + { + return; + } + } + + while (true) + { + await FillAsync().ConfigureAwait(false); + + remaining = (ulong)_readLength < length ? _readLength : (int)length; + await CopyFromBufferAsync(destination, remaining, cancellationToken).ConfigureAwait(false); + + length -= (ulong)remaining; + if (length == 0) + { + return; + } + } + } + + public void Acquire() + { + Debug.Assert(_currentRequest == null); + Debug.Assert(!_inUse); + + _inUse = true; + } + + public void Release() + { + Debug.Assert(_inUse); + + _inUse = false; + + // If the last request already completed (because the response had no content), return the connection to the pool now. + // Otherwise, it will be returned when the response has been consumed and CompleteResponse below is called. + if (_currentRequest == null) + { + ReturnConnectionToPool(); + } + } + + private void CompleteResponse() + { + Debug.Assert(_currentRequest != null, "Expected the connection to be associated with a request."); + Debug.Assert(_writeOffset == 0, "Everything in write buffer should have been flushed."); + + // Disassociate the connection from a request. + _currentRequest = null; + + // If we have extraneous data in the read buffer, don't reuse the connection; + // otherwise we'd interpret this as part of the next response. + if (RemainingBuffer.Length != 0) + { + if (NetEventSource.IsEnabled) + { + Trace("Unexpected data on connection after response read."); + } + + ConsumeFromRemainingBuffer(RemainingBuffer.Length); + _connectionClose = true; + } + + // If the connection is no longer in use (i.e. for NT authentication), then we can return it to the pool now. + // Otherwise, it will be returned when the connection is no longer in use (i.e. Release above is called). + if (!_inUse) + { + ReturnConnectionToPool(); + } + } + + public async Task DrainResponseAsync(HttpResponseMessage response) + { + Debug.Assert(_inUse); + + if (_connectionClose) + { + throw new HttpRequestException(SR.net_http_authconnectionfailure); + } + + HttpContentReadStream responseStream = (HttpContentReadStream)await response.Content.ReadAsStreamAsync().ConfigureAwait(false); + + if (responseStream.NeedsDrain) + { + Debug.Assert(response.RequestMessage == _currentRequest); + + if (!await responseStream.DrainAsync(_pool.Settings._maxResponseDrainSize).ConfigureAwait(false) || + _connectionClose) // Draining may have set this + { + throw new HttpRequestException(SR.net_http_authconnectionfailure); + } + } + + Debug.Assert(_currentRequest == null); + + response.Dispose(); + } + + private void ReturnConnectionToPool() + { + Debug.Assert(_currentRequest == null, "Connection should no longer be associated with a request."); + Debug.Assert(_readAheadTask == null, "Expected a previous initial read to already be consumed."); + Debug.Assert(RemainingBuffer.Length == 0, "Unexpected data in connection read buffer."); + + // If we decided not to reuse the connection (either because the server sent Connection: close, + // or there was some other problem while processing the request that makes the connection unusable), + // don't put the connection back in the pool. + if (_connectionClose) + { + if (NetEventSource.IsEnabled) + { + Trace("Connection will not be reused."); + } + + // We're not putting the connection back in the pool. Dispose it. + Dispose(); + } + else + { + // Put connection back in the pool. + _pool.ReturnConnection(this); + } + } + + private static bool EqualsOrdinal(string left, Span right) + { + Debug.Assert(left != null, "Expected non-null string"); + + if (left.Length != right.Length) + { + return false; + } + + for (int i = 0; i < left.Length; i++) + { + if (left[i] != right[i]) + { + return false; + } + } + + return true; + } + + public sealed override string ToString() => $"{nameof(HttpConnection)}({_pool})"; // Description for diagnostic purposes + + private static void ThrowInvalidHttpResponse() => throw new HttpRequestException(SR.net_http_invalid_response); + + private static void ThrowInvalidHttpResponse(Exception innerException) => throw new HttpRequestException(SR.net_http_invalid_response, innerException); + + internal void Trace(string message, [CallerMemberName] string memberName = null) => + NetEventSource.Log.HandlerMessage( + _pool?.GetHashCode() ?? 0, // pool ID + GetHashCode(), // connection ID + _currentRequest?.GetHashCode() ?? 0, // request ID + memberName, // method name + ToString() + ": " + message); // message + } + + internal sealed class HttpConnectionWithFinalizer : HttpConnection + { + public HttpConnectionWithFinalizer(HttpConnectionPool pool, Socket socket, Stream stream, TransportContext transportContext) : base(pool, socket, stream, transportContext) { } + + // This class is separated from HttpConnection so we only pay the price of having a finalizer + // when it's actually needed, e.g. when MaxConnectionsPerServer is enabled. + ~HttpConnectionWithFinalizer() => Dispose(disposing: false); + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionHandler.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionHandler.cs new file mode 100644 index 0000000000..59d440f4bf --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionHandler.cs @@ -0,0 +1,34 @@ +// 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.Threading; +using System.Threading.Tasks; + +namespace System.Net.Http +{ + internal sealed class HttpConnectionHandler : HttpMessageHandler + { + private readonly HttpConnectionPoolManager _poolManager; + + public HttpConnectionHandler(HttpConnectionPoolManager poolManager) + { + _poolManager = poolManager; + } + + protected internal override Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) + { + return _poolManager.SendAsync(request, doRequestAuth:false, cancellationToken); + } + + protected override void Dispose(bool disposing) + { + if (disposing) + { + _poolManager.Dispose(); + } + + base.Dispose(disposing); + } + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionKind.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionKind.cs new file mode 100644 index 0000000000..b89bb74c66 --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionKind.cs @@ -0,0 +1,16 @@ +// 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.Net.Http +{ + internal enum HttpConnectionKind : byte + { + Http, + Https, + Proxy, + ProxyTunnel, // Non-secure connection tunneled through proxy. + SslProxyTunnel, // SSL connection tunneled through proxy. + ProxyConnect // Connection used for proxy CONNECT. Tunnel will be established on top of this. + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpConnectionPool.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionPool.cs similarity index 56% rename from external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpConnectionPool.cs rename to external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionPool.cs index c0b74d0a0b..2bd2ff8145 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpConnectionPool.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionPool.cs @@ -4,8 +4,13 @@ using System.Collections.Generic; using System.Diagnostics; +using System.IO; +using System.Net.Security; +using System.Net.Sockets; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using System.Security.Authentication; +using System.Text; using System.Threading; using System.Threading.Tasks; @@ -14,14 +19,24 @@ namespace System.Net.Http /// Provides a pool of connections to the same endpoint. internal sealed class HttpConnectionPool : IDisposable { - /// Maximum number of milliseconds a connection is allowed to be idle in the pool before we remove it. - private const int MaxIdleTimeMilliseconds = 100_000; + private static readonly bool s_isWindows7Or2008R2 = GetIsWindows7Or2008R2(); + + private readonly HttpConnectionPoolManager _poolManager; + private readonly HttpConnectionKind _kind; + private readonly string _host; + private readonly int _port; + private readonly Uri _proxyUri; /// List of idle connections stored in the pool. private readonly List _idleConnections = new List(); /// The maximum number of connections allowed to be associated with the pool. private readonly int _maxConnections; + /// For non-proxy connection pools, this is the host name in bytes; for proxies, null. + private readonly byte[] _hostHeaderValueBytes; + /// Options specialized and cached for this pool and its . + private readonly SslClientAuthenticationOptions _sslOptions; + /// The head of a list of waiters waiting for a connection. Null if no one's waiting. private ConnectionWaiter _waitersHead; /// The tail of a list of waiters waiting for a connection. Null if no one's waiting. @@ -33,25 +48,143 @@ namespace System.Net.Http private bool _usedSinceLastCleanup = true; /// Whether the pool has been disposed. private bool _disposed; - + + private const int DefaultHttpPort = 80; + private const int DefaultHttpsPort = 443; + /// Initializes the pool. /// The maximum number of connections allowed to be associated with the pool at any given time. - public HttpConnectionPool(int maxConnections = int.MaxValue) // int.MaxValue treated as infinite + /// + public HttpConnectionPool(HttpConnectionPoolManager poolManager, HttpConnectionKind kind, string host, int port, string sslHostName, Uri proxyUri, int maxConnections) { + _poolManager = poolManager; + _kind = kind; + _host = host; + _port = port; + _proxyUri = proxyUri; _maxConnections = maxConnections; + + switch (kind) + { + case HttpConnectionKind.Http: + Debug.Assert(host != null); + Debug.Assert(port != 0); + Debug.Assert(sslHostName == null); + Debug.Assert(proxyUri == null); + break; + + case HttpConnectionKind.Https: + Debug.Assert(host != null); + Debug.Assert(port != 0); + Debug.Assert(sslHostName != null); + Debug.Assert(proxyUri == null); + + _sslOptions = ConstructSslOptions(poolManager, sslHostName); + break; + + case HttpConnectionKind.Proxy: + Debug.Assert(host == null); + Debug.Assert(port == 0); + Debug.Assert(sslHostName == null); + Debug.Assert(proxyUri != null); + break; + + case HttpConnectionKind.ProxyTunnel: + Debug.Assert(host != null); + Debug.Assert(port != 0); + Debug.Assert(sslHostName == null); + Debug.Assert(proxyUri != null); + break; + + case HttpConnectionKind.SslProxyTunnel: + Debug.Assert(host != null); + Debug.Assert(port != 0); + Debug.Assert(sslHostName != null); + Debug.Assert(proxyUri != null); + + _sslOptions = ConstructSslOptions(poolManager, sslHostName); + break; + + case HttpConnectionKind.ProxyConnect: + Debug.Assert(host != null); + Debug.Assert(port != 0); + Debug.Assert(sslHostName == null); + Debug.Assert(proxyUri != null); + Debug.Assert(proxyUri.IdnHost == host && proxyUri.Port == port); + break; + + default: + Debug.Fail("Unkown HttpConnectionKind in HttpConnectionPool.ctor"); + break; + } + + if (_host != null) + { + // Precalculate ASCII bytes for Host header + // Note that if _host is null, this is a (non-tunneled) proxy connection, and we can't cache the hostname. + string hostHeader = + (_port != (_sslOptions == null ? DefaultHttpPort : DefaultHttpsPort)) ? + $"{_host}:{_port}" : + _host; + + // Note the IDN hostname should always be ASCII, since it's already been IDNA encoded. + _hostHeaderValueBytes = Encoding.ASCII.GetBytes(hostHeader); + Debug.Assert(Encoding.ASCII.GetString(_hostHeaderValueBytes) == hostHeader); + } + + // Set up for PreAuthenticate. Access to this cache is guarded by a lock on the cache itself. + if (_poolManager.Settings._preAuthenticate) + { + PreAuthCredentials = new CredentialCache(); + } } + private static SslClientAuthenticationOptions ConstructSslOptions(HttpConnectionPoolManager poolManager, string sslHostName) + { + Debug.Assert(sslHostName != null); + + SslClientAuthenticationOptions sslOptions = poolManager.Settings._sslOptions?.ShallowClone() ?? new SslClientAuthenticationOptions(); + sslOptions.ApplicationProtocols = null; // explicitly ignore any ApplicationProtocols set + sslOptions.TargetHost = sslHostName; // always use the key's name rather than whatever was specified + + // Windows 7 and Windows 2008 R2 support TLS 1.1 and 1.2, but for legacy reasons by default those protocols + // are not enabled when a developer elects to use the system default. However, in .NET Core 2.0 and earlier, + // HttpClientHandler would enable them, due to being a wrapper for WinHTTP, which enabled them. Both for + // compatibility and because we prefer those higher protocols whenever possible, SocketsHttpHandler also + // pretends they're part of the default when running on Win7/2008R2. + if (s_isWindows7Or2008R2 && sslOptions.EnabledSslProtocols == SslProtocols.None) + { + if (NetEventSource.IsEnabled) + { + NetEventSource.Info(poolManager, $"Win7OrWin2K8R2 platform, Changing default TLS protocols to {SecurityProtocol.DefaultSecurityProtocols}"); + } + sslOptions.EnabledSslProtocols = SecurityProtocol.DefaultSecurityProtocols; + } + + return sslOptions; + } + + public HttpConnectionSettings Settings => _poolManager.Settings; + public bool IsSecure => _sslOptions != null; + public bool UsingProxy => _kind == HttpConnectionKind.Proxy; // Tunnel doesn't count, only direct proxy usage + public Uri ProxyUri => _proxyUri; + public ICredentials ProxyCredentials => _poolManager.ProxyCredentials; + public byte[] HostHeaderValueBytes => _hostHeaderValueBytes; + public CredentialCache PreAuthCredentials { get; } + /// Object used to synchronize access to state in the pool. private object SyncObj => _idleConnections; - public ValueTask GetConnectionAsync( - Func> createConnection, TState state, CancellationToken cancellationToken) + private ValueTask<(HttpConnection, HttpResponseMessage)> GetConnectionAsync(HttpRequestMessage request, CancellationToken cancellationToken) { if (cancellationToken.IsCancellationRequested) { - return new ValueTask(Task.FromCanceled(cancellationToken)); + return new ValueTask<(HttpConnection, HttpResponseMessage)>(Task.FromCanceled<(HttpConnection, HttpResponseMessage)>(cancellationToken)); } + TimeSpan pooledConnectionLifetime = _poolManager.Settings._pooledConnectionLifetime; + TimeSpan pooledConnectionIdleTimeout = _poolManager.Settings._pooledConnectionIdleTimeout; + DateTimeOffset now = DateTimeOffset.UtcNow; List list = _idleConnections; lock (SyncObj) { @@ -63,11 +196,12 @@ namespace System.Net.Http HttpConnection conn = cachedConnection._connection; list.RemoveAt(list.Count - 1); - if (cachedConnection.IsUsable()) + if (cachedConnection.IsUsable(now, pooledConnectionLifetime, pooledConnectionIdleTimeout) && + !conn.EnsureReadAheadAndPollRead()) { - // We found a valid collection. Return it. + // We found a valid connection. Return it. if (NetEventSource.IsEnabled) conn.Trace("Found usable connection in pool."); - return new ValueTask(conn); + return new ValueTask<(HttpConnection, HttpResponseMessage)>((conn, null)); } // We got a connection, but it was already closed by the server or the @@ -85,7 +219,7 @@ namespace System.Net.Http { if (NetEventSource.IsEnabled) Trace("Creating new connection for pool."); IncrementConnectionCountNoLock(); - return WaitForCreatedConnectionAsync(createConnection(state, cancellationToken)); + return WaitForCreatedConnectionAsync(CreateConnectionAsync(request, cancellationToken)); } else { @@ -97,7 +231,7 @@ namespace System.Net.Http // space is available and the provided creation func has successfully // created the connection to be used. if (NetEventSource.IsEnabled) Trace("Limit reached. Waiting to create new connection."); - var waiter = new ConnectionWaiter(this, createConnection, state, cancellationToken); + var waiter = new ConnectionWaiter(this, request, cancellationToken); EnqueueWaiter(waiter); if (cancellationToken.CanBeCanceled) { @@ -118,7 +252,7 @@ namespace System.Net.Http } }, waiter); } - return new ValueTask(waiter.Task); + return new ValueTask<(HttpConnection, HttpResponseMessage)>(waiter.Task); } // Note that we don't check for _disposed. We may end up disposing the @@ -132,6 +266,135 @@ namespace System.Net.Http } } + public async Task SendWithRetryAsync(HttpRequestMessage request, bool doRequestAuth, CancellationToken cancellationToken) + { + while (true) + { + // Loop on connection failures and retry if possible. + + (HttpConnection connection, HttpResponseMessage response) = await GetConnectionAsync(request, cancellationToken).ConfigureAwait(false); + if (response != null) + { + // Proxy tunnel failure; return proxy response + return response; + } + + bool isNewConnection = connection.IsNewConnection; + + connection.Acquire(); + try + { + return await connection.SendAsync(request, doRequestAuth, cancellationToken).ConfigureAwait(false); + } + catch (HttpRequestException e) when (!isNewConnection && e.InnerException is IOException && connection.CanRetry) + { + // Eat exception and try again. + } + finally + { + connection.Release(); + } + } + } + + public Task SendWithProxyAuthAsync(HttpRequestMessage request, bool doRequestAuth, CancellationToken cancellationToken) + { + if ((_kind == HttpConnectionKind.Proxy || _kind == HttpConnectionKind.ProxyConnect) && + _poolManager.ProxyCredentials != null) + { + return AuthenticationHelper.SendWithProxyAuthAsync(request, _proxyUri, _poolManager.ProxyCredentials, doRequestAuth, this, cancellationToken); + } + + return SendWithRetryAsync(request, doRequestAuth, cancellationToken); + } + + public Task SendAsync(HttpRequestMessage request, bool doRequestAuth, CancellationToken cancellationToken) + { + if (doRequestAuth && Settings._credentials != null) + { + return AuthenticationHelper.SendWithRequestAuthAsync(request, Settings._credentials, Settings._preAuthenticate, this, cancellationToken); + } + + return SendWithProxyAuthAsync(request, doRequestAuth, cancellationToken); + } + + private async ValueTask<(HttpConnection, HttpResponseMessage)> CreateConnectionAsync(HttpRequestMessage request, CancellationToken cancellationToken) + { + // If a non-infinite connect timeout has been set, create and use a new CancellationToken that'll be canceled + // when either the original token is canceled or a connect timeout occurs. + CancellationTokenSource cancellationWithConnectTimeout = null; + if (Settings._connectTimeout != Timeout.InfiniteTimeSpan) + { + cancellationWithConnectTimeout = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, default); + cancellationWithConnectTimeout.CancelAfter(Settings._connectTimeout); + cancellationToken = cancellationWithConnectTimeout.Token; + } + + try + { + Socket socket = null; + Stream stream = null; + switch (_kind) + { + case HttpConnectionKind.Http: + case HttpConnectionKind.Https: + case HttpConnectionKind.ProxyConnect: + (socket, stream) = await ConnectHelper.ConnectAsync(_host, _port, cancellationToken).ConfigureAwait(false); + break; + + case HttpConnectionKind.Proxy: + (socket, stream) = await ConnectHelper.ConnectAsync(_proxyUri.IdnHost, _proxyUri.Port, cancellationToken).ConfigureAwait(false); + break; + + case HttpConnectionKind.ProxyTunnel: + case HttpConnectionKind.SslProxyTunnel: + HttpResponseMessage response; + (stream, response) = await EstablishProxyTunnel(cancellationToken).ConfigureAwait(false); + if (response != null) + { + // Return non-success response from proxy. + response.RequestMessage = request; + return (null, response); + } + break; + } + + TransportContext transportContext = null; + if (_sslOptions != null) + { + SslStream sslStream = await ConnectHelper.EstablishSslConnectionAsync(_sslOptions, request, stream, cancellationToken).ConfigureAwait(false); + stream = sslStream; + transportContext = sslStream.TransportContext; + } + + HttpConnection connection = _maxConnections == int.MaxValue ? + new HttpConnection(this, socket, stream, transportContext) : + new HttpConnectionWithFinalizer(this, socket, stream, transportContext); // finalizer needed to signal the pool when a connection is dropped + return (connection, null); + } + finally + { + cancellationWithConnectTimeout?.Dispose(); + } + } + + // Returns the established stream or an HttpResponseMessage from the proxy indicating failure. + private async ValueTask<(Stream, HttpResponseMessage)> EstablishProxyTunnel(CancellationToken cancellationToken) + { + // Send a CONNECT request to the proxy server to establish a tunnel. + HttpRequestMessage tunnelRequest = new HttpRequestMessage(HttpMethod.Connect, _proxyUri); + tunnelRequest.Headers.Host = $"{_host}:{_port}"; // This specifies destination host/port to connect to + + HttpResponseMessage tunnelResponse = await _poolManager.SendProxyConnectAsync(tunnelRequest, _proxyUri, cancellationToken).ConfigureAwait(false); + + if (tunnelResponse.StatusCode != HttpStatusCode.OK) + { + return (null, tunnelResponse); + } + + return (await tunnelResponse.Content.ReadAsStreamAsync().ConfigureAwait(false), null); + } + /// Enqueues a waiter to the waiters list. /// The waiter to add. private void EnqueueWaiter(ConnectionWaiter waiter) @@ -214,11 +477,16 @@ namespace System.Net.Http } /// Waits for and returns the created connection, decrementing the associated connection count if it fails. - private async ValueTask WaitForCreatedConnectionAsync(ValueTask creationTask) + private async ValueTask<(HttpConnection, HttpResponseMessage)> WaitForCreatedConnectionAsync(ValueTask<(HttpConnection, HttpResponseMessage)> creationTask) { try { - return await creationTask.ConfigureAwait(false); + (HttpConnection connection, HttpResponseMessage response) = await creationTask.ConfigureAwait(false); + if (connection == null) + { + DecrementConnectionCount(); + } + return (connection, response); } catch { @@ -283,7 +551,7 @@ namespace System.Net.Http // Having a waiter means there must not be any idle connections, so we need to create // one, and we do so using the logic associated with the waiter. - ValueTask connectionTask = waiter.CreateConnectionAsync(); + ValueTask<(HttpConnection, HttpResponseMessage)> connectionTask = waiter.CreateConnectionAsync(); if (connectionTask.IsCompletedSuccessfully) { // We synchronously and successfully created a connection (this is rare). @@ -301,7 +569,13 @@ namespace System.Net.Http try { // Get the resulting connection. - HttpConnection result = innerConnectionTask.GetAwaiter().GetResult(); + (HttpConnection result, HttpResponseMessage response) = innerConnectionTask.GetAwaiter().GetResult(); + + if (response != null) + { + // Proxy tunnel connect failed, so decrement the connection count. + innerWaiter._pool.DecrementConnectionCount(); + } // Store the resulting connection into the waiter. As in the synchronous case, // since we already have a count that's inflated due to the connection being @@ -337,13 +611,13 @@ namespace System.Net.Http // If there's someone waiting for a connection, simply // transfer this one to them rather than pooling it. - if (_waitersTail != null) + if (_waitersTail != null && !connection.EnsureReadAheadAndPollRead()) { ConnectionWaiter waiter = DequeueWaiter(); waiter._cancellationTokenRegistration.Dispose(); if (NetEventSource.IsEnabled) connection.Trace("Transferring connection returned to pool."); - waiter.SetResult(connection); + waiter.SetResult((connection, null)); return; } @@ -351,8 +625,9 @@ namespace System.Net.Http // If the pool has been disposed of, dispose the connection being returned, // as the pool is being deactivated. We do this after the above in order to // use pooled connections to satisfy any requests that pended before the - // the pool was disposed of. - if (_disposed) + // the pool was disposed of. We also dispose of connections if connection + // timeouts are such that the connection would immediately expire, anyway. + if (_disposed || _poolManager.AvoidStoringConnections) { if (NetEventSource.IsEnabled) connection.Trace("Disposing connection returned to disposed pool."); connection.Dispose(); @@ -365,7 +640,10 @@ namespace System.Net.Http } } - /// Disposes the + /// + /// Disposes the connection pool. This is only needed when the pool currently contains + /// or has associated connections. + /// public void Dispose() { List list = _idleConnections; @@ -391,6 +669,9 @@ namespace System.Net.Http /// public bool CleanCacheAndDisposeIfUnused() { + TimeSpan pooledConnectionLifetime = _poolManager.Settings._pooledConnectionLifetime; + TimeSpan pooledConnectionIdleTimeout = _poolManager.Settings._pooledConnectionIdleTimeout; + List list = _idleConnections; List toDispose = null; bool tookLock = false; @@ -401,11 +682,11 @@ namespace System.Net.Http // Get the current time. This is compared against each connection's last returned // time to determine whether a connection is too old and should be closed. - DateTimeOffset now = DateTimeOffset.Now; + DateTimeOffset now = DateTimeOffset.UtcNow; // Find the first item which needs to be removed. int freeIndex = 0; - while (freeIndex < list.Count && list[freeIndex].IsUsable(now)) + while (freeIndex < list.Count && list[freeIndex].IsUsable(now, pooledConnectionLifetime, pooledConnectionIdleTimeout, poll: true)) { freeIndex++; } @@ -423,7 +704,7 @@ namespace System.Net.Http { // Look for the first item to be kept. Along the way, any // that shouldn't be kept are disposed of. - while (current < list.Count && !list[current].IsUsable(now)) + while (current < list.Count && !list[current].IsUsable(now, pooledConnectionLifetime, pooledConnectionIdleTimeout, poll: true)) { toDispose.Add(list[current]._connection); current++; @@ -475,7 +756,29 @@ namespace System.Net.Http return false; } - public override string ToString() => $"{nameof(HttpConnectionPool)}(Connections:{_associatedConnectionCount})"; // Description for diagnostic purposes + /// Gets whether we're running on Windows 7 or Windows 2008 R2. + private static bool GetIsWindows7Or2008R2() + { + OperatingSystem os = Environment.OSVersion; + if (os.Platform == PlatformID.Win32NT) + { + // Both Windows 7 and Windows 2008 R2 report version 6.1. + Version v = os.Version; + return v.Major == 6 && v.Minor == 1; + } + return false; + } + + // For diagnostic purposes + public override string ToString() => + $"{nameof(HttpConnectionPool)}" + + (_proxyUri == null ? + (_sslOptions == null ? + $"http://{_host}:{_port}" : + $"https://{_host}:{_port}" + (_sslOptions.TargetHost != _host ? $", SSL TargetHost={_sslOptions.TargetHost}" : null)) : + (_sslOptions == null ? + $"Proxy {_proxyUri}" : + $"https://{_host}:{_port}/ tunnelled via Proxy {_proxyUri}" + (_sslOptions.TargetHost != _host ? $", SSL TargetHost={_sslOptions.TargetHost}" : null))); private void Trace(string message, [CallerMemberName] string memberName = null) => NetEventSource.Log.HandlerMessage( @@ -504,11 +807,9 @@ namespace System.Net.Http } /// Gets whether the connection is currently usable. - /// true if we believe the connection can be reused; otherwise, false. See comments on other overload. - public bool IsUsable() => !_connection.ReadAheadCompleted; - - /// Gets whether the connection is currently usable, factoring in expiration time. /// The current time. Passed in to amortize the cost of calling DateTime.UtcNow. + /// How long a connection can be open to be considered reusable. + /// How long a connection can have been idle in the pool to be considered reusable. /// /// true if we believe the connection can be reused; otherwise, false. There is an inherent race condition here, /// in that the server could terminate the connection or otherwise make it unusable immediately after we check it, @@ -516,63 +817,55 @@ namespace System.Net.Http /// terminate it, which would be considered a failure, so this race condition is largely benign and inherent to /// the nature of connection pooling. /// - public bool IsUsable(DateTimeOffset now) => - now - _returnedTime <= TimeSpan.FromMilliseconds(MaxIdleTimeMilliseconds) && - IsUsable(); + public bool IsUsable( + DateTimeOffset now, + TimeSpan pooledConnectionLifetime, + TimeSpan pooledConnectionIdleTimeout, + bool poll = false) + { + // Validate that the connection hasn't been idle in the pool for longer than is allowed. + if ((pooledConnectionIdleTimeout != Timeout.InfiniteTimeSpan) && (now - _returnedTime > pooledConnectionIdleTimeout)) + { + if (NetEventSource.IsEnabled) _connection.Trace($"Connection no longer usable. Idle {now - _returnedTime} > {pooledConnectionIdleTimeout}."); + return false; + } + + // Validate that the connection hasn't been alive for longer than is allowed. + if ((pooledConnectionLifetime != Timeout.InfiniteTimeSpan) && (now - _connection.CreationTime > pooledConnectionLifetime)) + { + if (NetEventSource.IsEnabled) _connection.Trace($"Connection no longer usable. Alive {now - _connection.CreationTime} > {pooledConnectionLifetime}."); + return false; + } + + // Validate that the connection hasn't received any stray data while in the pool. + if (poll && _connection.PollRead()) + { + if (NetEventSource.IsEnabled) _connection.Trace($"Connection no longer usable. Unexpected data received."); + return false; + } + + // The connection is usable. + return true; + } public bool Equals(CachedConnection other) => ReferenceEquals(other._connection, _connection); public override bool Equals(object obj) => obj is CachedConnection && Equals((CachedConnection)obj); public override int GetHashCode() => _connection?.GetHashCode() ?? 0; } - /// Provides a waiter object that supports a generic function and state type for creating connections. - private sealed class ConnectionWaiter : ConnectionWaiter - { - /// The function to invoke if/when is invoked. - private readonly Func> _createConnectionAsync; - /// The state to pass to when it's invoked. - private readonly TState _state; - - /// Initializes the waiter. - /// The function to invoke if/when is invoked. - /// The state to pass to when it's invoked. - public ConnectionWaiter(HttpConnectionPool pool, Func> func, TState state, CancellationToken cancellationToken) : - base(pool, cancellationToken) - { - _createConnectionAsync = func; - _state = state; - } - - /// Creates a connection by invoking with . - public override ValueTask CreateConnectionAsync() - { - try - { - return _createConnectionAsync(_state, _cancellationToken); - } - catch (Exception e) - { - return new ValueTask(Threading.Tasks.Task.FromException(e)); - } - } - } - /// /// Provides a waiter object that's used when we've reached the limit on connections /// associated with the pool. When a connection is available or created, it's stored /// into the waiter as a result, and if no connection is available from the pool, /// this waiter's logic is used to create the connection. /// - /// - /// Implemented as a non-generic base type with a generic derived type to support - /// passing in arbitrary funcs and associated state while minimizing allocations. - /// The method will be implemented on the derived - /// type that is able to work with the supplied state generically. - /// - private abstract class ConnectionWaiter : TaskCompletionSource + private class ConnectionWaiter : TaskCompletionSource<(HttpConnection, HttpResponseMessage)> { /// The pool with which this waiter is associated. internal readonly HttpConnectionPool _pool; + /// Request to use to create the connection. + private readonly HttpRequestMessage _request; + /// Cancellation token for the waiter. internal readonly CancellationToken _cancellationToken; /// Registration that removes the waiter from the registration list. @@ -583,15 +876,17 @@ namespace System.Net.Http internal ConnectionWaiter _prev; /// Initializes the waiter. - public ConnectionWaiter(HttpConnectionPool pool, CancellationToken cancellationToken) : base(TaskCreationOptions.RunContinuationsAsynchronously) + public ConnectionWaiter(HttpConnectionPool pool, HttpRequestMessage request, CancellationToken cancellationToken) : base(TaskCreationOptions.RunContinuationsAsynchronously) { Debug.Assert(pool != null, "Expected non-null pool"); _pool = pool; + _request = request; _cancellationToken = cancellationToken; } - + /// Creates a connection. - public abstract ValueTask CreateConnectionAsync(); + public ValueTask<(HttpConnection, HttpResponseMessage)> CreateConnectionAsync() => + _pool.CreateConnectionAsync(_request, _cancellationToken); } } } diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionPoolManager.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionPoolManager.cs new file mode 100644 index 0000000000..1e81b115e2 --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionPoolManager.cs @@ -0,0 +1,401 @@ +// 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.Collections.Concurrent; +using System.Collections.Generic; +using System.Diagnostics; +using System.Threading; +using System.Threading.Tasks; + +namespace System.Net.Http +{ + // General flow of requests through the various layers: + // + // (1) HttpConnectionPoolManager.SendAsync: Does proxy lookup + // (2) HttpConnectionPoolManager.SendAsyncCore: Find or create connection pool + // (3) HttpConnectionPool.SendAsync: Handle basic/digest request auth + // (4) HttpConnectionPool.SendWithProxyAuthAsync: Handle basic/digest proxy auth + // (5) HttpConnectionPool.SendWithRetryAsync: Retrieve connection from pool, or create new + // Also, handle retry for failures on connection reuse + // (6) HttpConnection.SendAsync: Handle negotiate/ntlm connection auth + // (7) HttpConnection.SendWithNtProxyAuthAsync: Handle negotiate/ntlm proxy auth + // (8) HttpConnection.SendAsyncCore: Write request to connection and read response + // Also, handle cookie processing + // + // Redirect and deompression handling are done above HttpConnectionPoolManager, + // in RedirectHandler and DecompressionHandler respectively. + + /// Provides a set of connection pools, each for its own endpoint. + internal sealed class HttpConnectionPoolManager : IDisposable + { + /// How frequently an operation should be initiated to clean out old pools and connections in those pools. + private readonly TimeSpan _cleanPoolTimeout; + /// The pools, indexed by endpoint. + private readonly ConcurrentDictionary _pools; + /// Timer used to initiate cleaning of the pools. + private readonly Timer _cleaningTimer; + /// The maximum number of connections allowed per pool. indicates unlimited. + private readonly int _maxConnectionsPerServer; + /// true if either of the connection timeouts is zero such that we'll never pool connections. + private readonly bool _avoidStoringConnections; + // Temporary + private readonly HttpConnectionSettings _settings; + private readonly IWebProxy _proxy; + private readonly ICredentials _proxyCredentials; + + /// + /// Keeps track of whether or not the cleanup timer is running. It helps us avoid the expensive + /// call. + /// + private bool _timerIsRunning; + /// Object used to synchronize access to state in the pool. + private object SyncObj => _pools; + + /// Initializes the pools. + public HttpConnectionPoolManager(HttpConnectionSettings settings) + { + _settings = settings; + _maxConnectionsPerServer = settings._maxConnectionsPerServer; + _avoidStoringConnections = + settings._pooledConnectionIdleTimeout == TimeSpan.Zero || + settings._pooledConnectionLifetime == TimeSpan.Zero; + _pools = new ConcurrentDictionary(); + + // Start out with the timer not running, since we have no pools. + // When it does run, run it with a frequency based on the idle timeout. + if (!_avoidStoringConnections) + { + if (settings._pooledConnectionIdleTimeout == Timeout.InfiniteTimeSpan) + { + const int DefaultScavengeSeconds = 30; + _cleanPoolTimeout = TimeSpan.FromSeconds(DefaultScavengeSeconds); + } + else + { + const int ScavengesPerIdle = 4; + const int MinScavengeSeconds = 1; + TimeSpan timerPeriod = settings._pooledConnectionIdleTimeout / ScavengesPerIdle; + _cleanPoolTimeout = timerPeriod.TotalSeconds >= MinScavengeSeconds ? timerPeriod : TimeSpan.FromSeconds(MinScavengeSeconds); + } + + bool restoreFlow = false; + try + { + // Don't capture the current ExecutionContext and its AsyncLocals onto the timer causing them to live forever + if (!ExecutionContext.IsFlowSuppressed()) + { + ExecutionContext.SuppressFlow(); + restoreFlow = true; + } + + _cleaningTimer = new Timer(s => ((HttpConnectionPoolManager)s).RemoveStalePools(), this, Timeout.Infinite, Timeout.Infinite); + } + finally + { + // Restore the current ExecutionContext + if (restoreFlow) + { + ExecutionContext.RestoreFlow(); + } + } + } + + // Figure out proxy stuff. + if (settings._useProxy) + { + _proxy = settings._proxy ?? SystemProxyInfo.ConstructSystemProxy(); + if (_proxy != null) + { + _proxyCredentials = _proxy.Credentials ?? settings._defaultProxyCredentials; + } + } + } + + public HttpConnectionSettings Settings => _settings; + public ICredentials ProxyCredentials => _proxyCredentials; + public bool AvoidStoringConnections => _avoidStoringConnections; + + private static string ParseHostNameFromHeader(string hostHeader) + { + // See if we need to trim off a port. + int colonPos = hostHeader.IndexOf(':'); + if (colonPos >= 0) + { + // There is colon, which could either be a port separator or a separator in + // an IPv6 address. See if this is an IPv6 address; if it's not, use everything + // before the colon as the host name, and if it is, use everything before the last + // colon iff the last colon is after the end of the IPv6 address (otherwise it's a + // part of the address). + int ipV6AddressEnd = hostHeader.IndexOf(']'); + if (ipV6AddressEnd == -1) + { + return hostHeader.Substring(0, colonPos); + } + else + { + colonPos = hostHeader.LastIndexOf(':'); + if (colonPos > ipV6AddressEnd) + { + return hostHeader.Substring(0, colonPos); + } + } + } + + return hostHeader; + } + + private static HttpConnectionKey GetConnectionKey(HttpRequestMessage request, Uri proxyUri, bool isProxyConnect) + { + Uri uri = request.RequestUri; + + if (isProxyConnect) + { + Debug.Assert(uri == proxyUri); + return new HttpConnectionKey(HttpConnectionKind.ProxyConnect, uri.IdnHost, uri.Port, null, proxyUri); + } + + string sslHostName = null; + if (HttpUtilities.IsSupportedSecureScheme(uri.Scheme)) + { + string hostHeader = request.Headers.Host; + if (hostHeader != null) + { + sslHostName = ParseHostNameFromHeader(hostHeader); + } + else + { + // No explicit Host header. Use host from uri. + sslHostName = uri.IdnHost; + } + } + + if (proxyUri != null) + { + Debug.Assert(HttpUtilities.IsSupportedNonSecureScheme(proxyUri.Scheme)); + if (sslHostName == null) + { + if (HttpUtilities.IsNonSecureWebSocketScheme(uri.Scheme)) + { + // Non-secure websocket connection through proxy to the destination. + return new HttpConnectionKey(HttpConnectionKind.ProxyTunnel, uri.IdnHost, uri.Port, null, proxyUri); + } + else + { + // Standard HTTP proxy usage for non-secure requests + // The destination host and port are ignored here, since these connections + // will be shared across any requests that use the proxy. + return new HttpConnectionKey(HttpConnectionKind.Proxy, null, 0, null, proxyUri); + } + } + else + { + // Tunnel SSL connection through proxy to the destination. + return new HttpConnectionKey(HttpConnectionKind.SslProxyTunnel, uri.IdnHost, uri.Port, sslHostName, proxyUri); + } + } + else if (sslHostName != null) + { + return new HttpConnectionKey(HttpConnectionKind.Https, uri.IdnHost, uri.Port, sslHostName, null); + } + else + { + return new HttpConnectionKey(HttpConnectionKind.Http, uri.IdnHost, uri.Port, null, null); + } + } + + public Task SendAsyncCore(HttpRequestMessage request, Uri proxyUri, bool doRequestAuth, bool isProxyConnect, CancellationToken cancellationToken) + { + HttpConnectionKey key = GetConnectionKey(request, proxyUri, isProxyConnect); + + HttpConnectionPool pool; + while (!_pools.TryGetValue(key, out pool)) + { + // TODO: #28863 Uri.IdnHost is missing '[', ']' characters around IPv6 address. + // So, we need to add them manually for now. + bool isNonNullIPv6address = key.Host != null && request.RequestUri.HostNameType == UriHostNameType.IPv6; + + pool = new HttpConnectionPool(this, key.Kind, isNonNullIPv6address ? "[" + key.Host + "]" : key.Host, key.Port, key.SslHostName, key.ProxyUri, _maxConnectionsPerServer); + + Debug.Assert((_cleaningTimer == null) == _avoidStoringConnections); + if (_cleaningTimer == null) + { + // There's no cleaning timer, which means we're not adding connections into pools, but we still need + // the pool object for this request. We don't need or want to add the pool to the pools, though, + // since we don't want it to sit there forever, which it would without the cleaning timer. + break; + } + + if (_pools.TryAdd(key, pool)) + { + // We need to ensure the cleanup timer is running if it isn't + // already now that we added a new connection pool. + lock (SyncObj) + { + if (!_timerIsRunning) + { + SetCleaningTimer(_cleanPoolTimeout); + } + } + break; + } + + // We created a pool and tried to add it to our pools, but some other thread got there before us. + // We don't need to Dispose the pool, as that's only needed when it contains connections + // that need to be closed. + } + + return pool.SendAsync(request, doRequestAuth, cancellationToken); + } + + public Task SendProxyConnectAsync(HttpRequestMessage request, Uri proxyUri, CancellationToken cancellationToken) + { + return SendAsyncCore(request, proxyUri, doRequestAuth:false, isProxyConnect:true, cancellationToken); + } + + public Task SendAsync(HttpRequestMessage request, bool doRequestAuth, CancellationToken cancellationToken) + { + if (_proxy == null) + { + return SendAsyncCore(request, null, doRequestAuth, isProxyConnect:false, cancellationToken); + } + + // Do proxy lookup. + Uri proxyUri = null; + try + { + if (!_proxy.IsBypassed(request.RequestUri)) + { + proxyUri = _proxy.GetProxy(request.RequestUri); + } + } + catch (Exception ex) + { + // Eat any exception from the IWebProxy and just treat it as no proxy. + // This matches the behavior of other handlers. + if (NetEventSource.IsEnabled) NetEventSource.Error(this, $"Exception from IWebProxy.GetProxy({request.RequestUri}): {ex}"); + } + + if (proxyUri != null && proxyUri.Scheme != UriScheme.Http) + { + throw new NotSupportedException(SR.net_http_invalid_proxy_scheme); + } + + return SendAsyncCore(request, proxyUri, doRequestAuth, isProxyConnect:false, cancellationToken); + } + + /// Disposes of the pools, disposing of each individual pool. + public void Dispose() + { + _cleaningTimer?.Dispose(); + + foreach (KeyValuePair pool in _pools) + { + pool.Value.Dispose(); + } + + if (_proxy is IDisposable obj) + { + obj.Dispose(); + } + } + + /// Sets and based on the specified timeout. + private void SetCleaningTimer(TimeSpan timeout) + { + try + { + _cleaningTimer.Change(timeout, timeout); + _timerIsRunning = timeout != Timeout.InfiniteTimeSpan; + } + catch (ObjectDisposedException) + { + // In a rare race condition where the timer callback was queued + // or executed and then the pool manager was disposed, the timer + // would be disposed and then calling Change on it could result + // in an ObjectDisposedException. We simply eat that. + } + } + + /// Removes unusable connections from each pool, and removes stale pools entirely. + private void RemoveStalePools() + { + if (NetEventSource.IsEnabled) NetEventSource.Enter(this); + + Debug.Assert(_cleaningTimer != null); + + // Iterate through each pool in the set of pools. For each, ask it to clear out + // any unusable connections (e.g. those which have expired, those which have been closed, etc.) + // The pool may detect that it's empty and long unused, in which case it'll dispose of itself, + // such that any connections returned to the pool to be cached will be disposed of. In such + // a case, we also remove the pool from the set of pools to avoid a leak. + foreach (KeyValuePair entry in _pools) + { + if (entry.Value.CleanCacheAndDisposeIfUnused()) + { + _pools.TryRemove(entry.Key, out HttpConnectionPool _); + } + } + + // Stop running the timer if we don't have any pools to clean up. + lock (SyncObj) + { + if (_pools.IsEmpty) + { + SetCleaningTimer(Timeout.InfiniteTimeSpan); + } + } + + // NOTE: There is a possible race condition with regards to a pool getting cleaned up at the same + // time it's about to be used for another request. The timer cleanup could start running, see that + // a pool is empty, and initiate its disposal. Concurrently, the pools could hand out the pool + // to a request looking to get a connection, because the pool may not have been removed yet + // from the pools. Worst case here is that connection will end up getting returned to an + // already disposed pool, in which case the connection will also end up getting disposed rather + // than reused. This should be a rare occurrence, so for now we don't worry about it. In the + // future, there are a variety of possible ways to address it, such as allowing connections to + // be returned to pools they weren't associated with. + + if (NetEventSource.IsEnabled) NetEventSource.Exit(this); + } + + internal readonly struct HttpConnectionKey : IEquatable + { + public readonly HttpConnectionKind Kind; + public readonly string Host; + public readonly int Port; + public readonly string SslHostName; // null if not SSL + public readonly Uri ProxyUri; + + public HttpConnectionKey(HttpConnectionKind kind, string host, int port, string sslHostName, Uri proxyUri) + { + Kind = kind; + Host = host; + Port = port; + SslHostName = sslHostName; + ProxyUri = proxyUri; + } + + // In the common case, SslHostName (when present) is equal to Host. If so, don't include in hash. + public override int GetHashCode() => + (SslHostName == Host ? + HashCode.Combine(Kind, Host, Port, ProxyUri) : + HashCode.Combine(Kind, Host, Port, SslHostName, ProxyUri)); + + public override bool Equals(object obj) => + obj != null && + obj is HttpConnectionKey && + Equals((HttpConnectionKey)obj); + + public bool Equals(HttpConnectionKey other) => + Kind == other.Kind && + Host == other.Host && + Port == other.Port && + ProxyUri == other.ProxyUri && + SslHostName == other.SslHostName; + + public static bool operator ==(HttpConnectionKey key1, HttpConnectionKey key2) => key1.Equals(key2); + public static bool operator !=(HttpConnectionKey key1, HttpConnectionKey key2) => !key1.Equals(key2); + } + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpConnectionContent.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionResponseContent.cs similarity index 50% rename from external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpConnectionContent.cs rename to external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionResponseContent.cs index 6ce4fea1cf..b84484d70a 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/HttpConnectionContent.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionResponseContent.cs @@ -9,62 +9,62 @@ using System.Threading.Tasks; namespace System.Net.Http { - internal sealed partial class HttpConnection : IDisposable + internal partial class HttpConnection : IDisposable { - private sealed class HttpConnectionContent : HttpContent + private sealed class HttpConnectionResponseContent : HttpContent { - private readonly CancellationToken _cancellationToken; - private HttpContentReadStream _stream; + private HttpContentStream _stream; + private bool _consumedStream; - public HttpConnectionContent(CancellationToken cancellationToken) - { - _cancellationToken = cancellationToken; - } - - public void SetStream(HttpContentReadStream stream) + public void SetStream(HttpContentStream stream) { Debug.Assert(stream != null); Debug.Assert(stream.CanRead); + Debug.Assert(!_consumedStream); _stream = stream; } - private HttpContentReadStream ConsumeStream() + internal bool IsEmpty => (_stream == EmptyReadStream.Instance); + + private HttpContentStream ConsumeStream() { - if (_stream == null) + if (_consumedStream || _stream == null) { throw new InvalidOperationException(SR.net_http_content_stream_already_read); } + _consumedStream = true; - HttpContentReadStream stream = _stream; - _stream = null; - return stream; + return _stream; } - protected override async Task SerializeToStreamAsync(Stream stream, TransportContext context) + protected sealed override Task SerializeToStreamAsync(Stream stream, TransportContext context) => + SerializeToStreamAsync(stream, context, CancellationToken.None); + + internal sealed override async Task SerializeToStreamAsync(Stream stream, TransportContext context, CancellationToken cancellationToken) { Debug.Assert(stream != null); - using (HttpContentReadStream contentStream = ConsumeStream()) + using (HttpContentStream contentStream = ConsumeStream()) { const int BufferSize = 8192; - await contentStream.CopyToAsync(stream, BufferSize, _cancellationToken).ConfigureAwait(false); + await contentStream.CopyToAsync(stream, BufferSize, cancellationToken).ConfigureAwait(false); } } - protected internal override bool TryComputeLength(out long length) + protected internal sealed override bool TryComputeLength(out long length) { length = 0; return false; } - protected override Task CreateContentReadStreamAsync() => + protected sealed override Task CreateContentReadStreamAsync() => Task.FromResult(ConsumeStream()); - internal override Stream TryCreateContentReadStream() => + internal sealed override Stream TryCreateContentReadStream() => ConsumeStream(); - protected override void Dispose(bool disposing) + protected sealed override void Dispose(bool disposing) { if (disposing) { diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionSettings.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionSettings.cs new file mode 100644 index 0000000000..564a4e1da1 --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionSettings.cs @@ -0,0 +1,75 @@ +// 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.Collections.Generic; +using System.Net.Security; + +namespace System.Net.Http +{ + /// Provides a state bag of settings for configuring HTTP connections. + internal sealed class HttpConnectionSettings + { + internal DecompressionMethods _automaticDecompression = HttpHandlerDefaults.DefaultAutomaticDecompression; + + internal bool _useCookies = HttpHandlerDefaults.DefaultUseCookies; + internal CookieContainer _cookieContainer; + + internal bool _useProxy = HttpHandlerDefaults.DefaultUseProxy; + internal IWebProxy _proxy; + internal ICredentials _defaultProxyCredentials; + + internal bool _preAuthenticate = HttpHandlerDefaults.DefaultPreAuthenticate; + internal ICredentials _credentials; + + internal bool _allowAutoRedirect = HttpHandlerDefaults.DefaultAutomaticRedirection; + internal int _maxAutomaticRedirections = HttpHandlerDefaults.DefaultMaxAutomaticRedirections; + + internal int _maxConnectionsPerServer = HttpHandlerDefaults.DefaultMaxConnectionsPerServer; + internal int _maxResponseDrainSize = HttpHandlerDefaults.DefaultMaxResponseDrainSize; + internal TimeSpan _maxResponseDrainTime = HttpHandlerDefaults.DefaultResponseDrainTimeout; + internal int _maxResponseHeadersLength = HttpHandlerDefaults.DefaultMaxResponseHeadersLength; + + internal TimeSpan _pooledConnectionLifetime = HttpHandlerDefaults.DefaultPooledConnectionLifetime; + internal TimeSpan _pooledConnectionIdleTimeout = HttpHandlerDefaults.DefaultPooledConnectionIdleTimeout; + internal TimeSpan _expect100ContinueTimeout = HttpHandlerDefaults.DefaultExpect100ContinueTimeout; + internal TimeSpan _connectTimeout = HttpHandlerDefaults.DefaultConnectTimeout; + + internal SslClientAuthenticationOptions _sslOptions; + + internal IDictionary _properties; + + public HttpConnectionSettings Clone() + { + // Force creation of the cookie container if needed, so the original and clone share the same instance. + if (_useCookies && _cookieContainer == null) + { + _cookieContainer = new CookieContainer(); + } + + return new HttpConnectionSettings() + { + _allowAutoRedirect = _allowAutoRedirect, + _automaticDecompression = _automaticDecompression, + _cookieContainer = _cookieContainer, + _connectTimeout = _connectTimeout, + _credentials = _credentials, + _defaultProxyCredentials = _defaultProxyCredentials, + _expect100ContinueTimeout = _expect100ContinueTimeout, + _maxAutomaticRedirections = _maxAutomaticRedirections, + _maxConnectionsPerServer = _maxConnectionsPerServer, + _maxResponseDrainSize = _maxResponseDrainSize, + _maxResponseDrainTime = _maxResponseDrainTime, + _maxResponseHeadersLength = _maxResponseHeadersLength, + _pooledConnectionLifetime = _pooledConnectionLifetime, + _pooledConnectionIdleTimeout = _pooledConnectionIdleTimeout, + _preAuthenticate = _preAuthenticate, + _properties = _properties, + _proxy = _proxy, + _sslOptions = _sslOptions?.ShallowClone(), // shallow clone the options for basic prevention of mutation issues while processing + _useCookies = _useCookies, + _useProxy = _useProxy, + }; + } + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpContentDuplexStream.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpContentDuplexStream.cs new file mode 100644 index 0000000000..6665998147 --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpContentDuplexStream.cs @@ -0,0 +1,50 @@ +// 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.IO; +using System.Threading; +using System.Threading.Tasks; + +namespace System.Net.Http +{ + internal abstract class HttpContentDuplexStream : HttpContentStream + { + public HttpContentDuplexStream(HttpConnection connection) : base(connection) + { + if (NetEventSource.IsEnabled) NetEventSource.Info(this); + } + + public sealed override bool CanRead => true; + public sealed override bool CanWrite => true; + + public sealed override void Flush() => FlushAsync().GetAwaiter().GetResult(); + + public sealed override int Read(byte[] buffer, int offset, int count) + { + ValidateBufferArgs(buffer, offset, count); + return ReadAsync(new Memory(buffer, offset, count), CancellationToken.None).GetAwaiter().GetResult(); + } + + public sealed override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + { + ValidateBufferArgs(buffer, offset, count); + return ReadAsync(new Memory(buffer, offset, count), cancellationToken).AsTask(); + } + + public sealed override void Write(byte[] buffer, int offset, int count) + { + ValidateBufferArgs(buffer, offset, count); + WriteAsync(new Memory(buffer, offset, count), CancellationToken.None).GetAwaiter().GetResult(); + } + + public sealed override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + { + ValidateBufferArgs(buffer, offset, count); + return WriteAsync(new ReadOnlyMemory(buffer, offset, count), cancellationToken).AsTask(); + } + + public sealed override void CopyTo(Stream destination, int bufferSize) => + CopyToAsync(destination, bufferSize, CancellationToken.None).GetAwaiter().GetResult(); + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpContentReadStream.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpContentReadStream.cs new file mode 100644 index 0000000000..d1c44340d8 --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpContentReadStream.cs @@ -0,0 +1,113 @@ +// 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.IO; +using System.Threading; +using System.Threading.Tasks; + +namespace System.Net.Http +{ + internal partial class HttpConnection + { + internal abstract class HttpContentReadStream : HttpContentStream + { + private int _disposed; // 0==no, 1==yes + + public HttpContentReadStream(HttpConnection connection) : base(connection) + { + } + + public sealed override bool CanRead => true; + public sealed override bool CanWrite => false; + + public sealed override void Flush() { } + public sealed override Task FlushAsync(CancellationToken cancellationToken) => + cancellationToken.IsCancellationRequested ? + Task.FromCanceled(cancellationToken) : + Task.CompletedTask; + + public sealed override void WriteByte(byte value) => throw new NotSupportedException(); + public sealed override void Write(byte[] buffer, int offset, int count) => throw new NotSupportedException(); + public sealed override void Write(ReadOnlySpan source) => throw new NotSupportedException(); + public sealed override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) => throw new NotSupportedException(); + public sealed override ValueTask WriteAsync(ReadOnlyMemory destination, CancellationToken cancellationToken) => throw new NotSupportedException(); + + public sealed override int Read(byte[] buffer, int offset, int count) + { + ValidateBufferArgs(buffer, offset, count); + return ReadAsync(new Memory(buffer, offset, count), CancellationToken.None).GetAwaiter().GetResult(); + } + + public sealed override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + { + ValidateBufferArgs(buffer, offset, count); + return ReadAsync(new Memory(buffer, offset, count), cancellationToken).AsTask(); + } + + public sealed override void CopyTo(Stream destination, int bufferSize) => + CopyToAsync(destination, bufferSize, CancellationToken.None).GetAwaiter().GetResult(); + + public virtual bool NeedsDrain => false; + + public virtual Task DrainAsync(int maxDrainBytes) + { + Debug.Fail($"DrainAsync should not be called for this response stream: {GetType()}"); + return Task.FromResult(false); + } + + protected override void Dispose(bool disposing) + { + // Only attempt draining if we haven't started draining due to disposal; otherwise + // multiple calls to Dispose (which happens frequently when someone disposes of the + // response stream and response content) will kick off multiple concurrent draining + // operations. Also don't delegate to the base if Dispose has already been called, + // as doing so will end up disposing of the connection before we're done draining. + if (Interlocked.Exchange(ref _disposed, 1) != 0) + { + return; + } + + if (disposing && NeedsDrain) + { + // Start the asynchronous drain. + // It may complete synchronously, in which case the connection will be put back in the pool synchronously. + // Skip the call to base.Dispose -- it will be deferred until DrainOnDisposeAsync finishes. + DrainOnDisposeAsync(); + return; + } + + base.Dispose(disposing); + } + + private async void DrainOnDisposeAsync() + { + HttpConnection connection = _connection; // Will be null after drain succeeds + + try + { + bool drained = await DrainAsync(connection._pool.Settings._maxResponseDrainSize).ConfigureAwait(false); + + if (NetEventSource.IsEnabled) + { + connection.Trace(drained ? + "Connection drain succeeded" : + $"Connection drain failed because MaxResponseDrainSize of {connection._pool.Settings._maxResponseDrainSize} bytes was exceeded"); + } + } + catch (Exception e) + { + if (NetEventSource.IsEnabled) + { + connection.Trace($"Connection drain failed due to exception: {e}"); + } + + // Eat any exceptions and just Dispose. + } + + base.Dispose(true); + } + } + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpContentStream.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpContentStream.cs new file mode 100644 index 0000000000..be3f2a10c9 --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpContentStream.cs @@ -0,0 +1,101 @@ +// 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.IO; +using System.Threading.Tasks; + +namespace System.Net.Http +{ + internal abstract class HttpContentStream : Stream + { + protected HttpConnection _connection; + + public HttpContentStream(HttpConnection connection) + { + _connection = connection; + } + + protected override void Dispose(bool disposing) + { + if (disposing) + { + if (_connection != null) + { + _connection.Dispose(); + _connection = null; + } + } + + base.Dispose(disposing); + } + + public sealed override bool CanSeek => false; + + public sealed override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) => + TaskToApm.Begin(ReadAsync(buffer, offset, count, default), callback, state); + + public sealed override int EndRead(IAsyncResult asyncResult) => + TaskToApm.End(asyncResult); + + public sealed override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) => + TaskToApm.Begin(WriteAsync(buffer, offset, count, default), callback, state); + + public sealed override void EndWrite(IAsyncResult asyncResult) => + TaskToApm.End(asyncResult); + + public sealed override long Seek(long offset, SeekOrigin origin) => throw new NotSupportedException(); + + public sealed override void SetLength(long value) => throw new NotSupportedException(); + + public sealed override long Length => throw new NotSupportedException(); + + public sealed override long Position + { + get { throw new NotSupportedException(); } + set { throw new NotSupportedException(); } + } + + protected static void ValidateBufferArgs(byte[] buffer, int offset, int count) + { + if (buffer == null) + { + throw new ArgumentNullException(nameof(buffer)); + } + + if ((uint)offset > buffer.Length) + { + throw new ArgumentOutOfRangeException(nameof(offset)); + } + + if ((uint)count > buffer.Length - offset) + { + throw new ArgumentOutOfRangeException(nameof(count)); + } + } + + /// + /// Validate the arguments to CopyTo, as would Stream.CopyTo, but with knowledge that + /// the source stream is always readable and so only checking the destination. + /// + protected static void ValidateCopyToArgs(Stream source, Stream destination, int bufferSize) + { + if (destination == null) + { + throw new ArgumentNullException(nameof(destination)); + } + + if (bufferSize <= 0) + { + throw new ArgumentOutOfRangeException(nameof(bufferSize), bufferSize, SR.ArgumentOutOfRange_NeedPosNum); + } + + if (!destination.CanWrite) + { + throw destination.CanRead ? + new NotSupportedException(SR.NotSupported_UnwritableStream) : + (Exception)new ObjectDisposedException(nameof(destination), SR.ObjectDisposed_StreamClosed); + } + } + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpContentWriteStream.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpContentWriteStream.cs new file mode 100644 index 0000000000..6b7993950a --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpContentWriteStream.cs @@ -0,0 +1,44 @@ +// 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.Threading; +using System.Threading.Tasks; + +namespace System.Net.Http +{ + internal partial class HttpConnection : IDisposable + { + private abstract class HttpContentWriteStream : HttpContentStream + { + public HttpContentWriteStream(HttpConnection connection) : base(connection) => + Debug.Assert(connection != null); + + public sealed override bool CanRead => false; + public sealed override bool CanWrite => true; + + public sealed override void Flush() => FlushAsync().GetAwaiter().GetResult(); + + public sealed override int Read(byte[] buffer, int offset, int count) => throw new NotSupportedException(); + + public sealed override void Write(byte[] buffer, int offset, int count) => + WriteAsync(buffer, offset, count, CancellationToken.None).GetAwaiter().GetResult(); + + // The token here is ignored because it's coming from SendAsync and the only operations + // here are those that are already covered by the token having been registered with + // to close the connection. + + public sealed override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken ignored) + { + ValidateBufferArgs(buffer, offset, count); + return WriteAsync(new ReadOnlyMemory(buffer, offset, count), ignored).AsTask(); + } + + public sealed override Task FlushAsync(CancellationToken ignored) => + _connection.FlushAsync().AsTask(); + + public abstract Task FinishAsync(); + } + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpEnvironmentProxy.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpEnvironmentProxy.cs new file mode 100644 index 0000000000..5f46cfe8ab --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpEnvironmentProxy.cs @@ -0,0 +1,317 @@ +// 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; +using System.Net.Http; +using System.Net; +using System.Collections.Generic; + +namespace System.Net.Http +{ + internal sealed class HttpEnvironmentProxyCredentials : ICredentials + { + // Wrapper class for cases when http and https has different authentication. + private readonly NetworkCredential _httpCred; + private readonly NetworkCredential _httpsCred; + private readonly Uri _httpProxy; + private readonly Uri _httpsProxy; + + public HttpEnvironmentProxyCredentials(Uri httpProxy, NetworkCredential httpCred, + Uri httpsProxy, NetworkCredential httpsCred) + { + _httpCred = httpCred; + _httpsCred = httpsCred; + _httpProxy = httpProxy; + _httpsProxy = httpsProxy; + } + + public NetworkCredential GetCredential(Uri uri, string authType) + { + if (uri == null) + { + return null; + } + return uri.Equals(_httpProxy) ? _httpCred : + uri.Equals(_httpsProxy) ? _httpsCred : null; + } + + public static HttpEnvironmentProxyCredentials TryCreate(Uri httpProxy, Uri httpsProxy) + { + NetworkCredential httpCred = null; + NetworkCredential httpsCred = null; + + if (httpProxy != null) + { + httpCred = GetCredentialsFromString(httpProxy.UserInfo); + } + if (httpsProxy != null) + { + httpsCred = GetCredentialsFromString(httpsProxy.UserInfo); + } + if (httpCred == null && httpsCred == null) + { + return null; + } + return new HttpEnvironmentProxyCredentials(httpProxy, httpCred, httpsProxy, httpsCred); + } + + /// + /// Converts string containing user:password to NetworkCredential object + /// + private static NetworkCredential GetCredentialsFromString(string value) + { + if (string.IsNullOrWhiteSpace(value)) + { + return null; + } + + value = Uri.UnescapeDataString(value); + + string password = ""; + string domain = null; + int idx = value.IndexOf(':'); + if (idx != -1) + { + password = value.Substring(idx+1); + value = value.Substring(0, idx); + } + + idx = value.IndexOf('\\'); + if (idx != -1) + { + domain = value.Substring(0, idx); + value = value.Substring(idx+1); + } + + return new NetworkCredential(value, password, domain); + } + } + + internal sealed class HttpEnvironmentProxy : IWebProxy + { + private const string EnvAllProxyUC = "ALL_PROXY"; + private const string EnvAllProxyLC = "all_proxy"; + private const string EnvHttpProxyLC = "http_proxy"; + private const string EnvHttpsProxyLC = "https_proxy"; + private const string EnvHttpsProxyUC = "HTTPS_PROXY"; + private const string EnvNoProxyLC = "no_proxy"; + + private Uri _httpProxyUri; // String URI for HTTP requests + private Uri _httpsProxyUri; // String URI for HTTPS requests + private string[] _bypass = null;// list of domains not to proxy + private ICredentials _credentials; + + public static bool TryCreate(out IWebProxy proxy) + { + // Get environmental variables. Protocol specific take precedence over + // general all_*, lower case variable has precedence over upper case. + // Note that curl uses HTTPS_PROXY but not HTTP_PROXY. + // For http, only http_proxy and generic variables are used. + + Uri httpProxy = GetUriFromString(Environment.GetEnvironmentVariable(EnvHttpProxyLC)); + Uri httpsProxy = GetUriFromString(Environment.GetEnvironmentVariable(EnvHttpsProxyLC)) ?? + GetUriFromString(Environment.GetEnvironmentVariable(EnvHttpsProxyUC)); + + if (httpProxy == null || httpsProxy == null) + { + Uri allProxy = GetUriFromString(Environment.GetEnvironmentVariable(EnvAllProxyLC)) ?? + GetUriFromString(Environment.GetEnvironmentVariable(EnvAllProxyUC)); + + if (httpProxy == null) + { + httpProxy = allProxy; + } + if (httpsProxy == null) + { + httpsProxy = allProxy; + } + } + + // Do not instantiate if nothing is set. + // Caller may pick some other proxy type. + if (httpProxy == null && httpsProxy == null) + { + proxy = null; + return false; + } + + proxy = new HttpEnvironmentProxy(httpProxy, httpsProxy, Environment.GetEnvironmentVariable(EnvNoProxyLC)); + return true; + } + + private HttpEnvironmentProxy(Uri httpProxy, Uri httpsProxy, string bypassList) + { + _httpProxyUri = httpProxy; + _httpsProxyUri = httpsProxy; + + _credentials = HttpEnvironmentProxyCredentials.TryCreate(httpProxy, httpsProxy); + + if (!string.IsNullOrWhiteSpace(bypassList)) + { + string[] list = bypassList.Split(','); + List tmpList = new List(list.Length); + + foreach (string value in list) + { + string tmp = value.Trim(); + if (tmp.Length > 0) + { + tmpList.Add(tmp); + } + } + if (tmpList.Count > 0) + { + _bypass = tmpList.ToArray(); + } + } + } + + /// + /// This function will evaluate given string and it will try to convert + /// it to Uri object. The string could contain URI fragment, IP address and port + /// tuple or just IP address or name. It will return null if parsing fails. + /// + private static Uri GetUriFromString(string value) + { + if (string.IsNullOrEmpty(value)) + { + return null; + } + if (value.StartsWith("http://", StringComparison.OrdinalIgnoreCase)) + { + value = value.Substring(7); + } + + string user = null; + string password = null; + UInt16 port = 80; + string host = null; + + // Check if there is authentication part with user and possibly password. + // Curl accepts raw text and that may break URI parser. + int separatorIndex = value.LastIndexOf('@'); + if (separatorIndex != -1) + { + string auth = value.Substring(0, separatorIndex); + + // The User and password may or may not be URL encoded. + // Curl seems to accept both. To match that, + // we do opportunistic decode and we use original string if it fails. + try + { + auth = Uri.UnescapeDataString(auth); + } + catch { }; + + value = value.Substring(separatorIndex + 1); + separatorIndex = auth.IndexOf(':'); + if (separatorIndex == -1) + { + user = auth; + } + else + { + user = auth.Substring(0, separatorIndex); + password = auth.Substring(separatorIndex + 1); + } + } + + int ipV6AddressEnd = value.IndexOf(']'); + separatorIndex = value.LastIndexOf(':'); + // No ':' or it is part of IPv6 address. + if (separatorIndex == -1 || (ipV6AddressEnd != -1 && separatorIndex < ipV6AddressEnd)) + { + host = value; + } + else + { + host = value.Substring(0, separatorIndex); + if (!UInt16.TryParse(value.AsSpan(separatorIndex + 1), out port)) + { + return null; + } + } + + try + { + UriBuilder ub = new UriBuilder("http", host, port); + if (user != null) + { + ub.UserName = Uri.EscapeDataString(user); + } + + if (password != null) + { + ub.Password = Uri.EscapeDataString(password); + } + + return ub.Uri; + } + catch { }; + return null; + } + + /// + /// This function returns true if given Host match bypass list. + /// Note, that the list is common for http and https. + /// + private bool IsMatchInBypassList(Uri input) + { + if (_bypass != null) + { + foreach (string s in _bypass) + { + if (s[0] == '.') + { + // This should match either domain it self or any subdomain or host + // .foo.com will match foo.com it self or *.foo.com + if ((s.Length - 1) == input.Host.Length && + String.Compare(s, 1, input.Host, 0, input.Host.Length, StringComparison.OrdinalIgnoreCase) == 0) + { + return true; + } + else if (input.Host.EndsWith(s, StringComparison.OrdinalIgnoreCase)) + { + return true; + } + + } + else + { + if (String.Equals(s, input.Host, StringComparison.OrdinalIgnoreCase)) + { + return true; + } + } + } + } + return false; + } + + /// + /// Gets the proxy URI. (iWebProxy interface) + /// + public Uri GetProxy(Uri uri) + { + return uri.Scheme == Uri.UriSchemeHttp ? _httpProxyUri : _httpsProxyUri; + } + + /// + /// Checks if URI is subject to proxy or not. + /// + public bool IsBypassed(Uri uri) + { + return GetProxy(uri) == null ? true : IsMatchInBypassList(uri); + } + + public ICredentials Credentials + { + get + { + return _credentials; + } + set { throw new NotSupportedException(); } + } + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpSystemProxy.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpSystemProxy.cs new file mode 100644 index 0000000000..aed16ab7e9 --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpSystemProxy.cs @@ -0,0 +1,388 @@ +// 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.Collections.Generic; +using System.Net.NetworkInformation; +using System.Runtime.InteropServices; +using System.Text.RegularExpressions; + +using SafeWinHttpHandle = Interop.WinHttp.SafeWinHttpHandle; + +namespace System.Net.Http +{ + internal sealed class HttpSystemProxy : IWebProxy, IDisposable + { + private readonly Uri _insecureProxyUri; // URI of the http system proxy if set + private readonly Uri _secureProxyUri; // URI of the https system proxy if set + private readonly List _bypass; // list of domains not to proxy + private readonly bool _bypassLocal = false; // we should bypass domain considered local + private readonly List _localIp; + private ICredentials _credentials; + private readonly WinInetProxyHelper _proxyHelper; + private SafeWinHttpHandle _sessionHandle; + private bool _disposed; + private static readonly char[] s_proxyDelimiters = {';', ' ', '\n', '\r', '\t'}; + + public static bool TryCreate(out IWebProxy proxy) + { + // This will get basic proxy setting from system using existing + // WinInetProxyHelper functions. If no proxy is enabled, it will return null. + SafeWinHttpHandle sessionHandle = null; + proxy = null; + + WinInetProxyHelper proxyHelper = new WinInetProxyHelper(); + if (!proxyHelper.ManualSettingsOnly && !proxyHelper.AutoSettingsUsed) + { + return false; + } + + if (proxyHelper.AutoSettingsUsed) + { + if (NetEventSource.IsEnabled) NetEventSource.Info(proxyHelper, $"AutoSettingsUsed, calling {nameof(Interop.WinHttp.WinHttpOpen)}"); + sessionHandle = Interop.WinHttp.WinHttpOpen( + IntPtr.Zero, + Interop.WinHttp.WINHTTP_ACCESS_TYPE_NO_PROXY, + Interop.WinHttp.WINHTTP_NO_PROXY_NAME, + Interop.WinHttp.WINHTTP_NO_PROXY_BYPASS, + (int)Interop.WinHttp.WINHTTP_FLAG_ASYNC); + + if (sessionHandle.IsInvalid) + { + // Proxy failures are currently ignored by managed handler. + if (NetEventSource.IsEnabled) NetEventSource.Error(proxyHelper, $"{nameof(Interop.WinHttp.WinHttpOpen)} returned invalid handle"); + return false; + } + } + + proxy = new HttpSystemProxy(proxyHelper, sessionHandle); + return true; + } + + private HttpSystemProxy(WinInetProxyHelper proxyHelper, SafeWinHttpHandle sessionHandle) + { + _proxyHelper = proxyHelper; + _sessionHandle = sessionHandle; + + if (proxyHelper.ManualSettingsOnly) + { + ParseProxyConfig(proxyHelper.Proxy, out _insecureProxyUri, out _secureProxyUri); + + if (!string.IsNullOrWhiteSpace(proxyHelper.ProxyBypass)) + { + int idx = 0; + int start = 0; + string tmp; + + // Process bypass list for manual setting. + // Initial list size is best guess based on string length assuming each entry is at least 5 characters on average. + _bypass = new List(proxyHelper.ProxyBypass.Length / 5); + + while (idx < proxyHelper.ProxyBypass.Length) + { + // Strip leading spaces and scheme if any. + while (idx < proxyHelper.ProxyBypass.Length && proxyHelper.ProxyBypass[idx] == ' ') { idx += 1; }; + if (string.Compare(proxyHelper.ProxyBypass, idx, "http://", 0, 7, StringComparison.OrdinalIgnoreCase) == 0) + { + idx += 7; + } + else if (string.Compare(proxyHelper.ProxyBypass, idx, "https://", 0, 8, StringComparison.OrdinalIgnoreCase) == 0) + { + idx += 8; + } + + if (idx < proxyHelper.ProxyBypass.Length && proxyHelper.ProxyBypass[idx] == '[') + { + // Strip [] from IPv6 so we can use IdnHost laster for matching. + idx +=1; + } + + start = idx; + while (idx < proxyHelper.ProxyBypass.Length && proxyHelper.ProxyBypass[idx] != ' ' && proxyHelper.ProxyBypass[idx] != ';' && proxyHelper.ProxyBypass[idx] != ']') {idx += 1; }; + + if (idx == start) + { + // Empty string. + tmp = null; + } + else if (string.Compare(proxyHelper.ProxyBypass, start, "", 0, 7, StringComparison.OrdinalIgnoreCase) == 0) + { + _bypassLocal = true; + tmp = null; + } + else + { + tmp = proxyHelper.ProxyBypass.Substring(start, idx-start); + } + + // Skip trailing characters if any. + if (idx < proxyHelper.ProxyBypass.Length && proxyHelper.ProxyBypass[idx] != ';') + { + // Got stopped at space or ']'. Strip until next ';' or end. + while (idx < proxyHelper.ProxyBypass.Length && proxyHelper.ProxyBypass[idx] != ';' ) {idx += 1; }; + } + if (idx < proxyHelper.ProxyBypass.Length && proxyHelper.ProxyBypass[idx] == ';') + { + idx ++; + } + if (tmp == null) + { + continue; + } + + try + { + // Escape any special characters and unescape * to get wildcard pattern match. + Regex re = new Regex(Regex.Escape(tmp).Replace("\\*", ".*?") + "$", + RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant); + _bypass.Add(re); + } + catch (Exception ex) + { + if (NetEventSource.IsEnabled) + { + NetEventSource.Error(this, $"Failed to process {tmp} from bypass list: {ex}"); + } + } + } + if (_bypass.Count == 0) + { + // Bypass string only had garbage we did not parse. + _bypass = null; + } + } + + if (_bypassLocal) + { + _localIp = new List(); + foreach (NetworkInterface netInterface in NetworkInterface.GetAllNetworkInterfaces()) + { + IPInterfaceProperties ipProps = netInterface.GetIPProperties(); + foreach (UnicastIPAddressInformation addr in ipProps.UnicastAddresses) + { + _localIp.Add(addr.Address); + } + } + } + } + } + + public void Dispose() + { + if (!_disposed) + { + _disposed = true; + + if (_sessionHandle != null && !_sessionHandle.IsInvalid) + { + SafeWinHttpHandle.DisposeAndClearHandle(ref _sessionHandle); + } + } + } + + /// + /// This function will evaluate given string and it will try to convert + /// it to a Uri object. The string could contain URI fragment, IP address and port + /// tuple or just IP address or name. It will return null if parsing fails. + /// + private static Uri GetUriFromString(string value) + { + if (string.IsNullOrEmpty(value)) + { + return null; + } + + if (!value.Contains("://")) + { + value = "http://" + value; + } + + if (Uri.TryCreate(value, UriKind.Absolute, out Uri uri) && + (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps)) + { + // We only support http and https for now. + return uri; + } + return null; + } + + /// + /// This function is used to parse WinINet Proxy strings. The strings are a semicolon + /// or whitespace separated list, with each entry in the following format: + /// ([=]["://"][":"]) + /// + private static void ParseProxyConfig(string value, out Uri insecureProxy, out Uri secureProxy ) + { + secureProxy = null; + insecureProxy = null; + if (string.IsNullOrEmpty(value)) + { + return; + } + + int idx = value.IndexOf("http://"); + if (idx >= 0) + { + int proxyLength = GetProxySubstringLength(value, idx); + Uri.TryCreate(value.Substring(idx, proxyLength) , UriKind.Absolute, out insecureProxy); + } + + if (insecureProxy == null) + { + idx = value.IndexOf("http="); + if (idx >= 0) + { + idx += 5; // Skip "http=" so we can replace it with "http://" + int proxyLength = GetProxySubstringLength(value, idx); + Uri.TryCreate("http://" + value.Substring(idx, proxyLength) , UriKind.Absolute, out insecureProxy); + } + } + + idx = value.IndexOf("https://"); + if (idx >= 0) + { + idx += 8; // Skip "https://" so we can replace it with "http://" + int proxyLength = GetProxySubstringLength(value, idx); + Uri.TryCreate("http://" + value.Substring(idx, proxyLength) , UriKind.Absolute, out secureProxy); + } + + if (secureProxy == null) + { + idx = value.IndexOf("https="); + if (idx >= 0) + { + idx += 6; // Skip "https=" so we can replace it with "http://" + int proxyLength = GetProxySubstringLength(value, idx); + Uri.TryCreate("http://" + value.Substring(idx, proxyLength) , UriKind.Absolute, out secureProxy); + } + } + } + + private static int GetProxySubstringLength(String proxyString, int idx) + { + int endOfProxy = proxyString.IndexOfAny(s_proxyDelimiters, idx); + return (endOfProxy == -1) ? proxyString.Length - idx : endOfProxy - idx; + } + + /// + /// Gets the proxy URI. (IWebProxy interface) + /// + public Uri GetProxy(Uri uri) + { + if (_proxyHelper.ManualSettingsOnly) + { + if (_bypassLocal) + { + IPAddress address = null; + + if (uri.IsLoopback) + { + // This is optimization for loopback addresses. + // Unfortunately this does not work for all local addresses. + return null; + } + + // Pre-Check if host may be IP address to avoid parsing. + if (uri.HostNameType == UriHostNameType.IPv6 || uri.HostNameType == UriHostNameType.IPv4) + { + // RFC1123 allows labels to start with number. + // Leading number may or may not be IP address. + // IPv6 [::1] notation. '[' is not valid character in names. + if (IPAddress.TryParse(uri.IdnHost, out address)) + { + // Host is valid IP address. + // Check if it belongs to local system. + foreach (IPAddress a in _localIp) + { + if (a.Equals(address)) + { + return null; + } + } + } + } + if (uri.HostNameType != UriHostNameType.IPv6 && uri.IdnHost.IndexOf('.') == -1) + { + // Not address and does not have a dot. + // Hosts without FQDN are considered local. + return null; + } + } + + // Check if we have other rules for bypass. + if (_bypass != null) + { + foreach (Regex entry in _bypass) + { + // IdnHost does not have []. + if (entry.IsMatch(uri.IdnHost)) + { + return null; + } + } + } + + // We did not find match on bypass list. + return (uri.Scheme == UriScheme.Https || uri.Scheme == UriScheme.Wss) ? _secureProxyUri : _insecureProxyUri; + } + + // For anything else ask WinHTTP. To improve performance, we don't call into + // WinHTTP if there was a recent failure to detect a PAC file on the network. + if (!_proxyHelper.RecentAutoDetectionFailure) + { + var proxyInfo = new Interop.WinHttp.WINHTTP_PROXY_INFO(); + try + { + if (_proxyHelper.GetProxyForUrl(_sessionHandle, uri, out proxyInfo)) + { + return GetUriFromString(Marshal.PtrToStringUni(proxyInfo.Proxy)); + } + } + finally + { + Marshal.FreeHGlobal(proxyInfo.Proxy); + Marshal.FreeHGlobal(proxyInfo.ProxyBypass); + } + } + + return null; + } + + /// + /// Checks if URI is subject to proxy or not. + /// + public bool IsBypassed(Uri uri) + { + if (_proxyHelper.ManualSettingsOnly) + { + if (_bypassLocal) + { + // TODO #23150: implement bypass match. + } + return false; + } + else if (_proxyHelper.AutoSettingsUsed) + { + // Always return false for now to avoid query to WinHtttp. + // If URI should be bypassed GetProxy() will return null; + return false; + } + return true; + } + + public ICredentials Credentials + { + get + { + return _credentials; + } + set + { + _credentials = value; + } + } + + // Access function for unit tests. + internal List BypassList => _bypass; + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/RawConnectionStream.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/RawConnectionStream.cs new file mode 100644 index 0000000000..6eba9babd3 --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/RawConnectionStream.cs @@ -0,0 +1,182 @@ +// 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.IO; +using System.Threading; +using System.Threading.Tasks; + +namespace System.Net.Http +{ + internal partial class HttpConnection : IDisposable + { + private sealed class RawConnectionStream : HttpContentDuplexStream + { + public RawConnectionStream(HttpConnection connection) : base(connection) + { + } + + public override async ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken) + { + CancellationHelper.ThrowIfCancellationRequested(cancellationToken); + + if (_connection == null || buffer.Length == 0) + { + // Response body fully consumed or the caller didn't ask for any data + return 0; + } + + ValueTask readTask = _connection.ReadBufferedAsync(buffer); + int bytesRead; + if (readTask.IsCompletedSuccessfully) + { + bytesRead = readTask.Result; + } + else + { + CancellationTokenRegistration ctr = _connection.RegisterCancellation(cancellationToken); + try + { + bytesRead = await readTask.ConfigureAwait(false); + } + catch (Exception exc) when (CancellationHelper.ShouldWrapInOperationCanceledException(exc, cancellationToken)) + { + throw CancellationHelper.CreateOperationCanceledException(exc, cancellationToken); + } + finally + { + ctr.Dispose(); + } + } + + if (bytesRead == 0) + { + // A cancellation request may have caused the EOF. + CancellationHelper.ThrowIfCancellationRequested(cancellationToken); + + // We cannot reuse this connection, so close it. + _connection.Dispose(); + _connection = null; + return 0; + } + + return bytesRead; + } + + public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken) + { + ValidateCopyToArgs(this, destination, bufferSize); + + if (cancellationToken.IsCancellationRequested) + { + return Task.FromCanceled(cancellationToken); + } + + if (_connection == null) + { + // null if response body fully consumed + return Task.CompletedTask; + } + + Task copyTask = _connection.CopyToUntilEofAsync(destination, bufferSize, cancellationToken); + if (copyTask.IsCompletedSuccessfully) + { + Finish(); + return Task.CompletedTask; + } + + return CompleteCopyToAsync(copyTask, cancellationToken); + } + + private async Task CompleteCopyToAsync(Task copyTask, CancellationToken cancellationToken) + { + CancellationTokenRegistration ctr = _connection.RegisterCancellation(cancellationToken); + try + { + await copyTask.ConfigureAwait(false); + } + catch (Exception exc) when (CancellationHelper.ShouldWrapInOperationCanceledException(exc, cancellationToken)) + { + throw CancellationHelper.CreateOperationCanceledException(exc, cancellationToken); + } + finally + { + ctr.Dispose(); + } + + // If cancellation is requested and tears down the connection, it could cause the copy + // to end early but think it ended successfully. So we prioritize cancellation in this + // race condition, and if we find after the copy has completed that cancellation has + // been requested, we assume the copy completed due to cancellation and throw. + CancellationHelper.ThrowIfCancellationRequested(cancellationToken); + + Finish(); + } + + private void Finish() + { + // We cannot reuse this connection, so close it. + _connection.Dispose(); + _connection = null; + } + + public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken) + { + if (cancellationToken.IsCancellationRequested) + { + return new ValueTask(Task.FromCanceled(cancellationToken)); + } + + if (_connection == null) + { + return new ValueTask(Task.FromException(new IOException(SR.net_http_io_write))); + } + + if (buffer.Length == 0) + { + return default; + } + + ValueTask writeTask = _connection.WriteWithoutBufferingAsync(buffer); + return writeTask.IsCompleted ? + writeTask : + new ValueTask(WaitWithConnectionCancellationAsync(writeTask, cancellationToken)); + } + + public override Task FlushAsync(CancellationToken cancellationToken) + { + if (cancellationToken.IsCancellationRequested) + { + return Task.FromCanceled(cancellationToken); + } + + if (_connection == null) + { + return Task.CompletedTask; + } + + ValueTask flushTask = _connection.FlushAsync(); + return flushTask.IsCompleted ? + flushTask.AsTask() : + WaitWithConnectionCancellationAsync(flushTask, cancellationToken); + } + + private async Task WaitWithConnectionCancellationAsync(ValueTask task, CancellationToken cancellationToken) + { + CancellationTokenRegistration ctr = _connection.RegisterCancellation(cancellationToken); + try + { + await task.ConfigureAwait(false); + } + catch (Exception exc) when (CancellationHelper.ShouldWrapInOperationCanceledException(exc, cancellationToken)) + { + throw CancellationHelper.CreateOperationCanceledException(exc, cancellationToken); + } + finally + { + ctr.Dispose(); + } + } + } + } +} diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/RedirectHandler.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/RedirectHandler.cs new file mode 100644 index 0000000000..ede57cf9ca --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/RedirectHandler.cs @@ -0,0 +1,154 @@ +// 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.Threading; +using System.Threading.Tasks; + +namespace System.Net.Http +{ + internal sealed partial class RedirectHandler : HttpMessageHandler + { + private readonly HttpMessageHandler _initialInnerHandler; // Used for initial request + private readonly HttpMessageHandler _redirectInnerHandler; // Used for redirects; this allows disabling auth + private readonly int _maxAutomaticRedirections; + + public RedirectHandler(int maxAutomaticRedirections, HttpMessageHandler initialInnerHandler, HttpMessageHandler redirectInnerHandler) + { + Debug.Assert(initialInnerHandler != null); + Debug.Assert(redirectInnerHandler != null); + Debug.Assert(maxAutomaticRedirections > 0); + + _maxAutomaticRedirections = maxAutomaticRedirections; + _initialInnerHandler = initialInnerHandler; + _redirectInnerHandler = redirectInnerHandler; + } + + protected internal override async Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) + { + if (NetEventSource.IsEnabled) NetEventSource.Enter(this, request, cancellationToken); + + HttpResponseMessage response = await _initialInnerHandler.SendAsync(request, cancellationToken).ConfigureAwait(false); + + uint redirectCount = 0; + Uri redirectUri; + while ((redirectUri = GetUriForRedirect(request.RequestUri, response)) != null) + { + redirectCount++; + + if (redirectCount > _maxAutomaticRedirections) + { + // If we exceed the maximum number of redirects + // then just return the 3xx response. + if (NetEventSource.IsEnabled) + { + NetEventSource.Error(this, $"Exceeded max number of redirects. Redirect from {request.RequestUri} to {redirectUri} blocked."); + } + + break; + } + + response.Dispose(); + + // Clear the authorization header. + request.Headers.Authorization = null; + + // Set up for the redirect + request.RequestUri = redirectUri; + if (RequestRequiresForceGet(response.StatusCode, request.Method)) + { + request.Method = HttpMethod.Get; + request.Content = null; + request.Headers.TransferEncodingChunked = false; + } + + // Issue the redirected request. + response = await _redirectInnerHandler.SendAsync(request, cancellationToken).ConfigureAwait(false); + } + + if (NetEventSource.IsEnabled) NetEventSource.Exit(this); + + return response; + } + + private Uri GetUriForRedirect(Uri requestUri, HttpResponseMessage response) + { + switch (response.StatusCode) + { + case HttpStatusCode.Moved: + case HttpStatusCode.Found: + case HttpStatusCode.SeeOther: + case HttpStatusCode.TemporaryRedirect: + case HttpStatusCode.MultipleChoices: + break; + + default: + return null; + } + + Uri location = response.Headers.Location; + if (location == null) + { + return null; + } + + // Ensure the redirect location is an absolute URI. + if (!location.IsAbsoluteUri) + { + location = new Uri(requestUri, location); + } + + // Per https://tools.ietf.org/html/rfc7231#section-7.1.2, a redirect location without a + // fragment should inherit the fragment from the original URI. + string requestFragment = requestUri.Fragment; + if (!string.IsNullOrEmpty(requestFragment)) + { + string redirectFragment = location.Fragment; + if (string.IsNullOrEmpty(redirectFragment)) + { + location = new UriBuilder(location) { Fragment = requestFragment }.Uri; + } + } + + // Disallow automatic redirection from secure to non-secure schemes + if (HttpUtilities.IsSupportedSecureScheme(requestUri.Scheme) && !HttpUtilities.IsSupportedSecureScheme(location.Scheme)) + { + if (NetEventSource.IsEnabled) + { + NetEventSource.Error(this, $"Insecure https to http redirect from '{requestUri}' to '{location}' blocked."); + } + + return null; + } + + return location; + } + + private static bool RequestRequiresForceGet(HttpStatusCode statusCode, HttpMethod requestMethod) + { + switch (statusCode) + { + case HttpStatusCode.Moved: + case HttpStatusCode.Found: + case HttpStatusCode.SeeOther: + case HttpStatusCode.MultipleChoices: + return requestMethod == HttpMethod.Post; + default: + return false; + } + } + + protected override void Dispose(bool disposing) + { + if (disposing) + { + _initialInnerHandler.Dispose(); + _redirectInnerHandler.Dispose(); + } + + base.Dispose(disposing); + } + } +} + diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/ManagedHandler.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/SocketsHttpHandler.cs similarity index 50% rename from external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/ManagedHandler.cs rename to external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/SocketsHttpHandler.cs index 14029888fb..c276cbf25f 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/Managed/ManagedHandler.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/SocketsHttpHandler.cs @@ -4,14 +4,12 @@ using System.Collections.Generic; using System.Net.Security; -using System.Security.Authentication; -using System.Security.Cryptography.X509Certificates; using System.Threading; using System.Threading.Tasks; namespace System.Net.Http { - internal sealed class ManagedHandler : HttpMessageHandler + public sealed class SocketsHttpHandler : HttpMessageHandler { private readonly HttpConnectionSettings _settings = new HttpConnectionSettings(); private HttpMessageHandler _handler; @@ -21,7 +19,7 @@ namespace System.Net.Http { if (_disposed) { - throw new ObjectDisposedException(nameof(ManagedHandler)); + throw new ObjectDisposedException(nameof(SocketsHttpHandler)); } } @@ -34,12 +32,6 @@ namespace System.Net.Http } } - public bool SupportsAutomaticDecompression => true; - - public bool SupportsProxy => true; - - public bool SupportsRedirectConfiguration => true; - public bool UseCookies { get => _settings._useCookies; @@ -60,22 +52,6 @@ namespace System.Net.Http } } - public ClientCertificateOption ClientCertificateOptions - { - get => _settings._clientCertificateOptions; - set - { - if (value != ClientCertificateOption.Manual && - value != ClientCertificateOption.Automatic) - { - throw new ArgumentOutOfRangeException(nameof(value)); - } - - CheckDisposedOrStarted(); - _settings._clientCertificateOptions = value; - } - } - public DecompressionMethods AutomaticDecompression { get => _settings._automaticDecompression; @@ -126,16 +102,6 @@ namespace System.Net.Http } } - public bool UseDefaultCredentials - { - get => _settings._useDefaultCredentials; - set - { - CheckDisposedOrStarted(); - _settings._useDefaultCredentials = value; - } - } - public ICredentials Credentials { get => _settings._credentials; @@ -186,6 +152,37 @@ namespace System.Net.Http } } + public int MaxResponseDrainSize + { + get => _settings._maxResponseDrainSize; + set + { + if (value < 0) + { + throw new ArgumentOutOfRangeException(nameof(value), value, SR.ArgumentOutOfRange_NeedNonNegativeNum); + } + + CheckDisposedOrStarted(); + _settings._maxResponseDrainSize = value; + } + } + + public TimeSpan ResponseDrainTimeout + { + get => _settings._maxResponseDrainTime; + set + { + if ((value < TimeSpan.Zero && value != Timeout.InfiniteTimeSpan) || + (value.TotalMilliseconds > int.MaxValue)) + { + throw new ArgumentOutOfRangeException(nameof(value)); + } + + CheckDisposedOrStarted(); + _settings._maxResponseDrainTime = value; + } + } + public int MaxResponseHeadersLength { get => _settings._maxResponseHeadersLength; @@ -201,47 +198,75 @@ namespace System.Net.Http } } - public X509CertificateCollection ClientCertificates + public SslClientAuthenticationOptions SslOptions { - get + get => _settings._sslOptions ?? (_settings._sslOptions = new SslClientAuthenticationOptions()); + set { - if (_settings._clientCertificateOptions != ClientCertificateOption.Manual) + CheckDisposedOrStarted(); + _settings._sslOptions = value; + } + } + + public TimeSpan PooledConnectionLifetime + { + get => _settings._pooledConnectionLifetime; + set + { + if (value < TimeSpan.Zero && value != Timeout.InfiniteTimeSpan) { - throw new InvalidOperationException(SR.Format(SR.net_http_invalid_enable_first, nameof(ClientCertificateOptions), nameof(ClientCertificateOption.Manual))); + throw new ArgumentOutOfRangeException(nameof(value)); } - return _settings._clientCertificates ?? (_settings._clientCertificates = new X509Certificate2Collection()); + CheckDisposedOrStarted(); + _settings._pooledConnectionLifetime = value; } } - public Func ServerCertificateCustomValidationCallback + public TimeSpan PooledConnectionIdleTimeout { - get => _settings._serverCertificateCustomValidationCallback; + get => _settings._pooledConnectionIdleTimeout; set { + if (value < TimeSpan.Zero && value != Timeout.InfiniteTimeSpan) + { + throw new ArgumentOutOfRangeException(nameof(value)); + } + CheckDisposedOrStarted(); - _settings._serverCertificateCustomValidationCallback = value; + _settings._pooledConnectionIdleTimeout = value; } } - public bool CheckCertificateRevocationList + public TimeSpan ConnectTimeout { - get => _settings._checkCertificateRevocationList; + get => _settings._connectTimeout; set { + if ((value <= TimeSpan.Zero && value != Timeout.InfiniteTimeSpan) || + (value.TotalMilliseconds > int.MaxValue)) + { + throw new ArgumentOutOfRangeException(nameof(value)); + } + CheckDisposedOrStarted(); - _settings._checkCertificateRevocationList = value; + _settings._connectTimeout = value; } } - public SslProtocols SslProtocols + public TimeSpan Expect100ContinueTimeout { - get => _settings._sslProtocols; + get => _settings._expect100ContinueTimeout; set { - SecurityProtocol.ThrowOnNotAllowed(value, allowNone: true); + if ((value < TimeSpan.Zero && value != Timeout.InfiniteTimeSpan) || + (value.TotalMilliseconds > int.MaxValue)) + { + throw new ArgumentOutOfRangeException(nameof(value)); + } + CheckDisposedOrStarted(); - _settings._sslProtocols = value; + _settings._expect100ContinueTimeout = value; } } @@ -261,38 +286,48 @@ namespace System.Net.Http private HttpMessageHandler SetupHandlerChain() { - HttpMessageHandler handler = new HttpConnectionHandler(_settings); + // Clone the settings to get a relatively consistent view that won't change after this point. + // (This isn't entirely complete, as some of the collections it contains aren't currently deeply cloned.) + HttpConnectionSettings settings = _settings.Clone(); - if (_settings._useProxy && - (_settings._proxy != null || HttpProxyConnectionHandler.EnvironmentProxyConfigured)) - { - handler = new HttpProxyConnectionHandler(_settings, handler); - } + HttpConnectionPoolManager poolManager = new HttpConnectionPoolManager(settings); - if (_settings._useCookies) - { - handler = new CookieHandler(CookieContainer, handler); - } + HttpMessageHandler handler; - if (_settings._credentials != null || _settings._allowAutoRedirect) + if (settings._credentials == null) { - handler = new AuthenticateAndRedirectHandler(_settings._preAuthenticate, _settings._credentials, _settings._allowAutoRedirect, _settings._maxAutomaticRedirections, handler); - } - - if (_settings._automaticDecompression != DecompressionMethods.None) - { - handler = new DecompressionHandler(_settings._automaticDecompression, handler); - } - - if (Interlocked.CompareExchange(ref _handler, handler, null) == null) - { - return handler; + handler = new HttpConnectionHandler(poolManager); } else { - handler.Dispose(); - return _handler; + handler = new HttpAuthenticatedConnectionHandler(poolManager); } + + if (settings._allowAutoRedirect) + { + // Just as with WinHttpHandler and CurlHandler, for security reasons, we do not support authentication on redirects + // if the credential is anything other than a CredentialCache. + // We allow credentials in a CredentialCache since they are specifically tied to URIs. + HttpMessageHandler redirectHandler = + (settings._credentials == null || settings._credentials is CredentialCache) ? + handler : + new HttpConnectionHandler(poolManager); // will not authenticate + + handler = new RedirectHandler(settings._maxAutomaticRedirections, handler, redirectHandler); + } + + if (settings._automaticDecompression != DecompressionMethods.None) + { + handler = new DecompressionHandler(settings._automaticDecompression, handler); + } + + // Ensure a single handler is used for all requests. + if (Interlocked.CompareExchange(ref _handler, handler, null) != null) + { + handler.Dispose(); + } + + return _handler; } protected internal override Task SendAsync( @@ -300,7 +335,58 @@ namespace System.Net.Http { CheckDisposed(); HttpMessageHandler handler = _handler ?? SetupHandlerChain(); + + Exception error = ValidateAndNormalizeRequest(request); + if (error != null) + { + return Task.FromException(error); + } + return handler.SendAsync(request, cancellationToken); } + + private Exception ValidateAndNormalizeRequest(HttpRequestMessage request) + { + if (request.Version.Major == 0) + { + return new NotSupportedException(SR.net_http_unsupported_version); + } + + // Add headers to define content transfer, if not present + if (request.HasHeaders && request.Headers.TransferEncodingChunked.GetValueOrDefault()) + { + if (request.Content == null) + { + return new HttpRequestException(SR.net_http_client_execution_error, + new InvalidOperationException(SR.net_http_chunked_not_allowed_with_empty_content)); + } + + // Since the user explicitly set TransferEncodingChunked to true, we need to remove + // the Content-Length header if present, as sending both is invalid. + request.Content.Headers.ContentLength = null; + } + else if (request.Content != null && request.Content.Headers.ContentLength == null) + { + // We have content, but neither Transfer-Encoding nor Content-Length is set. + request.Headers.TransferEncodingChunked = true; + } + + if (request.Version.Minor == 0 && request.Version.Major == 1 && request.HasHeaders) + { + // HTTP 1.0 does not support chunking + if (request.Headers.TransferEncodingChunked == true) + { + return new NotSupportedException(SR.net_http_unsupported_chunking); + } + + // HTTP 1.0 does not support Expect: 100-continue; just disable it. + if (request.Headers.ExpectContinue == true) + { + request.Headers.ExpectContinue = false; + } + } + + return null; + } } } diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/SystemProxyInfo.Unix.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/SystemProxyInfo.Unix.cs new file mode 100644 index 0000000000..4c79a8eb05 --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/SystemProxyInfo.Unix.cs @@ -0,0 +1,16 @@ +// 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.Net.Http +{ + internal static class SystemProxyInfo + { + // On Unix we get default proxy configuration from environment variables + public static IWebProxy ConstructSystemProxy() + { + return HttpEnvironmentProxy.TryCreate(out IWebProxy proxy) ? proxy : null; + } + } +} + diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/SystemProxyInfo.Windows.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/SystemProxyInfo.Windows.cs new file mode 100644 index 0000000000..0994bf54a9 --- /dev/null +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/SystemProxyInfo.Windows.cs @@ -0,0 +1,15 @@ +// 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.Net.Http +{ + internal static class SystemProxyInfo + { + public static IWebProxy ConstructSystemProxy() + { + return HttpSystemProxy.TryCreate(out IWebProxy proxy) ? proxy : null; + } + } +} + diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/StreamContent.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/StreamContent.cs index edc8c3d826..acb84c0efb 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/StreamContent.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/StreamContent.cs @@ -11,16 +11,20 @@ namespace System.Net.Http { public class StreamContent : HttpContent { - private const int DefaultBufferSize = 4096; - private Stream _content; private int _bufferSize; private bool _contentConsumed; private long _start; public StreamContent(Stream content) - : this(content, DefaultBufferSize) { + if (content == null) + { + throw new ArgumentNullException(nameof(content)); + } + + // Indicate that we should use default buffer size by setting size to 0. + InitializeContent(content, 0); } public StreamContent(Stream content, int bufferSize) @@ -34,6 +38,11 @@ namespace System.Net.Http throw new ArgumentOutOfRangeException(nameof(bufferSize)); } + InitializeContent(content, bufferSize); + } + + private void InitializeContent(Stream content, int bufferSize) + { _content = content; _bufferSize = bufferSize; if (content.CanSeek) @@ -143,7 +152,7 @@ namespace System.Net.Http throw new NotSupportedException(SR.net_http_content_readonly_stream); } - public override void Write(ReadOnlySpan source) + public override void Write(ReadOnlySpan buffer) { throw new NotSupportedException(SR.net_http_content_readonly_stream); } @@ -158,7 +167,7 @@ namespace System.Net.Http throw new NotSupportedException(SR.net_http_content_readonly_stream); } - public override Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default) + public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken = default) { throw new NotSupportedException(SR.net_http_content_readonly_stream); } diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/StreamToStreamCopy.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/StreamToStreamCopy.cs index 05e453c2a8..2a74c5cc79 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/StreamToStreamCopy.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/StreamToStreamCopy.cs @@ -19,18 +19,20 @@ namespace System.Net.Http /// Copies the source stream from its current position to the destination stream at its current position. /// The source stream from which to copy. /// The destination stream to which to copy. - /// The size of the buffer to allocate if one needs to be allocated. + /// The size of the buffer to allocate if one needs to be allocated. If zero, use the default buffer size. /// Whether to dispose of the source stream after the copy has finished successfully. /// CancellationToken used to cancel the copy operation. public static Task CopyAsync(Stream source, Stream destination, int bufferSize, bool disposeSource, CancellationToken cancellationToken = default(CancellationToken)) { Debug.Assert(source != null); Debug.Assert(destination != null); - Debug.Assert(bufferSize > 0); + Debug.Assert(bufferSize >= 0); try { - Task copyTask = source.CopyToAsync(destination, bufferSize, cancellationToken); + Task copyTask = bufferSize == 0 ? + source.CopyToAsync(destination, cancellationToken) : + source.CopyToAsync(destination, bufferSize, cancellationToken); return disposeSource ? DisposeSourceWhenCompleteAsync(copyTask, source) : copyTask; diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/CancellationTest.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/CancellationTest.cs deleted file mode 100644 index f29922b17c..0000000000 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/CancellationTest.cs +++ /dev/null @@ -1,162 +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.IO; -using System.Net.Test.Common; -using System.Threading; -using System.Threading.Tasks; - -using Xunit; -using Xunit.Abstractions; - -namespace System.Net.Http.Functional.Tests -{ - public class CancellationTest : HttpClientTestBase - { - private readonly ITestOutputHelper _output; - - public CancellationTest(ITestOutputHelper output) - { - _output = output; - } - - [OuterLoop] // includes seconds of delay - [Theory] - [InlineData(false, false)] - [InlineData(false, true)] - [InlineData(true, false)] - [InlineData(true, true)] - [ActiveIssue("dotnet/corefx #20010", TargetFrameworkMonikers.Uap)] - [ActiveIssue("dotnet/corefx #19038", TargetFrameworkMonikers.NetFramework)] - public async Task GetAsync_ResponseContentRead_CancelUsingTimeoutOrToken_TaskCanceledQuickly( - bool useTimeout, bool startResponseBody) - { - var cts = new CancellationTokenSource(); // ignored if useTimeout==true - TimeSpan timeout = useTimeout ? new TimeSpan(0, 0, 1) : Timeout.InfiniteTimeSpan; - CancellationToken cancellationToken = useTimeout ? CancellationToken.None : cts.Token; - - using (HttpClient client = CreateHttpClient()) - { - client.Timeout = timeout; - - var triggerResponseWrite = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var triggerRequestCancel = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - await LoopbackServer.CreateServerAsync(async (server, url) => - { - Task serverTask = LoopbackServer.AcceptSocketAsync(server, async (socket, stream, reader, writer) => - { - while (!string.IsNullOrEmpty(await reader.ReadLineAsync())) ; - await writer.WriteAsync( - "HTTP/1.1 200 OK\r\n" + - $"Date: {DateTimeOffset.UtcNow:R}\r\n" + - "Content-Length: 16000\r\n" + - "\r\n" + - (startResponseBody ? "less than 16000 bytes" : "")); - - await Task.Delay(1000); - triggerRequestCancel.SetResult(true); // allow request to cancel - await triggerResponseWrite.Task; // pause until we're released - - return null; - }); - - var stopwatch = Stopwatch.StartNew(); - if (PlatformDetection.IsFullFramework) - { - // .NET Framework throws WebException instead of OperationCanceledException. - await Assert.ThrowsAnyAsync(async () => - { - Task getResponse = client.GetAsync(url, HttpCompletionOption.ResponseContentRead, cancellationToken); - await triggerRequestCancel.Task; - cts.Cancel(); - await getResponse; - }); - } - else - { - await Assert.ThrowsAnyAsync(async () => - { - Task getResponse = client.GetAsync(url, HttpCompletionOption.ResponseContentRead, cancellationToken); - await triggerRequestCancel.Task; - cts.Cancel(); - await getResponse; - }); - } - stopwatch.Stop(); - _output.WriteLine("GetAsync() completed at: {0}", stopwatch.Elapsed.ToString()); - - triggerResponseWrite.SetResult(true); - Assert.True(stopwatch.Elapsed < new TimeSpan(0, 0, 30), $"Elapsed time {stopwatch.Elapsed} should be less than 30 seconds, was {stopwatch.Elapsed.TotalSeconds}"); - }); - } - } - - [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "dotnet/corefx #18864")] // Hangs on NETFX - [ActiveIssue(9075, TestPlatforms.AnyUnix)] // recombine this test into the subsequent one when issue is fixed - [OuterLoop] // includes seconds of delay - [Fact] - public Task ReadAsStreamAsync_ReadAsync_Cancel_BodyNeverStarted_TaskCanceledQuickly() - { - return ReadAsStreamAsync_ReadAsync_Cancel_TaskCanceledQuickly(false); - } - - [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "dotnet/corefx #18864")] // Hangs on NETFX - [OuterLoop] // includes seconds of delay - [Theory] - [InlineData(true)] - public async Task ReadAsStreamAsync_ReadAsync_Cancel_TaskCanceledQuickly(bool startResponseBody) - { - using (HttpClient client = CreateHttpClient()) - { - await LoopbackServer.CreateServerAsync(async (server, url) => - { - var triggerResponseWrite = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - Task serverTask = LoopbackServer.AcceptSocketAsync(server, async (socket, stream, reader, writer) => - { - while (!string.IsNullOrEmpty(await reader.ReadLineAsync())) ; - await writer.WriteAsync( - "HTTP/1.1 200 OK\r\n" + - $"Date: {DateTimeOffset.UtcNow:R}\r\n" + - "Content-Length: 16000\r\n" + - "\r\n" + - (startResponseBody ? "20 bytes of the body" : "")); - - await triggerResponseWrite.Task; // pause until we're released - - return null; - }); - - using (HttpResponseMessage response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead)) - using (Stream responseStream = await response.Content.ReadAsStreamAsync()) - { - // Read all expected content - byte[] buffer = new byte[20]; - if (startResponseBody) - { - int totalRead = 0; - int bytesRead; - while (totalRead < 20 && (bytesRead = await responseStream.ReadAsync(buffer, 0, buffer.Length)) > 0) - { - totalRead += bytesRead; - } - } - - // Now do a read that'll need to be canceled - var stopwatch = Stopwatch.StartNew(); - await Assert.ThrowsAnyAsync( - () => responseStream.ReadAsync(buffer, 0, buffer.Length, new CancellationTokenSource(1000).Token)); - stopwatch.Stop(); - - triggerResponseWrite.SetResult(true); - _output.WriteLine("ReadAsync() completed at: {0}", stopwatch.Elapsed.ToString()); - Assert.True(stopwatch.Elapsed < new TimeSpan(0, 0, 30), $"Elapsed time {stopwatch.Elapsed} should be less than 30 seconds, was {stopwatch.Elapsed.TotalSeconds}"); - } - }); - } - } - } -} diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/DefaultCredentialsTest.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/DefaultCredentialsTest.cs index 2e003ac80b..4e822ab538 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/DefaultCredentialsTest.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/DefaultCredentialsTest.cs @@ -2,6 +2,7 @@ // 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.Collections.Generic; using System.Security.Principal; using System.Threading.Tasks; @@ -15,82 +16,76 @@ namespace System.Net.Http.Functional.Tests // TODO: #2383 - Consolidate the use of the environment variable settings to Common/tests. [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "dotnet/corefx #20010")] [PlatformSpecific(TestPlatforms.Windows)] - public class DefaultCredentialsTest : HttpClientTestBase + public abstract class DefaultCredentialsTest : HttpClientTestBase { - private static string DomainJoinedTestServer => Configuration.Http.DomainJoinedHttpHost; - private static bool DomainJoinedTestsEnabled => !string.IsNullOrEmpty(DomainJoinedTestServer); - private static bool DomainProxyTestsEnabled => (!string.IsNullOrEmpty(Configuration.Http.DomainJoinedProxyHost)) && DomainJoinedTestsEnabled; + private static bool DomainJoinedTestsEnabled => !string.IsNullOrEmpty(Configuration.Http.DomainJoinedHttpHost); + + private static bool DomainProxyTestsEnabled => !string.IsNullOrEmpty(Configuration.Http.DomainJoinedProxyHost); + + // Enable this to test against local HttpListener over loopback + // Note this doesn't work as expected with WinHttpHandler, because WinHttpHandler will always authenticate the + // current user against a loopback server using NTLM or Negotiate. + private static bool LocalHttpListenerTestsEnabled = false; + + public static bool ServerAuthenticationTestsEnabled => (LocalHttpListenerTestsEnabled || DomainJoinedTestsEnabled); private static string s_specificUserName = Configuration.Security.ActiveDirectoryUserName; private static string s_specificPassword = Configuration.Security.ActiveDirectoryUserPassword; private static string s_specificDomain = Configuration.Security.ActiveDirectoryName; - private static Uri s_authenticatedServer = - new Uri($"http://{DomainJoinedTestServer}/test/auth/negotiate/showidentity.ashx"); - - // This test endpoint offers multiple schemes, Basic and NTLM, in that specific order. This endpoint - // helps test that the client will use the stronger of the server proposed auth schemes and - // not the first auth scheme. - private static Uri s_multipleSchemesAuthenticatedServer = - new Uri($"http://{DomainJoinedTestServer}/test/auth/multipleschemes/showidentity.ashx"); - - private readonly ITestOutputHelper _output; private readonly NetworkCredential _specificCredential = new NetworkCredential(s_specificUserName, s_specificPassword, s_specificDomain); + private static Uri s_authenticatedServer = DomainJoinedTestsEnabled ? + new Uri($"http://{Configuration.Http.DomainJoinedHttpHost}/test/auth/negotiate/showidentity.ashx") : null; + + private readonly ITestOutputHelper _output; public DefaultCredentialsTest(ITestOutputHelper output) { _output = output; - _output.WriteLine(s_authenticatedServer.ToString()); } [OuterLoop] // TODO: Issue #11345 - [ActiveIssue(10041)] - [ConditionalTheory(nameof(DomainJoinedTestsEnabled))] - [InlineData(false)] - [InlineData(true)] - public async Task UseDefaultCredentials_DefaultValue_Unauthorized(bool useProxy) + [ConditionalTheory(nameof(ServerAuthenticationTestsEnabled))] + [MemberData(nameof(AuthenticatedServers))] + public async Task UseDefaultCredentials_DefaultValue_Unauthorized(string uri, bool useProxy) { HttpClientHandler handler = CreateHttpClientHandler(); handler.UseProxy = useProxy; using (var client = new HttpClient(handler)) - using (HttpResponseMessage response = await client.GetAsync(s_authenticatedServer)) + using (HttpResponseMessage response = await client.GetAsync(uri)) { Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); } } [OuterLoop] // TODO: Issue #11345 - [ActiveIssue(10041)] - [ConditionalTheory(nameof(DomainJoinedTestsEnabled))] - [InlineData(false)] - [InlineData(true)] - public async Task UseDefaultCredentials_SetFalse_Unauthorized(bool useProxy) + [ConditionalTheory(nameof(ServerAuthenticationTestsEnabled))] + [MemberData(nameof(AuthenticatedServers))] + public async Task UseDefaultCredentials_SetFalse_Unauthorized(string uri, bool useProxy) { HttpClientHandler handler = CreateHttpClientHandler(); handler.UseProxy = useProxy; handler.UseDefaultCredentials = false; using (var client = new HttpClient(handler)) - using (HttpResponseMessage response = await client.GetAsync(s_authenticatedServer)) + using (HttpResponseMessage response = await client.GetAsync(uri)) { Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); } } [OuterLoop] // TODO: Issue #11345 - [ActiveIssue(10041)] - [ConditionalTheory(nameof(DomainJoinedTestsEnabled))] - [InlineData(false)] - [InlineData(true)] - public async Task UseDefaultCredentials_SetTrue_ConnectAsCurrentIdentity(bool useProxy) + [ConditionalTheory(nameof(ServerAuthenticationTestsEnabled))] + [MemberData(nameof(AuthenticatedServers))] + public async Task UseDefaultCredentials_SetTrue_ConnectAsCurrentIdentity(string uri, bool useProxy) { HttpClientHandler handler = CreateHttpClientHandler(); handler.UseProxy = useProxy; handler.UseDefaultCredentials = true; using (var client = new HttpClient(handler)) - using (HttpResponseMessage response = await client.GetAsync(s_authenticatedServer)) + using (HttpResponseMessage response = await client.GetAsync(uri)) { Assert.Equal(HttpStatusCode.OK, response.StatusCode); @@ -102,18 +97,19 @@ namespace System.Net.Http.Functional.Tests } [OuterLoop] // TODO: Issue #11345 - [ActiveIssue(10041)] - [ConditionalTheory(nameof(DomainJoinedTestsEnabled))] - [InlineData(false)] - [InlineData(true)] - public async Task UseDefaultCredentials_SetTrueAndServerOffersMultipleSchemes_Ok(bool useProxy) + [ConditionalTheory(nameof(ServerAuthenticationTestsEnabled))] + [MemberData(nameof(AuthenticatedServers))] + public async Task Credentials_SetToWrappedDefaultCredential_ConnectAsCurrentIdentity(string uri, bool useProxy) { HttpClientHandler handler = CreateHttpClientHandler(); handler.UseProxy = useProxy; - handler.UseDefaultCredentials = true; + handler.Credentials = new CredentialWrapper + { + InnerCredentials = CredentialCache.DefaultCredentials + }; using (var client = new HttpClient(handler)) - using (HttpResponseMessage response = await client.GetAsync(s_multipleSchemesAuthenticatedServer)) + using (HttpResponseMessage response = await client.GetAsync(uri)) { Assert.Equal(HttpStatusCode.OK, response.StatusCode); @@ -124,6 +120,22 @@ namespace System.Net.Http.Functional.Tests } } + [OuterLoop] // TODO: Issue #11345 + [ConditionalTheory(nameof(ServerAuthenticationTestsEnabled))] + [MemberData(nameof(AuthenticatedServers))] + public async Task Credentials_SetToBadCredential_Unauthorized(string uri, bool useProxy) + { + HttpClientHandler handler = CreateHttpClientHandler(); + handler.UseProxy = useProxy; + handler.Credentials = new NetworkCredential("notarealuser", "123456"); + + using (var client = new HttpClient(handler)) + using (HttpResponseMessage response = await client.GetAsync(uri)) + { + Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); + } + } + [OuterLoop] // TODO: Issue #11345 [ActiveIssue(10041)] [ConditionalTheory(nameof(DomainJoinedTestsEnabled))] @@ -146,32 +158,6 @@ namespace System.Net.Http.Functional.Tests } } - [OuterLoop] // TODO: Issue #11345 - [ActiveIssue(10041)] - [ConditionalTheory(nameof(DomainJoinedTestsEnabled))] - [InlineData(false)] - [InlineData(true)] - public async Task Credentials_SetToWrappedDefaultCredential_ConnectAsCurrentIdentity(bool useProxy) - { - HttpClientHandler handler = CreateHttpClientHandler(); - handler.UseProxy = useProxy; - handler.Credentials = new CredentialWrapper - { - InnerCredentials = CredentialCache.DefaultCredentials - }; - - using (var client = new HttpClient(handler)) - using (HttpResponseMessage response = await client.GetAsync(s_authenticatedServer)) - { - Assert.Equal(HttpStatusCode.OK, response.StatusCode); - - string responseBody = await response.Content.ReadAsStringAsync(); - WindowsIdentity currentIdentity = WindowsIdentity.GetCurrent(); - _output.WriteLine("currentIdentity={0}", currentIdentity.Name); - VerifyAuthentication(responseBody, true, currentIdentity.Name); - } - } - [OuterLoop] // TODO: Issue #11345 [ActiveIssue(10041)] [ConditionalFact(nameof(DomainProxyTestsEnabled))] @@ -221,6 +207,27 @@ namespace System.Net.Http.Functional.Tests } } + public static IEnumerable AuthenticatedServers() + { + // Note that localhost will not actually use the proxy, but there's no harm in testing it. + foreach (bool b in new bool[] { true, false }) + { + if (LocalHttpListenerTestsEnabled) + { + yield return new object[] { HttpListenerAuthenticatedLoopbackServer.NtlmOnly.Uri, b }; + yield return new object[] { HttpListenerAuthenticatedLoopbackServer.NegotiateOnly.Uri, b }; + yield return new object[] { HttpListenerAuthenticatedLoopbackServer.NegotiateAndNtlm.Uri, b }; + yield return new object[] { HttpListenerAuthenticatedLoopbackServer.BasicAndNtlm.Uri, b }; + } + + if (!string.IsNullOrEmpty(Configuration.Http.DomainJoinedHttpHost)) + { + yield return new object[] { $"http://{Configuration.Http.DomainJoinedHttpHost}/test/auth/negotiate/showidentity.ashx", b }; + yield return new object[] { $"http://{Configuration.Http.DomainJoinedHttpHost}/test/auth/multipleschemes/showidentity.ashx", b }; + } + } + } + private void VerifyAuthentication(string response, bool authenticated, string user) { // Convert all strings to lowercase to compare. Windows treats domain and username as case-insensitive. @@ -296,6 +303,46 @@ namespace System.Net.Http.Functional.Tests { return false; } - } + } + + private sealed class HttpListenerAuthenticatedLoopbackServer + { + private readonly HttpListener _listener; + private readonly string _uri; + + public static readonly HttpListenerAuthenticatedLoopbackServer NtlmOnly = new HttpListenerAuthenticatedLoopbackServer("http://localhost:8080/", AuthenticationSchemes.Ntlm); + public static readonly HttpListenerAuthenticatedLoopbackServer NegotiateOnly = new HttpListenerAuthenticatedLoopbackServer("http://localhost:8081/", AuthenticationSchemes.Negotiate); + public static readonly HttpListenerAuthenticatedLoopbackServer NegotiateAndNtlm = new HttpListenerAuthenticatedLoopbackServer("http://localhost:8082/", AuthenticationSchemes.Negotiate | AuthenticationSchemes.Ntlm); + public static readonly HttpListenerAuthenticatedLoopbackServer BasicAndNtlm = new HttpListenerAuthenticatedLoopbackServer("http://localhost:8083/", AuthenticationSchemes.Basic | AuthenticationSchemes.Ntlm); + + // Don't construct directly, use instances above + private HttpListenerAuthenticatedLoopbackServer(string uri, AuthenticationSchemes authenticationSchemes) + { + _uri = uri; + + _listener = new HttpListener(); + _listener.Prefixes.Add(uri); + _listener.AuthenticationSchemes = authenticationSchemes; + _listener.Start(); + + Task.Run(() => ProcessRequests()); + } + + public string Uri => _uri; + + private async void ProcessRequests() + { + while (true) + { + var context = await _listener.GetContextAsync(); + + // Send a response in the JSON format that the client expects + string username = context.User.Identity.Name; + await context.Response.OutputStream.WriteAsync(System.Text.Encoding.UTF8.GetBytes($"{{\"authenticated\": \"true\", \"user\": \"{username}\" }}")); + + context.Response.Close(); + } + } + } } } diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs index 5a991d1d94..f7c5359b02 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs @@ -20,7 +20,7 @@ namespace System.Net.Http.Functional.Tests [ActiveIssue(20470, TargetFrameworkMonikers.UapAot)] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "NetEventSource is only part of .NET Core.")] - public class DiagnosticsTest : HttpClientTestBase + public abstract class DiagnosticsTest : HttpClientTestBase { [Fact] public static void EventSource_ExistsWithCorrectId() @@ -47,7 +47,7 @@ namespace System.Net.Http.Functional.Tests [Fact] public void SendAsync_ExpectedDiagnosticSourceLogging() { - RemoteInvoke(useManagedHandlerString => + RemoteInvoke(useSocketsHttpHandlerString => { bool requestLogged = false; Guid requestGuid = Guid.Empty; @@ -89,7 +89,7 @@ namespace System.Net.Http.Functional.Tests using (DiagnosticListener.AllListeners.Subscribe(diagnosticListenerObserver)) { diagnosticListenerObserver.Enable( s => !s.Contains("HttpRequestOut")); - using (HttpClient client = CreateHttpClient(useManagedHandlerString)) + using (HttpClient client = CreateHttpClient(useSocketsHttpHandlerString)) { client.GetAsync(Configuration.Http.RemoteEchoServer).Result.Dispose(); } @@ -104,7 +104,7 @@ namespace System.Net.Http.Functional.Tests } return SuccessExitCode; - }, UseManagedHandler.ToString()).Dispose(); + }, UseSocketsHttpHandler.ToString()).Dispose(); } /// @@ -115,7 +115,7 @@ namespace System.Net.Http.Functional.Tests [Fact] public void SendAsync_ExpectedDiagnosticSourceNoLogging() { - RemoteInvoke(useManagedHandlerString => + RemoteInvoke(useSocketsHttpHandlerString => { bool requestLogged = false; bool responseLogged = false; @@ -144,12 +144,11 @@ namespace System.Net.Http.Functional.Tests using (DiagnosticListener.AllListeners.Subscribe(diagnosticListenerObserver)) { - using (HttpClient client = CreateHttpClient(useManagedHandlerString)) + using (HttpClient client = CreateHttpClient(useSocketsHttpHandlerString)) { LoopbackServer.CreateServerAsync(async (server, url) => { - Task> requestLines = LoopbackServer.AcceptSocketAsync(server, - (s, stream, reader, writer) => LoopbackServer.ReadWriteAcceptedAsync(s, reader, writer)); + Task> requestLines = server.AcceptConnectionSendResponseAndCloseAsync(); Task response = client.GetAsync(url); await Task.WhenAll(response, requestLines); @@ -164,15 +163,17 @@ namespace System.Net.Http.Functional.Tests Assert.False(activityStopLogged, "HttpRequestOut.Stop was logged while logging disabled."); } return SuccessExitCode; - }, UseManagedHandler.ToString()).Dispose(); + }, UseSocketsHttpHandler.ToString()).Dispose(); } [ActiveIssue(23771, TestPlatforms.AnyUnix)] [OuterLoop] // TODO: Issue #11345 - [Fact] - public void SendAsync_HttpTracingEnabled_Succeeds() + [Theory] + [InlineData(false)] + [InlineData(true)] + public void SendAsync_HttpTracingEnabled_Succeeds(bool useSsl) { - RemoteInvoke(async useManagedHandlerString => + RemoteInvoke(async (useSocketsHttpHandlerString, useSslString) => { using (var listener = new TestEventListener("Microsoft-System-Net-Http", EventLevel.Verbose)) { @@ -180,21 +181,22 @@ namespace System.Net.Http.Functional.Tests await listener.RunWithCallbackAsync(events.Enqueue, async () => { // Exercise various code paths to get coverage of tracing - using (HttpClient client = CreateHttpClient(useManagedHandlerString)) + using (HttpClient client = CreateHttpClient(useSocketsHttpHandlerString)) { // Do a get to a loopback server await LoopbackServer.CreateServerAsync(async (server, url) => { await TestHelper.WhenAllCompletedOrAnyFailed( - LoopbackServer.ReadRequestAndSendResponseAsync(server), + server.AcceptConnectionSendResponseAndCloseAsync(), client.GetAsync(url)); }); // Do a post to a remote server byte[] expectedData = Enumerable.Range(0, 20000).Select(i => unchecked((byte)i)).ToArray(); - HttpContent content = new ByteArrayContent(expectedData); + Uri remoteServer = bool.Parse(useSslString) ? Configuration.Http.SecureRemoteEchoServer : Configuration.Http.RemoteEchoServer; + var content = new ByteArrayContent(expectedData); content.Headers.ContentMD5 = TestHelper.ComputeMD5Hash(expectedData); - using (HttpResponseMessage response = await client.PostAsync(Configuration.Http.RemoteEchoServer, content)) + using (HttpResponseMessage response = await client.PostAsync(remoteServer, content)) { Assert.Equal(HttpStatusCode.OK, response.StatusCode); } @@ -209,14 +211,14 @@ namespace System.Net.Http.Functional.Tests } return SuccessExitCode; - }, UseManagedHandler.ToString()).Dispose(); + }, UseSocketsHttpHandler.ToString(), useSsl.ToString()).Dispose(); } [OuterLoop] // TODO: Issue #11345 [Fact] public void SendAsync_ExpectedDiagnosticExceptionLogging() { - RemoteInvoke(useManagedHandlerString => + RemoteInvoke(useSocketsHttpHandlerString => { bool exceptionLogged = false; bool responseLogged = false; @@ -242,7 +244,7 @@ namespace System.Net.Http.Functional.Tests using (DiagnosticListener.AllListeners.Subscribe(diagnosticListenerObserver)) { diagnosticListenerObserver.Enable(s => !s.Contains("HttpRequestOut")); - using (HttpClient client = CreateHttpClient(useManagedHandlerString)) + using (HttpClient client = CreateHttpClient(useSocketsHttpHandlerString)) { Assert.ThrowsAsync(() => client.GetAsync($"http://{Guid.NewGuid()}.com")).Wait(); } @@ -254,7 +256,7 @@ namespace System.Net.Http.Functional.Tests } return SuccessExitCode; - }, UseManagedHandler.ToString()).Dispose(); + }, UseSocketsHttpHandler.ToString()).Dispose(); } [ActiveIssue(23209)] @@ -262,7 +264,7 @@ namespace System.Net.Http.Functional.Tests [Fact] public void SendAsync_ExpectedDiagnosticCancelledLogging() { - RemoteInvoke(useManagedHandlerString => + RemoteInvoke(useSocketsHttpHandlerString => { bool cancelLogged = false; var diagnosticListenerObserver = new FakeDiagnosticListenerObserver(kvp => @@ -279,16 +281,15 @@ namespace System.Net.Http.Functional.Tests using (DiagnosticListener.AllListeners.Subscribe(diagnosticListenerObserver)) { diagnosticListenerObserver.Enable(s => !s.Contains("HttpRequestOut")); - using (HttpClient client = CreateHttpClient(useManagedHandlerString)) + using (HttpClient client = CreateHttpClient(useSocketsHttpHandlerString)) { LoopbackServer.CreateServerAsync(async (server, url) => { CancellationTokenSource tcs = new CancellationTokenSource(); - Task request = LoopbackServer.AcceptSocketAsync(server, - (s, stream, reader, writer) => + Task request = server.AcceptConnectionAsync(connection => { tcs.Cancel(); - return LoopbackServer.ReadWriteAcceptedAsync(s, reader, writer); + return connection.ReadRequestHeaderAndSendResponseAsync(); }); Task response = client.GetAsync(url, tcs.Token); await Assert.ThrowsAnyAsync(() => TestHelper.WhenAllCompletedOrAnyFailed(response, request)); @@ -301,14 +302,14 @@ namespace System.Net.Http.Functional.Tests diagnosticListenerObserver.Disable(); return SuccessExitCode; - }, UseManagedHandler.ToString()).Dispose(); + }, UseSocketsHttpHandler.ToString()).Dispose(); } [OuterLoop] // TODO: Issue #11345 [Fact] public void SendAsync_ExpectedDiagnosticSourceActivityLogging() { - RemoteInvoke(useManagedHandlerString => + RemoteInvoke(useSocketsHttpHandlerString => { bool requestLogged = false; bool responseLogged = false; @@ -354,12 +355,11 @@ namespace System.Net.Http.Functional.Tests using (DiagnosticListener.AllListeners.Subscribe(diagnosticListenerObserver)) { diagnosticListenerObserver.Enable(s => s.Contains("HttpRequestOut")); - using (HttpClient client = CreateHttpClient(useManagedHandlerString)) + using (HttpClient client = CreateHttpClient(useSocketsHttpHandlerString)) { LoopbackServer.CreateServerAsync(async (server, url) => { - Task> requestLines = LoopbackServer.AcceptSocketAsync(server, - (s, stream, reader, writer) => LoopbackServer.ReadWriteAcceptedAsync(s, reader, writer)); + Task> requestLines = server.AcceptConnectionSendResponseAndCloseAsync(); Task response = client.GetAsync(url); await Task.WhenAll(response, requestLines); @@ -378,14 +378,14 @@ namespace System.Net.Http.Functional.Tests } return SuccessExitCode; - }, UseManagedHandler.ToString()).Dispose(); + }, UseSocketsHttpHandler.ToString()).Dispose(); } [OuterLoop] // TODO: Issue #11345 [Fact] public void SendAsync_ExpectedDiagnosticSourceUrlFilteredActivityLogging() { - RemoteInvoke(useManagedHandlerString => + RemoteInvoke(useSocketsHttpHandlerString => { bool activityStartLogged = false; bool activityStopLogged = false; @@ -408,7 +408,7 @@ namespace System.Net.Http.Functional.Tests } return true; }); - using (HttpClient client = CreateHttpClient(useManagedHandlerString)) + using (HttpClient client = CreateHttpClient(useSocketsHttpHandlerString)) { client.GetAsync(Configuration.Http.RemoteEchoServer).Result.Dispose(); } @@ -419,14 +419,14 @@ namespace System.Net.Http.Functional.Tests } return SuccessExitCode; - }, UseManagedHandler.ToString()).Dispose(); + }, UseSocketsHttpHandler.ToString()).Dispose(); } [OuterLoop] // TODO: Issue #11345 [Fact] public void SendAsync_ExpectedDiagnosticExceptionActivityLogging() { - RemoteInvoke(useManagedHandlerString => + RemoteInvoke(useSocketsHttpHandlerString => { bool exceptionLogged = false; bool activityStopLogged = false; @@ -453,7 +453,7 @@ namespace System.Net.Http.Functional.Tests using (DiagnosticListener.AllListeners.Subscribe(diagnosticListenerObserver)) { diagnosticListenerObserver.Enable(); - using (HttpClient client = CreateHttpClient(useManagedHandlerString)) + using (HttpClient client = CreateHttpClient(useSocketsHttpHandlerString)) { Assert.ThrowsAsync(() => client.GetAsync($"http://{Guid.NewGuid()}.com")).Wait(); } @@ -465,14 +465,76 @@ namespace System.Net.Http.Functional.Tests } return SuccessExitCode; - }, UseManagedHandler.ToString()).Dispose(); + }, UseSocketsHttpHandler.ToString()).Dispose(); + } + + [OuterLoop] // TODO: Issue #11345 + [Fact] + public void SendAsync_ExpectedDiagnosticSynchronousExceptionActivityLogging() + { + RemoteInvoke(useSocketsHttpHandlerString => + { + bool exceptionLogged = false; + bool activityStopLogged = false; + var diagnosticListenerObserver = new FakeDiagnosticListenerObserver(kvp => + { + if (kvp.Key.Equals("System.Net.Http.HttpRequestOut.Stop")) + { + Assert.NotNull(kvp.Value); + GetPropertyValueFromAnonymousTypeInstance(kvp.Value, "Request"); + var requestStatus = GetPropertyValueFromAnonymousTypeInstance(kvp.Value, "RequestTaskStatus"); + Assert.Equal(TaskStatus.Faulted, requestStatus); + + activityStopLogged = true; + } + else if (kvp.Key.Equals("System.Net.Http.Exception")) + { + Assert.NotNull(kvp.Value); + GetPropertyValueFromAnonymousTypeInstance(kvp.Value, "Exception"); + + exceptionLogged = true; + } + }); + + using (DiagnosticListener.AllListeners.Subscribe(diagnosticListenerObserver)) + { + diagnosticListenerObserver.Enable(); + using (HttpClientHandler handler = CreateHttpClientHandler(useSocketsHttpHandlerString)) + using (HttpClient client = new HttpClient(handler)) + { + if (bool.Parse(useSocketsHttpHandlerString)) + { + // Forces a synchronous exception for SocketsHttpHandler + HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, $"http://{Guid.NewGuid()}.com"); + request.Version = new Version(0, 0); + + Assert.ThrowsAsync(() => client.SendAsync(request)).Wait(); + } + else + { + // Forces a synchronous exception for WinHttpHandler + handler.UseCookies = true; + handler.CookieContainer = null; + + Assert.ThrowsAsync(() => client.GetAsync($"http://{Guid.NewGuid()}.com")).Wait(); + } + } + // Poll with a timeout since logging response is not synchronized with returning a response. + WaitForTrue(() => activityStopLogged, TimeSpan.FromSeconds(1), + "Response with exception was not logged within 1 second timeout."); + Assert.True(exceptionLogged, "Exception was not logged"); + diagnosticListenerObserver.Disable(); + } + + return SuccessExitCode; + }, UseSocketsHttpHandler.ToString()).Dispose(); } [OuterLoop] // TODO: Issue #11345 [Fact] public void SendAsync_ExpectedDiagnosticSourceNewAndDeprecatedEventsLogging() { - RemoteInvoke(useManagedHandlerString => + RemoteInvoke(useSocketsHttpHandlerString => { bool requestLogged = false; bool responseLogged = false; @@ -490,7 +552,7 @@ namespace System.Net.Http.Functional.Tests using (DiagnosticListener.AllListeners.Subscribe(diagnosticListenerObserver)) { diagnosticListenerObserver.Enable(); - using (HttpClient client = CreateHttpClient(useManagedHandlerString)) + using (HttpClient client = CreateHttpClient(useSocketsHttpHandlerString)) { client.GetAsync(Configuration.Http.RemoteEchoServer).Result.Dispose(); } @@ -504,14 +566,14 @@ namespace System.Net.Http.Functional.Tests } return SuccessExitCode; - }, UseManagedHandler.ToString()).Dispose(); + }, UseSocketsHttpHandler.ToString()).Dispose(); } [OuterLoop] // TODO: Issue #11345 [Fact] public void SendAsync_ExpectedDiagnosticExceptionOnlyActivityLogging() { - RemoteInvoke(useManagedHandlerString => + RemoteInvoke(useSocketsHttpHandlerString => { bool exceptionLogged = false; bool activityLogged = false; @@ -530,7 +592,7 @@ namespace System.Net.Http.Functional.Tests using (DiagnosticListener.AllListeners.Subscribe(diagnosticListenerObserver)) { diagnosticListenerObserver.Enable(s => s.Equals("System.Net.Http.Exception")); - using (HttpClient client = CreateHttpClient(useManagedHandlerString)) + using (HttpClient client = CreateHttpClient(useSocketsHttpHandlerString)) { Assert.ThrowsAsync(() => client.GetAsync($"http://{Guid.NewGuid()}.com")).Wait(); } @@ -542,14 +604,14 @@ namespace System.Net.Http.Functional.Tests } return SuccessExitCode; - }, UseManagedHandler.ToString()).Dispose(); + }, UseSocketsHttpHandler.ToString()).Dispose(); } [OuterLoop] // TODO: Issue #11345 [Fact] public void SendAsync_ExpectedDiagnosticStopOnlyActivityLogging() { - RemoteInvoke(useManagedHandlerString => + RemoteInvoke(useSocketsHttpHandlerString => { bool activityStartLogged = false; bool activityStopLogged = false; @@ -567,7 +629,7 @@ namespace System.Net.Http.Functional.Tests using (DiagnosticListener.AllListeners.Subscribe(diagnosticListenerObserver)) { diagnosticListenerObserver.Enable(s => s.Equals("System.Net.Http.HttpRequestOut")); - using (HttpClient client = CreateHttpClient(useManagedHandlerString)) + using (HttpClient client = CreateHttpClient(useSocketsHttpHandlerString)) { client.GetAsync(Configuration.Http.RemoteEchoServer).Result.Dispose(); } @@ -579,7 +641,7 @@ namespace System.Net.Http.Functional.Tests } return SuccessExitCode; - }, UseManagedHandler.ToString()).Dispose(); + }, UseSocketsHttpHandler.ToString()).Dispose(); } [ActiveIssue(23209)] @@ -587,7 +649,7 @@ namespace System.Net.Http.Functional.Tests [Fact] public void SendAsync_ExpectedDiagnosticCancelledActivityLogging() { - RemoteInvoke(useManagedHandlerString => + RemoteInvoke(useSocketsHttpHandlerString => { bool cancelLogged = false; var diagnosticListenerObserver = new FakeDiagnosticListenerObserver(kvp => @@ -605,17 +667,16 @@ namespace System.Net.Http.Functional.Tests using (DiagnosticListener.AllListeners.Subscribe(diagnosticListenerObserver)) { diagnosticListenerObserver.Enable(); - using (HttpClient client = CreateHttpClient(useManagedHandlerString)) + using (HttpClient client = CreateHttpClient(useSocketsHttpHandlerString)) { LoopbackServer.CreateServerAsync(async (server, url) => { CancellationTokenSource tcs = new CancellationTokenSource(); - Task request = LoopbackServer.AcceptSocketAsync(server, - (s, stream, reader, writer) => - { - tcs.Cancel(); - return LoopbackServer.ReadWriteAcceptedAsync(s, reader, writer); - }); + Task request = server.AcceptConnectionAsync(connection => + { + tcs.Cancel(); + return connection.ReadRequestHeaderAndSendResponseAsync(); + }); Task response = client.GetAsync(url, tcs.Token); await Assert.ThrowsAnyAsync(() => TestHelper.WhenAllCompletedOrAnyFailed(response, request)); }).Wait(); @@ -627,7 +688,7 @@ namespace System.Net.Http.Functional.Tests diagnosticListenerObserver.Disable(); return SuccessExitCode; - }, UseManagedHandler.ToString()).Dispose(); + }, UseSocketsHttpHandler.ToString()).Dispose(); } private static T GetPropertyValueFromAnonymousTypeInstance(object obj, string propertyName) @@ -655,7 +716,7 @@ namespace System.Net.Http.Functional.Tests Assert.False(SpinWait.SpinUntil(p, timeout), message); } - private void AssertHeadersAreInjected(List requestLines, Activity parent) + private static void AssertHeadersAreInjected(List requestLines, Activity parent) { string requestId = null; var correlationContext = new List(); @@ -687,7 +748,7 @@ namespace System.Net.Http.Functional.Tests } } - private void AssertNoHeadersAreInjected(List requestLines) + private static void AssertNoHeadersAreInjected(List requestLines) { foreach (var line in requestLines) { diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/DribbleStream.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/DribbleStream.cs new file mode 100644 index 0000000000..39e85c875a --- /dev/null +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/DribbleStream.cs @@ -0,0 +1,68 @@ +// 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.IO; +using System.Threading; +using System.Threading.Tasks; + +namespace System.Net.Http.Functional.Tests +{ + public sealed class DribbleStream : Stream + { + private readonly Stream _wrapped; + private readonly bool _clientDisconnectAllowed; + + public DribbleStream(Stream wrapped, bool clientDisconnectAllowed = false) + { + _wrapped = wrapped; + _clientDisconnectAllowed = clientDisconnectAllowed; + } + + public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + { + try + { + for (int i = 0; i < count; i++) + { + await _wrapped.WriteAsync(buffer, offset + i, 1); + await _wrapped.FlushAsync(); + await Task.Yield(); // introduce short delays, enough to send packets individually but not so long as to extend test duration significantly + } + } + catch (IOException) when (_clientDisconnectAllowed) + { + } + } + + public override void Write(byte[] buffer, int offset, int count) + { + try + { + for (int i = 0; i < count; i++) + { + _wrapped.Write(buffer, offset + i, 1); + _wrapped.Flush(); + } + } + catch (IOException) when (_clientDisconnectAllowed) + { + } + } + + public override bool CanRead => _wrapped.CanRead; + public override bool CanSeek => _wrapped.CanSeek; + public override bool CanWrite => _wrapped.CanWrite; + public override long Length => _wrapped.Length; + public override long Position { get => _wrapped.Position; set => _wrapped.Position = value; } + public override void Flush() => _wrapped.Flush(); + public override Task FlushAsync(CancellationToken cancellationToken) => _wrapped.FlushAsync(cancellationToken); + public override int Read(byte[] buffer, int offset, int count) => _wrapped.Read(buffer, offset, count); + public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) => _wrapped.ReadAsync(buffer, offset, count, cancellationToken); + public override long Seek(long offset, SeekOrigin origin) => _wrapped.Seek(offset, origin); + public override void SetLength(long value) => _wrapped.SetLength(value); + public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken) => _wrapped.CopyToAsync(destination, bufferSize, cancellationToken); + public override void Close() => _wrapped.Close(); + protected override void Dispose(bool disposing) => _wrapped.Dispose(); + } +} diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClient.SelectedSitesTest.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClient.SelectedSitesTest.cs new file mode 100644 index 0000000000..efa191b592 --- /dev/null +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClient.SelectedSitesTest.cs @@ -0,0 +1,133 @@ +// 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.Collections.Generic; +using System.IO; +using System.Reflection; +using System.Threading.Tasks; + +using Xunit; + +namespace System.Net.Http.Functional.Tests +{ + public abstract class HttpClient_SelectedSites_Test : HttpClientTestBase + { + public static bool IsSelectedSitesTestEnabled() + { + string envVar = Environment.GetEnvironmentVariable("CORFX_NET_HTTP_SELECTED_SITES"); + return envVar != null && + (envVar.Equals("true", StringComparison.OrdinalIgnoreCase) || envVar.Equals("1")); + } + + [ConditionalTheory(nameof(IsSelectedSitesTestEnabled))] + [Trait("SelectedSites", "true")] + [MemberData(nameof(GetSelectedSites))] + public async Task RetrieveSite_Succeeds(string site) + { + // Not doing this in bulk for platform handlers. + if (!UseSocketsHttpHandler) + return; + + int remainingAttempts = 2; + while (remainingAttempts-- > 0) + { + try + { + await VisitSite(site); + return; + } + catch + { + if (remainingAttempts < 1) + throw; + await Task.Delay(1500); + } + } + + throw new Exception("Not expected to reach here"); + } + + [ConditionalTheory(nameof(IsSelectedSitesTestEnabled))] + [Trait("SiteInvestigation", "true")] + [InlineData("http://microsoft.com")] + public async Task RetrieveSite_Debug_Helper(string site) + { + await VisitSite(site); + } + + public static IEnumerable GetSelectedSites() + { + const string resourceName = "SelectedSitesTest.txt"; + Assembly assembly = typeof(HttpClient_SelectedSites_Test).Assembly; + Stream s = assembly.GetManifestResourceStream(resourceName); + if (s == null) + { + throw new Exception("Couldn't find resource " + resourceName); + } + + using (var reader = new StreamReader(s)) + { + string site; + while (null != (site = reader.ReadLine())) + { + yield return new[] { site }; + } + } + } + + private async Task VisitSite(string site) + { + using (HttpClient httpClient = CreateHttpClientForSiteVisit()) + { + await VisitSiteWithClient(site, httpClient); + } + } + + private async Task VisitSiteWithClient(string site, HttpClient httpClient) + { + using (HttpResponseMessage response = await httpClient.GetAsync(site)) + { + switch (response.StatusCode) + { + case HttpStatusCode.Redirect: + case HttpStatusCode.OK: + if (response.Content.Headers.ContentLength > 0) + Assert.Equal(response.Content.Headers.ContentLength.Value, (await response.Content.ReadAsByteArrayAsync()).Length); + break; + case HttpStatusCode.BadGateway: + case HttpStatusCode.Forbidden: + case HttpStatusCode.Moved: + case HttpStatusCode.NotFound: + case HttpStatusCode.ServiceUnavailable: + case HttpStatusCode.Unauthorized: + case HttpStatusCode.InternalServerError: + break; + default: + throw new Exception($"{site} returned: {response.StatusCode}"); + } + } + } + + private HttpClient CreateHttpClientForSiteVisit() + { + HttpClient httpClient = new HttpClient(CreateHttpClientHandler(UseSocketsHttpHandler)); + + // Some extra headers since some sites only give proper responses when they are present. + httpClient.DefaultRequestHeaders.Add( + "User-Agent", + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.186 Safari/537.36"); + httpClient.DefaultRequestHeaders.Add( + "Accept-Language", + "en-US,en;q=0.9"); + httpClient.DefaultRequestHeaders.Add( + "Accept-Encoding", + "gzip, deflate, br"); + httpClient.DefaultRequestHeaders.Add( + "Accept", + "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8"); + + return httpClient; + } + } +} diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientEKUTest.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientEKUTest.cs index d5c693a6fd..c6badc770e 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientEKUTest.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientEKUTest.cs @@ -15,14 +15,14 @@ namespace System.Net.Http.Functional.Tests { using Configuration = System.Net.Test.Common.Configuration; - public class HttpClientEKUTest : HttpClientTestBase + public abstract class HttpClientEKUTest : HttpClientTestBase { // Curl + OSX SecureTransport doesn't support the custom certificate callback. private static bool BackendSupportsCustomCertificateHandling => #if TargetsWindows true; #else - CurlSslVersionDescription()?.StartsWith("OpenSSL") ?? false; + Interop.Http.GetSslVersionDescription()?.StartsWith(Interop.Http.OpenSsl10Description, StringComparison.OrdinalIgnoreCase) ?? false; #endif private static bool CanTestCertificates => @@ -32,11 +32,6 @@ namespace System.Net.Http.Functional.Tests private static bool CanTestClientCertificates => CanTestCertificates && BackendSupportsCustomCertificateHandling; -#if !TargetsWindows - [DllImport("System.Net.Http.Native", EntryPoint = "HttpNative_GetSslVersionDescription")] - private static extern string CurlSslVersionDescription(); -#endif - public const int TestTimeoutMilliseconds = 15 * 1000; public static X509Certificate2 serverCertificateServerEku = Configuration.Certificates.GetServerCertificate(); diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.AcceptAllCerts.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.AcceptAllCerts.cs index ab8429ecba..ac1d994bb0 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.AcceptAllCerts.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.AcceptAllCerts.cs @@ -12,7 +12,7 @@ namespace System.Net.Http.Functional.Tests { using Configuration = System.Net.Test.Common.Configuration; - public class HttpClientHandler_DangerousAcceptAllCertificatesValidator_Test : HttpClientTestBase + public abstract class HttpClientHandler_DangerousAcceptAllCertificatesValidator_Test : HttpClientTestBase { private static bool ClientSupportsDHECipherSuites => (!PlatformDetection.IsWindows || PlatformDetection.IsWindows10Version1607OrGreater); @@ -51,7 +51,7 @@ namespace System.Net.Http.Functional.Tests await LoopbackServer.CreateServerAsync(async (server, url) => { await TestHelper.WhenAllCompletedOrAnyFailed( - LoopbackServer.ReadRequestAndSendResponseAsync(server, options: options), + server.AcceptConnectionSendResponseAndCloseAsync(), client.GetAsync(url)); }, options); } diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Authentication.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Authentication.cs new file mode 100644 index 0000000000..b59c26a015 --- /dev/null +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Authentication.cs @@ -0,0 +1,492 @@ +// 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.Collections.Generic; +using System.Net.Test.Common; +using System.Text; +using System.Threading.Tasks; + +using Xunit; + +namespace System.Net.Http.Functional.Tests +{ + public abstract class HttpClientHandler_Authentication_Test : HttpClientTestBase + { + private const string Username = "testusername"; + private const string Password = "testpassword"; + private const string Domain = "testdomain"; + + private static readonly NetworkCredential s_credentials = new NetworkCredential(Username, Password, Domain); + private static readonly NetworkCredential s_credentialsNoDomain = new NetworkCredential(Username, Password); + + private static readonly Func s_createAndValidateRequest = async (handler, url, expectedStatusCode, credentials) => + { + handler.Credentials = credentials; + + using (HttpClient client = new HttpClient(handler)) + using (HttpResponseMessage response = await client.GetAsync(url)) + { + Assert.Equal(expectedStatusCode, response.StatusCode); + } + }; + + [Theory] + [MemberData(nameof(Authentication_TestData))] + public async Task HttpClientHandler_Authentication_Succeeds(string authenticateHeader, bool result) + { + if (PlatformDetection.IsWindowsNanoServer) + { + // TODO: #28065: Fix failing authentication test cases on different httpclienthandlers. + return; + } + + // Digest authentication does not work with domain credentials on CurlHandler. This is blocked by the behavior of LibCurl. + NetworkCredential credentials = (IsCurlHandler && authenticateHeader.ToLowerInvariant().Contains("digest")) ? + s_credentialsNoDomain : + s_credentials; + + var options = new LoopbackServer.Options { Domain = Domain, Username = Username, Password = Password }; + await LoopbackServer.CreateServerAsync(async (server, url) => + { + string serverAuthenticateHeader = $"WWW-Authenticate: {authenticateHeader}\r\n"; + HttpClientHandler handler = CreateHttpClientHandler(); + Task serverTask = result ? + server.AcceptConnectionPerformAuthenticationAndCloseAsync(serverAuthenticateHeader) : + server.AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode.Unauthorized, serverAuthenticateHeader); + + await TestHelper.WhenAllCompletedOrAnyFailedWithTimeout(TestHelper.PassingTestTimeoutMilliseconds, + s_createAndValidateRequest(handler, url, result ? HttpStatusCode.OK : HttpStatusCode.Unauthorized, credentials), serverTask); + }, options); + } + + [Theory] + [InlineData("WWW-Authenticate: Basic realm=\"hello1\"\r\nWWW-Authenticate: Basic realm=\"hello2\"\r\n")] + [InlineData("WWW-Authenticate: Basic realm=\"hello\"\r\nWWW-Authenticate: Basic realm=\"hello\"\r\n")] + [InlineData("WWW-Authenticate: Digest realm=\"hello\", nonce=\"hello\", algorithm=MD5\r\nWWW-Authenticate: Digest realm=\"hello\", nonce=\"hello\", algorithm=MD5\r\n")] + [InlineData("WWW-Authenticate: Digest realm=\"hello1\", nonce=\"hello\", algorithm=MD5\r\nWWW-Authenticate: Digest realm=\"hello\", nonce=\"hello\", algorithm=MD5\r\n")] + public async void HttpClientHandler_MultipleAuthenticateHeaders_WithSameAuth_Succeeds(string authenticateHeader) + { + if (IsWinHttpHandler) + { + // TODO: #28065: Fix failing authentication test cases on different httpclienthandlers. + return; + } + + await HttpClientHandler_MultipleAuthenticateHeaders_Succeeds(authenticateHeader); + } + + [Theory] + [InlineData("WWW-Authenticate: Basic realm=\"hello\"\r\nWWW-Authenticate: Digest realm=\"hello\", nonce=\"hello\", algorithm=MD5\r\n")] + [InlineData("WWW-Authenticate: Digest realm=\"hello\", nonce=\"hello\", algorithm=MD5\r\nWWW-Authenticate: Basic realm=\"hello\"\r\n")] + public async Task HttpClientHandler_MultipleAuthenticateHeaders_Succeeds(string authenticateHeader) + { + if (PlatformDetection.IsWindowsNanoServer || (IsCurlHandler && authenticateHeader.Contains("Digest"))) + { + // TODO: #28065: Fix failing authentication test cases on different httpclienthandlers. + return; + } + + var options = new LoopbackServer.Options { Domain = Domain, Username = Username, Password = Password }; + await LoopbackServer.CreateServerAsync(async (server, url) => + { + HttpClientHandler handler = CreateHttpClientHandler(); + Task serverTask = server.AcceptConnectionPerformAuthenticationAndCloseAsync(authenticateHeader); + await TestHelper.WhenAllCompletedOrAnyFailed(s_createAndValidateRequest(handler, url, HttpStatusCode.OK, s_credentials), serverTask); + }, options); + } + + [Theory] + [InlineData("WWW-Authenticate: Basic realm=\"hello\"\r\nWWW-Authenticate: NTLM\r\n", "Basic", "Negotiate")] + [InlineData("WWW-Authenticate: Basic realm=\"hello\"\r\nWWW-Authenticate: Digest realm=\"hello\", nonce=\"hello\", algorithm=MD5\r\nWWW-Authenticate: NTLM\r\n", "Digest", "Negotiate")] + public async Task HttpClientHandler_MultipleAuthenticateHeaders_PicksSupported(string authenticateHeader, string supportedAuth, string unsupportedAuth) + { + if (PlatformDetection.IsWindowsNanoServer || (IsCurlHandler && authenticateHeader.Contains("Digest"))) + { + // TODO: #28065: Fix failing authentication test cases on different httpclienthandlers. + return; + } + + var options = new LoopbackServer.Options { Domain = Domain, Username = Username, Password = Password }; + await LoopbackServer.CreateServerAsync(async (server, url) => + { + HttpClientHandler handler = CreateHttpClientHandler(); + handler.UseDefaultCredentials = false; + + var credentials = new CredentialCache(); + credentials.Add(url, supportedAuth, new NetworkCredential(Username, Password, Domain)); + credentials.Add(url, unsupportedAuth, new NetworkCredential(Username, Password, Domain)); + + Task serverTask = server.AcceptConnectionPerformAuthenticationAndCloseAsync(authenticateHeader); + await TestHelper.WhenAllCompletedOrAnyFailed(s_createAndValidateRequest(handler, url, HttpStatusCode.OK, credentials), serverTask); + }, options); + } + + [Theory] + [InlineData("WWW-Authenticate: Basic realm=\"hello\"\r\n")] + [InlineData("WWW-Authenticate: Digest realm=\"hello\", nonce=\"testnonce\"\r\n")] + public async void HttpClientHandler_IncorrectCredentials_Fails(string authenticateHeader) + { + var options = new LoopbackServer.Options { Domain = Domain, Username = Username, Password = Password }; + await LoopbackServer.CreateServerAsync(async (server, url) => + { + HttpClientHandler handler = CreateHttpClientHandler(); + Task serverTask = server.AcceptConnectionPerformAuthenticationAndCloseAsync(authenticateHeader); + await TestHelper.WhenAllCompletedOrAnyFailed(s_createAndValidateRequest(handler, url, HttpStatusCode.Unauthorized, new NetworkCredential("wronguser", "wrongpassword")), serverTask); + }, options); + } + + public static IEnumerable Authentication_TestData() + { + yield return new object[] { "Basic realm=\"testrealm\"", true }; + yield return new object[] { "Basic ", true }; + yield return new object[] { "Basic realm=withoutquotes", true }; + yield return new object[] { "basic ", true }; + yield return new object[] { "bAsiC ", true }; + yield return new object[] { "basic", true }; + + yield return new object[] { $"Digest realm=\"testrealm\", nonce=\"{Convert.ToBase64String(Encoding.UTF8.GetBytes($"{DateTimeOffset.UtcNow}:XMh;z+$5|`i6Hx}}\", qop=auth-int, algorithm=MD5"))}\"", true }; + yield return new object[] { $"Basic realm=\"testrealm\", " + + $"Digest realm=\"testrealm\", nonce=\"{Convert.ToBase64String(Encoding.UTF8.GetBytes($"{DateTimeOffset.UtcNow}:XMh;z+$5|`i6Hx}}"))}\", algorithm=MD5", true }; + + if (PlatformDetection.IsNetCore) + { + // TODO: #28060: Fix failing authentication test cases on Framework run. + yield return new object[] { "Basic something, Digest something", false }; + yield return new object[] { $"Digest realm=\"testrealm\", nonce=\"testnonce\", algorithm=MD5 " + + $"Basic realm=\"testrealm\"", false }; + } + } + + [Theory] + [InlineData(null)] + [InlineData("Basic")] + [InlineData("Digest")] + [InlineData("NTLM")] + [InlineData("Kerberos")] + [InlineData("Negotiate")] + public async Task PreAuthenticate_NoPreviousAuthenticatedRequests_NoCredentialsSent(string credCacheScheme) + { + if (IsCurlHandler && credCacheScheme != null) + { + // When provided with a credential that targets just one auth scheme, + // libcurl will often proactively send an auth header. + return; + } + + const int NumRequests = 3; + await LoopbackServer.CreateClientAndServerAsync(async uri => + { + using (HttpClientHandler handler = CreateHttpClientHandler()) + using (var client = new HttpClient(handler)) + { + client.DefaultRequestHeaders.ConnectionClose = true; // for simplicity of not needing to know every handler's pooling policy + handler.PreAuthenticate = true; + switch (credCacheScheme) + { + case null: + handler.Credentials = s_credentials; + break; + + default: + var cc = new CredentialCache(); + cc.Add(uri, credCacheScheme, s_credentials); + handler.Credentials = cc; + break; + } + + for (int i = 0; i < NumRequests; i++) + { + Assert.Equal("hello world", await client.GetStringAsync(uri)); + } + } + }, + async server => + { + for (int i = 0; i < NumRequests; i++) + { + List headers = await server.AcceptConnectionSendResponseAndCloseAsync(content: "hello world"); + Assert.All(headers, header => Assert.DoesNotContain("Authorization", header)); + } + }); + } + + [Theory] + [InlineData(null, "WWW-Authenticate: Basic realm=\"hello\"\r\n")] + [InlineData("Basic", "WWW-Authenticate: Basic realm=\"hello\"\r\n")] + public async Task PreAuthenticate_FirstRequestNoHeaderAndAuthenticates_SecondRequestPreauthenticates(string credCacheScheme, string authResponse) + { + if (IsCurlHandler && credCacheScheme != null) + { + // When provided with a credential that targets just one auth scheme, + // libcurl will often proactively send an auth header. + return; + } + + await LoopbackServer.CreateClientAndServerAsync(async uri => + { + using (HttpClientHandler handler = CreateHttpClientHandler()) + using (var client = new HttpClient(handler)) + { + client.DefaultRequestHeaders.ConnectionClose = true; // for simplicity of not needing to know every handler's pooling policy + handler.PreAuthenticate = true; + switch (credCacheScheme) + { + case null: + handler.Credentials = s_credentials; + break; + + default: + var cc = new CredentialCache(); + cc.Add(uri, credCacheScheme, s_credentials); + handler.Credentials = cc; + break; + } + + Assert.Equal("hello world", await client.GetStringAsync(uri)); + Assert.Equal("hello world", await client.GetStringAsync(uri)); + } + }, + async server => + { + List headers = await server.AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode.Unauthorized, authResponse); + Assert.All(headers, header => Assert.DoesNotContain("Authorization", header)); + + for (int i = 0; i < 2; i++) + { + headers = await server.AcceptConnectionSendResponseAndCloseAsync(content: "hello world"); + Assert.Contains(headers, header => header.Contains("Authorization")); + } + }); + } + + // InlineDatas for all values that pass on WinHttpHandler, which is the most restrictive. + // Uses numerical values for values named in .NET Core and not in .NET Framework. + [Theory] + [InlineData(HttpStatusCode.OK)] + [InlineData(HttpStatusCode.Created)] + [InlineData(HttpStatusCode.Accepted)] + [InlineData(HttpStatusCode.NonAuthoritativeInformation)] + [InlineData(HttpStatusCode.NoContent)] + [InlineData(HttpStatusCode.ResetContent)] + [InlineData(HttpStatusCode.PartialContent)] + [InlineData((HttpStatusCode)207)] // MultiStatus + [InlineData((HttpStatusCode)208)] // AlreadyReported + [InlineData((HttpStatusCode)226)] // IMUsed + [InlineData(HttpStatusCode.Ambiguous)] + [InlineData(HttpStatusCode.Ambiguous)] + [InlineData(HttpStatusCode.NotModified)] + [InlineData(HttpStatusCode.UseProxy)] + [InlineData(HttpStatusCode.Unused)] + [InlineData(HttpStatusCode.BadRequest)] + [InlineData(HttpStatusCode.PaymentRequired)] + [InlineData(HttpStatusCode.Forbidden)] + [InlineData(HttpStatusCode.NotFound)] + [InlineData(HttpStatusCode.MethodNotAllowed)] + [InlineData(HttpStatusCode.NotAcceptable)] + [InlineData(HttpStatusCode.RequestTimeout)] + [InlineData(HttpStatusCode.Conflict)] + [InlineData(HttpStatusCode.Gone)] + [InlineData(HttpStatusCode.LengthRequired)] + [InlineData(HttpStatusCode.PreconditionFailed)] + [InlineData(HttpStatusCode.RequestEntityTooLarge)] + [InlineData(HttpStatusCode.RequestUriTooLong)] + [InlineData(HttpStatusCode.UnsupportedMediaType)] + [InlineData(HttpStatusCode.RequestedRangeNotSatisfiable)] + [InlineData(HttpStatusCode.ExpectationFailed)] + [InlineData((HttpStatusCode)421)] // MisdirectedRequest + [InlineData((HttpStatusCode)422)] // UnprocessableEntity + [InlineData((HttpStatusCode)423)] // Locked + [InlineData((HttpStatusCode)424)] // FailedDependency + [InlineData(HttpStatusCode.UpgradeRequired)] + [InlineData((HttpStatusCode)428)] // PreconditionRequired + [InlineData((HttpStatusCode)429)] // TooManyRequests + [InlineData((HttpStatusCode)431)] // RequestHeaderFieldsTooLarge + [InlineData((HttpStatusCode)451)] // UnavailableForLegalReasons + [InlineData(HttpStatusCode.InternalServerError)] + [InlineData(HttpStatusCode.NotImplemented)] + [InlineData(HttpStatusCode.BadGateway)] + [InlineData(HttpStatusCode.ServiceUnavailable)] + [InlineData(HttpStatusCode.GatewayTimeout)] + [InlineData(HttpStatusCode.HttpVersionNotSupported)] + [InlineData((HttpStatusCode)506)] // VariantAlsoNegotiates + [InlineData((HttpStatusCode)507)] // InsufficientStorage + [InlineData((HttpStatusCode)508)] // LoopDetected + [InlineData((HttpStatusCode)510)] // NotExtended + [InlineData((HttpStatusCode)511)] // NetworkAuthenticationRequired + public async Task PreAuthenticate_FirstRequestNoHeader_SecondRequestVariousStatusCodes_ThirdRequestPreauthenticates(HttpStatusCode statusCode) + { + const string AuthResponse = "WWW-Authenticate: Basic realm=\"hello\"\r\n"; + + await LoopbackServer.CreateClientAndServerAsync(async uri => + { + using (HttpClientHandler handler = CreateHttpClientHandler()) + using (var client = new HttpClient(handler)) + { + client.DefaultRequestHeaders.ConnectionClose = true; // for simplicity of not needing to know every handler's pooling policy + handler.PreAuthenticate = true; + handler.Credentials = s_credentials; + client.DefaultRequestHeaders.ExpectContinue = false; + + using (HttpResponseMessage resp = await client.GetAsync(uri)) + { + Assert.Equal(statusCode, resp.StatusCode); + } + Assert.Equal("hello world", await client.GetStringAsync(uri)); + } + }, + async server => + { + List headers = await server.AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode.Unauthorized, AuthResponse); + Assert.All(headers, header => Assert.DoesNotContain("Authorization", header)); + + headers = await server.AcceptConnectionSendResponseAndCloseAsync(statusCode); + Assert.Contains(headers, header => header.Contains("Authorization")); + + headers = await server.AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode.OK, content: "hello world"); + Assert.Contains(headers, header => header.Contains("Authorization")); + }); + } + + [Theory] + [InlineData("/something/hello.html", "/something/hello.html", true)] + [InlineData("/something/hello.html", "/something/world.html", true)] + [InlineData("/something/hello.html", "/something/", true)] + [InlineData("/something/hello.html", "/", false)] + [InlineData("/something/hello.html", "/hello.html", false)] + [InlineData("/something/hello.html", "/world.html", false)] + [InlineData("/something/hello.html", "/another/", false)] + [InlineData("/something/hello.html", "/another/hello.html", false)] + public async Task PreAuthenticate_AuthenticatedUrl_ThenTryDifferentUrl_SendsAuthHeaderOnlyIfPrefixMatches( + string originalRelativeUri, string secondRelativeUri, bool expectedAuthHeader) + { + const string AuthResponse = "WWW-Authenticate: Basic realm=\"hello\"\r\n"; + + await LoopbackServer.CreateClientAndServerAsync(async uri => + { + using (HttpClientHandler handler = CreateHttpClientHandler()) + using (var client = new HttpClient(handler)) + { + client.DefaultRequestHeaders.ConnectionClose = true; // for simplicity of not needing to know every handler's pooling policy + handler.PreAuthenticate = true; + handler.Credentials = s_credentials; + + Assert.Equal("hello world 1", await client.GetStringAsync(new Uri(uri, originalRelativeUri))); + Assert.Equal("hello world 2", await client.GetStringAsync(new Uri(uri, secondRelativeUri))); + } + }, + async server => + { + List headers = await server.AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode.Unauthorized, AuthResponse); + Assert.All(headers, header => Assert.DoesNotContain("Authorization", header)); + + headers = await server.AcceptConnectionSendResponseAndCloseAsync(content: "hello world 1"); + Assert.Contains(headers, header => header.Contains("Authorization")); + + headers = await server.AcceptConnectionSendResponseAndCloseAsync(content: "hello world 2"); + if (expectedAuthHeader) + { + Assert.Contains(headers, header => header.Contains("Authorization")); + } + else + { + Assert.All(headers, header => Assert.DoesNotContain("Authorization", header)); + } + }); + } + + [Fact] + public async Task PreAuthenticate_SuccessfulBasicButThenFails_DoesntLoopInfinitely() + { + await LoopbackServer.CreateClientAndServerAsync(async uri => + { + using (HttpClientHandler handler = CreateHttpClientHandler()) + using (var client = new HttpClient(handler)) + { + client.DefaultRequestHeaders.ConnectionClose = true; // for simplicity of not needing to know every handler's pooling policy + handler.PreAuthenticate = true; + handler.Credentials = s_credentials; + + // First two requests: initially without auth header, then with + Assert.Equal("hello world", await client.GetStringAsync(uri)); + + // Attempt preauth, and when that fails, give up. + using (HttpResponseMessage resp = await client.GetAsync(uri)) + { + Assert.Equal(HttpStatusCode.Unauthorized, resp.StatusCode); + } + } + }, + async server => + { + // First request, no auth header, challenge Basic + List headers = headers = await server.AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode.Unauthorized, "WWW-Authenticate: Basic realm=\"hello\"\r\n"); + Assert.All(headers, header => Assert.DoesNotContain("Authorization", header)); + + // Second request, contains Basic auth header + headers = await server.AcceptConnectionSendResponseAndCloseAsync(content: "hello world"); + Assert.Contains(headers, header => header.Contains("Authorization")); + + // Third request, contains Basic auth header but challenges anyway + headers = headers = await server.AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode.Unauthorized, "WWW-Authenticate: Basic realm=\"hello\"\r\n"); + Assert.Contains(headers, header => header.Contains("Authorization")); + + if (IsNetfxHandler) + { + // For some reason, netfx tries one more time. + headers = headers = await server.AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode.Unauthorized, "WWW-Authenticate: Basic realm=\"hello\"\r\n"); + Assert.Contains(headers, header => header.Contains("Authorization")); + } + }); + } + + [Fact] + public async Task PreAuthenticate_SuccessfulBasic_ThenDigestChallenged() + { + if (IsWinHttpHandler) + { + // WinHttpHandler fails with Unauthorized after the basic preauth fails. + return; + } + + if (IsCurlHandler) + { + // When provided with a credential that targets just one auth scheme, + // libcurl will often proactively send an auth header. + return; + } + + await LoopbackServer.CreateClientAndServerAsync(async uri => + { + using (HttpClientHandler handler = CreateHttpClientHandler()) + using (var client = new HttpClient(handler)) + { + client.DefaultRequestHeaders.ConnectionClose = true; // for simplicity of not needing to know every handler's pooling policy + handler.PreAuthenticate = true; + handler.Credentials = s_credentials; + + Assert.Equal("hello world", await client.GetStringAsync(uri)); + Assert.Equal("hello world", await client.GetStringAsync(uri)); + } + }, + async server => + { + // First request, no auth header, challenge Basic + List headers = headers = await server.AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode.Unauthorized, "WWW-Authenticate: Basic realm=\"hello\"\r\n"); + Assert.All(headers, header => Assert.DoesNotContain("Authorization", header)); + + // Second request, contains Basic auth header, success + headers = await server.AcceptConnectionSendResponseAndCloseAsync(content: "hello world"); + Assert.Contains(headers, header => header.Contains("Authorization")); + + // Third request, contains Basic auth header, challenge digest + headers = await server.AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode.Unauthorized, "WWW-Authenticate: Digest realm=\"hello\", nonce=\"testnonce\"\r\n"); + Assert.Contains(headers, header => header.Contains("Authorization: Basic")); + + // Fourth request, contains Digest auth header, success + headers = await server.AcceptConnectionSendResponseAndCloseAsync(content: "hello world"); + Assert.Contains(headers, header => header.Contains("Authorization: Digest")); + }); + } + } +} diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Cancellation.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Cancellation.cs new file mode 100644 index 0000000000..8cb0273fc1 --- /dev/null +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Cancellation.cs @@ -0,0 +1,449 @@ +// 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.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.IO; +using System.Net.Test.Common; +using System.Threading; +using System.Threading.Tasks; +using Xunit; + +namespace System.Net.Http.Functional.Tests +{ + public abstract class HttpClientHandler_Cancellation_Test : HttpClientTestBase + { + [Theory] + [InlineData(false, CancellationMode.Token)] + [InlineData(true, CancellationMode.Token)] + public async Task PostAsync_CancelDuringRequestContentSend_TaskCanceledQuickly(bool chunkedTransfer, CancellationMode mode) + { + if (!UseSocketsHttpHandler) + { + // Issue #27063: hangs / doesn't cancel + return; + } + + var serverRelease = new TaskCompletionSource(); + await LoopbackServer.CreateClientAndServerAsync(async uri => + { + try + { + using (HttpClient client = CreateHttpClient()) + { + client.Timeout = Timeout.InfiniteTimeSpan; + var cts = new CancellationTokenSource(); + + var waitToSend = new TaskCompletionSource(); + var contentSending = new TaskCompletionSource(); + var req = new HttpRequestMessage(HttpMethod.Post, uri) { Content = new ByteAtATimeContent(int.MaxValue, waitToSend.Task, contentSending) }; + req.Headers.TransferEncodingChunked = chunkedTransfer; + + Task resp = client.SendAsync(req, HttpCompletionOption.ResponseHeadersRead, cts.Token); + waitToSend.SetResult(true); + await contentSending.Task; + Cancel(mode, client, cts); + await ValidateClientCancellationAsync(() => resp); + } + } + finally + { + serverRelease.SetResult(true); + } + }, server => server.AcceptConnectionAsync(connection => serverRelease.Task)); + } + + [Theory] + [MemberData(nameof(TwoBoolsAndCancellationMode))] + public async Task GetAsync_CancelDuringResponseHeadersReceived_TaskCanceledQuickly(bool chunkedTransfer, bool connectionClose, CancellationMode mode) + { + using (HttpClient client = CreateHttpClient()) + { + client.Timeout = Timeout.InfiniteTimeSpan; + var cts = new CancellationTokenSource(); + + await LoopbackServer.CreateServerAsync(async (server, url) => + { + var partialResponseHeadersSent = new TaskCompletionSource(); + var clientFinished = new TaskCompletionSource(); + + Task serverTask = server.AcceptConnectionAsync(async connection => + { + await connection.ReadRequestHeaderAndSendCustomResponseAsync( + $"HTTP/1.1 200 OK\r\nDate: {DateTimeOffset.UtcNow:R}\r\n"); // missing final \r\n so headers don't complete + + partialResponseHeadersSent.TrySetResult(true); + await clientFinished.Task; + }); + + await ValidateClientCancellationAsync(async () => + { + var req = new HttpRequestMessage(HttpMethod.Get, url); + req.Headers.ConnectionClose = connectionClose; + + Task getResponse = client.SendAsync(req, HttpCompletionOption.ResponseHeadersRead, cts.Token); + await partialResponseHeadersSent.Task; + Cancel(mode, client, cts); + await getResponse; + }); + + try + { + clientFinished.SetResult(true); + await serverTask; + } catch { } + }); + } + } + + [Theory] + [MemberData(nameof(TwoBoolsAndCancellationMode))] + public async Task GetAsync_CancelDuringResponseBodyReceived_Buffered_TaskCanceledQuickly(bool chunkedTransfer, bool connectionClose, CancellationMode mode) + { + using (HttpClient client = CreateHttpClient()) + { + client.Timeout = Timeout.InfiniteTimeSpan; + var cts = new CancellationTokenSource(); + + await LoopbackServer.CreateServerAsync(async (server, url) => + { + var responseHeadersSent = new TaskCompletionSource(); + var clientFinished = new TaskCompletionSource(); + + Task serverTask = server.AcceptConnectionAsync(async connection => + { + await connection.ReadRequestHeaderAndSendCustomResponseAsync( + $"HTTP/1.1 200 OK\r\n" + + $"Date: {DateTimeOffset.UtcNow:R}\r\n" + + (!chunkedTransfer ? "Content-Length: 20\r\n" : "") + + (connectionClose ? "Connection: close\r\n" : "") + + $"\r\n123"); // "123" is part of body and could either be chunked size or part of content-length bytes, both incomplete + + responseHeadersSent.TrySetResult(true); + await clientFinished.Task; + }); + + await ValidateClientCancellationAsync(async () => + { + var req = new HttpRequestMessage(HttpMethod.Get, url); + req.Headers.ConnectionClose = connectionClose; + + Task getResponse = client.SendAsync(req, HttpCompletionOption.ResponseContentRead, cts.Token); + await responseHeadersSent.Task; + await Task.Delay(1); // make it more likely that client will have started processing response body + Cancel(mode, client, cts); + await getResponse; + }); + + try + { + clientFinished.SetResult(true); + await serverTask; + } catch { } + }); + } + } + + [Theory] + [MemberData(nameof(ThreeBools))] + public async Task GetAsync_CancelDuringResponseBodyReceived_Unbuffered_TaskCanceledQuickly(bool chunkedTransfer, bool connectionClose, bool readOrCopyToAsync) + { + if (IsNetfxHandler || IsCurlHandler) + { + // doesn't cancel + return; + } + + using (HttpClient client = CreateHttpClient()) + { + client.Timeout = Timeout.InfiniteTimeSpan; + var cts = new CancellationTokenSource(); + + await LoopbackServer.CreateServerAsync(async (server, url) => + { + var clientFinished = new TaskCompletionSource(); + + Task serverTask = server.AcceptConnectionAsync(async connection => + { + await connection.ReadRequestHeaderAndSendCustomResponseAsync( + $"HTTP/1.1 200 OK\r\n" + + $"Date: {DateTimeOffset.UtcNow:R}\r\n" + + (!chunkedTransfer ? "Content-Length: 20\r\n" : "") + + (connectionClose ? "Connection: close\r\n" : "") + + $"\r\n"); + + await clientFinished.Task; + }); + + var req = new HttpRequestMessage(HttpMethod.Get, url); + req.Headers.ConnectionClose = connectionClose; + Task getResponse = client.SendAsync(req, HttpCompletionOption.ResponseHeadersRead, cts.Token); + await ValidateClientCancellationAsync(async () => + { + HttpResponseMessage resp = await getResponse; + Stream respStream = await resp.Content.ReadAsStreamAsync(); + Task readTask = readOrCopyToAsync ? + respStream.ReadAsync(new byte[1], 0, 1, cts.Token) : + respStream.CopyToAsync(Stream.Null, 10, cts.Token); + cts.Cancel(); + await readTask; + }); + + try + { + clientFinished.SetResult(true); + await serverTask; + } catch { } + }); + } + } + + [Theory] + [InlineData(CancellationMode.CancelPendingRequests, false)] + [InlineData(CancellationMode.DisposeHttpClient, true)] + [InlineData(CancellationMode.CancelPendingRequests, false)] + [InlineData(CancellationMode.DisposeHttpClient, true)] + public async Task GetAsync_CancelPendingRequests_DoesntCancelReadAsyncOnResponseStream(CancellationMode mode, bool copyToAsync) + { + if (IsNetfxHandler) + { + // throws ObjectDisposedException as part of Stream.CopyToAsync/ReadAsync + return; + } + if (IsCurlHandler) + { + // Issue #27065 + // throws OperationCanceledException from Stream.CopyToAsync/ReadAsync + return; + } + + using (HttpClient client = CreateHttpClient()) + { + client.Timeout = Timeout.InfiniteTimeSpan; + + await LoopbackServer.CreateServerAsync(async (server, url) => + { + var clientReadSomeBody = new TaskCompletionSource(); + var clientFinished = new TaskCompletionSource(); + + var responseContentSegment = new string('s', 3000); + int responseSegments = 4; + int contentLength = responseContentSegment.Length * responseSegments; + + Task serverTask = server.AcceptConnectionAsync(async connection => + { + await connection.ReadRequestHeaderAndSendCustomResponseAsync( + $"HTTP/1.1 200 OK\r\n" + + $"Date: {DateTimeOffset.UtcNow:R}\r\n" + + $"Content-Length: {contentLength}\r\n" + + $"\r\n"); + + for (int i = 0; i < responseSegments; i++) + { + await connection.Writer.WriteAsync(responseContentSegment); + if (i == 0) + { + await clientReadSomeBody.Task; + } + } + + await clientFinished.Task; + }); + + + using (HttpResponseMessage resp = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead)) + using (Stream respStream = await resp.Content.ReadAsStreamAsync()) + { + var result = new MemoryStream(); + int b = respStream.ReadByte(); + Assert.NotEqual(-1, b); + result.WriteByte((byte)b); + + Cancel(mode, client, null); // should not cancel the operation, as using ResponseHeadersRead + clientReadSomeBody.SetResult(true); + + if (copyToAsync) + { + await respStream.CopyToAsync(result, 10, new CancellationTokenSource().Token); + } + else + { + byte[] buffer = new byte[10]; + int bytesRead; + while ((bytesRead = await respStream.ReadAsync(buffer, 0, buffer.Length)) > 0) + { + result.Write(buffer, 0, bytesRead); + } + } + + Assert.Equal(contentLength, result.Length); + } + + clientFinished.SetResult(true); + await serverTask; + }); + } + } + + [Fact] + public async Task MaxConnectionsPerServer_WaitingConnectionsAreCancelable() + { + if (IsWinHttpHandler) + { + // Issue #27064: + // Throws WinHttpException ("The server returned an invalid or unrecognized response") + // while parsing headers. + return; + } + if (IsNetfxHandler) + { + // Throws HttpRequestException wrapping a WebException for the canceled request + // instead of throwing an OperationCanceledException or a canceled WebException directly. + return; + } + + using (HttpClientHandler handler = CreateHttpClientHandler()) + using (HttpClient client = new HttpClient(handler)) + { + handler.MaxConnectionsPerServer = 1; + client.Timeout = Timeout.InfiniteTimeSpan; + + await LoopbackServer.CreateServerAsync(async (server, url) => + { + var serverAboutToBlock = new TaskCompletionSource(); + var blockServerResponse = new TaskCompletionSource(); + + Task serverTask1 = server.AcceptConnectionAsync(async connection1 => + { + await connection1.ReadRequestHeaderAsync(); + await connection1.Writer.WriteAsync($"HTTP/1.1 200 OK\r\nDate: {DateTimeOffset.UtcNow:R}\r\n"); + serverAboutToBlock.SetResult(true); + await blockServerResponse.Task; + await connection1.Writer.WriteAsync("Content-Length: 5\r\n\r\nhello"); + }); + + Task get1 = client.GetAsync(url); + await serverAboutToBlock.Task; + + var cts = new CancellationTokenSource(); + Task get2 = ValidateClientCancellationAsync(() => client.GetAsync(url, cts.Token)); + Task get3 = ValidateClientCancellationAsync(() => client.GetAsync(url, cts.Token)); + + Task get4 = client.GetAsync(url); + + cts.Cancel(); + await get2; + await get3; + + blockServerResponse.SetResult(true); + await new[] { get1, serverTask1 }.WhenAllOrAnyFailed(); + + Task serverTask4 = server.AcceptConnectionSendResponseAndCloseAsync(); + + await new[] { get4, serverTask4 }.WhenAllOrAnyFailed(); + }); + } + } + + private async Task ValidateClientCancellationAsync(Func clientBodyAsync) + { + var stopwatch = Stopwatch.StartNew(); + Exception error = await Record.ExceptionAsync(clientBodyAsync); + stopwatch.Stop(); + + Assert.NotNull(error); + + if (IsNetfxHandler) + { + Assert.True( + error is WebException we && we.Status == WebExceptionStatus.RequestCanceled || + error is OperationCanceledException, + "Expected cancellation exception, got:" + Environment.NewLine + error); + } + else + { + Assert.True( + error is OperationCanceledException, + "Expected cancellation exception, got:" + Environment.NewLine + error); + } + + Assert.True(stopwatch.Elapsed < new TimeSpan(0, 0, 30), $"Elapsed time {stopwatch.Elapsed} should be less than 30 seconds, was {stopwatch.Elapsed.TotalSeconds}"); + } + + private static void Cancel(CancellationMode mode, HttpClient client, CancellationTokenSource cts) + { + if ((mode & CancellationMode.Token) != 0) + { + cts?.Cancel(); + } + + if ((mode & CancellationMode.CancelPendingRequests) != 0) + { + client?.CancelPendingRequests(); + } + + if ((mode & CancellationMode.DisposeHttpClient) != 0) + { + client?.Dispose(); + } + } + + [Flags] + public enum CancellationMode + { + Token = 0x1, + CancelPendingRequests = 0x2, + DisposeHttpClient = 0x4 + } + + private static readonly bool[] s_bools = new[] { true, false }; + + public static IEnumerable TwoBoolsAndCancellationMode() => + from first in s_bools + from second in s_bools + from mode in new[] { CancellationMode.Token, CancellationMode.CancelPendingRequests, CancellationMode.DisposeHttpClient, CancellationMode.Token | CancellationMode.CancelPendingRequests } + select new object[] { first, second, mode }; + + public static IEnumerable ThreeBools() => + from first in s_bools + from second in s_bools + from third in s_bools + select new object[] { first, second, third }; + + private sealed class ByteAtATimeContent : HttpContent + { + private readonly Task _waitToSend; + private readonly TaskCompletionSource _startedSend; + private readonly int _length; + + public ByteAtATimeContent(int length, Task waitToSend, TaskCompletionSource startedSend) + { + _length = length; + _waitToSend = waitToSend; + _startedSend = startedSend; + } + + protected override async Task SerializeToStreamAsync(Stream stream, TransportContext context) + { + await _waitToSend; + _startedSend.SetResult(true); + + var buffer = new byte[1] { 42 }; + for (int i = 0; i < _length; i++) + { + await stream.WriteAsync(buffer); + await stream.FlushAsync(); + await Task.Delay(1); + } + } + + protected override bool TryComputeLength(out long length) + { + length = _length; + return true; + } + } + } +} diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ClientCertificates.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ClientCertificates.cs index 9530ce22fe..78d0fdb09f 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ClientCertificates.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ClientCertificates.cs @@ -5,6 +5,7 @@ using System.Net.Security; using System.Net.Sockets; using System.Net.Test.Common; +using System.Runtime.InteropServices; using System.Security.Cryptography.X509Certificates; using System.Threading.Tasks; using Xunit; @@ -14,7 +15,7 @@ namespace System.Net.Http.Functional.Tests { using Configuration = System.Net.Test.Common.Configuration; - public class HttpClientHandler_ClientCertificates_Test : HttpClientTestBase + public abstract class HttpClientHandler_ClientCertificates_Test : HttpClientTestBase { public bool CanTestCertificates => Capability.IsTrustedRootCertificateInstalled() && @@ -75,7 +76,7 @@ namespace System.Net.Http.Functional.Tests [Fact] public async Task Automatic_SSLBackendNotSupported_ThrowsPlatformNotSupportedException() { - if (BackendSupportsCustomCertificateHandling) // can't use [Conditional*] right now as it's evaluated at the wrong time for the managed handler + if (BackendSupportsCustomCertificateHandling) // can't use [Conditional*] right now as it's evaluated at the wrong time for SocketsHttpHandler { return; } @@ -92,7 +93,7 @@ namespace System.Net.Http.Functional.Tests [Fact] public async Task Manual_SSLBackendNotSupported_ThrowsPlatformNotSupportedException() { - if (BackendSupportsCustomCertificateHandling) // can't use [Conditional*] right now as it's evaluated at the wrong time for the managed handler + if (BackendSupportsCustomCertificateHandling) // can't use [Conditional*] right now as it's evaluated at the wrong time for SocketsHttpHandler { return; } @@ -109,7 +110,7 @@ namespace System.Net.Http.Functional.Tests [Fact] public void Manual_SendClientCertificateWithClientAuthEKUToRemoteServer_OK() { - if (!CanTestClientCertificates) // can't use [Conditional*] right now as it's evaluated at the wrong time for the managed handler + if (!CanTestClientCertificates) // can't use [Conditional*] right now as it's evaluated at the wrong time for SocketsHttpHandler { _output.WriteLine($"Skipping {nameof(Manual_SendClientCertificateWithClientAuthEKUToRemoteServer_OK)}()"); return; @@ -118,10 +119,10 @@ namespace System.Net.Http.Functional.Tests // UAP HTTP stack caches connections per-process. This causes interference when these tests run in // the same process as the other tests. Each test needs to be isolated to its own process. // See dicussion: https://github.com/dotnet/corefx/issues/21945 - RemoteInvoke(async useManagedHandlerString => + RemoteInvoke(async useSocketsHttpHandlerString => { var cert = Configuration.Certificates.GetClientCertificate(); - HttpClientHandler handler = CreateHttpClientHandler(useManagedHandlerString); + HttpClientHandler handler = CreateHttpClientHandler(useSocketsHttpHandlerString); handler.ClientCertificates.Add(cert); using (var client = new HttpClient(handler)) { @@ -135,20 +136,14 @@ namespace System.Net.Http.Functional.Tests return SuccessExitCode; } - }, UseManagedHandler.ToString()).Dispose(); + }, UseSocketsHttpHandler.ToString()).Dispose(); } [OuterLoop] // TODO: Issue #11345 [Fact] public void Manual_SendClientCertificateWithServerAuthEKUToRemoteServer_Forbidden() { - if (UseManagedHandler) - { - // TODO #23128: The managed handler is currently sending out client certificates when it shouldn't. - return; - } - - if (!CanTestClientCertificates) // can't use [Conditional*] right now as it's evaluated at the wrong time for the managed handler + if (!CanTestClientCertificates) // can't use [Conditional*] right now as it's evaluated at the wrong time for SocketsHttpHandler { _output.WriteLine($"Skipping {nameof(Manual_SendClientCertificateWithServerAuthEKUToRemoteServer_Forbidden)}()"); return; @@ -157,10 +152,10 @@ namespace System.Net.Http.Functional.Tests // UAP HTTP stack caches connections per-process. This causes interference when these tests run in // the same process as the other tests. Each test needs to be isolated to its own process. // See dicussion: https://github.com/dotnet/corefx/issues/21945 - RemoteInvoke(async useManagedHandlerString => + RemoteInvoke(async useSocketsHttpHandlerString => { var cert = Configuration.Certificates.GetServerCertificate(); - HttpClientHandler handler = CreateHttpClientHandler(useManagedHandlerString); + HttpClientHandler handler = CreateHttpClientHandler(useSocketsHttpHandlerString); handler.ClientCertificates.Add(cert); using (var client = new HttpClient(handler)) { @@ -169,14 +164,14 @@ namespace System.Net.Http.Functional.Tests return SuccessExitCode; } - }, UseManagedHandler.ToString()).Dispose(); + }, UseSocketsHttpHandler.ToString()).Dispose(); } [OuterLoop] // TODO: Issue #11345 [Fact] public void Manual_SendClientCertificateWithNoEKUToRemoteServer_OK() { - if (!CanTestClientCertificates) // can't use [Conditional*] right now as it's evaluated at the wrong time for the managed handler + if (!CanTestClientCertificates) // can't use [Conditional*] right now as it's evaluated at the wrong time for SocketsHttpHandler { _output.WriteLine($"Skipping {nameof(Manual_SendClientCertificateWithNoEKUToRemoteServer_OK)}()"); return; @@ -185,10 +180,10 @@ namespace System.Net.Http.Functional.Tests // UAP HTTP stack caches connections per-process. This causes interference when these tests run in // the same process as the other tests. Each test needs to be isolated to its own process. // See dicussion: https://github.com/dotnet/corefx/issues/21945 - RemoteInvoke(async useManagedHandlerString => + RemoteInvoke(async useSocketsHttpHandlerString => { var cert = Configuration.Certificates.GetNoEKUCertificate(); - HttpClientHandler handler = CreateHttpClientHandler(useManagedHandlerString); + HttpClientHandler handler = CreateHttpClientHandler(useSocketsHttpHandlerString); handler.ClientCertificates.Add(cert); using (var client = new HttpClient(handler)) { @@ -202,12 +197,12 @@ namespace System.Net.Http.Functional.Tests return SuccessExitCode; } - }, UseManagedHandler.ToString()).Dispose(); + }, UseSocketsHttpHandler.ToString()).Dispose(); } [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "dotnet/corefx #20010")] - [OuterLoop] // TODO: Issue #11345 [ActiveIssue(9543)] // fails sporadically with 'WinHttpException : The server returned an invalid or unrecognized response' or 'TaskCanceledException : A task was canceled' + [OuterLoop] // TODO: Issue #11345 [Theory] [InlineData(6, false)] [InlineData(3, true)] @@ -215,12 +210,18 @@ namespace System.Net.Http.Functional.Tests int numberOfRequests, bool reuseClient) // validate behavior with and without connection pooling, which impacts client cert usage { - if (!BackendSupportsCustomCertificateHandling) // can't use [Conditional*] right now as it's evaluated at the wrong time for the managed handler + if (!BackendSupportsCustomCertificateHandling) // can't use [Conditional*] right now as it's evaluated at the wrong time for SocketsHttpHandler { _output.WriteLine($"Skipping {nameof(Manual_CertificateSentMatchesCertificateReceived_Success)}()"); return; } + if (!UseSocketsHttpHandler) + { + // Issue #9543: fails sporadically on WinHttpHandler/CurlHandler + return; + } + var options = new LoopbackServer.Options { UseSsl = true }; Func createClient = (cert) => @@ -228,27 +229,27 @@ namespace System.Net.Http.Functional.Tests HttpClientHandler handler = CreateHttpClientHandler(); handler.ServerCertificateCustomValidationCallback = delegate { return true; }; handler.ClientCertificates.Add(cert); + Assert.True(handler.ClientCertificates.Contains(cert)); return new HttpClient(handler); }; - Func makeAndValidateRequest = async (client, server, url, cert) => + Func makeAndValidateRequest = async (client, server, url, cert) => { await TestHelper.WhenAllCompletedOrAnyFailed( client.GetStringAsync(url), - LoopbackServer.AcceptSocketAsync(server, async (socket, stream, reader, writer) => + server.AcceptConnectionAsync(async connection => { - SslStream sslStream = Assert.IsType(stream); + SslStream sslStream = Assert.IsType(connection.Stream); Assert.Equal(cert, sslStream.RemoteCertificate); - await LoopbackServer.ReadWriteAcceptedAsync(socket, reader, writer); - return null; - }, options)); + await connection.ReadRequestHeaderAndSendResponseAsync(); + })); }; await LoopbackServer.CreateServerAsync(async (server, url) => { - if (reuseClient) + using (X509Certificate2 cert = Configuration.Certificates.GetClientCertificate()) { - using (X509Certificate2 cert = Configuration.Certificates.GetClientCertificate()) + if (reuseClient) { using (HttpClient client = createClient(cert)) { @@ -261,28 +262,78 @@ namespace System.Net.Http.Functional.Tests } } } - } - else - { - for (int i = 0; i < numberOfRequests; i++) + else { - using (X509Certificate2 cert = Configuration.Certificates.GetClientCertificate()) + for (int i = 0; i < numberOfRequests; i++) { using (HttpClient client = createClient(cert)) { await makeAndValidateRequest(client, server, url, cert); } - } - GC.Collect(); - GC.WaitForPendingFinalizers(); + GC.Collect(); + GC.WaitForPendingFinalizers(); + } } } }, options); } - private bool BackendSupportsCustomCertificateHandling => - UseManagedHandler || - new HttpClientHandler_ServerCertificates_Test().BackendSupportsCustomCertificateHandling; + [OuterLoop] // TODO: Issue #11345 + [Theory] + [InlineData(ClientCertificateOption.Manual)] + [InlineData(ClientCertificateOption.Automatic)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Fails with \"Authentication failed\" error.")] + public async Task AutomaticOrManual_DoesntFailRegardlessOfWhetherClientCertsAreAvailable(ClientCertificateOption mode) + { + if (!BackendSupportsCustomCertificateHandling) // can't use [Conditional*] right now as it's evaluated at the wrong time for SocketsHttpHandler + { + _output.WriteLine($"Skipping {nameof(Manual_CertificateSentMatchesCertificateReceived_Success)}()"); + return; + } + + using (HttpClientHandler handler = CreateHttpClientHandler()) + using (var client = new HttpClient(handler)) + { + handler.ServerCertificateCustomValidationCallback = delegate { return true; }; + handler.ClientCertificateOptions = mode; + + await LoopbackServer.CreateServerAsync(async server => + { + Task clientTask = client.GetStringAsync(server.Uri); + Task serverTask = server.AcceptConnectionAsync(async connection => + { + SslStream sslStream = Assert.IsType(connection.Stream); + await connection.ReadRequestHeaderAndSendResponseAsync(); + }); + + await new Task[] { clientTask, serverTask }.WhenAllOrAnyFailed(); + }, new LoopbackServer.Options { UseSsl = true }); + } + } + + private bool BackendSupportsCustomCertificateHandling + { + get + { +#if TargetsWindows + return true; +#else + if (UseSocketsHttpHandler) + { + return true; + } + + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) + { + return false; + } + + // For other Unix-based systems it's true if (and only if) the openssl backend + // is used with libcurl. + return (Interop.Http.GetSslVersionDescription()?.StartsWith(Interop.Http.OpenSsl10Description, StringComparison.OrdinalIgnoreCase) ?? false); +#endif + } + } } } diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Decompression.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Decompression.cs new file mode 100644 index 0000000000..362419fbcb --- /dev/null +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Decompression.cs @@ -0,0 +1,67 @@ +// 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.IO; +using System.IO.Compression; +using System.Net.Test.Common; +using System.Threading.Tasks; +using Xunit; + +namespace System.Net.Http.Functional.Tests +{ + public abstract class HttpClientHandler_Decompression_Test : HttpClientTestBase + { + [Fact] + public async Task Brotli_DecompressesResponse_Success() + { + var expectedContent = new byte[12345]; + new Random(42).NextBytes(expectedContent); + + await LoopbackServer.CreateClientAndServerAsync(async uri => + { + using (HttpClient client = CreateHttpClient()) + using (HttpResponseMessage response = await client.GetAsync(uri, HttpCompletionOption.ResponseHeadersRead)) + using (var decodedStream = new BrotliStream(await response.Content.ReadAsStreamAsync(), CompressionMode.Decompress)) + { + var data = new MemoryStream(); + await decodedStream.CopyToAsync(data); + Assert.Equal(expectedContent, data.ToArray()); + } + }, async server => + { + await server.AcceptConnectionAsync(async connection => + { + await connection.ReadRequestHeaderAsync(); + await connection.Writer.WriteAsync("HTTP/1.1 200 OK\r\nContent-Encoding: br\r\n\r\n"); + using (var brotli = new BrotliStream(connection.Stream, CompressionLevel.Optimal, leaveOpen: true)) + { + await brotli.WriteAsync(expectedContent); + } + }); + }); + } + + [OuterLoop("Accessing remote server")] + [Fact] + public async Task Brotli_External_DecompressesResponse_Success() + { + const string BrotliUrl = "http://httpbin.org/brotli"; + + var message = new HttpRequestMessage(HttpMethod.Get, BrotliUrl); + message.Headers.TryAddWithoutValidation("SomeAwesomeHeader", "AndItsAwesomeValue"); + + using (HttpClient client = CreateHttpClient()) + using (HttpResponseMessage response = await client.SendAsync(message)) + { + Assert.Contains("br", response.Content.Headers.ContentEncoding); + using (var decodedStream = new BrotliStream(await response.Content.ReadAsStreamAsync(), CompressionMode.Decompress)) + using (var reader = new StreamReader(decodedStream)) + { + string respText = await reader.ReadToEndAsync(); + Assert.Contains("AndItsAwesomeValue", respText); + } + } + } + } +} diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.DefaultProxyCredentials.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.DefaultProxyCredentials.cs index ebdf3a648d..1b77c5c3b3 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.DefaultProxyCredentials.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.DefaultProxyCredentials.cs @@ -2,6 +2,7 @@ // 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.Collections.Generic; using System.Diagnostics; using System.Net.Test.Common; using System.Runtime.InteropServices; @@ -13,7 +14,7 @@ namespace System.Net.Http.Functional.Tests { using Configuration = System.Net.Test.Common.Configuration; - public class HttpClientHandler_DefaultProxyCredentials_Test : HttpClientTestBase + public abstract class HttpClientHandler_DefaultProxyCredentials_Test : HttpClientTestBase { [Fact] public void Default_Get_Null() @@ -44,85 +45,83 @@ namespace System.Net.Http.Functional.Tests [ActiveIssue(23702, TargetFrameworkMonikers.NetFramework)] [ActiveIssue(20010, TargetFrameworkMonikers.Uap)] - [OuterLoop] // TODO: Issue #11345 [Fact] public async Task ProxyExplicitlyProvided_DefaultCredentials_Ignored() { - int port; - Task proxyTask = LoopbackGetRequestHttpProxy.StartAsync(out port, requireAuth: true, expectCreds: true); - Uri proxyUrl = new Uri($"http://localhost:{port}"); + var explicitProxyCreds = new NetworkCredential("rightusername", "rightpassword"); + var defaultSystemProxyCreds = new NetworkCredential("wrongusername", "wrongpassword"); + string expectCreds = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes($"{explicitProxyCreds.UserName}:{explicitProxyCreds.Password}")); - var rightCreds = new NetworkCredential("rightusername", "rightpassword"); - var wrongCreds = new NetworkCredential("wrongusername", "wrongpassword"); - - using (HttpClientHandler handler = CreateHttpClientHandler()) - using (var client = new HttpClient(handler)) + await LoopbackServer.CreateClientAndServerAsync(async proxyUrl => { - handler.Proxy = new UseSpecifiedUriWebProxy(proxyUrl, rightCreds); - handler.DefaultProxyCredentials = wrongCreds; - - Task responseTask = client.GetAsync(Configuration.Http.RemoteEchoServer); - Task responseStringTask = responseTask.ContinueWith(t => + using (HttpClientHandler handler = CreateHttpClientHandler()) + using (var client = new HttpClient(handler)) { - using (t.Result) return t.Result.Content.ReadAsStringAsync(); - }, TaskScheduler.Default).Unwrap(); - await (new Task[] { proxyTask, responseTask, responseStringTask }).WhenAllOrAnyFailed(); + handler.Proxy = new UseSpecifiedUriWebProxy(proxyUrl, explicitProxyCreds); + handler.DefaultProxyCredentials = defaultSystemProxyCreds; + using (HttpResponseMessage response = await client.GetAsync("http://notatrealserver.com/")) // URL does not matter + { + Assert.Equal(response.StatusCode, HttpStatusCode.OK); + } + } + }, async server => + { + if (!IsCurlHandler) // libcurl sends Basic auth preemptively when only basic creds are provided; other handlers wait for 407. + { + await server.AcceptConnectionSendResponseAndCloseAsync( + HttpStatusCode.ProxyAuthenticationRequired, "Connection: close\r\nProxy-Authenticate: Basic\r\n"); + } - TestHelper.VerifyResponseBody(responseStringTask.Result, responseTask.Result.Content.Headers.ContentMD5, false, null); - Assert.Equal(Encoding.ASCII.GetString(proxyTask.Result.ResponseContent), responseStringTask.Result); - - string expectedAuth = $"{rightCreds.UserName}:{rightCreds.Password}"; - Assert.Equal(expectedAuth, proxyTask.Result.AuthenticationHeaderValue); - } + List headers = await server.AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode.OK); + Assert.Equal(expectCreds, LoopbackServer.GetRequestHeaderValue(headers, "Proxy-Authorization")); + }); } [OuterLoop] // TODO: Issue #11345 + [PlatformSpecific(TestPlatforms.AnyUnix)] // The default proxy is resolved via WinINet on Windows. [Theory] [InlineData(false)] [InlineData(true)] - [ActiveIssue(25640, TestPlatforms.Windows)] // TODO It should be enabled for managed Handler on all platforms - public void ProxySetViaEnvironmentVariable_DefaultProxyCredentialsUsed(bool useProxy) + public async Task ProxySetViaEnvironmentVariable_DefaultProxyCredentialsUsed(bool useProxy) { - int port = 0; - Task proxyTask = null; - if (useProxy) - { - proxyTask = LoopbackGetRequestHttpProxy.StartAsync(out port, requireAuth: true, expectCreds: true); - } - const string ExpectedUsername = "rightusername"; const string ExpectedPassword = "rightpassword"; + LoopbackServer.Options options = new LoopbackServer.Options { IsProxy = true, Username = ExpectedUsername, Password = ExpectedPassword }; - // libcurl will read a default proxy from the http_proxy environment variable. Ensure that when it does, - // our default proxy credentials are used. To avoid messing up anything else in this process, we run the - // test in another process. - var psi = new ProcessStartInfo(); - psi.Environment.Add("http_proxy", $"http://localhost:{port}"); - RemoteInvoke((useProxyString, useManagedHandlerString) => + await LoopbackServer.CreateServerAsync(async (proxyServer, proxyUri) => { - using (HttpClientHandler handler = CreateHttpClientHandler(useManagedHandlerString)) - using (var client = new HttpClient(handler)) + // libcurl will read a default proxy from the http_proxy environment variable. Ensure that when it does, + // our default proxy credentials are used. To avoid messing up anything else in this process, we run the + // test in another process. + var psi = new ProcessStartInfo(); + Task> proxyTask = null; + + if (useProxy) { - var creds = new NetworkCredential(ExpectedUsername, ExpectedPassword); - handler.DefaultProxyCredentials = creds; - handler.UseProxy = bool.Parse(useProxyString); - - Task responseTask = client.GetAsync(Configuration.Http.RemoteEchoServer); - Task responseStringTask = responseTask.ContinueWith(t => - { - using (t.Result) return t.Result.Content.ReadAsStringAsync(); - }, TaskScheduler.Default).Unwrap(); - Task.WaitAll(responseTask, responseStringTask); - - TestHelper.VerifyResponseBody(responseStringTask.Result, responseTask.Result.Content.Headers.ContentMD5, false, null); + proxyTask = proxyServer.AcceptConnectionPerformAuthenticationAndCloseAsync("Proxy-Authenticate: Basic realm=\"NetCore\"\r\n"); + psi.Environment.Add("http_proxy", $"http://{proxyUri.Host}:{proxyUri.Port}"); } - return SuccessExitCode; - }, useProxy.ToString(), UseManagedHandler.ToString(), new RemoteInvokeOptions { StartInfo = psi }).Dispose(); - if (useProxy) - { - Assert.Equal($"{ExpectedUsername}:{ExpectedPassword}", proxyTask.Result.AuthenticationHeaderValue); - } + RemoteInvoke(async (useProxyString, useSocketsHttpHandlerString) => + { + using (HttpClientHandler handler = CreateHttpClientHandler(useSocketsHttpHandlerString)) + using (var client = new HttpClient(handler)) + { + var creds = new NetworkCredential(ExpectedUsername, ExpectedPassword); + handler.DefaultProxyCredentials = creds; + handler.UseProxy = bool.Parse(useProxyString); + + HttpResponseMessage response = await client.GetAsync(Configuration.Http.RemoteEchoServer); + // Correctness of user and password is done in server part. + Assert.True(response.StatusCode == HttpStatusCode.OK); + } + return SuccessExitCode; + }, useProxy.ToString(), UseSocketsHttpHandler.ToString(), new RemoteInvokeOptions { StartInfo = psi }).Dispose(); + if (useProxy) + { + await proxyTask; + } + }, options); } // The purpose of this test is mainly to validate the .NET Framework OOB System.Net.Http implementation diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.MaxConnectionsPerServer.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.MaxConnectionsPerServer.cs index f53be768eb..3df4f02bad 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.MaxConnectionsPerServer.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.MaxConnectionsPerServer.cs @@ -3,7 +3,9 @@ // See the LICENSE file in the project root for more information. using System.Linq; +using System.Net.Test.Common; using System.Runtime.InteropServices; +using System.Threading; using System.Threading.Tasks; using Xunit; @@ -13,7 +15,7 @@ namespace System.Net.Http.Functional.Tests using Configuration = System.Net.Test.Common.Configuration; [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "dotnet/corefx #20010")] - public class HttpClientHandler_MaxConnectionsPerServer_Test : HttpClientTestBase + public abstract class HttpClientHandler_MaxConnectionsPerServer_Test : HttpClientTestBase { [Fact] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "MaxConnectionsPerServer either returns two or int.MaxValue depending if ctor of HttpClientHandlerTest executed first. Disabling cause of random xunit execution order.")] @@ -76,5 +78,45 @@ namespace System.Net.Http.Functional.Tests select client.GetAsync(secure ? Configuration.Http.RemoteEchoServer : Configuration.Http.SecureRemoteEchoServer)); } } + + [OuterLoop("Relies on kicking off GC and waiting for finalizers")] + [Fact] + public async Task GetAsync_DontDisposeResponse_EventuallyUnblocksWaiters() + { + if (!UseSocketsHttpHandler) + { + // Issue #27067. Hang. + return; + } + + await LoopbackServer.CreateServerAsync(async (server, uri) => + { + using (HttpClientHandler handler = CreateHttpClientHandler()) + using (HttpClient client = new HttpClient(handler)) + { + handler.MaxConnectionsPerServer = 1; + + // Let server handle two requests. + const string ResponseContent = "abcdefghijklmnopqrstuvwxyz"; + Task serverTask1 = server.AcceptConnectionSendResponseAndCloseAsync(content: ResponseContent); + Task serverTask2 = server.AcceptConnectionSendResponseAndCloseAsync(content: ResponseContent); + + // Make first request and drop the response, not explicitly disposing of it. + void MakeAndDropRequest() => client.GetAsync(uri, HttpCompletionOption.ResponseHeadersRead); // separated out to enable GC of response + MakeAndDropRequest(); + + // A second request should eventually succeed, once the first one is cleaned up. + Task secondResponse = client.GetAsync(uri); + Assert.True(SpinWait.SpinUntil(() => + { + GC.Collect(); + GC.WaitForPendingFinalizers(); + return secondResponse.IsCompleted; + }, 30 * 1000), "Expected second response to have completed"); + + await new[] { serverTask1, serverTask2, secondResponse }.WhenAllOrAnyFailed(); + } + }); + } } } diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.MaxResponseHeadersLength.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.MaxResponseHeadersLength.cs index 1a666845c9..901f05136c 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.MaxResponseHeadersLength.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.MaxResponseHeadersLength.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Net.Test.Common; using System.Text; +using System.Threading; using System.Threading.Tasks; using Xunit; @@ -12,7 +13,7 @@ namespace System.Net.Http.Functional.Tests { using Configuration = System.Net.Test.Common.Configuration; - public class HttpClientHandler_MaxResponseHeadersLength_Test : HttpClientTestBase + public abstract class HttpClientHandler_MaxResponseHeadersLength_Test : HttpClientTestBase { [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Not currently supported on UAP")] [Theory] @@ -46,46 +47,89 @@ namespace System.Net.Http.Functional.Tests using (HttpClientHandler handler = CreateHttpClientHandler()) using (var client = new HttpClient(handler)) { - handler.MaxResponseHeadersLength = int.MaxValue; - await client.GetStreamAsync(Configuration.Http.RemoteEchoServer); - Assert.Throws(() => handler.MaxResponseHeadersLength = int.MaxValue); + handler.MaxResponseHeadersLength = 1; + (await client.GetStreamAsync(Configuration.Http.RemoteEchoServer)).Dispose(); + Assert.Throws(() => handler.MaxResponseHeadersLength = 1); } } - [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Not currently supported on UAP")] [OuterLoop] // TODO: Issue #11345 - [Theory, MemberData(nameof(ResponseWithManyHeadersData))] - public async Task ThresholdExceeded_ThrowsException(string responseHeaders, int maxResponseHeadersLength, bool shouldSucceed) + [Fact] + public async Task InfiniteSingleHeader_ThrowsException() { + if (IsCurlHandler) + { + // libcurl fails with an out of memory error + return; + } + await LoopbackServer.CreateServerAsync(async (server, url) => { using (HttpClientHandler handler = CreateHttpClientHandler()) using (var client = new HttpClient(handler)) { - handler.MaxResponseHeadersLength = maxResponseHeadersLength; + Task getAsync = client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead); + await server.AcceptConnectionAsync(async connection => + { + var cts = new CancellationTokenSource(); + Task serverTask = Task.Run(async delegate + { + await connection.ReadRequestHeaderAndSendCustomResponseAsync("HTTP/1.1 200 OK\r\nContent-Length: 0\r\nMyInfiniteHeader: "); + try + { + while (!cts.IsCancellationRequested) + { + await connection.Writer.WriteAsync(new string('s', 16000)); + await Task.Delay(1); + } + } + catch { } + }); + + await Assert.ThrowsAsync(() => getAsync); + cts.Cancel(); + await serverTask; + }); + } + }); + } + + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Not currently supported on UAP")] + [OuterLoop] // TODO: Issue #11345 + [Theory, MemberData(nameof(ResponseWithManyHeadersData))] + public async Task ThresholdExceeded_ThrowsException(string responseHeaders, int? maxResponseHeadersLength, bool shouldSucceed) + { + if (IsCurlHandler) + { + // libcurl often fails with out of memory errors + return; + } + + await LoopbackServer.CreateServerAsync(async (server, url) => + { + using (HttpClientHandler handler = CreateHttpClientHandler()) + using (var client = new HttpClient(handler)) + { + if (maxResponseHeadersLength.HasValue) + { + handler.MaxResponseHeadersLength = maxResponseHeadersLength.Value; + } Task getAsync = client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead); - await LoopbackServer.AcceptSocketAsync(server, async (s, serverStream, reader, writer) => + await server.AcceptConnectionAsync(async connection => { - using (s) using (serverStream) using (reader) using (writer) - { - string line; - while ((line = reader.ReadLine()) != null && !string.IsNullOrEmpty(line)) ; - - byte[] headerData = Encoding.ASCII.GetBytes(responseHeaders); - serverStream.Write(headerData, 0, headerData.Length); - } + Task serverTask = connection.ReadRequestHeaderAndSendCustomResponseAsync(responseHeaders); if (shouldSucceed) { (await getAsync).Dispose(); + await serverTask; } else { await Assert.ThrowsAsync(() => getAsync); + try { await serverTask; } catch { } } - - return null; }); } }); @@ -95,58 +139,32 @@ namespace System.Net.Http.Functional.Tests { get { - // Success case: response headers of size 1023 bytes (less than 1024 bytes max). + foreach (int? max in new int?[] { null, 1, 31, 128 }) { - yield return new object[] { GenerateLargeResponseHeaders(1023), 1, true }; - } + int actualSize = max.HasValue ? max.Value : 64; - // Success case: response headers of size 1024 bytes (equal to 1024 bytes max). - { - yield return new object[] { GenerateLargeResponseHeaders(1024), 1, true }; - } - - // Failure case: response headers of size 1025 (greater than 1024 bytes max). - { - yield return new object[] { GenerateLargeResponseHeaders(1025), 1, false }; + yield return new object[] { GenerateLargeResponseHeaders(actualSize * 1024 - 1), max, true }; // Small enough + yield return new object[] { GenerateLargeResponseHeaders(actualSize * 1024), max, true }; // Just right + yield return new object[] { GenerateLargeResponseHeaders(actualSize * 1024 + 1), max, false }; // Too big } } } private static string GenerateLargeResponseHeaders(int responseHeadersSizeInBytes) { - // This helper method only supports generating sizes of 1023, 1024, or 1025 bytes. - // These are the only sizes needed to support the above tests. - Assert.InRange(responseHeadersSizeInBytes, 1023, 1025); - - string statusHeader = "HTTP/1.1 200 OK\r\n"; - string contentFooter = "Content-Length: 0\r\n\r\n"; - var buffer = new StringBuilder(); - buffer.Append(statusHeader); + buffer.Append("HTTP/1.1 200 OK\r\n"); + buffer.Append("Content-Length: 0\r\n"); for (int i = 0; i < 24; i++) { buffer.Append($"Custom-{i:D4}: 1234567890123456789012345\r\n"); } - - if (responseHeadersSizeInBytes == 1023) - { - buffer.Append($"Custom-1023: 1234567890\r\n"); - } - else if (responseHeadersSizeInBytes == 1024) - { - buffer.Append($"Custom-1024: 12345678901\r\n"); - } - else - { - Assert.Equal(1025, responseHeadersSizeInBytes); - buffer.Append($"Custom-1025: 123456789012\r\n"); - } - - buffer.Append(contentFooter); + buffer.Append($"Custom-24: "); + buffer.Append(new string('c', responseHeadersSizeInBytes - (buffer.Length + 4))); + buffer.Append("\r\n\r\n"); string response = buffer.ToString(); Assert.Equal(responseHeadersSizeInBytes, response.Length); - return response; } } diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ResponseDrain.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ResponseDrain.cs new file mode 100644 index 0000000000..68bbc9f394 --- /dev/null +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ResponseDrain.cs @@ -0,0 +1,309 @@ +// 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.IO; +using System.Net.Test.Common; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using Xunit; + +namespace System.Net.Http.Functional.Tests +{ + public abstract class HttpClientHandler_ResponseDrain_Test : HttpClientTestBase + { + protected virtual void SetResponseDrainTimeout(HttpClientHandler handler, TimeSpan time) { } + + public enum ContentMode + { + ContentLength, + SingleChunk, + BytePerChunk + } + + protected static string GetResponseForContentMode(string content, ContentMode mode) + { + switch (mode) + { + case ContentMode.ContentLength: + return LoopbackServer.GetHttpResponse(content: content); + case ContentMode.SingleChunk: + return LoopbackServer.GetSingleChunkHttpResponse(content: content); + case ContentMode.BytePerChunk: + return LoopbackServer.GetBytePerChunkHttpResponse(content: content); + default: + Assert.True(false); + return null; + } + } + + [OuterLoop] + [Theory] + [InlineData(ContentMode.ContentLength)] + [InlineData(ContentMode.SingleChunk)] + [InlineData(ContentMode.BytePerChunk)] + public async Task GetAsync_DisposeBeforeReadingToEnd_DrainsRequestsAndReusesConnection(ContentMode mode) + { + if (IsWinHttpHandler) + { + if (mode == ContentMode.BytePerChunk) + { + // WinHttpHandler's behavior with multiple chunks is inconsistent, so disable the test. + return; + } + } + else if (IsCurlHandler) + { + // CurlHandler's behavior here is inconsistent, so disable the test. + return; + } + + const string simpleContent = "Hello world!"; + + await LoopbackServer.CreateClientAndServerAsync( + async url => + { + using (var client = CreateHttpClient()) + { + HttpResponseMessage response1 = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead); + ValidateResponseHeaders(response1, simpleContent.Length, mode); + + // Read up to exactly 1 byte before the end of the response + Stream responseStream = await response1.Content.ReadAsStreamAsync(); + byte[] bytes = await ReadToByteCount(responseStream, simpleContent.Length - 1); + Assert.Equal(simpleContent.Substring(0, simpleContent.Length - 1), Encoding.ASCII.GetString(bytes)); + + // Introduce a short delay to try to ensure that when we dispose the response, + // all response data is available and we can drain synchronously and reuse the connection. + await Task.Delay(100); + + response1.Dispose(); + + // Issue another request. We'll confirm that it comes on the same connection. + HttpResponseMessage response2 = await client.GetAsync(url); + ValidateResponseHeaders(response2, simpleContent.Length, mode); + Assert.Equal(simpleContent, await response2.Content.ReadAsStringAsync()); + } + }, + async server => + { + await server.AcceptConnectionAsync(async connection => + { + string response = GetResponseForContentMode(simpleContent, mode); + await connection.ReadRequestHeaderAndSendCustomResponseAsync(response); + await connection.ReadRequestHeaderAndSendCustomResponseAsync(response); + }); + }); + } + + // The actual amount of drain that's supported is handler and timing dependent, apparently. + // These cases are an attempt to provide a "min bar" for draining behavior. + + [OuterLoop] + [Theory] + [InlineData(0, 0, ContentMode.ContentLength)] + [InlineData(0, 0, ContentMode.SingleChunk)] + [InlineData(1, 0, ContentMode.ContentLength)] + [InlineData(1, 0, ContentMode.SingleChunk)] + [InlineData(1, 0, ContentMode.BytePerChunk)] + [InlineData(2, 1, ContentMode.ContentLength)] + [InlineData(2, 1, ContentMode.SingleChunk)] + [InlineData(2, 1, ContentMode.BytePerChunk)] + [InlineData(10, 1, ContentMode.ContentLength)] + [InlineData(10, 1, ContentMode.SingleChunk)] + [InlineData(10, 1, ContentMode.BytePerChunk)] + [InlineData(100, 10, ContentMode.ContentLength)] + [InlineData(100, 10, ContentMode.SingleChunk)] + [InlineData(100, 10, ContentMode.BytePerChunk)] + [InlineData(1000, 950, ContentMode.ContentLength)] + [InlineData(1000, 950, ContentMode.SingleChunk)] + [InlineData(1000, 950, ContentMode.BytePerChunk)] + [InlineData(10000, 9500, ContentMode.ContentLength)] + [InlineData(10000, 9500, ContentMode.SingleChunk)] + [InlineData(10000, 9500, ContentMode.BytePerChunk)] + public async Task GetAsyncWithMaxConnections_DisposeBeforeReadingToEnd_DrainsRequestsAndReusesConnection(int totalSize, int readSize, ContentMode mode) + { + if (IsWinHttpHandler) + { + // WinHttpHandler seems to only do a limited amount of draining, and this test starts + // failing if there's any measurable delay introduced in the response such that it dribbles + // in. So just skip these tests. + return; + } + + if (IsCurlHandler) + { + // CurlHandler drain behavior is very inconsistent, so just skip these tests. + return; + } + + await LoopbackServer.CreateClientAndServerAsync( + async url => + { + HttpClientHandler handler = CreateHttpClientHandler(); + SetResponseDrainTimeout(handler, Timeout.InfiniteTimeSpan); + + // Set MaxConnectionsPerServer to 1. This will ensure we will wait for the previous request to drain (or fail to) + handler.MaxConnectionsPerServer = 1; + + using (var client = new HttpClient(handler)) + { + HttpResponseMessage response1 = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead); + ValidateResponseHeaders(response1, totalSize, mode); + + // Read part but not all of response + Stream responseStream = await response1.Content.ReadAsStreamAsync(); + await ReadToByteCount(responseStream, readSize); + + response1.Dispose(); + + // Issue another request. We'll confirm that it comes on the same connection. + HttpResponseMessage response2 = await client.GetAsync(url); + ValidateResponseHeaders(response2, totalSize, mode); + Assert.Equal(totalSize, (await response2.Content.ReadAsStringAsync()).Length); + } + }, + async server => + { + string content = new string('a', totalSize); + string response = GetResponseForContentMode(content, mode); + await server.AcceptConnectionAsync(async connection => + { + // Process the first request, with some introduced delays in the response to + // stress the draining. + await connection.ReadRequestHeaderAsync().ConfigureAwait(false); + foreach (char c in response) + { + await connection.Writer.WriteAsync(c); + } + + // Process the second request. + await connection.ReadRequestHeaderAndSendCustomResponseAsync(response); + }); + }); + } + + [OuterLoop] + [Theory] + [InlineData(100000, 1, ContentMode.ContentLength)] + [InlineData(100000, 1, ContentMode.SingleChunk)] + [InlineData(100000, 1, ContentMode.BytePerChunk)] + [InlineData(800000, 1, ContentMode.ContentLength)] + [InlineData(800000, 1, ContentMode.SingleChunk)] + [InlineData(1024 * 1024, 1, ContentMode.ContentLength)] + public async Task GetAsyncLargeRequestWithMaxConnections_DisposeBeforeReadingToEnd_DrainsRequestsAndReusesConnection(int totalSize, int readSize, ContentMode mode) + { + // SocketsHttpHandler will reliably drain up to 1MB; other handlers don't. + if (!UseSocketsHttpHandler) + { + return; + } + + await GetAsyncWithMaxConnections_DisposeBeforeReadingToEnd_DrainsRequestsAndReusesConnection(totalSize, readSize, mode); + return; + } + + // Similar to above, these are semi-extreme cases where the response should never drain for any handler. + + [OuterLoop] + [Theory] + [InlineData(2000000, 0, ContentMode.ContentLength)] + [InlineData(2000000, 0, ContentMode.SingleChunk)] + [InlineData(2000000, 0, ContentMode.BytePerChunk)] + [InlineData(4000000, 1000000, ContentMode.ContentLength)] + [InlineData(4000000, 1000000, ContentMode.SingleChunk)] + [InlineData(4000000, 1000000, ContentMode.BytePerChunk)] + public async Task GetAsyncWithMaxConnections_DisposeBeforeReadingToEnd_KillsConnection(int totalSize, int readSize, ContentMode mode) + { + if (IsWinHttpHandler) + { + // [ActiveIssue(28424)] + return; + } + + await LoopbackServer.CreateClientAndServerAsync( + async url => + { + HttpClientHandler handler = CreateHttpClientHandler(); + SetResponseDrainTimeout(handler, Timeout.InfiniteTimeSpan); + + // Set MaxConnectionsPerServer to 1. This will ensure we will wait for the previous request to drain (or fail to) + handler.MaxConnectionsPerServer = 1; + + using (var client = new HttpClient(handler)) + { + HttpResponseMessage response1 = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead); + ValidateResponseHeaders(response1, totalSize, mode); + + // Read part but not all of response + Stream responseStream = await response1.Content.ReadAsStreamAsync(); + await ReadToByteCount(responseStream, readSize); + + response1.Dispose(); + + // Issue another request. We'll confirm that it comes on a new connection. + HttpResponseMessage response2 = await client.GetAsync(url); + ValidateResponseHeaders(response2, totalSize, mode); + Assert.Equal(totalSize, (await response2.Content.ReadAsStringAsync()).Length); + } + }, + async server => + { + string content = new string('a', totalSize); + string response = GetResponseForContentMode(content, mode); + await server.AcceptConnectionAsync(async connection => + { + await connection.ReadRequestHeaderAsync(); + try + { + await connection.Writer.WriteAsync(response); + } + catch (Exception) { } // Eat errors from client disconnect. + + await server.AcceptConnectionSendCustomResponseAndCloseAsync(response); + }); + }); + } + + protected static void ValidateResponseHeaders(HttpResponseMessage response, int contentLength, ContentMode mode) + { + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + + switch (mode) + { + case ContentMode.ContentLength: + Assert.Equal(contentLength, response.Content.Headers.ContentLength); + break; + + case ContentMode.SingleChunk: + case ContentMode.BytePerChunk: + Assert.True(response.Headers.TransferEncodingChunked); + break; + } + } + + protected static async Task ReadToByteCount(Stream stream, int byteCount) + { + byte[] buffer = new byte[byteCount]; + int totalBytesRead = 0; + + while (totalBytesRead < byteCount) + { + int bytesRead = await stream.ReadAsync(buffer, totalBytesRead, (byteCount - totalBytesRead)); + if (bytesRead == 0) + { + throw new Exception("Unexpected EOF"); + } + + totalBytesRead += bytesRead; + if (totalBytesRead > byteCount) + { + throw new Exception("Read more bytes than requested???"); + } + } + + return buffer; + } + } +} diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ServerCertificates.Unix.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ServerCertificates.Unix.cs index 3f7d5f264d..d19a63f598 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ServerCertificates.Unix.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ServerCertificates.Unix.cs @@ -15,7 +15,7 @@ using Xunit; namespace System.Net.Http.Functional.Tests { - public partial class HttpClientHandler_ServerCertificates_Test + public abstract partial class HttpClientHandler_ServerCertificates_Test { private static bool ShouldSuppressRevocationException { @@ -41,7 +41,7 @@ namespace System.Net.Http.Functional.Tests // MustNotCheck, // } - if (CurlSslVersionDescription() == "SecureTransport") + if (Interop.Http.GetSslVersionDescription() == "SecureTransport") { return true; } @@ -53,7 +53,7 @@ namespace System.Net.Http.Functional.Tests { get { - if (UseManagedHandler) + if (UseSocketsHttpHandler) { return true; } @@ -65,67 +65,36 @@ namespace System.Net.Http.Functional.Tests // For other Unix-based systems it's true if (and only if) the openssl backend // is used with libcurl. - return (CurlSslVersionDescription()?.StartsWith("OpenSSL") ?? false); + return (Interop.Http.GetSslVersionDescription()?.StartsWith(Interop.Http.OpenSsl10Description, StringComparison.OrdinalIgnoreCase) ?? false); } } - [DllImport("System.Net.Http.Native", EntryPoint = "HttpNative_GetSslVersionDescription")] - private static extern string CurlSslVersionDescription(); - - [Theory] + [Fact] [PlatformSpecific(~TestPlatforms.OSX)] // Not implemented - [InlineData(false, false, false, false, false)] // system -> ok - [InlineData(true, true, true, true, true)] // empty dir, empty bundle file -> fail - // It is enough to override the bundle, since all tested platforms don't have a default dir: - [InlineData(false, false, true, true, true)] // empty bundle -> fail - [InlineData(false, false, true, false, true)] // non-existing bundle -> fail - public void HttpClientUsesSslCertEnvironmentVariables(bool setSslCertDir, bool createSslCertDir, - bool setSslCertFile, bool createSslCertFile, bool expectedFailure) + public void HttpClientUsesSslCertEnvironmentVariables() { - // This test sets SSL_CERT_DIR and SSL_CERT_FILE to empty/non-existing locations and then - // checks the http request fails. - // Some platforms will use the system default when not specifying a value, while others - // will not use those certificates. Due to these platform differences, we only check specific - // combinations that are expected to work the same cross-platform. + // We set SSL_CERT_DIR and SSL_CERT_FILE to empty locations. + // The HttpClient should fail to validate the server certificate. + var psi = new ProcessStartInfo(); - if (setSslCertDir) - { - string sslCertDir = GetTestFilePath(); - if (createSslCertDir) - { - Directory.CreateDirectory(sslCertDir); - } - psi.Environment.Add("SSL_CERT_DIR", sslCertDir); - } + string sslCertDir = GetTestFilePath(); + Directory.CreateDirectory(sslCertDir); + psi.Environment.Add("SSL_CERT_DIR", sslCertDir); - if (setSslCertFile) - { - string sslCertFile = GetTestFilePath(); - if (createSslCertFile) - { - File.WriteAllText(sslCertFile, ""); - } - psi.Environment.Add("SSL_CERT_FILE", sslCertFile); - } + string sslCertFile = GetTestFilePath(); + File.WriteAllText(sslCertFile, ""); + psi.Environment.Add("SSL_CERT_FILE", sslCertFile); - RemoteInvoke(async arg => + RemoteInvoke(async useSocketsHttpHandlerString => { - bool shouldFail = bool.Parse(arg); const string Url = "https://www.microsoft.com"; - using (HttpClient client = new HttpClient()) + using (var client = CreateHttpClient(useSocketsHttpHandlerString)) { - if (shouldFail) - { - await Assert.ThrowsAsync(() => client.GetAsync(Url)); - } - else - { - await client.GetAsync(Url); - } + await Assert.ThrowsAsync(() => client.GetAsync(Url)); } return SuccessExitCode; - }, expectedFailure.ToString(), new RemoteInvokeOptions { StartInfo = psi }).Dispose(); + }, UseSocketsHttpHandler.ToString(), new RemoteInvokeOptions { StartInfo = psi }).Dispose(); } } } diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ServerCertificates.Windows.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ServerCertificates.Windows.cs index c213aab296..e5903984a7 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ServerCertificates.Windows.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ServerCertificates.Windows.cs @@ -4,12 +4,10 @@ namespace System.Net.Http.Functional.Tests { - public partial class HttpClientHandler_ServerCertificates_Test + public abstract partial class HttpClientHandler_ServerCertificates_Test { private static bool ShouldSuppressRevocationException => false; internal bool BackendSupportsCustomCertificateHandling => true; - - private bool BackendDoesNotSupportCustomCertificateHandling => !BackendSupportsCustomCertificateHandling; } } diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ServerCertificates.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ServerCertificates.cs index af3b67fe1b..f8164e104b 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ServerCertificates.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ServerCertificates.cs @@ -17,7 +17,7 @@ namespace System.Net.Http.Functional.Tests using Configuration = System.Net.Test.Common.Configuration; [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, ".NET Framework throws PNSE for ServerCertificateCustomValidationCallback")] - public partial class HttpClientHandler_ServerCertificates_Test : HttpClientTestBase + public abstract partial class HttpClientHandler_ServerCertificates_Test : HttpClientTestBase { private static bool ClientSupportsDHECipherSuites => (!PlatformDetection.IsWindows || PlatformDetection.IsWindows10Version1607OrGreater); private bool BackendSupportsCustomCertificateHandlingAndClientSupportsDHECipherSuites => @@ -45,6 +45,27 @@ namespace System.Net.Http.Functional.Tests } } + [Fact] + public void ServerCertificateCustomValidationCallback_SetGet_Roundtrips() + { + using (HttpClientHandler handler = CreateHttpClientHandler()) + { + Assert.Null(handler.ServerCertificateCustomValidationCallback); + + Func callback1 = (req, cert, chain, policy) => throw new NotImplementedException("callback1"); + Func callback2 = (req, cert, chain, policy) => throw new NotImplementedException("callback2"); + + handler.ServerCertificateCustomValidationCallback = callback1; + Assert.Same(callback1, handler.ServerCertificateCustomValidationCallback); + + handler.ServerCertificateCustomValidationCallback = callback2; + Assert.Same(callback2, handler.ServerCertificateCustomValidationCallback); + + handler.ServerCertificateCustomValidationCallback = null; + Assert.Null(handler.ServerCertificateCustomValidationCallback); + } + } + [OuterLoop] // TODO: Issue #11345 [Fact] public async Task NoCallback_ValidCertificate_SuccessAndExpectedPropertyBehavior() @@ -65,15 +86,59 @@ namespace System.Net.Http.Functional.Tests [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "UAP won't send requests through a custom proxy")] [OuterLoop] // TODO: Issue #11345 [Fact] - public async Task UseCallback_HaveNoCredsAndUseAuthenticatedCustomProxyAndPostToSecureServer_ProxyAuthenticationRequiredStatusCode() + public async Task UseCallback_HaveCredsAndUseAuthenticatedCustomProxyAndPostToSecureServer_Success() { if (!BackendSupportsCustomCertificateHandling) { return; } - if (UseManagedHandler) + + if (IsWinHttpHandler && PlatformDetection.IsWindows7) { - return; // TODO #23136: SSL proxy tunneling not yet implemented in ManagedHandler + // Issue #27612 + return; + } + + const string content = "This is a test"; + + int port; + Task proxyTask = LoopbackGetRequestHttpProxy.StartAsync( + out port, + requireAuth: true, + expectCreds: true); + Uri proxyUrl = new Uri($"http://localhost:{port}"); + + HttpClientHandler handler = CreateHttpClientHandler(); + handler.Proxy = new UseSpecifiedUriWebProxy(proxyUrl, new NetworkCredential("rightusername", "rightpassword")); + handler.ServerCertificateCustomValidationCallback = delegate { return true; }; + using (var client = new HttpClient(handler)) + { + HttpResponseMessage response = await client.PostAsync( + Configuration.Http.SecureRemoteEchoServer, + new StringContent(content)); + + string responseContent = await response.Content.ReadAsStringAsync(); + + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + TestHelper.VerifyResponseBody( + responseContent, + response.Content.Headers.ContentMD5, + false, + content); + } + + // Don't await proxyTask until the HttpClient is closed, otherwise it will wait for connection timeout. + await proxyTask; + } + + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "UAP won't send requests through a custom proxy")] + [OuterLoop] // TODO: Issue #11345 + [Fact] + public async Task UseCallback_HaveNoCredsAndUseAuthenticatedCustomProxyAndPostToSecureServer_ProxyAuthenticationRequiredStatusCode() + { + if (!BackendSupportsCustomCertificateHandling) + { + return; } int port; @@ -263,7 +328,7 @@ namespace System.Net.Http.Functional.Tests } catch (HttpRequestException) { - if (UseManagedHandler || !ShouldSuppressRevocationException) + if (UseSocketsHttpHandler || !ShouldSuppressRevocationException) throw; } } @@ -293,7 +358,7 @@ namespace System.Net.Http.Functional.Tests new object[] { Configuration.Http.WrongHostNameCertRemoteServer , SslPolicyErrors.RemoteCertificateNameMismatch}, }; - private async Task UseCallback_BadCertificate_ExpectedPolicyErrors_Helper(string url, bool useManagedHandler, SslPolicyErrors expectedErrors) + private async Task UseCallback_BadCertificate_ExpectedPolicyErrors_Helper(string url, bool useSocketsHttpHandler, SslPolicyErrors expectedErrors) { if (!BackendSupportsCustomCertificateHandling) { @@ -301,7 +366,7 @@ namespace System.Net.Http.Functional.Tests return; } - HttpClientHandler handler = CreateHttpClientHandler(useManagedHandler); + HttpClientHandler handler = CreateHttpClientHandler(useSocketsHttpHandler); using (var client = new HttpClient(handler)) { bool callbackCalled = false; @@ -312,13 +377,7 @@ namespace System.Net.Http.Functional.Tests Assert.NotNull(request); Assert.NotNull(cert); Assert.NotNull(chain); - if (!useManagedHandler) - { - // TODO #23137: This test is failing with the managed handler on the exact value of the managed errors, - // e.g. reporting "RemoteCertificateNameMismatch, RemoteCertificateChainErrors" when we only expect - // "RemoteCertificateChainErrors" - Assert.Equal(expectedErrors, errors); - } + Assert.Equal(expectedErrors, errors); return true; }; @@ -350,19 +409,19 @@ namespace System.Net.Http.Functional.Tests // UAP HTTP stack caches connections per-process. This causes interference when these tests run in // the same process as the other tests. Each test needs to be isolated to its own process. // See dicussion: https://github.com/dotnet/corefx/issues/21945 - RemoteInvoke((remoteUrl, remoteExpectedErrors, useManagedHandlerString) => + RemoteInvoke((remoteUrl, remoteExpectedErrors, useSocketsHttpHandlerString) => { UseCallback_BadCertificate_ExpectedPolicyErrors_Helper( remoteUrl, - bool.Parse(useManagedHandlerString), + bool.Parse(useSocketsHttpHandlerString), (SslPolicyErrors)Enum.Parse(typeof(SslPolicyErrors), remoteExpectedErrors)).Wait(); return SuccessExitCode; - }, url, expectedErrors.ToString(), UseManagedHandler.ToString()).Dispose(); + }, url, expectedErrors.ToString(), UseSocketsHttpHandler.ToString()).Dispose(); } else { - await UseCallback_BadCertificate_ExpectedPolicyErrors_Helper(url, UseManagedHandler, expectedErrors); + await UseCallback_BadCertificate_ExpectedPolicyErrors_Helper(url, UseSocketsHttpHandler, expectedErrors); } } catch (HttpRequestException e) when (e.InnerException?.GetType().Name == "WinHttpException" && diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.SslProtocols.Unix.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.SslProtocols.Unix.cs index 56377d5e69..615f2cb4fa 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.SslProtocols.Unix.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.SslProtocols.Unix.cs @@ -14,20 +14,10 @@ using Xunit; namespace System.Net.Http.Functional.Tests { - public partial class HttpClientHandler_SslProtocols_Test + public abstract partial class HttpClientHandler_SslProtocols_Test { private bool BackendSupportsSslConfiguration => - UseManagedHandler || - (CurlSslVersionDescription()?.StartsWith("OpenSSL") ?? false); - - private bool SSLv3DisabledByDefault => - BackendSupportsSslConfiguration || - Version.Parse(CurlVersionDescription()) >= new Version(7, 39); // libcurl disables SSLv3 by default starting in v7.39 - - [DllImport("System.Net.Http.Native", EntryPoint = "HttpNative_GetVersionDescription")] - private static extern string CurlVersionDescription(); - - [DllImport("System.Net.Http.Native", EntryPoint = "HttpNative_GetSslVersionDescription")] - private static extern string CurlSslVersionDescription(); + UseSocketsHttpHandler || + (Interop.Http.GetSslVersionDescription()?.StartsWith(Interop.Http.OpenSsl10Description, StringComparison.OrdinalIgnoreCase) ?? false); } } diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.SslProtocols.Windows.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.SslProtocols.Windows.cs index 28b5e9c8ce..961275bfc0 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.SslProtocols.Windows.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.SslProtocols.Windows.cs @@ -5,10 +5,8 @@ namespace System.Net.Http.Functional.Tests { - public partial class HttpClientHandler_SslProtocols_Test + public abstract partial class HttpClientHandler_SslProtocols_Test { private static bool BackendSupportsSslConfiguration => true; - - private static bool SSLv3DisabledByDefault => true; } } diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.SslProtocols.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.SslProtocols.cs index 2370fa76a0..ebc0b6d615 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.SslProtocols.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.SslProtocols.cs @@ -2,6 +2,7 @@ // 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.Collections.Generic; using System.IO; using System.Net.Security; using System.Net.Test.Common; @@ -16,7 +17,7 @@ namespace System.Net.Http.Functional.Tests [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "SslProtocols not supported on UAP")] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "dotnet/corefx #16805")] - public partial class HttpClientHandler_SslProtocols_Test : HttpClientTestBase + public abstract partial class HttpClientHandler_SslProtocols_Test : HttpClientTestBase { [Fact] public void DefaultProtocols_MatchesExpected() @@ -57,42 +58,51 @@ namespace System.Net.Http.Functional.Tests using (HttpClientHandler handler = CreateHttpClientHandler()) using (var client = new HttpClient(handler)) { - handler.ServerCertificateCustomValidationCallback = LoopbackServer.AllowAllCertificates; + handler.ServerCertificateCustomValidationCallback = TestHelper.AllowAllCertificates; await LoopbackServer.CreateServerAsync(async (server, url) => { await TestHelper.WhenAllCompletedOrAnyFailed( - LoopbackServer.ReadRequestAndSendResponseAsync(server), + server.AcceptConnectionSendResponseAndCloseAsync(), client.GetAsync(url)); }); Assert.Throws(() => handler.SslProtocols = SslProtocols.Tls12); } } - [OuterLoop] // TODO: Issue #11345 - [Theory] - [InlineData(~SslProtocols.None)] -#pragma warning disable 0618 // obsolete warning - [InlineData(SslProtocols.Ssl2)] - [InlineData(SslProtocols.Ssl3)] - [InlineData(SslProtocols.Ssl2 | SslProtocols.Ssl3)] - [InlineData(SslProtocols.Ssl2 | SslProtocols.Ssl3 | SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12)] -#pragma warning restore 0618 - public void DisabledProtocols_SetSslProtocols_ThrowsException(SslProtocols disabledProtocols) + + public static IEnumerable GetAsync_AllowedSSLVersion_Succeeds_MemberData() { - using (HttpClientHandler handler = CreateHttpClientHandler()) + // These protocols are all enabled by default, so we can connect with them both when + // explicitly specifying it in the client and when not. + foreach (SslProtocols protocol in new[] { SslProtocols.Tls, SslProtocols.Tls11, SslProtocols.Tls12 }) { - Assert.Throws(() => handler.SslProtocols = disabledProtocols); + yield return new object[] { protocol, false }; + yield return new object[] { protocol, true }; } + + // These protocols are disabled by default, so we can only connect with them explicitly. + // On certain platforms these are completely disabled and cannot be used at all. +#pragma warning disable 0618 + if (PlatformDetection.IsWindows || + PlatformDetection.IsOSX || + (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && + PlatformDetection.OpenSslVersion < new Version(1, 0, 2) && + !PlatformDetection.IsDebian && + !PlatformDetection.IsRedHatFamily6)) + { + // TODO #28790: SSLv3 is supported on RHEL 6, but this test case still fails. + yield return new object[] { SslProtocols.Ssl3, true }; + } + if (PlatformDetection.IsWindows && !PlatformDetection.IsWindows10Version1607OrGreater) + { + yield return new object[] { SslProtocols.Ssl2, true }; + } +#pragma warning restore 0618 } [OuterLoop] // TODO: Issue #11345 [Theory] - [InlineData(SslProtocols.Tls, false)] - [InlineData(SslProtocols.Tls, true)] - [InlineData(SslProtocols.Tls11, false)] - [InlineData(SslProtocols.Tls11, true)] - [InlineData(SslProtocols.Tls12, false)] - [InlineData(SslProtocols.Tls12, true)] + [MemberData(nameof(GetAsync_AllowedSSLVersion_Succeeds_MemberData))] public async Task GetAsync_AllowedSSLVersion_Succeeds(SslProtocols acceptedProtocol, bool requestOnlyThisProtocol) { if (!BackendSupportsSslConfiguration) @@ -100,16 +110,16 @@ namespace System.Net.Http.Functional.Tests return; } - if (UseManagedHandler) + if (UseSocketsHttpHandler) { - // TODO #26186: The managed handler is failing on some OSes. + // TODO #26186: SocketsHttpHandler is failing on some OSes. return; } using (HttpClientHandler handler = CreateHttpClientHandler()) using (var client = new HttpClient(handler)) { - handler.ServerCertificateCustomValidationCallback = LoopbackServer.AllowAllCertificates; + handler.ServerCertificateCustomValidationCallback = TestHelper.AllowAllCertificates; if (requestOnlyThisProtocol) { @@ -119,42 +129,44 @@ namespace System.Net.Http.Functional.Tests await LoopbackServer.CreateServerAsync(async (server, url) => { await TestHelper.WhenAllCompletedOrAnyFailed( - LoopbackServer.ReadRequestAndSendResponseAsync(server, options: options), + server.AcceptConnectionSendResponseAndCloseAsync(), client.GetAsync(url)); }, options); } } - public static readonly object[][] SupportedSSLVersionServers = + public static IEnumerable SupportedSSLVersionServers() { - new object[] {SslProtocols.Tls, Configuration.Http.TLSv10RemoteServer}, - new object[] {SslProtocols.Tls11, Configuration.Http.TLSv11RemoteServer}, - new object[] {SslProtocols.Tls12, Configuration.Http.TLSv12RemoteServer}, - }; +#pragma warning disable 0618 // SSL2/3 are deprecated + if (PlatformDetection.IsWindows || + PlatformDetection.IsOSX || + (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && PlatformDetection.OpenSslVersion < new Version(1, 0, 2) && !PlatformDetection.IsDebian)) + { + yield return new object[] { SslProtocols.Ssl3, Configuration.Http.SSLv3RemoteServer }; + } +#pragma warning restore 0618 + yield return new object[] { SslProtocols.Tls, Configuration.Http.TLSv10RemoteServer }; + yield return new object[] { SslProtocols.Tls11, Configuration.Http.TLSv11RemoteServer }; + yield return new object[] { SslProtocols.Tls12, Configuration.Http.TLSv12RemoteServer }; + } - // This test is logically the same as the above test, albeit using remote servers - // instead of local ones. We're keeping it for now (as outerloop) because it helps - // to validate against another SSL implementation that what we mean by a particular - // TLS version matches that other implementation. + // We have tests that validate with SslStream, but that's limited by what the current OS supports. + // This tests provides additional validation against an external server. + [ActiveIssue(26186)] [OuterLoop("Avoid www.ssllabs.com dependency in innerloop.")] [Theory] [MemberData(nameof(SupportedSSLVersionServers))] public async Task GetAsync_SupportedSSLVersion_Succeeds(SslProtocols sslProtocols, string url) { - if (UseManagedHandler) + if (UseSocketsHttpHandler) { - // TODO #26186: The managed handler is failing on some OSes. + // TODO #26186: SocketsHttpHandler is failing on some OSes. return; } using (HttpClientHandler handler = CreateHttpClientHandler()) { - if (PlatformDetection.IsRedHatFamily7) - { - // Default protocol selection is always TLSv1 on Centos7 libcurl 7.29.0 - // Hence, set the specific protocol on HttpClient that is required by test - handler.SslProtocols = sslProtocols; - } + handler.SslProtocols = sslProtocols; using (var client = new HttpClient(handler)) { (await RemoteServerQuery.Run(() => client.GetAsync(url), remoteServerExceptionWrapper, url)).Dispose(); @@ -177,72 +189,70 @@ namespace System.Net.Http.Functional.Tests } }; - public static readonly object[][] NotSupportedSSLVersionServers = + public static IEnumerable NotSupportedSSLVersionServers() { - new object[] {"SSLv2", Configuration.Http.SSLv2RemoteServer}, - new object[] {"SSLv3", Configuration.Http.SSLv3RemoteServer}, - }; +#pragma warning disable 0618 + if (PlatformDetection.IsWindows10Version1607OrGreater) + { + yield return new object[] { SslProtocols.Ssl2, Configuration.Http.SSLv2RemoteServer }; + } +#pragma warning restore 0618 + } - // It would be easy to remove the dependency on these remote servers if we didn't - // explicitly disallow creating SslStream with SSLv2/3. Since we explicitly throw - // when trying to use such an SslStream, we can't stand up a localhost server that - // only speaks those protocols. + // We have tests that validate with SslStream, but that's limited by what the current OS supports. + // This tests provides additional validation against an external server. [OuterLoop("Avoid www.ssllabs.com dependency in innerloop.")] [Theory] [MemberData(nameof(NotSupportedSSLVersionServers))] - public async Task GetAsync_UnsupportedSSLVersion_Throws(string name, string url) + public async Task GetAsync_UnsupportedSSLVersion_Throws(SslProtocols sslProtocols, string url) { - if (!SSLv3DisabledByDefault) - { - return; - } - - if (UseManagedHandler && !PlatformDetection.IsWindows10Version1607OrGreater) - { - // On Windows, https://github.com/dotnet/corefx/issues/21925#issuecomment-313408314 - // On Linux, an older version of OpenSSL may permit negotiating SSLv3. - return; - } - - using (HttpClient client = CreateHttpClient()) + using (HttpClientHandler handler = CreateHttpClientHandler()) + using (HttpClient client = new HttpClient(handler)) { + handler.SslProtocols = sslProtocols; await Assert.ThrowsAsync(() => RemoteServerQuery.Run(() => client.GetAsync(url), remoteServerExceptionWrapper, url)); } } [OuterLoop] // TODO: Issue #11345 - [ConditionalFact(nameof(SslDefaultsToTls12))] + [Fact] public async Task GetAsync_NoSpecifiedProtocol_DefaultsToTls12() { if (!BackendSupportsSslConfiguration) + { return; + } + using (HttpClientHandler handler = CreateHttpClientHandler()) using (var client = new HttpClient(handler)) { - handler.ServerCertificateCustomValidationCallback = LoopbackServer.AllowAllCertificates; + handler.ServerCertificateCustomValidationCallback = TestHelper.AllowAllCertificates; - var options = new LoopbackServer.Options { UseSsl = true }; + var options = new LoopbackServer.Options { UseSsl = true, SslProtocols = SslProtocols.Tls12 }; await LoopbackServer.CreateServerAsync(async (server, url) => { await TestHelper.WhenAllCompletedOrAnyFailed( client.GetAsync(url), - LoopbackServer.AcceptSocketAsync(server, async (s, stream, reader, writer) => + server.AcceptConnectionAsync(async connection => { - Assert.Equal(SslProtocols.Tls12, Assert.IsType(stream).SslProtocol); - await LoopbackServer.ReadWriteAcceptedAsync(s, reader, writer); - return null; - }, options)); + Assert.Equal(SslProtocols.Tls12, Assert.IsType(connection.Stream).SslProtocol); + await connection.ReadRequestHeaderAndSendResponseAsync(); + })); }, options); } } [OuterLoop] // TODO: Issue #11345 [Theory] - [InlineData(SslProtocols.Tls11, SslProtocols.Tls, typeof(IOException))] - [InlineData(SslProtocols.Tls12, SslProtocols.Tls11, typeof(IOException))] - [InlineData(SslProtocols.Tls, SslProtocols.Tls12, typeof(AuthenticationException))] +#pragma warning disable 0618 // SSL2/3 are deprecated + [InlineData(SslProtocols.Ssl2, SslProtocols.Tls12)] + [InlineData(SslProtocols.Ssl3, SslProtocols.Tls12)] +#pragma warning restore 0618 + [InlineData(SslProtocols.Tls11, SslProtocols.Tls)] + [InlineData(SslProtocols.Tls12, SslProtocols.Tls11)] + [InlineData(SslProtocols.Tls, SslProtocols.Tls12)] public async Task GetAsync_AllowedSSLVersionDiffersFromServer_ThrowsException( - SslProtocols allowedProtocol, SslProtocols acceptedProtocol, Type exceptedServerException) + SslProtocols allowedProtocol, SslProtocols acceptedProtocol) { if (!BackendSupportsSslConfiguration) return; @@ -250,14 +260,25 @@ namespace System.Net.Http.Functional.Tests using (var client = new HttpClient(handler)) { handler.SslProtocols = allowedProtocol; - handler.ServerCertificateCustomValidationCallback = LoopbackServer.AllowAllCertificates; + handler.ServerCertificateCustomValidationCallback = TestHelper.AllowAllCertificates; var options = new LoopbackServer.Options { UseSsl = true, SslProtocols = acceptedProtocol }; await LoopbackServer.CreateServerAsync(async (server, url) => { - await TestHelper.WhenAllCompletedOrAnyFailed( - Assert.ThrowsAsync(exceptedServerException, () => LoopbackServer.ReadRequestAndSendResponseAsync(server, options: options)), - Assert.ThrowsAsync(() => client.GetAsync(url))); + Task serverTask = server.AcceptConnectionSendResponseAndCloseAsync(); + await Assert.ThrowsAsync(() => client.GetAsync(url)); + try + { + await serverTask; + } + catch (Exception e) when (e is IOException || e is AuthenticationException) + { + // Some SSL implementations simply close or reset connection after protocol mismatch. + // Newer OpenSSL sends Fatal Alert message before closing. + return; + } + // We expect negotiation to fail so one or the other expected exception should be thrown. + Assert.True(false, "Expected exception did not happen."); }, options); } } @@ -271,7 +292,7 @@ namespace System.Net.Http.Functional.Tests using (var client = new HttpClient(handler)) { handler.SslProtocols = SslProtocols.Tls11 | SslProtocols.Tls12; - handler.ServerCertificateCustomValidationCallback = LoopbackServer.AllowAllCertificates; + handler.ServerCertificateCustomValidationCallback = TestHelper.AllowAllCertificates; if (BackendSupportsSslConfiguration) { @@ -280,9 +301,20 @@ namespace System.Net.Http.Functional.Tests options.SslProtocols = SslProtocols.Tls; await LoopbackServer.CreateServerAsync(async (server, url) => { - await TestHelper.WhenAllCompletedOrAnyFailed( - Assert.ThrowsAsync(() => LoopbackServer.ReadRequestAndSendResponseAsync(server, options: options)), - Assert.ThrowsAsync(() => client.GetAsync(url))); + Task serverTask = server.AcceptConnectionSendResponseAndCloseAsync(); + await Assert.ThrowsAsync(() => client.GetAsync(url)); + try + { + await serverTask; + } + catch (Exception e) when (e is IOException || e is AuthenticationException) + { + // Some SSL implementations simply close or reset connection after protocol mismatch. + // Newer OpenSSL sends Fatal Alert message before closing. + return; + } + // We expect negotiation to fail so one or the other expected exception should be thrown. + Assert.True(false, "Expected exception did not happen."); }, options); foreach (var prot in new[] { SslProtocols.Tls11, SslProtocols.Tls12 }) @@ -291,7 +323,7 @@ namespace System.Net.Http.Functional.Tests await LoopbackServer.CreateServerAsync(async (server, url) => { await TestHelper.WhenAllCompletedOrAnyFailed( - LoopbackServer.ReadRequestAndSendResponseAsync(server, options: options), + server.AcceptConnectionSendResponseAndCloseAsync(), client.GetAsync(url)); }, options); } @@ -302,9 +334,5 @@ namespace System.Net.Http.Functional.Tests } } } - - private static bool SslDefaultsToTls12 => !PlatformDetection.IsWindows7; - // TLS 1.2 may not be enabled on Win7 - // https://technet.microsoft.com/en-us/library/dn786418.aspx#BKMK_SchannelTR_TLS12 } } diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.cs.REMOVED.git-id b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.cs.REMOVED.git-id index fea9b1229d..d2a39dedcb 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.cs.REMOVED.git-id +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.cs.REMOVED.git-id @@ -1 +1 @@ -b4de81da4ff514243cfb621c3d54b94e9c695351 \ No newline at end of file +ad067fabc512195ddaec57a743c27141623c0d11 \ No newline at end of file diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientMiniStressTest.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientMiniStressTest.cs index 7866a00087..6ef4370683 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientMiniStressTest.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientMiniStressTest.cs @@ -12,13 +12,9 @@ using Xunit; namespace System.Net.Http.Functional.Tests { - using Configuration = System.Net.Test.Common.Configuration; - - public class HttpClientMiniStress : HttpClientTestBase + public abstract class HttpClientMiniStress : HttpClientTestBase { - private static bool HttpStressEnabled => Configuration.Http.StressEnabled; - - [ConditionalTheory(nameof(HttpStressEnabled))] + [ConditionalTheory(typeof(TestEnvironment), nameof(TestEnvironment.IsStressModeEnabled))] [MemberData(nameof(GetStressOptions))] public void SingleClient_ManyGets_Sync(int numRequests, int dop, HttpCompletionOption completionOption) { @@ -32,7 +28,7 @@ namespace System.Net.Http.Functional.Tests } } - [ConditionalTheory(nameof(HttpStressEnabled))] + [ConditionalTheory(typeof(TestEnvironment), nameof(TestEnvironment.IsStressModeEnabled))] public async Task SingleClient_ManyGets_Async(int numRequests, int dop, HttpCompletionOption completionOption) { string responseText = CreateResponse("abcdefghijklmnopqrstuvwxyz"); @@ -42,7 +38,7 @@ namespace System.Net.Http.Functional.Tests } } - [ConditionalTheory(nameof(HttpStressEnabled))] + [ConditionalTheory(typeof(TestEnvironment), nameof(TestEnvironment.IsStressModeEnabled))] [MemberData(nameof(GetStressOptions))] public void ManyClients_ManyGets(int numRequests, int dop, HttpCompletionOption completionOption) { @@ -56,7 +52,7 @@ namespace System.Net.Http.Functional.Tests }); } - [ConditionalTheory(nameof(HttpStressEnabled))] + [ConditionalTheory(typeof(TestEnvironment), nameof(TestEnvironment.IsStressModeEnabled))] [MemberData(nameof(PostStressOptions))] public async Task ManyClients_ManyPosts_Async(int numRequests, int dop, int numBytes) { @@ -70,7 +66,7 @@ namespace System.Net.Http.Functional.Tests }); } - [ConditionalTheory(nameof(HttpStressEnabled))] + [ConditionalTheory(typeof(TestEnvironment), nameof(TestEnvironment.IsStressModeEnabled))] [InlineData(1000000)] public void CreateAndDestroyManyClients(int numClients) { @@ -80,7 +76,7 @@ namespace System.Net.Http.Functional.Tests } } - [ConditionalTheory(nameof(HttpStressEnabled))] + [ConditionalTheory(typeof(TestEnvironment), nameof(TestEnvironment.IsStressModeEnabled))] [InlineData(5000)] public async Task MakeAndFaultManyRequests(int numRequests) { @@ -90,13 +86,12 @@ namespace System.Net.Http.Functional.Tests { client.Timeout = Timeout.InfiniteTimeSpan; - var ep = (IPEndPoint)server.LocalEndPoint; Task[] tasks = (from i in Enumerable.Range(0, numRequests) - select client.GetStringAsync($"http://{ep.Address}:{ep.Port}")) + select client.GetStringAsync(url)) .ToArray(); - Assert.All(tasks, t => + Assert.All(tasks, t => Assert.True(t.IsFaulted || t.Status == TaskStatus.WaitingForActivation, $"Unexpected status {t.Status}")); server.Dispose(); @@ -123,14 +118,14 @@ namespace System.Net.Http.Functional.Tests { Task getAsync = client.GetAsync(url, completionOption); - LoopbackServer.AcceptSocketAsync(server, (s, stream, reader, writer) => + server.AcceptConnectionAsync(connection => { - while (!string.IsNullOrEmpty(reader.ReadLine())) ; + while (!string.IsNullOrEmpty(connection.Reader.ReadLine())) ; - writer.Write(responseText); - s.Shutdown(SocketShutdown.Send); + connection.Writer.Write(responseText); + connection.Socket.Shutdown(SocketShutdown.Send); - return Task.FromResult>(null); + return Task.CompletedTask; }).GetAwaiter().GetResult(); getAsync.GetAwaiter().GetResult().Dispose(); @@ -144,14 +139,12 @@ namespace System.Net.Http.Functional.Tests { Task getAsync = client.GetAsync(url, completionOption); - await LoopbackServer.AcceptSocketAsync(server, async (s, stream, reader, writer) => + await server.AcceptConnectionAsync(async connection => { - while (!string.IsNullOrEmpty(await reader.ReadLineAsync().ConfigureAwait(false))) ; + while (!string.IsNullOrEmpty(await connection.Reader.ReadLineAsync().ConfigureAwait(false))) ; - await writer.WriteAsync(responseText).ConfigureAwait(false); - s.Shutdown(SocketShutdown.Send); - - return null; + await connection.Writer.WriteAsync(responseText).ConfigureAwait(false); + connection.Socket.Shutdown(SocketShutdown.Send); }); (await getAsync.ConfigureAwait(false)).Dispose(); @@ -173,35 +166,33 @@ namespace System.Net.Http.Functional.Tests var content = new ByteArrayContent(new byte[numBytes]); Task postAsync = client.PostAsync(url, content); - await LoopbackServer.AcceptSocketAsync(server, async (s, stream, reader, writer) => + await server.AcceptConnectionAsync(async connection => { - while (!string.IsNullOrEmpty(await reader.ReadLineAsync().ConfigureAwait(false))) ; - for (int i = 0; i < numBytes; i++) Assert.NotEqual(-1, reader.Read()); + while (!string.IsNullOrEmpty(await connection.Reader.ReadLineAsync().ConfigureAwait(false))) ; + for (int i = 0; i < numBytes; i++) Assert.NotEqual(-1, connection.Reader.Read()); - await writer.WriteAsync(responseText).ConfigureAwait(false); - s.Shutdown(SocketShutdown.Send); - - return null; + await connection.Writer.WriteAsync(responseText).ConfigureAwait(false); + connection.Socket.Shutdown(SocketShutdown.Send); }); (await postAsync.ConfigureAwait(false)).Dispose(); }); } - [ConditionalFact(nameof(HttpStressEnabled))] + [ConditionalFact(typeof(TestEnvironment), nameof(TestEnvironment.IsStressModeEnabled))] public async Task UnreadResponseMessage_Collectible() { await LoopbackServer.CreateServerAsync(async (server, url) => { using (HttpClient client = CreateHttpClient()) { - Func> getAsync = async () => new WeakReference(await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead)); + Func> getAsync = () => client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead).ContinueWith(t => new WeakReference(t.Result)); Task wrt = getAsync(); - await LoopbackServer.AcceptSocketAsync(server, async (s, stream, reader, writer) => + await server.AcceptConnectionAsync(async connection => { - while (!string.IsNullOrEmpty(await reader.ReadLineAsync())) ; - await writer.WriteAsync(CreateResponse(new string('a', 32 * 1024))); + while (!string.IsNullOrEmpty(await connection.Reader.ReadLineAsync())) ; + await connection.Writer.WriteAsync(CreateResponse(new string('a', 32 * 1024))); WeakReference wr = wrt.GetAwaiter().GetResult(); Assert.True(SpinWait.SpinUntil(() => @@ -211,8 +202,6 @@ namespace System.Net.Http.Functional.Tests GC.Collect(); return !wr.IsAlive; }, 10 * 1000), "Response object should have been collected"); - - return null; }); } }); @@ -224,7 +213,7 @@ namespace System.Net.Http.Functional.Tests "Content-Type: text/plain\r\n" + $"Content-Length: {asciiBody.Length}\r\n" + "\r\n" + - $"{asciiBody}\r\n"; + $"{asciiBody}"; private static Task ForCountAsync(int count, int dop, Func bodyAsync) { diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientTest.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientTest.cs index b8eace674e..180975cf04 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientTest.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientTest.cs @@ -2,9 +2,11 @@ // 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.Collections.Generic; using System.IO; using System.Linq; using System.Net.Test.Common; +using System.Text; using System.Threading; using System.Threading.Tasks; @@ -12,7 +14,7 @@ using Xunit; namespace System.Net.Http.Functional.Tests { - public partial class HttpClientTest : HttpClientTestBase + public abstract partial class HttpClientTest : HttpClientTestBase { [Fact] public void Dispose_MultipleTimes_Success() @@ -125,12 +127,7 @@ namespace System.Net.Http.Functional.Tests await LoopbackServer.CreateServerAsync(async (server, url) => { Task getTask = client.GetStringAsync(url); - Task serverTask = LoopbackServer.ReadRequestAndSendResponseAsync(server, - $"HTTP/1.1 200 OK\r\n" + - $"Date: {DateTimeOffset.UtcNow:R}\r\n" + - $"Content-Length: {contentLength}\r\n" + - "\r\n" + - new string('s', contentLength)); + Task serverTask = server.AcceptConnectionSendResponseAndCloseAsync(content: new string('s', contentLength)); Task bothTasks = TestHelper.WhenAllCompletedOrAnyFailed(getTask, serverTask); if (exceptionExpected) @@ -272,11 +269,11 @@ namespace System.Net.Http.Functional.Tests cts.Cancel(); - await Assert.ThrowsAnyAsync(() => t1); - await Assert.ThrowsAnyAsync(() => t2); - await Assert.ThrowsAnyAsync(() => t3); - await Assert.ThrowsAnyAsync(() => t4); - await Assert.ThrowsAnyAsync(() => t5); + await Assert.ThrowsAsync(() => t1); + await Assert.ThrowsAsync(() => t2); + await Assert.ThrowsAsync(() => t3); + await Assert.ThrowsAsync(() => t4); + await Assert.ThrowsAsync(() => t5); } } @@ -388,7 +385,7 @@ namespace System.Net.Http.Functional.Tests } Task[] tasks = Enumerable.Range(0, 3).Select(_ => client.GetAsync(CreateFakeUri())).ToArray(); client.CancelPendingRequests(); - Assert.All(tasks, task => Assert.ThrowsAny(() => task.GetAwaiter().GetResult())); + Assert.All(tasks, task => Assert.Throws(() => task.GetAwaiter().GetResult())); } } @@ -399,10 +396,30 @@ namespace System.Net.Http.Functional.Tests { client.Timeout = TimeSpan.FromMilliseconds(1); Task[] tasks = Enumerable.Range(0, 3).Select(_ => client.GetAsync(CreateFakeUri())).ToArray(); - Assert.All(tasks, task => Assert.ThrowsAny(() => task.GetAwaiter().GetResult())); + Assert.All(tasks, task => Assert.Throws(() => task.GetAwaiter().GetResult())); } } + [Fact] + public async Task SendAsync_UserAgent_CorrectlyWritten() + { + string userAgent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.18 Safari/537.36"; + + await LoopbackServer.CreateClientAndServerAsync(async uri => + { + using (var client = CreateHttpClient()) + { + var message = new HttpRequestMessage(HttpMethod.Get, uri); + message.Headers.TryAddWithoutValidation("User-Agent", userAgent); + (await client.SendAsync(message).ConfigureAwait(false)).Dispose(); + } + }, server => server.AcceptConnectionAsync(async connection => + { + List headers = await connection.ReadRequestHeaderAndSendResponseAsync(); + Assert.Contains($"User-Agent: {userAgent}", headers); + })); + } + [Fact] [OuterLoop("One second delay in getting server's response")] public async Task Timeout_SetTo30AndGetResponseFromLoopbackQuickly_Success() @@ -417,7 +434,7 @@ namespace System.Net.Http.Functional.Tests await Task.Delay(TimeSpan.FromSeconds(.5)); await TestHelper.WhenAllCompletedOrAnyFailed( getTask, - LoopbackServer.ReadRequestAndSendResponseAsync(server)); + server.AcceptConnectionSendResponseAndCloseAsync()); }); } } diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientTest.netcoreapp.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientTest.netcoreapp.cs index 618bc2cb80..adbe4f18d4 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientTest.netcoreapp.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientTest.netcoreapp.cs @@ -9,7 +9,7 @@ using Xunit; namespace System.Net.Http.Functional.Tests { - public partial class HttpClientTest + public abstract partial class HttpClientTest { [Fact] public async Task PatchAsync_Canceled_Throws() @@ -23,7 +23,7 @@ namespace System.Net.Http.Functional.Tests cts.Cancel(); - await Assert.ThrowsAnyAsync(() => t1); + await Assert.ThrowsAsync(() => t1); } } diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientTestBase.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientTestBase.cs index c8220d916b..5758dde86e 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientTestBase.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientTestBase.cs @@ -3,58 +3,53 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; -using System.Threading; +using System.Reflection; namespace System.Net.Http.Functional.Tests { public abstract class HttpClientTestBase : RemoteExecutorTestBase { - private const string ManagedHandlerEnvVar = "COMPlus_UseManagedHttpClientHandler"; - private static readonly LocalDataStoreSlot s_managedHandlerSlot; + protected virtual bool UseSocketsHttpHandler => true; - static HttpClientTestBase() - { - s_managedHandlerSlot = Thread.GetNamedDataSlot(ManagedHandlerEnvVar); - if (s_managedHandlerSlot == null) - { - try - { - s_managedHandlerSlot = Thread.AllocateNamedDataSlot(ManagedHandlerEnvVar); - } - catch (ArgumentException) - { - s_managedHandlerSlot = Thread.GetNamedDataSlot(ManagedHandlerEnvVar); - } - } - Debug.Assert(s_managedHandlerSlot != null); - } - - protected virtual bool UseManagedHandler => false; + protected bool IsWinHttpHandler => !UseSocketsHttpHandler && PlatformDetection.IsWindows && !PlatformDetection.IsUap && !PlatformDetection.IsFullFramework; + protected bool IsCurlHandler => !UseSocketsHttpHandler && !PlatformDetection.IsWindows; + protected bool IsNetfxHandler => PlatformDetection.IsWindows && PlatformDetection.IsFullFramework; + protected bool IsUapHandler => PlatformDetection.IsWindows && PlatformDetection.IsUap; protected HttpClient CreateHttpClient() => new HttpClient(CreateHttpClientHandler()); - protected HttpClientHandler CreateHttpClientHandler() => CreateHttpClientHandler(UseManagedHandler); + protected HttpClientHandler CreateHttpClientHandler() => CreateHttpClientHandler(UseSocketsHttpHandler); - protected static HttpClient CreateHttpClient(string useManagedHandlerBoolString) => - new HttpClient(CreateHttpClientHandler(useManagedHandlerBoolString)); + protected static HttpClient CreateHttpClient(string useSocketsHttpHandlerBoolString) => + new HttpClient(CreateHttpClientHandler(useSocketsHttpHandlerBoolString)); - protected static HttpClientHandler CreateHttpClientHandler(string useManagedHandlerBoolString) => - CreateHttpClientHandler(bool.Parse(useManagedHandlerBoolString)); + protected static HttpClientHandler CreateHttpClientHandler(string useSocketsHttpHandlerBoolString) => + CreateHttpClientHandler(bool.Parse(useSocketsHttpHandlerBoolString)); - protected static HttpClientHandler CreateHttpClientHandler(bool useManagedHandler) => - useManagedHandler ? CreateManagedHttpClientHandler() : new HttpClientHandler(); - - private static HttpClientHandler CreateManagedHttpClientHandler() + protected static HttpClientHandler CreateHttpClientHandler(bool useSocketsHttpHandler) { - try + if (!PlatformDetection.IsNetCore || useSocketsHttpHandler) { - Thread.SetData(s_managedHandlerSlot, true); return new HttpClientHandler(); } - finally - { - Thread.SetData(s_managedHandlerSlot, null); - } + + // Create platform specific handler. + ConstructorInfo ctor = typeof(HttpClientHandler).GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance, null, new Type[] { typeof(bool) }, null); + Debug.Assert(ctor != null, "Couldn't find test constructor on HttpClientHandler"); + + HttpClientHandler handler = (HttpClientHandler)ctor.Invoke(new object[] { useSocketsHttpHandler }); + Debug.Assert(useSocketsHttpHandler == IsSocketsHttpHandler(handler), "Unexpected handler."); + + return handler; + } + + protected static bool IsSocketsHttpHandler(HttpClientHandler handler) => + GetUnderlyingSocketsHttpHandler(handler) != null; + + protected static object GetUnderlyingSocketsHttpHandler(HttpClientHandler handler) + { + FieldInfo field = typeof(HttpClientHandler).GetField("_socketsHttpHandler", BindingFlags.Instance | BindingFlags.NonPublic); + return field?.GetValue(handler); } } } diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpCookieProtocolTests.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpCookieProtocolTests.cs new file mode 100644 index 0000000000..19d76c8214 --- /dev/null +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpCookieProtocolTests.cs @@ -0,0 +1,641 @@ +// 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.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Net.Test.Common; +using System.Threading.Tasks; +using Xunit; + +namespace System.Net.Http.Functional.Tests +{ + public abstract class HttpCookieProtocolTests : HttpClientTestBase + { + private const string s_cookieName = "ABC"; + private const string s_cookieValue = "123"; + private const string s_expectedCookieHeaderValue = "ABC=123"; + + private const string s_customCookieHeaderValue = "CustomCookie=456"; + + private const string s_simpleContent = "Hello world!"; + + // + // Send cookie tests + // + + private static CookieContainer CreateSingleCookieContainer(Uri uri) => CreateSingleCookieContainer(uri, s_cookieName, s_cookieValue); + + private static CookieContainer CreateSingleCookieContainer(Uri uri, string cookieName, string cookieValue) + { + var container = new CookieContainer(); + container.Add(uri, new Cookie(cookieName, cookieValue)); + return container; + } + + private static string GetCookieHeaderValue(string cookieName, string cookieValue) => $"{cookieName}={cookieValue}"; + + + [Fact] + public async Task GetAsync_DefaultCoookieContainer_NoCookieSent() + { + await LoopbackServer.CreateServerAsync(async (server, url) => + { + using (HttpClient client = CreateHttpClient()) + { + Task getResponseTask = client.GetAsync(url); + Task> serverTask = server.AcceptConnectionSendResponseAndCloseAsync(); + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + List requestLines = await serverTask; + + Assert.Equal(0, requestLines.Count(s => s.StartsWith("Cookie:"))); + } + }); + } + + [Theory] + [MemberData(nameof(CookieNamesValuesAndUseCookies))] + public async Task GetAsync_SetCookieContainer_CookieSent(string cookieName, string cookieValue, bool useCookies) + { + await LoopbackServer.CreateServerAsync(async (server, url) => + { + HttpClientHandler handler = CreateHttpClientHandler(); + handler.CookieContainer = CreateSingleCookieContainer(url, cookieName, cookieValue); + handler.UseCookies = useCookies; + + using (HttpClient client = new HttpClient(handler)) + { + Task getResponseTask = client.GetAsync(url); + Task> serverTask = server.AcceptConnectionSendResponseAndCloseAsync(); + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + List requestLines = await serverTask; + + if (useCookies) + { + Assert.Contains($"Cookie: {GetCookieHeaderValue(cookieName, cookieValue)}", requestLines); + Assert.Equal(1, requestLines.Count(s => s.StartsWith("Cookie:"))); + } + else + { + Assert.Equal(0, requestLines.Count(s => s.StartsWith("Cookie:"))); + } + } + }); + } + + [Fact] + public async Task GetAsync_SetCookieContainerMultipleCookies_CookiesSent() + { + var cookies = new Cookie[] + { + new Cookie("hello", "world"), + new Cookie("foo", "bar"), + new Cookie("ABC", "123") + }; + + await LoopbackServer.CreateServerAsync(async (server, url) => + { + HttpClientHandler handler = CreateHttpClientHandler(); + + var cookieContainer = new CookieContainer(); + foreach (Cookie c in cookies) + { + cookieContainer.Add(url, c); + } + + handler.CookieContainer = cookieContainer; + + using (HttpClient client = new HttpClient(handler)) + { + Task getResponseTask = client.GetAsync(url); + Task> serverTask = server.AcceptConnectionSendResponseAndCloseAsync(); + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + List requestLines = await serverTask; + + string expectedHeader = "Cookie: " + string.Join("; ", cookies.Select(c => $"{c.Name}={c.Value}").ToArray()); + Assert.Contains(expectedHeader, requestLines); + Assert.Equal(1, requestLines.Count(s => s.StartsWith("Cookie:"))); + } + }); + } + + [Fact] + public async Task GetAsync_AddCookieHeader_CookieHeaderSent() + { + if (IsNetfxHandler) + { + // Netfx handler does not support custom cookie header + return; + } + + await LoopbackServer.CreateServerAsync(async (server, url) => + { + HttpClientHandler handler = CreateHttpClientHandler(); + using (HttpClient client = new HttpClient(handler)) + { + HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Get, url); + requestMessage.Headers.Add("Cookie", s_customCookieHeaderValue); + + Task getResponseTask = client.SendAsync(requestMessage); + Task> serverTask = server.AcceptConnectionSendResponseAndCloseAsync(); + + List requestLines = await serverTask; + + Assert.Contains($"Cookie: {s_customCookieHeaderValue}", requestLines); + Assert.Equal(1, requestLines.Count(s => s.StartsWith("Cookie:"))); + } + }); + } + + [Fact] + public async Task GetAsync_AddMultipleCookieHeaders_CookiesSent() + { + if (IsNetfxHandler) + { + // Netfx handler does not support custom cookie header + return; + } + + await LoopbackServer.CreateServerAsync(async (server, url) => + { + HttpClientHandler handler = CreateHttpClientHandler(); + using (HttpClient client = new HttpClient(handler)) + { + HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Get, url); + requestMessage.Headers.Add("Cookie", "A=1"); + requestMessage.Headers.Add("Cookie", "B=2"); + requestMessage.Headers.Add("Cookie", "C=3"); + + Task getResponseTask = client.SendAsync(requestMessage); + Task> serverTask = server.AcceptConnectionSendResponseAndCloseAsync(); + + List requestLines = await serverTask; + + Assert.Equal(1, requestLines.Count(s => s.StartsWith("Cookie: "))); + + // Multiple Cookie header values are treated as any other header values and are + // concatenated using ", " as the separator. + + var cookieValues = requestLines.Single(s => s.StartsWith("Cookie: ")).Substring(8).Split(new string[] { ", " }, StringSplitOptions.None); + Assert.Contains("A=1", cookieValues); + Assert.Contains("B=2", cookieValues); + Assert.Contains("C=3", cookieValues); + Assert.Equal(3, cookieValues.Count()); + } + }); + } + + [Fact] + public async Task GetAsync_SetCookieContainerAndCookieHeader_BothCookiesSent() + { + if (IsNetfxHandler) + { + // Netfx handler does not support custom cookie header + return; + } + + if (IsCurlHandler) + { + // Issue #26983 + // CurlHandler ignores container cookies when custom Cookie header is set. + return; + } + + await LoopbackServer.CreateServerAsync(async (server, url) => + { + HttpClientHandler handler = CreateHttpClientHandler(); + handler.CookieContainer = CreateSingleCookieContainer(url); + + using (HttpClient client = new HttpClient(handler)) + { + HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Get, url); + requestMessage.Headers.Add("Cookie", s_customCookieHeaderValue); + + Task getResponseTask = client.SendAsync(requestMessage); + Task> serverTask = server.AcceptConnectionSendResponseAndCloseAsync(); + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + List requestLines = await serverTask; + + Assert.Equal(1, requestLines.Count(s => s.StartsWith("Cookie: "))); + + var cookies = requestLines.Single(s => s.StartsWith("Cookie: ")).Substring(8).Split(new string[] { "; " }, StringSplitOptions.None); + Assert.Contains(s_expectedCookieHeaderValue, cookies); + Assert.Contains(s_customCookieHeaderValue, cookies); + Assert.Equal(2, cookies.Count()); + } + }); + } + + [Fact] + public async Task GetAsync_SetCookieContainerAndMultipleCookieHeaders_BothCookiesSent() + { + if (IsNetfxHandler) + { + // Netfx handler does not support custom cookie header + return; + } + + if (IsCurlHandler) + { + // Issue #26983 + // CurlHandler ignores container cookies when custom Cookie header is set. + return; + } + + await LoopbackServer.CreateServerAsync(async (server, url) => + { + HttpClientHandler handler = CreateHttpClientHandler(); + handler.CookieContainer = CreateSingleCookieContainer(url); + + using (HttpClient client = new HttpClient(handler)) + { + HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Get, url); + requestMessage.Headers.Add("Cookie", "A=1"); + requestMessage.Headers.Add("Cookie", "B=2"); + + Task getResponseTask = client.SendAsync(requestMessage); + Task> serverTask = server.AcceptConnectionSendResponseAndCloseAsync(); + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + List requestLines = await serverTask; + + Assert.Equal(1, requestLines.Count(s => s.StartsWith("Cookie: "))); + + // Multiple Cookie header values are treated as any other header values and are + // concatenated using ", " as the separator. The container cookie is concatenated to + // one of these values using the "; " cookie separator. + + var cookieValues = requestLines.Single(s => s.StartsWith("Cookie: ")).Substring(8).Split(new string[] { ", " }, StringSplitOptions.None); + Assert.Equal(2, cookieValues.Count()); + + // Find container cookie and remove it so we can validate the rest of the cookie header values + bool sawContainerCookie = false; + for (int i = 0; i < cookieValues.Length; i++) + { + if (cookieValues[i].Contains(';')) + { + Assert.False(sawContainerCookie); + + var cookies = cookieValues[i].Split(new string[] { "; " }, StringSplitOptions.None); + Assert.Equal(2, cookies.Count()); + Assert.Contains(s_expectedCookieHeaderValue, cookies); + + sawContainerCookie = true; + cookieValues[i] = cookies.Where(c => c != s_expectedCookieHeaderValue).Single(); + } + } + + Assert.Contains("A=1", cookieValues); + Assert.Contains("B=2", cookieValues); + } + }); + } + + [Fact] + public async Task GetAsyncWithRedirect_SetCookieContainer_CorrectCookiesSent() + { + const string path1 = "/foo"; + const string path2 = "/bar"; + + await LoopbackServer.CreateClientAndServerAsync(async url => + { + Uri url1 = new Uri(url, path1); + Uri url2 = new Uri(url, path2); + Uri unusedUrl = new Uri(url, "/unused"); + + HttpClientHandler handler = CreateHttpClientHandler(); + handler.CookieContainer = new CookieContainer(); + handler.CookieContainer.Add(url1, new Cookie("cookie1", "value1")); + handler.CookieContainer.Add(url2, new Cookie("cookie2", "value2")); + handler.CookieContainer.Add(unusedUrl, new Cookie("cookie3", "value3")); + + using (HttpClient client = new HttpClient(handler)) + { + client.DefaultRequestHeaders.ConnectionClose = true; // to avoid issues with connection pooling + await client.GetAsync(url1); + } + }, + async server => + { + List request1Lines = await server.AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode.Found, $"Location: {path2}\r\n"); + + Assert.Contains($"Cookie: cookie1=value1", request1Lines); + Assert.Equal(1, request1Lines.Count(s => s.StartsWith("Cookie:"))); + + List request2Lines = await server.AcceptConnectionSendResponseAndCloseAsync(content: s_simpleContent); + + Assert.Contains($"Cookie: cookie2=value2", request2Lines); + Assert.Equal(1, request2Lines.Count(s => s.StartsWith("Cookie:"))); + }); + } + + // + // Receive cookie tests + // + + [Theory] + [MemberData(nameof(CookieNamesValuesAndUseCookies))] + public async Task GetAsync_ReceiveSetCookieHeader_CookieAdded(string cookieName, string cookieValue, bool useCookies) + { + await LoopbackServer.CreateServerAsync(async (server, url) => + { + HttpClientHandler handler = CreateHttpClientHandler(); + handler.UseCookies = useCookies; + + using (HttpClient client = new HttpClient(handler)) + { + Task getResponseTask = client.GetAsync(url); + Task> serverTask = server.AcceptConnectionSendResponseAndCloseAsync( + HttpStatusCode.OK, $"Set-Cookie: {GetCookieHeaderValue(cookieName, cookieValue)}\r\n", s_simpleContent); + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + CookieCollection collection = handler.CookieContainer.GetCookies(url); + + if (useCookies) + { + Assert.Equal(1, collection.Count); + Assert.Equal(cookieName, collection[0].Name); + Assert.Equal(cookieValue, collection[0].Value); + } + else + { + Assert.Equal(0, collection.Count); + } + } + }); + } + + [Fact] + public async Task GetAsync_ReceiveMultipleSetCookieHeaders_CookieAdded() + { + await LoopbackServer.CreateServerAsync(async (server, url) => + { + HttpClientHandler handler = CreateHttpClientHandler(); + + using (HttpClient client = new HttpClient(handler)) + { + Task getResponseTask = client.GetAsync(url); + Task> serverTask = server.AcceptConnectionSendResponseAndCloseAsync( + HttpStatusCode.OK, + $"Set-Cookie: A=1; Path=/\r\n" + + $"Set-Cookie : B=2; Path=/\r\n" + // space before colon to verify header is trimmed and recognized + $"Set-Cookie: C=3; Path=/\r\n", + s_simpleContent); + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + CookieCollection collection = handler.CookieContainer.GetCookies(url); + Assert.Equal(3, collection.Count); + + // Convert to array so we can more easily process contents, since CookieCollection does not implement IEnumerable + Cookie[] cookies = new Cookie[3]; + collection.CopyTo(cookies, 0); + + Assert.Contains(cookies, c => c.Name == "A" && c.Value == "1"); + Assert.Contains(cookies, c => c.Name == "B" && c.Value == "2"); + Assert.Contains(cookies, c => c.Name == "C" && c.Value == "3"); + } + }); + } + + [Fact] + public async Task GetAsync_ReceiveSetCookieHeader_CookieUpdated() + { + const string newCookieValue = "789"; + + await LoopbackServer.CreateServerAsync(async (server, url) => + { + HttpClientHandler handler = CreateHttpClientHandler(); + handler.CookieContainer = CreateSingleCookieContainer(url); + + using (HttpClient client = new HttpClient(handler)) + { + Task getResponseTask = client.GetAsync(url); + Task> serverTask = server.AcceptConnectionSendResponseAndCloseAsync( + HttpStatusCode.OK, $"Set-Cookie: {s_cookieName}={newCookieValue}\r\n", s_simpleContent); + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + CookieCollection collection = handler.CookieContainer.GetCookies(url); + Assert.Equal(1, collection.Count); + Assert.Equal(s_cookieName, collection[0].Name); + Assert.Equal(newCookieValue, collection[0].Value); + } + }); + } + + [Fact] + public async Task GetAsync_ReceiveSetCookieHeader_CookieRemoved() + { + await LoopbackServer.CreateServerAsync(async (server, url) => + { + HttpClientHandler handler = CreateHttpClientHandler(); + handler.CookieContainer = CreateSingleCookieContainer(url); + + using (HttpClient client = new HttpClient(handler)) + { + Task getResponseTask = client.GetAsync(url); + Task> serverTask = server.AcceptConnectionSendResponseAndCloseAsync( + HttpStatusCode.OK, $"Set-Cookie: {s_cookieName}=; Expires=Sun, 06 Nov 1994 08:49:37 GMT\r\n", s_simpleContent); + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + CookieCollection collection = handler.CookieContainer.GetCookies(url); + Assert.Equal(0, collection.Count); + } + }); + } + + [Fact] + public async Task GetAsync_ReceiveInvalidSetCookieHeader_ValidCookiesAdded() + { + if (IsNetfxHandler) + { + // NetfxHandler incorrectly only processes one valid cookie + return; + } + + await LoopbackServer.CreateServerAsync(async (server, url) => + { + HttpClientHandler handler = CreateHttpClientHandler(); + + using (HttpClient client = new HttpClient(handler)) + { + Task getResponseTask = client.GetAsync(url); + Task> serverTask = server.AcceptConnectionSendResponseAndCloseAsync( + HttpStatusCode.OK, + $"Set-Cookie: A=1; Path=/;Expires=asdfsadgads\r\n" + // invalid Expires + $"Set-Cookie: B=2; Path=/\r\n" + + $"Set-Cookie: C=3; Path=/\r\n", + s_simpleContent); + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + CookieCollection collection = handler.CookieContainer.GetCookies(url); + Assert.Equal(2, collection.Count); + + // Convert to array so we can more easily process contents, since CookieCollection does not implement IEnumerable + Cookie[] cookies = new Cookie[3]; + collection.CopyTo(cookies, 0); + + Assert.Contains(cookies, c => c.Name == "B" && c.Value == "2"); + Assert.Contains(cookies, c => c.Name == "C" && c.Value == "3"); + } + }); + } + + [Fact] + public async Task GetAsyncWithRedirect_ReceiveSetCookie_CookieSent() + { + const string path1 = "/foo"; + const string path2 = "/bar"; + + await LoopbackServer.CreateClientAndServerAsync(async url => + { + Uri url1 = new Uri(url, path1); + + HttpClientHandler handler = CreateHttpClientHandler(); + + using (HttpClient client = new HttpClient(handler)) + { + client.DefaultRequestHeaders.ConnectionClose = true; // to avoid issues with connection pooling + await client.GetAsync(url1); + + CookieCollection collection = handler.CookieContainer.GetCookies(url); + + Assert.Equal(2, collection.Count); + + // Convert to array so we can more easily process contents, since CookieCollection does not implement IEnumerable + Cookie[] cookies = new Cookie[2]; + collection.CopyTo(cookies, 0); + + Assert.Contains(cookies, c => c.Name == "A" && c.Value == "1"); + Assert.Contains(cookies, c => c.Name == "B" && c.Value == "2"); + } + }, + async server => + { + List request1Lines = await server.AcceptConnectionSendResponseAndCloseAsync( + HttpStatusCode.Found, $"Location: {path2}\r\nSet-Cookie: A=1; Path=/\r\n"); + + Assert.Equal(0, request1Lines.Count(s => s.StartsWith("Cookie:"))); + + List request2Lines = await server.AcceptConnectionSendResponseAndCloseAsync( + HttpStatusCode.OK, $"Set-Cookie: B=2; Path=/\r\n", s_simpleContent); + + Assert.Contains($"Cookie: A=1", request2Lines); + Assert.Equal(1, request2Lines.Count(s => s.StartsWith("Cookie:"))); + }); + } + + [Fact] + public async Task GetAsyncWithBasicAuth_ReceiveSetCookie_CookieSent() + { + if (IsWinHttpHandler) + { + // Issue #26986 + // WinHttpHandler does not process the cookie. + return; + } + + await LoopbackServer.CreateClientAndServerAsync(async url => + { + HttpClientHandler handler = CreateHttpClientHandler(); + handler.Credentials = new NetworkCredential("user", "pass"); + + using (HttpClient client = new HttpClient(handler)) + { + await client.GetAsync(url); + + CookieCollection collection = handler.CookieContainer.GetCookies(url); + + Assert.Equal(2, collection.Count); + + // Convert to array so we can more easily process contents, since CookieCollection does not implement IEnumerable + Cookie[] cookies = new Cookie[2]; + collection.CopyTo(cookies, 0); + + Assert.Contains(cookies, c => c.Name == "A" && c.Value == "1"); + Assert.Contains(cookies, c => c.Name == "B" && c.Value == "2"); + } + }, + async server => + { + await server.AcceptConnectionAsync(async connection => + { + List request1Lines = await connection.ReadRequestHeaderAndSendResponseAsync( + HttpStatusCode.Unauthorized, + $"WWW-Authenticate: Basic realm=\"WallyWorld\"\r\nSet-Cookie: A=1; Path=/\r\n"); + + Assert.Equal(0, request1Lines.Count(s => s.StartsWith("Cookie:"))); + + List request2Lines = await connection.ReadRequestHeaderAndSendResponseAsync( + HttpStatusCode.OK, + $"Set-Cookie: B=2; Path=/\r\n", + s_simpleContent); + + Assert.Contains($"Cookie: A=1", request2Lines); + Assert.Equal(1, request2Lines.Count(s => s.StartsWith("Cookie:"))); + }); + }); + } + + // + // MemberData stuff + // + + private static string GenerateCookie(string name, char repeat, int overallHeaderValueLength) + { + string emptyHeaderValue = $"{name}=; Path=/"; + + Debug.Assert(overallHeaderValueLength > emptyHeaderValue.Length); + + int valueCount = overallHeaderValueLength - emptyHeaderValue.Length; + return new string(repeat, valueCount); + } + + public static IEnumerable CookieNamesValuesAndUseCookies() + { + foreach (bool useCookies in new[] { true, false }) + { + yield return new object[] { "ABC", "123", useCookies }; + yield return new object[] { "Hello", "World", useCookies }; + yield return new object[] { "foo", "bar", useCookies }; + + yield return new object[] { ".AspNetCore.Session", "RAExEmXpoCbueP_QYM", useCookies }; + + yield return new object[] + { + ".AspNetCore.Antiforgery.Xam7_OeLcN4", + "CfDJ8NGNxAt7CbdClq3UJ8_6w_4661wRQZT1aDtUOIUKshbcV4P0NdS8klCL5qGSN-PNBBV7w23G6MYpQ81t0PMmzIN4O04fqhZ0u1YPv66mixtkX3iTi291DgwT3o5kozfQhe08-RAExEmXpoCbueP_QYM", + useCookies + }; + + // WinHttpHandler calls WinHttpQueryHeaders to iterate through multiple Set-Cookie header values, + // using an initial buffer size of 128 chars. If the buffer is not large enough, WinHttpQueryHeaders + // returns an insufficient buffer error, allowing WinHttpHandler to try again with a larger buffer. + // Sometimes when WinHttpQueryHeaders fails due to insufficient buffer, it still advances the + // iteration index, which would cause header values to be missed if not handled correctly. + // + // In particular, WinHttpQueryHeader behaves as follows for the following header value lengths: + // * 0-127 chars: succeeds, index advances from 0 to 1. + // * 128-255 chars: fails due to insufficient buffer, index advances from 0 to 1. + // * 256+ chars: fails due to insufficient buffer, index stays at 0. + // + // The below overall header value lengths were chosen to exercise reading header values at these + // edges, to ensure WinHttpHandler does not miss multiple Set-Cookie headers. + + yield return new object[] { "foo", GenerateCookie(name: "foo", repeat: 'a', overallHeaderValueLength: 126), useCookies }; + yield return new object[] { "foo", GenerateCookie(name: "foo", repeat: 'a', overallHeaderValueLength: 127), useCookies }; + yield return new object[] { "foo", GenerateCookie(name: "foo", repeat: 'a', overallHeaderValueLength: 128), useCookies }; + yield return new object[] { "foo", GenerateCookie(name: "foo", repeat: 'a', overallHeaderValueLength: 129), useCookies }; + + yield return new object[] { "foo", GenerateCookie(name: "foo", repeat: 'a', overallHeaderValueLength: 254), useCookies }; + yield return new object[] { "foo", GenerateCookie(name: "foo", repeat: 'a', overallHeaderValueLength: 255), useCookies }; + yield return new object[] { "foo", GenerateCookie(name: "foo", repeat: 'a', overallHeaderValueLength: 256), useCookies }; + yield return new object[] { "foo", GenerateCookie(name: "foo", repeat: 'a', overallHeaderValueLength: 257), useCookies }; + } + } + } +} diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpProtocolTests.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpProtocolTests.cs index 6df3d74381..0915ddd23d 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpProtocolTests.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpProtocolTests.cs @@ -2,6 +2,7 @@ // 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.Collections.Generic; using System.IO; using System.Net.Test.Common; using System.Threading; @@ -10,9 +11,320 @@ using Xunit; namespace System.Net.Http.Functional.Tests { - public class HttpProtocolTests : HttpClientTest + public abstract class HttpProtocolTests : HttpClientTestBase { protected virtual Stream GetStream(Stream s) => s; + protected virtual Stream GetStream_ClientDisconnectOk(Stream s) => s; + + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap)] // Uap does not support 1.0 + [Fact] + public async Task GetAsync_RequestVersion10_Success() + { + await LoopbackServer.CreateServerAsync(async (server, url) => + { + using (HttpClient client = CreateHttpClient()) + { + HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, url); + request.Version = HttpVersion.Version10; + + Task getResponseTask = client.SendAsync(request); + Task> serverTask = server.AcceptConnectionSendResponseAndCloseAsync(); + + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + var requestLines = await serverTask; + Assert.Equal($"GET {url.PathAndQuery} HTTP/1.0", requestLines[0]); + } + }, new LoopbackServer.Options { StreamWrapper = GetStream }); + } + + [Fact] + public async Task GetAsync_RequestVersion11_Success() + { + await LoopbackServer.CreateServerAsync(async (server, url) => + { + using (HttpClient client = CreateHttpClient()) + { + HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, url); + request.Version = HttpVersion.Version11; + + Task getResponseTask = client.SendAsync(request); + Task> serverTask = server.AcceptConnectionSendResponseAndCloseAsync(); + + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + var requestLines = await serverTask; + Assert.Equal($"GET {url.PathAndQuery} HTTP/1.1", requestLines[0]); + } + }, new LoopbackServer.Options { StreamWrapper = GetStream }); + } + + [Theory] + [InlineData(0)] + [InlineData(1)] + [InlineData(9)] + public async Task GetAsync_RequestVersion0X_ThrowsOr11(int minorVersion) + { + Type exceptionType = null; + if (PlatformDetection.IsFullFramework) + { + exceptionType = typeof(ArgumentException); + } + else if (UseSocketsHttpHandler) + { + exceptionType = typeof(NotSupportedException); + } + + await LoopbackServer.CreateServerAsync(async (server, url) => + { + using (HttpClient client = CreateHttpClient()) + { + HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, url); + request.Version = new Version(0, minorVersion); + + Task getResponseTask = client.SendAsync(request); + Task> serverTask = server.AcceptConnectionSendResponseAndCloseAsync(); + + if (exceptionType == null) + { + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + var requestLines = await serverTask; + Assert.Equal($"GET {url.PathAndQuery} HTTP/1.1", requestLines[0]); + } + else + { + await Assert.ThrowsAsync(exceptionType, (() => TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask))); + } + } + }, new LoopbackServer.Options { StreamWrapper = GetStream_ClientDisconnectOk}); + } + + [Theory] + [InlineData(1, 2)] + [InlineData(1, 6)] + [InlineData(2, 0)] // Note, this is plain HTTP (not HTTPS), so 2.0 is not supported and should degrade to 1.1 + [InlineData(2, 1)] + [InlineData(2, 7)] + [InlineData(3, 0)] + [InlineData(4, 2)] + public async Task GetAsync_UnknownRequestVersion_ThrowsOrDegradesTo11(int majorVersion, int minorVersion) + { + Type exceptionType = null; + if (PlatformDetection.IsFullFramework) + { + exceptionType = typeof(ArgumentException); + } + + await LoopbackServer.CreateServerAsync(async (server, url) => + { + using (HttpClient client = CreateHttpClient()) + { + HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, url); + request.Version = new Version(majorVersion, minorVersion); + + Task getResponseTask = client.SendAsync(request); + Task> serverTask = server.AcceptConnectionSendResponseAndCloseAsync(); + + if (exceptionType == null) + { + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + var requestLines = await serverTask; + Assert.Equal($"GET {url.PathAndQuery} HTTP/1.1", requestLines[0]); + } + else + { + await Assert.ThrowsAsync(exceptionType, (() => TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask))); + } + } + }, new LoopbackServer.Options { StreamWrapper = GetStream_ClientDisconnectOk }); + } + + [Theory] + [InlineData(0)] + [InlineData(1)] + public async Task GetAsync_ResponseVersion10or11_Success(int responseMinorVersion) + { + await LoopbackServer.CreateServerAsync(async (server, url) => + { + using (HttpClient client = CreateHttpClient()) + { + HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, url); + request.Version = HttpVersion.Version11; + + Task getResponseTask = client.SendAsync(request); + Task> serverTask = + server.AcceptConnectionSendCustomResponseAndCloseAsync( + $"HTTP/1.{responseMinorVersion} 200 OK\r\nDate: {DateTimeOffset.UtcNow:R}\r\nContent-Length: 0\r\n\r\n"); + + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + using (HttpResponseMessage response = await getResponseTask) + { + Assert.Equal(1, response.Version.Major); + Assert.Equal(responseMinorVersion, response.Version.Minor); + } + } + }, new LoopbackServer.Options { StreamWrapper = GetStream }); + } + + [Theory] + [InlineData(2)] + [InlineData(7)] + public async Task GetAsync_ResponseUnknownVersion1X_Success(int responseMinorVersion) + { + bool reportAs11 = PlatformDetection.IsFullFramework; + bool reportAs00 = !UseSocketsHttpHandler; + + await LoopbackServer.CreateServerAsync(async (server, url) => + { + using (HttpClient client = CreateHttpClient()) + { + HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, url); + request.Version = HttpVersion.Version11; + + Task getResponseTask = client.SendAsync(request); + Task> serverTask = + server.AcceptConnectionSendCustomResponseAndCloseAsync( + $"HTTP/1.{responseMinorVersion} 200 OK\r\nDate: {DateTimeOffset.UtcNow:R}\r\nContent-Length: 0\r\n\r\n"); + + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + using (HttpResponseMessage response = await getResponseTask) + { + if (reportAs11) + { + Assert.Equal(1, response.Version.Major); + Assert.Equal(1, response.Version.Minor); + } + else if (reportAs00) + { + Assert.Equal(0, response.Version.Major); + Assert.Equal(0, response.Version.Minor); + } + else + { + Assert.Equal(1, response.Version.Major); + Assert.Equal(responseMinorVersion, response.Version.Minor); + } + } + } + }, new LoopbackServer.Options { StreamWrapper = GetStream }); + } + + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap)] // Uap ignores response version if not 1.0 or 1.1 + [Theory] + [InlineData(0)] + [InlineData(1)] + [InlineData(9)] + public async Task GetAsync_ResponseVersion0X_ThrowsOr10(int responseMinorVersion) + { + bool reportAs10 = PlatformDetection.IsFullFramework; + + await LoopbackServer.CreateServerAsync(async (server, url) => + { + using (HttpClient client = CreateHttpClient()) + { + HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, url); + request.Version = HttpVersion.Version11; + + Task getResponseTask = client.SendAsync(request); + Task> serverTask = + server.AcceptConnectionSendCustomResponseAndCloseAsync( + $"HTTP/0.{responseMinorVersion} 200 OK\r\nDate: {DateTimeOffset.UtcNow:R}\r\nContent-Length: 0\r\n\r\n"); + + if (reportAs10) + { + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + using (HttpResponseMessage response = await getResponseTask) + { + Assert.Equal(1, response.Version.Major); + Assert.Equal(0, response.Version.Minor); + } + } + else + { + await Assert.ThrowsAsync(async () => await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask)); + } + } + }, new LoopbackServer.Options { StreamWrapper = GetStream_ClientDisconnectOk }); + } + + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap)] // Uap ignores response version if not 1.0 or 1.1 + [Theory] + [InlineData(2, 0)] + [InlineData(2, 1)] + [InlineData(3, 0)] + [InlineData(4, 2)] + public async Task GetAsyncVersion11_BadResponseVersion_ThrowsOr00(int responseMajorVersion, int responseMinorVersion) + { + // Full framework reports 1.0 or 1.1, depending on minor version, instead of throwing + bool reportAs1X = PlatformDetection.IsFullFramework; + + // CurlHandler reports these as 0.0, except for 2.0 which is reported as 2.0, instead of throwing. + bool reportAs00 = false; + bool reportAs20 = false; + if (!PlatformDetection.IsWindows && !UseSocketsHttpHandler) + { + if (responseMajorVersion == 2 && responseMinorVersion == 0) + { + reportAs20 = true; + } + else + { + reportAs00 = true; + } + } + + await LoopbackServer.CreateServerAsync(async (server, url) => + { + using (HttpClient client = CreateHttpClient()) + { + HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, url); + request.Version = HttpVersion.Version11; + + Task getResponseTask = client.SendAsync(request); + Task> serverTask = + server.AcceptConnectionSendCustomResponseAndCloseAsync( + $"HTTP/{responseMajorVersion}.{responseMinorVersion} 200 OK\r\nDate: {DateTimeOffset.UtcNow:R}\r\nContent-Length: 0\r\n\r\n"); + + if (reportAs00) + { + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + using (HttpResponseMessage response = await getResponseTask) + { + Assert.Equal(0, response.Version.Major); + Assert.Equal(0, response.Version.Minor); + } + } + else if (reportAs20) + { + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + using (HttpResponseMessage response = await getResponseTask) + { + Assert.Equal(2, response.Version.Major); + Assert.Equal(0, response.Version.Minor); + } + } + else if (reportAs1X) + { + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + using (HttpResponseMessage response = await getResponseTask) + { + Assert.Equal(1, response.Version.Major); + Assert.Equal(responseMinorVersion == 0 ? 0 : 1, response.Version.Minor); + } + } + else + { + await Assert.ThrowsAsync(async () => await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask)); + } + } + }, new LoopbackServer.Options { StreamWrapper = GetStream_ClientDisconnectOk }); + } [Theory] [InlineData("HTTP/1.1 200 OK", 200, "OK")] @@ -27,17 +339,47 @@ namespace System.Net.Http.Functional.Tests [InlineData("HTTP/1.1 500 Internal Server Error", 500, "Internal Server Error")] [InlineData("HTTP/1.1 555 we just don't like you", 555, "we just don't like you")] [InlineData("HTTP/1.1 600 still valid", 600, "still valid")] - // TODO #24713: The following pass on Windows on .NET Core but fail on .NET Framework. - //[InlineData("HTTP/1.1 200 ", 200, "")] - //[InlineData("HTTP/1.1 200 Something", 200, "Something")] - //[InlineData("HTTP/1.1\t200 OK", 200, "OK")] - //[InlineData("HTTP/1.1 200\tOK", 200, "OK")] - //[InlineData("HTTP/1.1 200", 200, "")] - //[InlineData("HTTP/1.1 200\t", 200, "")] - //[InlineData("HTTP/1.1 200 O\tK", 200, "O\tK")] - //[InlineData("HTTP/1.1 200 O \t\t \t\t\t\t \t K", 200, "O \t\t \t\t\t\t \t K")] - //[InlineData("HTTP/1.1 999 this\ttoo\t", 999, "this\ttoo\t")] public async Task GetAsync_ExpectedStatusCodeAndReason_Success(string statusLine, int expectedStatusCode, string expectedReason) + { + if (IsWinHttpHandler) + { + return; // [ActiveIssue(25880)] + } + + await GetAsyncSuccessHelper(statusLine, expectedStatusCode, expectedReason); + } + + [Theory] + [InlineData("HTTP/1.1 200 ", 200, " ", "")] + [InlineData("HTTP/1.1 200 Something", 200, " Something", "Something")] + public async Task GetAsync_ExpectedStatusCodeAndReason_PlatformBehaviorTest(string statusLine, + int expectedStatusCode, string reasonWithSpace, string reasonNoSpace) + { + if (UseSocketsHttpHandler || PlatformDetection.IsFullFramework) + { + // SocketsHttpHandler and .NET Framework will keep the space characters. + await GetAsyncSuccessHelper(statusLine, expectedStatusCode, reasonWithSpace); + } + else + { + // WinRT, WinHttpHandler, and CurlHandler will trim space characters. + await GetAsyncSuccessHelper(statusLine, expectedStatusCode, reasonNoSpace); + } + } + + [Theory] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "The following pass on .NET Core but fail on .NET Framework.")] + [InlineData("HTTP/1.1 200", 200, "")] // This test data requires the fix in .NET Framework 4.7.3 + [InlineData("HTTP/1.1 200 O\tK", 200, "O\tK")] + [InlineData("HTTP/1.1 200 O \t\t \t\t\t\t \t K", 200, "O \t\t \t\t\t\t \t K")] + // Only CurlHandler will trim the '\t' at the end and causing failure. + // [InlineData("HTTP/1.1 999 this\ttoo\t", 999, "this\ttoo\t")] + public async Task GetAsync_StatusLineNotFollowRFC_SuccessOnCore(string statusLine, int expectedStatusCode, string expectedReason) + { + await GetAsyncSuccessHelper(statusLine, expectedStatusCode, expectedReason); + } + + private async Task GetAsyncSuccessHelper(string statusLine, int expectedStatusCode, string expectedReason) { await LoopbackServer.CreateServerAsync(async (server, url) => { @@ -46,98 +388,230 @@ namespace System.Net.Http.Functional.Tests Task getResponseTask = client.GetAsync(url); await TestHelper.WhenAllCompletedOrAnyFailed( getResponseTask, - LoopbackServer.ReadRequestAndSendResponseAsync(server, + server.AcceptConnectionSendCustomResponseAndCloseAsync( $"{statusLine}\r\n" + $"Date: {DateTimeOffset.UtcNow:R}\r\n" + - "\r\n", - new LoopbackServer.Options { ResponseStreamWrapper = GetStream })); + "Content-Length: 0\r\n" + + "\r\n")); using (HttpResponseMessage response = await getResponseTask) { Assert.Equal(expectedStatusCode, (int)response.StatusCode); Assert.Equal(expectedReason, response.ReasonPhrase); } } - }); + }, new LoopbackServer.Options { StreamWrapper = GetStream }); + } + + public static IEnumerable GetInvalidStatusLine() + { + yield return "HTTP/1.1 2345"; + yield return "HTTP/A.1 200 OK"; + yield return "HTTP/X.Y.Z 200 OK"; + + // Only pass on .NET Core Windows & SocketsHttpHandler. + if (PlatformDetection.IsNetCore && PlatformDetection.IsWindows) + { + yield return "HTTP/0.1 200 OK"; + yield return "HTTP/3.5 200 OK"; + yield return "HTTP/1.12 200 OK"; + yield return "HTTP/12.1 200 OK"; + yield return "HTTP/1.1 200 O\rK"; + } + + // Skip these test cases on CurlHandler since the behavior is different. + if (PlatformDetection.IsWindows) + { + yield return "HTTP/1.A 200 OK"; + yield return "HTTP/1.1 "; + yield return "HTTP/1.1 !11"; + yield return "HTTP/1.1 a11"; + yield return "HTTP/1.1 abc"; + yield return "HTTP/1.1\t\t"; + yield return "HTTP/1.1\t"; + yield return "HTTP/1.1 "; + } + + // Skip these test cases on UAP since the behavior is different. + if (!PlatformDetection.IsUap) + { + yield return "HTTP/1.1 200OK"; + yield return "HTTP/1.1 20c"; + yield return "HTTP/1.1 23"; + yield return "HTTP/1.1 2bc"; + } + + // Skip these test cases on UAP & CurlHandler since the behavior is different. + if (!PlatformDetection.IsUap && PlatformDetection.IsWindows) + { + yield return "NOTHTTP/1.1"; + yield return "HTTP 1.1 200 OK"; + yield return "ABCD/1.1 200 OK"; + yield return "HTTP/1.1"; + yield return "HTTP\\1.1 200 OK"; + yield return "NOTHTTP/1.1 200 OK"; + } + } + + public static TheoryData InvalidStatusLine = GetInvalidStatusLine().ToTheoryData(); + + [Theory] + [MemberData(nameof(InvalidStatusLine))] + public async Task GetAsync_InvalidStatusLine_ThrowsException(string responseString) + { + await GetAsyncThrowsExceptionHelper(responseString); + } + + [Fact] + public async Task GetAsync_ReasonPhraseHasLF_BehaviorDifference() + { + string responseString = "HTTP/1.1 200 O\n"; + int expectedStatusCode = 200; + string expectedReason = "O"; + + if (IsNetfxHandler) + { + // .NET Framework will throw HttpRequestException. + await GetAsyncThrowsExceptionHelper(responseString); + } + else + { + await GetAsyncSuccessHelper(responseString, expectedStatusCode, expectedReason); + } } [Theory] - [InlineData("HTTP/1.1 2345")] - [InlineData("HTTP/A.1 200 OK")] - [InlineData("HTTP/X.Y.Z 200 OK")] - // TODO #24713: The following pass on Windows on .NET Core but fail on .NET Framework. - //[InlineData("HTTP/0.1 200 OK")] - //[InlineData("HTTP/3.5 200 OK")] - //[InlineData("HTTP/1.12 200 OK")] - //[InlineData("HTTP/12.1 200 OK")] - // TODO #24713: The following pass on Windows on .NET Core but fail on UWP / WinRT. - //[InlineData("HTTP/1.1 200 O\nK")] - //[InlineData("HTTP/1.1 200OK")] - //[InlineData("HTTP/1.1 20c")] - //[InlineData("HTTP/1.1 23")] - //[InlineData("HTTP/1.1 2bc")] - // TODO #24713: The following pass on Windows but fail on CurlHandler on Linux. - //[InlineData("NOTHTTP/1.1")] - //[InlineData("HTTP/1.A 200 OK")] - //[InlineData("HTTP 1.1 200 OK")] - //[InlineData("ABCD/1.1 200 OK")] - //[InlineData("HTTP/1.1")] - //[InlineData("HTTP\\1.1 200 OK")] - //[InlineData("HTTP/1.1 ")] - //[InlineData("HTTP/1.1 !11")] - //[InlineData("HTTP/1.1 a11")] - //[InlineData("HTTP/1.1 abc")] - //[InlineData("HTTP/1.1 200 O\rK")] - //[InlineData("HTTP/1.1\t\t")] - //[InlineData("HTTP/1.1\t")] - //[InlineData("HTTP/1.1 ")] - //[InlineData("NOTHTTP/1.1 200 OK")] - public async Task GetAsync_InvalidStatusLine_ThrowsException(string responseString) + [InlineData("HTTP/1.1\t200 OK")] + [InlineData("HTTP/1.1 200\tOK")] + [InlineData("HTTP/1.1 200\t")] + public async Task GetAsync_InvalidStatusLine_ThrowsExceptionOnSocketsHttpHandler(string responseString) + { + if (UseSocketsHttpHandler || PlatformDetection.IsFullFramework) + { + // SocketsHttpHandler and .NET Framework will throw HttpRequestException. + await GetAsyncThrowsExceptionHelper(responseString); + } + // WinRT, WinHttpHandler, and CurlHandler will succeed. + } + + private async Task GetAsyncThrowsExceptionHelper(string responseString) { await LoopbackServer.CreateServerAsync(async (server, url) => { using (HttpClient client = CreateHttpClient()) { - Task ignoredServerTask = LoopbackServer.ReadRequestAndSendResponseAsync( - server, - responseString + "\r\nContent-Length: 0\r\n\r\n", - new LoopbackServer.Options { ResponseStreamWrapper = GetStream }); + Task ignoredServerTask = server.AcceptConnectionSendCustomResponseAndCloseAsync( + responseString + "\r\nContent-Length: 0\r\n\r\n"); await Assert.ThrowsAsync(() => client.GetAsync(url)); } + }, new LoopbackServer.Options { StreamWrapper = GetStream }); + } + + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] // Does not support LF-only + [Theory] + [InlineData("\r\n")] + [InlineData("\n")] + public async Task GetAsync_ResponseHasNormalLineEndings_Success(string lineEnding) + { + await LoopbackServer.CreateServerAsync(async (server, url) => + { + using (HttpClient client = CreateHttpClient()) + { + Task getResponseTask = client.GetAsync(url); + Task> serverTask = server.AcceptConnectionSendCustomResponseAndCloseAsync( + $"HTTP/1.1 200 OK{lineEnding}Date: {DateTimeOffset.UtcNow:R}{lineEnding}Server: TestServer{lineEnding}Content-Length: 0{lineEnding}{lineEnding}"); + + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + using (HttpResponseMessage response = await getResponseTask) + { + Assert.Equal(200, (int)response.StatusCode); + Assert.Equal("OK", response.ReasonPhrase); + Assert.Equal("TestServer", response.Headers.Server.ToString()); + } + } + }, new LoopbackServer.Options { StreamWrapper = GetStream }); + } + + public static IEnumerable GetAsync_Chunked_VaryingSizeChunks_ReceivedCorrectly_MemberData() + { + foreach (int maxChunkSize in new[] { 1, 10_000 }) + foreach (string lineEnding in new[] { "\n", "\r\n" }) + foreach (bool useCopyToAsync in new[] { false, true }) + yield return new object[] { maxChunkSize, lineEnding, useCopyToAsync }; + } + + [OuterLoop] + [Theory] + [MemberData(nameof(GetAsync_Chunked_VaryingSizeChunks_ReceivedCorrectly_MemberData))] + public async Task GetAsync_Chunked_VaryingSizeChunks_ReceivedCorrectly(int maxChunkSize, string lineEnding, bool useCopyToAsync) + { + if (IsWinHttpHandler) + { + // [ActiveIssue(28423)] + return; + } + + if (!UseSocketsHttpHandler && lineEnding != "\r\n") + { + // Some handlers don't deal well with "\n" alone as the line ending + return; + } + + var rand = new Random(42); + byte[] expectedData = new byte[100_000]; + rand.NextBytes(expectedData); + + await LoopbackServer.CreateClientAndServerAsync(async uri => + { + using (HttpMessageInvoker client = new HttpMessageInvoker(CreateHttpClientHandler())) + using (HttpResponseMessage resp = await client.SendAsync(new HttpRequestMessage(HttpMethod.Get, uri), CancellationToken.None)) + using (Stream respStream = await resp.Content.ReadAsStreamAsync()) + { + var actualData = new MemoryStream(); + + if (useCopyToAsync) + { + await respStream.CopyToAsync(actualData); + } + else + { + byte[] buffer = new byte[4096]; + int bytesRead; + while ((bytesRead = await respStream.ReadAsync(buffer)) > 0) + { + actualData.Write(buffer, 0, bytesRead); + } + } + + Assert.Equal(expectedData, actualData.ToArray()); + } + }, async server => + { + await server.AcceptConnectionAsync(async connection => + { + await connection.ReadRequestHeaderAsync(); + + await connection.Writer.WriteAsync($"HTTP/1.1 200 OK{lineEnding}Transfer-Encoding: chunked{lineEnding}{lineEnding}"); + for (int bytesSent = 0; bytesSent < expectedData.Length;) + { + int bytesRemaining = expectedData.Length - bytesSent; + int bytesToSend = rand.Next(1, Math.Min(bytesRemaining, maxChunkSize + 1)); + await connection.Writer.WriteAsync(bytesToSend.ToString("X") + lineEnding); + await connection.Stream.WriteAsync(new Memory(expectedData, bytesSent, bytesToSend)); + await connection.Writer.WriteAsync(lineEnding); + bytesSent += bytesToSend; + } + await connection.Writer.WriteAsync($"0{lineEnding}"); + await connection.Writer.WriteAsync(lineEnding); + }); }); } } - public class HttpProtocolTests_Dribble : HttpProtocolTests, IDisposable + public abstract class HttpProtocolTests_Dribble : HttpProtocolTests { protected override Stream GetStream(Stream s) => new DribbleStream(s); - - private sealed class DribbleStream : Stream - { - private readonly Stream _wrapped; - - public DribbleStream(Stream wrapped) => _wrapped = wrapped; - - public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - for (int i = 0; i < count; i++) - { - await _wrapped.WriteAsync(buffer, offset + i, 1); - await Task.Yield(); // introduce short delays, enough to send packets individually but so long as to extend test duration significantly - } - } - - public override bool CanRead => false; - public override bool CanSeek => false; - public override bool CanWrite => _wrapped.CanWrite; - public override long Length => throw new NotSupportedException(); - public override long Position { get => throw new NotSupportedException(); set => throw new NotSupportedException(); } - public override void Flush() => _wrapped.Flush(); - public override Task FlushAsync(CancellationToken cancellationToken) => _wrapped.FlushAsync(cancellationToken); - public override int Read(byte[] buffer, int offset, int count) => throw new NotImplementedException(); - public override long Seek(long offset, SeekOrigin origin) => throw new NotImplementedException(); - public override void SetLength(long value) => throw new NotImplementedException(); - public override void Write(byte[] buffer, int offset, int count) => throw new NotImplementedException(); - } + protected override Stream GetStream_ClientDisconnectOk(Stream s) => new DribbleStream(s, true); } } diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpRequestMessageTest.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpRequestMessageTest.cs index bfc4d5042e..3261d0f76a 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpRequestMessageTest.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpRequestMessageTest.cs @@ -14,7 +14,7 @@ namespace System.Net.Http.Functional.Tests { public class HttpRequestMessageTest { - Version _expectedRequestMessageVersion = PlatformDetection.IsUap ? new Version(2,0) : new Version(1, 1); + Version _expectedRequestMessageVersion = !PlatformDetection.IsFullFramework ? new Version(2,0) : new Version(1, 1); [Fact] public void Ctor_Default_CorrectDefaults() diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpRetryProtocolTests.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpRetryProtocolTests.cs new file mode 100644 index 0000000000..860435de5a --- /dev/null +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpRetryProtocolTests.cs @@ -0,0 +1,140 @@ +// 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.Collections.Generic; +using System.IO; +using System.Net.Sockets; +using System.Net.Test.Common; +using System.Text; +using System.Threading.Tasks; +using Xunit; + +namespace System.Net.Http.Functional.Tests +{ + public abstract class HttpRetryProtocolTests : HttpClientTestBase + { + private static readonly string s_simpleContent = "Hello World\r\n"; + + // Retry logic is supported by SocketsHttpHandler, CurlHandler, uap, and netfx. Only WinHttp does not support. + private bool IsRetrySupported => !IsWinHttpHandler; + + [Fact] + [ActiveIssue(26770, TargetFrameworkMonikers.NetFramework)] + public async Task GetAsync_RetryOnConnectionClosed_Success() + { + if (!IsRetrySupported) + { + return; + } + + await LoopbackServer.CreateClientAndServerAsync(async url => + { + using (HttpClient client = CreateHttpClient()) + { + // Send initial request and receive response so connection is established + HttpResponseMessage response1 = await client.GetAsync(url); + Assert.Equal(HttpStatusCode.OK, response1.StatusCode); + Assert.Equal(s_simpleContent, await response1.Content.ReadAsStringAsync()); + + // Send second request. Should reuse same connection. + // The server will close the connection, but HttpClient should retry the request. + HttpResponseMessage response2 = await client.GetAsync(url); + Assert.Equal(HttpStatusCode.OK, response1.StatusCode); + Assert.Equal(s_simpleContent, await response1.Content.ReadAsStringAsync()); + } + }, + async server => + { + // Accept first connection + await server.AcceptConnectionAsync(async connection => + { + // Initial response + await connection.ReadRequestHeaderAndSendResponseAsync(content: s_simpleContent); + + // Second response: Read request headers, then close connection + await connection.ReadRequestHeaderAsync(); + }); + + // Client should reconnect. Accept that connection and send response. + await server.AcceptConnectionSendResponseAndCloseAsync(content: s_simpleContent); + }); + } + + [Fact] + public async Task PostAsyncExpect100Continue_FailsAfterContentSendStarted_Throws() + { + if (IsWinHttpHandler) + { + // WinHttpHandler does not support Expect: 100-continue. + return; + } + + var contentSending = new TaskCompletionSource(); + var connectionClosed = new TaskCompletionSource(); + + await LoopbackServer.CreateClientAndServerAsync(async url => + { + using (HttpClient client = CreateHttpClient()) + { + // Send initial request and receive response so connection is established + HttpResponseMessage response1 = await client.GetAsync(url); + Assert.Equal(HttpStatusCode.OK, response1.StatusCode); + Assert.Equal(s_simpleContent, await response1.Content.ReadAsStringAsync()); + + // Send second request on same connection. When the Expect: 100-continue timeout + // expires, the content will start to be serialized and will signal the server to + // close the connection; then once the connection is closed, the send will be allowed + // to continue and will fail. + var request = new HttpRequestMessage(HttpMethod.Post, url); + request.Headers.ExpectContinue = true; + request.Content = new SynchronizedSendContent(contentSending, connectionClosed.Task); + await Assert.ThrowsAsync(() => client.SendAsync(request)); + } + }, + async server => + { + // Accept connection + await server.AcceptConnectionAsync(async connection => + { + // Shut down the listen socket so no additional connections can happen + server.ListenSocket.Close(); + + // Initial response + await connection.ReadRequestHeaderAndSendResponseAsync(content: s_simpleContent); + + // Second response: Read request headers, then close connection + List lines = await connection.ReadRequestHeaderAsync(); + Assert.Contains("Expect: 100-continue", lines); + await contentSending.Task; + }); + connectionClosed.SetResult(true); + }); + } + + private sealed class SynchronizedSendContent : HttpContent + { + private readonly Task _connectionClosed; + private readonly TaskCompletionSource _sendingContent; + + public SynchronizedSendContent(TaskCompletionSource sendingContent, Task connectionClosed) + { + _connectionClosed = connectionClosed; + _sendingContent = sendingContent; + } + + protected override async Task SerializeToStreamAsync(Stream stream, TransportContext context) + { + _sendingContent.SetResult(true); + await _connectionClosed; + await stream.WriteAsync(Encoding.UTF8.GetBytes(s_simpleContent)); + } + + protected override bool TryComputeLength(out long length) + { + length = s_simpleContent.Length; + return true; + } + } + } +} diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/IdnaProtocolTests.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/IdnaProtocolTests.cs new file mode 100644 index 0000000000..505805316a --- /dev/null +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/IdnaProtocolTests.cs @@ -0,0 +1,133 @@ +// 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.Collections.Generic; +using System.Net.Test.Common; +using System.Threading.Tasks; +using Xunit; + +namespace System.Net.Http.Functional.Tests +{ + public abstract class IdnaProtocolTests : HttpClientTestBase + { + protected abstract bool SupportsIdna { get; } + + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "UAP does not support custom proxies.")] + [Theory] + [MemberData(nameof(InternationalHostNames))] + public async Task InternationalUrl_UsesIdnaEncoding_Success(string hostname) + { + if (!SupportsIdna) + { + return; + } + + Uri uri = new Uri($"http://{hostname}/"); + + await LoopbackServer.CreateServerAsync(async (server, serverUrl) => + { + // We don't actually want to do DNS lookup on the IDNA host name in the URL. + // So instead, configure the loopback server as a proxy so we will send to it. + HttpClientHandler handler = CreateHttpClientHandler(); + handler.UseProxy = true; + handler.Proxy = new WebProxy(serverUrl.ToString()); + + using (HttpClient client = new HttpClient(handler)) + { + Task getResponseTask = client.GetAsync(uri); + Task> serverTask = server.AcceptConnectionSendResponseAndCloseAsync(); + + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + List requestLines = await serverTask; + + // Note since we're using a proxy, host name is included in the request line + Assert.Equal($"GET http://{uri.IdnHost}/ HTTP/1.1", requestLines[0]); + Assert.Contains($"Host: {uri.IdnHost}", requestLines); + } + }); + } + + [ActiveIssue(26355)] // We aren't doing IDNA encoding properly + [Theory] + [MemberData(nameof(InternationalHostNames))] + public async Task InternationalRequestHeaderValues_UsesIdnaEncoding_Success(string hostname) + { + if (!SupportsIdna) + { + return; + } + + Uri uri = new Uri($"http://{hostname}/"); + + await LoopbackServer.CreateServerAsync(async (server, serverUrl) => + { + using (HttpClient client = new HttpClient(CreateHttpClientHandler())) + { + var request = new HttpRequestMessage(HttpMethod.Get, serverUrl); + request.Headers.Host = hostname; + request.Headers.Referrer = uri; + Task getResponseTask = client.SendAsync(request); + Task> serverTask = server.AcceptConnectionSendResponseAndCloseAsync(); + + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + List requestLines = await serverTask; + + Assert.Contains($"Host: {uri.IdnHost}", requestLines); + Assert.Contains($"Referer: http://{uri.IdnHost}/", requestLines); + } + }); + } + + [ActiveIssue(26355)] // We aren't doing IDNA decoding properly + [Theory] + [MemberData(nameof(InternationalHostNames))] + public async Task InternationalResponseHeaderValues_UsesIdnaDecoding_Success(string hostname) + { + if (!SupportsIdna) + { + return; + } + + Uri uri = new Uri($"http://{hostname}/"); + + await LoopbackServer.CreateServerAsync(async (server, serverUrl) => + { + HttpClientHandler handler = CreateHttpClientHandler(); + handler.AllowAutoRedirect = false; + + using (HttpClient client = new HttpClient(handler)) + { + Task getResponseTask = client.GetAsync(serverUrl); + Task> serverTask = server.AcceptConnectionSendResponseAndCloseAsync( + HttpStatusCode.Found, "Location: http://{uri.IdnHost}/\r\n"); + + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + HttpResponseMessage response = await getResponseTask; + + Assert.Equal(uri, response.Headers.Location); + } + }); + } + + private static IEnumerable InternationalHostNames() + { + // Latin-1 supplement + yield return new object[] { "\u00E1.com" }; + yield return new object[] { "\u00E1b\u00E7d\u00EB.com" }; + yield return new object[] { "b\u00E7.com" }; + yield return new object[] { "b\u00E7d.com" }; + + // Hebrew + yield return new object[] { "\u05E1.com" }; + yield return new object[] { "\u05D1\u05F1.com" }; + + // Katakana + yield return new object[] { "\u30A5.com" }; + yield return new object[] { "\u30B6\u30C7\u30D8.com" }; + } + } +} diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/LoopbackGetRequestHttpProxy.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/LoopbackGetRequestHttpProxy.cs index 10f99e938c..3ddee257df 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/LoopbackGetRequestHttpProxy.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/LoopbackGetRequestHttpProxy.cs @@ -32,14 +32,16 @@ namespace System.Net.Http.Functional.Tests return StartAsync(listener, requireAuth, expectCreds); } - private static async Task StartAsync(TcpListener listener, bool requireAuth, bool expectCreds) + public static async Task StartAsync(TcpListener listener, bool requireAuth, bool expectCreds) { ProxyResult result = new ProxyResult(); var headers = new Dictionary(); Socket clientSocket = null; - Stream clientStream = null; + NetworkStream clientStream = null; StreamReader clientReader = null; string url = null; + string method = null; + try { // Get and parse the incoming request. @@ -55,7 +57,9 @@ namespace System.Net.Http.Functional.Tests clientReader = new StreamReader(clientStream, Encoding.ASCII); headers.Clear(); - url = clientReader.ReadLine().Split(' ')[1]; + var requestTokens = clientReader.ReadLine().Split(' '); + method = requestTokens[0]; + url = requestTokens[1]; string line; while (!string.IsNullOrEmpty(line = clientReader.ReadLine())) { @@ -93,6 +97,44 @@ namespace System.Net.Http.Functional.Tests result.AuthenticationHeaderValue = Encoding.UTF8.GetString(Convert.FromBase64String(authValue.Substring("Basic ".Length))); } + if (method.Equals("CONNECT")) + { + String[] tokens = url.Split(':'); + Socket serverSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + await serverSocket.ConnectAsync(tokens[0], Int32.Parse(tokens[1])).ConfigureAwait(false); + NetworkStream serverStream = new NetworkStream(serverSocket); + + // Send response to client and relay traffic in both directions. + await clientSocket.SendAsync(new ArraySegment(Encoding.ASCII.GetBytes("HTTP/1.1 200 OK\r\n\r\n")), + SocketFlags.None).ConfigureAwait(false); + + Task clientCopyTask = Task.Run(async delegate + { + byte[] buffer = new byte[8000]; + int bytesRead; + while ((bytesRead = await clientStream.ReadAsync(buffer)) > 0) + { + await serverStream.WriteAsync(buffer, 0, bytesRead); + } + serverStream.Flush(); + serverSocket.Shutdown(SocketShutdown.Send); + }); + Task serverCopyTask = Task.Run(async delegate + { + byte[] buffer = new byte[8000]; + int bytesRead; + while ((bytesRead = await serverStream.ReadAsync(buffer)) > 0) + { + await clientStream.WriteAsync(buffer, 0, bytesRead); + } + clientStream.Flush(); + clientSocket.Shutdown(SocketShutdown.Send); + }); + // Relay bidirectional data including close. + await Task.WhenAll(clientCopyTask, serverCopyTask).ConfigureAwait(false); + return result; + } + // Forward the request to the server. var request = new HttpRequestMessage(HttpMethod.Get, url); foreach (var header in headers) request.Headers.Add(header.Key, header.Value); diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/ManagedHandlerTest.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/ManagedHandlerTest.cs deleted file mode 100644 index 3658fb78ff..0000000000 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/ManagedHandlerTest.cs +++ /dev/null @@ -1,384 +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.Collections.Concurrent; -using System.IO; -using System.Net.Sockets; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using Xunit; -using Xunit.Abstractions; - -namespace System.Net.Http.Functional.Tests -{ - public sealed class ManagedHandler_HttpProtocolTests : HttpProtocolTests - { - protected override bool UseManagedHandler => true; - } - - public sealed class ManagedHandler_HttpProtocolTests_Dribble : HttpProtocolTests_Dribble - { - protected override bool UseManagedHandler => true; - } - - public sealed class ManagedHandler_HttpClientTest : HttpClientTest - { - protected override bool UseManagedHandler => true; - } - - public sealed class ManagedHandler_DiagnosticsTest : DiagnosticsTest - { - protected override bool UseManagedHandler => true; - } - - public sealed class ManagedHandler_HttpClientEKUTest : HttpClientEKUTest - { - protected override bool UseManagedHandler => true; - } - - public sealed class ManagedHandler_HttpClientHandler_DangerousAcceptAllCertificatesValidator_Test : HttpClientHandler_DangerousAcceptAllCertificatesValidator_Test - { - protected override bool UseManagedHandler => true; - } - - public sealed class ManagedHandler_HttpClientHandler_ClientCertificates_Test : HttpClientHandler_ClientCertificates_Test - { - public ManagedHandler_HttpClientHandler_ClientCertificates_Test(ITestOutputHelper output) : base(output) { } - protected override bool UseManagedHandler => true; - } - - public sealed class ManagedHandler_HttpClientHandler_DefaultProxyCredentials_Test : HttpClientHandler_DefaultProxyCredentials_Test - { - protected override bool UseManagedHandler => true; - } - - public sealed class ManagedHandler_HttpClientHandler_MaxConnectionsPerServer_Test : HttpClientHandler_MaxConnectionsPerServer_Test - { - protected override bool UseManagedHandler => true; - } - - public sealed class ManagedHandler_HttpClientHandler_ServerCertificates_Test : HttpClientHandler_ServerCertificates_Test - { - protected override bool UseManagedHandler => true; - } - - public sealed class ManagedHandler_PostScenarioTest : PostScenarioTest - { - public ManagedHandler_PostScenarioTest(ITestOutputHelper output) : base(output) { } - protected override bool UseManagedHandler => true; - } - - public sealed class ManagedHandler_ResponseStreamTest : ResponseStreamTest - { - public ManagedHandler_ResponseStreamTest(ITestOutputHelper output) : base(output) { } - protected override bool UseManagedHandler => true; - } - - public sealed class ManagedHandler_HttpClientHandler_SslProtocols_Test : HttpClientHandler_SslProtocols_Test - { - protected override bool UseManagedHandler => true; - } - - public sealed class ManagedHandler_SchSendAuxRecordHttpTest : SchSendAuxRecordHttpTest - { - public ManagedHandler_SchSendAuxRecordHttpTest(ITestOutputHelper output) : base(output) { } - protected override bool UseManagedHandler => true; - } - - public sealed class ManagedHandler_HttpClientMiniStress : HttpClientMiniStress - { - protected override bool UseManagedHandler => true; - } - - public sealed class ManagedHandler_HttpClientHandlerTest : HttpClientHandlerTest - { - public ManagedHandler_HttpClientHandlerTest(ITestOutputHelper output) : base(output) { } - protected override bool UseManagedHandler => true; - } - - public sealed class ManagedHandler_DefaultCredentialsTest : DefaultCredentialsTest - { - public ManagedHandler_DefaultCredentialsTest(ITestOutputHelper output) : base(output) { } - protected override bool UseManagedHandler => true; - } - - // TODO #23141: Socket's don't support canceling individual operations, so ReadStream on NetworkStream - // isn't cancelable once the operation has started. We either need to wrap the operation with one that's - // "cancelable", meaning that the underlying operation will still be running even though we've returned "canceled", - // or we need to just recognize that cancellation in such situations can be left up to the caller to do the - // same thing if it's really important. - //public sealed class ManagedHandler_CancellationTest : CancellationTest - //{ - // public ManagedHandler_CancellationTest(ITestOutputHelper output) : base(output) { } - // protected override bool UseManagedHandler => true; - //} - - // TODO #23142: The managed handler doesn't currently track how much data was written for the response headers. - //public sealed class ManagedHandler_HttpClientHandler_MaxResponseHeadersLength_Test : HttpClientHandler_MaxResponseHeadersLength_Test - //{ - // protected override bool UseManagedHandler => true; - //} - - public sealed class ManagedHandler_HttpClientHandler_DuplexCommunication_Test : HttpClientTestBase - { - protected override bool UseManagedHandler => true; - - [Fact] - public async Task SendBytesBackAndForthBetweenClientAndServer_Success() - { - using (HttpClient client = CreateHttpClient()) - using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) - { - listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); - listener.Listen(1); - var ep = (IPEndPoint)listener.LocalEndPoint; - - var clientToServerStream = new ProducerConsumerStream(); - clientToServerStream.WriteByte(0); - - var reqMsg = new HttpRequestMessage - { - RequestUri = new Uri($"http://{ep.Address}:{ep.Port}/"), - Content = new StreamContent(clientToServerStream), - }; - Task req = client.SendAsync(reqMsg, HttpCompletionOption.ResponseHeadersRead); - - using (Socket server = await listener.AcceptAsync()) - using (var serverStream = new NetworkStream(server, ownsSocket: false)) - { - // Skip request headers. - while (true) - { - if (serverStream.ReadByte() == '\r') - { - serverStream.ReadByte(); - break; - } - while (serverStream.ReadByte() != '\r') { } - serverStream.ReadByte(); - } - - // Send response headers. - await server.SendAsync( - new ArraySegment(Encoding.ASCII.GetBytes($"HTTP/1.1 200 OK\r\nConnection: close\r\nDate: {DateTimeOffset.UtcNow:R}\r\n\r\n")), - SocketFlags.None); - - HttpResponseMessage resp = await req; - Stream serverToClientStream = await resp.Content.ReadAsStreamAsync(); - - // Communication should now be open between the client and server. - // Ping pong bytes back and forth. - for (byte i = 0; i < 100; i++) - { - // Send a byte from the client to the server. The server will receive - // the byte as a chunk. - if (i > 0) clientToServerStream.WriteByte(i); // 0 was already seeded when the stream was created above - Assert.Equal('1', serverStream.ReadByte()); - Assert.Equal('\r', serverStream.ReadByte()); - Assert.Equal('\n', serverStream.ReadByte()); - Assert.Equal(i, serverStream.ReadByte()); - Assert.Equal('\r', serverStream.ReadByte()); - Assert.Equal('\n', serverStream.ReadByte()); - - // Send a byte from the server to the client. The client will receive - // the byte on its own, with HttpClient stripping away the chunk encoding. - serverStream.WriteByte(i); - Assert.Equal(i, serverToClientStream.ReadByte()); - } - - clientToServerStream.DoneWriting(); - server.Shutdown(SocketShutdown.Send); - Assert.Equal(-1, clientToServerStream.ReadByte()); - } - } - } - - private sealed class ProducerConsumerStream : Stream - { - private readonly BlockingCollection _buffers = new BlockingCollection(); - private ArraySegment _remaining; - - public override void Write(byte[] buffer, int offset, int count) - { - if (count > 0) - { - byte[] tmp = new byte[count]; - Buffer.BlockCopy(buffer, offset, tmp, 0, count); - _buffers.Add(tmp); - } - } - - public override int Read(byte[] buffer, int offset, int count) - { - if (count > 0) - { - if (_remaining.Count == 0) - { - if (!_buffers.TryTake(out byte[] tmp, Timeout.Infinite)) - { - return 0; - } - _remaining = new ArraySegment(tmp, 0, tmp.Length); - } - - if (_remaining.Count <= count) - { - count = _remaining.Count; - Buffer.BlockCopy(_remaining.Array, _remaining.Offset, buffer, offset, count); - _remaining = default(ArraySegment); - } - else - { - Buffer.BlockCopy(_remaining.Array, _remaining.Offset, buffer, offset, count); - _remaining = new ArraySegment(_remaining.Array, _remaining.Offset + count, _remaining.Count - count); - } - } - - return count; - } - - public void DoneWriting() => _buffers.CompleteAdding(); - - public override bool CanRead => true; - public override bool CanSeek => false; - public override bool CanWrite => true; - public override long Length => throw new NotImplementedException(); - public override long Position { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } - public override void Flush() { } - public override long Seek(long offset, SeekOrigin origin) => throw new NotImplementedException(); - public override void SetLength(long value) => throw new NotImplementedException(); - } - - } - - public sealed class ManagedHandler_HttpClientHandler_ConnectionPooling_Test : HttpClientTestBase - { - protected override bool UseManagedHandler => true; - - // TODO: Currently the subsequent tests sometimes fail/hang with WinHttpHandler / CurlHandler. - // In theory they should pass with any handler that does appropriate connection pooling. - // We should understand why they sometimes fail there and ideally move them to be - // used by all handlers this test project tests. - - [Fact] - public async Task MultipleIterativeRequests_SameConnectionReused() - { - using (HttpClient client = CreateHttpClient()) - using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) - { - listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); - listener.Listen(1); - var ep = (IPEndPoint)listener.LocalEndPoint; - var uri = new Uri($"http://{ep.Address}:{ep.Port}/"); - - string responseBody = - "HTTP/1.1 200 OK\r\n" + - $"Date: {DateTimeOffset.UtcNow:R}\r\n" + - "Content-Length: 0\r\n" + - "\r\n"; - - Task firstRequest = client.GetStringAsync(uri); - using (Socket server = await listener.AcceptAsync()) - using (var serverStream = new NetworkStream(server, ownsSocket: false)) - using (var serverReader = new StreamReader(serverStream)) - { - while (!string.IsNullOrWhiteSpace(await serverReader.ReadLineAsync())); - await server.SendAsync(new ArraySegment(Encoding.ASCII.GetBytes(responseBody)), SocketFlags.None); - await firstRequest; - - Task secondAccept = listener.AcceptAsync(); // shouldn't complete - - Task additionalRequest = client.GetStringAsync(uri); - while (!string.IsNullOrWhiteSpace(await serverReader.ReadLineAsync())); - await server.SendAsync(new ArraySegment(Encoding.ASCII.GetBytes(responseBody)), SocketFlags.None); - await additionalRequest; - - Assert.False(secondAccept.IsCompleted, $"Second accept should never complete"); - } - } - } - - [OuterLoop("Incurs a delay")] - [Fact] - public async Task ServerDisconnectsAfterInitialRequest_SubsequentRequestUsesDifferentConnection() - { - using (HttpClient client = CreateHttpClient()) - using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) - { - listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); - listener.Listen(100); - var ep = (IPEndPoint)listener.LocalEndPoint; - var uri = new Uri($"http://{ep.Address}:{ep.Port}/"); - - string responseBody = - "HTTP/1.1 200 OK\r\n" + - $"Date: {DateTimeOffset.UtcNow:R}\r\n" + - "Content-Length: 0\r\n" + - "\r\n"; - - // Make multiple requests iteratively. - for (int i = 0; i < 2; i++) - { - Task request = client.GetStringAsync(uri); - using (Socket server = await listener.AcceptAsync()) - using (var serverStream = new NetworkStream(server, ownsSocket: false)) - using (var serverReader = new StreamReader(serverStream)) - { - while (!string.IsNullOrWhiteSpace(await serverReader.ReadLineAsync())); - await server.SendAsync(new ArraySegment(Encoding.ASCII.GetBytes(responseBody)), SocketFlags.None); - await request; - - server.Shutdown(SocketShutdown.Both); - if (i == 0) - { - await Task.Delay(2000); // give client time to see the closing before next connect - } - } - } - } - } - - [Fact] - public async Task ServerSendsConnectionClose_SubsequentRequestUsesDifferentConnection() - { - using (HttpClient client = CreateHttpClient()) - using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) - { - listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); - listener.Listen(100); - var ep = (IPEndPoint)listener.LocalEndPoint; - var uri = new Uri($"http://{ep.Address}:{ep.Port}/"); - - string responseBody = - "HTTP/1.1 200 OK\r\n" + - $"Date: {DateTimeOffset.UtcNow:R}\r\n" + - "Content-Length: 0\r\n" + - "Connection: close\r\n" + - "\r\n"; - - // Make multiple requests iteratively. - Task request1 = client.GetStringAsync(uri); - using (Socket server1 = await listener.AcceptAsync()) - using (var serverStream1 = new NetworkStream(server1, ownsSocket: false)) - using (var serverReader1 = new StreamReader(serverStream1)) - { - while (!string.IsNullOrWhiteSpace(await serverReader1.ReadLineAsync())); - await server1.SendAsync(new ArraySegment(Encoding.ASCII.GetBytes(responseBody)), SocketFlags.None); - await request1; - - Task request2 = client.GetStringAsync(uri); - using (Socket server2 = await listener.AcceptAsync()) - using (var serverStream2 = new NetworkStream(server2, ownsSocket: false)) - using (var serverReader2 = new StreamReader(serverStream2)) - { - while (!string.IsNullOrWhiteSpace(await serverReader2.ReadLineAsync())); - await server2.SendAsync(new ArraySegment(Encoding.ASCII.GetBytes(responseBody)), SocketFlags.None); - await request2; - } - } - } - } - } -} diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/PlatformHandlerTest.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/PlatformHandlerTest.cs new file mode 100644 index 0000000000..70dfcfae57 --- /dev/null +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/PlatformHandlerTest.cs @@ -0,0 +1,159 @@ +// 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.Collections.Concurrent; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Net; +using System.Net.Security; +using System.Net.Sockets; +using System.Net.Test.Common; +using System.Reflection; +using System.Security.Authentication; +using System.Security.Cryptography.X509Certificates; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using Xunit; +using Xunit.Abstractions; + +namespace System.Net.Http.Functional.Tests +{ + public sealed class PlatformHandler_HttpProtocolTests : HttpProtocolTests + { + protected override bool UseSocketsHttpHandler => false; + } + + public sealed class PlatformHandler_HttpProtocolTests_Dribble : HttpProtocolTests_Dribble + { + protected override bool UseSocketsHttpHandler => false; + } + + public sealed class PlatformHandler_HttpClientTest : HttpClientTest + { + protected override bool UseSocketsHttpHandler => false; + } + + public sealed class PlatformHandler_DiagnosticsTest : DiagnosticsTest + { + protected override bool UseSocketsHttpHandler => false; + } + + public sealed class PlatformHandler_HttpClient_SelectedSites_Test : HttpClient_SelectedSites_Test + { + protected override bool UseSocketsHttpHandler => false; + } + + public sealed class PlatformHandler_HttpClientEKUTest : HttpClientEKUTest + { + protected override bool UseSocketsHttpHandler => false; + } + +#if netcoreapp + public sealed class PlatformHandler_HttpClientHandler_DangerousAcceptAllCertificatesValidator_Test : HttpClientHandler_DangerousAcceptAllCertificatesValidator_Test + { + protected override bool UseSocketsHttpHandler => false; + } +#endif + + public sealed class PlatformHandler_HttpClientHandler_ClientCertificates_Test : HttpClientHandler_ClientCertificates_Test + { + public PlatformHandler_HttpClientHandler_ClientCertificates_Test(ITestOutputHelper output) : base(output) { } + protected override bool UseSocketsHttpHandler => false; + } + + public sealed class PlatformHandler_HttpClientHandler_DefaultProxyCredentials_Test : HttpClientHandler_DefaultProxyCredentials_Test + { + protected override bool UseSocketsHttpHandler => false; + } + + public sealed class PlatformHandler_HttpClientHandler_MaxConnectionsPerServer_Test : HttpClientHandler_MaxConnectionsPerServer_Test + { + protected override bool UseSocketsHttpHandler => false; + } + + public sealed class PlatformHandler_HttpClientHandler_ServerCertificates_Test : HttpClientHandler_ServerCertificates_Test + { + protected override bool UseSocketsHttpHandler => false; + } + + public sealed class PlatformHandler_PostScenarioTest : PostScenarioTest + { + public PlatformHandler_PostScenarioTest(ITestOutputHelper output) : base(output) { } + protected override bool UseSocketsHttpHandler => false; + } + + public sealed class PlatformHandler_ResponseStreamTest : ResponseStreamTest + { + public PlatformHandler_ResponseStreamTest(ITestOutputHelper output) : base(output) { } + protected override bool UseSocketsHttpHandler => false; + } + + public sealed class PlatformHandler_HttpClientHandler_SslProtocols_Test : HttpClientHandler_SslProtocols_Test + { + protected override bool UseSocketsHttpHandler => false; + } + + public sealed class PlatformHandler_SchSendAuxRecordHttpTest : SchSendAuxRecordHttpTest + { + public PlatformHandler_SchSendAuxRecordHttpTest(ITestOutputHelper output) : base(output) { } + protected override bool UseSocketsHttpHandler => false; + } + + public sealed class PlatformHandler_HttpClientMiniStress : HttpClientMiniStress + { + protected override bool UseSocketsHttpHandler => false; + } + + public sealed class PlatformHandler_HttpClientHandlerTest : HttpClientHandlerTest + { + public PlatformHandler_HttpClientHandlerTest(ITestOutputHelper output) : base(output) { } + protected override bool UseSocketsHttpHandler => false; + } + + public sealed class PlatformHandler_DefaultCredentialsTest : DefaultCredentialsTest + { + public PlatformHandler_DefaultCredentialsTest(ITestOutputHelper output) : base(output) { } + protected override bool UseSocketsHttpHandler => false; + } + + public sealed class PlatformHandler_IdnaProtocolTests : IdnaProtocolTests + { + protected override bool UseSocketsHttpHandler => false; + // WinHttp on Win7 does not support IDNA + protected override bool SupportsIdna => !PlatformDetection.IsWindows7 && !PlatformDetection.IsFullFramework; + } + + public sealed class PlatformHandler_HttpRetryProtocolTests : HttpRetryProtocolTests + { + protected override bool UseSocketsHttpHandler => false; + } + + public sealed class PlatformHandler_HttpCookieProtocolTests : HttpCookieProtocolTests + { + protected override bool UseSocketsHttpHandler => false; + } + + public sealed class PlatformHandler_HttpClientHandler_MaxResponseHeadersLength_Test : HttpClientHandler_MaxResponseHeadersLength_Test + { + protected override bool UseSocketsHttpHandler => false; + } + + public sealed class PlatformHandler_HttpClientHandler_ResponseDrain_Test : HttpClientHandler_ResponseDrain_Test + { + protected override bool UseSocketsHttpHandler => false; + } + + public sealed class PlatformHandler_HttpClientHandler_Cancellation_Test : HttpClientHandler_Cancellation_Test + { + protected override bool UseSocketsHttpHandler => false; + } + + public sealed class PlatformHandler_HttpClientHandler_Authentication_Test : HttpClientHandler_Authentication_Test + { + protected override bool UseSocketsHttpHandler => false; + } +} diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/PostScenarioTest.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/PostScenarioTest.cs index 5c5ee93fe8..ca5d55f1da 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/PostScenarioTest.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/PostScenarioTest.cs @@ -14,7 +14,7 @@ namespace System.Net.Http.Functional.Tests // Note: Disposing the HttpClient object automatically disposes the handler within. So, it is not necessary // to separately Dispose (or have a 'using' statement) for the handler. [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "dotnet/corefx #20010")] - public class PostScenarioTest : HttpClientTestBase + public abstract class PostScenarioTest : HttpClientTestBase { private const string ExpectedContent = "Test contest"; private const string UserName = "user1"; @@ -160,9 +160,14 @@ namespace System.Net.Http.Functional.Tests [OuterLoop] // TODO: Issue #11345 [Theory, MemberData(nameof(BasicAuthEchoServers))] - [ActiveIssue(9228, TestPlatforms.Windows)] public async Task PostNonRewindableContentUsingAuth_PreAuthenticate_Success(Uri serverUri) { + if (IsWinHttpHandler) + { + // Issue #9228 + return; + } + HttpContent content = CustomContent.Create(ExpectedContent, false); var credential = new NetworkCredential(UserName, Password); await PostUsingAuthHelper(serverUri, ExpectedContent, content, credential, preAuthenticate: true); @@ -191,9 +196,17 @@ namespace System.Net.Http.Functional.Tests { using (HttpClient client = CreateHttpClient()) { - if (!useContentLengthUpload && requestContent != null) + if (requestContent != null) { - requestContent.Headers.ContentLength = null; + if (useContentLengthUpload) + { + // Ensure that Content-Length is populated (see issue #27245) + requestContent.Headers.ContentLength = requestContent.Headers.ContentLength; + } + else + { + requestContent.Headers.ContentLength = null; + } } if (useChunkedEncodingUpload) diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/PostScenarioUWPTest.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/PostScenarioUWPTest.cs index 1c58ff83eb..f484e170cd 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/PostScenarioUWPTest.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/PostScenarioUWPTest.cs @@ -15,7 +15,7 @@ namespace System.Net.Http.Functional.Tests { using Configuration = System.Net.Test.Common.Configuration; - public class PostScenarioUWPTest : HttpClientTestBase + public abstract class PostScenarioUWPTest : HttpClientTestBase { private readonly ITestOutputHelper _output; @@ -27,7 +27,7 @@ namespace System.Net.Http.Functional.Tests [Fact] public void Authentication_UseStreamContent_Throws() { - RemoteInvoke(async useManagedHandlerString => + RemoteInvoke(async useSocketsHttpHandlerString => { // This test validates the current limitation of CoreFx's NetFxToWinRtStreamAdapter // which throws exceptions when trying to rewind a .NET Stream when it needs to be @@ -35,7 +35,7 @@ namespace System.Net.Http.Functional.Tests string username = "testuser"; string password = "password"; Uri uri = Configuration.Http.BasicAuthUriForCreds(secure: false, userName: username, password: password); - HttpClientHandler handler = CreateHttpClientHandler(useManagedHandlerString); + HttpClientHandler handler = CreateHttpClientHandler(useSocketsHttpHandlerString); handler.Credentials = new NetworkCredential(username, password); using (var client = new HttpClient(handler)) @@ -48,18 +48,18 @@ namespace System.Net.Http.Functional.Tests } return SuccessExitCode; - }, UseManagedHandler.ToString()).Dispose(); + }, UseSocketsHttpHandler.ToString()).Dispose(); } [Fact] public void Authentication_UseMultiInterfaceNonRewindableStreamContent_Throws() { - RemoteInvoke(async useManagedHandlerString => + RemoteInvoke(async useSocketsHttpHandlerString => { string username = "testuser"; string password = "password"; Uri uri = Configuration.Http.BasicAuthUriForCreds(secure: false, userName: username, password: password); - HttpClientHandler handler = CreateHttpClientHandler(useManagedHandlerString); + HttpClientHandler handler = CreateHttpClientHandler(useSocketsHttpHandlerString); handler.Credentials = new NetworkCredential(username, password); using (var client = new HttpClient(handler)) @@ -72,18 +72,18 @@ namespace System.Net.Http.Functional.Tests } return SuccessExitCode; - }, UseManagedHandler.ToString()).Dispose(); + }, UseSocketsHttpHandler.ToString()).Dispose(); } [Fact] public void Authentication_UseMultiInterfaceStreamContent_Success() { - RemoteInvoke(async useManagedHandlerString => + RemoteInvoke(async useSocketsHttpHandlerString => { string username = "testuser"; string password = "password"; Uri uri = Configuration.Http.BasicAuthUriForCreds(secure: false, userName: username, password: password); - HttpClientHandler handler = CreateHttpClientHandler(useManagedHandlerString); + HttpClientHandler handler = CreateHttpClientHandler(useSocketsHttpHandlerString); handler.Credentials = new NetworkCredential(username, password); using (var client = new HttpClient(handler)) @@ -100,18 +100,18 @@ namespace System.Net.Http.Functional.Tests } return SuccessExitCode; - }, UseManagedHandler.ToString()).Dispose(); + }, UseSocketsHttpHandler.ToString()).Dispose(); } [Fact] public void Authentication_UseMemoryStreamVisibleBufferContent_Success() { - RemoteInvoke(async useManagedHandlerString => + RemoteInvoke(async useSocketsHttpHandlerString => { string username = "testuser"; string password = "password"; Uri uri = Configuration.Http.BasicAuthUriForCreds(secure: false, userName: username, password: password); - HttpClientHandler handler = CreateHttpClientHandler(useManagedHandlerString); + HttpClientHandler handler = CreateHttpClientHandler(useSocketsHttpHandlerString); handler.Credentials = new NetworkCredential(username, password); using (var client = new HttpClient(handler)) @@ -128,18 +128,18 @@ namespace System.Net.Http.Functional.Tests } return SuccessExitCode; - }, UseManagedHandler.ToString()).Dispose(); + }, UseSocketsHttpHandler.ToString()).Dispose(); } [Fact] public void Authentication_UseMemoryStreamNotVisibleBufferContent_Success() { - RemoteInvoke(async useManagedHandlerString => + RemoteInvoke(async useSocketsHttpHandlerString => { string username = "testuser"; string password = "password"; Uri uri = Configuration.Http.BasicAuthUriForCreds(secure: false, userName: username, password: password); - HttpClientHandler handler = CreateHttpClientHandler(useManagedHandlerString); + HttpClientHandler handler = CreateHttpClientHandler(useSocketsHttpHandlerString); handler.Credentials = new NetworkCredential(username, password); using (var client = new HttpClient(handler)) @@ -156,7 +156,7 @@ namespace System.Net.Http.Functional.Tests } return SuccessExitCode; - }, UseManagedHandler.ToString()).Dispose(); + }, UseSocketsHttpHandler.ToString()).Dispose(); } } } diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/ReadOnlyMemoryContentTest.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/ReadOnlyMemoryContentTest.cs index 98bb3426b5..b63580d76f 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/ReadOnlyMemoryContentTest.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/ReadOnlyMemoryContentTest.cs @@ -35,12 +35,10 @@ namespace System.Net.Http.Functional.Tests public void ContentLength_LengthMatchesArrayLength(int contentLength, bool useArray) { Memory memory; - OwnedMemory ownedMemory; - ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out ownedMemory); - - Assert.Equal(contentLength, content.Headers.ContentLength); - - ownedMemory?.Dispose(); + using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out IMemoryOwner memoryOwner)) + { + Assert.Equal(contentLength, content.Headers.ContentLength); + } } [Theory] @@ -49,32 +47,32 @@ namespace System.Net.Http.Functional.Tests { const int ContentLength = 42; Memory memory; - OwnedMemory ownedMemory; - ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out ownedMemory); - using (Stream stream = await content.ReadAsStreamAsync()) + using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out IMemoryOwner memoryOwner)) { - // property values - Assert.Equal(ContentLength, stream.Length); - Assert.Equal(0, stream.Position); - Assert.True(stream.CanRead); - Assert.True(stream.CanSeek); - Assert.False(stream.CanWrite); + using (Stream stream = await content.ReadAsStreamAsync()) + { - // not supported - Assert.Throws(() => stream.SetLength(12345)); - Assert.Throws(() => stream.WriteByte(0)); - Assert.Throws(() => stream.Write(new byte[1], 0, 1)); - Assert.Throws(() => stream.Write(new ReadOnlySpan(new byte[1]))); - await Assert.ThrowsAsync(() => stream.WriteAsync(new byte[1], 0, 1)); - await Assert.ThrowsAsync(() => stream.WriteAsync(new ReadOnlyMemory(new byte[1]))); + // property values + Assert.Equal(ContentLength, stream.Length); + Assert.Equal(0, stream.Position); + Assert.True(stream.CanRead); + Assert.True(stream.CanSeek); + Assert.False(stream.CanWrite); - // nops - stream.Flush(); - await stream.FlushAsync(); + // not supported + Assert.Throws(() => stream.SetLength(12345)); + Assert.Throws(() => stream.WriteByte(0)); + Assert.Throws(() => stream.Write(new byte[1], 0, 1)); + Assert.Throws(() => stream.Write(new ReadOnlySpan(new byte[1]))); + await Assert.ThrowsAsync(async () => await stream.WriteAsync(new byte[1], 0, 1)); + await Assert.ThrowsAsync(async () => await stream.WriteAsync(new ReadOnlyMemory(new byte[1]))); + + // nops + stream.Flush(); + await stream.FlushAsync(); + } } - - ownedMemory?.Dispose(); } [Theory] @@ -83,62 +81,61 @@ namespace System.Net.Http.Functional.Tests { const int ContentLength = 42; Memory memory; - OwnedMemory ownedMemory; - ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out ownedMemory); - using (Stream s = await content.ReadAsStreamAsync()) + using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out IMemoryOwner memoryOwner)) { - foreach (int pos in new[] { 0, ContentLength / 2, ContentLength - 1 }) + using (Stream s = await content.ReadAsStreamAsync()) { - s.Position = pos; - Assert.Equal(pos, s.Position); - Assert.Equal(memory.Span[pos], s.ReadByte()); - } + foreach (int pos in new[] { 0, ContentLength / 2, ContentLength - 1 }) + { + s.Position = pos; + Assert.Equal(pos, s.Position); + Assert.Equal(memory.Span[pos], s.ReadByte()); + } - foreach (int pos in new[] { 0, ContentLength / 2, ContentLength - 1 }) - { - Assert.Equal(0, s.Seek(0, SeekOrigin.Begin)); + foreach (int pos in new[] { 0, ContentLength / 2, ContentLength - 1 }) + { + Assert.Equal(0, s.Seek(0, SeekOrigin.Begin)); + Assert.Equal(memory.Span[0], s.ReadByte()); + } + + Assert.Equal(ContentLength, s.Seek(0, SeekOrigin.End)); + Assert.Equal(s.Position, s.Length); + Assert.Equal(-1, s.ReadByte()); + + Assert.Equal(0, s.Seek(-ContentLength, SeekOrigin.End)); + Assert.Equal(0, s.Position); Assert.Equal(memory.Span[0], s.ReadByte()); + + s.Position = 0; + Assert.Equal(0, s.Seek(0, SeekOrigin.Current)); + Assert.Equal(0, s.Position); + + Assert.Equal(1, s.Seek(1, SeekOrigin.Current)); + Assert.Equal(1, s.Position); + Assert.Equal(memory.Span[1], s.ReadByte()); + Assert.Equal(2, s.Position); + Assert.Equal(3, s.Seek(1, SeekOrigin.Current)); + Assert.Equal(1, s.Seek(-2, SeekOrigin.Current)); + + Assert.Equal(int.MaxValue, s.Seek(int.MaxValue, SeekOrigin.Begin)); + Assert.Equal(int.MaxValue, s.Position); + Assert.Equal(int.MaxValue, s.Seek(0, SeekOrigin.Current)); + Assert.Equal(int.MaxValue, s.Position); + Assert.Equal(int.MaxValue, s.Seek(int.MaxValue - ContentLength, SeekOrigin.End)); + Assert.Equal(int.MaxValue, s.Position); + Assert.Equal(-1, s.ReadByte()); + Assert.Equal(int.MaxValue, s.Position); + + Assert.Throws("value", () => s.Position = -1); + Assert.Throws(() => s.Seek(-1, SeekOrigin.Begin)); + + AssertExtensions.Throws("value", () => s.Position = (long)int.MaxValue + 1); + AssertExtensions.Throws("offset", () => s.Seek((long)int.MaxValue + 1, SeekOrigin.Begin)); + + Assert.ThrowsAny(() => s.Seek(0, (SeekOrigin)42)); } - - Assert.Equal(ContentLength, s.Seek(0, SeekOrigin.End)); - Assert.Equal(s.Position, s.Length); - Assert.Equal(-1, s.ReadByte()); - - Assert.Equal(0, s.Seek(-ContentLength, SeekOrigin.End)); - Assert.Equal(0, s.Position); - Assert.Equal(memory.Span[0], s.ReadByte()); - - s.Position = 0; - Assert.Equal(0, s.Seek(0, SeekOrigin.Current)); - Assert.Equal(0, s.Position); - - Assert.Equal(1, s.Seek(1, SeekOrigin.Current)); - Assert.Equal(1, s.Position); - Assert.Equal(memory.Span[1], s.ReadByte()); - Assert.Equal(2, s.Position); - Assert.Equal(3, s.Seek(1, SeekOrigin.Current)); - Assert.Equal(1, s.Seek(-2, SeekOrigin.Current)); - - Assert.Equal(int.MaxValue, s.Seek(int.MaxValue, SeekOrigin.Begin)); - Assert.Equal(int.MaxValue, s.Position); - Assert.Equal(int.MaxValue, s.Seek(0, SeekOrigin.Current)); - Assert.Equal(int.MaxValue, s.Position); - Assert.Equal(int.MaxValue, s.Seek(int.MaxValue - ContentLength, SeekOrigin.End)); - Assert.Equal(int.MaxValue, s.Position); - Assert.Equal(-1, s.ReadByte()); - Assert.Equal(int.MaxValue, s.Position); - - Assert.Throws("value", () => s.Position = -1); - Assert.Throws(() => s.Seek(-1, SeekOrigin.Begin)); - - AssertExtensions.Throws("value", () => s.Position = (long)int.MaxValue + 1); - AssertExtensions.Throws("offset", () => s.Seek((long)int.MaxValue + 1, SeekOrigin.Begin)); - - Assert.ThrowsAny(() => s.Seek(0, (SeekOrigin)42)); } - - ownedMemory?.Dispose(); } [Theory] @@ -146,21 +143,20 @@ namespace System.Net.Http.Functional.Tests public async Task ReadAsStreamAsync_ReadByte_MatchesInput(int contentLength, bool useArray) { Memory memory; - OwnedMemory ownedMemory; - ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out ownedMemory); - using (Stream stream = await content.ReadAsStreamAsync()) + using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out IMemoryOwner memoryOwner)) { - for (int i = 0; i < contentLength; i++) + using (Stream stream = await content.ReadAsStreamAsync()) { - Assert.Equal(memory.Span[i], stream.ReadByte()); - Assert.Equal(i + 1, stream.Position); + for (int i = 0; i < contentLength; i++) + { + Assert.Equal(memory.Span[i], stream.ReadByte()); + Assert.Equal(i + 1, stream.Position); + } + Assert.Equal(-1, stream.ReadByte()); + Assert.Equal(stream.Length, stream.Position); } - Assert.Equal(-1, stream.ReadByte()); - Assert.Equal(stream.Length, stream.Position); } - - ownedMemory?.Dispose(); } [Theory] @@ -169,27 +165,26 @@ namespace System.Net.Http.Functional.Tests { const int ContentLength = 42; Memory memory; - OwnedMemory ownedMemory; - ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out ownedMemory); - using (Stream stream = await content.ReadAsStreamAsync()) + using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out IMemoryOwner memoryOwner)) { - AssertExtensions.Throws("buffer", () => stream.Read(null, 0, 0)); - AssertExtensions.Throws("buffer", () => { stream.ReadAsync(null, 0, 0); }); + using (Stream stream = await content.ReadAsStreamAsync()) + { + AssertExtensions.Throws("buffer", () => stream.Read(null, 0, 0)); + AssertExtensions.Throws("buffer", () => { stream.ReadAsync(null, 0, 0); }); - AssertExtensions.Throws("offset", () => stream.Read(new byte[1], -1, 1)); - AssertExtensions.Throws("offset", () => stream.Read(new byte[1], -1, 1)); + AssertExtensions.Throws("offset", () => stream.Read(new byte[1], -1, 1)); + AssertExtensions.Throws("offset", () => stream.Read(new byte[1], -1, 1)); - AssertExtensions.Throws("count", () => stream.Read(new byte[1], 0, -1)); - AssertExtensions.Throws("count", () => stream.Read(new byte[1], 0, -1)); + AssertExtensions.Throws("count", () => stream.Read(new byte[1], 0, -1)); + AssertExtensions.Throws("count", () => stream.Read(new byte[1], 0, -1)); - Assert.ThrowsAny(() => { stream.ReadAsync(new byte[1], 2, 0); }); - Assert.ThrowsAny(() => { stream.ReadAsync(new byte[1], 2, 0); }); - Assert.ThrowsAny(() => { stream.ReadAsync(new byte[1], 0, 2); }); - Assert.ThrowsAny(() => { stream.ReadAsync(new byte[1], 0, 2); }); + Assert.ThrowsAny(() => { stream.ReadAsync(new byte[1], 2, 0); }); + Assert.ThrowsAny(() => { stream.ReadAsync(new byte[1], 2, 0); }); + Assert.ThrowsAny(() => { stream.ReadAsync(new byte[1], 0, 2); }); + Assert.ThrowsAny(() => { stream.ReadAsync(new byte[1], 0, 2); }); + } } - - ownedMemory?.Dispose(); } [Theory] @@ -208,40 +203,38 @@ namespace System.Net.Http.Functional.Tests const int ContentLength = 1024; Memory memory; - OwnedMemory ownedMemory; - ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out ownedMemory); - - var buffer = new byte[3]; - - using (Stream stream = await content.ReadAsStreamAsync()) + using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out IMemoryOwner memoryOwner)) { - for (int i = 0; i < ContentLength; i += buffer.Length) + var buffer = new byte[3]; + + using (Stream stream = await content.ReadAsStreamAsync()) { - int bytesRead = + for (int i = 0; i < ContentLength; i += buffer.Length) + { + int bytesRead = + mode == 0 ? stream.Read(buffer, 0, buffer.Length) : + mode == 1 ? stream.Read(new Span(buffer)) : + mode == 2 ? await stream.ReadAsync(buffer, 0, buffer.Length) : + mode == 3 ? await stream.ReadAsync(new Memory(buffer)) : + await Task.Factory.FromAsync(stream.BeginRead, stream.EndRead, buffer, 0, buffer.Length, null); + + Assert.Equal(Math.Min(buffer.Length, ContentLength - i), bytesRead); + for (int j = 0; j < bytesRead; j++) + { + Assert.Equal(memory.Span[i + j], buffer[j]); + } + + Assert.Equal(i + bytesRead, stream.Position); + } + + Assert.Equal(0, mode == 0 ? stream.Read(buffer, 0, buffer.Length) : mode == 1 ? stream.Read(new Span(buffer)) : mode == 2 ? await stream.ReadAsync(buffer, 0, buffer.Length) : mode == 3 ? await stream.ReadAsync(new Memory(buffer)) : - await Task.Factory.FromAsync(stream.BeginRead, stream.EndRead, buffer, 0, buffer.Length, null); - - Assert.Equal(Math.Min(buffer.Length, ContentLength - i), bytesRead); - for (int j = 0; j < bytesRead; j++) - { - Assert.Equal(memory.Span[i + j], buffer[j]); - } - - Assert.Equal(i + bytesRead, stream.Position); + await Task.Factory.FromAsync(stream.BeginRead, stream.EndRead, buffer, 0, buffer.Length, null)); } - - Assert.Equal(0, - mode == 0 ? stream.Read(buffer, 0, buffer.Length) : - mode == 1 ? stream.Read(new Span(buffer)) : - mode == 2 ? await stream.ReadAsync(buffer, 0, buffer.Length) : - mode == 3 ? await stream.ReadAsync(new Memory(buffer)) : - await Task.Factory.FromAsync(stream.BeginRead, stream.EndRead, buffer, 0, buffer.Length, null)); } - - ownedMemory?.Dispose(); } [Theory] @@ -251,32 +244,30 @@ namespace System.Net.Http.Functional.Tests const int ContentLength = 100; Memory memory; - OwnedMemory ownedMemory; - ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out ownedMemory); - - var buffer = new byte[1]; - var cts = new CancellationTokenSource(); - int bytesRead; - - using (Stream stream = await content.ReadAsStreamAsync()) + using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out IMemoryOwner memoryOwner)) { - for (int i = 0; i < ContentLength; i++) + var buffer = new byte[1]; + var cts = new CancellationTokenSource(); + int bytesRead; + + using (Stream stream = await content.ReadAsStreamAsync()) { - switch (i % 2) + for (int i = 0; i < ContentLength; i++) { - case 0: - bytesRead = await stream.ReadAsync(buffer, 0, 1, cts.Token); - break; - default: - bytesRead = await stream.ReadAsync(new Memory(buffer), cts.Token); - break; + switch (i % 2) + { + case 0: + bytesRead = await stream.ReadAsync(buffer, 0, 1, cts.Token); + break; + default: + bytesRead = await stream.ReadAsync(new Memory(buffer), cts.Token); + break; + } + Assert.Equal(1, bytesRead); + Assert.Equal(memory.Span[i], buffer[0]); } - Assert.Equal(1, bytesRead); - Assert.Equal(memory.Span[i], buffer[0]); } } - - ownedMemory?.Dispose(); } [Theory] @@ -286,17 +277,16 @@ namespace System.Net.Http.Functional.Tests const int ContentLength = 2; Memory memory; - OwnedMemory ownedMemory; - ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out ownedMemory); - using (Stream stream = await content.ReadAsStreamAsync()) + using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out IMemoryOwner memoryOwner)) { - await Assert.ThrowsAnyAsync(() => stream.ReadAsync(new byte[1], 0, 1, new CancellationToken(true))); - await Assert.ThrowsAnyAsync(async () => await stream.ReadAsync(new Memory(new byte[1]), new CancellationToken(true))); - await Assert.ThrowsAnyAsync(async () => await stream.CopyToAsync(new MemoryStream(), 1, new CancellationToken(true))); + using (Stream stream = await content.ReadAsStreamAsync()) + { + await Assert.ThrowsAnyAsync(() => stream.ReadAsync(new byte[1], 0, 1, new CancellationToken(true))); + await Assert.ThrowsAnyAsync(async () => await stream.ReadAsync(new Memory(new byte[1]), new CancellationToken(true))); + await Assert.ThrowsAnyAsync(async () => await stream.CopyToAsync(new MemoryStream(), 1, new CancellationToken(true))); + } } - - ownedMemory?.Dispose(); } [Theory] @@ -304,15 +294,14 @@ namespace System.Net.Http.Functional.Tests public async Task CopyToAsync_AllContentCopied(int contentLength, bool useArray) { Memory memory; - OwnedMemory ownedMemory; - ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out ownedMemory); + using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out IMemoryOwner memoryOwner)) + { - var destination = new MemoryStream(); - await content.CopyToAsync(destination); + var destination = new MemoryStream(); + await content.CopyToAsync(destination); - Assert.Equal(memory.ToArray(), destination.ToArray()); - - ownedMemory?.Dispose(); + Assert.Equal(memory.ToArray(), destination.ToArray()); + } } [Theory] @@ -320,18 +309,17 @@ namespace System.Net.Http.Functional.Tests public async Task ReadAsStreamAsync_CopyTo_AllContentCopied(int contentLength, bool useArray) { Memory memory; - OwnedMemory ownedMemory; - ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out ownedMemory); - - var destination = new MemoryStream(); - using (Stream s = await content.ReadAsStreamAsync()) + using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out IMemoryOwner memoryOwner)) { - s.CopyTo(destination); + + var destination = new MemoryStream(); + using (Stream s = await content.ReadAsStreamAsync()) + { + s.CopyTo(destination); + } + + Assert.Equal(memory.ToArray(), destination.ToArray()); } - - Assert.Equal(memory.ToArray(), destination.ToArray()); - - ownedMemory?.Dispose(); } [Theory] @@ -340,27 +328,25 @@ namespace System.Net.Http.Functional.Tests { const int ContentLength = 42; Memory memory; - OwnedMemory ownedMemory; - ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out ownedMemory); - - using (Stream s = await content.ReadAsStreamAsync()) + using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out IMemoryOwner memoryOwner)) { - AssertExtensions.Throws("destination", () => s.CopyTo(null)); - AssertExtensions.Throws("destination", () => { s.CopyToAsync(null); }); + using (Stream s = await content.ReadAsStreamAsync()) + { + AssertExtensions.Throws("destination", () => s.CopyTo(null)); + AssertExtensions.Throws("destination", () => { s.CopyToAsync(null); }); - AssertExtensions.Throws("bufferSize", () => s.CopyTo(new MemoryStream(), 0)); - AssertExtensions.Throws("bufferSize", () => { s.CopyToAsync(new MemoryStream(), 0); }); + AssertExtensions.Throws("bufferSize", () => s.CopyTo(new MemoryStream(), 0)); + AssertExtensions.Throws("bufferSize", () => { s.CopyToAsync(new MemoryStream(), 0); }); - Assert.Throws(() => s.CopyTo(new MemoryStream(new byte[1], writable:false))); - Assert.Throws(() => { s.CopyToAsync(new MemoryStream(new byte[1], writable: false)); }); + Assert.Throws(() => s.CopyTo(new MemoryStream(new byte[1], writable: false))); + Assert.Throws(() => { s.CopyToAsync(new MemoryStream(new byte[1], writable: false)); }); - var disposedDestination = new MemoryStream(); - disposedDestination.Dispose(); - Assert.Throws(() => s.CopyTo(disposedDestination)); - Assert.Throws(() => { s.CopyToAsync(disposedDestination); }); + var disposedDestination = new MemoryStream(); + disposedDestination.Dispose(); + Assert.Throws(() => s.CopyTo(disposedDestination)); + Assert.Throws(() => { s.CopyToAsync(disposedDestination); }); + } } - - ownedMemory?.Dispose(); } [Theory] @@ -368,31 +354,30 @@ namespace System.Net.Http.Functional.Tests public async Task ReadAsStreamAsync_CopyToAsync_AllContentCopied(int contentLength, bool useArray) { Memory memory; - OwnedMemory ownedMemory; - ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out ownedMemory); - - var destination = new MemoryStream(); - using (Stream s = await content.ReadAsStreamAsync()) + using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out IMemoryOwner memoryOwner)) { - await s.CopyToAsync(destination); + + var destination = new MemoryStream(); + using (Stream s = await content.ReadAsStreamAsync()) + { + await s.CopyToAsync(destination); + } + + Assert.Equal(memory.ToArray(), destination.ToArray()); } - - Assert.Equal(memory.ToArray(), destination.ToArray()); - - ownedMemory?.Dispose(); } - private static ReadOnlyMemoryContent CreateContent(int contentLength, bool useArray, out Memory memory, out OwnedMemory ownedMemory) + private static ReadOnlyMemoryContent CreateContent(int contentLength, bool useArray, out Memory memory, out IMemoryOwner memoryOwner) { if (useArray) { memory = new byte[contentLength]; - ownedMemory = null; + memoryOwner = null; } else { - ownedMemory = new NativeOwnedMemory(contentLength); - memory = ownedMemory.Memory; + memoryOwner = new NativeMemoryManager(contentLength); + memory = memoryOwner.Memory; } new Random(contentLength).NextBytes(memory.Span); diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/ResponseStreamTest.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/ResponseStreamTest.cs index d067473b05..a099f05403 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/ResponseStreamTest.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/ResponseStreamTest.cs @@ -16,7 +16,7 @@ namespace System.Net.Http.Functional.Tests using Configuration = System.Net.Test.Common.Configuration; [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "dotnet/corefx #20010")] - public class ResponseStreamTest : HttpClientTestBase + public abstract class ResponseStreamTest : HttpClientTestBase { private readonly ITestOutputHelper _output; @@ -182,9 +182,9 @@ namespace System.Net.Http.Functional.Tests Assert.True(task.IsCompleted, "Task was not yet completed"); // Verify that the task completed successfully or is canceled. - if (PlatformDetection.IsWindows) + if (IsWinHttpHandler) { - // On Windows, we may fault because canceling the task destroys the request handle + // With WinHttpHandler, we may fault because canceling the task destroys the request handle // which may randomly cause an ObjectDisposedException (or other exception). Assert.True( task.Status == TaskStatus.RanToCompletion || @@ -208,44 +208,112 @@ namespace System.Net.Http.Functional.Tests [OuterLoop] // TODO: Issue #11345 [Theory] - [InlineData(LoopbackServer.TransferType.ContentLength, LoopbackServer.TransferError.ContentLengthTooLarge)] - [InlineData(LoopbackServer.TransferType.Chunked, LoopbackServer.TransferError.MissingChunkTerminator)] - [InlineData(LoopbackServer.TransferType.Chunked, LoopbackServer.TransferError.ChunkSizeTooLarge)] + [InlineData(TransferType.ContentLength, TransferError.ContentLengthTooLarge)] + [InlineData(TransferType.Chunked, TransferError.MissingChunkTerminator)] + [InlineData(TransferType.Chunked, TransferError.ChunkSizeTooLarge)] public async Task ReadAsStreamAsync_InvalidServerResponse_ThrowsIOException( - LoopbackServer.TransferType transferType, - LoopbackServer.TransferError transferError) + TransferType transferType, + TransferError transferError) { - IPEndPoint serverEndPoint; - Task serverTask = LoopbackServer.StartTransferTypeAndErrorServer(transferType, transferError, out serverEndPoint); - - await Assert.ThrowsAsync(() => ReadAsStreamHelper(serverEndPoint)); - - await serverTask; + await StartTransferTypeAndErrorServer(transferType, transferError, async uri => + { + await Assert.ThrowsAsync(() => ReadAsStreamHelper(uri)); + }); } [OuterLoop] // TODO: Issue #11345 [Theory] - [InlineData(LoopbackServer.TransferType.None, LoopbackServer.TransferError.None)] - [InlineData(LoopbackServer.TransferType.ContentLength, LoopbackServer.TransferError.None)] - [InlineData(LoopbackServer.TransferType.Chunked, LoopbackServer.TransferError.None)] + [InlineData(TransferType.None, TransferError.None)] + [InlineData(TransferType.ContentLength, TransferError.None)] + [InlineData(TransferType.Chunked, TransferError.None)] public async Task ReadAsStreamAsync_ValidServerResponse_Success( - LoopbackServer.TransferType transferType, - LoopbackServer.TransferError transferError) + TransferType transferType, + TransferError transferError) { - IPEndPoint serverEndPoint; - Task serverTask = LoopbackServer.StartTransferTypeAndErrorServer(transferType, transferError, out serverEndPoint); - - await ReadAsStreamHelper(serverEndPoint); - - await serverTask; + await StartTransferTypeAndErrorServer(transferType, transferError, async uri => + { + await ReadAsStreamHelper(uri); + }); } - private async Task ReadAsStreamHelper(IPEndPoint serverEndPoint) + public enum TransferType + { + None = 0, + ContentLength, + Chunked + } + + public enum TransferError + { + None = 0, + ContentLengthTooLarge, + ChunkSizeTooLarge, + MissingChunkTerminator + } + + public static Task StartTransferTypeAndErrorServer( + TransferType transferType, + TransferError transferError, + Func clientFunc) + { + return LoopbackServer.CreateClientAndServerAsync( + clientFunc, + server => server.AcceptConnectionAsync(async connection => + { + // Read past request headers. + await connection.ReadRequestHeaderAsync(); + + // Determine response transfer headers. + string transferHeader = null; + string content = "This is some response content."; + if (transferType == TransferType.ContentLength) + { + transferHeader = transferError == TransferError.ContentLengthTooLarge ? + $"Content-Length: {content.Length + 42}\r\n" : + $"Content-Length: {content.Length}\r\n"; + } + else if (transferType == TransferType.Chunked) + { + transferHeader = "Transfer-Encoding: chunked\r\n"; + } + + // Write response header + TextWriter writer = connection.Writer; + await writer.WriteAsync("HTTP/1.1 200 OK\r\n").ConfigureAwait(false); + await writer.WriteAsync($"Date: {DateTimeOffset.UtcNow:R}\r\n").ConfigureAwait(false); + await writer.WriteAsync("Content-Type: text/plain\r\n").ConfigureAwait(false); + if (!string.IsNullOrEmpty(transferHeader)) + { + await writer.WriteAsync(transferHeader).ConfigureAwait(false); + } + await writer.WriteAsync("\r\n").ConfigureAwait(false); + + // Write response body + if (transferType == TransferType.Chunked) + { + string chunkSizeInHex = string.Format( + "{0:x}\r\n", + content.Length + (transferError == TransferError.ChunkSizeTooLarge ? 42 : 0)); + await writer.WriteAsync(chunkSizeInHex).ConfigureAwait(false); + await writer.WriteAsync($"{content}\r\n").ConfigureAwait(false); + if (transferError != TransferError.MissingChunkTerminator) + { + await writer.WriteAsync("0\r\n\r\n").ConfigureAwait(false); + } + } + else + { + await writer.WriteAsync($"{content}").ConfigureAwait(false); + } + })); + } + + private async Task ReadAsStreamHelper(Uri serverUri) { using (HttpClient client = CreateHttpClient()) { using (var response = await client.GetAsync( - new Uri($"http://{serverEndPoint.Address}:{(serverEndPoint).Port}/"), + serverUri, HttpCompletionOption.ResponseHeadersRead)) using (var stream = await response.Content.ReadAsStreamAsync()) { diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/SchSendAuxRecordHttpTest.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/SchSendAuxRecordHttpTest.cs index c02e2f1eb6..19261e1022 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/SchSendAuxRecordHttpTest.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/SchSendAuxRecordHttpTest.cs @@ -12,7 +12,7 @@ using Xunit.Abstractions; namespace System.Net.Http.Functional.Tests { [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "dotnet/corefx #20010")] - public class SchSendAuxRecordHttpTest : HttpClientTestBase + public abstract class SchSendAuxRecordHttpTest : HttpClientTestBase { readonly ITestOutputHelper _output; @@ -33,7 +33,7 @@ namespace System.Net.Http.Functional.Tests using (HttpClientHandler handler = CreateHttpClientHandler()) using (var client = new HttpClient(handler)) { - handler.ServerCertificateCustomValidationCallback = LoopbackServer.AllowAllCertificates; + handler.ServerCertificateCustomValidationCallback = TestHelper.AllowAllCertificates; server.Start(); var tasks = new Task[2]; diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/SelectedSitesTest.txt b/external/corefx/src/System.Net.Http/tests/FunctionalTests/SelectedSitesTest.txt new file mode 100644 index 0000000000..42788a115a --- /dev/null +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/SelectedSitesTest.txt @@ -0,0 +1,50 @@ +http://facebook.com +http://google.com +http://youtube.com +http://live.com +http://yahoo.com +http://wikipedia.org +http://msn.com +http://blogger.com +http://microsoft.com +http://bing.com +http://qq.com +http://baidu.com +http://ask.com +http://wordpress.com +http://mozilla.com +http://apple.com +http://taobao.com +http://amazon.com +http://twitter.com +http://ebay.com +http://myspace.com +http://ehow.com +http://cnet.com +http://flickr.com +http://aol.com +http://google.com.hk +http://sohu.com +http://yahoo.co.jp +http://cnn.com +http://bbc.co.uk +http://linkedin.com +http://craigslist.org +http://google.fr +http://nytimes.com +http://msnbc.com +http://skype.com +http://mapquest.com +http://uol.com.br +http://alibaba.com +http://paypal.com +http://espn.com +http://real.com +http://hp.com +http://dictionary.com +http://sourceforge.net +http://terra.com.br +http://opera.com +http://google.es +http://walmart.com +http://dailymail.co.uk \ No newline at end of file diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs new file mode 100644 index 0000000000..5478ece4b4 --- /dev/null +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs @@ -0,0 +1,1420 @@ +// 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.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Net.Security; +using System.Net.Sockets; +using System.Net.Test.Common; +using System.Security.Authentication; +using System.Security.Cryptography.X509Certificates; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using Xunit; +using Xunit.Abstractions; + +namespace System.Net.Http.Functional.Tests +{ + public sealed class SocketsHttpHandler_HttpProtocolTests : HttpProtocolTests + { + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_HttpProtocolTests_Dribble : HttpProtocolTests_Dribble + { + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_HttpClientTest : HttpClientTest + { + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_DiagnosticsTest : DiagnosticsTest + { + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_HttpClient_SelectedSites_Test : HttpClient_SelectedSites_Test + { + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_HttpClientEKUTest : HttpClientEKUTest + { + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_HttpClientHandler_Decompression_Tests : HttpClientHandler_Decompression_Test + { + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_HttpClientHandler_DangerousAcceptAllCertificatesValidator_Test : HttpClientHandler_DangerousAcceptAllCertificatesValidator_Test + { + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_HttpClientHandler_ClientCertificates_Test : HttpClientHandler_ClientCertificates_Test + { + public SocketsHttpHandler_HttpClientHandler_ClientCertificates_Test(ITestOutputHelper output) : base(output) { } + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_HttpClientHandler_DefaultProxyCredentials_Test : HttpClientHandler_DefaultProxyCredentials_Test + { + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_HttpClientHandler_MaxConnectionsPerServer_Test : HttpClientHandler_MaxConnectionsPerServer_Test + { + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_HttpClientHandler_ServerCertificates_Test : HttpClientHandler_ServerCertificates_Test + { + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_HttpClientHandler_ResponseDrain_Test : HttpClientHandler_ResponseDrain_Test + { + protected override bool UseSocketsHttpHandler => true; + + protected override void SetResponseDrainTimeout(HttpClientHandler handler, TimeSpan time) + { + SocketsHttpHandler s = (SocketsHttpHandler)GetUnderlyingSocketsHttpHandler(handler); + Assert.NotNull(s); + s.ResponseDrainTimeout = time; + } + + [Fact] + public void MaxResponseDrainSize_Roundtrips() + { + using (var handler = new SocketsHttpHandler()) + { + Assert.Equal(1024 * 1024, handler.MaxResponseDrainSize); + + handler.MaxResponseDrainSize = 0; + Assert.Equal(0, handler.MaxResponseDrainSize); + + handler.MaxResponseDrainSize = int.MaxValue; + Assert.Equal(int.MaxValue, handler.MaxResponseDrainSize); + } + } + + [Fact] + public void MaxResponseDrainSize_InvalidArgument_Throws() + { + using (var handler = new SocketsHttpHandler()) + { + Assert.Equal(1024 * 1024, handler.MaxResponseDrainSize); + + AssertExtensions.Throws("value", () => handler.MaxResponseDrainSize = -1); + AssertExtensions.Throws("value", () => handler.MaxResponseDrainSize = int.MinValue); + + Assert.Equal(1024 * 1024, handler.MaxResponseDrainSize); + } + } + + [Fact] + public void MaxResponseDrainSize_SetAfterUse_Throws() + { + using (var handler = new SocketsHttpHandler()) + using (var client = new HttpClient(handler)) + { + handler.MaxResponseDrainSize = 1; + client.GetAsync("http://" + Guid.NewGuid().ToString("N")); // ignoring failure + Assert.Equal(1, handler.MaxResponseDrainSize); + Assert.Throws(() => handler.MaxResponseDrainSize = 1); + } + } + + [Fact] + public void ResponseDrainTimeout_Roundtrips() + { + using (var handler = new SocketsHttpHandler()) + { + Assert.Equal(TimeSpan.FromSeconds(2), handler.ResponseDrainTimeout); + + handler.ResponseDrainTimeout = TimeSpan.Zero; + Assert.Equal(TimeSpan.Zero, handler.ResponseDrainTimeout); + + handler.ResponseDrainTimeout = TimeSpan.FromTicks(int.MaxValue); + Assert.Equal(TimeSpan.FromTicks(int.MaxValue), handler.ResponseDrainTimeout); + } + } + + [Fact] + public void MaxResponseDraiTime_InvalidArgument_Throws() + { + using (var handler = new SocketsHttpHandler()) + { + Assert.Equal(TimeSpan.FromSeconds(2), handler.ResponseDrainTimeout); + + AssertExtensions.Throws("value", () => handler.ResponseDrainTimeout = TimeSpan.FromSeconds(-1)); + AssertExtensions.Throws("value", () => handler.ResponseDrainTimeout = TimeSpan.MaxValue); + AssertExtensions.Throws("value", () => handler.ResponseDrainTimeout = TimeSpan.FromSeconds(int.MaxValue)); + + Assert.Equal(TimeSpan.FromSeconds(2), handler.ResponseDrainTimeout); + } + } + + [Fact] + public void ResponseDrainTimeout_SetAfterUse_Throws() + { + using (var handler = new SocketsHttpHandler()) + using (var client = new HttpClient(handler)) + { + handler.ResponseDrainTimeout = TimeSpan.FromSeconds(42); + client.GetAsync("http://" + Guid.NewGuid().ToString("N")); // ignoring failure + Assert.Equal(TimeSpan.FromSeconds(42), handler.ResponseDrainTimeout); + Assert.Throws(() => handler.ResponseDrainTimeout = TimeSpan.FromSeconds(42)); + } + } + + [OuterLoop] + [Theory] + [InlineData(1024 * 1024 * 2, 9_500, 1024 * 1024 * 3, ContentMode.ContentLength)] + [InlineData(1024 * 1024 * 2, 9_500, 1024 * 1024 * 3, ContentMode.SingleChunk)] + [InlineData(1024 * 1024 * 2, 9_500, 1024 * 1024 * 13, ContentMode.BytePerChunk)] + public async Task GetAsyncWithMaxConnections_DisposeBeforeReadingToEnd_DrainsRequestsUnderMaxDrainSizeAndReusesConnection(int totalSize, int readSize, int maxDrainSize, ContentMode mode) + { + await LoopbackServer.CreateClientAndServerAsync( + async url => + { + var handler = new SocketsHttpHandler(); + handler.MaxResponseDrainSize = maxDrainSize; + handler.ResponseDrainTimeout = Timeout.InfiniteTimeSpan; + + // Set MaxConnectionsPerServer to 1. This will ensure we will wait for the previous request to drain (or fail to) + handler.MaxConnectionsPerServer = 1; + + using (var client = new HttpClient(handler)) + { + HttpResponseMessage response1 = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead); + ValidateResponseHeaders(response1, totalSize, mode); + + // Read part but not all of response + Stream responseStream = await response1.Content.ReadAsStreamAsync(); + await ReadToByteCount(responseStream, readSize); + + response1.Dispose(); + + // Issue another request. We'll confirm that it comes on the same connection. + HttpResponseMessage response2 = await client.GetAsync(url); + ValidateResponseHeaders(response2, totalSize, mode); + Assert.Equal(totalSize, (await response2.Content.ReadAsStringAsync()).Length); + } + }, + async server => + { + string content = new string('a', totalSize); + string response = GetResponseForContentMode(content, mode); + await server.AcceptConnectionAsync(async connection => + { + await connection.ReadRequestHeaderAndSendCustomResponseAsync(response); + await connection.ReadRequestHeaderAndSendCustomResponseAsync(response); + }); + }); + } + + [OuterLoop] + [Theory] + [InlineData(100_000, 0, ContentMode.ContentLength)] + [InlineData(100_000, 0, ContentMode.SingleChunk)] + [InlineData(100_000, 0, ContentMode.BytePerChunk)] + public async Task GetAsyncWithMaxConnections_DisposeLargerThanMaxDrainSize_KillsConnection(int totalSize, int maxDrainSize, ContentMode mode) + { + await LoopbackServer.CreateClientAndServerAsync( + async url => + { + var handler = new SocketsHttpHandler(); + handler.MaxResponseDrainSize = maxDrainSize; + handler.ResponseDrainTimeout = Timeout.InfiniteTimeSpan; + + // Set MaxConnectionsPerServer to 1. This will ensure we will wait for the previous request to drain (or fail to) + handler.MaxConnectionsPerServer = 1; + + using (var client = new HttpClient(handler)) + { + HttpResponseMessage response1 = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead); + ValidateResponseHeaders(response1, totalSize, mode); + response1.Dispose(); + + // Issue another request. We'll confirm that it comes on a new connection. + HttpResponseMessage response2 = await client.GetAsync(url); + ValidateResponseHeaders(response2, totalSize, mode); + Assert.Equal(totalSize, (await response2.Content.ReadAsStringAsync()).Length); + } + }, + async server => + { + string content = new string('a', totalSize); + string response = GetResponseForContentMode(content, mode); + await server.AcceptConnectionAsync(async connection => + { + await connection.ReadRequestHeaderAsync(); + try + { + await connection.Writer.WriteAsync(response); + } + catch (Exception) { } // Eat errors from client disconnect. + + await server.AcceptConnectionSendCustomResponseAndCloseAsync(response); + }); + }); + } + + [OuterLoop] + [Theory] + [InlineData(ContentMode.ContentLength)] + [InlineData(ContentMode.SingleChunk)] + [InlineData(ContentMode.BytePerChunk)] + public async Task GetAsyncWithMaxConnections_DrainTakesLongerThanTimeout_KillsConnection(ContentMode mode) + { + const int ContentLength = 10_000; + + await LoopbackServer.CreateClientAndServerAsync( + async url => + { + var handler = new SocketsHttpHandler(); + handler.MaxResponseDrainSize = int.MaxValue; + handler.ResponseDrainTimeout = TimeSpan.FromMilliseconds(1); + + // Set MaxConnectionsPerServer to 1. This will ensure we will wait for the previous request to drain (or fail to) + handler.MaxConnectionsPerServer = 1; + + using (var client = new HttpClient(handler)) + { + client.Timeout = Timeout.InfiniteTimeSpan; + + HttpResponseMessage response1 = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead); + ValidateResponseHeaders(response1, ContentLength, mode); + response1.Dispose(); + + // Issue another request. We'll confirm that it comes on a new connection. + HttpResponseMessage response2 = await client.GetAsync(url); + ValidateResponseHeaders(response2, ContentLength, mode); + Assert.Equal(ContentLength, (await response2.Content.ReadAsStringAsync()).Length); + } + }, + async server => + { + string content = new string('a', ContentLength); + string response = GetResponseForContentMode(content, mode); + await server.AcceptConnectionAsync(async connection => + { + await connection.ReadRequestHeaderAsync(); + try + { + // Write out only part of the response + await connection.Writer.WriteAsync(response.Substring(0, response.Length / 2)); + } + catch (Exception) { } // Eat errors from client disconnect. + + await server.AcceptConnectionSendCustomResponseAndCloseAsync(response); + }); + }); + } + } + + public sealed class SocketsHttpHandler_PostScenarioTest : PostScenarioTest + { + public SocketsHttpHandler_PostScenarioTest(ITestOutputHelper output) : base(output) { } + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_ResponseStreamTest : ResponseStreamTest + { + public SocketsHttpHandler_ResponseStreamTest(ITestOutputHelper output) : base(output) { } + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_HttpClientHandler_SslProtocols_Test : HttpClientHandler_SslProtocols_Test + { + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_SchSendAuxRecordHttpTest : SchSendAuxRecordHttpTest + { + public SocketsHttpHandler_SchSendAuxRecordHttpTest(ITestOutputHelper output) : base(output) { } + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_HttpClientMiniStress : HttpClientMiniStress + { + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_HttpClientHandlerTest : HttpClientHandlerTest + { + public SocketsHttpHandler_HttpClientHandlerTest(ITestOutputHelper output) : base(output) { } + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_DefaultCredentialsTest : DefaultCredentialsTest + { + public SocketsHttpHandler_DefaultCredentialsTest(ITestOutputHelper output) : base(output) { } + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_IdnaProtocolTests : IdnaProtocolTests + { + protected override bool UseSocketsHttpHandler => true; + protected override bool SupportsIdna => true; + } + + public sealed class SocketsHttpHandler_HttpRetryProtocolTests : HttpRetryProtocolTests + { + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_HttpCookieProtocolTests : HttpCookieProtocolTests + { + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_HttpClientHandler_Cancellation_Test : HttpClientHandler_Cancellation_Test + { + protected override bool UseSocketsHttpHandler => true; + + [Fact] + public void ConnectTimeout_Default() + { + using (var handler = new SocketsHttpHandler()) + { + Assert.Equal(Timeout.InfiniteTimeSpan, handler.ConnectTimeout); + } + } + + [Theory] + [InlineData(0)] + [InlineData(-2)] + [InlineData(int.MaxValue + 1L)] + public void ConnectTimeout_InvalidValues(long ms) + { + using (var handler = new SocketsHttpHandler()) + { + Assert.Throws(() => handler.ConnectTimeout = TimeSpan.FromMilliseconds(ms)); + } + } + + [Theory] + [InlineData(-1)] + [InlineData(1)] + [InlineData(int.MaxValue - 1)] + [InlineData(int.MaxValue)] + public void ConnectTimeout_ValidValues_Roundtrip(long ms) + { + using (var handler = new SocketsHttpHandler()) + { + handler.ConnectTimeout = TimeSpan.FromMilliseconds(ms); + Assert.Equal(TimeSpan.FromMilliseconds(ms), handler.ConnectTimeout); + } + } + + [Fact] + public void ConnectTimeout_SetAfterUse_Throws() + { + using (var handler = new SocketsHttpHandler()) + using (var client = new HttpClient(handler)) + { + handler.ConnectTimeout = TimeSpan.FromMilliseconds(int.MaxValue); + client.GetAsync("http://" + Guid.NewGuid().ToString("N")); // ignoring failure + Assert.Equal(TimeSpan.FromMilliseconds(int.MaxValue), handler.ConnectTimeout); + Assert.Throws(() => handler.ConnectTimeout = TimeSpan.FromMilliseconds(1)); + } + } + + [OuterLoop] + [Fact] + public async Task ConnectTimeout_TimesOutSSLAuth_Throws() + { + var releaseServer = new TaskCompletionSource(); + await LoopbackServer.CreateClientAndServerAsync(async uri => + { + using (var handler = new SocketsHttpHandler()) + using (var invoker = new HttpMessageInvoker(handler)) + { + handler.ConnectTimeout = TimeSpan.FromSeconds(1); + + var sw = Stopwatch.StartNew(); + await Assert.ThrowsAsync(() => + invoker.SendAsync(new HttpRequestMessage(HttpMethod.Get, + new UriBuilder(uri) { Scheme = "https" }.ToString()), default)); + sw.Stop(); + + Assert.InRange(sw.ElapsedMilliseconds, 500, 30_000); + releaseServer.SetResult(true); + } + }, server => releaseServer.Task); // doesn't establish SSL connection + } + + + [Fact] + public void Expect100ContinueTimeout_Default() + { + using (var handler = new SocketsHttpHandler()) + { + Assert.Equal(TimeSpan.FromSeconds(1), handler.Expect100ContinueTimeout); + } + } + + [Theory] + [InlineData(-2)] + [InlineData(int.MaxValue + 1L)] + public void Expect100ContinueTimeout_InvalidValues(long ms) + { + using (var handler = new SocketsHttpHandler()) + { + Assert.Throws(() => handler.Expect100ContinueTimeout = TimeSpan.FromMilliseconds(ms)); + } + } + + [Theory] + [InlineData(-1)] + [InlineData(1)] + [InlineData(int.MaxValue - 1)] + [InlineData(int.MaxValue)] + public void Expect100ContinueTimeout_ValidValues_Roundtrip(long ms) + { + using (var handler = new SocketsHttpHandler()) + { + handler.Expect100ContinueTimeout = TimeSpan.FromMilliseconds(ms); + Assert.Equal(TimeSpan.FromMilliseconds(ms), handler.Expect100ContinueTimeout); + } + } + + [Fact] + public void Expect100ContinueTimeout_SetAfterUse_Throws() + { + using (var handler = new SocketsHttpHandler()) + using (var client = new HttpClient(handler)) + { + handler.Expect100ContinueTimeout = TimeSpan.FromMilliseconds(int.MaxValue); + client.GetAsync("http://" + Guid.NewGuid().ToString("N")); // ignoring failure + Assert.Equal(TimeSpan.FromMilliseconds(int.MaxValue), handler.Expect100ContinueTimeout); + Assert.Throws(() => handler.Expect100ContinueTimeout = TimeSpan.FromMilliseconds(1)); + } + } + + [OuterLoop("Incurs significant delay")] + [Fact] + public async Task Expect100Continue_WaitsExpectedPeriodOfTimeBeforeSendingContent() + { + await LoopbackServer.CreateClientAndServerAsync(async uri => + { + using (var handler = new SocketsHttpHandler()) + using (var invoker = new HttpMessageInvoker(handler)) + { + TimeSpan delay = TimeSpan.FromSeconds(3); + handler.Expect100ContinueTimeout = delay; + + var tcs = new TaskCompletionSource(); + var content = new SetTcsContent(new MemoryStream(new byte[1]), tcs); + var request = new HttpRequestMessage(HttpMethod.Post, uri) { Content = content }; + request.Headers.ExpectContinue = true; + + var sw = Stopwatch.StartNew(); + (await invoker.SendAsync(request, default)).Dispose(); + sw.Stop(); + + Assert.InRange(sw.Elapsed, delay - TimeSpan.FromSeconds(.5), delay * 10); // arbitrary wiggle room + } + }, async server => + { + await server.AcceptConnectionAsync(async connection => + { + await connection.ReadRequestHeaderAsync(); + await connection.Reader.ReadAsync(new char[1]); + await connection.SendResponseAsync(); + }); + }); + } + + private sealed class SetTcsContent : StreamContent + { + private readonly TaskCompletionSource _tcs; + + public SetTcsContent(Stream stream, TaskCompletionSource tcs) : base(stream) => _tcs = tcs; + + protected override Task SerializeToStreamAsync(Stream stream, TransportContext context) + { + _tcs.SetResult(true); + return base.SerializeToStreamAsync(stream, context); + } + } + } + + public sealed class SocketsHttpHandler_HttpClientHandler_MaxResponseHeadersLength_Test : HttpClientHandler_MaxResponseHeadersLength_Test + { + protected override bool UseSocketsHttpHandler => true; + } + + public sealed class SocketsHttpHandler_HttpClientHandler_Authentication_Test : HttpClientHandler_Authentication_Test + { + protected override bool UseSocketsHttpHandler => true; + + [Theory] + [MemberData(nameof(Authentication_SocketsHttpHandler_TestData))] + public async void SocketsHttpHandler_Authentication_Succeeds(string authenticateHeader, bool result) + { + await HttpClientHandler_Authentication_Succeeds(authenticateHeader, result); + } + + public static IEnumerable Authentication_SocketsHttpHandler_TestData() + { + // These test cases successfully authenticate on SocketsHttpHandler but fail on the other handlers. + // These are legal as per the the RFC, so authenticating is the expected behavior. See #28521 for details. + yield return new object[] { "Basic realm=\"testrealm1\" basic realm=\"testrealm1\"", true }; + yield return new object[] { "Basic something digest something", true }; + yield return new object[] { "Digest realm=\"api@example.org\", qop=\"auth\", algorithm=MD5-sess, nonce=\"5TsQWLVdgBdmrQ0XsxbDODV+57QdFR34I9HAbC/RVvkK\", " + + "opaque=\"HRPCssKJSGjCrkzDg8OhwpzCiGPChXYjwrI2QmXDnsOS\", charset=UTF-8, userhash=true", true }; + yield return new object[] { "dIgEsT realm=\"api@example.org\", qop=\"auth\", algorithm=MD5-sess, nonce=\"5TsQWLVdgBdmrQ0XsxbDODV+57QdFR34I9HAbC/RVvkK\", " + + "opaque=\"HRPCssKJSGjCrkzDg8OhwpzCiGPChXYjwrI2QmXDnsOS\", charset=UTF-8, userhash=true", true }; + + // These cases fail on WinHttpHandler because of a behavior in WinHttp that causes requests to be duplicated + // when the digest header has certain parameters. See #28522 for details. + yield return new object[] { "Digest ", false }; + yield return new object[] { "Digest realm=\"testrealm\", nonce=\"testnonce\", algorithm=\"myown\"", false }; + + // These cases fail to authenticate on SocketsHttpHandler, but succeed on the other handlers. + // they are all invalid as per the RFC, so failing is the expected behavior. See #28523 for details. + yield return new object[] { "Digest realm=withoutquotes, nonce=withoutquotes", false }; + yield return new object[] { "Digest realm=\"testrealm\" nonce=\"testnonce\"", false }; + yield return new object[] { "Digest realm=\"testrealm1\", nonce=\"testnonce1\" Digest realm=\"testrealm2\", nonce=\"testnonce2\"", false }; + } + } + + public sealed class SocketsHttpHandler_ConnectionUpgrade_Test : HttpClientTestBase + { + protected override bool UseSocketsHttpHandler => true; + + [Fact] + public async Task UpgradeConnection_ReturnsReadableAndWritableStream() + { + await LoopbackServer.CreateServerAsync(async (server, url) => + { + using (HttpClient client = CreateHttpClient()) + { + // We need to use ResponseHeadersRead here, otherwise we will hang trying to buffer the response body. + Task getResponseTask = client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead); + await server.AcceptConnectionAsync(async connection => + { + Task> serverTask = connection.ReadRequestHeaderAndSendCustomResponseAsync($"HTTP/1.1 101 Switching Protocols\r\nDate: {DateTimeOffset.UtcNow:R}\r\n\r\n"); + + await TestHelper.WhenAllCompletedOrAnyFailed(getResponseTask, serverTask); + + using (Stream clientStream = await (await getResponseTask).Content.ReadAsStreamAsync()) + { + // Boolean properties returning correct values + Assert.True(clientStream.CanWrite); + Assert.True(clientStream.CanRead); + Assert.False(clientStream.CanSeek); + + // Not supported operations + Assert.Throws(() => clientStream.Length); + Assert.Throws(() => clientStream.Position); + Assert.Throws(() => clientStream.Position = 0); + Assert.Throws(() => clientStream.Seek(0, SeekOrigin.Begin)); + Assert.Throws(() => clientStream.SetLength(0)); + + // Invalid arguments + var nonWritableStream = new MemoryStream(new byte[1], false); + var disposedStream = new MemoryStream(); + disposedStream.Dispose(); + Assert.Throws(() => clientStream.CopyTo(null)); + Assert.Throws(() => clientStream.CopyTo(Stream.Null, 0)); + Assert.Throws(() => { clientStream.CopyToAsync(null, 100, default); }); + Assert.Throws(() => { clientStream.CopyToAsync(Stream.Null, 0, default); }); + Assert.Throws(() => { clientStream.CopyToAsync(Stream.Null, -1, default); }); + Assert.Throws(() => { clientStream.CopyToAsync(nonWritableStream, 100, default); }); + Assert.Throws(() => { clientStream.CopyToAsync(disposedStream, 100, default); }); + Assert.Throws(() => clientStream.Read(null, 0, 100)); + Assert.Throws(() => clientStream.Read(new byte[1], -1, 1)); + Assert.ThrowsAny(() => clientStream.Read(new byte[1], 2, 1)); + Assert.Throws(() => clientStream.Read(new byte[1], 0, -1)); + Assert.ThrowsAny(() => clientStream.Read(new byte[1], 0, 2)); + Assert.Throws(() => clientStream.BeginRead(null, 0, 100, null, null)); + Assert.Throws(() => clientStream.BeginRead(new byte[1], -1, 1, null, null)); + Assert.ThrowsAny(() => clientStream.BeginRead(new byte[1], 2, 1, null, null)); + Assert.Throws(() => clientStream.BeginRead(new byte[1], 0, -1, null, null)); + Assert.ThrowsAny(() => clientStream.BeginRead(new byte[1], 0, 2, null, null)); + Assert.Throws(() => clientStream.EndRead(null)); + Assert.Throws(() => { clientStream.ReadAsync(null, 0, 100, default); }); + Assert.Throws(() => { clientStream.ReadAsync(new byte[1], -1, 1, default); }); + Assert.ThrowsAny(() => { clientStream.ReadAsync(new byte[1], 2, 1, default); }); + Assert.Throws(() => { clientStream.ReadAsync(new byte[1], 0, -1, default); }); + Assert.ThrowsAny(() => { clientStream.ReadAsync(new byte[1], 0, 2, default); }); + + // Validate writing APIs on clientStream + + clientStream.WriteByte((byte)'!'); + clientStream.Write(new byte[] { (byte)'\r', (byte)'\n' }, 0, 2); + Assert.Equal("!", await connection.Reader.ReadLineAsync()); + + clientStream.Write(new Span(new byte[] { (byte)'h', (byte)'e', (byte)'l', (byte)'l', (byte)'o', (byte)'\r', (byte)'\n' })); + Assert.Equal("hello", await connection.Reader.ReadLineAsync()); + + await clientStream.WriteAsync(new byte[] { (byte)'w', (byte)'o', (byte)'r', (byte)'l', (byte)'d', (byte)'\r', (byte)'\n' }, 0, 7); + Assert.Equal("world", await connection.Reader.ReadLineAsync()); + + await clientStream.WriteAsync(new Memory(new byte[] { (byte)'a', (byte)'n', (byte)'d', (byte)'\r', (byte)'\n' }, 0, 5)); + Assert.Equal("and", await connection.Reader.ReadLineAsync()); + + await Task.Factory.FromAsync(clientStream.BeginWrite, clientStream.EndWrite, new byte[] { (byte)'b', (byte)'e', (byte)'y', (byte)'o', (byte)'n', (byte)'d', (byte)'\r', (byte)'\n' }, 0, 8, null); + Assert.Equal("beyond", await connection.Reader.ReadLineAsync()); + + clientStream.Flush(); + await clientStream.FlushAsync(); + + // Validate reading APIs on clientStream + await connection.Stream.WriteAsync(Encoding.ASCII.GetBytes("abcdefghijklmnopqrstuvwxyz")); + var buffer = new byte[1]; + + Assert.Equal('a', clientStream.ReadByte()); + + Assert.Equal(1, clientStream.Read(buffer, 0, 1)); + Assert.Equal((byte)'b', buffer[0]); + + Assert.Equal(1, clientStream.Read(new Span(buffer, 0, 1))); + Assert.Equal((byte)'c', buffer[0]); + + Assert.Equal(1, await clientStream.ReadAsync(buffer, 0, 1)); + Assert.Equal((byte)'d', buffer[0]); + + Assert.Equal(1, await clientStream.ReadAsync(new Memory(buffer, 0, 1))); + Assert.Equal((byte)'e', buffer[0]); + + Assert.Equal(1, await Task.Factory.FromAsync(clientStream.BeginRead, clientStream.EndRead, buffer, 0, 1, null)); + Assert.Equal((byte)'f', buffer[0]); + + var ms = new MemoryStream(); + Task copyTask = clientStream.CopyToAsync(ms); + + string bigString = string.Concat(Enumerable.Repeat("abcdefghijklmnopqrstuvwxyz", 1000)); + Task lotsOfDataSent = connection.Socket.SendAsync(Encoding.ASCII.GetBytes(bigString), SocketFlags.None); + connection.Socket.Shutdown(SocketShutdown.Send); + await copyTask; + await lotsOfDataSent; + Assert.Equal("ghijklmnopqrstuvwxyz" + bigString, Encoding.ASCII.GetString(ms.ToArray())); + } + }); + } + }); + } + } + + public sealed class SocketsHttpHandler_Connect_Test : HttpClientTestBase + { + protected override bool UseSocketsHttpHandler => true; + + [Fact] + public async Task ConnectMethod_Success() + { + await LoopbackServer.CreateServerAsync(async (server, url) => + { + using (HttpClient client = CreateHttpClient()) + { + HttpRequestMessage request = new HttpRequestMessage(new HttpMethod("CONNECT"), url); + request.Headers.Host = "foo.com:345"; + + // We need to use ResponseHeadersRead here, otherwise we will hang trying to buffer the response body. + Task responseTask = client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead); + + await server.AcceptConnectionAsync(async connection => + { + // Verify that Host header exist and has same value and URI authority. + List lines = await connection.ReadRequestHeaderAsync().ConfigureAwait(false); + string authority = lines[0].Split()[1]; + foreach (string line in lines) + { + if (line.StartsWith("Host:",StringComparison.InvariantCultureIgnoreCase)) + { + Assert.Equal(line, "Host: foo.com:345"); + break; + } + } + + Task serverTask = connection.SendResponseAsync(HttpStatusCode.OK); + await TestHelper.WhenAllCompletedOrAnyFailed(responseTask, serverTask).ConfigureAwait(false); + + using (Stream clientStream = await (await responseTask).Content.ReadAsStreamAsync()) + { + Assert.True(clientStream.CanWrite); + Assert.True(clientStream.CanRead); + Assert.False(clientStream.CanSeek); + + TextReader clientReader = new StreamReader(clientStream); + TextWriter clientWriter = new StreamWriter(clientStream) { AutoFlush = true }; + TextReader serverReader = connection.Reader; + TextWriter serverWriter = connection.Writer; + + const string helloServer = "hello server"; + const string helloClient = "hello client"; + const string goodbyeServer = "goodbye server"; + const string goodbyeClient = "goodbye client"; + + clientWriter.WriteLine(helloServer); + Assert.Equal(helloServer, serverReader.ReadLine()); + serverWriter.WriteLine(helloClient); + Assert.Equal(helloClient, clientReader.ReadLine()); + clientWriter.WriteLine(goodbyeServer); + Assert.Equal(goodbyeServer, serverReader.ReadLine()); + serverWriter.WriteLine(goodbyeClient); + Assert.Equal(goodbyeClient, clientReader.ReadLine()); + } + }); + } + }); + } + + [Fact] + public async Task ConnectMethod_Fails() + { + await LoopbackServer.CreateServerAsync(async (server, url) => + { + using (HttpClient client = CreateHttpClient()) + { + HttpRequestMessage request = new HttpRequestMessage(new HttpMethod("CONNECT"), url); + request.Headers.Host = "foo.com:345"; + // We need to use ResponseHeadersRead here, otherwise we will hang trying to buffer the response body. + Task responseTask = client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead); + await server.AcceptConnectionAsync(async connection => + { + Task> serverTask = connection.ReadRequestHeaderAndSendResponseAsync(HttpStatusCode.Forbidden, content: "error"); + + await TestHelper.WhenAllCompletedOrAnyFailed(responseTask, serverTask); + HttpResponseMessage response = await responseTask; + + Assert.True(response.StatusCode == HttpStatusCode.Forbidden); + }); + } + }); + } + } + + public sealed class SocketsHttpHandler_HttpClientHandler_ConnectionPooling_Test : HttpClientTestBase + { + protected override bool UseSocketsHttpHandler => true; + + // TODO: ISSUE #27272 + // Currently the subsequent tests sometimes fail/hang with WinHttpHandler / CurlHandler. + // In theory they should pass with any handler that does appropriate connection pooling. + // We should understand why they sometimes fail there and ideally move them to be + // used by all handlers this test project tests. + + [Fact] + public async Task MultipleIterativeRequests_SameConnectionReused() + { + using (HttpClient client = CreateHttpClient()) + using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + { + listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); + listener.Listen(1); + var ep = (IPEndPoint)listener.LocalEndPoint; + var uri = new Uri($"http://{ep.Address}:{ep.Port}/"); + + string responseBody = + "HTTP/1.1 200 OK\r\n" + + $"Date: {DateTimeOffset.UtcNow:R}\r\n" + + "Content-Length: 0\r\n" + + "\r\n"; + + Task firstRequest = client.GetStringAsync(uri); + using (Socket server = await listener.AcceptAsync()) + using (var serverStream = new NetworkStream(server, ownsSocket: false)) + using (var serverReader = new StreamReader(serverStream)) + { + while (!string.IsNullOrWhiteSpace(await serverReader.ReadLineAsync())); + await server.SendAsync(new ArraySegment(Encoding.ASCII.GetBytes(responseBody)), SocketFlags.None); + await firstRequest; + + Task secondAccept = listener.AcceptAsync(); // shouldn't complete + + Task additionalRequest = client.GetStringAsync(uri); + while (!string.IsNullOrWhiteSpace(await serverReader.ReadLineAsync())); + await server.SendAsync(new ArraySegment(Encoding.ASCII.GetBytes(responseBody)), SocketFlags.None); + await additionalRequest; + + Assert.False(secondAccept.IsCompleted, $"Second accept should never complete"); + } + } + } + + [OuterLoop("Incurs a delay")] + [Fact] + public async Task ServerDisconnectsAfterInitialRequest_SubsequentRequestUsesDifferentConnection() + { + using (HttpClient client = CreateHttpClient()) + { + await LoopbackServer.CreateServerAsync(async (server, uri) => + { + // Make multiple requests iteratively. + for (int i = 0; i < 2; i++) + { + Task request = client.GetStringAsync(uri); + await server.AcceptConnectionSendResponseAndCloseAsync(); + await request; + + if (i == 0) + { + await Task.Delay(2000); // give client time to see the closing before next connect + } + } + }); + } + } + + [Fact] + public async Task ServerSendsGarbageAfterInitialRequest_SubsequentRequestUsesDifferentConnection() + { + using (HttpClient client = CreateHttpClient()) + { + await LoopbackServer.CreateServerAsync(async (server, uri) => + { + // Make multiple requests iteratively. + for (int i = 0; i < 2; i++) + { + Task request = client.GetStringAsync(uri); + string response = LoopbackServer.GetHttpResponse() + "here is a bunch of garbage"; + await server.AcceptConnectionSendCustomResponseAndCloseAsync(response); + await request; + } + }); + } + } + + [Fact] + public async Task ServerSendsConnectionClose_SubsequentRequestUsesDifferentConnection() + { + using (HttpClient client = CreateHttpClient()) + { + await LoopbackServer.CreateServerAsync(async (server, uri) => + { + string responseBody = + "HTTP/1.1 200 OK\r\n" + + $"Date: {DateTimeOffset.UtcNow:R}\r\n" + + "Content-Length: 0\r\n" + + "Connection: close\r\n" + + "\r\n"; + + // Make first request. + Task request1 = client.GetStringAsync(uri); + await server.AcceptConnectionAsync(async connection1 => + { + await connection1.ReadRequestHeaderAndSendCustomResponseAsync(responseBody); + await request1; + + // Make second request and expect it to be served from a different connection. + Task request2 = client.GetStringAsync(uri); + await server.AcceptConnectionAsync(async connection2 => + { + await connection2.ReadRequestHeaderAndSendCustomResponseAsync(responseBody); + await request2; + }); + }); + }); + } + } + + [Theory] + [InlineData("PooledConnectionLifetime")] + [InlineData("PooledConnectionIdleTimeout")] + public async Task SmallConnectionTimeout_SubsequentRequestUsesDifferentConnection(string timeoutPropertyName) + { + using (var handler = new SocketsHttpHandler()) + { + switch (timeoutPropertyName) + { + case "PooledConnectionLifetime": handler.PooledConnectionLifetime = TimeSpan.FromMilliseconds(1); break; + case "PooledConnectionIdleTimeout": handler.PooledConnectionLifetime = TimeSpan.FromMilliseconds(1); break; + default: throw new ArgumentOutOfRangeException(nameof(timeoutPropertyName)); + } + + using (HttpClient client = new HttpClient(handler)) + { + await LoopbackServer.CreateServerAsync(async (server, uri) => + { + // Make first request. + Task request1 = client.GetStringAsync(uri); + await server.AcceptConnectionAsync(async connection => + { + await connection.ReadRequestHeaderAndSendResponseAsync(); + await request1; + + // Wait a small amount of time before making the second request, to give the first request time to timeout. + await Task.Delay(100); + + // Make second request and expect it to be served from a different connection. + Task request2 = client.GetStringAsync(uri); + await server.AcceptConnectionAsync(async connection2 => + { + await connection2.ReadRequestHeaderAndSendResponseAsync(); + await request2; + }); + }); + }); + } + } + } + + [OuterLoop] + [Theory] + [InlineData(false)] + [InlineData(true)] + public void ConnectionsPooledThenDisposed_NoUnobservedTaskExceptions(bool secure) + { + RemoteInvoke(async secureString => + { + var releaseServer = new TaskCompletionSource(); + await LoopbackServer.CreateClientAndServerAsync(async uri => + { + using (var handler = new SocketsHttpHandler()) + using (var client = new HttpClient(handler)) + { + handler.SslOptions.RemoteCertificateValidationCallback = delegate { return true; }; + handler.PooledConnectionLifetime = TimeSpan.FromMilliseconds(1); + + var exceptions = new List(); + TaskScheduler.UnobservedTaskException += (s, e) => exceptions.Add(e.Exception); + + await client.GetStringAsync(uri); + await Task.Delay(10); // any value >= the lifetime + Task ignored = client.GetStringAsync(uri); // force the pool to look for the previous connection and find it's too old + await Task.Delay(100); // give some time for the connection close to fail pending reads + + GC.Collect(); + GC.WaitForPendingFinalizers(); + + // Note that there are race conditions here such that we may not catch every failure, + // and thus could have some false negatives, but there won't be any false positives. + Assert.True(exceptions.Count == 0, string.Concat(exceptions)); + + releaseServer.SetResult(true); + } + }, server => server.AcceptConnectionAsync(async connection => + { + await connection.ReadRequestHeaderAndSendResponseAsync(content: "hello world"); + await releaseServer.Task; + }), + new LoopbackServer.Options { UseSsl = bool.Parse(secureString) }); + return SuccessExitCode; + }, secure.ToString()).Dispose(); + } + } + + public sealed class SocketsHttpHandler_PublicAPIBehavior_Test + { + private static async Task IssueRequestAsync(HttpMessageHandler handler) + { + using (var c = new HttpMessageInvoker(handler, disposeHandler: false)) + await Assert.ThrowsAnyAsync(() => + c.SendAsync(new HttpRequestMessage(HttpMethod.Get, new Uri("/shouldquicklyfail", UriKind.Relative)), default)); + } + + [Fact] + public void AllowAutoRedirect_GetSet_Roundtrips() + { + using (var handler = new SocketsHttpHandler()) + { + Assert.True(handler.AllowAutoRedirect); + + handler.AllowAutoRedirect = true; + Assert.True(handler.AllowAutoRedirect); + + handler.AllowAutoRedirect = false; + Assert.False(handler.AllowAutoRedirect); + } + } + + [Fact] + public void AutomaticDecompression_GetSet_Roundtrips() + { + using (var handler = new SocketsHttpHandler()) + { + Assert.Equal(DecompressionMethods.None, handler.AutomaticDecompression); + + handler.AutomaticDecompression = DecompressionMethods.GZip; + Assert.Equal(DecompressionMethods.GZip, handler.AutomaticDecompression); + + handler.AutomaticDecompression = DecompressionMethods.Deflate; + Assert.Equal(DecompressionMethods.Deflate, handler.AutomaticDecompression); + + handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate; + Assert.Equal(DecompressionMethods.GZip | DecompressionMethods.Deflate, handler.AutomaticDecompression); + } + } + + [Fact] + public void CookieContainer_GetSet_Roundtrips() + { + using (var handler = new SocketsHttpHandler()) + { + CookieContainer container = handler.CookieContainer; + Assert.Same(container, handler.CookieContainer); + + var newContainer = new CookieContainer(); + handler.CookieContainer = newContainer; + Assert.Same(newContainer, handler.CookieContainer); + } + } + + [Fact] + public void Credentials_GetSet_Roundtrips() + { + using (var handler = new SocketsHttpHandler()) + { + Assert.Null(handler.Credentials); + + var newCredentials = new NetworkCredential("username", "password"); + handler.Credentials = newCredentials; + Assert.Same(newCredentials, handler.Credentials); + } + } + + [Fact] + public void DefaultProxyCredentials_GetSet_Roundtrips() + { + using (var handler = new SocketsHttpHandler()) + { + Assert.Null(handler.DefaultProxyCredentials); + + var newCredentials = new NetworkCredential("username", "password"); + handler.DefaultProxyCredentials = newCredentials; + Assert.Same(newCredentials, handler.DefaultProxyCredentials); + } + } + + [Fact] + public void MaxAutomaticRedirections_GetSet_Roundtrips() + { + using (var handler = new SocketsHttpHandler()) + { + Assert.Equal(50, handler.MaxAutomaticRedirections); + + handler.MaxAutomaticRedirections = int.MaxValue; + Assert.Equal(int.MaxValue, handler.MaxAutomaticRedirections); + + handler.MaxAutomaticRedirections = 1; + Assert.Equal(1, handler.MaxAutomaticRedirections); + + AssertExtensions.Throws("value", () => handler.MaxAutomaticRedirections = 0); + AssertExtensions.Throws("value", () => handler.MaxAutomaticRedirections = -1); + } + } + + [Fact] + public void MaxConnectionsPerServer_GetSet_Roundtrips() + { + using (var handler = new SocketsHttpHandler()) + { + Assert.Equal(int.MaxValue, handler.MaxConnectionsPerServer); + + handler.MaxConnectionsPerServer = int.MaxValue; + Assert.Equal(int.MaxValue, handler.MaxConnectionsPerServer); + + handler.MaxConnectionsPerServer = 1; + Assert.Equal(1, handler.MaxConnectionsPerServer); + + AssertExtensions.Throws("value", () => handler.MaxConnectionsPerServer = 0); + AssertExtensions.Throws("value", () => handler.MaxConnectionsPerServer = -1); + } + } + + [Fact] + public void MaxResponseHeadersLength_GetSet_Roundtrips() + { + using (var handler = new SocketsHttpHandler()) + { + Assert.Equal(64, handler.MaxResponseHeadersLength); + + handler.MaxResponseHeadersLength = int.MaxValue; + Assert.Equal(int.MaxValue, handler.MaxResponseHeadersLength); + + handler.MaxResponseHeadersLength = 1; + Assert.Equal(1, handler.MaxResponseHeadersLength); + + AssertExtensions.Throws("value", () => handler.MaxResponseHeadersLength = 0); + AssertExtensions.Throws("value", () => handler.MaxResponseHeadersLength = -1); + } + } + + [Fact] + public void PreAuthenticate_GetSet_Roundtrips() + { + using (var handler = new SocketsHttpHandler()) + { + Assert.False(handler.PreAuthenticate); + + handler.PreAuthenticate = false; + Assert.False(handler.PreAuthenticate); + + handler.PreAuthenticate = true; + Assert.True(handler.PreAuthenticate); + } + } + + [Fact] + public void PooledConnectionIdleTimeout_GetSet_Roundtrips() + { + using (var handler = new SocketsHttpHandler()) + { + Assert.Equal(TimeSpan.FromMinutes(2), handler.PooledConnectionIdleTimeout); + + handler.PooledConnectionIdleTimeout = Timeout.InfiniteTimeSpan; + Assert.Equal(Timeout.InfiniteTimeSpan, handler.PooledConnectionIdleTimeout); + + handler.PooledConnectionIdleTimeout = TimeSpan.FromSeconds(0); + Assert.Equal(TimeSpan.FromSeconds(0), handler.PooledConnectionIdleTimeout); + + handler.PooledConnectionIdleTimeout = TimeSpan.FromSeconds(1); + Assert.Equal(TimeSpan.FromSeconds(1), handler.PooledConnectionIdleTimeout); + + AssertExtensions.Throws("value", () => handler.PooledConnectionIdleTimeout = TimeSpan.FromSeconds(-2)); + } + } + + [Fact] + public void PooledConnectionLifetime_GetSet_Roundtrips() + { + using (var handler = new SocketsHttpHandler()) + { + Assert.Equal(Timeout.InfiniteTimeSpan, handler.PooledConnectionLifetime); + + handler.PooledConnectionLifetime = Timeout.InfiniteTimeSpan; + Assert.Equal(Timeout.InfiniteTimeSpan, handler.PooledConnectionLifetime); + + handler.PooledConnectionLifetime = TimeSpan.FromSeconds(0); + Assert.Equal(TimeSpan.FromSeconds(0), handler.PooledConnectionLifetime); + + handler.PooledConnectionLifetime = TimeSpan.FromSeconds(1); + Assert.Equal(TimeSpan.FromSeconds(1), handler.PooledConnectionLifetime); + + AssertExtensions.Throws("value", () => handler.PooledConnectionLifetime = TimeSpan.FromSeconds(-2)); + } + } + + [Fact] + public void Properties_Roundtrips() + { + using (var handler = new SocketsHttpHandler()) + { + IDictionary props = handler.Properties; + Assert.NotNull(props); + Assert.Empty(props); + + props.Add("hello", "world"); + Assert.Equal(1, props.Count); + Assert.Equal("world", props["hello"]); + } + } + + [Fact] + public void Proxy_GetSet_Roundtrips() + { + using (var handler = new SocketsHttpHandler()) + { + Assert.Null(handler.Proxy); + + var proxy = new WebProxy(); + handler.Proxy = proxy; + Assert.Same(proxy, handler.Proxy); + } + } + + [Fact] + public void SslOptions_GetSet_Roundtrips() + { + using (var handler = new SocketsHttpHandler()) + { + SslClientAuthenticationOptions options = handler.SslOptions; + Assert.NotNull(options); + + Assert.True(options.AllowRenegotiation); + Assert.Null(options.ApplicationProtocols); + Assert.Equal(X509RevocationMode.NoCheck, options.CertificateRevocationCheckMode); + Assert.Null(options.ClientCertificates); + Assert.Equal(SslProtocols.None, options.EnabledSslProtocols); + Assert.Equal(EncryptionPolicy.RequireEncryption, options.EncryptionPolicy); + Assert.Null(options.LocalCertificateSelectionCallback); + Assert.Null(options.RemoteCertificateValidationCallback); + Assert.Null(options.TargetHost); + + Assert.Same(options, handler.SslOptions); + + var newOptions = new SslClientAuthenticationOptions(); + handler.SslOptions = newOptions; + Assert.Same(newOptions, handler.SslOptions); + } + } + + [Fact] + public void UseCookies_GetSet_Roundtrips() + { + using (var handler = new SocketsHttpHandler()) + { + Assert.True(handler.UseCookies); + + handler.UseCookies = true; + Assert.True(handler.UseCookies); + + handler.UseCookies = false; + Assert.False(handler.UseCookies); + } + } + + [Fact] + public void UseProxy_GetSet_Roundtrips() + { + using (var handler = new SocketsHttpHandler()) + { + Assert.True(handler.UseProxy); + + handler.UseProxy = false; + Assert.False(handler.UseProxy); + + handler.UseProxy = true; + Assert.True(handler.UseProxy); + } + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task AfterDisposeSendAsync_GettersUsable_SettersThrow(bool dispose) + { + using (var handler = new SocketsHttpHandler()) + { + Type expectedExceptionType; + if (dispose) + { + handler.Dispose(); + expectedExceptionType = typeof(ObjectDisposedException); + } + else + { + await IssueRequestAsync(handler); + expectedExceptionType = typeof(InvalidOperationException); + } + + Assert.True(handler.AllowAutoRedirect); + Assert.Equal(DecompressionMethods.None, handler.AutomaticDecompression); + Assert.NotNull(handler.CookieContainer); + Assert.Null(handler.Credentials); + Assert.Null(handler.DefaultProxyCredentials); + Assert.Equal(50, handler.MaxAutomaticRedirections); + Assert.Equal(int.MaxValue, handler.MaxConnectionsPerServer); + Assert.Equal(64, handler.MaxResponseHeadersLength); + Assert.False(handler.PreAuthenticate); + Assert.Equal(TimeSpan.FromMinutes(2), handler.PooledConnectionIdleTimeout); + Assert.Equal(Timeout.InfiniteTimeSpan, handler.PooledConnectionLifetime); + Assert.NotNull(handler.Properties); + Assert.Null(handler.Proxy); + Assert.NotNull(handler.SslOptions); + Assert.True(handler.UseCookies); + Assert.True(handler.UseProxy); + + Assert.Throws(expectedExceptionType, () => handler.AllowAutoRedirect = false); + Assert.Throws(expectedExceptionType, () => handler.AutomaticDecompression = DecompressionMethods.GZip); + Assert.Throws(expectedExceptionType, () => handler.CookieContainer = new CookieContainer()); + Assert.Throws(expectedExceptionType, () => handler.Credentials = new NetworkCredential("anotheruser", "anotherpassword")); + Assert.Throws(expectedExceptionType, () => handler.DefaultProxyCredentials = new NetworkCredential("anotheruser", "anotherpassword")); + Assert.Throws(expectedExceptionType, () => handler.MaxAutomaticRedirections = 2); + Assert.Throws(expectedExceptionType, () => handler.MaxConnectionsPerServer = 2); + Assert.Throws(expectedExceptionType, () => handler.MaxResponseHeadersLength = 2); + Assert.Throws(expectedExceptionType, () => handler.PreAuthenticate = false); + Assert.Throws(expectedExceptionType, () => handler.PooledConnectionIdleTimeout = TimeSpan.FromSeconds(2)); + Assert.Throws(expectedExceptionType, () => handler.PooledConnectionLifetime = TimeSpan.FromSeconds(2)); + Assert.Throws(expectedExceptionType, () => handler.Proxy = new WebProxy()); + Assert.Throws(expectedExceptionType, () => handler.SslOptions = new SslClientAuthenticationOptions()); + Assert.Throws(expectedExceptionType, () => handler.UseCookies = false); + Assert.Throws(expectedExceptionType, () => handler.UseProxy = false); + } + } + } + + public sealed class SocketsHttpHandler_ExternalConfiguration_Test : HttpClientTestBase + { + private const string EnvironmentVariableSettingName = "DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER"; + private const string AppContextSettingName = "System.Net.Http.UseSocketsHttpHandler"; + + private static bool UseSocketsHttpHandlerEnvironmentVariableIsNotSet => + string.IsNullOrEmpty(Environment.GetEnvironmentVariable(EnvironmentVariableSettingName)); + + [ConditionalTheory(nameof(UseSocketsHttpHandlerEnvironmentVariableIsNotSet))] + [InlineData("true", true)] + [InlineData("TRUE", true)] + [InlineData("tRuE", true)] + [InlineData("1", true)] + [InlineData("0", false)] + [InlineData("false", false)] + [InlineData("helloworld", true)] + [InlineData("", true)] + public void HttpClientHandler_SettingEnvironmentVariableChangesDefault(string envVarValue, bool expectedUseSocketsHandler) + { + RemoteInvoke((innerEnvVarValue, innerExpectedUseSocketsHandler) => + { + Environment.SetEnvironmentVariable(EnvironmentVariableSettingName, innerEnvVarValue); + using (var handler = new HttpClientHandler()) + { + Assert.Equal(bool.Parse(innerExpectedUseSocketsHandler), IsSocketsHttpHandler(handler)); + } + return SuccessExitCode; + }, envVarValue, expectedUseSocketsHandler.ToString()).Dispose(); + } + + [Fact] + public void HttpClientHandler_SettingAppContextChangesDefault() + { + RemoteInvoke(() => + { + AppContext.SetSwitch(AppContextSettingName, isEnabled: true); + using (var handler = new HttpClientHandler()) + { + Assert.True(IsSocketsHttpHandler(handler)); + } + + AppContext.SetSwitch(AppContextSettingName, isEnabled: false); + using (var handler = new HttpClientHandler()) + { + Assert.False(IsSocketsHttpHandler(handler)); + } + + return SuccessExitCode; + }).Dispose(); + } + + [Fact] + public void HttpClientHandler_AppContextOverridesEnvironmentVariable() + { + RemoteInvoke(() => + { + Environment.SetEnvironmentVariable(EnvironmentVariableSettingName, "true"); + using (var handler = new HttpClientHandler()) + { + Assert.True(IsSocketsHttpHandler(handler)); + } + + AppContext.SetSwitch(AppContextSettingName, isEnabled: false); + using (var handler = new HttpClientHandler()) + { + Assert.False(IsSocketsHttpHandler(handler)); + } + + AppContext.SetSwitch(AppContextSettingName, isEnabled: true); + Environment.SetEnvironmentVariable(EnvironmentVariableSettingName, null); + using (var handler = new HttpClientHandler()) + { + Assert.True(IsSocketsHttpHandler(handler)); + } + + return SuccessExitCode; + }).Dispose(); + } + } +} diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/StreamContentTest.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/StreamContentTest.cs index d512edbcc5..239154d856 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/StreamContentTest.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/StreamContentTest.cs @@ -32,6 +32,12 @@ namespace System.Net.Http.Functional.Tests Assert.Throws(() => new StreamContent(new MemoryStream(), 0)); } + [Fact] + public void Ctor_NullStreamAndZeroBufferSize_ThrowsArgumentNullException() + { + Assert.Throws(() => new StreamContent(null, 0)); + } + [Fact] public void ContentLength_SetStreamSupportingSeeking_StreamLengthMatchesHeaderValue() { diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/external/corefx/src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj index 08a2a2a241..b81d55947a 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj @@ -18,8 +18,14 @@ - - Common\System\Buffers\NativeOwnedMemory.cs + + Common\Interop\Unix\System.Net.Http.Native\Interop.VersionInfo.cs + + + Common\Interop\Unix\System.Net.Http.Native\Interop.VersionInfo.cs + + + Common\System\Buffers\NativeMemoryManager.cs Common\System\Diagnostics\Tracing\TestEventListener.cs @@ -63,19 +69,25 @@ Common\System\Net\Http\LoopbackServer.cs + + Common\System\Net\Http\LoopbackServer.AuthenticationHelpers.cs + Common\System\Threading\Tasks\TaskTimeoutExtensions.cs - + + + + @@ -89,9 +101,13 @@ + + + + @@ -99,6 +115,7 @@ + @@ -110,11 +127,12 @@ - - + + + @@ -140,5 +158,13 @@ + + + SelectedSitesTest.txt + + + + + - + \ No newline at end of file diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/TestHelper.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/TestHelper.cs index 0f7820f093..9bf6f216d1 100644 --- a/external/corefx/src/System.Net.Http/tests/FunctionalTests/TestHelper.cs +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/TestHelper.cs @@ -3,17 +3,20 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; +using System.Linq; +using System.Net.NetworkInformation; +using System.Net.Security; using System.Security.Cryptography; +using System.Security.Cryptography.X509Certificates; using System.Text; -using System.Threading; using System.Threading.Tasks; using Xunit; namespace System.Net.Http.Functional.Tests { - // TODO (#5525): This class will eventually be moved to Common once the HttpTestServers are finalized. public static class TestHelper { + public static int PassingTestTimeoutMilliseconds => 60 * 1000; public static bool JsonMessageContainsKeyValue(string message, string key, string value) { // TODO (#5525): Align with the rest of tests w.r.t response parsing once the test server is finalized. @@ -83,29 +86,26 @@ namespace System.Net.Http.Functional.Tests public static Task WhenAllCompletedOrAnyFailed(params Task[] tasks) { - var tcs = new TaskCompletionSource(); - - int remaining = tasks.Length; - foreach (var task in tasks) - { - task.ContinueWith(t => - { - if (t.IsFaulted) - { - tcs.SetException(t.Exception.InnerExceptions); - } - else if (t.IsCanceled) - { - tcs.SetCanceled(); - } - else if (Interlocked.Decrement(ref remaining) == 0) - { - tcs.SetResult(true); - } - }, CancellationToken.None, TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default); - } - - return tcs.Task; + return TaskTimeoutExtensions.WhenAllOrAnyFailed(tasks); } + + public static Task WhenAllCompletedOrAnyFailedWithTimeout(int timeoutInMilliseconds, params Task[] tasks) + { + return TaskTimeoutExtensions.WhenAllOrAnyFailed(tasks, timeoutInMilliseconds); + } + +#if netcoreapp + public static Func AllowAllCertificates = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator; +#else + public static Func AllowAllCertificates = (_, __, ___, ____) => true; +#endif + + public static IPAddress GetIPv6LinkLocalAddress() => + NetworkInterface + .GetAllNetworkInterfaces() + .SelectMany(i => i.GetIPProperties().UnicastAddresses) + .Select(a => a.Address) + .Where(a => a.IsIPv6LinkLocal) + .FirstOrDefault(); } } diff --git a/external/corefx/src/System.Runtime.Intrinsics/ref/Configurations.props b/external/corefx/src/System.Net.Http/tests/Performance/Configurations.props similarity index 100% rename from external/corefx/src/System.Runtime.Intrinsics/ref/Configurations.props rename to external/corefx/src/System.Net.Http/tests/Performance/Configurations.props diff --git a/external/corefx/src/System.Net.Http/tests/Performance/Perf.SocketsHttpHandler.cs b/external/corefx/src/System.Net.Http/tests/Performance/Perf.SocketsHttpHandler.cs new file mode 100644 index 0000000000..19b46c87c6 --- /dev/null +++ b/external/corefx/src/System.Net.Http/tests/Performance/Perf.SocketsHttpHandler.cs @@ -0,0 +1,122 @@ +// 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.Collections.Generic; +using System.IO; +using System.Linq; +using System.Net.Security; +using System.Net.Sockets; +using System.Security.Authentication; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Xunit.Performance; +using Xunit; + +namespace System.Net.Http.Tests +{ + public sealed class SocketsHttpHandlerPerfTest + { + const int InnerIterationCount = 1000; + + public static IEnumerable Get_MemberData() => + from ssl in new[] { false, true } + from connectionPerRequest in new[] { false, true } + from chunkedResponse in new[] { false, true } + from responseLength in new[] { 1, 100_000 } + select new object[] { ssl, connectionPerRequest, chunkedResponse, responseLength }; + + [Benchmark(InnerIterationCount = InnerIterationCount)] + [MemberData(nameof(Get_MemberData))] + public async Task Get(bool ssl, bool connectionPerRequest, bool chunkedResponse, int responseLength) + { + using (var serverCert = System.Net.Test.Common.Configuration.Certificates.GetServerCertificate()) + using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + { + #region Server + listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); + listener.Listen(int.MaxValue); + string responseText = + "HTTP/1.1 200 OK\r\n" + (connectionPerRequest ? "Connection: close\r\n" : "") + (chunkedResponse ? + $"Transfer-Encoding: chunked\r\n\r\n{responseLength.ToString("X")}\r\n{new string('a', responseLength)}\r\n0\r\n\r\n" : + $"Content-Length: {responseLength}\r\n\r\n{new string('a', responseLength)}"); + ReadOnlyMemory responseBytes = Encoding.UTF8.GetBytes(responseText); + + Task serverTask = Task.Run(async () => + { + try + { + while (true) + { + using (Socket s = await listener.AcceptAsync()) + { + try + { + Stream stream = new NetworkStream(s); + if (ssl) + { + var sslStream = new SslStream(stream, false, delegate { return true; }); + await sslStream.AuthenticateAsServerAsync(serverCert, false, SslProtocols.None, false); + stream = sslStream; + } + + using (var reader = new StreamReader(stream, Encoding.ASCII, detectEncodingFromByteOrderMarks: false, bufferSize: 100)) + { + while (true) + { + while (!string.IsNullOrEmpty(await reader.ReadLineAsync())); + await stream.WriteAsync(responseBytes); + if (connectionPerRequest) + { + break; + } + } + } + } + catch (SocketException e) when (e.SocketErrorCode == SocketError.ConnectionAborted) { } + } + } + } + catch { } + }); + #endregion + + var ep = (IPEndPoint)listener.LocalEndPoint; + var uri = new Uri($"http{(ssl?"s":"")}://{ep.Address}:{ep.Port}/"); + using (var handler = new SocketsHttpHandler()) + using (var invoker = new HttpMessageInvoker(handler)) + { + if (ssl) + { + handler.SslOptions.RemoteCertificateValidationCallback = delegate { return true; }; + } + + var req = new HttpRequestMessage(HttpMethod.Get, uri); + if (connectionPerRequest) + { + req.Headers.ConnectionClose = true; + } + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < InnerIterationCount; i++) + { + using (HttpResponseMessage resp = await invoker.SendAsync(req, CancellationToken.None)) + using (Stream respStream = await resp.Content.ReadAsStreamAsync()) + { + await respStream.CopyToAsync(Stream.Null); + } + } + } + } + } + + listener.Dispose(); + await serverTask; + } + } + } +} diff --git a/external/corefx/src/System.Net.Http/tests/Performance/System.Net.Http.Performance.Tests.csproj b/external/corefx/src/System.Net.Http/tests/Performance/System.Net.Http.Performance.Tests.csproj new file mode 100644 index 0000000000..d2948218ea --- /dev/null +++ b/external/corefx/src/System.Net.Http/tests/Performance/System.Net.Http.Performance.Tests.csproj @@ -0,0 +1,33 @@ + + + + + true + {981FC867-9071-444D-9388-BC5826609F76} + + + + + + + + Common\System\PerfUtils.cs + + + Common\System\Net\Configuration.Certificates.cs + + + + + {69e46a6f-9966-45a5-8945-2559fe337827} + PerfRunner + + + + + + + + + + \ No newline at end of file diff --git a/external/corefx/src/System.Net.Http/tests/UnitTests/DigestAuthenticationTests.cs b/external/corefx/src/System.Net.Http/tests/UnitTests/DigestAuthenticationTests.cs index 6758686447..f339ba78e4 100644 --- a/external/corefx/src/System.Net.Http/tests/UnitTests/DigestAuthenticationTests.cs +++ b/external/corefx/src/System.Net.Http/tests/UnitTests/DigestAuthenticationTests.cs @@ -12,6 +12,7 @@ namespace System.Net.Http.Tests { private static readonly List s_keyListWithCountTwo = new List { "key1", "key2" }; private static readonly List s_valueListWithCountTwo = new List { "value1", "value2" }; + private static readonly List s_listWithCountOne = new List { "item1" }; private static readonly List s_emptyStringList = new List(); [Theory] @@ -30,8 +31,8 @@ namespace System.Net.Http.Tests yield return new object[] { "key1=value1,key2=value2", s_keyListWithCountTwo, s_valueListWithCountTwo }; yield return new object[] { "\tkey1===value1,key2 \t===\tvalue2", s_keyListWithCountTwo, s_valueListWithCountTwo }; yield return new object[] { " key1 = value1, key2 = value2,", s_keyListWithCountTwo, s_valueListWithCountTwo }; - yield return new object[] { "key1 === value1,key2=, value2", s_keyListWithCountTwo, new List { "value1", string.Empty } }; - yield return new object[] { "key1,==value1,,, key2=\"value2\", key3 m", new List { "key1,", "key2" }, s_valueListWithCountTwo }; + yield return new object[] { "item1 === item1,key2=, value2", s_listWithCountOne, s_listWithCountOne }; + yield return new object[] { "item1,==item1,,, key2=\"value2\", key3 m", new List { "item1," }, s_listWithCountOne }; yield return new object[] { "key1= \"value1 \",key2 = \"v alu#e2\" ,", s_keyListWithCountTwo, new List { "value1 ", "v alu#e2"} }; yield return new object[] { "key1 ", s_emptyStringList, s_emptyStringList }; yield return new object[] { "=====", s_emptyStringList, s_emptyStringList }; @@ -40,5 +41,20 @@ namespace System.Net.Http.Tests yield return new object[] { "=value1,key2=,", s_emptyStringList, s_emptyStringList }; yield return new object[] { "key1\tm= value1", s_emptyStringList, s_emptyStringList }; } + + [Theory] + [InlineData("realm=\"NetCore\", nonce=\"qMRqWgAAAAAQMjIABgAAAFwEiEwAAAAA\", qop=\"auth\", stale=false", true)] + [InlineData("realm=\"NetCore\", nonce=\"qMRqWgAAAAAQMjIABgAAAFwEiEwAAAAA\"", true)] + [InlineData("nonce=\"qMRqWgAAAAAQMjIABgAAAFwEiEwAAAAA\", qop=\"auth\", stale=false", false)] + [InlineData("realm=\"NetCore\", qop=\"auth\", stale=false", false)] + public async void DigestResponse_AuthToken_Handling(string response, bool expectedResult) + { + NetworkCredential credential = new NetworkCredential("foo","bar"); + AuthenticationHelper.DigestResponse digestResponse = new AuthenticationHelper.DigestResponse(response); + HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, "http://microsoft.com/"); + string parameter = await AuthenticationHelper.GetDigestTokenForCredential(credential, request, digestResponse).ConfigureAwait(false); + + Assert.Equal(expectedResult, parameter != null); + } } } diff --git a/external/corefx/src/System.Net.Http/tests/UnitTests/HttpEnvironmentProxyTest.cs b/external/corefx/src/System.Net.Http/tests/UnitTests/HttpEnvironmentProxyTest.cs new file mode 100644 index 0000000000..7f7b8a8317 --- /dev/null +++ b/external/corefx/src/System.Net.Http/tests/UnitTests/HttpEnvironmentProxyTest.cs @@ -0,0 +1,208 @@ +// 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.Collections.Generic; +using System.Net.Http; +using Xunit; +using Xunit.Abstractions; +using System.Diagnostics; + +namespace System.Net.Http.Tests +{ + public class HttpEnvironmentProxyTest : RemoteExecutorTestBase + { + private readonly ITestOutputHelper _output; + private static readonly Uri fooHttp = new Uri("http://foo.com"); + private static readonly Uri fooHttps = new Uri("https://foo.com"); + + // This will clean specific environmental variables + // to be sure they do not interfere with the test. + private void CleanEnv() + { + List vars = new List() { "http_proxy", "HTTPS_PROXY", "https_proxy", + "all_proxy", "ALL_PROXY", + "NO_PROXY" }; + foreach (string v in vars) + { + Environment.SetEnvironmentVariable(v, null); + } + } + + public HttpEnvironmentProxyTest(ITestOutputHelper output) + { + _output = output; + CleanEnv(); + } + + [Fact] + public void HttpProxy_EnvironmentProxy_Loaded() + { + RemoteInvoke(() => + { + + IWebProxy p; + Uri u; + + // It should not return object if there are no variables set. + Assert.False(HttpEnvironmentProxy.TryCreate(out p)); + + Environment.SetEnvironmentVariable("all_proxy", "http://1.1.1.1:3000"); + Assert.True(HttpEnvironmentProxy.TryCreate(out p)); + Assert.NotNull(p); + Assert.Null(p.Credentials); + + u = p.GetProxy(fooHttp); + Assert.True(u != null && u.Host == "1.1.1.1"); + u = p.GetProxy(fooHttps); + Assert.True(u != null && u.Host == "1.1.1.1"); + + Environment.SetEnvironmentVariable("http_proxy", "http://1.1.1.2:3001"); + Assert.True(HttpEnvironmentProxy.TryCreate(out p)); + Assert.NotNull(p); + + // Protocol specific variables should take precedence over all_ + // and https should still use all_proxy. + u = p.GetProxy(fooHttp); + Assert.True(u != null && u.Host == "1.1.1.2" && u.Port == 3001); + u = p.GetProxy(fooHttps); + Assert.True(u != null && u.Host == "1.1.1.1" && u.Port == 3000); + + // Set https to invalid strings and use only IP & port for http. + Environment.SetEnvironmentVariable("http_proxy", "1.1.1.3:3003"); + Environment.SetEnvironmentVariable("https_proxy", "ab!cd"); + Assert.True(HttpEnvironmentProxy.TryCreate(out p)); + Assert.NotNull(p); + + u = p.GetProxy(fooHttp); + Assert.True(u != null && u.Host == "1.1.1.3" && u.Port == 3003); + u = p.GetProxy(fooHttps); + Assert.True(u != null && u.Host == "1.1.1.1" && u.Port == 3000); + + // Try valid URI with unsupported protocol. It will be ignored + // to mimic curl behavior. + Environment.SetEnvironmentVariable("https_proxy", "socks5://1.1.1.4:3004"); + Assert.True(HttpEnvironmentProxy.TryCreate(out p)); + Assert.NotNull(p); + u = p.GetProxy(fooHttps); + Assert.True(u != null && u.Host == "1.1.1.1" && u.Port == 3000); + + // Set https to valid URI but different from http. + Environment.SetEnvironmentVariable("https_proxy", "http://1.1.1.5:3005"); + Assert.True(HttpEnvironmentProxy.TryCreate(out p)); + Assert.NotNull(p); + + u = p.GetProxy(fooHttp); + Assert.True(u != null && u.Host == "1.1.1.3" && u.Port == 3003); + u = p.GetProxy(fooHttps); + Assert.True(u != null && u.Host == "1.1.1.5" && u.Port == 3005); + + return SuccessExitCode; + }).Dispose(); + } + + [Theory] + [InlineData("1.1.1.5", "1.1.1.5", "80", null, null)] + [InlineData("http://1.1.1.5:3005", "1.1.1.5", "3005", null, null)] + [InlineData("http://foo@1.1.1.5", "1.1.1.5", "80", "foo", "")] + [InlineData("http://[::1]:80", "[::1]", "80", null, null)] + [InlineData("foo:bar@[::1]:3128", "[::1]", "3128", "foo", "bar")] + [InlineData("foo:Pass$!#\\.$@127.0.0.1:3128", "127.0.0.1", "3128", "foo", "Pass$!#\\.$")] + [InlineData("[::1]", "[::1]", "80", null, null)] + [InlineData("domain\\foo:bar@1.1.1.1", "1.1.1.1", "80", "foo", "bar")] + [InlineData("domain%5Cfoo:bar@1.1.1.1", "1.1.1.1", "80", "foo", "bar")] + [InlineData("HTTP://ABC.COM/", "abc.com", "80", null, null)] + public void HttpProxy_Uri_Parsing(string _input, string _host, string _port, string _user , string _password) + { + RemoteInvoke((input, host, port, user, password) => + { + // Remote exec does not allow to pass null at this moment. + if (user == "null") + { + user = null; + } + if (password == "null") + { + password = null; + } + + Environment.SetEnvironmentVariable("all_proxy", input); + IWebProxy p; + Uri u; + + Assert.True(HttpEnvironmentProxy.TryCreate(out p)); + Assert.NotNull(p); + + u = p.GetProxy(fooHttp); + Assert.Equal(host, u.Host); + Assert.Equal(Convert.ToInt32(port), u.Port); + + if (user != null) + { + NetworkCredential nc = p.Credentials.GetCredential(u, "Basic"); + Assert.NotNull(nc); + Assert.Equal(user, nc.UserName); + Assert.Equal(password, nc.Password); + } + + return SuccessExitCode; + }, _input, _host, _port, _user ?? "null" , _password ?? "null").Dispose(); + } + + [Fact] + public void HttpProxy_CredentialParsing_Basic() + { + RemoteInvoke(() => + { + IWebProxy p; + + Environment.SetEnvironmentVariable("all_proxy", "http://foo:bar@1.1.1.1:3000"); + Assert.True(HttpEnvironmentProxy.TryCreate(out p)); + Assert.NotNull(p); + Assert.NotNull(p.Credentials); + + // Use user only without password. + Environment.SetEnvironmentVariable("all_proxy", "http://foo@1.1.1.1:3000"); + Assert.True(HttpEnvironmentProxy.TryCreate(out p)); + Assert.NotNull(p); + Assert.NotNull(p.Credentials); + + // Use different user for http and https + Environment.SetEnvironmentVariable("https_proxy", "http://foo1:bar1@1.1.1.1:3000"); + Assert.True(HttpEnvironmentProxy.TryCreate(out p)); + Assert.NotNull(p); + Uri u = p.GetProxy(fooHttp); + Assert.NotNull(p.Credentials.GetCredential(u, "Basic")); + u = p.GetProxy(fooHttps); + Assert.NotNull(p.Credentials.GetCredential(u, "Basic")); + // This should not match Proxy Uri + Assert.Null(p.Credentials.GetCredential(fooHttp, "Basic")); + Assert.Null(p.Credentials.GetCredential(null, null)); + + return SuccessExitCode; + }).Dispose(); + } + + [Fact] + public void HttpProxy_Exceptions_Match() + { + RemoteInvoke(() => + { + IWebProxy p; + + Environment.SetEnvironmentVariable("no_proxy", ".test.com,, foo.com"); + Environment.SetEnvironmentVariable("all_proxy", "http://foo:bar@1.1.1.1:3000"); + Assert.True(HttpEnvironmentProxy.TryCreate(out p)); + Assert.NotNull(p); + + Assert.True(p.IsBypassed(fooHttp)); + Assert.True(p.IsBypassed(fooHttps)); + Assert.True(p.IsBypassed(new Uri("http://test.com"))); + Assert.False(p.IsBypassed(new Uri("http://1test.com"))); + Assert.True(p.IsBypassed(new Uri("http://www.test.com"))); + + return SuccessExitCode; + }).Dispose(); + } + } +} diff --git a/external/corefx/src/System.Net.Http/tests/UnitTests/HttpSystemProxyTest.cs b/external/corefx/src/System.Net.Http/tests/UnitTests/HttpSystemProxyTest.cs new file mode 100644 index 0000000000..756eae36c1 --- /dev/null +++ b/external/corefx/src/System.Net.Http/tests/UnitTests/HttpSystemProxyTest.cs @@ -0,0 +1,171 @@ +// 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.Collections.Generic; +using System.Net.Http; +using Xunit; +using Xunit.Abstractions; +using System.Diagnostics; +using System.Net.Http.WinHttpHandlerUnitTests; + +namespace System.Net.Http.Tests +{ + public class HttpSystemProxyTest : RemoteExecutorTestBase + { + private readonly ITestOutputHelper _output; + private const string FakeProxyString = "http://proxy.contoso.com"; + private const string insecureProxyUri = "http://proxy.insecure.com"; + private const string secureProxyUri = "http://proxy.secure.com"; + private const string fooHttp = "http://foo.com"; + private const string fooHttps = "https://foo.com"; + private const string fooWs = "ws://foo.com"; + private const string fooWss = "wss://foo.com"; + + public HttpSystemProxyTest(ITestOutputHelper output) + { + _output = output; + } + + [Theory] + [InlineData("http://proxy.insecure.com", true, false)] + [InlineData("http=proxy.insecure.com", true, false)] + [InlineData("http://proxy.insecure.com http://proxy.wrong.com", true, false)] + [InlineData("https=proxy.secure.com http=proxy.insecure.com", true, true)] + [InlineData("https://proxy.secure.com\nhttp://proxy.insecure.com", true, true)] + [InlineData("https=proxy.secure.com\nhttp=proxy.insecure.com", true, true)] + [InlineData("https://proxy.secure.com;http://proxy.insecure.com", true, true)] + [InlineData("https=proxy.secure.com;http=proxy.insecure.com", true, true)] + [InlineData(";http=proxy.insecure.com;;", true, false)] + [InlineData(" http=proxy.insecure.com ", true, false)] + [InlineData("http=proxy.insecure.com;http=proxy.wrong.com", true, false)] + [InlineData("http=http://proxy.insecure.com", true, false)] + [InlineData("https=https://proxy.secure.com", false, true)] + public void HttpProxy_SystemProxy_Loaded(string rawProxyString, bool hasInsecureProxy, bool hasSecureProxy) + { + RemoteInvoke((proxyString, insecureProxy, secureProxy) => + { + IWebProxy p; + + FakeRegistry.Reset(); + Assert.False(HttpSystemProxy.TryCreate(out p)); + + FakeRegistry.WinInetProxySettings.Proxy = proxyString; + WinInetProxyHelper proxyHelper = new WinInetProxyHelper(); + + Assert.True(HttpSystemProxy.TryCreate(out p)); + Assert.NotNull(p); + + Assert.Equal(Boolean.Parse(insecureProxy) ? new Uri(insecureProxyUri) : null, p.GetProxy(new Uri(fooHttp))); + Assert.Equal(Boolean.Parse(secureProxy) ? new Uri(secureProxyUri) : null, p.GetProxy(new Uri(fooHttps))); + Assert.Equal(Boolean.Parse(insecureProxy) ? new Uri(insecureProxyUri) : null, p.GetProxy(new Uri(fooWs))); + Assert.Equal(Boolean.Parse(secureProxy) ? new Uri(secureProxyUri) : null, p.GetProxy(new Uri(fooWss))); + return SuccessExitCode; + }, rawProxyString, hasInsecureProxy.ToString(), hasSecureProxy.ToString()).Dispose(); + } + + [Theory] + [InlineData("http://localhost/", true)] + [InlineData("http://127.0.0.1/", true)] + [InlineData("http://128.0.0.1/", false)] + [InlineData("http://[::1]/", true)] + [InlineData("http://foo/", true)] + [InlineData("http://www.foo.com/", true)] + [InlineData("http://WWW.FOO.COM/", true)] + [InlineData("http://foo.com/", false)] + [InlineData("http://bar.com/", true)] + [InlineData("http://BAR.COM/", true)] + [InlineData("http://162.1.1.1/", true)] + [InlineData("http://[2a01:5b40:0:248::52]/", false)] + [InlineData("http://[2002::11]/", true)] + [InlineData("http://[2607:f8b0:4005:80a::200e]/", true)] + [InlineData("http://[2607:f8B0:4005:80A::200E]/", true)] + [InlineData("http://b\u00e9b\u00e9.eu/", true)] + [InlineData("http://www.b\u00e9b\u00e9.eu/", true)] + public void HttpProxy_Local_Bypassed(string name, bool shouldBypass) + { + RemoteInvoke((url, expected) => + { + bool expectedResult = Boolean.Parse(expected); + IWebProxy p; + + FakeRegistry.Reset(); + FakeRegistry.WinInetProxySettings.Proxy = insecureProxyUri; + FakeRegistry.WinInetProxySettings.ProxyBypass = "23.23.86.44;*.foo.com;;BAR.COM; ; 162*;[2002::11];[*:f8b0:4005:80a::200e]; http://www.xn--mnchhausen-9db.at;http://*.xn--bb-bjab.eu;http://xn--bb-bjab.eu;"; + + Assert.True(HttpSystemProxy.TryCreate(out p)); + Assert.NotNull(p); + + Uri u = new Uri(url); + Assert.Equal(expectedResult, p.GetProxy(u) == null); + + return SuccessExitCode; + }, name, shouldBypass.ToString()).Dispose(); + } + + [Theory] + [InlineData("", 0)] + [InlineData(" ", 0)] + [InlineData(" ; ; ", 0)] + [InlineData("http://127.0.0.1/", 1)] + [InlineData("[::]", 1)] + public void HttpProxy_Local_Parsing(string bypass, int count) + { + RemoteInvoke((bypassValue, expected) => + { + int expectedCount = Convert.ToInt32(expected); + IWebProxy p; + + FakeRegistry.Reset(); + FakeRegistry.WinInetProxySettings.Proxy = insecureProxyUri; + FakeRegistry.WinInetProxySettings.ProxyBypass = bypassValue; + + Assert.True(HttpSystemProxy.TryCreate(out p)); + Assert.NotNull(p); + + HttpSystemProxy sp = p as HttpSystemProxy; + Assert.NotNull(sp); + + if (expectedCount > 0) + { + Assert.Equal(expectedCount, sp.BypassList.Count); + } + else + { + Assert.Null(sp.BypassList); + } + return SuccessExitCode; + }, bypass, count.ToString()).Dispose(); + } + + [Theory] + [InlineData("http://")] + [InlineData("http=")] + [InlineData("http://;")] + [InlineData("http=;")] + [InlineData(" ; ")] + [InlineData("proxy.contoso.com")] + public void HttpProxy_InvalidSystemProxy_Null(string rawProxyString) + { + RemoteInvoke((proxyString) => + { + IWebProxy p; + + FakeRegistry.Reset(); + Assert.False(HttpSystemProxy.TryCreate(out p)); + + FakeRegistry.WinInetProxySettings.Proxy = proxyString; + WinInetProxyHelper proxyHelper = new WinInetProxyHelper(); + + Assert.True(HttpSystemProxy.TryCreate(out p)); + Assert.NotNull(p); + + Assert.Equal(null, p.GetProxy(new Uri(fooHttp))); + Assert.Equal(null, p.GetProxy(new Uri(fooHttps))); + Assert.Equal(null, p.GetProxy(new Uri(fooWs))); + Assert.Equal(null, p.GetProxy(new Uri(fooWss))); + return SuccessExitCode; + }, rawProxyString).Dispose(); + } + } +} diff --git a/external/corefx/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj b/external/corefx/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj index fc3a641c44..468260bb61 100644 --- a/external/corefx/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj +++ b/external/corefx/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj @@ -27,8 +27,8 @@ ProductionCode\Common\System\StringExtensions.cs - - ProductionCode\Common\System\IO\StringBuilderCache.cs + + ProductionCode\Common\System\Text\StringBuilderCache.cs ProductionCode\Common\System\IO\StreamHelpers.CopyValidation.cs @@ -84,8 +84,8 @@ ProductionCode\Common\System\Threading\Tasks\TaskToApm.cs - - ProductionCode\System\Net\Http\Managed\AuthenticationHelper.Digest.cs + + ProductionCode\System\Net\Http\SocketsHttpHandler\AuthenticationHelper.Digest.cs ProductionCode\System\Net\Http\ByteArrayContent.cs @@ -297,9 +297,12 @@ ProductionCode\System\Net\Http\StringContent.cs - + ProductionCode\System\Net\Http\CurlResponseHeaderReader.cs + + ProductionCode\System\Net\Http\SocketsHttpHandler\HttpEnvironmentProxy.cs + ProductionCode\System\Net\Http\HttpHandlerDefaults.cs @@ -362,11 +365,76 @@ + + + + + + + ProductionCode\System\Net\Http\HttpSystemProxy.cs + + + ProductionCode\System\Net\Http\WinHttpException.cs + + + ProductionCode\System\Net\Http\WinInetProxyHelper.cs + + + ProductionCode\System\Net\Http\WinInetProxyHelper.cs + + + Common\Interop\Windows\Interop.Libraries.cs + + + Common\Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore.cs + + + Common\Interop\Windows\Crypt32\Interop.certificates_types.cs + + + Common\Interop\Windows\Interop.HRESULT_FROM_WIN32.cs + + + Common\Interop\Windows\winhttp\Interop.SafeWinHttpHandle.cs + + + Common\System\Runtime\ExceptionServices\ExceptionStackTrace.cs + + + Common\Interop\Windows\winhttp\Interop.winhttp_types.cs + + + ProductionCode\System\Net\Http\WinInetProxyHelper.cs + + + ProductionCode\System\Net\Http\WinInetProxyHelper.cs + + + ProductionCode\System\Net\Http\WinInetProxyHelper.cs + + + ProductionCode\System\Net\Http\WinInetProxyHelper.cs + + + ProductionCode\System\Net\Http\WinInetProxyHelper.cs + + + ProductionCode\System\Net\Http\WinInetProxyHelper.cs + Common\System\SerializableAttribute.cs + + + {69e46a6f-9966-45a5-8945-2559fe337827} + RemoteExecutorConsoleApp + + + + + - \ No newline at end of file + diff --git a/external/corefx/src/System.Net.HttpListener/src/System.Net.HttpListener.csproj b/external/corefx/src/System.Net.HttpListener/src/System.Net.HttpListener.csproj index 010e032b2e..5c614e043b 100644 --- a/external/corefx/src/System.Net.HttpListener/src/System.Net.HttpListener.csproj +++ b/external/corefx/src/System.Net.HttpListener/src/System.Net.HttpListener.csproj @@ -227,9 +227,6 @@ Common\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs - - Common\System\Net\IntPtrHelper.cs - Common\System\Collections\Generic\BidirectionalDictionary.cs @@ -368,4 +365,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/System.Net.HttpListener/src/System/Net/Managed/HttpListenerResponse.Managed.cs b/external/corefx/src/System.Net.HttpListener/src/System/Net/Managed/HttpListenerResponse.Managed.cs index 4825b54efa..4e7063d8a4 100644 --- a/external/corefx/src/System.Net.HttpListener/src/System/Net/Managed/HttpListenerResponse.Managed.cs +++ b/external/corefx/src/System.Net.HttpListener/src/System/Net/Managed/HttpListenerResponse.Managed.cs @@ -315,7 +315,15 @@ namespace System.Net { if (anyValues) { - sb.Append(", "); + if (key.Equals(HttpKnownHeaderNames.SetCookie, StringComparison.OrdinalIgnoreCase) || + key.Equals(HttpKnownHeaderNames.SetCookie2, StringComparison.OrdinalIgnoreCase)) + { + sb.Append("\r\n").Append(key).Append(": "); + } + else + { + sb.Append(", "); + } } sb.Append(value); anyValues = true; diff --git a/external/corefx/src/System.Net.HttpListener/src/System/Net/Managed/WebSockets/HttpWebSocket.Managed.cs b/external/corefx/src/System.Net.HttpListener/src/System/Net/Managed/WebSockets/HttpWebSocket.Managed.cs index d7c9ea6e58..f169e85717 100644 --- a/external/corefx/src/System.Net.HttpListener/src/System/Net/Managed/WebSockets/HttpWebSocket.Managed.cs +++ b/external/corefx/src/System.Net.HttpListener/src/System/Net/Managed/WebSockets/HttpWebSocket.Managed.cs @@ -58,12 +58,7 @@ namespace System.Net.WebSockets // Send websocket handshake headers await responseStream.WriteWebSocketHandshakeHeadersAsync().ConfigureAwait(false); - const int MinBufferSize = 14; // from ManagedWebSocket.MaxMessageHeaderLength - Memory buffer = - internalBuffer.GetValueOrDefault().Count >= MinBufferSize ? internalBuffer.GetValueOrDefault() : // use provided buffer if it's big enough - receiveBufferSize >= MinBufferSize ? new byte[receiveBufferSize] : // or use provided size if it's big enough - Memory.Empty; // or use the default - WebSocket webSocket = WebSocket.CreateFromStream(context.Connection.ConnectedStream, isServer:true, subProtocol, keepAliveInterval, buffer); + WebSocket webSocket = WebSocket.CreateFromStream(context.Connection.ConnectedStream, isServer:true, subProtocol, keepAliveInterval); HttpListenerWebSocketContext webSocketContext = new HttpListenerWebSocketContext( request.Url, diff --git a/external/corefx/src/System.Net.HttpListener/src/System/Net/ServiceNameStore.cs b/external/corefx/src/System.Net.HttpListener/src/System/Net/ServiceNameStore.cs index fedc94bbe8..0459834bb9 100644 --- a/external/corefx/src/System.Net.HttpListener/src/System/Net/ServiceNameStore.cs +++ b/external/corefx/src/System.Net.HttpListener/src/System/Net/ServiceNameStore.cs @@ -297,11 +297,11 @@ namespace System.Net } catch (System.Net.Sockets.SocketException) { - return new string[0]; + return Array.Empty(); } catch (System.Security.SecurityException) { - return new string[0]; + return Array.Empty(); } } else if (!hostname.Contains(".")) diff --git a/external/corefx/src/System.Net.HttpListener/src/System/Net/Windows/HttpListener.Windows.cs b/external/corefx/src/System.Net.HttpListener/src/System/Net/Windows/HttpListener.Windows.cs index 019af2ea01..237af6f8a2 100644 --- a/external/corefx/src/System.Net.HttpListener/src/System/Net/Windows/HttpListener.Windows.cs +++ b/external/corefx/src/System.Net.HttpListener/src/System/Net/Windows/HttpListener.Windows.cs @@ -23,10 +23,6 @@ namespace System.Net { public static bool IsSupported => Interop.HttpApi.s_supported; - private static readonly Type s_channelBindingStatusType = typeof(Interop.HttpApi.HTTP_REQUEST_CHANNEL_BIND_STATUS); - private static readonly int s_requestChannelBindStatusSize = - Marshal.SizeOf(typeof(Interop.HttpApi.HTTP_REQUEST_CHANNEL_BIND_STATUS)); - // Windows 8 fixed a bug in Http.sys's HttpReceiveClientCertificate method. // Without this fix IOCP callbacks were not being called although ERROR_IO_PENDING was // returned from HttpReceiveClientCertificate when using the @@ -851,7 +847,7 @@ namespace System.Net NetEventSource.Info(this, $"authenticationScheme: {authenticationScheme}"); } SendError(requestId, HttpStatusCode.InternalServerError, null); - httpContext.Close(); + FreeContext(ref httpContext, memoryBlob); return null; } } @@ -935,9 +931,7 @@ namespace System.Net } httpError = HttpStatusCode.Unauthorized; - httpContext.Request.DetachBlob(memoryBlob); - httpContext.Close(); - httpContext = null; + FreeContext(ref httpContext, memoryBlob); } else { @@ -1010,7 +1004,10 @@ namespace System.Net if (decodedOutgoingBlob != null) { - outBlob = Convert.ToBase64String(decodedOutgoingBlob); + // Prefix SPNEGO token/NTLM challenge with scheme per RFC 4559, MS-NTHT + outBlob = string.Format("{0} {1}", + headerScheme == AuthenticationSchemes.Ntlm ? NegotiationInfoClass.NTLM : NegotiationInfoClass.Negotiate, + Convert.ToBase64String(decodedOutgoingBlob)); } if (!error) @@ -1101,12 +1098,9 @@ namespace System.Net { // auth incomplete newContext = context; - - challenge = (headerScheme == AuthenticationSchemes.Ntlm ? NegotiationInfoClass.NTLM : NegotiationInfoClass.Negotiate); - if (!String.IsNullOrEmpty(outBlob)) - { - challenge += " " + outBlob; - } + challenge = string.IsNullOrEmpty(outBlob) + ? headerScheme == AuthenticationSchemes.Ntlm ? NegotiationInfoClass.NTLM : NegotiationInfoClass.Negotiate + : outBlob; } } break; @@ -1161,9 +1155,7 @@ namespace System.Net NetEventSource.Info(this, "Handshake has failed."); } - httpContext.Request.DetachBlob(memoryBlob); - httpContext.Close(); - httpContext = null; + FreeContext(ref httpContext, memoryBlob); } } @@ -1240,8 +1232,7 @@ namespace System.Net if (NetEventSource.IsEnabled) NetEventSource.Info(this, "connectionId:" + connectionId + " because of failed HttpWaitForDisconnect"); SendError(requestId, HttpStatusCode.InternalServerError, null); - httpContext.Request.DetachBlob(memoryBlob); - httpContext.Close(); + FreeContext(ref httpContext, memoryBlob); return null; } } @@ -1282,11 +1273,7 @@ namespace System.Net } catch { - if (httpContext != null) - { - httpContext.Request.DetachBlob(memoryBlob); - httpContext.Close(); - } + FreeContext(ref httpContext, memoryBlob); if (newContext != null) { if (newContext == context) @@ -1341,6 +1328,16 @@ namespace System.Net } } } + + private static void FreeContext(ref HttpListenerContext httpContext, RequestContextBase memoryBlob) + { + if (httpContext != null) + { + httpContext.Request.DetachBlob(memoryBlob); + httpContext.Close(); + httpContext = null; + } + } // Using the configured Auth schemes, populate the auth challenge headers. This is for scenarios where // Anonymous access is allowed for some resources, but the server later determines that authorization @@ -1779,16 +1776,16 @@ namespace System.Net private static unsafe int GetTokenOffsetFromBlob(IntPtr blob) { Debug.Assert(blob != IntPtr.Zero); - IntPtr tokenPointer = Marshal.ReadIntPtr((IntPtr)blob, (int)Marshal.OffsetOf(s_channelBindingStatusType, "ChannelToken")); + IntPtr tokenPointer = ((Interop.HttpApi.HTTP_REQUEST_CHANNEL_BIND_STATUS*)blob)->ChannelToken; Debug.Assert(tokenPointer != IntPtr.Zero); - return (int)((long)tokenPointer - (long)blob); + return (int)((byte*)tokenPointer - (byte*)blob); } private static unsafe int GetTokenSizeFromBlob(IntPtr blob) { Debug.Assert(blob != IntPtr.Zero); - return Marshal.ReadInt32(blob, (int)Marshal.OffsetOf(s_channelBindingStatusType, "ChannelTokenSize")); + return (int)((Interop.HttpApi.HTTP_REQUEST_CHANNEL_BIND_STATUS*)blob)->ChannelTokenSize; } internal ChannelBinding GetChannelBindingFromTls(ulong connectionId) @@ -1797,7 +1794,7 @@ namespace System.Net // +128 since a CBT is usually <128 thus we need to call HRCC just once. If the CBT // is >128 we will get ERROR_MORE_DATA and call again - int size = s_requestChannelBindStatusSize + 128; + int size = sizeof(Interop.HttpApi.HTTP_REQUEST_CHANNEL_BIND_STATUS) + 128; Debug.Assert(size > 0); @@ -1841,7 +1838,7 @@ namespace System.Net int tokenSize = GetTokenSizeFromBlob((IntPtr)blobPtr); Debug.Assert(tokenSize < Int32.MaxValue); - size = s_requestChannelBindStatusSize + tokenSize; + size = sizeof(Interop.HttpApi.HTTP_REQUEST_CHANNEL_BIND_STATUS) + tokenSize; } else if (statusCode == Interop.HttpApi.ERROR_INVALID_PARAMETER) { diff --git a/external/corefx/src/System.Net.HttpListener/src/System/Net/Windows/WebSockets/WebSocketBuffer.cs b/external/corefx/src/System.Net.HttpListener/src/System/Net/Windows/WebSockets/WebSocketBuffer.cs index 02547dcafb..f96532d57b 100644 --- a/external/corefx/src/System.Net.HttpListener/src/System/Net/Windows/WebSockets/WebSocketBuffer.cs +++ b/external/corefx/src/System.Net.HttpListener/src/System/Net/Windows/WebSockets/WebSocketBuffer.cs @@ -39,7 +39,7 @@ namespace System.Net.WebSockets private readonly ArraySegment _propertyBuffer; private readonly int _sendBufferSize; private volatile int _payloadOffset; - private volatile WebSocketReceiveResult _bufferedPayloadReceiveResult; + private volatile PayloadReceiveResult _bufferedPayloadReceiveResult; private long _pinnedSendBufferStartAddress; private long _pinnedSendBufferEndAddress; private ArraySegment _pinnedSendBuffer; @@ -305,7 +305,7 @@ namespace System.Net.WebSockets Debug.Assert(_payloadOffset == 0, "'m_PayloadOffset' MUST be '0' at this point."); Debug.Assert(_bufferedPayloadReceiveResult == null || _bufferedPayloadReceiveResult.Count == 0, - "'m_BufferedPayloadReceiveResult.Count' MUST be '0' at this point."); + "'_bufferedPayloadReceiveResult.Count' MUST be '0' at this point."); Buffer.BlockCopy(payload.Array, payload.Offset + unconsumedDataOffset, @@ -314,7 +314,7 @@ namespace System.Net.WebSockets bytesBuffered); _bufferedPayloadReceiveResult = - new WebSocketReceiveResult(bytesBuffered, messageType, endOfMessage); + new PayloadReceiveResult(bytesBuffered, messageType, endOfMessage); this.ValidateBufferedPayload(); } @@ -326,12 +326,12 @@ namespace System.Net.WebSockets int bytesTransferred = Math.Min(buffer.Count, _bufferedPayloadReceiveResult.Count); + _bufferedPayloadReceiveResult.Count -= bytesTransferred; + receiveResult = new WebSocketReceiveResult( bytesTransferred, _bufferedPayloadReceiveResult.MessageType, - bytesTransferred == 0 && _bufferedPayloadReceiveResult.EndOfMessage, - _bufferedPayloadReceiveResult.CloseStatus, - _bufferedPayloadReceiveResult.CloseStatusDescription); + _bufferedPayloadReceiveResult.Count == 0 && _bufferedPayloadReceiveResult.EndOfMessage); Buffer.BlockCopy(_payloadBuffer.Array, _payloadBuffer.Offset + _payloadOffset, @@ -558,9 +558,9 @@ namespace System.Net.WebSockets private void ValidateBufferedPayload() { Debug.Assert(_bufferedPayloadReceiveResult != null, - "'m_BufferedPayloadReceiveResult' MUST NOT be NULL."); + "'_bufferedPayloadReceiveResult' MUST NOT be NULL."); Debug.Assert(_bufferedPayloadReceiveResult.Count >= 0, - "'m_BufferedPayloadReceiveResult.Count' MUST NOT be negative."); + "'_bufferedPayloadReceiveResult.Count' MUST NOT be negative."); Debug.Assert(_payloadOffset >= 0, "'m_PayloadOffset' MUST NOT be smaller than 0."); Debug.Assert(_payloadOffset <= _payloadBuffer.Count, "'m_PayloadOffset' MUST NOT be bigger than 'm_PayloadBuffer.Count'."); @@ -685,5 +685,24 @@ namespace System.Net.WebSockets public const int None = 0; public const int SendPayloadSpecified = 1; } + + private class PayloadReceiveResult + { + public int Count { get; set; } + public bool EndOfMessage { get; } + public WebSocketMessageType MessageType { get; } + + public PayloadReceiveResult(int count, WebSocketMessageType messageType, bool endOfMessage) + { + if (count < 0) + { + throw new ArgumentOutOfRangeException(nameof(count)); + } + + Count = count; + EndOfMessage = endOfMessage; + MessageType = messageType; + } + } } -} \ No newline at end of file +} diff --git a/external/corefx/src/System.Net.HttpListener/tests/HttpListenerResponseTests.Cookies.cs b/external/corefx/src/System.Net.HttpListener/tests/HttpListenerResponseTests.Cookies.cs index b52204e16e..4ea2c89d16 100644 --- a/external/corefx/src/System.Net.HttpListener/tests/HttpListenerResponseTests.Cookies.cs +++ b/external/corefx/src/System.Net.HttpListener/tests/HttpListenerResponseTests.Cookies.cs @@ -128,9 +128,9 @@ namespace System.Net.Tests response.Close(); - string clientResponse = GetClientResponse(173); - Assert.Contains($"\r\nSet-Cookie: name1=value1\r\n", clientResponse); - Assert.Contains($"\r\nSet-Cookie2: name2=value2\r\n", clientResponse); + string clientResponse = GetClientResponse(expectedLength:173); + Assert.Contains("\r\nSet-Cookie: name1=value1\r\n", clientResponse); + Assert.Contains("\r\nSet-Cookie2: name2=value2\r\n", clientResponse); } [Fact] @@ -147,9 +147,9 @@ namespace System.Net.Tests Assert.Null(response.Headers["Set-Cookie"]); Assert.Equal("name3=value3; Port=\"200\"; Version=1", response.Headers["Set-Cookie2"]); - string clientResponse = GetClientResponse(170); + string clientResponse = GetClientResponse(expectedLength:170); Assert.DoesNotContain("Set-Cookie:", clientResponse); - Assert.Contains($"\r\nSet-Cookie2: name3=value3; Port=\"200\"; Version=1\r\n", clientResponse); + Assert.Contains("\r\nSet-Cookie2: name3=value3; Port=\"200\"; Version=1\r\n", clientResponse); } [Fact] @@ -166,10 +166,28 @@ namespace System.Net.Tests Assert.Equal("name3=value3", response.Headers["Set-Cookie"]); Assert.Null(response.Headers["Set-Cookie2"]); - string clientResponse = GetClientResponse(146); - Assert.Contains($"\r\nSet-Cookie: name3=value3\r\n", clientResponse); + string clientResponse = GetClientResponse(expectedLength:146); + Assert.Contains("\r\nSet-Cookie: name3=value3\r\n", clientResponse); Assert.DoesNotContain("Set-Cookie2", clientResponse); } + + [Fact] + public async Task Cookies_AddMultipleInHeader_ClientReceivesExpectedHeaders() + { + HttpListenerResponse response = await GetResponse(); + response.Headers.Add("Set-Cookie", "name1=value1"); + response.Headers.Add("Set-Cookie", "name2=value2"); + response.Headers.Add("Set-Cookie", "name3=value3"); + response.Headers.Add("Set-Cookie", "name4=value4"); + + response.Close(); + + string clientResponse = GetClientResponse(expectedLength:224); + Assert.Contains("\r\nSet-Cookie: name1=value1\r\n", clientResponse); + Assert.Contains("\r\nSet-Cookie: name2=value2\r\n", clientResponse); + Assert.Contains("\r\nSet-Cookie: name3=value3\r\n", clientResponse); + Assert.Contains("\r\nSet-Cookie: name4=value4\r\n", clientResponse); + } [Fact] public async Task AppendCookie_ValidCookie_AddsCookieToCollection() diff --git a/external/corefx/src/System.Net.HttpListener/tests/HttpListenerWebSocketTests.cs b/external/corefx/src/System.Net.HttpListener/tests/HttpListenerWebSocketTests.cs index 4e061dd255..a0697b15cb 100644 --- a/external/corefx/src/System.Net.HttpListener/tests/HttpListenerWebSocketTests.cs +++ b/external/corefx/src/System.Net.HttpListener/tests/HttpListenerWebSocketTests.cs @@ -112,6 +112,40 @@ namespace System.Net.Tests Assert.Equal(Text, Encoding.ASCII.GetString(receivedBytes)); } + [ConditionalTheory(nameof(IsNotWindows7))] + [InlineData(300)] + [InlineData(500)] + [InlineData(1000)] + [InlineData(1300)] + public async Task ReceiveAsync_DetectEndOfMessage_Success(int bufferSize) + { + const int StringLength = 1000; + string sendString = new string('A', StringLength); + byte[] sentBytes = Encoding.ASCII.GetBytes(sendString); + + HttpListenerWebSocketContext context = await GetWebSocketContext(); + await ClientConnectTask; + + await Client.SendAsync(new ArraySegment(sentBytes), WebSocketMessageType.Text, true, new CancellationToken()); + + byte[] receivedBytes = new byte[bufferSize]; + List compoundBuffer = new List(); + + WebSocketReceiveResult result = new WebSocketReceiveResult(0, WebSocketMessageType.Close, false); + while (!result.EndOfMessage) + { + result = await (context.WebSocket).ReceiveAsync(new ArraySegment(receivedBytes), new CancellationToken()); + + byte[] readBytes = new byte[result.Count]; + Array.Copy(receivedBytes, readBytes, result.Count); + compoundBuffer.AddRange(readBytes); + } + + Assert.True(result.EndOfMessage); + string msg = Encoding.UTF8.GetString(compoundBuffer.ToArray()); + Assert.Equal(sendString, msg); + } + [ConditionalFact(nameof(IsNotWindows7))] public async Task ReceiveAsync_NoInnerBuffer_ThrowsArgumentNullException() { @@ -133,8 +167,6 @@ namespace System.Net.Tests public static IEnumerable CloseStatus_Valid_TestData() { - yield return new object[] { (WebSocketCloseStatus)(-1), "Negative", 65535 }; - yield return new object[] { WebSocketCloseStatus.Empty, null, WebSocketCloseStatus.Empty }; yield return new object[] { WebSocketCloseStatus.EndpointUnavailable, "", WebSocketCloseStatus.EndpointUnavailable }; yield return new object[] { WebSocketCloseStatus.MandatoryExtension, "StatusDescription", WebSocketCloseStatus.MandatoryExtension }; } diff --git a/external/corefx/src/System.Net.HttpListener/tests/HttpRequestStreamTests.cs b/external/corefx/src/System.Net.HttpListener/tests/HttpRequestStreamTests.cs index 80d19c33b9..4f43e91f76 100644 --- a/external/corefx/src/System.Net.HttpListener/tests/HttpRequestStreamTests.cs +++ b/external/corefx/src/System.Net.HttpListener/tests/HttpRequestStreamTests.cs @@ -10,6 +10,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using Xunit; +using Xunit.Abstractions; namespace System.Net.Tests { @@ -18,12 +19,15 @@ namespace System.Net.Tests private HttpListenerFactory _factory; private HttpListener _listener; private GetContextHelper _helper; + private const int TimeoutMilliseconds = 60*1000; + private readonly ITestOutputHelper _output; - public HttpRequestStreamTests() + public HttpRequestStreamTests(ITestOutputHelper output) { _factory = new HttpListenerFactory(); _listener = _factory.GetListener(); _helper = new GetContextHelper(_listener, _factory.ListeningUrl); + _output = output; } public void Dispose() @@ -32,6 +36,58 @@ namespace System.Net.Tests _helper.Dispose(); } + // Try to read 'length' bytes from stream or fail after timeout. + private async Task ReadLengthAsync(Stream stream, byte[] array, int offset, int length) + { + int remaining = length; + int readLength; + + do + { + readLength = await TaskTimeoutExtensions.TimeoutAfter(stream.ReadAsync(array, offset, remaining), TimeoutMilliseconds); + if (readLength <= 0) + { + break; + } + remaining -= readLength; + offset += readLength; + } + while (remaining > 0); + + if (remaining != 0) + { + _output.WriteLine("Expected {0} bytes but got {1}", length, length-remaining); + } + + return length - remaining; + } + + // Synchronous version of ReadLengthAsync above. + private int ReadLength(Stream stream, byte[] array, int offset, int length) + { + int remaining = length; + int readLength; + + do + { + readLength = stream.Read(array, offset, remaining); + if (readLength <= 0) + { + break; + } + remaining -= readLength; + offset += readLength; + } + while (remaining > 0); + + if (remaining != 0) + { + _output.WriteLine("Expected {0} bytes but got {1}", length, length-remaining); + } + + return length - remaining; + } + [Theory] [InlineData(true, "")] [InlineData(false, "")] @@ -60,7 +116,7 @@ namespace System.Net.Tests } byte[] buffer = new byte[expected.Length]; - int bytesRead = await context.Request.InputStream.ReadAsync(buffer, 0, buffer.Length); + int bytesRead = await ReadLengthAsync(context.Request.InputStream, buffer, 0, expected.Length); Assert.Equal(expected.Length, bytesRead); Assert.Equal(expected, buffer); @@ -107,7 +163,7 @@ namespace System.Net.Tests // Add padding at beginning and end to test for correct offset/size handling byte[] buffer = new byte[pad + expected.Length + pad]; - int bytesRead = await context.Request.InputStream.ReadAsync(buffer, pad, expected.Length); + int bytesRead = await ReadLengthAsync(context.Request.InputStream, buffer, pad, expected.Length); Assert.Equal(expected.Length, bytesRead); Assert.Equal(expected, buffer.Skip(pad).Take(bytesRead)); @@ -150,7 +206,7 @@ namespace System.Net.Tests } byte[] buffer = new byte[expected.Length]; - int bytesRead = context.Request.InputStream.Read(buffer, 0, buffer.Length); + int bytesRead = ReadLength(context.Request.InputStream, buffer, 0, buffer.Length); Assert.Equal(expected.Length, bytesRead); Assert.Equal(expected, buffer); @@ -263,7 +319,7 @@ namespace System.Net.Tests HttpListenerContext context = await contextTask; byte[] buffer = new byte[expected.Length + 5]; - int bytesRead = await context.Request.InputStream.ReadAsync(buffer, 0, buffer.Length); + int bytesRead = await ReadLengthAsync(context.Request.InputStream, buffer, 0, buffer.Length); Assert.Equal(expected.Length, bytesRead); Assert.Equal(expected.Concat(new byte[5]), buffer); @@ -289,7 +345,7 @@ namespace System.Net.Tests HttpListenerContext context = await contextTask; byte[] buffer = new byte[expected.Length + 5]; - int bytesRead = context.Request.InputStream.Read(buffer, 0, buffer.Length); + int bytesRead = ReadLength(context.Request.InputStream, buffer, 0, buffer.Length); Assert.Equal(expected.Length, bytesRead); Assert.Equal(expected.Concat(new byte[5]), buffer); @@ -315,7 +371,7 @@ namespace System.Net.Tests HttpListenerContext context = await contextTask; byte[] buffer = new byte[expected.Length - 5]; - int bytesRead = await context.Request.InputStream.ReadAsync(buffer, 0, buffer.Length); + int bytesRead = await ReadLengthAsync(context.Request.InputStream, buffer, 0, buffer.Length); Assert.Equal(buffer.Length, bytesRead); context.Response.Close(); diff --git a/external/corefx/src/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj b/external/corefx/src/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj index 9f7b02a8db..7c61c94e01 100644 --- a/external/corefx/src/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj +++ b/external/corefx/src/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj @@ -31,6 +31,9 @@ + + Common\System\Threading\Tasks\TaskTimeoutExtensions.cs + diff --git a/external/corefx/src/System.Net.HttpListener/tests/WebSocketTests.cs b/external/corefx/src/System.Net.HttpListener/tests/WebSocketTests.cs index 7665e2ab66..8e32b4d324 100644 --- a/external/corefx/src/System.Net.HttpListener/tests/WebSocketTests.cs +++ b/external/corefx/src/System.Net.HttpListener/tests/WebSocketTests.cs @@ -28,8 +28,7 @@ namespace System.Net.Tests { if (PlatformDetection.IsWindows7) { - // Websockets in WinHttp 5.1 is only supported from Windows 8+ - Assert.Throws(() => new ClientWebSocket()); + // Websockets is supported only from Windows 8+ return; } diff --git a/external/corefx/src/System.Net.Mail/ref/System.Net.Mime.cs b/external/corefx/src/System.Net.Mail/ref/System.Net.Mime.cs index 4066b48f9a..904d525242 100644 --- a/external/corefx/src/System.Net.Mail/ref/System.Net.Mime.cs +++ b/external/corefx/src/System.Net.Mail/ref/System.Net.Mime.cs @@ -58,6 +58,8 @@ namespace System.Net.Mime public const string Rtf = "application/rtf"; public const string Pdf = "application/pdf"; public const string Zip = "application/zip"; + public const string Json = "application/json"; + public const string Xml = "application/xml"; } public static class Image diff --git a/external/corefx/src/System.Net.Mail/src/System.Net.Mail.csproj b/external/corefx/src/System.Net.Mail/src/System.Net.Mail.csproj index 9d5a0a364e..fd32bce5b2 100644 --- a/external/corefx/src/System.Net.Mail/src/System.Net.Mail.csproj +++ b/external/corefx/src/System.Net.Mail/src/System.Net.Mail.csproj @@ -125,9 +125,6 @@ Common\System\Net\ExceptionCheck.cs - - Common\System\Net\IntPtrHelper.cs - Common\System\Collections\Generic\BidirectionalDictionary.cs @@ -317,4 +314,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/System.Net.Mail/src/System/Net/Mail/Attachment.cs b/external/corefx/src/System.Net.Mail/src/System/Net/Mail/Attachment.cs index 11bbbb1d2c..fd12570a1c 100644 --- a/external/corefx/src/System.Net.Mail/src/System/Net/Mail/Attachment.cs +++ b/external/corefx/src/System.Net.Mail/src/System/Net/Mail/Attachment.cs @@ -12,7 +12,6 @@ namespace System.Net.Mail { internal bool disposed = false; private MimePart _part = new MimePart(); - private static readonly char[] s_fileShortNameIndicators = new char[] { '\\', ':' }; private static readonly char[] s_contentCIDInvalidChars = new char[] { '<', '>' }; internal AttachmentBase() @@ -68,22 +67,6 @@ namespace System.Net.Mail } } - internal static string ShortNameFromFile(string fileName) - { - string name; - int start = fileName.LastIndexOfAny(s_fileShortNameIndicators, fileName.Length - 1, fileName.Length); - - if (start > 0) - { - name = fileName.Substring(start + 1, fileName.Length - start - 1); - } - else - { - name = fileName; - } - return name; - } - internal void SetContentFromFile(string fileName, ContentType contentType) { if (fileName == null) @@ -341,14 +324,14 @@ namespace System.Net.Mail public Attachment(string fileName) : base(fileName) { - Name = ShortNameFromFile(fileName); + Name = Path.GetFileName(fileName); MimePart.ContentDisposition = new ContentDisposition(); } public Attachment(string fileName, string mediaType) : base(fileName, mediaType) { - Name = ShortNameFromFile(fileName); + Name = Path.GetFileName(fileName); MimePart.ContentDisposition = new ContentDisposition(); } @@ -357,7 +340,7 @@ namespace System.Net.Mail { if (contentType.Name == null || contentType.Name == string.Empty) { - Name = ShortNameFromFile(fileName); + Name = Path.GetFileName(fileName); } else { diff --git a/external/corefx/src/System.Net.Mail/src/System/Net/Mime/MediaTypeNames.cs b/external/corefx/src/System.Net.Mail/src/System/Net/Mime/MediaTypeNames.cs index 09b6455122..6f62b58068 100644 --- a/external/corefx/src/System.Net.Mail/src/System/Net/Mime/MediaTypeNames.cs +++ b/external/corefx/src/System.Net.Mail/src/System/Net/Mime/MediaTypeNames.cs @@ -21,6 +21,8 @@ namespace System.Net.Mime public const string Rtf = "application/rtf"; public const string Pdf = "application/pdf"; public const string Zip = "application/zip"; + public const string Json = "application/json"; + public const string Xml = "application/xml"; } public static class Image diff --git a/external/corefx/src/System.Net.Mail/src/System/Net/Mime/SmtpDateTime.cs b/external/corefx/src/System.Net.Mail/src/System/Net/Mime/SmtpDateTime.cs index 17c431f786..73498f939b 100644 --- a/external/corefx/src/System.Net.Mail/src/System/Net/Mime/SmtpDateTime.cs +++ b/external/corefx/src/System.Net.Mail/src/System/Net/Mime/SmtpDateTime.cs @@ -230,7 +230,7 @@ namespace System.Net.Mime { if (!Char.IsLetter(value, i)) { - throw new FormatException(SR.MailHeaderFieldInvalidCharacter); + throw new FormatException(SR.Format(SR.MailHeaderFieldInvalidCharacter, value)); } } } @@ -258,7 +258,7 @@ namespace System.Net.Mime // no ':' means invalid value if (indexOfHourSeparator == -1) { - throw new FormatException(SR.MailHeaderFieldInvalidCharacter); + throw new FormatException(SR.Format(SR.MailHeaderFieldInvalidCharacter, data)); } // now we know where hours and minutes are separated. The first whitespace after @@ -269,7 +269,7 @@ namespace System.Net.Mime if (indexOfTimeZoneSeparator == -1) { - throw new FormatException(SR.MailHeaderFieldInvalidCharacter); + throw new FormatException(SR.Format(SR.MailHeaderFieldInvalidCharacter, data)); } // extract the time portion and remove all leading and trailing whitespace diff --git a/external/corefx/src/System.Net.Mail/tests/Functional/AttachmentTest.cs b/external/corefx/src/System.Net.Mail/tests/Functional/AttachmentTest.cs index fafa021f17..52ba6e6822 100644 --- a/external/corefx/src/System.Net.Mail/tests/Functional/AttachmentTest.cs +++ b/external/corefx/src/System.Net.Mail/tests/Functional/AttachmentTest.cs @@ -32,6 +32,48 @@ namespace System.Net.Mail.Tests Assert.Equal(null, attach.Name); } + [Fact] + public void ConstructorPathName() + { + using (var tempFile = TempFile.Create(new byte[0])) + { + using (Attachment attach = new Attachment(tempFile.Path)) + { + Assert.Equal(Path.GetFileName(tempFile.Path), attach.Name); + } + } + } + + [Fact] + public void ConstructorPathNameMediaType() + { + using (var tempFile = TempFile.Create(new byte[0])) + { + const string mediaType = "application/octet-stream"; + string shortName = Path.GetFileName(tempFile.Path); + using (Attachment attach = new Attachment(tempFile.Path, mediaType)) + { + Assert.Equal(shortName, attach.Name); + Assert.Equal(mediaType, attach.ContentType.MediaType); + } + } + } + + [Fact] + public void ConstructorPathNameContentType() + { + using (var tempFile = TempFile.Create(new byte[0])) + { + const string mediaType = "application/octet-stream"; + string shortName = Path.GetFileName(tempFile.Path); + using (Attachment attach = new Attachment(tempFile.Path, new Mime.ContentType(mediaType))) + { + Assert.Equal(shortName, attach.Name); + Assert.Equal(mediaType, attach.ContentType.MediaType); + } + } + } + [Fact] public void CreateAttachmentFromStringNullName() { diff --git a/external/corefx/src/System.Net.Mail/tests/Functional/SmtpClientTest.cs b/external/corefx/src/System.Net.Mail/tests/Functional/SmtpClientTest.cs index 618ebf85c7..60605123df 100644 --- a/external/corefx/src/System.Net.Mail/tests/Functional/SmtpClientTest.cs +++ b/external/corefx/src/System.Net.Mail/tests/Functional/SmtpClientTest.cs @@ -17,10 +17,9 @@ using Xunit; namespace System.Net.Mail.Tests { - public class SmtpClientTest : IDisposable + public class SmtpClientTest : FileCleanupTestBase { private SmtpClient _smtp; - private string _tempFolder; private SmtpClient Smtp { @@ -34,28 +33,17 @@ namespace System.Net.Mail.Tests { get { - if (_tempFolder == null) - { - _tempFolder = Path.Combine(Path.GetTempPath(), GetType().FullName, Guid.NewGuid().ToString()); - if (Directory.Exists(_tempFolder)) - Directory.Delete(_tempFolder, true); - - Directory.CreateDirectory(_tempFolder); - } - - return _tempFolder; + return TestDirectory; } } - public void Dispose() + protected override void Dispose(bool disposing) { if (_smtp != null) { _smtp.Dispose(); } - - if (Directory.Exists(_tempFolder)) - Directory.Delete(_tempFolder, true); + base.Dispose(disposing); } [Theory] diff --git a/external/corefx/src/System.Net.Mail/tests/Functional/SmtpExceptionTest.cs b/external/corefx/src/System.Net.Mail/tests/Functional/SmtpExceptionTest.cs index eefce6e9ed..d54f0d3699 100644 --- a/external/corefx/src/System.Net.Mail/tests/Functional/SmtpExceptionTest.cs +++ b/external/corefx/src/System.Net.Mail/tests/Functional/SmtpExceptionTest.cs @@ -12,6 +12,7 @@ using System.Collections; using System.Runtime.Serialization; using System.Runtime.Serialization.Formatters; +using System.Text.RegularExpressions; using Xunit; namespace System.Net.Mail.Tests @@ -80,7 +81,12 @@ namespace System.Net.Mail.Tests Assert.Equal(0, se.Data.Keys.Count); Assert.Null(se.InnerException); Assert.NotNull(se.Message); - Assert.NotEqual(-1, se.Message.IndexOf("'" + typeof(SmtpException).FullName + "'")); + + // \p{Pi} any kind of opening quote https://www.compart.com/en/unicode/category/Pi + // \p{Pf} any kind of closing quote https://www.compart.com/en/unicode/category/Pf + // \p{Po} any kind of punctuation character that is not a dash, bracket, quote or connector https://www.compart.com/en/unicode/category/Po + Assert.Matches(@"[\p{Pi}\p{Po}]" + Regex.Escape(typeof(SmtpException).FullName) + @"[\p{Pf}\p{Po}]", se.Message); + Assert.Equal(SmtpStatusCode.GeneralFailure, se.StatusCode); } @@ -112,7 +118,12 @@ namespace System.Net.Mail.Tests Assert.Equal(0, se.Data.Keys.Count); Assert.Null(se.InnerException); Assert.NotNull(se.Message); - Assert.NotEqual(-1, se.Message.IndexOf("'" + typeof(SmtpException).FullName + "'")); + + // \p{Pi} any kind of opening quote https://www.compart.com/en/unicode/category/Pi + // \p{Pf} any kind of closing quote https://www.compart.com/en/unicode/category/Pf + // \p{Po} any kind of punctuation character that is not a dash, bracket, quote or connector https://www.compart.com/en/unicode/category/Po + Assert.Matches(@"[\p{Pi}\p{Po}]" + Regex.Escape(typeof(SmtpException).FullName) + @"[\p{Pf}\p{Po}]", se.Message); + Assert.Equal((SmtpStatusCode)666, se.StatusCode); } diff --git a/external/corefx/src/System.Net.NameResolution/src/MatchingRefApiCompatBaseline.txt b/external/corefx/src/System.Net.NameResolution/src/MatchingRefApiCompatBaseline.txt new file mode 100644 index 0000000000..20f44b7edf --- /dev/null +++ b/external/corefx/src/System.Net.NameResolution/src/MatchingRefApiCompatBaseline.txt @@ -0,0 +1,4 @@ +Compat issues with assembly System.Net.NameResolution: +TypesMustExist : Type 'System.Net.Internals.ProtocolFamily' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.Net.Internals.ProtocolType' does not exist in the implementation but it does exist in the contract. +Total Issues: 2 diff --git a/external/corefx/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj b/external/corefx/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj index ef34f9675b..ccf01dc053 100644 --- a/external/corefx/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj +++ b/external/corefx/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj @@ -5,6 +5,7 @@ System.Net.NameResolution {1714448C-211E-48C1-8B7E-4EE667D336A1} true + true @@ -46,15 +47,18 @@ Common\System\Net\IPEndPointStatics.cs + + Common\System\Net\ByteOrder.cs + + + + Common\System\Net\ContextAwareResult.Windows.cs - - Common\System\Net\IntPtrHelper.cs - Common\System\Net\DebugSafeHandle.cs @@ -72,6 +76,9 @@ Common\System\Net\SocketProtocolSupportPal.Windows + + Common\System\Net\SocketAddressPal.Windows + Interop\Windows\Interop.Libraries.cs @@ -87,13 +94,7 @@ Interop\Windows\Winsock\Interop.closesocket.cs - - - Interop\Windows\Winsock\Interop.gethostbyaddr.cs - - - Interop\Windows\Winsock\Interop.gethostbyname.cs - + Interop\Windows\Winsock\Interop.gethostname.cs @@ -118,12 +119,27 @@ Interop\Windows\Winsock\SafeFreeAddrInfo.cs + + Interop\Windows\Winsock\AddressInfoEx.cs + + + Interop\Windows\Winsock\Interop.GetAddrInfoExW.cs + + + Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs + + + Interop\Windows\Kernel32\Interop.GetProcAddress.cs + + + Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs + + + Interop\Windows\Kernel32\Interop.FreeLibrary.cs + - - Common\System\Net\Internals\ByteOrder.cs - Common\System\Net\ContextAwareResult.Unix.cs @@ -189,6 +205,7 @@ + diff --git a/external/corefx/src/System.Net.NameResolution/src/System/Net/DNS.cs b/external/corefx/src/System.Net.NameResolution/src/System/Net/DNS.cs index a51ca67828..fff6712946 100644 --- a/external/corefx/src/System.Net.NameResolution/src/System/Net/DNS.cs +++ b/external/corefx/src/System.Net.NameResolution/src/System/Net/DNS.cs @@ -38,52 +38,31 @@ namespace System.Net { return NameResolutionUtilities.GetUnresolvedAnswer(address); } - return InternalGetHostByName(hostName, false); + return InternalGetHostByName(hostName); } - private static IPHostEntry InternalGetHostByName(string hostName, bool includeIPv6) + private static void ValidateHostName(string hostName) { - if (NetEventSource.IsEnabled) NetEventSource.Enter(null, hostName); - IPHostEntry ipHostEntry = null; - if (hostName.Length > MaxHostName // If 255 chars, the last one must be a dot. || hostName.Length == MaxHostName && hostName[MaxHostName - 1] != '.') { throw new ArgumentOutOfRangeException(nameof(hostName), SR.Format(SR.net_toolong, nameof(hostName), MaxHostName.ToString(NumberFormatInfo.CurrentInfo))); } + } - // - // IPv6 Changes: IPv6 requires the use of getaddrinfo() rather - // than the traditional IPv4 gethostbyaddr() / gethostbyname(). - // getaddrinfo() is also protocol independent in that it will also - // resolve IPv4 names / addresses. As a result, it is the preferred - // resolution mechanism on platforms that support it (Windows 5.1+). - // If getaddrinfo() is unsupported, IPv6 resolution does not work. - // - // Consider : If IPv6 is disabled, we could detect IPv6 addresses - // and throw an unsupported platform exception. - // - // Note : Whilst getaddrinfo is available on WinXP+, we only - // use it if IPv6 is enabled (platform is part of that - // decision). This is done to minimize the number of - // possible tests that are needed. - // - if (includeIPv6 || SocketProtocolSupportPal.OSSupportsIPv6) + private static IPHostEntry InternalGetHostByName(string hostName) + { + if (NetEventSource.IsEnabled) NetEventSource.Enter(null, hostName); + IPHostEntry ipHostEntry = null; + + ValidateHostName(hostName); + + int nativeErrorCode; + SocketError errorCode = NameResolutionPal.TryGetAddrInfo(hostName, out ipHostEntry, out nativeErrorCode); + if (errorCode != SocketError.Success) { - // - // IPv6 enabled: use getaddrinfo() to obtain DNS information. - // - int nativeErrorCode; - SocketError errorCode = NameResolutionPal.TryGetAddrInfo(hostName, out ipHostEntry, out nativeErrorCode); - if (errorCode != SocketError.Success) - { - throw SocketExceptionFactory.CreateSocketException(errorCode, nativeErrorCode); - } - } - else - { - ipHostEntry = NameResolutionPal.GetHostByName(hostName); + throw SocketExceptionFactory.CreateSocketException(errorCode, nativeErrorCode); } if (NetEventSource.IsEnabled) NetEventSource.Exit(null, ipHostEntry); @@ -101,7 +80,7 @@ namespace System.Net throw new ArgumentNullException(nameof(address)); } - IPHostEntry ipHostEntry = InternalGetHostByAddress(IPAddress.Parse(address), false); + IPHostEntry ipHostEntry = InternalGetHostByAddress(IPAddress.Parse(address)); if (NetEventSource.IsEnabled) NetEventSource.Exit(null, ipHostEntry); return ipHostEntry; @@ -118,79 +97,51 @@ namespace System.Net throw new ArgumentNullException(nameof(address)); } - IPHostEntry ipHostEntry = InternalGetHostByAddress(address, false); + IPHostEntry ipHostEntry = InternalGetHostByAddress(address); if (NetEventSource.IsEnabled) NetEventSource.Exit(null, ipHostEntry); return ipHostEntry; } // GetHostByAddress // Does internal IPAddress reverse and then forward lookups (for Legacy and current public methods). - private static IPHostEntry InternalGetHostByAddress(IPAddress address, bool includeIPv6) + private static IPHostEntry InternalGetHostByAddress(IPAddress address) { if (NetEventSource.IsEnabled) NetEventSource.Info(null, address); - - // - // IPv6 Changes: We need to use the new getnameinfo / getaddrinfo functions - // for resolution of IPv6 addresses. - // - if (SocketProtocolSupportPal.OSSupportsIPv6 || includeIPv6) + // + // Try to get the data for the host from it's address + // + // We need to call getnameinfo first, because getaddrinfo w/ the ipaddress string + // will only return that address and not the full list. + + // Do a reverse lookup to get the host name. + SocketError errorCode; + int nativeErrorCode; + string name = NameResolutionPal.TryGetNameInfo(address, out errorCode, out nativeErrorCode); + if (errorCode == SocketError.Success) { - // - // Try to get the data for the host from it's address - // - // We need to call getnameinfo first, because getaddrinfo w/ the ipaddress string - // will only return that address and not the full list. - - // Do a reverse lookup to get the host name. - SocketError errorCode; - int nativeErrorCode; - string name = NameResolutionPal.TryGetNameInfo(address, out errorCode, out nativeErrorCode); + // Do the forward lookup to get the IPs for that host name + IPHostEntry hostEntry; + errorCode = NameResolutionPal.TryGetAddrInfo(name, out hostEntry, out nativeErrorCode); if (errorCode == SocketError.Success) { - // Do the forward lookup to get the IPs for that host name - IPHostEntry hostEntry; - errorCode = NameResolutionPal.TryGetAddrInfo(name, out hostEntry, out nativeErrorCode); - if (errorCode == SocketError.Success) - { - return hostEntry; - } - - if (NetEventSource.IsEnabled) NetEventSource.Error(null, SocketExceptionFactory.CreateSocketException(errorCode, nativeErrorCode)); - - // One of two things happened: - // 1. There was a ptr record in dns, but not a corollary A/AAA record. - // 2. The IP was a local (non-loopback) IP that resolved to a connection specific dns suffix. - // - Workaround, Check "Use this connection's dns suffix in dns registration" on that network - // adapter's advanced dns settings. - - // Just return the resolved host name and no IPs. return hostEntry; } - throw SocketExceptionFactory.CreateSocketException(errorCode, nativeErrorCode); + if (NetEventSource.IsEnabled) NetEventSource.Error(null, SocketExceptionFactory.CreateSocketException(errorCode, nativeErrorCode)); + + // One of two things happened: + // 1. There was a ptr record in dns, but not a corollary A/AAA record. + // 2. The IP was a local (non-loopback) IP that resolved to a connection specific dns suffix. + // - Workaround, Check "Use this connection's dns suffix in dns registration" on that network + // adapter's advanced dns settings. + + // Just return the resolved host name and no IPs. + return hostEntry; } - // - // If IPv6 is not enabled (maybe config switch) but we've been - // given an IPv6 address then we need to bail out now. - // - else - { - if (address.AddressFamily == AddressFamily.InterNetworkV6) - { - // - // Protocol not supported - // - throw new SocketException((int)SocketError.ProtocolNotSupported); - } - // - // Use gethostbyaddr() to try to resolve the IP address - // - // End IPv6 Changes - // - return NameResolutionPal.GetHostByAddr(address); - } + throw SocketExceptionFactory.CreateSocketException(errorCode, nativeErrorCode); + } // InternalGetHostByAddress /***************************************************************************** @@ -235,7 +186,7 @@ namespace System.Net { try { - ipHostEntry = InternalGetHostByAddress(address, false); + ipHostEntry = InternalGetHostByAddress(address); } catch (SocketException ex) { @@ -245,49 +196,26 @@ namespace System.Net } else { - ipHostEntry = InternalGetHostByName(hostName, false); + ipHostEntry = InternalGetHostByName(hostName); } if (NetEventSource.IsEnabled) NetEventSource.Exit(null, ipHostEntry); return ipHostEntry; } - private class ResolveAsyncResult : ContextAwareResult - { - // Forward lookup - internal ResolveAsyncResult(string hostName, object myObject, bool includeIPv6, object myState, AsyncCallback myCallBack) : - base(myObject, myState, myCallBack) - { - this.hostName = hostName; - this.includeIPv6 = includeIPv6; - } - - // Reverse lookup - internal ResolveAsyncResult(IPAddress address, object myObject, bool includeIPv6, object myState, AsyncCallback myCallBack) : - base(myObject, myState, myCallBack) - { - this.includeIPv6 = includeIPv6; - this.address = address; - } - - internal readonly string hostName; - internal bool includeIPv6; - internal IPAddress address; - } - private static void ResolveCallback(object context) { - ResolveAsyncResult result = (ResolveAsyncResult)context; + DnsResolveAsyncResult result = (DnsResolveAsyncResult)context; IPHostEntry hostEntry; try { - if (result.address != null) + if (result.IpAddress != null) { - hostEntry = InternalGetHostByAddress(result.address, result.includeIPv6); + hostEntry = InternalGetHostByAddress(result.IpAddress); } else { - hostEntry = InternalGetHostByName(result.hostName, result.includeIPv6); + hostEntry = InternalGetHostByName(result.HostName); } } catch (OutOfMemoryException) @@ -305,7 +233,7 @@ namespace System.Net // Helpers for async GetHostByName, ResolveToAddresses, and Resolve - they're almost identical // If hostName is an IPString and justReturnParsedIP==true then no reverse lookup will be attempted, but the original address is returned. - private static IAsyncResult HostResolutionBeginHelper(string hostName, bool justReturnParsedIp, bool includeIPv6, bool throwOnIIPAny, AsyncCallback requestCallback, object state) + private static IAsyncResult HostResolutionBeginHelper(string hostName, bool justReturnParsedIp, bool throwOnIIPAny, AsyncCallback requestCallback, object state) { if (hostName == null) { @@ -315,20 +243,20 @@ namespace System.Net if (NetEventSource.IsEnabled) NetEventSource.Info(null, hostName); // See if it's an IP Address. - IPAddress address; - ResolveAsyncResult asyncResult; - if (IPAddress.TryParse(hostName, out address)) + IPAddress ipAddress; + DnsResolveAsyncResult asyncResult; + if (IPAddress.TryParse(hostName, out ipAddress)) { - if (throwOnIIPAny && (address.Equals(IPAddress.Any) || address.Equals(IPAddress.IPv6Any))) + if (throwOnIIPAny && (ipAddress.Equals(IPAddress.Any) || ipAddress.Equals(IPAddress.IPv6Any))) { throw new ArgumentException(SR.net_invalid_ip_addr, nameof(hostName)); } - asyncResult = new ResolveAsyncResult(address, null, includeIPv6, state, requestCallback); + asyncResult = new DnsResolveAsyncResult(ipAddress, null, state, requestCallback); if (justReturnParsedIp) { - IPHostEntry hostEntry = NameResolutionUtilities.GetUnresolvedAnswer(address); + IPHostEntry hostEntry = NameResolutionUtilities.GetUnresolvedAnswer(ipAddress); asyncResult.StartPostingAsyncOp(false); asyncResult.InvokeCallback(hostEntry); asyncResult.FinishPostingAsyncOp(); @@ -337,26 +265,36 @@ namespace System.Net } else { - asyncResult = new ResolveAsyncResult(hostName, null, includeIPv6, state, requestCallback); + asyncResult = new DnsResolveAsyncResult(hostName, null, state, requestCallback); } // Set up the context, possibly flow. asyncResult.StartPostingAsyncOp(false); - // Start the resolve. - Task.Factory.StartNew( - s => ResolveCallback(s), - asyncResult, - CancellationToken.None, - TaskCreationOptions.DenyChildAttach, - TaskScheduler.Default); + // If the OS supports it and 'hostName' is not an IP Address, resolve the name asynchronously + // instead of calling the synchronous version in the ThreadPool. + if (NameResolutionPal.SupportsGetAddrInfoAsync && ipAddress == null) + { + ValidateHostName(hostName); + NameResolutionPal.GetAddrInfoAsync(asyncResult); + } + else + { + // Start the resolve. + Task.Factory.StartNew( + s => ResolveCallback(s), + asyncResult, + CancellationToken.None, + TaskCreationOptions.DenyChildAttach, + TaskScheduler.Default); + } // Finish the flowing, maybe it completed? This does nothing if we didn't initiate the flowing above. asyncResult.FinishPostingAsyncOp(); return asyncResult; } - private static IAsyncResult HostResolutionBeginHelper(IPAddress address, bool flowContext, bool includeIPv6, AsyncCallback requestCallback, object state) + private static IAsyncResult HostResolutionBeginHelper(IPAddress address, bool flowContext, AsyncCallback requestCallback, object state) { if (address == null) { @@ -371,7 +309,7 @@ namespace System.Net if (NetEventSource.IsEnabled) NetEventSource.Info(null, address); // Set up the context, possibly flow. - ResolveAsyncResult asyncResult = new ResolveAsyncResult(address, null, includeIPv6, state, requestCallback); + DnsResolveAsyncResult asyncResult = new DnsResolveAsyncResult(address, null, state, requestCallback); if (flowContext) { asyncResult.StartPostingAsyncOp(false); @@ -399,7 +337,7 @@ namespace System.Net { throw new ArgumentNullException(nameof(asyncResult)); } - ResolveAsyncResult castedResult = asyncResult as ResolveAsyncResult; + DnsResolveAsyncResult castedResult = asyncResult as DnsResolveAsyncResult; if (castedResult == null) { throw new ArgumentException(SR.net_io_invalidasyncresult, nameof(asyncResult)); @@ -430,7 +368,7 @@ namespace System.Net NameResolutionPal.EnsureSocketsAreInitialized(); - IAsyncResult asyncResult = HostResolutionBeginHelper(hostName, true, true, false, requestCallback, stateObject); + IAsyncResult asyncResult = HostResolutionBeginHelper(hostName, true, true, requestCallback, stateObject); if (NetEventSource.IsEnabled) NetEventSource.Exit(null, asyncResult); return asyncResult; @@ -468,11 +406,11 @@ namespace System.Net throw new ArgumentException(SR.Format(SR.net_invalid_ip_addr, nameof(hostNameOrAddress))); } - ipHostEntry = InternalGetHostByAddress(address, true); + ipHostEntry = InternalGetHostByAddress(address); } else { - ipHostEntry = InternalGetHostByName(hostNameOrAddress, true); + ipHostEntry = InternalGetHostByName(hostNameOrAddress); } if (NetEventSource.IsEnabled) NetEventSource.Exit(null, ipHostEntry); @@ -495,7 +433,7 @@ namespace System.Net throw new ArgumentException(SR.Format(SR.net_invalid_ip_addr, nameof(address))); } - IPHostEntry ipHostEntry = InternalGetHostByAddress(address, true); + IPHostEntry ipHostEntry = InternalGetHostByAddress(address); if (NetEventSource.IsEnabled) NetEventSource.Exit(null, ipHostEntry); return ipHostEntry; @@ -526,7 +464,7 @@ namespace System.Net { // InternalGetHostByName works with IP addresses (and avoids a reverse-lookup), but we need // explicit handling in order to do the ArgumentException and guarantee the behavior. - addresses = InternalGetHostByName(hostNameOrAddress, true).AddressList; + addresses = InternalGetHostByName(hostNameOrAddress).AddressList; } if (NetEventSource.IsEnabled) NetEventSource.Exit(null, addresses); @@ -538,7 +476,7 @@ namespace System.Net if (NetEventSource.IsEnabled) NetEventSource.Enter(null, hostNameOrAddress); NameResolutionPal.EnsureSocketsAreInitialized(); - IAsyncResult asyncResult = HostResolutionBeginHelper(hostNameOrAddress, false, true, true, requestCallback, stateObject); + IAsyncResult asyncResult = HostResolutionBeginHelper(hostNameOrAddress, false, true, requestCallback, stateObject); if (NetEventSource.IsEnabled) NetEventSource.Exit(null, asyncResult); return asyncResult; @@ -550,7 +488,7 @@ namespace System.Net NameResolutionPal.EnsureSocketsAreInitialized(); - IAsyncResult asyncResult = HostResolutionBeginHelper(address, true, true, requestCallback, stateObject); + IAsyncResult asyncResult = HostResolutionBeginHelper(address, true, requestCallback, stateObject); if (NetEventSource.IsEnabled) NetEventSource.Exit(null, asyncResult); return asyncResult; @@ -570,7 +508,7 @@ namespace System.Net if (NetEventSource.IsEnabled) NetEventSource.Enter(null, hostNameOrAddress); NameResolutionPal.EnsureSocketsAreInitialized(); - IAsyncResult asyncResult = HostResolutionBeginHelper(hostNameOrAddress, true, true, true, requestCallback, state); + IAsyncResult asyncResult = HostResolutionBeginHelper(hostNameOrAddress, true, true, requestCallback, state); if (NetEventSource.IsEnabled) NetEventSource.Exit(null, asyncResult); return asyncResult; @@ -592,7 +530,7 @@ namespace System.Net NameResolutionPal.EnsureSocketsAreInitialized(); - IAsyncResult asyncResult = HostResolutionBeginHelper(hostName, false, false, false, requestCallback, stateObject); + IAsyncResult asyncResult = HostResolutionBeginHelper(hostName, false, false, requestCallback, stateObject); if (NetEventSource.IsEnabled) NetEventSource.Exit(null, asyncResult); return asyncResult; @@ -611,7 +549,7 @@ namespace System.Net } catch (SocketException ex) { - IPAddress address = ((ResolveAsyncResult)asyncResult).address; + IPAddress address = ((DnsResolveAsyncResult)asyncResult).IpAddress; if (address == null) throw; // BeginResolve was called with a HostName, not an IPAddress diff --git a/external/corefx/src/System.Net.NameResolution/src/System/Net/DnsResolveAsyncResult.cs b/external/corefx/src/System.Net.NameResolution/src/System/Net/DnsResolveAsyncResult.cs new file mode 100644 index 0000000000..e96b81aab7 --- /dev/null +++ b/external/corefx/src/System.Net.NameResolution/src/System/Net/DnsResolveAsyncResult.cs @@ -0,0 +1,26 @@ +// 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.Net +{ + internal sealed class DnsResolveAsyncResult : ContextAwareResult + { + internal string HostName { get; } + internal IPAddress IpAddress { get; } + + // Forward lookup + internal DnsResolveAsyncResult(string hostName, object myObject, object myState, AsyncCallback myCallBack) + : base(myObject, myState, myCallBack) + { + HostName = hostName; + } + + // Reverse lookup + internal DnsResolveAsyncResult(IPAddress ipAddress, object myObject, object myState, AsyncCallback myCallBack) + : base(myObject, myState, myCallBack) + { + IpAddress = ipAddress; + } + } +} diff --git a/external/corefx/src/Common/src/System/Net/IntPtrHelper.cs b/external/corefx/src/System.Net.NameResolution/src/System/Net/NameResolutionPal.Uap.cs similarity index 66% rename from external/corefx/src/Common/src/System/Net/IntPtrHelper.cs rename to external/corefx/src/System.Net.NameResolution/src/System/Net/NameResolutionPal.Uap.cs index 6bd2d35653..7f752ba354 100644 --- a/external/corefx/src/Common/src/System/Net/IntPtrHelper.cs +++ b/external/corefx/src/System.Net.NameResolution/src/System/Net/NameResolutionPal.Uap.cs @@ -4,8 +4,8 @@ namespace System.Net { - internal static class IntPtrHelper + internal static partial class NameResolutionPal { - internal static IntPtr Add(IntPtr a, int b) => (IntPtr)((long)a + (long)b); + private static bool GetAddrInfoExSupportsOverlapped() => false; } } diff --git a/external/corefx/src/System.Net.NameResolution/src/System/Net/NameResolutionPal.Unix.cs b/external/corefx/src/System.Net.NameResolution/src/System/Net/NameResolutionPal.Unix.cs index 139e2740f9..c0e94fe05f 100644 --- a/external/corefx/src/System.Net.NameResolution/src/System/Net/NameResolutionPal.Unix.cs +++ b/external/corefx/src/System.Net.NameResolution/src/System/Net/NameResolutionPal.Unix.cs @@ -13,26 +13,8 @@ namespace System.Net { internal static partial class NameResolutionPal { - private static SocketError GetSocketErrorForErrno(int errno) - { - switch (errno) - { - case 0: - return SocketError.Success; - case (int)Interop.Sys.GetHostErrorCodes.HOST_NOT_FOUND: - return SocketError.HostNotFound; - case (int)Interop.Sys.GetHostErrorCodes.NO_DATA: - return SocketError.NoData; - case (int)Interop.Sys.GetHostErrorCodes.NO_RECOVERY: - return SocketError.NoRecovery; - case (int)Interop.Sys.GetHostErrorCodes.TRY_AGAIN: - return SocketError.TryAgain; - default: - Debug.Fail("Unexpected errno: " + errno.ToString()); - return SocketError.SocketError; - } - } - + public const bool SupportsGetAddrInfoAsync = false; + private static SocketError GetSocketErrorForNativeError(int error) { switch (error) @@ -138,39 +120,7 @@ namespace System.Net Aliases = aliases }; } - - public static unsafe IPHostEntry GetHostByName(string hostName) - { - if (hostName == "") - { - // To match documented behavior on Windows, if an empty string is passed in, use the local host's name. - hostName = Dns.GetHostName(); - } - - Interop.Sys.HostEntry entry; - int err = Interop.Sys.GetHostByName(hostName, &entry); - if (err != 0) - { - throw SocketExceptionFactory.CreateSocketException(GetSocketErrorForErrno(err), err); - } - - return CreateIPHostEntry(entry); - } - - public static unsafe IPHostEntry GetHostByAddr(IPAddress addr) - { - // TODO #2891: Optimize this (or decide if this legacy code can be removed): - Interop.Sys.IPAddress address = addr.GetNativeIPAddress(); - Interop.Sys.HostEntry entry; - int err = Interop.Sys.GetHostByAddress(&address, &entry); - if (err != 0) - { - throw SocketExceptionFactory.CreateSocketException(GetSocketErrorForErrno(err), err); - } - - return CreateIPHostEntry(entry); - } - + public static unsafe SocketError TryGetAddrInfo(string name, out IPHostEntry hostinfo, out int nativeErrorCode) { if (name == "") @@ -194,30 +144,45 @@ namespace System.Net return SocketError.Success; } + internal static void GetAddrInfoAsync(DnsResolveAsyncResult asyncResult) + { + throw new NotSupportedException(); + } + public static unsafe string TryGetNameInfo(IPAddress addr, out SocketError socketError, out int nativeErrorCode) { byte* buffer = stackalloc byte[Interop.Sys.NI_MAXHOST + 1 /*for null*/]; - // TODO #2891: Remove the copying step to improve performance. This requires a change in the contracts. - byte[] addressBuffer = addr.GetAddressBytes(); - - int error; - fixed (byte* rawAddress = &addressBuffer[0]) + byte isIPv6; + int rawAddressLength; + if (addr.AddressFamily == AddressFamily.InterNetwork) { - error = Interop.Sys.GetNameInfo( - rawAddress, - unchecked((uint)addressBuffer.Length), - addr.AddressFamily == AddressFamily.InterNetworkV6 ? (byte)1 : (byte)0, - buffer, - Interop.Sys.NI_MAXHOST, - null, - 0, - Interop.Sys.GetNameInfoFlags.NI_NAMEREQD); + isIPv6 = 0; + rawAddressLength = IPAddressParserStatics.IPv4AddressBytes; } + else + { + isIPv6 = 1; + rawAddressLength = IPAddressParserStatics.IPv6AddressBytes; + } + + byte* rawAddress = stackalloc byte[rawAddressLength]; + addr.TryWriteBytes(new Span(rawAddress, rawAddressLength), out int bytesWritten); + Debug.Assert(bytesWritten == rawAddressLength); + + int error = Interop.Sys.GetNameInfo( + rawAddress, + (uint)rawAddressLength, + isIPv6, + buffer, + Interop.Sys.NI_MAXHOST, + null, + 0, + Interop.Sys.GetNameInfoFlags.NI_NAMEREQD); socketError = GetSocketErrorForNativeError(error); nativeErrorCode = error; - return socketError != SocketError.Success ? null : Marshal.PtrToStringAnsi((IntPtr)buffer); + return socketError != SocketError.Success ? null : Marshal.PtrToStringAnsi((IntPtr)buffer); } public static string GetHostName() diff --git a/external/corefx/src/System.Net.NameResolution/src/System/Net/NameResolutionPal.Win32.cs b/external/corefx/src/System.Net.NameResolution/src/System/Net/NameResolutionPal.Win32.cs new file mode 100644 index 0000000000..3fd64550cd --- /dev/null +++ b/external/corefx/src/System.Net.NameResolution/src/System/Net/NameResolutionPal.Win32.cs @@ -0,0 +1,24 @@ +// 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 Microsoft.Win32.SafeHandles; + +namespace System.Net +{ + internal static partial class NameResolutionPal + { + private static bool GetAddrInfoExSupportsOverlapped() + { + using (SafeLibraryHandle libHandle = Interop.Kernel32.LoadLibraryExW(Interop.Libraries.Ws2_32, IntPtr.Zero, Interop.Kernel32.LOAD_LIBRARY_SEARCH_SYSTEM32)) + { + if (libHandle.IsInvalid) + return false; + + // We can't just check that 'GetAddrInfoEx' exists, because it existed before supporting overlapped. + // The existence of 'GetAddrInfoExCancel' indicates that overlapped is supported. + return Interop.Kernel32.GetProcAddress(libHandle, Interop.Winsock.GetAddrInfoExCancelFunctionName) != IntPtr.Zero; + } + } + } +} diff --git a/external/corefx/src/System.Net.NameResolution/src/System/Net/NameResolutionPal.Windows.cs b/external/corefx/src/System.Net.NameResolution/src/System/Net/NameResolutionPal.Windows.cs index 36a69f8637..208be588f7 100644 --- a/external/corefx/src/System.Net.NameResolution/src/System/Net/NameResolutionPal.Windows.cs +++ b/external/corefx/src/System.Net.NameResolution/src/System/Net/NameResolutionPal.Windows.cs @@ -7,19 +7,34 @@ using System.Net.Sockets; using System.Runtime.InteropServices; using System.Text; using System.Threading; +using System.Threading.Tasks; +using Microsoft.Win32.SafeHandles; using ProtocolFamily = System.Net.Internals.ProtocolFamily; namespace System.Net { - internal static class NameResolutionPal + internal static partial class NameResolutionPal { // // used by GetHostName() to preallocate a buffer for the call to gethostname. // private const int HostNameBufferLength = 256; + private static bool s_initialized; private static readonly object s_initializedLock = new object(); + private static readonly unsafe Interop.Winsock.LPLOOKUPSERVICE_COMPLETION_ROUTINE s_getAddrInfoExCallback = GetAddressInfoExCallback; + private static bool s_getAddrInfoExSupported; + + public static bool SupportsGetAddrInfoAsync + { + get + { + EnsureSocketsAreInitialized(); + return s_getAddrInfoExSupported; + } + } + /*++ Routine Description: @@ -99,7 +114,7 @@ namespace System.Net // // now get the next pointer in the array and start over // - currentArrayElement = IntPtrHelper.Add(currentArrayElement, IntPtr.Size); + currentArrayElement = currentArrayElement + IntPtr.Size; nativePointer = Marshal.ReadIntPtr(currentArrayElement); } @@ -132,7 +147,7 @@ namespace System.Net // // now get the next pointer in the array and start over // - currentArrayElement = IntPtrHelper.Add(currentArrayElement, IntPtr.Size); + currentArrayElement = currentArrayElement + IntPtr.Size; nativePointer = Marshal.ReadIntPtr(currentArrayElement); } @@ -141,62 +156,6 @@ namespace System.Net return HostEntry; } // NativeToHostEntry - public static IPHostEntry GetHostByName(string hostName) - { - // - // IPv6 disabled: use gethostbyname() to obtain DNS information. - // - IntPtr nativePointer = - Interop.Winsock.gethostbyname( - hostName); - - if (nativePointer == IntPtr.Zero) - { - // Need to do this first since if we wait the last error code might be overwritten. - SocketException socketException = new SocketException(); - - IPAddress address; - if (IPAddress.TryParse(hostName, out address)) - { - IPHostEntry ipHostEntry = NameResolutionUtilities.GetUnresolvedAnswer(address); - if (NetEventSource.IsEnabled) NetEventSource.Exit(null, ipHostEntry); - return ipHostEntry; - } - - throw socketException; - } - - return NativeToHostEntry(nativePointer); - } - - public static IPHostEntry GetHostByAddr(IPAddress address) - { - // TODO #2891: Optimize this (or decide if this legacy code can be removed): -#pragma warning disable CS0618 // Address is marked obsolete - int addressAsInt = unchecked((int)address.Address); -#pragma warning restore CS0618 - -#if BIGENDIAN - // TODO #2891: above code needs testing for BIGENDIAN. - - addressAsInt = (int)(((uint)addressAsInt << 24) | (((uint)addressAsInt & 0x0000FF00) << 8) | - (((uint)addressAsInt >> 8) & 0x0000FF00) | ((uint)addressAsInt >> 24)); -#endif - - IntPtr nativePointer = - Interop.Winsock.gethostbyaddr( - ref addressAsInt, - sizeof(int), - ProtocolFamily.InterNetwork); - - if (nativePointer != IntPtr.Zero) - { - return NativeToHostEntry(nativePointer); - } - - throw new SocketException(); - } - public static unsafe SocketError TryGetAddrInfo(string name, out IPHostEntry hostinfo, out int nativeErrorCode) { // @@ -232,7 +191,6 @@ namespace System.Net // while (pAddressInfo != null) { - SocketAddress sockaddr; // // Retrieve the canonical name for the host - only appears in the first AddressInfo // entry in the returned array. @@ -247,29 +205,17 @@ namespace System.Net // We also filter based on whether IPv6 is supported on the current // platform / machine. // - if ((pAddressInfo->ai_family == AddressFamily.InterNetwork) || // Never filter v4 - (pAddressInfo->ai_family == AddressFamily.InterNetworkV6 && SocketProtocolSupportPal.OSSupportsIPv6)) + var socketAddress = new ReadOnlySpan(pAddressInfo->ai_addr, pAddressInfo->ai_addrlen); + + if (pAddressInfo->ai_family == AddressFamily.InterNetwork) { - sockaddr = new SocketAddress(pAddressInfo->ai_family, pAddressInfo->ai_addrlen); - // - // Push address data into the socket address buffer - // - for (int d = 0; d < pAddressInfo->ai_addrlen; d++) - { - sockaddr[d] = *(pAddressInfo->ai_addr + d); - } - // - // NOTE: We need an IPAddress now, the only way to create it from a - // SocketAddress is via IPEndPoint. This ought to be simpler. - // - if (pAddressInfo->ai_family == AddressFamily.InterNetwork) - { - addresses.Add(((IPEndPoint)IPEndPointStatics.Any.Create(sockaddr)).Address); - } - else - { - addresses.Add(((IPEndPoint)IPEndPointStatics.IPv6Any.Create(sockaddr)).Address); - } + if (socketAddress.Length == SocketAddressPal.IPv4AddressSize) + addresses.Add(CreateIPv4Address(socketAddress)); + } + else if (pAddressInfo->ai_family == AddressFamily.InterNetworkV6 && SocketProtocolSupportPal.OSSupportsIPv6) + { + if (socketAddress.Length == SocketAddressPal.IPv6AddressSize) + addresses.Add(CreateIPv6Address(socketAddress)); } // // Next addressinfo entry @@ -385,10 +331,193 @@ namespace System.Net throw new SocketException((int)errorCode); } + s_getAddrInfoExSupported = GetAddrInfoExSupportsOverlapped(); + Volatile.Write(ref s_initialized, true); } } } } + + public static unsafe void GetAddrInfoAsync(DnsResolveAsyncResult asyncResult) + { + GetAddrInfoExContext* context = GetAddrInfoExContext.AllocateContext(); + + try + { + var state = new GetAddrInfoExState(asyncResult); + context->QueryStateHandle = state.CreateHandle(); + } + catch + { + GetAddrInfoExContext.FreeContext(context); + throw; + } + + AddressInfoEx hints = new AddressInfoEx(); + hints.ai_flags = AddressInfoHints.AI_CANONNAME; + hints.ai_family = AddressFamily.Unspecified; // Gets all address families + + SocketError errorCode = + (SocketError)Interop.Winsock.GetAddrInfoExW(asyncResult.HostName, null, 0 /* NS_ALL*/, IntPtr.Zero, ref hints, out context->Result, IntPtr.Zero, ref context->Overlapped, s_getAddrInfoExCallback, out context->CancelHandle); + + if (errorCode != SocketError.IOPending) + ProcessResult(errorCode, context); + } + + private static unsafe void GetAddressInfoExCallback([In] int error, [In] int bytes, [In] NativeOverlapped* overlapped) + { + // Can be casted directly to GetAddrInfoExContext* because the overlapped is its first field + GetAddrInfoExContext* context = (GetAddrInfoExContext*)overlapped; + + ProcessResult((SocketError)error, context); + } + + private static unsafe void ProcessResult(SocketError errorCode, GetAddrInfoExContext* context) + { + try + { + GetAddrInfoExState state = GetAddrInfoExState.FromHandleAndFree(context->QueryStateHandle); + + if (errorCode != SocketError.Success) + { + state.CompleteAsyncResult(new SocketException((int)errorCode)); + return; + } + + AddressInfoEx* result = context->Result; + string canonicalName = null; + + List addresses = new List(); + + while (result != null) + { + if (canonicalName == null && result->ai_canonname != IntPtr.Zero) + canonicalName = Marshal.PtrToStringUni(result->ai_canonname); + + var socketAddress = new ReadOnlySpan(result->ai_addr, result->ai_addrlen); + + if (result->ai_family == AddressFamily.InterNetwork) + { + if (socketAddress.Length == SocketAddressPal.IPv4AddressSize) + addresses.Add(CreateIPv4Address(socketAddress)); + } + else if (SocketProtocolSupportPal.OSSupportsIPv6 && result->ai_family == AddressFamily.InterNetworkV6) + { + if (socketAddress.Length == SocketAddressPal.IPv6AddressSize) + addresses.Add(CreateIPv6Address(socketAddress)); + } + + result = result->ai_next; + } + + if (canonicalName == null) + canonicalName = state.HostName; + + state.CompleteAsyncResult(new IPHostEntry + { + HostName = canonicalName, + Aliases = Array.Empty(), + AddressList = addresses.ToArray() + }); + } + finally + { + GetAddrInfoExContext.FreeContext(context); + } + } + + private static unsafe IPAddress CreateIPv4Address(ReadOnlySpan socketAddress) + { + long address = (long)SocketAddressPal.GetIPv4Address(socketAddress) & 0x0FFFFFFFF; + return new IPAddress(address); + } + + private static unsafe IPAddress CreateIPv6Address(ReadOnlySpan socketAddress) + { + Span address = stackalloc byte[IPAddressParserStatics.IPv6AddressBytes]; + uint scope; + SocketAddressPal.GetIPv6Address(socketAddress, address, out scope); + + return new IPAddress(address, (long)scope); + } + + #region GetAddrInfoAsync Helper Classes + + // + // Warning: If this ever ported to NETFX, AppDomain unloads needs to be handled + // to protect against AppDomainUnloadException if there are pending operations. + // + + private sealed class GetAddrInfoExState + { + private DnsResolveAsyncResult _asyncResult; + private object _result; + + public string HostName => _asyncResult.HostName; + + public GetAddrInfoExState(DnsResolveAsyncResult asyncResult) + { + _asyncResult = asyncResult; + } + + public void CompleteAsyncResult(object o) + { + // We don't want to expose the GetAddrInfoEx callback thread to user code. + // The callback occurs in a native windows thread pool. + + _result = o; + + Task.Factory.StartNew(s => + { + var self = (GetAddrInfoExState)s; + self._asyncResult.InvokeCallback(self._result); + }, this, CancellationToken.None, TaskCreationOptions.DenyChildAttach, TaskScheduler.Default); + } + + public IntPtr CreateHandle() + { + GCHandle handle = GCHandle.Alloc(this, GCHandleType.Normal); + return GCHandle.ToIntPtr(handle); + } + + public static GetAddrInfoExState FromHandleAndFree(IntPtr handle) + { + GCHandle gcHandle = GCHandle.FromIntPtr(handle); + var state = (GetAddrInfoExState)gcHandle.Target; + gcHandle.Free(); + + return state; + } + } + + [StructLayout(LayoutKind.Sequential)] + private unsafe struct GetAddrInfoExContext + { + private static readonly int Size = sizeof(GetAddrInfoExContext); + + public NativeOverlapped Overlapped; + public AddressInfoEx* Result; + public IntPtr CancelHandle; + public IntPtr QueryStateHandle; + + public static GetAddrInfoExContext* AllocateContext() + { + var context = (GetAddrInfoExContext*)Marshal.AllocHGlobal(Size); + *context = default; + + return context; + } + + public static void FreeContext(GetAddrInfoExContext* context) + { + if (context->Result != null) + Interop.Winsock.FreeAddrInfoEx(context->Result); + + Marshal.FreeHGlobal((IntPtr)context); + } + } + + #endregion } } diff --git a/external/corefx/src/System.Net.NameResolution/tests/PalTests/Configurations.props b/external/corefx/src/System.Net.NameResolution/tests/PalTests/Configurations.props index eddfd3a9ac..1040c9ba37 100644 --- a/external/corefx/src/System.Net.NameResolution/tests/PalTests/Configurations.props +++ b/external/corefx/src/System.Net.NameResolution/tests/PalTests/Configurations.props @@ -2,8 +2,6 @@ - netstandard-Windows_NT; - netstandard-Unix; netcoreapp-Windows_NT; netcoreapp-Unix; diff --git a/external/corefx/src/System.Net.NameResolution/tests/PalTests/Fakes/FakeContextAwareResult.cs b/external/corefx/src/System.Net.NameResolution/tests/PalTests/Fakes/FakeContextAwareResult.cs new file mode 100644 index 0000000000..8a9615c9d2 --- /dev/null +++ b/external/corefx/src/System.Net.NameResolution/tests/PalTests/Fakes/FakeContextAwareResult.cs @@ -0,0 +1,91 @@ +// 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.Threading; + +namespace System.Net +{ + internal partial class ContextAwareResult : IAsyncResult + { + private AsyncCallback _callback; + + private static Func _resultFactory; + + public static void FakeSetResultFactory(Func resultFactory) + { + _resultFactory = resultFactory; + } + + public object AsyncState + { + get + { + throw new NotImplementedException(); + } + } + + internal bool EndCalled + { + get; + set; + } + + internal object Result + { + get + { + return _resultFactory?.Invoke(); + } + } + + public WaitHandle AsyncWaitHandle + { + get + { + throw new NotImplementedException(); + } + } + + public bool CompletedSynchronously + { + get + { + // Simulate sync completion: + return true; + } + } + + public bool IsCompleted + { + get + { + throw new NotImplementedException(); + } + } + + internal ContextAwareResult(object myObject, object myState, AsyncCallback myCallBack) + { + _callback = myCallBack; + } + + internal object StartPostingAsyncOp(bool lockCapture) + { + return null; + } + + internal bool FinishPostingAsyncOp() + { + return true; + } + + internal void InvokeCallback(object result) + { + _callback.Invoke(this); + } + + internal void InternalWaitForCompletion() { } + + + } +} diff --git a/external/corefx/src/System.Net.NameResolution/tests/PalTests/NameResolutionPalTests.cs b/external/corefx/src/System.Net.NameResolution/tests/PalTests/NameResolutionPalTests.cs index 1481a4a8cf..cd11cdf5d9 100644 --- a/external/corefx/src/System.Net.NameResolution/tests/PalTests/NameResolutionPalTests.cs +++ b/external/corefx/src/System.Net.NameResolution/tests/PalTests/NameResolutionPalTests.cs @@ -22,87 +22,6 @@ namespace System.Net.NameResolution.PalTests Assert.NotNull(NameResolutionPal.GetHostName()); } - [Fact] - public void GetHostByName_LocalHost() - { - IPHostEntry hostEntry = NameResolutionPal.GetHostByName("localhost"); - Assert.NotNull(hostEntry); - Assert.NotNull(hostEntry.HostName); - Assert.NotNull(hostEntry.AddressList); - Assert.NotNull(hostEntry.Aliases); - } - - public static object[][] InvalidHostNames = new object[][] { - new object[] { ":" }, - new object[] { "..." } - }; - - [Theory, MemberData(nameof(InvalidHostNames))] - public void GetHostByName_InvalidHostName_Throws(string hostName) - { - Assert.ThrowsAny(() => NameResolutionPal.GetHostByName(hostName)); - } - - [Fact] - public void GetHostByName_HostName() - { - string hostName = NameResolutionPal.GetHostName(); - Assert.NotNull(hostName); - - IPHostEntry hostEntry = NameResolutionPal.GetHostByName(hostName); - Assert.NotNull(hostEntry); - Assert.NotNull(hostEntry.HostName); - Assert.NotNull(hostEntry.AddressList); - Assert.NotNull(hostEntry.Aliases); - } - - [Fact] - public void GetHostByAddr_LocalHost() - { - Assert.NotNull(NameResolutionPal.GetHostByAddr(new IPAddress(0x0100007f))); - } - - [Fact] - public void GetHostByName_LocalHost_GetHostByAddr() - { - IPHostEntry hostEntry1 = NameResolutionPal.GetHostByName("localhost"); - Assert.NotNull(hostEntry1); - IPHostEntry hostEntry2 = NameResolutionPal.GetHostByAddr(hostEntry1.AddressList[0]); - Assert.NotNull(hostEntry2); - - IPAddress[] list1 = hostEntry1.AddressList; - IPAddress[] list2 = hostEntry2.AddressList; - - for (int i = 0; i < list1.Length; i++) - { - Assert.NotEqual(-1, Array.IndexOf(list2, list1[i])); - } - } - - [Fact] - public void GetHostByName_HostName_GetHostByAddr() - { - IPHostEntry hostEntry1 = NameResolutionPal.GetHostByName(System.Net.Test.Common.Configuration.Http.Http2Host); - Assert.NotNull(hostEntry1); - - IPAddress[] list1 = hostEntry1.AddressList; - Assert.InRange(list1.Length, 1, Int32.MaxValue); - - foreach (IPAddress addr1 in list1) - { - IPHostEntry hostEntry2 = NameResolutionPal.GetHostByAddr(addr1); - Assert.NotNull(hostEntry2); - - IPAddress[] list2 = hostEntry2.AddressList; - Assert.InRange(list2.Length, 1, list1.Length); - - foreach (IPAddress addr2 in list2) - { - Assert.NotEqual(-1, Array.IndexOf(list1, addr2)); - } - } - } - [Fact] public void TryGetAddrInfo_LocalHost() { @@ -125,6 +44,13 @@ namespace System.Net.NameResolution.PalTests IPHostEntry hostEntry; int nativeErrorCode; SocketError error = NameResolutionPal.TryGetAddrInfo(hostName, out hostEntry, out nativeErrorCode); + if (error == SocketError.HostNotFound && (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX))) + { + // On Unix, we are not guaranteed to be able to resove the local host. The ability to do so depends on the + // machine configurations, which varies by distro and is often inconsistent. + return; + } + Assert.Equal(SocketError.Success, error); Assert.NotNull(hostEntry); Assert.NotNull(hostEntry.HostName); diff --git a/external/corefx/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj b/external/corefx/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj index 333aa11cc1..7ad7cfaf05 100644 --- a/external/corefx/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj +++ b/external/corefx/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj @@ -10,10 +10,6 @@ - - - - @@ -24,6 +20,7 @@ + @@ -34,6 +31,9 @@ ProductionCode\System\Net\NameResolutionUtilities.cs + + ProductionCode\System\Net\DnsResolveAsyncResult.cs + Common\System\Net\Sockets\ProtocolType.cs @@ -52,20 +52,29 @@ Common\System\Net\Configuration.Http.cs + + Common\System\Net\ByteOrder.cs + ProductionCode\System\Net\NameResolutionPal.Windows.cs + + ProductionCode\System\Net\NameResolutionPal.Uap.cs + + + ProductionCode\System\Net\NameResolutionPal.Win32.cs + Common\System\Net\InternalException.cs - - Common\System\Net\IntPtrHelper.cs - System\Net\SocketProtocolSupportPal.Windows + + Common\System\Net\SocketAddressPal.Windows + Common\System\Net\DebugSafeHandle.cs @@ -86,12 +95,6 @@ Interop\Windows\Winsock\Interop.closesocket.cs - - Interop\Windows\Winsock\Interop.gethostbyaddr.cs - - - Interop\Windows\Winsock\Interop.gethostbyname.cs - Interop\Windows\Winsock\Interop.gethostname.cs @@ -116,6 +119,24 @@ Interop\Windows\Winsock\SafeFreeAddrInfo.cs + + Interop\Windows\Winsock\AddressInfoEx.cs + + + Interop\Windows\Winsock\Interop.GetAddrInfoExW.cs + + + Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs + + + Interop\Windows\Kernel32\Interop.GetProcAddress.cs + + + Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs + + + Interop\Windows\Kernel32\Interop.FreeLibrary.cs + @@ -124,9 +145,6 @@ Common\System\Net\Internals\Interop.CheckedAccess.cs - - Common\System\Net\Internals\ByteOrder.cs - Common\System\Net\InteropIPAddressExtensions.Unix.cs diff --git a/external/corefx/src/System.Net.NameResolution/tests/UnitTests/Fakes/FakeNameResolutionPal.cs b/external/corefx/src/System.Net.NameResolution/tests/UnitTests/Fakes/FakeNameResolutionPal.cs index 74da893f32..69d1bc9929 100644 --- a/external/corefx/src/System.Net.NameResolution/tests/UnitTests/Fakes/FakeNameResolutionPal.cs +++ b/external/corefx/src/System.Net.NameResolution/tests/UnitTests/Fakes/FakeNameResolutionPal.cs @@ -10,6 +10,8 @@ namespace System.Net { internal static class NameResolutionPal { + public static bool SupportsGetAddrInfoAsync => false; + internal static int FakesEnsureSocketsAreInitializedCallCount { get; @@ -49,6 +51,11 @@ namespace System.Net throw new NotImplementedException(); } + internal static void GetAddrInfoAsync(DnsResolveAsyncResult asyncResult) + { + throw new NotImplementedException(); + } + internal static IPHostEntry GetHostByAddr(IPAddress address) { throw new NotImplementedException(); diff --git a/external/corefx/src/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj b/external/corefx/src/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj index e99d16ebed..b52ff2aafc 100644 --- a/external/corefx/src/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj +++ b/external/corefx/src/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj @@ -26,6 +26,9 @@ ProductionCode\System\Net\DNS.cs + + + ProductionCode\System\Net\DnsResolveAsyncResult.cs diff --git a/external/corefx/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj b/external/corefx/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj index 575d33d0a3..e2a3f6ae0b 100644 --- a/external/corefx/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj +++ b/external/corefx/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj @@ -6,6 +6,7 @@ Library {3CA89D6C-F8D1-4813-9775-F8D249686E31} true + true @@ -34,6 +35,7 @@ + diff --git a/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkAddressChange.Linux.cs b/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkAddressChange.Linux.cs index c7a29ebcef..20eb573056 100644 --- a/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkAddressChange.Linux.cs +++ b/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkAddressChange.Linux.cs @@ -2,18 +2,16 @@ // 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.Collections.Generic; using System.Diagnostics; -using System.Linq; using System.Threading.Tasks; using System.Threading; namespace System.Net.NetworkInformation { // Linux implementation of NetworkChange - public class NetworkChange + public partial class NetworkChange { - private static NetworkAddressChangedEventHandler s_addressChangedSubscribers; - private static NetworkAvailabilityChangedEventHandler s_availabilityChangedSubscribers; private static volatile int s_socket = 0; // Lock controlling access to delegate subscriptions, socket initialization, availability-changed state and timer. private static readonly object s_gate = new object(); @@ -37,30 +35,37 @@ namespace System.Net.NetworkInformation { add { - lock (s_gate) + if (value != null) { - if (s_socket == 0) + lock (s_gate) { - CreateSocket(); - } + if (s_socket == 0) + { + CreateSocket(); + } - s_addressChangedSubscribers += value; + s_addressChangedSubscribers.TryAdd(value, ExecutionContext.Capture()); + } } } remove { - lock (s_gate) + if (value != null) { - if (s_addressChangedSubscribers == null && s_availabilityChangedSubscribers == null) + lock (s_gate) { - Debug.Assert(s_socket == 0, "s_socket != 0, but there are no subscribers to NetworkAddressChanged or NetworkAvailabilityChanged."); - return; - } + if (s_addressChangedSubscribers.Count == 0 && s_availabilityChangedSubscribers.Count == 0) + { + Debug.Assert(s_socket == 0, + "s_socket != 0, but there are no subscribers to NetworkAddressChanged or NetworkAvailabilityChanged."); + return; + } - s_addressChangedSubscribers -= value; - if (s_addressChangedSubscribers == null && s_availabilityChangedSubscribers == null) - { - CloseSocket(); + s_addressChangedSubscribers.Remove(value); + if (s_addressChangedSubscribers.Count == 0 && s_availabilityChangedSubscribers.Count == 0) + { + CloseSocket(); + } } } } @@ -70,50 +75,74 @@ namespace System.Net.NetworkInformation { add { - lock (s_gate) + if (value != null) { - if (s_socket == 0) + lock (s_gate) { - CreateSocket(); - } - if (s_availabilityTimer == null) - { - s_availabilityTimer = new Timer(s_availabilityTimerFiredCallback, null, -1, -1); - } + if (s_socket == 0) + { + CreateSocket(); + } - s_availabilityChangedSubscribers += value; + if (s_availabilityTimer == null) + { + // Don't capture the current ExecutionContext and its AsyncLocals onto the timer causing them to live forever + bool restoreFlow = false; + try + { + if (!ExecutionContext.IsFlowSuppressed()) + { + ExecutionContext.SuppressFlow(); + restoreFlow = true; + } + + s_availabilityTimer = new Timer(s_availabilityTimerFiredCallback, null, Timeout.Infinite, Timeout.Infinite); + } + finally + { + // Restore the current ExecutionContext + if (restoreFlow) + ExecutionContext.RestoreFlow(); + } + } + + s_availabilityChangedSubscribers.TryAdd(value, ExecutionContext.Capture()); + } } } remove { - lock (s_gate) + if (value != null) { - if (s_addressChangedSubscribers == null && s_availabilityChangedSubscribers == null) + lock (s_gate) { - Debug.Assert(s_socket == 0, "s_socket != 0, but there are no subscribers to NetworkAddressChanged or NetworkAvailabilityChanged."); - return; - } - - s_availabilityChangedSubscribers -= value; - if (s_availabilityChangedSubscribers == null) - { - if (s_availabilityTimer != null) + if (s_addressChangedSubscribers.Count == 0 && s_availabilityChangedSubscribers.Count == 0) { - s_availabilityTimer.Dispose(); - s_availabilityTimer = null; - s_availabilityHasChanged = false; + Debug.Assert(s_socket == 0, + "s_socket != 0, but there are no subscribers to NetworkAddressChanged or NetworkAvailabilityChanged."); + return; } - if (s_addressChangedSubscribers == null) + s_availabilityChangedSubscribers.Remove(value); + if (s_availabilityChangedSubscribers.Count == 0) { - CloseSocket(); + if (s_availabilityTimer != null) + { + s_availabilityTimer.Dispose(); + s_availabilityTimer = null; + s_availabilityHasChanged = false; + } + + if (s_addressChangedSubscribers.Count == 0) + { + CloseSocket(); + } } } } } } - private static void CreateSocket() { Debug.Assert(s_socket == 0, "s_socket != 0, must close existing socket before opening another."); @@ -150,7 +179,7 @@ namespace System.Net.NetworkInformation Interop.Sys.ReadEvents(socket, s_networkChangeCallback); } } - + private static void ProcessEvent(int socket, Interop.Sys.NetworkChangeKind kind) { if (kind != Interop.Sys.NetworkChangeKind.None) @@ -171,7 +200,7 @@ namespace System.Net.NetworkInformation { case Interop.Sys.NetworkChangeKind.AddressAdded: case Interop.Sys.NetworkChangeKind.AddressRemoved: - s_addressChangedSubscribers?.Invoke(null, EventArgs.Empty); + OnAddressChanged(); break; case Interop.Sys.NetworkChangeKind.AvailabilityChanged: lock (s_gate) @@ -189,18 +218,77 @@ namespace System.Net.NetworkInformation } } - private static void OnAvailabilityTimerFired(object state) + private static void OnAddressChanged() { - bool changed; + Dictionary addressChangedSubscribers = null; + lock (s_gate) { - changed = s_availabilityHasChanged; - s_availabilityHasChanged = false; + if (s_addressChangedSubscribers.Count > 0) + { + addressChangedSubscribers = new Dictionary(s_addressChangedSubscribers); + } } - if (changed) + if (addressChangedSubscribers != null) { - s_availabilityChangedSubscribers?.Invoke(null, new NetworkAvailabilityEventArgs(NetworkInterface.GetIsNetworkAvailable())); + foreach (KeyValuePair + subscriber in addressChangedSubscribers) + { + NetworkAddressChangedEventHandler handler = subscriber.Key; + ExecutionContext ec = subscriber.Value; + + if (ec == null) // Flow supressed + { + handler(null, EventArgs.Empty); + } + else + { + ExecutionContext.Run(ec, s_runAddressChangedHandler, handler); + } + } + } + } + + private static void OnAvailabilityTimerFired(object state) + { + Dictionary availabilityChangedSubscribers = null; + + lock (s_gate) + { + if (s_availabilityHasChanged) + { + s_availabilityHasChanged = false; + if (s_availabilityChangedSubscribers.Count > 0) + { + availabilityChangedSubscribers = + new Dictionary( + s_availabilityChangedSubscribers); + } + } + } + + if (availabilityChangedSubscribers != null) + { + bool isAvailable = NetworkInterface.GetIsNetworkAvailable(); + NetworkAvailabilityEventArgs args = isAvailable ? s_availableEventArgs : s_notAvailableEventArgs; + ContextCallback callbackContext = isAvailable ? s_runHandlerAvailable : s_runHandlerNotAvailable; + + foreach (KeyValuePair + subscriber in availabilityChangedSubscribers) + { + NetworkAvailabilityChangedEventHandler handler = subscriber.Key; + ExecutionContext ec = subscriber.Value; + + if (ec == null) // Flow supressed + { + handler(null, args); + } + else + { + ExecutionContext.Run(ec, callbackContext, handler); + } + } } } } diff --git a/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkAddressChange.OSX.cs b/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkAddressChange.OSX.cs index cff7cd1cae..aef7fb0994 100644 --- a/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkAddressChange.OSX.cs +++ b/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkAddressChange.OSX.cs @@ -2,6 +2,7 @@ // 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.Collections.Generic; using Microsoft.Win32.SafeHandles; using System.Diagnostics; using System.Threading; @@ -14,16 +15,10 @@ namespace System.Net.NetworkInformation // OSX implementation of NetworkChange // See and its documentation, as well as // the documentation for CFRunLoop for more information on the components involved. - public class NetworkChange + public partial class NetworkChange { private static object s_lockObj = new object(); - // The list of current address-changed subscribers. - private static NetworkAddressChangedEventHandler s_addressChangedSubscribers; - - // The list of current availability-changed subscribers. - private static NetworkAvailabilityChangedEventHandler s_availabilityChangedSubscribers; - // The dynamic store. We listen to changes in the IPv4 and IPv6 address keys. // When those keys change, our callback below is called (OnAddressChanged). private static SafeCreateHandle s_dynamicStoreRef; @@ -54,26 +49,34 @@ namespace System.Net.NetworkInformation { add { - lock (s_lockObj) + if (value != null) { - if (s_addressChangedSubscribers == null && s_availabilityChangedSubscribers == null) + lock (s_lockObj) { - CreateAndStartRunLoop(); - } + if (s_addressChangedSubscribers.Count == 0 && + s_availabilityChangedSubscribers.Count == 0) + { + CreateAndStartRunLoop(); + } - s_addressChangedSubscribers += value; + s_addressChangedSubscribers.TryAdd(value, ExecutionContext.Capture()); + } } } remove { - lock (s_lockObj) + if (value != null) { - bool hadAddressChangedSubscribers = s_addressChangedSubscribers != null; - s_addressChangedSubscribers -= value; - - if (hadAddressChangedSubscribers && s_addressChangedSubscribers == null && s_availabilityChangedSubscribers == null) + lock (s_lockObj) { - StopRunLoop(); + bool hadAddressChangedSubscribers = s_addressChangedSubscribers.Count != 0; + s_addressChangedSubscribers.Remove(value); + + if (hadAddressChangedSubscribers && s_addressChangedSubscribers.Count == 0 && + s_availabilityChangedSubscribers.Count == 0) + { + StopRunLoop(); + } } } } @@ -83,30 +86,39 @@ namespace System.Net.NetworkInformation { add { - lock (s_lockObj) + if (value != null) { - if (s_addressChangedSubscribers == null && s_availabilityChangedSubscribers == null) + lock (s_lockObj) { - CreateAndStartRunLoop(); - } - else - { - Debug.Assert(s_runLoop != IntPtr.Zero); - } + if (s_addressChangedSubscribers.Count == 0 && + s_availabilityChangedSubscribers.Count == 0) + { + CreateAndStartRunLoop(); + } + else + { + Debug.Assert(s_runLoop != IntPtr.Zero); + } - s_availabilityChangedSubscribers += value; + s_availabilityChangedSubscribers.TryAdd(value, ExecutionContext.Capture()); + } } } remove { - lock (s_lockObj) + if (value != null) { - bool hadSubscribers = s_addressChangedSubscribers != null || s_availabilityChangedSubscribers != null; - s_availabilityChangedSubscribers -= value; - - if (hadSubscribers && s_addressChangedSubscribers == null && s_availabilityChangedSubscribers == null) + lock (s_lockObj) { - StopRunLoop(); + bool hadSubscribers = s_addressChangedSubscribers.Count != 0 || + s_availabilityChangedSubscribers.Count != 0; + s_availabilityChangedSubscribers.Remove(value); + + if (hadSubscribers && s_addressChangedSubscribers.Count == 0 && + s_availabilityChangedSubscribers.Count == 0) + { + StopRunLoop(); + } } } } @@ -221,8 +233,61 @@ namespace System.Net.NetworkInformation private static void OnAddressChanged(IntPtr store, IntPtr changedKeys, IntPtr info) { - s_addressChangedSubscribers?.Invoke(null, EventArgs.Empty); - s_availabilityChangedSubscribers?.Invoke(null, new NetworkAvailabilityEventArgs(NetworkInterface.GetIsNetworkAvailable())); + Dictionary addressChangedSubscribers = null; + Dictionary availabilityChangedSubscribers = null; + + lock (s_lockObj) + { + if (s_addressChangedSubscribers.Count > 0) + { + addressChangedSubscribers = new Dictionary(s_addressChangedSubscribers); + } + if (s_availabilityChangedSubscribers.Count > 0) + { + availabilityChangedSubscribers = new Dictionary(s_availabilityChangedSubscribers); + } + } + + if (addressChangedSubscribers != null) + { + foreach (KeyValuePair + subscriber in addressChangedSubscribers) + { + NetworkAddressChangedEventHandler handler = subscriber.Key; + ExecutionContext ec = subscriber.Value; + + if (ec == null) // Flow supressed + { + handler(null, EventArgs.Empty); + } + else + { + ExecutionContext.Run(ec, s_runAddressChangedHandler, handler); + } + } + } + + if (availabilityChangedSubscribers != null) + { + bool isAvailable = NetworkInterface.GetIsNetworkAvailable(); + NetworkAvailabilityEventArgs args = isAvailable ? s_availableEventArgs : s_notAvailableEventArgs; + ContextCallback callbackContext = isAvailable ? s_runHandlerAvailable : s_runHandlerNotAvailable; + foreach (KeyValuePair + subscriber in availabilityChangedSubscribers) + { + NetworkAvailabilityChangedEventHandler handler = subscriber.Key; + ExecutionContext ec = subscriber.Value; + + if (ec == null) // Flow supressed + { + handler(null, args); + } + else + { + ExecutionContext.Run(ec, callbackContext, handler); + } + } + } } } } diff --git a/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkAddressChange.UnknownUnix.cs b/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkAddressChange.UnknownUnix.cs index e327f60a19..081c3420ba 100644 --- a/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkAddressChange.UnknownUnix.cs +++ b/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkAddressChange.UnknownUnix.cs @@ -4,7 +4,7 @@ namespace System.Net.NetworkInformation { - public class NetworkChange + public partial class NetworkChange { public static event NetworkAddressChangedEventHandler NetworkAddressChanged { diff --git a/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkAddressChange.Windows.cs b/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkAddressChange.Windows.cs index f731dc3e79..28e9b7c616 100644 --- a/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkAddressChange.Windows.cs +++ b/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkAddressChange.Windows.cs @@ -10,7 +10,7 @@ using System.Threading; namespace System.Net.NetworkInformation { - public class NetworkChange + public partial class NetworkChange { //introduced for supporting design-time loading of System.Windows.dll [Obsolete("This API supports the .NET Framework infrastructure and is not intended to be used directly from your code.", true)] @@ -44,20 +44,12 @@ namespace System.Net.NetworkInformation internal static class AvailabilityChangeListener { - private static readonly Dictionary s_availabilityCallerArray = - new Dictionary(); private static readonly NetworkAddressChangedEventHandler s_addressChange = ChangedAddress; private static volatile bool s_isAvailable = false; - private static readonly ContextCallback s_RunHandlerCallback = new ContextCallback(RunHandlerCallback); - - private static void RunHandlerCallback(object state) - { - ((NetworkAvailabilityChangedEventHandler)state)(null, new NetworkAvailabilityEventArgs(s_isAvailable)); - } private static void ChangedAddress(object sender, EventArgs eventArgs) { - Dictionary copy = null; + Dictionary availabilityChangedSubscribers = null; lock (s_globalLock) { @@ -68,25 +60,33 @@ namespace System.Net.NetworkInformation { s_isAvailable = isAvailableNow; - copy = - new Dictionary(s_availabilityCallerArray); + if (s_availabilityChangedSubscribers.Count > 0) + { + availabilityChangedSubscribers = new Dictionary(s_availabilityChangedSubscribers); + } } } // Executing user callbacks if Availability Change event occured. - if (copy != null) + if (availabilityChangedSubscribers != null) { - foreach (var entry in copy) + bool isAvailable = s_isAvailable; + NetworkAvailabilityEventArgs args = isAvailable ? s_availableEventArgs : s_notAvailableEventArgs; + ContextCallback callbackContext = isAvailable ? s_runHandlerAvailable : s_runHandlerNotAvailable; + + foreach (KeyValuePair + subscriber in availabilityChangedSubscribers) { - NetworkAvailabilityChangedEventHandler handler = entry.Key; - ExecutionContext context = entry.Value; - if (context == null) + NetworkAvailabilityChangedEventHandler handler = subscriber.Key; + ExecutionContext ec = subscriber.Value; + + if (ec == null) // Flow supressed { - handler(null, new NetworkAvailabilityEventArgs(s_isAvailable)); + handler(null, args); } else { - ExecutionContext.Run(context, s_RunHandlerCallback, handler); + ExecutionContext.Run(ec, callbackContext, handler); } } } @@ -94,29 +94,32 @@ namespace System.Net.NetworkInformation internal static void Start(NetworkAvailabilityChangedEventHandler caller) { - lock (s_globalLock) + if (caller != null) { - if (s_availabilityCallerArray.Count == 0) + lock (s_globalLock) { - s_isAvailable = NetworkInterface.GetIsNetworkAvailable(); - AddressChangeListener.UnsafeStart(s_addressChange); - } + if (s_availabilityChangedSubscribers.Count == 0) + { + s_isAvailable = NetworkInterface.GetIsNetworkAvailable(); + AddressChangeListener.UnsafeStart(s_addressChange); + } - if ((caller != null) && (!s_availabilityCallerArray.ContainsKey(caller))) - { - s_availabilityCallerArray.Add(caller, ExecutionContext.Capture()); + s_availabilityChangedSubscribers.TryAdd(caller, ExecutionContext.Capture()); } } } internal static void Stop(NetworkAvailabilityChangedEventHandler caller) { - lock (s_globalLock) + if (caller != null) { - s_availabilityCallerArray.Remove(caller); - if (s_availabilityCallerArray.Count == 0) + lock (s_globalLock) { - AddressChangeListener.Stop(s_addressChange); + s_availabilityChangedSubscribers.Remove(caller); + if (s_availabilityChangedSubscribers.Count == 0) + { + AddressChangeListener.Stop(s_addressChange); + } } } } @@ -125,9 +128,6 @@ namespace System.Net.NetworkInformation // Helper class for detecting address change events. internal static unsafe class AddressChangeListener { - private static readonly Dictionary s_callerArray = - new Dictionary(); - private static readonly ContextCallback s_runHandlerCallback = new ContextCallback(RunHandlerCallback); private static RegisteredWaitHandle s_registeredWait; // Need to keep the reference so it isn't GC'd before the native call executes. @@ -141,7 +141,7 @@ namespace System.Net.NetworkInformation // Callback fired when an address change occurs. private static void AddressChangedCallback(object stateObject, bool signaled) { - Dictionary copy; + Dictionary addressChangedSubscribers = null; lock (s_globalLock) { @@ -156,7 +156,10 @@ namespace System.Net.NetworkInformation s_isListening = false; // Need to copy the array so the callback can call start and stop - copy = new Dictionary(s_callerArray); + if (s_addressChangedSubscribers.Count > 0) + { + addressChangedSubscribers = new Dictionary(s_addressChangedSubscribers); + } try { @@ -170,29 +173,26 @@ namespace System.Net.NetworkInformation } // Release the lock before calling into user callback. - if (copy.Count > 0) + if (addressChangedSubscribers != null) { - foreach (var entry in copy) + foreach (KeyValuePair + subscriber in addressChangedSubscribers) { - NetworkAddressChangedEventHandler handler = entry.Key; - ExecutionContext context = entry.Value; - if (context == null) + NetworkAddressChangedEventHandler handler = subscriber.Key; + ExecutionContext ec = subscriber.Value; + + if (ec == null) // Flow supressed { handler(null, EventArgs.Empty); } else { - ExecutionContext.Run(context, s_runHandlerCallback, handler); + ExecutionContext.Run(ec, s_runAddressChangedHandler, handler); } } } } - private static void RunHandlerCallback(object state) - { - ((NetworkAddressChangedEventHandler)state)(null, EventArgs.Empty); - } - internal static void Start(NetworkAddressChangedEventHandler caller) { StartHelper(caller, true, StartIPOptions.Both); @@ -205,138 +205,141 @@ namespace System.Net.NetworkInformation private static void StartHelper(NetworkAddressChangedEventHandler caller, bool captureContext, StartIPOptions startIPOptions) { - lock (s_globalLock) + if (caller != null) { - // Setup changedEvent and native overlapped struct. - if (s_ipv4Socket == null) + lock (s_globalLock) { - int blocking; - - // Sockets will be initialized by the call to OSSupportsIP*. - if (Socket.OSSupportsIPv4) + // Setup changedEvent and native overlapped struct. + if (s_ipv4Socket == null) { - blocking = -1; - s_ipv4Socket = SafeCloseSocketAndEvent.CreateWSASocketWithEvent(AddressFamily.InterNetwork, SocketType.Dgram, (ProtocolType)0, true, false); - Interop.Winsock.ioctlsocket(s_ipv4Socket, Interop.Winsock.IoctlSocketConstants.FIONBIO, ref blocking); - s_ipv4WaitHandle = s_ipv4Socket.GetEventHandle(); - } + int blocking; - if (Socket.OSSupportsIPv6) - { - blocking = -1; - s_ipv6Socket = SafeCloseSocketAndEvent.CreateWSASocketWithEvent(AddressFamily.InterNetworkV6, SocketType.Dgram, (ProtocolType)0, true, false); - Interop.Winsock.ioctlsocket(s_ipv6Socket, Interop.Winsock.IoctlSocketConstants.FIONBIO, ref blocking); - s_ipv6WaitHandle = s_ipv6Socket.GetEventHandle(); - } - } - - if ((caller != null) && (!s_callerArray.ContainsKey(caller))) - { - s_callerArray.Add(caller, captureContext ? ExecutionContext.Capture() : null); - } - - if (s_isListening || s_callerArray.Count == 0) - { - return; - } - - if (!s_isPending) - { - int length; - SocketError errorCode; - - if (Socket.OSSupportsIPv4 && (startIPOptions & StartIPOptions.StartIPv4) != 0) - { - s_registeredWait = ThreadPool.RegisterWaitForSingleObject( - s_ipv4WaitHandle, - new WaitOrTimerCallback(AddressChangedCallback), - StartIPOptions.StartIPv4, - -1, - true); - - errorCode = Interop.Winsock.WSAIoctl_Blocking( - s_ipv4Socket.DangerousGetHandle(), - (int)IOControlCode.AddressListChange, - null, 0, null, 0, - out length, - IntPtr.Zero, IntPtr.Zero); - - if (errorCode != SocketError.Success) + // Sockets will be initialized by the call to OSSupportsIP*. + if (Socket.OSSupportsIPv4) { - NetworkInformationException exception = new NetworkInformationException(); - if (exception.ErrorCode != (uint)SocketError.WouldBlock) + blocking = -1; + s_ipv4Socket = SafeCloseSocketAndEvent.CreateWSASocketWithEvent(AddressFamily.InterNetwork, SocketType.Dgram, (ProtocolType)0, true, false); + Interop.Winsock.ioctlsocket(s_ipv4Socket, Interop.Winsock.IoctlSocketConstants.FIONBIO, ref blocking); + s_ipv4WaitHandle = s_ipv4Socket.GetEventHandle(); + } + + if (Socket.OSSupportsIPv6) + { + blocking = -1; + s_ipv6Socket = SafeCloseSocketAndEvent.CreateWSASocketWithEvent(AddressFamily.InterNetworkV6, SocketType.Dgram, (ProtocolType)0, true, false); + Interop.Winsock.ioctlsocket(s_ipv6Socket, Interop.Winsock.IoctlSocketConstants.FIONBIO, ref blocking); + s_ipv6WaitHandle = s_ipv6Socket.GetEventHandle(); + } + } + + s_addressChangedSubscribers.TryAdd(caller, captureContext ? ExecutionContext.Capture() : null); + + if (s_isListening || s_addressChangedSubscribers.Count == 0) + { + return; + } + + if (!s_isPending) + { + int length; + SocketError errorCode; + + if (Socket.OSSupportsIPv4 && (startIPOptions & StartIPOptions.StartIPv4) != 0) + { + s_registeredWait = ThreadPool.RegisterWaitForSingleObject( + s_ipv4WaitHandle, + new WaitOrTimerCallback(AddressChangedCallback), + StartIPOptions.StartIPv4, + -1, + true); + + errorCode = Interop.Winsock.WSAIoctl_Blocking( + s_ipv4Socket.DangerousGetHandle(), + (int)IOControlCode.AddressListChange, + null, 0, null, 0, + out length, + IntPtr.Zero, IntPtr.Zero); + + if (errorCode != SocketError.Success) { - throw exception; + NetworkInformationException exception = new NetworkInformationException(); + if (exception.ErrorCode != (uint)SocketError.WouldBlock) + { + throw exception; + } + } + + SafeWaitHandle s_ipv4SocketGetEventHandleSafeWaitHandle = + s_ipv4Socket.GetEventHandle().GetSafeWaitHandle(); + + errorCode = Interop.Winsock.WSAEventSelect( + s_ipv4Socket, + s_ipv4SocketGetEventHandleSafeWaitHandle, + Interop.Winsock.AsyncEventBits.FdAddressListChange); + + if (errorCode != SocketError.Success) + { + throw new NetworkInformationException(); } } - SafeWaitHandle s_ipv4SocketGetEventHandleSafeWaitHandle = - s_ipv4Socket.GetEventHandle().GetSafeWaitHandle(); - - errorCode = Interop.Winsock.WSAEventSelect( - s_ipv4Socket, - s_ipv4SocketGetEventHandleSafeWaitHandle, - Interop.Winsock.AsyncEventBits.FdAddressListChange); - - if (errorCode != SocketError.Success) + if (Socket.OSSupportsIPv6 && (startIPOptions & StartIPOptions.StartIPv6) != 0) { - throw new NetworkInformationException(); - } - } + s_registeredWait = ThreadPool.RegisterWaitForSingleObject( + s_ipv6WaitHandle, + new WaitOrTimerCallback(AddressChangedCallback), + StartIPOptions.StartIPv6, + -1, + true); - if (Socket.OSSupportsIPv6 && (startIPOptions & StartIPOptions.StartIPv6) != 0) - { - s_registeredWait = ThreadPool.RegisterWaitForSingleObject( - s_ipv6WaitHandle, - new WaitOrTimerCallback(AddressChangedCallback), - StartIPOptions.StartIPv6, - -1, - true); + errorCode = Interop.Winsock.WSAIoctl_Blocking( + s_ipv6Socket.DangerousGetHandle(), + (int)IOControlCode.AddressListChange, + null, 0, null, 0, + out length, + IntPtr.Zero, IntPtr.Zero); - errorCode = Interop.Winsock.WSAIoctl_Blocking( - s_ipv6Socket.DangerousGetHandle(), - (int)IOControlCode.AddressListChange, - null, 0, null, 0, - out length, - IntPtr.Zero, IntPtr.Zero); - - if (errorCode != SocketError.Success) - { - NetworkInformationException exception = new NetworkInformationException(); - if (exception.ErrorCode != (uint)SocketError.WouldBlock) + if (errorCode != SocketError.Success) { - throw exception; + NetworkInformationException exception = new NetworkInformationException(); + if (exception.ErrorCode != (uint)SocketError.WouldBlock) + { + throw exception; + } + } + + SafeWaitHandle s_ipv6SocketGetEventHandleSafeWaitHandle = + s_ipv6Socket.GetEventHandle().GetSafeWaitHandle(); + + errorCode = Interop.Winsock.WSAEventSelect( + s_ipv6Socket, + s_ipv6SocketGetEventHandleSafeWaitHandle, + Interop.Winsock.AsyncEventBits.FdAddressListChange); + + if (errorCode != SocketError.Success) + { + throw new NetworkInformationException(); } } - - SafeWaitHandle s_ipv6SocketGetEventHandleSafeWaitHandle = - s_ipv6Socket.GetEventHandle().GetSafeWaitHandle(); - - errorCode = Interop.Winsock.WSAEventSelect( - s_ipv6Socket, - s_ipv6SocketGetEventHandleSafeWaitHandle, - Interop.Winsock.AsyncEventBits.FdAddressListChange); - - if (errorCode != SocketError.Success) - { - throw new NetworkInformationException(); - } } - } - s_isListening = true; - s_isPending = true; + s_isListening = true; + s_isPending = true; + } } } internal static void Stop(NetworkAddressChangedEventHandler caller) { - lock (s_globalLock) + if (caller != null) { - s_callerArray.Remove(caller); - if (s_callerArray.Count == 0 && s_isListening) + lock (s_globalLock) { - s_isListening = false; + s_addressChangedSubscribers.Remove(caller); + if (s_addressChangedSubscribers.Count == 0 && s_isListening) + { + s_isListening = false; + } } } } diff --git a/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkAddressChange.cs b/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkAddressChange.cs new file mode 100644 index 0000000000..ed099bac0d --- /dev/null +++ b/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkAddressChange.cs @@ -0,0 +1,41 @@ +// 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.Collections.Generic; +using System.Threading; + +namespace System.Net.NetworkInformation +{ + public partial class NetworkChange + { + // The list of current address-changed subscribers. + private static readonly Dictionary s_addressChangedSubscribers = + new Dictionary(); + + // The list of current availability-changed subscribers. + private static readonly Dictionary s_availabilityChangedSubscribers = + new Dictionary(); + + private static readonly NetworkAvailabilityEventArgs s_availableEventArgs = new NetworkAvailabilityEventArgs(isAvailable: true); + private static readonly NetworkAvailabilityEventArgs s_notAvailableEventArgs = new NetworkAvailabilityEventArgs(isAvailable: false); + private static readonly ContextCallback s_runHandlerAvailable = new ContextCallback(RunAvailabilityHandlerAvailable); + private static readonly ContextCallback s_runHandlerNotAvailable = new ContextCallback(RunAvailabilityHandlerNotAvailable); + private static readonly ContextCallback s_runAddressChangedHandler = new ContextCallback(RunAddressChangedHandler); + + private static void RunAddressChangedHandler(object state) + { + ((NetworkAddressChangedEventHandler)state)(null, EventArgs.Empty); + } + + private static void RunAvailabilityHandlerAvailable(object state) + { + ((NetworkAvailabilityChangedEventHandler)state)(null, s_availableEventArgs); + } + + private static void RunAvailabilityHandlerNotAvailable(object state) + { + ((NetworkAvailabilityChangedEventHandler)state)(null, s_notAvailableEventArgs); + } + } +} diff --git a/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/SystemNetworkInterface.cs b/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/SystemNetworkInterface.cs index e6f4764f32..8bc75efcde 100644 --- a/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/SystemNetworkInterface.cs +++ b/external/corefx/src/System.Net.NetworkInformation/src/System/Net/NetworkInformation/SystemNetworkInterface.cs @@ -123,7 +123,7 @@ namespace System.Net.NetworkInformation // If we don't have any interfaces detected, return empty. if (result == Interop.IpHlpApi.ERROR_NO_DATA || result == Interop.IpHlpApi.ERROR_INVALID_PARAMETER) { - return new SystemNetworkInterface[0]; + return Array.Empty(); } // Otherwise we throw on an error. diff --git a/external/corefx/src/System.Net.Ping/src/System.Net.Ping.csproj b/external/corefx/src/System.Net.Ping/src/System.Net.Ping.csproj index 61b55ca48d..c823b9a94f 100644 --- a/external/corefx/src/System.Net.Ping/src/System.Net.Ping.csproj +++ b/external/corefx/src/System.Net.Ping/src/System.Net.Ping.csproj @@ -29,9 +29,6 @@ Common\System\Net\ByteOrder.cs - - Common\System\Net\IntPtrHelper.cs - Common\System\Net\IPAddressParserStatics.cs diff --git a/external/corefx/src/System.Net.Ping/src/System/Net/NetworkInformation/Ping.Windows.cs b/external/corefx/src/System.Net.Ping/src/System/Net/NetworkInformation/Ping.Windows.cs index 59e7ca0f53..1720f123ee 100644 --- a/external/corefx/src/System.Net.Ping/src/System/Net/NetworkInformation/Ping.Windows.cs +++ b/external/corefx/src/System.Net.Ping/src/System/Net/NetworkInformation/Ping.Windows.cs @@ -312,7 +312,7 @@ namespace System.Net.NetworkInformation // Only copy the data if we succeed w/ the ping operation. rtt = reply.RoundTripTime; buffer = new byte[sendSize]; - Marshal.Copy(IntPtrHelper.Add(dataPtr, 36), buffer, 0, sendSize); + Marshal.Copy(dataPtr + 36, buffer, 0, sendSize); } else { diff --git a/external/corefx/src/System.Net.Ping/tests/FunctionalTests/UnixPingUtilityTests.cs b/external/corefx/src/System.Net.Ping/tests/FunctionalTests/UnixPingUtilityTests.cs index 62e9191af9..e05d073f11 100644 --- a/external/corefx/src/System.Net.Ping/tests/FunctionalTests/UnixPingUtilityTests.cs +++ b/external/corefx/src/System.Net.Ping/tests/FunctionalTests/UnixPingUtilityTests.cs @@ -2,6 +2,7 @@ // 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.Collections.Generic; using System.Diagnostics; using System.Net.Sockets; using System.Runtime.InteropServices; @@ -33,21 +34,59 @@ namespace System.Net.NetworkInformation.Tests ? UnixCommandLinePing.Ping4UtilityPath : UnixCommandLinePing.Ping6UtilityPath; - ProcessStartInfo psi = new ProcessStartInfo(utilityPath, arguments); - psi.RedirectStandardError = true; - psi.RedirectStandardOutput = true; - Process p = Process.Start(psi); + var p = new Process(); + p.StartInfo.FileName = utilityPath; + p.StartInfo.Arguments = arguments; + p.StartInfo.UseShellExecute = false; + + p.StartInfo.RedirectStandardOutput = true; + var stdOutLines = new List(); + p.OutputDataReceived += new DataReceivedEventHandler( + delegate (object sendingProcess, DataReceivedEventArgs outputLine) { stdOutLines.Add(outputLine.Data); }); - string pingOutput = p.StandardOutput.ReadToEnd(); - Assert.True(p.WaitForExit(TestSettings.PingTimeout), "Ping process did not exit in " + TestSettings.PingTimeout + " ms."); - if (p.ExitCode == 1 || p.ExitCode == 2) + p.StartInfo.RedirectStandardError = true; + var stdErrLines = new List(); + p.ErrorDataReceived += new DataReceivedEventHandler( + delegate (object sendingProcess, DataReceivedEventArgs errorLine) { stdErrLines.Add(errorLine.Data); }); + + p.Start(); + p.BeginOutputReadLine(); + p.BeginErrorReadLine(); + + // There are multiple issues with ping6 in macOS 10.12 (Sierra), see https://github.com/dotnet/corefx/issues/26358. + bool isPing6OnMacSierra = utilityPath.Equals(UnixCommandLinePing.Ping6UtilityPath) && + RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && + !PlatformDetection.IsMacOsHighSierraOrHigher; + + string pingOutput; + if (!p.WaitForExit(TestSettings.PingTimeout)) { - // Workaround known OSX bug in ping6 utility. - Assert.Equal(utilityPath, UnixCommandLinePing.Ping6UtilityPath); - Assert.True(RuntimeInformation.IsOSPlatform(OSPlatform.OSX)); - return; + // Workaround known issues with ping6 in macOS 10.12 + if (isPing6OnMacSierra) + return; + + pingOutput = string.Join("\n", stdOutLines); + string stdErr = string.Join("\n", stdErrLines); + throw new Exception( + $"[{utilityPath} {arguments}] process did not exit in {TestSettings.PingTimeout} ms.\nStdOut:[{pingOutput}]\nStdErr:[{stdErr}]"); } + // Ensure standard output and error are flushed + p.WaitForExit(); + + pingOutput = string.Join("\n", stdOutLines); + var exitCode = p.ExitCode; + if (exitCode != 0) + { + // Workaround known issues with ping6 in macOS 10.12 + if (isPing6OnMacSierra) + return; + + string stdErr = string.Join("\n", stdErrLines); + throw new Exception( + $"[{utilityPath} {arguments}] process exit code is {exitCode}.\nStdOut:[{pingOutput}]\nStdErr:[{stdErr}]"); + } + try { // Validate that the returned data size is correct. @@ -65,7 +104,9 @@ namespace System.Net.NetworkInformation.Tests } catch (Exception e) { - throw new Exception($"Ping output was <{pingOutput}>", e); + string stdErr = string.Join("\n", stdErrLines); + throw new Exception( + $"Parse error for [{utilityPath} {arguments}] process exit code is {exitCode}.\nStdOut:[{pingOutput}]\nStdErr:[{stdErr}]", e); } } diff --git a/external/corefx/src/System.Net.Primitives/ref/System.Net.Primitives.cs b/external/corefx/src/System.Net.Primitives/ref/System.Net.Primitives.cs index f5123e3d7e..775a21d3dc 100644 --- a/external/corefx/src/System.Net.Primitives/ref/System.Net.Primitives.cs +++ b/external/corefx/src/System.Net.Primitives/ref/System.Net.Primitives.cs @@ -126,40 +126,55 @@ namespace System.Net public enum HttpStatusCode { Accepted = 202, + AlreadyReported = 208, Ambiguous = 300, BadGateway = 502, BadRequest = 400, Conflict = 409, Continue = 100, Created = 201, + EarlyHints = 103, ExpectationFailed = 417, + FailedDependency = 424, Forbidden = 403, Found = 302, GatewayTimeout = 504, Gone = 410, HttpVersionNotSupported = 505, + IMUsed = 226, + InsufficientStorage = 507, InternalServerError = 500, LengthRequired = 411, + Locked = 423, + LoopDetected = 508, MethodNotAllowed = 405, + MisdirectedRequest = 421, Moved = 301, MovedPermanently = 301, MultipleChoices = 300, + MultiStatus = 207, + NetworkAuthenticationRequired = 511, NoContent = 204, NonAuthoritativeInformation = 203, NotAcceptable = 406, + NotExtended = 510, NotFound = 404, NotImplemented = 501, NotModified = 304, OK = 200, PartialContent = 206, PaymentRequired = 402, + PermanentRedirect = 308, PreconditionFailed = 412, + PreconditionRequired = 428, + Processing = 102, ProxyAuthenticationRequired = 407, Redirect = 302, RedirectKeepVerb = 307, RedirectMethod = 303, RequestedRangeNotSatisfiable = 416, RequestEntityTooLarge = 413, + RequestHeaderFieldsTooLarge = 431, RequestTimeout = 408, RequestUriTooLong = 414, ResetContent = 205, @@ -167,11 +182,15 @@ namespace System.Net ServiceUnavailable = 503, SwitchingProtocols = 101, TemporaryRedirect = 307, + TooManyRequests = 429, Unauthorized = 401, + UnavailableForLegalReasons = 451, + UnprocessableEntity = 422, UnsupportedMediaType = 415, Unused = 306, UpgradeRequired = 426, UseProxy = 305, + VariantAlsoNegotiates = 506 } public partial interface ICredentials { diff --git a/external/corefx/src/System.Net.Primitives/src/MatchingRefApiCompatBaseline.netcoreapp.txt b/external/corefx/src/System.Net.Primitives/src/MatchingRefApiCompatBaseline.netcoreapp.txt new file mode 100644 index 0000000000..074f381930 --- /dev/null +++ b/external/corefx/src/System.Net.Primitives/src/MatchingRefApiCompatBaseline.netcoreapp.txt @@ -0,0 +1,4 @@ +Compat issues with assembly System.Net.Primitives: +TypesMustExist : Type 'System.Net.CookieVariant' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.Net.PathList' does not exist in the implementation but it does exist in the contract. +Total Issues: 2 diff --git a/external/corefx/src/System.Net.Primitives/src/MatchingRefApiCompatBaseline.uap.txt b/external/corefx/src/System.Net.Primitives/src/MatchingRefApiCompatBaseline.uap.txt new file mode 100644 index 0000000000..b33f3c8765 --- /dev/null +++ b/external/corefx/src/System.Net.Primitives/src/MatchingRefApiCompatBaseline.uap.txt @@ -0,0 +1,12 @@ +Compat issues with assembly System.Net.Primitives: +MembersMustExist : Member 'System.Boolean System.Net.Cookie.IsQuotedDomain' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Boolean System.Net.Cookie.IsQuotedVersion' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Net.Cookie.Clone()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Net.Cookie.InternalSetName(System.String)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Net.Cookie.ToServerString()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Net.Cookie.Variant.get()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Net.Cookie.Variant.set(System.Net.CookieVariant)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Net.CookieCollection.InternalAdd(System.Net.Cookie, System.Boolean)' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.Net.CookieVariant' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.Net.PathList' does not exist in the implementation but it does exist in the contract. +Total Issues: 10 diff --git a/external/corefx/src/System.Net.Primitives/src/System.Net.Primitives.csproj b/external/corefx/src/System.Net.Primitives/src/System.Net.Primitives.csproj index f759c979af..c34c478d45 100644 --- a/external/corefx/src/System.Net.Primitives/src/System.Net.Primitives.csproj +++ b/external/corefx/src/System.Net.Primitives/src/System.Net.Primitives.csproj @@ -6,6 +6,7 @@ Library {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55} true + true @@ -92,8 +93,8 @@ Common\System\Marvin.cs - - Common\System\IO\StringBuilderCache.cs + + Common\System\Text\StringBuilderCache.cs diff --git a/external/corefx/src/System.Net.Primitives/src/System/Net/CookieContainer.cs b/external/corefx/src/System.Net.Primitives/src/System/Net/CookieContainer.cs index 27dc045528..527a94ec2d 100644 --- a/external/corefx/src/System.Net.Primitives/src/System/Net/CookieContainer.cs +++ b/external/corefx/src/System.Net.Primitives/src/System/Net/CookieContainer.cs @@ -97,6 +97,7 @@ namespace System.Net public const int DefaultPerDomainCookieLimit = 20; public const int DefaultCookieLengthLimit = 4096; + private static readonly string s_fqdnMyDomain = CreateFqdnMyDomain(); private static readonly HeaderVariantInfo[] s_headerInfo = { new HeaderVariantInfo(HttpKnownHeaderNames.SetCookie, CookieVariant.Rfc2109), new HeaderVariantInfo(HttpKnownHeaderNames.SetCookie2, CookieVariant.Rfc2965) @@ -107,19 +108,13 @@ namespace System.Net private int m_maxCookies = DefaultCookieLimit; // Do not rename (binary serialization) private int m_maxCookiesPerDomain = DefaultPerDomainCookieLimit; // Do not rename (binary serialization) private int m_count = 0; // Do not rename (binary serialization) - private string m_fqdnMyDomain = string.Empty; // Do not rename (binary serialization) + private string m_fqdnMyDomain = s_fqdnMyDomain; // Do not rename (binary serialization) public CookieContainer() { - string domain = HostInformation.DomainName; - if (domain != null && domain.Length > 1) - { - m_fqdnMyDomain = '.' + domain; - } - // Otherwise it will remain string.Empty. } - public CookieContainer(int capacity) : this() + public CookieContainer(int capacity) { if (capacity <= 0) { @@ -142,6 +137,14 @@ namespace System.Net m_maxCookieSize = maxCookieSize; } + private static string CreateFqdnMyDomain() + { + string domain = HostInformation.DomainName; + return domain != null && domain.Length > 1 ? + '.' + domain : + string.Empty; + } + // NOTE: after shrinking the capacity, Count can become greater than Capacity. public int Capacity { diff --git a/external/corefx/src/System.Net.Primitives/src/System/Net/HttpStatusCode.cs b/external/corefx/src/System.Net.Primitives/src/System/Net/HttpStatusCode.cs index 2dc66e3244..e46a925a33 100644 --- a/external/corefx/src/System.Net.Primitives/src/System/Net/HttpStatusCode.cs +++ b/external/corefx/src/System.Net.Primitives/src/System/Net/HttpStatusCode.cs @@ -10,6 +10,8 @@ namespace System.Net // Informational 1xx Continue = 100, SwitchingProtocols = 101, + Processing = 102, + EarlyHints = 103, // Successful 2xx OK = 200, @@ -19,6 +21,10 @@ namespace System.Net NoContent = 204, ResetContent = 205, PartialContent = 206, + MultiStatus = 207, + AlreadyReported = 208, + + IMUsed = 226, // Redirection 3xx MultipleChoices = 300, @@ -34,6 +40,7 @@ namespace System.Net Unused = 306, TemporaryRedirect = 307, RedirectKeepVerb = 307, + PermanentRedirect = 308, // Client Error 4xx BadRequest = 400, @@ -54,9 +61,25 @@ namespace System.Net UnsupportedMediaType = 415, RequestedRangeNotSatisfiable = 416, ExpectationFailed = 417, + // From the discussion thread on #4382: + // "It would be a mistake to add it to .NET now. See golang/go#21326, + // nodejs/node#14644, requests/requests#4238 and aspnet/HttpAbstractions#915". + // ImATeapot = 418 + + MisdirectedRequest = 421, + UnprocessableEntity = 422, + Locked = 423, + FailedDependency = 424, UpgradeRequired = 426, + PreconditionRequired = 428, + TooManyRequests = 429, + + RequestHeaderFieldsTooLarge = 431, + + UnavailableForLegalReasons = 451, + // Server Error 5xx InternalServerError = 500, NotImplemented = 501, @@ -64,5 +87,11 @@ namespace System.Net ServiceUnavailable = 503, GatewayTimeout = 504, HttpVersionNotSupported = 505, + VariantAlsoNegotiates = 506, + InsufficientStorage = 507, + LoopDetected = 508, + + NotExtended = 510, + NetworkAuthenticationRequired = 511 } } diff --git a/external/corefx/src/System.Net.Primitives/src/System/Net/IPAddress.cs b/external/corefx/src/System.Net.Primitives/src/System/Net/IPAddress.cs index 5aeeac6ccc..7b7781bfea 100644 --- a/external/corefx/src/System.Net.Primitives/src/System/Net/IPAddress.cs +++ b/external/corefx/src/System.Net.Primitives/src/System/Net/IPAddress.cs @@ -6,6 +6,7 @@ using System.Buffers.Binary; using System.Diagnostics; using System.Net.Sockets; using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; namespace System.Net { @@ -232,7 +233,7 @@ namespace System.Net return false; } - address = IPAddressParser.Parse(ipString.AsReadOnlySpan(), tryParse: true); + address = IPAddressParser.Parse(ipString.AsSpan(), tryParse: true); return (address != null); } @@ -249,7 +250,7 @@ namespace System.Net throw new ArgumentNullException(nameof(ipString)); } - return IPAddressParser.Parse(ipString.AsReadOnlySpan(), tryParse: false); + return IPAddressParser.Parse(ipString.AsSpan(), tryParse: false); } public static IPAddress Parse(ReadOnlySpan ipSpan) @@ -611,7 +612,7 @@ namespace System.Net const int addressAndScopeIdLength = IPAddressParserStatics.IPv6AddressBytes + sizeof(uint); Span addressAndScopeIdSpan = stackalloc byte[addressAndScopeIdLength]; - new ReadOnlySpan(_numbers).AsBytes().CopyTo(addressAndScopeIdSpan); + MemoryMarshal.AsBytes(new ReadOnlySpan(_numbers)).CopyTo(addressAndScopeIdSpan); Span scopeIdSpan = addressAndScopeIdSpan.Slice(IPAddressParserStatics.IPv6AddressBytes); bool scopeWritten = BitConverter.TryWriteBytes(scopeIdSpan, _addressOrScopeId); Debug.Assert(scopeWritten); @@ -627,7 +628,7 @@ namespace System.Net // For IPv4 addresses, we use Marvin on the integer representation of the Address. hashCode = Marvin.ComputeHash32( - addressOrScopeIdSpan.AsBytes(), + MemoryMarshal.AsBytes(addressOrScopeIdSpan), Marvin.DefaultSeed); } diff --git a/external/corefx/src/System.Net.Primitives/src/System/Net/IPAddressParser.cs b/external/corefx/src/System.Net.Primitives/src/System/Net/IPAddressParser.cs index 930914f9b2..35998e6437 100644 --- a/external/corefx/src/System.Net.Primitives/src/System/Net/IPAddressParser.cs +++ b/external/corefx/src/System.Net.Primitives/src/System/Net/IPAddressParser.cs @@ -21,6 +21,7 @@ namespace System.Net // The address is parsed as IPv6 if and only if it contains a colon. This is valid because // we don't support/parse a port specification at the end of an IPv4 address. ushort* numbers = stackalloc ushort[IPAddressParserStatics.IPv6AddressShorts]; + new Span(numbers, IPAddressParserStatics.IPv6AddressShorts).Clear(); if (Ipv6StringToAddress(ipSpan, numbers, IPAddressParserStatics.IPv6AddressShorts, out uint scope)) { return new IPAddress(numbers, IPAddressParserStatics.IPv6AddressShorts, scope); diff --git a/external/corefx/src/System.Net.Primitives/tests/FunctionalTests/IPAddressParsingSpan.cs b/external/corefx/src/System.Net.Primitives/tests/FunctionalTests/IPAddressParsingSpan.cs index b8f38d10d4..0b41beb2e7 100644 --- a/external/corefx/src/System.Net.Primitives/tests/FunctionalTests/IPAddressParsingSpan.cs +++ b/external/corefx/src/System.Net.Primitives/tests/FunctionalTests/IPAddressParsingSpan.cs @@ -9,8 +9,8 @@ namespace System.Net.Primitives.Functional.Tests { public sealed class IPAddressParsing_Span : IPAddressParsing { - public override IPAddress Parse(string ipString) => IPAddress.Parse(ipString.AsReadOnlySpan()); - public override bool TryParse(string ipString, out IPAddress address) => IPAddress.TryParse(ipString.AsReadOnlySpan(), out address); + public override IPAddress Parse(string ipString) => IPAddress.Parse(ipString.AsSpan()); + public override bool TryParse(string ipString, out IPAddress address) => IPAddress.TryParse(ipString.AsSpan(), out address); [Theory] diff --git a/external/corefx/src/System.Net.Primitives/tests/FunctionalTests/IPAddressSpanTest.cs b/external/corefx/src/System.Net.Primitives/tests/FunctionalTests/IPAddressSpanTest.cs index 890ef3b14a..57de140b5e 100644 --- a/external/corefx/src/System.Net.Primitives/tests/FunctionalTests/IPAddressSpanTest.cs +++ b/external/corefx/src/System.Net.Primitives/tests/FunctionalTests/IPAddressSpanTest.cs @@ -37,7 +37,7 @@ namespace System.Net.Primitives.Functional.Tests IPAddress ip = new IPAddress(address); Assert.True(ip.TryWriteBytes(new Span(result), out int bytesWritten)); - Assert.Equal(address, result.AsSpan().Slice(0, bytesWritten).ToArray()); + Assert.Equal(address, result.AsSpan(0, bytesWritten).ToArray()); Assert.Equal(address.Length, bytesWritten); } diff --git a/external/corefx/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj b/external/corefx/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj index 818d010db0..510babcb7e 100644 --- a/external/corefx/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj +++ b/external/corefx/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj @@ -54,8 +54,8 @@ ProductionCode\Common\System\Marvin.cs - - ProductionCode\Common\System\IO\StringBuilderCache.cs + + ProductionCode\Common\System\Text\StringBuilderCache.cs @@ -168,4 +168,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/System.Net.Primitives/tests/UnitTests/CookieInternalTest.cs b/external/corefx/src/System.Net.Primitives/tests/UnitTests/CookieInternalTest.cs index 35653d720d..797fcf63f0 100644 --- a/external/corefx/src/System.Net.Primitives/tests/UnitTests/CookieInternalTest.cs +++ b/external/corefx/src/System.Net.Primitives/tests/UnitTests/CookieInternalTest.cs @@ -80,33 +80,5 @@ namespace NetPrimitivesUnitTests int expectedCookieCount = expectedStrings.Length >> 1; Assert.Equal(expectedCookieCount, cookieCount); } - - [ActiveIssue(22925)] - [Theory] - [InlineData("cookie_name=cookie_value", new[] { "cookie_name", "cookie_value" })] - [InlineData("cookie_name=cookie_value;", new[] { "cookie_name", "cookie_value" })] - [InlineData("cookie_name1=cookie_value1;cookie_name2=cookie_value2", new[] { "cookie_name1", "cookie_value1", "cookie_name2", "cookie_value2" })] - [InlineData("cookie_name1=cookie_value1;cookie_name2=cookie_value2;", new[] { "cookie_name1", "cookie_value1", "cookie_name2", "cookie_value2" })] - public void CookieParserGet_SetCookieHeaderValue_Success(string cookieString, string[] expectedStrings) - { - int index = 0; - int cookieCount = 0; - var parser = new CookieParser(cookieString); - while (true) - { - Cookie cookie = parser.Get(); - if (cookie == null) - { - break; - } - - cookieCount++; - Assert.Equal(expectedStrings[index++], cookie.Name); - Assert.Equal(expectedStrings[index++], cookie.Value); - } - - int expectedCookieCount = expectedStrings.Length >> 1; - Assert.Equal(expectedCookieCount, cookieCount); - } } } diff --git a/external/corefx/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj b/external/corefx/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj index 9185a900ed..aa22a5feed 100644 --- a/external/corefx/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj +++ b/external/corefx/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj @@ -98,8 +98,8 @@ Common\System\Marvin.cs - - Common\System\IO\StringBuilderCache.cs + + Common\System\Text\StringBuilderCache.cs @@ -144,4 +144,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/System.Net.Requests/src/FxCopBaseline.cs b/external/corefx/src/System.Net.Requests/src/FxCopBaseline.cs index 864b3c544d..555bfdee18 100644 --- a/external/corefx/src/System.Net.Requests/src/FxCopBaseline.cs +++ b/external/corefx/src/System.Net.Requests/src/FxCopBaseline.cs @@ -1,3 +1,7 @@ +// 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.CodeAnalysis; [assembly: SuppressMessage("Microsoft.Design", "CA2237", Scope = "type", Target = "System.Net.FtpWebRequest")] diff --git a/external/corefx/src/System.Net.Requests/src/MatchingRefApiCompatBaseline.txt b/external/corefx/src/System.Net.Requests/src/MatchingRefApiCompatBaseline.txt new file mode 100644 index 0000000000..7cfb162513 --- /dev/null +++ b/external/corefx/src/System.Net.Requests/src/MatchingRefApiCompatBaseline.txt @@ -0,0 +1,3 @@ +Compat issues with assembly System.Net.Requests: +MembersMustExist : Member 'System.Net.HttpWebRequest..ctor()' does not exist in the implementation but it does exist in the contract. +Total Issues: 1 diff --git a/external/corefx/src/System.Net.Requests/src/System.Net.Requests.csproj b/external/corefx/src/System.Net.Requests/src/System.Net.Requests.csproj index 1052fe84b7..02ba7fd65b 100644 --- a/external/corefx/src/System.Net.Requests/src/System.Net.Requests.csproj +++ b/external/corefx/src/System.Net.Requests/src/System.Net.Requests.csproj @@ -6,6 +6,7 @@ System.Net.Requests System.Net.Requests true + true @@ -140,4 +141,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/System.Net.Requests/src/System/Net/HttpDateParse.cs b/external/corefx/src/System.Net.Requests/src/System/Net/HttpDateParse.cs index 1eec59f08a..d384b90e51 100644 --- a/external/corefx/src/System.Net.Requests/src/System/Net/HttpDateParse.cs +++ b/external/corefx/src/System.Net.Requests/src/System/Net/HttpDateParse.cs @@ -398,5 +398,8 @@ namespace System.Net return true; } + + public static DateTime StringToDate(string s) => + HttpDateParse.ParseHttpDate(s, out DateTime dtOut) ? dtOut : throw new ProtocolViolationException(SR.net_baddate); } } diff --git a/external/corefx/src/System.Net.Requests/src/System/Net/HttpWebRequest.cs b/external/corefx/src/System.Net.Requests/src/System/Net/HttpWebRequest.cs index 1d10fe8d35..b04c2bc300 100644 --- a/external/corefx/src/System.Net.Requests/src/System/Net/HttpWebRequest.cs +++ b/external/corefx/src/System.Net.Requests/src/System/Net/HttpWebRequest.cs @@ -1164,7 +1164,7 @@ namespace System.Net if (_hostUri != null) { - request.Headers.Host = _hostUri.Host; + request.Headers.Host = Host; } // Copy the HttpWebRequest request headers from the WebHeaderCollection into HttpRequestMessage.Headers and @@ -1451,7 +1451,7 @@ namespace System.Net { return DateTime.MinValue; // MinValue means header is not present } - return StringToDate(headerValue); + return HttpDateParse.StringToDate(headerValue); #if DEBUG } #endif @@ -1472,20 +1472,6 @@ namespace System.Net #endif } - // parse String to DateTime format. - private static DateTime StringToDate(String S) - { - DateTime dtOut; - if (HttpDateParse.ParseHttpDate(S, out dtOut)) - { - return dtOut; - } - else - { - throw new ProtocolViolationException(SR.net_baddate); - } - } - // convert Date to String using RFC 1123 pattern private static string DateToString(DateTime D) { diff --git a/external/corefx/src/System.Net.Requests/src/System/Net/HttpWebResponse.cs b/external/corefx/src/System.Net.Requests/src/System/Net/HttpWebResponse.cs index 1e7be94bcb..6979a843df 100644 --- a/external/corefx/src/System.Net.Requests/src/System/Net/HttpWebResponse.cs +++ b/external/corefx/src/System.Net.Requests/src/System/Net/HttpWebResponse.cs @@ -151,13 +151,11 @@ namespace System.Net { return DateTime.Now; } - DateTime dtOut; - HttpDateParse.ParseHttpDate(lastmodHeaderValue, out dtOut); - return dtOut; + + return HttpDateParse.StringToDate(lastmodHeaderValue); } } - /// /// /// Gets the name of the server that sent the response. diff --git a/external/corefx/src/System.Net.Requests/src/System/Net/WebException.cs b/external/corefx/src/System.Net.Requests/src/System/Net/WebException.cs index 1b9865776e..bdf2e157d0 100644 --- a/external/corefx/src/System.Net.Requests/src/System/Net/WebException.cs +++ b/external/corefx/src/System.Net.Requests/src/System/Net/WebException.cs @@ -4,6 +4,7 @@ using System.Diagnostics; using System.Net.Http; +using System.Net.Sockets; using System.Runtime.Serialization; using System.Threading.Tasks; @@ -112,5 +113,28 @@ namespace System.Net return exception; } + + private static WebExceptionStatus GetStatusFromExceptionHelper(HttpRequestException ex) + { + SocketException socketEx = ex.InnerException as SocketException; + + if (socketEx is null) + { + return WebExceptionStatus.UnknownError; + } + + WebExceptionStatus status; + switch (socketEx.SocketErrorCode) + { + case SocketError.HostNotFound: + status = WebExceptionStatus.NameResolutionFailure; + break; + default: + status = WebExceptionStatus.UnknownError; + break; + } + + return status; + } } } diff --git a/external/corefx/src/System.Net.Requests/src/System/Net/WebExceptionPal.Unix.cs b/external/corefx/src/System.Net.Requests/src/System/Net/WebExceptionPal.Unix.cs index b4ed5af7b8..7ad711cc94 100644 --- a/external/corefx/src/System.Net.Requests/src/System/Net/WebExceptionPal.Unix.cs +++ b/external/corefx/src/System.Net.Requests/src/System/Net/WebExceptionPal.Unix.cs @@ -26,7 +26,7 @@ namespace System.Net status = WebExceptionStatus.NameResolutionFailure; break; default: - status = WebExceptionStatus.UnknownError; + status = GetStatusFromExceptionHelper(ex); break; } diff --git a/external/corefx/src/System.Net.Requests/src/System/Net/WebExceptionPal.Windows.cs b/external/corefx/src/System.Net.Requests/src/System/Net/WebExceptionPal.Windows.cs index 2de80f48f1..fb5a7f341d 100644 --- a/external/corefx/src/System.Net.Requests/src/System/Net/WebExceptionPal.Windows.cs +++ b/external/corefx/src/System.Net.Requests/src/System/Net/WebExceptionPal.Windows.cs @@ -26,7 +26,7 @@ namespace System.Net status = WebExceptionStatus.NameResolutionFailure; break; default: - status = WebExceptionStatus.UnknownError; + status = GetStatusFromExceptionHelper(ex); break; } diff --git a/external/corefx/src/System.Net.Requests/tests/HttpWebRequestTest.cs b/external/corefx/src/System.Net.Requests/tests/HttpWebRequestTest.cs index eb488b7505..3745049b94 100644 --- a/external/corefx/src/System.Net.Requests/tests/HttpWebRequestTest.cs +++ b/external/corefx/src/System.Net.Requests/tests/HttpWebRequestTest.cs @@ -173,7 +173,7 @@ namespace System.Net.Tests { HttpWebRequest request = WebRequest.CreateHttp(uri); Task getResponse = request.GetResponseAsync(); - await LoopbackServer.ReadRequestAndSendResponseAsync(server); + await server.AcceptConnectionSendResponseAndCloseAsync(); using (WebResponse response = await getResponse) { Assert.Throws(() => request.AutomaticDecompression = DecompressionMethods.Deflate); @@ -188,6 +188,29 @@ namespace System.Net.Tests }); } + [Fact] + public async Task HttpWebRequest_SetHostHeader_ContainsPortNumber() + { + await LoopbackServer.CreateServerAsync(async (server, uri) => + { + HttpWebRequest request = WebRequest.CreateHttp(uri); + string host = uri.Host + ":" + uri.Port; + request.Host = host; + Task getResponse = request.GetResponseAsync(); + + await server.AcceptConnectionAsync(async connection => + { + List headers = await connection.ReadRequestHeaderAndSendResponseAsync(); + Assert.Contains($"Host: {host}", headers); + }); + + using (var response = (HttpWebResponse) await getResponse) + { + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + }); + } + [Theory, MemberData(nameof(EchoServers))] public void MaximumResponseHeadersLength_SetNegativeTwo_ThrowsArgumentOutOfRangeException(Uri remoteServer) { @@ -682,14 +705,7 @@ namespace System.Net.Tests public void ServicePoint_GetValue_ExpectedResult(Uri remoteServer) { HttpWebRequest request = WebRequest.CreateHttp(remoteServer); - if (PlatformDetection.IsFullFramework) - { - Assert.NotNull(request.ServicePoint); - } - else - { - Assert.Throws(() => request.ServicePoint); - } + Assert.NotNull(request.ServicePoint); } [Theory, MemberData(nameof(EchoServers))] @@ -752,7 +768,7 @@ namespace System.Net.Tests request.ProtocolVersion = requestVersion; Task getResponse = request.GetResponseAsync(); - Task> serverTask = LoopbackServer.ReadRequestAndSendResponseAsync(server); + Task> serverTask = server.AcceptConnectionSendResponseAndCloseAsync(); using (HttpWebResponse response = (HttpWebResponse) await getResponse) { diff --git a/external/corefx/src/System.Net.Requests/tests/HttpWebResponseHeaderTest.cs b/external/corefx/src/System.Net.Requests/tests/HttpWebResponseHeaderTest.cs index 67155869ed..e2d7ac922b 100644 --- a/external/corefx/src/System.Net.Requests/tests/HttpWebResponseHeaderTest.cs +++ b/external/corefx/src/System.Net.Requests/tests/HttpWebResponseHeaderTest.cs @@ -31,13 +31,7 @@ namespace System.Net.Tests request.ContinueDelegate = continueDelegate; Task getResponse = request.GetResponseAsync(); DateTimeOffset utcNow = DateTimeOffset.UtcNow; - await LoopbackServer.ReadRequestAndSendResponseAsync(server, - $"HTTP/1.1 200 OK\r\n" + - $"Date: {utcNow:R}\r\n" + - "Content-Type: application/json;charset=UTF-8\r\n" + - "Content-Length: 5\r\n" + - "\r\n" + - "12345"); + await server.AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode.OK, "Content-Type: application/json;charset=UTF-8\r\n", "12345"); Assert.Equal(continueDelegate, request.ContinueDelegate); }); } @@ -52,13 +46,7 @@ namespace System.Net.Tests request.Method = HttpMethod.Get.Method; Task getResponse = request.GetResponseAsync(); DateTimeOffset utcNow = DateTimeOffset.UtcNow; - await LoopbackServer.ReadRequestAndSendResponseAsync(server, - $"HTTP/1.1 200 OK\r\n" + - $"Date: {utcNow:R}\r\n" + - "Content-Type: application/json;charset=UTF-8\r\n" + - "Content-Length: 5\r\n" + - "\r\n" + - "12345"); + await server.AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode.OK, "Content-Type: application/json;charset=UTF-8\r\n", "12345"); using (WebResponse response = await getResponse) { @@ -85,13 +73,7 @@ namespace System.Net.Tests request.Method = HttpMethod.Get.Method; Task getResponse = request.GetResponseAsync(); DateTimeOffset utcNow = DateTimeOffset.UtcNow; - await LoopbackServer.ReadRequestAndSendResponseAsync(server, - $"HTTP/1.1 200 OK\r\n" + - $"Date: {utcNow:R}\r\n" + - "Content-Type: application/json;charset=UTF-8\r\n" + - "Content-Length: 5\r\n" + - "\r\n" + - "12345"); + await server.AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode.OK, "Content-Type: application/json;charset=UTF-8\r\n", "12345"); WebResponse response = await getResponse; HttpWebResponse httpResponse = (HttpWebResponse)response; httpResponse.Close(); @@ -111,6 +93,40 @@ namespace System.Net.Tests }); } + [Fact] + public async Task LastModified_ValidDate_Success() + { + DateTime expected = TimeZoneInfo.ConvertTimeFromUtc(new DateTime(2018, 4, 10, 3, 4, 5, DateTimeKind.Utc), TimeZoneInfo.Local); + await LoopbackServer.CreateServerAsync(async (server, url) => + { + HttpWebRequest request = WebRequest.CreateHttp(url); + Task getResponse = request.GetResponseAsync(); + await server.AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode.OK, "Last-Modified: Tue, 10 Apr 2018 03:04:05 GMT\r\n", "12345"); + + using (HttpWebResponse response = (HttpWebResponse)(await getResponse)) + { + Assert.Equal(expected, response.LastModified); + } + }); + } + + [Fact] + public async Task LastModified_InvalidDate_Throws() + { + DateTime expected = TimeZoneInfo.ConvertTimeFromUtc(new DateTime(2018, 4, 10, 3, 4, 5, DateTimeKind.Utc), TimeZoneInfo.Local); + await LoopbackServer.CreateServerAsync(async (server, url) => + { + HttpWebRequest request = WebRequest.CreateHttp(url); + Task getResponse = request.GetResponseAsync(); + await server.AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode.OK, "Last-Modified: invalid date\r\n", "12345"); + + using (HttpWebResponse response = (HttpWebResponse)(await getResponse)) + { + Assert.Throws(() => response.LastModified); + } + }); + } + [Fact] public async Task HttpWebResponse_Serialize_ExpectedResult() { @@ -120,11 +136,7 @@ namespace System.Net.Tests request.Method = HttpMethod.Get.Method; Task getResponse = request.GetResponseAsync(); DateTimeOffset utcNow = DateTimeOffset.UtcNow; - await LoopbackServer.ReadRequestAndSendResponseAsync(server, - $"HTTP/1.1 200 OK\r\n" + - $"Date: {utcNow:R}\r\n" + - "Content-Length: 0\r\n" + - "\r\n"); + await server.AcceptConnectionSendResponseAndCloseAsync(); using (WebResponse response = await getResponse) { @@ -146,6 +158,6 @@ namespace System.Net.Tests } } }); - } + } } } diff --git a/external/corefx/src/System.Net.Requests/tests/HttpWebResponseTest.cs b/external/corefx/src/System.Net.Requests/tests/HttpWebResponseTest.cs index 03c67329bd..d60921bc85 100644 --- a/external/corefx/src/System.Net.Requests/tests/HttpWebResponseTest.cs +++ b/external/corefx/src/System.Net.Requests/tests/HttpWebResponseTest.cs @@ -23,13 +23,7 @@ namespace System.Net.Tests HttpWebRequest request = WebRequest.CreateHttp(url); request.Method = HttpMethod.Get.Method; Task getResponse = request.GetResponseAsync(); - await LoopbackServer.ReadRequestAndSendResponseAsync(server, - $"HTTP/1.1 200 OK\r\n" + - $"Date: {DateTimeOffset.UtcNow:R}\r\n" + - $"Content-Type: {expectedContentType}\r\n" + - "Content-Length: 5\r\n" + - "\r\n" + - "12345"); + await server.AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode.OK, $"Content-Type: {expectedContentType}\r\n", "12345"); using (WebResponse response = await getResponse) { @@ -46,12 +40,7 @@ namespace System.Net.Tests HttpWebRequest request = WebRequest.CreateHttp(url); request.Method = HttpMethod.Get.Method; Task getResponse = request.GetResponseAsync(); - await LoopbackServer.ReadRequestAndSendResponseAsync(server, - $"HTTP/1.1 200 OK\r\n" + - $"Date: {DateTimeOffset.UtcNow:R}\r\n" + - "Content-Length: 5\r\n" + - "\r\n" + - "12345"); + await server.AcceptConnectionSendResponseAndCloseAsync(content: "12345"); using (WebResponse response = await getResponse) { diff --git a/external/corefx/src/System.Net.Requests/tests/System.Net.Requests.Tests.csproj b/external/corefx/src/System.Net.Requests/tests/System.Net.Requests.Tests.csproj index 7b8600d644..35dc993fef 100644 --- a/external/corefx/src/System.Net.Requests/tests/System.Net.Requests.Tests.csproj +++ b/external/corefx/src/System.Net.Requests/tests/System.Net.Requests.Tests.csproj @@ -24,6 +24,9 @@ Common\System\Net\Http\LoopbackServer.cs + + Common\System\Threading\Tasks\TaskTimeoutExtensions.cs + {69e46a6f-9966-45a5-8945-2559fe337827} RemoteExecutorConsoleApp diff --git a/external/corefx/src/System.Net.Security/ref/System.Net.Security.cs b/external/corefx/src/System.Net.Security/ref/System.Net.Security.cs index 1aad87183a..785eadd9c2 100644 --- a/external/corefx/src/System.Net.Security/ref/System.Net.Security.cs +++ b/external/corefx/src/System.Net.Security/ref/System.Net.Security.cs @@ -32,6 +32,8 @@ namespace System.Net.Security RequireEncryption = 0, } public delegate System.Security.Cryptography.X509Certificates.X509Certificate LocalCertificateSelectionCallback(object sender, string targetHost, System.Security.Cryptography.X509Certificates.X509CertificateCollection localCertificates, System.Security.Cryptography.X509Certificates.X509Certificate remoteCertificate, string[] acceptableIssuers); + public delegate System.Security.Cryptography.X509Certificates.X509Certificate ServerCertificateSelectionCallback(object sender, string hostName); + public partial class NegotiateStream : AuthenticatedStream { public NegotiateStream(System.IO.Stream innerStream) : base(innerStream, false) { } @@ -108,6 +110,7 @@ namespace System.Net.Security public X509RevocationMode CertificateRevocationCheckMode { get { throw null; } set { } } public List ApplicationProtocols { get { throw null; } set { } } public RemoteCertificateValidationCallback RemoteCertificateValidationCallback { get { throw null; } set { } } + public ServerCertificateSelectionCallback ServerCertificateSelectionCallback { get { throw null; } set { } } public EncryptionPolicy EncryptionPolicy { get { throw null; } set { } } } public partial class SslClientAuthenticationOptions @@ -186,7 +189,7 @@ namespace System.Net.Security public virtual System.Threading.Tasks.Task AuthenticateAsServerAsync(System.Security.Cryptography.X509Certificates.X509Certificate serverCertificate) { throw null; } public virtual System.Threading.Tasks.Task AuthenticateAsServerAsync(System.Security.Cryptography.X509Certificates.X509Certificate serverCertificate, bool clientCertificateRequired, System.Security.Authentication.SslProtocols enabledSslProtocols, bool checkCertificateRevocation) { throw null; } public virtual System.Threading.Tasks.Task AuthenticateAsServerAsync(System.Security.Cryptography.X509Certificates.X509Certificate serverCertificate, bool clientCertificateRequired, bool checkCertificateRevocation) { throw null; } - public Task AuthenticateAsServerAsync(SslServerAuthenticationOptions sslClientAuthenticationOptions, CancellationToken cancellationToken) { throw null; } + public Task AuthenticateAsServerAsync(SslServerAuthenticationOptions sslServerAuthenticationOptions, CancellationToken cancellationToken) { throw null; } public virtual System.IAsyncResult BeginAuthenticateAsClient(string targetHost, System.AsyncCallback asyncCallback, object asyncState) { throw null; } public virtual System.IAsyncResult BeginAuthenticateAsClient(string targetHost, System.Security.Cryptography.X509Certificates.X509CertificateCollection clientCertificates, System.Security.Authentication.SslProtocols enabledSslProtocols, bool checkCertificateRevocation, System.AsyncCallback asyncCallback, object asyncState) { throw null; } public virtual System.IAsyncResult BeginAuthenticateAsClient(string targetHost, System.Security.Cryptography.X509Certificates.X509CertificateCollection clientCertificates, bool checkCertificateRevocation, System.AsyncCallback asyncCallback, object asyncState) { throw null; } diff --git a/external/corefx/src/System.Net.Security/src/Resources/Strings.resx b/external/corefx/src/System.Net.Security/src/Resources/Strings.resx index fe5ef27660..8d115d4762 100644 --- a/external/corefx/src/System.Net.Security/src/Resources/Strings.resx +++ b/external/corefx/src/System.Net.Security/src/Resources/Strings.resx @@ -208,7 +208,7 @@ Once authentication is attempted as the client or server, additional authentication attempts must use the same client or server role. - A call to SSPI failed, see inner exception. + Authentication failed, see inner exception. Authentication failed because the remote party has closed the transport stream. diff --git a/external/corefx/src/System.Net.Security/src/System.Net.Security.csproj b/external/corefx/src/System.Net.Security/src/System.Net.Security.csproj index ef39db997d..bf8d773a4e 100644 --- a/external/corefx/src/System.Net.Security/src/System.Net.Security.csproj +++ b/external/corefx/src/System.Net.Security/src/System.Net.Security.csproj @@ -5,6 +5,7 @@ System.Net.Security {89F37791-6254-4D60-AB96-ACD3CCA0E771} true + true $(DefineConstants);SYSNETSECURITY_NO_OPENSSL @@ -22,6 +23,7 @@ + @@ -76,9 +78,6 @@ Common\System\Net\ExceptionCheck.cs - - Common\System\Net\IntPtrHelper.cs - Common\System\Net\LazyAsyncResult.cs @@ -329,9 +328,6 @@ Common\Microsoft\Win32\SafeHandles\SafeX509Handles.Unix.cs - - Common\Microsoft\Win32\SafeHandles\SafeX509NameHandle.Unix.cs - Common\Microsoft\Win32\SafeHandles\X509ExtensionSafeHandles.Unix.cs diff --git a/external/corefx/src/System.Net.Security/src/System/Net/FixedSizeReader.cs b/external/corefx/src/System.Net.Security/src/System/Net/FixedSizeReader.cs index 94dc81225e..14ed8a79de 100644 --- a/external/corefx/src/System.Net.Security/src/System/Net/FixedSizeReader.cs +++ b/external/corefx/src/System.Net.Security/src/System/Net/FixedSizeReader.cs @@ -53,7 +53,7 @@ namespace System.Net int remainingCount = request.Count, offset = request.Offset; do { - int bytes = await transport.ReadAsync(request.Buffer, offset, remainingCount, CancellationToken.None).ConfigureAwait(false); + int bytes = await transport.ReadAsync(new Memory(request.Buffer, offset, remainingCount), CancellationToken.None).ConfigureAwait(false); if (bytes == 0) { if (remainingCount != request.Count) diff --git a/external/corefx/src/System.Net.Security/src/System/Net/Security/NetEventSource.Security.cs b/external/corefx/src/System.Net.Security/src/System/Net/Security/NetEventSource.Security.cs index 1590996740..1cf0c0ac82 100644 --- a/external/corefx/src/System.Net.Security/src/System/Net/Security/NetEventSource.Security.cs +++ b/external/corefx/src/System.Net.Security/src/System/Net/Security/NetEventSource.Security.cs @@ -14,21 +14,12 @@ namespace System.Net [EventSource(Name = "Microsoft-System-Net-Security", LocalizationResources = "FxResources.System.Net.Security.SR")] internal sealed partial class NetEventSource { - private const int EnumerateSecurityPackagesId = NextAvailableEventId; - private const int SspiPackageNotFoundId = EnumerateSecurityPackagesId + 1; - private const int AcquireDefaultCredentialId = SspiPackageNotFoundId + 1; - private const int AcquireCredentialsHandleId = AcquireDefaultCredentialId + 1; - private const int SecureChannelCtorId = AcquireCredentialsHandleId + 1; + private const int SecureChannelCtorId = NextAvailableEventId; private const int LocatingPrivateKeyId = SecureChannelCtorId + 1; private const int CertIsType2Id = LocatingPrivateKeyId + 1; private const int FoundCertInStoreId = CertIsType2Id + 1; private const int NotFoundCertInStoreId = FoundCertInStoreId + 1; - private const int InitializeSecurityContextId = NotFoundCertInStoreId + 1; - private const int SecurityContextInputBufferId = InitializeSecurityContextId + 1; - private const int SecurityContextInputBuffersId = SecurityContextInputBufferId + 1; - private const int AcceptSecuritContextId = SecurityContextInputBuffersId + 1; - private const int OperationReturnedSomethingId = AcceptSecuritContextId + 1; - private const int RemoteCertificateId = OperationReturnedSomethingId + 1; + private const int RemoteCertificateId = NotFoundCertInStoreId + 1; private const int CertificateFromDelegateId = RemoteCertificateId + 1; private const int NoDelegateNoClientCertId = CertificateFromDelegateId + 1; private const int NoDelegateButClientCertId = NoDelegateNoClientCertId + 1; @@ -343,29 +334,46 @@ namespace System.Net const int NumEventDatas = 8; var descrs = stackalloc EventData[NumEventDatas]; - descrs[0].DataPointer = (IntPtr)(arg1Ptr); - descrs[0].Size = (arg1.Length + 1) * sizeof(char); - - descrs[1].DataPointer = (IntPtr)(&arg2); - descrs[1].Size = sizeof(int); - - descrs[2].DataPointer = (IntPtr)(&arg3); - descrs[2].Size = sizeof(int); - - descrs[3].DataPointer = (IntPtr)(&arg4); - descrs[3].Size = sizeof(int); - - descrs[4].DataPointer = (IntPtr)(&arg5); - descrs[4].Size = sizeof(int); - - descrs[5].DataPointer = (IntPtr)(&arg6); - descrs[5].Size = sizeof(int); - - descrs[6].DataPointer = (IntPtr)(&arg7); - descrs[6].Size = sizeof(int); - - descrs[7].DataPointer = (IntPtr)(&arg8); - descrs[7].Size = sizeof(int); + descrs[0] = new EventData + { + DataPointer = (IntPtr)(arg1Ptr), + Size = (arg1.Length + 1) * sizeof(char) + }; + descrs[1] = new EventData + { + DataPointer = (IntPtr)(&arg2), + Size = sizeof(int) + }; + descrs[2] = new EventData + { + DataPointer = (IntPtr)(&arg3), + Size = sizeof(int) + }; + descrs[3] = new EventData + { + DataPointer = (IntPtr)(&arg4), + Size = sizeof(int) + }; + descrs[4] = new EventData + { + DataPointer = (IntPtr)(&arg5), + Size = sizeof(int) + }; + descrs[5] = new EventData + { + DataPointer = (IntPtr)(&arg6), + Size = sizeof(int) + }; + descrs[6] = new EventData + { + DataPointer = (IntPtr)(&arg7), + Size = sizeof(int) + }; + descrs[7] = new EventData + { + DataPointer = (IntPtr)(&arg8), + Size = sizeof(int) + }; WriteEventCore(eventId, NumEventDatas, descrs); } diff --git a/external/corefx/src/System.Net.Security/src/System/Net/Security/Pal.OSX/SafeDeleteSslContext.cs b/external/corefx/src/System.Net.Security/src/System/Net/Security/Pal.OSX/SafeDeleteSslContext.cs index 2007763ab6..d1d142b4de 100644 --- a/external/corefx/src/System.Net.Security/src/System/Net/Security/Pal.OSX/SafeDeleteSslContext.cs +++ b/external/corefx/src/System.Net.Security/src/System/Net/Security/Pal.OSX/SafeDeleteSslContext.cs @@ -66,7 +66,7 @@ namespace System.Net // let it pass. break; default: - throw new PlatformNotSupportedException(SR.net_encryptionpolicy_notsupported); + throw new PlatformNotSupportedException(SR.Format(SR.net_encryptionpolicy_notsupported, credential.Policy)); } SafeSslHandle sslContext = Interop.AppleCrypto.SslCreateContext(isServer ? 1 : 0); @@ -114,11 +114,6 @@ namespace System.Net _sslContext.Dispose(); _sslContext = null; } - - _toConnection = null; - _fromConnection = null; - _writeCallback = null; - _readCallback = null; } base.Dispose(disposing); @@ -239,44 +234,81 @@ namespace System.Net } } + private static readonly SslProtocols[] s_orderedSslProtocols = new SslProtocols[5] + { +#pragma warning disable 0618 + SslProtocols.Ssl2, + SslProtocols.Ssl3, +#pragma warning restore 0618 + SslProtocols.Tls, + SslProtocols.Tls11, + SslProtocols.Tls12 + }; + private static void SetProtocols(SafeSslHandle sslContext, SslProtocols protocols) { - const SslProtocols SupportedProtocols = SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12; - SslProtocols minProtocolId; - SslProtocols maxProtocolId; + // A contiguous range of protocols is required. Find the min and max of the range, + // or throw if it's non-contiguous or if no protocols are specified. - switch (protocols & SupportedProtocols) + // First, mark all of the specified protocols. + SslProtocols[] orderedSslProtocols = s_orderedSslProtocols; + Span protocolSet = stackalloc bool[orderedSslProtocols.Length]; + for (int i = 0; i < orderedSslProtocols.Length; i++) { - case SslProtocols.None: - throw new PlatformNotSupportedException(SR.net_securityprotocolnotsupported); - case SslProtocols.Tls: - minProtocolId = SslProtocols.Tls; - maxProtocolId = SslProtocols.Tls; - break; - case SslProtocols.Tls11: - minProtocolId = SslProtocols.Tls11; - maxProtocolId = SslProtocols.Tls11; - break; - case SslProtocols.Tls12: - minProtocolId = SslProtocols.Tls12; - maxProtocolId = SslProtocols.Tls12; - break; - case SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12: - minProtocolId = SslProtocols.Tls; - maxProtocolId = SslProtocols.Tls12; - break; - case SslProtocols.Tls11 | SslProtocols.Tls12: - minProtocolId = SslProtocols.Tls11; - maxProtocolId = SslProtocols.Tls12; - break; - case SslProtocols.Tls | SslProtocols.Tls11: - minProtocolId = SslProtocols.Tls; - maxProtocolId = SslProtocols.Tls11; - break; - default: - throw new PlatformNotSupportedException(SR.net_security_sslprotocol_contiguous); + protocolSet[i] = (protocols & orderedSslProtocols[i]) != 0; } + SslProtocols minProtocolId = (SslProtocols)(-1); + SslProtocols maxProtocolId = (SslProtocols)(-1); + + // Loop through them, starting from the lowest. + for (int min = 0; min < protocolSet.Length; min++) + { + if (protocolSet[min]) + { + // We found the first one that's set; that's the bottom of the range. + minProtocolId = orderedSslProtocols[min]; + + // Now loop from there to look for the max of the range. + for (int max = min + 1; max < protocolSet.Length; max++) + { + if (!protocolSet[max]) + { + // We found the first one after the min that's not set; the top of the range + // is the one before this (which might be the same as the min). + maxProtocolId = orderedSslProtocols[max - 1]; + + // Finally, verify that nothing beyond this one is set, as that would be + // a discontiguous set of protocols. + for (int verifyNotSet = max + 1; verifyNotSet < protocolSet.Length; verifyNotSet++) + { + if (protocolSet[verifyNotSet]) + { + throw new PlatformNotSupportedException(SR.Format(SR.net_security_sslprotocol_contiguous, protocols)); + } + } + + break; + } + } + + break; + } + } + + // If no protocols were set, throw. + if (minProtocolId == (SslProtocols)(-1)) + { + throw new PlatformNotSupportedException(SR.net_securityprotocolnotsupported); + } + + // If we didn't find an unset protocol after the min, go all the way to the last one. + if (maxProtocolId == (SslProtocols)(-1)) + { + maxProtocolId = orderedSslProtocols[orderedSslProtocols.Length - 1]; + } + + // Finally set this min and max. Interop.AppleCrypto.SslSetMinProtocolVersion(sslContext, minProtocolId); Interop.AppleCrypto.SslSetMaxProtocolVersion(sslContext, maxProtocolId); } diff --git a/external/corefx/src/System.Net.Security/src/System/Net/Security/SecureChannel.cs b/external/corefx/src/System.Net.Security/src/System/Net/Security/SecureChannel.cs index b444eea312..8bbb35b97f 100644 --- a/external/corefx/src/System.Net.Security/src/System/Net/Security/SecureChannel.cs +++ b/external/corefx/src/System.Net.Security/src/System/Net/Security/SecureChannel.cs @@ -624,7 +624,7 @@ namespace System.Net.Security // // Acquire Server Side Certificate information and set it on the class. // - private bool AcquireServerCredentials(ref byte[] thumbPrint) + private bool AcquireServerCredentials(ref byte[] thumbPrint, byte[] clientHello) { if (NetEventSource.IsEnabled) NetEventSource.Enter(this); @@ -632,10 +632,25 @@ namespace System.Net.Security X509Certificate localCertificate = null; bool cachedCred = false; - if (_sslAuthenticationOptions.CertSelectionDelegate != null) + // There are three options for selecting the server certificate. When + // selecting which to use, we prioritize the new ServerCertSelectionDelegate + // API. If the new API isn't used we call LocalCertSelectionCallback (for compat + // with .NET Framework), and if neither is set we fall back to using ServerCertificate. + if (_sslAuthenticationOptions.ServerCertSelectionDelegate != null) + { + string serverIdentity = SniHelper.GetServerName(clientHello); + localCertificate = _sslAuthenticationOptions.ServerCertSelectionDelegate(serverIdentity); + + if (localCertificate == null) + { + throw new AuthenticationException(SR.net_ssl_io_no_server_cert); + } + } + else if (_sslAuthenticationOptions.CertSelectionDelegate != null) { X509CertificateCollection tempCollection = new X509CertificateCollection(); tempCollection.Add(_sslAuthenticationOptions.ServerCertificate); + // We pass string.Empty here to maintain strict compatability with .NET Framework. localCertificate = _sslAuthenticationOptions.CertSelectionDelegate(string.Empty, tempCollection, null, Array.Empty()); if (NetEventSource.IsEnabled) NetEventSource.Info(this, "Use delegate selected Cert"); @@ -744,7 +759,6 @@ namespace System.Net.Security #if TRACE_VERBOSE if (NetEventSource.IsEnabled) NetEventSource.Enter(this, $"_refreshCredentialNeeded = {_refreshCredentialNeeded}"); #endif - if (offset < 0 || offset > (input == null ? 0 : input.Length)) { NetEventSource.Fail(this, "Argument 'offset' out of range."); @@ -786,7 +800,7 @@ namespace System.Net.Security if (_refreshCredentialNeeded) { cachedCreds = _sslAuthenticationOptions.IsServer - ? AcquireServerCredentials(ref thumbPrint) + ? AcquireServerCredentials(ref thumbPrint, input) : AcquireClientCredentials(ref thumbPrint); } @@ -870,24 +884,20 @@ namespace System.Net.Security if (NetEventSource.IsEnabled) NetEventSource.Enter(this); - StreamSizes streamSizes; - SslStreamPal.QueryContextStreamSizes(_securityContext, out streamSizes); + SslStreamPal.QueryContextStreamSizes(_securityContext, out StreamSizes streamSizes); - if (streamSizes != null) + try { - try - { - _headerSize = streamSizes.Header; - _trailerSize = streamSizes.Trailer; - _maxDataSize = checked(streamSizes.MaximumMessage - (_headerSize + _trailerSize)); + _headerSize = streamSizes.Header; + _trailerSize = streamSizes.Trailer; + _maxDataSize = checked(streamSizes.MaximumMessage - (_headerSize + _trailerSize)); - Debug.Assert(_maxDataSize > 0, "_maxDataSize > 0"); - } - catch (Exception e) when (!ExceptionCheck.IsFatal(e)) - { - NetEventSource.Fail(this, "StreamSizes out of range."); - throw; - } + Debug.Assert(_maxDataSize > 0, "_maxDataSize > 0"); + } + catch (Exception e) when (!ExceptionCheck.IsFatal(e)) + { + NetEventSource.Fail(this, "StreamSizes out of range."); + throw; } SslStreamPal.QueryContextConnectionInfo(_securityContext, out _connectionInfo); diff --git a/external/corefx/src/System.Net.Security/src/System/Net/Security/SniHelper.cs b/external/corefx/src/System.Net.Security/src/System/Net/Security/SniHelper.cs new file mode 100644 index 0000000000..b1540f122b --- /dev/null +++ b/external/corefx/src/System.Net.Security/src/System/Net/Security/SniHelper.cs @@ -0,0 +1,391 @@ +// 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.Globalization; +using System.Text; + +namespace System.Net.Security +{ + internal class SniHelper + { + private const int ProtocolVersionSize = 2; + private const int UInt24Size = 3; + private const int RandomSize = 32; + private readonly static IdnMapping s_idnMapping = CreateIdnMapping(); + private readonly static Encoding s_encoding = CreateEncoding(); + + public static string GetServerName(byte[] clientHello) + { + return GetSniFromSslPlainText(clientHello); + } + + private static string GetSniFromSslPlainText(ReadOnlySpan sslPlainText) + { + // https://tools.ietf.org/html/rfc6101#section-5.2.1 + // struct { + // ContentType type; // enum with max value 255 + // ProtocolVersion version; // 2x uint8 + // uint16 length; + // opaque fragment[SSLPlaintext.length]; + // } SSLPlaintext; + const int ContentTypeOffset = 0; + const int ProtocolVersionOffset = ContentTypeOffset + sizeof(ContentType); + const int LengthOffset = ProtocolVersionOffset + ProtocolVersionSize; + const int HandshakeOffset = LengthOffset + sizeof(ushort); + + // SSL v2's ContentType has 0x80 bit set. + // We do not care about SSL v2 here because it does not support client hello extensions + if (sslPlainText.Length < HandshakeOffset || (ContentType)sslPlainText[ContentTypeOffset] != ContentType.Handshake) + { + return null; + } + + // Skip ContentType and ProtocolVersion + int handshakeLength = BinaryPrimitives.ReadUInt16BigEndian(sslPlainText.Slice(LengthOffset)); + ReadOnlySpan sslHandshake = sslPlainText.Slice(HandshakeOffset); + + if (handshakeLength != sslHandshake.Length) + { + return null; + } + + return GetSniFromSslHandshake(sslHandshake); + } + + private static string GetSniFromSslHandshake(ReadOnlySpan sslHandshake) + { + // https://tools.ietf.org/html/rfc6101#section-5.6 + // struct { + // HandshakeType msg_type; /* handshake type */ + // uint24 length; /* bytes in message */ + // select (HandshakeType) { + // ... + // case client_hello: ClientHello; + // ... + // } body; + // } Handshake; + const int HandshakeTypeOffset = 0; + const int ClientHelloLengthOffset = HandshakeTypeOffset + sizeof(HandshakeType); + const int ClientHelloOffset = ClientHelloLengthOffset + UInt24Size; + + if (sslHandshake.Length < ClientHelloOffset || (HandshakeType)sslHandshake[HandshakeTypeOffset] != HandshakeType.ClientHello) + { + return null; + } + + int clientHelloLength = ReadUInt24BigEndian(sslHandshake.Slice(ClientHelloLengthOffset)); + ReadOnlySpan clientHello = sslHandshake.Slice(ClientHelloOffset); + + if (clientHello.Length != clientHelloLength) + { + return null; + } + + return GetSniFromClientHello(clientHello); + } + + private static string GetSniFromClientHello(ReadOnlySpan clientHello) + { + // Basic structure: https://tools.ietf.org/html/rfc6101#section-5.6.1.2 + // Extended structure: https://tools.ietf.org/html/rfc3546#section-2.1 + // struct { + // ProtocolVersion client_version; // 2x uint8 + // Random random; // 32 bytes + // SessionID session_id; // opaque type + // CipherSuite cipher_suites<2..2^16-1>; // opaque type + // CompressionMethod compression_methods<1..2^8-1>; // opaque type + // Extension client_hello_extension_list<0..2^16-1>; + // } ClientHello; + ReadOnlySpan p = SkipBytes(clientHello, ProtocolVersionSize + RandomSize); + + // Skip SessionID (max size 32 => size fits in 1 byte) + p = SkipOpaqueType1(p); + + // Skip cipher suites (max size 2^16-1 => size fits in 2 bytes) + p = SkipOpaqueType2(p, out _); + + // Skip compression methods (max size 2^8-1 => size fits in 1 byte) + p = SkipOpaqueType1(p); + + // is invalid structure or no extensions? + if (p.IsEmpty) + { + return null; + } + + // client_hello_extension_list (max size 2^16-1 => size fits in 2 bytes) + int extensionListLength = BinaryPrimitives.ReadUInt16BigEndian(p); + p = SkipBytes(p, sizeof(ushort)); + + if (extensionListLength != p.Length) + { + return null; + } + + string ret = null; + while (!p.IsEmpty) + { + bool invalid; + string sni = GetSniFromExtension(p, out p, out invalid); + if (invalid) + { + return null; + } + + if (ret != null && sni != null) + { + return null; + } + + if (sni != null) + { + ret = sni; + } + } + + return ret; + } + + private static string GetSniFromExtension(ReadOnlySpan extension, out ReadOnlySpan remainingBytes, out bool invalid) + { + // https://tools.ietf.org/html/rfc3546#section-2.3 + // struct { + // ExtensionType extension_type; + // opaque extension_data<0..2^16-1>; + // } Extension; + const int ExtensionDataOffset = sizeof(ExtensionType); + + if (extension.Length < ExtensionDataOffset) + { + remainingBytes = ReadOnlySpan.Empty; + invalid = true; + return null; + } + + ExtensionType extensionType = (ExtensionType)BinaryPrimitives.ReadUInt16BigEndian(extension); + ReadOnlySpan extensionData = extension.Slice(ExtensionDataOffset); + + if (extensionType == ExtensionType.ServerName) + { + return GetSniFromServerNameList(extensionData, out remainingBytes, out invalid); + } + else + { + remainingBytes = SkipOpaqueType2(extensionData, out invalid); + return null; + } + } + + private static string GetSniFromServerNameList(ReadOnlySpan serverNameListExtension, out ReadOnlySpan remainingBytes, out bool invalid) + { + // https://tools.ietf.org/html/rfc3546#section-3.1 + // struct { + // ServerName server_name_list<1..2^16-1> + // } ServerNameList; + // ServerNameList is an opaque type (length of sufficient size for max data length is prepended) + const int ServerNameListOffset = sizeof(ushort); + + if (serverNameListExtension.Length < ServerNameListOffset) + { + remainingBytes = ReadOnlySpan.Empty; + invalid = true; + return null; + } + + int serverNameListLength = BinaryPrimitives.ReadUInt16BigEndian(serverNameListExtension); + ReadOnlySpan serverNameList = serverNameListExtension.Slice(ServerNameListOffset); + + if (serverNameListLength > serverNameList.Length) + { + remainingBytes = ReadOnlySpan.Empty; + invalid = true; + return null; + } + + remainingBytes = serverNameList.Slice(serverNameListLength); + ReadOnlySpan serverName = serverNameList.Slice(0, serverNameListLength); + + return GetSniFromServerName(serverName, out invalid); + } + + private static string GetSniFromServerName(ReadOnlySpan serverName, out bool invalid) + { + // https://tools.ietf.org/html/rfc3546#section-3.1 + // struct { + // NameType name_type; + // select (name_type) { + // case host_name: HostName; + // } name; + // } ServerName; + // ServerName is an opaque type (length of sufficient size for max data length is prepended) + const int ServerNameLengthOffset = 0; + const int NameTypeOffset = ServerNameLengthOffset + sizeof(ushort); + const int HostNameStructOffset = NameTypeOffset + sizeof(NameType); + + if (serverName.Length < HostNameStructOffset) + { + invalid = true; + return null; + } + + // Following can underflow but it is ok due to equality check below + int hostNameStructLength = BinaryPrimitives.ReadUInt16BigEndian(serverName) - sizeof(NameType); + NameType nameType = (NameType)serverName[NameTypeOffset]; + ReadOnlySpan hostNameStruct = serverName.Slice(HostNameStructOffset); + + if (hostNameStructLength != hostNameStruct.Length || nameType != NameType.HostName) + { + invalid = true; + return null; + } + + return GetSniFromHostNameStruct(hostNameStruct, out invalid); + } + + private static string GetSniFromHostNameStruct(ReadOnlySpan hostNameStruct, out bool invalid) + { + // https://tools.ietf.org/html/rfc3546#section-3.1 + // HostName is an opaque type (length of sufficient size for max data length is prepended) + const int HostNameLengthOffset = 0; + const int HostNameOffset = HostNameLengthOffset + sizeof(ushort); + + int hostNameLength = BinaryPrimitives.ReadUInt16BigEndian(hostNameStruct); + ReadOnlySpan hostName = hostNameStruct.Slice(HostNameOffset); + if (hostNameLength != hostName.Length) + { + invalid = true; + return null; + } + + invalid = false; + return DecodeString(hostName); + } + + private static string DecodeString(ReadOnlySpan bytes) + { + // https://tools.ietf.org/html/rfc3546#section-3.1 + // Per spec: + // If the hostname labels contain only US-ASCII characters, then the + // client MUST ensure that labels are separated only by the byte 0x2E, + // representing the dot character U+002E (requirement 1 in section 3.1 + // of [IDNA] notwithstanding). If the server needs to match the HostName + // against names that contain non-US-ASCII characters, it MUST perform + // the conversion operation described in section 4 of [IDNA], treating + // the HostName as a "query string" (i.e. the AllowUnassigned flag MUST + // be set). Note that IDNA allows labels to be separated by any of the + // Unicode characters U+002E, U+3002, U+FF0E, and U+FF61, therefore + // servers MUST accept any of these characters as a label separator. If + // the server only needs to match the HostName against names containing + // exclusively ASCII characters, it MUST compare ASCII names case- + // insensitively. + + string idnEncodedString; + try + { + idnEncodedString = s_encoding.GetString(bytes); + } + catch (DecoderFallbackException) + { + return null; + } + + try + { + return s_idnMapping.GetUnicode(idnEncodedString); + } + catch (ArgumentException) + { + // client has not done IDN mapping + return idnEncodedString; + } + } + + private static int ReadUInt24BigEndian(ReadOnlySpan bytes) + { + return (bytes[0] << 16) | (bytes[1] << 8) | bytes[2]; + } + + private static ReadOnlySpan SkipBytes(ReadOnlySpan bytes, int numberOfBytesToSkip) + { + return (numberOfBytesToSkip < bytes.Length) ? bytes.Slice(numberOfBytesToSkip) : ReadOnlySpan.Empty; + } + + // Opaque type is of structure: + // - length (minimum number of bytes to hold the max value) + // - data (length bytes) + // We will only use opaque types which are of max size: 255 (length = 1) or 2^16-1 (length = 2). + // We will call them SkipOpaqueType`length` + private static ReadOnlySpan SkipOpaqueType1(ReadOnlySpan bytes) + { + const int OpaqueTypeLengthSize = sizeof(byte); + if (bytes.Length < OpaqueTypeLengthSize) + { + return ReadOnlySpan.Empty; + } + + byte length = bytes[0]; + int totalBytes = OpaqueTypeLengthSize + length; + + return SkipBytes(bytes, totalBytes); + } + + private static ReadOnlySpan SkipOpaqueType2(ReadOnlySpan bytes, out bool invalid) + { + const int OpaqueTypeLengthSize = sizeof(ushort); + if (bytes.Length < OpaqueTypeLengthSize) + { + invalid = true; + return ReadOnlySpan.Empty; + } + + ushort length = BinaryPrimitives.ReadUInt16BigEndian(bytes); + int totalBytes = OpaqueTypeLengthSize + length; + + invalid = bytes.Length < totalBytes; + if (invalid) + { + return ReadOnlySpan.Empty; + } + else + { + return bytes.Slice(totalBytes); + } + } + + private static IdnMapping CreateIdnMapping() + { + return new IdnMapping() + { + // Per spec "AllowUnassigned flag MUST be set". See comment above GetSniFromServerNameList for more details. + AllowUnassigned = true + }; + } + + private static Encoding CreateEncoding() + { + return Encoding.GetEncoding("utf-8", new EncoderExceptionFallback(), new DecoderExceptionFallback()); + } + + private enum ContentType : byte + { + Handshake = 0x16 + } + + private enum HandshakeType : byte + { + ClientHello = 0x01 + } + + private enum ExtensionType : ushort + { + ServerName = 0x00 + } + + private enum NameType : byte + { + HostName = 0x00 + } + } +} diff --git a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslApplicationProtocol.cs b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslApplicationProtocol.cs index a999c793c9..50799c0d6c 100644 --- a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslApplicationProtocol.cs +++ b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslApplicationProtocol.cs @@ -115,17 +115,17 @@ namespace System.Net.Security } return new string(byteChars, 0, byteCharsLength - 1); - - char GetHexValue(int i) - { - if (i < 10) - return (char)(i + '0'); - - return (char)(i - 10 + 'a'); - } } } + static char GetHexValue(int i) + { + if (i < 10) + return (char)(i + '0'); + + return (char)(i - 10 + 'a'); + } + public static bool operator ==(SslApplicationProtocol left, SslApplicationProtocol right) { return left.Equals(right); diff --git a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslAuthenticationOptions.cs b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslAuthenticationOptions.cs index 609666aee4..73741757fd 100644 --- a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslAuthenticationOptions.cs +++ b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslAuthenticationOptions.cs @@ -11,12 +11,12 @@ namespace System.Net.Security { internal class SslAuthenticationOptions { - internal SslAuthenticationOptions(SslClientAuthenticationOptions sslClientAuthenticationOptions) + internal SslAuthenticationOptions(SslClientAuthenticationOptions sslClientAuthenticationOptions, RemoteCertValidationCallback remoteCallback, LocalCertSelectionCallback localCallback) { // Common options. AllowRenegotiation = sslClientAuthenticationOptions.AllowRenegotiation; ApplicationProtocols = sslClientAuthenticationOptions.ApplicationProtocols; - CertValidationDelegate = sslClientAuthenticationOptions._certValidationDelegate; + CertValidationDelegate = remoteCallback; CheckCertName = true; EnabledSslProtocols = sslClientAuthenticationOptions.EnabledSslProtocols; EncryptionPolicy = sslClientAuthenticationOptions.EncryptionPolicy; @@ -26,7 +26,7 @@ namespace System.Net.Security TargetHost = sslClientAuthenticationOptions.TargetHost; // Client specific options. - CertSelectionDelegate = sslClientAuthenticationOptions._certSelectionDelegate; + CertSelectionDelegate = localCallback; CertificateRevocationCheckMode = sslClientAuthenticationOptions.CertificateRevocationCheckMode; ClientCertificates = sslClientAuthenticationOptions.ClientCertificates; LocalCertificateSelectionCallback = sslClientAuthenticationOptions.LocalCertificateSelectionCallback; @@ -37,7 +37,6 @@ namespace System.Net.Security // Common options. AllowRenegotiation = sslServerAuthenticationOptions.AllowRenegotiation; ApplicationProtocols = sslServerAuthenticationOptions.ApplicationProtocols; - CertValidationDelegate = sslServerAuthenticationOptions._certValidationDelegate; CheckCertName = false; EnabledSslProtocols = sslServerAuthenticationOptions.EnabledSslProtocols; EncryptionPolicy = sslServerAuthenticationOptions.EncryptionPolicy; @@ -66,6 +65,7 @@ namespace System.Net.Security internal bool CheckCertName { get; set; } internal RemoteCertValidationCallback CertValidationDelegate { get; set; } internal LocalCertSelectionCallback CertSelectionDelegate { get; set; } + internal ServerCertSelectionCallback ServerCertSelectionDelegate { get; set; } } } diff --git a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslClientAuthenticationOptions.cs b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslClientAuthenticationOptions.cs index 4bc3773708..bf68f1d602 100644 --- a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslClientAuthenticationOptions.cs +++ b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslClientAuthenticationOptions.cs @@ -16,9 +16,6 @@ namespace System.Net.Security private SslProtocols _enabledSslProtocols = SecurityProtocol.SystemDefaultSecurityProtocols; private bool _allowRenegotiation = true; - internal RemoteCertValidationCallback _certValidationDelegate; - internal LocalCertSelectionCallback _certSelectionDelegate; - public bool AllowRenegotiation { get => _allowRenegotiation; diff --git a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslServerAuthenticationOptions.cs b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslServerAuthenticationOptions.cs index cf5b271a10..5b3935ba07 100644 --- a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslServerAuthenticationOptions.cs +++ b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslServerAuthenticationOptions.cs @@ -15,8 +15,6 @@ namespace System.Net.Security private EncryptionPolicy _encryptionPolicy = EncryptionPolicy.RequireEncryption; private bool _allowRenegotiation = true; - internal RemoteCertValidationCallback _certValidationDelegate; - public bool AllowRenegotiation { get => _allowRenegotiation; @@ -29,6 +27,8 @@ namespace System.Net.Security public RemoteCertificateValidationCallback RemoteCertificateValidationCallback { get; set; } + public ServerCertificateSelectionCallback ServerCertificateSelectionCallback { get; set; } + public X509Certificate ServerCertificate { get; set; } public SslProtocols EnabledSslProtocols diff --git a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslState.cs b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslState.cs index d415cf5bde..9c60b706cc 100644 --- a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslState.cs +++ b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslState.cs @@ -77,12 +77,29 @@ namespace System.Net.Security _innerStream = innerStream; } - internal void ValidateCreateContext(SslClientAuthenticationOptions sslClientAuthenticationOptions) + /// Set as the _exception when the instance is disposed. + private static readonly ExceptionDispatchInfo s_disposedSentinel = ExceptionDispatchInfo.Capture(new ObjectDisposedException(nameof(SslStream))); + + private void ThrowIfExceptional() { - if (_exception != null) + ExceptionDispatchInfo e = _exception; + if (e != null) { - _exception.Throw(); + // If the stored exception just indicates disposal, throw a new ODE rather than the stored one, + // so as to not continually build onto the shared exception's stack. + if (ReferenceEquals(e, s_disposedSentinel)) + { + throw new ObjectDisposedException(nameof(SslStream)); + } + + // Throw the stored exception. + e.Throw(); } + } + + internal void ValidateCreateContext(SslClientAuthenticationOptions sslClientAuthenticationOptions, RemoteCertValidationCallback remoteCallback, LocalCertSelectionCallback localCallback) + { + ThrowIfExceptional(); if (Context != null && Context.IsValidContext) { @@ -99,15 +116,14 @@ namespace System.Net.Security throw new ArgumentNullException(nameof(sslClientAuthenticationOptions.TargetHost)); } - if (sslClientAuthenticationOptions.TargetHost.Length == 0) - { - sslClientAuthenticationOptions.TargetHost = "?" + Interlocked.Increment(ref s_uniqueNameInteger).ToString(NumberFormatInfo.InvariantInfo); - } - _exception = null; try { - _sslAuthenticationOptions = new SslAuthenticationOptions(sslClientAuthenticationOptions); + _sslAuthenticationOptions = new SslAuthenticationOptions(sslClientAuthenticationOptions, remoteCallback, localCallback); + if (_sslAuthenticationOptions.TargetHost.Length == 0) + { + _sslAuthenticationOptions.TargetHost = "?" + Interlocked.Increment(ref s_uniqueNameInteger).ToString(NumberFormatInfo.InvariantInfo); + } _context = new SecureChannel(_sslAuthenticationOptions); } catch (Win32Exception e) @@ -116,12 +132,9 @@ namespace System.Net.Security } } - internal void ValidateCreateContext(SslServerAuthenticationOptions sslServerAuthenticationOptions) + internal void ValidateCreateContext(SslAuthenticationOptions sslAuthenticationOptions) { - if (_exception != null) - { - _exception.Throw(); - } + ThrowIfExceptional(); if (Context != null && Context.IsValidContext) { @@ -133,15 +146,11 @@ namespace System.Net.Security throw new InvalidOperationException(SR.net_auth_client_server); } - if (sslServerAuthenticationOptions.ServerCertificate == null) - { - throw new ArgumentNullException(nameof(sslServerAuthenticationOptions.ServerCertificate)); - } - _exception = null; + _sslAuthenticationOptions = sslAuthenticationOptions; + try { - _sslAuthenticationOptions = new SslAuthenticationOptions(sslServerAuthenticationOptions); _context = new SecureChannel(_sslAuthenticationOptions); } catch (Win32Exception e) @@ -401,7 +410,7 @@ namespace System.Net.Security } } - private ExceptionDispatchInfo SetException(Exception e) + private void SetException(Exception e) { Debug.Assert(e != null, $"Expected non-null Exception to be passed to {nameof(SetException)}"); @@ -410,12 +419,7 @@ namespace System.Net.Security _exception = ExceptionDispatchInfo.Capture(e); } - if (_exception != null && Context != null) - { - Context.Close(); - } - - return _exception; + Context?.Close(); } private bool HandshakeCompleted @@ -436,10 +440,7 @@ namespace System.Net.Security internal void CheckThrow(bool authSuccessCheck, bool shutdownCheck = false) { - if (_exception != null) - { - _exception.Throw(); - } + ThrowIfExceptional(); if (authSuccessCheck && !IsAuthenticated) { @@ -467,11 +468,9 @@ namespace System.Net.Security // internal void Close() { - _exception = ExceptionDispatchInfo.Capture(new ObjectDisposedException("SslStream")); - if (Context != null) - { - Context.Close(); - } + _exception = s_disposedSentinel; + Context?.Close(); + _secureStream?.Dispose(); } internal SecurityStatusPal EncryptData(ReadOnlyMemory buffer, ref byte[] outBuffer, out int outSize) @@ -668,14 +667,12 @@ namespace System.Net.Security _Framing = Framing.Unknown; _handshakeCompleted = false; - if (SetException(e).SourceException == e) + SetException(e); + if (_exception.SourceException != e) { - throw; - } - else - { - _exception.Throw(); + ThrowIfExceptional(); } + throw; } finally { @@ -734,7 +731,8 @@ namespace System.Net.Security _Framing = Framing.Unknown; _handshakeCompleted = false; - SetException(e).Throw(); + SetException(e); + ThrowIfExceptional(); } } @@ -1286,7 +1284,7 @@ namespace System.Net.Security AsyncProtocolRequest request = (AsyncProtocolRequest)_queuedReadStateRequest; request.Buffer = renegotiateBuffer; _queuedReadStateRequest = null; - ThreadPool.QueueUserWorkItem(new WaitCallback(AsyncResumeHandshakeRead), request); + ThreadPool.QueueUserWorkItem(s => s.sslState.AsyncResumeHandshakeRead(s.request), (sslState: this, request), preferLocal: false); } } } @@ -1384,7 +1382,7 @@ namespace System.Net.Security taskCompletionSource.SetResult(0); break; default: - ThreadPool.QueueUserWorkItem(new WaitCallback(AsyncResumeHandshake), obj); + ThreadPool.QueueUserWorkItem(s => s.sslState.AsyncResumeHandshake(s.obj), (sslState: this, obj), preferLocal: false); break; } } @@ -1748,9 +1746,8 @@ namespace System.Net.Security // // Called with no user stack. // - private void AsyncResumeHandshakeRead(object state) + private void AsyncResumeHandshakeRead(AsyncProtocolRequest asyncRequest) { - AsyncProtocolRequest asyncRequest = (AsyncProtocolRequest)state; try { if (_pendingReHandshake) @@ -1776,22 +1773,6 @@ namespace System.Net.Security } } - // - // Called with no user stack. - // - private void CompleteRequestWaitCallback(object state) - { - AsyncProtocolRequest request = (AsyncProtocolRequest)state; - - // Force async completion. - if (request.MustCompleteSynchronously) - { - throw new InternalException(); - } - - request.CompleteRequest(0); - } - private void RehandshakeCompleteCallback(IAsyncResult result) { LazyAsyncResult lazyAsyncResult = (LazyAsyncResult)result; diff --git a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStream.cs b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStream.cs index 62027859b7..db8b2945b4 100644 --- a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStream.cs +++ b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStream.cs @@ -31,9 +31,12 @@ namespace System.Net.Security // A user delegate used to select local SSL certificate. public delegate X509Certificate LocalCertificateSelectionCallback(object sender, string targetHost, X509CertificateCollection localCertificates, X509Certificate remoteCertificate, string[] acceptableIssuers); + public delegate X509Certificate ServerCertificateSelectionCallback(object sender, string hostName); + // Internal versions of the above delegates. internal delegate bool RemoteCertValidationCallback(string host, X509Certificate2 certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors); internal delegate X509Certificate LocalCertSelectionCallback(string targetHost, X509CertificateCollection localCertificates, X509Certificate2 remoteCertificate, string[] acceptableIssuers); + internal delegate X509Certificate ServerCertSelectionCallback(string hostName); public class SslStream : AuthenticatedStream { @@ -42,6 +45,7 @@ namespace System.Net.Security internal RemoteCertificateValidationCallback _userCertificateValidationCallback; internal LocalCertificateSelectionCallback _userCertificateSelectionCallback; + internal ServerCertificateSelectionCallback _userServerCertificateSelectionCallback; internal RemoteCertValidationCallback _certValidationDelegate; internal LocalCertSelectionCallback _certSelectionDelegate; internal EncryptionPolicy _encryptionPolicy; @@ -141,6 +145,34 @@ namespace System.Net.Security return _userCertificateSelectionCallback(this, targetHost, localCertificates, remoteCertificate, acceptableIssuers); } + private X509Certificate ServerCertSelectionCallbackWrapper(string targetHost) + { + return _userServerCertificateSelectionCallback(this, targetHost); + } + + private SslAuthenticationOptions CreateAuthenticationOptions(SslServerAuthenticationOptions sslServerAuthenticationOptions) + { + if (sslServerAuthenticationOptions.ServerCertificate == null && sslServerAuthenticationOptions.ServerCertificateSelectionCallback == null && _certSelectionDelegate == null) + { + throw new ArgumentNullException(nameof(sslServerAuthenticationOptions.ServerCertificate)); + } + + if ((sslServerAuthenticationOptions.ServerCertificate != null || _certSelectionDelegate != null) && sslServerAuthenticationOptions.ServerCertificateSelectionCallback != null) + { + throw new InvalidOperationException(SR.Format(SR.net_conflicting_options, nameof(ServerCertificateSelectionCallback))); + } + + var authOptions = new SslAuthenticationOptions(sslServerAuthenticationOptions); + + _userServerCertificateSelectionCallback = sslServerAuthenticationOptions.ServerCertificateSelectionCallback; + authOptions.ServerCertSelectionDelegate = _userServerCertificateSelectionCallback == null ? null : new ServerCertSelectionCallback(ServerCertSelectionCallbackWrapper); + + authOptions.CertValidationDelegate = _certValidationDelegate; + authOptions.CertSelectionDelegate = _certSelectionDelegate; + + return authOptions; + } + // // Client side auth. // @@ -174,15 +206,10 @@ namespace System.Net.Security internal virtual IAsyncResult BeginAuthenticateAsClient(SslClientAuthenticationOptions sslClientAuthenticationOptions, CancellationToken cancellationToken, AsyncCallback asyncCallback, object asyncState) { - SecurityProtocol.ThrowOnNotAllowed(sslClientAuthenticationOptions.EnabledSslProtocols); SetAndVerifyValidationCallback(sslClientAuthenticationOptions.RemoteCertificateValidationCallback); SetAndVerifySelectionCallback(sslClientAuthenticationOptions.LocalCertificateSelectionCallback); - // Set the delegates on the options. - sslClientAuthenticationOptions._certValidationDelegate = _certValidationDelegate; - sslClientAuthenticationOptions._certSelectionDelegate = _certSelectionDelegate; - - _sslState.ValidateCreateContext(sslClientAuthenticationOptions); + _sslState.ValidateCreateContext(sslClientAuthenticationOptions, _certValidationDelegate, _certSelectionDelegate); LazyAsyncResult result = new LazyAsyncResult(_sslState, asyncState, asyncCallback); _sslState.ProcessAuthentication(result); @@ -230,13 +257,9 @@ namespace System.Net.Security private IAsyncResult BeginAuthenticateAsServer(SslServerAuthenticationOptions sslServerAuthenticationOptions, CancellationToken cancellationToken, AsyncCallback asyncCallback, object asyncState) { - SecurityProtocol.ThrowOnNotAllowed(sslServerAuthenticationOptions.EnabledSslProtocols); SetAndVerifyValidationCallback(sslServerAuthenticationOptions.RemoteCertificateValidationCallback); - // Set the delegate on the options. - sslServerAuthenticationOptions._certValidationDelegate = _certValidationDelegate; - - _sslState.ValidateCreateContext(sslServerAuthenticationOptions); + _sslState.ValidateCreateContext(CreateAuthenticationOptions(sslServerAuthenticationOptions)); LazyAsyncResult result = new LazyAsyncResult(_sslState, asyncState, asyncCallback); _sslState.ProcessAuthentication(result); @@ -298,15 +321,10 @@ namespace System.Net.Security private void AuthenticateAsClient(SslClientAuthenticationOptions sslClientAuthenticationOptions) { - SecurityProtocol.ThrowOnNotAllowed(sslClientAuthenticationOptions.EnabledSslProtocols); SetAndVerifyValidationCallback(sslClientAuthenticationOptions.RemoteCertificateValidationCallback); SetAndVerifySelectionCallback(sslClientAuthenticationOptions.LocalCertificateSelectionCallback); - // Set the delegates on the options. - sslClientAuthenticationOptions._certValidationDelegate = _certValidationDelegate; - sslClientAuthenticationOptions._certSelectionDelegate = _certSelectionDelegate; - - _sslState.ValidateCreateContext(sslClientAuthenticationOptions); + _sslState.ValidateCreateContext(sslClientAuthenticationOptions, _certValidationDelegate, _certSelectionDelegate); _sslState.ProcessAuthentication(null); } @@ -336,13 +354,9 @@ namespace System.Net.Security private void AuthenticateAsServer(SslServerAuthenticationOptions sslServerAuthenticationOptions) { - SecurityProtocol.ThrowOnNotAllowed(sslServerAuthenticationOptions.EnabledSslProtocols); SetAndVerifyValidationCallback(sslServerAuthenticationOptions.RemoteCertificateValidationCallback); - // Set the delegate on the options. - sslServerAuthenticationOptions._certValidationDelegate = _certValidationDelegate; - - _sslState.ValidateCreateContext(sslServerAuthenticationOptions); + _sslState.ValidateCreateContext(CreateAuthenticationOptions(sslServerAuthenticationOptions)); _sslState.ProcessAuthentication(null); } #endregion @@ -711,9 +725,9 @@ namespace System.Net.Security return _sslState.SecureStream.WriteAsync(buffer, offset, count, cancellationToken); } - public override Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken) + public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken) { - return _sslState.SecureStream.WriteAsync(source, cancellationToken); + return _sslState.SecureStream.WriteAsync(buffer, cancellationToken); } public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) @@ -721,9 +735,9 @@ namespace System.Net.Security return _sslState.SecureStream.ReadAsync(buffer, offset, count, cancellationToken); } - public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default) + public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default) { - return _sslState.SecureStream.ReadAsync(destination, cancellationToken); + return _sslState.SecureStream.ReadAsync(buffer, cancellationToken); } } } diff --git a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStreamInternal.Adapters.cs b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStreamInternal.Adapters.cs index a94abda4d5..2dcc93fe31 100644 --- a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStreamInternal.Adapters.cs +++ b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStreamInternal.Adapters.cs @@ -12,7 +12,7 @@ namespace System.Net.Security private interface ISslWriteAdapter { Task LockAsync(); - Task WriteAsync(byte[] buffer, int offset, int count); + ValueTask WriteAsync(byte[] buffer, int offset, int count); } private interface ISslReadAdapter @@ -61,7 +61,7 @@ namespace System.Net.Security public Task LockAsync() => _sslState.CheckEnqueueWriteAsync(); - public Task WriteAsync(byte[] buffer, int offset, int count) => _sslState.InnerStream.WriteAsync(buffer, offset, count, _cancellationToken); + public ValueTask WriteAsync(byte[] buffer, int offset, int count) => _sslState.InnerStream.WriteAsync(new ReadOnlyMemory(buffer, offset, count), _cancellationToken); } private readonly struct SslWriteSync : ISslWriteAdapter @@ -76,10 +76,10 @@ namespace System.Net.Security return Task.CompletedTask; } - public Task WriteAsync(byte[] buffer, int offset, int count) + public ValueTask WriteAsync(byte[] buffer, int offset, int count) { _sslState.InnerStream.Write(buffer, offset, count); - return Task.CompletedTask; + return default; } } } diff --git a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStreamInternal.cs b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStreamInternal.cs index 99e2f8b18a..f01377578a 100644 --- a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStreamInternal.cs +++ b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStreamInternal.cs @@ -14,7 +14,7 @@ namespace System.Net.Security // // This is a wrapping stream that does data encryption/decryption based on a successfully authenticated SSPI context. // - internal partial class SslStreamInternal + internal partial class SslStreamInternal : IDisposable { private const int FrameOverhead = 32; private const int ReadBufferSize = 4096 * 4 + FrameOverhead; // We read in 16K chunks + headers. @@ -57,10 +57,36 @@ namespace System.Net.Security ~SslStreamInternal() { - if (_internalBuffer != null) + Dispose(disposing: false); + } + + public void Dispose() + { + Dispose(disposing: true); + + if (_internalBuffer == null) { - ArrayPool.Shared.Return(_internalBuffer); - _internalBuffer = null; + // Suppress finalizer if the read buffer was returned. + GC.SuppressFinalize(this); + } + } + + private void Dispose(bool disposing) + { + // Ensure a Read operation is not in progress, + // block potential reads since SslStream is disposing. + // This leaves the _nestedRead = 1, but that's ok, since + // subsequent Reads first check if the context is still available. + if (Interlocked.CompareExchange(ref _nestedRead, 1, 0) == 0) + { + byte[] buffer = _internalBuffer; + if (buffer != null) + { + _internalBuffer = null; + _internalBufferCount = 0; + _internalOffset = 0; + ArrayPool.Shared.Return(buffer); + } } } @@ -141,7 +167,7 @@ namespace System.Net.Security internal void EndWrite(IAsyncResult asyncResult) => TaskToApm.End(asyncResult); - internal Task WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken) + internal ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken) { SslWriteAsync writeAdapter = new SslWriteAsync(_sslState, cancellationToken); return WriteAsyncInternal(writeAdapter, buffer); @@ -150,13 +176,12 @@ namespace System.Net.Security internal Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) { ValidateParameters(buffer, offset, count); - return WriteAsync(new ReadOnlyMemory(buffer, offset, count), cancellationToken); + return WriteAsync(new ReadOnlyMemory(buffer, offset, count), cancellationToken).AsTask(); } private void ResetReadBuffer() { Debug.Assert(_decryptedBytesCount == 0); - Debug.Assert(_internalBuffer == null || _internalBufferCount > 0); if (_internalBuffer == null) { @@ -206,22 +231,21 @@ namespace System.Net.Security throw new NotSupportedException(SR.Format(SR.net_io_invalidnestedcall, nameof(ReadAsync), "read")); } - while (true) + try { - int copyBytes; - if (_decryptedBytesCount != 0) + while (true) { - copyBytes = CopyDecryptedData(buffer); + int copyBytes; + if (_decryptedBytesCount != 0) + { + copyBytes = CopyDecryptedData(buffer); - _sslState.FinishRead(null); - _nestedRead = 0; + _sslState.FinishRead(null); - return copyBytes; - } + return copyBytes; + } - copyBytes = await adapter.LockAsync(buffer).ConfigureAwait(false); - try - { + copyBytes = await adapter.LockAsync(buffer).ConfigureAwait(false); if (copyBytes > 0) { return copyBytes; @@ -241,9 +265,10 @@ namespace System.Net.Security } readBytes = await FillBufferAsync(adapter, SecureChannel.ReadHeaderSize + payloadBytes).ConfigureAwait(false); - if (readBytes < 0) + Debug.Assert(readBytes >= 0); + if (readBytes == 0) { - throw new IOException(SR.net_frame_read_size); + throw new IOException(SR.net_io_eof); } // At this point, readBytes contains the size of the header plus body. @@ -294,25 +319,25 @@ namespace System.Net.Security throw new IOException(SR.net_io_decrypt, message.GetException()); } } - catch (Exception e) - { - _sslState.FinishRead(null); + } + catch (Exception e) + { + _sslState.FinishRead(null); - if (e is IOException) - { - throw; - } - - throw new IOException(SR.net_io_read, e); - } - finally + if (e is IOException) { - _nestedRead = 0; + throw; } + + throw new IOException(SR.net_io_read, e); + } + finally + { + _nestedRead = 0; } } - private Task WriteAsyncInternal(TWriteAdapter writeAdapter, ReadOnlyMemory buffer) + private ValueTask WriteAsyncInternal(TWriteAdapter writeAdapter, ReadOnlyMemory buffer) where TWriteAdapter : struct, ISslWriteAdapter { _sslState.CheckThrow(authSuccessCheck: true, shutdownCheck: true); @@ -320,7 +345,7 @@ namespace System.Net.Security if (buffer.Length == 0 && !SslStreamPal.CanEncryptEmptyMessage) { // If it's an empty message and the PAL doesn't support that, we're done. - return Task.CompletedTask; + return default; } if (Interlocked.Exchange(ref _nestedWrite, 1) == 1) @@ -328,18 +353,18 @@ namespace System.Net.Security throw new NotSupportedException(SR.Format(SR.net_io_invalidnestedcall, nameof(WriteAsync), "write")); } - Task t = buffer.Length < _sslState.MaxDataSize ? + ValueTask t = buffer.Length < _sslState.MaxDataSize ? WriteSingleChunk(writeAdapter, buffer) : - WriteAsyncChunked(writeAdapter, buffer); + new ValueTask(WriteAsyncChunked(writeAdapter, buffer)); if (t.IsCompletedSuccessfully) { _nestedWrite = 0; return t; } - return ExitWriteAsync(t); + return new ValueTask(ExitWriteAsync(t)); - async Task ExitWriteAsync(Task task) + async Task ExitWriteAsync(ValueTask task) { try { @@ -363,7 +388,7 @@ namespace System.Net.Security } } - private Task WriteSingleChunk(TWriteAdapter writeAdapter, ReadOnlyMemory buffer) + private ValueTask WriteSingleChunk(TWriteAdapter writeAdapter, ReadOnlyMemory buffer) where TWriteAdapter : struct, ISslWriteAdapter { // Request a write IO slot. @@ -371,7 +396,7 @@ namespace System.Net.Security if (!ioSlot.IsCompletedSuccessfully) { // Operation is async and has been queued, return. - return WaitForWriteIOSlot(writeAdapter, ioSlot, buffer); + return new ValueTask(WaitForWriteIOSlot(writeAdapter, ioSlot, buffer)); } byte[] rentedBuffer = ArrayPool.Shared.Rent(buffer.Length + FrameOverhead); @@ -384,10 +409,10 @@ namespace System.Net.Security // Re-handshake status is not supported. ArrayPool.Shared.Return(rentedBuffer); ProtocolToken message = new ProtocolToken(null, status); - return Task.FromException(new IOException(SR.net_io_encrypt, message.GetException())); + return new ValueTask(Task.FromException(new IOException(SR.net_io_encrypt, message.GetException()))); } - Task t = writeAdapter.WriteAsync(outBuffer, 0, encryptedBytes); + ValueTask t = writeAdapter.WriteAsync(outBuffer, 0, encryptedBytes); if (t.IsCompletedSuccessfully) { ArrayPool.Shared.Return(rentedBuffer); @@ -396,7 +421,7 @@ namespace System.Net.Security } else { - return CompleteAsync(t, rentedBuffer); + return new ValueTask(CompleteAsync(t, rentedBuffer)); } async Task WaitForWriteIOSlot(TWriteAdapter wAdapter, Task lockTask, ReadOnlyMemory buff) @@ -405,7 +430,7 @@ namespace System.Net.Security await WriteSingleChunk(wAdapter, buff).ConfigureAwait(false); } - async Task CompleteAsync(Task writeTask, byte[] bufferToReturn) + async Task CompleteAsync(ValueTask writeTask, byte[] bufferToReturn) { try { @@ -445,7 +470,7 @@ namespace System.Net.Security ValueTask t = adapter.ReadAsync(_internalBuffer, _internalBufferCount, _internalBuffer.Length - _internalBufferCount); if (!t.IsCompletedSuccessfully) { - return new ValueTask(InternalFillBufferAsync(adapter, t.AsTask(), minSize, initialCount)); + return new ValueTask(InternalFillBufferAsync(adapter, t, minSize, initialCount)); } int bytes = t.Result; if (bytes == 0) @@ -464,7 +489,7 @@ namespace System.Net.Security return new ValueTask(minSize); - async Task InternalFillBufferAsync(TReadAdapter adap, Task task, int min, int initial) + async Task InternalFillBufferAsync(TReadAdapter adap, ValueTask task, int min, int initial) { while (true) { @@ -485,7 +510,7 @@ namespace System.Net.Security return min; } - task = adap.ReadAsync(_internalBuffer, _internalBufferCount, _internalBuffer.Length - _internalBufferCount).AsTask(); + task = adap.ReadAsync(_internalBuffer, _internalBufferCount, _internalBuffer.Length - _internalBufferCount); } } } diff --git a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStreamPal.OSX.cs b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStreamPal.OSX.cs index 54f8303ce5..02943cc70f 100644 --- a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStreamPal.OSX.cs +++ b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStreamPal.OSX.cs @@ -16,8 +16,6 @@ namespace System.Net.Security { internal static class SslStreamPal { - private static readonly StreamSizes s_streamSizes = new StreamSizes(); - public static Exception GetException(SecurityStatusPal status) { return status.Exception ?? new Win32Exception((int)status.ErrorCode); @@ -128,7 +126,7 @@ namespace System.Net.Security unsafe { - MemoryHandle memHandle = input.Retain(pin: true); + MemoryHandle memHandle = input.Pin(); try { PAL_TlsIo status; @@ -259,7 +257,7 @@ namespace System.Net.Security SafeDeleteContext securityContext, out StreamSizes streamSizes) { - streamSizes = s_streamSizes; + streamSizes = StreamSizes.Default; } public static void QueryContextConnectionInfo( diff --git a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStreamPal.Unix.cs b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStreamPal.Unix.cs index 38461f1996..37e197434b 100644 --- a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStreamPal.Unix.cs +++ b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStreamPal.Unix.cs @@ -15,8 +15,6 @@ namespace System.Net.Security { internal static class SslStreamPal { - private static readonly StreamSizes s_streamSizes = new StreamSizes(); - public static Exception GetException(SecurityStatusPal status) { return status.Exception ?? new Interop.OpenSsl.SslException((int)status.ErrorCode); @@ -122,7 +120,7 @@ namespace System.Net.Security public static void QueryContextStreamSizes(SafeDeleteContext securityContext, out StreamSizes streamSizes) { - streamSizes = s_streamSizes; + streamSizes = StreamSizes.Default; } public static void QueryContextConnectionInfo(SafeDeleteContext securityContext, out SslConnectionInfo connectionInfo) @@ -257,6 +255,11 @@ namespace System.Net.Security { return new SecurityStatusPal(SecurityStatusPalErrorCode.OK); } + else if (code == Interop.Ssl.SslErrorCode.SSL_ERROR_SSL) + { + // OpenSSL failure occurred. The error queue contains more details, when building the exception the queue will be cleared. + return new SecurityStatusPal(SecurityStatusPalErrorCode.InternalError, Interop.Crypto.CreateOpenSslCryptographicException()); + } else { return new SecurityStatusPal(SecurityStatusPalErrorCode.InternalError, new Interop.OpenSsl.SslException((int)code)); diff --git a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStreamPal.Windows.cs b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStreamPal.Windows.cs index d2b822b84d..1217c710fe 100644 --- a/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStreamPal.Windows.cs +++ b/external/corefx/src/System.Net.Security/src/System/Net/Security/SslStreamPal.Windows.cs @@ -153,7 +153,8 @@ namespace System.Net.Security Interop.SspiCli.SCHANNEL_CRED.Flags.SCH_SEND_AUX_RECORD; // CoreFX: always opt-in SCH_USE_STRONG_CRYPTO except for SSL3. - if (((protocolFlags & (Interop.SChannel.SP_PROT_TLS1_0 | Interop.SChannel.SP_PROT_TLS1_1 | Interop.SChannel.SP_PROT_TLS1_2)) != 0) + if (((protocolFlags == 0) || + (protocolFlags & (Interop.SChannel.SP_PROT_TLS1_0 | Interop.SChannel.SP_PROT_TLS1_1 | Interop.SChannel.SP_PROT_TLS1_2)) != 0) && (policy != EncryptionPolicy.AllowNoEncryption) && (policy != EncryptionPolicy.NoEncryption)) { flags |= Interop.SspiCli.SCHANNEL_CRED.Flags.SCH_USE_STRONG_CRYPTO; @@ -165,6 +166,7 @@ namespace System.Net.Security flags = Interop.SspiCli.SCHANNEL_CRED.Flags.SCH_SEND_AUX_RECORD; } + if (NetEventSource.IsEnabled) NetEventSource.Info($"flags=({flags}), ProtocolFlags=({protocolFlags}), EncryptionPolicy={policy}"); Interop.SspiCli.SCHANNEL_CRED secureCredential = CreateSecureCredential( Interop.SspiCli.SCHANNEL_CRED.CurrentVersion, certificate, @@ -465,9 +467,8 @@ namespace System.Net.Security return SSPIWrapper.AcquireCredentialsHandle(GlobalSSPI.SSPISecureChannel, SecurityPackage, credUsage, secureCredential); }); } - catch (Exception ex) + catch { - Debug.Fail("AcquireCredentialsHandle failed.", ex.ToString()); return SSPIWrapper.AcquireCredentialsHandle(GlobalSSPI.SSPISecureChannel, SecurityPackage, credUsage, secureCredential); } } diff --git a/external/corefx/src/System.Net.Security/src/System/Net/Security/StreamSizes.OSX.cs b/external/corefx/src/System.Net.Security/src/System/Net/Security/StreamSizes.OSX.cs index ed34467fe9..5d8e5e9ef6 100644 --- a/external/corefx/src/System.Net.Security/src/System/Net/Security/StreamSizes.OSX.cs +++ b/external/corefx/src/System.Net.Security/src/System/Net/Security/StreamSizes.OSX.cs @@ -4,7 +4,7 @@ namespace System.Net { - internal partial class StreamSizes + internal partial struct StreamSizes { // Windows SChannel requires that you pass it a buffer big enough to hold // the header, the trailer, and the payload. You're also required to do your @@ -19,11 +19,6 @@ namespace System.Net // but using a bound of 32k means that if we were to switch from pointers to temporary // arrays, we'd be maintaining a reasonable upper bound. - public StreamSizes() - { - Header = 0; - Trailer = 0; - MaximumMessage = 32 * 1024; - } + public static StreamSizes Default => new StreamSizes { MaximumMessage = 32 * 1024 }; } } diff --git a/external/corefx/src/System.Net.Security/src/System/Net/Security/StreamSizes.Unix.cs b/external/corefx/src/System.Net.Security/src/System/Net/Security/StreamSizes.Unix.cs index 58025fa760..69d1a46318 100644 --- a/external/corefx/src/System.Net.Security/src/System/Net/Security/StreamSizes.Unix.cs +++ b/external/corefx/src/System.Net.Security/src/System/Net/Security/StreamSizes.Unix.cs @@ -4,7 +4,7 @@ namespace System.Net { - internal partial class StreamSizes + internal partial struct StreamSizes { // Windows SChannel requires that you pass it a buffer big enough to hold // the header, the trailer, and the payload. You're also required to do your @@ -20,11 +20,6 @@ namespace System.Net // but using a bound of 32k means that if we were to switch from pointers to temporary // arrays, we'd be maintaining a reasonable upper bound. - public StreamSizes() - { - Header = 0; - Trailer = 0; - MaximumMessage = 32 * 1024; - } + public static StreamSizes Default => new StreamSizes { MaximumMessage = 32 * 1024 }; } } diff --git a/external/corefx/src/System.Net.Security/src/System/Net/Security/StreamSizes.Windows.cs b/external/corefx/src/System.Net.Security/src/System/Net/Security/StreamSizes.Windows.cs index a09cad726a..2b1184aa04 100644 --- a/external/corefx/src/System.Net.Security/src/System/Net/Security/StreamSizes.Windows.cs +++ b/external/corefx/src/System.Net.Security/src/System/Net/Security/StreamSizes.Windows.cs @@ -4,7 +4,7 @@ namespace System.Net { - internal partial class StreamSizes + internal partial struct StreamSizes { public StreamSizes(SecPkgContext_StreamSizes interopStreamSizes) { diff --git a/external/corefx/src/System.Net.Security/src/System/Net/Security/StreamSizes.cs b/external/corefx/src/System.Net.Security/src/System/Net/Security/StreamSizes.cs index a885fa364e..a9cfaff12d 100644 --- a/external/corefx/src/System.Net.Security/src/System/Net/Security/StreamSizes.cs +++ b/external/corefx/src/System.Net.Security/src/System/Net/Security/StreamSizes.cs @@ -4,7 +4,7 @@ namespace System.Net { - internal partial class StreamSizes + internal partial struct StreamSizes { public int Header { diff --git a/external/corefx/src/System.Net.Security/tests/FunctionalTests/ClientAsyncAuthenticateTest.cs b/external/corefx/src/System.Net.Security/tests/FunctionalTests/ClientAsyncAuthenticateTest.cs index e89925d910..c134274bee 100644 --- a/external/corefx/src/System.Net.Security/tests/FunctionalTests/ClientAsyncAuthenticateTest.cs +++ b/external/corefx/src/System.Net.Security/tests/FunctionalTests/ClientAsyncAuthenticateTest.cs @@ -24,6 +24,17 @@ namespace System.Net.Security.Tests _log = TestLogging.GetInstance(); } + [Fact] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "CI uses old Framework version, which doesn't support using SslProtocols.None for default system behavior")] + public async Task ClientAsyncAuthenticate_SslStreamClientServerNone_UseStrongCryptoSet() + { + SslProtocols protocol = SslProtocols.None; + await ClientAsyncSslHelper(protocol, protocol); + + // Additional manual verification. + // Step into the code and verify that the 'SCH_USE_STRONG_CRYPTO' flag is being set. + } + [Fact] public async Task ClientAsyncAuthenticate_ServerRequireEncryption_ConnectWithEncryption() { @@ -44,15 +55,18 @@ namespace System.Net.Security.Tests await ClientAsyncSslHelper(protocol, protocol); } - [Theory] - [ClassData(typeof(SslProtocolSupport.UnsupportedSslProtocolsTestData))] - [ActiveIssue(16534, TestPlatforms.Windows)] - public async Task ClientAsyncAuthenticate_EachClientUnsupportedProtocol_Fail(SslProtocols protocol) + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] + public async Task ClientAsyncAuthenticate_Ssl2WithSelf_Success() { - await Assert.ThrowsAsync(() => + // Test Ssl2 against itself. This is a standalone test as even on versions where Windows supports Ssl2, + // it appears to have rules around not using it when other protocols are mentioned. + if (!PlatformDetection.IsWindows10Version1607OrGreater) { - return ClientAsyncSslHelper(protocol, SslProtocolSupport.SupportedSslProtocols); - }); +#pragma warning disable 0618 + await ClientAsyncSslHelper(SslProtocols.Ssl2, SslProtocols.Ssl2); +#pragma warning restore 0618 + } } [Theory] @@ -63,7 +77,9 @@ namespace System.Net.Security.Tests SslProtocols clientProtocol, Type expectedException) { - await Assert.ThrowsAsync(expectedException, () => ClientAsyncSslHelper(serverProtocol, clientProtocol)); + Exception e = await Record.ExceptionAsync(() => ClientAsyncSslHelper(serverProtocol, clientProtocol)); + Assert.NotNull(e); + Assert.IsAssignableFrom(expectedException, e); } [Fact] @@ -75,18 +91,6 @@ namespace System.Net.Security.Tests SslProtocolSupport.SupportedSslProtocols); } - [Fact] - [ActiveIssue(16534, TestPlatforms.Windows)] - public async Task ClientAsyncAuthenticate_UnsupportedAllClient_Fail() - { - await Assert.ThrowsAsync(() => - { - return ClientAsyncSslHelper( - SslProtocolSupport.UnsupportedSslProtocols, - SslProtocolSupport.SupportedSslProtocols); - }); - } - [Theory] [ClassData(typeof(SslProtocolSupport.SupportedSslProtocolsTestData))] [ActiveIssue(16534, TestPlatforms.Windows)] @@ -109,6 +113,11 @@ namespace System.Net.Security.Tests private static IEnumerable ProtocolMismatchData() { +#pragma warning disable 0618 + yield return new object[] { SslProtocols.Ssl2, SslProtocols.Ssl3, typeof(Exception) }; + yield return new object[] { SslProtocols.Ssl2, SslProtocols.Tls12, typeof(Exception) }; + yield return new object[] { SslProtocols.Ssl3, SslProtocols.Tls12, typeof(Exception) }; +#pragma warning restore 0618 yield return new object[] { SslProtocols.Tls, SslProtocols.Tls11, typeof(IOException) }; yield return new object[] { SslProtocols.Tls, SslProtocols.Tls12, typeof(IOException) }; yield return new object[] { SslProtocols.Tls11, SslProtocols.Tls, typeof(AuthenticationException) }; diff --git a/external/corefx/src/System.Net.Security/tests/FunctionalTests/NegotiateStreamStreamToStreamTest.cs b/external/corefx/src/System.Net.Security/tests/FunctionalTests/NegotiateStreamStreamToStreamTest.cs index 30ddb217fd..552c731a5e 100644 --- a/external/corefx/src/System.Net.Security/tests/FunctionalTests/NegotiateStreamStreamToStreamTest.cs +++ b/external/corefx/src/System.Net.Security/tests/FunctionalTests/NegotiateStreamStreamToStreamTest.cs @@ -184,7 +184,7 @@ namespace System.Net.Security.Tests Assert.Equal(false, clientIdentity.IsAuthenticated); // On .Net Desktop: Assert.Equal(true, clientIdentity.IsAuthenticated); - IdentityValidator.AssertHasName(clientIdentity, @"NT AUTHORITY\ANONYMOUS LOGON"); + IdentityValidator.AssertHasName(clientIdentity, new SecurityIdentifier(WellKnownSidType.AnonymousSid, null).Translate(typeof(NTAccount)).Value); } } diff --git a/external/corefx/src/System.Net.Security/tests/FunctionalTests/ServerAsyncAuthenticateTest.cs b/external/corefx/src/System.Net.Security/tests/FunctionalTests/ServerAsyncAuthenticateTest.cs index fd01c39fbb..c91a0775c5 100644 --- a/external/corefx/src/System.Net.Security/tests/FunctionalTests/ServerAsyncAuthenticateTest.cs +++ b/external/corefx/src/System.Net.Security/tests/FunctionalTests/ServerAsyncAuthenticateTest.cs @@ -3,9 +3,9 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; +using System.ComponentModel; using System.Net.Sockets; using System.Net.Test.Common; -using System.Runtime.ExceptionServices; using System.Security.Authentication; using System.Security.Cryptography.X509Certificates; using System.Threading.Tasks; @@ -42,20 +42,6 @@ namespace System.Net.Security.Tests await ServerAsyncSslHelper(protocol, protocol); } - [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "These protocols are explicitly disabled on .NET Core but still supported on .NET Framework.")] - [Theory] - [ClassData(typeof(SslProtocolSupport.UnsupportedSslProtocolsTestData))] - public async Task ServerAsyncAuthenticate_EachServerUnsupportedProtocol_Fail(SslProtocols protocol) - { - await Assert.ThrowsAsync(() => - { - return ServerAsyncSslHelper( - SslProtocolSupport.SupportedSslProtocols, - protocol, - expectedToFail: true); - }); - } - [Theory] [MemberData(nameof(ProtocolMismatchData))] public async Task ServerAsyncAuthenticate_MismatchProtocols_Fails( @@ -63,8 +49,7 @@ namespace System.Net.Security.Tests SslProtocols clientProtocol, Type expectedException) { - await Assert.ThrowsAsync( - expectedException, + Exception e = await Record.ExceptionAsync( () => { return ServerAsyncSslHelper( @@ -72,19 +57,9 @@ namespace System.Net.Security.Tests clientProtocol, expectedToFail: true); }); - } - [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "These protocols are explicitly disabled on .NET Core but still supported on .NET Framework.")] - [Fact] - public async Task ServerAsyncAuthenticate_UnsupportedAllServer_Fail() - { - await Assert.ThrowsAsync(() => - { - return ServerAsyncSslHelper( - SslProtocolSupport.SupportedSslProtocols, - SslProtocolSupport.UnsupportedSslProtocols, - expectedToFail: true); - }); + Assert.NotNull(e); + Assert.IsAssignableFrom(expectedException, e); } [Theory] @@ -97,6 +72,11 @@ namespace System.Net.Security.Tests private static IEnumerable ProtocolMismatchData() { +#pragma warning disable 0618 + yield return new object[] { SslProtocols.Ssl2, SslProtocols.Ssl3, typeof(Exception) }; + yield return new object[] { SslProtocols.Ssl2, SslProtocols.Tls12, typeof(Exception) }; + yield return new object[] { SslProtocols.Ssl3, SslProtocols.Tls12, typeof(Exception) }; +#pragma warning restore 0618 yield return new object[] { SslProtocols.Tls, SslProtocols.Tls11, typeof(AuthenticationException) }; yield return new object[] { SslProtocols.Tls, SslProtocols.Tls12, typeof(AuthenticationException) }; yield return new object[] { SslProtocols.Tls11, SslProtocols.Tls, typeof(TimeoutException) }; diff --git a/external/corefx/src/System.Net.Security/tests/FunctionalTests/SniHelperTest.cs.REMOVED.git-id b/external/corefx/src/System.Net.Security/tests/FunctionalTests/SniHelperTest.cs.REMOVED.git-id new file mode 100644 index 0000000000..f4a59c3b18 --- /dev/null +++ b/external/corefx/src/System.Net.Security/tests/FunctionalTests/SniHelperTest.cs.REMOVED.git-id @@ -0,0 +1 @@ +3dafcc083f16c1c9580eb2c91031b26cabf17d80 \ No newline at end of file diff --git a/external/corefx/src/System.Net.Security/tests/FunctionalTests/SslAuthenticationOptionsTest.cs b/external/corefx/src/System.Net.Security/tests/FunctionalTests/SslAuthenticationOptionsTest.cs new file mode 100644 index 0000000000..ada4a652b6 --- /dev/null +++ b/external/corefx/src/System.Net.Security/tests/FunctionalTests/SslAuthenticationOptionsTest.cs @@ -0,0 +1,108 @@ +// 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.Collections.Generic; +using System.Net.Test.Common; +using System.Security.Cryptography.X509Certificates; +using System.Security.Authentication; +using System.Threading.Tasks; +using Xunit; +using System.Linq; + +namespace System.Net.Security.Tests +{ + using Configuration = System.Net.Test.Common.Configuration; + + public class SslClientAuthenticationOptionsTest + { + [Fact] + public async Task ClientOptions_ServerOptions_NotMutatedDuringAuthentication() + { + using (X509Certificate2 clientCert = Configuration.Certificates.GetClientCertificate()) + using (X509Certificate2 serverCert = Configuration.Certificates.GetServerCertificate()) + { + // Values used to populate client options + bool clientAllowRenegotiation = false; + List clientAppProtocols = new List { SslApplicationProtocol.Http11 }; + X509RevocationMode clientRevocation = X509RevocationMode.NoCheck; + X509CertificateCollection clientCertificates = new X509CertificateCollection() { clientCert }; + SslProtocols clientSslProtocols = SslProtocols.Tls12; + EncryptionPolicy clientEncryption = EncryptionPolicy.RequireEncryption; + LocalCertificateSelectionCallback clientLocalCallback = new LocalCertificateSelectionCallback(delegate { return null; }); + RemoteCertificateValidationCallback clientRemoteCallback = new RemoteCertificateValidationCallback(delegate { return true; }); + string clientHost = serverCert.GetNameInfo(X509NameType.SimpleName, false); + + // Values used to populate server options + bool serverAllowRenegotiation = true; + List serverAppProtocols = new List { SslApplicationProtocol.Http11, SslApplicationProtocol.Http2 }; + X509RevocationMode serverRevocation = X509RevocationMode.NoCheck; + bool serverCertRequired = false; + SslProtocols serverSslProtocols = SslProtocols.Tls11 | SslProtocols.Tls12; + EncryptionPolicy serverEncryption = EncryptionPolicy.AllowNoEncryption; + RemoteCertificateValidationCallback serverRemoteCallback = new RemoteCertificateValidationCallback(delegate { return true; }); + + var network = new VirtualNetwork(); + using (var client = new SslStream(new VirtualNetworkStream(network, isServer: false))) + using (var server = new SslStream(new VirtualNetworkStream(network, isServer: true))) + { + // Create client options + var clientOptions = new SslClientAuthenticationOptions + { + AllowRenegotiation = clientAllowRenegotiation, + ApplicationProtocols = clientAppProtocols, + CertificateRevocationCheckMode = clientRevocation, + ClientCertificates = clientCertificates, + EnabledSslProtocols = clientSslProtocols, + EncryptionPolicy = clientEncryption, + LocalCertificateSelectionCallback = clientLocalCallback, + RemoteCertificateValidationCallback = clientRemoteCallback, + TargetHost = clientHost + }; + + // Create server options + var serverOptions = new SslServerAuthenticationOptions + { + AllowRenegotiation = serverAllowRenegotiation, + ApplicationProtocols = serverAppProtocols, + CertificateRevocationCheckMode = serverRevocation, + ClientCertificateRequired = serverCertRequired, + EnabledSslProtocols = serverSslProtocols, + EncryptionPolicy = serverEncryption, + RemoteCertificateValidationCallback = serverRemoteCallback, + ServerCertificate = serverCert + }; + + // Authenticate + Task clientTask = client.AuthenticateAsClientAsync(clientOptions, default); + Task serverTask = server.AuthenticateAsServerAsync(serverOptions, default); + await new[] { clientTask, serverTask }.WhenAllOrAnyFailed(); + + // Validate that client options are unchanged + Assert.Equal(clientAllowRenegotiation, clientOptions.AllowRenegotiation); + Assert.Same(clientAppProtocols, clientOptions.ApplicationProtocols); + Assert.Equal(1, clientOptions.ApplicationProtocols.Count); + Assert.Equal(clientRevocation, clientOptions.CertificateRevocationCheckMode); + Assert.Same(clientCertificates, clientOptions.ClientCertificates); + Assert.Contains(clientCert, clientOptions.ClientCertificates.Cast()); + Assert.Equal(clientSslProtocols, clientOptions.EnabledSslProtocols); + Assert.Equal(clientEncryption, clientOptions.EncryptionPolicy); + Assert.Same(clientLocalCallback, clientOptions.LocalCertificateSelectionCallback); + Assert.Same(clientRemoteCallback, clientOptions.RemoteCertificateValidationCallback); + Assert.Same(clientHost, clientOptions.TargetHost); + + // Validate that server options are unchanged + Assert.Equal(serverAllowRenegotiation, serverOptions.AllowRenegotiation); + Assert.Same(serverAppProtocols, serverOptions.ApplicationProtocols); + Assert.Equal(2, serverOptions.ApplicationProtocols.Count); + Assert.Equal(clientRevocation, serverOptions.CertificateRevocationCheckMode); + Assert.Equal(serverCertRequired, serverOptions.ClientCertificateRequired); + Assert.Equal(serverSslProtocols, serverOptions.EnabledSslProtocols); + Assert.Equal(serverEncryption, serverOptions.EncryptionPolicy); + Assert.Same(serverRemoteCallback, serverOptions.RemoteCertificateValidationCallback); + Assert.Same(serverCert, serverOptions.ServerCertificate); + } + } + } + } +} diff --git a/external/corefx/src/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs b/external/corefx/src/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs index 2d02da12ee..160765c4b9 100644 --- a/external/corefx/src/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs +++ b/external/corefx/src/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs @@ -77,6 +77,59 @@ namespace System.Net.Security.Tests listener.Stop(); } + [Fact] + [PlatformSpecific(TestPlatforms.Linux)] // This only applies where OpenSsl is used. + public async Task SslStream_SendReceiveOverNetworkStream_AuthenticationException() + { + TcpListener listener = new TcpListener(IPAddress.Loopback, 0); + + using (X509Certificate2 serverCertificate = Configuration.Certificates.GetServerCertificate()) + using (TcpClient client = new TcpClient()) + { + listener.Start(); + + Task clientConnectTask = client.ConnectAsync(IPAddress.Loopback, ((IPEndPoint)listener.LocalEndpoint).Port); + Task listenerAcceptTask = listener.AcceptTcpClientAsync(); + + await TestConfiguration.WhenAllOrAnyFailedWithTimeout(clientConnectTask, listenerAcceptTask); + + TcpClient server = listenerAcceptTask.Result; + using (SslStream clientStream = new SslStream( + client.GetStream(), + false, + new RemoteCertificateValidationCallback(ValidateServerCertificate), + null, + EncryptionPolicy.RequireEncryption)) + using (SslStream serverStream = new SslStream( + server.GetStream(), + false, + null, + null, + EncryptionPolicy.RequireEncryption)) + { + + Task clientAuthenticationTask = clientStream.AuthenticateAsClientAsync( + serverCertificate.GetNameInfo(X509NameType.SimpleName, false), + null, + SslProtocols.Tls11, + false); + + AuthenticationException e = await Assert.ThrowsAsync(() => serverStream.AuthenticateAsServerAsync( + serverCertificate, + false, + SslProtocols.Tls12, + false)); + + Assert.NotNull(e.InnerException); + Assert.True(e.InnerException.Message.Contains("SSL_ERROR_SSL")); + Assert.NotNull(e.InnerException.InnerException); + Assert.True(e.InnerException.InnerException.Message.Contains("protocol")); + } + } + + listener.Stop(); + } + [Fact] [OuterLoop] // Test hits external azure server. public async Task SslStream_NetworkStream_Renegotiation_Succeeds() diff --git a/external/corefx/src/System.Net.Security/tests/FunctionalTests/SslStreamSniTest.cs b/external/corefx/src/System.Net.Security/tests/FunctionalTests/SslStreamSniTest.cs new file mode 100644 index 0000000000..2d27690b0c --- /dev/null +++ b/external/corefx/src/System.Net.Security/tests/FunctionalTests/SslStreamSniTest.cs @@ -0,0 +1,221 @@ +// 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.Collections.Generic; +using System.Net.Test.Common; +using System.Security.Authentication; +using System.Security.Cryptography.X509Certificates; +using System.Threading; +using System.Threading.Tasks; +using Xunit; + +namespace System.Net.Security.Tests +{ + using Configuration = System.Net.Test.Common.Configuration; + + public class SslStreamSniTest + { + [Theory] + [MemberData(nameof(HostNameData))] + public void SslStream_ClientSendsSNIServerReceives_Ok(string hostName) + { + X509Certificate serverCert = Configuration.Certificates.GetSelfSignedServerCertificate(); + + WithVirtualConnection(async (server, client) => + { + Task clientJob = Task.Run(() => { + client.AuthenticateAsClient(hostName); + }); + + SslServerAuthenticationOptions options = DefaultServerOptions(); + + int timesCallbackCalled = 0; + options.ServerCertificateSelectionCallback = (sender, actualHostName) => + { + timesCallbackCalled++; + Assert.Equal(hostName, actualHostName); + return serverCert; + }; + + await TaskTimeoutExtensions.WhenAllOrAnyFailed(new[] { clientJob, server.AuthenticateAsServerAsync(options, CancellationToken.None) }); + + Assert.Equal(1, timesCallbackCalled); + }, + (object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors) => + { + Assert.Equal(serverCert, certificate); + return true; + } + ); + } + + [Theory] + [MemberData(nameof(HostNameData))] + public async void SslStream_ServerCallbackAndLocalCertificateSelectionSet_Throws(string hostName) + { + X509Certificate serverCert = Configuration.Certificates.GetSelfSignedServerCertificate(); + + int timesCallbackCalled = 0; + + var selectionCallback = new LocalCertificateSelectionCallback((object sender, string targetHost, X509CertificateCollection localCertificates, X509Certificate remoteCertificate, string[] issuers) => + { + Assert.True(false, "LocalCertificateSelectionCallback called when AuthenticateAsServerAsync was expected to fail."); + return null; + }); + + var validationCallback = new RemoteCertificateValidationCallback((object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors) => + { + Assert.Equal(serverCert, certificate); + return true; + }); + + VirtualNetwork vn = new VirtualNetwork(); + using (VirtualNetworkStream serverStream = new VirtualNetworkStream(vn, isServer: true), + clientStream = new VirtualNetworkStream(vn, isServer: false)) + using (SslStream server = new SslStream(serverStream, false, null, selectionCallback), + client = new SslStream(clientStream, leaveInnerStreamOpen: false, validationCallback)) + { + Task clientJob = Task.Run(() => { + client.AuthenticateAsClient(hostName); + Assert.True(false, "RemoteCertificateValidationCallback called when AuthenticateAsServerAsync was expected to fail."); + }); + + SslServerAuthenticationOptions options = DefaultServerOptions(); + options.ServerCertificateSelectionCallback = (sender, actualHostName) => + { + timesCallbackCalled++; + Assert.Equal(hostName, actualHostName); + return serverCert; + }; + + await Assert.ThrowsAsync(() => server.AuthenticateAsServerAsync(options, CancellationToken.None)); + + Assert.Equal(0, timesCallbackCalled); + } + } + + [Theory] + [MemberData(nameof(HostNameData))] + public async void SslStream_ServerCallbackNotSet_UsesLocalCertificateSelection(string hostName) + { + X509Certificate serverCert = Configuration.Certificates.GetSelfSignedServerCertificate(); + + int timesCallbackCalled = 0; + + var selectionCallback = new LocalCertificateSelectionCallback((object sender, string targetHost, X509CertificateCollection localCertificates, X509Certificate remoteCertificate, string[] issuers) => + { + Assert.Equal(string.Empty, targetHost); + Assert.True(localCertificates.Contains(serverCert)); + timesCallbackCalled++; + return serverCert; + }); + + var validationCallback = new RemoteCertificateValidationCallback((object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors) => + { + Assert.Equal(serverCert, certificate); + return true; + }); + + VirtualNetwork vn = new VirtualNetwork(); + using (VirtualNetworkStream serverStream = new VirtualNetworkStream(vn, isServer: true), + clientStream = new VirtualNetworkStream(vn, isServer: false)) + using (SslStream server = new SslStream(serverStream, false, null, selectionCallback), + client = new SslStream(clientStream, leaveInnerStreamOpen: false, validationCallback)) + { + Task clientJob = Task.Run(() => { + client.AuthenticateAsClient(hostName); + }); + + SslServerAuthenticationOptions options = DefaultServerOptions(); + options.ServerCertificate = serverCert; + + await TaskTimeoutExtensions.WhenAllOrAnyFailed(new[] { clientJob, server.AuthenticateAsServerAsync(options, CancellationToken.None) }); + + Assert.Equal(1, timesCallbackCalled); + } + } + + [Fact] + public void SslStream_NoSniFromClient_CallbackReturnsNull() + { + WithVirtualConnection(async (server, client) => + { + Task clientJob = Task.Run(() => { + Assert.Throws(() => + client.AuthenticateAsClient("test") + ); + }); + + int timesCallbackCalled = 0; + SslServerAuthenticationOptions options = DefaultServerOptions(); + options.ServerCertificateSelectionCallback = (sender, actualHostName) => + { + timesCallbackCalled++; + return null; + }; + + var cts = new CancellationTokenSource(); + await Assert.ThrowsAsync(WithAggregateExceptionUnwrapping(async () => + await server.AuthenticateAsServerAsync(options, cts.Token) + )); + + // to break connection so that client is not waiting + server.Dispose(); + + Assert.Equal(1, timesCallbackCalled); + + await clientJob; + }, + (object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors) => + { + return true; + }); + } + + private static Func WithAggregateExceptionUnwrapping(Func a) + { + return async () => { + try + { + await a(); + } + catch (AggregateException e) + { + throw e.InnerException; + } + }; + } + + private static SslServerAuthenticationOptions DefaultServerOptions() + { + return new SslServerAuthenticationOptions() + { + ClientCertificateRequired = false, + EnabledSslProtocols = SslProtocols.Tls, + CertificateRevocationCheckMode = X509RevocationMode.NoCheck, + }; + } + + private async void WithVirtualConnection(Func serverClientConnection, RemoteCertificateValidationCallback clientCertValidate) + { + VirtualNetwork vn = new VirtualNetwork(); + using (VirtualNetworkStream serverStream = new VirtualNetworkStream(vn, isServer: true), + clientStream = new VirtualNetworkStream(vn, isServer: false)) + using (SslStream server = new SslStream(serverStream, leaveInnerStreamOpen: false), + client = new SslStream(clientStream, leaveInnerStreamOpen: false, clientCertValidate)) + { + await serverClientConnection(server, client); + } + } + + private static IEnumerable HostNameData() + { + yield return new object[] { "a" }; + yield return new object[] { "test" }; + // max allowed hostname length is 63 + yield return new object[] { new string('a', 63) }; + yield return new object[] { "\u017C\u00F3\u0142\u0107 g\u0119\u015Bl\u0105 ja\u017A\u0144. \u7EA2\u70E7. \u7167\u308A\u713C\u304D" }; + } + } +} diff --git a/external/corefx/src/System.Net.Security/tests/FunctionalTests/SslStreamStreamToStreamTest.cs b/external/corefx/src/System.Net.Security/tests/FunctionalTests/SslStreamStreamToStreamTest.cs index b02f57468e..3e0d6ed171 100644 --- a/external/corefx/src/System.Net.Security/tests/FunctionalTests/SslStreamStreamToStreamTest.cs +++ b/external/corefx/src/System.Net.Security/tests/FunctionalTests/SslStreamStreamToStreamTest.cs @@ -2,6 +2,7 @@ // 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.IO; using System.Linq; using System.Net.Test.Common; using System.Security.Authentication; @@ -58,6 +59,28 @@ namespace System.Net.Security.Tests } } + [Fact] + public async Task SslStream_ServerLocalCertificateSelectionCallbackReturnsNull_Throw() + { + VirtualNetwork network = new VirtualNetwork(); + + var selectionCallback = new LocalCertificateSelectionCallback((object sender, string targetHost, X509CertificateCollection localCertificates, X509Certificate remoteCertificate, string[] issuers) => + { + return null; + }); + + using (var clientStream = new VirtualNetworkStream(network, isServer: false)) + using (var serverStream = new VirtualNetworkStream(network, isServer: true)) + using (var client = new SslStream(clientStream, false, AllowAnyServerCertificate)) + using (var server = new SslStream(serverStream, false, null, selectionCallback)) + using (X509Certificate2 certificate = Configuration.Certificates.GetServerCertificate()) + { + await Assert.ThrowsAsync(async () => + await TestConfiguration.WhenAllOrAnyFailedWithTimeout(client.AuthenticateAsClientAsync(certificate.GetNameInfo(X509NameType.SimpleName, false)), server.AuthenticateAsServerAsync(certificate)) + ); + } + } + [Fact] public async Task SslStream_StreamToStream_Successive_ClientWrite_Sync_Success() { @@ -306,6 +329,55 @@ namespace System.Net.Security.Tests } } + [Fact] + public async Task SslStream_StreamToStream_Dispose_Throws() + { + VirtualNetwork network = new VirtualNetwork() + { + DisableConnectionBreaking = true + }; + + using (var clientStream = new VirtualNetworkStream(network, isServer: false)) + using (var serverStream = new VirtualNetworkStream(network, isServer: true)) + using (var clientSslStream = new SslStream(clientStream, false, AllowAnyServerCertificate)) + { + var serverSslStream = new SslStream(serverStream); + await DoHandshake(clientSslStream, serverSslStream); + + var serverBuffer = new byte[1]; + Task serverReadTask = serverSslStream.ReadAsync(serverBuffer, 0, serverBuffer.Length); + await serverSslStream.WriteAsync(new byte[] { 1 }, 0, 1) + .TimeoutAfter(TestConfiguration.PassingTestTimeoutMilliseconds); + + // Shouldn't throw, the context is diposed now. + // Since the server read task is in progress, the read buffer is not returned to ArrayPool. + serverSslStream.Dispose(); + + // Read in client + var clientBuffer = new byte[1]; + await clientSslStream.ReadAsync(clientBuffer, 0, clientBuffer.Length); + Assert.Equal(1, clientBuffer[0]); + + await clientSslStream.WriteAsync(new byte[] { 2 }, 0, 1); + + if (PlatformDetection.IsFullFramework) + { + await Assert.ThrowsAsync(() => serverReadTask); + } + else + { + IOException serverException = await Assert.ThrowsAsync(() => serverReadTask); + Assert.IsType(serverException.InnerException); + } + + await Assert.ThrowsAsync(() => serverSslStream.ReadAsync(serverBuffer, 0, serverBuffer.Length)); + + // Now, there is no pending read, so the internal buffer will be returned to ArrayPool. + serverSslStream.Dispose(); + await Assert.ThrowsAsync(() => serverSslStream.ReadAsync(serverBuffer, 0, serverBuffer.Length)); + } + } + [Fact] public void SslStream_StreamToStream_Flush_Propagated() { @@ -337,6 +409,50 @@ namespace System.Net.Security.Tests } } + [Fact] + public async Task SslStream_StreamToStream_EOFDuringFrameRead_ThrowsIOException() + { + var network = new VirtualNetwork(); + using (var clientNetworkStream = new VirtualNetworkStream(network, isServer: false)) + using (var serverNetworkStream = new VirtualNetworkStream(network, isServer: true)) + { + int readMode = 0; + var serverWrappedNetworkStream = new DelegateStream( + canWriteFunc: () => true, + canReadFunc: () => true, + writeFunc: (buffer, offset, count) => serverNetworkStream.Write(buffer, offset, count), + readFunc: (buffer, offset, count) => + { + // Do normal reads as requested until the read mode is set + // to 1. Then do a single read of only 10 bytes to read only + // part of the message, and subsequently return EOF. + if (readMode == 0) + { + return serverNetworkStream.Read(buffer, offset, count); + } + else if (readMode == 1) + { + readMode = 2; + return serverNetworkStream.Read(buffer, offset, 10); // read at least header but less than full frame + } + else + { + return 0; + } + }); + + + using (var clientSslStream = new SslStream(clientNetworkStream, false, AllowAnyServerCertificate)) + using (var serverSslStream = new SslStream(serverWrappedNetworkStream)) + { + await DoHandshake(clientSslStream, serverSslStream); + await clientSslStream.WriteAsync(new byte[20], 0, 20); + readMode = 1; + await Assert.ThrowsAsync(() => serverSslStream.ReadAsync(new byte[1], 0, 1)); + } + } + } + private bool VerifyOutput(byte[] actualBuffer, byte[] expectedBuffer) { return expectedBuffer.SequenceEqual(actualBuffer); diff --git a/external/corefx/src/System.Net.Security/tests/FunctionalTests/SslStreamSystemDefaultsTest.cs b/external/corefx/src/System.Net.Security/tests/FunctionalTests/SslStreamSystemDefaultsTest.cs index 941d34fce4..311ea12e21 100644 --- a/external/corefx/src/System.Net.Security/tests/FunctionalTests/SslStreamSystemDefaultsTest.cs +++ b/external/corefx/src/System.Net.Security/tests/FunctionalTests/SslStreamSystemDefaultsTest.cs @@ -45,37 +45,56 @@ namespace System.Net.Security.Tests [InlineData(SslProtocols.Tls12, null)] [InlineData(SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12, null)] [InlineData(null, SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12)] +#pragma warning disable 0618 + [InlineData(SslProtocols.Default, null)] + [InlineData(null, SslProtocols.Default)] +#pragma warning restore 0618 public async Task ClientAndServer_OneOrBothUseDefault_Ok(SslProtocols? clientProtocols, SslProtocols? serverProtocols) { - const int SEC_E_BUFFER_TOO_SMALL = unchecked((int)0x80090321); - - X509Certificate2 serverCertificate = Configuration.Certificates.GetServerCertificate(); - string serverHost = serverCertificate.GetNameInfo(X509NameType.SimpleName, false); - var clientCertificates = new X509CertificateCollection(); - clientCertificates.Add(Configuration.Certificates.GetClientCertificate()); - - var tasks = new Task[2]; - tasks[0] = AuthenticateClientAsync(serverHost, clientCertificates, checkCertificateRevocation: false, protocols: clientProtocols); - tasks[1] = AuthenticateServerAsync(serverCertificate, clientCertificateRequired: true, checkCertificateRevocation: false, protocols: serverProtocols); - - try + using (X509Certificate2 serverCertificate = Configuration.Certificates.GetServerCertificate()) + using (X509Certificate2 clientCertificate = Configuration.Certificates.GetClientCertificate()) { - await TestConfiguration.WhenAllOrAnyFailedWithTimeout(tasks); - if (PlatformDetection.IsWindows && PlatformDetection.WindowsVersion >= 10) + string serverHost = serverCertificate.GetNameInfo(X509NameType.SimpleName, false); + var clientCertificates = new X509CertificateCollection() { clientCertificate }; + + await TestConfiguration.WhenAllOrAnyFailedWithTimeout( + AuthenticateClientAsync(serverHost, clientCertificates, checkCertificateRevocation: false, protocols: clientProtocols), + AuthenticateServerAsync(serverCertificate, clientCertificateRequired: true, checkCertificateRevocation: false, protocols: serverProtocols)); + if (PlatformDetection.IsWindows && PlatformDetection.WindowsVersion >= 10 && +#pragma warning disable 0618 + clientProtocols.GetValueOrDefault() != SslProtocols.Default && + serverProtocols.GetValueOrDefault() != SslProtocols.Default) +#pragma warning restore 0618 { Assert.True( (_clientStream.SslProtocol == SslProtocols.Tls11 && _clientStream.HashAlgorithm == HashAlgorithmType.Sha1) || _clientStream.HashAlgorithm == HashAlgorithmType.Sha256 || _clientStream.HashAlgorithm == HashAlgorithmType.Sha384 || - _clientStream.HashAlgorithm == HashAlgorithmType.Sha512); + _clientStream.HashAlgorithm == HashAlgorithmType.Sha512, + _clientStream.SslProtocol + " " + _clientStream.HashAlgorithm); } } - catch (HttpRequestException e) when (e.InnerException?.GetType().Name == "WinHttpException" && - e.InnerException.HResult == SEC_E_BUFFER_TOO_SMALL && - !PlatformDetection.IsWindows10Version1607OrGreater) + } + + [ConditionalTheory(nameof(IsNotWindows7))] +#pragma warning disable 0618 + [InlineData(null, SslProtocols.Ssl2)] + [InlineData(SslProtocols.None, SslProtocols.Ssl2)] + [InlineData(SslProtocols.Ssl2, null)] + [InlineData(SslProtocols.Ssl2, SslProtocols.None)] +#pragma warning restore 0618 + public async Task ClientAndServer_OneUsesDefault_OtherUsesLowerProtocol_Fails( + SslProtocols? clientProtocols, SslProtocols? serverProtocols) + { + using (X509Certificate2 serverCertificate = Configuration.Certificates.GetServerCertificate()) + using (X509Certificate2 clientCertificate = Configuration.Certificates.GetClientCertificate()) { - // Testing on old Windows versions can hit https://github.com/dotnet/corefx/issues/7812 - // Ignore SEC_E_BUFFER_TOO_SMALL error on such cases. + string serverHost = serverCertificate.GetNameInfo(X509NameType.SimpleName, false); + var clientCertificates = new X509CertificateCollection() { clientCertificate }; + + await Assert.ThrowsAnyAsync(() => TestConfiguration.WhenAllOrAnyFailedWithTimeout( + AuthenticateClientAsync(serverHost, clientCertificates, checkCertificateRevocation: false, protocols: clientProtocols), + AuthenticateServerAsync(serverCertificate, clientCertificateRequired: true, checkCertificateRevocation: false, protocols: serverProtocols))); } } diff --git a/external/corefx/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/external/corefx/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj index 87291673ac..bdf707b62d 100644 --- a/external/corefx/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj +++ b/external/corefx/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj @@ -42,6 +42,9 @@ + + Common\System\IO\DelegateStream.cs + Common\System\Net\Capability.Security.cs @@ -90,9 +93,15 @@ + + src\SniHelper.cs + + + + @@ -154,5 +163,8 @@ RemoteExecutorConsoleApp + + + - \ No newline at end of file + diff --git a/external/corefx/src/System.Net.Security/tests/UnitTests/Fakes/FakeAuthenticatedStream.cs b/external/corefx/src/System.Net.Security/tests/UnitTests/Fakes/FakeAuthenticatedStream.cs index be2d2483d5..1a549fea08 100644 --- a/external/corefx/src/System.Net.Security/tests/UnitTests/Fakes/FakeAuthenticatedStream.cs +++ b/external/corefx/src/System.Net.Security/tests/UnitTests/Fakes/FakeAuthenticatedStream.cs @@ -33,7 +33,7 @@ namespace System.Net.Security public abstract bool IsSigned { get; } public abstract bool IsServer { get; } - public new abstract Task WriteAsync(ReadOnlyMemory buffer, CancellationToken token); + public new abstract ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken token); public new abstract ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken); } } diff --git a/external/corefx/src/System.Net.Security/tests/UnitTests/Fakes/FakeSslState.cs b/external/corefx/src/System.Net.Security/tests/UnitTests/Fakes/FakeSslState.cs index 2ee788a9ea..52d650a8a0 100644 --- a/external/corefx/src/System.Net.Security/tests/UnitTests/Fakes/FakeSslState.cs +++ b/external/corefx/src/System.Net.Security/tests/UnitTests/Fakes/FakeSslState.cs @@ -21,11 +21,11 @@ namespace System.Net.Security { } - internal void ValidateCreateContext(SslClientAuthenticationOptions sslClientAuthenticationOptions) + internal void ValidateCreateContext(SslClientAuthenticationOptions sslClientAuthenticationOptions, RemoteCertValidationCallback remoteCallback, LocalCertSelectionCallback localCallback) { } - internal void ValidateCreateContext(SslServerAuthenticationOptions sslServerAuthenticationOptions) + internal void ValidateCreateContext(SslAuthenticationOptions sslAuthenticationOptions) { } @@ -279,7 +279,7 @@ namespace System.Net.Security throw new NotImplementedException(); } - public new Task WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken) + public new ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken) { throw new NotImplementedException(); } diff --git a/external/corefx/src/System.Net.Security/tests/UnitTests/SslStreamAllowedProtocolsTest.cs b/external/corefx/src/System.Net.Security/tests/UnitTests/SslStreamAllowedProtocolsTest.cs index b316e129e4..a2229efde9 100644 --- a/external/corefx/src/System.Net.Security/tests/UnitTests/SslStreamAllowedProtocolsTest.cs +++ b/external/corefx/src/System.Net.Security/tests/UnitTests/SslStreamAllowedProtocolsTest.cs @@ -18,14 +18,6 @@ namespace System.Net.Security.Tests SslStream stream, bool waitForCompletion, string targetHost, X509CertificateCollection clientCertificates, SslProtocols enabledSslProtocols, bool checkCertificateRevocation); - [Theory] - [ClassData(typeof(SslProtocolSupport.UnsupportedSslProtocolsTestData))] - public void SslStream_AuthenticateAsClientAsync_NotSupported_Fails(SslProtocols protocol) - { - SslStream stream = new SslStream(new NotImplementedStream()); - Assert.Throws(() => AuthenticateAsClient(stream, false, "host", null, protocol, false)); - } - [Theory] [ClassData(typeof(SslProtocolSupport.SupportedSslProtocolsTestData))] public void SslStream_AuthenticateAsClientAsync_Supported_Success(SslProtocols protocol) @@ -42,27 +34,6 @@ namespace System.Net.Security.Tests AuthenticateAsClient(stream, true, "host", null, protocol, false); } - [Fact] - public void SslStream_AuthenticateAsClientAsync_Invalid_Fails() - { - SslStream stream = new SslStream(new NotImplementedStream()); - Assert.Throws(() => AuthenticateAsClient(stream, false, "host", null, (SslProtocols)4096, false)); - } - - [Fact] - public void SslStream_AuthenticateAsClient_Invalid_Fails() - { - SslStream stream = new SslStream(new NotImplementedStream()); - Assert.Throws(() => AuthenticateAsClient(stream, false, "host", null, (SslProtocols)4096, false)); - } - - [Fact] - public void SslStream_AuthenticateAsClientAsync_AllUnsupported_Fails() - { - SslStream stream = new SslStream(new NotImplementedStream()); - Assert.Throws(() => AuthenticateAsClient(stream, false, "host", null, SslProtocolSupport.UnsupportedSslProtocols, false)); - } - [Fact] public void SslStream_AuthenticateAsClientAsync_AllSupported_Success() { diff --git a/external/corefx/src/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj b/external/corefx/src/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj index d1181a7f2e..fba7e18fba 100644 --- a/external/corefx/src/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj +++ b/external/corefx/src/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj @@ -85,5 +85,8 @@ + + + \ No newline at end of file diff --git a/external/corefx/src/System.Net.ServicePoint/src/System/Net/ServicePointManager.cs b/external/corefx/src/System.Net.ServicePoint/src/System/Net/ServicePointManager.cs index 5d0f21c44a..250c455aba 100644 --- a/external/corefx/src/System.Net.ServicePoint/src/System/Net/ServicePointManager.cs +++ b/external/corefx/src/System.Net.ServicePoint/src/System/Net/ServicePointManager.cs @@ -176,16 +176,27 @@ namespace System.Net { if (proxy != null && !address.IsLoopback) { - Uri proxyAddress = proxy.GetProxy(address); - if (proxyAddress != null) + try { - if (proxyAddress.Scheme != Uri.UriSchemeHttp) + Uri proxyAddress = proxy.GetProxy(address); + if (proxyAddress != null) { - throw new NotSupportedException(SR.Format(SR.net_proxyschemenotsupported, address.Scheme)); - } + if (proxyAddress.Scheme != Uri.UriSchemeHttp) + { + throw new NotSupportedException(SR.Format(SR.net_proxyschemenotsupported, address.Scheme)); + } - address = proxyAddress; - return true; + address = proxyAddress; + return true; + } + } + catch (PlatformNotSupportedException) + { + // HttpWebRequest has a dummy SystemWebProxy that's used as a sentinel + // and whose GetProxy method throws a PlatformNotSupportedException. + // For the purposes of this stand-in ServicePointManager implementation, + // we ignore this default "system" proxy for the purposes of mapping + // to a particular ServicePoint instance. } } diff --git a/external/corefx/src/System.Net.ServicePoint/tests/ServicePointManagerTest.cs b/external/corefx/src/System.Net.ServicePoint/tests/ServicePointManagerTest.cs index f25ad6f7e3..f9ab985f3c 100644 --- a/external/corefx/src/System.Net.ServicePoint/tests/ServicePointManagerTest.cs +++ b/external/corefx/src/System.Net.ServicePoint/tests/ServicePointManagerTest.cs @@ -15,7 +15,7 @@ namespace System.Net.Tests [Fact] public static void RequireEncryption_ExpectedDefault() { - RemoteInvoke(() => Assert.Equal(EncryptionPolicy.RequireEncryption, ServicePointManager.EncryptionPolicy)); + RemoteInvoke(() => Assert.Equal(EncryptionPolicy.RequireEncryption, ServicePointManager.EncryptionPolicy)).Dispose(); } [Fact] @@ -30,7 +30,7 @@ namespace System.Net.Tests ServicePointManager.CheckCertificateRevocationList = false; Assert.False(ServicePointManager.CheckCertificateRevocationList); - }); + }).Dispose(); } [Fact] @@ -45,7 +45,7 @@ namespace System.Net.Tests ServicePointManager.DefaultConnectionLimit = 2; Assert.Equal(2, ServicePointManager.DefaultConnectionLimit); - }); + }).Dispose(); } [Fact] @@ -60,7 +60,7 @@ namespace System.Net.Tests ServicePointManager.DnsRefreshTimeout = 120000; Assert.Equal(120000, ServicePointManager.DnsRefreshTimeout); - }); + }).Dispose(); } [Fact] @@ -75,7 +75,7 @@ namespace System.Net.Tests ServicePointManager.EnableDnsRoundRobin = false; Assert.False(ServicePointManager.EnableDnsRoundRobin); - }); + }).Dispose(); } [Fact] @@ -90,7 +90,7 @@ namespace System.Net.Tests ServicePointManager.Expect100Continue = true; Assert.True(ServicePointManager.Expect100Continue); - }); + }).Dispose(); } [Fact] @@ -105,7 +105,7 @@ namespace System.Net.Tests ServicePointManager.MaxServicePointIdleTime = 100000; Assert.Equal(100000, ServicePointManager.MaxServicePointIdleTime); - }); + }).Dispose(); } [Fact] @@ -120,7 +120,7 @@ namespace System.Net.Tests ServicePointManager.MaxServicePoints = 0; Assert.Equal(0, ServicePointManager.MaxServicePoints); - }); + }).Dispose(); } [Fact] @@ -135,7 +135,7 @@ namespace System.Net.Tests ServicePointManager.ReusePort = false; Assert.False(ServicePointManager.ReusePort); - }); + }).Dispose(); } [Fact] @@ -152,7 +152,7 @@ namespace System.Net.Tests ServicePointManager.SecurityProtocol = orig; Assert.Equal(orig, ServicePointManager.SecurityProtocol); - }); + }).Dispose(); } [Fact] @@ -168,7 +168,7 @@ namespace System.Net.Tests ServicePointManager.ServerCertificateValidationCallback = null; Assert.Null(ServicePointManager.ServerCertificateValidationCallback); - }); + }).Dispose(); } [Fact] @@ -183,7 +183,7 @@ namespace System.Net.Tests ServicePointManager.UseNagleAlgorithm = true; Assert.True(ServicePointManager.UseNagleAlgorithm); - }); + }).Dispose(); } [Fact] @@ -214,7 +214,7 @@ namespace System.Net.Tests AssertExtensions.Throws("value", () => sp.ReceiveBufferSize = -2); AssertExtensions.Throws("keepAliveTime", () => sp.SetTcpKeepAlive(true, -1, 1)); AssertExtensions.Throws("keepAliveInterval", () => sp.SetTcpKeepAlive(true, 1, -1)); - }); + }).Dispose(); } [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Ssl3 is supported by desktop but explicitly not by core")] @@ -231,7 +231,7 @@ namespace System.Net.Tests Assert.Throws(() => ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3); Assert.Throws(() => ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3 | ssl2); #pragma warning restore - }); + }).Dispose(); } [Fact] @@ -267,7 +267,7 @@ namespace System.Net.Tests Assert.NotSame( ServicePointManager.FindServicePoint(address1, new FixedWebProxy(address1)), ServicePointManager.FindServicePoint(address1, new FixedWebProxy(address2))); - }); + }).Dispose(); } [Fact] @@ -286,7 +286,7 @@ namespace System.Net.Tests GC.Collect(); Assert.Equal(initial, GetExpect100Continue(address)); - }); + }).Dispose(); } [Fact] @@ -313,7 +313,7 @@ namespace System.Net.Tests Assert.Equal(-1, sp.ReceiveBufferSize); Assert.True(sp.SupportsPipelining, "SupportsPipelining"); Assert.True(sp.UseNagleAlgorithm, "UseNagleAlgorithm"); - }); + }).Dispose(); } [Fact] @@ -348,7 +348,7 @@ namespace System.Net.Tests Assert.Equal(expectedMaxIdleTime, sp2.MaxIdleTime); Assert.Equal(expectedReceiveBufferSize, sp2.ReceiveBufferSize); Assert.Equal(expectedUseNagleAlgorithm, sp2.UseNagleAlgorithm); - }); + }).Dispose(); } [Fact] @@ -378,7 +378,7 @@ namespace System.Net.Tests ServicePointManager.Expect100Continue = orig100Continue; ServicePointManager.UseNagleAlgorithm = origNagle; - }); + }).Dispose(); } // Separated out to avoid the JIT in debug builds interfering with object lifetimes diff --git a/external/corefx/src/System.Net.ServicePoint/tests/TlsSystemDefault.cs b/external/corefx/src/System.Net.ServicePoint/tests/TlsSystemDefault.cs index 76e7d8ce7c..67ee162073 100644 --- a/external/corefx/src/System.Net.ServicePoint/tests/TlsSystemDefault.cs +++ b/external/corefx/src/System.Net.ServicePoint/tests/TlsSystemDefault.cs @@ -12,13 +12,13 @@ namespace System.Net.Tests [Fact] public void ServicePointManager_SecurityProtocolDefault_Ok() { - RemoteInvoke(() => Assert.Equal(SecurityProtocolType.SystemDefault, ServicePointManager.SecurityProtocol)); + RemoteInvoke(() => Assert.Equal(SecurityProtocolType.SystemDefault, ServicePointManager.SecurityProtocol)).Dispose(); } [Fact] public void ServicePointManager_CheckAllowedProtocols_SystemDefault_Allowed() { - RemoteInvoke(() => ServicePointManager.SecurityProtocol = SecurityProtocolType.SystemDefault); + RemoteInvoke(() => ServicePointManager.SecurityProtocol = SecurityProtocolType.SystemDefault).Dispose(); } } } diff --git a/external/corefx/src/System.Net.Sockets/src/Resources/Strings.resx b/external/corefx/src/System.Net.Sockets/src/Resources/Strings.resx index de08663dd3..b95d2522e7 100644 --- a/external/corefx/src/System.Net.Sockets/src/Resources/Strings.resx +++ b/external/corefx/src/System.Net.Sockets/src/Resources/Strings.resx @@ -238,4 +238,10 @@ This operation may only be performed when the buffer was set using the SetBuffer overload that accepts an array. + + The result of the operation was already consumed and may not be used again. + + + Another continuation was already registered. + diff --git a/external/corefx/src/System.Net.Sockets/src/System.Net.Sockets.csproj b/external/corefx/src/System.Net.Sockets/src/System.Net.Sockets.csproj index dd4680c6d4..35a8203423 100644 --- a/external/corefx/src/System.Net.Sockets/src/System.Net.Sockets.csproj +++ b/external/corefx/src/System.Net.Sockets/src/System.Net.Sockets.csproj @@ -7,6 +7,7 @@ true true true + true @@ -62,6 +63,7 @@ + Common\System\IO\StreamHelpers.CopyValidation.cs @@ -411,6 +413,7 @@ + diff --git a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/NetEventSource.Sockets.cs b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/NetEventSource.Sockets.cs index 9210ded65a..6529d794f3 100644 --- a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/NetEventSource.Sockets.cs +++ b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/NetEventSource.Sockets.cs @@ -5,6 +5,7 @@ using System.Diagnostics.Tracing; using System.Net.Sockets; using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; namespace System.Net { @@ -106,7 +107,7 @@ namespace System.Net } buffer = buffer.Slice(offset, Math.Min(count, MaxDumpSize)); - byte[] slice = buffer.TryGetArray(out ArraySegment arraySegment) && arraySegment.Offset == 0 && arraySegment.Count == buffer.Length ? + byte[] slice = MemoryMarshal.TryGetArray(buffer, out ArraySegment arraySegment) && arraySegment.Offset == 0 && arraySegment.Count == buffer.Length ? arraySegment.Array : buffer.ToArray(); diff --git a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/NetworkStream.cs b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/NetworkStream.cs index 64a3b7803c..d8ab22b135 100644 --- a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/NetworkStream.cs +++ b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/NetworkStream.cs @@ -204,7 +204,7 @@ namespace System.Net.Sockets #endif if (_cleanedUp) { - throw new ObjectDisposedException(this.GetType().FullName); + throw new ObjectDisposedException(GetType().FullName); } // Ask the socket how many bytes are available. If it's @@ -269,7 +269,7 @@ namespace System.Net.Sockets bool canRead = CanRead; // Prevent race with Dispose. if (_cleanedUp) { - throw new ObjectDisposedException(this.GetType().FullName); + throw new ObjectDisposedException(GetType().FullName); } if (!canRead) { @@ -281,11 +281,11 @@ namespace System.Net.Sockets { throw new ArgumentNullException(nameof(buffer)); } - if (offset < 0 || offset > buffer.Length) + if ((uint)offset > buffer.Length) { throw new ArgumentOutOfRangeException(nameof(offset)); } - if (size < 0 || size > buffer.Length - offset) + if ((uint)size > buffer.Length - offset) { throw new ArgumentOutOfRangeException(nameof(size)); } @@ -329,7 +329,7 @@ namespace System.Net.Sockets public override unsafe int ReadByte() { - int b; + byte b; return Read(new Span(&b, 1)) == 0 ? -1 : b; } @@ -358,7 +358,7 @@ namespace System.Net.Sockets bool canWrite = CanWrite; // Prevent race with Dispose. if (_cleanedUp) { - throw new ObjectDisposedException(this.GetType().FullName); + throw new ObjectDisposedException(GetType().FullName); } if (!canWrite) { @@ -370,11 +370,11 @@ namespace System.Net.Sockets { throw new ArgumentNullException(nameof(buffer)); } - if (offset < 0 || offset > buffer.Length) + if ((uint)offset > buffer.Length) { throw new ArgumentOutOfRangeException(nameof(offset)); } - if (size < 0 || size > buffer.Length - offset) + if ((uint)size > buffer.Length - offset) { throw new ArgumentOutOfRangeException(nameof(size)); } @@ -504,7 +504,7 @@ namespace System.Net.Sockets bool canRead = CanRead; // Prevent race with Dispose. if (_cleanedUp) { - throw new ObjectDisposedException(this.GetType().FullName); + throw new ObjectDisposedException(GetType().FullName); } if (!canRead) { @@ -516,11 +516,11 @@ namespace System.Net.Sockets { throw new ArgumentNullException(nameof(buffer)); } - if (offset < 0 || offset > buffer.Length) + if ((uint)offset > buffer.Length) { throw new ArgumentOutOfRangeException(nameof(offset)); } - if (size < 0 || size > buffer.Length - offset) + if ((uint)size > buffer.Length - offset) { throw new ArgumentOutOfRangeException(nameof(size)); } @@ -562,7 +562,7 @@ namespace System.Net.Sockets #endif if (_cleanedUp) { - throw new ObjectDisposedException(this.GetType().FullName); + throw new ObjectDisposedException(GetType().FullName); } // Validate input parameters. @@ -609,7 +609,7 @@ namespace System.Net.Sockets bool canWrite = CanWrite; // Prevent race with Dispose. if (_cleanedUp) { - throw new ObjectDisposedException(this.GetType().FullName); + throw new ObjectDisposedException(GetType().FullName); } if (!canWrite) { @@ -621,11 +621,11 @@ namespace System.Net.Sockets { throw new ArgumentNullException(nameof(buffer)); } - if (offset < 0 || offset > buffer.Length) + if ((uint)offset > buffer.Length) { throw new ArgumentOutOfRangeException(nameof(offset)); } - if (size < 0 || size > buffer.Length - offset) + if ((uint)size > buffer.Length - offset) { throw new ArgumentOutOfRangeException(nameof(size)); } @@ -664,7 +664,7 @@ namespace System.Net.Sockets #endif if (_cleanedUp) { - throw new ObjectDisposedException(this.GetType().FullName); + throw new ObjectDisposedException(GetType().FullName); } // Validate input parameters. @@ -708,7 +708,7 @@ namespace System.Net.Sockets bool canRead = CanRead; // Prevent race with Dispose. if (_cleanedUp) { - throw new ObjectDisposedException(this.GetType().FullName); + throw new ObjectDisposedException(GetType().FullName); } if (!canRead) { @@ -720,26 +720,22 @@ namespace System.Net.Sockets { throw new ArgumentNullException(nameof(buffer)); } - if (offset < 0 || offset > buffer.Length) + if ((uint)offset > buffer.Length) { throw new ArgumentOutOfRangeException(nameof(offset)); } - if (size < 0 || size > buffer.Length - offset) + if ((uint)size > buffer.Length - offset) { throw new ArgumentOutOfRangeException(nameof(size)); } - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try { return _streamSocket.ReceiveAsync( - new ArraySegment(buffer, offset, size), + new Memory(buffer, offset, size), SocketFlags.None, - fromNetworkStream: true); + fromNetworkStream: true, + cancellationToken).AsTask(); } catch (Exception exception) when (!(exception is OutOfMemoryException)) { @@ -749,12 +745,12 @@ namespace System.Net.Sockets } } - public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken) + public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken) { bool canRead = CanRead; // Prevent race with Dispose. if (_cleanedUp) { - throw new ObjectDisposedException(this.GetType().FullName); + throw new ObjectDisposedException(GetType().FullName); } if (!canRead) { @@ -764,7 +760,7 @@ namespace System.Net.Sockets try { return _streamSocket.ReceiveAsync( - destination, + buffer, SocketFlags.None, fromNetworkStream: true, cancellationToken: cancellationToken); @@ -797,7 +793,7 @@ namespace System.Net.Sockets bool canWrite = CanWrite; // Prevent race with Dispose. if (_cleanedUp) { - throw new ObjectDisposedException(this.GetType().FullName); + throw new ObjectDisposedException(GetType().FullName); } if (!canWrite) { @@ -809,26 +805,21 @@ namespace System.Net.Sockets { throw new ArgumentNullException(nameof(buffer)); } - if (offset < 0 || offset > buffer.Length) + if ((uint)offset > buffer.Length) { throw new ArgumentOutOfRangeException(nameof(offset)); } - if (size < 0 || size > buffer.Length - offset) + if ((uint)size > buffer.Length - offset) { throw new ArgumentOutOfRangeException(nameof(size)); } - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try { - return _streamSocket.SendAsync( - new ArraySegment(buffer, offset, size), + return _streamSocket.SendAsyncForNetworkStream( + new ReadOnlyMemory(buffer, offset, size), SocketFlags.None, - fromNetworkStream: true); + cancellationToken).AsTask(); } catch (Exception exception) when (!(exception is OutOfMemoryException)) { @@ -838,12 +829,12 @@ namespace System.Net.Sockets } } - public override Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken) + public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken) { bool canWrite = CanWrite; // Prevent race with Dispose. if (_cleanedUp) { - throw new ObjectDisposedException(this.GetType().FullName); + throw new ObjectDisposedException(GetType().FullName); } if (!canWrite) { @@ -852,15 +843,10 @@ namespace System.Net.Sockets try { - ValueTask t = _streamSocket.SendAsync( - source, + return _streamSocket.SendAsyncForNetworkStream( + buffer, SocketFlags.None, - fromNetworkStream: true, cancellationToken: cancellationToken); - - return t.IsCompletedSuccessfully ? - Task.CompletedTask : - t.AsTask(); } catch (Exception exception) when (!(exception is OutOfMemoryException)) { @@ -870,50 +856,6 @@ namespace System.Net.Sockets } } - public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken) - { - // Validate arguments as would the base CopyToAsync - StreamHelpers.ValidateCopyToArgs(this, destination, bufferSize); - - // And bail early if cancellation has already been requested - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - - // Do the copy. We get a copy buffer from the shared pool, and we pass both it and the - // socket into the copy as part of the event args so as to avoid additional fields in - // the async method's state machine. - return CopyToAsyncCore( - destination, - new AwaitableSocketAsyncEventArgs(_streamSocket, ArrayPool.Shared.Rent(bufferSize)), - cancellationToken); - } - - private static async Task CopyToAsyncCore(Stream destination, AwaitableSocketAsyncEventArgs ea, CancellationToken cancellationToken) - { - try - { - while (true) - { - cancellationToken.ThrowIfCancellationRequested(); - - int bytesRead = await ea.ReceiveAsync(); - if (bytesRead == 0) - { - break; - } - - await destination.WriteAsync(ea.Buffer, 0, bytesRead, cancellationToken).ConfigureAwait(false); - } - } - finally - { - ArrayPool.Shared.Return(ea.Buffer, clearArray: true); - ea.Dispose(); - } - } - // Flushes data from the stream. This is meaningless for us, so it does nothing. public override void Flush() { @@ -959,115 +901,5 @@ namespace System.Net.Sockets } } } - - /// A SocketAsyncEventArgs that can be awaited to get the result of an operation. - internal sealed class AwaitableSocketAsyncEventArgs : SocketAsyncEventArgs, ICriticalNotifyCompletion - { - /// Sentinel object used to indicate that the operation has completed prior to OnCompleted being called. - private static readonly Action s_completedSentinel = () => { }; - /// - /// null if the operation has not completed, if it has, and another object - /// if OnCompleted was called before the operation could complete, in which case it's the delegate to invoke - /// when the operation does complete. - /// - private Action _continuation; - - /// Initializes the event args. - /// The associated socket. - /// The buffer to use for all operations. - public AwaitableSocketAsyncEventArgs(Socket socket, byte[] buffer) - { - Debug.Assert(socket != null); - Debug.Assert(buffer != null && buffer.Length > 0); - - // Store the socket into the base's UserToken. This avoids the need for an extra field, at the expense - // of an object=>Socket cast when we need to access it, which is only once per operation. - UserToken = socket; - - // Store the buffer for use by all operations with this instance. - SetBuffer(buffer, 0, buffer.Length); - - // Hook up the completed event. - Completed += delegate - { - // When the operation completes, see if OnCompleted was already called to hook up a continuation. - // If it was, invoke the continuation. - Action c = _continuation; - if (c != null) - { - c(); - } - else - { - // We may be racing with OnCompleted, so check with synchronization, trying to swap in our - // completion sentinel. If we lose the race and OnCompleted did hook up a continuation, - // invoke it. Otherwise, there's nothing more to be done. - Interlocked.CompareExchange(ref _continuation, s_completedSentinel, null)?.Invoke(); - } - }; - } - - /// Initiates a receive operation on the associated socket. - /// This instance. - public AwaitableSocketAsyncEventArgs ReceiveAsync() - { - if (!Socket.ReceiveAsync(this)) - { - _continuation = s_completedSentinel; - } - return this; - } - - /// Gets this instance. - public AwaitableSocketAsyncEventArgs GetAwaiter() => this; - - /// Gets whether the operation has already completed. - /// - /// This is not a generically usable IsCompleted operation that suggests the whole operation has completed. - /// Rather, it's specifically used as part of the await pattern, and is only usable to determine whether the - /// operation has completed by the time the instance is awaited. - /// - public bool IsCompleted => _continuation != null; - - /// Same as - public void UnsafeOnCompleted(Action continuation) => OnCompleted(continuation); - - /// Queues the provided continuation to be executed once the operation has completed. - public void OnCompleted(Action continuation) - { - if (ReferenceEquals(_continuation, s_completedSentinel) || - ReferenceEquals(Interlocked.CompareExchange(ref _continuation, continuation, null), s_completedSentinel)) - { - Task.Run(continuation); - } - } - - /// Gets the result of the completion operation. - /// Number of bytes transferred. - /// - /// Unlike Task's awaiter's GetResult, this does not block until the operation completes: it must only - /// be used once the operation has completed. This is handled implicitly by await. - /// - public int GetResult() - { - _continuation = null; - if (SocketError != SocketError.Success) - { - ThrowIOSocketException(); - } - return BytesTransferred; - } - - /// Gets the associated socket. - internal Socket Socket => (Socket)UserToken; // stored in the base's UserToken to avoid an extra field in the object - - /// Throws an IOException wrapping a SocketException using the current . - [MethodImpl(MethodImplOptions.NoInlining)] - private void ThrowIOSocketException() - { - var se = new SocketException((int)SocketError); - throw new IOException(SR.Format(SR.net_io_readfailure, se.Message), se); - } - } } } diff --git a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/Socket.Tasks.cs b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/Socket.Tasks.cs index fc796379ec..4e0b8cf521 100644 --- a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/Socket.Tasks.cs +++ b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/Socket.Tasks.cs @@ -10,6 +10,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; +using System.Threading.Tasks.Sources; namespace System.Net.Sockets { @@ -46,12 +47,12 @@ namespace System.Net.Sockets private static readonly Task s_zeroTask = Task.FromResult(0); /// Cached event args used with Task-based async operations. - private CachedTaskEventArgs _cachedTaskEventArgs; + private CachedEventArgs _cachedTaskEventArgs; internal Task AcceptAsync(Socket acceptSocket) { // Get any cached SocketAsyncEventArg we may have. - TaskSocketAsyncEventArgs saea = Interlocked.Exchange(ref LazyInitializer.EnsureInitialized(ref _cachedTaskEventArgs).Accept, s_rentedSocketSentinel); + TaskSocketAsyncEventArgs saea = Interlocked.Exchange(ref LazyInitializer.EnsureInitialized(ref _cachedTaskEventArgs).TaskAccept, s_rentedSocketSentinel); if (saea == s_rentedSocketSentinel) { // An instance was once created (or is currently being created elsewhere), but some other @@ -179,24 +180,13 @@ namespace System.Net.Sockets internal Task ReceiveAsync(ArraySegment buffer, SocketFlags socketFlags, bool fromNetworkStream) { - // Validate the arguments. ValidateBuffer(buffer); - - Int32TaskSocketAsyncEventArgs saea = RentSocketAsyncEventArgs(isReceive: true); - if (saea != null) - { - // We got a cached instance. Configure the buffer and initate the operation. - ConfigureBuffer(saea, buffer, socketFlags, wrapExceptionsInIOExceptions: fromNetworkStream); - return GetTaskForSendReceive(ReceiveAsync(saea), saea, fromNetworkStream, isReceive: true); - } - else - { - // We couldn't get a cached instance, due to a concurrent receive operation on the socket. - // Fall back to wrapping APM. - return ReceiveAsyncApm(buffer, socketFlags); - } + return ReceiveAsync((Memory)buffer, socketFlags, fromNetworkStream, default).AsTask(); } + // TODO https://github.com/dotnet/corefx/issues/24430: + // Fully plumb cancellation down into socket operations. + internal ValueTask ReceiveAsync(Memory buffer, SocketFlags socketFlags, bool fromNetworkStream, CancellationToken cancellationToken) { if (cancellationToken.IsCancellationRequested) @@ -204,15 +194,14 @@ namespace System.Net.Sockets return new ValueTask(Task.FromCanceled(cancellationToken)); } - // TODO https://github.com/dotnet/corefx/issues/24430: - // Fully plumb cancellation down into socket operations. - - Int32TaskSocketAsyncEventArgs saea = RentSocketAsyncEventArgs(isReceive: true); - if (saea != null) + AwaitableSocketAsyncEventArgs saea = LazyInitializer.EnsureInitialized(ref LazyInitializer.EnsureInitialized(ref _cachedTaskEventArgs).ValueTaskReceive); + if (saea.Reserve()) { - // We got a cached instance. Configure the buffer and initate the operation. - ConfigureBuffer(saea, buffer, socketFlags, wrapExceptionsInIOExceptions: fromNetworkStream); - return GetValueTaskForSendReceive(ReceiveAsync(saea), saea, fromNetworkStream, isReceive: true); + Debug.Assert(saea.BufferList == null); + saea.SetBuffer(buffer); + saea.SocketFlags = socketFlags; + saea.WrapExceptionsInIOExceptions = fromNetworkStream; + return saea.ReceiveAsync(this); } else { @@ -225,7 +214,7 @@ namespace System.Net.Sockets /// Implements Task-returning ReceiveAsync on top of Begin/EndReceive. private Task ReceiveAsyncApm(Memory buffer, SocketFlags socketFlags) { - if (buffer.TryGetArray(out ArraySegment bufferArray)) + if (MemoryMarshal.TryGetArray(buffer, out ArraySegment bufferArray)) { // We were able to extract the underlying byte[] from the Memory. Use it. var tcs = new TaskCompletionSource(this); @@ -341,42 +330,27 @@ namespace System.Net.Sockets return tcs.Task; } - internal Task SendAsync(ArraySegment buffer, SocketFlags socketFlags, bool fromNetworkStream) + internal Task SendAsync(ArraySegment buffer, SocketFlags socketFlags) { - // Validate the arguments. ValidateBuffer(buffer); - - Int32TaskSocketAsyncEventArgs saea = RentSocketAsyncEventArgs(isReceive: false); - if (saea != null) - { - // We got a cached instance. Configure the buffer and initate the operation. - ConfigureBuffer(saea, buffer, socketFlags, wrapExceptionsInIOExceptions: fromNetworkStream); - return GetTaskForSendReceive(SendAsync(saea), saea, fromNetworkStream, isReceive: false); - } - else - { - // We couldn't get a cached instance, due to a concurrent send operation on the socket. - // Fall back to wrapping APM. - return SendAsyncApm(buffer, socketFlags); - } + return SendAsync((ReadOnlyMemory)buffer, socketFlags, default).AsTask(); } - internal ValueTask SendAsync(ReadOnlyMemory buffer, SocketFlags socketFlags, bool fromNetworkStream, CancellationToken cancellationToken) + internal ValueTask SendAsync(ReadOnlyMemory buffer, SocketFlags socketFlags, CancellationToken cancellationToken) { if (cancellationToken.IsCancellationRequested) { return new ValueTask(Task.FromCanceled(cancellationToken)); } - // TODO https://github.com/dotnet/corefx/issues/24430: - // Fully plumb cancellation down into socket operations. - - Int32TaskSocketAsyncEventArgs saea = RentSocketAsyncEventArgs(isReceive: false); - if (saea != null) + AwaitableSocketAsyncEventArgs saea = LazyInitializer.EnsureInitialized(ref LazyInitializer.EnsureInitialized(ref _cachedTaskEventArgs).ValueTaskSend); + if (saea.Reserve()) { - // We got a cached instance. Configure the buffer and initate the operation. - ConfigureBuffer(saea, MemoryMarshal.AsMemory(buffer), socketFlags, wrapExceptionsInIOExceptions: fromNetworkStream); - return GetValueTaskForSendReceive(SendAsync(saea), saea, fromNetworkStream, isReceive: false); + Debug.Assert(saea.BufferList == null); + saea.SetBuffer(MemoryMarshal.AsMemory(buffer)); + saea.SocketFlags = socketFlags; + saea.WrapExceptionsInIOExceptions = false; + return saea.SendAsync(this); } else { @@ -386,6 +360,30 @@ namespace System.Net.Sockets } } + internal ValueTask SendAsyncForNetworkStream(ReadOnlyMemory buffer, SocketFlags socketFlags, CancellationToken cancellationToken) + { + if (cancellationToken.IsCancellationRequested) + { + return new ValueTask(Task.FromCanceled(cancellationToken)); + } + + AwaitableSocketAsyncEventArgs saea = LazyInitializer.EnsureInitialized(ref LazyInitializer.EnsureInitialized(ref _cachedTaskEventArgs).ValueTaskSend); + if (saea.Reserve()) + { + Debug.Assert(saea.BufferList == null); + saea.SetBuffer(MemoryMarshal.AsMemory(buffer)); + saea.SocketFlags = socketFlags; + saea.WrapExceptionsInIOExceptions = true; + return saea.SendAsyncForNetworkStream(this); + } + else + { + // We couldn't get a cached instance, due to a concurrent send operation on the socket. + // Fall back to wrapping APM. + return new ValueTask(SendAsyncApm(buffer, socketFlags)); + } + } + /// Implements Task-returning SendAsync on top of Begin/EndSend. private Task SendAsyncApm(ReadOnlyMemory buffer, SocketFlags socketFlags) { @@ -502,19 +500,6 @@ namespace System.Net.Sockets } } - private static void ConfigureBuffer( - Int32TaskSocketAsyncEventArgs saea, Memory buffer, SocketFlags socketFlags, bool wrapExceptionsInIOExceptions) - { - // Configure the buffer. We don't clear the buffers when returning the SAEA to the pool, - // so as to minimize overhead if the same buffer is used for subsequent operations (which is likely). - // But SAEA doesn't support having both a buffer and a buffer list configured, so clear out a buffer list - // if there is one before we set the desired buffer. - if (saea.BufferList != null) saea.BufferList = null; - saea.SetBuffer(buffer); - saea.SocketFlags = socketFlags; - saea._wrapExceptionsInIOExceptions = wrapExceptionsInIOExceptions; - } - private static void ConfigureBufferList( Int32TaskSocketAsyncEventArgs saea, IList> buffers, SocketFlags socketFlags) { @@ -572,16 +557,8 @@ namespace System.Net.Sockets } else { - // Get any cached, successfully-completed cached task that may exist on this SAEA. - Task lastTask = saea._successfullyCompletedTask; - Debug.Assert(lastTask == null || lastTask.IsCompletedSuccessfully); - - // If there is a task and if it has the desired result, simply reuse it. - // Otherwise, create a new one for this result value, and in addition to returning it, - // also store it into the SAEA for potential future reuse. - t = lastTask != null && lastTask.Result == bytesTransferred ? - lastTask : - (saea._successfullyCompletedTask = Task.FromResult(bytesTransferred)); + // Otherwise, create a new task for this result value. + t = Task.FromResult(bytesTransferred); } } else @@ -596,48 +573,6 @@ namespace System.Net.Sockets return t; } - /// Gets a value task to represent the operation. - /// true if the operation completes asynchronously; false if it completed synchronously. - /// The event args instance used with the operation. - /// - /// true if the request is coming from NetworkStream, which has special semantics for - /// exceptions and cached tasks; otherwise, false. - /// - /// true if this is a receive; false if this is a send. - private ValueTask GetValueTaskForSendReceive( - bool pending, Int32TaskSocketAsyncEventArgs saea, - bool fromNetworkStream, bool isReceive) - { - ValueTask t; - - if (pending) - { - // The operation is completing asynchronously (it may have already completed). - // Get the task for the operation, with appropriate synchronization to coordinate - // with the async callback that'll be completing the task. - bool responsibleForReturningToPool; - t = new ValueTask(saea.GetCompletionResponsibility(out responsibleForReturningToPool).Task); - if (responsibleForReturningToPool) - { - // We're responsible for returning it only if the callback has already been invoked - // and gotten what it needs from the SAEA; otherwise, the callback will return it. - ReturnSocketAsyncEventArgs(saea, isReceive); - } - } - else - { - // The operation completed synchronously. Return a ValueTask for it. - t = saea.SocketError == SocketError.Success ? - new ValueTask(saea.BytesTransferred) : - new ValueTask(Task.FromException(GetException(saea.SocketError, wrapExceptionsInIOExceptions: fromNetworkStream))); - - // There won't be a callback, and we're done with the SAEA, so return it to the pool. - ReturnSocketAsyncEventArgs(saea, isReceive); - } - - return t; - } - /// Completes the SocketAsyncEventArg's Task with the result of the send or receive, and returns it to the specified pool. private static void CompleteAccept(Socket s, TaskSocketAsyncEventArgs saea) { @@ -709,10 +644,10 @@ namespace System.Net.Sockets private Int32TaskSocketAsyncEventArgs RentSocketAsyncEventArgs(bool isReceive) { // Get any cached SocketAsyncEventArg we may have. - CachedTaskEventArgs cea = LazyInitializer.EnsureInitialized(ref _cachedTaskEventArgs); + CachedEventArgs cea = LazyInitializer.EnsureInitialized(ref _cachedTaskEventArgs); Int32TaskSocketAsyncEventArgs saea = isReceive ? - Interlocked.Exchange(ref cea.Receive, s_rentedInt32Sentinel) : - Interlocked.Exchange(ref cea.Send, s_rentedInt32Sentinel); + Interlocked.Exchange(ref cea.TaskReceive, s_rentedInt32Sentinel) : + Interlocked.Exchange(ref cea.TaskSend, s_rentedInt32Sentinel); if (saea == s_rentedInt32Sentinel) { @@ -752,13 +687,13 @@ namespace System.Net.Sockets // never null or another instance. if (isReceive) { - Debug.Assert(_cachedTaskEventArgs.Receive == s_rentedInt32Sentinel); - Volatile.Write(ref _cachedTaskEventArgs.Receive, saea); + Debug.Assert(_cachedTaskEventArgs.TaskReceive == s_rentedInt32Sentinel); + Volatile.Write(ref _cachedTaskEventArgs.TaskReceive, saea); } else { - Debug.Assert(_cachedTaskEventArgs.Send == s_rentedInt32Sentinel); - Volatile.Write(ref _cachedTaskEventArgs.Send, saea); + Debug.Assert(_cachedTaskEventArgs.TaskSend == s_rentedInt32Sentinel); + Volatile.Write(ref _cachedTaskEventArgs.TaskSend, saea); } } @@ -779,19 +714,21 @@ namespace System.Net.Sockets // Write this instance back as a cached instance. It should only ever be overwriting the sentinel, // never null or another instance. - Debug.Assert(_cachedTaskEventArgs.Accept == s_rentedSocketSentinel); - Volatile.Write(ref _cachedTaskEventArgs.Accept, saea); + Debug.Assert(_cachedTaskEventArgs.TaskAccept == s_rentedSocketSentinel); + Volatile.Write(ref _cachedTaskEventArgs.TaskAccept, saea); } /// Dispose of any cached instances. private void DisposeCachedTaskSocketAsyncEventArgs() { - CachedTaskEventArgs cea = _cachedTaskEventArgs; + CachedEventArgs cea = _cachedTaskEventArgs; if (cea != null) { - Interlocked.Exchange(ref cea.Accept, s_rentedSocketSentinel)?.Dispose(); - Interlocked.Exchange(ref cea.Receive, s_rentedInt32Sentinel)?.Dispose(); - Interlocked.Exchange(ref cea.Send, s_rentedInt32Sentinel)?.Dispose(); + Interlocked.Exchange(ref cea.TaskAccept, s_rentedSocketSentinel)?.Dispose(); + Interlocked.Exchange(ref cea.TaskReceive, s_rentedInt32Sentinel)?.Dispose(); + Interlocked.Exchange(ref cea.TaskSend, s_rentedInt32Sentinel)?.Dispose(); + Interlocked.Exchange(ref cea.ValueTaskReceive, AwaitableSocketAsyncEventArgs.Reserved)?.Dispose(); + Interlocked.Exchange(ref cea.ValueTaskSend, AwaitableSocketAsyncEventArgs.Reserved)?.Dispose(); } } @@ -810,14 +747,18 @@ namespace System.Net.Sockets } /// Cached event args used with Task-based async operations. - private sealed class CachedTaskEventArgs + private sealed class CachedEventArgs { /// Cached instance for accept operations. - public TaskSocketAsyncEventArgs Accept; - /// Cached instance for receive operations. - public Int32TaskSocketAsyncEventArgs Receive; - /// Cached instance for send operations. - public Int32TaskSocketAsyncEventArgs Send; + public TaskSocketAsyncEventArgs TaskAccept; + /// Cached instance for receive operations that return . + public Int32TaskSocketAsyncEventArgs TaskReceive; + /// Cached instance for send operations that return . + public Int32TaskSocketAsyncEventArgs TaskSend; + /// Cached instance for receive operations that return . + public AwaitableSocketAsyncEventArgs ValueTaskReceive; + /// Cached instance for send operations that return . + public AwaitableSocketAsyncEventArgs ValueTaskSend; } /// A SocketAsyncEventArgs with an associated async method builder. @@ -838,6 +779,11 @@ namespace System.Net.Sockets /// internal bool _accessed = false; + internal TaskSocketAsyncEventArgs() : + base(flowExecutionContext: false) // avoid flowing context at lower layers as we only expose Task, which handles it + { + } + /// Gets the builder's task with appropriate synchronization. internal AsyncTaskMethodBuilder GetCompletionResponsibility(out bool responsibleForReturningToPool) { @@ -854,10 +800,300 @@ namespace System.Net.Sockets /// A SocketAsyncEventArgs with an associated async method builder. private sealed class Int32TaskSocketAsyncEventArgs : TaskSocketAsyncEventArgs { - /// A cached, successfully completed task. - internal Task _successfullyCompletedTask; /// Whether exceptions that emerge should be wrapped in IOExceptions. internal bool _wrapExceptionsInIOExceptions; } + + /// A SocketAsyncEventArgs that can be awaited to get the result of an operation. + internal sealed class AwaitableSocketAsyncEventArgs : SocketAsyncEventArgs, IValueTaskSource, IValueTaskSource + { + internal static readonly AwaitableSocketAsyncEventArgs Reserved = new AwaitableSocketAsyncEventArgs() { _continuation = null }; + /// Sentinel object used to indicate that the operation has completed prior to OnCompleted being called. + private static readonly Action s_completedSentinel = new Action(state => throw new Exception(nameof(s_completedSentinel))); + /// Sentinel object used to indicate that the instance is available for use. + private static readonly Action s_availableSentinel = new Action(state => throw new Exception(nameof(s_availableSentinel))); + /// + /// if the object is available for use, after GetResult has been called on a previous use. + /// null if the operation has not completed. + /// if it has completed. + /// Another delegate if OnCompleted was called before the operation could complete, in which case it's the delegate to invoke + /// when the operation does complete. + /// + private Action _continuation = s_availableSentinel; + private ExecutionContext _executionContext; + private object _scheduler; + /// Current token value given to a ValueTask and then verified against the value it passes back to us. + /// + /// This is not meant to be a completely reliable mechanism, doesn't require additional synchronization, etc. + /// It's purely a best effort attempt to catch misuse, including awaiting for a value task twice and after + /// it's already being reused by someone else. + /// + private short _token; + + /// Initializes the event args. + /// The associated socket. + /// The buffer to use for all operations. + public AwaitableSocketAsyncEventArgs() : + base(flowExecutionContext: false) // avoid flowing context at lower layers as we only expose ValueTask, which handles it + { + } + + public bool WrapExceptionsInIOExceptions { get; set; } + + public bool Reserve() => + ReferenceEquals(Interlocked.CompareExchange(ref _continuation, null, s_availableSentinel), s_availableSentinel); + + private void Release() + { + _token++; + Volatile.Write(ref _continuation, s_availableSentinel); + } + + protected override void OnCompleted(SocketAsyncEventArgs _) + { + // When the operation completes, see if OnCompleted was already called to hook up a continuation. + // If it was, invoke the continuation. + Action c = _continuation; + if (c != null || (c = Interlocked.CompareExchange(ref _continuation, s_completedSentinel, null)) != null) + { + Debug.Assert(c != s_availableSentinel, "The delegate should not have been the available sentinel."); + Debug.Assert(c != s_completedSentinel, "The delegate should not have been the completed sentinel."); + + object continuationState = UserToken; + UserToken = null; + _continuation = s_completedSentinel; // in case someone's polling IsCompleted + + ExecutionContext ec = _executionContext; + if (ec == null) + { + InvokeContinuation(c, continuationState, forceAsync: false); + } + else + { + // This case should be relatively rare, as the async Task/ValueTask method builders + // use the awaiter's UnsafeOnCompleted, so this will only happen with code that + // explicitly uses the awaiter's OnCompleted instead. + _executionContext = null; + ExecutionContext.Run(ec, runState => + { + var t = (Tuple, object>)runState; + t.Item1.InvokeContinuation(t.Item2, t.Item3, forceAsync: false); + }, Tuple.Create(this, c, continuationState)); + } + } + } + + /// Initiates a receive operation on the associated socket. + /// This instance. + public ValueTask ReceiveAsync(Socket socket) + { + Debug.Assert(Volatile.Read(ref _continuation) == null, $"Expected null continuation to indicate reserved for use"); + + if (socket.ReceiveAsync(this)) + { + return new ValueTask(this, _token); + } + + int bytesTransferred = BytesTransferred; + SocketError error = SocketError; + + Release(); + + return error == SocketError.Success ? + new ValueTask(bytesTransferred) : + new ValueTask(Task.FromException(CreateException(error))); + } + + /// Initiates a send operation on the associated socket. + /// This instance. + public ValueTask SendAsync(Socket socket) + { + Debug.Assert(Volatile.Read(ref _continuation) == null, $"Expected null continuation to indicate reserved for use"); + + if (socket.SendAsync(this)) + { + return new ValueTask(this, _token); + } + + int bytesTransferred = BytesTransferred; + SocketError error = SocketError; + + Release(); + + return error == SocketError.Success ? + new ValueTask(bytesTransferred) : + new ValueTask(Task.FromException(CreateException(error))); + } + + public ValueTask SendAsyncForNetworkStream(Socket socket) + { + Debug.Assert(Volatile.Read(ref _continuation) == null, $"Expected null continuation to indicate reserved for use"); + + if (socket.SendAsync(this)) + { + return new ValueTask(this, _token); + } + + SocketError error = SocketError; + + Release(); + + return error == SocketError.Success ? + default : + new ValueTask(Task.FromException(CreateException(error))); + } + + /// Gets the status of the operation. + public ValueTaskSourceStatus GetStatus(short token) + { + if (token != _token) + { + ThrowIncorrectTokenException(); + } + + return + !ReferenceEquals(_continuation, s_completedSentinel) ? ValueTaskSourceStatus.Pending : + base.SocketError == SocketError.Success ? ValueTaskSourceStatus.Succeeded : + ValueTaskSourceStatus.Faulted; + } + + /// Queues the provided continuation to be executed once the operation has completed. + public void OnCompleted(Action continuation, object state, short token, ValueTaskSourceOnCompletedFlags flags) + { + if (token != _token) + { + ThrowIncorrectTokenException(); + } + + if ((flags & ValueTaskSourceOnCompletedFlags.FlowExecutionContext) != 0) + { + _executionContext = ExecutionContext.Capture(); + } + + if ((flags & ValueTaskSourceOnCompletedFlags.UseSchedulingContext) != 0) + { + SynchronizationContext sc = SynchronizationContext.Current; + if (sc != null && sc.GetType() != typeof(SynchronizationContext)) + { + _scheduler = sc; + } + else + { + TaskScheduler ts = TaskScheduler.Current; + if (ts != TaskScheduler.Default) + { + _scheduler = ts; + } + } + } + + UserToken = state; // Use UserToken to carry the continuation state around + Action prevContinuation = Interlocked.CompareExchange(ref _continuation, continuation, null); + if (ReferenceEquals(prevContinuation, s_completedSentinel)) + { + // Lost the race condition and the operation has now already completed. + // We need to invoke the continuation, but it must be asynchronously to + // avoid a stack dive. However, since all of the queueing mechanisms flow + // ExecutionContext, and since we're still in the same context where we + // captured it, we can just ignore the one we captured. + _executionContext = null; + UserToken = null; // we have the state in "state"; no need for the one in UserToken + InvokeContinuation(continuation, state, forceAsync: true); + } + else if (prevContinuation != null) + { + // Flag errors with the continuation being hooked up multiple times. + // This is purely to help alert a developer to a bug they need to fix. + ThrowMultipleContinuationsException(); + } + } + + private void InvokeContinuation(Action continuation, object state, bool forceAsync) + { + object scheduler = _scheduler; + _scheduler = null; + + if (scheduler != null) + { + if (scheduler is SynchronizationContext sc) + { + sc.Post(s => + { + var t = (Tuple, object>)s; + t.Item1(t.Item2); + }, Tuple.Create(continuation, state)); + } + else + { + Debug.Assert(scheduler is TaskScheduler, $"Expected TaskScheduler, got {scheduler}"); + Task.Factory.StartNew(continuation, state, CancellationToken.None, TaskCreationOptions.DenyChildAttach, (TaskScheduler)scheduler); + } + } + else if (forceAsync) + { + ThreadPool.QueueUserWorkItem(continuation, state, preferLocal: true); + } + else + { + continuation(state); + } + } + + /// Gets the result of the completion operation. + /// Number of bytes transferred. + /// + /// Unlike TaskAwaiter's GetResult, this does not block until the operation completes: it must only + /// be used once the operation has completed. This is handled implicitly by await. + /// + public int GetResult(short token) + { + if (token != _token) + { + ThrowIncorrectTokenException(); + } + + SocketError error = SocketError; + int bytes = BytesTransferred; + + Release(); + + if (error != SocketError.Success) + { + ThrowException(error); + } + return bytes; + } + + void IValueTaskSource.GetResult(short token) + { + if (token != _token) + { + ThrowIncorrectTokenException(); + } + + SocketError error = SocketError; + + Release(); + + if (error != SocketError.Success) + { + ThrowException(error); + } + } + + private void ThrowIncorrectTokenException() => throw new InvalidOperationException(SR.InvalidOperation_IncorrectToken); + + private void ThrowMultipleContinuationsException() => throw new InvalidOperationException(SR.InvalidOperation_MultipleContinuations); + + private void ThrowException(SocketError error) => throw CreateException(error); + + private Exception CreateException(SocketError error) + { + var se = new SocketException((int)error); + return WrapExceptionsInIOExceptions ? (Exception) + new IOException(SR.Format(SR.net_io_readfailure, se.Message), se) : + se; + } + } } } diff --git a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/Socket.Windows.cs b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/Socket.Windows.cs index 897bebb851..0c7eeb8fe3 100644 --- a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/Socket.Windows.cs +++ b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/Socket.Windows.cs @@ -5,8 +5,7 @@ using Microsoft.Win32.SafeHandles; using System.Collections; using System.IO; -using System.Runtime.ExceptionServices; -using System.Runtime.InteropServices; +using System.Runtime.CompilerServices; using System.Threading; namespace System.Net.Sockets @@ -285,10 +284,14 @@ namespace System.Net.Sockets } - internal ThreadPoolBoundHandle GetOrAllocateThreadPoolBoundHandle() + internal ThreadPoolBoundHandle GetOrAllocateThreadPoolBoundHandle() => + _handle.GetThreadPoolBoundHandle() ?? + GetOrAllocateThreadPoolBoundHandleSlow(); + + [MethodImpl(MethodImplOptions.NoInlining)] + internal ThreadPoolBoundHandle GetOrAllocateThreadPoolBoundHandleSlow() { - // There is a known bug that exists through Windows 7 with UDP and - // SetFileCompletionNotificationModes. + // There is a known bug that exists through Windows 7 with UDP and SetFileCompletionNotificationModes. // So, don't try to enable skipping the completion port on success in this case. bool trySkipCompletionPortOnSuccess = !(CompletionPortHelper.PlatformHasUdpIssue && _protocolType == ProtocolType.Udp); return _handle.GetOrAllocateThreadPoolBoundHandle(trySkipCompletionPortOnSuccess); diff --git a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/Socket.cs.REMOVED.git-id b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/Socket.cs.REMOVED.git-id index 21302f789f..a3bef93f9d 100644 --- a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/Socket.cs.REMOVED.git-id +++ b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/Socket.cs.REMOVED.git-id @@ -1 +1 @@ -10bd970a50210617dd5f2e7f0b1355084b3ba7a2 \ No newline at end of file +fa85ae8d57cb300ecf620af894910a21f5984eb7 \ No newline at end of file diff --git a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncContext.Unix.cs b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncContext.Unix.cs index 2321c9c297..7df7edc0be 100644 --- a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncContext.Unix.cs +++ b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncContext.Unix.cs @@ -133,7 +133,7 @@ namespace System.Net.Sockets public ManualResetEventSlim Event { - private get { return (ManualResetEventSlim)CallbackOrEvent; } + get { return CallbackOrEvent as ManualResetEventSlim; } set { CallbackOrEvent = value; } } @@ -177,28 +177,11 @@ namespace System.Net.Sockets return true; } - public bool SetComplete() + public void SetComplete() { Debug.Assert(Volatile.Read(ref _state) == (int)State.Running); Volatile.Write(ref _state, (int)State.Complete); - - if (CallbackOrEvent is ManualResetEventSlim e) - { - e.Set(); - - // No callback needed - return false; - } - else - { -#if DEBUG - Debug.Assert(Interlocked.CompareExchange(ref _callbackQueued, 1, 0) == 0, $"Unexpected _callbackQueued: {_callbackQueued}"); -#endif - - // Indicate callback is needed - return true; - } } public void SetWaiting() @@ -208,11 +191,6 @@ namespace System.Net.Sockets Volatile.Write(ref _state, (int)State.Waiting); } - public void DoCallback() - { - InvokeCallback(); - } - public bool TryCancel() { Trace("Enter"); @@ -267,8 +245,11 @@ namespace System.Net.Sockets #if DEBUG Debug.Assert(Interlocked.CompareExchange(ref _callbackQueued, 1, 0) == 0, $"Unexpected _callbackQueued: {_callbackQueued}"); #endif - - ThreadPool.QueueUserWorkItem(o => ((AsyncOperation)o).InvokeCallback(), this); + // We've marked the operation as canceled, and so should invoke the callback, but + // we can't pool the object, as ProcessQueue may still have a reference to it, due to + // using a pattern whereby it takes the lock to grab an item, but then releases the lock + // to do further processing on the item that's still in the list. + ThreadPool.UnsafeQueueUserWorkItem(o => ((AsyncOperation)o).InvokeCallback(allowPooling: false), this); } Trace("Exit"); @@ -278,6 +259,21 @@ namespace System.Net.Sockets return true; } + public void Dispatch(WaitCallback processingCallback) + { + ManualResetEventSlim e = Event; + if (e != null) + { + // Sync operation. Signal waiting thread to continue processing. + e.Set(); + } + else + { + // Async operation. Process the IO on the threadpool. + ThreadPool.UnsafeQueueUserWorkItem(processingCallback, this); + } + } + // Called when op is not in the queue yet, so can't be otherwise executing public void DoAbort() { @@ -289,7 +285,7 @@ namespace System.Net.Sockets protected abstract bool DoTryComplete(SocketAsyncContext context); - protected abstract void InvokeCallback(); + public abstract void InvokeCallback(bool allowPooling); [Conditional("SOCKETASYNCCONTEXT_TRACE")] public void Trace(string message, [CallerMemberName] string memberName = null) @@ -332,7 +328,7 @@ namespace System.Net.Sockets set => CallbackOrEvent = value; } - protected override void InvokeCallback() => + public override void InvokeCallback(bool allowPooling) => ((Action)CallbackOrEvent)(BytesTransferred, SocketAddress, SocketAddressLen, SocketFlags.None, ErrorCode); } @@ -348,7 +344,7 @@ namespace System.Net.Sockets return SocketPal.TryCompleteSendTo(context._socket, Buffer.Span, null, ref bufferIndex, ref Offset, ref Count, Flags, SocketAddress, SocketAddressLen, ref BytesTransferred, out ErrorCode); } - protected override void InvokeCallback() + public override void InvokeCallback(bool allowPooling) { var cb = (Action)CallbackOrEvent; int bt = BytesTransferred; @@ -356,7 +352,10 @@ namespace System.Net.Sockets int sal = SocketAddressLen; SocketError ec = ErrorCode; - AssociatedContext.ReturnOperation(this); + if (allowPooling) + { + AssociatedContext.ReturnOperation(this); + } cb(bt, sa, sal, SocketFlags.None, ec); } @@ -374,7 +373,7 @@ namespace System.Net.Sockets return SocketPal.TryCompleteSendTo(context._socket, default(ReadOnlySpan), Buffers, ref BufferIndex, ref Offset, ref Count, Flags, SocketAddress, SocketAddressLen, ref BytesTransferred, out ErrorCode); } - protected override void InvokeCallback() + public override void InvokeCallback(bool allowPooling) { var cb = (Action)CallbackOrEvent; int bt = BytesTransferred; @@ -382,7 +381,10 @@ namespace System.Net.Sockets int sal = SocketAddressLen; SocketError ec = ErrorCode; - AssociatedContext.ReturnOperation(this); + if (allowPooling) + { + AssociatedContext.ReturnOperation(this); + } cb(bt, sa, sal, SocketFlags.None, ec); } @@ -416,7 +418,7 @@ namespace System.Net.Sockets set => CallbackOrEvent = value; } - protected override void InvokeCallback() => + public override void InvokeCallback(bool allowPooling) => ((Action)CallbackOrEvent)( BytesTransferred, SocketAddress, SocketAddressLen, ReceivedFlags, ErrorCode); } @@ -427,10 +429,24 @@ namespace System.Net.Sockets public BufferMemoryReceiveOperation(SocketAsyncContext context) : base(context) { } - protected override bool DoTryComplete(SocketAsyncContext context) => - SocketPal.TryCompleteReceiveFrom(context._socket, Buffer.Span, null, Flags, SocketAddress, ref SocketAddressLen, out BytesTransferred, out ReceivedFlags, out ErrorCode); + protected override bool DoTryComplete(SocketAsyncContext context) + { + // Zero byte read is performed to know when data is available. + // We don't have to call receive, our caller is interested in the event. + if (Buffer.Length == 0 && Flags == SocketFlags.None && SocketAddress == null) + { + BytesTransferred = 0; + ReceivedFlags = SocketFlags.None; + ErrorCode = SocketError.Success; + return true; + } + else + { + return SocketPal.TryCompleteReceiveFrom(context._socket, Buffer.Span, null, Flags, SocketAddress, ref SocketAddressLen, out BytesTransferred, out ReceivedFlags, out ErrorCode); + } + } - protected override void InvokeCallback() + public override void InvokeCallback(bool allowPooling) { var cb = (Action)CallbackOrEvent; int bt = BytesTransferred; @@ -439,7 +455,10 @@ namespace System.Net.Sockets SocketFlags rf = ReceivedFlags; SocketError ec = ErrorCode; - AssociatedContext.ReturnOperation(this); + if (allowPooling) + { + AssociatedContext.ReturnOperation(this); + } cb(bt, sa, sal, rf, ec); } @@ -454,7 +473,7 @@ namespace System.Net.Sockets protected override bool DoTryComplete(SocketAsyncContext context) => SocketPal.TryCompleteReceiveFrom(context._socket, default(Span), Buffers, Flags, SocketAddress, ref SocketAddressLen, out BytesTransferred, out ReceivedFlags, out ErrorCode); - protected override void InvokeCallback() + public override void InvokeCallback(bool allowPooling) { var cb = (Action)CallbackOrEvent; int bt = BytesTransferred; @@ -463,7 +482,10 @@ namespace System.Net.Sockets SocketFlags rf = ReceivedFlags; SocketError ec = ErrorCode; - AssociatedContext.ReturnOperation(this); + if (allowPooling) + { + AssociatedContext.ReturnOperation(this); + } cb(bt, sa, sal, rf, ec); } @@ -504,7 +526,7 @@ namespace System.Net.Sockets protected override bool DoTryComplete(SocketAsyncContext context) => SocketPal.TryCompleteReceiveMessageFrom(context._socket, Buffer.Span, Buffers, Flags, SocketAddress, ref SocketAddressLen, IsIPv4, IsIPv6, out BytesTransferred, out ReceivedFlags, out IPPacketInformation, out ErrorCode); - protected override void InvokeCallback() => + public override void InvokeCallback(bool allowPooling) => ((Action)CallbackOrEvent)( BytesTransferred, SocketAddress, SocketAddressLen, ReceivedFlags, IPPacketInformation, ErrorCode); } @@ -530,7 +552,7 @@ namespace System.Net.Sockets return completed; } - protected override void InvokeCallback() + public override void InvokeCallback(bool allowPooling) { var cb = (Action)CallbackOrEvent; IntPtr fd = AcceptedFileDescriptor; @@ -538,7 +560,10 @@ namespace System.Net.Sockets int sal = SocketAddressLen; SocketError ec = ErrorCode; - AssociatedContext.ReturnOperation(this); + if (allowPooling) + { + AssociatedContext.ReturnOperation(this); + } cb(fd, sa, sal, ec); } @@ -562,7 +587,7 @@ namespace System.Net.Sockets return result; } - protected override void InvokeCallback() => + public override void InvokeCallback(bool allowPooling) => ((Action)CallbackOrEvent)(ErrorCode); } @@ -582,7 +607,7 @@ namespace System.Net.Sockets set => CallbackOrEvent = value; } - protected override void InvokeCallback() => + public override void InvokeCallback(bool allowPooling) => ((Action)CallbackOrEvent)(BytesTransferred, ErrorCode); protected override bool DoTryComplete(SocketAsyncContext context) => @@ -669,8 +694,8 @@ namespace System.Net.Sockets private LockToken Lock() => new LockToken(_queueLock); private static readonly WaitCallback s_processingCallback = - typeof(TOperation) == typeof(ReadOperation) ? ((o) => { var context = ((SocketAsyncContext)o); context._receiveQueue.ProcessQueue(context); }) : - typeof(TOperation) == typeof(WriteOperation) ? ((o) => { var context = ((SocketAsyncContext)o); context._sendQueue.ProcessQueue(context); }) : + typeof(TOperation) == typeof(ReadOperation) ? ((op) => { var operation = ((ReadOperation)op); operation.AssociatedContext._receiveQueue.ProcessAsyncOperation(operation); }) : + typeof(TOperation) == typeof(WriteOperation) ? ((op) => { var operation = ((WriteOperation)op); operation.AssociatedContext._sendQueue.ProcessAsyncOperation(operation); }) : (WaitCallback)null; public void Init() @@ -773,6 +798,7 @@ namespace System.Net.Sockets // Called on the epoll thread whenever we receive an epoll notification. public void HandleEvent(SocketAsyncContext context) { + AsyncOperation op; using (Lock()) { Trace(context, $"Enter"); @@ -788,6 +814,7 @@ namespace System.Net.Sockets case QueueState.Waiting: Debug.Assert(_tail != null, "State == Waiting but queue is empty!"); _state = QueueState.Processing; + op = _tail.Next; // Break out and release lock break; @@ -808,16 +835,37 @@ namespace System.Net.Sockets } } - // We just transitioned from Waiting to Processing. - // Spawn a work item to do the actual processing. - ThreadPool.QueueUserWorkItem(s_processingCallback, context); + // Dispatch the op so we can try to process it. + op.Dispatch(s_processingCallback); + } + + private void ProcessAsyncOperation(TOperation op) + { + OperationResult result = ProcessQueuedOperation(op); + + Debug.Assert(op.Event == null, "Sync operation encountered in ProcessAsyncOperation"); + + if (result == OperationResult.Completed) + { + // At this point, the operation has completed and it's no longer + // in the queue / no one else has a reference to it. We can invoke + // the callback and let it pool the object if appropriate. + op.InvokeCallback(allowPooling: true); + } } - // Called on the threadpool when data may be available. - public void ProcessQueue(SocketAsyncContext context) + public enum OperationResult { + Pending = 0, + Completed = 1, + Cancelled = 2 + } + + public OperationResult ProcessQueuedOperation(TOperation op) + { + SocketAsyncContext context = op.AssociatedContext; + int observedSequenceNumber; - AsyncOperation op; using (Lock()) { Trace(context, $"Enter"); @@ -826,129 +874,185 @@ namespace System.Net.Sockets { Debug.Assert(_tail == null); Trace(context, $"Exit (stopped)"); - return; + return OperationResult.Cancelled; } else { Debug.Assert(_state == QueueState.Processing, $"_state={_state} while processing queue!"); Debug.Assert(_tail != null, "Unexpected empty queue while processing I/O"); + Debug.Assert(op == _tail.Next, "Operation is not at head of queue???"); observedSequenceNumber = _sequenceNumber; - op = _tail.Next; // head of queue } } - bool needCallback = false; - AsyncOperation nextOp; + bool wasCompleted = false; while (true) { - bool wasCompleted = false; - // Try to change the op state to Running. // If this fails, it means the operation was previously cancelled, // and we should just remove it from the queue without further processing. - bool isRunning = op.TrySetRunning(); - if (isRunning) - { - // Try to perform the IO - wasCompleted = op.TryComplete(context); - if (wasCompleted) - { - needCallback = op.SetComplete(); - } - else - { - op.SetWaiting(); - } - } - - nextOp = null; - if (wasCompleted || !isRunning) - { - // Remove the op from the queue and see if there's more to process. - - using (Lock()) - { - if (_state == QueueState.Stopped) - { - Debug.Assert(_tail == null); - Trace(context, $"Exit (stopped)"); - } - else - { - Debug.Assert(_state == QueueState.Processing, $"_state={_state} while processing queue!"); - Debug.Assert(_tail.Next == op, "Queue modified while processing queue"); - - if (op == _tail) - { - // No more operations to process - _tail = null; - _state = QueueState.Ready; - _sequenceNumber++; - Trace(context, $"Exit (finished queue)"); - } - else - { - // Pop current operation and advance to next - nextOp = _tail.Next = op.Next; - } - } - } - } - else - { - // Check for retry and reset queue state. - - using (Lock()) - { - if (_state == QueueState.Stopped) - { - Debug.Assert(_tail == null); - Trace(context, $"Exit (stopped)"); - } - else - { - Debug.Assert(_state == QueueState.Processing, $"_state={_state} while processing queue!"); - - if (observedSequenceNumber != _sequenceNumber) - { - // We received another epoll notification since we previously checked it. - // So, we need to retry the operation. - Debug.Assert(observedSequenceNumber - _sequenceNumber < 10000, "Very large sequence number increase???"); - observedSequenceNumber = _sequenceNumber; - nextOp = op; - } - else - { - _state = QueueState.Waiting; - Trace(context, $"Exit (received EAGAIN)"); - } - } - } - } - - if (needCallback || nextOp == null) + if (!op.TrySetRunning()) { break; } - op = nextOp; - } - - if (needCallback) - { - if (nextOp != null) + // Try to perform the IO + if (op.TryComplete(context)) { - Debug.Assert(_state == QueueState.Processing); - - // Spawn a new work item to continue processing the queue. - ThreadPool.QueueUserWorkItem(s_processingCallback, context); + op.SetComplete(); + wasCompleted = true; + break; } - op.DoCallback(); + op.SetWaiting(); + + // Check for retry and reset queue state. + + using (Lock()) + { + if (_state == QueueState.Stopped) + { + Debug.Assert(_tail == null); + Trace(context, $"Exit (stopped)"); + return OperationResult.Cancelled; + } + else + { + Debug.Assert(_state == QueueState.Processing, $"_state={_state} while processing queue!"); + + if (observedSequenceNumber != _sequenceNumber) + { + // We received another epoll notification since we previously checked it. + // So, we need to retry the operation. + Debug.Assert(observedSequenceNumber - _sequenceNumber < 10000, "Very large sequence number increase???"); + observedSequenceNumber = _sequenceNumber; + } + else + { + _state = QueueState.Waiting; + Trace(context, $"Exit (received EAGAIN)"); + return OperationResult.Pending; + } + } + } } - else + + // Remove the op from the queue and see if there's more to process. + + AsyncOperation nextOp = null; + using (Lock()) { - Debug.Assert(nextOp == null); + if (_state == QueueState.Stopped) + { + Debug.Assert(_tail == null); + Trace(context, $"Exit (stopped)"); + } + else + { + Debug.Assert(_state == QueueState.Processing, $"_state={_state} while processing queue!"); + Debug.Assert(_tail.Next == op, "Queue modified while processing queue"); + + if (op == _tail) + { + // No more operations to process + _tail = null; + _state = QueueState.Ready; + _sequenceNumber++; + Trace(context, $"Exit (finished queue)"); + } + else + { + // Pop current operation and advance to next + nextOp = _tail.Next = op.Next; + } + } + } + + if (nextOp != null) + { + nextOp.Dispatch(s_processingCallback); + } + + return (wasCompleted ? OperationResult.Completed : OperationResult.Cancelled); + } + + public void CancelAndContinueProcessing(TOperation op) + { + // Note, only sync operations use this method. + Debug.Assert(op.Event != null); + + // Remove operation from queue. + // Note it must be there since it can only be processed and removed by the caller. + AsyncOperation nextOp = null; + using (Lock()) + { + if (_state == QueueState.Stopped) + { + Debug.Assert(_tail == null); + } + else + { + Debug.Assert(_tail != null, "Unexpected empty queue in CancelAndContinueProcessing"); + + if (_tail.Next == op) + { + // We're the head of the queue + if (op == _tail) + { + // No more operations + _tail = null; + } + else + { + // Pop current operation and advance to next + _tail.Next = op.Next; + } + + // We're the first op in the queue. + if (_state == QueueState.Processing) + { + // The queue has already handed off execution responsibility to us. + // We need to dispatch to the next op. + if (_tail == null) + { + _state = QueueState.Ready; + _sequenceNumber++; + } + else + { + nextOp = _tail.Next; + } + } + else if (_state == QueueState.Waiting) + { + if (_tail == null) + { + _state = QueueState.Ready; + } + } + } + else + { + // We're not the head of the queue. + // Just find this op and remove it. + AsyncOperation current = _tail.Next; + while (current.Next != op) + { + current = current.Next; + } + + if (current.Next == _tail) + { + _tail = current; + } + current.Next = current.Next.Next; + } + } + } + + if (nextOp != null) + { + nextOp.Dispatch(s_processingCallback); } } @@ -1013,10 +1117,7 @@ namespace System.Net.Sockets private void Register() { - // Note, on OSX, this is not always true because in certain cases, - // the socket can already be in non-blocking mode even though we didn't set that ourselves. - // TODO: Track down exactly why this is - // Debug.Assert(_nonBlockingSet); + Debug.Assert(_nonBlockingSet); lock (_registerLock) { if (!_registered) @@ -1085,6 +1186,8 @@ namespace System.Net.Sockets private void PerformSyncOperation(ref OperationQueue queue, TOperation operation, int timeout, int observedSequenceNumber) where TOperation : AsyncOperation { + Debug.Assert(timeout == -1 || timeout > 0, $"Unexpected timeout: {timeout}"); + using (var e = new ManualResetEventSlim(false, 0)) { operation.Event = e; @@ -1095,25 +1198,67 @@ namespace System.Net.Sockets return; } - if (e.Wait(timeout)) + bool timeoutExpired = false; + while (true) { - // Completed within timeout - return; + DateTime waitStart = DateTime.UtcNow; + + if (!e.Wait(timeout)) + { + timeoutExpired = true; + break; + } + + // Reset the event now to avoid lost notifications if the processing is unsuccessful. + e.Reset(); + + // We've been signalled to try to process the operation. + OperationQueue.OperationResult result = queue.ProcessQueuedOperation(operation); + if (result == OperationQueue.OperationResult.Completed || + result == OperationQueue.OperationResult.Cancelled) + { + break; + } + + // Couldn't process the operation. + // Adjust timeout and try again. + if (timeout > 0) + { + timeout -= (DateTime.UtcNow - waitStart).Milliseconds; + + if (timeout <= 0) + { + timeoutExpired = true; + break; + } + } } - bool cancelled = operation.TryCancel(); - if (cancelled) + if (timeoutExpired) { + queue.CancelAndContinueProcessing(operation); operation.ErrorCode = SocketError.TimedOut; } } } - public SocketError Accept(byte[] socketAddress, ref int socketAddressLen, int timeout, out IntPtr acceptedFd) + private bool ShouldRetrySyncOperation(out SocketError errorCode) + { + if (_nonBlockingSet) + { + errorCode = SocketError.Success; // Will be ignored + return true; + } + + // We are in blocking mode, so the EAGAIN we received indicates a timeout. + errorCode = SocketError.TimedOut; + return false; + } + + public SocketError Accept(byte[] socketAddress, ref int socketAddressLen, out IntPtr acceptedFd) { Debug.Assert(socketAddress != null, "Expected non-null socketAddress"); Debug.Assert(socketAddressLen > 0, $"Unexpected socketAddressLen: {socketAddressLen}"); - Debug.Assert(timeout == -1 || timeout > 0, $"Unexpected timeout: {timeout}"); SocketError errorCode; int observedSequenceNumber; @@ -1130,7 +1275,7 @@ namespace System.Net.Sockets SocketAddressLen = socketAddressLen, }; - PerformSyncOperation(ref _receiveQueue, operation, timeout, observedSequenceNumber); + PerformSyncOperation(ref _receiveQueue, operation, -1, observedSequenceNumber); socketAddressLen = operation.SocketAddressLen; acceptedFd = operation.AcceptedFileDescriptor; @@ -1174,11 +1319,10 @@ namespace System.Net.Sockets return SocketError.IOPending; } - public SocketError Connect(byte[] socketAddress, int socketAddressLen, int timeout) + public SocketError Connect(byte[] socketAddress, int socketAddressLen) { Debug.Assert(socketAddress != null, "Expected non-null socketAddress"); Debug.Assert(socketAddressLen > 0, $"Unexpected socketAddressLen: {socketAddressLen}"); - Debug.Assert(timeout == -1 || timeout > 0, $"Unexpected timeout: {timeout}"); // Connect is different than the usual "readiness" pattern of other operations. // We need to call TryStartConnect to initiate the connect with the OS, @@ -1199,7 +1343,7 @@ namespace System.Net.Sockets SocketAddressLen = socketAddressLen }; - PerformSyncOperation(ref _sendQueue, operation, timeout, observedSequenceNumber); + PerformSyncOperation(ref _sendQueue, operation, -1, observedSequenceNumber); return operation.ErrorCode; } @@ -1265,7 +1409,8 @@ namespace System.Net.Sockets SocketError errorCode; int observedSequenceNumber; if (_receiveQueue.IsReady(this, out observedSequenceNumber) && - SocketPal.TryCompleteReceiveFrom(_socket, buffer.Span, flags, socketAddress, ref socketAddressLen, out bytesReceived, out receivedFlags, out errorCode)) + (SocketPal.TryCompleteReceiveFrom(_socket, buffer.Span, flags, socketAddress, ref socketAddressLen, out bytesReceived, out receivedFlags, out errorCode) || + !ShouldRetrySyncOperation(out errorCode))) { flags = receivedFlags; return errorCode; @@ -1292,7 +1437,8 @@ namespace System.Net.Sockets SocketError errorCode; int observedSequenceNumber; if (_receiveQueue.IsReady(this, out observedSequenceNumber) && - SocketPal.TryCompleteReceiveFrom(_socket, buffer, flags, socketAddress, ref socketAddressLen, out bytesReceived, out receivedFlags, out errorCode)) + (SocketPal.TryCompleteReceiveFrom(_socket, buffer, flags, socketAddress, ref socketAddressLen, out bytesReceived, out receivedFlags, out errorCode) || + !ShouldRetrySyncOperation(out errorCode))) { flags = receivedFlags; return errorCode; @@ -1370,7 +1516,8 @@ namespace System.Net.Sockets SocketError errorCode; int observedSequenceNumber; if (_receiveQueue.IsReady(this, out observedSequenceNumber) && - SocketPal.TryCompleteReceiveFrom(_socket, buffers, flags, socketAddress, ref socketAddressLen, out bytesReceived, out receivedFlags, out errorCode)) + (SocketPal.TryCompleteReceiveFrom(_socket, buffers, flags, socketAddress, ref socketAddressLen, out bytesReceived, out receivedFlags, out errorCode) || + !ShouldRetrySyncOperation(out errorCode))) { flags = receivedFlags; return errorCode; @@ -1437,7 +1584,8 @@ namespace System.Net.Sockets SocketError errorCode; int observedSequenceNumber; if (_receiveQueue.IsReady(this, out observedSequenceNumber) && - SocketPal.TryCompleteReceiveMessageFrom(_socket, buffer.Span, buffers, flags, socketAddress, ref socketAddressLen, isIPv4, isIPv6, out bytesReceived, out receivedFlags, out ipPacketInformation, out errorCode)) + (SocketPal.TryCompleteReceiveMessageFrom(_socket, buffer.Span, buffers, flags, socketAddress, ref socketAddressLen, isIPv4, isIPv6, out bytesReceived, out receivedFlags, out ipPacketInformation, out errorCode) || + !ShouldRetrySyncOperation(out errorCode))) { flags = receivedFlags; return errorCode; @@ -1524,7 +1672,8 @@ namespace System.Net.Sockets SocketError errorCode; int observedSequenceNumber; if (_sendQueue.IsReady(this, out observedSequenceNumber) && - SocketPal.TryCompleteSendTo(_socket, buffer, ref offset, ref count, flags, socketAddress, socketAddressLen, ref bytesSent, out errorCode)) + (SocketPal.TryCompleteSendTo(_socket, buffer, ref offset, ref count, flags, socketAddress, socketAddressLen, ref bytesSent, out errorCode) || + !ShouldRetrySyncOperation(out errorCode))) { return errorCode; } @@ -1555,7 +1704,8 @@ namespace System.Net.Sockets int bufferIndexIgnored = 0, offset = 0, count = buffer.Length; int observedSequenceNumber; if (_sendQueue.IsReady(this, out observedSequenceNumber) && - SocketPal.TryCompleteSendTo(_socket, buffer, null, ref bufferIndexIgnored, ref offset, ref count, flags, socketAddress, socketAddressLen, ref bytesSent, out errorCode)) + (SocketPal.TryCompleteSendTo(_socket, buffer, null, ref bufferIndexIgnored, ref offset, ref count, flags, socketAddress, socketAddressLen, ref bytesSent, out errorCode) || + !ShouldRetrySyncOperation(out errorCode))) { return errorCode; } @@ -1636,7 +1786,8 @@ namespace System.Net.Sockets SocketError errorCode; int observedSequenceNumber; if (_sendQueue.IsReady(this, out observedSequenceNumber) && - SocketPal.TryCompleteSendTo(_socket, buffers, ref bufferIndex, ref offset, flags, socketAddress, socketAddressLen, ref bytesSent, out errorCode)) + (SocketPal.TryCompleteSendTo(_socket, buffers, ref bufferIndex, ref offset, flags, socketAddress, socketAddressLen, ref bytesSent, out errorCode) || + !ShouldRetrySyncOperation(out errorCode))) { return errorCode; } @@ -1703,7 +1854,8 @@ namespace System.Net.Sockets SocketError errorCode; int observedSequenceNumber; if (_sendQueue.IsReady(this, out observedSequenceNumber) && - SocketPal.TryCompleteSendFile(_socket, fileHandle, ref offset, ref count, ref bytesSent, out errorCode)) + (SocketPal.TryCompleteSendFile(_socket, fileHandle, ref offset, ref count, ref bytesSent, out errorCode) || + !ShouldRetrySyncOperation(out errorCode))) { return errorCode; } diff --git a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEngine.Unix.cs b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEngine.Unix.cs index 39b503551e..b270ff7c77 100644 --- a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEngine.Unix.cs +++ b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEngine.Unix.cs @@ -286,11 +286,21 @@ namespace System.Net.Sockets // // Start the event loop on its own thread. // - Task.Factory.StartNew( - EventLoop, - CancellationToken.None, - TaskCreationOptions.LongRunning, - TaskScheduler.Default); + bool suppressFlow = !ExecutionContext.IsFlowSuppressed(); + try + { + if (suppressFlow) ExecutionContext.SuppressFlow(); + Task.Factory.StartNew( + s => ((SocketAsyncEngine)s).EventLoop(), + this, + CancellationToken.None, + TaskCreationOptions.LongRunning, + TaskScheduler.Default); + } + finally + { + if (suppressFlow) ExecutionContext.RestoreFlow(); + } } catch { diff --git a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs index 7bcabcfba4..3ba8debc31 100644 --- a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs +++ b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs @@ -5,6 +5,7 @@ using System.Buffers; using System.Diagnostics; using System.IO; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Threading; @@ -40,13 +41,27 @@ namespace System.Net.Sockets // Overlapped object related variables. private PreAllocatedOverlapped _preAllocatedOverlapped; + private readonly StrongBox _strongThisRef = new StrongBox(); // state for _preAllocatedOverlapped; .Value set to this while operations in flight private PinState _pinState; private enum PinState : byte { None = 0, MultipleBuffer, SendPackets } private void InitializeInternals() { - _preAllocatedOverlapped = new PreAllocatedOverlapped(s_completionPortCallback, this, null); + // PreAllocatedOverlapped captures ExecutionContext, but SocketAsyncEventArgs ensures + // that context is properly flowed if necessary, and thus we don't need the overlapped + // infrastructure capturing and flowing as well. + bool suppressFlow = !ExecutionContext.IsFlowSuppressed(); + try + { + if (suppressFlow) ExecutionContext.SuppressFlow(); + _preAllocatedOverlapped = new PreAllocatedOverlapped(s_completionPortCallback, _strongThisRef, null); + } + finally + { + if (suppressFlow) ExecutionContext.RestoreFlow(); + } + if (NetEventSource.IsEnabled) NetEventSource.Info(this, $"new PreAllocatedOverlapped {_preAllocatedOverlapped}"); } @@ -58,9 +73,9 @@ namespace System.Net.Sockets private unsafe NativeOverlapped* AllocateNativeOverlapped() { + Debug.Assert(_operating == InProgress, $"Expected {nameof(_operating)} == {nameof(InProgress)}, got {_operating}"); Debug.Assert(_currentSocket != null, "_currentSocket is null"); Debug.Assert(_currentSocket.SafeHandle != null, "_currentSocket.SafeHandle is null"); - Debug.Assert(!_currentSocket.SafeHandle.IsInvalid, "_currentSocket.SafeHandle is invalid"); Debug.Assert(_preAllocatedOverlapped != null, "_preAllocatedOverlapped is null"); ThreadPoolBoundHandle boundHandle = _currentSocket.GetOrAllocateThreadPoolBoundHandle(); @@ -70,6 +85,7 @@ namespace System.Net.Sockets private unsafe void FreeNativeOverlapped(NativeOverlapped* overlapped) { Debug.Assert(overlapped != null, "overlapped is null"); + Debug.Assert(_operating == InProgress, $"Expected _operating == InProgress, got {_operating}"); Debug.Assert(_currentSocket != null, "_currentSocket is null"); Debug.Assert(_currentSocket.SafeHandle != null, "_currentSocket.SafeHandle is null"); Debug.Assert(_currentSocket.SafeHandle.IOCPBoundHandle != null, "_currentSocket.SafeHandle.IOCPBoundHandle is null"); @@ -78,16 +94,25 @@ namespace System.Net.Sockets _currentSocket.SafeHandle.IOCPBoundHandle.FreeNativeOverlapped(overlapped); } - private unsafe void FreeNativeOverlappedIfNotPending(NativeOverlapped* overlapped, SocketError error) + partial void StartOperationCommonCore() { - if (error != SocketError.IOPending) - { - FreeNativeOverlapped(overlapped); - } + // Store the reference to this instance so that it's kept alive by the preallocated + // overlapped during the asynchronous operation and so that it's available in the + // I/O completion callback. Once the operation completes, we null this out so + // that the SocketAsyncEventArgs instance isn't kept alive unnecessarily. + _strongThisRef.Value = this; } - private SocketError ProcessIOCPResult(bool success, int bytesTransferred) + /// Handles the result of an IOCP operation. + /// true if the operation completed synchronously and successfully; otherwise, false. + /// The number of bytes transferred, if the operation completed synchronously and successfully. + /// The overlapped to be freed if the operation completed synchronously. + /// The result status of the operation. + private unsafe SocketError ProcessIOCPResult(bool success, int bytesTransferred, NativeOverlapped* overlapped) { + // Note: We need to dispose of the overlapped iff the operation completed synchronously, + // and if we do, we must do so before we mark the operation as completed. + if (success) { // Synchronous success. @@ -95,6 +120,7 @@ namespace System.Net.Sockets { // The socket handle is configured to skip completion on success, // so we can set the results right now. + FreeNativeOverlapped(overlapped); FinishOperationSyncSuccess(bytesTransferred, SocketFlags.None); return SocketError.Success; } @@ -109,6 +135,7 @@ namespace System.Net.Sockets if (socketError != SocketError.IOPending) { // Completed synchronously with a failure. + FreeNativeOverlapped(overlapped); FinishOperationSyncFailure(socketError, bytesTransferred, SocketFlags.None); return socketError; } @@ -121,8 +148,16 @@ namespace System.Net.Sockets return SocketError.IOPending; } - private SocketError ProcessIOCPResultWithSingleBufferHandle(SocketError socketError, int bytesTransferred) + /// Handles the result of an IOCP operation. + /// The result status of the operation, as returned from the API call. + /// The number of bytes transferred, if the operation completed synchronously and successfully. + /// The overlapped to be freed if the operation completed synchronously. + /// The result status of the operation. + private unsafe SocketError ProcessIOCPResultWithSingleBufferHandle(SocketError socketError, int bytesTransferred, NativeOverlapped* overlapped) { + // Note: We need to dispose of the overlapped iff the operation completed synchronously, + // and if we do, we must do so before we mark the operation as completed. + if (socketError == SocketError.Success) { // Synchronous success. @@ -131,6 +166,7 @@ namespace System.Net.Sockets // The socket handle is configured to skip completion on success, // so we can set the results right now. _singleBufferHandleState = SingleBufferHandleState.None; + FreeNativeOverlapped(overlapped); FinishOperationSyncSuccess(bytesTransferred, SocketFlags.None); return SocketError.Success; } @@ -146,6 +182,7 @@ namespace System.Net.Sockets { // Completed synchronously with a failure. _singleBufferHandleState = SingleBufferHandleState.None; + FreeNativeOverlapped(overlapped); FinishOperationSyncFailure(socketError, bytesTransferred, SocketFlags.None); return socketError; } @@ -157,7 +194,7 @@ namespace System.Net.Sockets // Return pending and we will continue in the completion port callback. if (_singleBufferHandleState == SingleBufferHandleState.InProcess) { - _singleBufferHandle = _buffer.Retain(pin: true); + _singleBufferHandle = _buffer.Pin(); _singleBufferHandleState = SingleBufferHandleState.Set; } return SocketError.IOPending; @@ -165,15 +202,15 @@ namespace System.Net.Sockets internal unsafe SocketError DoOperationAccept(Socket socket, SafeCloseSocket handle, SafeCloseSocket acceptHandle) { - SocketError socketError = SocketError.Success; + bool userBuffer = _count != 0; + Debug.Assert(!userBuffer || (!_buffer.Equals(default) && _count >= _acceptAddressBufferCount)); + Memory buffer = userBuffer ? _buffer : _acceptBuffer; + Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.None); + NativeOverlapped* overlapped = AllocateNativeOverlapped(); try { - bool userBuffer = _count != 0; - Debug.Assert(!userBuffer || (!_buffer.Equals(default) && _count >= _acceptAddressBufferCount)); - Memory buffer = userBuffer ? _buffer : _acceptBuffer; - Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.None); - _singleBufferHandle = buffer.Retain(pin: true); + _singleBufferHandle = buffer.Pin(); _singleBufferHandleState = SingleBufferHandleState.Set; bool success = socket.AcceptEx( @@ -186,19 +223,15 @@ namespace System.Net.Sockets out int bytesTransferred, overlapped); - socketError = ProcessIOCPResult(success, bytesTransferred); - return socketError; + return ProcessIOCPResult(success, bytesTransferred, overlapped); } catch { + FreeNativeOverlapped(overlapped); _singleBufferHandle.Dispose(); _singleBufferHandleState = SingleBufferHandleState.None; throw; } - finally - { - FreeNativeOverlappedIfNotPending(overlapped, socketError); - } } internal unsafe SocketError DoOperationConnect(Socket socket, SafeCloseSocket handle) @@ -208,12 +241,11 @@ namespace System.Net.Sockets // The sockaddr is pinned with a GCHandle to avoid having to use the object array form of UnsafePack. PinSocketAddressBuffer(); - SocketError socketError = SocketError.Success; NativeOverlapped* overlapped = AllocateNativeOverlapped(); try { Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.None); - _singleBufferHandle = _buffer.Retain(pin: true); + _singleBufferHandle = _buffer.Pin(); _singleBufferHandleState = SingleBufferHandleState.Set; bool success = socket.ConnectEx( @@ -225,24 +257,19 @@ namespace System.Net.Sockets out int bytesTransferred, overlapped); - socketError = ProcessIOCPResult(success, bytesTransferred); - return socketError; + return ProcessIOCPResult(success, bytesTransferred, overlapped); } catch { + FreeNativeOverlapped(overlapped); _singleBufferHandle.Dispose(); _singleBufferHandleState = SingleBufferHandleState.None; throw; } - finally - { - FreeNativeOverlappedIfNotPending(overlapped, socketError); - } } internal unsafe SocketError DoOperationDisconnect(Socket socket, SafeCloseSocket handle) { - SocketError socketError = SocketError.Success; NativeOverlapped* overlapped = AllocateNativeOverlapped(); try { @@ -252,12 +279,12 @@ namespace System.Net.Sockets (int)(DisconnectReuseSocket ? TransmitFileOptions.ReuseSocket : 0), 0); - socketError = ProcessIOCPResult(success, 0); - return socketError; + return ProcessIOCPResult(success, 0, overlapped); } - finally + catch { - FreeNativeOverlappedIfNotPending(overlapped, socketError); + FreeNativeOverlapped(overlapped); + throw; } } @@ -267,18 +294,17 @@ namespace System.Net.Sockets internal unsafe SocketError DoOperationReceiveSingleBuffer(SafeCloseSocket handle) { - SocketError socketError = SocketError.Success; - NativeOverlapped* overlapped = AllocateNativeOverlapped(); - try + fixed (byte* bufferPtr = &MemoryMarshal.GetReference(_buffer.Span)) { - fixed (byte* bufferPtr = &MemoryMarshal.GetReference(_buffer.Span)) - { - Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.None, $"Expected None, got {_singleBufferHandleState}"); - _singleBufferHandleState = SingleBufferHandleState.InProcess; - var wsaBuffer = new WSABuffer { Length = _count, Pointer = (IntPtr)(bufferPtr + _offset) }; - SocketFlags flags = _socketFlags; + Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.None, $"Expected None, got {_singleBufferHandleState}"); + _singleBufferHandleState = SingleBufferHandleState.InProcess; + var wsaBuffer = new WSABuffer { Length = _count, Pointer = (IntPtr)(bufferPtr + _offset) }; - socketError = Interop.Winsock.WSARecv( + NativeOverlapped* overlapped = AllocateNativeOverlapped(); + try + { + SocketFlags flags = _socketFlags; + SocketError socketError = Interop.Winsock.WSARecv( handle.DangerousGetHandle(), // to minimize chances of handle recycling from misuse, this should use DangerousAddRef/Release, but it adds too much overhead ref wsaBuffer, 1, @@ -288,29 +314,24 @@ namespace System.Net.Sockets IntPtr.Zero); GC.KeepAlive(handle); // small extra safe guard against handle getting collected/finalized while P/Invoke in progress - socketError = ProcessIOCPResultWithSingleBufferHandle(socketError, bytesTransferred); + return ProcessIOCPResultWithSingleBufferHandle(socketError, bytesTransferred, overlapped); + } + catch + { + FreeNativeOverlapped(overlapped); + _singleBufferHandleState = SingleBufferHandleState.None; + throw; } - return socketError; - } - catch - { - _singleBufferHandleState = SingleBufferHandleState.None; - throw; - } - finally - { - FreeNativeOverlappedIfNotPending(overlapped, socketError); } } internal unsafe SocketError DoOperationReceiveMultiBuffer(SafeCloseSocket handle) { - SocketError socketError = SocketError.Success; NativeOverlapped* overlapped = AllocateNativeOverlapped(); try { SocketFlags flags = _socketFlags; - socketError = Interop.Winsock.WSARecv( + SocketError socketError = Interop.Winsock.WSARecv( handle.DangerousGetHandle(), // to minimize chances of handle recycling from misuse, this should use DangerousAddRef/Release, but it adds too much overhead _wsaBufferArray, _bufferListInternal.Count, @@ -320,12 +341,12 @@ namespace System.Net.Sockets IntPtr.Zero); GC.KeepAlive(handle); // small extra safe guard against handle getting collected/finalized while P/Invoke in progress - socketError = ProcessIOCPResult(socketError == SocketError.Success, bytesTransferred); - return socketError; + return ProcessIOCPResult(socketError == SocketError.Success, bytesTransferred, overlapped); } - finally + catch { - FreeNativeOverlappedIfNotPending(overlapped, socketError); + FreeNativeOverlapped(overlapped); + throw; } } @@ -345,19 +366,17 @@ namespace System.Net.Sockets internal unsafe SocketError DoOperationReceiveFromSingleBuffer(SafeCloseSocket handle) { - - SocketError socketError = SocketError.Success; - NativeOverlapped* overlapped = AllocateNativeOverlapped(); - try + fixed (byte* bufferPtr = &MemoryMarshal.GetReference(_buffer.Span)) { - fixed (byte* bufferPtr = &MemoryMarshal.GetReference(_buffer.Span)) - { - Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.None); - _singleBufferHandleState = SingleBufferHandleState.InProcess; - var wsaBuffer = new WSABuffer { Length = _count, Pointer = (IntPtr)(bufferPtr + _offset) }; - SocketFlags flags = _socketFlags; + Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.None); + _singleBufferHandleState = SingleBufferHandleState.InProcess; + var wsaBuffer = new WSABuffer { Length = _count, Pointer = (IntPtr)(bufferPtr + _offset) }; - socketError = Interop.Winsock.WSARecvFrom( + NativeOverlapped* overlapped = AllocateNativeOverlapped(); + try + { + SocketFlags flags = _socketFlags; + SocketError socketError = Interop.Winsock.WSARecvFrom( handle.DangerousGetHandle(), // to minimize chances of handle recycling from misuse, this should use DangerousAddRef/Release, but it adds too much overhead ref wsaBuffer, 1, @@ -369,30 +388,24 @@ namespace System.Net.Sockets IntPtr.Zero); GC.KeepAlive(handle); // small extra safe guard against handle getting collected/finalized while P/Invoke in progress - socketError = ProcessIOCPResultWithSingleBufferHandle(socketError, bytesTransferred); - return socketError; + return ProcessIOCPResultWithSingleBufferHandle(socketError, bytesTransferred, overlapped); + } + catch + { + FreeNativeOverlapped(overlapped); + _singleBufferHandleState = SingleBufferHandleState.None; + throw; } - } - catch - { - _singleBufferHandleState = SingleBufferHandleState.None; - throw; - } - finally - { - FreeNativeOverlappedIfNotPending(overlapped, socketError); } } internal unsafe SocketError DoOperationReceiveFromMultiBuffer(SafeCloseSocket handle) { - - SocketError socketError = SocketError.Success; NativeOverlapped* overlapped = AllocateNativeOverlapped(); try { SocketFlags flags = _socketFlags; - socketError = Interop.Winsock.WSARecvFrom( + SocketError socketError = Interop.Winsock.WSARecvFrom( handle.DangerousGetHandle(), // to minimize chances of handle recycling from misuse, this should use DangerousAddRef/Release, but it adds too much overhead _wsaBufferArray, _bufferListInternal.Count, @@ -404,12 +417,12 @@ namespace System.Net.Sockets IntPtr.Zero); GC.KeepAlive(handle); // small extra safe guard against handle getting collected/finalized while P/Invoke in progress - socketError = ProcessIOCPResult(socketError == SocketError.Success, bytesTransferred); - return socketError; + return ProcessIOCPResult(socketError == SocketError.Success, bytesTransferred, overlapped); } - finally + catch { - FreeNativeOverlappedIfNotPending(overlapped, socketError); + FreeNativeOverlapped(overlapped); + throw; } } @@ -470,7 +483,7 @@ namespace System.Net.Sockets } Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.None); - _singleBufferHandle = _buffer.Retain(pin: true); + _singleBufferHandle = _buffer.Pin(); _singleBufferHandleState = SingleBufferHandleState.Set; _wsaRecvMsgWSABufferArray[0].Pointer = (IntPtr)_singleBufferHandle.Pointer; @@ -522,30 +535,25 @@ namespace System.Net.Sockets pMessage->flags = _socketFlags; } - SocketError socketError = SocketError.Success; NativeOverlapped* overlapped = AllocateNativeOverlapped(); try { - socketError = socket.WSARecvMsg( + SocketError socketError = socket.WSARecvMsg( handle, Marshal.UnsafeAddrOfPinnedArrayElement(_wsaMessageBuffer, 0), out int bytesTransferred, overlapped, IntPtr.Zero); - socketError = ProcessIOCPResultWithSingleBufferHandle(socketError, bytesTransferred); - return socketError; + return ProcessIOCPResultWithSingleBufferHandle(socketError, bytesTransferred, overlapped); } catch { + FreeNativeOverlapped(overlapped); _singleBufferHandle.Dispose(); _singleBufferHandleState = SingleBufferHandleState.None; throw; } - finally - { - FreeNativeOverlappedIfNotPending(overlapped, socketError); - } } internal unsafe SocketError DoOperationSend(SafeCloseSocket handle) => _bufferList == null ? @@ -554,17 +562,16 @@ namespace System.Net.Sockets internal unsafe SocketError DoOperationSendSingleBuffer(SafeCloseSocket handle) { - SocketError socketError = SocketError.Success; - NativeOverlapped* overlapped = AllocateNativeOverlapped(); - try + fixed (byte* bufferPtr = &MemoryMarshal.GetReference(_buffer.Span)) { - fixed (byte* bufferPtr = &MemoryMarshal.GetReference(_buffer.Span)) - { - Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.None); - _singleBufferHandleState = SingleBufferHandleState.InProcess; - var wsaBuffer = new WSABuffer { Length = _count, Pointer = (IntPtr)(bufferPtr + _offset) }; + Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.None); + _singleBufferHandleState = SingleBufferHandleState.InProcess; + var wsaBuffer = new WSABuffer { Length = _count, Pointer = (IntPtr)(bufferPtr + _offset) }; - socketError = Interop.Winsock.WSASend( + NativeOverlapped* overlapped = AllocateNativeOverlapped(); + try + { + SocketError socketError = Interop.Winsock.WSASend( handle.DangerousGetHandle(), // to minimize chances of handle recycling from misuse, this should use DangerousAddRef/Release, but it adds too much overhead ref wsaBuffer, 1, @@ -574,28 +581,23 @@ namespace System.Net.Sockets IntPtr.Zero); GC.KeepAlive(handle); // small extra safe guard against handle getting collected/finalized while P/Invoke in progress - socketError = ProcessIOCPResultWithSingleBufferHandle(socketError, bytesTransferred); - return socketError; + return ProcessIOCPResultWithSingleBufferHandle(socketError, bytesTransferred, overlapped); + } + catch + { + FreeNativeOverlapped(overlapped); + _singleBufferHandleState = SingleBufferHandleState.None; + throw; } - } - catch - { - _singleBufferHandleState = SingleBufferHandleState.None; - throw; - } - finally - { - FreeNativeOverlappedIfNotPending(overlapped, socketError); } } internal unsafe SocketError DoOperationSendMultiBuffer(SafeCloseSocket handle) { - SocketError socketError = SocketError.Success; NativeOverlapped* overlapped = AllocateNativeOverlapped(); try { - socketError = Interop.Winsock.WSASend( + SocketError socketError = Interop.Winsock.WSASend( handle.DangerousGetHandle(), // to minimize chances of handle recycling from misuse, this should use DangerousAddRef/Release, but it adds too much overhead _wsaBufferArray, _bufferListInternal.Count, @@ -605,12 +607,12 @@ namespace System.Net.Sockets IntPtr.Zero); GC.KeepAlive(handle); // small extra safe guard against handle getting collected/finalized while P/Invoke in progress - socketError = ProcessIOCPResult(socketError == SocketError.Success, bytesTransferred); - return socketError; + return ProcessIOCPResult(socketError == SocketError.Success, bytesTransferred, overlapped); } - finally + catch { - FreeNativeOverlappedIfNotPending(overlapped, socketError); + FreeNativeOverlapped(overlapped); + throw; } } @@ -697,7 +699,6 @@ namespace System.Net.Sockets Debug.Assert(_multipleBufferGCHandles[0].IsAllocated); Debug.Assert(_multipleBufferGCHandles[0].Target == sendPacketsDescriptor); - SocketError socketError = SocketError.Success; NativeOverlapped* overlapped = AllocateNativeOverlapped(); try { @@ -709,12 +710,12 @@ namespace System.Net.Sockets overlapped, _sendPacketsFlags); - socketError = ProcessIOCPResult(result, 0); - return socketError; + return ProcessIOCPResult(result, 0, overlapped); } - finally + catch { - FreeNativeOverlappedIfNotPending(overlapped, socketError); + FreeNativeOverlapped(overlapped); + throw; } } @@ -735,17 +736,16 @@ namespace System.Net.Sockets internal unsafe SocketError DoOperationSendToSingleBuffer(SafeCloseSocket handle) { - SocketError socketError = SocketError.Success; - NativeOverlapped* overlapped = AllocateNativeOverlapped(); - try + fixed (byte* bufferPtr = &MemoryMarshal.GetReference(_buffer.Span)) { - fixed (byte* bufferPtr = &MemoryMarshal.GetReference(_buffer.Span)) - { - Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.None); - _singleBufferHandleState = SingleBufferHandleState.InProcess; - var wsaBuffer = new WSABuffer { Length = _count, Pointer = (IntPtr)(bufferPtr + _offset) }; + Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.None); + _singleBufferHandleState = SingleBufferHandleState.InProcess; + var wsaBuffer = new WSABuffer { Length = _count, Pointer = (IntPtr)(bufferPtr + _offset) }; - socketError = Interop.Winsock.WSASendTo( + NativeOverlapped* overlapped = AllocateNativeOverlapped(); + try + { + SocketError socketError = Interop.Winsock.WSASendTo( handle.DangerousGetHandle(), // to minimize chances of handle recycling from misuse, this should use DangerousAddRef/Release, but it adds too much overhead ref wsaBuffer, 1, @@ -757,28 +757,23 @@ namespace System.Net.Sockets IntPtr.Zero); GC.KeepAlive(handle); // small extra safe guard against handle getting collected/finalized while P/Invoke in progress - socketError = ProcessIOCPResultWithSingleBufferHandle(socketError, bytesTransferred); - return socketError; + return ProcessIOCPResultWithSingleBufferHandle(socketError, bytesTransferred, overlapped); + } + catch + { + FreeNativeOverlapped(overlapped); + _singleBufferHandleState = SingleBufferHandleState.None; + throw; } - } - catch - { - _singleBufferHandleState = SingleBufferHandleState.None; - throw; - } - finally - { - FreeNativeOverlappedIfNotPending(overlapped, socketError); } } internal unsafe SocketError DoOperationSendToMultiBuffer(SafeCloseSocket handle) { - SocketError socketError = SocketError.Success; NativeOverlapped* overlapped = AllocateNativeOverlapped(); try { - socketError = Interop.Winsock.WSASendTo( + SocketError socketError = Interop.Winsock.WSASendTo( handle.DangerousGetHandle(), // to minimize chances of handle recycling from misuse, this should use DangerousAddRef/Release, but it adds too much overhead _wsaBufferArray, _bufferListInternal.Count, @@ -790,12 +785,12 @@ namespace System.Net.Sockets IntPtr.Zero); GC.KeepAlive(handle); // small extra safe guard against handle getting collected/finalized while P/Invoke in progress - socketError = ProcessIOCPResult(socketError == SocketError.Success, bytesTransferred); - return socketError; + return ProcessIOCPResult(socketError == SocketError.Success, bytesTransferred, overlapped); } - finally + catch { - FreeNativeOverlappedIfNotPending(overlapped, socketError); + FreeNativeOverlapped(overlapped); + throw; } } @@ -1069,7 +1064,6 @@ namespace System.Net.Sockets try { Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.Set); - Debug.Assert(_singleBufferHandle.HasPointer); bool userBuffer = _count >= _acceptAddressBufferCount; _currentSocket.GetAcceptExSockaddrs( @@ -1132,6 +1126,7 @@ namespace System.Net.Sockets private void CompleteCore() { + _strongThisRef.Value = null; // null out this reference from the overlapped so this isn't kept alive artificially if (_singleBufferHandleState != SingleBufferHandleState.None) { CompleteCoreSpin(); @@ -1190,7 +1185,10 @@ namespace System.Net.Sockets private static readonly unsafe IOCompletionCallback s_completionPortCallback = delegate (uint errorCode, uint numBytes, NativeOverlapped* nativeOverlapped) { - var saea = (SocketAsyncEventArgs)ThreadPoolBoundHandle.GetNativeOverlappedState(nativeOverlapped); + var saeaBox = (StrongBox)ThreadPoolBoundHandle.GetNativeOverlappedState(nativeOverlapped); + SocketAsyncEventArgs saea = saeaBox.Value; + Debug.Assert(saea != null); + if ((SocketError)errorCode == SocketError.Success) { saea.FreeNativeOverlapped(nativeOverlapped); diff --git a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.cs b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.cs index 97257b02ff..4c7c12d5c8 100644 --- a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.cs +++ b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Diagnostics; +using System.Runtime.InteropServices; using System.Threading; namespace System.Net.Sockets @@ -70,6 +71,7 @@ namespace System.Net.Sockets internal Internals.SocketAddress _socketAddress; // Misc state variables. + private readonly bool _flowExecutionContext; private ExecutionContext _context; private static readonly ContextCallback s_executionCallback = ExecutionCallback; private Socket _currentSocket; @@ -84,8 +86,18 @@ namespace System.Net.Sockets private MultipleConnectAsync _multipleConnect; - public SocketAsyncEventArgs() + public SocketAsyncEventArgs() : this(flowExecutionContext: true) { + } + + /// Initialize the SocketAsyncEventArgs + /// + /// Whether to capture and flow ExecutionContext. ExecutionContext flow should only + /// be disabled if it's going to be handled by higher layers. + /// + internal SocketAsyncEventArgs(bool flowExecutionContext) + { + _flowExecutionContext = flowExecutionContext; InitializeInternals(); } @@ -106,7 +118,7 @@ namespace System.Net.Sockets { if (_bufferIsExplicitArray) { - bool success = _buffer.TryGetArray(out ArraySegment arraySegment); + bool success = MemoryMarshal.TryGetArray(_buffer, out ArraySegment arraySegment); Debug.Assert(success); return arraySegment.Array; } @@ -519,13 +531,17 @@ namespace System.Net.Sockets _context = null; } - // Capture execution context if none already. - if (_context == null) + // Capture execution context if necessary. + if (_flowExecutionContext && _context == null) { _context = ExecutionContext.Capture(); } + + StartOperationCommonCore(); } + partial void StartOperationCommonCore(); + internal void StartOperationAccept() { // AcceptEx needs a single buffer that's the size of two native sockaddr buffers with 16 diff --git a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs index 3367ac0259..da0bab6b1b 100644 --- a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs +++ b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs @@ -47,7 +47,7 @@ namespace System.Net.Sockets return default(IPPacketInformation); } - Interop.Sys.IPPacketInformation nativePacketInfo; + Interop.Sys.IPPacketInformation nativePacketInfo = default; if (!Interop.Sys.TryGetIPPacketInformation(messageHeader, isIPv4, &nativePacketInfo)) { return default(IPPacketInformation); @@ -65,7 +65,7 @@ namespace System.Net.Sockets { Debug.Assert(socketAddress != null || socketAddressLen == 0, $"Unexpected values: socketAddress={socketAddress}, socketAddressLen={socketAddressLen}"); - long received; + long received = 0; int sockAddrLen = socketAddress != null ? socketAddressLen : 0; fixed (byte* sockAddr = socketAddress) @@ -123,7 +123,7 @@ namespace System.Net.Sockets IOVectorCount = 1 }; - long bytesSent; + long bytesSent = 0; errno = Interop.Sys.SendMessage( socket.DangerousGetHandle(), // to minimize chances of handle recycling from misuse, this should use DangerousAddRef/Release, but it adds too much overhead &messageHeader, @@ -186,7 +186,7 @@ namespace System.Net.Sockets IOVectorCount = iovCount }; - long bytesSent; + long bytesSent = 0; errno = Interop.Sys.SendMessage( socket.DangerousGetHandle(), // to minimize chances of handle recycling from misuse, this should use DangerousAddRef/Release, but it adds too much overhead &messageHeader, @@ -244,7 +244,7 @@ namespace System.Net.Sockets private static unsafe int Receive(SafeCloseSocket socket, SocketFlags flags, IList> buffers, byte[] socketAddress, ref int socketAddressLen, out SocketFlags receivedFlags, out Interop.Error errno) { - int available; + int available = 0; errno = Interop.Sys.GetBytesAvailable(socket, &available); if (errno != Interop.Error.SUCCESS) { @@ -353,7 +353,7 @@ namespace System.Net.Sockets Interop.Sys.MessageHeader messageHeader; - long received; + long received = 0; fixed (byte* rawSocketAddress = socketAddress) fixed (byte* b = &MemoryMarshal.GetReference(buffer)) { @@ -432,7 +432,7 @@ namespace System.Net.Sockets ControlBufferLen = cmsgBufferLen }; - long received; + long received = 0; errno = Interop.Sys.ReceiveMessage( socket.DangerousGetHandle(), // to minimize chances of handle recycling from misuse, this should use DangerousAddRef/Release, but it adds too much overhead &messageHeader, @@ -470,7 +470,7 @@ namespace System.Net.Sockets public static unsafe bool TryCompleteAccept(SafeCloseSocket socket, byte[] socketAddress, ref int socketAddressLen, out IntPtr acceptedFd, out SocketError errorCode) { - IntPtr fd; + IntPtr fd = IntPtr.Zero; Interop.Error errno; int sockAddrLen = socketAddressLen; fixed (byte* rawSocketAddress = socketAddress) @@ -545,7 +545,7 @@ namespace System.Net.Sockets public static unsafe bool TryCompleteConnect(SafeCloseSocket socket, int socketAddressLen, out SocketError errorCode) { - Interop.Error socketError; + Interop.Error socketError = default; Interop.Error err; try { @@ -864,7 +864,7 @@ namespace System.Net.Sockets { if (!handle.IsNonBlocking) { - return handle.AsyncContext.Connect(socketAddress, socketAddressLen, -1); + return handle.AsyncContext.Connect(socketAddress, socketAddressLen); } SocketError errorCode; @@ -1097,17 +1097,15 @@ namespace System.Net.Sockets { if (optionName == SocketOptionName.ReceiveTimeout) { - // Note, setting a non-infinite timeout will force the handle into nonblocking mode handle.ReceiveTimeout = optionValue == 0 ? -1 : optionValue; - handle.TrackOption(optionLevel, optionName); - return SocketError.Success; + err = Interop.Sys.SetReceiveTimeout(handle, optionValue); + return GetErrorAndTrackSetting(handle, optionLevel, optionName, err); } else if (optionName == SocketOptionName.SendTimeout) { - // Note, setting a non-infinite timeout will force the handle into nonblocking mode handle.SendTimeout = optionValue == 0 ? -1 : optionValue; - handle.TrackOption(optionLevel, optionName); - return SocketError.Success; + err = Interop.Sys.SetSendTimeout(handle, optionValue); + return GetErrorAndTrackSetting(handle, optionLevel, optionName, err); } } else if (optionLevel == SocketOptionLevel.IP) @@ -1307,7 +1305,7 @@ namespace System.Net.Sockets Interop.Sys.MulticastOption.MULTICAST_ADD : Interop.Sys.MulticastOption.MULTICAST_DROP; - Interop.Sys.IPv4MulticastOption opt; + Interop.Sys.IPv4MulticastOption opt = default; Interop.Error err = Interop.Sys.GetIPv4MulticastOption(handle, optName, &opt); if (err != Interop.Error.SUCCESS) { @@ -1332,7 +1330,7 @@ namespace System.Net.Sockets Interop.Sys.MulticastOption.MULTICAST_ADD : Interop.Sys.MulticastOption.MULTICAST_DROP; - Interop.Sys.IPv6MulticastOption opt; + Interop.Sys.IPv6MulticastOption opt = default; Interop.Error err = Interop.Sys.GetIPv6MulticastOption(handle, optName, &opt); if (err != Interop.Error.SUCCESS) { diff --git a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketTaskExtensions.cs b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketTaskExtensions.cs index 7407206222..e32adfba41 100644 --- a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketTaskExtensions.cs +++ b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/SocketTaskExtensions.cs @@ -36,9 +36,9 @@ namespace System.Net.Sockets socket.ReceiveMessageFromAsync(buffer, socketFlags, remoteEndPoint); public static Task SendAsync(this Socket socket, ArraySegment buffer, SocketFlags socketFlags) => - socket.SendAsync(buffer, socketFlags, fromNetworkStream: false); + socket.SendAsync(buffer, socketFlags); public static ValueTask SendAsync(this Socket socket, ReadOnlyMemory buffer, SocketFlags socketFlags, CancellationToken cancellationToken = default) => - socket.SendAsync(buffer, socketFlags, fromNetworkStream: false, cancellationToken: cancellationToken); + socket.SendAsync(buffer, socketFlags, cancellationToken); public static Task SendAsync(this Socket socket, IList> buffers, SocketFlags socketFlags) => socket.SendAsync(buffers, socketFlags); public static Task SendToAsync(this Socket socket, ArraySegment buffer, SocketFlags socketFlags, EndPoint remoteEP) => diff --git a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/TCPListener.cs b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/TCPListener.cs index e761e80051..9bb3834591 100644 --- a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/TCPListener.cs +++ b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/TCPListener.cs @@ -316,8 +316,18 @@ namespace System.Net.Sockets throw new ArgumentOutOfRangeException(nameof(port)); } - TcpListener listener = new TcpListener(IPAddress.IPv6Any, port); - listener.Server.DualMode = true; + TcpListener listener; + if (Socket.OSSupportsIPv6) + { + // If OS supports IPv6 use dual mode so both address families work. + listener = new TcpListener(IPAddress.IPv6Any, port); + listener.Server.DualMode = true; + } + else + { + // If not, fall-back to old IPv4. + listener = new TcpListener(IPAddress.Any , port); + } if (NetEventSource.IsEnabled) NetEventSource.Exit(null, port); diff --git a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/UDPClient.cs b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/UDPClient.cs index b8746d5654..326caaf921 100644 --- a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/UDPClient.cs +++ b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/UDPClient.cs @@ -60,7 +60,7 @@ namespace System.Net.Sockets // Validate the address family. if (family != AddressFamily.InterNetwork && family != AddressFamily.InterNetworkV6) { - throw new ArgumentException(SR.net_protocol_invalid_family, nameof(family)); + throw new ArgumentException(SR.Format(SR.net_protocol_invalid_family, "UDP"), nameof(family)); } IPEndPoint localEP; diff --git a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/UnixDomainSocketEndPoint.Unix.cs b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/UnixDomainSocketEndPoint.Unix.cs index 1dc982dce9..0fd3087b60 100644 --- a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/UnixDomainSocketEndPoint.Unix.cs +++ b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/UnixDomainSocketEndPoint.Unix.cs @@ -8,18 +8,12 @@ using System.Text; namespace System.Net.Sockets { /// Represents a Unix Domain Socket endpoint as a path. - public sealed class UnixDomainSocketEndPoint : EndPoint + public sealed partial class UnixDomainSocketEndPoint : EndPoint { - private const AddressFamily EndPointAddressFamily = AddressFamily.Unix; - - private static readonly Encoding s_pathEncoding = Encoding.UTF8; private static readonly int s_nativePathOffset; private static readonly int s_nativePathLength; private static readonly int s_nativeAddressSize; - private readonly string _path; - private readonly byte[] _encodedPath; - static UnixDomainSocketEndPoint() { Interop.Sys.GetDomainSocketSizes(out s_nativePathOffset, out s_nativePathLength, out s_nativeAddressSize); @@ -29,107 +23,7 @@ namespace System.Net.Sockets Debug.Assert(s_nativePathLength >= 92, "Expected max path length to be at least 92"); // per http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_un.h.html } - public UnixDomainSocketEndPoint(string path) - { - if (path == null) - { - throw new ArgumentNullException(nameof(path)); - } - - // Pathname socket addresses should be null-terminated. - // Linux abstract socket addresses start with a zero byte, they must not be null-terminated. - bool isAbstract = IsAbstract(path); - int bufferLength = s_pathEncoding.GetByteCount(path); - if (!isAbstract) - { - // for null terminator - bufferLength++; - } - - if (path.Length == 0 || bufferLength > s_nativePathLength) - { - throw new ArgumentOutOfRangeException( - nameof(path), path, - SR.Format(SR.ArgumentOutOfRange_PathLengthInvalid, path, s_nativePathLength)); - } - - _path = path; - _encodedPath = new byte[bufferLength]; - int bytesEncoded = s_pathEncoding.GetBytes(path, 0, path.Length, _encodedPath, 0); - Debug.Assert(bufferLength - (isAbstract ? 0 : 1) == bytesEncoded); - } - - internal UnixDomainSocketEndPoint(SocketAddress socketAddress) - { - if (socketAddress == null) - { - throw new ArgumentNullException(nameof(socketAddress)); - } - - if (socketAddress.Family != EndPointAddressFamily || - socketAddress.Size > s_nativeAddressSize) - { - throw new ArgumentOutOfRangeException(nameof(socketAddress)); - } - - if (socketAddress.Size > s_nativePathOffset) - { - _encodedPath = new byte[socketAddress.Size - s_nativePathOffset]; - for (int i = 0; i < _encodedPath.Length; i++) - { - _encodedPath[i] = socketAddress[s_nativePathOffset + i]; - } - - // Strip trailing null of pathname socket addresses. - int length = _encodedPath.Length; - if (!IsAbstract(_encodedPath)) - { - // Since this isn't an abstract path, we're sure our first byte isn't 0. - while (_encodedPath[length - 1] == 0) - { - length--; - } - } - _path = s_pathEncoding.GetString(_encodedPath, 0, length); - } - else - { - _encodedPath = Array.Empty(); - _path = string.Empty; - } - } - - public override SocketAddress Serialize() - { - var result = new SocketAddress(AddressFamily.Unix, s_nativePathOffset + _encodedPath.Length); - - for (int index = 0; index < _encodedPath.Length; index++) - { - result[s_nativePathOffset + index] = _encodedPath[index]; - } - - return result; - } - - public override EndPoint Create(SocketAddress socketAddress) => new UnixDomainSocketEndPoint(socketAddress); - - public override AddressFamily AddressFamily => EndPointAddressFamily; - - public override string ToString() - { - bool isAbstract = IsAbstract(_path); - if (isAbstract) - { - return "@" + _path.Substring(1); - } - else - { - return _path; - } - } - - private static bool IsAbstract(string path) => path.Length > 0 && path[0] == '\0'; - - private static bool IsAbstract(byte[] encodedPath) => encodedPath.Length > 0 && encodedPath[0] == 0; + private SocketAddress CreateSocketAddressForSerialize() => + new SocketAddress(AddressFamily.Unix, s_nativePathOffset + _encodedPath.Length); } } diff --git a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/UnixDomainSocketEndPoint.Windows.cs b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/UnixDomainSocketEndPoint.Windows.cs index 6a6c9925d9..c778247c2a 100644 --- a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/UnixDomainSocketEndPoint.Windows.cs +++ b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/UnixDomainSocketEndPoint.Windows.cs @@ -5,11 +5,22 @@ namespace System.Net.Sockets { /// Represents a Unix Domain Socket endpoint as a path. - public sealed class UnixDomainSocketEndPoint : EndPoint + public sealed partial class UnixDomainSocketEndPoint : EndPoint { - public UnixDomainSocketEndPoint(string path) - { - throw new PlatformNotSupportedException(); - } + private static readonly int s_nativePathOffset = 2; // sizeof(sun_family) + private static readonly int s_nativePathLength = 108; // sizeof(sun_path) + private static readonly int s_nativeAddressSize = s_nativePathOffset + s_nativePathLength; // sizeof(sockaddr_un) + + private SocketAddress CreateSocketAddressForSerialize() => + new SocketAddress(AddressFamily.Unix, s_nativeAddressSize); + + // from afunix.h: + //#define UNIX_PATH_MAX 108 + //typedef struct sockaddr_un + //{ + // ADDRESS_FAMILY sun_family; /* AF_UNIX */ + // char sun_path[UNIX_PATH_MAX]; /* pathname */ + //} + //SOCKADDR_UN, *PSOCKADDR_UN; } } diff --git a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/UnixDomainSocketEndPoint.cs b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/UnixDomainSocketEndPoint.cs new file mode 100644 index 0000000000..534df754d3 --- /dev/null +++ b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/UnixDomainSocketEndPoint.cs @@ -0,0 +1,140 @@ +// 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.Text; + +namespace System.Net.Sockets +{ + /// Represents a Unix Domain Socket endpoint as a path. + public sealed partial class UnixDomainSocketEndPoint : EndPoint + { + private const AddressFamily EndPointAddressFamily = AddressFamily.Unix; + + private static readonly Encoding s_pathEncoding = Encoding.UTF8; + private static readonly Lazy s_udsSupported = new Lazy(() => + { + try + { + new Socket(AddressFamily.Unix, SocketType.Stream, ProtocolType.Unspecified).Dispose(); + return true; + } + catch + { + return false; + } + }); + + private readonly string _path; + private readonly byte[] _encodedPath; + + public UnixDomainSocketEndPoint(string path) + { + if (path == null) + { + throw new ArgumentNullException(nameof(path)); + } + + // Pathname socket addresses should be null-terminated. + // Linux abstract socket addresses start with a zero byte, they must not be null-terminated. + bool isAbstract = IsAbstract(path); + int bufferLength = s_pathEncoding.GetByteCount(path); + if (!isAbstract) + { + // for null terminator + bufferLength++; + } + + if (path.Length == 0 || bufferLength > s_nativePathLength) + { + throw new ArgumentOutOfRangeException( + nameof(path), path, + SR.Format(SR.ArgumentOutOfRange_PathLengthInvalid, path, s_nativePathLength)); + } + + _path = path; + _encodedPath = new byte[bufferLength]; + int bytesEncoded = s_pathEncoding.GetBytes(path, 0, path.Length, _encodedPath, 0); + Debug.Assert(bufferLength - (isAbstract ? 0 : 1) == bytesEncoded); + + if (!s_udsSupported.Value) + { + throw new PlatformNotSupportedException(); + } + } + + internal UnixDomainSocketEndPoint(SocketAddress socketAddress) + { + if (socketAddress == null) + { + throw new ArgumentNullException(nameof(socketAddress)); + } + + if (socketAddress.Family != EndPointAddressFamily || + socketAddress.Size > s_nativeAddressSize) + { + throw new ArgumentOutOfRangeException(nameof(socketAddress)); + } + + if (socketAddress.Size > s_nativePathOffset) + { + _encodedPath = new byte[socketAddress.Size - s_nativePathOffset]; + for (int i = 0; i < _encodedPath.Length; i++) + { + _encodedPath[i] = socketAddress[s_nativePathOffset + i]; + } + + // Strip trailing null of pathname socket addresses. + int length = _encodedPath.Length; + if (!IsAbstract(_encodedPath)) + { + // Since this isn't an abstract path, we're sure our first byte isn't 0. + while (_encodedPath[length - 1] == 0) + { + length--; + } + } + _path = s_pathEncoding.GetString(_encodedPath, 0, length); + } + else + { + _encodedPath = Array.Empty(); + _path = string.Empty; + } + } + + public override SocketAddress Serialize() + { + SocketAddress result = CreateSocketAddressForSerialize(); + + for (int index = 0; index < _encodedPath.Length; index++) + { + result[s_nativePathOffset + index] = _encodedPath[index]; + } + + return result; + } + + public override EndPoint Create(SocketAddress socketAddress) => new UnixDomainSocketEndPoint(socketAddress); + + public override AddressFamily AddressFamily => EndPointAddressFamily; + + public override string ToString() + { + bool isAbstract = IsAbstract(_path); + if (isAbstract) + { + return "@" + _path.Substring(1); + } + else + { + return _path; + } + } + + private static bool IsAbstract(string path) => path.Length > 0 && path[0] == '\0'; + + private static bool IsAbstract(byte[] encodedPath) => encodedPath.Length > 0 && encodedPath[0] == 0; + } +} diff --git a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/Accept.cs b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/Accept.cs index 270b35599b..d5348dbe51 100644 --- a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/Accept.cs +++ b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/Accept.cs @@ -276,6 +276,30 @@ namespace System.Net.Sockets.Tests Assert.Throws(() => { AcceptAsync(listener, server); }); } } + + [Fact] + public async Task AcceptAsync_MultipleAcceptsThenDispose_AcceptsThrowAfterDispose() + { + if (UsesSync) + { + return; + } + + for (int i = 0; i < 100; i++) + { + using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + { + listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); + listener.Listen(2); + + Task accept1 = AcceptAsync(listener); + Task accept2 = AcceptAsync(listener); + listener.Dispose(); + await Assert.ThrowsAnyAsync(() => accept1); + await Assert.ThrowsAnyAsync(() => accept2); + } + } + } } public sealed class AcceptSync : Accept { } diff --git a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/Connect.cs b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/Connect.cs index 5fe40c29b3..51d92fc7f7 100644 --- a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/Connect.cs +++ b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/Connect.cs @@ -44,9 +44,7 @@ namespace System.Net.Sockets.Tests } } - [OuterLoop] // TODO: Issue #11345 [Fact] - [ActiveIssue(22765, TestPlatforms.AnyUnix)] public async Task Connect_OnConnectedSocket_Fails() { int port; diff --git a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/ExecutionContextFlowTest.cs b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/ExecutionContextFlowTest.cs new file mode 100644 index 0000000000..e30e0ce6b2 --- /dev/null +++ b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/ExecutionContextFlowTest.cs @@ -0,0 +1,501 @@ +// 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.IO; +using System.Threading; +using System.Threading.Tasks; +using Xunit; + +namespace System.Net.Sockets.Tests +{ + public partial class ExecutionContextFlowTest : FileCleanupTestBase + { + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task SocketAsyncEventArgs_ExecutionContextFlowsAcrossAcceptAsyncOperation(bool suppressContext) + { + using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + using (var saea = new SocketAsyncEventArgs()) + { + listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); + listener.Listen(1); + + var asyncLocal = new AsyncLocal(); + var tcs = new TaskCompletionSource(); + saea.Completed += (s, e) => + { + e.AcceptSocket.Dispose(); + tcs.SetResult(asyncLocal.Value); + }; + + asyncLocal.Value = 42; + if (suppressContext) ExecutionContext.SuppressFlow(); + try + { + Assert.True(listener.AcceptAsync(saea)); + } + finally + { + if (suppressContext) ExecutionContext.RestoreFlow(); + } + asyncLocal.Value = 0; + + client.Connect(listener.LocalEndPoint); + + Assert.Equal(suppressContext ? 0 : 42, await tcs.Task); + } + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task APM_ExecutionContextFlowsAcrossBeginAcceptOperation(bool suppressContext) + { + using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + { + listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); + listener.Listen(1); + + var asyncLocal = new AsyncLocal(); + var tcs = new TaskCompletionSource(); + + asyncLocal.Value = 42; + if (suppressContext) ExecutionContext.SuppressFlow(); + try + { + listener.BeginAccept(iar => + { + listener.EndAccept(iar).Dispose(); + tcs.SetResult(asyncLocal.Value); + }, null); + } + finally + { + if (suppressContext) ExecutionContext.RestoreFlow(); + } + asyncLocal.Value = 0; + + client.Connect(listener.LocalEndPoint); + + Assert.Equal(suppressContext ? 0 : 42, await tcs.Task); + } + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task SocketAsyncEventArgs_ExecutionContextFlowsAcrossConnectAsyncOperation(bool suppressContext) + { + using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + using (var saea = new SocketAsyncEventArgs()) + { + listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); + listener.Listen(1); + + var asyncLocal = new AsyncLocal(); + var tcs = new TaskCompletionSource(); + saea.Completed += (s, e) => tcs.SetResult(asyncLocal.Value); + saea.RemoteEndPoint = listener.LocalEndPoint; + + bool pending; + asyncLocal.Value = 42; + if (suppressContext) ExecutionContext.SuppressFlow(); + try + { + pending = client.ConnectAsync(saea); + } + finally + { + if (suppressContext) ExecutionContext.RestoreFlow(); + } + asyncLocal.Value = 0; + + if (pending) + { + Assert.Equal(suppressContext ? 0 : 42, await tcs.Task); + } + } + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task APM_ExecutionContextFlowsAcrossBeginConnectOperation(bool suppressContext) + { + using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + { + listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); + listener.Listen(1); + + var asyncLocal = new AsyncLocal(); + var tcs = new TaskCompletionSource(); + + bool pending; + asyncLocal.Value = 42; + if (suppressContext) ExecutionContext.SuppressFlow(); + try + { + pending = !client.BeginConnect(listener.LocalEndPoint, iar => + { + client.EndConnect(iar); + tcs.SetResult(asyncLocal.Value); + }, null).CompletedSynchronously; + } + finally + { + if (suppressContext) ExecutionContext.RestoreFlow(); + } + asyncLocal.Value = 0; + + if (pending) + { + Assert.Equal(suppressContext ? 0 : 42, await tcs.Task); + } + } + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task SocketAsyncEventArgs_ExecutionContextFlowsAcrossDisconnectAsyncOperation(bool suppressContext) + { + using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + using (var saea = new SocketAsyncEventArgs()) + { + listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); + listener.Listen(1); + + client.Connect(listener.LocalEndPoint); + using (Socket server = listener.Accept()) + { + var asyncLocal = new AsyncLocal(); + var tcs = new TaskCompletionSource(); + saea.Completed += (s, e) => tcs.SetResult(asyncLocal.Value); + + bool pending; + asyncLocal.Value = 42; + if (suppressContext) ExecutionContext.SuppressFlow(); + try + { + pending = client.DisconnectAsync(saea); + } + finally + { + if (suppressContext) ExecutionContext.RestoreFlow(); + } + asyncLocal.Value = 0; + + if (pending) + { + Assert.Equal(suppressContext ? 0 : 42, await tcs.Task); + } + } + } + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task APM_ExecutionContextFlowsAcrossBeginDisconnectOperation(bool suppressContext) + { + using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + { + listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); + listener.Listen(1); + + client.Connect(listener.LocalEndPoint); + using (Socket server = listener.Accept()) + { + var asyncLocal = new AsyncLocal(); + var tcs = new TaskCompletionSource(); + + bool pending; + asyncLocal.Value = 42; + if (suppressContext) ExecutionContext.SuppressFlow(); + try + { + pending = !client.BeginDisconnect(reuseSocket: false, iar => + { + client.EndDisconnect(iar); + tcs.SetResult(asyncLocal.Value); + }, null).CompletedSynchronously; + } + finally + { + if (suppressContext) ExecutionContext.RestoreFlow(); + } + asyncLocal.Value = 0; + + if (pending) + { + Assert.Equal(suppressContext ? 0 : 42, await tcs.Task); + } + } + } + } + + [Theory] + [InlineData(false, false)] + [InlineData(true, false)] + [InlineData(false, true)] + [InlineData(true, true)] + public async Task SocketAsyncEventArgs_ExecutionContextFlowsAcrossReceiveAsyncOperation(bool suppressContext, bool receiveFrom) + { + using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + using (var saea = new SocketAsyncEventArgs()) + { + listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); + listener.Listen(1); + + client.Connect(listener.LocalEndPoint); + using (Socket server = listener.Accept()) + { + var asyncLocal = new AsyncLocal(); + var tcs = new TaskCompletionSource(); + saea.Completed += (s, e) => tcs.SetResult(asyncLocal.Value); + saea.SetBuffer(new byte[1], 0, 1); + saea.RemoteEndPoint = server.LocalEndPoint; + + asyncLocal.Value = 42; + if (suppressContext) ExecutionContext.SuppressFlow(); + try + { + Assert.True(receiveFrom ? + client.ReceiveFromAsync(saea) : + client.ReceiveAsync(saea)); + } + finally + { + if (suppressContext) ExecutionContext.RestoreFlow(); + } + asyncLocal.Value = 0; + + server.Send(new byte[] { 18 }); + Assert.Equal(suppressContext ? 0 : 42, await tcs.Task); + } + } + } + + [Theory] + [InlineData(false, false)] + [InlineData(true, false)] + [InlineData(false, true)] + [InlineData(true, true)] + public async Task APM_ExecutionContextFlowsAcrossBeginReceiveOperation(bool suppressContext, bool receiveFrom) + { + using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + { + listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); + listener.Listen(1); + + client.Connect(listener.LocalEndPoint); + using (Socket server = listener.Accept()) + { + var asyncLocal = new AsyncLocal(); + var tcs = new TaskCompletionSource(); + + asyncLocal.Value = 42; + if (suppressContext) ExecutionContext.SuppressFlow(); + try + { + EndPoint ep = server.LocalEndPoint; + Assert.False(receiveFrom ? + client.BeginReceiveFrom(new byte[1], 0, 1, SocketFlags.None, ref ep, iar => + { + client.EndReceiveFrom(iar, ref ep); + tcs.SetResult(asyncLocal.Value); + }, null).CompletedSynchronously : + client.BeginReceive(new byte[1], 0, 1, SocketFlags.None, iar => + { + client.EndReceive(iar); + tcs.SetResult(asyncLocal.Value); + }, null).CompletedSynchronously); + } + finally + { + if (suppressContext) + ExecutionContext.RestoreFlow(); + } + asyncLocal.Value = 0; + + server.Send(new byte[] { 18 }); + Assert.Equal(suppressContext ? 0 : 42, await tcs.Task); + } + } + } + + [Theory] + [InlineData(false, 0)] + [InlineData(true, 0)] + [InlineData(false, 1)] + [InlineData(true, 1)] + [InlineData(false, 2)] + [InlineData(true, 2)] + public async Task SocketAsyncEventArgs_ExecutionContextFlowsAcrossSendAsyncOperation(bool suppressContext, int sendMode) + { + using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + using (var saea = new SocketAsyncEventArgs()) + { + listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); + listener.Listen(1); + + client.Connect(listener.LocalEndPoint); + using (Socket server = listener.Accept()) + { + byte[] buffer = new byte[10_000_000]; + + var asyncLocal = new AsyncLocal(); + var tcs = new TaskCompletionSource(); + saea.Completed += (s, e) => tcs.SetResult(asyncLocal.Value); + saea.SetBuffer(buffer, 0, buffer.Length); + saea.RemoteEndPoint = server.LocalEndPoint; + saea.SendPacketsElements = new[] { new SendPacketsElement(buffer) }; + + bool pending; + asyncLocal.Value = 42; + if (suppressContext) ExecutionContext.SuppressFlow(); + try + { + pending = + sendMode == 0 ? client.SendAsync(saea) : + sendMode == 1 ? client.SendToAsync(saea) : + client.SendPacketsAsync(saea); + } + finally + { + if (suppressContext) ExecutionContext.RestoreFlow(); + } + asyncLocal.Value = 0; + + int totalReceived = 0; + while (totalReceived < buffer.Length) + { + totalReceived += server.Receive(buffer); + } + + if (pending) + { + Assert.Equal(suppressContext ? 0 : 42, await tcs.Task); + } + } + } + } + + [Theory] + [InlineData(false, false)] + [InlineData(true, false)] + [InlineData(false, true)] + [InlineData(true, true)] + public async Task APM_ExecutionContextFlowsAcrossBeginSendOperation(bool suppressContext, bool sendTo) + { + using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + { + listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); + listener.Listen(1); + + client.Connect(listener.LocalEndPoint); + using (Socket server = listener.Accept()) + { + byte[] buffer = new byte[10_000_000]; + + var asyncLocal = new AsyncLocal(); + var tcs = new TaskCompletionSource(); + + bool pending; + asyncLocal.Value = 42; + if (suppressContext) ExecutionContext.SuppressFlow(); + try + { + pending = sendTo ? + !client.BeginSendTo(buffer, 0, buffer.Length, SocketFlags.None, server.LocalEndPoint, iar => + { + client.EndSendTo(iar); + tcs.SetResult(asyncLocal.Value); + }, null).CompletedSynchronously : + !client.BeginSend(buffer, 0, buffer.Length, SocketFlags.None, iar => + { + client.EndSend(iar); + tcs.SetResult(asyncLocal.Value); + }, null).CompletedSynchronously; + } + finally + { + if (suppressContext) ExecutionContext.RestoreFlow(); + } + asyncLocal.Value = 0; + + int totalReceived = 0; + while (totalReceived < buffer.Length) + { + totalReceived += server.Receive(buffer); + } + + if (pending) + { + Assert.Equal(suppressContext ? 0 : 42, await tcs.Task); + } + } + } + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task APM_ExecutionContextFlowsAcrossBeginSendFileOperation(bool suppressContext) + { + using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + { + listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); + listener.Listen(1); + + client.Connect(listener.LocalEndPoint); + using (Socket server = listener.Accept()) + { + string filePath = GetTestFilePath(); + using (FileStream fs = File.Create(filePath)) + { + fs.WriteByte(18); + } + + var asyncLocal = new AsyncLocal(); + var tcs = new TaskCompletionSource(); + + bool pending; + asyncLocal.Value = 42; + if (suppressContext) ExecutionContext.SuppressFlow(); + try + { + pending = !client.BeginSendFile(filePath, iar => + { + client.EndSendFile(iar); + tcs.SetResult(asyncLocal.Value); + }, null).CompletedSynchronously; + } + finally + { + if (suppressContext) ExecutionContext.RestoreFlow(); + } + asyncLocal.Value = 0; + + if (pending) + { + Assert.Equal(suppressContext ? 0 : 42, await tcs.Task); + } + } + } + } + } +} diff --git a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/ExecutionContextFlowTest.netcoreapp.cs b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/ExecutionContextFlowTest.netcoreapp.cs new file mode 100644 index 0000000000..c2c1e37f0d --- /dev/null +++ b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/ExecutionContextFlowTest.netcoreapp.cs @@ -0,0 +1,89 @@ +// 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.IO; +using System.Runtime.CompilerServices; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using Xunit; + +namespace System.Net.Sockets.Tests +{ + public partial class ExecutionContextFlowTest : FileCleanupTestBase + { + [Fact] + public Task ExecutionContext_FlowsOnlyOnceAcrossAsyncOperations() + { + return Task.Run(async () => // escape xunit's sync ctx + { + using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + { + listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); + listener.Listen(1); + + client.Connect(listener.LocalEndPoint); + using (Socket server = listener.Accept()) + { + var stackLog = new StringBuilder(); + int executionContextChanges = 0; + var asyncLocal = new AsyncLocal(_ => + { + executionContextChanges++; + stackLog.AppendLine($"#{executionContextChanges}: {Environment.StackTrace}"); + }); + Assert.Equal(0, executionContextChanges); + + int numAwaits = 20; + for (int i = 1; i <= numAwaits; i++) + { + asyncLocal.Value = i; + + await new AwaitWithOnCompletedInvocation( + client.ReceiveAsync(new Memory(new byte[1]), SocketFlags.None), + () => server.Send(new byte[1])); + + Assert.Equal(i, asyncLocal.Value); + } + + // This doesn't count EC changes where EC.Run is passed the same context + // as is current, but it's the best we can track via public API. + try + { + Assert.InRange(executionContextChanges, 1, numAwaits * 3); // at most: 1 / AsyncLocal change + 1 / suspend + 1 / resume + } + catch (Exception e) + { + throw new Exception($"{nameof(executionContextChanges)} == {executionContextChanges} with log: {stackLog.ToString()}", e); + } + } + } + }); + } + + private readonly struct AwaitWithOnCompletedInvocation : ICriticalNotifyCompletion + { + private readonly ValueTask _valueTask; + private readonly Action _invokeAfterOnCompleted; + + public AwaitWithOnCompletedInvocation(ValueTask valueTask, Action invokeAfterOnCompleted) + { + _valueTask = valueTask; + _invokeAfterOnCompleted = invokeAfterOnCompleted; + } + + public AwaitWithOnCompletedInvocation GetAwaiter() => this; + + public bool IsCompleted => false; + public T GetResult() => _valueTask.GetAwaiter().GetResult(); + public void OnCompleted(Action continuation) => throw new NotSupportedException(); + public void UnsafeOnCompleted(Action continuation) + { + _valueTask.GetAwaiter().UnsafeOnCompleted(continuation); + _invokeAfterOnCompleted(); + } + } + } +} diff --git a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/NetworkStreamTest.cs b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/NetworkStreamTest.cs index d4a50d03a6..af10c538d7 100644 --- a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/NetworkStreamTest.cs +++ b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/NetworkStreamTest.cs @@ -454,6 +454,21 @@ namespace System.Net.Sockets.Tests } } + [Fact] + public async Task ReadWrite_Byte_Success() + { + await RunWithConnectedNetworkStreamsAsync(async (server, client) => + { + for (byte i = 0; i < 10; i++) + { + Task read = Task.Run(() => client.ReadByte()); + Task write = Task.Run(() => server.WriteByte(i)); + await Task.WhenAll(read, write); + Assert.Equal(i, await read); + } + }); + } + [Fact] public async Task ReadWrite_Array_Success() { diff --git a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/NetworkStreamTest.netcoreapp.cs b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/NetworkStreamTest.netcoreapp.cs index bcf29d4bb5..38be110fad 100644 --- a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/NetworkStreamTest.netcoreapp.cs +++ b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/NetworkStreamTest.netcoreapp.cs @@ -2,6 +2,9 @@ // 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.Collections.Generic; +using System.Linq; +using System.Security.Cryptography; using System.Threading; using System.Threading.Tasks; using Xunit; @@ -43,17 +46,333 @@ namespace System.Net.Sockets.Tests }); } + [Fact] + public async Task ReadWrite_Memory_LargeWrite_Success() + { + await RunWithConnectedNetworkStreamsAsync(async (server, client) => + { + var writeBuffer = new byte[10 * 1024 * 1024]; + var readBuffer = new byte[writeBuffer.Length]; + RandomNumberGenerator.Fill(writeBuffer); + + ValueTask writeTask = client.WriteAsync((ReadOnlyMemory)writeBuffer); + + int totalRead = 0; + while (totalRead < readBuffer.Length) + { + int bytesRead = await server.ReadAsync(new Memory(readBuffer).Slice(totalRead)); + Assert.InRange(bytesRead, 0, int.MaxValue); + if (bytesRead == 0) + { + break; + } + totalRead += bytesRead; + } + Assert.Equal(readBuffer.Length, totalRead); + Assert.Equal(writeBuffer, readBuffer); + + await writeTask; + }); + } + [Fact] public async Task ReadWrite_Precanceled_Throws() { await RunWithConnectedNetworkStreamsAsync(async (server, client) => { - await Assert.ThrowsAnyAsync(() => server.WriteAsync((ArraySegment)new byte[0], new CancellationToken(true))); - await Assert.ThrowsAnyAsync(() => server.ReadAsync((ArraySegment)new byte[0], new CancellationToken(true)).AsTask()); + await Assert.ThrowsAnyAsync(async () => await server.WriteAsync((ArraySegment)new byte[0], new CancellationToken(true))); + await Assert.ThrowsAnyAsync(async () => await server.ReadAsync((ArraySegment)new byte[0], new CancellationToken(true))); - await Assert.ThrowsAnyAsync(() => server.WriteAsync((ReadOnlyMemory)new byte[0], new CancellationToken(true))); - await Assert.ThrowsAnyAsync(() => server.ReadAsync((Memory)new byte[0], new CancellationToken(true)).AsTask()); + await Assert.ThrowsAnyAsync(async () => await server.WriteAsync((ReadOnlyMemory)new byte[0], new CancellationToken(true))); + await Assert.ThrowsAnyAsync(async () => await server.ReadAsync((Memory)new byte[0], new CancellationToken(true))); }); } + + [Fact] + public async Task ReadAsync_AwaitMultipleTimes_Throws() + { + await RunWithConnectedNetworkStreamsAsync(async (server, client) => + { + var b = new byte[1]; + ValueTask r = server.ReadAsync(b); + await client.WriteAsync(new byte[] { 42 }); + Assert.Equal(1, await r); + Assert.Equal(42, b[0]); + await Assert.ThrowsAsync(async () => await r); + Assert.Throws(() => r.GetAwaiter().IsCompleted); + Assert.Throws(() => r.GetAwaiter().OnCompleted(() => { })); + Assert.Throws(() => r.GetAwaiter().GetResult()); + }); + } + + [Fact] + public async Task ReadAsync_MultipleContinuations_Throws() + { + await RunWithConnectedNetworkStreamsAsync((server, client) => + { + var b = new byte[1]; + ValueTask r = server.ReadAsync(b); + r.GetAwaiter().OnCompleted(() => { }); + Assert.Throws(() => r.GetAwaiter().OnCompleted(() => { })); + return Task.CompletedTask; + }); + } + + [Fact] + public async Task ReadAsync_MultipleConcurrentValueTaskReads_Success() + { + await RunWithConnectedNetworkStreamsAsync(async (server, client) => + { + // Technically this isn't supported behavior, but it happens to work because it's supported on socket. + // So validate it to alert us to any potential future breaks. + + byte[] b1 = new byte[1], b2 = new byte[1], b3 = new byte[1]; + ValueTask r1 = server.ReadAsync(b1); + ValueTask r2 = server.ReadAsync(b2); + ValueTask r3 = server.ReadAsync(b3); + + await client.WriteAsync(new byte[] { 42, 43, 44 }); + + Assert.Equal(3, await r1 + await r2 + await r3); + Assert.Equal(42 + 43 + 44, b1[0] + b2[0] + b3[0]); + }); + } + + [Fact] + public async Task ReadAsync_MultipleConcurrentValueTaskReads_AsTask_Success() + { + await RunWithConnectedNetworkStreamsAsync(async (server, client) => + { + // Technically this isn't supported behavior, but it happens to work because it's supported on socket. + // So validate it to alert us to any potential future breaks. + + byte[] b1 = new byte[1], b2 = new byte[1], b3 = new byte[1]; + Task r1 = server.ReadAsync((Memory)b1).AsTask(); + Task r2 = server.ReadAsync((Memory)b2).AsTask(); + Task r3 = server.ReadAsync((Memory)b3).AsTask(); + + await client.WriteAsync(new byte[] { 42, 43, 44 }); + + Assert.Equal(3, await r1 + await r2 + await r3); + Assert.Equal(42 + 43 + 44, b1[0] + b2[0] + b3[0]); + }); + } + + [Fact] + public async Task WriteAsync_MultipleConcurrentValueTaskWrites_Success() + { + await RunWithConnectedNetworkStreamsAsync(async (server, client) => + { + // Technically this isn't supported behavior, but it happens to work because it's supported on socket. + // So validate it to alert us to any potential future breaks. + + ValueTask s1 = server.WriteAsync(new ReadOnlyMemory(new byte[] { 42 })); + ValueTask s2 = server.WriteAsync(new ReadOnlyMemory(new byte[] { 43 })); + ValueTask s3 = server.WriteAsync(new ReadOnlyMemory(new byte[] { 44 })); + + byte[] b1 = new byte[1], b2 = new byte[1], b3 = new byte[1]; + Assert.Equal(3, + await client.ReadAsync((Memory)b1) + + await client.ReadAsync((Memory)b2) + + await client.ReadAsync((Memory)b3)); + + await s1; + await s2; + await s3; + + Assert.Equal(42 + 43 + 44, b1[0] + b2[0] + b3[0]); + }); + } + + [Fact] + public async Task WriteAsync_MultipleConcurrentValueTaskWrites_AsTask_Success() + { + await RunWithConnectedNetworkStreamsAsync(async (server, client) => + { + // Technically this isn't supported behavior, but it happens to work because it's supported on socket. + // So validate it to alert us to any potential future breaks. + + Task s1 = server.WriteAsync(new ReadOnlyMemory(new byte[] { 42 })).AsTask(); + Task s2 = server.WriteAsync(new ReadOnlyMemory(new byte[] { 43 })).AsTask(); + Task s3 = server.WriteAsync(new ReadOnlyMemory(new byte[] { 44 })).AsTask(); + + byte[] b1 = new byte[1], b2 = new byte[1], b3 = new byte[1]; + Task r1 = client.ReadAsync((Memory)b1).AsTask(); + Task r2 = client.ReadAsync((Memory)b2).AsTask(); + Task r3 = client.ReadAsync((Memory)b3).AsTask(); + + await Task.WhenAll(s1, s2, s3, r1, r2, r3); + + Assert.Equal(3, await r1 + await r2 + await r3); + Assert.Equal(42 + 43 + 44, b1[0] + b2[0] + b3[0]); + }); + } + + public static IEnumerable ReadAsync_ContinuesOnCurrentContextIfDesired_MemberData() => + from flowExecutionContext in new[] { true, false } + from continueOnCapturedContext in new bool?[] { null, false, true } + select new object[] { flowExecutionContext, continueOnCapturedContext }; + + [Theory] + [MemberData(nameof(ReadAsync_ContinuesOnCurrentContextIfDesired_MemberData))] + public async Task ReadAsync_ContinuesOnCurrentSynchronizationContextIfDesired( + bool flowExecutionContext, bool? continueOnCapturedContext) + { + await Task.Run(async () => // escape xunit sync ctx + { + await RunWithConnectedNetworkStreamsAsync(async (server, client) => + { + Assert.Null(SynchronizationContext.Current); + + var continuationRan = new TaskCompletionSource(); + var asyncLocal = new AsyncLocal(); + bool schedulerWasFlowed = false; + bool executionContextWasFlowed = false; + Action continuation = () => + { + schedulerWasFlowed = SynchronizationContext.Current is CustomSynchronizationContext; + executionContextWasFlowed = 42 == asyncLocal.Value; + continuationRan.SetResult(true); + }; + + var readBuffer = new byte[1]; + ValueTask readValueTask = client.ReadAsync((Memory)new byte[1]); + + SynchronizationContext.SetSynchronizationContext(new CustomSynchronizationContext()); + asyncLocal.Value = 42; + switch (continueOnCapturedContext) + { + case null: + if (flowExecutionContext) + { + readValueTask.GetAwaiter().OnCompleted(continuation); + } + else + { + readValueTask.GetAwaiter().UnsafeOnCompleted(continuation); + } + break; + default: + if (flowExecutionContext) + { + readValueTask.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().OnCompleted(continuation); + } + else + { + readValueTask.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().UnsafeOnCompleted(continuation); + } + break; + } + asyncLocal.Value = 0; + SynchronizationContext.SetSynchronizationContext(null); + + Assert.False(readValueTask.IsCompleted); + Assert.False(readValueTask.IsCompletedSuccessfully); + await server.WriteAsync(new byte[] { 42 }); + + await continuationRan.Task; + Assert.True(readValueTask.IsCompleted); + Assert.True(readValueTask.IsCompletedSuccessfully); + + Assert.Equal(continueOnCapturedContext != false, schedulerWasFlowed); + Assert.Equal(flowExecutionContext, executionContextWasFlowed); + }); + }); + } + + [Theory] + [MemberData(nameof(ReadAsync_ContinuesOnCurrentContextIfDesired_MemberData))] + public async Task ReadAsync_ContinuesOnCurrentTaskSchedulerIfDesired( + bool flowExecutionContext, bool? continueOnCapturedContext) + { + await Task.Run(async () => // escape xunit sync ctx + { + await RunWithConnectedNetworkStreamsAsync(async (server, client) => + { + Assert.Null(SynchronizationContext.Current); + + var continuationRan = new TaskCompletionSource(); + var asyncLocal = new AsyncLocal(); + bool schedulerWasFlowed = false; + bool executionContextWasFlowed = false; + Action continuation = () => + { + schedulerWasFlowed = TaskScheduler.Current is CustomTaskScheduler; + executionContextWasFlowed = 42 == asyncLocal.Value; + continuationRan.SetResult(true); + }; + + var readBuffer = new byte[1]; + ValueTask readValueTask = client.ReadAsync((Memory)new byte[1]); + + await Task.Factory.StartNew(() => + { + Assert.IsType(TaskScheduler.Current); + asyncLocal.Value = 42; + switch (continueOnCapturedContext) + { + case null: + if (flowExecutionContext) + { + readValueTask.GetAwaiter().OnCompleted(continuation); + } + else + { + readValueTask.GetAwaiter().UnsafeOnCompleted(continuation); + } + break; + default: + if (flowExecutionContext) + { + readValueTask.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().OnCompleted(continuation); + } + else + { + readValueTask.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().UnsafeOnCompleted(continuation); + } + break; + } + asyncLocal.Value = 0; + }, CancellationToken.None, TaskCreationOptions.None, new CustomTaskScheduler()); + + Assert.False(readValueTask.IsCompleted); + Assert.False(readValueTask.IsCompletedSuccessfully); + await server.WriteAsync(new byte[] { 42 }); + + await continuationRan.Task; + Assert.True(readValueTask.IsCompleted); + Assert.True(readValueTask.IsCompletedSuccessfully); + + Assert.Equal(continueOnCapturedContext != false, schedulerWasFlowed); + Assert.Equal(flowExecutionContext, executionContextWasFlowed); + }); + }); + } + + private sealed class CustomSynchronizationContext : SynchronizationContext + { + public override void Post(SendOrPostCallback d, object state) + { + ThreadPool.QueueUserWorkItem(delegate + { + SetSynchronizationContext(this); + try + { + d(state); + } + finally + { + SetSynchronizationContext(null); + } + }, null); + } + } + + private sealed class CustomTaskScheduler : TaskScheduler + { + protected override void QueueTask(Task task) => ThreadPool.QueueUserWorkItem(_ => TryExecuteTask(task)); + protected override bool TryExecuteTaskInline(Task task, bool taskWasPreviouslyQueued) => false; + protected override IEnumerable GetScheduledTasks() => null; + } } } diff --git a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/OSSupport.cs b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/OSSupport.cs index 3e1614a737..064c00cf23 100644 --- a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/OSSupport.cs +++ b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/OSSupport.cs @@ -81,9 +81,9 @@ namespace System.Net.Sockets.Tests } } - [ActiveIssue(25639)] + [PlatformSpecific(TestPlatforms.AnyUnix)] [Fact] - public void IOControl_SIOCATMARK_Success() + public void IOControl_SIOCATMARK_Unix_Success() { using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) { @@ -101,25 +101,89 @@ namespace System.Net.Sockets.Tests { byte[] siocatmarkResult = new byte[sizeof(int)]; + // Socket connected but no data sent. + Assert.Equal(4, client.IOControl(IOControlCode.OobDataRead, null, siocatmarkResult)); + Assert.Equal(0, BitConverter.ToInt32(siocatmarkResult, 0)); + server.Send(new byte[] { 42 }, SocketFlags.None); server.Send(new byte[] { 43 }, SocketFlags.OutOfBand); - Assert.Equal(4, client.IOControl(IOControlCode.OobDataRead, null, siocatmarkResult)); - Assert.Equal(0, BitConverter.ToInt32(siocatmarkResult, 0)); + // OOB data recieved, but read pointer not at mark. + Assert.True(SpinWait.SpinUntil(() => + { + Assert.Equal(4, client.IOControl(IOControlCode.OobDataRead, null, siocatmarkResult)); + return BitConverter.ToInt32(siocatmarkResult, 0) == 0; + }, 10_000)); var received = new byte[1]; Assert.Equal(1, client.Receive(received)); Assert.Equal(42, received[0]); + // OOB data recieved, read pointer at mark. + Assert.Equal(4, client.IOControl(IOControlCode.OobDataRead, null, siocatmarkResult)); + Assert.Equal(1, BitConverter.ToInt32(siocatmarkResult, 0)); + Assert.Equal(1, client.Receive(received, SocketFlags.OutOfBand)); Assert.Equal(43, received[0]); + // OOB data read, read pointer at mark. + Assert.Equal(4, client.IOControl(IOControlCode.OobDataRead, null, siocatmarkResult)); + Assert.Equal(PlatformDetection.IsOSX ? 0 : 1, BitConverter.ToInt32(siocatmarkResult, 0)); + } + } + } + } + + [PlatformSpecific(TestPlatforms.Windows)] + [Fact] + public void IOControl_SIOCATMARK_Windows_Success() + { + using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + { + Assert.Throws(() => client.IOControl(IOControlCode.OobDataRead, null, null)); + Assert.Throws(() => client.IOControl(IOControlCode.OobDataRead, null, new byte[0])); + Assert.Throws(() => client.IOControl(IOControlCode.OobDataRead, null, new byte[sizeof(int) - 1])); + + using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + { + listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); + listener.Listen(1); + + client.Connect(listener.LocalEndPoint); + using (Socket server = listener.Accept()) + { + byte[] siocatmarkResult = new byte[sizeof(int)]; + + // Socket connected but no data sent. + Assert.Equal(4, client.IOControl(IOControlCode.OobDataRead, null, siocatmarkResult)); + Assert.Equal(1, BitConverter.ToInt32(siocatmarkResult, 0)); + + server.Send(new byte[] { 42 }, SocketFlags.None); + server.Send(new byte[] { 43 }, SocketFlags.OutOfBand); + + // OOB data recieved, but read pointer not at mark Assert.True(SpinWait.SpinUntil(() => { Assert.Equal(4, client.IOControl(IOControlCode.OobDataRead, null, siocatmarkResult)); - return BitConverter.ToInt32(siocatmarkResult, 0) == 1; + return BitConverter.ToInt32(siocatmarkResult, 0) == 0; }, 10_000)); + + var received = new byte[1]; + + Assert.Equal(1, client.Receive(received)); + Assert.Equal(42, received[0]); + + // OOB data recieved, read pointer at mark. + Assert.Equal(4, client.IOControl(IOControlCode.OobDataRead, null, siocatmarkResult)); + Assert.Equal(0, BitConverter.ToInt32(siocatmarkResult, 0)); + + Assert.Equal(1, client.Receive(received, SocketFlags.OutOfBand)); + Assert.Equal(43, received[0]); + + // OOB data read, read pointer at mark. + Assert.Equal(4, client.IOControl(IOControlCode.OobDataRead, null, siocatmarkResult)); + Assert.Equal(1, BitConverter.ToInt32(siocatmarkResult, 0)); } } } diff --git a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SendPacketsAsync.cs b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SendPacketsAsync.cs index 00baeb74a7..f1d15d9251 100644 --- a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SendPacketsAsync.cs +++ b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SendPacketsAsync.cs @@ -286,11 +286,12 @@ namespace System.Net.Sockets.Tests AssertExtensions.Throws("path", null, () => { // Existence is validated on send - SendPackets(type, new SendPacketsElement(" \t "), 0); + SendPackets(type, new SendPacketsElement(" "), 0); }); } [Theory] + [ActiveIssue(27269)] [InlineData(SocketImplementationType.APM)] [InlineData(SocketImplementationType.Async)] [PlatformSpecific(TestPlatforms.Windows)] // valid filename chars on Unix diff --git a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SendReceive.cs b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SendReceive.cs index f08b4cfb9a..5719cb8373 100644 --- a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SendReceive.cs +++ b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SendReceive.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; +using System.Linq; using System.Threading; using System.Threading.Tasks; using Xunit; @@ -1196,7 +1197,74 @@ namespace System.Net.Sockets.Tests } } - public sealed class SendReceiveSync : SendReceive { } + public sealed class SendReceiveSync : SendReceive + { + [OuterLoop] + [Fact] + public void BlockingRead_DoesntRequireAnotherThreadPoolThread() + { + RemoteInvoke(() => + { + // Set the max number of worker threads to a low value. + ThreadPool.GetMaxThreads(out int workerThreads, out int completionPortThreads); + ThreadPool.SetMaxThreads(Environment.ProcessorCount, completionPortThreads); + + // Create twice that many socket pairs, for good measure. + (Socket, Socket)[] socketPairs = Enumerable.Range(0, Environment.ProcessorCount * 2).Select(_ => CreateConnectedSocketPair()).ToArray(); + try + { + // Ensure that on Unix all of the first socket in each pair are configured for sync-over-async. + foreach ((Socket, Socket) pair in socketPairs) + { + pair.Item1.ForceNonBlocking(force: true); + } + + // Queue a work item for each first socket to do a blocking receive. + Task[] receives = + (from pair in socketPairs + select Task.Factory.StartNew(() => pair.Item1.Receive(new byte[1]), CancellationToken.None, TaskCreationOptions.PreferFairness, TaskScheduler.Default)) + .ToArray(); + + // Give a bit of time for the pool to start executing the receives. It's possible this won't be enough, + // in which case the test we could get a false negative on the test, but we won't get spurious failures. + Thread.Sleep(1000); + + // Now send to each socket. + foreach ((Socket, Socket) pair in socketPairs) + { + pair.Item2.Send(new byte[1]); + } + + // And wait for all the receives to complete. + Assert.True(Task.WaitAll(receives, 60_000), "Expected all receives to complete within timeout"); + } + finally + { + foreach ((Socket, Socket) pair in socketPairs) + { + pair.Item1.Dispose(); + pair.Item2.Dispose(); + } + } + }).Dispose(); + } + + private static (Socket, Socket) CreateConnectedSocketPair() + { + using (Socket listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + { + listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); + listener.Listen(1); + + Socket client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + client.Connect(listener.LocalEndPoint); + Socket server = listener.Accept(); + + return (client, server); + } + } + } + public sealed class SendReceiveSyncForceNonBlocking : SendReceive { } public sealed class SendReceiveApm : SendReceive { } public sealed class SendReceiveTask : SendReceive { } diff --git a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SendReceive.netcoreapp.cs b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SendReceive.netcoreapp.cs index 9b511de045..ae34a6e90b 100644 --- a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SendReceive.netcoreapp.cs +++ b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SendReceive.netcoreapp.cs @@ -2,10 +2,58 @@ // 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.Threading; +using System.Threading.Tasks; +using Xunit; + namespace System.Net.Sockets.Tests { public sealed class SendReceiveSpanSync : SendReceive { } public sealed class SendReceiveSpanSyncForceNonBlocking : SendReceive { } - public sealed class SendReceiveMemoryArrayTask : SendReceive { } + public sealed class SendReceiveMemoryArrayTask : SendReceive + { + [Fact] + public async Task Precanceled_Throws() + { + using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + { + listener.BindToAnonymousPort(IPAddress.Loopback); + listener.Listen(1); + + await client.ConnectAsync(listener.LocalEndPoint); + using (Socket server = await listener.AcceptAsync()) + { + var cts = new CancellationTokenSource(); + cts.Cancel(); + + await Assert.ThrowsAnyAsync(async () => await server.SendAsync((ReadOnlyMemory)new byte[0], SocketFlags.None, cts.Token)); + await Assert.ThrowsAnyAsync(async () => await server.ReceiveAsync((Memory)new byte[0], SocketFlags.None, cts.Token)); + } + } + } + + [Fact] + public async Task DisposedSocket_ThrowsOperationCanceledException() + { + using (var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + { + listener.BindToAnonymousPort(IPAddress.Loopback); + listener.Listen(1); + + await client.ConnectAsync(listener.LocalEndPoint); + using (Socket server = await listener.AcceptAsync()) + { + var cts = new CancellationTokenSource(); + cts.Cancel(); + + server.Shutdown(SocketShutdown.Both); + await Assert.ThrowsAnyAsync(async () => await server.SendAsync((ReadOnlyMemory)new byte[0], SocketFlags.None, cts.Token)); + await Assert.ThrowsAnyAsync(async () => await server.ReceiveAsync((Memory)new byte[0], SocketFlags.None, cts.Token)); + } + } + } + } public sealed class SendReceiveMemoryNativeTask : SendReceive { } } diff --git a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SocketAsyncEventArgsTest.netcoreapp.cs b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SocketAsyncEventArgsTest.netcoreapp.cs index 90edf5b175..c0819e9566 100644 --- a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SocketAsyncEventArgsTest.netcoreapp.cs +++ b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SocketAsyncEventArgsTest.netcoreapp.cs @@ -4,6 +4,10 @@ using System.Buffers; using System.Collections.Generic; +using System.Linq; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Threading; using Xunit; namespace System.Net.Sockets.Tests @@ -48,7 +52,7 @@ namespace System.Net.Sockets.Tests byte[] array = new byte[42]; saea.SetBuffer(array, 0, array.Length); - Assert.True(saea.MemoryBuffer.TryGetArray(out ArraySegment result)); + Assert.True(MemoryMarshal.TryGetArray(saea.MemoryBuffer, out ArraySegment result)); Assert.Same(array, result.Array); Assert.Same(saea.Buffer, array); Assert.Equal(0, result.Offset); @@ -59,7 +63,7 @@ namespace System.Net.Sockets.Tests Assert.Equal(1, saea.Offset); Assert.Equal(2, saea.Count); - Assert.True(saea.MemoryBuffer.TryGetArray(out result)); + Assert.True(MemoryMarshal.TryGetArray(saea.MemoryBuffer, out result)); Assert.Same(array, result.Array); Assert.Equal(0, result.Offset); Assert.Equal(array.Length, result.Count); @@ -181,15 +185,64 @@ namespace System.Net.Sockets.Tests [Fact] public void SetBufferMemory_NonArray_BufferReturnsNull() { - using (var m = new NativeOwnedMemory(42)) + using (var m = new NativeMemoryManager(42)) using (var saea = new SocketAsyncEventArgs()) { saea.SetBuffer(m.Memory); Assert.True(saea.MemoryBuffer.Equals(m.Memory)); Assert.Equal(0, saea.Offset); - Assert.Equal(m.Length, saea.Count); + Assert.Equal(m.Memory.Length, saea.Count); Assert.Null(saea.Buffer); } } + + [OuterLoop("Involves GC and finalization")] + [Theory] + [InlineData(false)] + [InlineData(true)] + public void Finalizer_InvokedWhenNoLongerReferenced(bool afterAsyncOperation) + { + var cwt = new ConditionalWeakTable(); + + for (int i = 0; i < 5; i++) // create several SAEA instances, stored into cwt + { + CreateSocketAsyncEventArgs(); + + void CreateSocketAsyncEventArgs() // separated out so that JIT doesn't extend lifetime of SAEA instances + { + var saea = new SocketAsyncEventArgs(); + cwt.Add(saea, saea); + + if (afterAsyncOperation) + { + using (Socket listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + { + listener.Bind(new IPEndPoint(IPAddress.Loopback, 0)); + listener.Listen(1); + + using (Socket client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + { + saea.RemoteEndPoint = listener.LocalEndPoint; + using (var mres = new ManualResetEventSlim()) + { + saea.Completed += (s, e) => mres.Set(); + if (client.ConnectAsync(saea)) + { + mres.Wait(); + } + } + } + } + } + } + } + + Assert.True(SpinWait.SpinUntil(() => + { + GC.Collect(); + GC.WaitForPendingFinalizers(); + return cwt.Count() == 0; // validate that the cwt becomes empty + }, 30_000)); + } } } diff --git a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SocketTestHelper.cs b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SocketTestHelper.cs index 362db55b6f..17ac1c59ad 100644 --- a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SocketTestHelper.cs +++ b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SocketTestHelper.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; +using System.Diagnostics; using System.Runtime.InteropServices; using System.Threading.Tasks; @@ -269,7 +270,7 @@ namespace System.Net.Sockets.Tests // MemberDatas that are generally useful // - public abstract class MemberDatas + public abstract class MemberDatas : RemoteExecutorTestBase { public static readonly object[][] Loopbacks = new[] { diff --git a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SocketTestHelper.netcoreapp.cs b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SocketTestHelper.netcoreapp.cs index 3e41627e37..945e905764 100644 --- a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SocketTestHelper.netcoreapp.cs +++ b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/SocketTestHelper.netcoreapp.cs @@ -39,7 +39,7 @@ namespace System.Net.Sockets.Tests public override bool ValidatesArrayArguments => false; public override async Task ReceiveAsync(Socket s, ArraySegment buffer) { - using (var m = new NativeOwnedMemory(buffer.Count)) + using (var m = new NativeMemoryManager(buffer.Count)) { int bytesReceived = await s.ReceiveAsync(m.Memory, SocketFlags.None).ConfigureAwait(false); m.Memory.Span.Slice(0, bytesReceived).CopyTo(buffer.AsSpan()); @@ -48,7 +48,7 @@ namespace System.Net.Sockets.Tests } public override async Task SendAsync(Socket s, ArraySegment buffer) { - using (var m = new NativeOwnedMemory(buffer.Count)) + using (var m = new NativeMemoryManager(buffer.Count)) { buffer.AsSpan().CopyTo(m.Memory.Span); return await s.SendAsync(m.Memory, SocketFlags.None).ConfigureAwait(false); diff --git a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj index 47411a841d..8ef8f9b4cd 100644 --- a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj +++ b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj @@ -21,6 +21,8 @@ + + @@ -48,7 +50,6 @@ - @@ -97,8 +98,8 @@ Common\System\Threading\Tasks\TaskTimeoutExtensions.cs - - Common\System\Buffers\NativeOwnedMemory.cs + + Common\System\Buffers\NativeMemoryManager.cs Common\System\Threading\Tasks\TaskToApm.cs @@ -119,5 +120,8 @@ + + + diff --git a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/TcpListenerTest.cs b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/TcpListenerTest.cs index 78ef0fe6b9..0bb6d7fa64 100644 --- a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/TcpListenerTest.cs +++ b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/TcpListenerTest.cs @@ -124,6 +124,24 @@ namespace System.Net.Sockets.Tests listener.Stop(); } + [Fact] + // This verify that basic constructs do work when IPv6 is NOT available. + public void IPv6_Only_Works() + { + if (Socket.OSSupportsIPv6 || !Socket.OSSupportsIPv4) + { + // TBD we should figure out better way how to execute this in IPv4 only environment. + return; + } + + // This should not throw e.g. default to IPv6. + TcpListener l = TcpListener.Create(0); + l.Stop(); + + Socket s = new Socket(SocketType.Stream, ProtocolType.Tcp); + s.Close(); + } + private sealed class DerivedTcpListener : TcpListener { #pragma warning disable 0618 diff --git a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/UnixDomainSocketTest.cs b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/UnixDomainSocketTest.cs deleted file mode 100644 index af17a979cb..0000000000 --- a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/UnixDomainSocketTest.cs +++ /dev/null @@ -1,30 +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.Net.Test.Common; - -using Xunit; -using Xunit.Abstractions; - -namespace System.Net.Sockets.Tests -{ - public partial class UnixDomainSocketTest - { - private readonly ITestOutputHelper _log; - - public UnixDomainSocketTest(ITestOutputHelper output) - { - _log = TestLogging.GetInstance(); - } - - [OuterLoop] // TODO: Issue #11345 - [Fact] - [PlatformSpecific(TestPlatforms.Windows)] // CreateUnixDomainSocket should throw on Windows - public void Socket_CreateUnixDomainSocket_Throws_OnWindows() - { - SocketException e = Assert.Throws(() => new Socket(AddressFamily.Unix, SocketType.Stream, ProtocolType.Unspecified)); - Assert.Equal(SocketError.AddressFamilyNotSupported, e.SocketErrorCode); - } - } -} diff --git a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/UnixDomainSocketTest.netcoreapp.cs b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/UnixDomainSocketTest.netcoreapp.cs index 661eb872ff..8d03c24142 100644 --- a/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/UnixDomainSocketTest.netcoreapp.cs +++ b/external/corefx/src/System.Net.Sockets/tests/FunctionalTests/UnixDomainSocketTest.netcoreapp.cs @@ -15,16 +15,8 @@ namespace System.Net.Sockets.Tests { public partial class UnixDomainSocketTest { - [Fact] - [PlatformSpecific(TestPlatforms.Windows)] // new UnixDomainSocketEndPoint should throw on Windows - public void UnixDomainSocketEndPoint_Throws_OnWindows() - { - Assert.Throws(() => new UnixDomainSocketEndPoint("/path")); - } - - [OuterLoop] // TODO: Issue #11345 - [Fact] - [PlatformSpecific(TestPlatforms.AnyUnix)] // Tests ConnectAsyncUnixDomainSocketEndPoint success on Unix + [PlatformSpecific(~TestPlatforms.Windows)] // Windows doesn't currently support ConnectEx with domain sockets + [ConditionalFact(nameof(PlatformSupportsUnixDomainSockets))] public async Task Socket_ConnectAsyncUnixDomainSocketEndPoint_Success() { string path = null; @@ -79,9 +71,7 @@ namespace System.Net.Sockets.Tests } } - [OuterLoop] // TODO: Issue #11345 - [Fact] - [PlatformSpecific(TestPlatforms.AnyUnix)] // Tests ConnectAsyncUnixDomainSocketEndPoint seccess on Unix + [ConditionalFact(nameof(PlatformSupportsUnixDomainSockets))] public async Task Socket_ConnectAsyncUnixDomainSocketEndPoint_NotServer() { string path = GetRandomNonExistingFilePath(); @@ -103,7 +93,9 @@ namespace System.Net.Sockets.Tests await complete.Task; } - Assert.Equal(SocketError.AddressNotAvailable, args.SocketError); + Assert.Equal( + RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? SocketError.InvalidArgument : SocketError.AddressNotAvailable, + args.SocketError); } } finally @@ -113,9 +105,7 @@ namespace System.Net.Sockets.Tests } } - [OuterLoop] // TODO: Issue #11345 - [Fact] - [PlatformSpecific(TestPlatforms.AnyUnix)] // Tests SendReceive success for UnixDomainSocketEndPoint on Unix + [ConditionalFact(nameof(PlatformSupportsUnixDomainSockets))] public void Socket_SendReceive_Success() { string path = GetRandomNonExistingFilePath(); @@ -152,9 +142,7 @@ namespace System.Net.Sockets.Tests } } - [OuterLoop] // TODO: Issue #11345 - [Fact] - [PlatformSpecific(TestPlatforms.AnyUnix)] // Tests SendReceiveAsync success for UnixDomainSocketEndPoint on Unix + [ConditionalFact(nameof(PlatformSupportsUnixDomainSockets))] public async Task Socket_SendReceiveAsync_Success() { string path = GetRandomNonExistingFilePath(); @@ -191,13 +179,11 @@ namespace System.Net.Sockets.Tests } } - [OuterLoop] // TODO: Issue #11345 - [Theory] + [ConditionalTheory(nameof(PlatformSupportsUnixDomainSockets))] [InlineData(5000, 1, 1)] [InlineData(500, 18, 21)] [InlineData(500, 21, 18)] [InlineData(5, 128000, 64000)] - [PlatformSpecific(TestPlatforms.AnyUnix)] // Tests SendReceiveAsync success for UnixDomainSocketEndPoint on Unix public async Task Socket_SendReceiveAsync_PropagateToStream_Success(int iterations, int writeBufferSize, int readBufferSize) { var writeBuffer = new byte[writeBufferSize * iterations]; @@ -219,10 +205,15 @@ namespace System.Net.Sockets.Tests Task clientReceives = Task.Run(async () => { - int bytesRead; byte[] buffer = new byte[readBufferSize]; - while ((bytesRead = await client.ReceiveAsync(new ArraySegment(buffer), SocketFlags.None)) > 0) + while (true) { + int bytesRead = await client.ReceiveAsync(new Memory(buffer), SocketFlags.None); + if (bytesRead == 0) + { + break; + } + Assert.InRange(bytesRead, 1, writeBuffer.Length - readData.Length); readData.Write(buffer, 0, bytesRead); } }); @@ -250,11 +241,9 @@ namespace System.Net.Sockets.Tests } } - [OuterLoop] // TODO: Issue #11345 - [Theory] + [ConditionalTheory(nameof(PlatformSupportsUnixDomainSockets))] [InlineData(false)] [InlineData(true)] - [PlatformSpecific(TestPlatforms.AnyUnix)] // Tests ConcurrentSendReceive success for UnixDomainSocketEndPoint on Unix public async Task ConcurrentSendReceive(bool forceNonBlocking) { using (Socket server = new Socket(AddressFamily.Unix, SocketType.Stream, ProtocolType.Unspecified)) @@ -296,9 +285,7 @@ namespace System.Net.Sockets.Tests } } - [OuterLoop] // TODO: Issue #11345 - [Fact] - [PlatformSpecific(TestPlatforms.AnyUnix)] // Tests ConcurrentSendReceive success for UnixDomainSocketEndPoint on Unix + [ConditionalFact(nameof(PlatformSupportsUnixDomainSockets))] public async Task ConcurrentSendReceiveAsync() { using (Socket server = new Socket(AddressFamily.Unix, SocketType.Stream, ProtocolType.Unspecified)) @@ -336,8 +323,7 @@ namespace System.Net.Sockets.Tests } } - [Fact] - [PlatformSpecific(TestPlatforms.AnyUnix)] // Tests new UnixDomainSocketEndPoint throws the correct exception for invalid args + [ConditionalFact(nameof(PlatformSupportsUnixDomainSockets))] public void UnixDomainSocketEndPoint_InvalidPaths_Throws() { Assert.Throws(() => new UnixDomainSocketEndPoint(null)); @@ -351,8 +337,7 @@ namespace System.Net.Sockets.Tests Assert.Throws(() => new UnixDomainSocketEndPoint(invalidLengthString)); } - [Theory] - [PlatformSpecific(TestPlatforms.AnyUnix)] + [ConditionalTheory(nameof(PlatformSupportsUnixDomainSockets))] [InlineData(false)] [InlineData(true)] public void UnixDomainSocketEndPoint_RemoteEndPointEqualsBindAddress(bool abstractAddress) @@ -412,7 +397,7 @@ namespace System.Net.Sockets.Tests } } - [Fact] + [ConditionalFact(nameof(PlatformSupportsUnixDomainSockets))] [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Linux)] // Don't support abstract socket addresses. public void UnixDomainSocketEndPoint_UsingAbstractSocketAddressOnUnsupported_Throws() { @@ -432,6 +417,16 @@ namespace System.Net.Sockets.Tests } } + [ConditionalFact(nameof(PlatformDoesntSupportUnixDomainSockets))] + [PlatformSpecific(TestPlatforms.Windows)] + public void Socket_CreateUnixDomainSocket_Throws_OnWindows() + { + AssertExtensions.Throws("path", () => new UnixDomainSocketEndPoint(null)); + AssertExtensions.Throws("path", () => new UnixDomainSocketEndPoint("")); + AssertExtensions.Throws("path", () => new UnixDomainSocketEndPoint(new string('s', 1000))); + Assert.Throws(() => new UnixDomainSocketEndPoint("hello")); + } + private static string GetRandomNonExistingFilePath() { string result; @@ -443,5 +438,34 @@ namespace System.Net.Sockets.Tests return result; } + + + private static bool PlatformSupportsUnixDomainSockets => s_platformSupportsUnixDomainSockets.Value; + + private static bool PlatformDoesntSupportUnixDomainSockets => !s_platformSupportsUnixDomainSockets.Value; + + private static readonly Lazy s_platformSupportsUnixDomainSockets = new Lazy(() => + { + // All Unixes should support UDS. Some Windows will. + + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + IntPtr s = socket((int)AddressFamily.Unix, (int)SocketType.Stream, (int)ProtocolType.Unspecified); + if (s == (IntPtr)(-1)) + { + return false; + } + + closesocket(s); + } + + return true; + }); + + [DllImport("ws2_32.dll")] + internal static extern IntPtr socket(int af, int type, int protocol); + + [DllImport("ws2_32.dll")] + internal static extern int closesocket(IntPtr socketHandle); } } diff --git a/external/corefx/src/System.Net.Sockets/tests/ManualPerformanceTests/System.Net.Sockets.Async.Performance.Tests.csproj b/external/corefx/src/System.Net.Sockets/tests/ManualPerformanceTests/System.Net.Sockets.Async.Performance.Tests.csproj index f5b5401921..c64e8caa64 100644 --- a/external/corefx/src/System.Net.Sockets/tests/ManualPerformanceTests/System.Net.Sockets.Async.Performance.Tests.csproj +++ b/external/corefx/src/System.Net.Sockets/tests/ManualPerformanceTests/System.Net.Sockets.Async.Performance.Tests.csproj @@ -68,5 +68,8 @@ PerfRunner + + + - + \ No newline at end of file diff --git a/external/corefx/src/System.Net.Sockets/tests/Performance/Perf.Socket.SendReceive.cs b/external/corefx/src/System.Net.Sockets/tests/Performance/Perf.Socket.SendReceive.cs index 5f359277ac..ac8ed2c992 100644 --- a/external/corefx/src/System.Net.Sockets/tests/Performance/Perf.Socket.SendReceive.cs +++ b/external/corefx/src/System.Net.Sockets/tests/Performance/Perf.Socket.SendReceive.cs @@ -17,8 +17,8 @@ namespace System.Net.Sockets.Tests { await OpenLoopbackConnectionAsync(async (client, server) => { - byte[] clientBuffer = new byte[1]; - byte[] serverBuffer = new byte[1]; + ReadOnlyMemory clientBuffer = new byte[1]; + Memory serverBuffer = new byte[1]; foreach (BenchmarkIteration iteration in Benchmark.Iterations) { long iters = Benchmark.InnerIterationCount; @@ -39,8 +39,8 @@ namespace System.Net.Sockets.Tests { await OpenLoopbackConnectionAsync(async (client, server) => { - byte[] clientBuffer = new byte[1]; - byte[] serverBuffer = new byte[1]; + ReadOnlyMemory clientBuffer = new byte[1]; + Memory serverBuffer = new byte[1]; foreach (BenchmarkIteration iteration in Benchmark.Iterations) { long iters = Benchmark.InnerIterationCount; @@ -48,7 +48,7 @@ namespace System.Net.Sockets.Tests { for (int i = 0; i < iters; i++) { - Task r = server.ReceiveAsync(serverBuffer, SocketFlags.None); + ValueTask r = server.ReceiveAsync(serverBuffer, SocketFlags.None); await client.SendAsync(clientBuffer, SocketFlags.None); await r; } @@ -57,30 +57,6 @@ namespace System.Net.Sockets.Tests }); } - [Benchmark(InnerIterationCount = 1_000_000)] - [InlineData(16)] - public async Task ReceiveAsyncThenSendAsync_Task_Parallel(int numConnections) - { - byte[] clientBuffer = new byte[1]; - byte[] serverBuffer = new byte[1]; - foreach (BenchmarkIteration iteration in Benchmark.Iterations) - { - await OpenLoopbackConnectionAsync(async (client, server) => - { - long iters = Benchmark.InnerIterationCount; - using (iteration.StartMeasurement()) - { - for (int i = 0; i < iters; i++) - { - Task r = server.ReceiveAsync(serverBuffer, SocketFlags.None); - await client.SendAsync(clientBuffer, SocketFlags.None); - await r; - } - } - }); - } - } - [Benchmark(InnerIterationCount = 10_000), MeasureGCAllocations] public async Task SendAsyncThenReceiveAsync_SocketAsyncEventArgs() { diff --git a/external/corefx/src/System.Net.Sockets/tests/Performance/System.Net.Sockets.Performance.Tests.csproj b/external/corefx/src/System.Net.Sockets/tests/Performance/System.Net.Sockets.Performance.Tests.csproj index 11c4fca607..03fc01f29b 100644 --- a/external/corefx/src/System.Net.Sockets/tests/Performance/System.Net.Sockets.Performance.Tests.csproj +++ b/external/corefx/src/System.Net.Sockets/tests/Performance/System.Net.Sockets.Performance.Tests.csproj @@ -20,5 +20,8 @@ PerfRunner + + + \ No newline at end of file diff --git a/external/corefx/src/System.Net.WebClient/src/System/Net/WebClient.cs b/external/corefx/src/System.Net.WebClient/src/System/Net/WebClient.cs index 68cf3bd93f..eaf5e9bffc 100644 --- a/external/corefx/src/System.Net.WebClient/src/System/Net/WebClient.cs +++ b/external/corefx/src/System.Net.WebClient/src/System/Net/WebClient.cs @@ -875,6 +875,11 @@ namespace System.Net } writeStream.SetLength(copyBuffer.Length); } + + if (contentLength >= 0) + { + _progress.TotalBytesToReceive = contentLength; + } using (writeStream) using (Stream readStream = response.GetResponseStream()) @@ -883,7 +888,7 @@ namespace System.Net { while (true) { - int bytesRead = await readStream.ReadAsync(copyBuffer, 0, copyBuffer.Length).ConfigureAwait(false); + int bytesRead = await readStream.ReadAsync(new Memory(copyBuffer)).ConfigureAwait(false); if (bytesRead == 0) { break; @@ -895,7 +900,7 @@ namespace System.Net PostProgressChanged(asyncOp, _progress); } - await writeStream.WriteAsync(copyBuffer, 0, bytesRead).ConfigureAwait(false); + await writeStream.WriteAsync(new ReadOnlyMemory(copyBuffer, 0, bytesRead)).ConfigureAwait(false); } } @@ -1005,7 +1010,7 @@ namespace System.Net { if (header != null) { - await writeStream.WriteAsync(header, 0, header.Length).ConfigureAwait(false); + await writeStream.WriteAsync(new ReadOnlyMemory(header)).ConfigureAwait(false); _progress.BytesSent += header.Length; PostProgressChanged(asyncOp, _progress); } @@ -1016,9 +1021,9 @@ namespace System.Net { while (true) { - int bytesRead = await readStream.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false); + int bytesRead = await readStream.ReadAsync(new Memory(buffer)).ConfigureAwait(false); if (bytesRead <= 0) break; - await writeStream.WriteAsync(buffer, 0, bytesRead).ConfigureAwait(false); + await writeStream.WriteAsync(new ReadOnlyMemory(buffer, 0, bytesRead)).ConfigureAwait(false); _progress.BytesSent += bytesRead; PostProgressChanged(asyncOp, _progress); @@ -1034,7 +1039,7 @@ namespace System.Net { toWrite = chunkSize; } - await writeStream.WriteAsync(buffer, pos, toWrite).ConfigureAwait(false); + await writeStream.WriteAsync(new ReadOnlyMemory(buffer, pos, toWrite)).ConfigureAwait(false); pos += toWrite; _progress.BytesSent += toWrite; PostProgressChanged(asyncOp, _progress); @@ -1043,7 +1048,7 @@ namespace System.Net if (footer != null) { - await writeStream.WriteAsync(footer, 0, footer.Length).ConfigureAwait(false); + await writeStream.WriteAsync(new ReadOnlyMemory(footer)).ConfigureAwait(false); _progress.BytesSent += footer.Length; PostProgressChanged(asyncOp, _progress); } diff --git a/external/corefx/src/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj b/external/corefx/src/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj index 7c5b8ceec6..bfa64249a8 100644 --- a/external/corefx/src/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj +++ b/external/corefx/src/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj @@ -19,7 +19,10 @@ Common\System\Net\Http\LoopbackServer.cs + + + Common\System\Threading\Tasks\TaskTimeoutExtensions.cs - \ No newline at end of file + diff --git a/external/corefx/src/System.Net.WebClient/tests/WebClientTest.cs b/external/corefx/src/System.Net.WebClient/tests/WebClientTest.cs index 64efdb0509..45d32915da 100644 --- a/external/corefx/src/System.Net.WebClient/tests/WebClientTest.cs +++ b/external/corefx/src/System.Net.WebClient/tests/WebClientTest.cs @@ -374,12 +374,7 @@ namespace System.Net.Tests { Task download = wc.DownloadStringTaskAsync(url.ToString()); Assert.Null(wc.ResponseHeaders); - await LoopbackServer.ReadRequestAndSendResponseAsync(server, - "HTTP/1.1 200 OK\r\n" + - $"Date: {DateTimeOffset.UtcNow:R}\r\n" + - $"Content-Length: 0\r\n" + - "ArbitraryHeader: ArbitraryValue\r\n" + - "\r\n"); + await server.AcceptConnectionSendResponseAndCloseAsync(additionalHeaders: "ArbitraryHeader: ArbitraryValue\r\n"); await download; }); @@ -430,11 +425,7 @@ namespace System.Net.Tests { Task download = wc.DownloadStringTaskAsync(url.ToString()); Assert.Null(wc.ResponseHeaders); - await LoopbackServer.ReadRequestAndSendResponseAsync(server, - "HTTP/1.1 200 OK\r\n" + - $"Date: {DateTimeOffset.UtcNow:R}\r\n" + - $"Content-Length: 0\r\n" + - "\r\n"); + await server.AcceptConnectionSendResponseAndCloseAsync(); await download; }); } @@ -476,6 +467,8 @@ namespace System.Net.Tests public abstract class WebClientTestBase { + public const int TimeoutMilliseconds = 30 * 1000; + public static readonly object[][] EchoServers = System.Net.Test.Common.Configuration.Http.EchoServers; const string ExpectedText = "To be, or not to be, that is the question:" + @@ -520,12 +513,7 @@ namespace System.Net.Tests } Task download = DownloadStringAsync(wc, url.ToString()); - await LoopbackServer.ReadRequestAndSendResponseAsync(server, - "HTTP/1.1 200 OK\r\n" + - $"Date: {DateTimeOffset.UtcNow:R}\r\n" + - $"Content-Length: {ExpectedText.Length}\r\n" + - "\r\n" + - $"{ExpectedText}"); + await server.AcceptConnectionSendResponseAndCloseAsync(content: ExpectedText); Assert.Equal(ExpectedText, await download); }); } @@ -541,14 +529,13 @@ namespace System.Net.Tests wc.DownloadProgressChanged += (s, e) => downloadProgressInvoked.TrySetResult(true); Task download = DownloadDataAsync(wc, url.ToString()); - await LoopbackServer.ReadRequestAndSendResponseAsync(server, - "HTTP/1.1 200 OK\r\n" + - $"Date: {DateTimeOffset.UtcNow:R}\r\n" + - $"Content-Length: {ExpectedText.Length}\r\n" + - "\r\n" + - $"{ExpectedText}"); + await server.AcceptConnectionSendResponseAndCloseAsync(content: ExpectedText); Assert.Equal(ExpectedText, Encoding.ASCII.GetString(await download)); - Assert.True(!IsAsync || await downloadProgressInvoked.Task, "Expected download progress callback to be invoked"); + + if (IsAsync) + { + await downloadProgressInvoked.Task.TimeoutAfter(TimeoutMilliseconds); + } }); } @@ -559,15 +546,24 @@ namespace System.Net.Tests { string largeText = GetRandomText(1024 * 1024); + var downloadProgressInvokedWithContentLength = new TaskCompletionSource(); var wc = new WebClient(); + wc.DownloadProgressChanged += (s, e) => + { + if (e.TotalBytesToReceive == largeText.Length && e.BytesReceived < e.TotalBytesToReceive) + { + downloadProgressInvokedWithContentLength.TrySetResult(true); + } + }; + Task download = DownloadDataAsync(wc, url.ToString()); - await LoopbackServer.ReadRequestAndSendResponseAsync(server, - "HTTP/1.1 200 OK\r\n" + - $"Date: {DateTimeOffset.UtcNow:R}\r\n" + - $"Content-Length: {largeText.Length}\r\n" + - "\r\n" + - $"{largeText}"); + await server.AcceptConnectionSendResponseAndCloseAsync(content: largeText); Assert.Equal(largeText, Encoding.ASCII.GetString(await download)); + + if (IsAsync) + { + await downloadProgressInvokedWithContentLength.Task.TimeoutAfter(TimeoutMilliseconds); + } }); } @@ -581,12 +577,7 @@ namespace System.Net.Tests { var wc = new WebClient(); Task download = DownloadFileAsync(wc, url.ToString(), tempPath); - await LoopbackServer.ReadRequestAndSendResponseAsync(server, - "HTTP/1.1 200 OK\r\n" + - $"Date: {DateTimeOffset.UtcNow:R}\r\n" + - $"Content-Length: {ExpectedText.Length}\r\n" + - "\r\n" + - $"{ExpectedText}"); + await server.AcceptConnectionSendResponseAndCloseAsync(content: ExpectedText); await download; Assert.Equal(ExpectedText, File.ReadAllText(tempPath)); @@ -605,12 +596,7 @@ namespace System.Net.Tests { var wc = new WebClient(); Task download = OpenReadAsync(wc, url.ToString()); - await LoopbackServer.ReadRequestAndSendResponseAsync(server, - "HTTP/1.1 200 OK\r\n" + - $"Date: {DateTimeOffset.UtcNow:R}\r\n" + - $"Content-Length: {ExpectedText.Length}\r\n" + - "\r\n" + - $"{ExpectedText}"); + await server.AcceptConnectionSendResponseAndCloseAsync(content: ExpectedText); using (var reader = new StreamReader(await download)) { @@ -644,7 +630,10 @@ namespace System.Net.Tests byte[] result = await UploadDataAsync(wc, echoServer.ToString(), Encoding.UTF8.GetBytes(ExpectedText)); Assert.Contains(ExpectedText, Encoding.UTF8.GetString(result)); - Assert.True(!IsAsync || await uploadProgressInvoked.Task, "Expected upload progress callback to be invoked"); + if(IsAsync) + { + await uploadProgressInvoked.Task.TimeoutAfter(TimeoutMilliseconds); + } } [OuterLoop("Networking test talking to remote server: issue #11345")] diff --git a/external/corefx/src/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.cs b/external/corefx/src/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.cs index a80079730a..7dfcff2fd8 100644 --- a/external/corefx/src/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.cs +++ b/external/corefx/src/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.cs @@ -32,6 +32,7 @@ namespace System.Net.WebSockets public System.Net.ICredentials Credentials { get { throw null; } set { } } public System.TimeSpan KeepAliveInterval { get { throw null; } set { } } public System.Net.IWebProxy Proxy { get { throw null; } set { } } + public System.Net.Security.RemoteCertificateValidationCallback RemoteCertificateValidationCallback { get { throw null; } set { } } public bool UseDefaultCredentials { get { throw null; } set { } } public void AddSubProtocol(string subProtocol) { } public void SetBuffer(int receiveBufferSize, int sendBufferSize) { } diff --git a/external/corefx/src/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj b/external/corefx/src/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj index b4619853bb..18a1d23354 100644 --- a/external/corefx/src/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj +++ b/external/corefx/src/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj @@ -13,6 +13,7 @@ + diff --git a/external/corefx/src/System.Net.WebSockets.Client/src/Resources/Strings.resx b/external/corefx/src/System.Net.WebSockets.Client/src/Resources/Strings.resx index cc93c4738e..dc7a2067a1 100644 --- a/external/corefx/src/System.Net.WebSockets.Client/src/Resources/Strings.resx +++ b/external/corefx/src/System.Net.WebSockets.Client/src/Resources/Strings.resx @@ -183,4 +183,7 @@ Client certificate was not found in the personal (\"MY\") certificate store. In UWP, client certificates are only supported if they have been added to that certificate store. + + ClientWebSocketOptions.RemoteCertificateValidationCallback is not supported on this platform. + diff --git a/external/corefx/src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj b/external/corefx/src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj index 60f70c705f..51ea4edfdd 100644 --- a/external/corefx/src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj +++ b/external/corefx/src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj @@ -4,20 +4,17 @@ {B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B} True - + true $(DefineConstants);uap - - - - - - + + + + + + @@ -33,70 +30,18 @@ Common\System\Net\WebSockets\WebSocketValidate.cs - + - - - - - - - - - - - Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs - - - Common\System\Net\Http\WinHttpException.cs - - - Common\System\Runtime\ExceptionServices\ExceptionStackTrace.cs - - - - Interop\Windows\Interop.Libraries.cs - - - Interop\Windows\kernel32\Interop.GetModuleHandle.cs - - - Interop\Windows\Interop.HRESULT_FROM_WIN32.cs - - - Interop\Windows\kernel32\Interop.FormatMessage.cs - - - Interop\Windows\kernel32\Interop.FreeLibrary.cs - - - Interop\Windows\kernel32\Interop.GetProcAddress.cs - - - Interop\Windows\kernel32\Interop.LoadLibraryEx.cs - - - Interop\Windows\winhttp\Interop.SafeWinHttpHandle.cs - - - Interop\Windows\winhttp\Interop.winhttp.cs - - - Interop\Windows\winhttp\Interop.winhttp_types.cs - - - - Common\System\Net\Security\CertificateHelper.cs Common\System\Net\Security\CertificateHelper.Uap.cs - + - + Common\System\StringExtensions.cs @@ -125,6 +70,7 @@ + @@ -137,10 +83,9 @@ - + - @@ -149,4 +94,4 @@ - + \ No newline at end of file diff --git a/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/ClientWebSocket.cs b/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/ClientWebSocket.cs index b0409ce728..8d0146ea38 100644 --- a/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/ClientWebSocket.cs +++ b/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/ClientWebSocket.cs @@ -31,7 +31,7 @@ namespace System.Net.WebSockets WebSocketHandle.CheckPlatformSupport(); _state = (int)InternalState.Created; - _options = new ClientWebSocketOptions(); + _options = new ClientWebSocketOptions() { Proxy = DefaultWebProxy.Instance }; if (NetEventSource.IsEnabled) NetEventSource.Exit(this); } @@ -165,7 +165,7 @@ namespace System.Net.WebSockets return _innerWebSocket.SendAsync(buffer, messageType, endOfMessage, cancellationToken); } - public override Task SendAsync(ReadOnlyMemory buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken) + public override ValueTask SendAsync(ReadOnlyMemory buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken) { ThrowIfNotConnected(); return _innerWebSocket.SendAsync(buffer, messageType, endOfMessage, cancellationToken); @@ -236,5 +236,14 @@ namespace System.Net.WebSockets throw new InvalidOperationException(SR.net_WebSockets_NotConnected); } } + + /// Used as a sentinel to indicate that ClientWebSocket should use the system's default proxy. + internal sealed class DefaultWebProxy : IWebProxy + { + public static DefaultWebProxy Instance { get; } = new DefaultWebProxy(); + public ICredentials Credentials { get => throw new NotSupportedException(); set => throw new NotSupportedException(); } + public Uri GetProxy(Uri destination) => throw new NotSupportedException(); + public bool IsBypassed(Uri host) => throw new NotSupportedException(); + } } } diff --git a/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/ClientWebSocketOptions.cs b/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/ClientWebSocketOptions.cs index c488277150..56aef0d781 100644 --- a/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/ClientWebSocketOptions.cs +++ b/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/ClientWebSocketOptions.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; +using System.Net.Security; using System.Security.Cryptography.X509Certificates; using System.Threading; @@ -24,6 +25,7 @@ namespace System.Net.WebSockets private int _receiveBufferSize = 0x1000; private int _sendBufferSize = 0x1000; private ArraySegment? _buffer; + private RemoteCertificateValidationCallback _remoteCertificateValidationCallback; internal ClientWebSocketOptions() { @@ -108,6 +110,16 @@ namespace System.Net.WebSockets } } + public RemoteCertificateValidationCallback RemoteCertificateValidationCallback + { + get => _remoteCertificateValidationCallback; + set + { + ThrowIfReadOnly(); + _remoteCertificateValidationCallback = value; + } + } + public CookieContainer Cookies { get diff --git a/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.Managed.cs b/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.Managed.cs index 8405225836..7f0b8d13fe 100644 --- a/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.Managed.cs +++ b/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.Managed.cs @@ -9,6 +9,7 @@ using System.Net.Security; using System.Net.Sockets; using System.Runtime.ExceptionServices; using System.Security.Cryptography; +using System.Security.Cryptography.X509Certificates; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -28,7 +29,10 @@ namespace System.Net.WebSockets private const int DefaultReceiveBufferSize = 0x1000; /// GUID appended by the server as part of the security key response. Defined in the RFC. private const string WSServerGuid = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"; - +#if !MONO + /// Shared, lazily-initialized handler for when using default options. + private static SocketsHttpHandler s_defaultHandler; +#endif private readonly CancellationTokenSource _abortSource = new CancellationTokenSource(); private WebSocketState _state = WebSocketState.Connecting; private WebSocket _webSocket; @@ -62,7 +66,7 @@ namespace System.Net.WebSockets public Task SendAsync(ArraySegment buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken) => _webSocket.SendAsync(buffer, messageType, endOfMessage, cancellationToken); - public Task SendAsync(ReadOnlyMemory buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken) => + public ValueTask SendAsync(ReadOnlyMemory buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken) => _webSocket.SendAsync(buffer, messageType, endOfMessage, cancellationToken); public Task ReceiveAsync(ArraySegment buffer, CancellationToken cancellationToken) => @@ -93,6 +97,8 @@ namespace System.Net.WebSockets Socket connectedSocket = await ConnectSocketAsync(uri.Host, uri.Port, cancellationToken).ConfigureAwait(false); Stream stream = new NetworkStream(connectedSocket, ownsSocket:true); + const System.Security.Authentication.SslProtocols AllowedSecurityProtocols = System.Security.Authentication.SslProtocols.Tls | System.Security.Authentication.SslProtocols.Tls11 | System.Security.Authentication.SslProtocols.Tls12; + // Upgrade to SSL if needed if (uri.Scheme == UriScheme.Wss) { @@ -100,7 +106,7 @@ namespace System.Net.WebSockets await sslStream.AuthenticateAsClientAsync( uri.Host, options.ClientCertificates, - SecurityProtocol.AllowedSecurityProtocols, + AllowedSecurityProtocols, checkCertificateRevocation: false).ConfigureAwait(false); stream = sslStream; } @@ -463,4 +469,4 @@ namespace System.Net.WebSockets } } } -} +} \ No newline at end of file diff --git a/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.Win32.cs b/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.Win32.cs deleted file mode 100644 index d602478f37..0000000000 --- a/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.Win32.cs +++ /dev/null @@ -1,64 +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; -using System.Collections.Generic; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Diagnostics; -using System.Net; -using System.Security.Cryptography.X509Certificates; -using System.Threading; -using System.Threading.Tasks; - -using Microsoft.Win32.SafeHandles; - -namespace System.Net.WebSockets -{ - internal readonly partial struct WebSocketHandle - { - private const string WebSocketAvailableApiCheck = "WinHttpWebSocketCompleteUpgrade"; - - private readonly WinHttpWebSocket _webSocket; - - public static WebSocketHandle Create() - { - return new WebSocketHandle(new WinHttpWebSocket()); - } - - public static void CheckPlatformSupport() - { - bool isPlatformSupported = false; - - using (SafeLibraryHandle libHandle = Interop.Kernel32.LoadLibraryExW(Interop.Libraries.WinHttp, IntPtr.Zero, 0)) - { - isPlatformSupported = Interop.Kernel32.GetProcAddress(libHandle, WebSocketAvailableApiCheck) != IntPtr.Zero; - } - - if (!isPlatformSupported) - { - WebSocketValidate.ThrowPlatformNotSupportedException(); - } - } - - private WebSocketHandle(WinHttpWebSocket webSocket) - { - _webSocket = webSocket; - } - - public async Task ConnectAsyncCore(Uri uri, CancellationToken cancellationToken, ClientWebSocketOptions options) - { - try - { - await _webSocket.ConnectAsync(uri, cancellationToken, options).ConfigureAwait(false); - } - catch (Win32Exception ex) - { - var wex = new WebSocketException(SR.net_webstatus_ConnectFailure, ex); - if (NetEventSource.IsEnabled) NetEventSource.Error(_webSocket, wex); - throw wex; - } - } - } -} diff --git a/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.WinRT.cs b/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.WinRT.cs index 6a69057405..38a9de071a 100644 --- a/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.WinRT.cs +++ b/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.WinRT.cs @@ -39,6 +39,11 @@ namespace System.Net.WebSockets public async Task ConnectAsyncCore(Uri uri, CancellationToken cancellationToken, ClientWebSocketOptions options) { + if (options.RemoteCertificateValidationCallback != null) + { + throw new PlatformNotSupportedException(SR.net_WebSockets_RemoteValidationCallbackNotSupported); + } + try { await _webSocket.ConnectAsync(uri, cancellationToken, options).ConfigureAwait(false); diff --git a/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.Windows.cs b/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.Windows.cs index a7f9d1083d..679b5e5d6d 100644 --- a/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.Windows.cs +++ b/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.Windows.cs @@ -80,7 +80,7 @@ namespace System.Net.WebSockets return _webSocket.SendAsync(buffer, messageType, endOfMessage, cancellationToken); } - public Task SendAsync(ReadOnlyMemory buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken) + public ValueTask SendAsync(ReadOnlyMemory buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken) { if (messageType != WebSocketMessageType.Text && messageType != WebSocketMessageType.Binary) { diff --git a/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketMessageTypeAdapter.cs b/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketMessageTypeAdapter.cs deleted file mode 100644 index 965b67831f..0000000000 --- a/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketMessageTypeAdapter.cs +++ /dev/null @@ -1,69 +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.Net.Http; - -namespace System.Net.WebSockets -{ - internal static class WebSocketMessageTypeAdapter - { - internal static Interop.WinHttp.WINHTTP_WEB_SOCKET_BUFFER_TYPE GetWinHttpMessageType(WebSocketMessageType messageType, bool endOfMessage) - { - switch (messageType) - { - case WebSocketMessageType.Binary: - if (endOfMessage) - { - return Interop.WinHttp.WINHTTP_WEB_SOCKET_BUFFER_TYPE.WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE; - } - else - { - return Interop.WinHttp.WINHTTP_WEB_SOCKET_BUFFER_TYPE.WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE; - } - - case WebSocketMessageType.Text: - if (endOfMessage) - { - return Interop.WinHttp.WINHTTP_WEB_SOCKET_BUFFER_TYPE.WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE; - } - else - { - return Interop.WinHttp.WINHTTP_WEB_SOCKET_BUFFER_TYPE.WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE; - } - - case WebSocketMessageType.Close: - return Interop.WinHttp.WINHTTP_WEB_SOCKET_BUFFER_TYPE.WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE; - - default: - Debug.Fail("Unknown WebSocketMessageType."); - return Interop.WinHttp.WINHTTP_WEB_SOCKET_BUFFER_TYPE.WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE; - } - } - - internal static WebSocketMessageType GetWebSocketMessageType(Interop.WinHttp.WINHTTP_WEB_SOCKET_BUFFER_TYPE winHttpMessageType, out bool endOfMessage) - { - switch (winHttpMessageType) - { - case Interop.WinHttp.WINHTTP_WEB_SOCKET_BUFFER_TYPE.WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE: - endOfMessage = true; - return WebSocketMessageType.Binary; - case Interop.WinHttp.WINHTTP_WEB_SOCKET_BUFFER_TYPE.WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE: - endOfMessage = false; - return WebSocketMessageType.Binary; - case Interop.WinHttp.WINHTTP_WEB_SOCKET_BUFFER_TYPE.WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE: - endOfMessage = true; - return WebSocketMessageType.Text; - case Interop.WinHttp.WINHTTP_WEB_SOCKET_BUFFER_TYPE.WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE: - endOfMessage = false; - return WebSocketMessageType.Text; - case Interop.WinHttp.WINHTTP_WEB_SOCKET_BUFFER_TYPE.WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE: - endOfMessage = true; - return WebSocketMessageType.Close; - default: - throw new ArgumentOutOfRangeException(nameof(winHttpMessageType), "Unknown WINHTTP_WEB_SOCKET_BUFFER_TYPE."); - } - } - } -} diff --git a/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WinHttpWebSocket.cs b/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WinHttpWebSocket.cs deleted file mode 100644 index 62052b29bb..0000000000 --- a/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WinHttpWebSocket.cs +++ /dev/null @@ -1,865 +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.Collections.Generic; -using System.Diagnostics; -using System.Net.Http; -using System.Runtime.InteropServices; -using System.Text; -using System.Threading; -using System.Threading.Tasks; - -namespace System.Net.WebSockets -{ - internal sealed class WinHttpWebSocket : WebSocket - { - #region Constants - // TODO (#7893): This code needs to be shared with WinHttpClientHandler - private const string HeaderNameCookie = "Cookie"; - private const string HeaderNameWebSocketProtocol = "Sec-WebSocket-Protocol"; - #endregion - - // TODO (Issue 2503): move System.Net.* strings to resources as appropriate. - - // NOTE: All WinHTTP operations must be called while holding the _operation.Lock. - // It is critical that no handle gets closed while a WinHTTP function is running. - private WebSocketCloseStatus? _closeStatus = null; - private string _closeStatusDescription = null; - private string _subProtocol = null; - private bool _disposed = false; - - private WinHttpWebSocketState _operation = new WinHttpWebSocketState(); - - public WinHttpWebSocket() - { - } - - #region Properties - public override WebSocketCloseStatus? CloseStatus - { - get - { - return _closeStatus; - } - } - - public override string CloseStatusDescription - { - get - { - return _closeStatusDescription; - } - } - - public override WebSocketState State - { - get - { - return _operation.State; - } - } - - public override string SubProtocol - { - get - { - return _subProtocol; - } - } - #endregion - - static readonly WebSocketState[] s_validConnectStates = { WebSocketState.None }; - static readonly WebSocketState[] s_validConnectingStates = { WebSocketState.Connecting }; - - public async Task ConnectAsync(Uri uri, CancellationToken cancellationToken, ClientWebSocketOptions options) - { - _operation.InterlockedCheckAndUpdateState(WebSocketState.Connecting, s_validConnectStates); - - using (CancellationTokenRegistration ctr = ThrowOrRegisterCancellation(cancellationToken)) - { - lock (_operation.Lock) - { - _operation.CheckValidState(s_validConnectingStates); - - // Must grab lock until RequestHandle is populated, otherwise we risk resource leaks on Abort. - // - // TODO (Issue 2506): Alternatively, release the lock between WinHTTP operations and check, under lock, that the - // state is still valid to continue operation. - _operation.SessionHandle = InitializeWinHttp(options); - - _operation.ConnectionHandle = Interop.WinHttp.WinHttpConnectWithCallback( - _operation.SessionHandle, - uri.IdnHost, - (ushort)uri.Port, - 0); - - ThrowOnInvalidHandle(_operation.ConnectionHandle); - - bool secureConnection = uri.Scheme == UriScheme.Https || uri.Scheme == UriScheme.Wss; - - _operation.RequestHandle = Interop.WinHttp.WinHttpOpenRequestWithCallback( - _operation.ConnectionHandle, - "GET", - uri.PathAndQuery, - null, - Interop.WinHttp.WINHTTP_NO_REFERER, - null, - secureConnection ? Interop.WinHttp.WINHTTP_FLAG_SECURE : 0); - - ThrowOnInvalidHandle(_operation.RequestHandle); - _operation.IncrementHandlesOpenWithCallback(); - - if (!Interop.WinHttp.WinHttpSetOption( - _operation.RequestHandle, - Interop.WinHttp.WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET, - IntPtr.Zero, - 0)) - { - WinHttpException.ThrowExceptionUsingLastError(); - } - - // We need the address of the IntPtr to the GCHandle. - IntPtr context = _operation.ToIntPtr(); - IntPtr contextAddress; - unsafe - { - contextAddress = (IntPtr)(void*)&context; - } - - if (!Interop.WinHttp.WinHttpSetOption( - _operation.RequestHandle, - Interop.WinHttp.WINHTTP_OPTION_CONTEXT_VALUE, - contextAddress, - (uint)IntPtr.Size)) - { - WinHttpException.ThrowExceptionUsingLastError(); - } - - const uint notificationFlags = - Interop.WinHttp.WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS | - Interop.WinHttp.WINHTTP_CALLBACK_FLAG_HANDLES | - Interop.WinHttp.WINHTTP_CALLBACK_FLAG_SECURE_FAILURE; - - if (Interop.WinHttp.WinHttpSetStatusCallback( - _operation.RequestHandle, - WinHttpWebSocketCallback.s_StaticCallbackDelegate, - notificationFlags, - IntPtr.Zero) == (IntPtr)Interop.WinHttp.WINHTTP_INVALID_STATUS_CALLBACK) - { - WinHttpException.ThrowExceptionUsingLastError(); - } - - _operation.RequestHandle.AttachCallback(); - - // We need to pin the operation object at this point in time since the WinHTTP callback - // has been fully wired to the request handle and the operation object has been set as - // the context value of the callback. Any notifications from activity on the handle will - // result in the callback being called with the context value. - _operation.Pin(); - - AddRequestHeaders(uri, options); - - _operation.TcsUpgrade = new TaskCompletionSource(); - } - - await InternalSendWsUpgradeRequestAsync().ConfigureAwait(false); - - await InternalReceiveWsUpgradeResponse().ConfigureAwait(false); - - lock (_operation.Lock) - { - VerifyUpgradeResponse(); - - ThrowOnInvalidConnectState(); - - _operation.WebSocketHandle = - Interop.WinHttp.WinHttpWebSocketCompleteUpgrade(_operation.RequestHandle, IntPtr.Zero); - - ThrowOnInvalidHandle(_operation.WebSocketHandle); - _operation.IncrementHandlesOpenWithCallback(); - - // We need the address of the IntPtr to the GCHandle. - IntPtr context = _operation.ToIntPtr(); - IntPtr contextAddress; - unsafe - { - contextAddress = (IntPtr)(void*)&context; - } - - if (!Interop.WinHttp.WinHttpSetOption( - _operation.WebSocketHandle, - Interop.WinHttp.WINHTTP_OPTION_CONTEXT_VALUE, - contextAddress, - (uint)IntPtr.Size)) - { - WinHttpException.ThrowExceptionUsingLastError(); - } - - _operation.WebSocketHandle.AttachCallback(); - _operation.UpdateState(WebSocketState.Open); - - if (_operation.RequestHandle != null) - { - _operation.RequestHandle.Dispose(); - // RequestHandle will be set to null in the callback. - } - _operation.TcsUpgrade = null; - - ctr.Dispose(); - } - } - } - - // Requires lock taken. - private Interop.WinHttp.SafeWinHttpHandle InitializeWinHttp(ClientWebSocketOptions options) - { - Interop.WinHttp.SafeWinHttpHandle sessionHandle; - sessionHandle = Interop.WinHttp.WinHttpOpen( - IntPtr.Zero, - Interop.WinHttp.WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, - null, - null, - (int)Interop.WinHttp.WINHTTP_FLAG_ASYNC); - - ThrowOnInvalidHandle(sessionHandle); - - uint optionAssuredNonBlockingTrue = 1; // TRUE - - if (!Interop.WinHttp.WinHttpSetOption( - sessionHandle, - Interop.WinHttp.WINHTTP_OPTION_ASSURED_NON_BLOCKING_CALLBACKS, - ref optionAssuredNonBlockingTrue, - (uint)sizeof(uint))) - { - WinHttpException.ThrowExceptionUsingLastError(); - } - - return sessionHandle; - } - - private Task InternalSendWsUpgradeRequestAsync() - { - lock (_operation.Lock) - { - ThrowOnInvalidConnectState(); - if (!Interop.WinHttp.WinHttpSendRequest( - _operation.RequestHandle, - Interop.WinHttp.WINHTTP_NO_ADDITIONAL_HEADERS, - 0, - IntPtr.Zero, - 0, - 0, - _operation.ToIntPtr())) - { - WinHttpException.ThrowExceptionUsingLastError(); - } - } - - return _operation.TcsUpgrade.Task; - } - - private Task InternalReceiveWsUpgradeResponse() - { - // TODO (Issue 2507): Potential optimization: move this in WinHttpWebSocketCallback. - lock (_operation.Lock) - { - ThrowOnInvalidConnectState(); - - _operation.TcsUpgrade = new TaskCompletionSource(); - - if (!Interop.WinHttp.WinHttpReceiveResponse(_operation.RequestHandle, IntPtr.Zero)) - { - WinHttpException.ThrowExceptionUsingLastError(); - } - } - - return _operation.TcsUpgrade.Task; - } - - private void ThrowOnInvalidConnectState() - { - // A special behavior for WebSocket upgrade: throws ConnectFailure instead of other Abort messages. - if (_operation.State != WebSocketState.Connecting) - { - throw new WebSocketException(SR.net_webstatus_ConnectFailure); - } - } - - private static readonly WebSocketState[] s_validSendStates = { WebSocketState.Open, WebSocketState.CloseReceived }; - public override Task SendAsync( - ArraySegment buffer, - WebSocketMessageType messageType, - bool endOfMessage, - CancellationToken cancellationToken) - { - _operation.InterlockedCheckValidStates(s_validSendStates); - - using (CancellationTokenRegistration ctr = ThrowOrRegisterCancellation(cancellationToken)) - { - var bufferType = WebSocketMessageTypeAdapter.GetWinHttpMessageType(messageType, endOfMessage); - - _operation.PinSendBuffer(buffer); - - bool sendOperationAlreadyPending = false; - if (_operation.PendingWriteOperation == false) - { - lock (_operation.Lock) - { - _operation.CheckValidState(s_validSendStates); - - if (_operation.PendingWriteOperation == false) - { - _operation.PendingWriteOperation = true; - _operation.TcsSend = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - uint ret = Interop.WinHttp.WinHttpWebSocketSend( - _operation.WebSocketHandle, - bufferType, - buffer.Count > 0 ? Marshal.UnsafeAddrOfPinnedArrayElement(buffer.Array, buffer.Offset) : IntPtr.Zero, - (uint)buffer.Count); - - if (Interop.WinHttp.ERROR_SUCCESS != ret) - { - throw WinHttpException.CreateExceptionUsingError((int)ret); - } - } - else - { - sendOperationAlreadyPending = true; - } - } - } - else - { - sendOperationAlreadyPending = true; - } - - if (sendOperationAlreadyPending) - { - var exception = new InvalidOperationException( - SR.Format(SR.net_Websockets_AlreadyOneOutstandingOperation, "SendAsync")); - - _operation.TcsSend.TrySetException(exception); - Abort(); - } - - return _operation.TcsSend.Task; - } - } - - private static readonly WebSocketState[] s_validReceiveStates = { WebSocketState.Open, WebSocketState.CloseSent }; - private static readonly WebSocketState[] s_validAfterReceiveStates = { WebSocketState.Open, WebSocketState.CloseSent, WebSocketState.CloseReceived }; - public override async Task ReceiveAsync( - ArraySegment buffer, - CancellationToken cancellationToken) - { - _operation.InterlockedCheckValidStates(s_validReceiveStates); - - using (ThrowOrRegisterCancellation(cancellationToken)) - { - _operation.PinReceiveBuffer(buffer); - - await InternalReceiveAsync(buffer).ConfigureAwait(false); - - // Check for abort. - _operation.InterlockedCheckValidStates(s_validAfterReceiveStates); - - bool endOfMessage; - WebSocketMessageType bufferType = WebSocketMessageTypeAdapter.GetWebSocketMessageType(_operation.BufferType, out endOfMessage); - int bytesTransferred = checked((int)_operation.BytesTransferred); - - WebSocketReceiveResult ret; - - if (bufferType == WebSocketMessageType.Close) - { - UpdateServerCloseStatus(); - ret = new WebSocketReceiveResult(bytesTransferred, bufferType, endOfMessage, _closeStatus, _closeStatusDescription); - } - else - { - ret = new WebSocketReceiveResult(bytesTransferred, bufferType, endOfMessage); - } - - return ret; - } - } - - public override async ValueTask ReceiveAsync(Memory buffer, CancellationToken cancellationToken) - { - _operation.InterlockedCheckValidStates(s_validReceiveStates); - - using (ThrowOrRegisterCancellation(cancellationToken)) - using (buffer.Retain(pin: true)) - { - await InternalReceiveAsync(buffer).ConfigureAwait(false); - - // Check for abort. - _operation.InterlockedCheckValidStates(s_validAfterReceiveStates); - - WebSocketMessageType bufferType = WebSocketMessageTypeAdapter.GetWebSocketMessageType(_operation.BufferType, out bool endOfMessage); - int bytesTransferred = checked((int)_operation.BytesTransferred); - - if (bufferType == WebSocketMessageType.Close) - { - UpdateServerCloseStatus(); - } - - return new ValueWebSocketReceiveResult(bytesTransferred, bufferType, endOfMessage); - } - } - - private Task InternalReceiveAsync(Memory pinnedBuffer) - { - bool receiveOperationAlreadyPending = false; - if (_operation.PendingReadOperation == false) - { - lock (_operation.Lock) - { - if (_operation.PendingReadOperation == false) - { - _operation.CheckValidState(s_validReceiveStates); - - // Prevent continuations from running on the same thread as the callback to prevent re-entrance deadlocks - _operation.TcsReceive = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - _operation.PendingReadOperation = true; - - uint bytesRead = 0; - Interop.WinHttp.WINHTTP_WEB_SOCKET_BUFFER_TYPE winHttpBufferType = 0; - IntPtr pinnedBufferPtr; - unsafe - { - fixed (byte* p = &MemoryMarshal.GetReference(pinnedBuffer.Span)) - { - pinnedBufferPtr = (IntPtr)p; - } - } - - uint status = Interop.WinHttp.WinHttpWebSocketReceive( - _operation.WebSocketHandle, - pinnedBufferPtr, - (uint)pinnedBuffer.Length, - out bytesRead, // Unused in async mode: ignore. - out winHttpBufferType); // Unused in async mode: ignore. - - if (Interop.WinHttp.ERROR_SUCCESS != status) - { - throw WinHttpException.CreateExceptionUsingError((int)status); - } - } - else - { - receiveOperationAlreadyPending = true; - } - } - } - else - { - receiveOperationAlreadyPending = true; - } - - if (receiveOperationAlreadyPending) - { - var exception = new InvalidOperationException( - SR.Format(SR.net_Websockets_AlreadyOneOutstandingOperation, "ReceiveAsync")); - _operation.TcsReceive.TrySetException(exception); - - Abort(); - } - - return _operation.TcsReceive.Task; - } - - private static readonly WebSocketState[] s_validCloseStates = { WebSocketState.Open, WebSocketState.CloseReceived, WebSocketState.CloseSent }; - public override async Task CloseAsync( - WebSocketCloseStatus closeStatus, - string statusDescription, - CancellationToken cancellationToken) - { - _operation.InterlockedCheckAndUpdateState(WebSocketState.CloseSent, s_validCloseStates); - - using (CancellationTokenRegistration ctr = ThrowOrRegisterCancellation(cancellationToken)) - { - _operation.TcsClose = new TaskCompletionSource(); - await InternalCloseAsync(closeStatus, statusDescription).ConfigureAwait(false); - UpdateServerCloseStatus(); - } - } - - private Task InternalCloseAsync(WebSocketCloseStatus closeStatus, string statusDescription) - { - uint ret; - _operation.TcsClose = new TaskCompletionSource(); - - lock (_operation.Lock) - { - _operation.CheckValidState(s_validCloseStates); - - if (!string.IsNullOrEmpty(statusDescription)) - { - byte[] statusDescriptionBuffer = Encoding.UTF8.GetBytes(statusDescription); - - ret = Interop.WinHttp.WinHttpWebSocketClose( - _operation.WebSocketHandle, - (ushort)closeStatus, - statusDescriptionBuffer, - (uint)statusDescriptionBuffer.Length); - } - else - { - ret = Interop.WinHttp.WinHttpWebSocketClose( - _operation.WebSocketHandle, - (ushort)closeStatus, - IntPtr.Zero, - 0); - } - - if (ret != Interop.WinHttp.ERROR_SUCCESS) - { - throw WinHttpException.CreateExceptionUsingError((int)ret); - } - } - return _operation.TcsClose.Task; - } - - private void UpdateServerCloseStatus() - { - uint ret; - ushort serverStatus; - var closeDescription = new byte[WebSocketValidate.MaxControlFramePayloadLength]; - uint closeDescriptionConsumed; - - lock (_operation.Lock) - { - ret = Interop.WinHttp.WinHttpWebSocketQueryCloseStatus( - _operation.WebSocketHandle, - out serverStatus, - closeDescription, - (uint)closeDescription.Length, - out closeDescriptionConsumed); - - if (ret != Interop.WinHttp.ERROR_SUCCESS) - { - throw WinHttpException.CreateExceptionUsingError((int)ret); - } - - _closeStatus = (WebSocketCloseStatus)serverStatus; - _closeStatusDescription = Encoding.UTF8.GetString(closeDescription, 0, (int)closeDescriptionConsumed); - } - } - - private static readonly WebSocketState[] s_validCloseOutputStates = { WebSocketState.Open, WebSocketState.CloseReceived }; - private static readonly WebSocketState[] s_validCloseOutputStatesAfterUpdate = { WebSocketState.CloseReceived, WebSocketState.CloseSent }; - public override Task CloseOutputAsync( - WebSocketCloseStatus closeStatus, - string statusDescription, - CancellationToken cancellationToken) - { - _operation.InterlockedCheckAndUpdateState(WebSocketState.CloseSent, s_validCloseOutputStates); - - using (CancellationTokenRegistration ctr = ThrowOrRegisterCancellation(cancellationToken)) - { - lock (_operation.Lock) - { - _operation.CheckValidState(s_validCloseOutputStatesAfterUpdate); - - uint ret; - _operation.TcsCloseOutput = new TaskCompletionSource(); - - if (!string.IsNullOrEmpty(statusDescription)) - { - byte[] statusDescriptionBuffer = Encoding.UTF8.GetBytes(statusDescription); - - ret = Interop.WinHttp.WinHttpWebSocketShutdown( - _operation.WebSocketHandle, - (ushort)closeStatus, - statusDescriptionBuffer, - (uint)statusDescriptionBuffer.Length); - } - else - { - ret = Interop.WinHttp.WinHttpWebSocketShutdown( - _operation.WebSocketHandle, - (ushort)closeStatus, - IntPtr.Zero, - 0); - } - - if (ret != Interop.WinHttp.ERROR_SUCCESS) - { - throw WinHttpException.CreateExceptionUsingError((int)ret); - } - } - - return _operation.TcsCloseOutput.Task; - } - } - - private void VerifyUpgradeResponse() - { - // Check the status code - var statusCode = GetHttpStatusCode(); - if (statusCode != HttpStatusCode.SwitchingProtocols) - { - Abort(); - return; - } - - _subProtocol = GetResponseHeader(HeaderNameWebSocketProtocol); - } - - private void AddRequestHeaders(Uri uri, ClientWebSocketOptions options) - { - var requestHeadersBuffer = new StringBuilder(); - - // Manually add cookies. - if (options.Cookies != null) - { - AppendCookieHeaderLine(uri, options.Cookies, requestHeadersBuffer); - } - - // Serialize general request headers. - requestHeadersBuffer.AppendLine(options.RequestHeaders.ToString()); - - using (List.Enumerator e = options.RequestedSubProtocols.GetEnumerator()) - { - if (e.MoveNext()) - { - requestHeadersBuffer.Append(HeaderNameWebSocketProtocol + ": "); - requestHeadersBuffer.Append(e.Current); - - while (e.MoveNext()) - { - requestHeadersBuffer.Append(", "); - requestHeadersBuffer.Append(e.Current); - } - - requestHeadersBuffer.AppendLine(); - } - } - - // Add request headers to WinHTTP request handle. - if (!Interop.WinHttp.WinHttpAddRequestHeaders( - _operation.RequestHandle, - requestHeadersBuffer, - (uint)requestHeadersBuffer.Length, - Interop.WinHttp.WINHTTP_ADDREQ_FLAG_ADD)) - { - WinHttpException.ThrowExceptionUsingLastError(); - } - } - - private static void AppendCookieHeaderLine(Uri uri, CookieContainer cookies, StringBuilder requestHeadersBuffer) - { - Debug.Assert(cookies != null); - Debug.Assert(requestHeadersBuffer != null); - - string cookieValues = cookies.GetCookieHeader(uri); - if (!string.IsNullOrEmpty(cookieValues)) - { - requestHeadersBuffer.Append(HeaderNameCookie + ": "); - requestHeadersBuffer.AppendLine(cookieValues); - } - } - - private HttpStatusCode GetHttpStatusCode() - { - uint infoLevel = Interop.WinHttp.WINHTTP_QUERY_STATUS_CODE | Interop.WinHttp.WINHTTP_QUERY_FLAG_NUMBER; - uint result = 0; - uint resultSize = sizeof(uint); - - if (!Interop.WinHttp.WinHttpQueryHeaders( - _operation.RequestHandle, - infoLevel, - Interop.WinHttp.WINHTTP_HEADER_NAME_BY_INDEX, - ref result, - ref resultSize, - IntPtr.Zero)) - { - WinHttpException.ThrowExceptionUsingLastError(); - } - - return (HttpStatusCode)result; - } - - private unsafe string GetResponseHeader(string headerName, char[] buffer = null) - { - const int StackLimit = 128; - - Debug.Assert(buffer == null || (buffer != null && buffer.Length > StackLimit)); - - int bufferLength; - - if (buffer == null) - { - bufferLength = StackLimit; - char* pBuffer = stackalloc char[bufferLength]; - if (QueryHeaders(headerName, pBuffer, ref bufferLength)) - { - return new string(pBuffer, 0, bufferLength); - } - } - else - { - bufferLength = buffer.Length; - fixed (char* pBuffer = &buffer[0]) - { - if (QueryHeaders(headerName, pBuffer, ref bufferLength)) - { - return new string(pBuffer, 0, bufferLength); - } - } - } - - int lastError = Marshal.GetLastWin32Error(); - - if (lastError == Interop.WinHttp.ERROR_WINHTTP_HEADER_NOT_FOUND) - { - return null; - } - - if (lastError == Interop.WinHttp.ERROR_INSUFFICIENT_BUFFER) - { - buffer = new char[bufferLength]; - return GetResponseHeader(headerName, buffer); - } - - throw WinHttpException.CreateExceptionUsingError(lastError); - } - - private unsafe bool QueryHeaders(string headerName, char* buffer, ref int bufferLength) - { - Debug.Assert(bufferLength >= 0, "bufferLength must not be negative."); - - uint index = 0; - - // Convert the char buffer length to the length in bytes. - uint bufferLengthInBytes = (uint)bufferLength * sizeof(char); - - // The WinHttpQueryHeaders buffer length is in bytes, - // but the API actually returns Unicode characters. - bool result = Interop.WinHttp.WinHttpQueryHeaders( - _operation.RequestHandle, - Interop.WinHttp.WINHTTP_QUERY_CUSTOM, - headerName, - new IntPtr(buffer), - ref bufferLengthInBytes, - ref index); - - // Convert the byte buffer length back to the length in chars. - bufferLength = (int)bufferLengthInBytes / sizeof(char); - - return result; - } - - public override void Dispose() - { - if (!_disposed) - { - lock (_operation.Lock) - { - // Disposing will involve calling WinHttpClose on handles. It is critical that no other WinHttp - // function is running at the same time. - - if (!_disposed) - { - _operation.Dispose(); - - _disposed = true; - } - } - } - - // No need to suppress finalization since the finalizer is not overridden. - } - - public override void Abort() - { - lock (_operation.Lock) - { - if ((State != WebSocketState.None) && (State != WebSocketState.Connecting)) - { - _operation.UpdateState(WebSocketState.Aborted); - } - else - { - // ClientWebSocket Desktop behavior: a ws that was not connected will not switch state to Aborted. - _operation.UpdateState(WebSocketState.Closed); - } - - Dispose(); - } - - CancelAllOperations(); - } - - private void CancelAllOperations() - { - if (_operation.TcsClose != null) - { - var exception = new WebSocketException( - WebSocketError.InvalidState, - SR.Format( - SR.net_WebSockets_InvalidState_ClosedOrAborted, - "System.Net.WebSockets.InternalClientWebSocket", - "Aborted")); - - _operation.TcsClose.TrySetException(exception); - } - - if (_operation.TcsCloseOutput != null) - { - var exception = new WebSocketException( - WebSocketError.InvalidState, - SR.Format( - SR.net_WebSockets_InvalidState_ClosedOrAborted, - "System.Net.WebSockets.InternalClientWebSocket", - "Aborted")); - - _operation.TcsCloseOutput.TrySetException(exception); - } - - if (_operation.TcsReceive != null) - { - _operation.TcsReceive.TrySetCanceled(); - } - - if (_operation.TcsSend != null) - { - var exception = new OperationCanceledException(); - _operation.TcsSend.TrySetException(exception); - } - - if (_operation.TcsUpgrade != null) - { - var exception = new WebSocketException(SR.net_webstatus_ConnectFailure); - _operation.TcsUpgrade.TrySetException(exception); - } - } - - private void ThrowOnInvalidHandle(Interop.WinHttp.SafeWinHttpHandle value) - { - if (value.IsInvalid) - { - Abort(); - throw new WebSocketException( - SR.net_webstatus_ConnectFailure, - WinHttpException.CreateExceptionUsingLastError()); - } - } - - private CancellationTokenRegistration ThrowOrRegisterCancellation(CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - Abort(); - cancellationToken.ThrowIfCancellationRequested(); - } - - CancellationTokenRegistration cancellationRegistration = - cancellationToken.Register(s => ((WinHttpWebSocket)s).Abort(), this); - - return cancellationRegistration; - } - } -} diff --git a/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WinHttpWebSocketCallback.cs b/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WinHttpWebSocketCallback.cs deleted file mode 100644 index 5ba776c1ba..0000000000 --- a/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WinHttpWebSocketCallback.cs +++ /dev/null @@ -1,376 +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.Net.Http; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using System.ComponentModel; -using System.Runtime.InteropServices; -using System.Diagnostics; - -namespace System.Net.WebSockets -{ - /// - /// Static class containing the WinHttp global callback and associated routines. - /// - internal static class WinHttpWebSocketCallback - { - public static Interop.WinHttp.WINHTTP_STATUS_CALLBACK s_StaticCallbackDelegate = - new Interop.WinHttp.WINHTTP_STATUS_CALLBACK(WinHttpCallback); - - public static void WinHttpCallback( - IntPtr handle, - IntPtr context, - uint internetStatus, - IntPtr statusInformation, - uint statusInformationLength) - { - if (Environment.HasShutdownStarted) - { - return; - } - - if (context == IntPtr.Zero) - { - Debug.Assert(internetStatus != Interop.WinHttp.WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING); - return; - } - - try - { - WinHttpWebSocketState state = WinHttpWebSocketState.FromIntPtr(context); - Debug.Assert(state != null, "WinHttpWebSocketCallback: state should not be null"); - - if ((state.RequestHandle != null) && - (state.RequestHandle.DangerousGetHandle() == handle)) - { - RequestCallback(handle, state, internetStatus, statusInformation, statusInformationLength); - return; - } - - if ((state.WebSocketHandle != null) && - (state.WebSocketHandle.DangerousGetHandle() == handle)) - { - WebSocketCallback(handle, state, internetStatus, statusInformation, statusInformationLength); - return; - } - } - catch (Exception ex) - { - Debug.Fail("Unhandled exception in WinHTTP callback: " + ex); - } - } - - #region RequestCallback - - private static void RequestCallback( - IntPtr handle, - WinHttpWebSocketState state, - uint internetStatus, - IntPtr statusInformation, - uint statusInformationLength) - { - switch (internetStatus) - { - case Interop.WinHttp.WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE: - OnRequestSendRequestComplete(state); - return; - - case Interop.WinHttp.WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE: - OnRequestHeadersAvailable(state); - return; - - case Interop.WinHttp.WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING: - OnRequestHandleClosing(state); - return; - - case Interop.WinHttp.WINHTTP_CALLBACK_STATUS_REQUEST_ERROR: - Debug.Assert( - statusInformationLength == Marshal.SizeOf(), - "RequestCallback: statusInformationLength=" + statusInformationLength + - " must be sizeof(WINHTTP_ASYNC_RESULT)=" + Marshal.SizeOf()); - - var asyncResult = Marshal.PtrToStructure(statusInformation); - OnRequestError(state, asyncResult); - return; - - case Interop.WinHttp.WINHTTP_CALLBACK_STATUS_SECURE_FAILURE: - Debug.Assert( - statusInformationLength == sizeof(uint), - "RequestCallback: statusInformationLength must be sizeof(uint)."); - - // statusInformation contains a flag: WINHTTP_CALLBACK_STATUS_FLAG_* - uint flags = 0; - unchecked - { - flags = (uint)Marshal.ReadInt32(statusInformation); - } - OnRequestSecureFailure(state, flags); - - return; - } - } - - private static void OnRequestSendRequestComplete(WinHttpWebSocketState state) - { - Debug.Assert(state != null, "OnRequestSendRequestComplete: state is null"); - Debug.Assert(state.TcsUpgrade != null, "OnRequestSendRequestComplete: task completion source is null"); - state.TcsUpgrade.TrySetResult(true); - } - - private static void OnRequestHeadersAvailable(WinHttpWebSocketState state) - { - Debug.Assert(state != null, "OnRequestHeadersAvailable: state is null"); - Debug.Assert(state.TcsUpgrade != null, "OnRequestHeadersAvailable: task completion source is null"); - state.TcsUpgrade.TrySetResult(true); - } - - private static void OnRequestHandleClosing(WinHttpWebSocketState state) - { - Debug.Assert(state != null, "OnRequestError: state is null"); - Debug.Assert(state.RequestHandle != null, "OnRequestError: RequestHandle is null"); - Debug.Assert(!state.RequestHandle.IsInvalid, "OnRequestError: RequestHandle is invalid"); - - state.RequestHandle.DetachCallback(); - state.RequestHandle = null; - - // Unpin the state object if there are no more open handles that are wired to the callback. - if (state.DecrementHandlesOpenWithCallback() == 0) - { - state.Unpin(); - } - } - - private static void OnRequestError( - WinHttpWebSocketState state, - Interop.WinHttp.WINHTTP_ASYNC_RESULT asyncResult) - { - Debug.Assert(state != null, "OnRequestError: state is null"); - - var innerException = WinHttpException.CreateExceptionUsingError(unchecked((int)asyncResult.dwError)); - - switch (unchecked((uint)asyncResult.dwResult.ToInt32())) - { - case Interop.WinHttp.API_SEND_REQUEST: - case Interop.WinHttp.API_RECEIVE_RESPONSE: - { - var exception = new WebSocketException(SR.net_webstatus_ConnectFailure, innerException); - state.UpdateState(WebSocketState.Closed); - state.TcsUpgrade.TrySetException(exception); - } - break; - - default: - { - Debug.Fail( - "OnRequestError: Result (" + asyncResult.dwResult + ") is not expected.", - "Error code: " + asyncResult.dwError + " (" + innerException.Message + ")"); - } - break; - } - } - - private static void OnRequestSecureFailure(WinHttpWebSocketState state, uint flags) - { - Debug.Assert(state != null, "OnRequestSecureFailure: state is null"); - - var innerException = WinHttpException.CreateExceptionUsingError(unchecked((int)Interop.WinHttp.ERROR_WINHTTP_SECURE_FAILURE)); - - var exception = new WebSocketException( - WebSocketError.Success, - SR.net_webstatus_ConnectFailure, - innerException); - - // TODO (#2509): handle SSL related exceptions. - state.UpdateState(WebSocketState.Closed); - - // TODO (#2509): Create exception from WINHTTP_CALLBACK_STATUS_SECURE_FAILURE flags. - state.TcsUpgrade.TrySetException(exception); - } - #endregion - - #region WebSocketCallback - private static void WebSocketCallback( - IntPtr handle, - WinHttpWebSocketState state, - uint internetStatus, - IntPtr statusInformation, - uint statusInformationLength) - { - switch (internetStatus) - { - case Interop.WinHttp.WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE: - OnWebSocketWriteComplete(state); - return; - - case Interop.WinHttp.WINHTTP_CALLBACK_STATUS_READ_COMPLETE: - Debug.Assert( - statusInformationLength == Marshal.SizeOf(), - "WebSocketCallback: statusInformationLength must be sizeof(WINHTTP_WEB_SOCKET_STATUS)."); - - var info = Marshal.PtrToStructure(statusInformation); - OnWebSocketReadComplete(state, info); - return; - - case Interop.WinHttp.WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE: - OnWebSocketCloseComplete(state); - return; - - case Interop.WinHttp.WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE: - OnWebSocketShutdownComplete(state); - return; - - case Interop.WinHttp.WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING: - OnWebSocketHandleClosing(state); - return; - - case Interop.WinHttp.WINHTTP_CALLBACK_STATUS_REQUEST_ERROR: - Debug.Assert( - statusInformationLength == Marshal.SizeOf(), - "WebSocketCallback: statusInformationLength must be sizeof(WINHTTP_WEB_SOCKET_ASYNC_RESULT)."); - - var asyncResult = Marshal.PtrToStructure(statusInformation); - OnWebSocketError(state, asyncResult); - return; - - case Interop.WinHttp.WINHTTP_CALLBACK_STATUS_SECURE_FAILURE: - Debug.Assert( - statusInformationLength == sizeof(uint), - "WebSocketCallback: statusInformationLength must be sizeof(uint)."); - - // statusInformation contains a flag: WINHTTP_CALLBACK_STATUS_FLAG_* - uint flags = unchecked((uint)statusInformation); - OnRequestSecureFailure(state, flags); - return; - } - } - - private static void OnWebSocketWriteComplete(WinHttpWebSocketState state) - { - Debug.Assert(state != null, "OnWebSocketWriteComplete: state is null"); - - state.PendingWriteOperation = false; - state.TcsSend.TrySetResult(true); - } - - private static void OnWebSocketReadComplete( - WinHttpWebSocketState state, - Interop.WinHttp.WINHTTP_WEB_SOCKET_STATUS info) - { - Debug.Assert(state != null, "OnWebSocketReadComplete: state is null"); - - if (info.eBufferType == Interop.WinHttp.WINHTTP_WEB_SOCKET_BUFFER_TYPE.WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE) - { - state.UpdateState(WebSocketState.CloseReceived); - } - - state.BufferType = info.eBufferType; - state.BytesTransferred = info.dwBytesTransferred; - state.PendingReadOperation = false; - - state.TcsReceive.TrySetResult(true); - } - - private static void OnWebSocketCloseComplete(WinHttpWebSocketState state) - { - Debug.Assert(state != null, "OnWebSocketCloseComplete: state is null"); - - state.UpdateState(WebSocketState.Closed); - state.TcsClose.TrySetResult(true); - } - - private static void OnWebSocketShutdownComplete(WinHttpWebSocketState state) - { - Debug.Assert(state != null, "OnWebSocketShutdownComplete: state is null"); - - state.UpdateState(WebSocketState.CloseSent); - state.TcsCloseOutput.TrySetResult(true); - } - - private static void OnWebSocketHandleClosing(WinHttpWebSocketState state) - { - Debug.Assert(state != null, "OnWebSocketHandleClosing: state is null"); - Debug.Assert(state.WebSocketHandle != null, "OnWebSocketHandleClosing: WebSocketHandle is null"); - Debug.Assert(!state.WebSocketHandle.IsInvalid, "OnWebSocketHandleClosing: WebSocketHandle is invalid"); - - state.WebSocketHandle.DetachCallback(); - state.WebSocketHandle = null; - - // Unpin the state object if there are no more open handles that are wired to the callback. - if (state.DecrementHandlesOpenWithCallback() == 0) - { - state.Unpin(); - } - } - - private static void OnWebSocketError( - WinHttpWebSocketState state, - Interop.WinHttp.WINHTTP_WEB_SOCKET_ASYNC_RESULT asyncResult) - { - Debug.Assert(state != null, "OnWebSocketError: state is null"); - - var innerException = WinHttpException.CreateExceptionUsingError(unchecked((int)(asyncResult.AsyncResult.dwError))); - - if (asyncResult.AsyncResult.dwError == Interop.WinHttp.ERROR_WINHTTP_OPERATION_CANCELLED) - { - state.UpdateState(WebSocketState.Aborted); - - if (state.TcsReceive != null) - { - state.TcsReceive.TrySetCanceled(); - } - - if (state.TcsSend != null) - { - state.TcsSend.TrySetCanceled(); - } - - return; - } - - switch (asyncResult.Operation) - { - case Interop.WinHttp.WINHTTP_WEB_SOCKET_OPERATION.WINHTTP_WEB_SOCKET_SEND_OPERATION: - state.PendingWriteOperation = false; - state.TcsSend.TrySetException(innerException); - break; - - case Interop.WinHttp.WINHTTP_WEB_SOCKET_OPERATION.WINHTTP_WEB_SOCKET_RECEIVE_OPERATION: - state.PendingReadOperation = false; - state.TcsReceive.TrySetException(innerException); - break; - - case Interop.WinHttp.WINHTTP_WEB_SOCKET_OPERATION.WINHTTP_WEB_SOCKET_CLOSE_OPERATION: - state.TcsClose.TrySetException(innerException); - break; - - case Interop.WinHttp.WINHTTP_WEB_SOCKET_OPERATION.WINHTTP_WEB_SOCKET_SHUTDOWN_OPERATION: - state.TcsCloseOutput.TrySetException(innerException); - break; - - default: - Debug.Fail( - "OnWebSocketError: Operation (" + asyncResult.Operation + ") is not expected.", - "Error code: " + asyncResult.AsyncResult.dwError + " (" + innerException.Message + ")"); - break; - } - } - - private static void OnWebSocketSecureFailure(WinHttpWebSocketState state, uint flags) - { - Debug.Assert(state != null, "OnWebSocketSecureFailure: state is null"); - - var innerException = WinHttpException.CreateExceptionUsingError(unchecked((int)Interop.WinHttp.ERROR_WINHTTP_SECURE_FAILURE)); - var exception = new WebSocketException(WebSocketError.ConnectionClosedPrematurely, innerException); - - // TODO (Issue 2509): handle SSL related exceptions. - state.UpdateState(WebSocketState.Aborted); - - // TODO (Issue 2509): Create exception from WINHTTP_CALLBACK_STATUS_SECURE_FAILURE flags. - state.TcsUpgrade.TrySetException(exception); - } - #endregion - } -} diff --git a/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WinHttpWebSocketState.cs b/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WinHttpWebSocketState.cs deleted file mode 100644 index f96c318cac..0000000000 --- a/external/corefx/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/WinHttpWebSocketState.cs +++ /dev/null @@ -1,286 +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.InteropServices; -using System.Threading; -using System.Threading.Tasks; - -namespace System.Net.WebSockets -{ - internal sealed class WinHttpWebSocketState : IDisposable - { - // TODO (Issue 2506): The current locking mechanism doesn't allow any two WinHttp functions executing at - // the same time for the same handle. Enhance locking to prevent only WinHttpCloseHandle being called - // during other API execution. E.g. using a Reader/Writer model or, even better, Interlocked functions. - - // The _lock object must be during the execution of any WinHttp function to ensure no race conditions with - // calling WinHttpCloseHandle. - private readonly object _lock = new object(); - - private Interop.WinHttp.SafeWinHttpHandle _sessionHandle; - private Interop.WinHttp.SafeWinHttpHandle _connectionHandle; - private Interop.WinHttp.SafeWinHttpHandleWithCallback _requestHandle; - private Interop.WinHttp.SafeWinHttpHandleWithCallback _webSocketHandle; - private int _handlesOpenWithCallback = 0; - - // A GCHandle for this operation object. - // This is owned by the callback and will be unpinned by the callback when it determines that - // no further calls will happen on the callback, i.e. all WinHTTP handles have fully closed via - // a WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING notification being received by the callback. - private GCHandle _operationHandle = new GCHandle(); - - private volatile WebSocketState _state = WebSocketState.None; - private volatile bool _pendingReadOperation = false; - private volatile bool _pendingWriteOperation = false; - - // TODO (Issue 2505): temporary pinned buffer caches of 1 item. Will be replaced by PinnableBufferCache. - private GCHandle _cachedSendPinnedBuffer = default(GCHandle); - private GCHandle _cachedReceivePinnedBuffer = default(GCHandle); - - private volatile bool _disposed = false; // To detect redundant calls - - public WinHttpWebSocketState() - { - } - - public void Pin() - { - Debug.Assert(!_operationHandle.IsAllocated); - _operationHandle = GCHandle.Alloc(this); - } - - public void Unpin() - { - if (_operationHandle.IsAllocated) - { - Debug.Assert(_handlesOpenWithCallback == 0); - - // This method only gets called when the WinHTTP request/websocket handles are fully closed and thus - // all async operations are done. So, it is safe at this point to unpin the buffers and release - // the strong GCHandle for this object. - if (_cachedReceivePinnedBuffer.IsAllocated) - { - _cachedReceivePinnedBuffer.Free(); - _cachedReceivePinnedBuffer = default(GCHandle); - } - - if (_cachedSendPinnedBuffer.IsAllocated) - { - _cachedSendPinnedBuffer.Free(); - _cachedSendPinnedBuffer = default(GCHandle); - } - - _operationHandle.Free(); - _operationHandle = default(GCHandle); - } - } - - public void PinSendBuffer(ArraySegment buffer) - { - if (!_cachedSendPinnedBuffer.IsAllocated || _cachedSendPinnedBuffer.Target != buffer.Array) - { - if (_cachedSendPinnedBuffer.IsAllocated) - { - _cachedSendPinnedBuffer.Free(); - } - - _cachedSendPinnedBuffer = GCHandle.Alloc(buffer.Array, GCHandleType.Pinned); - } - } - - public void PinReceiveBuffer(ArraySegment buffer) - { - if (!_cachedReceivePinnedBuffer.IsAllocated || _cachedReceivePinnedBuffer.Target != buffer.Array) - { - if (_cachedReceivePinnedBuffer.IsAllocated) - { - _cachedReceivePinnedBuffer.Free(); - } - - _cachedReceivePinnedBuffer = GCHandle.Alloc(buffer.Array, GCHandleType.Pinned); - } - } - - public void IncrementHandlesOpenWithCallback() - { - Interlocked.Increment(ref _handlesOpenWithCallback); - } - - public int DecrementHandlesOpenWithCallback() - { - int count = Interlocked.Decrement(ref _handlesOpenWithCallback); - Debug.Assert(count >= 0); - - return count; - } - - public WebSocketState State - { - get - { - return _state; - } - } - - public object Lock - { - get - { - return _lock; - } - } - - public Interop.WinHttp.SafeWinHttpHandle SessionHandle - { - get - { - return _sessionHandle; - } - set - { - _sessionHandle = value; - } - } - - public Interop.WinHttp.SafeWinHttpHandle ConnectionHandle - { - get - { - return _connectionHandle; - } - set - { - _connectionHandle = value; - } - } - - public Interop.WinHttp.SafeWinHttpHandleWithCallback RequestHandle - { - get - { - return _requestHandle; - } - set - { - _requestHandle = value; - } - } - - public Interop.WinHttp.SafeWinHttpHandleWithCallback WebSocketHandle - { - get - { - return _webSocketHandle; - } - set - { - _webSocketHandle = value; - } - } - - // Important: do not hold _lock while signaling completion of any of below TaskCompletionSources. - public TaskCompletionSource TcsUpgrade { get; set; } - public TaskCompletionSource TcsSend { get; set; } - public TaskCompletionSource TcsReceive { get; set; } - public TaskCompletionSource TcsClose { get; set; } - public TaskCompletionSource TcsCloseOutput { get; set; } - - public bool PendingReadOperation - { - get - { - return _pendingReadOperation; - } - - set - { - _pendingReadOperation = value; - } - } - - public bool PendingWriteOperation - { - get - { - return _pendingWriteOperation; - } - - set - { - _pendingWriteOperation = value; - } - } - - public IntPtr ToIntPtr() - { - return GCHandle.ToIntPtr(_operationHandle); - } - - public static WinHttpWebSocketState FromIntPtr(IntPtr gcHandle) - { - var stateHandle = GCHandle.FromIntPtr(gcHandle); - return (WinHttpWebSocketState)stateHandle.Target; - } - - public Interop.WinHttp.WINHTTP_WEB_SOCKET_BUFFER_TYPE BufferType { get; set; } - - public uint BytesTransferred { get; set; } - - public void InterlockedCheckValidStates(WebSocketState[] validStates) - { - lock (_lock) - { - WebSocketValidate.ThrowIfInvalidState(_state, _disposed, validStates); - } - } - - public void InterlockedCheckAndUpdateState( - WebSocketState newState, - params WebSocketState[] validStates) - { - lock (_lock) - { - CheckValidState(validStates); - UpdateState(newState); - } - } - - // Must be called with Lock taken. - public void CheckValidState(WebSocketState[] validStates) - { - WebSocketValidate.ThrowIfInvalidState(_state, _disposed, validStates); - } - - public void UpdateState(WebSocketState value) - { - if ((_state != WebSocketState.Closed) && (_state != WebSocketState.Aborted)) - { - _state = value; - } - } - - #region IDisposable Support - private void Dispose(bool disposing) - { - // These will be set to null in the callback. - _webSocketHandle?.Dispose(); - _requestHandle?.Dispose(); - - Interop.WinHttp.SafeWinHttpHandle.DisposeAndClearHandle(ref _connectionHandle); - Interop.WinHttp.SafeWinHttpHandle.DisposeAndClearHandle(ref _sessionHandle); - } - - public void Dispose() - { - if (!_disposed) - { - // No need to suppress finalization since the finalizer is not overridden. - Dispose(true); - _disposed = true; - } - } - #endregion - } -} diff --git a/external/corefx/src/System.Net.WebSockets.Client/tests/ClientWebSocketOptionsTests.Unix.cs b/external/corefx/src/System.Net.WebSockets.Client/tests/ClientWebSocketOptionsTests.Unix.cs deleted file mode 100644 index 2f1dba038d..0000000000 --- a/external/corefx/src/System.Net.WebSockets.Client/tests/ClientWebSocketOptionsTests.Unix.cs +++ /dev/null @@ -1,36 +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.Collections.Generic; -using System.Net.Security; -using System.Net.Test.Common; -using System.Runtime.InteropServices; -using System.Security.Authentication.ExtendedProtection; -using System.Security.Cryptography.X509Certificates; -using System.Threading.Tasks; -using Xunit; - -namespace System.Net.WebSockets.Client.Tests -{ - public partial class ClientWebSocketOptionsTests - { - internal static bool BackendSupportsCustomCertificateHandling - { - get - { - if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) - { - return false; - } - - // For other Unix-based systems it's true if (and only if) the openssl backend - // is used with libcurl. - return (CurlSslVersionDescription()?.StartsWith("OpenSSL") ?? false); - } - } - - [DllImport("System.Net.Http.Native", EntryPoint = "HttpNative_GetSslVersionDescription")] - private static extern string CurlSslVersionDescription(); - } -} diff --git a/external/corefx/src/System.Net.WebSockets.Client/tests/ClientWebSocketOptionsTests.Windows.cs b/external/corefx/src/System.Net.WebSockets.Client/tests/ClientWebSocketOptionsTests.Windows.cs deleted file mode 100644 index 967efd4474..0000000000 --- a/external/corefx/src/System.Net.WebSockets.Client/tests/ClientWebSocketOptionsTests.Windows.cs +++ /dev/null @@ -1,20 +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.Collections.Generic; -using System.Net.Security; -using System.Net.Test.Common; -using System.Runtime.InteropServices; -using System.Security.Authentication.ExtendedProtection; -using System.Security.Cryptography.X509Certificates; -using System.Threading.Tasks; -using Xunit; - -namespace System.Net.WebSockets.Client.Tests -{ - public partial class ClientWebSocketOptionsTests - { - internal static bool BackendSupportsCustomCertificateHandling => true; - } -} diff --git a/external/corefx/src/System.Net.WebSockets.Client/tests/ClientWebSocketOptionsTests.cs b/external/corefx/src/System.Net.WebSockets.Client/tests/ClientWebSocketOptionsTests.cs index 3e6615e982..c94f554832 100644 --- a/external/corefx/src/System.Net.WebSockets.Client/tests/ClientWebSocketOptionsTests.cs +++ b/external/corefx/src/System.Net.WebSockets.Client/tests/ClientWebSocketOptionsTests.cs @@ -2,11 +2,9 @@ // 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.Collections.Generic; using System.Net.Security; -using System.Net.Sockets; using System.Net.Test.Common; -using System.Security.Authentication; +using System.Reflection; using System.Security.Cryptography.X509Certificates; using System.Threading; using System.Threading.Tasks; @@ -18,17 +16,9 @@ namespace System.Net.WebSockets.Client.Tests { public partial class ClientWebSocketOptionsTests : ClientWebSocketTestBase { - public static bool CanTestCertificates => - Capability.IsTrustedRootCertificateInstalled() && - (BackendSupportsCustomCertificateHandling || Capability.AreHostsFileNamesInstalled()); - - public static bool CanTestClientCertificates => - CanTestCertificates && BackendSupportsCustomCertificateHandling; - // Windows 10 Version 1709 introduced the necessary APIs for the UAP version of // ClientWebSocket.ConnectAsync to carry out mutual TLS authentication. - public static bool ClientCertificatesSupported => - !PlatformDetection.IsUap || PlatformDetection.IsWindows10Version1709OrGreater; + public static bool ClientCertificatesSupported => !PlatformDetection.IsUap; public ClientWebSocketOptionsTests(ITestOutputHelper output) : base(output) { } @@ -43,6 +33,77 @@ namespace System.Net.WebSockets.Client.Tests Assert.False(cws.Options.UseDefaultCredentials); } + [ConditionalFact(nameof(WebSocketsSupported))] + public static void Proxy_Roundtrips() + { + var cws = new ClientWebSocket(); + + Assert.NotNull(cws.Options.Proxy); + Assert.Same(cws.Options.Proxy, cws.Options.Proxy); + + IWebProxy p = new WebProxy(); + cws.Options.Proxy = p; + Assert.Same(p, cws.Options.Proxy); + + cws.Options.Proxy = null; + Assert.Null(cws.Options.Proxy); + } + + [OuterLoop] // TODO: Issue #11345 + [ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))] + public async Task Proxy_SetNull_ConnectsSuccessfully(Uri server) + { + for (int i = 0; i < 3; i++) // Connect and disconnect multiple times to exercise shared handler on netcoreapp + { + var ws = await WebSocketHelper.Retry(_output, async () => + { + var cws = new ClientWebSocket(); + cws.Options.Proxy = null; + await cws.ConnectAsync(server, default); + return cws; + }); + await ws.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, default); + ws.Dispose(); + } + } + + [ActiveIssue(28027)] + [OuterLoop] // TODO: Issue #11345 + [ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))] + public async Task Proxy_ConnectThruProxy_Success(Uri server) + { + string proxyServerUri = System.Net.Test.Common.Configuration.WebSockets.ProxyServerUri; + if (string.IsNullOrEmpty(proxyServerUri)) + { + _output.WriteLine("Skipping test...no proxy server defined."); + return; + } + + _output.WriteLine($"ProxyServer: {proxyServerUri}"); + + IWebProxy proxy = new WebProxy(new Uri(proxyServerUri)); + using (ClientWebSocket cws = await WebSocketHelper.GetConnectedWebSocket( + server, + TimeOutMilliseconds, + _output, + default(TimeSpan), + proxy)) + { + var cts = new CancellationTokenSource(TimeOutMilliseconds); + Assert.Equal(WebSocketState.Open, cws.State); + + var closeStatus = WebSocketCloseStatus.NormalClosure; + string closeDescription = "Normal Closure"; + + await cws.CloseAsync(closeStatus, closeDescription, cts.Token); + + // Verify a clean close frame handshake. + Assert.Equal(WebSocketState.Closed, cws.State); + Assert.Equal(closeStatus, cws.CloseStatus); + Assert.Equal(closeDescription, cws.CloseStatusDescription); + } + } + [ConditionalFact(nameof(WebSocketsSupported))] public static void SetBuffer_InvalidArgs_Throws() { @@ -81,48 +142,5 @@ namespace System.Net.WebSockets.Client.Tests AssertExtensions.Throws("value", () => cws.Options.KeepAliveInterval = TimeSpan.MinValue); } - - [OuterLoop] // TODO: Issue #11345 - [ActiveIssue(5120, TargetFrameworkMonikers.Netcoreapp)] - [ConditionalFact(nameof(WebSocketsSupported), nameof(CanTestClientCertificates), nameof(ClientCertificatesSupported))] - public async Task ClientCertificates_ValidCertificate_ServerReceivesCertificateAndConnectAsyncSucceeds() - { - var options = new LoopbackServer.Options { UseSsl = true, WebSocketEndpoint = true }; - - Func connectToServerWithClientCert = async (clientSocket, server, url, clientCert) => - { - // Start listening for incoming connections on the server side. - Task> acceptTask = LoopbackServer.AcceptSocketAsync(server, async (socket, stream, reader, writer) => - { - // Validate that the client certificate received by the server matches the one configured on - // the client-side socket. - SslStream sslStream = Assert.IsType(stream); - Assert.NotNull(sslStream.RemoteCertificate); - Assert.Equal(clientCert, new X509Certificate2(sslStream.RemoteCertificate)); - - // Complete the WebSocket upgrade over the secure channel. After this is done, the client-side - // ConnectAsync should complete. - Assert.True(await LoopbackServer.WebSocketHandshakeAsync(socket, reader, writer)); - return null; - }, options); - - // Initiate a connection attempt with a client certificate configured on the socket. - clientSocket.Options.ClientCertificates.Add(clientCert); - var cts = new CancellationTokenSource(TimeOutMilliseconds); - await clientSocket.ConnectAsync(url, cts.Token); - acceptTask.Wait(cts.Token); - }; - - await LoopbackServer.CreateServerAsync(async (server, url) => - { - using (X509Certificate2 clientCert = Test.Common.Configuration.Certificates.GetClientCertificate()) - { - using (ClientWebSocket clientSocket = new ClientWebSocket()) - { - await connectToServerWithClientCert(clientSocket, server, url, clientCert); - } - } - }, options); - } } } diff --git a/external/corefx/src/System.Net.WebSockets.Client/tests/ClientWebSocketOptionsTests.netcoreapp.cs b/external/corefx/src/System.Net.WebSockets.Client/tests/ClientWebSocketOptionsTests.netcoreapp.cs new file mode 100644 index 0000000000..e7101406fd --- /dev/null +++ b/external/corefx/src/System.Net.WebSockets.Client/tests/ClientWebSocketOptionsTests.netcoreapp.cs @@ -0,0 +1,136 @@ +// 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.Net.Security; +using System.Net.Test.Common; +using System.Reflection; +using System.Security.Cryptography.X509Certificates; +using System.Threading; +using System.Threading.Tasks; + +using Xunit; +using Xunit.Abstractions; + +namespace System.Net.WebSockets.Client.Tests +{ + public partial class ClientWebSocketOptionsTests : ClientWebSocketTestBase + { + [ConditionalFact(nameof(WebSocketsSupported), nameof(ClientCertificatesSupported))] + public void RemoteCertificateValidationCallback_Roundtrips() + { + using (var cws = new ClientWebSocket()) + { + Assert.Null(cws.Options.RemoteCertificateValidationCallback); + + RemoteCertificateValidationCallback callback = delegate { return true; }; + cws.Options.RemoteCertificateValidationCallback = callback; + Assert.Same(callback, cws.Options.RemoteCertificateValidationCallback); + + cws.Options.RemoteCertificateValidationCallback = null; + Assert.Null(cws.Options.RemoteCertificateValidationCallback); + } + } + + [OuterLoop("Connects to remote service")] + [ConditionalTheory(nameof(WebSocketsSupported), nameof(ClientCertificatesSupported))] + [InlineData(false)] + [InlineData(true)] + public async Task RemoteCertificateValidationCallback_PassedRemoteCertificateInfo(bool secure) + { + if (PlatformDetection.IsWindows7) + { + return; // [ActiveIssue(27846)] + } + + bool callbackInvoked = false; + + await LoopbackServer.CreateClientAndServerAsync(async uri => + { + using (var cws = new ClientWebSocket()) + using (var cts = new CancellationTokenSource(TimeOutMilliseconds)) + { + cws.Options.RemoteCertificateValidationCallback = (source, cert, chain, errors) => + { + Assert.NotNull(source); + Assert.NotNull(cert); + Assert.NotNull(chain); + Assert.NotEqual(SslPolicyErrors.None, errors); + callbackInvoked = true; + return true; + }; + await cws.ConnectAsync(uri, cts.Token); + } + }, server => server.AcceptConnectionAsync(async connection => + { + Assert.True(await LoopbackHelper.WebSocketHandshakeAsync(connection)); + }), + new LoopbackServer.Options { UseSsl = secure, WebSocketEndpoint = true }); + + Assert.Equal(secure, callbackInvoked); + } + + [OuterLoop("Connects to remote service")] + [ConditionalFact(nameof(WebSocketsSupported), nameof(ClientCertificatesSupported))] + public async Task ClientCertificates_ValidCertificate_ServerReceivesCertificateAndConnectAsyncSucceeds() + { + if (PlatformDetection.IsWindows7) + { + return; // [ActiveIssue(27846)] + } + + using (X509Certificate2 clientCert = Test.Common.Configuration.Certificates.GetClientCertificate()) + { + await LoopbackServer.CreateClientAndServerAsync(async uri => + { + using (var clientSocket = new ClientWebSocket()) + using (var cts = new CancellationTokenSource(TimeOutMilliseconds)) + { + clientSocket.Options.ClientCertificates.Add(clientCert); + clientSocket.Options.RemoteCertificateValidationCallback = delegate { return true; }; + await clientSocket.ConnectAsync(uri, cts.Token); + } + }, server => server.AcceptConnectionAsync(async connection => + { + // Validate that the client certificate received by the server matches the one configured on + // the client-side socket. + SslStream sslStream = Assert.IsType(connection.Stream); + Assert.NotNull(sslStream.RemoteCertificate); + Assert.Equal(clientCert, new X509Certificate2(sslStream.RemoteCertificate)); + + // Complete the WebSocket upgrade over the secure channel. After this is done, the client-side + // ConnectAsync should complete. + Assert.True(await LoopbackHelper.WebSocketHandshakeAsync(connection)); + }), new LoopbackServer.Options { UseSsl = true, WebSocketEndpoint = true }); + } + } + + [ConditionalTheory(nameof(WebSocketsSupported))] + [InlineData("ws://")] + [InlineData("wss://")] + public async Task NonSecureConnect_ConnectThruProxy_CONNECTisUsed(string connectionType) + { + if (PlatformDetection.IsWindows7) + { + return; // [ActiveIssue(27846)] + } + + bool connectionAccepted = false; + + await LoopbackServer.CreateClientAndServerAsync(async proxyUri => + { + using (var cws = new ClientWebSocket()) + { + cws.Options.Proxy = new WebProxy(proxyUri); + try { await cws.ConnectAsync(new Uri(connectionType + Guid.NewGuid().ToString("N")), default); } catch { } + } + }, server => server.AcceptConnectionAsync(async connection => + { + Assert.Contains("CONNECT", await connection.Reader.ReadLineAsync()); + connectionAccepted = true; + })); + + Assert.True(connectionAccepted); + } + } +} diff --git a/external/corefx/src/System.Net.WebSockets.Client/tests/ClientWebSocketUnitTest.cs b/external/corefx/src/System.Net.WebSockets.Client/tests/ClientWebSocketUnitTest.cs index 44fcf82070..0314befd4f 100644 --- a/external/corefx/src/System.Net.WebSockets.Client/tests/ClientWebSocketUnitTest.cs +++ b/external/corefx/src/System.Net.WebSockets.Client/tests/ClientWebSocketUnitTest.cs @@ -2,11 +2,12 @@ // 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.Common.Tests; +using System.Globalization; using System.Threading; using System.Threading.Tasks; using Xunit; -using Xunit.Abstractions; namespace System.Net.WebSockets.Client.Tests { @@ -15,16 +16,8 @@ namespace System.Net.WebSockets.Client.Tests /// public class ClientWebSocketUnitTest { - private readonly ITestOutputHelper _output; - - public ClientWebSocketUnitTest(ITestOutputHelper output) - { - _output = output; - } - private static bool WebSocketsSupported { get { return WebSocketHelper.WebSocketsSupported; } } - [OuterLoop] // TODO: Issue #11345 [ConditionalFact(nameof(WebSocketsSupported))] public void Ctor_Success() { @@ -32,7 +25,6 @@ namespace System.Net.WebSockets.Client.Tests cws.Dispose(); } - [OuterLoop] // TODO: Issue #11345 [ConditionalFact(nameof(WebSocketsSupported))] public void Abort_CreateAndAbort_StateIsClosed() { @@ -44,7 +36,6 @@ namespace System.Net.WebSockets.Client.Tests } } - [OuterLoop] // TODO: Issue #11345 [ConditionalFact(nameof(WebSocketsSupported))] public void CloseAsync_CreateAndClose_ThrowsInvalidOperationException() { @@ -57,14 +48,21 @@ namespace System.Net.WebSockets.Client.Tests } } - [OuterLoop] // TODO: Issue #11345 [ConditionalFact(nameof(WebSocketsSupported))] public async Task CloseAsync_CreateAndCloseOutput_ThrowsInvalidOperationExceptionWithMessage() { using (var cws = new ClientWebSocket()) { - var exception = await Assert.ThrowsAsync( - () => cws.CloseOutputAsync(WebSocketCloseStatus.Empty, "", new CancellationToken())); + InvalidOperationException exception; + using (var tcc = new ThreadCultureChange()) + { + // The .Net Native toolchain optimizes away exception messages. + if (!PlatformDetection.IsNetNative) + tcc.ChangeCultureInfo(CultureInfo.InvariantCulture); + + exception = await Assert.ThrowsAsync( + () => cws.CloseOutputAsync(WebSocketCloseStatus.Empty, "", new CancellationToken())); + } // The .Net Native toolchain optimizes away exception messages. if (!PlatformDetection.IsNetNative) @@ -77,7 +75,6 @@ namespace System.Net.WebSockets.Client.Tests } } - [OuterLoop] // TODO: Issue #11345 [ConditionalFact(nameof(WebSocketsSupported))] public void CloseAsync_CreateAndReceive_ThrowsInvalidOperationException() { @@ -94,7 +91,6 @@ namespace System.Net.WebSockets.Client.Tests } } - [OuterLoop] // TODO: Issue #11345 [ConditionalFact(nameof(WebSocketsSupported))] public async Task CloseAsync_CreateAndReceive_ThrowsInvalidOperationExceptionWithMessage() { @@ -104,8 +100,17 @@ namespace System.Net.WebSockets.Client.Tests var segment = new ArraySegment(buffer); var ct = new CancellationToken(); - var exception = await Assert.ThrowsAsync( - () => cws.ReceiveAsync(segment, ct)); + InvalidOperationException exception; + + using (var tcc = new ThreadCultureChange()) + { + // The .Net Native toolchain optimizes away exception messages. + if (!PlatformDetection.IsNetNative) + tcc.ChangeCultureInfo(CultureInfo.InvariantCulture); + + exception = await Assert.ThrowsAsync( + () => cws.ReceiveAsync(segment, ct)); + } // The .Net Native toolchain optimizes away exception messages. if (!PlatformDetection.IsNetNative) @@ -118,7 +123,6 @@ namespace System.Net.WebSockets.Client.Tests } } - [OuterLoop] // TODO: Issue #11345 [ConditionalFact(nameof(WebSocketsSupported))] public void CloseAsync_CreateAndSend_ThrowsInvalidOperationException() { @@ -135,7 +139,6 @@ namespace System.Net.WebSockets.Client.Tests } } - [OuterLoop] // TODO: Issue #11345 [ConditionalFact(nameof(WebSocketsSupported))] public async Task CloseAsync_CreateAndSend_ThrowsInvalidOperationExceptionWithMessage() { @@ -145,8 +148,16 @@ namespace System.Net.WebSockets.Client.Tests var segment = new ArraySegment(buffer); var ct = new CancellationToken(); - var exception = await Assert.ThrowsAsync( - () => cws.SendAsync(segment, WebSocketMessageType.Text, false, ct)); + InvalidOperationException exception; + using (var tcc = new ThreadCultureChange()) + { + // The .Net Native toolchain optimizes away exception messages. + if (!PlatformDetection.IsNetNative) + tcc.ChangeCultureInfo(CultureInfo.InvariantCulture); + + exception = await Assert.ThrowsAsync( + () => cws.SendAsync(segment, WebSocketMessageType.Text, false, ct)); + } // The .Net Native toolchain optimizes away exception messages. if (!PlatformDetection.IsNetNative) @@ -159,7 +170,6 @@ namespace System.Net.WebSockets.Client.Tests } } - [OuterLoop] // TODO: Issue #11345 [ConditionalFact(nameof(WebSocketsSupported))] public void Ctor_ExpectedPropertyValues() { @@ -174,7 +184,6 @@ namespace System.Net.WebSockets.Client.Tests } } - [OuterLoop] // TODO: Issue #11345 [ConditionalFact(nameof(WebSocketsSupported))] public void Abort_CreateAndDisposeAndAbort_StateIsClosedSuccess() { @@ -185,7 +194,6 @@ namespace System.Net.WebSockets.Client.Tests Assert.Equal(WebSocketState.Closed, cws.State); } - [OuterLoop] // TODO: Issue #11345 [ConditionalFact(nameof(WebSocketsSupported))] public void CloseAsync_DisposeAndClose_ThrowsObjectDisposedException() { @@ -198,7 +206,6 @@ namespace System.Net.WebSockets.Client.Tests Assert.Equal(WebSocketState.Closed, cws.State); } - [OuterLoop] // TODO: Issue #11345 [ConditionalFact(nameof(WebSocketsSupported))] public void CloseAsync_DisposeAndCloseOutput_ThrowsObjectDisposedExceptionWithMessage() { @@ -215,7 +222,6 @@ namespace System.Net.WebSockets.Client.Tests Assert.Equal(WebSocketState.Closed, cws.State); } - [OuterLoop] // TODO: Issue #11345 [ConditionalFact(nameof(WebSocketsSupported))] public void ReceiveAsync_CreateAndDisposeAndReceive_ThrowsObjectDisposedExceptionWithMessage() { @@ -235,7 +241,6 @@ namespace System.Net.WebSockets.Client.Tests Assert.Equal(WebSocketState.Closed, cws.State); } - [OuterLoop] // TODO: Issue #11345 [ConditionalFact(nameof(WebSocketsSupported))] public void SendAsync_CreateAndDisposeAndSend_ThrowsObjectDisposedExceptionWithMessage() { @@ -255,7 +260,6 @@ namespace System.Net.WebSockets.Client.Tests Assert.Equal(WebSocketState.Closed, cws.State); } - [OuterLoop] // TODO: Issue #11345 [ConditionalFact(nameof(WebSocketsSupported))] public void Dispose_CreateAndDispose_ExpectedPropertyValues() { diff --git a/external/corefx/src/System.Net.WebSockets.Client/tests/LoopbackHelper.cs b/external/corefx/src/System.Net.WebSockets.Client/tests/LoopbackHelper.cs new file mode 100644 index 0000000000..093250cf0b --- /dev/null +++ b/external/corefx/src/System.Net.WebSockets.Client/tests/LoopbackHelper.cs @@ -0,0 +1,59 @@ +// 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.Net.Test.Common; +using System.Security.Cryptography; +using System.Text; +using System.Threading.Tasks; + +namespace System.Net.WebSockets.Client.Tests +{ + public static class LoopbackHelper + { + public static async Task WebSocketHandshakeAsync(LoopbackServer.Connection connection) + { + string serverResponse = null; + string currentRequestLine; + while (!string.IsNullOrEmpty(currentRequestLine = await connection.Reader.ReadLineAsync().ConfigureAwait(false))) + { + string[] tokens = currentRequestLine.Split(new char[] { ':' }, 2); + if (tokens.Length == 2) + { + string headerName = tokens[0]; + if (headerName == "Sec-WebSocket-Key") + { + string headerValue = tokens[1].Trim(); + string responseSecurityAcceptValue = ComputeWebSocketHandshakeSecurityAcceptValue(headerValue); + serverResponse = + "HTTP/1.1 101 Switching Protocols\r\n" + + "Upgrade: websocket\r\n" + + "Connection: Upgrade\r\n" + + "Sec-WebSocket-Accept: " + responseSecurityAcceptValue + "\r\n\r\n"; + } + } + } + + if (serverResponse != null) + { + // We received a valid WebSocket opening handshake. Send the appropriate response. + await connection.Writer.WriteAsync(serverResponse).ConfigureAwait(false); + return true; + } + + return false; + } + + private static string ComputeWebSocketHandshakeSecurityAcceptValue(string secWebSocketKey) + { + // GUID specified by RFC 6455. + const string Rfc6455Guid = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"; + string combinedKey = secWebSocketKey + Rfc6455Guid; + + // Use of SHA1 hash is required by RFC 6455. + SHA1 sha1Provider = new SHA1CryptoServiceProvider(); + byte[] sha1Hash = sha1Provider.ComputeHash(Encoding.UTF8.GetBytes(combinedKey)); + return Convert.ToBase64String(sha1Hash); + } + } +} diff --git a/external/corefx/src/System.Net.WebSockets.Client/tests/SendReceiveTest.cs b/external/corefx/src/System.Net.WebSockets.Client/tests/SendReceiveTest.cs index 82ec689f2e..e2235068b6 100644 --- a/external/corefx/src/System.Net.WebSockets.Client/tests/SendReceiveTest.cs +++ b/external/corefx/src/System.Net.WebSockets.Client/tests/SendReceiveTest.cs @@ -2,8 +2,6 @@ // 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.Collections.Generic; -using System.ComponentModel; using System.Net.Sockets; using System.Net.Test.Common; using System.Threading; @@ -305,7 +303,6 @@ namespace System.Net.WebSockets.Client.Tests } } - [ActiveIssue(23765)] [OuterLoop] // TODO: Issue #11345 [ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))] public async Task SendReceive_VaryingLengthBuffers_Success(Uri server) @@ -381,25 +378,23 @@ namespace System.Net.WebSockets.Client.Tests { var options = new LoopbackServer.Options { WebSocketEndpoint = true }; - Func connectToServerThatAbortsConnection = async (clientSocket, server, url) => + Func connectToServerThatAbortsConnection = async (clientSocket, server, url) => { AutoResetEvent pendingReceiveAsyncPosted = new AutoResetEvent(false); // Start listening for incoming connections on the server side. - Task> acceptTask = LoopbackServer.AcceptSocketAsync(server, async (socket, stream, reader, writer) => + Task acceptTask = server.AcceptConnectionAsync(async connection => { // Complete the WebSocket upgrade. After this is done, the client-side ConnectAsync should complete. - Assert.True(await LoopbackServer.WebSocketHandshakeAsync(socket, reader, writer)); + Assert.True(await LoopbackHelper.WebSocketHandshakeAsync(connection)); // Wait for client-side ConnectAsync to complete and for a pending ReceiveAsync to be posted. pendingReceiveAsyncPosted.WaitOne(TimeOutMilliseconds); // Close the underlying connection prematurely (without sending a WebSocket Close frame). - socket.Shutdown(SocketShutdown.Both); - socket.Close(); - - return null; - }, options); + connection.Socket.Shutdown(SocketShutdown.Both); + connection.Socket.Close(); + }); // Initiate a connection attempt. var cts = new CancellationTokenSource(TimeOutMilliseconds); @@ -414,75 +409,27 @@ namespace System.Net.WebSockets.Client.Tests // Wait for the server to close the underlying connection. acceptTask.Wait(cts.Token); - // Validate I/O errors and socket state. - if (!PlatformDetection.IsWindows) + WebSocketException pendingReceiveException = await Assert.ThrowsAsync(() => pendingReceiveAsync); + + Assert.Equal(WebSocketError.ConnectionClosedPrematurely, pendingReceiveException.WebSocketErrorCode); + + if (PlatformDetection.IsUap) { - _output.WriteLine("[Non-Windows] ManagedWebSocket-based implementation."); - - WebSocketException pendingReceiveException = await Assert.ThrowsAsync(() => pendingReceiveAsync); - Assert.Equal(WebSocketError.ConnectionClosedPrematurely, pendingReceiveException.WebSocketErrorCode); - - WebSocketException newReceiveException = - await Assert.ThrowsAsync(() => ReceiveAsync(clientSocket, recvSegment, cts.Token)); - Assert.Equal(WebSocketError.ConnectionClosedPrematurely, newReceiveException.WebSocketErrorCode); - - Assert.Equal(WebSocketState.Open, clientSocket.State); - Assert.Null(clientSocket.CloseStatus); - } - else if (PlatformDetection.IsFullFramework) - { - _output.WriteLine("[Windows] ManagedWebSocket-based implementation."); - - WebSocketException pendingReceiveException = await Assert.ThrowsAsync(() => pendingReceiveAsync); - Assert.Equal(WebSocketError.ConnectionClosedPrematurely, pendingReceiveException.WebSocketErrorCode); - - WebSocketException newReceiveException = - await Assert.ThrowsAsync(() => ReceiveAsync(clientSocket, recvSegment, cts.Token)); - Assert.Equal(WebSocketError.Success, newReceiveException.WebSocketErrorCode); - Assert.Equal( - ResourceHelper.GetExceptionMessage("net_WebSockets_InvalidState", "Aborted", "Open, CloseSent"), - newReceiveException.Message); - - Assert.Equal(WebSocketState.Aborted, clientSocket.State); - Assert.Null(clientSocket.CloseStatus); - } - else if (PlatformDetection.IsUap) - { - _output.WriteLine("WinRTWebSocket-based implementation."); - const uint WININET_E_CONNECTION_ABORTED = 0x80072EFE; - WebSocketException pendingReceiveException = await Assert.ThrowsAsync(() => pendingReceiveAsync); - Assert.Equal(WebSocketError.ConnectionClosedPrematurely, pendingReceiveException.WebSocketErrorCode); Assert.NotNull(pendingReceiveException.InnerException); Assert.Equal(WININET_E_CONNECTION_ABORTED, (uint)pendingReceiveException.InnerException.HResult); + } - WebSocketException newReceiveException = + WebSocketException newReceiveException = await Assert.ThrowsAsync(() => ReceiveAsync(clientSocket, recvSegment, cts.Token)); - Assert.Equal(WebSocketError.Success, newReceiveException.WebSocketErrorCode); - Assert.Equal( - ResourceHelper.GetExceptionMessage("net_WebSockets_InvalidState", "Aborted", "Open, CloseSent"), - newReceiveException.Message); + + Assert.Equal( + ResourceHelper.GetExceptionMessage("net_WebSockets_InvalidState", "Aborted", "Open, CloseSent"), + newReceiveException.Message); - Assert.Equal(WebSocketState.Aborted, clientSocket.State); - Assert.Null(clientSocket.CloseStatus); - } - else - { - _output.WriteLine("WinHttpWebSocket-based implementation."); - - const uint WININET_E_CONNECTION_RESET = 0x80072eff; - - Win32Exception pendingReceiveException = await Assert.ThrowsAnyAsync(() => pendingReceiveAsync); - Assert.Equal(WININET_E_CONNECTION_RESET, (uint)pendingReceiveException.HResult); - - Win32Exception newReceiveException = - await Assert.ThrowsAnyAsync(() => ReceiveAsync(clientSocket, recvSegment, cts.Token)); - Assert.Equal(WININET_E_CONNECTION_RESET, (uint)newReceiveException.HResult); - - Assert.Equal(WebSocketState.Open, clientSocket.State); - Assert.Null(clientSocket.CloseStatus); - } + Assert.Equal(WebSocketState.Aborted, clientSocket.State); + Assert.Null(clientSocket.CloseStatus); }; await LoopbackServer.CreateServerAsync(async (server, url) => @@ -493,5 +440,42 @@ namespace System.Net.WebSockets.Client.Tests } }, options); } + + [OuterLoop] // TODO: Issue #11345 + [ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))] + public async Task ZeroByteReceive_CompletesWhenDataAvailable(Uri server) + { + using (ClientWebSocket cws = await WebSocketHelper.GetConnectedWebSocket(server, TimeOutMilliseconds, _output)) + { + var rand = new Random(); + var ctsDefault = new CancellationTokenSource(TimeOutMilliseconds); + + // Do a 0-byte receive. It shouldn't complete yet. + Task t = ReceiveAsync(cws, new ArraySegment(Array.Empty()), ctsDefault.Token); + Assert.False(t.IsCompleted); + + // Send a packet to the echo server. + await SendAsync(cws, new ArraySegment(new byte[1] { 42 }), WebSocketMessageType.Binary, true, ctsDefault.Token); + + // Now the 0-byte receive should complete, but without reading any data. + WebSocketReceiveResult r = await t; + Assert.Equal(WebSocketMessageType.Binary, r.MessageType); + Assert.Equal(0, r.Count); + Assert.False(r.EndOfMessage); + + // Now do a receive to get the payload. + var receiveBuffer = new byte[1]; + t = ReceiveAsync(cws, new ArraySegment(receiveBuffer), ctsDefault.Token); + Assert.Equal(TaskStatus.RanToCompletion, t.Status); + r = await t; + Assert.Equal(WebSocketMessageType.Binary, r.MessageType); + Assert.Equal(1, r.Count); + Assert.True(r.EndOfMessage); + Assert.Equal(42, receiveBuffer[0]); + + // Clean up. + await cws.CloseAsync(WebSocketCloseStatus.NormalClosure, nameof(ZeroByteReceive_CompletesWhenDataAvailable), ctsDefault.Token); + } + } } } diff --git a/external/corefx/src/System.Net.WebSockets.Client/tests/SendReceiveTest.netcoreapp.cs b/external/corefx/src/System.Net.WebSockets.Client/tests/SendReceiveTest.netcoreapp.cs index 4c7759cba0..778ba03213 100644 --- a/external/corefx/src/System.Net.WebSockets.Client/tests/SendReceiveTest.netcoreapp.cs +++ b/external/corefx/src/System.Net.WebSockets.Client/tests/SendReceiveTest.netcoreapp.cs @@ -2,7 +2,6 @@ // 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.Net.Sockets; using System.Threading; using System.Threading.Tasks; using Xunit.Abstractions; @@ -16,16 +15,16 @@ namespace System.Net.WebSockets.Client.Tests protected override async Task ReceiveAsync(WebSocket ws, ArraySegment arraySegment, CancellationToken cancellationToken) { ValueWebSocketReceiveResult r = await ws.ReceiveAsync( - arraySegment == default(ArraySegment) ? Memory.Empty : (Memory)arraySegment, + (Memory)arraySegment, cancellationToken); return new WebSocketReceiveResult(r.Count, r.MessageType, r.EndOfMessage, ws.CloseStatus, ws.CloseStatusDescription); } protected override Task SendAsync(WebSocket ws, ArraySegment arraySegment, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken) => ws.SendAsync( - arraySegment == default(ArraySegment) ? ReadOnlyMemory.Empty : (ReadOnlyMemory)arraySegment, + (ReadOnlyMemory)arraySegment, messageType, endOfMessage, - cancellationToken); + cancellationToken).AsTask(); } } diff --git a/external/corefx/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj b/external/corefx/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj index 206d82430f..4b57c19a40 100644 --- a/external/corefx/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj +++ b/external/corefx/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj @@ -39,17 +39,23 @@ Common\System\Net\Http\LoopbackServer.cs + + Common\System\Threading\Tasks\TaskTimeoutExtensions.cs + + + Common\System\ThreadCultureChange.cs + - - + + diff --git a/external/corefx/src/System.Net.WebSockets.Client/tests/WebSocketHelper.cs b/external/corefx/src/System.Net.WebSockets.Client/tests/WebSocketHelper.cs index 38dd18f4e5..e5b95119ca 100644 --- a/external/corefx/src/System.Net.WebSockets.Client/tests/WebSocketHelper.cs +++ b/external/corefx/src/System.Net.WebSockets.Client/tests/WebSocketHelper.cs @@ -61,11 +61,43 @@ namespace System.Net.WebSockets.Client.Tests } } - public static async Task GetConnectedWebSocket( + public static Task GetConnectedWebSocket( Uri server, int timeOutMilliseconds, ITestOutputHelper output, - TimeSpan keepAliveInterval = default(TimeSpan)) + TimeSpan keepAliveInterval = default, + IWebProxy proxy = null) => + Retry(output, async () => + { + var cws = new ClientWebSocket(); + if (proxy != null) + { + cws.Options.Proxy = proxy; + } + + if (keepAliveInterval.TotalSeconds > 0) + { + cws.Options.KeepAliveInterval = keepAliveInterval; + } + + using (var cts = new CancellationTokenSource(timeOutMilliseconds)) + { + output.WriteLine("GetConnectedWebSocket: ConnectAsync starting."); + Task taskConnect = cws.ConnectAsync(server, cts.Token); + Assert.True( + (cws.State == WebSocketState.None) || + (cws.State == WebSocketState.Connecting) || + (cws.State == WebSocketState.Open) || + (cws.State == WebSocketState.Aborted), + "State immediately after ConnectAsync incorrect: " + cws.State); + await taskConnect; + output.WriteLine("GetConnectedWebSocket: ConnectAsync done."); + Assert.Equal(WebSocketState.Open, cws.State); + } + return cws; + }); + + public static async Task Retry(ITestOutputHelper output, Func> func) { const int MaxTries = 5; int betweenTryDelayMilliseconds = 1000; @@ -74,27 +106,7 @@ namespace System.Net.WebSockets.Client.Tests { try { - var cws = new ClientWebSocket(); - if (keepAliveInterval.TotalSeconds > 0) - { - cws.Options.KeepAliveInterval = keepAliveInterval; - } - - using (var cts = new CancellationTokenSource(timeOutMilliseconds)) - { - output.WriteLine("GetConnectedWebSocket: ConnectAsync starting."); - Task taskConnect = cws.ConnectAsync(server, cts.Token); - Assert.True( - (cws.State == WebSocketState.None) || - (cws.State == WebSocketState.Connecting) || - (cws.State == WebSocketState.Open) || - (cws.State == WebSocketState.Aborted), - "State immediately after ConnectAsync incorrect: " + cws.State); - await taskConnect; - output.WriteLine("GetConnectedWebSocket: ConnectAsync done."); - Assert.Equal(WebSocketState.Open, cws.State); - } - return cws; + return await func(); } catch (WebSocketException exc) { diff --git a/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/System.Net.WebSockets.WebSocketProtocol.sln b/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/System.Net.WebSockets.WebSocketProtocol.sln index 74e571f6e3..6d49347244 100644 --- a/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/System.Net.WebSockets.WebSocketProtocol.sln +++ b/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/System.Net.WebSockets.WebSocketProtocol.sln @@ -1,55 +1,50 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27214.1 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebSockets.WebSocketProtocol", "src\System.Net.WebSockets.WebSocketProtocol.csproj", "{747BE014-7C1D-4460-95AF-B41C35717165}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D5A36F24-E27C-43DF-8658-10C5290423E0}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9D10D7AD-2F8C-4F7A-B0FA-E5EB3ECE287F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebSockets.WebSocketProtocol", "ref\System.Net.WebSockets.WebSocketProtocol.csproj", "{4EDBE9F5-D10A-4553-AE24-2E0E946B15B0}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F47347C3-433C-4D3B-90F9-487FE7F4F444}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebSockets.WebSocketProtocol.Tests", "tests\System.Net.WebSockets.WebSocketProtocol.Tests.csproj", "{CF73547B-07D2-4290-A14A-CA2A354F4D21}" + ProjectSection(ProjectDependencies) = postProject + {747BE014-7C1D-4460-95AF-B41C35717165} = {747BE014-7C1D-4460-95AF-B41C35717165} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebSockets.WebSocketProtocol", "src\System.Net.WebSockets.WebSocketProtocol.csproj", "{747BE014-7C1D-4460-95AF-B41C35717165}" + ProjectSection(ProjectDependencies) = postProject + {203345A4-0E3B-43C1-ADEB-FF493E578063} = {203345A4-0E3B-43C1-ADEB-FF493E578063} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebSockets.WebSocketProtocol", "ref\System.Net.WebSockets.WebSocketProtocol.csproj", "{203345A4-0E3B-43C1-ADEB-FF493E578063}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - netstandard-Debug|Any CPU = netstandard-Debug|Any CPU - netstandard-Release|Any CPU = netstandard-Release|Any CPU + Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {747BE014-7C1D-4460-95AF-B41C35717165}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {747BE014-7C1D-4460-95AF-B41C35717165}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {747BE014-7C1D-4460-95AF-B41C35717165}.netstandard-Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {747BE014-7C1D-4460-95AF-B41C35717165}.netstandard-Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {747BE014-7C1D-4460-95AF-B41C35717165}.netstandard-Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {747BE014-7C1D-4460-95AF-B41C35717165}.netstandard-Release|Any CPU.Build.0 = netstandard-Release|Any CPU - {4EDBE9F5-D10A-4553-AE24-2E0E946B15B0}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {4EDBE9F5-D10A-4553-AE24-2E0E946B15B0}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {4EDBE9F5-D10A-4553-AE24-2E0E946B15B0}.netstandard-Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {4EDBE9F5-D10A-4553-AE24-2E0E946B15B0}.netstandard-Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {4EDBE9F5-D10A-4553-AE24-2E0E946B15B0}.netstandard-Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {4EDBE9F5-D10A-4553-AE24-2E0E946B15B0}.netstandard-Release|Any CPU.Build.0 = netstandard-Release|Any CPU - {CF73547B-07D2-4290-A14A-CA2A354F4D21}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {CF73547B-07D2-4290-A14A-CA2A354F4D21}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {CF73547B-07D2-4290-A14A-CA2A354F4D21}.netstandard-Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {CF73547B-07D2-4290-A14A-CA2A354F4D21}.netstandard-Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {CF73547B-07D2-4290-A14A-CA2A354F4D21}.netstandard-Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {CF73547B-07D2-4290-A14A-CA2A354F4D21}.netstandard-Release|Any CPU.Build.0 = netstandard-Release|Any CPU + {CF73547B-07D2-4290-A14A-CA2A354F4D21}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {CF73547B-07D2-4290-A14A-CA2A354F4D21}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {CF73547B-07D2-4290-A14A-CA2A354F4D21}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {CF73547B-07D2-4290-A14A-CA2A354F4D21}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU + {747BE014-7C1D-4460-95AF-B41C35717165}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {747BE014-7C1D-4460-95AF-B41C35717165}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {747BE014-7C1D-4460-95AF-B41C35717165}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {747BE014-7C1D-4460-95AF-B41C35717165}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU + {203345A4-0E3B-43C1-ADEB-FF493E578063}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {203345A4-0E3B-43C1-ADEB-FF493E578063}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {203345A4-0E3B-43C1-ADEB-FF493E578063}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {203345A4-0E3B-43C1-ADEB-FF493E578063}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {747BE014-7C1D-4460-95AF-B41C35717165} = {D5A36F24-E27C-43DF-8658-10C5290423E0} - {4EDBE9F5-D10A-4553-AE24-2E0E946B15B0} = {9D10D7AD-2F8C-4F7A-B0FA-E5EB3ECE287F} - {CF73547B-07D2-4290-A14A-CA2A354F4D21} = {F47347C3-433C-4D3B-90F9-487FE7F4F444} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {6618B298-BA53-4E58-9795-756C6DC1BA38} + {CF73547B-07D2-4290-A14A-CA2A354F4D21} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} + {747BE014-7C1D-4460-95AF-B41C35717165} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD} + {203345A4-0E3B-43C1-ADEB-FF493E578063} = {2E666815-2EDB-464B-9DF6-380BF4789AD4} EndGlobalSection EndGlobal diff --git a/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/pkg/System.Net.WebSockets.WebSocketProtocol.pkgproj b/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/pkg/System.Net.WebSockets.WebSocketProtocol.pkgproj index 44ceae2df0..3a937242ec 100644 --- a/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/pkg/System.Net.WebSockets.WebSocketProtocol.pkgproj +++ b/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/pkg/System.Net.WebSockets.WebSocketProtocol.pkgproj @@ -3,7 +3,7 @@ - net461;netcoreapp2.0;$(AllXamarinFrameworks) + uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks) diff --git a/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/ref/System.Net.WebSockets.WebSocketProtocol.cs b/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/ref/System.Net.WebSockets.WebSocketProtocol.cs index b66dd7b603..87509360b6 100644 --- a/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/ref/System.Net.WebSockets.WebSocketProtocol.cs +++ b/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/ref/System.Net.WebSockets.WebSocketProtocol.cs @@ -5,12 +5,10 @@ // Changes to this file must follow the http://aka.ms/api-review process. // ------------------------------------------------------------------------------ -using System.IO; - namespace System.Net.WebSockets { public static class WebSocketProtocol { - public static WebSocket CreateFromStream(Stream stream, bool isServer, string subProtocol, TimeSpan keepAliveInterval, Memory buffer = default) { throw null; } + public static WebSocket CreateFromStream(System.IO.Stream stream, bool isServer, string subProtocol, System.TimeSpan keepAliveInterval) { throw null; } } } diff --git a/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/ref/System.Net.WebSockets.WebSocketProtocol.csproj b/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/ref/System.Net.WebSockets.WebSocketProtocol.csproj index 702a9a5a3a..6db4fdf4dc 100644 --- a/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/ref/System.Net.WebSockets.WebSocketProtocol.csproj +++ b/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/ref/System.Net.WebSockets.WebSocketProtocol.csproj @@ -1,6 +1,9 @@  + + {203345A4-0E3B-43C1-ADEB-FF493E578063} + @@ -10,4 +13,4 @@ - + \ No newline at end of file diff --git a/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj b/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj index ae63f2d5f0..a5321205dd 100644 --- a/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj +++ b/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj @@ -5,6 +5,7 @@ System.Net.WebSockets.WebSocketProtocol True {747BE014-7C1D-4460-95AF-B41C35717165} + true diff --git a/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/src/System/Net/WebSockets/ManagedWebSocketExtensions.cs b/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/src/System/Net/WebSockets/ManagedWebSocketExtensions.cs index 3f2143990e..52b9e2fdc1 100644 --- a/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/src/System/Net/WebSockets/ManagedWebSocketExtensions.cs +++ b/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/src/System/Net/WebSockets/ManagedWebSocketExtensions.cs @@ -23,16 +23,16 @@ namespace System.Net.WebSockets } } - internal static Task ReadAsync(this Stream stream, Memory destination, CancellationToken cancellationToken) + internal static ValueTask ReadAsync(this Stream stream, Memory destination, CancellationToken cancellationToken = default) { - if (destination.TryGetArray(out ArraySegment array)) + if (MemoryMarshal.TryGetArray(destination, out ArraySegment array)) { - return stream.ReadAsync(array.Array, array.Offset, array.Count, cancellationToken); + return new ValueTask(stream.ReadAsync(array.Array, array.Offset, array.Count, cancellationToken)); } else { byte[] buffer = ArrayPool.Shared.Rent(destination.Length); - return FinishReadAsync(stream.ReadAsync(buffer, 0, destination.Length, cancellationToken), buffer, destination); + return new ValueTask(FinishReadAsync(stream.ReadAsync(buffer, 0, destination.Length, cancellationToken), buffer, destination)); async Task FinishReadAsync(Task readTask, byte[] localBuffer, Memory localDestination) { @@ -49,6 +49,32 @@ namespace System.Net.WebSockets } } } + + internal static ValueTask WriteAsync(this Stream stream, ReadOnlyMemory source, CancellationToken cancellationToken = default) + { + if (MemoryMarshal.TryGetArray(source, out ArraySegment array)) + { + return new ValueTask(stream.WriteAsync(array.Array, array.Offset, array.Count, cancellationToken)); + } + else + { + byte[] buffer = ArrayPool.Shared.Rent(source.Length); + source.Span.CopyTo(buffer); + return new ValueTask(FinishWriteAsync(stream.WriteAsync(buffer, 0, source.Length, cancellationToken), buffer)); + + async Task FinishWriteAsync(Task writeTask, byte[] localBuffer) + { + try + { + await writeTask.ConfigureAwait(false); + } + finally + { + ArrayPool.Shared.Return(localBuffer); + } + } + } + } } internal static class BitConverter diff --git a/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/src/System/Net/WebSockets/WebSocketProtocol.cs b/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/src/System/Net/WebSockets/WebSocketProtocol.cs index e4756eb603..732cbb5e91 100644 --- a/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/src/System/Net/WebSockets/WebSocketProtocol.cs +++ b/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/src/System/Net/WebSockets/WebSocketProtocol.cs @@ -13,8 +13,7 @@ namespace System.Net.WebSockets Stream stream, bool isServer, string subProtocol, - TimeSpan keepAliveInterval, - Memory buffer = default) + TimeSpan keepAliveInterval) { if (stream == null) { @@ -38,7 +37,7 @@ namespace System.Net.WebSockets 0)); } - return ManagedWebSocket.CreateFromConnectedStream(stream, isServer, subProtocol, keepAliveInterval, buffer); + return ManagedWebSocket.CreateFromConnectedStream(stream, isServer, subProtocol, keepAliveInterval); } } } diff --git a/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/tests/System.Net.WebSockets.WebSocketProtocol.Tests.csproj b/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/tests/System.Net.WebSockets.WebSocketProtocol.Tests.csproj index f0ac7ecbac..8460f376bc 100644 --- a/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/tests/System.Net.WebSockets.WebSocketProtocol.Tests.csproj +++ b/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/tests/System.Net.WebSockets.WebSocketProtocol.Tests.csproj @@ -1,6 +1,8 @@  + + @@ -19,4 +21,4 @@ - + \ No newline at end of file diff --git a/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/tests/WebSocketProtocolTests.cs b/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/tests/WebSocketProtocolTests.cs index 2b5964ed66..b5a5c2857f 100644 --- a/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/tests/WebSocketProtocolTests.cs +++ b/external/corefx/src/System.Net.WebSockets.WebSocketProtocol/tests/WebSocketProtocolTests.cs @@ -7,6 +7,7 @@ using System.IO; using System.Net; using System.Net.Http; using System.Net.Http.Headers; +using System.Net.Security; using System.Net.Sockets; using System.Security.Cryptography; using System.Text; @@ -24,19 +25,19 @@ namespace System.Net.WebSockets.Tests public void CreateFromStream_InvalidArguments_Throws() { AssertExtensions.Throws("stream", - () => WebSocketProtocol.CreateFromStream(null, true, "subProtocol", TimeSpan.FromSeconds(30), default(Memory))); + () => WebSocketProtocol.CreateFromStream(null, true, "subProtocol", TimeSpan.FromSeconds(30))); AssertExtensions.Throws("stream", - () => WebSocketProtocol.CreateFromStream(new MemoryStream(new byte[100], writable: false), true, "subProtocol", TimeSpan.FromSeconds(30), default(Memory))); + () => WebSocketProtocol.CreateFromStream(new MemoryStream(new byte[100], writable: false), true, "subProtocol", TimeSpan.FromSeconds(30))); AssertExtensions.Throws("stream", - () => WebSocketProtocol.CreateFromStream(new UnreadableStream(), true, "subProtocol", TimeSpan.FromSeconds(30), default(Memory))); + () => WebSocketProtocol.CreateFromStream(new UnreadableStream(), true, "subProtocol", TimeSpan.FromSeconds(30))); AssertExtensions.Throws("subProtocol", - () => WebSocketProtocol.CreateFromStream(new MemoryStream(), true, " ", TimeSpan.FromSeconds(30), default(Memory))); + () => WebSocketProtocol.CreateFromStream(new MemoryStream(), true, " ", TimeSpan.FromSeconds(30))); AssertExtensions.Throws("subProtocol", - () => WebSocketProtocol.CreateFromStream(new MemoryStream(), true, "\xFF", TimeSpan.FromSeconds(30), default(Memory))); + () => WebSocketProtocol.CreateFromStream(new MemoryStream(), true, "\xFF", TimeSpan.FromSeconds(30))); AssertExtensions.Throws("keepAliveInterval", () => - WebSocketProtocol.CreateFromStream(new MemoryStream(), true, "subProtocol", TimeSpan.FromSeconds(-2), default(Memory))); + WebSocketProtocol.CreateFromStream(new MemoryStream(), true, "subProtocol", TimeSpan.FromSeconds(-2))); } [Theory] @@ -46,8 +47,8 @@ namespace System.Net.WebSockets.Tests [InlineData(4096)] public void CreateFromStream_ValidBufferSizes_Succeed(int bufferSize) { - Assert.NotNull(WebSocketProtocol.CreateFromStream(new MemoryStream(), false, null, Timeout.InfiniteTimeSpan, new Memory(new byte[bufferSize]))); - Assert.NotNull(WebSocketProtocol.CreateFromStream(new MemoryStream(), true, null, Timeout.InfiniteTimeSpan, new Memory(new byte[bufferSize]))); + Assert.NotNull(WebSocketProtocol.CreateFromStream(new MemoryStream(), false, null, Timeout.InfiniteTimeSpan)); + Assert.NotNull(WebSocketProtocol.CreateFromStream(new MemoryStream(), true, null, Timeout.InfiniteTimeSpan)); } [OuterLoop] // Connects to external server. @@ -55,19 +56,41 @@ namespace System.Net.WebSockets.Tests [MemberData(nameof(EchoServers))] public async Task WebSocketProtocol_CreateFromConnectedStream_Succeeds(Uri echoUri) { - Uri uri = new UriBuilder(echoUri) { Scheme = (echoUri.Scheme == "ws") ? "http" : "https" }.Uri; - HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, uri); - KeyValuePair secKeyAndSecWebSocketAccept = CreateSecKeyAndSecWebSocketAccept(); - AddWebSocketHeaders(request, secKeyAndSecWebSocketAccept.Key); - DirectManagedHttpClientHandler handler = DirectManagedHttpClientHandler.CreateHandler(); - using (HttpResponseMessage response = await handler.SendAsync(request, CancellationToken.None).ConfigureAwait(false)) + using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) { - Assert.Equal(HttpStatusCode.SwitchingProtocols, response.StatusCode); - using (Stream connectedStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false)) + bool secure = echoUri.Scheme == "wss"; + client.Connect(echoUri.Host, secure ? 443 : 80); + + Stream stream = new NetworkStream(client, ownsSocket: false); + if (secure) { - Assert.True(connectedStream.CanRead); - Assert.True(connectedStream.CanWrite); - using (WebSocket socket = WebSocketProtocol.CreateFromStream(connectedStream, false, null, TimeSpan.FromSeconds(10))) + SslStream ssl = new SslStream(stream, leaveInnerStreamOpen: true, delegate { return true; }); + await ssl.AuthenticateAsClientAsync(echoUri.Host); + stream = ssl; + } + + using (stream) + { + using (var writer = new StreamWriter(stream, Encoding.ASCII, bufferSize: 1, leaveOpen: true)) + { + await writer.WriteAsync($"GET {echoUri.PathAndQuery} HTTP/1.1\r\n"); + await writer.WriteAsync($"Host: {echoUri.Host}\r\n"); + await writer.WriteAsync($"Upgrade: websocket\r\n"); + await writer.WriteAsync($"Connection: Upgrade\r\n"); + await writer.WriteAsync($"Sec-WebSocket-Version: 13\r\n"); + await writer.WriteAsync($"Sec-WebSocket-Key: {Convert.ToBase64String(Guid.NewGuid().ToByteArray())}\r\n"); + await writer.WriteAsync($"\r\n"); + } + + using (var reader = new StreamReader(stream, Encoding.ASCII, detectEncodingFromByteOrderMarks: false, bufferSize: 1, leaveOpen: true)) + { + string statusLine = await reader.ReadLineAsync(); + Assert.NotEmpty(statusLine); + Assert.Equal("HTTP/1.1 101 Switching Protocols", statusLine); + while (!string.IsNullOrEmpty(await reader.ReadLineAsync())); + } + + using (WebSocket socket = WebSocketProtocol.CreateFromStream(stream, false, null, TimeSpan.FromSeconds(10))) { Assert.NotNull(socket); Assert.Equal(WebSocketState.Open, socket.State); @@ -87,28 +110,6 @@ namespace System.Net.WebSockets.Tests public static readonly object[][] EchoServers = System.Net.Test.Common.Configuration.WebSockets.EchoServers; - /// GUID appended by the server as part of the security key response. Defined in the RFC. - private const string WSServerGuid = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"; - - private static KeyValuePair CreateSecKeyAndSecWebSocketAccept() - { - string secKey = Convert.ToBase64String(Guid.NewGuid().ToByteArray()); - using (SHA1 sha = SHA1.Create()) - { - return new KeyValuePair( - secKey, - Convert.ToBase64String(sha.ComputeHash(Encoding.ASCII.GetBytes(secKey + WSServerGuid)))); - } - } - - private static void AddWebSocketHeaders(HttpRequestMessage request, string secKey) - { - request.Headers.TryAddWithoutValidation(HttpKnownHeaderNames.Connection, HttpKnownHeaderNames.Upgrade); - request.Headers.TryAddWithoutValidation(HttpKnownHeaderNames.Upgrade, "websocket"); - request.Headers.TryAddWithoutValidation(HttpKnownHeaderNames.SecWebSocketVersion, "13"); - request.Headers.TryAddWithoutValidation(HttpKnownHeaderNames.SecWebSocketKey, secKey); - } - private sealed class UnreadableStream : Stream { public override bool CanRead => false; @@ -122,44 +123,5 @@ namespace System.Net.WebSockets.Tests public override void SetLength(long value) => throw new NotImplementedException(); public override void Write(byte[] buffer, int offset, int count) => throw new NotImplementedException(); } - - private sealed class DirectManagedHttpClientHandler : HttpClientHandler - { - private const string ManagedHandlerEnvVar = "COMPlus_UseManagedHttpClientHandler"; - private static readonly LocalDataStoreSlot s_managedHandlerSlot = GetSlot(); - private static readonly object s_true = true; - - private static LocalDataStoreSlot GetSlot() - { - LocalDataStoreSlot slot = Thread.GetNamedDataSlot(ManagedHandlerEnvVar); - if (slot != null) - { - return slot; - } - - try - { - return Thread.AllocateNamedDataSlot(ManagedHandlerEnvVar); - } - catch (ArgumentException) // in case of a race condition where multiple threads all try to allocate the slot concurrently - { - return Thread.GetNamedDataSlot(ManagedHandlerEnvVar); - } - } - - public static DirectManagedHttpClientHandler CreateHandler() - { - Thread.SetData(s_managedHandlerSlot, s_true); - try - { - return new DirectManagedHttpClientHandler(); - } - finally { Thread.SetData(s_managedHandlerSlot, null); } - } - - public new Task SendAsync( - HttpRequestMessage request, CancellationToken cancellationToken) => - base.SendAsync(request, cancellationToken); - } } } diff --git a/external/corefx/src/System.Net.WebSockets/ref/System.Net.WebSockets.cs b/external/corefx/src/System.Net.WebSockets/ref/System.Net.WebSockets.cs index 924dc869fe..c174799633 100644 --- a/external/corefx/src/System.Net.WebSockets/ref/System.Net.WebSockets.cs +++ b/external/corefx/src/System.Net.WebSockets/ref/System.Net.WebSockets.cs @@ -29,7 +29,7 @@ namespace System.Net.WebSockets public static System.ArraySegment CreateClientBuffer(int receiveBufferSize, int sendBufferSize) { throw null; } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public static System.Net.WebSockets.WebSocket CreateClientWebSocket(System.IO.Stream innerStream, string subProtocol, int receiveBufferSize, int sendBufferSize, System.TimeSpan keepAliveInterval, bool useZeroMaskingKey, System.ArraySegment internalBuffer) { throw null; } - public static System.Net.WebSockets.WebSocket CreateFromStream(System.IO.Stream stream, bool isServer, string subProtocol, System.TimeSpan keepAliveInterval, System.Memory buffer=default(System.Memory)) { throw null; } + public static System.Net.WebSockets.WebSocket CreateFromStream(System.IO.Stream stream, bool isServer, string subProtocol, System.TimeSpan keepAliveInterval) { throw null; } public static System.ArraySegment CreateServerBuffer(int receiveBufferSize) { throw null; } public abstract void Dispose(); [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] @@ -41,7 +41,7 @@ namespace System.Net.WebSockets [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] public static void RegisterPrefixes() { } public abstract System.Threading.Tasks.Task SendAsync(System.ArraySegment buffer, System.Net.WebSockets.WebSocketMessageType messageType, bool endOfMessage, System.Threading.CancellationToken cancellationToken); - public virtual System.Threading.Tasks.Task SendAsync(System.ReadOnlyMemory buffer, System.Net.WebSockets.WebSocketMessageType messageType, bool endOfMessage, System.Threading.CancellationToken cancellationToken) { throw null; } + public virtual System.Threading.Tasks.ValueTask SendAsync(System.ReadOnlyMemory buffer, System.Net.WebSockets.WebSocketMessageType messageType, bool endOfMessage, System.Threading.CancellationToken cancellationToken) { throw null; } protected static void ThrowOnInvalidState(System.Net.WebSockets.WebSocketState state, params System.Net.WebSockets.WebSocketState[] validStates) { } } public enum WebSocketCloseStatus diff --git a/external/corefx/src/System.Net.WebSockets/src/System.Net.WebSockets.csproj b/external/corefx/src/System.Net.WebSockets/src/System.Net.WebSockets.csproj index 882d8eed46..8f7a330915 100644 --- a/external/corefx/src/System.Net.WebSockets/src/System.Net.WebSockets.csproj +++ b/external/corefx/src/System.Net.WebSockets/src/System.Net.WebSockets.csproj @@ -5,6 +5,7 @@ {B0C83201-EC32-4E8D-9DE4-EEF41E052DA1} System.Net.WebSockets True + true diff --git a/external/corefx/src/System.Net.WebSockets/src/System/Net/WebSockets/ManagedWebSocket.netcoreapp.cs b/external/corefx/src/System.Net.WebSockets/src/System/Net/WebSockets/ManagedWebSocket.netcoreapp.cs index 23e5f6949c..f61f3177dd 100644 --- a/external/corefx/src/System.Net.WebSockets/src/System/Net/WebSockets/ManagedWebSocket.netcoreapp.cs +++ b/external/corefx/src/System.Net.WebSockets/src/System/Net/WebSockets/ManagedWebSocket.netcoreapp.cs @@ -10,7 +10,7 @@ namespace System.Net.WebSockets { internal sealed partial class ManagedWebSocket : WebSocket { - public override Task SendAsync(ReadOnlyMemory buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken) + public override ValueTask SendAsync(ReadOnlyMemory buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken) { return SendPrivateAsync(buffer, messageType, endOfMessage, cancellationToken); } @@ -24,8 +24,11 @@ namespace System.Net.WebSockets Debug.Assert(!Monitor.IsEntered(StateUpdateLock), $"{nameof(StateUpdateLock)} must never be held when acquiring {nameof(ReceiveAsyncLock)}"); lock (ReceiveAsyncLock) // synchronize with receives in CloseAsync { - ThrowIfOperationInProgress(_lastReceiveAsync); + ThrowIfOperationInProgress(_lastReceiveAsync.IsCompleted); ValueTask t = ReceiveAsyncPrivate(buffer, cancellationToken); + + // WARNING: This code is only valid because ReceiveAsyncPrivate returns a ValueTask that wraps a T or a Task. + // If that ever changes where ReceiveAsyncPrivate could wrap an IValueTaskSource, this must also change. _lastReceiveAsync = t.IsCompletedSuccessfully ? (t.Result.MessageType == WebSocketMessageType.Close ? s_cachedCloseTask : Task.CompletedTask) : t.AsTask(); diff --git a/external/corefx/src/System.Net.WebSockets/src/System/Net/WebSockets/WebSocket.cs b/external/corefx/src/System.Net.WebSockets/src/System/Net/WebSockets/WebSocket.cs index 8013388494..27ae87c6a8 100644 --- a/external/corefx/src/System.Net.WebSockets/src/System/Net/WebSockets/WebSocket.cs +++ b/external/corefx/src/System.Net.WebSockets/src/System/Net/WebSockets/WebSocket.cs @@ -35,7 +35,7 @@ namespace System.Net.WebSockets public virtual async ValueTask ReceiveAsync(Memory buffer, CancellationToken cancellationToken) { - if (buffer.TryGetArray(out ArraySegment arraySegment)) + if (MemoryMarshal.TryGetArray(buffer, out ArraySegment arraySegment)) { WebSocketReceiveResult r = await ReceiveAsync(arraySegment, cancellationToken).ConfigureAwait(false); return new ValueWebSocketReceiveResult(r.Count, r.MessageType, r.EndOfMessage); @@ -56,10 +56,10 @@ namespace System.Net.WebSockets } } - public virtual Task SendAsync(ReadOnlyMemory buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken) => - MemoryMarshal.TryGetArray(buffer, out ArraySegment arraySegment) ? + public virtual ValueTask SendAsync(ReadOnlyMemory buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken) => + new ValueTask(MemoryMarshal.TryGetArray(buffer, out ArraySegment arraySegment) ? SendAsync(arraySegment, messageType, endOfMessage, cancellationToken) : - SendWithArrayPoolAsync(buffer, messageType, endOfMessage, cancellationToken); + SendWithArrayPoolAsync(buffer, messageType, endOfMessage, cancellationToken)); private async Task SendWithArrayPoolAsync( ReadOnlyMemory buffer, @@ -135,9 +135,8 @@ namespace System.Net.WebSockets /// true if this is the server-side of the connection; false if it's the client side. /// The agreed upon sub-protocol that was used when creating the connection. /// The keep-alive interval to use, or to disable keep-alives. - /// A scratch buffer that may be used by the implementation for any purpose. /// The created . - public static WebSocket CreateFromStream(Stream stream, bool isServer, string subProtocol, TimeSpan keepAliveInterval, Memory buffer = default) + public static WebSocket CreateFromStream(Stream stream, bool isServer, string subProtocol, TimeSpan keepAliveInterval) { if (stream == null) { @@ -161,7 +160,7 @@ namespace System.Net.WebSockets 0)); } - return ManagedWebSocket.CreateFromConnectedStream(stream, isServer, subProtocol, keepAliveInterval, buffer); + return ManagedWebSocket.CreateFromConnectedStream(stream, isServer, subProtocol, keepAliveInterval); } [EditorBrowsable(EditorBrowsableState.Never)] @@ -211,12 +210,10 @@ namespace System.Net.WebSockets SR.Format(SR.net_WebSockets_ArgumentOutOfRange_TooSmall, 0)); } - Memory internalMemoryBuffer = - internalBuffer.Count >= receiveBufferSize ? internalBuffer : - receiveBufferSize >= ManagedWebSocket.MaxMessageHeaderLength ? new byte[receiveBufferSize] : - Memory.Empty; // let ManagedWebSocket create it + // Ignore useZeroMaskingKey. ManagedWebSocket doesn't currently support that debugging option. + // Ignore internalBuffer. ManagedWebSocket uses its own small buffer for headers/control messages. - return ManagedWebSocket.CreateFromConnectedStream(innerStream, false, subProtocol, keepAliveInterval, internalMemoryBuffer); + return ManagedWebSocket.CreateFromConnectedStream(innerStream, false, subProtocol, keepAliveInterval); } } } diff --git a/external/corefx/src/System.Net.WebSockets/tests/WebSocketTests.netcoreapp.cs b/external/corefx/src/System.Net.WebSockets/tests/WebSocketTests.netcoreapp.cs index a95bb7e319..59e1e2e049 100644 --- a/external/corefx/src/System.Net.WebSockets/tests/WebSocketTests.netcoreapp.cs +++ b/external/corefx/src/System.Net.WebSockets/tests/WebSocketTests.netcoreapp.cs @@ -29,17 +29,6 @@ namespace System.Net.WebSockets.Tests WebSocket.CreateFromStream(new MemoryStream(), true, "subProtocol", TimeSpan.FromSeconds(-2))); } - [Theory] - [InlineData(0)] - [InlineData(1)] - [InlineData(14)] - [InlineData(4096)] - public void CreateFromStream_ValidBufferSizes_Succeed(int bufferSize) - { - Assert.NotNull(WebSocket.CreateFromStream(new MemoryStream(), false, null, Timeout.InfiniteTimeSpan, new byte[bufferSize])); - Assert.NotNull(WebSocket.CreateFromStream(new MemoryStream(), true, null, Timeout.InfiniteTimeSpan, new byte[bufferSize])); - } - [Fact] public void ValueWebSocketReceiveResult_Ctor_InvalidArguments_Throws() { diff --git a/external/corefx/src/System.Numerics.Vectors/System.Numerics.Vectors.sln b/external/corefx/src/System.Numerics.Vectors/System.Numerics.Vectors.sln index e07ec13da9..1880dbdf04 100644 --- a/external/corefx/src/System.Numerics.Vectors/System.Numerics.Vectors.sln +++ b/external/corefx/src/System.Numerics.Vectors/System.Numerics.Vectors.sln @@ -39,10 +39,10 @@ Global {D9906F1A-A41A-43CD-81D2-BA94CF0001C9}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {D9906F1A-A41A-43CD-81D2-BA94CF0001C9}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU {D9906F1A-A41A-43CD-81D2-BA94CF0001C9}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU - {53134B0C-0D57-481B-B84E-D1991E8D54FF}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU - {53134B0C-0D57-481B-B84E-D1991E8D54FF}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU - {53134B0C-0D57-481B-B84E-D1991E8D54FF}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU - {53134B0C-0D57-481B-B84E-D1991E8D54FF}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU + {53134B0C-0D57-481B-B84E-D1991E8D54FF}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU + {53134B0C-0D57-481B-B84E-D1991E8D54FF}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU + {53134B0C-0D57-481B-B84E-D1991E8D54FF}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU + {53134B0C-0D57-481B-B84E-D1991E8D54FF}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU {650277B5-9423-4ACE-BB54-2659995B21C7}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {650277B5-9423-4ACE-BB54-2659995B21C7}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {650277B5-9423-4ACE-BB54-2659995B21C7}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/external/corefx/src/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj b/external/corefx/src/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj index fb09f270ed..7226c74df4 100644 --- a/external/corefx/src/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj +++ b/external/corefx/src/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj @@ -6,11 +6,11 @@ 2.8.6 + + netcore45;wp8;wpa81;netcoreapp1.0;$(AllXamarinFrameworks) + - net45;netcore45;wp8;wpa81;netcoreapp1.0;$(AllXamarinFrameworks) - - true + net45 @@ -21,15 +21,8 @@ - - - - .NETCoreApp;UAP - + + \ No newline at end of file diff --git a/external/corefx/src/System.Numerics.Vectors/ref/Configurations.props b/external/corefx/src/System.Numerics.Vectors/ref/Configurations.props index 322defb707..ed7d2db187 100644 --- a/external/corefx/src/System.Numerics.Vectors/ref/Configurations.props +++ b/external/corefx/src/System.Numerics.Vectors/ref/Configurations.props @@ -3,6 +3,7 @@ netstandard1.0; + net45; netstandard; net46; diff --git a/external/corefx/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.cs b/external/corefx/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.cs index 486ad29db9..3bf0960947 100644 --- a/external/corefx/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.cs +++ b/external/corefx/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.cs @@ -301,6 +301,9 @@ namespace System.Numerics public Vector(T value) { throw null; } public Vector(T[] values) { throw null; } public Vector(T[] values, int index) { throw null; } +#if HAS_SPAN + public Vector(Span values) { throw null; } +#endif public static int Count { get { throw null; } } public T this[int index] { get { throw null; } } public static System.Numerics.Vector One { get { throw null; } } diff --git a/external/corefx/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj b/external/corefx/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj index e613f45d1c..05beeb02a6 100644 --- a/external/corefx/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj +++ b/external/corefx/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj @@ -3,8 +3,14 @@ {650277B5-9423-4ACE-BB54-2659995B21C7} - true + true + $(DefineConstants);HAS_SPAN + + 4.1.3.0 + + @@ -20,14 +26,14 @@ - + - + diff --git a/external/corefx/src/System.Numerics.Vectors/src/ApiCompatBaseline.uapaot.txt b/external/corefx/src/System.Numerics.Vectors/src/ApiCompatBaseline.uapaot.txt new file mode 100644 index 0000000000..bc7a12f526 --- /dev/null +++ b/external/corefx/src/System.Numerics.Vectors/src/ApiCompatBaseline.uapaot.txt @@ -0,0 +1 @@ +MembersMustExist : Member 'System.Numerics.Vector..ctor(System.Span)' does not exist in the implementation but it does exist in the contract. \ No newline at end of file diff --git a/external/corefx/src/System.Numerics.Vectors/src/Configurations.props b/external/corefx/src/System.Numerics.Vectors/src/Configurations.props index 29a728f3e8..3e3accde0d 100644 --- a/external/corefx/src/System.Numerics.Vectors/src/Configurations.props +++ b/external/corefx/src/System.Numerics.Vectors/src/Configurations.props @@ -7,10 +7,12 @@ net46; + uapaot-Windows_NT; uap-Windows_NT; netfx-Windows_NT; - netcoreapp; + netcoreapp-Windows_NT; + netcoreapp-Unix; $(PackageConfigurations) - \ No newline at end of file + diff --git a/external/corefx/src/System.Numerics.Vectors/src/Resources/Strings.resx b/external/corefx/src/System.Numerics.Vectors/src/Resources/Strings.resx index fc8ea5b29b..688f37d005 100644 --- a/external/corefx/src/System.Numerics.Vectors/src/Resources/Strings.resx +++ b/external/corefx/src/System.Numerics.Vectors/src/Resources/Strings.resx @@ -70,4 +70,7 @@ Specified type is not supported + + At least {0} element(s) are expected in the parameter "{1}". + \ No newline at end of file diff --git a/external/corefx/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj b/external/corefx/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj index d3f22a00a7..47a3bf9c34 100644 --- a/external/corefx/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj +++ b/external/corefx/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj @@ -6,13 +6,17 @@ System.Numerics $(OutputPath)$(MSBuildProjectName).xml true - true + true + true + true netstandard1.0;portable-net45+win8+wp8+wpa81 - - + + + + @@ -21,37 +25,49 @@ + + - + Common\System\Numerics\Hashing\HashHelpers.cs - + + System\Runtime\CompilerServices\IntrinsicAttribute.cs + + + + + True True ConstantHelper.tt + System\Numerics\ConstantHelper.cs - - + True True Register.tt + System\Numerics\Register.cs - + True True Vector.tt + System\Numerics\Vector.cs + + + System\Numerics\Vector_Operations.cs - - - + + System\MathF.netstandard.cs - + @@ -63,24 +79,34 @@ - + - - + + System\Numerics\GenerationConfig.ttinclude + + TextTemplatingFileGenerator ConstantHelper.cs + System\Numerics\ConstantHelper.tt - + TextTemplatingFileGenerator Register.cs + System\Numerics\Register.tt - + TextTemplatingFileGenerator Vector.cs + System\Numerics\Vector.tt + + + + + diff --git a/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/JitIntrinsicAttribute.cs b/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/JitIntrinsicAttribute.cs deleted file mode 100644 index 741041222f..0000000000 --- a/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/JitIntrinsicAttribute.cs +++ /dev/null @@ -1,14 +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.Numerics -{ - /// - /// An attribute that can be attached to JIT Intrinsic methods/properties - /// - [AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Property)] - internal class JitIntrinsicAttribute : Attribute - { - } -} diff --git a/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector.cs.REMOVED.git-id b/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector.cs.REMOVED.git-id deleted file mode 100644 index 1cba6f7ee8..0000000000 --- a/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector.cs.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -9e4eb703aaceb3c7a02e8fb8d863320bf33bca56 \ No newline at end of file diff --git a/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector2_Intrinsics.cs b/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector2_Intrinsics.cs index 8578ac877f..59db2b078d 100644 --- a/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector2_Intrinsics.cs +++ b/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector2_Intrinsics.cs @@ -27,7 +27,7 @@ namespace System.Numerics /// Constructs a vector whose elements are all the single specified value. /// /// The element to fill the vector with. - [JitIntrinsic] + [Intrinsic] public Vector2(Single value) : this(value, value) { } /// @@ -35,7 +35,7 @@ namespace System.Numerics /// /// The X component. /// The Y component. - [JitIntrinsic] + [Intrinsic] public Vector2(Single x, Single y) { X = x; @@ -86,7 +86,7 @@ namespace System.Numerics /// /// The Vector2 to compare this instance to. /// True if the other Vector2 is equal to this instance; False otherwise. - [JitIntrinsic] + [Intrinsic] public bool Equals(Vector2 other) { return this.X == other.X && this.Y == other.Y; @@ -100,7 +100,7 @@ namespace System.Numerics /// The first vector. /// The second vector. /// The dot product. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static float Dot(Vector2 value1, Vector2 value2) { @@ -114,7 +114,7 @@ namespace System.Numerics /// The first source vector. /// The second source vector. /// The minimized vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector2 Min(Vector2 value1, Vector2 value2) { @@ -129,7 +129,7 @@ namespace System.Numerics /// The first source vector /// The second source vector /// The maximized vector - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector2 Max(Vector2 value1, Vector2 value2) { @@ -143,7 +143,7 @@ namespace System.Numerics /// /// The source vector. /// The absolute value vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector2 Abs(Vector2 value) { @@ -155,7 +155,7 @@ namespace System.Numerics /// /// The source vector. /// The square root vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector2 SquareRoot(Vector2 value) { @@ -170,7 +170,7 @@ namespace System.Numerics /// The first source vector. /// The second source vector. /// The summed vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector2 operator +(Vector2 left, Vector2 right) { @@ -183,7 +183,7 @@ namespace System.Numerics /// The first source vector. /// The second source vector. /// The difference vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector2 operator -(Vector2 left, Vector2 right) { @@ -196,7 +196,7 @@ namespace System.Numerics /// The first source vector. /// The second source vector. /// The product vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector2 operator *(Vector2 left, Vector2 right) { @@ -209,7 +209,7 @@ namespace System.Numerics /// The scalar value. /// The source vector. /// The scaled vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector2 operator *(Single left, Vector2 right) { @@ -222,7 +222,7 @@ namespace System.Numerics /// The source vector. /// The scalar value. /// The scaled vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector2 operator *(Vector2 left, Single right) { @@ -235,7 +235,7 @@ namespace System.Numerics /// The first source vector. /// The second source vector. /// The vector resulting from the division. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector2 operator /(Vector2 left, Vector2 right) { @@ -248,14 +248,10 @@ namespace System.Numerics /// The source vector. /// The scalar value. /// The result of the division. - [JitIntrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector2 operator /(Vector2 value1, float value2) { - float invDiv = 1.0f / value2; - return new Vector2( - value1.X * invDiv, - value1.Y * invDiv); + return value1 / new Vector2(value2); } /// diff --git a/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector3_Intrinsics.cs b/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector3_Intrinsics.cs index baefa0e3ec..b8c034ac93 100644 --- a/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector3_Intrinsics.cs +++ b/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector3_Intrinsics.cs @@ -32,7 +32,7 @@ namespace System.Numerics /// Constructs a vector whose elements are all the single specified value. /// /// The element to fill the vector with. - [JitIntrinsic] + [Intrinsic] public Vector3(Single value) : this(value, value, value) { } /// @@ -48,7 +48,7 @@ namespace System.Numerics /// The X component. /// The Y component. /// The Z component. - [JitIntrinsic] + [Intrinsic] public Vector3(Single x, Single y, Single z) { X = x; @@ -74,7 +74,7 @@ namespace System.Numerics /// If array is multidimensional. /// If index is greater than end of the array or index is less than zero. /// If number of elements in source vector is greater than those available in destination array. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public void CopyTo(Single[] array, int index) { @@ -101,7 +101,7 @@ namespace System.Numerics /// /// The Vector3 to compare this instance to. /// True if the other Vector3 is equal to this instance; False otherwise. - [JitIntrinsic] + [Intrinsic] public bool Equals(Vector3 other) { return X == other.X && @@ -117,7 +117,7 @@ namespace System.Numerics /// The first vector. /// The second vector. /// The dot product. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static float Dot(Vector3 vector1, Vector3 vector2) { @@ -132,7 +132,7 @@ namespace System.Numerics /// The first source vector. /// The second source vector. /// The minimized vector. - [JitIntrinsic] + [Intrinsic] public static Vector3 Min(Vector3 value1, Vector3 value2) { return new Vector3( @@ -147,7 +147,7 @@ namespace System.Numerics /// The first source vector. /// The second source vector. /// The maximized vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector3 Max(Vector3 value1, Vector3 value2) { @@ -162,7 +162,7 @@ namespace System.Numerics /// /// The source vector. /// The absolute value vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector3 Abs(Vector3 value) { @@ -174,7 +174,7 @@ namespace System.Numerics /// /// The source vector. /// The square root vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector3 SquareRoot(Vector3 value) { @@ -189,7 +189,7 @@ namespace System.Numerics /// The first source vector. /// The second source vector. /// The summed vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector3 operator +(Vector3 left, Vector3 right) { @@ -202,7 +202,7 @@ namespace System.Numerics /// The first source vector. /// The second source vector. /// The difference vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector3 operator -(Vector3 left, Vector3 right) { @@ -215,7 +215,7 @@ namespace System.Numerics /// The first source vector. /// The second source vector. /// The product vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector3 operator *(Vector3 left, Vector3 right) { @@ -228,7 +228,7 @@ namespace System.Numerics /// The source vector. /// The scalar value. /// The scaled vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector3 operator *(Vector3 left, Single right) { @@ -241,7 +241,7 @@ namespace System.Numerics /// The scalar value. /// The source vector. /// The scaled vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector3 operator *(Single left, Vector3 right) { @@ -254,7 +254,7 @@ namespace System.Numerics /// The first source vector. /// The second source vector. /// The vector resulting from the division. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector3 operator /(Vector3 left, Vector3 right) { @@ -267,16 +267,10 @@ namespace System.Numerics /// The source vector. /// The scalar value. /// The result of the division. - [JitIntrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector3 operator /(Vector3 value1, float value2) { - float invDiv = 1.0f / value2; - - return new Vector3( - value1.X * invDiv, - value1.Y * invDiv, - value1.Z * invDiv); + return value1 / new Vector3(value2); } /// @@ -296,7 +290,7 @@ namespace System.Numerics /// The first vector to compare. /// The second vector to compare. /// True if the vectors are equal; False otherwise. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static bool operator ==(Vector3 left, Vector3 right) { diff --git a/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector4_Intrinsics.cs b/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector4_Intrinsics.cs index b6add39ec6..067b387f55 100644 --- a/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector4_Intrinsics.cs +++ b/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector4_Intrinsics.cs @@ -36,7 +36,7 @@ namespace System.Numerics /// Constructs a vector whose elements are all the single specified value. /// /// The element to fill the vector with. - [JitIntrinsic] + [Intrinsic] public Vector4(Single value) : this(value, value, value, value) { @@ -48,7 +48,7 @@ namespace System.Numerics /// X component. /// Y component. /// Z component. - [JitIntrinsic] + [Intrinsic] public Vector4(Single x, Single y, Single z, Single w) { W = w; @@ -102,7 +102,7 @@ namespace System.Numerics /// If array is multidimensional. /// If index is greater than end of the array or index is less than zero. /// If number of elements in source vector is greater than those available in destination array. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public void CopyTo(Single[] array, int index) { @@ -130,7 +130,7 @@ namespace System.Numerics /// /// The Vector4 to compare this instance to. /// True if the other Vector4 is equal to this instance; False otherwise. - [JitIntrinsic] + [Intrinsic] public bool Equals(Vector4 other) { return this.X == other.X @@ -147,7 +147,7 @@ namespace System.Numerics /// The first vector. /// The second vector. /// The dot product. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static float Dot(Vector4 vector1, Vector4 vector2) { @@ -163,7 +163,7 @@ namespace System.Numerics /// The first source vector. /// The second source vector. /// The minimized vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector4 Min(Vector4 value1, Vector4 value2) { @@ -180,7 +180,7 @@ namespace System.Numerics /// The first source vector. /// The second source vector. /// The maximized vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector4 Max(Vector4 value1, Vector4 value2) { @@ -196,7 +196,7 @@ namespace System.Numerics /// /// The source vector. /// The absolute value vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector4 Abs(Vector4 value) { @@ -208,7 +208,7 @@ namespace System.Numerics /// /// The source vector. /// The square root vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector4 SquareRoot(Vector4 value) { @@ -223,7 +223,7 @@ namespace System.Numerics /// The first source vector. /// The second source vector. /// The summed vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector4 operator +(Vector4 left, Vector4 right) { @@ -236,7 +236,7 @@ namespace System.Numerics /// The first source vector. /// The second source vector. /// The difference vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector4 operator -(Vector4 left, Vector4 right) { @@ -249,7 +249,7 @@ namespace System.Numerics /// The first source vector. /// The second source vector. /// The product vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector4 operator *(Vector4 left, Vector4 right) { @@ -262,7 +262,7 @@ namespace System.Numerics /// The source vector. /// The scalar value. /// The scaled vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector4 operator *(Vector4 left, Single right) { @@ -275,7 +275,7 @@ namespace System.Numerics /// The scalar value. /// The source vector. /// The scaled vector. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector4 operator *(Single left, Vector4 right) { @@ -288,7 +288,7 @@ namespace System.Numerics /// The first source vector. /// The second source vector. /// The vector resulting from the division. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector4 operator /(Vector4 left, Vector4 right) { @@ -301,17 +301,10 @@ namespace System.Numerics /// The source vector. /// The scalar value. /// The result of the division. - [JitIntrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector4 operator /(Vector4 value1, float value2) { - float invDiv = 1.0f / value2; - - return new Vector4( - value1.X * invDiv, - value1.Y * invDiv, - value1.Z * invDiv, - value1.W * invDiv); + return value1 / new Vector4(value2); } /// @@ -331,7 +324,7 @@ namespace System.Numerics /// The first vector to compare. /// The second vector to compare. /// True if the vectors are equal; False otherwise. - [JitIntrinsic] + [Intrinsic] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static bool operator ==(Vector4 left, Vector4 right) { diff --git a/external/corefx/src/System.Numerics.Vectors/tests/GenericVectorTests.cs.REMOVED.git-id b/external/corefx/src/System.Numerics.Vectors/tests/GenericVectorTests.cs.REMOVED.git-id index af3ae65640..238601dc1d 100644 --- a/external/corefx/src/System.Numerics.Vectors/tests/GenericVectorTests.cs.REMOVED.git-id +++ b/external/corefx/src/System.Numerics.Vectors/tests/GenericVectorTests.cs.REMOVED.git-id @@ -1 +1 @@ -e03022a21608be4ac2d624b1a15c3b2cf7fb9182 \ No newline at end of file +eb0e588d6483a157c5e1cf53be92aacf1b5e9768 \ No newline at end of file diff --git a/external/corefx/src/System.Numerics.Vectors/tests/GenericVectorTests.netcoreapp.cs b/external/corefx/src/System.Numerics.Vectors/tests/GenericVectorTests.netcoreapp.cs new file mode 100644 index 0000000000..cb5ed7b81a --- /dev/null +++ b/external/corefx/src/System.Numerics.Vectors/tests/GenericVectorTests.netcoreapp.cs @@ -0,0 +1,226 @@ +// 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; +using System.Globalization; +using System.Linq; +using System.Reflection; +using Xunit; +using Xunit.Sdk; + +namespace System.Numerics.Tests +{ + /// + /// Vector{T} tests that use random number generation and a unified generic test structure + /// + public partial class GenericVectorTests + { + #region Constructor Tests + + #region Tests for Span based constructor + [Fact] + public void ConstructorWithSpanByte() => TestConstructorWithSpan(); + [Fact] + public void ConstructorWithSpanSByte() => TestConstructorWithSpan(); + [Fact] + public void ConstructorWithSpanUInt16() => TestConstructorWithSpan(); + [Fact] + public void ConstructorWithSpanInt16() => TestConstructorWithSpan(); + [Fact] + public void ConstructorWithSpanUInt32() => TestConstructorWithSpan(); + [Fact] + public void ConstructorWithSpanInt32() => TestConstructorWithSpan(); + [Fact] + public void ConstructorWithSpanUInt64() => TestConstructorWithSpan(); + [Fact] + public void ConstructorWithSpanInt64() => TestConstructorWithSpan(); + [Fact] + public void ConstructorWithSpanSingle() => TestConstructorWithSpan(); + [Fact] + public void ConstructorWithSpanDouble() => TestConstructorWithSpan(); + + private void TestConstructorWithSpan() where T : struct + { + T[] values = GenerateRandomValuesForVector().ToArray(); + var valueSpan = new Span(values); + + var vector = new Vector(valueSpan); + ValidateVector(vector, + (index, val) => + { + Assert.Equal(values[index], val); + }); + } + + [Fact] + public void SpanBasedConstructorWithLessElements_Byte() => Assert.Throws(() => TestSpanBasedConstructorWithLessElements()); + [Fact] + public void SpanBasedConstructorWithLessElements_SByte() => Assert.Throws(() => TestSpanBasedConstructorWithLessElements()); + [Fact] + public void SpanBasedConstructorWithLessElements_UInt16() => Assert.Throws(() => TestSpanBasedConstructorWithLessElements()); + [Fact] + public void SpanBasedConstructorWithLessElements_Int16() => Assert.Throws(() => TestSpanBasedConstructorWithLessElements()); + [Fact] + public void SpanBasedConstructorWithLessElements_UInt32() => Assert.Throws(() => TestSpanBasedConstructorWithLessElements()); + [Fact] + public void SpanBasedConstructorWithLessElements_Int32() => Assert.Throws(() => TestSpanBasedConstructorWithLessElements()); + [Fact] + public void SpanBasedConstructorWithLessElements_UInt64() => Assert.Throws(() => TestSpanBasedConstructorWithLessElements()); + [Fact] + public void SpanBasedConstructorWithLessElements_Int64() => Assert.Throws(() => TestSpanBasedConstructorWithLessElements()); + [Fact] + public void SpanBasedConstructorWithLessElements_Single() => Assert.Throws(() => TestSpanBasedConstructorWithLessElements()); + [Fact] + public void SpanBasedConstructorWithLessElements_Double() => Assert.Throws(() => TestSpanBasedConstructorWithLessElements()); + + private void TestSpanBasedConstructorWithLessElements() where T : struct + { + T[] values = GenerateRandomValuesForVector(Vector.Count - 1).ToArray(); + var vector = new Vector(new Span(values)); + } + + #endregion Tests for Span based constructor + + #region Tests for Array based constructor + + [Fact] + public void ArrayBasedConstructor_Byte() => TestArrayBasedConstructor(); + [Fact] + public void ArrayBasedConstructor_SByte() => TestArrayBasedConstructor(); + [Fact] + public void ArrayBasedConstructor_UInt16() => TestArrayBasedConstructor(); + [Fact] + public void ArrayBasedConstructor_Int16() => TestArrayBasedConstructor(); + [Fact] + public void ArrayBasedConstructor_UInt32() => TestArrayBasedConstructor(); + [Fact] + public void ArrayBasedConstructor_Int32() => TestArrayBasedConstructor(); + [Fact] + public void ArrayBasedConstructor_UInt64() => TestArrayBasedConstructor(); + [Fact] + public void ArrayBasedConstructor_Int64() => TestArrayBasedConstructor(); + [Fact] + public void ArrayBasedConstructor_Single() => TestArrayBasedConstructor(); + [Fact] + public void ArrayBasedConstructor_Double() => TestArrayBasedConstructor(); + + private void TestArrayBasedConstructor() where T : struct + { + T[] values = GenerateRandomValuesForVector(Vector.Count).ToArray(); + var vector = new Vector(values); + ValidateVector(vector, + (index, val) => + { + Assert.Equal(values[index], val); + }); + } + + [Fact] + public void ArrayIndexBasedConstructor_Byte() => TestArrayIndexBasedConstructor(); + [Fact] + public void ArrayIndexBasedConstructor_SByte() => TestArrayIndexBasedConstructor(); + [Fact] + public void ArrayIndexBasedConstructor_UInt16() => TestArrayIndexBasedConstructor(); + [Fact] + public void ArrayIndexBasedConstructor_Int16() => TestArrayIndexBasedConstructor(); + [Fact] + public void ArrayIndexBasedConstructor_UInt32() => TestArrayIndexBasedConstructor(); + [Fact] + public void ArrayIndexBasedConstructor_Int32() => TestArrayIndexBasedConstructor(); + [Fact] + public void ArrayIndexBasedConstructor_UInt64() => TestArrayIndexBasedConstructor(); + [Fact] + public void ArrayIndexBasedConstructor_Int64() => TestArrayIndexBasedConstructor(); + [Fact] + public void ArrayIndexBasedConstructor_Single() => TestArrayIndexBasedConstructor(); + [Fact] + public void ArrayIndexBasedConstructor_Double() => TestArrayIndexBasedConstructor(); + + private void TestArrayIndexBasedConstructor() where T : struct + { + T[] values = GenerateRandomValuesForVector(Vector.Count * 2).ToArray(); + int offset = Vector.Count - 1; + var vector = new Vector(values, offset); + ValidateVector(vector, + (index, val) => + { + Assert.Equal(values[offset + index], val); + }); + } + + [Fact] + public void ArrayBasedConstructorWithLessElements_Byte() => TestArrayBasedConstructorWithLessElements(); + [Fact] + public void ArrayBasedConstructorWithLessElements_SByte() => TestArrayBasedConstructorWithLessElements(); + [Fact] + public void ArrayBasedConstructorWithLessElements_UInt16() => TestArrayBasedConstructorWithLessElements(); + [Fact] + public void ArrayBasedConstructorWithLessElements_Int16() => TestArrayBasedConstructorWithLessElements(); + [Fact] + public void ArrayBasedConstructorWithLessElements_UInt32() => TestArrayBasedConstructorWithLessElements(); + [Fact] + public void ArrayBasedConstructorWithLessElements_Int32() => TestArrayBasedConstructorWithLessElements(); + [Fact] + public void ArrayBasedConstructorWithLessElements_UInt64() => TestArrayBasedConstructorWithLessElements(); + [Fact] + public void ArrayBasedConstructorWithLessElements_Int64() => TestArrayBasedConstructorWithLessElements(); + [Fact] + public void ArrayBasedConstructorWithLessElements_Single() => TestArrayBasedConstructorWithLessElements(); + [Fact] + public void ArrayBasedConstructorWithLessElements_Double() => TestArrayBasedConstructorWithLessElements(); + + private void TestArrayBasedConstructorWithLessElements() where T : struct + { + T[] values = GenerateRandomValuesForVector(Vector.Count - 1).ToArray(); + Assert.Throws(() => new Vector(values)); + } + + [Fact] + public void ArrayIndexBasedConstructorLessElements_Byte() => TestArrayIndexBasedConstructorLessElements(); + [Fact] + public void ArrayIndexBasedConstructorLessElements_SByte() => TestArrayIndexBasedConstructorLessElements(); + [Fact] + public void ArrayIndexBasedConstructorLessElements_UInt16() => TestArrayIndexBasedConstructorLessElements(); + [Fact] + public void ArrayIndexBasedConstructorLessElements_Int16() => TestArrayIndexBasedConstructorLessElements(); + [Fact] + public void ArrayIndexBasedConstructorLessElements_UInt32() => TestArrayIndexBasedConstructorLessElements(); + [Fact] + public void ArrayIndexBasedConstructorLessElements_Int32() => TestArrayIndexBasedConstructorLessElements(); + [Fact] + public void ArrayIndexBasedConstructorLessElements_UInt64() => TestArrayIndexBasedConstructorLessElements(); + [Fact] + public void ArrayIndexBasedConstructorLessElements_Int64() => TestArrayIndexBasedConstructorLessElements(); + [Fact] + public void ArrayIndexBasedConstructorLessElements_Single() => TestArrayIndexBasedConstructorLessElements(); + [Fact] + public void ArrayIndexBasedConstructorLessElements_Double() => TestArrayIndexBasedConstructorLessElements(); + + private void TestArrayIndexBasedConstructorLessElements() where T : struct + { + T[] values = GenerateRandomValuesForVector(Vector.Count * 2).ToArray(); + Assert.Throws(() => new Vector(values, Vector.Count + 1)); + } + + #endregion Tests for Array based constructor + + #region Tests for constructors using unsupported types + + [Fact] + public void ConstructorWithUnsupportedTypes_Guid() => TestConstructorWithUnsupportedTypes(); + [Fact] + public void ConstructorWithUnsupportedTypes_DateTime() => TestConstructorWithUnsupportedTypes(); + [Fact] + public void ConstructorWithUnsupportedTypes_Char() => TestConstructorWithUnsupportedTypes(); + + private void TestConstructorWithUnsupportedTypes() where T : struct + { + Assert.Throws(() => new Vector(new Span(new T[4]))); + } + + #endregion Tests for constructors using unsupported types + + #endregion Constructor Tests + } +} diff --git a/external/corefx/src/System.Numerics.Vectors/tests/GenericVectorTests.netcoreapp.tt b/external/corefx/src/System.Numerics.Vectors/tests/GenericVectorTests.netcoreapp.tt new file mode 100644 index 0000000000..68a0c15077 --- /dev/null +++ b/external/corefx/src/System.Numerics.Vectors/tests/GenericVectorTests.netcoreapp.tt @@ -0,0 +1,174 @@ +<#@ template debug="true" hostSpecific="true" #> +<#@ output extension=".cs" #> +<#@ Assembly Name="System.Core.dll" #> +<#@ Assembly Name="System.Xml.dll" #> +<#@ import namespace="System" #> +<#@ import namespace="System.Linq" #> +<#@ import namespace="System.Runtime.InteropServices" #> +<#@ include file="..\..\Common\src\CoreLib\System\Numerics\GenerationConfig.ttinclude" #><# GenerateCopyrightHeader(); #> + +using System; +using System.Globalization; +using System.Linq; +using System.Reflection; +using Xunit; +using Xunit.Sdk; + +namespace System.Numerics.Tests +{ + /// + /// Vector{T} tests that use random number generation and a unified generic test structure + /// + public partial class GenericVectorTests + { + #region Constructor Tests + + #region Tests for Span based constructor +<# + foreach (var type in supportedTypes) + { +#> + [Fact] + public void ConstructorWithSpan<#=type.Name#>() => TestConstructorWithSpan<<#=type.Name#>>(); +<# + } +#> + + private void TestConstructorWithSpan() where T : struct + { + T[] values = GenerateRandomValuesForVector().ToArray(); + var valueSpan = new Span(values); + + var vector = new Vector(valueSpan); + ValidateVector(vector, + (index, val) => + { + Assert.Equal(values[index], val); + }); + } + +<# + foreach (var type in supportedTypes) + { +#> + [Fact] + public void SpanBasedConstructorWithLessElements_<#=type.Name#>() => Assert.Throws(() => TestSpanBasedConstructorWithLessElements<<#=type.Name#>>()); +<# + } +#> + + private void TestSpanBasedConstructorWithLessElements() where T : struct + { + T[] values = GenerateRandomValuesForVector(Vector.Count - 1).ToArray(); + var vector = new Vector(new Span(values)); + } + + #endregion Tests for Span based constructor + + #region Tests for Array based constructor + +<# + foreach (var type in supportedTypes) + { +#> + [Fact] + public void ArrayBasedConstructor_<#=type.Name#>() => TestArrayBasedConstructor<<#=type.Name#>>(); +<# + } +#> + + private void TestArrayBasedConstructor() where T : struct + { + T[] values = GenerateRandomValuesForVector(Vector.Count).ToArray(); + var vector = new Vector(values); + ValidateVector(vector, + (index, val) => + { + Assert.Equal(values[index], val); + }); + } + +<# + foreach (var type in supportedTypes) + { +#> + [Fact] + public void ArrayIndexBasedConstructor_<#=type.Name#>() => TestArrayIndexBasedConstructor<<#=type.Name#>>(); +<# + } +#> + + private void TestArrayIndexBasedConstructor() where T : struct + { + T[] values = GenerateRandomValuesForVector(Vector.Count * 2).ToArray(); + int offset = Vector.Count - 1; + var vector = new Vector(values, offset); + ValidateVector(vector, + (index, val) => + { + Assert.Equal(values[offset + index], val); + }); + } + +<# + foreach (var type in supportedTypes) + { +#> + [Fact] + public void ArrayBasedConstructorWithLessElements_<#=type.Name#>() => TestArrayBasedConstructorWithLessElements<<#=type.Name#>>(); +<# + } +#> + + private void TestArrayBasedConstructorWithLessElements() where T : struct + { + T[] values = GenerateRandomValuesForVector(Vector.Count - 1).ToArray(); + Assert.Throws(() => new Vector(values)); + } + +<# + foreach (var type in supportedTypes) + { +#> + [Fact] + public void ArrayIndexBasedConstructorLessElements_<#=type.Name#>() => TestArrayIndexBasedConstructorLessElements<<#=type.Name#>>(); +<# + } +#> + + private void TestArrayIndexBasedConstructorLessElements() where T : struct + { + T[] values = GenerateRandomValuesForVector(Vector.Count * 2).ToArray(); + Assert.Throws(() => new Vector(values, Vector.Count + 1)); + } + + #endregion Tests for Array based constructor + + #region Tests for constructors using unsupported types + +<# + Type[] unsupportedTypes = new[] + { + typeof(Guid), typeof(DateTime), typeof(char) + }; + + + foreach (var type in unsupportedTypes) + { +#> + [Fact] + public void ConstructorWithUnsupportedTypes_<#=type.Name#>() => TestConstructorWithUnsupportedTypes<<#=type.Name#>>(); +<# + } +#> + + private void TestConstructorWithUnsupportedTypes() where T : struct + { + Assert.Throws(() => new Vector(new Span(new T[4]))); + } + + #endregion Tests for constructors using unsupported types + + #endregion Constructor Tests + } +} diff --git a/external/corefx/src/System.Numerics.Vectors/tests/GenericVectorTests.tt b/external/corefx/src/System.Numerics.Vectors/tests/GenericVectorTests.tt index 4790b1ac50..5fbd230724 100644 --- a/external/corefx/src/System.Numerics.Vectors/tests/GenericVectorTests.tt +++ b/external/corefx/src/System.Numerics.Vectors/tests/GenericVectorTests.tt @@ -5,7 +5,7 @@ <#@ import namespace="System" #> <#@ import namespace="System.Linq" #> <#@ import namespace="System.Runtime.InteropServices" #> -<#@ include file="..\src\System\Numerics\GenerationConfig.ttinclude" #><# GenerateCopyrightHeader(); #> +<#@ include file="..\..\common\src\corelib\System\Numerics\GenerationConfig.ttinclude" #><# GenerateCopyrightHeader(); #> using System; using System.Globalization; @@ -19,7 +19,7 @@ namespace System.Numerics.Tests /// /// Vector{T} tests that use random number generation and a unified generic test structure /// - public class GenericVectorTests + public partial class GenericVectorTests { // Static constructor in top-level class\ static System.Numerics.Vector dummy; @@ -116,7 +116,7 @@ namespace System.Numerics.Tests }); } -<# +<# foreach (var type in supportedTypes) { #> @@ -1792,11 +1792,11 @@ namespace System.Numerics.Tests } } - internal static T[] GenerateRandomValuesForVector() where T : struct + internal static T[] GenerateRandomValuesForVector(int? numValues = null) where T : struct { int minValue = GetMinValue(); int maxValue = GetMaxValue(); - return Util.GenerateRandomValues(Vector.Count, minValue, maxValue); + return Util.GenerateRandomValues(numValues ?? Vector.Count, minValue, maxValue); } internal static int GetMinValue() where T : struct @@ -1869,4 +1869,4 @@ namespace System.Numerics.Tests } #endregion } -} \ No newline at end of file +} diff --git a/external/corefx/src/System.Numerics.Vectors/tests/Performance/Constructor/GenericVectorConstructorTests.cs b/external/corefx/src/System.Numerics.Vectors/tests/Performance/Constructor/GenericVectorConstructorTests.cs new file mode 100644 index 0000000000..4220c38085 --- /dev/null +++ b/external/corefx/src/System.Numerics.Vectors/tests/Performance/Constructor/GenericVectorConstructorTests.cs @@ -0,0 +1,352 @@ +// 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; +using System.Globalization; +using System.Linq; +using System.Reflection; +using System.Runtime.InteropServices; +using Xunit; +using Xunit.Sdk; +using Microsoft.Xunit.Performance; + +namespace System.Numerics.Tests +{ + public static class Constructor + { + private static Random s_random = new Random(); + + public const int DefaultInnerIterationsCount = 100000000; + + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void ConstructorBenchmark_Byte() + { + Byte[] arrValues = GenerateRandomValuesForVector(); + var spanValues = new Span(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + Construct(spanValues); + } + } + } + + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void ConstructorBenchmark_SByte() + { + SByte[] arrValues = GenerateRandomValuesForVector(); + var spanValues = new Span(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + Construct(spanValues); + } + } + } + + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void ConstructorBenchmark_UInt16() + { + UInt16[] arrValues = GenerateRandomValuesForVector(); + var spanValues = new Span(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + Construct(spanValues); + } + } + } + + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void ConstructorBenchmark_Int16() + { + Int16[] arrValues = GenerateRandomValuesForVector(); + var spanValues = new Span(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + Construct(spanValues); + } + } + } + + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void ConstructorBenchmark_UInt32() + { + UInt32[] arrValues = GenerateRandomValuesForVector(); + var spanValues = new Span(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + Construct(spanValues); + } + } + } + + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void ConstructorBenchmark_Int32() + { + Int32[] arrValues = GenerateRandomValuesForVector(); + var spanValues = new Span(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + Construct(spanValues); + } + } + } + + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void ConstructorBenchmark_UInt64() + { + UInt64[] arrValues = GenerateRandomValuesForVector(); + var spanValues = new Span(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + Construct(spanValues); + } + } + } + + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void ConstructorBenchmark_Int64() + { + Int64[] arrValues = GenerateRandomValuesForVector(); + var spanValues = new Span(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + Construct(spanValues); + } + } + } + + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void ConstructorBenchmark_Single() + { + Single[] arrValues = GenerateRandomValuesForVector(); + var spanValues = new Span(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + Construct(spanValues); + } + } + } + + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void ConstructorBenchmark_Double() + { + Double[] arrValues = GenerateRandomValuesForVector(); + var spanValues = new Span(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + Construct(spanValues); + } + } + } + + + public static void Construct(Span values) where T : struct + { + for (var iteration = 0; iteration < Benchmark.InnerIterationCount; iteration++) + { + Vector vect = new Vector(values); + } + } + + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void SpanCastBenchmark_Byte() + { + Byte[] arrValues = GenerateRandomValuesForVector(); + var spanValues = new ReadOnlySpan(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + SpanCast(spanValues); + } + } + } + + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void SpanCastBenchmark_SByte() + { + SByte[] arrValues = GenerateRandomValuesForVector(); + var spanValues = new ReadOnlySpan(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + SpanCast(spanValues); + } + } + } + + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void SpanCastBenchmark_UInt16() + { + UInt16[] arrValues = GenerateRandomValuesForVector(); + var spanValues = new ReadOnlySpan(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + SpanCast(spanValues); + } + } + } + + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void SpanCastBenchmark_Int16() + { + Int16[] arrValues = GenerateRandomValuesForVector(); + var spanValues = new ReadOnlySpan(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + SpanCast(spanValues); + } + } + } + + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void SpanCastBenchmark_UInt32() + { + UInt32[] arrValues = GenerateRandomValuesForVector(); + var spanValues = new ReadOnlySpan(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + SpanCast(spanValues); + } + } + } + + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void SpanCastBenchmark_Int32() + { + Int32[] arrValues = GenerateRandomValuesForVector(); + var spanValues = new ReadOnlySpan(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + SpanCast(spanValues); + } + } + } + + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void SpanCastBenchmark_UInt64() + { + UInt64[] arrValues = GenerateRandomValuesForVector(); + var spanValues = new ReadOnlySpan(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + SpanCast(spanValues); + } + } + } + + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void SpanCastBenchmark_Int64() + { + Int64[] arrValues = GenerateRandomValuesForVector(); + var spanValues = new ReadOnlySpan(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + SpanCast(spanValues); + } + } + } + + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void SpanCastBenchmark_Single() + { + Single[] arrValues = GenerateRandomValuesForVector(); + var spanValues = new ReadOnlySpan(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + SpanCast(spanValues); + } + } + } + + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void SpanCastBenchmark_Double() + { + Double[] arrValues = GenerateRandomValuesForVector(); + var spanValues = new ReadOnlySpan(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + SpanCast(spanValues); + } + } + } + + + public static void SpanCast(ReadOnlySpan values) where T : struct + { + for (var iteration = 0; iteration < Benchmark.InnerIterationCount; iteration++) + { + ReadOnlySpan> vectors = MemoryMarshal.Cast>(values); + Vector vector = vectors[0]; + } + } + + internal static T[] GenerateRandomValuesForVector() where T : struct + { + int minValue = GetMinValue(); + int maxValue = GetMaxValue(); + return Util.GenerateRandomValues(Vector.Count, minValue, maxValue); + } + + internal static int GetMinValue() where T : struct + { + if (typeof(T) == typeof(Int64) || typeof(T) == typeof(Single) || typeof(T) == typeof(Double) || typeof(T) == typeof(UInt32) || typeof(T) == typeof(UInt64)) + { + return int.MinValue; + } + TypeInfo typeInfo = typeof(T).GetTypeInfo(); + FieldInfo field = typeInfo.GetDeclaredField("MinValue"); + var value = field.GetValue(null); + return (int)(dynamic)value; + } + + internal static int GetMaxValue() where T : struct + { + if (typeof(T) == typeof(Int64) || typeof(T) == typeof(Single) || typeof(T) == typeof(Double) || typeof(T) == typeof(UInt32) || typeof(T) == typeof(UInt64)) + { + return int.MaxValue; + } + TypeInfo typeInfo = typeof(T).GetTypeInfo(); + FieldInfo field = typeInfo.GetDeclaredField("MaxValue"); + var value = field.GetValue(null); + return (int)(dynamic)value; + } + } +} diff --git a/external/corefx/src/System.Numerics.Vectors/tests/Performance/Constructor/GenericVectorConstructorTests.tt b/external/corefx/src/System.Numerics.Vectors/tests/Performance/Constructor/GenericVectorConstructorTests.tt new file mode 100644 index 0000000000..5fb58ea5a7 --- /dev/null +++ b/external/corefx/src/System.Numerics.Vectors/tests/Performance/Constructor/GenericVectorConstructorTests.tt @@ -0,0 +1,119 @@ +<#@ template debug="true" hostSpecific="true" #> +<#@ output extension=".cs" #> +<#@ Assembly Name="System.Core.dll" #> +<#@ Assembly Name="System.Xml.dll" #> +<#@ import namespace="System" #> +<#@ import namespace="System.Linq" #> +<#@ import namespace="System.Runtime.InteropServices" #> +<#@ include file="..\..\..\..\Common\src\CoreLib\System\Numerics\GenerationConfig.ttinclude" #><# GenerateCopyrightHeader(); #> + +using System; +using System.Globalization; +using System.Linq; +using System.Reflection; +using System.Runtime.InteropServices; +using Xunit; +using Xunit.Sdk; +using Microsoft.Xunit.Performance; + +namespace System.Numerics.Tests +{ + public static class Constructor + { + private static Random s_random = new Random(); + + public const int DefaultInnerIterationsCount = 100000000; + +<# + foreach (var type in supportedTypes) + { +#> + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void ConstructorBenchmark_<#=type.Name#>() + { + <#=type.Name#>[] arrValues = GenerateRandomValuesForVector<<#=type.Name#>>(); + var spanValues = new Span<<#=type.Name#>>(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + Construct<<#=type.Name#>>(spanValues); + } + } + } + +<# + } +#> + + public static void Construct(Span values) where T : struct + { + for (var iteration = 0; iteration < Benchmark.InnerIterationCount; iteration++) + { + Vector vect = new Vector(values); + } + } + +<# + foreach (var type in supportedTypes) + { +#> + [Benchmark(InnerIterationCount = DefaultInnerIterationsCount)] + public static void SpanCastBenchmark_<#=type.Name#>() + { + <#=type.Name#>[] arrValues = GenerateRandomValuesForVector<<#=type.Name#>>(); + var spanValues = new ReadOnlySpan<<#=type.Name#>>(arrValues); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + SpanCast<<#=type.Name#>>(spanValues); + } + } + } + +<# + } +#> + + public static void SpanCast(ReadOnlySpan values) where T : struct + { + for (var iteration = 0; iteration < Benchmark.InnerIterationCount; iteration++) + { + ReadOnlySpan> vectors = MemoryMarshal.Cast>(values); + Vector vector = vectors[0]; + } + } + + internal static T[] GenerateRandomValuesForVector() where T : struct + { + int minValue = GetMinValue(); + int maxValue = GetMaxValue(); + return Util.GenerateRandomValues(Vector.Count, minValue, maxValue); + } + + internal static int GetMinValue() where T : struct + { + if (typeof(T) == typeof(Int64) || typeof(T) == typeof(Single) || typeof(T) == typeof(Double) || typeof(T) == typeof(UInt32) || typeof(T) == typeof(UInt64)) + { + return int.MinValue; + } + TypeInfo typeInfo = typeof(T).GetTypeInfo(); + FieldInfo field = typeInfo.GetDeclaredField("MinValue"); + var value = field.GetValue(null); + return (int)(dynamic)value; + } + + internal static int GetMaxValue() where T : struct + { + if (typeof(T) == typeof(Int64) || typeof(T) == typeof(Single) || typeof(T) == typeof(Double) || typeof(T) == typeof(UInt32) || typeof(T) == typeof(UInt64)) + { + return int.MaxValue; + } + TypeInfo typeInfo = typeof(T).GetTypeInfo(); + FieldInfo field = typeInfo.GetDeclaredField("MaxValue"); + var value = field.GetValue(null); + return (int)(dynamic)value; + } + } +} diff --git a/external/corefx/src/System.Numerics.Vectors/tests/Performance/System.Numerics.Vectors.Performance.Tests.csproj b/external/corefx/src/System.Numerics.Vectors/tests/Performance/System.Numerics.Vectors.Performance.Tests.csproj index 0c1b1634d4..318d8f0e62 100644 --- a/external/corefx/src/System.Numerics.Vectors/tests/Performance/System.Numerics.Vectors.Performance.Tests.csproj +++ b/external/corefx/src/System.Numerics.Vectors/tests/Performance/System.Numerics.Vectors.Performance.Tests.csproj @@ -62,5 +62,30 @@ PerfRunner + + + TextTemplatingFileGenerator + GenericVectorConstructorTests.cs + + + + + + + + + Util.cs + + + True + True + GenericVectorConstructorTests.tt + + + + + GenerationConfig.ttinclude + + \ No newline at end of file diff --git a/external/corefx/src/System.Numerics.Vectors/tests/QuaternionTests.cs b/external/corefx/src/System.Numerics.Vectors/tests/QuaternionTests.cs index 6bb5c32e72..759f62a189 100644 --- a/external/corefx/src/System.Numerics.Vectors/tests/QuaternionTests.cs +++ b/external/corefx/src/System.Numerics.Vectors/tests/QuaternionTests.cs @@ -21,7 +21,7 @@ namespace System.Numerics.Tests float actual; actual = Quaternion.Dot(a, b); - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.Dot did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.Dot did not return the expected value: expected {expected} actual {actual}"); } // A test for Length () @@ -39,7 +39,7 @@ namespace System.Numerics.Tests actual = target.Length(); - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.Length did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.Length did not return the expected value: expected {expected} actual {actual}"); } // A test for LengthSquared () @@ -56,7 +56,7 @@ namespace System.Numerics.Tests actual = target.LengthSquared(); - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.LengthSquared did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.LengthSquared did not return the expected value: expected {expected} actual {actual}"); } // A test for Lerp (Quaternion, Quaternion, float) @@ -73,12 +73,12 @@ namespace System.Numerics.Tests Quaternion actual; actual = Quaternion.Lerp(a, b, t); - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.Lerp did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.Lerp did not return the expected value: expected {expected} actual {actual}"); // Case a and b are same. expected = a; actual = Quaternion.Lerp(a, a, t); - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.Lerp did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.Lerp did not return the expected value: expected {expected} actual {actual}"); } // A test for Lerp (Quaternion, Quaternion, float) @@ -94,7 +94,7 @@ namespace System.Numerics.Tests Quaternion expected = new Quaternion(a.X, a.Y, a.Z, a.W); Quaternion actual = Quaternion.Lerp(a, b, t); - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.Lerp did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.Lerp did not return the expected value: expected {expected} actual {actual}"); } // A test for Lerp (Quaternion, Quaternion, float) @@ -110,7 +110,7 @@ namespace System.Numerics.Tests Quaternion expected = new Quaternion(b.X, b.Y, b.Z, b.W); Quaternion actual = Quaternion.Lerp(a, b, t); - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.Lerp did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.Lerp did not return the expected value: expected {expected} actual {actual}"); } // A test for Lerp (Quaternion, Quaternion, float) @@ -128,7 +128,7 @@ namespace System.Numerics.Tests // Note that in quaternion world, Q == -Q. In the case of quaternions dot product is zero, // one of the quaternion will be flipped to compute the shortest distance. When t = 1, we // expect the result to be the same as quaternion b but flipped. - Assert.True(actual == a, "Quaternion.Lerp did not return the expected value."); + Assert.True(actual == a, $"Quaternion.Lerp did not return the expected value: expected {a} actual {actual}"); } // A test for Conjugate(Quaternion) @@ -141,7 +141,7 @@ namespace System.Numerics.Tests Quaternion actual; actual = Quaternion.Conjugate(a); - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.Conjugate did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.Conjugate did not return the expected value: expected {expected} actual {actual}"); } // A test for Normalize (Quaternion) @@ -154,7 +154,7 @@ namespace System.Numerics.Tests Quaternion actual; actual = Quaternion.Normalize(a); - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.Normalize did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.Normalize did not return the expected value: expected {expected} actual {actual}"); } // A test for Normalize (Quaternion) @@ -166,7 +166,7 @@ namespace System.Numerics.Tests Quaternion actual = Quaternion.Normalize(a); Assert.True(float.IsNaN(actual.X) && float.IsNaN(actual.Y) && float.IsNaN(actual.Z) && float.IsNaN(actual.W) - , "Quaternion.Normalize did not return the expected value."); + , $"Quaternion.Normalize did not return the expected value: expected {new Quaternion(float.NaN, float.NaN, float.NaN, float.NaN)} actual {actual}"); } // A test for Concatenate(Quaternion, Quaternion) @@ -180,7 +180,7 @@ namespace System.Numerics.Tests Quaternion actual; actual = Quaternion.Concatenate(a, b); - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.Concatenate did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.Concatenate did not return the expected value: expected {expected} actual {actual}"); } // A test for operator - (Quaternion, Quaternion) @@ -195,7 +195,7 @@ namespace System.Numerics.Tests actual = a - b; - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.operator - did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.operator - did not return the expected value: expected {expected} actual {actual}"); } // A test for operator * (Quaternion, float) @@ -210,7 +210,7 @@ namespace System.Numerics.Tests actual = a * factor; - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.operator * did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.operator * did not return the expected value: expected {expected} actual {actual}"); } // A test for operator * (Quaternion, Quaternion) @@ -225,7 +225,7 @@ namespace System.Numerics.Tests actual = a * b; - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.operator * did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.operator * did not return the expected value: expected {expected} actual {actual}"); } // A test for operator / (Quaternion, Quaternion) @@ -240,7 +240,7 @@ namespace System.Numerics.Tests actual = a / b; - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.operator / did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.operator / did not return the expected value: expected {expected} actual {actual}"); } // A test for operator + (Quaternion, Quaternion) @@ -255,7 +255,7 @@ namespace System.Numerics.Tests actual = a + b; - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.operator + did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.operator + did not return the expected value: expected {expected} actual {actual}"); } // A test for Quaternion (float, float, float, float) @@ -296,7 +296,7 @@ namespace System.Numerics.Tests Quaternion actual; actual = Quaternion.CreateFromAxisAngle(axis, angle); - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.CreateFromAxisAngle did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.CreateFromAxisAngle did not return the expected value: expected {expected} actual {actual}"); } // A test for CreateFromAxisAngle (Vector3f, float) @@ -325,7 +325,7 @@ namespace System.Numerics.Tests Quaternion actual1 = Quaternion.CreateFromAxisAngle(axis, angle1); Quaternion actual2 = Quaternion.CreateFromAxisAngle(axis, angle2); - Assert.True(MathHelper.Equal(actual1, actual2), "Quaternion.CreateFromAxisAngle did not return the expected value."); + Assert.True(MathHelper.Equal(actual1, actual2), $"Quaternion.CreateFromAxisAngle did not return the expected value: actual1 {actual1} actual2 {actual2}"); } // A test for CreateFromAxisAngle (Vector3f, float) @@ -342,7 +342,7 @@ namespace System.Numerics.Tests actual1.X = -actual1.X; actual1.W = -actual1.W; - Assert.True(MathHelper.Equal(actual1, actual2), "Quaternion.CreateFromAxisAngle did not return the expected value."); + Assert.True(MathHelper.Equal(actual1, actual2), $"Quaternion.CreateFromAxisAngle did not return the expected value: actual1 {actual1} actual2 {actual2}"); } [Fact] @@ -358,7 +358,7 @@ namespace System.Numerics.Tests Quaternion expected = yaw * pitch * roll; Quaternion actual = Quaternion.CreateFromYawPitchRoll(yawAngle, pitchAngle, rollAngle); - Assert.True(MathHelper.Equal(expected, actual)); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.QuaternionCreateFromYawPitchRollTest1 did not return the expected value: expected {expected} actual {actual}"); } // Covers more numeric rigions @@ -383,7 +383,7 @@ namespace System.Numerics.Tests Quaternion expected = yaw * pitch * roll; Quaternion actual = Quaternion.CreateFromYawPitchRoll(yawRad, pitchRad, rollRad); - Assert.True(MathHelper.Equal(expected, actual), String.Format("Yaw:{0} Pitch:{1} Roll:{2}", yawAngle, pitchAngle, rollAngle)); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.QuaternionCreateFromYawPitchRollTest2 Yaw:{yawAngle} Pitch:{pitchAngle} Roll:{rollAngle} did not return the expected value: expected {expected} actual {actual}"); } } } @@ -403,12 +403,12 @@ namespace System.Numerics.Tests Quaternion actual; actual = Quaternion.Slerp(a, b, t); - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.Slerp did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.Slerp did not return the expected value: expected {expected} actual {actual}"); // Case a and b are same. expected = a; actual = Quaternion.Slerp(a, a, t); - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.Slerp did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.Slerp did not return the expected value: expected {expected} actual {actual}"); } // A test for Slerp (Quaternion, Quaternion, float) @@ -424,7 +424,7 @@ namespace System.Numerics.Tests Quaternion expected = new Quaternion(a.X, a.Y, a.Z, a.W); Quaternion actual = Quaternion.Slerp(a, b, t); - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.Slerp did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.Slerp did not return the expected value: expected {expected} actual {actual}"); } // A test for Slerp (Quaternion, Quaternion, float) @@ -440,7 +440,7 @@ namespace System.Numerics.Tests Quaternion expected = new Quaternion(b.X, b.Y, b.Z, b.W); Quaternion actual = Quaternion.Slerp(a, b, t); - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.Slerp did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.Slerp did not return the expected value: expected {expected} actual {actual}"); } // A test for Slerp (Quaternion, Quaternion, float) @@ -459,7 +459,7 @@ namespace System.Numerics.Tests // Note that in quaternion world, Q == -Q. In the case of quaternions dot product is zero, // one of the quaternion will be flipped to compute the shortest distance. When t = 1, we // expect the result to be the same as quaternion b but flipped. - Assert.True(actual == expected, "Quaternion.Slerp did not return the expected value."); + Assert.True(actual == expected, $"Quaternion.Slerp did not return the expected value: expected {expected} actual {actual}"); } // A test for Slerp (Quaternion, Quaternion, float) @@ -475,7 +475,7 @@ namespace System.Numerics.Tests Quaternion expected = new Quaternion(a.X, a.Y, a.Z, a.W); Quaternion actual = Quaternion.Slerp(a, b, t); - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.Slerp did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.Slerp did not return the expected value: expected {expected} actual {actual}"); } // A test for operator - (Quaternion) @@ -489,7 +489,7 @@ namespace System.Numerics.Tests actual = -a; - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.operator - did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.operator - did not return the expected value: expected {expected} actual {actual}"); } // A test for Inverse (Quaternion) @@ -514,7 +514,7 @@ namespace System.Numerics.Tests Quaternion actual = Quaternion.Inverse(a); Assert.True(float.IsNaN(actual.X) && float.IsNaN(actual.Y) && float.IsNaN(actual.Z) && float.IsNaN(actual.W) - ); + , $"Quaternion.Inverse - did not return the expected value: expected {new Quaternion(float.NaN, float.NaN, float.NaN, float.NaN)} actual {actual}"); } // A test for ToString () @@ -556,7 +556,7 @@ namespace System.Numerics.Tests Quaternion actual; actual = Quaternion.Divide(a, b); - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.Divide did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.Divide did not return the expected value: expected {expected} actual {actual}"); } // A test for Equals (object) @@ -615,7 +615,7 @@ namespace System.Numerics.Tests Quaternion actual; actual = Quaternion.Multiply(a, factor); - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.Multiply did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.Multiply did not return the expected value: expected {expected} actual {actual}"); } // A test for Multiply (Quaternion, Quaternion) @@ -629,7 +629,7 @@ namespace System.Numerics.Tests Quaternion actual; actual = Quaternion.Multiply(a, b); - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.Multiply did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), $"Quaternion.Multiply did not return the expected value: expected {expected} actual {actual}"); } // A test for Negate (Quaternion) @@ -706,11 +706,13 @@ namespace System.Numerics.Tests Quaternion expected = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f); Quaternion actual = Quaternion.CreateFromRotationMatrix(matrix); - Assert.True(MathHelper.Equal(expected, actual), "Quaternion.CreateFromRotationMatrix did not return the expected value."); + Assert.True(MathHelper.Equal(expected, actual), + $"Quaternion.CreateFromRotationMatrix did not return the expected value: expected {expected} actual {actual}"); // make sure convert back to matrix is same as we passed matrix. Matrix4x4 m2 = Matrix4x4.CreateFromQuaternion(actual); - Assert.True(MathHelper.Equal(matrix, m2), "Quaternion.CreateFromRotationMatrix did not return the expected value."); + Assert.True(MathHelper.Equal(matrix, m2), + $"Quaternion.CreateFromQuaternion did not return the expected value: matrix {matrix} m2 {m2}"); } // A test for CreateFromRotationMatrix (Matrix4x4) @@ -725,14 +727,12 @@ namespace System.Numerics.Tests Quaternion expected = Quaternion.CreateFromAxisAngle(Vector3.UnitX, angle); Quaternion actual = Quaternion.CreateFromRotationMatrix(matrix); Assert.True(MathHelper.EqualRotation(expected, actual), - string.Format("Quaternion.CreateFromRotationMatrix did not return the expected value. angle:{0} expected:{1} actual:{2}", - angle.ToString(), expected.ToString(), actual.ToString())); + $"Quaternion.CreateFromRotationMatrix angle:{angle} did not return the expected value: expected {expected} actual {actual}"); // make sure convert back to matrix is same as we passed matrix. Matrix4x4 m2 = Matrix4x4.CreateFromQuaternion(actual); Assert.True(MathHelper.Equal(matrix, m2), - string.Format("Quaternion.CreateFromRotationMatrix did not return the expected value. angle:{0} expected:{1} actual:{2}", - angle.ToString(), matrix.ToString(), m2.ToString())); + $"Quaternion.CreateFromQuaternion angle:{angle} did not return the expected value: matrix {matrix} m2 {m2}"); } } @@ -748,14 +748,12 @@ namespace System.Numerics.Tests Quaternion expected = Quaternion.CreateFromAxisAngle(Vector3.UnitY, angle); Quaternion actual = Quaternion.CreateFromRotationMatrix(matrix); Assert.True(MathHelper.EqualRotation(expected, actual), - string.Format("Quaternion.CreateFromRotationMatrix did not return the expected value. angle:{0}", - angle.ToString())); + $"Quaternion.CreateFromRotationMatrix angle:{angle} did not return the expected value: expected {expected} actual {actual}"); // make sure convert back to matrix is same as we passed matrix. Matrix4x4 m2 = Matrix4x4.CreateFromQuaternion(actual); Assert.True(MathHelper.Equal(matrix, m2), - string.Format("Quaternion.CreateFromRotationMatrix did not return the expected value. angle:{0}", - angle.ToString())); + $"Quaternion.CreateFromQuaternion angle:{angle} did not return the expected value: matrix {matrix} m2 {m2}"); } } @@ -771,14 +769,12 @@ namespace System.Numerics.Tests Quaternion expected = Quaternion.CreateFromAxisAngle(Vector3.UnitZ, angle); Quaternion actual = Quaternion.CreateFromRotationMatrix(matrix); Assert.True(MathHelper.EqualRotation(expected, actual), - string.Format("Quaternion.CreateFromRotationMatrix did not return the expected value. angle:{0} expected:{1} actual:{2}", - angle.ToString(), expected.ToString(), actual.ToString())); + $"Quaternion.CreateFromRotationMatrix angle:{angle} did not return the expected value: expected {expected} actual {actual}"); // make sure convert back to matrix is same as we passed matrix. Matrix4x4 m2 = Matrix4x4.CreateFromQuaternion(actual); Assert.True(MathHelper.Equal(matrix, m2), - string.Format("Quaternion.CreateFromRotationMatrix did not return the expected value. angle:{0} expected:{1} actual:{2}", - angle.ToString(), matrix.ToString(), m2.ToString())); + $"Quaternion.CreateFromQuaternion angle:{angle} did not return the expected value: matrix {matrix} m2 {m2}"); } } @@ -798,14 +794,12 @@ namespace System.Numerics.Tests Quaternion actual = Quaternion.CreateFromRotationMatrix(matrix); Assert.True(MathHelper.EqualRotation(expected, actual), - string.Format("Quaternion.CreateFromRotationMatrix did not return the expected value. angle:{0} expected:{1} actual:{2}", - angle.ToString(), expected.ToString(), actual.ToString())); + $"Quaternion.CreateFromRotationMatrix angle:{angle} did not return the expected value: expected {expected} actual {actual}"); // make sure convert back to matrix is same as we passed matrix. Matrix4x4 m2 = Matrix4x4.CreateFromQuaternion(actual); Assert.True(MathHelper.Equal(matrix, m2), - string.Format("Quaternion.CreateFromRotationMatrix did not return the expected value. angle:{0} expected:{1} actual:{2}", - angle.ToString(), matrix.ToString(), m2.ToString())); + $"Quaternion.CreateFromQuaternion angle:{angle} did not return the expected value: matrix {matrix} m2 {m2}"); } } @@ -819,11 +813,13 @@ namespace System.Numerics.Tests Quaternion expected = Quaternion.CreateFromAxisAngle(Vector3.UnitZ, angle) * Quaternion.CreateFromAxisAngle(Vector3.UnitY, angle); Quaternion actual = Quaternion.CreateFromRotationMatrix(matrix); - Assert.True(MathHelper.EqualRotation(expected, actual), "Quaternion.CreateFromRotationMatrix did not return the expected value."); + Assert.True(MathHelper.EqualRotation(expected, actual), + $"Quaternion.CreateFromRotationMatrix did not return the expected value: expected {expected} actual {actual}"); // make sure convert back to matrix is same as we passed matrix. Matrix4x4 m2 = Matrix4x4.CreateFromQuaternion(actual); - Assert.True(MathHelper.Equal(matrix, m2), "Quaternion.CreateFromRotationMatrix did not return the expected value."); + Assert.True(MathHelper.Equal(matrix, m2), + $"Quaternion.CreateFromQuaternion did not return the expected value: matrix {matrix} m2 {m2}"); } // A test for CreateFromRotationMatrix (Matrix4x4) @@ -836,11 +832,13 @@ namespace System.Numerics.Tests Quaternion expected = Quaternion.CreateFromAxisAngle(Vector3.UnitZ, angle) * Quaternion.CreateFromAxisAngle(Vector3.UnitX, angle); Quaternion actual = Quaternion.CreateFromRotationMatrix(matrix); - Assert.True(MathHelper.EqualRotation(expected, actual), "Quaternion.CreateFromRotationMatrix did not return the expected value."); + Assert.True(MathHelper.EqualRotation(expected, actual), + $"Quaternion.CreateFromRotationMatrix did not return the expected value: expected {expected} actual {actual}"); // make sure convert back to matrix is same as we passed matrix. Matrix4x4 m2 = Matrix4x4.CreateFromQuaternion(actual); - Assert.True(MathHelper.Equal(matrix, m2), "Quaternion.CreateFromRotationMatrix did not return the expected value."); + Assert.True(MathHelper.Equal(matrix, m2), + $"Quaternion.CreateFromQuaternion did not return the expected value: matrix {matrix} m2 {m2}"); } // A test for CreateFromRotationMatrix (Matrix4x4) @@ -853,11 +851,13 @@ namespace System.Numerics.Tests Quaternion expected = Quaternion.CreateFromAxisAngle(Vector3.UnitY, angle) * Quaternion.CreateFromAxisAngle(Vector3.UnitX, angle); Quaternion actual = Quaternion.CreateFromRotationMatrix(matrix); - Assert.True(MathHelper.EqualRotation(expected, actual), "Quaternion.CreateFromRotationMatrix did not return the expected value."); + Assert.True(MathHelper.EqualRotation(expected, actual), + $"Quaternion.CreateFromRotationMatrix did not return the expected value: expected {expected} actual {actual}"); // make sure convert back to matrix is same as we passed matrix. Matrix4x4 m2 = Matrix4x4.CreateFromQuaternion(actual); - Assert.True(MathHelper.Equal(matrix, m2), "Quaternion.CreateFromRotationMatrix did not return the expected value."); + Assert.True(MathHelper.Equal(matrix, m2), + $"Quaternion.CreateFromQuaternion did not return the expected value: matrix {matrix} m2 {m2}"); } // A test for Equals (Quaternion) diff --git a/external/corefx/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj b/external/corefx/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj index c52b2f9485..a79a3da3e2 100644 --- a/external/corefx/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj +++ b/external/corefx/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj @@ -12,7 +12,7 @@ - + True True ConstantHelper.tt @@ -35,13 +35,20 @@ System\MathF.netstandard.cs + + + True + True + GenericVectorTests.netcoreapp.tt + + - + ConstantHelper.tt TextTemplatingFileGenerator ConstantHelper.cs - + GenerationConfig.ttinclude @@ -49,5 +56,15 @@ GenericVectorTests.cs + + + + + + + TextTemplatingFileGenerator + GenericVectorTests.netcoreapp.cs + + \ No newline at end of file diff --git a/external/corefx/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DataContractSerializer.cs b/external/corefx/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DataContractSerializer.cs index 1670ceada6..27d9bdb824 100644 --- a/external/corefx/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DataContractSerializer.cs +++ b/external/corefx/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DataContractSerializer.cs @@ -92,16 +92,6 @@ namespace System.Runtime.Serialization Initialize(type, knownTypes, maxItemsInObjectGraph, ignoreExtensionDataObject, preserveObjectReferences, null, false); } - public DataContractSerializer(Type type, XmlDictionaryString rootName, XmlDictionaryString rootNamespace, - IEnumerable knownTypes, - int maxItemsInObjectGraph, - bool ignoreExtensionDataObject, - bool preserveObjectReferences, - DataContractResolver dataContractResolver) - { - Initialize(type, rootName, rootNamespace, knownTypes, maxItemsInObjectGraph, ignoreExtensionDataObject, preserveObjectReferences, /*dataContractSurrogate,*/ dataContractResolver, false); - } - public DataContractSerializer(Type type, DataContractSerializerSettings settings) { if (settings == null) diff --git a/external/corefx/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/SurrogateDataContract.cs b/external/corefx/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/SurrogateDataContract.cs index 0a5bc4c6b8..68bee7ff61 100644 --- a/external/corefx/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/SurrogateDataContract.cs +++ b/external/corefx/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/SurrogateDataContract.cs @@ -1,6 +1,7 @@ -//----------------------------------------------------------------------------- -// Copyright (c) Microsoft Corporation. All rights reserved. -//----------------------------------------------------------------------------- +// 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.Runtime.Serialization { using System; diff --git a/external/corefx/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlReaderDelegator.cs b/external/corefx/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlReaderDelegator.cs index 6acfc8c0f0..dc18ceb406 100644 --- a/external/corefx/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlReaderDelegator.cs +++ b/external/corefx/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlReaderDelegator.cs @@ -502,7 +502,7 @@ namespace System.Runtime.Serialization public virtual byte[] ReadContentAsBase64() { if (isEndOfEmptyElement) - return new byte[0]; + return Array.Empty(); if (dictionaryReader == null) { diff --git a/external/corefx/src/System.Private.DataContractSerialization/src/System/Xml/XmlDictionaryReader.cs b/external/corefx/src/System.Private.DataContractSerialization/src/System/Xml/XmlDictionaryReader.cs index 8028d77080..bdafce7db8 100644 --- a/external/corefx/src/System.Private.DataContractSerialization/src/System/Xml/XmlDictionaryReader.cs +++ b/external/corefx/src/System.Private.DataContractSerialization/src/System/Xml/XmlDictionaryReader.cs @@ -1322,11 +1322,6 @@ namespace System.Xml return ReadArray(XmlDictionaryString.GetString(localName), XmlDictionaryString.GetString(namespaceUri), array, offset, count); } - public override void Close() - { - base.Dispose(); - } - private class XmlWrappedReader : XmlDictionaryReader, IXmlLineInfo { private XmlReader _reader; diff --git a/external/corefx/src/System.Private.Reflection.Metadata.Ecma335/src/Resources/Strings.resx b/external/corefx/src/System.Private.Reflection.Metadata.Ecma335/src/Resources/Strings.resx index 75779ebbda..731f0bb4a0 100644 --- a/external/corefx/src/System.Private.Reflection.Metadata.Ecma335/src/Resources/Strings.resx +++ b/external/corefx/src/System.Private.Reflection.Metadata.Ecma335/src/Resources/Strings.resx @@ -294,6 +294,12 @@ Unexpected Embedded Portable PDB data signature value. + + + Unexpected PDB Checksum data signature value. + + + Invalid PDB Checksum data data format. Expected signature header for '{0}', but found '{1}' (0x{2:x2}). @@ -354,6 +360,9 @@ Expected non-empty list. + + + Expected non-empty array. Expected non-empty string. diff --git a/external/corefx/src/System.Private.Reflection.Metadata.Ecma335/src/System.Private.Reflection.Metadata.Ecma335.csproj b/external/corefx/src/System.Private.Reflection.Metadata.Ecma335/src/System.Private.Reflection.Metadata.Ecma335.csproj index 9853f6d4f9..409e24a6a4 100644 --- a/external/corefx/src/System.Private.Reflection.Metadata.Ecma335/src/System.Private.Reflection.Metadata.Ecma335.csproj +++ b/external/corefx/src/System.Private.Reflection.Metadata.Ecma335/src/System.Private.Reflection.Metadata.Ecma335.csproj @@ -224,6 +224,7 @@ + diff --git a/external/corefx/src/System.Private.Uri/src/FxCopBaseline.cs b/external/corefx/src/System.Private.Uri/src/FxCopBaseline.cs index 5207ad7c67..dc2623db1e 100644 --- a/external/corefx/src/System.Private.Uri/src/FxCopBaseline.cs +++ b/external/corefx/src/System.Private.Uri/src/FxCopBaseline.cs @@ -1,3 +1,7 @@ +// 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.CodeAnalysis; // TODO: Remove this once https://github.com/dotnet/corefx/issues/13107 is fixed diff --git a/external/corefx/src/System.Private.Uri/src/System.Private.Uri.csproj b/external/corefx/src/System.Private.Uri/src/System.Private.Uri.csproj index b7c563e485..90f37cff19 100644 --- a/external/corefx/src/System.Private.Uri/src/System.Private.Uri.csproj +++ b/external/corefx/src/System.Private.Uri/src/System.Private.Uri.csproj @@ -5,6 +5,7 @@ {4AC5343E-6E31-4BA5-A795-0493AE7E9008} System.Private.Uri true + true @@ -57,4 +58,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/System.Private.Uri/src/System/DomainNameHelper.cs b/external/corefx/src/System.Private.Uri/src/System/DomainNameHelper.cs index cfc31d61f1..b1e2adb855 100644 --- a/external/corefx/src/System.Private.Uri/src/System/DomainNameHelper.cs +++ b/external/corefx/src/System.Private.Uri/src/System/DomainNameHelper.cs @@ -3,16 +3,15 @@ // See the LICENSE file in the project root for more information. using System.Globalization; +using System.Runtime.CompilerServices; namespace System { // The class designed as to keep working set of Uri class as minimal. // The idea is to stay with static helper methods and strings - internal class DomainNameHelper + internal static class DomainNameHelper { - private DomainNameHelper() - { - } + private static readonly IdnMapping s_idnMapping = new IdnMapping(); internal const string Localhost = "localhost"; internal const string Loopback = "loopback"; @@ -76,10 +75,13 @@ namespace System { char ch = *newPos; if (ch > 0x7f) return false; // not ascii - if (ch == '/' || ch == '\\' || (notImplicitFile && (ch == ':' || ch == '?' || ch == '#'))) + if (ch < 'a') // Optimize for lower-case letters, which make up the majority of most Uris, and which are all greater than symbols checked for below { - end = newPos; - break; + if (ch == '/' || ch == '\\' || (notImplicitFile && (ch == ':' || ch == '?' || ch == '#'))) + { + end = newPos; + break; + } } } @@ -272,8 +274,7 @@ namespace System // check ace validity try { - IdnMapping map = new IdnMapping(); - map.GetUnicode(new string(strippedHostPtr, curPos, newPos - curPos)); + s_idnMapping.GetUnicode(strippedHost, curPos, newPos - curPos); atLeastOneValidIdn = true; break; } @@ -328,18 +329,15 @@ namespace System } else { - IdnMapping map = new IdnMapping(); - string asciiForm; bidiStrippedHost = UriHelper.StripBidiControlCharacter(hostname, start, end - start); try { - asciiForm = map.GetAscii(bidiStrippedHost); + return s_idnMapping.GetAscii(bidiStrippedHost); } catch (ArgumentException) { throw new UriFormatException(SR.net_uri_BadUnicodeHostForIdn); } - return asciiForm; } } @@ -370,13 +368,11 @@ namespace System // internal static unsafe string UnicodeEquivalent(string idnHost, char* hostname, int start, int end) { - IdnMapping map = new IdnMapping(); - // Test common scenario first for perf // try to get unicode equivalent try { - return map.GetUnicode(idnHost); + return s_idnMapping.GetUnicode(idnHost); } catch (ArgumentException) { @@ -390,8 +386,6 @@ namespace System internal static unsafe string UnicodeEquivalent(char* hostname, int start, int end, ref bool allAscii, ref bool atLeastOneValidIdn) { - IdnMapping map = new IdnMapping(); - // hostname already validated allAscii = true; atLeastOneValidIdn = false; @@ -454,14 +448,14 @@ namespace System string asciiForm = unescapedHostname.Substring(curPos, newPos - curPos); try { - asciiForm = map.GetAscii(asciiForm); + asciiForm = s_idnMapping.GetAscii(asciiForm); } catch (ArgumentException) { throw new UriFormatException(SR.net_uri_BadUnicodeHostForIdn); } - unicodeEqvlHost += map.GetUnicode(asciiForm); + unicodeEqvlHost += s_idnMapping.GetUnicode(asciiForm); if (foundDot) unicodeEqvlHost += "."; } @@ -473,7 +467,7 @@ namespace System // check ace validity try { - unicodeEqvlHost += map.GetUnicode(unescapedHostname.Substring(curPos, newPos - curPos)); + unicodeEqvlHost += s_idnMapping.GetUnicode(unescapedHostname, curPos, newPos - curPos); if (foundDot) unicodeEqvlHost += "."; aceValid = true; @@ -505,16 +499,20 @@ namespace System // DNS specification [RFC 1035]. We use our own variant of IsLetterOrDigit // because the base version returns false positives for non-ANSI characters // + [MethodImpl(MethodImplOptions.AggressiveInlining)] private static bool IsASCIILetterOrDigit(char character, ref bool notCanonical) { - if ((character >= 'a' && character <= 'z') || (character >= '0' && character <= '9')) + if ((uint)(character - 'a') <= 'z' - 'a' || (uint)(character - '0') <= '9' - '0') + { return true; + } - if (character >= 'A' && character <= 'Z') + if ((uint)(character - 'A') <= 'Z' - 'A') { notCanonical = true; return true; } + return false; } @@ -522,16 +520,20 @@ namespace System // Takes into account the additional legal domain name characters '-' and '_' // Note that '_' char is formally invalid but is historically in use, especially on corpnets // + [MethodImpl(MethodImplOptions.AggressiveInlining)] private static bool IsValidDomainLabelCharacter(char character, ref bool notCanonical) { - if ((character >= 'a' && character <= 'z') || (character >= '0' && character <= '9') || (character == '-') || (character == '_')) + if ((uint)(character - 'a') <= 'z' - 'a' || (uint)(character - '0') <= '9' - '0' || character == '-' || character == '_') + { return true; + } - if (character >= 'A' && character <= 'Z') + if ((uint)(character - 'A') <= 'Z' - 'A') { notCanonical = true; return true; } + return false; } } diff --git a/external/corefx/src/System.Private.Uri/src/System/IPv4AddressHelper.cs b/external/corefx/src/System.Private.Uri/src/System/IPv4AddressHelper.cs index e03eabac38..af47cb6a0f 100644 --- a/external/corefx/src/System.Private.Uri/src/System/IPv4AddressHelper.cs +++ b/external/corefx/src/System.Private.Uri/src/System/IPv4AddressHelper.cs @@ -27,7 +27,18 @@ namespace System { byte* numbers = stackalloc byte[NumberOfLabels]; isLoopback = Parse(str, numbers, start, end); - return numbers[0] + "." + numbers[1] + "." + numbers[2] + "." + numbers[3]; + + Span stackSpace = stackalloc char[NumberOfLabels * 3 + 3]; + int totalChars = 0, charsWritten; + for (int i = 0; i < 3; i++) + { + numbers[i].TryFormat(stackSpace.Slice(totalChars), out charsWritten); + int periodPos = totalChars + charsWritten; + stackSpace[periodPos] = '.'; + totalChars = periodPos + 1; + } + numbers[3].TryFormat(stackSpace.Slice(totalChars), out charsWritten); + return new string(stackSpace.Slice(0, totalChars + charsWritten)); } } @@ -184,7 +195,7 @@ namespace System { int numberBase = Decimal; char ch; - long[] parts = new long[4]; + Span parts = stackalloc long[4]; long currentValue = 0; bool atLeastOneChar = false; diff --git a/external/corefx/src/System.Private.Uri/src/System/Uri.cs.REMOVED.git-id b/external/corefx/src/System.Private.Uri/src/System/Uri.cs.REMOVED.git-id index 6a2d6423b9..9337dbf019 100644 --- a/external/corefx/src/System.Private.Uri/src/System/Uri.cs.REMOVED.git-id +++ b/external/corefx/src/System.Private.Uri/src/System/Uri.cs.REMOVED.git-id @@ -1 +1 @@ -ebf064fad2d61a6c755274f7cfa67fb959e7dc48 \ No newline at end of file +fcc1b9ea14bc7cb776e86beed29fff64c4a5c2e6 \ No newline at end of file diff --git a/external/corefx/src/System.Private.Uri/tests/FunctionalTests/IriTest.cs b/external/corefx/src/System.Private.Uri/tests/FunctionalTests/IriTest.cs index a7a09da6eb..ac7ba5a8ab 100644 --- a/external/corefx/src/System.Private.Uri/tests/FunctionalTests/IriTest.cs +++ b/external/corefx/src/System.Private.Uri/tests/FunctionalTests/IriTest.cs @@ -540,5 +540,32 @@ namespace System.PrivateUri.Tests Assert.Equal(authority, fileTwoSlashes.Authority); // Two slashes must be followed by an authority Assert.Equal(authority, fileFourSlashes.Authority); // More than three slashes looks like a UNC share } + + [Theory] + [InlineData(@"c:/path/with/unicode/ö/test.xml")] + [InlineData(@"file://c:/path/with/unicode/ö/test.xml")] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Requires fix shipping in .NET 4.7.2")] + public void Iri_WindowsPathWithUnicode_DoesRemoveScheme(string uriString) + { + var uri = new Uri(uriString); + Assert.False(uri.LocalPath.StartsWith("file:")); + } + + [Theory] + [InlineData("http:%C3%A8")] + [InlineData("http:\u00E8")] + [InlineData("%C3%A8")] + [InlineData("\u00E8")] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Requires fix shipping in .NET 4.7.2")] + public void Iri_RelativeUriCreation_ShouldNotNormalize(string uriString) + { + Uri href; + Uri hrefAbsolute; + Uri baseIri = new Uri("http://www.contoso.com"); + + Assert.True(Uri.TryCreate(uriString, UriKind.RelativeOrAbsolute, out href)); + Assert.True(Uri.TryCreate(baseIri, href, out hrefAbsolute)); + Assert.Equal("http://www.contoso.com/%C3%A8", hrefAbsolute.AbsoluteUri); + } } } diff --git a/external/corefx/src/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj b/external/corefx/src/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj index 1d5ade2524..69e9e6bf1c 100644 --- a/external/corefx/src/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj +++ b/external/corefx/src/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj @@ -5,7 +5,6 @@ {BAC347A3-9841-44FC-B1E3-2344D1152C23} System.Private.Xml.Linq System.Xml - $(DefineConstants);SILVERLIGHT $(DefineConstants);uap @@ -25,8 +24,8 @@ System\Collections\Generic\LargeArrayBuilder.cs - - System\StringBuilderCache.cs + + System\Text\StringBuilderCache.cs @@ -71,6 +70,7 @@ + - \ No newline at end of file + diff --git a/external/corefx/src/System.Private.Xml.Linq/src/System/Xml/Linq/XContainer.cs b/external/corefx/src/System.Private.Xml.Linq/src/System/Xml/Linq/XContainer.cs index 7a3ae67461..31c5801dbd 100644 --- a/external/corefx/src/System.Private.Xml.Linq/src/System/Xml/Linq/XContainer.cs +++ b/external/corefx/src/System.Private.Xml.Linq/src/System/Xml/Linq/XContainer.cs @@ -108,7 +108,7 @@ namespace System.Xml.Linq /// TimeSpan /// Any type implementing ToString() /// Any type implementing IEnumerable - /// + /// /// /// When adding complex content, a number of types may be passed to this method. /// @@ -117,19 +117,19 @@ namespace System.Xml.Linq /// XAttribute /// Any type implementing IEnumerable /// - /// + /// /// If an object implements IEnumerable, then the collection in the object is enumerated, /// and all items in the collection are added. If the collection contains simple content, /// then the simple content in the collection is concatenated and added as a single /// string of simple content. If the collection contains complex content, then each item /// in the collection is added separately. - /// + /// /// If content is null, nothing is added. This allows the results of a query to be passed /// as content. If the query returns null, no contents are added, and this method does not /// throw a NullReferenceException. - /// + /// /// Attributes and simple content can't be added to a document. - /// + /// /// An added attribute must have a unique name within the element to /// which it is being added. /// @@ -235,7 +235,7 @@ namespace System.Xml.Linq } /// - /// Creates an used to add either nodes + /// Creates an used to add either nodes /// or attributes to the . The later option /// applies only for . /// @@ -259,7 +259,7 @@ namespace System.Xml.Linq /// /// Returns the descendant s of this . Note this method will /// not return itself in the resulting IEnumerable. See if you - /// need to include the current in the results. + /// need to include the current in the results. /// /// /// @@ -275,7 +275,7 @@ namespace System.Xml.Linq /// of XElement. /// /// The to match against descendant s. - /// An of + /// An of public IEnumerable Descendants(XName name) { return name != null ? GetDescendants(name, false) : XElement.EmptySequence; @@ -346,7 +346,7 @@ namespace System.Xml.Linq /// that the content does not include s. /// /// - /// The contents of this + /// The contents of this public IEnumerable Nodes() { XNode n = LastNode; @@ -385,7 +385,7 @@ namespace System.Xml.Linq { if (this is XElement) { - // Change in the serialization of an empty element: + // Change in the serialization of an empty element: // from start/end tag pair to empty tag NotifyChanging(this, XObjectChangeEventArgs.Value); if ((object)s != (object)content) throw new InvalidOperationException(SR.InvalidOperation_ExternalCode); @@ -554,7 +554,7 @@ namespace System.Xml.Linq { if (this is XElement) { - // Change in the serialization of an empty element: + // Change in the serialization of an empty element: // from empty tag to start/end tag pair NotifyChanging(this, XObjectChangeEventArgs.Value); if (content != null) throw new InvalidOperationException(SR.InvalidOperation_ExternalCode); @@ -830,7 +830,7 @@ namespace System.Xml.Linq } else if (value is DateTime) { - s = ((DateTime)value).ToString("o"); // Round-trip date/time pattern. + s = XmlConvert.ToString((DateTime) value, XmlDateTimeSerializationMode.RoundtripKind); } else if (value is DateTimeOffset) { @@ -855,7 +855,7 @@ namespace System.Xml.Linq internal void ReadContentFrom(XmlReader r) { if (r.ReadState != ReadState.Interactive) throw new InvalidOperationException(SR.InvalidOperation_ExpectedInteractive); - + ContentReader cr = new ContentReader(this); while (cr.ReadContentFrom(this, r) && r.Read()) ; } @@ -893,7 +893,7 @@ namespace System.Xml.Linq return; } if (r.ReadState != ReadState.Interactive) throw new InvalidOperationException(SR.InvalidOperation_ExpectedInteractive); - + ContentReader cr = new ContentReader(this, r, o); do { diff --git a/external/corefx/src/System.Private.Xml.Linq/src/System/Xml/Linq/XDeclaration.cs b/external/corefx/src/System.Private.Xml.Linq/src/System/Xml/Linq/XDeclaration.cs index 6bcd19b498..2efc42b1b0 100644 --- a/external/corefx/src/System.Private.Xml.Linq/src/System/Xml/Linq/XDeclaration.cs +++ b/external/corefx/src/System.Private.Xml.Linq/src/System/Xml/Linq/XDeclaration.cs @@ -3,8 +3,14 @@ // See the LICENSE file in the project root for more information. using System.IO; +using System.Text; using StringBuilder = System.Text.StringBuilder; +#if MONO +// remove it when StringBuilderCache moves back to System.IO +using StringBuilderCache = System.Text.StringBuilderCache; +#endif + namespace System.Xml.Linq { /// diff --git a/external/corefx/src/System.Private.Xml.Linq/src/System/Xml/Linq/XElement.cs b/external/corefx/src/System.Private.Xml.Linq/src/System/Xml/Linq/XElement.cs index c38f8cb7cc..a934550925 100644 --- a/external/corefx/src/System.Private.Xml.Linq/src/System/Xml/Linq/XElement.cs +++ b/external/corefx/src/System.Private.Xml.Linq/src/System/Xml/Linq/XElement.cs @@ -4,16 +4,22 @@ using System.Collections.Generic; using System.IO; -using System.Xml.Serialization; -using System.Xml.Schema; +using System.Text; using System.Threading; using System.Threading.Tasks; +using System.Xml.Serialization; +using System.Xml.Schema; using CultureInfo = System.Globalization.CultureInfo; using IEnumerable = System.Collections.IEnumerable; using SuppressMessageAttribute = System.Diagnostics.CodeAnalysis.SuppressMessageAttribute; using StringBuilder = System.Text.StringBuilder; +#if MONO +// remove it when StringBuilderCache moves back to System.IO +using StringBuilderCache = System.Text.StringBuilderCache; +#endif + namespace System.Xml.Linq { /// @@ -30,6 +36,9 @@ namespace System.Xml.Linq /// /// /// +#if MONO_HYBRID_SYSTEM_XML + [XmlTypeConvertor ("ConvertForAssignment")] +#endif [XmlSchemaProvider(null, IsAny = true)] public class XElement : XContainer, IXmlSerializable { @@ -1858,6 +1867,18 @@ namespace System.Xml.Linq return XmlConvert.ToGuid(element.Value); } +#if MONO_HYBRID_SYSTEM_XML + static object ConvertForAssignment (object value) + { + var node = value as XmlNode; + if (node == null) + return value; + var doc = new XmlDocument (); + doc.AppendChild (doc.ImportNode (node, true)); + return XElement.Parse (doc.InnerXml); + } +#endif + /// /// This method is obsolete for the IXmlSerializable contract. /// diff --git a/external/corefx/src/System.Private.Xml.Linq/src/System/Xml/Linq/XHashtable.cs b/external/corefx/src/System.Private.Xml.Linq/src/System/Xml/Linq/XHashtable.cs index ae13f99791..caeeac837c 100644 --- a/external/corefx/src/System.Private.Xml.Linq/src/System/Xml/Linq/XHashtable.cs +++ b/external/corefx/src/System.Private.Xml.Linq/src/System/Xml/Linq/XHashtable.cs @@ -2,6 +2,7 @@ // 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.Threading; using Debug = System.Diagnostics.Debug; using Interlocked = System.Threading.Interlocked; @@ -109,17 +110,8 @@ namespace System.Xml.Linq lock (this) { XHashtableState newState = _state.Resize(); - // Use memory barrier to ensure that the resized XHashtableState object is fully constructed before it is assigned -#if !SILVERLIGHT Thread.MemoryBarrier(); -#else // SILVERLIGHT - // The MemoryBarrier method usage is probably incorrect and should be removed. - - // Replacing with Interlocked.CompareExchange for now (with no effect) - // which will do a very similar thing to MemoryBarrier (it's just slower) - System.Threading.Interlocked.CompareExchange(ref _state, null, null); -#endif // SILVERLIGHT _state = newState; } } @@ -302,15 +294,7 @@ namespace System.Xml.Linq // Ensure that all writes to the entry can't be reordered past this barrier (or other threads might see new entry // in list before entry has been initialized!). -#if !SILVERLIGHT Thread.MemoryBarrier(); -#else // SILVERLIGHT - // The MemoryBarrier method usage is probably incorrect and should be removed. - - // Replacing with Interlocked.CompareExchange for now (with no effect) - // which will do a very similar thing to MemoryBarrier (it's just slower) - System.Threading.Interlocked.CompareExchange(ref _entries, null, null); -#endif // SILVERLIGHT // Loop until a matching entry is found, a new entry is added, or linked list is found to be full entryIndex = 0; diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/Properties/FunctionalTests.cs b/external/corefx/src/System.Private.Xml.Linq/tests/Properties/FunctionalTests.cs index a7297b63e5..8ca9fcc11d 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/Properties/FunctionalTests.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/Properties/FunctionalTests.cs @@ -8,7 +8,7 @@ using Xunit; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class PropertiesFunctionalTests : TestModule { // Type is CoreXml.Test.XLinq.FunctionalTests [Fact] @@ -16,7 +16,7 @@ namespace CoreXml.Test.XLinq public static void RunTests() { TestInput.CommandLine = ""; - FunctionalTests module = new FunctionalTests(); + PropertiesFunctionalTests module = new PropertiesFunctionalTests(); module.Init(); //for class PropertiesTests diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/Properties/ImplicitConversionsRoundTrip.cs b/external/corefx/src/System.Private.Xml.Linq/tests/Properties/ImplicitConversionsRoundTrip.cs index 54d62d6e12..2df7a18ba0 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/Properties/ImplicitConversionsRoundTrip.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/Properties/ImplicitConversionsRoundTrip.cs @@ -15,7 +15,7 @@ using Microsoft.Test.ModuleCore; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class PropertiesFunctionalTests : TestModule { public partial class PropertiesTests : XLinqTestCase { diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/Properties/XElement_Value.cs b/external/corefx/src/System.Private.Xml.Linq/tests/Properties/XElement_Value.cs index 45a3e755b0..fcd94429ea 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/Properties/XElement_Value.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/Properties/XElement_Value.cs @@ -14,7 +14,7 @@ using Microsoft.Test.ModuleCore; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class PropertiesFunctionalTests : TestModule { public partial class PropertiesTests : XLinqTestCase { diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/misc/FunctionalTests.cs b/external/corefx/src/System.Private.Xml.Linq/tests/misc/FunctionalTests.cs index dde850d8dc..17da698093 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/misc/FunctionalTests.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/misc/FunctionalTests.cs @@ -10,7 +10,7 @@ using Xunit; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class MiscFunctionalTests : TestModule { // Type is CoreXml.Test.XLinq.FunctionalTests // Test Module @@ -19,7 +19,7 @@ namespace CoreXml.Test.XLinq public static void RunTests() { TestInput.CommandLine = ""; - FunctionalTests module = new FunctionalTests(); + MiscFunctionalTests module = new MiscFunctionalTests(); module.Init(); module.AddChild(new MiscTests() { Attribute = new TestCaseAttribute() { Name = "Misc", Desc = "XLinq Misc. Tests" } }); diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/misc/PrefixNamespaceFixes.cs b/external/corefx/src/System.Private.Xml.Linq/tests/misc/PrefixNamespaceFixes.cs index 40d2de9ae0..04c43fdeb0 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/misc/PrefixNamespaceFixes.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/misc/PrefixNamespaceFixes.cs @@ -10,7 +10,7 @@ using Microsoft.Test.ModuleCore; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class MiscFunctionalTests : TestModule { public partial class MiscTests : XLinqTestCase { diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/misc/System.Xml.Linq.Misc.Tests.csproj b/external/corefx/src/System.Private.Xml.Linq/tests/misc/System.Xml.Linq.Misc.Tests.csproj index 37d30161d0..def58e5d8c 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/misc/System.Xml.Linq.Misc.Tests.csproj +++ b/external/corefx/src/System.Private.Xml.Linq/tests/misc/System.Xml.Linq.Misc.Tests.csproj @@ -16,6 +16,7 @@ + diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/misc/XAttribute.cs b/external/corefx/src/System.Private.Xml.Linq/tests/misc/XAttribute.cs new file mode 100644 index 0000000000..5bb72329eb --- /dev/null +++ b/external/corefx/src/System.Private.Xml.Linq/tests/misc/XAttribute.cs @@ -0,0 +1,22 @@ +// 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; +using System.Collections.Generic; +using System.Linq; +using Microsoft.Test.ModuleCore; +using Xunit; + +namespace System.Xml.Linq.Tests +{ + public class XAttributeTests + { + [Fact] + public void FormattedDate() + { + // Ensure we are compatible with the full framework + Assert.Equal("CreatedTime=\"2018-01-01T12:13:14Z\"", new XAttribute("CreatedTime", new DateTime(2018, 1, 1, 12, 13, 14, DateTimeKind.Utc)).ToString()); + } + } +} diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/misc/XNameAPI.cs b/external/corefx/src/System.Private.Xml.Linq/tests/misc/XNameAPI.cs index e47f5582a5..ca47ba1e55 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/misc/XNameAPI.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/misc/XNameAPI.cs @@ -10,7 +10,7 @@ using Microsoft.Test.ModuleCore; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class MiscFunctionalTests : TestModule { public partial class MiscTests : XLinqTestCase { diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/CommonTests.cs.REMOVED.git-id b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/CommonTests.cs.REMOVED.git-id index 2fb4845942..8d277d4971 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/CommonTests.cs.REMOVED.git-id +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/CommonTests.cs.REMOVED.git-id @@ -1 +1 @@ -bf5589d9cb0089deab67cebc92cc5ee8c793a593 \ No newline at end of file +105e8864e1d7593e78f6dd9779707e269bf929fb \ No newline at end of file diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/EndOfLineHandlingTests.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/EndOfLineHandlingTests.cs index ccab40e315..62fc95868b 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/EndOfLineHandlingTests.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/EndOfLineHandlingTests.cs @@ -13,7 +13,7 @@ using Microsoft.Test.ModuleCore; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeBuilderFunctionalTests : TestModule { public partial class XNodeBuilderTests : XLinqTestCase { diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/ErrorConditions.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/ErrorConditions.cs index 0ba81aafde..6801bc1a10 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/ErrorConditions.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/ErrorConditions.cs @@ -9,7 +9,7 @@ using Microsoft.Test.ModuleCore; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeBuilderFunctionalTests : TestModule { public partial class XNodeBuilderTests : XLinqTestCase { diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/FunctionalTests.cs.REMOVED.git-id b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/FunctionalTests.cs.REMOVED.git-id index 070539607f..8f9bba0507 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/FunctionalTests.cs.REMOVED.git-id +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/FunctionalTests.cs.REMOVED.git-id @@ -1 +1 @@ -0be91ab56960522dc23e8b088adf6dd6000c5528 \ No newline at end of file +2dcce34a3d016c8e7c274268f99c7b40f74ce9f5 \ No newline at end of file diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/OmitDuplicateNamespaceDecl.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/OmitDuplicateNamespaceDecl.cs index a4de882f7c..4680a12bef 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/OmitDuplicateNamespaceDecl.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/OmitDuplicateNamespaceDecl.cs @@ -12,7 +12,7 @@ using System.IO; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeBuilderFunctionalTests : TestModule { public partial class XNodeBuilderTests : XLinqTestCase { diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/OmitDuplicatesAnnotation.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/OmitDuplicatesAnnotation.cs index 9a9dc5dfc7..a656a3b99c 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/OmitDuplicatesAnnotation.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/OmitDuplicatesAnnotation.cs @@ -15,7 +15,7 @@ using XmlCoreTest.Common; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeBuilderFunctionalTests : TestModule { public partial class XNodeBuilderTests : XLinqTestCase { diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/SaveOptions_OmitDuplicateNamespace.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/SaveOptions_OmitDuplicateNamespace.cs index 6b8a1a0b6d..3e833a0de3 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/SaveOptions_OmitDuplicateNamespace.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/SaveOptions_OmitDuplicateNamespace.cs @@ -14,7 +14,7 @@ using Xunit; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeBuilderFunctionalTests : TestModule { public partial class XNodeBuilderTests : XLinqTestCase { diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/WriterSettings.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/WriterSettings.cs index 598cc37edc..3dafd2fe33 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/WriterSettings.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/WriterSettings.cs @@ -9,7 +9,7 @@ using Microsoft.Test.ModuleCore; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeBuilderFunctionalTests : TestModule { public partial class XNodeBuilderTests : XLinqTestCase { diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/XmlFactoryWriterTests.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/XmlFactoryWriterTests.cs index 7e3c9df36c..5b0c3efe0d 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/XmlFactoryWriterTests.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeBuilder/XmlFactoryWriterTests.cs @@ -13,7 +13,7 @@ using Microsoft.Test.ModuleCore; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeBuilderFunctionalTests : TestModule { public partial class XNodeBuilderTests : XLinqTestCase { diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/CXMLGeneralTest.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/CXMLGeneralTest.cs index 538f446824..fc5c6b951f 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/CXMLGeneralTest.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/CXMLGeneralTest.cs @@ -9,7 +9,7 @@ using Microsoft.Test.ModuleCore; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeReaderFunctionalTests : TestModule { public partial class XNodeReaderTests : XLinqTestCase { diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/CXMLReaderAttrTest.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/CXMLReaderAttrTest.cs index 8150eca5f0..21a01e123f 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/CXMLReaderAttrTest.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/CXMLReaderAttrTest.cs @@ -9,7 +9,7 @@ using Microsoft.Test.ModuleCore; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeReaderFunctionalTests : TestModule { public partial class XNodeReaderTests : XLinqTestCase { diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/CXmlReaderReadEtc.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/CXmlReaderReadEtc.cs index 1e940c6707..6b4349f395 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/CXmlReaderReadEtc.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/CXmlReaderReadEtc.cs @@ -10,7 +10,7 @@ using Xunit; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeReaderFunctionalTests : TestModule { public partial class XNodeReaderTests : XLinqTestCase { diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/CommonTest.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/CommonTest.cs index 6f0c84bbab..25412d67c5 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/CommonTest.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/CommonTest.cs @@ -10,7 +10,7 @@ using Microsoft.Test.ModuleCore; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeReaderFunctionalTests : TestModule { public partial class XNodeReaderTests : XLinqTestCase diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ErrorConditions.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ErrorConditions.cs index 9e9c749b30..7c116dad3a 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ErrorConditions.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ErrorConditions.cs @@ -10,7 +10,7 @@ using System.Xml.Linq; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeReaderFunctionalTests : TestModule { public partial class XNodeReaderTests : XLinqTestCase { diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/FunctionalTests.cs.REMOVED.git-id b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/FunctionalTests.cs.REMOVED.git-id index 066566935e..e10dc350bd 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/FunctionalTests.cs.REMOVED.git-id +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/FunctionalTests.cs.REMOVED.git-id @@ -1 +1 @@ -4882a4483f532e10fc043554a27f4372c740efe5 \ No newline at end of file +dc1abcf036ce13023606aef009b6da99860f0fb7 \ No newline at end of file diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/IntegrityTest.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/IntegrityTest.cs index 76652bba8c..f246856112 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/IntegrityTest.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/IntegrityTest.cs @@ -8,7 +8,7 @@ using System.Xml; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeReaderFunctionalTests : TestModule { public partial class XNodeReaderTests : XLinqTestCase diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadBase64.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadBase64.cs index 929953ec34..a60e29608a 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadBase64.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadBase64.cs @@ -11,7 +11,7 @@ using XmlCoreTest.Common; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeReaderFunctionalTests : TestModule { public partial class XNodeReaderTests : XLinqTestCase diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadBinHex.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadBinHex.cs index 0228d8b419..9930055a4e 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadBinHex.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadBinHex.cs @@ -10,7 +10,7 @@ using System.Xml; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeReaderFunctionalTests : TestModule { public partial class XNodeReaderTests : XLinqTestCase { diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadOuterXml.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadOuterXml.cs index e66a244c44..d4fe004be3 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadOuterXml.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadOuterXml.cs @@ -9,7 +9,7 @@ using Xunit; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeReaderFunctionalTests : TestModule { public partial class XNodeReaderTests : XLinqTestCase diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadSubTree.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadSubTree.cs index 0963e20dd7..575d5575fd 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadSubTree.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadSubTree.cs @@ -9,7 +9,7 @@ using Microsoft.Test.ModuleCore; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeReaderFunctionalTests : TestModule { public partial class XNodeReaderTests : XLinqTestCase { diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToDescendant.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToDescendant.cs index de6cb2c64d..3f7a6055e9 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToDescendant.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToDescendant.cs @@ -9,7 +9,7 @@ using Microsoft.Test.ModuleCore; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeReaderFunctionalTests : TestModule { public partial class XNodeReaderTests : XLinqTestCase diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToFollowing.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToFollowing.cs index 733880d421..7b19e953dd 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToFollowing.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToFollowing.cs @@ -9,7 +9,7 @@ using Microsoft.Test.ModuleCore; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeReaderFunctionalTests : TestModule { public partial class XNodeReaderTests : XLinqTestCase diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToNextSibling.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToNextSibling.cs index 4c7089aac7..68a8fb5103 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToNextSibling.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToNextSibling.cs @@ -9,7 +9,7 @@ using Microsoft.Test.ModuleCore; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeReaderFunctionalTests : TestModule { public partial class XNodeReaderTests : XLinqTestCase diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadValue.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadValue.cs index 599b5ee787..5f95fb3c60 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadValue.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReadValue.cs @@ -10,7 +10,7 @@ using XmlCoreTest.Common; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeReaderFunctionalTests : TestModule { public partial class XNodeReaderTests : XLinqTestCase { diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReaderProperty.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReaderProperty.cs index d2d3667105..6bf1167f8f 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReaderProperty.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/ReaderProperty.cs @@ -8,7 +8,7 @@ using Microsoft.Test.ModuleCore; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeReaderFunctionalTests : TestModule { public partial class XNodeReaderTests : XLinqTestCase diff --git a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/XNodeReaderAPI.cs b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/XNodeReaderAPI.cs index 4d2682a12d..7fe7237326 100644 --- a/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/XNodeReaderAPI.cs +++ b/external/corefx/src/System.Private.Xml.Linq/tests/xNodeReader/XNodeReaderAPI.cs @@ -10,7 +10,7 @@ using Microsoft.Test.ModuleCore; namespace CoreXml.Test.XLinq { - public partial class FunctionalTests : TestModule + public partial class XNodeReaderFunctionalTests : TestModule { public partial class XNodeReaderTests : XLinqTestCase { diff --git a/external/corefx/src/System.Private.Xml/src/Resources/Strings.resx.REMOVED.git-id b/external/corefx/src/System.Private.Xml/src/Resources/Strings.resx.REMOVED.git-id index 837f6399bb..00f5a1412f 100644 --- a/external/corefx/src/System.Private.Xml/src/Resources/Strings.resx.REMOVED.git-id +++ b/external/corefx/src/System.Private.Xml/src/Resources/Strings.resx.REMOVED.git-id @@ -1 +1 @@ -b7c8d8724fc05f407a46e9f5d1a16455fc1f0eb6 \ No newline at end of file +a95f77a85fdabfb8671471abdd9c616a2a2d1b7e \ No newline at end of file diff --git a/external/corefx/src/System.Private.Xml/src/System.Private.Xml.csproj b/external/corefx/src/System.Private.Xml/src/System.Private.Xml.csproj index bff32c8149..1eec546b3a 100644 --- a/external/corefx/src/System.Private.Xml/src/System.Private.Xml.csproj +++ b/external/corefx/src/System.Private.Xml/src/System.Private.Xml.csproj @@ -20,7 +20,7 @@ - + System\StringBuilderCache.cs diff --git a/external/corefx/src/System.Private.Xml/src/System/Xml/Core/XmlEncodedRawTextWriter.cs b/external/corefx/src/System.Private.Xml/src/System/Xml/Core/XmlEncodedRawTextWriter.cs index a1e6c3e1d2..3c8f752f65 100644 --- a/external/corefx/src/System.Private.Xml/src/System/Xml/Core/XmlEncodedRawTextWriter.cs +++ b/external/corefx/src/System.Private.Xml/src/System/Xml/Core/XmlEncodedRawTextWriter.cs @@ -171,6 +171,11 @@ namespace System.Xml _textContentMarks[0] = 1; _charEntityFallback = new CharEntityEncoderFallback(); + + // grab bom before possibly changing encoding settings + ReadOnlySpan bom = encoding.Preamble; + + // the encoding instance this creates can differ from the one passed in this.encoding = Encoding.GetEncoding( settings.Encoding.CodePage, _charEntityFallback, @@ -180,7 +185,6 @@ namespace System.Xml if (!stream.CanSeek || stream.Position == 0) { - ReadOnlySpan bom = encoding.Preamble; if (bom.Length != 0) { this.stream.Write(bom); diff --git a/external/corefx/src/System.Private.Xml/src/System/Xml/Dom/XmlDeclaration.cs b/external/corefx/src/System.Private.Xml/src/System/Xml/Dom/XmlDeclaration.cs index 16c80c45bf..7254222c5d 100644 --- a/external/corefx/src/System.Private.Xml/src/System/Xml/Dom/XmlDeclaration.cs +++ b/external/corefx/src/System.Private.Xml/src/System/Xml/Dom/XmlDeclaration.cs @@ -2,9 +2,9 @@ // 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.Text; using System.Diagnostics; using System.IO; +using System.Text; namespace System.Xml { diff --git a/external/corefx/src/System.Private.Xml/src/System/Xml/NameTable.cs b/external/corefx/src/System.Private.Xml/src/System/Xml/NameTable.cs index 2218a369e8..2317dd9767 100644 --- a/external/corefx/src/System.Private.Xml/src/System/Xml/NameTable.cs +++ b/external/corefx/src/System.Private.Xml/src/System/Xml/NameTable.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System; +using System.Runtime.InteropServices; namespace System.Xml { @@ -197,7 +198,7 @@ namespace System.Xml Entry[] oldEntries = _entries; Entry[] newEntries = new Entry[newMask + 1]; - // use oldEntries.Length to eliminate the range check + // use oldEntries.Length to eliminate the range check for (int i = 0; i < oldEntries.Length; i++) { Entry e = oldEntries[i]; @@ -234,13 +235,13 @@ namespace System.Xml private static int ComputeHash32(string key) { - ReadOnlySpan bytes = key.AsReadOnlySpan().AsBytes(); + ReadOnlySpan bytes = MemoryMarshal.AsBytes(key.AsSpan()); return Marvin.ComputeHash32(bytes, Marvin.DefaultSeed); } private static int ComputeHash32(char[] key, int start, int len) { - ReadOnlySpan bytes = key.AsReadOnlySpan().Slice(start, len).AsBytes(); + ReadOnlySpan bytes = MemoryMarshal.AsBytes(key.AsSpan(start, len)); return Marvin.ComputeHash32(bytes, Marvin.DefaultSeed); } } diff --git a/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/ReflectionXmlSerializationReader.cs b/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/ReflectionXmlSerializationReader.cs index 88fc758431..5c81a051bd 100644 --- a/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/ReflectionXmlSerializationReader.cs +++ b/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/ReflectionXmlSerializationReader.cs @@ -693,7 +693,7 @@ namespace System.Xml.Serialization { if (special.TypeDesc.Kind == TypeKind.Node) { - value = Document.CreateTextNode(ReadString()); + value = Document.CreateTextNode(Reader.ReadString()); } else { @@ -706,11 +706,11 @@ namespace System.Xml.Serialization { if (text.Mapping.TypeDesc.CollapseWhitespace) { - value = CollapseWhitespace(ReadString()); + value = CollapseWhitespace(Reader.ReadString()); } else { - value = ReadString(); + value = Reader.ReadString(); } } else @@ -721,7 +721,7 @@ namespace System.Xml.Serialization } else { - value = WritePrimitive(text.Mapping, (state) => ((ReflectionXmlSerializationReader)state).ReadString(), this); + value = WritePrimitive(text.Mapping, (state) => ((ReflectionXmlSerializationReader)state).Reader.ReadString(), this); } } } @@ -1832,7 +1832,7 @@ namespace System.Xml.Serialization Func functor = (state) => { var reader = (ReflectionXmlSerializationReader)state; - return reader.CollapseWhitespace(reader.ReadString()); + return reader.CollapseWhitespace(reader.Reader.ReadString()); }; o = WriteEnumMethod(enumMapping, functor, this); ReadEndElement(); diff --git a/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/SchemaImporter.cs b/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/SchemaImporter.cs index 974aa82ba4..8bf4b20188 100644 --- a/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/SchemaImporter.cs +++ b/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/SchemaImporter.cs @@ -155,7 +155,7 @@ namespace System.Xml.Serialization TypeDesc typeDesc = Scope.GetTypeDesc(typeof(object)); StructMapping mapping = new StructMapping(); mapping.TypeDesc = typeDesc; - mapping.Members = new MemberMapping[0]; + mapping.Members = Array.Empty(); mapping.IncludeInSchema = false; mapping.TypeName = Soap.UrType; mapping.Namespace = XmlSchema.Namespace; diff --git a/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/SoapReflectionImporter.cs b/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/SoapReflectionImporter.cs index 05838f6828..383946e7d4 100644 --- a/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/SoapReflectionImporter.cs +++ b/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/SoapReflectionImporter.cs @@ -266,7 +266,7 @@ namespace System.Xml.Serialization StructMapping mapping = new StructMapping(); mapping.IsSoap = true; mapping.TypeDesc = typeDesc; - mapping.Members = new MemberMapping[0]; + mapping.Members = Array.Empty(); mapping.IncludeInSchema = false; mapping.TypeName = Soap.UrType; mapping.Namespace = XmlSchema.Namespace; @@ -739,7 +739,7 @@ namespace System.Xml.Serialization attribute.Mapping = ImportTypeMapping(_modelScope.GetTypeModel(accessorType), (a.SoapAttribute == null ? String.Empty : a.SoapAttribute.DataType), limiter); attribute.Default = GetDefaultValue(model.FieldTypeDesc, a); accessor.Attribute = attribute; - accessor.Elements = new ElementAccessor[0]; + accessor.Elements = Array.Empty(); } else { diff --git a/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/Types.cs b/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/Types.cs index 079ec5e661..8f099cc27f 100644 --- a/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/Types.cs +++ b/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/Types.cs @@ -1253,7 +1253,7 @@ namespace System.Xml.Serialization { if (typeof(IEnumerable).IsAssignableFrom(type)) { - MethodInfo enumerator = type.GetMethod("GetEnumerator", new Type[0]); + MethodInfo enumerator = type.GetMethod("GetEnumerator", Array.Empty()); if (enumerator == null || !typeof(IEnumerator).IsAssignableFrom(enumerator.ReturnType)) { diff --git a/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/XmlSchemaImporter.cs b/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/XmlSchemaImporter.cs index 8dd5777b34..b3d3af2471 100644 --- a/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/XmlSchemaImporter.cs +++ b/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/XmlSchemaImporter.cs @@ -37,19 +37,6 @@ namespace System.Xml.Serialization /// public XmlSchemaImporter(XmlSchemas schemas, CodeIdentifiers typeIdentifiers) : base(schemas, CodeGenerationOptions.GenerateProperties, new ImportContext(typeIdentifiers, false)) { } - /// - /// - /// [To be supplied.] - /// - public XmlSchemaImporter(XmlSchemas schemas, CodeIdentifiers typeIdentifiers, CodeGenerationOptions options) : base(schemas, options, new ImportContext(typeIdentifiers, false)) { } - - /// - /// - /// [To be supplied.] - /// - public XmlSchemaImporter(XmlSchemas schemas, CodeGenerationOptions options, ImportContext context) : base(schemas, options, context) { } - - /// /// /// [To be supplied.] @@ -1166,7 +1153,7 @@ namespace System.Xml.Serialization accessor.Mapping = mapping; MemberMapping member = new MemberMapping(); - member.Elements = new ElementAccessor[0]; + member.Elements = Array.Empty(); member.Text = accessor; if (isMixed) { @@ -1499,7 +1486,7 @@ namespace System.Xml.Serialization AttributeAccessor accessor = ImportAttribute(attribute, identifier, ns, attribute); if (accessor == null) return; MemberMapping member = new MemberMapping(); - member.Elements = new ElementAccessor[0]; + member.Elements = Array.Empty(); member.Attribute = accessor; member.Name = CodeIdentifier.MakeValid(Accessor.UnescapeName(accessor.Name)); member.Name = membersScope.AddUnique(member.Name, member); @@ -1529,7 +1516,7 @@ namespace System.Xml.Serialization accessor.Mapping = mapping; MemberMapping member = new MemberMapping(); - member.Elements = new ElementAccessor[0]; + member.Elements = Array.Empty(); member.Attribute = accessor; member.Name = membersScope.MakeRightCase("AnyAttr"); member.Name = membersScope.AddUnique(member.Name, member); @@ -1584,7 +1571,7 @@ namespace System.Xml.Serialization xmlnsMapping.TypeDesc = xmlnsTypeDesc; xmlnsMapping.TypeName = xmlnsMapping.TypeDesc.Name; - xmlnsMapping.Members = new MemberMapping[0]; + xmlnsMapping.Members = Array.Empty(); xmlnsMapping.IncludeInSchema = false; xmlnsMapping.ReferencedByTopLevelElement = true; diff --git a/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializationReader.cs.REMOVED.git-id b/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializationReader.cs.REMOVED.git-id index f5a434ab79..f58def1ecc 100644 --- a/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializationReader.cs.REMOVED.git-id +++ b/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializationReader.cs.REMOVED.git-id @@ -1 +1 @@ -c9882b4b25531d053c8b0344643eebb1c770772e \ No newline at end of file +3e349e434045cf7d6423f937410c4bac7b5ea22c \ No newline at end of file diff --git a/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializationWriter.cs.REMOVED.git-id b/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializationWriter.cs.REMOVED.git-id index 291b292c0f..ae9f6d9af4 100644 --- a/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializationWriter.cs.REMOVED.git-id +++ b/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializationWriter.cs.REMOVED.git-id @@ -1 +1 @@ -766ee3628abf98b82ebc3f3487674f1331e97147 \ No newline at end of file +dda50dfb90118a21b76de1fb40f3af02a8a2d483 \ No newline at end of file diff --git a/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializer.cs b/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializer.cs index e7a3342436..d9f998ba0f 100644 --- a/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializer.cs +++ b/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializer.cs @@ -159,6 +159,7 @@ namespace System.Xml.Serialization internal string DefaultNamespace = null; #endif private Type _rootType; + private bool _isReflectionBasedSerializer = false; private static TempAssemblyCache s_cache = new TempAssemblyCache(); private static volatile XmlSerializerNamespaces s_defaultNamespaces; @@ -447,7 +448,7 @@ namespace System.Xml.Serialization } SerializePrimitive(xmlWriter, o, namespaces); } - else if (ShouldUseReflectionBasedSerialization(_mapping)) + else if (ShouldUseReflectionBasedSerialization(_mapping) || _isReflectionBasedSerializer) { SerializeUsingReflection(xmlWriter, o, namespaces, encodingStyle, id); } @@ -587,7 +588,7 @@ namespace System.Xml.Serialization } return DeserializePrimitive(xmlReader, events); } - else if (ShouldUseReflectionBasedSerialization(_mapping)) + else if (ShouldUseReflectionBasedSerialization(_mapping) || _isReflectionBasedSerializer) { return DeserializeUsingReflection(xmlReader, encodingStyle, events); } @@ -797,6 +798,7 @@ namespace System.Xml.Serialization serializers[i] = new XmlSerializer(); serializers[i]._rootType = type; serializers[i]._mapping = mappings[i]; + serializers[i]._isReflectionBasedSerializer = true; } return serializers; @@ -805,7 +807,7 @@ namespace System.Xml.Serialization #if !FEATURE_SERIALIZATION_UAPAOT [ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)] [ResourceExposure(ResourceScope.None)] - public static bool GenerateSerializer(Type[] types, XmlMapping[] mappings, Stream stream) + internal static bool GenerateSerializer(Type[] types, XmlMapping[] mappings, Stream stream) { if (types == null || types.Length == 0) return false; diff --git a/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializerFactory.cs b/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializerFactory.cs index cfd9374aff..95f2f17bf9 100644 --- a/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializerFactory.cs +++ b/external/corefx/src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializerFactory.cs @@ -40,7 +40,7 @@ namespace System.Xml.Serialization /// public XmlSerializer CreateSerializer(Type type, XmlRootAttribute root) { - return CreateSerializer(type, null, new Type[0], root, null, null); + return CreateSerializer(type, null, Array.Empty(), root, null, null); } /// @@ -58,7 +58,7 @@ namespace System.Xml.Serialization /// public XmlSerializer CreateSerializer(Type type, XmlAttributeOverrides overrides) { - return CreateSerializer(type, overrides, new Type[0], null, null, null); + return CreateSerializer(type, overrides, Array.Empty(), null, null, null); } /// diff --git a/external/corefx/src/System.Private.Xml/src/System/Xml/Xsl/Runtime/XmlQueryContext.cs b/external/corefx/src/System.Private.Xml/src/System/Xml/Xsl/Runtime/XmlQueryContext.cs index 2a747d6e2a..783692d486 100644 --- a/external/corefx/src/System.Private.Xml/src/System/Xml/Xsl/Runtime/XmlQueryContext.cs +++ b/external/corefx/src/System.Private.Xml/src/System/Xml/Xsl/Runtime/XmlQueryContext.cs @@ -328,9 +328,7 @@ namespace System.Xml.Xsl.Runtime XsltMessageEncounteredEventHandler onMessage = (_argList != null) ? _argList.xsltMessageEncountered : null; if (onMessage != null) - onMessage(this, new XmlILQueryEventArgs(message)); - else - Console.WriteLine(message); + onMessage(this, new XmlILQueryEventArgs(message)); } } diff --git a/external/corefx/src/System.Private.Xml/src/System/Xml/Xsl/XsltOld/DbgCompiler.cs b/external/corefx/src/System.Private.Xml/src/System/Xml/Xsl/XsltOld/DbgCompiler.cs index 0dce03c365..aa992b9ecf 100644 --- a/external/corefx/src/System.Private.Xml/src/System/Xml/Xsl/XsltOld/DbgCompiler.cs +++ b/external/corefx/src/System.Private.Xml/src/System/Xml/Xsl/XsltOld/DbgCompiler.cs @@ -32,7 +32,7 @@ namespace System.Xml.Xsl.XsltOld private DbgData() { _styleSheet = null; - _variables = new VariableAction[0]; + _variables = Array.Empty(); } public static DbgData Empty { get { return s_nullDbgData; } } } diff --git a/external/corefx/src/System.Private.Xml/src/System/Xml/Xsl/XsltOld/MessageAction.cs b/external/corefx/src/System.Private.Xml/src/System/Xml/Xsl/XsltOld/MessageAction.cs index 4910cb122e..6c57672caf 100644 --- a/external/corefx/src/System.Private.Xml/src/System/Xml/Xsl/XsltOld/MessageAction.cs +++ b/external/corefx/src/System.Private.Xml/src/System/Xml/Xsl/XsltOld/MessageAction.cs @@ -56,8 +56,7 @@ namespace System.Xml.Xsl.XsltOld case ProcessingChildren: TextOnlyOutput recOutput = processor.PopOutput() as TextOnlyOutput; - Debug.Assert(recOutput != null); - Console.WriteLine(recOutput.Writer.ToString()); + Debug.Assert(recOutput != null); if (_Terminate) { diff --git a/external/corefx/src/System.Private.Xml/src/System/Xml/Xsl/XsltOld/UseAttributeSetsAction.cs b/external/corefx/src/System.Private.Xml/src/System/Xml/Xsl/XsltOld/UseAttributeSetsAction.cs index bac0d33715..7f1fc34c64 100644 --- a/external/corefx/src/System.Private.Xml/src/System/Xml/Xsl/XsltOld/UseAttributeSetsAction.cs +++ b/external/corefx/src/System.Private.Xml/src/System/Xml/Xsl/XsltOld/UseAttributeSetsAction.cs @@ -32,7 +32,7 @@ namespace System.Xml.Xsl.XsltOld if (_useString.Length == 0) { // Split creates empty node is spliting empty string - _useAttributeSets = new XmlQualifiedName[0]; + _useAttributeSets = Array.Empty(); return; } @@ -56,7 +56,7 @@ namespace System.Xml.Xsl.XsltOld throw; } // Ignore the whole list in forwards-compatible mode - _useAttributeSets = new XmlQualifiedName[0]; + _useAttributeSets = Array.Empty(); } } diff --git a/external/corefx/src/System.Private.Xml/src/System/Xml/Xslt/XsltException.cs b/external/corefx/src/System.Private.Xml/src/System/Xml/Xslt/XsltException.cs index 7b040816aa..4c2e761127 100644 --- a/external/corefx/src/System.Private.Xml/src/System/Xml/Xslt/XsltException.cs +++ b/external/corefx/src/System.Private.Xml/src/System/Xml/Xslt/XsltException.cs @@ -147,10 +147,9 @@ namespace System.Xml.Xsl } [Serializable] -<<<<<<< HEAD -======= +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] ->>>>>>> upstream/master +#endif public class XsltCompileException : XsltException { protected XsltCompileException(SerializationInfo info, StreamingContext context) : base(info, context) diff --git a/external/corefx/src/System.Private.Xml/tests/Misc/System.Xml.Misc.Tests.csproj b/external/corefx/src/System.Private.Xml/tests/Misc/System.Xml.Misc.Tests.csproj index 275891669f..102aa3cc79 100644 --- a/external/corefx/src/System.Private.Xml/tests/Misc/System.Xml.Misc.Tests.csproj +++ b/external/corefx/src/System.Private.Xml/tests/Misc/System.Xml.Misc.Tests.csproj @@ -10,6 +10,7 @@ + \ No newline at end of file diff --git a/external/corefx/src/System.Private.Xml/tests/Misc/XmlUrlResolverTests.cs b/external/corefx/src/System.Private.Xml/tests/Misc/XmlUrlResolverTests.cs new file mode 100644 index 0000000000..ae7f394cee --- /dev/null +++ b/external/corefx/src/System.Private.Xml/tests/Misc/XmlUrlResolverTests.cs @@ -0,0 +1,77 @@ +// 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.Collections.Generic; +using System.IO; +using System.Runtime.InteropServices; +using Xunit; + +namespace System.Xml.Tests +{ + public class XmlUriResolverTests + { + [Fact] + public void Resolving_RelativeBase_Throws() + { + var resolver = new XmlUrlResolver(); + Assert.Throws(() => resolver.ResolveUri( + new Uri(Environment.CurrentDirectory + Path.DirectorySeparatorChar, UriKind.Relative), "test.xml")); + } + + [Theory] + [MemberData(nameof(GetBaseUriAndPath))] + public void Resolving_LocalPath_Ok(Uri baseUri, string path) + { + var resolver = new XmlUrlResolver(); + Uri resolvedUri = resolver.ResolveUri(baseUri, path); + + Assert.Equal(Path.GetFullPath(Path.Combine(Environment.CurrentDirectory, path)), resolvedUri.LocalPath); + Assert.True(resolvedUri.LocalPath.EndsWith(path.Replace('/', Path.DirectorySeparatorChar))); + } + + [Theory] + [MemberData(nameof(XmlFileTargets))] + public void Resolving_OnlyWithBaseUri_Ok(string basePath) + { + var baseUri = new Uri(Path.GetFullPath(basePath)); + var resolver = new XmlUrlResolver(); + Uri resolvedUri = resolver.ResolveUri(baseUri, string.Empty); + + Assert.Equal(Path.GetFullPath(basePath), resolvedUri.LocalPath); + } + + public static IEnumerable GetBaseUriAndPath() + { + // Base URI as null is the default for internal Xml operation. + var baseUris = new List { null }; + + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + // The case below does not work on Unix, the '#' ends up treated as a fragment and the path is cut there. + var currDirWithDirSeparator = Environment.CurrentDirectory + Path.DirectorySeparatorChar; + baseUris.Add(new Uri(currDirWithDirSeparator, UriKind.Absolute)); + baseUris.Add(new Uri(string.Empty, UriKind.RelativeOrAbsolute)); + } + + foreach (Uri baseUri in baseUris) + { + foreach (object[] targetFile in XmlFileTargets) + yield return new object[] { baseUri, targetFile[0] }; + } + } + + public static IEnumerable XmlFileTargets => new object[][] + { + new object[] { "f#/t/\u00eb/test.xml" }, + new object[] { "/f#/t/\u00eb/t#st.xml" }, + new object[] { "/f#/\u00e3/\u00eb/t\u00ebst.xml" }, + new object[] { "u/t/c/test.xml" }, + new object[] { "u/t/c/t#st.xml" }, + new object[] { "/u/t/c/t\u00ebst.xml" }, + new object[] { "test.xml" }, + new object[] { "t#st.xml" }, + new object[] { "t\u00ebst.xml" } + }; + } +} diff --git a/external/corefx/src/System.Private.Xml/tests/Writers/RwFactory/CXmlDriverVariation.cs b/external/corefx/src/System.Private.Xml/tests/Writers/RwFactory/CXmlDriverVariation.cs index f90abf777f..4f00d99d1f 100644 --- a/external/corefx/src/System.Private.Xml/tests/Writers/RwFactory/CXmlDriverVariation.cs +++ b/external/corefx/src/System.Private.Xml/tests/Writers/RwFactory/CXmlDriverVariation.cs @@ -58,8 +58,7 @@ namespace System.Xml.Tests res = (tagVARIATION_STATUS)HandleException(e); } catch (Exception e) - { - Console.WriteLine(e); + { res = (tagVARIATION_STATUS)HandleException(e); } diff --git a/external/corefx/src/System.Private.Xml/tests/Writers/XmlWriterApi/TCFullEndElement.cs.REMOVED.git-id b/external/corefx/src/System.Private.Xml/tests/Writers/XmlWriterApi/TCFullEndElement.cs.REMOVED.git-id index 98532f95ef..c9fb3b3077 100644 --- a/external/corefx/src/System.Private.Xml/tests/Writers/XmlWriterApi/TCFullEndElement.cs.REMOVED.git-id +++ b/external/corefx/src/System.Private.Xml/tests/Writers/XmlWriterApi/TCFullEndElement.cs.REMOVED.git-id @@ -1 +1 @@ -afb534ae18d226b6299692bf9d4ce8f122ed5b94 \ No newline at end of file +82a09864ec59beee71b25be6f0f48d73318e0161 \ No newline at end of file diff --git a/external/corefx/src/System.Private.Xml/tests/XmlReader/XmlResolver/XmlSystemPathResolverTests.cs b/external/corefx/src/System.Private.Xml/tests/XmlReader/XmlResolver/XmlSystemPathResolverTests.cs index 4404f5fb9c..8c711bae7c 100644 --- a/external/corefx/src/System.Private.Xml/tests/XmlReader/XmlResolver/XmlSystemPathResolverTests.cs +++ b/external/corefx/src/System.Private.Xml/tests/XmlReader/XmlResolver/XmlSystemPathResolverTests.cs @@ -76,6 +76,7 @@ namespace System.Xml.Tests || e is FileNotFoundException || e is FormatException || e is UnauthorizedAccessException + || e is IOException || e is XmlException); } diff --git a/external/corefx/src/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Reprocess.cs b/external/corefx/src/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Reprocess.cs index 0acd938c88..269dffa070 100644 --- a/external/corefx/src/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Reprocess.cs +++ b/external/corefx/src/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Reprocess.cs @@ -635,15 +635,15 @@ namespace System.Xml.Tests string correctUri = Path.GetFullPath(path); _output.WriteLine("Include uri: " + includeUri); _output.WriteLine("Correct uri: " + correctUri); - Stream s = new FileStream(Path.GetFullPath(path), FileMode.Open, FileAccess.Read, FileShare.Read, 1); - XmlReader r = XmlReader.Create(s, new XmlReaderSettings(), includeUri); - _output.WriteLine("Reader uri: " + r.BaseURI); - XmlSchema som = null; - using (r) + using (Stream s = new FileStream(Path.GetFullPath(path), FileMode.Open, FileAccess.Read, FileShare.Read, 1)) { - som = XmlSchema.Read(r, new ValidationEventHandler(ValidationCallback)); + XmlReader r = XmlReader.Create(s, new XmlReaderSettings(), includeUri); + _output.WriteLine("Reader uri: " + r.BaseURI); + using (r) + { + return XmlSchema.Read(r, new ValidationEventHandler(ValidationCallback)); + } } - return som; } } } diff --git a/external/corefx/src/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateMisc.cs b/external/corefx/src/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateMisc.cs index 31e44a8e33..c9be8ac570 100644 --- a/external/corefx/src/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateMisc.cs +++ b/external/corefx/src/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateMisc.cs @@ -892,7 +892,6 @@ namespace System.Xml.Tests } } - //TFS_538324 [Fact] public void XSDValidationGeneratesInvalidError_1() { @@ -918,7 +917,6 @@ namespace System.Xml.Tests } } - //TFS_538324 [Fact] public void XSDValidationGeneratesInvalidError_2() { diff --git a/external/corefx/src/System.Private.Xml/tests/XmlSerializer/Performance/System.Xml.XmlSerializer.Performance.Tests.csproj b/external/corefx/src/System.Private.Xml/tests/XmlSerializer/Performance/System.Xml.XmlSerializer.Performance.Tests.csproj index a04c4db3fb..a36a097ac3 100644 --- a/external/corefx/src/System.Private.Xml/tests/XmlSerializer/Performance/System.Xml.XmlSerializer.Performance.Tests.csproj +++ b/external/corefx/src/System.Private.Xml/tests/XmlSerializer/Performance/System.Xml.XmlSerializer.Performance.Tests.csproj @@ -11,7 +11,7 @@ - + @@ -24,4 +24,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj b/external/corefx/src/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj index 11e1057ae5..ba3f95079b 100644 --- a/external/corefx/src/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj +++ b/external/corefx/src/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/external/corefx/src/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj b/external/corefx/src/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj index 261a6360d6..f1bfe4c675 100644 --- a/external/corefx/src/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj +++ b/external/corefx/src/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/external/corefx/src/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.cs b/external/corefx/src/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.cs index 10281561d3..81c8f7bb1e 100644 --- a/external/corefx/src/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.cs +++ b/external/corefx/src/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.cs @@ -477,15 +477,15 @@ string.Format(@" public static void XML_TypeWithXmlSchemaFormAttribute() { var value = new TypeWithXmlSchemaFormAttribute() { NoneSchemaFormListProperty = new List { "abc" }, QualifiedSchemaFormListProperty = new List { true }, UnqualifiedSchemaFormListProperty = new List { 1 } }; - var acutal = SerializeAndDeserialize(value, + var actual = SerializeAndDeserialize(value, @"1abctrue"); - Assert.StrictEqual(value.NoneSchemaFormListProperty.Count, acutal.NoneSchemaFormListProperty.Count); - Assert.StrictEqual(value.NoneSchemaFormListProperty[0], acutal.NoneSchemaFormListProperty[0]); - Assert.StrictEqual(value.UnqualifiedSchemaFormListProperty.Count, acutal.UnqualifiedSchemaFormListProperty.Count); - Assert.StrictEqual(value.UnqualifiedSchemaFormListProperty[0], acutal.UnqualifiedSchemaFormListProperty[0]); - Assert.StrictEqual(value.QualifiedSchemaFormListProperty.Count, acutal.QualifiedSchemaFormListProperty.Count); - Assert.StrictEqual(value.QualifiedSchemaFormListProperty[0], acutal.QualifiedSchemaFormListProperty[0]); + Assert.StrictEqual(value.NoneSchemaFormListProperty.Count, actual.NoneSchemaFormListProperty.Count); + Assert.StrictEqual(value.NoneSchemaFormListProperty[0], actual.NoneSchemaFormListProperty[0]); + Assert.StrictEqual(value.UnqualifiedSchemaFormListProperty.Count, actual.UnqualifiedSchemaFormListProperty.Count); + Assert.StrictEqual(value.UnqualifiedSchemaFormListProperty[0], actual.UnqualifiedSchemaFormListProperty[0]); + Assert.StrictEqual(value.QualifiedSchemaFormListProperty.Count, actual.QualifiedSchemaFormListProperty.Count); + Assert.StrictEqual(value.QualifiedSchemaFormListProperty[0], actual.QualifiedSchemaFormListProperty[0]); } [Fact] @@ -1613,6 +1613,97 @@ string.Format(@" Assert.Equal(value, actual); } + [Fact] + public static void Xml_DefaultValueAttributeSetToPositiveInfinityTest() + { + var value = new DefaultValuesSetToPositiveInfinity(); + var actual = SerializeAndDeserialize(value, +@" + + 0 + 0 + 0 + 0 +"); + Assert.NotNull(actual); + Assert.Equal(value, actual); + } + + [Fact] + public static void Xml_DefaultValueAttributeSetToNegativeInfinityTest() + { + var value = new DefaultValuesSetToNegativeInfinity(); + var actual = SerializeAndDeserialize(value, +@" + + 0 + 0 + 0 + 0 +"); + Assert.NotNull(actual); + Assert.Equal(value, actual); + } + + [ActiveIssue(28321)] + [Fact] + public static void SerializeWithDefaultValueSetToNaNTest() + { + var value = new DefaultValuesSetToNaN(); + value.DoubleField = Double.NaN; + value.SingleField = Single.NaN; + value.FloatProp = Single.NaN; + value.DoubleProp = Double.NaN; + + bool result=SerializeWithDefaultValue(value, +@" +"); + Assert.True(result); + } + + [Fact] + public static void SerializeWithDefaultValueSetToPositiveInfinityTest() + { + var value = new DefaultValuesSetToPositiveInfinity(); + value.DoubleField = Double.PositiveInfinity; + value.SingleField = Single.PositiveInfinity; + value.FloatProp = Single.PositiveInfinity; + value.DoubleProp = Double.PositiveInfinity; + + bool result = SerializeWithDefaultValue(value, +@" +"); + Assert.True(result); + } + + [Fact] + public static void SerializeWithDefaultValueSetToNegativeInfinityTest() + { + var value = new DefaultValuesSetToNegativeInfinity(); + value.DoubleField = Double.NegativeInfinity; + value.SingleField = Single.NegativeInfinity; + value.FloatProp = Single.NegativeInfinity; + value.DoubleProp = Double.NegativeInfinity; + + bool result = SerializeWithDefaultValue(value, + @" +"); + Assert.True(result); + } + + private static bool SerializeWithDefaultValue(T value, string baseline) + { + XmlSerializer serializer = new XmlSerializer(typeof(T)); + using (MemoryStream ms = new MemoryStream()) + { + serializer.Serialize(ms, value); + ms.Position = 0; + string output = new StreamReader(ms).ReadToEnd(); + Utils.CompareResult result = Utils.Compare(baseline, output); + return result.Equal; + } + } + [Fact] public static void Xml_TypeWithMismatchBetweenAttributeAndPropertyType() { diff --git a/external/corefx/src/System.Private.Xml/tests/XmlWriter/WriteWithEncoding.cs b/external/corefx/src/System.Private.Xml/tests/XmlWriter/WriteWithEncoding.cs index 78c191a4d8..b764701630 100644 --- a/external/corefx/src/System.Private.Xml/tests/XmlWriter/WriteWithEncoding.cs +++ b/external/corefx/src/System.Private.Xml/tests/XmlWriter/WriteWithEncoding.cs @@ -3,7 +3,9 @@ // See the LICENSE file in the project root for more information. using System.IO; +using System.Linq; using System.Text; +using System.Xml.Xsl; using Xunit; namespace System.Xml.Tests @@ -36,5 +38,38 @@ namespace System.Xml.Tests Assert.Equal("1-456-ab١2-36-00a𐀀𐐁", s); } + + [Fact] + public void WriteWithUtf32EncodingNoBom() + { + //Given, encoding set to UTF32 with no BOM + var settings = new XmlWriterSettings + { + OmitXmlDeclaration = false, + ConformanceLevel = ConformanceLevel.Document, + Encoding = new UTF32Encoding(false, false, true) + }; + + string resultString; + using (var result = new MemoryStream()) + { + // BOM can be written in this call + var writer = XmlWriter.Create(result, settings); + + // When, do work and get result + writer.WriteStartDocument(); + writer.WriteStartElement("orders"); + writer.WriteElementString("orderID", "1-456-ab\u0661"); + writer.WriteElementString("orderID", "2-36-00a\uD800\uDC00\uD801\uDC01"); + writer.WriteEndElement(); + writer.WriteEndDocument(); + writer.Flush(); + result.Position = 0; + resultString = settings.Encoding.GetString(result.ToArray()); + } + + // Then, last '>' will be cut off in resulting string if BOM is present + Assert.Equal("", string.Concat(resultString.Take(39))); + } } } diff --git a/external/corefx/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XslCompiledTransform.cs.REMOVED.git-id b/external/corefx/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XslCompiledTransform.cs.REMOVED.git-id index 533b02cb60..43c46d195c 100644 --- a/external/corefx/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XslCompiledTransform.cs.REMOVED.git-id +++ b/external/corefx/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XslCompiledTransform.cs.REMOVED.git-id @@ -1 +1 @@ -f9f00e7d3f5250edd6c46b5b57557b7d6f67dbf3 \ No newline at end of file +2f2649b529d5d8be6592dbc1196215177a318446 \ No newline at end of file diff --git a/external/corefx/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XsltApiV2.cs b/external/corefx/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XsltApiV2.cs index 5e058dce06..f5c7c15859 100644 --- a/external/corefx/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XsltApiV2.cs +++ b/external/corefx/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XsltApiV2.cs @@ -44,7 +44,7 @@ namespace System.Xml.Tests public String szDefaultNS = "urn:my-object"; public String szEmpty = ""; - public String szInvalid = "*?%(){}[]&!@#$"; + public String szInvalid = "*?%(){}\0[]&!@#$"; public String szLongString = "ThisIsAVeryLongStringToBeStoredAsAVariableToDetermineHowLargeThisBufferForAVariableNameCanBeAndStillFunctionAsExpected"; public String szLongNS = "http://www.microsoft.com/this/is/a/very/long/namespace/uri/to/do/the/api/testing/for/xslt/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/"; public String[] szWhiteSpace = { " ", "\n", "\t", "\r", "\t\n \r\t" }; @@ -76,7 +76,7 @@ namespace System.Xml.Tests static XsltApiTestCaseBase2() { // Replace absolute URI in xmlResolver_document_function.xml based on the environment - string targetFile = Path.Combine(Path.GetTempPath(), "xmlResolver_document_function.xml"); + string targetFile = Path.Combine(Path.GetTempPath(), typeof(XsltApiTestCaseBase2) + "_" + Path.GetRandomFileName()); string xslFile = Path.Combine("TestFiles", FilePathUtil.GetTestDataPath(), "XsltApiV2", "xmlResolver_document_function_absolute_uri.xsl"); XmlDocument doc = new XmlDocument(); doc.Load(xslFile); diff --git a/external/corefx/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XsltSettings.cs b/external/corefx/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XsltSettings.cs index 01d7d5519a..7bfb96f3cc 100644 --- a/external/corefx/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XsltSettings.cs +++ b/external/corefx/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XsltSettings.cs @@ -5,6 +5,7 @@ using Xunit; using Xunit.Abstractions; using System.IO; +using System.Text.RegularExpressions; using System.Xml.XPath; using System.Xml.Xsl; @@ -335,7 +336,12 @@ namespace System.Xml.Tests StringWriter sw; var e = Assert.ThrowsAny(() => sw = Transform()); - Assert.Contains("Execution of the 'document()' function was prohibited. Use the XsltSettings.EnableDocumentFunction property to enable it.", e.Message); + + // \p{Pi} any kind of opening quote https://www.compart.com/en/unicode/category/Pi + // \p{Pf} any kind of closing quote https://www.compart.com/en/unicode/category/Pf + // \p{Po} any kind of punctuation character that is not a dash, bracket, quote or connector https://www.compart.com/en/unicode/category/Po + Assert.Matches(@"[\p{Pi}\p{Po}]" + Regex.Escape("document()") + @"[\p{Pf}\p{Po}]", e.Message); + Assert.Matches(@"\b" + Regex.Escape("XsltSettings.EnableDocumentFunction") + @"\b", e.Message); } } -} \ No newline at end of file +} diff --git a/external/corefx/src/System.Private.Xml/tests/Xslt/XslTransformApi/CXslTransform.cs.REMOVED.git-id b/external/corefx/src/System.Private.Xml/tests/Xslt/XslTransformApi/CXslTransform.cs.REMOVED.git-id index f08833637c..66784921cd 100644 --- a/external/corefx/src/System.Private.Xml/tests/Xslt/XslTransformApi/CXslTransform.cs.REMOVED.git-id +++ b/external/corefx/src/System.Private.Xml/tests/Xslt/XslTransformApi/CXslTransform.cs.REMOVED.git-id @@ -1 +1 @@ -0a8ecb612ca4fd205780454c01bffd543dcff218 \ No newline at end of file +bf9194ae81885d8eeeaff257ed5da12c5989f938 \ No newline at end of file diff --git a/external/corefx/src/System.Private.Xml/tests/Xslt/XslTransformApi/XSLTransform.cs b/external/corefx/src/System.Private.Xml/tests/Xslt/XslTransformApi/XSLTransform.cs index a75f8ea73c..3ef33bd4fc 100644 --- a/external/corefx/src/System.Private.Xml/tests/Xslt/XslTransformApi/XSLTransform.cs +++ b/external/corefx/src/System.Private.Xml/tests/Xslt/XslTransformApi/XSLTransform.cs @@ -49,7 +49,7 @@ namespace System.Xml.Tests public class XsltApiTestCaseBase : FileCleanupTestBase { private const string XmlResolverDocumentName = "xmlResolver_document_function.xml"; - private static readonly string s_temporaryResolverDocumentFullName = Path.Combine(Path.GetTempPath(), "XslTransformApi", XmlResolverDocumentName); + private static readonly string s_temporaryResolverDocumentFullName = Path.Combine(Path.GetTempPath(), typeof(XsltApiTestCaseBase) + "_" + Path.GetRandomFileName()); private static readonly object s_temporaryResolverDocumentLock = new object(); // Generic data for all derived test cases @@ -57,7 +57,7 @@ namespace System.Xml.Tests public String szDefaultNS = "urn:my-object"; public String szEmpty = ""; - public String szInvalid = "*?%(){}[]&!@#$"; + public String szInvalid = "*?%()\0{}[]&!@#$"; public String szLongString = "ThisIsAVeryLongStringToBeStoredAsAVariableToDetermineHowLargeThisBufferForAVariableNameCanBeAndStillFunctionAsExpected"; public String szLongNS = "http://www.miocrosoft.com/this/is/a/very/long/namespace/uri/to/do/the/api/testing/for/xslt/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/0123456789/"; public String[] szWhiteSpace = { " ", "\n", "\t", "\r", "\t\n \r\t" }; diff --git a/external/corefx/src/System.Reflection.DispatchProxy/ref/Configurations.props b/external/corefx/src/System.Reflection.DispatchProxy/ref/Configurations.props index c398e42e89..637e93f3d7 100644 --- a/external/corefx/src/System.Reflection.DispatchProxy/ref/Configurations.props +++ b/external/corefx/src/System.Reflection.DispatchProxy/ref/Configurations.props @@ -3,6 +3,8 @@ netstandard; + uap10.0.16299; + uap; - \ No newline at end of file + diff --git a/external/corefx/src/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj b/external/corefx/src/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj index ed520e0316..477e983d47 100644 --- a/external/corefx/src/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj +++ b/external/corefx/src/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj @@ -6,8 +6,18 @@ + + + + + + + + + + - \ No newline at end of file + diff --git a/external/corefx/src/System.Reflection.DispatchProxy/src/Configurations.props b/external/corefx/src/System.Reflection.DispatchProxy/src/Configurations.props index 3fbbd69075..b3f3f55017 100644 --- a/external/corefx/src/System.Reflection.DispatchProxy/src/Configurations.props +++ b/external/corefx/src/System.Reflection.DispatchProxy/src/Configurations.props @@ -5,12 +5,14 @@ netfx; netstandard; netcoreapp2.0; - uapaot-Windows_NT; - uap-Windows_NT; + uap10.0.16299-Windows_NT; + uap10.0.16299aot-Windows_NT; $(PackageConfigurations); netcoreapp; + uap-Windows_NT; + uapaot-Windows_NT; diff --git a/external/corefx/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj b/external/corefx/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj index 58e4b88958..04020a4094 100644 --- a/external/corefx/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj +++ b/external/corefx/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj @@ -5,10 +5,10 @@ {1E689C1B-690C-4799-BDE9-6E7990585894} System.Reflection.DispatchProxy true - true + true SR.PlatformNotSupported_ReflectionDispatchProxy - None + None @@ -22,6 +22,10 @@ + + + + @@ -31,7 +35,7 @@ - + diff --git a/external/corefx/src/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.cs b/external/corefx/src/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.cs index 0009996c2a..77213e8ee3 100644 --- a/external/corefx/src/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.cs +++ b/external/corefx/src/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.cs @@ -48,6 +48,7 @@ namespace System.Reflection.Emit public virtual void Emit(System.Reflection.Emit.OpCode opcode, System.Type cls) { } public virtual void EmitCall(System.Reflection.Emit.OpCode opcode, System.Reflection.MethodInfo methodInfo, System.Type[] optionalParameterTypes) { } public virtual void EmitCalli(System.Reflection.Emit.OpCode opcode, System.Reflection.CallingConventions callingConvention, System.Type returnType, System.Type[] parameterTypes, System.Type[] optionalParameterTypes) { } + public virtual void EmitCalli(System.Reflection.Emit.OpCode opcode, System.Runtime.InteropServices.CallingConvention unmanagedCallConv, Type returnType, Type[] parameterTypes) { } public virtual void EmitWriteLine(System.Reflection.Emit.LocalBuilder localBuilder) { } public virtual void EmitWriteLine(System.Reflection.FieldInfo fld) { } public virtual void EmitWriteLine(string value) { } diff --git a/external/corefx/src/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj b/external/corefx/src/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj index 8f4487c380..c500b168be 100644 --- a/external/corefx/src/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj +++ b/external/corefx/src/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj @@ -13,6 +13,7 @@ + diff --git a/external/corefx/src/System.Reflection.Emit.ILGeneration/tests/ILGenerator/Emit4Tests.cs b/external/corefx/src/System.Reflection.Emit.ILGeneration/tests/ILGenerator/Emit4Tests.cs new file mode 100644 index 0000000000..3002a335f9 --- /dev/null +++ b/external/corefx/src/System.Reflection.Emit.ILGeneration/tests/ILGenerator/Emit4Tests.cs @@ -0,0 +1,147 @@ +// 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.Linq; +using System.Runtime.InteropServices; +using Xunit; + +namespace System.Reflection.Emit.Tests +{ + public class ILGeneratorEmit4 + { + [Fact] + public void TestEmitCalliBlittable() + { + int a = 1, b = 1, result = 2; + + ModuleBuilder moduleBuilder = Helpers.DynamicModule(); + TypeBuilder typeBuilder = moduleBuilder.DefineType("T", TypeAttributes.Public); + Type returnType = typeof(int); + + MethodBuilder methodBuilder = typeBuilder.DefineMethod("F", + MethodAttributes.Public | MethodAttributes.Static, returnType, new Type[] { typeof(IntPtr), typeof(int), typeof(int) }); + methodBuilder.SetImplementationFlags(MethodImplAttributes.NoInlining); + + ILGenerator il = methodBuilder.GetILGenerator(); + il.Emit(OpCodes.Ldarg_1); + il.Emit(OpCodes.Ldarg_2); + il.Emit(OpCodes.Ldarg_0); + il.EmitCalli(OpCodes.Calli, CallingConvention.StdCall, returnType, new Type[] { typeof(int), typeof(int) }); + il.Emit(OpCodes.Ret); + + Type dynamicType = typeBuilder.CreateType(); + + var del = new Int32SumStdCall(Int32Sum); + IntPtr funcPtr = Marshal.GetFunctionPointerForDelegate(del); + + object resultValue = dynamicType + .GetMethod("F", BindingFlags.Public | BindingFlags.Static) + .Invoke(null, new object[] { funcPtr, a, b }); + + GC.KeepAlive(del); + + Assert.IsType(returnType, resultValue); + Assert.Equal(result, resultValue); + } + + [Fact] + public void TestDynamicMethodEmitCalliBlittable() + { + int a = 1, b = 1, result = 2; + + Type returnType = typeof(int); + + var dynamicMethod = new DynamicMethod("F", returnType, new Type[] { typeof(IntPtr), typeof(int), typeof(int) }); + + ILGenerator il = dynamicMethod.GetILGenerator(); + il.Emit(OpCodes.Ldarg_1); + il.Emit(OpCodes.Ldarg_2); + il.Emit(OpCodes.Ldarg_0); + il.EmitCalli(OpCodes.Calli, CallingConvention.StdCall, returnType, new Type[] { typeof(int), typeof(int) }); + il.Emit(OpCodes.Ret); + + var del = new Int32SumStdCall(Int32Sum); + IntPtr funcPtr = Marshal.GetFunctionPointerForDelegate(del); + + object resultValue = dynamicMethod + .Invoke(null, new object[] { funcPtr, a, b }); + + GC.KeepAlive(del); + + Assert.IsType(returnType, resultValue); + Assert.Equal(result, resultValue); + } + + [Fact] + public void TestEmitCalliNonBlittable() + { + string input = "Test string!", result = "!gnirts tseT"; + + ModuleBuilder moduleBuilder = Helpers.DynamicModule(); + TypeBuilder typeBuilder = moduleBuilder.DefineType("T", TypeAttributes.Public); + Type returnType = typeof(string); + + MethodBuilder methodBuilder = typeBuilder.DefineMethod("F", + MethodAttributes.Public | MethodAttributes.Static, returnType, new Type[] { typeof(IntPtr), typeof(string) }); + methodBuilder.SetImplementationFlags(MethodImplAttributes.NoInlining); + + ILGenerator il = methodBuilder.GetILGenerator(); + il.Emit(OpCodes.Ldarg_1); + il.Emit(OpCodes.Ldarg_0); + il.EmitCalli(OpCodes.Calli, CallingConvention.Cdecl, returnType, new Type[] { typeof(string) }); + il.Emit(OpCodes.Ret); + + Type dynamicType = typeBuilder.CreateType(); + + var del = new StringReverseCdecl(StringReverse); + IntPtr funcPtr = Marshal.GetFunctionPointerForDelegate(del); + + object resultValue = dynamicType + .GetMethod("F", BindingFlags.Public | BindingFlags.Static) + .Invoke(null, new object[] { funcPtr, input }); + + GC.KeepAlive(del); + + Assert.IsType(returnType, resultValue); + Assert.Equal(result, resultValue); + } + + [Fact] + public void TestDynamicMethodEmitCalliNonBlittable() + { + string input = "Test string!", result = "!gnirts tseT"; + + Type returnType = typeof(string); + + var dynamicMethod = new DynamicMethod("F", returnType, new Type[] { typeof(IntPtr), typeof(string) }); + + ILGenerator il = dynamicMethod.GetILGenerator(); + il.Emit(OpCodes.Ldarg_1); + il.Emit(OpCodes.Ldarg_0); + il.EmitCalli(OpCodes.Calli, CallingConvention.Cdecl, returnType, new Type[] { typeof(string) }); + il.Emit(OpCodes.Ret); + + var del = new StringReverseCdecl(StringReverse); + IntPtr funcPtr = Marshal.GetFunctionPointerForDelegate(del); + + object resultValue = dynamicMethod + .Invoke(null, new object[] { funcPtr, input }); + + GC.KeepAlive(del); + + Assert.IsType(returnType, resultValue); + Assert.Equal(result, resultValue); + } + + [UnmanagedFunctionPointer(CallingConvention.StdCall)] + private delegate int Int32SumStdCall(int a, int b); + + [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + private delegate string StringReverseCdecl(string a); + + private static int Int32Sum(int a, int b) => a + b; + + private static string StringReverse(string a) => string.Join("", a.Reverse()); + } +} diff --git a/external/corefx/src/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.csproj b/external/corefx/src/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.csproj index 55be259a78..f4da5f470a 100644 --- a/external/corefx/src/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.csproj +++ b/external/corefx/src/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.csproj @@ -12,6 +12,7 @@ + diff --git a/external/corefx/src/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj b/external/corefx/src/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj index d80cfdefce..e73c04ec8b 100644 --- a/external/corefx/src/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj +++ b/external/corefx/src/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj @@ -1,18 +1,10 @@  - - - 2.8.6 - net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks) - - portable-net45+win8 - 1.1.37 - false - SR.PlatformNotSupported_Caching + SR.PlatformNotSupported_Caching + + + + - + @@ -59,6 +63,10 @@ + + + + Common\Interop\Windows\kernel32\Interop.GlobalMemoryStatusEx.cs @@ -69,6 +77,9 @@ Common\Interop\Windows\Interop.Libraries.cs + + + @@ -90,6 +101,7 @@ + diff --git a/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/Configuration/CachingSectionGroup.cs b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/Configuration/CachingSectionGroup.cs index e9a6219214..c18f96a83d 100644 --- a/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/Configuration/CachingSectionGroup.cs +++ b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/Configuration/CachingSectionGroup.cs @@ -7,7 +7,7 @@ using System.Configuration; namespace System.Runtime.Caching.Configuration { - public sealed class CachingSectionGroup : ConfigurationSectionGroup + internal sealed class CachingSectionGroup : ConfigurationSectionGroup { public CachingSectionGroup() { diff --git a/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/Configuration/MemoryCacheElement.cs b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/Configuration/MemoryCacheElement.cs index cba10e3936..c0e1997c24 100644 --- a/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/Configuration/MemoryCacheElement.cs +++ b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/Configuration/MemoryCacheElement.cs @@ -8,7 +8,7 @@ using System.Configuration; namespace System.Runtime.Caching.Configuration { - public sealed class MemoryCacheElement : ConfigurationElement + internal sealed class MemoryCacheElement : ConfigurationElement { private static ConfigurationPropertyCollection s_properties; private static readonly ConfigurationProperty s_propName; diff --git a/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/Configuration/MemoryCacheSection.cs b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/Configuration/MemoryCacheSection.cs index 06afa86dd9..20b8cc60cb 100644 --- a/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/Configuration/MemoryCacheSection.cs +++ b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/Configuration/MemoryCacheSection.cs @@ -21,7 +21,7 @@ namespace System.Runtime.Caching.Configuration */ - public sealed class MemoryCacheSection : ConfigurationSection + internal sealed class MemoryCacheSection : ConfigurationSection { private static ConfigurationPropertyCollection s_properties; private static readonly ConfigurationProperty s_propNamedCaches; diff --git a/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/Configuration/MemoryCacheSettingsCollection.cs b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/Configuration/MemoryCacheSettingsCollection.cs index f35e5625f4..ba976621c6 100644 --- a/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/Configuration/MemoryCacheSettingsCollection.cs +++ b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/Configuration/MemoryCacheSettingsCollection.cs @@ -9,7 +9,7 @@ namespace System.Runtime.Caching.Configuration { [ConfigurationCollection(typeof(MemoryCacheElement), CollectionType = ConfigurationElementCollectionType.AddRemoveClearMap)] - public sealed class MemoryCacheSettingsCollection : ConfigurationElementCollection + internal sealed class MemoryCacheSettingsCollection : ConfigurationElementCollection { private static ConfigurationPropertyCollection s_properties; diff --git a/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/Dbg.cs b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/Dbg.cs index c2b638de06..865d59fb23 100644 --- a/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/Dbg.cs +++ b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/Dbg.cs @@ -413,29 +413,35 @@ namespace System.Runtime.Caching } private static void MonitorRegistryForOneChange() { - // Close the open reg handle - if (s_regHandle != null) { - s_regHandle.Close(); - s_regHandle = null; - } + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + // Close the open reg handle + if (s_regHandle != null) + { + s_regHandle.Close(); + s_regHandle = null; + } - // Open the reg key - int result = NativeMethods.RegOpenKeyEx(NativeMethods.HKEY_LOCAL_MACHINE, s_listenKeyName, 0, NativeMethods.KEY_READ, out s_regHandle); - if (result != 0) { - StopRegistryMonitor(); - return; - } + // Open the reg key + int result = NativeMethods.RegOpenKeyEx(NativeMethods.HKEY_LOCAL_MACHINE, s_listenKeyName, 0, NativeMethods.KEY_READ, out s_regHandle); + if (result != 0) + { + StopRegistryMonitor(); + return; + } - // Listen for changes. - result = NativeMethods.RegNotifyChangeKeyValue( - s_regHandle, - true, - NativeMethods.REG_NOTIFY_CHANGE_NAME | NativeMethods.REG_NOTIFY_CHANGE_LAST_SET, - s_notifyEvent.SafeWaitHandle, - true); + // Listen for changes. + result = NativeMethods.RegNotifyChangeKeyValue( + s_regHandle, + true, + NativeMethods.REG_NOTIFY_CHANGE_NAME | NativeMethods.REG_NOTIFY_CHANGE_LAST_SET, + s_notifyEvent.SafeWaitHandle, + true); - if (result != 0) { - StopRegistryMonitor(); + if (result != 0) + { + StopRegistryMonitor(); + } } } @@ -523,8 +529,11 @@ namespace System.Runtime.Caching } else { if (s_includeThreadPrefix) { - idThread = NativeMethods.GetCurrentThreadId(); - idProcess = NativeMethods.GetCurrentProcessId(); + idThread = Thread.CurrentThread.ManagedThreadId; + using(var process = Process.GetCurrentProcess()) + { + idProcess = process.Id; + } traceFormat = "[0x{0:x}.{1:x} {2} {3}] {4}\n{5}"; } else { @@ -610,6 +619,11 @@ Stack trace: A=Exit process R=Debug I=Continue"; } + int idProcess = 0; + using (var process = Process.GetCurrentProcess()) + { + idProcess = process.Id; + } string dialogMessage = string.Format( CultureInfo.InvariantCulture, @@ -617,35 +631,9 @@ A=Exit process R=Debug I=Continue"; message, fileName, lineNumber, COMPONENT, - NativeMethods.GetCurrentProcessId(), NativeMethods.GetCurrentThreadId(), + idProcess, Thread.CurrentThread.ManagedThreadId, trace.ToString()); - //MBResult mbResult = new MBResult(); - - //Thread thread = new Thread( - // delegate() { - // for (int i = 0; i < 100; i++) { - // NativeMethods.MSG msg = new NativeMethods.MSG(); - // NativeMethods.PeekMessage(ref msg, new HandleRef(mbResult, IntPtr.Zero), 0, 0, NativeMethods.PM_REMOVE); - // } - - // mbResult.Result = NativeMethods.MessageBox(new HandleRef(mbResult, IntPtr.Zero), dialogMessage, PRODUCT + " Assertion", - // NativeMethods.MB_SERVICE_NOTIFICATION | - // NativeMethods.MB_TOPMOST | - // NativeMethods.MB_ABORTRETRYIGNORE | - // NativeMethods.MB_ICONEXCLAMATION); - // } - //); - - //thread.Start(); - //thread.Join(); - - //if (mbResult.Result == NativeMethods.IDABORT) { - // IntPtr currentProcess = NativeMethods.GetCurrentProcess(); - // NativeMethods.TerminateProcess(new HandleRef(mbResult, currentProcess), 1); - //} - - //return mbResult.Result == NativeMethods.IDRETRY; Debug.Fail(dialogMessage); return true; } @@ -826,13 +814,16 @@ A=Exit process R=Debug I=Continue"; internal static void Break() { #if DEBUG - if (NativeMethods.IsDebuggerPresent()) { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && NativeMethods.IsDebuggerPresent()) + { NativeMethods.DebugBreak(); } - else if (!Debugger.IsAttached) { + else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && !Debugger.IsAttached) + { Debugger.Launch(); } - else { + else + { Debugger.Break(); } #endif diff --git a/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/MemoryCacheStatistics.cs b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/MemoryCacheStatistics.cs index 7b1430dbdb..f0dd69f1da 100644 --- a/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/MemoryCacheStatistics.cs +++ b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/MemoryCacheStatistics.cs @@ -147,6 +147,10 @@ namespace System.Runtime.Caching _configCacheMemoryLimitMegabytes = ConfigUtil.GetIntValue(config, ConfigUtil.CacheMemoryLimitMegabytes, _configCacheMemoryLimitMegabytes, true, Int32.MaxValue); _configPhysicalMemoryLimitPercentage = ConfigUtil.GetIntValue(config, ConfigUtil.PhysicalMemoryLimitPercentage, _configPhysicalMemoryLimitPercentage, true, 100); } + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && _configPhysicalMemoryLimitPercentage > 0) + { + throw new PlatformNotSupportedException(SR.PlatformNotSupported_PhysicalMemoryLimitPercentage); + } } private void InitDisposableMembers() diff --git a/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/MemoryMonitor.Windows.cs b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/MemoryMonitor.Windows.cs new file mode 100644 index 0000000000..d48820639a --- /dev/null +++ b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/MemoryMonitor.Windows.cs @@ -0,0 +1,26 @@ +// 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; +using System.Collections.Specialized; +using System.Security; +using System.Runtime.InteropServices; + + +namespace System.Runtime.Caching +{ + internal abstract partial class MemoryMonitor + { + static MemoryMonitor() + { + Interop.Kernel32.MEMORYSTATUSEX memoryStatusEx = default; + memoryStatusEx.dwLength = (uint)Marshal.SizeOf(); + if (Interop.Kernel32.GlobalMemoryStatusEx(out memoryStatusEx) != 0) + { + s_totalPhysical = (long)memoryStatusEx.ullTotalPhys; + s_totalVirtual = (long)memoryStatusEx.ullTotalVirtual; + } + } + } +} diff --git a/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/MemoryMonitor.cs b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/MemoryMonitor.cs index 7318621c1f..37294bba91 100644 --- a/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/MemoryMonitor.cs +++ b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/MemoryMonitor.cs @@ -16,7 +16,7 @@ namespace System.Runtime.Caching // drop cache entries to avoid paging. The second monitors the amount of memory used by // the cache itself, and helps determine when we should drop cache entries to avoid // exceeding the cache's memory limit. Both are configurable (see ConfigUtil.cs). - internal abstract class MemoryMonitor + internal abstract partial class MemoryMonitor { protected const int TERABYTE_SHIFT = 40; protected const long TERABYTE = 1L << TERABYTE_SHIFT; @@ -39,22 +39,11 @@ namespace System.Runtime.Caching protected int[] _pressureHist; protected int _pressureTotal; - private static long s_totalPhysical; - private static long s_totalVirtual; + private static long s_totalPhysical = 0; + private static long s_totalVirtual = 0; - static MemoryMonitor() - { - Interop.Kernel32.MEMORYSTATUSEX memoryStatusEx; - memoryStatusEx.dwLength = (uint)Marshal.SizeOf(typeof(Interop.Kernel32.MEMORYSTATUSEX)); - if (Interop.Kernel32.GlobalMemoryStatusEx(out memoryStatusEx) != 0) - { - s_totalPhysical = (long)memoryStatusEx.ullTotalPhys; - s_totalVirtual = (long)memoryStatusEx.ullTotalVirtual; - } - } - - internal static long TotalPhysical { get { return s_totalPhysical; } } - internal static long TotalVirtual { get { return s_totalVirtual; } } + internal static long TotalPhysical => s_totalPhysical; + internal static long TotalVirtual => s_totalVirtual; internal int PressureLast { get { return _pressureHist[_i0]; } } internal int PressureHigh { get { return _pressureHigh; } } diff --git a/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/PhysicalMemoryMonitor.Unix.cs b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/PhysicalMemoryMonitor.Unix.cs new file mode 100644 index 0000000000..1a5860c06c --- /dev/null +++ b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/PhysicalMemoryMonitor.Unix.cs @@ -0,0 +1,16 @@ +// 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; + +namespace System.Runtime.Caching +{ + internal sealed partial class PhysicalMemoryMonitor : MemoryMonitor + { + protected override int GetCurrentPressure() + { + return 0; + } + } +} diff --git a/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/PhysicalMemoryMonitor.Windows.cs b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/PhysicalMemoryMonitor.Windows.cs new file mode 100644 index 0000000000..43949df1db --- /dev/null +++ b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/PhysicalMemoryMonitor.Windows.cs @@ -0,0 +1,27 @@ +// 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; +using System.Runtime.Caching.Configuration; +using System.Runtime.InteropServices; +using System.Security; + +namespace System.Runtime.Caching +{ + internal sealed partial class PhysicalMemoryMonitor : MemoryMonitor + { + protected override int GetCurrentPressure() + { + Interop.Kernel32.MEMORYSTATUSEX memoryStatusEx = default; + memoryStatusEx.dwLength = (uint)Marshal.SizeOf(); + if (Interop.Kernel32.GlobalMemoryStatusEx(out memoryStatusEx) == 0) + { + return 0; + } + + int memoryLoad = (int)memoryStatusEx.dwMemoryLoad; + return memoryLoad; + } + } +} diff --git a/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/PhysicalMemoryMonitor.cs b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/PhysicalMemoryMonitor.cs index 0029db1f72..c3cb2f4d3a 100644 --- a/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/PhysicalMemoryMonitor.cs +++ b/external/corefx/src/System.Runtime.Caching/src/System/Runtime/Caching/PhysicalMemoryMonitor.cs @@ -12,7 +12,7 @@ namespace System.Runtime.Caching // PhysicalMemoryMonitor monitors the amound of physical memory used on the machine // and helps us determine when to drop entries to avoid paging and GC thrashing. // The limit is configurable (see ConfigUtil.cs). - internal sealed class PhysicalMemoryMonitor : MemoryMonitor + internal sealed partial class PhysicalMemoryMonitor : MemoryMonitor { private const int MIN_TOTAL_MEMORY_TRIM_PERCENT = 10; private static readonly long s_TARGET_TOTAL_MEMORY_TRIM_INTERVAL_TICKS = 5 * TimeSpan.TicksPerMinute; @@ -48,7 +48,6 @@ namespace System.Runtime.Caching */ long memory = TotalPhysical; - Dbg.Assert(memory != 0, "memory != 0"); if (memory >= 0x100000000) { _pressureHigh = 99; @@ -76,19 +75,6 @@ namespace System.Runtime.Caching InitHistory(); } - protected override int GetCurrentPressure() - { - Interop.Kernel32.MEMORYSTATUSEX memoryStatusEx = default; - memoryStatusEx.dwLength = (uint)Marshal.SizeOf(typeof(Interop.Kernel32.MEMORYSTATUSEX)); - if (Interop.Kernel32.GlobalMemoryStatusEx(out memoryStatusEx) == 0) - { - return 0; - } - - int memoryLoad = (int)memoryStatusEx.dwMemoryLoad; - return memoryLoad; - } - internal override int GetPercentToTrim(DateTime lastTrimTime, int lastTrimPercent) { int percent = 0; diff --git a/external/corefx/src/System.Runtime.Caching/tests/System.Runtime.Caching/MemoryCacheTest.cs b/external/corefx/src/System.Runtime.Caching/tests/System.Runtime.Caching/MemoryCacheTest.cs index 1e6d59bc18..bb3d941280 100644 --- a/external/corefx/src/System.Runtime.Caching/tests/System.Runtime.Caching/MemoryCacheTest.cs +++ b/external/corefx/src/System.Runtime.Caching/tests/System.Runtime.Caching/MemoryCacheTest.cs @@ -33,6 +33,7 @@ using System.Collections; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Collections.Specialized; +using System.Diagnostics; using System.Runtime.Caching; using System.Threading; using System.Threading.Tasks; @@ -143,6 +144,18 @@ namespace MonoTests.System.Runtime.Caching mc = new MemoryCache("MyCache", config); } + [Fact] + [PlatformSpecific(TestPlatforms.AnyUnix)] // Negative case for "physicalMemoryLimitPercentage" on non Windows + public void PhysicalMemoryLimitNotSupported() + { + var config = new NameValueCollection(); + config.Add("PhysicalMemoryLimitPercentage", "99"); + Assert.Throws(() => + { + new MemoryCache("MyCache", config); + }); + } + [Fact] public void Defaults() { @@ -176,6 +189,7 @@ namespace MonoTests.System.Runtime.Caching } [Fact] + [PlatformSpecific(TestPlatforms.Windows)] // Uses "physicalMemoryLimitPercentage" not supported on other platforms public void ConstructorValues() { var config = new NameValueCollection(); @@ -991,6 +1005,7 @@ namespace MonoTests.System.Runtime.Caching } [Fact] + [PlatformSpecific(TestPlatforms.Windows)] // Uses "physicalMemoryLimitPercentage" not supported on other platforms public void TestExpiredGetValues() { var config = new NameValueCollection(); @@ -1024,6 +1039,8 @@ namespace MonoTests.System.Runtime.Caching } [Fact] + [PlatformSpecific(TestPlatforms.Windows)] // Uses "physicalMemoryLimitPercentage" not supported on other platforms + [OuterLoop] // makes long wait public void TestCacheSliding() { var config = new NameValueCollection(); @@ -1039,7 +1056,8 @@ namespace MonoTests.System.Runtime.Caching // The sliding expiration timeout has to be greater than 1 second because // .NET implementation ignores timeouts updates smaller than // CacheExpires.MIN_UPDATE_DELTA which is equal to 1. - cip.SlidingExpiration = TimeSpan.FromSeconds(2); + const int SlidingExpirationThresholdMSec = 4000; + cip.SlidingExpiration = TimeSpan.FromMilliseconds(SlidingExpirationThresholdMSec); mc.Add("slidingtest", "42", cip); mc.Add("expire1", "1", cip); @@ -1049,13 +1067,28 @@ namespace MonoTests.System.Runtime.Caching mc.Add("expire5", "5", cip); Assert.Equal(6, mc.GetCount()); - + // The loop below would sleep for ~5 seconds total (in 50 intervals). + // Each of these intervals is only supposed to be ~100ms. + // However due to concurrency with other tests and various system conditions, + // we observe occasional delays that are much longer than the SlidingExpirationThresholdMSec + // expiration period which causes the "slidingtest" cache item to expire + Stopwatch sw = new Stopwatch(); for (int i = 0; i < 50; i++) { + sw.Restart(); Thread.Sleep(100); - var item = mc.Get("slidingtest"); - Assert.NotEqual(null, item); + sw.Stop(); + + if (sw.ElapsedMilliseconds < SlidingExpirationThresholdMSec) + { + Assert.NotEqual(null, item); + } + else + { + // for the sake of simplicity skip an inversed assert here (Assert.Equal(null, item)) + // (to avoid further complicating the test as we would need to address a few more subtle timing cases) + } } Assert.Null(mc.Get("expire1")); @@ -1065,7 +1098,7 @@ namespace MonoTests.System.Runtime.Caching Assert.Null(mc.Get("expire5")); Assert.Equal(1, mc.GetCount()); - Thread.Sleep(3000); + Thread.Sleep(SlidingExpirationThresholdMSec + 1000); Assert.Null(mc.Get("slidingtest")); Assert.Equal(0, mc.GetCount()); @@ -1314,6 +1347,7 @@ namespace MonoTests.System.Runtime.Caching public class MemoryCacheTestExpires4 { [Fact] + [PlatformSpecific(TestPlatforms.Windows)] // Uses "physicalMemoryLimitPercentage" not supported on other platforms public async Task TestCacheShrink() { const int HEAP_RESIZE_THRESHOLD = 8192 + 2; @@ -1371,6 +1405,7 @@ namespace MonoTests.System.Runtime.Caching public class MemoryCacheTestExpires5 { [Fact] + [PlatformSpecific(TestPlatforms.Windows)] // Uses "physicalMemoryLimitPercentage" not supported on other platforms public async Task TestCacheExpiryOrdering() { var config = new NameValueCollection(); diff --git a/external/corefx/src/System.Runtime.CompilerServices.Unsafe/dir.props b/external/corefx/src/System.Runtime.CompilerServices.Unsafe/dir.props index 0d81e0a9e8..41debf92d3 100644 --- a/external/corefx/src/System.Runtime.CompilerServices.Unsafe/dir.props +++ b/external/corefx/src/System.Runtime.CompilerServices.Unsafe/dir.props @@ -4,5 +4,6 @@ 4.0.4.0 MSFT + true \ No newline at end of file diff --git a/external/corefx/src/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj b/external/corefx/src/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj index d73c618a40..55ce5a7bb6 100644 --- a/external/corefx/src/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj +++ b/external/corefx/src/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj @@ -7,6 +7,11 @@ net45;netcore45;wp8;wpa81;netcoreapp1.0;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/external/corefx/src/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.cs b/external/corefx/src/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.cs index fe7fcc03c0..411b25efd2 100644 --- a/external/corefx/src/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.cs +++ b/external/corefx/src/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.cs @@ -30,6 +30,8 @@ namespace System.Runtime.CompilerServices public unsafe static void InitBlock(void* startAddress, byte value, uint byteCount) { } public static void InitBlockUnaligned(ref byte startAddress, byte value, uint byteCount) { } public unsafe static void InitBlockUnaligned(void* startAddress, byte value, uint byteCount) { } + public static bool IsAddressGreaterThan(ref T left, ref T right) { throw null; } + public static bool IsAddressLessThan(ref T left, ref T right) { throw null; } public unsafe static T Read(void* source) { throw null; } public unsafe static T ReadUnaligned(void* source) { throw null; } public static T ReadUnaligned(ref byte source) { throw null; } diff --git a/external/corefx/src/System.Runtime.CompilerServices.Unsafe/src/Configurations.props b/external/corefx/src/System.Runtime.CompilerServices.Unsafe/src/Configurations.props index d13cce3482..2a68e751ff 100644 --- a/external/corefx/src/System.Runtime.CompilerServices.Unsafe/src/Configurations.props +++ b/external/corefx/src/System.Runtime.CompilerServices.Unsafe/src/Configurations.props @@ -1,9 +1,14 @@  - + + netcoreapp2.0; netstandard1.0; netstandard; - + + + $(PackageConfigurations); + netcoreapp + diff --git a/external/corefx/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il b/external/corefx/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il index 07c61f177d..891f9ac201 100644 --- a/external/corefx/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il +++ b/external/corefx/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il @@ -419,6 +419,26 @@ ret } // end of method Unsafe::AreSame + .method public hidebysig static bool IsAddressGreaterThan(!!T& left, !!T& right) cil managed aggressiveinlining + { + .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) + .maxstack 2 + ldarg.0 + ldarg.1 + cgt.un + ret + } // end of method Unsafe::IsAddressGreaterThan + + .method public hidebysig static bool IsAddressLessThan(!!T& left, !!T& right) cil managed aggressiveinlining + { + .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) + .maxstack 2 + ldarg.0 + ldarg.1 + clt.un + ret + } // end of method Unsafe::IsAddressLessThan + } // end of class System.Runtime.CompilerServices.Unsafe .class private auto ansi sealed beforefieldinit System.Runtime.Versioning.NonVersionableAttribute diff --git a/external/corefx/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj b/external/corefx/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj index 2a61d0a70f..4b95956155 100644 --- a/external/corefx/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj +++ b/external/corefx/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj @@ -4,12 +4,16 @@ $(MSBuildThisFileDirectory)System.Runtime.CompilerServices.Unsafe.xml {04BA3E3C-6979-4792-B19E-C797AD607F42} - $(IlasmFlags) -INCLUDE=include\$(TargetGroup) + include\$(TargetGroup) + include\netcoreapp + $(IlasmFlags) -INCLUDE=$(IncludePath) + + diff --git a/external/corefx/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.xml b/external/corefx/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.xml index 8c24ae6194..bb4911a411 100644 --- a/external/corefx/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.xml +++ b/external/corefx/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.xml @@ -201,6 +201,30 @@ The second reference to compare. true if and point to the same location; otherwise false. + + + Determines whether the memory address referenced by is greater than the memory address referenced by . + + The first reference to compare. + The second reference to compare. + true if the memory address referenced by is greater than the memory address referenced by ; otherwise false. + + This check is conceptually similar to "(void*)(&left) > (void*)(&right)". Both parameters must reference the same object, array, or span; + or the objects being referenced must both be pinned; or both references must represent unmanaged pointers; otherwise the result is undefined. + + + + + Determines whether the memory address referenced by is less than the memory address referenced by . + + The first reference to compare. + The second reference to compare. + true if the memory address referenced by is less than the memory address referenced by ; otherwise false. + + This check is conceptually similar to "(void*)(&left) < (void*)(&right)". Both parameters must reference the same object, array, or span; + or the objects being referenced must both be pinned; or both references must represent unmanaged pointers; otherwise the result is undefined. + + Copies bytes from the source address to the destination address. diff --git a/external/corefx/src/System.Runtime.CompilerServices.Unsafe/tests/UnsafeTests.cs b/external/corefx/src/System.Runtime.CompilerServices.Unsafe/tests/UnsafeTests.cs index fce1ae27d3..508358d907 100644 --- a/external/corefx/src/System.Runtime.CompilerServices.Unsafe/tests/UnsafeTests.cs +++ b/external/corefx/src/System.Runtime.CompilerServices.Unsafe/tests/UnsafeTests.cs @@ -608,6 +608,44 @@ namespace System.Runtime.CompilerServices Assert.False(Unsafe.AreSame(ref a[0], ref a[1])); } + [Fact] + public static unsafe void RefIsAddressGreaterThan() + { + int[] a = new int[2]; + + Assert.False(Unsafe.IsAddressGreaterThan(ref a[0], ref a[0])); + Assert.False(Unsafe.IsAddressGreaterThan(ref a[0], ref a[1])); + Assert.True(Unsafe.IsAddressGreaterThan(ref a[1], ref a[0])); + Assert.False(Unsafe.IsAddressGreaterThan(ref a[1], ref a[1])); + + // The following tests ensure that we're using unsigned comparison logic + + Assert.False(Unsafe.IsAddressGreaterThan(ref Unsafe.AsRef((void*)(1)), ref Unsafe.AsRef((void*)(-1)))); + Assert.True(Unsafe.IsAddressGreaterThan(ref Unsafe.AsRef((void*)(-1)), ref Unsafe.AsRef((void*)(1)))); + Assert.True(Unsafe.IsAddressGreaterThan(ref Unsafe.AsRef((void*)(Int32.MinValue)), ref Unsafe.AsRef((void*)(Int32.MaxValue)))); + Assert.False(Unsafe.IsAddressGreaterThan(ref Unsafe.AsRef((void*)(Int32.MaxValue)), ref Unsafe.AsRef((void*)(Int32.MinValue)))); + Assert.False(Unsafe.IsAddressGreaterThan(ref Unsafe.AsRef(null), ref Unsafe.AsRef(null))); + } + + [Fact] + public static unsafe void RefIsAddressLessThan() + { + int[] a = new int[2]; + + Assert.False(Unsafe.IsAddressLessThan(ref a[0], ref a[0])); + Assert.True(Unsafe.IsAddressLessThan(ref a[0], ref a[1])); + Assert.False(Unsafe.IsAddressLessThan(ref a[1], ref a[0])); + Assert.False(Unsafe.IsAddressLessThan(ref a[1], ref a[1])); + + // The following tests ensure that we're using unsigned comparison logic + + Assert.True(Unsafe.IsAddressLessThan(ref Unsafe.AsRef((void*)(1)), ref Unsafe.AsRef((void*)(-1)))); + Assert.False(Unsafe.IsAddressLessThan(ref Unsafe.AsRef((void*)(-1)), ref Unsafe.AsRef((void*)(1)))); + Assert.False(Unsafe.IsAddressLessThan(ref Unsafe.AsRef((void*)(Int32.MinValue)), ref Unsafe.AsRef((void*)(Int32.MaxValue)))); + Assert.True(Unsafe.IsAddressLessThan(ref Unsafe.AsRef((void*)(Int32.MaxValue)), ref Unsafe.AsRef((void*)(Int32.MinValue)))); + Assert.False(Unsafe.IsAddressLessThan(ref Unsafe.AsRef(null), ref Unsafe.AsRef(null))); + } + [Fact] public static unsafe void ReadUnaligned_ByRef_Int32() { diff --git a/external/corefx/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.cs.REMOVED.git-id b/external/corefx/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.cs.REMOVED.git-id index 45a985388b..34e23f30af 100644 --- a/external/corefx/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.cs.REMOVED.git-id +++ b/external/corefx/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.cs.REMOVED.git-id @@ -1 +1 @@ -c21a0bca889034baada9df6932fe27eb643fa041 \ No newline at end of file +81162f9ce83699ae7b9fb79cd3a7ba9315d8b080 \ No newline at end of file diff --git a/external/corefx/src/System.Runtime.Extensions/src/ApiCompatBaseline.uapaot.txt b/external/corefx/src/System.Runtime.Extensions/src/ApiCompatBaseline.uapaot.txt new file mode 100644 index 0000000000..03ef2c671a --- /dev/null +++ b/external/corefx/src/System.Runtime.Extensions/src/ApiCompatBaseline.uapaot.txt @@ -0,0 +1,5 @@ +TypesMustExist : Type 'System.Globalization.GlobalizationExtensions' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.IO.Path.Join(System.ReadOnlySpan, System.ReadOnlySpan)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.IO.Path.Join(System.ReadOnlySpan, System.ReadOnlySpan, System.ReadOnlySpan)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.IO.Path.TryJoin(System.ReadOnlySpan, System.ReadOnlySpan, System.ReadOnlySpan, System.Span, System.Int32)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.IO.Path.TryJoin(System.ReadOnlySpan, System.ReadOnlySpan, System.Span, System.Int32)' does not exist in the implementation but it does exist in the contract. \ No newline at end of file diff --git a/external/corefx/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj b/external/corefx/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj index 7e5768f0ba..d554ea754a 100644 --- a/external/corefx/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj +++ b/external/corefx/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj @@ -9,6 +9,8 @@ true true $(DefineConstants);uapaot + true + true @@ -19,6 +21,9 @@ + + Common\System\PasteArguments.cs + @@ -29,7 +34,6 @@ - @@ -72,15 +76,18 @@ Common\System\Collections\Generic\LowLevelDictionary.cs - - Common\System\IO\StringBuilderCache.cs - - - Common\System\IO\PathInternal.cs + + Common\System\Text\StringBuilderCache.cs Common\System\HResults.cs + + CoreLib\System\Text\ValueStringBuilder.cs + + + Common\System\Collections\HashHelpers.cs + @@ -96,11 +103,14 @@ + + Common\System\PasteArguments.Windows.cs + - - Common\System\IO\Win32Marshal.cs + + Common\CoreLib\System\IO\Win32Marshal.cs Common\Interop\Windows\Interop.Libraries.cs @@ -108,6 +118,9 @@ Common\Interop\Windows\Interop.Errors.cs + + Common\Interop\Windows\Interop.BOOLEAN.cs + Common\Interop\Windows\advapi32\Interop.LookupAccountNameW.cs @@ -132,9 +145,6 @@ Common\Interop\Windows\Interop.GetLogicalDrive.cs - - Common\Interop\Windows\kernel32\Interop.GetLongPathName.cs - Common\Interop\Windows\kernel32\Interop.GetSystemDirectoryW.cs @@ -165,8 +175,20 @@ Common\System\IO\DriveInfoInternal.Win32.cs - - Common\System\IO\PathInternal.Windows.cs + + CoreLib\System\IO\PathHelper.Windows.cs + + + CoreLib\System\IO\PathInternal.cs + + + CoreLib\System\IO\PathInternal.Windows.cs + + + CoreLib\Interop\Windows\Kernel32\Interop.GetLongPathNameW.cs + + + CoreLib\Interop\Windows\Kernel32\Interop.GetFullPathNameW.cs @@ -234,15 +256,15 @@ Common\System\IO\DriveInfoInternal.Unix.cs - - Common\System\IO\PathInternal.Unix.cs - Common\System\IO\PersistedFiles.Unix.cs Common\System\IO\PersistedFiles.Unix.cs + + Common\System\PasteArguments.Unix.cs + @@ -261,4 +283,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/System.Runtime.Extensions/src/System/Collections/Hashtable.cs b/external/corefx/src/System.Runtime.Extensions/src/System/Collections/Hashtable.cs index 7449e90345..e3b8ed8a5b 100644 --- a/external/corefx/src/System.Runtime.Extensions/src/System/Collections/Hashtable.cs +++ b/external/corefx/src/System.Runtime.Extensions/src/System/Collections/Hashtable.cs @@ -156,6 +156,9 @@ namespace System.Collections private IEqualityComparer _keycomparer; private Object _syncRoot; + private static ConditionalWeakTable s_serializationInfoTable; + private static ConditionalWeakTable SerializationInfoTable => LazyInitializer.EnsureInitialized(ref s_serializationInfoTable); + [Obsolete("Please use EqualityComparer property.")] protected IHashCodeProvider hcp { @@ -383,7 +386,7 @@ namespace System.Collections //We can't do anything with the keys and values until the entire graph has been deserialized //and we have a reasonable estimate that GetHashCode is not going to fail. For the time being, //we'll just cache this. The graph is not valid until OnDeserialization has been called. - HashHelpers.SerializationInfoTable.Add(this, info); + SerializationInfoTable.Add(this, info); } // ?InitHash? is basically an implementation of classic DoubleHashing (see http://en.wikipedia.org/wiki/Double_hashing) @@ -1175,7 +1178,7 @@ namespace System.Collections } SerializationInfo siInfo; - HashHelpers.SerializationInfoTable.TryGetValue(this, out siInfo); + SerializationInfoTable.TryGetValue(this, out siInfo); if (siInfo == null) { @@ -1257,7 +1260,7 @@ namespace System.Collections _version = siInfo.GetInt32(VersionName); - HashHelpers.SerializationInfoTable.Remove(this); + SerializationInfoTable.Remove(this); } // Implements a Collection for the keys of a hashtable. An instance of this @@ -1647,84 +1650,4 @@ namespace System.Collections } } } - - internal static class HashHelpers - { - // Table of prime numbers to use as hash table sizes. - // A typical resize algorithm would pick the smallest prime number in this array - // that is larger than twice the previous capacity. - // Suppose our Hashtable currently has capacity x and enough elements are added - // such that a resize needs to occur. Resizing first computes 2x then finds the - // first prime in the table greater than 2x, i.e. if primes are ordered - // p_1, p_2, ..., p_i, ..., it finds p_n such that p_n-1 < 2x < p_n. - // Doubling is important for preserving the asymptotic complexity of the - // hashtable operations such as add. Having a prime guarantees that double - // hashing does not lead to infinite loops. IE, your hash function will be - // h1(key) + i*h2(key), 0 <= i < size. h2 and the size must be relatively prime. - public static readonly int[] primes = { - 3, 7, 11, 17, 23, 29, 37, 47, 59, 71, 89, 107, 131, 163, 197, 239, 293, 353, 431, 521, 631, 761, 919, - 1103, 1327, 1597, 1931, 2333, 2801, 3371, 4049, 4861, 5839, 7013, 8419, 10103, 12143, 14591, - 17519, 21023, 25229, 30293, 36353, 43627, 52361, 62851, 75431, 90523, 108631, 130363, 156437, - 187751, 225307, 270371, 324449, 389357, 467237, 560689, 672827, 807403, 968897, 1162687, 1395263, - 1674319, 2009191, 2411033, 2893249, 3471899, 4166287, 4999559, 5999471, 7199369}; - - public static bool IsPrime(int candidate) - { - if ((candidate & 1) != 0) - { - int limit = (int)Math.Sqrt(candidate); - for (int divisor = 3; divisor <= limit; divisor += 2) - { - if ((candidate % divisor) == 0) - return false; - } - return true; - } - return (candidate == 2); - } - - public static int GetPrime(int min) - { - if (min < 0) - throw new ArgumentException(SR.Arg_HTCapacityOverflow); - - for (int i = 0; i < primes.Length; i++) - { - int prime = primes[i]; - if (prime >= min) return prime; - } - - //outside of our predefined table. - //compute the hard way. - for (int i = (min | 1); i < Int32.MaxValue; i += 2) - { - if (IsPrime(i) && ((i - 1) % Hashtable.HashPrime != 0)) - return i; - } - return min; - } - - // Returns size of hashtable to grow to. - public static int ExpandPrime(int oldSize) - { - int newSize = 2 * oldSize; - - // Allow the hashtables to grow to maximum possible size (~2G elements) before encountering capacity overflow. - // Note that this check works even when _items.Length overflowed thanks to the (uint) cast - if ((uint)newSize > MaxPrimeArrayLength && MaxPrimeArrayLength > oldSize) - { - Debug.Assert(MaxPrimeArrayLength == GetPrime(MaxPrimeArrayLength), "Invalid MaxPrimeArrayLength"); - return MaxPrimeArrayLength; - } - - return GetPrime(newSize); - } - - - // This is the maximum prime smaller than Array.MaxArrayLength - public const int MaxPrimeArrayLength = 0x7FEFFFFD; - - private static ConditionalWeakTable s_serializationInfoTable; - public static ConditionalWeakTable SerializationInfoTable => LazyInitializer.EnsureInitialized(ref s_serializationInfoTable); - } } diff --git a/external/corefx/src/System.Runtime.Extensions/src/System/Environment.Unix.cs b/external/corefx/src/System.Runtime.Extensions/src/System/Environment.Unix.cs index a10fc04349..14383db0f3 100644 --- a/external/corefx/src/System.Runtime.Extensions/src/System/Environment.Unix.cs +++ b/external/corefx/src/System.Runtime.Extensions/src/System/Environment.Unix.cs @@ -18,7 +18,7 @@ namespace System { internal static readonly bool IsMac = Interop.Sys.GetUnixName() == "OSX"; private static Func> s_fileReadLines; - private static Action s_directoryCreateDirectory; + private static Func s_directoryCreateDirectory; private static string CurrentDirectoryCore { @@ -80,11 +80,11 @@ namespace System Debug.Assert(option == SpecialFolderOption.Create); // TODO #11151: Replace with Directory.CreateDirectory once we have access to System.IO.FileSystem here. - Action createDirectory = LazyInitializer.EnsureInitialized(ref s_directoryCreateDirectory, () => + Func createDirectory = LazyInitializer.EnsureInitialized(ref s_directoryCreateDirectory, () => { Type dirType = Type.GetType("System.IO.Directory, System.IO.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", throwOnError: true); MethodInfo mi = dirType.GetTypeInfo().GetDeclaredMethod("CreateDirectory"); - return (Action)mi.CreateDelegate(typeof(Action)); + return (Func)mi.CreateDelegate(typeof(Func)); }); createDirectory(path); @@ -368,7 +368,7 @@ namespace System { // First try with a buffer that should suffice for 99% of cases. string username; - const int BufLen = 1024; + const int BufLen = Interop.Sys.Passwd.InitialBufferSize; byte* stackBuf = stackalloc byte[BufLen]; if (TryGetUserNameFromPasswd(stackBuf, BufLen, out username)) { diff --git a/external/corefx/src/System.Runtime.Extensions/src/System/Environment.Win32.cs b/external/corefx/src/System.Runtime.Extensions/src/System/Environment.Win32.cs index ca023ced81..3ac7663b50 100644 --- a/external/corefx/src/System.Runtime.Extensions/src/System/Environment.Win32.cs +++ b/external/corefx/src/System.Runtime.Extensions/src/System/Environment.Win32.cs @@ -2,60 +2,108 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Internal.Runtime.Augments; -using System.Diagnostics; using System.IO; -using System.Runtime.InteropServices; using System.Text; +using System.Runtime.InteropServices; namespace System { public static partial class Environment { - static partial void GetUserName(ref string username) + public static string UserName { - // Use GetUserNameExW, as GetUserNameW isn't available on all platforms, e.g. Win7 - var domainName = new StringBuilder(1024); - uint domainNameLen = (uint)domainName.Capacity; - if (Interop.Secur32.GetUserNameExW(Interop.Secur32.NameSamCompatible, domainName, ref domainNameLen) == 1) + get { - string samName = domainName.ToString(); - int index = samName.IndexOf('\\'); + // 40 should be enough as we're asking for the SAM compatible name (DOMAIN\User). + // The max length should be 15 (domain) + 1 (separator) + 20 (name) + null. If for + // some reason it isn't, we'll grow the buffer. + + // https://support.microsoft.com/en-us/help/909264/naming-conventions-in-active-directory-for-computers-domains-sites-and + // https://msdn.microsoft.com/en-us/library/ms679635.aspx + + Span initialBuffer = stackalloc char[40]; + var builder = new ValueStringBuilder(initialBuffer); + GetUserName(ref builder); + + ReadOnlySpan name = builder.AsSpan(); + int index = name.IndexOf('\\'); if (index != -1) { - username = samName.Substring(index + 1); - return; + // In the form of DOMAIN\User, cut off DOMAIN\ + name = name.Slice(index + 1); } - } - username = string.Empty; + return name.ToString(); + } } - static partial void GetDomainName(ref string userDomainName) + private static void GetUserName(ref ValueStringBuilder builder) { - var domainName = new StringBuilder(1024); - uint domainNameLen = (uint)domainName.Capacity; - if (Interop.Secur32.GetUserNameExW(Interop.Secur32.NameSamCompatible, domainName, ref domainNameLen) == 1) + uint size = 0; + while (Interop.Secur32.GetUserNameExW(Interop.Secur32.NameSamCompatible, ref builder.GetPinnableReference(), ref size) == Interop.BOOLEAN.FALSE) { - string samName = domainName.ToString(); - int index = samName.IndexOf('\\'); - if (index != -1) + if (Marshal.GetLastWin32Error() == Interop.Errors.ERROR_MORE_DATA) { - userDomainName = samName.Substring(0, index); + builder.EnsureCapacity(checked((int)size)); + } + else + { + builder.Length = 0; return; } } - domainNameLen = (uint)domainName.Capacity; - byte[] sid = new byte[1024]; - int sidLen = sid.Length; - int peUse; - if (!Interop.Advapi32.LookupAccountNameW(null, UserName, sid, ref sidLen, domainName, ref domainNameLen, out peUse)) + builder.Length = (int)size; + } + + public static string UserDomainName + { + get { - throw new InvalidOperationException(Win32Marshal.GetExceptionForLastWin32Error().Message); - } + // See the comment in UserName + Span initialBuffer = stackalloc char[40]; + var builder = new ValueStringBuilder(initialBuffer); + GetUserName(ref builder); - userDomainName = domainName.ToString(); + ReadOnlySpan name = builder.AsSpan(); + int index = name.IndexOf('\\'); + if (index != -1) + { + // In the form of DOMAIN\User, cut off \User and return + return name.Slice(0, index).ToString(); + } + + // In theory we should never get use out of LookupAccountNameW as the above API should + // always return what we need. Can't find any clues in the historical sources, however. + + // Domain names aren't typically long. + // https://support.microsoft.com/en-us/help/909264/naming-conventions-in-active-directory-for-computers-domains-sites-and + Span initialDomainNameBuffer = stackalloc char[64]; + var domainBuilder = new ValueStringBuilder(initialBuffer); + uint length = (uint)domainBuilder.Capacity; + + // This API will fail to return the domain name without a buffer for the SID. + // SIDs are never over 68 bytes long. + Span sid = stackalloc byte[68]; + uint sidLength = 68; + + while (!Interop.Advapi32.LookupAccountNameW(null, ref builder.GetPinnableReference(), ref MemoryMarshal.GetReference(sid), + ref sidLength, ref domainBuilder.GetPinnableReference(), ref length, out _)) + { + int error = Marshal.GetLastWin32Error(); + + // The docs don't call this out clearly, but experimenting shows that the error returned is the following. + if (error != Interop.Errors.ERROR_INSUFFICIENT_BUFFER) + { + throw new InvalidOperationException(Win32Marshal.GetMessage(error)); + } + + domainBuilder.EnsureCapacity((int)length); + } + + domainBuilder.Length = (int)length; + return domainBuilder.ToString(); + } } private static string GetFolderPathCore(SpecialFolder folder, SpecialFolderOption option) @@ -224,8 +272,7 @@ namespace System { Guid folderId = new Guid(folderGuid); - string path; - int hr = Interop.Shell32.SHGetKnownFolderPath(folderId, (uint)option, IntPtr.Zero, out path); + int hr = Interop.Shell32.SHGetKnownFolderPath(folderId, (uint)option, IntPtr.Zero, out string path); if (hr != 0) // Not S_OK { return string.Empty; diff --git a/external/corefx/src/System.Runtime.Extensions/src/System/Environment.WinRT.cs b/external/corefx/src/System.Runtime.Extensions/src/System/Environment.WinRT.cs index bf55d20f97..c757bea779 100644 --- a/external/corefx/src/System.Runtime.Extensions/src/System/Environment.WinRT.cs +++ b/external/corefx/src/System.Runtime.Extensions/src/System/Environment.WinRT.cs @@ -10,6 +10,9 @@ namespace System { public static partial class Environment { + public static string UserName => "Windows User"; + public static string UserDomainName => "Windows Domain"; + private static string GetFolderPathCore(SpecialFolder folder, SpecialFolderOption option) { // For testing we'll fall back if the needed APIs aren't present. diff --git a/external/corefx/src/System.Runtime.Extensions/src/System/Environment.Windows.cs b/external/corefx/src/System.Runtime.Extensions/src/System/Environment.Windows.cs index 2caff315a0..317ddd2801 100644 --- a/external/corefx/src/System.Runtime.Extensions/src/System/Environment.Windows.cs +++ b/external/corefx/src/System.Runtime.Extensions/src/System/Environment.Windows.cs @@ -2,7 +2,6 @@ // 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.IO; using System.Runtime.InteropServices; using System.Text; @@ -16,41 +15,24 @@ namespace System { get { - StringBuilder sb = StringBuilderCache.Acquire(Interop.Kernel32.MAX_PATH + 1); - if (Interop.Kernel32.GetCurrentDirectory(sb.Capacity, sb) == 0) + Span initialBuffer = stackalloc char[Interop.Kernel32.MAX_PATH]; + var builder = new ValueStringBuilder(initialBuffer); + + uint length; + while ((length = Interop.Kernel32.GetCurrentDirectory((uint)builder.Capacity, ref builder.GetPinnableReference())) > builder.Capacity) { - StringBuilderCache.Release(sb); + builder.EnsureCapacity((int)length); + } + + if (length == 0) throw Win32Marshal.GetExceptionForLastWin32Error(); - } - string currentDirectory = sb.ToString(); - // Note that if we have somehow put our command prompt into short - // file name mode (i.e. by running edlin or a DOS grep, etc), then - // this will return a short file name. - if (currentDirectory.IndexOf('~') >= 0) - { - int r = Interop.Kernel32.GetLongPathName(currentDirectory, sb, sb.Capacity); - if (r == 0 || r >= Interop.Kernel32.MAX_PATH) - { - int errorCode = r >= Interop.Kernel32.MAX_PATH ? - Interop.Errors.ERROR_FILENAME_EXCED_RANGE : - Marshal.GetLastWin32Error(); + builder.Length = (int)length; - if (errorCode != Interop.Errors.ERROR_FILE_NOT_FOUND && - errorCode != Interop.Errors.ERROR_PATH_NOT_FOUND && - errorCode != Interop.Errors.ERROR_INVALID_FUNCTION && - errorCode != Interop.Errors.ERROR_ACCESS_DENIED) - { - StringBuilderCache.Release(sb); - throw Win32Marshal.GetExceptionForWin32Error(errorCode); - } - } - - currentDirectory = sb.ToString(); - } - - StringBuilderCache.Release(sb); - return currentDirectory; + // If we have a tilde in the path, make an attempt to expand 8.3 filenames + return builder.AsSpan().IndexOf('~') >= 0 + ? PathHelper.TryExpandShortFileName(ref builder, null) + : builder.ToString(); } set { @@ -72,8 +54,7 @@ namespace System { get { - var info = default(Interop.Kernel32.SYSTEM_INFO); - Interop.Kernel32.GetSystemInfo(out info); + Interop.Kernel32.GetSystemInfo(out Interop.Kernel32.SYSTEM_INFO info); return info.dwPageSize; } } @@ -82,42 +63,25 @@ namespace System private static string ExpandEnvironmentVariablesCore(string name) { - int currentSize = 100; - StringBuilder result = StringBuilderCache.Acquire(currentSize); // A somewhat reasonable default size + Span initialBuffer = stackalloc char[128]; + var builder = new ValueStringBuilder(initialBuffer); - result.Length = 0; - int size = Interop.Kernel32.ExpandEnvironmentStringsW(name, result, currentSize); - if (size == 0) + uint length; + while ((length = Interop.Kernel32.ExpandEnvironmentStringsW(name, ref builder.GetPinnableReference(), (uint)builder.Capacity)) > builder.Capacity) { - StringBuilderCache.Release(result); + builder.EnsureCapacity((int)length); + } + + if (length == 0) Marshal.ThrowExceptionForHR(Marshal.GetHRForLastWin32Error()); - } - while (size > currentSize) - { - currentSize = size; - result.Length = 0; - result.Capacity = currentSize; - - size = Interop.Kernel32.ExpandEnvironmentStringsW(name, result, currentSize); - if (size == 0) - { - StringBuilderCache.Release(result); - Marshal.ThrowExceptionForHR(Marshal.GetHRForLastWin32Error()); - } - } - - return StringBuilderCache.GetStringAndRelease(result); + // length includes the null terminator + builder.Length = (int)length - 1; + return builder.ToString(); } private static bool Is64BitOperatingSystemWhen32BitProcess - { - get - { - bool isWow64; - return Interop.Kernel32.IsWow64Process(Interop.Kernel32.GetCurrentProcess(), out isWow64) && isWow64; - } - } + => Interop.Kernel32.IsWow64Process(Interop.Kernel32.GetCurrentProcess(), out bool isWow64) && isWow64; public static string MachineName { @@ -150,47 +114,22 @@ namespace System { get { - // The path will likely be under 32 characters, e.g. C:\Windows\system32 - Span buffer = stackalloc char[32]; - int requiredSize = Interop.Kernel32.GetSystemDirectoryW(buffer); + // Normally this will be C:\Windows\System32 + Span initialBuffer = stackalloc char[32]; + var builder = new ValueStringBuilder(initialBuffer); - if (requiredSize > buffer.Length) + uint length; + while ((length = Interop.Kernel32.GetSystemDirectoryW(ref builder.GetPinnableReference(), (uint)builder.Capacity)) > builder.Capacity) { - buffer = new char[requiredSize]; - requiredSize = Interop.Kernel32.GetSystemDirectoryW(buffer); + builder.EnsureCapacity((int)length); } - if (requiredSize == 0) - { + if (length == 0) throw Win32Marshal.GetExceptionForLastWin32Error(); - } - return new string(buffer.Slice(0, requiredSize)); + builder.Length = (int)length; + return builder.ToString(); } } - - public static string UserName - { - get - { - string username = "Windows User"; - GetUserName(ref username); - return username; - } - } - - static partial void GetUserName(ref string username); - - public static string UserDomainName - { - get - { - string userDomainName = "Windows Domain"; - GetDomainName(ref userDomainName); - return userDomainName; - } - } - - static partial void GetDomainName(ref string userDomainName); } } diff --git a/external/corefx/src/System.Runtime.Extensions/src/System/Environment.cs b/external/corefx/src/System.Runtime.Extensions/src/System/Environment.cs index 213ec53ee0..448b434753 100644 --- a/external/corefx/src/System.Runtime.Extensions/src/System/Environment.cs +++ b/external/corefx/src/System.Runtime.Extensions/src/System/Environment.cs @@ -2,13 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Internal.Runtime.Augments; using System.Collections; using System.Collections.Generic; -using System.IO; using System.Reflection; using System.Runtime.CompilerServices; -using System.Text; +using Internal.Runtime.Augments; namespace System { @@ -65,35 +63,7 @@ namespace System { get { - StringBuilder sb = StringBuilderCache.Acquire(); - - foreach (string arg in GetCommandLineArgs()) - { - bool containsQuotes = false, containsWhitespace = false; - foreach (char c in arg) - { - if (char.IsWhiteSpace(c)) - { - containsWhitespace = true; - } - else if (c == '"') - { - containsQuotes = true; - } - } - - string quote = containsWhitespace ? "\"" : ""; - string formattedArg = containsQuotes && containsWhitespace ? arg.Replace("\"", "\\\"") : arg; - - sb.Append(quote).Append(formattedArg).Append(quote).Append(' '); - } - - if (sb.Length > 0) - { - sb.Length--; - } - - return StringBuilderCache.GetStringAndRelease(sb); + return PasteArguments.Paste(GetCommandLineArgs(), pasteFirstArgumentUsingArgV0Rules: true); } } diff --git a/external/corefx/src/System.Runtime.Extensions/src/System/Globalization/Extensions.cs b/external/corefx/src/System.Runtime.Extensions/src/System/Globalization/Extensions.cs deleted file mode 100644 index 080dd877e1..0000000000 --- a/external/corefx/src/System.Runtime.Extensions/src/System/Globalization/Extensions.cs +++ /dev/null @@ -1,99 +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; -using System.Diagnostics; -using System.Diagnostics.Private; - -namespace System.Globalization -{ - public static class GlobalizationExtensions - { - public static StringComparer GetStringComparer(this CompareInfo compareInfo, CompareOptions options) - { - if (compareInfo == null) - { - throw new ArgumentNullException(nameof(compareInfo)); - } - - if (options == CompareOptions.Ordinal) - { - return StringComparer.Ordinal; - } - - if (options == CompareOptions.OrdinalIgnoreCase) - { - return StringComparer.OrdinalIgnoreCase; - } - - if ((options & CultureAwareComparer.ValidCompareMaskOffFlags) != 0) - { - throw new ArgumentException(SR.Argument_InvalidFlag, nameof(options)); - } - - return new CultureAwareComparer(compareInfo, options); - } - } - - [Serializable] - internal sealed class CultureAwareComparer : StringComparer - { - internal const CompareOptions ValidCompareMaskOffFlags = - ~(CompareOptions.IgnoreCase | CompareOptions.IgnoreSymbols | CompareOptions.IgnoreNonSpace | - CompareOptions.IgnoreWidth | CompareOptions.IgnoreKanaType | CompareOptions.StringSort); - - private readonly CompareInfo _compareInfo; - private readonly CompareOptions _options; - - internal CultureAwareComparer(CompareInfo compareInfo, CompareOptions options) - { - Debug.Assert((options & ValidCompareMaskOffFlags) == 0); - _compareInfo = compareInfo; - _options = options; - } - - public override int Compare(string x, string y) - { - if (Object.ReferenceEquals(x, y)) return 0; - if (x == null) return -1; - if (y == null) return 1; - return _compareInfo.Compare(x, y, _options); - } - - public override bool Equals(string x, string y) - { - if (Object.ReferenceEquals(x, y)) return true; - if (x == null || y == null) return false; - - return (_compareInfo.Compare(x, y, _options) == 0); - } - - public override int GetHashCode(string obj) - { - if (obj == null) - { - throw new ArgumentNullException(nameof(obj)); - } - - // StringSort used in compare operation and not with the hashing - return _compareInfo.GetHashCode(obj, _options & (~CompareOptions.StringSort)); - } - - // Equals method for the comparer itself. - public override bool Equals(object obj) - { - CultureAwareComparer comparer = obj as CultureAwareComparer; - return - comparer != null && - _options == comparer._options && - _compareInfo.Equals(comparer._compareInfo); - } - - public override int GetHashCode() - { - return _compareInfo.GetHashCode() ^ ((int)_options & 0x7FFFFFFF); - } - } -} - diff --git a/external/corefx/src/System.Runtime.Extensions/src/System/IO/BufferedStream.cs b/external/corefx/src/System.Runtime.Extensions/src/System/IO/BufferedStream.cs index 90ac28ce24..5398c47ca7 100644 --- a/external/corefx/src/System.Runtime.Extensions/src/System/IO/BufferedStream.cs +++ b/external/corefx/src/System.Runtime.Extensions/src/System/IO/BufferedStream.cs @@ -413,7 +413,7 @@ namespace System.IO Debug.Assert(_buffer != null && _bufferSize >= _writePos, "BufferedStream: Write buffer must be allocated and write position must be in the bounds of the buffer in FlushWrite!"); - await _stream.WriteAsync(_buffer, 0, _writePos, cancellationToken).ConfigureAwait(false); + await _stream.WriteAsync(new ReadOnlyMemory(_buffer, 0, _writePos), cancellationToken).ConfigureAwait(false); _writePos = 0; await _stream.FlushAsync(cancellationToken).ConfigureAwait(false); } @@ -440,8 +440,7 @@ namespace System.IO Debug.Assert(readbytes >= 0); if (readbytes > 0) { - bool copied = new Span(_buffer, _readPos, readbytes).TryCopyTo(destination); - Debug.Assert(copied); + new ReadOnlySpan(_buffer, _readPos, readbytes).CopyTo(destination); _readPos += readbytes; } return readbytes; @@ -645,7 +644,7 @@ namespace System.IO cancellationToken, bytesFromBuffer, semaphoreLockTask).AsTask(); } - public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default(CancellationToken)) + public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default(CancellationToken)) { if (cancellationToken.IsCancellationRequested) { @@ -663,8 +662,8 @@ namespace System.IO bool completeSynchronously = true; try { - bytesFromBuffer = ReadFromBuffer(destination.Span); - completeSynchronously = bytesFromBuffer == destination.Length; + bytesFromBuffer = ReadFromBuffer(buffer.Span); + completeSynchronously = bytesFromBuffer == buffer.Length; if (completeSynchronously) { // If we satisfied enough data from the buffer, we can complete synchronously. @@ -681,7 +680,7 @@ namespace System.IO } // Delegate to the async implementation. - return ReadFromUnderlyingStreamAsync(destination.Slice(bytesFromBuffer), cancellationToken, bytesFromBuffer, semaphoreLockTask); + return ReadFromUnderlyingStreamAsync(buffer.Slice(bytesFromBuffer), cancellationToken, bytesFromBuffer, semaphoreLockTask); } /// BufferedStream should be as thin a wrapper as possible. We want ReadAsync to delegate to @@ -732,7 +731,7 @@ namespace System.IO // Ok. We can fill the buffer: EnsureBufferAllocated(); - _readLen = await _stream.ReadAsync(_buffer, 0, _bufferSize, cancellationToken).ConfigureAwait(false); + _readLen = await _stream.ReadAsync(new Memory(_buffer, 0, _bufferSize), cancellationToken).ConfigureAwait(false); bytesFromBuffer = ReadFromBuffer(buffer.Span); return bytesAlreadySatisfied + bytesFromBuffer; @@ -797,13 +796,13 @@ namespace System.IO offset += bytesToWrite; } - private int WriteToBuffer(ReadOnlySpan source) + private int WriteToBuffer(ReadOnlySpan buffer) { - int bytesToWrite = Math.Min(_bufferSize - _writePos, source.Length); + int bytesToWrite = Math.Min(_bufferSize - _writePos, buffer.Length); if (bytesToWrite > 0) { EnsureBufferAllocated(); - source.Slice(0, bytesToWrite).CopyTo(new Span(_buffer, _writePos, bytesToWrite)); + buffer.Slice(0, bytesToWrite).CopyTo(new Span(_buffer, _writePos, bytesToWrite)); _writePos += bytesToWrite; } return bytesToWrite; @@ -958,7 +957,7 @@ namespace System.IO } } - public override void Write(ReadOnlySpan source) + public override void Write(ReadOnlySpan buffer) { EnsureNotClosed(); EnsureCanWrite(); @@ -974,21 +973,21 @@ namespace System.IO checked { // We do not expect buffer sizes big enough for an overflow, but if it happens, lets fail early: - totalUserbytes = _writePos + source.Length; - useBuffer = (totalUserbytes + source.Length < (_bufferSize + _bufferSize)); + totalUserbytes = _writePos + buffer.Length; + useBuffer = (totalUserbytes + buffer.Length < (_bufferSize + _bufferSize)); } if (useBuffer) { // Copy as much data to the buffer as will fit. If there's still room in the buffer, // everything must have fit. - int bytesWritten = WriteToBuffer(source); + int bytesWritten = WriteToBuffer(buffer); if (_writePos < _bufferSize) { - Debug.Assert(bytesWritten == source.Length); + Debug.Assert(bytesWritten == buffer.Length); return; } - source = source.Slice(bytesWritten); + buffer = buffer.Slice(bytesWritten); Debug.Assert(_writePos == _bufferSize); Debug.Assert(_buffer != null); @@ -998,8 +997,8 @@ namespace System.IO _writePos = 0; // Now write the remainder. It must fit, as we're only on this path if that's true. - bytesWritten = WriteToBuffer(source); - Debug.Assert(bytesWritten == source.Length); + bytesWritten = WriteToBuffer(buffer); + Debug.Assert(bytesWritten == buffer.Length); Debug.Assert(_writePos < _bufferSize); } @@ -1015,7 +1014,7 @@ namespace System.IO if (totalUserbytes <= (_bufferSize + _bufferSize) && totalUserbytes <= MaxShadowBufferSize) { EnsureShadowBufferAllocated(); - source.CopyTo(new Span(_buffer, _writePos, source.Length)); + buffer.CopyTo(new Span(_buffer, _writePos, buffer.Length)); _stream.Write(_buffer, 0, totalUserbytes); _writePos = 0; return; @@ -1026,7 +1025,7 @@ namespace System.IO } // Write out user data. - _stream.Write(source); + _stream.Write(buffer); } } @@ -1041,15 +1040,15 @@ namespace System.IO if (buffer.Length - offset < count) throw new ArgumentException(SR.Argument_InvalidOffLen); - return WriteAsync(new ReadOnlyMemory(buffer, offset, count), cancellationToken); + return WriteAsync(new ReadOnlyMemory(buffer, offset, count), cancellationToken).AsTask(); } - public override Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default(CancellationToken)) + public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken = default(CancellationToken)) { // Fast path check for cancellation already requested if (cancellationToken.IsCancellationRequested) { - return Task.FromCanceled(cancellationToken); + return new ValueTask(Task.FromCanceled(cancellationToken)); } EnsureNotClosed(); @@ -1071,12 +1070,12 @@ namespace System.IO Debug.Assert(_writePos < _bufferSize); // If the write completely fits into the buffer, we can complete synchronously: - completeSynchronously = source.Length < _bufferSize - _writePos; + completeSynchronously = buffer.Length < _bufferSize - _writePos; if (completeSynchronously) { - int bytesWritten = WriteToBuffer(source.Span); - Debug.Assert(bytesWritten == source.Length); - return Task.CompletedTask; + int bytesWritten = WriteToBuffer(buffer.Span); + Debug.Assert(bytesWritten == buffer.Length); + return default; } } finally @@ -1087,7 +1086,7 @@ namespace System.IO } // Delegate to the async implementation. - return WriteToUnderlyingStreamAsync(source, cancellationToken, semaphoreLockTask); + return new ValueTask(WriteToUnderlyingStreamAsync(buffer, cancellationToken, semaphoreLockTask)); } /// BufferedStream should be as thin a wrapper as possible. We want WriteAsync to delegate to @@ -1096,7 +1095,7 @@ namespace System.IO /// little as possible. /// private async Task WriteToUnderlyingStreamAsync( - ReadOnlyMemory source, CancellationToken cancellationToken, Task semaphoreLockTask) + ReadOnlyMemory buffer, CancellationToken cancellationToken, Task semaphoreLockTask) { Debug.Assert(_stream != null); Debug.Assert(_stream.CanWrite); @@ -1119,29 +1118,29 @@ namespace System.IO checked { // We do not expect buffer sizes big enough for an overflow, but if it happens, lets fail early: - totalUserBytes = _writePos + source.Length; - useBuffer = (totalUserBytes + source.Length < (_bufferSize + _bufferSize)); + totalUserBytes = _writePos + buffer.Length; + useBuffer = (totalUserBytes + buffer.Length < (_bufferSize + _bufferSize)); } if (useBuffer) { - source = source.Slice(WriteToBuffer(source.Span)); + buffer = buffer.Slice(WriteToBuffer(buffer.Span)); if (_writePos < _bufferSize) { - Debug.Assert(source.Length == 0); + Debug.Assert(buffer.Length == 0); return; } - Debug.Assert(source.Length >= 0); + Debug.Assert(buffer.Length >= 0); Debug.Assert(_writePos == _bufferSize); Debug.Assert(_buffer != null); - await _stream.WriteAsync(_buffer, 0, _writePos, cancellationToken).ConfigureAwait(false); + await _stream.WriteAsync(new ReadOnlyMemory(_buffer, 0, _writePos), cancellationToken).ConfigureAwait(false); _writePos = 0; - int bytesWritten = WriteToBuffer(source.Span); - Debug.Assert(bytesWritten == source.Length); + int bytesWritten = WriteToBuffer(buffer.Span); + Debug.Assert(bytesWritten == buffer.Length); Debug.Assert(_writePos < _bufferSize); @@ -1158,19 +1157,19 @@ namespace System.IO if (totalUserBytes <= (_bufferSize + _bufferSize) && totalUserBytes <= MaxShadowBufferSize) { EnsureShadowBufferAllocated(); - source.Span.CopyTo(new Span(_buffer, _writePos, source.Length)); + buffer.Span.CopyTo(new Span(_buffer, _writePos, buffer.Length)); - await _stream.WriteAsync(_buffer, 0, totalUserBytes, cancellationToken).ConfigureAwait(false); + await _stream.WriteAsync(new ReadOnlyMemory(_buffer, 0, totalUserBytes), cancellationToken).ConfigureAwait(false); _writePos = 0; return; } - await _stream.WriteAsync(_buffer, 0, _writePos, cancellationToken).ConfigureAwait(false); + await _stream.WriteAsync(new ReadOnlyMemory(_buffer, 0, _writePos), cancellationToken).ConfigureAwait(false); _writePos = 0; } // Write out user data. - await _stream.WriteAsync(source, cancellationToken).ConfigureAwait(false); + await _stream.WriteAsync(buffer, cancellationToken).ConfigureAwait(false); } } finally @@ -1313,7 +1312,7 @@ namespace System.IO { // If there's any read data in the buffer, write it all to the destination stream. Debug.Assert(_writePos == 0, "Write buffer must be empty if there's data in the read buffer"); - await destination.WriteAsync(_buffer, _readPos, readBytes, cancellationToken).ConfigureAwait(false); + await destination.WriteAsync(new ReadOnlyMemory(_buffer, _readPos, readBytes), cancellationToken).ConfigureAwait(false); _readPos = _readLen = 0; } else if (_writePos > 0) diff --git a/external/corefx/src/System.Runtime.Extensions/src/System/IO/StringReader.cs b/external/corefx/src/System.Runtime.Extensions/src/System/IO/StringReader.cs index d3d50adb96..9951540c80 100644 --- a/external/corefx/src/System.Runtime.Extensions/src/System/IO/StringReader.cs +++ b/external/corefx/src/System.Runtime.Extensions/src/System/IO/StringReader.cs @@ -121,7 +121,7 @@ namespace System.IO { if (GetType() != typeof(StringReader)) { - // This overload was added affter the Read(char[], ...) overload, and so in case + // This overload was added after the Read(char[], ...) overload, and so in case // a derived type may have overridden it, we need to delegate to it, which the base does. return base.Read(buffer); } @@ -139,7 +139,7 @@ namespace System.IO n = buffer.Length; } - _s.AsReadOnlySpan().Slice(_pos, n).CopyTo(buffer); + _s.AsSpan(_pos, n).CopyTo(buffer); _pos += n; } diff --git a/external/corefx/src/System.Runtime.Extensions/src/System/OperatingSystem.cs b/external/corefx/src/System.Runtime.Extensions/src/System/OperatingSystem.cs index 743442edfc..941fd3f8d9 100644 --- a/external/corefx/src/System.Runtime.Extensions/src/System/OperatingSystem.cs +++ b/external/corefx/src/System.Runtime.Extensions/src/System/OperatingSystem.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.Serialization; namespace System @@ -23,7 +24,7 @@ namespace System { if (platform < PlatformID.Win32S || platform > PlatformID.MacOSX) { - throw new ArgumentOutOfRangeException(nameof(platform), platform, SR.Arg_EnumIllegalVal); + throw new ArgumentOutOfRangeException(nameof(platform), platform, SR.Format(SR.Arg_EnumIllegalVal, platform)); } if (version == null) diff --git a/external/corefx/src/System.Runtime.Extensions/tests/Performance/System.Runtime.Extensions.Performance.Tests.csproj b/external/corefx/src/System.Runtime.Extensions/tests/Performance/System.Runtime.Extensions.Performance.Tests.csproj index 7e7d8683cd..060e97e526 100644 --- a/external/corefx/src/System.Runtime.Extensions/tests/Performance/System.Runtime.Extensions.Performance.Tests.csproj +++ b/external/corefx/src/System.Runtime.Extensions/tests/Performance/System.Runtime.Extensions.Performance.Tests.csproj @@ -30,5 +30,8 @@ PerfRunner + + + \ No newline at end of file diff --git a/external/corefx/src/System.Runtime.Extensions/tests/Performance/System/Perf.Convert.cs b/external/corefx/src/System.Runtime.Extensions/tests/Performance/System/Perf.Convert.cs index cc24b8ba2e..f9bdac896a 100644 --- a/external/corefx/src/System.Runtime.Extensions/tests/Performance/System/Perf.Convert.cs +++ b/external/corefx/src/System.Runtime.Extensions/tests/Performance/System/Perf.Convert.cs @@ -101,8 +101,8 @@ namespace System [InlineData("Fri, 27 Feb 2009 03:11:21 GMT")] [InlineData("Thursday, February 26, 2009")] [InlineData("February 26, 2009")] - [InlineData("12/31/1999 11:59:59 PM")] - [InlineData("12/31/1999")] + [InlineData("12/12/1999 11:59:59 PM")] + [InlineData("12/12/1999")] public void ToDateTime_String(string value) { int innerIterationCount = (int)Benchmark.InnerIterationCount; diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj b/external/corefx/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj index 39599cc9b8..f064b76310 100644 --- a/external/corefx/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj +++ b/external/corefx/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj @@ -22,6 +22,9 @@ + + + @@ -30,9 +33,16 @@ + + + + + + + @@ -52,9 +62,9 @@ - + - + @@ -102,6 +112,9 @@ Common\System\ShouldNotBeInvokedException.cs + + Common\System\Security\Cryptography\ByteUtils.cs + @@ -125,5 +138,8 @@ TestApp + + + - \ No newline at end of file + diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/AppDomainTests.cs b/external/corefx/src/System.Runtime.Extensions/tests/System/AppDomainTests.cs index cf51f3cac9..1f34257b31 100644 --- a/external/corefx/src/System.Runtime.Extensions/tests/System/AppDomainTests.cs +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/AppDomainTests.cs @@ -335,14 +335,21 @@ namespace System.Tests [Fact] public void toString() { - string actual = AppDomain.CurrentDomain.ToString(); + // Workaround issue: UWP culture is process wide + RemoteInvoke(() => + { + CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture; - // NetFx has additional line endings - if (PlatformDetection.IsFullFramework) - actual = actual.Trim(); + string actual = AppDomain.CurrentDomain.ToString(); - string expected = "Name:" + AppDomain.CurrentDomain.FriendlyName + Environment.NewLine + "There are no context policies."; - Assert.Equal(expected, actual); + // NetFx has additional line endings + if (PlatformDetection.IsFullFramework) + actual = actual.Trim(); + + string expected = "Name:" + AppDomain.CurrentDomain.FriendlyName + Environment.NewLine + "There are no context policies."; + Assert.Equal(expected, actual); + + }).Dispose(); } [Fact] diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/Convert.netcoreapp.cs b/external/corefx/src/System.Runtime.Extensions/tests/System/Convert.netcoreapp.cs index ec1db8cc18..979c81cebf 100644 --- a/external/corefx/src/System.Runtime.Extensions/tests/System/Convert.netcoreapp.cs +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/Convert.netcoreapp.cs @@ -3,8 +3,12 @@ // See the LICENSE file in the project root for more information. using System.Linq; +using System.Text; +using System.Collections.Generic; using Xunit; +using Test.Cryptography; + namespace System.Tests { public partial class ConvertTests @@ -14,9 +18,9 @@ namespace System.Tests [InlineData(new byte[] { 5, 6, 7, 8 }, "BQYHCA==")] public void ToBase64String_Span_ProducesExpectedOutput(byte[] input, string expected) { - Assert.Equal(expected, Convert.ToBase64String(input.AsReadOnlySpan())); - Assert.Equal(expected, Convert.ToBase64String(input.AsReadOnlySpan(), Base64FormattingOptions.None)); - Assert.Equal(expected, Convert.ToBase64String(input.AsReadOnlySpan(), Base64FormattingOptions.InsertLineBreaks)); + Assert.Equal(expected, Convert.ToBase64String(input.AsSpan())); + Assert.Equal(expected, Convert.ToBase64String(input.AsSpan(), Base64FormattingOptions.None)); + Assert.Equal(expected, Convert.ToBase64String(input.AsSpan(), Base64FormattingOptions.InsertLineBreaks)); } [Fact] @@ -48,7 +52,7 @@ namespace System.Tests [InlineData((Base64FormattingOptions)(2))] public void ToBase64String_Span_InvalidOptions_Throws(Base64FormattingOptions invalidOption) { - AssertExtensions.Throws("options", () => Convert.ToBase64String(new byte[0].AsReadOnlySpan(), invalidOption)); + AssertExtensions.Throws("options", () => Convert.ToBase64String(new byte[0].AsSpan(), invalidOption)); } [Theory] @@ -60,7 +64,7 @@ namespace System.Tests // Just right dest = new char[expected.Length]; - Assert.True(Convert.TryToBase64Chars(input.AsReadOnlySpan(), dest, out int charsWritten)); + Assert.True(Convert.TryToBase64Chars(input.AsSpan(), dest, out int charsWritten)); Assert.Equal(expected.Length, charsWritten); Assert.Equal(expected.ToCharArray(), dest.ToArray()); @@ -68,13 +72,13 @@ namespace System.Tests if (expected.Length > 0) { dest = new char[expected.Length - 1]; - Assert.False(Convert.TryToBase64Chars(input.AsReadOnlySpan(), dest, out charsWritten)); + Assert.False(Convert.TryToBase64Chars(input.AsSpan(), dest, out charsWritten)); Assert.Equal(0, charsWritten); } // Longer than needed dest = new char[expected.Length + 1]; - Assert.True(Convert.TryToBase64Chars(input.AsReadOnlySpan(), dest, out charsWritten)); + Assert.True(Convert.TryToBase64Chars(input.AsSpan(), dest, out charsWritten)); Assert.Equal(expected.Length, charsWritten); Assert.Equal(expected.ToCharArray(), dest.Slice(0, expected.Length).ToArray()); Assert.Equal(0, dest[dest.Length - 1]); @@ -86,76 +90,262 @@ namespace System.Tests public void TryToBase64Chars_InvalidOptions_Throws(Base64FormattingOptions invalidOption) { AssertExtensions.Throws("options", - () => Convert.TryToBase64Chars(new byte[0].AsReadOnlySpan(), new char[0].AsSpan(), out int charsWritten, invalidOption)); + () => Convert.TryToBase64Chars(new byte[0].AsSpan(), new char[0].AsSpan(), out int charsWritten, invalidOption)); } [Theory] - [InlineData("")] - [InlineData("BQYHCA==")] - [InlineData( - "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4\r\n" + - "OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3Bx\r\n" + - "cnN0dXZ3")] - public void TryFromBase64String_MatchesFromBase64String(string stringInput) + [MemberData(nameof(Base64TestData))] + public static void TryFromBase64String(string encoded, byte[] expected) { - byte[] expected = Convert.FromBase64String(stringInput); - Span dest; - - // Just the right length - dest = new byte[expected.Length]; - Assert.True(Convert.TryFromBase64String(stringInput, dest, out int bytesWritten)); - Assert.Equal(expected.Length, bytesWritten); - Assert.Equal(expected, dest.ToArray()); - - // Too short - if (expected.Length > 0) + if (expected == null) { - dest = new byte[expected.Length - 1]; - Assert.False(Convert.TryFromBase64String(stringInput, dest, out bytesWritten)); + Span actual = new byte[1000]; + bool success = Convert.TryFromBase64String(encoded, actual, out int bytesWritten); + Assert.False(success); Assert.Equal(0, bytesWritten); } + else + { + // Exact-sized buffer + { + byte[] actual = new byte[expected.Length]; + bool success = Convert.TryFromBase64String(encoded, actual, out int bytesWritten); + Assert.True(success); + Assert.Equal(expected, actual); + Assert.Equal(expected.Length, bytesWritten); + } - // Longer than needed - dest = new byte[expected.Length + 1]; - Assert.True(Convert.TryFromBase64String(stringInput, dest, out bytesWritten)); - Assert.Equal(expected.Length, bytesWritten); - Assert.Equal(expected, dest.Slice(0, expected.Length).ToArray()); - Assert.Equal(0, dest[dest.Length - 1]); + // Buffer too short + if (expected.Length != 0) + { + byte[] actual = new byte[expected.Length - 1]; + bool success = Convert.TryFromBase64String(encoded, actual, out int bytesWritten); + Assert.False(success); + Assert.Equal(0, bytesWritten); + } + + // Buffer larger than needed + { + byte[] actual = new byte[expected.Length + 1]; + actual[expected.Length] = 99; + bool success = Convert.TryFromBase64String(encoded, actual, out int bytesWritten); + Assert.True(success); + Assert.Equal(99, actual[expected.Length]); + Assert.Equal(expected, actual.Take(expected.Length)); + Assert.Equal(expected.Length, bytesWritten); + } + } } [Theory] - [InlineData("")] - [InlineData("BQYHCA==")] - [InlineData( - "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4\r\n" + - "OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3Bx\r\n" + - "cnN0dXZ3")] - public void TryFromBase64Chars_MatchesFromBase64CharArray(string stringInput) + [MemberData(nameof(Base64TestData))] + public static void TryFromBase64Chars(string encodedAsString, byte[] expected) { - char[] charArrayInput = stringInput.ToCharArray(); - byte[] expected = Convert.FromBase64CharArray(charArrayInput, 0, charArrayInput.Length); - Span dest; - - // Just the right length - dest = new byte[expected.Length]; - Assert.True(Convert.TryFromBase64Chars(charArrayInput.AsReadOnlySpan(), dest, out int bytesWritten)); - Assert.Equal(expected.Length, bytesWritten); - Assert.Equal(expected, dest.ToArray()); - - // Too short - if (expected.Length > 0) + ReadOnlySpan encoded = encodedAsString; // Executing the conversion to ROS here so people debugging don't have to step through it at the api callsite. + if (expected == null) { - dest = new byte[expected.Length - 1]; - Assert.False(Convert.TryFromBase64Chars(charArrayInput.AsReadOnlySpan(), dest, out bytesWritten)); + Span actual = new byte[1000]; + bool success = Convert.TryFromBase64Chars(encoded, actual, out int bytesWritten); + Assert.False(success); Assert.Equal(0, bytesWritten); } + else + { + // Exact-sized buffer + { + byte[] actual = new byte[expected.Length]; + bool success = Convert.TryFromBase64Chars(encoded, actual, out int bytesWritten); + Assert.True(success); + Assert.Equal(expected, actual); + Assert.Equal(expected.Length, bytesWritten); + } - // Longer than needed - dest = new byte[expected.Length + 1]; - Assert.True(Convert.TryFromBase64Chars(charArrayInput.AsReadOnlySpan(), dest, out bytesWritten)); - Assert.Equal(expected.Length, bytesWritten); - Assert.Equal(expected, dest.Slice(0, dest.Length - 1).ToArray()); - Assert.Equal(0, dest[dest.Length - 1]); + // Buffer too short + if (expected.Length != 0) + { + byte[] actual = new byte[expected.Length - 1]; + bool success = Convert.TryFromBase64Chars(encoded, actual, out int bytesWritten); + Assert.False(success); + Assert.Equal(0, bytesWritten); + } + + // Buffer larger than needed + { + byte[] actual = new byte[expected.Length + 1]; + actual[expected.Length] = 99; + bool success = Convert.TryFromBase64Chars(encoded, actual, out int bytesWritten); + Assert.True(success); + Assert.Equal(99, actual[expected.Length]); + Assert.Equal(expected, actual.Take(expected.Length)); + Assert.Equal(expected.Length, bytesWritten); + } + } + } + + public static IEnumerable Base64TestData + { + get + { + foreach (Tuple tuple in Base64TestDataSeed) + { + yield return new object[] { tuple.Item1, tuple.Item2 }; + yield return new object[] { InsertSpaces(tuple.Item1, 1), tuple.Item2 }; + yield return new object[] { InsertSpaces(tuple.Item1, 4), tuple.Item2 }; + } + } + } + + public static IEnumerable> Base64TestDataSeed + { + get + { + // Empty + yield return Tuple.Create("", Array.Empty()); + + // All whitespace characters. + yield return Tuple.Create(" \t\r\n", Array.Empty()); + + // Pad characters + yield return Tuple.Create("BQYHCAZ=", "0506070806".HexToByteArray()); + yield return Tuple.Create("BQYHCA==", "05060708".HexToByteArray()); + + // Typical + yield return Tuple.Create( + "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0+P0" + + "BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3", + + ("000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E" + + "3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F7071727374757677").HexToByteArray() + ); + + // Input length not multiple of 4 + yield return Tuple.Create("A", null); + yield return Tuple.Create("AA", null); + yield return Tuple.Create("AAA", null); + yield return Tuple.Create("AAAAA", null); + yield return Tuple.Create("AAAAAA", null); + yield return Tuple.Create("AAAAAAA", null); + + // Cannot continue past end pad + yield return Tuple.Create("AAA=BBBB", null); + yield return Tuple.Create("AA==BBBB", null); + + // Cannot have more than two end pads + yield return Tuple.Create("A===", null); + yield return Tuple.Create("====", null); + + // Verify negative entries of charmap. + for (int i = 0; i < 256; i++) + { + char c = (char)i; + if (!IsValidBase64Char(c)) + { + string text = new string(c, 1) + "AAA"; + yield return Tuple.Create(text, null); + } + } + + // Verify >255 character handling. + string largerThanByte = new string((char)256, 1); + yield return Tuple.Create(largerThanByte + "AAA", null); + yield return Tuple.Create("A" + largerThanByte + "AA", null); + yield return Tuple.Create("AA" + largerThanByte + "A", null); + yield return Tuple.Create("AAA" + largerThanByte, null); + yield return Tuple.Create("AAAA" + largerThanByte + "AAA", null); + yield return Tuple.Create("AAAA" + "A" + largerThanByte + "AA", null); + yield return Tuple.Create("AAAA" + "AA" + largerThanByte + "A", null); + yield return Tuple.Create("AAAA" + "AAA" + largerThanByte, null); + + // Verify positive entries of charmap. + yield return Tuple.Create("+A==", new byte[] { 0xf8 }); + yield return Tuple.Create("/A==", new byte[] { 0xfc }); + yield return Tuple.Create("0A==", new byte[] { 0xd0 }); + yield return Tuple.Create("1A==", new byte[] { 0xd4 }); + yield return Tuple.Create("2A==", new byte[] { 0xd8 }); + yield return Tuple.Create("3A==", new byte[] { 0xdc }); + yield return Tuple.Create("4A==", new byte[] { 0xe0 }); + yield return Tuple.Create("5A==", new byte[] { 0xe4 }); + yield return Tuple.Create("6A==", new byte[] { 0xe8 }); + yield return Tuple.Create("7A==", new byte[] { 0xec }); + yield return Tuple.Create("8A==", new byte[] { 0xf0 }); + yield return Tuple.Create("9A==", new byte[] { 0xf4 }); + yield return Tuple.Create("AA==", new byte[] { 0x00 }); + yield return Tuple.Create("BA==", new byte[] { 0x04 }); + yield return Tuple.Create("CA==", new byte[] { 0x08 }); + yield return Tuple.Create("DA==", new byte[] { 0x0c }); + yield return Tuple.Create("EA==", new byte[] { 0x10 }); + yield return Tuple.Create("FA==", new byte[] { 0x14 }); + yield return Tuple.Create("GA==", new byte[] { 0x18 }); + yield return Tuple.Create("HA==", new byte[] { 0x1c }); + yield return Tuple.Create("IA==", new byte[] { 0x20 }); + yield return Tuple.Create("JA==", new byte[] { 0x24 }); + yield return Tuple.Create("KA==", new byte[] { 0x28 }); + yield return Tuple.Create("LA==", new byte[] { 0x2c }); + yield return Tuple.Create("MA==", new byte[] { 0x30 }); + yield return Tuple.Create("NA==", new byte[] { 0x34 }); + yield return Tuple.Create("OA==", new byte[] { 0x38 }); + yield return Tuple.Create("PA==", new byte[] { 0x3c }); + yield return Tuple.Create("QA==", new byte[] { 0x40 }); + yield return Tuple.Create("RA==", new byte[] { 0x44 }); + yield return Tuple.Create("SA==", new byte[] { 0x48 }); + yield return Tuple.Create("TA==", new byte[] { 0x4c }); + yield return Tuple.Create("UA==", new byte[] { 0x50 }); + yield return Tuple.Create("VA==", new byte[] { 0x54 }); + yield return Tuple.Create("WA==", new byte[] { 0x58 }); + yield return Tuple.Create("XA==", new byte[] { 0x5c }); + yield return Tuple.Create("YA==", new byte[] { 0x60 }); + yield return Tuple.Create("ZA==", new byte[] { 0x64 }); + yield return Tuple.Create("aA==", new byte[] { 0x68 }); + yield return Tuple.Create("bA==", new byte[] { 0x6c }); + yield return Tuple.Create("cA==", new byte[] { 0x70 }); + yield return Tuple.Create("dA==", new byte[] { 0x74 }); + yield return Tuple.Create("eA==", new byte[] { 0x78 }); + yield return Tuple.Create("fA==", new byte[] { 0x7c }); + yield return Tuple.Create("gA==", new byte[] { 0x80 }); + yield return Tuple.Create("hA==", new byte[] { 0x84 }); + yield return Tuple.Create("iA==", new byte[] { 0x88 }); + yield return Tuple.Create("jA==", new byte[] { 0x8c }); + yield return Tuple.Create("kA==", new byte[] { 0x90 }); + yield return Tuple.Create("lA==", new byte[] { 0x94 }); + yield return Tuple.Create("mA==", new byte[] { 0x98 }); + yield return Tuple.Create("nA==", new byte[] { 0x9c }); + yield return Tuple.Create("oA==", new byte[] { 0xa0 }); + yield return Tuple.Create("pA==", new byte[] { 0xa4 }); + yield return Tuple.Create("qA==", new byte[] { 0xa8 }); + yield return Tuple.Create("rA==", new byte[] { 0xac }); + yield return Tuple.Create("sA==", new byte[] { 0xb0 }); + yield return Tuple.Create("tA==", new byte[] { 0xb4 }); + yield return Tuple.Create("uA==", new byte[] { 0xb8 }); + yield return Tuple.Create("vA==", new byte[] { 0xbc }); + yield return Tuple.Create("wA==", new byte[] { 0xc0 }); + yield return Tuple.Create("xA==", new byte[] { 0xc4 }); + yield return Tuple.Create("yA==", new byte[] { 0xc8 }); + yield return Tuple.Create("zA==", new byte[] { 0xcc }); + } + } + + private static string InsertSpaces(string text, int period) + { + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < text.Length; i++) + { + if ((i % period) == 0) + { + sb.Append(" "); + } + sb.Append(text[i]); + } + sb.Append(" "); + return sb.ToString(); + } + + private static bool IsValidBase64Char(char c) + { + return c >= 'A' && c <= 'Z' + || c >= 'a' && c <= 'z' + || c >= '0' && c <= '9' + || c == '+' + || c == '/'; } } } diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/Environment.UserDomainName.cs b/external/corefx/src/System.Runtime.Extensions/tests/System/Environment.UserDomainName.cs index 9cbdbed483..8c88b07a40 100644 --- a/external/corefx/src/System.Runtime.Extensions/tests/System/Environment.UserDomainName.cs +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/Environment.UserDomainName.cs @@ -22,5 +22,28 @@ namespace System.Tests // Highly unlikely anyone is using domain with this name Assert.NotEqual("Windows Domain", Environment.UserDomainName); } + + [Fact] + public void UserDomainName_Valid() + { + string name = Environment.UserDomainName; + Assert.False(string.IsNullOrWhiteSpace(name)); + Assert.Equal(-1, name.IndexOf('\0')); + } + + [Fact] + [PlatformSpecific(TestPlatforms.AnyUnix)] + public void UserDomainName_MatchesMachineName_Unix() + { + Assert.Equal(Environment.MachineName, Environment.UserDomainName); + } + + [Fact] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap)] + [PlatformSpecific(TestPlatforms.Windows)] + public void UserDomainName_MatchesEnvironment_Windows() + { + Assert.Equal(Environment.GetEnvironmentVariable("USERDOMAIN"), Environment.UserDomainName); + } } } diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/Environment.UserName.cs b/external/corefx/src/System.Runtime.Extensions/tests/System/Environment.UserName.cs index 3f88f165eb..31abd730cd 100644 --- a/external/corefx/src/System.Runtime.Extensions/tests/System/Environment.UserName.cs +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/Environment.UserName.cs @@ -22,5 +22,21 @@ namespace System.Tests // Highly unlikely anyone is using user with this name Assert.NotEqual("Windows User", Environment.UserName); } + + [Fact] + public void UserName_Valid() + { + string name = Environment.UserName; + Assert.False(string.IsNullOrWhiteSpace(name)); + Assert.Equal(-1, name.IndexOf('\0')); + } + + [Fact] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap)] + [PlatformSpecific(TestPlatforms.Windows)] + public void UserName_MatchesEnvironment_Windows() + { + Assert.Equal(Environment.GetEnvironmentVariable("USERNAME"), Environment.UserName); + } } } diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/EnvironmentTests.cs b/external/corefx/src/System.Runtime.Extensions/tests/System/EnvironmentTests.cs index 3ac079082d..91c74c68c1 100644 --- a/external/corefx/src/System.Runtime.Extensions/tests/System/EnvironmentTests.cs +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/EnvironmentTests.cs @@ -148,25 +148,6 @@ namespace System.Tests Assert.True(Environment.UserInteractive); } - [Fact] - public void UserName_Valid() - { - Assert.False(string.IsNullOrWhiteSpace(Environment.UserName)); - } - - [Fact] - public void UserDomainName_Valid() - { - Assert.False(string.IsNullOrWhiteSpace(Environment.UserDomainName)); - } - - [Fact] - [PlatformSpecific(TestPlatforms.AnyUnix)] // Tests OS-specific environment - public void UserDomainName_Unix_MatchesMachineName() - { - Assert.Equal(Environment.MachineName, Environment.UserDomainName); - } - [Fact] public void Version_MatchesFixedVersion() { @@ -193,19 +174,96 @@ namespace System.Tests [ActiveIssue("https://github.com/dotnet/corefx/issues/21404", TargetFrameworkMonikers.Uap)] public void FailFast_ExpectFailureExitCode() { - using (Process p = RemoteInvoke(() => { Environment.FailFast("message"); return SuccessExitCode; }).Process) + using (RemoteInvokeHandle handle = RemoteInvoke(() => { Environment.FailFast("message"); return SuccessExitCode; })) { + Process p = handle.Process; + handle.Process = null; p.WaitForExit(); Assert.NotEqual(SuccessExitCode, p.ExitCode); } - using (Process p = RemoteInvoke(() => { Environment.FailFast("message", new Exception("uh oh")); return SuccessExitCode; }).Process) + using (RemoteInvokeHandle handle = RemoteInvoke(() => { Environment.FailFast("message", new Exception("uh oh")); return SuccessExitCode; })) { + Process p = handle.Process; + handle.Process = null; p.WaitForExit(); Assert.NotEqual(SuccessExitCode, p.ExitCode); } } + [Trait(XunitConstants.Category, XunitConstants.IgnoreForCI)] // fail fast crashes the process + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Full framework does not have dotnet/coreclr#16622")] + [Fact] + public void FailFast_ExceptionStackTrace_ArgumentException() + { + var psi = new ProcessStartInfo(); + psi.RedirectStandardError = true; + psi.RedirectStandardOutput = true; + + using (RemoteInvokeHandle handle = RemoteInvoke( + () => { Environment.FailFast("message", new ArgumentException("bad arg")); return SuccessExitCode; }, + new RemoteInvokeOptions { StartInfo = psi })) + { + Process p = handle.Process; + handle.Process = null; + p.WaitForExit(); + string consoleOutput = p.StandardError.ReadToEnd(); + Assert.Contains("Exception details:", consoleOutput); + Assert.Contains("ArgumentException:", consoleOutput); + Assert.Contains("bad arg", consoleOutput); + } + } + + [Trait(XunitConstants.Category, XunitConstants.IgnoreForCI)] // fail fast crashes the process + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Full framework does not have dotnet/coreclr#16622")] + [Fact] + public void FailFast_ExceptionStackTrace_StackOverflowException() + { + // Test using another type of exception + var psi = new ProcessStartInfo(); + psi.RedirectStandardError = true; + psi.RedirectStandardOutput = true; + + using (RemoteInvokeHandle handle = RemoteInvoke( + () => { Environment.FailFast("message", new StackOverflowException("SO exception")); return SuccessExitCode; }, + new RemoteInvokeOptions { StartInfo = psi })) + { + Process p = handle.Process; + handle.Process = null; + p.WaitForExit(); + string consoleOutput = p.StandardError.ReadToEnd(); + Assert.Contains("Exception details:", consoleOutput); + Assert.Contains("StackOverflowException", consoleOutput); + Assert.Contains("SO exception", consoleOutput); + } + } + + [Trait(XunitConstants.Category, XunitConstants.IgnoreForCI)] // fail fast crashes the process + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Full framework does not have dotnet/coreclr#16622")] + [Fact] + public void FailFast_ExceptionStackTrace_InnerException() + { + // Test if inner exception details are also logged + var psi = new ProcessStartInfo(); + psi.RedirectStandardError = true; + psi.RedirectStandardOutput = true; + + using (RemoteInvokeHandle handle = RemoteInvoke( + () => { Environment.FailFast("message", new ArgumentException("first exception", new NullReferenceException("inner exception"))); return SuccessExitCode; }, + new RemoteInvokeOptions { StartInfo = psi })) + { + Process p = handle.Process; + handle.Process = null; + p.WaitForExit(); + string consoleOutput = p.StandardError.ReadToEnd(); + Assert.Contains("Exception details:", consoleOutput); + Assert.Contains("first exception", consoleOutput); + Assert.Contains("inner exception", consoleOutput); + Assert.Contains("ArgumentException", consoleOutput); + Assert.Contains("NullReferenceException", consoleOutput); + } + } + [Fact] [PlatformSpecific(TestPlatforms.AnyUnix)] // Tests OS-specific environment public void GetFolderPath_Unix_PersonalIsHomeAndUserProfile() @@ -215,6 +273,27 @@ namespace System.Tests Assert.Equal(Environment.GetEnvironmentVariable("HOME"), Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)); } + [Theory] + [OuterLoop] + [PlatformSpecific(TestPlatforms.AnyUnix)] // Tests OS-specific environment + [InlineData(Environment.SpecialFolder.ApplicationData)] + [InlineData(Environment.SpecialFolder.Desktop)] + [InlineData(Environment.SpecialFolder.DesktopDirectory)] + [InlineData(Environment.SpecialFolder.Fonts)] + [InlineData(Environment.SpecialFolder.MyMusic)] + [InlineData(Environment.SpecialFolder.MyPictures)] + [InlineData(Environment.SpecialFolder.MyVideos)] + [InlineData(Environment.SpecialFolder.Templates)] + public void GetFolderPath_Unix_SpecialFolderDoesNotExist_CreatesSuccessfully(Environment.SpecialFolder folder) + { + string path = Environment.GetFolderPath(folder, Environment.SpecialFolderOption.DoNotVerify); + if (Directory.Exists(path)) + return; + path = Environment.GetFolderPath(folder, Environment.SpecialFolderOption.Create); + Assert.True(Directory.Exists(path)); + Directory.Delete(path); + } + [Fact] public void GetSystemDirectory() { diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/IO/Path.IsPathFullyQualified.cs b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/Path.IsPathFullyQualified.cs index 9816e1659f..a240eb3c0d 100644 --- a/external/corefx/src/System.Runtime.Extensions/tests/System/IO/Path.IsPathFullyQualified.cs +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/Path.IsPathFullyQualified.cs @@ -9,7 +9,7 @@ namespace System.IO.Tests public static class GetFullyQualifiedPathTests { [Fact] - public static void IsPathFullyQualified_NullThrows() + public static void IsPathFullyQualified_NullArgument() { Assert.Throws(() => Path.IsPathFullyQualified(null)); } @@ -67,6 +67,7 @@ namespace System.IO.Tests public static void IsPathFullyQualified_Unix_Invalid(string path) { Assert.False(Path.IsPathFullyQualified(path)); + Assert.False(Path.IsPathFullyQualified(path.AsSpan())); } [PlatformSpecific(TestPlatforms.AnyUnix)] @@ -80,6 +81,7 @@ namespace System.IO.Tests public static void IsPathFullyQualified_Unix_Valid(string path) { Assert.True(Path.IsPathFullyQualified(path)); + Assert.True(Path.IsPathFullyQualified(path.AsSpan())); } } } diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/IO/Path.IsPathFullyQualified.netcoreapp.cs b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/Path.IsPathFullyQualified.netcoreapp.cs new file mode 100644 index 0000000000..f70ba4209d --- /dev/null +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/Path.IsPathFullyQualified.netcoreapp.cs @@ -0,0 +1,50 @@ +// 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 Xunit; + +namespace System.IO.Tests +{ + public static class GetFullyQualifiedPathSpanTests + { + [Fact] + public static void IsPathFullyQualified_Empty() + { + Assert.False(Path.IsPathFullyQualified(ReadOnlySpan.Empty)); + } + + [PlatformSpecific(TestPlatforms.Windows)] + [Theory] + [InlineData("/")] + [InlineData(@"\")] + [InlineData(".")] + [InlineData("C:")] + [InlineData("C:foo.txt")] + public static void IsPathFullyQualified_Windows_Invalid(string path) + { + Assert.False(Path.IsPathFullyQualified(path.AsSpan())); + } + + [PlatformSpecific(TestPlatforms.Windows)] + [Theory] + [InlineData(@"\\")] + [InlineData(@"\\\")] + [InlineData(@"\\Server")] + [InlineData(@"\\Server\Foo.txt")] + [InlineData(@"\\Server\Share\Foo.txt")] + [InlineData(@"\\Server\Share\Test\Foo.txt")] + [InlineData(@"C:\")] + [InlineData(@"C:\foo1")] + [InlineData(@"C:\\")] + [InlineData(@"C:\\foo2")] + [InlineData(@"C:/")] + [InlineData(@"C:/foo1")] + [InlineData(@"C://")] + [InlineData(@"C://foo2")] + public static void IsPathFullyQualified_Windows_Valid(string path) + { + Assert.True(Path.IsPathFullyQualified(path.AsSpan())); + } + } +} diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests.cs b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests.cs index 4f690d7d10..e3f17889c0 100644 --- a/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests.cs +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests.cs @@ -1,32 +1,30 @@ -// Licensed to the .NET Foundation under one or more agreements. +// 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.Collections.Generic; -using System.Runtime.InteropServices; using System.Text; -using System.Text.RegularExpressions; using Xunit; namespace System.IO.Tests { - public static partial class PathTests + public partial class PathTests : PathTestsBase { - [Theory] - [InlineData(null, null, null)] - [InlineData(null, "exe", null)] - [InlineData("", "", "")] - [InlineData("file.exe", null, "file")] - [InlineData("file.exe", "", "file.")] - [InlineData("file", "exe", "file.exe")] - [InlineData("file", ".exe", "file.exe")] - [InlineData("file.txt", "exe", "file.exe")] - [InlineData("file.txt", ".exe", "file.exe")] - [InlineData("file.txt.bin", "exe", "file.txt.exe")] - [InlineData("dir/file.t", "exe", "dir/file.exe")] - [InlineData("dir/file.exe", "t", "dir/file.t")] - [InlineData("dir/file", "exe", "dir/file.exe")] - public static void ChangeExtension(string path, string newExtension, string expected) + [Theory, + InlineData(null, null, null), + InlineData(null, "exe", null), + InlineData("", "", ""), + InlineData("file.exe", null, "file"), + InlineData("file.exe", "", "file."), + InlineData("file", "exe", "file.exe"), + InlineData("file", ".exe", "file.exe"), + InlineData("file.txt", "exe", "file.exe"), + InlineData("file.txt", ".exe", "file.exe"), + InlineData("file.txt.bin", "exe", "file.txt.exe"), + InlineData("dir/file.t", "exe", "dir/file.exe"), + InlineData("dir/file.exe", "t", "dir/file.t"), + InlineData("dir/file", "exe", "dir/file.exe")] + public void ChangeExtension(string path, string newExtension, string expected) { if (expected != null) expected = expected.Replace('/', Path.DirectorySeparatorChar); @@ -36,214 +34,78 @@ namespace System.IO.Tests } [Fact] - public static void GetDirectoryName_EmptyThrows() + public void GetDirectoryName_NullReturnsNull() { - AssertExtensions.Throws("path", null, () => Path.GetDirectoryName(string.Empty)); + Assert.Null(Path.GetDirectoryName(null)); } - [Theory, - InlineData(" "), - InlineData("\r\n")] - [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] - public static void GetDirectoryName_SpaceOrControlCharsThrowOnWindows(string path) - { - Action action = () => Path.GetDirectoryName(path); - if (PlatformDetection.IsWindows) - { - AssertExtensions.Throws("path", null, () => Path.GetDirectoryName(path)); - } - else - { - // These are valid paths on Unix - action(); - } - } - - [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] - public static void GetDirectoryName_SpaceThrowOnWindows_Core() - { - string path = " "; - Action action = () => Path.GetDirectoryName(path); - if (PlatformDetection.IsWindows) - { - AssertExtensions.Throws("path", null, () => Path.GetDirectoryName(path)); - } - else - { - // This is a valid path on Unix - action(); - } - } - - [Theory] - [InlineData("\u00A0")] // Non-breaking Space - [InlineData("\u2028")] // Line separator - [InlineData("\u2029")] // Paragraph separator - public static void GetDirectoryName_NonControl(string path) - { - Assert.Equal(string.Empty, Path.GetDirectoryName(path)); - } - - [Theory] - [InlineData("\u00A0")] // Non-breaking Space - [InlineData("\u2028")] // Line separator - [InlineData("\u2029")] // Paragraph separator - public static void GetDirectoryName_NonControlWithSeparator(string path) - { - Assert.Equal(path, Path.GetDirectoryName(Path.Combine(path, path))); - } - - [Theory] - [InlineData(null, null)] - [InlineData(".", "")] - [InlineData("..", "")] - [InlineData("baz", "")] - public static void GetDirectoryName(string path, string expected) - { - Assert.Equal(expected, Path.GetDirectoryName(path)); - } - - [Theory] - [InlineData(@"dir/baz", "dir")] - [InlineData(@"dir\baz", "dir")] - [InlineData(@"dir\baz\bar", @"dir\baz")] - [InlineData(@"dir\\baz", "dir")] - [InlineData(@" dir\baz", " dir")] - [InlineData(@" C:\dir\baz", @"C:\dir")] - [InlineData(@"..\..\files.txt", @"..\..")] - [InlineData(@"C:\", null)] - [InlineData(@"C:", null)] - [PlatformSpecific(TestPlatforms.Windows)] // Tests Windows-specific paths - public static void GetDirectoryName_Windows(string path, string expected) - { - Assert.Equal(expected, Path.GetDirectoryName(path)); - } - - [Theory] - [InlineData(@"dir/baz", @"dir")] - [InlineData(@"dir//baz", @"dir")] - [InlineData(@"dir\baz", @"")] - [InlineData(@"dir/baz/bar", @"dir/baz")] - [InlineData(@"../../files.txt", @"../..")] - [InlineData(@"/", null)] - [PlatformSpecific(TestPlatforms.AnyUnix)] // Tests Unix-specific paths - public static void GetDirectoryName_Unix(string path, string expected) + [Theory, MemberData(nameof(TestData_GetDirectoryName))] + public void GetDirectoryName(string path, string expected) { Assert.Equal(expected, Path.GetDirectoryName(path)); } [Fact] - public static void GetDirectoryName_CurrentDirectory() + public void GetDirectoryName_CurrentDirectory() { string curDir = Directory.GetCurrentDirectory(); Assert.Equal(curDir, Path.GetDirectoryName(Path.Combine(curDir, "baz"))); + Assert.Equal(null, Path.GetDirectoryName(Path.GetPathRoot(curDir))); } - [PlatformSpecific(TestPlatforms.AnyUnix)] // Checks Unix-specific special characters in directory path [Fact] - public static void GetDirectoryName_ControlCharacters_Unix() + public void GetExtension_Null() { - Assert.Equal(new string('\t', 1), Path.GetDirectoryName(Path.Combine(new string('\t', 1), "file"))); - Assert.Equal(new string('\b', 2), Path.GetDirectoryName(Path.Combine(new string('\b', 2), "fi le"))); - Assert.Equal(new string('\v', 3), Path.GetDirectoryName(Path.Combine(new string('\v', 3), "fi\nle"))); - Assert.Equal(new string('\n', 4), Path.GetDirectoryName(Path.Combine(new string('\n', 4), "fi\rle"))); + Assert.Null(Path.GetExtension(null)); } - [Theory] - [InlineData("file.exe", ".exe")] - [InlineData("file", "")] - [InlineData(null, null)] - [InlineData("file.", "")] - [InlineData("file.s", ".s")] - [InlineData("test/file", "")] - [InlineData("test/file.extension", ".extension")] - public static void GetExtension(string path, string expected) - { - if (path != null) - { - path = path.Replace('/', Path.DirectorySeparatorChar); - } - Assert.Equal(expected, Path.GetExtension(path)); - Assert.Equal(!string.IsNullOrEmpty(expected), Path.HasExtension(path)); - } - - [PlatformSpecific(TestPlatforms.AnyUnix)] // Checks file extension behavior on Unix - [Theory] - [InlineData("file.e xe", ".e xe")] - [InlineData("file. ", ". ")] - [InlineData(" file. ", ". ")] - [InlineData(" file.extension", ".extension")] - [InlineData("file.exten\tsion", ".exten\tsion")] - public static void GetExtension_Unix(string path, string expected) + [Theory, MemberData(nameof(TestData_GetExtension))] + public void GetExtension(string path, string expected) { Assert.Equal(expected, Path.GetExtension(path)); Assert.Equal(!string.IsNullOrEmpty(expected), Path.HasExtension(path)); } - public static IEnumerable GetFileName_TestData() + [Fact] + public void GetFileName_Null() { - yield return new object[] { null, null }; - yield return new object[] { ".", "." }; - yield return new object[] { "..", ".." }; - yield return new object[] { "file", "file" }; - yield return new object[] { "file.", "file." }; - yield return new object[] { "file.exe", "file.exe" }; - yield return new object[] { Path.Combine("baz", "file.exe"), "file.exe" }; - yield return new object[] { Path.Combine("bar", "baz", "file.exe"), "file.exe" }; - yield return new object[] { Path.Combine("bar", "baz", "file.exe") + Path.DirectorySeparatorChar, "" }; + Assert.Null(Path.GetFileName(null)); } - [Theory] - [MemberData(nameof(GetFileName_TestData))] - public static void GetFileName(string path, string expected) + [Fact] + public void GetFileName_Empty() + { + Assert.Empty(Path.GetFileName(string.Empty)); + } + + [Theory, MemberData(nameof(TestData_GetFileName))] + public void GetFileName(string path, string expected) { Assert.Equal(expected, Path.GetFileName(path)); + Assert.Equal(expected, Path.GetFileName(Path.Combine("whizzle", path))); } - [PlatformSpecific(TestPlatforms.AnyUnix)] // Tests Unix-specific valid file names [Fact] - public static void GetFileName_Unix() + public void GetFileNameWithoutExtension_Null() { - Assert.Equal(" . ", Path.GetFileName(" . ")); - Assert.Equal(" .. ", Path.GetFileName(" .. ")); - Assert.Equal("fi le", Path.GetFileName("fi le")); - Assert.Equal("fi le", Path.GetFileName("fi le")); - Assert.Equal("fi le", Path.GetFileName(Path.Combine("b \r\n ar", "fi le"))); + Assert.Null(Path.GetFileNameWithoutExtension(null)); } - public static IEnumerable GetFileNameWithoutExtension_TestData() - { - yield return new object[] { null, null }; - yield return new object[] { "", "" }; - yield return new object[] { "file", "file" }; - yield return new object[] { "file.exe", "file" }; - yield return new object[] { Path.Combine("bar", "baz", "file.exe"), "file" }; - yield return new object[] { Path.Combine("bar", "baz") + Path.DirectorySeparatorChar, "" }; - } - - [Theory] - [MemberData(nameof(GetFileNameWithoutExtension_TestData))] - public static void GetFileNameWithoutExtension(string path, string expected) + [Theory, MemberData(nameof(TestData_GetFileNameWithoutExtension))] + public void GetFileNameWithoutExtension(string path, string expected) { Assert.Equal(expected, Path.GetFileNameWithoutExtension(path)); } [Fact] - public static void GetPathRoot_NullReturnsNull() + public void GetPathRoot_Null() { Assert.Null(Path.GetPathRoot(null)); } [Fact] - public static void GetPathRoot_EmptyThrows() - { - AssertExtensions.Throws("path", null, () => Path.GetPathRoot(string.Empty)); - } - - [Fact] - public static void GetPathRoot_Basic() + public void GetPathRoot_Basic() { string cwd = Directory.GetCurrentDirectory(); Assert.Equal(cwd.Substring(0, cwd.IndexOf(Path.DirectorySeparatorChar) + 1), Path.GetPathRoot(cwd)); @@ -253,83 +115,36 @@ namespace System.IO.Tests Assert.False(Path.IsPathRooted("file.exe")); } - [PlatformSpecific(TestPlatforms.Windows)] // Tests UNC - [Theory] - [InlineData(@"\\test\unc\path\to\something", @"\\test\unc")] - [InlineData(@"\\a\b\c\d\e", @"\\a\b")] - [InlineData(@"\\a\b\", @"\\a\b")] - [InlineData(@"\\a\b", @"\\a\b")] - [InlineData(@"\\test\unc", @"\\test\unc")] - public static void GetPathRoot_Windows_UncAndExtended(string value, string expected) - { - Assert.True(Path.IsPathRooted(value)); - Assert.Equal(expected, Path.GetPathRoot(value)); - } - - [PlatformSpecific(TestPlatforms.Windows)] // Tests UNC - [Theory] - [InlineData(@"\\?\UNC\test\unc", @"\\?\UNC", @"\\?\UNC\test\unc\path\to\something")] - [InlineData(@"\\?\UNC\test\unc", @"\\?\UNC", @"\\?\UNC\test\unc")] - [InlineData(@"\\?\UNC\a\b1", @"\\?\UNC", @"\\?\UNC\a\b1")] - [InlineData(@"\\?\UNC\a\b2", @"\\?\UNC", @"\\?\UNC\a\b2\")] - [InlineData(@"\\?\C:\", @"\\?\C:", @"\\?\C:\foo\bar.txt")] - public static void GetPathRoot_Windows_UncAndExtended_WithLegacySupport(string normalExpected, string legacyExpected, string value) - { - Assert.True(Path.IsPathRooted(value)); - - string expected = PathFeatures.IsUsingLegacyPathNormalization() ? legacyExpected : normalExpected; - Assert.Equal(expected, Path.GetPathRoot(value)); - } - - [PlatformSpecific(TestPlatforms.Windows)] // Tests Windows-specific path convention - [Theory] - [InlineData(@"C:", @"C:")] - [InlineData(@"C:\", @"C:\")] - [InlineData(@"C:\\", @"C:\")] - [InlineData(@"C://", @"C:\")] - [InlineData(@"C:\foo1", @"C:\")] - [InlineData(@"C:\\foo2", @"C:\")] - [InlineData(@"C://foo3", @"C:\")] - public static void GetPathRoot_Windows(string value, string expected) - { - Assert.True(Path.IsPathRooted(value)); - Assert.Equal(expected, Path.GetPathRoot(value)); - } - - [PlatformSpecific(TestPlatforms.AnyUnix)] // Tests Unix-specific path convention [Fact] - public static void GetPathRoot_Unix() + public void GetInvalidPathChars_Invariants() { - // slashes are normal filename characters - string uncPath = @"\\test\unc\path\to\something"; - Assert.False(Path.IsPathRooted(uncPath)); - Assert.Equal(string.Empty, Path.GetPathRoot(uncPath)); - } - - [Theory] - [InlineData(null)] - [InlineData("")] - [InlineData(" ")] - public static void IsPathRooted(string path) - { - Assert.False(Path.IsPathRooted(path)); - } - - // Testing invalid drive letters !(a-zA-Z) - [PlatformSpecific(TestPlatforms.Windows)] - [Theory] - [InlineData(@"@:\foo")] // 064 = @ 065 = A - [InlineData(@"[:\\")] // 091 = [ 090 = Z - [InlineData(@"`:\foo")] // 096 = ` 097 = a - [InlineData(@"{:\\")] // 123 = { 122 = z - [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Bug fixed on Core where it would return true if the first char is not a drive letter followed by a VolumeSeparatorChar coreclr/10297")] - public static void IsPathRooted_Windows_Invalid(string value) - { - Assert.False(Path.IsPathRooted(value)); + Assert.NotNull(Path.GetInvalidPathChars()); + Assert.NotSame(Path.GetInvalidPathChars(), Path.GetInvalidPathChars()); + Assert.Equal((IEnumerable)Path.GetInvalidPathChars(), Path.GetInvalidPathChars()); + Assert.True(Path.GetInvalidPathChars().Length > 0); } [Fact] - public static void GetRandomFileName() + public void InvalidPathChars_MatchesGetInvalidPathChars() + { +#pragma warning disable 0618 + Assert.NotNull(Path.InvalidPathChars); + Assert.Equal(Path.GetInvalidPathChars(), Path.InvalidPathChars); + Assert.Same(Path.InvalidPathChars, Path.InvalidPathChars); +#pragma warning restore 0618 + } + + [Fact] + public void GetInvalidFileNameChars_Invariants() + { + Assert.NotNull(Path.GetInvalidFileNameChars()); + Assert.NotSame(Path.GetInvalidFileNameChars(), Path.GetInvalidFileNameChars()); + Assert.Equal((IEnumerable)Path.GetInvalidFileNameChars(), Path.GetInvalidFileNameChars()); + Assert.True(Path.GetInvalidFileNameChars().Length > 0); + } + + [Fact] + public void GetRandomFileName() { char[] invalidChars = Path.GetInvalidFileNameChars(); var fileNames = new HashSet(); @@ -344,85 +159,7 @@ namespace System.IO.Tests } [Fact] - [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] - public static void GetInvalidPathChars() - { - Assert.NotNull(Path.GetInvalidPathChars()); - Assert.NotSame(Path.GetInvalidPathChars(), Path.GetInvalidPathChars()); - Assert.Equal((IEnumerable)Path.GetInvalidPathChars(), Path.GetInvalidPathChars()); - Assert.True(Path.GetInvalidPathChars().Length > 0); - Assert.All(Path.GetInvalidPathChars(), c => - { - string bad = c.ToString(); - AssertExtensions.Throws("path", null, () => Path.ChangeExtension(bad, "ok")); - AssertExtensions.Throws("path", null, () => Path.Combine(bad, "ok")); - AssertExtensions.Throws("path", null, () => Path.Combine("ok", "ok", bad)); - AssertExtensions.Throws("path", null, () => Path.Combine("ok", "ok", bad, "ok")); - AssertExtensions.Throws("path", null, () => Path.Combine(bad, bad, bad, bad, bad)); - AssertExtensions.Throws("path", null, () => Path.GetDirectoryName(bad)); - AssertExtensions.Throws("path", null, () => Path.GetExtension(bad)); - AssertExtensions.Throws("path", null, () => Path.GetFileName(bad)); - AssertExtensions.Throws("path", null, () => Path.GetFileNameWithoutExtension(bad)); - AssertExtensions.Throws(c == 124 ? null : "path", null, () => Path.GetFullPath(bad)); - AssertExtensions.Throws("path", null, () => Path.GetPathRoot(bad)); - AssertExtensions.Throws("path", null, () => Path.IsPathRooted(bad)); - }); - } - - [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] - public static void GetInvalidPathChars_Core() - { - Assert.NotNull(Path.GetInvalidPathChars()); - Assert.NotSame(Path.GetInvalidPathChars(), Path.GetInvalidPathChars()); - Assert.Equal((IEnumerable)Path.GetInvalidPathChars(), Path.GetInvalidPathChars()); - Assert.True(Path.GetInvalidPathChars().Length > 0); - Assert.All(Path.GetInvalidPathChars(), c => - { - string bad = c.ToString(); - Assert.Equal(bad + ".ok", Path.ChangeExtension(bad, "ok")); - Assert.Equal(bad + Path.DirectorySeparatorChar + "ok", Path.Combine(bad, "ok")); - Assert.Equal("ok" + Path.DirectorySeparatorChar + "ok" + Path.DirectorySeparatorChar + bad, Path.Combine("ok", "ok", bad)); - Assert.Equal("ok" + Path.DirectorySeparatorChar + "ok" + Path.DirectorySeparatorChar + bad + Path.DirectorySeparatorChar + "ok", Path.Combine("ok", "ok", bad, "ok")); - Assert.Equal(bad + Path.DirectorySeparatorChar + bad + Path.DirectorySeparatorChar + bad + Path.DirectorySeparatorChar + bad + Path.DirectorySeparatorChar + bad, Path.Combine(bad, bad, bad, bad, bad)); - Assert.Equal("", Path.GetDirectoryName(bad)); - Assert.Equal(string.Empty, Path.GetExtension(bad)); - Assert.Equal(bad, Path.GetFileName(bad)); - Assert.Equal(bad, Path.GetFileNameWithoutExtension(bad)); - AssertExtensions.Throws(c == 124 ? null : "path", null, () => Path.GetFullPath(bad)); - Assert.Equal(string.Empty, Path.GetPathRoot(bad)); - Assert.False(Path.IsPathRooted(bad)); - }); - } - - [Fact] - public static void GetInvalidFileNameChars() - { - Assert.NotNull(Path.GetInvalidFileNameChars()); - Assert.NotSame(Path.GetInvalidFileNameChars(), Path.GetInvalidFileNameChars()); - Assert.Equal((IEnumerable)Path.GetInvalidFileNameChars(), Path.GetInvalidFileNameChars()); - Assert.True(Path.GetInvalidFileNameChars().Length > 0); - } - - [Fact] - [OuterLoop] - public static void GetInvalidFileNameChars_OtherCharsValid() - { - string curDir = Directory.GetCurrentDirectory(); - var invalidChars = new HashSet(Path.GetInvalidFileNameChars()); - for (int i = 0; i < char.MaxValue; i++) - { - char c = (char)i; - if (!invalidChars.Contains(c)) - { - string name = "file" + c + ".txt"; - Assert.Equal(Path.Combine(curDir, name), Path.GetFullPath(name)); - } - } - } - - [Fact] - public static void GetTempPath_Default() + public void GetTempPath_Default() { string tmpPath = Path.GetTempPath(); Assert.False(string.IsNullOrEmpty(tmpPath)); @@ -431,57 +168,8 @@ namespace System.IO.Tests Assert.True(Directory.Exists(tmpPath)); } - [PlatformSpecific(TestPlatforms.Windows)] // Sets environment vars with Windows-specific paths - [Theory] - [InlineData(@"C:\Users\someuser\AppData\Local\Temp\", @"C:\Users\someuser\AppData\Local\Temp")] - [InlineData(@"C:\Users\someuser\AppData\Local\Temp\", @"C:\Users\someuser\AppData\Local\Temp\")] - [InlineData(@"C:\", @"C:\")] - [InlineData(@"C:\tmp\", @"C:\tmp")] - [InlineData(@"C:\tmp\", @"C:\tmp\")] - public static void GetTempPath_SetEnvVar_Windows(string expected, string newTempPath) - { - GetTempPath_SetEnvVar("TMP", expected, newTempPath); - } - - [PlatformSpecific(TestPlatforms.AnyUnix)] // Sets environment vars with Unix-specific paths - [Theory] - [InlineData("/tmp/", "/tmp")] - [InlineData("/tmp/", "/tmp/")] - [InlineData("/", "/")] - [InlineData("/var/tmp/", "/var/tmp")] - [InlineData("/var/tmp/", "/var/tmp/")] - [InlineData("~/", "~")] - [InlineData("~/", "~/")] - [InlineData(".tmp/", ".tmp")] - [InlineData("./tmp/", "./tmp")] - [InlineData("/home/someuser/sometempdir/", "/home/someuser/sometempdir/")] - [InlineData("/home/someuser/some tempdir/", "/home/someuser/some tempdir/")] - [InlineData("/tmp/", null)] - public static void GetTempPath_SetEnvVar_Unix(string expected, string newTempPath) - { - GetTempPath_SetEnvVar("TMPDIR", expected, newTempPath); - } - - private static void GetTempPath_SetEnvVar(string envVar, string expected, string newTempPath) - { - string original = Path.GetTempPath(); - Assert.NotNull(original); - try - { - Environment.SetEnvironmentVariable(envVar, newTempPath); - Assert.Equal( - Path.GetFullPath(expected), - Path.GetFullPath(Path.GetTempPath())); - } - finally - { - Environment.SetEnvironmentVariable(envVar, original); - Assert.Equal(original, Path.GetTempPath()); - } - } - [Fact] - public static void GetTempFileName() + public void GetTempFileName() { string tmpFile = Path.GetTempFileName(); try @@ -501,449 +189,82 @@ namespace System.IO.Tests } } - [Theory] - [InlineData("\u0085")] // Next line - [InlineData("\u00A0")] // Non breaking space - [InlineData("\u2028")] // Line separator - [PlatformSpecific(TestPlatforms.Windows)] - [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] // not NetFX - public static void GetFullPath_NonControlWhiteSpaceStays(string component) - { - // When not NetFX full path should not cut off component - string path = "C:\\Test" + component; - Assert.Equal(path, Path.GetFullPath(path)); - } - - [Theory] - [InlineData(" ")] - [InlineData(" ")] - [InlineData(" ")] - [PlatformSpecific(TestPlatforms.Windows)] - public static void GetFullPath_TrailingSpaceCut(string component) - { - // Windows cuts off any simple white space added to a path - string path = "C:\\Test" + component; - Assert.Equal("C:\\Test", Path.GetFullPath(path)); - } - [Fact] - public static void GetFullPath_InvalidArgs() + public void GetFullPath_InvalidArgs() { Assert.Throws(() => Path.GetFullPath(null)); AssertExtensions.Throws("path", null, () => Path.GetFullPath(string.Empty)); } - public static IEnumerable GetFullPath_BasicExpansions_TestData() + public static TheoryData GetFullPath_BasicExpansions { - string curDir = Directory.GetCurrentDirectory(); - yield return new object[] { curDir, curDir }; // Current directory => current directory - yield return new object[] { ".", curDir }; // "." => current directory - yield return new object[] { "..", Path.GetDirectoryName(curDir) }; // "." => up a directory - yield return new object[] { Path.Combine(curDir, ".", ".", ".", ".", "."), curDir }; // "dir/./././." => "dir" - yield return new object[] { curDir + new string(Path.DirectorySeparatorChar, 3) + ".", curDir }; // "dir///." => "dir" - yield return new object[] { Path.Combine(curDir, "..", Path.GetFileName(curDir), ".", "..", Path.GetFileName(curDir)), curDir }; // "dir/../dir/./../dir" => "dir" - yield return new object[] { Path.Combine(Path.GetPathRoot(curDir), "somedir", ".."), Path.GetPathRoot(curDir) }; // "C:\somedir\.." => "C:\" - yield return new object[] { Path.Combine(Path.GetPathRoot(curDir), "."), Path.GetPathRoot(curDir) }; // "C:\." => "C:\" - yield return new object[] { Path.Combine(Path.GetPathRoot(curDir), "..", "..", "..", ".."), Path.GetPathRoot(curDir) }; // "C:\..\..\..\.." => "C:\" - yield return new object[] { Path.GetPathRoot(curDir) + new string(Path.DirectorySeparatorChar, 3), Path.GetPathRoot(curDir) }; // "C:\\\" => "C:\" - - // Path longer than MaxPath that normalizes down to less than MaxPath - const int Iters = 10000; - var longPath = new StringBuilder(curDir, curDir.Length + (Iters * 2)); - for (int i = 0; i < 10000; i++) + get { - longPath.Append(Path.DirectorySeparatorChar).Append('.'); + string currentDirectory = Directory.GetCurrentDirectory(); + string root = Path.GetPathRoot(currentDirectory); + string fileName = Path.GetFileName(currentDirectory); + + TheoryData data = new TheoryData + { + // Current directory => current directory + { currentDirectory, currentDirectory }, + // "." => current directory + { ".", currentDirectory }, + // ".." => up a directory + { "..", Path.GetDirectoryName(currentDirectory) }, + // "dir/./././." => "dir" + { Path.Combine(currentDirectory, ".", ".", ".", ".", "."), currentDirectory }, + // "dir///." => "dir" + { currentDirectory + new string(Path.DirectorySeparatorChar, 3) + ".", currentDirectory }, + // "dir/../dir/./../dir" => "dir" + { Path.Combine(currentDirectory, "..", fileName, ".", "..", fileName), currentDirectory }, + // "C:\somedir\.." => "C:\" + { Path.Combine(root, "somedir", ".."), root }, + // "C:\." => "C:\" + { Path.Combine(root, "."), root }, + // "C:\..\..\..\.." => "C:\" + { Path.Combine(root, "..", "..", "..", ".."), root }, + // "C:\\\" => "C:\" + { root + new string(Path.DirectorySeparatorChar, 3), root }, + }; + + // Path longer than MaxPath that normalizes down to less than MaxPath + const int Iters = 10000; + var longPath = new StringBuilder(currentDirectory, currentDirectory.Length + (Iters * 2)); + for (int i = 0; i < 10000; i++) + { + longPath.Append(Path.DirectorySeparatorChar).Append('.'); + } + data.Add(longPath.ToString(), currentDirectory); + + return data; } - yield return new object[] { longPath.ToString(), curDir }; } - [Theory] - [MemberData(nameof(GetFullPath_BasicExpansions_TestData))] - public static void GetFullPath_BasicExpansions(string path, string expected) + public static TheoryData GetFullPath_TildePaths + { + get + { + // Paths with tildes '~' are processed for 8.3 expansion on Windows + string currentDirectory = Directory.GetCurrentDirectory(); + string root = Path.GetPathRoot(currentDirectory); + + TheoryData data = new TheoryData + { + { "~", Path.Combine(currentDirectory, "~") }, + { Path.Combine(root, "~"), Path.Combine(root, "~") } + }; + + return data; + } + } + + [Theory, + MemberData(nameof(GetFullPath_BasicExpansions)), + MemberData(nameof(GetFullPath_TildePaths))] + public void GetFullPath_CoreTests(string path, string expected) { Assert.Equal(expected, Path.GetFullPath(path)); } - - [PlatformSpecific(TestPlatforms.AnyUnix)] // Tests whitespace in paths on Unix - [Fact] - public static void GetFullPath_Unix_Whitespace() - { - string curDir = Directory.GetCurrentDirectory(); - Assert.Equal("/ / ", Path.GetFullPath("/ // ")); - Assert.Equal(Path.Combine(curDir, " "), Path.GetFullPath(" ")); - Assert.Equal(Path.Combine(curDir, "\r\n"), Path.GetFullPath("\r\n")); - } - - [PlatformSpecific(TestPlatforms.AnyUnix)] // Tests URIs as valid file names - [Theory] - [InlineData("http://www.microsoft.com")] - [InlineData("file://somefile")] - public static void GetFullPath_Unix_URIsAsFileNames(string uriAsFileName) - { - // URIs are valid filenames, though the multiple slashes will be consolidated in GetFullPath - Assert.Equal( - Path.Combine(Directory.GetCurrentDirectory(), uriAsFileName.Replace("//", "/")), - Path.GetFullPath(uriAsFileName)); - } - - [PlatformSpecific(TestPlatforms.Windows)] // Checks normalized long path (> MaxPath) on Windows - [Fact] - public static void GetFullPath_Windows_NormalizedLongPathTooLong() - { - // Try out a long path that normalizes down to more than MaxPath - string curDir = Directory.GetCurrentDirectory(); - const int Iters = 260; - var longPath = new StringBuilder(curDir, curDir.Length + (Iters * 4)); - for (int i = 0; i < Iters; i++) - { - longPath.Append(Path.DirectorySeparatorChar).Append('a').Append(Path.DirectorySeparatorChar).Append('.'); - } - - if (PathFeatures.AreAllLongPathsAvailable()) - { - // Now no longer throws unless over ~32K - Assert.NotNull(Path.GetFullPath(longPath.ToString())); - } - else - { - Assert.Throws(() => Path.GetFullPath(longPath.ToString())); - } - } - - [PlatformSpecific(TestPlatforms.Windows)] // Tests Windows-specific invalid paths - [Fact] - public static void GetFullPath_Windows_AlternateDataStreamsNotSupported() - { - // Throws via our invalid colon filtering - Assert.Throws(() => Path.GetFullPath(@"bad:path")); - Assert.Throws(() => Path.GetFullPath(@"C:\some\bad:path")); - } - - [PlatformSpecific(TestPlatforms.Windows)] // Tests Windows-specific invalid paths - [Theory] - [InlineData("http://www.microsoft.com")] - [InlineData("file://www.microsoft.com")] - public static void GetFullPath_Windows_URIFormatNotSupported(string path) - { - // Throws via our invalid colon filtering - if (!PathFeatures.IsUsingLegacyPathNormalization()) - { - Assert.Throws(() => Path.GetFullPath(path)); - } - } - - [PlatformSpecific(TestPlatforms.Windows)] // Tests Windows-specific invalid paths - [Theory] - [InlineData(@"bad::$DATA")] - [InlineData(@"C :")] - [InlineData(@"C :\somedir")] - public static void GetFullPath_Windows_NotSupportedExceptionPaths(string path) - { - // Old path normalization throws ArgumentException, new one throws NotSupportedException - if (!PathFeatures.IsUsingLegacyPathNormalization()) - { - Assert.Throws(() => Path.GetFullPath(path)); - } - else - { - AssertExtensions.Throws(null, () => Path.GetFullPath(path)); - } - } - - [PlatformSpecific(TestPlatforms.Windows)] // Tests legitimate Windows paths that are now allowed - [Theory] - [InlineData(@"C:...")] - [InlineData(@"C:...\somedir")] - [InlineData(@"\.. .\")] - [InlineData(@"\. .\")] - [InlineData(@"\ .\")] - public static void GetFullPath_Windows_LegacyArgumentExceptionPaths(string path) - { - if (PathFeatures.IsUsingLegacyPathNormalization()) - { - // We didn't allow these paths on < 4.6.2 - AssertExtensions.Throws(null, () => Path.GetFullPath(path)); - } - else - { - // These paths are legitimate Windows paths that can be created without extended syntax. - // We now allow them through. - Path.GetFullPath(path); - } - } - - [PlatformSpecific(TestPlatforms.Windows)] // Tests MaxPathNotTooLong on Windows - [Fact] - public static void GetFullPath_Windows_MaxPathNotTooLong() - { - string value = @"C:\" + new string('a', 255) + @"\"; - if (PathFeatures.AreAllLongPathsAvailable()) - { - // Shouldn't throw anymore - Path.GetFullPath(value); - } - else - { - Assert.Throws(() => Path.GetFullPath(value)); - } - } - - [PlatformSpecific(TestPlatforms.Windows)] // Tests PathTooLong on Windows - [Fact] - public static void GetFullPath_Windows_PathTooLong() - { - Assert.Throws(() => Path.GetFullPath(@"C:\" + new string('a', short.MaxValue) + @"\")); - } - - [PlatformSpecific(TestPlatforms.Windows)] // Tests Windows-specific paths - [Theory] - [InlineData(@"C:\", @"C:\")] - [InlineData(@"C:\.", @"C:\")] - [InlineData(@"C:\..", @"C:\")] - [InlineData(@"C:\..\..", @"C:\")] - [InlineData(@"C:\A\..", @"C:\")] - [InlineData(@"C:\..\..\A\..", @"C:\")] - public static void GetFullPath_Windows_RelativeRoot(string path, string expected) - { - Assert.Equal(Path.GetFullPath(path), expected); - } - - [PlatformSpecific(TestPlatforms.Windows)] // Tests legitimate strage windows paths that are now allowed - [Fact] - public static void GetFullPath_Windows_StrangeButLegalPaths() - { - // These are legal and creatable without using extended syntax if you use a trailing slash - // (such as "md ...\"). We used to filter these out, but now allow them to prevent apps from - // being blocked when they hit these paths. - string curDir = Directory.GetCurrentDirectory(); - if (PathFeatures.IsUsingLegacyPathNormalization()) - { - // Legacy path Path.GetFullePath() ignores . when there is less or more that two, when there is .. in the path it returns one directory up. - Assert.Equal( - Path.GetFullPath(curDir + Path.DirectorySeparatorChar), - Path.GetFullPath(curDir + Path.DirectorySeparatorChar + ". " + Path.DirectorySeparatorChar)); - Assert.Equal( - Path.GetFullPath(Path.GetDirectoryName(curDir) + Path.DirectorySeparatorChar), - Path.GetFullPath(curDir + Path.DirectorySeparatorChar + "..." + Path.DirectorySeparatorChar)); - Assert.Equal( - Path.GetFullPath(Path.GetDirectoryName(curDir) + Path.DirectorySeparatorChar), - Path.GetFullPath(curDir + Path.DirectorySeparatorChar + ".. " + Path.DirectorySeparatorChar)); - } - else - { - Assert.NotEqual( - Path.GetFullPath(curDir + Path.DirectorySeparatorChar), - Path.GetFullPath(curDir + Path.DirectorySeparatorChar + ". " + Path.DirectorySeparatorChar)); - Assert.NotEqual( - Path.GetFullPath(Path.GetDirectoryName(curDir) + Path.DirectorySeparatorChar), - Path.GetFullPath(curDir + Path.DirectorySeparatorChar + "..." + Path.DirectorySeparatorChar)); - Assert.NotEqual( - Path.GetFullPath(Path.GetDirectoryName(curDir) + Path.DirectorySeparatorChar), - Path.GetFullPath(curDir + Path.DirectorySeparatorChar + ".. " + Path.DirectorySeparatorChar)); - } - } - - [PlatformSpecific(TestPlatforms.Windows)] // Tests Windows-specific paths - [Theory] - [InlineData(@"\\?\C:\ ")] - [InlineData(@"\\?\C:\ \ ")] - [InlineData(@"\\?\C:\ .")] - [InlineData(@"\\?\C:\ ..")] - [InlineData(@"\\?\C:\...")] - [InlineData(@"\\?\GLOBALROOT\")] - [InlineData(@"\\?\")] - [InlineData(@"\\?\.")] - [InlineData(@"\\?\..")] - [InlineData(@"\\?\\")] - [InlineData(@"\\?\C:\\")] - [InlineData(@"\\?\C:\|")] - [InlineData(@"\\?\C:\.")] - [InlineData(@"\\?\C:\..")] - [InlineData(@"\\?\C:\Foo1\.")] - [InlineData(@"\\?\C:\Foo2\..")] - [InlineData(@"\\?\UNC\")] - [InlineData(@"\\?\UNC\server1")] - [InlineData(@"\\?\UNC\server2\")] - [InlineData(@"\\?\UNC\server3\\")] - [InlineData(@"\\?\UNC\server4\..")] - [InlineData(@"\\?\UNC\server5\share\.")] - [InlineData(@"\\?\UNC\server6\share\..")] - [InlineData(@"\\?\UNC\a\b\\")] - [InlineData(@"\\.\")] - [InlineData(@"\\.\.")] - [InlineData(@"\\.\..")] - [InlineData(@"\\.\\")] - [InlineData(@"\\.\C:\\")] - [InlineData(@"\\.\C:\|")] - [InlineData(@"\\.\C:\.")] - [InlineData(@"\\.\C:\..")] - [InlineData(@"\\.\C:\Foo1\.")] - [InlineData(@"\\.\C:\Foo2\..")] - public static void GetFullPath_Windows_ValidExtendedPaths(string path) - { - if (PathFeatures.IsUsingLegacyPathNormalization()) - { - // Legacy Path doesn't support any of these paths. - AssertExtensions.ThrowsAny(() => Path.GetFullPath(path)); - return; - } - - // None of these should throw - if (path.StartsWith(@"\\?\")) - { - Assert.Equal(path, Path.GetFullPath(path)); - } - else - { - Path.GetFullPath(path); - } - } - - [PlatformSpecific(TestPlatforms.Windows)] // Tests Windows-specific paths - [Theory] - [InlineData(@"\\.\UNC\")] - [InlineData(@"\\.\UNC\LOCALHOST")] - [InlineData(@"\\.\UNC\localHOST\")] - [InlineData(@"\\.\UNC\LOcaLHOST\\")] - [InlineData(@"\\.\UNC\lOCALHOST\..")] - [InlineData(@"\\.\UNC\LOCALhost\share\.")] - [InlineData(@"\\.\UNC\loCALHOST\share\..")] - [InlineData(@"\\.\UNC\a\b\\")] - public static void GetFullPath_Windows_ValidLegacy_ValidExtendedPaths(string path) - { - // should not throw - Path.GetFullPath(path); - } - - [PlatformSpecific(TestPlatforms.Windows)] // Tests valid paths based on UNC - [Theory] - // https://github.com/dotnet/corefx/issues/11965 - [InlineData(@"\\LOCALHOST\share\test.txt.~SS", @"\\LOCALHOST\share\test.txt.~SS")] - [InlineData(@"\\LOCALHOST\share1", @"\\LOCALHOST\share1")] - [InlineData(@"\\LOCALHOST\share2", @" \\LOCALHOST\share2")] - [InlineData(@"\\LOCALHOST\share3\dir", @"\\LOCALHOST\share3\dir")] - [InlineData(@"\\LOCALHOST\share4", @"\\LOCALHOST\share4\.")] - [InlineData(@"\\LOCALHOST\share5", @"\\LOCALHOST\share5\..")] - [InlineData(@"\\LOCALHOST\share6\", @"\\LOCALHOST\share6\ ")] - [InlineData(@"\\LOCALHOST\ share7\", @"\\LOCALHOST\ share7\")] - [InlineData(@"\\?\UNC\LOCALHOST\share8\test.txt.~SS", @"\\?\UNC\LOCALHOST\share8\test.txt.~SS")] - [InlineData(@"\\?\UNC\LOCALHOST\share9", @"\\?\UNC\LOCALHOST\share9")] - [InlineData(@"\\?\UNC\LOCALHOST\shareA\dir", @"\\?\UNC\LOCALHOST\shareA\dir")] - [InlineData(@"\\?\UNC\LOCALHOST\shareB\. ", @"\\?\UNC\LOCALHOST\shareB\. ")] - [InlineData(@"\\?\UNC\LOCALHOST\shareC\.. ", @"\\?\UNC\LOCALHOST\shareC\.. ")] - [InlineData(@"\\?\UNC\LOCALHOST\shareD\ ", @"\\?\UNC\LOCALHOST\shareD\ ")] - [InlineData(@"\\.\UNC\LOCALHOST\ shareE\", @"\\.\UNC\LOCALHOST\ shareE\")] - [InlineData(@"\\.\UNC\LOCALHOST\shareF\test.txt.~SS", @"\\.\UNC\LOCALHOST\shareF\test.txt.~SS")] - [InlineData(@"\\.\UNC\LOCALHOST\shareG", @"\\.\UNC\LOCALHOST\shareG")] - [InlineData(@"\\.\UNC\LOCALHOST\shareH\dir", @"\\.\UNC\LOCALHOST\shareH\dir")] - [InlineData(@"\\.\UNC\LOCALHOST\shareK\", @"\\.\UNC\LOCALHOST\shareK\ ")] - [InlineData(@"\\.\UNC\LOCALHOST\ shareL\", @"\\.\UNC\LOCALHOST\ shareL\")] - public static void GetFullPath_Windows_UNC_Valid(string expected, string input) - { - if (input.StartsWith(@"\\?\") && PathFeatures.IsUsingLegacyPathNormalization()) - { - AssertExtensions.Throws(null, () => Path.GetFullPath(input)); - } - else - { - Assert.Equal(expected, Path.GetFullPath(input)); - } - } - - [PlatformSpecific(TestPlatforms.Windows)] // Tests valid paths based on UNC - [Theory] - [InlineData(@"\\.\UNC\LOCALHOST\shareI\", @"\\.\UNC\LOCALHOST\shareI", @"\\.\UNC\LOCALHOST\shareI\. ")] - [InlineData(@"\\.\UNC\LOCALHOST\shareJ\", @"\\.\UNC\LOCALHOST", @"\\.\UNC\LOCALHOST\shareJ\.. ")] - public static void GetFullPath_Windows_UNC_Valid_LegacyPathSupport(string normalExpected, string legacyExpected, string input) - { - string expected = PathFeatures.IsUsingLegacyPathNormalization() ? legacyExpected : normalExpected; - Assert.Equal(expected, Path.GetFullPath(input)); - } - - [PlatformSpecific(TestPlatforms.Windows)] // Tests invalid paths based on UNC - [Theory] - [InlineData(@"\\")] - [InlineData(@"\\LOCALHOST")] - [InlineData(@"\\LOCALHOST\")] - [InlineData(@"\\LOCALHOST\\")] - [InlineData(@"\\LOCALHOST\..")] - public static void GetFullPath_Windows_UNC_Invalid(string invalidPath) - { - AssertExtensions.Throws(null, () => Path.GetFullPath(invalidPath)); - } - - [Fact] - [PlatformSpecific(TestPlatforms.Windows)] // Uses P/Invokes to get short path name - public static void GetFullPath_Windows_83Paths() - { - // Create a temporary file name with a name longer than 8.3 such that it'll need to be shortened. - string tempFilePath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N") + ".txt"); - File.Create(tempFilePath).Dispose(); - try - { - // Get its short name - var sb = new StringBuilder(260); - if (GetShortPathName(tempFilePath, sb, sb.Capacity) > 0) // only proceed if we could successfully create the short name - { - string shortName = sb.ToString(); - - // Make sure the shortened name expands back to the original one - // Sometimes shortening or GetFullPath is changing the casing of "temp" on some test machines: normalize both sides - tempFilePath = Regex.Replace(tempFilePath, @"\\temp\\", @"\TEMP\", RegexOptions.IgnoreCase); - shortName = Regex.Replace(Path.GetFullPath(shortName), @"\\temp\\", @"\TEMP\", RegexOptions.IgnoreCase); - Assert.Equal(tempFilePath, shortName); - - // Should work with device paths that aren't well-formed extended syntax - if (!PathFeatures.IsUsingLegacyPathNormalization()) - { - Assert.Equal(@"\\.\" + tempFilePath, Path.GetFullPath(@"\\.\" + shortName)); - Assert.Equal(@"\\?\" + tempFilePath, Path.GetFullPath(@"//?/" + shortName)); - - // Shouldn't mess with well-formed extended syntax - Assert.Equal(@"\\?\" + shortName, Path.GetFullPath(@"\\?\" + shortName)); - } - - // Validate case where short name doesn't expand to a real file - string invalidShortName = @"S:\DOESNT~1\USERNA~1.RED\LOCALS~1\Temp\bg3ylpzp"; - Assert.Equal(invalidShortName, Path.GetFullPath(invalidShortName)); - - // Same thing, but with a long path that normalizes down to a short enough one - const int Iters = 1000; - var shortLongName = new StringBuilder(invalidShortName, invalidShortName.Length + (Iters * 2)); - for (int i = 0; i < Iters; i++) - { - shortLongName.Append(Path.DirectorySeparatorChar).Append('.'); - } - Assert.Equal(invalidShortName, Path.GetFullPath(shortLongName.ToString())); - } - } - finally - { - File.Delete(tempFilePath); - } - } - - [PlatformSpecific(TestPlatforms.Windows)] // Tests Windows-specific invalid paths - [Theory] - [InlineData('*')] - [InlineData('?')] - public static void GetFullPath_Windows_Wildcards(char wildcard) - { - AssertExtensions.Throws("path", null, () => Path.GetFullPath("test" + wildcard + "ing")); - } - - // Windows-only P/Invoke to create 8.3 short names from long names - [DllImport("kernel32.dll", EntryPoint = "GetShortPathNameW" ,CharSet = CharSet.Unicode)] - private static extern uint GetShortPathName(string lpszLongPath, StringBuilder lpszShortPath, int cchBuffer); - - [Fact] - public static void InvalidPathChars_MatchesGetInvalidPathChars() - { -#pragma warning disable 0618 - Assert.NotNull(Path.InvalidPathChars); - Assert.Equal(Path.GetInvalidPathChars(), Path.InvalidPathChars); - Assert.Same(Path.InvalidPathChars, Path.InvalidPathChars); -#pragma warning restore 0618 - } } } diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests.netcoreapp.cs b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests.netcoreapp.cs new file mode 100644 index 0000000000..373838763e --- /dev/null +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests.netcoreapp.cs @@ -0,0 +1,246 @@ +// 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.Collections.Generic; +using Xunit; + +namespace System.IO.Tests +{ + public partial class PathTests : PathTestsBase + { + [Fact] + public void GetDirectoryName_EmptyReturnsNull() + { + // In NetFX this throws argument exception + Assert.Null(Path.GetDirectoryName(string.Empty)); + } + + [Theory, MemberData(nameof(TestData_Spaces))] + public void GetDirectoryName_Spaces(string path) + { + if (PlatformDetection.IsWindows) + { + // In Windows spaces are eaten by Win32, making them effectively empty + Assert.Null(Path.GetDirectoryName(path)); + } + else + { + Assert.Empty(Path.GetDirectoryName(path)); + } + } + + [Theory, MemberData(nameof(TestData_Spaces))] + public void GetDirectoryName_Span_Spaces(string path) + { + PathAssert.Empty(Path.GetDirectoryName(path.AsSpan())); + } + + [Theory, + MemberData(nameof(TestData_EmbeddedNull)), + MemberData(nameof(TestData_ControlChars)), + MemberData(nameof(TestData_UnicodeWhiteSpace))] + public void GetDirectoryName_NetFxInvalid(string path) + { + Assert.Empty(Path.GetDirectoryName(path)); + Assert.Equal(path, Path.GetDirectoryName(Path.Combine(path, path))); + PathAssert.Empty(Path.GetDirectoryName(path.AsSpan())); + PathAssert.Equal(path, new string(Path.GetDirectoryName(Path.Combine(path, path).AsSpan()))); + } + + [Theory, MemberData(nameof(TestData_GetDirectoryName))] + public void GetDirectoryName_Span(string path, string expected) + { + PathAssert.Equal(expected ?? ReadOnlySpan.Empty, Path.GetDirectoryName(path.AsSpan())); + } + + [Fact] + public void GetDirectoryName_Span_CurrentDirectory() + { + string curDir = Directory.GetCurrentDirectory(); + PathAssert.Equal(curDir, Path.GetDirectoryName(Path.Combine(curDir, "baz").AsSpan())); + PathAssert.Empty(Path.GetDirectoryName(Path.GetPathRoot(curDir).AsSpan())); + } + + [Theory, + InlineData(@" C:\dir/baz", @" C:\dir"), + InlineData(@" C:\dir/baz", @" C:\dir")] + public void GetDirectoryName_SkipSpaces(string path, string expected) + { + // We no longer trim leading spaces for any path + Assert.Equal(expected, Path.GetDirectoryName(path)); + } + + [Theory, MemberData(nameof(TestData_GetExtension))] + public void GetExtension_Span(string path, string expected) + { + PathAssert.Equal(expected, Path.GetExtension(path.AsSpan())); + Assert.Equal(!string.IsNullOrEmpty(expected), Path.HasExtension(path.AsSpan())); + } + + [Theory, MemberData(nameof(TestData_GetFileName))] + public void GetFileName_Span(string path, string expected) + { + PathAssert.Equal(expected, Path.GetFileName(path.AsSpan())); + } + + public static IEnumerable TestData_GetFileName_Volume() + { + yield return new object[] { ":", ":" }; + yield return new object[] { ".:", ".:" }; + yield return new object[] { ".:.", ".:." }; // Not a valid drive letter + yield return new object[] { "file:", "file:" }; + yield return new object[] { ":file", ":file" }; + yield return new object[] { "file:exe", "file:exe" }; + yield return new object[] { Path.Combine("baz", "file:exe"), "file:exe" }; + yield return new object[] { Path.Combine("bar", "baz", "file:exe"), "file:exe" }; + } + + [Theory, MemberData(nameof(TestData_GetFileName_Volume))] + public void GetFileName_Volume(string path, string expected) + { + // We used to break on ':' on Windows. This is a valid file name character for alternate data streams. + // Additionally the character can show up on unix volumes mounted to Windows. + Assert.Equal(expected, Path.GetFileName(path)); + PathAssert.Equal(expected, Path.GetFileName(path.AsSpan())); + } + + [Theory, MemberData(nameof(TestData_GetFileNameWithoutExtension))] + public void GetFileNameWithoutExtension_Span(string path, string expected) + { + PathAssert.Equal(expected, Path.GetFileNameWithoutExtension(path.AsSpan())); + } + + [Fact] + public void GetPathRoot_Empty() + { + Assert.Null(Path.GetPathRoot(string.Empty)); + } + + [Fact] + public void GetPathRoot_Empty_Span() + { + PathAssert.Empty(Path.GetPathRoot(ReadOnlySpan.Empty)); + } + + [Theory, + InlineData(nameof(TestData_Spaces)), + InlineData(nameof(TestData_ControlChars)), + InlineData(nameof(TestData_EmbeddedNull)), + InlineData(nameof(TestData_InvalidDriveLetters)), + InlineData(nameof(TestData_UnicodeWhiteSpace)), + InlineData(nameof(TestData_EmptyString))] + public void IsPathRooted_NegativeCases(string path) + { + Assert.False(Path.IsPathRooted(path)); + Assert.False(Path.IsPathRooted(path.AsSpan())); + } + + [Fact] + public void GetInvalidPathChars() + { + Assert.All(Path.GetInvalidPathChars(), c => + { + string bad = c.ToString(); + Assert.Equal(bad + ".ok", Path.ChangeExtension(bad, "ok")); + Assert.Equal(bad + Path.DirectorySeparatorChar + "ok", Path.Combine(bad, "ok")); + Assert.Equal("ok" + Path.DirectorySeparatorChar + "ok" + Path.DirectorySeparatorChar + bad, Path.Combine("ok", "ok", bad)); + Assert.Equal("ok" + Path.DirectorySeparatorChar + "ok" + Path.DirectorySeparatorChar + bad + Path.DirectorySeparatorChar + "ok", Path.Combine("ok", "ok", bad, "ok")); + Assert.Equal(bad + Path.DirectorySeparatorChar + bad + Path.DirectorySeparatorChar + bad + Path.DirectorySeparatorChar + bad + Path.DirectorySeparatorChar + bad, Path.Combine(bad, bad, bad, bad, bad)); + Assert.Equal("", Path.GetDirectoryName(bad)); + Assert.Equal(string.Empty, Path.GetExtension(bad)); + Assert.Equal(bad, Path.GetFileName(bad)); + Assert.Equal(bad, Path.GetFileNameWithoutExtension(bad)); + if (bad[0] == '\0') + { + Assert.Throws("path", () => Path.GetFullPath(bad)); + } + else + { + Assert.True(Path.GetFullPath(bad).EndsWith(bad)); + } + Assert.Equal(string.Empty, Path.GetPathRoot(bad)); + Assert.False(Path.IsPathRooted(bad)); + }); + } + + [Fact] + public void GetInvalidPathChars_Span() + { + Assert.All(Path.GetInvalidPathChars(), c => + { + string bad = c.ToString(); + Assert.Equal(string.Empty, new string(Path.GetDirectoryName(bad.AsSpan()))); + Assert.Equal(string.Empty, new string(Path.GetExtension(bad.AsSpan()))); + Assert.Equal(bad, new string(Path.GetFileName(bad.AsSpan()))); + Assert.Equal(bad, new string(Path.GetFileNameWithoutExtension(bad.AsSpan()))); + Assert.Equal(string.Empty, new string(Path.GetPathRoot(bad.AsSpan()))); + Assert.False(Path.IsPathRooted(bad.AsSpan())); + }); + } + + [Theory, + InlineData("http://www.microsoft.com"), + InlineData("file://somefile")] + public void GetFullPath_URIsAsFileNames(string uriAsFileName) + { + // URIs are valid filenames, though the multiple slashes will be consolidated in GetFullPath + Assert.Equal( + Path.Combine(Directory.GetCurrentDirectory(), uriAsFileName.Replace("//", Path.DirectorySeparatorChar.ToString())), + Path.GetFullPath(uriAsFileName)); + } + + [Theory, MemberData(nameof(TestData_NonDriveColonPaths))] + public void GetFullPath_NowSupportedColons(string path) + { + // Used to throw on Windows, now should never throw + Path.GetFullPath(path); + } + + [Theory, MemberData(nameof(TestData_InvalidUnc))] + public static void GetFullPath_UNC_Invalid(string path) + { + // These UNCs used to throw on Windows + Path.GetFullPath(path); + } + + [Theory, + MemberData(nameof(TestData_Wildcards)), + MemberData(nameof(TestData_ExtendedWildcards))] + public void GetFullPath_Wildcards(char wildcard) + { + string path = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName() + wildcard + "ing"); + Assert.Equal(path, Path.GetFullPath(path)); + } + + public static TheoryData GetFullPathBasePath_ArgumentNullException => new TheoryData + { + { @"", null, "basePath" }, + { @"tmp",null, "basePath" }, + { @"\home", null, "basePath"}, + { null, @"foo\bar", "path"}, + { null, @"foo\bar", "path"}, + }; + + [Theory, + MemberData(nameof(GetFullPathBasePath_ArgumentNullException))] + public static void GetFullPath_BasePath_NullInput(string path, string basePath, string paramName) + { + Assert.Throws(paramName, () => Path.GetFullPath(path, basePath)); + } + + public static TheoryData GetFullPathBasePath_ArgumentException => new TheoryData + { + { @"", @"foo\bar", "basePath"}, + { @"tmp", @"foo\bar", "basePath"}, + { @"\home", @"foo\bar", "basePath"}, + }; + + [Theory, + MemberData(nameof(GetFullPathBasePath_ArgumentException))] + public static void GetFullPath_BasePath_Input(string path, string basePath, string paramName) + { + Assert.Throws(paramName, () => Path.GetFullPath(path, basePath)); + } + } +} diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTestsBase.cs b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTestsBase.cs new file mode 100644 index 0000000000..e07cb5291e --- /dev/null +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTestsBase.cs @@ -0,0 +1,226 @@ +// 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 Xunit; + +namespace System.IO.Tests +{ + public partial class PathTestsBase : RemoteExecutorTestBase + { + protected static string Sep = Path.DirectorySeparatorChar.ToString(); + protected static string AltSep = Path.AltDirectorySeparatorChar.ToString(); + + public static TheoryData TestData_EmbeddedNull => new TheoryData + { + "a\0b" + }; + + public static TheoryData TestData_EmptyString => new TheoryData + { + "" + }; + + public static TheoryData TestData_ControlChars => new TheoryData + { + "\t", + "\r\n", + "\b", + "\v", + "\n" + }; + + public static TheoryData TestData_NonDriveColonPaths => new TheoryData + { + @"bad:path", + @"C:\some\bad:path", + @"http://www.microsoft.com", + @"file://www.microsoft.com", + @"bad::$DATA", + @"C :", + @"C :\somedir" + }; + + public static TheoryData TestData_Spaces => new TheoryData + { + " ", + " " + }; + + public static TheoryData TestData_Periods => new TheoryData + { + // One and two periods have special meaning (current and parent dir) + "...", + "...." + }; + + public static TheoryData TestData_Wildcards => new TheoryData + { + "*", + "?" + }; + + public static TheoryData TestData_ExtendedWildcards => new TheoryData + { + // These are supported by Windows although .NET blocked them historically + "\"", + "<", + ">" + }; + + public static TheoryData TestData_UnicodeWhiteSpace => new TheoryData + { + "\u00A0", // Non-breaking Space + "\u2028", // Line separator + "\u2029", // Paragraph separator + }; + + public static TheoryData TestData_InvalidUnc => new TheoryData + { + // .NET used to validate properly formed UNCs + @"\\", + @"\\LOCALHOST", + @"\\LOCALHOST\", + @"\\LOCALHOST\\", + @"\\LOCALHOST\.." + }; + + public static TheoryData TestData_InvalidDriveLetters => new TheoryData + { + { @"@:\foo" }, // 064 = @ 065 = A + { @"[:\\" }, // 091 = [ 090 = Z + { @"`:\foo "}, // 096 = ` 097 = a + { @"{:\\" }, // 123 = { 122 = z + { @"@:/foo" }, + { @"[://" }, + { @"`:/foo "}, + { @"{:/" }, + { @"]:" } + }; + + public static TheoryData TestData_ValidDriveLetters => new TheoryData + { + { @"A:\foo" }, // 064 = @ 065 = A + { @"Z:\\" }, // 091 = [ 090 = Z + { @"a:\foo "}, // 096 = ` 097 = a + { @"z:\\" }, // 123 = { 122 = z + { @"B:/foo" }, + { @"D://" }, + { @"E:/foo "}, + { @"F:/" }, + { @"G:" } + }; + + public static TheoryData TestData_GetDirectoryName => new TheoryData + { + { ".", "" }, + { "..", "" }, + { "baz", "" }, + { Path.Combine("dir", "baz"), "dir" }, + { "dir.foo" + Path.AltDirectorySeparatorChar + "baz.txt", "dir.foo" }, + { Path.Combine("dir", "baz", "bar"), Path.Combine("dir", "baz") }, + { Path.Combine("..", "..", "files.txt"), Path.Combine("..", "..") }, + { Path.DirectorySeparatorChar + "foo", Path.DirectorySeparatorChar.ToString() }, + { Path.DirectorySeparatorChar.ToString(), null } + }; + + public static TheoryData TestData_GetDirectoryName_Windows => new TheoryData + { + { @"C:\", null }, + { @"C:/", null }, + { @"C:", null }, + { @"dir\\baz", "dir" }, + { @"dir//baz", "dir" }, + { @"C:\foo", @"C:\" }, + { @"C:foo", "C:" } + }; + + public static TheoryData TestData_GetExtension => new TheoryData + { + { @"file.exe", ".exe" }, + { @"file", "" }, + { @"file.", "" }, + { @"file.s", ".s" }, + { @"test/file", "" }, + { @"test/file.extension", ".extension" }, + { @"test\file", "" }, + { @"test\file.extension", ".extension" }, + { "file.e xe", ".e xe"}, + { "file. ", ". "}, + { " file. ", ". "}, + { " file.extension", ".extension"} + }; + + public static TheoryData TestData_GetFileName => new TheoryData + { + { ".", "." }, + { "..", ".." }, + { "file", "file" }, + { "file.", "file." }, + { "file.exe", "file.exe" }, + { " . ", " . " }, + { " .. ", " .. " }, + { "fi le", "fi le" }, + { Path.Combine("baz", "file.exe"), "file.exe" }, + { Path.Combine("baz", "file.exe") + Path.AltDirectorySeparatorChar, "" }, + { Path.Combine("bar", "baz", "file.exe"), "file.exe" }, + { Path.Combine("bar", "baz", "file.exe") + Path.DirectorySeparatorChar, "" } + }; + + public static TheoryData TestData_GetFileNameWithoutExtension => new TheoryData + { + { "", "" }, + { "file", "file" }, + { "file.exe", "file" }, + { Path.Combine("bar", "baz", "file.exe"), "file" }, + { Path.Combine("bar", "baz") + Path.DirectorySeparatorChar, "" } + }; + + public static TheoryData TestData_GetPathRoot_Unc => new TheoryData + { + { @"\\test\unc\path\to\something", @"\\test\unc" }, + { @"\\a\b\c\d\e", @"\\a\b" }, + { @"\\a\b\", @"\\a\b" }, + { @"\\a\b", @"\\a\b" }, + { @"\\test\unc", @"\\test\unc" }, + }; + + // TODO: Include \\.\ as well + public static TheoryData TestData_GetPathRoot_DevicePaths => new TheoryData + { + { @"\\?\UNC\test\unc\path\to\something", PathFeatures.IsUsingLegacyPathNormalization() ? @"\\?\UNC" : @"\\?\UNC\test\unc" }, + { @"\\?\UNC\test\unc", PathFeatures.IsUsingLegacyPathNormalization() ? @"\\?\UNC" : @"\\?\UNC\test\unc" }, + { @"\\?\UNC\a\b1", PathFeatures.IsUsingLegacyPathNormalization() ? @"\\?\UNC" : @"\\?\UNC\a\b1" }, + { @"\\?\UNC\a\b2\", PathFeatures.IsUsingLegacyPathNormalization() ? @"\\?\UNC" : @"\\?\UNC\a\b2" }, + { @"\\?\C:\foo\bar.txt", PathFeatures.IsUsingLegacyPathNormalization() ? @"\\?\C:" : @"\\?\C:\" } + }; + + public static TheoryData TestData_GetPathRoot_Windows => new TheoryData + { + { @"C:", @"C:" }, + { @"C:\", @"C:\" }, + { @"C:\\", @"C:\" }, + { @"C:\foo1", @"C:\" }, + { @"C:\\foo2", @"C:\" }, + }; + + protected static void GetTempPath_SetEnvVar(string envVar, string expected, string newTempPath) + { + string original = Path.GetTempPath(); + Assert.NotNull(original); + try + { + Environment.SetEnvironmentVariable(envVar, newTempPath); + Assert.Equal( + Path.GetFullPath(expected), + Path.GetFullPath(Path.GetTempPath())); + } + finally + { + Environment.SetEnvironmentVariable(envVar, original); + Assert.Equal(original, Path.GetTempPath()); + } + } + } +} diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTestsBase.netcoreapp.cs b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTestsBase.netcoreapp.cs new file mode 100644 index 0000000000..78d986ff1f --- /dev/null +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTestsBase.netcoreapp.cs @@ -0,0 +1,23 @@ +// 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.IO.Tests +{ + public partial class PathTestsBase + { + protected static class PathAssert + { + public static void Equal(ReadOnlySpan expected, ReadOnlySpan actual) + { + if (!actual.SequenceEqual(expected)) + throw new Xunit.Sdk.EqualException(new string(expected), new string(actual)); + } + + public static void Empty(ReadOnlySpan actual) + { + if (actual.Length > 0) + throw new Xunit.Sdk.NotEmptyException(); + } + } + } +} diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/IO/Path.Combine.cs b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests_Combine.cs similarity index 99% rename from external/corefx/src/System.Runtime.Extensions/tests/System/IO/Path.Combine.cs rename to external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests_Combine.cs index 292c5480d2..382732253f 100644 --- a/external/corefx/src/System.Runtime.Extensions/tests/System/IO/Path.Combine.cs +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests_Combine.cs @@ -7,7 +7,7 @@ using Xunit; namespace System.IO.Tests { - public static partial class PathTests + public class PathTests_Combine { private static readonly char s_separator = Path.DirectorySeparatorChar; diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests_Join.netcoreapp.cs b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests_Join.netcoreapp.cs new file mode 100644 index 0000000000..4c8a9b9bdb --- /dev/null +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests_Join.netcoreapp.cs @@ -0,0 +1,111 @@ +// 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 Xunit; + +namespace System.IO.Tests +{ + public class PathTests_Join : PathTestsBase + { + public static TheoryData TestData_JoinTwoPaths = new TheoryData + { + { "", "", "" }, + { Sep, "", Sep }, + { AltSep, "", AltSep }, + { "", Sep, Sep }, + { "", AltSep, AltSep }, + { Sep, Sep, $"{Sep}{Sep}" }, + { AltSep, AltSep, $"{AltSep}{AltSep}" }, + { "a", "", "a" }, + { "", "a", "a" }, + { "a", "a", $"a{Sep}a" }, + { $"a{Sep}", "a", $"a{Sep}a" }, + { "a", $"{Sep}a", $"a{Sep}a" }, + { $"a{Sep}", $"{Sep}a", $"a{Sep}{Sep}a" }, + { "a", $"a{Sep}", $"a{Sep}a{Sep}" }, + { $"a{AltSep}", "a", $"a{AltSep}a" }, + { "a", $"{AltSep}a", $"a{AltSep}a" }, + { $"a{Sep}", $"{AltSep}a", $"a{Sep}{AltSep}a" }, + { $"a{AltSep}", $"{AltSep}a", $"a{AltSep}{AltSep}a" }, + { "a", $"a{AltSep}", $"a{Sep}a{AltSep}" }, + }; + + [Theory, MemberData(nameof(TestData_JoinTwoPaths))] + public void JoinTwoPaths(string path1, string path2, string expected) + { + Assert.Equal(expected, Path.Join(path1, path2)); + } + + [Theory, MemberData(nameof(TestData_JoinTwoPaths))] + public void TryJoinTwoPaths(string path1, string path2, string expected) + { + char[] output = new char[expected.Length]; + + Assert.True(Path.TryJoin(path1, path2, output, out int written)); + Assert.Equal(expected.Length, written); + Assert.Equal(expected, new string(output)); + + if (expected.Length > 0) + { + Assert.False(Path.TryJoin(path1, path2, Span.Empty, out written)); + Assert.Equal(0, written); + + output = new char[expected.Length - 1]; + Assert.False(Path.TryJoin(path1, path2, output, out written)); + Assert.Equal(0, written); + Assert.Equal(output, new char[output.Length]); + } + } + + public static TheoryData TestData_JoinThreePaths = new TheoryData + { + { "", "", "", "" }, + { Sep, Sep, Sep, $"{Sep}{Sep}{Sep}" }, + { AltSep, AltSep, AltSep, $"{AltSep}{AltSep}{AltSep}" }, + { "a", "", "", "a" }, + { "", "a", "", "a" }, + { "", "", "a", "a" }, + { "a", "", "a", $"a{Sep}a" }, + { "a", "a", "", $"a{Sep}a" }, + { "", "a", "a", $"a{Sep}a" }, + { "a", "a", "a", $"a{Sep}a{Sep}a" }, + { "a", Sep, "a", $"a{Sep}a" }, + { $"a{Sep}", "", "a", $"a{Sep}a" }, + { $"a{Sep}", "a", "", $"a{Sep}a" }, + { "", $"a{Sep}", "a", $"a{Sep}a" }, + { "a", "", $"{Sep}a", $"a{Sep}a" }, + { $"a{AltSep}", "", "a", $"a{AltSep}a" }, + { $"a{AltSep}", "a", "", $"a{AltSep}a" }, + { "", $"a{AltSep}", "a", $"a{AltSep}a" }, + { "a", "", $"{AltSep}a", $"a{AltSep}a" }, + }; + + [Theory, MemberData(nameof(TestData_JoinThreePaths))] + public void JoinThreePaths(string path1, string path2, string path3, string expected) + { + Assert.Equal(expected, Path.Join(path1, path2, path3)); + } + + [Theory, MemberData(nameof(TestData_JoinThreePaths))] + public void TryJoinThreePaths(string path1, string path2, string path3, string expected) + { + char[] output = new char[expected.Length]; + + Assert.True(Path.TryJoin(path1, path2, path3, output, out int written)); + Assert.Equal(expected.Length, written); + Assert.Equal(expected, new string(output)); + + if (expected.Length > 0) + { + Assert.False(Path.TryJoin(path1, path2, path3, Span.Empty, out written)); + Assert.Equal(0, written); + + output = new char[expected.Length - 1]; + Assert.False(Path.TryJoin(path1, path2, path3, output, out written)); + Assert.Equal(0, written); + Assert.Equal(output, new char[output.Length]); + } + } + } +} diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests_Unix.cs b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests_Unix.cs new file mode 100644 index 0000000000..19b2473235 --- /dev/null +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests_Unix.cs @@ -0,0 +1,131 @@ +// 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.Collections.Generic; +using Xunit; + +namespace System.IO.Tests +{ + [PlatformSpecific(TestPlatforms.AnyUnix)] + public class PathTests_Unix : PathTestsBase + { + [Theory, + MemberData(nameof(TestData_GetPathRoot_Unc)), + MemberData(nameof(TestData_GetPathRoot_DevicePaths))] + public static void GetPathRoot(string value, string expected) + { + // UNCs and device paths have no special meaning in Unix + Assert.Empty(Path.GetPathRoot(value)); + } + + [Theory, + InlineData("B:", "B:"), + InlineData("A:.", "A:.")] + public void GetFileName_Volume(string path, string expected) + { + // No such thing as a drive relative path on Unix. + Assert.Equal(expected, Path.GetFileName(path)); + Assert.Equal(expected, new string(Path.GetFileName(path.AsSpan()))); + } + + public static IEnumerable GetTempPath_SetEnvVar_Data() + { + yield return new string[] { "/tmp/", "/tmp" }; + yield return new string[] { "/tmp/", "/tmp/" }; + yield return new string[] { "/", "/" }; + yield return new string[] { "/var/tmp/", "/var/tmp" }; + yield return new string[] { "/var/tmp/", "/var/tmp/" }; + yield return new string[] { "~/", "~" }; + yield return new string[] { "~/", "~/" }; + yield return new string[] { ".tmp/", ".tmp" }; + yield return new string[] { "./tmp/", "./tmp" }; + yield return new string[] { "/home/someuser/sometempdir/", "/home/someuser/sometempdir/" }; + yield return new string[] { "/home/someuser/some tempdir/", "/home/someuser/some tempdir/" }; + yield return new string[] { "/tmp/", null }; + } + + [Fact] + public void GetTempPath_SetEnvVar_Unix() + { + RemoteInvoke(() => + { + foreach (string[] tempPath in GetTempPath_SetEnvVar_Data()) + { + GetTempPath_SetEnvVar("TMPDIR", tempPath[0], tempPath[1]); + } + }).Dispose(); + } + + [Fact] + public void GetFullPath_Unix_Whitespace() + { + string curDir = Directory.GetCurrentDirectory(); + Assert.Equal("/ / ", Path.GetFullPath("/ // ")); + Assert.Equal(Path.Combine(curDir, " "), Path.GetFullPath(" ")); + Assert.Equal(Path.Combine(curDir, "\r\n"), Path.GetFullPath("\r\n")); + } + + public static TheoryData GetFullPath_BasePath_BasicExpansions_TestData_Unix => new TheoryData + { + { @"/home/git", @"/home/git", @"/home/git" }, + { "", @"/home/git", @"/home/git" }, + { "..", @"/home/git", @"/home" }, + { @"/home/git/././././././", @"/home/git", @"/home/git/" }, + { @"/home/git///.", @"/home/git", @"/home/git" }, + { @"/home/git/../git/./../git", @"/home/git", @"/home/git" }, + { @"/home/git/somedir/..", @"/home/git", @"/home/git" }, + { @"/home/git/./", @"/home/git", @"/home/git/" }, + { @"/home/../../../../..", @"/home/git", @"/" }, + { @"/home///", @"/home/git", @"/home/" }, + { "tmp", @"/home/git", @"/home/git/tmp" }, + { "tmp/bar/..", @"/home/git", @"/home/git/tmp" }, + { "tmp/..", @"/home/git", @"/home/git" }, + { "tmp/./bar/../", @"/home/git", @"/home/git/tmp/" }, + { "tmp/bar/../../", @"/home/git", @"/home/git/" }, + { "tmp/bar/../next/../", @"/home/git", @"/home/git/tmp/" }, + { "tmp/bar/next", @"/home/git", @"/home/git/tmp/bar/next" }, + + // Rooted + { @"/tmp/bar", @"/home/git", @"/tmp/bar" }, + { @"/bar", @"/home/git", @"/bar" }, + { @"/tmp/..", @"/home/git", @"/" }, + { @"/tmp/bar/..", @"/home/git", @"/tmp" }, + { @"/tmp/..", @"/home/git", @"/" }, + { @"/", @"/home/git", @"/" }, + + { @"/tmp/../../../bar", @"/home/git", @"/bar" }, + { @"/bar/././././../../..", @"/home/git", @"/" }, + { @"/../../tmp/../../", @"/home/git", @"/" }, + { @"/../../tmp/bar/..", @"/home/git", @"/tmp" }, + { @"/tmp/..", @"/home/git", @"/" }, + { @"/././../../../../", @"/home/git", @"/" }, + + { @"/tmp/../../../../../bar", @"/home/git", @"/bar" }, + { @"/./././bar/../../../", @"/home/git", @"/" }, + { @"/tmp/..", @"/home/git", @"/" }, + { @"/../../tmp/bar/..", @"/home/git", @"/tmp" }, + { @"/tmp/..", @"/home/git", @"/" }, + { @"../../../", @"/home/git", @"/" }, + + { @"../.././././bar/../../../", @"/home/git", @"/" }, + { @"../../.././tmp/..", @"/home/git", @"/" }, + { @"../../../tmp/bar/..", @"/home/git", @"/tmp" }, + { @"../../././tmp/..", @"/home/git", @"/" }, + { @"././../../../", @"/home/git", @"/" }, + }; + + [Theory, + MemberData(nameof(GetFullPath_BasePath_BasicExpansions_TestData_Unix))] + public static void GetFullPath_BasicExpansions_Unix(string path, string basePath, string expected) + { + Assert.Equal(expected, Path.GetFullPath(path, basePath)); + } + + [Fact] + public void GetFullPath_ThrowsOnEmbeddedNulls() + { + Assert.Throws(null, () => Path.GetFullPath("/gi\0t", "/foo/bar")); + } + } +} diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests_Windows.cs b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests_Windows.cs new file mode 100644 index 0000000000..005a1169f5 --- /dev/null +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests_Windows.cs @@ -0,0 +1,369 @@ +// 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.Collections.Generic; +using System.Runtime.InteropServices; +using System.Text; +using System.Text.RegularExpressions; +using Xunit; + +namespace System.IO.Tests +{ + [PlatformSpecific(TestPlatforms.Windows)] + public partial class PathTests_Windows : PathTestsBase + { + public void GetDirectoryName_DevicePath() + { + if (PathFeatures.IsUsingLegacyPathNormalization()) + { + Assert.Equal(@"\\?\C:", Path.GetDirectoryName(@"\\?\C:\foo")); + } + else + { + Assert.Equal(@"\\?\C:\", Path.GetDirectoryName(@"\\?\C:\foo")); + } + } + + [Theory, MemberData(nameof(TestData_GetDirectoryName_Windows))] + public void GetDirectoryName(string path, string expected) + { + Assert.Equal(expected, Path.GetDirectoryName(path)); + } + + [Theory, + InlineData("B:", ""), + InlineData("A:.", ".")] + public static void GetFileName_Volume(string path, string expected) + { + // With a valid drive letter followed by a colon, we have a root, but only on Windows. + Assert.Equal(expected, Path.GetFileName(path)); + } + + [ActiveIssue(27552)] + [Theory, + MemberData(nameof(TestData_GetPathRoot_Windows)), + MemberData(nameof(TestData_GetPathRoot_Unc)), + MemberData(nameof(TestData_GetPathRoot_DevicePaths))] + public void GetPathRoot_Windows(string value, string expected) + { + Assert.Equal(expected, Path.GetPathRoot(value)); + + if (value.Length != expected.Length) + { + // The string overload normalizes the separators + Assert.Equal(expected, Path.GetPathRoot(value.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar))); + + // UNCs and device paths will have their semantics changed if we double up separators + if (!value.StartsWith(@"\\")) + Assert.Equal(expected, Path.GetPathRoot(value.Replace(@"\", @"\\"))); + } + } + + public static IEnumerable GetTempPath_SetEnvVar_Data() + { + yield return new string[] { @"C:\Users\someuser\AppData\Local\Temp\", @"C:\Users\someuser\AppData\Local\Temp" }; + yield return new string[] { @"C:\Users\someuser\AppData\Local\Temp\", @"C:\Users\someuser\AppData\Local\Temp\" }; + yield return new string[] { @"C:\", @"C:\" }; + yield return new string[] { @"C:\tmp\", @"C:\tmp" }; + yield return new string[] { @"C:\tmp\", @"C:\tmp\" }; + } + + [Fact] + public void GetTempPath_SetEnvVar() + { + RemoteInvoke(() => + { + foreach (string[] tempPath in GetTempPath_SetEnvVar_Data()) + { + GetTempPath_SetEnvVar("TMP", tempPath[0], tempPath[1]); + } + }).Dispose(); + } + + [Theory, MemberData(nameof(TestData_Spaces))] + public void GetFullPath_TrailingSpacesCut(string component) + { + // Windows cuts off any simple white space added to a path + string path = "C:\\Test" + component; + Assert.Equal("C:\\Test", Path.GetFullPath(path)); + } + + [Fact] + public void GetFullPath_NormalizedLongPathTooLong() + { + // Try out a long path that normalizes down to more than MaxPath + string curDir = Directory.GetCurrentDirectory(); + const int Iters = 260; + var longPath = new StringBuilder(curDir, curDir.Length + (Iters * 4)); + for (int i = 0; i < Iters; i++) + { + longPath.Append(Path.DirectorySeparatorChar).Append('a').Append(Path.DirectorySeparatorChar).Append('.'); + } + + if (PathFeatures.AreAllLongPathsAvailable()) + { + // Now no longer throws unless over ~32K + Assert.NotNull(Path.GetFullPath(longPath.ToString())); + } + else + { + Assert.Throws(() => Path.GetFullPath(longPath.ToString())); + } + } + + [Theory, + InlineData(@"C:..."), + InlineData(@"C:...\somedir"), + InlineData(@"\.. .\"), + InlineData(@"\. .\"), + InlineData(@"\ .\")] + public void GetFullPath_LegacyArgumentExceptionPaths(string path) + { + if (PathFeatures.IsUsingLegacyPathNormalization()) + { + // We didn't allow these paths on < 4.6.2 + AssertExtensions.Throws(null, () => Path.GetFullPath(path)); + } + else + { + // These paths are legitimate Windows paths that can be created without extended syntax. + // We now allow them through. + Path.GetFullPath(path); + } + } + + [Fact] + public void GetFullPath_MaxPathNotTooLong() + { + string value = @"C:\" + new string('a', 255) + @"\"; + if (PathFeatures.AreAllLongPathsAvailable()) + { + // Shouldn't throw anymore + Path.GetFullPath(value); + } + else + { + Assert.Throws(() => Path.GetFullPath(value)); + } + } + + [Fact] + public void GetFullPath_PathTooLong() + { + Assert.Throws(() => Path.GetFullPath(@"C:\" + new string('a', short.MaxValue) + @"\")); + } + + [Theory, + InlineData(@"C:\", @"C:\"), + InlineData(@"C:\.", @"C:\"), + InlineData(@"C:\..", @"C:\"), + InlineData(@"C:\..\..", @"C:\"), + InlineData(@"C:\A\..", @"C:\"), + InlineData(@"C:\..\..\A\..", @"C:\")] + public void GetFullPath_RelativeRoot(string path, string expected) + { + Assert.Equal(Path.GetFullPath(path), expected); + } + + [Fact] + public void GetFullPath_StrangeButLegalPaths() + { + // These are legal and creatable without using extended syntax if you use a trailing slash + // (such as "md ...\"). We used to filter these out, but now allow them to prevent apps from + // being blocked when they hit these paths. + string curDir = Directory.GetCurrentDirectory(); + if (PathFeatures.IsUsingLegacyPathNormalization()) + { + // Legacy path Path.GetFullePath() ignores . when there is less or more that two, when there is .. in the path it returns one directory up. + Assert.Equal( + Path.GetFullPath(curDir + Path.DirectorySeparatorChar), + Path.GetFullPath(curDir + Path.DirectorySeparatorChar + ". " + Path.DirectorySeparatorChar)); + Assert.Equal( + Path.GetFullPath(Path.GetDirectoryName(curDir) + Path.DirectorySeparatorChar), + Path.GetFullPath(curDir + Path.DirectorySeparatorChar + "..." + Path.DirectorySeparatorChar)); + Assert.Equal( + Path.GetFullPath(Path.GetDirectoryName(curDir) + Path.DirectorySeparatorChar), + Path.GetFullPath(curDir + Path.DirectorySeparatorChar + ".. " + Path.DirectorySeparatorChar)); + } + else + { + Assert.NotEqual( + Path.GetFullPath(curDir + Path.DirectorySeparatorChar), + Path.GetFullPath(curDir + Path.DirectorySeparatorChar + ". " + Path.DirectorySeparatorChar)); + Assert.NotEqual( + Path.GetFullPath(Path.GetDirectoryName(curDir) + Path.DirectorySeparatorChar), + Path.GetFullPath(curDir + Path.DirectorySeparatorChar + "..." + Path.DirectorySeparatorChar)); + Assert.NotEqual( + Path.GetFullPath(Path.GetDirectoryName(curDir) + Path.DirectorySeparatorChar), + Path.GetFullPath(curDir + Path.DirectorySeparatorChar + ".. " + Path.DirectorySeparatorChar)); + } + } + + [Theory, + InlineData(@"\\?\C:\ "), + InlineData(@"\\?\C:\ \ "), + InlineData(@"\\?\C:\ ."), + InlineData(@"\\?\C:\ .."), + InlineData(@"\\?\C:\..."), + InlineData(@"\\?\GLOBALROOT\"), + InlineData(@"\\?\"), + InlineData(@"\\?\."), + InlineData(@"\\?\.."), + InlineData(@"\\?\\"), + InlineData(@"\\?\C:\\"), + InlineData(@"\\?\C:\|"), + InlineData(@"\\?\C:\."), + InlineData(@"\\?\C:\.."), + InlineData(@"\\?\C:\Foo1\."), + InlineData(@"\\?\C:\Foo2\.."), + InlineData(@"\\?\UNC\"), + InlineData(@"\\?\UNC\server1"), + InlineData(@"\\?\UNC\server2\"), + InlineData(@"\\?\UNC\server3\\"), + InlineData(@"\\?\UNC\server4\.."), + InlineData(@"\\?\UNC\server5\share\."), + InlineData(@"\\?\UNC\server6\share\.."), + InlineData(@"\\?\UNC\a\b\\"), + InlineData(@"\\.\"), + InlineData(@"\\.\."), + InlineData(@"\\.\.."), + InlineData(@"\\.\\"), + InlineData(@"\\.\C:\\"), + InlineData(@"\\.\C:\|"), + InlineData(@"\\.\C:\."), + InlineData(@"\\.\C:\.."), + InlineData(@"\\.\C:\Foo1\."), + InlineData(@"\\.\C:\Foo2\..")] + public void GetFullPath_ValidExtendedPaths(string path) + { + if (PathFeatures.IsUsingLegacyPathNormalization()) + { + // Legacy Path doesn't support any of these paths. + AssertExtensions.ThrowsAny(() => Path.GetFullPath(path)); + return; + } + + // None of these should throw + if (path.StartsWith(@"\\?\")) + { + Assert.Equal(path, Path.GetFullPath(path)); + } + else + { + Path.GetFullPath(path); + } + } + + [Theory, + InlineData(@"\\.\UNC\"), + InlineData(@"\\.\UNC\LOCALHOST"), + InlineData(@"\\.\UNC\localHOST\"), + InlineData(@"\\.\UNC\LOcaLHOST\\"), + InlineData(@"\\.\UNC\lOCALHOST\.."), + InlineData(@"\\.\UNC\LOCALhost\share\."), + InlineData(@"\\.\UNC\loCALHOST\share\.."), + InlineData(@"\\.\UNC\a\b\\")] + public static void GetFullPath_ValidLegacy_ValidExtendedPaths(string path) + { + // should not throw + Path.GetFullPath(path); + } + + [Theory, + // https://github.com/dotnet/corefx/issues/11965 + InlineData(@"\\LOCALHOST\share\test.txt.~SS", @"\\LOCALHOST\share\test.txt.~SS"), + InlineData(@"\\LOCALHOST\share1", @"\\LOCALHOST\share1"), + InlineData(@"\\LOCALHOST\share3\dir", @"\\LOCALHOST\share3\dir"), + InlineData(@"\\LOCALHOST\share4\.", @"\\LOCALHOST\share4"), + InlineData(@"\\LOCALHOST\share5\..", @"\\LOCALHOST\share5"), + InlineData(@"\\LOCALHOST\share6\ ", @"\\LOCALHOST\share6\"), + InlineData(@"\\LOCALHOST\ share7\", @"\\LOCALHOST\ share7\"), + InlineData(@"\\?\UNC\LOCALHOST\share8\test.txt.~SS", @"\\?\UNC\LOCALHOST\share8\test.txt.~SS"), + InlineData(@"\\?\UNC\LOCALHOST\share9", @"\\?\UNC\LOCALHOST\share9"), + InlineData(@"\\?\UNC\LOCALHOST\shareA\dir", @"\\?\UNC\LOCALHOST\shareA\dir"), + InlineData(@"\\?\UNC\LOCALHOST\shareB\. ", @"\\?\UNC\LOCALHOST\shareB\. "), + InlineData(@"\\?\UNC\LOCALHOST\shareC\.. ", @"\\?\UNC\LOCALHOST\shareC\.. "), + InlineData(@"\\?\UNC\LOCALHOST\shareD\ ", @"\\?\UNC\LOCALHOST\shareD\ "), + InlineData(@"\\.\UNC\LOCALHOST\ shareE\", @"\\.\UNC\LOCALHOST\ shareE\"), + InlineData(@"\\.\UNC\LOCALHOST\shareF\test.txt.~SS", @"\\.\UNC\LOCALHOST\shareF\test.txt.~SS"), + InlineData(@"\\.\UNC\LOCALHOST\shareG", @"\\.\UNC\LOCALHOST\shareG"), + InlineData(@"\\.\UNC\LOCALHOST\shareH\dir", @"\\.\UNC\LOCALHOST\shareH\dir"), + InlineData(@"\\.\UNC\LOCALHOST\shareK\ ", @"\\.\UNC\LOCALHOST\shareK\"), + InlineData(@"\\.\UNC\LOCALHOST\ shareL\", @"\\.\UNC\LOCALHOST\ shareL\")] + public void GetFullPath_UNC_Valid(string path, string expected) + { + if (path.StartsWith(@"\\?\") && PathFeatures.IsUsingLegacyPathNormalization()) + { + AssertExtensions.Throws(null, () => Path.GetFullPath(path)); + } + else + { + Assert.Equal(expected, Path.GetFullPath(path)); + } + } + + [Theory, + InlineData(@"\\.\UNC\LOCALHOST\shareI\. ", @"\\.\UNC\LOCALHOST\shareI\", @"\\.\UNC\LOCALHOST\shareI"), + InlineData(@"\\.\UNC\LOCALHOST\shareJ\.. ", @"\\.\UNC\LOCALHOST\shareJ\", @"\\.\UNC\LOCALHOST")] + public static void GetFullPath_Windows_UNC_Valid_LegacyPathSupport(string path, string normalExpected, string legacyExpected) + { + string expected = PathFeatures.IsUsingLegacyPathNormalization() ? legacyExpected : normalExpected; + Assert.Equal(expected, Path.GetFullPath(path)); + } + + [Fact] + public static void GetFullPath_Windows_83Paths() + { + // Create a temporary file name with a name longer than 8.3 such that it'll need to be shortened. + string tempFilePath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N") + ".txt"); + File.Create(tempFilePath).Dispose(); + try + { + // Get its short name + var sb = new StringBuilder(260); + if (GetShortPathName(tempFilePath, sb, sb.Capacity) > 0) // only proceed if we could successfully create the short name + { + string shortName = sb.ToString(); + + // Make sure the shortened name expands back to the original one + // Sometimes shortening or GetFullPath is changing the casing of "temp" on some test machines: normalize both sides + tempFilePath = Regex.Replace(tempFilePath, @"\\temp\\", @"\TEMP\", RegexOptions.IgnoreCase); + shortName = Regex.Replace(Path.GetFullPath(shortName), @"\\temp\\", @"\TEMP\", RegexOptions.IgnoreCase); + Assert.Equal(tempFilePath, shortName); + + // Should work with device paths that aren't well-formed extended syntax + if (!PathFeatures.IsUsingLegacyPathNormalization()) + { + Assert.Equal(@"\\.\" + tempFilePath, Path.GetFullPath(@"\\.\" + shortName)); + Assert.Equal(@"\\?\" + tempFilePath, Path.GetFullPath(@"//?/" + shortName)); + + // Shouldn't mess with well-formed extended syntax + Assert.Equal(@"\\?\" + shortName, Path.GetFullPath(@"\\?\" + shortName)); + } + + // Validate case where short name doesn't expand to a real file + string invalidShortName = @"S:\DOESNT~1\USERNA~1.RED\LOCALS~1\Temp\bg3ylpzp"; + Assert.Equal(invalidShortName, Path.GetFullPath(invalidShortName)); + + // Same thing, but with a long path that normalizes down to a short enough one + const int Iters = 1000; + var shortLongName = new StringBuilder(invalidShortName, invalidShortName.Length + (Iters * 2)); + for (int i = 0; i < Iters; i++) + { + shortLongName.Append(Path.DirectorySeparatorChar).Append('.'); + } + Assert.Equal(invalidShortName, Path.GetFullPath(shortLongName.ToString())); + } + } + finally + { + File.Delete(tempFilePath); + } + } + + // Windows-only P/Invoke to create 8.3 short names from long names + [DllImport("kernel32.dll", EntryPoint = "GetShortPathNameW", CharSet = CharSet.Unicode)] + private static extern uint GetShortPathName(string lpszLongPath, StringBuilder lpszShortPath, int cchBuffer); + } +} diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests_Windows.netcoreapp.cs b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests_Windows.netcoreapp.cs new file mode 100644 index 0000000000..2e8360eb18 --- /dev/null +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests_Windows.netcoreapp.cs @@ -0,0 +1,268 @@ +// 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 Xunit; + +namespace System.IO.Tests +{ + public partial class PathTests_Windows : PathTestsBase + { + [Theory, + MemberData(nameof(TestData_GetPathRoot_Windows)), + MemberData(nameof(TestData_GetPathRoot_Unc)), + MemberData(nameof(TestData_GetPathRoot_DevicePaths))] + public void GetPathRoot_Span(string value, string expected) + { + Assert.Equal(expected, new string(Path.GetPathRoot(value.AsSpan()))); + Assert.True(Path.IsPathRooted(value.AsSpan())); + } + + [Theory, MemberData(nameof(TestData_UnicodeWhiteSpace))] + public void GetFullPath_UnicodeWhiteSpaceStays(string component) + { + // When not NetFX full path should not cut off component + string path = "C:\\Test" + component; + Assert.Equal(path, Path.GetFullPath(path)); + } + + [Theory, MemberData(nameof(TestData_Periods))] + public void GetFullPath_TrailingPeriodsCut(string component) + { + // Windows cuts off any simple white space added to a path + string path = "C:\\Test" + component; + Assert.Equal("C:\\Test", Path.GetFullPath(path)); + } + + public static TheoryData GetFullPath_Windows_FullyQualified => new TheoryData + { + { @"C:\git\corefx", @"C:\git\corefx", @"C:\git\corefx" }, + { @"C:\git\corefx.\.\.\.\.\.", @"C:\git\corefx", @"C:\git\corefx" }, + { @"C:\git\corefx\\\.", @"C:\git\corefx", @"C:\git\corefx" }, + { @"C:\git\corefx\..\corefx\.\..\corefx", @"C:\git\corefx", @"C:\git\corefx" }, + { @"C:\somedir\..", @"C:\git\corefx", @"C:\" }, + { @"C:\", @"C:\git\corefx", @"C:\" }, + { @"..\..\..\..", @"C:\git\corefx", @"C:\" }, + { @"C:\\\", @"C:\git\corefx", @"C:\" }, + { @"C:\..\..\", @"C:\git\corefx", @"C:\" }, + { @"C:\..\git\..\.\", @"C:\git\corefx", @"C:\" }, + { @"C:\git\corefx\..\..\..\", @"C:\git\corefx", @"C:\" }, + { @"C:\.\corefx\", @"C:\git\corefx", @"C:\corefx\" }, + }; + + [Theory, + MemberData(nameof(GetFullPath_Windows_FullyQualified))] + public void GetFullPath_BasicExpansions_Windows(string path, string basePath, string expected) + { + Assert.Equal(expected, Path.GetFullPath(path, basePath)); + } + + public static TheoryData GetFullPath_Windows_PathIsDevicePath => new TheoryData + { + // Device Paths with \\?\ wont get normalized i.e. relative segments wont get removed. + { @"\\?\C:\git\corefx.\.\.\.\.\.", @"C:\git\corefx", @"\\?\C:\git\corefx.\.\.\.\.\." }, + { @"\\?\C:\git\corefx\\\.", @"C:\git\corefx", @"\\?\C:\git\corefx\\\." }, + { @"\\?\C:\git\corefx\..\corefx\.\..\corefx", @"C:\git\corefx", @"\\?\C:\git\corefx\..\corefx\.\..\corefx" }, + { @"\\?\\somedir\..", @"C:\git\corefx", @"\\?\\somedir\.." }, + { @"\\?\", @"C:\git\corefx", @"\\?\" }, + { @"\\?\..\..\..\..", @"C:\git\corefx", @"\\?\..\..\..\.." }, + { @"\\?\\\\" , @"C:\git\corefx", @"\\?\\\\" }, + { @"\\?\C:\Foo." , @"C:\git\corefx", @"\\?\C:\Foo." }, + { @"\\?\C:\Foo " , @"C:\git\corefx", @"\\?\C:\Foo " }, + + { @"\\.\C:\git\corefx.\.\.\.\.\.", @"C:\git\corefx", @"\\.\C:\git\corefx" }, + { @"\\.\C:\git\corefx\\\.", @"C:\git\corefx", @"\\.\C:\git\corefx" }, + { @"\\.\C:\git\corefx\..\corefx\.\..\corefx", @"C:\git\corefx", @"\\.\C:\git\corefx" }, + { @"\\.\\somedir\..", @"C:\git\corefx", @"\\.\" }, + { @"\\.\", @"C:\git\corefx", @"\\.\" }, + { @"\\.\..\..\..\..", @"C:\git\corefx", @"\\.\" }, + { @"\\.\", @"C:\git\corefx", @"\\.\" }, + { @"\\.\C:\Foo." , @"C:\git\corefx", @"\\.\C:\Foo" }, + { @"\\.\C:\Foo " , @"C:\git\corefx", @"\\.\C:\Foo" }, + }; + + [Theory, + MemberData(nameof(GetFullPath_Windows_PathIsDevicePath))] + public void GetFullPath_BasicExpansions_Windows_PathIsDevicePath(string path, string basePath, string expected) + { + Assert.Equal(expected, Path.GetFullPath(path, basePath)); + Assert.Equal(expected, Path.GetFullPath(path, @"\\.\" + basePath)); + Assert.Equal(expected, Path.GetFullPath(path, @"\\?\" + basePath)); + } + + public static TheoryData GetFullPath_Windows_UNC => new TheoryData + { + { @"foo", @"", @"foo" }, + { @"foo", @"server1", @"server1\foo" }, + { @"\foo", @"server2", @"server2\foo" }, + { @"foo", @"server3\", @"server3\foo" }, + { @"..\foo", @"server4", @"server4\..\foo" }, + { @".\foo", @"server5\share", @"server5\share\foo" }, + { @"..\foo", @"server6\share", @"server6\share\foo" }, + { @"\foo", @"a\b\\", @"a\b\foo" }, + { @"foo", @"LOCALHOST\share8\test.txt.~SS", @"LOCALHOST\share8\test.txt.~SS\foo" }, + { @"foo", @"LOCALHOST\share9", @"LOCALHOST\share9\foo" }, + { @"foo", @"LOCALHOST\shareA\dir", @"LOCALHOST\shareA\dir\foo" }, + { @". \foo", @"LOCALHOST\shareB\", @"LOCALHOST\shareB\. \foo" }, + { @".. \foo", @"LOCALHOST\shareC\", @"LOCALHOST\shareC\.. \foo" }, + { @" \foo", @"LOCALHOST\shareD\", @"LOCALHOST\shareD\ \foo" }, + + { "foo", @"LOCALHOST\ shareE\", @"LOCALHOST\ shareE\foo" }, + { "foo", @"LOCALHOST\shareF\test.txt.~SS", @"LOCALHOST\shareF\test.txt.~SS\foo" }, + { "foo", @"LOCALHOST\shareG", @"LOCALHOST\shareG\foo" }, + { "foo", @"LOCALHOST\shareH\dir", @"LOCALHOST\shareH\dir\foo" }, + { "foo", @"LOCALHOST\shareK\", @"LOCALHOST\shareK\foo" }, + { "foo", @"LOCALHOST\ shareL\", @"LOCALHOST\ shareL\foo" }, + + // Relative segments eating into the root + { @".\..\foo\..\", @"server\share", @"server\share\" }, + { @"..\foo\tmp\..\..\", @"server\share", @"server\share\" }, + { @"..\..\..\foo", @"server\share", @"server\share\foo" }, + { @"..\foo\..\..\tmp", @"server\share", @"server\share\tmp" }, + { @"..\foo", @"server\share", @"server\share\foo" }, + { @"...\\foo", @"server\share", @"server\share\...\foo" }, + { @"...\..\.\foo", @"server\share", @"server\share\foo" }, + { @"..\foo\tmp\..\..\..\..\..\", @"server\share", @"server\share\" }, + { @"..\..\..\..\foo", @"server\share", @"server\share\foo" }, + }; + + [Theory, + MemberData(nameof(GetFullPath_Windows_UNC))] + public void GetFullPath_CommonUnc_Windows(string path, string basePath, string expected) + { + Assert.Equal(@"\\" + expected, Path.GetFullPath(path, @"\\" + basePath)); + Assert.Equal(@"\\.\UNC\" + expected, Path.GetFullPath(path, @"\\.\UNC\" + basePath)); + Assert.Equal(@"\\?\UNC\" + expected, Path.GetFullPath(path, @"\\?\UNC\" + basePath)); + } + + public static TheoryData GetFullPath_Windows_CommonDevicePaths => new TheoryData + { + // Device paths + { "foo", @"C:\ ", @"C:\ \foo" }, + { @" \ \foo", @"C:\", @"C:\ \ \foo" }, + { @" .\foo", @"C:\", @"C:\ .\foo" }, + { @" ..\foo", @"C:\", @"C:\ ..\foo" }, + { @"...\foo", @"C:\", @"C:\...\foo" }, + + { @"foo", @"C:\\", @"C:\foo" }, + { @"foo.", @"C:\\", @"C:\foo." }, + { @"foo \git", @"C:\\", @"C:\foo \git" }, + { @"foo. \git", @"C:\\", @"C:\foo. \git" }, + { @" foo \git", @"C:\\", @"C:\ foo \git" }, + { @"foo ", @"C:\\", @"C:\foo " }, + { @"|\foo", @"C:\", @"C:\|\foo" }, + { @".\foo", @"C:\", @"C:\foo" }, + { @"..\foo", @"C:\", @"C:\foo" }, + + { @"\Foo1\.\foo", @"C:\", @"C:\Foo1\foo" }, + { @"\Foo2\..\foo", @"C:\", @"C:\foo" }, + + { @"foo", @"GLOBALROOT\", @"GLOBALROOT\foo" }, + { @"foo", @"", @"foo" }, + { @".\foo", @"", @".\foo" }, + { @"..\foo", @"", @"..\foo" }, + { @"C:", @"", @"C:\"}, + + // Relative segments eating into the root + { @"foo", @"GLOBALROOT\", @"GLOBALROOT\foo" }, + { @"..\..\foo\..\..\", @"", @"..\" }, + { @".\..\..\..\..\foo", @"", @".\foo" }, + { @"..\foo\..\..\..\", @"", @"..\" }, + { @"\.\.\..\", @"C:\", @"C:\"}, + { @"..\..\..\foo", @"GLOBALROOT\", @"GLOBALROOT\foo" }, + { @"foo\..\..\", @"", @"foo\" }, + { @".\.\foo\..\", @"", @".\" }, + }; + + [Theory, + MemberData(nameof(GetFullPath_Windows_CommonDevicePaths))] + public void GetFullPath_CommonDevice_Windows(string path, string basePath, string expected) + { + Assert.Equal(@"\\.\" + expected, Path.GetFullPath(path, @"\\.\" + basePath)); + Assert.Equal(@"\\?\" + expected, Path.GetFullPath(path, @"\\?\" + basePath)); + } + + public static TheoryData GetFullPath_CommonRootedWindowsData => new TheoryData + { + { "", @"C:\git\corefx", @"C:\git\corefx" }, + { "..", @"C:\git\corefx", @"C:\git" }, + + // Current drive rooted + { @"\tmp\bar", @"C:\git\corefx", @"C:\tmp\bar" }, + { @"\.\bar", @"C:\git\corefx", @"C:\bar" }, + { @"\tmp\..", @"C:\git\corefx", @"C:\" }, + { @"\tmp\bar\..", @"C:\git\corefx", @"C:\tmp" }, + { @"\tmp\bar\..", @"C:\git\corefx", @"C:\tmp" }, + { @"\", @"C:\git\corefx", @"C:\" }, + + { @"..\..\tmp\bar", @"C:\git\corefx", @"C:\tmp\bar" }, + { @"..\..\.\bar", @"C:\git\corefx", @"C:\bar" }, + { @"..\..\..\..\tmp\..", @"C:\git\corefx", @"C:\" }, + { @"\tmp\..\bar..\..\..", @"C:\git\corefx", @"C:\" }, + { @"\tmp\..\bar\..", @"C:\git\corefx", @"C:\" }, + { @"\.\.\..\..\", @"C:\git\corefx", @"C:\" }, + + // Specific drive rooted + { @"C:tmp\foo\..", @"C:\git\corefx", @"C:\git\corefx\tmp" }, + { @"C:tmp\foo\.", @"C:\git\corefx", @"C:\git\corefx\tmp\foo" }, + { @"C:tmp\foo\..", @"C:\git\corefx", @"C:\git\corefx\tmp" }, + { @"C:tmp", @"C:\git\corefx", @"C:\git\corefx\tmp" }, + { @"C:", @"C:\git\corefx", @"C:\git\corefx" }, + { @"C", @"C:\git\corefx", @"C:\git\corefx\C" }, + + { @"Z:tmp\foo\..", @"C:\git\corefx", @"Z:\tmp" }, + { @"Z:tmp\foo\.", @"C:\git\corefx", @"Z:\tmp\foo" }, + { @"Z:tmp\foo\..", @"C:\git\corefx", @"Z:\tmp" }, + { @"Z:tmp", @"C:\git\corefx", @"Z:\tmp" }, + { @"Z:", @"C:\git\corefx", @"Z:\" }, + { @"Z", @"C:\git\corefx", @"C:\git\corefx\Z" }, + + // Relative segments eating into the root + { @"C:..\..\..\tmp\foo\..", @"C:\git\corefx", @"C:\tmp" }, + { @"C:tmp\..\..\foo\.", @"C:\git\corefx", @"C:\git\foo" }, + { @"C:..\..\tmp\foo\..", @"C:\git\corefx", @"C:\tmp" }, + { @"C:tmp\..\", @"C:\git\corefx", @"C:\git\corefx\" }, + { @"C:", @"C:\git\corefx", @"C:\git\corefx" }, + { @"C", @"C:\git\corefx", @"C:\git\corefx\C" }, + + { @"C:tmp\..\..\..\..\foo\..", @"C:\git\corefx", @"C:\" }, + { @"C:tmp\..\..\foo\.", @"C:\", @"C:\foo" }, + { @"C:..\..\tmp\..\foo\..", @"C:\", @"C:\" }, + { @"C:tmp\..\", @"C:\", @"C:\" }, + + { @"Z:tmp\foo\..", @"C:\git\corefx", @"Z:\tmp" }, + { @"Z:tmp\foo\.", @"C:\git\corefx", @"Z:\tmp\foo" }, + { @"Z:tmp\foo\..", @"C:\git\corefx", @"Z:\tmp" }, + { @"Z:tmp", @"C:\git\corefx", @"Z:\tmp" }, + { @"Z:", @"C:\git\corefx", @"Z:\" }, + { @"Z", @"C:\git\corefx", @"C:\git\corefx\Z" }, + + { @"Z:..\..\..\tmp\foo\..", @"C:\git\corefx", @"Z:\tmp" }, + { @"Z:tmp\..\..\foo\.", @"C:\git\corefx", @"Z:\foo" }, + { @"Z:..\..\tmp\foo\..", @"C:\git\corefx", @"Z:\tmp" }, + { @"Z:tmp\..\", @"C:\git\corefx", @"Z:\" }, + { @"Z:", @"C:\git\corefx", @"Z:\" }, + { @"Z", @"C:\git\corefx", @"C:\git\corefx\Z" }, + + { @"Z:tmp\..\..\..\..\foo\..", @"C:\git\corefx", @"Z:\" }, + { @"Z:tmp\..\..\foo\.", @"C:\", @"Z:\foo" }, + { @"Z:..\..\tmp\..\foo\..", @"C:\", @"Z:\" }, + { @"Z:tmp\..\", @"C:\", @"Z:\" }, + }; + + [Theory, + MemberData(nameof(GetFullPath_CommonRootedWindowsData))] + public void GetFullPath_CommonUnRooted_Windows(string path, string basePath, string expected) + { + Assert.Equal(expected, Path.GetFullPath(path, basePath)); + Assert.Equal(@"\\.\" + expected, Path.GetFullPath(path, @"\\.\" + basePath)); + Assert.Equal(@"\\?\" + expected, Path.GetFullPath(path, @"\\?\" + basePath)); + } + + [Fact] + public void GetFullPath_ThrowsOnEmbeddedNulls() + { + Assert.Throws(null, () => Path.GetFullPath("/gi\0t", @"C:\foo\bar")); + } + } +} diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests_Windows_NetFX.cs b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests_Windows_NetFX.cs new file mode 100644 index 0000000000..56dee5db9d --- /dev/null +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/IO/PathTests_Windows_NetFX.cs @@ -0,0 +1,106 @@ +// 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 Xunit; + +namespace System.IO.Tests +{ + [PlatformSpecific(TestPlatforms.Windows)] + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] + public class PathTests_Windows_NetFX : PathTestsBase + { + [Theory, + MemberData(nameof(TestData_EmbeddedNull)), + MemberData(nameof(TestData_EmptyString)), + MemberData(nameof(TestData_ControlChars))] + public void GetDirectoryName_ArgumentExceptions(string path) + { + // In NetFX we normalize and check invalid path chars + AssertExtensions.Throws("path", null, () => Path.GetDirectoryName(path)); + } + + [Theory, + MemberData(nameof(TestData_ControlChars)), + MemberData(nameof(TestData_EmbeddedNull))] + public void IsPathRooted_ArgumentExceptions(string path) + { + // In NetFX we check invalid path chars + AssertExtensions.Throws("path", null, () => Path.IsPathRooted(path)); + } + + [Theory, + MemberData(nameof(TestData_Spaces)), + MemberData(nameof(TestData_UnicodeWhiteSpace)), + MemberData(nameof(TestData_EmptyString))] + public void IsPathRooted_NegativeCases(string path) + { + Assert.False(Path.IsPathRooted(path)); + } + + [Theory, + MemberData(nameof(TestData_InvalidDriveLetters)), + MemberData(nameof(TestData_ValidDriveLetters))] + public void IsPathRooted(string path) + { + Assert.True(Path.IsPathRooted(path)); + } + + [Theory, + InlineData(@" C:\dir\baz", @"C:\dir"), + InlineData(@" C:\dir\baz", @"C:\dir")] + public void GetDirectoryName_SkipSpaces(string path, string expected) + { + // In very specific cases we would trim leading spaces + Assert.Equal(expected, Path.GetDirectoryName(path)); + } + + [Fact] + public void GetPathRoot_EmptyThrows_Desktop() + { + AssertExtensions.Throws("path", null, () => Path.GetPathRoot(string.Empty)); + } + + [Fact] + public void GetInvalidPathChars() + { + Assert.All(Path.GetInvalidPathChars(), c => + { + string bad = c.ToString(); + AssertExtensions.Throws("path", null, () => Path.ChangeExtension(bad, "ok")); + AssertExtensions.Throws("path", null, () => Path.Combine(bad, "ok")); + AssertExtensions.Throws("path", null, () => Path.Combine("ok", "ok", bad)); + AssertExtensions.Throws("path", null, () => Path.Combine("ok", "ok", bad, "ok")); + AssertExtensions.Throws("path", null, () => Path.Combine(bad, bad, bad, bad, bad)); + AssertExtensions.Throws("path", null, () => Path.GetDirectoryName(bad)); + AssertExtensions.Throws("path", null, () => Path.GetExtension(bad)); + AssertExtensions.Throws("path", null, () => Path.GetFileName(bad)); + AssertExtensions.Throws("path", null, () => Path.GetFileNameWithoutExtension(bad)); + AssertExtensions.Throws(c == 124 ? null : "path", null, () => Path.GetFullPath(bad)); + AssertExtensions.Throws("path", null, () => Path.GetPathRoot(bad)); + AssertExtensions.Throws("path", null, () => Path.IsPathRooted(bad)); + }); + } + + [Theory, MemberData(nameof(TestData_NonDriveColonPaths))] + public void GetFullPath_NotSupportedColons(string path) + { + // Throws via our invalid colon filtering (as part of FileIOPermissions) + AssertExtensions.ThrowsAny(() => Path.GetFullPath(path)); + } + + [Theory, + MemberData(nameof(TestData_Wildcards)), + MemberData(nameof(TestData_ExtendedWildcards))] + public void GetFullPath_Wildcards(char wildcard) + { + AssertExtensions.Throws("path", null, () => Path.GetFullPath("test" + wildcard + "ing")); + } + + [Theory, MemberData(nameof(TestData_InvalidUnc))] + public void GetFullPath_UNC_Invalid(string invalidPath) + { + AssertExtensions.Throws(null, () => Path.GetFullPath(invalidPath)); + } + } +} diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/Math.cs.REMOVED.git-id b/external/corefx/src/System.Runtime.Extensions/tests/System/Math.cs.REMOVED.git-id index 5d2df78a88..3272440122 100644 --- a/external/corefx/src/System.Runtime.Extensions/tests/System/Math.cs.REMOVED.git-id +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/Math.cs.REMOVED.git-id @@ -1 +1 @@ -8f3dc1bab5c7852a5cf1aa55e794846ea13f9592 \ No newline at end of file +70211b3fca1a649c5401d4dc08ba39a2d031b82b \ No newline at end of file diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/MathF.netcoreapp.cs.REMOVED.git-id b/external/corefx/src/System.Runtime.Extensions/tests/System/MathF.netcoreapp.cs.REMOVED.git-id index acc07d5af8..ba2cd12f7c 100644 --- a/external/corefx/src/System.Runtime.Extensions/tests/System/MathF.netcoreapp.cs.REMOVED.git-id +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/MathF.netcoreapp.cs.REMOVED.git-id @@ -1 +1 @@ -958dc3806c20da5124b4704c02421cf573439caf \ No newline at end of file +484aef174a002b091ed28e8a46d44640c7860531 \ No newline at end of file diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/MathTests.netcoreapp.cs b/external/corefx/src/System.Runtime.Extensions/tests/System/MathTests.netcoreapp.cs index f179214076..d62b026862 100644 --- a/external/corefx/src/System.Runtime.Extensions/tests/System/MathTests.netcoreapp.cs +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/MathTests.netcoreapp.cs @@ -7,7 +7,6 @@ using Xunit; namespace System.Tests { - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Math.Clamp is not in CoreRT yet.")] public static partial class MathTests { public static IEnumerable Clamp_UnsignedInt_TestData() @@ -32,6 +31,163 @@ namespace System.Tests yield return new object[] { 2, -1, 1, 1 }; } + [Theory] + [InlineData( double.NegativeInfinity, double.NaN, 0.0)] + [InlineData(-3.1415926535897932, double.NaN, 0.0)] // value: -(pi) + [InlineData(-2.7182818284590452, double.NaN, 0.0)] // value: -(e) + [InlineData(-1.4142135623730950, double.NaN, 0.0)] // value: -(sqrt(2)) + [InlineData(-1.0, double.NaN, 0.0)] + [InlineData(-0.69314718055994531, double.NaN, 0.0)] // value: -(ln(2)) + [InlineData(-0.43429448190325183, double.NaN, 0.0)] // value: -(log10(e)) + [InlineData(-0.0, double.NaN, 0.0)] + [InlineData( double.NaN, double.NaN, 0.0)] + [InlineData( 0.0, double.NaN, 0.0)] + [InlineData( 1.0, 0.0, CrossPlatformMachineEpsilon)] + [InlineData( 1.0510897883672876, 0.31830988618379067, CrossPlatformMachineEpsilon)] // expected: (1 / pi) + [InlineData( 1.0957974645564909, 0.43429448190325183, CrossPlatformMachineEpsilon)] // expected: (log10(e)) + [InlineData( 1.2095794864199787, 0.63661977236758134, CrossPlatformMachineEpsilon)] // expected: (2 / pi) + [InlineData( 1.25, 0.69314718055994531, CrossPlatformMachineEpsilon)] // expected: (ln(2)) + [InlineData( 1.2605918365213561, 0.70710678118654752, CrossPlatformMachineEpsilon)] // expected: (1 / sqrt(2)) + [InlineData( 1.3246090892520058, 0.78539816339744831, CrossPlatformMachineEpsilon)] // expected: (pi / 4) + [InlineData( 1.5430806348152438, 1.0, CrossPlatformMachineEpsilon * 10)] + [InlineData( 1.7071001431069344, 1.1283791670955126, CrossPlatformMachineEpsilon * 10)] // expected: (2 / sqrt(pi)) + [InlineData( 2.1781835566085709, 1.4142135623730950, CrossPlatformMachineEpsilon * 10)] // expected: (sqrt(2)) + [InlineData( 2.2341880974508023, 1.4426950408889634, CrossPlatformMachineEpsilon * 10)] // expected: (log2(e)) + [InlineData( 2.5091784786580568, 1.5707963267948966, CrossPlatformMachineEpsilon * 10)] // expected: (pi / 2) + [InlineData( 5.05, 2.3025850929940457, CrossPlatformMachineEpsilon * 10)] // expected: (ln(10)) + [InlineData( 7.6101251386622884, 2.7182818284590452, CrossPlatformMachineEpsilon * 10)] // expected: (e) + [InlineData( 11.591953275521521, 3.1415926535897932, CrossPlatformMachineEpsilon * 10)] // expected: (pi) + [InlineData( double.PositiveInfinity, double.PositiveInfinity, 0.0)] + public static void Acosh(double value, double expectedResult, double allowedVariance) + { + AssertEqual(expectedResult, Math.Acosh(value), allowedVariance); + } + + [Theory] + [InlineData( double.NegativeInfinity, double.NegativeInfinity, 0.0)] + [InlineData(-11.548739357257748, -3.1415926535897932, CrossPlatformMachineEpsilon * 10)] // expected: -(pi) + [InlineData(-7.5441371028169758, -2.7182818284590452, CrossPlatformMachineEpsilon * 10)] // expected: -(e) + [InlineData(-4.95, -2.3025850929940457, CrossPlatformMachineEpsilon * 10)] // expected: -(ln(10)) + [InlineData(-2.3012989023072949, -1.5707963267948966, CrossPlatformMachineEpsilon * 10)] // expected: -(pi / 2) + [InlineData(-1.9978980091062796, -1.4426950408889634, CrossPlatformMachineEpsilon * 10)] // expected: -(log2(e)) + [InlineData(-1.9350668221743567, -1.4142135623730950, CrossPlatformMachineEpsilon * 10)] // expected: -(sqrt(2)) + [InlineData(-1.3835428792038633, -1.1283791670955126, CrossPlatformMachineEpsilon * 10)] // expected: -(2 / sqrt(pi)) + [InlineData(-1.1752011936438015, -1, CrossPlatformMachineEpsilon * 10)] + [InlineData(-0.86867096148600961, -0.78539816339744831, CrossPlatformMachineEpsilon)] // expected: -(pi / 4) + [InlineData(-0.76752314512611633, -0.70710678118654752, CrossPlatformMachineEpsilon)] // expected: -(1 / sqrt(2)) + [InlineData(-0.75, -0.69314718055994531, CrossPlatformMachineEpsilon)] // expected: -(ln(2)) + [InlineData(-0.68050167815224332, -0.63661977236758134, CrossPlatformMachineEpsilon)] // expected: -(2 / pi) + [InlineData(-0.44807597941469025, -0.43429448190325183, CrossPlatformMachineEpsilon)] // expected: -(log10(e)) + [InlineData(-0.32371243907207108, -0.31830988618379067, CrossPlatformMachineEpsilon)] // expected: -(1 / pi) + [InlineData(-0.0, -0.0, 0.0)] + [InlineData( double.NaN, double.NaN, 0.0)] + [InlineData( 0.0, 0.0, 0.0)] + [InlineData( 0.32371243907207108, 0.31830988618379067, CrossPlatformMachineEpsilon)] // expected: (1 / pi) + [InlineData( 0.44807597941469025, 0.43429448190325183, CrossPlatformMachineEpsilon)] // expected: (log10(e)) + [InlineData( 0.68050167815224332, 0.63661977236758134, CrossPlatformMachineEpsilon)] // expected: (2 / pi) + [InlineData( 0.75, 0.69314718055994531, CrossPlatformMachineEpsilon)] // expected: (ln(2)) + [InlineData( 0.76752314512611633, 0.70710678118654752, CrossPlatformMachineEpsilon)] // expected: (1 / sqrt(2)) + [InlineData( 0.86867096148600961, 0.78539816339744831, CrossPlatformMachineEpsilon)] // expected: (pi / 4) + [InlineData( 1.1752011936438015, 1.0, CrossPlatformMachineEpsilon * 10)] + [InlineData( 1.3835428792038633, 1.1283791670955126, CrossPlatformMachineEpsilon * 10)] // expected: (2 / sqrt(pi)) + [InlineData( 1.9350668221743567, 1.4142135623730950, CrossPlatformMachineEpsilon * 10)] // expected: (sqrt(2)) + [InlineData( 1.9978980091062796, 1.4426950408889634, CrossPlatformMachineEpsilon * 10)] // expected: (log2(e)) + [InlineData( 2.3012989023072949, 1.5707963267948966, CrossPlatformMachineEpsilon * 10)] // expected: (pi / 2) + [InlineData( 4.95, 2.3025850929940457, CrossPlatformMachineEpsilon * 10)] // expected: (ln(10)) + [InlineData( 7.5441371028169758, 2.7182818284590452, CrossPlatformMachineEpsilon * 10)] // expected: (e) + [InlineData( 11.548739357257748, 3.1415926535897932, CrossPlatformMachineEpsilon * 10)] // expected: (pi) + [InlineData( double.PositiveInfinity, double.PositiveInfinity, 0.0)] + public static void Asinh(double value, double expectedResult, double allowedVariance) + { + AssertEqual(expectedResult, Math.Asinh(value), allowedVariance); + } + + [Theory] + [InlineData( double.NegativeInfinity, double.NaN, 0.0)] + [InlineData(-3.1415926535897932, double.NaN, 0.0)] // value: -(pi) + [InlineData(-2.7182818284590452, double.NaN, 0.0)] // value: -(e) + [InlineData(-1.4142135623730950, double.NaN, 0.0)] // value: -(sqrt(2)) + [InlineData(-1.0, double.NegativeInfinity, CrossPlatformMachineEpsilon * 10)] + [InlineData(-0.99627207622074994, -3.1415926535897932, CrossPlatformMachineEpsilon * 10)] // expected: -(pi) + [InlineData(-0.99132891580059984, -2.7182818284590452, CrossPlatformMachineEpsilon * 10)] // expected: -(e) + [InlineData(-0.98019801980198020, -2.3025850929940457, CrossPlatformMachineEpsilon * 10)] // expected: -(ln(10)) + [InlineData(-0.91715233566727435, -1.5707963267948966, CrossPlatformMachineEpsilon * 10)] // expected: -(pi / 2) + [InlineData(-0.89423894585503855, -1.4426950408889634, CrossPlatformMachineEpsilon * 10)] // expected: -(log2(e)) + [InlineData(-0.88838556158566054, -1.4142135623730950, CrossPlatformMachineEpsilon * 10)] // expected: -(sqrt(2)) + [InlineData(-0.81046380599898809, -1.1283791670955126, CrossPlatformMachineEpsilon * 10)] // expected: -(2 / sqrt(pi)) + [InlineData(-0.76159415595576489, -1.0, CrossPlatformMachineEpsilon * 10)] + [InlineData(-0.65579420263267244, -0.78539816339744831, CrossPlatformMachineEpsilon)] // expected: -(pi / 4) + [InlineData(-0.60885936501391381, -0.70710678118654752, CrossPlatformMachineEpsilon)] // expected: -(1 / sqrt(2)) + [InlineData(-0.6, -0.69314718055994531, CrossPlatformMachineEpsilon)] // expected: -(ln(2)) + [InlineData(-0.56259360033158334, -0.63661977236758134, CrossPlatformMachineEpsilon)] // expected: -(2 / pi) + [InlineData(-0.40890401183401433, -0.43429448190325183, CrossPlatformMachineEpsilon)] // expected: -(log10(e)) + [InlineData(-0.30797791269089433, -0.31830988618379067, CrossPlatformMachineEpsilon)] // expected: -(1 / pi) + [InlineData(-0.0, -0.0, 0.0)] + [InlineData( double.NaN, double.NaN, 0.0)] + [InlineData( 0.0, 0.0, 0.0)] + [InlineData( 0.30797791269089433, 0.31830988618379067, CrossPlatformMachineEpsilon)] // expected: (1 / pi) + [InlineData( 0.40890401183401433, 0.43429448190325183, CrossPlatformMachineEpsilon)] // expected: (log10(e)) + [InlineData( 0.56259360033158334, 0.63661977236758134, CrossPlatformMachineEpsilon)] // expected: (2 / pi) + [InlineData( 0.6, 0.69314718055994531, CrossPlatformMachineEpsilon)] // expected: (ln(2)) + [InlineData( 0.60885936501391381, 0.70710678118654752, CrossPlatformMachineEpsilon)] // expected: (1 / sqrt(2)) + [InlineData( 0.65579420263267244, 0.78539816339744831, CrossPlatformMachineEpsilon)] // expected: (pi / 4) + [InlineData( 0.76159415595576489, 1.0, CrossPlatformMachineEpsilon * 10)] + [InlineData( 0.81046380599898809, 1.1283791670955126, CrossPlatformMachineEpsilon * 10)] // expected: (2 / sqrt(pi)) + [InlineData( 0.88838556158566054, 1.4142135623730950, CrossPlatformMachineEpsilon * 10)] // expected: (sqrt(2)) + [InlineData( 0.89423894585503855, 1.4426950408889634, CrossPlatformMachineEpsilon * 10)] // expected: (log2(e)) + [InlineData( 0.91715233566727435, 1.5707963267948966, CrossPlatformMachineEpsilon * 10)] // expected: (pi / 2) + [InlineData( 0.98019801980198020, 2.3025850929940457, CrossPlatformMachineEpsilon * 10)] // expected: (ln(10)) + [InlineData( 0.99132891580059984, 2.7182818284590452, CrossPlatformMachineEpsilon * 10)] // expected: (e) + [InlineData( 0.99627207622074994, 3.1415926535897932, CrossPlatformMachineEpsilon * 10)] // expected: (pi) + [InlineData( 1.0, double.PositiveInfinity, 0.0)] + [InlineData( 1.4142135623730950, double.NaN, 0.0)] // value: (sqrt(2)) + [InlineData( 2.7182818284590452, double.NaN, 0.0)] // value: (e) + [InlineData( 3.1415926535897932, double.NaN, 0.0)] // value: (pi) + [InlineData( double.PositiveInfinity, double.NaN, 0.0)] + public static void Atanh(double value, double expectedResult, double allowedVariance) + { + AssertEqual(expectedResult, Math.Atanh(value), allowedVariance); + } + + [Theory] + [InlineData( double.NegativeInfinity, double.NegativeInfinity, 0.0)] + [InlineData(-3.1415926535897932, -1.4645918875615233, CrossPlatformMachineEpsilon * 10)] // value: -(pi) + [InlineData(-2.7182818284590452, -1.3956124250860895, CrossPlatformMachineEpsilon * 10)] // value: -(e) + [InlineData(-2.3025850929940457, -1.3205004784536852, CrossPlatformMachineEpsilon * 10)] // value: -(ln(10)) + [InlineData(-1.5707963267948966, -1.1624473515096265, CrossPlatformMachineEpsilon * 10)] // value: -(pi / 2) + [InlineData(-1.4426950408889634, -1.1299472763373901, CrossPlatformMachineEpsilon * 10)] // value: -(log2(e)) + [InlineData(-1.4142135623730950, -1.1224620483093730, CrossPlatformMachineEpsilon * 10)] // value: -(sqrt(2)) + [InlineData(-1.1283791670955126, -1.0410821966965807, CrossPlatformMachineEpsilon * 10)] // value: -(2 / sqrt(pi)) + [InlineData(-1.0, -1.0, CrossPlatformMachineEpsilon * 10)] + [InlineData(-0.78539816339744831, -0.92263507432201421, CrossPlatformMachineEpsilon)] // value: -(pi / 4) + [InlineData(-0.70710678118654752, -0.89089871814033930, CrossPlatformMachineEpsilon)] // value: -(1 / sqrt(2)) + [InlineData(-0.69314718055994531, -0.88499704450051772, CrossPlatformMachineEpsilon)] // value: -(ln(2)) + [InlineData(-0.63661977236758134, -0.86025401382809963, CrossPlatformMachineEpsilon)] // value: -(2 / pi) + [InlineData(-0.43429448190325183, -0.75728863133090766, CrossPlatformMachineEpsilon)] // value: -(log10(e)) + [InlineData(-0.31830988618379067, -0.68278406325529568, CrossPlatformMachineEpsilon)] // value: -(1 / pi) + [InlineData(-0.0, -0.0, 0.0)] + [InlineData( double.NaN, double.NaN, 0.0)] + [InlineData( 0.0, 0.0, 0.0)] + [InlineData( 0.31830988618379067, 0.68278406325529568, CrossPlatformMachineEpsilon)] // value: (1 / pi) + [InlineData( 0.43429448190325183, 0.75728863133090766, CrossPlatformMachineEpsilon)] // value: (log10(e)) + [InlineData( 0.63661977236758134, 0.86025401382809963, CrossPlatformMachineEpsilon)] // value: (2 / pi) + [InlineData( 0.69314718055994531, 0.88499704450051772, CrossPlatformMachineEpsilon)] // value: (ln(2)) + [InlineData( 0.70710678118654752, 0.89089871814033930, CrossPlatformMachineEpsilon)] // value: (1 / sqrt(2)) + [InlineData( 0.78539816339744831, 0.92263507432201421, CrossPlatformMachineEpsilon)] // value: (pi / 4) + [InlineData( 1.0, 1.0, CrossPlatformMachineEpsilon * 10)] + [InlineData( 1.1283791670955126, 1.0410821966965807, CrossPlatformMachineEpsilon * 10)] // value: (2 / sqrt(pi)) + [InlineData( 1.4142135623730950, 1.1224620483093730, CrossPlatformMachineEpsilon * 10)] // value: (sqrt(2)) + [InlineData( 1.4426950408889634, 1.1299472763373901, CrossPlatformMachineEpsilon * 10)] // value: (log2(e)) + [InlineData( 1.5707963267948966, 1.1624473515096265, CrossPlatformMachineEpsilon * 10)] // value: (pi / 2) + [InlineData( 2.3025850929940457, 1.3205004784536852, CrossPlatformMachineEpsilon * 10)] // value: (ln(10)) + [InlineData( 2.7182818284590452, 1.3956124250860895, CrossPlatformMachineEpsilon * 10)] // value: (e) + [InlineData( 3.1415926535897932, 1.4645918875615233, CrossPlatformMachineEpsilon * 10)] // value: (pi) + [InlineData( double.PositiveInfinity, double.PositiveInfinity, 0.0)] + public static void Cbrt(double value, double expectedResult, double allowedVariance) + { + AssertEqual(expectedResult, Math.Cbrt(value), allowedVariance); + } + [Theory] [MemberData(nameof(Clamp_SignedInt_TestData))] public static void Clamp_SByte(sbyte value, sbyte min, sbyte max, sbyte expected) diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/StringComparer.cs b/external/corefx/src/System.Runtime.Extensions/tests/System/StringComparer.cs index f6e998ae2d..3ed12672b3 100644 --- a/external/corefx/src/System.Runtime.Extensions/tests/System/StringComparer.cs +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/StringComparer.cs @@ -26,12 +26,24 @@ namespace System.Tests VerifyComparer(StringComparer.OrdinalIgnoreCase, true); } + [Fact] + [ActiveIssue(27098, TargetFrameworkMonikers.NetFramework)] + public static void TestOrdinal_EmbeddedNull_ReturnsDifferentHashCodes() + { + StringComparer sc = StringComparer.Ordinal; + Assert.NotEqual(sc.GetHashCode("\0AAAAAAAAA"), sc.GetHashCode("\0BBBBBBBBBBBB")); + sc = StringComparer.OrdinalIgnoreCase; + Assert.NotEqual(sc.GetHashCode("\0AAAAAAAAA"), sc.GetHashCode("\0BBBBBBBBBBBB")); + } + private static void VerifyComparer(StringComparer sc, bool ignoreCase) { String s1 = "Hello"; String s1a = "Hello"; String s1b = "HELLO"; String s2 = "There"; + String aa = "\0AAAAAAAAA"; + String bb = "\0BBBBBBBBBBBB"; Assert.True(sc.Equals(s1, s1a)); Assert.True(sc.Equals(s1, s1a)); @@ -52,6 +64,12 @@ namespace System.Tests Assert.Equal(ignoreCase, sc.Equals(s1, s1b)); Assert.Equal(ignoreCase, ((IEqualityComparer)sc).Equals(s1, s1b)); + Assert.NotEqual(0, ((IComparer)sc).Compare(aa, bb)); + Assert.False(sc.Equals(aa, bb)); + Assert.False(((IEqualityComparer)sc).Equals(aa, bb)); + Assert.True(sc.Compare(aa, bb) < 0); + Assert.True(((IComparer)sc).Compare(aa, bb) < 0); + int result = sc.Compare(s1, s1b); if (ignoreCase) Assert.Equal(0, result); diff --git a/external/corefx/src/System.Runtime.Extensions/tests/System/StringComparer.netcoreapp.cs b/external/corefx/src/System.Runtime.Extensions/tests/System/StringComparer.netcoreapp.cs index 4b195dce9b..698b38f91b 100644 --- a/external/corefx/src/System.Runtime.Extensions/tests/System/StringComparer.netcoreapp.cs +++ b/external/corefx/src/System.Runtime.Extensions/tests/System/StringComparer.netcoreapp.cs @@ -14,13 +14,13 @@ namespace System.Tests { public static readonly object[][] FromComparison_TestData = { - // StringComparison StringComparer - new object[] { StringComparison.CurrentCulture, StringComparer.CurrentCulture }, - new object[] { StringComparison.CurrentCultureIgnoreCase, StringComparer.CurrentCultureIgnoreCase }, - new object[] { StringComparison.InvariantCulture, StringComparer.InvariantCulture }, + // StringComparison StringComparer + new object[] { StringComparison.CurrentCulture, StringComparer.CurrentCulture }, + new object[] { StringComparison.CurrentCultureIgnoreCase, StringComparer.CurrentCultureIgnoreCase }, + new object[] { StringComparison.InvariantCulture, StringComparer.InvariantCulture }, new object[] { StringComparison.InvariantCultureIgnoreCase, StringComparer.InvariantCultureIgnoreCase }, - new object[] { StringComparison.Ordinal, StringComparer.Ordinal }, - new object[] { StringComparison.OrdinalIgnoreCase, StringComparer.OrdinalIgnoreCase }, + new object[] { StringComparison.Ordinal, StringComparer.Ordinal }, + new object[] { StringComparison.OrdinalIgnoreCase, StringComparer.OrdinalIgnoreCase }, }; [Theory] @@ -39,5 +39,72 @@ namespace System.Tests AssertExtensions.Throws("comparisonType", () => StringComparer.FromComparison(minInvalid)); AssertExtensions.Throws("comparisonType", () => StringComparer.FromComparison(maxInvalid)); } + + public static TheoryData CreateFromCultureAndOptionsData => new TheoryData + { + { "abcd", "ABCD", "en-US", CompareOptions.None, false}, + { "latin i", "LATIN I", "en-US", CompareOptions.None, false}, + { "turky \u0131", "TURKY I", "tr-TR", CompareOptions.None, false}, + { "turky i", "TURKY \u0130", "tr-TR", CompareOptions.None, false}, + { "abcd", "ABCD", "en-US", CompareOptions.IgnoreCase, true}, + { "latin i", "LATIN I", "en-US", CompareOptions.IgnoreCase, true}, + { "turky \u0131", "TURKY I", "tr-TR", CompareOptions.IgnoreCase, true}, + { "turky i", "TURKY \u0130", "tr-TR", CompareOptions.IgnoreCase, true}, + { "abcd", "ab cd", "en-US", CompareOptions.IgnoreSymbols, true }, + { "abcd", "ab+cd", "en-US", CompareOptions.IgnoreSymbols, true }, + { "abcd", "ab%cd", "en-US", CompareOptions.IgnoreSymbols, true }, + { "abcd", "ab&cd", "en-US", CompareOptions.IgnoreSymbols, true }, + { "abcd", "ab$cd", "en-US", CompareOptions.IgnoreSymbols, true }, + { "abcd", "ab$cd", "en-US", CompareOptions.IgnoreSymbols, true }, + { "a-bcd", "ab$cd", "en-US", CompareOptions.IgnoreSymbols, true }, + { "abcd*", "ab$cd", "en-US", CompareOptions.IgnoreSymbols, true }, + { "ab$dd", "ab$cd", "en-US", CompareOptions.IgnoreSymbols, false }, + { "abcd", "ab$cd", "en-US", CompareOptions.IgnoreSymbols, true }, + }; + + public static TheoryData CreateFromCultureAndOptionsStringSortData => new TheoryData + { + { "abcd", "abcd", "en-US", CompareOptions.StringSort, true }, + { "abcd", "ABcd", "en-US", CompareOptions.StringSort, false }, + }; + + [Theory] + [MemberData(nameof(CreateFromCultureAndOptionsData))] + [MemberData(nameof(CreateFromCultureAndOptionsStringSortData))] + public static void CreateFromCultureAndOptions(string actualString, string expectedString, string cultureName, CompareOptions options, bool result) + { + CultureInfo ci = CultureInfo.GetCultureInfo(cultureName); + StringComparer sc = StringComparer.Create(ci, options); + + Assert.Equal(result, sc.Equals(actualString, expectedString)); + Assert.Equal(result, sc.Equals((object)actualString, (object)expectedString)); + } + + [Theory] + [MemberData(nameof(CreateFromCultureAndOptionsData))] + public static void CreateFromCultureAndOptionsStringSort(string actualString, string expectedString, string cultureName, CompareOptions options, bool result) + { + CultureInfo ci = CultureInfo.GetCultureInfo(cultureName); + StringComparer sc = StringComparer.Create(ci, options); + + if (result) + { + Assert.Equal(sc.GetHashCode(actualString), sc.GetHashCode(expectedString)); + Assert.Equal(sc.GetHashCode((object)actualString), sc.GetHashCode((object)actualString)); + } + else + { + Assert.NotEqual(sc.GetHashCode(actualString), sc.GetHashCode(expectedString)); + Assert.NotEqual(sc.GetHashCode((object)actualString), sc.GetHashCode((object)expectedString)); + } + } + + [Fact] + public static void CreateFromCultureAndOptionsOrdinal() + { + CultureInfo ci = CultureInfo.GetCultureInfo("en-US"); + Assert.Throws(() => StringComparer.Create(ci, CompareOptions.Ordinal)); + Assert.Throws(() => StringComparer.Create(ci, CompareOptions.OrdinalIgnoreCase)); + } } } diff --git a/external/corefx/src/System.Runtime.Extensions/tests/TestHelpers.cs b/external/corefx/src/System.Runtime.Extensions/tests/TestHelpers.cs new file mode 100644 index 0000000000..88d77f6240 --- /dev/null +++ b/external/corefx/src/System.Runtime.Extensions/tests/TestHelpers.cs @@ -0,0 +1,32 @@ +// 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.Collections.Generic; +using Xunit; + +namespace System +{ + public static class TestHelpers + { + public static TheoryData Concat(this IEnumerable first, TheoryData second) + { + TheoryData data = new TheoryData(); + foreach (var item in first) + data.Add(item); + foreach (var item in second) + data.Add((T)item[0]); + return data; + } + + public static TheoryData Concat(this TheoryData first, TheoryData second) + { + TheoryData data = new TheoryData(); + foreach (var item in first) + data.Add((T)item[0]); + foreach (var item in second) + data.Add((T)item[0]); + return data; + } + } +} diff --git a/external/corefx/src/System.Runtime.InteropServices.RuntimeInformation/tests/DescriptionNameTests.cs b/external/corefx/src/System.Runtime.InteropServices.RuntimeInformation/tests/DescriptionNameTests.cs index 4432b6850b..f89b9bfa18 100644 --- a/external/corefx/src/System.Runtime.InteropServices.RuntimeInformation/tests/DescriptionNameTests.cs +++ b/external/corefx/src/System.Runtime.InteropServices.RuntimeInformation/tests/DescriptionNameTests.cs @@ -21,8 +21,10 @@ namespace System.Runtime.InteropServices.RuntimeInformationTests string osa = RuntimeInformation.OSArchitecture.ToString(); string pra = RuntimeInformation.ProcessArchitecture.ToString(); string frd = RuntimeInformation.FrameworkDescription.Trim(); + string lcr = PlatformDetection.LibcRelease; + string lcv = PlatformDetection.LibcVersion; - Console.WriteLine($@"{dvs} OS={osd} OSVer={osv} OSArch={osa} Arch={pra} Framework={frd}"); + Console.WriteLine($@"{dvs} OS={osd} OSVer={osv} OSArch={osa} Arch={pra} Framework={frd} LibcRelease={lcr} LibcVersion={lcv}"); } [Fact] diff --git a/external/corefx/src/System.Runtime.InteropServices/src/System/Runtime/InteropServices/ComTypes/IDataObject.cs b/external/corefx/src/System.Runtime.InteropServices/src/System/Runtime/InteropServices/ComTypes/IDataObject.cs index 33e8c79164..c41c04876d 100644 --- a/external/corefx/src/System.Runtime.InteropServices/src/System/Runtime/InteropServices/ComTypes/IDataObject.cs +++ b/external/corefx/src/System.Runtime.InteropServices/src/System/Runtime/InteropServices/ComTypes/IDataObject.cs @@ -4,17 +4,85 @@ namespace System.Runtime.InteropServices.ComTypes { + /// + /// The IDataObject interface specifies methods that enable data transfer + /// and notification of changes in data. Data transfer methods specify + /// the format of the transferred data along with the medium through + /// which the data is to be transferred. Optionally, the data can be + /// rendered for a specific target device. In addition to methods for + /// retrieving and storing data, the IDataObject interface specifies + /// methods for enumerating available formats and managing connections + /// to advisory sinks for handling change notifications. + /// [CLSCompliant(false)] - public interface IDataObject - { - int DAdvise(ref FORMATETC pFormatetc, ADVF advf, IAdviseSink adviseSink, out int connection); - void DUnadvise(int connection); - int EnumDAdvise(out IEnumSTATDATA enumAdvise); + [ComImport()] + [Guid("0000010E-0000-0000-C000-000000000046")] + [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)] + public interface IDataObject { + + /// + /// Called by a data consumer to obtain data from a source data object. + /// The GetData method renders the data described in the specified FORMATETC + /// structure and transfers it through the specified STGMEDIUM structure. + /// The caller then assumes responsibility for releasing the STGMEDIUM structure. + /// + void GetData([In] ref FORMATETC format, out STGMEDIUM medium); + + /// + /// Called by a data consumer to obtain data from a source data object. + /// This method differs from the GetData method in that the caller must + /// allocate and free the specified storage medium. + /// + void GetDataHere([In] ref FORMATETC format, ref STGMEDIUM medium); + + /// + /// Determines whether the data object is capable of rendering the data + /// described in the FORMATETC structure. Objects attempting a paste or + /// drop operation can call this method before calling IDataObject::GetData + /// to get an indication of whether the operation may be successful. + /// + [PreserveSig] + int QueryGetData([In] ref FORMATETC format); + + /// + /// Provides a standard FORMATETC structure that is logically equivalent to one that is more + /// complex. You use this method to determine whether two different + /// FORMATETC structures would return the same data, removing the need + /// for duplicate rendering. + /// + [PreserveSig] + int GetCanonicalFormatEtc([In] ref FORMATETC formatIn, out FORMATETC formatOut); + + /// + /// Called by an object containing a data source to transfer data to + /// the object that implements this method. + /// + void SetData([In] ref FORMATETC formatIn, [In] ref STGMEDIUM medium, [MarshalAs(UnmanagedType.Bool)] bool release); + + /// + /// Creates an object for enumerating the FORMATETC structures for a + /// data object. These structures are used in calls to IDataObject::GetData + /// or IDataObject::SetData. + /// IEnumFORMATETC EnumFormatEtc(DATADIR direction); - int GetCanonicalFormatEtc(ref FORMATETC formatIn, out FORMATETC formatOut); - void GetData(ref FORMATETC format, out STGMEDIUM medium); - void GetDataHere(ref FORMATETC format, ref STGMEDIUM medium); - int QueryGetData(ref FORMATETC format); - void SetData(ref FORMATETC formatIn, ref STGMEDIUM medium, bool release); + + /// + /// Called by an object supporting an advise sink to create a connection between + /// a data object and the advise sink. This enables the advise sink to be + /// notified of changes in the data of the object. + /// + [PreserveSig] + int DAdvise([In] ref FORMATETC pFormatetc, ADVF advf, IAdviseSink adviseSink, out int connection); + + /// + /// Destroys a notification connection that had been previously set up. + /// + void DUnadvise(int connection); + + /// + /// Creates an object that can be used to enumerate the current advisory connections. + /// + [PreserveSig] + int EnumDAdvise(out IEnumSTATDATA enumAdvise); } } diff --git a/external/corefx/src/System.Runtime.InteropServices/src/System/Runtime/InteropServices/ComTypes/IEnumSTATDATA.cs b/external/corefx/src/System.Runtime.InteropServices/src/System/Runtime/InteropServices/ComTypes/IEnumSTATDATA.cs index 27f127a399..1c05186040 100644 --- a/external/corefx/src/System.Runtime.InteropServices/src/System/Runtime/InteropServices/ComTypes/IEnumSTATDATA.cs +++ b/external/corefx/src/System.Runtime.InteropServices/src/System/Runtime/InteropServices/ComTypes/IEnumSTATDATA.cs @@ -4,12 +4,46 @@ namespace System.Runtime.InteropServices.ComTypes { - [CLSCompliant(false)] + /// + /// The IEnumSTATDATA interface is used to enumerate through an array of + /// STATDATA structures, which contain advisory connection information for + /// a data object. IEnumSTATDATA has the same methods as all enumerator + /// interfaces: Next, Skip, Reset, and Clone. + /// + [ComImport()] + [Guid("00000103-0000-0000-C000-000000000046")] + [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)] public interface IEnumSTATDATA { - void Clone(out IEnumSTATDATA newEnum); - int Next(int celt, STATDATA[] rgelt, int[] pceltFetched); - int Reset(); + + /// + /// Retrieves the next celt items in the enumeration sequence. If there are + /// fewer than the requested number of elements left in the sequence, it + /// retrieves the remaining elements. The number of elements actually + /// retrieved is returned through pceltFetched (unless the caller passed + /// in NULL for that parameter). + /// + [PreserveSig] + int Next(int celt, [Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex=0)] STATDATA[] rgelt, [Out, MarshalAs(UnmanagedType.LPArray, SizeConst=1)] int[] pceltFetched); + + /// + /// Skips over the next specified number of elements in the enumeration sequence. + /// + [PreserveSig] int Skip(int celt); + + /// + /// Resets the enumeration sequence to the beginning. + /// + [PreserveSig] + int Reset(); + + /// + /// Creates another enumerator that contains the same enumeration state as + /// the current one. Using this function, a client can record a particular + /// point in the enumeration sequence and then return to that point at a + /// later time. The new enumerator supports the same interface as the original one. + /// + void Clone(out IEnumSTATDATA newEnum); } } diff --git a/external/corefx/src/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln b/external/corefx/src/System.Runtime.Intrinsics.Experimental/System.Runtime.Intrinsics.Experimental.sln similarity index 89% rename from external/corefx/src/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln rename to external/corefx/src/System.Runtime.Intrinsics.Experimental/System.Runtime.Intrinsics.Experimental.sln index 16efecee03..ef61ead4a2 100644 --- a/external/corefx/src/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln +++ b/external/corefx/src/System.Runtime.Intrinsics.Experimental/System.Runtime.Intrinsics.Experimental.sln @@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Intrinsics", "src\System.Runtime.Intrinsics.csproj", "{543FBFE5-E9E4-4631-8242-911A707FE818}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Intrinsics.Experimental", "src\System.Runtime.Intrinsics.Experimental.csproj", "{543FBFE5-E9E4-4631-8242-911A707FE818}" ProjectSection(ProjectDependencies) = postProject {4074AF8C-8C65-486C-960E-F45DAAB0BE0D} = {4074AF8C-8C65-486C-960E-F45DAAB0BE0D} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Intrinsics", "ref\System.Runtime.Intrinsics.csproj", "{4074AF8C-8C65-486C-960E-F45DAAB0BE0D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Intrinsics.Experimental", "ref\System.Runtime.Intrinsics.Experimental.csproj", "{4074AF8C-8C65-486C-960E-F45DAAB0BE0D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}" EndProject diff --git a/external/corefx/src/System.Runtime.Intrinsics.Experimental/dir.props b/external/corefx/src/System.Runtime.Intrinsics.Experimental/dir.props new file mode 100644 index 0000000000..fbbc9a2ce3 --- /dev/null +++ b/external/corefx/src/System.Runtime.Intrinsics.Experimental/dir.props @@ -0,0 +1,10 @@ + + + + + 4.0.0.0 + Open + + true + + diff --git a/external/corefx/src/System.Runtime.Intrinsics.Experimental/pkg/System.Runtime.Intrinsics.Experimental.pkgproj b/external/corefx/src/System.Runtime.Intrinsics.Experimental/pkg/System.Runtime.Intrinsics.Experimental.pkgproj new file mode 100644 index 0000000000..b8ebbcce2d --- /dev/null +++ b/external/corefx/src/System.Runtime.Intrinsics.Experimental/pkg/System.Runtime.Intrinsics.Experimental.pkgproj @@ -0,0 +1,11 @@ + + + + + + netcoreapp2.1 + + + + + diff --git a/external/corefx/src/System.Runtime.Intrinsics.Experimental/ref/Configurations.props b/external/corefx/src/System.Runtime.Intrinsics.Experimental/ref/Configurations.props new file mode 100644 index 0000000000..2845c11c54 --- /dev/null +++ b/external/corefx/src/System.Runtime.Intrinsics.Experimental/ref/Configurations.props @@ -0,0 +1,8 @@ + + + + + netcoreapp; + + + \ No newline at end of file diff --git a/external/corefx/src/System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.csproj b/external/corefx/src/System.Runtime.Intrinsics.Experimental/ref/System.Runtime.Intrinsics.Experimental.csproj similarity index 92% rename from external/corefx/src/System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.csproj rename to external/corefx/src/System.Runtime.Intrinsics.Experimental/ref/System.Runtime.Intrinsics.Experimental.csproj index 78a1f4b8fd..f699e7a679 100644 --- a/external/corefx/src/System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.csproj +++ b/external/corefx/src/System.Runtime.Intrinsics.Experimental/ref/System.Runtime.Intrinsics.Experimental.csproj @@ -9,10 +9,10 @@ - + - \ No newline at end of file + diff --git a/external/corefx/src/System.Runtime.Intrinsics.Experimental/ref/System.Runtime.Intrinsics.cs.REMOVED.git-id b/external/corefx/src/System.Runtime.Intrinsics.Experimental/ref/System.Runtime.Intrinsics.cs.REMOVED.git-id new file mode 100644 index 0000000000..d0c9c7adda --- /dev/null +++ b/external/corefx/src/System.Runtime.Intrinsics.Experimental/ref/System.Runtime.Intrinsics.cs.REMOVED.git-id @@ -0,0 +1 @@ +c4426c7b23df2e31ce7136f08c77ed6f3057c6d9 \ No newline at end of file diff --git a/external/corefx/src/System.Runtime.Intrinsics/src/Configurations.props b/external/corefx/src/System.Runtime.Intrinsics.Experimental/src/Configurations.props similarity index 100% rename from external/corefx/src/System.Runtime.Intrinsics/src/Configurations.props rename to external/corefx/src/System.Runtime.Intrinsics.Experimental/src/Configurations.props diff --git a/external/corefx/src/System.Runtime.Intrinsics/src/System.Runtime.Intrinsics.csproj b/external/corefx/src/System.Runtime.Intrinsics.Experimental/src/System.Runtime.Intrinsics.Experimental.csproj similarity index 93% rename from external/corefx/src/System.Runtime.Intrinsics/src/System.Runtime.Intrinsics.csproj rename to external/corefx/src/System.Runtime.Intrinsics.Experimental/src/System.Runtime.Intrinsics.Experimental.csproj index 548805ab48..273ed07308 100644 --- a/external/corefx/src/System.Runtime.Intrinsics/src/System.Runtime.Intrinsics.csproj +++ b/external/corefx/src/System.Runtime.Intrinsics.Experimental/src/System.Runtime.Intrinsics.Experimental.csproj @@ -2,7 +2,7 @@ - System.Runtime.Intrinsics + System.Runtime.Intrinsics.Experimental true {543FBFE5-E9E4-4631-8242-911A707FE818} diff --git a/external/corefx/src/System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.X86.cs.REMOVED.git-id b/external/corefx/src/System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.X86.cs.REMOVED.git-id deleted file mode 100644 index 1ca474f97b..0000000000 --- a/external/corefx/src/System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.X86.cs.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -0f3f24effb78c6b12c6d718fab9bfbe77ec0e518 \ No newline at end of file diff --git a/external/corefx/src/System.Runtime.Loader/System.Runtime.Loader.sln b/external/corefx/src/System.Runtime.Loader/System.Runtime.Loader.sln index 2884525c90..270ede3878 100644 --- a/external/corefx/src/System.Runtime.Loader/System.Runtime.Loader.sln +++ b/external/corefx/src/System.Runtime.Loader/System.Runtime.Loader.sln @@ -22,7 +22,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Loader.Noop. {485A65F0-51C9-4B95-A7A8-A4860C231E67} = {485A65F0-51C9-4B95-A7A8-A4860C231E67} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Loader.Test.Assembly", "tests\System.Runtime.Loader.Test.Assembly\System.Runtime.Loader.Test.Assembly.csproj", "{396D6EBF-60BD-4DAF-8783-FB403E070A56}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Loader.Test.Assembly", "tests\System.Runtime.Loader.Test.Assembly\System.Runtime.Loader.Test.Assembly.csproj", "{E3C33774-AA3D-4CED-A7A6-BDF9A7F100DF}" ProjectSection(ProjectDependencies) = postProject {485A65F0-51C9-4B95-A7A8-A4860C231E67} = {485A65F0-51C9-4B95-A7A8-A4860C231E67} EndProjectSection @@ -62,10 +62,10 @@ Global {396D6EBF-60BD-4DAF-8783-FB403E070A57}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {396D6EBF-60BD-4DAF-8783-FB403E070A57}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU {396D6EBF-60BD-4DAF-8783-FB403E070A57}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU - {396D6EBF-60BD-4DAF-8783-FB403E070A56}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU - {396D6EBF-60BD-4DAF-8783-FB403E070A56}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU - {396D6EBF-60BD-4DAF-8783-FB403E070A56}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU - {396D6EBF-60BD-4DAF-8783-FB403E070A56}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU + {E3C33774-AA3D-4CED-A7A6-BDF9A7F100DF}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {E3C33774-AA3D-4CED-A7A6-BDF9A7F100DF}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {E3C33774-AA3D-4CED-A7A6-BDF9A7F100DF}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {E3C33774-AA3D-4CED-A7A6-BDF9A7F100DF}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {485A65F0-51C9-4B95-A7A8-A4860C231E67}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU {485A65F0-51C9-4B95-A7A8-A4860C231E67}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU {485A65F0-51C9-4B95-A7A8-A4860C231E67}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU @@ -83,7 +83,7 @@ Global {701CB3BC-00DC-435D-BDE4-C5FC29A708A8} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} {701CB3BC-00DC-435D-BDE4-C5FC29A708A9} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} {396D6EBF-60BD-4DAF-8783-FB403E070A57} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} - {396D6EBF-60BD-4DAF-8783-FB403E070A56} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} + {E3C33774-AA3D-4CED-A7A6-BDF9A7F100DF} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} {485A65F0-51C9-4B95-A7A8-A4860C231E67} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD} {FB507A82-ACDD-4809-A030-6F9372A71194} = {2E666815-2EDB-464B-9DF6-380BF4789AD4} EndGlobalSection diff --git a/external/corefx/src/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly/System.Runtime.Loader.Test.Assembly.csproj b/external/corefx/src/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly/System.Runtime.Loader.Test.Assembly.csproj index 12c34c5bbb..285161427f 100644 --- a/external/corefx/src/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly/System.Runtime.Loader.Test.Assembly.csproj +++ b/external/corefx/src/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly/System.Runtime.Loader.Test.Assembly.csproj @@ -2,7 +2,7 @@ - {396D6EBF-60BD-4DAF-8783-FB403E070A56} + {E3C33774-AA3D-4CED-A7A6-BDF9A7F100DF} diff --git a/external/corefx/src/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj b/external/corefx/src/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj index f017bb6b57..0e853f79dc 100644 --- a/external/corefx/src/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj +++ b/external/corefx/src/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj @@ -29,8 +29,8 @@ System\Globalization\FormatProvider.Number.cs - - System\Text\ValueStringBuilder.cs + + CoreLib\System\Text\ValueStringBuilder.cs diff --git a/external/corefx/src/System.Runtime.Numerics/src/System/Numerics/BigNumber.cs b/external/corefx/src/System.Runtime.Numerics/src/System/Numerics/BigNumber.cs index 8361b744a2..ccea174b33 100644 --- a/external/corefx/src/System.Runtime.Numerics/src/System/Numerics/BigNumber.cs +++ b/external/corefx/src/System.Runtime.Numerics/src/System/Numerics/BigNumber.cs @@ -330,7 +330,7 @@ namespace System.Numerics return false; } - return TryParseBigInteger(value.AsReadOnlySpan(), style, info, out result); + return TryParseBigInteger(value.AsSpan(), style, info, out result); } internal static bool TryParseBigInteger(ReadOnlySpan value, NumberStyles style, NumberFormatInfo info, out BigInteger result) @@ -371,7 +371,7 @@ namespace System.Numerics throw new ArgumentNullException(nameof(value)); } - return ParseBigInteger(value.AsReadOnlySpan(), style, info); + return ParseBigInteger(value.AsSpan(), style, info); } internal static BigInteger ParseBigInteger(ReadOnlySpan value, NumberStyles style, NumberFormatInfo info) diff --git a/external/corefx/src/System.Runtime.Numerics/tests/BigInteger/parse.netcoreapp.cs b/external/corefx/src/System.Runtime.Numerics/tests/BigInteger/parse.netcoreapp.cs index 31650dd358..593fc5f8b7 100644 --- a/external/corefx/src/System.Runtime.Numerics/tests/BigInteger/parse.netcoreapp.cs +++ b/external/corefx/src/System.Runtime.Numerics/tests/BigInteger/parse.netcoreapp.cs @@ -13,26 +13,26 @@ namespace System.Numerics.Tests { if (failureNotExpected) { - Eval(BigInteger.Parse(num1.AsReadOnlySpan(), ns), expected); + Eval(BigInteger.Parse(num1.AsSpan(), ns), expected); - Assert.True(BigInteger.TryParse(num1.AsReadOnlySpan(), ns, provider: null, out BigInteger test)); + Assert.True(BigInteger.TryParse(num1.AsSpan(), ns, provider: null, out BigInteger test)); Eval(test, expected); if (ns == NumberStyles.Integer) { - Assert.True(BigInteger.TryParse(num1.AsReadOnlySpan(), out test)); + Assert.True(BigInteger.TryParse(num1.AsSpan(), out test)); Eval(test, expected); } } else { - Assert.Throws(() => { BigInteger.Parse(num1.AsReadOnlySpan(), ns); }); + Assert.Throws(() => { BigInteger.Parse(num1.AsSpan(), ns); }); - Assert.False(BigInteger.TryParse(num1.AsReadOnlySpan(), ns, provider: null, out BigInteger test)); + Assert.False(BigInteger.TryParse(num1.AsSpan(), ns, provider: null, out BigInteger test)); if (ns == NumberStyles.Integer) { - Assert.False(BigInteger.TryParse(num1.AsReadOnlySpan(), out test)); + Assert.False(BigInteger.TryParse(num1.AsSpan(), out test)); } } } @@ -41,14 +41,14 @@ namespace System.Numerics.Tests { if (!failureExpected) { - Assert.Equal(expected, BigInteger.Parse(num1.AsReadOnlySpan(), provider: nfi)); - Assert.True(BigInteger.TryParse(num1.AsReadOnlySpan(), NumberStyles.Any, nfi, out BigInteger test)); + Assert.Equal(expected, BigInteger.Parse(num1.AsSpan(), provider: nfi)); + Assert.True(BigInteger.TryParse(num1.AsSpan(), NumberStyles.Any, nfi, out BigInteger test)); Assert.Equal(expected, test); } else { - Assert.Throws(() => { BigInteger.Parse(num1.AsReadOnlySpan(), provider: nfi); }); - Assert.False(BigInteger.TryParse(num1.AsReadOnlySpan(), NumberStyles.Any, nfi, out BigInteger test), String.Format("Expected TryParse to fail on {0}", num1)); + Assert.Throws(() => { BigInteger.Parse(num1.AsSpan(), provider: nfi); }); + Assert.False(BigInteger.TryParse(num1.AsSpan(), NumberStyles.Any, nfi, out BigInteger test), String.Format("Expected TryParse to fail on {0}", num1)); } } @@ -56,14 +56,14 @@ namespace System.Numerics.Tests { if (!failureExpected) { - Assert.Equal(expected, BigInteger.Parse(num1.AsReadOnlySpan(), ns, nfi)); - Assert.True(BigInteger.TryParse(num1.AsReadOnlySpan(), NumberStyles.Any, nfi, out BigInteger test)); + Assert.Equal(expected, BigInteger.Parse(num1.AsSpan(), ns, nfi)); + Assert.True(BigInteger.TryParse(num1.AsSpan(), NumberStyles.Any, nfi, out BigInteger test)); Assert.Equal(expected, test); } else { - Assert.Throws(() => { BigInteger.Parse(num1.AsReadOnlySpan(), ns, nfi); }); - Assert.False(BigInteger.TryParse(num1.AsReadOnlySpan(), ns, nfi, out BigInteger test), String.Format("Expected TryParse to fail on {0}", num1)); + Assert.Throws(() => { BigInteger.Parse(num1.AsSpan(), ns, nfi); }); + Assert.False(BigInteger.TryParse(num1.AsSpan(), ns, nfi, out BigInteger test), String.Format("Expected TryParse to fail on {0}", num1)); } } } diff --git a/external/corefx/src/System.Runtime.Numerics/tests/ComplexTests.cs b/external/corefx/src/System.Runtime.Numerics/tests/ComplexTests.cs index 27ed62d9dc..c05876af4b 100644 --- a/external/corefx/src/System.Runtime.Numerics/tests/ComplexTests.cs +++ b/external/corefx/src/System.Runtime.Numerics/tests/ComplexTests.cs @@ -440,7 +440,6 @@ namespace System.Numerics.Tests yield return new object[] { double.NaN, double.NegativeInfinity, double.NaN, double.NaN }; } - [ActiveIssue(15455)] [Theory, MemberData(nameof(ASin_Advanced_TestData))] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] public static void ASin_Advanced(double real, double imaginary, double expectedReal, double expectedImaginary) diff --git a/external/corefx/src/System.Runtime.Serialization.Formatters/src/MatchingRefApiCompatBaseline.txt b/external/corefx/src/System.Runtime.Serialization.Formatters/src/MatchingRefApiCompatBaseline.txt new file mode 100644 index 0000000000..87f8d5ca0f --- /dev/null +++ b/external/corefx/src/System.Runtime.Serialization.Formatters/src/MatchingRefApiCompatBaseline.txt @@ -0,0 +1,3 @@ +# Exposed publicly only in implementation for serialization compat +TypesMustExist : Type 'System.Runtime.Serialization.SerializationEventHandler' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.Runtime.Serialization.TypeLoadExceptionHolder' does not exist in the implementation but it does exist in the contract. diff --git a/external/corefx/src/System.Runtime.Serialization.Formatters/src/Resources/Strings.resx b/external/corefx/src/System.Runtime.Serialization.Formatters/src/Resources/Strings.resx index 8311d78104..4a01b4fadc 100644 --- a/external/corefx/src/System.Runtime.Serialization.Formatters/src/Resources/Strings.resx +++ b/external/corefx/src/System.Runtime.Serialization.Formatters/src/Resources/Strings.resx @@ -58,6 +58,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Capacity overflowed and went negative. + Type '{0}' in Assembly '{1}' is not marked as serializable. diff --git a/external/corefx/src/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj b/external/corefx/src/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj index 7752ff9879..ae432a86ca 100644 --- a/external/corefx/src/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj +++ b/external/corefx/src/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj @@ -61,6 +61,9 @@ + + Common\System\Collections\HashHelpers.cs + @@ -77,4 +80,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/ObjectIDGenerator.cs b/external/corefx/src/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/ObjectIDGenerator.cs index fab0a64183..8d70b5e190 100644 --- a/external/corefx/src/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/ObjectIDGenerator.cs +++ b/external/corefx/src/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/ObjectIDGenerator.cs @@ -2,6 +2,7 @@ // 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.Collections; using System.Runtime.CompilerServices; namespace System.Runtime.Serialization @@ -11,24 +12,16 @@ namespace System.Runtime.Serialization { private const int NumBins = 4; - // Table of prime numbers to use as hash table sizes. Each entry is the - // smallest prime number larger than twice the previous entry. - private static readonly int[] s_sizes = - { - 5, 11, 29, 47, 97, 197, 397, 797, 1597, 3203, 6421, 12853, 25717, 51437, - 102877, 205759, 411527, 823117, 1646237, 3292489, 6584983 - }; - internal int _currentCount; - internal int _currentSize; - internal long[] _ids; - internal object[] _objs; + private int _currentSize; + private long[] _ids; + private object[] _objs; // Constructs a new ObjectID generator, initializing all of the necessary variables. public ObjectIDGenerator() { _currentCount = 1; - _currentSize = s_sizes[0]; + _currentSize = HashHelpers.primes[0]; // Starting with 3 _ids = new long[_currentSize * NumBins]; _objs = new object[_currentSize * NumBins]; } @@ -107,13 +100,12 @@ namespace System.Runtime.Serialization // we return that id, otherwise we return 0. public virtual long HasId(object obj, out bool firstTime) { - bool found; - if (obj == null) { throw new ArgumentNullException(nameof(obj)); } + bool found; int pos = FindElement(obj, out found); if (found) { @@ -130,14 +122,14 @@ namespace System.Runtime.Serialization // the old arrays into the new ones. Expensive but necessary. private void Rehash() { - int i = 0; - for (int currSize = _currentSize; i < s_sizes.Length && s_sizes[i] <= currSize; i++) ; - if (i == s_sizes.Length) + int currSize = _currentSize; + int newSize = HashHelpers.ExpandPrime(currSize); + if (newSize == currSize) { // We just walked off the end of the array. throw new SerializationException(SR.Serialization_TooManyElements); } - _currentSize = s_sizes[i]; + _currentSize = newSize; long[] newIds = new long[_currentSize * NumBins]; object[] newObjs = new object[_currentSize * NumBins]; @@ -152,8 +144,7 @@ namespace System.Runtime.Serialization { if (oldObjs[j] != null) { - bool found; - int pos = FindElement(oldObjs[j], out found); + int pos = FindElement(oldObjs[j], out _); _objs[pos] = oldObjs[j]; _ids[pos] = oldIds[j]; } diff --git a/external/corefx/src/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/SerializationEventsCache.cs b/external/corefx/src/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/SerializationEventsCache.cs index 896afe1ea3..ee10099257 100644 --- a/external/corefx/src/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/SerializationEventsCache.cs +++ b/external/corefx/src/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/SerializationEventsCache.cs @@ -5,6 +5,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Diagnostics; +using System.Diagnostics.Private; using System.Reflection; namespace System.Runtime.Serialization diff --git a/external/corefx/src/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/SurrogateSelector.cs b/external/corefx/src/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/SurrogateSelector.cs index 82078ef303..5f150f5f0a 100644 --- a/external/corefx/src/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/SurrogateSelector.cs +++ b/external/corefx/src/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/SurrogateSelector.cs @@ -67,7 +67,7 @@ namespace System.Runtime.Serialization // Verify that we don't try and add ourself twice. if (selector == this) { - throw new SerializationException(SR.Serialization_DuplicateSelector); + throw new SerializationException(SR.Serialization_SurrogateCycle); } // Verify that the argument doesn't contain a cycle. diff --git a/external/corefx/src/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTestData.cs.REMOVED.git-id b/external/corefx/src/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTestData.cs.REMOVED.git-id index f88fa67d1c..5fad205d9d 100644 --- a/external/corefx/src/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTestData.cs.REMOVED.git-id +++ b/external/corefx/src/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTestData.cs.REMOVED.git-id @@ -1 +1 @@ -9d15e2597a82a25f5421e6b8c3b5ef37c7a6276b \ No newline at end of file +2269ed6e1397aa49e9b0ca69967a00c95f3d0596 \ No newline at end of file diff --git a/external/corefx/src/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTests.cs b/external/corefx/src/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTests.cs index 0caa876e40..9c1630c84b 100644 --- a/external/corefx/src/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTests.cs +++ b/external/corefx/src/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTests.cs @@ -18,6 +18,31 @@ namespace System.Runtime.Serialization.Formatters.Tests { public partial class BinaryFormatterTests : RemoteExecutorTestBase { + private static unsafe bool Is64Bit => sizeof(void*) == 8; + + // On 32-bit we can't test these high inputs as they cause OutOfMemoryExceptions. + [ConditionalTheory(nameof(Is64Bit))] + [InlineData(2 * 6_584_983 - 2)] // previous limit + [InlineData(2 * 7_199_369 - 2)] // last pre-computed prime number + public void SerializeHugeObjectGraphs(int limit) + { + Point[] pointArr = Enumerable.Range(0, limit) + .Select(i => new Point(i, i + 1)) + .ToArray(); + + // This should not throw a SerializationException as we removed the artifical limit in the ObjectIDGenerator. + // Instead of round tripping we only serialize to minimize test time. + // This will throw on .NET Framework as the artificial limit is still enabled. + var bf = new BinaryFormatter(); + AssertExtensions.ThrowsIf(PlatformDetection.IsFullFramework, () => + { + using (MemoryStream ms = new MemoryStream()) + { + bf.Serialize(ms, pointArr); + } + }); + } + [Theory] [MemberData(nameof(BasicObjectsRoundtrip_MemberData))] public void ValidateBasicObjectsRoundtrip(object obj, FormatterAssemblyStyle assemblyFormat, TypeFilterLevel filterLevel, FormatterTypeStyle typeFormat) @@ -50,15 +75,16 @@ namespace System.Runtime.Serialization.Formatters.Tests [Theory] [MemberData(nameof(SerializableObjects_MemberData))] - public void ValidateAgainstBlobs(object obj, string[] blobs) + [ActiveIssue(28816, TargetFrameworkMonikers.NetFramework)] + public void ValidateAgainstBlobs(object obj, TypeSerializableValue[] blobs) => ValidateAndRoundtrip(obj, blobs, false); [Theory] [MemberData(nameof(SerializableEqualityComparers_MemberData))] - public void ValidateEqualityComparersAgainstBlobs(object obj, string[] blobs) + public void ValidateEqualityComparersAgainstBlobs(object obj, TypeSerializableValue[] blobs) => ValidateAndRoundtrip(obj, blobs, true); - private static void ValidateAndRoundtrip(object obj, string[] blobs, bool isEqualityComparer) + private static void ValidateAndRoundtrip(object obj, TypeSerializableValue[] blobs, bool isEqualityComparer) { if (obj == null) { @@ -73,17 +99,22 @@ namespace System.Runtime.Serialization.Formatters.Tests SanityCheckBlob(obj, blobs); - // SqlException isn't deserializable from Desktop --> Core. + // SqlException, ReflectionTypeLoadException and LicenseException aren't deserializable from Desktop --> Core. // Therefore we remove the second blob which is the one from Desktop. if (!PlatformDetection.IsFullFramework && (obj is SqlException || obj is ReflectionTypeLoadException || obj is LicenseException)) { - var tmpList = new List(blobs); + var tmpList = new List(blobs); tmpList.RemoveAt(1); + + int index = tmpList.FindIndex(b => b.Platform == TargetFrameworkMoniker.netfx461 || b.Platform == TargetFrameworkMoniker.netfx471); + if (index >= 0) + tmpList.RemoveAt(index); + blobs = tmpList.ToArray(); } // We store our framework blobs in index 1 - int platformBlobIndex = PlatformDetection.IsFullFramework ? 1 : 0; + int platformBlobIndex = TypeSerializableValue.GetPlatformIndex(blobs); for (int i = 0; i < blobs.Length; i++) { // Check if the current blob is from the current running platform. @@ -91,13 +122,13 @@ namespace System.Runtime.Serialization.Formatters.Tests if (isEqualityComparer) { - ValidateEqualityComparer(BinaryFormatterHelpers.FromBase64String(blobs[i], FormatterAssemblyStyle.Simple)); - ValidateEqualityComparer(BinaryFormatterHelpers.FromBase64String(blobs[i], FormatterAssemblyStyle.Full)); + ValidateEqualityComparer(BinaryFormatterHelpers.FromBase64String(blobs[i].Base64Blob, FormatterAssemblyStyle.Simple)); + ValidateEqualityComparer(BinaryFormatterHelpers.FromBase64String(blobs[i].Base64Blob, FormatterAssemblyStyle.Full)); } else { - EqualityExtensions.CheckEquals(obj, BinaryFormatterHelpers.FromBase64String(blobs[i], FormatterAssemblyStyle.Simple), isSamePlatform); - EqualityExtensions.CheckEquals(obj, BinaryFormatterHelpers.FromBase64String(blobs[i], FormatterAssemblyStyle.Full), isSamePlatform); + EqualityExtensions.CheckEquals(obj, BinaryFormatterHelpers.FromBase64String(blobs[i].Base64Blob, FormatterAssemblyStyle.Simple), isSamePlatform); + EqualityExtensions.CheckEquals(obj, BinaryFormatterHelpers.FromBase64String(blobs[i].Base64Blob, FormatterAssemblyStyle.Full), isSamePlatform); } } } @@ -486,12 +517,11 @@ namespace System.Runtime.Serialization.Formatters.Tests Assert.Equal(obj.GetType().GetGenericArguments()[0], objType.GetGenericArguments()[0]); } - private static void SanityCheckBlob(object obj, string[] blobs) + private static void SanityCheckBlob(object obj, TypeSerializableValue[] blobs) { // These types are unstable during serialization and produce different blobs. if (obj is WeakReference || - obj is Collections.Specialized.HybridDictionary || - obj is TimeZoneInfo.AdjustmentRule) + obj is Collections.Specialized.HybridDictionary) { return; } @@ -504,18 +534,18 @@ namespace System.Runtime.Serialization.Formatters.Tests } // Check if runtime generated blob is the same as the stored one - int frameworkBlobNumber = PlatformDetection.IsFullFramework ? 1 : 0; + int frameworkBlobNumber = TypeSerializableValue.GetPlatformIndex(blobs); if (frameworkBlobNumber < blobs.Length) { string runtimeBlob = BinaryFormatterHelpers.ToBase64String(obj, FormatterAssemblyStyle.Full); - string storedComparableBlob = CreateComparableBlobInfo(blobs[frameworkBlobNumber]); + string storedComparableBlob = CreateComparableBlobInfo(blobs[frameworkBlobNumber].Base64Blob); string runtimeComparableBlob = CreateComparableBlobInfo(runtimeBlob); Assert.True(storedComparableBlob == runtimeComparableBlob, $"The stored blob for type {obj.GetType().FullName} is outdated and needs to be updated.{Environment.NewLine}{Environment.NewLine}" + $"-------------------- Stored blob ---------------------{Environment.NewLine}" + - $"Encoded: {blobs[frameworkBlobNumber]}{Environment.NewLine}" + + $"Encoded: {blobs[frameworkBlobNumber].Base64Blob}{Environment.NewLine}" + $"Decoded: {storedComparableBlob}{Environment.NewLine}{Environment.NewLine}" + $"--------------- Runtime generated blob ---------------{Environment.NewLine}" + $"Encoded: {runtimeBlob}{Environment.NewLine}" + diff --git a/external/corefx/src/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj b/external/corefx/src/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj index b59b9f9d5e..4134419233 100644 --- a/external/corefx/src/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj +++ b/external/corefx/src/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj @@ -4,6 +4,7 @@ {13CE5E71-D373-4EA6-B3CB-166FF089A42A} true + true @@ -22,17 +23,16 @@ + Common\System\NonRuntimeType.cs Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs - - - - - + + Common\System\ThreadCultureChange.cs + diff --git a/external/corefx/src/System.Runtime.Serialization.Formatters/tests/TypeSerializableValue.cs b/external/corefx/src/System.Runtime.Serialization.Formatters/tests/TypeSerializableValue.cs new file mode 100644 index 0000000000..f02cf45e26 --- /dev/null +++ b/external/corefx/src/System.Runtime.Serialization.Formatters/tests/TypeSerializableValue.cs @@ -0,0 +1,70 @@ +// 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.Collections.Generic; +using System.Linq; + +namespace System.Runtime.Serialization.Formatters.Tests +{ + public readonly struct TypeSerializableValue + { + public readonly string Base64Blob; + + // This is the minimum version, when the blob changed. + public readonly TargetFrameworkMoniker Platform; + + public TypeSerializableValue(string base64Blob, TargetFrameworkMoniker platform) + { + Base64Blob = base64Blob; + Platform = platform; + } + + public static int GetPlatformIndex(TypeSerializableValue[] blobs) + { + List blobList = blobs.ToList(); + + // .NET Framework + if (PlatformDetection.IsFullFramework) + { + // Check if a specialized blob for >=netfx471 is present and return if found. + if (PlatformDetection.IsNetfx471OrNewer) + { + int index = blobList.FindIndex(b => b.Platform == TargetFrameworkMoniker.netfx471); + + if (index >= 0) + return index; + } + + // If no newer blob for >=netfx471 is present use existing one. + // If no netfx blob is present then -1 will be returned. + return blobList.FindIndex(b => b.Platform == TargetFrameworkMoniker.netfx461); + } + + // .NET Core + if (PlatformDetection.IsNetCore) + { + // Check if a specialized blob for >=netcoreapp2.1 is present and return if found. + int index = blobList.FindIndex(b => b.Platform == TargetFrameworkMoniker.netcoreapp21); + + if (index >= 0) + return index; + + // If no newer blob for >=netcoreapp2.1 is present use existing one. + // If no netfx blob is present then -1 will be returned. + return blobList.FindIndex((b => b.Platform == TargetFrameworkMoniker.netcoreapp20)); + } + + return -1; + } + } + + // The values represent platforms where there was change in the serialization for one or more types. + public enum TargetFrameworkMoniker + { + netfx461, + netfx471, + netcoreapp20, + netcoreapp21, + } +} diff --git a/external/corefx/src/System.Runtime.Serialization.Json/tests/Performance/System.Runtime.Serialization.Json.Performance.Tests.csproj b/external/corefx/src/System.Runtime.Serialization.Json/tests/Performance/System.Runtime.Serialization.Json.Performance.Tests.csproj index 1a4a2be2f4..1cdad22492 100644 --- a/external/corefx/src/System.Runtime.Serialization.Json/tests/Performance/System.Runtime.Serialization.Json.Performance.Tests.csproj +++ b/external/corefx/src/System.Runtime.Serialization.Json/tests/Performance/System.Runtime.Serialization.Json.Performance.Tests.csproj @@ -10,7 +10,7 @@ - + @@ -28,4 +28,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/System.Runtime.Serialization.Json/tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj b/external/corefx/src/System.Runtime.Serialization.Json/tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj index 35c2c57cb6..3bda63bf6a 100644 --- a/external/corefx/src/System.Runtime.Serialization.Json/tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj +++ b/external/corefx/src/System.Runtime.Serialization.Json/tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/external/corefx/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj b/external/corefx/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj index 250c5e60a4..8244dec441 100644 --- a/external/corefx/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj +++ b/external/corefx/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj @@ -13,10 +13,10 @@ - + - \ No newline at end of file + diff --git a/external/corefx/src/System.Runtime.Serialization.Xml/tests/Performance/System.Runtime.Serialization.Xml.Performance.Tests.csproj b/external/corefx/src/System.Runtime.Serialization.Xml/tests/Performance/System.Runtime.Serialization.Xml.Performance.Tests.csproj index 738256206c..e9b27af44b 100644 --- a/external/corefx/src/System.Runtime.Serialization.Xml/tests/Performance/System.Runtime.Serialization.Xml.Performance.Tests.csproj +++ b/external/corefx/src/System.Runtime.Serialization.Xml/tests/Performance/System.Runtime.Serialization.Xml.Performance.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/external/corefx/src/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj b/external/corefx/src/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj index bbb1216009..688b2ffd7f 100644 --- a/external/corefx/src/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj +++ b/external/corefx/src/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj @@ -11,14 +11,14 @@ + - - + Common\System\IO\TempFile.cs diff --git a/external/corefx/src/System.Runtime.Serialization.Xml/tests/SerializationTypes.cs b/external/corefx/src/System.Runtime.Serialization.Xml/tests/SerializationTypes.cs index 8db9d14c14..a716ec5785 100644 --- a/external/corefx/src/System.Runtime.Serialization.Xml/tests/SerializationTypes.cs +++ b/external/corefx/src/System.Runtime.Serialization.Xml/tests/SerializationTypes.cs @@ -1140,11 +1140,11 @@ public class TypeWithVirtualGenericPropertyDerived : TypeWithVirtualGenericPr public class DefaultValuesSetToNaN { - [DefaultValue(double.NaN)] - public double DoubleProp { get; set; } + [DefaultValue(Double.NaN)] + public Double DoubleProp { get; set; } - [DefaultValue(float.NaN)] - public float FloatProp { get; set; } + [DefaultValue(Single.NaN)] + public Single FloatProp { get; set; } [DefaultValue(Double.NaN)] public Double DoubleField; @@ -1167,6 +1167,64 @@ public class DefaultValuesSetToNaN } } +public class DefaultValuesSetToPositiveInfinity +{ + [DefaultValue(Double.PositiveInfinity)] + public Double DoubleProp { get; set; } + + [DefaultValue(Single.PositiveInfinity)] + public Single FloatProp { get; set; } + + [DefaultValue(Double.PositiveInfinity)] + public Double DoubleField; + + [DefaultValue(Single.PositiveInfinity)] + public Single SingleField; + + public override bool Equals(object obj) + { + var other = obj as DefaultValuesSetToPositiveInfinity; + return other == null ? false : + other.DoubleProp == this.DoubleProp && other.FloatProp == this.FloatProp && + other.DoubleField == this.DoubleField && other.SingleField == this.SingleField; + } + + public override int GetHashCode() + { + return this.DoubleProp.GetHashCode() ^ this.FloatProp.GetHashCode() ^ + this.DoubleField.GetHashCode() ^ this.SingleField.GetHashCode(); + } +} + +public class DefaultValuesSetToNegativeInfinity +{ + [DefaultValue(Double.NegativeInfinity)] + public Double DoubleProp { get; set; } + + [DefaultValue(Single.NegativeInfinity)] + public Single FloatProp { get; set; } + + [DefaultValue(Double.NegativeInfinity)] + public Double DoubleField; + + [DefaultValue(Single.NegativeInfinity)] + public Single SingleField; + + public override bool Equals(object obj) + { + var other = obj as DefaultValuesSetToNegativeInfinity; + return other == null ? false : + other.DoubleProp == this.DoubleProp && other.FloatProp == this.FloatProp && + other.DoubleField == this.DoubleField && other.SingleField == this.SingleField; + } + + public override int GetHashCode() + { + return this.DoubleProp.GetHashCode() ^ this.FloatProp.GetHashCode() ^ + this.DoubleField.GetHashCode() ^ this.SingleField.GetHashCode(); + } +} + [XmlRoot("RootElement")] public class TypeWithMismatchBetweenAttributeAndPropertyType { @@ -1184,4 +1242,4 @@ public class TypeWithMismatchBetweenAttributeAndPropertyType _intValue = value; } } -} \ No newline at end of file +} diff --git a/external/corefx/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj b/external/corefx/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj index 95fc9e94b3..fe5b3cff85 100644 --- a/external/corefx/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj +++ b/external/corefx/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj @@ -11,7 +11,6 @@ - @@ -29,6 +28,7 @@ Common\System\Runtime\Serialization\DataContractSerializerHelper.cs + @@ -47,4 +47,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/System.Runtime.Serialization.Xml/tests/XmlDictionaryReaderTests.cs b/external/corefx/src/System.Runtime.Serialization.Xml/tests/XmlDictionaryReaderTests.cs index 25c9b5b366..ab3f876315 100644 --- a/external/corefx/src/System.Runtime.Serialization.Xml/tests/XmlDictionaryReaderTests.cs +++ b/external/corefx/src/System.Runtime.Serialization.Xml/tests/XmlDictionaryReaderTests.cs @@ -183,5 +183,40 @@ namespace System.Runtime.Serialization.Xml.Tests return sb.ToString(); } + + [Fact] + public static void Close_DerivedReader_Success() + { + new NotImplementedXmlDictionaryReader().Close(); + } + + private sealed class NotImplementedXmlDictionaryReader : XmlDictionaryReader + { + public override ReadState ReadState => ReadState.Initial; + + public override int AttributeCount => throw new NotImplementedException(); + public override string BaseURI => throw new NotImplementedException(); + public override int Depth => throw new NotImplementedException(); + public override bool EOF => throw new NotImplementedException(); + public override bool IsEmptyElement => throw new NotImplementedException(); + public override string LocalName => throw new NotImplementedException(); + public override string NamespaceURI => throw new NotImplementedException(); + public override XmlNameTable NameTable => throw new NotImplementedException(); + public override XmlNodeType NodeType => throw new NotImplementedException(); + public override string Prefix => throw new NotImplementedException(); + public override string Value => throw new NotImplementedException(); + public override string GetAttribute(int i) => throw new NotImplementedException(); + public override string GetAttribute(string name) => throw new NotImplementedException(); + public override string GetAttribute(string name, string namespaceURI) => throw new NotImplementedException(); + public override string LookupNamespace(string prefix) => throw new NotImplementedException(); + public override bool MoveToAttribute(string name) => throw new NotImplementedException(); + public override bool MoveToAttribute(string name, string ns) => throw new NotImplementedException(); + public override bool MoveToElement() => throw new NotImplementedException(); + public override bool MoveToFirstAttribute() => throw new NotImplementedException(); + public override bool MoveToNextAttribute() => throw new NotImplementedException(); + public override bool Read() => throw new NotImplementedException(); + public override bool ReadAttributeValue() => throw new NotImplementedException(); + public override void ResolveEntity() => throw new NotImplementedException(); + } } } diff --git a/external/corefx/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj b/external/corefx/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj index 79e53dc4db..5c500ecd68 100644 --- a/external/corefx/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj +++ b/external/corefx/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj @@ -94,8 +94,8 @@ Common\Interop\Windows\Interop.Errors.cs - - Common\System\IO\Win32Marshal.cs + + Common\CoreLib\System\IO\Win32Marshal.cs @@ -130,4 +130,4 @@ - + \ No newline at end of file diff --git a/external/corefx/src/System.Runtime.WindowsRuntime/src/System/InternalHelpers.cs b/external/corefx/src/System.Runtime.WindowsRuntime/src/System/InternalHelpers.cs index 43fbe0f017..2c6753245d 100644 --- a/external/corefx/src/System.Runtime.WindowsRuntime/src/System/InternalHelpers.cs +++ b/external/corefx/src/System.Runtime.WindowsRuntime/src/System/InternalHelpers.cs @@ -2,8 +2,7 @@ // 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.Threading.Tasks; -using System.Threading; +using System.Runtime.InteropServices; namespace System { @@ -11,12 +10,7 @@ namespace System { internal static void SetErrorCode(this Exception ex, int code) { - // Stub, until COM interop guys fix the exception logic - } - - internal static void TryDeregister(this CancellationTokenRegistration ctr) - { - //nothing to do for projectN + InteropExtensions.SetExceptionErrorCode(ex, code); } } } diff --git a/external/corefx/src/System.Runtime.WindowsRuntime/src/System/Threading/Tasks/AsyncInfoToTaskBridge.CoreCLR.cs b/external/corefx/src/System.Runtime.WindowsRuntime/src/System/Threading/Tasks/AsyncInfoToTaskBridge.CoreCLR.cs index 09941a25ca..b92a8efd2f 100644 --- a/external/corefx/src/System.Runtime.WindowsRuntime/src/System/Threading/Tasks/AsyncInfoToTaskBridge.CoreCLR.cs +++ b/external/corefx/src/System.Runtime.WindowsRuntime/src/System/Threading/Tasks/AsyncInfoToTaskBridge.CoreCLR.cs @@ -70,7 +70,7 @@ namespace System.Threading.Tasks } if (disposeOfCtr) - ctr.TryDeregister(); + ctr.Unregister(); } } catch (Exception ex) @@ -150,7 +150,7 @@ namespace System.Threading.Tasks ctr = _ctr; // under lock to avoid torn reads _ctr = default(CancellationTokenRegistration); } - ctr.TryDeregister(); // It's ok if we end up unregistering a not-initialized registration; it'll just be a nop. + ctr.Unregister(); // It's ok if we end up unregistering a not-initialized registration; it'll just be a nop. try { diff --git a/external/corefx/src/System.Runtime.WindowsRuntime/src/System/Threading/Tasks/AsyncInfoToTaskBridge.CoreRT.cs b/external/corefx/src/System.Runtime.WindowsRuntime/src/System/Threading/Tasks/AsyncInfoToTaskBridge.CoreRT.cs index eec0c38d48..502d470059 100644 --- a/external/corefx/src/System.Runtime.WindowsRuntime/src/System/Threading/Tasks/AsyncInfoToTaskBridge.CoreRT.cs +++ b/external/corefx/src/System.Runtime.WindowsRuntime/src/System/Threading/Tasks/AsyncInfoToTaskBridge.CoreRT.cs @@ -2,16 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. - using Internal.Interop; using Internal.Threading.Tasks; -using System.ComponentModel; using System.Diagnostics; using System.Diagnostics.Contracts; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices.WindowsRuntime; using System.Runtime.InteropServices; -using System.Threading; using Windows.Foundation; namespace System.Threading.Tasks @@ -68,7 +63,7 @@ namespace System.Threading.Tasks } if (disposeOfCtr) - ctr.TryDeregister(); + ctr.Unregister(); } } catch (Exception ex) @@ -151,7 +146,7 @@ namespace System.Threading.Tasks ctr = _ctr; // under lock to avoid torn reads _ctr = default(CancellationTokenRegistration); } - ctr.TryDeregister(); // It's ok if we end up unregistering a not-initialized registration; it'll just be a nop. + ctr.Unregister(); // It's ok if we end up unregistering a not-initialized registration; it'll just be a nop. try { diff --git a/external/corefx/src/System.Runtime/ref/System.Runtime.cs.REMOVED.git-id b/external/corefx/src/System.Runtime/ref/System.Runtime.cs.REMOVED.git-id index 04a819f2de..9433555c00 100644 --- a/external/corefx/src/System.Runtime/ref/System.Runtime.cs.REMOVED.git-id +++ b/external/corefx/src/System.Runtime/ref/System.Runtime.cs.REMOVED.git-id @@ -1 +1 @@ -bfd34ca190b443de8549f160fa0f8a620042ea77 \ No newline at end of file +abab3f410c872deb37a0af535df705aecd5fadab \ No newline at end of file diff --git a/external/corefx/src/System.Runtime/src/ApiCompatBaseline.uap.txt b/external/corefx/src/System.Runtime/src/ApiCompatBaseline.uap.txt new file mode 100644 index 0000000000..df3e40e4cc --- /dev/null +++ b/external/corefx/src/System.Runtime/src/ApiCompatBaseline.uap.txt @@ -0,0 +1,14 @@ +Compat issues with assembly System.Runtime: +MembersMustExist : Member 'System.Memory.Pin()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.ReadOnlyMemory.Pin()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Memory..ctor(System.Buffers.MemoryManager, System.Int32, System.Int32)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Memory.CreateFromPinnedArray(T[], System.Int32, System.Int32)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Buffers.MemoryHandle..ctor(System.Void*, System.Runtime.InteropServices.GCHandle, System.Buffers.IPinnable)' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.Buffers.IMemoryOwner' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.Buffers.IPinnable' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.Buffers.MemoryManager' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Buffers.MemoryManager.CreateMemory(System.Int32)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Buffers.MemoryManager.CreateMemory(System.Int32, System.Int32)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.ReadOnlySpan.GetPinnableReference()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Span.GetPinnableReference()' does not exist in the implementation but it does exist in the contract. +Total Issues: 12 diff --git a/external/corefx/src/System.Runtime/src/ApiCompatBaseline.uapaot.txt b/external/corefx/src/System.Runtime/src/ApiCompatBaseline.uapaot.txt new file mode 100644 index 0000000000..df3e40e4cc --- /dev/null +++ b/external/corefx/src/System.Runtime/src/ApiCompatBaseline.uapaot.txt @@ -0,0 +1,14 @@ +Compat issues with assembly System.Runtime: +MembersMustExist : Member 'System.Memory.Pin()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.ReadOnlyMemory.Pin()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Memory..ctor(System.Buffers.MemoryManager, System.Int32, System.Int32)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Memory.CreateFromPinnedArray(T[], System.Int32, System.Int32)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Buffers.MemoryHandle..ctor(System.Void*, System.Runtime.InteropServices.GCHandle, System.Buffers.IPinnable)' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.Buffers.IMemoryOwner' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.Buffers.IPinnable' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.Buffers.MemoryManager' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Buffers.MemoryManager.CreateMemory(System.Int32)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Buffers.MemoryManager.CreateMemory(System.Int32, System.Int32)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.ReadOnlySpan.GetPinnableReference()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Span.GetPinnableReference()' does not exist in the implementation but it does exist in the contract. +Total Issues: 12 diff --git a/external/corefx/src/System.Runtime/src/System.Runtime.csproj b/external/corefx/src/System.Runtime/src/System.Runtime.csproj index 0129b51f90..428bbf0137 100644 --- a/external/corefx/src/System.Runtime/src/System.Runtime.csproj +++ b/external/corefx/src/System.Runtime/src/System.Runtime.csproj @@ -5,6 +5,8 @@ {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} System.Runtime true + true + true diff --git a/external/corefx/src/System.Runtime/tests/Configurations.props b/external/corefx/src/System.Runtime/tests/Configurations.props index 91486c3416..c0cb0f7fed 100644 --- a/external/corefx/src/System.Runtime/tests/Configurations.props +++ b/external/corefx/src/System.Runtime/tests/Configurations.props @@ -3,7 +3,7 @@ netcoreapp; - netstandard; + netfx; uap; uapaot; diff --git a/external/corefx/src/System.Runtime/tests/Performance/Perf.Char.cs b/external/corefx/src/System.Runtime/tests/Performance/Perf.Char.cs index 4dbdae9cc0..ae6633e0e8 100644 --- a/external/corefx/src/System.Runtime/tests/Performance/Perf.Char.cs +++ b/external/corefx/src/System.Runtime/tests/Performance/Perf.Char.cs @@ -2,20 +2,63 @@ // 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.Collections.Generic; +using System.Globalization; using Microsoft.Xunit.Performance; +using Xunit; namespace System.Tests { public class Perf_Char { - [Benchmark] - public static char Char_ToLower() + private const int InnerIterations = 1_000_000; + + public static IEnumerable Char_ChangeCase_MemberData() + { + yield return new object[] { 'A', "en-US" }; // ASCII upper case + yield return new object[] { 'a', "en-US" }; // ASCII lower case + yield return new object[] { '\u0130', "en-US" }; // non-ASCII, English + yield return new object[] { '\u4F60', "zh-Hans" }; // non-ASCII, Chinese + } + + [Benchmark(InnerIterationCount = InnerIterations)] + [MemberData(nameof(Char_ChangeCase_MemberData))] + public static char Char_ToLower(char c, string cultureName) { char ret = default(char); + CultureInfo culture = new CultureInfo(cultureName); foreach (var iteration in Benchmark.Iterations) + { using (iteration.StartMeasurement()) - ret = Char.ToLower('A'); + { + for (int i = 0; i < InnerIterations; i++) + { + ret = Char.ToLower(c, culture); + } + } + } + + return ret; + } + + [Benchmark(InnerIterationCount = InnerIterations)] + [MemberData(nameof(Char_ChangeCase_MemberData))] + public static char Char_ToUpper(char c, string cultureName) + { + char ret = default(char); + CultureInfo culture = new CultureInfo(cultureName); + + foreach (var iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < InnerIterations; i++) + { + ret = Char.ToUpper(c, culture); + } + } + } return ret; } diff --git a/external/corefx/src/System.Runtime/tests/Performance/Perf.Int32.cs b/external/corefx/src/System.Runtime/tests/Performance/Perf.Int32.cs index 958eeedb48..195414b5af 100644 --- a/external/corefx/src/System.Runtime/tests/Performance/Perf.Int32.cs +++ b/external/corefx/src/System.Runtime/tests/Performance/Perf.Int32.cs @@ -3,37 +3,78 @@ // See the LICENSE file in the project root for more information. using Microsoft.Xunit.Performance; +using Xunit; namespace System.Tests { public class Perf_Int32 { - [Benchmark] - public void ToString_() + private const int InnerCount = 500_000; + + private static string s_resultString; + private static int s_resultInt32; + + public static object[][] Int32Values => new[] { - int i32 = 32; - foreach (var iteration in Benchmark.Iterations) + new object[] { 0 }, + new object[] { -1 }, + new object[] { 1 }, + new object[] { -1283 }, + new object[] { 1283 }, + new object[] { -12837467 }, + new object[] { 12837467 }, + new object[] { -2147483648 }, + new object[] { 2147483647 }, + }; + + [Benchmark(InnerIterationCount = InnerCount)] + [MemberData(nameof(Int32Values))] + public void ToString(int value) + { + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { using (iteration.StartMeasurement()) - for (int i = 0; i < 10000; i++) + { + for (int i = 0; i < InnerCount; i++) { - i32.ToString(); i32.ToString(); i32.ToString(); - i32.ToString(); i32.ToString(); i32.ToString(); - i32.ToString(); i32.ToString(); i32.ToString(); + s_resultString = value.ToString(); } + } + } } - [Benchmark] - public void Parse_str() + [Benchmark(InnerIterationCount = InnerCount)] + [MemberData(nameof(Int32Values))] + public void TryFormat(int value) { - string builtString = "1111111"; - foreach (var iteration in Benchmark.Iterations) + Span destination = new char[value.ToString().Length]; + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { using (iteration.StartMeasurement()) - for (int i = 0; i < 10000; i++) + { + for (int i = 0; i < InnerCount; i++) { - int.Parse(builtString); int.Parse(builtString); int.Parse(builtString); - int.Parse(builtString); int.Parse(builtString); int.Parse(builtString); - int.Parse(builtString); int.Parse(builtString); int.Parse(builtString); + value.TryFormat(destination, out s_resultInt32); } + } + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [MemberData(nameof(Int32Values))] + public void Parse(int value) + { + ReadOnlySpan valueSpan = value.ToString(); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < InnerCount; i++) + { + s_resultInt32 = int.Parse(valueSpan); + } + } + } } } } diff --git a/external/corefx/src/System.Runtime/tests/Performance/Perf.Int64.cs b/external/corefx/src/System.Runtime/tests/Performance/Perf.Int64.cs new file mode 100644 index 0000000000..3c373271d8 --- /dev/null +++ b/external/corefx/src/System.Runtime/tests/Performance/Perf.Int64.cs @@ -0,0 +1,115 @@ +// 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 Microsoft.Xunit.Performance; +using Xunit; + +namespace System.Tests +{ + public class Perf_Int64 + { + private const int InnerCount = 500_000; + + private static string s_resultString; + private static int s_resultInt32; + private static long s_resultInt64; + + public static object[][] Int64Values => new[] + { + new object[] { 214748364L }, + new object[] { 2L }, + new object[] { 21474836L }, + new object[] { 21474L }, + new object[] { 214L }, + new object[] { 2147L }, + new object[] { 214748L }, + new object[] { 21L }, + new object[] { 2147483L }, + new object[] { 922337203685477580L }, + new object[] { 92233720368547758L }, + new object[] { 9223372036854775L }, + new object[] { 922337203685477L }, + new object[] { 92233720368547L }, + new object[] { 9223372036854L }, + new object[] { 922337203685L }, + new object[] { 92233720368L }, + new object[] { -214748364L }, + new object[] { -2L }, + new object[] { -21474836L }, + new object[] { -21474L }, + new object[] { -214L }, + new object[] { -2147L }, + new object[] { -214748L }, + new object[] { -21L }, + new object[] { -2147483L }, + new object[] { -922337203685477580L }, + new object[] { -92233720368547758L }, + new object[] { -9223372036854775L }, + new object[] { -922337203685477L }, + new object[] { -92233720368547L }, + new object[] { -9223372036854L }, + new object[] { -922337203685L }, + new object[] { -92233720368L }, + new object[] { 0L }, + new object[] { -9223372036854775808L }, // min value + new object[] { 9223372036854775807L }, // max value + new object[] { -2147483648L }, // int32 min value + new object[] { 2147483647L }, // int32 max value + new object[] { -4294967295000000000L }, // -(uint.MaxValue * Billion) + new object[] { 4294967295000000000L }, // uint.MaxValue * Billion + new object[] { -4294967295000000001L }, // -(uint.MaxValue * Billion + 1) + new object[] { 4294967295000000001L }, // uint.MaxValue * Billion + 1 + }; + + [Benchmark(InnerIterationCount = InnerCount)] + [MemberData(nameof(Int64Values))] + public void ToString(long value) + { + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < InnerCount; i++) + { + s_resultString = value.ToString(); + } + } + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [MemberData(nameof(Int64Values))] + public void TryFormat(long value) + { + Span destination = new char[value.ToString().Length]; + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < InnerCount; i++) + { + value.TryFormat(destination, out s_resultInt32); + } + } + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [MemberData(nameof(Int64Values))] + public void Parse(long value) + { + ReadOnlySpan valueSpan = value.ToString(); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < InnerCount; i++) + { + s_resultInt64 = long.Parse(valueSpan); + } + } + } + } + } +} diff --git a/external/corefx/src/System.Runtime/tests/Performance/Perf.String.cs b/external/corefx/src/System.Runtime/tests/Performance/Perf.String.cs index 55faef233a..6395169314 100644 --- a/external/corefx/src/System.Runtime/tests/Performance/Perf.String.cs +++ b/external/corefx/src/System.Runtime/tests/Performance/Perf.String.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Globalization; +using System.Linq; using System.Text; using System.Collections.Generic; using Xunit; @@ -232,28 +233,104 @@ namespace System.Tests testString.Substring(startIndex, length); } - [Benchmark] - [MemberData(nameof(TestStringSizes))] - public void ToLower(int size) + [Flags] + public enum ChangeCaseOptions { - PerfUtils utils = new PerfUtils(); - string testString = utils.CreateString(size); - foreach (var iteration in Benchmark.Iterations) - using (iteration.StartMeasurement()) - for (int i = 0; i < 10000; i++) - testString.ToLower(); + None = 0, + UniqueString = 0x1, + + MiddleTurkishI = 0x2, + MiddleDifferentCase = 0x4, + AllDifferentCase = 0x8, } - [Benchmark] - [MemberData(nameof(TestStringSizes))] - public void ToUpper(int size) + public static IEnumerable ChangeCaseMemberData() => + from size in new[] { 1, 10, 500 } + from culture in new[] { "en-US" } + from options in new[] + { + ChangeCaseOptions.None, + ChangeCaseOptions.MiddleTurkishI, + ChangeCaseOptions.MiddleDifferentCase, + ChangeCaseOptions.AllDifferentCase, + + ChangeCaseOptions.UniqueString, + ChangeCaseOptions.UniqueString | ChangeCaseOptions.MiddleTurkishI, + ChangeCaseOptions.UniqueString | ChangeCaseOptions.MiddleDifferentCase, + ChangeCaseOptions.UniqueString | ChangeCaseOptions.AllDifferentCase, + } + select new object[] { size, options, culture }; + + private static string CreateChangeCaseString(int size, ChangeCaseOptions options, bool upper) { - PerfUtils utils = new PerfUtils(); - string testString = utils.CreateString(size); + Span chars = new char[size]; + + bool differentCase = (options & ChangeCaseOptions.AllDifferentCase) != 0; + chars.Fill(upper != differentCase ? 'S' : 's'); + + if ((options & ChangeCaseOptions.MiddleTurkishI) != 0) + { + chars[chars.Length / 2] = '\u0131'; + } + else if ((options & ChangeCaseOptions.MiddleDifferentCase) != 0) + { + char c = chars[chars.Length / 2]; + chars[chars.Length / 2] = char.IsUpper(c) ? char.ToLower(c) : char.ToUpper(c); + } + + return chars.ToString(); + } + + [Benchmark, MeasureGCAllocations] + [MemberData(nameof(ChangeCaseMemberData))] + public void ToLower(int size, ChangeCaseOptions options, string cultureName) + { + const int Iters = 10_000; + var strings = new string[Iters]; + var culture = new CultureInfo(cultureName); // Benchmark doesn't support CultureInfo as argument + string target = CreateChangeCaseString(size, options, upper: false); + foreach (var iteration in Benchmark.Iterations) + { + for (int i = 0; i < strings.Length; i++) + { + strings[i] = (options & ChangeCaseOptions.UniqueString) != 0 ? string.Copy(target) : target; + } + using (iteration.StartMeasurement()) - for (int i = 0; i < 10000; i++) - testString.ToUpper(); + { + for (int i = 0; i < Iters; i++) + { + strings[i].ToLower(culture); + } + } + } + } + + [Benchmark, MeasureGCAllocations] + [MemberData(nameof(ChangeCaseMemberData))] + public void ToUpper(int size, ChangeCaseOptions options, string cultureName) + { + const int Iters = 10_000; + var strings = new string[Iters]; + var culture = new CultureInfo(cultureName); // Benchmark doesn't support CultureInfo as argument + string target = CreateChangeCaseString(size, options, upper: true); + + foreach (var iteration in Benchmark.Iterations) + { + for (int i = 0; i < strings.Length; i++) + { + strings[i] = (options & ChangeCaseOptions.UniqueString) != 0 ? string.Copy(target) : target; + } + + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Iters; i++) + { + strings[i].ToUpper(culture); + } + } + } } [Benchmark] diff --git a/external/corefx/src/System.Runtime/tests/Performance/Perf.UInt32.cs b/external/corefx/src/System.Runtime/tests/Performance/Perf.UInt32.cs index 129286bb2e..37695897ab 100644 --- a/external/corefx/src/System.Runtime/tests/Performance/Perf.UInt32.cs +++ b/external/corefx/src/System.Runtime/tests/Performance/Perf.UInt32.cs @@ -3,23 +3,75 @@ // See the LICENSE file in the project root for more information. using Microsoft.Xunit.Performance; +using Xunit; namespace System.Tests { public class Perf_UInt32 { - [Benchmark] - public void ToString_() + private const int InnerCount = 500_000; + + private static string s_resultString; + private static int s_resultInt32; + private static uint s_resultUInt32; + + public static object[][] UInt32Values => new[] { - uint testint = new uint(); - foreach (var iteration in Benchmark.Iterations) + new object[] { 0u }, + new object[] { 1u }, + new object[] { 1283u }, + new object[] { 12837467u }, + new object[] { 4294967295u }, + }; + + [Benchmark(InnerIterationCount = InnerCount)] + [MemberData(nameof(UInt32Values))] + public void ToString(uint value) + { + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { using (iteration.StartMeasurement()) - for (int i = 0; i < 10000; i++) + { + for (int i = 0; i < InnerCount; i++) { - testint.ToString(); testint.ToString(); testint.ToString(); - testint.ToString(); testint.ToString(); testint.ToString(); - testint.ToString(); testint.ToString(); testint.ToString(); + s_resultString = value.ToString(); } + } + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [MemberData(nameof(UInt32Values))] + public void TryFormat(uint value) + { + Span destination = new char[value.ToString().Length]; + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < InnerCount; i++) + { + value.TryFormat(destination, out s_resultInt32); + } + } + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [MemberData(nameof(UInt32Values))] + public void Parse(uint value) + { + ReadOnlySpan valueSpan = value.ToString(); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < InnerCount; i++) + { + s_resultUInt32 = uint.Parse(valueSpan); + } + } + } } } } diff --git a/external/corefx/src/System.Runtime/tests/Performance/Perf.UInt64.cs b/external/corefx/src/System.Runtime/tests/Performance/Perf.UInt64.cs new file mode 100644 index 0000000000..30b903d247 --- /dev/null +++ b/external/corefx/src/System.Runtime/tests/Performance/Perf.UInt64.cs @@ -0,0 +1,96 @@ +// 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 Microsoft.Xunit.Performance; +using Xunit; + +namespace System.Tests +{ + public class Perf_UInt64 + { + private const int InnerCount = 100_000; + + private static string s_resultString; + private static int s_resultInt32; + private static ulong s_resultUInt64; + + public static object[][] UInt64Values => new[] + { + new object[] { 214748364LU }, + new object[] { 2LU }, + new object[] { 21474836LU }, + new object[] { 21474LU }, + new object[] { 214LU }, + new object[] { 2147LU }, + new object[] { 214748LU }, + new object[] { 21LU }, + new object[] { 2147483LU }, + new object[] { 922337203685477580LU }, + new object[] { 92233720368547758LU }, + new object[] { 9223372036854775LU }, + new object[] { 922337203685477LU }, + new object[] { 92233720368547LU }, + new object[] { 9223372036854LU }, + new object[] { 922337203685LU }, + new object[] { 92233720368LU }, + new object[] { 0LU }, // min value + new object[] { 18446744073709551615LU }, // max value + new object[] { 2147483647LU }, // int32 max value + new object[] { 9223372036854775807LU }, // int64 max value + new object[] { 1000000000000000000LU }, // quintillion + new object[] { 4294967295000000000LU }, // uint.MaxValue * Billion + new object[] { 4294967295000000001LU }, // uint.MaxValue * Billion + 1 + }; + + [Benchmark(InnerIterationCount = InnerCount)] + [MemberData(nameof(UInt64Values))] + public void ToString(ulong value) + { + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < InnerCount; i++) + { + s_resultString = value.ToString(); + } + } + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [MemberData(nameof(UInt64Values))] + public void TryFormat(ulong value) + { + Span destination = new char[value.ToString().Length]; + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < InnerCount; i++) + { + value.TryFormat(destination, out s_resultInt32); + } + } + } + } + + [Benchmark(InnerIterationCount = InnerCount)] + [MemberData(nameof(UInt64Values))] + public void Parse(ulong value) + { + ReadOnlySpan valueSpan = value.ToString(); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < InnerCount; i++) + { + s_resultUInt64 = ulong.Parse(valueSpan); + } + } + } + } + } +} diff --git a/external/corefx/src/System.Runtime/tests/Performance/System.Runtime.Performance.Tests.csproj b/external/corefx/src/System.Runtime/tests/Performance/System.Runtime.Performance.Tests.csproj index d65f1a0c6e..fb012aa9de 100644 --- a/external/corefx/src/System.Runtime/tests/Performance/System.Runtime.Performance.Tests.csproj +++ b/external/corefx/src/System.Runtime/tests/Performance/System.Runtime.Performance.Tests.csproj @@ -12,19 +12,21 @@ + + + + + - - - - + Common\System\PerfUtils.cs @@ -38,5 +40,8 @@ PerfRunner + + + - \ No newline at end of file + diff --git a/external/corefx/src/System.Runtime/tests/System.Runtime.Tests.csproj b/external/corefx/src/System.Runtime/tests/System.Runtime.Tests.csproj index b4dbe71660..8c5b158bdd 100644 --- a/external/corefx/src/System.Runtime/tests/System.Runtime.Tests.csproj +++ b/external/corefx/src/System.Runtime/tests/System.Runtime.Tests.csproj @@ -7,11 +7,13 @@ 1718 $(DefineConstants);netcoreapp $(DefineConstants);uapaot + + $(MSBuildProjectDirectory)\App.config - - + + @@ -95,9 +97,11 @@ + + @@ -164,6 +168,7 @@ + @@ -266,5 +271,8 @@ + + + diff --git a/external/corefx/src/System.Runtime/tests/System/ArraySegmentTests.netcoreapp.cs b/external/corefx/src/System.Runtime/tests/System/ArraySegmentTests.netcoreapp.cs index 7ed13c5293..69713241b6 100644 --- a/external/corefx/src/System.Runtime/tests/System/ArraySegmentTests.netcoreapp.cs +++ b/external/corefx/src/System.Runtime/tests/System/ArraySegmentTests.netcoreapp.cs @@ -98,6 +98,28 @@ namespace System.Tests var emptyArraySegment = new ArraySegment(new T[1], 0, 0); Assert.NotSame(emptyArraySegment.Array, emptyArraySegment.ToArray()); } + + [Fact] + public void Cast_FromNullArray_ReturnsDefault() + { + ArraySegment fromNull = null; + Assert.Null(fromNull.Array); + Assert.Equal(0, fromNull.Offset); + Assert.Equal(0, fromNull.Count); + + Assert.True(default(ArraySegment) == null); + Assert.True(new ArraySegment(Array.Empty()) != null); + } + + [Fact] + public void Cast_FromValidArray_ReturnsSegmentForWholeArray() + { + var array = new T[42]; + ArraySegment fromArray = array; + Assert.Same(array, fromArray.Array); + Assert.Equal(0, fromArray.Offset); + Assert.Equal(42, fromArray.Count); + } } public static partial class ArraySegment_Tests diff --git a/external/corefx/src/System.Runtime/tests/System/BooleanTests.netcoreapp.cs b/external/corefx/src/System.Runtime/tests/System/BooleanTests.netcoreapp.cs index 07cb323e3c..95bd5a3d72 100644 --- a/external/corefx/src/System.Runtime/tests/System/BooleanTests.netcoreapp.cs +++ b/external/corefx/src/System.Runtime/tests/System/BooleanTests.netcoreapp.cs @@ -2,19 +2,31 @@ // 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.Collections.Generic; using Xunit; namespace System.Tests { public partial class BooleanTests { - [Theory] - [MemberData(nameof(Parse_Valid_TestData))] - public static void Parse_Span_Valid(string value, bool expected) + public static IEnumerable Parse_ValidWithOffsetCount_TestData() { - Assert.Equal(expected, bool.Parse(value.AsReadOnlySpan())); + foreach (object[] inputs in Parse_Valid_TestData()) + { + yield return new object[] { inputs[0], 0, ((string)inputs[0]).Length, inputs[1] }; + } - Assert.True(bool.TryParse(value.AsReadOnlySpan(), out bool result)); + yield return new object[] { " \0 \0 TrueFalse \0 ", 6, 4, true }; + yield return new object[] { " \0 \0 TrueFalse \0 ", 10, 5, false }; + } + + [Theory] + [MemberData(nameof(Parse_ValidWithOffsetCount_TestData))] + public static void Parse_Span_Valid(string value, int offset, int count, bool expected) + { + Assert.Equal(expected, bool.Parse(value.AsSpan(offset, count))); + + Assert.True(bool.TryParse(value.AsSpan(offset, count), out bool result)); Assert.Equal(expected, result); } @@ -24,9 +36,9 @@ namespace System.Tests { if (value != null) { - Assert.Throws(exceptionType, () => bool.Parse(value.AsReadOnlySpan())); + Assert.Throws(exceptionType, () => bool.Parse(value.AsSpan())); - Assert.False(bool.TryParse(value.AsReadOnlySpan(), out bool result)); + Assert.False(bool.TryParse(value.AsSpan(), out bool result)); Assert.Equal(false, result); } } diff --git a/external/corefx/src/System.Runtime/tests/System/ByteTests.netcoreapp.cs b/external/corefx/src/System.Runtime/tests/System/ByteTests.netcoreapp.cs index 7b95e90915..08b6b8e9bc 100644 --- a/external/corefx/src/System.Runtime/tests/System/ByteTests.netcoreapp.cs +++ b/external/corefx/src/System.Runtime/tests/System/ByteTests.netcoreapp.cs @@ -2,6 +2,7 @@ // 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.Collections.Generic; using System.Globalization; using Xunit; @@ -9,13 +10,30 @@ namespace System.Tests { public partial class ByteTests { - [Theory] - [MemberData(nameof(Parse_Valid_TestData))] - public static void Parse_Span_Valid(string value, NumberStyles style, IFormatProvider provider, byte expected) + public static IEnumerable Parse_ValidWithOffsetCount_TestData() { - Assert.Equal(expected, byte.Parse(value.AsReadOnlySpan(), style, provider)); + foreach (object[] inputs in Parse_Valid_TestData()) + { + yield return new object[] { inputs[0], 0, ((string)inputs[0]).Length, inputs[1], inputs[2], inputs[3] }; + } - Assert.True(byte.TryParse(value.AsReadOnlySpan(), style, provider, out byte result)); + yield return new object[] { "123", 0, 2, NumberStyles.Integer, null, (byte)12 }; + yield return new object[] { "+123", 0, 2, NumberStyles.Integer, null, (byte)1 }; + yield return new object[] { "+123", 1, 3, NumberStyles.Integer, null, (byte)123 }; + yield return new object[] { " 123 ", 4, 1, NumberStyles.Integer, null, (byte)3 }; + yield return new object[] { "12", 1, 1, NumberStyles.HexNumber, null, (byte)0x2 }; + yield return new object[] { "10", 0, 1, NumberStyles.AllowThousands, null, (byte)1 }; + yield return new object[] { "$100", 0, 2, NumberStyles.Currency, new NumberFormatInfo() { CurrencySymbol = "$" }, (byte)1 }; + } + + + [Theory] + [MemberData(nameof(Parse_ValidWithOffsetCount_TestData))] + public static void Parse_Span_Valid(string value, int offset, int count, NumberStyles style, IFormatProvider provider, byte expected) + { + Assert.Equal(expected, byte.Parse(value.AsSpan(offset, count), style, provider)); + + Assert.True(byte.TryParse(value.AsSpan(offset, count), style, provider, out byte result)); Assert.Equal(expected, result); } @@ -25,9 +43,9 @@ namespace System.Tests { if (value != null) { - Assert.Throws(exceptionType, () => byte.Parse(value.AsReadOnlySpan(), style, provider)); + Assert.Throws(exceptionType, () => byte.Parse(value.AsSpan(), style, provider)); - Assert.False(byte.TryParse(value.AsReadOnlySpan(), style, provider, out byte result)); + Assert.False(byte.TryParse(value.AsSpan(), style, provider, out byte result)); Assert.Equal(0, result); } } diff --git a/external/corefx/src/System.Runtime/tests/System/DateTimeOffsetTests.cs b/external/corefx/src/System.Runtime/tests/System/DateTimeOffsetTests.cs index 97dec13593..6a20af508d 100644 --- a/external/corefx/src/System.Runtime/tests/System/DateTimeOffsetTests.cs +++ b/external/corefx/src/System.Runtime/tests/System/DateTimeOffsetTests.cs @@ -1055,5 +1055,104 @@ namespace System.Tests var dateTimeOffset = new DateTimeOffset(1, 1, 1, 0, 0, 0, 0, new GregorianCalendar(),TimeSpan.Zero); VerifyDateTimeOffset(dateTimeOffset, 1, 1, 1, 0, 0, 0, 0, TimeSpan.Zero); } + + public static IEnumerable ToString_MatchesExpected_MemberData() + { + // Randomly generated data on netfx with: + // using System; + // class Program + // { + // static void Main() + // { + // var rand = new Random(42); + // var bytes = new byte[8]; + // int i = 0; + // while (i < 40) + // { + // DateTimeKind kind = rand.Next(2) == 0 ? DateTimeKind.Utc : DateTimeKind.Unspecified; + // string format; + // switch (rand.Next(4)) + // { + // case 0: format = "o"; break; + // case 1: format = "O"; break; + // case 2: format = "r"; break; + // default: format = "R"; break; + // } + // + // try + // { + // rand.NextBytes(bytes); + // long seed1 = BitConverter.ToInt64(bytes, 0); + // short seed2 = BitConverter.ToInt16(bytes, 0); + // var dto = new DateTimeOffset(seed1, TimeSpan.FromSeconds(seed2)); + // Console.WriteLine($"yield return new object[] {{ new DateTimeOffset({seed1}, TimeSpan.FromSeconds({seed2})), \"{format}\", \"{dto.ToString(format)}\" }};"); + // i++; + // } + // catch { } + // } + // } + // } + + yield return new object[] { new DateTimeOffset(2900400428644841236, TimeSpan.FromSeconds(14100)), "R", "Thu, 02 Jan 9192 18:39:24 GMT" }; + yield return new object[] { new DateTimeOffset(1274262903994885572, TimeSpan.FromSeconds(-23100)), "R", "Fri, 24 Dec 4038 14:11:39 GMT" }; + yield return new object[] { new DateTimeOffset(1228646631256163984, TimeSpan.FromSeconds(1680)), "R", "Tue, 05 Jun 3894 16:37:25 GMT" }; + yield return new object[] { new DateTimeOffset(2075652349868341848, TimeSpan.FromSeconds(31320)), "O", "6578-06-25T09:43:06.8341848+08:42" }; + yield return new object[] { new DateTimeOffset(2552829549675618692, TimeSpan.FromSeconds(8580)), "O", "8090-08-05T19:56:07.5618692+02:23" }; + yield return new object[] { new DateTimeOffset(2125715934081389968, TimeSpan.FromSeconds(5520)), "o", "6737-02-16T08:50:08.1389968+01:32" }; + yield return new object[] { new DateTimeOffset(98868902986124576, TimeSpan.FromSeconds(3360)), "O", "0314-04-22T14:24:58.6124576+00:56" }; + yield return new object[] { new DateTimeOffset(2013251697288306712, TimeSpan.FromSeconds(24600)), "O", "6380-09-28T10:15:28.8306712+06:50" }; + yield return new object[] { new DateTimeOffset(1037147523427228640, TimeSpan.FromSeconds(23520)), "o", "3287-08-04T05:25:42.7228640+06:32" }; + yield return new object[] { new DateTimeOffset(2177752403904984188, TimeSpan.FromSeconds(29820)), "r", "Mon, 09 Jan 6902 10:02:50 GMT" }; + yield return new object[] { new DateTimeOffset(832166470435218996, TimeSpan.FromSeconds(9780)), "r", "Fri, 12 Jan 2638 12:34:23 GMT" }; + yield return new object[] { new DateTimeOffset(651609783134768240, TimeSpan.FromSeconds(-13200)), "o", "2065-11-13T23:45:13.4768240-03:40" }; + yield return new object[] { new DateTimeOffset(1436056534611459616, TimeSpan.FromSeconds(-480)), "o", "4551-09-07T11:17:41.1459616-00:08" }; + yield return new object[] { new DateTimeOffset(1028124353647668124, TimeSpan.FromSeconds(-5220)), "o", "3258-12-30T17:49:24.7668124-01:27" }; + yield return new object[] { new DateTimeOffset(815446183072290676, TimeSpan.FromSeconds(-10380)), "o", "2585-01-17T10:51:47.2290676-02:53" }; + yield return new object[] { new DateTimeOffset(2091185090181553120, TimeSpan.FromSeconds(23520)), "r", "Fri, 14 Sep 6627 20:11:38 GMT" }; + yield return new object[] { new DateTimeOffset(2668855365894778960, TimeSpan.FromSeconds(-20400)), "R", "Mon, 08 Apr 8458 04:56:29 GMT" }; + yield return new object[] { new DateTimeOffset(1640160533452759488, TimeSpan.FromSeconds(8640)), "O", "5198-06-18T22:49:05.2759488+02:24" }; + yield return new object[] { new DateTimeOffset(2958665748788957224, TimeSpan.FromSeconds(20520)), "o", "9376-08-21T15:41:18.8957224+05:42" }; + yield return new object[] { new DateTimeOffset(2902544657562766092, TimeSpan.FromSeconds(-29940)), "R", "Tue, 20 Oct 9198 00:48:16 GMT" }; + yield return new object[] { new DateTimeOffset(2847595389168931696, TimeSpan.FromSeconds(21360)), "R", "Thu, 02 Sep 9024 17:59:16 GMT" }; + yield return new object[] { new DateTimeOffset(2010196475667096780, TimeSpan.FromSeconds(9420)), "r", "Sat, 23 Jan 6371 04:22:26 GMT" }; + yield return new object[] { new DateTimeOffset(613442997756722832, TimeSpan.FromSeconds(32400)), "O", "1944-12-04T11:16:15.6722832+09:00" }; + yield return new object[] { new DateTimeOffset(921560296274801912, TimeSpan.FromSeconds(13560)), "r", "Wed, 23 Apr 2921 13:21:07 GMT" }; + yield return new object[] { new DateTimeOffset(1990689515682669052, TimeSpan.FromSeconds(8700)), "o", "6309-03-31T18:59:28.2669052+02:25" }; + yield return new object[] { new DateTimeOffset(620638066929852080, TimeSpan.FromSeconds(24240)), "O", "1967-09-23T02:18:12.9852080+06:44" }; + yield return new object[] { new DateTimeOffset(327248350932775524, TimeSpan.FromSeconds(12900)), "O", "1038-01-04T15:58:13.2775524+03:35" }; + yield return new object[] { new DateTimeOffset(1370257845275318012, TimeSpan.FromSeconds(-10500)), "O", "4343-03-06T13:55:27.5318012-02:55" }; + yield return new object[] { new DateTimeOffset(1239382730779209800, TimeSpan.FromSeconds(12360)), "O", "3928-06-13T18:04:37.9209800+03:26" }; + yield return new object[] { new DateTimeOffset(2935667013803687040, TimeSpan.FromSeconds(-17280)), "o", "9303-10-05T17:56:20.3687040-04:48" }; + yield return new object[] { new DateTimeOffset(2101626275971711700, TimeSpan.FromSeconds(-15660)), "R", "Tue, 16 Oct 6660 00:00:57 GMT" }; + yield return new object[] { new DateTimeOffset(1417918072364232412, TimeSpan.FromSeconds(28380)), "o", "4494-03-15T21:07:16.4232412+07:53" }; + yield return new object[] { new DateTimeOffset(962535844977970944, TimeSpan.FromSeconds(3840)), "r", "Thu, 27 Feb 3051 01:44:17 GMT" }; + yield return new object[] { new DateTimeOffset(2576630638913059544, TimeSpan.FromSeconds(-1320)), "R", "Tue, 07 Jan 8166 09:40:11 GMT" }; + yield return new object[] { new DateTimeOffset(991481917233718112, TimeSpan.FromSeconds(25440)), "r", "Thu, 19 Nov 3142 05:18:03 GMT" }; + yield return new object[] { new DateTimeOffset(230115425073485984, TimeSpan.FromSeconds(-10080)), "o", "0730-03-18T07:08:27.3485984-02:48" }; + yield return new object[] { new DateTimeOffset(1289946780226617584, TimeSpan.FromSeconds(240)), "r", "Sat, 04 Sep 4088 22:56:22 GMT" }; + yield return new object[] { new DateTimeOffset(3119563990129685280, TimeSpan.FromSeconds(-19680)), "R", "Sun, 04 Jul 9886 16:44:52 GMT" }; + yield return new object[] { new DateTimeOffset(1167612095351481672, TimeSpan.FromSeconds(-6840)), "r", "Thu, 06 Jan 3701 23:12:55 GMT" }; + yield return new object[] { new DateTimeOffset(1617181518122280616, TimeSpan.FromSeconds(26280)), "O", "5125-08-24T20:50:12.2280616+07:18" }; + } + + [Theory] + [MemberData(nameof(ToString_MatchesExpected_MemberData))] + public static void ToString_MatchesExpected(DateTimeOffset dateTimeOffset, string format, string expected) + { + Assert.Equal(expected, dateTimeOffset.ToString(format)); + } + + public static IEnumerable ToString_WithCulture_MatchesExpected_MemberData() + { + yield return new object[] { new DateTimeOffset(636572516255571994, TimeSpan.FromHours(-5)), "M", new CultureInfo("fr-FR"), "21 mars" }; + yield return new object[] { new DateTimeOffset(636572516255571994, TimeSpan.FromHours(-5)), "Y", new CultureInfo("da-DK"), "marts 2018" }; + } + + [Theory] + [MemberData(nameof(ToString_WithCulture_MatchesExpected_MemberData))] + public static void ToString_WithCulture_MatchesExpected(DateTimeOffset dateTimeOffset, string format, CultureInfo culture, string expected) + { + Assert.Equal(expected, dateTimeOffset.ToString(format, culture)); + } } } diff --git a/external/corefx/src/System.Runtime/tests/System/DateTimeOffsetTests.netcoreapp.cs b/external/corefx/src/System.Runtime/tests/System/DateTimeOffsetTests.netcoreapp.cs index 9b65d1fefe..0f6ad1da95 100644 --- a/external/corefx/src/System.Runtime/tests/System/DateTimeOffsetTests.netcoreapp.cs +++ b/external/corefx/src/System.Runtime/tests/System/DateTimeOffsetTests.netcoreapp.cs @@ -15,16 +15,34 @@ namespace System.Tests DateTimeOffset expected = DateTimeOffset.MaxValue; string expectedString = expected.ToString(); - Assert.Equal(expectedString, DateTimeOffset.Parse(expectedString.AsReadOnlySpan()).ToString()); - Assert.Equal(expectedString, DateTimeOffset.Parse(expectedString.AsReadOnlySpan(), null).ToString()); - Assert.Equal(expectedString, DateTimeOffset.Parse(expectedString.AsReadOnlySpan(), null, DateTimeStyles.None).ToString()); + Assert.Equal(expectedString, DateTimeOffset.Parse(expectedString.AsSpan()).ToString()); + Assert.Equal(expectedString, DateTimeOffset.Parse(expectedString.AsSpan(), null).ToString()); + Assert.Equal(expectedString, DateTimeOffset.Parse(expectedString.AsSpan(), null, DateTimeStyles.None).ToString()); - Assert.True(DateTimeOffset.TryParse(expectedString.AsReadOnlySpan(), out DateTimeOffset actual)); + Assert.True(DateTimeOffset.TryParse(expectedString.AsSpan(), out DateTimeOffset actual)); Assert.Equal(expectedString, actual.ToString()); - Assert.True(DateTimeOffset.TryParse(expectedString.AsReadOnlySpan(), null, DateTimeStyles.None, out actual)); + Assert.True(DateTimeOffset.TryParse(expectedString.AsSpan(), null, DateTimeStyles.None, out actual)); Assert.Equal(expectedString, actual.ToString()); } + [Theory] + [InlineData("r")] + [InlineData("o")] + public static void ToString_Slice_ParseSpan_RoundtripsSuccessfully(string roundtripFormat) + { + string expectedString = DateTimeOffset.UtcNow.ToString(roundtripFormat); + ReadOnlySpan expectedSpan = ("abcd" + expectedString + "1234").AsSpan("abcd".Length, expectedString.Length); + + Assert.Equal(expectedString, DateTimeOffset.Parse(expectedSpan).ToString(roundtripFormat)); + Assert.Equal(expectedString, DateTimeOffset.Parse(expectedSpan, null).ToString(roundtripFormat)); + Assert.Equal(expectedString, DateTimeOffset.Parse(expectedSpan, null, DateTimeStyles.None).ToString(roundtripFormat)); + + Assert.True(DateTimeOffset.TryParse(expectedSpan, out DateTimeOffset actual)); + Assert.Equal(expectedString, actual.ToString(roundtripFormat)); + Assert.True(DateTimeOffset.TryParse(expectedSpan, null, DateTimeStyles.None, out actual)); + Assert.Equal(expectedString, actual.ToString(roundtripFormat)); + } + [Fact] public static void ToString_ParseExactSpan_RoundtripsSuccessfully() { @@ -65,6 +83,19 @@ namespace System.Tests Assert.Equal(0, actual[actual.Length - 1]); } + [Theory] + [MemberData(nameof(ToString_MatchesExpected_MemberData))] + public static void TryFormat_MatchesExpected(DateTimeOffset dateTimeOffset, string format, string expected) + { + var destination = new char[expected.Length]; + + Assert.False(dateTimeOffset.TryFormat(destination.AsSpan(0, destination.Length - 1), out _, format)); + + Assert.True(dateTimeOffset.TryFormat(destination, out int charsWritten, format)); + Assert.Equal(destination.Length, charsWritten); + Assert.Equal(expected, new string(destination)); + } + [Fact] public static void UnixEpoch() { diff --git a/external/corefx/src/System.Runtime/tests/System/DateTimeTests.cs b/external/corefx/src/System.Runtime/tests/System/DateTimeTests.cs index 27a4ed0d98..73b3d79655 100644 --- a/external/corefx/src/System.Runtime/tests/System/DateTimeTests.cs +++ b/external/corefx/src/System.Runtime/tests/System/DateTimeTests.cs @@ -815,6 +815,17 @@ namespace System.Tests Assert.Equal(expectedString, result.ToString("g")); } + [Fact] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Needs desktop port: https://github.com/dotnet/coreclr/issues/15896")] + // Regression test for https://github.com/dotnet/coreclr/issues/15896 + public static void TryParseExact_EmptyAMPMDesignator() + { + var englishCulture = new CultureInfo("en-US"); + englishCulture.DateTimeFormat.AMDesignator = ""; + englishCulture.DateTimeFormat.PMDesignator = ""; + Assert.False(DateTime.TryParseExact(" ", "%t", englishCulture, DateTimeStyles.None, out _)); + } + public static void ParseExact_EscapedSingleQuotes() { var formatInfo = DateTimeFormatInfo.GetInstance(new CultureInfo("mt-MT")); @@ -1027,6 +1038,69 @@ namespace System.Tests yield return new object[] { "1234-05-06T07:00:00Z", "yyyy-MM-dd'T'HH:mm:ssFFFZ", CultureInfo.InvariantCulture, DateTimeStyles.None, TimeZoneInfo.ConvertTimeFromUtc(new DateTime(1234, 5, 6, 7, 0, 0, DateTimeKind.Utc), TimeZoneInfo.Local) }; yield return new object[] { "1234-05-06T07:00:00GMT", "yyyy-MM-dd'T'HH:mm:ssFFFZ", CultureInfo.InvariantCulture, DateTimeStyles.None, TimeZoneInfo.ConvertTimeFromUtc(new DateTime(1234, 5, 6, 7, 0, 0, DateTimeKind.Utc), TimeZoneInfo.Local) }; + + yield return new object[] { "9", "\" \"%d", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, new DateTime(DateTime.Now.Year, 1, 9, 0, 0, 0) }; + yield return new object[] { "15", "\' \'dd", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, new DateTime(DateTime.Now.Year, 1, 15, 0, 0, 0) }; + + yield return new object[] { "9", "\" \"%M", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, new DateTime(DateTime.Now.Year, 9, 1, 0, 0, 0) }; + yield return new object[] { "09", "\" \"MM", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, new DateTime(DateTime.Now.Year, 9, 1, 0, 0, 0) }; + yield return new object[] { "Sep", "\" \"MMM", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, new DateTime(DateTime.Now.Year, 9, 1, 0, 0, 0) }; + yield return new object[] { "September", "\' \'MMMM", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, new DateTime(DateTime.Now.Year, 9, 1, 0, 0, 0) }; + + yield return new object[] { "1", "\' \'%y", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, new DateTime(2001, 1, 1, 0, 0, 0) }; + yield return new object[] { "01", "\" \"yy", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, new DateTime(2001, 1, 1, 0, 0, 0) }; + yield return new object[] { "2001", "\" \"yyyy", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, new DateTime(2001, 1, 1, 0, 0, 0) }; + + yield return new object[] { "3", "\" \"%H", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, DateTime.Today + TimeSpan.FromHours(3) }; + yield return new object[] { "03", "\" \"HH", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, DateTime.Today + TimeSpan.FromHours(3) }; + + yield return new object[] { "3A", "\" \"ht", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, DateTime.Today + TimeSpan.FromHours(3) }; + yield return new object[] { "03A", "\" \"hht", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, DateTime.Today + TimeSpan.FromHours(3) }; + yield return new object[] { "3P", "\' \'ht", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, DateTime.Today + TimeSpan.FromHours(12 + 3) }; + yield return new object[] { "03P", "\" \"hht", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, DateTime.Today + TimeSpan.FromHours(12 + 3) }; + + yield return new object[] { "2017-10-11 01:23:45Z", "u", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, new DateTime(2017, 10, 11, 1, 23, 45) }; + yield return new object[] { "9/8/2017 10:11:12 AM", "\' \'M/d/yyyy HH':'mm':'ss tt", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, new DateTime(2017, 9, 8, 10, 11, 12) }; + yield return new object[] { "9/8/2017 20:11:12 PM", "\" \"M/d/yyyy HH':'mm':'ss tt", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, new DateTime(2017, 9, 8, 20, 11, 12) }; + yield return new object[] { "1234-05-06T07:00:00.8Z", "\" \"yyyy-MM-dd'T'HH:mm:ss.FFF'Z'", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, new DateTime(1234, 5, 6, 7, 0, 0, 800) }; + yield return new object[] { "1234-05-06T07:00:00Z", "\" \"yyyy-MM-dd'T'HH:mm:ss.FFF'Z'", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, new DateTime(1234, 5, 6, 7, 0, 0, 0) }; + yield return new object[] { "1234-05-06T07:00:00Z", "\' \'yyyy-MM-dd'T'HH:mm:ssFFF'Z'", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, new DateTime(1234, 5, 6, 7, 0, 0, 0) }; + yield return new object[] { "1234-05-06T07:00:00Z", "\' \'yyyy-MM-dd'T'HH:mm:ssFFF'Z'", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, new DateTime(1234, 5, 6, 7, 0, 0, 0) }; + yield return new object[] { "1234-05-06T07:00:00Z", "\" \"yyyy-MM-dd'T'HH:mm:ssFFFZ", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, TimeZoneInfo.ConvertTimeFromUtc(new DateTime(1234, 5, 6, 7, 0, 0, DateTimeKind.Utc), TimeZoneInfo.Local) }; + yield return new object[] { "1234-05-06T07:00:00GMT", "\" \"yyyy-MM-dd'T'HH:mm:ssFFFZ", CultureInfo.InvariantCulture, DateTimeStyles.AllowLeadingWhite, TimeZoneInfo.ConvertTimeFromUtc(new DateTime(1234, 5, 6, 7, 0, 0, DateTimeKind.Utc), TimeZoneInfo.Local) }; + + + yield return new object[] { "9", "%d\" \"", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, new DateTime(DateTime.Now.Year, 1, 9, 0, 0, 0) }; + yield return new object[] { "15", "dd\' \'", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, new DateTime(DateTime.Now.Year, 1, 15, 0, 0, 0) }; + + yield return new object[] { "9", "%M\" \"", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, new DateTime(DateTime.Now.Year, 9, 1, 0, 0, 0) }; + yield return new object[] { "09", "MM\" \"", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, new DateTime(DateTime.Now.Year, 9, 1, 0, 0, 0) }; + yield return new object[] { "Sep", "MMM\" \"", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, new DateTime(DateTime.Now.Year, 9, 1, 0, 0, 0) }; + yield return new object[] { "September", "MMMM\' \'", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, new DateTime(DateTime.Now.Year, 9, 1, 0, 0, 0) }; + + yield return new object[] { "1", "%y\' \'", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, new DateTime(2001, 1, 1, 0, 0, 0) }; + yield return new object[] { "01", "yy\" \"", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, new DateTime(2001, 1, 1, 0, 0, 0) }; + yield return new object[] { "2001", "yyyy\" \"", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, new DateTime(2001, 1, 1, 0, 0, 0) }; + + yield return new object[] { "3", "%H\" \"", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, DateTime.Today + TimeSpan.FromHours(3) }; + yield return new object[] { "03", "HH\" \"", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, DateTime.Today + TimeSpan.FromHours(3) }; + + yield return new object[] { "3A", "ht\" \"", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, DateTime.Today + TimeSpan.FromHours(3) }; + yield return new object[] { "03A", "hht\" \"", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, DateTime.Today + TimeSpan.FromHours(3) }; + yield return new object[] { "3P", "ht\' \'", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, DateTime.Today + TimeSpan.FromHours(12 + 3) }; + yield return new object[] { "03P", "hht\" \"", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, DateTime.Today + TimeSpan.FromHours(12 + 3) }; + + yield return new object[] { "2017-10-11 01:23:45Z", "u", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, new DateTime(2017, 10, 11, 1, 23, 45) }; + yield return new object[] { "9/8/2017 10:11:12 AM", "M/d/yyyy HH':'mm':'ss tt\' \'", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, new DateTime(2017, 9, 8, 10, 11, 12) }; + yield return new object[] { "9/8/2017 20:11:12 PM", "M/d/yyyy HH':'mm':'ss tt\" \"", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, new DateTime(2017, 9, 8, 20, 11, 12) }; + yield return new object[] { "1234-05-06T07:00:00.8Z", "yyyy-MM-dd'T'HH:mm:ss.FFF'Z'\" \"", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, new DateTime(1234, 5, 6, 7, 0, 0, 800) }; + yield return new object[] { "1234-05-06T07:00:00Z", "yyyy-MM-dd'T'HH:mm:ss.FFF'Z'\" \"", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, new DateTime(1234, 5, 6, 7, 0, 0, 0) }; + yield return new object[] { "1234-05-06T07:00:00Z", "yyyy-MM-dd'T'HH:mm:ssFFF'Z'\' \'", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, new DateTime(1234, 5, 6, 7, 0, 0, 0) }; + yield return new object[] { "1234-05-06T07:00:00Z", "yyyy-MM-dd'T'HH:mm:ssFFF'Z'\' \'", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, new DateTime(1234, 5, 6, 7, 0, 0, 0) }; + yield return new object[] { "1234-05-06T07:00:00Z", "yyyy-MM-dd'T'HH:mm:ssFFFZ\" \"", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, TimeZoneInfo.ConvertTimeFromUtc(new DateTime(1234, 5, 6, 7, 0, 0, DateTimeKind.Utc), TimeZoneInfo.Local) }; + yield return new object[] { "1234-05-06T07:00:00GMT", "yyyy-MM-dd'T'HH:mm:ssFFFZ\" \"", CultureInfo.InvariantCulture, DateTimeStyles.AllowTrailingWhite, TimeZoneInfo.ConvertTimeFromUtc(new DateTime(1234, 5, 6, 7, 0, 0, DateTimeKind.Utc), TimeZoneInfo.Local) }; + + var hebrewCulture = new CultureInfo("he-IL"); hebrewCulture.DateTimeFormat.Calendar = new HebrewCalendar(); DateTime today = DateTime.Today; @@ -1121,5 +1195,90 @@ namespace System.Tests Assert.False(DateTime.TryParseExact(input, format, culture, style, out DateTime result)); Assert.False(DateTime.TryParseExact(input, new[] { format }, culture, style, out result)); } + + public static IEnumerable ToString_MatchesExpected_MemberData() + { + // Randomly generated data on netfx with: + // using System; + // class Program + // { + // static void Main() + // { + // var rand = new Random(42); + // var bytes = new byte[8]; + // int i = 0; + // while (i < 40) + // { + // DateTimeKind kind = rand.Next(2) == 0 ? DateTimeKind.Utc : DateTimeKind.Unspecified; + // string format; + // switch (rand.Next(4)) + // { + // case 0: format = "o"; break; + // case 1: format = "O"; break; + // case 2: format = "r"; break; + // default: format = "R"; break; + // } + // + // try + // { + // rand.NextBytes(bytes); + // long seed = BitConverter.ToInt64(bytes, 0); + // var dt = new DateTime(seed, kind); + // Console.WriteLine($"yield return new object[] {{ new DateTime({seed}, DateTimeKind.{kind}), \"{format}\", \"{dt.ToString(format)}\" }};"); + // i++; + // } + // catch { } + // } + // } + //} + + yield return new object[] { new DateTime(2688006240964947440, DateTimeKind.Utc), "O", "8518-12-15T08:01:36.4947440Z" }; + yield return new object[] { new DateTime(2461197105169450509, DateTimeKind.Utc), "r", "Sun, 23 Mar 7800 18:15:16 GMT" }; + yield return new object[] { new DateTime(71363981510699949, DateTimeKind.Unspecified), "R", "Fri, 23 Feb 0227 04:49:11 GMT" }; + yield return new object[] { new DateTime(1678426538898407093, DateTimeKind.Unspecified), "R", "Fri, 22 Sep 5319 07:24:49 GMT" }; + yield return new object[] { new DateTime(2689041307785948711, DateTimeKind.Utc), "o", "8522-03-27T07:52:58.5948711Z" }; + yield return new object[] { new DateTime(996610247053299209, DateTimeKind.Unspecified), "r", "Thu, 19 Feb 3159 01:58:25 GMT" }; + yield return new object[] { new DateTime(3105391438361510074, DateTimeKind.Unspecified), "R", "Fri, 06 Aug 9841 01:17:16 GMT" }; + yield return new object[] { new DateTime(946433487657072106, DateTimeKind.Utc), "R", "Mon, 17 Feb 3000 03:06:05 GMT" }; + yield return new object[] { new DateTime(2521748413631767931, DateTimeKind.Unspecified), "R", "Sat, 08 Feb 7992 07:02:43 GMT" }; + yield return new object[] { new DateTime(49349519375012969, DateTimeKind.Utc), "R", "Fri, 20 May 0157 11:58:57 GMT" }; + yield return new object[] { new DateTime(796677276139881359, DateTimeKind.Utc), "o", "2525-07-28T04:20:13.9881359Z" }; + yield return new object[] { new DateTime(3022911536338429542, DateTimeKind.Unspecified), "R", "Mon, 24 Mar 9580 04:53:53 GMT" }; + yield return new object[] { new DateTime(1144652135553351618, DateTimeKind.Utc), "R", "Tue, 04 Apr 3628 20:39:15 GMT" }; + yield return new object[] { new DateTime(2570858096011770291, DateTimeKind.Unspecified), "o", "8147-09-23T04:53:21.1770291" }; + yield return new object[] { new DateTime(15695724649124585, DateTimeKind.Unspecified), "R", "Tue, 27 Sep 0050 08:21:04 GMT" }; + yield return new object[] { new DateTime(1503933934291527034, DateTimeKind.Unspecified), "O", "4766-10-12T06:37:09.1527034" }; + yield return new object[] { new DateTime(2688603665097410101, DateTimeKind.Unspecified), "r", "Tue, 05 Nov 8520 19:08:29 GMT" }; + yield return new object[] { new DateTime(1310336900529542610, DateTimeKind.Unspecified), "r", "Tue, 17 Apr 4153 15:14:12 GMT" }; + yield return new object[] { new DateTime(2313720085584182693, DateTimeKind.Unspecified), "O", "7332-11-20T18:22:38.4182693" }; + yield return new object[] { new DateTime(2291958603891779335, DateTimeKind.Unspecified), "o", "7263-12-05T20:46:29.1779335" }; + yield return new object[] { new DateTime(262036413643976979, DateTimeKind.Unspecified), "o", "0831-05-12T21:16:04.3976979" }; + yield return new object[] { new DateTime(684781207384421044, DateTimeKind.Utc), "O", "2170-12-26T20:12:18.4421044Z" }; + yield return new object[] { new DateTime(1444462249169683325, DateTimeKind.Utc), "r", "Mon, 27 Apr 4578 07:21:56 GMT" }; + yield return new object[] { new DateTime(1155518137384061537, DateTimeKind.Unspecified), "r", "Sun, 10 Sep 3662 06:02:18 GMT" }; + yield return new object[] { new DateTime(2333390479532380569, DateTimeKind.Unspecified), "O", "7395-03-22T10:12:33.2380569" }; + yield return new object[] { new DateTime(2217528014591554502, DateTimeKind.Unspecified), "R", "Sat, 26 Jan 7028 08:24:19 GMT" }; + yield return new object[] { new DateTime(2764551324904480205, DateTimeKind.Utc), "O", "8761-07-08T04:21:30.4480205Z" }; + yield return new object[] { new DateTime(2880903932678729712, DateTimeKind.Utc), "O", "9130-03-23T13:14:27.8729712Z" }; + yield return new object[] { new DateTime(507699902578704433, DateTimeKind.Utc), "O", "1609-11-02T15:04:17.8704433Z" }; + yield return new object[] { new DateTime(2429953022324426129, DateTimeKind.Utc), "O", "7701-03-20T15:03:52.4426129Z" }; + yield return new object[] { new DateTime(603147512164908366, DateTimeKind.Unspecified), "O", "1912-04-20T09:33:36.4908366" }; + yield return new object[] { new DateTime(2900400428644841236, DateTimeKind.Utc), "R", "Thu, 02 Jan 9192 22:34:24 GMT" }; + yield return new object[] { new DateTime(1710845568474490805, DateTimeKind.Utc), "O", "5422-06-16T08:00:47.4490805Z" }; + yield return new object[] { new DateTime(2988999715803714268, DateTimeKind.Utc), "r", "Sun, 06 Oct 9472 09:53:00 GMT" }; + yield return new object[] { new DateTime(1068133489112689365, DateTimeKind.Utc), "r", "Wed, 12 Oct 3385 14:41:51 GMT" }; + yield return new object[] { new DateTime(798784044525059284, DateTimeKind.Unspecified), "R", "Mon, 31 Mar 2532 13:40:52 GMT" }; + yield return new object[] { new DateTime(2561736813034040593, DateTimeKind.Utc), "O", "8118-10-28T03:55:03.4040593Z" }; + yield return new object[] { new DateTime(1677975383149674547, DateTimeKind.Utc), "o", "5318-04-18T03:18:34.9674547Z" }; + yield return new object[] { new DateTime(1101778442151366156, DateTimeKind.Utc), "O", "3492-05-25T12:43:35.1366156Z" }; + yield return new object[] { new DateTime(221550163152616218, DateTimeKind.Utc), "r", "Sun, 25 Jan 0703 19:11:55 GMT" }; + } + + [Theory] + [MemberData(nameof(ToString_MatchesExpected_MemberData))] + public static void ToString_MatchesExpected(DateTime dateTime, string format, string expected) + { + Assert.Equal(expected, dateTime.ToString(format)); + } } } diff --git a/external/corefx/src/System.Runtime/tests/System/DateTimeTests.netcoreapp.cs b/external/corefx/src/System.Runtime/tests/System/DateTimeTests.netcoreapp.cs index 44e806cadf..b11911bea0 100644 --- a/external/corefx/src/System.Runtime/tests/System/DateTimeTests.netcoreapp.cs +++ b/external/corefx/src/System.Runtime/tests/System/DateTimeTests.netcoreapp.cs @@ -35,22 +35,35 @@ namespace System.Tests Assert.Equal(0, dest[dest.Length - 1]); } + [Theory] + [MemberData(nameof(ToString_MatchesExpected_MemberData))] + public static void TryFormat_MatchesExpected(DateTime dateTime, string format, string expected) + { + var destination = new char[expected.Length]; + + Assert.False(dateTime.TryFormat(destination.AsSpan(0, destination.Length - 1), out _, format)); + + Assert.True(dateTime.TryFormat(destination, out int charsWritten, format)); + Assert.Equal(destination.Length, charsWritten); + Assert.Equal(expected, new string(destination)); + } + [Theory] [MemberData(nameof(Parse_ValidInput_Suceeds_MemberData))] public static void Parse_Span_ValidInput_Suceeds(string input, CultureInfo culture, DateTime? expected) { - Assert.Equal(expected, DateTime.Parse(input.AsReadOnlySpan(), culture)); + Assert.Equal(expected, DateTime.Parse(input.AsSpan(), culture)); } [Theory] [MemberData(nameof(ParseExact_ValidInput_Succeeds_MemberData))] public static void ParseExact_Span_ValidInput_Succeeds(string input, string format, CultureInfo culture, DateTimeStyles style, DateTime? expected) { - DateTime result1 = DateTime.ParseExact(input.AsReadOnlySpan(), format, culture, style); - DateTime result2 = DateTime.ParseExact(input.AsReadOnlySpan(), new[] { format }, culture, style); + DateTime result1 = DateTime.ParseExact(input.AsSpan(), format, culture, style); + DateTime result2 = DateTime.ParseExact(input.AsSpan(), new[] { format }, culture, style); - Assert.True(DateTime.TryParseExact(input.AsReadOnlySpan(), format, culture, style, out DateTime result3)); - Assert.True(DateTime.TryParseExact(input.AsReadOnlySpan(), new[] { format }, culture, style, out DateTime result4)); + Assert.True(DateTime.TryParseExact(input.AsSpan(), format, culture, style, out DateTime result3)); + Assert.True(DateTime.TryParseExact(input.AsSpan(), new[] { format }, culture, style, out DateTime result4)); Assert.Equal(result1, result2); Assert.Equal(result1, result3); @@ -76,11 +89,11 @@ namespace System.Tests [MemberData(nameof(ParseExact_InvalidInputs_Fail_MemberData))] public static void ParseExact_Span_InvalidInputs_Fail(string input, string format, CultureInfo culture, DateTimeStyles style) { - Assert.Throws(() => DateTime.ParseExact(input.AsReadOnlySpan(), format, culture, style)); - Assert.Throws(() => DateTime.ParseExact(input.AsReadOnlySpan(), new[] { format }, culture, style)); + Assert.Throws(() => DateTime.ParseExact(input.AsSpan(), format, culture, style)); + Assert.Throws(() => DateTime.ParseExact(input.AsSpan(), new[] { format }, culture, style)); - Assert.False(DateTime.TryParseExact(input.AsReadOnlySpan(), format, culture, style, out DateTime result)); - Assert.False(DateTime.TryParseExact(input.AsReadOnlySpan(), new[] { format }, culture, style, out result)); + Assert.False(DateTime.TryParseExact(input.AsSpan(), format, culture, style, out DateTime result)); + Assert.False(DateTime.TryParseExact(input.AsSpan(), new[] { format }, culture, style, out result)); } [Fact] diff --git a/external/corefx/src/System.Runtime/tests/System/DecimalTests.cs b/external/corefx/src/System.Runtime/tests/System/DecimalTests.cs index c82adf4d8c..18a281d0f9 100644 --- a/external/corefx/src/System.Runtime/tests/System/DecimalTests.cs +++ b/external/corefx/src/System.Runtime/tests/System/DecimalTests.cs @@ -557,7 +557,7 @@ namespace System.Tests public static IEnumerable Parse_Valid_TestData() { - NumberStyles defaultStyle = NumberStyles.Float; + NumberStyles defaultStyle = NumberStyles.Number; NumberFormatInfo emptyFormat = NumberFormatInfo.CurrentInfo; @@ -605,7 +605,7 @@ namespace System.Tests { bool isDefaultProvider = provider == null || provider == NumberFormatInfo.CurrentInfo; decimal result; - if ((style & ~NumberStyles.Integer) == 0 && style != NumberStyles.None) + if ((style & ~NumberStyles.Number) == 0 && style != NumberStyles.None) { // Use Parse(string) or Parse(string, IFormatProvider) if (isDefaultProvider) @@ -638,7 +638,7 @@ namespace System.Tests public static IEnumerable Parse_Invalid_TestData() { - NumberStyles defaultStyle = NumberStyles.Float; + NumberStyles defaultStyle = NumberStyles.Number; var customFormat = new NumberFormatInfo(); customFormat.CurrencySymbol = "$"; @@ -669,7 +669,7 @@ namespace System.Tests { bool isDefaultProvider = provider == null || provider == NumberFormatInfo.CurrentInfo; decimal result; - if ((style & ~NumberStyles.Integer) == 0 && style != NumberStyles.None && (style & NumberStyles.AllowLeadingWhite) == (style & NumberStyles.AllowTrailingWhite)) + if ((style & ~NumberStyles.Number) == 0 && style != NumberStyles.None && (style & NumberStyles.AllowLeadingWhite) == (style & NumberStyles.AllowTrailingWhite)) { // Use Parse(string) or Parse(string, IFormatProvider) if (isDefaultProvider) @@ -1455,6 +1455,153 @@ namespace System.Tests } } + [Fact] + public static void BigInteger_Floor() + { + decimal[] decimalValues = GetRandomData(out BigDecimal[] bigDecimals); + for (int i = 0; i < decimalValues.Length; i++) + { + decimal d1 = decimalValues[i]; + BigDecimal expected = bigDecimals[i].Floor(); + decimal actual = decimal.Floor(d1); + unsafe + { + if (expected.Scale != (byte)(*(uint*)&actual >> BigDecimal.ScaleShift) || expected.CompareTo(new BigDecimal(actual)) != 0) + throw new Xunit.Sdk.AssertActualExpectedException(expected, actual, d1 + " Floor"); + } + } + } + + [Fact] + public static void BigInteger_Ceiling() + { + decimal[] decimalValues = GetRandomData(out BigDecimal[] bigDecimals); + for (int i = 0; i < decimalValues.Length; i++) + { + decimal d1 = decimalValues[i]; + BigDecimal expected = bigDecimals[i].Ceiling(); + decimal actual = decimal.Ceiling(d1); + unsafe + { + if (expected.Scale != (byte)(*(uint*)&actual >> BigDecimal.ScaleShift) || expected.CompareTo(new BigDecimal(actual)) != 0) + throw new Xunit.Sdk.AssertActualExpectedException(expected, actual, d1 + " Ceiling"); + } + } + } + + [Fact] + public static void BigInteger_Truncate() + { + decimal[] decimalValues = GetRandomData(out BigDecimal[] bigDecimals); + for (int i = 0; i < decimalValues.Length; i++) + { + decimal d1 = decimalValues[i]; + BigDecimal expected = bigDecimals[i].Truncate(); + decimal actual = decimal.Truncate(d1); + unsafe + { + if (expected.Scale != (byte)(*(uint*)&actual >> BigDecimal.ScaleShift) || expected.CompareTo(new BigDecimal(actual)) != 0) + throw new Xunit.Sdk.AssertActualExpectedException(expected, actual, d1 + " Truncate"); + } + } + } + + [Fact] + public static void BigInteger_ToInt32() + { + decimal[] decimalValues = GetRandomData(out BigDecimal[] bigDecimals); + for (int i = 0; i < decimalValues.Length; i++) + { + decimal d1 = decimalValues[i]; + int expected = bigDecimals[i].ToInt32(out bool expectedOverflow); + if (expectedOverflow) + { + try + { + int actual = decimal.ToInt32(d1); + throw new Xunit.Sdk.AssertActualExpectedException(typeof(OverflowException), actual, d1 + " ToInt32"); + } + catch (OverflowException) { } + } + else + { + int actual = decimal.ToInt32(d1); + if (expected != actual) + throw new Xunit.Sdk.AssertActualExpectedException(expected, actual, d1 + " ToInt32"); + } + } + } + + [Fact] + public static void BigInteger_ToOACurrency() + { + decimal[] decimalValues = GetRandomData(out BigDecimal[] bigDecimals); + for (int i = 0; i < decimalValues.Length; i++) + { + decimal d1 = decimalValues[i]; + long expected = bigDecimals[i].ToOACurrency(out bool expectedOverflow); + if (expectedOverflow) + { + try + { + long actual = decimal.ToOACurrency(d1); + throw new Xunit.Sdk.AssertActualExpectedException(typeof(OverflowException), actual, d1 + " ToOACurrency"); + } + catch (OverflowException) { } + } + else + { + long actual = decimal.ToOACurrency(d1); + if (expected != actual) + throw new Xunit.Sdk.AssertActualExpectedException(expected, actual, d1 + " ToOACurrency"); + } + } + } + + [Fact] + public static void BigInteger_Round() + { + decimal[] decimalValues = GetRandomData(out BigDecimal[] bigDecimals); + for (int i = 0; i < decimalValues.Length; i++) + { + decimal d1 = decimalValues[i]; + BigDecimal b1 = bigDecimals[i]; + for (int j = 0; j <= 28; j++) + { + + BigDecimal expected = b1.Round(j); + decimal actual = decimal.Round(d1, j); + unsafe + { + if (expected.Scale != (byte)(*(uint*)&actual >> BigDecimal.ScaleShift) || expected.CompareTo(new BigDecimal(actual)) != 0) + throw new Xunit.Sdk.AssertActualExpectedException(expected, actual, d1 + " Round(" + j + ")"); + } + } + } + } + + [Fact] + public static void BigInteger_RoundAwayFromZero() + { + decimal[] decimalValues = GetRandomData(out BigDecimal[] bigDecimals); + for (int i = 0; i < decimalValues.Length; i++) + { + decimal d1 = decimalValues[i]; + BigDecimal b1 = bigDecimals[i]; + for (int j = 0; j <= 28; j++) + { + + BigDecimal expected = b1.RoundAwayFromZero(j); + decimal actual = decimal.Round(d1, j, MidpointRounding.AwayFromZero); + unsafe + { + if (expected.Scale != (byte)(*(uint*)&actual >> BigDecimal.ScaleShift) || expected.CompareTo(new BigDecimal(actual)) != 0) + throw new Xunit.Sdk.AssertActualExpectedException(expected, actual, d1 + " RoundAwayFromZero(" + j + ")"); + } + } + } + } + static decimal[] GetRandomData(out BigDecimal[] bigDecimals) { // some static data to test the limits @@ -1698,6 +1845,69 @@ namespace System.Tests } return false; } + + public BigDecimal Floor() => FloorCeiling(Integer.Sign < 0); + public BigDecimal Ceiling() => FloorCeiling(Integer.Sign > 0); + + BigDecimal FloorCeiling(bool up) + { + if (Scale == 0) + return this; + var res = BigInteger.DivRem(Integer, Pow10[Scale], out var remainder); + if (up && !remainder.IsZero) + res += Integer.Sign; + return new BigDecimal(res, 0); + } + + public BigDecimal Truncate() => Scale == 0 ? this : new BigDecimal(Integer / Pow10[Scale], 0); + + public int ToInt32(out bool expectedOverflow) + { + var i = Truncate().Integer; + return (expectedOverflow = i < int.MinValue || i > int.MaxValue) ? 0 : (int)i; + } + + public long ToOACurrency(out bool expectedOverflow) + { + var i = Integer; + if (Scale < 4) + i *= Pow10[4 - Scale]; + else if (Scale > 4) + i = RoundToEven(i, Scale - 4); + return (expectedOverflow = i < long.MinValue || i > long.MaxValue) ? 0 : (long)i; + } + + static BigInteger RoundToEven(BigInteger value, int scale) + { + var pow = Pow10[scale]; + var res = BigInteger.DivRem(value, pow, out var remainder); + pow >>= 1; + remainder = BigInteger.Abs(remainder); + if (remainder > pow || remainder == pow && !res.IsEven) + res += value.Sign; + return res; + } + + public BigDecimal Round(int scale) + { + var diff = Scale - scale; + if (diff <= 0) + return this; + return new BigDecimal(RoundToEven(Integer, diff), (byte)scale); + } + + public BigDecimal RoundAwayFromZero(int scale) + { + var diff = Scale - scale; + if (diff <= 0) + return this; + + var pow = Pow10[diff]; + var res = BigInteger.DivRem(Integer, pow, out var remainder); + if (BigInteger.Abs(remainder) >= (pow >> 1)) + res += Integer.Sign; + return new BigDecimal(res, (byte)scale); + } } } } diff --git a/external/corefx/src/System.Runtime/tests/System/DecimalTests.netcoreapp.cs b/external/corefx/src/System.Runtime/tests/System/DecimalTests.netcoreapp.cs index 6afd958d71..01fd648214 100644 --- a/external/corefx/src/System.Runtime/tests/System/DecimalTests.netcoreapp.cs +++ b/external/corefx/src/System.Runtime/tests/System/DecimalTests.netcoreapp.cs @@ -2,6 +2,7 @@ // 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.Collections.Generic; using System.Globalization; using Xunit; @@ -9,13 +10,44 @@ namespace System.Tests { public partial class DecimalTests { - [Theory] - [MemberData(nameof(Parse_Valid_TestData))] - public static void Parse_Span_Valid(string value, NumberStyles style, IFormatProvider provider, decimal expected) + public static IEnumerable Parse_ValidWithOffsetCount_TestData() { - Assert.Equal(expected, decimal.Parse(value.AsReadOnlySpan(), style, provider)); + foreach (object[] inputs in Parse_Valid_TestData()) + { + yield return new object[] { inputs[0], 0, ((string)inputs[0]).Length, inputs[1], inputs[2], inputs[3] }; + } - Assert.True(decimal.TryParse(value.AsReadOnlySpan(), style, provider, out decimal result)); + yield return new object[] { "-123", 1, 3, NumberStyles.Number, null, 123m }; + yield return new object[] { "-123", 0, 3, NumberStyles.Number, null, -12m }; + yield return new object[] { 1000.ToString("N0"), 0, 4, NumberStyles.AllowThousands, null, 100m }; + yield return new object[] { 1000.ToString("N0"), 2, 3, NumberStyles.AllowThousands, null, 0m }; + yield return new object[] { "(123)", 1, 3, NumberStyles.AllowParentheses, new NumberFormatInfo() { NumberDecimalSeparator = "." }, 123m }; + yield return new object[] { "1234567890123456789012345.678456", 1, 4, NumberStyles.Number, new NumberFormatInfo() { NumberDecimalSeparator = "." }, 2345m }; + } + + [Theory] + [MemberData(nameof(Parse_ValidWithOffsetCount_TestData))] + public static void Parse_Span_Valid(string value, int offset, int count, NumberStyles style, IFormatProvider provider, decimal expected) + { + bool isDefaultProvider = provider == null || provider == NumberFormatInfo.CurrentInfo; + decimal result; + if ((style & ~NumberStyles.Number) == 0 && style != NumberStyles.None) + { + // Use Parse(string) or Parse(string, IFormatProvider) + if (isDefaultProvider) + { + Assert.True(decimal.TryParse(value.AsSpan(offset, count), out result)); + Assert.Equal(expected, result); + + Assert.Equal(expected, decimal.Parse(value.AsSpan(offset, count))); + } + + Assert.Equal(expected, decimal.Parse(value.AsSpan(offset, count), provider: provider)); + } + + Assert.Equal(expected, decimal.Parse(value.AsSpan(offset, count), style, provider)); + + Assert.True(decimal.TryParse(value.AsSpan(offset, count), style, provider, out result)); Assert.Equal(expected, result); } @@ -25,9 +57,9 @@ namespace System.Tests { if (value != null) { - Assert.Throws(exceptionType, () => decimal.Parse(value.AsReadOnlySpan(), style, provider)); + Assert.Throws(exceptionType, () => decimal.Parse(value.AsSpan(), style, provider)); - Assert.False(decimal.TryParse(value.AsReadOnlySpan(), style, provider, out decimal result)); + Assert.False(decimal.TryParse(value.AsSpan(), style, provider, out decimal result)); Assert.Equal(0, result); } } diff --git a/external/corefx/src/System.Runtime/tests/System/DoubleTests.cs b/external/corefx/src/System.Runtime/tests/System/DoubleTests.cs index 69290976b3..cbf15cf3e2 100644 --- a/external/corefx/src/System.Runtime/tests/System/DoubleTests.cs +++ b/external/corefx/src/System.Runtime/tests/System/DoubleTests.cs @@ -205,8 +205,10 @@ namespace System.Tests [InlineData((double)789, (double)-789, false)] [InlineData((double)789, (double)0, false)] [InlineData(double.NaN, double.NaN, true)] + [InlineData(double.NaN, -double.NaN, true)] [InlineData((double)789, (float)789, false)] [InlineData((double)789, "789", false)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "The fix was made in coreclr that is not in netfx. See https://github.com/dotnet/coreclr/issues/6237")] public static void Equals(double d1, object value, bool expected) { if (value is double d2) @@ -326,8 +328,7 @@ namespace System.Tests public static IEnumerable Parse_Valid_TestData() { - // Defaults: AllowLeadingWhite | AllowTrailingWhite | AllowLeadingSign | AllowDecimalPoint | AllowExponent | AllowThousands - NumberStyles defaultStyle = NumberStyles.Float; + NumberStyles defaultStyle = NumberStyles.Float | NumberStyles.AllowThousands; NumberFormatInfo emptyFormat = NumberFormatInfo.CurrentInfo; @@ -374,7 +375,7 @@ namespace System.Tests { bool isDefaultProvider = provider == null || provider == NumberFormatInfo.CurrentInfo; double result; - if ((style & ~NumberStyles.Integer) == 0 && style != NumberStyles.None) + if ((style & ~(NumberStyles.Float | NumberStyles.AllowThousands)) == 0 && style != NumberStyles.None) { // Use Parse(string) or Parse(string, IFormatProvider) if (isDefaultProvider) @@ -439,7 +440,7 @@ namespace System.Tests { bool isDefaultProvider = provider == null || provider == NumberFormatInfo.CurrentInfo; double result; - if ((style & ~NumberStyles.Integer) == 0 && style != NumberStyles.None && (style & NumberStyles.AllowLeadingWhite) == (style & NumberStyles.AllowTrailingWhite)) + if ((style & ~(NumberStyles.Float | NumberStyles.AllowThousands)) == 0 && style != NumberStyles.None && (style & NumberStyles.AllowLeadingWhite) == (style & NumberStyles.AllowTrailingWhite)) { // Use Parse(string) or Parse(string, IFormatProvider) if (isDefaultProvider) diff --git a/external/corefx/src/System.Runtime/tests/System/DoubleTests.netcoreapp.cs b/external/corefx/src/System.Runtime/tests/System/DoubleTests.netcoreapp.cs index 90b5aaa60d..16b5dc5013 100644 --- a/external/corefx/src/System.Runtime/tests/System/DoubleTests.netcoreapp.cs +++ b/external/corefx/src/System.Runtime/tests/System/DoubleTests.netcoreapp.cs @@ -87,13 +87,44 @@ namespace System.Tests Assert.Equal(expected, double.IsSubnormal(d)); } - [Theory] - [MemberData(nameof(Parse_Valid_TestData))] - public static void Parse_Span_Valid(string value, NumberStyles style, IFormatProvider provider, double expected) + public static IEnumerable Parse_ValidWithOffsetCount_TestData() { - Assert.Equal(expected, double.Parse(value.AsReadOnlySpan(), style, provider)); + foreach (object[] inputs in Parse_Valid_TestData()) + { + yield return new object[] { inputs[0], 0, ((string)inputs[0]).Length, inputs[1], inputs[2], inputs[3] }; + } - Assert.True(double.TryParse(value.AsReadOnlySpan(), style, provider, out double result)); + const NumberStyles DefaultStyle = NumberStyles.Float | NumberStyles.AllowThousands; + yield return new object[] { "-123", 0, 3, DefaultStyle, null, (double)-12 }; + yield return new object[] { "-123", 1, 3, DefaultStyle, null, (double)123 }; + yield return new object[] { "1E23", 0, 3, DefaultStyle, null, 1E2 }; + yield return new object[] { "(123)", 1, 3, NumberStyles.AllowParentheses, new NumberFormatInfo() { NumberDecimalSeparator = "." }, 123 }; + yield return new object[] { "-Infinity", 1, 8, NumberStyles.Any, NumberFormatInfo.InvariantInfo, double.PositiveInfinity }; + } + + [Theory] + [MemberData(nameof(Parse_ValidWithOffsetCount_TestData))] + public static void Parse_Span_Valid(string value, int offset, int count, NumberStyles style, IFormatProvider provider, double expected) + { + bool isDefaultProvider = provider == null || provider == NumberFormatInfo.CurrentInfo; + double result; + if ((style & ~(NumberStyles.Float | NumberStyles.AllowThousands)) == 0 && style != NumberStyles.None) + { + // Use Parse(string) or Parse(string, IFormatProvider) + if (isDefaultProvider) + { + Assert.True(double.TryParse(value.AsSpan(offset, count), out result)); + Assert.Equal(expected, result); + + Assert.Equal(expected, double.Parse(value.AsSpan(offset, count))); + } + + Assert.Equal(expected, double.Parse(value.AsSpan(offset, count), provider: provider)); + } + + Assert.Equal(expected, double.Parse(value.AsSpan(offset, count), style, provider)); + + Assert.True(double.TryParse(value.AsSpan(offset, count), style, provider, out result)); Assert.Equal(expected, result); } @@ -103,9 +134,9 @@ namespace System.Tests { if (value != null) { - Assert.Throws(exceptionType, () => double.Parse(value.AsReadOnlySpan(), style, provider)); + Assert.Throws(exceptionType, () => double.Parse(value.AsSpan(), style, provider)); - Assert.False(double.TryParse(value.AsReadOnlySpan(), style, provider, out double result)); + Assert.False(double.TryParse(value.AsSpan(), style, provider, out double result)); Assert.Equal(0, result); } } diff --git a/external/corefx/src/System.Runtime/tests/System/ExceptionTests.cs b/external/corefx/src/System.Runtime/tests/System/ExceptionTests.cs index 02651372dc..53b152efa3 100644 --- a/external/corefx/src/System.Runtime/tests/System/ExceptionTests.cs +++ b/external/corefx/src/System.Runtime/tests/System/ExceptionTests.cs @@ -5,6 +5,8 @@ using System; using System.IO; using System.Reflection; +using System.Runtime.CompilerServices; +using System.Text.RegularExpressions; using Xunit; namespace System.Tests @@ -57,6 +59,104 @@ namespace System.Tests Assert.True(caught); } + + [Fact] + public static void ThrowStatementDoesNotResetExceptionStackLineSameMethod() + { + (string, string, int) rethrownExceptionStackFrame = (null, null, 0); + + try + { + ThrowAndRethrowSameMethod(out rethrownExceptionStackFrame); + } + catch (Exception ex) + { + VerifyCallStack(rethrownExceptionStackFrame, ex.StackTrace, 0); + } + } + + private static (string, string, int) ThrowAndRethrowSameMethod(out (string, string, int) rethrownExceptionStackFrame) + { + try + { + if (!PlatformDetection.IsFullFramework) + rethrownExceptionStackFrame = GetSourceInformation(1); + throw new Exception("Boom!"); + } + catch + { + if (PlatformDetection.IsFullFramework) + rethrownExceptionStackFrame = GetSourceInformation(1); + throw; + } + } + + [Fact] + public static void ThrowStatementDoesNotResetExceptionStackLineOtherMethod() + { + (string, string, int) rethrownExceptionStackFrame = (null, null, 0); + + try + { + ThrowAndRethrowOtherMethod(out rethrownExceptionStackFrame); + } + catch (Exception ex) + { + VerifyCallStack(rethrownExceptionStackFrame, ex.StackTrace, 1); + } + } + + private static void ThrowAndRethrowOtherMethod(out (string, string, int) rethrownExceptionStackFrame) + { + try + { + if (!PlatformDetection.IsFullFramework) + rethrownExceptionStackFrame = GetSourceInformation(1); + ThrowException(); Assert.True(false, "Workaround for Linux Release builds (https://github.com/dotnet/corefx/pull/28059#issuecomment-378335456)"); + } + catch + { + if (PlatformDetection.IsFullFramework) + rethrownExceptionStackFrame = GetSourceInformation(1); + throw; + } + rethrownExceptionStackFrame = (null, null, 0); + } + + private static void ThrowException() + { + throw new Exception("Boom!"); + } + + private static void VerifyCallStack( + (string CallerMemberName, string SourceFilePath, int SourceLineNumber) expectedStackFrame, + string reportedCallStack, int skipFrames) + { + Console.WriteLine("* ExceptionTests - reported call stack:\n{0}", reportedCallStack); + const string frameParserRegex = @"\s+at\s.+\.(?[^(.]+)\([^)]*\)\sin\s(?.*)\:line\s(?[\d]+)"; + + using (var sr = new StringReader(reportedCallStack)) + { + for (int i = 0; i < skipFrames; i++) + sr.ReadLine(); + string frame = sr.ReadLine(); + Assert.NotNull(frame); + var match = Regex.Match(frame, frameParserRegex); + Assert.True(match.Success); + Assert.Equal(expectedStackFrame.CallerMemberName, match.Groups["memberName"].Value); + Assert.Equal(expectedStackFrame.SourceFilePath, match.Groups["filePath"].Value); + Assert.Equal(expectedStackFrame.SourceLineNumber, Convert.ToInt32(match.Groups["lineNumber"].Value)); + } + } + + private static (string, string, int) GetSourceInformation( + int offset, + [CallerMemberName] string memberName = "", + [CallerFilePath] string sourceFilePath = "", + [CallerLineNumber] int sourceLineNumber = 0) + { + return (memberName, sourceFilePath, sourceLineNumber + offset); + } } public class ExceptionDerivedTests: Exception diff --git a/external/corefx/src/System.Runtime/tests/System/GCTests.cs b/external/corefx/src/System.Runtime/tests/System/GCTests.cs index 91ff25ec33..da919c5ed7 100644 --- a/external/corefx/src/System.Runtime/tests/System/GCTests.cs +++ b/external/corefx/src/System.Runtime/tests/System/GCTests.cs @@ -69,8 +69,8 @@ namespace System.Tests [InlineData(GCCollectionMode.Optimized + 1)] public static void Collection_InvalidCollectionMode_ThrowsArgumentOutOfRangeException(GCCollectionMode mode) { - AssertExtensions.Throws("mode", "Enum value was out of legal range.", () => GC.Collect(2, mode)); - AssertExtensions.Throws("mode", "Enum value was out of legal range.", () => GC.Collect(2, mode, false)); + AssertExtensions.Throws("mode", null, () => GC.Collect(2, mode)); + AssertExtensions.Throws("mode", null, () => GC.Collect(2, mode, false)); } [Fact] diff --git a/external/corefx/src/System.Runtime/tests/System/GuidTests.netcoreapp.cs b/external/corefx/src/System.Runtime/tests/System/GuidTests.netcoreapp.cs index 512f35558b..a8b9f97317 100644 --- a/external/corefx/src/System.Runtime/tests/System/GuidTests.netcoreapp.cs +++ b/external/corefx/src/System.Runtime/tests/System/GuidTests.netcoreapp.cs @@ -77,19 +77,19 @@ namespace System.Tests [MemberData(nameof(GuidStrings_Valid_TestData))] public static void Parse_Span_ValidInput_Success(string input, string format, Guid expected) { - Assert.Equal(expected, Guid.Parse(input.AsReadOnlySpan())); - Assert.Equal(expected, Guid.ParseExact(input.AsReadOnlySpan(), format.ToUpperInvariant())); - Assert.Equal(expected, Guid.ParseExact(input.AsReadOnlySpan(), format.ToLowerInvariant())); // Format should be case insensitive + Assert.Equal(expected, Guid.Parse(input.AsSpan())); + Assert.Equal(expected, Guid.ParseExact(input.AsSpan(), format.ToUpperInvariant())); + Assert.Equal(expected, Guid.ParseExact(input.AsSpan(), format.ToLowerInvariant())); // Format should be case insensitive Guid result; - Assert.True(Guid.TryParse(input.AsReadOnlySpan(), out result)); + Assert.True(Guid.TryParse(input.AsSpan(), out result)); Assert.Equal(expected, result); - Assert.True(Guid.TryParseExact(input.AsReadOnlySpan(), format.ToUpperInvariant(), out result)); + Assert.True(Guid.TryParseExact(input.AsSpan(), format.ToUpperInvariant(), out result)); Assert.Equal(expected, result); - Assert.True(Guid.TryParseExact(input.AsReadOnlySpan(), format.ToLowerInvariant(), out result)); // Format should be case insensitive + Assert.True(Guid.TryParseExact(input.AsSpan(), format.ToLowerInvariant(), out result)); // Format should be case insensitive Assert.Equal(expected, result); } @@ -107,16 +107,16 @@ namespace System.Tests { exceptionType = typeof(FormatException); } - Assert.Throws(exceptionType, () => Guid.Parse(input.AsReadOnlySpan())); + Assert.Throws(exceptionType, () => Guid.Parse(input.AsSpan())); - Assert.False(Guid.TryParse(input.AsReadOnlySpan(), out Guid result)); + Assert.False(Guid.TryParse(input.AsSpan(), out Guid result)); Assert.Equal(Guid.Empty, result); foreach (string format in new[] { "N", "D", "B", "P", "X" }) { - Assert.Throws(exceptionType, () => Guid.ParseExact(input.AsReadOnlySpan(), format)); + Assert.Throws(exceptionType, () => Guid.ParseExact(input.AsSpan(), format)); - Assert.False(Guid.TryParseExact(input.AsReadOnlySpan(), format, out result)); + Assert.False(Guid.TryParseExact(input.AsSpan(), format, out result)); Assert.Equal(Guid.Empty, result); } } diff --git a/external/corefx/src/System.Runtime/tests/System/Int16Tests.netcoreapp.cs b/external/corefx/src/System.Runtime/tests/System/Int16Tests.netcoreapp.cs index 4cd5f400c5..175b1fdcff 100644 --- a/external/corefx/src/System.Runtime/tests/System/Int16Tests.netcoreapp.cs +++ b/external/corefx/src/System.Runtime/tests/System/Int16Tests.netcoreapp.cs @@ -2,6 +2,7 @@ // 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.Collections.Generic; using System.Globalization; using Xunit; @@ -9,13 +10,30 @@ namespace System.Tests { public partial class Int16Tests { - [Theory] - [MemberData(nameof(Parse_Valid_TestData))] - public static void Parse_Span_Valid(string value, NumberStyles style, IFormatProvider provider, short expected) + public static IEnumerable Parse_ValidWithOffsetCount_TestData() { - Assert.Equal(expected, short.Parse(value.AsReadOnlySpan(), style, provider)); + foreach (object[] inputs in Parse_Valid_TestData()) + { + yield return new object[] { inputs[0], 0, ((string)inputs[0]).Length, inputs[1], inputs[2], inputs[3] }; + } - Assert.True(short.TryParse(value.AsReadOnlySpan(), style, provider, out short result)); + yield return new object[] { "-32767", 1, 5, NumberStyles.Integer, null, (short)32767 }; + yield return new object[] { "-32768", 0, 5, NumberStyles.Integer, null, (short)-3276 }; + yield return new object[] { "abc", 0, 2, NumberStyles.HexNumber, null, (short)0xab }; + yield return new object[] { "abc", 1, 2, NumberStyles.HexNumber, null, (short)0xbc }; + yield return new object[] { "(123)", 1, 3, NumberStyles.AllowParentheses, null, (short)123 }; + yield return new object[] { "123", 0, 1, NumberStyles.Integer, new NumberFormatInfo(), (short)1 }; + yield return new object[] { "$1,000", 1, 5, NumberStyles.Currency, new NumberFormatInfo() { CurrencySymbol = "$" }, (short)1000 }; + yield return new object[] { "$1,000", 0, 2, NumberStyles.Currency, new NumberFormatInfo() { CurrencySymbol = "$" }, (short)1 }; + } + + [Theory] + [MemberData(nameof(Parse_ValidWithOffsetCount_TestData))] + public static void Parse_Span_Valid(string value, int offset, int count, NumberStyles style, IFormatProvider provider, short expected) + { + Assert.Equal(expected, short.Parse(value.AsSpan(offset, count), style, provider)); + + Assert.True(short.TryParse(value.AsSpan(offset, count), style, provider, out short result)); Assert.Equal(expected, result); } @@ -25,9 +43,9 @@ namespace System.Tests { if (value != null) { - Assert.Throws(exceptionType, () => short.Parse(value.AsReadOnlySpan(), style, provider)); + Assert.Throws(exceptionType, () => short.Parse(value.AsSpan(), style, provider)); - Assert.False(short.TryParse(value.AsReadOnlySpan(), style, provider, out short result)); + Assert.False(short.TryParse(value.AsSpan(), style, provider, out short result)); Assert.Equal(0, result); } } diff --git a/external/corefx/src/System.Runtime/tests/System/Int32Tests.netcoreapp.cs b/external/corefx/src/System.Runtime/tests/System/Int32Tests.netcoreapp.cs index b4d8193a71..37e928d893 100644 --- a/external/corefx/src/System.Runtime/tests/System/Int32Tests.netcoreapp.cs +++ b/external/corefx/src/System.Runtime/tests/System/Int32Tests.netcoreapp.cs @@ -2,6 +2,7 @@ // 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.Collections.Generic; using System.Globalization; using Xunit; @@ -9,13 +10,77 @@ namespace System.Tests { public partial class Int32Tests { - [Theory] - [MemberData(nameof(Parse_Valid_TestData))] - public static void Parse_Span_Valid(string value, NumberStyles style, IFormatProvider provider, int expected) + public static IEnumerable Parse_ValidWithOffsetCount_TestData() { - Assert.Equal(expected, int.Parse(value.AsReadOnlySpan(), style, provider)); + foreach (object[] inputs in Parse_Valid_TestData()) + { + yield return new object[] { inputs[0], 0, ((string)inputs[0]).Length, inputs[1], inputs[2], inputs[3] }; + } - Assert.True(int.TryParse(value.AsReadOnlySpan(), style, provider, out int result)); + NumberFormatInfo samePositiveNegativeFormat = new NumberFormatInfo() + { + PositiveSign = "|", + NegativeSign = "|" + }; + + NumberFormatInfo emptyPositiveFormat = new NumberFormatInfo() { PositiveSign = "" }; + NumberFormatInfo emptyNegativeFormat = new NumberFormatInfo() { NegativeSign = "" }; + + // None + yield return new object[] { "2147483647", 1, 9, NumberStyles.None, null, 147483647 }; + yield return new object[] { "2147483647", 1, 1, NumberStyles.None, null, 1 }; + yield return new object[] { "123\0\0", 2, 2, NumberStyles.None, null, 3 }; + + // Hex + yield return new object[] { "abc", 0, 1, NumberStyles.HexNumber, null, 0xa }; + yield return new object[] { "ABC", 1, 1, NumberStyles.HexNumber, null, 0xB }; + yield return new object[] { "FFFFFFFF", 6, 2, NumberStyles.HexNumber, null, 0xFF }; + yield return new object[] { "FFFFFFFF", 0, 1, NumberStyles.HexNumber, null, 0xF }; + + // Currency + yield return new object[] { "-$1000", 1, 5, NumberStyles.Currency, new NumberFormatInfo() + { + CurrencySymbol = "$", + CurrencyGroupSeparator = "|", + NumberGroupSeparator = "/" + }, 1000 }; + + NumberFormatInfo emptyCurrencyFormat = new NumberFormatInfo() { CurrencySymbol = "" }; + yield return new object[] { "100", 1, 2, NumberStyles.Currency, emptyCurrencyFormat, 0 }; + yield return new object[] { "100", 0, 1, NumberStyles.Currency, emptyCurrencyFormat, 1 }; + + // If CurrencySymbol and Negative are the same, NegativeSign is preferred + NumberFormatInfo sameCurrencyNegativeSignFormat = new NumberFormatInfo() + { + NegativeSign = "|", + CurrencySymbol = "|" + }; + yield return new object[] { "1000", 1, 3, NumberStyles.AllowCurrencySymbol | NumberStyles.AllowLeadingSign, sameCurrencyNegativeSignFormat, 0 }; + yield return new object[] { "|1000", 0, 2, NumberStyles.AllowCurrencySymbol | NumberStyles.AllowLeadingSign, sameCurrencyNegativeSignFormat, -1 }; + + // Any + yield return new object[] { "123", 0, 2, NumberStyles.Any, null, 12 }; + + // AllowLeadingSign + yield return new object[] { "-2147483648", 0, 10, NumberStyles.AllowLeadingSign, null, -214748364 }; + + // AllowTrailingSign + yield return new object[] { "123-", 0, 3, NumberStyles.AllowTrailingSign, null, 123 }; + + // AllowExponent + yield return new object[] { "1E2", 0, 1, NumberStyles.AllowExponent, null, 1 }; + yield return new object[] { "1E+2", 3, 1, NumberStyles.AllowExponent, null, 2 }; + yield return new object[] { "(1E2)", 1, 3, NumberStyles.AllowExponent | NumberStyles.AllowParentheses, null, 1E2 }; + yield return new object[] { "-1E2", 1, 3, NumberStyles.AllowExponent | NumberStyles.AllowLeadingSign, null, 1E2 }; + } + + [Theory] + [MemberData(nameof(Parse_ValidWithOffsetCount_TestData))] + public static void Parse_Span_Valid(string value, int offset, int count, NumberStyles style, IFormatProvider provider, int expected) + { + Assert.Equal(expected, int.Parse(value.AsSpan(offset, count), style, provider)); + + Assert.True(int.TryParse(value.AsSpan(offset, count), style, provider, out int result)); Assert.Equal(expected, result); } @@ -25,9 +90,9 @@ namespace System.Tests { if (value != null) { - Assert.Throws(exceptionType, () => int.Parse(value.AsReadOnlySpan(), style, provider)); + Assert.Throws(exceptionType, () => int.Parse(value.AsSpan(), style, provider)); - Assert.False(int.TryParse(value.AsReadOnlySpan(), style, provider, out int result)); + Assert.False(int.TryParse(value.AsSpan(), style, provider, out int result)); Assert.Equal(0, result); } } diff --git a/external/corefx/src/System.Runtime/tests/System/Int64Tests.netcoreapp.cs b/external/corefx/src/System.Runtime/tests/System/Int64Tests.netcoreapp.cs index 7291c5ebbb..d831e0bb1d 100644 --- a/external/corefx/src/System.Runtime/tests/System/Int64Tests.netcoreapp.cs +++ b/external/corefx/src/System.Runtime/tests/System/Int64Tests.netcoreapp.cs @@ -2,6 +2,7 @@ // 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.Collections.Generic; using System.Globalization; using Xunit; @@ -9,13 +10,28 @@ namespace System.Tests { public partial class Int64Tests { - [Theory] - [MemberData(nameof(Parse_Valid_TestData))] - public static void Parse_Span_Valid(string value, NumberStyles style, IFormatProvider provider, long expected) + public static IEnumerable Parse_ValidWithOffsetCount_TestData() { - Assert.Equal(expected, long.Parse(value.AsReadOnlySpan(), style, provider)); + foreach (object[] inputs in Parse_Valid_TestData()) + { + yield return new object[] { inputs[0], 0, ((string)inputs[0]).Length, inputs[1], inputs[2], inputs[3] }; + } - Assert.True(long.TryParse(value.AsReadOnlySpan(), style, provider, out long result)); + yield return new object[] { "-9223372036854775808", 0, 19, NumberStyles.Integer, null, -922337203685477580 }; + yield return new object[] { "09223372036854775807", 1, 19, NumberStyles.Integer, null, 9223372036854775807 }; + yield return new object[] { "9223372036854775807", 0, 1, NumberStyles.Integer, null, 9 }; + yield return new object[] { "ABC", 0, 2, NumberStyles.HexNumber, null, (long)0xAB }; + yield return new object[] { "(123)", 1, 3, NumberStyles.AllowParentheses, null, (long)123 }; + yield return new object[] { "$1,000", 0, 2, NumberStyles.Currency, new NumberFormatInfo() { CurrencySymbol = "$" }, (long)1 }; + } + + [Theory] + [MemberData(nameof(Parse_ValidWithOffsetCount_TestData))] + public static void Parse_Span_Valid(string value, int offset, int count, NumberStyles style, IFormatProvider provider, long expected) + { + Assert.Equal(expected, long.Parse(value.AsSpan(offset, count), style, provider)); + + Assert.True(long.TryParse(value.AsSpan(offset, count), style, provider, out long result)); Assert.Equal(expected, result); } @@ -25,9 +41,9 @@ namespace System.Tests { if (value != null) { - Assert.Throws(exceptionType, () => long.Parse(value.AsReadOnlySpan(), style, provider)); + Assert.Throws(exceptionType, () => long.Parse(value.AsSpan(), style, provider)); - Assert.False(long.TryParse(value.AsReadOnlySpan(), style, provider, out long result)); + Assert.False(long.TryParse(value.AsSpan(), style, provider, out long result)); Assert.Equal(0, result); } } diff --git a/external/corefx/src/System.Runtime/tests/System/PseudoCustomAttributeTests.cs b/external/corefx/src/System.Runtime/tests/System/PseudoCustomAttributeTests.cs new file mode 100644 index 0000000000..e40da39285 --- /dev/null +++ b/external/corefx/src/System.Runtime/tests/System/PseudoCustomAttributeTests.cs @@ -0,0 +1,178 @@ +// 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; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Runtime.InteropServices; +using System.Runtime.Serialization; +using Xunit; + +namespace System.Tests +{ + public static partial class PseudoCustomAttributeTests + { + [Theory] + [MemberData(nameof(TestData_AttributeExists))] + [MemberData(nameof(TestData_AttributeDoesNotExist))] + public static void IsDefined(object target, Type attributeType, Attribute attribute) + { + switch (target) + { + case Type type: + Assert.Equal(attribute != null, Attribute.IsDefined(type, attributeType)); + Assert.Equal(attribute != null, Attribute.IsDefined(type, attributeType, true)); + break; + case MemberInfo memberInfo: + Assert.Equal(attribute != null, Attribute.IsDefined(memberInfo, attributeType)); + Assert.Equal(attribute != null, Attribute.IsDefined(memberInfo, attributeType, true)); + break; + case ParameterInfo parameterInfo: + Assert.Equal(attribute != null, Attribute.IsDefined(parameterInfo, attributeType)); + Assert.Equal(attribute != null, Attribute.IsDefined(parameterInfo, attributeType, true)); + break; + default: + Assert.True(false); + break; + } + } + + [Theory] + [MemberData(nameof(TestData_AttributeExists))] + [MemberData(nameof(TestData_AttributeDoesNotExist))] + public static void GetCustomAttribute(object target, Type attributeType, Attribute attribute) + { + switch (target) + { + case Type type: + Assert.Equal(attribute, Attribute.GetCustomAttribute(type, attributeType)); + Assert.Equal(attribute, Attribute.GetCustomAttribute(type, attributeType, true)); + break; + case MemberInfo memberInfo: + Assert.Equal(attribute, Attribute.GetCustomAttribute(memberInfo, attributeType)); + Assert.Equal(attribute, Attribute.GetCustomAttribute(memberInfo, attributeType, true)); + break; + case ParameterInfo parameterInfo: + Assert.Equal(attribute, Attribute.GetCustomAttribute(parameterInfo, attributeType)); + Assert.Equal(attribute, Attribute.GetCustomAttribute(parameterInfo, attributeType, true)); + break; + default: + Assert.True(false); + break; + } + } + + [Theory] + [MemberData(nameof(TestData_AttributeExists))] + [MemberData(nameof(TestData_AttributeDoesNotExist))] + public static void GetCustomAttributes(object target, Type attributeType, Attribute attribute) + { + switch (target) + { + case Type type: + Assert.Equal(attribute, Attribute.GetCustomAttributes(type, typeof(Attribute)) + .Where((e) => e.GetType() == attributeType).SingleOrDefault()); + Assert.Equal(attribute, Attribute.GetCustomAttributes(type, typeof(Attribute), true) + .Where((e) => e.GetType() == attributeType).SingleOrDefault()); + break; + case MemberInfo memberInfo: + Assert.Equal(attribute, Attribute.GetCustomAttributes(memberInfo, typeof(Attribute)) + .Where((e) => e.GetType() == attributeType).SingleOrDefault()); + Assert.Equal(attribute, Attribute.GetCustomAttributes(memberInfo, typeof(Attribute), true) + .Where((e) => e.GetType() == attributeType).SingleOrDefault()); + break; + case ParameterInfo parameterInfo: + Assert.Equal(attribute, Attribute.GetCustomAttributes(parameterInfo, typeof(Attribute)) + .Where((e) => e.GetType() == attributeType).SingleOrDefault()); + Assert.Equal(attribute, Attribute.GetCustomAttributes(parameterInfo, typeof(Attribute), true) + .Where((e) => e.GetType() == attributeType).SingleOrDefault()); + break; + default: + Assert.True(false); + break; + } + } + + private static IEnumerable TestData_AttributeExists() + { + yield return new object[] { typeof(TestTypeWithAttributes), typeof(SerializableAttribute), new SerializableAttribute() }; + yield return new object[] { typeof(ITestComInterface), typeof(ComImportAttribute), new ComImportAttribute() }; + + FieldInfo testField = typeof(TestTypeWithAttributes).GetField("_testField"); + yield return new object[] { testField, typeof(FieldOffsetAttribute), new FieldOffsetAttribute(120) }; + yield return new object[] { testField, typeof(NonSerializedAttribute), new NonSerializedAttribute() }; + yield return new object[] { testField, typeof(MarshalAsAttribute), new MarshalAsAttribute(UnmanagedType.ByValTStr) { SizeConst = 100 } }; + + MethodInfo testMethod = typeof(TestTypeWithAttributes).GetMethod("TestMethod"); + + ParameterInfo testMethodParameter = testMethod.GetParameters()[0]; + yield return new object[] { testMethodParameter, typeof(MarshalAsAttribute), new MarshalAsAttribute(UnmanagedType.LPArray) { ArraySubType = UnmanagedType.I4 } }; + yield return new object[] { testMethodParameter, typeof(InAttribute), new InAttribute() }; + yield return new object[] { testMethodParameter, typeof(OutAttribute), new OutAttribute() }; + yield return new object[] { testMethodParameter, typeof(OptionalAttribute), new OptionalAttribute() }; + + yield return new object[] { testMethod.ReturnParameter, typeof(MarshalAsAttribute), new MarshalAsAttribute(UnmanagedType.Bool) }; + + yield return new object[] { testMethod, typeof(DllImportAttribute), + new DllImportAttribute("nonexistent") { CallingConvention = CallingConvention.Winapi, CharSet = CharSet.Unicode, SetLastError = true, PreserveSig = true, EntryPoint = "MyEntryPoint" } }; + + yield return new object[] { testMethod, typeof(PreserveSigAttribute), new PreserveSigAttribute() }; + } + + private static IEnumerable TestData_AttributeDoesNotExist() + { + yield return new object[] { typeof(TestTypeWithoutAttributes), typeof(SerializableAttribute), null }; + + yield return new object[] { typeof(TestTypeWithoutAttributes), typeof(ComImportAttribute), null }; + + FieldInfo testField = typeof(TestTypeWithoutAttributes).GetField("_testField"); + yield return new object[] { testField, typeof(FieldOffsetAttribute), null }; + yield return new object[] { testField, typeof(NonSerializedAttribute), null }; + yield return new object[] { testField, typeof(MarshalAsAttribute), null }; + + MethodInfo testMethod = typeof(TestTypeWithoutAttributes).GetMethod("TestMethod"); + + ParameterInfo testMethodParameter = testMethod.GetParameters()[0]; + yield return new object[] { testMethodParameter, typeof(MarshalAsAttribute), null }; + yield return new object[] { testMethodParameter, typeof(InAttribute), null }; + yield return new object[] { testMethodParameter, typeof(OutAttribute), null }; + yield return new object[] { testMethodParameter, typeof(OptionalAttribute), null }; + + yield return new object[] { testMethod.ReturnParameter, typeof(MarshalAsAttribute), null }; + + yield return new object[] { testMethod, typeof(DllImportAttribute), null }; + + yield return new object[] { testMethod, typeof(PreserveSigAttribute), null }; + } + + [SerializableAttribute] + [StructLayoutAttribute(LayoutKind.Explicit)] + public class TestTypeWithAttributes + { + [FieldOffsetAttribute(120)] + [NonSerializedAttribute] + [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 100)] + public string _testField; + + [PreserveSigAttribute] + [return: MarshalAsAttribute(UnmanagedType.Bool)] + [DllImportAttribute("nonexistent", CallingConvention = CallingConvention.Winapi, CharSet = CharSet.Unicode, SetLastError = true, PreserveSig = true, EntryPoint = "MyEntryPoint")] + public extern static bool TestMethod([MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.I4), In, Out, Optional] int[] x); + } + + public class TestTypeWithoutAttributes + { + public string _testField; + + public static bool TestMethod(int[] x) => false; + } + + [ComImport] + [Guid("42424242-4242-4242-4242-424242424242"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] + public interface ITestComInterface + { + } + } +} diff --git a/external/corefx/src/System.Runtime/tests/System/Reflection/AssemblyNameTests.cs b/external/corefx/src/System.Runtime/tests/System/Reflection/AssemblyNameTests.cs index 0da7b72ae2..f745bdcaae 100644 --- a/external/corefx/src/System.Runtime/tests/System/Reflection/AssemblyNameTests.cs +++ b/external/corefx/src/System.Runtime/tests/System/Reflection/AssemblyNameTests.cs @@ -84,6 +84,11 @@ namespace System.Reflection.Tests AssertExtensions.Throws("path", null, () => AssemblyName.GetAssemblyName(string.Empty)); Assert.Throws(() => AssemblyName.GetAssemblyName("IDontExist")); + using (var tempFile = new TempFile(Path.GetTempFileName(), 0)) // Zero-size file + { + Assert.Throws(() => AssemblyName.GetAssemblyName(tempFile.Path)); + } + using (var tempFile = new TempFile(Path.GetTempFileName(), 42)) { Assert.Throws(() => AssemblyName.GetAssemblyName(tempFile.Path)); @@ -93,6 +98,24 @@ namespace System.Reflection.Tests Assert.Equal(new AssemblyName(a.FullName).ToString(), AssemblyName.GetAssemblyName(a.Location).ToString()); } + [Fact] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "AssemblyName.GetAssemblyName() not supported on UapAot")] + public static void GetAssemblyName_LockedFile() + { + using (var tempFile = new TempFile(Path.GetTempFileName(), 100)) + using (var fileStream = new FileStream(tempFile.Path, FileMode.Append, FileAccess.Write, FileShare.None)) + { + if (PlatformDetection.IsWindows) // File locking is Windows specific. + { + Assert.Throws(() => AssemblyName.GetAssemblyName(tempFile.Path)); + } + else + { + Assert.Throws(() => AssemblyName.GetAssemblyName(tempFile.Path)); + } + } + } + public static IEnumerable ReferenceMatchesDefinition_TestData() { yield return new object[] { new AssemblyName(typeof(AssemblyNameTests).Assembly.FullName), new AssemblyName(typeof(AssemblyNameTests).Assembly.FullName), true }; diff --git a/external/corefx/src/System.Runtime/tests/System/Reflection/PointerTests.cs b/external/corefx/src/System.Runtime/tests/System/Reflection/PointerTests.cs index 5856e745c3..731a9ef48f 100644 --- a/external/corefx/src/System.Runtime/tests/System/Reflection/PointerTests.cs +++ b/external/corefx/src/System.Runtime/tests/System/Reflection/PointerTests.cs @@ -23,6 +23,10 @@ namespace System.Reflection.Tests } } + unsafe delegate void MethodDelegate(byte* ptr, int expected); + + unsafe delegate bool* ReturnDelegate(int expected); + public unsafe class PointerTests { [Fact] @@ -90,6 +94,15 @@ namespace System.Reflection.Tests Assert.Equal(value, unchecked((int)obj.field)); } + [Fact] + public void PointerFieldSetNullValue() + { + var obj = new PointerHolder(); + FieldInfo field = typeof(PointerHolder).GetField("field"); + field.SetValue(obj, null); + Assert.Equal(0, unchecked((int)obj.field)); + } + [Theory] [MemberData(nameof(Pointers))] public void IntPtrFieldSetValue(int value) @@ -127,7 +140,6 @@ namespace System.Reflection.Tests [Theory] [MemberData(nameof(Pointers))] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Pointers through Invoke not implemented: https://github.com/dotnet/corert/issues/2113")] public void PointerPropertySetValue(int value) { var obj = new PointerHolder(); @@ -138,7 +150,6 @@ namespace System.Reflection.Tests [Theory] [MemberData(nameof(Pointers))] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Pointers through Invoke not implemented: https://github.com/dotnet/corert/issues/2113")] public void IntPtrPropertySetValue(int value) { var obj = new PointerHolder(); @@ -149,7 +160,6 @@ namespace System.Reflection.Tests [Theory] [MemberData(nameof(Pointers))] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Pointers through Invoke not implemented: https://github.com/dotnet/corert/issues/2113")] public void PointerPropertySetValue_InvalidType(int value) { var obj = new PointerHolder(); @@ -162,7 +172,6 @@ namespace System.Reflection.Tests [Theory] [MemberData(nameof(Pointers))] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Pointers through Invoke not implemented: https://github.com/dotnet/corert/issues/2113")] public void PointerPropertyGetValue(int value) { var obj = new PointerHolder(); @@ -176,7 +185,6 @@ namespace System.Reflection.Tests [Theory] [MemberData(nameof(Pointers))] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Pointers through Invoke not implemented: https://github.com/dotnet/corert/issues/2113")] public void PointerMethodParameter(int value) { var obj = new PointerHolder(); @@ -184,9 +192,16 @@ namespace System.Reflection.Tests method.Invoke(obj, new[] { Pointer.Box(unchecked((void*)value), typeof(byte*)), value }); } + [Fact] + public void PointerNullMethodParameter() + { + var obj = new PointerHolder(); + MethodInfo method = typeof(PointerHolder).GetMethod("Method"); + method.Invoke(obj, new object[] { null, 0 }); + } + [Theory] [MemberData(nameof(Pointers))] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Pointers through Invoke not implemented: https://github.com/dotnet/corert/issues/2113")] public void IntPtrMethodParameter(int value) { var obj = new PointerHolder(); @@ -196,7 +211,6 @@ namespace System.Reflection.Tests [Theory] [MemberData(nameof(Pointers))] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Pointers through Invoke not implemented: https://github.com/dotnet/corert/issues/2113")] public void PointerMethodParameter_InvalidType(int value) { var obj = new PointerHolder(); @@ -209,7 +223,6 @@ namespace System.Reflection.Tests [Theory] [MemberData(nameof(Pointers))] - [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Pointers through Invoke not implemented: https://github.com/dotnet/corert/issues/2113")] public void PointerMethodReturn(int value) { var obj = new PointerHolder(); @@ -219,5 +232,55 @@ namespace System.Reflection.Tests void* actualPointer = Pointer.Unbox(actualValue); Assert.Equal(value, unchecked((int)actualPointer)); } + + [Theory] + [MemberData(nameof(Pointers))] + public void PointerMethodDelegateParameter(int value) + { + var obj = new PointerHolder(); + MethodDelegate d = obj.Method; + d.DynamicInvoke(Pointer.Box(unchecked((void*)value), typeof(byte*)), value); + } + + [Fact] + public void PointerNullMethodDelegateParameter() + { + var obj = new PointerHolder(); + MethodDelegate d = obj.Method; + d.DynamicInvoke(null, 0); + } + + [Theory] + [MemberData(nameof(Pointers))] + public void IntPtrMethodDelegateParameter(int value) + { + var obj = new PointerHolder(); + MethodDelegate d = obj.Method; + d.DynamicInvoke((IntPtr)value, value); + } + + [Theory] + [MemberData(nameof(Pointers))] + public void PointerMethodDelegateParameter_InvalidType(int value) + { + var obj = new PointerHolder(); + MethodDelegate d = obj.Method; + AssertExtensions.Throws(null, () => + { + d.DynamicInvoke(Pointer.Box(unchecked((void*)value), typeof(long*)), value); + }); + } + + [Theory] + [MemberData(nameof(Pointers))] + public void PointerMethodDelegateReturn(int value) + { + var obj = new PointerHolder(); + ReturnDelegate d = obj.Return; + object actualValue = d.DynamicInvoke(value); + Assert.IsType(actualValue); + void* actualPointer = Pointer.Unbox(actualValue); + Assert.Equal(value, unchecked((int)actualPointer)); + } } } diff --git a/external/corefx/src/System.Runtime/tests/System/Runtime/CompilerServices/AttributesTests.cs b/external/corefx/src/System.Runtime/tests/System/Runtime/CompilerServices/AttributesTests.cs new file mode 100644 index 0000000000..876b4d367c --- /dev/null +++ b/external/corefx/src/System.Runtime/tests/System/Runtime/CompilerServices/AttributesTests.cs @@ -0,0 +1,22 @@ +// 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 Xunit; + +namespace System.Runtime.CompilerServices.Tests +{ + public static class AttributesTests + { + [Fact] + public static void TypeForwardedToAttributeTests() + { + string assemblyFullName = "MyAssembly"; + var attr = new TypeForwardedFromAttribute(assemblyFullName); + Assert.Equal(assemblyFullName, attr.AssemblyFullName); + + AssertExtensions.Throws("assemblyFullName", () => new TypeForwardedFromAttribute(null)); + AssertExtensions.Throws("assemblyFullName", () => new TypeForwardedFromAttribute("")); + } + } +} diff --git a/external/corefx/src/System.Runtime/tests/System/Runtime/CompilerServices/RuntimeHelpersTests.cs b/external/corefx/src/System.Runtime/tests/System/Runtime/CompilerServices/RuntimeHelpersTests.cs index 00cb43b3f8..30d42613aa 100644 --- a/external/corefx/src/System.Runtime/tests/System/Runtime/CompilerServices/RuntimeHelpersTests.cs +++ b/external/corefx/src/System.Runtime/tests/System/Runtime/CompilerServices/RuntimeHelpersTests.cs @@ -3,6 +3,9 @@ // See the LICENSE file in the project root for more information. using System; +using System.Reflection; +using System.Collections; +using System.Collections.Generic; using System.Runtime.CompilerServices; using Xunit; @@ -110,6 +113,73 @@ namespace System.Runtime.CompilerServices.Tests { public static string S; } + + [Fact] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework | TargetFrameworkMonikers.Mono)] + public static void PrepareMethod() + { + foreach (MethodInfo m in typeof(RuntimeHelpersTests).GetMethods()) + RuntimeHelpers.PrepareMethod(m.MethodHandle); + + Assert.Throws(() => RuntimeHelpers.PrepareMethod(default(RuntimeMethodHandle))); + Assert.ThrowsAny(() => RuntimeHelpers.PrepareMethod(typeof(IList).GetMethod("Add").MethodHandle)); + } + + [Fact] + [SkipOnTargetFramework(TargetFrameworkMonikers.Mono)] + public static void PrepareGenericMethod() + { + Assert.Throws(() => RuntimeHelpers.PrepareMethod(default(RuntimeMethodHandle), null)); + + // + // Type instantiations + // + + // Generic definition with instantiation is valid + RuntimeHelpers.PrepareMethod(typeof(List<>).GetMethod("Add").MethodHandle, + new RuntimeTypeHandle[] { typeof(TestStruct).TypeHandle }); + + // Instantiated method without instantiation is valid + RuntimeHelpers.PrepareMethod(typeof(List).GetMethod("Add").MethodHandle, + null); + + // Generic definition without instantiation is invalid + Assert.Throws(() => RuntimeHelpers.PrepareMethod(typeof(List<>).GetMethod("Add").MethodHandle, + null)); + + // Wrong instantiation + Assert.Throws(() => RuntimeHelpers.PrepareMethod(typeof(List<>).GetMethod("Add").MethodHandle, + new RuntimeTypeHandle[] { typeof(TestStruct).TypeHandle, typeof(TestStruct).TypeHandle })); + + // + // Method instantiations + // + + // Generic definition with instantiation is valid + RuntimeHelpers.PrepareMethod(typeof(Array).GetMethod("Resize").MethodHandle, + new RuntimeTypeHandle[] { typeof(TestStruct).TypeHandle }); + + // Instantiated method without instantiation is valid + RuntimeHelpers.PrepareMethod(typeof(Array).GetMethod("Resize") + .MakeGenericMethod(new Type[] { typeof(TestStruct) }).MethodHandle, + null); + + // Generic definition without instantiation is invalid + Assert.Throws(() => RuntimeHelpers.PrepareMethod(typeof(Array).GetMethod("Resize").MethodHandle, + null)); + + // Wrong instantiation + Assert.Throws(() => RuntimeHelpers.PrepareMethod(typeof(Array).GetMethod("Resize").MethodHandle, + new RuntimeTypeHandle[] { typeof(TestStruct).TypeHandle, typeof(TestStruct).TypeHandle })); + } + + [Fact] + public static void PrepareDelegate() + { + RuntimeHelpers.PrepareDelegate((Action)(() => { })); + RuntimeHelpers.PrepareDelegate((Func)(() => 1) + (Func)(() => 2)); + RuntimeHelpers.PrepareDelegate(null); + } } public struct Age diff --git a/external/corefx/src/System.Runtime/tests/System/Runtime/ExceptionServices/HandleProcessCorruptedStateExceptions.cs b/external/corefx/src/System.Runtime/tests/System/Runtime/ExceptionServices/HandleProcessCorruptedStateExceptions.cs index 00b901ff16..03f045e904 100644 --- a/external/corefx/src/System.Runtime/tests/System/Runtime/ExceptionServices/HandleProcessCorruptedStateExceptions.cs +++ b/external/corefx/src/System.Runtime/tests/System/Runtime/ExceptionServices/HandleProcessCorruptedStateExceptions.cs @@ -40,14 +40,15 @@ namespace System.Runtime.ExceptionServices.Tests [ActiveIssue("https://github.com/dotnet/corefx/issues/21123", TargetFrameworkMonikers.Uap)] public static void ProcessExit_Called() { - using (Process p = RemoteInvoke(() => { CauseAVInNative(); return SuccessExitCode; }).Process) + using (RemoteInvokeHandle handle = RemoteInvoke(() => { CauseAVInNative(); return SuccessExitCode; }, new RemoteInvokeOptions { CheckExitCode = false })) { + Process p = handle.Process; p.WaitForExit(); if (PlatformDetection.IsFullFramework) Assert.Equal(SuccessExitCode, p.ExitCode); else Assert.NotEqual(SuccessExitCode, p.ExitCode); - } + } } } } diff --git a/external/corefx/src/System.Runtime/tests/System/SByteTests.netcoreapp.cs b/external/corefx/src/System.Runtime/tests/System/SByteTests.netcoreapp.cs index 2c1ad7abd6..f95a6daae3 100644 --- a/external/corefx/src/System.Runtime/tests/System/SByteTests.netcoreapp.cs +++ b/external/corefx/src/System.Runtime/tests/System/SByteTests.netcoreapp.cs @@ -2,6 +2,7 @@ // 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.Collections.Generic; using System.Globalization; using Xunit; @@ -9,13 +10,28 @@ namespace System.Tests { public partial class SByteTests { - [Theory] - [MemberData(nameof(Parse_Valid_TestData))] - public static void Parse_Span_Valid(string value, NumberStyles style, IFormatProvider provider, sbyte expected) + public static IEnumerable Parse_ValidWithOffsetCount_TestData() { - Assert.Equal(expected, sbyte.Parse(value.AsReadOnlySpan(), style, provider)); + foreach (object[] inputs in Parse_Valid_TestData()) + { + yield return new object[] { inputs[0], 0, ((string)inputs[0]).Length, inputs[1], inputs[2], inputs[3] }; + } - Assert.True(sbyte.TryParse(value.AsReadOnlySpan(), style, provider, out sbyte result)); + yield return new object[] { "-123", 0, 2, NumberStyles.Integer, null, (sbyte)-1 }; + yield return new object[] { "-123", 1, 3, NumberStyles.Integer, null, (sbyte)123 }; + yield return new object[] { "12", 0, 1, NumberStyles.HexNumber, null, (sbyte)0x1 }; + yield return new object[] { "12", 1, 1, NumberStyles.HexNumber, null, (sbyte)0x2 }; + yield return new object[] { "(123)", 1, 3, NumberStyles.AllowParentheses, null, (sbyte)123 }; + yield return new object[] { "$100", 1, 1, NumberStyles.Currency, new NumberFormatInfo() { CurrencySymbol = "$" }, (sbyte)1 }; + } + + [Theory] + [MemberData(nameof(Parse_ValidWithOffsetCount_TestData))] + public static void Parse_Span_Valid(string value, int offset, int count, NumberStyles style, IFormatProvider provider, sbyte expected) + { + Assert.Equal(expected, sbyte.Parse(value.AsSpan(offset, count), style, provider)); + + Assert.True(sbyte.TryParse(value.AsSpan(offset, count), style, provider, out sbyte result)); Assert.Equal(expected, result); } @@ -25,9 +41,9 @@ namespace System.Tests { if (value != null) { - Assert.Throws(exceptionType, () => sbyte.Parse(value.AsReadOnlySpan(), style, provider)); + Assert.Throws(exceptionType, () => sbyte.Parse(value.AsSpan(), style, provider)); - Assert.False(sbyte.TryParse(value.AsReadOnlySpan(), style, provider, out sbyte result)); + Assert.False(sbyte.TryParse(value.AsSpan(), style, provider, out sbyte result)); Assert.Equal(0, result); } } diff --git a/external/corefx/src/System.Runtime/tests/System/SingleTests.cs b/external/corefx/src/System.Runtime/tests/System/SingleTests.cs index 576b5eb383..5dd6b7b01c 100644 --- a/external/corefx/src/System.Runtime/tests/System/SingleTests.cs +++ b/external/corefx/src/System.Runtime/tests/System/SingleTests.cs @@ -211,8 +211,10 @@ namespace System.Tests [InlineData((float)789, (float)-789, false)] [InlineData((float)789, (float)0, false)] [InlineData(float.NaN, float.NaN, true)] + [InlineData(float.NaN, -float.NaN, true)] [InlineData((float)789, (double)789, false)] [InlineData((float)789, "789", false)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "The fix was made in coreclr that is not in netfx. See https://github.com/dotnet/coreclr/issues/6237")] public static void Equals(float f1, object value, bool expected) { if (value is float f2) @@ -325,8 +327,7 @@ namespace System.Tests public static IEnumerable Parse_Valid_TestData() { - // Defaults: AllowLeadingWhite | AllowTrailingWhite | AllowLeadingSign | AllowDecimalPoint | AllowExponent | AllowThousands - NumberStyles defaultStyle = NumberStyles.Float; + NumberStyles defaultStyle = NumberStyles.Float | NumberStyles.AllowThousands; NumberFormatInfo emptyFormat = NumberFormatInfo.CurrentInfo; @@ -373,7 +374,7 @@ namespace System.Tests { bool isDefaultProvider = provider == null || provider == NumberFormatInfo.CurrentInfo; float result; - if ((style & ~NumberStyles.Integer) == 0 && style != NumberStyles.None) + if ((style & ~(NumberStyles.Float | NumberStyles.AllowThousands)) == 0 && style != NumberStyles.None) { // Use Parse(string) or Parse(string, IFormatProvider) if (isDefaultProvider) @@ -436,7 +437,7 @@ namespace System.Tests { bool isDefaultProvider = provider == null || provider == NumberFormatInfo.CurrentInfo; float result; - if ((style & ~NumberStyles.Integer) == 0 && style != NumberStyles.None && (style & NumberStyles.AllowLeadingWhite) == (style & NumberStyles.AllowTrailingWhite)) + if ((style & ~(NumberStyles.Float | NumberStyles.AllowThousands)) == 0 && style != NumberStyles.None && (style & NumberStyles.AllowLeadingWhite) == (style & NumberStyles.AllowTrailingWhite)) { // Use Parse(string) or Parse(string, IFormatProvider) if (isDefaultProvider) diff --git a/external/corefx/src/System.Runtime/tests/System/SingleTests.netcoreapp.cs b/external/corefx/src/System.Runtime/tests/System/SingleTests.netcoreapp.cs index 2d68e56c1f..50382e5ccc 100644 --- a/external/corefx/src/System.Runtime/tests/System/SingleTests.netcoreapp.cs +++ b/external/corefx/src/System.Runtime/tests/System/SingleTests.netcoreapp.cs @@ -87,13 +87,47 @@ namespace System.Tests Assert.Equal(expected, float.IsSubnormal(d)); } - [Theory] - [MemberData(nameof(Parse_Valid_TestData))] - public static void Parse_Span_Valid(string value, NumberStyles style, IFormatProvider provider, float expected) + public static IEnumerable Parse_ValidWithOffsetCount_TestData() { - Assert.Equal(expected, float.Parse(value.AsReadOnlySpan(), style, provider)); + foreach (object[] inputs in Parse_Valid_TestData()) + { + yield return new object[] { inputs[0], 0, ((string)inputs[0]).Length, inputs[1], inputs[2], inputs[3] }; + } - Assert.True(float.TryParse(value.AsReadOnlySpan(), style, provider, out float result)); + const NumberStyles DefaultStyle = NumberStyles.Float | NumberStyles.AllowThousands; + + yield return new object[] { "-123", 1, 3, DefaultStyle, null, (float)123 }; + yield return new object[] { "-123", 0, 3, DefaultStyle, null, (float)-12 }; + yield return new object[] { "1E23", 0, 3, DefaultStyle, null, (float)1E2 }; + yield return new object[] { "123", 0, 2, NumberStyles.Float, new NumberFormatInfo(), (float)12 }; + yield return new object[] { "$1,000", 1, 3, NumberStyles.Currency, new NumberFormatInfo() { CurrencySymbol = "$", CurrencyGroupSeparator = "," }, (float)10 }; + yield return new object[] { "(123)", 1, 3, NumberStyles.AllowParentheses, new NumberFormatInfo() { NumberDecimalSeparator = "." }, (float)123 }; + yield return new object[] { "-Infinity", 1, 8, NumberStyles.Any, NumberFormatInfo.InvariantInfo, float.PositiveInfinity }; + } + + [Theory] + [MemberData(nameof(Parse_ValidWithOffsetCount_TestData))] + public static void Parse_Span_Valid(string value, int offset, int count, NumberStyles style, IFormatProvider provider, float expected) + { + bool isDefaultProvider = provider == null || provider == NumberFormatInfo.CurrentInfo; + float result; + if ((style & ~(NumberStyles.Float | NumberStyles.AllowThousands)) == 0 && style != NumberStyles.None) + { + // Use Parse(string) or Parse(string, IFormatProvider) + if (isDefaultProvider) + { + Assert.True(float.TryParse(value.AsSpan(offset, count), out result)); + Assert.Equal(expected, result); + + Assert.Equal(expected, float.Parse(value.AsSpan(offset, count))); + } + + Assert.Equal(expected, float.Parse(value.AsSpan(offset, count), provider: provider)); + } + + Assert.Equal(expected, float.Parse(value.AsSpan(offset, count), style, provider)); + + Assert.True(float.TryParse(value.AsSpan(offset, count), style, provider, out result)); Assert.Equal(expected, result); } @@ -103,9 +137,9 @@ namespace System.Tests { if (value != null) { - Assert.Throws(exceptionType, () => float.Parse(value.AsReadOnlySpan(), style, provider)); + Assert.Throws(exceptionType, () => float.Parse(value.AsSpan(), style, provider)); - Assert.False(float.TryParse(value.AsReadOnlySpan(), style, provider, out float result)); + Assert.False(float.TryParse(value.AsSpan(), style, provider, out float result)); Assert.Equal(0, result); } } diff --git a/external/corefx/src/System.Runtime/tests/System/StringGetHashCodeTests.cs b/external/corefx/src/System.Runtime/tests/System/StringGetHashCodeTests.cs new file mode 100644 index 0000000000..1c868b58ac --- /dev/null +++ b/external/corefx/src/System.Runtime/tests/System/StringGetHashCodeTests.cs @@ -0,0 +1,64 @@ +// 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.Collections.Generic; +using System.Diagnostics; +using System.Globalization; +using Xunit; + +namespace System.Tests +{ + public class StringGetHashCodeTests : RemoteExecutorTestBase + { + /// + /// Ensure that hash codes are randomized by getting the hash in two processes + /// and confirming it is different (modulo possible values of int). + /// If the legacy hash codes are being returned, it will not be different. + /// + [Theory] + [MemberData(nameof(GetHashCode_TestData))] + public void GetHashCodeWithStringComparer_UseSameStringInTwoProcesses_ReturnsDifferentHashCodes(int getHashCodeIndex) + { + Func method = (parentHash, i) => int.Parse(parentHash) != s_GetHashCodes[int.Parse(i)]() ? SuccessExitCode : -1; + int parentHashCode = s_GetHashCodes[getHashCodeIndex](); + int exitCode, retry = 0; + do + { + // very small chance the child and parent hashcode are the same. To further reduce chance of collision we try up to 3 times + using (RemoteInvokeHandle handle = RemoteInvoke(method, parentHashCode.ToString(), getHashCodeIndex.ToString(), new RemoteInvokeOptions { CheckExitCode = false })) + { + exitCode = handle.ExitCode; + retry++; + } + } while (exitCode != SuccessExitCode && retry < 3); + Assert.Equal(SuccessExitCode, exitCode); + } + + public static IEnumerable GetHashCode_TestData() + { + for (int i = 0; i < s_GetHashCodes.Length; i++) + { + yield return new object[] { i }; + } + } + + private static readonly Func[] s_GetHashCodes = { + () => { return StringComparer.CurrentCulture.GetHashCode("abc"); }, + () => { return StringComparer.CurrentCultureIgnoreCase.GetHashCode("abc"); }, + () => { return StringComparer.InvariantCulture.GetHashCode("abc"); }, + () => { return StringComparer.InvariantCultureIgnoreCase.GetHashCode("abc"); }, + () => { return StringComparer.Ordinal.GetHashCode("abc"); }, + () => { return StringComparer.OrdinalIgnoreCase.GetHashCode("abc"); }, + () => { return "abc".GetHashCode(); }, + () => { return CultureInfo.CurrentCulture.CompareInfo.GetHashCode("abc", CompareOptions.IgnoreCase); }, + () => { return CultureInfo.CurrentCulture.CompareInfo.GetHashCode("abc", CompareOptions.IgnoreKanaType); }, + () => { return CultureInfo.CurrentCulture.CompareInfo.GetHashCode("abc", CompareOptions.IgnoreNonSpace); }, + () => { return CultureInfo.CurrentCulture.CompareInfo.GetHashCode("abc", CompareOptions.IgnoreSymbols); }, + () => { return CultureInfo.CurrentCulture.CompareInfo.GetHashCode("abc", CompareOptions.IgnoreWidth); }, + () => { return CultureInfo.CurrentCulture.CompareInfo.GetHashCode("abc", CompareOptions.None); }, + () => { return CultureInfo.CurrentCulture.CompareInfo.GetHashCode("abc", CompareOptions.Ordinal); }, + () => { return CultureInfo.CurrentCulture.CompareInfo.GetHashCode("abc", CompareOptions.OrdinalIgnoreCase); } + }; + } +} diff --git a/external/corefx/src/System.Runtime/tests/System/StringTests.cs.REMOVED.git-id b/external/corefx/src/System.Runtime/tests/System/StringTests.cs.REMOVED.git-id index 86e1ba7bf0..409fbb78cd 100644 --- a/external/corefx/src/System.Runtime/tests/System/StringTests.cs.REMOVED.git-id +++ b/external/corefx/src/System.Runtime/tests/System/StringTests.cs.REMOVED.git-id @@ -1 +1 @@ -e01112b773871db0e5ce1fffdf840636d9e1fabd \ No newline at end of file +cc83dfa42505a501057a7f8d1f405e9a8bdf2177 \ No newline at end of file diff --git a/external/corefx/src/System.Runtime/tests/System/StringTests.netcoreapp.cs b/external/corefx/src/System.Runtime/tests/System/StringTests.netcoreapp.cs index 8f14fe13e6..52f088e546 100644 --- a/external/corefx/src/System.Runtime/tests/System/StringTests.netcoreapp.cs +++ b/external/corefx/src/System.Runtime/tests/System/StringTests.netcoreapp.cs @@ -20,6 +20,13 @@ namespace System.Tests Assert.Same(string.Empty, new string(new ReadOnlySpan(new char[length], offset, 0))); } + [Fact] + public static unsafe void Ctor_CharSpan_Empty() + { + Assert.Same(string.Empty, new string((ReadOnlySpan)null)); + Assert.Same(string.Empty, new string(ReadOnlySpan.Empty)); + } + [Theory] [InlineData(new char[] { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', '\0' }, 0, 8, "abcdefgh")] [InlineData(new char[] { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', '\0', 'i', 'j', 'k' }, 0, 12, "abcdefgh\0ijk")] @@ -214,6 +221,7 @@ namespace System.Tests public static void Contains(string s, string value, StringComparison comparisonType, bool expected) { Assert.Equal(expected, s.Contains(value, comparisonType)); + Assert.Equal(expected, s.AsSpan().Contains(value, comparisonType)); } [Fact] @@ -225,6 +233,7 @@ namespace System.Tests CultureInfo.CurrentCulture = new CultureInfo("tr-TR"); Assert.True(source.Contains("\u0069\u0069", StringComparison.CurrentCultureIgnoreCase)); + Assert.True(source.AsSpan().Contains("\u0069\u0069", StringComparison.CurrentCultureIgnoreCase)); return SuccessExitCode; }, str).Dispose(); @@ -234,6 +243,7 @@ namespace System.Tests CultureInfo.CurrentCulture = new CultureInfo("en-US"); Assert.False(source.Contains("\u0069\u0069", StringComparison.CurrentCultureIgnoreCase)); + Assert.False(source.AsSpan().Contains("\u0069\u0069", StringComparison.CurrentCultureIgnoreCase)); return SuccessExitCode; }, str).Dispose(); @@ -607,6 +617,9 @@ namespace System.Tests public static void IndexOf_SingleLetter(string s, char target, StringComparison stringComparison, int expected) { Assert.Equal(expected, s.IndexOf(target, stringComparison)); + var charArray = new char[1]; + charArray[0] = target; + Assert.Equal(expected, s.AsSpan().IndexOf(charArray, stringComparison)); } [Fact] @@ -624,12 +637,23 @@ namespace System.Tests Assert.Equal(19, s.IndexOf(value, StringComparison.Ordinal)); Assert.Equal(19, s.IndexOf(value, StringComparison.OrdinalIgnoreCase)); + ReadOnlySpan span = s.AsSpan(); + Assert.Equal(19, span.IndexOf(new char[] { value }, StringComparison.CurrentCulture)); + Assert.Equal(4, span.IndexOf(new char[] { value }, StringComparison.CurrentCultureIgnoreCase)); + Assert.Equal(19, span.IndexOf(new char[] { value }, StringComparison.Ordinal)); + Assert.Equal(19, span.IndexOf(new char[] { value }, StringComparison.OrdinalIgnoreCase)); + value = '\u0131'; Assert.Equal(10, s.IndexOf(value, StringComparison.CurrentCulture)); Assert.Equal(8, s.IndexOf(value, StringComparison.CurrentCultureIgnoreCase)); Assert.Equal(10, s.IndexOf(value, StringComparison.Ordinal)); Assert.Equal(10, s.IndexOf(value, StringComparison.OrdinalIgnoreCase)); + Assert.Equal(10, span.IndexOf(new char[] { value }, StringComparison.CurrentCulture)); + Assert.Equal(8, span.IndexOf(new char[] { value }, StringComparison.CurrentCultureIgnoreCase)); + Assert.Equal(10, span.IndexOf(new char[] { value }, StringComparison.Ordinal)); + Assert.Equal(10, span.IndexOf(new char[] { value }, StringComparison.OrdinalIgnoreCase)); + return SuccessExitCode; }).Dispose(); } diff --git a/external/corefx/src/System.Runtime/tests/System/Text/StringBuilderTests.cs b/external/corefx/src/System.Runtime/tests/System/Text/StringBuilderTests.cs index e68d4046c2..d5e57a118e 100644 --- a/external/corefx/src/System.Runtime/tests/System/Text/StringBuilderTests.cs +++ b/external/corefx/src/System.Runtime/tests/System/Text/StringBuilderTests.cs @@ -979,6 +979,40 @@ namespace System.Text.Tests Assert.Same(string.Empty, builder.ToString()); } + [Fact] + public static void Clear_Empty_CapacityNotZero() + { + var builder = new StringBuilder(); + builder.Clear(); + Assert.NotEqual(0, builder.Capacity); + } + + [Fact] + public static void Clear_Empty_CapacityStaysUnchanged() + { + var sb = new StringBuilder(14); + sb.Clear(); + Assert.Equal(14, sb.Capacity); + } + + [Fact] + public static void Clear_Full_CapacityStaysUnchanged() + { + var sb = new StringBuilder(14); + sb.Append("Hello World!!!"); + sb.Clear(); + Assert.Equal(14, sb.Capacity); + } + + [Fact] + public static void Clear_AtMaxCapacity_CapacityStaysUnchanged() + { + var builder = new StringBuilder(14, 14); + builder.Append("Hello World!!!"); + builder.Clear(); + Assert.Equal(14, builder.Capacity); + } + [Theory] [InlineData("Hello", 0, new char[] { '\0', '\0', '\0', '\0', '\0' }, 0, 5, new char[] { 'H', 'e', 'l', 'l', 'o' })] [InlineData("Hello", 0, new char[] { '\0', '\0', '\0', '\0', '\0', '\0' }, 1, 5, new char[] { '\0', 'H', 'e', 'l', 'l', 'o' })] diff --git a/external/corefx/src/System.Runtime/tests/System/Text/StringBuilderTests.netcoreapp.cs b/external/corefx/src/System.Runtime/tests/System/Text/StringBuilderTests.netcoreapp.cs index acc91e312c..848cd2888b 100644 --- a/external/corefx/src/System.Runtime/tests/System/Text/StringBuilderTests.netcoreapp.cs +++ b/external/corefx/src/System.Runtime/tests/System/Text/StringBuilderTests.netcoreapp.cs @@ -141,6 +141,67 @@ namespace System.Text.Tests Assert.Equal(expected, builder.ToString()); } + [Theory] + [InlineData(1)] + [InlineData(10000)] + public static void Clear_AppendAndInsertBeforeClearManyTimes_CapacityStaysWithinRange(int times) + { + var builder = new StringBuilder(); + var originalCapacity = builder.Capacity; + var s = new string(' ', 10); + int oldLength = 0; + for (int i = 0; i < times; i++) + { + builder.Append(s); + builder.Append(s); + builder.Append(s); + builder.Insert(0, s); + builder.Insert(0, s); + oldLength = builder.Length; + + builder.Clear(); + } + Assert.InRange(builder.Capacity, 1, oldLength * 1.2); + } + + [Fact] + public static void Clear_InitialCapacityMuchLargerThanLength_CapacityReducedToInitialCapacity() + { + var builder = new StringBuilder(100); + var initialCapacity = builder.Capacity; + builder.Append(new string('a', 40)); + builder.Insert(0, new string('a', 10)); + builder.Insert(0, new string('a', 10)); + builder.Insert(0, new string('a', 10)); + var oldCapacity = builder.Capacity; + var oldLength = builder.Length; + builder.Clear(); + Assert.NotEqual(oldCapacity, builder.Capacity); + Assert.Equal(initialCapacity, builder.Capacity); + Assert.NotInRange(builder.Capacity, 1, oldLength * 1.2); + Assert.InRange(builder.Capacity, 1, Math.Max(initialCapacity, oldLength * 1.2)); + } + + [Fact] + public static void Clear_StringBuilderHasTwoChunks_OneChunkIsEmpty_ClearReducesCapacity() + { + var sb = new StringBuilder(string.Empty); + int initialCapacity = sb.Capacity; + for (int i = 0; i < initialCapacity; i++) + { + sb.Append('a'); + } + sb.Insert(0, 'a'); + while (sb.Length > 1) + { + sb.Remove(1, 1); + } + int oldCapacity = sb.Capacity; + sb.Clear(); + Assert.Equal(oldCapacity - 1, sb.Capacity); + Assert.Equal(initialCapacity, sb.Capacity); + } + [Theory] [InlineData("Hello", 0, new char[] { '\0', '\0', '\0', '\0', '\0' }, 5, new char[] { 'H', 'e', 'l', 'l', 'o' })] [InlineData("Hello", 0, new char[] { '\0', '\0', '\0', '\0' }, 4, new char[] { 'H', 'e', 'l', 'l' })] @@ -325,7 +386,7 @@ namespace System.Text.Tests [MemberData(nameof(Equals_String_TestData))] public static void Equals(StringBuilder sb1, string value, bool expected) { - Assert.Equal(expected, sb1.Equals(value.AsReadOnlySpan())); + Assert.Equal(expected, sb1.Equals(value.AsSpan())); } } } diff --git a/external/corefx/src/System.Runtime/tests/System/Threading/WaitHandleTests.cs b/external/corefx/src/System.Runtime/tests/System/Threading/WaitHandleTests.cs index 983011c9dd..d0947181ca 100644 --- a/external/corefx/src/System.Runtime/tests/System/Threading/WaitHandleTests.cs +++ b/external/corefx/src/System.Runtime/tests/System/Threading/WaitHandleTests.cs @@ -251,7 +251,6 @@ namespace System.Threading.Tests [Theory] [MemberData(nameof(SignalAndWait_MemberData))] - [PlatformSpecific(TestPlatforms.Windows)] // other platforms don't support SignalAndWait private static void SignalAndWait( WaitHandle toSignal, AutoResetEvent toWaitOn, @@ -296,7 +295,6 @@ namespace System.Threading.Tests } [Fact] - [PlatformSpecific(TestPlatforms.Windows)] // other platforms don't support SignalAndWait public static void SignalAndWait_InvalidArgs() { var toSignal = new ManualResetEvent(false); @@ -320,17 +318,6 @@ namespace System.Threading.Tests Assert.False(toSignal.WaitOne(0)); } - [Fact] - [PlatformSpecific(TestPlatforms.AnyUnix)] // Unix doesn't support SignalAndWait - public static void SignalAndWait_PlatformNotSupported() - { - var toSignal = new ManualResetEvent(false); - var toWaitOn = new ManualResetEvent(true); - Assert.Throws(() => WaitHandle.SignalAndWait(toSignal, toWaitOn)); - Assert.Throws(() => WaitHandle.SignalAndWait(toSignal, toWaitOn, 0, false)); - Assert.Throws(() => WaitHandle.SignalAndWait(toSignal, toWaitOn, TimeSpan.Zero, false)); - } - [Fact] public static void Close() { diff --git a/external/corefx/src/System.Runtime/tests/System/TimeSpanTests.netcoreapp.cs b/external/corefx/src/System.Runtime/tests/System/TimeSpanTests.netcoreapp.cs index c7b5a82eaa..1478e6855f 100644 --- a/external/corefx/src/System.Runtime/tests/System/TimeSpanTests.netcoreapp.cs +++ b/external/corefx/src/System.Runtime/tests/System/TimeSpanTests.netcoreapp.cs @@ -111,11 +111,27 @@ namespace System.Tests AssertExtensions.Throws("divisor", () => TimeSpan.FromDays(1).Divide(double.NaN)); } - [Theory] - [MemberData(nameof(Parse_Valid_TestData))] - public static void Parse_Span(string inputString, IFormatProvider provider, TimeSpan expected) + public static IEnumerable Parse_ValidWithOffsetCount_TestData() { - ReadOnlySpan input = inputString.AsReadOnlySpan(); + foreach (object[] inputs in Parse_Valid_TestData()) + { + yield return new object[] { inputs[0], 0, ((string)inputs[0]).Length, inputs[1], inputs[2] }; + } + + yield return new object[] { " 12:24:02 ", 5, 8, null, new TimeSpan(0, 12, 24, 2, 0) }; + yield return new object[] { " 12:24:02 ", 6, 7, null, new TimeSpan(0, 2, 24, 2, 0) }; + yield return new object[] { " 12:24:02 ", 6, 6, null, new TimeSpan(0, 2, 24, 0, 0) }; + yield return new object[] { "12:24:02.01", 0, 8, CultureInfo.InvariantCulture, new TimeSpan(0, 12, 24, 2, 0) }; + yield return new object[] { "1:1:1.00000001", 0, 7, CultureInfo.InvariantCulture, new TimeSpan(1, 1, 1) }; + yield return new object[] { "1:1:.00000001", 0, 6, CultureInfo.InvariantCulture, new TimeSpan(36600000000) }; + yield return new object[] { "24:00:00", 1, 7, null, new TimeSpan(4, 0, 0) }; + } + + [Theory] + [MemberData(nameof(Parse_ValidWithOffsetCount_TestData))] + public static void Parse_Span(string inputString, int offset, int count, IFormatProvider provider, TimeSpan expected) + { + ReadOnlySpan input = inputString.AsSpan(offset, count); TimeSpan result; Assert.Equal(expected, TimeSpan.Parse(input, provider)); @@ -125,7 +141,7 @@ namespace System.Tests // Also negate if (!char.IsWhiteSpace(input[0])) { - input = ("-" + inputString).AsReadOnlySpan(); + input = ("-" + inputString.Substring(offset, count)).AsSpan(); expected = -expected; Assert.Equal(expected, TimeSpan.Parse(input, provider)); @@ -140,8 +156,8 @@ namespace System.Tests { if (inputString != null) { - Assert.Throws(exceptionType, () => TimeSpan.Parse(inputString.AsReadOnlySpan(), provider)); - Assert.False(TimeSpan.TryParse(inputString.AsReadOnlySpan(), provider, out TimeSpan result)); + Assert.Throws(exceptionType, () => TimeSpan.Parse(inputString.AsSpan(), provider)); + Assert.False(TimeSpan.TryParse(inputString.AsSpan(), provider, out TimeSpan result)); Assert.Equal(TimeSpan.Zero, result); } } @@ -152,7 +168,7 @@ namespace System.Tests [MemberData(nameof(ParseExact_Valid_TestData))] public static void ParseExact_Span_Valid(string inputString, string format, TimeSpan expected) { - ReadOnlySpan input = inputString.AsReadOnlySpan(); + ReadOnlySpan input = inputString.AsSpan(); TimeSpan result; Assert.Equal(expected, TimeSpan.ParseExact(input, format, new CultureInfo("en-US"))); @@ -188,13 +204,13 @@ namespace System.Tests { if (inputString != null && format != null) { - Assert.Throws(exceptionType, () => TimeSpan.ParseExact(inputString.AsReadOnlySpan(), format, new CultureInfo("en-US"))); + Assert.Throws(exceptionType, () => TimeSpan.ParseExact(inputString.AsSpan(), format, new CultureInfo("en-US"))); TimeSpan result; - Assert.False(TimeSpan.TryParseExact(inputString.AsReadOnlySpan(), format, new CultureInfo("en-US"), out result)); + Assert.False(TimeSpan.TryParseExact(inputString.AsSpan(), format, new CultureInfo("en-US"), out result)); Assert.Equal(TimeSpan.Zero, result); - Assert.False(TimeSpan.TryParseExact(inputString.AsReadOnlySpan(), new[] { format }, new CultureInfo("en-US"), out result)); + Assert.False(TimeSpan.TryParseExact(inputString.AsSpan(), new[] { format }, new CultureInfo("en-US"), out result)); Assert.Equal(TimeSpan.Zero, result); } } @@ -204,11 +220,11 @@ namespace System.Tests { TimeSpan result; - AssertExtensions.Throws("formats", () => TimeSpan.ParseExact("12:34:56".AsReadOnlySpan(), (string[])null, null)); - Assert.False(TimeSpan.TryParseExact("12:34:56".AsReadOnlySpan(), (string[])null, null, out result)); + AssertExtensions.Throws("formats", () => TimeSpan.ParseExact("12:34:56".AsSpan(), (string[])null, null)); + Assert.False(TimeSpan.TryParseExact("12:34:56".AsSpan(), (string[])null, null, out result)); - Assert.Throws(() => TimeSpan.ParseExact("12:34:56".AsReadOnlySpan(), new string[0], null)); - Assert.False(TimeSpan.TryParseExact("12:34:56".AsReadOnlySpan(), new string[0], null, out result)); + Assert.Throws(() => TimeSpan.ParseExact("12:34:56".AsSpan(), new string[0], null)); + Assert.False(TimeSpan.TryParseExact("12:34:56".AsSpan(), new string[0], null, out result)); } [Theory] diff --git a/external/corefx/src/System.Runtime/tests/System/TimeZoneInfoTests.cs.REMOVED.git-id b/external/corefx/src/System.Runtime/tests/System/TimeZoneInfoTests.cs.REMOVED.git-id index 4e55412372..329b808d72 100644 --- a/external/corefx/src/System.Runtime/tests/System/TimeZoneInfoTests.cs.REMOVED.git-id +++ b/external/corefx/src/System.Runtime/tests/System/TimeZoneInfoTests.cs.REMOVED.git-id @@ -1 +1 @@ -0ff4adc60ccf764da518c02d303602bd5e928c3f \ No newline at end of file +d535ff3765141ae030d8212318bb82ebb2219d79 \ No newline at end of file diff --git a/external/corefx/src/System.Runtime/tests/System/TypeTests.cs b/external/corefx/src/System.Runtime/tests/System/TypeTests.cs index 34aced8b59..6c052d9ea6 100644 --- a/external/corefx/src/System.Runtime/tests/System/TypeTests.cs +++ b/external/corefx/src/System.Runtime/tests/System/TypeTests.cs @@ -402,5 +402,88 @@ namespace System.Tests Assert.True(!typeof(TypeTestsExtended).IsContextful); Assert.True(!typeof(ContextBoundClass).IsContextful); } + +#region GetInterfaceMap tests + public static IEnumerable GetInterfaceMap_TestData() + { + yield return new object[] + { + typeof(ISimpleInterface), + typeof(SimpleType), + new Tuple[] + { + new Tuple(typeof(ISimpleInterface).GetMethod("Method"), typeof(SimpleType).GetMethod("Method")), + new Tuple(typeof(ISimpleInterface).GetMethod("GenericMethod"), typeof(SimpleType).GetMethod("GenericMethod")) + } + }; + yield return new object[] + { + typeof(IGenericInterface), + typeof(DerivedType), + new Tuple[] + { + new Tuple(typeof(IGenericInterface).GetMethod("Method"), typeof(DerivedType).GetMethod("Method", new Type[] { typeof(object) })), + } + }; + yield return new object[] + { + typeof(IGenericInterface), + typeof(DerivedType), + new Tuple[] + { + new Tuple(typeof(IGenericInterface).GetMethod("Method"), typeof(DerivedType).GetMethod("Method", new Type[] { typeof(string) })), + } + }; + } + + [Theory] + [MemberData(nameof(GetInterfaceMap_TestData))] + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Type.GetInterfaceMap() is not supported on UapAot")] + public static void GetInterfaceMap(Type interfaceType, Type classType, Tuple[] expectedMap) + { + InterfaceMapping actualMapping = classType.GetInterfaceMap(interfaceType); + + Assert.Equal(interfaceType, actualMapping.InterfaceType); + Assert.Equal(classType, actualMapping.TargetType); + + Assert.Equal(expectedMap.Length, actualMapping.InterfaceMethods.Length); + Assert.Equal(expectedMap.Length, actualMapping.TargetMethods.Length); + + for (int i = 0; i < expectedMap.Length; i++) + { + Assert.Contains(expectedMap[i].Item1, actualMapping.InterfaceMethods); + + int index = Array.IndexOf(actualMapping.InterfaceMethods, expectedMap[i].Item1); + Assert.Equal(expectedMap[i].Item2, actualMapping.TargetMethods[index]); + } + } + + interface ISimpleInterface + { + void Method(); + void GenericMethod(); + } + + class SimpleType : ISimpleInterface + { + public void Method() { } + public void GenericMethod() { } + } + + interface IGenericInterface + { + void Method(T arg); + } + + class GenericBaseType : IGenericInterface + { + public void Method(T arg) { } + } + + class DerivedType : GenericBaseType, IGenericInterface + { + public void Method(string arg) { } + } +#endregion } } diff --git a/external/corefx/src/System.Runtime/tests/System/TypedReferenceTests.cs b/external/corefx/src/System.Runtime/tests/System/TypedReferenceTests.cs index 6f44d35967..aba8ccfc59 100644 --- a/external/corefx/src/System.Runtime/tests/System/TypedReferenceTests.cs +++ b/external/corefx/src/System.Runtime/tests/System/TypedReferenceTests.cs @@ -1,3 +1,6 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information + // // TypedReferenceTest.cs // diff --git a/external/corefx/src/System.Runtime/tests/System/UInt16Tests.netcoreapp.cs b/external/corefx/src/System.Runtime/tests/System/UInt16Tests.netcoreapp.cs index b183f168da..4d7cc00547 100644 --- a/external/corefx/src/System.Runtime/tests/System/UInt16Tests.netcoreapp.cs +++ b/external/corefx/src/System.Runtime/tests/System/UInt16Tests.netcoreapp.cs @@ -2,6 +2,7 @@ // 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.Collections.Generic; using System.Globalization; using Xunit; @@ -9,13 +10,29 @@ namespace System.Tests { public partial class UInt16Tests { - [Theory] - [MemberData(nameof(Parse_Valid_TestData))] - public static void Parse_Span_Valid(string value, NumberStyles style, IFormatProvider provider, ushort expected) + public static IEnumerable Parse_ValidWithOffsetCount_TestData() { - Assert.Equal(expected, ushort.Parse(value.AsReadOnlySpan(), style, provider)); + foreach (object[] inputs in Parse_Valid_TestData()) + { + yield return new object[] { inputs[0], 0, ((string)inputs[0]).Length, inputs[1], inputs[2], inputs[3] }; + } - Assert.True(ushort.TryParse(value.AsReadOnlySpan(), style, provider, out ushort result)); + yield return new object[] { "123", 0, 2, NumberStyles.Integer, null, (ushort)12 }; + yield return new object[] { "123", 1, 2, NumberStyles.Integer, null, (ushort)23 }; + yield return new object[] { "+123", 0, 2, NumberStyles.Integer, null, (ushort)1 }; + yield return new object[] { "+123", 1, 3, NumberStyles.Integer, null, (ushort)123 }; + yield return new object[] { "AJK", 0, 1, NumberStyles.HexNumber, new NumberFormatInfo(), (ushort)0XA }; + yield return new object[] { "$1,000", 0, 2, NumberStyles.Currency, new NumberFormatInfo() { CurrencySymbol = "$" }, (ushort)1 }; + yield return new object[] { "$1,000", 1, 3, NumberStyles.Currency, new NumberFormatInfo() { CurrencySymbol = "$" }, (ushort)10 }; + } + + [Theory] + [MemberData(nameof(Parse_ValidWithOffsetCount_TestData))] + public static void Parse_Span_Valid(string value, int offset, int count, NumberStyles style, IFormatProvider provider, ushort expected) + { + Assert.Equal(expected, ushort.Parse(value.AsSpan(offset, count), style, provider)); + + Assert.True(ushort.TryParse(value.AsSpan(offset, count), style, provider, out ushort result)); Assert.Equal(expected, result); } @@ -25,9 +42,9 @@ namespace System.Tests { if (value != null) { - Assert.Throws(exceptionType, () => ushort.Parse(value.AsReadOnlySpan(), style, provider)); + Assert.Throws(exceptionType, () => ushort.Parse(value.AsSpan(), style, provider)); - Assert.False(ushort.TryParse(value.AsReadOnlySpan(), style, provider, out ushort result)); + Assert.False(ushort.TryParse(value.AsSpan(), style, provider, out ushort result)); Assert.Equal(0, (short)result); } } diff --git a/external/corefx/src/System.Runtime/tests/System/UInt32Tests.netcoreapp.cs b/external/corefx/src/System.Runtime/tests/System/UInt32Tests.netcoreapp.cs index 594a0230ee..19ade4bf5e 100644 --- a/external/corefx/src/System.Runtime/tests/System/UInt32Tests.netcoreapp.cs +++ b/external/corefx/src/System.Runtime/tests/System/UInt32Tests.netcoreapp.cs @@ -2,6 +2,7 @@ // 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.Collections.Generic; using System.Globalization; using Xunit; @@ -9,13 +10,29 @@ namespace System.Tests { public partial class UInt32Tests { - [Theory] - [MemberData(nameof(Parse_Valid_TestData))] - public static void Parse_Span_Valid(string value, NumberStyles style, IFormatProvider provider, uint expected) + public static IEnumerable Parse_ValidWithOffsetCount_TestData() { - Assert.Equal(expected, uint.Parse(value.AsReadOnlySpan(), style, provider)); + foreach (object[] inputs in Parse_Valid_TestData()) + { + yield return new object[] { inputs[0], 0, ((string)inputs[0]).Length, inputs[1], inputs[2], inputs[3] }; + } - Assert.True(uint.TryParse(value.AsReadOnlySpan(), style, provider, out uint result)); + yield return new object[] { "123", 0, 2, NumberStyles.Integer, null, (uint)12 }; + yield return new object[] { "123", 1, 2, NumberStyles.Integer, null, (uint)23 }; + yield return new object[] { "4294967295", 0, 1, NumberStyles.Integer, null, 4 }; + yield return new object[] { "4294967295", 9, 1, NumberStyles.Integer, null, 5 }; + yield return new object[] { "12", 0, 1, NumberStyles.HexNumber, null, (uint)0x1 }; + yield return new object[] { "12", 1, 1, NumberStyles.HexNumber, null, (uint)0x2 }; + yield return new object[] { "$1,000", 1, 3, NumberStyles.Currency, new NumberFormatInfo() { CurrencySymbol = "$" }, (uint)10 }; + } + + [Theory] + [MemberData(nameof(Parse_ValidWithOffsetCount_TestData))] + public static void Parse_Span_Valid(string value, int offset, int count, NumberStyles style, IFormatProvider provider, uint expected) + { + Assert.Equal(expected, uint.Parse(value.AsSpan(offset, count), style, provider)); + + Assert.True(uint.TryParse(value.AsSpan(offset, count), style, provider, out uint result)); Assert.Equal(expected, result); } @@ -25,9 +42,9 @@ namespace System.Tests { if (value != null) { - Assert.Throws(exceptionType, () => uint.Parse(value.AsReadOnlySpan(), style, provider)); + Assert.Throws(exceptionType, () => uint.Parse(value.AsSpan(), style, provider)); - Assert.False(uint.TryParse(value.AsReadOnlySpan(), style, provider, out uint result)); + Assert.False(uint.TryParse(value.AsSpan(), style, provider, out uint result)); Assert.Equal(0, (int)result); } } diff --git a/external/corefx/src/System.Runtime/tests/System/UInt64Tests.netcoreapp.cs b/external/corefx/src/System.Runtime/tests/System/UInt64Tests.netcoreapp.cs index 8be57929f1..37d3b1883d 100644 --- a/external/corefx/src/System.Runtime/tests/System/UInt64Tests.netcoreapp.cs +++ b/external/corefx/src/System.Runtime/tests/System/UInt64Tests.netcoreapp.cs @@ -2,6 +2,7 @@ // 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.Collections.Generic; using System.Globalization; using Xunit; @@ -9,13 +10,28 @@ namespace System.Tests { public partial class UInt64Tests { - [Theory] - [MemberData(nameof(Parse_Valid_TestData))] - public static void Parse_Span_Valid(string value, NumberStyles style, IFormatProvider provider, ulong expected) + public static IEnumerable Parse_ValidWithOffsetCount_TestData() { - Assert.Equal(expected, ulong.Parse(value.AsReadOnlySpan(), style, provider)); + foreach (object[] inputs in Parse_Valid_TestData()) + { + yield return new object[] { inputs[0], 0, ((string)inputs[0]).Length, inputs[1], inputs[2], inputs[3] }; + } - Assert.True(ulong.TryParse(value.AsReadOnlySpan(), style, provider, out ulong result)); + yield return new object[] { "+123", 1, 3, NumberStyles.Integer, null, (ulong)123 }; + yield return new object[] { "+123", 0, 3, NumberStyles.Integer, null, (ulong)12 }; + yield return new object[] { " 123 ", 1, 2, NumberStyles.Integer, null, (ulong)1 }; + yield return new object[] { "12", 0, 1, NumberStyles.HexNumber, null, (ulong)0x1 }; + yield return new object[] { "ABC", 1, 1, NumberStyles.HexNumber, null, (ulong)0xb }; + yield return new object[] { "$1,000", 1, 3, NumberStyles.Currency, new NumberFormatInfo() { CurrencySymbol = "$" }, (ulong)10 }; + } + + [Theory] + [MemberData(nameof(Parse_ValidWithOffsetCount_TestData))] + public static void Parse_Span_Valid(string value, int offset, int count, NumberStyles style, IFormatProvider provider, ulong expected) + { + Assert.Equal(expected, ulong.Parse(value.AsSpan(offset, count), style, provider)); + + Assert.True(ulong.TryParse(value.AsSpan(offset, count), style, provider, out ulong result)); Assert.Equal(expected, result); } @@ -25,9 +41,9 @@ namespace System.Tests { if (value != null) { - Assert.Throws(exceptionType, () => ulong.Parse(value.AsReadOnlySpan(), style, provider)); + Assert.Throws(exceptionType, () => ulong.Parse(value.AsSpan(), style, provider)); - Assert.False(ulong.TryParse(value.AsReadOnlySpan(), style, provider, out ulong result)); + Assert.False(ulong.TryParse(value.AsSpan(), style, provider, out ulong result)); Assert.Equal(0, (long)result); } } diff --git a/external/corefx/src/System.Runtime/tests/System/ValueTypeTests.cs b/external/corefx/src/System.Runtime/tests/System/ValueTypeTests.cs index f4a971fa2c..f9aec19b29 100644 --- a/external/corefx/src/System.Runtime/tests/System/ValueTypeTests.cs +++ b/external/corefx/src/System.Runtime/tests/System/ValueTypeTests.cs @@ -28,6 +28,7 @@ namespace System.Tests obj2.value2 = -0.0; Assert.True(obj1.Equals(obj2)); + Assert.Equal(obj1.GetHashCode(), obj2.GetHashCode()); } [Fact] @@ -43,6 +44,7 @@ namespace System.Tests obj2.value2 = -0.0; Assert.True(obj1.Equals(obj2)); + Assert.Equal(obj1.GetHashCode(), obj2.GetHashCode()); } [Fact] @@ -57,6 +59,7 @@ namespace System.Tests obj2.value2 = -double.NaN; Assert.True(obj1.Equals(obj2)); + Assert.Equal(obj1.GetHashCode(), obj2.GetHashCode()); } [Fact] @@ -72,6 +75,7 @@ namespace System.Tests obj2.value2 = -double.NaN; Assert.True(obj1.Equals(obj2)); + Assert.Equal(obj1.GetHashCode(), obj2.GetHashCode()); } [Fact] @@ -86,6 +90,7 @@ namespace System.Tests obj2.value2.value2 = -0.0; Assert.True(obj1.Equals(obj2)); + Assert.Equal(obj1.GetHashCode(), obj2.GetHashCode()); } [Fact] @@ -101,6 +106,7 @@ namespace System.Tests obj2.value2.value2 = -0.0; Assert.True(obj1.Equals(obj2)); + Assert.Equal(obj1.GetHashCode(), obj2.GetHashCode()); } [Fact] @@ -115,6 +121,7 @@ namespace System.Tests obj2.value2.value2 = -double.NaN; Assert.True(obj1.Equals(obj2)); + Assert.Equal(obj1.GetHashCode(), obj2.GetHashCode()); } [Fact] @@ -130,9 +137,11 @@ namespace System.Tests obj2.value2.value2 = -double.NaN; Assert.True(obj1.Equals(obj2)); + Assert.Equal(obj1.GetHashCode(), obj2.GetHashCode()); } [Fact] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "The fix was made in coreclr that is not in netfx. See https://github.com/dotnet/coreclr/issues/6237")] public static void StructWithFloatFieldNotTightlyPackedZeroCompareTest() { StructWithFloatFieldNotTightlyPacked obj1 = new StructWithFloatFieldNotTightlyPacked(); @@ -144,6 +153,7 @@ namespace System.Tests obj2.value2 = 1; Assert.True(obj1.Equals(obj2)); + Assert.Equal(obj1.GetHashCode(), obj2.GetHashCode()); } [Fact] @@ -159,9 +169,11 @@ namespace System.Tests obj2.value2 = 1; Assert.True(obj1.Equals(obj2)); + Assert.Equal(obj1.GetHashCode(), obj2.GetHashCode()); } [Fact] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "The fix was made in coreclr that is not in netfx. See https://github.com/dotnet/coreclr/issues/6237")] public static void StructWithFloatFieldNotTightlyPackedNaNCompareTest() { StructWithFloatFieldNotTightlyPacked obj1 = new StructWithFloatFieldNotTightlyPacked(); @@ -173,6 +185,7 @@ namespace System.Tests obj2.value2 = 1; Assert.True(obj1.Equals(obj2)); + Assert.Equal(obj1.GetHashCode(), obj2.GetHashCode()); } [Fact] @@ -188,9 +201,11 @@ namespace System.Tests obj2.value2 = 1; Assert.True(obj1.Equals(obj2)); + Assert.Equal(obj1.GetHashCode(), obj2.GetHashCode()); } [Fact] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "The fix was made in coreclr that is not in netfx. See https://github.com/dotnet/coreclr/issues/6237")] public static void StructWithNestedFloatFieldNotTightlyPackedZeroCompareTest() { StructWithFloatFieldNestedNotTightlyPacked obj1 = new StructWithFloatFieldNestedNotTightlyPacked(); @@ -202,6 +217,7 @@ namespace System.Tests obj2.value2.value2 = 1; Assert.True(obj1.Equals(obj2)); + Assert.Equal(obj1.GetHashCode(), obj2.GetHashCode()); } [Fact] @@ -217,9 +233,11 @@ namespace System.Tests obj2.value2.value2 = 1; Assert.True(obj1.Equals(obj2)); + Assert.Equal(obj1.GetHashCode(), obj2.GetHashCode()); } [Fact] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "The fix was made in coreclr that is not in netfx. See https://github.com/dotnet/coreclr/issues/6237")] public static void StructWithNestedFloatFieldNotTightlyPackedNaNCompareTest() { StructWithFloatFieldNestedNotTightlyPacked obj1 = new StructWithFloatFieldNestedNotTightlyPacked(); @@ -231,6 +249,7 @@ namespace System.Tests obj2.value2.value2 = 1; Assert.True(obj1.Equals(obj2)); + Assert.Equal(obj1.GetHashCode(), obj2.GetHashCode()); } [Fact] @@ -246,6 +265,7 @@ namespace System.Tests obj2.value2.value2 = 1; Assert.True(obj1.Equals(obj2)); + Assert.Equal(obj1.GetHashCode(), obj2.GetHashCode()); } [Fact] @@ -260,6 +280,7 @@ namespace System.Tests obj2.value2.value = 2; Assert.True(obj1.Equals(obj2)); + Assert.Equal(obj1.GetHashCode(), obj2.GetHashCode()); } [Fact] @@ -275,6 +296,7 @@ namespace System.Tests obj2.value2.value = 2; Assert.False(obj1.Equals(obj2)); + Assert.Equal(obj1.GetHashCode(), obj2.GetHashCode()); } [Fact] @@ -289,6 +311,7 @@ namespace System.Tests obj2.value2 = -0.0; Assert.True(obj1.Equals(obj2)); + Assert.Equal(obj1.GetHashCode(), obj2.GetHashCode()); } public struct S diff --git a/external/corefx/src/System.Runtime/tests/System/VersionTests.netcoreapp.cs b/external/corefx/src/System.Runtime/tests/System/VersionTests.netcoreapp.cs index 95dea7888d..f33a046e3f 100644 --- a/external/corefx/src/System.Runtime/tests/System/VersionTests.netcoreapp.cs +++ b/external/corefx/src/System.Runtime/tests/System/VersionTests.netcoreapp.cs @@ -2,24 +2,38 @@ // 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.Collections.Generic; using Xunit; namespace System.Tests { public partial class VersionTests { + public static IEnumerable Parse_ValidWithOffsetCount_TestData() + { + foreach (object[] inputs in Parse_Valid_TestData()) + { + yield return new object[] { inputs[0], 0, ((string)inputs[0]).Length, inputs[1] }; + } + + yield return new object[] { "1.2.3", 0, 3, new Version(1, 2) }; + yield return new object[] { "1.2.3", 2, 3, new Version(2, 3) }; + yield return new object[] { "2 .3. 4. \t\r\n15 ", 0, 11, new Version(2, 3, 4) }; + yield return new object[] { "+1.+2.+3.+4", 3, 5, new Version(2, 3) }; + } + [Theory] - [MemberData(nameof(Parse_Valid_TestData))] - public static void Parse_Span_ValidInput_ReturnsExpected(string input, Version expected) + [MemberData(nameof(Parse_ValidWithOffsetCount_TestData))] + public static void Parse_Span_ValidInput_ReturnsExpected(string input, int offset, int count, Version expected) { if (input == null) { return; } - Assert.Equal(expected, Version.Parse(input.AsReadOnlySpan())); + Assert.Equal(expected, Version.Parse(input.AsSpan(offset, count))); - Assert.True(Version.TryParse(input.AsReadOnlySpan(), out Version version)); + Assert.True(Version.TryParse(input.AsSpan(offset, count), out Version version)); Assert.Equal(expected, version); } @@ -32,9 +46,9 @@ namespace System.Tests return; } - Assert.Throws(exceptionType, () => Version.Parse(input.AsReadOnlySpan())); + Assert.Throws(exceptionType, () => Version.Parse(input.AsSpan())); - Assert.False(Version.TryParse(input.AsReadOnlySpan(), out Version version)); + Assert.False(Version.TryParse(input.AsSpan(), out Version version)); Assert.Null(version); } diff --git a/external/corefx/src/System.Runtime/tests/app.config b/external/corefx/src/System.Runtime/tests/app.config new file mode 100644 index 0000000000..f2243cc975 --- /dev/null +++ b/external/corefx/src/System.Runtime/tests/app.config @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/external/corefx/src/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj b/external/corefx/src/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj index 634efabebf..11c00d830b 100644 --- a/external/corefx/src/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj +++ b/external/corefx/src/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj @@ -6,9 +6,9 @@ net461;netcoreapp2.0;$(UAPvNextTFM);$(AllXamarinFrameworks) - runtimes/win/lib/$(UAPvNextTFM) + runtimes/win/lib/uap10.0.16299 - + diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.cs index b5030ad693..0b737c40a9 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.cs @@ -195,13 +195,39 @@ namespace System.Security.Cryptography public static System.Security.Cryptography.ECCurve nistP521 { get { throw null; } } } } + public abstract partial class ECDiffieHellman : System.Security.Cryptography.AsymmetricAlgorithm + { + protected ECDiffieHellman() { } + public override string KeyExchangeAlgorithm { get { throw null; } } + public abstract System.Security.Cryptography.ECDiffieHellmanPublicKey PublicKey { get; } + public override string SignatureAlgorithm { get { throw null; } } + public static new System.Security.Cryptography.ECDiffieHellman Create() { throw null; } + public static System.Security.Cryptography.ECDiffieHellman Create(System.Security.Cryptography.ECCurve curve) { throw null; } + public static System.Security.Cryptography.ECDiffieHellman Create(System.Security.Cryptography.ECParameters parameters) { throw null; } + public static new System.Security.Cryptography.ECDiffieHellman Create(string algorithm) { throw null; } + public byte[] DeriveKeyFromHash(System.Security.Cryptography.ECDiffieHellmanPublicKey otherPartyPublicKey, System.Security.Cryptography.HashAlgorithmName hashAlgorithm) { throw null; } + public virtual byte[] DeriveKeyFromHash(System.Security.Cryptography.ECDiffieHellmanPublicKey otherPartyPublicKey, System.Security.Cryptography.HashAlgorithmName hashAlgorithm, byte[] secretPrepend, byte[] secretAppend) { throw null; } + public byte[] DeriveKeyFromHmac(System.Security.Cryptography.ECDiffieHellmanPublicKey otherPartyPublicKey, System.Security.Cryptography.HashAlgorithmName hashAlgorithm, byte[] hmacKey) { throw null; } + public virtual byte[] DeriveKeyFromHmac(System.Security.Cryptography.ECDiffieHellmanPublicKey otherPartyPublicKey, System.Security.Cryptography.HashAlgorithmName hashAlgorithm, byte[] hmacKey, byte[] secretPrepend, byte[] secretAppend) { throw null; } + public virtual byte[] DeriveKeyMaterial(System.Security.Cryptography.ECDiffieHellmanPublicKey otherPartyPublicKey) { throw null; } + public virtual byte[] DeriveKeyTls(System.Security.Cryptography.ECDiffieHellmanPublicKey otherPartyPublicKey, byte[] prfLabel, byte[] prfSeed) { throw null; } + public virtual System.Security.Cryptography.ECParameters ExportExplicitParameters(bool includePrivateParameters) { throw null; } + public virtual System.Security.Cryptography.ECParameters ExportParameters(bool includePrivateParameters) { throw null; } + public override void FromXmlString(string xmlString) { } + public virtual void GenerateKey(System.Security.Cryptography.ECCurve curve) { } + public virtual void ImportParameters(System.Security.Cryptography.ECParameters parameters) { } + public override string ToXmlString(bool includePrivateParameters) { throw null; } + } public abstract partial class ECDiffieHellmanPublicKey : System.IDisposable { + protected ECDiffieHellmanPublicKey() { } protected ECDiffieHellmanPublicKey(byte[] keyBlob) { } public void Dispose() { } protected virtual void Dispose(bool disposing) { } public virtual byte[] ToByteArray() { throw null; } public virtual string ToXmlString() { throw null; } + public virtual System.Security.Cryptography.ECParameters ExportExplicitParameters() { throw null; } + public virtual System.Security.Cryptography.ECParameters ExportParameters() { throw null; } } public abstract partial class ECDsa : System.Security.Cryptography.AsymmetricAlgorithm { diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.netcoreapp.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.netcoreapp.cs index bb7b224718..538f9d517b 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.netcoreapp.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.netcoreapp.cs @@ -10,17 +10,17 @@ namespace System.Security.Cryptography { public abstract partial class DSA : System.Security.Cryptography.AsymmetricAlgorithm { - public virtual bool TryCreateSignature(ReadOnlySpan source, Span destination, out int bytesWritten) { throw null; } - protected virtual bool TryHashData(ReadOnlySpan source, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) { throw null; } - public virtual bool TrySignData(ReadOnlySpan source, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) { throw null; } + public virtual bool TryCreateSignature(ReadOnlySpan hash, Span destination, out int bytesWritten) { throw null; } + protected virtual bool TryHashData(ReadOnlySpan data, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) { throw null; } + public virtual bool TrySignData(ReadOnlySpan data, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) { throw null; } public virtual bool VerifyData(ReadOnlySpan data, ReadOnlySpan signature, HashAlgorithmName hashAlgorithm) { throw null; } - public virtual bool VerifySignature(ReadOnlySpan rgbHash, ReadOnlySpan rgbSignature) { throw null; } + public virtual bool VerifySignature(ReadOnlySpan hash, ReadOnlySpan signature) { throw null; } } public abstract partial class ECDsa : System.Security.Cryptography.AsymmetricAlgorithm { - protected virtual bool TryHashData(ReadOnlySpan source, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) { throw null; } - public virtual bool TrySignData(ReadOnlySpan source, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) { throw null; } - public virtual bool TrySignHash(ReadOnlySpan source, Span destination, out int bytesWritten) { throw null; } + protected virtual bool TryHashData(ReadOnlySpan data, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) { throw null; } + public virtual bool TrySignData(ReadOnlySpan data, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) { throw null; } + public virtual bool TrySignHash(ReadOnlySpan hash, Span destination, out int bytesWritten) { throw null; } public virtual bool VerifyData(ReadOnlySpan data, ReadOnlySpan signature, HashAlgorithmName hashAlgorithm) { throw null; } public virtual bool VerifyHash(ReadOnlySpan hash, ReadOnlySpan signature) { throw null; } } @@ -31,16 +31,17 @@ namespace System.Security.Cryptography } public abstract partial class RandomNumberGenerator : System.IDisposable { + public static void Fill(Span data) => throw null; public virtual void GetBytes(System.Span data) { } public virtual void GetNonZeroBytes(System.Span data) { } } public abstract partial class RSA : System.Security.Cryptography.AsymmetricAlgorithm { - public virtual bool TryDecrypt(System.ReadOnlySpan source, System.Span destination, RSAEncryptionPadding padding, out int bytesWritten) { throw null; } - public virtual bool TryEncrypt(System.ReadOnlySpan source, System.Span destination, RSAEncryptionPadding padding, out int bytesWritten) { throw null; } - protected virtual bool TryHashData(System.ReadOnlySpan source, System.Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) { throw null; } - public virtual bool TrySignData(System.ReadOnlySpan source, System.Span destination, HashAlgorithmName hashAlgorithm, RSASignaturePadding padding, out int bytesWritten) { throw null; } - public virtual bool TrySignHash(System.ReadOnlySpan source, System.Span destination, HashAlgorithmName hashAlgorithm, RSASignaturePadding padding, out int bytesWritten) { throw null; } + public virtual bool TryDecrypt(System.ReadOnlySpan data, System.Span destination, RSAEncryptionPadding padding, out int bytesWritten) { throw null; } + public virtual bool TryEncrypt(System.ReadOnlySpan data, System.Span destination, RSAEncryptionPadding padding, out int bytesWritten) { throw null; } + protected virtual bool TryHashData(System.ReadOnlySpan data, System.Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) { throw null; } + public virtual bool TrySignData(System.ReadOnlySpan data, System.Span destination, HashAlgorithmName hashAlgorithm, RSASignaturePadding padding, out int bytesWritten) { throw null; } + public virtual bool TrySignHash(System.ReadOnlySpan hash, System.Span destination, HashAlgorithmName hashAlgorithm, RSASignaturePadding padding, out int bytesWritten) { throw null; } public virtual bool VerifyData(System.ReadOnlySpan data, System.ReadOnlySpan signature, HashAlgorithmName hashAlgorithm, RSASignaturePadding padding) { throw null; } public virtual bool VerifyHash(System.ReadOnlySpan hash, System.ReadOnlySpan signature, HashAlgorithmName hashAlgorithm, RSASignaturePadding padding) { throw null; } } diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/HashProviderDispenser.OSX.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/HashProviderDispenser.OSX.cs index b663864fd8..4768666d3a 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/HashProviderDispenser.OSX.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/HashProviderDispenser.OSX.cs @@ -27,7 +27,7 @@ namespace Internal.Cryptography return new AppleDigestProvider(Interop.AppleCrypto.PAL_HashAlgorithm.Sha512); } - throw new PlatformNotSupportedException(SR.Format(SR.Cryptography_UnknownHashAlgorithm, hashAlgorithmId)); + throw new CryptographicException(SR.Format(SR.Cryptography_UnknownHashAlgorithm, hashAlgorithmId)); } public static HashProvider CreateMacProvider(string hashAlgorithmId, byte[] key) @@ -46,7 +46,7 @@ namespace Internal.Cryptography return new AppleHmacProvider(Interop.AppleCrypto.PAL_HashAlgorithm.Sha512, key); } - throw new PlatformNotSupportedException(SR.Format(SR.Cryptography_UnknownHashAlgorithm, hashAlgorithmId)); + throw new CryptographicException(SR.Format(SR.Cryptography_UnknownHashAlgorithm, hashAlgorithmId)); } // ----------------------------- diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/HashProviderDispenser.Unix.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/HashProviderDispenser.Unix.cs index 999167d6d1..ff8e91e7c9 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/HashProviderDispenser.Unix.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/HashProviderDispenser.Unix.cs @@ -27,7 +27,7 @@ namespace Internal.Cryptography case HashAlgorithmNames.MD5: return new EvpHashProvider(Interop.Crypto.EvpMd5()); } - throw new CryptographicException(); + throw new CryptographicException(SR.Format(SR.Cryptography_UnknownHashAlgorithm, hashAlgorithmId)); } public static unsafe HashProvider CreateMacProvider(string hashAlgorithmId, byte[] key) @@ -45,7 +45,7 @@ namespace Internal.Cryptography case HashAlgorithmNames.MD5: return new HmacHashProvider(Interop.Crypto.EvpMd5(), key); } - throw new CryptographicException(); + throw new CryptographicException(SR.Format(SR.Cryptography_UnknownHashAlgorithm, hashAlgorithmId)); } // ----------------------------- diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/RandomNumberGeneratorImplementation.OSX.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/RandomNumberGeneratorImplementation.OSX.cs index 012fba22de..f10e1aeeea 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/RandomNumberGeneratorImplementation.OSX.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/RandomNumberGeneratorImplementation.OSX.cs @@ -3,16 +3,17 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; namespace System.Security.Cryptography { partial class RandomNumberGeneratorImplementation { - private void GetBytes(ref byte pbBuffer, int count) + private static unsafe void GetBytes(byte* pbBuffer, int count) { Debug.Assert(count > 0); - Interop.AppleCrypto.GetRandomBytes(ref pbBuffer, count); + Interop.AppleCrypto.GetRandomBytes(pbBuffer, count); } } } diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/RandomNumberGeneratorImplementation.Unix.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/RandomNumberGeneratorImplementation.Unix.cs index 3065b37c5e..9a5f9661d7 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/RandomNumberGeneratorImplementation.Unix.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/RandomNumberGeneratorImplementation.Unix.cs @@ -8,11 +8,11 @@ namespace System.Security.Cryptography { partial class RandomNumberGeneratorImplementation { - private void GetBytes(ref byte pbBuffer, int count) + private static unsafe void GetBytes(byte* pbBuffer, int count) { Debug.Assert(count > 0); - if (!Interop.Crypto.GetRandomBytes(ref pbBuffer, count)) + if (!Interop.Crypto.GetRandomBytes(pbBuffer, count)) { throw Interop.Crypto.CreateOpenSslCryptographicException(); } diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/RandomNumberGeneratorImplementation.Windows.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/RandomNumberGeneratorImplementation.Windows.cs index a7a0253e88..f3f9de3ba1 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/RandomNumberGeneratorImplementation.Windows.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/RandomNumberGeneratorImplementation.Windows.cs @@ -3,16 +3,17 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; namespace System.Security.Cryptography { partial class RandomNumberGeneratorImplementation { - private void GetBytes(ref byte pbBuffer, int count) + private static unsafe void GetBytes(byte* pbBuffer, int count) { Debug.Assert(count > 0); - Interop.BCrypt.NTSTATUS status = Interop.BCrypt.BCryptGenRandom(ref pbBuffer, count); + Interop.BCrypt.NTSTATUS status = Interop.BCrypt.BCryptGenRandom(IntPtr.Zero, pbBuffer, count, Interop.BCrypt.BCRYPT_USE_SYSTEM_PREFERRED_RNG); if (status != Interop.BCrypt.NTSTATUS.STATUS_SUCCESS) throw Interop.BCrypt.CreateCryptographicException(status); } diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/RandomNumberGeneratorImplementation.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/RandomNumberGeneratorImplementation.cs index 5d528f158f..4f0d2e4acb 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/RandomNumberGeneratorImplementation.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/RandomNumberGeneratorImplementation.cs @@ -8,6 +8,16 @@ namespace System.Security.Cryptography { internal sealed partial class RandomNumberGeneratorImplementation : RandomNumberGenerator { + // As long as each implementation can provide a static GetBytes(ref byte buf, int length) + // they can share this one implementation of FillSpan. + internal static unsafe void FillSpan(Span data) + { + if (data.Length > 0) + { + fixed (byte* ptr = data) GetBytes(ptr, data.Length); + } + } + public override void GetBytes(byte[] data) { if (data == null) throw new ArgumentNullException(nameof(data)); @@ -20,11 +30,11 @@ namespace System.Security.Cryptography GetBytes(new Span(data, offset, count)); } - public override void GetBytes(Span data) + public override unsafe void GetBytes(Span data) { if (data.Length > 0) { - GetBytes(ref MemoryMarshal.GetReference(data), data.Length); + fixed (byte* ptr = data) GetBytes(ptr, data.Length); } } diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/Resources/Strings.resx b/external/corefx/src/System.Security.Cryptography.Algorithms/src/Resources/Strings.resx index b5fce95f5e..5d1ed666c3 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/src/Resources/Strings.resx +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/Resources/Strings.resx @@ -79,6 +79,18 @@ Error occurred during a cryptographic operation. + + The keys from both parties must be the same size to generate a secret agreement. + + + Keys used with the ECDiffieHellmanCng algorithm must have an algorithm group of ECDiffieHellman. + + + The TLS key derivation function requires both the label and seed properties to be set. + + + The TLS key derivation function requires a seed value of exactly 64 bytes. + The provided value of {0} bytes does not match the expected size of {1} bytes for the algorithm ({2}). @@ -94,6 +106,9 @@ DSA keys can be imported, but new key generation is not supported on this platform. + + The message exceeds the maximum allowable length for the chosen options ({0}). + XML serialization of an elliptic curve key requires using an overload which specifies the XML format to be used. @@ -161,7 +176,7 @@ This operation is not supported for this class. - Specified padding mode is not valid for this algorithm. + Padding is invalid and cannot be removed. The specified RSA parameters are not valid; both Exponent and Modulus are required fields. @@ -172,6 +187,9 @@ The string contains a character not in the 7 bit ASCII character set. + + The key is too small for the requested operation. + The cipher mode specified requires that an initialization vector (IV) be used. @@ -190,6 +208,9 @@ Key is not a valid public or private key. + + Error occurred while decoding OAEP padding. + Cannot open an invalid handle. @@ -211,6 +232,12 @@ BlockSize must be 128 in this implementation. + + The length of the data to decrypt is not valid for the size of this key. + + + The provided hash value is not the expected size for the specified hash algorithm. + Attempt to transform beyond end of buffer. diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj index 3ca3bbc338..97332e9203 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj @@ -47,7 +47,10 @@ + + + @@ -104,12 +107,21 @@ Internal\Cryptography\UniversalCryptoDecryptor.cs + + Common\System\Security\Cryptography\RsaPaddingProcessor.cs + + + + + + + @@ -129,11 +141,11 @@ Common\Interop\Windows\BCrypt\Cng.cs - - Common\Interop\Windows\BCrypt\Interop.BCryptGenRandom.cs + + Common\CoreLib\Interop\Windows\BCrypt\Interop.BCryptGenRandom.cs - - Common\Interop\Windows\BCrypt\Interop.NTSTATUS.cs + + Common\CoreLib\Interop\Windows\BCrypt\Interop.NTSTATUS.cs Common\Interop\Windows\BCrypt\Interop.AsymmetricEncryption.Types.cs @@ -168,6 +180,15 @@ Interop\Windows\BCrypt\Interop.BCryptPropertyStrings.cs + + Internal\Windows\NCrypt\Interop.NCryptDeriveKeyMaterial.cs + + + Internal\Windows\NCrypt\Interop.NCryptDeriveSecretAgreement.cs + + + Internal\Windows\NCrypt\Interop.NCryptBuffer.cs + Internal\Windows\BCrypt\BCryptAlgorithmCache.cs @@ -255,6 +276,12 @@ Common\System\Security\Cryptography\ECCng.ImportExport.cs + + Common\System\Security\Cryptography\ECDsaCng.cs + + + Common\System\Security\Cryptography\ECDsaCng.ImportExport.cs + Common\System\Security\Cryptography\ECDsaCng.cs @@ -305,6 +332,15 @@ Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EcKey.cs + + Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.cs + + + Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.EcKey.cs + + + Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.Ecdh.cs + Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs @@ -344,23 +380,41 @@ Common\Microsoft\Win32\SafeHandles\SafeEvpMdCtxHandle.Unix.cs + + Common\Microsoft\Win32\SafeHandles\SafeEvpPkeyCtxHandle.Unix.cs + Common\Microsoft\Win32\SafeHandles\SafeHmacCtxHandle.Unix.cs Common\Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs + + Common\Microsoft\Win32\SafeHandles\SafeEvpPKeyHandle.Unix.cs + Common\Microsoft\Win32\SafeHandles\SafeRsaHandle.Unix.cs Common\System\Security\Cryptography\DSAOpenSsl.cs + + Common\System\Security\Cryptography\ECDiffieHellmanOpenSsl.cs + + + Common\System\Security\Cryptography\ECDiffieHellmanOpenSsl.Derive.cs + + + Common\System\Security\Cryptography\ECDiffieHellmanOpenSslPublicKey.cs + Common\System\Security\Cryptography\ECDsaOpenSsl.cs - - Common\System\Security\Cryptography\ECDsaOpenSsl.ImportExport.cs + + Common\System\Security\Cryptography\ECOpenSsl.cs + + + Common\System\Security\Cryptography\ECOpenSsl.ImportExport.cs Common\System\Security\Cryptography\RSAOpenSsl.cs @@ -373,6 +427,7 @@ + @@ -405,6 +460,9 @@ Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Hmac.cs + + Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.KeyAgree.cs + Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Keychain.cs @@ -441,6 +499,12 @@ Common\System\Security\Cryptography\DSASecurityTransforms.cs + + Common\System\Security\Cryptography\EccSecurityTransforms.cs + + + Common\System\Security\Cryptography\ECDiffieHellmanSecurityTransforms.cs + Common\System\Security\Cryptography\ECDsaSecurityTransforms.cs @@ -460,6 +524,7 @@ + @@ -474,10 +539,14 @@ Common\System\Security\Cryptography\DerSequenceReader.cs + + Common\System\Security\Cryptography\ECDiffieHellmanDerivation.cs + + diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/CngKeyLite.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/CngKeyLite.cs index d8dc7f8dfe..42d4d272b0 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/CngKeyLite.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/CngKeyLite.cs @@ -16,8 +16,9 @@ namespace System.Security.Cryptography { internal static class CngKeyLite { - private static class KeyPropertyName + internal static class KeyPropertyName { + internal const string AlgorithmGroup = "Algorithm Group"; // NCRYPT_ALGORITHM_GROUP_PROPERTY internal const string ECCCurveName = "ECCCurveName"; // NCRYPT_ECC_CURVE_NAME internal const string ECCParameters = "ECCParameters"; // BCRYPT_ECC_PARAMETERS internal const string ExportPolicy = "Export Policy"; // NCRYPT_EXPORT_POLICY_PROPERTY @@ -327,7 +328,7 @@ namespace System.Security.Cryptography /// Retrieve a well-known CNG string property. (Note: desktop compat: this helper likes to return special values rather than throw exceptions for missing /// or ill-formatted property values. Only use it for well-known properties that are unlikely to be ill-formatted.) /// - private static string GetPropertyAsString(SafeNCryptHandle ncryptHandle, string propertyName, CngPropertyOptions options) + internal static string GetPropertyAsString(SafeNCryptHandle ncryptHandle, string propertyName, CngPropertyOptions options) { Debug.Assert(!ncryptHandle.IsInvalid); byte[] value = GetProperty(ncryptHandle, propertyName, options); @@ -449,6 +450,10 @@ namespace Microsoft.Win32.SafeHandles { } + internal class SafeNCryptSecretHandle : SafeNCryptHandle + { + } + internal class DuplicateSafeNCryptKeyHandle : SafeNCryptKeyHandle { public DuplicateSafeNCryptKeyHandle(SafeNCryptKeyHandle original) diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/CryptoConfig.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/CryptoConfig.cs index 348b55564e..140f5d395d 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/CryptoConfig.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/CryptoConfig.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Globalization; using System.Reflection; +using System.Runtime.InteropServices; namespace System.Security.Cryptography { @@ -29,6 +30,8 @@ namespace System.Security.Cryptography private const string OID_OIWSEC_SHA512 = "2.16.840.1.101.3.4.2.3"; private const string OID_OIWSEC_RIPEMD160 = "1.3.36.3.2.1"; + private const string ECDsaIdentifier = "ECDsa"; + private static volatile Dictionary s_defaultOidHT = null; private static volatile Dictionary s_defaultNameHT = null; private static volatile Dictionary appNameHT = new Dictionary(StringComparer.OrdinalIgnoreCase); @@ -184,7 +187,12 @@ namespace System.Security.Cryptography ht.Add("DSA", DSACryptoServiceProviderType); ht.Add("System.Security.Cryptography.DSA", DSACryptoServiceProviderType); - ht.Add("ECDsa", ECDsaCngType); + // Windows will register the public ECDsaCng type. Non-Windows gets a special handler. + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + ht.Add(ECDsaIdentifier, ECDsaCngType); + } + ht.Add("ECDsaCng", ECDsaCngType); ht.Add("System.Security.Cryptography.ECDsaCng", ECDsaCngType); @@ -357,6 +365,15 @@ namespace System.Security.Cryptography } } + // Special case asking for "ECDsa" since the default map from .NET Framework uses + // a Windows-only type. + if (retvalType == null && + (args == null || args.Length == 1) && + name == ECDsaIdentifier) + { + return ECDsa.Create(); + } + // Maybe they gave us a classname. if (retvalType == null) { diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/DSA.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/DSA.cs index e30085d734..9fdeb2b984 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/DSA.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/DSA.cs @@ -129,9 +129,9 @@ namespace System.Security.Cryptography return VerifySignature(hash, signature); } - public virtual bool TryCreateSignature(ReadOnlySpan source, Span destination, out int bytesWritten) + public virtual bool TryCreateSignature(ReadOnlySpan hash, Span destination, out int bytesWritten) { - byte[] sig = CreateSignature(source.ToArray()); + byte[] sig = CreateSignature(hash.ToArray()); if (sig.Length <= destination.Length) { new ReadOnlySpan(sig).CopyTo(destination); @@ -145,13 +145,13 @@ namespace System.Security.Cryptography } } - protected virtual bool TryHashData(ReadOnlySpan source, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) + protected virtual bool TryHashData(ReadOnlySpan data, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) { - byte[] array = ArrayPool.Shared.Rent(source.Length); + byte[] array = ArrayPool.Shared.Rent(data.Length); try { - source.CopyTo(array); - byte[] hash = HashData(array, 0, source.Length, hashAlgorithm); + data.CopyTo(array); + byte[] hash = HashData(array, 0, data.Length, hashAlgorithm); if (destination.Length >= hash.Length) { new ReadOnlySpan(hash).CopyTo(destination); @@ -166,19 +166,19 @@ namespace System.Security.Cryptography } finally { - Array.Clear(array, 0, source.Length); + Array.Clear(array, 0, data.Length); ArrayPool.Shared.Return(array); } } - public virtual bool TrySignData(ReadOnlySpan source, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) + public virtual bool TrySignData(ReadOnlySpan data, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) { if (string.IsNullOrEmpty(hashAlgorithm.Name)) { throw HashAlgorithmNameNullOrEmpty(); } - if (TryHashData(source, destination, hashAlgorithm, out int hashLength) && + if (TryHashData(data, destination, hashAlgorithm, out int hashLength) && TryCreateSignature(destination.Slice(0, hashLength), destination, out bytesWritten)) { return true; @@ -214,8 +214,8 @@ namespace System.Security.Cryptography } } - public virtual bool VerifySignature(ReadOnlySpan rgbHash, ReadOnlySpan rgbSignature) => - VerifySignature(rgbHash.ToArray(), rgbSignature.ToArray()); + public virtual bool VerifySignature(ReadOnlySpan hash, ReadOnlySpan signature) => + VerifySignature(hash.ToArray(), signature.ToArray()); private static Exception DerivedClassMustOverride() => new NotImplementedException(SR.NotSupported_SubclassOverride); diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECCngKey.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECCngKey.cs new file mode 100644 index 0000000000..5224477644 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECCngKey.cs @@ -0,0 +1,216 @@ +// 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 Internal.NativeCrypto; +using Microsoft.Win32.SafeHandles; + +namespace System.Security.Cryptography +{ + internal sealed partial class ECCngKey + { + private SafeNCryptKeyHandle _keyHandle; + private int _lastKeySize; + private string _lastAlgorithm; + private readonly string _algorithmGroup; + + internal ECCngKey(string algorithmGroup) + { + Debug.Assert( + algorithmGroup == BCryptNative.AlgorithmName.ECDH || + algorithmGroup == BCryptNative.AlgorithmName.ECDsa); + + _algorithmGroup = algorithmGroup; + } + + internal int KeySize { get; private set; } + + internal string GetCurveName(int callerKeySizeProperty) + { + // Ensure key\handle is created + using (SafeNCryptKeyHandle keyHandle = GetDuplicatedKeyHandle(callerKeySizeProperty)) + { + string algorithm = _lastAlgorithm; + + if (ECCng.IsECNamedCurve(algorithm)) + { + return CngKeyLite.GetCurveName(keyHandle); + } + + // Use hard-coded values (for use with pre-Win10 APIs) + return ECCng.SpecialNistAlgorithmToCurveName(algorithm); + } + } + + internal SafeNCryptKeyHandle GetDuplicatedKeyHandle(int callerKeySizeProperty) + { + if (ECCng.IsECNamedCurve(_lastAlgorithm)) + { + // Curve was previously created, so use that + return new DuplicateSafeNCryptKeyHandle(_keyHandle); + } + else + { + if (_lastKeySize != callerKeySizeProperty) + { + // Map the current key size to a CNG algorithm name + string algorithm; + + bool isEcdsa = _algorithmGroup == BCryptNative.AlgorithmName.ECDsa; + + switch (callerKeySizeProperty) + { + case 256: + algorithm = isEcdsa + ? BCryptNative.AlgorithmName.ECDsaP256 + : BCryptNative.AlgorithmName.ECDHP256; + break; + case 384: + algorithm = isEcdsa + ? BCryptNative.AlgorithmName.ECDsaP384 + : BCryptNative.AlgorithmName.ECDHP384; + break; + case 521: + algorithm = isEcdsa + ? BCryptNative.AlgorithmName.ECDsaP521 + : BCryptNative.AlgorithmName.ECDHP521; + break; + default: + Debug.Fail("Should not have invalid key size"); + throw new ArgumentException(SR.Cryptography_InvalidKeySize); + } + + if (_keyHandle != null) + { + DisposeKey(); + } + + _keyHandle = CngKeyLite.GenerateNewExportableKey(algorithm, callerKeySizeProperty); + _lastKeySize = callerKeySizeProperty; + _lastAlgorithm = algorithm; + KeySize = callerKeySizeProperty; + } + + return new DuplicateSafeNCryptKeyHandle(_keyHandle); + } + } + + internal void GenerateKey(ECCurve curve) + { + curve.Validate(); + + if (_keyHandle != null) + { + DisposeKey(); + } + + string algorithm = null; + int keySize = 0; + + if (curve.IsNamed) + { + if (string.IsNullOrEmpty(curve.Oid.FriendlyName)) + { + throw new PlatformNotSupportedException( + string.Format(SR.Cryptography_InvalidCurveOid, curve.Oid.Value)); + } + + // Map curve name to algorithm to support pre-Win10 curves + if (_algorithmGroup == BCryptNative.AlgorithmName.ECDsa) + { + algorithm = ECCng.EcdsaCurveNameToAlgorithm(curve.Oid.FriendlyName); + } + else + { + Debug.Assert(_algorithmGroup == BCryptNative.AlgorithmName.ECDH); + algorithm = ECCng.EcdhCurveNameToAlgorithm(curve.Oid.FriendlyName); + } + + if (ECCng.IsECNamedCurve(algorithm)) + { + try + { + _keyHandle = CngKeyLite.GenerateNewExportableKey(algorithm, curve.Oid.FriendlyName); + keySize = CngKeyLite.GetKeyLength(_keyHandle); + } + catch (CryptographicException e) + { + // Map to PlatformNotSupportedException if appropriate + Interop.NCrypt.ErrorCode errorCode = (Interop.NCrypt.ErrorCode)e.HResult; + + if (curve.IsNamed && errorCode == Interop.NCrypt.ErrorCode.NTE_INVALID_PARAMETER || + errorCode == Interop.NCrypt.ErrorCode.NTE_NOT_SUPPORTED) + { + throw new PlatformNotSupportedException( + string.Format(SR.Cryptography_CurveNotSupported, curve.Oid.FriendlyName), e); + } + + throw; + } + } + else + { + // Get the proper KeySize from algorithm name + switch (algorithm) + { + case BCryptNative.AlgorithmName.ECDsaP256: + case BCryptNative.AlgorithmName.ECDHP256: + keySize = 256; + break; + case BCryptNative.AlgorithmName.ECDsaP384: + case BCryptNative.AlgorithmName.ECDHP384: + keySize = 384; + break; + case BCryptNative.AlgorithmName.ECDsaP521: + case BCryptNative.AlgorithmName.ECDHP521: + keySize = 521; + break; + default: + Debug.Fail(string.Format("Unknown algorithm {0}", algorithm.ToString())); + throw new ArgumentException(SR.Cryptography_InvalidKeySize); + } + + _keyHandle = CngKeyLite.GenerateNewExportableKey(algorithm, keySize); + } + } + else if (curve.IsExplicit) + { + algorithm = _algorithmGroup; + _keyHandle = CngKeyLite.GenerateNewExportableKey(algorithm, ref curve); + keySize = CngKeyLite.GetKeyLength(_keyHandle); + } + else + { + throw new PlatformNotSupportedException( + string.Format(SR.Cryptography_CurveNotSupported, curve.CurveType.ToString())); + } + + _lastAlgorithm = algorithm; + _lastKeySize = keySize; + KeySize = keySize; + } + + internal void DisposeKey() + { + if (_keyHandle != null) + { + _keyHandle.Dispose(); + _keyHandle = null; + } + + _lastAlgorithm = null; + _lastKeySize = 0; + } + + internal void SetHandle(SafeNCryptKeyHandle keyHandle, string algorithmName) + { + _keyHandle?.Dispose(); + _keyHandle = keyHandle; + _lastAlgorithm = algorithmName; + + KeySize = CngKeyLite.GetKeyLength(keyHandle); + _lastKeySize = KeySize; + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellman.Create.Cng.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellman.Create.Cng.cs new file mode 100644 index 0000000000..4e8362e9ec --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellman.Create.Cng.cs @@ -0,0 +1,35 @@ +// 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.Security.Cryptography +{ + public abstract partial class ECDiffieHellman : AsymmetricAlgorithm + { + public static new ECDiffieHellman Create() + { + return new ECDiffieHellmanImplementation.ECDiffieHellmanCng(); + } + + public static ECDiffieHellman Create(ECCurve curve) + { + return new ECDiffieHellmanImplementation.ECDiffieHellmanCng(curve); + } + + public static ECDiffieHellman Create(ECParameters parameters) + { + ECDiffieHellman ecdh = new ECDiffieHellmanImplementation.ECDiffieHellmanCng(); + + try + { + ecdh.ImportParameters(parameters); + return ecdh; + } + catch + { + ecdh.Dispose(); + throw; + } + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellman.Create.OpenSsl.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellman.Create.OpenSsl.cs new file mode 100644 index 0000000000..4be428f569 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellman.Create.OpenSsl.cs @@ -0,0 +1,35 @@ +// 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.Security.Cryptography +{ + public abstract partial class ECDiffieHellman : AsymmetricAlgorithm + { + public static new ECDiffieHellman Create() + { + return new ECDiffieHellmanImplementation.ECDiffieHellmanOpenSsl(); + } + + public static ECDiffieHellman Create(ECCurve curve) + { + return new ECDiffieHellmanImplementation.ECDiffieHellmanOpenSsl(curve); + } + + public static ECDiffieHellman Create(ECParameters parameters) + { + ECDiffieHellman ecdh = new ECDiffieHellmanImplementation.ECDiffieHellmanOpenSsl(); + + try + { + ecdh.ImportParameters(parameters); + return ecdh; + } + catch + { + ecdh.Dispose(); + throw; + } + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellman.Create.SecurityTransforms.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellman.Create.SecurityTransforms.cs new file mode 100644 index 0000000000..a6945bfdaf --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellman.Create.SecurityTransforms.cs @@ -0,0 +1,46 @@ +// 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.Security.Cryptography +{ + public abstract partial class ECDiffieHellman : AsymmetricAlgorithm + { + public static new ECDiffieHellman Create() + { + return new ECDiffieHellmanImplementation.ECDiffieHellmanSecurityTransforms(); + } + + public static ECDiffieHellman Create(ECCurve curve) + { + ECDiffieHellman ecdh = Create(); + + try + { + ecdh.GenerateKey(curve); + return ecdh; + } + catch + { + ecdh.Dispose(); + throw; + } + } + + public static ECDiffieHellman Create(ECParameters parameters) + { + ECDiffieHellman ecdh = Create(); + + try + { + ecdh.ImportParameters(parameters); + return ecdh; + } + catch + { + ecdh.Dispose(); + throw; + } + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellman.Xml.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellman.Xml.cs new file mode 100644 index 0000000000..3bd0cc8ee9 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellman.Xml.cs @@ -0,0 +1,19 @@ +// 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.Security.Cryptography +{ + public abstract partial class ECDiffieHellman : AsymmetricAlgorithm + { + public override void FromXmlString(string xmlString) + { + throw new NotImplementedException(SR.Cryptography_ECXmlSerializationFormatRequired); + } + + public override string ToXmlString(bool includePrivateParameters) + { + throw new NotImplementedException(SR.Cryptography_ECXmlSerializationFormatRequired); + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellman.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellman.cs new file mode 100644 index 0000000000..e471c46b09 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellman.cs @@ -0,0 +1,170 @@ +// 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.Security.Cryptography +{ + /// + /// Abstract base class for implementations of elliptic curve Diffie-Hellman to derive from + /// + public abstract partial class ECDiffieHellman : AsymmetricAlgorithm + { + public override string KeyExchangeAlgorithm + { + get { return "ECDiffieHellman"; } + } + + public override string SignatureAlgorithm + { + get { return null; } + } + + public static new ECDiffieHellman Create(string algorithm) + { + if (algorithm == null) + { + throw new ArgumentNullException(nameof(algorithm)); + } + + return CryptoConfig.CreateFromName(algorithm) as ECDiffieHellman; + } + + public abstract ECDiffieHellmanPublicKey PublicKey { get; } + + // This method must be implemented by derived classes. In order to conform to the contract, it cannot be abstract. + public virtual byte[] DeriveKeyMaterial(ECDiffieHellmanPublicKey otherPartyPublicKey) + { + throw DerivedClassMustOverride(); + } + + /// + /// Derive key material using the formula HASH(x) where x is the computed result of the EC Diffie-Hellman algorithm. + /// + /// The public key of the party with which to derive a mutual secret. + /// The identifier for the hash algorithm to use. + /// A hashed output suitable for key material + /// is over a different curve than this key + public byte[] DeriveKeyFromHash(ECDiffieHellmanPublicKey otherPartyPublicKey, HashAlgorithmName hashAlgorithm) + { + return DeriveKeyFromHash(otherPartyPublicKey, hashAlgorithm, null, null); + } + + /// + /// Derive key material using the formula HASH(secretPrepend || x || secretAppend) where x is the computed + /// result of the EC Diffie-Hellman algorithm. + /// + /// The public key of the party with which to derive a mutual secret. + /// The identifier for the hash algorithm to use. + /// A value to prepend to the derived secret before hashing. A null value is treated as an empty array. + /// A value to append to the derived secret before hashing. A null value is treated as an empty array. + /// A hashed output suitable for key material + /// is over a different curve than this key + public virtual byte[] DeriveKeyFromHash( + ECDiffieHellmanPublicKey otherPartyPublicKey, + HashAlgorithmName hashAlgorithm, + byte[] secretPrepend, + byte[] secretAppend) + { + throw DerivedClassMustOverride(); + } + + /// + /// Derive key material using the formula HMAC(hmacKey, x) where x is the computed + /// result of the EC Diffie-Hellman algorithm. + /// + /// The public key of the party with which to derive a mutual secret. + /// The identifier for the hash algorithm to use. + /// The key to use in the HMAC. A null value indicates that the result of the EC Diffie-Hellman algorithm should be used as the HMAC key. + /// A hashed output suitable for key material + /// is over a different curve than this key + public byte[] DeriveKeyFromHmac( + ECDiffieHellmanPublicKey otherPartyPublicKey, + HashAlgorithmName hashAlgorithm, + byte[] hmacKey) + { + return DeriveKeyFromHmac(otherPartyPublicKey, hashAlgorithm, hmacKey, null, null); + } + + /// + /// Derive key material using the formula HMAC(hmacKey, secretPrepend || x || secretAppend) where x is the computed + /// result of the EC Diffie-Hellman algorithm. + /// + /// The public key of the party with which to derive a mutual secret. + /// The identifier for the hash algorithm to use. + /// The key to use in the HMAC. A null value indicates that the result of the EC Diffie-Hellman algorithm should be used as the HMAC key. + /// A value to prepend to the derived secret before hashing. A null value is treated as an empty array. + /// A value to append to the derived secret before hashing. A null value is treated as an empty array. + /// A hashed output suitable for key material + /// is over a different curve than this key + public virtual byte[] DeriveKeyFromHmac( + ECDiffieHellmanPublicKey otherPartyPublicKey, + HashAlgorithmName hashAlgorithm, + byte[] hmacKey, + byte[] secretPrepend, + byte[] secretAppend) + { + throw DerivedClassMustOverride(); + } + + /// + /// Derive key material using the TLS pseudo-random function (PRF) derivation algorithm. + /// + /// The public key of the party with which to derive a mutual secret. + /// The ASCII encoded PRF label. + /// The 64-byte PRF seed. + /// A 48-byte output of the TLS pseudo-random function. + /// is over a different curve than this key + /// is null + /// is null + /// is not exactly 64 bytes in length + public virtual byte[] DeriveKeyTls(ECDiffieHellmanPublicKey otherPartyPublicKey, byte[] prfLabel, byte[] prfSeed) + { + throw DerivedClassMustOverride(); + } + + private static Exception DerivedClassMustOverride() + { + return new NotImplementedException(SR.NotSupported_SubclassOverride); + } + + /// + /// When overridden in a derived class, exports the named or explicit ECParameters for an ECCurve. + /// If the curve has a name, the Curve property will contain named curve parameters, otherwise it + /// will contain explicit parameters. + /// + /// true to include private parameters, otherwise, false. + /// The ECParameters representing the point on the curve for this key. + public virtual ECParameters ExportParameters(bool includePrivateParameters) + { + throw DerivedClassMustOverride(); + } + + /// + /// When overridden in a derived class, exports the explicit ECParameters for an ECCurve. + /// + /// true to include private parameters, otherwise, false. + /// The ECParameters representing the point on the curve for this key, using the explicit curve format. + public virtual ECParameters ExportExplicitParameters(bool includePrivateParameters) + { + throw DerivedClassMustOverride(); + } + + /// + /// When overridden in a derived class, imports the specified ECParameters. + /// + /// The curve parameters. + public virtual void ImportParameters(ECParameters parameters) + { + throw DerivedClassMustOverride(); + } + + /// + /// When overridden in a derived class, generates a new public/private keypair for the specified curve. + /// + /// The curve to use. + public virtual void GenerateKey(ECCurve curve) + { + throw new NotSupportedException(SR.NotSupported_SubclassOverride); + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellmanCng.Derive.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellmanCng.Derive.cs new file mode 100644 index 0000000000..008cd8227e --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellmanCng.Derive.cs @@ -0,0 +1,72 @@ +// 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 Internal.NativeCrypto; +using Microsoft.Win32.SafeHandles; + +namespace System.Security.Cryptography +{ + internal static partial class ECDiffieHellmanImplementation + { + public sealed partial class ECDiffieHellmanCng : ECDiffieHellman + { + // For the public ECDiffieHellmanCng this is exposed as the HashAlgorithm property + // which is a CngAlgorithm type. We're not doing that, but we do need the default value + // for DeriveKeyMaterial. + public override byte[] DeriveKeyMaterial(ECDiffieHellmanPublicKey otherPartyPublicKey) + { + if (otherPartyPublicKey == null) + { + throw new ArgumentNullException(nameof(otherPartyPublicKey)); + } + + // ECDiffieHellmanCng on .NET Framework will throw an ArgumentException in this method + // if otherPartyPublicKey is not an ECDiffieHellmanCngPublicKey. All of the other methods + // will use Import/Export to coerce the correct type for interop. + + // None of the other Core types will match that behavior, so the ECDiffieHellman.Create() on + // Windows on .NET Core won't, either. + + // The default behavior for ECDiffieHellmanCng / ECDiffieHellman.Create() on .NET Framework was + // to derive from hash, no prepend, no append, SHA-2-256. + return DeriveKeyFromHash(otherPartyPublicKey, HashAlgorithmName.SHA256); + } + + private SafeNCryptSecretHandle DeriveSecretAgreementHandle(ECDiffieHellmanPublicKey otherPartyPublicKey) + { + if (otherPartyPublicKey == null) + { + throw new ArgumentNullException(nameof(otherPartyPublicKey)); + } + + ECParameters otherPartyParameters = otherPartyPublicKey.ExportParameters(); + + using (ECDiffieHellmanCng otherPartyCng = (ECDiffieHellmanCng)Create(otherPartyParameters)) + using (SafeNCryptKeyHandle otherPartyHandle = otherPartyCng.GetDuplicatedKeyHandle()) + { + string importedKeyAlgorithmGroup = + CngKeyLite.GetPropertyAsString( + otherPartyHandle, + CngKeyLite.KeyPropertyName.AlgorithmGroup, + CngPropertyOptions.None); + + if (importedKeyAlgorithmGroup != BCryptNative.AlgorithmName.ECDH) + { + throw new ArgumentException(SR.Cryptography_ArgECDHRequiresECDHKey, nameof(otherPartyPublicKey)); + } + + if (CngKeyLite.GetKeyLength(otherPartyHandle) != KeySize) + { + throw new ArgumentException(SR.Cryptography_ArgECDHKeySizeMismatch, nameof(otherPartyPublicKey)); + } + + using (SafeNCryptKeyHandle localHandle = GetDuplicatedKeyHandle()) + { + return Interop.NCrypt.DeriveSecretAgreement(localHandle, otherPartyHandle); + } + } + } + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellmanCng.Key.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellmanCng.Key.cs new file mode 100644 index 0000000000..d6d18ccb79 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellmanCng.Key.cs @@ -0,0 +1,46 @@ +// 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 Internal.NativeCrypto; +using Microsoft.Win32.SafeHandles; + +namespace System.Security.Cryptography +{ + internal static partial class ECDiffieHellmanImplementation + { + public sealed partial class ECDiffieHellmanCng : ECDiffieHellman + { + private readonly ECCngKey _key = new ECCngKey(BCryptNative.AlgorithmName.ECDH); + + private string GetCurveName() => _key.GetCurveName(KeySize); + + public override void GenerateKey(ECCurve curve) + { + _key.GenerateKey(curve); + ForceSetKeySize(_key.KeySize); + } + + private SafeNCryptKeyHandle GetDuplicatedKeyHandle() => _key.GetDuplicatedKeyHandle(KeySize); + + private void DisposeKey() => _key.DisposeKey(); + + /// + /// Public key used to generate key material with the second party + /// + public override ECDiffieHellmanPublicKey PublicKey + { + get + { + string curveName = GetCurveName(); + + return new ECDiffieHellmanCngPublicKey( + curveName == null + ? ExportFullKeyBlob(includePrivateParameters: false) + : ExportKeyBlob(includePrivateParameters: false), + curveName); + } + } + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellmanCng.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellmanCng.cs new file mode 100644 index 0000000000..e6485509f2 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellmanCng.cs @@ -0,0 +1,68 @@ +// 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 Microsoft.Win32.SafeHandles; +using static Internal.NativeCrypto.BCryptNative; + +namespace System.Security.Cryptography +{ + internal static partial class ECDiffieHellmanImplementation + { + public sealed partial class ECDiffieHellmanCng : ECDiffieHellman + { + private void ImportFullKeyBlob(byte[] ecfullKeyBlob, bool includePrivateParameters) + { + string blobType = includePrivateParameters ? + Interop.BCrypt.KeyBlobType.BCRYPT_ECCFULLPRIVATE_BLOB : + Interop.BCrypt.KeyBlobType.BCRYPT_ECCFULLPUBLIC_BLOB; + + SafeNCryptKeyHandle keyHandle = CngKeyLite.ImportKeyBlob(blobType, ecfullKeyBlob); + + Debug.Assert(!keyHandle.IsInvalid); + + _key.SetHandle(keyHandle, AlgorithmName.ECDH); + ForceSetKeySize(_key.KeySize); + } + + private void ImportKeyBlob(byte[] ecKeyBlob, string curveName, bool includePrivateParameters) + { + string blobType = includePrivateParameters ? + Interop.BCrypt.KeyBlobType.BCRYPT_ECCPRIVATE_BLOB : + Interop.BCrypt.KeyBlobType.BCRYPT_ECCPUBLIC_BLOB; + + SafeNCryptKeyHandle keyHandle = CngKeyLite.ImportKeyBlob(blobType, ecKeyBlob, curveName); + + Debug.Assert(!keyHandle.IsInvalid); + + _key.SetHandle(keyHandle, ECCng.EcdhCurveNameToAlgorithm(curveName)); + ForceSetKeySize(_key.KeySize); + } + + private byte[] ExportKeyBlob(bool includePrivateParameters) + { + string blobType = includePrivateParameters ? + Interop.BCrypt.KeyBlobType.BCRYPT_ECCPRIVATE_BLOB : + Interop.BCrypt.KeyBlobType.BCRYPT_ECCPUBLIC_BLOB; + + using (SafeNCryptKeyHandle keyHandle = GetDuplicatedKeyHandle()) + { + return CngKeyLite.ExportKeyBlob(keyHandle, blobType); + } + } + + private byte[] ExportFullKeyBlob(bool includePrivateParameters) + { + string blobType = includePrivateParameters ? + Interop.BCrypt.KeyBlobType.BCRYPT_ECCFULLPRIVATE_BLOB : + Interop.BCrypt.KeyBlobType.BCRYPT_ECCFULLPUBLIC_BLOB; + + using (SafeNCryptKeyHandle keyHandle = GetDuplicatedKeyHandle()) + { + return CngKeyLite.ExportKeyBlob(keyHandle, blobType); + } + } + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellmanCngPublicKey.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellmanCngPublicKey.cs new file mode 100644 index 0000000000..8a669b4a1e --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellmanCngPublicKey.cs @@ -0,0 +1,81 @@ +// 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.Security.Cryptography +{ + internal static partial class ECDiffieHellmanImplementation + { + public sealed partial class ECDiffieHellmanCngPublicKey : ECDiffieHellmanPublicKey + { + private byte[] _keyBlob; + internal string _curveName; + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + } + + public override string ToXmlString() + { + throw new PlatformNotSupportedException(); + } + + public static ECDiffieHellmanCngPublicKey FromXmlString(string xml) + { + throw new PlatformNotSupportedException(); + } + + internal ECDiffieHellmanCngPublicKey(byte[] keyBlob, string curveName) : base(keyBlob) + { + Debug.Assert(_curveName != null && keyBlob != null); + + _keyBlob = keyBlob; + _curveName = curveName; + } + + /// + /// Exports the key and explicit curve parameters used by the ECC object into an object. + /// + /// + /// if there was an issue obtaining the curve values. + /// + /// + /// if explicit export is not supported by this platform. Windows 10 or higher is required. + /// + /// The key and explicit curve parameters used by the ECC object. + public override ECParameters ExportExplicitParameters() + { + ECParameters ecparams = new ECParameters(); + ECCng.ExportPrimeCurveParameters(ref ecparams, _keyBlob, includePrivateParameters: false); + return ecparams; + } + + /// + /// Exports the key used by the ECC object into an object. + /// If the key was created as a named curve, the Curve property will contain named curve parameters + /// otherwise it will contain explicit parameters. + /// + /// + /// if there was an issue obtaining the curve values. + /// + /// The key and named curve parameters used by the ECC object. + public override ECParameters ExportParameters() + { + if (string.IsNullOrEmpty(_curveName)) + { + return ExportExplicitParameters(); + } + else + { + ECParameters ecparams = new ECParameters(); + ECCng.ExportNamedCurveParameters(ref ecparams, _keyBlob, includePrivateParameters: false); + ecparams.Curve = ECCurve.CreateFromFriendlyName(_curveName); + return ecparams; + } + } + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellmanPublicKey.ExportParameters.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellmanPublicKey.ExportParameters.cs new file mode 100644 index 0000000000..44a473d901 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellmanPublicKey.ExportParameters.cs @@ -0,0 +1,32 @@ +// 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.Security.Cryptography +{ + /// + /// Wrapper for public key material passed between parties during Diffie-Hellman key material generation + /// + public abstract partial class ECDiffieHellmanPublicKey : IDisposable + { + /// + /// When overridden in a derived class, exports the named or explicit ECParameters for an ECCurve. + /// If the curve has a name, the Curve property will contain named curve parameters, otherwise it + /// will contain explicit parameters. + /// + /// The ECParameters representing the point on the curve for this key. + public virtual ECParameters ExportParameters() + { + throw new NotSupportedException(SR.NotSupported_SubclassOverride); + } + + /// + /// When overridden in a derived class, exports the explicit ECParameters for an ECCurve. + /// + /// The ECParameters representing the point on the curve for this key, using the explicit curve format. + public virtual ECParameters ExportExplicitParameters() + { + throw new NotSupportedException(SR.NotSupported_SubclassOverride); + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellmanPublicKey.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellmanPublicKey.cs index 78b04674d1..9a389a477b 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellmanPublicKey.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDiffieHellmanPublicKey.cs @@ -7,11 +7,18 @@ namespace System.Security.Cryptography /// /// Wrapper for public key material passed between parties during Diffie-Hellman key material generation /// +#if MONO [Serializable] - public abstract class ECDiffieHellmanPublicKey : IDisposable +#endif + public abstract partial class ECDiffieHellmanPublicKey : IDisposable { private readonly byte[] _keyBlob; + protected ECDiffieHellmanPublicKey() + { + _keyBlob = Array.Empty(); + } + protected ECDiffieHellmanPublicKey(byte[] keyBlob) { if (keyBlob == null) diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDsa.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDsa.cs index d17ded3926..f5ff11d92c 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDsa.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDsa.cs @@ -83,14 +83,14 @@ namespace System.Security.Cryptography return SignHash(hash); } - public virtual bool TrySignData(ReadOnlySpan source, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) + public virtual bool TrySignData(ReadOnlySpan data, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) { if (string.IsNullOrEmpty(hashAlgorithm.Name)) { throw new ArgumentException(SR.Cryptography_HashAlgorithmNameNullOrEmpty, nameof(hashAlgorithm)); } - if (TryHashData(source, destination, hashAlgorithm, out int hashLength) && + if (TryHashData(data, destination, hashAlgorithm, out int hashLength) && TrySignHash(destination.Slice(0, hashLength), destination, out bytesWritten)) { return true; @@ -191,13 +191,13 @@ namespace System.Security.Cryptography throw new NotSupportedException(SR.NotSupported_SubclassOverride); } - protected virtual bool TryHashData(ReadOnlySpan source, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) + protected virtual bool TryHashData(ReadOnlySpan data, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) { - byte[] array = ArrayPool.Shared.Rent(source.Length); + byte[] array = ArrayPool.Shared.Rent(data.Length); try { - source.CopyTo(array); - byte[] hash = HashData(array, 0, source.Length, hashAlgorithm); + data.CopyTo(array); + byte[] hash = HashData(array, 0, data.Length, hashAlgorithm); if (hash.Length <= destination.Length) { new ReadOnlySpan(hash).CopyTo(destination); @@ -212,14 +212,14 @@ namespace System.Security.Cryptography } finally { - Array.Clear(array, 0, source.Length); + Array.Clear(array, 0, data.Length); ArrayPool.Shared.Return(array); } } - public virtual bool TrySignHash(ReadOnlySpan source, Span destination, out int bytesWritten) + public virtual bool TrySignHash(ReadOnlySpan hash, Span destination, out int bytesWritten) { - byte[] result = SignHash(source.ToArray()); + byte[] result = SignHash(hash.ToArray()); if (result.Length <= destination.Length) { new ReadOnlySpan(result).CopyTo(destination); diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDsaCng.Key.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDsaCng.Key.cs index 6c5ffbae85..dd126187ac 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDsaCng.Key.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDsaCng.Key.cs @@ -2,154 +2,28 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.Win32.SafeHandles; +using static Internal.NativeCrypto.BCryptNative; + namespace System.Security.Cryptography { - using Microsoft.Win32.SafeHandles; - using System.Diagnostics; - using static Internal.NativeCrypto.BCryptNative; - using static Interop.NCrypt; internal static partial class ECDsaImplementation { public sealed partial class ECDsaCng : ECDsa { - private SafeNCryptKeyHandle _keyHandle; - private int _lastKeySize; - private string _lastAlgorithm; - - internal string GetCurveName() - { - using (SafeNCryptKeyHandle keyHandle = GetDuplicatedKeyHandle()) // Ensure key\handle is created - { - string algorithm = _lastAlgorithm; - if (IsECNamedCurve(algorithm)) - { - return CngKeyLite.GetCurveName(keyHandle); - } - - // Use hard-coded values (for use with pre-Win10 APIs) - return SpecialNistAlgorithmToCurveName(algorithm); - } - } - - private SafeNCryptKeyHandle GetDuplicatedKeyHandle() - { - if (IsECNamedCurve(_lastAlgorithm)) - { - // Curve was previously created, so use that - return new DuplicateSafeNCryptKeyHandle(_keyHandle); - } - else - { - string algorithm = null; - - int keySize = KeySize; - if (_lastKeySize != keySize) - { - // Map the current key size to a CNG algorithm name - switch (keySize) - { - case 256: algorithm = AlgorithmName.ECDsaP256; break; - case 384: algorithm = AlgorithmName.ECDsaP384; break; - case 521: algorithm = AlgorithmName.ECDsaP521; break; - default: - Debug.Fail("Should not have invalid key size"); - throw new ArgumentException(SR.Cryptography_InvalidKeySize); - } - if (_keyHandle != null) - { - DisposeKey(); - } - _keyHandle = CngKeyLite.GenerateNewExportableKey(algorithm, keySize); - _lastKeySize = keySize; - _lastAlgorithm = algorithm; - ForceSetKeySize(keySize); - } - return new DuplicateSafeNCryptKeyHandle(_keyHandle); - } - } + private readonly ECCngKey _key = new ECCngKey(AlgorithmName.ECDsa); + private string GetCurveName() => _key.GetCurveName(KeySize); + public override void GenerateKey(ECCurve curve) { - curve.Validate(); - - if (_keyHandle != null) - { - DisposeKey(); - } - - string algorithm = null; - int keySize = 0; - - if (curve.IsNamed) - { - if (string.IsNullOrEmpty(curve.Oid.FriendlyName)) - throw new PlatformNotSupportedException(string.Format(SR.Cryptography_InvalidCurveOid, curve.Oid.Value)); - - // Map curve name to algorithm to support pre-Win10 curves - algorithm = ECCng.EcdsaCurveNameToAlgorithm(curve.Oid.FriendlyName); - if (IsECNamedCurve(algorithm)) - { - try - { - _keyHandle = CngKeyLite.GenerateNewExportableKey(algorithm, curve.Oid.FriendlyName); - keySize = CngKeyLite.GetKeyLength(_keyHandle); - } - catch (CryptographicException e) - { - // Map to PlatformNotSupportedException if appropriate - ErrorCode errorCode = (ErrorCode)e.HResult; - - if (curve.IsNamed && - errorCode == ErrorCode.NTE_INVALID_PARAMETER || errorCode == ErrorCode.NTE_NOT_SUPPORTED) - { - throw new PlatformNotSupportedException(string.Format(SR.Cryptography_CurveNotSupported, curve.Oid.FriendlyName), e); - } - throw; - } - } - else - { - // Get the proper KeySize from algorithm name - if (algorithm == AlgorithmName.ECDsaP256) - keySize = 256; - else if (algorithm == AlgorithmName.ECDsaP384) - keySize = 384; - else if (algorithm == AlgorithmName.ECDsaP521) - keySize = 521; - else - { - Debug.Fail(string.Format("Unknown algorithm {0}", algorithm.ToString())); - throw new ArgumentException(SR.Cryptography_InvalidKeySize); - } - _keyHandle = CngKeyLite.GenerateNewExportableKey(algorithm, keySize); - } - } - else if (curve.IsExplicit) - { - algorithm = AlgorithmName.ECDsa; - _keyHandle = CngKeyLite.GenerateNewExportableKey(algorithm, ref curve); - keySize = CngKeyLite.GetKeyLength(_keyHandle); - } - else - { - throw new PlatformNotSupportedException(string.Format(SR.Cryptography_CurveNotSupported, curve.CurveType.ToString())); - } - - _lastAlgorithm = algorithm; - _lastKeySize = keySize; - ForceSetKeySize(keySize); + _key.GenerateKey(curve); + ForceSetKeySize(_key.KeySize); } - private void DisposeKey() - { - if (_keyHandle != null) - { - _keyHandle.Dispose(); - _keyHandle = null; - } - _lastAlgorithm = null; - _lastKeySize = 0; - } + private SafeNCryptKeyHandle GetDuplicatedKeyHandle() => _key.GetDuplicatedKeyHandle(KeySize); + + private void DisposeKey() => _key.DisposeKey(); } } } diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDsaCng.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDsaCng.cs index e2f6bf17b4..70ababc343 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDsaCng.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/ECDsaCng.cs @@ -58,13 +58,8 @@ namespace System.Security.Cryptography Debug.Assert(!keyHandle.IsInvalid); - _keyHandle = keyHandle; - _lastAlgorithm = AlgorithmName.ECDsa; - - int newKeySize = CngKeyLite.GetKeyLength(keyHandle); - - ForceSetKeySize(newKeySize); - _lastKeySize = newKeySize; + _key.SetHandle(keyHandle, AlgorithmName.ECDsa); + ForceSetKeySize(_key.KeySize); } private void ImportKeyBlob(byte[] ecKeyBlob, string curveName, bool includePrivateParameters) @@ -77,13 +72,8 @@ namespace System.Security.Cryptography Debug.Assert(!keyHandle.IsInvalid); - _keyHandle = keyHandle; - _lastAlgorithm = ECCng.EcdsaCurveNameToAlgorithm(curveName); - - int newKeySize = CngKeyLite.GetKeyLength(keyHandle); - - ForceSetKeySize(newKeySize); - _lastKeySize = newKeySize; + _key.SetHandle(keyHandle, ECCng.EcdsaCurveNameToAlgorithm(curveName)); + ForceSetKeySize(_key.KeySize); } private byte[] ExportKeyBlob(bool includePrivateParameters) diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/RSA.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/RSA.cs index c0e34b19c2..aa5962b0be 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/RSA.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/RSA.cs @@ -56,9 +56,9 @@ namespace System.Security.Cryptography protected virtual byte[] HashData(byte[] data, int offset, int count, HashAlgorithmName hashAlgorithm) => throw DerivedClassMustOverride(); protected virtual byte[] HashData(Stream data, HashAlgorithmName hashAlgorithm) => throw DerivedClassMustOverride(); - public virtual bool TryDecrypt(ReadOnlySpan source, Span destination, RSAEncryptionPadding padding, out int bytesWritten) + public virtual bool TryDecrypt(ReadOnlySpan data, Span destination, RSAEncryptionPadding padding, out int bytesWritten) { - byte[] result = Decrypt(source.ToArray(), padding); + byte[] result = Decrypt(data.ToArray(), padding); if (destination.Length >= result.Length) { @@ -71,9 +71,9 @@ namespace System.Security.Cryptography return false; } - public virtual bool TryEncrypt(ReadOnlySpan source, Span destination, RSAEncryptionPadding padding, out int bytesWritten) + public virtual bool TryEncrypt(ReadOnlySpan data, Span destination, RSAEncryptionPadding padding, out int bytesWritten) { - byte[] result = Encrypt(source.ToArray(), padding); + byte[] result = Encrypt(data.ToArray(), padding); if (destination.Length >= result.Length) { @@ -86,18 +86,18 @@ namespace System.Security.Cryptography return false; } - protected virtual bool TryHashData(ReadOnlySpan source, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) + protected virtual bool TryHashData(ReadOnlySpan data, Span destination, HashAlgorithmName hashAlgorithm, out int bytesWritten) { byte[] result; - byte[] array = ArrayPool.Shared.Rent(source.Length); + byte[] array = ArrayPool.Shared.Rent(data.Length); try { - source.CopyTo(array); - result = HashData(array, 0, source.Length, hashAlgorithm); + data.CopyTo(array); + result = HashData(array, 0, data.Length, hashAlgorithm); } finally { - Array.Clear(array, 0, source.Length); + Array.Clear(array, 0, data.Length); ArrayPool.Shared.Return(array); } @@ -112,9 +112,9 @@ namespace System.Security.Cryptography return false; } - public virtual bool TrySignHash(ReadOnlySpan source, Span destination, HashAlgorithmName hashAlgorithm, RSASignaturePadding padding, out int bytesWritten) + public virtual bool TrySignHash(ReadOnlySpan hash, Span destination, HashAlgorithmName hashAlgorithm, RSASignaturePadding padding, out int bytesWritten) { - byte[] result = SignHash(source.ToArray(), hashAlgorithm, padding); + byte[] result = SignHash(hash.ToArray(), hashAlgorithm, padding); if (destination.Length >= result.Length) { @@ -184,7 +184,7 @@ namespace System.Security.Cryptography return SignHash(hash, hashAlgorithm, padding); } - public virtual bool TrySignData(ReadOnlySpan source, Span destination, HashAlgorithmName hashAlgorithm, RSASignaturePadding padding, out int bytesWritten) + public virtual bool TrySignData(ReadOnlySpan data, Span destination, HashAlgorithmName hashAlgorithm, RSASignaturePadding padding, out int bytesWritten) { if (string.IsNullOrEmpty(hashAlgorithm.Name)) { @@ -195,7 +195,7 @@ namespace System.Security.Cryptography throw new ArgumentNullException(nameof(padding)); } - if (TryHashData(source, destination, hashAlgorithm, out int hashLength) && + if (TryHashData(data, destination, hashAlgorithm, out int hashLength) && TrySignHash(destination.Slice(0, hashLength), destination, hashAlgorithm, padding, out bytesWritten)) { return true; diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/RandomNumberGenerator.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/RandomNumberGenerator.cs index 31c88b7739..8a3895f048 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/RandomNumberGenerator.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/RandomNumberGenerator.cs @@ -91,6 +91,11 @@ namespace System.Security.Cryptography } } + public static void Fill(Span data) + { + RandomNumberGeneratorImplementation.FillSpan(data); + } + internal void VerifyGetBytes(byte[] data, int offset, int count) { if (data == null) throw new ArgumentNullException(nameof(data)); diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/CryptoConfigTests.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/CryptoConfigTests.cs index 9e78d3bddb..c4e971b468 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/CryptoConfigTests.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/CryptoConfigTests.cs @@ -192,7 +192,7 @@ namespace System.Security.Cryptography.CryptoConfigTests yield return new object[] { "System.Security.Cryptography.AsymmetricAlgorithm", "System.Security.Cryptography.RSACryptoServiceProvider", true }; yield return new object[] { "DSA", "System.Security.Cryptography.DSACryptoServiceProvider", true }; yield return new object[] { "System.Security.Cryptography.DSA", "System.Security.Cryptography.DSACryptoServiceProvider", true }; - yield return new object[] { "ECDsa", "System.Security.Cryptography.ECDsaCng", false }; + yield return new object[] { "ECDsa", "System.Security.Cryptography.ECDsaCng", true }; yield return new object[] { "ECDsaCng", "System.Security.Cryptography.ECDsaCng", false }; yield return new object[] { "System.Security.Cryptography.ECDsaCng", null, false }; yield return new object[] { "DES", "System.Security.Cryptography.DESCryptoServiceProvider", true }; @@ -256,7 +256,9 @@ namespace System.Security.Cryptography.CryptoConfigTests [Theory, MemberData(nameof(AllValidNames))] public static void CreateFromName_AllValidNames(string name, string typeName, bool supportsUnixMac) { - if (supportsUnixMac || RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + bool isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows); + + if (supportsUnixMac || isWindows) { object obj = CryptoConfig.CreateFromName(name); Assert.NotNull(obj); @@ -266,7 +268,15 @@ namespace System.Security.Cryptography.CryptoConfigTests typeName = name; } - Assert.Equal(typeName, obj.GetType().FullName); + // ECDsa is special on non-Windows + if (isWindows || name != "ECDsa") + { + Assert.Equal(typeName, obj.GetType().FullName); + } + else + { + Assert.NotEqual(typeName, obj.GetType().FullName); + } if (obj is IDisposable) { diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/DSATests.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/DSATests.cs index c3d1251db6..22c9391ba7 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/DSATests.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/DSATests.cs @@ -107,7 +107,7 @@ namespace System.Security.Cryptography.Algorithms.Tests byte[] signature = wrapperDsa.SignData(input, HashAlgorithmName.SHA1); Assert.True(wrapperDsa.VerifyData(input.AsSpan(), signature, HashAlgorithmName.SHA1)); - Assert.False(wrapperDsa.VerifyData(input.AsSpan(), signature.AsReadOnlySpan().Slice(0, signature.Length - 1), HashAlgorithmName.SHA1)); + Assert.False(wrapperDsa.VerifyData(input.AsSpan(), signature.AsSpan(0, signature.Length - 1), HashAlgorithmName.SHA1)); } } @@ -126,7 +126,7 @@ namespace System.Security.Cryptography.Algorithms.Tests byte[] signature = wrapperDsa.SignData(new MemoryStream(input), HashAlgorithmName.SHA1); Assert.True(wrapperDsa.VerifyData(new MemoryStream(input), signature, HashAlgorithmName.SHA1)); - Assert.False(wrapperDsa.VerifyData(new MemoryStream(input), signature.AsReadOnlySpan().Slice(0, signature.Length - 1).ToArray(), HashAlgorithmName.SHA1)); + Assert.False(wrapperDsa.VerifyData(new MemoryStream(input), signature.AsSpan(0, signature.Length - 1).ToArray(), HashAlgorithmName.SHA1)); } } @@ -143,7 +143,7 @@ namespace System.Security.Cryptography.Algorithms.Tests byte[] signature = wrapperDsa.SignData(input, HashAlgorithmName.SHA1); Assert.True(wrapperDsa.VerifyData(input.AsSpan(), signature, HashAlgorithmName.SHA1)); - Assert.False(wrapperDsa.VerifyData(input.AsSpan(), signature.AsReadOnlySpan().Slice(0, signature.Length - 1), HashAlgorithmName.SHA1)); + Assert.False(wrapperDsa.VerifyData(input.AsSpan(), signature.AsSpan(0, signature.Length - 1), HashAlgorithmName.SHA1)); } } diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/DefaultECDiffieHellmanProvider.Unix.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/DefaultECDiffieHellmanProvider.Unix.cs new file mode 100644 index 0000000000..21c3c5016e --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/DefaultECDiffieHellmanProvider.Unix.cs @@ -0,0 +1,54 @@ +// 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.Runtime.InteropServices; + +namespace System.Security.Cryptography.EcDiffieHellman.Tests +{ + public partial class ECDiffieHellmanProvider : IECDiffieHellmanProvider + { + public bool IsCurveValid(Oid oid) + { + if (PlatformDetection.IsOSX) + { + return false; + } + if (!string.IsNullOrEmpty(oid.Value)) + { + // Value is passed before FriendlyName + return IsValueOrFriendlyNameValid(oid.Value); + } + return IsValueOrFriendlyNameValid(oid.FriendlyName); + } + + public bool ExplicitCurvesSupported + { + get + { + if (PlatformDetection.IsOSX) + { + return false; + } + + return true; + } + } + + private static bool IsValueOrFriendlyNameValid(string friendlyNameOrValue) + { + if (string.IsNullOrEmpty(friendlyNameOrValue)) + { + return false; + } + + IntPtr key = Interop.Crypto.EcKeyCreateByOid(friendlyNameOrValue); + if (key != IntPtr.Zero) + { + Interop.Crypto.EcKeyDestroy(key); + return true; + } + return false; + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/DefaultECDiffieHellmanProvider.Windows.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/DefaultECDiffieHellmanProvider.Windows.cs new file mode 100644 index 0000000000..a5c2470275 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/DefaultECDiffieHellmanProvider.Windows.cs @@ -0,0 +1,45 @@ +// 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.Runtime.InteropServices; +using Test.Cryptography; + +namespace System.Security.Cryptography.EcDiffieHellman.Tests +{ + public partial class ECDiffieHellmanProvider : IECDiffieHellmanProvider + { + public bool IsCurveValid(Oid oid) + { + // Friendly name required for windows + return NativeOidFriendlyNameExists(oid.FriendlyName); + } + + public bool ExplicitCurvesSupported + { + get + { + return PlatformDetection.WindowsVersion >= 10; + } + } + + private static bool NativeOidFriendlyNameExists(string oidFriendlyName) + { + if (string.IsNullOrEmpty(oidFriendlyName)) + return false; + + try + { + // By specifying OidGroup.PublicKeyAlgorithm, no caches are used + // Note: this throws when there is no oid value, even when friendly name is valid + // so it cannot be used for curves with no oid value such as curve25519 + return !string.IsNullOrEmpty(Oid.FromFriendlyName(oidFriendlyName, OidGroup.PublicKeyAlgorithm).FriendlyName); + } + catch (Exception) + { + return false; + } + } + } +} + diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/DefaultECDiffieHellmanProvider.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/DefaultECDiffieHellmanProvider.cs new file mode 100644 index 0000000000..2885750e10 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/DefaultECDiffieHellmanProvider.cs @@ -0,0 +1,32 @@ +// 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.Security.Cryptography.EcDiffieHellman.Tests +{ + public partial class ECDiffieHellmanProvider : IECDiffieHellmanProvider + { + public ECDiffieHellman Create() + { + return ECDiffieHellman.Create(); + } + + public ECDiffieHellman Create(int keySize) + { + ECDiffieHellman ec = Create(); + ec.KeySize = keySize; + return ec; + } + + public ECDiffieHellman Create(ECCurve curve) + { + return ECDiffieHellman.Create(curve); + } + } + + public partial class ECDiffieHellmanFactory + { + private static readonly IECDiffieHellmanProvider s_provider = new ECDiffieHellmanProvider(); + } +} + diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/DefaultRSAProvider.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/DefaultRSAProvider.cs index f3c3414888..873a599b23 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/DefaultRSAProvider.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/DefaultRSAProvider.cs @@ -45,13 +45,14 @@ namespace System.Security.Cryptography.Rsa.Tests } } - public bool SupportsSha2Oaep - { - // Currently only RSACng does, which is the default provider on Windows. - get { return RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && !(Create() is RSACryptoServiceProvider); } - } + public bool SupportsSha2Oaep { get; } = + !PlatformDetection.IsFullFramework || !(RSA.Create() is RSACryptoServiceProvider); + + public bool SupportsPss { get; } = + !PlatformDetection.IsFullFramework || !(RSA.Create() is RSACryptoServiceProvider); public bool SupportsDecryptingIntoExactSpaceRequired => RuntimeInformation.IsOSPlatform(OSPlatform.Windows); + } public partial class RSAFactory diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/ECDiffieHellmanPublicKeyTests.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/ECDiffieHellmanPublicKeyTests.cs index a769d4e2c5..c73f6b6e63 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/ECDiffieHellmanPublicKeyTests.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/ECDiffieHellmanPublicKeyTests.cs @@ -4,7 +4,7 @@ using Xunit; -namespace System.Security.Cryptography.ECDiffieHellman.Tests +namespace System.Security.Cryptography.EcDiffieHellman.Tests { public class ECDiffieHellmanPublicKeyTests { diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/ECDiffieHellmanTests.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/ECDiffieHellmanTests.cs new file mode 100644 index 0000000000..5770079da2 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/ECDiffieHellmanTests.cs @@ -0,0 +1,50 @@ +// 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.Collections.Generic; +using System.Security.Cryptography; +using System.Security.Cryptography.Tests; +using System.Text; +using Test.Cryptography; +using Xunit; + +namespace System.Security.Cryptography.EcDiffieHellman.Tests +{ + public partial class ECDiffieHellmanTests + { + [Fact] + public static void ECCurve_ctor() + { + using (ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create(ECCurve.NamedCurves.nistP256)) + { + Assert.Equal(256, ecdh.KeySize); + ecdh.Exercise(); + } + + using (ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create(ECCurve.NamedCurves.nistP384)) + { + Assert.Equal(384, ecdh.KeySize); + ecdh.Exercise(); + } + + using (ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create(ECCurve.NamedCurves.nistP521)) + { + Assert.Equal(521, ecdh.KeySize); + ecdh.Exercise(); + } + } + + [Fact] + public static void Equivalence_Hash() + { + using (ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create()) + using (ECDiffieHellmanPublicKey publicKey = ecdh.PublicKey) + { + byte[] newWay = ecdh.DeriveKeyFromHash(publicKey, HashAlgorithmName.SHA256, null, null); + byte[] oldWay = ecdh.DeriveKeyMaterial(publicKey); + Assert.Equal(newWay, oldWay); + } + } + } +} \ No newline at end of file diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/ECDsaTests.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/ECDsaTests.cs index 644cf412f7..217467798f 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/ECDsaTests.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/ECDsaTests.cs @@ -76,7 +76,7 @@ namespace System.Security.Cryptography.Algorithms.Tests Assert.NotNull(result); Assert.NotEmpty(result); - Assert.False(ecdsa.VerifyData(input.AsSpan().Slice(1).ToArray(), result, HashAlgorithmName.SHA256)); + Assert.False(ecdsa.VerifyData(input.AsSpan(1).ToArray(), result, HashAlgorithmName.SHA256)); Assert.True(ecdsa.VerifyData(input, result, HashAlgorithmName.SHA256)); } } @@ -102,7 +102,7 @@ namespace System.Security.Cryptography.Algorithms.Tests Assert.NotNull(result); Assert.NotEmpty(result); - Assert.False(ecdsa.VerifyData(new MemoryStream(input.AsSpan().Slice(1).ToArray()), result, HashAlgorithmName.SHA256)); + Assert.False(ecdsa.VerifyData(new MemoryStream(input.AsSpan(1).ToArray()), result, HashAlgorithmName.SHA256)); Assert.True(ecdsa.VerifyData(new MemoryStream(input), result, HashAlgorithmName.SHA256)); } } diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/HashAlgorithmTest.netcoreapp.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/HashAlgorithmTest.netcoreapp.cs index c76951d8dc..5750440f0a 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/HashAlgorithmTest.netcoreapp.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/HashAlgorithmTest.netcoreapp.cs @@ -34,7 +34,7 @@ namespace System.Security.Cryptography.Hashing.Algorithms.Tests actual[actual.Length - 1] = 42; Assert.True(hash.TryComputeHash(input, actual, out bytesWritten)); Assert.Equal(expected.Length, bytesWritten); - Assert.Equal(expected, actual.AsSpan().Slice(0, expected.Length).ToArray()); + Assert.Equal(expected, actual.AsSpan(0, expected.Length).ToArray()); Assert.Equal(42, actual[actual.Length - 1]); } } diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/IncrementalHashTests.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/IncrementalHashTests.cs index ee0e6cd5d0..d029cda080 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/IncrementalHashTests.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/IncrementalHashTests.cs @@ -265,5 +265,19 @@ namespace System.Security.Cryptography.Algorithms.Tests Assert.Throws(() => hash.GetHashAndReset()); } } + + [Fact] + public static void UnknownDigestAlgorithm() + { + Assert.ThrowsAny( + () => IncrementalHash.CreateHash(new HashAlgorithmName("SHA0"))); + } + + [Fact] + public static void UnknownHmacAlgorithm() + { + Assert.ThrowsAny( + () => IncrementalHash.CreateHMAC(new HashAlgorithmName("SHA0"), Array.Empty())); + } } } diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/RandomNumberGeneratorTests.netcoreapp.cs b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/RandomNumberGeneratorTests.netcoreapp.cs index 3ca4bbabaf..018e2b0088 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/RandomNumberGeneratorTests.netcoreapp.cs +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/RandomNumberGeneratorTests.netcoreapp.cs @@ -55,5 +55,42 @@ namespace System.Security.Cryptography.RNG.Tests Assert.Equal(-1, Array.IndexOf(rand, 0)); } } + + [Fact] + public static void Fill_ZeroLengthSpan() + { + byte[] rand = { 1 }; + RandomNumberGenerator.Fill(new Span(rand, 0, 0)); + Assert.Equal(1, rand[0]); + } + + [Fact] + public static void Fill_SpanLength1() + { + byte[] rand = { 1 }; + bool replacedValue = false; + + for (int i = 0; i < 10; i++) + { + RandomNumberGenerator.Fill(rand); + + if (rand[0] != 1) + { + replacedValue = true; + break; + } + } + + Assert.True(replacedValue, "Fill eventually wrote a different byte"); + } + + [Fact] + public static void Fill_RandomDistribution() + { + byte[] random = new byte[2048]; + RandomNumberGenerator.Fill(random); + + RandomDataGenerator.VerifyRandomDistribution(random); + } } } diff --git a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj index 4ecce64cd1..5698a14e2c 100644 --- a/external/corefx/src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj +++ b/external/corefx/src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj @@ -52,6 +52,12 @@ CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\CurveDef.cs + + CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\EccTestBase.cs + + + CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\EccTestData.cs + CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaFactory.cs @@ -70,9 +76,6 @@ CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTestsBase.cs - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTestData.cs - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs @@ -129,23 +132,55 @@ + + + Common\Interop\Unix\Interop.Libraries.cs + + + + + CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanFactory.cs + + + CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.cs + + + CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hash.cs + + + CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hmac.cs + + + CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.ImportExport.cs + + + CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.NistValidation.cs + + + CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Tls.cs + + + CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Xml.cs + + + diff --git a/external/corefx/src/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.pkgproj b/external/corefx/src/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.pkgproj index 149f0eaee0..83c04f6ad0 100644 --- a/external/corefx/src/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.pkgproj +++ b/external/corefx/src/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.pkgproj @@ -8,9 +8,10 @@ - runtimes/win/lib/$(UAPvNextTFM) + runtimes/win/lib/uap10.0.16299 - + + diff --git a/external/corefx/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.ECDiffieHellman.cs b/external/corefx/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.ECDiffieHellman.cs new file mode 100644 index 0000000000..538bbe8b25 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.ECDiffieHellman.cs @@ -0,0 +1,70 @@ +// 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. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the http://aka.ms/api-review process. +// ------------------------------------------------------------------------------ + +namespace System.Security.Cryptography +{ + public sealed partial class ECDiffieHellmanCng : System.Security.Cryptography.ECDiffieHellman + { + public ECDiffieHellmanCng() { } + public ECDiffieHellmanCng(int keySize) { } + public ECDiffieHellmanCng(CngKey key) { } +#if FEATURE_ECPARAMETERS + public ECDiffieHellmanCng(System.Security.Cryptography.ECCurve curve) { } +#endif + public System.Security.Cryptography.CngAlgorithm HashAlgorithm { get { throw null; } set { } } + public byte[] HmacKey { get { throw null; } set { } } + public System.Security.Cryptography.CngKey Key { get { throw null; } } + public System.Security.Cryptography.ECDiffieHellmanKeyDerivationFunction KeyDerivationFunction { get { throw null; } set { } } + public override int KeySize { get { throw null; } set { } } + public byte[] Label { get { throw null; } set { } } + public override System.Security.Cryptography.ECDiffieHellmanPublicKey PublicKey { get { throw null; } } + public byte[] SecretAppend { get { throw null; } set { } } + public byte[] SecretPrepend { get { throw null; } set { } } + public byte[] Seed { get { throw null; } set { } } + public bool UseSecretAgreementAsHmacKey { get { throw null; } } +#if FEATURE_ECDH_DERIVEFROM + public override byte[] DeriveKeyFromHash(System.Security.Cryptography.ECDiffieHellmanPublicKey otherPartyPublicKey, System.Security.Cryptography.HashAlgorithmName hashAlgorithm, byte[] secretPrepend, byte[] secretAppend) { throw null; } + public override byte[] DeriveKeyFromHmac(System.Security.Cryptography.ECDiffieHellmanPublicKey otherPartyPublicKey, System.Security.Cryptography.HashAlgorithmName hashAlgorithm, byte[] hmacKey, byte[] secretPrepend, byte[] secretAppend) { throw null; } + public override byte[] DeriveKeyTls(System.Security.Cryptography.ECDiffieHellmanPublicKey otherPartyPublicKey, byte[] prfLabel, byte[] prfSeed) { throw null; } +#endif + public byte[] DeriveKeyMaterial(System.Security.Cryptography.CngKey otherPartyPublicKey) { throw null; } + public override byte[] DeriveKeyMaterial(System.Security.Cryptography.ECDiffieHellmanPublicKey otherPartyPublicKey) { throw null; } + public Microsoft.Win32.SafeHandles.SafeNCryptSecretHandle DeriveSecretAgreementHandle(System.Security.Cryptography.CngKey otherPartyPublicKey) { throw null; } + public Microsoft.Win32.SafeHandles.SafeNCryptSecretHandle DeriveSecretAgreementHandle(System.Security.Cryptography.ECDiffieHellmanPublicKey otherPartyPublicKey) { throw null; } + protected override void Dispose(bool disposing) { } +#if FEATURE_ECPARAMETERS + public override System.Security.Cryptography.ECParameters ExportExplicitParameters(bool includePrivateParameters) { throw null; } + public override System.Security.Cryptography.ECParameters ExportParameters(bool includePrivateParameters) { throw null; } +#endif + public void FromXmlString(string xml, System.Security.Cryptography.ECKeyXmlFormat format) { } +#if FEATURE_ECPARAMETERS + public override void GenerateKey(System.Security.Cryptography.ECCurve curve) { } + public override void ImportParameters(System.Security.Cryptography.ECParameters parameters) { } +#endif + public string ToXmlString(System.Security.Cryptography.ECKeyXmlFormat format) { throw null; } + } + public sealed partial class ECDiffieHellmanCngPublicKey : System.Security.Cryptography.ECDiffieHellmanPublicKey + { + private ECDiffieHellmanCngPublicKey() : base(null) { } + public System.Security.Cryptography.CngKeyBlobFormat BlobFormat { get { throw null; } } + protected override void Dispose(bool disposing) { } +#if FEATURE_ECPARAMETERS + public override System.Security.Cryptography.ECParameters ExportExplicitParameters() { throw null; } + public override System.Security.Cryptography.ECParameters ExportParameters() { throw null; } +#endif + public static System.Security.Cryptography.ECDiffieHellmanPublicKey FromByteArray(byte[] publicKeyBlob, System.Security.Cryptography.CngKeyBlobFormat format) { throw null; } + public static System.Security.Cryptography.ECDiffieHellmanCngPublicKey FromXmlString(string xml) { throw null; } + public System.Security.Cryptography.CngKey Import() { throw null; } + public override string ToXmlString() { throw null; } + } + public enum ECDiffieHellmanKeyDerivationFunction + { + Hash = 0, + Hmac = 1, + Tls = 2, + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.cs b/external/corefx/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.cs index 1d6c944bf9..ce84ccec1d 100644 --- a/external/corefx/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.cs +++ b/external/corefx/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.cs @@ -265,7 +265,7 @@ namespace System.Security.Cryptography public override string SignatureAlgorithm { get { throw null; } } protected override void Dispose(bool disposing) { } public override System.Security.Cryptography.DSAParameters ExportParameters(bool includePrivateParameters) { throw null; } -#if FEATURE_HASHDATA // uap and netcoreapp specific +#if FEATURE_DSA_HASHDATA protected override byte[] HashData(byte[] data, int offset, int count, System.Security.Cryptography.HashAlgorithmName hashAlgorithm) { throw null; } protected override byte[] HashData(System.IO.Stream data, System.Security.Cryptography.HashAlgorithmName hashAlgorithm) { throw null; } #endif diff --git a/external/corefx/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj b/external/corefx/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj index dc15bd1da2..a54f705b1e 100644 --- a/external/corefx/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj +++ b/external/corefx/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj @@ -4,7 +4,10 @@ $(DefineConstants);FEATURE_ECPARAMETERS {9FD12550-3A7C-49D3-9A1E-C4B7410989DD} - $(DefineConstants);FEATURE_HASHDATA + + $(DefineConstants);FEATURE_DSA_HASHDATA + + $(DefineConstants);FEATURE_ECDH_DERIVEFROM true + diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.cs index a6f9682cd6..90ffa1454f 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.cs @@ -20,8 +20,8 @@ namespace System.Security.Cryptography public CryptographicAttributeObjectCollection(System.Security.Cryptography.CryptographicAttributeObject attribute) { } public int Count { get { throw null; } } public System.Security.Cryptography.CryptographicAttributeObject this[int index] { get { throw null; } } - bool System.Collections.ICollection.IsSynchronized { get { throw null; } } - object System.Collections.ICollection.SyncRoot { get { throw null; } } + public bool IsSynchronized { get { throw null; } } + public object SyncRoot { get { throw null; } } public int Add(System.Security.Cryptography.AsnEncodedData asnEncodedData) { throw null; } public int Add(System.Security.Cryptography.CryptographicAttributeObject attribute) { throw null; } public void CopyTo(System.Security.Cryptography.CryptographicAttributeObject[] array, int index) { } @@ -48,6 +48,7 @@ namespace System.Security.Cryptography.Pkcs public AlgorithmIdentifier(System.Security.Cryptography.Oid oid, int keyLength) { } public int KeyLength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public System.Security.Cryptography.Oid Oid { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public byte[] Parameters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } } public sealed partial class CmsRecipient { @@ -63,8 +64,8 @@ namespace System.Security.Cryptography.Pkcs public CmsRecipientCollection(System.Security.Cryptography.Pkcs.SubjectIdentifierType recipientIdentifierType, System.Security.Cryptography.X509Certificates.X509Certificate2Collection certificates) { } public int Count { get { throw null; } } public System.Security.Cryptography.Pkcs.CmsRecipient this[int index] { get { throw null; } } - bool System.Collections.ICollection.IsSynchronized { get { throw null; } } - object System.Collections.ICollection.SyncRoot { get { throw null; } } + public bool IsSynchronized { get { throw null; } } + public object SyncRoot { get { throw null; } } public int Add(System.Security.Cryptography.Pkcs.CmsRecipient recipient) { throw null; } public void CopyTo(System.Array array, int index) { } public void CopyTo(System.Security.Cryptography.Pkcs.CmsRecipient[] array, int index) { } @@ -91,9 +92,9 @@ namespace System.Security.Cryptography.Pkcs public SubjectIdentifierType SignerIdentifierType { get => throw null; set => throw null; } public System.Security.Cryptography.X509Certificates.X509Certificate2 Certificate { get => throw null; set => throw null; } public Oid DigestAlgorithm { get => throw null; set => throw null; } - public CryptographicAttributeObjectCollection SignedAttributes { get => throw null; set => throw null; } - public CryptographicAttributeObjectCollection UnsignedAttributes { get => throw null; set => throw null; } - public System.Security.Cryptography.X509Certificates.X509Certificate2Collection Certificates { get => throw null; set => throw null; } + public CryptographicAttributeObjectCollection SignedAttributes { get => throw null; } + public CryptographicAttributeObjectCollection UnsignedAttributes { get => throw null; } + public System.Security.Cryptography.X509Certificates.X509Certificate2Collection Certificates { get => throw null; } public System.Security.Cryptography.X509Certificates.X509IncludeOption IncludeOption { get => throw null; set => throw null; } } public sealed partial class ContentInfo @@ -208,8 +209,8 @@ namespace System.Security.Cryptography.Pkcs internal RecipientInfoCollection() { } public int Count { get { throw null; } } public System.Security.Cryptography.Pkcs.RecipientInfo this[int index] { get { throw null; } } - bool System.Collections.ICollection.IsSynchronized { get { throw null; } } - object System.Collections.ICollection.SyncRoot { get { throw null; } } + public bool IsSynchronized { get { throw null; } } + public object SyncRoot { get { throw null; } } public void CopyTo(System.Array array, int index) { } public void CopyTo(System.Security.Cryptography.Pkcs.RecipientInfo[] array, int index) { } public System.Security.Cryptography.Pkcs.RecipientInfoEnumerator GetEnumerator() { throw null; } diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj b/external/corefx/src/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj index e5d055ae1f..f52fded032 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj @@ -24,6 +24,7 @@ + diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.netcoreapp.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.netcoreapp.cs index 1d65c813f0..fc90740267 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.netcoreapp.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.netcoreapp.cs @@ -5,8 +5,60 @@ // Changes to this file must follow the http://aka.ms/api-review process. // ------------------------------------------------------------------------------ +using System.Security.Cryptography.X509Certificates; + namespace System.Security.Cryptography.Pkcs { + public sealed partial class Rfc3161TimestampRequest + { + private Rfc3161TimestampRequest() { } + public int Version => throw null; + public ReadOnlyMemory GetMessageHash() => throw null; + public Oid HashAlgorithmId => throw null; + public Oid RequestedPolicyId => throw null; + public bool RequestSignerCertificate => throw null; + public ReadOnlyMemory? GetNonce() => throw null; + public bool HasExtensions => throw null; + public X509ExtensionCollection GetExtensions() => throw null; + public byte[] Encode() => throw null; + public bool TryEncode(Span destination, out int bytesWritten) => throw null; + public Rfc3161TimestampToken ProcessResponse(ReadOnlyMemory responseBytes, out int bytesConsumed) => throw null; + public static Rfc3161TimestampRequest CreateFromData(ReadOnlySpan data, HashAlgorithmName hashAlgorithm, Oid requestedPolicyId = null, ReadOnlyMemory? nonce = null, bool requestSignerCertificates = false, X509ExtensionCollection extensions = null) => throw null; + public static Rfc3161TimestampRequest CreateFromHash(ReadOnlyMemory hash, HashAlgorithmName hashAlgorithm, Oid requestedPolicyId = null, ReadOnlyMemory? nonce = null, bool requestSignerCertificates = false, X509ExtensionCollection extensions = null) => throw null; + public static Rfc3161TimestampRequest CreateFromHash(ReadOnlyMemory hash, Oid hashAlgorithmId, Oid requestedPolicyId = null, ReadOnlyMemory? nonce = null, bool requestSignerCertificates = false, X509ExtensionCollection extensions = null) => throw null; + public static Rfc3161TimestampRequest CreateFromSignerInfo(SignerInfo signerInfo, HashAlgorithmName hashAlgorithm, Oid requestedPolicyId = null, ReadOnlyMemory? nonce = null, bool requestSignerCertificates = false, X509ExtensionCollection extensions = null) => throw null; + public static bool TryDecode(ReadOnlyMemory encodedBytes, out Rfc3161TimestampRequest request, out int bytesConsumed) => throw null; + } + public sealed partial class Rfc3161TimestampToken + { + private Rfc3161TimestampToken() { } + public Rfc3161TimestampTokenInfo TokenInfo => throw null; + public SignedCms AsSignedCms() => throw null; + public bool VerifySignatureForHash(ReadOnlySpan hash, HashAlgorithmName hashAlgorithm, out X509Certificate2 signerCertificate, X509Certificate2Collection extraCandidates = null) => throw null; + public bool VerifySignatureForHash(ReadOnlySpan hash, Oid hashAlgorithmId, out X509Certificate2 signerCertificate, X509Certificate2Collection extraCandidates = null) => throw null; + public bool VerifySignatureForData(ReadOnlySpan data, out X509Certificate2 signerCertificate, X509Certificate2Collection extraCandidates = null) => throw null; + public bool VerifySignatureForSignerInfo(SignerInfo signerInfo, out X509Certificate2 signerCertificate, X509Certificate2Collection extraCandidates = null) => throw null; + public static bool TryDecode(ReadOnlyMemory encodedBytes, out Rfc3161TimestampToken token, out int bytesConsumed) => throw null; + } + public sealed partial class Rfc3161TimestampTokenInfo + { + public Rfc3161TimestampTokenInfo(Oid policyId, Oid hashAlgorithmId, ReadOnlyMemory messageHash, ReadOnlyMemory serialNumber, DateTimeOffset timestamp, long? accuracyInMicroseconds=null, bool isOrdering=false, ReadOnlyMemory? nonce=null, ReadOnlyMemory? timestampAuthorityName=null, X509ExtensionCollection extensions =null) { throw null; } + public int Version => throw null; + public Oid PolicyId=> throw null; + public Oid HashAlgorithmId => throw null; + public ReadOnlyMemory GetMessageHash() { throw null; } + public ReadOnlyMemory GetSerialNumber() { throw null; } + public DateTimeOffset Timestamp => throw null; + public long? AccuracyInMicroseconds => throw null; + public bool IsOrdering => throw null; + public ReadOnlyMemory? GetNonce() { throw null; } + public ReadOnlyMemory? GetTimestampAuthorityName() { throw null; } + public bool HasExtensions => throw null; + public X509ExtensionCollection GetExtensions() { throw null; } + public byte[] Encode() => throw null; + public bool TryEncode(Span destination, out int bytesWritten) => throw null; + public static bool TryDecode(ReadOnlyMemory encodedBytes, out Rfc3161TimestampTokenInfo timestampTokenInfo, out int bytesConsumed) { throw null; } + } public sealed partial class SignerInfo { public Oid SignatureAlgorithm => throw null; diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Helpers.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Helpers.cs index c972345356..abdce600b6 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Helpers.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Helpers.cs @@ -6,6 +6,7 @@ using System; using System.Buffers; using System.Text; using System.Diagnostics; +using System.IO; using System.Runtime.InteropServices; using System.Security.Cryptography; using System.Security.Cryptography.Asn1; @@ -56,6 +57,22 @@ namespace Internal.Cryptography } } + internal static string GetOidFromHashAlgorithm(HashAlgorithmName algName) + { + if (algName == HashAlgorithmName.MD5) + return Oids.Md5; + if (algName == HashAlgorithmName.SHA1) + return Oids.Sha1; + if (algName == HashAlgorithmName.SHA256) + return Oids.Sha256; + if (algName == HashAlgorithmName.SHA384) + return Oids.Sha384; + if (algName == HashAlgorithmName.SHA512) + return Oids.Sha512; + + throw new CryptographicException(SR.Cryptography_Cms_UnknownAlgorithm, algName.Name); + } + /// /// This is not just a convenience wrapper for Array.Resize(). In DEBUG builds, it forces the array to move in memory even if no resize is needed. This should be used by /// helper methods that do anything of the form "call a native api once to get the estimated size, call it again to get the data and return the data in a byte[] array." @@ -119,6 +136,26 @@ namespace Internal.Cryptography return set.SetData; } + internal static byte[] EncodeContentInfo( + T value, + string contentType, + AsnEncodingRules ruleSet = AsnEncodingRules.DER) + { + using (AsnWriter innerWriter = AsnSerializer.Serialize(value, ruleSet)) + { + ContentInfoAsn content = new ContentInfoAsn + { + ContentType = contentType, + Content = innerWriter.Encode(), + }; + + using (AsnWriter outerWriter = AsnSerializer.Serialize(content, ruleSet)) + { + return outerWriter.Encode(); + } + } + } + public static CmsRecipientCollection DeepCopy(this CmsRecipientCollection recipients) { CmsRecipientCollection recipientsCopy = new CmsRecipientCollection(); @@ -151,7 +188,7 @@ namespace Internal.Cryptography public static X509Certificate2Collection GetStoreCertificates(StoreName storeName, StoreLocation storeLocation, bool openExistingOnly) { - using (X509Store store = new X509Store()) + using (X509Store store = new X509Store(storeName, storeLocation)) { OpenFlags flags = OpenFlags.ReadOnly | OpenFlags.IncludeArchived; if (openExistingOnly) @@ -234,14 +271,14 @@ namespace Internal.Cryptography return skiString.UpperHexStringToByteArray(); } - public static string ToSkiString(this ReadOnlySpan skiBytes) + public static string ToSkiString(this byte[] skiBytes) { return ToUpperHexString(skiBytes); } - public static string ToSkiString(this byte[] skiBytes) + public static string ToBigEndianHex(this ReadOnlySpan bytes) { - return ToUpperHexString(skiBytes); + return ToUpperHexString(bytes); } /// @@ -398,6 +435,29 @@ namespace Internal.Cryptography #endif } + internal static byte[] OneShot(this ICryptoTransform transform, byte[] data) + { + return OneShot(transform, data, 0, data.Length); + } + + internal static byte[] OneShot(this ICryptoTransform transform, byte[] data, int offset, int length) + { + if (transform.CanTransformMultipleBlocks) + { + return transform.TransformFinalBlock(data, offset, length); + } + + using (MemoryStream memoryStream = new MemoryStream()) + { + using (var cryptoStream = new CryptoStream(memoryStream, transform, CryptoStreamMode.Write)) + { + cryptoStream.Write(data, offset, length); + } + + return memoryStream.ToArray(); + } + } + private static ReadOnlyMemory GetSubjectPublicKeyInfo(X509Certificate2 certificate) { var parsedCertificate = AsnSerializer.Deserialize(certificate.RawData, AsnEncodingRules.DER); diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Oids.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Oids.cs index 0abf2df115..2274607c67 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Oids.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Oids.cs @@ -2,19 +2,22 @@ // 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; -using System.Text; -using System.Diagnostics; - namespace Internal.Cryptography { internal static class Oids { // Symmetric encryption algorithms + public const string Rc2Cbc = "1.2.840.113549.3.2"; + public const string Rc4 = "1.2.840.113549.3.4"; public const string TripleDesCbc = "1.2.840.113549.3.7"; + public const string DesCbc = "1.3.14.3.2.7"; + public const string Aes128Cbc = "2.16.840.1.101.3.4.1.2"; + public const string Aes192Cbc = "2.16.840.1.101.3.4.1.22"; + public const string Aes256Cbc = "2.16.840.1.101.3.4.1.42"; // Asymmetric encryption algorithms public const string Rsa = "1.2.840.113549.1.1.1"; + public const string RsaOaep = "1.2.840.113549.1.1.7"; public const string RsaPss = "1.2.840.113549.1.1.10"; public const string Esdh = "1.2.840.113549.1.9.16.3.5"; @@ -24,6 +27,8 @@ namespace Internal.Cryptography public const string DocumentDescription = "1.3.6.1.4.1.311.88.2.2"; public const string MessageDigest = "1.2.840.113549.1.9.4"; public const string CounterSigner = "1.2.840.113549.1.9.6"; + public const string SigningCertificate = "1.2.840.113549.1.9.16.2.12"; + public const string SigningCertificateV2 = "1.2.840.113549.1.9.16.2.47"; public const string DocumentName = "1.3.6.1.4.1.311.88.2.1"; // Key wrap algorithms @@ -64,5 +69,9 @@ namespace Internal.Cryptography // Cert Extensions public const string SubjectKeyIdentifier = "2.5.29.14"; public const string KeyUsage = "2.5.29.15"; + + // RFC3161 Timestamping + public const string TstInfo = "1.2.840.113549.1.9.16.1.4"; + public const string TimeStampingPurpose = "1.3.6.1.5.5.7.3.8"; } } diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/AsnHelpers.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/AsnHelpers.cs new file mode 100644 index 0000000000..92f0651835 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/AsnHelpers.cs @@ -0,0 +1,140 @@ +// 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; +using System.Diagnostics; +using System.Security.Cryptography; +using System.Security.Cryptography.Asn1; +using System.Security.Cryptography.Pkcs; +using System.Security.Cryptography.Pkcs.Asn1; +using System.Security.Cryptography.X509Certificates; +using System.Security.Cryptography.Xml; + +namespace Internal.Cryptography.Pal.AnyOS +{ + internal static class AsnHelpers + { + internal static SubjectIdentifierOrKey ToSubjectIdentifierOrKey( + this OriginatorIdentifierOrKeyAsn originator) + { + if (originator.IssuerAndSerialNumber != null) + { + var name = new X500DistinguishedName(originator.IssuerAndSerialNumber.Value.Issuer.ToArray()); + + return new SubjectIdentifierOrKey( + SubjectIdentifierOrKeyType.IssuerAndSerialNumber, + new X509IssuerSerial( + name.Name, + originator.IssuerAndSerialNumber.Value.SerialNumber.Span.ToBigEndianHex())); + } + + if (originator.SubjectKeyIdentifier != null) + { + return new SubjectIdentifierOrKey( + SubjectIdentifierOrKeyType.SubjectKeyIdentifier, + originator.SubjectKeyIdentifier.Value.Span.ToBigEndianHex()); + } + + if (originator.OriginatorKey != null) + { + OriginatorPublicKeyAsn originatorKey = originator.OriginatorKey; + + return new SubjectIdentifierOrKey( + SubjectIdentifierOrKeyType.PublicKeyInfo, + new PublicKeyInfo( + originatorKey.Algorithm.ToPresentationObject(), + originatorKey.PublicKey.ToArray())); + } + + Debug.Fail("Unknown SubjectIdentifierOrKey state"); + return new SubjectIdentifierOrKey(SubjectIdentifierOrKeyType.Unknown, String.Empty); + } + + internal static AlgorithmIdentifier ToPresentationObject(this AlgorithmIdentifierAsn asn) + { + int keyLength; + + switch (asn.Algorithm.Value) + { + case Oids.Rc2Cbc: + { + if (asn.Parameters == null) + { + keyLength = 0; + break; + } + + Rc2CbcParameters rc2Params = AsnSerializer.Deserialize( + asn.Parameters.Value, + AsnEncodingRules.BER); + + int keySize = rc2Params.GetEffectiveKeyBits(); + + // These are the only values .NET Framework would set. + switch (keySize) + { + case 40: + case 56: + case 64: + case 128: + keyLength = keySize; + break; + default: + keyLength = 0; + break; + } + + break; + } + case Oids.Rc4: + { + if (asn.Parameters == null) + { + keyLength = 0; + break; + } + + int saltLen = 0; + AsnReader reader = new AsnReader(asn.Parameters.Value, AsnEncodingRules.BER); + + // DER NULL is considered the same as not present. + // No call to ReadNull() is necessary because the serializer already verified that + // there's no data after the [AnyValue] value. + if (reader.PeekTag() != Asn1Tag.Null) + { + if (reader.TryGetPrimitiveOctetStringBytes(out ReadOnlyMemory contents)) + { + saltLen = contents.Length; + } + else + { + Span salt = stackalloc byte[KeyLengths.Rc4Max_128Bit / 8]; + + if (!reader.TryCopyOctetStringBytes(salt, out saltLen)) + { + throw new CryptographicException(); + } + } + } + + keyLength = KeyLengths.Rc4Max_128Bit - 8 * saltLen; + break; + } + case Oids.DesCbc: + keyLength = KeyLengths.Des_64Bit; + break; + case Oids.TripleDesCbc: + keyLength = KeyLengths.TripleDes_192Bit; + break; + default: + // .NET Framework doesn't set a keylength for AES, or any other algorithm than the ones + // listed here. + keyLength = 0; + break; + } + + return new AlgorithmIdentifier(new Oid(asn.Algorithm), keyLength); + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.Asn.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.Asn.cs new file mode 100644 index 0000000000..89bda03041 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.Asn.cs @@ -0,0 +1,172 @@ +// 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; +using System.Buffers; +using System.Diagnostics; +using System.Security.Cryptography; +using System.Security.Cryptography.Asn1; +using System.Security.Cryptography.Pkcs.Asn1; + +namespace Internal.Cryptography.Pal.AnyOS +{ + internal sealed partial class ManagedPkcsPal : PkcsPal + { + private static readonly byte[] s_invalidEmptyOid = { 0x06, 0x00 }; + + public override byte[] EncodeOctetString(byte[] octets) + { + // Write using DER to support the most readers. + using (AsnWriter writer = new AsnWriter(AsnEncodingRules.DER)) + { + writer.WriteOctetString(octets); + return writer.Encode(); + } + } + + public override byte[] DecodeOctetString(byte[] encodedOctets) + { + // Read using BER because the CMS specification says the encoding is BER. + AsnReader reader = new AsnReader(encodedOctets, AsnEncodingRules.BER); + + const int ArbitraryStackLimit = 256; + Span tmp = stackalloc byte[ArbitraryStackLimit]; + // Use stackalloc 0 so data can later hold a slice of tmp. +#if __MonoCS__ + ReadOnlySpan data = new byte[0]; +#else + ReadOnlySpan data = stackalloc byte[0]; +#endif + byte[] poolBytes = null; + + try + { + if (!reader.TryGetPrimitiveOctetStringBytes(out var contents)) + { + if (reader.TryCopyOctetStringBytes(tmp, out int bytesWritten)) + { + data = tmp.Slice(0, bytesWritten); + } + else + { + poolBytes = ArrayPool.Shared.Rent(reader.PeekContentBytes().Length); + + if (!reader.TryCopyOctetStringBytes(poolBytes, out bytesWritten)) + { + Debug.Fail("TryCopyOctetStringBytes failed with a provably-large-enough buffer"); + throw new CryptographicException(); + } + + data = new ReadOnlySpan(poolBytes, 0, bytesWritten); + } + } + else + { + data = contents.Span; + } + + if (reader.HasData) + { + throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); + } + + return data.ToArray(); + } + finally + { + if (poolBytes != null) + { + Array.Clear(poolBytes, 0, data.Length); + ArrayPool.Shared.Return(poolBytes); + } + } + } + + public override byte[] EncodeUtcTime(DateTime utcTime) + { + const int minLegalYear = 1950; + // Write using DER to support the most readers. + using (AsnWriter writer = new AsnWriter(AsnEncodingRules.DER)) + { + try + { + // Sending the DateTime through ToLocalTime here will cause the right normalization + // of DateTimeKind.Unknown. + // + // Unknown => Local (adjust) => UTC (adjust "back", add Z marker; matches Windows) + if (utcTime.Kind == DateTimeKind.Unspecified) + { + writer.WriteUtcTime(utcTime.ToLocalTime(), minLegalYear); + } + else + { + writer.WriteUtcTime(utcTime, minLegalYear); + } + + return writer.Encode(); + } + catch (ArgumentException ex) + { + throw new CryptographicException(ex.Message, ex); + } + } + } + + public override DateTime DecodeUtcTime(byte[] encodedUtcTime) + { + // Read using BER because the CMS specification says the encoding is BER. + AsnReader reader = new AsnReader(encodedUtcTime, AsnEncodingRules.BER); + DateTimeOffset value = reader.GetUtcTime(); + + if (reader.HasData) + { + throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); + } + + return value.UtcDateTime; + } + + public override string DecodeOid(byte[] encodedOid) + { + // Windows compat. + if (s_invalidEmptyOid.AsSpan().SequenceEqual(encodedOid)) + { + return string.Empty; + } + + // Read using BER because the CMS specification says the encoding is BER. + AsnReader reader = new AsnReader(encodedOid, AsnEncodingRules.BER); + string value = reader.ReadObjectIdentifierAsString(); + + if (reader.HasData) + { + throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); + } + + return value; + } + + public override Oid GetEncodedMessageType(byte[] encodedMessage) + { + AsnReader reader = new AsnReader(encodedMessage, AsnEncodingRules.BER); + + ContentInfoAsn contentInfo = AsnSerializer.Deserialize( + reader.GetEncodedValue(), + AsnEncodingRules.BER); + + switch (contentInfo.ContentType) + { + case Oids.Pkcs7Data: + case Oids.Pkcs7Signed: + case Oids.Pkcs7Enveloped: + case Oids.Pkcs7SignedEnveloped: + case Oids.Pkcs7Hashed: + case Oids.Pkcs7Encrypted: + return new Oid(contentInfo.ContentType); + } + + throw new CryptographicException(SR.Cryptography_Cms_InvalidMessageType); + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.Decode.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.Decode.cs new file mode 100644 index 0000000000..17e0302c18 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.Decode.cs @@ -0,0 +1,94 @@ +// 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; +using System.Collections.Generic; +using System.Diagnostics; +using System.Security.Cryptography; +using System.Security.Cryptography.Asn1; +using System.Security.Cryptography.Pkcs; +using System.Security.Cryptography.Pkcs.Asn1; +using System.Security.Cryptography.X509Certificates; + +namespace Internal.Cryptography.Pal.AnyOS +{ + internal sealed partial class ManagedPkcsPal : PkcsPal + { + public override DecryptorPal Decode( + byte[] encodedMessage, + out int version, + out ContentInfo contentInfo, + out AlgorithmIdentifier contentEncryptionAlgorithm, + out X509Certificate2Collection originatorCerts, + out CryptographicAttributeObjectCollection unprotectedAttributes) + { + // Read using BER because the CMS specification says the encoding is BER. + AsnReader reader = new AsnReader(encodedMessage, AsnEncodingRules.BER); + + ContentInfoAsn parsedContentInfo = AsnSerializer.Deserialize( + reader.GetEncodedValue(), + AsnEncodingRules.BER); + + if (parsedContentInfo.ContentType != Oids.Pkcs7Enveloped) + { + throw new CryptographicException(SR.Cryptography_Cms_InvalidMessageType); + } + + byte[] copy = parsedContentInfo.Content.ToArray(); + + EnvelopedDataAsn data = AsnSerializer.Deserialize( + copy, + AsnEncodingRules.BER); + + version = data.Version; + + contentInfo = new ContentInfo( + new Oid(data.EncryptedContentInfo.ContentType), + data.EncryptedContentInfo.EncryptedContent?.ToArray() ?? Array.Empty()); + + contentEncryptionAlgorithm = + data.EncryptedContentInfo.ContentEncryptionAlgorithm.ToPresentationObject(); + + originatorCerts = new X509Certificate2Collection(); + + if (data.OriginatorInfo != null && data.OriginatorInfo.CertificateSet != null) + { + foreach (CertificateChoiceAsn certChoice in data.OriginatorInfo.CertificateSet) + { + if (certChoice.Certificate != null) + { + originatorCerts.Add(new X509Certificate2(certChoice.Certificate.Value.ToArray())); + } + } + } + + unprotectedAttributes = SignerInfo.MakeAttributeCollection(data.UnprotectedAttributes); + + var recipientInfos = new List(); + + foreach (RecipientInfoAsn recipientInfo in data.RecipientInfos) + { + if (recipientInfo.Ktri != null) + { + recipientInfos.Add(new KeyTransRecipientInfo(new ManagedKeyTransPal(recipientInfo.Ktri))); + } + else if (recipientInfo.Kari != null) + { + for (int i = 0; i < recipientInfo.Kari.RecipientEncryptedKeys.Length; i++) + { + recipientInfos.Add( + new KeyAgreeRecipientInfo(new ManagedKeyAgreePal(recipientInfo.Kari, i))); + } + } + else + { + Debug.Fail($"{nameof(RecipientInfoAsn)} deserialized with an unknown recipient type"); + throw new CryptographicException(); + } + } + + return new ManagedDecryptorPal(copy, data, new RecipientInfoCollection(recipientInfos)); + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.Decrypt.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.Decrypt.cs new file mode 100644 index 0000000000..78a5daf31f --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.Decrypt.cs @@ -0,0 +1,186 @@ +// 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; +using System.Buffers; +using System.Diagnostics; +using System.Security.Cryptography; +using System.Security.Cryptography.Asn1; +using System.Security.Cryptography.Pkcs; +using System.Security.Cryptography.Pkcs.Asn1; +using System.Security.Cryptography.X509Certificates; + +namespace Internal.Cryptography.Pal.AnyOS +{ + internal sealed partial class ManagedPkcsPal : PkcsPal + { + private sealed class ManagedDecryptorPal : DecryptorPal + { + private byte[] _dataCopy; + private EnvelopedDataAsn _envelopedData; + + public ManagedDecryptorPal( + byte[] dataCopy, + EnvelopedDataAsn envelopedDataAsn, + RecipientInfoCollection recipientInfos) + : base(recipientInfos) + { + _dataCopy = dataCopy; + _envelopedData = envelopedDataAsn; + } + + public override unsafe ContentInfo TryDecrypt( + RecipientInfo recipientInfo, + X509Certificate2 cert, + X509Certificate2Collection originatorCerts, + X509Certificate2Collection extraStore, + out Exception exception) + { + // When encryptedContent is null Windows seems to decrypt the CEK first, + // then return a 0 byte answer. + + byte[] cek; + + if (recipientInfo.Pal is ManagedKeyTransPal ktri) + { + cek = ktri.DecryptCek(cert, out exception); + } + else + { + exception = new CryptographicException( + SR.Cryptography_Cms_RecipientType_NotSupported, + recipientInfo.Type.ToString()); + + return null; + } + + byte[] decrypted; + + // Pin CEK to prevent it from getting copied during heap compaction. + fixed (byte* pinnedCek = cek) + { + try + { + if (exception != null) + { + return null; + } + + ReadOnlyMemory? encryptedContent = _envelopedData.EncryptedContentInfo.EncryptedContent; + + if (encryptedContent == null) + { + exception = null; + + return new ContentInfo( + new Oid(_envelopedData.EncryptedContentInfo.ContentType), + Array.Empty()); + } + + decrypted = DecryptContent(encryptedContent.Value, cek, out exception); + } + finally + { + if (cek != null) + { + Array.Clear(cek, 0, cek.Length); + } + } + } + + if (exception != null) + { + return null; + } + + if (_envelopedData.EncryptedContentInfo.ContentType == Oids.Pkcs7Data) + { + byte[] tmp = null; + + try + { + AsnReader reader = new AsnReader(decrypted, AsnEncodingRules.BER); + + if (reader.TryGetPrimitiveOctetStringBytes(out ReadOnlyMemory contents)) + { + decrypted = contents.ToArray(); + } + else + { + tmp = ArrayPool.Shared.Rent(decrypted.Length); + + if (reader.TryCopyOctetStringBytes(tmp, out int written)) + { + Span innerContents = new Span(tmp, 0, written); + decrypted = innerContents.ToArray(); + innerContents.Clear(); + } + else + { + Debug.Fail("Octet string grew during copy"); + // If this happens (which requires decrypted was overwritten, which + // shouldn't be possible), just leave decrypted alone. + } + } + } + catch (CryptographicException) + { + } + finally + { + if (tmp != null) + { + // Already cleared + ArrayPool.Shared.Return(tmp); + } + } + } + + exception = null; + return new ContentInfo( + new Oid(_envelopedData.EncryptedContentInfo.ContentType), + decrypted); + } + + private byte[] DecryptContent(ReadOnlyMemory encryptedContent, byte[] cek, out Exception exception) + { + exception = null; + int encryptedContentLength = encryptedContent.Length; + byte[] encryptedContentArray = ArrayPool.Shared.Rent(encryptedContentLength); + + try + { + encryptedContent.CopyTo(encryptedContentArray); + + AlgorithmIdentifierAsn contentEncryptionAlgorithm = + _envelopedData.EncryptedContentInfo.ContentEncryptionAlgorithm; + + using (SymmetricAlgorithm alg = OpenAlgorithm(contentEncryptionAlgorithm)) + using (ICryptoTransform decryptor = alg.CreateDecryptor(cek, alg.IV)) + { + return decryptor.OneShot( + encryptedContentArray, + 0, + encryptedContentLength); + } + } + catch (CryptographicException e) + { + exception = e; + return null; + } + finally + { + Array.Clear(encryptedContentArray, 0, encryptedContentLength); + ArrayPool.Shared.Return(encryptedContentArray); + encryptedContentArray = null; + } + } + + public override void Dispose() + { + } + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.Encrypt.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.Encrypt.cs new file mode 100644 index 0000000000..9d9a983b27 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.Encrypt.cs @@ -0,0 +1,186 @@ +// 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; +using System.Collections.Generic; +using System.Security.Cryptography; +using System.Security.Cryptography.Asn1; +using System.Security.Cryptography.Pkcs; +using System.Security.Cryptography.Pkcs.Asn1; +using System.Security.Cryptography.X509Certificates; + +namespace Internal.Cryptography.Pal.AnyOS +{ + internal sealed partial class ManagedPkcsPal : PkcsPal + { + public override unsafe byte[] Encrypt( + CmsRecipientCollection recipients, + ContentInfo contentInfo, + AlgorithmIdentifier contentEncryptionAlgorithm, + X509Certificate2Collection originatorCerts, + CryptographicAttributeObjectCollection unprotectedAttributes) + { + byte[] encryptedContent = EncryptContent( + contentInfo, + contentEncryptionAlgorithm, + out byte[] cek, + out byte[] parameterBytes); + + // Pin the CEK to prevent it from getting copied during heap compaction. + fixed (byte* pinnedCek = cek) + { + try + { + return Encrypt( + recipients, + contentInfo, + contentEncryptionAlgorithm, + originatorCerts, + unprotectedAttributes, + encryptedContent, + cek, + parameterBytes); + } + finally + { + Array.Clear(cek, 0, cek.Length); + } + } + } + + private static byte[] Encrypt( + CmsRecipientCollection recipients, + ContentInfo contentInfo, + AlgorithmIdentifier contentEncryptionAlgorithm, + X509Certificate2Collection originatorCerts, + CryptographicAttributeObjectCollection unprotectedAttributes, + byte[] encryptedContent, + byte[] cek, + byte[] parameterBytes) + { + EnvelopedDataAsn envelopedData = new EnvelopedDataAsn + { + EncryptedContentInfo = + { + ContentType = contentInfo.ContentType.Value, + + ContentEncryptionAlgorithm = + { + Algorithm = contentEncryptionAlgorithm.Oid, + Parameters = parameterBytes, + }, + + EncryptedContent = encryptedContent, + }, + }; + + if (unprotectedAttributes != null && unprotectedAttributes.Count > 0) + { + List attrList = CmsSigner.BuildAttributes(unprotectedAttributes); + + envelopedData.UnprotectedAttributes = Helpers.NormalizeSet(attrList.ToArray()); + } + + if (originatorCerts != null && originatorCerts.Count > 0) + { + CertificateChoiceAsn[] certs = new CertificateChoiceAsn[originatorCerts.Count]; + + for (int i = 0; i < originatorCerts.Count; i++) + { + certs[i].Certificate = originatorCerts[i].RawData; + } + + envelopedData.OriginatorInfo = new OriginatorInfoAsn + { + CertificateSet = certs, + }; + } + + envelopedData.RecipientInfos = new RecipientInfoAsn[recipients.Count]; + + bool allRecipientsVersion0 = true; + + for (var i = 0; i < recipients.Count; i++) + { + CmsRecipient recipient = recipients[i]; + bool v0Recipient; + + switch (recipient.Certificate.GetKeyAlgorithm()) + { + case Oids.Rsa: + envelopedData.RecipientInfos[i].Ktri = MakeKtri(cek, recipient, out v0Recipient); + break; + default: + throw new CryptographicException( + SR.Cryptography_Cms_UnknownAlgorithm, + recipient.Certificate.GetKeyAlgorithm()); + } + + allRecipientsVersion0 = allRecipientsVersion0 && v0Recipient; + } + + // https://tools.ietf.org/html/rfc5652#section-6.1 + // + // v4 (RFC 3852): + // * OriginatorInfo contains certificates with type other (not supported) + // * OriginatorInfo contains crls with type other (not supported) + // v3 (RFC 3369): + // * OriginatorInfo contains v2 attribute certificates (not supported) + // * Any PWRI (password) recipients are present (not supported) + // * Any ORI (other) recipients are present (not supported) + // v2 (RFC 2630): + // * OriginatorInfo is present + // * Any RecipientInfo has a non-zero version number + // * UnprotectedAttrs is present + // v1 (not defined for EnvelopedData) + // v0 (RFC 2315): + // * Anything not already matched + + if (envelopedData.OriginatorInfo != null || + !allRecipientsVersion0 || + envelopedData.UnprotectedAttributes != null) + { + envelopedData.Version = 2; + } + + return Helpers.EncodeContentInfo(envelopedData, Oids.Pkcs7Enveloped); + } + + private byte[] EncryptContent( + ContentInfo contentInfo, + AlgorithmIdentifier contentEncryptionAlgorithm, + out byte[] cek, + out byte[] parameterBytes) + { + using (SymmetricAlgorithm alg = OpenAlgorithm(contentEncryptionAlgorithm)) + using (ICryptoTransform encryptor = alg.CreateEncryptor()) + { + cek = alg.Key; + + if (alg is RC2) + { + Rc2CbcParameters rc2Params = new Rc2CbcParameters(alg.IV, alg.KeySize); + + using (AsnWriter writer = AsnSerializer.Serialize(rc2Params, AsnEncodingRules.DER)) + { + parameterBytes = writer.Encode(); + } + } + else + { + parameterBytes = EncodeOctetString(alg.IV); + } + + byte[] toEncrypt = contentInfo.Content; + + if (contentInfo.ContentType.Value == Oids.Pkcs7Data) + { + toEncrypt = EncodeOctetString(toEncrypt); + } + + return encryptor.OneShot(toEncrypt); + } + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.Exceptions.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.Exceptions.cs new file mode 100644 index 0000000000..0abe53da71 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.Exceptions.cs @@ -0,0 +1,38 @@ +// 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; +using System.Security.Cryptography; + +namespace Internal.Cryptography.Pal.AnyOS +{ + internal sealed partial class ManagedPkcsPal : PkcsPal + { + public override Exception CreateRecipientsNotFoundException() + { + return new CryptographicException(SR.Cryptography_Cms_RecipientNotFound); + } + + public override Exception CreateRecipientInfosAfterEncryptException() + { + return CreateInvalidMessageTypeException(); + } + + public override Exception CreateDecryptAfterEncryptException() + { + return CreateInvalidMessageTypeException(); + } + + public override Exception CreateDecryptTwiceException() + { + return CreateInvalidMessageTypeException(); + } + + private static Exception CreateInvalidMessageTypeException() + { + // Windows CRYPT_E_INVALID_MSG_TYPE + return new CryptographicException(SR.Cryptography_Cms_InvalidMessageType); + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.KeyAgree.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.KeyAgree.cs new file mode 100644 index 0000000000..3c8bfd02c2 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.KeyAgree.cs @@ -0,0 +1,94 @@ +// 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; +using System.Security.Cryptography; +using System.Security.Cryptography.Pkcs; +using System.Security.Cryptography.Pkcs.Asn1; + +namespace Internal.Cryptography.Pal.AnyOS +{ + internal sealed partial class ManagedPkcsPal : PkcsPal + { + private sealed class ManagedKeyAgreePal : KeyAgreeRecipientInfoPal + { + private readonly KeyAgreeRecipientInfoAsn _asn; + private readonly int _index; + + internal ManagedKeyAgreePal(KeyAgreeRecipientInfoAsn asn, int index) + { + _asn = asn; + _index = index; + } + + public override byte[] EncryptedKey => + _asn.RecipientEncryptedKeys[_index].EncryptedKey.ToArray(); + + public override AlgorithmIdentifier KeyEncryptionAlgorithm => + _asn.KeyEncryptionAlgorithm.ToPresentationObject(); + + public override SubjectIdentifier RecipientIdentifier => + new SubjectIdentifier( + _asn.RecipientEncryptedKeys[_index].Rid.IssuerAndSerialNumber, + _asn.RecipientEncryptedKeys[_index].Rid.RKeyId?.SubjectKeyIdentifier); + + public override int Version => _asn.Version; + + public override DateTime Date + { + get + { + KeyAgreeRecipientIdentifierAsn rid = _asn.RecipientEncryptedKeys[_index].Rid; + + if (rid.RKeyId == null) + { + throw new InvalidOperationException(SR.Cryptography_Cms_Key_Agree_Date_Not_Available); + } + + if (rid.RKeyId.Date == null) + { + // Compatibility with Windows/NetFX. + return DateTime.FromFileTimeUtc(0); + } + + return rid.RKeyId.Date.Value.LocalDateTime; + } + } + + public override SubjectIdentifierOrKey OriginatorIdentifierOrKey => + _asn.Originator.ToSubjectIdentifierOrKey(); + + public override CryptographicAttributeObject OtherKeyAttribute + { + get + { + KeyAgreeRecipientIdentifierAsn rid = _asn.RecipientEncryptedKeys[_index].Rid; + + if (rid.RKeyId == null) + { + // Yes, "date" (Windows compat) + throw new InvalidOperationException(SR.Cryptography_Cms_Key_Agree_Date_Not_Available); + } + + if (rid.RKeyId.Other == null) + { + return null; + } + + Oid oid = new Oid(rid.RKeyId.Other.Value.KeyAttrId); + byte[] rawData = Array.Empty(); + + if (rid.RKeyId.Other.Value.KeyAttr != null) + { + rawData = rid.RKeyId.Other.Value.KeyAttr.Value.ToArray(); + } + + Pkcs9AttributeObject pkcs9AttributeObject = new Pkcs9AttributeObject(oid, rawData); + AsnEncodedDataCollection values = new AsnEncodedDataCollection(pkcs9AttributeObject); + return new CryptographicAttributeObject(oid, values); + } + } + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.KeyTrans.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.KeyTrans.cs new file mode 100644 index 0000000000..152cc116f5 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.KeyTrans.cs @@ -0,0 +1,179 @@ +// 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; +using System.Buffers; +using System.Diagnostics; +using System.Security.Cryptography; +using System.Security.Cryptography.Pkcs; +using System.Security.Cryptography.Pkcs.Asn1; +using System.Security.Cryptography.X509Certificates; + +namespace Internal.Cryptography.Pal.AnyOS +{ + internal sealed partial class ManagedPkcsPal : PkcsPal + { + private static readonly byte[] s_rsaPkcsParameters = { 0x05, 0x00 }; + private static readonly byte[] s_rsaOaepSha1Parameters = { 0x30, 0x00 }; + + private sealed class ManagedKeyTransPal : KeyTransRecipientInfoPal + { + private readonly KeyTransRecipientInfoAsn _asn; + + internal ManagedKeyTransPal(KeyTransRecipientInfoAsn asn) + { + _asn = asn; + } + + public override byte[] EncryptedKey => + _asn.EncryptedKey.ToArray(); + + public override AlgorithmIdentifier KeyEncryptionAlgorithm => + _asn.KeyEncryptionAlgorithm.ToPresentationObject(); + + public override SubjectIdentifier RecipientIdentifier => + new SubjectIdentifier(_asn.Rid.IssuerAndSerialNumber, _asn.Rid.SubjectKeyIdentifier); + + public override int Version => _asn.Version; + + internal byte[] DecryptCek(X509Certificate2 cert, out Exception exception) + { + RSAEncryptionPadding encryptionPadding; + ReadOnlyMemory? parameters = _asn.KeyEncryptionAlgorithm.Parameters; + + switch (_asn.KeyEncryptionAlgorithm.Algorithm.Value) + { + case Oids.Rsa: + if (parameters != null && + !parameters.Value.Span.SequenceEqual(s_rsaPkcsParameters)) + { + exception = new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); + return null; + } + + encryptionPadding = RSAEncryptionPadding.Pkcs1; + break; + case Oids.RsaOaep: + if (parameters != null && + !parameters.Value.Span.SequenceEqual(s_rsaOaepSha1Parameters)) + { + exception = new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); + return null; + } + + encryptionPadding = RSAEncryptionPadding.OaepSHA1; + break; + default: + exception = new CryptographicException( + SR.Cryptography_Cms_UnknownAlgorithm, + _asn.KeyEncryptionAlgorithm.Algorithm.Value); + + return null; + } + + byte[] cek = null; + int cekLength = 0; + + try + { + using (RSA rsa = cert.GetRSAPrivateKey()) + { + if (rsa == null) + { + exception = new CryptographicException(SR.Cryptography_Cms_Signing_RequiresPrivateKey); + return null; + } + +#if netcoreapp + cek = ArrayPool.Shared.Rent(rsa.KeySize / 8); + + if (!rsa.TryDecrypt(_asn.EncryptedKey.Span, cek, encryptionPadding, out cekLength)) + { + Debug.Fail("TryDecrypt wanted more space than the key size"); + exception = new CryptographicException(); + return null; + } + + exception = null; + return new Span(cek, 0, cekLength).ToArray(); +#else + exception = null; + return rsa.Decrypt(_asn.EncryptedKey.Span.ToArray(), encryptionPadding); +#endif + } + } + catch (CryptographicException e) + { + exception = e; + return null; + } + finally + { + if (cek != null) + { + Array.Clear(cek, 0, cekLength); + ArrayPool.Shared.Return(cek); + } + } + } + } + + private static KeyTransRecipientInfoAsn MakeKtri( + byte[] cek, + CmsRecipient recipient, + out bool v0Recipient) + { + KeyTransRecipientInfoAsn ktri = new KeyTransRecipientInfoAsn(); + + if (recipient.RecipientIdentifierType == SubjectIdentifierType.SubjectKeyIdentifier) + { + ktri.Version = 2; + ktri.Rid.SubjectKeyIdentifier = recipient.Certificate.GetSubjectKeyIdentifier(); + } + else if (recipient.RecipientIdentifierType == SubjectIdentifierType.IssuerAndSerialNumber) + { + byte[] serial = recipient.Certificate.GetSerialNumber(); + Array.Reverse(serial); + + IssuerAndSerialNumberAsn iasn = new IssuerAndSerialNumberAsn + { + Issuer = recipient.Certificate.IssuerName.RawData, + SerialNumber = serial, + }; + + ktri.Rid.IssuerAndSerialNumber = iasn; + } + else + { + throw new CryptographicException( + SR.Cryptography_Cms_Invalid_Subject_Identifier_Type, + recipient.RecipientIdentifierType.ToString()); + } + + RSAEncryptionPadding padding; + + switch (recipient.Certificate.GetKeyAlgorithm()) + { + case Oids.RsaOaep: + padding = RSAEncryptionPadding.OaepSHA1; + ktri.KeyEncryptionAlgorithm.Algorithm = new Oid(Oids.RsaOaep, Oids.RsaOaep); + ktri.KeyEncryptionAlgorithm.Parameters = s_rsaOaepSha1Parameters; + break; + default: + padding = RSAEncryptionPadding.Pkcs1; + ktri.KeyEncryptionAlgorithm.Algorithm = new Oid(Oids.Rsa, Oids.Rsa); + ktri.KeyEncryptionAlgorithm.Parameters = s_rsaPkcsParameters; + break; + } + + using (RSA rsa = recipient.Certificate.GetRSAPublicKey()) + { + ktri.EncryptedKey = rsa.Encrypt(cek, padding); + } + + v0Recipient = (ktri.Version == 0); + return ktri; + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.cs new file mode 100644 index 0000000000..0e47bb29f7 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.cs @@ -0,0 +1,176 @@ +// 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; +using System.Diagnostics; +using System.Security.Cryptography; +using System.Security.Cryptography.Asn1; +using System.Security.Cryptography.Pkcs; +using System.Security.Cryptography.Pkcs.Asn1; +using System.Security.Cryptography.X509Certificates; + +namespace Internal.Cryptography.Pal.AnyOS +{ + internal sealed partial class ManagedPkcsPal : PkcsPal + { + public override void AddCertsFromStoreForDecryption(X509Certificate2Collection certs) + { + certs.AddRange(Helpers.GetStoreCertificates(StoreName.My, StoreLocation.CurrentUser, openExistingOnly: false)); + + try + { + // This store exists on macOS, but not Linux + certs.AddRange( + Helpers.GetStoreCertificates(StoreName.My, StoreLocation.LocalMachine, openExistingOnly: false)); + } + catch (CryptographicException) + { + } + } + + public override byte[] GetSubjectKeyIdentifier(X509Certificate2 certificate) + { + return certificate.GetSubjectKeyIdentifier(); + } + + public override T GetPrivateKeyForSigning(X509Certificate2 certificate, bool silent) + { + return GetPrivateKey(certificate); + } + + public override T GetPrivateKeyForDecryption(X509Certificate2 certificate, bool silent) + { + return GetPrivateKey(certificate); + } + + private T GetPrivateKey(X509Certificate2 certificate) where T : AsymmetricAlgorithm + { + if (typeof(T) == typeof(RSA)) + return (T)(object)certificate.GetRSAPrivateKey(); + if (typeof(T) == typeof(ECDsa)) + return (T)(object)certificate.GetECDsaPrivateKey(); +#if netcoreapp + if (typeof(T) == typeof(DSA)) + return (T)(object)certificate.GetDSAPrivateKey(); +#endif + + Debug.Fail($"Unknown key type requested: {typeof(T).FullName}"); + return null; + } + + private static SymmetricAlgorithm OpenAlgorithm(AlgorithmIdentifierAsn contentEncryptionAlgorithm) + { + SymmetricAlgorithm alg = OpenAlgorithm(contentEncryptionAlgorithm.Algorithm); + + if (alg is RC2) + { + if (contentEncryptionAlgorithm.Parameters == null) + { + // Windows issues CRYPT_E_BAD_DECODE + throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); + } + + Rc2CbcParameters rc2Params = AsnSerializer.Deserialize( + contentEncryptionAlgorithm.Parameters.Value, + AsnEncodingRules.BER); + + alg.KeySize = rc2Params.GetEffectiveKeyBits(); + alg.IV = rc2Params.Iv.ToArray(); + } + else + { + if (contentEncryptionAlgorithm.Parameters == null) + { + // Windows issues CRYPT_E_BAD_DECODE + throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); + } + + AsnReader reader = new AsnReader(contentEncryptionAlgorithm.Parameters.Value, AsnEncodingRules.BER); + + if (reader.TryGetPrimitiveOctetStringBytes(out ReadOnlyMemory primitiveBytes)) + { + alg.IV = primitiveBytes.ToArray(); + } + else + { + byte[] iv = new byte[alg.BlockSize / 8]; + + if (!reader.TryCopyOctetStringBytes(iv, out int bytesWritten) || + bytesWritten != iv.Length) + { + throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); + } + + alg.IV = iv; + } + } + + return alg; + } + + private static SymmetricAlgorithm OpenAlgorithm(AlgorithmIdentifier algorithmIdentifier) + { + SymmetricAlgorithm alg = OpenAlgorithm(algorithmIdentifier.Oid); + + if (alg is RC2) + { + if (algorithmIdentifier.KeyLength != 0) + { + alg.KeySize = algorithmIdentifier.KeyLength; + } + else + { + alg.KeySize = KeyLengths.Rc2_128Bit; + } + } + + return alg; + } + + private static SymmetricAlgorithm OpenAlgorithm(Oid algorithmIdentifier) + { + Debug.Assert(algorithmIdentifier != null); + + SymmetricAlgorithm alg; + + switch (algorithmIdentifier.Value) + { + case Oids.Rc2Cbc: +#pragma warning disable CA5351 + alg = RC2.Create(); +#pragma warning restore CA5351 + break; + case Oids.DesCbc: +#pragma warning disable CA5351 + alg = DES.Create(); +#pragma warning restore CA5351 + break; + case Oids.TripleDesCbc: +#pragma warning disable CA5350 + alg = TripleDES.Create(); +#pragma warning restore CA5350 + break; + case Oids.Aes128Cbc: + alg = Aes.Create(); + alg.KeySize = 128; + break; + case Oids.Aes192Cbc: + alg = Aes.Create(); + alg.KeySize = 192; + break; + case Oids.Aes256Cbc: + alg = Aes.Create(); + alg.KeySize = 256; + break; + default: + throw new CryptographicException(SR.Cryptography_Cms_UnknownAlgorithm, algorithmIdentifier.Value); + } + + // These are the defaults, but they're restated here for clarity. + alg.Padding = PaddingMode.PKCS7; + alg.Mode = CipherMode.CBC; + return alg; + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/PkcsPal.AnyOS.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/PkcsPal.AnyOS.cs index 919b1280a7..11e8b43f7f 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/PkcsPal.AnyOS.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/PkcsPal.AnyOS.cs @@ -2,220 +2,12 @@ // 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; -using System.Buffers; -using System.Diagnostics; -using System.Security.Cryptography; -using System.Security.Cryptography.Asn1; -using System.Security.Cryptography.Pkcs; -using System.Security.Cryptography.X509Certificates; +using Internal.Cryptography.Pal.AnyOS; namespace Internal.Cryptography { internal abstract partial class PkcsPal { - private static PkcsPal s_instance = new ManagedPkcsPal(); - - private class ManagedPkcsPal : PkcsPal - { - public override byte[] Encrypt( - CmsRecipientCollection recipients, - ContentInfo contentInfo, - AlgorithmIdentifier contentEncryptionAlgorithm, - X509Certificate2Collection originatorCerts, - CryptographicAttributeObjectCollection unprotectedAttributes) - { - throw new PlatformNotSupportedException(SR.PlatformNotSupported_CryptographyPkcs); - } - - public override DecryptorPal Decode( - byte[] encodedMessage, - out int version, - out ContentInfo contentInfo, - out AlgorithmIdentifier contentEncryptionAlgorithm, - out X509Certificate2Collection originatorCerts, - out CryptographicAttributeObjectCollection unprotectedAttributes) - { - throw new PlatformNotSupportedException(SR.PlatformNotSupported_CryptographyPkcs); - } - - public override byte[] EncodeOctetString(byte[] octets) - { - // Write using DER to support the most readers. - using (AsnWriter writer = new AsnWriter(AsnEncodingRules.DER)) - { - writer.WriteOctetString(octets); - return writer.Encode(); - } - } - - public override byte[] DecodeOctetString(byte[] encodedOctets) - { - // Read using BER because the CMS specification says the encoding is BER. - AsnReader reader = new AsnReader(encodedOctets, AsnEncodingRules.BER); - - const int ArbitraryStackLimit = 256; - Span tmp = stackalloc byte[ArbitraryStackLimit]; - // Use stackalloc 0 so data can later hold a slice of tmp. - ReadOnlySpan data = stackalloc byte[0]; - byte[] poolBytes = null; - - try - { - if (!reader.TryGetPrimitiveOctetStringBytes(out var contents)) - { - if (reader.TryCopyOctetStringBytes(tmp, out int bytesWritten)) - { - data = tmp.Slice(0, bytesWritten); - } - else - { - poolBytes = ArrayPool.Shared.Rent(reader.PeekContentBytes().Length); - - if (!reader.TryCopyOctetStringBytes(poolBytes, out bytesWritten)) - { - Debug.Fail("TryCopyOctetStringBytes failed with a provably-large-enough buffer"); - throw new CryptographicException(); - } - - data = new ReadOnlySpan(poolBytes, 0, bytesWritten); - } - } - else - { - data = contents.Span; - } - - if (reader.HasData) - { - throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); - } - - return data.ToArray(); - } - finally - { - if (poolBytes != null) - { - Array.Clear(poolBytes, 0, data.Length); - ArrayPool.Shared.Return(poolBytes); - } - } - } - - public override byte[] EncodeUtcTime(DateTime utcTime) - { - // Write using DER to support the most readers. - using (AsnWriter writer = new AsnWriter(AsnEncodingRules.DER)) - { - // Sending the DateTime through ToLocalTime here will cause the right normalization - // of DateTimeKind.Unknown. - // - // Local => Local (noop) => UTC (in WriteUtcTime) (adjust, correct) - // UTC => Local (adjust) => UTC (adjust back, correct) - // Unknown => Local (adjust) => UTC (adjust "back", add Z marker; matches Windows) - writer.WriteUtcTime(utcTime.ToLocalTime()); - return writer.Encode(); - } - } - - public override DateTime DecodeUtcTime(byte[] encodedUtcTime) - { - // Read using BER because the CMS specification says the encoding is BER. - AsnReader reader = new AsnReader(encodedUtcTime, AsnEncodingRules.BER); - DateTimeOffset value = reader.GetUtcTime(); - - if (reader.HasData) - { - throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); - } - - return value.UtcDateTime; - } - - public override string DecodeOid(byte[] encodedOid) - { - Span emptyInvalidOid = stackalloc byte[2]; - emptyInvalidOid[0] = 0x06; - emptyInvalidOid[1] = 0x00; - - // Windows compat. - if (emptyInvalidOid.SequenceEqual(encodedOid)) - { - return string.Empty; - } - - // Read using BER because the CMS specification says the encoding is BER. - AsnReader reader = new AsnReader(encodedOid, AsnEncodingRules.BER); - string value = reader.ReadObjectIdentifierAsString(); - - if (reader.HasData) - { - throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); - } - - return value; - } - - public override Oid GetEncodedMessageType(byte[] encodedMessage) - { - throw new PlatformNotSupportedException(SR.PlatformNotSupported_CryptographyPkcs); - } - - public override void AddCertsFromStoreForDecryption(X509Certificate2Collection certs) - { - throw new PlatformNotSupportedException(SR.PlatformNotSupported_CryptographyPkcs); - } - - public override Exception CreateRecipientsNotFoundException() - { - throw new PlatformNotSupportedException(SR.PlatformNotSupported_CryptographyPkcs); - } - - public override Exception CreateRecipientInfosAfterEncryptException() - { - throw new PlatformNotSupportedException(SR.PlatformNotSupported_CryptographyPkcs); - } - - public override Exception CreateDecryptAfterEncryptException() - { - throw new PlatformNotSupportedException(SR.PlatformNotSupported_CryptographyPkcs); - } - - public override Exception CreateDecryptTwiceException() - { - throw new PlatformNotSupportedException(SR.PlatformNotSupported_CryptographyPkcs); - } - - public override byte[] GetSubjectKeyIdentifier(X509Certificate2 certificate) - { - return certificate.GetSubjectKeyIdentifier(); - } - - public override T GetPrivateKeyForSigning(X509Certificate2 certificate, bool silent) - { - return GetPrivateKey(certificate); - } - - public override T GetPrivateKeyForDecryption(X509Certificate2 certificate, bool silent) - { - return GetPrivateKey(certificate); - } - - private T GetPrivateKey(X509Certificate2 certificate) where T : AsymmetricAlgorithm - { - if (typeof(T) == typeof(RSA)) - return (T)(object)certificate.GetRSAPrivateKey(); - if (typeof(T) == typeof(ECDsa)) - return (T)(object)certificate.GetECDsaPrivateKey(); -#if netcoreapp - if (typeof(T) == typeof(DSA)) - return (T)(object)certificate.GetDSAPrivateKey(); -#endif - - Debug.Fail($"Unknown key type requested: {typeof(T).FullName}"); - return null; - } - } + private static readonly PkcsPal s_instance = new ManagedPkcsPal(); } } diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/Windows/HelpersWindows.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/Windows/HelpersWindows.cs index 4dc1252a8f..790990c4f3 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/Windows/HelpersWindows.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/Windows/HelpersWindows.cs @@ -359,7 +359,7 @@ namespace Internal.Cryptography.Pal.Windows throw new CryptographicException(); } - int provType = BinaryPrimitives.ReadMachineEndian(stackSpan.Slice(0, size)); + int provType = MemoryMarshal.Read(stackSpan.Slice(0, size)); size = stackSpan.Length; if (!Interop.Advapi32.CryptGetProvParam(handle, CryptProvParam.PP_KEYSET_TYPE, stackSpan, ref size)) @@ -373,7 +373,7 @@ namespace Internal.Cryptography.Pal.Windows throw new CryptographicException(); } - int keysetType = BinaryPrimitives.ReadMachineEndian(stackSpan.Slice(0, size)); + int keysetType = MemoryMarshal.Read(stackSpan.Slice(0, size)); // Only CRYPT_MACHINE_KEYSET is described as coming back, but be defensive. CspProviderFlags provFlags = diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/MatchingRefApiCompatBaseline.netstandard.txt b/external/corefx/src/System.Security.Cryptography.Pkcs/src/MatchingRefApiCompatBaseline.netstandard.txt new file mode 100644 index 0000000000..c89f8fff9f --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/MatchingRefApiCompatBaseline.netstandard.txt @@ -0,0 +1,3 @@ +# These members don't belong in netstandard reference because of type unification with netfx (the members are new in net472). +MembersMustExist : Member 'System.Security.Cryptography.Pkcs.SignerInfo.GetSignature()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Security.Cryptography.Pkcs.SignerInfo.SignatureAlgorithm.get()' does not exist in the implementation but it does exist in the contract. diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/Resources/Strings.resx b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Resources/Strings.resx index a755844916..70849195a7 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/src/Resources/Strings.resx +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/Resources/Strings.resx @@ -199,6 +199,12 @@ The signed cryptographic message does not have a signer for the specified signer index. + + The enveloped-data message does not contain the specified recipient. + + + The recipient type '{0}' is not supported for encryption or decryption on this platform. + Cannot create CMS signature for empty content. @@ -244,6 +250,21 @@ PSS salt size {0} is not supported by this platform with hash algorithm {1}. + + The response from the timestamping server did not match the request nonce. + + + The response from the timestamping server was not understood. + + + The timestamping server did not grant the request. The request status is '{0}' with failure info '{1}'. + + + The timestamping request required the TSA certificate in the response, but it was not found. + + + The timestamping request required the TSA certificate not be included in the response, but certificates were present. + Duplicate items are not allowed in the collection. diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj index b02bd42ac4..c26a748287 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj @@ -175,7 +175,30 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -225,11 +248,19 @@ + + + + + + + + @@ -242,6 +273,10 @@ + + + + diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/CryptographicAttributeObjectCollection.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/CryptographicAttributeObjectCollection.cs index ce4b5af3bf..126363c9be 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/CryptographicAttributeObjectCollection.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/CryptographicAttributeObjectCollection.cs @@ -102,6 +102,22 @@ namespace System.Security.Cryptography } } + public bool IsSynchronized + { + get + { + return false; + } + } + + public object SyncRoot + { + get + { + return this; + } + } + public CryptographicAttributeObjectEnumerator GetEnumerator() { return new CryptographicAttributeObjectEnumerator(this); @@ -142,22 +158,6 @@ namespace System.Security.Cryptography _list.CopyTo(array, index); } - bool ICollection.IsSynchronized - { - get - { - return false; - } - } - - object ICollection.SyncRoot - { - get - { - return this; - } - } - private readonly List _list; } } diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/AlgorithmIdentifier.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/AlgorithmIdentifier.cs index 4d0526dc47..3f57bc67f5 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/AlgorithmIdentifier.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/AlgorithmIdentifier.cs @@ -30,6 +30,8 @@ namespace System.Security.Cryptography.Pkcs public Oid Oid { get; set; } public int KeyLength { get; set; } + + public byte[] Parameters { get; set; } = Array.Empty(); } } diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/AlgorithmIdentifierAsn.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/AlgorithmIdentifierAsn.cs index 575dbb2a5d..47ad9dea35 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/AlgorithmIdentifierAsn.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/AlgorithmIdentifierAsn.cs @@ -15,6 +15,8 @@ namespace System.Security.Cryptography.Pkcs.Asn1 // parameters ANY DEFINED BY algorithm OPTIONAL } internal struct AlgorithmIdentifierAsn { + internal static readonly ReadOnlyMemory ExplicitDerNull = new byte[] { 0x05, 0x00 }; + [ObjectIdentifier(PopulateFriendlyName = true)] public Oid Algorithm; diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/EncapsulatedContentInfoAsn.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/EncapsulatedContentInfoAsn.cs index 47d0bf6417..456fa830a8 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/EncapsulatedContentInfoAsn.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/EncapsulatedContentInfoAsn.cs @@ -22,7 +22,7 @@ namespace System.Security.Cryptography.Pkcs.Asn1 [OptionalValue] [ExpectedTag(0, ExplicitTag = true)] - [OctetString] + [AnyValue] public ReadOnlyMemory? Content; } } diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/EncryptedContentInfoAsn.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/EncryptedContentInfoAsn.cs new file mode 100644 index 0000000000..a190523804 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/EncryptedContentInfoAsn.cs @@ -0,0 +1,33 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + // https://tools.ietf.org/html/rfc5652#section-6.1 + // + // EncryptedContentInfo ::= SEQUENCE { + // contentType ContentType, + // contentEncryptionAlgorithm ContentEncryptionAlgorithmIdentifier, + // encryptedContent[0] IMPLICIT EncryptedContent OPTIONAL } + // + // https://tools.ietf.org/html/rfc5652#section-11.1 + // + // ContentType ::= OBJECT IDENTIFIER + [StructLayout(LayoutKind.Sequential)] + internal struct EncryptedContentInfoAsn + { + [ObjectIdentifier] + internal string ContentType; + + internal AlgorithmIdentifierAsn ContentEncryptionAlgorithm; + + [OptionalValue] + [OctetString] + [ExpectedTag(0)] + internal ReadOnlyMemory? EncryptedContent; + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/EnvelopedDataAsn.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/EnvelopedDataAsn.cs new file mode 100644 index 0000000000..652cc7cba7 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/EnvelopedDataAsn.cs @@ -0,0 +1,39 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + // https://tools.ietf.org/html/rfc5652#section-6.1 + // + // EnvelopedData ::= SEQUENCE { + // version CMSVersion, + // originatorInfo [0] IMPLICIT OriginatorInfo OPTIONAL, + // recipientInfos RecipientInfos, + // encryptedContentInfo EncryptedContentInfo, + // unprotectedAttrs [1] IMPLICIT UnprotectedAttributes OPTIONAL } + // + // RecipientInfos ::= SET SIZE (1..MAX) OF RecipientInfo + [StructLayout(LayoutKind.Sequential)] + internal struct EnvelopedDataAsn + { + public int Version; + + [OptionalValue] + [ExpectedTag(0)] + public OriginatorInfoAsn OriginatorInfo; + + [SetOf] + public RecipientInfoAsn[] RecipientInfos; + + public EncryptedContentInfoAsn EncryptedContentInfo; + + [ExpectedTag(1)] + [SetOf] + [OptionalValue] + public AttributeAsn[] UnprotectedAttributes; + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/GeneralName.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/GeneralName.cs new file mode 100644 index 0000000000..f5895c9b17 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/GeneralName.cs @@ -0,0 +1,87 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + [Choice] + [StructLayout(LayoutKind.Sequential)] + internal struct GeneralName + { + [ExpectedTag(0, ExplicitTag = true)] + internal OtherName? OtherName; + + [ExpectedTag(1, ExplicitTag = true)] + [IA5String] + internal string Rfc822Name; + + [ExpectedTag(2, ExplicitTag = true)] + [IA5String] + internal string DnsName; + + [ExpectedTag(3, ExplicitTag = true)] + [AnyValue] + internal ReadOnlyMemory? X400Address; + + [ExpectedTag(4, ExplicitTag = true)] + [AnyValue] + internal ReadOnlyMemory? DirectoryName; + + [ExpectedTag(5, ExplicitTag = true)] + internal EdiPartyName? EdiPartyName; + + [ExpectedTag(6, ExplicitTag = true)] + [IA5String] + internal string Uri; + + [ExpectedTag(7, ExplicitTag = true)] + [OctetString] + internal ReadOnlyMemory? IPAddress; + + [ExpectedTag(8, ExplicitTag = true)] + [ObjectIdentifier] + internal string RegisteredId; + } + + [StructLayout(LayoutKind.Sequential)] + internal struct OtherName + { + internal string TypeId; + + [ExpectedTag(0, ExplicitTag = true)] + [AnyValue] + internal ReadOnlyMemory Value; + } + + [StructLayout(LayoutKind.Sequential)] + internal struct EdiPartyName + { + [OptionalValue] + internal DirectoryString? NameAssigner; + + internal DirectoryString PartyName; + } + + [Choice] + [StructLayout(LayoutKind.Sequential)] + internal struct DirectoryString + { + [ExpectedTag(TagClass.Universal, (int)UniversalTagNumber.TeletexString)] + internal ReadOnlyMemory? TeletexString; + + [PrintableString] + internal string PrintableString; + + [ExpectedTag(TagClass.Universal, (int)UniversalTagNumber.UniversalString)] + internal ReadOnlyMemory? UniversalString; + + [UTF8String] + internal string Utf8String; + + [BMPString] + internal string BMPString; + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/KeyAgreeRecipientIdentifierAsn.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/KeyAgreeRecipientIdentifierAsn.cs new file mode 100644 index 0000000000..9fb175717d --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/KeyAgreeRecipientIdentifierAsn.cs @@ -0,0 +1,24 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + // https://tools.ietf.org/html/rfc5652#section-6.2.2 + // + // KeyAgreeRecipientIdentifier ::= CHOICE { + // issuerAndSerialNumber IssuerAndSerialNumber, + // rKeyId[0] IMPLICIT RecipientKeyIdentifier } + [Choice] + [StructLayout(LayoutKind.Sequential)] + internal struct KeyAgreeRecipientIdentifierAsn + { + internal IssuerAndSerialNumberAsn? IssuerAndSerialNumber; + + [ExpectedTag(0)] + internal RecipientKeyIdentifier RKeyId; + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/KeyAgreeRecipientInfoAsn.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/KeyAgreeRecipientInfoAsn.cs new file mode 100644 index 0000000000..bdd89fe9b4 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/KeyAgreeRecipientInfoAsn.cs @@ -0,0 +1,39 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + // https://tools.ietf.org/html/rfc5652#section-6.2.2 + // + // KeyAgreeRecipientInfo ::= SEQUENCE { + // version CMSVersion, -- always set to 3 + // originator[0] EXPLICIT OriginatorIdentifierOrKey, + // ukm[1] EXPLICIT UserKeyingMaterial OPTIONAL, + // keyEncryptionAlgorithm KeyEncryptionAlgorithmIdentifier, + // recipientEncryptedKeys RecipientEncryptedKeys } + // + // https://tools.ietf.org/html/rfc5652#section-10.2.6 + // + // UserKeyingMaterial ::= OCTET STRING + [StructLayout(LayoutKind.Sequential)] + internal sealed class KeyAgreeRecipientInfoAsn + { + internal int Version; + + [ExpectedTag(0, ExplicitTag = true)] + internal OriginatorIdentifierOrKeyAsn Originator; + + [OptionalValue] + [ExpectedTag(1, ExplicitTag = true)] + [OctetString] + internal ReadOnlyMemory? Ukm; + + internal AlgorithmIdentifierAsn KeyEncryptionAlgorithm; + + internal RecipientEncryptedKeyAsn[] RecipientEncryptedKeys; + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/KeyTransRecipientInfoAsn.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/KeyTransRecipientInfoAsn.cs new file mode 100644 index 0000000000..f9fbe258fa --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/KeyTransRecipientInfoAsn.cs @@ -0,0 +1,33 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + // https://tools.ietf.org/html/rfc5652#section-6.2.1 + // + // KeyTransRecipientInfo ::= SEQUENCE { + // version CMSVersion, -- always set to 0 or 2 + // rid RecipientIdentifier, + // keyEncryptionAlgorithm KeyEncryptionAlgorithmIdentifier, + // encryptedKey EncryptedKey } + // + // https://tools.ietf.org/html/rfc5652#section-6.2 + // + // EncryptedKey ::= OCTET STRING + [StructLayout(LayoutKind.Sequential)] + internal sealed class KeyTransRecipientInfoAsn + { + internal int Version; + + internal RecipientIdentifierAsn Rid; + + internal AlgorithmIdentifierAsn KeyEncryptionAlgorithm; + + [OctetString] + internal ReadOnlyMemory EncryptedKey; + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/MessageImprint.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/MessageImprint.cs new file mode 100644 index 0000000000..0d363892b3 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/MessageImprint.cs @@ -0,0 +1,23 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + // https://tools.ietf.org/html/rfc3161#section-2.4.1 + // + // MessageImprint::= SEQUENCE { + // hashAlgorithm AlgorithmIdentifier, + // hashedMessage OCTET STRING } + [StructLayout(LayoutKind.Sequential)] + internal struct MessageImprint + { + internal AlgorithmIdentifierAsn HashAlgorithm; + + [OctetString] + internal ReadOnlyMemory HashedMessage; + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/OriginatorIdentifierOrKeyAsn.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/OriginatorIdentifierOrKeyAsn.cs new file mode 100644 index 0000000000..b983ff633b --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/OriginatorIdentifierOrKeyAsn.cs @@ -0,0 +1,31 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + // https://tools.ietf.org/html/rfc5652#section-6.2.2 + // + // OriginatorIdentifierOrKey ::= CHOICE { + // issuerAndSerialNumber IssuerAndSerialNumber, + // subjectKeyIdentifier[0] SubjectKeyIdentifier, + // originatorKey[1] OriginatorPublicKey } + // + // DEFINITIONS IMPLICIT TAGS, so [0] is [0] IMPLICIT, and [1] is [1] IMPLICIT + [StructLayout(LayoutKind.Sequential)] + [Choice] + internal struct OriginatorIdentifierOrKeyAsn + { + internal IssuerAndSerialNumberAsn? IssuerAndSerialNumber; + + [OctetString] + [ExpectedTag(0)] + internal ReadOnlyMemory? SubjectKeyIdentifier; + + [ExpectedTag(1)] + internal OriginatorPublicKeyAsn OriginatorKey; + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/OriginatorInfoAsn.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/OriginatorInfoAsn.cs new file mode 100644 index 0000000000..09c3793d7d --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/OriginatorInfoAsn.cs @@ -0,0 +1,28 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + // https://tools.ietf.org/html/rfc5652#section-6.1 + // + // OriginatorInfo ::= SEQUENCE { + // certs[0] IMPLICIT CertificateSet OPTIONAL, + // crls[1] IMPLICIT RevocationInfoChoices OPTIONAL } + [StructLayout(LayoutKind.Sequential)] + internal sealed class OriginatorInfoAsn + { + [OptionalValue] + [ExpectedTag(0)] + [SetOf] + public CertificateChoiceAsn[] CertificateSet; + + [OptionalValue] + [ExpectedTag(1)] + [AnyValue] + public ReadOnlyMemory? RevocationInfoChoices; + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/OriginatorPublicKeyAsn.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/OriginatorPublicKeyAsn.cs new file mode 100644 index 0000000000..6d8535a8d4 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/OriginatorPublicKeyAsn.cs @@ -0,0 +1,23 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + // https://tools.ietf.org/html/rfc5652#section-6.2.2 + // + // OriginatorPublicKey ::= SEQUENCE { + // algorithm AlgorithmIdentifier, + // publicKey BIT STRING } + [StructLayout(LayoutKind.Sequential)] + internal sealed class OriginatorPublicKeyAsn + { + internal AlgorithmIdentifierAsn Algorithm; + + [BitString] + internal ReadOnlyMemory PublicKey; + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/OtherKeyAttributeAsn.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/OtherKeyAttributeAsn.cs new file mode 100644 index 0000000000..5f2d7968a8 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/OtherKeyAttributeAsn.cs @@ -0,0 +1,25 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + // https://tools.ietf.org/html/rfc5652#section-10.2.7 + // + // OtherKeyAttribute ::= SEQUENCE { + // keyAttrId OBJECT IDENTIFIER, + // keyAttr ANY DEFINED BY keyAttrId OPTIONAL } + [StructLayout(LayoutKind.Sequential)] + internal struct OtherKeyAttributeAsn + { + [ObjectIdentifier] + internal string KeyAttrId; + + [OptionalValue] + [AnyValue] + internal ReadOnlyMemory? KeyAttr; + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/Rc2CbcParameters.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/Rc2CbcParameters.cs new file mode 100644 index 0000000000..3f076c4a4e --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/Rc2CbcParameters.cs @@ -0,0 +1,80 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + // https://tools.ietf.org/html/rfc3370#section-5.2 (CMS Algorithms, RC2-CBC) says + // + // The AlgorithmIdentifier parameters field MUST be present, and the + // parameters field MUST contain a RC2CBCParameter: + // + // RC2CBCParameter ::= SEQUENCE { + // rc2ParameterVersion INTEGER, + // iv OCTET STRING } -- exactly 8 octets + // + // It then effectively says "see RFC2268" for the version. + // + // https://tools.ietf.org/html/rfc2268#section-6 provides the table (EkbEncoding), + // and provides a different structure for "RC2-CBCParameter" (with a hyphen in this name). + // + // The RFC3370 structure is the second CHOICE option for RC2-CBCParameter (it has no name). + // Since 3370 says to just use that alternative there's no fallback in this code for handling + // just an IV which means that an effective key size of 32-bits has been chosen. Since 40-bit is the + // smallest supported by .NET that's not really a problem. + [StructLayout(LayoutKind.Sequential)] + internal struct Rc2CbcParameters + { + private static readonly byte[] s_rc2EkbEncoding = + { + 0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a, 0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0, + 0x30, 0x04, 0xb6, 0xdc, 0x7d, 0xdf, 0x32, 0x4b, 0xf7, 0xcb, 0x45, 0x9b, 0x31, 0xbb, 0x21, 0x5a, + 0x41, 0x9f, 0xe1, 0xd9, 0x4a, 0x4d, 0x9e, 0xda, 0xa0, 0x68, 0x2c, 0xc3, 0x27, 0x5f, 0x80, 0x36, + 0x3e, 0xee, 0xfb, 0x95, 0x1a, 0xfe, 0xce, 0xa8, 0x34, 0xa9, 0x13, 0xf0, 0xa6, 0x3f, 0xd8, 0x0c, + 0x78, 0x24, 0xaf, 0x23, 0x52, 0xc1, 0x67, 0x17, 0xf5, 0x66, 0x90, 0xe7, 0xe8, 0x07, 0xb8, 0x60, + 0x48, 0xe6, 0x1e, 0x53, 0xf3, 0x92, 0xa4, 0x72, 0x8c, 0x08, 0x15, 0x6e, 0x86, 0x00, 0x84, 0xfa, + 0xf4, 0x7f, 0x8a, 0x42, 0x19, 0xf6, 0xdb, 0xcd, 0x14, 0x8d, 0x50, 0x12, 0xba, 0x3c, 0x06, 0x4e, + 0xec, 0xb3, 0x35, 0x11, 0xa1, 0x88, 0x8e, 0x2b, 0x94, 0x99, 0xb7, 0x71, 0x74, 0xd3, 0xe4, 0xbf, + 0x3a, 0xde, 0x96, 0x0e, 0xbc, 0x0a, 0xed, 0x77, 0xfc, 0x37, 0x6b, 0x03, 0x79, 0x89, 0x62, 0xc6, + 0xd7, 0xc0, 0xd2, 0x7c, 0x6a, 0x8b, 0x22, 0xa3, 0x5b, 0x05, 0x5d, 0x02, 0x75, 0xd5, 0x61, 0xe3, + 0x18, 0x8f, 0x55, 0x51, 0xad, 0x1f, 0x0b, 0x5e, 0x85, 0xe5, 0xc2, 0x57, 0x63, 0xca, 0x3d, 0x6c, + 0xb4, 0xc5, 0xcc, 0x70, 0xb2, 0x91, 0x59, 0x0d, 0x47, 0x20, 0xc8, 0x4f, 0x58, 0xe0, 0x01, 0xe2, + 0x16, 0x38, 0xc4, 0x6f, 0x3b, 0x0f, 0x65, 0x46, 0xbe, 0x7e, 0x2d, 0x7b, 0x82, 0xf9, 0x40, 0xb5, + 0x1d, 0x73, 0xf8, 0xeb, 0x26, 0xc7, 0x87, 0x97, 0x25, 0x54, 0xb1, 0x28, 0xaa, 0x98, 0x9d, 0xa5, + 0x64, 0x6d, 0x7a, 0xd4, 0x10, 0x81, 0x44, 0xef, 0x49, 0xd6, 0xae, 0x2e, 0xdd, 0x76, 0x5c, 0x2f, + 0xa7, 0x1c, 0xc9, 0x09, 0x69, 0x9a, 0x83, 0xcf, 0x29, 0x39, 0xb9, 0xe9, 0x4c, 0xff, 0x43, 0xab, + }; + + internal int Rc2Version; + + [OctetString] + internal ReadOnlyMemory Iv; + + internal Rc2CbcParameters(ReadOnlyMemory iv, int keySize) + { + if (keySize > byte.MaxValue) + { + Rc2Version = keySize; + } + else + { + Rc2Version = s_rc2EkbEncoding[keySize]; + } + + Iv = iv; + } + + internal int GetEffectiveKeyBits() + { + if (Rc2Version > byte.MaxValue) + { + return Rc2Version; + } + + return Array.IndexOf(s_rc2EkbEncoding, (byte)Rc2Version); + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/RecipientEncryptedKeyAsn.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/RecipientEncryptedKeyAsn.cs new file mode 100644 index 0000000000..a80537a261 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/RecipientEncryptedKeyAsn.cs @@ -0,0 +1,27 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + // https://tools.ietf.org/html/rfc5652#section-6.2.2 + // + // RecipientEncryptedKey ::= SEQUENCE { + // rid KeyAgreeRecipientIdentifier, + // encryptedKey EncryptedKey } + // + // https://tools.ietf.org/html/rfc5652#section-6.2 + // + // EncryptedKey ::= OCTET STRING + [StructLayout(LayoutKind.Sequential)] + internal struct RecipientEncryptedKeyAsn + { + internal KeyAgreeRecipientIdentifierAsn Rid; + + [OctetString] + internal ReadOnlyMemory EncryptedKey; + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/RecipientIdentifierAsn.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/RecipientIdentifierAsn.cs new file mode 100644 index 0000000000..48eda4c305 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/RecipientIdentifierAsn.cs @@ -0,0 +1,27 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + // https://tools.ietf.org/html/rfc5652#section-6.2.1 + // + // RecipientIdentifier ::= CHOICE { + // issuerAndSerialNumber IssuerAndSerialNumber, + // subjectKeyIdentifier[0] SubjectKeyIdentifier } + // + // DEFINITIONS IMPLICIT TAGS, so [0] is [0] IMPLICIT + [StructLayout(LayoutKind.Sequential)] + [Choice] + internal struct RecipientIdentifierAsn + { + internal IssuerAndSerialNumberAsn? IssuerAndSerialNumber; + + [OctetString] + [ExpectedTag(0)] + internal ReadOnlyMemory? SubjectKeyIdentifier; + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/RecipientInfoAsn.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/RecipientInfoAsn.cs new file mode 100644 index 0000000000..465c5c0a02 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/RecipientInfoAsn.cs @@ -0,0 +1,30 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + // https://tools.ietf.org/html/rfc5652#section-6.2 + // + // RecipientInfo ::= CHOICE { + // ktri KeyTransRecipientInfo, + // kari[1] KeyAgreeRecipientInfo, + // kekri[2] KEKRecipientInfo, + // pwri[3] PasswordRecipientinfo, + // ori[4] OtherRecipientInfo } + [StructLayout(LayoutKind.Sequential)] + [Choice] + internal struct RecipientInfoAsn + { + internal KeyTransRecipientInfoAsn Ktri; + + [ExpectedTag(1)] + internal KeyAgreeRecipientInfoAsn Kari; + + // By not declaring the rest of the types here we get an ASN deserialization + // error for unsupported recipient types + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/RecipientKeyIdentifier.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/RecipientKeyIdentifier.cs new file mode 100644 index 0000000000..9036a57310 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/RecipientKeyIdentifier.cs @@ -0,0 +1,31 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + // https://tools.ietf.org/html/rfc5652#section-6.2.2 + // + // RecipientKeyIdentifier ::= SEQUENCE { + // subjectKeyIdentifier SubjectKeyIdentifier, + // date GeneralizedTime OPTIONAL, + // other OtherKeyAttribute OPTIONAL } + // + // SubjectKeyIdentifier ::= OCTET STRING + [StructLayout(LayoutKind.Sequential)] + internal sealed class RecipientKeyIdentifier + { + [OctetString] + internal ReadOnlyMemory SubjectKeyIdentifier; + + [OptionalValue] + [GeneralizedTime] + internal DateTimeOffset? Date; + + [OptionalValue] + internal OtherKeyAttributeAsn? Other; + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/Rfc3161Accuracy.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/Rfc3161Accuracy.cs new file mode 100644 index 0000000000..4ba16e4b74 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/Rfc3161Accuracy.cs @@ -0,0 +1,77 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + // https://tools.ietf.org/html/rfc3161#section-2.4.2 + // + // Accuracy ::= SEQUENCE { + // seconds INTEGER OPTIONAL, + // millis[0] INTEGER(1..999) OPTIONAL, + // micros[1] INTEGER(1..999) OPTIONAL } + // + // And the ASN.1 module starts as + // DEFINITIONS IMPLICIT TAGS + [StructLayout(LayoutKind.Sequential)] + internal struct Rfc3161Accuracy + { + [OptionalValue] + internal int? Seconds; + + [ExpectedTag(0)] + [OptionalValue] + internal int? Millis; + + [ExpectedTag(1)] + [OptionalValue] + internal int? Micros; + + // Parameter name (and exception) match the Rfc3161TimestampTokenInfo ctor. + internal Rfc3161Accuracy(long accuracyInMicroseconds) + { + if (accuracyInMicroseconds < 0) + { + throw new ArgumentOutOfRangeException(nameof(accuracyInMicroseconds)); + } + + long totalMillis = Math.DivRem(accuracyInMicroseconds, 1000, out long micros); + long seconds = Math.DivRem(totalMillis, 1000, out long millis); + + if (seconds != 0) + { + Seconds = checked((int)seconds); + } + else + { + Seconds = null; + } + + if (millis != 0) + { + Millis = (int)millis; + } + else + { + Millis = null; + } + + if (micros != 0) + { + Micros = (int)micros; + } + else + { + Micros = null; + } + } + + internal long TotalMicros => + 1_000_000L * Seconds.GetValueOrDefault() + + 1000L * Millis.GetValueOrDefault() + + Micros.GetValueOrDefault(); + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/Rfc3161TimeStampReq.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/Rfc3161TimeStampReq.cs new file mode 100644 index 0000000000..236520b363 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/Rfc3161TimeStampReq.cs @@ -0,0 +1,44 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + // https://tools.ietf.org/html/rfc3161#section-2.4.1 + // + // TimeStampReq ::= SEQUENCE { + // version INTEGER { v1(1) }, + // messageImprint MessageImprint, + // --a hash algorithm OID and the hash value of the data to be + // --time-stamped + // reqPolicy TSAPolicyId OPTIONAL, + // nonce INTEGER OPTIONAL, + // certReq BOOLEAN DEFAULT FALSE, + // extensions [0] IMPLICIT Extensions OPTIONAL } + [StructLayout(LayoutKind.Sequential)] + internal struct Rfc3161TimeStampReq + { + public int Version; + + public MessageImprint MessageImprint; + + [OptionalValue] + public Oid ReqPolicy; + + [OptionalValue] + [Integer] + public ReadOnlyMemory? Nonce; + +#pragma warning disable CS3016 + [DefaultValue(0x01, 0x01, 0x00)] +#pragma warning restore CS3016 + public bool CertReq; + + [ExpectedTag(0)] + [OptionalValue] + internal X509ExtensionAsn[] Extensions; + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/Rfc3161TimeStampResp.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/Rfc3161TimeStampResp.cs new file mode 100644 index 0000000000..d05e9ab269 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/Rfc3161TimeStampResp.cs @@ -0,0 +1,76 @@ +using System.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + [StructLayout(LayoutKind.Sequential)] + internal struct Rfc3161TimeStampResp + { + public PkiStatusInfo Status; + + // TimeStampToken, but it'll be parsed by something else. + [AnyValue] + [OptionalValue] + public ReadOnlyMemory? TimeStampToken; + } + + [StructLayout(LayoutKind.Sequential)] + internal struct PkiStatusInfo + { + public int Status; + + [OptionalValue] + [AnyValue] + [ExpectedTag(TagClass.Universal, (int)UniversalTagNumber.SequenceOf)] + public ReadOnlyMemory? StatusString; + + [OptionalValue] + public PkiFailureInfo? FailInfo; + } + + // https://tools.ietf.org/html/rfc4210#section-5.2.3 + [Flags] + internal enum PkiFailureInfo + { + None = 0, + BadAlg = 1 << 0, + BadMessageCheck = 1 << 1, + BadRequest = 1 << 2, + BadTime = 1 << 3, + BadCertId = 1 << 4, + BadDataFormat = 1 << 5, + WrongAuthority = 1 << 6, + IncorrectData = 1 << 7, + MissingTimeStamp = 1 << 8, + BadPop = 1 << 9, + CertRevoked = 1 << 10, + CertConfirmed = 1 << 11, + WrongIntegrity = 1 << 12, + BadRecipientNonce = 1 << 13, + TimeNotAvailable = 1 << 14, + UnacceptedPolicy = 1 << 15, + UnacceptedExtension = 1 << 16, + AddInfoNotAvailable = 1 << 17, + BadSenderNonce = 1 << 18, + BadCertTemplate = 1 << 19, + SignerNotTrusted = 1 << 20, + TransactionIdInUse = 1 << 21, + UnsupportedVersion = 1 << 22, + NotAuthorized = 1 << 23, + SystemUnavail = 1 << 24, + SystemFailure = 1 << 25, + DuplicateCertReq = 1 << 26, + } + + // https://tools.ietf.org/html/rfc4210#section-5.2.3 + internal enum PkiStatus + { + Granted = 0, + GrantedWithMods = 1, + Rejection = 2, + Waiting = 3, + RevocationWarning = 4, + RevocationNotification = 5, + KeyUpdateWarning = 6, + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/Rfc3161TstInfo.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/Rfc3161TstInfo.cs new file mode 100644 index 0000000000..1a646768e8 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/Rfc3161TstInfo.cs @@ -0,0 +1,68 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + // https://tools.ietf.org/html/rfc3161#section-2.4.2 + // + // TSTInfo ::= SEQUENCE { + // version INTEGER { v1(1) }, + // policy TSAPolicyId, + // messageImprint MessageImprint, + // -- MUST have the same value as the similar field in + // -- TimeStampReq + // serialNumber INTEGER, + // -- Time-Stamping users MUST be ready to accommodate integers + // -- up to 160 bits. + // genTime GeneralizedTime, + // accuracy Accuracy OPTIONAL, + // ordering BOOLEAN DEFAULT FALSE, + // nonce INTEGER OPTIONAL, + // -- MUST be present if the similar field was present + // -- in TimeStampReq.In that case it MUST have the same value. + // tsa[0] GeneralName OPTIONAL, + // extensions[1] IMPLICIT Extensions OPTIONAL } + // + [StructLayout(LayoutKind.Sequential)] + internal sealed class Rfc3161TstInfo + { + internal int Version; + + [ObjectIdentifier(PopulateFriendlyName = true)] + internal Oid Policy; + + internal MessageImprint MessageImprint; + + [Integer] + internal ReadOnlyMemory SerialNumber; + + // Timestamps SHOULD omit fractions "when there is no need". + // That means that we need to still support reading and writing them. + [GeneralizedTime(DisallowFractions = false)] + internal DateTimeOffset GenTime; + + [OptionalValue] + internal Rfc3161Accuracy? Accuracy; + +#pragma warning disable CS3016 // Arrays as attribute arguments is not CLS-compliant + [DefaultValue(0x01, 0x01, 0x00)] +#pragma warning restore CS3016 // Arrays as attribute arguments is not CLS-compliant + internal bool Ordering; + + [Integer] + [OptionalValue] + internal ReadOnlyMemory? Nonce; + + [ExpectedTag(0, ExplicitTag = true)] + [OptionalValue] + internal GeneralName? Tsa; + + [ExpectedTag(1)] + [OptionalValue] + internal X509ExtensionAsn[] Extensions; + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/SigningCertificateAsn.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/SigningCertificateAsn.cs new file mode 100644 index 0000000000..92f147aa75 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/SigningCertificateAsn.cs @@ -0,0 +1,89 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + // https://tools.ietf.org/html/rfc2634#section-5.4 + // + // SigningCertificate ::= SEQUENCE { + // certs SEQUENCE OF ESSCertID, + // policies SEQUENCE OF PolicyInformation OPTIONAL + // } + [StructLayout(LayoutKind.Sequential)] + internal struct SigningCertificateAsn + { + public EssCertId[] Certs; + + [OptionalValue] + public PolicyInformation[] Policies; + } + + [StructLayout(LayoutKind.Sequential)] + internal sealed class EssCertId + { + [OctetString] + public ReadOnlyMemory Hash; + + [OptionalValue] + public CadesIssuerSerial? IssuerSerial; + } + + [StructLayout(LayoutKind.Sequential)] + internal struct CadesIssuerSerial + { + public GeneralName[] Issuer; + + [Integer] + public ReadOnlyMemory SerialNumber; + } + + [StructLayout(LayoutKind.Sequential)] + internal struct PolicyInformation + { + [ObjectIdentifier] + public string PolicyIdentifier; + + [OptionalValue] + public PolicyQualifierInfo[] PolicyQualifiers; + } + + [StructLayout(LayoutKind.Sequential)] + internal struct PolicyQualifierInfo + { + [ObjectIdentifier] + public string PolicyQualifierId; + + [AnyValue] + public ReadOnlyMemory Qualifier; + } + + [StructLayout(LayoutKind.Sequential)] + internal struct SigningCertificateV2Asn + { + public EssCertIdV2[] Certs; + + + [OptionalValue] + public PolicyInformation[] Policies; + } + + [StructLayout(LayoutKind.Sequential)] + internal sealed class EssCertIdV2 + { +#pragma warning disable CS3016 // Arrays as attribute arguments is not CLS-compliant + // SEQUENCE(OID(2.16.840.1.101.3.4.2.1)) + [DefaultValue(0x30, 0x0B, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01)] +#pragma warning restore CS3016 // Arrays as attribute arguments is not CLS-compliant + public AlgorithmIdentifierAsn HashAlgorithm; + + [OctetString] + public ReadOnlyMemory Hash; + + [OptionalValue] + public CadesIssuerSerial? IssuerSerial; + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/X509ExtensionAsn.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/X509ExtensionAsn.cs new file mode 100644 index 0000000000..42ad92bce8 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/X509ExtensionAsn.cs @@ -0,0 +1,38 @@ +// 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.Runtime.InteropServices; +using System.Security.Cryptography.Asn1; +using System.Security.Cryptography.X509Certificates; +using Internal.Cryptography; + +namespace System.Security.Cryptography.Pkcs.Asn1 +{ + [StructLayout(LayoutKind.Sequential)] + internal struct X509ExtensionAsn + { + [ObjectIdentifier] + internal string ExtnId; + +#pragma warning disable CS3016 // Arrays as attribute arguments is not CLS-compliant + [DefaultValue(0x01, 0x01, 0x00)] +#pragma warning restore CS3016 // Arrays as attribute arguments is not CLS-compliant + internal bool Critical; + + [OctetString] + internal ReadOnlyMemory ExtnValue; + + public X509ExtensionAsn(X509Extension extension, bool copyValue=true) + { + if (extension == null) + { + throw new ArgumentNullException(nameof(extension)); + } + + ExtnId = extension.Oid.Value; + Critical = extension.Critical; + ExtnValue = copyValue ? extension.RawData.CloneByteArray() : extension.RawData; + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsRecipientCollection.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsRecipientCollection.cs index b9789dddfa..090024df30 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsRecipientCollection.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsRecipientCollection.cs @@ -112,7 +112,7 @@ namespace System.Security.Cryptography.Pkcs _recipients.CopyTo(array, index); } - bool ICollection.IsSynchronized + public bool IsSynchronized { get { @@ -120,7 +120,7 @@ namespace System.Security.Cryptography.Pkcs } } - object ICollection.SyncRoot + public object SyncRoot { get { diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsSignature.DSA.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsSignature.DSA.cs index e85cfbd3fc..53e21182c7 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsSignature.DSA.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsSignature.DSA.cs @@ -32,8 +32,13 @@ namespace System.Security.Cryptography.Pkcs } internal override bool VerifySignature( +#if netcoreapp ReadOnlySpan valueHash, ReadOnlyMemory signature, +#else + byte[] valueHash, + byte[] signature, +#endif string digestAlgorithmOid, HashAlgorithmName digestAlgorithmName, ReadOnlyMemory? signatureParameters, @@ -58,28 +63,38 @@ namespace System.Security.Cryptography.Pkcs DSAParameters dsaParameters = dsa.ExportParameters(false); int bufSize = 2 * dsaParameters.Q.Length; +#if netcoreapp ArrayPool pool = ArrayPool.Shared; byte[] rented = pool.Rent(bufSize); Span ieee = new Span(rented, 0, bufSize); try { +#else + byte[] ieee = new byte[bufSize]; +#endif if (!DsaDerToIeee(signature, ieee)) { return false; } return dsa.VerifySignature(valueHash, ieee); +#if netcoreapp } finally { ieee.Clear(); pool.Return(rented); } +#endif } protected override bool Sign( +#if netcoreapp ReadOnlySpan dataHash, +#else + byte[] dataHash, +#endif HashAlgorithmName hashAlgorithmName, X509Certificate2 certificate, bool silent, @@ -114,6 +129,7 @@ namespace System.Security.Cryptography.Pkcs signatureAlgorithm = new Oid(oidValue, oidValue); +#if netcoreapp ArrayPool pool = ArrayPool.Shared; // The Q size cannot be bigger than the KeySize. byte[] rented = pool.Rent(dsa.KeySize / 8); @@ -135,6 +151,11 @@ namespace System.Security.Cryptography.Pkcs signatureValue = null; return false; +#else + byte[] signature = dsa.CreateSignature(dataHash); + signatureValue = DsaIeeeToDer(new ReadOnlySpan(signature)); + return true; +#endif } } } diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsSigner.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsSigner.cs index 954c342292..559b27b928 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsSigner.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsSigner.cs @@ -13,15 +13,32 @@ namespace System.Security.Cryptography.Pkcs { public sealed class CmsSigner { +#if MONO + private static readonly Oid s_defaultAlgorithm = Oid.FromOidValue(Oids.Sha1, OidGroup.HashAlgorithm); +#else private static readonly Oid s_defaultAlgorithm = Oid.FromOidValue(Oids.Sha256, OidGroup.HashAlgorithm); +#endif + + private SubjectIdentifierType _signerIdentifierType; public X509Certificate2 Certificate { get; set; } - public X509Certificate2Collection Certificates { get; set; } = new X509Certificate2Collection(); + public AsymmetricAlgorithm PrivateKey { get; set; } + public X509Certificate2Collection Certificates { get; private set; } = new X509Certificate2Collection(); public Oid DigestAlgorithm { get; set; } public X509IncludeOption IncludeOption { get; set; } - public CryptographicAttributeObjectCollection SignedAttributes { get; set; } = new CryptographicAttributeObjectCollection(); - public SubjectIdentifierType SignerIdentifierType { get; set; } - public CryptographicAttributeObjectCollection UnsignedAttributes { get; set; } = new CryptographicAttributeObjectCollection(); + public CryptographicAttributeObjectCollection SignedAttributes { get; private set; } = new CryptographicAttributeObjectCollection(); + public CryptographicAttributeObjectCollection UnsignedAttributes { get; private set; } = new CryptographicAttributeObjectCollection(); + + public SubjectIdentifierType SignerIdentifierType + { + get { return _signerIdentifierType; } + set + { + if (value < SubjectIdentifierType.IssuerAndSerialNumber || value > SubjectIdentifierType.NoSignature) + throw new ArgumentException(SR.Format(SR.Cryptography_Cms_Invalid_Subject_Identifier_Type, value)); + _signerIdentifierType = value; + } + } public CmsSigner() : this(SubjectIdentifierType.IssuerAndSerialNumber, null) @@ -54,23 +71,23 @@ namespace System.Security.Cryptography.Pkcs switch (signerIdentifierType) { case SubjectIdentifierType.Unknown: - SignerIdentifierType = SubjectIdentifierType.IssuerAndSerialNumber; + _signerIdentifierType = SubjectIdentifierType.IssuerAndSerialNumber; IncludeOption = X509IncludeOption.ExcludeRoot; break; case SubjectIdentifierType.IssuerAndSerialNumber: - SignerIdentifierType = signerIdentifierType; + _signerIdentifierType = signerIdentifierType; IncludeOption = X509IncludeOption.ExcludeRoot; break; case SubjectIdentifierType.SubjectKeyIdentifier: - SignerIdentifierType = signerIdentifierType; + _signerIdentifierType = signerIdentifierType; IncludeOption = X509IncludeOption.ExcludeRoot; break; case SubjectIdentifierType.NoSignature: - SignerIdentifierType = signerIdentifierType; + _signerIdentifierType = signerIdentifierType; IncludeOption = X509IncludeOption.None; break; default: - SignerIdentifierType = SubjectIdentifierType.IssuerAndSerialNumber; + _signerIdentifierType = SubjectIdentifierType.IssuerAndSerialNumber; IncludeOption = X509IncludeOption.ExcludeRoot; break; } @@ -112,7 +129,10 @@ namespace System.Security.Cryptography.Pkcs SignerInfoAsn newSignerInfo = new SignerInfoAsn(); newSignerInfo.DigestAlgorithm.Algorithm = DigestAlgorithm; - if ((SignedAttributes != null && SignedAttributes.Count > 0) || contentTypeOid == null) + // If the user specified attributes (not null, count > 0) we need attributes. + // If the content type is null we're counter-signing, and need the message digest attr. + // If the content type is otherwise not-data we need to record it as the content-type attr. + if (SignedAttributes?.Count > 0 || contentTypeOid != Oids.Pkcs7Data) { List signedAttrs = BuildAttributes(SignedAttributes); @@ -255,7 +275,7 @@ namespace System.Security.Cryptography.Pkcs if (i == last && IncludeOption == X509IncludeOption.ExcludeRoot && - cert.SubjectName.RawData.AsReadOnlySpan().SequenceEqual(cert.IssuerName.RawData)) + cert.SubjectName.RawData.AsSpan().SequenceEqual(cert.IssuerName.RawData)) { break; } @@ -269,7 +289,7 @@ namespace System.Security.Cryptography.Pkcs return newSignerInfo; } - private static List BuildAttributes(CryptographicAttributeObjectCollection attributes) + internal static List BuildAttributes(CryptographicAttributeObjectCollection attributes) { List signedAttrs = new List(); diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/EnvelopedCms.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/EnvelopedCms.cs index 9c2521a0ba..f3a03c9a7c 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/EnvelopedCms.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/EnvelopedCms.cs @@ -10,7 +10,7 @@ using Internal.Cryptography; namespace System.Security.Cryptography.Pkcs { - public sealed class EnvelopedCms + public sealed partial class EnvelopedCms { // // Constructors diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/RecipientInfoCollection.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/RecipientInfoCollection.cs index 4a625806b8..1c7e8a83e2 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/RecipientInfoCollection.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/RecipientInfoCollection.cs @@ -81,7 +81,7 @@ namespace System.Security.Cryptography.Pkcs _recipientInfos.CopyTo(array, index); } - bool ICollection.IsSynchronized + public bool IsSynchronized { get { @@ -89,7 +89,7 @@ namespace System.Security.Cryptography.Pkcs } } - object ICollection.SyncRoot + public object SyncRoot { get { diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Rfc3161RequestResponseStatus.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Rfc3161RequestResponseStatus.cs new file mode 100644 index 0000000000..6539625b20 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Rfc3161RequestResponseStatus.cs @@ -0,0 +1,19 @@ +// 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.Security.Cryptography.Pkcs +{ + internal enum Rfc3161RequestResponseStatus + { + Unknown = 0, + Accepted = 1, + DoesNotParse = 2, + RequestFailed = 3, + HashMismatch = 4, + VersionTooNew = 5, + NonceMismatch = 6, + RequestedCertificatesMissing = 7, + UnexpectedCertificates = 8, + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Rfc3161TimestampRequest.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Rfc3161TimestampRequest.cs new file mode 100644 index 0000000000..4be637279f --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Rfc3161TimestampRequest.cs @@ -0,0 +1,427 @@ +// 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.Linq; +using System.Security.Cryptography.Asn1; +using System.Security.Cryptography.Pkcs.Asn1; +using System.Security.Cryptography.X509Certificates; +using Internal.Cryptography; + +namespace System.Security.Cryptography.Pkcs +{ + public sealed class Rfc3161TimestampRequest + { + private byte[] _encodedBytes; + private Rfc3161TimeStampReq _parsedData; + + private Rfc3161TimestampRequest() + { + } + + public int Version => _parsedData.Version; + public ReadOnlyMemory GetMessageHash() => _parsedData.MessageImprint.HashedMessage; + public Oid HashAlgorithmId => _parsedData.MessageImprint.HashAlgorithm.Algorithm; + public Oid RequestedPolicyId => _parsedData.ReqPolicy; + public bool RequestSignerCertificate => _parsedData.CertReq; + public ReadOnlyMemory? GetNonce() => _parsedData.Nonce; + public bool HasExtensions => _parsedData.Extensions?.Length > 0; + + public X509ExtensionCollection GetExtensions() + { + var coll = new X509ExtensionCollection(); + + if (!HasExtensions) + { + return coll; + } + + X509ExtensionAsn[] rawExtensions = _parsedData.Extensions; + + foreach (X509ExtensionAsn rawExtension in rawExtensions) + { + X509Extension extension = new X509Extension( + rawExtension.ExtnId, + rawExtension.ExtnValue.ToArray(), + rawExtension.Critical); + + // Currently there are no extensions defined. + // Should this dip into CryptoConfig or other extensible + // mechanisms for the CopyTo rich type uplift? + coll.Add(extension); + } + + return coll; + } + + public Rfc3161TimestampToken ProcessResponse(ReadOnlyMemory source, out int bytesConsumed) + { + Rfc3161RequestResponseStatus status; + Rfc3161TimestampToken token; + + if (ProcessResponse(source, out token, out status, out int localBytesRead, shouldThrow: true)) + { + Debug.Assert(status == Rfc3161RequestResponseStatus.Accepted); + bytesConsumed = localBytesRead; + return token; + } + + Debug.Fail($"AcceptResponse should have thrown or returned true (status={status})"); + throw new CryptographicException(); + } + + private bool ProcessResponse( + ReadOnlyMemory source, + out Rfc3161TimestampToken token, + out Rfc3161RequestResponseStatus status, + out int bytesConsumed, + bool shouldThrow) + { + status = Rfc3161RequestResponseStatus.Unknown; + token = null; + + Rfc3161TimeStampResp resp; + + try + { + resp = AsnSerializer.Deserialize(source, AsnEncodingRules.DER, out bytesConsumed); + } + catch (CryptographicException) when (!shouldThrow) + { + bytesConsumed = 0; + status = Rfc3161RequestResponseStatus.DoesNotParse; + return false; + } + + // bytesRead will be set past this point + + PkiStatus pkiStatus = (PkiStatus)resp.Status.Status; + + if (pkiStatus != PkiStatus.Granted && + pkiStatus != PkiStatus.GrantedWithMods) + { + if (shouldThrow) + { + throw new CryptographicException( + SR.Format( + SR.Cryptography_TimestampReq_Failure, + pkiStatus, + resp.Status.FailInfo.GetValueOrDefault())); + } + + status = Rfc3161RequestResponseStatus.RequestFailed; + return false; + } + + if (!Rfc3161TimestampToken.TryDecode(resp.TimeStampToken.GetValueOrDefault(), out token, out _)) + { + if (shouldThrow) + { + throw new CryptographicException(SR.Cryptography_TimestampReq_BadResponse); + } + + bytesConsumed = 0; + status = Rfc3161RequestResponseStatus.DoesNotParse; + return false; + } + + status = ValidateResponse(token, shouldThrow); + return status == Rfc3161RequestResponseStatus.Accepted; + } + + public byte[] Encode() + { + return _encodedBytes.CloneByteArray(); + } + + public bool TryEncode(Span destination, out int bytesWritten) + { + if (destination.Length < _encodedBytes.Length) + { + bytesWritten = 0; + return false; + } + + _encodedBytes.AsSpan().CopyTo(destination); + bytesWritten = _encodedBytes.Length; + return true; + } + + public static Rfc3161TimestampRequest CreateFromSignerInfo( + SignerInfo signerInfo, + HashAlgorithmName hashAlgorithm, + Oid requestedPolicyId = null, + ReadOnlyMemory? nonce = null, + bool requestSignerCertificates = false, + X509ExtensionCollection extensions = null) + { + if (signerInfo == null) + { + throw new ArgumentNullException(nameof(signerInfo)); + } + + // https://tools.ietf.org/html/rfc3161, Appendix A. + // + // The value of messageImprint field within TimeStampToken shall be a + // hash of the value of signature field within SignerInfo for the + // signedData being time-stamped. + return CreateFromData( + signerInfo.GetSignature(), + hashAlgorithm, + requestedPolicyId, + nonce, + requestSignerCertificates, + extensions); + } + + public static Rfc3161TimestampRequest CreateFromData( + ReadOnlySpan data, + HashAlgorithmName hashAlgorithm, + Oid requestedPolicyId = null, + ReadOnlyMemory? nonce = null, + bool requestSignerCertificates = false, + X509ExtensionCollection extensions = null) + { + using (IncrementalHash hasher = IncrementalHash.CreateHash(hashAlgorithm)) + { + hasher.AppendData(data); + byte[] digest = hasher.GetHashAndReset(); + + return CreateFromHash( + digest, + hashAlgorithm, + requestedPolicyId, + nonce, + requestSignerCertificates, + extensions); + } + } + + public static Rfc3161TimestampRequest CreateFromHash( + ReadOnlyMemory hash, + HashAlgorithmName hashAlgorithm, + Oid requestedPolicyId = null, + ReadOnlyMemory? nonce = null, + bool requestSignerCertificates = false, + X509ExtensionCollection extensions = null) + { + string oidStr = Helpers.GetOidFromHashAlgorithm(hashAlgorithm); + + return CreateFromHash( + hash, + new Oid(oidStr, oidStr), + requestedPolicyId, + nonce, + requestSignerCertificates, + extensions); + } + + /// + /// Create a timestamp request using a pre-computed hash value. + /// + /// The pre-computed hash value to be timestamped. + /// + /// The Object Identifier (OID) for the hash algorithm which produced . + /// + /// + /// The Object Identifier (OID) for a timestamp policy the Timestamp Authority (TSA) should use, + /// or null to express no preference. + /// + /// + /// An optional nonce (number used once) to uniquely identify this request to pair it with the response. + /// The value is interpreted as an unsigned big-endian integer and may be normalized to the encoding format. + /// + /// + /// Indicates whether the Timestamp Authority (TSA) must (true) or must not (false) include + /// the signing certificate in the issued timestamp token. + /// + /// RFC3161 extensions to present with the request. + /// + /// An representing the chosen values. + /// + /// + /// + public static Rfc3161TimestampRequest CreateFromHash( + ReadOnlyMemory hash, + Oid hashAlgorithmId, + Oid requestedPolicyId = null, + ReadOnlyMemory? nonce = null, + bool requestSignerCertificates = false, + X509ExtensionCollection extensions = null) + { + var req = new Rfc3161TimeStampReq + { + Version = 1, + MessageImprint = new MessageImprint + { + HashAlgorithm = + { + Algorithm = hashAlgorithmId, + Parameters = AlgorithmIdentifierAsn.ExplicitDerNull, + }, + + HashedMessage = hash, + }, + ReqPolicy = requestedPolicyId, + CertReq = requestSignerCertificates, + Nonce = nonce, + }; + + if (extensions != null) + { + req.Extensions = + extensions.OfType().Select(e => new X509ExtensionAsn(e)).ToArray(); + } + + // The RFC implies DER (see TryParse), and DER is the most widely understood given that + // CER isn't specified. + const AsnEncodingRules ruleSet = AsnEncodingRules.DER; + AsnWriter writer = AsnSerializer.Serialize(req, ruleSet); + byte[] encodedBytes = writer.Encode(); + + // Make sure everything normalizes + req = AsnSerializer.Deserialize(encodedBytes, ruleSet); + + return new Rfc3161TimestampRequest + { + _encodedBytes = writer.Encode(), + _parsedData = req, + }; + } + + public static bool TryDecode( + ReadOnlyMemory encodedBytes, + out Rfc3161TimestampRequest request, + out int bytesConsumed) + { + try + { + // RFC 3161 doesn't have a concise statement that TimeStampReq will + // be DER encoded, but under the email protocol (3.1), file protocol (3.2), + // socket protocol (3.3) and HTTP protocol (3.4) they all say DER for the + // transmission. + // + // Since nothing says BER, assume DER only. + const AsnEncodingRules RuleSet = AsnEncodingRules.DER; + + AsnReader reader = new AsnReader(encodedBytes, RuleSet); + ReadOnlyMemory firstElement = reader.PeekEncodedValue(); + + var req = AsnSerializer.Deserialize(firstElement, RuleSet); + + request = new Rfc3161TimestampRequest + { + _parsedData = req, + _encodedBytes = firstElement.ToArray(), + }; + + bytesConsumed = firstElement.Length; + return true; + } + catch (CryptographicException) + { + } + + request = null; + bytesConsumed = 0; + return false; + } + + private Rfc3161RequestResponseStatus ValidateResponse( + Rfc3161TimestampToken token, + bool shouldThrow) + { + Debug.Assert(token != null); + + // This method validates the acceptance criteria sprinkled throughout the + // field descriptions in https://tools.ietf.org/html/rfc3161#section-2.4.1 and + // https://tools.ietf.org/html/rfc3161#section-2.4.2 + + if (!token.VerifyHash(GetMessageHash().Span, HashAlgorithmId.Value)) + { + if (shouldThrow) + { + throw new CryptographicException(SR.Cryptography_BadHashValue); + } + + return Rfc3161RequestResponseStatus.HashMismatch; + } + + Rfc3161TimestampTokenInfo tokenInfo = token.TokenInfo; + + // We only understand V1 messaging and validation + if (tokenInfo.Version != 1) + { + if (shouldThrow) + { + throw new CryptographicException(SR.Cryptography_TimestampReq_BadResponse); + } + + return Rfc3161RequestResponseStatus.VersionTooNew; + } + + // reqPolicy is what the policy SHOULD be, so we can't reject it here. + + ReadOnlyMemory? requestNonce = GetNonce(); + ReadOnlyMemory? responseNonce = tokenInfo.GetNonce(); + + // The RFC says that if a nonce was in the request it MUST be present in + // the response and it MUST be equal. + // + // It does not say that if no nonce was requested that the response MUST NOT include one, so + // don't check anything if no nonce was requested. + if (requestNonce != null) + { + if (responseNonce == null || + !requestNonce.Value.Span.SequenceEqual(responseNonce.Value.Span)) + { + if (shouldThrow) + { + throw new CryptographicException(SR.Cryptography_TimestampReq_BadNonce); + } + + return Rfc3161RequestResponseStatus.NonceMismatch; + } + } + + SignedCms tokenCms = token.AsSignedCms(); + + if (RequestSignerCertificate) + { + // If the certificate was requested it + // A) MUST be present in token.AsSignedCms().Certificates + // B) the ESSCertID(2) identifier MUST be correct. + // + // Other certificates are permitted, and will not be validated. + + if (tokenCms.SignerInfos[0].Certificate == null) + { + if (shouldThrow) + { + throw new CryptographicException(SR.Cryptography_TimestampReq_NoCertFound); + } + + return Rfc3161RequestResponseStatus.RequestedCertificatesMissing; + } + } + else + { + // If no certificate was requested then the CMS Certificates collection + // MUST be empty. + + if (tokenCms.Certificates.Count != 0) + { + if (shouldThrow) + { + throw new CryptographicException(SR.Cryptography_TimestampReq_UnexpectedCertFound); + } + + return Rfc3161RequestResponseStatus.UnexpectedCertificates; + } + } + + return Rfc3161RequestResponseStatus.Accepted; + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Rfc3161TimestampToken.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Rfc3161TimestampToken.cs new file mode 100644 index 0000000000..665d5c0b61 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Rfc3161TimestampToken.cs @@ -0,0 +1,641 @@ +// 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.Linq; +using System.Security.Cryptography.Asn1; +using System.Security.Cryptography.Pkcs.Asn1; +using System.Security.Cryptography.X509Certificates; +using System.Security.Cryptography.Xml; +using Internal.Cryptography; + +namespace System.Security.Cryptography.Pkcs +{ + public sealed class Rfc3161TimestampToken + { + private SignedCms _parsedDocument; + private SignerInfo _signerInfo; + private EssCertId _essCertId; + private EssCertIdV2 _essCertIdV2; + + public Rfc3161TimestampTokenInfo TokenInfo { get; private set; } + + private Rfc3161TimestampToken() + { + } + + /// + /// Get a SignedCms representation of the RFC3161 Timestamp Token. + /// + /// The SignedCms representation of the RFC3161 Timestamp Token. + /// + /// Successive calls to this method return the same object. + /// The SignedCms class is mutable, but changes to that object are not reflected in the + /// object which produced it. + /// The value from calling can be interpreted again as an + /// via another call to . + /// + public SignedCms AsSignedCms() => _parsedDocument; + + private X509Certificate2 GetSignerCertificate(X509Certificate2Collection extraCandidates) + { + Debug.Assert(_signerInfo != null, "_signerInfo != null"); + X509Certificate2 signerCert = _signerInfo.Certificate; + + if (signerCert != null) + { + if (CheckCertificate(signerCert, _signerInfo, _essCertId, _essCertIdV2, TokenInfo)) + { + return signerCert; + } + + // SignedCms will not try another certificate in this state, so just fail. + return null; + } + + if (extraCandidates == null || extraCandidates.Count == 0) + { + return null; + } + + foreach (X509Certificate2 candidate in extraCandidates) + { + if (CheckCertificate(candidate, _signerInfo, _essCertId, _essCertIdV2, TokenInfo)) + { + return candidate; + } + } + + return null; + } + + public bool VerifySignatureForData( + ReadOnlySpan data, + out X509Certificate2 signerCertificate, + X509Certificate2Collection extraCandidates = null) + { + signerCertificate = null; + + X509Certificate2 cert = GetSignerCertificate(extraCandidates); + + if (cert == null) + { + return false; + } + + bool ret = VerifyData(data); + + if (ret) + { + signerCertificate = cert; + } + + return ret; + } + + public bool VerifySignatureForHash( + ReadOnlySpan hash, + HashAlgorithmName hashAlgorithm, + out X509Certificate2 signerCertificate, + X509Certificate2Collection extraCandidates = null) + { + signerCertificate = null; + + X509Certificate2 cert = GetSignerCertificate(extraCandidates); + + if (cert == null) + { + return false; + } + + bool ret = VerifyHash(hash, Helpers.GetOidFromHashAlgorithm(hashAlgorithm)); + + if (ret) + { + signerCertificate = cert; + } + + return ret; + } + + public bool VerifySignatureForHash( + ReadOnlySpan hash, + Oid hashAlgorithmId, + out X509Certificate2 signerCertificate, + X509Certificate2Collection extraCandidates = null) + { + if (hashAlgorithmId == null) + { + throw new ArgumentNullException(nameof(hashAlgorithmId)); + } + + signerCertificate = null; + + X509Certificate2 cert = GetSignerCertificate(extraCandidates); + + if (cert == null) + { + return false; + } + + bool ret = VerifyHash(hash, hashAlgorithmId.Value); + + if (ret) + { + // REVIEW: Should this return the cert, or new X509Certificate2(cert.RawData)? + // SignedCms.SignerInfos builds new objects each call, which makes + // ReferenceEquals(cms.SignerInfos[0].Certificate, cms.SignerInfos[0].Certificate) be false. + // So maybe it's weird to give back a cert we've copied from that? + signerCertificate = cert; + } + + return ret; + } + + public bool VerifySignatureForSignerInfo( + SignerInfo signerInfo, + out X509Certificate2 signerCertificate, + X509Certificate2Collection extraCandidates = null) + { + if (signerInfo == null) + { + throw new ArgumentNullException(nameof(signerInfo)); + } + + return VerifySignatureForData( + signerInfo.GetSignatureMemory().Span, + out signerCertificate, + extraCandidates); + } + + internal bool VerifyHash(ReadOnlySpan hash, string hashAlgorithmId) + { + return + hash.SequenceEqual(TokenInfo.GetMessageHash().Span) && + hashAlgorithmId == TokenInfo.HashAlgorithmId.Value; + } + + private bool VerifyData(ReadOnlySpan data) + { + Oid hashAlgorithmId = TokenInfo.HashAlgorithmId; + HashAlgorithmName hashAlgorithmName = Helpers.GetDigestAlgorithm(hashAlgorithmId); + + using (IncrementalHash hasher = IncrementalHash.CreateHash(hashAlgorithmName)) + { + hasher.AppendData(data); + + // SHA-2-512 is the biggest hash we currently know about. + Span stackSpan = stackalloc byte[512 / 8]; + + if (hasher.TryGetHashAndReset(stackSpan, out int bytesWritten)) + { + return VerifyHash(stackSpan.Slice(0, bytesWritten), hashAlgorithmId.Value); + } + + // Something we understood, but is bigger than 512-bit. + // Allocate at runtime, trip in a debug build so we can re-evaluate this. + Debug.Fail( + $"TryGetHashAndReset did not fit in {stackSpan.Length} for hash {hashAlgorithmId.Value}"); + + return VerifyHash(hasher.GetHashAndReset(), hashAlgorithmId.Value); + } + } + + private static bool CheckCertificate( + X509Certificate2 tsaCertificate, + SignerInfo signer, + EssCertId certId, + EssCertIdV2 certId2, + Rfc3161TimestampTokenInfo tokenInfo) + { + Debug.Assert(tsaCertificate != null); + Debug.Assert(signer != null); + Debug.Assert(tokenInfo != null); + // certId and certId2 are allowed to be null, they get checked in CertMatchesIds. + + if (!CertMatchesIds(tsaCertificate, certId, certId2)) + { + return false; + } + + // Nothing in RFC3161 actually mentions checking the certificate's validity + // against the TSTInfo timestamp value, but it seems sensible. + // + // Accuracy is ignored here, for better replicability in user code. + + if (tsaCertificate.NotAfter < tokenInfo.Timestamp || + tsaCertificate.NotBefore > tokenInfo.Timestamp) + { + return false; + } + + // https://tools.ietf.org/html/rfc3161#section-2.3 + // + // The TSA MUST sign each time-stamp message with a key reserved + // specifically for that purpose. A TSA MAY have distinct private keys, + // e.g., to accommodate different policies, different algorithms, + // different private key sizes or to increase the performance. The + // corresponding certificate MUST contain only one instance of the + // extended key usage field extension as defined in [RFC2459] Section + // 4.2.1.13 with KeyPurposeID having value: + // + // id-kp-timeStamping. This extension MUST be critical. + + using (var ekuExts = tsaCertificate.Extensions.OfType().GetEnumerator()) + { + if (!ekuExts.MoveNext()) + { + return false; + } + + X509EnhancedKeyUsageExtension ekuExt = ekuExts.Current; + + if (!ekuExt.Critical) + { + return false; + } + + bool hasPurpose = false; + + foreach (Oid oid in ekuExt.EnhancedKeyUsages) + { + if (oid.Value == Oids.TimeStampingPurpose) + { + hasPurpose = true; + break; + } + } + + if (!hasPurpose) + { + return false; + } + + if (ekuExts.MoveNext()) + { + return false; + } + } + + try + { + signer.CheckSignature(new X509Certificate2Collection(tsaCertificate), true); + return true; + } + catch (CryptographicException) + { + return false; + } + } + + public static bool TryDecode(ReadOnlyMemory source, out Rfc3161TimestampToken token, out int bytesConsumed) + { + bytesConsumed = 0; + token = null; + + try + { + ContentInfoAsn contentInfo = + AsnSerializer.Deserialize(source, AsnEncodingRules.BER, out int bytesActuallyRead); + + // https://tools.ietf.org/html/rfc3161#section-2.4.2 + // + // A TimeStampToken is as follows. It is defined as a ContentInfo + // ([CMS]) and SHALL encapsulate a signed data content type. + // + // TimeStampToken::= ContentInfo + // --contentType is id-signedData([CMS]) + // --content is SignedData ([CMS]) + if (contentInfo.ContentType != Oids.Pkcs7Signed) + { + return false; + } + + SignedCms cms = new SignedCms(); + cms.Decode(source); + + // The fields of type EncapsulatedContentInfo of the SignedData + // construct have the following meanings: + // + // eContentType is an object identifier that uniquely specifies the + // content type. For a time-stamp token it is defined as: + // + // id-ct-TSTInfo OBJECT IDENTIFIER ::= { iso(1) member-body(2) + // us(840) rsadsi(113549) pkcs(1) pkcs-9(9) smime(16) ct(1) 4} + // + // eContent is the content itself, carried as an octet string. + // The eContent SHALL be the DER-encoded value of TSTInfo. + if (cms.ContentInfo.ContentType.Value != Oids.TstInfo) + { + return false; + } + + // RFC3161: + // The time-stamp token MUST NOT contain any signatures other than the + // signature of the TSA. The certificate identifier (ESSCertID) of the + // TSA certificate MUST be included as a signerInfo attribute inside a + // SigningCertificate attribute. + + // RFC5816 says that ESSCertIDv2 should be allowed instead. + + SignerInfoCollection signerInfos = cms.SignerInfos; + + if (signerInfos.Count != 1) + { + return false; + } + + SignerInfo signer = signerInfos[0]; + EssCertId certId; + EssCertIdV2 certId2; + + if (!TryGetCertIds(signer, out certId, out certId2)) + { + return false; + } + + X509Certificate2 signerCert = signer.Certificate; + + if (signerCert == null && + signer.SignerIdentifier.Type == SubjectIdentifierType.IssuerAndSerialNumber) + { + // If the cert wasn't provided, but the identifier was IssuerAndSerialNumber, + // and the ESSCertId(V2) has specified an issuerSerial value, ensure it's a match. + X509IssuerSerial issuerSerial = (X509IssuerSerial)signer.SignerIdentifier.Value; + + if (certId?.IssuerSerial != null) + { + if (!IssuerAndSerialMatch( + certId.IssuerSerial.Value, + issuerSerial.IssuerName, + issuerSerial.SerialNumber)) + { + return false; + } + } + + if (certId2?.IssuerSerial != null) + { + if (!IssuerAndSerialMatch( + certId2.IssuerSerial.Value, + issuerSerial.IssuerName, + issuerSerial.SerialNumber)) + { + return false; + } + } + } + + Rfc3161TimestampTokenInfo tokenInfo; + + if (Rfc3161TimestampTokenInfo.TryDecode(cms.ContentInfo.Content, out tokenInfo, out _)) + { + if (signerCert != null && + !CheckCertificate(signerCert, signer, certId, certId2, tokenInfo)) + { + return false; + } + + token = new Rfc3161TimestampToken + { + _parsedDocument = cms, + _signerInfo = signer, + _essCertId = certId, + _essCertIdV2 = certId2, + TokenInfo = tokenInfo, + }; + + bytesConsumed = bytesActuallyRead; + return true; + } + } + catch (CryptographicException) + { + } + + return false; + } + + private static bool IssuerAndSerialMatch( + CadesIssuerSerial issuerSerial, + string issuerDirectoryName, + string serialNumber) + { + GeneralName[] issuerNames = issuerSerial.Issuer; + + if (issuerNames == null || issuerNames.Length != 1) + { + return false; + } + + GeneralName requiredName = issuerNames[0]; + + if (requiredName.DirectoryName == null) + { + return false; + } + + if (issuerDirectoryName != new X500DistinguishedName(requiredName.DirectoryName.Value.ToArray()).Name) + { + return false; + } + + return serialNumber == issuerSerial.SerialNumber.Span.ToBigEndianHex(); + } + + private static bool IssuerAndSerialMatch( + CadesIssuerSerial issuerSerial, + ReadOnlySpan issuerDirectoryName, + ReadOnlySpan serialNumber) + { + GeneralName[] issuerNames = issuerSerial.Issuer; + + if (issuerNames == null || issuerNames.Length != 1) + { + return false; + } + + GeneralName requiredName = issuerNames[0]; + + if (requiredName.DirectoryName == null) + { + return false; + } + + if (!requiredName.DirectoryName.Value.Span.SequenceEqual(issuerDirectoryName)) + { + return false; + } + + return serialNumber.SequenceEqual(issuerSerial.SerialNumber.Span); + } + + private static bool CertMatchesIds(X509Certificate2 signerCert, EssCertId certId, EssCertIdV2 certId2) + { + Debug.Assert(signerCert != null); + Debug.Assert(certId != null || certId2 != null); + byte[] serialNumber = null; + + if (certId != null) + { + Span thumbprint = stackalloc byte[20]; + + if (!signerCert.TryGetCertHash(HashAlgorithmName.SHA1, thumbprint, out int written) || + written != thumbprint.Length || + !thumbprint.SequenceEqual(certId.Hash.Span)) + { + return false; + } + + if (certId.IssuerSerial != null) + { + serialNumber = signerCert.GetSerialNumber(); + Array.Reverse(serialNumber); + + if (!IssuerAndSerialMatch( + certId.IssuerSerial.Value, + signerCert.IssuerName.RawData, + serialNumber)) + { + return false; + } + } + } + + if (certId2 != null) + { + HashAlgorithmName alg; + // SHA-2-512 is the biggest we know about. + Span thumbprint = stackalloc byte[512 / 8]; + + try + { + alg = Helpers.GetDigestAlgorithm(certId2.HashAlgorithm.Algorithm); + + if (signerCert.TryGetCertHash(alg, thumbprint, out int written)) + { + thumbprint = thumbprint.Slice(0, written); + } + else + { + Debug.Fail( + $"TryGetCertHash did not fit in {thumbprint.Length} for hash {certId2.HashAlgorithm.Algorithm.Value}"); + + thumbprint = signerCert.GetCertHash(alg); + } + } + catch (CryptographicException) + { + return false; + } + + if (!thumbprint.SequenceEqual(certId2.Hash.Span)) + { + return false; + } + + if (certId2.IssuerSerial != null) + { + if (serialNumber == null) + { + serialNumber = signerCert.GetSerialNumber(); + Array.Reverse(serialNumber); + } + + if (!IssuerAndSerialMatch( + certId2.IssuerSerial.Value, + signerCert.IssuerName.RawData, + serialNumber)) + { + return false; + } + } + } + + return true; + } + + private static bool TryGetCertIds(SignerInfo signer, out EssCertId certId, out EssCertIdV2 certId2) + { + // RFC 5035 says that SigningCertificateV2 (contains ESSCertIDv2) is a signed + // attribute, with OID 1.2.840.113549.1.9.16.2.47, and that it must not be multiply defined. + + // RFC 2634 says that SigningCertificate (contains ESSCertID) is a signed attribute, + // with OID 1.2.840.113549.1.9.16.2.12, and that it must not be multiply defined. + certId = null; + certId2 = null; + + foreach (CryptographicAttributeObject attrSet in signer.SignedAttributes) + { + string setOid = attrSet.Oid?.Value; + + if (setOid != null && + setOid != Oids.SigningCertificate && + setOid != Oids.SigningCertificateV2) + { + continue; + } + + foreach (AsnEncodedData attr in attrSet.Values) + { + string attrOid = attr.Oid?.Value; + + if (attrOid == Oids.SigningCertificate) + { + if (certId != null) + { + return false; + } + + try + { + SigningCertificateAsn signingCert = + AsnSerializer.Deserialize(attr.RawData, AsnEncodingRules.BER); + + if (signingCert.Certs.Length < 1) + { + return false; + } + + // The first one is the signing cert, the rest constrain the chain. + certId = signingCert.Certs[0]; + } + catch (CryptographicException) + { + return false; + } + } + + if (attrOid == Oids.SigningCertificateV2) + { + if (certId2 != null) + { + return false; + } + + try + { + SigningCertificateV2Asn signingCert = + AsnSerializer.Deserialize(attr.RawData, AsnEncodingRules.BER); + + if (signingCert.Certs.Length < 1) + { + return false; + } + + // The first one is the signing cert, the rest constrain the chain. + certId2 = signingCert.Certs[0]; + } + catch (CryptographicException) + { + return false; + } + } + } + } + + return certId2 != null || certId != null; + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Rfc3161TimestampTokenInfo.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Rfc3161TimestampTokenInfo.cs new file mode 100644 index 0000000000..fed6e5605c --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Rfc3161TimestampTokenInfo.cs @@ -0,0 +1,265 @@ +// 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.Linq; +using System.Security.Cryptography.Asn1; +using System.Security.Cryptography.Pkcs.Asn1; +using System.Security.Cryptography.X509Certificates; +using Internal.Cryptography; + +namespace System.Security.Cryptography.Pkcs +{ + public sealed class Rfc3161TimestampTokenInfo + { + private readonly byte[] _encodedBytes; + private readonly Rfc3161TstInfo _parsedData; + private ReadOnlyMemory? _tsaNameBytes; + + public Rfc3161TimestampTokenInfo( + Oid policyId, + Oid hashAlgorithmId, + ReadOnlyMemory messageHash, + ReadOnlyMemory serialNumber, + DateTimeOffset timestamp, + long? accuracyInMicroseconds = null, + bool isOrdering = false, + ReadOnlyMemory? nonce = null, + ReadOnlyMemory? tsaName = null, + X509ExtensionCollection extensions = null) + { + _encodedBytes = Encode( + policyId, + hashAlgorithmId, + messageHash, + serialNumber, + timestamp, + isOrdering, + accuracyInMicroseconds, + nonce, + tsaName, + extensions); + + if (!TryDecode(_encodedBytes, true, out _parsedData, out _, out _)) + { + Debug.Fail("Unable to decode the data we encoded"); + throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); + } + } + + private Rfc3161TimestampTokenInfo(byte[] copiedBytes, Rfc3161TstInfo tstInfo) + { + _encodedBytes = copiedBytes; + _parsedData = tstInfo; + } + + public int Version => _parsedData.Version; + public Oid PolicyId => _parsedData.Policy; + public Oid HashAlgorithmId => _parsedData.MessageImprint.HashAlgorithm.Algorithm; + public ReadOnlyMemory GetMessageHash() => _parsedData.MessageImprint.HashedMessage; + public ReadOnlyMemory GetSerialNumber() => _parsedData.SerialNumber; + public DateTimeOffset Timestamp => _parsedData.GenTime; + public long? AccuracyInMicroseconds => _parsedData.Accuracy?.TotalMicros; + public bool IsOrdering => _parsedData.Ordering; + public ReadOnlyMemory? GetNonce() => _parsedData.Nonce; + public bool HasExtensions => _parsedData.Extensions?.Length > 0; + + public ReadOnlyMemory? GetTimestampAuthorityName() + { + if (_tsaNameBytes == null) + { + GeneralName? tsaName = _parsedData.Tsa; + + if (tsaName == null) + { + return null; + } + + _tsaNameBytes = AsnSerializer.Serialize(tsaName.Value, AsnEncodingRules.DER).Encode(); + Debug.Assert(_tsaNameBytes.HasValue); + } + + return _tsaNameBytes.Value; + } + + public X509ExtensionCollection GetExtensions() + { + var coll = new X509ExtensionCollection(); + + if (!HasExtensions) + { + return coll; + } + + X509ExtensionAsn[] rawExtensions = _parsedData.Extensions; + + foreach (X509ExtensionAsn rawExtension in rawExtensions) + { + X509Extension extension = new X509Extension( + rawExtension.ExtnId, + rawExtension.ExtnValue.ToArray(), + rawExtension.Critical); + + // Currently there are no extensions defined. + // Should this dip into CryptoConfig or other extensible + // mechanisms for the CopyTo rich type uplift? + coll.Add(extension); + } + + return coll; + } + + public byte[] Encode() + { + return _encodedBytes.CloneByteArray(); + } + + public bool TryEncode(Span destination, out int bytesWritten) + { + if (destination.Length < _encodedBytes.Length) + { + bytesWritten = 0; + return false; + } + + _encodedBytes.AsSpan().CopyTo(destination); + bytesWritten = _encodedBytes.Length; + return true; + } + + public static bool TryDecode( + ReadOnlyMemory source, + out Rfc3161TimestampTokenInfo timestampTokenInfo, + out int bytesConsumed) + { + if (TryDecode(source, false, out Rfc3161TstInfo tstInfo, out bytesConsumed, out byte[] copiedBytes)) + { + timestampTokenInfo = new Rfc3161TimestampTokenInfo(copiedBytes, tstInfo); + return true; + } + + bytesConsumed = 0; + timestampTokenInfo = null; + return false; + } + + private static bool TryDecode( + ReadOnlyMemory source, + bool ownsMemory, + out Rfc3161TstInfo tstInfo, + out int bytesConsumed, + out byte[] copiedBytes) + { + // https://tools.ietf.org/html/rfc3161#section-2.4.2 + // The eContent SHALL be the DER-encoded value of TSTInfo. + AsnReader reader = new AsnReader(source, AsnEncodingRules.DER); + + try + { + ReadOnlyMemory firstElement = reader.PeekEncodedValue(); + + if (ownsMemory) + { + copiedBytes = null; + } + else + { + // Copy the data so no ReadOnlyMemory values are pointing back to user data. + copiedBytes = firstElement.ToArray(); + firstElement = copiedBytes; + } + + Rfc3161TstInfo parsedInfo = AsnSerializer.Deserialize( + firstElement, + AsnEncodingRules.DER); + + // The deserializer doesn't do bounds checks. + // Micros and Millis are defined as (1..999) + // Seconds doesn't define that it's bounded by 0, + // but negative accuracy doesn't make sense. + // + // (Reminder to readers: a null int? with an inequality operator + // has the value false, so if accuracy is missing, or millis or micro is missing, + // then the respective checks return false and don't throw). + if (parsedInfo.Accuracy?.Micros > 999 || + parsedInfo.Accuracy?.Micros < 1 || + parsedInfo.Accuracy?.Millis > 999 || + parsedInfo.Accuracy?.Millis < 1 || + parsedInfo.Accuracy?.Seconds < 0) + { + throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); + } + + tstInfo = parsedInfo; + bytesConsumed = firstElement.Length; + return true; + } + catch (CryptographicException) + { + tstInfo = null; + bytesConsumed = 0; + copiedBytes = null; + return false; + } + } + + private static byte[] Encode( + Oid policyId, + Oid hashAlgorithmId, + ReadOnlyMemory messageHash, + ReadOnlyMemory serialNumber, + DateTimeOffset timestamp, + bool isOrdering, + long? accuracyInMicroseconds, + ReadOnlyMemory? nonce, + ReadOnlyMemory? tsaName, + X509ExtensionCollection extensions) + { + if (policyId == null) + throw new ArgumentNullException(nameof(policyId)); + if (hashAlgorithmId == null) + throw new ArgumentNullException(nameof(hashAlgorithmId)); + + var tstInfo = new Rfc3161TstInfo + { + // The only legal value as of 2017. + Version = 1, + Policy = policyId, + MessageImprint = + { + HashAlgorithm = + { + Algorithm = hashAlgorithmId, + Parameters = AlgorithmIdentifierAsn.ExplicitDerNull, + }, + + HashedMessage = messageHash, + }, + SerialNumber = serialNumber, + GenTime = timestamp, + Ordering = isOrdering, + Nonce = nonce, + }; + + if (accuracyInMicroseconds != null) + { + tstInfo.Accuracy = new Rfc3161Accuracy(accuracyInMicroseconds.Value); + } + + if (tsaName != null) + { + tstInfo.Tsa = AsnSerializer.Deserialize(tsaName.Value, AsnEncodingRules.DER); + } + + if (extensions != null) + { + tstInfo.Extensions = extensions.OfType(). + Select(ex => new X509ExtensionAsn(ex, copyValue: false)).ToArray(); + } + + AsnWriter writer = AsnSerializer.Serialize(tstInfo, AsnEncodingRules.DER); + return writer.Encode(); + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/SignedCms.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/SignedCms.cs index 64bd9fe8f7..f209dd6511 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/SignedCms.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/SignedCms.cs @@ -2,6 +2,7 @@ // 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; using System.Collections.Generic; using System.Diagnostics; using System.Linq; @@ -24,6 +25,11 @@ namespace System.Security.Cryptography.Pkcs // bytes will be held separate once the content is "bound" (first signature or decode) private ReadOnlyMemory? _heldContent; + // During decode, if the PKCS#7 fallback for a missing OCTET STRING is present, this + // becomes true and GetHashableContentSpan behaves differently. + // See https://tools.ietf.org/html/rfc5652#section-5.2.1 + private bool _hasPkcs7Content; + // Similar to _heldContent, the Windows CMS API held this separate internally, // and thus we need to be reslilient against modification. private string _contentType; @@ -98,19 +104,7 @@ namespace System.Security.Cryptography.Pkcs throw new InvalidOperationException(SR.Cryptography_Cms_MessageNotSigned); } - // Write as DER, so everyone can read it. - AsnWriter writer = AsnSerializer.Serialize(_signedData, AsnEncodingRules.DER); - byte[] signedData = writer.Encode(); - - ContentInfoAsn contentInfo = new ContentInfoAsn - { - Content = signedData, - ContentType = Oids.Pkcs7Signed, - }; - - // Write as DER, so everyone can read it. - writer = AsnSerializer.Serialize(contentInfo, AsnEncodingRules.DER); - return writer.Encode(); + return Helpers.EncodeContentInfo(_signedData, Oids.Pkcs7Signed); } public void Decode(byte[] encodedMessage) @@ -118,13 +112,17 @@ namespace System.Security.Cryptography.Pkcs if (encodedMessage == null) throw new ArgumentNullException(nameof(encodedMessage)); - // Windows (and thus NetFx) reads the leading data and ignores extra. - // The deserializer will complain if too much data is given, so use the reader - // to ask how much we want to deserialize. - AsnReader reader = new AsnReader(encodedMessage, AsnEncodingRules.BER); - ReadOnlyMemory cmsSegment = reader.GetEncodedValue(); + Decode(new ReadOnlyMemory(encodedMessage)); + } - ContentInfoAsn contentInfo = AsnSerializer.Deserialize(cmsSegment, AsnEncodingRules.BER); + internal void Decode(ReadOnlyMemory encodedMessage) + { + // Windows (and thus NetFx) reads the leading data and ignores extra. + // So use the Deserialize overload which doesn't throw on extra data. + ContentInfoAsn contentInfo = AsnSerializer.Deserialize( + encodedMessage, + AsnEncodingRules.BER, + out int bytesRead); if (contentInfo.ContentType != Oids.Pkcs7Signed) { @@ -135,20 +133,33 @@ namespace System.Security.Cryptography.Pkcs _heldData = contentInfo.Content.ToArray(); _signedData = AsnSerializer.Deserialize(_heldData, AsnEncodingRules.BER); _contentType = _signedData.EncapContentInfo.ContentType; + _hasPkcs7Content = false; if (!Detached) { ReadOnlyMemory? content = _signedData.EncapContentInfo.Content; + ReadOnlyMemory contentValue; + + if (content.HasValue) + { + contentValue = GetContent(content.Value, _contentType); + // If no OCTET STRING was stripped off, we have PKCS7 interop concerns. + _hasPkcs7Content = content.Value.Length == contentValue.Length; + } + else + { + contentValue = ReadOnlyMemory.Empty; + } // This is in _heldData, so we don't need a defensive copy. - _heldContent = content ?? ReadOnlyMemory.Empty; + _heldContent = contentValue; // The ContentInfo object/property DOES need a defensive copy, because // a) it is mutable by the user, and // b) it is no longer authoritative // // (and c: it takes a byte[] and we have a ReadOnlyMemory) - ContentInfo = new ContentInfo(new Oid(_contentType), _heldContent.Value.ToArray()); + ContentInfo = new ContentInfo(new Oid(_contentType), contentValue.ToArray()); } else { @@ -160,6 +171,59 @@ namespace System.Security.Cryptography.Pkcs _hasData = true; } + internal static ReadOnlyMemory GetContent( + ReadOnlyMemory wrappedContent, + string contentType) + { + // Read the input. + // + // PKCS7's id-data is written in both PKCS#7 and CMS as an OCTET STRING wrapping + // the arbitrary bytes, so the OCTET STRING must always be present. + // + // For other types, CMS says to always write an OCTET STRING, and to put the properly + // encoded data within it. + // PKCS#7 originally ommitted the OCTET STRING wrapper for this model, so this is the + // dynamic adapter. + // + // See https://tools.ietf.org/html/rfc5652#section-5.2.1 + byte[] rented = null; + int bytesWritten = 0; + try + { + AsnReader reader = new AsnReader(wrappedContent, AsnEncodingRules.BER); + + if (reader.TryGetPrimitiveOctetStringBytes(out ReadOnlyMemory inner)) + { + return inner; + } + + rented = ArrayPool.Shared.Rent(wrappedContent.Length); + + if (!reader.TryCopyOctetStringBytes(rented, out bytesWritten)) + { + Debug.Fail($"TryCopyOctetStringBytes failed with an array larger than the encoded value"); + throw new CryptographicException(); + } + + return rented.AsSpan(0, bytesWritten).ToArray(); + } + catch (Exception) when (contentType != Oids.Pkcs7Data) + { + } + finally + { + if (rented != null) + { + rented.AsSpan(0, bytesWritten).Clear(); + ArrayPool.Shared.Return(rented); + } + } + + // PKCS#7 encoding for something other than id-data. + Debug.Assert(contentType != Oids.Pkcs7Data); + return wrappedContent; + } + public void ComputeSignature() { throw new PlatformNotSupportedException(SR.Cryptography_Cms_NoSignerCert); @@ -185,7 +249,7 @@ namespace System.Security.Cryptography.Pkcs // If we had content already, use that now. // (The second signer doesn't inherit edits to signedCms.ContentInfo.Content) ReadOnlyMemory content = _heldContent ?? ContentInfo.Content; - string contentType = _contentType ?? ContentInfo.ContentType.Value; + string contentType = _contentType ?? ContentInfo.ContentType.Value ?? Oids.Pkcs7Data; X509Certificate2Collection chainCerts; SignerInfoAsn newSigner = signer.Sign(content, contentType, silent, out chainCerts); @@ -206,7 +270,12 @@ namespace System.Security.Cryptography.Pkcs // the copy of _heldContent or _contentType here if we're attached. if (!Detached) { - _signedData.EncapContentInfo.Content = content; + using (AsnWriter writer = new AsnWriter(AsnEncodingRules.DER)) + { + writer.WriteOctetString(content.Span); + + _signedData.EncapContentInfo.Content = writer.Encode(); + } } _hasData = true; @@ -262,7 +331,21 @@ namespace System.Security.Cryptography.Pkcs RemoveSignature(idx); } - internal ReadOnlySpan GetContentSpan() => _heldContent.Value.Span; + internal ReadOnlySpan GetHashableContentSpan() + { + ReadOnlyMemory content = _heldContent.Value; + + if (!_hasPkcs7Content) + { + return content.Span; + } + + // In PKCS#7 compat, only return the contents within the outermost tag. + // See https://tools.ietf.org/html/rfc5652#section-5.2.1 + AsnReader reader = new AsnReader(content, AsnEncodingRules.BER); + // This span is safe to return because it's still bound under _heldContent. + return reader.PeekContentBytes().Span; + } internal void Reencode() { diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/SignerInfo.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/SignerInfo.cs index 31b22a8c2f..3211de7dbe 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/SignerInfo.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/SignerInfo.cs @@ -71,6 +71,8 @@ namespace System.Security.Cryptography.Pkcs } } + internal ReadOnlyMemory GetSignatureMemory() => _signature; + public byte[] GetSignature() => _signature.ToArray(); public X509Certificate2 Certificate @@ -310,7 +312,9 @@ namespace System.Security.Cryptography.Pkcs { writer.PushSetOf(); - AsnReader reader = new AsnReader(modifiedAttr.AttrValues, writer.RuleSet); + AsnReader outerReader = new AsnReader(modifiedAttr.AttrValues, writer.RuleSet); + AsnReader reader = outerReader.ReadSetOf(); + outerReader.ThrowIfNotEmpty(); int i = 0; @@ -469,12 +473,17 @@ namespace System.Security.Cryptography.Pkcs if (embeddedContent != null) { - hasher.AppendData(embeddedContent.Value.Span); - } + // Unwrap the OCTET STRING manually, because of PKCS#7 compatibility. + // https://tools.ietf.org/html/rfc5652#section-5.2.1 + ReadOnlyMemory hashableContent = SignedCms.GetContent( + embeddedContent.Value, + documentData.EncapContentInfo.ContentType); + hasher.AppendData(hashableContent.Span); + } } - hasher.AppendData(_document.GetContentSpan()); + hasher.AppendData(_document.GetHashableContentSpan()); } else { @@ -511,7 +520,7 @@ namespace System.Security.Cryptography.Pkcs var digestAttr = (Pkcs9MessageDigest)obj.Values[0]; - if (!contentDigest.AsSpan().SequenceEqual(digestAttr.MessageDigest.AsReadOnlySpan())) + if (!contentDigest.AsSpan().SequenceEqual(digestAttr.MessageDigest)) { throw new CryptographicException(SR.Cryptography_BadHashValue); } @@ -620,7 +629,7 @@ namespace System.Security.Cryptography.Pkcs return Helpers.GetDigestAlgorithm(DigestAlgorithm.Value); } - private static CryptographicAttributeObjectCollection MakeAttributeCollection(AttributeAsn[] attributes) + internal static CryptographicAttributeObjectCollection MakeAttributeCollection(AttributeAsn[] attributes) { var coll = new CryptographicAttributeObjectCollection(); diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/SignerInfoCollection.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/SignerInfoCollection.cs index b221876e8b..37102bde1f 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/SignerInfoCollection.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/SignerInfoCollection.cs @@ -37,7 +37,15 @@ namespace System.Security.Cryptography.Pkcs } } - public SignerInfo this[int index] => _signerInfos[index]; + public SignerInfo this[int index] + { + get + { + if (index < 0 || index >= _signerInfos.Length) + throw new ArgumentOutOfRangeException("index"); + return _signerInfos[index]; + } + } public int Count => _signerInfos.Length; diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/SubjectIdentifier.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/SubjectIdentifier.cs index 891b072762..506f2dc9b8 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/SubjectIdentifier.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/SubjectIdentifier.cs @@ -3,8 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; -using System.Linq; -using System.Security.Cryptography.Asn1; using System.Security.Cryptography.Pkcs.Asn1; using System.Security.Cryptography.X509Certificates; @@ -44,11 +42,19 @@ namespace System.Security.Cryptography.Pkcs } internal SubjectIdentifier(SignerIdentifierAsn signerIdentifierAsn) + : this(signerIdentifierAsn.IssuerAndSerialNumber, signerIdentifierAsn.SubjectKeyIdentifier) { - if (signerIdentifierAsn.IssuerAndSerialNumber.HasValue) + + } + + internal SubjectIdentifier( + IssuerAndSerialNumberAsn? issuerAndSerialNumber, + ReadOnlyMemory? subjectKeyIdentifier) + { + if (issuerAndSerialNumber.HasValue) { - ReadOnlySpan issuerNameSpan = signerIdentifierAsn.IssuerAndSerialNumber.Value.Issuer.Span; - ReadOnlySpan serial = signerIdentifierAsn.IssuerAndSerialNumber.Value.SerialNumber.Span; + ReadOnlySpan issuerNameSpan = issuerAndSerialNumber.Value.Issuer.Span; + ReadOnlySpan serial = issuerAndSerialNumber.Value.SerialNumber.Span; bool nonZero = false; @@ -64,7 +70,7 @@ namespace System.Security.Cryptography.Pkcs // If the serial number is zero and the subject is exactly "CN=Dummy Signer" // then this is the special "NoSignature" signer. if (!nonZero && - DummySignerEncodedValue.AsReadOnlySpan().SequenceEqual(issuerNameSpan)) + DummySignerEncodedValue.AsSpan().SequenceEqual(issuerNameSpan)) { Type = SubjectIdentifierType.NoSignature; Value = null; @@ -74,13 +80,13 @@ namespace System.Security.Cryptography.Pkcs Type = SubjectIdentifierType.IssuerAndSerialNumber; var name = new X500DistinguishedName(issuerNameSpan.ToArray()); - Value = new X509IssuerSerial(name.Name, serial.ToSkiString()); + Value = new X509IssuerSerial(name.Name, serial.ToBigEndianHex()); } } - else if (signerIdentifierAsn.SubjectKeyIdentifier != null) + else if (subjectKeyIdentifier != null) { Type = SubjectIdentifierType.SubjectKeyIdentifier; - Value = signerIdentifierAsn.SubjectKeyIdentifier.Value.Span.ToSkiString(); + Value = subjectKeyIdentifier.Value.Span.ToBigEndianHex(); } else { diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/AlgorithmIdentifierTest.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/AlgorithmIdentifierTest.cs new file mode 100644 index 0000000000..f7647d7207 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/AlgorithmIdentifierTest.cs @@ -0,0 +1,113 @@ +// 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 Test.Cryptography; +using Xunit; + +namespace System.Security.Cryptography.Pkcs.Tests +{ + public static class AlgorithmIdentifierTest + { + [Fact] + public static void ParameterlessConstructor() + { + AlgorithmIdentifier ai = new AlgorithmIdentifier(); + Assert.Equal(0, ai.KeyLength); + Assert.Equal(Oids.TripleDesCbc, ai.Oid.Value); + Assert.NotNull(ai.Parameters); + Assert.Equal(0, ai.Parameters.Length); + } + + [Fact] + public static void ConstructorTakesOid() + { + Oid o = new Oid(Oids.Rsa); + AlgorithmIdentifier ai = new AlgorithmIdentifier(o); + Assert.Equal(0, ai.KeyLength); + Assert.Equal(Oids.Rsa, ai.Oid.Value); + Assert.NotNull(ai.Parameters); + Assert.Equal(0, ai.Parameters.Length); + } + + [Fact] + public static void ConstructorTakesNullOid() + { + AlgorithmIdentifier ai = new AlgorithmIdentifier(null); + Assert.Null(ai.Oid); + Assert.Equal(0, ai.KeyLength); + Assert.NotNull(ai.Parameters); + Assert.Equal(0, ai.Parameters.Length); + } + + [Fact] + public static void ConstructorTakesOidAndKeyLength() + { + Oid o = new Oid(Oids.Rsa); + AlgorithmIdentifier ai = new AlgorithmIdentifier(o, 128); + Assert.Equal(128, ai.KeyLength); + Assert.Equal(Oids.Rsa, ai.Oid.Value); + Assert.NotNull(ai.Parameters); + Assert.Equal(0, ai.Parameters.Length); + } + + [Fact] + public static void ConstructorTakesNullOidAndKeyLength() + { + AlgorithmIdentifier ai = new AlgorithmIdentifier(null, 128); + Assert.Null(ai.Oid); + Assert.Equal(128, ai.KeyLength); + Assert.NotNull(ai.Parameters); + Assert.Equal(0, ai.Parameters.Length); + } + + [Fact] + public static void ConstructorTakesOidAndNegativeKeyLength() + { + Oid o = new Oid(Oids.Rsa); + AlgorithmIdentifier ai = new AlgorithmIdentifier(o, -1); + Assert.Equal(-1, ai.KeyLength); + Assert.Equal(Oids.Rsa, ai.Oid.Value); + Assert.NotNull(ai.Parameters); + Assert.Equal(0, ai.Parameters.Length); + } + + [Fact] + public static void KeyLength() + { + AlgorithmIdentifier ai = new AlgorithmIdentifier + { + KeyLength = int.MaxValue + }; + Assert.Equal(int.MaxValue, ai.KeyLength); + ai.KeyLength = 0; + Assert.Equal(0, ai.KeyLength); + ai.KeyLength = int.MinValue; + Assert.Equal(int.MinValue, ai.KeyLength); + } + + [Fact] + public static void Oid() + { + AlgorithmIdentifier ai = new AlgorithmIdentifier + { + Oid = new Oid(Oids.Rsa) + }; + Assert.Equal(Oids.Rsa, ai.Oid.Value); + ai.Oid = null; + Assert.Null(ai.Oid); + } + + [Fact] + public static void Parameters() + { + AlgorithmIdentifier ai = new AlgorithmIdentifier + { + Parameters = new byte[2] { 0x05, 0x00 } // ASN.1 NULL + }; + Assert.Equal("0500", ai.Parameters.ByteArrayToHex()); + ai.Parameters = null; + Assert.Null(ai.Parameters); + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/Certificates.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/Certificates.cs deleted file mode 100644 index 4644b764f4..0000000000 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/Certificates.cs +++ /dev/null @@ -1,630 +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 Test.Cryptography; - -namespace System.Security.Cryptography.Pkcs.Tests -{ - internal static class Certificates - { - public static readonly CertLoader RSAKeyTransfer1 = new CertLoaderFromRawData(RawData.s_RSAKeyTransfer1Cer, RawData.s_RSAKeyTransfer1Pfx, "1111"); - public static readonly CertLoader RSAKeyTransfer2 = new CertLoaderFromRawData(RawData.s_RSAKeyTransfer2Cer, RawData.s_RSAKeyTransfer2Pfx, "1111"); - public static readonly CertLoader RSAKeyTransfer3 = new CertLoaderFromRawData(RawData.s_RSAKeyTransfer3Cer, RawData.s_RSAKeyTransfer3Pfx, "1111"); - public static readonly CertLoader RSAKeyTransferCapi1 = new CertLoaderFromRawData(RawData.s_RSAKeyTransferCapi1Cer, RawData.s_RSAKeyTransferCapi1Pfx, "1111"); - public static readonly CertLoader RSASha256KeyTransfer1 = new CertLoaderFromRawData(RawData.s_RSASha256KeyTransfer1Cer, RawData.s_RSASha256KeyTransfer1Pfx, "1111"); - public static readonly CertLoader RSASha384KeyTransfer1 = new CertLoaderFromRawData(RawData.s_RSASha384KeyTransfer1Cer, RawData.s_RSASha384KeyTransfer1Pfx, "1111"); - public static readonly CertLoader RSASha512KeyTransfer1 = new CertLoaderFromRawData(RawData.s_RSASha512KeyTransfer1Cer, RawData.s_RSASha512KeyTransfer1Pfx, "1111"); - public static readonly CertLoader DHKeyAgree1 = new CertLoaderFromRawData(RawData.s_DHKeyAgree1Cer); - public static readonly CertLoader RSA2048SignatureOnly = new CertLoaderFromRawData(RawData.s_Rsa2048SignatureOnlyCer, RawData.s_Rsa2048SignatureOnlyPfx, "12345"); - public static readonly CertLoader Dsa1024 = new CertLoaderFromRawData(RawData.s_dsa1024Cert, RawData.s_dsa1024Pfx, "1234"); - public static readonly CertLoader ECDsaP256Win = new CertLoaderFromRawData(RawData.ECDsaP256_DigitalSignature_Cert, RawData.ECDsaP256_DigitalSignature_Pfx_Windows, "Test"); - - // Note: the raw data is its own (nested) class to avoid problems with static field initialization ordering. - private static class RawData - { - public static byte[] s_RSAKeyTransfer1Cer = - ("308201c830820131a003020102021031d935fb63e8cfab48a0bf7b397b67c0300d06092a864886f70d0101050500301a3118" - + "30160603550403130f5253414b65795472616e7366657231301e170d3136303431323136323534375a170d31373034313232" - + "32323534375a301a311830160603550403130f5253414b65795472616e736665723130819f300d06092a864886f70d010101" - + "050003818d00308189028181009eaab63f5629db5ac0bd74300b43ba61f49189ccc30c001fa96bd3b139f45732cd3c37e422" - + "ccbb2c598a4c6b3977a516a36ff850a5e914331f7445e86973f5a6cbb590105e933306e240eab6db72d08430cd7316e99481" - + "a272adef0f2479d0b7c58e89e072364d660fdad1b51a603ff4549a82e8dc914df82bcc6c6c232985450203010001a30f300d" - + "300b0603551d0f040403020520300d06092a864886f70d01010505000381810048c83e6f45d73a111c67e8f9f9c2d646292b" - + "75cec52ef0f9ae3e1639504aa1759512c46527fcf5476897d3fb6fc515ff1646f8f8bc09f84ea6e2ad04242d3fb9b190b816" - + "86b73d334e8b3afa7fb8eb31483efc0c7ccb0f8c1ca94d8be4f0daade4498501d02e6f92dd7b2f4401550896eb511ef14417" - + "cbb5a1b360d67998d334").HexToByteArray(); - - // password = "1111" - public static byte[] s_RSAKeyTransfer1Pfx = - ("308205d20201033082058e06092a864886f70d010701a082057f0482057b308205773082034806092a864886f70d010701a0" - + "82033904820335308203313082032d060b2a864886f70d010c0a0102a08202a6308202a2301c060a2a864886f70d010c0103" - + "300e040818fdedadbb31b101020207d0048202806aa390fa9a4cb071a0daf25765ed69efe039896036c0f0edfc03ebe35d2a" - + "f2f6a5bc9efd907f3b64ae15ac7f61d830e48810aa096ee37fe442b7bfbceeb92e22c25bd5484baf91460be29e06648485db" - + "7b10ea92d17983c4d22067396c12e4598541ab989d7beb38bf8a0213fd7c9d49ecd46d319bbb58b1423504cd4145e1b33978" - + "41306c5ace9eab42d408e05101911adc684e63a8c8c9579ce929e48ce2393af1a63c3180c52bd87475e3edb9763dff731ede" - + "38fc8043dee375001a59e7d6eec5d686d509efee38ef0e7bddcd7ba0477f6f38ff7172ceaeef94ff56ad4b9533241f404d58" - + "c2b5d54f1ab8250c56b1a70f57b7fffc640b7037408b8f830263befc031ffe7dbc6bef23f02c1e6e2b541be12009bfb11297" - + "02fc0559e54d264df9b0d046c73ad1b25056231e5d3c4015bdc4f0a9af70ac28b7241233ecc845ce14484779102a45da2560" - + "c354ec3e01f26d0e0b9a8b650f811d2ffeba95ec1e5cf6be2d060788c1b18ea4ec8f41e46da734c1216044a10a3e171620ed" - + "79f7e9dd36972c89d91111c68fd60a94d2aa2a3dbbde0383c7c367f77b70a218ddf9fb4ed7abf94c233ffb2797d9ca3802ed" - + "77868d3ab5651abb90e4de9ea74854b13603859b308689d770a62b5821e5a5650ecb23ca2894ad7901c7e1d2f22ef97e9092" - + "f0791e886487a59d380d98c0368d3f2f261e0139714b02010e61aa073ee782b1fe5b6f79d070ef1412a13270138330a2e308" - + "599e1e7829be9f983202ac0dc1c38d38587defe2741903af35227e4f979a68adef86a8459be4a2d74e5de7f94e114a8ea7e4" - + "0ea2af6b8a93a747377bdd8ddd83c086bb20ca49854efb931ee689b319f984e5377f5a0f20d0a613326d749af00675c6bc06" - + "0be528ef90ec6a9b2f9b3174301306092a864886f70d0109153106040401000000305d06092b060104018237110131501e4e" - + "004d006900630072006f0073006f0066007400200053006f0066007400770061007200650020004b00650079002000530074" - + "006f0072006100670065002000500072006f007600690064006500723082022706092a864886f70d010701a0820218048202" - + "14308202103082020c060b2a864886f70d010c0a0103a08201e4308201e0060a2a864886f70d01091601a08201d0048201cc" - + "308201c830820131a003020102021031d935fb63e8cfab48a0bf7b397b67c0300d06092a864886f70d0101050500301a3118" - + "30160603550403130f5253414b65795472616e7366657231301e170d3136303431323136323534375a170d31373034313232" - + "32323534375a301a311830160603550403130f5253414b65795472616e736665723130819f300d06092a864886f70d010101" - + "050003818d00308189028181009eaab63f5629db5ac0bd74300b43ba61f49189ccc30c001fa96bd3b139f45732cd3c37e422" - + "ccbb2c598a4c6b3977a516a36ff850a5e914331f7445e86973f5a6cbb590105e933306e240eab6db72d08430cd7316e99481" - + "a272adef0f2479d0b7c58e89e072364d660fdad1b51a603ff4549a82e8dc914df82bcc6c6c232985450203010001a30f300d" - + "300b0603551d0f040403020520300d06092a864886f70d01010505000381810048c83e6f45d73a111c67e8f9f9c2d646292b" - + "75cec52ef0f9ae3e1639504aa1759512c46527fcf5476897d3fb6fc515ff1646f8f8bc09f84ea6e2ad04242d3fb9b190b816" - + "86b73d334e8b3afa7fb8eb31483efc0c7ccb0f8c1ca94d8be4f0daade4498501d02e6f92dd7b2f4401550896eb511ef14417" - + "cbb5a1b360d67998d3343115301306092a864886f70d0109153106040401000000303b301f300706052b0e03021a0414c4c0" - + "4e0c0b0a20e50d58cb5ce565ba7c192d5d3f041479b53fc5f1f1f493a02cf113d563a247462e8726020207d0").HexToByteArray(); - - public static byte[] s_RSAKeyTransfer2Cer = - ("308201c830820131a00302010202102bce9f9ece39f98044f0cd2faa9a14e7300d06092a864886f70d0101050500301a3118" - + "30160603550403130f5253414b65795472616e7366657232301e170d3136303332353231323334325a170d31373033323630" - + "33323334325a301a311830160603550403130f5253414b65795472616e736665723230819f300d06092a864886f70d010101" - + "050003818d0030818902818100ea5a3834bfb863ae481b696ea7010ba4492557a160a102b3b4d11c120a7128f20b656ebbd2" - + "4b426f1a6d40be0a55ca1b53ebdca202d258eebb20d5c662819182e64539360461dd3b5dda4085f10250fc5249cf023976b8" - + "db2bc5f5e628fdb0f26e1b11e83202cbcfc9750efd6bb4511e6211372b60a97adb984779fdae21ce070203010001a30f300d" - + "300b0603551d0f040403020520300d06092a864886f70d0101050500038181004dc6f9fd6054ae0361d28d2d781be590fa8f" - + "5685fedfc947e315db12a4c47e220601e8c810e84a39b05b7a89f87425a06c0202ad48b3f2713109f5815e6b5d61732dac45" - + "41da152963e700a6f37faf7678f084a9fb4fe88f7b2cbc6cdeb0b9fdcc6a8a16843e7bc281a71dc6eb8bbc4092d299bf7599" - + "a3492c99c9a3acf41b29").HexToByteArray(); - - // password = "1111" - public static byte[] s_RSAKeyTransfer2Pfx = - ("308205d20201033082058e06092a864886f70d010701a082057f0482057b308205773082034806092a864886f70d010701a0" - + "82033904820335308203313082032d060b2a864886f70d010c0a0102a08202a6308202a2301c060a2a864886f70d010c0103" - + "300e04080338620310d29656020207d0048202804a94d3b1a1bf43efe3726aa9f0abc90c44585d2f0aee0864b4d574cd2cc1" - + "dca4a353b102779e072ed6072d3c083b83974e74069b353ba8ac8be113228e0225993f5ecb7293ab1a6941bef75f7bcb0e3b" - + "e6902832be46b976e94c6a0bc6865822ff07371551d206e300558da67cf972d89c3d181beb86d02f5523baa8351b88992654" - + "a4c507e136dd32120530585a25424fe40f9962b910e08fb55f582c3764946ba7f6d92520decfc9faa2d5e180f9824e5ed4c8" - + "c57e549a27950e7a875f2ed450035a69de6d95ec7bd9e30b65b8563fdd52809a4a1fc960f75c817c72f98afb000e8a8a33be" - + "f62e458c2db97b464121489bf3c54de45e05f9c3e06c21892735e3f2d9353a71febcd6a73a0af3c3fc0922ea71bdc483ed7e" - + "5653740c107cfd5e101e1609c20061f864671ccb45c8b5b5b7b48436797afe19de99b5027faf4cead0fd69d1987bbda5a0a4" - + "0141495998d368d3a4747fc370205eed9fc28e530d2975ca4084c297a544441cf46c39fb1f0f42c65b99a6c9c970746012ad" - + "c2be15fbbc803d5243f73fdec50bdee0b74297bd30ca3ea3a1dc623db6a199e93e02053bd1a6ca1a00a5c6090de1fa10cdd5" - + "b5541bd5f5f92ff60a139c50deff8768e7b242018611efd2cce0d9441f3c8b207906345a985617ba5e98e7883c9b925ba17d" - + "c4fadddbbe025cecd24bb9b95cae573a8a24ceb635eb9f663e74b0084a88f4e8e0d2baf767be3abe5b873695989a0edac7bd" - + "092de79c3b6427dcbedee0512918fc3f7a45cd6898701673c9ed9f2f873abb8aa64cec7b8d350e8c780c645e50ce607a1afd" - + "bcefba6cf5cebbc766d1e61d78fbef7680b38dd0f32133ceb39c6c9cabd0b33af9f7ef73c94854b57cf68e61997b61393a0b" - + "6fc37f8834157e0c9fba3174301306092a864886f70d0109153106040401000000305d06092b060104018237110131501e4e" - + "004d006900630072006f0073006f0066007400200053006f0066007400770061007200650020004b00650079002000530074" - + "006f0072006100670065002000500072006f007600690064006500723082022706092a864886f70d010701a0820218048202" - + "14308202103082020c060b2a864886f70d010c0a0103a08201e4308201e0060a2a864886f70d01091601a08201d0048201cc" - + "308201c830820131a00302010202102bce9f9ece39f98044f0cd2faa9a14e7300d06092a864886f70d0101050500301a3118" - + "30160603550403130f5253414b65795472616e7366657232301e170d3136303332353231323334325a170d31373033323630" - + "33323334325a301a311830160603550403130f5253414b65795472616e736665723230819f300d06092a864886f70d010101" - + "050003818d0030818902818100ea5a3834bfb863ae481b696ea7010ba4492557a160a102b3b4d11c120a7128f20b656ebbd2" - + "4b426f1a6d40be0a55ca1b53ebdca202d258eebb20d5c662819182e64539360461dd3b5dda4085f10250fc5249cf023976b8" - + "db2bc5f5e628fdb0f26e1b11e83202cbcfc9750efd6bb4511e6211372b60a97adb984779fdae21ce070203010001a30f300d" - + "300b0603551d0f040403020520300d06092a864886f70d0101050500038181004dc6f9fd6054ae0361d28d2d781be590fa8f" - + "5685fedfc947e315db12a4c47e220601e8c810e84a39b05b7a89f87425a06c0202ad48b3f2713109f5815e6b5d61732dac45" - + "41da152963e700a6f37faf7678f084a9fb4fe88f7b2cbc6cdeb0b9fdcc6a8a16843e7bc281a71dc6eb8bbc4092d299bf7599" - + "a3492c99c9a3acf41b293115301306092a864886f70d0109153106040401000000303b301f300706052b0e03021a04143cdb" - + "6a36dfd2288ba4e3771766d7a5289c04419704146c84193dc4f3778f21197d11ff994d8bf4822049020207d0").HexToByteArray(); - - public static byte[] s_RSAKeyTransfer3Cer = - ("308201c830820131a00302010202104497d870785a23aa4432ed0106ef72a6300d06092a864886f70d0101050500301a3118" - + "30160603550403130f5253414b65795472616e7366657233301e170d3136303332353231323335355a170d31373033323630" - + "33323335355a301a311830160603550403130f5253414b65795472616e736665723330819f300d06092a864886f70d010101" - + "050003818d0030818902818100bbc6fe8702a4e92eadb9b0f41577c0fffc731411c6f87c27c9ef7c2e2113d4269574f44f2e" - + "90382bd193eb2f57564cf00092172d91a003e7252a544958b30aab6402e6fba7e442e973d1902e383f6bc4a4d8a00e60b3f3" - + "3a032bdf6bedb56acb0d08669b71dd7b35f5d39d9914f5e111e1cd1559eb741a3075d673c39e7850a50203010001a30f300d" - + "300b0603551d0f040403020520300d06092a864886f70d01010505000381810058abccbf69346360351d55817a61a6091b0b" - + "022607caeb44edb6f05a91f169903608d7391b245ac0dcbe052e16a91ac1f8d9533f19f6793f15cb6681b2cbaa0d8e83d77b" - + "5207e7c70d843deda8754af8ef1029e0b68c35d88c30d7da2f85d1a20dd4099facf373341b50a8a213f735421062e1477459" - + "6e27a32e23b3f3fcfec3").HexToByteArray(); - - // password = "1111" - public static byte[] s_RSAKeyTransfer3Pfx = - ("308205d20201033082058e06092a864886f70d010701a082057f0482057b308205773082034806092a864886f70d010701a0" - + "82033904820335308203313082032d060b2a864886f70d010c0a0102a08202a6308202a2301c060a2a864886f70d010c0103" - + "300e0408a9197ad512c316b5020207d004820280b1c213fa87f3906cde3502249830a01d1d636d0058bd8d6172222544c35a" - + "9676f390a5ef1d52f13fae2f04fe2ca1bcb9914296f97fdf729a52e0c3472c9f7ae72bd746f0a66b0c9363fae0328ad063fa" - + "45d35cc2679c85e970c7420ad036012ce553ef47ed8fe594917739aab1123be435a0ca88ac4b85cf3d341d4aeb2c6816d8fc" - + "a2e9611224b42f0ca00bde4f25db460200f25fe99ed4fd0236e4d00c48085aec4734f0bce7e6c8fea08b11a2a7214f4a18c0" - + "fa4b732c8dae5c5857f2edec27fa94eb17ac05d1d05b321b01c1368231ff89c46c6378abf67cb751156370bbcc35591e0028" - + "d4ace5158048d9d25b00e028b7766f1c74ade9603a211aad241fc3b7599a2b15f86846dfdc106f49cf56491b3f6ff451d641" - + "400f38fabcdb74a4423828b041901fa5d8c528ebf1cc6169b08eb14b2d457acb6970a11ccaa8fbc3b37b6454803b07b1916e" - + "2ad3533f2b72721625c11f39a457033744fde3745c3d107a3f1e14118e04db41ca8970a383e8706bcf8ba5439a4cb360b250" - + "4fcae3dbfb54af0154f9b813ad552f2bdbc2a9eb61d38ae5e6917990cbeb1c5292845637c5fed477dabbed4198a2978640ba" - + "7db22c85322115fa9027ad418a61e2e31263da3776398faaaab818aae6423c873bd393f558fa2fc05115b4983d35ecfeae13" - + "601519a53c7a77b5688aeddc6f210a65303eeb0dbd7e3a5ec94d7552cf4cbe7acebf5e4e10abaccd2e990f1cf217b98ad9b5" - + "06820f7769a7c5e61d95462918681c2b111faf29f13e3615c4c5e75426dbcd903c483590434e8ab1965dc620e7d8bebea36f" - + "53f1bc0807933b0ef9d8cc1b36b96aff8288e9a8d1bba24af562dfeb497b9a58083b71d76dacd6f2ce67cb2593c6f06472ef" - + "e508012c34f40d87e0be3174301306092a864886f70d0109153106040401000000305d06092b060104018237110131501e4e" - + "004d006900630072006f0073006f0066007400200053006f0066007400770061007200650020004b00650079002000530074" - + "006f0072006100670065002000500072006f007600690064006500723082022706092a864886f70d010701a0820218048202" - + "14308202103082020c060b2a864886f70d010c0a0103a08201e4308201e0060a2a864886f70d01091601a08201d0048201cc" - + "308201c830820131a00302010202104497d870785a23aa4432ed0106ef72a6300d06092a864886f70d0101050500301a3118" - + "30160603550403130f5253414b65795472616e7366657233301e170d3136303332353231323335355a170d31373033323630" - + "33323335355a301a311830160603550403130f5253414b65795472616e736665723330819f300d06092a864886f70d010101" - + "050003818d0030818902818100bbc6fe8702a4e92eadb9b0f41577c0fffc731411c6f87c27c9ef7c2e2113d4269574f44f2e" - + "90382bd193eb2f57564cf00092172d91a003e7252a544958b30aab6402e6fba7e442e973d1902e383f6bc4a4d8a00e60b3f3" - + "3a032bdf6bedb56acb0d08669b71dd7b35f5d39d9914f5e111e1cd1559eb741a3075d673c39e7850a50203010001a30f300d" - + "300b0603551d0f040403020520300d06092a864886f70d01010505000381810058abccbf69346360351d55817a61a6091b0b" - + "022607caeb44edb6f05a91f169903608d7391b245ac0dcbe052e16a91ac1f8d9533f19f6793f15cb6681b2cbaa0d8e83d77b" - + "5207e7c70d843deda8754af8ef1029e0b68c35d88c30d7da2f85d1a20dd4099facf373341b50a8a213f735421062e1477459" - + "6e27a32e23b3f3fcfec33115301306092a864886f70d0109153106040401000000303b301f300706052b0e03021a0414cd11" - + "0833d653f2e18d2afb2de74689ff0446ec7d0414f2ca1c390db19317697044b9012ef6864e0f05cc020207d0").HexToByteArray(); - - public static byte[] s_RSAKeyTransferCapi1Cer = - ("3082020c30820179a00302010202105d2ffff863babc9b4d3c80ab178a4cca300906052b0e03021d0500301e311c301a0603" - + "55040313135253414b65795472616e736665724361706931301e170d3135303431353037303030305a170d32353034313530" - + "37303030305a301e311c301a060355040313135253414b65795472616e73666572436170693130819f300d06092a864886f7" - + "0d010101050003818d0030818902818100aa272700586c0cc41b05c65c7d846f5a2bc27b03e301c37d9bff6d75b6eb6671ba" - + "9596c5c63ba2b1af5c318d9ca39e7400d10c238ac72630579211b86570d1a1d44ec86aa8f6c9d2b4e283ea3535923f398a31" - + "2a23eaeacd8d34faaca965cd910b37da4093ef76c13b337c1afab7d1d07e317b41a336baa4111299f99424408d0203010001" - + "a3533051304f0603551d0104483046801015432db116b35d07e4ba89edb2469d7aa120301e311c301a060355040313135253" - + "414b65795472616e73666572436170693182105d2ffff863babc9b4d3c80ab178a4cca300906052b0e03021d050003818100" - + "81e5535d8eceef265acbc82f6c5f8bc9d84319265f3ccf23369fa533c8dc1938952c5931662d9ecd8b1e7b81749e48468167" - + "e2fce3d019fa70d54646975b6dc2a3ba72d5a5274c1866da6d7a5df47938e034a075d11957d653b5c78e5291e4401045576f" - + "6d4eda81bef3c369af56121e49a083c8d1adb09f291822e99a429646").HexToByteArray(); - - // Password = "1111" - // - // Built by: - // - // makecert -r -len 1024 -n "CN=RSAKeyTransferCapi1" -b 04/15/2015 -e 04/15/2025 RSAKeyTransferCapi1.cer -sv RSAKeyTransferCapi1.pvk -sky exchange - // pvk2pfx.exe -pvk RSAKeyTransferCapi1.pvk -spc RSAKeyTransferCapi1.cer -pfx RSAKeyTransferCapi1.pfx -po 1111 - // - public static byte[] s_RSAKeyTransferCapi1Pfx = - ("30820626020103308205e206092a864886f70d010701a08205d3048205cf308205cb3082035806092a864886f70d010701a0" - + "82034904820345308203413082033d060b2a864886f70d010c0a0102a08202b6308202b2301c060a2a864886f70d010c0103" - + "300e0408dbd82a9abd7c1a2b020207d004820290768873985e74c2ece506531d348d8b43f2ae8524a2bcc737eeb778fac1ee" - + "b21f82deb7cf1ba54bc9a865be8294de23e6648ffb881ae2f0132265c6dacd60ae55df1497abc3eb9181f47cb126261ea66f" - + "d22107bbcdb8825251c60c5179ef873cb7e047782a4a255e3e9d2e0dd33f04cde92f9d268e8e4daf8ba74e54d8b279a0e811" - + "9a3d0152608c51331bbdd23ff65da492f85809e1d7f37af9ae00dca796030a19e517e7fe2572d4502d4738fd5394ee369216" - + "fb64cf84beab33860855e23204156dcf774fac18588f1c1ca1a576f276e9bfbf249449842f193020940a35f163378a2ce7da" - + "37352d5b0c7c3ac5eb5f21ed1921a0076523b2e66a101655bb78d4ecc22472ac0151b7e8051633747d50377258ab19dcb22e" - + "e09820876607d3291b55bba73d713d6689486b310507316b4f227383e4869628ad31f0b431145d45f4f38f325772c866a20e" - + "0b442088cbf663e92e8ee82dd495fba8d40345474a384bb3b80b49ca1d66eef5321235135dcc0a5425e4bf3b8ce5c2469e2a" - + "c0f8d53aab276361d9a2ff5c974c6e6b66126158676331fe7f74643fd1e215b22d7799846651350ed0f1f21a67ac6b3bfd62" - + "7defb235ef8732d772d1c4bea2ae80c165f0182f547ea7a3f3366288f74c030689988a9838c27b10a48737a620d8220f68b4" - + "ea8d8eb26298d5359d54a59c6be6716cefc12c929e17bb71c57c560659a7757ba8ac08ae90794474e50f0e87a22e2b7c3ebd" - + "061390928bf48c6c6200c225f7025eab20f5f6fee5dc41682b2d4a607c8c81964b7d52651e5a62a41f4e8ea3982c294a4aee" - + "8a67dc36a8b34b29509a4868c259dc205d1e8a3b6259a76a147f002f3bfbc8378e8edd230a34f9cd5f13ce6651b10394709d" - + "5092bb6a70d8c2816f1c0e44cd45dfa7c2d94aa32112d79cb44a3174301306092a864886f70d010915310604040100000030" - + "5d06092b060104018237110131501e4e004d006900630072006f0073006f006600740020005300740072006f006e00670020" - + "00430072007900700074006f0067007200610070006800690063002000500072006f007600690064006500723082026b0609" - + "2a864886f70d010701a082025c048202583082025430820250060b2a864886f70d010c0a0103a082022830820224060a2a86" - + "4886f70d01091601a0820214048202103082020c30820179a00302010202105d2ffff863babc9b4d3c80ab178a4cca300906" - + "052b0e03021d0500301e311c301a060355040313135253414b65795472616e736665724361706931301e170d313530343135" - + "3037303030305a170d3235303431353037303030305a301e311c301a060355040313135253414b65795472616e7366657243" - + "6170693130819f300d06092a864886f70d010101050003818d0030818902818100aa272700586c0cc41b05c65c7d846f5a2b" - + "c27b03e301c37d9bff6d75b6eb6671ba9596c5c63ba2b1af5c318d9ca39e7400d10c238ac72630579211b86570d1a1d44ec8" - + "6aa8f6c9d2b4e283ea3535923f398a312a23eaeacd8d34faaca965cd910b37da4093ef76c13b337c1afab7d1d07e317b41a3" - + "36baa4111299f99424408d0203010001a3533051304f0603551d0104483046801015432db116b35d07e4ba89edb2469d7aa1" - + "20301e311c301a060355040313135253414b65795472616e73666572436170693182105d2ffff863babc9b4d3c80ab178a4c" - + "ca300906052b0e03021d05000381810081e5535d8eceef265acbc82f6c5f8bc9d84319265f3ccf23369fa533c8dc1938952c" - + "5931662d9ecd8b1e7b81749e48468167e2fce3d019fa70d54646975b6dc2a3ba72d5a5274c1866da6d7a5df47938e034a075" - + "d11957d653b5c78e5291e4401045576f6d4eda81bef3c369af56121e49a083c8d1adb09f291822e99a429646311530130609" - + "2a864886f70d0109153106040401000000303b301f300706052b0e03021a041463c18f4fec17cf06262e8acd744e18b8ab7b" - + "8f280414134ec4a25653b142c3d3f9999830f2ac66ef513b020207d0").HexToByteArray(); - - public static byte[] s_RSASha256KeyTransfer1Cer = - ("308201d43082013da003020102021072c6c7734916468c4d608253da017676300d06092a864886f70d01010b05003020311e" - + "301c060355040313155253415368613235364b65795472616e7366657231301e170d3136303431383130353934365a170d31" - + "37303431383136353934365a3020311e301c060355040313155253415368613235364b65795472616e736665723130819f30" - + "0d06092a864886f70d010101050003818d0030818902818100cad046de3a7f6dc78fc5a4e01d1f7d90db596f586334d5708a" - + "ecb8e52d6bb912c0b5ec9633a82b4abac4c2860c766f2fdf1c905c4a72a54adfd041adabe5f2afd1e2ad88615970e818dc3d" - + "4d00bb6c4ce94c5eb4e3efedd80d14c3d295ea471ae430cbb20b071582f1396369fbe90c14aa5f85b8e3b14011d81fbd41ec" - + "b1495d0203010001a30f300d300b0603551d0f040403020520300d06092a864886f70d01010b050003818100baed2a5ae2d1" - + "1ee4209c0694c790e72e3e8ad310b2506b277d7c001b09f660d48dba846ac5bbef97653613adf53d7624fc9b2b337f25cb33" - + "74227900cfefbe2fdac92b4f769cf2bf3befb485f282a85bfb09454b797ce5286de560c219fb0dd6fce0442adbfef4f767e9" - + "ac81cf3e9701baf81efc73a0ed88576adff12413b827").HexToByteArray(); - - // password = "1111" - public static byte[] s_RSASha256KeyTransfer1Pfx = - ("308205de0201033082059a06092a864886f70d010701a082058b04820587308205833082034806092a864886f70d010701a0" - + "82033904820335308203313082032d060b2a864886f70d010c0a0102a08202a6308202a2301c060a2a864886f70d010c0103" - + "300e040829e4911057aa5fb6020207d00482028052e016e1e339ca6a648ab1e152813899bd2ec0de1e34804c33e109cf2136" - + "d42edc0d5ff8a005939ec38d4284aa0cfda295e801b701855c3c129e9311dc80b3538ba76d3164d48d83a73949d695f42294" - + "75469f262c807767bc5c12bb83b2c4857fa9f8c7c519143136ba93ab93e17ad4b0b63cf6449708e6128425b00eaeae6bc5b6" - + "7ff092673c9aabbbb63e90424295f0ae828bcd00f5ad85fe8384711ca5fffd4cbfe57ddbc3e5bb1df19e6fd7640fbd8d4516" - + "f8d2d5ec84baca72ac42b50e77be0055dfdbbbe9c6de42c06fc86de8fbfc6231db89b30065d534e76aa851833b6c9c651288" - + "c12f87ba12ae429e9bec0b22297c666046355ebd5a54dc7f13a55e0ebd53c768f69eee57d6041263f5bdf1c4c5b2b55dfb9b" - + "38171aaed0d21fd5a41e0ef760db42f373c9007e1df47fd79ba9b41528c9c02dffdd04472265763ae94f4e05b86976a2c459" - + "093d8e6bb0d0c5da5994fe3edbdf843b67e8e4c4daf59351788bf8b96da116aecbb95d52bf727ff10ca41340112f0bcb41e0" - + "b8373a6e55727c745b77cf1944b74fa447ed0a6d93b8e43fd6e4b4b3e0d49d03ee2ee12d15519406c49a4c1be70de5171c93" - + "d056e9f47b8a96d50f01873be4c596590f1247a2f2822dea9339fa87dd49545b559e0225ab738ecc0b054155749670d412be" - + "472d13dfb0a8c8f56b3c0be1aa0d9195ba937b0c2119c702a0be1f83e1b4a77375ed1654e3dcf6b8ce119db3ac7cd440369a" - + "b0b964e0b526b865680015cc3046a20badeaca4543ce65042ff5eb691e93232754a7b34fd8b6833c2625fdfdc59d80b3dcb4" - + "ce70d1833ecf6344bb7331e46b71bb1592b6d814370548ee2b2f4df207696be87d2e1e0c5dc0ca528e5a231802cbb7853968" - + "beb6ceb1b3a2998ecd313174301306092a864886f70d0109153106040401000000305d06092b060104018237110131501e4e" - + "004d006900630072006f0073006f0066007400200053006f0066007400770061007200650020004b00650079002000530074" - + "006f0072006100670065002000500072006f007600690064006500723082023306092a864886f70d010701a0820224048202" - + "203082021c30820218060b2a864886f70d010c0a0103a08201f0308201ec060a2a864886f70d01091601a08201dc048201d8" - + "308201d43082013da003020102021072c6c7734916468c4d608253da017676300d06092a864886f70d01010b05003020311e" - + "301c060355040313155253415368613235364b65795472616e7366657231301e170d3136303431383130353934365a170d31" - + "37303431383136353934365a3020311e301c060355040313155253415368613235364b65795472616e736665723130819f30" - + "0d06092a864886f70d010101050003818d0030818902818100cad046de3a7f6dc78fc5a4e01d1f7d90db596f586334d5708a" - + "ecb8e52d6bb912c0b5ec9633a82b4abac4c2860c766f2fdf1c905c4a72a54adfd041adabe5f2afd1e2ad88615970e818dc3d" - + "4d00bb6c4ce94c5eb4e3efedd80d14c3d295ea471ae430cbb20b071582f1396369fbe90c14aa5f85b8e3b14011d81fbd41ec" - + "b1495d0203010001a30f300d300b0603551d0f040403020520300d06092a864886f70d01010b050003818100baed2a5ae2d1" - + "1ee4209c0694c790e72e3e8ad310b2506b277d7c001b09f660d48dba846ac5bbef97653613adf53d7624fc9b2b337f25cb33" - + "74227900cfefbe2fdac92b4f769cf2bf3befb485f282a85bfb09454b797ce5286de560c219fb0dd6fce0442adbfef4f767e9" - + "ac81cf3e9701baf81efc73a0ed88576adff12413b8273115301306092a864886f70d0109153106040401000000303b301f30" - + "0706052b0e03021a0414282ee1780ac2a08b2783b1f8f7c855fb1a53ce9e04143fad59471323dc979f3bf29b927e54eca677" - + "7576020207d0").HexToByteArray(); - - public static byte[] s_RSASha384KeyTransfer1Cer = - ("308201d43082013da00302010202103c724fb7a0159a9345caac9e3df5f136300d06092a864886f70d01010c05003020311e" - + "301c060355040313155253415368613338344b65795472616e7366657231301e170d3136303431383131303530365a170d31" - + "37303431383137303530365a3020311e301c060355040313155253415368613338344b65795472616e736665723130819f30" - + "0d06092a864886f70d010101050003818d0030818902818100e6b46b0e6f4f6df724081e11f201b9fbb07f2b6db2b868f607" - + "68e2b5b843f690ca5e8d48f439d8b181ace2fb27dfa07eff0324642d6c9129e2d95e136702f6c31fe3ccf3aa87ba9f1b6f7b" - + "acd07156ff3dd2a7f4c70356fb94b0adbde6819383c19bbefb4a6d1d6491a770d5f9feb11bcb3e5ac99cb153984dee0910e4" - + "b57f8f0203010001a30f300d300b0603551d0f040403020520300d06092a864886f70d01010c0500038181003842cc95a680" - + "c8a31534a461d061a4706a0aba52b7a1c709c2f1e3b94acf6dc0930b74e63e3babf3c5b11c8f8a888722d9f23c7e0a8c9b09" - + "90ebcdbce563b8d4209efc1b04750f46c8c6117ccb96b26b5f02b0b5f961ab01b0c3b4cdb2530cbc5dcf37786712a3476ce7" - + "32c5c544c328db5ebc3a338b18fe32aedaffedd973ef").HexToByteArray(); - - // password = "1111" - public static byte[] s_RSASha384KeyTransfer1Pfx = - ("308205de0201033082059a06092a864886f70d010701a082058b04820587308205833082034806092a864886f70d010701a0" - + "82033904820335308203313082032d060b2a864886f70d010c0a0102a08202a6308202a2301c060a2a864886f70d010c0103" - + "300e040856d7d59810ce8b17020207d00482028082012797edb5f74429bb6b91dd1e24aa32a19b89d92fd486e826773a7a11" - + "03a9b49d98c6b7e97d411d19b44cd79559964f31cb6f0443c70d687c390d31c656ee3887391ae1735c142d891ec8337c5dc4" - + "d6b5a4f09400a4cc35dd8dbde831f7625b7afedf4990294988b0b32b2889c97cd85c2568ffef332be83232449dd4083a43d4" - + "89e654520eb922239379b5e9f5dfc1e64972339dee27dfdd874e2ee2b85f941f3b313ab881571c3a5a9b292d8c82d79d74a0" - + "2d78dd5cfce366b3a914b61b861b35948757d137e5d53589a0fa2f1b4d06ee6b4aa4b8d3f526b059637b236ceb2de128d7bd" - + "f91c12612d09e1cb4bed1b5e336fb56424b68dcc6d6cd5d90f666047c8b181526a60622027d322db0172046c23e84a3c725e" - + "45ce774df037cafb74b359c3ec6874dce98673d9f7581f54dcb6e3c40583de2de6aaf6739bba878362e9bfab331cab2eb22d" - + "3b130dec4eedf55a7ed8d5960e9f037209f9c1ef584c6dd5de17245d0da62c54420dc862b6648418d2aa9797f86a2cd0ecf6" - + "abcbeb16907d8f44021690682a4e1286cd3f9aea4866108b3c968cf4b80a39c60436079617346861662e01a5419d8cebe2c6" - + "e186141e42baf7cfc596270dbab8db03da9bd501daa426e24aa2d8ccf4d4512a8dce3ae8954be69b5c3a70fac587ac91ad97" - + "fb427c8118659b710b57183c4fd16ffd276834e2fe45d74e175f3f5077783cdd7668b4e87217512ceb7f3e64715ba22bbab7" - + "0d1b3485820c16304758cf1dd0b806d801f1185bb14d12f2c147ec65b95088077dec23498ebe40a952727c559c7af5cf20f1" - + "f491f4123db093dc1a67014c3db46c11c7d5833b15167c91138eba6b4badf869aefba5fbea523a5ad02bb676db6039e7aabd" - + "44f0702d59cf3d1ad9bb3174301306092a864886f70d0109153106040401000000305d06092b060104018237110131501e4e" - + "004d006900630072006f0073006f0066007400200053006f0066007400770061007200650020004b00650079002000530074" - + "006f0072006100670065002000500072006f007600690064006500723082023306092a864886f70d010701a0820224048202" - + "203082021c30820218060b2a864886f70d010c0a0103a08201f0308201ec060a2a864886f70d01091601a08201dc048201d8" - + "308201d43082013da00302010202103c724fb7a0159a9345caac9e3df5f136300d06092a864886f70d01010c05003020311e" - + "301c060355040313155253415368613338344b65795472616e7366657231301e170d3136303431383131303530365a170d31" - + "37303431383137303530365a3020311e301c060355040313155253415368613338344b65795472616e736665723130819f30" - + "0d06092a864886f70d010101050003818d0030818902818100e6b46b0e6f4f6df724081e11f201b9fbb07f2b6db2b868f607" - + "68e2b5b843f690ca5e8d48f439d8b181ace2fb27dfa07eff0324642d6c9129e2d95e136702f6c31fe3ccf3aa87ba9f1b6f7b" - + "acd07156ff3dd2a7f4c70356fb94b0adbde6819383c19bbefb4a6d1d6491a770d5f9feb11bcb3e5ac99cb153984dee0910e4" - + "b57f8f0203010001a30f300d300b0603551d0f040403020520300d06092a864886f70d01010c0500038181003842cc95a680" - + "c8a31534a461d061a4706a0aba52b7a1c709c2f1e3b94acf6dc0930b74e63e3babf3c5b11c8f8a888722d9f23c7e0a8c9b09" - + "90ebcdbce563b8d4209efc1b04750f46c8c6117ccb96b26b5f02b0b5f961ab01b0c3b4cdb2530cbc5dcf37786712a3476ce7" - + "32c5c544c328db5ebc3a338b18fe32aedaffedd973ef3115301306092a864886f70d0109153106040401000000303b301f30" - + "0706052b0e03021a041429bd86de50f91b8f804b2097b1d9167ca56577f40414b8714b8172fa1baa384bed57e3ddb6d1851a" - + "f5e9020207d0").HexToByteArray(); - - public static byte[] s_RSASha512KeyTransfer1Cer = - ("308201d43082013da00302010202102f5d9d58a5f41b844650aa233e68f105300d06092a864886f70d01010d05003020311e" - + "301c060355040313155253415368613531324b65795472616e7366657231301e170d3136303431383131303532355a170d31" - + "37303431383137303532355a3020311e301c060355040313155253415368613531324b65795472616e736665723130819f30" - + "0d06092a864886f70d010101050003818d0030818902818100b2eca20240da8486b1a933ade62ad8781ef30d4434ebbc9b3f" - + "c9c550d0f9a75f4345b5520f3d0bafa63b8037785d1e8cbd3efe9a22513dc8b82bcd1d44bf26bd2c292205ca3e793ff1cb09" - + "e0df4afefb542362bc148ea2b76053d06754b4a37a535afe63b048282f8fb6bd8cf5dc5b47b7502760587f84d9995acbf1f3" - + "4a3ca10203010001a30f300d300b0603551d0f040403020520300d06092a864886f70d01010d050003818100493d857684d2" - + "7468dd09926d20933254c7c79645f7b466e7b4a90a583cedba1c3b3dbf4ccf1c2506eb392dcf15f53f964f3c3b519132a38e" - + "b966d3ea397fe25457b8a703fb43ddab1c52272d6a12476df1df1826c90fb679cebc4c04efc764fd8ce3277305c3bcdf1637" - + "91784d778663194097180584e5e8ab69039908bf6f86").HexToByteArray(); - - // password = "1111" - public static byte[] s_RSASha512KeyTransfer1Pfx = - ("308205de0201033082059a06092a864886f70d010701a082058b04820587308205833082034806092a864886f70d010701a0" - + "82033904820335308203313082032d060b2a864886f70d010c0a0102a08202a6308202a2301c060a2a864886f70d010c0103" - + "300e04083a0e344b65dd4e27020207d00482028014464df9f07d2cb37a28607570130de5877e829e759040976866afc831db" - + "4d2741734ae53ea5eb80c1080dae7b0a2acddabd3d47b1ed5f3051455429308f3b7b0b48c5a4dbc5d718534472c746ce62f1" - + "bbb8c5d178c1d3e91efdbd4f56569517bcadf3c81dbe4c34746194e47bcf46b74cd1880d7bd12d9b819b462fbcf6f51f3972" - + "2858c9b9af8975bfefd7f007928b39e11d50b612761d03e566b992f92e9c9873d138c937fc43fe971db4c8e57b51aeef4ed0" - + "022ec76c3bb4bd9f2395b99585449303a6d68183edf6e5dda1885531bee10b7cf6509390f4ee6a37ed2931d658548bd6390f" - + "a7094fdf017166309074c00581d2b7dcaaee657f9c48e08edf636004dc5e60486dd022c45058700fe682472b371380948792" - + "74c2a20dd9e07e149e7ab52157db748160ad81f91019297baa58ce68656b0b2f7c9ac88b3da6920c2a5eab7bcc2629974f8a" - + "6c8bf33629af05e4e34d5d24393448e9751b7708f5915b0fd97a5af4dd5a37d71b18b6526316cbc65b1c6af8a6779acbc470" - + "2381f027bdb118cb84e9005b02a8bd2d02365d280cffb04831f877de7bd3d3287f11beed8978a5389e2b28317eb90569781f" - + "94f66f672736a09b4a7caeaaefd1909f2d20255df51512dbd08ec6125455d932b626bdfd3c4f669148fa783671f90b59ceff" - + "560c338f92cbe8bf7fbab4db3e9b943effac747eb34f06bd72aee961ed31742caa2a9934a5fe4685677ecbca6fb1b1c0b642" - + "b4f71d55d0e2cb1dc10ce845514090cc117a875c4d10c0ce367e31091144eacd7e600792d61d036bde020e3bb9a004a7dd1a" - + "cf03541b6fff3bcef4c30df05d98b75688320685261b2b34813407b20a7c92a04eeb46cb7e618a6ee32154728ba6735668f4" - + "11abece4ba07426a394b3174301306092a864886f70d0109153106040401000000305d06092b060104018237110131501e4e" - + "004d006900630072006f0073006f0066007400200053006f0066007400770061007200650020004b00650079002000530074" - + "006f0072006100670065002000500072006f007600690064006500723082023306092a864886f70d010701a0820224048202" - + "203082021c30820218060b2a864886f70d010c0a0103a08201f0308201ec060a2a864886f70d01091601a08201dc048201d8" - + "308201d43082013da00302010202102f5d9d58a5f41b844650aa233e68f105300d06092a864886f70d01010d05003020311e" - + "301c060355040313155253415368613531324b65795472616e7366657231301e170d3136303431383131303532355a170d31" - + "37303431383137303532355a3020311e301c060355040313155253415368613531324b65795472616e736665723130819f30" - + "0d06092a864886f70d010101050003818d0030818902818100b2eca20240da8486b1a933ade62ad8781ef30d4434ebbc9b3f" - + "c9c550d0f9a75f4345b5520f3d0bafa63b8037785d1e8cbd3efe9a22513dc8b82bcd1d44bf26bd2c292205ca3e793ff1cb09" - + "e0df4afefb542362bc148ea2b76053d06754b4a37a535afe63b048282f8fb6bd8cf5dc5b47b7502760587f84d9995acbf1f3" - + "4a3ca10203010001a30f300d300b0603551d0f040403020520300d06092a864886f70d01010d050003818100493d857684d2" - + "7468dd09926d20933254c7c79645f7b466e7b4a90a583cedba1c3b3dbf4ccf1c2506eb392dcf15f53f964f3c3b519132a38e" - + "b966d3ea397fe25457b8a703fb43ddab1c52272d6a12476df1df1826c90fb679cebc4c04efc764fd8ce3277305c3bcdf1637" - + "91784d778663194097180584e5e8ab69039908bf6f863115301306092a864886f70d0109153106040401000000303b301f30" - + "0706052b0e03021a041401844058f6e177051a87eedcc55cc4fa8d567ff10414669cb82c9cc3ceb4d3ca9f65bd57ba829616" - + "60d9020207d0").HexToByteArray(); - - public static byte[] s_DHKeyAgree1Cer = - ("3082041930820305a00302010202100ae59b0cb8119f8942eda74163413a02300906052b0e03021d0500304f314d304b0603" - + "5504031e44004d0061006e006100670065006400200050004b00430053002300370020005400650073007400200052006f00" - + "6f007400200041007500740068006f0072006900740079301e170d3136303431333132313630315a170d3339313233313233" - + "353935395a301f311d301b06035504031314446648656c6c654b657941677265656d656e7431308201b63082012b06072a86" - + "48ce3e02013082011e02818100b2f221e2b4649401f817557771e4f2ca1c1309caab3fa4d85b03dc1ea13c8395665eb4d05a" - + "212b33e1d727403fec46d30ef3c3fd58cd5b621d7d30912f2360676f16b206aa419dba39b95267b42f14f6500b1729de2d94" - + "ef182ed0f3042fd3850a7398808c48f3501fca0e929cec7a9594e98bccb093c21ca9b7dbdfcdd733110281805e0bed02dd17" - + "342f9f96d186d2cc9e6ff57f5345b44bfeeb0da936b37bca62e2e508d9635a216616abe777c3fa64021728e7aa42cfdae521" - + "01c6a390c3eb618226d8060ceacdbc59fa43330ad41e34a604b1c740959b534f00bd6cf0f35b62d1f8de68d8f37389cd435d" - + "764b4abec5fc39a1e936cdf52a8b73e0f4f37dda536902150093ced62909a4ac3aeca9982f68d1eed34bf055b30381840002" - + "81804f7e72a0e0ed4aae8e498131b0f23425537b9a28b15810a3c1ff6f1439647f4e55dcf73e72a7573ce609a5fb5c5dc3dc" - + "daa883b334780c232ea12b3af2f88226775db48f4b800c9ab1b54e7a26c4c0697bbd5e09355e3b4ac8005a89c65027e1d0d7" - + "091b6aec8ede5dc72e9bb0d3597915d50da58221673ad8a74e76b2a79f25a38194308191300c0603551d130101ff04023000" - + "3081800603551d010479307780109713ac709a6e2cc6aa54b098e5557cd8a151304f314d304b06035504031e44004d006100" - + "6e006100670065006400200050004b00430053002300370020005400650073007400200052006f006f007400200041007500" - + "740068006f00720069007400798210d581eafe596cd7a34d453011f4a4b6f0300906052b0e03021d05000382010100357fbe" - + "079401e111bf80db152752766983c756eca044610f8baab67427dc9b5f37df736da806e91a562939cf876a0998c1232f31b9" - + "9cf38f0e34d39c7e8a2cc04ed897bfdc91f7f292426063ec3ec5490e35c52a7f98ba86a4114976c45881373dacc95ad3e684" - + "7e1e28bb58e4f7cfc7138a56ce75f01a8050194159e1878bd90f9f580f63c6dd41e2d15cd80dc0a8db61101df9009d891ec2" - + "28f70f3a0a37358e7917fc94dfeb6e7cb176e8f5dbfa1ace2af6c0a4306e22eb3051e7705306152ce87328b24f7f153d565b" - + "73aef677d25ae8657f81ca1cd5dd50404b70b9373eadcd2d276e263105c00607a86f0c10ab26d1aafd986313a36c70389a4d" - + "1a8e88").HexToByteArray(); - - public static byte[] s_Rsa2048SignatureOnlyCer = ( - "3082032C30820214A003020102020900E0D8AB6819D7306E300D06092A864886" + - "F70D01010B05003038313630340603550403132D54776F2074686F7573616E64" + - "20666F7274792065696768742062697473206F662052534120676F6F646E6573" + - "73301E170D3137313130333233353131355A170D313831313033323335313135" + - "5A3038313630340603550403132D54776F2074686F7573616E6420666F727479" + - "2065696768742062697473206F662052534120676F6F646E6573733082012230" + - "0D06092A864886F70D01010105000382010F003082010A028201010096C114A5" + - "898D09133EF859F89C1D848BA8CB5258793E05B92D499C55EEFACE274BBBC268" + - "03FB813B9C11C6898153CC1745DED2C4D2672F807F0B2D957BC4B65EBC9DDE26" + - "E2EA7B2A6FE9A7C4D8BD1EF6032B8F0BB6AA33C8B57248B3D5E3901D8A38A283" + - "D7E25FF8E6F522381EE5484234CFF7B30C174635418FA89E14C468AD89DCFCBB" + - "B535E5AF53510F9EA7F9DA8C1B53375B6DAB95A291439A5648726EE1012E4138" + - "8E100691642CF6917F5569D8351F2782F435A579014E8448EEA0C4AECAFF2F47" + - "6799D88457E2C8BCB56E5E128782B4FE26AFF0720D91D52CCAFE344255808F52" + - "71D09F784F787E8323182080915BE0AE15A71D66476D0F264DD084F302030100" + - "01A3393037301D0603551D0E04160414745B5F12EF962E84B897E246D399A2BA" + - "DEA9C5AC30090603551D1304023000300B0603551D0F040403020780300D0609" + - "2A864886F70D01010B0500038201010087A15DF37FBD6E9DED7A8FFF25E60B73" + - "1F635469BA01DD14BC03B2A24D99EFD8B894E9493D63EC88C496CB04B33DF252" + - "22544F23D43F4023612C4D97B719C1F9431E4DB7A580CDF66A3E5F0DAF89A267" + - "DD187ABFFB08361B1F79232376AA5FC5AD384CC2F98FE36C1CEA0B943E1E3961" + - "190648889C8ABE8397A5A338843CBFB1D8B212BE46685ACE7B80475CC7C97FC0" + - "377936ABD5F664E9C09C463897726650711A1110FA9866BC1C278D95E5636AB9" + - "6FAE95CCD67FD572A8C727E2C03E7B242457318BEC1BE52CA5BD9454A0A41140" + - "AE96ED1C56D220D1FD5DD3B1B4FB2AA0E04FC94F7E3C7D476F29896224556395" + - "3AD7225EDCEAC8B8509E49292E62D8BF").HexToByteArray(); - - public static byte[] s_Rsa2048SignatureOnlyPfx = ( - "308209E3020103308209A306092A864886F70D010701A0820994048209903082" + - "098C308205BD06092A864886F70D010701A08205AE048205AA308205A6308205" + - "A2060B2A864886F70D010C0A0102A08204FE308204FA301C060A2A864886F70D" + - "010C0103300E04083EF905F0EA26FBF7020207D0048204D82297B5546DA6CC49" + - "BD8C1444E3FE1845A2C9E9BDB8B83E78235DF4ADF7A97496A62D31D4EEEB76B0" + - "71C0B183ACC3663272F88CF4F31E2E00D76357C0A051B8D6E0BB0BCF4CCDD064" + - "CCBAF546EABA80DA56CD11FE952C61154792559D65F26B0476CF7A5FDB8CC794" + - "B89F6ACD50003459054FE82C48D8791B226A0EEEC01F048AC3CE716C9F3BB313" + - "D64BEBBF0037D83133DD9C15D04F15BB11652D793B613A68AFE580245724E5D1" + - "110040B332B5C39BE04086BA4DFC58E905BC2FE8B3C696181E2879AF197EE24D" + - "91D8AD67013F14C4864C8D0FB19C134B766CF3E48B8C9E363A11EB19F1E82E74" + - "D25EDD96517D64A94314B40C11651030D561E742E63856E8D1A3EE9FDFD6CF64" + - "7140CFC354AE7EA1D14C157C2985F82D54296F7D3DE456AF7513F5F30A0421E4" + - "3A9DAD6DF8A2BF69005B35CA8066F80755D848DA73EF03BC0CC129C5799911D9" + - "3A1ED43F8E76732AF56FD62DC6D0B0DBA6AAC6DCDE77D0E8AC9F6A5EB5A02B61" + - "BC477706D4F1873240AB45E0291EF21E6034D48F1AE8EB139DE7ACD8B8A821E6" + - "70B395C3EC4B0E75C34BF0067F052FCED835CAC1F17C3FBEA2FC9FD281FCDE21" + - "D5B27CF31A07E90164A979ACEF0E1C67DBA6C33082E9B189D4BDA2D2D504776F" + - "455843437BDF10D4AF48639EC03344BCC36EFEA7CDE08D7F94DDEAF98BCB5D65" + - "207AE0C349EECE3032DE19F3B337F29A3457AA0AAF4306FA8301619AB01B7235" + - "BE16CB93728E142DAA6C1CBBCC5BD82D913596994DA40FB916CF2DB5FBCC20CF" + - "E893DC62BBC5FC59E00BC0A704A9DB25BBF9291971F2377FC1A20F2C954869DB" + - "6FFCC90C625AABE97ED4CF7C0209D39AD780003C437152D636ACB3B484C46885" + - "DC1584733D2153A3F9B968F12CDD5937CDF9DD2581D72EE67C83AE2530197AA7" + - "C6110613BEFF0B75E586C28394EA8EBCF7F9DB133295B33DC86C8DBA92BF8BD1" + - "ADCAF8D2CD2E018B08D59FF1C30A13484AB11468F7DCEB1FE53A6DAF309B0510" + - "7772CB735314A5B2F053E60A653F0496BCB9CADF5E50339A4D2EF2382056B768" + - "558EB9230D996C636E6D29664F92F70A088DE3EE4EC4BBD8A9C4C98C7892D122" + - "28806622B87E581A321AD835B8F4B964A17B5BE6D9DA50133D494732A41884E2" + - "9E891FE2D40ACCFD585C8BF626C1E8A412D2EE7CDE060E2CCDA826BF79D80F1B" + - "F6B8400473BCE0C19D03ACF55D1FAA994C04A8CD11D49743B1F45F48DFFDD701" + - "18B5FA82ECDF67714F5DE5D3D3DDDCB76ED0EA6A6E151665A4AA351DB1A99F8C" + - "7502D3795C2C358CCA589C390C1F4810615130B91BA42A85E77FA37197E1B083" + - "FE1246B067C6444D49B369D45B130A6D7B463C3F0459EB41D68009CABD2F5C60" + - "49DB706FA742C9773FB5791AF123FBE485E05F87759ADD25281BE337B6095EC3" + - "4EFF9FC692798FB4217EF4B2B59902D930F28181933FAA278C041123CAE3CA63" + - "6DFD3AD4E04EB751A30D50C26288EA4D01C7B323E4FD6387F88E020BC433BF60" + - "C4406398C44EA5C7A6EB24134B0811E4F94DFAF5553172306FA5543C254E7E04" + - "DEEC84DBF9FAF7BFEA8D61E094CBB18DD45C5BAB9199DD719F9A305E205605CC" + - "671DCD566FEBA2C8F4C1A445625C4F42D1CFE32087F095591798D1D48DA46DE9" + - "230F5102B56A1EF879D48936D5331D6B3D9F1B564CF08FD3C641CFF3B02CB4FC" + - "8995E5EC5DD1D183704940C02DEA7430FD594E54800DCC74B7732731C63FBBA2" + - "A2F6DC031174390A74781D352B09FB4F318190301306092A864886F70D010915" + - "3106040401000000307906092B0601040182371101316C1E6A004D0069006300" + - "72006F0073006F0066007400200045006E00680061006E006300650064002000" + - "520053004100200061006E006400200041004500530020004300720079007000" + - "74006F0067007200610070006800690063002000500072006F00760069006400" + - "650072308203C706092A864886F70D010706A08203B8308203B4020100308203" + - "AD06092A864886F70D010701301C060A2A864886F70D010C0106300E04087CB7" + - "E0256AD1AD80020207D0808203800C21CEBEF9F3765F11A188B56702050E3DCA" + - "78AA27123654D066399DD56E62187C89A30940B5B63493950EEFA06C04B5CAF0" + - "329143AF30EE0B47406E49D4E6241817986F864780B743B58F03DF13523F5C01" + - "C889046356623AFA816B163E57A36672FAC9CA72294B2A17F75F5ADB1A4CBDB7" + - "B3F5C33C643DA0CC00CB79E54FAB25D1881B81C03BA5762BAA551A7E8BA38144" + - "353B07285B288BC2747F75B7AF249040C338CFC585D0B1CECFED46BCAE7FAF09" + - "60BB3EE996E30E626CB544A38393BC7DFDB7A27A21A6CF09332B544F448DF5B3" + - "31E000F7CCD5CE5C8E8765A2339919C713352FCD30FA52B994C25EA95E548C4B" + - "5EC23B3BDEC7342D0676B9227D3405758DBA5BD09F9253791FAA03F158F04848" + - "D5073DD240F466F57770353528B3AE83A626F33D05BD1BBB4E28CB067FFAA97D" + - "B4C79EEAAFB4B30BE738C1AA5DB1830B3968CDF6BAF778494AE40EF003DCDA54" + - "486E9952EB44628385E149C348E0E431928B85608622B994CF43433DA9C19482" + - "360121560E53E85FE7CBB7C31E27AD335BC247F284EAC3CA94C30DBB4DF2AB02" + - "DF1154626838240213D910D5B7476A025CA7565CECBA0051320FC7EECD6C74FF" + - "505566F75804D1E2BD2B0181B235CE911EAD9260C0799C817F956AE290E00EF0" + - "997F7B6BD059B315915D580CF0C019A23A6D4993F6E8B8106A1AB6CE1991B609" + - "1B42B6D33EE01EC96CB475430365E9C710C5EB4C6010260D12108022449F7E6D" + - "1A2F28838304DB2A60B9FF714FC887579A4CDC139DAF30A18D3910D82313CCB1" + - "FA43A8930E0F10DE24652AC1E5B797084BEBDB8AB5FA6DCE03E44ABF35EDEB1A" + - "FFEAD3F7C9CB342CCA2882D945EB52C20DC595FA10161866EB9426281CF13341" + - "311B59FDE8E69F9B853117740D92F4AC1B2E4597D41B8A097E1DAA688FFF1C5C" + - "846DF96CA75224EC26F4FF328164F5D1EC06B697211BDB42E6C97EB294A5798C" + - "0FCE6104C950A5207F74EC0DED8AEE10463EF2D9ACD7473D2BE48EBBF0A550B9" + - "AA19A465147B378B078229E8804918136633D7FCE5340AC61A1418D7D9BB18D1" + - "98B7B7866C4D7DC562B1F93F3F322484BDDCEB23680B8EB9904EC783D5CD7177" + - "CFE9CA9D1893104E97760E871DE0907D4BDF6263E7BB0F47414AF31E377C7447" + - "B881E68AE3E80D06597F12D5EF5ED861D055D494D89F04A70800DA3FD4E53877" + - "87FBEED7B772E3A24E7F4832A956FEC0C81847C68373ED4760ABF542F77DC794" + - "249519BDDF5F846EB8C5078BCC053037301F300706052B0E03021A0414461F5B" + - "19C6933240012EFEB95F734C648CCD13460414FA1743400686D25BA1CB28D736" + - "F2B1ED97699EA4").HexToByteArray(); - - public static byte[] s_dsa1024Pfx = ( - "308206EE020103308206B406092A864886F70D010701A08206A5048206A13082" + - "069D3082043706092A864886F70D010706A0820428308204240201003082041D" + - "06092A864886F70D010701301C060A2A864886F70D010C0106300E04084AF212" + - "89D5D7E2E702020800808203F0DECCF218AC91F26BAB026998AB77C7629D20DB" + - "E2FB7022A3C4A1CECD743C0F932E944AE229DAFB61AD76C4DEB6995DF4F4BA01" + - "2DBAD5C63A4C846E0807FCA0BC4A162CDFBAB4B3C4D304F473B3ACC1D268436E" + - "F537DAE97ECC3C634C8DF2A294CC23E904A169F369021A0C024A03DE98A65B0F" + - "3F14D6910525D76AD98B91E67BB7398E245CF48A4D2A5603CFCCF4E547D7EDAB" + - "669D9A8597C6839119EB9FD932D1E4BA8B45D3317186CDA2EFF247BCFD64A5CA" + - "ED604BF7033E423CC21CEC6454FE3B74E03A26C51A1C3519CE339FBE9F10B81D" + - "DF6A0AAB4F8166D90B6F52B3439AB4B5273D0A506E3E01869F8FEBD1521EF8E5" + - "BFB357FA630E3C988926EF3ACC0A0F4176FE8A93337C1A5C6DEAB5758EC2F07C" + - "11E8B2495ECDE58D12312CCCA2E8B2EE8564B533D18C7A26A9290394C2A9942C" + - "295EBB0317F5695103627519567960908323FFE6560AD054C97800218A52F37A" + - "DDE4E7F18EF3BF3718A9D7BF57B700DBEB5AB86598C9604A4546995E34DBABBB" + - "6A9FB483A3C2DFE6046DFD54F2D7AC61C062AF04B7FBAC395C5DD19408D6926A" + - "93B896BFB92DA6F7F5A4E54EDBE2CFBB56576878150676ADB0D37E0177B91E0D" + - "F09D7B37769E66842DD40C7B1422127F152A165BC9669168885BA0243C9641B4" + - "48F68575AA6AB9247A49A61AC3C683EE057B7676B9610CF9100096FC46BDC8B9" + - "BAA03535815D5E98BA3ABC1E18E39B50A8AF8D81E30F2DFD6AF5D0F9FC3636AB" + - "69E128C793571723A79E42FC7C1BD7F39BD45FBE9C39EEB010005435BEC19844" + - "2058033D2601B83124BD369DADB831317E0B2C28CE7535A2E89D8A0E5E34E252" + - "3B0FCEC34FF26A2B80566F4D86F958F70106BF3322FA70A3312E48EAA130246A" + - "07412E93FDE91F633F758BC49311F6CBBAEC5D2F22AFCD696F72BC22E7DE6C00" + - "3275DFEC47E3848226FE9DBA184EA711E051B267C584749F897EFE7EAFD02F1D" + - "BF3FD8E882474CA1F45509EF2E7B82F35B677CB88ED42AF729848EE2B424B0CE" + - "2E9AAC945BABA550C20D5B25075A30FE70D8CAA5A527A35F1DF17BCCB91930C1" + - "7120C625667120E0806C2B51EDFF540F928BD555FB48DBCB83CCCE0C385E78C8" + - "65BE715AE6F8BE472E5FC187EBE3FEFD8D7FE62D4DB2EE61F42D24D81FAA9179" + - "0FB17E8EBC8E219B6F9E039F5AB3BC4870821D474B36C8F8D0583D9DC06E4383" + - "D03424420B8C8B26276877166A0F51E22F0D8FA60A070CFBD47EAFBC717C879C" + - "B5A1EA69C4C2A38F26A1EEF96A0C32BFCECCE4EA97E90A425066B1DD0891353F" + - "766EB9F2BFA2563A815DAF3639EBB147E1E8757A6BFAB902C4A8F037AD47E03F" + - "AF2E019FCF6CA7430BDFEA4B45B28ED746BB90E09BEF7B370A75E7924BBA0920" + - "25FE654A9A197A5B8BBBE43DC7C892FF14E75A37EB97FC489AB121A43E308202" + - "5E06092A864886F70D010701A082024F0482024B3082024730820243060B2A86" + - "4886F70D010C0A0102A082017630820172301C060A2A864886F70D010C010330" + - "0E0408ECB4D1550DA52C6302020800048201509322DC0193DD9E79ADAFD38827" + - "AD6DE9299327DDDF6E9DF4FB70D53A64951E4B814E90D2A19B3F4B8E39A2F851" + - "A3E5E9B9EB947DD248A3E5F5EB458F3323D4656709E97C6BD59238C4D1F26AB6" + - "7D73235FAE7780D98705957B6650AC0DE3E2D46E22455D0A105D138F16A84839" + - "14EDDF5C518B748558704ED3AE4A8C4914F667BBDE07978E4A4FC66194F6B86B" + - "AB9F558EDE890C25DFB97C59653906CC573B5DEB62165CFF8A5F4F8059A478EB" + - "F6FED75F1DACDC612C2E271E25A7083E15D33697270FD442D79FFCB25DB135F9" + - "8E580DC9CE14F73C3B847931AF821C77718455F595CA15B86386F3FCC5962262" + - "5FC916DDB4A08479DCB49FF7444333FA99FBB22F1AEC1876CF1E099F7A4ECA85" + - "A325A8623E071EEA9359194EEE712F73076C5EB72AA243D0C0978B934BC8596F" + - "8353FD3CA859EEA457C6175E82AE5854CC7B6598A1E980332F56AB1EE1208277" + - "4A91A63181B9302306092A864886F70D01091531160414E6335FA7097AB6DE4A" + - "1CDB0C678D7A929883FB6430819106092B06010401823711013181831E818000" + - "4D006900630072006F0073006F0066007400200045006E00680061006E006300" + - "650064002000440053005300200061006E006400200044006900660066006900" + - "65002D00480065006C006C006D0061006E002000430072007900700074006F00" + - "67007200610070006800690063002000500072006F0076006900640065007230" + - "313021300906052B0E03021A0500041466FD3518CEBBD69877BA663C9E8D7092" + - "8E8A98F30408DFB5AE610308BCF802020800").HexToByteArray(); - - public static byte[] s_dsa1024Cert = ( - "3082038D3082034AA003020102020900AB740A714AA83C92300B060960864801" + - "650304030230818D310B3009060355040613025553311330110603550408130A" + - "57617368696E67746F6E3110300E060355040713075265646D6F6E64311E301C" + - "060355040A13154D6963726F736F667420436F72706F726174696F6E3120301E" + - "060355040B13172E4E4554204672616D65776F726B2028436F72654658293115" + - "30130603550403130C313032342D62697420445341301E170D31353131323531" + - "34343030335A170D3135313232353134343030335A30818D310B300906035504" + - "0613025553311330110603550408130A57617368696E67746F6E3110300E0603" + - "55040713075265646D6F6E64311E301C060355040A13154D6963726F736F6674" + - "20436F72706F726174696F6E3120301E060355040B13172E4E4554204672616D" + - "65776F726B2028436F7265465829311530130603550403130C313032342D6269" + - "7420445341308201B73082012C06072A8648CE3804013082011F02818100AEE3" + - "309FC7C9DB750D4C3797D333B3B9B234B462868DB6FFBDED790B7FC8DDD574C2" + - "BD6F5E749622507AB2C09DF5EAAD84859FC0706A70BB8C9C8BE22B4890EF2325" + - "280E3A7F9A3CE341DBABEF6058D063EA6783478FF8B3B7A45E0CA3F7BAC9995D" + - "CFDDD56DF168E91349130F719A4E717351FAAD1A77EAC043611DC5CC5A7F0215" + - "00D23428A76743EA3B49C62EF0AA17314A85415F0902818100853F830BDAA738" + - "465300CFEE02418E6B07965658EAFDA7E338A2EB1531C0E0CA5EF1A12D9DDC7B" + - "550A5A205D1FF87F69500A4E4AF5759F3F6E7F0C48C55396B738164D9E35FB50" + - "6BD50E090F6A497C70E7E868C61BD4477C1D62922B3DBB40B688DE7C175447E2" + - "E826901A109FAD624F1481B276BF63A665D99C87CEE9FD063303818400028180" + - "25B8E7078E149BAC352667623620029F5E4A5D4126E336D56F1189F9FF71EA67" + - "1B844EBD351514F27B69685DDF716B32F102D60EA520D56F544D19B2F08F5D9B" + - "DDA3CBA3A73287E21E559E6A07586194AFAC4F6E721EDCE49DE0029627626D7B" + - "D30EEB337311DB4FF62D7608997B6CC32E9C42859820CA7EF399590D5A388C48" + - "A330302E302C0603551D110425302387047F0000018710000000000000000000" + - "0000000000000182096C6F63616C686F7374300B060960864801650304030203" + - "3000302D021500B9316CC7E05C9F79197E0B41F6FD4E3FCEB72A8A0214075505" + - "CCAECB18B7EF4C00F9C069FA3BC78014DE").HexToByteArray(); - - // Password: "Test" - internal static readonly byte[] ECDsaP256_DigitalSignature_Pfx_Windows = ( - "308204470201033082040306092A864886F70D010701A08203F4048203F03082" + - "03EC3082016D06092A864886F70D010701A082015E0482015A30820156308201" + - "52060B2A864886F70D010C0A0102A081CC3081C9301C060A2A864886F70D010C" + - "0103300E0408EC154269C5878209020207D00481A80BAA4AF8660E6FAB7B050B" + - "8EF604CFC378652B54FE005DC3C7E2F12E5EFC7FE2BB0E1B3828CAFE752FD64C" + - "7CA04AF9FBC5A1F36E30D7D299C52BF6AE65B54B9240CC37C04E7E06330C24E9" + - "6D19A67B7015A6BF52C172FFEA719B930DBE310EEBC756BDFF2DF2846EE973A6" + - "6C63F4E9130083D64487B35C1941E98B02B6D5A92972293742383C62CCAFB996" + - "EAD71A1DF5D0380EFFF25BA60B233A39210FD7D55A9B95CD8A440DF666317430" + - "1306092A864886F70D0109153106040401000000305D06092B06010401823711" + - "0131501E4E004D006900630072006F0073006F0066007400200053006F006600" + - "7400770061007200650020004B00650079002000530074006F00720061006700" + - "65002000500072006F007600690064006500723082027706092A864886F70D01" + - "0706A0820268308202640201003082025D06092A864886F70D010701301C060A" + - "2A864886F70D010C0106300E0408175CCB1790C48584020207D080820230E956" + - "E38768A035D8EA911283A63F2E5B6E5B73231CFC4FFD386481DE24B7BB1B0995" + - "D614A0D1BD086215CE0054E01EF9CF91B7D80A4ACB6B596F1DFD6CBCA71476F6" + - "10C0D6DD24A301E4B79BA6993F15D34A8ADB7115A8605E797A2C6826A4379B65" + - "90B56CA29F7C36997119257A827C3CA0EC7F8F819536208C650E324C8F884794" + - "78705F833155463A4EFC02B5D5E2608B83F3CAF6C9BB97C1BBBFC6C5584BDCD3" + - "9C46A3944915B3845C41429C7792EB4FA3A7EDECCD801F31A4B6EF57D808AEEA" + - "AF3D1F55F378EF8EF9632CED16EDA3EFBE4A9D5C5F608CA90A9AC8D3F86462AC" + - "219BFFD0B8A87DDD22CF029230369B33FC2B488B5F82702EFC3F270F912EAD2E" + - "2402D99F8324164C5CD5959F22DEC0D1D212345B4B3F62848E7D9CFCE2224B61" + - "976C107E1B218B4B7614FF65BCCA388F85D6920270D4C588DEED323C416D014F" + - "5F648CC2EE941855EB3C889DCB9A345ED11CAE94041A86ED23E5789137A3DE22" + - "5F4023D260BB686901F2149B5D7E37102FFF5282995892BDC2EAB48BD5DA155F" + - "72B1BD05EE3EDD32160AC852E5B47CA9AEACE24946062E9D7DCDA642F945C9E7" + - "C98640DFAC7A2B88E76A560A0B4156611F9BE8B3613C71870F035062BD4E3D9F" + - "D896CF373CBFBFD31410972CDE50739FFB8EC9180A52D7F5415EBC997E5A4221" + - "349B4BB7D53614630EEEA729A74E0C0D20726FDE5814321D6C265A7DC6BA24CA" + - "F2FCE8C8C162733D58E02E08921E70EF838B95C96A5818489782563AE8A2A85F" + - "64A95EB350FF8EF6D625AD031BCD303B301F300706052B0E03021A0414C8D96C" + - "ED140F5CA3CB92BEFCA32C690804576ABF0414B59D4FECA9944D40EEFDE7FB96" + - "196D167B0FA511020207D0").HexToByteArray(); - - internal static readonly byte[] ECDsaP256_DigitalSignature_Cert = ( - "308201583081FFA003020102021035428F3B3C5107AD49E776D6E74C4DC8300A" + - "06082A8648CE3D04030230153113301106035504030C0A454344534120546573" + - "74301E170D3135303530313030333730335A170D313630353031303035373033" + - "5A30153113301106035504030C0A454344534120546573743059301306072A86" + - "48CE3D020106082A8648CE3D030107034200047590F69CA114E92927E034C997" + - "B7C882A8C992AC00CEFB4EB831901536F291E1B515263BCD20E1EA32496FDAC8" + - "4E2D8D1B703266A9088F6EAF652549D9BB63D5A331302F300E0603551D0F0101" + - "FF040403020388301D0603551D0E0416041411218A92C5EB12273B3C5CCFB822" + - "0CCCFDF387DB300A06082A8648CE3D040302034800304502201AFE595E19F1AE" + - "4B6A4B231E8851926438C55B5DDE632E6ADF13C1023A65898E022100CBDF434F" + - "DD197D8B594E8026E44263BADE773C2BEBD060CC4109484A498E7C7E").HexToByteArray(); - } - } -} - - diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/Certificates.cs.REMOVED.git-id b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/Certificates.cs.REMOVED.git-id new file mode 100644 index 0000000000..c57ed1d142 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/Certificates.cs.REMOVED.git-id @@ -0,0 +1 @@ +b19fad719d04d44b34744aaa09c0b81b2e3a59ae \ No newline at end of file diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/ContentEncryptionAlgorithmTests.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/ContentEncryptionAlgorithmTests.cs index 4e82b880d1..24a66e27c2 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/ContentEncryptionAlgorithmTests.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/ContentEncryptionAlgorithmTests.cs @@ -2,15 +2,6 @@ // 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.IO; -using System.Linq; -using System.Globalization; -using System.Collections.Generic; -using System.Security.Cryptography; -using System.Runtime.InteropServices; -using System.Text; -using System.Security.Cryptography.Pkcs; -using System.Security.Cryptography.Xml; using System.Security.Cryptography.X509Certificates; using Xunit; @@ -21,6 +12,24 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests { public static partial class ContentEncryptionAlgorithmTests { + public static bool SupportsRc4 => PlatformDetection.IsWindows; + public static bool DoesNotSupportRc4 => !SupportsRc4; + + [Fact] + public static void EncryptionAlgorithmRc2_InvalidKeyLength() + { + // For desktop compat, variable key length ciphers throw an error if the key length provided + // is not a multiple of 8. + AlgorithmIdentifier algorithm = new AlgorithmIdentifier(new Oid(Oids.Rc2), 3); + ContentInfo contentInfo = new ContentInfo(new byte[] { 1, 2, 3 }); + EnvelopedCms ecms = new EnvelopedCms(contentInfo, algorithm); + using (X509Certificate2 cert = Certificates.RSAKeyTransfer1.GetCertificate()) + { + CmsRecipient cmsRecipient = new CmsRecipient(cert); + Assert.ThrowsAny(() => ecms.Encrypt(cmsRecipient)); + } + } + [Fact] public static void DecodeAlgorithmRc2_128_RoundTrip() { @@ -59,6 +68,92 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.Equal(128, algorithm.KeyLength); } + [Fact] + public static void DecodeAlgorithmRc2_40_FixedValue() + { + ContentInfo expectedContentInfo = new ContentInfo(new byte[] { 1, 2, 3, 4 }); + byte[] encodedMessage = + ("3082011806092A864886F70D010703A0820109308201050201003181CC3081C90201003032301E311C301A0" + + "60355040313135253414B65795472616E73666572436170693102105D2FFFF863BABC9B4D3C80AB178A4CCA" + + "300D06092A864886F70D010101050004818004E46A48651034B01134B0D4F665C9E85F6C45B58458ECDBAFE" + + "B6B55CBFA9AEBEFA52BCBEF3C8811B5118970562623FC35D4B733B55CBC50DA4F49822E1D198834897D3540" + + "7B329FECF49277159F2FEAB31173004776B03746381E0DA660B6D656A861E54E79186F36F450105DEB2714D" + + "02DB5500921EBE4F1A7D3DFB07E4EE9303106092A864886F70D010701301A06082A864886F70D0302300E02" + + "0200A00408D621253C94AF659B800802930ACE6A997122").HexToByteArray(); + EnvelopedCms ecms = new EnvelopedCms(); + ecms.Decode(encodedMessage); + + AlgorithmIdentifier algorithm = ecms.ContentEncryptionAlgorithm; + Assert.NotNull(algorithm.Oid); + Assert.Equal(Oids.Rc2, algorithm.Oid.Value); + Assert.Equal(40, algorithm.KeyLength); + } + + [Fact] + [OuterLoop(/* Leaks key on disk if interrupted */)] + public static void DecodeAlgorithmRc2_40_RoundTrip() + { + ContentInfo contentInfo = new ContentInfo(new byte[] { 1, 2, 3, 4 }); + EnvelopedCms ecms = new EnvelopedCms(contentInfo, new AlgorithmIdentifier(new Oid(Oids.Rc2), 40)); + + using (X509Certificate2 cert = Certificates.RSAKeyTransferCapi1.GetCertificate()) + { + ecms.Encrypt(new CmsRecipient(SubjectIdentifierType.IssuerAndSerialNumber, cert)); + } + + byte[] encodedMessage = ecms.Encode(); + + ecms = new EnvelopedCms(); + ecms.Decode(encodedMessage); + + AlgorithmIdentifier algorithm = ecms.ContentEncryptionAlgorithm; + Assert.NotNull(algorithm.Oid); + Assert.Equal(Oids.Rc2, algorithm.Oid.Value); + Assert.Equal(40, algorithm.KeyLength); + } + + [ConditionalFact(nameof(SupportsRc4))] + [OuterLoop(/* Leaks key on disk if interrupted */)] + public static void DecodeAlgorithmRc4_40_RoundTrip() + { + ContentInfo contentInfo = new ContentInfo(new byte[] { 1, 2, 3, 4 }); + EnvelopedCms ecms = new EnvelopedCms(contentInfo, new AlgorithmIdentifier(new Oid(Oids.Rc4), 40)); + + using (X509Certificate2 cert = Certificates.RSAKeyTransferCapi1.GetCertificate()) + { + ecms.Encrypt(new CmsRecipient(SubjectIdentifierType.IssuerAndSerialNumber, cert)); + } + + byte[] encodedMessage = ecms.Encode(); + + ecms = new EnvelopedCms(); + ecms.Decode(encodedMessage); + + AlgorithmIdentifier algorithm = ecms.ContentEncryptionAlgorithm; + Assert.NotNull(algorithm.Oid); + Assert.Equal(Oids.Rc4, algorithm.Oid.Value); + Assert.Equal(40, algorithm.KeyLength); + } + + + [ConditionalFact(nameof(DoesNotSupportRc4))] + [OuterLoop(/* Leaks key on disk if interrupted */)] + public static void DecodeAlgorithmRc4_40_PlatformNotSupported() + { + ContentInfo contentInfo = new ContentInfo(new byte[] { 1, 2, 3, 4 }); + EnvelopedCms ecms = new EnvelopedCms(contentInfo, new AlgorithmIdentifier(new Oid(Oids.Rc4), 40)); + + using (X509Certificate2 cert = Certificates.RSAKeyTransferCapi1.GetCertificate()) + { + CmsRecipient recipient = new CmsRecipient(SubjectIdentifierType.IssuerAndSerialNumber, cert); + + CryptographicException e = + Assert.Throws(() => ecms.Encrypt(recipient)); + + Assert.Contains(Oids.Rc4, e.Message); + } + } + [Fact] public static void DecodeAlgorithmDes_RoundTrip() { @@ -134,7 +229,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.Equal(192, algorithm.KeyLength); } - [Fact] + [ConditionalFact(nameof(SupportsRc4))] public static void DecodeAlgorithmRc4_RoundTrip() { AlgorithmIdentifier algorithm = new AlgorithmIdentifier(new Oid(Oids.Rc4)); @@ -172,6 +267,46 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.Equal(128, algorithm.KeyLength); } + [Fact] + public static void DecodeAlgorithmRc4_40_FixedValue() + { + byte[] encodedMessage = + ("3082011006092A864886F70D010703A08201013081FE0201003181CC3081C90201003032301E311C301A060" + + "355040313135253414B65795472616E73666572436170693102105D2FFFF863BABC9B4D3C80AB178A4CCA30" + + "0D06092A864886F70D01010105000481809D242C1517B82A58335E0337B0B2CE97B2789AF31A6B31311417B" + + "A069D0D76FD08AE5B4F58C290116667FFD00319AA7AFED4EEAD9D5031C0D17A48E6CB39A5EB62C8BD7F4C2C" + + "BE8E581EF8B7FF7BA9376923A367B9B7E031F630E4CA6ADCB31209B04B03E64076FB0465E7E437B13D4AEA2" + + "70CA89EB58C1A598F0AC88DCB4024302A06092A864886F70D010701301706082A864886F70D0304040B4B5A" + + "8F64D714F933642D4A8004C68A936F").HexToByteArray(); + + EnvelopedCms ecms = new EnvelopedCms(); + ecms.Decode(encodedMessage); + AlgorithmIdentifier algorithm = ecms.ContentEncryptionAlgorithm; + Assert.NotNull(algorithm.Oid); + Assert.Equal(Oids.Rc4, algorithm.Oid.Value); + Assert.Equal(40, algorithm.KeyLength); + } + + [Fact] + public static void EncryptionAlgorithmAes128_IgnoresKeyLength() + { + // For desktop compat, static key length ciphers ignore the key lengths supplied + AlgorithmIdentifier algorithm = new AlgorithmIdentifier(new Oid(Oids.Aes128), 3); + ContentInfo contentInfo = new ContentInfo(new byte[] { 1, 2, 3 }); + EnvelopedCms ecms = new EnvelopedCms(contentInfo, algorithm); + using (X509Certificate2 cert = Certificates.RSAKeyTransfer1.GetCertificate()) + { + CmsRecipient cmsRecipient = new CmsRecipient(cert); + ecms.Encrypt(cmsRecipient); + } + byte[] encodedMessage = ecms.Encode(); + + ecms.Decode(encodedMessage); + + Assert.Equal(Oids.Aes128, ecms.ContentEncryptionAlgorithm.Oid.Value); + Assert.Equal(0, ecms.ContentEncryptionAlgorithm.KeyLength); + } + [Fact] public static void DecodeAlgorithmAes128_RoundTrip() { diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/DecryptTests.KeyPersistence.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/DecryptTests.KeyPersistence.cs index f34cee98be..748b8140ae 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/DecryptTests.KeyPersistence.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/DecryptTests.KeyPersistence.cs @@ -80,6 +80,11 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests [OuterLoop("Leaks key on disk if interrupted")] public static void Decrypt_Capi_Perphemeral(string algOid) { + if (algOid == Oids.Rc4 && !ContentEncryptionAlgorithmTests.SupportsRc4) + { + return; + } + byte[] content = { 1, 1, 2, 3, 5, 8, 13, 21 }; ContentInfo contentInfo = new ContentInfo(content); TestSimpleDecrypt_RoundTrip( diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/DecryptTests.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/DecryptTests.cs index fb31e70a15..9d1a6b5000 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/DecryptTests.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/DecryptTests.cs @@ -2,14 +2,6 @@ // 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.IO; -using System.Linq; -using System.Globalization; -using System.Collections.Generic; -using System.Security.Cryptography; -using System.Runtime.InteropServices; -using System.Text; -using System.Security.Cryptography.Pkcs; using System.Security.Cryptography.Xml; using System.Security.Cryptography.X509Certificates; using Xunit; @@ -77,6 +69,80 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests TestSimpleDecrypt_RoundTrip(Certificates.RSASha512KeyTransfer1, contentInfo, Oids.Aes256, SubjectIdentifierType.IssuerAndSerialNumber); } + [ConditionalFact(nameof(SupportsCngCertificates))] + [OuterLoop("Leaks key on disk if interrupted")] + public static void Decrypt_512_FixedValue() + { + byte[] content = { 5, 77, 32, 33, 2, 34 }; + byte[] message = ( + "3082012506092A864886F70D010703A0820116308201120201003181CE3081CB" + + "02010030343020311E301C060355040313155253415368613531324B65795472" + + "616E736665723102102F5D9D58A5F41B844650AA233E68F105300D06092A8648" + + "86F70D01010105000481803163AA33F8F5E033DC03AE98CCEE158199589FC420" + + "19200DCC1D202309CCCAF79CC0278B9502B5709F1311E522DA325338136D3F1E" + + "A271FAEA978CC656A3CB94B1C6A8D7AFC836C3193DB693E8B8767472C2C23125" + + "BA11E7D0623E4C8B848826BBF99EB411CB88B4731740D1AD834F0E4076BAD0D4" + + "BA695CFE8CDB2DE3E77196303C06092A864886F70D010701301D060960864801" + + "650304012A0410280AC7A629BFC9FD6FB24F8A42F094B48010B78CDFECFF32A8" + + "E86D448989382A93E7" + ).HexToByteArray(); + + VerifySimpleDecrypt(message, Certificates.RSASha512KeyTransfer1, new ContentInfo(content)); + } + + [ConditionalFact(nameof(SupportsCngCertificates))] + [OuterLoop("Leaks key on disk if interrupted")] + public static void Decrypt_512_NoData_FixedValue() + { + // This is the Decrypt_512_FixedData test re-encoded to remove the + // encryptedContentInfo.encryptedContent optional value. + byte[] content = Array.Empty(); + byte[] message = ( + "3082011306092A864886F70D010703A0820104308201000201003181CE3081CB" + + "02010030343020311E301C060355040313155253415368613531324B65795472" + + "616E736665723102102F5D9D58A5F41B844650AA233E68F105300D06092A8648" + + "86F70D01010105000481803163AA33F8F5E033DC03AE98CCEE158199589FC420" + + "19200DCC1D202309CCCAF79CC0278B9502B5709F1311E522DA325338136D3F1E" + + "A271FAEA978CC656A3CB94B1C6A8D7AFC836C3193DB693E8B8767472C2C23125" + + "BA11E7D0623E4C8B848826BBF99EB411CB88B4731740D1AD834F0E4076BAD0D4" + + "BA695CFE8CDB2DE3E77196302A06092A864886F70D010701301D060960864801" + + "650304012A0410280AC7A629BFC9FD6FB24F8A42F094B4" + ).HexToByteArray(); + + if (PlatformDetection.IsFullFramework) + { + // On NetFx when Array.Empty should be returned an array of 6 zeros is + // returned instead. + content = new byte[6]; + } + + VerifySimpleDecrypt(message, Certificates.RSASha512KeyTransfer1, new ContentInfo(content)); + } + + [ConditionalFact(nameof(SupportsCngCertificates))] + [OuterLoop("Leaks key on disk if interrupted")] + public static void Decrypt_512_CekDoesNotDecrypt_FixedValue() + { + // This is the Decrypt_512_NoData_FixedValue test except that the last + // byte of the recipient encrypted key has been changed from 0x96 to 0x95 + // (the sequence 7195 identifies the changed byte) + byte[] content = Array.Empty(); + byte[] message = ( + "3082011306092A864886F70D010703A0820104308201000201003181CE3081CB" + + "02010030343020311E301C060355040313155253415368613531324B65795472" + + "616E736665723102102F5D9D58A5F41B844650AA233E68F105300D06092A8648" + + "86F70D01010105000481803163AA33F8F5E033DC03AE98CCEE158199589FC420" + + "19200DCC1D202309CCCAF79CC0278B9502B5709F1311E522DA325338136D3F1E" + + "A271FAEA978CC656A3CB94B1C6A8D7AFC836C3193DB693E8B8767472C2C23125" + + "BA11E7D0623E4C8B848826BBF99EB411CB88B4731740D1AD834F0E4076BAD0D4" + + "BA695CFE8CDB2DE3E77195302A06092A864886F70D010701301D060960864801" + + "650304012A0410280AC7A629BFC9FD6FB24F8A42F094B4" + ).HexToByteArray(); + + Assert.ThrowsAny( + () => VerifySimpleDecrypt(message, Certificates.RSASha512KeyTransfer1, new ContentInfo(content))); + } + [Fact] [OuterLoop(/* Leaks key on disk if interrupted */)] public static void Decrypt_SignedWithinEnveloped() @@ -175,6 +241,229 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.Equal(content, contentInfo.Content); } + [Fact] + [OuterLoop(/* Leaks key on disk if interrupted */)] + public static void TestDecryptSimpleAes128_IssuerAndSerial() + { + // Message encrypted on framework for a recipient using the certificate returned by Certificates.RSAKeyTransfer1.GetCertificate() + // and of type IssuerAndSerialNumber. The symmetric algorithm is Aes128 + byte[] encryptedMessage = + ("3082011F06092A864886F70D010703A08201103082010C0201003181C83081C5020100302E301A311830160" + + "603550403130F5253414B65795472616E7366657231021031D935FB63E8CFAB48A0BF7B397B67C0300D0609" + + "2A864886F70D0101073000048180862175CD3B2932235A67C6A025F75CDA1A43B53E785370895BA9AC8D0DD" + + "318EB36DFAE275B16ABD497FEBBFCF2D4B3F38C75B91DC40941A2CC1F7F47E701EEA2D5A770C485565F8726" + + "DC0D59DDE17AA6DB0F9384C919FC8BC6CB561A980A9AE6095486FDF9F52249FB466B3676E4AEFE4035C15DC" + + "EE769F25E4660D4BE664E7F303C06092A864886F70D010701301D060960864801650304010204100A068EE9" + + "03E085EA5A03D1D8B4B73DD88010740E5DE9B798AA062B449F104D0F5D35").HexToByteArray(); + + byte[] expectedContent = { 1, 2, 3, 4 }; + ContentInfo expectedContentInfo = new ContentInfo(expectedContent); + CertLoader certLoader = Certificates.RSAKeyTransfer1; + + VerifySimpleDecrypt(encryptedMessage, certLoader, expectedContentInfo); + } + + [Fact] + [OuterLoop(/* Leaks key on disk if interrupted */)] + public static void TestDecryptSimpleAes192_IssuerAndSerial() + { + // Message encrypted on framework for a recipient using the certificate returned by Certificates.RSAKeyTransfer1.GetCertificate() + // and of type IssuerAndSerialNumber. The symmetric algorithm used is Aes192 + byte[] encryptedMessage = + ("3082011F06092A864886F70D010703A08201103082010C0201003181C83081C5020100302E301A311830160" + + "603550403130F5253414B65795472616E7366657231021031D935FB63E8CFAB48A0BF7B397B67C0300D0609" + + "2A864886F70D010107300004818029B82454B4C301F277D7872A14695A41ED24FD37AC4C9942F9EE96774E0" + + "C6ACC18E756993A38AB215E5702CD34F244E52402DA432E8B79DF748405135E8A6D8CB78D88D9E4C142565C" + + "06F9FAFB32F5A9A4074E10FCCB0758A708CA758C12A17A4961969FCB3B2A6E6C9EB49F5E688D107E1B1DF3D" + + "531BC684B944FCE6BD4550C303C06092A864886F70D010701301D06096086480165030401160410FD7CBBF5" + + "6101854387E584C1B6EF3B08801034BD11C68228CB683E0A43AB5D27A8A4").HexToByteArray(); + + byte[] expectedContent = { 1, 2, 3, 4 }; + ContentInfo expectedContentInfo = new ContentInfo(expectedContent); + CertLoader certLoader = Certificates.RSAKeyTransfer1; + + VerifySimpleDecrypt(encryptedMessage, certLoader, expectedContentInfo); + } + + [Fact] + [OuterLoop(/* Leaks key on disk if interrupted */)] + public static void TestDecryptSimpleAes256_IssuerAndSerial() + { + // Message encrypted on framework for a recipient using the certificate returned by Certificates.RSAKeyTransfer1.GetCertificate() + // and of type IssuerAndSerialNumber. The symmetric algorithm used is Aes256 + byte[] encryptedMessage = + ("3082011F06092A864886F70D010703A08201103082010C0201003181C83081C5020100302E301A311830160" + + "603550403130F5253414B65795472616E7366657231021031D935FB63E8CFAB48A0BF7B397B67C0300D0609" + + "2A864886F70D01010730000481800215BF7505BCD5D083F8EFDA01A4F91D61DE3967779B2F5E4360593D4CB" + + "96474E36198531A5E20E417B04C5C7E3263C3301DF8FA888FFBECC796500D382858379059C986285AFD605C" + + "B5DE125487CCA658DF261C836720E2E14440DA60E2F12D6D5E3992A0DB59973929DF6FC23D8E891F97CA956" + + "2A7AD160B502FA3C10477AA303C06092A864886F70D010701301D060960864801650304012A04101287FE80" + + "93F3C517AE86AFB95E599D7E80101823D88F47191857BE0743C4C730E39E").HexToByteArray(); + + byte[] expectedContent = { 1, 2, 3, 4 }; + ContentInfo expectedContentInfo = new ContentInfo(expectedContent); + CertLoader certLoader = Certificates.RSAKeyTransfer1; + + VerifySimpleDecrypt(encryptedMessage, certLoader, expectedContentInfo); + } + + [Fact] + [OuterLoop(/* Leaks key on disk if interrupted */)] + public static void TestDecryptSimpleTripleDes_IssuerAndSerial() + { + // Message encrypted on framework for a recipient using the certificate returned by Certificates.RSAKeyTransfer1.GetCertificate() + // and of type IssuerAndSerialNumber. The symmetric algorithm used is 3DES-CBC + byte[] encryptedMessage = + ("3082010C06092A864886F70D010703A081FE3081FB0201003181C83081C5020100302E301A3118301606035" + + "50403130F5253414B65795472616E7366657231021031D935FB63E8CFAB48A0BF7B397B67C0300D06092A86" + + "4886F70D0101010500048180062F6F16637C8F35B73924AD85BA47D99DBB4800CB8F0C4094F6896050B7C1F" + + "11CE79BEE55A638EAAE70F2C32C01FC24B8D09D9D574CB7373788C8BC3A4748124154338C74B644A2A11750" + + "9E97D1B3535FAE70E4E7C8F2F866232CBFC6448E89CF9D72B948EDCF9C9FC9C153BCC7104680282A4BBBC1E" + + "E367F094F627EE45FCD302B06092A864886F70D010701301406082A864886F70D030704081E3F12D42E4041" + + "58800877A4A100165DD0F2").HexToByteArray(); + + byte[] expectedContent = { 1, 2, 3, 4 }; + ContentInfo expectedContentInfo = new ContentInfo(expectedContent); + CertLoader certLoader = Certificates.RSAKeyTransfer1; + + VerifySimpleDecrypt(encryptedMessage, certLoader, expectedContentInfo); + } + + [Fact] + [OuterLoop(/* Leaks key on disk if interrupted */)] + public static void TestDecryptSimpleAes256_Ski() + { + // Message encrypted on framework for a recipient using the certificate returned by Certificates.RSAKeyTransfer1.GetCertificate() + // and of type SubjectKeyIdentifier. The symmetric algorithm used is Aes256 + byte[] encryptedMessage = + ("3082010306092A864886F70D010703A081F53081F20201023181AE3081AB0201028014F2008AA9FA3742E83" + + "70CB1674CE1D1582921DCC3300D06092A864886F70D010101050004818055F258073615B95426A7021E1B30" + + "9CFE8DD135B58D29F174B9FE19AE80CFC84621BCE3DBD63A5422AF30A6FAA3E2DFC05CB1AB5AB4FBA6C84EB" + + "1C2E17D5BE5C4959DBE8F96BF1A9701F55B697843032EEC7AFEC58A36815168F017DCFD70C74AD05C48B5E4" + + "D9DDEE409FDC9DC3326B6C5BA9F433A9E031FF9B09473176637F50303C06092A864886F70D010701301D060" + + "960864801650304012A0410314DA87435ED110DFE4F52FA70CEF7B080104DDA6C617338DEBDD10913A9141B" + + "EE52").HexToByteArray(); + + byte[] expectedContent = { 1, 2, 3, 4 }; + ContentInfo expectedContentInfo = new ContentInfo(expectedContent); + CertLoader certLoader = Certificates.RSAKeyTransfer1; + + VerifySimpleDecrypt(encryptedMessage, certLoader, expectedContentInfo); + } + + [Fact] + [OuterLoop(/* Leaks key on disk if interrupted */)] + public static void TestDecryptSimpleAes256_RsaTransferCapi() + { + // Message encrypted on framework for a recipient using the certificate returned by Certificates.RSAKeyTransferCapi1.GetCertificate() + // and of type IssuerAndSerialNumber. The symmetric algorithm used is Aes256 + byte[] encryptedMessage = + ("3082012306092A864886F70D010703A0820114308201100201003181CC3081C90201003032301E311C301A0" + + "60355040313135253414B65795472616E73666572436170693102105D2FFFF863BABC9B4D3C80AB178A4CCA" + + "300D06092A864886F70D01010730000481804F3F4A6707B329AB9A7343C62F20D5C1EAF4E74ECBB2DC66D1C" + + "642FC4AA3E40FC4C13547C6C9F73D525EE2FE4147B2043B8FEBF8604C0E4091C657B48DFD83A322F0879580" + + "FA002C9B27AD1FCF9B8AF24EDDA927BB6728D11530B3F96EBFC859ED6B9F7B009F992171FACB587A7D05E8B" + + "467B3A1DACC08B2F3341413A7E96576303C06092A864886F70D010701301D060960864801650304012A0410" + + "6F911E14D9D991DAB93C0B7738D1EC208010044264D201501735F73052FFCA4B2A95").HexToByteArray(); + + byte[] expectedContent = { 1, 2, 3, 4 }; + ContentInfo expectedContentInfo = new ContentInfo(expectedContent); + CertLoader certLoader = Certificates.RSAKeyTransferCapi1; + + VerifySimpleDecrypt(encryptedMessage, certLoader, expectedContentInfo); + } + + [Fact] + [OuterLoop(/* Leaks key on disk if interrupted */)] + public static void TestDecryptSimpleAes256_RsaSha256() + { + // Message encrypted on framework for a recipient using the certificate returned by + // Certificates.RSASha256KeyTransfer1.GetCertificate() and of type IssuerAndSerialNumber. The symmetric algorithm used is Aes256 + byte[] encryptedMessage = + ("3082012506092A864886F70D010703A0820116308201120201003181CE3081CB02010030343020311E301C0" + + "60355040313155253415368613235364B65795472616E7366657231021072C6C7734916468C4D608253DA01" + + "7676300D06092A864886F70D01010730000481805C32FA32EBDCFFC3595166EEDACFC9E9D60842105B581E1" + + "8B85DE1409F4C999995637153480438530955EE4481A3B27B866FF4E106A525CDFFC6941BDD01EFECCC6CCC" + + "82A3D7F743F7543AB20A61A7831FE4DFB24A1652B072B3758FE4B2588D3B94A29575B6422DC5EF52E432565" + + "36CA25A11BB92817D61FEAFBDDDEC6EE331303C06092A864886F70D010701301D060960864801650304012A" + + "041021D59FDB89C13A3EC3766EF32FB333D080105AE8DEB71DF50DD85F66FEA63C8113F4").HexToByteArray(); + + byte[] expectedContent = { 1, 2, 3, 4 }; + ContentInfo expectedContentInfo = new ContentInfo(expectedContent); + CertLoader certLoader = Certificates.RSASha256KeyTransfer1; + + VerifySimpleDecrypt(encryptedMessage, certLoader, expectedContentInfo); + } + + [Fact] + [OuterLoop(/* Leaks key on disk if interrupted */)] + public static void TestDecryptSimpleAes256_RsaSha384() + { + // Message encrypted on framework for a recipient using the certificate returned by Certificates.RSASha384KeyTransfer1.GetCertificate() + // and of type IssuerAndSerialNumber. The symmetric algorithm used is Aes256 + byte[] encryptedMessage = + ("3082012506092A864886F70D010703A0820116308201120201003181CE3081CB02010030343020311E301C0" + + "60355040313155253415368613338344B65795472616E736665723102103C724FB7A0159A9345CAAC9E3DF5" + + "F136300D06092A864886F70D010107300004818011C1B85914331C005EA89E30D00364821B29BC0C459A22D" + + "917494A1092CDBDA2022792E46C5E88BAD0EE3FD4927B856722311F9B17934FB29CAB8FE595C2AB2B20096B" + + "9E2FC6F9D7B92125F571CBFC945C892EE4764D9B63369350FD2DAEFE455B367F48E100CB461F112808E792A" + + "8AA49B66C79E511508A877530BBAA896696303C06092A864886F70D010701301D060960864801650304012A" + + "0410D653E25E06BFF2EEB0BED4A90D00FE2680106B7EF143912ABA5C24F5E2C151E59D7D").HexToByteArray(); + + byte[] expectedContent = { 1, 2, 3, 4 }; + ContentInfo expectedContentInfo = new ContentInfo(expectedContent); + CertLoader certLoader = Certificates.RSASha384KeyTransfer1; + + VerifySimpleDecrypt(encryptedMessage, certLoader, expectedContentInfo); + } + + [Fact] + [OuterLoop(/* Leaks key on disk if interrupted */)] + public static void TestDecryptSimpleAes256_RsaSha512() + { + // Message encrypted on framework for a recipient using the certificate returned by Certificates.RSASha512KeyTransfer1.GetCertificate() + // and of type IssuerAndSerialNumber. The symmetric algorithm used is Aes256 + byte[] encryptedMessage = + ("3082012506092A864886F70D010703A0820116308201120201003181CE3081CB02010030343020311E301C0" + + "60355040313155253415368613531324B65795472616E736665723102102F5D9D58A5F41B844650AA233E68" + + "F105300D06092A864886F70D01010730000481802156D42FF5ED2F0338302E7298EF79BA1D04E20E68B079D" + + "B3239120E1FC03FEDA8B544F59142AACAFBC5E58205E8A0D124AAD17B5DCAA39BFC6BA634E820DE623BFDB6" + + "582BC48AF1B3DEF6849A57D2033586AF01079D67C9AB3AA9F6B51754BCC479A19581D4045EBE23145370219" + + "98ECB6F5E1BCF8D6BED6A75FE957A40077D303C06092A864886F70D010701301D060960864801650304012A" + + "04100B696608E489E7C35914D0A3DB9EB27F80103D362181B54721FB2CB7CE461CB31030").HexToByteArray(); + + byte[] expectedContent = { 1, 2, 3, 4 }; + ContentInfo expectedContentInfo = new ContentInfo(expectedContent); + CertLoader certLoader = Certificates.RSASha512KeyTransfer1; + + VerifySimpleDecrypt(encryptedMessage, certLoader, expectedContentInfo); + } + + [Fact] + [OuterLoop(/* Leaks key on disk if interrupted */)] + public static void TestDecryptSimple_ExplicitSki() + { + // Message encrypted on framework for a recipient using the certificate returned by Certificates.RSAKeyTransfer_ExplicitSki.GetCertificate() + // and of type SubjectKeyIdentifier. The symmetric algorithm used is Aes256 + byte[] encryptedMessage = + ("3082018806092A864886F70D010703A082017930820175020102318201303082012C020102801401952851C" + + "55DB594B0C6167F5863C5B6B67AEFE6300D06092A864886F70D010101050004820100269EAF029262C87125" + + "314DD3FB02302FA212EB3CC06F73DF1474382BBA2A92845F39FF5A7F5020482849C36B4BC6BC82F7AF0E2E3" + + "9143548CC32B93B72EF0659C6895F77E6B5839962678532392185C9431658B34D1ABD31F64F4C4A9B348A77" + + "56783D60244519ADDD33560405E9377A91617127C2EECF2BAE53AB930FC13AFD25723FB60DB763286EDF6F1" + + "187D8124B6A569AA2BD19294A7D551A0D90F8436274690231520A2254C19EA9BF877FC99566059A29CDF503" + + "6BEA1D517916BA2F20AC9F1D8F164B6E8ACDD52BA8B2650EBBCC2ED9103561E11AF422D10DF7405404195FA" + + "EF79A1FDC680F3A3DC395E3E9C0B10394DF35AE134E6CB719E35152F8E5303C06092A864886F70D01070130" + + "1D060960864801650304012A041085072D8771A2A2BB403E3236A7C60C2A80105C71A04E73C57FE75C1DEDD" + + "94B57FD01").HexToByteArray(); + + byte[] expectedContent = { 1, 2, 3, 4 }; + ContentInfo expectedContentInfo = new ContentInfo(expectedContent); + CertLoader certLoader = Certificates.RSAKeyTransfer_ExplicitSki; + + VerifySimpleDecrypt(encryptedMessage, certLoader, expectedContentInfo); + } + private static void TestSimpleDecrypt_RoundTrip(CertLoader certLoader, ContentInfo contentInfo, string algorithmOidValue, SubjectIdentifierType type) { // Deep-copy the contentInfo since the real ContentInfo doesn't do this. This defends against a bad implementation changing diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/EdgeCasesTests.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/EdgeCasesTests.cs index b7de03720f..54f06d6b2f 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/EdgeCasesTests.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/EdgeCasesTests.cs @@ -2,14 +2,6 @@ // 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.IO; -using System.Linq; -using System.Globalization; -using System.Collections.Generic; -using System.Security.Cryptography; -using System.Runtime.InteropServices; -using System.Text; -using System.Security.Cryptography.Pkcs; using System.Security.Cryptography.Xml; using System.Security.Cryptography.X509Certificates; using Xunit; @@ -21,6 +13,8 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests { public static partial class EdgeCasesTests { + public static bool SupportsRc4 { get; } = ContentEncryptionAlgorithmTests.SupportsRc4; + public static bool SupportsCngCertificates { get; } = (!PlatformDetection.IsFullFramework || PlatformDetection.IsNetfx462OrNewer); [ConditionalFact(nameof(SupportsCngCertificates))] @@ -92,6 +86,34 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests return collection[0]; } + [Fact] + public static void ZeroLengthContextUntagged_FixedValue() + { + // This test ensures that we can handle when the enveloped message has no content inside. This test differs + // from "ZeroLengthContent_FixedValue" in that it doesn't have a context specific [0] in the EncryptedContentInfo + // section of the DER encoding of the message. + // EncryptedContentInfo ::= SEQUENCE { + // contentType ContentType, + // contentEncryptionAlgorithm ContentEncryptionAlgorithmIdentifier, + // encryptedContent[0] IMPLICIT EncryptedContent OPTIONAL } + // The input was created with ASN1 editor and verified with .NET framework. It's an enveloped message, version 0, + // with one Key Transport recipient and holds data encrypted with 3DES. + byte[] content = + ("3082010206092A864886F70D010703A081F43081F10201003181C83081C5020100302E301A311830160603550403130F" + + "5253414B65795472616E7366657231021031D935FB63E8CFAB48A0BF7B397B67C0300D06092A864886F70D0101010500" + + "04818009C16B674495C2C3D4763189C3274CF7A9142FBEEC8902ABDC9CE29910D541DF910E029A31443DC9A9F3B05F02" + + "DA1C38478C400261C734D6789C4197C20143C4312CEAA99ECB1849718326D4FC3B7FBB2D1D23281E31584A63E99F2C17" + + "132BCD8EDDB632967125CD0A4BAA1EFA8CE4C855F7C093339211BDF990CEF5CCE6CD74302106092A864886F70D010701" + + "301406082A864886F70D03070408779B3DE045826B18").HexToByteArray(); + + EnvelopedCms ecms = new EnvelopedCms(); + ecms.Decode(content); + + int expected = PlatformDetection.IsFullFramework ? 6 : 0; // Desktop bug gives 6 + Assert.Equal(expected, ecms.ContentInfo.Content.Length); + Assert.Equal(Oids.Pkcs7Data, ecms.ContentInfo.ContentType.Value); + } + [Fact] [OuterLoop(/* Leaks key on disk if interrupted */)] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Desktop rejects zero length content: corefx#18724")] @@ -122,7 +144,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests ValidateZeroLengthContent(encodedMessage); } - [Fact] + [ConditionalFact(nameof(SupportsRc4))] [OuterLoop(/* Leaks key on disk if interrupted */)] [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "RC4 isn't available via CNG, and CNG is the only library available to UWP")] public static void Rc4AndCngWrappersDontMixTest() @@ -458,6 +480,14 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.Throws(() => ContentInfo.GetContentType(null)); } + [Fact] + public static void ContentInfoGetContentTypeUnknown() + { + byte[] encodedMessage = + ("301A06092A864886F70D010700A00D040B48656C6C6F202E4E455421").HexToByteArray(); + Assert.ThrowsAny(() => ContentInfo.GetContentType(encodedMessage)); + } + [Fact] public static void CryptographicAttributeObjectOidCtor() { diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/GeneralTests.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/GeneralTests.cs index 13c91dc05a..8b7b616941 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/GeneralTests.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/GeneralTests.cs @@ -2,25 +2,21 @@ // 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.IO; using System.Linq; -using System.Globalization; -using System.Collections.Generic; -using System.Security.Cryptography; using System.Runtime.InteropServices; -using System.Text; -using System.Security.Cryptography.Pkcs; +using System.Security.Cryptography.Pkcs.Tests; using System.Security.Cryptography.Xml; using System.Security.Cryptography.X509Certificates; using Xunit; using Test.Cryptography; -using System.Security.Cryptography.Pkcs.Tests; namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests { public static partial class GeneralTests { + public static bool SupportsDiffieHellman { get; } = KeyAgreeRecipientInfoTests.SupportsDiffieHellman; + [Fact] public static void DecodeVersion0_RoundTrip() { @@ -58,7 +54,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.Equal(0, version); } - [Fact] + [ConditionalFact(nameof(SupportsDiffieHellman))] public static void DecodeRecipients3_RoundTrip() { ContentInfo contentInfo = new ContentInfo(new byte[] { 1, 2, 3 }); @@ -117,6 +113,46 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.Equal(expectedIssuers, actualIssuers); } + + [Fact] + public static void DecodeAllIndefinite() + { + byte[] encrypted = Convert.FromBase64String( + @" +MIAGCSqGSIb3DQEHA6CAMIACAQAxggFXMIIBUwIBADA7MDMxGTAXBgNVBAoMEERh +dGEgSW50ZXJjaGFuZ2UxFjAUBgNVBAMMDVVubyBUZXN0IFJvb3QCBFqG6RQwDQYJ +KoZIhvcNAQEBBQAEggEAUPilAHUe67HG5vDCO/JBmof44G/XnDLtiDrbxD4QekGq +mdPqazZiLDKEewlBy2uFJr/JijeYx6qNKTXs/EShw/lYnKisaK5ue6JZ7ssMunM9 +HpkiDfM+iyN7PxnC1riZ/Kg2JExY8pf5R1Zuvu29JSLhM9ajWk9C1pBzQRJ4vkY2 +OvFKR2th0Vgw7mTmc2X6HUK4tosB3LGKDVNd6BVoMQMvfkseCqeZOe1KIiBFmhyk +E+B2UZcD6Z6kLnCk4LNGyoyxW6Thv5s/lwP9p7trVVbPXbuep1l8uMCGj6vjTD66 +AamEIRmTFvEVHzyO2MGG9V0bM+8UpqPAVFNCXOm6mjCABgkqhkiG9w0BBwEwFAYI +KoZIhvcNAwcECJ01qtX2EKx6oIAEEM7op+R2U3GQbYwlEj5X+h0AAAAAAAAAAAAA +"); + EnvelopedCms cms = new EnvelopedCms(); + cms.Decode(encrypted); + + RecipientInfoCollection recipientInfos = cms.RecipientInfos; + + Assert.Equal(1, recipientInfos.Count); + Assert.Equal( + SubjectIdentifierType.IssuerAndSerialNumber, + recipientInfos[0].RecipientIdentifier.Type); + + string expectedContentHex = "CEE8A7E4765371906D8C25123E57FA1D"; + + if (PlatformDetection.IsFullFramework) + { + // .NET Framework over-counts encrypted content. + expectedContentHex += "000000000000"; + } + + // Still encrypted. + Assert.Equal( + expectedContentHex, + cms.ContentInfo.Content.ByteArrayToHex()); + } + [Fact] public static void TestGetContentTypeEnveloped() { @@ -158,6 +194,98 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.Equal(Oids.Pkcs7Signed, contentType.Value); } + [Fact] + public static void TestContent() + { + // Tests that the content is what it is expected to be, even if it's still encyrpted. This prevents from ambiguous definitions of content. + + // The encoded message was built in ASN.1 editor and tested in framework. It contains an enveloped message version 0 with one recipient of + // key transport type. The symmetric algorythm is 3DES and the contained type is data. + byte[] encodedMessage = + ("3082010c06092a864886f70d010703a081fe3081fb0201003181c83081c5020100302e301a311830160603550403130f5253" + + "414b65795472616e7366657231021031d935fb63e8cfab48a0bf7b397b67c0300d06092a864886f70d010101050004818013" + + "dc0eb2984a445d04a1f6246b8fe41f1d24507548d449d454d5bb5e0638d75ed101bf78c0155a5d208eb746755fbccbc86923" + + "8443760a9ae94770d6373e0197be23a6a891f0c522ca96b3e8008bf23547474b7e24e7f32e8134df3862d84f4dea2470548e" + + "c774dd74f149a56cdd966e141122900d00ad9d10ea1848541294a1302b06092a864886f70d010701301406082a864886f70d" + + "030704089c8119f6cf6b174c8008bcea3a10d0737eb9").HexToByteArray(); + + EnvelopedCms cms = new EnvelopedCms(); + + cms.Decode(encodedMessage); + + string expectedHex = "BCEA3A10D0737EB9"; + + if (PlatformDetection.IsFullFramework) + { + expectedHex = "BCEA3A10D0737EB9000000000000"; + } + + Assert.Equal(expectedHex, cms.ContentInfo.Content.ByteArrayToHex()); + } + + [Fact] + [OuterLoop(/* Leaks key on disk if interrupted */)] + public static void MultipleRecipientIdentifiers_RoundTrip() + { + ContentInfo contentInfo = new ContentInfo(new byte[] { 1, 2, 3 }); + EnvelopedCms ecms = new EnvelopedCms(contentInfo); + CmsRecipientCollection recipients = new CmsRecipientCollection(); + using (X509Certificate2 issuerSerialCert = Certificates.RSAKeyTransfer1.GetCertificate()) + using (X509Certificate2 explicitSkiCert = Certificates.RSAKeyTransfer_ExplicitSki.GetCertificate()) + { + // CmsRecipients have different identifiers to test multiple identifier encryption. + recipients.Add(new CmsRecipient(SubjectIdentifierType.IssuerAndSerialNumber, issuerSerialCert)); + recipients.Add(new CmsRecipient(SubjectIdentifierType.SubjectKeyIdentifier, explicitSkiCert)); + ecms.Encrypt(recipients); + } + + byte[] encodedMessage = ecms.Encode(); + + ecms = new EnvelopedCms(); + ecms.Decode(encodedMessage); + + // Try decoding it, doesn't really matter with which cert you want to do it as it's not what this + // test aims for. + + using (X509Certificate2 privateCert = Certificates.RSAKeyTransfer_ExplicitSki.TryGetCertificateWithPrivateKey()) + { + if (privateCert == null) + return; // CertLoader can't load the private certificate. + + ecms.Decrypt(new X509Certificate2Collection(privateCert)); + } + Assert.Equal(contentInfo.ContentType.Value, ecms.ContentInfo.ContentType.Value); + Assert.Equal(contentInfo.Content, ecms.ContentInfo.Content); + } + + [Fact] + [OuterLoop(/* Leaks key on disk if interrupted */)] + public static void RoundTrip_ExplicitSki() + { + ContentInfo contentInfo = new ContentInfo(new byte[] { 1, 2, 3 }); + EnvelopedCms ecms = new EnvelopedCms(contentInfo); + using (X509Certificate2 explicitSkiCert = Certificates.RSAKeyTransfer_ExplicitSki.GetCertificate()) + { + CmsRecipient recipient = new CmsRecipient(SubjectIdentifierType.SubjectKeyIdentifier, explicitSkiCert); + ecms.Encrypt(recipient); + } + + byte[] encodedMessage = ecms.Encode(); + + ecms = new EnvelopedCms(); + ecms.Decode(encodedMessage); + + using (X509Certificate2 privateCert = Certificates.RSAKeyTransfer_ExplicitSki.TryGetCertificateWithPrivateKey()) + { + if (privateCert == null) + return; // CertLoader can't load the private certificate. + + ecms.Decrypt(new X509Certificate2Collection(privateCert)); + } + Assert.Equal(contentInfo.ContentType.Value, ecms.ContentInfo.ContentType.Value); + Assert.Equal(contentInfo.Content, ecms.ContentInfo.Content); + } + private static X509Certificate2[] s_certs = { Certificates.RSAKeyTransfer1.GetCertificate(), diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/KeyAgreeRecipientInfoTests.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/KeyAgreeRecipientInfoTests.cs index dc878c9cf4..5209ec00a5 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/KeyAgreeRecipientInfoTests.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/KeyAgreeRecipientInfoTests.cs @@ -2,26 +2,37 @@ // 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.IO; -using System.Linq; -using System.Globalization; -using System.Collections.Generic; -using System.Security.Cryptography; -using System.Runtime.InteropServices; -using System.Text; -using System.Security.Cryptography.Pkcs; +using System.Security.Cryptography.Pkcs.Tests; using System.Security.Cryptography.Xml; using System.Security.Cryptography.X509Certificates; using Xunit; using Test.Cryptography; -using System.Security.Cryptography.Pkcs.Tests; namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests { public static partial class KeyAgreeRecipientInfoTests { - [Fact] + public static bool SupportsDiffieHellman => PlatformDetection.IsWindows; + public static bool DoesNotSupportDiffieHellman => !SupportsDiffieHellman; + + [ConditionalFact(nameof(DoesNotSupportDiffieHellman))] + public static void TestKeyAgreement_PlatformNotSupported() + { + ContentInfo contentInfo = new ContentInfo(new byte[] { 1, 2, 3 }); + EnvelopedCms ecms = new EnvelopedCms(contentInfo); + using (X509Certificate2 cert = Certificates.DHKeyAgree1.GetCertificate()) + { + CmsRecipient cmsRecipient = new CmsRecipient(cert); + + CryptographicException e = + Assert.Throws(() => ecms.Encrypt(cmsRecipient)); + + Assert.Contains(cert.GetKeyAlgorithm(), e.Message); + } + } + + [ConditionalFact(nameof(SupportsDiffieHellman))] public static void TestKeyAgreeVersion_RoundTrip() { KeyAgreeRecipientInfo recipient = EncodeKeyAgreel(); @@ -35,7 +46,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.Equal(3, recipient.Version); } - [Fact] + [ConditionalFact(nameof(SupportsDiffieHellman))] public static void TestKeyAgreeType_RoundTrip() { KeyAgreeRecipientInfo recipient = EncodeKeyAgreel(); @@ -49,7 +60,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.Equal(RecipientInfoType.KeyAgreement, recipient.Type); } - [Fact] + [ConditionalFact(nameof(SupportsDiffieHellman))] public static void TestKeyAgreesRecipientIdType_RoundTrip() { KeyAgreeRecipientInfo recipient = EncodeKeyAgreel(); @@ -65,7 +76,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.Equal(SubjectIdentifierType.IssuerAndSerialNumber, subjectIdentifier.Type); } - [Fact] + [ConditionalFact(nameof(SupportsDiffieHellman))] public static void TestKeyAgreeRecipientIdValue_RoundTrip() { KeyAgreeRecipientInfo recipient = EncodeKeyAgreel(); @@ -89,7 +100,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.Equal("0AE59B0CB8119F8942EDA74163413A02", xis.SerialNumber); } - [Fact] + [ConditionalFact(nameof(SupportsDiffieHellman))] public static void TestKeyAgreeRecipientIdType_Ski_RoundTrip() { KeyAgreeRecipientInfo recipient = FixedValueKeyAgree1(SubjectIdentifierType.SubjectKeyIdentifier); @@ -105,7 +116,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.Equal(SubjectIdentifierType.SubjectKeyIdentifier, subjectIdentifier.Type); } - [Fact] + [ConditionalFact(nameof(SupportsDiffieHellman))] public static void TestKeyAgreeRecipientIdValue_Ski_RoundTrip() { KeyAgreeRecipientInfo recipient = FixedValueKeyAgree1(SubjectIdentifierType.SubjectKeyIdentifier); @@ -127,7 +138,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.Equal("10DA1370316788112EB8594C864C2420AE7FBA42", ski); } - [Fact] + [ConditionalFact(nameof(SupportsDiffieHellman))] public static void TestKeyAgreeKeyEncryptionAlgorithm_RoundTrip() { KeyAgreeRecipientInfo recipient = EncodeKeyAgreel(); @@ -145,7 +156,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.Equal(0, a.KeyLength); } - [Fact] + [ConditionalFact(nameof(SupportsDiffieHellman))] public static void TestKeyAgreeEncryptedKey_RoundTrip() { KeyAgreeRecipientInfo recipient = EncodeKeyAgreel(); @@ -163,7 +174,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.Equal(expectedEncryptedKey, encryptedKey); } - [Fact] + [ConditionalFact(nameof(SupportsDiffieHellman))] public static void TestKeyAgreeOriginatorIdentifierOrKey_RoundTrip() { KeyAgreeRecipientInfo recipient = EncodeKeyAgreel(); @@ -199,7 +210,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.Equal(expectedKey, key); } - [Fact] + [ConditionalFact(nameof(SupportsDiffieHellman))] public static void TestKeyAgreeDate_RoundTrip() { KeyAgreeRecipientInfo recipient = EncodeKeyAgreel(); @@ -215,7 +226,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.Throws(() => ignore = recipient.Date); } - [Fact] + [ConditionalFact(nameof(SupportsDiffieHellman))] public static void TestKeyAgreeDate_RoundTrip_Ski() { KeyAgreeRecipientInfo recipient = EncodeKeyAgreel(SubjectIdentifierType.SubjectKeyIdentifier); @@ -236,7 +247,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests } - [Fact] + [ConditionalFact(nameof(SupportsDiffieHellman))] public static void TestKeyAgreeOtherKeyAttribute_RoundTrip() { KeyAgreeRecipientInfo recipient = EncodeKeyAgreel(); @@ -280,6 +291,66 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.Equal(expectedAsnData, asnData.RawData); } + [Fact] + public static void TestMultipleKeyAgree_ShortNotation() + { + // KeyAgreement recipients are defined in RFC 2630 as + // + // KeyAgreeRecipientInfo::= SEQUENCE { + // version CMSVersion, --always set to 3 + // originator[0] EXPLICIT OriginatorIdentifierOrKey, + // ukm[1] EXPLICIT UserKeyingMaterial OPTIONAL, + // keyEncryptionAlgorithm KeyEncryptionAlgorithmIdentifier, + // recipientEncryptedKeys RecipientEncryptedKeys } + // + // RecipientEncryptedKeys::= SEQUENCE OF RecipientEncryptedKey + // + // RecipientEncryptedKey::= SEQUENCE { + // rid KeyAgreeRecipientIdentifier, + // encryptedKey EncryptedKey } + // + // When RecipientEncryptedKeys has more than one sequence in it, then different KeyAgreement recipients are created, where each + // recipient hold the information from one RecipientEncryptedKey. This message has one KeyAgreeRecipientInfo object that has two + // RecipientEncryptedKeys so it needs to have two recipients in the end. + + byte[] encodedMessage = + ("3082019206092A864886F70D010703A08201833082017F0201023182014BA1820147020103A08196A18193300906072A" + + "8648CE3E02010381850002818100AC89002E19D3A7DC35DAFBF083413483EF14691FC00A465B957496CA860BA4918182" + + "1CAFB50EB25330952BB11A71A44B44691CF9779999F1115497CD1CE238B452CA95622AF968E39F06E165D2EBE1991493" + + "70334D925AA47273751AC63A0EF80CDCF6331ED3324CD689BFFC90E61E9CC921C88EF5FB92B863053C4C1FABFE15301E" + + "060B2A864886F70D0109100305300F060B2A864886F70D010910030605003081883042A016041410DA1370316788112E" + + "B8594C864C2420AE7FBA420428DFBDC19AD44063478A0C125641BE274113441AD5891C78F925097F06A3DF57F3F1E6D1" + + "160F8D3C223042A016041411DA1370316788112EB8594C864C2420AE7FBA420428DFBDC19AD44063478A0C125641BE27" + + "4113441AD5891C78F925097F06A3DF57F3F1E6D1160F8D3C22302B06092A864886F70D010701301406082A864886F70D" + + "030704088AADC286F258F6D78008FC304F518A653F83").HexToByteArray(); + + EnvelopedCms ecms = new EnvelopedCms(); + ecms.Decode(encodedMessage); + + RecipientInfoCollection recipients = ecms.RecipientInfos; + Assert.Equal(2, recipients.Count); + RecipientInfo recipient0 = recipients[0]; + RecipientInfo recipient1 = recipients[1]; + + Assert.IsType(recipient0); + Assert.IsType(recipient1); + + KeyAgreeRecipientInfo recipient0Cast = recipient0 as KeyAgreeRecipientInfo; + KeyAgreeRecipientInfo recipient1Cast = recipient1 as KeyAgreeRecipientInfo; + + Assert.Equal(3, recipient0.Version); + Assert.Equal(3, recipient1.Version); + + Assert.Equal(SubjectIdentifierOrKeyType.PublicKeyInfo, recipient0Cast.OriginatorIdentifierOrKey.Type); + Assert.Equal(SubjectIdentifierOrKeyType.PublicKeyInfo, recipient1Cast.OriginatorIdentifierOrKey.Type); + + Assert.Equal(SubjectIdentifierType.SubjectKeyIdentifier, recipient0Cast.RecipientIdentifier.Type); + Assert.Equal(SubjectIdentifierType.SubjectKeyIdentifier, recipient1Cast.RecipientIdentifier.Type); + + Assert.Equal("10DA1370316788112EB8594C864C2420AE7FBA42", recipient0Cast.RecipientIdentifier.Value); + Assert.Equal("11DA1370316788112EB8594C864C2420AE7FBA42", recipient1Cast.RecipientIdentifier.Value); + } + private static KeyAgreeRecipientInfo EncodeKeyAgreel(SubjectIdentifierType type = SubjectIdentifierType.IssuerAndSerialNumber) { ContentInfo contentInfo = new ContentInfo(new byte[] { 1, 2, 3 }); @@ -328,8 +399,6 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests return (KeyAgreeRecipientInfo)recipientInfo; } - - private static byte[] s_KeyAgreeEncodedMessage = ("3082019b06092a864886f70d010703a082018c3082018802010231820154a1820150020103a08195a18192300906072a8648" + "ce3e0201038184000281806f96ef8c53a6919cc976e88b8f426696e7b7970abc6bd4abbdcf4cf34f89ceb6e8ef675000fad2" diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/KeyTransRecipientInfoTests.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/KeyTransRecipientInfoTests.cs index 6dba4cc2bc..2c0bb68ce0 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/KeyTransRecipientInfoTests.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/KeyTransRecipientInfoTests.cs @@ -116,6 +116,35 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.Equal("F2008AA9FA3742E8370CB1674CE1D1582921DCC3", ski); } + [Fact] + [OuterLoop(/* Leaks key on disk if interrupted */)] + public static void TestKeyTransRecipientIdValue_ExplicitSki_RoundTrip() + { + ContentInfo contentInfo = new ContentInfo(new byte[] { 1, 2, 3 }); + EnvelopedCms ecms = new EnvelopedCms(contentInfo); + using (X509Certificate2 cert = Certificates.RSAKeyTransfer_ExplicitSki.GetCertificate()) + { + CmsRecipient cmsRecipient = new CmsRecipient(SubjectIdentifierType.SubjectKeyIdentifier, cert); + ecms.Encrypt(cmsRecipient); + } + byte[] encodedMessage = ecms.Encode(); + + EnvelopedCms ecms2 = new EnvelopedCms(); + ecms2.Decode(encodedMessage); + + RecipientInfoCollection recipients = ecms2.RecipientInfos; + Assert.Equal(1, recipients.Count); + RecipientInfo recipientInfo = recipients[0]; + Assert.IsType(recipientInfo); + KeyTransRecipientInfo recipient = (KeyTransRecipientInfo)recipientInfo; + + SubjectIdentifier subjectIdentifier = recipient.RecipientIdentifier; + object value = subjectIdentifier.Value; + Assert.IsType(value); + string ski = (string)value; + Assert.Equal("01952851C55DB594B0C6167F5863C5B6B67AEFE6", ski); + } + [Fact] public static void TestKeyTransRecipientIdValue_Ski_FixedValue() { @@ -183,7 +212,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests RecipientInfoCollection recipients = ecms2.RecipientInfos; Assert.Equal(1, recipients.Count); RecipientInfo recipientInfo = recipients[0]; - Assert.True(recipientInfo is KeyTransRecipientInfo); + Assert.IsType(recipientInfo); return (KeyTransRecipientInfo)recipientInfo; } @@ -210,7 +239,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests RecipientInfoCollection recipients = ecms.RecipientInfos; Assert.Equal(1, recipients.Count); RecipientInfo recipientInfo = recipients[0]; - Assert.True(recipientInfo is KeyTransRecipientInfo); + Assert.IsType(recipientInfo); return (KeyTransRecipientInfo)recipientInfo; } diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/StateTests.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/StateTests.cs index 19a0ba344b..fc4b143b0b 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/StateTests.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/StateTests.cs @@ -180,6 +180,24 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.Equal(expectedContentInfo.Content, actualContentInfo.Content); } + [Fact] + [OuterLoop(/* Leaks key on disk if interrupted */)] + public static void PostEncrypt_Certs() + { + ContentInfo expectedContentInfo = new ContentInfo(new byte[] { 1, 2, 3 }); + EnvelopedCms ecms = new EnvelopedCms(expectedContentInfo); + ecms.Certificates.Add(Certificates.RSAKeyTransfer2.GetCertificate()); + ecms.Certificates.Add(Certificates.RSAKeyTransfer3.GetCertificate()); + + using (X509Certificate2 cert = Certificates.RSAKeyTransfer1.GetCertificate()) + { + ecms.Encrypt(new CmsRecipient(cert)); + } + + Assert.Equal(Certificates.RSAKeyTransfer2.GetCertificate(), ecms.Certificates[0]); + Assert.Equal(Certificates.RSAKeyTransfer3.GetCertificate(), ecms.Certificates[1]); + } + // // State 3: Called Decode() // @@ -372,6 +390,40 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.ThrowsAny(() => ecms.Decrypt(r[1], extraStore)); } } + + [Fact] + public static void PostEncode_DifferentData() + { + // This ensures that the decoding and encoding output different values to make sure Encrypt changes the state of the data. + byte[] encoded = + ("3082010206092A864886F70D010703A081F43081F10201003181C83081C5020100302E301A311830160603550403130F" + + "5253414B65795472616E7366657231021031D935FB63E8CFAB48A0BF7B397B67C0300D06092A864886F70D0101010500" + + "04818009C16B674495C2C3D4763189C3274CF7A9142FBEEC8902ABDC9CE29910D541DF910E029A31443DC9A9F3B05F02" + + "DA1C38478C400261C734D6789C4197C20143C4312CEAA99ECB1849718326D4FC3B7FBB2D1D23281E31584A63E99F2C17" + + "132BCD8EDDB632967125CD0A4BAA1EFA8CE4C855F7C093339211BDF990CEF5CCE6CD74302106092A864886F70D010701" + + "301406082A864886F70D03070408779B3DE045826B18").HexToByteArray(); + EnvelopedCms ecms = new EnvelopedCms(); + ecms.Decode(encoded); + using (X509Certificate2 cert = Certificates.RSAKeyTransfer1.GetCertificate()) + { + ecms.Encrypt(new CmsRecipient(cert)); + } + + byte[] encrypted = ecms.Encode(); + + Assert.NotEqual(encoded, encrypted); + } + + private static void AssertEncryptedContentEqual(byte[] expected, byte[] actual) + { + if (expected.SequenceEqual(actual)) + return; + + if (actual.Length > expected.Length && actual.Take(expected.Length).SequenceEqual(expected)) + throw new Exception("Returned content had extra bytes padded. If you're running this test on the desktop framework, this is a known bug."); + + Assert.Equal(expected, actual); + } } } diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/UnprotectedAttributeTests.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/UnprotectedAttributeTests.cs index 5c797fe3fc..6c22bb3956 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/UnprotectedAttributeTests.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/UnprotectedAttributeTests.cs @@ -2,15 +2,8 @@ // 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.IO; using System.Linq; -using System.Globalization; using System.Collections.Generic; -using System.Security.Cryptography; -using System.Runtime.InteropServices; -using System.Text; -using System.Security.Cryptography.Pkcs; -using System.Security.Cryptography.Xml; using System.Security.Cryptography.X509Certificates; using Xunit; @@ -412,6 +405,73 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests Assert.True(a is Pkcs9AttributeObject); } + [Fact] + [OuterLoop(/* Leaks key on disk if interrupted */)] + public static void PostEncrypt_UnprotectedAttributes() + { + byte[] docDescription = ("041E4D00790020004400650073006300720069007000740069006F006E000000").HexToByteArray(); + byte[] docName1 = ("0410AA00790020004E0061006D0065000000").HexToByteArray(); + byte[] docName2 = ("04104D00790020004E0061006D0065000000").HexToByteArray(); + ContentInfo expectedContentInfo = new ContentInfo(new byte[] { 1, 2, 3 }); + EnvelopedCms ecms = new EnvelopedCms(expectedContentInfo); + AsnEncodedData[] attributes = { + new AsnEncodedData(Oids.DocumentName, docName1), + new AsnEncodedData(Oids.DocumentName, docName2), + new AsnEncodedData(Oids.DocumentDescription, docDescription)}; + + foreach (AsnEncodedData attribute in attributes) + { + ecms.UnprotectedAttributes.Add(attribute); + } + + AsnEncodedData[] before = ecms.UnprotectedAttributes.FlattenAndSort(); + + using (X509Certificate2 cert = Certificates.RSAKeyTransfer1.GetCertificate()) + { + ecms.Encrypt(new CmsRecipient(cert)); + } + + AsnEncodedData[] after = ecms.UnprotectedAttributes.FlattenAndSort(); + + // There are three objects, but ecms.UnprotectedAttributes.Count returns the count of different Oids, + // not the amount of objects inside. + Assert.Equal(2, ecms.UnprotectedAttributes.Count); + + Assert.Equal(before.Length, after.Length); + for (int i = 0; i(() => ign = new Pkcs9AttributeObject(a)); } + [Fact] + public static void InputDateTimeAsX509TimeBefore1950_Utc() + { + DateTime dt = new DateTime(1949, 12, 31, 23, 59, 59, DateTimeKind.Utc); + Assert.ThrowsAny(() => new Pkcs9SigningTime(dt)); + } + + [Fact] + public static void InputDateTimeAsX509TimeBefore1950_Unspecified() + { + DateTime dt = new DateTime(1949, 12, 30); + Assert.ThrowsAny(() => new Pkcs9SigningTime(dt)); + } + + [Fact] + public static void InputDateTimeAsX509TimeBefore1950_Local() + { + DateTime dt = new DateTime(1949, 12, 30, 00, 00, 00, DateTimeKind.Local); + Assert.ThrowsAny(() => new Pkcs9SigningTime(dt)); + } + + [Fact] + public static void InputDateTimeAsX509TimeAfter2049_Utc() + { + DateTime dt = new DateTime(2050, 01, 01, 00, 00, 00, DateTimeKind.Utc); + Assert.ThrowsAny(() => new Pkcs9SigningTime(dt)); + } + + [Fact] + public static void InputDateTimeAsX509TimeAfter2049_Unspecified() + { + DateTime dt = new DateTime(2050, 01, 02); + Assert.ThrowsAny(() => new Pkcs9SigningTime(dt)); + } + + [Fact] + public static void InputDateTimeAsX509TimeAfter2049_Local() + { + DateTime dt = new DateTime(2050, 01, 02, 00, 00, 00, DateTimeKind.Local); + Assert.ThrowsAny(() => new Pkcs9SigningTime(dt)); + } + + [Fact] + public static void InputDateTimeAsX509TimeBetween1950And2049_Utc() + { + var exception = Record.Exception(() => { + DateTime dt = new DateTime(1950, 1, 1, 00, 00, 00, DateTimeKind.Utc); + Pkcs9SigningTime st = new Pkcs9SigningTime(dt); + dt = new DateTime(2049, 12, 31, 23, 59, 59, DateTimeKind.Utc); + st = new Pkcs9SigningTime(dt); + + dt = new DateTime(1950, 1, 2); + st = new Pkcs9SigningTime(dt); + dt = new DateTime(2049, 12, 30); + st = new Pkcs9SigningTime(dt); + + dt = new DateTime(1950, 1, 2, 00, 00, 00, DateTimeKind.Local); + st = new Pkcs9SigningTime(dt); + dt = new DateTime(2049, 12, 30, 23, 59, 59, DateTimeKind.Local); + st = new Pkcs9SigningTime(dt); + }); + Assert.Null(exception); + } [Fact] public static void Pkcs9AttributeAsnEncodedDataCtorNullOidValue() @@ -166,6 +219,7 @@ namespace System.Security.Cryptography.Pkcs.Tests // the default constructor initializes with DateTime.Now. Assert.NotNull(p.RawData); + Assert.Equal(DateTimeKind.Local, p.SigningTime.Kind); string oid = p.Oid.Value; Assert.Equal(s_OidSigningTime, oid); } @@ -178,13 +232,14 @@ namespace System.Security.Cryptography.Pkcs.Tests Pkcs9SigningTime p = new Pkcs9SigningTime(rawData); Assert.Equal(rawData, p.RawData); DateTime cookedData = p.SigningTime; + Assert.Equal(DateTimeKind.Utc, cookedData.Kind); Assert.Equal(dateTime, cookedData); string oid = p.Oid.Value; Assert.Equal(s_OidSigningTime, oid); } [Fact] - public static void SigningTimeFromCookedData() + public static void SigningTimeFromCookedData_Unspecified() { DateTime dateTime = new DateTime(2015, 4, 1); Pkcs9SigningTime p = new Pkcs9SigningTime(dateTime); @@ -194,6 +249,35 @@ namespace System.Security.Cryptography.Pkcs.Tests Pkcs9SigningTime p2 = new Pkcs9SigningTime(p.RawData); DateTime cookedData = p2.SigningTime; Assert.Equal(dateTime, cookedData); + Assert.Equal(DateTimeKind.Utc, cookedData.Kind); + } + + [Fact] + public static void SigningTimeFromCookedData_Local() + { + DateTime dateTime = new DateTime(2015, 4, 1, 0, 0, 0, DateTimeKind.Local); + Pkcs9SigningTime p = new Pkcs9SigningTime(dateTime); + string oid = p.Oid.Value; + Assert.Equal(s_OidSigningTime, oid); + + Pkcs9SigningTime p2 = new Pkcs9SigningTime(p.RawData); + DateTime cookedData = p2.SigningTime; + Assert.Equal(dateTime, cookedData.ToLocalTime()); + Assert.Equal(DateTimeKind.Utc, cookedData.Kind); + } + + [Fact] + public static void SigningTimeFromCookedData_Utc() + { + DateTime dateTime = new DateTime(2015, 4, 1, 0, 0, 0, DateTimeKind.Utc); + Pkcs9SigningTime p = new Pkcs9SigningTime(dateTime); + string oid = p.Oid.Value; + Assert.Equal(s_OidSigningTime, oid); + + Pkcs9SigningTime p2 = new Pkcs9SigningTime(p.RawData); + DateTime cookedData = p2.SigningTime; + Assert.Equal(dateTime, cookedData); + Assert.Equal(DateTimeKind.Utc, cookedData.Kind); } [Fact] diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/Rfc3161/TimestampRequestTests.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/Rfc3161/TimestampRequestTests.cs new file mode 100644 index 0000000000..cac3c984f3 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/Rfc3161/TimestampRequestTests.cs @@ -0,0 +1,783 @@ +// 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.Reflection; +using System.Security.Cryptography.X509Certificates; +using Test.Cryptography; +using Xunit; + +namespace System.Security.Cryptography.Pkcs.Tests +{ + public static class TimestampRequestTests + { + [Theory] + [InlineData(false)] + [InlineData(true)] + public static void BuildExpectedRequest_FromData(bool viaSpan) + { + Rfc3161TimestampRequest request = Rfc3161TimestampRequest.CreateFromData( + System.Text.Encoding.ASCII.GetBytes("Hello, world!!"), + HashAlgorithmName.SHA256, + requestSignerCertificates: true); + + VerifyExpectedRequest(request, viaSpan); + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public static void BuildExpectedRequest_FromHashAndName(bool viaSpan) + { + Rfc3161TimestampRequest request = Rfc3161TimestampRequest.CreateFromHash( + "11806C2441295EA697EA96EE4247C0F9C71EE7638863CB8E29CD941A488FCB5A".HexToByteArray(), + HashAlgorithmName.SHA256, + requestSignerCertificates: true); + + VerifyExpectedRequest(request, viaSpan); + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public static void BuildExpectedRequest_FromHashAndOid(bool viaSpan) + { + Oid hashAlgorithmId = new Oid("2.16.840.1.101.3.4.2.1", "Nothing should read this friendly name"); + + Rfc3161TimestampRequest request = Rfc3161TimestampRequest.CreateFromHash( + "11806C2441295EA697EA96EE4247C0F9C71EE7638863CB8E29CD941A488FCB5A".HexToByteArray(), + hashAlgorithmId, + requestSignerCertificates: true); + + Assert.NotSame(hashAlgorithmId, request.HashAlgorithmId); + Assert.Equal(hashAlgorithmId.Value, request.HashAlgorithmId.Value); + + VerifyExpectedRequest(request, viaSpan); + } + + private static void VerifyExpectedRequest(Rfc3161TimestampRequest request, bool viaSpan) + { + // Captured with Fiddler from a CryptRetrieveTimestamp call + const string ExpectedHex = + "30390201013031300D06096086480165030402010500042011806C2441295EA6" + + "97EA96EE4247C0F9C71EE7638863CB8E29CD941A488FCB5A0101FF"; + + Assert.Equal(1, request.Version); + Assert.Equal( + "11806C2441295EA697EA96EE4247C0F9C71EE7638863CB8E29CD941A488FCB5A", + request.GetMessageHash().ByteArrayToHex()); + + Assert.False(request.GetNonce().HasValue, "request.GetNonce().HasValue"); + Assert.Equal("2.16.840.1.101.3.4.2.1", request.HashAlgorithmId.Value); + Assert.Null(request.RequestedPolicyId); + Assert.True(request.RequestSignerCertificate, "request.RequestSignerCertificate"); + Assert.False(request.HasExtensions); + + if (viaSpan) + { + // Twice as big as it needs to be. + byte[] buf = new byte[ExpectedHex.Length]; + + const byte FillByte = 0x55; + buf.AsSpan().Fill(FillByte); + + // Too small + Assert.False(request.TryEncode(Span.Empty, out int bytesWritten)); + Assert.Equal(0, bytesWritten); + + const int WriteOffset = 7; + + // Too small + Span dest = new Span(buf, WriteOffset, (ExpectedHex.Length / 2) - 1); + Assert.False(request.TryEncode(dest, out bytesWritten)); + Assert.Equal(0, bytesWritten); + + Assert.Equal(new string('5', buf.Length * 2), buf.ByteArrayToHex()); + + // Bigger than needed + dest = new Span(buf, WriteOffset, buf.Length - WriteOffset); + Assert.True(request.TryEncode(dest, out bytesWritten)); + Assert.Equal(ExpectedHex.Length / 2, bytesWritten); + Assert.Equal(ExpectedHex, dest.Slice(0, bytesWritten).ByteArrayToHex()); + + Assert.Equal(FillByte, buf[WriteOffset - 1]); + Assert.Equal(FillByte, buf[WriteOffset + bytesWritten]); + + // Reset + dest.Fill(FillByte); + + // Perfectly sized + dest = dest.Slice(0, bytesWritten); + Assert.True(request.TryEncode(dest, out bytesWritten)); + Assert.Equal(ExpectedHex.Length / 2, bytesWritten); + Assert.Equal(ExpectedHex, dest.ByteArrayToHex()); + + Assert.Equal(FillByte, buf[WriteOffset - 1]); + Assert.Equal(FillByte, buf[WriteOffset + bytesWritten]); + } + else + { + byte[] encoded = request.Encode(); + + Assert.Equal(ExpectedHex, encoded.ByteArrayToHex()); + } + } + + [Fact] + public static void BuildFromSignerInfo() + { + ContentInfo content = new ContentInfo(new byte[] { 1, 2, 3, 4 }); + SignedCms cms = new SignedCms(content, false); + + using (X509Certificate2 signerCert = Certificates.RSAKeyTransferCapi1.TryGetCertificateWithPrivateKey()) + { + CmsSigner signer = new CmsSigner(SubjectIdentifierType.SubjectKeyIdentifier, signerCert); + signer.SignedAttributes.Add(new Pkcs9SigningTime()); + cms.ComputeSignature(signer); + } + + SignerInfo signerInfo = cms.SignerInfos[0]; + byte[] sig = signerInfo.GetSignature(); + + Rfc3161TimestampRequest fromSigner = Rfc3161TimestampRequest.CreateFromSignerInfo(signerInfo, HashAlgorithmName.SHA256); + Rfc3161TimestampRequest fromData = Rfc3161TimestampRequest.CreateFromData(sig, HashAlgorithmName.SHA256); + + Assert.Equal(fromData.Encode().ByteArrayToHex(), fromSigner.Encode().ByteArrayToHex()); + } + + [Fact] + public static void BuildFromNullSignerInfo() + { + AssertExtensions.Throws( + "signerInfo", + () => Rfc3161TimestampRequest.CreateFromSignerInfo(null, HashAlgorithmName.SHA256)); + } + + [Fact] + public static void BuildWithAllOptions() + { + byte[] data = { 1, 9, 7, 5, 0, 4, 0, 4 }; + Oid requestedPolicyOid = new Oid("1.2.3", "1.2.3"); + byte[] nonce = "0123456789".HexToByteArray(); + + X509ExtensionCollection extensionsIn = new X509ExtensionCollection + { + new X509Extension("1.2.3.4.5", new byte[] { 0x05, 0x00 }, false), + new X509Extension("0.1.2", new byte[] { 0x04, 0x00 }, false), + }; + + Rfc3161TimestampRequest req = Rfc3161TimestampRequest.CreateFromData( + data, + HashAlgorithmName.SHA512, + requestedPolicyOid, + nonce, + true, + extensionsIn); + + Assert.NotNull(req); + Assert.Equal(512 / 8, req.GetMessageHash().Length); + Assert.Equal(Oids.Sha512, req.HashAlgorithmId.Value); + Assert.NotNull(req.RequestedPolicyId); + Assert.NotSame(requestedPolicyOid, req.RequestedPolicyId); + Assert.Equal(requestedPolicyOid.Value, req.RequestedPolicyId.Value); + Assert.True(req.GetNonce().HasValue, "req.GetNonce().HasValue"); + Assert.Equal(nonce.ByteArrayToHex(), req.GetNonce().Value.ByteArrayToHex()); + Assert.True(req.RequestSignerCertificate, "req.RequestSignerCertificate"); + Assert.True(req.HasExtensions, "req.HasExtensions"); + + X509ExtensionCollection extensionsOut = req.GetExtensions(); + + Assert.NotSame(extensionsIn, extensionsOut); + Assert.Equal(extensionsIn.Count, extensionsOut.Count); + Assert.NotSame(extensionsIn[0], extensionsOut[0]); + Assert.NotSame(extensionsIn[0], extensionsOut[1]); + Assert.NotSame(extensionsIn[1], extensionsOut[0]); + Assert.NotSame(extensionsIn[1], extensionsOut[1]); + + // Extensions is order-preserving + Assert.Equal(extensionsIn[0].Oid.Value, extensionsOut[0].Oid.Value); + Assert.Equal(extensionsIn[0].RawData, extensionsOut[0].RawData); + + Assert.Equal(extensionsIn[1].Oid.Value, extensionsOut[1].Oid.Value); + Assert.Equal(extensionsIn[1].RawData, extensionsOut[1].RawData); + } + + [Theory] + [InlineData(true)] + [InlineData(false)] + public static void TryDecode_WithExtensions(bool withExcessData) + { + const string PaddingHex = "0403010203"; + + byte[] inputBytes = ( + "307C0201013051300D06096086480165030402030500044060EDD3D91924EC2A2AABA0BD16997" + + "4AF5A04BC5495342871CF52EF9AF8DF36BAB5B2E456B26C00B42147626C5ADDAAC986291091FA" + + "7387D504A5BF62427176AD06022A03020501234567890101FFA016300A06042A0304050402050" + + "030080602010204020400" + PaddingHex).HexToByteArray(); + + var dataRange = new ReadOnlyMemory(inputBytes, 0, inputBytes.Length - PaddingHex.Length / 2); + + ReadOnlyMemory toUse = withExcessData ? inputBytes : dataRange; + + Rfc3161TimestampRequest request; + int bytesRead; + + Assert.True(Rfc3161TimestampRequest.TryDecode(toUse, out request, out bytesRead), "TryDecode"); + Assert.Equal(dataRange.Length, bytesRead); + Assert.NotNull(request); + + const string ExpectedHashHex = + "60EDD3D91924EC2A2AABA0BD169974AF5A04BC5495342871CF52EF9AF8DF36BA" + + "B5B2E456B26C00B42147626C5ADDAAC986291091FA7387D504A5BF62427176AD"; + + Assert.Equal(1, request.Version); + Assert.Equal(ExpectedHashHex, request.GetMessageHash().ByteArrayToHex()); + Assert.Equal(Oids.Sha512, request.HashAlgorithmId.Value); + Assert.NotNull(request.RequestedPolicyId); + Assert.Equal("1.2.3", request.RequestedPolicyId.Value); + Assert.True(request.GetNonce().HasValue, "request.GetNonce().HasValue"); + Assert.Equal("0123456789", request.GetNonce().Value.ByteArrayToHex()); + Assert.True(request.RequestSignerCertificate, "request.RequestSignerCertificate"); + Assert.True(request.HasExtensions, "request.HasExtensions"); + + X509ExtensionCollection extensions = request.GetExtensions(); + Assert.Equal(2, extensions.Count); + Assert.Equal("1.2.3.4.5", extensions[0].Oid.Value); + Assert.Equal("0500", extensions[0].RawData.ByteArrayToHex()); + Assert.Equal("0.1.2", extensions[1].Oid.Value); + Assert.Equal("0400", extensions[1].RawData.ByteArrayToHex()); + } + + [Theory] + [InlineData(Rfc3161RequestResponseStatus.Accepted, 0)] + [InlineData(Rfc3161RequestResponseStatus.HashMismatch, 0)] + [InlineData(Rfc3161RequestResponseStatus.HashMismatch, 1)] + [InlineData(Rfc3161RequestResponseStatus.NonceMismatch, 0)] + [InlineData(Rfc3161RequestResponseStatus.UnexpectedCertificates, 0)] + [InlineData(Rfc3161RequestResponseStatus.RequestFailed, 0)] + [InlineData(Rfc3161RequestResponseStatus.DoesNotParse, 0)] + [InlineData(Rfc3161RequestResponseStatus.DoesNotParse, 1)] + [InlineData(Rfc3161RequestResponseStatus.DoesNotParse, 2)] + [InlineData(Rfc3161RequestResponseStatus.DoesNotParse, 3)] + [InlineData(Rfc3161RequestResponseStatus.DoesNotParse, 4)] + [InlineData(Rfc3161RequestResponseStatus.DoesNotParse, 5)] + [InlineData(Rfc3161RequestResponseStatus.DoesNotParse, 6)] + [InlineData(Rfc3161RequestResponseStatus.DoesNotParse, 7)] + public static void ProcessResponse_FreeTsa_WithCerts_NoNonce(Rfc3161RequestResponseStatus expectedStatus, int variant) + { + const string Padding = "0400"; + + string inputHex = + "30820D2D300302010030820D2406092A864886F70D010702A0820D1530820D11" + + "020103310B300906052B0E03021A050030820196060B2A864886F70D01091001" + + "04A0820185048201813082017D02010106042A0304013031300D060960864801" + + "65030402010500042011806C2441295EA697EA96EE4247C0F9C71EE7638863CB" + + "8E29CD941A488FCB5A020306A5C1181632303138303130343136353634302E35" + + "39373334385A300A020101800201F48101640101FFA0820111A482010D308201" + + "093111300F060355040A13084672656520545341310C300A060355040B130354" + + "534131763074060355040D136D54686973206365727469666963617465206469" + + "676974616C6C79207369676E7320646F63756D656E747320616E642074696D65" + + "207374616D70207265717565737473206D616465207573696E67207468652066" + + "7265657473612E6F7267206F6E6C696E65207365727669636573311830160603" + + "550403130F7777772E667265657473612E6F72673122302006092A864886F70D" + + "0109011613627573696C657A617340676D61696C2E636F6D3112301006035504" + + "071309577565727A62757267310B3009060355040613024445310F300D060355" + + "0408130642617965726EA082080530820801308205E9A003020102020900C1E9" + + "86160DA8E982300D06092A864886F70D01010D05003081953111300F06035504" + + "0A130846726565205453413110300E060355040B1307526F6F74204341311830" + + "160603550403130F7777772E667265657473612E6F72673122302006092A8648" + + "86F70D0109011613627573696C657A617340676D61696C2E636F6D3112301006" + + "035504071309577565727A62757267310F300D0603550408130642617965726E" + + "310B3009060355040613024445301E170D3136303331333031353733395A170D" + + "3236303331313031353733395A308201093111300F060355040A130846726565" + + "20545341310C300A060355040B130354534131763074060355040D136D546869" + + "73206365727469666963617465206469676974616C6C79207369676E7320646F" + + "63756D656E747320616E642074696D65207374616D7020726571756573747320" + + "6D616465207573696E672074686520667265657473612E6F7267206F6E6C696E" + + "65207365727669636573311830160603550403130F7777772E66726565747361" + + "2E6F72673122302006092A864886F70D0109011613627573696C657A61734067" + + "6D61696C2E636F6D3112301006035504071309577565727A62757267310B3009" + + "060355040613024445310F300D0603550408130642617965726E30820222300D" + + "06092A864886F70D01010105000382020F003082020A0282020100B591048C4E" + + "486F34E9DC08627FC2375162236984B82CB130BEFF517CFC38F84BCE5C65A874" + + "DAB2621AE0BCE7E33563E0EDE934FD5F8823159F07848808227460C1ED882617" + + "06F4281334359DFBB81BD1353FC179610AF1A8C8C865DC00EA23B3A89BE6BD03" + + "BA85A9EC827D60565905E22D6A584ED1380AE150280CEE397E98A012F3804640" + + "07862443BC077CB95F421AF31712D9683CDB6DFFBAF3C8BA5BA566AE523D459D" + + "6177346D4D840E27886B7C01C5B890D78A2E27BBA8DD2F9A2812E157D62F921C" + + "65962548069DCDB7D06DE181DE0E9570D66F87220CE28B628AB55906F3EE0C21" + + "0F7051E8F4858AF8B9A92D09E46AF2D9CBA5BFCFAD168CDF604491A4B06603B1" + + "14CAF7031F065E7EEEFA53C575F3490C059D2E32DDC76AC4D4C4C710683B97FD" + + "1BE591BC61055186D88F9A0391B307B6F91ED954DAA36F9ACD6A1E14AA2E4ADF" + + "17464B54DB18DBB6FFE30080246547370436CE4E77BAE5DE6FE0F3F9D6E7FFBE" + + "B461E794E92FB0951F8AAE61A412CCE9B21074635C8BE327AE1A0F6B4A646EB0" + + "F8463BC63BF845530435D19E802511EC9F66C3496952D8BECB69B0AA4D4C41F6" + + "0515FE7DCBB89319CDDA59BA6AEA4BE3CEAE718E6FCB6CCD7DB9FC50BB15B12F" + + "3665B0AA307289C2E6DD4B111CE48BA2D9EFDB5A6B9A506069334FB34F6FC7AE" + + "330F0B34208AAC80DF3266FDD90465876BA2CB898D9505315B6E7B0203010001" + + "A38201DB308201D730090603551D1304023000301D0603551D0E041604146E76" + + "0B7B4E4F9CE160CA6D2CE927A2A294B37737301F0603551D23041830168014FA" + + "550D8C346651434CF7E7B3A76C95AF7AE6A497300B0603551D0F0404030206C0" + + "30160603551D250101FF040C300A06082B06010505070308306306082B060105" + + "0507010104573055302A06082B06010505073002861E687474703A2F2F777777" + + "2E667265657473612E6F72672F7473612E637274302706082B06010505073001" + + "861B687474703A2F2F7777772E667265657473612E6F72673A32353630303706" + + "03551D1F0430302E302CA02AA0288626687474703A2F2F7777772E6672656574" + + "73612E6F72672F63726C2F726F6F745F63612E63726C3081C60603551D200481" + + "BE3081BB3081B80601003081B2303306082B060105050702011627687474703A" + + "2F2F7777772E667265657473612E6F72672F667265657473615F6370732E6874" + + "6D6C303206082B060105050702011626687474703A2F2F7777772E6672656574" + + "73612E6F72672F667265657473615F6370732E706466304706082B0601050507" + + "0202303B1A394672656554534120747275737465642074696D657374616D7069" + + "6E6720536F667477617265206173206120536572766963652028536161532930" + + "0D06092A864886F70D01010D05000382020100A5C944E2C6FAC0A14D930A7FD0" + + "A0B172B41FC1483C3E957C68A2BCD9B9764F1A950161FD72472D41A5EED27778" + + "6203B5422240FB3A26CDE176087B6FB1011DF4CC19E2571AA4A051109665E94C" + + "46F50BD2ADEE6AC4137E251B25A39DABDA451515D8FF9E07209E8EC20B7874F7" + + "E1A0EDE7C00937FE84A334F8B3265CED2D8ED9DF61396583677FEB382C1EE3B2" + + "3E6EA5F05DF30DE7B9F89005D25266F612F39C8B4F6DABA6D7BFBAC19632B906" + + "37329F52A6F066A10E43EAA81F849A6C5FE3FE8B5EA23275F687F2052E502EA6" + + "C30762A668CCE07871DD8E97E315BBA929E25589977A0A312CE96C5106B1437C" + + "779F2B361B182888F3EE8A234374FA063E956192627F7C431073965D1260928E" + + "BA009E803429AE324CF96F042354F37BCA5AFDDC79F79346AB388BFC79F01DC9" + + "861254EA6CC129941076B83D20556F3BE51326837F2876F7833B370E7C3D4105" + + "23827D4F53400C72218D75229FF10C6F8893A9A3A1C0C42BB4C898C13DF41C7F" + + "6573B4FC56515971A610A7B0D2857C8225A9FB204EACECA2E8971AA1AF87886A" + + "2AE3C72FE0A0AAE842980A77BEF16B92115458090D982B5946603764E75A0AD3" + + "D11454B9986F678B9AB6AFE8497033AE3ABFD4EB43B7BC9DEE68815949E64815" + + "82A82E785277F2282107EFE390200E0508ACB8EA82EA2505276F3C9DA2A3D3B4" + + "AD38BBF8842BDA36FC2448291F558DC02DD1E03182035A308203560201013081" + + "A33081953111300F060355040A130846726565205453413110300E060355040B" + + "1307526F6F74204341311830160603550403130F7777772E667265657473612E" + + "6F72673122302006092A864886F70D0109011613627573696C657A617340676D" + + "61696C2E636F6D3112301006035504071309577565727A62757267310F300D06" + + "03550408130642617965726E310B3009060355040613024445020900C1E98616" + + "0DA8E982300906052B0E03021A0500A0818C301A06092A864886F70D01090331" + + "0D060B2A864886F70D0109100104301C06092A864886F70D010905310F170D31" + + "38303130343136353634305A302306092A864886F70D01090431160414029AC1" + + "0A42471FBD0586C107BE51F79FA3080004302B060B2A864886F70D010910020C" + + "311C301A301830160414916DA3D860ECCA82E34BC59D1793E7E968875F14300D" + + "06092A864886F70D01010105000482020093555D4EA36895232E8D8E3FBAFFD1" + + "B625FF0C61363411AD1ECF5A53DEBC6A233046539971BD8B50EEAC06E8CE72F2" + + "DC12C28C01F3AEC0D8276955703E88FD043829F7E67A1781C5BBB949897FBD12" + + "9ED0E81F252E35FE3E398453783C136A6FAC9B2F519936079C878AF389324D72" + + "83C0396A94B432C52344BDC9F561110894978900B0EA8121AB937341A08F1BF3" + + "109C41871CD81456C45F41DA306E164F143FCA9FC708C545B6F9A7032541C2AB" + + "8B6A8C37114AB66AC142226C740EA695E701E434AE225A488E0484089C785F3D" + + "873FCE5D8A8D75DE6AA6AB5915C5C11CE76263A463DF4BA07FE164D989DB9055" + + "54B4207A2C622DF10808F0078F40CC75C7B2B9C161C11A17231C2EFABEB50047" + + "E7FD76B13A011225ECFB9C8185E82A724C9175C4763D6353F1C3992AE9E6EF0D" + + "6D32867DF84CD98F55AD0E1B260B48899019FA903F257FCC2DBA5893FF840A99" + + "E22EB0B20E43868C75A2463E38740B79AF183CD5B6AE50D1D6FE5C2D397C2257" + + "87C682AF575A7554201725C444747FD6C4644B0029B3BBFE39265ADA82020D5C" + + "7EB9DEAAA4EEF9EF404CEEC73C4BC907E0E4006BD9CAA41852F12BE13B1279AF" + + "62D502B5A721B4A4ABE3939DBE114E7C473F29719D1B580E8CE92BE2143E8DFA" + + "480C07A6CAE881893678BDF0828F7286E47D76A251C6899F41C75728AFADABE6" + + "6A47E3E28EB64E734356A6374E4CB05EC3" + Padding; + + byte[] inputBytes = inputHex.HexToByteArray(); + ReadOnlyMemory? nonce = null; + HashAlgorithmName hashAlgorithmName = HashAlgorithmName.SHA256; + byte[] hash = "11806C2441295EA697EA96EE4247C0F9C71EE7638863CB8E29CD941A488FCB5A".HexToByteArray(); + + if (expectedStatus == Rfc3161RequestResponseStatus.NonceMismatch) + { + nonce = new byte[] { 9, 8, 7, 6 }; + } + else if (expectedStatus == Rfc3161RequestResponseStatus.HashMismatch) + { + if (variant == 0) + { + hash[0] ^= 0xFF; + } + else + { + hashAlgorithmName = HashAlgorithmName.SHA384; + } + } + else if (expectedStatus == Rfc3161RequestResponseStatus.RequestFailed) + { + // Address determined by data inspection + Assert.Equal(0, inputBytes[8]); + inputBytes[8] = 3; + } + else if (expectedStatus == Rfc3161RequestResponseStatus.VersionTooNew) + { + // Address determined by data inspection + Assert.Equal(1, inputBytes[79]); + inputBytes[79] = 2; + } + else if (expectedStatus == Rfc3161RequestResponseStatus.DoesNotParse) + { + if (variant == 0) + { + // Change the PkiStatus from a SEQUENCE to a SET. + + // Address determined by data inspection + Assert.Equal(0x30, inputBytes[4]); + inputBytes[4] = 0x31; + } + else if (variant == 1) + { + // Change the SET OF (digestAlgorithms) in the token CMS to SEQUENCE OF + + // Address determined by data inspection + Assert.Equal(0x31, inputBytes[35]); + inputBytes[35] = 0x30; + } + else if (variant == 2) + { + // Change the id-signedData value to id-data. + + // Address determined by data inspection + Assert.Equal(2, inputBytes[23]); + inputBytes[23] = 1; + } + else if (variant == 3) + { + // Change the id-ct-TSTInfo into id-ct-receipt + + // Address determined by data inspection + Assert.Equal(4, inputBytes[64]); + inputBytes[64] = 1; + } + else if (variant == 4) + { + // Change the id-aa-signing-certificate into id-aa-content-hint + // Now the signer has no ESSCertId (and it already doesn't have an ESSCertIdV2) + + // Address determined by data inspection + Assert.Equal(12, inputBytes[2815]); + inputBytes[2815] = 4; + } + else if (variant == 5) + { + // Alter a byte in the certificate required hash value, ESSCertId mismatches + + // Address determined by data inspection + Assert.Equal(0xD8, inputBytes[2829]); + inputBytes[2829] ^= 0xFF; + } + else if (variant == 6) + { + // Alter the signerInfo signature algorithm to say it's the PKCS#1 module + + // Address determined by data inspection + Assert.Equal(1, inputBytes[2858]); + inputBytes[2858] = 0; + } + else if (variant == 7) + { + // Change the TSTInfo.Version value, which breaks the signature. + + // Address determined by data inspection + Assert.Equal(1, inputBytes[79]); + inputBytes[79] = 2; + } + else if (variant == 7) + { + // Change one of the SEQUENCE values in ESSCertId to SET + + // Address determined by data inspection + Assert.Equal(0x30, inputBytes[2820]); + inputBytes[2820] = 0x31; + } + } + + Rfc3161TimestampRequest request = Rfc3161TimestampRequest.CreateFromHash( + hash, + hashAlgorithmName, + nonce: nonce, + requestSignerCertificates: expectedStatus != Rfc3161RequestResponseStatus.UnexpectedCertificates); + + ProcessResponse(expectedStatus, request, inputBytes, Padding.Length / 2); + } + + [Theory] + [InlineData(Rfc3161RequestResponseStatus.Accepted, 0)] + [InlineData(Rfc3161RequestResponseStatus.Accepted, 1)] + [InlineData(Rfc3161RequestResponseStatus.HashMismatch, 0)] + [InlineData(Rfc3161RequestResponseStatus.HashMismatch, 1)] + [InlineData(Rfc3161RequestResponseStatus.NonceMismatch, 0)] + [InlineData(Rfc3161RequestResponseStatus.RequestedCertificatesMissing, 0)] + [InlineData(Rfc3161RequestResponseStatus.VersionTooNew, 0)] + [InlineData(Rfc3161RequestResponseStatus.DoesNotParse, 0)] + [InlineData(Rfc3161RequestResponseStatus.DoesNotParse, 1)] + [InlineData(Rfc3161RequestResponseStatus.DoesNotParse, 2)] + public static void ProcessResponse_Symantec_NoCerts_WithNonce( + Rfc3161RequestResponseStatus expectedStatus, + int variant) + { + const string Padding = "0403000000"; + + string inputHex = + "308203B23003020100308203A906092A864886F70D010702A082039A30820396" + + "020103310D300B060960864801650304020130820122060B2A864886F70D0109" + + "100104A08201110482010D30820109020101060B6086480186F8450107170330" + + "31300D06096086480165030402010500042011806C2441295EA697EA96EE4247" + + "C0F9C71EE7638863CB8E29CD941A488FCB5A021500D19949957B5677CF5F5581" + + "630A597827BA80EFD6180F32303138303130353137303931365A300302011E02" + + "0E3230313830313035313730373030A08186A48183308180310B300906035504" + + "0613025553311D301B060355040A131453796D616E74656320436F72706F7261" + + "74696F6E311F301D060355040B131653796D616E746563205472757374204E65" + + "74776F726B3131302F0603550403132853796D616E7465632053484132353620" + + "54696D655374616D70696E67205369676E6572202D2047323182025A30820256" + + "02010130818B3077310B3009060355040613025553311D301B060355040A1314" + + "53796D616E74656320436F72706F726174696F6E311F301D060355040B131653" + + "796D616E746563205472757374204E6574776F726B312830260603550403131F" + + "53796D616E746563205348413235362054696D655374616D70696E6720434102" + + "105458F2AAD741D644BC84A97BA09652E6300B0609608648016503040201A081" + + "A4301A06092A864886F70D010903310D060B2A864886F70D0109100104301C06" + + "092A864886F70D010905310F170D3138303130353137303931365A302F06092A" + + "864886F70D01090431220420ACA421A6482F4722320ECF53223F8D15099329CA" + + "4ADFD71EC562631F522C85553037060B2A864886F70D010910022F3128302630" + + "2430220420CF7AC17AD047ECD5FDC36822031B12D4EF078B6F2B4C5E6BA41F8F" + + "F2CF4BAD67300B06092A864886F70D010101048201008F4020CFAE55355A0545" + + "1A1250CCE1439A2DDD62915C81A1C7661888A74F9D0792922051CD426792D3A1" + + "ED3DC47C6AF2281A9A02ED89C605BB9FB7FD63FAF27335FE45A7681E5904C68C" + + "C30E5DBB37D127C437785F07BD2EF20C31EB0341AB2FA6F9D70C43ADA15C082E" + + "E630D64E59CBB06918F094D6B5B19C9C74DC7B203E2F86EC638761E244B279DB" + + "DAFDC87143288A488398FDFAABBAD82D992EFC9845BE9ABF19D00754E4064D24" + + "6C8B2C16012FA147B25000570F41C2BE9126082095A4CCA3E2FA3C5C694C1E6B" + + "BC7BFF4CA8EA692A07B8B9E6AB8E3114701080923A9A83DD6A4257C4248C865F" + + "C51BA0D8DA57FB5692039F4B102608AECA217204BBD4" + Padding; + + byte[] inputBytes = inputHex.HexToByteArray(); + + ReadOnlyMemory nonce = "3230313830313035313730373030".HexToByteArray(); + HashAlgorithmName hashAlgorithmName = HashAlgorithmName.SHA256; + byte[] hash = "11806C2441295EA697EA96EE4247C0F9C71EE7638863CB8E29CD941A488FCB5A".HexToByteArray(); + + if (expectedStatus == Rfc3161RequestResponseStatus.NonceMismatch) + { + nonce = new byte[] { 9, 8, 7, 6 }; + } + else if (expectedStatus == Rfc3161RequestResponseStatus.HashMismatch) + { + if (variant == 0) + { + hash[0] ^= 0xFF; + } + else + { + hashAlgorithmName = HashAlgorithmName.SHA384; + } + } + else if (expectedStatus == Rfc3161RequestResponseStatus.VersionTooNew) + { + // Change the TSTInfo.Version value. + // Since the certificate isn't embedded the signature check doesn't happen. + + // Address determined by data inspection + Assert.Equal(1, inputBytes[81]); + inputBytes[81] = 2; + } + else if (expectedStatus == Rfc3161RequestResponseStatus.DoesNotParse) + { + if (variant == 0) + { + // Change the id-aa-signing-certificateV2 into id-aa-binary-signing-time + // Now the signer has no ESSCertIdV2 (and it already doesn't have an ESSCertId) + + // Address determined by data inspection + Assert.Equal(47, inputBytes[634]); + inputBytes[634] = 46; + } + else if (variant == 1) + { + // Change one of the SEQUENCE values in ESSCertIdV2 to SET + + // Address determined by data inspection + Assert.Equal(0x30, inputBytes[639]); + inputBytes[639] = 0x31; + } + else if (variant == 2) + { + // Corrupt the structure of the TSTInfo + + // Address determined by data inspection + Assert.Equal(0x02, inputBytes[79]); + inputBytes[79] = 0x04; + } + } + else if (expectedStatus == Rfc3161RequestResponseStatus.Accepted) + { + if (variant == 1) + { + // Tamper with the hash in the ESSCertIdV2. This will be accepted because + // the cert is unknown. + + // Address determined by data inspection + Assert.Equal(0x7A, inputBytes[646]); + inputBytes[646] ^= 0xFF; + } + } + Rfc3161TimestampRequest request = Rfc3161TimestampRequest.CreateFromHash( + hash, + hashAlgorithmName, + nonce: nonce, + requestSignerCertificates: expectedStatus == Rfc3161RequestResponseStatus.RequestedCertificatesMissing); + + ProcessResponse(expectedStatus, request, inputBytes, Padding.Length / 2); + } + + private static void ProcessResponse( + Rfc3161RequestResponseStatus expectedStatus, + Rfc3161TimestampRequest request, + byte[] inputBytes, + int paddingByteCount) + { + Rfc3161TimestampToken token; + int bytesRead; + Rfc3161RequestResponseStatus status; + bool result = request.TryProcessResponse(inputBytes, out token, out status, out bytesRead); + + Assert.Equal(expectedStatus, status); + + if (expectedStatus == Rfc3161RequestResponseStatus.Accepted) + { + Assert.True(result, "request.TryProcessResponse return value"); + } + else + { + Assert.False(result, "request.TryProcessResponse return value"); + } + + if (expectedStatus == Rfc3161RequestResponseStatus.DoesNotParse) + { + Assert.Equal(0, bytesRead); + } + else + { + Assert.Equal(inputBytes.Length - paddingByteCount, bytesRead); + } + + switch (expectedStatus) + { + case Rfc3161RequestResponseStatus.Accepted: + case Rfc3161RequestResponseStatus.HashMismatch: + case Rfc3161RequestResponseStatus.NonceMismatch: + case Rfc3161RequestResponseStatus.UnexpectedCertificates: + case Rfc3161RequestResponseStatus.RequestedCertificatesMissing: + case Rfc3161RequestResponseStatus.VersionTooNew: + Assert.NotNull(token); + break; + default: + Assert.Null(token); + break; + } + + if (result) + { + Rfc3161TimestampToken token2 = request.ProcessResponse(inputBytes, out int bytesRead2); + + Assert.Equal(bytesRead, bytesRead2); + Assert.NotNull(token2); + Assert.NotSame(token, token2); + } + else + { + Assert.Throws(() => request.ProcessResponse(inputBytes, out bytesRead)); + } + } + + [Fact] + public static void EmptyNonce() + { + byte[] sha256 = new byte[256 / 8]; + + Rfc3161TimestampRequest req = Rfc3161TimestampRequest.CreateFromHash( + sha256, + HashAlgorithmName.SHA256, + nonce: Array.Empty()); + + Assert.Equal("00", req.GetNonce().Value.ByteArrayToHex()); + } + + [Fact] + public static void NegativeNonceIsMadePositive() + { + byte[] sha256 = new byte[256 / 8]; + byte[] nonce = { 0xFE }; + + Rfc3161TimestampRequest req = Rfc3161TimestampRequest.CreateFromHash( + sha256, + HashAlgorithmName.SHA256, + nonce: nonce); + + Assert.Equal("00FE", req.GetNonce().Value.ByteArrayToHex()); + } + + [Fact] + public static void NonceLeadingZerosIgnored() + { + byte[] sha256 = new byte[256 / 8]; + byte[] nonce = { 0x00, 0x00, 0x01, 0xFE }; + + Rfc3161TimestampRequest req = Rfc3161TimestampRequest.CreateFromHash( + sha256, + HashAlgorithmName.SHA256, + nonce: nonce); + + Assert.Equal("01FE", req.GetNonce().Value.ByteArrayToHex()); + } + + [Fact] + public static void NoncePaddingZerosIgnored() + { + byte[] sha256 = new byte[256 / 8]; + byte[] nonce = { 0x00, 0x00, 0xFE }; + + Rfc3161TimestampRequest req = Rfc3161TimestampRequest.CreateFromHash( + sha256, + HashAlgorithmName.SHA256, + nonce: nonce); + + Assert.Equal("00FE", req.GetNonce().Value.ByteArrayToHex()); + } + + public enum Rfc3161RequestResponseStatus + { + Unknown = 0, + Accepted = 1, + DoesNotParse = 2, + RequestFailed = 3, + HashMismatch = 4, + VersionTooNew = 5, + NonceMismatch = 6, + RequestedCertificatesMissing = 7, + UnexpectedCertificates = 8, + } + } + + internal static class Rfc3161TimestampRequestExtensions + { + private static readonly MethodInfo s_tryProcesses; + + static Rfc3161TimestampRequestExtensions() + { + s_tryProcesses = typeof(Rfc3161TimestampRequest) + .GetMethod("ProcessResponse", BindingFlags.NonPublic | BindingFlags.Instance); + } + + internal static bool TryProcessResponse( + this Rfc3161TimestampRequest request, + ReadOnlyMemory inputBytes, + out Rfc3161TimestampToken token, + out TimestampRequestTests.Rfc3161RequestResponseStatus status, + out int bytesRead) + { + object[] parameters = { inputBytes, null, null, null, false }; + object result = s_tryProcesses.Invoke(request, parameters); + + token = (Rfc3161TimestampToken)parameters[1]; + + status = (TimestampRequestTests.Rfc3161RequestResponseStatus) + Enum.ToObject(typeof(TimestampRequestTests.Rfc3161RequestResponseStatus), parameters[2]); + + bytesRead = (int)parameters[3]; + + return (bool)result; + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/Rfc3161/TimestampTokenInfoTests.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/Rfc3161/TimestampTokenInfoTests.cs new file mode 100644 index 0000000000..2ab7adda28 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/Rfc3161/TimestampTokenInfoTests.cs @@ -0,0 +1,501 @@ +// 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.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Security.Cryptography.X509Certificates; +using Test.Cryptography; +using Xunit; + +namespace System.Security.Cryptography.Pkcs.Tests +{ + public static class TimestampTokenInfoTests + { + [Theory] + [InlineData(nameof(TimestampTokenTestData.FreeTsaDotOrg1))] + [InlineData(nameof(TimestampTokenTestData.Symantec1))] + public static void CreateFromParameters(string testDataName) + { + TimestampTokenTestData testData = TimestampTokenTestData.GetTestData(testDataName); + + Oid policyId = new Oid(testData.PolicyId, testData.PolicyId); + Oid hashAlgorithmOid = new Oid(testData.HashAlgorithmId); + byte[] messageHash = testData.HashBytes.ToArray(); + byte[] serial = testData.SerialNumberBytes.ToArray(); + DateTimeOffset nonUtcTimestamp = testData.Timestamp.ToOffset(TimeSpan.FromHours(-8)); + long? accuracyMicrosec = testData.AccuracyInMicroseconds; + byte[] nonce = testData.NonceBytes?.ToArray(); + byte[] tsaNameBytes = testData.TsaNameBytes?.ToArray(); + + ReadOnlyMemory? nonceMemory = null; + ReadOnlyMemory? tsaMemory = null; + + if (nonce != null) + { + nonceMemory = nonce; + } + + if (tsaNameBytes != null) + { + tsaMemory = tsaNameBytes; + } + + var tokenInfo = new Rfc3161TimestampTokenInfo( + policyId, + hashAlgorithmOid, + messageHash, + serial, + nonUtcTimestamp, + accuracyMicrosec, + testData.IsOrdering, + nonceMemory, + tsaMemory); + + // Since AssertEqual will check all the fields the remaining checks in this method are about + // input/output value/reference associations. + AssertEqual(testData, tokenInfo); + + Assert.NotSame(policyId, tokenInfo.PolicyId); + Assert.NotSame(hashAlgorithmOid, tokenInfo.HashAlgorithmId); + + Assert.Equal(nonUtcTimestamp, tokenInfo.Timestamp); + Assert.Equal(TimeSpan.Zero, tokenInfo.Timestamp.Offset); + + Assert.Equal(messageHash.ByteArrayToHex(), tokenInfo.GetMessageHash().ByteArrayToHex()); + // Detached from the original data + messageHash[0] ^= 0xFF; + Assert.NotEqual(messageHash.ByteArrayToHex(), tokenInfo.GetMessageHash().ByteArrayToHex()); + + Assert.Equal(serial.ByteArrayToHex(), tokenInfo.GetSerialNumber().ByteArrayToHex()); + // Detached from the original data + serial[1] ^= 0xFF; + Assert.NotEqual(serial.ByteArrayToHex(), tokenInfo.GetSerialNumber().ByteArrayToHex()); + + + if (nonce != null) + { + ReadOnlyMemory? tokenNonce = tokenInfo.GetNonce(); + Assert.True(tokenNonce.HasValue, "tokenInfo.GetNonce().HasValue"); + + Assert.Equal(nonce.ByteArrayToHex(), tokenNonce.Value.ByteArrayToHex()); + // Detached from the original data + nonce[0] ^= 0xFF; + Assert.NotEqual(nonce.ByteArrayToHex(), tokenNonce.Value.ByteArrayToHex()); + } + + ReadOnlyMemory? nameFromToken = tokenInfo.GetTimestampAuthorityName(); + + if (tsaNameBytes != null) + { + Assert.True(nameFromToken.HasValue, "nameFromToken.HasValue"); + Assert.Equal(tsaNameBytes.ByteArrayToHex(), nameFromToken.Value.ByteArrayToHex()); + // Detached from the original data + tsaNameBytes[5] ^= 0xFF; + Assert.NotEqual(tsaNameBytes.ByteArrayToHex(), nameFromToken.Value.ByteArrayToHex()); + } + + if (testData.ExtensionsBytes == null) + { + Assert.False(tokenInfo.HasExtensions, "tokenInfo.HasExtensions"); + Assert.NotNull(tokenInfo.GetExtensions()); + Assert.Equal(0, tokenInfo.GetExtensions().Count); + + // GetExtensions always returns a new collection. + Assert.NotSame(tokenInfo.GetExtensions(), tokenInfo.GetExtensions()); + } + else + { + Assert.True(tokenInfo.HasExtensions, "tokenInfo.HasExtensions"); + Assert.NotNull(tokenInfo.GetExtensions()); + + Assert.True(false, "A test handler has been written for extensions..."); + + // GetExtensions always returns a new collection. + Assert.NotSame(tokenInfo.GetExtensions(), tokenInfo.GetExtensions()); + } + + // Because the token is DER encoded, we should produce byte-for-byte the same value. + Assert.Equal(testData.TokenInfoBytes.ByteArrayToHex(), tokenInfo.Encode().ByteArrayToHex()); + } + + [Theory] + [InlineData(nameof(TimestampTokenTestData.FreeTsaDotOrg1), false)] + [InlineData(nameof(TimestampTokenTestData.FreeTsaDotOrg1), true)] + [InlineData(nameof(TimestampTokenTestData.Symantec1), false)] + [InlineData(nameof(TimestampTokenTestData.Symantec1), true)] + public static void CreateFromValue(string testDataName, bool viaTry) + { + TimestampTokenTestData testData = TimestampTokenTestData.GetTestData(testDataName); + + ValidateTokenInfo( + testData.TokenInfoBytes, + testData, + viaTry ? testData.TokenInfoBytes.Length : (int?)null); + } + + private static void ValidateTokenInfo( + ReadOnlyMemory tokenInfoBytes, + TimestampTokenTestData testData, + int? lengthFromTry) + { + Rfc3161TimestampTokenInfo tokenInfo; + + Assert.True( + Rfc3161TimestampTokenInfo.TryDecode(tokenInfoBytes, out tokenInfo, out int bytesRead), + "Rfc3161TimestampTokenInfo.TryDecode"); + + Assert.NotNull(tokenInfo); + + if (lengthFromTry != null) + { + Assert.Equal(lengthFromTry.Value, bytesRead); + } + + AssertEqual(testData, tokenInfo); + } + + [Fact] + public static void TryDecode_LongerThanNeeded() + { + const int ExtraBytes = 11; + ReadOnlyMemory inputTokenData = TimestampTokenTestData.Symantec1.TokenInfoBytes; + int len = inputTokenData.Length + ExtraBytes; + byte[] inputData = new byte[len]; + + for (int i = inputTokenData.Length; i < len; i++) + { + inputData[i] = unchecked((byte)i); + } + + inputTokenData.Span.CopyTo(inputData); + + ValidateTokenInfo(inputData, TimestampTokenTestData.Symantec1, inputTokenData.Length); + } + + [Fact] + public static void TryDecode_Invalid() + { + ReadOnlyMemory inputData = TimestampTokenTestData.Symantec1.TokenInfoBytes; + + Assert.False( + Rfc3161TimestampTokenInfo.TryDecode( + inputData.Slice(0, inputData.Length - 1), + out Rfc3161TimestampTokenInfo tokenInfo, + out int bytesRead)); + + Assert.Equal(0, bytesRead); + Assert.Null(tokenInfo); + } + + [Fact] + public static void BuilderCtor_PolicyIdRequired() + { + AssertExtensions.Throws( + "policyId", + () => new Rfc3161TimestampTokenInfo(null, null, default, default, default)); + } + + [Fact] + public static void BuilderCtor_HashAlgorithmIdRequired() + { + Oid policyId = new Oid("0.0", "0.0"); + + AssertExtensions.Throws( + "hashAlgorithmId", + () => new Rfc3161TimestampTokenInfo(policyId, null, default, default, default)); + } + + [Fact] + public static void BuilderCtor_TsaNameOptional() + { + Oid policyId = new Oid("0.0", "0.0"); + Oid hashAlgorithmId = new Oid(Oids.Sha256); + + var tokenInfo = new Rfc3161TimestampTokenInfo( + policyId, + hashAlgorithmId, + new byte[256 / 8], + new byte[] { 1 }, + DateTimeOffset.UtcNow); + + Assert.False(tokenInfo.GetTimestampAuthorityName().HasValue); + + Assert.True(Rfc3161TimestampTokenInfo.TryDecode(tokenInfo.Encode(), out tokenInfo, out _)); + Assert.False(tokenInfo.GetTimestampAuthorityName().HasValue); + } + + [Fact] + public static void BuilderCtor_AccuracyOptional() + { + Oid policyId = new Oid("0.0", "0.0"); + Oid hashAlgorithmId = new Oid(Oids.Sha256); + + var tokenInfo = new Rfc3161TimestampTokenInfo( + policyId, + hashAlgorithmId, + new byte[256 / 8], + new byte[] { 2 }, + DateTimeOffset.UtcNow); + + Assert.False(tokenInfo.AccuracyInMicroseconds.HasValue); + + Assert.True(Rfc3161TimestampTokenInfo.TryDecode(tokenInfo.Encode(), out tokenInfo, out _)); + Assert.False(tokenInfo.AccuracyInMicroseconds.HasValue); + } + + [Fact] + public static void TsaName_SameDataSecondInvocation() + { + const string InputHex = + "3081F8020101060B6086480186F845010717033031300D060960864801650304" + + "020105000420315F5BDB76D078C43B8AC0064E4A0164612B1FCE77C869345BFC" + + "94C75894EDD302146C77B12D5FCF9F6DC1D4A481E935F446FBA376C4180F3230" + + "3137313031303232303835325A300302011EA08186A48183308180310B300906" + + "0355040613025553311D301B060355040A131453796D616E74656320436F7270" + + "6F726174696F6E311F301D060355040B131653796D616E746563205472757374" + + "204E6574776F726B3131302F0603550403132853796D616E7465632053484132" + + "35362054696D655374616D70696E67205369676E6572202D204732"; + + Rfc3161TimestampTokenInfo tokenInfo; + Assert.True(Rfc3161TimestampTokenInfo.TryDecode(InputHex.HexToByteArray(), out tokenInfo, out _)); + + ReadOnlyMemory? tsaName = tokenInfo.GetTimestampAuthorityName(); + Assert.True(tsaName.HasValue, "tsaName.HasValue"); + ReadOnlyMemory tsaName1 = tsaName.Value; + ReadOnlyMemory tsaName2 = tokenInfo.GetTimestampAuthorityName().Value; + + Assert.Equal(tsaName1.Length, tsaName2.Length); + + Assert.True( + Unsafe.AreSame( + ref MemoryMarshal.GetReference(tsaName1.Span), + ref MemoryMarshal.GetReference(tsaName2.Span)), + "Second call to GetTimestampAuthorityName is over the same memory"); + } + + [Fact] + public static void ExtensionsRoundtrips() + { + Oid policyId = new Oid("0.0", "0.0"); + Oid hashAlgorithmId = new Oid(Oids.Sha256); + + byte[] extensionValue = { 3, 1, 4, 1, 5, 9, 2, 7, 5, 8 }; + + var tokenInfo = new Rfc3161TimestampTokenInfo( + policyId, + hashAlgorithmId, + new byte[256 / 8], + new byte[] { 3 }, + DateTimeOffset.UtcNow, + extensions: new X509ExtensionCollection + { + new X509Extension(new Oid("0.0.0", "0.0.0"), extensionValue, true), + }); + + Assert.True(tokenInfo.HasExtensions); + + Assert.True(Rfc3161TimestampTokenInfo.TryDecode(tokenInfo.Encode(), out tokenInfo, out _)); + + Assert.True(tokenInfo.HasExtensions); + X509ExtensionCollection extensions = tokenInfo.GetExtensions(); + + Assert.Equal(1, extensions.Count); + X509Extension extension = extensions[0]; + Assert.NotNull(extension); + Assert.Equal("0.0.0", extension.Oid.Value); + Assert.True(extension.Critical, "extension.Critical"); + Assert.Equal(extensionValue.ByteArrayToHex(), extension.RawData.ByteArrayToHex()); + } + + [Fact] + public static void BuilderCtor_IsOrdering_Roundtrips() + { + Oid policyId = new Oid("0.0", "0.0"); + Oid hashAlgorithmId = new Oid(Oids.Sha256); + + var tokenInfo = new Rfc3161TimestampTokenInfo( + policyId, + hashAlgorithmId, + new byte[256 / 8], + new byte[] { 7 }, + DateTimeOffset.UtcNow, + isOrdering: true); + + Assert.True(tokenInfo.IsOrdering, "tokenInfo.IsOrdering"); + + Assert.True(Rfc3161TimestampTokenInfo.TryDecode(tokenInfo.Encode(), out tokenInfo, out _)); + Assert.True(tokenInfo.IsOrdering, "tokenInfo.IsOrdering"); + } + + [Fact] + public static void BuilderCtor_Timestamp_KeepsSubSeconds() + { + // RFC 3161 says that the genTime value should omit fractions "when there is no need" + // + // We leave the trimming up to the caller, because there are multiple positions for + // the accuracy+precision position. + DateTimeOffset marker = new DateTimeOffset(2017, 12, 18, 17, 5, 34, TimeSpan.Zero); + DateTimeOffset experiment = marker + TimeSpan.FromMilliseconds(17); + + Assert.NotEqual(marker, experiment); + + Oid policyId1 = new Oid("0.0", "0.0"); + Oid hashAlgorithmId1 = new Oid(Oids.Sha256); + + var tokenInfo = new Rfc3161TimestampTokenInfo( + policyId1, + hashAlgorithmId1, + new byte[256 / 8], + new byte[] { 6 }, + experiment); + + Assert.Equal(experiment, tokenInfo.Timestamp); + } + + [Theory] + [InlineData("No accuracy", "", true, null)] + [InlineData("MicroSeconds = 0", "3003810100", false, null)] + [InlineData("MicroSeconds = 1", "3003810101", true, 1L)] + [InlineData("MicroSeconds = 999", "3004810203E7", true, 999L)] + [InlineData("MicroSeconds = 1000", "3004810203E8", false, null)] + [InlineData("MilliSeconds = 0", "3003800100", false, null)] + [InlineData("MilliSeconds = 1", "3003800101", true, 1000L)] + [InlineData("MilliSeconds = 999", "3004800203E7", true, 999000L)] + [InlineData("MilliSeconds = 1000", "3004800203E8", false, null)] + [InlineData("Seconds = 0", "3003020100", true, 0L)] + [InlineData("Seconds = -1", "30030201FF", false, null)] + public static void Accuracy_Bounds_ParsesAsExpected( + string description, + string accuracyHex, + bool shouldParse, + long? expectedTotalMicroseconds) + { + string inputHex = + "305A0201010601003031300D0609608648016503040201050004200000000000" + + "0000000000000000000000000000000000000000000000000000000201081817" + + "32303137313231383138313235342E373438363336345A" + accuracyHex; + + byte[] inputData = inputHex.HexToByteArray(); + inputData[1] = checked((byte)(0x55 + accuracyHex.Length / 2)); + + if (shouldParse) + { + int bytesRead; + Rfc3161TimestampTokenInfo tokenInfo; + + Assert.True(Rfc3161TimestampTokenInfo.TryDecode(inputData, out tokenInfo, out bytesRead)); + Assert.Equal(inputData.Length, bytesRead); + Assert.NotNull(tokenInfo); + Assert.Equal(expectedTotalMicroseconds, tokenInfo.AccuracyInMicroseconds); + } + else + { + Assert.False(Rfc3161TimestampTokenInfo.TryDecode(inputData, out _, out _)); + } + } + + [Theory] + [InlineData(0)] + [InlineData(1)] + [InlineData(999)] + [InlineData(1000)] + [InlineData(1001)] + [InlineData(1999)] + [InlineData(999000)] + [InlineData(999001)] + [InlineData(999999)] + [InlineData(1000000)] + [InlineData(1000001)] + [InlineData(1000999)] + [InlineData(1001000)] + [InlineData(1001001)] + [InlineData(1999999)] + public static void AccuracyRoundtrips(long totalMicroseconds) + { + Rfc3161TimestampTokenInfo info = new Rfc3161TimestampTokenInfo( + new Oid("0.0", "0.0"), + new Oid(Oids.Sha256), + new byte[256 / 8], + new byte[] { 1 }, + DateTimeOffset.UtcNow, + accuracyInMicroseconds: totalMicroseconds); + + Assert.True(info.AccuracyInMicroseconds.HasValue); + Assert.Equal(totalMicroseconds, info.AccuracyInMicroseconds.Value); + + byte[] encoded = info.Encode(); + + Rfc3161TimestampTokenInfo info2; + int bytesConsumed; + + Assert.True( + Rfc3161TimestampTokenInfo.TryDecode(encoded, out info2, out bytesConsumed)); + + Assert.Equal(encoded.Length, bytesConsumed); + Assert.NotNull(info2); + Assert.True(info2.AccuracyInMicroseconds.HasValue); + Assert.Equal(totalMicroseconds, info2.AccuracyInMicroseconds.Value); + } + + [Fact] + public static void NegativeAccuracyThrows() + { + AssertExtensions.Throws( + "accuracyInMicroseconds", + () => new Rfc3161TimestampTokenInfo( + new Oid("0.0", "0.0"), + new Oid(Oids.Sha256), + new byte[256 / 8], + new byte[] { 2 }, + DateTimeOffset.UtcNow, + accuracyInMicroseconds: -1)); + } + + internal static void AssertEqual(TimestampTokenTestData testData, Rfc3161TimestampTokenInfo tokenInfo) + { + Assert.Equal(testData.Version, tokenInfo.Version); + Assert.Equal(testData.PolicyId, tokenInfo.PolicyId.Value); + Assert.Equal(testData.HashAlgorithmId, tokenInfo.HashAlgorithmId.Value); + // FriendlyName should be set for known digest algorithms + Assert.NotEqual(tokenInfo.HashAlgorithmId.Value, tokenInfo.HashAlgorithmId.FriendlyName); + Assert.Equal(testData.HashBytes.ByteArrayToHex(), tokenInfo.GetMessageHash().ByteArrayToHex()); + Assert.Equal(testData.SerialNumberBytes.ByteArrayToHex(), tokenInfo.GetSerialNumber().ByteArrayToHex()); + Assert.Equal(testData.Timestamp, tokenInfo.Timestamp); + Assert.Equal(TimeSpan.Zero, tokenInfo.Timestamp.Offset); + Assert.Equal(testData.AccuracyInMicroseconds, tokenInfo.AccuracyInMicroseconds); + + if (testData.IsOrdering) + { + Assert.True(tokenInfo.IsOrdering, "tokenInfo.IsOrdering"); + } + else + { + Assert.False(tokenInfo.IsOrdering, "tokenInfo.IsOrdering"); + } + + Assert.Equal(testData.NonceBytes?.ByteArrayToHex(), tokenInfo.GetNonce()?.ByteArrayToHex()); + Assert.Equal(testData.TsaNameBytes?.ByteArrayToHex(), tokenInfo.GetTimestampAuthorityName()?.ByteArrayToHex()); + + if (testData.ExtensionsBytes == null) + { + Assert.False(tokenInfo.HasExtensions, "tokenInfo.HasExtensions"); + Assert.NotNull(tokenInfo.GetExtensions()); + Assert.Equal(0, tokenInfo.GetExtensions().Count); + + // GetExtensions always returns a new collection. + Assert.NotSame(tokenInfo.GetExtensions(), tokenInfo.GetExtensions()); + } + else + { + Assert.True(tokenInfo.HasExtensions, "tokenInfo.HasExtensions"); + Assert.NotNull(tokenInfo.GetExtensions()); + + Assert.True(false, "A test handler has been written for extensions..."); + + // GetExtensions always returns a new collection. + Assert.NotSame(tokenInfo.GetExtensions(), tokenInfo.GetExtensions()); + } + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/Rfc3161/TimestampTokenTestData.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/Rfc3161/TimestampTokenTestData.cs new file mode 100644 index 0000000000..8bdc43a476 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/Rfc3161/TimestampTokenTestData.cs @@ -0,0 +1,301 @@ +// 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.Text; +using Test.Cryptography; + +namespace System.Security.Cryptography.Pkcs.Tests +{ + internal sealed class TimestampTokenTestData + { + internal ReadOnlyMemory MessageContent { get; private set; } + + internal ReadOnlyMemory FullTokenBytes { get; } + internal ReadOnlyMemory? EmbeddedSigningCertificate { get; private set; } + internal ReadOnlyMemory TokenInfoBytes { get; private set; } + + internal int Version => 1; + internal string PolicyId { get; private set; } + internal string HashAlgorithmId { get; private set; } + internal ReadOnlyMemory HashBytes { get; private set; } + internal ReadOnlyMemory SerialNumberBytes { get; private set; } + internal bool TimestampTooPrecise { get; private set; } + internal DateTimeOffset Timestamp { get; private set; } + internal long? AccuracyInMicroseconds { get; private set; } + internal bool IsOrdering { get; private set; } + internal ReadOnlyMemory? NonceBytes { get; private set; } + internal ReadOnlyMemory? TsaNameBytes { get; private set; } + internal ReadOnlyMemory? ExtensionsBytes { get; private set; } + + internal byte[] ExternalCertificateBytes { get; private set; } + + private TimestampTokenTestData(string inputHex) + : this(inputHex.HexToByteArray()) + { + } + + private TimestampTokenTestData(ReadOnlyMemory fullTokenBytes) + { + FullTokenBytes = fullTokenBytes; + } + + internal static TimestampTokenTestData GetTestData(string testDataName) + { + switch (testDataName) + { + case nameof(FreeTsaDotOrg1): + return FreeTsaDotOrg1; + case nameof(Symantec1): + return Symantec1; + } + + throw new ArgumentOutOfRangeException(nameof(testDataName), testDataName, "No registered value"); + } + + internal static readonly TimestampTokenTestData FreeTsaDotOrg1 = ((Func)(() => + { + var data = new TimestampTokenTestData( + "3082053606092A864886F70D010702A082052730820523020103310B30090605" + + "2B0E03021A0500308201B1060B2A864886F70D0109100104A08201A00482019C" + + "3082019802010106042A0304013041300D060960864801650304020205000430" + + "9111E404B85D1F088C23DBE654943F30B103B6CBFE01898A1F7701A23B055E79" + + "C27AEE38BC44CC0F212DBAC0EBE92C580203064F641816323031373132313831" + + "37333431362E3830303831325A300A020101800201F48101640101FF02090096" + + "31D170EA3B92D4A0820111A482010D308201093111300F060355040A13084672" + + "656520545341310C300A060355040B130354534131763074060355040D136D54" + + "686973206365727469666963617465206469676974616C6C79207369676E7320" + + "646F63756D656E747320616E642074696D65207374616D702072657175657374" + + "73206D616465207573696E672074686520667265657473612E6F7267206F6E6C" + + "696E65207365727669636573311830160603550403130F7777772E6672656574" + + "73612E6F72673122302006092A864886F70D0109011613627573696C657A6173" + + "40676D61696C2E636F6D3112301006035504071309577565727A62757267310B" + + "3009060355040613024445310F300D0603550408130642617965726E3182035A" + + "308203560201013081A33081953111300F060355040A13084672656520545341" + + "3110300E060355040B1307526F6F74204341311830160603550403130F777777" + + "2E667265657473612E6F72673122302006092A864886F70D0109011613627573" + + "696C657A617340676D61696C2E636F6D3112301006035504071309577565727A" + + "62757267310F300D0603550408130642617965726E310B300906035504061302" + + "4445020900C1E986160DA8E982300906052B0E03021A0500A0818C301A06092A" + + "864886F70D010903310D060B2A864886F70D0109100104301C06092A864886F7" + + "0D010905310F170D3137313231383137333431365A302306092A864886F70D01" + + "090431160414F53C4FC877C8AE82F9695BFE039ED1F0D154D5D3302B060B2A86" + + "4886F70D010910020C311C301A301830160414916DA3D860ECCA82E34BC59D17" + + "93E7E968875F14300D06092A864886F70D01010105000482020078A64BC950D0" + + "0A576DB1F1BBE822C08FA165689198CD19B4A64CB8E65CF3B33E69C7BA6EF4A3" + + "A005F8138457063A331D293E822260AD4DDD8DE04D4161103CF5A554283E4B1C" + + "7AAF57DA04E84FA3572A7F2DB1409C06B192C10C09A7672B0D45DDF114A5975C" + + "388BEC9036FA1D557379B7B81D4B0329A599D98217EF2E7EEFD9439B29746A6E" + + "93DB966072EE969B4468168E169DA035AD05A478A90475951EC27C8C32B0920B" + + "735B15D32393B9271466B5F8217355B0F86B44DDE7F36CBBA2A90D4F285C15AE" + + "17A8A1C8E536B5810B8219016009C0B8F8A2B893B662A4200BABF32E4CD21600" + + "6B9132D75B9C7BFB85DE109C65F072E9A419548F2499631D04AD4ED83E420A51" + + "64DEB505B3D345158FA936E8D559A860AEC5B5D79D1E7D7A02133868531CBFE7" + + "84B32E4A4D74706E0A04161D97C5BA50D190ED8C2792EF1E8834E0982241D668" + + "86B9CDACCFBE7CA890F71594818C50AA4EA66E21D539D108FE0A9116E18C421D" + + "F544465469AD7F614BF79788E808B09A8C223A02F21D7CF1B1AB1D5210D74EAB" + + "7958AD5035CA440BAC27C1CA9EAA603BBB4C85A09DBB4ADFA93FAF5262CFACC2" + + "92C0513769CC02554A1315B40D16A9AE547E50F0AC4310D71F13D9E22ADFE241" + + "D50DF295F1DB078C84EECBCB30F1018E939B1FEA8615B31F39F87F02EF816EFF" + + "FE80A39C0857ECA510882DD2D66D49B743F0E7FF8DBEE4650449"); + + data.MessageContent = Encoding.ASCII.GetBytes("This is a test.\n"); + + data.TokenInfoBytes = data.FullTokenBytes.Slice(64, 412); + data.PolicyId = "1.2.3.4.1"; + data.HashAlgorithmId = Oids.Sha384; + data.HashBytes = data.TokenInfoBytes.Slice(32, 48); + data.SerialNumberBytes = data.TokenInfoBytes.Slice(82, 3); + data.Timestamp = new DateTimeOffset(2017, 12, 18, 17, 34, 16, TimeSpan.Zero); + data.Timestamp += TimeSpan.FromTicks(8008120); + data.TimestampTooPrecise = true; + data.AccuracyInMicroseconds = 1 * 1000000L + 0x1F4 * 1000 + 0x64; + data.IsOrdering = true; + data.NonceBytes = data.TokenInfoBytes.Slice(126, 9); + data.TsaNameBytes = data.TokenInfoBytes.Slice(139, 273); + + // https://freetsa.org/files/tsa.crt + data.ExternalCertificateBytes = Convert.FromBase64String( + @" +MIIIATCCBemgAwIBAgIJAMHphhYNqOmCMA0GCSqGSIb3DQEBDQUAMIGVMREwDwYD +VQQKEwhGcmVlIFRTQTEQMA4GA1UECxMHUm9vdCBDQTEYMBYGA1UEAxMPd3d3LmZy +ZWV0c2Eub3JnMSIwIAYJKoZIhvcNAQkBFhNidXNpbGV6YXNAZ21haWwuY29tMRIw +EAYDVQQHEwlXdWVyemJ1cmcxDzANBgNVBAgTBkJheWVybjELMAkGA1UEBhMCREUw +HhcNMTYwMzEzMDE1NzM5WhcNMjYwMzExMDE1NzM5WjCCAQkxETAPBgNVBAoTCEZy +ZWUgVFNBMQwwCgYDVQQLEwNUU0ExdjB0BgNVBA0TbVRoaXMgY2VydGlmaWNhdGUg +ZGlnaXRhbGx5IHNpZ25zIGRvY3VtZW50cyBhbmQgdGltZSBzdGFtcCByZXF1ZXN0 +cyBtYWRlIHVzaW5nIHRoZSBmcmVldHNhLm9yZyBvbmxpbmUgc2VydmljZXMxGDAW +BgNVBAMTD3d3dy5mcmVldHNhLm9yZzEiMCAGCSqGSIb3DQEJARYTYnVzaWxlemFz +QGdtYWlsLmNvbTESMBAGA1UEBxMJV3VlcnpidXJnMQswCQYDVQQGEwJERTEPMA0G +A1UECBMGQmF5ZXJuMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtZEE +jE5IbzTp3Ahif8I3UWIjaYS4LLEwvv9RfPw4+EvOXGWodNqyYhrgvOfjNWPg7ek0 +/V+IIxWfB4SICCJ0YMHtiCYXBvQoEzQ1nfu4G9E1P8F5YQrxqMjIZdwA6iOzqJvm +vQO6hansgn1gVlkF4i1qWE7ROArhUCgM7jl+mKAS84BGQAeGJEO8B3y5X0Ia8xcS +2Wg8223/uvPIululZq5SPUWdYXc0bU2EDieIa3wBxbiQ14ouJ7uo3S+aKBLhV9Yv +khxlliVIBp3Nt9Bt4YHeDpVw1m+HIgzii2KKtVkG8+4MIQ9wUej0hYr4uaktCeRq +8tnLpb/PrRaM32BEkaSwZgOxFMr3Ax8GXn7u+lPFdfNJDAWdLjLdx2rE1MTHEGg7 +l/0b5ZG8YQVRhtiPmgORswe2+R7ZVNqjb5rNah4Uqi5K3xdGS1TbGNu2/+MAgCRl +RzcENs5Od7rl3m/g8/nW5/++tGHnlOkvsJUfiq5hpBLM6bIQdGNci+MnrhoPa0pk +brD4RjvGO/hFUwQ10Z6AJRHsn2bDSWlS2L7LabCqTUxB9gUV/n3LuJMZzdpZumrq +S+POrnGOb8tszX25/FC7FbEvNmWwqjByicLm3UsRHOSLotnv21prmlBgaTNPs09v +x64zDws0IIqsgN8yZv3ZBGWHa6LLiY2VBTFbbnsCAwEAAaOCAdswggHXMAkGA1Ud +EwQCMAAwHQYDVR0OBBYEFG52C3tOT5zhYMptLOknoqKUs3c3MB8GA1UdIwQYMBaA +FPpVDYw0ZlFDTPfns6dsla965qSXMAsGA1UdDwQEAwIGwDAWBgNVHSUBAf8EDDAK +BggrBgEFBQcDCDBjBggrBgEFBQcBAQRXMFUwKgYIKwYBBQUHMAKGHmh0dHA6Ly93 +d3cuZnJlZXRzYS5vcmcvdHNhLmNydDAnBggrBgEFBQcwAYYbaHR0cDovL3d3dy5m +cmVldHNhLm9yZzoyNTYwMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuZnJl +ZXRzYS5vcmcvY3JsL3Jvb3RfY2EuY3JsMIHGBgNVHSAEgb4wgbswgbgGAQAwgbIw +MwYIKwYBBQUHAgEWJ2h0dHA6Ly93d3cuZnJlZXRzYS5vcmcvZnJlZXRzYV9jcHMu +aHRtbDAyBggrBgEFBQcCARYmaHR0cDovL3d3dy5mcmVldHNhLm9yZy9mcmVldHNh +X2Nwcy5wZGYwRwYIKwYBBQUHAgIwOxo5RnJlZVRTQSB0cnVzdGVkIHRpbWVzdGFt +cGluZyBTb2Z0d2FyZSBhcyBhIFNlcnZpY2UgKFNhYVMpMA0GCSqGSIb3DQEBDQUA +A4ICAQClyUTixvrAoU2TCn/QoLFytB/BSDw+lXxoorzZuXZPGpUBYf1yRy1Bpe7S +d3hiA7VCIkD7OibN4XYIe2+xAR30zBniVxqkoFEQlmXpTEb1C9Kt7mrEE34lGyWj +navaRRUV2P+eByCejsILeHT34aDt58AJN/6EozT4syZc7S2O2d9hOWWDZ3/rOCwe +47I+bqXwXfMN57n4kAXSUmb2EvOci09tq6bXv7rBljK5Bjcyn1Km8GahDkPqqB+E +mmxf4/6LXqIydfaH8gUuUC6mwwdipmjM4Hhx3Y6X4xW7qSniVYmXegoxLOlsUQax +Q3x3nys2GxgoiPPuiiNDdPoGPpVhkmJ/fEMQc5ZdEmCSjroAnoA0Ka4yTPlvBCNU +83vKWv3cefeTRqs4i/x58B3JhhJU6mzBKZQQdrg9IFVvO+UTJoN/KHb3gzs3Dnw9 +QQUjgn1PU0AMciGNdSKf8QxviJOpo6HAxCu0yJjBPfQcf2VztPxWUVlxphCnsNKF +fIIlqfsgTqzsouiXGqGvh4hqKuPHL+CgquhCmAp3vvFrkhFUWAkNmCtZRmA3ZOda +CtPRFFS5mG9ni5q2r+hJcDOuOr/U60O3vJ3uaIFZSeZIFYKoLnhSd/IoIQfv45Ag +DgUIrLjqguolBSdvPJ2io9O0rTi7+IQr2jb8JEgpH1WNwC3R4A=="); + + return data; + }))(); + + internal static readonly TimestampTokenTestData Symantec1 = ((Func)(() => + { + var data = new TimestampTokenTestData( + "30820E2406092A864886F70D010702A0820E1530820E11020103310D300B0609" + + "6086480165030402013082010E060B2A864886F70D0109100104A081FE0481FB" + + "3081F8020101060B6086480186F845010717033031300D060960864801650304" + + "020105000420315F5BDB76D078C43B8AC0064E4A0164612B1FCE77C869345BFC" + + "94C75894EDD302146C77B12D5FCF9F6DC1D4A481E935F446FBA376C4180F3230" + + "3137313031303232303835325A300302011EA08186A48183308180310B300906" + + "0355040613025553311D301B060355040A131453796D616E74656320436F7270" + + "6F726174696F6E311F301D060355040B131653796D616E746563205472757374" + + "204E6574776F726B3131302F0603550403132853796D616E7465632053484132" + + "35362054696D655374616D70696E67205369676E6572202D204732A0820A8B30" + + "82053830820420A00302010202107B05B1D449685144F7C989D29C199D12300D" + + "06092A864886F70D01010B05003081BD310B3009060355040613025553311730" + + "15060355040A130E566572695369676E2C20496E632E311F301D060355040B13" + + "16566572695369676E205472757374204E6574776F726B313A3038060355040B" + + "1331286329203230303820566572695369676E2C20496E632E202D20466F7220" + + "617574686F72697A656420757365206F6E6C79313830360603550403132F5665" + + "72695369676E20556E6976657273616C20526F6F742043657274696669636174" + + "696F6E20417574686F72697479301E170D3136303131323030303030305A170D" + + "3331303131313233353935395A3077310B3009060355040613025553311D301B" + + "060355040A131453796D616E74656320436F72706F726174696F6E311F301D06" + + "0355040B131653796D616E746563205472757374204E6574776F726B31283026" + + "0603550403131F53796D616E746563205348413235362054696D655374616D70" + + "696E6720434130820122300D06092A864886F70D01010105000382010F003082" + + "010A0282010100BB599D59554F9D8C725D1A81A2EB55F3B001AD3C71AC328F05" + + "6B869A270032976A4DC964144B29BBC2D929B92EEC63B3E1CF3F0B5690F8621B" + + "7EEBA607E2DE7F5E6D4038D49106E7417C791CCBCBAD1BBFD89591F3F0EE6CF8" + + "AD96392E7FC127B87839C584A5EDEDAF878ECE8DC76DEAD298B53A1F1E399DC3" + + "F49AA8F484E1C4D17C71C60629B43FE4830D26C37B083E4DF90AB73349FFCA3B" + + "D4F5B29B4BE188991AF5C0E93314D6DFC780DB91EEFEBC92577277F4CDA8CCFE" + + "09F59337BE95886AC5DCF4B14BD4CEE809915FB58479358A78AC19328F23C132" + + "411B590EA93EB1CCF9D62BEFB7D8E4D51D6D113A92F693C99CE348EEBB530ED4" + + "36978678C5A1370203010001A382017730820173300E0603551D0F0101FF0404" + + "0302010630120603551D130101FF040830060101FF02010030660603551D2004" + + "5F305D305B060B6086480186F84501071703304C302306082B06010505070201" + + "161768747470733A2F2F642E73796D63622E636F6D2F637073302506082B0601" + + "050507020230191A1768747470733A2F2F642E73796D63622E636F6D2F727061" + + "302E06082B0601050507010104223020301E06082B0601050507300186126874" + + "74703A2F2F732E73796D63642E636F6D30360603551D1F042F302D302BA029A0" + + "278625687474703A2F2F732E73796D63622E636F6D2F756E6976657273616C2D" + + "726F6F742E63726C30130603551D25040C300A06082B06010505070308302806" + + "03551D110421301FA41D301B311930170603550403131054696D655374616D70" + + "2D323034382D33301D0603551D0E04160414AF63D6CAA34E8572E0A7BC41F329" + + "A2387F807562301F0603551D23041830168014B677FA6948479F5312D5C2EA07" + + "327607D1970719300D06092A864886F70D01010B0500038201010075EAB02DD5" + + "34195C3245FE0EE1D44FA678C16FD7EADDDC4FF3A1C88188F7A78F15E64029AD" + + "E65DF4A2D956648471302ADD1E61176620560698198D5D71F2F897BC09FD1C91" + + "47C9E2E88D03FBCC902FD60A6C4E33ECD6B493C84C906348394021C4DDD66E89" + + "983CB59897E8A906B709C98F535741902FE11E4D4EDCCA10786C426EF0B6C5F8" + + "615C52F54EF66B8DF74A7ABEF3CDFD03D7D9F603A80FE353F70A75ECC6752EAA" + + "66850499B7F80657E1C60EF6E8AFDAEC9B181FAAB9E33A00BFCE8A94CB01DB9E" + + "C738BB0F52ABD1E39403600A4DA0FE276D1432FC3F9740E1BF9989DBE43914BD" + + "DAE4D3C3EA2B5AB3955855047DC79AEC23038D852AD2FFAEA961813082054B30" + + "820433A00302010202105458F2AAD741D644BC84A97BA09652E6300D06092A86" + + "4886F70D01010B05003077310B3009060355040613025553311D301B06035504" + + "0A131453796D616E74656320436F72706F726174696F6E311F301D060355040B" + + "131653796D616E746563205472757374204E6574776F726B3128302606035504" + + "03131F53796D616E746563205348413235362054696D655374616D70696E6720" + + "4341301E170D3137303130323030303030305A170D3238303430313233353935" + + "395A308180310B3009060355040613025553311D301B060355040A131453796D" + + "616E74656320436F72706F726174696F6E311F301D060355040B131653796D61" + + "6E746563205472757374204E6574776F726B3131302F0603550403132853796D" + + "616E746563205348413235362054696D655374616D70696E67205369676E6572" + + "202D20473230820122300D06092A864886F70D01010105000382010F00308201" + + "0A028201010099F3FCD804090386F9D75CA693C0427CEA7C63CF5D00E28EF3C0" + + "90DF8F29F518EA94B792E5D7B0A07381E8E90A9B4A7C01FF9D8FA439A70EEA45" + + "F4220C3A70ED39458BE4C51B5CF0456846240563769B1CFC9E6C2AB156E58A7F" + + "5271AEF235D54623061CCF482D1DB4CDB8D976238E1CFF3EBFBB065C6907A665" + + "0EF85EAE7D2EED4DAE35EFC9D70042FD28950E9F5D724209BCC3DA44D2EDCC47" + + "84E4FCCA2DAC58BEAEF7AED9440D08B7C277D61A4370D16E03DE5292C4100871" + + "D9BA2255F21FBCED9B9D3BE25E1D4C83FF970F7B0BE755834ED20DEBBED7ECAE" + + "6E47B99FDFA5D651BC0455EDFF27704CC9ED2A4B13E1B1B94C0FC901EE55655F" + + "69027866CB3F0203010001A38201C7308201C3300C0603551D130101FF040230" + + "0030660603551D20045F305D305B060B6086480186F84501071703304C302306" + + "082B06010505070201161768747470733A2F2F642E73796D63622E636F6D2F63" + + "7073302506082B0601050507020230191A1768747470733A2F2F642E73796D63" + + "622E636F6D2F72706130400603551D1F043930373035A033A031862F68747470" + + "3A2F2F74732D63726C2E77732E73796D616E7465632E636F6D2F736861323536" + + "2D7473732D63612E63726C30160603551D250101FF040C300A06082B06010505" + + "070308300E0603551D0F0101FF040403020780307706082B0601050507010104" + + "6B3069302A06082B06010505073001861E687474703A2F2F74732D6F6373702E" + + "77732E73796D616E7465632E636F6D303B06082B06010505073002862F687474" + + "703A2F2F74732D6169612E77732E73796D616E7465632E636F6D2F7368613235" + + "362D7473732D63612E63657230280603551D110421301FA41D301B3119301706" + + "03550403131054696D655374616D702D323034382D35301D0603551D0E041604" + + "1409B5C1FE96729729439AC9E002BAAEF8FD2FBAF6301F0603551D2304183016" + + "8014AF63D6CAA34E8572E0A7BC41F329A2387F807562300D06092A864886F70D" + + "01010B0500038201010017B30A88E95C5A5E206B3B0A15B26CC5A98A3287D3B1" + + "F41C53AE85BE3F9BFFD7BCB79485B4C7527E94E8BDED61B2D4A799E4C3C993C1" + + "353D0BE8680A5D5698BDB1223BD1447AD7BFF06D51328AD523DF380137F6E253" + + "2B7A2B118FB74D6C7A33031B7C6B099417BBE4DB58D4211365E7ECD125CA2C75" + + "9A9C7FFCC9BB2A68ABC47DB4CFA3C96CA7D9C4009C890A7791F44DA2FB313B86" + + "6EF6E61F5003869BBFCB42ABE6769B725A11018AC6EFA56F95E7DDAEBAE62265" + + "F018591B11C9CD80B7D897471F4208F8AC711FB04653B3D4B2D5A3AB50754812" + + "1782ADCFE0414F327ECD951CBF918A083DA4A7670296DF244CA5D041C08260A3" + + "8A17324BD3BCCFA4B48C3182025A3082025602010130818B3077310B30090603" + + "55040613025553311D301B060355040A131453796D616E74656320436F72706F" + + "726174696F6E311F301D060355040B131653796D616E74656320547275737420" + + "4E6574776F726B312830260603550403131F53796D616E746563205348413235" + + "362054696D655374616D70696E6720434102105458F2AAD741D644BC84A97BA0" + + "9652E6300B0609608648016503040201A081A4301A06092A864886F70D010903" + + "310D060B2A864886F70D0109100104301C06092A864886F70D010905310F170D" + + "3137313031303232303835325A302F06092A864886F70D01090431220420B50E" + + "D0D890F9195926E4D7D2ACC301FB7C33460AF36509BFBE3C692C3BA5EC3B3037" + + "060B2A864886F70D010910022F31283026302430220420CF7AC17AD047ECD5FD" + + "C36822031B12D4EF078B6F2B4C5E6BA41F8FF2CF4BAD67300B06092A864886F7" + + "0D010101048201003368AF4246A64CD0C2FC5CF85A05E923CC64A5DA51CEB9A5" + + "46C7ADB1230F1E13A87934C7A857B8B6565AD17CE4C09914F95949DBB34C9F1B" + + "25FBDAA9AD777698FA3400708C8BE678B49F19CE222F86A14A00DBC706972119" + + "FD93DC6971F9390A826FB1953498569FD646A58C99C46C8A2683378819D4C54E" + + "F21EB9846AA69D985DCC68D9FAFDDA365B50D8CBAD7B8865AD58A5B7CD85CC66" + + "B2733193C5674971BAC64EDADCA8880944572CBF4D5DD0D22B6BB0421C537885" + + "0E8F60BAD98EB85C7B09EBBCE11A759181EA9C32A83C8D1B73E54F3A571D1461" + + "FD6B6AB4F89DC6750F14EC2E0134BA61B4D0B2C1FB2F60F622379249CE6381AF" + + "667900B17A7BB6AE"); + + data.MessageContent = Encoding.ASCII.GetBytes("Hello, world!"); + + data.EmbeddedSigningCertificate = data.FullTokenBytes.Slice(1659, 1359); + + data.TokenInfoBytes = data.FullTokenBytes.Slice(64, 251); + data.PolicyId = "2.16.840.1.113733.1.7.23.3"; + data.HashAlgorithmId = Oids.Sha256; + data.HashBytes = data.TokenInfoBytes.Slice(38, 32); + data.SerialNumberBytes = data.TokenInfoBytes.Slice(72, 20); + data.Timestamp = new DateTimeOffset(2017, 10, 10, 22, 8, 52, TimeSpan.Zero); + data.AccuracyInMicroseconds = 30 * 1000000L; + data.IsOrdering = false; + data.TsaNameBytes = data.TokenInfoBytes.Slice(117, 134); + return data; + }))(); + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/Rfc3161/TimestampTokenTests.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/Rfc3161/TimestampTokenTests.cs new file mode 100644 index 0000000000..49a0e72b73 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/Rfc3161/TimestampTokenTests.cs @@ -0,0 +1,1087 @@ +// 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.Linq; +using System.Security.Cryptography.X509Certificates; +using Test.Cryptography; +using Xunit; + +namespace System.Security.Cryptography.Pkcs.Tests +{ + public static class TimestampTokenTests + { + [Theory] + [InlineData(nameof(TimestampTokenTestData.FreeTsaDotOrg1))] + [InlineData(nameof(TimestampTokenTestData.Symantec1))] + public static void ParseDocument(string testDataName) + { + TimestampTokenTestData testData = TimestampTokenTestData.GetTestData(testDataName); + + TestParseDocument(testData.FullTokenBytes, testData, testData.FullTokenBytes.Length); + } + + [Theory] + [InlineData(nameof(TimestampTokenTestData.FreeTsaDotOrg1))] + [InlineData(nameof(TimestampTokenTestData.Symantec1))] + public static void ParseDocument_ExcessData(string testDataName) + { + TimestampTokenTestData testData = TimestampTokenTestData.GetTestData(testDataName); + + int baseLen = testData.FullTokenBytes.Length; + byte[] tooMuchData = new byte[baseLen + 30]; + testData.FullTokenBytes.CopyTo(tooMuchData); + + // Look like an octet string of the remainder of the payload. Should be ignored. + tooMuchData[baseLen] = 0x04; + tooMuchData[baseLen + 1] = 28; + + TestParseDocument(tooMuchData, testData, baseLen); + } + + private static void TestParseDocument( + ReadOnlyMemory tokenBytes, + TimestampTokenTestData testData, + int? expectedBytesRead) + { + int bytesRead; + Rfc3161TimestampToken token; + + Assert.True( + Rfc3161TimestampToken.TryDecode(tokenBytes, out token, out bytesRead), + "Rfc3161TimestampToken.TryDecode"); + + if (expectedBytesRead != null) + { + Assert.Equal(expectedBytesRead.Value, bytesRead); + } + + Assert.NotNull(token); + TimestampTokenInfoTests.AssertEqual(testData, token.TokenInfo); + + SignedCms signedCms = token.AsSignedCms(); + Assert.NotNull(signedCms); + Assert.Equal(Oids.TstInfo, signedCms.ContentInfo.ContentType.Value); + + Assert.Equal( + testData.TokenInfoBytes.ByteArrayToHex(), + signedCms.ContentInfo.Content.ByteArrayToHex()); + + if (testData.EmbeddedSigningCertificate != null) + { + Assert.NotNull(signedCms.SignerInfos[0].Certificate); + + Assert.Equal( + testData.EmbeddedSigningCertificate.Value.ByteArrayToHex(), + signedCms.SignerInfos[0].Certificate.RawData.ByteArrayToHex()); + + // Assert.NoThrow + signedCms.CheckSignature(true); + } + else + { + Assert.Null(signedCms.SignerInfos[0].Certificate); + + using (var signerCert = new X509Certificate2(testData.ExternalCertificateBytes)) + { + // Assert.NoThrow + signedCms.CheckSignature( + new X509Certificate2Collection(signerCert), + true); + } + } + + X509Certificate2 returnedCert; + ReadOnlySpan messageContentSpan = testData.MessageContent.Span; + X509Certificate2Collection candidates = null; + + if (testData.EmbeddedSigningCertificate != null) + { + Assert.True( + token.VerifySignatureForData(messageContentSpan, out returnedCert), + "token.VerifySignatureForData(correct)"); + + Assert.NotNull(returnedCert); + Assert.Equal(signedCms.SignerInfos[0].Certificate, returnedCert); + } + else + { + candidates = new X509Certificate2Collection + { + new X509Certificate2(testData.ExternalCertificateBytes), + }; + + Assert.False( + token.VerifySignatureForData(messageContentSpan, out returnedCert), + "token.VerifySignatureForData(correct, no cert)"); + + Assert.Null(returnedCert); + + Assert.True( + token.VerifySignatureForData(messageContentSpan, out returnedCert, candidates), + "token.VerifySignatureForData(correct, certs)"); + + Assert.NotNull(returnedCert); + Assert.Equal(candidates[0], returnedCert); + } + + X509Certificate2 previousCert = returnedCert; + + Assert.False( + token.VerifySignatureForData(messageContentSpan.Slice(1), out returnedCert, candidates), + "token.VerifySignatureForData(incorrect)"); + + Assert.Null(returnedCert); + + byte[] messageHash = testData.HashBytes.ToArray(); + + Assert.False( + token.VerifySignatureForHash(messageHash, HashAlgorithmName.MD5, out returnedCert, candidates), + "token.VerifyHash(correct, MD5)"); + Assert.Null(returnedCert); + + Assert.False( + token.VerifySignatureForHash(messageHash, new Oid(Oids.Md5), out returnedCert, candidates), + "token.VerifyHash(correct, Oid(MD5))"); + Assert.Null(returnedCert); + + Assert.True( + token.VerifySignatureForHash(messageHash, new Oid(testData.HashAlgorithmId), out returnedCert, candidates), + "token.VerifyHash(correct, Oid(algId))"); + Assert.NotNull(returnedCert); + Assert.Equal(previousCert, returnedCert); + + messageHash[0] ^= 0xFF; + Assert.False( + token.VerifySignatureForHash(messageHash, new Oid(testData.HashAlgorithmId), out returnedCert, candidates), + "token.VerifyHash(incorrect, Oid(algId))"); + Assert.Null(returnedCert); + } + + [Fact] + public static void TryDecode_Fails_SignedCmsOfData() + { + Assert.False( + Rfc3161TimestampToken.TryDecode( + SignedDocuments.RsaPkcs1OneSignerIssuerAndSerialNumber, + out Rfc3161TimestampToken token, + out int bytesRead), + "Rfc3161TimestampToken.TryDecode"); + + Assert.Equal(0, bytesRead); + Assert.Null(token); + } + + [Fact] + public static void TryDecode_Fails_Empty() + { + Assert.False( + Rfc3161TimestampToken.TryDecode( + ReadOnlyMemory.Empty, + out Rfc3161TimestampToken token, + out int bytesRead), + "Rfc3161TimestampToken.TryDecode"); + + Assert.Equal(0, bytesRead); + Assert.Null(token); + } + + [Fact] + public static void TryDecode_Fails_EnvelopedCms() + { + byte[] encodedMessage = + ("3082010c06092a864886f70d010703a081fe3081fb0201003181c83081c5020100302e301a311830160603550403130f5253" + + "414b65795472616e7366657231021031d935fb63e8cfab48a0bf7b397b67c0300d06092a864886f70d010101050004818013" + + "dc0eb2984a445d04a1f6246b8fe41f1d24507548d449d454d5bb5e0638d75ed101bf78c0155a5d208eb746755fbccbc86923" + + "8443760a9ae94770d6373e0197be23a6a891f0c522ca96b3e8008bf23547474b7e24e7f32e8134df3862d84f4dea2470548e" + + "c774dd74f149a56cdd966e141122900d00ad9d10ea1848541294a1302b06092a864886f70d010701301406082a864886f70d" + + "030704089c8119f6cf6b174c8008bcea3a10d0737eb9").HexToByteArray(); + + Assert.False( + Rfc3161TimestampToken.TryDecode( + encodedMessage, + out Rfc3161TimestampToken token, + out int bytesRead), + "Rfc3161TimestampToken.TryDecode"); + + Assert.Equal(0, bytesRead); + Assert.Null(token); + } + + [Fact] + public static void TryDecode_Fails_MalformedToken() + { + ContentInfo contentInfo = new ContentInfo( + new Oid(Oids.TstInfo, Oids.TstInfo), + new byte[] { 1 }); + + SignedCms cms = new SignedCms(contentInfo); + + using (X509Certificate2 cert = Certificates.RSAKeyTransferCapi1.TryGetCertificateWithPrivateKey()) + { + cms.ComputeSignature(new CmsSigner(SubjectIdentifierType.IssuerAndSerialNumber, cert)); + } + + Assert.False( + Rfc3161TimestampToken.TryDecode( + cms.Encode(), + out Rfc3161TimestampToken token, + out int bytesRead), + "Rfc3161TimestampToken.TryDecode"); + + Assert.Equal(0, bytesRead); + Assert.Null(token); + } + + [Theory] + [InlineData(X509IncludeOption.WholeChain, SigningCertificateOption.ValidHashNoName)] + [InlineData(X509IncludeOption.None, SigningCertificateOption.ValidHashNoName)] + [InlineData(X509IncludeOption.WholeChain, SigningCertificateOption.ValidHashWithName)] + [InlineData(X509IncludeOption.None, SigningCertificateOption.ValidHashWithName)] + public static void MatchV1(X509IncludeOption includeOption, SigningCertificateOption v1Option) + { + CustomBuild_CertMatch( + Certificates.ValidLookingTsaCert, + new DateTimeOffset(2018, 1, 10, 17, 21, 11, 802, TimeSpan.Zero), + v1Option, + SigningCertificateOption.Omit, + includeOption: includeOption); + } + + [Theory] + [InlineData(X509IncludeOption.WholeChain)] + [InlineData(X509IncludeOption.None)] + public static void CertHashMismatchV1(X509IncludeOption includeOption) + { + CustomBuild_CertMismatch( + Certificates.ValidLookingTsaCert, + new DateTimeOffset(2018, 1, 10, 17, 21, 11, 802, TimeSpan.Zero), + SigningCertificateOption.InvalidHashNoName, + SigningCertificateOption.Omit, + includeOption: includeOption); + } + + [Theory] + [InlineData( + X509IncludeOption.WholeChain, + SigningCertificateOption.ValidHashWithInvalidName, + SubjectIdentifierType.SubjectKeyIdentifier)] + [InlineData( + X509IncludeOption.None, + SigningCertificateOption.ValidHashWithInvalidName, + SubjectIdentifierType.SubjectKeyIdentifier)] + [InlineData( + X509IncludeOption.WholeChain, + SigningCertificateOption.ValidHashWithInvalidName, + SubjectIdentifierType.IssuerAndSerialNumber)] + [InlineData( + X509IncludeOption.None, + SigningCertificateOption.ValidHashWithInvalidName, + SubjectIdentifierType.IssuerAndSerialNumber)] + public static void CertMismatchIssuerAndSerialV1( + X509IncludeOption includeOption, + SigningCertificateOption v1Option, + SubjectIdentifierType identifierType) + { + CustomBuild_CertMismatch( + Certificates.ValidLookingTsaCert, + new DateTimeOffset(2018, 1, 10, 17, 21, 11, 802, TimeSpan.Zero), + v1Option, + SigningCertificateOption.Omit, + includeOption: includeOption, + identifierType: identifierType); + } + + [Theory] + [InlineData( + X509IncludeOption.WholeChain, + SigningCertificateOption.ValidHashNoName, + null)] + [InlineData( + X509IncludeOption.None, + SigningCertificateOption.ValidHashNoName, + null)] + [InlineData( + X509IncludeOption.WholeChain, + SigningCertificateOption.ValidHashWithName, + "MD5")] + [InlineData( + X509IncludeOption.None, + SigningCertificateOption.ValidHashWithName, + "MD5")] + [InlineData( + X509IncludeOption.WholeChain, + SigningCertificateOption.ValidHashWithName, + "SHA1")] + [InlineData( + X509IncludeOption.None, + SigningCertificateOption.ValidHashWithName, + "SHA1")] + [InlineData( + X509IncludeOption.WholeChain, + SigningCertificateOption.ValidHashWithName, + "SHA384")] + [InlineData( + X509IncludeOption.None, + SigningCertificateOption.ValidHashWithName, + "SHA384")] + public static void MatchV2( + X509IncludeOption includeOption, + SigningCertificateOption v2Option, + string hashAlgName) + { + CustomBuild_CertMatch( + Certificates.ValidLookingTsaCert, + new DateTimeOffset(2018, 1, 10, 17, 21, 11, 802, TimeSpan.Zero), + SigningCertificateOption.Omit, + v2Option, + hashAlgName == null ? default(HashAlgorithmName) : new HashAlgorithmName(hashAlgName), + includeOption); + } + + [Theory] + [InlineData(X509IncludeOption.WholeChain, null)] + [InlineData(X509IncludeOption.None, null)] + [InlineData(X509IncludeOption.WholeChain, "MD5")] + [InlineData(X509IncludeOption.None, "MD5")] + [InlineData(X509IncludeOption.WholeChain, "SHA1")] + [InlineData(X509IncludeOption.None, "SHA1")] + [InlineData(X509IncludeOption.WholeChain, "SHA384")] + [InlineData(X509IncludeOption.None, "SHA384")] + public static void CertHashMismatchV2(X509IncludeOption includeOption, string hashAlgName) + { + CustomBuild_CertMismatch( + Certificates.ValidLookingTsaCert, + new DateTimeOffset(2018, 1, 10, 17, 21, 11, 802, TimeSpan.Zero), + SigningCertificateOption.Omit, + SigningCertificateOption.InvalidHashNoName, + hashAlgName == null ? default(HashAlgorithmName) : new HashAlgorithmName(hashAlgName), + includeOption: includeOption); + } + + [Theory] + [InlineData( + X509IncludeOption.WholeChain, + SigningCertificateOption.ValidHashWithInvalidName, + SubjectIdentifierType.SubjectKeyIdentifier, + null)] + [InlineData( + X509IncludeOption.None, + SigningCertificateOption.ValidHashWithInvalidName, + SubjectIdentifierType.SubjectKeyIdentifier, + null)] + [InlineData( + X509IncludeOption.WholeChain, + SigningCertificateOption.ValidHashWithInvalidName, + SubjectIdentifierType.SubjectKeyIdentifier, + "SHA384")] + [InlineData( + X509IncludeOption.None, + SigningCertificateOption.ValidHashWithInvalidName, + SubjectIdentifierType.SubjectKeyIdentifier, + "SHA384")] + [InlineData( + X509IncludeOption.WholeChain, + SigningCertificateOption.ValidHashWithInvalidName, + SubjectIdentifierType.IssuerAndSerialNumber, + null)] + [InlineData( + X509IncludeOption.None, + SigningCertificateOption.ValidHashWithInvalidName, + SubjectIdentifierType.IssuerAndSerialNumber, + null)] + [InlineData( + X509IncludeOption.WholeChain, + SigningCertificateOption.ValidHashWithInvalidName, + SubjectIdentifierType.IssuerAndSerialNumber, + "SHA384")] + [InlineData( + X509IncludeOption.None, + SigningCertificateOption.ValidHashWithInvalidName, + SubjectIdentifierType.IssuerAndSerialNumber, + "SHA384")] + public static void CertMismatchIssuerAndSerialV2( + X509IncludeOption includeOption, + SigningCertificateOption v2Option, + SubjectIdentifierType identifierType, + string hashAlgName) + { + CustomBuild_CertMismatch( + Certificates.ValidLookingTsaCert, + new DateTimeOffset(2018, 1, 10, 17, 21, 11, 802, TimeSpan.Zero), + SigningCertificateOption.Omit, + v2Option, + hashAlgName == null ? default(HashAlgorithmName) : new HashAlgorithmName(hashAlgName), + includeOption: includeOption, + identifierType: identifierType); + } + + [Theory] + [InlineData( + X509IncludeOption.WholeChain, + SigningCertificateOption.ValidHashNoName, + SigningCertificateOption.ValidHashNoName, + null)] + [InlineData( + X509IncludeOption.WholeChain, + SigningCertificateOption.ValidHashNoName, + SigningCertificateOption.ValidHashNoName, + "SHA512")] + [InlineData( + X509IncludeOption.None, + SigningCertificateOption.ValidHashNoName, + SigningCertificateOption.ValidHashNoName, + null)] + [InlineData( + X509IncludeOption.None, + SigningCertificateOption.ValidHashNoName, + SigningCertificateOption.ValidHashNoName, + "SHA512")] + [InlineData( + X509IncludeOption.WholeChain, + SigningCertificateOption.ValidHashNoName, + SigningCertificateOption.ValidHashWithName, + null)] + [InlineData( + X509IncludeOption.WholeChain, + SigningCertificateOption.ValidHashNoName, + SigningCertificateOption.ValidHashWithName, + "SHA384")] + [InlineData( + X509IncludeOption.None, + SigningCertificateOption.ValidHashNoName, + SigningCertificateOption.ValidHashWithName, + null)] + [InlineData( + X509IncludeOption.None, + SigningCertificateOption.ValidHashNoName, + SigningCertificateOption.ValidHashWithName, + "SHA384")] + [InlineData( + X509IncludeOption.WholeChain, + SigningCertificateOption.ValidHashWithName, + SigningCertificateOption.ValidHashNoName, + null)] + [InlineData( + X509IncludeOption.WholeChain, + SigningCertificateOption.ValidHashWithName, + SigningCertificateOption.ValidHashNoName, + "SHA512")] + [InlineData( + X509IncludeOption.None, + SigningCertificateOption.ValidHashWithName, + SigningCertificateOption.ValidHashNoName, + null)] + [InlineData( + X509IncludeOption.None, + SigningCertificateOption.ValidHashWithName, + SigningCertificateOption.ValidHashNoName, + "SHA512")] + [InlineData( + X509IncludeOption.WholeChain, + SigningCertificateOption.ValidHashWithName, + SigningCertificateOption.ValidHashWithName, + null)] + [InlineData( + X509IncludeOption.WholeChain, + SigningCertificateOption.ValidHashWithName, + SigningCertificateOption.ValidHashWithName, + "SHA384")] + [InlineData( + X509IncludeOption.None, + SigningCertificateOption.ValidHashWithName, + SigningCertificateOption.ValidHashWithName, + null)] + [InlineData( + X509IncludeOption.None, + SigningCertificateOption.ValidHashWithName, + SigningCertificateOption.ValidHashWithName, + "SHA384")] + public static void CertMatchV1AndV2( + X509IncludeOption includeOption, + SigningCertificateOption v1Option, + SigningCertificateOption v2Option, + string hashAlgName) + { + CustomBuild_CertMatch( + Certificates.ValidLookingTsaCert, + new DateTimeOffset(2018, 1, 10, 17, 21, 11, 802, TimeSpan.Zero), + v1Option, + v2Option, + hashAlgName == null ? default(HashAlgorithmName) : new HashAlgorithmName(hashAlgName), + includeOption); + } + + [Theory] + [InlineData( + X509IncludeOption.None, + SigningCertificateOption.InvalidHashNoName, + SigningCertificateOption.ValidHashWithName, + SubjectIdentifierType.IssuerAndSerialNumber, + null)] + [InlineData( + X509IncludeOption.WholeChain, + SigningCertificateOption.ValidHashWithInvalidSerial, + SigningCertificateOption.ValidHashWithName, + SubjectIdentifierType.IssuerAndSerialNumber, + "SHA384")] + [InlineData( + X509IncludeOption.WholeChain, + SigningCertificateOption.ValidHashWithInvalidName, + SigningCertificateOption.InvalidHashNoName, + SubjectIdentifierType.SubjectKeyIdentifier, + null)] + [InlineData( + X509IncludeOption.None, + SigningCertificateOption.ValidHashWithName, + SigningCertificateOption.InvalidHashNoName, + SubjectIdentifierType.SubjectKeyIdentifier, + "SHA512")] + [InlineData( + X509IncludeOption.WholeChain, + SigningCertificateOption.InvalidHashWithInvalidSerial, + SigningCertificateOption.ValidHashNoName, + SubjectIdentifierType.IssuerAndSerialNumber, + null)] + public static void CertMismatchV1OrV2( + X509IncludeOption includeOption, + SigningCertificateOption v1Option, + SigningCertificateOption v2Option, + SubjectIdentifierType identifierType, + string hashAlgName) + { + CustomBuild_CertMismatch( + Certificates.ValidLookingTsaCert, + new DateTimeOffset(2018, 1, 10, 17, 21, 11, 802, TimeSpan.Zero), + v1Option, + v2Option, + hashAlgName == null ? default(HashAlgorithmName) : new HashAlgorithmName(hashAlgName), + includeOption: includeOption, + identifierType: identifierType); + } + + [Theory] + [InlineData(X509IncludeOption.WholeChain)] + [InlineData(X509IncludeOption.None)] + public static void TimestampTooOld(X509IncludeOption includeOption) + { + CertLoader loader = Certificates.ValidLookingTsaCert; + DateTimeOffset referenceTime; + + using (X509Certificate2 cert = loader.GetCertificate()) + { + referenceTime = cert.NotBefore.AddSeconds(-1); + } + + CustomBuild_CertMismatch( + loader, + referenceTime, + SigningCertificateOption.ValidHashNoName, + SigningCertificateOption.Omit, + includeOption: includeOption); + } + + [Theory] + [InlineData(X509IncludeOption.WholeChain)] + [InlineData(X509IncludeOption.None)] + public static void TimestampTooNew(X509IncludeOption includeOption) + { + CertLoader loader = Certificates.ValidLookingTsaCert; + DateTimeOffset referenceTime; + + using (X509Certificate2 cert = loader.GetCertificate()) + { + referenceTime = cert.NotAfter.AddSeconds(1); + } + + CustomBuild_CertMismatch( + loader, + referenceTime, + SigningCertificateOption.ValidHashNoName, + SigningCertificateOption.Omit, + includeOption: includeOption); + } + + [Theory] + [InlineData(X509IncludeOption.WholeChain)] + [InlineData(X509IncludeOption.None)] + public static void NoEkuExtension(X509IncludeOption includeOption) + { + CertLoader loader = Certificates.RSA2048SignatureOnly; + DateTimeOffset referenceTime; + + using (X509Certificate2 cert = loader.GetCertificate()) + { + referenceTime = cert.NotAfter.AddDays(-1); + + Assert.Equal(0, cert.Extensions.OfType().Count()); + } + + CustomBuild_CertMismatch( + loader, + referenceTime, + SigningCertificateOption.ValidHashNoName, + SigningCertificateOption.Omit, + includeOption: includeOption); + } + + [Theory] + [InlineData(X509IncludeOption.WholeChain)] + [InlineData(X509IncludeOption.None)] + public static void TwoEkuExtensions(X509IncludeOption includeOption) + { + CertLoader loader = Certificates.TwoEkuTsaCert; + DateTimeOffset referenceTime; + + using (X509Certificate2 cert = loader.GetCertificate()) + { + referenceTime = cert.NotAfter.AddDays(-1); + + var ekuExts = cert.Extensions.OfType().ToList(); + + Assert.Equal(2, ekuExts.Count); + + // Make sure we're validating that "early success" doesn't happen. + Assert.Contains( + Oids.TimeStampingPurpose, + ekuExts[0].EnhancedKeyUsages.OfType().Select(o => o.Value)); + } + + CustomBuild_CertMismatch( + loader, + referenceTime, + SigningCertificateOption.ValidHashNoName, + SigningCertificateOption.Omit, + includeOption: includeOption); + } + + [Theory] + [InlineData(X509IncludeOption.WholeChain)] + [InlineData(X509IncludeOption.None)] + public static void NonCriticalEkuExtension(X509IncludeOption includeOption) + { + CertLoader loader = Certificates.NonCriticalTsaEku; + DateTimeOffset referenceTime; + + using (X509Certificate2 cert = loader.GetCertificate()) + { + referenceTime = cert.NotAfter.AddDays(-1); + + var ekuExts = cert.Extensions.OfType().ToList(); + + Assert.Equal(1, ekuExts.Count); + Assert.False(ekuExts[0].Critical, "ekuExts[0].Critical"); + } + + CustomBuild_CertMismatch( + loader, + referenceTime, + SigningCertificateOption.ValidHashNoName, + SigningCertificateOption.Omit, + includeOption: includeOption); + } + + [Theory] + [InlineData(X509IncludeOption.WholeChain)] + [InlineData(X509IncludeOption.None)] + public static void NoTsaEku(X509IncludeOption includeOption) + { + CertLoader loader = Certificates.TlsClientServerCert; + DateTimeOffset referenceTime; + + using (X509Certificate2 cert = loader.GetCertificate()) + { + referenceTime = cert.NotAfter.AddDays(-1); + } + + CustomBuild_CertMismatch( + loader, + referenceTime, + SigningCertificateOption.ValidHashNoName, + SigningCertificateOption.Omit, + includeOption: includeOption); + } + + private static void CustomBuild_CertMatch( + CertLoader loader, + DateTimeOffset referenceTime, + SigningCertificateOption v1Option, + SigningCertificateOption v2Option, + HashAlgorithmName v2AlgorithmName = default, + X509IncludeOption includeOption = default, + SubjectIdentifierType identifierType = SubjectIdentifierType.IssuerAndSerialNumber) + { + byte[] tokenBytes = BuildCustomToken( + loader, + referenceTime, + v1Option, + v2Option, + v2AlgorithmName, + includeOption, + identifierType); + + Rfc3161TimestampToken token; + Assert.True(Rfc3161TimestampToken.TryDecode(tokenBytes, out token, out int bytesRead)); + + Assert.Equal(tokenBytes.Length, bytesRead); + Assert.NotNull(token); + + Assert.Equal(referenceTime, token.TokenInfo.Timestamp); + + using (X509Certificate2 cert = Certificates.ValidLookingTsaCert.GetCertificate()) + { + Assert.True( + token.VerifySignatureForHash( + token.TokenInfo.GetMessageHash().Span, + token.TokenInfo.HashAlgorithmId, + out X509Certificate2 signer, + new X509Certificate2Collection(cert))); + + Assert.Equal(cert, signer); + } + } + + private static void CustomBuild_CertMismatch( + CertLoader loader, + DateTimeOffset referenceTime, + SigningCertificateOption v1Option, + SigningCertificateOption v2Option, + HashAlgorithmName v2AlgorithmName = default, + X509IncludeOption includeOption = default, + SubjectIdentifierType identifierType = SubjectIdentifierType.IssuerAndSerialNumber) + { + byte[] tokenBytes = BuildCustomToken( + loader, + referenceTime, + v1Option, + v2Option, + v2AlgorithmName, + includeOption, + identifierType); + + Rfc3161TimestampToken token; + + bool willParse = includeOption == X509IncludeOption.None; + + if (willParse && identifierType == SubjectIdentifierType.IssuerAndSerialNumber) + { + // Because IASN matches against the ESSCertId(V2) directly it will reject the token. + + switch (v1Option) + { + case SigningCertificateOption.ValidHashWithInvalidName: + case SigningCertificateOption.ValidHashWithInvalidSerial: + case SigningCertificateOption.InvalidHashWithInvalidName: + case SigningCertificateOption.InvalidHashWithInvalidSerial: + willParse = false; + break; + } + + switch (v2Option) + { + case SigningCertificateOption.ValidHashWithInvalidName: + case SigningCertificateOption.ValidHashWithInvalidSerial: + case SigningCertificateOption.InvalidHashWithInvalidName: + case SigningCertificateOption.InvalidHashWithInvalidSerial: + willParse = false; + break; + } + } + + if (willParse) + { + Assert.True(Rfc3161TimestampToken.TryDecode(tokenBytes, out token, out int bytesRead)); + Assert.NotNull(token); + Assert.Equal(tokenBytes.Length, bytesRead); + + using (X509Certificate2 cert = loader.GetCertificate()) + { + Assert.False( + token.VerifySignatureForHash( + token.TokenInfo.GetMessageHash().Span, + token.TokenInfo.HashAlgorithmId, + out X509Certificate2 signer, + new X509Certificate2Collection(cert))); + + Assert.Null(signer); + } + } + else + { + Assert.False(Rfc3161TimestampToken.TryDecode(tokenBytes, out token, out int bytesRead)); + + Assert.Null(token); + Assert.Equal(0, bytesRead); + } + } + + private static byte[] BuildCustomToken( + CertLoader cert, + DateTimeOffset timestamp, + SigningCertificateOption v1Option, + SigningCertificateOption v2Option, + HashAlgorithmName v2DigestAlg=default, + X509IncludeOption includeOption=X509IncludeOption.ExcludeRoot, + SubjectIdentifierType identifierType=SubjectIdentifierType.IssuerAndSerialNumber) + { + long accuracyMicroSeconds = (long)(TimeSpan.FromMinutes(1).TotalMilliseconds * 1000); + + byte[] serialNumber = BitConverter.GetBytes(DateTimeOffset.UtcNow.Ticks); + Array.Reverse(serialNumber); + + Rfc3161TimestampTokenInfo info = new Rfc3161TimestampTokenInfo( + new Oid("0.0", "0.0"), + new Oid(Oids.Sha384), + new byte[384 / 8], + serialNumber, + timestamp, + accuracyMicroSeconds, + isOrdering: true); + + ContentInfo contentInfo = new ContentInfo(new Oid(Oids.TstInfo, Oids.TstInfo), info.Encode()); + SignedCms cms = new SignedCms(contentInfo); + + using (X509Certificate2 tsaCert = cert.TryGetCertificateWithPrivateKey()) + { + CmsSigner signer = new CmsSigner(identifierType, tsaCert) + { + IncludeOption = includeOption + }; + + if (v1Option != SigningCertificateOption.Omit) + { + ExpandOption(v1Option, out bool validHash, out bool skipIssuerSerial, out bool validName, out bool validSerial); + + // simple SigningCertificate + byte[] signingCertificateV1Bytes = + "301A3018301604140000000000000000000000000000000000000000".HexToByteArray(); + + if (validHash) + { + using (SHA1 hasher = SHA1.Create()) + { + byte[] hash = hasher.ComputeHash(tsaCert.RawData); + + Buffer.BlockCopy( + hash, + 0, + signingCertificateV1Bytes, + signingCertificateV1Bytes.Length - hash.Length, + hash.Length); + } + } + + if (!skipIssuerSerial) + { + byte[] footer = BuildIssuerAndSerialNumber(tsaCert, validName, validSerial); + + signingCertificateV1Bytes[1] += (byte)footer.Length; + signingCertificateV1Bytes[3] += (byte)footer.Length; + signingCertificateV1Bytes[5] += (byte)footer.Length; + + Assert.InRange(signingCertificateV1Bytes[1], 0, 127); + + signingCertificateV1Bytes = signingCertificateV1Bytes.Concat(footer).ToArray(); + } + + signer.SignedAttributes.Add( + new AsnEncodedData("1.2.840.113549.1.9.16.2.12", signingCertificateV1Bytes)); + } + + if (v2Option != SigningCertificateOption.Omit) + { + byte[] attrBytes; + byte[] algBytes = Array.Empty(); + byte[] hashBytes; + byte[] issuerNameBytes = Array.Empty(); + + if (v2DigestAlg != default) + { + switch (v2DigestAlg.Name) + { + case "MD5": + algBytes = "300C06082A864886F70D02050500".HexToByteArray(); + break; + case "SHA1": + algBytes = "300906052B0E03021A0500".HexToByteArray(); + break; + case "SHA256": + // Invalid under DER, because it's the default. + algBytes = "300D06096086480165030402010500".HexToByteArray(); + break; + case "SHA384": + algBytes = "300D06096086480165030402020500".HexToByteArray(); + break; + case "SHA512": + algBytes = "300D06096086480165030402030500".HexToByteArray(); + break; + default: + throw new NotSupportedException(v2DigestAlg.Name); + } + } + else + { + v2DigestAlg = HashAlgorithmName.SHA256; + } + + hashBytes = tsaCert.GetCertHash(v2DigestAlg); + + ExpandOption(v2Option, out bool validHash, out bool skipIssuerSerial, out bool validName, out bool validSerial); + + if (!validHash) + { + hashBytes[0] ^= 0xFF; + } + + if (!skipIssuerSerial) + { + issuerNameBytes = BuildIssuerAndSerialNumber(tsaCert, validName, validSerial); + } + + // hashBytes hasn't been wrapped in an OCTET STRING yet, so add 2 more. + int payloadSize = algBytes.Length + hashBytes.Length + issuerNameBytes.Length + 2; + Assert.InRange(payloadSize, 0, 123); + + attrBytes = new byte[payloadSize + 6]; + + int index = 0; + + // SEQUENCE (SigningCertificateV2) + attrBytes[index++] = 0x30; + attrBytes[index++] = (byte)(payloadSize + 4); + + // SEQUENCE OF => certs + attrBytes[index++] = 0x30; + attrBytes[index++] = (byte)(payloadSize + 2); + + // SEQUENCE (ESSCertIdV2) + attrBytes[index++] = 0x30; + attrBytes[index++] = (byte)payloadSize; + + Buffer.BlockCopy(algBytes, 0, attrBytes, index, algBytes.Length); + index += algBytes.Length; + + // OCTET STRING (Hash) + attrBytes[index++] = 0x04; + attrBytes[index++] = (byte)hashBytes.Length; + Buffer.BlockCopy(hashBytes, 0, attrBytes, index, hashBytes.Length); + index += hashBytes.Length; + + Buffer.BlockCopy(issuerNameBytes, 0, attrBytes, index, issuerNameBytes.Length); + + signer.SignedAttributes.Add( + new AsnEncodedData("1.2.840.113549.1.9.16.2.47", attrBytes)); + } + + cms.ComputeSignature(signer); + } + + return cms.Encode(); + } + + private static byte[] BuildIssuerAndSerialNumber(X509Certificate2 tsaCert, bool validName, bool validSerial) + { + byte[] issuerNameBytes; + + if (validName) + { + issuerNameBytes = tsaCert.IssuerName.RawData; + } + else + { + issuerNameBytes = new X500DistinguishedName("CN=No Match").RawData; + } + + byte[] serialBytes = tsaCert.GetSerialNumber(); + + if (validSerial) + { + Array.Reverse(serialBytes); + } + else + { + // If the byte sequence was a palindrome it's still a match, + // so flip some bits. + serialBytes[0] ^= 0x7F; + } + + if (issuerNameBytes.Length + serialBytes.Length > 80) + { + throw new NotSupportedException( + "Issuer name and serial length are bigger than this code can handle"); + } + + // SEQUENCE + // SEQUENCE + // CONTEXT-SPECIFIC 4 + // [IssuerName] + // INTEGER + // [SerialNumber, big endian] + + byte[] issuerAndSerialNumber = new byte[issuerNameBytes.Length + serialBytes.Length + 8]; + issuerAndSerialNumber[0] = 0x30; + issuerAndSerialNumber[1] = (byte)(issuerAndSerialNumber.Length - 2); + + issuerAndSerialNumber[2] = 0x30; + issuerAndSerialNumber[3] = (byte)(issuerNameBytes.Length + 2); + + issuerAndSerialNumber[4] = 0xA4; + issuerAndSerialNumber[5] = (byte)(issuerNameBytes.Length); + Buffer.BlockCopy(issuerNameBytes, 0, issuerAndSerialNumber, 6, issuerNameBytes.Length); + + issuerAndSerialNumber[issuerNameBytes.Length + 6] = 0x02; + issuerAndSerialNumber[issuerNameBytes.Length + 7] = (byte)serialBytes.Length; + Buffer.BlockCopy(serialBytes, 0, issuerAndSerialNumber, issuerNameBytes.Length + 8, serialBytes.Length); + + return issuerAndSerialNumber; + } + + private static void ExpandOption( + SigningCertificateOption option, + out bool validHash, + out bool skipIssuerSerial, + out bool validName, + out bool validSerial) + { + Assert.NotEqual(SigningCertificateOption.Omit, option); + + validHash = option < SigningCertificateOption.InvalidHashNoName; + + skipIssuerSerial = + option == SigningCertificateOption.ValidHashNoName || + option == SigningCertificateOption.InvalidHashNoName; + + if (skipIssuerSerial) + { + validName = validSerial = false; + } + else + { + validName = + option == SigningCertificateOption.ValidHashWithName || + option == SigningCertificateOption.InvalidHashWithName || + option == SigningCertificateOption.ValidHashWithInvalidSerial || + option == SigningCertificateOption.InvalidHashWithInvalidSerial; + + validSerial = + option == SigningCertificateOption.ValidHashWithName || + option == SigningCertificateOption.InvalidHashWithName || + option == SigningCertificateOption.ValidHashWithInvalidName || + option == SigningCertificateOption.InvalidHashWithInvalidName; + } + } + + public enum SigningCertificateOption + { + Omit, + ValidHashNoName, + ValidHashWithName, + ValidHashWithInvalidName, + ValidHashWithInvalidSerial, + InvalidHashNoName, + InvalidHashWithName, + InvalidHashWithInvalidName, + InvalidHashWithInvalidSerial, + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/SignedCms/CmsSignerTests.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/SignedCms/CmsSignerTests.cs new file mode 100644 index 0000000000..142449e5d9 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/SignedCms/CmsSignerTests.cs @@ -0,0 +1,24 @@ +// 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.Linq; +using System.Security.Cryptography.X509Certificates; +using System.Security.Cryptography.Xml; +using Test.Cryptography; +using Xunit; + +namespace System.Security.Cryptography.Pkcs.Tests +{ + public static partial class CmsSignerTests + { + [Fact] + public void SignerIdentifierType_InvalidValues() + { + CmsSigner signer = new CmsSigner(); + Assert.ThrowsAny(() => signer.SignerIdentifierType = SubjectIdentifierType.Unknown); + Assert.ThrowsAny(() => signer.SignerIdentifierType = (SubjectIdentifierType)4); + Assert.ThrowsAny(() => signer.SignerIdentifierType = (SubjectIdentifierType)-1); + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedCmsTests.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedCmsTests.cs index 4d131a5ea8..fbb0950fcd 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedCmsTests.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedCmsTests.cs @@ -204,7 +204,7 @@ namespace System.Security.Cryptography.Pkcs.Tests { byte[] basis = SignedDocuments.RsaPkcs1OneSignerIssuerAndSerialNumber; byte[] data = new byte[basis.Length + 60]; - data.AsSpan().Slice(basis.Length).Fill(0x5E); + data.AsSpan(basis.Length).Fill(0x5E); basis.AsSpan().CopyTo(data); SignedCms cms = new SignedCms(); @@ -890,5 +890,183 @@ namespace System.Security.Cryptography.Pkcs.Tests // Assert.NoThrow cms.CheckSignature(true); } + + [Fact] + public static void SignerInfoCollection_Indexer_MinusOne () + { + SignedCms cms = new SignedCms(); + cms.Decode(SignedDocuments.RsaPkcs1OneSignerIssuerAndSerialNumber); + + Assert.Throws(() => cms.SignerInfos[-1]); + Assert.Throws(() => cms.SignerInfos[1]); + } + + [Theory] + [InlineData(SubjectIdentifierType.IssuerAndSerialNumber)] + [InlineData(SubjectIdentifierType.SubjectKeyIdentifier)] + public static void SignEnveloped(SubjectIdentifierType signerType) + { + using (X509Certificate2 cert = Certificates.RSAKeyTransferCapi1.TryGetCertificateWithPrivateKey()) + { + EnvelopedCms envelopedCms = new EnvelopedCms(new ContentInfo(new byte[] { 3 })); + envelopedCms.Encrypt(new CmsRecipient(signerType, cert)); + + SignedCms signedCms = new SignedCms( + new ContentInfo(new Oid(Oids.Pkcs7Enveloped), envelopedCms.Encode())); + + signedCms.ComputeSignature(new CmsSigner(cert)); + signedCms.CheckSignature(true); + + SignerInfoCollection signers = signedCms.SignerInfos; + Assert.Equal(1, signers.Count); + + CryptographicAttributeObjectCollection attrs = signers[0].SignedAttributes; + Assert.Equal(2, attrs.Count); + + CryptographicAttributeObject firstAttrSet = attrs[0]; + Assert.Equal(Oids.ContentType, firstAttrSet.Oid.Value); + Assert.Equal(1, firstAttrSet.Values.Count); + Assert.Equal(Oids.ContentType, firstAttrSet.Values[0].Oid.Value); + Assert.Equal("06092A864886F70D010703", firstAttrSet.Values[0].RawData.ByteArrayToHex()); + + CryptographicAttributeObject secondAttrSet = attrs[1]; + Assert.Equal(Oids.MessageDigest, secondAttrSet.Oid.Value); + Assert.Equal(1, secondAttrSet.Values.Count); + Assert.Equal(Oids.MessageDigest, secondAttrSet.Values[0].Oid.Value); + } + } + + [Theory] + [InlineData(Oids.Pkcs7Data, "0102", false)] + // NetFX PKCS7: The length exceeds the payload, so this fails. + [InlineData("0.0", "0102", true)] + [InlineData("0.0", "04020102", false)] + // NetFX PKCS7: The payload exceeds the length, so this fails. + [InlineData("0.0", "0402010203", true)] + [InlineData("0.0", "010100", false)] + [InlineData(Oids.Pkcs7Hashed, "010100", false)] + [InlineData(Oids.Pkcs7Hashed, "3000", false)] + public static void SignIdentifiedContent(string oidValue, string contentHex, bool netfxProblem) + { + SignedCms signedCms = new SignedCms( + new ContentInfo(new Oid(oidValue, "Some Friendly Name"), contentHex.HexToByteArray())); + + using (X509Certificate2 cert = Certificates.RSAKeyTransferCapi1.TryGetCertificateWithPrivateKey()) + { + try + { + signedCms.ComputeSignature(new CmsSigner(cert)); + } + catch (CryptographicException) when (netfxProblem) + { + // When no signed or unsigned attributes are present and the signer uses + // IssuerAndSerial as the identifier type, NetFx uses an older PKCS7 encoding + // of the current CMS one. The older encoding fails on these inputs because of a + // difference in PKCS7 vs CMS encoding of values using types other than Pkcs7Data. + return; + } + + byte[] encoded = signedCms.Encode(); + signedCms.Decode(encoded); + } + + // Assert.NoThrows + signedCms.CheckSignature(true); + + Assert.Equal(oidValue, signedCms.ContentInfo.ContentType.Value); + Assert.Equal(contentHex, signedCms.ContentInfo.Content.ByteArrayToHex()); + } + + [Theory] + [InlineData(null, "0102", Oids.Pkcs7Data)] + [InlineData(null, "010100", Oids.Pkcs7Data)] + [InlineData("potato", "010100", null)] + [InlineData(" 1.1", "010100", null)] + [InlineData("1.1 ", "010100", null)] + [InlineData("1 1", "010100", null)] + public static void SignIdentifiedContent_BadOid(string oidValueIn, string contentHex, string oidValueOut) + { + SignedCms signedCms = new SignedCms( + new ContentInfo(new Oid(oidValueIn, "Some Friendly Name"), contentHex.HexToByteArray())); + + using (X509Certificate2 cert = Certificates.RSAKeyTransferCapi1.TryGetCertificateWithPrivateKey()) + { + Action signAction = () => signedCms.ComputeSignature(new CmsSigner(cert)); + + if (oidValueOut == null) + { + Assert.ThrowsAny(signAction); + return; + } + + signAction(); + + byte[] encoded = signedCms.Encode(); + signedCms.Decode(encoded); + } + + // Assert.NoThrows + signedCms.CheckSignature(true); + + Assert.Equal(oidValueOut, signedCms.ContentInfo.ContentType.Value); + Assert.Equal(contentHex, signedCms.ContentInfo.Content.ByteArrayToHex()); + } + + [Fact] + public static void CheckSignedEncrypted_IssuerSerial_FromNetFx() + { + CheckSignedEncrypted( + SignedDocuments.SignedCmsOverEnvelopedCms_IssuerSerial_NetFx, + SubjectIdentifierType.IssuerAndSerialNumber); + } + + [Fact] + public static void CheckSignedEncrypted_SKID_FromNetFx() + { + CheckSignedEncrypted( + SignedDocuments.SignedCmsOverEnvelopedCms_SKID_NetFx, + SubjectIdentifierType.SubjectKeyIdentifier); + } + + [Fact] + public static void CheckSignedEncrypted_IssuerSerial_FromCoreFx() + { + CheckSignedEncrypted( + SignedDocuments.SignedCmsOverEnvelopedCms_IssuerSerial_CoreFx, + SubjectIdentifierType.IssuerAndSerialNumber); + } + + [Fact] + public static void CheckSignedEncrypted_SKID_FromCoreFx() + { + CheckSignedEncrypted( + SignedDocuments.SignedCmsOverEnvelopedCms_SKID_CoreFx, + SubjectIdentifierType.SubjectKeyIdentifier); + } + + private static void CheckSignedEncrypted(byte[] docBytes, SubjectIdentifierType expectedType) + { + SignedCms signedCms = new SignedCms(); + signedCms.Decode(docBytes); + + Assert.Equal(Oids.Pkcs7Enveloped, signedCms.ContentInfo.ContentType.Value); + + SignerInfoCollection signers = signedCms.SignerInfos; + Assert.Equal(1, signers.Count); + Assert.Equal(expectedType, signers[0].SignerIdentifier.Type); + + // Assert.NotThrows + signedCms.CheckSignature(true); + + EnvelopedCms envelopedCms = new EnvelopedCms(); + envelopedCms.Decode(signedCms.ContentInfo.Content); + + using (X509Certificate2 cert = Certificates.RSAKeyTransferCapi1.TryGetCertificateWithPrivateKey()) + { + envelopedCms.Decrypt(new X509Certificate2Collection(cert)); + } + + Assert.Equal("42", envelopedCms.ContentInfo.Content.ByteArrayToHex()); + } } } diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedDocuments.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedDocuments.cs index 7d0e1fbe06..717669830b 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedDocuments.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedDocuments.cs @@ -395,5 +395,254 @@ namespace System.Security.Cryptography.Pkcs.Tests "0906052B0E03021A0500300906072A8648CE380403042F302D021476DCB780CE" + "D5B308A3630726A85DB97FBC50DFD1021500CDF2649B50500BB7428B9DCA6BEF" + "2C7E7EF1B79C").HexToByteArray(); + + public static byte[] RsaPkcs1TwoCounterSignaturesInSingleAttribute = ( + "30820BBA06092A864886F70D010702A0820BAB30820BA7020101310D300B0609" + + "608648016503040201301406092A864886F70D010701A00704050102030405A0" + + "82081D308201583081FFA003020102021035428F3B3C5107AD49E776D6E74C4D" + + "C8300A06082A8648CE3D04030230153113301106035504030C0A454344534120" + + "54657374301E170D3135303530313030333730335A170D313630353031303035" + + "3730335A30153113301106035504030C0A454344534120546573743059301306" + + "072A8648CE3D020106082A8648CE3D030107034200047590F69CA114E92927E0" + + "34C997B7C882A8C992AC00CEFB4EB831901536F291E1B515263BCD20E1EA3249" + + "6FDAC84E2D8D1B703266A9088F6EAF652549D9BB63D5A331302F300E0603551D" + + "0F0101FF040403020388301D0603551D0E0416041411218A92C5EB12273B3C5C" + + "CFB8220CCCFDF387DB300A06082A8648CE3D040302034800304502201AFE595E" + + "19F1AE4B6A4B231E8851926438C55B5DDE632E6ADF13C1023A65898E022100CB" + + "DF434FDD197D8B594E8026E44263BADE773C2BEBD060CC4109484A498E7C7E30" + + "82032C30820214A003020102020900E0D8AB6819D7306E300D06092A864886F7" + + "0D01010B05003038313630340603550403132D54776F2074686F7573616E6420" + + "666F7274792065696768742062697473206F662052534120676F6F646E657373" + + "301E170D3137313130333233353131355A170D3138313130333233353131355A" + + "3038313630340603550403132D54776F2074686F7573616E6420666F72747920" + + "65696768742062697473206F662052534120676F6F646E65737330820122300D" + + "06092A864886F70D01010105000382010F003082010A028201010096C114A589" + + "8D09133EF859F89C1D848BA8CB5258793E05B92D499C55EEFACE274BBBC26803" + + "FB813B9C11C6898153CC1745DED2C4D2672F807F0B2D957BC4B65EBC9DDE26E2" + + "EA7B2A6FE9A7C4D8BD1EF6032B8F0BB6AA33C8B57248B3D5E3901D8A38A283D7" + + "E25FF8E6F522381EE5484234CFF7B30C174635418FA89E14C468AD89DCFCBBB5" + + "35E5AF53510F9EA7F9DA8C1B53375B6DAB95A291439A5648726EE1012E41388E" + + "100691642CF6917F5569D8351F2782F435A579014E8448EEA0C4AECAFF2F4767" + + "99D88457E2C8BCB56E5E128782B4FE26AFF0720D91D52CCAFE344255808F5271" + + "D09F784F787E8323182080915BE0AE15A71D66476D0F264DD084F30203010001" + + "A3393037301D0603551D0E04160414745B5F12EF962E84B897E246D399A2BADE" + + "A9C5AC30090603551D1304023000300B0603551D0F040403020780300D06092A" + + "864886F70D01010B0500038201010087A15DF37FBD6E9DED7A8FFF25E60B731F" + + "635469BA01DD14BC03B2A24D99EFD8B894E9493D63EC88C496CB04B33DF25222" + + "544F23D43F4023612C4D97B719C1F9431E4DB7A580CDF66A3E5F0DAF89A267DD" + + "187ABFFB08361B1F79232376AA5FC5AD384CC2F98FE36C1CEA0B943E1E396119" + + "0648889C8ABE8397A5A338843CBFB1D8B212BE46685ACE7B80475CC7C97FC037" + + "7936ABD5F664E9C09C463897726650711A1110FA9866BC1C278D95E5636AB96F" + + "AE95CCD67FD572A8C727E2C03E7B242457318BEC1BE52CA5BD9454A0A41140AE" + + "96ED1C56D220D1FD5DD3B1B4FB2AA0E04FC94F7E3C7D476F298962245563953A" + + "D7225EDCEAC8B8509E49292E62D8BF3082038D3082034AA003020102020900AB" + + "740A714AA83C92300B060960864801650304030230818D310B30090603550406" + + "13025553311330110603550408130A57617368696E67746F6E3110300E060355" + + "040713075265646D6F6E64311E301C060355040A13154D6963726F736F667420" + + "436F72706F726174696F6E3120301E060355040B13172E4E4554204672616D65" + + "776F726B2028436F7265465829311530130603550403130C313032342D626974" + + "20445341301E170D3135313132353134343030335A170D313531323235313434" + + "3030335A30818D310B3009060355040613025553311330110603550408130A57" + + "617368696E67746F6E3110300E060355040713075265646D6F6E64311E301C06" + + "0355040A13154D6963726F736F667420436F72706F726174696F6E3120301E06" + + "0355040B13172E4E4554204672616D65776F726B2028436F7265465829311530" + + "130603550403130C313032342D62697420445341308201B73082012C06072A86" + + "48CE3804013082011F02818100AEE3309FC7C9DB750D4C3797D333B3B9B234B4" + + "62868DB6FFBDED790B7FC8DDD574C2BD6F5E749622507AB2C09DF5EAAD84859F" + + "C0706A70BB8C9C8BE22B4890EF2325280E3A7F9A3CE341DBABEF6058D063EA67" + + "83478FF8B3B7A45E0CA3F7BAC9995DCFDDD56DF168E91349130F719A4E717351" + + "FAAD1A77EAC043611DC5CC5A7F021500D23428A76743EA3B49C62EF0AA17314A" + + "85415F0902818100853F830BDAA738465300CFEE02418E6B07965658EAFDA7E3" + + "38A2EB1531C0E0CA5EF1A12D9DDC7B550A5A205D1FF87F69500A4E4AF5759F3F" + + "6E7F0C48C55396B738164D9E35FB506BD50E090F6A497C70E7E868C61BD4477C" + + "1D62922B3DBB40B688DE7C175447E2E826901A109FAD624F1481B276BF63A665" + + "D99C87CEE9FD06330381840002818025B8E7078E149BAC352667623620029F5E" + + "4A5D4126E336D56F1189F9FF71EA671B844EBD351514F27B69685DDF716B32F1" + + "02D60EA520D56F544D19B2F08F5D9BDDA3CBA3A73287E21E559E6A07586194AF" + + "AC4F6E721EDCE49DE0029627626D7BD30EEB337311DB4FF62D7608997B6CC32E" + + "9C42859820CA7EF399590D5A388C48A330302E302C0603551D11042530238704" + + "7F00000187100000000000000000000000000000000182096C6F63616C686F73" + + "74300B0609608648016503040302033000302D021500B9316CC7E05C9F79197E" + + "0B41F6FD4E3FCEB72A8A0214075505CCAECB18B7EF4C00F9C069FA3BC78014DE" + + "3182035A3082035602010130453038313630340603550403132D54776F207468" + + "6F7573616E6420666F7274792065696768742062697473206F66205253412067" + + "6F6F646E657373020900E0D8AB6819D7306E300B060960864801650304020130" + + "0B06092A864886F70D01010104820100457E2996B3A1AE5C7DC2F4EF4D9010F4" + + "8B62B72DFB43F2EDC503FD32408A1058EE7BBCF4750CB4B4242B11A599C40792" + + "70D32D15A57FF791FF59836A027E634B9B97E1764173597A9A6155D5ED5365F6" + + "5DF14FDD15928ABD63E1409DBF2D1A713D20D80E09EE76BC63775F3FA8638A26" + + "ED3816FF87C7CDC8A9299485055BFC38AE158BB6577812AA98436FB54844544A" + + "C92CD449690B8107447044580FAE590D8A7326A8D139886C8A4AC8CEEACB0458" + + "1666D8447D267F1A9E9CAB20F155E05D5EC055AC863C047B5E1E3A98528EA766" + + "7C19B33AD98B2D33ABBD7E607C1DA18BCDB87C626554C277E069CE9EC489BC87" + + "2E7DEAED4C642DE5AB10BD2D558EAFB3A18201EA308201E606092A864886F70D" + + "010906318201D73082010D02010130819B30818D310B30090603550406130255" + + "53311330110603550408130A57617368696E67746F6E3110300E060355040713" + + "075265646D6F6E64311E301C060355040A13154D6963726F736F667420436F72" + + "706F726174696F6E3120301E060355040B13172E4E4554204672616D65776F72" + + "6B2028436F7265465829311530130603550403130C313032342D626974204453" + + "41020900AB740A714AA83C92300706052B0E03021AA025302306092A864886F7" + + "0D0109043116041409200943E2EDD3DD3B186C5839BDC9B1051903FF30090607" + + "2A8648CE380403042F302D0215009FDBE95176B1EC0697155ADDF335E5126A9F" + + "59D60214736F650C74E73BEA577151BCFD226FEDC06832E53081C30201013029" + + "30153113301106035504030C0A45434453412054657374021035428F3B3C5107" + + "AD49E776D6E74C4DC8300B0609608648016503040201A031302F06092A864886" + + "F70D01090431220420DF5D49DB775A8F94CAB3129038B200EDE9FCD2AE8F039D" + + "B1AB96D9B827D299D2300A06082A8648CE3D0403020447304502202327A60E1A" + + "5A798CD29B72C7C7991F968D29DB15C4865BEE83A7E2FD73326CA4022100899F" + + "000179F77BFE296783548EAE56BA7F53C0DB0563A27A36A149BAEC9C23AC").HexToByteArray(); + + internal static readonly byte[] SignedCmsOverEnvelopedCms_IssuerSerial_NetFx = ( + "3082047C06092A864886F70D010702A082046D30820469020101310B30090605" + + "2B0E03021A05003082012406092A864886F70D010703A0820115308201110609" + + "2A864886F70D010703A08201023081FF0201003181CC3081C90201003032301E" + + "311C301A060355040313135253414B65795472616E7366657243617069310210" + + "5D2FFFF863BABC9B4D3C80AB178A4CCA300D06092A864886F70D010101050004" + + "81800BB53BF3BD028A6B54703899B241CB358CACBF9018A4497A733C27EA223E" + + "05BD31099EB80AE04ADBB23A5E397C181A14476668402EFE3BCA08BCA615C743" + + "41FA06D56671AA940BF09B6B7B4C6905AD2927DE94960ED03DF141360589979F" + + "9944DB48B91AA1B139EB652D6A1BAC48DF33AF14006CD9DB4C09E7DA270733D0" + + "DF90302B06092A864886F70D010701301406082A864886F70D03070408E4972B" + + "4188B1B4FE80084CBF0A9D37B094EBA08202103082020C30820179A003020102" + + "02105D2FFFF863BABC9B4D3C80AB178A4CCA300906052B0E03021D0500301E31" + + "1C301A060355040313135253414B65795472616E736665724361706931301E17" + + "0D3135303431353037303030305A170D3235303431353037303030305A301E31" + + "1C301A060355040313135253414B65795472616E73666572436170693130819F" + + "300D06092A864886F70D010101050003818D0030818902818100AA272700586C" + + "0CC41B05C65C7D846F5A2BC27B03E301C37D9BFF6D75B6EB6671BA9596C5C63B" + + "A2B1AF5C318D9CA39E7400D10C238AC72630579211B86570D1A1D44EC86AA8F6" + + "C9D2B4E283EA3535923F398A312A23EAEACD8D34FAACA965CD910B37DA4093EF" + + "76C13B337C1AFAB7D1D07E317B41A336BAA4111299F99424408D0203010001A3" + + "533051304F0603551D0104483046801015432DB116B35D07E4BA89EDB2469D7A" + + "A120301E311C301A060355040313135253414B65795472616E73666572436170" + + "693182105D2FFFF863BABC9B4D3C80AB178A4CCA300906052B0E03021D050003" + + "81810081E5535D8ECEEF265ACBC82F6C5F8BC9D84319265F3CCF23369FA533C8" + + "DC1938952C5931662D9ECD8B1E7B81749E48468167E2FCE3D019FA70D5464697" + + "5B6DC2A3BA72D5A5274C1866DA6D7A5DF47938E034A075D11957D653B5C78E52" + + "91E4401045576F6D4EDA81BEF3C369AF56121E49A083C8D1ADB09F291822E99A" + + "42964631820119308201150201013032301E311C301A06035504031313525341" + + "4B65795472616E73666572436170693102105D2FFFF863BABC9B4D3C80AB178A" + + "4CCA300906052B0E03021A0500A03F301806092A864886F70D010903310B0609" + + "2A864886F70D010703302306092A864886F70D01090431160414FE46C861E86B" + + "719D0F665AFAE48165B56CDFBFD4300D06092A864886F70D0101010500048180" + + "32CEE36532673C2734C908A48B6E017FD695BE69FAC21028B6627466B72688D8" + + "60FC65F2F18E5C19FED2301351F247DF90217087C5F88D76CA052287E6A2F47F" + + "7DA5AC226B4FC202AB0B5B73A24B5C138247F54466621288F2DA941320C4CE89" + + "A503ED3E6F63112798A841E55344BEE84E1366E4CF3788C9788C5E86D1879029").HexToByteArray(); + + internal static readonly byte[] SignedCmsOverEnvelopedCms_SKID_NetFx = ( + "3082046006092A864886F70D010702A08204513082044D020103310B30090605" + + "2B0E03021A05003082012806092A864886F70D010703A0820119048201153082" + + "011106092A864886F70D010703A08201023081FF0201003181CC3081C9020100" + + "3032301E311C301A060355040313135253414B65795472616E73666572436170" + + "693102105D2FFFF863BABC9B4D3C80AB178A4CCA300D06092A864886F70D0101" + + "0105000481803ECF128C059F49199D3344979BD0EBAC2A5443D4F27775B8CFAC" + + "7B1F28AFDDAD86097FF34DFB3ED2D514C325B78074D6D17CA14952EA954E860B" + + "D5980F2C629C70AE402D3E9E867246E532E345712DFA33C37EF141E2EBFD10F7" + + "249CFD193B313825CB7B297FB204DA755F02384659F51D97AB31F867C7E973C6" + + "28B9F6E43018302B06092A864886F70D010701301406082A864886F70D030704" + + "089FC5129D8AB0CDDE80086D7E35774EFA334AA08202103082020C30820179A0" + + "0302010202105D2FFFF863BABC9B4D3C80AB178A4CCA300906052B0E03021D05" + + "00301E311C301A060355040313135253414B65795472616E7366657243617069" + + "31301E170D3135303431353037303030305A170D323530343135303730303030" + + "5A301E311C301A060355040313135253414B65795472616E7366657243617069" + + "3130819F300D06092A864886F70D010101050003818D0030818902818100AA27" + + "2700586C0CC41B05C65C7D846F5A2BC27B03E301C37D9BFF6D75B6EB6671BA95" + + "96C5C63BA2B1AF5C318D9CA39E7400D10C238AC72630579211B86570D1A1D44E" + + "C86AA8F6C9D2B4E283EA3535923F398A312A23EAEACD8D34FAACA965CD910B37" + + "DA4093EF76C13B337C1AFAB7D1D07E317B41A336BAA4111299F99424408D0203" + + "010001A3533051304F0603551D0104483046801015432DB116B35D07E4BA89ED" + + "B2469D7AA120301E311C301A060355040313135253414B65795472616E736665" + + "72436170693182105D2FFFF863BABC9B4D3C80AB178A4CCA300906052B0E0302" + + "1D05000381810081E5535D8ECEEF265ACBC82F6C5F8BC9D84319265F3CCF2336" + + "9FA533C8DC1938952C5931662D9ECD8B1E7B81749E48468167E2FCE3D019FA70" + + "D54646975B6DC2A3BA72D5A5274C1866DA6D7A5DF47938E034A075D11957D653" + + "B5C78E5291E4401045576F6D4EDA81BEF3C369AF56121E49A083C8D1ADB09F29" + + "1822E99A4296463181FA3081F702010380146B4A6B92FDED07EE0119F3674A96" + + "D1A70D2A588D300906052B0E03021A0500A03F301806092A864886F70D010903" + + "310B06092A864886F70D010703302306092A864886F70D0109043116041435DE" + + "A4AE3B383A023271BA27D2D50EC021D40800300D06092A864886F70D01010105" + + "00048180386A2EB06AB0ED0111EB37214480CD782243C66105948AD8EAB3236A" + + "7ECF135F22B6558F3C601140F6BBDF313F7DB98B3E6277ED5C2407D57323348D" + + "A97F6A9653C7C219EE1B0E3F85A970FA6CFC00B53E72484F732916E6067E2F0D" + + "4D31EFF51CECD46F3EF245FEF8729C4E1F16C0A3054054477D6C787FC7C94D79" + + "A24AC54B").HexToByteArray(); + + internal static readonly byte[] SignedCmsOverEnvelopedCms_IssuerSerial_CoreFx = ( + "3082048E06092A864886F70D010702A082047F3082047B020103310D300B0609" + + "6086480165030402013082012806092A864886F70D010703A082011904820115" + + "3082011106092A864886F70D010703A08201023081FF0201003181CC3081C902" + + "01003032301E311C301A060355040313135253414B65795472616E7366657243" + + "6170693102105D2FFFF863BABC9B4D3C80AB178A4CCA300D06092A864886F70D" + + "01010105000481801B7806566B26A92076D5C9F5A06FBC9AB1D53BD63D3B7F97" + + "569B683219C4BA0B285F2F3EF533387EDD7E6BE38DFDD1F33EBA8E5001238BD0" + + "E75B9A5C5E2504FD78954B372A2E8B183F4CBD2D239CB72D129E112D0476D9A9" + + "A00AF0EC700776F4719BC4838DBAC7F06C671F67B977ABDF449B42C98D28035A" + + "194CE2B786E8C8A2302B06092A864886F70D010701301406082A864886F70D03" + + "070408B4B41A525B6E8F628008767424A015173966A08202103082020C308201" + + "79A00302010202105D2FFFF863BABC9B4D3C80AB178A4CCA300906052B0E0302" + + "1D0500301E311C301A060355040313135253414B65795472616E736665724361" + + "706931301E170D3135303431353037303030305A170D32353034313530373030" + + "30305A301E311C301A060355040313135253414B65795472616E736665724361" + + "70693130819F300D06092A864886F70D010101050003818D0030818902818100" + + "AA272700586C0CC41B05C65C7D846F5A2BC27B03E301C37D9BFF6D75B6EB6671" + + "BA9596C5C63BA2B1AF5C318D9CA39E7400D10C238AC72630579211B86570D1A1" + + "D44EC86AA8F6C9D2B4E283EA3535923F398A312A23EAEACD8D34FAACA965CD91" + + "0B37DA4093EF76C13B337C1AFAB7D1D07E317B41A336BAA4111299F99424408D" + + "0203010001A3533051304F0603551D0104483046801015432DB116B35D07E4BA" + + "89EDB2469D7AA120301E311C301A060355040313135253414B65795472616E73" + + "666572436170693182105D2FFFF863BABC9B4D3C80AB178A4CCA300906052B0E" + + "03021D05000381810081E5535D8ECEEF265ACBC82F6C5F8BC9D84319265F3CCF" + + "23369FA533C8DC1938952C5931662D9ECD8B1E7B81749E48468167E2FCE3D019" + + "FA70D54646975B6DC2A3BA72D5A5274C1866DA6D7A5DF47938E034A075D11957" + + "D653B5C78E5291E4401045576F6D4EDA81BEF3C369AF56121E49A083C8D1ADB0" + + "9F291822E99A42964631820125308201210201013032301E311C301A06035504" + + "0313135253414B65795472616E73666572436170693102105D2FFFF863BABC9B" + + "4D3C80AB178A4CCA300B0609608648016503040201A04B301806092A864886F7" + + "0D010903310B06092A864886F70D010703302F06092A864886F70D0109043122" + + "042018BEF3F24109B4BCD5BF3D5372EA7A0D16AF6DF46DE9BE5C2373DF065381" + + "5E13300B06092A864886F70D01010104818016A02798B3CEC42BE258C85A4BED" + + "06099339C9E716B8C72A3330923BE4B6A0538A5DCE031CD710589E8281E24074" + + "F26AB6B86CEACF78449B82FF1512F511B5A97ABA4403029E2BA1D837D3F9D230" + + "45E0EB3CE59E3AF7E52B814EFCBBCFD7A442327C5C408D166D4302AEFF807ECB" + + "D107C811DC66EC35FE167408B58FB03B7F84").HexToByteArray(); + + internal static readonly byte[] SignedCmsOverEnvelopedCms_SKID_CoreFx = ( + "3082047006092A864886F70D010702A08204613082045D020103310D300B0609" + + "6086480165030402013082012806092A864886F70D010703A082011904820115" + + "3082011106092A864886F70D010703A08201023081FF0201003181CC3081C902" + + "01003032301E311C301A060355040313135253414B65795472616E7366657243" + + "6170693102105D2FFFF863BABC9B4D3C80AB178A4CCA300D06092A864886F70D" + + "0101010500048180724D9D5E0D2110B8147589120524B1D1E7019A3F436AD459" + + "3DF555413423AE28FCBA01548B20FDCA21901ECF6B54331542CECD4326C7E292" + + "54AA563D7F38C2287C146B648E6779FA3843FB0F11A3726265266DF87BAAF04B" + + "AA1DD4825B9FFFEBD1DC47414EA4978580A03484B9159E57045018DAA3054704" + + "84046F89465169A0302B06092A864886F70D010701301406082A864886F70D03" + + "0704087E74D74C2652F5198008930CBA811F9E9E15A08202103082020C308201" + + "79A00302010202105D2FFFF863BABC9B4D3C80AB178A4CCA300906052B0E0302" + + "1D0500301E311C301A060355040313135253414B65795472616E736665724361" + + "706931301E170D3135303431353037303030305A170D32353034313530373030" + + "30305A301E311C301A060355040313135253414B65795472616E736665724361" + + "70693130819F300D06092A864886F70D010101050003818D0030818902818100" + + "AA272700586C0CC41B05C65C7D846F5A2BC27B03E301C37D9BFF6D75B6EB6671" + + "BA9596C5C63BA2B1AF5C318D9CA39E7400D10C238AC72630579211B86570D1A1" + + "D44EC86AA8F6C9D2B4E283EA3535923F398A312A23EAEACD8D34FAACA965CD91" + + "0B37DA4093EF76C13B337C1AFAB7D1D07E317B41A336BAA4111299F99424408D" + + "0203010001A3533051304F0603551D0104483046801015432DB116B35D07E4BA" + + "89EDB2469D7AA120301E311C301A060355040313135253414B65795472616E73" + + "666572436170693182105D2FFFF863BABC9B4D3C80AB178A4CCA300906052B0E" + + "03021D05000381810081E5535D8ECEEF265ACBC82F6C5F8BC9D84319265F3CCF" + + "23369FA533C8DC1938952C5931662D9ECD8B1E7B81749E48468167E2FCE3D019" + + "FA70D54646975B6DC2A3BA72D5A5274C1866DA6D7A5DF47938E034A075D11957" + + "D653B5C78E5291E4401045576F6D4EDA81BEF3C369AF56121E49A083C8D1ADB0" + + "9F291822E99A429646318201073082010302010380146B4A6B92FDED07EE0119" + + "F3674A96D1A70D2A588D300B0609608648016503040201A04B301806092A8648" + + "86F70D010903310B06092A864886F70D010703302F06092A864886F70D010904" + + "31220420873B6A3B7CE192922129761C3EDD8D68C4A6B0369F3BF5B3D30B0A9E" + + "2336A8F4300B06092A864886F70D0101010481807D31B3260AE00DE3992DDD1E" + + "B01FDECA28053F2B87AA723CCD27B92896E3199F7C4B3B4A391C181899E5CBD1" + + "4A4BCDDFF6DC6CD10CA118DAA62E32589F066D1669D2948E51B5363B7BEE2BA9" + + "351CDE1791D118E552F0C8A4FB58EC7C34F5BAB2D562B415C4B3F673179B8410" + + "86A9B0F03ED56DBD4FA9CBB775307C9BB3045F72").HexToByteArray(); } } diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/SignedCms/SignerInfoTests.cs b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/SignedCms/SignerInfoTests.cs index e97223c1f7..f2f6559d18 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/SignedCms/SignerInfoTests.cs +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/SignedCms/SignerInfoTests.cs @@ -451,6 +451,53 @@ namespace System.Security.Cryptography.Pkcs.Tests () => signer.RemoveCounterSignature(0)); } + [Theory] + [InlineData(0)] + [InlineData(1)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "NetFx bug")] + public static void RemoveCounterSignature_EncodedInSingleAttribute_ByIndex(int indexToRemove) + { + SignedCms cms = new SignedCms(); + cms.Decode(SignedDocuments.RsaPkcs1TwoCounterSignaturesInSingleAttribute); + SignerInfo signerInfo = cms.SignerInfos[0]; + + Assert.Equal(2, signerInfo.CounterSignerInfos.Count); + signerInfo.RemoveCounterSignature(indexToRemove); + Assert.Equal(1, signerInfo.CounterSignerInfos.Count); + + cms.CheckSignature(true); + + byte[] encoded = cms.Encode(); + cms.Decode(encoded); + + Assert.Equal(1, cms.SignerInfos[0].CounterSignerInfos.Count); + cms.CheckSignature(true); + } + + [Theory] + [InlineData(0)] + [InlineData(1)] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "NetFx bug")] + public static void RemoveCounterSignature_EncodedInSingleAttribute_BySignerInfo(int indexToRemove) + { + SignedCms cms = new SignedCms(); + cms.Decode(SignedDocuments.RsaPkcs1TwoCounterSignaturesInSingleAttribute); + SignerInfo signerInfo = cms.SignerInfos[0]; + + SignerInfoCollection counterSigners = signerInfo.CounterSignerInfos; + Assert.Equal(2, counterSigners.Count); + signerInfo.RemoveCounterSignature(counterSigners[indexToRemove]); + Assert.Equal(1, signerInfo.CounterSignerInfos.Count); + + cms.CheckSignature(true); + + byte[] encoded = cms.Encode(); + cms.Decode(encoded); + + Assert.Equal(1, cms.SignerInfos[0].CounterSignerInfos.Count); + cms.CheckSignature(true); + } + [Fact] public static void AddCounterSigner_DuplicateCert_RSA() { diff --git a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj index b5edb59ea4..5fc0ae1645 100644 --- a/external/corefx/src/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj +++ b/external/corefx/src/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj @@ -19,21 +19,12 @@ CommonTest\System\Security\Cryptography\ByteUtils.cs + - - - - - - - - - - @@ -43,6 +34,20 @@ + + + + + + + + + + + + + + diff --git a/external/corefx/src/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln b/external/corefx/src/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln index c90a901aea..4eb045691a 100644 --- a/external/corefx/src/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln +++ b/external/corefx/src/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln @@ -7,6 +7,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptograph {DF73E985-E143-4BF5-9FA4-E199E7D36235} = {DF73E985-E143-4BF5-9FA4-E199E7D36235} EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Primitives.Performance.Tests", "tests\Performance\System.Security.Cryptography.Primitives.Performance.Tests.csproj", "{FB3EA273-567D-414F-B36D-3698BE8D198B}" + ProjectSection(ProjectDependencies) = postProject + {DF73E985-E143-4BF5-9FA4-E199E7D36235} = {DF73E985-E143-4BF5-9FA4-E199E7D36235} + EndProjectSection +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Primitives", "src\System.Security.Cryptography.Primitives.csproj", "{DF73E985-E143-4BF5-9FA4-E199E7D36235}" ProjectSection(ProjectDependencies) = postProject {F050C895-297F-41C6-98C3-406D791AD515} = {F050C895-297F-41C6-98C3-406D791AD515} @@ -30,6 +35,10 @@ Global {101EB757-55A4-4F48-841C-C088640B8F57}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {101EB757-55A4-4F48-841C-C088640B8F57}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU {101EB757-55A4-4F48-841C-C088640B8F57}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU + {FB3EA273-567D-414F-B36D-3698BE8D198B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {FB3EA273-567D-414F-B36D-3698BE8D198B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {FB3EA273-567D-414F-B36D-3698BE8D198B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {FB3EA273-567D-414F-B36D-3698BE8D198B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {DF73E985-E143-4BF5-9FA4-E199E7D36235}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {DF73E985-E143-4BF5-9FA4-E199E7D36235}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {DF73E985-E143-4BF5-9FA4-E199E7D36235}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU @@ -44,6 +53,7 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {101EB757-55A4-4F48-841C-C088640B8F57} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} + {FB3EA273-567D-414F-B36D-3698BE8D198B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} {DF73E985-E143-4BF5-9FA4-E199E7D36235} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD} {F050C895-297F-41C6-98C3-406D791AD515} = {2E666815-2EDB-464B-9DF6-380BF4789AD4} EndGlobalSection diff --git a/external/corefx/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.cs b/external/corefx/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.cs index 73d5d1e6bb..7b4ff0b492 100644 --- a/external/corefx/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.cs +++ b/external/corefx/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.cs @@ -36,6 +36,11 @@ namespace System.Security.Cryptography [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] OFB = 3, } + public static partial class CryptographicOperations + { + public static bool FixedTimeEquals(System.ReadOnlySpan left, System.ReadOnlySpan right) => throw null; + public static void ZeroMemory(System.Span buffer) => throw null; + } public partial class CryptographicUnexpectedOperationException : System.Security.Cryptography.CryptographicException { public CryptographicUnexpectedOperationException() { } diff --git a/external/corefx/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj b/external/corefx/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj index 1051a19615..abf8101d36 100644 --- a/external/corefx/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj +++ b/external/corefx/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj @@ -17,4 +17,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/System.Security.Cryptography.Primitives/src/Resources/Strings.resx b/external/corefx/src/System.Security.Cryptography.Primitives/src/Resources/Strings.resx index c6b046c2e2..0f9c473cb2 100644 --- a/external/corefx/src/System.Security.Cryptography.Primitives/src/Resources/Strings.resx +++ b/external/corefx/src/System.Security.Cryptography.Primitives/src/Resources/Strings.resx @@ -79,6 +79,9 @@ FlushFinalBlock() method was called twice on a CryptoStream. It can only be called once. + + This platform does not allow the automatic selection of an algorithm. + Hash must be finalized before the hash value is retrieved. diff --git a/external/corefx/src/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj b/external/corefx/src/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj index 042b0a1d36..5e37c26e65 100644 --- a/external/corefx/src/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj +++ b/external/corefx/src/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj @@ -13,6 +13,8 @@ + + diff --git a/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/AsymmetricAlgorithm.cs b/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/AsymmetricAlgorithm.cs index d273f4a940..b9757dd565 100644 --- a/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/AsymmetricAlgorithm.cs +++ b/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/AsymmetricAlgorithm.cs @@ -11,15 +11,11 @@ namespace System.Security.Cryptography protected AsymmetricAlgorithm() { } - public static AsymmetricAlgorithm Create() - { - return Create("System.Security.Cryptography.AsymmetricAlgorithm"); - } + public static AsymmetricAlgorithm Create() => + throw new PlatformNotSupportedException(SR.Cryptography_DefaultAlgorithm_NotSupported); - public static AsymmetricAlgorithm Create(string algName) - { - throw new PlatformNotSupportedException(); - } + public static AsymmetricAlgorithm Create(string algName) => + (AsymmetricAlgorithm)CryptoConfigForwarder.CreateFromName(algName); public virtual int KeySize { diff --git a/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/CryptoConfigForwarder.cs b/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/CryptoConfigForwarder.cs new file mode 100644 index 0000000000..758208ee8c --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/CryptoConfigForwarder.cs @@ -0,0 +1,33 @@ +// 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.Reflection; + +namespace System.Security.Cryptography +{ + internal static class CryptoConfigForwarder + { + private static readonly Func s_createFromName = BindCreateFromName(); + + private static Func BindCreateFromName() + { + const string CryptoConfigTypeName = + "System.Security.Cryptography.CryptoConfig, System.Security.Cryptography.Algorithms"; + + const string CreateFromNameMethodName = "CreateFromName"; + + Type t = Type.GetType(CryptoConfigTypeName, throwOnError: true); + MethodInfo createFromName = t.GetMethod(CreateFromNameMethodName, new[] { typeof(string) }); + + if (createFromName == null) + { + throw new MissingMethodException(t.FullName, CreateFromNameMethodName); + } + + return (Func)createFromName.CreateDelegate(typeof(Func)); + } + + internal static object CreateFromName(string name) => s_createFromName(name); + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/CryptoStream.cs b/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/CryptoStream.cs index c9f420d593..60ba529d6e 100644 --- a/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/CryptoStream.cs +++ b/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/CryptoStream.cs @@ -2,6 +2,7 @@ // 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; using System.IO; using System.Threading; using System.Threading.Tasks; @@ -238,7 +239,7 @@ namespace System.Security.Cryptography public override int Read(byte[] buffer, int offset, int count) { CheckReadArguments(buffer, offset, count); - return ReadAsyncCore(buffer, offset, count, default(CancellationToken), useAsync: false).ConfigureAwait(false).GetAwaiter().GetResult(); + return ReadAsyncCore(buffer, offset, count, default(CancellationToken), useAsync: false).GetAwaiter().GetResult(); } private void CheckReadArguments(byte[] buffer, int offset, int count) @@ -270,6 +271,8 @@ namespace System.Security.Cryptography Buffer.BlockCopy(_outputBuffer, 0, buffer, offset, _outputBufferIndex); bytesToDeliver -= _outputBufferIndex; currentOutputIndex += _outputBufferIndex; + int toClear = _outputBuffer.Length - _outputBufferIndex; + CryptographicOperations.ZeroMemory(new Span(_outputBuffer, _outputBufferIndex, toClear)); _outputBufferIndex = 0; } else @@ -277,6 +280,10 @@ namespace System.Security.Cryptography Buffer.BlockCopy(_outputBuffer, 0, buffer, offset, count); Buffer.BlockCopy(_outputBuffer, count, _outputBuffer, 0, _outputBufferIndex - count); _outputBufferIndex -= count; + + int toClear = _outputBuffer.Length - _outputBufferIndex; + CryptographicOperations.ZeroMemory(new Span(_outputBuffer, _outputBufferIndex, toClear)); + return (count); } } @@ -294,65 +301,98 @@ namespace System.Security.Cryptography int numOutputBytes; // OK, see first if it's a multi-block transform and we can speed up things - if (bytesToDeliver > _outputBlockSize) + int blocksToProcess = bytesToDeliver / _outputBlockSize; + + if (blocksToProcess > 1 && _transform.CanTransformMultipleBlocks) { - if (_transform.CanTransformMultipleBlocks) + int numWholeBlocksInBytes = blocksToProcess * _inputBlockSize; + byte[] tempInputBuffer = ArrayPool.Shared.Rent(numWholeBlocksInBytes); + byte[] tempOutputBuffer = null; + + try { - int BlocksToProcess = bytesToDeliver / _outputBlockSize; - int numWholeBlocksInBytes = BlocksToProcess * _inputBlockSize; - byte[] tempInputBuffer = new byte[numWholeBlocksInBytes]; - // get first the block already read - Buffer.BlockCopy(_inputBuffer, 0, tempInputBuffer, 0, _inputBufferIndex); - amountRead = _inputBufferIndex; - amountRead += useAsync ? - await _stream.ReadAsync(tempInputBuffer, _inputBufferIndex, numWholeBlocksInBytes - _inputBufferIndex, cancellationToken) : + amountRead = useAsync ? + await _stream.ReadAsync(new Memory(tempInputBuffer, _inputBufferIndex, numWholeBlocksInBytes - _inputBufferIndex), cancellationToken) : _stream.Read(tempInputBuffer, _inputBufferIndex, numWholeBlocksInBytes - _inputBufferIndex); - _inputBufferIndex = 0; - if (amountRead <= _inputBlockSize) + int totalInput = _inputBufferIndex + amountRead; + + // If there's still less than a block, copy the new data into the hold buffer and move to the slow read. + if (totalInput < _inputBlockSize) { - _inputBuffer = tempInputBuffer; - _inputBufferIndex = amountRead; - goto slow; + Buffer.BlockCopy(tempInputBuffer, _inputBufferIndex, _inputBuffer, _inputBufferIndex, amountRead); + _inputBufferIndex = totalInput; } - // Make amountRead an integral multiple of _InputBlockSize - int numWholeReadBlocksInBytes = (amountRead / _inputBlockSize) * _inputBlockSize; - int numIgnoredBytes = amountRead - numWholeReadBlocksInBytes; - if (numIgnoredBytes != 0) + else { - _inputBufferIndex = numIgnoredBytes; - Buffer.BlockCopy(tempInputBuffer, numWholeReadBlocksInBytes, _inputBuffer, 0, numIgnoredBytes); + // Copy any held data into tempInputBuffer now that we know we're proceeding + Buffer.BlockCopy(_inputBuffer, 0, tempInputBuffer, 0, _inputBufferIndex); + CryptographicOperations.ZeroMemory(new Span(_inputBuffer, 0, _inputBufferIndex)); + amountRead += _inputBufferIndex; + _inputBufferIndex = 0; + + // Make amountRead an integral multiple of _InputBlockSize + int numWholeReadBlocks = amountRead / _inputBlockSize; + int numWholeReadBlocksInBytes = numWholeReadBlocks * _inputBlockSize; + int numIgnoredBytes = amountRead - numWholeReadBlocksInBytes; + + if (numIgnoredBytes != 0) + { + _inputBufferIndex = numIgnoredBytes; + Buffer.BlockCopy(tempInputBuffer, numWholeReadBlocksInBytes, _inputBuffer, 0, numIgnoredBytes); + } + + tempOutputBuffer = ArrayPool.Shared.Rent(numWholeReadBlocks * _outputBlockSize); + numOutputBytes = _transform.TransformBlock(tempInputBuffer, 0, numWholeReadBlocksInBytes, tempOutputBuffer, 0); + Buffer.BlockCopy(tempOutputBuffer, 0, buffer, currentOutputIndex, numOutputBytes); + + // Clear what was written while we know how much that was + CryptographicOperations.ZeroMemory(new Span(tempOutputBuffer, 0, numOutputBytes)); + ArrayPool.Shared.Return(tempOutputBuffer); + tempOutputBuffer = null; + + bytesToDeliver -= numOutputBytes; + currentOutputIndex += numOutputBytes; } - byte[] tempOutputBuffer = new byte[(numWholeReadBlocksInBytes / _inputBlockSize) * _outputBlockSize]; - numOutputBytes = _transform.TransformBlock(tempInputBuffer, 0, numWholeReadBlocksInBytes, tempOutputBuffer, 0); - Buffer.BlockCopy(tempOutputBuffer, 0, buffer, currentOutputIndex, numOutputBytes); - // Now, tempInputBuffer and tempOutputBuffer are no more needed, so zeroize them to protect plain text - Array.Clear(tempInputBuffer, 0, tempInputBuffer.Length); - Array.Clear(tempOutputBuffer, 0, tempOutputBuffer.Length); - bytesToDeliver -= numOutputBytes; - currentOutputIndex += numOutputBytes; + } + finally + { + // If we rented and then an exception happened we don't know how much was written to, + // clear the whole thing and return it. + if (tempOutputBuffer != null) + { + CryptographicOperations.ZeroMemory(tempOutputBuffer); + ArrayPool.Shared.Return(tempOutputBuffer); + tempOutputBuffer = null; + } + + CryptographicOperations.ZeroMemory(new Span(tempInputBuffer, 0, numWholeBlocksInBytes)); + ArrayPool.Shared.Return(tempInputBuffer); + tempInputBuffer = null; } } - slow: // try to fill _InputBuffer so we have something to transform while (bytesToDeliver > 0) { while (_inputBufferIndex < _inputBlockSize) { amountRead = useAsync ? - await _stream.ReadAsync(_inputBuffer, _inputBufferIndex, _inputBlockSize - _inputBufferIndex, cancellationToken) : + await _stream.ReadAsync(new Memory(_inputBuffer, _inputBufferIndex, _inputBlockSize - _inputBufferIndex), cancellationToken) : _stream.Read(_inputBuffer, _inputBufferIndex, _inputBlockSize - _inputBufferIndex); // first, check to see if we're at the end of the input stream if (amountRead == 0) goto ProcessFinalBlock; _inputBufferIndex += amountRead; } + numOutputBytes = _transform.TransformBlock(_inputBuffer, 0, _inputBlockSize, _outputBuffer, 0); _inputBufferIndex = 0; + if (bytesToDeliver >= numOutputBytes) { Buffer.BlockCopy(_outputBuffer, 0, buffer, currentOutputIndex, numOutputBytes); + CryptographicOperations.ZeroMemory(new Span(_outputBuffer, 0, numOutputBytes)); currentOutputIndex += numOutputBytes; bytesToDeliver -= numOutputBytes; } @@ -361,6 +401,8 @@ namespace System.Security.Cryptography Buffer.BlockCopy(_outputBuffer, 0, buffer, currentOutputIndex, bytesToDeliver); _outputBufferIndex = numOutputBytes - bytesToDeliver; Buffer.BlockCopy(_outputBuffer, bytesToDeliver, _outputBuffer, 0, _outputBufferIndex); + int toClear = _outputBuffer.Length - _outputBufferIndex; + CryptographicOperations.ZeroMemory(new Span(_outputBuffer, _outputBufferIndex, toClear)); return count; } } @@ -381,6 +423,8 @@ namespace System.Security.Cryptography Buffer.BlockCopy(_outputBuffer, 0, buffer, currentOutputIndex, bytesToDeliver); _outputBufferIndex -= bytesToDeliver; Buffer.BlockCopy(_outputBuffer, bytesToDeliver, _outputBuffer, 0, _outputBufferIndex); + int toClear = _outputBuffer.Length - _outputBufferIndex; + CryptographicOperations.ZeroMemory(new Span(_outputBuffer, _outputBufferIndex, toClear)); return (count); } else @@ -388,6 +432,7 @@ namespace System.Security.Cryptography Buffer.BlockCopy(_outputBuffer, 0, buffer, currentOutputIndex, _outputBufferIndex); bytesToDeliver -= _outputBufferIndex; _outputBufferIndex = 0; + CryptographicOperations.ZeroMemory(_outputBuffer); return (count - bytesToDeliver); } } @@ -475,7 +520,7 @@ namespace System.Security.Cryptography if (_outputBufferIndex > 0) { if (useAsync) - await _stream.WriteAsync(_outputBuffer, 0, _outputBufferIndex, cancellationToken); + await _stream.WriteAsync(new ReadOnlyMemory(_outputBuffer, 0, _outputBufferIndex), cancellationToken); else _stream.Write(_outputBuffer, 0, _outputBufferIndex); _outputBufferIndex = 0; @@ -488,7 +533,7 @@ namespace System.Security.Cryptography numOutputBytes = _transform.TransformBlock(_inputBuffer, 0, _inputBlockSize, _outputBuffer, 0); // write out the bytes we just got if (useAsync) - await _stream.WriteAsync(_outputBuffer, 0, numOutputBytes, cancellationToken); + await _stream.WriteAsync(new ReadOnlyMemory(_outputBuffer, 0, numOutputBytes), cancellationToken); else _stream.Write(_outputBuffer, 0, numOutputBytes); @@ -500,21 +545,38 @@ namespace System.Security.Cryptography if (bytesToWrite >= _inputBlockSize) { // We have at least an entire block's worth to transform + int numWholeBlocks = bytesToWrite / _inputBlockSize; + // If the transform will handle multiple blocks at once, do that - if (_transform.CanTransformMultipleBlocks) + if (_transform.CanTransformMultipleBlocks && numWholeBlocks > 1) { - int numWholeBlocks = bytesToWrite / _inputBlockSize; int numWholeBlocksInBytes = numWholeBlocks * _inputBlockSize; - byte[] _tempOutputBuffer = new byte[numWholeBlocks * _outputBlockSize]; - numOutputBytes = _transform.TransformBlock(buffer, currentInputIndex, numWholeBlocksInBytes, _tempOutputBuffer, 0); + byte[] tempOutputBuffer = ArrayPool.Shared.Rent(numWholeBlocks * _outputBlockSize); + numOutputBytes = 0; - if (useAsync) - await _stream.WriteAsync(_tempOutputBuffer, 0, numOutputBytes, cancellationToken); - else - _stream.Write(_tempOutputBuffer, 0, numOutputBytes); + try + { + numOutputBytes = + _transform.TransformBlock(buffer, currentInputIndex, numWholeBlocksInBytes, tempOutputBuffer, 0); - currentInputIndex += numWholeBlocksInBytes; - bytesToWrite -= numWholeBlocksInBytes; + if (useAsync) + { + await _stream.WriteAsync(new ReadOnlyMemory(tempOutputBuffer, 0, numOutputBytes), cancellationToken); + } + else + { + _stream.Write(tempOutputBuffer, 0, numOutputBytes); + } + + currentInputIndex += numWholeBlocksInBytes; + bytesToWrite -= numWholeBlocksInBytes; + } + finally + { + CryptographicOperations.ZeroMemory(new Span(tempOutputBuffer, 0, numOutputBytes)); + ArrayPool.Shared.Return(tempOutputBuffer); + tempOutputBuffer = null; + } } else { @@ -522,7 +584,7 @@ namespace System.Security.Cryptography numOutputBytes = _transform.TransformBlock(buffer, currentInputIndex, _inputBlockSize, _outputBuffer, 0); if (useAsync) - await _stream.WriteAsync(_outputBuffer, 0, numOutputBytes, cancellationToken); + await _stream.WriteAsync(new ReadOnlyMemory(_outputBuffer, 0, numOutputBytes), cancellationToken); else _stream.Write(_outputBuffer, 0, numOutputBytes); diff --git a/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/CryptographicOperations.cs b/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/CryptographicOperations.cs new file mode 100644 index 0000000000..3f1caff6b1 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/CryptographicOperations.cs @@ -0,0 +1,63 @@ +// 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.Runtime.CompilerServices; + +namespace System.Security.Cryptography +{ + public static class CryptographicOperations + { + /// + /// Determine the equality of two byte sequences in an amount of time which depends on + /// the length of the sequences, but not the values. + /// + /// The first buffer to compare. + /// The second buffer to compare. + /// + /// true if and have the same + /// values for and the same contents, false + /// otherwise. + /// + /// + /// This method compares two buffers' contents for equality in a manner which does not + /// leak timing information, making it ideal for use within cryptographic routines. + /// This method will short-circuit and return false only if + /// and have different lengths. + /// + /// Fixed-time behavior is guaranteed in all other cases, including if + /// and reference the same address. + /// + [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)] + public static bool FixedTimeEquals(ReadOnlySpan left, ReadOnlySpan right) + { + // NoOptimization because we want this method to be exactly as non-short-circuiting + // as written. + // + // NoInlining because the NoOptimization would get lost if the method got inlined. + + if (left.Length != right.Length) + { + return false; + } + + int length = left.Length; + int accum = 0; + + for (int i = 0; i < length; i++) + { + accum |= left[i] - right[i]; + } + + return accum == 0; + } + + [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)] + public static void ZeroMemory(Span buffer) + { + // NoOptimize to prevent the optimizer from deciding this call is unnecessary + // NoInlining to prevent the inliner from forgetting that the method was no-optimize + buffer.Clear(); + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/HMAC.cs b/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/HMAC.cs index 7f02b70178..819e3084d5 100644 --- a/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/HMAC.cs +++ b/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/HMAC.cs @@ -17,9 +17,11 @@ namespace System.Security.Cryptography protected HMAC() { } - public static new HMAC Create() => Create("System.Security.Cryptography.HMAC"); + public static new HMAC Create() => + throw new PlatformNotSupportedException(SR.Cryptography_DefaultAlgorithm_NotSupported); - public static new HMAC Create(string algorithmName) => throw new PlatformNotSupportedException(); + public static new HMAC Create(string algorithmName) => + (HMAC)CryptoConfigForwarder.CreateFromName(algorithmName); public string HashName { diff --git a/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/HashAlgorithm.cs b/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/HashAlgorithm.cs index 8c8daa18c6..739db28b2f 100644 --- a/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/HashAlgorithm.cs +++ b/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/HashAlgorithm.cs @@ -16,9 +16,11 @@ namespace System.Security.Cryptography protected HashAlgorithm() { } - public static HashAlgorithm Create() => Create("System.Security.Cryptography.HashAlgorithm"); + public static HashAlgorithm Create() => + throw new PlatformNotSupportedException(SR.Cryptography_DefaultAlgorithm_NotSupported); - public static HashAlgorithm Create(string hashName) => throw new PlatformNotSupportedException(); + public static HashAlgorithm Create(string hashName) => + (HashAlgorithm)CryptoConfigForwarder.CreateFromName(hashName); public virtual int HashSize => HashSizeValue; @@ -96,13 +98,23 @@ namespace System.Security.Cryptography throw new ObjectDisposedException(null); // Default the buffer size to 4K. - byte[] buffer = new byte[4096]; - int bytesRead; - while ((bytesRead = inputStream.Read(buffer, 0, buffer.Length)) > 0) + byte[] buffer = ArrayPool.Shared.Rent(4096); + + try { - HashCore(buffer, 0, bytesRead); + int bytesRead; + while ((bytesRead = inputStream.Read(buffer, 0, buffer.Length)) > 0) + { + HashCore(buffer, 0, bytesRead); + } + + return CaptureHashCodeAndReinitialize(); + } + finally + { + CryptographicOperations.ZeroMemory(buffer); + ArrayPool.Shared.Return(buffer); } - return CaptureHashCodeAndReinitialize(); } private byte[] CaptureHashCodeAndReinitialize() diff --git a/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/KeyedHashAlgorithm.cs b/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/KeyedHashAlgorithm.cs index 8bedcd577f..6f75011e4d 100644 --- a/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/KeyedHashAlgorithm.cs +++ b/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/KeyedHashAlgorithm.cs @@ -8,15 +8,11 @@ namespace System.Security.Cryptography { protected KeyedHashAlgorithm() { } - public static new KeyedHashAlgorithm Create() - { - return Create("System.Security.Cryptography.KeyedHashAlgorithm"); - } + public static new KeyedHashAlgorithm Create() => + throw new PlatformNotSupportedException(SR.Cryptography_DefaultAlgorithm_NotSupported); - public static new KeyedHashAlgorithm Create(string algName) - { - throw new PlatformNotSupportedException(); - } + public static new KeyedHashAlgorithm Create(string algName) => + (KeyedHashAlgorithm)CryptoConfigForwarder.CreateFromName(algName); public virtual byte[] Key { diff --git a/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/SymmetricAlgorithm.cs b/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/SymmetricAlgorithm.cs index dad3c11ba4..ee9098876f 100644 --- a/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/SymmetricAlgorithm.cs +++ b/external/corefx/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/SymmetricAlgorithm.cs @@ -12,15 +12,11 @@ namespace System.Security.Cryptography PaddingValue = PaddingMode.PKCS7; } - public static SymmetricAlgorithm Create() - { - return Create("System.Security.Cryptography.SymmetricAlgorithm"); - } + public static SymmetricAlgorithm Create() => + throw new PlatformNotSupportedException(SR.Cryptography_DefaultAlgorithm_NotSupported); - public static SymmetricAlgorithm Create(string algName) - { - throw new PlatformNotSupportedException(); - } + public static SymmetricAlgorithm Create(string algName) => + (SymmetricAlgorithm)CryptoConfigForwarder.CreateFromName(algName); public virtual int FeedbackSize { diff --git a/external/corefx/src/System.Security.Cryptography.Primitives/tests/CryptoConfigTests.cs b/external/corefx/src/System.Security.Cryptography.Primitives/tests/CryptoConfigTests.cs index 08a1f864d4..9fbfe2a7d5 100644 --- a/external/corefx/src/System.Security.Cryptography.Primitives/tests/CryptoConfigTests.cs +++ b/external/corefx/src/System.Security.Cryptography.Primitives/tests/CryptoConfigTests.cs @@ -9,20 +9,151 @@ namespace System.Security.Cryptography.CryptoConfigTests public static class CryptoConfigTests { [Fact] - public static void StaticCreateMethods() + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public static void DefaultStaticCreateMethods() { - // These are not supported because CryptoConfig exists in Algorithms assembly. - // CryptoConfig exists in Algorithms partly because it requires the Oid class in Encoding assembly. + // .NET Core does not allow the base classes to pick an algorithm. Assert.Throws(() => AsymmetricAlgorithm.Create()); - Assert.Throws(() => AsymmetricAlgorithm.Create(null)); Assert.Throws(() => HashAlgorithm.Create()); - Assert.Throws(() => HashAlgorithm.Create(null)); Assert.Throws(() => KeyedHashAlgorithm.Create()); - Assert.Throws(() => KeyedHashAlgorithm.Create(null)); Assert.Throws(() => HMAC.Create()); - Assert.Throws(() => HMAC.Create(null)); Assert.Throws(() => SymmetricAlgorithm.Create()); - Assert.Throws(() => SymmetricAlgorithm.Create(null)); + } + + [Fact] + public static void NamedCreateMethods_NullInput() + { + AssertExtensions.Throws("name", () => AsymmetricAlgorithm.Create(null)); + AssertExtensions.Throws("name", () => HashAlgorithm.Create(null)); + AssertExtensions.Throws("name", () => KeyedHashAlgorithm.Create(null)); + AssertExtensions.Throws("name", () => HMAC.Create(null)); + AssertExtensions.Throws("name", () => SymmetricAlgorithm.Create(null)); + } + + // The returned types on .NET Framework can differ when the machine is in FIPS mode. + // So check hash algorithms via a more complicated manner. + [Theory] + [InlineData("MD5", typeof(MD5))] + [InlineData("http://www.w3.org/2001/04/xmldsig-more#md5", typeof(MD5))] + [InlineData("System.Security.Cryptography.HashAlgorithm", typeof(SHA1))] + [InlineData("SHA1", typeof(SHA1))] + [InlineData("http://www.w3.org/2000/09/xmldsig#sha1", typeof(SHA1))] + [InlineData("SHA256", typeof(SHA256))] + [InlineData("SHA-256", typeof(SHA256))] + [InlineData("http://www.w3.org/2001/04/xmlenc#sha256", typeof(SHA256))] + [InlineData("SHA384", typeof(SHA384))] + [InlineData("SHA-384", typeof(SHA384))] + [InlineData("http://www.w3.org/2001/04/xmldsig-more#sha384", typeof(SHA384))] + [InlineData("SHA512", typeof(SHA512))] + [InlineData("SHA-512", typeof(SHA512))] + [InlineData("http://www.w3.org/2001/04/xmlenc#sha512", typeof(SHA512))] + public static void NamedHashAlgorithmCreate(string identifier, Type baseType) + { + using (HashAlgorithm created = HashAlgorithm.Create(identifier)) + { + Assert.NotNull(created); + Assert.IsAssignableFrom(baseType, created); + + using (HashAlgorithm equivalent = + (HashAlgorithm)baseType.GetMethod("Create", Array.Empty()).Invoke(null, null)) + { + byte[] input = { 1, 2, 3, 4, 5 }; + byte[] equivHash = equivalent.ComputeHash(input); + byte[] createdHash = created.ComputeHash(input); + Assert.Equal(equivHash, createdHash); + } + } + } + + [Theory] + [InlineData("System.Security.Cryptography.HMAC", typeof(HMACSHA1))] + [InlineData("System.Security.Cryptography.KeyedHashAlgorithm", typeof(HMACSHA1))] + [InlineData("System.Security.Cryptography.HMACSHA1", typeof(HMACSHA1))] + [InlineData("HMACSHA1", typeof(HMACSHA1))] + [InlineData("http://www.w3.org/2000/09/xmldsig#hmac-sha1", typeof(HMACSHA1))] + [InlineData("System.Security.Cryptography.HMACSHA256", typeof(HMACSHA256))] + [InlineData("HMACSHA256", typeof(HMACSHA256))] + [InlineData("http://www.w3.org/2001/04/xmldsig-more#hmac-sha256", typeof(HMACSHA256))] + [InlineData("System.Security.Cryptography.HMACSHA384", typeof(HMACSHA384))] + [InlineData("HMACSHA384", typeof(HMACSHA384))] + [InlineData("http://www.w3.org/2001/04/xmldsig-more#hmac-sha384", typeof(HMACSHA384))] + [InlineData("System.Security.Cryptography.HMACSHA512", typeof(HMACSHA512))] + [InlineData("HMACSHA512", typeof(HMACSHA512))] + [InlineData("http://www.w3.org/2001/04/xmldsig-more#hmac-sha512", typeof(HMACSHA512))] + [InlineData("System.Security.Cryptography.HMACMD5", typeof(HMACMD5))] + [InlineData("HMACMD5", typeof(HMACMD5))] + [InlineData("http://www.w3.org/2001/04/xmldsig-more#hmac-md5", typeof(HMACMD5))] + public static void NamedKeyedHashAlgorithmCreate(string identifier, Type actualType) + { + using (KeyedHashAlgorithm kha = KeyedHashAlgorithm.Create(identifier)) + { + Assert.IsType(actualType, kha); + + // .NET Core only has HMAC keyed hash algorithms, so combine the two tests + using (HMAC hmac = HMAC.Create(identifier)) + { + Assert.IsType(actualType, hmac); + } + } + } + + [Theory] + [InlineData("AES", typeof(Aes))] + [InlineData("Rijndael", typeof(Rijndael))] + [InlineData("System.Security.Cryptography.Rijndael", typeof(Rijndael))] + [InlineData("http://www.w3.org/2001/04/xmlenc#aes128-cbc", typeof(Rijndael))] + [InlineData("http://www.w3.org/2001/04/xmlenc#aes192-cbc", typeof(Rijndael))] + [InlineData("http://www.w3.org/2001/04/xmlenc#aes256-cbc", typeof(Rijndael))] + [InlineData("3DES", typeof(TripleDES))] + [InlineData("TripleDES", typeof(TripleDES))] + [InlineData("System.Security.Cryptography.TripleDES", typeof(TripleDES))] + [InlineData("http://www.w3.org/2001/04/xmlenc#tripledes-cbc", typeof(TripleDES))] + [InlineData("DES", typeof(DES))] + [InlineData("System.Security.Cryptography.DES", typeof(DES))] + [InlineData("http://www.w3.org/2001/04/xmlenc#des-cbc", typeof(DES))] + public static void NamedSymmetricAlgorithmCreate(string identifier, Type baseType) + { + using (SymmetricAlgorithm created = SymmetricAlgorithm.Create(identifier)) + { + Assert.NotNull(created); + Assert.IsAssignableFrom(baseType, created); + } + } + + [Theory] + [InlineData("RSA", typeof(RSA))] + [InlineData("System.Security.Cryptography.RSA", typeof(RSA))] + [InlineData("ECDsa", typeof(ECDsa))] + [InlineData("DSA", typeof(DSA))] + [InlineData("System.Security.Cryptography.DSA", typeof(DSA))] + public static void NamedAsymmetricAlgorithmCreate(string identifier, Type baseType) + { + using (AsymmetricAlgorithm created = AsymmetricAlgorithm.Create(identifier)) + { + Assert.NotNull(created); + Assert.IsAssignableFrom(baseType, created); + } + } + + [Fact] + public static void NamedCreate_Mismatch() + { + Assert.Throws(() => AsymmetricAlgorithm.Create("SHA1")); + Assert.Throws(() => KeyedHashAlgorithm.Create("SHA1")); + Assert.Throws(() => HMAC.Create("SHA1")); + Assert.Throws(() => SymmetricAlgorithm.Create("SHA1")); + Assert.Throws(() => HashAlgorithm.Create("RSA")); + } + + [Fact] + public static void NamedCreate_Unknown() + { + const string UnknownAlgorithmName = "XYZZY"; + Assert.Null(AsymmetricAlgorithm.Create(UnknownAlgorithmName)); + Assert.Null(HashAlgorithm.Create(UnknownAlgorithmName)); + Assert.Null(KeyedHashAlgorithm.Create(UnknownAlgorithmName)); + Assert.Null(HMAC.Create(UnknownAlgorithmName)); + Assert.Null(SymmetricAlgorithm.Create(UnknownAlgorithmName)); } } } diff --git a/external/corefx/src/System.Security.Cryptography.Primitives/tests/FixedTimeEqualsTests.cs b/external/corefx/src/System.Security.Cryptography.Primitives/tests/FixedTimeEqualsTests.cs new file mode 100644 index 0000000000..a662a3628b --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Primitives/tests/FixedTimeEqualsTests.cs @@ -0,0 +1,109 @@ +// 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; +using System.Reflection; +using System.Runtime.CompilerServices; +using Xunit; + +namespace System.Security.Cryptography.Primitives.Tests +{ + public static class FixedTimeEqualsTests + { + [Theory] + [InlineData(0)] + [InlineData(1)] + [InlineData(128 / 8)] + [InlineData(256 / 8)] + [InlineData(512 / 8)] + [InlineData(96)] + [InlineData(1024)] + public static void EqualReturnsTrue(int byteLength) + { + byte[] rented = ArrayPool.Shared.Rent(byteLength); + Span testSpan = new Span(rented, 0, byteLength); + RandomNumberGenerator.Fill(testSpan); + + byte[] rented2 = ArrayPool.Shared.Rent(byteLength); + Span testSpan2 = new Span(rented2, 0, byteLength); + + testSpan.CopyTo(testSpan2); + + bool isEqual = CryptographicOperations.FixedTimeEquals(testSpan, testSpan2); + + ArrayPool.Shared.Return(rented); + ArrayPool.Shared.Return(rented2); + + Assert.True(isEqual); + } + + [Theory] + [InlineData(1)] + [InlineData(128 / 8)] + [InlineData(256 / 8)] + [InlineData(512 / 8)] + [InlineData(96)] + [InlineData(1024)] + public static void UnequalReturnsFalse(int byteLength) + { + byte[] rented = ArrayPool.Shared.Rent(byteLength); + Span testSpan = new Span(rented, 0, byteLength); + RandomNumberGenerator.Fill(testSpan); + + byte[] rented2 = ArrayPool.Shared.Rent(byteLength); + Span testSpan2 = new Span(rented2, 0, byteLength); + + testSpan.CopyTo(testSpan2); + testSpan[testSpan[0] % testSpan.Length] ^= 0xFF; + + bool isEqual = CryptographicOperations.FixedTimeEquals(testSpan, testSpan2); + + ArrayPool.Shared.Return(rented); + ArrayPool.Shared.Return(rented2); + + Assert.False(isEqual); + } + + [Theory] + [InlineData(1)] + [InlineData(128 / 8)] + [InlineData(256 / 8)] + [InlineData(512 / 8)] + [InlineData(96)] + [InlineData(1024)] + public static void DifferentLengthsReturnFalse(int byteLength) + { + byte[] rented = ArrayPool.Shared.Rent(byteLength); + Span testSpan = new Span(rented, 0, byteLength); + RandomNumberGenerator.Fill(testSpan); + + byte[] rented2 = ArrayPool.Shared.Rent(byteLength); + Span testSpan2 = new Span(rented2, 0, byteLength); + + testSpan.CopyTo(testSpan2); + + bool isEqualA = CryptographicOperations.FixedTimeEquals(testSpan, testSpan2.Slice(0, byteLength - 1)); + bool isEqualB = CryptographicOperations.FixedTimeEquals(testSpan.Slice(0, byteLength - 1), testSpan2); + + ArrayPool.Shared.Return(rented); + ArrayPool.Shared.Return(rented2); + + Assert.False(isEqualA, "value, value missing last byte"); + Assert.False(isEqualB, "value missing last byte, value"); + } + + [Fact] + public static void HasCorrectMethodImpl() + { + Type t = typeof(CryptographicOperations); + MethodInfo mi = t.GetMethod(nameof(CryptographicOperations.FixedTimeEquals)); + + // This method cannot be optimized, or it loses its fixed time guarantees. + // It cannot be inlined, or it loses its no-optimization guarantee. + Assert.Equal( + MethodImplAttributes.NoInlining | MethodImplAttributes.NoOptimization, + mi.MethodImplementationFlags); + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Primitives/tests/Performance/Configurations.props b/external/corefx/src/System.Security.Cryptography.Primitives/tests/Performance/Configurations.props new file mode 100644 index 0000000000..d3ac8a63c7 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Primitives/tests/Performance/Configurations.props @@ -0,0 +1,8 @@ + + + + + netcoreapp; + + + diff --git a/external/corefx/src/System.Security.Cryptography.Primitives/tests/Performance/Perf.FixedTimeEquals.cs b/external/corefx/src/System.Security.Cryptography.Primitives/tests/Performance/Perf.FixedTimeEquals.cs new file mode 100644 index 0000000000..d7fbf81eaf --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Primitives/tests/Performance/Perf.FixedTimeEquals.cs @@ -0,0 +1,115 @@ +// 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 Microsoft.Xunit.Performance; +using Test.Cryptography; +using Xunit; + +namespace System.Security.Cryptography.Primitives.Tests.Performance +{ + public class Perf_FixedTimeEquals + { + private const int IterationCountFor256Bit = 300000; + + [Benchmark(InnerIterationCount = IterationCountFor256Bit)] + public static void FixedTimeEquals_256Bit_Equal() + { + MeasureFixedTimeEquals( + "741202531e19d673ad7fff334594549e7c81a285dd02865ddd12530612a96336", + "0000000000000000000000000000000000000000000000000000000000000000"); + } + + [Benchmark(InnerIterationCount = IterationCountFor256Bit)] + public static void FixedTimeEquals_256Bit_LastBitDifferent() + { + MeasureFixedTimeEquals( + "741202531e19d673ad7fff334594549e7c81a285dd02865ddd12530612a96336", + "0000000000000000000000000000000000000000000000000000000000000001"); + } + + [Benchmark(InnerIterationCount = IterationCountFor256Bit)] + public static void FixedTimeEquals_256Bit_FirstBitDifferent() + { + MeasureFixedTimeEquals( + "741202531e19d673ad7fff334594549e7c81a285dd02865ddd12530612a96336", + "8000000000000000000000000000000000000000000000000000000000000000"); + } + + [Benchmark(InnerIterationCount = IterationCountFor256Bit)] + public static void FixedTimeEquals_256Bit_CascadingErrors() + { + MeasureFixedTimeEquals( + "741202531e19d673ad7fff334594549e7c81a285dd02865ddd12530612a96336", + "0102040810204080112244880000000000000000000000000000000000000000"); + } + + [Benchmark(InnerIterationCount = IterationCountFor256Bit)] + public static void FixedTimeEquals_256Bit_AllBitsDifferent() + { + MeasureFixedTimeEquals( + "741202531e19d673ad7fff334594549e7c81a285dd02865ddd12530612a96336", + "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); + } + + [Benchmark(InnerIterationCount = IterationCountFor256Bit)] + public static void FixedTimeEquals_256Bit_VersusZero() + { + MeasureFixedTimeEquals( + "741202531e19d673ad7fff334594549e7c81a285dd02865ddd12530612a96336", + "741202531e19d673ad7fff334594549e7c81a285dd02865ddd12530612a96336"); + } + + [Benchmark(InnerIterationCount = IterationCountFor256Bit)] + public static void FixedTimeEquals_256Bit_SameReference() + { + byte[] test = "741202531e19d673ad7fff334594549e7c81a285dd02865ddd12530612a96336".HexToByteArray(); + + Span left = test; + Span right = test; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + CryptographicOperations.FixedTimeEquals(left, right); + } + } + } + } + + // The important statistics from these perf runs aren't the mean, but the t-test for + // every set of the same length being the same as when it was equal. + private static void MeasureFixedTimeEquals(string baseValueHex, string errorVectorHex) + { + if (errorVectorHex.Length != baseValueHex.Length) + { + throw new InvalidOperationException(); + } + + byte[] a = baseValueHex.HexToByteArray(); + byte[] b = errorVectorHex.HexToByteArray(); + + for (int i = 0; i < a.Length; i++) + { + b[i] ^= a[i]; + } + + Span left = a; + Span right = b; + + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < Benchmark.InnerIterationCount; i++) + { + CryptographicOperations.FixedTimeEquals(left, right); + } + } + } + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Primitives/tests/Performance/System.Security.Cryptography.Primitives.Performance.Tests.csproj b/external/corefx/src/System.Security.Cryptography.Primitives/tests/Performance/System.Security.Cryptography.Primitives.Performance.Tests.csproj new file mode 100644 index 0000000000..d4f5a9a985 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Primitives/tests/Performance/System.Security.Cryptography.Primitives.Performance.Tests.csproj @@ -0,0 +1,30 @@ + + + + + + true + {FB3EA273-567D-414F-B36D-3698BE8D198B} + + + + + + Common\System\PerfUtils.cs + + + CommonTest\System\Security\Cryptography\ByteUtils.cs + + + + + + {69e46a6f-9966-45a5-8945-2559fe337827} + PerfRunner + + + + + + + \ No newline at end of file diff --git a/external/corefx/src/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj b/external/corefx/src/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj index 2159215055..cc2cdbdb68 100644 --- a/external/corefx/src/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj +++ b/external/corefx/src/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj @@ -11,8 +11,13 @@ + + CommonTest\System\IO\PositionValueStream.cs + + + @@ -20,14 +25,11 @@ - - - CommonTest\System\IO\PositionValueStream.cs - - + + - \ No newline at end of file + diff --git a/external/corefx/src/System.Security.Cryptography.Primitives/tests/ZeroMemoryTests.cs b/external/corefx/src/System.Security.Cryptography.Primitives/tests/ZeroMemoryTests.cs new file mode 100644 index 0000000000..aa4a51bbba --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Primitives/tests/ZeroMemoryTests.cs @@ -0,0 +1,77 @@ +// 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; +using System.Reflection; +using Xunit; + +namespace System.Security.Cryptography.Primitives.Tests +{ + public static class ZeroMemoryTests + { + [Theory] + [InlineData(1)] + [InlineData(128 / 8)] + [InlineData(256 / 8)] + [InlineData(512 / 8)] + [InlineData(96)] + [InlineData(1024)] + public static void MemoryGetsCleared(int byteLength) + { + byte[] rented = ArrayPool.Shared.Rent(byteLength); + Span testSpan = new Span(rented, 0, byteLength); + + bool hasData = false; + + // i should really only iterate when byteLength is 1, and then + // only 1/256 executions. + // + // The chances of this failing are 1 in 1.2e24, unless the RNG is broken. + for (int i = 0; i < 10 && !hasData; i++) + { + RandomNumberGenerator.Fill(testSpan); + + for (int j = 0; j < testSpan.Length; j++) + { + if (testSpan[j] != 0) + { + hasData = true; + break; + } + } + } + + if (!hasData) + { + throw new InvalidOperationException("RNG provided all zero-values"); + } + + // This test cannot guarantee the effect of the memory being cleared + // on an otherwise abandoned reference; since the act of measuring it + // changes what the optimizer could have done. + // + // But it can check for it calling clear. + CryptographicOperations.ZeroMemory(testSpan); + + for (int i = 0; i < testSpan.Length; i++) + { + Assert.Equal(0, testSpan[i]); + } + } + + [Fact] + public static void HasCorrectMethodImpl() + { + Type t = typeof(CryptographicOperations); + MethodInfo mi = t.GetMethod(nameof(CryptographicOperations.ZeroMemory)); + + // This method cannot be optimized, or the optimizer can decide that a call to Clear + // is unnecessary. + // It cannot be inlined, or it loses its no-optimization guarantee. + Assert.Equal( + MethodImplAttributes.NoInlining | MethodImplAttributes.NoOptimization, + mi.MethodImplementationFlags); + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj b/external/corefx/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj index c62b41e383..e00aaaefd4 100644 --- a/external/corefx/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj +++ b/external/corefx/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj @@ -52,6 +52,7 @@ + diff --git a/external/corefx/src/System.Security.Cryptography.ProtectedData/src/System/Security/Cryptography/ProtectedData.cs b/external/corefx/src/System.Security.Cryptography.ProtectedData/src/System/Security/Cryptography/ProtectedData.cs index 2fdb99bc16..7baa56669a 100644 --- a/external/corefx/src/System.Security.Cryptography.ProtectedData/src/System/Security/Cryptography/ProtectedData.cs +++ b/external/corefx/src/System.Security.Cryptography.ProtectedData/src/System/Security/Cryptography/ProtectedData.cs @@ -2,8 +2,6 @@ // 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; -using System.Diagnostics; using System.Runtime.InteropServices; using Internal.Cryptography; @@ -15,6 +13,8 @@ namespace System.Security.Cryptography { public static partial class ProtectedData { + private static readonly byte[] s_nonEmpty = new byte[1]; + public static byte[] Protect(byte[] userData, byte[] optionalEntropy, DataProtectionScope scope) { if (userData == null) @@ -35,7 +35,12 @@ namespace System.Security.Cryptography { unsafe { - fixed (byte* pInputData = inputData, pOptionalEntropy = optionalEntropy) + // The Win32 API will reject pbData == nullptr, and the fixed statement + // maps empty arrays to nullptr... so when the input is empty use the address of a + // different array, but still assign cbData to 0. + byte[] relevantData = inputData.Length == 0 ? s_nonEmpty : inputData; + + fixed (byte* pInputData = relevantData, pOptionalEntropy = optionalEntropy) { DATA_BLOB userDataBlob = new DATA_BLOB((IntPtr)pInputData, (uint)(inputData.Length)); DATA_BLOB optionalEntropyBlob = default(DATA_BLOB); diff --git a/external/corefx/src/System.Security.Cryptography.ProtectedData/tests/ProtectedDataTests.cs b/external/corefx/src/System.Security.Cryptography.ProtectedData/tests/ProtectedDataTests.cs index 9532224918..467c8d64c0 100644 --- a/external/corefx/src/System.Security.Cryptography.ProtectedData/tests/ProtectedDataTests.cs +++ b/external/corefx/src/System.Security.Cryptography.ProtectedData/tests/ProtectedDataTests.cs @@ -33,6 +33,24 @@ namespace System.Security.Cryptography.ProtectedDataTests } } + [Theory] + [InlineData(DataProtectionScope.CurrentUser, false)] + [InlineData(DataProtectionScope.CurrentUser, true)] + [InlineData(DataProtectionScope.LocalMachine, false)] + [InlineData(DataProtectionScope.LocalMachine, true)] + public static void ProtectEmptyData(DataProtectionScope scope, bool useEntropy) + { + // Use new byte[0] instead of Array.Empty to prove the implementation + // isn't using reference equality + byte[] data = new byte[0]; + byte[] entropy = useEntropy ? new byte[] { 68, 65, 72, 72, 75 } : null; + byte[] encrypted = ProtectedData.Protect(data, entropy, scope); + + Assert.NotEqual(data, encrypted); + byte[] recovered = ProtectedData.Unprotect(encrypted, entropy, scope); + Assert.Equal(data, recovered); + } + [Fact] public static void NullEntropyEquivalence() { diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Helpers.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Helpers.cs index 50bdae57fa..0f7ef8989e 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Helpers.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Helpers.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -using System.Diagnostics; +using System.Diagnostics.Private; using System.Globalization; namespace Internal.Cryptography diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.OSX/CertificateData.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.OSX/CertificateData.cs new file mode 100644 index 0000000000..e52e8aaa37 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.OSX/CertificateData.cs @@ -0,0 +1,506 @@ +// 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; +using System.Collections.Generic; +using System.Diagnostics; +using System.Security.Cryptography; +using System.Security.Cryptography.X509Certificates; +using System.Text; + +namespace Internal.Cryptography.Pal +{ + internal enum GeneralNameType + { + OtherName = 0, + Rfc822Name = 1, + // RFC 822: Standard for the format of ARPA Internet Text Messages. + // That means "email", and an RFC 822 Name: "Email address" + Email = Rfc822Name, + DnsName = 2, + X400Address = 3, + DirectoryName = 4, + EdiPartyName = 5, + UniformResourceIdentifier = 6, + IPAddress = 7, + RegisteredId = 8, + } + + internal struct CertificateData + { + internal struct AlgorithmIdentifier + { + internal string AlgorithmId; + internal byte[] Parameters; + } + + internal byte[] RawData; + internal byte[] SubjectPublicKeyInfo; + + internal int Version; + internal byte[] SerialNumber; + internal AlgorithmIdentifier TbsSignature; + internal X500DistinguishedName Issuer; + internal DateTime NotBefore; + internal DateTime NotAfter; + internal X500DistinguishedName Subject; + internal AlgorithmIdentifier PublicKeyAlgorithm; + internal byte[] PublicKey; + internal byte[] IssuerUniqueId; + internal byte[] SubjectUniqueId; + internal List Extensions; + internal AlgorithmIdentifier SignatureAlgorithm; + internal byte[] SignatureValue; + + internal CertificateData(byte[] rawData) + { +#if DEBUG + try + { +#endif + DerSequenceReader reader = new DerSequenceReader(rawData); + + DerSequenceReader tbsCertificate = reader.ReadSequence(); + + if (tbsCertificate.PeekTag() == DerSequenceReader.ContextSpecificConstructedTag0) + { + DerSequenceReader version = tbsCertificate.ReadSequence(); + Version = version.ReadInteger(); + } + else if (tbsCertificate.PeekTag() != (byte)DerSequenceReader.DerTag.Integer) + { + throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); + } + else + { + Version = 0; + } + + if (Version < 0 || Version > 2) + throw new CryptographicException(); + + SerialNumber = tbsCertificate.ReadIntegerBytes(); + + DerSequenceReader tbsSignature = tbsCertificate.ReadSequence(); + TbsSignature.AlgorithmId = tbsSignature.ReadOidAsString(); + TbsSignature.Parameters = tbsSignature.HasData ? tbsSignature.ReadNextEncodedValue() : Array.Empty(); + + if (tbsSignature.HasData) + throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); + + Issuer = new X500DistinguishedName(tbsCertificate.ReadNextEncodedValue()); + + DerSequenceReader validity = tbsCertificate.ReadSequence(); + NotBefore = validity.ReadX509Date(); + NotAfter = validity.ReadX509Date(); + + if (validity.HasData) + throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); + + Subject = new X500DistinguishedName(tbsCertificate.ReadNextEncodedValue()); + + SubjectPublicKeyInfo = tbsCertificate.ReadNextEncodedValue(); + DerSequenceReader subjectPublicKeyInfo = new DerSequenceReader(SubjectPublicKeyInfo); + DerSequenceReader subjectKeyAlgorithm = subjectPublicKeyInfo.ReadSequence(); + PublicKeyAlgorithm.AlgorithmId = subjectKeyAlgorithm.ReadOidAsString(); + PublicKeyAlgorithm.Parameters = subjectKeyAlgorithm.HasData ? subjectKeyAlgorithm.ReadNextEncodedValue() : Array.Empty(); + + if (subjectKeyAlgorithm.HasData) + throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); + + PublicKey = subjectPublicKeyInfo.ReadBitString(); + + if (subjectPublicKeyInfo.HasData) + throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); + + if (Version > 0 && + tbsCertificate.HasData && + tbsCertificate.PeekTag() == DerSequenceReader.ContextSpecificConstructedTag1) + { + IssuerUniqueId = tbsCertificate.ReadBitString(); + } + else + { + IssuerUniqueId = null; + } + + if (Version > 0 && + tbsCertificate.HasData && + tbsCertificate.PeekTag() == DerSequenceReader.ContextSpecificConstructedTag2) + { + SubjectUniqueId = tbsCertificate.ReadBitString(); + } + else + { + SubjectUniqueId = null; + } + + Extensions = new List(); + + if (Version > 1 && + tbsCertificate.HasData && + tbsCertificate.PeekTag() == DerSequenceReader.ContextSpecificConstructedTag3) + { + DerSequenceReader extensions = tbsCertificate.ReadSequence(); + extensions = extensions.ReadSequence(); + + while (extensions.HasData) + { + DerSequenceReader extensionReader = extensions.ReadSequence(); + string oid = extensionReader.ReadOidAsString(); + bool critical = false; + + if (extensionReader.PeekTag() == (byte)DerSequenceReader.DerTag.Boolean) + { + critical = extensionReader.ReadBoolean(); + } + + byte[] extensionData = extensionReader.ReadOctetString(); + + Extensions.Add(new X509Extension(oid, extensionData, critical)); + + if (extensionReader.HasData) + throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); + } + } + + if (tbsCertificate.HasData) + throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); + + DerSequenceReader signatureAlgorithm = reader.ReadSequence(); + SignatureAlgorithm.AlgorithmId = signatureAlgorithm.ReadOidAsString(); + SignatureAlgorithm.Parameters = signatureAlgorithm.HasData ? signatureAlgorithm.ReadNextEncodedValue() : Array.Empty(); + + if (signatureAlgorithm.HasData) + throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); + + SignatureValue = reader.ReadBitString(); + + if (reader.HasData) + throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); + + RawData = rawData; +#if DEBUG + } + catch (Exception e) + { + throw new CryptographicException( + $"Error in reading certificate:{Environment.NewLine}{PemPrintCert(rawData)}", + e); + } +#endif + } + + public string GetNameInfo(X509NameType nameType, bool forIssuer) + { + // Algorithm behaviors (pseudocode). When forIssuer is true, replace "Subject" with "Issuer" and + // SAN (Subject Alternative Names) with IAN (Issuer Alternative Names). + // + // SimpleName: Subject[CN] ?? Subject[OU] ?? Subject[O] ?? Subject[E] ?? Subject.Rdns.FirstOrDefault() ?? + // SAN.Entries.FirstOrDefault(type == GEN_EMAIL); + // EmailName: SAN.Entries.FirstOrDefault(type == GEN_EMAIL) ?? Subject[E]; + // UpnName: SAN.Entries.FirsOrDefaultt(type == GEN_OTHER && entry.AsOther().OID == szOidUpn).AsOther().Value; + // DnsName: SAN.Entries.FirstOrDefault(type == GEN_DNS) ?? Subject[CN]; + // DnsFromAlternativeName: SAN.Entries.FirstOrDefault(type == GEN_DNS); + // UrlName: SAN.Entries.FirstOrDefault(type == GEN_URI); + + if (nameType == X509NameType.SimpleName) + { + X500DistinguishedName name = forIssuer ? Issuer : Subject; + string candidate = GetSimpleNameInfo(name); + + if (candidate != null) + { + return candidate; + } + } + + // Check the Subject Alternative Name (or Issuer Alternative Name) for the right value; + { + string extensionId = forIssuer ? Oids.IssuerAltName : Oids.SubjectAltName; + GeneralNameType? matchType = null; + string otherOid = null; + + // Currently all X509NameType types have a path where they look at the SAN/IAN, + // but we need to figure out which kind they want. + switch (nameType) + { + case X509NameType.DnsName: + case X509NameType.DnsFromAlternativeName: + matchType = GeneralNameType.DnsName; + break; + case X509NameType.SimpleName: + case X509NameType.EmailName: + matchType = GeneralNameType.Email; + break; + case X509NameType.UpnName: + matchType = GeneralNameType.OtherName; + otherOid = Oids.UserPrincipalName; + break; + case X509NameType.UrlName: + matchType = GeneralNameType.UniformResourceIdentifier; + break; + } + + if (matchType.HasValue) + { + foreach (X509Extension extension in Extensions) + { + if (extension.Oid.Value == extensionId) + { + string candidate = FindAltNameMatch(extension.RawData, matchType.Value, otherOid); + + if (candidate != null) + { + return candidate; + } + } + } + } + else + { + Debug.Fail($"Unresolved matchType for X509NameType.{nameType}"); + } + } + + // Subject-based fallback + { + string expectedKey = null; + + switch (nameType) + { + case X509NameType.EmailName: + expectedKey = Oids.EmailAddress; + break; + case X509NameType.DnsName: + // Note: This does not include DnsFromAlternativeName, since + // the subject (or issuer) is not the Alternative Name. + expectedKey = Oids.CommonName; + break; + } + + if (expectedKey != null) + { + X500DistinguishedName name = forIssuer ? Issuer : Subject; + + foreach (var kvp in ReadReverseRdns(name)) + { + if (kvp.Key == expectedKey) + { + return kvp.Value; + } + } + } + } + + return ""; + } + + private static string GetSimpleNameInfo(X500DistinguishedName name) + { + string ou = null; + string o = null; + string e = null; + string firstRdn = null; + + foreach (var kvp in ReadReverseRdns(name)) + { + string oid = kvp.Key; + string value = kvp.Value; + + // TODO: Check this (and the OpenSSL-using version) if OU/etc are specified more than once. + // (Compare against Windows) + switch (oid) + { + case Oids.CommonName: + return value; + case Oids.OrganizationalUnit: + ou = value; + break; + case Oids.Organization: + o = value; + break; + case Oids.EmailAddress: + e = value; + break; + default: + if (firstRdn == null) + { + firstRdn = value; + } + + break; + } + } + + return ou ?? o ?? e ?? firstRdn; + } + + private static string FindAltNameMatch(byte[] extensionBytes, GeneralNameType matchType, string otherOid) + { + // If Other, have OID, else, no OID. + Debug.Assert( + (otherOid == null) == (matchType != GeneralNameType.OtherName), + $"otherOid has incorrect nullarity for matchType {matchType}"); + + Debug.Assert( + matchType == GeneralNameType.UniformResourceIdentifier || + matchType == GeneralNameType.DnsName || + matchType == GeneralNameType.Email || + matchType == GeneralNameType.OtherName, + $"matchType ({matchType}) is not currently supported"); + + Debug.Assert( + otherOid == null || otherOid == Oids.UserPrincipalName, + $"otherOid ({otherOid}) is not supported"); + + // SubjectAltName ::= GeneralNames + // + // IssuerAltName ::= GeneralNames + // + // GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName + // + // GeneralName ::= CHOICE { + // otherName [0] OtherName, + // rfc822Name [1] IA5String, + // dNSName [2] IA5String, + // x400Address [3] ORAddress, + // directoryName [4] Name, + // ediPartyName [5] EDIPartyName, + // uniformResourceIdentifier [6] IA5String, + // iPAddress [7] OCTET STRING, + // registeredID [8] OBJECT IDENTIFIER } + // + // OtherName::= SEQUENCE { + // type - id OBJECT IDENTIFIER, + // value[0] EXPLICIT ANY DEFINED BY type - id } + + byte expectedTag = (byte)(DerSequenceReader.ContextSpecificTagFlag | (byte)matchType); + + if (matchType == GeneralNameType.OtherName) + { + expectedTag |= DerSequenceReader.ConstructedFlag; + } + + DerSequenceReader altNameReader = new DerSequenceReader(extensionBytes); + + while (altNameReader.HasData) + { + if (altNameReader.PeekTag() != expectedTag) + { + altNameReader.SkipValue(); + continue; + } + + switch (matchType) + { + case GeneralNameType.OtherName: + { + DerSequenceReader otherNameReader = altNameReader.ReadSequence(); + string oid = otherNameReader.ReadOidAsString(); + + if (oid == otherOid) + { + // Payload is value[0] EXPLICIT, meaning + // a) it'll be tagged as ContextSpecific0 + // b) that's interpretable as a Sequence (EXPLICIT) + // c) the payload will then be retagged as the correct type (EXPLICIT) + if (otherNameReader.PeekTag() != DerSequenceReader.ContextSpecificConstructedTag0) + { + throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); + } + + otherNameReader = otherNameReader.ReadSequence(); + + // Currently only UPN is supported, which is a UTF8 string per + // https://msdn.microsoft.com/en-us/library/ff842518.aspx + return otherNameReader.ReadUtf8String(); + } + + // If the OtherName OID didn't match, move to the next entry. + continue; + } + case GeneralNameType.Rfc822Name: + case GeneralNameType.DnsName: + case GeneralNameType.UniformResourceIdentifier: + return altNameReader.ReadIA5String(); + default: + altNameReader.SkipValue(); + continue; + } + } + + return null; + } + + private static IEnumerable> ReadReverseRdns(X500DistinguishedName name) + { + DerSequenceReader x500NameReader = new DerSequenceReader(name.RawData); + var rdnReaders = new Stack(); + + while (x500NameReader.HasData) + { + rdnReaders.Push(x500NameReader.ReadSet()); + } + + + while (rdnReaders.Count > 0) + { + DerSequenceReader rdnReader = rdnReaders.Pop(); + + while (rdnReader.HasData) + { + DerSequenceReader tavReader = rdnReader.ReadSequence(); + string oid = tavReader.ReadOidAsString(); + + var tag = (DerSequenceReader.DerTag)tavReader.PeekTag(); + string value = null; + + switch (tag) + { + case DerSequenceReader.DerTag.BMPString: + value = tavReader.ReadBMPString(); + break; + case DerSequenceReader.DerTag.IA5String: + value = tavReader.ReadIA5String(); + break; + case DerSequenceReader.DerTag.PrintableString: + value = tavReader.ReadPrintableString(); + break; + case DerSequenceReader.DerTag.UTF8String: + value = tavReader.ReadUtf8String(); + break; + + // Ignore anything we don't know how to read. + } + + if (value != null) + { + yield return new KeyValuePair(oid, value); + } + } + } + } + +#if DEBUG + private static string PemPrintCert(byte[] rawData) + { + const string PemHeader = "-----BEGIN CERTIFICATE-----"; + const string PemFooter = "-----END CERTIFICATE-----"; + + StringBuilder builder = new StringBuilder(PemHeader.Length + PemFooter.Length + rawData.Length * 2); + builder.Append(PemHeader); + builder.AppendLine(); + + builder.Append(Convert.ToBase64String(rawData, Base64FormattingOptions.InsertLineBreaks)); + builder.AppendLine(); + + builder.Append(PemFooter); + builder.AppendLine(); + + return builder.ToString(); + } +#endif + } +} diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.OSX/CertificatePal.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.OSX/CertificatePal.cs index 2463c2ccef..6121f17a6a 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.OSX/CertificatePal.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.OSX/CertificatePal.cs @@ -526,246 +526,8 @@ namespace Internal.Cryptography.Pal public string GetNameInfo(X509NameType nameType, bool forIssuer) { - // Algorithm behaviors (pseudocode). When forIssuer is true, replace "Subject" with "Issuer" and - // SAN (Subject Alternative Names) with IAN (Issuer Alternative Names). - // - // SimpleName: Subject[CN] ?? Subject[OU] ?? Subject[O] ?? Subject[E] ?? Subject.Rdns.FirstOrDefault() ?? - // SAN.Entries.FirstOrDefault(type == GEN_EMAIL); - // EmailName: SAN.Entries.FirstOrDefault(type == GEN_EMAIL) ?? Subject[E]; - // UpnName: SAN.Entries.FirsOrDefaultt(type == GEN_OTHER && entry.AsOther().OID == szOidUpn).AsOther().Value; - // DnsName: SAN.Entries.FirstOrDefault(type == GEN_DNS) ?? Subject[CN]; - // DnsFromAlternativeName: SAN.Entries.FirstOrDefault(type == GEN_DNS); - // UrlName: SAN.Entries.FirstOrDefault(type == GEN_URI); - EnsureCertData(); - - if (nameType == X509NameType.SimpleName) - { - X500DistinguishedName name = forIssuer ? _certData.Issuer : _certData.Subject; - string candidate = GetSimpleNameInfo(name); - - if (candidate != null) - { - return candidate; - } - } - - // Check the Subject Alternative Name (or Issuer Alternative Name) for the right value; - { - string extensionId = forIssuer ? Oids.IssuerAltName : Oids.SubjectAltName; - GeneralNameType? matchType = null; - string otherOid = null; - - // Currently all X509NameType types have a path where they look at the SAN/IAN, - // but we need to figure out which kind they want. - switch (nameType) - { - case X509NameType.DnsName: - case X509NameType.DnsFromAlternativeName: - matchType = GeneralNameType.DnsName; - break; - case X509NameType.SimpleName: - case X509NameType.EmailName: - matchType = GeneralNameType.Email; - break; - case X509NameType.UpnName: - matchType = GeneralNameType.OtherName; - otherOid = Oids.UserPrincipalName; - break; - case X509NameType.UrlName: - matchType = GeneralNameType.UniformResourceIdentifier; - break; - } - - if (matchType.HasValue) - { - foreach (X509Extension extension in _certData.Extensions) - { - if (extension.Oid.Value == extensionId) - { - string candidate = FindAltNameMatch(extension.RawData, matchType.Value, otherOid); - - if (candidate != null) - { - return candidate; - } - } - } - } - else - { - Debug.Fail($"Unresolved matchType for X509NameType.{nameType}"); - } - } - - // Subject-based fallback - { - string expectedKey = null; - - switch (nameType) - { - case X509NameType.EmailName: - expectedKey = Oids.EmailAddress; - break; - case X509NameType.DnsName: - // Note: This does not include DnsFromAlternativeName, since - // the subject (or issuer) is not the Alternative Name. - expectedKey = Oids.CommonName; - break; - } - - if (expectedKey != null) - { - X500DistinguishedName name = forIssuer ? _certData.Issuer : _certData.Subject; - - foreach (var kvp in ReadReverseRdns(name)) - { - if (kvp.Key == expectedKey) - { - return kvp.Value; - } - } - } - } - - return ""; - } - - private static string GetSimpleNameInfo(X500DistinguishedName name) - { - string ou = null; - string o = null; - string e = null; - string firstRdn = null; - - foreach (var kvp in ReadReverseRdns(name)) - { - string oid = kvp.Key; - string value = kvp.Value; - - // TODO: Check this (and the OpenSSL-using version) if OU/etc are specified more than once. - // (Compare against Windows) - switch (oid) - { - case Oids.CommonName: - return value; - case Oids.OrganizationalUnit: - ou = value; - break; - case Oids.Organization: - o = value; - break; - case Oids.EmailAddress: - e = value; - break; - default: - if (firstRdn == null) - { - firstRdn = value; - } - - break; - } - } - - return ou ?? o ?? e ?? firstRdn; - } - - private static string FindAltNameMatch(byte[] extensionBytes, GeneralNameType matchType, string otherOid) - { - // If Other, have OID, else, no OID. - Debug.Assert( - (otherOid == null) == (matchType != GeneralNameType.OtherName), - $"otherOid has incorrect nullarity for matchType {matchType}"); - - Debug.Assert( - matchType == GeneralNameType.UniformResourceIdentifier || - matchType == GeneralNameType.DnsName || - matchType == GeneralNameType.Email || - matchType == GeneralNameType.OtherName, - $"matchType ({matchType}) is not currently supported"); - - Debug.Assert( - otherOid == null || otherOid == Oids.UserPrincipalName, - $"otherOid ({otherOid}) is not supported"); - - // SubjectAltName ::= GeneralNames - // - // IssuerAltName ::= GeneralNames - // - // GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName - // - // GeneralName ::= CHOICE { - // otherName [0] OtherName, - // rfc822Name [1] IA5String, - // dNSName [2] IA5String, - // x400Address [3] ORAddress, - // directoryName [4] Name, - // ediPartyName [5] EDIPartyName, - // uniformResourceIdentifier [6] IA5String, - // iPAddress [7] OCTET STRING, - // registeredID [8] OBJECT IDENTIFIER } - // - // OtherName::= SEQUENCE { - // type - id OBJECT IDENTIFIER, - // value[0] EXPLICIT ANY DEFINED BY type - id } - - byte expectedTag = (byte)(DerSequenceReader.ContextSpecificTagFlag | (byte)matchType); - - if (matchType == GeneralNameType.OtherName) - { - expectedTag |= DerSequenceReader.ConstructedFlag; - } - - DerSequenceReader altNameReader = new DerSequenceReader(extensionBytes); - - while (altNameReader.HasData) - { - if (altNameReader.PeekTag() != expectedTag) - { - altNameReader.SkipValue(); - continue; - } - - switch (matchType) - { - case GeneralNameType.OtherName: - { - DerSequenceReader otherNameReader = altNameReader.ReadSequence(); - string oid = otherNameReader.ReadOidAsString(); - - if (oid == otherOid) - { - // Payload is value[0] EXPLICIT, meaning - // a) it'll be tagged as ContextSpecific0 - // b) that's interpretable as a Sequence (EXPLICIT) - // c) the payload will then be retagged as the correct type (EXPLICIT) - if (otherNameReader.PeekTag() != DerSequenceReader.ContextSpecificConstructedTag0) - { - throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); - } - - otherNameReader = otherNameReader.ReadSequence(); - - // Currently only UPN is supported, which is a UTF8 string per - // https://msdn.microsoft.com/en-us/library/ff842518.aspx - return otherNameReader.ReadUtf8String(); - } - - // If the OtherName OID didn't match, move to the next entry. - continue; - } - case GeneralNameType.Rfc822Name: - case GeneralNameType.DnsName: - case GeneralNameType.UniformResourceIdentifier: - return altNameReader.ReadIA5String(); - default: - altNameReader.SkipValue(); - continue; - } - } - - return null; + return _certData.GetNameInfo(nameType, forIssuer); } public void AppendPrivateKeyInfo(StringBuilder sb) @@ -791,255 +553,5 @@ namespace Internal.Cryptography.Pal _readCertData = true; } - private static IEnumerable> ReadReverseRdns(X500DistinguishedName name) - { - DerSequenceReader x500NameReader = new DerSequenceReader(name.RawData); - var rdnReaders = new Stack(); - - while (x500NameReader.HasData) - { - rdnReaders.Push(x500NameReader.ReadSet()); - } - - - while (rdnReaders.Count > 0) - { - DerSequenceReader rdnReader = rdnReaders.Pop(); - - while (rdnReader.HasData) - { - DerSequenceReader tavReader = rdnReader.ReadSequence(); - string oid = tavReader.ReadOidAsString(); - - var tag = (DerSequenceReader.DerTag)tavReader.PeekTag(); - string value = null; - - switch (tag) - { - case DerSequenceReader.DerTag.BMPString: - value = tavReader.ReadBMPString(); - break; - case DerSequenceReader.DerTag.IA5String: - value = tavReader.ReadIA5String(); - break; - case DerSequenceReader.DerTag.PrintableString: - value = tavReader.ReadPrintableString(); - break; - case DerSequenceReader.DerTag.UTF8String: - value = tavReader.ReadUtf8String(); - break; - - // Ignore anything we don't know how to read. - } - - if (value != null) - { - yield return new KeyValuePair(oid, value); - } - } - } - } - } - - internal enum GeneralNameType - { - OtherName = 0, - Rfc822Name = 1, - // RFC 822: Standard for the format of ARPA Internet Text Messages. - // That means "email", and an RFC 822 Name: "Email address" - Email = Rfc822Name, - DnsName = 2, - X400Address = 3, - DirectoryName = 4, - EdiPartyName = 5, - UniformResourceIdentifier = 6, - IPAddress = 7, - RegisteredId = 8, - } - - internal struct CertificateData - { - internal struct AlgorithmIdentifier - { - internal string AlgorithmId; - internal byte[] Parameters; - } - - internal byte[] RawData; - internal byte[] SubjectPublicKeyInfo; - - internal int Version; - internal byte[] SerialNumber; - internal AlgorithmIdentifier TbsSignature; - internal X500DistinguishedName Issuer; - internal DateTime NotBefore; - internal DateTime NotAfter; - internal X500DistinguishedName Subject; - internal AlgorithmIdentifier PublicKeyAlgorithm; - internal byte[] PublicKey; - internal byte[] IssuerUniqueId; - internal byte[] SubjectUniqueId; - internal List Extensions; - internal AlgorithmIdentifier SignatureAlgorithm; - internal byte[] SignatureValue; - - internal CertificateData(byte[] rawData) - { -#if DEBUG - try - { -#endif - DerSequenceReader reader = new DerSequenceReader(rawData); - - DerSequenceReader tbsCertificate = reader.ReadSequence(); - - if (tbsCertificate.PeekTag() == DerSequenceReader.ContextSpecificConstructedTag0) - { - DerSequenceReader version = tbsCertificate.ReadSequence(); - Version = version.ReadInteger(); - } - else if (tbsCertificate.PeekTag() != (byte)DerSequenceReader.DerTag.Integer) - { - throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); - } - else - { - Version = 0; - } - - if (Version < 0 || Version > 2) - throw new CryptographicException(); - - SerialNumber = tbsCertificate.ReadIntegerBytes(); - - DerSequenceReader tbsSignature = tbsCertificate.ReadSequence(); - TbsSignature.AlgorithmId = tbsSignature.ReadOidAsString(); - TbsSignature.Parameters = tbsSignature.HasData ? tbsSignature.ReadNextEncodedValue() : Array.Empty(); - - if (tbsSignature.HasData) - throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); - - Issuer = new X500DistinguishedName(tbsCertificate.ReadNextEncodedValue()); - - DerSequenceReader validity = tbsCertificate.ReadSequence(); - NotBefore = validity.ReadX509Date(); - NotAfter = validity.ReadX509Date(); - - if (validity.HasData) - throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); - - Subject = new X500DistinguishedName(tbsCertificate.ReadNextEncodedValue()); - - SubjectPublicKeyInfo = tbsCertificate.ReadNextEncodedValue(); - DerSequenceReader subjectPublicKeyInfo = new DerSequenceReader(SubjectPublicKeyInfo); - DerSequenceReader subjectKeyAlgorithm = subjectPublicKeyInfo.ReadSequence(); - PublicKeyAlgorithm.AlgorithmId = subjectKeyAlgorithm.ReadOidAsString(); - PublicKeyAlgorithm.Parameters = subjectKeyAlgorithm.HasData ? subjectKeyAlgorithm.ReadNextEncodedValue() : Array.Empty(); - - if (subjectKeyAlgorithm.HasData) - throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); - - PublicKey = subjectPublicKeyInfo.ReadBitString(); - - if (subjectPublicKeyInfo.HasData) - throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); - - if (Version > 0 && - tbsCertificate.HasData && - tbsCertificate.PeekTag() == DerSequenceReader.ContextSpecificConstructedTag1) - { - IssuerUniqueId = tbsCertificate.ReadBitString(); - } - else - { - IssuerUniqueId = null; - } - - if (Version > 0 && - tbsCertificate.HasData && - tbsCertificate.PeekTag() == DerSequenceReader.ContextSpecificConstructedTag2) - { - SubjectUniqueId = tbsCertificate.ReadBitString(); - } - else - { - SubjectUniqueId = null; - } - - Extensions = new List(); - - if (Version > 1 && - tbsCertificate.HasData && - tbsCertificate.PeekTag() == DerSequenceReader.ContextSpecificConstructedTag3) - { - DerSequenceReader extensions = tbsCertificate.ReadSequence(); - extensions = extensions.ReadSequence(); - - while (extensions.HasData) - { - DerSequenceReader extensionReader = extensions.ReadSequence(); - string oid = extensionReader.ReadOidAsString(); - bool critical = false; - - if (extensionReader.PeekTag() == (byte)DerSequenceReader.DerTag.Boolean) - { - critical = extensionReader.ReadBoolean(); - } - - byte[] extensionData = extensionReader.ReadOctetString(); - - Extensions.Add(new X509Extension(oid, extensionData, critical)); - - if (extensionReader.HasData) - throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); - } - } - - if (tbsCertificate.HasData) - throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); - - DerSequenceReader signatureAlgorithm = reader.ReadSequence(); - SignatureAlgorithm.AlgorithmId = signatureAlgorithm.ReadOidAsString(); - SignatureAlgorithm.Parameters = signatureAlgorithm.HasData ? signatureAlgorithm.ReadNextEncodedValue() : Array.Empty(); - - if (signatureAlgorithm.HasData) - throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); - - SignatureValue = reader.ReadBitString(); - - if (reader.HasData) - throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); - - RawData = rawData; -#if DEBUG - } - catch (Exception e) - { - throw new CryptographicException( - $"Error in reading certificate:{Environment.NewLine}{PemPrintCert(rawData)}", - e); - } -#endif - } - -#if DEBUG - private static string PemPrintCert(byte[] rawData) - { - const string PemHeader = "-----BEGIN CERTIFICATE-----"; - const string PemFooter = "-----END CERTIFICATE-----"; - - StringBuilder builder = new StringBuilder(PemHeader.Length + PemFooter.Length + rawData.Length * 2); - builder.Append(PemHeader); - builder.AppendLine(); - - builder.Append(Convert.ToBase64String(rawData, Base64FormattingOptions.InsertLineBreaks)); - builder.AppendLine(); - - builder.Append(PemFooter); - builder.AppendLine(); - - return builder.ToString(); - } -#endif } } diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/CertificateAssetDownloader.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/CertificateAssetDownloader.cs index aa75ae4455..010fe58e55 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/CertificateAssetDownloader.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/CertificateAssetDownloader.cs @@ -54,10 +54,16 @@ namespace Internal.Cryptography.Pal using (SafeBioHandle bio = Interop.Crypto.CreateMemoryBio()) { + Interop.Crypto.CheckValidOpenSslHandle(bio); + Interop.Crypto.BioWrite(bio, data, data.Length); handle = Interop.Crypto.PemReadBioX509Crl(bio); + // DecodeX509Crl failed, so we need to clear its error. + // If PemReadBioX509Crl failed, clear that too. + Interop.Crypto.ErrClearError(); + if (!handle.IsInvalid) { return handle; diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/CertificatePal.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/CertificatePal.cs index 26df9d4c69..6a69f24ceb 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/CertificatePal.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/CertificatePal.cs @@ -34,12 +34,13 @@ namespace Internal.Cryptography.Pal Debug.Assert(password != null); ICertificatePal cert; + Exception openSslException; if (TryReadX509Der(rawData, out cert) || TryReadX509Pem(rawData, out cert) || PkcsFormatReader.TryReadPkcs7Der(rawData, out cert) || PkcsFormatReader.TryReadPkcs7Pem(rawData, out cert) || - PkcsFormatReader.TryReadPkcs12(rawData, password, out cert)) + PkcsFormatReader.TryReadPkcs12(rawData, password, out cert, out openSslException)) { if (cert == null) { @@ -51,7 +52,8 @@ namespace Internal.Cryptography.Pal } // Unsupported - throw Interop.Crypto.CreateOpenSslCryptographicException(); + Debug.Assert(openSslException != null); + throw openSslException; } public static ICertificatePal FromFile(string fileName, SafePasswordHandle password, X509KeyStorageFlags keyStorageFlags) @@ -104,7 +106,9 @@ namespace Internal.Cryptography.Pal // Rewind, try again. RewindBio(bio, bioPosition); - if (PkcsFormatReader.TryReadPkcs12(bio, password, out certPal)) + // Capture the exception so in case of failure, the call to BioSeek does not override it. + Exception openSslException; + if (PkcsFormatReader.TryReadPkcs12(bio, password, out certPal, out openSslException)) { return certPal; } @@ -112,14 +116,14 @@ namespace Internal.Cryptography.Pal // Since we aren't going to finish reading, leaving the buffer where it was when we got // it seems better than leaving it in some arbitrary other position. // - // But, before seeking back to start, save the Exception representing the last reported - // OpenSSL error in case the last BioSeek would change it. - Exception openSslException = Interop.Crypto.CreateOpenSslCryptographicException(); - // Use BioSeek directly for the last seek attempt, because any failure here should instead // report the already created (but not yet thrown) exception. - Interop.Crypto.BioSeek(bio, bioPosition); + if (Interop.Crypto.BioSeek(bio, bioPosition) < 0) + { + Interop.Crypto.ErrClearError(); + } + Debug.Assert(openSslException != null); throw openSslException; } @@ -141,6 +145,7 @@ namespace Internal.Cryptography.Pal { certHandle.Dispose(); certPal = null; + Interop.Crypto.ErrClearError(); return false; } @@ -156,6 +161,7 @@ namespace Internal.Cryptography.Pal { cert.Dispose(); certPal = null; + Interop.Crypto.ErrClearError(); return false; } @@ -169,7 +175,11 @@ namespace Internal.Cryptography.Pal { Interop.Crypto.CheckValidOpenSslHandle(bio); - Interop.Crypto.BioWrite(bio, rawData, rawData.Length); + if (Interop.Crypto.BioWrite(bio, rawData, rawData.Length) != rawData.Length) + { + Interop.Crypto.ErrClearError(); + } + return TryReadX509Pem(bio, out certPal); } } @@ -182,6 +192,7 @@ namespace Internal.Cryptography.Pal { cert.Dispose(); fromBio = null; + Interop.Crypto.ErrClearError(); return false; } diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/ChainPal.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/ChainPal.cs index 8f05c0960b..943fda15cb 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/ChainPal.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/ChainPal.cs @@ -163,11 +163,7 @@ namespace Internal.Cryptography.Pal { userIntermediate.Add(cert); } - catch (CryptographicException) - { - // Saving is opportunistic, just ignore failures - } - catch (IOException) + catch { // Saving is opportunistic, just ignore failures } diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/CrlCache.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/CrlCache.cs index 4ae325910e..fadf117627 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/CrlCache.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/CrlCache.cs @@ -13,6 +13,8 @@ namespace Internal.Cryptography.Pal { internal static class CrlCache { + private const ulong X509_R_CERT_ALREADY_IN_HASH_TABLE = 0x0B07D065; + public static void AddCrlForCertificate( X509Certificate2 cert, SafeX509StoreHandle store, @@ -50,6 +52,7 @@ namespace Internal.Cryptography.Pal { if (bio.IsInvalid) { + Interop.Crypto.ErrClearError(); return false; } @@ -59,6 +62,7 @@ namespace Internal.Cryptography.Pal { if (crl.IsInvalid) { + Interop.Crypto.ErrClearError(); return false; } @@ -83,9 +87,18 @@ namespace Internal.Cryptography.Pal return false; } - // TODO (#3063): Check the return value of X509_STORE_add_crl, and throw on any error other - // than X509_R_CERT_ALREADY_IN_HASH_TABLE - Interop.Crypto.X509StoreAddCrl(store, crl); + if (!Interop.Crypto.X509StoreAddCrl(store, crl)) + { + // Ignore error "cert already in store", throw on anything else. In any case the error queue will be cleared. + if (X509_R_CERT_ALREADY_IN_HASH_TABLE == Interop.Crypto.ErrPeekLastError()) + { + Interop.Crypto.ErrClearError(); + } + else + { + throw Interop.Crypto.CreateOpenSslCryptographicException(); + } + } return true; } @@ -111,9 +124,18 @@ namespace Internal.Cryptography.Pal // null is a valid return (e.g. no remainingDownloadTime) if (crl != null && !crl.IsInvalid) { - // TODO (#3063): Check the return value of X509_STORE_add_crl, and throw on any error other - // than X509_R_CERT_ALREADY_IN_HASH_TABLE - Interop.Crypto.X509StoreAddCrl(store, crl); + if (!Interop.Crypto.X509StoreAddCrl(store, crl)) + { + // Ignore error "cert already in store", throw on anything else. In any case the error queue will be cleared. + if (X509_R_CERT_ALREADY_IN_HASH_TABLE == Interop.Crypto.ErrPeekLastError()) + { + Interop.Crypto.ErrClearError(); + } + else + { + throw Interop.Crypto.CreateOpenSslCryptographicException(); + } + } // Saving the CRL to the disk is just a performance optimization for later requests to not // need to use the network again, so failure to save shouldn't throw an exception or mark @@ -124,9 +146,10 @@ namespace Internal.Cryptography.Pal using (SafeBioHandle bio = Interop.Crypto.BioNewFile(crlFile, "wb")) { - if (!bio.IsInvalid) + if (bio.IsInvalid || Interop.Crypto.PemWriteBioX509Crl(bio, crl) == 0) { - Interop.Crypto.PemWriteBioX509Crl(bio, crl); + // No bio, or write failed + Interop.Crypto.ErrClearError(); } } } @@ -147,6 +170,11 @@ namespace Internal.Cryptography.Pal // X509_issuer_name_hash returns "unsigned long", which is marshalled as ulong. // But it only sets 32 bits worth of data, so force it down to uint just... in case. ulong persistentHashLong = Interop.Crypto.X509IssuerNameHash(pal.SafeHandle); + if (persistentHashLong == 0) + { + Interop.Crypto.ErrClearError(); + } + uint persistentHash = unchecked((uint)persistentHashLong); // OpenSSL's hashed filename algorithm is the 8-character hex version of the 32-bit value diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/DirectoryBasedStoreProvider.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/DirectoryBasedStoreProvider.cs index 7c801a1656..83b6fb506e 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/DirectoryBasedStoreProvider.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/DirectoryBasedStoreProvider.cs @@ -116,6 +116,22 @@ namespace Internal.Cryptography.Pal throw new CryptographicException(SR.Cryptography_X509_StoreReadOnly); } + try + { + AddCertToStore(certPal); + } + catch (CryptographicException) + { + throw; + } + catch (Exception e) + { + throw new CryptographicException(SR.Cryptography_X509_StoreAddFailure, e); + } + } + + private void AddCertToStore(ICertificatePal certPal) + { // This may well be the first time that we've added something to this store. Directory.CreateDirectory(_storePath); diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/OpenSslPkcs12Reader.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/OpenSslPkcs12Reader.cs index f7e98fd899..768c28e89a 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/OpenSslPkcs12Reader.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/OpenSslPkcs12Reader.cs @@ -22,35 +22,17 @@ namespace Internal.Cryptography.Pal _pkcs12Handle = pkcs12Handle; } - public static bool TryRead(byte[] data, out OpenSslPkcs12Reader pkcs12Reader) - { - SafePkcs12Handle handle = Interop.Crypto.DecodePkcs12(data, data.Length); + public static bool TryRead(byte[] data, out OpenSslPkcs12Reader pkcs12Reader) => + TryRead(data, out pkcs12Reader, out _, captureException: false); - if (!handle.IsInvalid) - { - pkcs12Reader = new OpenSslPkcs12Reader(handle); - return true; - } + public static bool TryRead(byte[] data, out OpenSslPkcs12Reader pkcs12Reader, out Exception openSslException) => + TryRead(data, out pkcs12Reader, out openSslException, captureException: true); - handle.Dispose(); - pkcs12Reader = null; - return false; - } + public static bool TryRead(SafeBioHandle fileBio, out OpenSslPkcs12Reader pkcs12Reader) => + TryRead(fileBio, out pkcs12Reader, out _, captureException: false); - public static bool TryRead(SafeBioHandle fileBio, out OpenSslPkcs12Reader pkcs12Reader) - { - SafePkcs12Handle p12 = Interop.Crypto.DecodePkcs12FromBio(fileBio); - - if (!p12.IsInvalid) - { - pkcs12Reader = new OpenSslPkcs12Reader(p12); - return true; - } - - p12.Dispose(); - pkcs12Reader = null; - return false; - } + public static bool TryRead(SafeBioHandle fileBio, out OpenSslPkcs12Reader pkcs12Reader, out Exception openSslException) => + TryRead(fileBio, out pkcs12Reader, out openSslException, captureException: true); public void Dispose() { @@ -132,5 +114,55 @@ namespace Internal.Cryptography.Pal return certs; } + + private static bool TryRead(byte[] data, out OpenSslPkcs12Reader pkcs12Reader, out Exception openSslException, bool captureException) + { + SafePkcs12Handle handle = Interop.Crypto.DecodePkcs12(data, data.Length); + openSslException = null; + + if (!handle.IsInvalid) + { + pkcs12Reader = new OpenSslPkcs12Reader(handle); + return true; + } + + handle.Dispose(); + pkcs12Reader = null; + if (captureException) + { + openSslException = Interop.Crypto.CreateOpenSslCryptographicException(); + } + else + { + Interop.Crypto.ErrClearError(); + } + + return false; + } + + private static bool TryRead(SafeBioHandle fileBio, out OpenSslPkcs12Reader pkcs12Reader, out Exception openSslException, bool captureException) + { + SafePkcs12Handle p12 = Interop.Crypto.DecodePkcs12FromBio(fileBio); + openSslException = null; + + if (!p12.IsInvalid) + { + pkcs12Reader = new OpenSslPkcs12Reader(p12); + return true; + } + + p12.Dispose(); + pkcs12Reader = null; + if (captureException) + { + openSslException = Interop.Crypto.CreateOpenSslCryptographicException(); + } + else + { + Interop.Crypto.ErrClearError(); + } + + return false; + } } } diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/OpenSslX509ChainProcessor.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/OpenSslX509ChainProcessor.cs index 2cf00f883a..7c0040acc0 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/OpenSslX509ChainProcessor.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/OpenSslX509ChainProcessor.cs @@ -380,16 +380,19 @@ namespace Internal.Cryptography.Pal using (var systemIntermediateStore = new X509Store(StoreName.CertificateAuthority, StoreLocation.LocalMachine)) using (var userRootStore = new X509Store(StoreName.Root, StoreLocation.CurrentUser)) using (var userIntermediateStore = new X509Store(StoreName.CertificateAuthority, StoreLocation.CurrentUser)) + using (var userMyStore = new X509Store(StoreName.My, StoreLocation.CurrentUser)) { systemRootStore.Open(OpenFlags.ReadOnly); systemIntermediateStore.Open(OpenFlags.ReadOnly); userRootStore.Open(OpenFlags.ReadOnly); userIntermediateStore.Open(OpenFlags.ReadOnly); + userMyStore.Open(OpenFlags.ReadOnly); X509Certificate2Collection systemRootCerts = systemRootStore.Certificates; X509Certificate2Collection systemIntermediateCerts = systemIntermediateStore.Certificates; X509Certificate2Collection userRootCerts = userRootStore.Certificates; X509Certificate2Collection userIntermediateCerts = userIntermediateStore.Certificates; + X509Certificate2Collection userMyCerts = userMyStore.Certificates; // fill the system trusted collection foreach (X509Certificate2 userRootCert in userRootCerts) @@ -416,6 +419,7 @@ namespace Internal.Cryptography.Pal X509Certificate2Collection[] storesToCheck = { extraStore, + userMyCerts, userIntermediateCerts, systemIntermediateCerts, userRootCerts, @@ -452,7 +456,7 @@ namespace Internal.Cryptography.Pal candidates, ReferenceEqualityComparer.Instance); - // Certificates come from 5 sources: + // Certificates come from 6 sources: // 1) extraStore. // These are cert objects that are provided by the user, we shouldn't dispose them. // 2) the machine root store @@ -463,8 +467,11 @@ namespace Internal.Cryptography.Pal // These certs were either path candidates, or not. If they were, don't dispose them. Otherwise do. // 5) the user intermediate store // These certs were either path candidates, or not. If they were, don't dispose them. Otherwise do. + // 6) the user my store + // These certs were either path candidates, or not. If they were, don't dispose them. Otherwise do. DisposeUnreferenced(candidatesByReference, systemIntermediateCerts); DisposeUnreferenced(candidatesByReference, userIntermediateCerts); + DisposeUnreferenced(candidatesByReference, userMyCerts); } return candidates; diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/PkcsFormatReader.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/PkcsFormatReader.cs index 0489a68422..168ada2980 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/PkcsFormatReader.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/PkcsFormatReader.cs @@ -15,21 +15,35 @@ namespace Internal.Cryptography.Pal { using (SafePkcs7Handle pkcs7 = Interop.Crypto.DecodePkcs7(rawData, rawData.Length)) { - if (!pkcs7.IsInvalid) + if (pkcs7.IsInvalid) + { + Interop.Crypto.ErrClearError(); + } + else { return true; } + } using (SafeBioHandle bio = Interop.Crypto.CreateMemoryBio()) { Interop.Crypto.CheckValidOpenSslHandle(bio); - Interop.Crypto.BioWrite(bio, rawData, rawData.Length); + if (Interop.Crypto.BioWrite(bio, rawData, rawData.Length) != rawData.Length) + { + Interop.Crypto.ErrClearError(); + } using (SafePkcs7Handle pkcs7 = Interop.Crypto.PemReadBioPkcs7(bio)) { - return !pkcs7.IsInvalid; + if (pkcs7.IsInvalid) + { + Interop.Crypto.ErrClearError(); + return false; + } + + return true; } } } @@ -38,7 +52,13 @@ namespace Internal.Cryptography.Pal { using (SafePkcs7Handle pkcs7 = Interop.Crypto.D2IPkcs7Bio(fileBio)) { - return !pkcs7.IsInvalid; + if (pkcs7.IsInvalid) + { + Interop.Crypto.ErrClearError(); + return false; + } + + return true; } } @@ -46,7 +66,13 @@ namespace Internal.Cryptography.Pal { using (SafePkcs7Handle pkcs7 = Interop.Crypto.PemReadBioPkcs7(fileBio)) { - return !pkcs7.IsInvalid; + if (pkcs7.IsInvalid) + { + Interop.Crypto.ErrClearError(); + return false; + } + + return true; } } @@ -90,6 +116,7 @@ namespace Internal.Cryptography.Pal { certPal = null; certPals = null; + Interop.Crypto.ErrClearError(); return false; } @@ -109,6 +136,7 @@ namespace Internal.Cryptography.Pal { certPal = null; certPals = null; + Interop.Crypto.ErrClearError(); return false; } @@ -154,7 +182,10 @@ namespace Internal.Cryptography.Pal { Interop.Crypto.CheckValidOpenSslHandle(bio); - Interop.Crypto.BioWrite(bio, rawData, rawData.Length); + if (Interop.Crypto.BioWrite(bio, rawData, rawData.Length) != rawData.Length) + { + Interop.Crypto.ErrClearError(); + } return TryReadPkcs7Pem(bio, single, out certPal, out certPals); } @@ -172,6 +203,7 @@ namespace Internal.Cryptography.Pal { certPal = null; certPals = null; + Interop.Crypto.ErrClearError(); return false; } @@ -218,33 +250,32 @@ namespace Internal.Cryptography.Pal return true; } - internal static bool TryReadPkcs12(byte[] rawData, SafePasswordHandle password, out ICertificatePal certPal) + internal static bool TryReadPkcs12(byte[] rawData, SafePasswordHandle password, out ICertificatePal certPal, out Exception openSslException) { List ignored; - return TryReadPkcs12(rawData, password, true, out certPal, out ignored); - + return TryReadPkcs12(rawData, password, true, out certPal, out ignored, out openSslException); } - internal static bool TryReadPkcs12(SafeBioHandle bio, SafePasswordHandle password, out ICertificatePal certPal) + internal static bool TryReadPkcs12(SafeBioHandle bio, SafePasswordHandle password, out ICertificatePal certPal, out Exception openSslException) { List ignored; - return TryReadPkcs12(bio, password, true, out certPal, out ignored); + return TryReadPkcs12(bio, password, true, out certPal, out ignored, out openSslException); } - internal static bool TryReadPkcs12(byte[] rawData, SafePasswordHandle password, out List certPals) + internal static bool TryReadPkcs12(byte[] rawData, SafePasswordHandle password, out List certPals, out Exception openSslException) { ICertificatePal ignored; - return TryReadPkcs12(rawData, password, false, out ignored, out certPals); + return TryReadPkcs12(rawData, password, false, out ignored, out certPals, out openSslException); } - internal static bool TryReadPkcs12(SafeBioHandle bio, SafePasswordHandle password, out List certPals) + internal static bool TryReadPkcs12(SafeBioHandle bio, SafePasswordHandle password, out List certPals, out Exception openSslException) { ICertificatePal ignored; - return TryReadPkcs12(bio, password, false, out ignored, out certPals); + return TryReadPkcs12(bio, password, false, out ignored, out certPals, out openSslException); } private static bool TryReadPkcs12( @@ -252,12 +283,13 @@ namespace Internal.Cryptography.Pal SafePasswordHandle password, bool single, out ICertificatePal readPal, - out List readCerts) + out List readCerts, + out Exception openSslException) { // DER-PKCS12 OpenSslPkcs12Reader pfx; - if (!OpenSslPkcs12Reader.TryRead(rawData, out pfx)) + if (!OpenSslPkcs12Reader.TryRead(rawData, out pfx, out openSslException)) { readPal = null; readCerts = null; @@ -275,12 +307,13 @@ namespace Internal.Cryptography.Pal SafePasswordHandle password, bool single, out ICertificatePal readPal, - out List readCerts) + out List readCerts, + out Exception openSslException) { // DER-PKCS12 OpenSslPkcs12Reader pfx; - if (!OpenSslPkcs12Reader.TryRead(bio, out pfx)) + if (!OpenSslPkcs12Reader.TryRead(bio, out pfx, out openSslException)) { readPal = null; readCerts = null; diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/StorePal.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/StorePal.cs index 538f07b7de..57b8f025b8 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/StorePal.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/StorePal.cs @@ -42,17 +42,19 @@ namespace Internal.Cryptography.Pal } List certPals; + Exception openSslException; if (PkcsFormatReader.TryReadPkcs7Der(rawData, out certPals) || PkcsFormatReader.TryReadPkcs7Pem(rawData, out certPals) || - PkcsFormatReader.TryReadPkcs12(rawData, password, out certPals)) + PkcsFormatReader.TryReadPkcs12(rawData, password, out certPals, out openSslException)) { Debug.Assert(certPals != null); return ListToLoaderPal(certPals); } - throw Interop.Crypto.CreateOpenSslCryptographicException(); + Debug.Assert(openSslException != null); + throw openSslException; } public static ILoaderPal FromFile(string fileName, SafePasswordHandle password, X509KeyStorageFlags keyStorageFlags) @@ -106,7 +108,9 @@ namespace Internal.Cryptography.Pal // Rewind, try again. CertificatePal.RewindBio(bio, bioPosition); - if (PkcsFormatReader.TryReadPkcs12(bio, password, out certPals)) + // Capture the exception so in case of failure, the call to BioSeek does not override it. + Exception openSslException; + if (PkcsFormatReader.TryReadPkcs12(bio, password, out certPals, out openSslException)) { return ListToLoaderPal(certPals); } @@ -114,14 +118,14 @@ namespace Internal.Cryptography.Pal // Since we aren't going to finish reading, leaving the buffer where it was when we got // it seems better than leaving it in some arbitrary other position. // - // But, before seeking back to start, save the Exception representing the last reported - // OpenSSL error in case the last BioSeek would change it. - Exception openSslException = Interop.Crypto.CreateOpenSslCryptographicException(); - // Use BioSeek directly for the last seek attempt, because any failure here should instead // report the already created (but not yet thrown) exception. - Interop.Crypto.BioSeek(bio, bioPosition); - + if (Interop.Crypto.BioSeek(bio, bioPosition) < 0) + { + Interop.Crypto.ErrClearError(); + } + + Debug.Assert(openSslException != null); throw openSslException; } @@ -250,6 +254,13 @@ namespace Internal.Cryptography.Pal { using (SafeBioHandle fileBio = Interop.Crypto.BioNewFile(file.FullName, "rb")) { + // The handle may be invalid, for example when we don't have read permission for the file. + if (fileBio.IsInvalid) + { + Interop.Crypto.ErrClearError(); + continue; + } + ICertificatePal pal; while (CertificatePal.TryReadX509Pem(fileBio, out pal) || diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/X500NameEncoder.ManagedDecode.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/X500NameEncoder.ManagedDecode.cs index 094e95c20d..0285415ba3 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/X500NameEncoder.ManagedDecode.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/X500NameEncoder.ManagedDecode.cs @@ -127,7 +127,7 @@ namespace Internal.Cryptography.Pal } } - if (addTrailingDelimiter) + if (addTrailingDelimiter && decodedName.Length > 0) { decodedName.Append(dnSeparator); } @@ -150,7 +150,7 @@ namespace Internal.Cryptography.Pal case DerSequenceReader.DerTag.UTF8String: return tavReader.ReadUtf8String(); case DerSequenceReader.DerTag.T61String: - return ""; + return tavReader.ReadT61String(); default: throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding); } diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/X500NameEncoder.OpenSslDecode.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/X500NameEncoder.OpenSslDecode.cs deleted file mode 100644 index eeaca53b1f..0000000000 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/X500NameEncoder.OpenSslDecode.cs +++ /dev/null @@ -1,122 +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.Text; - -using Microsoft.Win32.SafeHandles; - -namespace Internal.Cryptography.Pal -{ - internal static partial class X500NameEncoder - { - private static string X500DistinguishedNameDecode( - byte[] encodedName, - bool printOid, - bool reverse, - bool quoteIfNeeded, - string dnSeparator, - string multiValueSeparator, - bool addTrailingDelimiter) - { - using (SafeX509NameHandle x509Name = Interop.Crypto.DecodeX509Name(encodedName, encodedName.Length)) - { - if (x509Name.IsInvalid) - { - return ""; - } - - // We need to allocate a StringBuilder to hold the data as we're building it, and there's the usual - // arbitrary process of choosing a number that's "big enough" to minimize reallocations without wasting - // too much space in the average case. - // - // So, let's look at an example of what our output might be. - // - // GitHub.com's SSL cert has a "pretty long" subject (partially due to the unknown OIDs): - // businessCategory=Private Organization - // 1.3.6.1.4.1.311.60.2.1.3=US - // 1.3.6.1.4.1.311.60.2.1.2=Delaware - // serialNumber=5157550 - // street=548 4th Street - // postalCode=94107 - // C=US - // ST=California - // L=San Francisco - // O=GitHub, Inc. - // CN=github.com - // - // Which comes out to 228 characters using OpenSSL's default pretty-print - // (openssl x509 -in github.cer -text -noout) - // Throw in some "maybe-I-need-to-quote-this" quotes, and a couple of extra/extra-long O/OU values - // and round that up to the next programmer number, and you get that 512 should avoid reallocations - // in all but the most dire of cases. - StringBuilder decodedName = new StringBuilder(512); - int entryCount = Interop.Crypto.GetX509NameEntryCount(x509Name); - bool printSpacing = false; - - for (int i = 0; i < entryCount; i++) - { - int loc = reverse ? entryCount - i - 1 : i; - - using (SafeSharedX509NameEntryHandle nameEntry = Interop.Crypto.GetX509NameEntry(x509Name, loc)) - { - Interop.Crypto.CheckValidOpenSslHandle(nameEntry); - - string thisOidValue; - - using (SafeSharedAsn1ObjectHandle oidHandle = Interop.Crypto.GetX509NameEntryOid(nameEntry)) - { - thisOidValue = Interop.Crypto.GetOidValue(oidHandle); - } - - if (printSpacing) - { - decodedName.Append(dnSeparator); - } - else - { - printSpacing = true; - } - - if (printOid) - { - AppendOid(decodedName, thisOidValue); - } - - string rdnValue; - - using (SafeSharedAsn1StringHandle valueHandle = Interop.Crypto.GetX509NameEntryData(nameEntry)) - { - rdnValue = Interop.Crypto.Asn1StringToManagedString(valueHandle); - } - - bool quote = quoteIfNeeded && NeedsQuoting(rdnValue); - - if (quote) - { - decodedName.Append('"'); - - // If the RDN itself had a quote within it, that quote needs to be escaped - // with another quote. - rdnValue = rdnValue.Replace("\"", "\"\""); - } - - decodedName.Append(rdnValue); - - if (quote) - { - decodedName.Append('"'); - } - } - } - - if (addTrailingDelimiter) - { - decodedName.Append(dnSeparator); - } - - return decodedName.ToString(); - } - } - } -} diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/X500NameEncoder.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/X500NameEncoder.cs index 56da9ae40c..005e09abe3 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/X500NameEncoder.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/X500NameEncoder.cs @@ -40,7 +40,7 @@ namespace Internal.Cryptography.Pal byte[] encodedName, bool printOid, X500DistinguishedNameFlags flags, - bool addTrailingDelimieter=false) + bool addTrailingDelimiter = false) { bool reverse = (flags & X500DistinguishedNameFlags.Reversed) == X500DistinguishedNameFlags.Reversed; bool quoteIfNeeded = (flags & X500DistinguishedNameFlags.DoNotUseQuotes) != X500DistinguishedNameFlags.DoNotUseQuotes; @@ -51,7 +51,8 @@ namespace Internal.Cryptography.Pal { dnSeparator = "; "; } - else if ((flags & X500DistinguishedNameFlags.UseNewLines) == X500DistinguishedNameFlags.UseNewLines) + // Explicit UseCommas has preference over explicit UseNewLines. + else if ((flags & (X500DistinguishedNameFlags.UseNewLines | X500DistinguishedNameFlags.UseCommas)) == X500DistinguishedNameFlags.UseNewLines) { dnSeparator = Environment.NewLine; } @@ -73,7 +74,7 @@ namespace Internal.Cryptography.Pal quoteIfNeeded, dnSeparator, multiValueSparator, - addTrailingDelimieter); + addTrailingDelimiter); } catch (CryptographicException) { diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/ChainPal.GetChainStatusInformation.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/ChainPal.GetChainStatusInformation.cs index 18de38235c..2f9c40e35d 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/ChainPal.GetChainStatusInformation.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/ChainPal.GetChainStatusInformation.cs @@ -34,7 +34,7 @@ namespace Internal.Cryptography.Pal { Debug.Assert(index < chainStatus.Length); - chainStatus[index].StatusInformation = GetSystemErrorString(mapping.Win32ErrorCode); + chainStatus[index].StatusInformation = Interop.Kernel32.GetMessage(mapping.Win32ErrorCode); chainStatus[index].Status = mapping.ChainStatusFlag; index++; dwStatus &= ~mapping.Win32Flag; @@ -60,23 +60,6 @@ namespace Internal.Cryptography.Pal return chainStatus; } - private static string GetSystemErrorString(int errorCode) - { - StringBuilder strMessage = new StringBuilder(512); - int dwErrorCode = Interop.localization.FormatMessage( - FormatMessageFlags.FORMAT_MESSAGE_FROM_SYSTEM | FormatMessageFlags.FORMAT_MESSAGE_IGNORE_INSERTS, - IntPtr.Zero, - errorCode, - 0, - strMessage, - strMessage.Capacity, - IntPtr.Zero); - if (dwErrorCode != 0) - return strMessage.ToString(); - else - return SR.Unknown_Error; - } - private readonly struct X509ChainErrorMapping { public readonly CertTrustErrorStatus Win32Flag; diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/ChainPal.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/ChainPal.cs index 04e8052d50..1c1a3ba33f 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/ChainPal.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/ChainPal.cs @@ -35,24 +35,23 @@ namespace Internal.Cryptography.Pal { exception = null; - CERT_CHAIN_POLICY_PARA para = new CERT_CHAIN_POLICY_PARA() + unsafe { - cbSize = Marshal.SizeOf(), - dwFlags = (int)flags, - }; + CERT_CHAIN_POLICY_PARA para = new CERT_CHAIN_POLICY_PARA(); + para.cbSize = sizeof(CERT_CHAIN_POLICY_PARA); + para.dwFlags = (int)flags; - CERT_CHAIN_POLICY_STATUS status = new CERT_CHAIN_POLICY_STATUS() - { - cbSize = Marshal.SizeOf(), - }; + CERT_CHAIN_POLICY_STATUS status = new CERT_CHAIN_POLICY_STATUS(); + status.cbSize = sizeof(CERT_CHAIN_POLICY_STATUS); - if (!Interop.crypt32.CertVerifyCertificateChainPolicy(ChainPolicy.CERT_CHAIN_POLICY_BASE, _chain, ref para, ref status)) - { - int errorCode = Marshal.GetLastWin32Error(); - exception = errorCode.ToCryptographicException(); - return default(bool?); + if (!Interop.crypt32.CertVerifyCertificateChainPolicy(ChainPolicy.CERT_CHAIN_POLICY_BASE, _chain, ref para, ref status)) + { + int errorCode = Marshal.GetLastWin32Error(); + exception = errorCode.ToCryptographicException(); + return default(bool?); + } + return status.dwError == 0; } - return status.dwError == 0; } public X509ChainElement[] ChainElements diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/FindPal.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/FindPal.cs index 1d4141348f..1336b5e38e 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/FindPal.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/FindPal.cs @@ -360,7 +360,7 @@ namespace Internal.Cryptography.Pal // This needs to be kept in sync with IsCertValid in the // Unix/OpenSSL PAL version (and potentially any other PALs that come about) ChainPal chainPal = ChainPal.BuildChain( - true, + false, CertificatePal.FromHandle(pCertContext.DangerousGetHandle()), null, //extraStore null, //applicationPolicy diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/Native/Helpers.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/Native/Helpers.cs index a29b265dd4..c9c192c584 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/Native/Helpers.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/Native/Helpers.cs @@ -5,13 +5,9 @@ using System; using System.Text; using System.Diagnostics; -using System.Globalization; -using System.Collections.Generic; using System.Security.Cryptography; using System.Runtime.InteropServices; -using Internal.Cryptography.Pal; - namespace Internal.Cryptography.Pal.Native { internal static class Helpers @@ -30,41 +26,44 @@ namespace Internal.Cryptography.Pal.Native return SafeLocalAllocHandle.InvalidHandle; } - // Copy the oid strings to a local list to prevent a security race condition where + // Copy the oid strings to a local array to prevent a security race condition where // the OidCollection or individual oids can be modified by another thread and // potentially cause a buffer overflow - List oidStrings = new List(); - foreach (Oid oid in oids) + var oidStrings = new string[oids.Count]; + for (int i = 0; i < oidStrings.Length; i++) { - byte[] oidString = oid.ValueAsAscii(); - oidStrings.Add(oidString); + oidStrings[i] = oids[i].Value; } - numOids = oidStrings.Count; unsafe { - int allocationSize = checked(numOids * sizeof(void*)); - foreach (byte[] oidString in oidStrings) + int allocationSize = checked(oidStrings.Length * sizeof(void*)); + foreach (string oidString in oidStrings) { checked { - allocationSize += oidString.Length + 1; + allocationSize += oidString.Length + 1; // Encoding.ASCII doesn't have a fallback, so it's fine to use String.Length } } SafeLocalAllocHandle safeLocalAllocHandle = SafeLocalAllocHandle.Create(allocationSize); byte** pOidPointers = (byte**)(safeLocalAllocHandle.DangerousGetHandle()); - byte* pOidContents = (byte*)(pOidPointers + numOids); + byte* pOidContents = (byte*)(pOidPointers + oidStrings.Length); - for (int i = 0; i < numOids; i++) + for (int i = 0; i < oidStrings.Length; i++) { + string oidString = oidStrings[i]; + pOidPointers[i] = pOidContents; - byte[] oidString = oidStrings[i]; - Marshal.Copy(oidString, 0, new IntPtr(pOidContents), oidString.Length); + + int bytesWritten = Encoding.ASCII.GetBytes(oidString, new Span(pOidContents, oidString.Length)); + Debug.Assert(bytesWritten == oidString.Length); + pOidContents[oidString.Length] = 0; pOidContents += oidString.Length + 1; } + numOids = oidStrings.Length; return safeLocalAllocHandle; } } diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/Native/Primitives.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/Native/Primitives.cs index 9853fc8023..6456bc9184 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/Native/Primitives.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/Native/Primitives.cs @@ -752,13 +752,6 @@ namespace Internal.Cryptography.Pal.Native public Guid ChainId; } - [Flags] - internal enum FormatMessageFlags : int - { - FORMAT_MESSAGE_FROM_SYSTEM = 0x00001000, - FORMAT_MESSAGE_IGNORE_INSERTS = 0x00000200, - } - [StructLayout(LayoutKind.Sequential)] internal struct CERT_CHAIN_POLICY_PARA { diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/StorePal.Import.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/StorePal.Import.cs index 07c4c1b704..7f957cfbe9 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/StorePal.Import.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Windows/StorePal.Import.cs @@ -140,9 +140,9 @@ namespace Internal.Cryptography.Pal // applied to the original store. This has a limit of 99 links per cert context however. // - foreach (X509Certificate2 certificate in certificates) + for (int i = 0; i < certificates.Count; i++) { - SafeCertContextHandle certContext = ((CertificatePal)certificate.Pal).CertContext; + SafeCertContextHandle certContext = ((CertificatePal)certificates[i].Pal).CertContext; if (!Interop.crypt32.CertAddCertificateLinkToStore(certStore, certContext, CertStoreAddDisposition.CERT_STORE_ADD_ALWAYS, IntPtr.Zero)) throw Marshal.GetLastWin32Error().ToCryptographicException(); } diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Microsoft/Win32/SafeHandles/SafePasswordHandle.Unix.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Microsoft/Win32/SafeHandles/SafePasswordHandle.Unix.cs index 647b62152d..bb41691322 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Microsoft/Win32/SafeHandles/SafePasswordHandle.Unix.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Microsoft/Win32/SafeHandles/SafePasswordHandle.Unix.cs @@ -17,7 +17,7 @@ namespace Microsoft.Win32.SafeHandles private IntPtr CreateHandle(SecureString password) { - return SecureStringMarshal.SecureStringToGlobalAllocAnsi(password); + return Marshal.SecureStringToGlobalAllocAnsi(password); } private void FreeHandle() diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Microsoft/Win32/SafeHandles/SafePasswordHandle.Windows.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Microsoft/Win32/SafeHandles/SafePasswordHandle.Windows.cs index 8a684139f6..93dce2ab13 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Microsoft/Win32/SafeHandles/SafePasswordHandle.Windows.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Microsoft/Win32/SafeHandles/SafePasswordHandle.Windows.cs @@ -17,7 +17,7 @@ namespace Microsoft.Win32.SafeHandles private IntPtr CreateHandle(SecureString password) { - return SecureStringMarshal.SecureStringToGlobalAllocUnicode(password); + return Marshal.SecureStringToGlobalAllocUnicode(password); } private void FreeHandle() diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Resources/Strings.resx b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Resources/Strings.resx index 20c4e24975..749f88bb57 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Resources/Strings.resx +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/Resources/Strings.resx @@ -151,6 +151,9 @@ Only named curves are supported on this platform. + + The message exceeds the maximum allowable length for the chosen options ({0}). + ASN1 corrupted data. @@ -178,6 +181,12 @@ The store handle is invalid. + + The key is too small for the requested operation. + + + Error occurred while decoding OAEP padding. + Cannot open an invalid handle. @@ -187,6 +196,12 @@ The provided key does not match the public key algorithm for this certificate. + + The length of the data to decrypt is not valid for the size of this key. + + + The provided hash value is not the expected size for the specified hash algorithm. + The Disallowed store is not supported on this platform, but already has data. All files under '{0}' must be removed. @@ -235,6 +250,9 @@ Cannot find the original signer. + + The X509 certificate could not be added to the store. + The X509 certificate could not be added to the store because all candidate file names were in use. diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj index a63a66ff53..09ad30e45e 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj @@ -103,7 +103,6 @@ - @@ -139,8 +138,8 @@ Common\Interop\Windows\BCrypt\Interop.Blobs.cs - - Common\Interop\Windows\BCrypt\Interop.NTSTATUS.cs + + Common\CoreLib\Interop\Windows\BCrypt\Interop.NTSTATUS.cs Common\Microsoft\Win32\SafeHandles\SafeBCryptHandle.cs @@ -170,7 +169,6 @@ - @@ -230,9 +228,6 @@ Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Name.cs - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509NameEntry.cs - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Stack.cs @@ -287,9 +282,6 @@ Common\Microsoft\Win32\SafeHandles\SafeX509Handles.Unix.cs - - Common\Microsoft\Win32\SafeHandles\SafeX509NameHandle.Unix.cs - Common\Microsoft\Win32\SafeHandles\X509ExtensionSafeHandles.Unix.cs @@ -376,12 +368,18 @@ Common\System\Security\Cryptography\DSASecurityTransforms.cs + + Common\System\Security\Cryptography\EccSecurityTransforms.cs + Common\System\Security\Cryptography\ECDsaSecurityTransforms.cs Common\System\Security\Cryptography\KeyBlobHelpers.cs + + Common\System\Security\Cryptography\RsaPaddingProcessor.cs + Common\System\Security\Cryptography\RSASecurityTransforms.cs @@ -389,6 +387,7 @@ Common\System\Security\Cryptography\SecKeyPair.cs + @@ -397,7 +396,6 @@ - @@ -405,9 +403,12 @@ + + + @@ -422,6 +423,7 @@ + diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/System/Security/Cryptography/X509Certificates/GeneralNameEncoder.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/System/Security/Cryptography/X509Certificates/GeneralNameEncoder.cs index 2b9082c50c..925dcb1054 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/System/Security/Cryptography/X509Certificates/GeneralNameEncoder.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/System/Security/Cryptography/X509Certificates/GeneralNameEncoder.cs @@ -26,7 +26,7 @@ namespace System.Security.Cryptography.X509Certificates RegisteredId = DerSequenceReader.ContextSpecificTagFlag | 8, } - private readonly IdnMapping _idnMapping = new IdnMapping(); + private static readonly IdnMapping s_idnMapping = new IdnMapping(); internal byte[][] EncodeEmailAddress(string emailAddress) { @@ -38,7 +38,7 @@ namespace System.Security.Cryptography.X509Certificates internal byte[][] EncodeDnsName(string dnsName) { - string idnaName = _idnMapping.GetAscii(dnsName); + string idnaName = s_idnMapping.GetAscii(dnsName); byte[][] dnsNameTlv = DerEncoder.SegmentedEncodeIA5String(idnaName.ToCharArray()); dnsNameTlv[0][0] = (byte)GeneralNameTag.DnsName; diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/System/Security/Cryptography/X509Certificates/X509EnhancedKeyUsageExtension.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/System/Security/Cryptography/X509Certificates/X509EnhancedKeyUsageExtension.cs index 82ab80636d..d986f50807 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/System/Security/Cryptography/X509Certificates/X509EnhancedKeyUsageExtension.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/System/Security/Cryptography/X509Certificates/X509EnhancedKeyUsageExtension.cs @@ -42,7 +42,10 @@ namespace System.Security.Cryptography.X509Certificates X509Pal.Instance.DecodeX509EnhancedKeyUsageExtension(RawData, out _enhancedKeyUsages); _decoded = true; } - return _enhancedKeyUsages; + OidCollection oids = new OidCollection(); + foreach (Oid oid in _enhancedKeyUsages) + oids.Add(oid); + return oids; } } diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/System/Security/Cryptography/X509Certificates/X509Store.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/System/Security/Cryptography/X509Certificates/X509Store.cs index 708f3717a1..011dbe9da5 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/src/System/Security/Cryptography/X509Certificates/X509Store.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/src/System/Security/Cryptography/X509Certificates/X509Store.cs @@ -17,7 +17,7 @@ namespace System.Security.Cryptography.X509Certificates private IStorePal _storePal; public X509Store() - : this(StoreName.My, StoreLocation.CurrentUser) + : this("MY", StoreLocation.CurrentUser) { } @@ -32,7 +32,7 @@ namespace System.Security.Cryptography.X509Certificates } public X509Store(StoreLocation storeLocation) - : this(StoreName.My, storeLocation) + : this("MY", storeLocation) { } diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/Cert.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/Cert.cs index 49e6e7cfc6..dd4a3d8686 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/Cert.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/Cert.cs @@ -17,7 +17,9 @@ namespace System.Security.Cryptography.X509Certificates.Tests // netcoreapp-OSX: DefaultKeySet // netcoreapp-other: EphemeralKeySet internal static readonly X509KeyStorageFlags EphemeralIfPossible = +#if !NO_EPHEMERALKEYSET_AVAILABLE !RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? X509KeyStorageFlags.EphemeralKeySet : +#endif X509KeyStorageFlags.DefaultKeySet; // // The Import() methods have an overload for each X509Certificate2Collection.Import() overload. diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/CertTests.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/CertTests.cs index 559c576c5a..7b9aa25067 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/CertTests.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/CertTests.cs @@ -289,9 +289,11 @@ namespace System.Security.Cryptography.X509Certificates.Tests // State held on X509Certificate Assert.ThrowsAny(() => c.GetCertHash()); - Assert.ThrowsAny(() => c.GetCertHash(HashAlgorithmName.SHA256)); Assert.ThrowsAny(() => c.GetCertHashString()); +#if HAVE_THUMBPRINT_OVERLOADS + Assert.ThrowsAny(() => c.GetCertHash(HashAlgorithmName.SHA256)); Assert.ThrowsAny(() => c.GetCertHashString(HashAlgorithmName.SHA256)); +#endif Assert.ThrowsAny(() => c.GetKeyAlgorithm()); Assert.ThrowsAny(() => c.GetKeyAlgorithmParameters()); Assert.ThrowsAny(() => c.GetKeyAlgorithmParametersString()); @@ -302,8 +304,10 @@ namespace System.Security.Cryptography.X509Certificates.Tests Assert.ThrowsAny(() => c.NotBefore); Assert.ThrowsAny(() => c.NotAfter); +#if HAVE_THUMBPRINT_OVERLOADS Assert.ThrowsAny( () => c.TryGetCertHash(HashAlgorithmName.SHA256, Array.Empty(), out _)); +#endif // State held on X509Certificate2 Assert.ThrowsAny(() => c.RawData); diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/ChainTests.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/ChainTests.cs index 95492b5ba3..7d34e05a18 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/ChainTests.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/ChainTests.cs @@ -642,7 +642,12 @@ namespace System.Security.Cryptography.X509Certificates.Tests } else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) { - expectedFlags = X509ChainStatusFlags.UntrustedRoot; + // For OSX alone expectedFlags here means OR instead of AND. + // Because the error code changed in 10.13.4 from UntrustedRoot to PartialChain + // and we handle that later in this test. + expectedFlags = + X509ChainStatusFlags.UntrustedRoot | + X509ChainStatusFlags.PartialChain; } else { @@ -670,6 +675,18 @@ namespace System.Security.Cryptography.X509Certificates.Tests X509ChainStatusFlags.NoError, (a, b) => a | b); + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) + { + // If we're on 10.13.3 or older we get UntrustedRoot. + // If we're on 10.13.4 or newer we get PartialChain. + // + // So make the expectedValue be whichever of those two is set. + expectedFlags = (expectedFlags & allFlags); + // One of them has to be set. + Assert.NotEqual(X509ChainStatusFlags.NoError, expectedFlags); + // Continue executing now to ensure that no other unexpected flags were set. + } + Assert.Equal(expectedFlags, allFlags); } } diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/CollectionImportTests.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/CollectionImportTests.cs index 56a0f1e411..19b8bf7ff6 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/CollectionImportTests.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/CollectionImportTests.cs @@ -310,6 +310,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests } } +#if !NO_EPHEMERALKEYSET_AVAILABLE [Fact] public static void InvalidStorageFlags() { @@ -327,7 +328,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests // No test is performed here for the ephemeral flag failing downlevel, because the live // binary is always used by default, meaning it doesn't know EphemeralKeySet doesn't exist. } - + [Fact] public static void InvalidStorageFlags_PersistedEphemeral() { @@ -345,16 +346,19 @@ namespace System.Security.Cryptography.X509Certificates.Tests "keyStorageFlags", () => coll.Import(string.Empty, string.Empty, PersistedEphemeral)); } +#endif public static IEnumerable StorageFlags { get { yield return new object[] { X509KeyStorageFlags.DefaultKeySet }; + +#if !NO_EPHEMERALKEYSET_AVAILABLE if (!RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) yield return new object[] { X509KeyStorageFlags.EphemeralKeySet }; +#endif } } - } } diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/CollectionTests.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/CollectionTests.cs index 0891532760..f1d4fecb2c 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/CollectionTests.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/CollectionTests.cs @@ -228,7 +228,8 @@ namespace System.Security.Cryptography.X509Certificates.Tests Assert.Throws(() => ilist.Remove(null)); } - Assert.Throws(() => new X509CertificateCollection.X509CertificateEnumerator(null)); + AssertExtensions.Throws( + () => new X509CertificateCollection.X509CertificateEnumerator(null)); } [Fact] @@ -364,7 +365,14 @@ namespace System.Security.Cryptography.X509Certificates.Tests // has been deliberately changed to no longer throw to match the behavior of // X509CertificateCollection.Contains and the IList.Contains implementation, which do not // throw. - Assert.False(collection.Contains(null)); + if (PlatformDetection.IsFullFramework) + { + Assert.Throws(() => collection.Contains(null)); + } + else + { + Assert.False(collection.Contains(null)); + } IList ilist = (IList)collection; Assert.True(ilist.Contains(c1)); diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/Configurations.props b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/Configurations.props index 05d3ab66c3..f350faf899 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/Configurations.props +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/Configurations.props @@ -5,6 +5,7 @@ netcoreapp-OSX; netcoreapp-Unix; netcoreapp-Windows_NT; + netstandard; uap-Windows_NT; diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/CtorTests.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/CtorTests.cs index 04abb8df92..5af304d781 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/CtorTests.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/CtorTests.cs @@ -2,7 +2,6 @@ // 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; using System.Runtime.InteropServices; using Xunit; @@ -25,7 +24,9 @@ namespace System.Security.Cryptography.X509Certificates.Tests object ignored; Assert.Equal(IntPtr.Zero, h); Assert.ThrowsAny(() => c.GetCertHash()); +#if HAVE_THUMBPRINT_OVERLOADS Assert.ThrowsAny(() => c.GetCertHash(HashAlgorithmName.SHA256)); +#endif Assert.ThrowsAny(() => c.GetKeyAlgorithm()); Assert.ThrowsAny(() => c.GetKeyAlgorithmParameters()); Assert.ThrowsAny(() => c.GetKeyAlgorithmParametersString()); @@ -44,7 +45,9 @@ namespace System.Security.Cryptography.X509Certificates.Tests Assert.ThrowsAny(() => ignored = c.SubjectName); Assert.ThrowsAny(() => ignored = c.IssuerName); Assert.ThrowsAny(() => c.GetCertHashString()); +#if HAVE_THUMBPRINT_OVERLOADS Assert.ThrowsAny(() => c.GetCertHashString(HashAlgorithmName.SHA256)); +#endif Assert.ThrowsAny(() => c.GetEffectiveDateString()); Assert.ThrowsAny(() => c.GetExpirationDateString()); Assert.ThrowsAny(() => c.GetPublicKeyString()); @@ -56,8 +59,10 @@ namespace System.Security.Cryptography.X509Certificates.Tests Assert.ThrowsAny(() => c.GetName()); #pragma warning restore 0618 +#if HAVE_THUMBPRINT_OVERLOADS Assert.ThrowsAny( () => c.TryGetCertHash(HashAlgorithmName.SHA256, Array.Empty(), out _)); +#endif } [Fact] @@ -77,8 +82,10 @@ namespace System.Security.Cryptography.X509Certificates.Tests byte[] actualThumbprint = c.GetCertHash(); Assert.Equal(expectedThumbPrintSha1, actualThumbprint); +#if HAVE_THUMBPRINT_OVERLOADS byte[] specifiedAlgThumbprint = c.GetCertHash(HashAlgorithmName.SHA1); Assert.Equal(expectedThumbPrintSha1, specifiedAlgThumbprint); +#endif }; using (X509Certificate2 c = new X509Certificate2(TestData.MsCertificate)) @@ -108,8 +115,10 @@ namespace System.Security.Cryptography.X509Certificates.Tests byte[] actualThumbprint = cert.GetCertHash(); Assert.Equal(expectedThumbPrintSha1, actualThumbprint); +#if HAVE_THUMBPRINT_OVERLOADS byte[] specifiedAlgThumbprint = cert.GetCertHash(HashAlgorithmName.SHA1); Assert.Equal(expectedThumbPrintSha1, specifiedAlgThumbprint); +#endif }; using (X509Certificate2 c = new X509Certificate2(TestData.MsCertificatePemBytes)) @@ -179,7 +188,9 @@ namespace System.Security.Cryptography.X509Certificates.Tests using (var c2 = new X509Certificate2(c1)) { Assert.Equal(c1.GetCertHash(), c2.GetCertHash()); +#if HAVE_THUMBPRINT_OVERLOADS Assert.Equal(c1.GetCertHash(HashAlgorithmName.SHA256), c2.GetCertHash(HashAlgorithmName.SHA256)); +#endif Assert.Equal(c1.GetKeyAlgorithm(), c2.GetKeyAlgorithm()); Assert.Equal(c1.GetKeyAlgorithmParameters(), c2.GetKeyAlgorithmParameters()); Assert.Equal(c1.GetKeyAlgorithmParametersString(), c2.GetKeyAlgorithmParametersString()); @@ -196,7 +207,9 @@ namespace System.Security.Cryptography.X509Certificates.Tests Assert.Equal(c1.SubjectName.Name, c2.SubjectName.Name); Assert.Equal(c1.IssuerName.Name, c2.IssuerName.Name); Assert.Equal(c1.GetCertHashString(), c2.GetCertHashString()); +#if HAVE_THUMBPRINT_OVERLOADS Assert.Equal(c1.GetCertHashString(HashAlgorithmName.SHA256), c2.GetCertHashString(HashAlgorithmName.SHA256)); +#endif Assert.Equal(c1.GetEffectiveDateString(), c2.GetEffectiveDateString()); Assert.Equal(c1.GetExpirationDateString(), c2.GetExpirationDateString()); Assert.Equal(c1.GetPublicKeyString(), c2.GetPublicKeyString()); @@ -398,6 +411,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests } } +#if !NO_EPHEMERALKEYSET_AVAILABLE [Fact] public static void InvalidStorageFlags() { @@ -422,7 +436,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests // No test is performed here for the ephemeral flag failing downlevel, because the live // binary is always used by default, meaning it doesn't know EphemeralKeySet doesn't exist. } - + [Fact] public static void InvalidStorageFlags_PersistedEphemeral() { @@ -447,5 +461,6 @@ namespace System.Security.Cryptography.X509Certificates.Tests "keyStorageFlags", () => new X509Certificate2(string.Empty, string.Empty, PersistedEphemeral)); } +#endif } } diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/ExtensionsTests.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/ExtensionsTests.cs index 32cba5be20..2db1267d4d 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/ExtensionsTests.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/ExtensionsTests.cs @@ -298,6 +298,20 @@ namespace System.Security.Cryptography.X509Certificates.Tests Assert.ThrowsAny(() => new X509EnhancedKeyUsageExtension(oids, false)); } + [Fact] + public static void EnhancedKeyUsageExtension_ImmutableOids() + { + Oid oid1 = new Oid("1.3.6.1.5.5.7.3.1"); + OidCollection usages = new OidCollection(); + X509EnhancedKeyUsageExtension e = new X509EnhancedKeyUsageExtension(usages, false); + Assert.Equal(0, e.EnhancedKeyUsages.Count); + usages.Add(oid1); + Assert.Equal(0, e.EnhancedKeyUsages.Count); + e.EnhancedKeyUsages.Add(oid1); + Assert.Equal(0, e.EnhancedKeyUsages.Count); + Assert.NotSame(e.EnhancedKeyUsages, e.EnhancedKeyUsages); + } + [Fact] public static void SubjectKeyIdentifierExtensionDefault() { diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/ImportTests.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/ImportTests.cs index 4f93181657..05ec5a9500 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/ImportTests.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/ImportTests.cs @@ -29,12 +29,24 @@ namespace System.Security.Cryptography.X509Certificates.Tests private static void VerifyImportNotSupported(X509Certificate c) { - Assert.Throws(() => c.Import(Array.Empty())); - Assert.Throws(() => c.Import(string.Empty)); - Assert.Throws(() => c.Import(Array.Empty(), string.Empty, X509KeyStorageFlags.DefaultKeySet)); - Assert.Throws(() => c.Import(Array.Empty(), new SecureString(), X509KeyStorageFlags.DefaultKeySet)); - Assert.Throws(() => c.Import(string.Empty, string.Empty, X509KeyStorageFlags.DefaultKeySet)); - Assert.Throws(() => c.Import(string.Empty, new SecureString(), X509KeyStorageFlags.DefaultKeySet)); + if (PlatformDetection.IsFullFramework) + { + Assert.Throws(() => c.Import(Array.Empty())); + Assert.Throws(() => c.Import(string.Empty)); + Assert.Throws(() => c.Import(Array.Empty(), string.Empty, X509KeyStorageFlags.DefaultKeySet)); + Assert.Throws(() => c.Import(Array.Empty(), new SecureString(), X509KeyStorageFlags.DefaultKeySet)); + Assert.Throws(() => c.Import(string.Empty, string.Empty, X509KeyStorageFlags.DefaultKeySet)); + Assert.Throws(() => c.Import(string.Empty, new SecureString(), X509KeyStorageFlags.DefaultKeySet)); + } + else + { + Assert.Throws(() => c.Import(Array.Empty())); + Assert.Throws(() => c.Import(string.Empty)); + Assert.Throws(() => c.Import(Array.Empty(), string.Empty, X509KeyStorageFlags.DefaultKeySet)); + Assert.Throws(() => c.Import(Array.Empty(), new SecureString(), X509KeyStorageFlags.DefaultKeySet)); + Assert.Throws(() => c.Import(string.Empty, string.Empty, X509KeyStorageFlags.DefaultKeySet)); + Assert.Throws(() => c.Import(string.Empty, new SecureString(), X509KeyStorageFlags.DefaultKeySet)); + } } } } diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/LoadFromFileTests.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/LoadFromFileTests.cs index 68ec3359b8..55403a33ef 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/LoadFromFileTests.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/LoadFromFileTests.cs @@ -37,6 +37,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests } [Fact] + [ActiveIssue(30543, TargetFrameworkMonikers.NetFramework)] public static void TestSerial() { string expectedSerialHex = "B00000000100DD9F3BD08B0AAF11B000000033"; @@ -66,6 +67,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests } } +#if HAVE_THUMBPRINT_OVERLOADS [Theory] [InlineData("SHA1", false)] [InlineData("SHA1", true)] @@ -115,7 +117,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests byte[] thumbPrint = new byte[expectedSize + 10]; thumbPrint.AsSpan().Fill(FillByte); - Span writeDest = thumbPrint.AsSpan().Slice(WriteOffset); + Span writeDest = thumbPrint.AsSpan(WriteOffset); int bytesWritten; // Too small. @@ -148,6 +150,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests } } } +#endif [Fact] public static void TestGetFormat() @@ -209,6 +212,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests [Fact] [ActiveIssue(2910, TestPlatforms.AnyUnix)] + [ActiveIssue(30544, TargetFrameworkMonikers.NetFramework)] public static void TestLoadSignedFile() { // X509Certificate2 can also extract the certificate from a signed file. diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/PfxTests.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/PfxTests.cs index f38308ddcd..556d250686 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/PfxTests.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/PfxTests.cs @@ -129,8 +129,11 @@ namespace System.Security.Cryptography.X509Certificates.Tests VerifyPrivateKey((RSA)alg); // Currently unable to set PrivateKey - Assert.Throws(() => c.PrivateKey = null); - Assert.Throws(() => c.PrivateKey = alg); + if (!PlatformDetection.IsFullFramework) + { + Assert.Throws(() => c.PrivateKey = null); + Assert.Throws(() => c.PrivateKey = alg); + } } } @@ -185,16 +188,20 @@ namespace System.Security.Cryptography.X509Certificates.Tests Assert.Null(pubOnly.PrivateKey); // Currently unable to set PrivateKey - Assert.Throws(() => cert.PrivateKey = null); + if (!PlatformDetection.IsFullFramework) + { + Assert.Throws(() => cert.PrivateKey = null); + } using (var privKey = cert.GetECDsaPrivateKey()) { - Assert.Throws(() => cert.PrivateKey = privKey); - Assert.Throws(() => pubOnly.PrivateKey = privKey); + Assert.ThrowsAny(() => cert.PrivateKey = privKey); + Assert.ThrowsAny(() => pubOnly.PrivateKey = privKey); } } } +#if !NO_DSA_AVAILABLE [Fact] public static void DsaPrivateKeyProperty() { @@ -216,6 +223,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests Assert.False(dsa.VerifyData(data, sig, HashAlgorithmName.SHA1), "Key verifies tampered data signature"); } } +#endif private static void Verify_ECDsaPrivateKey_WindowsPfx(ECDsa ecdsa) { @@ -279,7 +287,8 @@ namespace System.Security.Cryptography.X509Certificates.Tests } } } - + +#if !NO_DSA_AVAILABLE [Fact] public static void ReadDSAPrivateKey() { @@ -301,7 +310,9 @@ namespace System.Security.Cryptography.X509Certificates.Tests Assert.ThrowsAny(() => pubKey.SignData(data, HashAlgorithmName.SHA1)); } } +#endif +#if !NO_EPHEMERALKEYSET_AVAILABLE [Fact] [PlatformSpecific(TestPlatforms.Windows)] // Uses P/Invokes public static void EphemeralImport_HasNoKeyName() @@ -371,6 +382,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests Assert.NotNull(key.KeyName); } } +#endif [Fact] [PlatformSpecific(TestPlatforms.Windows)] // Uses P/Invokes diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/PropsTests.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/PropsTests.cs index e767991fbe..73d71ce326 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/PropsTests.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/PropsTests.cs @@ -415,48 +415,56 @@ Wry5FNNo } [Fact] + [ActiveIssue(30561, TargetFrameworkMonikers.NetFramework)] public static void ComplexGetNameInfo_UpnName_Cert() { TestComplexGetNameInfo("subjectupn1@example.org", X509NameType.UpnName, false); } [Fact] + [ActiveIssue(30561, TargetFrameworkMonikers.NetFramework)] public static void ComplexGetNameInfo_UpnName_Issuer() { TestComplexGetNameInfo("issuerupn1@example.org", X509NameType.UpnName, true); } [Fact] + [ActiveIssue(30561, TargetFrameworkMonikers.NetFramework)] public static void ComplexGetNameInfo_DnsName_Cert() { TestComplexGetNameInfo("dns1.subject.example.org", X509NameType.DnsName, false); } [Fact] + [ActiveIssue(30561, TargetFrameworkMonikers.NetFramework)] public static void ComplexGetNameInfo_DnsName_Issuer() { TestComplexGetNameInfo("dns1.issuer.example.org", X509NameType.DnsName, true); } [Fact] + [ActiveIssue(30561, TargetFrameworkMonikers.NetFramework)] public static void ComplexGetNameInfo_DnsFromAlternativeName_Cert() { TestComplexGetNameInfo("dns1.subject.example.org", X509NameType.DnsFromAlternativeName, false); } [Fact] + [ActiveIssue(30561, TargetFrameworkMonikers.NetFramework)] public static void ComplexGetNameInfo_DnsFromAlternativeName_Issuer() { TestComplexGetNameInfo("dns1.issuer.example.org", X509NameType.DnsFromAlternativeName, true); } [Fact] + [ActiveIssue(30561, TargetFrameworkMonikers.NetFramework)] public static void ComplexGetNameInfo_UrlName_Cert() { TestComplexGetNameInfo("http://uri1.subject.example.org/", X509NameType.UrlName, false); } [Fact] + [ActiveIssue(30561, TargetFrameworkMonikers.NetFramework)] public static void ComplexGetNameInfo_UrlName_Issuer() { TestComplexGetNameInfo("http://uri1.issuer.example.org/", X509NameType.UrlName, true); diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/PublicKeyTests.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/PublicKeyTests.cs index 60c7e2b427..b93f842f70 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/PublicKeyTests.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/PublicKeyTests.cs @@ -310,6 +310,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests } [Theory, MemberData(nameof(BrainpoolCurves))] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "brainpool GetECDsaPublicKey fails on current netfx")] public static void TestKey_ECDsabrainpool_PublicKey(byte[] curveData, byte[] notUsed) { byte[] helloBytes = Encoding.ASCII.GetBytes("Hello"); @@ -390,6 +391,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests } [Theory, MemberData(nameof(BrainpoolCurves))] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "brainpool GetECDsaPublicKey fails on current netfx")] public static void TestECDsaPublicKey_BrainpoolP160r1_ValidatesSignature(byte[] curveData, byte[] existingSignature) { byte[] helloBytes = Encoding.ASCII.GetBytes("Hello"); @@ -474,7 +476,8 @@ namespace System.Security.Cryptography.X509Certificates.Tests } } } - + +#if !NO_DSA_AVAILABLE [Fact] public static void TestDSAPublicKey() { @@ -524,6 +527,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests Assert.Null(pubKey); } } +#endif [Fact] [PlatformSpecific(TestPlatforms.Windows)] // Uses P/Invokes @@ -548,6 +552,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests [Fact] [PlatformSpecific(TestPlatforms.Windows)] // Uses P/Invokes + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "brainpool GetECDsaPublicKey fails on current netfx")] public static void TestKey_BrainpoolP160r1() { if (PlatformDetection.WindowsVersion >= 10) diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj index 9c209605c3..de2a1df6a8 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj @@ -4,7 +4,13 @@ {A28B0064-EFB2-4B77-B97C-DECF5DAB074E} true + true + true $(DefineConstants);netcoreapp + $(DefineConstants);uap + $(DefineConstants);NO_DSA_AVAILABLE + $(DefineConstants);NO_EPHEMERALKEYSET_AVAILABLE + $(DefineConstants);HAVE_THUMBPRINT_OVERLOADS @@ -12,20 +18,12 @@ + + - - - - - - - - - - @@ -33,8 +31,6 @@ - - @@ -44,7 +40,6 @@ - @@ -59,6 +54,21 @@ Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs + + + + + + + + + + + + + + + @@ -90,6 +100,12 @@ + + + {69e46a6f-9966-45a5-8945-2559fe337827} + RemoteExecutorConsoleApp + + diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/TestData.cs.REMOVED.git-id b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/TestData.cs.REMOVED.git-id index fb9a94f222..9d229459ce 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/TestData.cs.REMOVED.git-id +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/TestData.cs.REMOVED.git-id @@ -1 +1 @@ -25b55d437b9d9533afb758bda87c6e3866641321 \ No newline at end of file +ff8c1614be5a4956ca251667eacd7957b38eff3e \ No newline at end of file diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/X500DistinguishedNameTests.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/X500DistinguishedNameTests.cs index 027823ffbd..95ac1ed519 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/X500DistinguishedNameTests.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/X500DistinguishedNameTests.cs @@ -126,6 +126,16 @@ namespace System.Security.Cryptography.X509Certificates.Tests Assert.Equal(notQuoted, dn.Decode(X500DistinguishedNameFlags.DoNotUseQuotes)); } + + [Theory] + [MemberData(nameof(T61Cases))] + public static void T61Strings(string expected, string hexEncoded) + { + byte[] encoded = hexEncoded.HexToByteArray(); + X500DistinguishedName dn = new X500DistinguishedName(encoded); + + Assert.Equal(expected, dn.Name); + } [Fact] public static void PrintComplexReversed() @@ -158,6 +168,22 @@ namespace System.Security.Cryptography.X509Certificates.Tests Assert.EndsWith(expected, dn.Decode(X500DistinguishedNameFlags.None), StringComparison.Ordinal); } + [Fact] + public static void EdgeCaseEmptyFormat() + { + X500DistinguishedName dn = new X500DistinguishedName(""); + Assert.Equal(String.Empty, dn.Format(true)); + Assert.Equal(String.Empty, dn.Format(false)); + } + + [Fact] + public static void EdgeCaseUseCommaAndNewLines() + { + const string rname = "C=US, O=\"RSA Data Security, Inc.\", OU=Secure Server Certification Authority"; + X500DistinguishedName dn = new X500DistinguishedName(rname, X500DistinguishedNameFlags.None); + Assert.Equal(rname, dn.Decode(X500DistinguishedNameFlags.UseCommas | X500DistinguishedNameFlags.UseNewLines)); + } + public static readonly object[][] WhitespaceBeforeCases = { // Regular space. @@ -386,6 +412,49 @@ namespace System.Security.Cryptography.X509Certificates.Tests }, }; + public static readonly object[][] T61Cases = + { + // https://github.com/dotnet/corefx/issues/27466 + new object[] + { + "CN=GrapeCity inc., OU=Tools Development, O=GrapeCity inc., " + + "L=Sendai Izumi-ku, S=Miyagi, C=JP", + "308186310b3009060355040613024a50310f300d060355040813064d69796167" + + "69311830160603550407130f53656e64616920497a756d692d6b753117301506" + + "0355040a140e47726170654369747920696e632e311a3018060355040b141154" + + "6f6f6c7320446576656c6f706d656e74311730150603550403140e4772617065" + + "4369747920696e632e" + }, + + // Mono test case taken from old bug report + new object[] + { + "SERIALNUMBER=CVR:13471967-UID:121212121212, E=vhm@use.test.dk, " + + "CN=Hedeby's M\u00f8belhandel - Salgsafdelingen, " + + "O=Hedeby's M\u00f8belhandel // CVR:13471967, C=DK", + "3081B5310B300906035504061302444B312D302B060355040A14244865646562" + + "792773204DF862656C68616E64656C202F2F204356523A313334373139363731" + + "2F302D060355040314264865646562792773204DF862656C68616E64656C202D" + + "2053616C6773616664656C696E67656E311E301C06092A864886F70D01090116" + + "0F76686D407573652E746573742E646B312630240603550405131D4356523A31" + + "333437313936372D5549443A313231323132313231323132" + }, + + // Valid UTF-8 string is interpreted as UTF-8 + new object[] + { + "C=\u00a2", + "300D310B300906035504061402C2A2" + }, + + // Invalid UTF-8 string with valid UTF-8 sequence is interpreted as ISO 8859-1 + new object[] + { + "L=\u00c2\u00a2\u00f8", + "300E310C300A06035504071403C2A2F8" + }, + }; + private const string MicrosoftDotComSubject = "3082010F31133011060B2B0601040182373C02010313025553311B3019060B2B" + "0601040182373C0201020C0A57617368696E67746F6E311D301B060355040F13" + diff --git a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/X509StoreTests.cs b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/X509StoreTests.cs index 2bc94e2fec..fe2db40054 100644 --- a/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/X509StoreTests.cs +++ b/external/corefx/src/System.Security.Cryptography.X509Certificates/tests/X509StoreTests.cs @@ -2,11 +2,18 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +#if netcoreapp || uap +#define HAVE_STORE_ISOPEN +#endif + +using System.Diagnostics; +using System.IO; +using System.Runtime.InteropServices; using Xunit; namespace System.Security.Cryptography.X509Certificates.Tests { - public class X509StoreTests + public class X509StoreTests : RemoteExecutorTestBase { [Fact] public static void OpenMyStore() @@ -14,6 +21,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests using (X509Store store = new X509Store(StoreName.My, StoreLocation.CurrentUser)) { store.Open(OpenFlags.ReadOnly); + Assert.Equal("My", store.Name); } } @@ -22,10 +30,11 @@ namespace System.Security.Cryptography.X509Certificates.Tests { using (X509Store store = new X509Store(StoreLocation.CurrentUser)) { - Assert.Equal("My", store.Name); + Assert.Equal("MY", store.Name); } } +#if HAVE_STORE_ISOPEN [Fact] public static void Constructor_IsNotOpen() { @@ -34,6 +43,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests Assert.False(store.IsOpen); } } +#endif [Fact] public static void Constructor_DefaultStoreLocation() @@ -97,6 +107,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests Assert.Throws(() => new X509Chain(IntPtr.Zero)); } +#if HAVE_STORE_ISOPEN [Fact] public static void Constructor_OpenFlags() { @@ -132,6 +143,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests new X509Store(new Guid().ToString("D"), StoreLocation.CurrentUser, OpenFlags.ReadOnly | OpenFlags.OpenExistingOnly) ); } +#endif [PlatformSpecific(TestPlatforms.Windows | TestPlatforms.OSX)] // StoreHandle not supported via OpenSSL [Fact] @@ -174,6 +186,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests } } +#if HAVE_STORE_ISOPEN [Fact] public static void Open_IsOpenTrue() { @@ -202,6 +215,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests store.Open(OpenFlags.ReadOnly); Assert.True(store.IsOpen); } +#endif [Fact] public static void AddReadOnlyThrows() @@ -496,5 +510,48 @@ namespace System.Security.Cryptography.X509Certificates.Tests Assert.Equal(0, store.Certificates.Count); } } + + [Fact] + [PlatformSpecific(TestPlatforms.Linux)] // Windows/OSX doesn't use SSL_CERT_{DIR,FILE}. + private void X509Store_MachineStoreLoadSkipsInvalidFiles() + { + // We create a folder for our machine store and use it by setting SSL_CERT_{DIR,FILE}. + // In the store we'll add some invalid files, but we start and finish with a valid file. + // This is to account for the order in which the store is populated. + string sslCertDir = GetTestFilePath(); + Directory.CreateDirectory(sslCertDir); + + // Valid file. + File.WriteAllBytes(Path.Combine(sslCertDir, "0.pem"), TestData.SelfSigned1PemBytes); + + // File with invalid content. + File.WriteAllText(Path.Combine(sslCertDir, "1.pem"), "This is not a valid cert"); + + // File which is not readable by the current user. + string unreadableFileName = Path.Combine(sslCertDir, "2.pem"); + File.WriteAllBytes(unreadableFileName, TestData.SelfSigned2PemBytes); + Assert.Equal(0, chmod(unreadableFileName, 0)); + + // Valid file. + File.WriteAllBytes(Path.Combine(sslCertDir, "3.pem"), TestData.SelfSigned3PemBytes); + + var psi = new ProcessStartInfo(); + psi.Environment.Add("SSL_CERT_DIR", sslCertDir); + psi.Environment.Add("SSL_CERT_FILE", "/nonexisting"); + RemoteInvoke(() => + { + using (var store = new X509Store(StoreName.Root, StoreLocation.LocalMachine)) + { + store.Open(OpenFlags.OpenExistingOnly); + + // Check nr of certificates in store. + Assert.Equal(2, store.Certificates.Count); + } + return SuccessExitCode; + }, new RemoteInvokeOptions { StartInfo = psi }).Dispose(); + } + + [DllImport("libc")] + private static extern int chmod(string path, int mode); } } diff --git a/external/corefx/src/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.cs b/external/corefx/src/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.cs index d97dcfc823..16ccf31399 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.cs @@ -364,7 +364,13 @@ namespace System.Security.Cryptography.Xml public const string XmlDsigMinimalCanonicalizationUrl = "http://www.w3.org/2000/09/xmldsig#minimal"; public const string XmlDsigNamespaceUrl = "http://www.w3.org/2000/09/xmldsig#"; public const string XmlDsigRSASHA1Url = "http://www.w3.org/2000/09/xmldsig#rsa-sha1"; + public const string XmlDsigRSASHA256Url = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"; + public const string XmlDsigRSASHA384Url = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"; + public const string XmlDsigRSASHA512Url = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"; public const string XmlDsigSHA1Url = "http://www.w3.org/2000/09/xmldsig#sha1"; + public const string XmlDsigSHA256Url = "http://www.w3.org/2001/04/xmlenc#sha256"; + public const string XmlDsigSHA384Url = "http://www.w3.org/2001/04/xmldsig-more#sha384"; + public const string XmlDsigSHA512Url = "http://www.w3.org/2001/04/xmlenc#sha512"; public const string XmlDsigXPathTransformUrl = "http://www.w3.org/TR/1999/REC-xpath-19991116"; public const string XmlDsigXsltTransformUrl = "http://www.w3.org/TR/1999/REC-xslt-19991116"; public const string XmlLicenseTransformUrl = "urn:mpeg:mpeg21:2003:01-REL-R-NS:licenseTransform"; diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/MatchingRefApiCompatBaseline.netstandard.txt b/external/corefx/src/System.Security.Cryptography.Xml/src/MatchingRefApiCompatBaseline.netstandard.txt new file mode 100644 index 0000000000..1f4b419245 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/MatchingRefApiCompatBaseline.netstandard.txt @@ -0,0 +1,2 @@ +# Type must be public in implementation for serialization to work but we don't want to expose it publicly in the contract as it isn't public on .NET Framework +TypesMustExist : Type 'System.Security.Cryptography.Xml.CryptoSignedXmlRecursionException' does not exist in the implementation but it does exist in the contract. diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj b/external/corefx/src/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj index c16b4e66a3..739a1c7bc0 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj @@ -73,7 +73,6 @@ - @@ -106,6 +105,7 @@ + diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/CanonicalXml.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/CanonicalXml.cs index c043fcd14d..afe1bb1cc2 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/CanonicalXml.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/CanonicalXml.cs @@ -118,7 +118,7 @@ namespace System.Security.Cryptography.Xml internal byte[] GetDigestedBytes(HashAlgorithm hash) { _c14nDoc.WriteHash(hash, DocPosition.BeforeRootElement, _ancMgr); - hash.TransformFinalBlock(new byte[0], 0, 0); + hash.TransformFinalBlock(Array.Empty(), 0, 0); byte[] res = (byte[])hash.Hash.Clone(); // reinitialize the hash so it is still usable after the call hash.Initialize(); diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/CipherReference.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/CipherReference.cs index 079a5d09f7..5dd3dd2968 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/CipherReference.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/CipherReference.cs @@ -74,7 +74,8 @@ namespace System.Security.Cryptography.Xml throw new ArgumentNullException(nameof(value)); ReferenceType = value.LocalName; - Uri = Utils.GetAttribute(value, "URI", EncryptedXml.XmlEncNamespaceUrl); + string uri = Utils.GetAttribute(value, "URI", EncryptedXml.XmlEncNamespaceUrl); + Uri = uri ?? throw new CryptographicException(SR.Cryptography_Xml_UriRequired); // Transforms XmlNamespaceManager nsm = new XmlNamespaceManager(value.OwnerDocument.NameTable); diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/CryptoHelpers.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/CryptoHelpers.cs index a857475d3e..d73702fdac 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/CryptoHelpers.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/CryptoHelpers.cs @@ -2,15 +2,21 @@ // 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.CodeAnalysis; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; namespace System.Security.Cryptography.Xml { internal static class CryptoHelpers { - [SuppressMessage("Microsoft.Security", "CA5350", Justification = "SHA1 needed for compat.")] - [SuppressMessage("Microsoft.Security", "CA5351", Justification = "HMACMD5 needed for compat.")] - public static object CreateFromName(string name) + private static readonly char[] _invalidChars = new char[] { ',', '`', '[', '*', '&' }; + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA5350", Justification = "SHA1 needed for compat.")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA5351", Justification = "HMACMD5 needed for compat.")] + public static object CreateFromKnownName(string name) { switch (name) { @@ -73,7 +79,23 @@ namespace System.Security.Cryptography.Xml return TripleDES.Create(); } - return CryptoConfig.CreateFromName(name); + return null; + } + + public static T CreateFromName(string name) where T : class + { + if (name == null || name.IndexOfAny(_invalidChars) >= 0) + { + return null; + } + try + { + return (CreateFromKnownName(name) ?? CryptoConfig.CreateFromName(name)) as T; + } + catch (Exception) + { + return null; + } } } } diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/DSASignatureDescription.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/DSASignatureDescription.cs index 4c74f878f4..ca0ff8d3e8 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/DSASignatureDescription.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/DSASignatureDescription.cs @@ -20,7 +20,7 @@ namespace System.Security.Cryptography.Xml public sealed override AsymmetricSignatureDeformatter CreateDeformatter(AsymmetricAlgorithm key) { - var item = (AsymmetricSignatureDeformatter)CryptoHelpers.CreateFromName(DeformatterAlgorithm); + var item = (AsymmetricSignatureDeformatter)CryptoConfig.CreateFromName(DeformatterAlgorithm); item.SetKey(key); item.SetHashAlgorithm(HashAlgorithm); return item; @@ -28,7 +28,7 @@ namespace System.Security.Cryptography.Xml public sealed override AsymmetricSignatureFormatter CreateFormatter(AsymmetricAlgorithm key) { - var item = (AsymmetricSignatureFormatter)CryptoHelpers.CreateFromName(FormatterAlgorithm); + var item = (AsymmetricSignatureFormatter)CryptoConfig.CreateFromName(FormatterAlgorithm); item.SetKey(key); item.SetHashAlgorithm(HashAlgorithm); return item; diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/EncryptedReference.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/EncryptedReference.cs index 4c8b5fddc5..0c92ff1c79 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/EncryptedReference.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/EncryptedReference.cs @@ -112,7 +112,11 @@ namespace System.Security.Cryptography.Xml throw new ArgumentNullException(nameof(value)); ReferenceType = value.LocalName; - Uri = Utils.GetAttribute(value, "URI", EncryptedXml.XmlEncNamespaceUrl); + + string uri = Utils.GetAttribute(value, "URI", EncryptedXml.XmlEncNamespaceUrl); + if (uri == null) + throw new ArgumentNullException(SR.Cryptography_Xml_UriRequired); + Uri = uri; // Transforms XmlNamespaceManager nsm = new XmlNamespaceManager(value.OwnerDocument.NameTable); diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/EncryptedXml.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/EncryptedXml.cs index 19202e33b2..574799c281 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/EncryptedXml.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/EncryptedXml.cs @@ -197,21 +197,38 @@ namespace System.Security.Cryptography.Xml if (cipherData.CipherReference.CipherValue != null) return cipherData.CipherReference.CipherValue; Stream decInputStream = null; + if (cipherData.CipherReference.Uri == null) + { + throw new CryptographicException(SR.Cryptography_Xml_UriNotSupported); + } // See if the CipherReference is a local URI if (cipherData.CipherReference.Uri.Length == 0) { // self referenced Uri string baseUri = (_document == null ? null : _document.BaseURI); TransformChain tc = cipherData.CipherReference.TransformChain; + if (tc == null) + { + throw new CryptographicException(SR.Cryptography_Xml_UriNotSupported); + } decInputStream = tc.TransformToOctetStream(_document, _xmlResolver, baseUri); } else if (cipherData.CipherReference.Uri[0] == '#') { string idref = Utils.ExtractIdFromLocalUri(cipherData.CipherReference.Uri); // Serialize - inputStream = new MemoryStream(_encoding.GetBytes(GetIdElement(_document, idref).OuterXml)); + XmlElement idElem = GetIdElement(_document, idref); + if (idElem == null || idElem.OuterXml == null) + { + throw new CryptographicException(SR.Cryptography_Xml_UriNotSupported); + } + inputStream = new MemoryStream(_encoding.GetBytes(idElem.OuterXml)); string baseUri = (_document == null ? null : _document.BaseURI); TransformChain tc = cipherData.CipherReference.TransformChain; + if (tc == null) + { + throw new CryptographicException(SR.Cryptography_Xml_UriNotSupported); + } decInputStream = tc.TransformToOctetStream(inputStream, _xmlResolver, baseUri); } else @@ -361,7 +378,11 @@ namespace System.Security.Cryptography.Xml if (key == null) throw new CryptographicException(SR.Cryptography_Xml_MissingDecryptionKey); - SymmetricAlgorithm symAlg = (SymmetricAlgorithm)CryptoHelpers.CreateFromName(symmetricAlgorithmUri); + SymmetricAlgorithm symAlg = CryptoHelpers.CreateFromName(symmetricAlgorithmUri); + if (symAlg == null) + { + throw new CryptographicException(SR.Cryptography_Xml_MissingAlgorithm); + } symAlg.Key = key; return symAlg; } @@ -394,6 +415,10 @@ namespace System.Security.Cryptography.Xml object kek = _keyNameMapping[keyName]; if (kek != null) { + if (encryptedKey.CipherData == null || encryptedKey.CipherData.CipherValue == null) + { + throw new CryptographicException(SR.Cryptography_Xml_MissingAlgorithm); + } // kek is either a SymmetricAlgorithm or an RSA key, otherwise, we wouldn't be able to insert it in the hash table if (kek is SymmetricAlgorithm) return EncryptedXml.DecryptKey(encryptedKey.CipherData.CipherValue, (SymmetricAlgorithm)kek); @@ -414,6 +439,10 @@ namespace System.Security.Cryptography.Xml { if (privateKey != null) { + if (encryptedKey.CipherData == null || encryptedKey.CipherData.CipherValue == null) + { + throw new CryptographicException(SR.Cryptography_Xml_MissingAlgorithm); + } fOAEP = (encryptedKey.EncryptionMethod != null && encryptedKey.EncryptionMethod.KeyAlgorithm == EncryptedXml.XmlEncRSAOAEPUrl); return EncryptedXml.DecryptKey(encryptedKey.CipherData.CipherValue, privateKey, fOAEP); } @@ -456,7 +485,16 @@ namespace System.Security.Cryptography.Xml if (encryptionKey != null) { // this is a symmetric algorithm for sure - SymmetricAlgorithm symAlg = (SymmetricAlgorithm)CryptoHelpers.CreateFromName(encryptedKey.EncryptionMethod.KeyAlgorithm); + SymmetricAlgorithm symAlg = CryptoHelpers.CreateFromName(encryptedKey.EncryptionMethod.KeyAlgorithm); + if (symAlg == null) + { + throw new CryptographicException(SR.Cryptography_Xml_MissingAlgorithm); + } + symAlg.Key = encryptionKey; + if (encryptedKey.CipherData == null || encryptedKey.CipherData.CipherValue == null) + { + throw new CryptographicException(SR.Cryptography_Xml_MissingAlgorithm); + } symAlg.Key = encryptionKey; return EncryptedXml.DecryptKey(encryptedKey.CipherData.CipherValue, symAlg); } diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/ExcCanonicalXml.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/ExcCanonicalXml.cs index 2b1bc1d2d4..bd91b30166 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/ExcCanonicalXml.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/ExcCanonicalXml.cs @@ -66,7 +66,7 @@ namespace System.Security.Cryptography.Xml internal byte[] GetDigestedBytes(HashAlgorithm hash) { _c14nDoc.WriteHash(hash, DocPosition.BeforeRootElement, _ancMgr); - hash.TransformFinalBlock(new byte[0], 0, 0); + hash.TransformFinalBlock(Array.Empty(), 0, 0); byte[] res = (byte[])hash.Hash.Clone(); // reinitialize the hash so it is still usable after the call hash.Initialize(); diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/KeyInfo.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/KeyInfo.cs index 50ca8a5803..d69b0ef864 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/KeyInfo.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/KeyInfo.cs @@ -71,6 +71,8 @@ namespace System.Security.Cryptography.Xml XmlElement keyInfoElement = value; _id = Utils.GetAttribute(keyInfoElement, "Id", SignedXml.XmlDsigNamespaceUrl); + if (!Utils.VerifyAttributes(keyInfoElement, "Id")) + throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "KeyInfo"); XmlNode child = keyInfoElement.FirstChild; while (child != null) @@ -83,6 +85,10 @@ namespace System.Security.Cryptography.Xml // Special-case handling for KeyValue -- we have to go one level deeper if (kicString == "http://www.w3.org/2000/09/xmldsig# KeyValue") { + if (!Utils.VerifyAttributes(elem, (string[])null)) + { + throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "KeyInfo/KeyValue"); + } XmlNodeList nodeList2 = elem.ChildNodes; foreach (XmlNode node2 in nodeList2) { @@ -94,7 +100,8 @@ namespace System.Security.Cryptography.Xml } } } - KeyInfoClause keyInfoClause = (KeyInfoClause)CryptoHelpers.CreateFromName(kicString); + + KeyInfoClause keyInfoClause = CryptoHelpers.CreateFromName(kicString); // if we don't know what kind of KeyInfoClause we're looking at, use a generic KeyInfoNode: if (keyInfoClause == null) keyInfoClause = new KeyInfoNode(); diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/KeyInfoX509Data.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/KeyInfoX509Data.cs index f377bd08e9..67a4b87230 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/KeyInfoX509Data.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/KeyInfoX509Data.cs @@ -16,7 +16,7 @@ namespace System.Security.Cryptography.Xml { public class KeyInfoX509Data : KeyInfoClause { - // An array of certificates representing the certificate chain + // An array of certificates representing the certificate chain private ArrayList _certificates = null; // An array of issuer serial structs private ArrayList _issuerSerials = null; @@ -167,7 +167,7 @@ namespace System.Security.Cryptography.Xml if (_issuerSerials == null) _issuerSerials = new ArrayList(); - _issuerSerials.Add(new X509IssuerSerial(issuerName, h.ToString())); + _issuerSerials.Add(Utils.CreateX509IssuerSerial(issuerName, h.ToString())); } // When we load an X509Data from Xml, we know the serial number is in decimal representation. @@ -175,7 +175,7 @@ namespace System.Security.Cryptography.Xml { if (_issuerSerials == null) _issuerSerials = new ArrayList(); - _issuerSerials.Add(new X509IssuerSerial(issuerName, serialNumber)); + _issuerSerials.Add(Utils.CreateX509IssuerSerial(issuerName, serialNumber)); } public byte[] CRL diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/RSAPKCS1SignatureDescription.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/RSAPKCS1SignatureDescription.cs index 2fc6a3d810..ab37fbd98e 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/RSAPKCS1SignatureDescription.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/RSAPKCS1SignatureDescription.cs @@ -16,7 +16,7 @@ namespace System.Security.Cryptography.Xml public sealed override AsymmetricSignatureDeformatter CreateDeformatter(AsymmetricAlgorithm key) { - var item = (AsymmetricSignatureDeformatter)CryptoHelpers.CreateFromName(DeformatterAlgorithm); + var item = (AsymmetricSignatureDeformatter)CryptoConfig.CreateFromName(DeformatterAlgorithm); item.SetKey(key); item.SetHashAlgorithm(DigestAlgorithm); return item; @@ -24,7 +24,7 @@ namespace System.Security.Cryptography.Xml public sealed override AsymmetricSignatureFormatter CreateFormatter(AsymmetricAlgorithm key) { - var item = (AsymmetricSignatureFormatter)CryptoHelpers.CreateFromName(FormatterAlgorithm); + var item = (AsymmetricSignatureFormatter)CryptoConfig.CreateFromName(FormatterAlgorithm); item.SetKey(key); item.SetHashAlgorithm(DigestAlgorithm); return item; diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Reference.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Reference.cs index a34d3d492c..b608cf077a 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Reference.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Reference.cs @@ -219,25 +219,52 @@ namespace System.Security.Cryptography.Xml _id = Utils.GetAttribute(value, "Id", SignedXml.XmlDsigNamespaceUrl); _uri = Utils.GetAttribute(value, "URI", SignedXml.XmlDsigNamespaceUrl); _type = Utils.GetAttribute(value, "Type", SignedXml.XmlDsigNamespaceUrl); + if (!Utils.VerifyAttributes(value, new string[] { "Id", "URI", "Type" })) + throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "Reference"); XmlNamespaceManager nsm = new XmlNamespaceManager(value.OwnerDocument.NameTable); nsm.AddNamespace("ds", SignedXml.XmlDsigNamespaceUrl); // Transforms + bool hasTransforms = false; TransformChain = new TransformChain(); - XmlElement transformsElement = value.SelectSingleNode("ds:Transforms", nsm) as XmlElement; - if (transformsElement != null) + XmlNodeList transformsNodes = value.SelectNodes("ds:Transforms", nsm); + if (transformsNodes != null && transformsNodes.Count != 0) { + if (transformsNodes.Count > 1) + { + throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "Reference/Transforms"); + } + hasTransforms = true; + XmlElement transformsElement = transformsNodes[0] as XmlElement; + if (!Utils.VerifyAttributes(transformsElement, (string[])null)) + { + throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "Reference/Transforms"); + } XmlNodeList transformNodes = transformsElement.SelectNodes("ds:Transform", nsm); if (transformNodes != null) { + if (transformNodes.Count != transformsElement.SelectNodes("*").Count) + { + throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "Reference/Transforms"); + } + if (transformNodes.Count > Utils.MaxTransformsPerReference) + { + throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "Reference/Transforms"); + } foreach (XmlNode transformNode in transformNodes) { XmlElement transformElement = transformNode as XmlElement; string algorithm = Utils.GetAttribute(transformElement, "Algorithm", SignedXml.XmlDsigNamespaceUrl); - Transform transform = CryptoHelpers.CreateFromName(algorithm) as Transform; - if (transform == null) + if (algorithm == null || !Utils.VerifyAttributes(transformElement, "Algorithm")) + { throw new CryptographicException(SR.Cryptography_Xml_UnknownTransform); + } + Transform transform = CryptoHelpers.CreateFromName(algorithm); + if (transform == null) + { + throw new CryptographicException(SR.Cryptography_Xml_UnknownTransform); + } AddTransform(transform); // let the transform read the children of the transformElement for data transform.LoadInnerXml(transformElement.ChildNodes); @@ -267,16 +294,27 @@ namespace System.Security.Cryptography.Xml } // DigestMethod - XmlElement digestMethodElement = value.SelectSingleNode("ds:DigestMethod", nsm) as XmlElement; - if (digestMethodElement == null) + XmlNodeList digestMethodNodes = value.SelectNodes("ds:DigestMethod", nsm); + if (digestMethodNodes == null || digestMethodNodes.Count == 0 || digestMethodNodes.Count > 1) throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "Reference/DigestMethod"); + XmlElement digestMethodElement = digestMethodNodes[0] as XmlElement; _digestMethod = Utils.GetAttribute(digestMethodElement, "Algorithm", SignedXml.XmlDsigNamespaceUrl); + if (_digestMethod == null || !Utils.VerifyAttributes(digestMethodElement, "Algorithm")) + throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "Reference/DigestMethod"); + // DigestValue - XmlElement digestValueElement = value.SelectSingleNode("ds:DigestValue", nsm) as XmlElement; - if (digestValueElement == null) + XmlNodeList digestValueNodes = value.SelectNodes("ds:DigestValue", nsm); + if (digestValueNodes == null || digestValueNodes.Count == 0 || digestValueNodes.Count > 1) throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "Reference/DigestValue"); + XmlElement digestValueElement = digestValueNodes[0] as XmlElement; _digestValue = Convert.FromBase64String(Utils.DiscardWhiteSpaces(digestValueElement.InnerText)); + if (!Utils.VerifyAttributes(digestValueElement, (string[])null)) + throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "Reference/DigestValue"); + // Verify that there aren't any extra nodes that aren't allowed + int expectedChildNodeCount = hasTransforms ? 3 : 2; + if (value.SelectNodes("*").Count != expectedChildNodeCount) + throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "Reference"); // cache the Xml _cachedXml = value; @@ -304,7 +342,7 @@ namespace System.Security.Cryptography.Xml { // refList is a list of elements that might be targets of references // Now's the time to create our hashing algorithm - _hashAlgorithm = CryptoHelpers.CreateFromName(_digestMethod) as HashAlgorithm; + _hashAlgorithm = CryptoHelpers.CreateFromName(_digestMethod); if (_hashAlgorithm == null) throw new CryptographicException(SR.Cryptography_Xml_CreateHashAlgorithmFailed); diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Signature.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Signature.cs index e023d983f5..d755de9e73 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Signature.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Signature.cs @@ -148,37 +148,53 @@ namespace System.Security.Cryptography.Xml // Id attribute -- optional _id = Utils.GetAttribute(signatureElement, "Id", SignedXml.XmlDsigNamespaceUrl); + if (!Utils.VerifyAttributes(signatureElement, "Id")) + throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "Signature"); XmlNamespaceManager nsm = new XmlNamespaceManager(value.OwnerDocument.NameTable); nsm.AddNamespace("ds", SignedXml.XmlDsigNamespaceUrl); + int expectedChildNodes = 0; // SignedInfo - XmlElement signedInfoElement = signatureElement.SelectSingleNode("ds:SignedInfo", nsm) as XmlElement; - if (signedInfoElement == null) + XmlNodeList signedInfoNodes = signatureElement.SelectNodes("ds:SignedInfo", nsm); + if (signedInfoNodes == null || signedInfoNodes.Count == 0 || signedInfoNodes.Count > 1) throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "SignedInfo"); + XmlElement signedInfoElement = signedInfoNodes[0] as XmlElement; + expectedChildNodes += signedInfoNodes.Count; SignedInfo = new SignedInfo(); SignedInfo.LoadXml(signedInfoElement); // SignatureValue - XmlElement signatureValueElement = signatureElement.SelectSingleNode("ds:SignatureValue", nsm) as XmlElement; - if (signatureValueElement == null) - throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "SignedInfo/SignatureValue"); + XmlNodeList signatureValueNodes = signatureElement.SelectNodes("ds:SignatureValue", nsm); + if (signatureValueNodes == null || signatureValueNodes.Count == 0 || signatureValueNodes.Count > 1) + throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "SignatureValue"); + XmlElement signatureValueElement = signatureValueNodes[0] as XmlElement; + expectedChildNodes += signatureValueNodes.Count; _signatureValue = Convert.FromBase64String(Utils.DiscardWhiteSpaces(signatureValueElement.InnerText)); _signatureValueId = Utils.GetAttribute(signatureValueElement, "Id", SignedXml.XmlDsigNamespaceUrl); + if (!Utils.VerifyAttributes(signatureValueElement, "Id")) + throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "SignatureValue"); + // KeyInfo - optional single element XmlNodeList keyInfoNodes = signatureElement.SelectNodes("ds:KeyInfo", nsm); _keyInfo = new KeyInfo(); if (keyInfoNodes != null) { + if (keyInfoNodes.Count > 1) + { + throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "KeyInfo"); + } foreach (XmlNode node in keyInfoNodes) { XmlElement keyInfoElement = node as XmlElement; if (keyInfoElement != null) _keyInfo.LoadXml(keyInfoElement); } + expectedChildNodes += keyInfoNodes.Count; } + // Object - zero or more elements allowed XmlNodeList objectNodes = signatureElement.SelectNodes("ds:Object", nsm); _embeddedObjects.Clear(); if (objectNodes != null) @@ -193,6 +209,7 @@ namespace System.Security.Cryptography.Xml _embeddedObjects.Add(dataObj); } } + expectedChildNodes += objectNodes.Count; } // Select all elements that have Id attributes @@ -204,6 +221,11 @@ namespace System.Security.Cryptography.Xml _referencedItems.Add(node); } } + // Verify that there aren't any extra nodes that aren't allowed + if (signatureElement.SelectNodes("*").Count != expectedChildNodes) + { + throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "Signature"); + } } public void AddObject(DataObject dataObject) diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/SignedInfo.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/SignedInfo.cs index 30408790d4..f87416ec5a 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/SignedInfo.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/SignedInfo.cs @@ -98,7 +98,7 @@ namespace System.Security.Cryptography.Xml { if (_canonicalizationMethodTransform == null) { - _canonicalizationMethodTransform = CryptoHelpers.CreateFromName(CanonicalizationMethod) as Transform; + _canonicalizationMethodTransform = CryptoHelpers.CreateFromName(CanonicalizationMethod); if (_canonicalizationMethodTransform == null) throw new CryptographicException(string.Format(CultureInfo.CurrentCulture, SR.Cryptography_Xml_CreateTransformFailed, CanonicalizationMethod)); _canonicalizationMethodTransform.SignedXml = SignedXml; @@ -213,24 +213,35 @@ namespace System.Security.Cryptography.Xml XmlNamespaceManager nsm = new XmlNamespaceManager(value.OwnerDocument.NameTable); nsm.AddNamespace("ds", SignedXml.XmlDsigNamespaceUrl); + int expectedChildNodes = 0; // Id attribute -- optional _id = Utils.GetAttribute(signedInfoElement, "Id", SignedXml.XmlDsigNamespaceUrl); + if (!Utils.VerifyAttributes(signedInfoElement, "Id")) + throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "SignedInfo"); // CanonicalizationMethod -- must be present - XmlElement canonicalizationMethodElement = signedInfoElement.SelectSingleNode("ds:CanonicalizationMethod", nsm) as XmlElement; - if (canonicalizationMethodElement == null) + XmlNodeList canonicalizationMethodNodes = signedInfoElement.SelectNodes("ds:CanonicalizationMethod", nsm); + if (canonicalizationMethodNodes == null || canonicalizationMethodNodes.Count == 0 || canonicalizationMethodNodes.Count > 1) throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "SignedInfo/CanonicalizationMethod"); + XmlElement canonicalizationMethodElement = canonicalizationMethodNodes.Item(0) as XmlElement; + expectedChildNodes += canonicalizationMethodNodes.Count; _canonicalizationMethod = Utils.GetAttribute(canonicalizationMethodElement, "Algorithm", SignedXml.XmlDsigNamespaceUrl); + if (_canonicalizationMethod == null || !Utils.VerifyAttributes(canonicalizationMethodElement, "Algorithm")) + throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "SignedInfo/CanonicalizationMethod"); _canonicalizationMethodTransform = null; if (canonicalizationMethodElement.ChildNodes.Count > 0) CanonicalizationMethodObject.LoadInnerXml(canonicalizationMethodElement.ChildNodes); // SignatureMethod -- must be present - XmlElement signatureMethodElement = signedInfoElement.SelectSingleNode("ds:SignatureMethod", nsm) as XmlElement; - if (signatureMethodElement == null) + XmlNodeList signatureMethodNodes = signedInfoElement.SelectNodes("ds:SignatureMethod", nsm); + if (signatureMethodNodes == null || signatureMethodNodes.Count == 0 || signatureMethodNodes.Count > 1) throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "SignedInfo/SignatureMethod"); + XmlElement signatureMethodElement = signatureMethodNodes.Item(0) as XmlElement; + expectedChildNodes += signatureMethodNodes.Count; _signatureMethod = Utils.GetAttribute(signatureMethodElement, "Algorithm", SignedXml.XmlDsigNamespaceUrl); + if (_signatureMethod == null || !Utils.VerifyAttributes(signatureMethodElement, "Algorithm")) + throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "SignedInfo/SignatureMethod"); // Now get the output length if we are using a MAC algorithm XmlElement signatureLengthElement = signatureMethodElement.SelectSingleNode("ds:HMACOutputLength", nsm) as XmlElement; @@ -240,9 +251,14 @@ namespace System.Security.Cryptography.Xml // flush out any reference that was there _references.Clear(); + // Reference - 0 or more XmlNodeList referenceNodes = signedInfoElement.SelectNodes("ds:Reference", nsm); if (referenceNodes != null) { + if (referenceNodes.Count > Utils.MaxReferencesPerSignedInfo) + { + throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "SignedInfo/Reference"); + } foreach (XmlNode node in referenceNodes) { XmlElement referenceElement = node as XmlElement; @@ -250,6 +266,12 @@ namespace System.Security.Cryptography.Xml AddReference(reference); reference.LoadXml(referenceElement); } + expectedChildNodes += referenceNodes.Count; + // Verify that there aren't any extra nodes that aren't allowed + if (signedInfoElement.SelectNodes("*").Count != expectedChildNodes) + { + throw new CryptographicException(SR.Cryptography_Xml_InvalidElement, "SignedInfo"); + } } // Save away the cached value diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/SignedXml.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/SignedXml.cs index dfe3774358..4a5dc3e8ee 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/SignedXml.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/SignedXml.cs @@ -68,15 +68,15 @@ namespace System.Security.Cryptography.Xml public const string XmlDsigRSASHA1Url = "http://www.w3.org/2000/09/xmldsig#rsa-sha1"; public const string XmlDsigHMACSHA1Url = "http://www.w3.org/2000/09/xmldsig#hmac-sha1"; - internal const string XmlDsigSHA256Url = "http://www.w3.org/2001/04/xmlenc#sha256"; - internal const string XmlDsigRSASHA256Url = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"; + public const string XmlDsigSHA256Url = "http://www.w3.org/2001/04/xmlenc#sha256"; + public const string XmlDsigRSASHA256Url = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"; // Yes, SHA384 is in the xmldsig-more namespace even though all the other SHA variants are in xmlenc. That's the standard. - internal const string XmlDsigSHA384Url = "http://www.w3.org/2001/04/xmldsig-more#sha384"; - internal const string XmlDsigRSASHA384Url = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"; + public const string XmlDsigSHA384Url = "http://www.w3.org/2001/04/xmldsig-more#sha384"; + public const string XmlDsigRSASHA384Url = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"; - internal const string XmlDsigSHA512Url = "http://www.w3.org/2001/04/xmlenc#sha512"; - internal const string XmlDsigRSASHA512Url = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"; + public const string XmlDsigSHA512Url = "http://www.w3.org/2001/04/xmlenc#sha512"; + public const string XmlDsigRSASHA512Url = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"; public const string XmlDsigC14NTransformUrl = "http://www.w3.org/TR/2001/REC-xml-c14n-20010315"; public const string XmlDsigC14NWithCommentsTransformUrl = "http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"; @@ -410,7 +410,7 @@ namespace System.Security.Cryptography.Xml } // See if there is a signature description class defined in the Config file - SignatureDescription signatureDescription = CryptoHelpers.CreateFromName(SignedInfo.SignatureMethod) as SignatureDescription; + SignatureDescription signatureDescription = CryptoHelpers.CreateFromName(SignedInfo.SignatureMethod); if (signatureDescription == null) throw new CryptographicException(SR.Cryptography_Xml_SignatureDescriptionNotCreated); HashAlgorithm hashAlg = signatureDescription.CreateDigest(); @@ -653,7 +653,7 @@ namespace System.Security.Cryptography.Xml } // See if we're signed witn an HMAC algorithm - HMAC hmac = CryptoHelpers.CreateFromName(SignatureMethod) as HMAC; + HMAC hmac = CryptoHelpers.CreateFromName(SignatureMethod); if (hmac == null) { // We aren't signed with an HMAC algorithm, so we cannot have a truncated HMAC @@ -1017,7 +1017,7 @@ namespace System.Security.Cryptography.Xml SignedXmlDebugLog.LogBeginCheckSignedInfo(this, m_signature.SignedInfo); - SignatureDescription signatureDescription = CryptoHelpers.CreateFromName(SignatureMethod) as SignatureDescription; + SignatureDescription signatureDescription = CryptoHelpers.CreateFromName(SignatureMethod); if (signatureDescription == null) throw new CryptographicException(SR.Cryptography_Xml_SignatureDescriptionNotCreated); diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/SignedXmlDebugLog.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/SignedXmlDebugLog.cs index 299b8804de..ae678857a6 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/SignedXmlDebugLog.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/SignedXmlDebugLog.cs @@ -698,6 +698,8 @@ namespace System.Security.Cryptography.Xml if (VerboseLoggingEnabled) { + HashAlgorithm hashAlgorithm = CryptoHelpers.CreateFromName(reference.DigestMethod); + string hashAlgorithmName = hashAlgorithm == null ? "null" : hashAlgorithm.GetType().Name; string logMessage = string.Format(CultureInfo.InvariantCulture, SR.Log_SigningReference, GetObjectId(reference), @@ -705,7 +707,7 @@ namespace System.Security.Cryptography.Xml reference.Id, reference.Type, reference.DigestMethod, - CryptoHelpers.CreateFromName(reference.DigestMethod).GetType().Name); + hashAlgorithmName); WriteLine(signedXml, TraceEventType.Verbose, @@ -831,11 +833,13 @@ namespace System.Security.Cryptography.Xml if (VerboseLoggingEnabled) { + HashAlgorithm hashAlgorithm = CryptoHelpers.CreateFromName(reference.DigestMethod); + string hashAlgorithmName = hashAlgorithm == null ? "null" : hashAlgorithm.GetType().Name; string logMessage = string.Format(CultureInfo.InvariantCulture, SR.Log_ReferenceHash, GetObjectId(reference), reference.DigestMethod, - CryptoHelpers.CreateFromName(reference.DigestMethod).GetType().Name, + hashAlgorithmName, FormatBytes(actualHash), FormatBytes(expectedHash)); @@ -1043,11 +1047,13 @@ namespace System.Security.Cryptography.Xml if (InformationLoggingEnabled) { + HashAlgorithm hashAlgorithm = CryptoHelpers.CreateFromName(reference.DigestMethod); + string hashAlgorithmName = hashAlgorithm == null ? "null" : hashAlgorithm.GetType().Name; string logMessage = string.Format(CultureInfo.InvariantCulture, SR.Log_SignedXmlRecursionLimit, GetObjectId(reference), reference.DigestMethod, - CryptoHelpers.CreateFromName(reference.DigestMethod).GetType().Name); + hashAlgorithmName); WriteLine(signedXml, TraceEventType.Information, diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/TransformChain.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/TransformChain.cs index 7c2530da77..3242910a3e 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/TransformChain.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/TransformChain.cs @@ -200,7 +200,7 @@ namespace System.Security.Cryptography.Xml { XmlElement transformElement = (XmlElement)transformNodes.Item(i); string algorithm = Utils.GetAttribute(transformElement, "Algorithm", SignedXml.XmlDsigNamespaceUrl); - Transform transform = CryptoHelpers.CreateFromName(algorithm) as Transform; + Transform transform = CryptoHelpers.CreateFromName(algorithm); if (transform == null) throw new CryptographicException(SR.Cryptography_Xml_UnknownTransform); // let the transform read the children of the transformElement for data diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Utils.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Utils.cs index 0eda167c95..4f0608c708 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Utils.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Utils.cs @@ -81,6 +81,29 @@ namespace System.Security.Cryptography.Xml return element.HasAttribute(localName) || element.HasAttribute(localName, namespaceURI); } + internal static bool VerifyAttributes(XmlElement element, string expectedAttrName) + { + return VerifyAttributes(element, expectedAttrName == null ? null : new string[] { expectedAttrName }); + } + + internal static bool VerifyAttributes(XmlElement element, string[] expectedAttrNames) + { + foreach (XmlAttribute attr in element.Attributes) + { + // There are a few Xml Special Attributes that are always allowed on any node. Make sure we allow those here. + bool attrIsAllowed = attr.Name == "xmlns" || attr.Name.StartsWith("xmlns:") || attr.Name == "xml:space" || attr.Name == "xml:lang" || attr.Name == "xml:base"; + int expectedInd = 0; + while (!attrIsAllowed && expectedAttrNames != null && expectedInd < expectedAttrNames.Length) + { + attrIsAllowed = attr.Name == expectedAttrNames[expectedInd]; + expectedInd++; + } + if (!attrIsAllowed) + return false; + } + return true; + } + internal static bool IsNamespaceNode(XmlNode n) { return n.NodeType == XmlNodeType.Attribute && (n.Prefix.Equals("xmlns") || (n.Prefix.Length == 0 && n.LocalName.Equals("xmlns"))); @@ -309,7 +332,7 @@ namespace System.Security.Cryptography.Xml // initialize the return value discardComments = true; - // Deal with XPointer of type #xpointer(id("ID")). Other XPointer support isn't handled here and is anyway optional + // Deal with XPointer of type #xpointer(id("ID")). Other XPointer support isn't handled here and is anyway optional if (idref.StartsWith("xpointer(id(", StringComparison.Ordinal)) { int startId = idref.IndexOf("id(", StringComparison.Ordinal); @@ -328,7 +351,7 @@ namespace System.Security.Cryptography.Xml { string idref = uri.Substring(1); - // Deal with XPointer of type #xpointer(id("ID")). Other XPointer support isn't handled here and is anyway optional + // Deal with XPointer of type #xpointer(id("ID")). Other XPointer support isn't handled here and is anyway optional if (idref.StartsWith("xpointer(id(", StringComparison.Ordinal)) { int startId = idref.IndexOf("id(", StringComparison.Ordinal); @@ -356,9 +379,9 @@ namespace System.Security.Cryptography.Xml } } - // Writes one stream (starting from the current position) into - // an output stream, connecting them up and reading until - // hitting the end of the input stream. + // Writes one stream (starting from the current position) into + // an output stream, connecting them up and reading until + // hitting the end of the input stream. // returns the number of bytes copied internal static long Pump(Stream input, Stream output) { @@ -482,7 +505,7 @@ namespace System.Security.Cryptography.Xml } } - // This method gets the attributes that should be propagated + // This method gets the attributes that should be propagated internal static CanonicalXmlNodeList GetPropagatedAttributes(XmlElement elem) { if (elem == null) @@ -606,6 +629,21 @@ namespace System.Security.Cryptography.Xml return index + 1; } + // Mimic the behavior of the X509IssuerSerial constructor with null and empty checks + internal static X509IssuerSerial CreateX509IssuerSerial(string issuerName, string serialNumber) + { + if (issuerName == null || issuerName.Length == 0) + throw new ArgumentException(SR.Arg_EmptyOrNullString, nameof(issuerName)); + if (serialNumber == null || serialNumber.Length == 0) + throw new ArgumentException(SR.Arg_EmptyOrNullString, nameof(serialNumber)); + + return new X509IssuerSerial() + { + IssuerName = issuerName, + SerialNumber = serialNumber + }; + } + internal static X509Certificate2Collection BuildBagOfCerts(KeyInfoX509Data keyInfoX509Data, CertUsageType certUsageType) { X509Certificate2Collection collection = new X509Certificate2Collection(); @@ -620,7 +658,7 @@ namespace System.Security.Cryptography.Xml collection.Add(certificate); break; case CertUsageType.Decryption: - decryptionIssuerSerials.Add(new X509IssuerSerial(certificate.IssuerName.Name, certificate.SerialNumber)); + decryptionIssuerSerials.Add(CreateX509IssuerSerial(certificate.IssuerName.Name, certificate.SerialNumber)); break; } } @@ -759,5 +797,8 @@ namespace System.Security.Cryptography.Xml { return (AsymmetricAlgorithm)certificate.GetRSAPublicKey(); } + + internal const int MaxTransformsPerReference = 10; + internal const int MaxReferencesPerSignedInfo = 100; } } diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/X509IssuerSerial.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/X509IssuerSerial.cs deleted file mode 100644 index 46454a4daf..0000000000 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/X509IssuerSerial.cs +++ /dev/null @@ -1,55 +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; -using System.Collections; -using System.Runtime.InteropServices; -using System.Security.Cryptography; -using System.Security.Cryptography.X509Certificates; -using System.Text; -using System.Xml; - -namespace System.Security.Cryptography.Xml -{ - public struct X509IssuerSerial - { - private string _issuerName; - private string _serialNumber; - - internal X509IssuerSerial(string issuerName, string serialNumber) - { - if (issuerName == null || issuerName.Length == 0) - throw new ArgumentException(SR.Arg_EmptyOrNullString, nameof(issuerName)); - if (serialNumber == null || serialNumber.Length == 0) - throw new ArgumentException(SR.Arg_EmptyOrNullString, nameof(serialNumber)); - _issuerName = issuerName; - _serialNumber = serialNumber; - } - - - public string IssuerName - { - get - { - return _issuerName; - } - set - { - _issuerName = value; - } - } - - public string SerialNumber - { - get - { - return _serialNumber; - } - set - { - _serialNumber = value; - } - } - } -} diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlDecryptionTransform.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlDecryptionTransform.cs index 7e6fb6a3f3..d721fb6fea 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlDecryptionTransform.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlDecryptionTransform.cs @@ -98,14 +98,25 @@ namespace System.Security.Cryptography.Xml foreach (XmlNode node in nodeList) { XmlElement elem = node as XmlElement; - if (elem != null && elem.LocalName == "Except" && elem.NamespaceURI == XmlDecryptionTransformNamespaceUrl) + if (elem != null) { - // the Uri is required - string uri = Utils.GetAttribute(elem, "URI", XmlDecryptionTransformNamespaceUrl); - if (uri == null || uri.Length == 0 || uri[0] != '#') - throw new CryptographicException(SR.Cryptography_Xml_UriRequired); - string idref = Utils.ExtractIdFromLocalUri(uri); - ExceptUris.Add(idref); + if (elem.LocalName == "Except" && elem.NamespaceURI == XmlDecryptionTransformNamespaceUrl) + { + // the Uri is required + string uri = Utils.GetAttribute(elem, "URI", XmlDecryptionTransformNamespaceUrl); + if (uri == null || uri.Length == 0 || uri[0] != '#') + throw new CryptographicException(SR.Cryptography_Xml_UriRequired); + if (!Utils.VerifyAttributes(elem, "URI")) + { + throw new CryptographicException(SR.Cryptography_Xml_UnknownTransform); + } + string idref = Utils.ExtractIdFromLocalUri(uri); + ExceptUris.Add(idref); + } + else + { + throw new CryptographicException(SR.Cryptography_Xml_UnknownTransform); + } } } } diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlDsigC14NTransform.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlDsigC14NTransform.cs index 0a67878804..b03d8424f1 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlDsigC14NTransform.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlDsigC14NTransform.cs @@ -42,7 +42,11 @@ namespace System.Security.Cryptography.Xml get { return _outputTypes; } } - public override void LoadInnerXml(XmlNodeList nodeList) { } + public override void LoadInnerXml(XmlNodeList nodeList) + { + if (nodeList != null && nodeList.Count > 0) + throw new CryptographicException(SR.Cryptography_Xml_UnknownTransform); + } protected override XmlNodeList GetInnerXml() { diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlDsigEnvelopedSignatureTransform.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlDsigEnvelopedSignatureTransform.cs index 15dae41c9c..d1d98ed331 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlDsigEnvelopedSignatureTransform.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlDsigEnvelopedSignatureTransform.cs @@ -52,7 +52,11 @@ namespace System.Security.Cryptography.Xml } // An enveloped signature has no inner XML elements - public override void LoadInnerXml(XmlNodeList nodeList) { } + public override void LoadInnerXml(XmlNodeList nodeList) + { + if (nodeList != null && nodeList.Count > 0) + throw new CryptographicException(SR.Cryptography_Xml_UnknownTransform); + } // An enveloped signature has no inner XML elements protected override XmlNodeList GetInnerXml() diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlDsigExcC14NTransform.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlDsigExcC14NTransform.cs index f861c5ff31..44373ee12a 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlDsigExcC14NTransform.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlDsigExcC14NTransform.cs @@ -58,12 +58,23 @@ namespace System.Security.Cryptography.Xml foreach (XmlNode n in nodeList) { XmlElement e = n as XmlElement; - if (e != null && e.LocalName.Equals("InclusiveNamespaces") && - e.NamespaceURI.Equals(SignedXml.XmlDsigExcC14NTransformUrl) && - Utils.HasAttribute(e, "PrefixList", SignedXml.XmlDsigNamespaceUrl)) + if (e != null) { - InclusiveNamespacesPrefixList = Utils.GetAttribute(e, "PrefixList", SignedXml.XmlDsigNamespaceUrl); - return; + if (e.LocalName.Equals("InclusiveNamespaces") + && e.NamespaceURI.Equals(SignedXml.XmlDsigExcC14NTransformUrl) && + Utils.HasAttribute(e, "PrefixList", SignedXml.XmlDsigNamespaceUrl)) + { + if (!Utils.VerifyAttributes(e, "PrefixList")) + { + throw new CryptographicException(SR.Cryptography_Xml_UnknownTransform); + } + this.InclusiveNamespacesPrefixList = Utils.GetAttribute(e, "PrefixList", SignedXml.XmlDsigNamespaceUrl); + return; + } + else + { + throw new CryptographicException(SR.Cryptography_Xml_UnknownTransform); + } } } } diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlDsigXPathTransform.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlDsigXPathTransform.cs index 07c02d7c68..48812b908f 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlDsigXPathTransform.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlDsigXPathTransform.cs @@ -50,28 +50,39 @@ namespace System.Security.Cryptography.Xml string prefix = null; string namespaceURI = null; XmlElement elem = node as XmlElement; - if ((elem != null) && (elem.LocalName == "XPath")) + if (elem != null) { - _xpathexpr = elem.InnerXml.Trim(null); - XmlNodeReader nr = new XmlNodeReader(elem); - XmlNameTable nt = nr.NameTable; - _nsm = new XmlNamespaceManager(nt); - // Look for a namespace in the attributes - foreach (XmlAttribute attrib in elem.Attributes) + if (elem.LocalName == "XPath") { - if (attrib.Prefix == "xmlns") + _xpathexpr = elem.InnerXml.Trim(null); + XmlNodeReader nr = new XmlNodeReader(elem); + XmlNameTable nt = nr.NameTable; + _nsm = new XmlNamespaceManager(nt); + if (!Utils.VerifyAttributes(elem, (string)null)) { - prefix = attrib.LocalName; - namespaceURI = attrib.Value; - if (prefix == null) - { - prefix = elem.Prefix; - namespaceURI = elem.NamespaceURI; - } - _nsm.AddNamespace(prefix, namespaceURI); + throw new CryptographicException(SR.Cryptography_Xml_UnknownTransform); } + // Look for a namespace in the attributes + foreach (XmlAttribute attrib in elem.Attributes) + { + if (attrib.Prefix == "xmlns") + { + prefix = attrib.LocalName; + namespaceURI = attrib.Value; + if (prefix == null) + { + prefix = elem.Prefix; + namespaceURI = elem.NamespaceURI; + } + _nsm.AddNamespace(prefix, namespaceURI); + } + } + break; + } + else + { + throw new CryptographicException(SR.Cryptography_Xml_UnknownTransform); } - break; } } diff --git a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlLicenseTransform.cs b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlLicenseTransform.cs index bb1f49201b..0c45f2627b 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlLicenseTransform.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlLicenseTransform.cs @@ -132,7 +132,11 @@ namespace System.Security.Cryptography.Xml } // License transform has no inner XML elements - public override void LoadInnerXml(XmlNodeList nodeList) { } + public override void LoadInnerXml(XmlNodeList nodeList) + { + if (nodeList != null && nodeList.Count > 0) + throw new CryptographicException(SR.Cryptography_Xml_UnknownTransform); + } public override void LoadInput(object obj) { diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/AssertCrypto.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/AssertCrypto.cs index e34ed93f0c..35f02232f0 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/AssertCrypto.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/AssertCrypto.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // MonoTests.System.Security.Cryptography.Xml.AssertCrypto.cs // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/Configurations.props b/external/corefx/src/System.Security.Cryptography.Xml/tests/Configurations.props index 3e1323e176..ea9ea79f78 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/Configurations.props +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/Configurations.props @@ -2,7 +2,8 @@ - netstandard + netcoreapp; + netstandard; diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/DSAKeyValueTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/DSAKeyValueTest.cs index 0bd33ca268..005b7ca729 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/DSAKeyValueTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/DSAKeyValueTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // DSAKeyValueTest.cs - Test Cases for DSAKeyValue // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/DataObjectTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/DataObjectTest.cs index b6a6c5b4de..f8190fe638 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/DataObjectTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/DataObjectTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // DataObjectTest.cs - Test Cases for DataObject // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/DataReferenceTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/DataReferenceTest.cs index 83e3fa2823..86cfc46162 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/DataReferenceTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/DataReferenceTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // DataReferenceTest.cs // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/EncryptedXmlTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/EncryptedXmlTest.cs index 7e9f2ffeca..b004fcd5e6 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/EncryptedXmlTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/EncryptedXmlTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // EncryptedXmlTest.cs // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/EncryptionMethodTests.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/EncryptionMethodTests.cs index c272f20e74..ab725f2673 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/EncryptionMethodTests.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/EncryptionMethodTests.cs @@ -45,10 +45,7 @@ namespace System.Security.Cryptography.Xml.Tests public void KeySize_SetNegativeValue_ThrowsArgumentOutOfRangeException(int value) { EncryptionMethod method = new EncryptionMethod(); - if (PlatformDetection.IsFullFramework) - AssertExtensions.Throws("The key size should be a non negative integer.", () => method.KeySize = value); - else - AssertExtensions.Throws("value", () => method.KeySize = value); + AssertExtensions.Throws("value", null, () => method.KeySize = value); } [Theory] diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfoNameTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfoNameTest.cs index cc58e455d3..eff7bad8a2 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfoNameTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfoNameTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // KeyInfoNameTest.cs - Test Cases for KeyInfoName // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfoNodeTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfoNodeTest.cs index 6ef942a8a5..790fa8b9be 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfoNodeTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfoNodeTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // KeyInfoNodeTest.cs - Test Cases for KeyInfoNode // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfoRetrievalMethodTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfoRetrievalMethodTest.cs index 4ddbb3483b..4a46d4729d 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfoRetrievalMethodTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfoRetrievalMethodTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // KeyInfoRetrievalMethodTest.cs - Test Cases for KeyInfoRetrievalMethod // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfoTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfoTest.cs index 96ef5ef99d..4fc06bb314 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfoTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfoTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // KeyInfoTest.cs - Test Cases for KeyInfo // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfoX509DataTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfoX509DataTest.cs index a4b70fc73c..f80b991d98 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfoX509DataTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfoX509DataTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // KeyInfoX509DataTest.cs - Test Cases for KeyInfoX509Data // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfo_ArbitraryElements.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfo_ArbitraryElements.cs new file mode 100644 index 0000000000..a05b09eb0e --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/KeyInfo_ArbitraryElements.cs @@ -0,0 +1,33 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information. + +using System.Xml; +using Xunit; + +namespace System.Security.Cryptography.Xml.Tests +{ + public class KeyInfo_ArbitraryElements + { + [Fact] + public static void ExtraData() + { + string arbitraryData = @"lol"; + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg={arbitraryData}ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.True(Helpers.VerifyCryptoExceptionOnLoad(xml, false)); + } + + [Fact] + public static void ExtraAttributes() + { + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void KeyValue_ExtraAttributes() + { + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/RSAKeyValueTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/RSAKeyValueTest.cs index 52463f0ff0..2048a4884d 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/RSAKeyValueTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/RSAKeyValueTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // RSAKeyValueTest.cs - Test Cases for RSAKeyValue // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/ReferenceTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/ReferenceTest.cs index ba6d4f31aa..0cbec07cff 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/ReferenceTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/ReferenceTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // ReferenceTest.cs - Test Cases for Reference // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/Reference_ArbitraryElements.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/Reference_ArbitraryElements.cs new file mode 100644 index 0000000000..8a1f86daef --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/Reference_ArbitraryElements.cs @@ -0,0 +1,156 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information. + +using System.Xml; +using Xunit; + +namespace System.Security.Cryptography.Xml.Tests +{ + public class Reference_ArbitraryElements + { + [Fact] + public static void ExtraData() + { + string arbitraryData = @"lol"; + string xml = $@"X{arbitraryData}ZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void OutOfOrder() + { + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, false)); + } + + [Fact] + public static void DuplicateTransforms() + { + string arbitraryData = @"lol"; + string xml = $@"X{arbitraryData}ZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void Transforms_ExtraData() + { + string arbitraryData = @"lol"; + string xml = $@"X{arbitraryData}ZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void Transforms_ExtraData_CData_Text() + { + string arbitraryData = @"text"; + + string xml = $@" +X{arbitraryData}ZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, false)); + } + + [Fact] + public static void Transforms_ExtraData_XmlNotation() + { + string xml = $@" +XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void Transforms_ExtraData_XmlProcessingInstruction() + { + string xml = $@" +XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, false)); + } + + [Fact] + public static void Transforms_ExtraAttributes() + { + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void DuplicateDigestMethod() + { + string arbitraryData = @"lol"; + + string xml = $@"X{arbitraryData}{arbitraryData}ZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void DuplicateDigestValue() + { + string arbitraryData = @"lol"; + string xml = $@"X{arbitraryData}ZVZLYkc1BAx+YtaqeYlxanb2cGI={arbitraryData}Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void ExtraAttributes() + { + foreach (string includeID in new string[] { "", $@" Id=""""" }) + foreach (string includeURI in new string[] { "", $@" URI=""""" }) + foreach (string includeType in new string[] { "", $@" Type=""""" }) + foreach (string includeExtra in new string[] { "", $@" extraattr=""cat""" }) + { + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.Equal((includeExtra == "" && includeID == "" && includeURI != "" && includeType == ""), Helpers.VerifyCryptoExceptionOnLoad(xml, includeExtra != "")); + } + } + + [Fact] + public static void DuplicateLegalAttributes() + { + foreach (string includeID in new string[] { "", $@" Id=""""", $@" Id="""" Id=""""" }) + foreach (string includeURI in new string[] { "", $@" URI=""""", $@" URI="""" URI=""""" }) + foreach (string includeType in new string[] { "", $@" Type=""""", $@" Type="""" Type=""""" }) + { + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + bool throwsXmlException = includeID.LastIndexOf("I") != includeID.IndexOf("I") || includeURI.LastIndexOf("U") != includeURI.IndexOf("U") || includeType.LastIndexOf("T") != includeType.IndexOf("T"); + if (throwsXmlException) + Assert.Throws(() => Helpers.VerifyCryptoExceptionOnLoad(xml, false)); + else + Assert.Equal(includeID == "" && includeURI != "" && includeType == "", Helpers.VerifyCryptoExceptionOnLoad(xml, false)); + } + } + + [Fact] + public static void MissingAttribute_Transform() + { + string arbitraryData = @"lol"; + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI={arbitraryData}Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Helpers.VerifyCryptoExceptionOnLoad(xml, true); + } + + [Fact] + public static void ExtraAttribute_Transform() + { + string arbitraryData = @"lol"; + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI={arbitraryData}Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Helpers.VerifyCryptoExceptionOnLoad(xml, true); + } + + [Fact] + public static void MissingAttribute_DigestMethod() + { + string arbitraryData = @"lol"; + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI={arbitraryData}Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Helpers.VerifyCryptoExceptionOnLoad(xml, true); + } + + [Fact] + public static void ExtraAttribute_DigestMethod() + { + string arbitraryData = @"lol"; + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI={arbitraryData}Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Helpers.VerifyCryptoExceptionOnLoad(xml, true); + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/SignatureTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/SignatureTest.cs index 874e7de794..60415eb8a2 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/SignatureTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/SignatureTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // SignatureTest.cs - Test Cases for SignedXml // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/Signature_ArbitraryElements.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/Signature_ArbitraryElements.cs new file mode 100644 index 0000000000..eae7bac6bc --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/Signature_ArbitraryElements.cs @@ -0,0 +1,153 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information. + +using System.Xml; +using Xunit; + +namespace System.Security.Cryptography.Xml.Tests +{ + public class Signature_ArbitraryElements + { + [Fact] + public static void CorrectAttributes() + { + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, false)); + } + + [Fact] + public static void DoubleSameAttribute_ID() + { + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.Throws(() => Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void DifferentSignatureXMLNS() + { + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, false)); + } + + [Fact] + public static void ExtraAttributes() + { + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void ExtraAttributes_WeirdXMLNS() + { + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.True(Helpers.VerifyCryptoExceptionOnLoad(xml, false)); + } + + [Fact] + public static void ExtraAttributes_Preserve() + { + string xml = $@" +XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + + Assert.True(Helpers.VerifyCryptoExceptionOnLoad(xml, false)); + } + + [Fact] + public static void ExtraAttributes_Preserve_PlusExtraData() + { + string xml = $@" +X i ss u eZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void ExtraAttributes_Lang() + { + string xml = $@" + XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + + Assert.True(Helpers.VerifyCryptoExceptionOnLoad(xml, false)); + } + + [Fact] + public static void ExtraAttributes_Base() + { + string xml = $@" + XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + + Assert.True(Helpers.VerifyCryptoExceptionOnLoad(xml, false)); + } + + [Fact] + public static void ExtraAttributes_DigestValueWhenMissingDigestValue() + { + string xml = $@"XKx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void ExtraAttributes_ExtraFirst() + { + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void ExtraAttributes_SignatureValue() + { + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Theory] + [InlineData(@"lol", false, true)] // Element + [InlineData(@"", true, false)] //CData_CDataSection + [InlineData(@"", true, false)] //CData_Comment + [InlineData(@" ", true, false)] //CData_Whitespace + [InlineData(@"this", true, false)] //CData_Text + [InlineData(@"&", true, false)] //EntityReference + [InlineData(@"", true, false)] //EntityReference + [InlineData(@"", true, false)] //EntityReference + + public static void ExtraData(string arbitraryData, bool checkSignatureSucceeds, bool loadThrows) + { + string xml = $@" + X{arbitraryData}ZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + + Assert.Equal(checkSignatureSucceeds, Helpers.VerifyCryptoExceptionOnLoad(xml, loadThrows)); + } + + [Fact] + public static void OutOfOrder() + { + string xml = $@"XKx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ZVZLYkc1BAx+YtaqeYlxanb2cGI=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.True(Helpers.VerifyCryptoExceptionOnLoad(xml, false)); + } + + [Fact] + public static void DuplicateSignedInfo() + { + string arbitraryData = @"lol"; + + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI={arbitraryData}Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void DuplicateSignatureValue() + { + string arbitraryData = @"lol"; + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg={arbitraryData}ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void DuplicateKeyInfo() + { + string arbitraryData = @"lol"; + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB{arbitraryData}ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/SignedInfoTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/SignedInfoTest.cs index f2d64dab40..2e1502ac76 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/SignedInfoTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/SignedInfoTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // SignedInfoTest.cs - Test Cases for SignedInfo // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/SignedInfo_ArbitraryElements.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/SignedInfo_ArbitraryElements.cs new file mode 100644 index 0000000000..9c6b03b078 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/SignedInfo_ArbitraryElements.cs @@ -0,0 +1,81 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information. + +using System.Xml; +using Xunit; + +namespace System.Security.Cryptography.Xml.Tests +{ + public class SignedInfo_ArbitraryElements + { + [Fact] + public static void ExtraData() + { + string arbitraryData = @"lol"; + + string xml = $@"X{arbitraryData}ZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void OutOfOrder() + { + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, false)); + } + + [Fact] + public static void DuplicateCanonicalizationMethod() + { + string arbitraryData = @"lol"; + + string xml = $@"X{arbitraryData}ZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void DuplicateSignatureMethod() + { + string arbitraryData = @"lol"; + + string xml = $@"X{arbitraryData}ZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void ExtraAttributes() + { + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void ExtraAttributes_CanonicalizationMethod() + { + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void MissingAttributes_CanonicalizationMethod() + { + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void ExtraAttributes_SignatureMethod() + { + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + } + + [Fact] + public static void MissingAttributes_SignatureMethod() + { + string xml = $@"XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Assert.False(Helpers.VerifyCryptoExceptionOnLoad(xml, true)); + + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/SignedXmlTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/SignedXmlTest.cs index bdbf97d5a3..d18ed6baf6 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/SignedXmlTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/SignedXmlTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // SignedXmlTest.cs - Test Cases for SignedXml // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/SignedXml_Helpers.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/SignedXml_Helpers.cs new file mode 100644 index 0000000000..2ca0131959 --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/SignedXml_Helpers.cs @@ -0,0 +1,34 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information. + +using System.Xml; +using System.Security.Cryptography.X509Certificates; +using Xunit; + +namespace System.Security.Cryptography.Xml.Tests +{ + public static class Helpers + { + public static bool VerifyCryptoExceptionOnLoad(string xml, bool loadXmlThrows) + { + var xmlDoc = new XmlDocument(); + xmlDoc.PreserveWhitespace = true; + xmlDoc.LoadXml(xml); + + var signatureNode = (XmlElement)xmlDoc.GetElementsByTagName("Signature", SignedXml.XmlDsigNamespaceUrl)[0]; + + SignedXml signedXml = new SignedXml(xmlDoc); + if (loadXmlThrows) + Assert.Throws(() => signedXml.LoadXml(signatureNode)); + else + signedXml.LoadXml(signatureNode); + + if (!loadXmlThrows) + { + bool checkSigResult = signedXml.CheckSignature(); + return checkSigResult; + } + return false; + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/SignedXml_Limits.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/SignedXml_Limits.cs new file mode 100644 index 0000000000..4f20978f5b --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/SignedXml_Limits.cs @@ -0,0 +1,41 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information. + +using System.Xml; +using Xunit; + +namespace System.Security.Cryptography.Xml.Tests +{ + public class SignedXml_Limits + { + private const int MaxTransformsPerReference = 10; + private const int MaxReferencesPerSignedInfo = 100; + + [Theory] + [InlineData(1, 1, false)] + [InlineData(MaxTransformsPerReference, 1, false)] + [InlineData(MaxTransformsPerReference + 1, 1, true)] + [InlineData(1, MaxReferencesPerSignedInfo, false)] + [InlineData(1, MaxReferencesPerSignedInfo + 1, true)] + [InlineData(MaxTransformsPerReference, MaxReferencesPerSignedInfo, false)] + [InlineData(MaxTransformsPerReference, MaxReferencesPerSignedInfo + 1, true)] + [InlineData(MaxTransformsPerReference + 1, MaxReferencesPerSignedInfo, true)] + [InlineData(MaxTransformsPerReference + 1, MaxReferencesPerSignedInfo + 1, true)] + public static void TestReferenceLimits(int numTransformsPerReference, int numReferencesPerSignedInfo, bool loadXmlThrows) + { + string xml = $@" +X"; + for (int i = 0; i < numReferencesPerSignedInfo; i++) + { + xml += $@""; + for (int j = 0; j < numTransformsPerReference; j++) + { + xml += $@""; + } + xml += $@"ZVZLYkc1BAx+YtaqeYlxanb2cGI="; + } + xml += $@"Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + Helpers.VerifyCryptoExceptionOnLoad(xml, loadXmlThrows); + } + } +} diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/SignedXml_SignatureMethodAlgorithm.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/SignedXml_SignatureMethodAlgorithm.cs new file mode 100644 index 0000000000..71af4cda6e --- /dev/null +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/SignedXml_SignatureMethodAlgorithm.cs @@ -0,0 +1,38 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information. + +using System.Xml; +using Xunit; + +namespace System.Security.Cryptography.Xml.Tests +{ + public class SignedXml_SignatureMethodAlgorithm + { + [Fact] + public static void TestDummySignatureAlgorithm() + { + string objectToConstruct = typeof(DummyClass).AssemblyQualifiedName; + string xml = $@" + XZVZLYkc1BAx+YtaqeYlxanb2cGI=Kx8xs0of766gimu5girTqiTR5xoiWjN4XMx8uzDDhG70bIqpSzlhh6IA3iI54R5mpqCCPWrJJp85ps4jpQk8RGHe4KMejstbY6YXCfs7LtRPzkNzcoZB3vDbr3ijUSrbMk+0wTaZeyeYs8Z6cOicDIVN6bN6yC/Se5fbzTTCSmg=ww2w+NbXwY/GRBZfFcXqrAM2X+P1NQoU+QEvgLO1izMTB8kvx1i/bodBvHTrKMwAMGEO4kVATA1f1Vf5/lVnbqiCLMJPVRZU6rWKjOGD28T/VRaIGywTV+mC0HvMbe4DlEd3dBwJZLIMUNvOPsj5Ua+l9IS4EoszFNAg6F5Lsyk=AQAB"; + + var xmlDoc = new XmlDocument(); + xmlDoc.PreserveWhitespace = true; + xmlDoc.LoadXml(xml); + + var signatureNode = (XmlElement)xmlDoc.GetElementsByTagName("Signature", SignedXml.XmlDsigNamespaceUrl)[0]; + + SignedXml signedXml = new SignedXml(xmlDoc); + signedXml.LoadXml(signatureNode); + Assert.Throws(() => signedXml.CheckSignature()); + } + + public class DummyClass + { + public DummyClass() + { + Assert.False(true); + } + } + } +} + diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj b/external/corefx/src/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj index 3cb9cf6d35..64857aafcc 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj @@ -21,6 +21,7 @@ + @@ -43,7 +44,6 @@ - @@ -55,6 +55,15 @@ + + + + + + + + + @@ -64,7 +73,9 @@ + + - + \ No newline at end of file diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/TransformChainTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/TransformChainTest.cs index cccf97b3a3..4421363d86 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/TransformChainTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/TransformChainTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // TransformChainTest.cs - Test Cases for TransformChain // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/TransformTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/TransformTest.cs index 3f5ce535be..24927f31b3 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/TransformTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/TransformTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // Unit tests for Transform // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDecryptionTransformTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDecryptionTransformTest.cs index adcc6dcb14..70d86a8cea 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDecryptionTransformTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDecryptionTransformTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // Unit tests for XmlDecryptionTransform // @@ -108,7 +110,7 @@ namespace System.Security.Cryptography.Xml.Tests XmlDocument doc = new XmlDocument(); doc.LoadXml(""); - transform.LoadInnerXml(doc.ChildNodes); + Assert.Throws(() => transform.LoadInnerXml(doc.ChildNodes)); Assert.Null(transform.UnprotectedGetInnerXml()); } diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigBase64TransformTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigBase64TransformTest.cs index 262f92cea3..e47c9c701f 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigBase64TransformTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigBase64TransformTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // XmlDsigBase64TransformTest.cs - Test Cases for XmlDsigBase64Transform // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigC14NTransformTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigC14NTransformTest.cs index fd5366f093..8943993a6f 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigC14NTransformTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigC14NTransformTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // XmlDsigC14NTransformTest.cs - Test Cases for XmlDsigC14NTransform // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigC14NWithCommentsTransformTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigC14NWithCommentsTransformTest.cs index d5889ac43f..7802020b78 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigC14NWithCommentsTransformTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigC14NWithCommentsTransformTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // XmlDsigC14NWithCommentsTransformTest.cs // - Test Cases for XmlDsigC14NWithCommentsTransform diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigEnvelopedSignatureTransformTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigEnvelopedSignatureTransformTest.cs index 9bc2bb0581..3c8278e9d4 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigEnvelopedSignatureTransformTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigEnvelopedSignatureTransformTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // XmlDsigEnvelopedSignatureTransformTest.cs // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigExcC14NTransformTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigExcC14NTransformTest.cs index 26f82ffab6..bb4bdd58de 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigExcC14NTransformTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigExcC14NTransformTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // XmlDsigExcC14NTransformTest.cs - Test Cases for XmlDsigExcC14NTransform // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigExcC14NWithCommentsTransformTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigExcC14NWithCommentsTransformTest.cs index 5454d6fcd9..0b9683c26b 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigExcC14NWithCommentsTransformTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigExcC14NWithCommentsTransformTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // XmlDsigExcC14NWithCommentsTransformTest.cs - Test Cases for // XmlDsigExcC14NWithCommentsTransform diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigXPathTransformTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigXPathTransformTest.cs index d088954f33..8075df3c28 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigXPathTransformTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigXPathTransformTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // XmlDsigXPathTransformTest.cs - Test Cases for XmlDsigXPathTransform // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigXsltTransformTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigXsltTransformTest.cs index 90abb4928c..027143b018 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigXsltTransformTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlDsigXsltTransformTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // XmlDsigXsltTransformTest.cs - Test Cases for XmlDsigXsltTransform // diff --git a/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlLicenseTransformTest.cs b/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlLicenseTransformTest.cs index 0f6e6114dd..480ed1782c 100644 --- a/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlLicenseTransformTest.cs +++ b/external/corefx/src/System.Security.Cryptography.Xml/tests/XmlLicenseTransformTest.cs @@ -1,3 +1,5 @@ +// Licensed to the .NET Foundation under one or more agreements. +// See the LICENSE file in the project root for more information // // XmlLicenseTransformTest.cs - Test Cases for XmlLicenseTransform // diff --git a/external/corefx/src/System.Security.Permissions/ref/Configurations.props b/external/corefx/src/System.Security.Permissions/ref/Configurations.props index c398e42e89..d9777d8275 100644 --- a/external/corefx/src/System.Security.Permissions/ref/Configurations.props +++ b/external/corefx/src/System.Security.Permissions/ref/Configurations.props @@ -3,6 +3,7 @@ netstandard; + netfx; \ No newline at end of file diff --git a/external/corefx/src/System.Security.Permissions/ref/System.Security.Permissions.cs.REMOVED.git-id b/external/corefx/src/System.Security.Permissions/ref/System.Security.Permissions.cs.REMOVED.git-id index 1f4e59ade2..f2d4cb25ca 100644 --- a/external/corefx/src/System.Security.Permissions/ref/System.Security.Permissions.cs.REMOVED.git-id +++ b/external/corefx/src/System.Security.Permissions/ref/System.Security.Permissions.cs.REMOVED.git-id @@ -1 +1 @@ -66c2dfdaf4d5ee369e42aa928da2ec16b84518f8 \ No newline at end of file +d54444edf05978359bd395a60bae7a1adb2887f3 \ No newline at end of file diff --git a/external/corefx/src/System.Security.Permissions/ref/System.Security.Permissions.csproj b/external/corefx/src/System.Security.Permissions/ref/System.Security.Permissions.csproj index 53bad00887..b3c83900d7 100644 --- a/external/corefx/src/System.Security.Permissions/ref/System.Security.Permissions.csproj +++ b/external/corefx/src/System.Security.Permissions/ref/System.Security.Permissions.csproj @@ -3,16 +3,26 @@ {07CAF142-B259-418E-86EF-C4BD8B50253E} - - netstandard2.0;$(UAPvNextTFM) + true + + - - + + + + + + + + + + + diff --git a/external/corefx/src/System.Security.Permissions/src/Resources/Strings.resx b/external/corefx/src/System.Security.Permissions/src/Resources/Strings.resx index fa01deef12..28da01bfd3 100644 --- a/external/corefx/src/System.Security.Permissions/src/Resources/Strings.resx +++ b/external/corefx/src/System.Security.Permissions/src/Resources/Strings.resx @@ -82,4 +82,4 @@ Code Access Security is not supported on this platform. - + \ No newline at end of file diff --git a/external/corefx/src/System.Security.Permissions/src/System.Security.Permissions.csproj b/external/corefx/src/System.Security.Permissions/src/System.Security.Permissions.csproj index 56e6f6e0c2..45a6bc5408 100644 --- a/external/corefx/src/System.Security.Permissions/src/System.Security.Permissions.csproj +++ b/external/corefx/src/System.Security.Permissions/src/System.Security.Permissions.csproj @@ -6,7 +6,6 @@ System.Security.Permissions System.Security.Permissions true - true @@ -170,6 +169,11 @@ + + + + + @@ -181,6 +185,7 @@ + diff --git a/external/corefx/src/System.Security.Permissions/src/System/Security/Permissions/HostProtectionResource.cs b/external/corefx/src/System.Security.Permissions/src/System/Security/Permissions/HostProtectionResource.cs index bd9e557492..08b7e45392 100644 --- a/external/corefx/src/System.Security.Permissions/src/System/Security/Permissions/HostProtectionResource.cs +++ b/external/corefx/src/System.Security.Permissions/src/System/Security/Permissions/HostProtectionResource.cs @@ -5,7 +5,9 @@ namespace System.Security.Permissions { [Flags] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public enum HostProtectionResource { All = 511, diff --git a/external/corefx/src/System.Security.Permissions/src/System/Security/Permissions/PrincipalPermission.cs b/external/corefx/src/System.Security.Permissions/src/System/Security/Permissions/PrincipalPermission.cs index 913ebd17b3..c410ca27ea 100644 --- a/external/corefx/src/System.Security.Permissions/src/System/Security/Permissions/PrincipalPermission.cs +++ b/external/corefx/src/System.Security.Permissions/src/System/Security/Permissions/PrincipalPermission.cs @@ -79,7 +79,7 @@ namespace System.Security.Permissions } else if (!VerifyType(target)) { - throw new ArgumentException(SR.Argument_WrongType, GetType().FullName); + throw new ArgumentException(SR.Format(SR.Argument_WrongType, GetType().FullName), nameof(target)); } PrincipalPermission operand = (PrincipalPermission)target; @@ -122,7 +122,7 @@ namespace System.Security.Permissions } else if (!VerifyType(target)) { - throw new ArgumentException(SR.Argument_WrongType, GetType().FullName); + throw new ArgumentException(SR.Format(SR.Argument_WrongType, GetType().FullName), nameof(target)); } else if (IsUnrestricted()) { @@ -179,7 +179,7 @@ namespace System.Security.Permissions } else if (!VerifyType(other)) { - throw new ArgumentException(SR.Argument_WrongType, GetType().FullName); + throw new ArgumentException(SR.Format(SR.Argument_WrongType, GetType().FullName), nameof(other)); } PrincipalPermission operand = (PrincipalPermission)other; @@ -292,7 +292,7 @@ namespace System.Security.Permissions } } else - _idArray = new IDRole[0]; + _idArray = Array.Empty(); } public override string ToString() diff --git a/external/corefx/src/System.Security.Permissions/src/System/Security/Policy/FirstMatchCodeGroup.cs b/external/corefx/src/System.Security.Permissions/src/System/Security/Policy/FirstMatchCodeGroup.cs index e53f97c6ba..be8691e2c4 100644 --- a/external/corefx/src/System.Security.Permissions/src/System/Security/Policy/FirstMatchCodeGroup.cs +++ b/external/corefx/src/System.Security.Permissions/src/System/Security/Policy/FirstMatchCodeGroup.cs @@ -4,7 +4,7 @@ namespace System.Security.Policy { - [Serializable] + [Obsolete("This type is obsolete. See http://go.microsoft.com/fwlink/?LinkID=155570 for more information.")] public sealed partial class FirstMatchCodeGroup : CodeGroup { public FirstMatchCodeGroup(IMembershipCondition membershipCondition, PolicyStatement policy) : base(default(IMembershipCondition), default(PolicyStatement)) { } diff --git a/external/corefx/src/System.Security.Permissions/src/System/Security/Policy/PermissionRequestEvidence.cs b/external/corefx/src/System.Security.Permissions/src/System/Security/Policy/PermissionRequestEvidence.cs index 629c625fa9..4d8cd6b6a4 100644 --- a/external/corefx/src/System.Security.Permissions/src/System/Security/Policy/PermissionRequestEvidence.cs +++ b/external/corefx/src/System.Security.Permissions/src/System/Security/Policy/PermissionRequestEvidence.cs @@ -4,7 +4,7 @@ namespace System.Security.Policy { - [Serializable] + [Obsolete("This type is obsolete. See http://go.microsoft.com/fwlink/?LinkID=155570 for more information.")] public sealed partial class PermissionRequestEvidence : EvidenceBase { public PermissionRequestEvidence(PermissionSet request, PermissionSet optional, PermissionSet denied) { } diff --git a/external/corefx/src/System.Security.Permissions/src/System/Security/Policy/PolicyLevel.cs b/external/corefx/src/System.Security.Permissions/src/System/Security/Policy/PolicyLevel.cs index 350a0e7f97..1af8f36ac3 100644 --- a/external/corefx/src/System.Security.Permissions/src/System/Security/Policy/PolicyLevel.cs +++ b/external/corefx/src/System.Security.Permissions/src/System/Security/Policy/PolicyLevel.cs @@ -23,6 +23,7 @@ namespace System.Security.Policy public void AddFullTrustAssembly(StrongNameMembershipCondition snMC) { } public void AddNamedPermissionSet(NamedPermissionSet permSet) { } public NamedPermissionSet ChangeNamedPermissionSet(string name, PermissionSet pSet) { return default(NamedPermissionSet); } + [Obsolete("AppDomain policy levels are obsolete. See http://go.microsoft.com/fwlink/?LinkID=155570 for more information.")] public static PolicyLevel CreateAppDomainLevel() { return default(PolicyLevel); } public void FromXml(SecurityElement e) { } public NamedPermissionSet GetNamedPermissionSet(string name) { return default(NamedPermissionSet); } diff --git a/external/corefx/src/System.Security.Permissions/src/System/Security/Policy/UnionCodeGroup.cs b/external/corefx/src/System.Security.Permissions/src/System/Security/Policy/UnionCodeGroup.cs index 5c63b20035..ac249fe359 100644 --- a/external/corefx/src/System.Security.Permissions/src/System/Security/Policy/UnionCodeGroup.cs +++ b/external/corefx/src/System.Security.Permissions/src/System/Security/Policy/UnionCodeGroup.cs @@ -4,7 +4,7 @@ namespace System.Security.Policy { - [Serializable] + [Obsolete("This type is obsolete. See http://go.microsoft.com/fwlink/?LinkID=155570 for more information.")] public sealed partial class UnionCodeGroup : CodeGroup { public UnionCodeGroup(IMembershipCondition membershipCondition, PolicyStatement policy) : base(default(IMembershipCondition), default(PolicyStatement)) { } diff --git a/external/corefx/src/System.Security.Permissions/src/System/ServiceProcess/ServiceControllerPermission.cs b/external/corefx/src/System.Security.Permissions/src/System/ServiceProcess/ServiceControllerPermission.cs new file mode 100644 index 0000000000..4a74c9e4a2 --- /dev/null +++ b/external/corefx/src/System.Security.Permissions/src/System/ServiceProcess/ServiceControllerPermission.cs @@ -0,0 +1,17 @@ +// 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.Security.Permissions; + +namespace System.ServiceProcess +{ + public sealed class ServiceControllerPermission : ResourcePermissionBase + { + public ServiceControllerPermission() { } + public ServiceControllerPermission(PermissionState state) : base(state) { } + public ServiceControllerPermission(ServiceControllerPermissionAccess permissionAccess, string machineName, string serviceName) { } + public ServiceControllerPermission(ServiceControllerPermissionEntry[] permissionAccessEntries) { } + public ServiceControllerPermissionEntryCollection PermissionEntries { get => null; } + } +} diff --git a/external/corefx/src/System.Security.Permissions/src/System/ServiceProcess/ServiceControllerPermissionAccess.cs b/external/corefx/src/System.Security.Permissions/src/System/ServiceProcess/ServiceControllerPermissionAccess.cs new file mode 100644 index 0000000000..80466c7c12 --- /dev/null +++ b/external/corefx/src/System.Security.Permissions/src/System/ServiceProcess/ServiceControllerPermissionAccess.cs @@ -0,0 +1,14 @@ +// 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.ServiceProcess +{ + [Flags] + public enum ServiceControllerPermissionAccess + { + None = 0, + Browse = 1 << 1, + Control = 1 << 2 | Browse, + } +} diff --git a/external/corefx/src/System.Security.Permissions/src/System/ServiceProcess/ServiceControllerPermissionAttribute.cs b/external/corefx/src/System.Security.Permissions/src/System/ServiceProcess/ServiceControllerPermissionAttribute.cs new file mode 100644 index 0000000000..5b13ed2a96 --- /dev/null +++ b/external/corefx/src/System.Security.Permissions/src/System/ServiceProcess/ServiceControllerPermissionAttribute.cs @@ -0,0 +1,19 @@ +// 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.Security; +using System.Security.Permissions; + +namespace System.ServiceProcess +{ + [AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Assembly | AttributeTargets.Event, AllowMultiple = true, Inherited = false )] + public class ServiceControllerPermissionAttribute : CodeAccessSecurityAttribute + { + public ServiceControllerPermissionAttribute(SecurityAction action): base(action) { } + public string MachineName { get => null; set { } } + public ServiceControllerPermissionAccess PermissionAccess { get => default(ServiceControllerPermissionAccess); set { } } + public string ServiceName { get => null; set { } } + public override IPermission CreatePermission() { return default(IPermission); } + } +} diff --git a/external/corefx/src/System.Security.Permissions/src/System/ServiceProcess/ServiceControllerPermissionEntry.cs b/external/corefx/src/System.Security.Permissions/src/System/ServiceProcess/ServiceControllerPermissionEntry.cs new file mode 100644 index 0000000000..92c460c905 --- /dev/null +++ b/external/corefx/src/System.Security.Permissions/src/System/ServiceProcess/ServiceControllerPermissionEntry.cs @@ -0,0 +1,15 @@ +// 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.ServiceProcess +{ + public class ServiceControllerPermissionEntry + { + public ServiceControllerPermissionEntry() { } + public ServiceControllerPermissionEntry(ServiceControllerPermissionAccess permissionAccess, string machineName, string serviceName) { } + public string MachineName { get => null; } + public ServiceControllerPermissionAccess PermissionAccess { get => default(ServiceControllerPermissionAccess); } + public string ServiceName { get => null; } + } +} diff --git a/external/corefx/src/System.Security.Permissions/src/System/ServiceProcess/ServiceControllerPermissionEntryCollection.cs b/external/corefx/src/System.Security.Permissions/src/System/ServiceProcess/ServiceControllerPermissionEntryCollection.cs new file mode 100644 index 0000000000..56f35b8f3b --- /dev/null +++ b/external/corefx/src/System.Security.Permissions/src/System/ServiceProcess/ServiceControllerPermissionEntryCollection.cs @@ -0,0 +1,26 @@ +// 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.Collections; + +namespace System.ServiceProcess +{ + public class ServiceControllerPermissionEntryCollection : CollectionBase + { + internal ServiceControllerPermissionEntryCollection() { } + public ServiceControllerPermissionEntry this[int index] { get { return null; } set { } } + public int Add(ServiceControllerPermissionEntry value) { return 0; } + public void AddRange(ServiceControllerPermissionEntry[] value) { } + public void AddRange(ServiceControllerPermissionEntryCollection value) { } + public bool Contains(ServiceControllerPermissionEntry value) { return false; } + public void CopyTo(ServiceControllerPermissionEntry[] array, int index) { } + public int IndexOf(ServiceControllerPermissionEntry value) { return 0; } + public void Insert(int index, ServiceControllerPermissionEntry value) { } + protected override void OnClear() { } + protected override void OnInsert(int index, object value) { } + protected override void OnRemove(int index, object value) { } + protected override void OnSet(int index, object oldValue, object newValue) { } + public void Remove(ServiceControllerPermissionEntry value) { } + } +} diff --git a/external/corefx/src/System.Security.Permissions/tests/CodeGroupTests.cs b/external/corefx/src/System.Security.Permissions/tests/CodeGroupTests.cs index e6802ec210..14c6e44a54 100644 --- a/external/corefx/src/System.Security.Permissions/tests/CodeGroupTests.cs +++ b/external/corefx/src/System.Security.Permissions/tests/CodeGroupTests.cs @@ -23,7 +23,9 @@ namespace System.Security.Permissions.Tests [Fact] public static void FirstMatchCodeGroupCallMethods() { +#pragma warning disable 618 FirstMatchCodeGroup fmcg = new FirstMatchCodeGroup(new GacMembershipCondition(), new PolicyStatement(new PermissionSet(new PermissionState()))); +#pragma warning restore 618 CodeGroup cg = fmcg.Copy(); PolicyStatement ps = fmcg.Resolve(new Evidence()); cg = fmcg.ResolveMatchingCodeGroups(new Evidence()); @@ -48,7 +50,9 @@ namespace System.Security.Permissions.Tests [Fact] public static void UnionCodeGroupCallMethods() { +#pragma warning disable 618 UnionCodeGroup ucg = new UnionCodeGroup(new GacMembershipCondition(), new PolicyStatement(new PermissionSet(new PermissionState()))); +#pragma warning restore 618 CodeGroup cg = ucg.Copy(); PolicyStatement ps = ucg.Resolve(new Evidence()); cg = ucg.ResolveMatchingCodeGroups(new Evidence()); diff --git a/external/corefx/src/System.Security.Permissions/tests/EvidenceBaseTests.cs b/external/corefx/src/System.Security.Permissions/tests/EvidenceBaseTests.cs index 81e76b0894..25b75cb3de 100644 --- a/external/corefx/src/System.Security.Permissions/tests/EvidenceBaseTests.cs +++ b/external/corefx/src/System.Security.Permissions/tests/EvidenceBaseTests.cs @@ -53,8 +53,10 @@ namespace System.Security.Permissions.Tests public static void PermissionRequestEvidenceCallMethods() { PermissionSet ps = new PermissionSet(new PermissionState()); +#pragma warning disable 618 PermissionRequestEvidence pre = new PermissionRequestEvidence(ps, ps, ps); PermissionRequestEvidence obj = pre.Copy(); +#pragma warning restore 618 string str = ps.ToString(); SecurityElement se = new SecurityElement(""); ps.FromXml(se); diff --git a/external/corefx/src/System.Security.Permissions/tests/PolicyTests.cs b/external/corefx/src/System.Security.Permissions/tests/PolicyTests.cs index 5a5ea33e70..9e6a95c9ef 100644 --- a/external/corefx/src/System.Security.Permissions/tests/PolicyTests.cs +++ b/external/corefx/src/System.Security.Permissions/tests/PolicyTests.cs @@ -24,7 +24,9 @@ namespace System.Security.Permissions.Tests NamedPermissionSet nps = new NamedPermissionSet("test"); pl.AddNamedPermissionSet(nps); nps = pl.ChangeNamedPermissionSet("test", new PermissionSet(new Permissions.PermissionState())); +#pragma warning disable 618 PolicyLevel.CreateAppDomainLevel(); +#pragma warning restore 618 nps = pl.GetNamedPermissionSet("test"); pl.Recover(); NamedPermissionSet nps2 = pl.RemoveNamedPermissionSet(nps); diff --git a/external/corefx/src/System.Security.Permissions/tests/PrincipalPermissionTests.cs b/external/corefx/src/System.Security.Permissions/tests/PrincipalPermissionTests.cs index a51905b15a..4817fa89f2 100644 --- a/external/corefx/src/System.Security.Permissions/tests/PrincipalPermissionTests.cs +++ b/external/corefx/src/System.Security.Permissions/tests/PrincipalPermissionTests.cs @@ -201,7 +201,7 @@ namespace System.Security.Permissions.Tests { PrincipalPermission p1 = new PrincipalPermission("user", null); EnvironmentPermission ep2 = new EnvironmentPermission(PermissionState.Unrestricted); - AssertExtensions.Throws("System.Security.Permissions.PrincipalPermission", () => p1.Union(ep2)); + AssertExtensions.Throws("other", () => p1.Union(ep2)); } [Fact] @@ -286,7 +286,7 @@ namespace System.Security.Permissions.Tests { PrincipalPermission p1 = new PrincipalPermission("user", null); EnvironmentPermission ep2 = new EnvironmentPermission(PermissionState.Unrestricted); - AssertExtensions.Throws("System.Security.Permissions.PrincipalPermission", () => p1.Intersect(ep2)); + AssertExtensions.Throws("target", () => p1.Intersect(ep2)); } [Fact] @@ -351,7 +351,7 @@ namespace System.Security.Permissions.Tests { PrincipalPermission p1 = new PrincipalPermission("user", null); EnvironmentPermission ep2 = new EnvironmentPermission(PermissionState.Unrestricted); - AssertExtensions.Throws("System.Security.Permissions.PrincipalPermission", () => p1.IsSubsetOf(ep2)); + AssertExtensions.Throws("target", () => p1.IsSubsetOf(ep2)); } } } diff --git a/external/corefx/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj b/external/corefx/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj index 7d1af3b562..9893075869 100644 --- a/external/corefx/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj +++ b/external/corefx/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj @@ -7,9 +7,9 @@ - runtimes/win/lib/$(UAPvNextTFM) + runtimes/win/lib/uap10.0.16299 - + false - - - + + + Common\Interop\Windows\Interop.Libraries.cs @@ -96,6 +96,7 @@ + @@ -105,7 +106,7 @@ - + diff --git a/external/corefx/src/System.ServiceProcess.ServiceController/src/System/ServiceProcess/ServiceBase.cs b/external/corefx/src/System.ServiceProcess.ServiceController/src/System/ServiceProcess/ServiceBase.cs index 0286919d61..26f28af8ec 100644 --- a/external/corefx/src/System.ServiceProcess.ServiceController/src/System/ServiceProcess/ServiceBase.cs +++ b/external/corefx/src/System.ServiceProcess.ServiceController/src/System/ServiceProcess/ServiceBase.cs @@ -8,6 +8,7 @@ using System.Diagnostics; using System.Globalization; using System.IO; using System.Reflection; +using System.Runtime.ExceptionServices; using System.Runtime.InteropServices; using System.Security; using System.Threading; @@ -29,6 +30,7 @@ namespace System.ServiceProcess private ServiceMainCallback _mainCallback; private IntPtr _handleName; private ManualResetEvent _startCompletedSignal; + private ExceptionDispatchInfo _startFailedException; private int _acceptedCommands; private string _serviceName; private bool _nameFrozen; // set to true once we've started running and ServiceName can't be changed any more. @@ -620,7 +622,21 @@ namespace System.ServiceProcess // While the service is running, this function will never return. It will return when the service // is stopped. + // After it returns, SCM might terminate the process at any time + // (so subsequent code is not guaranteed to run). bool res = StartServiceCtrlDispatcher(entriesPointer); + + foreach (ServiceBase service in services) + { + if (service._startFailedException != null) + { + // Propagate exceptions throw during OnStart. + // Note that this same exception is also thrown from ServiceMainCallback + // (so SCM can see it as well). + service._startFailedException.Throw(); + } + } + string errorMessage = ""; if (!res) @@ -830,6 +846,12 @@ namespace System.ServiceProcess { WriteLogEntry(SR.Format(SR.StartFailed, e.ToString()), true); _status.currentState = ServiceControlStatus.STATE_STOPPED; + + // We capture the exception so that it can be propagated + // from ServiceBase.Run. + // We also use the presence of this exception to inform SCM + // that the service failed to start successfully. + _startFailedException = ExceptionDispatchInfo.Capture(e); } _startCompletedSignal.Set(); } @@ -901,8 +923,20 @@ namespace System.ServiceProcess // since NT will terminate this thread right after this function // finishes. _startCompletedSignal = new ManualResetEvent(false); + _startFailedException = null; ThreadPool.QueueUserWorkItem(new WaitCallback(this.ServiceQueuedMainCallback), args); _startCompletedSignal.WaitOne(); + + if (_startFailedException != null) + { + // Inform SCM that the service could not be started successfully. + // (Unless the service has already provided another failure exit code) + if (_status.win32ExitCode == 0) + { + _status.win32ExitCode = ServiceControlStatus.ERROR_EXCEPTION_IN_SERVICE; + } + } + statusOK = SetServiceStatus(_statusHandle, pStatus); if (!statusOK) { diff --git a/external/corefx/src/System.ServiceProcess.ServiceController/src/System/ServiceProcess/ServiceProcessDescriptionAttribute.cs b/external/corefx/src/System.ServiceProcess.ServiceController/src/System/ServiceProcess/ServiceProcessDescriptionAttribute.cs new file mode 100644 index 0000000000..ff716f8837 --- /dev/null +++ b/external/corefx/src/System.ServiceProcess.ServiceController/src/System/ServiceProcess/ServiceProcessDescriptionAttribute.cs @@ -0,0 +1,42 @@ +// 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.ComponentModel; + +namespace System.ServiceProcess +{ + /// + /// DescriptionAttribute marks a property, event, or extender with a + /// description. Visual designers can display this description when referencing + /// the member. + /// + [AttributeUsage(AttributeTargets.All)] + public class ServiceProcessDescriptionAttribute : DescriptionAttribute + { + private bool replaced = false; + + /// + /// Constructs a new sys description + /// + public ServiceProcessDescriptionAttribute(string description) : base(description) + { + } + + /// + /// Retrieves the description text. + /// + public override string Description + { + get + { + if (!replaced) + { + replaced = true; + DescriptionValue = base.Description; + } + return base.Description; + } + } + } +} diff --git a/external/corefx/src/System.ServiceProcess.ServiceController/tests/ServiceBaseTests.cs b/external/corefx/src/System.ServiceProcess.ServiceController/tests/ServiceBaseTests.cs index e09e915ac5..8a4c830ffd 100644 --- a/external/corefx/src/System.ServiceProcess.ServiceController/tests/ServiceBaseTests.cs +++ b/external/corefx/src/System.ServiceProcess.ServiceController/tests/ServiceBaseTests.cs @@ -2,10 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.Win32; -using System; using System.Diagnostics; -using System.Security.Principal; using Xunit; /// @@ -16,6 +13,7 @@ namespace System.ServiceProcess.Tests [OuterLoop(/* Modifies machine state */)] public class ServiceBaseTests : IDisposable { + private const int connectionTimeout = 30000; private readonly TestServiceProvider _testService; private static readonly Lazy s_isElevated = new Lazy(() => AdminHelpers.IsProcessElevated()); @@ -41,11 +39,11 @@ namespace System.ServiceProcess.Tests Assert.True(testServiceController.CanShutdown); } - //[Fact] + // [Fact] // To cleanup lingering Test Services uncomment the Fact attribute and run the following command - // msbuild /t:rebuildandtest /p:XunitMethodName=System.ServiceProcess.Tests.ServiceBaseTests.Cleanup + // msbuild /t:rebuildandtest /p:XunitMethodName=System.ServiceProcess.Tests.ServiceBaseTests.Cleanup /p:OuterLoop=true // Remember to comment out the Fact again before running tests otherwise it will cleanup tests running in parallel - // and casue them to fail. + // and cause them to fail. public void Cleanup() { string currentService = ""; @@ -75,144 +73,134 @@ namespace System.ServiceProcess.Tests [ConditionalFact(nameof(IsProcessElevated))] public void TestOnStartThenStop() { - var controller = new ServiceController(_testService.TestServiceName); - AssertExpectedProperties(controller); - string expected = -@"OnStart args= -OnStop -"; + ServiceController controller = ConnectToServer(); + controller.Stop(); + Assert.Equal((int)PipeMessageByteCode.Stop, _testService.GetByte()); controller.WaitForStatus(ServiceControllerStatus.Stopped); - Assert.Equal(expected, _testService.GetServiceOutput()); } [ConditionalFact(nameof(IsProcessElevated))] public void TestOnStartWithArgsThenStop() { - var controller = new ServiceController(_testService.TestServiceName); - AssertExpectedProperties(controller); + ServiceController controller = ConnectToServer(); + controller.Stop(); + Assert.Equal((int)PipeMessageByteCode.Stop, _testService.GetByte()); controller.WaitForStatus(ServiceControllerStatus.Stopped); - string expected = -@"OnStart args=a,b,c -OnStop -"; - controller.Start(new string[] { "a", "b", "c" }); + controller.Start(new string[] { "StartWithArguments", "a", "b", "c" }); + _testService.Client = null; + _testService.Client.Connect(); + + // There is no definite order between start and connected when tests are running on multiple threads. + // In this case we dont care much about the order, so we are just checking whether the appropiate bytes have been sent. + Assert.Equal((int)(PipeMessageByteCode.Connected | PipeMessageByteCode.Start), _testService.GetByte() | _testService.GetByte()); controller.WaitForStatus(ServiceControllerStatus.Running); + controller.Stop(); + Assert.Equal((int)PipeMessageByteCode.Stop, _testService.GetByte()); controller.WaitForStatus(ServiceControllerStatus.Stopped); - Assert.Equal(expected, _testService.GetServiceOutput()); } [ConditionalFact(nameof(IsProcessElevated))] public void TestOnPauseThenStop() { - var controller = new ServiceController(_testService.TestServiceName); - AssertExpectedProperties(controller); - string expected = -@"OnStart args= -OnPause -OnStop -"; + ServiceController controller = ConnectToServer(); + controller.Pause(); + Assert.Equal((int)PipeMessageByteCode.Pause, _testService.GetByte()); controller.WaitForStatus(ServiceControllerStatus.Paused); + controller.Stop(); + Assert.Equal((int)PipeMessageByteCode.Stop, _testService.GetByte()); controller.WaitForStatus(ServiceControllerStatus.Stopped); - Assert.Equal(expected, _testService.GetServiceOutput()); } [ConditionalFact(nameof(IsProcessElevated))] public void TestOnPauseAndContinueThenStop() { - var controller = new ServiceController(_testService.TestServiceName); - AssertExpectedProperties(controller); - string expected = -@"OnStart args= -OnPause -OnContinue -OnStop -"; + ServiceController controller = ConnectToServer(); + controller.Pause(); + Assert.Equal((int)PipeMessageByteCode.Pause, _testService.GetByte()); controller.WaitForStatus(ServiceControllerStatus.Paused); + controller.Continue(); + Assert.Equal((int)PipeMessageByteCode.Continue, _testService.GetByte()); controller.WaitForStatus(ServiceControllerStatus.Running); + controller.Stop(); + Assert.Equal((int)PipeMessageByteCode.Stop, _testService.GetByte()); controller.WaitForStatus(ServiceControllerStatus.Stopped); - Assert.Equal(expected, _testService.GetServiceOutput()); } [ConditionalFact(nameof(IsProcessElevated))] public void TestOnExecuteCustomCommand() { - var controller = new ServiceController(_testService.TestServiceName); - AssertExpectedProperties(controller); - string expected = -@"OnStart args= -OnCustomCommand command=128 -OnStop -"; + ServiceController controller = ConnectToServer(); + controller.ExecuteCommand(128); - controller.WaitForStatus(ServiceControllerStatus.Running); + Assert.Equal(128, _testService.GetByte()); + controller.Stop(); + Assert.Equal((int)PipeMessageByteCode.Stop, _testService.GetByte()); controller.WaitForStatus(ServiceControllerStatus.Stopped); - Assert.Equal(expected, _testService.GetServiceOutput()); } [ConditionalFact(nameof(IsProcessElevated))] public void TestOnContinueBeforePause() { - var controller = new ServiceController(_testService.TestServiceName); - AssertExpectedProperties(controller); - string expected = -@"OnStart args= -OnStop -"; + ServiceController controller = ConnectToServer(); + controller.Continue(); controller.WaitForStatus(ServiceControllerStatus.Running); + controller.Stop(); + Assert.Equal((int)PipeMessageByteCode.Stop, _testService.GetByte()); controller.WaitForStatus(ServiceControllerStatus.Stopped); - Assert.Equal(expected, _testService.GetServiceOutput()); } [ConditionalFact(nameof(IsElevatedAndSupportsEventLogs))] public void LogWritten() { - using (EventLog eventLog = new EventLog("Application")) - { - ServiceBase sb = new ServiceBase() { ServiceName = nameof(LogWritten) + Guid.NewGuid().ToString() }; - Assert.False(EventLog.SourceExists(sb.ServiceName)); - try - { - ServiceBase.Run(sb); - eventLog.Source = sb.ServiceName; - Assert.True(EventLog.SourceExists(sb.ServiceName)); - } - finally - { - sb.Stop(); - EventLog.DeleteEventSource(sb.ServiceName); - } - } + string serviceName = Guid.NewGuid().ToString(); + // The default username for installing the service is NT AUTHORITY\\LocalService which does not have access to EventLog. + // If the username is null, then the service is created under LocalSystem Account which have access to EventLog. + var testService = new TestServiceProvider(serviceName, userName: null); + Assert.True(EventLog.SourceExists(serviceName)); + testService.DeleteTestServices(); } [ConditionalFact(nameof(IsElevatedAndSupportsEventLogs))] public void LogWritten_AutoLog_False() { - using (EventLog eventLog = new EventLog("Application")) - { - ServiceBase sb = new ServiceBase() { ServiceName = nameof(LogWritten) + Guid.NewGuid().ToString(), AutoLog = false }; - Assert.False(EventLog.SourceExists(sb.ServiceName)); - try - { - ServiceBase.Run(sb); - Assert.False(EventLog.SourceExists(sb.ServiceName)); - } - finally - { - sb.Stop(); - } - } + string serviceName = nameof(LogWritten_AutoLog_False) + Guid.NewGuid().ToString(); + var testService = new TestServiceProvider(serviceName); + Assert.False(EventLog.SourceExists(serviceName)); + testService.DeleteTestServices(); + } + + [ConditionalFact(nameof(IsProcessElevated))] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Full Framework receives the Connected Byte Code after the Exception Thrown Byte Code")] + public void PropagateExceptionFromOnStart() + { + string serviceName = nameof(PropagateExceptionFromOnStart) + Guid.NewGuid().ToString(); + var testService = new TestServiceProvider(serviceName); + testService.Client.Connect(connectionTimeout); + Assert.Equal((int)PipeMessageByteCode.Connected, testService.GetByte()); + Assert.Equal((int)PipeMessageByteCode.ExceptionThrown, testService.GetByte()); + testService.DeleteTestServices(); + } + + private ServiceController ConnectToServer() + { + _testService.Client.Connect(connectionTimeout); + Assert.Equal((int)PipeMessageByteCode.Connected, _testService.GetByte()); + + ServiceController controller = new ServiceController(_testService.TestServiceName); + AssertExpectedProperties(controller); + return controller; } public void Dispose() diff --git a/external/corefx/src/System.ServiceProcess.ServiceController/tests/ServiceControllerTests.cs b/external/corefx/src/System.ServiceProcess.ServiceController/tests/ServiceControllerTests.cs index 11978dfe06..c39395cb40 100644 --- a/external/corefx/src/System.ServiceProcess.ServiceController/tests/ServiceControllerTests.cs +++ b/external/corefx/src/System.ServiceProcess.ServiceController/tests/ServiceControllerTests.cs @@ -2,10 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.Win32; -using System; -using System.Diagnostics; -using System.Security.Principal; using Xunit; namespace System.ServiceProcess.Tests @@ -13,6 +9,7 @@ namespace System.ServiceProcess.Tests [OuterLoop(/* Modifies machine state */)] public class ServiceControllerTests : IDisposable { + private const int connectionTimeout = 30000; private readonly TestServiceProvider _testService; private static readonly Lazy s_isElevated = new Lazy(() => AdminHelpers.IsProcessElevated()); @@ -76,27 +73,6 @@ namespace System.ServiceProcess.Tests Assert.True(controller.CanShutdown); } - [ConditionalFact(nameof(IsProcessElevated))] - public void StartWithArguments() - { - var controller = new ServiceController(_testService.TestServiceName); - controller.WaitForStatus(ServiceControllerStatus.Running, _testService.ControlTimeout); - Assert.Equal(ServiceControllerStatus.Running, controller.Status); - - controller.Stop(); - controller.WaitForStatus(ServiceControllerStatus.Stopped, _testService.ControlTimeout); - Assert.Equal(ServiceControllerStatus.Stopped, controller.Status); - - var args = new[] { "a", "b", "c", "d", "e" }; - controller.Start(args); - controller.WaitForStatus(ServiceControllerStatus.Running, _testService.ControlTimeout); - Assert.Equal(ServiceControllerStatus.Running, controller.Status); - - string argsOutput = _testService.GetServiceOutput().Trim(); - string argsInput = "OnStart args=" + string.Join(",", args); - Assert.Equal(argsInput, argsOutput); - } - [ConditionalFact(nameof(IsProcessElevated))] public void Start_NullArg_ThrowsArgumentNullException() { @@ -126,20 +102,32 @@ namespace System.ServiceProcess.Tests [ConditionalFact(nameof(IsProcessElevated))] public void PauseAndContinue() { - var controller = new ServiceController(_testService.TestServiceName); + string serviceName = _testService.TestServiceName; + var controller = new ServiceController(serviceName); + controller.WaitForStatus(ServiceControllerStatus.Running, _testService.ControlTimeout); Assert.Equal(ServiceControllerStatus.Running, controller.Status); + _testService.Client.Connect(connectionTimeout); + Assert.Equal((int)PipeMessageByteCode.Connected, _testService.GetByte()); + for (int i = 0; i < 2; i++) { controller.Pause(); + Assert.Equal((int)PipeMessageByteCode.Pause, _testService.GetByte()); controller.WaitForStatus(ServiceControllerStatus.Paused, _testService.ControlTimeout); Assert.Equal(ServiceControllerStatus.Paused, controller.Status); controller.Continue(); + Assert.Equal((int)PipeMessageByteCode.Continue, _testService.GetByte()); controller.WaitForStatus(ServiceControllerStatus.Running, _testService.ControlTimeout); Assert.Equal(ServiceControllerStatus.Running, controller.Status); } + + controller.Stop(); + Assert.Equal((int)PipeMessageByteCode.Stop, _testService.GetByte()); + controller.WaitForStatus(ServiceControllerStatus.Stopped, _testService.ControlTimeout); + Assert.Equal(ServiceControllerStatus.Stopped, controller.Status); } [ConditionalFact(nameof(IsProcessElevated))] diff --git a/external/corefx/src/System.ServiceProcess.ServiceController/tests/ServiceProcessDescriptionAttributeTests.cs b/external/corefx/src/System.ServiceProcess.ServiceController/tests/ServiceProcessDescriptionAttributeTests.cs new file mode 100644 index 0000000000..5e609da0a5 --- /dev/null +++ b/external/corefx/src/System.ServiceProcess.ServiceController/tests/ServiceProcessDescriptionAttributeTests.cs @@ -0,0 +1,23 @@ +// 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 Xunit; + +namespace System.ServiceProcess.Tests +{ + public class ServiceProcessDescriptionAttributeTests + { + public static TheoryData Ctor_Data => new TheoryData + { + { string.Empty }, + { null }, + { "hello" } + }; + + [Theory, + MemberData(nameof(Ctor_Data))] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void CtorAndGetDescription_test(string input) => Assert.Equal(input, new ServiceProcessDescriptionAttribute(input).Description); + } +} diff --git a/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/Helpers.cs b/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/Helpers.cs new file mode 100644 index 0000000000..aaf8042c19 --- /dev/null +++ b/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/Helpers.cs @@ -0,0 +1,17 @@ +// 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.ServiceProcess.Tests +{ + public enum PipeMessageByteCode + { + Start, + Continue, + Pause, + Stop, + OnCustomCommand, + ExceptionThrown, + Connected + }; +} diff --git a/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/Program.cs b/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/Program.cs index e812baca1f..81dcdcc1e0 100644 --- a/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/Program.cs +++ b/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/Program.cs @@ -2,11 +2,6 @@ // 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; -using System.Collections.Generic; -using System.IO; -using System.Text; - namespace System.ServiceProcess.Tests { public class Program @@ -15,8 +10,38 @@ namespace System.ServiceProcess.Tests { if (args.Length == 1 || args.Length == 2) { - TestService testService = new TestService(args[0]); - ServiceBase.Run(testService); + TestService testService; + if (args[0].StartsWith("PropagateExceptionFromOnStart")) + { + var expectedException = new InvalidOperationException("Fail on startup."); + testService = new TestService(args[0], expectedException); + try + { + ServiceBase.Run(testService); + } + catch (Exception actualException) + { + if (object.ReferenceEquals(expectedException, actualException)) + { + testService.WriteStreamAsync(PipeMessageByteCode.ExceptionThrown).Wait(); + } + else + { + throw actualException; + } + } + } + else if (args[0].StartsWith("LogWritten")) + { + testService = new TestService(args[0], throwException: null); + testService.AutoLog = false; + ServiceBase.Run(testService); + } + else + { + testService = new TestService(args[0]); + ServiceBase.Run(testService); + } return 0; } else if (args.Length == 3) diff --git a/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj b/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj index f9a346b6d3..62b33ff7f1 100644 --- a/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj +++ b/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj @@ -11,6 +11,7 @@ + @@ -46,6 +47,9 @@ Common\Interop\Windows\Interop.DeleteService.cs + + Common\System\Threading\Tasks\TaskTimeoutExtensions.cs + diff --git a/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/TestService.cs b/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/TestService.cs index 93445c4b09..c50f129e8e 100644 --- a/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/TestService.cs +++ b/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/TestService.cs @@ -2,22 +2,20 @@ // 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.ComponentModel; using System.Diagnostics; -using System; -using System.Collections; -using System.IO; -using System.Reflection; -using System.Threading; -using System.Text; -using System.Runtime.InteropServices; -using System.Globalization; +using System.IO.Pipes; +using System.Threading.Tasks; namespace System.ServiceProcess.Tests { public class TestService : ServiceBase { - public TestService(string serviceName) + private bool _disposed; + private Task _waitClientConnect; + private NamedPipeServerStream _serverStream; + private readonly Exception _exception; + + public TestService(string serviceName, Exception throwException = null) { this.ServiceName = serviceName; @@ -29,66 +27,100 @@ namespace System.ServiceProcess.Tests // We cannot easily test these so disable the events this.CanHandleSessionChangeEvent = false; this.CanHandlePowerEvent = false; - } + this._exception = throwException; - public static string GetLogPath(string serviceName) - { - return typeof(TestService).Assembly.Location + "." + serviceName + ".log"; + this._serverStream = new NamedPipeServerStream(serviceName); + _waitClientConnect = this._serverStream.WaitForConnectionAsync(); + _waitClientConnect.ContinueWith((t) => WriteStreamAsync(PipeMessageByteCode.Connected)); } protected override void OnContinue() { - WriteLog(nameof(OnContinue)); base.OnContinue(); + WriteStreamAsync(PipeMessageByteCode.Continue).Wait(); } protected override void OnCustomCommand(int command) { - WriteLog(nameof(OnCustomCommand) + " command=" + command); base.OnCustomCommand(command); + WriteStreamAsync(PipeMessageByteCode.OnCustomCommand, command).Wait(); } protected override void OnPause() { - WriteLog(nameof(OnPause)); base.OnPause(); + WriteStreamAsync(PipeMessageByteCode.Pause).Wait(); } protected override void OnSessionChange(SessionChangeDescription changeDescription) { - WriteLog(nameof(OnSessionChange) + " change=" + changeDescription.ToString()); base.OnSessionChange(changeDescription); } protected override bool OnPowerEvent(PowerBroadcastStatus powerStatus) { - WriteLog(nameof(OnPowerEvent) + " status=" + powerStatus.ToString()); return base.OnPowerEvent(powerStatus); } protected override void OnShutdown() { - WriteLog(nameof(OnShutdown)); base.OnShutdown(); } protected override void OnStart(string[] args) { - File.Delete(GetLogPath(ServiceName)); - - WriteLog(nameof(OnStart) + " args=" + string.Join(",", args)); base.OnStart(args); + if (_exception != null) + { + throw _exception; + } + + if (args.Length == 4 && args[0] == "StartWithArguments") + { + Debug.Assert(args[1] == "a"); + Debug.Assert(args[2] == "b"); + Debug.Assert(args[3] == "c"); + WriteStreamAsync(PipeMessageByteCode.Start).Wait(); + } } protected override void OnStop() { - WriteLog(nameof(OnStop)); base.OnStop(); + WriteStreamAsync(PipeMessageByteCode.Stop).Wait(); } - private void WriteLog(string msg) + public async Task WriteStreamAsync(PipeMessageByteCode code, int command = 0) { - File.AppendAllText(GetLogPath(ServiceName), msg + Environment.NewLine); + if (_waitClientConnect.IsCompleted) + { + Task writeCompleted; + const int WriteTimeout = 60000; + if (code == PipeMessageByteCode.OnCustomCommand) + { + writeCompleted = _serverStream.WriteAsync(new byte[] { (byte)command }, 0, 1); + } + else + { + writeCompleted = _serverStream.WriteAsync(new byte[] { (byte)code }, 0, 1); + } + await writeCompleted.TimeoutAfter(WriteTimeout).ConfigureAwait(false); + } + else + { + // We get here if the service is getting torn down before a client ever connected. + // some tests do this. + } + } + + protected override void Dispose(bool disposing) + { + if (!_disposed) + { + _serverStream.Dispose(); + _disposed = true; + base.Dispose(); + } } } } diff --git a/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/TestServiceInstaller.cs b/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/TestServiceInstaller.cs index 0f68314816..db9b3fe2eb 100644 --- a/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/TestServiceInstaller.cs +++ b/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/TestServiceInstaller.cs @@ -4,7 +4,6 @@ using System.ComponentModel; using System.Diagnostics; -using System.Threading; using System.Text; using System.Runtime.InteropServices; @@ -12,10 +11,6 @@ namespace System.ServiceProcess.Tests { public class TestServiceInstaller { - public const string LocalServiceName = "NT AUTHORITY\\LocalService"; - - private string _removalStack; - public TestServiceInstaller() { } @@ -41,11 +36,6 @@ namespace System.ServiceProcess.Tests string username = Username; string password = Password; - if (string.IsNullOrEmpty(username)) - { - username = LocalServiceName; - } - if (ServiceCommandLine == null) { string processName = Process.GetCurrentProcess().MainModule.FileName; @@ -94,7 +84,7 @@ namespace System.ServiceProcess.Tests ServiceCommandLine, null, IntPtr.Zero, servicesDependedOn, username, password); if (serviceHandle == IntPtr.Zero) - throw new Win32Exception(); + throw new Win32Exception("Cannot create service"); // A local variable in an unsafe method is already fixed -- so we don't need a "fixed { }" blocks to protect // across the p/invoke calls below. @@ -106,7 +96,7 @@ namespace System.ServiceProcess.Tests bool success = Interop.Advapi32.ChangeServiceConfig2(serviceHandle, Interop.Advapi32.ServiceConfigOptions.SERVICE_CONFIG_DESCRIPTION, ref serviceDesc); Marshal.FreeHGlobal(serviceDesc.description); if (!success) - throw new Win32Exception(); + throw new Win32Exception("Cannot set description"); } // Start the service after creating it @@ -115,7 +105,8 @@ namespace System.ServiceProcess.Tests if (svc.Status != ServiceControllerStatus.Running) { svc.Start(); - svc.WaitForStatus(ServiceControllerStatus.Running, TimeSpan.FromSeconds(30)); + if (!ServiceName.StartsWith("PropagateExceptionFromOnStart")) + svc.WaitForStatus(ServiceControllerStatus.Running, TimeSpan.FromSeconds(30)); } } } @@ -130,24 +121,30 @@ namespace System.ServiceProcess.Tests public void RemoveService() { - if (ServiceName == null) - throw new InvalidOperationException($"Already removed service at stack ${_removalStack}"); - - // Store the stack for logging in case we're called twice try { - throw new Exception(); + StopService(); } - catch (Exception e) + finally { - _removalStack = e.StackTrace; - } + // If the service didn't stop promptly, we will get a TimeoutException. + // This means the test service has gotten "jammed". + // Meantime we still want this service to get deleted, so we'll go ahead and call + // DeleteService, which will schedule it to get deleted on reboot. + // We won't catch the exception: we do want the test to fail. - // Stop the service + DeleteService(); + + ServiceName = null; + } + } + + private void StopService() + { using (ServiceController svc = new ServiceController(ServiceName)) { // The Service exists at this point, but OpenService is failing, possibly because its being invoked concurrently for another service. - // https://github.com/dotnet/corefx/issues/23388 + // https://github.com/dotnet/corefx/issues/23388 if (svc.Status != ServiceControllerStatus.Stopped) { try @@ -156,17 +153,26 @@ namespace System.ServiceProcess.Tests } catch (InvalidOperationException) { - ServiceName = null; + // Already stopped return; } - svc.WaitForStatus(ServiceControllerStatus.Stopped, TimeSpan.FromSeconds(30)); + // var sw = Stopwatch.StartNew(); + svc.WaitForStatus(ServiceControllerStatus.Stopped, TimeSpan.FromSeconds(120)); + // sw.Stop(); + // if (sw.Elapsed > TimeSpan.FromSeconds(30)) + // { + // Console.WriteLine($"Took unexpectedly long to stop a service: {sw.Elapsed.TotalSeconds}"); + // } } } + } + private void DeleteService() + { IntPtr serviceManagerHandle = Interop.Advapi32.OpenSCManager(null, null, Interop.Advapi32.ServiceControllerOptions.SC_MANAGER_ALL); if (serviceManagerHandle == IntPtr.Zero) - throw new Win32Exception(); + throw new Win32Exception("Could not open SCM"); IntPtr serviceHandle = IntPtr.Zero; try @@ -175,10 +181,10 @@ namespace System.ServiceProcess.Tests ServiceName, Interop.Advapi32.ServiceOptions.STANDARD_RIGHTS_DELETE); if (serviceHandle == IntPtr.Zero) - throw new Win32Exception(); + throw new Win32Exception($"Could not find service '{ServiceName}'"); if (!Interop.Advapi32.DeleteService(serviceHandle)) - throw new Win32Exception(); + throw new Win32Exception($"Could not delete service '{ServiceName}'"); } finally { @@ -187,8 +193,6 @@ namespace System.ServiceProcess.Tests Interop.Advapi32.CloseServiceHandle(serviceManagerHandle); } - - ServiceName = null; } } -} \ No newline at end of file +} diff --git a/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj b/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj index 52c5fd1475..6e5a4a4aa6 100644 --- a/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj +++ b/external/corefx/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj @@ -13,6 +13,7 @@ + diff --git a/external/corefx/src/System.ServiceProcess.ServiceController/tests/TestServiceProvider.cs b/external/corefx/src/System.ServiceProcess.ServiceController/tests/TestServiceProvider.cs index 47800befb6..696867fb5c 100644 --- a/external/corefx/src/System.ServiceProcess.ServiceController/tests/TestServiceProvider.cs +++ b/external/corefx/src/System.ServiceProcess.ServiceController/tests/TestServiceProvider.cs @@ -2,30 +2,53 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.Win32; -using System; using System.Diagnostics; +using System.IO.Pipes; using System.Security.Principal; -using Xunit; -using System.IO; -using System.Threading; +using System.Threading.Tasks; namespace System.ServiceProcess.Tests { internal sealed class TestServiceProvider { + private const int readTimeout = 60000; + public const string LocalServiceName = "NT AUTHORITY\\LocalService"; + private static readonly Lazy s_runningWithElevatedPrivileges = new Lazy( () => new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator)); + private NamedPipeClientStream _client; + public static bool RunningWithElevatedPrivileges { get { return s_runningWithElevatedPrivileges.Value; } } + public NamedPipeClientStream Client + { + get + { + if (_client == null) + { + _client = new NamedPipeClientStream(".", TestServiceName, PipeDirection.In); + } + return _client; + } + set + { + if (value == null) + { + _client.Dispose(); + _client = null; + } + } + } + public readonly string TestServiceAssembly = typeof(TestService).Assembly.Location; public readonly string TestMachineName; public readonly TimeSpan ControlTimeout; public readonly string TestServiceName; + public readonly string Username; public readonly string TestServiceDisplayName; private readonly TestServiceProvider _dependentServices; @@ -42,23 +65,37 @@ namespace System.ServiceProcess.Tests CreateTestServices(); } - public TestServiceProvider(string serviceName) + public TestServiceProvider(string serviceName, string userName = LocalServiceName) { TestMachineName = "."; ControlTimeout = TimeSpan.FromSeconds(120); TestServiceName = serviceName; TestServiceDisplayName = "Test Service " + TestServiceName; + Username = userName; // Create the service CreateTestServices(); } + public async Task ReadPipeAsync() + { + Task readTask; + byte[] received = new byte[] { 0 }; + readTask = Client.ReadAsync(received, 0, 1); + await readTask.TimeoutAfter(readTimeout).ConfigureAwait(false); + return received[0]; + } + + public byte GetByte() => ReadPipeAsync().Result; + private void CreateTestServices() { TestServiceInstaller testServiceInstaller = new TestServiceInstaller(); testServiceInstaller.ServiceName = TestServiceName; testServiceInstaller.DisplayName = TestServiceDisplayName; + testServiceInstaller.Description = "__Dummy Test Service__"; + testServiceInstaller.Username = Username; if (_dependentServices != null) { @@ -90,22 +127,15 @@ namespace System.ServiceProcess.Tests { try { + if (_client != null) + { + _client.Dispose(); + _client = null; + } + TestServiceInstaller testServiceInstaller = new TestServiceInstaller(); testServiceInstaller.ServiceName = TestServiceName; testServiceInstaller.RemoveService(); - - if (File.Exists(LogPath)) - { - try - { - File.Delete(LogPath); - } - catch (IOException) - { - // Don't fail simply because the service was not fully cleaned up - // and is still holding a handle to the log file - } - } } finally { @@ -117,16 +147,5 @@ namespace System.ServiceProcess.Tests } } } - - private string LogPath => TestService.GetLogPath(TestServiceName); - - public string GetServiceOutput() - { - // Need to open with FileShare.ReadWrite because we expect the service still has it open for write - using (StreamReader reader = new StreamReader(File.Open(LogPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))) - { - return reader.ReadToEnd(); - } - } } } diff --git a/external/corefx/src/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.cs b/external/corefx/src/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.cs index 71c444cab2..44737d78f9 100644 --- a/external/corefx/src/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.cs +++ b/external/corefx/src/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.cs @@ -5,12 +5,13 @@ // Changes to this file must follow the http://aka.ms/api-review process. // ------------------------------------------------------------------------------ - namespace System.Text { - public sealed partial class CodePagesEncodingProvider + public sealed partial class CodePagesEncodingProvider : System.Text.EncodingProvider { internal CodePagesEncodingProvider() { } public static System.Text.EncodingProvider Instance { get { throw null; } } + public override System.Text.Encoding GetEncoding(int codepage) { throw null; } + public override System.Text.Encoding GetEncoding(string name) { throw null; } } } diff --git a/external/corefx/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj b/external/corefx/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj index fdc22bcfb6..adf7d65acd 100644 --- a/external/corefx/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj +++ b/external/corefx/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj @@ -73,6 +73,7 @@ + diff --git a/external/corefx/src/System.Text.Encoding.CodePages/src/System/Text/BaseCodePageEncoding.cs b/external/corefx/src/System.Text.Encoding.CodePages/src/System/Text/BaseCodePageEncoding.cs index 4954da4d77..7d9b86571a 100644 --- a/external/corefx/src/System.Text.Encoding.CodePages/src/System/Text/BaseCodePageEncoding.cs +++ b/external/corefx/src/System.Text.Encoding.CodePages/src/System/Text/BaseCodePageEncoding.cs @@ -82,7 +82,7 @@ namespace System.Text throw new PlatformNotSupportedException(); } - // Just a helper as we cannot use 'this' when calling 'base(...)' + // Just a helper as we cannot use 'this' when calling 'base(...)' private void SetFallbackEncoding() { (EncoderFallback as InternalEncoderBestFitFallback).encoding = this; @@ -330,8 +330,8 @@ namespace System.Text return arrayBytesBestFit; } - // During the AppDomain shutdown the Encoding class may have already finalized, making the memory section - // invalid. We detect that by validating the memory section handle then re-initializing the memory + // During the AppDomain shutdown the Encoding class may have already finalized, making the memory section + // invalid. We detect that by validating the memory section handle then re-initializing the memory // section by calling LoadManagedCodePage() method and eventually the mapped file handle and // the memory section pointer will get finalized one more time. internal unsafe void CheckMemorySection() diff --git a/external/corefx/src/System.Text.Encoding.CodePages/src/System/Text/DBCSCodePageEncoding.cs b/external/corefx/src/System.Text.Encoding.CodePages/src/System/Text/DBCSCodePageEncoding.cs index 03a37da0f0..f690a85b99 100644 --- a/external/corefx/src/System.Text.Encoding.CodePages/src/System/Text/DBCSCodePageEncoding.cs +++ b/external/corefx/src/System.Text.Encoding.CodePages/src/System/Text/DBCSCodePageEncoding.cs @@ -8,6 +8,7 @@ using System.Diagnostics; using System.Text; using System.Threading; using System.Security; +using System.Runtime.CompilerServices; namespace System.Text { @@ -106,7 +107,9 @@ namespace System.Text // Get our mapped section (bytes to allocate = 2 bytes per 65536 Unicode chars + 2 bytes per 65536 DBCS chars) // Plus 4 byte to remember CP # when done loading it. (Don't want to get IA64 or anything out of alignment) - byte* pNativeMemory = GetNativeMemory(65536 * 2 * 2 + 4 + iExtraBytes); + int sizeToAllocate = 65536 * 2 * 2 + 4 + iExtraBytes; + byte* pNativeMemory = GetNativeMemory(sizeToAllocate); + Unsafe.InitBlockUnaligned(pNativeMemory, 0, (uint)sizeToAllocate); mapBytesToUnicode = (char*)pNativeMemory; mapUnicodeToBytes = (ushort*)(pNativeMemory + 65536 * 2); diff --git a/external/corefx/src/System.Text.Encoding.CodePages/src/System/Text/SBCSCodePageEncoding.cs b/external/corefx/src/System.Text.Encoding.CodePages/src/System/Text/SBCSCodePageEncoding.cs index 981782fbbb..36adf22a86 100644 --- a/external/corefx/src/System.Text.Encoding.CodePages/src/System/Text/SBCSCodePageEncoding.cs +++ b/external/corefx/src/System.Text.Encoding.CodePages/src/System/Text/SBCSCodePageEncoding.cs @@ -9,6 +9,7 @@ using System.Text; using System.Threading; using System.Globalization; using System.Security; +using System.Runtime.CompilerServices; namespace System.Text { @@ -33,28 +34,6 @@ namespace System.Text { } - // Method assumes that memory pointer is aligned - private static unsafe void ZeroMemAligned(byte* buffer, int count) - { - long* pLong = (long*)buffer; - long* pLongEnd = (long*)(buffer + count - sizeof(long)); - - while (pLong < pLongEnd) - { - *pLong = 0; - pLong++; - } - - byte* pByte = (byte*)pLong; - byte* pEnd = buffer + count; - - while (pByte < pEnd) - { - *pByte = 0; - pByte++; - } - } - // We have a managed code page entry, so load our tables // SBCS data section looks like: // @@ -93,7 +72,7 @@ namespace System.Text const int CodePageNumberSize = 4; int bytesToAllocate = UnicodeToBytesMappingSize + BytesToUnicodeMappingSize + CodePageNumberSize + iExtraBytes; byte* pNativeMemory = GetNativeMemory(bytesToAllocate); - ZeroMemAligned(pNativeMemory, bytesToAllocate); + Unsafe.InitBlockUnaligned(pNativeMemory, 0, (uint)bytesToAllocate); char* mapBytesToUnicode = (char*)pNativeMemory; byte* mapUnicodeToBytes = (byte*)(pNativeMemory + 256 * 2); @@ -131,7 +110,7 @@ namespace System.Text } } } - + _mapBytesToUnicode = mapBytesToUnicode; _mapUnicodeToBytes = mapUnicodeToBytes; } diff --git a/external/corefx/src/System.Text.Encoding/tests/Decoder/DecoderSpanTests.netcoreapp.cs b/external/corefx/src/System.Text.Encoding/tests/Decoder/DecoderSpanTests.netcoreapp.cs index 1f51d02a57..4a2e3d5c7e 100644 --- a/external/corefx/src/System.Text.Encoding/tests/Decoder/DecoderSpanTests.netcoreapp.cs +++ b/external/corefx/src/System.Text.Encoding/tests/Decoder/DecoderSpanTests.netcoreapp.cs @@ -26,7 +26,7 @@ namespace System.Text.Encodings.Tests byte[] textBytes = e.GetBytes(TextString); char[] chars = new char[TextString.Length]; - Assert.Equal(chars.Length, e.GetDecoder().GetChars(textBytes.AsReadOnlySpan(), chars.AsSpan(), flush: true)); + Assert.Equal(chars.Length, e.GetDecoder().GetChars(textBytes, chars.AsSpan(), flush: true)); Assert.Equal(TextString, new string(chars)); } @@ -40,7 +40,7 @@ namespace System.Text.Encodings.Tests char[] chars; chars = new char[TextString.Length]; - decoder.Convert(textBytes.AsSpan(), chars.AsSpan().Slice(0, 2), true, out int bytesUsed, out int charsUsed, out bool completed); + decoder.Convert(textBytes.AsSpan(), chars.AsSpan(0, 2), true, out int bytesUsed, out int charsUsed, out bool completed); Assert.Equal("he", new string(chars, 0, 2)); Assert.Equal(2, bytesUsed); Assert.Equal(2, charsUsed); diff --git a/external/corefx/src/System.Text.Encoding/tests/Encoder/EncoderSpanTests.netcoreapp.cs b/external/corefx/src/System.Text.Encoding/tests/Encoder/EncoderSpanTests.netcoreapp.cs index e6c81c47fc..105c864115 100644 --- a/external/corefx/src/System.Text.Encoding/tests/Encoder/EncoderSpanTests.netcoreapp.cs +++ b/external/corefx/src/System.Text.Encoding/tests/Encoder/EncoderSpanTests.netcoreapp.cs @@ -13,7 +13,7 @@ namespace System.Text.Encodings.Tests { const string TextString = "hello world"; Encoding e = Encoding.UTF8; - Assert.Equal(e.GetByteCount(TextString), e.GetEncoder().GetByteCount(TextString.AsReadOnlySpan(), flush: true)); + Assert.Equal(e.GetByteCount(TextString), e.GetEncoder().GetByteCount(TextString.AsSpan(), flush: true)); } [Fact] @@ -23,7 +23,7 @@ namespace System.Text.Encodings.Tests Encoding e = Encoding.UTF8; byte[] bytes = new byte[e.GetByteCount(TextString)]; - Assert.Equal(bytes.Length, e.GetEncoder().GetBytes(TextString.AsReadOnlySpan(), bytes, flush: true)); + Assert.Equal(bytes.Length, e.GetEncoder().GetBytes(TextString.AsSpan(), bytes, flush: true)); Assert.Equal(e.GetBytes(TextString), bytes); } @@ -36,14 +36,14 @@ namespace System.Text.Encodings.Tests byte[] bytes; bytes = new byte[encoding.GetByteCount(TextString)]; - encoder.Convert(TextString.AsReadOnlySpan(), bytes.AsSpan().Slice(0, 2), true, out int charsUsed, out int bytesUsed, out bool completed); - Assert.Equal(encoding.GetBytes(TextString).AsSpan().Slice(0, 2).ToArray(), bytes.AsSpan().Slice(0, 2).ToArray()); + encoder.Convert(TextString.AsSpan(), bytes.AsSpan(0, 2), true, out int charsUsed, out int bytesUsed, out bool completed); + Assert.Equal(encoding.GetBytes(TextString).AsSpan(0, 2).ToArray(), bytes.AsSpan(0, 2).ToArray()); Assert.Equal(2, charsUsed); Assert.Equal(2, bytesUsed); Assert.False(completed); bytes = new byte[encoding.GetByteCount(TextString)]; - encoder.Convert(TextString.AsReadOnlySpan(), bytes, true, out charsUsed, out bytesUsed, out completed); + encoder.Convert(TextString.AsSpan(), bytes, true, out charsUsed, out bytesUsed, out completed); Assert.Equal(encoding.GetBytes(TextString), bytes); Assert.Equal(TextString.Length, charsUsed); Assert.Equal(bytes.Length, bytesUsed); diff --git a/external/corefx/src/System.Text.Encoding/tests/Encoding/EncodingGetEncodingTests.cs b/external/corefx/src/System.Text.Encoding/tests/Encoding/EncodingGetEncodingTests.cs index cf5475b76c..2713ff6545 100644 --- a/external/corefx/src/System.Text.Encoding/tests/Encoding/EncodingGetEncodingTests.cs +++ b/external/corefx/src/System.Text.Encoding/tests/Encoding/EncodingGetEncodingTests.cs @@ -2,12 +2,13 @@ // 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.Globalization; using Xunit; namespace System.Text.Tests { - public class EncodingGetEncodingTest + public class EncodingGetEncodingTest : RemoteExecutorTestBase { [Fact] public void GetEncoding_String_Invalid() @@ -99,10 +100,10 @@ namespace System.Text.Tests [Fact] public void GetEncoding_EncodingName() { - CultureInfo originalUICulture = CultureInfo.CurrentUICulture; - try + // Workaround issue: UWP culture is process wide + RemoteInvoke(() => { - CultureInfo.CurrentCulture = new CultureInfo("en-US"); + CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture; foreach (var map in s_mapping) { @@ -115,11 +116,7 @@ namespace System.Text.Tests Assert.All(name, ch => Assert.InRange(ch, 0, 127)); } - } - finally - { - CultureInfo.CurrentUICulture = originalUICulture; - } + }).Dispose(); } [Fact] diff --git a/external/corefx/src/System.Text.Encoding/tests/EncodingTestHelpers.netcoreapp.cs b/external/corefx/src/System.Text.Encoding/tests/EncodingTestHelpers.netcoreapp.cs index f82e81ae46..470baace3e 100644 --- a/external/corefx/src/System.Text.Encoding/tests/EncodingTestHelpers.netcoreapp.cs +++ b/external/corefx/src/System.Text.Encoding/tests/EncodingTestHelpers.netcoreapp.cs @@ -14,7 +14,10 @@ namespace System.Text.Tests Assert.Equal(expected, encoding.GetByteCount(chars, index, count)); // Use GetByteCount(ReadOnlySpan chars) - Assert.Equal(expected, encoding.GetByteCount(chars.AsReadOnlySpan().Slice(index, count))); + Assert.Equal(expected, encoding.GetByteCount(chars.AsSpan(index, count))); + + if (count == 0) + Assert.Equal(expected, encoding.GetByteCount(ReadOnlySpan.Empty)); } static partial void GetBytes_NetCoreApp(Encoding encoding, string chars, int index, int count, byte[] expected) @@ -25,14 +28,20 @@ namespace System.Text.Tests // Use GetBytes(ReadOnlySpan, Span) Array.Clear(stringResultAdvanced, 0, stringResultAdvanced.Length); - Assert.Equal(expected.Length, encoding.GetBytes(chars.AsReadOnlySpan().Slice(index, count), (Span)stringResultAdvanced)); + Assert.Equal(expected.Length, encoding.GetBytes(chars.AsSpan(index, count), (Span)stringResultAdvanced)); VerifyGetBytes(stringResultAdvanced, 0, stringResultAdvanced.Length, new byte[expected.Length], expected); + + if (count == 0) + Assert.Equal(expected.Length, encoding.GetBytes(ReadOnlySpan.Empty, (Span)stringResultAdvanced)); } static partial void GetCharCount_NetCoreApp(Encoding encoding, byte[] bytes, int index, int count, int expected) { // Use GetCharCount(ReadOnlySpan) Assert.Equal(expected, encoding.GetCharCount(new ReadOnlySpan(bytes, index, count))); + + if (count == 0) + Assert.Equal(expected, encoding.GetCharCount(ReadOnlySpan.Empty)); } static partial void VerifyGetChars_NetCoreApp(Encoding encoding, byte[] bytes, int byteIndex, int byteCount, char[] chars, int charIndex, char[] expectedChars) @@ -42,12 +51,21 @@ namespace System.Text.Tests int charCount = encoding.GetChars(new ReadOnlySpan(bytes, byteIndex, byteCount), new Span(byteChars).Slice(charIndex)); VerifyGetChars(byteChars, charIndex, charCount, (char[])chars.Clone(), expectedChars); Assert.Equal(expectedChars.Length, charCount); + + if (byteCount == 0) + { + charCount = encoding.GetChars(ReadOnlySpan.Empty, new Span(byteChars).Slice(charIndex)); + Assert.Equal(expectedChars.Length, charCount); + } } static partial void GetString_NetCoreApp(Encoding encoding, byte[] bytes, int index, int count, string expected) { // Use GetString(ReadOnlySpan) Assert.Equal(expected, encoding.GetString(new ReadOnlySpan(bytes, index, count))); + + if (count == 0) + Assert.Equal(expected, encoding.GetString(ReadOnlySpan.Empty)); } } } diff --git a/external/corefx/src/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj b/external/corefx/src/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj index f9f3aed6ae..ecea2a8a2c 100644 --- a/external/corefx/src/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj +++ b/external/corefx/src/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj @@ -81,5 +81,11 @@ + + + {69e46a6f-9966-45a5-8945-2559fe337827} + RemoteExecutorConsoleApp + + \ No newline at end of file diff --git a/external/corefx/src/System.Text.Encoding/tests/UTF8Encoding/UTF8EncodingDecode.cs b/external/corefx/src/System.Text.Encoding/tests/UTF8Encoding/UTF8EncodingDecode.cs index 78a5f4da6f..618858cbc5 100644 --- a/external/corefx/src/System.Text.Encoding/tests/UTF8Encoding/UTF8EncodingDecode.cs +++ b/external/corefx/src/System.Text.Encoding/tests/UTF8Encoding/UTF8EncodingDecode.cs @@ -103,7 +103,6 @@ namespace System.Text.Tests [Theory] [MemberData(nameof(Decode_TestData))] - [ActiveIssue("https://github.com/dotnet/corefx/issues/20525", TargetFrameworkMonikers.UapAot)] public void Decode(byte[] bytes, int index, int count, string expected) { EncodingHelpers.Decode(new UTF8Encoding(true, false), bytes, index, count, expected); diff --git a/external/corefx/src/System.Text.Encoding/tests/UnicodeEncoding/UnicodeEncodingDecode.cs b/external/corefx/src/System.Text.Encoding/tests/UnicodeEncoding/UnicodeEncodingDecode.cs index cbded91274..a057429ba2 100644 --- a/external/corefx/src/System.Text.Encoding/tests/UnicodeEncoding/UnicodeEncodingDecode.cs +++ b/external/corefx/src/System.Text.Encoding/tests/UnicodeEncoding/UnicodeEncodingDecode.cs @@ -73,7 +73,6 @@ namespace System.Text.Tests [Theory] [MemberData(nameof(Decode_TestData))] - [ActiveIssue("https://github.com/dotnet/corefx/issues/20525", TargetFrameworkMonikers.UapAot)] public void Decode(byte[] littleEndianBytes, int index, int count, string expected) { byte[] bigEndianBytes = GetBigEndianBytes(littleEndianBytes, index, count); diff --git a/external/corefx/src/System.Text.RegularExpressions/System.Text.RegularExpressions.sln b/external/corefx/src/System.Text.RegularExpressions/System.Text.RegularExpressions.sln index 2680b4879d..aff3ca264e 100644 --- a/external/corefx/src/System.Text.RegularExpressions/System.Text.RegularExpressions.sln +++ b/external/corefx/src/System.Text.RegularExpressions/System.Text.RegularExpressions.sln @@ -7,6 +7,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.RegularExpressi {2C58640B-5BED-4E83-9554-CD2B9762643F} = {2C58640B-5BED-4E83-9554-CD2B9762643F} EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.RegularExpressions.Performance.Tests", "tests\Performance\System.Text.RegularExpressions.Performance.Tests.csproj", "{7f4b8c48-8692-4885-bf84-feb7ea82e34b}" + ProjectSection(ProjectDependencies) = postProject + {2C58640B-5BED-4E83-9554-CD2B9762643F} = {2C58640B-5BED-4E83-9554-CD2B9762643F} + EndProjectSection +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.RegularExpressions", "src\System.Text.RegularExpressions.csproj", "{2C58640B-5BED-4E83-9554-CD2B9762643F}" ProjectSection(ProjectDependencies) = postProject {B262B15E-13E6-4C1E-A25E-16D06E222A09} = {B262B15E-13E6-4C1E-A25E-16D06E222A09} @@ -30,6 +35,10 @@ Global {94B106C2-D574-4392-80AB-3EE308A078DF}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {94B106C2-D574-4392-80AB-3EE308A078DF}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU {94B106C2-D574-4392-80AB-3EE308A078DF}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU + {7f4b8c48-8692-4885-bf84-feb7ea82e34b}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {7f4b8c48-8692-4885-bf84-feb7ea82e34b}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {7f4b8c48-8692-4885-bf84-feb7ea82e34b}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {7f4b8c48-8692-4885-bf84-feb7ea82e34b}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {2C58640B-5BED-4E83-9554-CD2B9762643F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {2C58640B-5BED-4E83-9554-CD2B9762643F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {2C58640B-5BED-4E83-9554-CD2B9762643F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU @@ -44,6 +53,7 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {94B106C2-D574-4392-80AB-3EE308A078DF} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} + {7f4b8c48-8692-4885-bf84-feb7ea82e34b} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} {2C58640B-5BED-4E83-9554-CD2B9762643F} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD} {B262B15E-13E6-4C1E-A25E-16D06E222A09} = {2E666815-2EDB-464B-9DF6-380BF4789AD4} EndGlobalSection diff --git a/external/corefx/src/System.Text.RegularExpressions/src/MatchingRefApiCompatBaseline.txt b/external/corefx/src/System.Text.RegularExpressions/src/MatchingRefApiCompatBaseline.txt new file mode 100644 index 0000000000..43f5db97fe --- /dev/null +++ b/external/corefx/src/System.Text.RegularExpressions/src/MatchingRefApiCompatBaseline.txt @@ -0,0 +1,2 @@ +# API is only for Debug purposes +MembersMustExist : Member 'System.Text.RegularExpressions.RegexOptions System.Text.RegularExpressions.RegexOptions.Debug' does not exist in the implementation but it does exist in the contract. diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj b/external/corefx/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj index 8b3d02dd91..f0ae7d1659 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj +++ b/external/corefx/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj @@ -5,42 +5,54 @@ {2C58640B-5BED-4E83-9554-CD2B9762643F} System.Text.RegularExpressions $(DefineConstants);FEATURE_COMPILED + true - + + + + + + + + + + + + + + + - - - - - - - + + - Common\System\NotImplemented.cs - - Common\System\IO\StringBuilderCache.cs + + Common\System\Text\StringBuilderCache.cs + + + Common\System\Collections\Generic\ValueListBuilder.cs @@ -51,9 +63,11 @@ + + @@ -66,4 +80,4 @@ - \ No newline at end of file + diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Collections/Generic/ValueListBuilder.Pop.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Collections/Generic/ValueListBuilder.Pop.cs new file mode 100644 index 0000000000..18075c0261 --- /dev/null +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Collections/Generic/ValueListBuilder.Pop.cs @@ -0,0 +1,21 @@ +// 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.Runtime.CompilerServices; + +namespace System.Collections.Generic +{ + /// + /// These public methods are required by RegexWriter. + /// + internal ref partial struct ValueListBuilder + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public T Pop() + { + _pos--; + return _span[_pos]; + } + } +} diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/HashtableExtensions.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Collections/HashtableExtensions.cs similarity index 84% rename from external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/HashtableExtensions.cs rename to external/corefx/src/System.Text.RegularExpressions/src/System/Collections/HashtableExtensions.cs index f86c9b8076..c2ad00b428 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/HashtableExtensions.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Collections/HashtableExtensions.cs @@ -2,9 +2,7 @@ // 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.Collections; - -namespace System.Text.RegularExpressions +namespace System.Collections { internal static class HashtableExtensions { @@ -15,7 +13,7 @@ namespace System.Text.RegularExpressions value = (T)table[key]; return true; } - value = default(T); + value = default; return false; } } diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Capture.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Capture.cs new file mode 100644 index 0000000000..6c5610b02c --- /dev/null +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Capture.cs @@ -0,0 +1,61 @@ +// 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. + +// Capture is just a location/length pair that indicates the +// location of a regular expression match. A single regexp +// search may return multiple Capture within each capturing +// RegexGroup. + +namespace System.Text.RegularExpressions +{ + /// + /// Represents the results from a single subexpression capture. The object represents + /// one substring for a single successful capture. + /// + public class Capture + { + internal Capture(string text, int index, int length) + { + Text = text; + Index = index; + Length = length; + } + + /// + /// Returns the position in the original string where the first character of + /// captured substring was found. + /// + public int Index { get; private protected set; } + + /// + /// Returns the length of the captured substring. + /// + public int Length { get; private protected set; } + + /// + /// The original string + /// + internal string Text { get; private protected set; } + + /// + /// Returns the value of this Regex Capture. + /// + public string Value => Text.Substring(Index, Length); + + /// + /// Returns the substring that was matched. + /// + public override string ToString() => Value; + + /// + /// The substring to the left of the capture + /// + internal ReadOnlySpan GetLeftSubstring() => Text.AsSpan(0, Index); + + /// + /// The substring to the right of the capture + /// + internal ReadOnlySpan GetRightSubstring() => Text.AsSpan(Index + Length, Text.Length - Index - Length); + } +} diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCaptureCollection.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/CaptureCollection.cs similarity index 92% rename from external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCaptureCollection.cs rename to external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/CaptureCollection.cs index b4bf1d0101..0c738317dc 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCaptureCollection.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/CaptureCollection.cs @@ -21,8 +21,10 @@ namespace System.Text.RegularExpressions /// to return the set of captures done by a single capturing group. /// [DebuggerDisplay("Count = {Count}")] - [DebuggerTypeProxy(typeof(RegexCollectionDebuggerProxy))] +#if !MONO [Serializable] +#endif + [DebuggerTypeProxy(typeof(CollectionDebuggerProxy))] public class CaptureCollection : IList, IReadOnlyList, IList { private readonly Group _group; @@ -68,16 +70,24 @@ namespace System.Text.RegularExpressions // first time a capture is accessed, compute them all if (_captures == null) { - _captures = new Capture[_capcount]; - for (int j = 0; j < _capcount - 1; j++) - { - _captures[j] = new Capture(_group._text, _group._caps[j * 2], _group._caps[j * 2 + 1]); - } + ForceInitialized(); } return _captures[i]; } + /// + /// Compute all captures + /// + internal void ForceInitialized() + { + _captures = new Capture[_capcount]; + for (int j = 0; j < _capcount - 1; j++) + { + _captures[j] = new Capture(_group.Text, _group._caps[j * 2], _group._caps[j * 2 + 1]); + } + } + public bool IsSynchronized => false; public object SyncRoot => _group; @@ -110,12 +120,14 @@ namespace System.Text.RegularExpressions int IList.IndexOf(Capture item) { - var comparer = EqualityComparer.Default; for (int i = 0; i < Count; i++) { - if (comparer.Equals(this[i], item)) + if (EqualityComparer.Default.Equals(this[i], item)) + { return i; + } } + return -1; } diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCollectionDebuggerProxy.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/CollectionDebuggerProxy.cs similarity index 65% rename from external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCollectionDebuggerProxy.cs rename to external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/CollectionDebuggerProxy.cs index 5caea8d58f..e8ef9dc896 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCollectionDebuggerProxy.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/CollectionDebuggerProxy.cs @@ -7,16 +7,13 @@ using System.Diagnostics; namespace System.Text.RegularExpressions { - internal sealed class RegexCollectionDebuggerProxy + internal sealed class CollectionDebuggerProxy { private readonly ICollection _collection; - public RegexCollectionDebuggerProxy(ICollection collection) + public CollectionDebuggerProxy(ICollection collection) { - if (collection == null) - throw new ArgumentNullException(nameof(collection)); - - _collection = collection; + _collection = collection ?? throw new ArgumentNullException(nameof(collection)); } [DebuggerBrowsable(DebuggerBrowsableState.RootHidden)] @@ -24,7 +21,7 @@ namespace System.Text.RegularExpressions { get { - T[] items = new T[_collection.Count]; + var items = new T[_collection.Count]; _collection.CopyTo(items, 0); return items; } diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/CompiledRegexRunner.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/CompiledRegexRunner.cs index 2ae5caf18d..2d2bd2fc6a 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/CompiledRegexRunner.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/CompiledRegexRunner.cs @@ -10,9 +10,9 @@ namespace System.Text.RegularExpressions private Func _findFirstCharMethod; private Action _initTrackCountMethod; - internal CompiledRegexRunner() { } + public CompiledRegexRunner() { } - internal void SetDelegates(Action go, Func firstChar, Action trackCount) + public void SetDelegates(Action go, Func firstChar, Action trackCount) { _goMethod = go; _findFirstCharMethod = firstChar; diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/CompiledRegexRunnerFactory.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/CompiledRegexRunnerFactory.cs index 1f81283199..8b7a9f1fbc 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/CompiledRegexRunnerFactory.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/CompiledRegexRunnerFactory.cs @@ -2,6 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +// This is the only concrete implementation of RegexRunnerFactory, +// but we cannot combine them due to RegexRunnerFactory having shipped public. + using System.Reflection.Emit; namespace System.Text.RegularExpressions @@ -12,7 +15,7 @@ namespace System.Text.RegularExpressions private readonly DynamicMethod _findFirstCharMethod; private readonly DynamicMethod _initTrackCountMethod; - internal CompiledRegexRunnerFactory(DynamicMethod go, DynamicMethod firstChar, DynamicMethod trackCount) + public CompiledRegexRunnerFactory(DynamicMethod go, DynamicMethod firstChar, DynamicMethod trackCount) { _goMethod = go; _findFirstCharMethod = firstChar; diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexGroup.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Group.cs similarity index 75% rename from external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexGroup.cs rename to external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Group.cs index b84359e472..4f441ffadc 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexGroup.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Group.cs @@ -16,46 +16,28 @@ namespace System.Text.RegularExpressions [Serializable] public class Group : Capture { - // the empty group object internal static readonly Group s_emptyGroup = new Group(string.Empty, Array.Empty(), 0, string.Empty); internal readonly int[] _caps; internal int _capcount; internal CaptureCollection _capcoll; - internal readonly string _name; internal Group(string text, int[] caps, int capcount, string name) - - : base(text, capcount == 0 ? 0 : caps[(capcount - 1) * 2], + : base(text, capcount == 0 ? 0 : caps[(capcount - 1) * 2], capcount == 0 ? 0 : caps[(capcount * 2) - 1]) { _caps = caps; _capcount = capcount; - _name = name; + Name = name; } /// /// Indicates whether the match is successful. /// - public bool Success - { - get - { - return _capcount != 0; - } - } + public bool Success => _capcount != 0; - public string Name - { - get - { - return _name; - } - } + public string Name { get; } - /* - * The collection of all captures for this group - */ /// /// Returns a collection of all the captures matched by the capturing /// group, in innermost-leftmost-first order (or innermost-rightmost-first order if @@ -72,9 +54,6 @@ namespace System.Text.RegularExpressions } } - /* - * Convert to a thread-safe object by precomputing cache contents - */ /// /// Returns a Group object equivalent to the one supplied that is safe to share between /// multiple threads. @@ -85,14 +64,11 @@ namespace System.Text.RegularExpressions throw new ArgumentNullException(nameof(inner)); // force Captures to be computed. - - CaptureCollection capcoll; - Capture dummy; - - capcoll = inner.Captures; - - if (inner._capcount > 0) - dummy = capcoll[0]; + CaptureCollection capcoll = inner.Captures; + if (inner.Success) + { + capcoll.ForceInitialized(); + } return inner; } diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexGroupCollection.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/GroupCollection.cs similarity index 96% rename from external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexGroupCollection.cs rename to external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/GroupCollection.cs index bb68ae3bc1..51ae057a4e 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexGroupCollection.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/GroupCollection.cs @@ -16,8 +16,10 @@ namespace System.Text.RegularExpressions /// to return the set of captures done by a single capturing group. /// [DebuggerDisplay("Count = {Count}")] - [DebuggerTypeProxy(typeof(RegexCollectionDebuggerProxy))] +#if MONO [Serializable] +#endif + [DebuggerTypeProxy(typeof(CollectionDebuggerProxy))] public class GroupCollection : IList, IReadOnlyList, IList { private readonly Match _match; @@ -56,8 +58,7 @@ namespace System.Text.RegularExpressions { if (_captureMap != null) { - int groupNumImpl; - if (_captureMap.TryGetValue(groupnum, out groupNumImpl)) + if (_captureMap.TryGetValue(groupnum, out int groupNumImpl)) { return GetGroupImpl(groupNumImpl); } @@ -86,7 +87,7 @@ namespace System.Text.RegularExpressions for (int i = 0; i < _groups.Length; i++) { string groupname = _match._regex.GroupNameFromNumber(i + 1); - _groups[i] = new Group(_match._text, _match._matches[i + 1], _match._matchcount[i + 1], groupname); + _groups[i] = new Group(_match.Text, _match._matches[i + 1], _match._matchcount[i + 1], groupname); } } diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexMatch.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Match.cs similarity index 82% rename from external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexMatch.cs rename to external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Match.cs index 97ad8fb80f..f9581a249f 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexMatch.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Match.cs @@ -36,7 +36,6 @@ namespace System.Text.RegularExpressions [Serializable] public class Match : Group { - internal static readonly Match s_empty = new Match(null, 1, string.Empty, 0, 0, 0); internal GroupCollection _groupcoll; // input to the match @@ -52,23 +51,11 @@ namespace System.Text.RegularExpressions internal bool _balancing; // whether we've done any balancing with this match. If we // have done balancing, we'll need to do extra work in Tidy(). - /// - /// Returns an empty Match object. - /// - public static Match Empty - { - get - { - return s_empty; - } - } - internal Match(Regex regex, int capcount, string text, int begpos, int len, int startpos) : base(text, new int[2], 0, "0") { _regex = regex; _matchcount = new int[capcount]; - _matches = new int[capcount][]; _matches[0] = _caps; _textbeg = begpos; @@ -77,17 +64,19 @@ namespace System.Text.RegularExpressions _balancing = false; // No need for an exception here. This is only called internally, so we'll use an Assert instead - System.Diagnostics.Debug.Assert(!(_textbeg < 0 || _textstart < _textbeg || _textend < _textstart || _text.Length < _textend), + System.Diagnostics.Debug.Assert(!(_textbeg < 0 || _textstart < _textbeg || _textend < _textstart || Text.Length < _textend), "The parameters are out of range."); } - /* - * Nonpublic set-text method - */ + /// + /// Returns an empty Match object. + /// + public static Match Empty { get; } = new Match(null, 1, string.Empty, 0, 0, 0); + internal virtual void Reset(Regex regex, string text, int textbeg, int textend, int textstart) { _regex = regex; - _text = text; + Text = text; _textbeg = textbeg; _textend = textend; _textstart = textstart; @@ -121,7 +110,7 @@ namespace System.Text.RegularExpressions if (_regex == null) return this; - return _regex.Run(false, _length, _text, _textbeg, _textend - _textbeg, _textpos); + return _regex.Run(false, Length, Text, _textbeg, _textend - _textbeg, _textpos); } /// @@ -131,29 +120,20 @@ namespace System.Text.RegularExpressions /// public virtual string Result(string replacement) { - RegexReplacement repl; - if (replacement == null) throw new ArgumentNullException(nameof(replacement)); if (_regex == null) throw new NotSupportedException(SR.NoResultOnFailed); - repl = (RegexReplacement)_regex._replref.Get(); - - if (repl == null || !repl.Pattern.Equals(replacement)) - { - repl = RegexParser.ParseReplacement(replacement, _regex.caps, _regex.capsize, _regex.capnames, _regex.roptions); - _regex._replref.Cache(repl); - } + // Gets the weakly cached replacement helper or creates one if there isn't one already. + RegexReplacement repl = RegexReplacement.GetOrCreate(_regex._replref, replacement, _regex.caps, _regex.capsize, + _regex.capnames, _regex.roptions); return repl.Replacement(this); } - /* - * Used by the replacement code - */ - internal virtual string GroupToStringImpl(int groupnum) + internal virtual ReadOnlySpan GroupToStringImpl(int groupnum) { int c = _matchcount[groupnum]; if (c == 0) @@ -161,26 +141,18 @@ namespace System.Text.RegularExpressions int[] matches = _matches[groupnum]; - return _text.Substring(matches[(c - 1) * 2], matches[(c * 2) - 1]); + return Text.AsSpan(matches[(c - 1) * 2], matches[(c * 2) - 1]); } - /* - * Used by the replacement code - */ - internal string LastGroupToStringImpl() + internal ReadOnlySpan LastGroupToStringImpl() { return GroupToStringImpl(_matchcount.Length - 1); } - - /* - * Convert to a thread-safe object by precomputing cache contents - */ /// /// Returns a Match instance equivalent to the one supplied that is safe to share /// between multiple threads. /// - public static Match Synchronized(Match inner) { if (inner == null) @@ -201,9 +173,9 @@ namespace System.Text.RegularExpressions return inner; } - /* - * Nonpublic builder: add a capture to the group specified by "cap" - */ + /// + /// Adds a capture to the group specified by "cap" + /// internal virtual void AddMatch(int cap, int start, int len) { int capcount; @@ -236,14 +208,11 @@ namespace System.Text.RegularExpressions */ internal virtual void BalanceMatch(int cap) { - int capcount; - int target; - _balancing = true; // we'll look at the last capture first - capcount = _matchcount[cap]; - target = capcount * 2 - 2; + int capcount = _matchcount[cap]; + int target = capcount * 2 - 2; // first see if it is negative, and therefore is a reference to the next available // capture group for balancing. If it is, we'll reset target to point to that capture. @@ -260,25 +229,25 @@ namespace System.Text.RegularExpressions AddMatch(cap, -3 - target, -4 - target /* == -3 - (target + 1) */ ); } - /* - * Nonpublic builder: removes a group match by capnum - */ + /// + /// Removes a group match by capnum + /// internal virtual void RemoveMatch(int cap) { _matchcount[cap]--; } - /* - * Nonpublic: tells if a group was matched by capnum - */ + /// + /// Tells if a group was matched by capnum + /// internal virtual bool IsMatched(int cap) { return cap < _matchcount.Length && _matchcount[cap] > 0 && _matches[cap][_matchcount[cap] * 2 - 1] != (-3 + 1); } - /* - * Nonpublic: returns the index of the last specified matched group by capnum - */ + /// + /// Returns the index of the last specified matched group by capnum + /// internal virtual int MatchIndex(int cap) { int i = _matches[cap][_matchcount[cap] * 2 - 2]; @@ -288,9 +257,9 @@ namespace System.Text.RegularExpressions return _matches[cap][-3 - i]; } - /* - * Nonpublic: returns the length of the last specified matched group by capnum - */ + /// + /// Returns the length of the last specified matched group by capnum + /// internal virtual int MatchLength(int cap) { int i = _matches[cap][_matchcount[cap] * 2 - 1]; @@ -300,16 +269,14 @@ namespace System.Text.RegularExpressions return _matches[cap][-3 - i]; } - /* - * Nonpublic: tidy the match so that it can be used as an immutable result - */ + /// + /// Tidy the match so that it can be used as an immutable result + /// internal virtual void Tidy(int textpos) { - int[] interval; - - interval = _matches[0]; - _index = interval[0]; - _length = interval[1]; + int[] interval = _matches[0]; + Index = interval[0]; + Length = interval[1]; _textpos = textpos; _capcount = _matchcount[0]; @@ -387,7 +354,7 @@ namespace System.Text.RegularExpressions string text = ""; if (_matches[i][j * 2] >= 0) - text = _text.Substring(_matches[i][j * 2], _matches[i][j * 2 + 1]); + text = Text.Substring(_matches[i][j * 2], _matches[i][j * 2 + 1]); System.Diagnostics.Debug.WriteLine(" (" + _matches[i][j * 2].ToString(CultureInfo.InvariantCulture) + "," + _matches[i][j * 2 + 1].ToString(CultureInfo.InvariantCulture) + ") " + text); } @@ -396,23 +363,16 @@ namespace System.Text.RegularExpressions #endif } - - /* - * MatchSparse is for handling the case where slots are - * sparsely arranged (e.g., if somebody says use slot 100000) - */ + /// + /// MatchSparse is for handling the case where slots are sparsely arranged (e.g., if somebody says use slot 100000) + /// internal class MatchSparse : Match { // the lookup hashtable - new internal Hashtable _caps; + new internal readonly Hashtable _caps; - /* - * Nonpublic constructor - */ - internal MatchSparse(Regex regex, Hashtable caps, int capcount, - string text, int begpos, int len, int startpos) - - : base(regex, capcount, text, begpos, len, startpos) + internal MatchSparse(Regex regex, Hashtable caps, int capcount, string text, int begpos, int len, int startpos) + : base(regex, capcount, text, begpos, len, startpos) { _caps = caps; } diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexMatchCollection.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/MatchCollection.cs similarity index 98% rename from external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexMatchCollection.cs rename to external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/MatchCollection.cs index 9f26b793ee..eee2924be2 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexMatchCollection.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/MatchCollection.cs @@ -21,8 +21,10 @@ namespace System.Text.RegularExpressions /// names in a regular expression. /// [DebuggerDisplay("Count = {Count}")] - [DebuggerTypeProxy(typeof(RegexCollectionDebuggerProxy))] +#if MONO [Serializable] +#endif + [DebuggerTypeProxy(typeof(CollectionDebuggerProxy))] public class MatchCollection : IList, IReadOnlyList, IList { private readonly Regex _regex; @@ -113,7 +115,7 @@ namespace System.Text.RegularExpressions _matches.Add(match); - _prevlen = match._length; + _prevlen = match.Length; _startat = match._textpos; } while (_matches.Count <= i); diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Reference.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Reference.cs new file mode 100644 index 0000000000..eb7d2755a3 --- /dev/null +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Reference.cs @@ -0,0 +1,88 @@ +// 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.Threading; + +namespace System.Text.RegularExpressions +{ + /// + /// Used to cache one exclusive runner reference + /// + internal sealed class ExclusiveReference + { + private RegexRunner _ref; + private RegexRunner _obj; + private volatile int _locked; + + /// + /// Return an object and grab an exclusive lock. + /// + /// If the exclusive lock can't be obtained, null is returned; + /// if the object can't be returned, the lock is released. + /// + public RegexRunner Get() + { + // try to obtain the lock + + if (0 == Interlocked.Exchange(ref _locked, 1)) + { + // grab reference + RegexRunner obj = _ref; + + // release the lock and return null if no reference + if (obj == null) + { + _locked = 0; + + return null; + } + + // remember the reference and keep the lock + _obj = obj; + + return obj; + } + + return null; + } + + /// + /// Release an object back to the cache. + /// + /// If the object is the one that's under lock, the lock is released. + /// If there is no cached object, then the lock is obtained and the object is placed in the cache. + /// + public void Release(RegexRunner obj) + { + if (obj == null) + throw new ArgumentNullException(nameof(obj)); + + // if this reference owns the lock, release it + if (_obj == obj) + { + _obj = null; + _locked = 0; + + return; + } + + // if no reference owns the lock, try to cache this reference + if (_obj == null) + { + // try to obtain the lock + if (0 == Interlocked.Exchange(ref _locked, 1)) + { + // if there's really no reference, cache this reference + if (_ref == null) + _ref = obj; + + // release the lock + _locked = 0; + + return; + } + } + } + } +} diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.Cache.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.Cache.cs new file mode 100644 index 0000000000..e14be8eec6 --- /dev/null +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.Cache.cs @@ -0,0 +1,303 @@ +// 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 SysDebug = System.Diagnostics.Debug; // as Regex.Debug +using System.Collections.Generic; +using System.Collections; +using System.Runtime.CompilerServices; +using System.Threading; + +namespace System.Text.RegularExpressions +{ + public partial class Regex + { + private const int CacheDictionarySwitchLimit = 10; + + private static int s_cacheSize = 15; + // the cache of code and factories that are currently loaded: + // Dictionary for large cache + private static readonly Dictionary s_cache = new Dictionary(s_cacheSize); + // linked list for MRU and for small cache + private static int s_cacheCount = 0; + private static CachedCodeEntry s_cacheFirst; + private static CachedCodeEntry s_cacheLast; + + public static int CacheSize + { + get + { + return s_cacheSize; + } + set + { + if (value < 0) + throw new ArgumentOutOfRangeException(nameof(value)); + + lock (s_cache) + { + s_cacheSize = value; // not to allow other thread to change it while we use cache + while (s_cacheCount > s_cacheSize) + { + CachedCodeEntry last = s_cacheLast; + if (s_cacheCount >= CacheDictionarySwitchLimit) + { + SysDebug.Assert(s_cache.ContainsKey(last.Key)); + s_cache.Remove(last.Key); + } + + // update linked list: + s_cacheLast = last.Next; + if (last.Next != null) + { + SysDebug.Assert(s_cacheFirst != null); + SysDebug.Assert(s_cacheFirst != last); + SysDebug.Assert(last.Next.Previous == last); + last.Next.Previous = null; + } + else // last one removed + { + SysDebug.Assert(s_cacheFirst == last); + s_cacheFirst = null; + } + + s_cacheCount--; + } + } + } + } + + /// + /// Find cache based on options+pattern+culture and optionally add new cache if not found + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private CachedCodeEntry GetCachedCode(CachedCodeEntryKey key, bool isToAdd) + { + // to avoid lock: + CachedCodeEntry first = s_cacheFirst; + if (first?.Key == key) + return first; + if (s_cacheSize == 0) + return null; + + return GetCachedCodeEntryInternal(key, isToAdd); + } + + private CachedCodeEntry GetCachedCodeEntryInternal(CachedCodeEntryKey key, bool isToAdd) + { + lock (s_cache) + { + // first look for it in the cache and move it to the head + CachedCodeEntry entry = LookupCachedAndPromote(key); + // it wasn't in the cache, so we'll add a new one + if (entry == null && isToAdd && s_cacheSize != 0) // check cache size again in case it changed + { + entry = new CachedCodeEntry(key, capnames, capslist, _code, caps, capsize, _runnerref, _replref); + // put first in linked list: + if (s_cacheFirst != null) + { + SysDebug.Assert(s_cacheFirst.Next == null); + s_cacheFirst.Next = entry; + entry.Previous = s_cacheFirst; + } + s_cacheFirst = entry; + + s_cacheCount++; + if (s_cacheCount >= CacheDictionarySwitchLimit) + { + if (s_cacheCount == CacheDictionarySwitchLimit) + FillCacheDictionary(); + else + s_cache.Add(key, entry); + SysDebug.Assert(s_cacheCount == s_cache.Count); + } + + // update last in linked list: + if (s_cacheLast == null) + { + s_cacheLast = entry; + } + else if (s_cacheCount > s_cacheSize) // remove last + { + CachedCodeEntry last = s_cacheLast; + if (s_cacheCount >= CacheDictionarySwitchLimit) + { + SysDebug.Assert(s_cache[last.Key] == s_cacheLast); + s_cache.Remove(last.Key); + } + + SysDebug.Assert(last.Previous == null); + SysDebug.Assert(last.Next != null); + SysDebug.Assert(last.Next.Previous == last); + last.Next.Previous = null; + s_cacheLast = last.Next; + s_cacheCount--; + } + + } + return entry; + } + } + + private void FillCacheDictionary() + { + s_cache.Clear(); + CachedCodeEntry next = s_cacheFirst; + while (next != null) + { + s_cache.Add(next.Key, next); + next = next.Previous; + } + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] // Unprofitable inline - JIT overly pessimistic + private static bool TryGetCacheValue(CachedCodeEntryKey key, out CachedCodeEntry entry) + { + if (s_cacheCount >= CacheDictionarySwitchLimit) + { + SysDebug.Assert((s_cacheFirst != null && s_cacheLast != null && s_cache.Count > 0) || + (s_cacheFirst == null && s_cacheLast == null && s_cache.Count == 0), + "Linked list and Dict should be synchronized"); + return s_cache.TryGetValue(key, out entry); + } + + return TryGetCacheValueSmall(key, out entry); + } + + private static bool TryGetCacheValueSmall(CachedCodeEntryKey key, out CachedCodeEntry entry) + { + entry = s_cacheFirst?.Previous; // first already checked + while (entry != null) + { + if (entry.Key == key) + return true; + entry = entry.Previous; + } + + return false; + } + + private static CachedCodeEntry LookupCachedAndPromote(CachedCodeEntryKey key) + { + SysDebug.Assert(Monitor.IsEntered(s_cache)); + if (s_cacheFirst?.Key == key) // again check this as could have been promoted by other thread + return s_cacheFirst; + + if (TryGetCacheValue(key, out CachedCodeEntry entry)) + { + // promote: + SysDebug.Assert(s_cacheFirst != entry, "key should not get s_livecode_first"); + SysDebug.Assert(s_cacheFirst != null, "as Dict has at least one"); + SysDebug.Assert(s_cacheFirst.Next == null); + SysDebug.Assert(s_cacheFirst.Previous != null); + SysDebug.Assert(entry.Next != null, "not first so Next should exist"); + SysDebug.Assert(entry.Next.Previous == entry); + if (s_cacheLast == entry) + { + SysDebug.Assert(entry.Previous == null, "last"); + s_cacheLast = entry.Next; + } + else + { + SysDebug.Assert(entry.Previous != null, "in middle"); + SysDebug.Assert(entry.Previous.Next == entry); + entry.Previous.Next = entry.Next; + } + entry.Next.Previous = entry.Previous; + + s_cacheFirst.Next = entry; + entry.Previous = s_cacheFirst; + entry.Next = null; + s_cacheFirst = entry; + } + + return entry; + } + + /// + /// Used as a key for CacheCodeEntry + /// + internal readonly struct CachedCodeEntryKey : IEquatable + { + private readonly RegexOptions _options; + private readonly string _cultureKey; + private readonly string _pattern; + + public CachedCodeEntryKey(RegexOptions options, string cultureKey, string pattern) + { + SysDebug.Assert(cultureKey != null, "Culture must be provided"); + SysDebug.Assert(pattern != null, "Pattern must be provided"); + + _options = options; + _cultureKey = cultureKey; + _pattern = pattern; + } + + public override bool Equals(object obj) + { + return obj is CachedCodeEntryKey && Equals((CachedCodeEntryKey)obj); + } + + public bool Equals(CachedCodeEntryKey other) + { + return _pattern.Equals(other._pattern) && _options == other._options && _cultureKey.Equals(other._cultureKey); + } + + public static bool operator ==(CachedCodeEntryKey left, CachedCodeEntryKey right) + { + return left.Equals(right); + } + + public static bool operator !=(CachedCodeEntryKey left, CachedCodeEntryKey right) + { + return !left.Equals(right); + } + + public override int GetHashCode() + { + return ((int)_options) ^ _cultureKey.GetHashCode() ^ _pattern.GetHashCode(); + } + } + + /// + /// Used to cache byte codes + /// + internal sealed class CachedCodeEntry + { + public CachedCodeEntry Next; + public CachedCodeEntry Previous; + public readonly CachedCodeEntryKey Key; + public RegexCode Code; + public readonly Hashtable Caps; + public readonly Hashtable Capnames; + public readonly string[] Capslist; +#if FEATURE_COMPILED + public RegexRunnerFactory Factory; +#endif + public readonly int Capsize; + public readonly ExclusiveReference Runnerref; + public readonly WeakReference ReplRef; + + public CachedCodeEntry(CachedCodeEntryKey key, Hashtable capnames, string[] capslist, RegexCode code, + Hashtable caps, int capsize, ExclusiveReference runner, WeakReference replref) + { + Key = key; + Capnames = capnames; + Capslist = capslist; + Code = code; + Caps = caps; + Capsize = capsize; + Runnerref = runner; + ReplRef = replref; + } + +#if FEATURE_COMPILED + public void AddCompiled(RegexRunnerFactory factory) + { + Factory = factory; + Code = null; + } +#endif + } + } +} diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.Match.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.Match.cs new file mode 100644 index 0000000000..e7aece5572 --- /dev/null +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.Match.cs @@ -0,0 +1,184 @@ +// 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.Text.RegularExpressions +{ + public partial class Regex + { + /// + /// Searches the input string for one or more occurrences of the text supplied in the given pattern. + /// + public static bool IsMatch(string input, string pattern) + { + return IsMatch(input, pattern, RegexOptions.None, s_defaultMatchTimeout); + } + + /// + /// Searches the input string for one or more occurrences of the text + /// supplied in the pattern parameter with matching options supplied in the options + /// parameter. + /// + public static bool IsMatch(string input, string pattern, RegexOptions options) + { + return IsMatch(input, pattern, options, s_defaultMatchTimeout); + } + + public static bool IsMatch(string input, string pattern, RegexOptions options, TimeSpan matchTimeout) + { + return new Regex(pattern, options, matchTimeout, true).IsMatch(input); + } + + /* + * Returns true if the regex finds a match within the specified string + */ + /// + /// Searches the input string for one or more matches using the previous pattern, + /// options, and starting position. + /// + public bool IsMatch(string input) + { + if (input == null) + throw new ArgumentNullException(nameof(input)); + + return IsMatch(input, UseOptionR() ? input.Length : 0); + } + + /* + * Returns true if the regex finds a match after the specified position + * (proceeding leftward if the regex is leftward and rightward otherwise) + */ + /// + /// Searches the input string for one or more matches using the previous pattern and options, + /// with a new starting position. + /// + public bool IsMatch(string input, int startat) + { + if (input == null) + throw new ArgumentNullException(nameof(input)); + + return (null == Run(true, -1, input, 0, input.Length, startat)); + } + + /// + /// Searches the input string for one or more occurrences of the text + /// supplied in the pattern parameter. + /// + public static Match Match(string input, string pattern) + { + return Match(input, pattern, RegexOptions.None, s_defaultMatchTimeout); + } + + /// + /// Searches the input string for one or more occurrences of the text + /// supplied in the pattern parameter. Matching is modified with an option + /// string. + /// + public static Match Match(string input, string pattern, RegexOptions options) + { + return Match(input, pattern, options, s_defaultMatchTimeout); + } + + public static Match Match(string input, string pattern, RegexOptions options, TimeSpan matchTimeout) + { + return new Regex(pattern, options, matchTimeout, true).Match(input); + } + + /* + * Finds the first match for the regular expression starting at the beginning + * of the string (or at the end of the string if the regex is leftward) + */ + /// + /// Matches a regular expression with a string and returns + /// the precise result as a RegexMatch object. + /// + public Match Match(string input) + { + if (input == null) + throw new ArgumentNullException(nameof(input)); + + return Match(input, UseOptionR() ? input.Length : 0); + } + + /* + * Finds the first match, starting at the specified position + */ + /// + /// Matches a regular expression with a string and returns + /// the precise result as a RegexMatch object. + /// + public Match Match(string input, int startat) + { + if (input == null) + throw new ArgumentNullException(nameof(input)); + + return Run(false, -1, input, 0, input.Length, startat); + } + + /* + * Finds the first match, restricting the search to the specified interval of + * the char array. + */ + /// + /// Matches a regular expression with a string and returns the precise result as a + /// RegexMatch object. + /// + public Match Match(string input, int beginning, int length) + { + if (input == null) + throw new ArgumentNullException(nameof(input)); + + return Run(false, -1, input, beginning, length, UseOptionR() ? beginning + length : beginning); + } + + /// + /// Returns all the successful matches as if Match were called iteratively numerous times. + /// + public static MatchCollection Matches(string input, string pattern) + { + return Matches(input, pattern, RegexOptions.None, s_defaultMatchTimeout); + } + + /// + /// Returns all the successful matches as if Match were called iteratively numerous times. + /// + public static MatchCollection Matches(string input, string pattern, RegexOptions options) + { + return Matches(input, pattern, options, s_defaultMatchTimeout); + } + + public static MatchCollection Matches(string input, string pattern, RegexOptions options, TimeSpan matchTimeout) + { + return new Regex(pattern, options, matchTimeout, true).Matches(input); + } + + /* + * Finds the first match for the regular expression starting at the beginning + * of the string Enumerator(or at the end of the string if the regex is leftward) + */ + /// + /// Returns all the successful matches as if Match was called iteratively numerous times. + /// + public MatchCollection Matches(string input) + { + if (input == null) + throw new ArgumentNullException(nameof(input)); + + return Matches(input, UseOptionR() ? input.Length : 0); + } + + /* + * Finds the first match, starting at the specified position + */ + /// + /// Returns all the successful matches as if Match was called iteratively numerous times. + /// + public MatchCollection Matches(string input, int startat) + { + if (input == null) + throw new ArgumentNullException(nameof(input)); + + return new MatchCollection(this, input, 0, input.Length, startat); + } + } +} diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.Replace.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.Replace.cs new file mode 100644 index 0000000000..15809a2060 --- /dev/null +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.Replace.cs @@ -0,0 +1,231 @@ +// 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.Collections.Generic; +using System.IO; +using System.Text; + +namespace System.Text.RegularExpressions +{ + // Callback class + public delegate string MatchEvaluator(Match match); + + public partial class Regex + { + /// + /// Replaces all occurrences of the pattern with the pattern, starting at + /// the first character in the input string. + /// + public static string Replace(string input, string pattern, string replacement) + { + return Replace(input, pattern, replacement, RegexOptions.None, s_defaultMatchTimeout); + } + + /// + /// Replaces all occurrences of + /// the with the + /// pattern, starting at the first character in the input string. + /// + public static string Replace(string input, string pattern, string replacement, RegexOptions options) + { + return Replace(input, pattern, replacement, options, s_defaultMatchTimeout); + } + + public static string Replace(string input, string pattern, string replacement, RegexOptions options, TimeSpan matchTimeout) + { + return new Regex(pattern, options, matchTimeout, true).Replace(input, replacement); + } + + /// + /// Replaces all occurrences of the previously defined pattern with the + /// pattern, starting at the first character in the + /// input string. + /// + public string Replace(string input, string replacement) + { + if (input == null) + throw new ArgumentNullException(nameof(input)); + + return Replace(input, replacement, -1, UseOptionR() ? input.Length : 0); + } + + /// + /// Replaces all occurrences of the previously defined pattern with the + /// pattern, starting at the first character in the + /// input string. + /// + public string Replace(string input, string replacement, int count) + { + if (input == null) + throw new ArgumentNullException(nameof(input)); + + return Replace(input, replacement, count, UseOptionR() ? input.Length : 0); + } + + /// + /// Replaces all occurrences of the previously defined pattern with the + /// pattern, starting at the character position + /// . + /// + public string Replace(string input, string replacement, int count, int startat) + { + if (input == null) + throw new ArgumentNullException(nameof(input)); + + if (replacement == null) + throw new ArgumentNullException(nameof(replacement)); + + // Gets the weakly cached replacement helper or creates one if there isn't one already. + RegexReplacement repl = RegexReplacement.GetOrCreate(_replref, replacement, caps, capsize, capnames, roptions); + + return repl.Replace(this, input, count, startat); + } + + /// + /// Replaces all occurrences of the with the recent + /// replacement pattern. + /// + public static string Replace(string input, string pattern, MatchEvaluator evaluator) + { + return Replace(input, pattern, evaluator, RegexOptions.None, s_defaultMatchTimeout); + } + + /// + /// Replaces all occurrences of the with the recent + /// replacement pattern, starting at the first character. + /// + public static string Replace(string input, string pattern, MatchEvaluator evaluator, RegexOptions options) + { + return Replace(input, pattern, evaluator, options, s_defaultMatchTimeout); + } + + public static string Replace(string input, string pattern, MatchEvaluator evaluator, RegexOptions options, TimeSpan matchTimeout) + { + return new Regex(pattern, options, matchTimeout, true).Replace(input, evaluator); + } + + /// + /// Replaces all occurrences of the previously defined pattern with the recent + /// replacement pattern, starting at the first character position. + /// + public string Replace(string input, MatchEvaluator evaluator) + { + if (input == null) + throw new ArgumentNullException(nameof(input)); + + return Replace(input, evaluator, -1, UseOptionR() ? input.Length : 0); + } + + /// + /// Replaces all occurrences of the previously defined pattern with the recent + /// replacement pattern, starting at the first character position. + /// + public string Replace(string input, MatchEvaluator evaluator, int count) + { + if (input == null) + throw new ArgumentNullException(nameof(input)); + + return Replace(input, evaluator, count, UseOptionR() ? input.Length : 0); + } + + /// + /// Replaces all occurrences of the previously defined pattern with the recent + /// replacement pattern, starting at the character position + /// . + /// + public string Replace(string input, MatchEvaluator evaluator, int count, int startat) + { + if (input == null) + throw new ArgumentNullException(nameof(input)); + + return Replace(evaluator, this, input, count, startat); + } + + /// + /// Replaces all occurrences of the regex in the string with the + /// replacement evaluator. + /// + /// Note that the special case of no matches is handled on its own: + /// with no matches, the input string is returned unchanged. + /// The right-to-left case is split out because StringBuilder + /// doesn't handle right-to-left string building directly very well. + /// + private static string Replace(MatchEvaluator evaluator, Regex regex, string input, int count, int startat) + { + if (evaluator == null) + throw new ArgumentNullException(nameof(evaluator)); + if (count < -1) + throw new ArgumentOutOfRangeException(nameof(count), SR.CountTooSmall); + if (startat < 0 || startat > input.Length) + throw new ArgumentOutOfRangeException(nameof(startat), SR.BeginIndexNotNegative); + + if (count == 0) + return input; + + Match match = regex.Match(input, startat); + + if (!match.Success) + { + return input; + } + else + { + StringBuilder sb = StringBuilderCache.Acquire(); + + if (!regex.RightToLeft) + { + int prevat = 0; + + do + { + if (match.Index != prevat) + sb.Append(input, prevat, match.Index - prevat); + + prevat = match.Index + match.Length; + + sb.Append(evaluator(match)); + + if (--count == 0) + break; + + match = match.NextMatch(); + } while (match.Success); + + if (prevat < input.Length) + sb.Append(input, prevat, input.Length - prevat); + } + else + { + List al = new List(); + int prevat = input.Length; + + do + { + if (match.Index + match.Length != prevat) + al.Add(input.Substring(match.Index + match.Length, prevat - match.Index - match.Length)); + + prevat = match.Index; + + al.Add(evaluator(match)); + + if (--count == 0) + break; + + match = match.NextMatch(); + } while (match.Success); + + if (prevat > 0) + sb.Append(input, 0, prevat); + + for (int i = al.Count - 1; i >= 0; i--) + { + sb.Append(al[i]); + } + } + + return StringBuilderCache.GetStringAndRelease(sb); + } + } + } +} diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.Split.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.Split.cs new file mode 100644 index 0000000000..4e4205ebbd --- /dev/null +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.Split.cs @@ -0,0 +1,165 @@ +// 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.Collections.Generic; + +namespace System.Text.RegularExpressions +{ + public partial class Regex + { + /// + /// Splits the string at the position defined + /// by . + /// + public static string[] Split(string input, string pattern) + { + return Split(input, pattern, RegexOptions.None, s_defaultMatchTimeout); + } + + /// + /// Splits the string at the position defined by . + /// + public static string[] Split(string input, string pattern, RegexOptions options) + { + return Split(input, pattern, options, s_defaultMatchTimeout); + } + + public static string[] Split(string input, string pattern, RegexOptions options, TimeSpan matchTimeout) + { + return new Regex(pattern, options, matchTimeout, true).Split(input); + } + + /// + /// Splits the string at the position defined by a + /// previous pattern. + /// + public string[] Split(string input) + { + if (input == null) + throw new ArgumentNullException(nameof(input)); + + return Split(input, 0, UseOptionR() ? input.Length : 0); + } + + /// + /// Splits the string at the position defined by a + /// previous pattern. + /// + public string[] Split(string input, int count) + { + if (input == null) + throw new ArgumentNullException(nameof(input)); + + return Split(this, input, count, UseOptionR() ? input.Length : 0); + } + + /// + /// Splits the string at the position defined by a previous pattern. + /// + public string[] Split(string input, int count, int startat) + { + if (input == null) + throw new ArgumentNullException(nameof(input)); + + return Split(this, input, count, startat); + } + + /// + /// Does a split. In the right-to-left case we reorder the + /// array to be forwards. + /// + private static string[] Split(Regex regex, string input, int count, int startat) + { + if (count < 0) + throw new ArgumentOutOfRangeException(nameof(count), SR.CountTooSmall); + if (startat < 0 || startat > input.Length) + throw new ArgumentOutOfRangeException(nameof(startat), SR.BeginIndexNotNegative); + + string[] result; + + if (count == 1) + { + result = new string[1]; + result[0] = input; + return result; + } + + count -= 1; + + Match match = regex.Match(input, startat); + + if (!match.Success) + { + result = new string[1]; + result[0] = input; + return result; + } + else + { + List al = new List(); + + if (!regex.RightToLeft) + { + int prevat = 0; + + for (; ; ) + { + al.Add(input.Substring(prevat, match.Index - prevat)); + + prevat = match.Index + match.Length; + + // add all matched capture groups to the list. + for (int i = 1; i < match.Groups.Count; i++) + { + if (match.IsMatched(i)) + al.Add(match.Groups[i].ToString()); + } + + if (--count == 0) + break; + + match = match.NextMatch(); + + if (!match.Success) + break; + } + + al.Add(input.Substring(prevat, input.Length - prevat)); + } + else + { + int prevat = input.Length; + + for (; ; ) + { + al.Add(input.Substring(match.Index + match.Length, prevat - match.Index - match.Length)); + + prevat = match.Index; + + // add all matched capture groups to the list. + for (int i = 1; i < match.Groups.Count; i++) + { + if (match.IsMatched(i)) + al.Add(match.Groups[i].ToString()); + } + + if (--count == 0) + break; + + match = match.NextMatch(); + + if (!match.Success) + break; + } + + al.Add(input.Substring(0, prevat)); + + al.Reverse(0, al.Count); + } + + return al.ToArray(); + } + } + } +} diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.Timeout.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.Timeout.cs new file mode 100644 index 0000000000..b59f294428 --- /dev/null +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.Timeout.cs @@ -0,0 +1,104 @@ +// 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.Threading; + +namespace System.Text.RegularExpressions +{ + public partial class Regex + { + // We need this because time is queried using Environment.TickCount for performance reasons + // (Environment.TickCount returns milliseconds as an int and cycles): + private static readonly TimeSpan s_maximumMatchTimeout = TimeSpan.FromMilliseconds(int.MaxValue - 1); + + // During static initialisation of Regex we check + private const string DefaultMatchTimeout_ConfigKeyName = "REGEX_DEFAULT_MATCH_TIMEOUT"; + + // DefaultMatchTimeout specifies the match timeout to use if no other timeout was specified + // by one means or another. Typically, it is set to InfiniteMatchTimeout. + internal static readonly TimeSpan s_defaultMatchTimeout; + + // InfiniteMatchTimeout specifies that match timeout is switched OFF. It allows for faster code paths + // compared to simply having a very large timeout. + // We do not want to ask users to use System.Threading.Timeout.InfiniteTimeSpan as a parameter because: + // (1) We do not want to imply any relation between having using a RegEx timeout and using multi-threading. + // (2) We do not want to require users to take ref to a contract assembly for threading just to use RegEx. + // There may in theory be a SKU that has RegEx, but no multithreading. + // We create a public Regex.InfiniteMatchTimeout constant, which for consistency uses the save underlying + // value as Timeout.InfiniteTimeSpan creating an implementation detail dependency only. + public static readonly TimeSpan InfiniteMatchTimeout = Timeout.InfiniteTimeSpan; + + // timeout for the execution of this regex + protected internal TimeSpan internalMatchTimeout; + + static Regex() + { + s_defaultMatchTimeout = InitDefaultMatchTimeout(); + } + + /// + /// The match timeout used by this Regex instance. + /// + public TimeSpan MatchTimeout => internalMatchTimeout; + + // Note: "<" is the XML entity for smaller ("<"). + /// + /// Validates that the specified match timeout value is valid. + /// The valid range is TimeSpan.Zero < matchTimeout <= Regex.MaximumMatchTimeout. + /// + /// The timeout value to validate. + /// If the specified timeout is not within a valid range. + /// + protected internal static void ValidateMatchTimeout(TimeSpan matchTimeout) + { + if (InfiniteMatchTimeout == matchTimeout) + return; + + // Change this to make sure timeout is not longer then Environment.Ticks cycle length: + if (TimeSpan.Zero < matchTimeout && matchTimeout <= s_maximumMatchTimeout) + return; + + throw new ArgumentOutOfRangeException(nameof(matchTimeout)); + } + + /// + /// Specifies the default RegEx matching timeout value (i.e. the timeout that will be used if no + /// explicit timeout is specified). + /// The default is queried from the current AppDomain. + /// If the AddDomain's data value for that key is not a TimeSpan value or if it is outside the + /// valid range, an exception is thrown. + /// If the AddDomain's data value for that key is null, a fallback value is returned. + /// + /// The default RegEx matching timeout for this AppDomain + private static TimeSpan InitDefaultMatchTimeout() + { + // Query AppDomain + AppDomain ad = AppDomain.CurrentDomain; + object defaultMatchTimeoutObj = ad.GetData(DefaultMatchTimeout_ConfigKeyName); + + // If no default is specified, use fallback + if (defaultMatchTimeoutObj == null) + { + return InfiniteMatchTimeout; + } + + if (defaultMatchTimeoutObj is TimeSpan defaultMatchTimeOut) + { + // If default timeout is outside the valid range, throw. It will result in a TypeInitializationException: + try + { + ValidateMatchTimeout(defaultMatchTimeOut); + } + catch (ArgumentOutOfRangeException) + { + throw new ArgumentOutOfRangeException(SR.Format(SR.IllegalDefaultRegexMatchTimeoutInAppDomain, DefaultMatchTimeout_ConfigKeyName, defaultMatchTimeOut)); + } + + return defaultMatchTimeOut; + } + + throw new InvalidCastException(SR.Format(SR.IllegalDefaultRegexMatchTimeoutInAppDomain, DefaultMatchTimeout_ConfigKeyName, defaultMatchTimeoutObj)); + } + } +} diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs index 511312b4ef..628fd6ac96 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs @@ -6,7 +6,6 @@ // expression. using System.Collections; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Reflection; @@ -15,7 +14,6 @@ using System.Reflection.Emit; using System.Runtime.CompilerServices; #endif using System.Runtime.Serialization; -using System.Threading; namespace System.Text.RegularExpressions { @@ -24,101 +22,26 @@ namespace System.Text.RegularExpressions /// contains static methods that allow use of regular expressions without instantiating /// a Regex explicitly. /// - [Serializable] - public class Regex : ISerializable + public partial class Regex : ISerializable { + internal const int MaxOptionShift = 10; + protected internal string pattern; // The string pattern provided protected internal RegexOptions roptions; // the top-level options from the options string - - // *********** Match timeout fields { *********** - - // We need this because time is queried using Environment.TickCount for performance reasons - // (Environment.TickCount returns milliseconds as an int and cycles): - private static readonly TimeSpan MaximumMatchTimeout = TimeSpan.FromMilliseconds(int.MaxValue - 1); - - // InfiniteMatchTimeout specifies that match timeout is switched OFF. It allows for faster code paths - // compared to simply having a very large timeout. - // We do not want to ask users to use System.Threading.Timeout.InfiniteTimeSpan as a parameter because: - // (1) We do not want to imply any relation between having using a RegEx timeout and using multi-threading. - // (2) We do not want to require users to take ref to a contract assembly for threading just to use RegEx. - // There may in theory be a SKU that has RegEx, but no multithreading. - // We create a public Regex.InfiniteMatchTimeout constant, which for consistency uses the save underlying - // value as Timeout.InfiniteTimeSpan creating an implementation detail dependency only. - public static readonly TimeSpan InfiniteMatchTimeout = Timeout.InfiniteTimeSpan; - - protected internal TimeSpan internalMatchTimeout; // timeout for the execution of this regex - - // During static initialisation of Regex we check - private const string DefaultMatchTimeout_ConfigKeyName = "REGEX_DEFAULT_MATCH_TIMEOUT"; - - // DefaultMatchTimeout specifies the match timeout to use if no other timeout was specified - // by one means or another. Typically, it is set to InfiniteMatchTimeout. - internal static readonly TimeSpan DefaultMatchTimeout = InitDefaultMatchTimeout(); - - // *********** } match timeout fields *********** - protected internal RegexRunnerFactory factory; - - protected internal Hashtable caps; // if captures are sparse, this is the hashtable capnum->index - protected internal Hashtable capnames; // if named captures are used, this maps names->index - - protected internal string[] capslist; // if captures are sparse or named captures are used, this is the sorted list of names - protected internal int capsize; // the size of the capture array - - [CLSCompliant(false)] - protected IDictionary Caps - { - get - { - return caps; - } - set - { - if (value == null) - throw new ArgumentNullException(nameof(value)); - - caps = value as Hashtable; - if (caps == null) - { - caps = new Hashtable(value); - } - } - } - - [CLSCompliant(false)] - protected IDictionary CapNames - { - get - { - return capnames; - } - set - { - if (value == null) - throw new ArgumentNullException(nameof(value)); - - capnames = value as Hashtable; - if (capnames == null) - { - capnames = new Hashtable(value); - } - } - } - - - internal ExclusiveReference _runnerref; // cached runner - internal SharedReference _replref; // cached parsed replacement pattern - internal RegexCode _code; // if interpreted, this is the code for RegexInterpreter + protected internal Hashtable caps; // if captures are sparse, this is the hashtable capnum->index + protected internal Hashtable capnames; // if named captures are used, this maps names->index + protected internal string[] capslist; // if captures are sparse or named captures are used, this is the sorted list of names + protected internal int capsize; // the size of the capture array + + internal ExclusiveReference _runnerref; // cached runner + internal WeakReference _replref; // cached parsed replacement pattern + internal RegexCode _code; // if interpreted, this is the code for RegexInterpreter internal bool _refsInitialized = false; - internal static LinkedList s_livecode = new LinkedList();// the cache of code and factories that are currently loaded - internal static int s_cacheSize = 15; - - internal const int MaxOptionShift = 10; - protected Regex() { - internalMatchTimeout = DefaultMatchTimeout; + internalMatchTimeout = s_defaultMatchTimeout; } /// @@ -126,7 +49,7 @@ namespace System.Text.RegularExpressions /// expression. /// public Regex(string pattern) - : this(pattern, RegexOptions.None, DefaultMatchTimeout, false) + : this(pattern, RegexOptions.None, s_defaultMatchTimeout, false) { } @@ -135,7 +58,7 @@ namespace System.Text.RegularExpressions /// specified regular expression with options that modify the pattern. /// public Regex(string pattern, RegexOptions options) - : this(pattern, options, DefaultMatchTimeout, false) + : this(pattern, options, s_defaultMatchTimeout, false) { } @@ -183,50 +106,50 @@ namespace System.Text.RegularExpressions ValidateMatchTimeout(matchTimeout); - string cultureKey; - if ((options & RegexOptions.CultureInvariant) != 0) - cultureKey = CultureInfo.InvariantCulture.ToString(); - else - cultureKey = CultureInfo.CurrentCulture.ToString(); - - // Try to look up this regex in the cache. - var key = new CachedCodeEntryKey(options, cultureKey, pattern); - CachedCodeEntry cached = LookupCachedAndUpdate(key); - + // After parameter validation assign this.pattern = pattern; roptions = options; internalMatchTimeout = matchTimeout; + // Cache handling. Try to look up this regex in the cache. + string cultureKey = (options & RegexOptions.CultureInvariant) != 0 ? + CultureInfo.InvariantCulture.ToString() : + CultureInfo.CurrentCulture.ToString(); + var key = new CachedCodeEntryKey(options, cultureKey, pattern); + CachedCodeEntry cached = GetCachedCode(key, false); + if (cached == null) { // Parse the input RegexTree tree = RegexParser.Parse(pattern, roptions); // Extract the relevant information - capnames = tree._capnames; - capslist = tree._capslist; + capnames = tree.CapNames; + capslist = tree.CapsList; _code = RegexWriter.Write(tree); - caps = _code._caps; - capsize = _code._capsize; + caps = _code.Caps; + capsize = _code.CapSize; InitializeReferences(); tree = null; if (addToCache) - cached = CacheCode(key); + cached = GetCachedCode(key, true); } else { - caps = cached._caps; - capnames = cached._capnames; - capslist = cached._capslist; - capsize = cached._capsize; - _code = cached._code; + caps = cached.Caps; + capnames = cached.Capnames; + capslist = cached.Capslist; + capsize = cached.Capsize; + _code = cached.Code; #if FEATURE_COMPILED - factory = cached._factory; + factory = cached.Factory; #endif - _runnerref = cached._runnerref; - _replref = cached._replref; + + // Cache runner and replacement + _runnerref = cached.Runnerref; + _replref = cached.ReplRef; _refsInitialized = true; } @@ -246,63 +169,36 @@ namespace System.Text.RegularExpressions #endif } - // Note: "<" is the XML entity for smaller ("<"). - /// - /// Validates that the specified match timeout value is valid. - /// The valid range is TimeSpan.Zero < matchTimeout <= Regex.MaximumMatchTimeout. - /// - /// The timeout value to validate. - /// If the specified timeout is not within a valid range. - /// - protected internal static void ValidateMatchTimeout(TimeSpan matchTimeout) + [CLSCompliant(false)] + protected IDictionary Caps { - if (InfiniteMatchTimeout == matchTimeout) - return; + get + { + return caps; + } + set + { + if (value == null) + throw new ArgumentNullException(nameof(value)); - // Change this to make sure timeout is not longer then Environment.Ticks cycle length: - if (TimeSpan.Zero < matchTimeout && matchTimeout <= MaximumMatchTimeout) - return; - - throw new ArgumentOutOfRangeException(nameof(matchTimeout)); + caps = value as Hashtable ?? new Hashtable(value); + } } - /// - /// Specifies the default RegEx matching timeout value (i.e. the timeout that will be used if no - /// explicit timeout is specified). - /// The default is queried from the current AppDomain. - /// If the AddDomain's data value for that key is not a TimeSpan value or if it is outside the - /// valid range, an exception is thrown. - /// If the AddDomain's data value for that key is null, a fallback value is returned. - /// - /// The default RegEx matching timeout for this AppDomain - private static TimeSpan InitDefaultMatchTimeout() + [CLSCompliant(false)] + protected IDictionary CapNames { - // Query AppDomain - AppDomain ad = AppDomain.CurrentDomain; - object defaultMatchTimeoutObj = ad.GetData(DefaultMatchTimeout_ConfigKeyName); - - // If no default is specified, use fallback - if (defaultMatchTimeoutObj == null) + get { - return InfiniteMatchTimeout; + return capnames; } - - if (defaultMatchTimeoutObj is TimeSpan defaultMatchTimeOut) + set { - // If default timeout is outside the valid range, throw. It will result in a TypeInitializationException: - try - { - ValidateMatchTimeout(defaultMatchTimeOut); - } - catch (ArgumentOutOfRangeException) - { - throw new ArgumentOutOfRangeException(SR.Format(SR.IllegalDefaultRegexMatchTimeoutInAppDomain, DefaultMatchTimeout_ConfigKeyName, defaultMatchTimeOut)); - } + if (value == null) + throw new ArgumentNullException(nameof(value)); - return defaultMatchTimeOut; + capnames = value as Hashtable ?? new Hashtable(value); } - - throw new InvalidCastException(SR.Format(SR.IllegalDefaultRegexMatchTimeoutInAppDomain, DefaultMatchTimeout_ConfigKeyName, defaultMatchTimeoutObj)); } #if FEATURE_COMPILED @@ -316,6 +212,21 @@ namespace System.Text.RegularExpressions { return RegexCompiler.Compile(code, roptions); } + + public static void CompileToAssembly(RegexCompilationInfo[] regexinfos, AssemblyName assemblyname) + { + throw new PlatformNotSupportedException(SR.PlatformNotSupported_CompileToAssembly); + } + + public static void CompileToAssembly(RegexCompilationInfo[] regexinfos, AssemblyName assemblyname, CustomAttributeBuilder[] attributes) + { + throw new PlatformNotSupportedException(SR.PlatformNotSupported_CompileToAssembly); + } + + public static void CompileToAssembly(RegexCompilationInfo[] regexinfos, AssemblyName assemblyname, CustomAttributeBuilder[] attributes, string resourceFile) + { + throw new PlatformNotSupportedException(SR.PlatformNotSupported_CompileToAssembly); + } #endif /// @@ -338,7 +249,6 @@ namespace System.Text.RegularExpressions /// /// Unescapes any escaped characters in the input string. /// - [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Unescape", Justification = "Already shipped since v1 - can't fix without causing a breaking change")] public static string Unescape(string str) { if (str == null) @@ -347,65 +257,20 @@ namespace System.Text.RegularExpressions return RegexParser.Unescape(str); } - [SuppressMessage("Microsoft.Concurrency", "CA8001", Justification = "Reviewed for thread-safety")] - public static int CacheSize - { - get - { - return s_cacheSize; - } - set - { - if (value < 0) - throw new ArgumentOutOfRangeException(nameof(value)); - - s_cacheSize = value; - if (s_livecode.Count > s_cacheSize) - { - lock (s_livecode) - { - while (s_livecode.Count > s_cacheSize) - s_livecode.RemoveLast(); - } - } - } - } - /// /// Returns the options passed into the constructor /// - public RegexOptions Options - { - get { return roptions; } - } - - - /// - /// The match timeout used by this Regex instance. - /// - public TimeSpan MatchTimeout - { - get { return internalMatchTimeout; } - } + public RegexOptions Options => roptions; /// /// Indicates whether the regular expression matches from right to left. /// - public bool RightToLeft - { - get - { - return UseOptionR(); - } - } + public bool RightToLeft => UseOptionR(); /// /// Returns the regular expression pattern passed into the constructor /// - public override string ToString() - { - return pattern; - } + public override string ToString() => pattern; /* * Returns an array of the group names that are used to capture groups @@ -434,7 +299,6 @@ namespace System.Text.RegularExpressions else { result = new string[capslist.Length]; - Array.Copy(capslist, 0, result, 0, capslist.Length); } @@ -559,412 +423,6 @@ namespace System.Text.RegularExpressions return -1; } - /* - * Static version of simple IsMatch call - */ - /// - /// Searches the input string for one or more occurrences of the text supplied in the given pattern. - /// - public static bool IsMatch(string input, string pattern) - { - return IsMatch(input, pattern, RegexOptions.None, DefaultMatchTimeout); - } - - /* - * Static version of simple IsMatch call - */ - /// - /// Searches the input string for one or more occurrences of the text - /// supplied in the pattern parameter with matching options supplied in the options - /// parameter. - /// - public static bool IsMatch(string input, string pattern, RegexOptions options) - { - return IsMatch(input, pattern, options, DefaultMatchTimeout); - } - - public static bool IsMatch(string input, string pattern, RegexOptions options, TimeSpan matchTimeout) - { - return new Regex(pattern, options, matchTimeout, true).IsMatch(input); - } - - /* - * Returns true if the regex finds a match within the specified string - */ - /// - /// Searches the input string for one or more matches using the previous pattern, - /// options, and starting position. - /// - public bool IsMatch(string input) - { - if (input == null) - throw new ArgumentNullException(nameof(input)); - - return IsMatch(input, UseOptionR() ? input.Length : 0); - } - - /* - * Returns true if the regex finds a match after the specified position - * (proceeding leftward if the regex is leftward and rightward otherwise) - */ - /// - /// Searches the input string for one or more matches using the previous pattern and options, - /// with a new starting position. - /// - public bool IsMatch(string input, int startat) - { - if (input == null) - throw new ArgumentNullException(nameof(input)); - - return (null == Run(true, -1, input, 0, input.Length, startat)); - } - - /* - * Static version of simple Match call - */ - /// - /// Searches the input string for one or more occurrences of the text - /// supplied in the pattern parameter. - /// - public static Match Match(string input, string pattern) - { - return Match(input, pattern, RegexOptions.None, DefaultMatchTimeout); - } - - /* - * Static version of simple Match call - */ - /// - /// Searches the input string for one or more occurrences of the text - /// supplied in the pattern parameter. Matching is modified with an option - /// string. - /// - public static Match Match(string input, string pattern, RegexOptions options) - { - return Match(input, pattern, options, DefaultMatchTimeout); - } - - - public static Match Match(string input, string pattern, RegexOptions options, TimeSpan matchTimeout) - { - return new Regex(pattern, options, matchTimeout, true).Match(input); - } - - /* - * Finds the first match for the regular expression starting at the beginning - * of the string (or at the end of the string if the regex is leftward) - */ - /// - /// Matches a regular expression with a string and returns - /// the precise result as a RegexMatch object. - /// - public Match Match(string input) - { - if (input == null) - throw new ArgumentNullException(nameof(input)); - - return Match(input, UseOptionR() ? input.Length : 0); - } - - /* - * Finds the first match, starting at the specified position - */ - /// - /// Matches a regular expression with a string and returns - /// the precise result as a RegexMatch object. - /// - public Match Match(string input, int startat) - { - if (input == null) - throw new ArgumentNullException(nameof(input)); - - return Run(false, -1, input, 0, input.Length, startat); - } - - /* - * Finds the first match, restricting the search to the specified interval of - * the char array. - */ - /// - /// Matches a regular expression with a string and returns the precise result as a - /// RegexMatch object. - /// - public Match Match(string input, int beginning, int length) - { - if (input == null) - throw new ArgumentNullException(nameof(input)); - - return Run(false, -1, input, beginning, length, UseOptionR() ? beginning + length : beginning); - } - - /* - * Static version of simple Matches call - */ - /// - /// Returns all the successful matches as if Match were called iteratively numerous times. - /// - public static MatchCollection Matches(string input, string pattern) - { - return Matches(input, pattern, RegexOptions.None, DefaultMatchTimeout); - } - - /* - * Static version of simple Matches call - */ - /// - /// Returns all the successful matches as if Match were called iteratively numerous times. - /// - public static MatchCollection Matches(string input, string pattern, RegexOptions options) - { - return Matches(input, pattern, options, DefaultMatchTimeout); - } - - public static MatchCollection Matches(string input, string pattern, RegexOptions options, TimeSpan matchTimeout) - { - return new Regex(pattern, options, matchTimeout, true).Matches(input); - } - - /* - * Finds the first match for the regular expression starting at the beginning - * of the string Enumerator(or at the end of the string if the regex is leftward) - */ - /// - /// Returns all the successful matches as if Match was called iteratively numerous times. - /// - public MatchCollection Matches(string input) - { - if (input == null) - throw new ArgumentNullException(nameof(input)); - - return Matches(input, UseOptionR() ? input.Length : 0); - } - - /* - * Finds the first match, starting at the specified position - */ - /// - /// Returns all the successful matches as if Match was called iteratively numerous times. - /// - public MatchCollection Matches(string input, int startat) - { - if (input == null) - throw new ArgumentNullException(nameof(input)); - - return new MatchCollection(this, input, 0, input.Length, startat); - } - - /// - /// Replaces all occurrences of the pattern with the pattern, starting at - /// the first character in the input string. - /// - public static string Replace(string input, string pattern, string replacement) - { - return Replace(input, pattern, replacement, RegexOptions.None, DefaultMatchTimeout); - } - - /// - /// Replaces all occurrences of - /// the with the - /// pattern, starting at the first character in the input string. - /// - public static string Replace(string input, string pattern, string replacement, RegexOptions options) - { - return Replace(input, pattern, replacement, options, DefaultMatchTimeout); - } - - public static string Replace(string input, string pattern, string replacement, RegexOptions options, TimeSpan matchTimeout) - { - return new Regex(pattern, options, matchTimeout, true).Replace(input, replacement); - } - - /// - /// Replaces all occurrences of the previously defined pattern with the - /// pattern, starting at the first character in the - /// input string. - /// - public string Replace(string input, string replacement) - { - if (input == null) - throw new ArgumentNullException(nameof(input)); - - return Replace(input, replacement, -1, UseOptionR() ? input.Length : 0); - } - - /// - /// Replaces all occurrences of the previously defined pattern with the - /// pattern, starting at the first character in the - /// input string. - /// - public string Replace(string input, string replacement, int count) - { - if (input == null) - throw new ArgumentNullException(nameof(input)); - - return Replace(input, replacement, count, UseOptionR() ? input.Length : 0); - } - - /// - /// Replaces all occurrences of the previously defined pattern with the - /// pattern, starting at the character position - /// . - /// - public string Replace(string input, string replacement, int count, int startat) - { - if (input == null) - throw new ArgumentNullException(nameof(input)); - - if (replacement == null) - throw new ArgumentNullException(nameof(replacement)); - - // a little code to grab a cached parsed replacement object - RegexReplacement repl = (RegexReplacement)_replref.Get(); - - if (repl == null || !repl.Pattern.Equals(replacement)) - { - repl = RegexParser.ParseReplacement(replacement, caps, capsize, capnames, roptions); - _replref.Cache(repl); - } - - return repl.Replace(this, input, count, startat); - } - - /// - /// Replaces all occurrences of the with the recent - /// replacement pattern. - /// - public static string Replace(string input, string pattern, MatchEvaluator evaluator) - { - return Replace(input, pattern, evaluator, RegexOptions.None, DefaultMatchTimeout); - } - - /// - /// Replaces all occurrences of the with the recent - /// replacement pattern, starting at the first character. - /// - public static string Replace(string input, string pattern, MatchEvaluator evaluator, RegexOptions options) - { - return Replace(input, pattern, evaluator, options, DefaultMatchTimeout); - } - - public static string Replace(string input, string pattern, MatchEvaluator evaluator, RegexOptions options, TimeSpan matchTimeout) - { - return new Regex(pattern, options, matchTimeout, true).Replace(input, evaluator); - } - - /// - /// Replaces all occurrences of the previously defined pattern with the recent - /// replacement pattern, starting at the first character position. - /// - public string Replace(string input, MatchEvaluator evaluator) - { - if (input == null) - throw new ArgumentNullException(nameof(input)); - - return Replace(input, evaluator, -1, UseOptionR() ? input.Length : 0); - } - - /// - /// Replaces all occurrences of the previously defined pattern with the recent - /// replacement pattern, starting at the first character position. - /// - public string Replace(string input, MatchEvaluator evaluator, int count) - { - if (input == null) - throw new ArgumentNullException(nameof(input)); - - return Replace(input, evaluator, count, UseOptionR() ? input.Length : 0); - } - - /// - /// Replaces all occurrences of the previously defined pattern with the recent - /// replacement pattern, starting at the character position - /// . - /// - public string Replace(string input, MatchEvaluator evaluator, int count, int startat) - { - if (input == null) - throw new ArgumentNullException(nameof(input)); - - return RegexReplacement.Replace(evaluator, this, input, count, startat); - } - - /// - /// Splits the string at the position defined - /// by . - /// - public static string[] Split(string input, string pattern) - { - return Split(input, pattern, RegexOptions.None, DefaultMatchTimeout); - } - - /// - /// Splits the string at the position defined by . - /// - public static string[] Split(string input, string pattern, RegexOptions options) - { - return Split(input, pattern, options, DefaultMatchTimeout); - } - - public static string[] Split(string input, string pattern, RegexOptions options, TimeSpan matchTimeout) - { - return new Regex(pattern, options, matchTimeout, true).Split(input); - } - - /// - /// Splits the string at the position defined by a - /// previous pattern. - /// - public string[] Split(string input) - { - if (input == null) - throw new ArgumentNullException(nameof(input)); - - return Split(input, 0, UseOptionR() ? input.Length : 0); - } - - /// - /// Splits the string at the position defined by a - /// previous pattern. - /// - public string[] Split(string input, int count) - { - if (input == null) - throw new ArgumentNullException(nameof(input)); - - return RegexReplacement.Split(this, input, count, UseOptionR() ? input.Length : 0); - } - - /// - /// Splits the string at the position defined by a previous pattern. - /// - public string[] Split(string input, int count, int startat) - { - if (input == null) - throw new ArgumentNullException(nameof(input)); - - return RegexReplacement.Split(this, input, count, startat); - } - -#if FEATURE_COMPILED - [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "assemblyname", Justification = "Microsoft: already shipped since v1 - can't fix without causing a breaking change")] - public static void CompileToAssembly(RegexCompilationInfo[] regexinfos, AssemblyName assemblyname) - { - throw new PlatformNotSupportedException(SR.PlatformNotSupported_CompileToAssembly); - } - - [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "assemblyname", Justification = "Microsoft: already shipped since v1 - can't fix without causing a breaking change")] - public static void CompileToAssembly(RegexCompilationInfo[] regexinfos, AssemblyName assemblyname, CustomAttributeBuilder[] attributes) - { - throw new PlatformNotSupportedException(SR.PlatformNotSupported_CompileToAssembly); - } - - [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "assemblyname", Justification = "Microsoft: already shipped since v1 - can't fix without causing a breaking change")] - public static void CompileToAssembly(RegexCompilationInfo[] regexinfos, AssemblyName assemblyname, CustomAttributeBuilder[] attributes, string resourceFile) - { - throw new PlatformNotSupportedException(SR.PlatformNotSupported_CompileToAssembly); - } -#endif - protected void InitializeReferences() { if (_refsInitialized) @@ -972,18 +430,15 @@ namespace System.Text.RegularExpressions _refsInitialized = true; _runnerref = new ExclusiveReference(); - _replref = new SharedReference(); + _replref = new WeakReference(null); } - - /* - * Internal worker called by all the public APIs - */ + /// + /// Internal worker called by all the public APIs + /// + /// internal Match Run(bool quick, int prevlen, string input, int beginning, int length, int startat) { - Match match; - RegexRunner runner = null; - if (startat < 0 || startat > input.Length) throw new ArgumentOutOfRangeException(nameof(startat), SR.BeginIndexNotNegative); @@ -991,21 +446,19 @@ namespace System.Text.RegularExpressions throw new ArgumentOutOfRangeException(nameof(length), SR.LengthNotNegative); // There may be a cached runner; grab ownership of it if we can. - - runner = (RegexRunner)_runnerref.Get(); + RegexRunner runner = _runnerref.Get(); // Create a RegexRunner instance if we need to - if (runner == null) { // Use the compiled RegexRunner factory if the code was compiled to MSIL - if (factory != null) runner = factory.CreateInstance(); else runner = new RegexInterpreter(_code, UseOptionInvariant() ? CultureInfo.InvariantCulture : CultureInfo.CurrentCulture); } + Match match; try { // Do the scan starting at the requested position @@ -1024,61 +477,6 @@ namespace System.Text.RegularExpressions return match; } - /* - * Find code cache based on options+pattern - */ - private static CachedCodeEntry LookupCachedAndUpdate(CachedCodeEntryKey key) - { - lock (s_livecode) - { - for (LinkedListNode current = s_livecode.First; current != null; current = current.Next) - { - if (current.Value._key == key) - { - // If we find an entry in the cache, move it to the head at the same time. - s_livecode.Remove(current); - s_livecode.AddFirst(current); - return current.Value; - } - } - } - - return null; - } - - /* - * Add current code to the cache - */ - private CachedCodeEntry CacheCode(CachedCodeEntryKey key) - { - CachedCodeEntry newcached = null; - - lock (s_livecode) - { - // first look for it in the cache and move it to the head - for (LinkedListNode current = s_livecode.First; current != null; current = current.Next) - { - if (current.Value._key == key) - { - s_livecode.Remove(current); - s_livecode.AddFirst(current); - return current.Value; - } - } - - // it wasn't in the cache, so we'll add a new one. Shortcut out for the case where cacheSize is zero. - if (s_cacheSize != 0) - { - newcached = new CachedCodeEntry(key, capnames, capslist, _code, caps, capsize, _runnerref, _replref); - s_livecode.AddFirst(newcached); - if (s_livecode.Count > s_cacheSize) - s_livecode.RemoveLast(); - } - } - - return newcached; - } - protected bool UseOptionC() { #if MOBILE @@ -1097,249 +495,15 @@ namespace System.Text.RegularExpressions /* * True if the L option was set */ - protected internal bool UseOptionR() - { - return (roptions & RegexOptions.RightToLeft) != 0; - } + protected internal bool UseOptionR() => (roptions & RegexOptions.RightToLeft) != 0; - internal bool UseOptionInvariant() - { - return (roptions & RegexOptions.CultureInvariant) != 0; - } + internal bool UseOptionInvariant() => (roptions & RegexOptions.CultureInvariant) != 0; #if DEBUG - /* - * True if the regex has debugging enabled - */ - internal bool Debug - { - get - { - return (roptions & RegexOptions.Debug) != 0; - } - } + /// + /// True if the regex has debugging enabled + /// + internal bool Debug => (roptions & RegexOptions.Debug) != 0; #endif } - - - /* - * Callback class - */ - public delegate string MatchEvaluator(Match match); - - /* - * Used as a key for CacheCodeEntry - */ - internal readonly struct CachedCodeEntryKey : IEquatable - { - private readonly RegexOptions _options; - private readonly string _cultureKey; - private readonly string _pattern; - - internal CachedCodeEntryKey(RegexOptions options, string cultureKey, string pattern) - { - _options = options; - _cultureKey = cultureKey; - _pattern = pattern; - } - - public override bool Equals(object obj) - { - return obj is CachedCodeEntryKey && Equals((CachedCodeEntryKey)obj); - } - - public bool Equals(CachedCodeEntryKey other) - { - return this == other; - } - - public static bool operator ==(CachedCodeEntryKey left, CachedCodeEntryKey right) - { - return left._options == right._options && left._cultureKey == right._cultureKey && left._pattern == right._pattern; - } - - public static bool operator !=(CachedCodeEntryKey left, CachedCodeEntryKey right) - { - return !(left == right); - } - - public override int GetHashCode() - { - return ((int)_options) ^ _cultureKey.GetHashCode() ^ _pattern.GetHashCode(); - } - } - - /* - * Used to cache byte codes - */ - internal sealed class CachedCodeEntry - { - internal CachedCodeEntryKey _key; - internal RegexCode _code; - internal Hashtable _caps; - internal Hashtable _capnames; - internal string[] _capslist; -#if FEATURE_COMPILED - internal RegexRunnerFactory _factory; -#endif - internal int _capsize; - internal ExclusiveReference _runnerref; - internal SharedReference _replref; - - internal CachedCodeEntry(CachedCodeEntryKey key, Hashtable capnames, string[] capslist, RegexCode code, Hashtable caps, int capsize, ExclusiveReference runner, SharedReference repl) - { - _key = key; - _capnames = capnames; - _capslist = capslist; - - _code = code; - _caps = caps; - _capsize = capsize; - - _runnerref = runner; - _replref = repl; - } - -#if FEATURE_COMPILED - internal void AddCompiled(RegexRunnerFactory factory) - { - _factory = factory; - _code = null; - } -#endif - } - - /* - * Used to cache one exclusive runner reference - */ - internal sealed class ExclusiveReference - { - private RegexRunner _ref; - private object _obj; - private int _locked; - - /* - * Return an object and grab an exclusive lock. - * - * If the exclusive lock can't be obtained, null is returned; - * if the object can't be returned, the lock is released. - * - */ - internal object Get() - { - // try to obtain the lock - - if (0 == Interlocked.Exchange(ref _locked, 1)) - { - // grab reference - - - object obj = _ref; - - // release the lock and return null if no reference - - if (obj == null) - { - _locked = 0; - return null; - } - - // remember the reference and keep the lock - - _obj = obj; - return obj; - } - - return null; - } - - /* - * Release an object back to the cache - * - * If the object is the one that's under lock, the lock - * is released. - * - * If there is no cached object, then the lock is obtained - * and the object is placed in the cache. - * - */ - internal void Release(object obj) - { - if (obj == null) - throw new ArgumentNullException(nameof(obj)); - - // if this reference owns the lock, release it - - if (_obj == obj) - { - _obj = null; - _locked = 0; - return; - } - - // if no reference owns the lock, try to cache this reference - - if (_obj == null) - { - // try to obtain the lock - - if (0 == Interlocked.Exchange(ref _locked, 1)) - { - // if there's really no reference, cache this reference - - if (_ref == null) - _ref = (RegexRunner)obj; - - // release the lock - - _locked = 0; - return; - } - } - } - } - - /* - * Used to cache a weak reference in a threadsafe way - */ - internal sealed class SharedReference - { - private WeakReference _ref = new WeakReference(null); - private int _locked; - - /* - * Return an object from a weakref, protected by a lock. - * - * If the exclusive lock can't be obtained, null is returned; - * - * Note that _ref.Target is referenced only under the protection - * of the lock. (Is this necessary?) - */ - internal object Get() - { - if (0 == Interlocked.Exchange(ref _locked, 1)) - { - object obj = _ref.Target; - _locked = 0; - return obj; - } - - return null; - } - - /* - * Suggest an object into a weakref, protected by a lock. - * - * Note that _ref.Target is referenced only under the protection - * of the lock. (Is this necessary?) - */ - internal void Cache(object obj) - { - if (0 == Interlocked.Exchange(ref _locked, 1)) - { - _ref.Target = obj; - _locked = 0; - } - } - } } diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexBoyerMoore.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexBoyerMoore.cs index d70e2d906b..e3bf0e7399 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexBoyerMoore.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexBoyerMoore.cs @@ -14,39 +14,32 @@ using System.Diagnostics; using System.Globalization; using System.IO; +using System.Text; namespace System.Text.RegularExpressions { internal sealed class RegexBoyerMoore { - internal readonly int[] _positive; - internal readonly int[] _negativeASCII; - internal readonly int[][] _negativeUnicode; - internal readonly string _pattern; - internal readonly int _lowASCII; - internal readonly int _highASCII; - private readonly bool _rightToLeft; - internal readonly bool _caseInsensitive; + public readonly int[] Positive; + public readonly int[] NegativeASCII; + public readonly int[][] NegativeUnicode; + public readonly string Pattern; + public readonly int LowASCII; + public readonly int HighASCII; + public readonly bool RightToLeft; + public readonly bool CaseInsensitive; private readonly CultureInfo _culture; /// /// Constructs a Boyer-Moore state machine for searching for the string /// pattern. The string must not be zero-length. /// - internal RegexBoyerMoore(string pattern, bool caseInsensitive, bool rightToLeft, CultureInfo culture) + public RegexBoyerMoore(string pattern, bool caseInsensitive, bool rightToLeft, CultureInfo culture) { // Sorry, you just can't use Boyer-Moore to find an empty pattern. // We're doing this for your own protection. (Really, for speed.) Debug.Assert(pattern.Length != 0, "RegexBoyerMoore called with an empty string. This is bad for perf"); - int beforefirst; - int last; - int bump; - int examine; - int scan; - int match; - char ch; - // We do the ToLower character by character for consistency. With surrogate chars, doing // a ToLower on the entire string could actually change the surrogate pair. This is more correct // linguistically, but since Regex doesn't support surrogates, it's more important to be @@ -59,11 +52,15 @@ namespace System.Text.RegularExpressions pattern = StringBuilderCache.GetStringAndRelease(sb); } - _pattern = pattern; - _rightToLeft = rightToLeft; - _caseInsensitive = caseInsensitive; + Pattern = pattern; + RightToLeft = rightToLeft; + CaseInsensitive = caseInsensitive; _culture = culture; + int beforefirst; + int last; + int bump; + if (!rightToLeft) { beforefirst = -1; @@ -86,12 +83,14 @@ namespace System.Text.RegularExpressions // This algorithm is a simplified variant of the standard // Boyer-Moore good suffix calculation. - _positive = new int[pattern.Length]; + Positive = new int[pattern.Length]; - examine = last; - ch = pattern[examine]; - _positive[examine] = bump; + int examine = last; + char ch = pattern[examine]; + Positive[examine] = bump; examine -= bump; + int scan; + int match; for (; ;) { @@ -118,8 +117,8 @@ namespace System.Text.RegularExpressions // at the end of the match, note the difference in _positive // this is not the length of the match, but the distance from the internal match // to the tail suffix. - if (_positive[match] == 0) - _positive[match] = match - scan; + if (Positive[match] == 0) + Positive[match] = match - scan; // System.Diagnostics.Debug.WriteLine("Set positive[" + match + "] to " + (match - scan)); @@ -146,8 +145,8 @@ namespace System.Text.RegularExpressions // should mean a little more work rather than skipping a potential match. while (match != beforefirst) { - if (_positive[match] == 0) - _positive[match] = bump; + if (Positive[match] == 0) + Positive[match] = bump; match -= bump; } @@ -164,13 +163,13 @@ namespace System.Text.RegularExpressions // appear in the string are in the table. (Maximum size with // Unicode is 65K; ASCII only case is 512 bytes.) - _negativeASCII = new int[128]; + NegativeASCII = new int[128]; for (int i = 0; i < 128; i++) - _negativeASCII[i] = last - beforefirst; + NegativeASCII[i] = last - beforefirst; - _lowASCII = 127; - _highASCII = 0; + LowASCII = 127; + HighASCII = 0; for (examine = last; examine != beforefirst; examine -= bump) { @@ -178,26 +177,26 @@ namespace System.Text.RegularExpressions if (ch < 128) { - if (_lowASCII > ch) - _lowASCII = ch; + if (LowASCII > ch) + LowASCII = ch; - if (_highASCII < ch) - _highASCII = ch; + if (HighASCII < ch) + HighASCII = ch; - if (_negativeASCII[ch] == last - beforefirst) - _negativeASCII[ch] = last - examine; + if (NegativeASCII[ch] == last - beforefirst) + NegativeASCII[ch] = last - examine; } else { int i = ch >> 8; int j = ch & 0xFF; - if (_negativeUnicode == null) + if (NegativeUnicode == null) { - _negativeUnicode = new int[256][]; + NegativeUnicode = new int[256][]; } - if (_negativeUnicode[i] == null) + if (NegativeUnicode[i] == null) { int[] newarray = new int[256]; @@ -206,63 +205,64 @@ namespace System.Text.RegularExpressions if (i == 0) { - Array.Copy(_negativeASCII, 0, newarray, 0, 128); - _negativeASCII = newarray; + Array.Copy(NegativeASCII, 0, newarray, 0, 128); + NegativeASCII = newarray; } - _negativeUnicode[i] = newarray; + NegativeUnicode[i] = newarray; } - if (_negativeUnicode[i][j] == last - beforefirst) - _negativeUnicode[i][j] = last - examine; + if (NegativeUnicode[i][j] == last - beforefirst) + NegativeUnicode[i][j] = last - examine; } } } private bool MatchPattern(string text, int index) { - if (_caseInsensitive) + if (CaseInsensitive) { - if (text.Length - index < _pattern.Length) + if (text.Length - index < Pattern.Length) { return false; } TextInfo textinfo = _culture.TextInfo; - for (int i = 0; i < _pattern.Length; i++) + for (int i = 0; i < Pattern.Length; i++) { - Debug.Assert(textinfo.ToLower(_pattern[i]) == _pattern[i], "pattern should be converted to lower case in constructor!"); - if (textinfo.ToLower(text[index + i]) != _pattern[i]) + Debug.Assert(textinfo.ToLower(Pattern[i]) == Pattern[i], "pattern should be converted to lower case in constructor!"); + if (textinfo.ToLower(text[index + i]) != Pattern[i]) { return false; } } + return true; } else { - return (0 == string.CompareOrdinal(_pattern, 0, text, index, _pattern.Length)); + return (0 == string.CompareOrdinal(Pattern, 0, text, index, Pattern.Length)); } } /// /// When a regex is anchored, we can do a quick IsMatch test instead of a Scan /// - internal bool IsMatch(string text, int index, int beglimit, int endlimit) + public bool IsMatch(string text, int index, int beglimit, int endlimit) { - if (!_rightToLeft) + if (!RightToLeft) { - if (index < beglimit || endlimit - index < _pattern.Length) + if (index < beglimit || endlimit - index < Pattern.Length) return false; return MatchPattern(text, index); } else { - if (index > endlimit || index - beglimit < _pattern.Length) + if (index > endlimit || index - beglimit < Pattern.Length) return false; - return MatchPattern(text, index - _pattern.Length); + return MatchPattern(text, index - Pattern.Length); } } @@ -274,38 +274,37 @@ namespace System.Text.RegularExpressions /// The direction and case-sensitivity of the match is determined /// by the arguments to the RegexBoyerMoore constructor. /// - internal int Scan(string text, int index, int beglimit, int endlimit) + public int Scan(string text, int index, int beglimit, int endlimit) { + int defadv; int test; - int test2; - int match; int startmatch; int endmatch; - int advance; - int defadv; int bump; - char chMatch; - char chTest; - int[] unicodeLookup; - if (!_rightToLeft) + if (!RightToLeft) { - defadv = _pattern.Length; - startmatch = _pattern.Length - 1; + defadv = Pattern.Length; + startmatch = Pattern.Length - 1; endmatch = 0; test = index + defadv - 1; bump = 1; } else { - defadv = -_pattern.Length; + defadv = -Pattern.Length; startmatch = 0; endmatch = -defadv - 1; test = index + defadv; bump = -1; } - chMatch = _pattern[startmatch]; + char chMatch = Pattern[startmatch]; + char chTest; + int test2; + int match; + int advance; + int[] unicodeLookup; for (; ;) { @@ -314,14 +313,14 @@ namespace System.Text.RegularExpressions chTest = text[test]; - if (_caseInsensitive) + if (CaseInsensitive) chTest = _culture.TextInfo.ToLower(chTest); if (chTest != chMatch) { if (chTest < 128) - advance = _negativeASCII[chTest]; - else if (null != _negativeUnicode && (null != (unicodeLookup = _negativeUnicode[chTest >> 8]))) + advance = NegativeASCII[chTest]; + else if (null != NegativeUnicode && (null != (unicodeLookup = NegativeUnicode[chTest >> 8]))) advance = unicodeLookup[chTest & 0xFF]; else advance = defadv; @@ -336,22 +335,22 @@ namespace System.Text.RegularExpressions for (; ;) { if (match == endmatch) - return (_rightToLeft ? test2 + 1 : test2); + return (RightToLeft ? test2 + 1 : test2); match -= bump; test2 -= bump; chTest = text[test2]; - if (_caseInsensitive) + if (CaseInsensitive) chTest = _culture.TextInfo.ToLower(chTest); - if (chTest != _pattern[match]) + if (chTest != Pattern[match]) { - advance = _positive[match]; + advance = Positive[match]; if ((chTest & 0xFF80) == 0) - test2 = (match - startmatch) + _negativeASCII[chTest]; - else if (null != _negativeUnicode && (null != (unicodeLookup = _negativeUnicode[chTest >> 8]))) + test2 = (match - startmatch) + NegativeASCII[chTest]; + else if (null != NegativeUnicode && (null != (unicodeLookup = NegativeUnicode[chTest >> 8]))) test2 = (match - startmatch) + unicodeLookup[chTest & 0xFF]; else { @@ -359,7 +358,7 @@ namespace System.Text.RegularExpressions break; } - if (_rightToLeft ? test2 < advance : test2 > advance) + if (RightToLeft ? test2 < advance : test2 > advance) advance = test2; test += advance; @@ -370,35 +369,32 @@ namespace System.Text.RegularExpressions } } +#if DEBUG /// /// Used when dumping for debugging. /// - public override string ToString() - { - return _pattern; - } + public override string ToString() => Pattern; -#if DEBUG public string Dump(string indent) { StringBuilder sb = new StringBuilder(); - sb.Append(indent + "BM Pattern: " + _pattern + "\n"); + sb.Append(indent + "BM Pattern: " + Pattern + "\n"); sb.Append(indent + "Positive: "); - for (int i = 0; i < _positive.Length; i++) + for (int i = 0; i < Positive.Length; i++) { - sb.Append(_positive[i].ToString(CultureInfo.InvariantCulture) + " "); + sb.Append(Positive[i].ToString(CultureInfo.InvariantCulture) + " "); } sb.Append("\n"); - if (_negativeASCII != null) + if (NegativeASCII != null) { sb.Append(indent + "Negative table\n"); - for (int i = 0; i < _negativeASCII.Length; i++) + for (int i = 0; i < NegativeASCII.Length; i++) { - if (_negativeASCII[i] != _pattern.Length) + if (NegativeASCII[i] != Pattern.Length) { - sb.Append(indent + " " + Regex.Escape(Convert.ToString((char)i, CultureInfo.InvariantCulture)) + " " + _negativeASCII[i].ToString(CultureInfo.InvariantCulture) + "\n"); + sb.Append(indent + " " + Regex.Escape(Convert.ToString((char)i, CultureInfo.InvariantCulture)) + " " + NegativeASCII[i].ToString(CultureInfo.InvariantCulture) + "\n"); } } } diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCapture.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCapture.cs deleted file mode 100644 index 060d1a0652..0000000000 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCapture.cs +++ /dev/null @@ -1,106 +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. - -// Capture is just a location/length pair that indicates the -// location of a regular expression match. A single regexp -// search may return multiple Capture within each capturing -// RegexGroup. - -namespace System.Text.RegularExpressions -{ - /// - /// Represents the results from a single subexpression capture. The object represents - /// one substring for a single successful capture. - /// - [Serializable] - public class Capture - { - internal string _text; - internal int _index; - internal int _length; - - internal Capture(string text, int i, int l) - { - _text = text; - _index = i; - _length = l; - } - - /* - * The index of the beginning of the matched capture - */ - /// - /// Returns the position in the original string where the first character of - /// captured substring was found. - /// - public int Index - { - get - { - return _index; - } - } - - /* - * The length of the matched capture - */ - /// - /// Returns the length of the captured substring. - /// - public int Length - { - get - { - return _length; - } - } - - /// - /// Returns the value of this Regex Capture. - /// - public string Value - { - get - { - return _text.Substring(_index, _length); - } - } - - /* - * The capture as a string - */ - /// - /// Returns the substring that was matched. - /// - override public string ToString() - { - return Value; - } - - /* - * The original string - */ - internal string GetOriginalString() - { - return _text; - } - - /* - * The substring to the left of the capture - */ - internal string GetLeftSubstring() - { - return _text.Substring(0, _index); - } - - /* - * The substring to the right of the capture - */ - internal string GetRightSubstring() - { - return _text.Substring(_index + _length, _text.Length - _index - _length); - } - - } -} diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCharClass.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCharClass.cs index d4ab864958..05f2811a5a 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCharClass.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCharClass.cs @@ -24,18 +24,12 @@ using System.Collections.Generic; using System.Diagnostics; using System.Globalization; using System.IO; +using System.Text; namespace System.Text.RegularExpressions { internal sealed class RegexCharClass { - // instance data - private List _rangelist; - private StringBuilder _categories; - private bool _canonical; - private bool _negate; - private RegexCharClass _subtractor; - // Constants private const int FLAGS = 0; private const int SETLENGTH = 1; @@ -43,32 +37,28 @@ namespace System.Text.RegularExpressions private const int SETSTART = 3; private const string NullCharString = "\0"; - private const char NullChar = '\0'; private const char LastChar = '\uFFFF'; - private const char GroupChar = (char)0; - private const short SpaceConst = 100; private const short NotSpaceConst = -100; private const char ZeroWidthJoiner = '\u200D'; private const char ZeroWidthNonJoiner = '\u200C'; - private static readonly string s_internalRegexIgnoreCase = "__InternalRegexIgnoreCase__"; private static readonly string s_space = "\x64"; private static readonly string s_notSpace = "\uFF9C"; private static readonly string s_word = "\u0000\u0002\u0004\u0005\u0003\u0001\u0006\u0009\u0013\u0000"; private static readonly string s_notWord = "\u0000\uFFFE\uFFFC\uFFFB\uFFFD\uFFFF\uFFFA\uFFF7\uFFED\u0000"; - internal static readonly string SpaceClass = "\u0000\u0000\u0001\u0064"; - internal static readonly string NotSpaceClass = "\u0001\u0000\u0001\u0064"; - internal static readonly string WordClass = "\u0000\u0000\u000A\u0000\u0002\u0004\u0005\u0003\u0001\u0006\u0009\u0013\u0000"; - internal static readonly string NotWordClass = "\u0001\u0000\u000A\u0000\u0002\u0004\u0005\u0003\u0001\u0006\u0009\u0013\u0000"; - internal static readonly string DigitClass = "\u0000\u0000\u0001\u0009"; - internal static readonly string NotDigitClass = "\u0000\u0000\u0001\uFFF7"; + public static readonly string SpaceClass = "\u0000\u0000\u0001\u0064"; + public static readonly string NotSpaceClass = "\u0001\u0000\u0001\u0064"; + public static readonly string WordClass = "\u0000\u0000\u000A\u0000\u0002\u0004\u0005\u0003\u0001\u0006\u0009\u0013\u0000"; + public static readonly string NotWordClass = "\u0001\u0000\u000A\u0000\u0002\u0004\u0005\u0003\u0001\u0006\u0009\u0013\u0000"; + public static readonly string DigitClass = "\u0000\u0000\u0001\u0009"; + public static readonly string NotDigitClass = "\u0000\u0000\u0001\uFFF7"; private const string ECMASpaceSet = "\u0009\u000E\u0020\u0021"; private const string NotECMASpaceSet = "\0\u0009\u000E\u0020\u0021"; @@ -77,15 +67,15 @@ namespace System.Text.RegularExpressions private const string ECMADigitSet = "\u0030\u003A"; private const string NotECMADigitSet = "\0\u0030\u003A"; - internal const string ECMASpaceClass = "\x00\x04\x00" + ECMASpaceSet; - internal const string NotECMASpaceClass = "\x01\x04\x00" + ECMASpaceSet; - internal const string ECMAWordClass = "\x00\x0A\x00" + ECMAWordSet; - internal const string NotECMAWordClass = "\x01\x0A\x00" + ECMAWordSet; - internal const string ECMADigitClass = "\x00\x02\x00" + ECMADigitSet; - internal const string NotECMADigitClass = "\x01\x02\x00" + ECMADigitSet; + public const string ECMASpaceClass = "\x00\x04\x00" + ECMASpaceSet; + public const string NotECMASpaceClass = "\x01\x04\x00" + ECMASpaceSet; + public const string ECMAWordClass = "\x00\x0A\x00" + ECMAWordSet; + public const string NotECMAWordClass = "\x01\x0A\x00" + ECMAWordSet; + public const string ECMADigitClass = "\x00\x02\x00" + ECMADigitSet; + public const string NotECMADigitClass = "\x01\x02\x00" + ECMADigitSet; - internal const string AnyClass = "\x00\x01\x00\x00"; - internal const string EmptyClass = "\x00\x00\x00"; + public const string AnyClass = "\x00\x01\x00\x00"; + public const string EmptyClass = "\x00\x00\x00"; // UnicodeCategory is zero based, so we add one to each value and subtract it off later private const int DefinedCategoriesCapacity = 38; @@ -279,7 +269,6 @@ namespace System.Text.RegularExpressions +"\u3041\u3097\u3099\u30A0\u30A1\u30FB\u30FC\u3100\u3105\u312D\u3131\u318F\u3190\u31B8\u31F0\u321D\u3220\u3244\u3251\u327C\u327F\u32CC\u32D0\u32FF\u3300\u3377\u337B\u33DE\u33E0\u33FF\u3400\u4DB6\u4E00\u9FA6\uA000\uA48D\uA490\uA4C7\uAC00\uD7A4\uF900\uFA2E\uFA30\uFA6B\uFB00\uFB07\uFB13\uFB18\uFB1D\uFB37\uFB38\uFB3D\uFB3E\uFB3F\uFB40\uFB42\uFB43\uFB45\uFB46\uFBB2\uFBD3\uFD3E\uFD50\uFD90\uFD92\uFDC8\uFDF0\uFDFD\uFE00\uFE10\uFE20\uFE24\uFE62\uFE63\uFE64\uFE67\uFE69\uFE6A\uFE70\uFE75\uFE76\uFEFD\uFF04\uFF05\uFF0B\uFF0C\uFF10\uFF1A\uFF1C\uFF1F\uFF21\uFF3B\uFF3E\uFF3F\uFF40\uFF5B\uFF5C\uFF5D\uFF5E\uFF5F\uFF66\uFFBF\uFFC2\uFFC8\uFFCA\uFFD0\uFFD2\uFFD8\uFFDA\uFFDD\uFFE0\uFFE7\uFFE8\uFFEF\uFFFC\uFFFE"}, }; - /************************************************************************** Let U be the set of Unicode character values and let L be the lowercase function, mapping from U to U. To perform case insensitive matching of @@ -411,6 +400,12 @@ namespace System.Text.RegularExpressions new LowerCaseMapping('\uFF21', '\uFF3A', LowercaseAdd, 32), }; + private List _rangelist; + private StringBuilder _categories; + private bool _canonical; + private bool _negate; + private RegexCharClass _subtractor; + #if DEBUG static RegexCharClass() { @@ -432,7 +427,7 @@ namespace System.Text.RegularExpressions /// /// Creates an empty character class. /// - internal RegexCharClass() + public RegexCharClass() { _rangelist = new List(6); _canonical = true; @@ -448,7 +443,7 @@ namespace System.Text.RegularExpressions _subtractor = subtraction; } - internal bool CanMerge + public bool CanMerge { get { @@ -456,12 +451,12 @@ namespace System.Text.RegularExpressions } } - internal bool Negate + public bool Negate { set { _negate = value; } } - internal void AddChar(char c) + public void AddChar(char c) { AddRange(c, c); } @@ -469,7 +464,7 @@ namespace System.Text.RegularExpressions /// /// Adds a regex char class /// - internal void AddCharClass(RegexCharClass cc) + public void AddCharClass(RegexCharClass cc) { int i; @@ -480,7 +475,7 @@ namespace System.Text.RegularExpressions // if the new char class to add isn't canonical, we're not either. _canonical = false; } - else if (_canonical && RangeCount() > 0 && cc.RangeCount() > 0 && cc.GetRangeAt(0)._first <= GetRangeAt(RangeCount() - 1)._last) + else if (_canonical && RangeCount() > 0 && cc.RangeCount() > 0 && cc.GetRangeAt(0).First <= GetRangeAt(RangeCount() - 1).Last) _canonical = false; for (i = 0; i < cc.RangeCount(); i += 1) @@ -499,7 +494,7 @@ namespace System.Text.RegularExpressions int i; if (_canonical && RangeCount() > 0 && set.Length > 0 && - set[0] <= GetRangeAt(RangeCount() - 1)._last) + set[0] <= GetRangeAt(RangeCount() - 1).Last) _canonical = false; for (i = 0; i < set.Length - 1; i += 2) @@ -513,7 +508,7 @@ namespace System.Text.RegularExpressions } } - internal void AddSubtraction(RegexCharClass sub) + public void AddSubtraction(RegexCharClass sub) { Debug.Assert(_subtractor == null, "Can't add two subtractions to a char class. "); _subtractor = sub; @@ -522,20 +517,19 @@ namespace System.Text.RegularExpressions /// /// Adds a single range of characters to the class. /// - internal void AddRange(char first, char last) + public void AddRange(char first, char last) { _rangelist.Add(new SingleRange(first, last)); if (_canonical && _rangelist.Count > 0 && - first <= _rangelist[_rangelist.Count - 1]._last) + first <= _rangelist[_rangelist.Count - 1].Last) { _canonical = false; } } - internal void AddCategoryFromName(string categoryName, bool invert, bool caseInsensitive, string pattern) + public void AddCategoryFromName(string categoryName, bool invert, bool caseInsensitive, string pattern) { - string category; - if (s_definedCategories.TryGetValue(categoryName, out category) && !categoryName.Equals(s_internalRegexIgnoreCase)) + if (s_definedCategories.TryGetValue(categoryName, out string category) && !categoryName.Equals(s_internalRegexIgnoreCase)) { if (caseInsensitive) { @@ -562,7 +556,7 @@ namespace System.Text.RegularExpressions /// Adds to the class any lowercase versions of characters already /// in the class. Used for case-insensitivity. /// - internal void AddLowercase(CultureInfo culture) + public void AddLowercase(CultureInfo culture) { _canonical = false; @@ -570,14 +564,14 @@ namespace System.Text.RegularExpressions for (int i = 0; i < count; i++) { SingleRange range = _rangelist[i]; - if (range._first == range._last) + if (range.First == range.Last) { - char lower = culture.TextInfo.ToLower(range._first); + char lower = culture.TextInfo.ToLower(range.First); _rangelist[i] = new SingleRange(lower, lower); } else { - AddLowercaseRange(range._first, range._last, culture); + AddLowercaseRange(range.First, range.Last, culture); } } } @@ -595,7 +589,7 @@ namespace System.Text.RegularExpressions for (i = 0, iMax = s_lcTable.Length; i < iMax;) { iMid = (i + iMax) / 2; - if (s_lcTable[iMid]._chMax < chMin) + if (s_lcTable[iMid].ChMax < chMin) i = iMid + 1; else iMax = iMid; @@ -604,25 +598,25 @@ namespace System.Text.RegularExpressions if (i >= s_lcTable.Length) return; - for (; i < s_lcTable.Length && (lc = s_lcTable[i])._chMin <= chMax; i++) + for (; i < s_lcTable.Length && (lc = s_lcTable[i]).ChMin <= chMax; i++) { - if ((chMinT = lc._chMin) < chMin) + if ((chMinT = lc.ChMin) < chMin) chMinT = chMin; - if ((chMaxT = lc._chMax) > chMax) + if ((chMaxT = lc.ChMax) > chMax) chMaxT = chMax; - switch (lc._lcOp) + switch (lc.LcOp) { case LowercaseSet: - chMinT = (char)lc._data; - chMaxT = (char)lc._data; + chMinT = (char)lc.Data; + chMaxT = (char)lc.Data; break; case LowercaseAdd: unchecked { - chMinT += (char)lc._data; - chMaxT += (char)lc._data; + chMinT += (char)lc.Data; + chMaxT += (char)lc.Data; } break; case LowercaseBor: @@ -640,7 +634,7 @@ namespace System.Text.RegularExpressions } } - internal void AddWord(bool ecma, bool negate) + public void AddWord(bool ecma, bool negate) { if (negate) { @@ -658,7 +652,7 @@ namespace System.Text.RegularExpressions } } - internal void AddSpace(bool ecma, bool negate) + public void AddSpace(bool ecma, bool negate) { if (negate) { @@ -676,7 +670,7 @@ namespace System.Text.RegularExpressions } } - internal void AddDigit(bool ecma, bool negate, string pattern) + public void AddDigit(bool ecma, bool negate, string pattern) { if (ecma) { @@ -689,7 +683,7 @@ namespace System.Text.RegularExpressions AddCategoryFromName("Nd", negate, false, pattern); } - internal static string ConvertOldStringsToClass(string set, string category) + public static string ConvertOldStringsToClass(string set, string category) { StringBuilder sb = StringBuilderCache.Acquire(set.Length + category.Length + 3); @@ -715,29 +709,26 @@ namespace System.Text.RegularExpressions /// /// Returns the char /// - internal static char SingletonChar(string set) + public static char SingletonChar(string set) { Debug.Assert(IsSingleton(set) || IsSingletonInverse(set), "Tried to get the singleton char out of a non singleton character class"); return set[SETSTART]; } - internal static bool IsMergeable(string charClass) + public static bool IsMergeable(string charClass) { return (!IsNegated(charClass) && !IsSubtraction(charClass)); } - internal static bool IsEmpty(string charClass) + public static bool IsEmpty(string charClass) { - if (charClass[CATEGORYLENGTH] == 0 && charClass[FLAGS] == 0 && charClass[SETLENGTH] == 0 && !IsSubtraction(charClass)) - return true; - else - return false; + return (charClass[CATEGORYLENGTH] == 0 && charClass[FLAGS] == 0 && charClass[SETLENGTH] == 0 && !IsSubtraction(charClass)); } /// /// true if the set contains a single character only /// - internal static bool IsSingleton(string set) + public static bool IsSingleton(string set) { if (set[FLAGS] == 0 && set[CATEGORYLENGTH] == 0 && set[SETLENGTH] == 2 && !IsSubtraction(set) && (set[SETSTART] == LastChar || set[SETSTART] + 1 == set[SETSTART + 1])) @@ -746,7 +737,7 @@ namespace System.Text.RegularExpressions return false; } - internal static bool IsSingletonInverse(string set) + public static bool IsSingletonInverse(string set) { if (set[FLAGS] == 1 && set[CATEGORYLENGTH] == 0 && set[SETLENGTH] == 2 && !IsSubtraction(set) && (set[SETSTART] == LastChar || set[SETSTART] + 1 == set[SETSTART + 1])) @@ -760,12 +751,12 @@ namespace System.Text.RegularExpressions return (charClass.Length > SETSTART + charClass[SETLENGTH] + charClass[CATEGORYLENGTH]); } - internal static bool IsNegated(string set) + private static bool IsNegated(string set) { return (set != null && set[FLAGS] == 1); } - internal static bool IsECMAWordChar(char ch) + public static bool IsECMAWordChar(char ch) { // According to ECMA-262, \s, \S, ., ^, and $ use Unicode-based interpretations of // whitespace and newline, while \d, \D\, \w, \W, \b, and \B use ASCII-only @@ -775,7 +766,7 @@ namespace System.Text.RegularExpressions return CharInClass(ch, ECMAWordClass); } - internal static bool IsWordChar(char ch) + public static bool IsWordChar(char ch) { // According to UTS#18 Unicode Regular Expressions (http://www.unicode.org/reports/tr18/) // RL 1.4 Simple Word Boundaries The class of includes all Alphabetic @@ -784,13 +775,12 @@ namespace System.Text.RegularExpressions return CharInClass(ch, WordClass) || ch == ZeroWidthJoiner || ch == ZeroWidthNonJoiner; } - internal static bool CharInClass(char ch, string set) + public static bool CharInClass(char ch, string set) { return CharInClassRecursive(ch, set, 0); } - - internal static bool CharInClassRecursive(char ch, string set, int start) + private static bool CharInClassRecursive(char ch, string set, int start) { int mySetLength = set[start + SETLENGTH]; int myCategoryLength = set[start + CATEGORYLENGTH]; @@ -977,7 +967,7 @@ namespace System.Text.RegularExpressions return StringBuilderCache.GetStringAndRelease(sb); } - internal static RegexCharClass Parse(string charClass) + public static RegexCharClass Parse(string charClass) { return ParseRecursive(charClass, 0); } @@ -1023,7 +1013,7 @@ namespace System.Text.RegularExpressions /// /// Constructs the string representation of the class. /// - internal string ToStringClass() + public string ToStringClass() { if (!_canonical) Canonicalize(); @@ -1047,10 +1037,10 @@ namespace System.Text.RegularExpressions for (int i = 0; i < _rangelist.Count; i++) { SingleRange currentRange = _rangelist[i]; - sb.Append(currentRange._first); + sb.Append(currentRange.First); - if (currentRange._last != LastChar) - sb.Append((char)(currentRange._last + 1)); + if (currentRange.Last != LastChar) + sb.Append((char)(currentRange.Last + 1)); } sb[SETLENGTH] = (char)(sb.Length - SETSTART); @@ -1095,7 +1085,7 @@ namespace System.Text.RegularExpressions for (i = 1, j = 0; ; i++) { - for (last = _rangelist[j]._last; ; i++) + for (last = _rangelist[j].Last; ; i++) { if (i == _rangelist.Count || last == LastChar) { @@ -1103,14 +1093,14 @@ namespace System.Text.RegularExpressions break; } - if ((CurrentRange = _rangelist[i])._first > last + 1) + if ((CurrentRange = _rangelist[i]).First > last + 1) break; - if (last < CurrentRange._last) - last = CurrentRange._last; + if (last < CurrentRange.Last) + last = CurrentRange.Last; } - _rangelist[j] = new SingleRange(_rangelist[j]._first, last); + _rangelist[j] = new SingleRange(_rangelist[j].First, last); j++; @@ -1159,10 +1149,20 @@ namespace System.Text.RegularExpressions #if DEBUG + public static readonly char[] Hex = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; + public static readonly string[] Categories = new string[] {"Lu", "Ll", "Lt", "Lm", "Lo", s_internalRegexIgnoreCase, + "Mn", "Mc", "Me", + "Nd", "Nl", "No", + "Zs", "Zl", "Zp", + "Cc", "Cf", "Cs", "Co", + "Pc", "Pd", "Ps", "Pe", "Pi", "Pf", "Po", + "Sm", "Sc", "Sk", "So", + "Cn" }; + /// /// Produces a human-readable description for a set string. /// - internal static string SetDescription(string set) + public static string SetDescription(string set) { int mySetLength = set[SETLENGTH]; int myCategoryLength = set[CATEGORYLENGTH]; @@ -1208,7 +1208,7 @@ namespace System.Text.RegularExpressions int lastindex = set.IndexOf(GroupChar, index + 1); string group = set.Substring(index, lastindex - index + 1); - foreach (var kvp in s_definedCategories) + foreach (KeyValuePair kvp in s_definedCategories) { if (group.Equals(kvp.Value)) { @@ -1256,20 +1256,10 @@ namespace System.Text.RegularExpressions return desc.ToString(); } - internal static readonly char[] Hex = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; - internal static readonly string[] Categories = new string[] {"Lu", "Ll", "Lt", "Lm", "Lo", s_internalRegexIgnoreCase, - "Mn", "Mc", "Me", - "Nd", "Nl", "No", - "Zs", "Zl", "Zp", - "Cc", "Cf", "Cs", "Co", - "Pc", "Pd", "Ps", "Pe", "Pi", "Pf", "Po", - "Sm", "Sc", "Sk", "So", - "Cn" }; - /// /// Produces a human-readable description for a single character. /// - internal static string CharDescription(char ch) + public static string CharDescription(char ch) { if (ch == '\\') return "\\\\"; @@ -1325,18 +1315,18 @@ namespace System.Text.RegularExpressions /// private readonly struct LowerCaseMapping { + public readonly char ChMin; + public readonly char ChMax; + public readonly int LcOp; + public readonly int Data; + internal LowerCaseMapping(char chMin, char chMax, int lcOp, int data) { - _chMin = chMin; - _chMax = chMax; - _lcOp = lcOp; - _data = data; + ChMin = chMin; + ChMax = chMax; + LcOp = lcOp; + Data = data; } - - internal readonly char _chMin; - internal readonly char _chMax; - internal readonly int _lcOp; - internal readonly int _data; } /// @@ -1352,7 +1342,7 @@ namespace System.Text.RegularExpressions public int Compare(SingleRange x, SingleRange y) { - return x._first.CompareTo(y._first); + return x.First.CompareTo(y.First); } } @@ -1361,14 +1351,14 @@ namespace System.Text.RegularExpressions /// private readonly struct SingleRange { + public readonly char First; + public readonly char Last; + internal SingleRange(char first, char last) { - _first = first; - _last = last; + First = first; + Last = last; } - - internal readonly char _first; - internal readonly char _last; } } } diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCode.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCode.cs index b500772081..21738410f0 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCode.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCode.cs @@ -27,98 +27,98 @@ namespace System.Text.RegularExpressions // The following primitive operations come directly from the parser // lef/back operands description - internal const int Onerep = 0; // lef,back char,min,max a {n} - internal const int Notonerep = 1; // lef,back char,min,max .{n} - internal const int Setrep = 2; // lef,back set,min,max [\d]{n} + public const int Onerep = 0; // lef,back char,min,max a {n} + public const int Notonerep = 1; // lef,back char,min,max .{n} + public const int Setrep = 2; // lef,back set,min,max [\d]{n} - internal const int Oneloop = 3; // lef,back char,min,max a {,n} - internal const int Notoneloop = 4; // lef,back char,min,max .{,n} - internal const int Setloop = 5; // lef,back set,min,max [\d]{,n} + public const int Oneloop = 3; // lef,back char,min,max a {,n} + public const int Notoneloop = 4; // lef,back char,min,max .{,n} + public const int Setloop = 5; // lef,back set,min,max [\d]{,n} - internal const int Onelazy = 6; // lef,back char,min,max a {,n}? - internal const int Notonelazy = 7; // lef,back char,min,max .{,n}? - internal const int Setlazy = 8; // lef,back set,min,max [\d]{,n}? + public const int Onelazy = 6; // lef,back char,min,max a {,n}? + public const int Notonelazy = 7; // lef,back char,min,max .{,n}? + public const int Setlazy = 8; // lef,back set,min,max [\d]{,n}? - internal const int One = 9; // lef char a - internal const int Notone = 10; // lef char [^a] - internal const int Set = 11; // lef set [a-z\s] \w \s \d + public const int One = 9; // lef char a + public const int Notone = 10; // lef char [^a] + public const int Set = 11; // lef set [a-z\s] \w \s \d - internal const int Multi = 12; // lef string abcd - internal const int Ref = 13; // lef group \# + public const int Multi = 12; // lef string abcd + public const int Ref = 13; // lef group \# - internal const int Bol = 14; // ^ - internal const int Eol = 15; // $ - internal const int Boundary = 16; // \b - internal const int Nonboundary = 17; // \B - internal const int Beginning = 18; // \A - internal const int Start = 19; // \G - internal const int EndZ = 20; // \Z - internal const int End = 21; // \Z + public const int Bol = 14; // ^ + public const int Eol = 15; // $ + public const int Boundary = 16; // \b + public const int Nonboundary = 17; // \B + public const int Beginning = 18; // \A + public const int Start = 19; // \G + public const int EndZ = 20; // \Z + public const int End = 21; // \Z - internal const int Nothing = 22; // Reject! + public const int Nothing = 22; // Reject! // Primitive control structures - internal const int Lazybranch = 23; // back jump straight first - internal const int Branchmark = 24; // back jump branch first for loop - internal const int Lazybranchmark = 25; // back jump straight first for loop - internal const int Nullcount = 26; // back val set counter, null mark - internal const int Setcount = 27; // back val set counter, make mark - internal const int Branchcount = 28; // back jump,limit branch++ if zero<=c impl group slots - internal readonly int _capsize; // number of impl group slots - internal readonly RegexPrefix _fcPrefix; // the set of candidate first characters (may be null) - internal readonly RegexBoyerMoore _bmPrefix; // the fixed prefix string as a Boyer-Moore machine (may be null) - internal readonly int _anchors; // the set of zero-length start anchors (RegexFCD.Bol, etc) - internal readonly bool _rightToLeft; // true if right to left + public readonly int[] Codes; // the code + public readonly string[] Strings; // the string/set table + public readonly int TrackCount; // how many instructions use backtracking + public readonly Hashtable Caps; // mapping of user group numbers -> impl group slots + public readonly int CapSize; // number of impl group slots + public readonly RegexPrefix? FCPrefix; // the set of candidate first characters (may be null) + public readonly RegexBoyerMoore BMPrefix; // the fixed prefix string as a Boyer-Moore machine (may be null) + public readonly int Anchors; // the set of zero-length start anchors (RegexFCD.Bol, etc) + public readonly bool RightToLeft; // true if right to left - internal RegexCode(int[] codes, List stringlist, int trackcount, + public RegexCode(int[] codes, List stringlist, int trackcount, Hashtable caps, int capsize, - RegexBoyerMoore bmPrefix, RegexPrefix fcPrefix, + RegexBoyerMoore bmPrefix, RegexPrefix? fcPrefix, int anchors, bool rightToLeft) { Debug.Assert(codes != null, "codes cannot be null."); Debug.Assert(stringlist != null, "stringlist cannot be null."); - _codes = codes; - _strings = stringlist.ToArray(); - _trackcount = trackcount; - _caps = caps; - _capsize = capsize; - _bmPrefix = bmPrefix; - _fcPrefix = fcPrefix; - _anchors = anchors; - _rightToLeft = rightToLeft; + Codes = codes; + Strings = stringlist.ToArray(); + TrackCount = trackcount; + Caps = caps; + CapSize = capsize; + BMPrefix = bmPrefix; + FCPrefix = fcPrefix; + Anchors = anchors; + RightToLeft = rightToLeft; } - internal static bool OpcodeBacktracks(int Op) + public static bool OpcodeBacktracks(int Op) { Op &= Mask; @@ -151,7 +151,7 @@ namespace System.Text.RegularExpressions } } - internal static int OpcodeSize(int opcode) + public static int OpcodeSize(int opcode) { opcode &= Mask; @@ -212,7 +212,7 @@ namespace System.Text.RegularExpressions } #if DEBUG - private static readonly string[] CodeStr = new string[] + private static readonly string[] s_codeStr = new string[] { "Onerep", "Notonerep", "Setrep", "Oneloop", "Notoneloop", "Setloop", @@ -231,21 +231,21 @@ namespace System.Text.RegularExpressions #endif }; - internal static string OperatorDescription(int Opcode) + private static string OperatorDescription(int Opcode) { bool isCi = ((Opcode & Ci) != 0); bool isRtl = ((Opcode & Rtl) != 0); bool isBack = ((Opcode & Back) != 0); bool isBack2 = ((Opcode & Back2) != 0); - return CodeStr[Opcode & Mask] + + return s_codeStr[Opcode & Mask] + (isCi ? "-Ci" : "") + (isRtl ? "-Rtl" : "") + (isBack ? "-Back" : "") + (isBack2 ? "-Back2" : ""); } - internal string OpcodeDescription(int offset) + public string OpcodeDescription(int offset) { StringBuilder sb = new StringBuilder(); - int opcode = _codes[offset]; + int opcode = Codes[offset]; sb.AppendFormat("{0:D6} ", offset); sb.Append(OpcodeBacktracks(opcode & Mask) ? '*' : ' '); @@ -265,7 +265,7 @@ namespace System.Text.RegularExpressions case Onelazy: case Notonelazy: sb.Append("Ch = "); - sb.Append(RegexCharClass.CharDescription((char)_codes[offset + 1])); + sb.Append(RegexCharClass.CharDescription((char)Codes[offset + 1])); break; case Set: @@ -273,34 +273,34 @@ namespace System.Text.RegularExpressions case Setloop: case Setlazy: sb.Append("Set = "); - sb.Append(RegexCharClass.SetDescription(_strings[_codes[offset + 1]])); + sb.Append(RegexCharClass.SetDescription(Strings[Codes[offset + 1]])); break; case Multi: sb.Append("String = "); - sb.Append(_strings[_codes[offset + 1]]); + sb.Append(Strings[Codes[offset + 1]]); break; case Ref: case Testref: sb.Append("Index = "); - sb.Append(_codes[offset + 1]); + sb.Append(Codes[offset + 1]); break; case Capturemark: sb.Append("Index = "); - sb.Append(_codes[offset + 1]); - if (_codes[offset + 2] != -1) + sb.Append(Codes[offset + 1]); + if (Codes[offset + 2] != -1) { sb.Append(", Unindex = "); - sb.Append(_codes[offset + 2]); + sb.Append(Codes[offset + 2]); } break; case Nullcount: case Setcount: sb.Append("Value = "); - sb.Append(_codes[offset + 1]); + sb.Append(Codes[offset + 1]); break; case Goto: @@ -310,7 +310,7 @@ namespace System.Text.RegularExpressions case Branchcount: case Lazybranchcount: sb.Append("Addr = "); - sb.Append(_codes[offset + 1]); + sb.Append(Codes[offset + 1]); break; } @@ -326,19 +326,19 @@ namespace System.Text.RegularExpressions case Setloop: case Setlazy: sb.Append(", Rep = "); - if (_codes[offset + 2] == int.MaxValue) + if (Codes[offset + 2] == int.MaxValue) sb.Append("inf"); else - sb.Append(_codes[offset + 2]); + sb.Append(Codes[offset + 2]); break; case Branchcount: case Lazybranchcount: sb.Append(", Limit = "); - if (_codes[offset + 2] == int.MaxValue) + if (Codes[offset + 2] == int.MaxValue) sb.Append("inf"); else - sb.Append(_codes[offset + 2]); + sb.Append(Codes[offset + 2]); break; } @@ -347,24 +347,24 @@ namespace System.Text.RegularExpressions return sb.ToString(); } - internal void Dump() + public void Dump() { int i; - Debug.WriteLine("Direction: " + (_rightToLeft ? "right-to-left" : "left-to-right")); - Debug.WriteLine("Firstchars: " + (_fcPrefix == null ? "n/a" : RegexCharClass.SetDescription(_fcPrefix.Prefix))); - Debug.WriteLine("Prefix: " + (_bmPrefix == null ? "n/a" : Regex.Escape(_bmPrefix.ToString()))); - Debug.WriteLine("Anchors: " + RegexFCD.AnchorDescription(_anchors)); + Debug.WriteLine("Direction: " + (RightToLeft ? "right-to-left" : "left-to-right")); + Debug.WriteLine("Firstchars: " + (FCPrefix == null ? "n/a" : RegexCharClass.SetDescription(FCPrefix.GetValueOrDefault().Prefix))); + Debug.WriteLine("Prefix: " + (BMPrefix == null ? "n/a" : Regex.Escape(BMPrefix.ToString()))); + Debug.WriteLine("Anchors: " + RegexFCD.AnchorDescription(Anchors)); Debug.WriteLine(""); - if (_bmPrefix != null) + if (BMPrefix != null) { Debug.WriteLine("BoyerMoore:"); - Debug.WriteLine(_bmPrefix.Dump(" ")); + Debug.WriteLine(BMPrefix.Dump(" ")); } - for (i = 0; i < _codes.Length;) + for (i = 0; i < Codes.Length;) { Debug.WriteLine(OpcodeDescription(i)); - i += OpcodeSize(_codes[i]); + i += OpcodeSize(Codes[i]); } Debug.WriteLine(""); diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCompilationInfo.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCompilationInfo.cs index 2f27e09f40..9bed23d25e 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCompilationInfo.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCompilationInfo.cs @@ -15,7 +15,7 @@ namespace System.Text.RegularExpressions private TimeSpan _matchTimeout; public RegexCompilationInfo(string pattern, RegexOptions options, string name, string fullnamespace, bool ispublic) - : this(pattern, options, name, fullnamespace, ispublic, Regex.DefaultMatchTimeout) + : this(pattern, options, name, fullnamespace, ispublic, Regex.s_defaultMatchTimeout) { } @@ -63,10 +63,7 @@ namespace System.Text.RegularExpressions public string Namespace { get => _nspace; - set - { - _nspace = value ?? throw new ArgumentNullException(nameof(Namespace)); - } + set => _nspace = value ?? throw new ArgumentNullException(nameof(Namespace)); } public RegexOptions Options { get; set; } diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCompiler.cs.REMOVED.git-id b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCompiler.cs.REMOVED.git-id index efdae86207..111ce7fd3d 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCompiler.cs.REMOVED.git-id +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCompiler.cs.REMOVED.git-id @@ -1 +1 @@ -fac86269ec4ab0f16a400c531f4934efa4435b11 \ No newline at end of file +5f585ba7d343f4757e5bdc1ccc9c8e645eabe6bc \ No newline at end of file diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexFCD.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexFCD.cs index a116994dd5..a9c30fa650 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexFCD.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexFCD.cs @@ -11,65 +11,77 @@ // This step is as simple as walking the tree and emitting // sequences of codes. +using System.Collections.Generic; using System.Globalization; namespace System.Text.RegularExpressions { - internal sealed class RegexFCD + internal ref struct RegexFCD { - private int[] _intStack; - private int _intDepth; - private RegexFC[] _fcStack; - private int _fcDepth; - private bool _skipAllChildren; // don't process any more children at the current level - private bool _skipchild; // don't process the current child. - private bool _failed = false; - + private const int StackBufferSize = 32; private const int BeforeChild = 64; private const int AfterChild = 128; // where the regex can be pegged - internal const int Beginning = 0x0001; - internal const int Bol = 0x0002; - internal const int Start = 0x0004; - internal const int Eol = 0x0008; - internal const int EndZ = 0x0010; - internal const int End = 0x0020; - internal const int Boundary = 0x0040; - internal const int ECMABoundary = 0x0080; + public const int Beginning = 0x0001; + public const int Bol = 0x0002; + public const int Start = 0x0004; + public const int Eol = 0x0008; + public const int EndZ = 0x0010; + public const int End = 0x0020; + public const int Boundary = 0x0040; + public const int ECMABoundary = 0x0080; - /* - * This is the one of the only two functions that should be called from outside. - * It takes a RegexTree and computes the set of chars that can start it. - */ - internal static RegexPrefix FirstChars(RegexTree t) + private readonly List _fcStack; + private ValueListBuilder _intStack; // must not be readonly + private bool _skipAllChildren; // don't process any more children at the current level + private bool _skipchild; // don't process the current child. + private bool _failed; + + private RegexFCD(Span intStack) { - RegexFCD s = new RegexFCD(); + _fcStack = new List(StackBufferSize); + _intStack = new ValueListBuilder(intStack); + _failed = false; + _skipchild = false; + _skipAllChildren = false; + } + + /// + /// This is the one of the only two functions that should be called from outside. + /// It takes a RegexTree and computes the set of chars that can start it. + /// + public static RegexPrefix? FirstChars(RegexTree t) + { + // Create/rent buffers + Span intSpan = stackalloc int[StackBufferSize]; + + RegexFCD s = new RegexFCD(intSpan); RegexFC fc = s.RegexFCFromRegexTree(t); + s.Dispose(); if (fc == null || fc._nullable) return null; - CultureInfo culture = ((t._options & RegexOptions.CultureInvariant) != 0) ? CultureInfo.InvariantCulture : CultureInfo.CurrentCulture; - return new RegexPrefix(fc.GetFirstChars(culture), fc.IsCaseInsensitive()); + CultureInfo culture = ((t.Options & RegexOptions.CultureInvariant) != 0) ? CultureInfo.InvariantCulture : CultureInfo.CurrentCulture; + + return new RegexPrefix(fc.GetFirstChars(culture), fc.CaseInsensitive); } - /* - * This is a related computation: it takes a RegexTree and computes the - * leading substring if it see one. It's quite trivial and gives up easily. - */ - internal static RegexPrefix Prefix(RegexTree tree) + /// + /// This is a related computation: it takes a RegexTree and computes the + /// leading substring if it see one. It's quite trivial and gives up easily. + /// + public static RegexPrefix Prefix(RegexTree tree) { - RegexNode curNode; + RegexNode curNode = tree.Root; RegexNode concatNode = null; int nextChild = 0; - curNode = tree._root; - for (; ;) { - switch (curNode._type) + switch (curNode.NType) { case RegexNode.Concatenate: if (curNode.ChildCount() > 0) @@ -87,19 +99,29 @@ namespace System.Text.RegularExpressions case RegexNode.Oneloop: case RegexNode.Onelazy: - if (curNode._m > 0) + + // In release, cutoff at a length to which we can still reasonably construct a string + // In debug, use a smaller cutoff to exercise the cutoff path in tests + const int Cutoff = + #if DEBUG + 50; + #else + 1_000_000; + #endif + + if (curNode.M > 0 && curNode.M < Cutoff) { - string pref = string.Empty.PadRight(curNode._m, curNode._ch); - return new RegexPrefix(pref, 0 != (curNode._options & RegexOptions.IgnoreCase)); + string pref = string.Empty.PadRight(curNode.M, curNode.Ch); + return new RegexPrefix(pref, 0 != (curNode.Options & RegexOptions.IgnoreCase)); } else return RegexPrefix.Empty; case RegexNode.One: - return new RegexPrefix(curNode._ch.ToString(), 0 != (curNode._options & RegexOptions.IgnoreCase)); + return new RegexPrefix(curNode.Ch.ToString(), 0 != (curNode.Options & RegexOptions.IgnoreCase)); case RegexNode.Multi: - return new RegexPrefix(curNode._str, 0 != (curNode._options & RegexOptions.IgnoreCase)); + return new RegexPrefix(curNode.Str, 0 != (curNode.Options & RegexOptions.IgnoreCase)); case RegexNode.Bol: case RegexNode.Eol: @@ -125,22 +147,22 @@ namespace System.Text.RegularExpressions } } - /* - * Yet another related computation: it takes a RegexTree and computes the - * leading anchors that it encounters. - */ - internal static int Anchors(RegexTree tree) + /// + /// Yet another related computation: it takes a RegexTree and computes + /// the leading anchors that it encounters. + /// + public static int Anchors(RegexTree tree) { RegexNode curNode; RegexNode concatNode = null; int nextChild = 0; int result = 0; - curNode = tree._root; + curNode = tree.Root; for (; ;) { - switch (curNode._type) + switch (curNode.NType) { case RegexNode.Concatenate: if (curNode.ChildCount() > 0) @@ -164,7 +186,7 @@ namespace System.Text.RegularExpressions case RegexNode.Start: case RegexNode.EndZ: case RegexNode.End: - return result | AnchorFromType(curNode._type); + return result | AnchorFromType(curNode.NType); case RegexNode.Empty: case RegexNode.Require: @@ -182,9 +204,9 @@ namespace System.Text.RegularExpressions } } - /* - * Convert anchor type to anchor bit. - */ + /// + /// Convert anchor type to anchor bit. + /// private static int AnchorFromType(int type) { switch (type) @@ -202,18 +224,26 @@ namespace System.Text.RegularExpressions } #if DEBUG - internal static string AnchorDescription(int anchors) + public static string AnchorDescription(int anchors) { StringBuilder sb = new StringBuilder(); - if (0 != (anchors & Beginning)) sb.Append(", Beginning"); - if (0 != (anchors & Start)) sb.Append(", Start"); - if (0 != (anchors & Bol)) sb.Append(", Bol"); - if (0 != (anchors & Boundary)) sb.Append(", Boundary"); - if (0 != (anchors & ECMABoundary)) sb.Append(", ECMABoundary"); - if (0 != (anchors & Eol)) sb.Append(", Eol"); - if (0 != (anchors & End)) sb.Append(", End"); - if (0 != (anchors & EndZ)) sb.Append(", EndZ"); + if (0 != (anchors & Beginning)) + sb.Append(", Beginning"); + if (0 != (anchors & Start)) + sb.Append(", Start"); + if (0 != (anchors & Bol)) + sb.Append(", Bol"); + if (0 != (anchors & Boundary)) + sb.Append(", Boundary"); + if (0 != (anchors & ECMABoundary)) + sb.Append(", ECMABoundary"); + if (0 != (anchors & Eol)) + sb.Append(", Eol"); + if (0 != (anchors & End)) + sb.Append(", End"); + if (0 != (anchors & EndZ)) + sb.Append(", EndZ"); if (sb.Length >= 2) return (sb.ToString(2, sb.Length - 2)); @@ -222,118 +252,83 @@ namespace System.Text.RegularExpressions } #endif - /* - * private constructor; can't be created outside - */ - private RegexFCD() + /// + /// To avoid recursion, we use a simple integer stack. + /// + private void PushInt(int i) { - _fcStack = new RegexFC[32]; - _intStack = new int[32]; + _intStack.Append(i); } - /* - * To avoid recursion, we use a simple integer stack. - * This is the push. - */ - private void PushInt(int I) - { - if (_intDepth >= _intStack.Length) - { - int[] expanded = new int[_intDepth * 2]; - - Array.Copy(_intStack, 0, expanded, 0, _intDepth); - - _intStack = expanded; - } - - _intStack[_intDepth++] = I; - } - - /* - * True if the stack is empty. - */ private bool IntIsEmpty() { - return _intDepth == 0; + return _intStack.Length == 0; } - /* - * This is the pop. - */ private int PopInt() { - return _intStack[--_intDepth]; + return _intStack.Pop(); } - /* - * We also use a stack of RegexFC objects. - * This is the push. - */ + /// + /// We also use a stack of RegexFC objects. + /// private void PushFC(RegexFC fc) { - if (_fcDepth >= _fcStack.Length) - { - RegexFC[] expanded = new RegexFC[_fcDepth * 2]; - - Array.Copy(_fcStack, 0, expanded, 0, _fcDepth); - _fcStack = expanded; - } - - _fcStack[_fcDepth++] = fc; + _fcStack.Add(fc); } - /* - * True if the stack is empty. - */ private bool FCIsEmpty() { - return _fcDepth == 0; + return _fcStack.Count == 0; } - /* - * This is the pop. - */ private RegexFC PopFC() { - return _fcStack[--_fcDepth]; + RegexFC item = TopFC(); + _fcStack.RemoveAt(_fcStack.Count - 1); + + return item; } - /* - * This is the top. - */ private RegexFC TopFC() { - return _fcStack[_fcDepth - 1]; + return _fcStack[_fcStack.Count - 1]; } - /* - * The main FC computation. It does a shortcutted depth-first walk - * through the tree and calls CalculateFC to emits code before - * and after each child of an interior node, and at each leaf. - */ + /// + /// Return rented buffers. + /// + public void Dispose() + { + _intStack.Dispose(); + } + + /// + /// The main FC computation. It does a shortcutted depth-first walk + /// through the tree and calls CalculateFC to emits code before + /// and after each child of an interior node, and at each leaf. + /// private RegexFC RegexFCFromRegexTree(RegexTree tree) { - RegexNode curNode; - int curChild; - - curNode = tree._root; - curChild = 0; + RegexNode curNode = tree.Root; + int curChild = 0; for (; ;) { - if (curNode._children == null) + if (curNode.Children == null) { // This is a leaf node - CalculateFC(curNode._type, curNode, 0); + CalculateFC(curNode.NType, curNode, 0); } - else if (curChild < curNode._children.Count && !_skipAllChildren) + else if (curChild < curNode.Children.Count && !_skipAllChildren) { // This is an interior node, and we have more children to analyze - CalculateFC(curNode._type | BeforeChild, curNode, curChild); + CalculateFC(curNode.NType | BeforeChild, curNode, curChild); if (!_skipchild) { - curNode = curNode._children[curChild]; + curNode = curNode.Children[curChild]; // this stack is how we get a depth first walk of the tree. PushInt(curChild); curChild = 0; @@ -354,9 +349,9 @@ namespace System.Text.RegularExpressions break; curChild = PopInt(); - curNode = curNode._next; + curNode = curNode.Next; - CalculateFC(curNode._type | AfterChild, curNode, curChild); + CalculateFC(curNode.NType | AfterChild, curNode, curChild); if (_failed) return null; @@ -369,17 +364,17 @@ namespace System.Text.RegularExpressions return PopFC(); } - /* - * Called in Beforechild to prevent further processing of the current child - */ + /// + /// Called in Beforechild to prevent further processing of the current child + /// private void SkipChild() { _skipchild = true; } - /* - * FC computation and shortcut cases for each node type - */ + /// + /// FC computation and shortcut cases for each node type + /// private void CalculateFC(int NodeType, RegexNode node, int CurIndex) { bool ci = false; @@ -387,9 +382,9 @@ namespace System.Text.RegularExpressions if (NodeType <= RegexNode.Ref) { - if ((node._options & RegexOptions.IgnoreCase) != 0) + if ((node.Options & RegexOptions.IgnoreCase) != 0) ci = true; - if ((node._options & RegexOptions.RightToLeft) != 0) + if ((node.Options & RegexOptions.RightToLeft) != 0) rtl = true; } @@ -447,7 +442,7 @@ namespace System.Text.RegularExpressions case RegexNode.Loop | AfterChild: case RegexNode.Lazyloop | AfterChild: - if (node._m == 0) + if (node.M == 0) TopFC()._nullable = true; break; @@ -471,35 +466,35 @@ namespace System.Text.RegularExpressions case RegexNode.One: case RegexNode.Notone: - PushFC(new RegexFC(node._ch, NodeType == RegexNode.Notone, false, ci)); + PushFC(new RegexFC(node.Ch, NodeType == RegexNode.Notone, false, ci)); break; case RegexNode.Oneloop: case RegexNode.Onelazy: - PushFC(new RegexFC(node._ch, false, node._m == 0, ci)); + PushFC(new RegexFC(node.Ch, false, node.M == 0, ci)); break; case RegexNode.Notoneloop: case RegexNode.Notonelazy: - PushFC(new RegexFC(node._ch, true, node._m == 0, ci)); + PushFC(new RegexFC(node.Ch, true, node.M == 0, ci)); break; case RegexNode.Multi: - if (node._str.Length == 0) + if (node.Str.Length == 0) PushFC(new RegexFC(true)); else if (!rtl) - PushFC(new RegexFC(node._str[0], false, false, ci)); + PushFC(new RegexFC(node.Str[0], false, false, ci)); else - PushFC(new RegexFC(node._str[node._str.Length - 1], false, false, ci)); + PushFC(new RegexFC(node.Str[node.Str.Length - 1], false, false, ci)); break; case RegexNode.Set: - PushFC(new RegexFC(node._str, false, ci)); + PushFC(new RegexFC(node.Str, false, ci)); break; case RegexNode.Setloop: case RegexNode.Setlazy: - PushFC(new RegexFC(node._str, node._m == 0, ci)); + PushFC(new RegexFC(node.Str, node.M == 0, ci)); break; case RegexNode.Ref: @@ -528,17 +523,16 @@ namespace System.Text.RegularExpressions internal sealed class RegexFC { - internal RegexCharClass _cc; - internal bool _nullable; - internal bool _caseInsensitive; + private RegexCharClass _cc; + public bool _nullable; - internal RegexFC(bool nullable) + public RegexFC(bool nullable) { _cc = new RegexCharClass(); _nullable = nullable; } - internal RegexFC(char ch, bool not, bool nullable, bool caseInsensitive) + public RegexFC(char ch, bool not, bool nullable, bool caseInsensitive) { _cc = new RegexCharClass(); @@ -554,19 +548,19 @@ namespace System.Text.RegularExpressions _cc.AddRange(ch, ch); } - _caseInsensitive = caseInsensitive; + CaseInsensitive = caseInsensitive; _nullable = nullable; } - internal RegexFC(string charClass, bool nullable, bool caseInsensitive) + public RegexFC(string charClass, bool nullable, bool caseInsensitive) { _cc = RegexCharClass.Parse(charClass); _nullable = nullable; - _caseInsensitive = caseInsensitive; + CaseInsensitive = caseInsensitive; } - internal bool AddFC(RegexFC fc, bool concatenate) + public bool AddFC(RegexFC fc, bool concatenate) { if (!_cc.CanMerge || !fc._cc.CanMerge) { @@ -587,59 +581,19 @@ namespace System.Text.RegularExpressions _nullable = true; } - _caseInsensitive |= fc._caseInsensitive; + CaseInsensitive |= fc.CaseInsensitive; _cc.AddCharClass(fc._cc); return true; } - internal String GetFirstChars(CultureInfo culture) + public bool CaseInsensitive { get; private set; } + + public string GetFirstChars(CultureInfo culture) { - if (_caseInsensitive) + if (CaseInsensitive) _cc.AddLowercase(culture); return _cc.ToStringClass(); } - - internal bool IsCaseInsensitive() - { - return _caseInsensitive; - } - } - - internal sealed class RegexPrefix - { - internal string _prefix; - internal bool _caseInsensitive; - - internal static RegexPrefix _empty = new RegexPrefix(string.Empty, false); - - internal RegexPrefix(string prefix, bool ci) - { - _prefix = prefix; - _caseInsensitive = ci; - } - - internal string Prefix - { - get - { - return _prefix; - } - } - - internal bool CaseInsensitive - { - get - { - return _caseInsensitive; - } - } - internal static RegexPrefix Empty - { - get - { - return _empty; - } - } } } diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexInterpreter.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexInterpreter.cs index 4a1f0d8814..9170757392 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexInterpreter.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexInterpreter.cs @@ -2,9 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -// This RegexInterpreter class is internal to the RegularExpression package. -// It executes a block of regular expression codes while consuming -// input. +// The RegexInterpreter executes a block of regular expression codes +// while consuming input. using System.Diagnostics; using System.Globalization; @@ -20,7 +19,7 @@ namespace System.Text.RegularExpressions private bool _rightToLeft; private bool _caseInsensitive; - internal RegexInterpreter(RegexCode code, CultureInfo culture) + public RegexInterpreter(RegexCode code, CultureInfo culture) { Debug.Assert(code != null, "code cannot be null."); Debug.Assert(culture != null, "culture cannot be null."); @@ -31,13 +30,13 @@ namespace System.Text.RegularExpressions protected override void InitTrackCount() { - runtrackcount = _code._trackcount; + runtrackcount = _code.TrackCount; } private void Advance(int i) { _codepos += (i + 1); - SetOperator(_code._codes[_codepos]); + SetOperator(_code.Codes[_codepos]); } private void Goto(int newpos) @@ -46,7 +45,7 @@ namespace System.Text.RegularExpressions if (newpos < _codepos) EnsureStorage(); - SetOperator(_code._codes[newpos]); + SetOperator(_code.Codes[newpos]); _codepos = newpos; } @@ -131,11 +130,11 @@ namespace System.Text.RegularExpressions if (newpos < 0) { newpos = -newpos; - SetOperator(_code._codes[newpos] | RegexCode.Back2); + SetOperator(_code.Codes[newpos] | RegexCode.Back2); } else { - SetOperator(_code._codes[newpos] | RegexCode.Back); + SetOperator(_code.Codes[newpos] | RegexCode.Back); } // When branching backward, ensure storage @@ -223,7 +222,7 @@ namespace System.Text.RegularExpressions private int Operand(int i) { - return _code._codes[_codepos + i + 1]; + return _code.Codes[_codepos + i + 1]; } private int Leftchars() @@ -355,77 +354,74 @@ namespace System.Text.RegularExpressions protected override bool FindFirstChar() { - int i; - string set; - - if (0 != (_code._anchors & (RegexFCD.Beginning | RegexFCD.Start | RegexFCD.EndZ | RegexFCD.End))) + if (0 != (_code.Anchors & (RegexFCD.Beginning | RegexFCD.Start | RegexFCD.EndZ | RegexFCD.End))) { - if (!_code._rightToLeft) + if (!_code.RightToLeft) { - if ((0 != (_code._anchors & RegexFCD.Beginning) && runtextpos > runtextbeg) || - (0 != (_code._anchors & RegexFCD.Start) && runtextpos > runtextstart)) + if ((0 != (_code.Anchors & RegexFCD.Beginning) && runtextpos > runtextbeg) || + (0 != (_code.Anchors & RegexFCD.Start) && runtextpos > runtextstart)) { runtextpos = runtextend; return false; } - if (0 != (_code._anchors & RegexFCD.EndZ) && runtextpos < runtextend - 1) + if (0 != (_code.Anchors & RegexFCD.EndZ) && runtextpos < runtextend - 1) { runtextpos = runtextend - 1; } - else if (0 != (_code._anchors & RegexFCD.End) && runtextpos < runtextend) + else if (0 != (_code.Anchors & RegexFCD.End) && runtextpos < runtextend) { runtextpos = runtextend; } } else { - if ((0 != (_code._anchors & RegexFCD.End) && runtextpos < runtextend) || - (0 != (_code._anchors & RegexFCD.EndZ) && (runtextpos < runtextend - 1 || + if ((0 != (_code.Anchors & RegexFCD.End) && runtextpos < runtextend) || + (0 != (_code.Anchors & RegexFCD.EndZ) && (runtextpos < runtextend - 1 || (runtextpos == runtextend - 1 && CharAt(runtextpos) != '\n'))) || - (0 != (_code._anchors & RegexFCD.Start) && runtextpos < runtextstart)) + (0 != (_code.Anchors & RegexFCD.Start) && runtextpos < runtextstart)) { runtextpos = runtextbeg; return false; } - if (0 != (_code._anchors & RegexFCD.Beginning) && runtextpos > runtextbeg) + if (0 != (_code.Anchors & RegexFCD.Beginning) && runtextpos > runtextbeg) { runtextpos = runtextbeg; } } - if (_code._bmPrefix != null) + if (_code.BMPrefix != null) { - return _code._bmPrefix.IsMatch(runtext, runtextpos, runtextbeg, runtextend); + return _code.BMPrefix.IsMatch(runtext, runtextpos, runtextbeg, runtextend); } return true; // found a valid start or end anchor } - else if (_code._bmPrefix != null) + else if (_code.BMPrefix != null) { - runtextpos = _code._bmPrefix.Scan(runtext, runtextpos, runtextbeg, runtextend); + runtextpos = _code.BMPrefix.Scan(runtext, runtextpos, runtextbeg, runtextend); if (runtextpos == -1) { - runtextpos = (_code._rightToLeft ? runtextbeg : runtextend); + runtextpos = (_code.RightToLeft ? runtextbeg : runtextend); return false; } return true; } - else if (_code._fcPrefix == null) + else if (_code.FCPrefix == null) { return true; } - _rightToLeft = _code._rightToLeft; - _caseInsensitive = _code._fcPrefix.CaseInsensitive; - set = _code._fcPrefix.Prefix; + _rightToLeft = _code.RightToLeft; + _caseInsensitive = _code.FCPrefix.GetValueOrDefault().CaseInsensitive; + string set = _code.FCPrefix.GetValueOrDefault().Prefix; if (RegexCharClass.IsSingleton(set)) { char ch = RegexCharClass.SingletonChar(set); - for (i = Forwardchars(); i > 0; i--) + for (int i = Forwardchars(); i > 0; i--) { if (ch == Forwardcharnext()) { @@ -436,7 +432,7 @@ namespace System.Text.RegularExpressions } else { - for (i = Forwardchars(); i > 0; i--) + for (int i = Forwardchars(); i > 0; i--) { if (RegexCharClass.CharInClass(Forwardcharnext(), set)) { @@ -445,6 +441,7 @@ namespace System.Text.RegularExpressions } } } + return false; } @@ -889,7 +886,7 @@ namespace System.Text.RegularExpressions continue; case RegexCode.Set: - if (Forwardchars() < 1 || !RegexCharClass.CharInClass(Forwardcharnext(), _code._strings[Operand(0)])) + if (Forwardchars() < 1 || !RegexCharClass.CharInClass(Forwardcharnext(), _code.Strings[Operand(0)])) break; advance = 1; @@ -897,7 +894,7 @@ namespace System.Text.RegularExpressions case RegexCode.Multi: { - if (!Stringmatch(_code._strings[Operand(0)])) + if (!Stringmatch(_code.Strings[Operand(0)])) break; advance = 1; @@ -964,7 +961,7 @@ namespace System.Text.RegularExpressions if (Forwardchars() < c) break; - string set = _code._strings[Operand(0)]; + string set = _code.Strings[Operand(0)]; while (c-- > 0) if (!RegexCharClass.CharInClass(Forwardcharnext(), set)) @@ -1033,7 +1030,7 @@ namespace System.Text.RegularExpressions if (c > Forwardchars()) c = Forwardchars(); - string set = _code._strings[Operand(0)]; + string set = _code.Strings[Operand(0)]; int i; for (i = c; i > 0; i--) @@ -1154,7 +1151,7 @@ namespace System.Text.RegularExpressions int pos = TrackPeek(1); Textto(pos); - if (!RegexCharClass.CharInClass(Forwardcharnext(), _code._strings[Operand(0)])) + if (!RegexCharClass.CharInClass(Forwardcharnext(), _code.Strings[Operand(0)])) break; int i = TrackPeek(); diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexLWCGCompiler.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexLWCGCompiler.cs index d37ab1a0bd..e5833b02c5 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexLWCGCompiler.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexLWCGCompiler.cs @@ -9,27 +9,23 @@ using System.Globalization; namespace System.Text.RegularExpressions { - internal class RegexLWCGCompiler : RegexCompiler + internal sealed class RegexLWCGCompiler : RegexCompiler { private static int s_regexCount = 0; private static Type[] s_paramTypes = new Type[] { typeof(RegexRunner) }; - internal RegexLWCGCompiler() - { - } - /* * The top-level driver. Initializes everything then calls the Generate* methods. */ - internal RegexRunnerFactory FactoryInstanceFromCode(RegexCode code, RegexOptions options) + public RegexRunnerFactory FactoryInstanceFromCode(RegexCode code, RegexOptions options) { _code = code; - _codes = code._codes; - _strings = code._strings; - _fcPrefix = code._fcPrefix; - _bmPrefix = code._bmPrefix; - _anchors = code._anchors; - _trackcount = code._trackcount; + _codes = code.Codes; + _strings = code.Strings; + _fcPrefix = code.FCPrefix; + _bmPrefix = code.BMPrefix; + _anchors = code.Anchors; + _trackcount = code.TrackCount; _options = options; // pick a unique number for the methods we generate @@ -51,7 +47,7 @@ namespace System.Text.RegularExpressions /* * Begins the definition of a new method (no args) with a specified return value */ - internal DynamicMethod DefineDynamicMethod(string methname, Type returntype, Type hostType) + public DynamicMethod DefineDynamicMethod(string methname, Type returntype, Type hostType) { // We're claiming that these are static methods, but really they are instance methods. // By giving them a parameter which represents "this", we're tricking them into diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexNode.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexNode.cs index f60e800def..339e3d7139 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexNode.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexNode.cs @@ -51,113 +51,108 @@ namespace System.Text.RegularExpressions // The following are leaves, and correspond to primitive operations - internal const int Oneloop = RegexCode.Oneloop; // c,n a* - internal const int Notoneloop = RegexCode.Notoneloop; // c,n .* - internal const int Setloop = RegexCode.Setloop; // set,n \d* + public const int Oneloop = RegexCode.Oneloop; // c,n a* + public const int Notoneloop = RegexCode.Notoneloop; // c,n .* + public const int Setloop = RegexCode.Setloop; // set,n \d* - internal const int Onelazy = RegexCode.Onelazy; // c,n a*? - internal const int Notonelazy = RegexCode.Notonelazy; // c,n .*? - internal const int Setlazy = RegexCode.Setlazy; // set,n \d*? + public const int Onelazy = RegexCode.Onelazy; // c,n a*? + public const int Notonelazy = RegexCode.Notonelazy; // c,n .*? + public const int Setlazy = RegexCode.Setlazy; // set,n \d*? - internal const int One = RegexCode.One; // char a - internal const int Notone = RegexCode.Notone; // char . [^a] - internal const int Set = RegexCode.Set; // set [a-z] \w \s \d + public const int One = RegexCode.One; // char a + public const int Notone = RegexCode.Notone; // char . [^a] + public const int Set = RegexCode.Set; // set [a-z] \w \s \d - internal const int Multi = RegexCode.Multi; // string abcdef - internal const int Ref = RegexCode.Ref; // index \1 + public const int Multi = RegexCode.Multi; // string abcdef + public const int Ref = RegexCode.Ref; // index \1 - internal const int Bol = RegexCode.Bol; // ^ - internal const int Eol = RegexCode.Eol; // $ - internal const int Boundary = RegexCode.Boundary; // \b - internal const int Nonboundary = RegexCode.Nonboundary; // \B - internal const int ECMABoundary = RegexCode.ECMABoundary; // \b - internal const int NonECMABoundary = RegexCode.NonECMABoundary; // \B - internal const int Beginning = RegexCode.Beginning; // \A - internal const int Start = RegexCode.Start; // \G - internal const int EndZ = RegexCode.EndZ; // \Z - internal const int End = RegexCode.End; // \z + public const int Bol = RegexCode.Bol; // ^ + public const int Eol = RegexCode.Eol; // $ + public const int Boundary = RegexCode.Boundary; // \b + public const int Nonboundary = RegexCode.Nonboundary; // \B + public const int ECMABoundary = RegexCode.ECMABoundary; // \b + public const int NonECMABoundary = RegexCode.NonECMABoundary; // \B + public const int Beginning = RegexCode.Beginning; // \A + public const int Start = RegexCode.Start; // \G + public const int EndZ = RegexCode.EndZ; // \Z + public const int End = RegexCode.End; // \z // Interior nodes do not correspond to primitive operations, but // control structures compositing other operations // Concat and alternate take n children, and can run forward or backwards - internal const int Nothing = 22; // [] - internal const int Empty = 23; // () + public const int Nothing = 22; // [] + public const int Empty = 23; // () - internal const int Alternate = 24; // a|b - internal const int Concatenate = 25; // ab + public const int Alternate = 24; // a|b + public const int Concatenate = 25; // ab - internal const int Loop = 26; // m,x * + ? {,} - internal const int Lazyloop = 27; // m,x *? +? ?? {,}? + public const int Loop = 26; // m,x * + ? {,} + public const int Lazyloop = 27; // m,x *? +? ?? {,}? - internal const int Capture = 28; // n () - internal const int Group = 29; // (?:) - internal const int Require = 30; // (?=) (?<=) - internal const int Prevent = 31; // (?!) (?) (?<) - internal const int Testref = 33; // (?(n) | ) - internal const int Testgroup = 34; // (?(...) | ) + public const int Capture = 28; // n () - capturing group + public const int Group = 29; // (?:) - noncapturing group + public const int Require = 30; // (?=) (?<=) - lookahead and lookbehind assertions + public const int Prevent = 31; // (?!) (?) - greedy subexpression + public const int Testref = 33; // (?(n) | ) - alternation, reference + public const int Testgroup = 34; // (?(...) | )- alternation, expression - // RegexNode data members + public int NType; + public List Children; + public string Str; + public char Ch; + public int M; + public int N; + public readonly RegexOptions Options; + public RegexNode Next; - internal int _type; - - internal List _children; - - internal string _str; - internal char _ch; - internal int _m; - internal int _n; - internal readonly RegexOptions _options; - - internal RegexNode _next; - - internal RegexNode(int type, RegexOptions options) + public RegexNode(int type, RegexOptions options) { - _type = type; - _options = options; + NType = type; + Options = options; } - internal RegexNode(int type, RegexOptions options, char ch) + public RegexNode(int type, RegexOptions options, char ch) { - _type = type; - _options = options; - _ch = ch; + NType = type; + Options = options; + Ch = ch; } - internal RegexNode(int type, RegexOptions options, string str) + public RegexNode(int type, RegexOptions options, string str) { - _type = type; - _options = options; - _str = str; + NType = type; + Options = options; + Str = str; } - internal RegexNode(int type, RegexOptions options, int m) + public RegexNode(int type, RegexOptions options, int m) { - _type = type; - _options = options; - _m = m; + NType = type; + Options = options; + M = m; } - internal RegexNode(int type, RegexOptions options, int m, int n) + public RegexNode(int type, RegexOptions options, int m, int n) { - _type = type; - _options = options; - _m = m; - _n = n; + NType = type; + Options = options; + M = m; + N = n; } - internal bool UseOptionR() + public bool UseOptionR() { - return (_options & RegexOptions.RightToLeft) != 0; + return (Options & RegexOptions.RightToLeft) != 0; } - internal RegexNode ReverseLeft() + public RegexNode ReverseLeft() { - if (UseOptionR() && _type == Concatenate && _children != null) + if (UseOptionR() && NType == Concatenate && Children != null) { - _children.Reverse(0, _children.Count); + Children.Reverse(0, Children.Count); } return this; @@ -166,17 +161,17 @@ namespace System.Text.RegularExpressions /// /// Pass type as OneLazy or OneLoop /// - internal void MakeRep(int type, int min, int max) + private void MakeRep(int type, int min, int max) { - _type += (type - One); - _m = min; - _n = max; + NType += (type - One); + M = min; + N = max; } /// /// Removes redundant nodes from the subtree, and returns a reduced subtree. /// - internal RegexNode Reduce() + private RegexNode Reduce() { RegexNode n; @@ -217,12 +212,12 @@ namespace System.Text.RegularExpressions /// one child strip out the intermediate node. If it has zero children, /// turn it into an empty. /// - internal RegexNode StripEnation(int emptyType) + private RegexNode StripEnation(int emptyType) { switch (ChildCount()) { case 0: - return new RegexNode(emptyType, _options); + return new RegexNode(emptyType, Options); case 1: return Child(0); default: @@ -234,7 +229,7 @@ namespace System.Text.RegularExpressions /// Simple optimization. Once parsed into a tree, non-capturing groups /// serve no function, so strip them out. /// - internal RegexNode ReduceGroup() + private RegexNode ReduceGroup() { RegexNode u; @@ -248,18 +243,13 @@ namespace System.Text.RegularExpressions /// Nested repeaters just get multiplied with each other if they're not /// too lumpy /// - internal RegexNode ReduceRep() + private RegexNode ReduceRep() { - RegexNode u; + RegexNode u = this; RegexNode child; - int type; - int min; - int max; - - u = this; - type = Type(); - min = _m; - max = _n; + int type = Type(); + int min = M; + int max = N; for (; ;) { @@ -280,49 +270,50 @@ namespace System.Text.RegularExpressions // child can be too lumpy to blur, e.g., (a {100,105}) {3} or (a {2,})? // [but things like (a {2,})+ are not too lumpy...] - if (u._m == 0 && child._m > 1 || child._n < child._m * 2) + if (u.M == 0 && child.M > 1 || child.N < child.M * 2) break; u = child; - if (u._m > 0) - u._m = min = ((int.MaxValue - 1) / u._m < min) ? int.MaxValue : u._m * min; - if (u._n > 0) - u._n = max = ((int.MaxValue - 1) / u._n < max) ? int.MaxValue : u._n * max; + if (u.M > 0) + u.M = min = ((int.MaxValue - 1) / u.M < min) ? int.MaxValue : u.M * min; + if (u.N > 0) + u.N = max = ((int.MaxValue - 1) / u.N < max) ? int.MaxValue : u.N * max; } - return min == int.MaxValue ? new RegexNode(Nothing, _options) : u; + return min == int.MaxValue ? new RegexNode(Nothing, Options) : u; } /// /// Simple optimization. If a set is a singleton, an inverse singleton, /// or empty, it's transformed accordingly. /// - internal RegexNode ReduceSet() + private RegexNode ReduceSet() { // Extract empty-set, one and not-one case as special - if (RegexCharClass.IsEmpty(_str)) + if (RegexCharClass.IsEmpty(Str)) { - _type = Nothing; - _str = null; + NType = Nothing; + Str = null; } - else if (RegexCharClass.IsSingleton(_str)) + else if (RegexCharClass.IsSingleton(Str)) { - _ch = RegexCharClass.SingletonChar(_str); - _str = null; - _type += (One - Set); + Ch = RegexCharClass.SingletonChar(Str); + Str = null; + NType += (One - Set); } - else if (RegexCharClass.IsSingletonInverse(_str)) + else if (RegexCharClass.IsSingletonInverse(Str)) { - _ch = RegexCharClass.SingletonChar(_str); - _str = null; - _type += (Notone - Set); + Ch = RegexCharClass.SingletonChar(Str); + Str = null; + NType += (Notone - Set); } return this; } /// + /// Combine adjacent sets/chars. /// Basic optimization. Single-letter alternations can be replaced /// by faster set specifications, and nested alternations with no /// intervening operators can be flattened: @@ -330,55 +321,49 @@ namespace System.Text.RegularExpressions /// a|b|c|def|g|h -> [a-c]|def|[gh] /// apple|(?:orange|pear)|grape -> apple|orange|pear|grape /// - internal RegexNode ReduceAlternation() + private RegexNode ReduceAlternation() { - // Combine adjacent sets/chars + if (Children == null) + return new RegexNode(Nothing, Options); - bool wasLastSet; - bool lastNodeCannotMerge; - RegexOptions optionsLast; + bool wasLastSet = false; + bool lastNodeCannotMerge = false; + RegexOptions optionsLast = 0; RegexOptions optionsAt; int i; int j; RegexNode at; RegexNode prev; - if (_children == null) - return new RegexNode(Nothing, _options); - - wasLastSet = false; - lastNodeCannotMerge = false; - optionsLast = 0; - - for (i = 0, j = 0; i < _children.Count; i++, j++) + for (i = 0, j = 0; i < Children.Count; i++, j++) { - at = _children[i]; + at = Children[i]; if (j < i) - _children[j] = at; + Children[j] = at; for (; ;) { - if (at._type == Alternate) + if (at.NType == Alternate) { - for (int k = 0; k < at._children.Count; k++) - at._children[k]._next = this; + for (int k = 0; k < at.Children.Count; k++) + at.Children[k].Next = this; - _children.InsertRange(i + 1, at._children); + Children.InsertRange(i + 1, at.Children); j--; } - else if (at._type == Set || at._type == One) + else if (at.NType == Set || at.NType == One) { // Cannot merge sets if L or I options differ, or if either are negated. - optionsAt = at._options & (RegexOptions.RightToLeft | RegexOptions.IgnoreCase); + optionsAt = at.Options & (RegexOptions.RightToLeft | RegexOptions.IgnoreCase); - if (at._type == Set) + if (at.NType == Set) { - if (!wasLastSet || optionsLast != optionsAt || lastNodeCannotMerge || !RegexCharClass.IsMergeable(at._str)) + if (!wasLastSet || optionsLast != optionsAt || lastNodeCannotMerge || !RegexCharClass.IsMergeable(at.Str)) { wasLastSet = true; - lastNodeCannotMerge = !RegexCharClass.IsMergeable(at._str); + lastNodeCannotMerge = !RegexCharClass.IsMergeable(at.Str); optionsLast = optionsAt; break; } @@ -395,33 +380,33 @@ namespace System.Text.RegularExpressions // The last node was a Set or a One, we're a Set or One and our options are the same. // Merge the two nodes. j--; - prev = _children[j]; + prev = Children[j]; RegexCharClass prevCharClass; - if (prev._type == One) + if (prev.NType == One) { prevCharClass = new RegexCharClass(); - prevCharClass.AddChar(prev._ch); + prevCharClass.AddChar(prev.Ch); } else { - prevCharClass = RegexCharClass.Parse(prev._str); + prevCharClass = RegexCharClass.Parse(prev.Str); } - if (at._type == One) + if (at.NType == One) { - prevCharClass.AddChar(at._ch); + prevCharClass.AddChar(at.Ch); } else { - RegexCharClass atCharClass = RegexCharClass.Parse(at._str); + RegexCharClass atCharClass = RegexCharClass.Parse(at.Str); prevCharClass.AddCharClass(atCharClass); } - prev._type = Set; - prev._str = prevCharClass.ToStringClass(); + prev.NType = Set; + prev.Str = prevCharClass.ToStringClass(); } - else if (at._type == Nothing) + else if (at.NType == Nothing) { j--; } @@ -435,56 +420,52 @@ namespace System.Text.RegularExpressions } if (j < i) - _children.RemoveRange(j, i - j); + Children.RemoveRange(j, i - j); return StripEnation(Nothing); } /// + /// Eliminate empties and concat adjacent strings/chars. /// Basic optimization. Adjacent strings can be concatenated. /// /// (?:abc)(?:def) -> abcdef /// - internal RegexNode ReduceConcatenation() + private RegexNode ReduceConcatenation() { - // Eliminate empties and concat adjacent strings/chars + if (Children == null) + return new RegexNode(Empty, Options); - bool wasLastString; - RegexOptions optionsLast; + bool wasLastString = false; + RegexOptions optionsLast = 0; RegexOptions optionsAt; int i; int j; - if (_children == null) - return new RegexNode(Empty, _options); - - wasLastString = false; - optionsLast = 0; - - for (i = 0, j = 0; i < _children.Count; i++, j++) + for (i = 0, j = 0; i < Children.Count; i++, j++) { RegexNode at; RegexNode prev; - at = _children[i]; + at = Children[i]; if (j < i) - _children[j] = at; + Children[j] = at; - if (at._type == Concatenate && - ((at._options & RegexOptions.RightToLeft) == (_options & RegexOptions.RightToLeft))) + if (at.NType == Concatenate && + ((at.Options & RegexOptions.RightToLeft) == (Options & RegexOptions.RightToLeft))) { - for (int k = 0; k < at._children.Count; k++) - at._children[k]._next = this; + for (int k = 0; k < at.Children.Count; k++) + at.Children[k].Next = this; - _children.InsertRange(i + 1, at._children); + Children.InsertRange(i + 1, at.Children); j--; } - else if (at._type == Multi || - at._type == One) + else if (at.NType == Multi || + at.NType == One) { // Cannot merge strings if L or I options differ - optionsAt = at._options & (RegexOptions.RightToLeft | RegexOptions.IgnoreCase); + optionsAt = at.Options & (RegexOptions.RightToLeft | RegexOptions.IgnoreCase); if (!wasLastString || optionsLast != optionsAt) { @@ -493,30 +474,30 @@ namespace System.Text.RegularExpressions continue; } - prev = _children[--j]; + prev = Children[--j]; - if (prev._type == One) + if (prev.NType == One) { - prev._type = Multi; - prev._str = Convert.ToString(prev._ch, CultureInfo.InvariantCulture); + prev.NType = Multi; + prev.Str = Convert.ToString(prev.Ch, CultureInfo.InvariantCulture); } if ((optionsAt & RegexOptions.RightToLeft) == 0) { - if (at._type == One) - prev._str += at._ch.ToString(); + if (at.NType == One) + prev.Str += at.Ch.ToString(); else - prev._str += at._str; + prev.Str += at.Str; } else { - if (at._type == One) - prev._str = at._ch.ToString() + prev._str; + if (at.NType == One) + prev.Str = at.Ch.ToString() + prev.Str; else - prev._str = at._str + prev._str; + prev.Str = at.Str + prev.Str; } } - else if (at._type == Empty) + else if (at.NType == Empty) { j--; } @@ -527,66 +508,62 @@ namespace System.Text.RegularExpressions } if (j < i) - _children.RemoveRange(j, i - j); + Children.RemoveRange(j, i - j); return StripEnation(Empty); } - internal RegexNode MakeQuantifier(bool lazy, int min, int max) + public RegexNode MakeQuantifier(bool lazy, int min, int max) { - RegexNode result; - if (min == 0 && max == 0) - return new RegexNode(Empty, _options); + return new RegexNode(Empty, Options); if (min == 1 && max == 1) return this; - switch (_type) + switch (NType) { case One: case Notone: case Set: - MakeRep(lazy ? Onelazy : Oneloop, min, max); return this; default: - result = new RegexNode(lazy ? Lazyloop : Loop, _options, min, max); + var result = new RegexNode(lazy ? Lazyloop : Loop, Options, min, max); result.AddChild(this); return result; } } - internal void AddChild(RegexNode newChild) + public void AddChild(RegexNode newChild) { - RegexNode reducedChild; + if (Children == null) + Children = new List(4); - if (_children == null) - _children = new List(4); - - reducedChild = newChild.Reduce(); - - _children.Add(reducedChild); - reducedChild._next = this; - } - internal RegexNode Child(int i) - { - return _children[i]; + RegexNode reducedChild = newChild.Reduce(); + Children.Add(reducedChild); + reducedChild.Next = this; } - internal int ChildCount() + public RegexNode Child(int i) { - return _children == null ? 0 : _children.Count; + return Children[i]; } - internal int Type() + public int ChildCount() { - return _type; + return Children == null ? 0 : Children.Count; + } + + public int Type() + { + return NType; } #if DEBUG - internal static readonly string[] TypeStr = new string[] { + private const string Space = " "; + private static readonly string[] s_typeStr = new string[] { "Onerep", "Notonerep", "Setrep", "Oneloop", "Notoneloop", "Setloop", "Onelazy", "Notonelazy", "Setlazy", @@ -601,28 +578,28 @@ namespace System.Text.RegularExpressions "Capture", "Group", "Require", "Prevent", "Greedy", "Testref", "Testgroup"}; - internal string Description() + private string Description() { StringBuilder ArgSb = new StringBuilder(); - ArgSb.Append(TypeStr[_type]); + ArgSb.Append(s_typeStr[NType]); - if ((_options & RegexOptions.ExplicitCapture) != 0) + if ((Options & RegexOptions.ExplicitCapture) != 0) ArgSb.Append("-C"); - if ((_options & RegexOptions.IgnoreCase) != 0) + if ((Options & RegexOptions.IgnoreCase) != 0) ArgSb.Append("-I"); - if ((_options & RegexOptions.RightToLeft) != 0) + if ((Options & RegexOptions.RightToLeft) != 0) ArgSb.Append("-L"); - if ((_options & RegexOptions.Multiline) != 0) + if ((Options & RegexOptions.Multiline) != 0) ArgSb.Append("-M"); - if ((_options & RegexOptions.Singleline) != 0) + if ((Options & RegexOptions.Singleline) != 0) ArgSb.Append("-S"); - if ((_options & RegexOptions.IgnorePatternWhitespace) != 0) + if ((Options & RegexOptions.IgnorePatternWhitespace) != 0) ArgSb.Append("-X"); - if ((_options & RegexOptions.ECMAScript) != 0) + if ((Options & RegexOptions.ECMAScript) != 0) ArgSb.Append("-E"); - switch (_type) + switch (NType) { case Oneloop: case Notoneloop: @@ -630,26 +607,26 @@ namespace System.Text.RegularExpressions case Notonelazy: case One: case Notone: - ArgSb.Append("(Ch = " + RegexCharClass.CharDescription(_ch) + ")"); + ArgSb.Append("(Ch = " + RegexCharClass.CharDescription(Ch) + ")"); break; case Capture: - ArgSb.Append("(index = " + _m.ToString(CultureInfo.InvariantCulture) + ", unindex = " + _n.ToString(CultureInfo.InvariantCulture) + ")"); + ArgSb.Append("(index = " + M.ToString(CultureInfo.InvariantCulture) + ", unindex = " + N.ToString(CultureInfo.InvariantCulture) + ")"); break; case Ref: case Testref: - ArgSb.Append("(index = " + _m.ToString(CultureInfo.InvariantCulture) + ")"); + ArgSb.Append("(index = " + M.ToString(CultureInfo.InvariantCulture) + ")"); break; case Multi: - ArgSb.Append("(String = " + _str + ")"); + ArgSb.Append("(String = " + Str + ")"); break; case Set: case Setloop: case Setlazy: - ArgSb.Append("(Set = " + RegexCharClass.SetDescription(_str) + ")"); + ArgSb.Append("(Set = " + RegexCharClass.SetDescription(Str) + ")"); break; } - switch (_type) + switch (NType) { case Oneloop: case Notoneloop: @@ -659,16 +636,14 @@ namespace System.Text.RegularExpressions case Setlazy: case Loop: case Lazyloop: - ArgSb.Append("(Min = " + _m.ToString(CultureInfo.InvariantCulture) + ", Max = " + (_n == int.MaxValue ? "inf" : Convert.ToString(_n, CultureInfo.InvariantCulture)) + ")"); + ArgSb.Append("(Min = " + M.ToString(CultureInfo.InvariantCulture) + ", Max = " + (N == int.MaxValue ? "inf" : Convert.ToString(N, CultureInfo.InvariantCulture)) + ")"); break; } return ArgSb.ToString(); } - internal const string Space = " "; - - internal void Dump() + public void Dump() { List Stack = new List(); RegexNode CurNode; @@ -681,10 +656,10 @@ namespace System.Text.RegularExpressions for (; ;) { - if (CurNode._children != null && CurChild < CurNode._children.Count) + if (CurNode.Children != null && CurChild < CurNode.Children.Count) { Stack.Add(CurChild + 1); - CurNode = CurNode._children[CurChild]; + CurNode = CurNode.Children[CurChild]; CurChild = 0; int Depth = Stack.Count; @@ -700,7 +675,7 @@ namespace System.Text.RegularExpressions CurChild = Stack[Stack.Count - 1]; Stack.RemoveAt(Stack.Count - 1); - CurNode = CurNode._next; + CurNode = CurNode.Next; } } } diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs index b94abe2e48..971e2dd8f6 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs @@ -14,39 +14,40 @@ using System.Collections; using System.Collections.Generic; using System.Globalization; using System.IO; +using System.Text; namespace System.Text.RegularExpressions { internal sealed class RegexParser { - internal RegexNode _stack; - internal RegexNode _group; - internal RegexNode _alternation; - internal RegexNode _concatenation; - internal RegexNode _unit; + private const int MaxValueDiv10 = int.MaxValue / 10; + private const int MaxValueMod10 = int.MaxValue % 10; - internal string _pattern; - internal int _currentPos; - internal CultureInfo _culture; + private RegexNode _stack; + private RegexNode _group; + private RegexNode _alternation; + private RegexNode _concatenation; + private RegexNode _unit; - internal int _autocap; - internal int _capcount; - internal int _captop; - internal int _capsize; + private string _pattern; + private int _currentPos; + private CultureInfo _culture; - internal Hashtable _caps; - internal Hashtable _capnames; + private int _autocap; + private int _capcount; + private int _captop; + private int _capsize; - internal int[] _capnumlist; - internal List _capnamelist; + private Hashtable _caps; + private Hashtable _capnames; - internal RegexOptions _options; - internal List _optionsStack; + private int[] _capnumlist; + private List _capnamelist; - internal bool _ignoreNextParen = false; + private RegexOptions _options; + private List _optionsStack; - internal const int MaxValueDiv10 = int.MaxValue / 10; - internal const int MaxValueMod10 = int.MaxValue % 10; + private bool _ignoreNextParen = false; /* * This static call constructs a RegexTree from a regular expression @@ -54,7 +55,7 @@ namespace System.Text.RegularExpressions * * The method creates, drives, and drops a parser instance. */ - internal static RegexTree Parse(string re, RegexOptions op) + public static RegexTree Parse(string re, RegexOptions op) { RegexParser p; RegexNode root; @@ -81,7 +82,7 @@ namespace System.Text.RegularExpressions * This static call constructs a flat concatenation node given * a replacement pattern. */ - internal static RegexReplacement ParseReplacement(string rep, Hashtable caps, int capsize, Hashtable capnames, RegexOptions op) + public static RegexReplacement ParseReplacement(string rep, Hashtable caps, int capsize, Hashtable capnames, RegexOptions op) { RegexParser p; RegexNode root; @@ -100,7 +101,7 @@ namespace System.Text.RegularExpressions /* * Escapes all metacharacters (including |,(,),[,{,|,^,$,*,+,?,\, spaces and #) */ - internal static string Escape(string input) + public static string Escape(string input) { for (int i = 0; i < input.Length; i++) { @@ -155,7 +156,7 @@ namespace System.Text.RegularExpressions /* * Escapes all metacharacters (including (,),[,],{,},|,^,$,*,+,?,\, spaces and #) */ - internal static string Unescape(string input) + public static string Unescape(string input) { for (int i = 0; i < input.Length; i++) { @@ -200,7 +201,7 @@ namespace System.Text.RegularExpressions /* * Drops a string into the pattern buffer. */ - internal void SetPattern(string Re) + private void SetPattern(string Re) { if (Re == null) Re = string.Empty; @@ -211,7 +212,7 @@ namespace System.Text.RegularExpressions /* * Resets parsing to the beginning of the pattern. */ - internal void Reset(RegexOptions topopts) + private void Reset(RegexOptions topopts) { _currentPos = 0; _autocap = 1; @@ -227,7 +228,7 @@ namespace System.Text.RegularExpressions /* * The main parsing function. */ - internal RegexNode ScanRegex() + private RegexNode ScanRegex() { char ch = '@'; // nonspecial ch, means at beginning bool isQuantifier = false; @@ -288,7 +289,7 @@ namespace System.Text.RegularExpressions goto ContinueOuterScan; case '[': - AddUnitSet(ScanCharClass(UseOptionI()).ToStringClass()); + AddUnitSet(ScanCharClass(UseOptionI(), scanOnly: false).ToStringClass()); break; case '(': @@ -326,7 +327,7 @@ namespace System.Text.RegularExpressions break; case '\\': - AddUnitNode(ScanBackslash()); + AddUnitNode(ScanBackslash(scanOnly: false)); break; case '^': @@ -367,7 +368,7 @@ namespace System.Text.RegularExpressions goto ContinueOuterScan; } - ch = MoveRightGetChar(); + ch = RightCharMoveRight(); // Handle quantifiers while (Unit() != null) @@ -409,7 +410,7 @@ namespace System.Text.RegularExpressions } } - if (startpos == Textpos() || CharsRight() == 0 || MoveRightGetChar() != '}') + if (startpos == Textpos() || CharsRight() == 0 || RightCharMoveRight() != '}') { AddConcatenate(); Textto(startpos - 1); @@ -457,7 +458,7 @@ namespace System.Text.RegularExpressions /* * Simple parsing for replacement patterns */ - internal RegexNode ScanReplacement() + private RegexNode ScanReplacement() { int c; int startpos; @@ -482,7 +483,7 @@ namespace System.Text.RegularExpressions if (c > 0) { - if (MoveRightGetChar() == '$') + if (RightCharMoveRight() == '$') AddUnitNode(ScanDollar()); AddConcatenate(); } @@ -495,16 +496,7 @@ namespace System.Text.RegularExpressions * Scans contents of [] (not including []'s), and converts to a * RegexCharClass. */ - internal RegexCharClass ScanCharClass(bool caseInsensitive) - { - return ScanCharClass(caseInsensitive, false); - } - - /* - * Scans contents of [] (not including []'s), and converts to a - * RegexCharClass. - */ - internal RegexCharClass ScanCharClass(bool caseInsensitive, bool scanOnly) + private RegexCharClass ScanCharClass(bool caseInsensitive, bool scanOnly) { char ch = '\0'; char chPrev = '\0'; @@ -526,7 +518,7 @@ namespace System.Text.RegularExpressions for (; CharsRight() > 0; firstChar = false) { bool fTranslatedChar = false; - ch = MoveRightGetChar(); + ch = RightCharMoveRight(); if (ch == ']') { if (!firstChar) @@ -537,7 +529,7 @@ namespace System.Text.RegularExpressions } else if (ch == '\\' && CharsRight() > 0) { - switch (ch = MoveRightGetChar()) + switch (ch = RightCharMoveRight()) { case 'D': case 'd': @@ -606,7 +598,7 @@ namespace System.Text.RegularExpressions MoveRight(); name = ScanCapname(); - if (CharsRight() < 2 || MoveRightGetChar() != ':' || MoveRightGetChar() != ']') + if (CharsRight() < 2 || RightCharMoveRight() != ':' || RightCharMoveRight() != ']') Textto(savePos); // else lookup name (nyi) } @@ -624,7 +616,7 @@ namespace System.Text.RegularExpressions // In that case, we'll add chPrev to our char class, skip the opening [, and // scan the new character class recursively. cc.AddChar(chPrev); - cc.AddSubtraction(ScanCharClass(caseInsensitive, false)); + cc.AddSubtraction(ScanCharClass(caseInsensitive, scanOnly)); if (CharsRight() > 0 && RightChar() != ']') throw MakeException(SR.SubtractionMustBeLast); @@ -652,7 +644,7 @@ namespace System.Text.RegularExpressions if (!scanOnly) { MoveRight(1); - cc.AddSubtraction(ScanCharClass(caseInsensitive, false)); + cc.AddSubtraction(ScanCharClass(caseInsensitive, scanOnly)); if (CharsRight() > 0 && RightChar() != ']') throw MakeException(SR.SubtractionMustBeLast); @@ -660,7 +652,7 @@ namespace System.Text.RegularExpressions else { MoveRight(1); - ScanCharClass(caseInsensitive, true); + ScanCharClass(caseInsensitive, scanOnly); } } else @@ -684,7 +676,7 @@ namespace System.Text.RegularExpressions * a RegexNode for the type of group scanned, or null if the group * simply changed options (?cimsx-cimsx) or was a comment (#...). */ - internal RegexNode ScanGroupOpen() + private RegexNode ScanGroupOpen() { char ch = '\0'; int NodeType; @@ -713,23 +705,27 @@ namespace System.Text.RegularExpressions if (CharsRight() == 0) break; - switch (ch = MoveRightGetChar()) + switch (ch = RightCharMoveRight()) { case ':': + // noncapturing group NodeType = RegexNode.Group; break; case '=': + // lookahead assertion _options &= ~(RegexOptions.RightToLeft); NodeType = RegexNode.Require; break; case '!': + // negative lookahead assertion _options &= ~(RegexOptions.RightToLeft); NodeType = RegexNode.Prevent; break; case '>': + // greedy subexpression NodeType = RegexNode.Greedy; break; @@ -742,12 +738,13 @@ namespace System.Text.RegularExpressions if (CharsRight() == 0) goto BreakRecognize; - switch (ch = MoveRightGetChar()) + switch (ch = RightCharMoveRight()) { case '=': if (close == '\'') goto BreakRecognize; + // lookbehind assertion _options |= RegexOptions.RightToLeft; NodeType = RegexNode.Require; break; @@ -756,6 +753,7 @@ namespace System.Text.RegularExpressions if (close == '\'') goto BreakRecognize; + // negative lookbehind assertion _options |= RegexOptions.RightToLeft; NodeType = RegexNode.Prevent; break; @@ -804,7 +802,7 @@ namespace System.Text.RegularExpressions // grab part after - if any - if ((capnum != -1 || proceed == true) && CharsRight() > 0 && RightChar() == '-') + if ((capnum != -1 || proceed == true) && CharsRight() > 1 && RightChar() == '-') { MoveRight(); ch = RightChar(); @@ -842,7 +840,7 @@ namespace System.Text.RegularExpressions // actually make the node - if ((capnum != -1 || uncapnum != -1) && CharsRight() > 0 && MoveRightGetChar() == close) + if ((capnum != -1 || uncapnum != -1) && CharsRight() > 0 && RightCharMoveRight() == close) { return new RegexNode(RegexNode.Capture, _options, capnum, uncapnum); } @@ -862,7 +860,7 @@ namespace System.Text.RegularExpressions if (ch >= '0' && ch <= '9') { int capnum = ScanDecimal(); - if (CharsRight() > 0 && MoveRightGetChar() == ')') + if (CharsRight() > 0 && RightCharMoveRight() == ')') { if (IsCaptureSlot(capnum)) return new RegexNode(RegexNode.Testref, _options, capnum); @@ -876,7 +874,7 @@ namespace System.Text.RegularExpressions { string capname = ScanCapname(); - if (IsCaptureName(capname) && CharsRight() > 0 && MoveRightGetChar() == ')') + if (IsCaptureName(capname) && CharsRight() > 0 && RightCharMoveRight() == ')') return new RegexNode(RegexNode.Testref, _options, CaptureSlotFromName(capname)); } } @@ -911,12 +909,12 @@ namespace System.Text.RegularExpressions NodeType = RegexNode.Group; // Disallow options in the children of a testgroup node - if (_group._type != RegexNode.Testgroup) + if (_group.NType != RegexNode.Testgroup) ScanOptions(); if (CharsRight() == 0) goto BreakRecognize; - if ((ch = MoveRightGetChar()) == ')') + if ((ch = RightCharMoveRight()) == ')') return null; if (ch != ':') @@ -937,7 +935,7 @@ namespace System.Text.RegularExpressions /* * Scans whitespace or x-mode comments. */ - internal void ScanBlank() + private void ScanBlank() { if (UseOptionX()) { @@ -988,7 +986,7 @@ namespace System.Text.RegularExpressions * Scans chars following a '\' (not counting the '\'), and returns * a RegexNode for the type of atom scanned. */ - internal RegexNode ScanBackslash() + private RegexNode ScanBackslash(bool scanOnly) { char ch; RegexCharClass cc; @@ -1005,40 +1003,54 @@ namespace System.Text.RegularExpressions case 'Z': case 'z': MoveRight(); + if (scanOnly) + return null; return new RegexNode(TypeFromCode(ch), _options); case 'w': MoveRight(); + if (scanOnly) + return null; if (UseOptionE()) return new RegexNode(RegexNode.Set, _options, RegexCharClass.ECMAWordClass); return new RegexNode(RegexNode.Set, _options, RegexCharClass.WordClass); case 'W': MoveRight(); + if (scanOnly) + return null; if (UseOptionE()) return new RegexNode(RegexNode.Set, _options, RegexCharClass.NotECMAWordClass); return new RegexNode(RegexNode.Set, _options, RegexCharClass.NotWordClass); case 's': MoveRight(); + if (scanOnly) + return null; if (UseOptionE()) return new RegexNode(RegexNode.Set, _options, RegexCharClass.ECMASpaceClass); return new RegexNode(RegexNode.Set, _options, RegexCharClass.SpaceClass); case 'S': MoveRight(); + if (scanOnly) + return null; if (UseOptionE()) return new RegexNode(RegexNode.Set, _options, RegexCharClass.NotECMASpaceClass); return new RegexNode(RegexNode.Set, _options, RegexCharClass.NotSpaceClass); case 'd': MoveRight(); + if (scanOnly) + return null; if (UseOptionE()) return new RegexNode(RegexNode.Set, _options, RegexCharClass.ECMADigitClass); return new RegexNode(RegexNode.Set, _options, RegexCharClass.DigitClass); case 'D': MoveRight(); + if (scanOnly) + return null; if (UseOptionE()) return new RegexNode(RegexNode.Set, _options, RegexCharClass.NotECMADigitClass); return new RegexNode(RegexNode.Set, _options, RegexCharClass.NotDigitClass); @@ -1046,6 +1058,8 @@ namespace System.Text.RegularExpressions case 'p': case 'P': MoveRight(); + if (scanOnly) + return null; cc = new RegexCharClass(); cc.AddCategoryFromName(ParseProperty(), (ch != 'p'), UseOptionI(), _pattern); if (UseOptionI()) @@ -1054,14 +1068,14 @@ namespace System.Text.RegularExpressions return new RegexNode(RegexNode.Set, _options, cc.ToStringClass()); default: - return ScanBasicBackslash(); + return ScanBasicBackslash(scanOnly); } } /* * Scans \-style backreferences and character escapes */ - internal RegexNode ScanBasicBackslash() + private RegexNode ScanBasicBackslash(bool scanOnly) { if (CharsRight() == 0) throw MakeException(SR.IllegalEndEscape); @@ -1081,7 +1095,7 @@ namespace System.Text.RegularExpressions if (CharsRight() >= 2) { MoveRight(); - ch = MoveRightGetChar(); + ch = RightCharMoveRight(); if (ch == '<' || ch == '\'') { @@ -1107,14 +1121,16 @@ namespace System.Text.RegularExpressions ch = RightChar(); } - // Try to parse backreference: \<1> or \ + // Try to parse backreference: \<1> if (angled && ch >= '0' && ch <= '9') { int capnum = ScanDecimal(); - if (CharsRight() > 0 && MoveRightGetChar() == close) + if (CharsRight() > 0 && RightCharMoveRight() == close) { + if (scanOnly) + return null; if (IsCaptureSlot(capnum)) return new RegexNode(RegexNode.Ref, _options, capnum); else @@ -1141,11 +1157,13 @@ namespace System.Text.RegularExpressions newcapnum = newcapnum * 10 + (int)(ch - '0'); } if (capnum >= 0) - return new RegexNode(RegexNode.Ref, _options, capnum); + return scanOnly ? null : new RegexNode(RegexNode.Ref, _options, capnum); } else { int capnum = ScanDecimal(); + if (scanOnly) + return null; if (IsCaptureSlot(capnum)) return new RegexNode(RegexNode.Ref, _options, capnum); else if (capnum <= 9) @@ -1153,12 +1171,17 @@ namespace System.Text.RegularExpressions } } + + // Try to parse backreference: \ + else if (angled && RegexCharClass.IsWordChar(ch)) { string capname = ScanCapname(); - if (CharsRight() > 0 && MoveRightGetChar() == close) + if (CharsRight() > 0 && RightCharMoveRight() == close) { + if (scanOnly) + return null; if (IsCaptureName(capname)) return new RegexNode(RegexNode.Ref, _options, CaptureSlotFromName(capname)); else @@ -1174,13 +1197,13 @@ namespace System.Text.RegularExpressions if (UseOptionI()) ch = _culture.TextInfo.ToLower(ch); - return new RegexNode(RegexNode.One, _options, ch); + return scanOnly ? null : new RegexNode(RegexNode.One, _options, ch); } /* * Scans $ patterns recognized within replacement patterns */ - internal RegexNode ScanDollar() + private RegexNode ScanDollar() { if (CharsRight() == 0) return new RegexNode(RegexNode.One, _options, '$'); @@ -1240,7 +1263,7 @@ namespace System.Text.RegularExpressions else { int capnum = ScanDecimal(); - if (!angled || CharsRight() > 0 && MoveRightGetChar() == '}') + if (!angled || CharsRight() > 0 && RightCharMoveRight() == '}') { if (IsCaptureSlot(capnum)) return new RegexNode(RegexNode.Ref, _options, capnum); @@ -1251,7 +1274,7 @@ namespace System.Text.RegularExpressions { string capname = ScanCapname(); - if (CharsRight() > 0 && MoveRightGetChar() == '}') + if (CharsRight() > 0 && RightCharMoveRight() == '}') { if (IsCaptureName(capname)) return new RegexNode(RegexNode.Ref, _options, CaptureSlotFromName(capname)); @@ -1304,13 +1327,13 @@ namespace System.Text.RegularExpressions /* * Scans a capture name: consumes word chars */ - internal string ScanCapname() + private string ScanCapname() { int startpos = Textpos(); while (CharsRight() > 0) { - if (!RegexCharClass.IsWordChar(MoveRightGetChar())) + if (!RegexCharClass.IsWordChar(RightCharMoveRight())) { MoveLeft(); break; @@ -1324,7 +1347,7 @@ namespace System.Text.RegularExpressions /* * Scans up to three octal digits (stops before exceeding 0377). */ - internal char ScanOctal() + private char ScanOctal() { int d; int i; @@ -1356,7 +1379,7 @@ namespace System.Text.RegularExpressions /* * Scans any number of decimal digits (pegs value at 2^31-1 if too large) */ - internal int ScanDecimal() + private int ScanDecimal() { int i = 0; int d; @@ -1378,7 +1401,7 @@ namespace System.Text.RegularExpressions /* * Scans exactly c hex digits (c=2 for \xFF, c=4 for \uFFFF) */ - internal char ScanHex(int c) + private char ScanHex(int c) { int i; int d; @@ -1387,7 +1410,7 @@ namespace System.Text.RegularExpressions if (CharsRight() >= c) { - for (; c > 0 && ((d = HexDigit(MoveRightGetChar())) >= 0); c -= 1) + for (; c > 0 && ((d = HexDigit(RightCharMoveRight())) >= 0); c -= 1) { i *= 0x10; i += d; @@ -1403,7 +1426,7 @@ namespace System.Text.RegularExpressions /* * Returns n <= 0xF for a hex digit. */ - internal static int HexDigit(char ch) + private static int HexDigit(char ch) { int d; @@ -1422,14 +1445,14 @@ namespace System.Text.RegularExpressions /* * Grabs and converts an ASCII control character */ - internal char ScanControl() + private char ScanControl() { char ch; if (CharsRight() <= 0) throw MakeException(SR.MissingControl); - ch = MoveRightGetChar(); + ch = RightCharMoveRight(); // \ca interpreted as \cA @@ -1445,7 +1468,7 @@ namespace System.Text.RegularExpressions /* * Returns true for options allowed only at the top level */ - internal bool IsOnlyTopOption(RegexOptions option) + private bool IsOnlyTopOption(RegexOptions option) { return (option == RegexOptions.RightToLeft || option == RegexOptions.CultureInvariant @@ -1456,7 +1479,7 @@ namespace System.Text.RegularExpressions /* * Scans cimsx-cimsx option string, stops at the first unrecognized char. */ - internal void ScanOptions() + private void ScanOptions() { char ch; bool off; @@ -1491,11 +1514,11 @@ namespace System.Text.RegularExpressions /* * Scans \ code for escape codes that map to single Unicode chars. */ - internal char ScanCharEscape() + private char ScanCharEscape() { char ch; - ch = MoveRightGetChar(); + ch = RightCharMoveRight(); if (ch >= '0' && ch <= '7') { @@ -1537,13 +1560,13 @@ namespace System.Text.RegularExpressions /* * Scans X for \p{X} or \P{X} */ - internal string ParseProperty() + private string ParseProperty() { if (CharsRight() < 3) { throw MakeException(SR.IncompleteSlashP); } - char ch = MoveRightGetChar(); + char ch = RightCharMoveRight(); if (ch != '{') { throw MakeException(SR.MalformedSlashP); @@ -1552,7 +1575,7 @@ namespace System.Text.RegularExpressions int startpos = Textpos(); while (CharsRight() > 0) { - ch = MoveRightGetChar(); + ch = RightCharMoveRight(); if (!(RegexCharClass.IsWordChar(ch) || ch == '-')) { MoveLeft(); @@ -1561,7 +1584,7 @@ namespace System.Text.RegularExpressions } string capname = _pattern.Substring(startpos, Textpos() - startpos); - if (CharsRight() == 0 || MoveRightGetChar() != '}') + if (CharsRight() == 0 || RightCharMoveRight() != '}') throw MakeException(SR.IncompleteSlashP); return capname; @@ -1570,7 +1593,7 @@ namespace System.Text.RegularExpressions /* * Returns ReNode type for zero-length assertions with a \ code. */ - internal int TypeFromCode(char ch) + private int TypeFromCode(char ch) { switch (ch) { @@ -1594,7 +1617,7 @@ namespace System.Text.RegularExpressions /* * Returns option bit from single-char (?cimsx) code. */ - internal static RegexOptions OptionFromCode(char ch) + private static RegexOptions OptionFromCode(char ch) { // case-insensitive if (ch >= 'A' && ch <= 'Z') @@ -1629,7 +1652,7 @@ namespace System.Text.RegularExpressions * a prescanner for deducing the slots used for * captures by doing a partial tokenization of the pattern. */ - internal void CountCaptures() + private void CountCaptures() { char ch; @@ -1640,12 +1663,12 @@ namespace System.Text.RegularExpressions while (CharsRight() > 0) { int pos = Textpos(); - ch = MoveRightGetChar(); + ch = RightCharMoveRight(); switch (ch) { case '\\': if (CharsRight() > 0) - MoveRight(); + ScanBackslash(scanOnly: true); break; case '#': @@ -1657,7 +1680,7 @@ namespace System.Text.RegularExpressions break; case '[': - ScanCharClass(false, true); + ScanCharClass(caseInsensitive: false, scanOnly: true); break; case ')': @@ -1741,7 +1764,7 @@ namespace System.Text.RegularExpressions /* * Notes a used capture slot */ - internal void NoteCaptureSlot(int i, int pos) + private void NoteCaptureSlot(int i, int pos) { if (!_caps.ContainsKey(i)) { @@ -1763,7 +1786,7 @@ namespace System.Text.RegularExpressions /* * Notes a used capture slot */ - internal void NoteCaptureName(string name, int pos) + private void NoteCaptureName(string name, int pos) { if (_capnames == null) { @@ -1781,7 +1804,7 @@ namespace System.Text.RegularExpressions /* * For when all the used captures are known: note them all at once */ - internal void NoteCaptures(Hashtable caps, int capsize, Hashtable capnames) + private void NoteCaptures(Hashtable caps, int capsize, Hashtable capnames) { _caps = caps; _capsize = capsize; @@ -1791,7 +1814,7 @@ namespace System.Text.RegularExpressions /* * Assigns unused slot numbers to the capture names */ - internal void AssignNameSlots() + private void AssignNameSlots() { if (_capnames != null) { @@ -1869,7 +1892,7 @@ namespace System.Text.RegularExpressions /* * Looks up the slot number for a given name */ - internal int CaptureSlotFromName(string capname) + private int CaptureSlotFromName(string capname) { return (int)_capnames[capname]; } @@ -1877,7 +1900,7 @@ namespace System.Text.RegularExpressions /* * True if the capture slot was noted */ - internal bool IsCaptureSlot(int i) + private bool IsCaptureSlot(int i) { if (_caps != null) return _caps.ContainsKey(i); @@ -1888,7 +1911,7 @@ namespace System.Text.RegularExpressions /* * Looks up the slot number for a given name */ - internal bool IsCaptureName(string capname) + private bool IsCaptureName(string capname) { if (_capnames == null) return false; @@ -1899,7 +1922,7 @@ namespace System.Text.RegularExpressions /* * True if N option disabling '(' autocapture is on. */ - internal bool UseOptionN() + private bool UseOptionN() { return (_options & RegexOptions.ExplicitCapture) != 0; } @@ -1907,7 +1930,7 @@ namespace System.Text.RegularExpressions /* * True if I option enabling case-insensitivity is on. */ - internal bool UseOptionI() + private bool UseOptionI() { return (_options & RegexOptions.IgnoreCase) != 0; } @@ -1915,7 +1938,7 @@ namespace System.Text.RegularExpressions /* * True if M option altering meaning of $ and ^ is on. */ - internal bool UseOptionM() + private bool UseOptionM() { return (_options & RegexOptions.Multiline) != 0; } @@ -1923,7 +1946,7 @@ namespace System.Text.RegularExpressions /* * True if S option altering meaning of . is on. */ - internal bool UseOptionS() + private bool UseOptionS() { return (_options & RegexOptions.Singleline) != 0; } @@ -1931,7 +1954,7 @@ namespace System.Text.RegularExpressions /* * True if X option enabling whitespace/comment mode is on. */ - internal bool UseOptionX() + private bool UseOptionX() { return (_options & RegexOptions.IgnorePatternWhitespace) != 0; } @@ -1939,21 +1962,21 @@ namespace System.Text.RegularExpressions /* * True if E option enabling ECMAScript behavior is on. */ - internal bool UseOptionE() + private bool UseOptionE() { return (_options & RegexOptions.ECMAScript) != 0; } - internal const byte Q = 5; // quantifier - internal const byte S = 4; // ordinary stopper - internal const byte Z = 3; // ScanBlank stopper - internal const byte X = 2; // whitespace - internal const byte E = 1; // should be escaped + private const byte Q = 5; // quantifier + private const byte S = 4; // ordinary stopper + private const byte Z = 3; // ScanBlank stopper + private const byte X = 2; // whitespace + private const byte E = 1; // should be escaped /* * For categorizing ASCII characters. */ - internal static readonly byte[] _category = new byte[] { + private static readonly byte[] s_category = new byte[] { // 0 1 2 3 4 5 6 7 8 9 A B C D E F 0 1 2 3 4 5 6 7 8 9 A B C D E F 0,0,0,0,0,0,0,0,0,X,X,0,X,X,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // ! " # $ % & ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = > ? @@ -1966,28 +1989,28 @@ namespace System.Text.RegularExpressions /* * Returns true for those characters that terminate a string of ordinary chars. */ - internal static bool IsSpecial(char ch) + private static bool IsSpecial(char ch) { - return (ch <= '|' && _category[ch] >= S); + return (ch <= '|' && s_category[ch] >= S); } /* * Returns true for those characters that terminate a string of ordinary chars. */ - internal static bool IsStopperX(char ch) + private static bool IsStopperX(char ch) { - return (ch <= '|' && _category[ch] >= X); + return (ch <= '|' && s_category[ch] >= X); } /* * Returns true for those characters that begin a quantifier. */ - internal static bool IsQuantifier(char ch) + private static bool IsQuantifier(char ch) { - return (ch <= '{' && _category[ch] >= Q); + return (ch <= '{' && s_category[ch] >= Q); } - internal bool IsTrueQuantifier() + private bool IsTrueQuantifier() { int nChars = CharsRight(); if (nChars == 0) @@ -1995,7 +2018,7 @@ namespace System.Text.RegularExpressions int startpos = Textpos(); char ch = CharAt(startpos); if (ch != '{') - return ch <= '{' && _category[ch] >= Q; + return ch <= '{' && s_category[ch] >= Q; int pos = startpos; while (--nChars > 0 && (ch = CharAt(++pos)) >= '0' && ch <= '9') ; if (nChars == 0 || pos - startpos == 1) @@ -2011,24 +2034,24 @@ namespace System.Text.RegularExpressions /* * Returns true for whitespace. */ - internal static bool IsSpace(char ch) + private static bool IsSpace(char ch) { - return (ch <= ' ' && _category[ch] == X); + return (ch <= ' ' && s_category[ch] == X); } /* * Returns true for chars that should be escaped. */ - internal static bool IsMetachar(char ch) + private static bool IsMetachar(char ch) { - return (ch <= '|' && _category[ch] >= E); + return (ch <= '|' && s_category[ch] >= E); } /* * Add a string to the last concatenate. */ - internal void AddConcatenate(int pos, int cch, bool isReplacement) + private void AddConcatenate(int pos, int cch, bool isReplacement) { RegexNode node; @@ -2069,23 +2092,23 @@ namespace System.Text.RegularExpressions /* * Push the parser state (in response to an open paren) */ - internal void PushGroup() + private void PushGroup() { - _group._next = _stack; - _alternation._next = _group; - _concatenation._next = _alternation; + _group.Next = _stack; + _alternation.Next = _group; + _concatenation.Next = _alternation; _stack = _concatenation; } /* * Remember the pushed state (in response to a ')') */ - internal void PopGroup() + private void PopGroup() { _concatenation = _stack; - _alternation = _concatenation._next; - _group = _alternation._next; - _stack = _group._next; + _alternation = _concatenation.Next; + _group = _alternation.Next; + _stack = _group.Next; // The first () inside a Testgroup group goes directly to the group if (_group.Type() == RegexNode.Testgroup && _group.ChildCount() == 0) @@ -2101,7 +2124,7 @@ namespace System.Text.RegularExpressions /* * True if the group stack is empty. */ - internal bool EmptyStack() + private bool EmptyStack() { return _stack == null; } @@ -2109,7 +2132,7 @@ namespace System.Text.RegularExpressions /* * Start a new round for the parser state (in response to an open paren or string start) */ - internal void StartGroup(RegexNode openGroup) + private void StartGroup(RegexNode openGroup) { _group = openGroup; _alternation = new RegexNode(RegexNode.Alternate, _options); @@ -2119,7 +2142,7 @@ namespace System.Text.RegularExpressions /* * Finish the current concatenation (in response to a |) */ - internal void AddAlternate() + private void AddAlternate() { // The | parts inside a Testgroup group go directly to the group @@ -2138,7 +2161,7 @@ namespace System.Text.RegularExpressions /* * Finish the current quantifiable (when a quantifier is not found or is not possible) */ - internal void AddConcatenate() + private void AddConcatenate() { // The first (| inside a Testgroup group goes directly to the group @@ -2149,7 +2172,7 @@ namespace System.Text.RegularExpressions /* * Finish the current quantifiable (when a quantifier is found) */ - internal void AddConcatenate(bool lazy, int min, int max) + private void AddConcatenate(bool lazy, int min, int max) { _concatenation.AddChild(_unit.MakeQuantifier(lazy, min, max)); _unit = null; @@ -2158,7 +2181,7 @@ namespace System.Text.RegularExpressions /* * Returns the current unit */ - internal RegexNode Unit() + private RegexNode Unit() { return _unit; } @@ -2166,7 +2189,7 @@ namespace System.Text.RegularExpressions /* * Sets the current unit to a single char node */ - internal void AddUnitOne(char ch) + private void AddUnitOne(char ch) { if (UseOptionI()) ch = _culture.TextInfo.ToLower(ch); @@ -2177,7 +2200,7 @@ namespace System.Text.RegularExpressions /* * Sets the current unit to a single inverse-char node */ - internal void AddUnitNotone(char ch) + private void AddUnitNotone(char ch) { if (UseOptionI()) ch = _culture.TextInfo.ToLower(ch); @@ -2188,7 +2211,7 @@ namespace System.Text.RegularExpressions /* * Sets the current unit to a single set node */ - internal void AddUnitSet(string cc) + private void AddUnitSet(string cc) { _unit = new RegexNode(RegexNode.Set, _options, cc); } @@ -2196,7 +2219,7 @@ namespace System.Text.RegularExpressions /* * Sets the current unit to a subtree */ - internal void AddUnitNode(RegexNode node) + private void AddUnitNode(RegexNode node) { _unit = node; } @@ -2204,7 +2227,7 @@ namespace System.Text.RegularExpressions /* * Sets the current unit to an assertion of the specified type */ - internal void AddUnitType(int type) + private void AddUnitType(int type) { _unit = new RegexNode(type, _options); } @@ -2212,7 +2235,7 @@ namespace System.Text.RegularExpressions /* * Finish the current group (in response to a ')' or end) */ - internal void AddGroup() + private void AddGroup() { if (_group.Type() == RegexNode.Testgroup || _group.Type() == RegexNode.Testref) { @@ -2233,7 +2256,7 @@ namespace System.Text.RegularExpressions /* * Saves options on a stack. */ - internal void PushOptions() + private void PushOptions() { _optionsStack.Add(_options); } @@ -2241,7 +2264,7 @@ namespace System.Text.RegularExpressions /* * Recalls options from the stack. */ - internal void PopOptions() + private void PopOptions() { _options = _optionsStack[_optionsStack.Count - 1]; _optionsStack.RemoveAt(_optionsStack.Count - 1); @@ -2250,7 +2273,7 @@ namespace System.Text.RegularExpressions /* * True if options stack is empty. */ - internal bool EmptyOptionsStack() + private bool EmptyOptionsStack() { return (_optionsStack.Count == 0); } @@ -2258,7 +2281,7 @@ namespace System.Text.RegularExpressions /* * Pops the option stack, but keeps the current options unchanged. */ - internal void PopKeepOptions() + private void PopKeepOptions() { _optionsStack.RemoveAt(_optionsStack.Count - 1); } @@ -2266,7 +2289,7 @@ namespace System.Text.RegularExpressions /* * Fills in an ArgumentException */ - internal ArgumentException MakeException(string message) + private ArgumentException MakeException(string message) { return new ArgumentException(SR.Format(SR.MakeException, _pattern, message)); } @@ -2274,7 +2297,7 @@ namespace System.Text.RegularExpressions /* * Returns the current parsing position. */ - internal int Textpos() + private int Textpos() { return _currentPos; } @@ -2282,7 +2305,7 @@ namespace System.Text.RegularExpressions /* * Zaps to a specific parsing position. */ - internal void Textto(int pos) + private void Textto(int pos) { _currentPos = pos; } @@ -2290,7 +2313,7 @@ namespace System.Text.RegularExpressions /* * Returns the char at the right of the current parsing position and advances to the right. */ - internal char MoveRightGetChar() + private char RightCharMoveRight() { return _pattern[_currentPos++]; } @@ -2298,12 +2321,12 @@ namespace System.Text.RegularExpressions /* * Moves the current position to the right. */ - internal void MoveRight() + private void MoveRight() { MoveRight(1); } - internal void MoveRight(int i) + private void MoveRight(int i) { _currentPos += i; } @@ -2311,7 +2334,7 @@ namespace System.Text.RegularExpressions /* * Moves the current parsing position one to the left. */ - internal void MoveLeft() + private void MoveLeft() { --_currentPos; } @@ -2319,7 +2342,7 @@ namespace System.Text.RegularExpressions /* * Returns the char left of the current parsing position. */ - internal char CharAt(int i) + private char CharAt(int i) { return _pattern[i]; } @@ -2335,7 +2358,7 @@ namespace System.Text.RegularExpressions /* * Returns the char i chars right of the current parsing position. */ - internal char RightChar(int i) + private char RightChar(int i) { return _pattern[_currentPos + i]; } @@ -2343,7 +2366,7 @@ namespace System.Text.RegularExpressions /* * Number of characters to the right of the current parsing position. */ - internal int CharsRight() + private int CharsRight() { return _pattern.Length - _currentPos; } diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexPrefix.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexPrefix.cs new file mode 100644 index 0000000000..081cace866 --- /dev/null +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexPrefix.cs @@ -0,0 +1,21 @@ +// 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.Text.RegularExpressions +{ + internal readonly struct RegexPrefix + { + internal RegexPrefix(string prefix, bool ci) + { + Prefix = prefix; + CaseInsensitive = ci; + } + + internal bool CaseInsensitive { get; } + + internal static RegexPrefix Empty { get; } = new RegexPrefix(string.Empty, false); + + internal string Prefix { get; } + } +} diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexReplacement.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexReplacement.cs index 579980bfa7..10f89a9b0d 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexReplacement.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexReplacement.cs @@ -9,19 +9,19 @@ using System.Collections; using System.Collections.Generic; using System.IO; +using System.Text; namespace System.Text.RegularExpressions { internal sealed class RegexReplacement { // Constants for special insertion patterns - internal const int Specials = 4; - internal const int LeftPortion = -1; - internal const int RightPortion = -2; - internal const int LastGroup = -3; - internal const int WholeString = -4; + private const int Specials = 4; + public const int LeftPortion = -1; + public const int RightPortion = -2; + public const int LastGroup = -3; + public const int WholeString = -4; - private readonly string _rep; private readonly List _strings; // table of string constants private readonly List _rules; // negative -> group #, positive -> string # @@ -30,7 +30,7 @@ namespace System.Text.RegularExpressions /// the constructor takes a RegexNode which is a concatenation /// of constant strings and backreferences. /// - internal RegexReplacement(string rep, RegexNode concat, Hashtable _caps) + public RegexReplacement(string rep, RegexNode concat, Hashtable _caps) { if (concat.Type() != RegexNode.Concatenate) throw new ArgumentException(SR.ReplacementError); @@ -46,11 +46,11 @@ namespace System.Text.RegularExpressions switch (child.Type()) { case RegexNode.Multi: - sb.Append(child._str); + sb.Append(child.Str); break; case RegexNode.One: - sb.Append(child._ch); + sb.Append(child.Ch); break; case RegexNode.Ref: @@ -60,7 +60,7 @@ namespace System.Text.RegularExpressions strings.Add(sb.ToString()); sb.Length = 0; } - int slot = child._m; + int slot = child.M; if (_caps != null && slot >= 0) slot = (int)_caps[slot]; @@ -81,11 +81,34 @@ namespace System.Text.RegularExpressions StringBuilderCache.Release(sb); - _rep = rep; + Pattern = rep; _strings = strings; _rules = rules; } + /// + /// Either returns a weakly cached RegexReplacement helper or creates one and caches it. + /// + /// + public static RegexReplacement GetOrCreate(WeakReference replRef, string replacement, Hashtable caps, + int capsize, Hashtable capnames, RegexOptions roptions) + { + RegexReplacement repl; + + if (!replRef.TryGetTarget(out repl) || !repl.Pattern.Equals(replacement)) + { + repl = RegexParser.ParseReplacement(replacement, caps, capsize, capnames, roptions); + replRef.SetTarget(repl); + } + + return repl; + } + + /// + /// The original pattern string + /// + public string Pattern { get; } + /// /// Given a Match, emits into the StringBuilder the evaluated /// substitution pattern. @@ -113,7 +136,7 @@ namespace System.Text.RegularExpressions sb.Append(match.LastGroupToStringImpl()); break; case WholeString: - sb.Append(match.GetOriginalString()); + sb.Append(match.Text); break; } } @@ -132,40 +155,32 @@ namespace System.Text.RegularExpressions if (r >= 0) // string lookup al.Add(_strings[r]); else if (r < -Specials) // group lookup - al.Add(match.GroupToStringImpl(-Specials - 1 - r)); + al.Add(match.GroupToStringImpl(-Specials - 1 - r).ToString()); else { switch (-Specials - 1 - r) { // special insertion patterns case LeftPortion: - al.Add(match.GetLeftSubstring()); + al.Add(match.GetLeftSubstring().ToString()); break; case RightPortion: - al.Add(match.GetRightSubstring()); + al.Add(match.GetRightSubstring().ToString()); break; case LastGroup: - al.Add(match.LastGroupToStringImpl()); + al.Add(match.LastGroupToStringImpl().ToString()); break; case WholeString: - al.Add(match.GetOriginalString()); + al.Add(match.Text); break; } } } } - /// - /// The original pattern string - /// - internal string Pattern - { - get { return _rep; } - } - /// /// Returns the replacement result for a single match /// - internal string Replacement(Match match) + public string Replacement(Match match) { StringBuilder sb = StringBuilderCache.Acquire(); @@ -186,7 +201,7 @@ namespace System.Text.RegularExpressions /// The right-to-left case is split out because StringBuilder /// doesn't handle right-to-left string building directly very well. /// - internal string Replace(Regex regex, string input, int count, int startat) + public string Replace(Regex regex, string input, int count, int startat) { if (count < -1) throw new ArgumentOutOfRangeException(nameof(count), SR.CountTooSmall); @@ -255,189 +270,5 @@ namespace System.Text.RegularExpressions return StringBuilderCache.GetStringAndRelease(sb); } } - - /// - /// Replaces all occurrences of the regex in the string with the - /// replacement evaluator. - /// - /// Note that the special case of no matches is handled on its own: - /// with no matches, the input string is returned unchanged. - /// The right-to-left case is split out because StringBuilder - /// doesn't handle right-to-left string building directly very well. - /// - internal static string Replace(MatchEvaluator evaluator, Regex regex, - string input, int count, int startat) - { - if (evaluator == null) - throw new ArgumentNullException(nameof(evaluator)); - if (count < -1) - throw new ArgumentOutOfRangeException(nameof(count), SR.CountTooSmall); - if (startat < 0 || startat > input.Length) - throw new ArgumentOutOfRangeException(nameof(startat), SR.BeginIndexNotNegative); - - if (count == 0) - return input; - - Match match = regex.Match(input, startat); - - if (!match.Success) - { - return input; - } - else - { - StringBuilder sb = StringBuilderCache.Acquire(); - - if (!regex.RightToLeft) - { - int prevat = 0; - - do - { - if (match.Index != prevat) - sb.Append(input, prevat, match.Index - prevat); - - prevat = match.Index + match.Length; - - sb.Append(evaluator(match)); - - if (--count == 0) - break; - - match = match.NextMatch(); - } while (match.Success); - - if (prevat < input.Length) - sb.Append(input, prevat, input.Length - prevat); - } - else - { - List al = new List(); - int prevat = input.Length; - - do - { - if (match.Index + match.Length != prevat) - al.Add(input.Substring(match.Index + match.Length, prevat - match.Index - match.Length)); - - prevat = match.Index; - - al.Add(evaluator(match)); - - if (--count == 0) - break; - - match = match.NextMatch(); - } while (match.Success); - - if (prevat > 0) - sb.Append(input, 0, prevat); - - for (int i = al.Count - 1; i >= 0; i--) - { - sb.Append(al[i]); - } - } - - return StringBuilderCache.GetStringAndRelease(sb); - } - } - - /// - /// Does a split. In the right-to-left case we reorder the - /// array to be forwards. - /// - internal static string[] Split(Regex regex, string input, int count, int startat) - { - if (count < 0) - throw new ArgumentOutOfRangeException(nameof(count), SR.CountTooSmall); - if (startat < 0 || startat > input.Length) - throw new ArgumentOutOfRangeException(nameof(startat), SR.BeginIndexNotNegative); - - string[] result; - - if (count == 1) - { - result = new string[1]; - result[0] = input; - return result; - } - - count -= 1; - - Match match = regex.Match(input, startat); - - if (!match.Success) - { - result = new string[1]; - result[0] = input; - return result; - } - else - { - List al = new List(); - - if (!regex.RightToLeft) - { - int prevat = 0; - - for (; ;) - { - al.Add(input.Substring(prevat, match.Index - prevat)); - - prevat = match.Index + match.Length; - - // add all matched capture groups to the list. - for (int i = 1; i < match.Groups.Count; i++) - { - if (match.IsMatched(i)) - al.Add(match.Groups[i].ToString()); - } - - if (--count == 0) - break; - - match = match.NextMatch(); - - if (!match.Success) - break; - } - - al.Add(input.Substring(prevat, input.Length - prevat)); - } - else - { - int prevat = input.Length; - - for (; ;) - { - al.Add(input.Substring(match.Index + match.Length, prevat - match.Index - match.Length)); - - prevat = match.Index; - - // add all matched capture groups to the list. - for (int i = 1; i < match.Groups.Count; i++) - { - if (match.IsMatched(i)) - al.Add(match.Groups[i].ToString()); - } - - if (--count == 0) - break; - - match = match.NextMatch(); - - if (!match.Success) - break; - } - - al.Add(input.Substring(0, prevat)); - - al.Reverse(0, al.Count); - } - - return al.ToArray(); - } - } } } diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexRunner.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexRunner.cs index ae72533ef4..92d0c72efc 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexRunner.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexRunner.cs @@ -206,15 +206,16 @@ namespace System.Text.RegularExpressions if (_ignoreTimeout) return; - if (--_timeoutChecksToSkip != 0) - return; - - _timeoutChecksToSkip = TimeoutCheckFrequency; DoCheckTimeout(); } private void DoCheckTimeout() { + if (--_timeoutChecksToSkip != 0) + return; + + _timeoutChecksToSkip = TimeoutCheckFrequency; + // Note that both, Environment.TickCount and timeoutOccursAt are ints and can overflow and become negative. // See the comment in StartTimeoutWatch(). @@ -566,7 +567,7 @@ namespace System.Text.RegularExpressions Debug.WriteLine("Stack: " + StackDescription(runstack, runstackpos)); } - internal static string StackDescription(int[] a, int index) + private static string StackDescription(int[] a, int index) { var sb = new StringBuilder(); diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexTree.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexTree.cs index d7e0c35847..09c29b91cc 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexTree.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexTree.cs @@ -11,36 +11,36 @@ namespace System.Text.RegularExpressions { internal sealed class RegexTree { - internal RegexTree(RegexNode root, Hashtable caps, int[] capnumlist, int captop, Hashtable capnames, string[] capslist, RegexOptions opts) - { - _root = root; - _caps = caps; - _capnumlist = capnumlist; - _capnames = capnames; - _capslist = capslist; - _captop = captop; - _options = opts; - } + public readonly RegexNode Root; + public readonly Hashtable Caps; + public readonly int[] CapNumList; + public readonly int CapTop; + public readonly Hashtable CapNames; + public readonly string[] CapsList; + public readonly RegexOptions Options; - internal readonly RegexNode _root; - internal readonly Hashtable _caps; - internal readonly int[] _capnumlist; - internal readonly Hashtable _capnames; - internal readonly string[] _capslist; - internal readonly RegexOptions _options; - internal readonly int _captop; + internal RegexTree(RegexNode root, Hashtable caps, int[] capNumList, int capTop, Hashtable capNames, string[] capsList, RegexOptions options) + { + Root = root; + Caps = caps; + CapNumList = capNumList; + CapTop = capTop; + CapNames = capNames; + CapsList = capsList; + Options = options; + } #if DEBUG - internal void Dump() + public void Dump() { - _root.Dump(); + Root.Dump(); } - internal bool Debug + public bool Debug { get { - return (_options & RegexOptions.Debug) != 0; + return (Options & RegexOptions.Debug) != 0; } } #endif diff --git a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexWriter.cs b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexWriter.cs index 734f42f422..b0bc0d1e5a 100644 --- a/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexWriter.cs +++ b/external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexWriter.cs @@ -18,89 +18,136 @@ using System.Globalization; namespace System.Text.RegularExpressions { - internal sealed class RegexWriter + internal ref struct RegexWriter { - private int[] _intStack; - private int _depth; - private int[] _emitted; - private int _curpos; - private readonly Dictionary _stringhash; - private readonly List _stringtable; - private bool _counting; - private int _count; - private int _trackcount; - private Hashtable _caps; - private const int BeforeChild = 64; private const int AfterChild = 128; + // Distribution of common patterns indicates an average amount of 56 op codes. + private const int EmittedSize = 56; + private const int IntStackSize = 32; + + private ValueListBuilder _emitted; + private ValueListBuilder _intStack; + private readonly Dictionary _stringHash; + private readonly List _stringTable; + private Hashtable _caps; + private int _trackCount; + + private RegexWriter(Span emittedSpan, Span intStackSpan) + { + _emitted = new ValueListBuilder(emittedSpan); + _intStack = new ValueListBuilder(intStackSpan); + _stringHash = new Dictionary(); + _stringTable = new List(); + _caps = null; + _trackCount = 0; + } /// /// This is the only function that should be called from outside. /// It takes a RegexTree and creates a corresponding RegexCode. /// - internal static RegexCode Write(RegexTree t) + public static RegexCode Write(RegexTree tree) { - RegexWriter w = new RegexWriter(); - RegexCode retval = w.RegexCodeFromRegexTree(t); + Span emittedSpan = stackalloc int[EmittedSize]; + Span intStackSpan = stackalloc int[IntStackSize]; + + var writer = new RegexWriter(emittedSpan, intStackSpan); + RegexCode code = writer.RegexCodeFromRegexTree(tree); + writer.Dispose(); + #if DEBUG - if (t.Debug) + if (tree.Debug) { - t.Dump(); - retval.Dump(); + tree.Dump(); + code.Dump(); } #endif - return retval; - } - // Private constructor; can't be created outside - private RegexWriter() - { - _intStack = new int[32]; - _emitted = new int[32]; - _stringhash = new Dictionary(); - _stringtable = new List(); + return code; } /// - /// To avoid recursion, we use a simple integer stack. - /// This is the push. + /// Return rented buffers. /// - private void PushInt(int i) + public void Dispose() { - if (_depth >= _intStack.Length) + _emitted.Dispose(); + _intStack.Dispose(); + } + + /// + /// The top level RegexCode generator. It does a depth-first walk + /// through the tree and calls EmitFragment to emits code before + /// and after each child of an interior node, and at each leaf. + /// + public RegexCode RegexCodeFromRegexTree(RegexTree tree) + { + // construct sparse capnum mapping if some numbers are unused + int capsize; + if (tree.CapNumList == null || tree.CapTop == tree.CapNumList.Length) { - int[] expanded = new int[_depth * 2]; - - Array.Copy(_intStack, 0, expanded, 0, _depth); - - _intStack = expanded; + capsize = tree.CapTop; + _caps = null; + } + else + { + capsize = tree.CapNumList.Length; + _caps = tree.Caps; + for (int i = 0; i < tree.CapNumList.Length; i++) + _caps[tree.CapNumList[i]] = i; } - _intStack[_depth++] = i; - } + RegexNode curNode = tree.Root; + int curChild = 0; - /// - /// true if the stack is empty. - /// - private bool EmptyStack() - { - return _depth == 0; - } + Emit(RegexCode.Lazybranch, 0); - /// - /// This is the pop. - /// - private int PopInt() - { - return _intStack[--_depth]; - } + for (; ; ) + { + if (curNode.Children == null) + { + EmitFragment(curNode.NType, curNode, 0); + } + else if (curChild < curNode.Children.Count) + { + EmitFragment(curNode.NType | BeforeChild, curNode, curChild); - /// - /// Returns the current position in the emitted code. - /// - private int CurPos() - { - return _curpos; + curNode = curNode.Children[curChild]; + _intStack.Append(curChild); + curChild = 0; + continue; + } + + if (_intStack.Length == 0) + break; + + curChild = _intStack.Pop(); + curNode = curNode.Next; + + EmitFragment(curNode.NType | AfterChild, curNode, curChild); + curChild++; + } + + PatchJump(0, _emitted.Length); + Emit(RegexCode.Stop); + + RegexPrefix? fcPrefix = RegexFCD.FirstChars(tree); + RegexPrefix prefix = RegexFCD.Prefix(tree); + bool rtl = ((tree.Options & RegexOptions.RightToLeft) != 0); + + CultureInfo culture = (tree.Options & RegexOptions.CultureInvariant) != 0 ? CultureInfo.InvariantCulture : CultureInfo.CurrentCulture; + RegexBoyerMoore bmPrefix; + + if (prefix.Prefix.Length > 0) + bmPrefix = new RegexBoyerMoore(prefix.Prefix, prefix.CaseInsensitive, rtl, culture); + else + bmPrefix = null; + + int anchors = RegexFCD.Anchors(tree); + int[] emitted = _emitted.AsSpan().ToArray(); + + return new RegexCode(emitted, _stringTable, _trackCount, _caps, capsize, bmPrefix, fcPrefix, anchors, rtl); } /// @@ -119,14 +166,10 @@ namespace System.Text.RegularExpressions /// private void Emit(int op) { - if (_counting) - { - _count += 1; - if (RegexCode.OpcodeBacktracks(op)) - _trackcount += 1; - return; - } - _emitted[_curpos++] = op; + if (RegexCode.OpcodeBacktracks(op)) + _trackCount++; + + _emitted.Append(op); } /// @@ -134,15 +177,11 @@ namespace System.Text.RegularExpressions /// private void Emit(int op, int opd1) { - if (_counting) - { - _count += 2; - if (RegexCode.OpcodeBacktracks(op)) - _trackcount += 1; - return; - } - _emitted[_curpos++] = op; - _emitted[_curpos++] = opd1; + if (RegexCode.OpcodeBacktracks(op)) + _trackCount++; + + _emitted.Append(op); + _emitted.Append(opd1); } /// @@ -150,16 +189,12 @@ namespace System.Text.RegularExpressions /// private void Emit(int op, int opd1, int opd2) { - if (_counting) - { - _count += 3; - if (RegexCode.OpcodeBacktracks(op)) - _trackcount += 1; - return; - } - _emitted[_curpos++] = op; - _emitted[_curpos++] = opd1; - _emitted[_curpos++] = opd2; + if (RegexCode.OpcodeBacktracks(op)) + _trackCount++; + + _emitted.Append(op); + _emitted.Append(opd1); + _emitted.Append(opd2); } /// @@ -168,18 +203,15 @@ namespace System.Text.RegularExpressions /// private int StringCode(string str) { - if (_counting) - return 0; - if (str == null) str = string.Empty; int i; - if (!_stringhash.TryGetValue(str, out i)) + if (!_stringHash.TryGetValue(str, out i)) { - i = _stringtable.Count; - _stringhash[str] = i; - _stringtable.Add(str); + i = _stringTable.Count; + _stringHash[str] = i; + _stringTable.Add(str); } return i; @@ -202,106 +234,6 @@ namespace System.Text.RegularExpressions return capnum; } - /// - /// The top level RegexCode generator. It does a depth-first walk - /// through the tree and calls EmitFragment to emits code before - /// and after each child of an interior node, and at each leaf. - /// - /// It runs two passes, first to count the size of the generated - /// code, and second to generate the code. - /// - /// We should time it against the alternative, which is - /// to just generate the code and grow the array as we go. - /// - private RegexCode RegexCodeFromRegexTree(RegexTree tree) - { - RegexNode curNode; - int curChild; - int capsize; - RegexPrefix fcPrefix; - RegexPrefix prefix; - int anchors; - RegexBoyerMoore bmPrefix; - bool rtl; - - // construct sparse capnum mapping if some numbers are unused - - if (tree._capnumlist == null || tree._captop == tree._capnumlist.Length) - { - capsize = tree._captop; - _caps = null; - } - else - { - capsize = tree._capnumlist.Length; - _caps = tree._caps; - for (int i = 0; i < tree._capnumlist.Length; i++) - _caps[tree._capnumlist[i]] = i; - } - - _counting = true; - - for (; ;) - { - if (!_counting) - _emitted = new int[_count]; - - curNode = tree._root; - curChild = 0; - - Emit(RegexCode.Lazybranch, 0); - - for (; ;) - { - if (curNode._children == null) - { - EmitFragment(curNode._type, curNode, 0); - } - else if (curChild < curNode._children.Count) - { - EmitFragment(curNode._type | BeforeChild, curNode, curChild); - - curNode = curNode._children[curChild]; - PushInt(curChild); - curChild = 0; - continue; - } - - if (EmptyStack()) - break; - - curChild = PopInt(); - curNode = curNode._next; - - EmitFragment(curNode._type | AfterChild, curNode, curChild); - curChild++; - } - - PatchJump(0, CurPos()); - Emit(RegexCode.Stop); - - if (!_counting) - break; - - _counting = false; - } - - fcPrefix = RegexFCD.FirstChars(tree); - - prefix = RegexFCD.Prefix(tree); - rtl = ((tree._options & RegexOptions.RightToLeft) != 0); - - CultureInfo culture = (tree._options & RegexOptions.CultureInvariant) != 0 ? CultureInfo.InvariantCulture : CultureInfo.CurrentCulture; - if (prefix != null && prefix.Prefix.Length > 0) - bmPrefix = new RegexBoyerMoore(prefix.Prefix, prefix.CaseInsensitive, rtl, culture); - else - bmPrefix = null; - - anchors = RegexFCD.Anchors(tree); - - return new RegexCode(_emitted, _stringtable, _trackcount, _caps, capsize, bmPrefix, fcPrefix, anchors, rtl); - } - /// /// The main RegexCode generator. It does a depth-first walk /// through the tree and calls EmitFragment to emits code before @@ -315,7 +247,7 @@ namespace System.Text.RegularExpressions { if (node.UseOptionR()) bits |= RegexCode.Rtl; - if ((node._options & RegexOptions.IgnoreCase) != 0) + if ((node.Options & RegexOptions.IgnoreCase) != 0) bits |= RegexCode.Ci; } @@ -327,28 +259,28 @@ namespace System.Text.RegularExpressions break; case RegexNode.Alternate | BeforeChild: - if (curIndex < node._children.Count - 1) + if (curIndex < node.Children.Count - 1) { - PushInt(CurPos()); + _intStack.Append(_emitted.Length); Emit(RegexCode.Lazybranch, 0); } break; case RegexNode.Alternate | AfterChild: { - if (curIndex < node._children.Count - 1) + if (curIndex < node.Children.Count - 1) { - int LBPos = PopInt(); - PushInt(CurPos()); + int LBPos = _intStack.Pop(); + _intStack.Append(_emitted.Length); Emit(RegexCode.Goto, 0); - PatchJump(LBPos, CurPos()); + PatchJump(LBPos, _emitted.Length); } else { int I; for (I = 0; I < curIndex; I++) { - PatchJump(PopInt(), CurPos()); + PatchJump(_intStack.Pop(), _emitted.Length); } } break; @@ -359,9 +291,9 @@ namespace System.Text.RegularExpressions { case 0: Emit(RegexCode.Setjump); - PushInt(CurPos()); + _intStack.Append(_emitted.Length); Emit(RegexCode.Lazybranch, 0); - Emit(RegexCode.Testref, MapCapnum(node._m)); + Emit(RegexCode.Testref, MapCapnum(node.M)); Emit(RegexCode.Forejump); break; } @@ -372,18 +304,18 @@ namespace System.Text.RegularExpressions { case 0: { - int Branchpos = PopInt(); - PushInt(CurPos()); + int Branchpos = _intStack.Pop(); + _intStack.Append(_emitted.Length); Emit(RegexCode.Goto, 0); - PatchJump(Branchpos, CurPos()); + PatchJump(Branchpos, _emitted.Length); Emit(RegexCode.Forejump); - if (node._children.Count > 1) + if (node.Children.Count > 1) break; // else fallthrough goto case 1; } case 1: - PatchJump(PopInt(), CurPos()); + PatchJump(_intStack.Pop(), _emitted.Length); break; } break; @@ -394,7 +326,7 @@ namespace System.Text.RegularExpressions case 0: Emit(RegexCode.Setjump); Emit(RegexCode.Setmark); - PushInt(CurPos()); + _intStack.Append(_emitted.Length); Emit(RegexCode.Lazybranch, 0); break; } @@ -408,19 +340,19 @@ namespace System.Text.RegularExpressions Emit(RegexCode.Forejump); break; case 1: - int Branchpos = PopInt(); - PushInt(CurPos()); + int Branchpos = _intStack.Pop(); + _intStack.Append(_emitted.Length); Emit(RegexCode.Goto, 0); - PatchJump(Branchpos, CurPos()); + PatchJump(Branchpos, _emitted.Length); Emit(RegexCode.Getmark); Emit(RegexCode.Forejump); - if (node._children.Count > 2) + if (node.Children.Count > 2) break; // else fallthrough goto case 2; case 2: - PatchJump(PopInt(), CurPos()); + PatchJump(_intStack.Pop(), _emitted.Length); break; } break; @@ -428,32 +360,32 @@ namespace System.Text.RegularExpressions case RegexNode.Loop | BeforeChild: case RegexNode.Lazyloop | BeforeChild: - if (node._n < int.MaxValue || node._m > 1) - Emit(node._m == 0 ? RegexCode.Nullcount : RegexCode.Setcount, node._m == 0 ? 0 : 1 - node._m); + if (node.N < int.MaxValue || node.M > 1) + Emit(node.M == 0 ? RegexCode.Nullcount : RegexCode.Setcount, node.M == 0 ? 0 : 1 - node.M); else - Emit(node._m == 0 ? RegexCode.Nullmark : RegexCode.Setmark); + Emit(node.M == 0 ? RegexCode.Nullmark : RegexCode.Setmark); - if (node._m == 0) + if (node.M == 0) { - PushInt(CurPos()); + _intStack.Append(_emitted.Length); Emit(RegexCode.Goto, 0); } - PushInt(CurPos()); + _intStack.Append(_emitted.Length); break; case RegexNode.Loop | AfterChild: case RegexNode.Lazyloop | AfterChild: { - int StartJumpPos = CurPos(); + int StartJumpPos = _emitted.Length; int Lazy = (nodetype - (RegexNode.Loop | AfterChild)); - if (node._n < int.MaxValue || node._m > 1) - Emit(RegexCode.Branchcount + Lazy, PopInt(), node._n == int.MaxValue ? int.MaxValue : node._n - node._m); + if (node.N < int.MaxValue || node.M > 1) + Emit(RegexCode.Branchcount + Lazy, _intStack.Pop(), node.N == int.MaxValue ? int.MaxValue : node.N - node.M); else - Emit(RegexCode.Branchmark + Lazy, PopInt()); + Emit(RegexCode.Branchmark + Lazy, _intStack.Pop()); - if (node._m == 0) - PatchJump(PopInt(), StartJumpPos); + if (node.M == 0) + PatchJump(_intStack.Pop(), StartJumpPos); } break; @@ -466,7 +398,7 @@ namespace System.Text.RegularExpressions break; case RegexNode.Capture | AfterChild: - Emit(RegexCode.Capturemark, MapCapnum(node._m), MapCapnum(node._n)); + Emit(RegexCode.Capturemark, MapCapnum(node.M), MapCapnum(node.N)); break; case RegexNode.Require | BeforeChild: @@ -489,13 +421,13 @@ namespace System.Text.RegularExpressions case RegexNode.Prevent | BeforeChild: Emit(RegexCode.Setjump); - PushInt(CurPos()); + _intStack.Append(_emitted.Length); Emit(RegexCode.Lazybranch, 0); break; case RegexNode.Prevent | AfterChild: Emit(RegexCode.Backjump); - PatchJump(PopInt(), CurPos()); + PatchJump(_intStack.Pop(), _emitted.Length); Emit(RegexCode.Forejump); break; @@ -509,40 +441,40 @@ namespace System.Text.RegularExpressions case RegexNode.One: case RegexNode.Notone: - Emit(node._type | bits, node._ch); + Emit(node.NType | bits, node.Ch); break; case RegexNode.Notoneloop: case RegexNode.Notonelazy: case RegexNode.Oneloop: case RegexNode.Onelazy: - if (node._m > 0) - Emit(((node._type == RegexNode.Oneloop || node._type == RegexNode.Onelazy) ? - RegexCode.Onerep : RegexCode.Notonerep) | bits, node._ch, node._m); - if (node._n > node._m) - Emit(node._type | bits, node._ch, node._n == int.MaxValue ? - int.MaxValue : node._n - node._m); + if (node.M > 0) + Emit(((node.NType == RegexNode.Oneloop || node.NType == RegexNode.Onelazy) ? + RegexCode.Onerep : RegexCode.Notonerep) | bits, node.Ch, node.M); + if (node.N > node.M) + Emit(node.NType | bits, node.Ch, node.N == int.MaxValue ? + int.MaxValue : node.N - node.M); break; case RegexNode.Setloop: case RegexNode.Setlazy: - if (node._m > 0) - Emit(RegexCode.Setrep | bits, StringCode(node._str), node._m); - if (node._n > node._m) - Emit(node._type | bits, StringCode(node._str), - (node._n == int.MaxValue) ? int.MaxValue : node._n - node._m); + if (node.M > 0) + Emit(RegexCode.Setrep | bits, StringCode(node.Str), node.M); + if (node.N > node.M) + Emit(node.NType | bits, StringCode(node.Str), + (node.N == int.MaxValue) ? int.MaxValue : node.N - node.M); break; case RegexNode.Multi: - Emit(node._type | bits, StringCode(node._str)); + Emit(node.NType | bits, StringCode(node.Str)); break; case RegexNode.Set: - Emit(node._type | bits, StringCode(node._str)); + Emit(node.NType | bits, StringCode(node.Str)); break; case RegexNode.Ref: - Emit(node._type | bits, MapCapnum(node._m)); + Emit(node.NType | bits, MapCapnum(node.M)); break; case RegexNode.Nothing: @@ -556,7 +488,7 @@ namespace System.Text.RegularExpressions case RegexNode.Start: case RegexNode.EndZ: case RegexNode.End: - Emit(node._type); + Emit(node.NType); break; default: diff --git a/external/corefx/src/System.Text.RegularExpressions/tests/Performance/Configurations.props b/external/corefx/src/System.Text.RegularExpressions/tests/Performance/Configurations.props new file mode 100644 index 0000000000..2845c11c54 --- /dev/null +++ b/external/corefx/src/System.Text.RegularExpressions/tests/Performance/Configurations.props @@ -0,0 +1,8 @@ + + + + + netcoreapp; + + + \ No newline at end of file diff --git a/external/corefx/src/System.Text.RegularExpressions/tests/Performance/Perf.Regex.Cache.cs b/external/corefx/src/System.Text.RegularExpressions/tests/Performance/Perf.Regex.Cache.cs new file mode 100644 index 0000000000..7ed8b7c20a --- /dev/null +++ b/external/corefx/src/System.Text.RegularExpressions/tests/Performance/Perf.Regex.Cache.cs @@ -0,0 +1,122 @@ +// 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 Microsoft.Xunit.Performance; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Xunit; + +namespace System.Text.RegularExpressions.Tests +{ + public class Perf_Regex_Cache + { + private const int MaxConcurrency = 4; + private volatile bool _isMatch; + + private static string[] CreatePatterns(int total, int unique) + { + var regexps = new string[total]; + // create: + { + var i = 0; + for (; i < unique; i++) + { + // "(0+)" "(1+)" .. "(9+)(9+)(8+)" .. + var sb = new StringBuilder(); + foreach (var c in i.ToString()) + sb.Append("(" + c + "+)"); + regexps[i] = sb.ToString(); + } + for (; i < total; i++) regexps[i] = regexps[i % unique]; + } + + // shuffle: + const int someSeed = 101; // seed for reproducability + var random = new Random(someSeed); + for (var i = 0; i < total; i++) + { + var r = random.Next(i, total); + var t = regexps[i]; + regexps[i] = regexps[r]; + regexps[r] = t; + } + + return regexps; + } + + [Benchmark] + [MeasureGCAllocations] + [InlineData(400_000, 7, 15)] // default size, most common + [InlineData(400_000, 1, 15)] // default size, to test MRU + [InlineData(40_000, 7, 0)] // cache turned off + [InlineData(40_000, 1_600, 15)] // default size, to compare when cache used + [InlineData(40_000, 1_600, 800)] // larger size, to test cache is not O(n) + [InlineData(40_000, 1_600, 3_200)] // larger size, to test cache always hit + public void IsMatch(int total, int unique, int cacheSize) + { + var cacheSizeOld = Regex.CacheSize; + string[] patterns = CreatePatterns(total, unique); + + try + { + Regex.CacheSize = 0; // clean up cache + Regex.CacheSize = cacheSize; + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + using (iteration.StartMeasurement()) + RunTest(0, total, patterns); + } + finally + { + Regex.CacheSize = cacheSizeOld; + } + } + + private void RunTest(int start, int total, string[] regexps) + { + for (var i = 0; i < total; i++) + _isMatch = Regex.IsMatch("0123456789", regexps[start + i]); + } + + [Benchmark] + [MeasureGCAllocations] + [InlineData(400_000, 7, 15)] // default size, most common + [InlineData(400_000, 1, 15)] // default size, to test MRU + [InlineData(40_000, 7, 0)] // cache turned off + [InlineData(40_000, 1_600, 15)] // default size, to compare when cache used + [InlineData(40_000, 1_600, 800)] // larger size, to test cache is not O(n) + [InlineData(40_000, 1_600, 3_200)] // larger size, to test cache always hit + public async Task IsMatch_Multithreading(int total, int unique, int cacheSize) + { + int cacheSizeOld = Regex.CacheSize; + string[] patterns = CreatePatterns(total, unique); + + try + { + Regex.CacheSize = 0; // clean up cache + Regex.CacheSize = cacheSize; + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + int sliceLength = total / MaxConcurrency; + var tasks = new Task[MaxConcurrency]; + + for (int i = 0; i < MaxConcurrency; i++) + { + int start = i * sliceLength; + tasks[i] = Task.Run(() => RunTest(start, sliceLength, patterns)); + } + + await Task.WhenAll(tasks); + } + } + } + finally + { + Regex.CacheSize = cacheSizeOld; + } + } + } +} diff --git a/external/corefx/src/System.Text.RegularExpressions/tests/Performance/Perf.Regex.cs b/external/corefx/src/System.Text.RegularExpressions/tests/Performance/Perf.Regex.cs new file mode 100644 index 0000000000..96718a624f --- /dev/null +++ b/external/corefx/src/System.Text.RegularExpressions/tests/Performance/Perf.Regex.cs @@ -0,0 +1,452 @@ +// 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.Collections.Generic; +using Microsoft.Xunit.Performance; + +namespace System.Text.RegularExpressions.Tests +{ + /// + /// Performance tests for Regular Expressions + /// + public class Perf_Regex + { + private const int InnerIterations = 100; + + [Benchmark] + [MeasureGCAllocations] + public void Match() + { + var cacheSizeOld = Regex.CacheSize; + try + { + Regex.CacheSize = 0; // disable cache to get clearer results + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + for (int i = 0; i < InnerIterations; i++) + { + foreach (var test in Match_TestData()) + Regex.Match((string)test[1], (string)test[0], (RegexOptions)test[2]); + } + } + } + } + finally + { + Regex.CacheSize = cacheSizeOld; + } + } + + // A series of patterns (all valid and non pathological) and inputs (which they may or may not match) + public static IEnumerable Match_TestData() + { + yield return new object[] { "[abcd-[d]]+", "dddaabbccddd", RegexOptions.None }; + yield return new object[] { @"[\d-[357]]+", "33312468955", RegexOptions.None }; + yield return new object[] { @"[\d-[357]]+", "51246897", RegexOptions.None }; + yield return new object[] { @"[\d-[357]]+", "3312468977", RegexOptions.None }; + yield return new object[] { @"[\w-[b-y]]+", "bbbaaaABCD09zzzyyy", RegexOptions.None }; + yield return new object[] { @"[\w-[\d]]+", "0AZaz9", RegexOptions.None }; + yield return new object[] { @"[\w-[\p{Ll}]]+", "a09AZz", RegexOptions.None }; + yield return new object[] { @"[\d-[13579]]+", "1024689", RegexOptions.ECMAScript }; + yield return new object[] { @"[\d-[13579]]+", "\x066102468\x0660", RegexOptions.ECMAScript }; + yield return new object[] { @"[\d-[13579]]+", "\x066102468\x0660", RegexOptions.None }; + yield return new object[] { @"[\w-[b-y]]+", "bbbaaaABCD09zzzyyy", RegexOptions.None }; + yield return new object[] { @"[\w-[b-y]]+", "bbbaaaABCD09zzzyyy", RegexOptions.None }; + yield return new object[] { @"[\w-[b-y]]+", "bbbaaaABCD09zzzyyy", RegexOptions.None }; + yield return new object[] { @"[\p{Ll}-[ae-z]]+", "aaabbbcccdddeee", RegexOptions.None }; + yield return new object[] { @"[\p{Nd}-[2468]]+", "20135798", RegexOptions.None }; + yield return new object[] { @"[\P{Lu}-[ae-z]]+", "aaabbbcccdddeee", RegexOptions.None }; + yield return new object[] { @"[\P{Nd}-[\p{Ll}]]+", "az09AZ'[]", RegexOptions.None }; + yield return new object[] { "[abcd-[def]]+", "fedddaabbccddd", RegexOptions.None }; + yield return new object[] { @"[\d-[357a-z]]+", "az33312468955", RegexOptions.None }; + yield return new object[] { @"[\d-[de357fgA-Z]]+", "AZ51246897", RegexOptions.None }; + yield return new object[] { @"[\d-[357\p{Ll}]]+", "az3312468977", RegexOptions.None }; + yield return new object[] { @"[\w-[b-y\s]]+", " \tbbbaaaABCD09zzzyyy", RegexOptions.None }; + yield return new object[] { @"[\w-[\d\p{Po}]]+", "!#0AZaz9", RegexOptions.None }; + yield return new object[] { @"[\w-[\p{Ll}\s]]+", "a09AZz", RegexOptions.None }; + yield return new object[] { @"[\d-[13579a-zA-Z]]+", "AZ1024689", RegexOptions.ECMAScript }; + yield return new object[] { @"[\d-[13579abcd]]+", "abcd\x066102468\x0660", RegexOptions.ECMAScript }; + yield return new object[] { @"[\d-[13579\s]]+", " \t\x066102468\x0660", RegexOptions.None }; + yield return new object[] { @"[\w-[b-y\p{Po}]]+", "!#bbbaaaABCD09zzzyyy", RegexOptions.None }; + yield return new object[] { @"[\w-[b-y!.,]]+", "!.,bbbaaaABCD09zzzyyy", RegexOptions.None }; + yield return new object[] { "[\\w-[b-y\x00-\x0F]]+", "\0bbbaaaABCD09zzzyyy", RegexOptions.None }; + yield return new object[] { @"[\p{Ll}-[ae-z0-9]]+", "09aaabbbcccdddeee", RegexOptions.None }; + yield return new object[] { @"[\p{Nd}-[2468az]]+", "az20135798", RegexOptions.None }; + yield return new object[] { @"[\P{Lu}-[ae-zA-Z]]+", "AZaaabbbcccdddeee", RegexOptions.None }; + yield return new object[] { @"[\P{Nd}-[\p{Ll}0123456789]]+", "09az09AZ'[]", RegexOptions.None }; + yield return new object[] { "[abc-[defg]]+", "dddaabbccddd", RegexOptions.None }; + yield return new object[] { @"[\d-[abc]]+", "abc09abc", RegexOptions.None }; + yield return new object[] { @"[\d-[a-zA-Z]]+", "az09AZ", RegexOptions.None }; + yield return new object[] { @"[\d-[\p{Ll}]]+", "az09az", RegexOptions.None }; + yield return new object[] { @"[\w-[\x00-\x0F]]+", "bbbaaaABYZ09zzzyyy", RegexOptions.None }; + yield return new object[] { @"[\w-[\s]]+", "0AZaz9", RegexOptions.None }; + yield return new object[] { @"[\w-[\W]]+", "0AZaz9", RegexOptions.None }; + yield return new object[] { @"[\w-[\p{Po}]]+", "#a09AZz!", RegexOptions.None }; + yield return new object[] { @"[\d-[\D]]+", "azAZ1024689", RegexOptions.ECMAScript }; + yield return new object[] { @"[\d-[a-zA-Z]]+", "azAZ\x066102468\x0660", RegexOptions.ECMAScript }; + yield return new object[] { @"[\d-[\p{Ll}]]+", "\x066102468\x0660", RegexOptions.None }; + yield return new object[] { @"[a-zA-Z0-9-[\s]]+", " \tazAZ09", RegexOptions.None }; + yield return new object[] { @"[a-zA-Z0-9-[\W]]+", "bbbaaaABCD09zzzyyy", RegexOptions.None }; + yield return new object[] { @"[a-zA-Z0-9-[^a-zA-Z0-9]]+", "bbbaaaABCD09zzzyyy", RegexOptions.None }; + yield return new object[] { @"[\p{Ll}-[A-Z]]+", "AZaz09", RegexOptions.None }; + yield return new object[] { @"[\p{Nd}-[a-z]]+", "az09", RegexOptions.None }; + yield return new object[] { @"[\P{Lu}-[\p{Lu}]]+", "AZazAZ", RegexOptions.None }; + yield return new object[] { @"[\P{Lu}-[A-Z]]+", "AZazAZ", RegexOptions.None }; + yield return new object[] { @"[\P{Nd}-[\p{Nd}]]+", "azAZ09", RegexOptions.None }; + yield return new object[] { @"[\P{Nd}-[2-8]]+", "1234567890azAZ1234567890", RegexOptions.None }; + yield return new object[] { @"([ ]|[\w-[0-9]])+", "09az AZ90", RegexOptions.None }; + yield return new object[] { @"([0-9-[02468]]|[0-9-[13579]])+", "az1234567890za", RegexOptions.None }; + yield return new object[] { @"([^0-9-[a-zAE-Z]]|[\w-[a-zAF-Z]])+", "azBCDE1234567890BCDEFza", RegexOptions.None }; + yield return new object[] { @"([\p{Ll}-[aeiou]]|[^\w-[\s]])+", "aeiobcdxyz!@#aeio", RegexOptions.None }; + yield return new object[] { @"98[\d-[9]][\d-[8]][\d-[0]]", "98911 98881 98870 98871", RegexOptions.None }; + yield return new object[] { @"m[\w-[^aeiou]][\w-[^aeiou]]t", "mbbt mect meet", RegexOptions.None }; + yield return new object[] { "[abcdef-[^bce]]+", "adfbcefda", RegexOptions.None }; + yield return new object[] { "[^cde-[ag]]+", "agbfxyzga", RegexOptions.None }; + yield return new object[] { @"[\p{L}-[^\p{Lu}]]+", "09',.abcxyzABCXYZ", RegexOptions.None }; + yield return new object[] { @"[\p{IsGreek}-[\P{Lu}]]+", "\u0390\u03FE\u0386\u0388\u03EC\u03EE\u0400", RegexOptions.None }; + yield return new object[] { @"[\p{IsBasicLatin}-[G-L]]+", "GAFMZL", RegexOptions.None }; + yield return new object[] { "[a-zA-Z-[aeiouAEIOU]]+", "aeiouAEIOUbcdfghjklmnpqrstvwxyz", RegexOptions.None }; + yield return new object[] { @"^ + (?^ + ( + ( + (?[\d-[013-9]]) + | + [\d-[2-9]] + ) + (?(Octet2xx) + ( + (?[\d-[01-46-9]]) + | + [\d-[5-9]] + ) + ( + (?(Octet25x) + [\d-[6-9]] + | + [\d] + ) + ) + | + [\d]{2} + ) + ) + | + ([\d][\d]) + | + [\d] + )$" + , "255", RegexOptions.IgnorePatternWhitespace }; + yield return new object[] { @"[abcd\-d-[bc]]+", "bbbaaa---dddccc", RegexOptions.None }; + yield return new object[] { @"[abcd\-d-[bc]]+", "bbbaaa---dddccc", RegexOptions.None }; + yield return new object[] { @"[^a-f-[\x00-\x60\u007B-\uFFFF]]+", "aaafffgggzzz{{{", RegexOptions.None }; + yield return new object[] { @"[\[\]a-f-[[]]+", "gggaaafff]]][[[", RegexOptions.None }; + yield return new object[] { @"[\[\]a-f-[]]]+", "gggaaafff[[[]]]", RegexOptions.None }; + yield return new object[] { @"[ab\-\[cd-[-[]]]]", "a]]", RegexOptions.None }; + yield return new object[] { @"[ab\-\[cd-[-[]]]]", "b]]", RegexOptions.None }; + yield return new object[] { @"[ab\-\[cd-[-[]]]]", "c]]", RegexOptions.None }; + yield return new object[] { @"[ab\-\[cd-[-[]]]]", "d]]", RegexOptions.None }; + yield return new object[] { @"[ab\-\[cd-[[]]]]", "a]]", RegexOptions.None }; + yield return new object[] { @"[ab\-\[cd-[[]]]]", "b]]", RegexOptions.None }; + yield return new object[] { @"[ab\-\[cd-[[]]]]", "c]]", RegexOptions.None }; + yield return new object[] { @"[ab\-\[cd-[[]]]]", "d]]", RegexOptions.None }; + yield return new object[] { @"[ab\-\[cd-[[]]]]", "-]]", RegexOptions.None }; + yield return new object[] { @"[a-[c-e]]+", "bbbaaaccc", RegexOptions.None }; + yield return new object[] { @"[a-[c-e]]+", "```aaaccc", RegexOptions.None }; + yield return new object[] { @"[a-d\--[bc]]+", "cccaaa--dddbbb", RegexOptions.None }; + yield return new object[] { @"[\0- [bc]+", "!!!\0\0\t\t [[[[bbbcccaaa", RegexOptions.None }; + yield return new object[] { "[[abcd]-[bc]]+", "a-b]", RegexOptions.None }; + yield return new object[] { "[-[e-g]+", "ddd[[[---eeefffggghhh", RegexOptions.None }; + yield return new object[] { "[-e-g]+", "ddd---eeefffggghhh", RegexOptions.None }; + yield return new object[] { "[-e-g]+", "ddd---eeefffggghhh", RegexOptions.None }; + yield return new object[] { "[a-e - m-p]+", "---a b c d e m n o p---", RegexOptions.None }; + yield return new object[] { "[^-[bc]]", "b] c] -] aaaddd]", RegexOptions.None }; + yield return new object[] { "[^-[bc]]", "b] c] -] aaa]ddd]", RegexOptions.None }; + yield return new object[] { @"[a\-[bc]+", "```bbbaaa---[[[cccddd", RegexOptions.None }; + yield return new object[] { @"[a\-[\-\-bc]+", "```bbbaaa---[[[cccddd", RegexOptions.None }; + yield return new object[] { @"[a\-\[\-\[\-bc]+", "```bbbaaa---[[[cccddd", RegexOptions.None }; + yield return new object[] { @"[abc\--[b]]+", "[[[```bbbaaa---cccddd", RegexOptions.None }; + yield return new object[] { @"[abc\-z-[b]]+", "```aaaccc---zzzbbb", RegexOptions.None }; + yield return new object[] { @"[a-d\-[b]+", "```aaabbbcccddd----[[[[]]]", RegexOptions.None }; + yield return new object[] { @"[abcd\-d\-[bc]+", "bbbaaa---[[[dddccc", RegexOptions.None }; + yield return new object[] { "[a - c - [ b ] ]+", "dddaaa ccc [[[[ bbb ]]]", RegexOptions.IgnorePatternWhitespace }; + yield return new object[] { "[a - c - [ b ] +", "dddaaa ccc [[[[ bbb ]]]", RegexOptions.IgnorePatternWhitespace }; + yield return new object[] { @"(\p{Lu}\w*)\s(\p{Lu}\w*)", "Hello World", RegexOptions.None }; + yield return new object[] { @"(\p{Lu}\p{Ll}*)\s(\p{Lu}\p{Ll}*)", "Hello World", RegexOptions.None }; + yield return new object[] { @"(\P{Ll}\p{Ll}*)\s(\P{Ll}\p{Ll}*)", "Hello World", RegexOptions.None }; + yield return new object[] { @"(\P{Lu}+\p{Lu})\s(\P{Lu}+\p{Lu})", "hellO worlD", RegexOptions.None }; + yield return new object[] { @"(\p{Lt}\w*)\s(\p{Lt}*\w*)", "\u01C5ello \u01C5orld", RegexOptions.None }; + yield return new object[] { @"(\P{Lt}\w*)\s(\P{Lt}*\w*)", "Hello World", RegexOptions.None }; + yield return new object[] { @"[@-D]+", "eE?@ABCDabcdeE", RegexOptions.IgnoreCase }; + yield return new object[] { @"[>-D]+", "eE=>?@ABCDabcdeE", RegexOptions.IgnoreCase }; + yield return new object[] { @"[\u0554-\u0557]+", "\u0583\u0553\u0554\u0555\u0556\u0584\u0585\u0586\u0557\u0558", RegexOptions.IgnoreCase }; + yield return new object[] { @"[X-\]]+", "wWXYZxyz[\\]^", RegexOptions.IgnoreCase }; + yield return new object[] { @"[X-\u0533]+", "\u0551\u0554\u0560AXYZaxyz\u0531\u0532\u0533\u0561\u0562\u0563\u0564", RegexOptions.IgnoreCase }; + yield return new object[] { @"[X-a]+", "wWAXYZaxyz", RegexOptions.IgnoreCase }; + yield return new object[] { @"[X-c]+", "wWABCXYZabcxyz", RegexOptions.IgnoreCase }; + yield return new object[] { @"[X-\u00C0]+", "\u00C1\u00E1\u00C0\u00E0wWABCXYZabcxyz", RegexOptions.IgnoreCase }; + yield return new object[] { @"[\u0100\u0102\u0104]+", "\u00FF \u0100\u0102\u0104\u0101\u0103\u0105\u0106", RegexOptions.IgnoreCase }; + yield return new object[] { @"[B-D\u0130]+", "aAeE\u0129\u0131\u0068 BCDbcD\u0130\u0069\u0070", RegexOptions.IgnoreCase }; + yield return new object[] { @"[\u013B\u013D\u013F]+", "\u013A\u013B\u013D\u013F\u013C\u013E\u0140\u0141", RegexOptions.IgnoreCase }; + yield return new object[] { "(Cat)\r(Dog)", "Cat\rDog", RegexOptions.None }; + yield return new object[] { "(Cat)\t(Dog)", "Cat\tDog", RegexOptions.None }; + yield return new object[] { "(Cat)\f(Dog)", "Cat\fDog", RegexOptions.None }; + yield return new object[] { @"{5", "hello {5 world", RegexOptions.None }; + yield return new object[] { @"{5,", "hello {5, world", RegexOptions.None }; + yield return new object[] { @"{5,6", "hello {5,6 world", RegexOptions.None }; + yield return new object[] { @"(?n:(?cat)(\s+)(?dog))", "cat dog", RegexOptions.None }; + yield return new object[] { @"(?n:(cat)(\s+)(dog))", "cat dog", RegexOptions.None }; + yield return new object[] { @"(?n:(cat)(?\s+)(dog))", "cat dog", RegexOptions.None }; + yield return new object[] { @"(?x: + (?cat) # Cat statement + (\s+) # Whitespace chars + (?dog # Dog statement + ))", "cat dog", RegexOptions.None }; + yield return new object[] { @"(?+i:cat)", "CAT", RegexOptions.None }; + yield return new object[] { @"cat([\d]*)dog", "hello123cat230927dog1412d", RegexOptions.None }; + yield return new object[] { @"([\D]*)dog", "65498catdog58719", RegexOptions.None }; + yield return new object[] { @"cat([\s]*)dog", "wiocat dog3270", RegexOptions.None }; + yield return new object[] { @"cat([\S]*)", "sfdcatdog 3270", RegexOptions.None }; + yield return new object[] { @"cat([\w]*)", "sfdcatdog 3270", RegexOptions.None }; + yield return new object[] { @"cat([\W]*)dog", "wiocat dog3270", RegexOptions.None }; + yield return new object[] { @"([\p{Lu}]\w*)\s([\p{Lu}]\w*)", "Hello World", RegexOptions.None }; + yield return new object[] { @"([\P{Ll}][\p{Ll}]*)\s([\P{Ll}][\p{Ll}]*)", "Hello World", RegexOptions.None }; + yield return new object[] { @"(cat)([\x41]*)(dog)", "catAAAdog", RegexOptions.None }; + yield return new object[] { @"(cat)([\u0041]*)(dog)", "catAAAdog", RegexOptions.None }; + yield return new object[] { @"(cat)([\a]*)(dog)", "cat\a\a\adog", RegexOptions.None }; + yield return new object[] { @"(cat)([\b]*)(dog)", "cat\b\b\bdog", RegexOptions.None }; + yield return new object[] { @"(cat)([\e]*)(dog)", "cat\u001B\u001B\u001Bdog", RegexOptions.None }; + yield return new object[] { @"(cat)([\f]*)(dog)", "cat\f\f\fdog", RegexOptions.None }; + yield return new object[] { @"(cat)([\r]*)(dog)", "cat\r\r\rdog", RegexOptions.None }; + yield return new object[] { @"(cat)([\v]*)(dog)", "cat\v\v\vdog", RegexOptions.None }; + yield return new object[] { @"cat([\d]*)dog", "hello123cat230927dog1412d", RegexOptions.ECMAScript }; + yield return new object[] { @"([\D]*)dog", "65498catdog58719", RegexOptions.ECMAScript }; + yield return new object[] { @"cat([\s]*)dog", "wiocat dog3270", RegexOptions.ECMAScript }; + yield return new object[] { @"cat([\S]*)", "sfdcatdog 3270", RegexOptions.ECMAScript }; + yield return new object[] { @"cat([\w]*)", "sfdcatdog 3270", RegexOptions.ECMAScript }; + yield return new object[] { @"cat([\W]*)dog", "wiocat dog3270", RegexOptions.ECMAScript }; + yield return new object[] { @"([\p{Lu}]\w*)\s([\p{Lu}]\w*)", "Hello World", RegexOptions.ECMAScript }; + yield return new object[] { @"([\P{Ll}][\p{Ll}]*)\s([\P{Ll}][\p{Ll}]*)", "Hello World", RegexOptions.ECMAScript }; + yield return new object[] { @"(cat)\d*dog", "hello123cat230927dog1412d", RegexOptions.ECMAScript }; + yield return new object[] { @"\D*(dog)", "65498catdog58719", RegexOptions.ECMAScript }; + yield return new object[] { @"(cat)\s*(dog)", "wiocat dog3270", RegexOptions.ECMAScript }; + yield return new object[] { @"(cat)\S*", "sfdcatdog 3270", RegexOptions.ECMAScript }; + yield return new object[] { @"(cat)\w*", "sfdcatdog 3270", RegexOptions.ECMAScript }; + yield return new object[] { @"(cat)\W*(dog)", "wiocat dog3270", RegexOptions.ECMAScript }; + yield return new object[] { @"\p{Lu}(\w*)\s\p{Lu}(\w*)", "Hello World", RegexOptions.ECMAScript }; + yield return new object[] { @"\P{Ll}\p{Ll}*\s\P{Ll}\p{Ll}*", "Hello World", RegexOptions.ECMAScript }; + yield return new object[] { @"cat(?dog)", "catcatdogdogcat", RegexOptions.None }; + yield return new object[] { @"(?cat)\s*(?dog)", "catcat dogdogcat", RegexOptions.None }; + yield return new object[] { @"(?<1>cat)\s*(?<1>dog)", "catcat dogdogcat", RegexOptions.None }; + yield return new object[] { @"(?<2048>cat)\s*(?<2048>dog)", "catcat dogdogcat", RegexOptions.None }; + yield return new object[] { @"(?cat)\w+(?dog)", "cat_Hello_World_dog", RegexOptions.None }; + yield return new object[] { @"(?cat)\w+(?<-cat>dog)", "cat_Hello_World_dog", RegexOptions.None }; + yield return new object[] { @"(?cat)\w+(?dog)", "cat_Hello_World_dog", RegexOptions.None }; + yield return new object[] { @"(?<1>cat)\w+(?dog)", "cat_Hello_World_dog", RegexOptions.None }; + yield return new object[] { @"(?cat)\w+(?<2-cat>dog)", "cat_Hello_World_dog", RegexOptions.None }; + yield return new object[] { @"(?<1>cat)\w+(?<2-1>dog)", "cat_Hello_World_dog", RegexOptions.None }; + yield return new object[] { @"(?cat){", "STARTcat{", RegexOptions.None }; + yield return new object[] { @"(?cat){fdsa", "STARTcat{fdsa", RegexOptions.None }; + yield return new object[] { @"(?cat){1", "STARTcat{1", RegexOptions.None }; + yield return new object[] { @"(?cat){1END", "STARTcat{1END", RegexOptions.None }; + yield return new object[] { @"(?cat){1,", "STARTcat{1,", RegexOptions.None }; + yield return new object[] { @"(?cat){1,END", "STARTcat{1,END", RegexOptions.None }; + yield return new object[] { @"(?cat){1,2", "STARTcat{1,2", RegexOptions.None }; + yield return new object[] { @"(?cat){1,2END", "STARTcat{1,2END", RegexOptions.None }; + yield return new object[] { @"(cat) #cat + \s+ #followed by 1 or more whitespace + (dog) #followed by dog + ", "cat dog", RegexOptions.IgnorePatternWhitespace }; + yield return new object[] { @"(cat) #cat + \s+ #followed by 1 or more whitespace + (dog) #followed by dog", "cat dog", RegexOptions.IgnorePatternWhitespace }; + yield return new object[] { @"(cat) (?#cat) \s+ (?#followed by 1 or more whitespace) (dog) (?#followed by dog)", "cat dog", RegexOptions.IgnorePatternWhitespace }; + yield return new object[] { @"(?cat)(?dog)\k", "asdfcatdogcatdog", RegexOptions.None }; + yield return new object[] { @"(?cat)\s+(?dog)\k", "asdfcat dogcat dog", RegexOptions.None }; + yield return new object[] { @"(?cat)\s+(?dog)\k'cat'", "asdfcat dogcat dog", RegexOptions.None }; + yield return new object[] { @"(?cat)\s+(?dog)\", "asdfcat dogcat dog", RegexOptions.None }; + yield return new object[] { @"(?cat)\s+(?dog)\'cat'", "asdfcat dogcat dog", RegexOptions.None }; + yield return new object[] { @"(?cat)\s+(?dog)\k<1>", "asdfcat dogcat dog", RegexOptions.None }; + yield return new object[] { @"(?cat)\s+(?dog)\k'1'", "asdfcat dogcat dog", RegexOptions.None }; + yield return new object[] { @"(?cat)\s+(?dog)\<1>", "asdfcat dogcat dog", RegexOptions.None }; + yield return new object[] { @"(?cat)\s+(?dog)\'1'", "asdfcat dogcat dog", RegexOptions.None }; + yield return new object[] { @"(?cat)\s+(?dog)\1", "asdfcat dogcat dog", RegexOptions.None }; + yield return new object[] { @"(?cat)\s+(?dog)\1", "asdfcat dogcat dog", RegexOptions.ECMAScript }; + yield return new object[] { @"(?cat)\s+(?dog)\k", "asdfcat dogdog dog", RegexOptions.None }; + yield return new object[] { @"(?cat)\s+(?dog)\2", "asdfcat dogdog dog", RegexOptions.None }; + yield return new object[] { @"(?cat)\s+(?dog)\2", "asdfcat dogdog dog", RegexOptions.ECMAScript }; + yield return new object[] { @"(cat)(\077)", "hellocat?dogworld", RegexOptions.None }; + yield return new object[] { @"(cat)(\77)", "hellocat?dogworld", RegexOptions.None }; + yield return new object[] { @"(cat)(\176)", "hellocat~dogworld", RegexOptions.None }; + yield return new object[] { @"(cat)(\400)", "hellocat\0dogworld", RegexOptions.None }; + yield return new object[] { @"(cat)(\300)", "hellocat\u00C0dogworld", RegexOptions.None }; + yield return new object[] { @"(cat)(\300)", "hellocat\u00C0dogworld", RegexOptions.None }; + yield return new object[] { @"(cat)(\477)", "hellocat\u003Fdogworld", RegexOptions.None }; + yield return new object[] { @"(cat)(\777)", "hellocat\u00FFdogworld", RegexOptions.None }; + yield return new object[] { @"(cat)(\7770)", "hellocat\u00FF0dogworld", RegexOptions.None }; + yield return new object[] { @"(cat)(\077)", "hellocat?dogworld", RegexOptions.ECMAScript }; + yield return new object[] { @"(cat)(\77)", "hellocat?dogworld", RegexOptions.ECMAScript }; + yield return new object[] { @"(cat)(\7)", "hellocat\adogworld", RegexOptions.ECMAScript }; + yield return new object[] { @"(cat)(\40)", "hellocat dogworld", RegexOptions.ECMAScript }; + yield return new object[] { @"(cat)(\040)", "hellocat dogworld", RegexOptions.ECMAScript }; + yield return new object[] { @"(cat)(\176)", "hellocatcat76dogworld", RegexOptions.ECMAScript }; + yield return new object[] { @"(cat)(\377)", "hellocat\u00FFdogworld", RegexOptions.ECMAScript }; + yield return new object[] { @"(cat)(\400)", "hellocat 0Fdogworld", RegexOptions.ECMAScript }; + yield return new object[] { @"(cat)\s+(?<2147483646>dog)", "asdlkcat dogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)\s+(?<2147483647>dog)", "asdlkcat dogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)(\x2a*)(dog)", "asdlkcat***dogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)(\x2b*)(dog)", "asdlkcat+++dogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)(\x2c*)(dog)", "asdlkcat,,,dogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)(\x2d*)(dog)", "asdlkcat---dogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)(\x2e*)(dog)", "asdlkcat...dogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)(\x2A*)(dog)", "asdlkcat***dogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)(\x2B*)(dog)", "asdlkcat+++dogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)(\x2C*)(dog)", "asdlkcat,,,dogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)(\x2D*)(dog)", "asdlkcat---dogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)(\x2E*)(dog)", "asdlkcat...dogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)(\c@*)(dog)", "asdlkcat\0\0dogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)(\cA*)(dog)", "asdlkcat\u0001dogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)(\ca*)(dog)", "asdlkcat\u0001dogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)(\cC*)(dog)", "asdlkcat\u0003dogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)(\cc*)(dog)", "asdlkcat\u0003dogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)(\cD*)(dog)", "asdlkcat\u0004dogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)(\cd*)(dog)", "asdlkcat\u0004dogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)(\cX*)(dog)", "asdlkcat\u0018dogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)(\cx*)(dog)", "asdlkcat\u0018dogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)(\cZ*)(dog)", "asdlkcat\u001adogiwod", RegexOptions.None }; + yield return new object[] { @"(cat)(\cz*)(dog)", "asdlkcat\u001adogiwod", RegexOptions.None }; + yield return new object[] { @"\A(cat)\s+(dog)", "cat \n\n\n dog", RegexOptions.None }; + yield return new object[] { @"\A(cat)\s+(dog)", "cat \n\n\n dog", RegexOptions.Multiline }; + yield return new object[] { @"\A(cat)\s+(dog)", "cat \n\n\n dog", RegexOptions.ECMAScript }; + yield return new object[] { @"(cat)\s+(dog)\Z", "cat \n\n\n dog", RegexOptions.None }; + yield return new object[] { @"(cat)\s+(dog)\Z", "cat \n\n\n dog", RegexOptions.Multiline }; + yield return new object[] { @"(cat)\s+(dog)\Z", "cat \n\n\n dog", RegexOptions.ECMAScript }; + yield return new object[] { @"(cat)\s+(dog)\Z", "cat \n\n\n dog\n", RegexOptions.None }; + yield return new object[] { @"(cat)\s+(dog)\Z", "cat \n\n\n dog\n", RegexOptions.Multiline }; + yield return new object[] { @"(cat)\s+(dog)\Z", "cat \n\n\n dog\n", RegexOptions.ECMAScript }; + yield return new object[] { @"(cat)\s+(dog)\z", "cat \n\n\n dog", RegexOptions.None }; + yield return new object[] { @"(cat)\s+(dog)\z", "cat \n\n\n dog", RegexOptions.Multiline }; + yield return new object[] { @"(cat)\s+(dog)\z", "cat \n\n\n dog", RegexOptions.ECMAScript }; + yield return new object[] { @"\b@cat", "123START123@catEND", RegexOptions.None }; + yield return new object[] { @"\b\cat)\s+(?dog)\s+\123\s+\234", "asdfcat dog cat23 dog34eia", RegexOptions.ECMAScript }; + yield return new object[] { @"
+ (?> +
(?) | +
(?<-DEPTH>) | + .? + )*? + (?(DEPTH)(?!)) +
", "
this is some
red
text
", RegexOptions.IgnorePatternWhitespace }; + yield return new object[] { @"( + ((?'open'<+)[^<>]*)+ + ((?'close-open'>+)[^<>]*)+ + )+", "<01deep_01<02deep_01<03deep_01>><02deep_02><02deep_03<03deep_03>>>", RegexOptions.IgnorePatternWhitespace }; + yield return new object[] { @"( + (?<)? + [^<>]? + (?>)? + )*", "<01deep_01<02deep_01<03deep_01>><02deep_02><02deep_03<03deep_03>>>", RegexOptions.IgnorePatternWhitespace }; + yield return new object[] { @"( + (?<[^/<>]*>)? + [^<>]? + (?]*>)? + )*", "Cat", RegexOptions.IgnorePatternWhitespace }; + yield return new object[] { @"( + (?<(?[^/<>]*)>)? + [^<>]? + (?>)? + )*", "catdog", RegexOptions.IgnorePatternWhitespace }; + yield return new object[] { @"([0-9]+?)([\w]+?)", "55488aheiaheiad", RegexOptions.ECMAScript }; + yield return new object[] { @"([0-9]+?)([a-z]+?)", "55488aheiaheiad", RegexOptions.ECMAScript }; + yield return new object[] { @"\G<%#(?.*?)?%>", @"<%# DataBinder.Eval(this, ""MyNumber"") %>", RegexOptions.Singleline }; + yield return new object[] { @"^[abcd]{0,0x10}*$", "a{0,0x10}}}", RegexOptions.None }; + yield return new object[] { @"([a-z]*?)([\w])", "cat", RegexOptions.IgnoreCase }; + yield return new object[] { @"^([a-z]*?)([\w])$", "cat", RegexOptions.IgnoreCase }; + yield return new object[] { @"([a-z]*)([\w])", "cat", RegexOptions.IgnoreCase }; + yield return new object[] { @"^([a-z]*)([\w])$", "cat", RegexOptions.IgnoreCase }; + yield return new object[] { @"(cat){", "cat{", RegexOptions.None }; + yield return new object[] { @"(cat){}", "cat{}", RegexOptions.None }; + yield return new object[] { @"(cat){,", "cat{,", RegexOptions.None }; + yield return new object[] { @"(cat){,}", "cat{,}", RegexOptions.None }; + yield return new object[] { @"(cat){cat}", "cat{cat}", RegexOptions.None }; + yield return new object[] { @"(cat){cat,5}", "cat{cat,5}", RegexOptions.None }; + yield return new object[] { @"(cat){5,dog}", "cat{5,dog}", RegexOptions.None }; + yield return new object[] { @"(cat){cat,dog}", "cat{cat,dog}", RegexOptions.None }; + yield return new object[] { @"(cat){,}?", "cat{,}?", RegexOptions.None }; + yield return new object[] { @"(cat){cat}?", "cat{cat}?", RegexOptions.None }; + yield return new object[] { @"(cat){cat,5}?", "cat{cat,5}?", RegexOptions.None }; + yield return new object[] { @"(cat){5,dog}?", "cat{5,dog}?", RegexOptions.None }; + yield return new object[] { @"(cat){cat,dog}?", "cat{cat,dog}?", RegexOptions.None }; + yield return new object[] { @"()", "cat", RegexOptions.None }; + yield return new object[] { @"(?)", "cat", RegexOptions.None }; + yield return new object[] { @"(?'cat')", "cat", RegexOptions.None }; + yield return new object[] { @"(?:)", "cat", RegexOptions.None }; + yield return new object[] { @"(?imn)", "cat", RegexOptions.None }; + yield return new object[] { @"(?imn)cat", "(?imn)cat", RegexOptions.None }; + yield return new object[] { @"(?=)", "cat", RegexOptions.None }; + yield return new object[] { @"(?<=)", "cat", RegexOptions.None }; + yield return new object[] { @"(?>)", "cat", RegexOptions.None }; + yield return new object[] { @"(?()|)", "(?()|)", RegexOptions.None }; + yield return new object[] { @"(?(cat)|)", "cat", RegexOptions.None }; + yield return new object[] { @"(?(cat)|)", "dog", RegexOptions.None }; + yield return new object[] { @"(?(cat)catdog|)", "catdog", RegexOptions.None }; + yield return new object[] { @"(?(cat)catdog|)", "dog", RegexOptions.None }; + yield return new object[] { @"(?(cat)dog|)", "dog", RegexOptions.None }; + yield return new object[] { @"(?(cat)dog|)", "cat", RegexOptions.None }; + yield return new object[] { @"(?(cat)|catdog)", "cat", RegexOptions.None }; + yield return new object[] { @"(?(cat)|catdog)", "catdog", RegexOptions.None }; + yield return new object[] { @"(?(cat)|dog)", "dog", RegexOptions.None }; + yield return new object[] { "([\u0000-\uFFFF-[azAZ09]]|[\u0000-\uFFFF-[^azAZ09]])+", "azAZBCDE1234567890BCDEFAZza", RegexOptions.None }; + yield return new object[] { "[\u0000-\uFFFF-[\u0000-\uFFFF-[\u0000-\uFFFF-[\u0000-\uFFFF-[\u0000-\uFFFF-[a]]]]]]+", "abcxyzABCXYZ123890", RegexOptions.None }; + yield return new object[] { "[\u0000-\uFFFF-[\u0000-\uFFFF-[\u0000-\uFFFF-[\u0000-\uFFFF-[\u0000-\uFFFF-[\u0000-\uFFFF-[a]]]]]]]+", "bcxyzABCXYZ123890a", RegexOptions.None }; + yield return new object[] { "[\u0000-\uFFFF-[\\p{P}\\p{S}\\p{C}]]+", "!@`';.,$+<>=\x0001\x001FazAZ09", RegexOptions.None }; + yield return new object[] { @"[\uFFFD-\uFFFF]+", "\uFFFC\uFFFD\uFFFE\uFFFF", RegexOptions.IgnoreCase }; + yield return new object[] { @"[\uFFFC-\uFFFE]+", "\uFFFB\uFFFC\uFFFD\uFFFE\uFFFF", RegexOptions.IgnoreCase }; + yield return new object[] { @"([a*]*)+?$", "ab", RegexOptions.None }; + yield return new object[] { @"(a*)+?$", "b", RegexOptions.None }; + } + } +} diff --git a/external/corefx/src/System.Text.RegularExpressions/tests/Performance/Perf.RegexRedux.cs b/external/corefx/src/System.Text.RegularExpressions/tests/Performance/Perf.RegexRedux.cs new file mode 100644 index 0000000000..de980c885c --- /dev/null +++ b/external/corefx/src/System.Text.RegularExpressions/tests/Performance/Perf.RegexRedux.cs @@ -0,0 +1,70 @@ +// 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; +using System.IO; +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using System.Diagnostics; +using System.Threading; +using System.Collections.Generic; +using Xunit; +using Microsoft.Xunit.Performance; + +namespace System.Text.RegularExpressions.Tests +{ + public class RegexRedux + { + static readonly string input = File.ReadAllText(Path.Combine("regexredux", "200_000.in")); + + static Regex regex(string re, RegexOptions options) + { + return new Regex(re, options); + } + + static string regexCount(string s, string r, RegexOptions options) + { + int c = 0; + var m = regex(r, options).Match(s); + while (m.Success) { c++; m = m.NextMatch(); } + return r + " " + c; + } + + [Benchmark] + [InlineData(RegexOptions.None)] + [InlineData(RegexOptions.Compiled)] + public void RegexReduxMini(RegexOptions options) + { + foreach (var iteration in Benchmark.Iterations) + using (iteration.StartMeasurement()) + { + string sequences = input; + var initialLength = sequences.Length; + sequences = Regex.Replace(sequences, ">.*\n|\n", ""); + + var magicTask = Task.Run(() => + { + var newseq = regex("tHa[Nt]", options).Replace(sequences, "<4>"); + newseq = regex("aND|caN|Ha[DS]|WaS", options).Replace(newseq, "<3>"); + newseq = regex("a[NSt]|BY", options).Replace(newseq, "<2>"); + newseq = regex("<[^>]*>", options).Replace(newseq, "|"); + newseq = regex("\\|[^|][^|]*\\|", options).Replace(newseq, "-"); + return newseq.Length; + }); + + var variant2 = Task.Run(() => regexCount(sequences, "[cgt]gggtaaa|tttaccc[acg]", options)); + var variant3 = Task.Run(() => regexCount(sequences, "a[act]ggtaaa|tttacc[agt]t", options)); + var variant7 = Task.Run(() => regexCount(sequences, "agggt[cgt]aa|tt[acg]accct", options)); + var variant6 = Task.Run(() => regexCount(sequences, "aggg[acg]aaa|ttt[cgt]ccct", options)); + var variant4 = Task.Run(() => regexCount(sequences, "ag[act]gtaaa|tttac[agt]ct", options)); + var variant5 = Task.Run(() => regexCount(sequences, "agg[act]taaa|ttta[agt]cct", options)); + var variant1 = Task.Run(() => regexCount(sequences, "agggtaaa|tttaccct", options)); + var variant9 = Task.Run(() => regexCount(sequences, "agggtaa[cgt]|[acg]ttaccct", options)); + var variant8 = Task.Run(() => regexCount(sequences, "agggta[cgt]a|t[acg]taccct", options)); + + Task.WaitAll(magicTask, variant1, variant2, variant3, variant4, variant5, variant6, variant7, variant8, variant9); + } + } + } +} diff --git a/external/corefx/src/System.Text.RegularExpressions/tests/Performance/System.Text.RegularExpressions.Performance.Tests.csproj b/external/corefx/src/System.Text.RegularExpressions/tests/Performance/System.Text.RegularExpressions.Performance.Tests.csproj new file mode 100644 index 0000000000..be6f5e04ec --- /dev/null +++ b/external/corefx/src/System.Text.RegularExpressions/tests/Performance/System.Text.RegularExpressions.Performance.Tests.csproj @@ -0,0 +1,31 @@ + + + + + true + {7F4B8C48-8692-4885-BF84-FEB7EA82E34B} + + + + + + + + + + Common\System\PerfUtils.cs + + + + + %(RecursiveDir)%(Filename)%(Extension) + + + + + {69e46a6f-9966-45a5-8945-2559fe337827} + PerfRunner + + + + \ No newline at end of file diff --git a/external/corefx/src/System.Text.RegularExpressions/tests/Performance/THIRD-PARTY-NOTICES b/external/corefx/src/System.Text.RegularExpressions/tests/Performance/THIRD-PARTY-NOTICES new file mode 100644 index 0000000000..51b5799e35 --- /dev/null +++ b/external/corefx/src/System.Text.RegularExpressions/tests/Performance/THIRD-PARTY-NOTICES @@ -0,0 +1,31 @@ +.NET Core uses third-party libraries or other resources that may be +distributed under licenses different than the .NET Core software. + +In the event that we accidentally failed to list a required notice, please +bring it to our attention. Post an issue or email us: + + dotnet@microsoft.com + +The attached notices are provided for information only. + +=============== + +The Computer Language +Benchmarks Game +Revised BSD license +This is a specific instance of the Open Source Initiative (OSI) BSD license template. + +Copyright (c) 2004-2008 Brent Fulgham, 2005-2018 Isaac Gouy + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +Neither the name of "The Computer Language Benchmarks Game" nor the name of "The Computer Language Shootout Benchmarks" nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/external/corefx/src/System.Text.RegularExpressions/tests/Regex.Cache.Tests.cs b/external/corefx/src/System.Text.RegularExpressions/tests/Regex.Cache.Tests.cs new file mode 100644 index 0000000000..17694afcc5 --- /dev/null +++ b/external/corefx/src/System.Text.RegularExpressions/tests/Regex.Cache.Tests.cs @@ -0,0 +1,156 @@ +using System.Collections.Generic; +using System.Diagnostics; +using System.Globalization; +using System.Reflection; +using Xunit; + +namespace System.Text.RegularExpressions.Tests +{ + public class RegexCacheTests : RemoteExecutorTestBase + { + [Theory] + [InlineData(0)] + [InlineData(12)] + public void CacheSize_Set(int newCacheSize) + { + int originalCacheSize = Regex.CacheSize; + + try + { + Regex.CacheSize = newCacheSize; + Assert.Equal(newCacheSize, Regex.CacheSize); + } + finally + { + Regex.CacheSize = originalCacheSize; + } + } + + [Fact] + public void CacheSize_Set_NegativeValue_ThrowsArgumentOutOfRangeException() + { + AssertExtensions.Throws("value", () => Regex.CacheSize = -1); + } + + [Fact] + public void Ctor_Cache_Second_drops_first() + { + RemoteInvoke(() => + { + Regex.CacheSize = 1; + Assert.True(Regex.IsMatch("1", "1")); + Assert.True(Regex.IsMatch("2", "2")); // previous removed from cache + Assert.True(GetCachedItemsNum() == 1); + return SuccessExitCode; + }).Dispose(); + } + + [Fact] + public void Ctor_Cache_Shrink_cache() + { + RemoteInvoke(() => + { + Regex.CacheSize = 2; + Assert.True(Regex.IsMatch("1", "1")); + Assert.True(Regex.IsMatch("2", "2")); + Assert.True(GetCachedItemsNum() == 2); + Regex.CacheSize = 1; + Assert.True(GetCachedItemsNum() == 1); + Regex.CacheSize = 0; // clear + Assert.True(GetCachedItemsNum() == 0); + return SuccessExitCode; + }).Dispose(); + } + + [Fact] + public void Ctor_Cache_Promote_entries() + { + RemoteInvoke(() => + { + Regex.CacheSize = 3; + Assert.True(Regex.IsMatch("1", "1")); + Assert.True(Regex.IsMatch("2", "2")); + Assert.True(Regex.IsMatch("3", "3")); + Assert.True(GetCachedItemsNum() == 3); + Assert.True(Regex.IsMatch("1", "1")); // should be put first + Assert.True(GetCachedItemsNum() == 3); + Regex.CacheSize = 1; // only 1 stays + Assert.True(GetCachedItemsNum() == 1); + return SuccessExitCode; + }).Dispose(); + } + + [Fact] + public void Ctor_Cache_Uses_culture_and_options() + { + RemoteInvoke(() => + { + Regex.CacheSize = 0; + Regex.CacheSize = 3; + Assert.True(Regex.IsMatch("1", "1", RegexOptions.IgnoreCase)); + Assert.True(Regex.IsMatch("1", "1", RegexOptions.Multiline)); + Assert.True(GetCachedItemsNum() == 2); + CultureInfo.CurrentCulture = CultureInfo.GetCultureInfo("de-DE"); + Assert.True(Regex.IsMatch("1", "1", RegexOptions.Multiline)); + Assert.True(GetCachedItemsNum() == 3); + return SuccessExitCode; + }).Dispose(); + } + + [Fact] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] // different cache structure + public void Ctor_Cache_Uses_dictionary_linked_list_switch_does_not_throw() + { + // assume the limit is less than the cache size so we cross it two times: + RemoteInvoke(() => + { + int original = Regex.CacheSize; + Regex.CacheSize = 0; + Fill(original); + const int limit = 10; + Regex.CacheSize = limit - 1; + Regex.CacheSize = 0; + Fill(original); + Remove(original); + + void Fill(int n) + { + for (int i = 0; i < n; i++) + { + Regex.CacheSize++; + Assert.True(Regex.IsMatch(i.ToString(), i.ToString())); + Assert.True(GetCachedItemsNum() == i + 1); + } + } + void Remove(int n) + { + for (int i = 0; i < original; i++) + { + Regex.CacheSize--; + Assert.True(GetCachedItemsNum() == Regex.CacheSize); + } + } + return SuccessExitCode; + }).Dispose(); + } + + private int GetCachedItemsNum() + { + // On .NET Framework we have a different cache structure. + if (PlatformDetection.IsFullFramework) + { + object linkedList = typeof(Regex) + .GetField("livecode", BindingFlags.NonPublic | BindingFlags.Static) + .GetValue(null); + return (int)linkedList.GetType() + .GetProperty("Count", BindingFlags.Public | BindingFlags.Instance) + .GetValue(linkedList); + } + + string cacheFieldName = PlatformDetection.IsFullFramework ? "cacheSize" : "s_cacheCount"; + return (int)typeof(Regex) + .GetField(cacheFieldName, BindingFlags.NonPublic | BindingFlags.Static) + .GetValue(null); + } + } +} diff --git a/external/corefx/src/System.Text.RegularExpressions/tests/Regex.Ctor.Tests.cs b/external/corefx/src/System.Text.RegularExpressions/tests/Regex.Ctor.Tests.cs index fc63daef93..615c9753ca 100644 --- a/external/corefx/src/System.Text.RegularExpressions/tests/Regex.Ctor.Tests.cs +++ b/external/corefx/src/System.Text.RegularExpressions/tests/Regex.Ctor.Tests.cs @@ -85,7 +85,7 @@ namespace System.Text.RegularExpressions.Tests Assert.Throws(() => Regex.InfiniteMatchTimeout); return SuccessExitCode; - }); + }).Dispose(); } [Fact] @@ -97,32 +97,7 @@ namespace System.Text.RegularExpressions.Tests Assert.Throws(() => Regex.InfiniteMatchTimeout); return SuccessExitCode; - }); - } - - [Fact] - public void CacheSize_Get() - { - Assert.Equal(15, Regex.CacheSize); - } - - [Theory] - [InlineData(0)] - [InlineData(12)] - public void CacheSize_Set(int newCacheSize) - { - int originalCacheSize = Regex.CacheSize; - - Regex.CacheSize = newCacheSize; - Assert.Equal(newCacheSize, Regex.CacheSize); - - Regex.CacheSize = originalCacheSize; - } - - [Fact] - public void CacheSize_Set_NegativeValue_ThrowsArgumentOutOfRangeException() - { - AssertExtensions.Throws("value", () => Regex.CacheSize = -1); + }).Dispose(); } [Theory] @@ -235,8 +210,10 @@ namespace System.Text.RegularExpressions.Tests [InlineData("(?<=", RegexOptions.None)] [InlineData("(?", RegexOptions.None)] + [InlineData("(?>-", RegexOptions.None)] [InlineData("(?)", RegexOptions.None)] [InlineData("(?<)", RegexOptions.None)] + [InlineData("(?<", RegexOptions.None)] [InlineData("(?')", RegexOptions.None)] [InlineData(@"\1", RegexOptions.None)] [InlineData(@"\1", RegexOptions.None)] @@ -282,6 +259,14 @@ namespace System.Text.RegularExpressions.Tests AssertExtensions.Throws(null, () => new Regex(pattern, options)); } + [Theory] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Full framework throws InvalidOperationException")] + [InlineData("(?<-", RegexOptions.None)] + public void Ctor_InvalidPattern_NotNetFramework(string pattern, RegexOptions options) + { + AssertExtensions.Throws(null, () => new Regex(pattern, options)); + } + [Theory] // Testgroup with options [InlineData("(?(?i))", RegexOptions.None, typeof(NullReferenceException))] diff --git a/external/corefx/src/System.Text.RegularExpressions/tests/Regex.Groups.Tests.cs b/external/corefx/src/System.Text.RegularExpressions/tests/Regex.Groups.Tests.cs index c28be6399f..c1ade0a8c3 100644 --- a/external/corefx/src/System.Text.RegularExpressions/tests/Regex.Groups.Tests.cs +++ b/external/corefx/src/System.Text.RegularExpressions/tests/Regex.Groups.Tests.cs @@ -322,6 +322,7 @@ namespace System.Text.RegularExpressions.Tests yield return new object[] { @"(cat) (?#cat) \s+ (?#followed by 1 or more whitespace) (dog) (?#followed by dog)", "cat dog", RegexOptions.IgnorePatternWhitespace, new string[] { "cat dog", "cat", "dog" } }; // Back Reference + yield return new object[] { @"(?cat)(?dog)\k", "asdfcatdogcatdog", RegexOptions.None, new string[] { "catdogcat", "cat", "dog" } }; yield return new object[] { @"(?cat)\s+(?dog)\k", "asdfcat dogcat dog", RegexOptions.None, new string[] { "cat dogcat", "cat", "dog" } }; yield return new object[] { @"(?cat)\s+(?dog)\k'cat'", "asdfcat dogcat dog", RegexOptions.None, new string[] { "cat dogcat", "cat", "dog" } }; yield return new object[] { @"(?cat)\s+(?dog)\", "asdfcat dogcat dog", RegexOptions.None, new string[] { "cat dogcat", "cat", "dog" } }; @@ -394,6 +395,12 @@ namespace System.Text.RegularExpressions.Tests yield return new object[] { @"(cat)(\cZ*)(dog)", "asdlkcat\u001adogiwod", RegexOptions.None, new string[] { "cat\u001adog", "cat", "\u001a", "dog" } }; yield return new object[] { @"(cat)(\cz*)(dog)", "asdlkcat\u001adogiwod", RegexOptions.None, new string[] { "cat\u001adog", "cat", "\u001a", "dog" } }; + if (!PlatformDetection.IsFullFramework) // missing fix for #26501 + { + yield return new object[] { @"(cat)(\c[*)(dog)", "asdlkcat\u001bdogiwod", RegexOptions.None, new string[] { "cat\u001bdog", "cat", "\u001b", "dog" } }; + yield return new object[] { @"(cat)(\c[*)(dog)", "asdlkcat\u001Bdogiwod", RegexOptions.None, new string[] { "cat\u001Bdog", "cat", "\u001B", "dog" } }; + } + // Atomic Zero-Width Assertions \A \Z \z \G \b \B //\A yield return new object[] { @"\A(cat)\s+(dog)", "cat \n\n\n dog", RegexOptions.None, new string[] { "cat \n\n\n dog", "cat", "dog" } }; diff --git a/external/corefx/src/System.Text.RegularExpressions/tests/Regex.Match.Tests.cs b/external/corefx/src/System.Text.RegularExpressions/tests/Regex.Match.Tests.cs index 672f29ce88..0d15939704 100644 --- a/external/corefx/src/System.Text.RegularExpressions/tests/Regex.Match.Tests.cs +++ b/external/corefx/src/System.Text.RegularExpressions/tests/Regex.Match.Tests.cs @@ -14,6 +14,8 @@ namespace System.Text.RegularExpressions.Tests { public static IEnumerable Match_Basic_TestData() { + // pattern, input, options, beginning, length, expectedSuccess, expectedValue + // Testing octal sequence matches: "\\060(\\061)?\\061" // Octal \061 is ASCII 49 ('1') yield return new object[] { @"\060(\061)?\061", "011", RegexOptions.None, 0, 3, true, "011" }; @@ -28,6 +30,28 @@ namespace System.Text.RegularExpressions.Tests // Using *, +, ?, {}: Actual - "a+\\.?b*\\.?c{2}" yield return new object[] { @"a+\.?b*\.+c{2}", "ab.cc", RegexOptions.None, 0, 5, true, "ab.cc" }; + // Using long loop prefix + yield return new object[] { @"a{10}", new string('a', 10), RegexOptions.None, 0, 10, true, new string('a', 10) }; + yield return new object[] { @"a{100}", new string('a', 100), RegexOptions.None, 0, 100, true, new string('a', 100) }; + + yield return new object[] { @"a{10}b", new string('a', 10) + "bc", RegexOptions.None, 0, 12, true, new string('a', 10) + "b" }; + yield return new object[] { @"a{100}b", new string('a', 100) + "bc", RegexOptions.None, 0, 102, true, new string('a', 100) + "b" }; + + yield return new object[] { @"a{11}b", new string('a', 10) + "bc", RegexOptions.None, 0, 12, false, string.Empty }; + yield return new object[] { @"a{101}b", new string('a', 100) + "bc", RegexOptions.None, 0, 102, false, string.Empty }; + + yield return new object[] { @"a{1,3}b", "bc", RegexOptions.None, 0, 2, false, string.Empty }; + yield return new object[] { @"a{1,3}b", "abc", RegexOptions.None, 0, 3, true, "ab" }; + yield return new object[] { @"a{1,3}b", "aaabc", RegexOptions.None, 0, 5, true, "aaab" }; + yield return new object[] { @"a{1,3}b", "aaaabc", RegexOptions.None, 0, 6, true, "aaab" }; + + yield return new object[] { @"a{2,}b", "abc", RegexOptions.None, 0, 3, false, string.Empty }; + yield return new object[] { @"a{2,}b", "aabc", RegexOptions.None, 0, 4, true, "aab" }; + + // {,n} is treated as a literal rather than {0,n} as it should be + yield return new object[] { @"a{,3}b", "a{,3}bc", RegexOptions.None, 0, 6, true, "a{,3}b" }; + yield return new object[] { @"a{,3}b", "aaabc", RegexOptions.None, 0, 5, false, String.Empty }; + // Using [a-z], \s, \w: Actual - "([a-zA-Z]+)\\s(\\w+)" yield return new object[] { @"([a-zA-Z]+)\s(\w+)", "David Bau", RegexOptions.None, 0, 9, true, "David Bau" }; @@ -263,6 +287,10 @@ namespace System.Text.RegularExpressions.Tests yield return new object[] { @"[ab\-\[cd-[[]]]]", "e]]", RegexOptions.None, 0, 3, false, string.Empty }; yield return new object[] { @"[a-[a-f]]", "abcdefghijklmnopqrstuvwxyz", RegexOptions.None, 0, 26, false, string.Empty }; + + // \c + if (!PlatformDetection.IsFullFramework) // missing fix for #26501 + yield return new object[] { @"(cat)(\c[*)(dog)", "asdlkcat\u00FFdogiwod", RegexOptions.None, 0, 15, false, string.Empty }; } [Theory] @@ -342,7 +370,7 @@ namespace System.Text.RegularExpressions.Tests Assert.Throws(() => new Regex(Pattern).Match(input)); return SuccessExitCode; - }); + }).Dispose(); } public static IEnumerable Match_Advanced_TestData() @@ -735,6 +763,20 @@ namespace System.Text.RegularExpressions.Tests }).Dispose(); } + [Fact] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Full framework needs fix for #26484")] + public void Match_ExcessPrefix() + { + RemoteInvoke(() => + { + // Should not throw out of memory + Assert.False(Regex.IsMatch("a", @"a{2147483647,}")); + Assert.False(Regex.IsMatch("a", @"a{1000001,}")); // 1 over the cutoff for Boyer-Moore prefix + + Assert.False(Regex.IsMatch("a", @"a{50000}")); // creates string for Boyer-Moore but not so large that tests fail and start paging + }).Dispose(); + } + [Fact] public void Match_Invalid() { diff --git a/external/corefx/src/System.Text.RegularExpressions/tests/RegexCompilationHelper.cs b/external/corefx/src/System.Text.RegularExpressions/tests/RegexCompilationHelper.cs index 5a20e154f2..418d3651fb 100644 --- a/external/corefx/src/System.Text.RegularExpressions/tests/RegexCompilationHelper.cs +++ b/external/corefx/src/System.Text.RegularExpressions/tests/RegexCompilationHelper.cs @@ -33,7 +33,7 @@ namespace System.Text.RegularExpressions.Tests return result; } } - + throw new Exception($"Test method '{testDataMethodName}' not found"); } diff --git a/external/corefx/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj b/external/corefx/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj index aca9ba82ba..6ec879d5ba 100644 --- a/external/corefx/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj +++ b/external/corefx/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj @@ -5,6 +5,12 @@ {94B106C2-D574-4392-80AB-3EE308A078DF} Properties + + + @@ -15,6 +21,7 @@ + @@ -44,4 +51,4 @@ - + \ No newline at end of file diff --git a/external/corefx/src/System.Threading.Channels/System.Threading.Channels.sln b/external/corefx/src/System.Threading.Channels/System.Threading.Channels.sln index 0baa0b1633..d2a964cd63 100644 --- a/external/corefx/src/System.Threading.Channels/System.Threading.Channels.sln +++ b/external/corefx/src/System.Threading.Channels/System.Threading.Channels.sln @@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Channels.Tests", "tests\System.Threading.Channels.Tests.csproj", "{9E984EB2-827E-4029-9647-FB5F8B67C553}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Channels.Tests", "tests\System.Threading.Channels.Tests.csproj", "{1AF01469-DBFC-4BA1-9331-8E39AA639FEE}" ProjectSection(ProjectDependencies) = postProject - {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977} = {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977} + {AAADA5D3-CF64-4E9D-943C-EFDC006D6366} = {AAADA5D3-CF64-4E9D-943C-EFDC006D6366} EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Channels.Performance.Tests", "tests\Performance\System.Threading.Channels.Performance.Tests.csproj", "{11ABE2F8-4FB9-48AC-91AA-D04503059550}" ProjectSection(ProjectDependencies) = postProject - {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977} = {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977} + {AAADA5D3-CF64-4E9D-943C-EFDC006D6366} = {AAADA5D3-CF64-4E9D-943C-EFDC006D6366} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Channels", "src\System.Threading.Channels.csproj", "{1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Channels", "src\System.Threading.Channels.csproj", "{AAADA5D3-CF64-4E9D-943C-EFDC006D6366}" ProjectSection(ProjectDependencies) = postProject - {9C524CA0-92FF-437B-B568-BCE8A794A69A} = {9C524CA0-92FF-437B-B568-BCE8A794A69A} + {97DB4782-7AB3-4F4C-B716-CF722A0E6066} = {97DB4782-7AB3-4F4C-B716-CF722A0E6066} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Channels", "ref\System.Threading.Channels.csproj", "{9C524CA0-92FF-437B-B568-BCE8A794A69A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Channels", "ref\System.Threading.Channels.csproj", "{97DB4782-7AB3-4F4C-B716-CF722A0E6066}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}" EndProject @@ -31,30 +31,30 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9E984EB2-827E-4029-9647-FB5F8B67C553}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {9E984EB2-827E-4029-9647-FB5F8B67C553}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {9E984EB2-827E-4029-9647-FB5F8B67C553}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {9E984EB2-827E-4029-9647-FB5F8B67C553}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU + {1AF01469-DBFC-4BA1-9331-8E39AA639FEE}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {1AF01469-DBFC-4BA1-9331-8E39AA639FEE}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {1AF01469-DBFC-4BA1-9331-8E39AA639FEE}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {1AF01469-DBFC-4BA1-9331-8E39AA639FEE}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU {11ABE2F8-4FB9-48AC-91AA-D04503059550}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {11ABE2F8-4FB9-48AC-91AA-D04503059550}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {11ABE2F8-4FB9-48AC-91AA-D04503059550}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU {11ABE2F8-4FB9-48AC-91AA-D04503059550}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU - {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU - {9C524CA0-92FF-437B-B568-BCE8A794A69A}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {9C524CA0-92FF-437B-B568-BCE8A794A69A}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {9C524CA0-92FF-437B-B568-BCE8A794A69A}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {9C524CA0-92FF-437B-B568-BCE8A794A69A}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU + {AAADA5D3-CF64-4E9D-943C-EFDC006D6366}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {AAADA5D3-CF64-4E9D-943C-EFDC006D6366}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {AAADA5D3-CF64-4E9D-943C-EFDC006D6366}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {AAADA5D3-CF64-4E9D-943C-EFDC006D6366}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU + {97DB4782-7AB3-4F4C-B716-CF722A0E6066}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {97DB4782-7AB3-4F4C-B716-CF722A0E6066}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {97DB4782-7AB3-4F4C-B716-CF722A0E6066}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {97DB4782-7AB3-4F4C-B716-CF722A0E6066}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {9E984EB2-827E-4029-9647-FB5F8B67C553} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} + {1AF01469-DBFC-4BA1-9331-8E39AA639FEE} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} {11ABE2F8-4FB9-48AC-91AA-D04503059550} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} - {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD} - {9C524CA0-92FF-437B-B568-BCE8A794A69A} = {2E666815-2EDB-464B-9DF6-380BF4789AD4} + {AAADA5D3-CF64-4E9D-943C-EFDC006D6366} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD} + {97DB4782-7AB3-4F4C-B716-CF722A0E6066} = {2E666815-2EDB-464B-9DF6-380BF4789AD4} EndGlobalSection EndGlobal diff --git a/external/corefx/src/System.Threading.Channels/ref/System.Threading.Channels.cs b/external/corefx/src/System.Threading.Channels/ref/System.Threading.Channels.cs index 7ac0268176..d484aab487 100644 --- a/external/corefx/src/System.Threading.Channels/ref/System.Threading.Channels.cs +++ b/external/corefx/src/System.Threading.Channels/ref/System.Threading.Channels.cs @@ -26,8 +26,6 @@ namespace System.Threading.Channels public static System.Threading.Channels.Channel CreateBounded(System.Threading.Channels.BoundedChannelOptions options) { throw null; } public static System.Threading.Channels.Channel CreateUnbounded() { throw null; } public static System.Threading.Channels.Channel CreateUnbounded(System.Threading.Channels.UnboundedChannelOptions options) { throw null; } - public static System.Threading.Channels.Channel CreateUnbuffered() { throw null; } - public static System.Threading.Channels.Channel CreateUnbuffered(System.Threading.Channels.UnbufferedChannelOptions options) { throw null; } } public partial class ChannelClosedException : System.InvalidOperationException { @@ -49,7 +47,7 @@ namespace System.Threading.Channels public virtual System.Threading.Tasks.Task Completion { get { throw null; } } public virtual System.Threading.Tasks.ValueTask ReadAsync(CancellationToken cancellationToken = default) { throw null; } public abstract bool TryRead(out T item); - public abstract System.Threading.Tasks.Task WaitToReadAsync(System.Threading.CancellationToken cancellationToken=default); + public abstract System.Threading.Tasks.ValueTask WaitToReadAsync(System.Threading.CancellationToken cancellationToken=default); } public abstract partial class ChannelWriter { @@ -57,8 +55,8 @@ namespace System.Threading.Channels public void Complete(System.Exception error=null) { } public virtual bool TryComplete(System.Exception error=null) { throw null; } public abstract bool TryWrite(T item); - public abstract System.Threading.Tasks.Task WaitToWriteAsync(System.Threading.CancellationToken cancellationToken=default); - public virtual System.Threading.Tasks.Task WriteAsync(T item, System.Threading.CancellationToken cancellationToken=default) { throw null; } + public abstract System.Threading.Tasks.ValueTask WaitToWriteAsync(System.Threading.CancellationToken cancellationToken=default); + public virtual System.Threading.Tasks.ValueTask WriteAsync(T item, System.Threading.CancellationToken cancellationToken=default) { throw null; } } public abstract partial class Channel : System.Threading.Channels.Channel { @@ -76,8 +74,4 @@ namespace System.Threading.Channels { public UnboundedChannelOptions() { } } - public sealed partial class UnbufferedChannelOptions : System.Threading.Channels.ChannelOptions - { - public UnbufferedChannelOptions() { } - } } diff --git a/external/corefx/src/System.Threading.Channels/ref/System.Threading.Channels.csproj b/external/corefx/src/System.Threading.Channels/ref/System.Threading.Channels.csproj index 6f9782d4ff..492262d3e8 100644 --- a/external/corefx/src/System.Threading.Channels/ref/System.Threading.Channels.csproj +++ b/external/corefx/src/System.Threading.Channels/ref/System.Threading.Channels.csproj @@ -2,10 +2,12 @@ - {9C524CA0-92FF-437B-B568-BCE8A794A69A} + {97DB4782-7AB3-4F4C-B716-CF722A0E6066} + + @@ -20,4 +22,4 @@ - + \ No newline at end of file diff --git a/external/corefx/src/System.Threading.Channels/src/Configurations.props b/external/corefx/src/System.Threading.Channels/src/Configurations.props index 5f3b2623ed..7eb3ac6025 100644 --- a/external/corefx/src/System.Threading.Channels/src/Configurations.props +++ b/external/corefx/src/System.Threading.Channels/src/Configurations.props @@ -4,6 +4,7 @@ netstandard1.3; netstandard; + netcoreapp; diff --git a/external/corefx/src/System.Threading.Channels/src/Resources/Strings.resx b/external/corefx/src/System.Threading.Channels/src/Resources/Strings.resx index 2beea8a357..01229ace1d 100644 --- a/external/corefx/src/System.Threading.Channels/src/Resources/Strings.resx +++ b/external/corefx/src/System.Threading.Channels/src/Resources/Strings.resx @@ -120,4 +120,13 @@ The channel has been closed. - \ No newline at end of file + + The asynchronous operation has not completed. + + + Another continuation was already registered. + + + The result of the operation was already consumed and may not be used again. + + diff --git a/external/corefx/src/System.Threading.Channels/src/System.Threading.Channels.csproj b/external/corefx/src/System.Threading.Channels/src/System.Threading.Channels.csproj index 9dc268ec36..072d3a5b67 100644 --- a/external/corefx/src/System.Threading.Channels/src/System.Threading.Channels.csproj +++ b/external/corefx/src/System.Threading.Channels/src/System.Threading.Channels.csproj @@ -2,12 +2,16 @@ - {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977} + {AAADA5D3-CF64-4E9D-943C-EFDC006D6366} System.Threading.Channels $(OutputPath)$(MSBuildProjectName).xml + + + + @@ -22,10 +26,9 @@ - + - Common\System\Collections\Concurrent\SingleProducerConsumerQueue.cs diff --git a/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/AsyncOperation.cs b/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/AsyncOperation.cs new file mode 100644 index 0000000000..257ccf6b37 --- /dev/null +++ b/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/AsyncOperation.cs @@ -0,0 +1,449 @@ +// 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.ExceptionServices; +using System.Threading.Tasks; +using System.Threading.Tasks.Sources; + +namespace System.Threading.Channels +{ + internal abstract class AsyncOperation + { + /// Sentinel object used in a field to indicate the operation is available for use. + protected static readonly Action s_availableSentinel = new Action(s => Debug.Fail($"{nameof(AsyncOperation)}.{nameof(s_availableSentinel)} invoked with {s}.")); + /// Sentinel object used in a field to indicate the operation has completed. + protected static readonly Action s_completedSentinel = new Action(s => Debug.Fail($"{nameof(AsyncOperation)}.{nameof(s_completedSentinel)} invoked with {s}")); + + /// Throws an exception indicating that the operation's result was accessed before the operation completed. + protected static void ThrowIncompleteOperationException() => + throw new InvalidOperationException(SR.InvalidOperation_IncompleteAsyncOperation); + + /// Throws an exception indicating that multiple continuations can't be set for the same operation. + protected static void ThrowMultipleContinuations() => + throw new InvalidOperationException(SR.InvalidOperation_MultipleContinuations); + + /// Throws an exception indicating that the operation was used after it was supposed to be used. + protected static void ThrowIncorrectCurrentIdException() => + throw new InvalidOperationException(SR.InvalidOperation_IncorrectToken); + } + + /// The representation of an asynchronous operation that has a result value. + /// Specifies the type of the result. May be . + internal class AsyncOperation : AsyncOperation, IValueTaskSource, IValueTaskSource + { + /// Registration with a provided cancellation token. + private readonly CancellationTokenRegistration _registration; + /// true if this object is pooled and reused; otherwise, false. + /// + /// If the operation is cancelable, then it can't be pooled. And if it's poolable, there must never be race conditions to complete it, + /// which is the main reason poolable objects can't be cancelable, as then cancellation could fire, the object could get reused, + /// and then we may end up trying to complete an object that's used by someone else. + /// + private readonly bool _pooled; + /// Whether continuations should be forced to run asynchronously. + private readonly bool _runContinuationsAsynchronously; + + /// Only relevant to cancelable operations; 0 if the operation hasn't had completion reserved, 1 if it has. + private volatile int _completionReserved = 0; + /// The result of the operation. + private TResult _result; + /// Any error that occurred during the operation. + private ExceptionDispatchInfo _error; + /// The continuation callback. + /// + /// This may be the completion sentinel if the operation has already completed. + /// This may be the available sentinel if the operation is being pooled and is available for use. + /// This may be null if the operation is pending. + /// This may be another callback if the operation has had a callback hooked up with OnCompleted. + /// + private Action _continuation; + /// State object to be passed to . + private object _continuationState; + /// Scheduling context (a or ) to which to queue the continuation. May be null. + private object _schedulingContext; + /// Execution context to use when invoking . May be null. + private ExecutionContext _executionContext; + /// The token value associated with the current operation. + /// + /// IValueTaskSource operations on this instance are only valid if the provided token matches this value, + /// which is incremented once GetResult is called to avoid multiple awaits on the same instance. + /// + private short _currentId; + + /// Initializes the interactor. + /// true if continuations should be forced to run asynchronously; otherwise, false. + /// The cancellation token used to cancel the operation. + /// Whether this instance is pooled and reused. + public AsyncOperation(bool runContinuationsAsynchronously, CancellationToken cancellationToken = default, bool pooled = false) + { + _continuation = pooled ? s_availableSentinel : null; + _pooled = pooled; + _runContinuationsAsynchronously = runContinuationsAsynchronously; + if (cancellationToken.CanBeCanceled) + { + Debug.Assert(!_pooled, "Cancelable operations can't be pooled"); + CancellationToken = cancellationToken; + _registration = cancellationToken.Register(s => + { + var thisRef = (AsyncOperation)s; + thisRef.TrySetCanceled(thisRef.CancellationToken); + }, this); + } + } + + /// Gets or sets the next operation in the linked list of operations. + public AsyncOperation Next { get; set; } + /// Gets the cancellation token associated with this operation. + public CancellationToken CancellationToken { get; } + /// Gets a backed by this instance and its current token. + public ValueTask ValueTask => new ValueTask(this, _currentId); + /// Gets a backed by this instance and its current token. + public ValueTask ValueTaskOfT => new ValueTask(this, _currentId); + + /// Gets the current status of the operation. + /// The token that must match . + public ValueTaskSourceStatus GetStatus(short token) + { + if (_currentId == token) + { + return + !IsCompleted ? ValueTaskSourceStatus.Pending : + _error == null ? ValueTaskSourceStatus.Succeeded : + _error.SourceException is OperationCanceledException ? ValueTaskSourceStatus.Canceled : + ValueTaskSourceStatus.Faulted; + } + + ThrowIncorrectCurrentIdException(); + return default; // just to satisfy compiler + } + + /// Gets whether the operation has completed. + /// + /// The operation is considered completed if both a) it's in the completed state, + /// AND b) it has a non-null continuation. We need to consider both because they're + /// not set atomically. If we only considered the state, then if we set the state to + /// completed and then set the continuation, it's possible for an awaiter to check + /// IsCompleted, see true, call GetResult, and return the object to the pool, and only + /// then do we try to store the continuation into an object we no longer own. If we + /// only considered the state, then if we set the continuation and then set the state, + /// a racing awaiter could see the continuation set before the state has transitioned + /// to completed and could end up calling GetResult in an incomplete state. And if we + /// only considered the continuation, then we have issues if OnCompleted is used before + /// the operation completes, as the continuation will be + /// + internal bool IsCompleted => ReferenceEquals(_continuation, s_completedSentinel); + + /// Gets the result of the operation. + /// The token that must match . + public TResult GetResult(short token) + { + if (_currentId != token) + { + ThrowIncorrectCurrentIdException(); + } + + if (!IsCompleted) + { + ThrowIncompleteOperationException(); + } + + ExceptionDispatchInfo error = _error; + TResult result = _result; + _currentId++; + + if (_pooled) + { + Volatile.Write(ref _continuation, s_availableSentinel); // only after fetching all needed data + } + + error?.Throw(); + return result; + } + + /// Gets the result of the operation. + /// The token that must match . + void IValueTaskSource.GetResult(short token) + { + if (_currentId != token) + { + ThrowIncorrectCurrentIdException(); + } + + if (!IsCompleted) + { + ThrowIncompleteOperationException(); + } + + ExceptionDispatchInfo error = _error; + _currentId++; + + if (_pooled) + { + Volatile.Write(ref _continuation, s_availableSentinel); // only after fetching all needed data + } + + error?.Throw(); + } + + /// Attempts to take ownership of the pooled instance. + /// true if the instance is now owned by the caller, in which case its state has been reset; otherwise, false. + public bool TryOwnAndReset() + { + Debug.Assert(_pooled, "Should only be used for pooled objects"); + if (ReferenceEquals(Interlocked.CompareExchange(ref _continuation, null, s_availableSentinel), s_availableSentinel)) + { + _continuationState = null; + _result = default; + _error = null; + _schedulingContext = null; + _executionContext = null; + return true; + } + + return false; + } + + /// Hooks up a continuation callback for when the operation has completed. + /// The callback. + /// The state to pass to the callback. + /// The current token that must match . + /// Flags that influence the behavior of the callback. + public void OnCompleted(Action continuation, object state, short token, ValueTaskSourceOnCompletedFlags flags) + { + if (_currentId != token) + { + ThrowIncorrectCurrentIdException(); + } + + // We need to store the state before the CompareExchange, so that if it completes immediately + // after the CompareExchange, it'll find the state already stored. If someone misuses this + // and schedules multiple continuations erroneously, we could end up using the wrong state. + // Make a best-effort attempt to catch such misuse. + if (_continuationState != null) + { + ThrowMultipleContinuations(); + } + _continuationState = state; + + // Capture the execution context if necessary. + Debug.Assert(_executionContext == null); + if ((flags & ValueTaskSourceOnCompletedFlags.FlowExecutionContext) != 0) + { + _executionContext = ExecutionContext.Capture(); + } + + // Capture the scheduling context if necessary. + Debug.Assert(_schedulingContext == null); + SynchronizationContext sc = null; + TaskScheduler ts = null; + if ((flags & ValueTaskSourceOnCompletedFlags.UseSchedulingContext) != 0) + { + sc = SynchronizationContext.Current; + if (sc != null && sc.GetType() != typeof(SynchronizationContext)) + { + _schedulingContext = sc; + } + else + { + ts = TaskScheduler.Current; + if (ts != TaskScheduler.Default) + { + _schedulingContext = ts; + } + } + } + + // Try to set the provided continuation into _continuation. If this succeeds, that means the operation + // has not yet completed, and the completer will be responsible for invoking the callback. If this fails, + // that means the operation has already completed, and we must invoke the callback, but because we're still + // inside the awaiter's OnCompleted method and we want to avoid possible stack dives, we must invoke + // the continuation asynchronously rather than synchronously. + Action prevContinuation = Interlocked.CompareExchange(ref _continuation, continuation, null); + if (prevContinuation != null) + { + // If the set failed because there's already a delegate in _continuation, but that delegate is + // something other than s_completedSentinel, something went wrong, which should only happen if + // the instance was erroneously used, likely to hook up multiple continuations. + Debug.Assert(IsCompleted, $"Expected IsCompleted"); + if (!ReferenceEquals(prevContinuation, s_completedSentinel)) + { + Debug.Assert(prevContinuation != s_availableSentinel, "Continuation was the available sentinel."); + ThrowMultipleContinuations(); + } + + // Queue the continuation. + if (sc != null) + { + sc.Post(s => + { + var t = (Tuple, object>)s; + t.Item1(t.Item2); + }, Tuple.Create(continuation, state)); + } + else + { + Task.Factory.StartNew(continuation, state, CancellationToken.None, TaskCreationOptions.DenyChildAttach, ts ?? TaskScheduler.Default); + } + } + } + + /// Unregisters from cancellation. + /// + /// This is important for two reasons: + /// 1. To avoid leaking a registration into a token, so it must be done prior to completing the operation. + /// 2. To avoid having to worry about concurrent completion; once invoked, the caller can be guaranteed + /// that no one else will try to complete the operation (assuming the caller is properly constructed + /// and themselves guarantees only a single completer other than through cancellation). + /// + public void UnregisterCancellation() => _registration.Dispose(); + + /// Completes the operation with a success state and the specified result. + /// The result value. + /// true if the operation could be successfully transitioned to a completed state; false if it was already completed. + public bool TrySetResult(TResult item) + { + UnregisterCancellation(); + + if (TryReserveCompletionIfCancelable()) + { + _result = item; + SignalCompletion(); + return true; + } + + return false; + } + + /// Completes the operation with a failed state and the specified error. + /// The error. + /// true if the operation could be successfully transitioned to a completed state; false if it was already completed. + public bool TrySetException(Exception exception) + { + UnregisterCancellation(); + + if (TryReserveCompletionIfCancelable()) + { + _error = ExceptionDispatchInfo.Capture(exception); + SignalCompletion(); + return true; + } + + return false; + } + + /// Completes the operation with a failed state and a cancellation error. + /// The cancellation token that caused the cancellation. + /// true if the operation could be successfully transitioned to a completed state; false if it was already completed. + public bool TrySetCanceled(CancellationToken cancellationToken = default) + { + if (TryReserveCompletionIfCancelable()) + { + _error = ExceptionDispatchInfo.Capture(new OperationCanceledException(cancellationToken)); + SignalCompletion(); + return true; + } + + return false; + } + + /// Attempts to reserve this instance for completion. + /// + /// This will always return true for non-cancelable objects, as they only ever have a single owner + /// responsible for completion. For cancelable operations, this will attempt to atomically transition + /// from Initialized to CompletionReserved. + /// + private bool TryReserveCompletionIfCancelable() => + !CancellationToken.CanBeCanceled || + Interlocked.CompareExchange(ref _completionReserved, 1, 0) == 0; + + /// Signals to a registered continuation that the operation has now completed. + private void SignalCompletion() + { + if (_continuation != null || Interlocked.CompareExchange(ref _continuation, s_completedSentinel, null) != null) + { + ExecutionContext ec = _executionContext; + if (ec != null) + { + ExecutionContext.Run(ec, s => ((AsyncOperation)s).SignalCompletionCore(), this); + } + else + { + SignalCompletionCore(); + } + } + } + + /// Invokes the registered continuation; separated out of SignalCompletion for convenience so that it may be invoked on multiple code paths. + private void SignalCompletionCore() + { + Debug.Assert(_continuation != s_completedSentinel, $"The continuation was the completion sentinel."); + Debug.Assert(_continuation != s_availableSentinel, $"The continuation was the available sentinel."); + + if (_schedulingContext == null) + { + // There's no captured scheduling context. If we're forced to run continuations asynchronously, queue it. + // Otherwise fall through to invoke it synchronously. + if (_runContinuationsAsynchronously) + { + Task.Factory.StartNew(s => ((AsyncOperation)s).SetCompletionAndInvokeContinuation(), this, + CancellationToken.None, TaskCreationOptions.DenyChildAttach, TaskScheduler.Default); + return; + } + } + else if (_schedulingContext is SynchronizationContext sc) + { + // There's a captured synchronization context. If we're forced to run continuations asynchronously, + // or if there's a current synchronization context that's not the one we're targeting, queue it. + // Otherwise fall through to invoke it synchronously. + if (_runContinuationsAsynchronously || sc != SynchronizationContext.Current) + { + sc.Post(s => ((AsyncOperation)s).SetCompletionAndInvokeContinuation(), this); + return; + } + } + else + { + // There's a captured TaskScheduler. If we're forced to run continuations asynchronously, + // or if there's a current scheduler that's not the one we're targeting, queue it. + // Otherwise fall through to invoke it synchronously. + TaskScheduler ts = (TaskScheduler)_schedulingContext; + Debug.Assert(ts != null, "Expected a TaskScheduler"); + if (_runContinuationsAsynchronously || ts != TaskScheduler.Current) + { + Task.Factory.StartNew(s => ((AsyncOperation)s).SetCompletionAndInvokeContinuation(), this, + CancellationToken.None, TaskCreationOptions.DenyChildAttach, ts); + return; + } + } + + // Invoke the continuation synchronously. + SetCompletionAndInvokeContinuation(); + } + + private void SetCompletionAndInvokeContinuation() + { + Action c = _continuation; + _continuation = s_completedSentinel; + c(_continuationState); + } + } + + /// The representation of an asynchronous operation that has a result value and carries additional data with it. + /// Specifies the type of data being written. + internal sealed class VoidAsyncOperationWithData : AsyncOperation + { + /// Initializes the interactor. + /// true if continuations should be forced to run asynchronously; otherwise, false. + /// The cancellation token used to cancel the operation. + /// Whether this instance is pooled and reused. + public VoidAsyncOperationWithData(bool runContinuationsAsynchronously, CancellationToken cancellationToken = default, bool pooled = false) : + base(runContinuationsAsynchronously, cancellationToken, pooled) + { + } + + /// The item being written. + public TData Item { get; set; } + } +} diff --git a/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/BoundedChannel.cs b/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/BoundedChannel.cs index 23047aba28..a4ff7d070f 100644 --- a/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/BoundedChannel.cs +++ b/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/BoundedChannel.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace System.Threading.Channels { /// Provides a channel with a bounded capacity. - [DebuggerDisplay("Items={ItemsCountForDebugger}, Capacity={_bufferedCapacity}")] + [DebuggerDisplay("Items={ItemsCountForDebugger}, Capacity={_bufferedCapacity}, Mode={_mode}, Closed={ChannelIsClosedForDebugger}")] [DebuggerTypeProxy(typeof(DebugEnumeratorDebugView<>))] internal sealed class BoundedChannel : Channel, IDebugEnumerable { @@ -21,12 +21,14 @@ namespace System.Threading.Channels private readonly int _bufferedCapacity; /// Items currently stored in the channel waiting to be read. private readonly Dequeue _items = new Dequeue(); + /// Readers waiting to read from the channel. + private readonly Dequeue> _blockedReaders = new Dequeue>(); /// Writers waiting to write to the channel. - private readonly Dequeue> _blockedWriters = new Dequeue>(); - /// Task signaled when any WaitToReadAsync waiters should be woken up. - private ReaderInteractor _waitingReaders; - /// Task signaled when any WaitToWriteAsync waiters should be woken up. - private ReaderInteractor _waitingWriters; + private readonly Dequeue> _blockedWriters = new Dequeue>(); + /// Linked list of WaitToReadAsync waiters. + private AsyncOperation _waitingReadersTail; + /// Linked list of WaitToWriteAsync waiters. + private AsyncOperation _waitingWritersTail; /// Whether to force continuations to be executed asynchronously from producer writes. private readonly bool _runContinuationsAsynchronously; /// Set to non-null once Complete has been called. @@ -49,10 +51,20 @@ namespace System.Threading.Channels Writer = new BoundedChannelWriter(this); } - private sealed class BoundedChannelReader : ChannelReader + [DebuggerDisplay("Items={ItemsCountForDebugger}")] + [DebuggerTypeProxy(typeof(DebugEnumeratorDebugView<>))] + private sealed class BoundedChannelReader : ChannelReader, IDebugEnumerable { internal readonly BoundedChannel _parent; - internal BoundedChannelReader(BoundedChannel parent) => _parent = parent; + private readonly AsyncOperation _readerSingleton; + private readonly AsyncOperation _waiterSingleton; + + internal BoundedChannelReader(BoundedChannel parent) + { + _parent = parent; + _readerSingleton = new AsyncOperation(parent._runContinuationsAsynchronously, pooled: true); + _waiterSingleton = new AsyncOperation(parent._runContinuationsAsynchronously, pooled: true); + } public override Task Completion => _parent._completion.Task; @@ -75,11 +87,54 @@ namespace System.Threading.Channels return false; } - public override Task WaitToReadAsync(CancellationToken cancellationToken) + public override ValueTask ReadAsync(CancellationToken cancellationToken) { if (cancellationToken.IsCancellationRequested) { - return Task.FromCanceled(cancellationToken); + return new ValueTask(Task.FromCanceled(cancellationToken)); + } + + BoundedChannel parent = _parent; + lock (parent.SyncObj) + { + parent.AssertInvariants(); + + // If there are any items, hand one back. + if (!parent._items.IsEmpty) + { + return new ValueTask(DequeueItemAndPostProcess()); + } + + // There weren't any items. If we're done writing so that there + // will never be more items, fail. + if (parent._doneWriting != null) + { + return ChannelUtilities.GetInvalidCompletionValueTask(parent._doneWriting); + } + + // If we're able to use the singleton reader, do so. + if (!cancellationToken.CanBeCanceled) + { + AsyncOperation singleton = _readerSingleton; + if (singleton.TryOwnAndReset()) + { + parent._blockedReaders.EnqueueTail(singleton); + return singleton.ValueTaskOfT; + } + } + + // Otherwise, queue the reader. + var reader = new AsyncOperation(parent._runContinuationsAsynchronously, cancellationToken); + parent._blockedReaders.EnqueueTail(reader); + return reader.ValueTaskOfT; + } + } + + public override ValueTask WaitToReadAsync(CancellationToken cancellationToken) + { + if (cancellationToken.IsCancellationRequested) + { + return new ValueTask(Task.FromCanceled(cancellationToken)); } BoundedChannel parent = _parent; @@ -90,20 +145,35 @@ namespace System.Threading.Channels // If there are any items available, a read is possible. if (!parent._items.IsEmpty) { - return ChannelUtilities.s_trueTask; + return new ValueTask(true); } // There were no items available, so if we're done writing, a read will never be possible. if (parent._doneWriting != null) { return parent._doneWriting != ChannelUtilities.s_doneWritingSentinel ? - Task.FromException(parent._doneWriting) : - ChannelUtilities.s_falseTask; + new ValueTask(Task.FromException(parent._doneWriting)) : + default; } // There were no items available, but there could be in the future, so ensure // there's a blocked reader task and return it. - return ChannelUtilities.GetOrCreateWaiter(ref parent._waitingReaders, parent._runContinuationsAsynchronously, cancellationToken); + + // If we're able to use the singleton waiter, do so. + if (!cancellationToken.CanBeCanceled) + { + AsyncOperation singleton = _waiterSingleton; + if (singleton.TryOwnAndReset()) + { + ChannelUtilities.QueueWaiter(ref parent._waitingReadersTail, singleton); + return singleton.ValueTaskOfT; + } + } + + // Otherwise, queue a reader. + var waiter = new AsyncOperation(parent._runContinuationsAsynchronously, cancellationToken); + ChannelUtilities.QueueWaiter(ref _parent._waitingReadersTail, waiter); + return waiter.ValueTaskOfT; } } @@ -117,40 +187,68 @@ namespace System.Threading.Channels // Dequeue an item. T item = parent._items.DequeueHead(); - // If we're now empty and we're done writing, complete the channel. - if (parent._doneWriting != null && parent._items.IsEmpty) + if (parent._doneWriting != null) { - ChannelUtilities.Complete(parent._completion, parent._doneWriting); - } - - // If there are any writers blocked, there's now room for at least one - // to be promoted to have its item moved into the items queue. We need - // to loop while trying to complete the writer in order to find one that - // hasn't yet been canceled (canceled writers transition to canceled but - // remain in the physical queue). - while (!parent._blockedWriters.IsEmpty) - { - WriterInteractor w = parent._blockedWriters.DequeueHead(); - if (w.Success(default)) + // We're done writing, so if we're now empty, complete the channel. + if (parent._items.IsEmpty) { - parent._items.EnqueueTail(w.Item); - return item; + ChannelUtilities.Complete(parent._completion, parent._doneWriting); } } + else + { + // If there are any writers blocked, there's now room for at least one + // to be promoted to have its item moved into the items queue. We need + // to loop while trying to complete the writer in order to find one that + // hasn't yet been canceled (canceled writers transition to canceled but + // remain in the physical queue). + // + // (It's possible for _doneWriting to be non-null due to Complete + // having been called but for there to still be blocked/waiting writers. + // This is a temporary condition, after which Complete has set _doneWriting + // and then exited the lock; at that point it'll proceed to clean this up, + // so we just ignore them.) - // There was no blocked writer, so see if there's a WaitToWriteAsync - // we should wake up. - ChannelUtilities.WakeUpWaiters(ref parent._waitingWriters, result: true); + while (!parent._blockedWriters.IsEmpty) + { + VoidAsyncOperationWithData w = parent._blockedWriters.DequeueHead(); + if (w.TrySetResult(default)) + { + parent._items.EnqueueTail(w.Item); + return item; + } + } + + // There was no blocked writer, so see if there's a WaitToWriteAsync + // we should wake up. + ChannelUtilities.WakeUpWaiters(ref parent._waitingWritersTail, result: true); + } // Return the item return item; } + + /// Gets the number of items in the channel. This should only be used by the debugger. + private int ItemsCountForDebugger => _parent._items.Count; + + /// Gets an enumerator the debugger can use to show the contents of the channel. + IEnumerator IDebugEnumerable.GetEnumerator() => _parent._items.GetEnumerator(); } - private sealed class BoundedChannelWriter : ChannelWriter + [DebuggerDisplay("Items={ItemsCountForDebugger}, Capacity={CapacityForDebugger}")] + [DebuggerTypeProxy(typeof(DebugEnumeratorDebugView<>))] + private sealed class BoundedChannelWriter : ChannelWriter, IDebugEnumerable { internal readonly BoundedChannel _parent; - internal BoundedChannelWriter(BoundedChannel parent) => _parent = parent; + private readonly VoidAsyncOperationWithData _writerSingleton; + private readonly AsyncOperation _waiterSingleton; + + internal BoundedChannelWriter(BoundedChannel parent) + { + _parent = parent; + _writerSingleton = new VoidAsyncOperationWithData(runContinuationsAsynchronously: true, pooled: true); + _waiterSingleton = new AsyncOperation(runContinuationsAsynchronously: true, pooled: true); + } public override bool TryComplete(Exception error) { @@ -181,14 +279,15 @@ namespace System.Threading.Channels ChannelUtilities.Complete(parent._completion, error); } - // At this point, _blockedWriters and _waitingReaders/Writers will not be mutated: + // At this point, _blockedReaders/Writers and _waitingReaders/Writers will not be mutated: // they're only mutated by readers/writers while holding the lock, and only if _doneWriting is null. // We also know that only one thread (this one) will ever get here, as only that thread // will be the one to transition from _doneWriting false to true. As such, we can // freely manipulate them without any concurrency concerns. - ChannelUtilities.FailInteractors, VoidResult>(parent._blockedWriters, ChannelUtilities.CreateInvalidCompletionException(error)); - ChannelUtilities.WakeUpWaiters(ref parent._waitingReaders, result: false, error: error); - ChannelUtilities.WakeUpWaiters(ref parent._waitingWriters, result: false, error: error); + ChannelUtilities.FailOperations, T>(parent._blockedReaders, ChannelUtilities.CreateInvalidCompletionException(error)); + ChannelUtilities.FailOperations, VoidResult>(parent._blockedWriters, ChannelUtilities.CreateInvalidCompletionException(error)); + ChannelUtilities.WakeUpWaiters(ref parent._waitingReadersTail, result: false, error: error); + ChannelUtilities.WakeUpWaiters(ref parent._waitingWritersTail, result: false, error: error); // Successfully transitioned to completed. return true; @@ -196,7 +295,8 @@ namespace System.Threading.Channels public override bool TryWrite(T item) { - ReaderInteractor waitingReaders = null; + AsyncOperation blockedReader = null; + AsyncOperation waitingReadersTail = null; BoundedChannel parent = _parent; lock (parent.SyncObj) @@ -214,16 +314,34 @@ namespace System.Threading.Channels if (count == 0) { - // There are no items in the channel, which means we may have waiting readers. - // Store the item. - parent._items.EnqueueTail(item); - waitingReaders = parent._waitingReaders; - if (waitingReaders == null) + // There are no items in the channel, which means we may have blocked/waiting readers. + + // If there are any blocked readers, find one that's not canceled + // and store it to complete outside of the lock, in case it has + // continuations that'll run synchronously + while (!parent._blockedReaders.IsEmpty) { - // If no one's waiting to be notified about a 0-to-1 transition, we're done. - return true; + AsyncOperation r = parent._blockedReaders.DequeueHead(); + r.UnregisterCancellation(); // ensure that once we grab it, we own its completion + if (!r.IsCompleted) + { + blockedReader = r; + break; + } + } + + if (blockedReader == null) + { + // If there wasn't a blocked reader, then store the item. If no one's waiting + // to be notified about a 0-to-1 transition, we're done. + parent._items.EnqueueTail(item); + waitingReadersTail = parent._waitingReadersTail; + if (waitingReadersTail == null) + { + return true; + } + parent._waitingReadersTail = null; } - parent._waitingReaders = null; } else if (count < parent._bufferedCapacity) { @@ -257,19 +375,32 @@ namespace System.Threading.Channels } } - // We stored an item bringing the count up from 0 to 1. Alert - // any waiting readers that there may be something for them to consume. - // Since we're no longer holding the lock, it's possible we'll end up - // waking readers that have since come in. - waitingReaders.Success(item: true); + // We either wrote the item already, or we're transferring it to the blocked reader we grabbed. + if (blockedReader != null) + { + Debug.Assert(waitingReadersTail == null, "Shouldn't have any waiters to wake up"); + + // Transfer the written item to the blocked reader. + bool success = blockedReader.TrySetResult(item); + Debug.Assert(success, "We should always be able to complete the reader."); + } + else + { + // We stored an item bringing the count up from 0 to 1. Alert + // any waiting readers that there may be something for them to consume. + // Since we're no longer holding the lock, it's possible we'll end up + // waking readers that have since come in. + ChannelUtilities.WakeUpWaiters(ref waitingReadersTail, result: true); + } + return true; } - public override Task WaitToWriteAsync(CancellationToken cancellationToken) + public override ValueTask WaitToWriteAsync(CancellationToken cancellationToken) { if (cancellationToken.IsCancellationRequested) { - return Task.FromCanceled(cancellationToken); + return new ValueTask(Task.FromCanceled(cancellationToken)); } BoundedChannel parent = _parent; @@ -281,8 +412,8 @@ namespace System.Threading.Channels if (parent._doneWriting != null) { return parent._doneWriting != ChannelUtilities.s_doneWritingSentinel ? - Task.FromException(parent._doneWriting) : - ChannelUtilities.s_falseTask; + new ValueTask(Task.FromException(parent._doneWriting)) : + default; } // If there's space to write, a write is possible. @@ -290,22 +421,38 @@ namespace System.Threading.Channels // full we'll just drop an element to make room. if (parent._items.Count < parent._bufferedCapacity || parent._mode != BoundedChannelFullMode.Wait) { - return ChannelUtilities.s_trueTask; + return new ValueTask(true); } // We're still allowed to write, but there's no space, so ensure a waiter is queued and return it. - return ChannelUtilities.GetOrCreateWaiter(ref parent._waitingWriters, runContinuationsAsynchronously: true, cancellationToken); + + // If we're able to use the singleton waiter, do so. + if (!cancellationToken.CanBeCanceled) + { + AsyncOperation singleton = _waiterSingleton; + if (singleton.TryOwnAndReset()) + { + ChannelUtilities.QueueWaiter(ref parent._waitingWritersTail, singleton); + return singleton.ValueTaskOfT; + } + } + + // Otherwise, queue a waiter. + var waiter = new AsyncOperation(runContinuationsAsynchronously: true, cancellationToken); + ChannelUtilities.QueueWaiter(ref parent._waitingWritersTail, waiter); + return waiter.ValueTaskOfT; } } - public override Task WriteAsync(T item, CancellationToken cancellationToken) + public override ValueTask WriteAsync(T item, CancellationToken cancellationToken) { if (cancellationToken.IsCancellationRequested) { - return Task.FromCanceled(cancellationToken); + return new ValueTask(Task.FromCanceled(cancellationToken)); } - ReaderInteractor waitingReaders = null; + AsyncOperation blockedReader = null; + AsyncOperation waitingReadersTail = null; BoundedChannel parent = _parent; lock (parent.SyncObj) @@ -315,7 +462,7 @@ namespace System.Threading.Channels // If we're done writing, trying to write is an error. if (parent._doneWriting != null) { - return Task.FromException(ChannelUtilities.CreateInvalidCompletionException(parent._doneWriting)); + return new ValueTask(Task.FromException(ChannelUtilities.CreateInvalidCompletionException(parent._doneWriting))); } // Get the number of items in the channel currently. @@ -323,16 +470,34 @@ namespace System.Threading.Channels if (count == 0) { - // There are no items in the channel, which means we may have waiting readers. - // Store the item. - parent._items.EnqueueTail(item); - waitingReaders = parent._waitingReaders; - if (waitingReaders == null) + // There are no items in the channel, which means we may have blocked/waiting readers. + + // If there are any blocked readers, find one that's not canceled + // and store it to complete outside of the lock, in case it has + // continuations that'll run synchronously + while (!parent._blockedReaders.IsEmpty) { - // If no one's waiting to be notified about a 0-to-1 transition, we're done. - return ChannelUtilities.s_trueTask; + AsyncOperation r = parent._blockedReaders.DequeueHead(); + r.UnregisterCancellation(); // ensure that once we grab it, we own its completion + if (!r.IsCompleted) + { + blockedReader = r; + break; + } + } + + if (blockedReader == null) + { + // If there wasn't a blocked reader, then store the item. If no one's waiting + // to be notified about a 0-to-1 transition, we're done. + parent._items.EnqueueTail(item); + waitingReadersTail = parent._waitingReadersTail; + if (waitingReadersTail == null) + { + return default; + } + parent._waitingReadersTail = null; } - parent._waitingReaders = null; } else if (count < parent._bufferedCapacity) { @@ -340,21 +505,35 @@ namespace System.Threading.Channels // since there's room, we can simply store the item and exit without having to // worry about blocked/waiting readers. parent._items.EnqueueTail(item); - return ChannelUtilities.s_trueTask; + return default; } else if (parent._mode == BoundedChannelFullMode.Wait) { - // The channel is full and we're in a wait mode. - // Queue the writer. - var writer = WriterInteractor.Create(runContinuationsAsynchronously: true, item, cancellationToken); + // The channel is full and we're in a wait mode. We need to queue a writer. + + // If we're able to use the singleton writer, do so. + if (!cancellationToken.CanBeCanceled) + { + VoidAsyncOperationWithData singleton = _writerSingleton; + if (singleton.TryOwnAndReset()) + { + singleton.Item = item; + parent._blockedWriters.EnqueueTail(singleton); + return singleton.ValueTask; + } + } + + // Otherwise, queue a new writer. + var writer = new VoidAsyncOperationWithData(runContinuationsAsynchronously: true, cancellationToken); + writer.Item = item; parent._blockedWriters.EnqueueTail(writer); - return writer.Task; + return writer.ValueTask; } else if (parent._mode == BoundedChannelFullMode.DropWrite) { // The channel is full and we're in ignore mode. // Ignore the item but say we accepted it. - return ChannelUtilities.s_trueTask; + return default; } else { @@ -364,17 +543,37 @@ namespace System.Threading.Channels parent._items.DequeueTail() : parent._items.DequeueHead(); parent._items.EnqueueTail(item); - return ChannelUtilities.s_trueTask; + return default; } } - // We stored an item bringing the count up from 0 to 1. Alert - // any waiting readers that there may be something for them to consume. - // Since we're no longer holding the lock, it's possible we'll end up - // waking readers that have since come in. - waitingReaders.Success(item: true); - return ChannelUtilities.s_trueTask; + // We either wrote the item already, or we're transfering it to the blocked reader we grabbed. + if (blockedReader != null) + { + // Transfer the written item to the blocked reader. + bool success = blockedReader.TrySetResult(item); + Debug.Assert(success, "We should always be able to complete the reader."); + } + else + { + // We stored an item bringing the count up from 0 to 1. Alert + // any waiting readers that there may be something for them to consume. + // Since we're no longer holding the lock, it's possible we'll end up + // waking readers that have since come in. + ChannelUtilities.WakeUpWaiters(ref waitingReadersTail, result: true); + } + + return default; } + + /// Gets the number of items in the channel. This should only be used by the debugger. + private int ItemsCountForDebugger => _parent._items.Count; + + /// Gets the capacity of the channel. This should only be used by the debugger. + private int CapacityForDebugger => _parent._bufferedCapacity; + + /// Gets an enumerator the debugger can use to show the contents of the channel. + IEnumerator IDebugEnumerable.GetEnumerator() => _parent._items.GetEnumerator(); } [Conditional("DEBUG")] @@ -385,16 +584,23 @@ namespace System.Threading.Channels if (!_items.IsEmpty) { - Debug.Assert(_waitingReaders == null, "There are items available, so there shouldn't be any waiting readers."); + Debug.Assert(_blockedReaders.IsEmpty, "There are items available, so there shouldn't be any blocked readers."); + Debug.Assert(_waitingReadersTail == null, "There are items available, so there shouldn't be any waiting readers."); } if (_items.Count < _bufferedCapacity) { Debug.Assert(_blockedWriters.IsEmpty, "There's space available, so there shouldn't be any blocked writers."); - Debug.Assert(_waitingWriters == null, "There's space available, so there shouldn't be any waiting writers."); + Debug.Assert(_waitingWritersTail == null, "There's space available, so there shouldn't be any waiting writers."); + } + if (!_blockedReaders.IsEmpty) + { + Debug.Assert(_items.IsEmpty, "There shouldn't be queued items if there's a blocked reader."); + Debug.Assert(_blockedWriters.IsEmpty, "There shouldn't be any blocked writer if there's a blocked reader."); } if (!_blockedWriters.IsEmpty) { Debug.Assert(_items.Count == _bufferedCapacity, "We should have a full buffer if there's a blocked writer."); + Debug.Assert(_blockedReaders.IsEmpty, "There shouldn't be any blocked readers if there's a blocked writer."); } if (_completion.Task.IsCompleted) { @@ -405,6 +611,9 @@ namespace System.Threading.Channels /// Gets the number of items in the channel. This should only be used by the debugger. private int ItemsCountForDebugger => _items.Count; + /// Report if the channel is closed or not. This should only be used by the debugger. + private bool ChannelIsClosedForDebugger => _doneWriting != null; + /// Gets an enumerator the debugger can use to show the contents of the channel. IEnumerator IDebugEnumerable.GetEnumerator() => _items.GetEnumerator(); } diff --git a/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/Channel.cs b/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/Channel.cs index ed1b3f34ef..5a4d6693f8 100644 --- a/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/Channel.cs +++ b/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/Channel.cs @@ -52,25 +52,5 @@ namespace System.Threading.Channels return new BoundedChannel(options.Capacity, options.FullMode, !options.AllowSynchronousContinuations); } - - /// Creates a channel that doesn't buffer any items. - /// Specifies the type of data in the channel. - /// The created channel. - public static Channel CreateUnbuffered() => - new UnbufferedChannel(); - - /// Creates a channel that doesn't buffer any items. - /// Specifies the type of data in the channel. - /// Options that guide the behavior of the channel. - /// The created channel. - public static Channel CreateUnbuffered(UnbufferedChannelOptions options) - { - if (options == null) - { - throw new ArgumentNullException(nameof(options)); - } - - return new UnbufferedChannel(); - } } } diff --git a/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/ChannelOptions.cs b/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/ChannelOptions.cs index 9172889de8..a949c601b2 100644 --- a/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/ChannelOptions.cs +++ b/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/ChannelOptions.cs @@ -99,9 +99,4 @@ namespace System.Threading.Channels public sealed class UnboundedChannelOptions : ChannelOptions { } - - /// Provides options that control the behavior of instances. - public sealed class UnbufferedChannelOptions : ChannelOptions - { - } } diff --git a/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/ChannelReader.cs b/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/ChannelReader.cs index 8b2469ed1d..2a838e8231 100644 --- a/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/ChannelReader.cs +++ b/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/ChannelReader.cs @@ -29,10 +29,10 @@ namespace System.Threading.Channels /// A that will complete with a true result when data is available to read /// or with a false result when no further data will ever be available to be read. /// - public abstract Task WaitToReadAsync(CancellationToken cancellationToken = default); + public abstract ValueTask WaitToReadAsync(CancellationToken cancellationToken = default); - /// Asynchronously reads an item from the channel. - /// A used to cancel the read operation. + /// Asynchronously reads an item from the channel. + /// A used to cancel the read operation. /// A that represents the asynchronous read operation. public virtual ValueTask ReadAsync(CancellationToken cancellationToken = default) { @@ -57,24 +57,17 @@ namespace System.Threading.Channels async ValueTask ReadAsyncCore(CancellationToken ct) { - try + while (true) { - while (true) + if (!await WaitToReadAsync(ct).ConfigureAwait(false)) { - if (!await WaitToReadAsync(ct)) - { - throw new ChannelClosedException(); - } - - if (TryRead(out T item)) - { - return item; - } + throw new ChannelClosedException(); + } + + if (TryRead(out T item)) + { + return item; } - } - catch (Exception exc) when (!(exc is ChannelClosedException || exc is OperationCanceledException)) - { - throw new ChannelClosedException(exc); } } } diff --git a/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/ChannelUtilities.cs b/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/ChannelUtilities.cs index 17d412f04b..ab0282cb18 100644 --- a/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/ChannelUtilities.cs +++ b/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/ChannelUtilities.cs @@ -23,7 +23,7 @@ namespace System.Threading.Channels /// Completes the specified TaskCompletionSource. /// The source to complete. /// - /// The optional exception with which to complete. + /// The optional exception with which to complete. /// If this is null or the DoneWritingSentinel, the source will be completed successfully. /// If this is an OperationCanceledException, it'll be completed with the exception's token. /// Otherwise, it'll be completed as faulted with the exception. @@ -44,74 +44,71 @@ namespace System.Threading.Channels } } - /// Wake up all of the waiters and null out the field. - /// The waiters. - /// The value with which to complete each waiter. - internal static void WakeUpWaiters(ref ReaderInteractor waiters, bool result) - { - ReaderInteractor w = waiters; - if (w != null) - { - w.Success(result); - waiters = null; - } - } - - /// Wake up all of the waiters and null out the field. - /// The waiters. - /// The success value with which to complete each waiter if error is null. - /// The failure with which to cmplete each waiter, if non-null. - internal static void WakeUpWaiters(ref ReaderInteractor waiters, bool result, Exception error = null) - { - ReaderInteractor w = waiters; - if (w != null) - { - if (error != null) - { - w.Fail(error); - } - else - { - w.Success(result); - } - waiters = null; - } - } - - /// Removes all interactors from the queue, failing each. - /// The queue of interactors to complete. - /// The error with which to complete each interactor. - internal static void FailInteractors(Dequeue interactors, Exception error) where T : Interactor + /// Gets a value task representing an error. + /// Specifies the type of the value that would have been returned. + /// The error. This may be . + /// The failed task. + internal static ValueTask GetInvalidCompletionValueTask(Exception error) { Debug.Assert(error != null); - while (!interactors.IsEmpty) + + Task t = + error == s_doneWritingSentinel ? Task.FromException(CreateInvalidCompletionException()) : + error is OperationCanceledException oce ? Task.FromCanceled(oce.CancellationToken.IsCancellationRequested ? oce.CancellationToken : new CancellationToken(true)) : + Task.FromException(CreateInvalidCompletionException(error)); + + return new ValueTask(t); + } + + internal static ValueTask QueueWaiter(ref AsyncOperation tail, AsyncOperation waiter) + { + AsyncOperation c = tail; + if (c == null) { - interactors.DequeueHead().Fail(error); + waiter.Next = waiter; + } + else + { + waiter.Next = c.Next; + c.Next = waiter; + } + tail = waiter; + return waiter.ValueTaskOfT; + } + + internal static void WakeUpWaiters(ref AsyncOperation listTail, bool result, Exception error = null) + { + AsyncOperation tail = listTail; + if (tail != null) + { + listTail = null; + + AsyncOperation head = tail.Next; + AsyncOperation c = head; + do + { + AsyncOperation next = c.Next; + c.Next = null; + + bool completed = error != null ? c.TrySetException(error) : c.TrySetResult(result); + Debug.Assert(completed || c.CancellationToken.CanBeCanceled); + + c = next; + } + while (c != head); } } - /// Gets or creates a "waiter" (e.g. WaitForRead/WriteAsync) interactor. - /// The field storing the waiter interactor. - /// true to force continuations to run asynchronously; otherwise, false. - /// The token to use to cancel the wait. - internal static Task GetOrCreateWaiter(ref ReaderInteractor waiter, bool runContinuationsAsynchronously, CancellationToken cancellationToken) + /// Removes all operations from the queue, failing each. + /// The queue of operations to complete. + /// The error with which to complete each operations. + internal static void FailOperations(Dequeue operations, Exception error) where T : AsyncOperation { - // Get the existing waiters interactor. - ReaderInteractor w = waiter; - - // If there isn't one, create one. This explicitly does not include the cancellation token, - // as we reuse it for any number of waiters that overlap. - if (w == null) + Debug.Assert(error != null); + while (!operations.IsEmpty) { - waiter = w = ReaderInteractor.Create(runContinuationsAsynchronously); + operations.DequeueHead().TrySetException(error); } - - // If the cancellation token can't be canceled, then just return the waiter task. - // If it can, we need to return a task that will complete when the waiter task does but that can also be canceled. - // Easiest way to do that is with a cancelable continuation. - return cancellationToken.CanBeCanceled ? - w.Task.ContinueWith(t => t.Result, cancellationToken, TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default) : - w.Task; } /// Creates and returns an exception object to indicate that a channel has been closed. diff --git a/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/ChannelWriter.cs b/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/ChannelWriter.cs index d09fa1b0d0..2399c4187a 100644 --- a/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/ChannelWriter.cs +++ b/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/ChannelWriter.cs @@ -31,38 +31,38 @@ namespace System.Threading.Channels /// A that will complete with a true result when space is available to write an item /// or with a false result when no further writing will be permitted. /// - public abstract Task WaitToWriteAsync(CancellationToken cancellationToken = default); + public abstract ValueTask WaitToWriteAsync(CancellationToken cancellationToken = default); /// Asynchronously writes an item to the channel. /// The value to write to the channel. /// A used to cancel the write operation. /// A that represents the asynchronous write operation. - public virtual Task WriteAsync(T item, CancellationToken cancellationToken = default) + public virtual ValueTask WriteAsync(T item, CancellationToken cancellationToken = default) { try { return - cancellationToken.IsCancellationRequested ? Task.FromCanceled(cancellationToken) : - TryWrite(item) ? Task.CompletedTask : - WriteAsyncCore(item, cancellationToken); + cancellationToken.IsCancellationRequested ? new ValueTask(Task.FromCanceled(cancellationToken)) : + TryWrite(item) ? default : + new ValueTask(WriteAsyncCore(item, cancellationToken)); } catch (Exception e) { - return Task.FromException(e); + return new ValueTask(Task.FromException(e)); } + } - async Task WriteAsyncCore(T innerItem, CancellationToken ct) + private async Task WriteAsyncCore(T innerItem, CancellationToken ct) + { + while (await WaitToWriteAsync(ct).ConfigureAwait(false)) { - while (await WaitToWriteAsync(ct).ConfigureAwait(false)) + if (TryWrite(innerItem)) { - if (TryWrite(innerItem)) - { - return; - } + return; } - - throw ChannelUtilities.CreateInvalidCompletionException(); } + + throw ChannelUtilities.CreateInvalidCompletionException(); } /// Mark the channel as being complete, meaning no more items will be written to it. diff --git a/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/Interactor.cs b/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/Interactor.cs deleted file mode 100644 index f4e0c74767..0000000000 --- a/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/Interactor.cs +++ /dev/null @@ -1,149 +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.Threading.Tasks; - -namespace System.Threading.Channels -{ - /// A base class for a blocked or waiting reader or writer. - /// Specifies the type of data passed to the reader or writer. - internal abstract class Interactor : TaskCompletionSource - { - /// Initializes the interactor. - /// true if continuations should be forced to run asynchronously; otherwise, false. - protected Interactor(bool runContinuationsAsynchronously) : - base(runContinuationsAsynchronously ? TaskCreationOptions.RunContinuationsAsynchronously : TaskCreationOptions.None) { } - - /// Completes the interactor with a success state and the specified result. - /// The result value. - /// true if the interactor could be successfully transitioned to a completed state; false if it was already completed. - internal bool Success(T item) - { - UnregisterCancellation(); - return TrySetResult(item); - } - - /// Completes the interactor with a failed state and the specified error. - /// The error. - /// true if the interactor could be successfully transitioned to a completed state; false if it was already completed. - internal bool Fail(Exception exception) - { - UnregisterCancellation(); - return TrySetException(exception); - } - - /// Unregister cancellation in case cancellation was registered. - internal virtual void UnregisterCancellation() { } - } - - /// A blocked or waiting reader. - /// Specifies the type of data being read. - internal class ReaderInteractor : Interactor - { - /// Initializes the reader. - /// true if continuations should be forced to run asynchronously; otherwise, false. - protected ReaderInteractor(bool runContinuationsAsynchronously) : base(runContinuationsAsynchronously) { } - - /// Creates a reader. - /// true if continuations should be forced to run asynchronously; otherwise, false. - /// The reader. - public static ReaderInteractor Create(bool runContinuationsAsynchronously) => - new ReaderInteractor(runContinuationsAsynchronously); - - /// Creates a reader. - /// true if continuations should be forced to run asynchronously; otherwise, false. - /// A that can be used to cancel the read operation. - /// The reader. - public static ReaderInteractor Create(bool runContinuationsAsynchronously, CancellationToken cancellationToken) => - cancellationToken.CanBeCanceled ? - new CancelableReaderInteractor(runContinuationsAsynchronously, cancellationToken) : - new ReaderInteractor(runContinuationsAsynchronously); - } - - /// A blocked or waiting writer. - /// Specifies the type of data being written. - internal class WriterInteractor : Interactor - { - /// Initializes the writer. - /// true if continuations should be forced to run asynchronously; otherwise, false. - protected WriterInteractor(bool runContinuationsAsynchronously) : base(runContinuationsAsynchronously) { } - - /// The item being written. - internal T Item { get; private set; } - - /// Creates a writer. - /// true if continuations should be forced to run asynchronously; otherwise, false. - /// The item being written. - /// A that can be used to cancel the read operation. - /// The reader. - public static WriterInteractor Create(bool runContinuationsAsynchronously, T item, CancellationToken cancellationToken) - { - WriterInteractor w = cancellationToken.CanBeCanceled ? - new CancelableWriter(runContinuationsAsynchronously, cancellationToken) : - new WriterInteractor(runContinuationsAsynchronously); - w.Item = item; - return w; - } - } - - /// A blocked or waiting reader where the read can be canceled. - /// Specifies the type of data being read. - internal sealed class CancelableReaderInteractor : ReaderInteractor - { - /// The token used for cancellation. - private readonly CancellationToken _token; - /// Registration in that should be disposed of when the operation has completed. - private CancellationTokenRegistration _registration; - - /// Initializes the cancelable reader. - /// true if continuations should be forced to run asynchronously; otherwise, false. - /// A that can be used to cancel the read operation. - internal CancelableReaderInteractor(bool runContinuationsAsynchronously, CancellationToken cancellationToken) : base(runContinuationsAsynchronously) - { - _token = cancellationToken; - _registration = cancellationToken.Register(s => - { - var thisRef = (CancelableReaderInteractor)s; - thisRef.TrySetCanceled(thisRef._token); - }, this); - } - - /// Unregister cancellation in case cancellation was registered. - internal override void UnregisterCancellation() - { - _registration.Dispose(); - _registration = default; - } - } - - /// A blocked or waiting reader where the read can be canceled. - /// Specifies the type of data being read. - internal sealed class CancelableWriter : WriterInteractor - { - /// The token used for cancellation. - private CancellationToken _token; - /// Registration in that should be disposed of when the operation has completed. - private CancellationTokenRegistration _registration; - - /// Initializes the cancelable writer. - /// true if continuations should be forced to run asynchronously; otherwise, false. - /// A that can be used to cancel the read operation. - internal CancelableWriter(bool runContinuationsAsynchronously, CancellationToken cancellationToken) : base(runContinuationsAsynchronously) - { - _token = cancellationToken; - _registration = cancellationToken.Register(s => - { - var thisRef = (CancelableWriter)s; - thisRef.TrySetCanceled(thisRef._token); - }, this); - } - - /// Unregister cancellation in case cancellation was registered. - internal override void UnregisterCancellation() - { - _registration.Dispose(); - _registration = default; - } - } -} diff --git a/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/SingleConsumerUnboundedChannel.cs b/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/SingleConsumerUnboundedChannel.cs index b3435b88ae..75cbd1cf79 100644 --- a/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/SingleConsumerUnboundedChannel.cs +++ b/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/SingleConsumerUnboundedChannel.cs @@ -13,7 +13,7 @@ namespace System.Threading.Channels /// Provides a buffered channel of unbounded capacity for use by any number /// of writers but at most a single reader at a time. /// - [DebuggerDisplay("Items={ItemsCountForDebugger}")] + [DebuggerDisplay("Items={ItemsCountForDebugger}, Closed={ChannelIsClosedForDebugger}")] [DebuggerTypeProxy(typeof(DebugEnumeratorDebugView<>))] internal sealed class SingleConsumerUnboundedChannel : Channel, IDebugEnumerable { @@ -31,8 +31,11 @@ namespace System.Threading.Channels /// non-null if the channel has been marked as complete for writing. private volatile Exception _doneWriting; + /// An if there's a blocked reader. + private AsyncOperation _blockedReader; + /// A waiting reader (e.g. WaitForReadAsync) if there is one. - private ReaderInteractor _waitingReader; + private AsyncOperation _waitingReader; /// Initialize the channel. /// Whether to force continuations to be executed asynchronously. @@ -45,13 +48,76 @@ namespace System.Threading.Channels Writer = new UnboundedChannelWriter(this); } - private sealed class UnboundedChannelReader : ChannelReader + [DebuggerDisplay("Items={ItemsCountForDebugger}")] + [DebuggerTypeProxy(typeof(DebugEnumeratorDebugView<>))] + private sealed class UnboundedChannelReader : ChannelReader, IDebugEnumerable { internal readonly SingleConsumerUnboundedChannel _parent; - internal UnboundedChannelReader(SingleConsumerUnboundedChannel parent) => _parent = parent; + private readonly AsyncOperation _readerSingleton; + private readonly AsyncOperation _waiterSingleton; + + internal UnboundedChannelReader(SingleConsumerUnboundedChannel parent) + { + _parent = parent; + _readerSingleton = new AsyncOperation(parent._runContinuationsAsynchronously, pooled: true); + _waiterSingleton = new AsyncOperation(parent._runContinuationsAsynchronously, pooled: true); + } public override Task Completion => _parent._completion.Task; + public override ValueTask ReadAsync(CancellationToken cancellationToken) + { + if (cancellationToken.IsCancellationRequested) + { + return new ValueTask(Task.FromCanceled(cancellationToken)); + } + + if (TryRead(out T item)) + { + return new ValueTask(item); + } + + SingleConsumerUnboundedChannel parent = _parent; + + AsyncOperation oldBlockedReader, newBlockedReader; + lock (parent.SyncObj) + { + // Now that we hold the lock, try reading again. + if (TryRead(out item)) + { + return new ValueTask(item); + } + + // If no more items will be written, fail the read. + if (parent._doneWriting != null) + { + return ChannelUtilities.GetInvalidCompletionValueTask(parent._doneWriting); + } + + // Try to use the singleton reader. If it's currently being used, then the channel + // is being used erroneously, and we cancel the outstanding operation. + oldBlockedReader = parent._blockedReader; + if (!cancellationToken.CanBeCanceled && _readerSingleton.TryOwnAndReset()) + { + newBlockedReader = _readerSingleton; + if (newBlockedReader == oldBlockedReader) + { + // The previous operation completed, so null out the "old" reader + // so we don't end up canceling the new operation. + oldBlockedReader = null; + } + } + else + { + newBlockedReader = new AsyncOperation(_parent._runContinuationsAsynchronously, cancellationToken); + } + parent._blockedReader = newBlockedReader; + } + + oldBlockedReader?.TrySetCanceled(); + return newBlockedReader.ValueTaskOfT; + } + public override bool TryRead(out T item) { SingleConsumerUnboundedChannel parent = _parent; @@ -66,55 +132,79 @@ namespace System.Threading.Channels return false; } - public override Task WaitToReadAsync(CancellationToken cancellationToken) + public override ValueTask WaitToReadAsync(CancellationToken cancellationToken) { // Outside of the lock, check if there are any items waiting to be read. If there are, we're done. - return - cancellationToken.IsCancellationRequested ? Task.FromCanceled(cancellationToken) : - !_parent._items.IsEmpty ? ChannelUtilities.s_trueTask : - WaitToReadAsyncCore(cancellationToken); - - Task WaitToReadAsyncCore(CancellationToken ct) + if (cancellationToken.IsCancellationRequested) { - SingleConsumerUnboundedChannel parent = _parent; - ReaderInteractor oldWaiter = null, newWaiter; - lock (parent.SyncObj) + return new ValueTask(Task.FromCanceled(cancellationToken)); + } + + if (!_parent._items.IsEmpty) + { + return new ValueTask(true); + } + + SingleConsumerUnboundedChannel parent = _parent; + AsyncOperation oldWaitingReader = null, newWaitingReader; + lock (parent.SyncObj) + { + // Again while holding the lock, check to see if there are any items available. + if (!parent._items.IsEmpty) { - // Again while holding the lock, check to see if there are any items available. - if (!parent._items.IsEmpty) - { - return ChannelUtilities.s_trueTask; - } - - // There aren't any items; if we're done writing, there never will be more items. - if (parent._doneWriting != null) - { - return parent._doneWriting != ChannelUtilities.s_doneWritingSentinel ? - Task.FromException(parent._doneWriting) : - ChannelUtilities.s_falseTask; - } - - // Create the new waiter. We're a bit more tolerant of a stray waiting reader - // than we are of a blocked reader, as with usage patterns it's easier to leave one - // behind, so we just cancel any that may have been waiting around. - oldWaiter = parent._waitingReader; - parent._waitingReader = newWaiter = ReaderInteractor.Create(parent._runContinuationsAsynchronously, ct); + return new ValueTask(true); } - oldWaiter?.TrySetCanceled(); - return newWaiter.Task; + // There aren't any items; if we're done writing, there never will be more items. + if (parent._doneWriting != null) + { + return parent._doneWriting != ChannelUtilities.s_doneWritingSentinel ? + new ValueTask(Task.FromException(parent._doneWriting)) : + default; + } + + // Try to use the singleton waiter. If it's currently being used, then the channel + // is being used erroneously, and we cancel the outstanding operation. + oldWaitingReader = parent._waitingReader; + if (!cancellationToken.CanBeCanceled && _waiterSingleton.TryOwnAndReset()) + { + newWaitingReader = _waiterSingleton; + if (newWaitingReader == oldWaitingReader) + { + // The previous operation completed, so null out the "old" waiter + // so we don't end up canceling the new operation. + oldWaitingReader = null; + } + } + else + { + newWaitingReader = new AsyncOperation(_parent._runContinuationsAsynchronously, cancellationToken); + } + parent._waitingReader = newWaitingReader; } + + oldWaitingReader?.TrySetCanceled(); + return newWaitingReader.ValueTaskOfT; } + + /// Gets the number of items in the channel. This should only be used by the debugger. + private int ItemsCountForDebugger => _parent._items.Count; + + /// Gets an enumerator the debugger can use to show the contents of the channel. + IEnumerator IDebugEnumerable.GetEnumerator() => _parent._items.GetEnumerator(); } - private sealed class UnboundedChannelWriter : ChannelWriter + [DebuggerDisplay("Items={ItemsCountForDebugger}")] + [DebuggerTypeProxy(typeof(DebugEnumeratorDebugView<>))] + private sealed class UnboundedChannelWriter : ChannelWriter, IDebugEnumerable { internal readonly SingleConsumerUnboundedChannel _parent; internal UnboundedChannelWriter(SingleConsumerUnboundedChannel parent) => _parent = parent; public override bool TryComplete(Exception error) { - ReaderInteractor waitingReader = null; + AsyncOperation blockedReader = null; + AsyncOperation waitingReader = null; bool completeTask = false; SingleConsumerUnboundedChannel parent = _parent; @@ -136,6 +226,12 @@ namespace System.Threading.Channels { completeTask = true; + if (parent._blockedReader != null) + { + blockedReader = parent._blockedReader; + parent._blockedReader = null; + } + if (parent._waitingReader != null) { waitingReader = parent._waitingReader; @@ -150,16 +246,26 @@ namespace System.Threading.Channels ChannelUtilities.Complete(parent._completion, error); } - // Complete a waiting reader if necessary. + Debug.Assert(blockedReader == null || waitingReader == null, "There should only ever be at most one reader."); + + // Complete a blocked reader if necessary + if (blockedReader != null) + { + error = ChannelUtilities.CreateInvalidCompletionException(error); + blockedReader.TrySetException(error); + } + + // Complete a waiting reader if necessary. (We really shouldn't have both a blockedReader + // and a waitingReader, but it's more expensive to prevent it than to just tolerate it.) if (waitingReader != null) { if (error != null) { - waitingReader.Fail(error); + waitingReader.TrySetException(error); } else { - waitingReader.Success(item: false); + waitingReader.TrySetResult(item: false); } } @@ -172,7 +278,8 @@ namespace System.Threading.Channels SingleConsumerUnboundedChannel parent = _parent; while (true) // in case a reader was canceled and we need to try again { - ReaderInteractor waitingReader = null; + AsyncOperation blockedReader = null; + AsyncOperation waitingReader = null; lock (parent.SyncObj) { @@ -182,42 +289,71 @@ namespace System.Threading.Channels return false; } - // Queue the item being written; then if there's a waiting - // reader, store it for notification outside of the lock. - parent._items.Enqueue(item); - - waitingReader = parent._waitingReader; - if (waitingReader == null) + // If there's a blocked reader, store it into a local for completion outside of the lock. + // If there isn't a blocked reader, queue the item being written; then if there's a waiting + blockedReader = parent._blockedReader; + if (blockedReader != null) { - return true; + parent._blockedReader = null; + } + else + { + parent._items.Enqueue(item); + + waitingReader = parent._waitingReader; + if (waitingReader == null) + { + return true; + } + parent._waitingReader = null; } - parent._waitingReader = null; } - // If we get here, we grabbed a waiting reader. - // Notify it that an item was written and exit. - Debug.Assert(waitingReader != null, "Expected a waiting reader"); - waitingReader.Success(item: true); - return true; + // If we get here, we grabbed a blocked or a waiting reader. + Debug.Assert((blockedReader != null) ^ (waitingReader != null), "Expected either a blocked or waiting reader, but not both"); + + // If we have a waiting reader, notify it that an item was written and exit. + if (waitingReader != null) + { + // If we get here, we grabbed a waiting reader. + waitingReader.TrySetResult(item: true); + return true; + } + + // Otherwise we have a blocked reader: complete it with the item being written. + // In the case of a ReadAsync(CancellationToken), it's possible the reader could + // have been completed due to cancellation by the time we get here. In that case, + // we'll loop around to try again so as not to lose the item being written. + Debug.Assert(blockedReader != null); + if (blockedReader.TrySetResult(item)) + { + return true; + } } } - public override Task WaitToWriteAsync(CancellationToken cancellationToken) + public override ValueTask WaitToWriteAsync(CancellationToken cancellationToken) { Exception doneWriting = _parent._doneWriting; return - cancellationToken.IsCancellationRequested ? Task.FromCanceled(cancellationToken) : - doneWriting == null ? ChannelUtilities.s_trueTask : - doneWriting != ChannelUtilities.s_doneWritingSentinel ? Task.FromException(doneWriting) : - ChannelUtilities.s_falseTask; + cancellationToken.IsCancellationRequested ? new ValueTask(Task.FromCanceled(cancellationToken)) : + doneWriting == null ? new ValueTask(true) : + doneWriting != ChannelUtilities.s_doneWritingSentinel ? new ValueTask(Task.FromException(doneWriting)) : + default; } - public override Task WriteAsync(T item, CancellationToken cancellationToken) => + public override ValueTask WriteAsync(T item, CancellationToken cancellationToken) => // Writing always succeeds (unless we've already completed writing or cancellation has been requested), // so just TryWrite and return a completed task. - cancellationToken.IsCancellationRequested ? Task.FromCanceled(cancellationToken) : - TryWrite(item) ? Task.CompletedTask : - Task.FromException(ChannelUtilities.CreateInvalidCompletionException(_parent._doneWriting)); + cancellationToken.IsCancellationRequested ? new ValueTask(Task.FromCanceled(cancellationToken)) : + TryWrite(item) ? default : + new ValueTask(Task.FromException(ChannelUtilities.CreateInvalidCompletionException(_parent._doneWriting))); + + /// Gets the number of items in the channel. This should only be used by the debugger. + private int ItemsCountForDebugger => _parent._items.Count; + + /// Gets an enumerator the debugger can use to show the contents of the channel. + IEnumerator IDebugEnumerable.GetEnumerator() => _parent._items.GetEnumerator(); } private object SyncObj => _items; @@ -225,6 +361,9 @@ namespace System.Threading.Channels /// Gets the number of items in the channel. This should only be used by the debugger. private int ItemsCountForDebugger => _items.Count; + /// Report if the channel is closed or not. This should only be used by the debugger. + private bool ChannelIsClosedForDebugger => _doneWriting != null; + /// Gets an enumerator the debugger can use to show the contents of the channel. IEnumerator IDebugEnumerable.GetEnumerator() => _items.GetEnumerator(); } diff --git a/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/UnboundedChannel.cs b/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/UnboundedChannel.cs index 33ca00c6af..5ac4a2d91b 100644 --- a/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/UnboundedChannel.cs +++ b/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/UnboundedChannel.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; namespace System.Threading.Channels { /// Provides a buffered channel of unbounded capacity. - [DebuggerDisplay("Items={ItemsCountForDebugger}")] + [DebuggerDisplay("Items={ItemsCountForDebugger}, Closed={ChannelIsClosedForDebugger}")] [DebuggerTypeProxy(typeof(DebugEnumeratorDebugView<>))] internal sealed class UnboundedChannel : Channel, IDebugEnumerable { @@ -18,11 +18,13 @@ namespace System.Threading.Channels private readonly TaskCompletionSource _completion; /// The items in the channel. private readonly ConcurrentQueue _items = new ConcurrentQueue(); + /// Readers blocked reading from the channel. + private readonly Dequeue> _blockedReaders = new Dequeue>(); /// Whether to force continuations to be executed asynchronously from producer writes. private readonly bool _runContinuationsAsynchronously; /// Readers waiting for a notification that data is available. - private ReaderInteractor _waitingReaders; + private AsyncOperation _waitingReadersTail; /// Set to non-null once Complete has been called. private Exception _doneWriting; @@ -31,17 +33,77 @@ namespace System.Threading.Channels { _runContinuationsAsynchronously = runContinuationsAsynchronously; _completion = new TaskCompletionSource(runContinuationsAsynchronously ? TaskCreationOptions.RunContinuationsAsynchronously : TaskCreationOptions.None); - base.Reader = new UnboundedChannelReader(this); + Reader = new UnboundedChannelReader(this); Writer = new UnboundedChannelWriter(this); } - private sealed class UnboundedChannelReader : ChannelReader + [DebuggerDisplay("Items={ItemsCountForDebugger}")] + [DebuggerTypeProxy(typeof(DebugEnumeratorDebugView<>))] + private sealed class UnboundedChannelReader : ChannelReader, IDebugEnumerable { internal readonly UnboundedChannel _parent; - internal UnboundedChannelReader(UnboundedChannel parent) => _parent = parent; + private readonly AsyncOperation _readerSingleton; + private readonly AsyncOperation _waiterSingleton; + + internal UnboundedChannelReader(UnboundedChannel parent) + { + _parent = parent; + _readerSingleton = new AsyncOperation(parent._runContinuationsAsynchronously, pooled: true); + _waiterSingleton = new AsyncOperation(parent._runContinuationsAsynchronously, pooled: true); + } public override Task Completion => _parent._completion.Task; + public override ValueTask ReadAsync(CancellationToken cancellationToken) + { + if (cancellationToken.IsCancellationRequested) + { + return new ValueTask(Task.FromCanceled(cancellationToken)); + } + + // Dequeue an item if we can. + UnboundedChannel parent = _parent; + if (parent._items.TryDequeue(out T item)) + { + CompleteIfDone(parent); + return new ValueTask(item); + } + + lock (parent.SyncObj) + { + parent.AssertInvariants(); + + // Try to dequeue again, now that we hold the lock. + if (parent._items.TryDequeue(out item)) + { + CompleteIfDone(parent); + return new ValueTask(item); + } + + // There are no items, so if we're done writing, fail. + if (parent._doneWriting != null) + { + return ChannelUtilities.GetInvalidCompletionValueTask(parent._doneWriting); + } + + // If we're able to use the singleton reader, do so. + if (!cancellationToken.CanBeCanceled) + { + AsyncOperation singleton = _readerSingleton; + if (singleton.TryOwnAndReset()) + { + parent._blockedReaders.EnqueueTail(singleton); + return singleton.ValueTaskOfT; + } + } + + // Otherwise, create and queue a reader. + var reader = new AsyncOperation(parent._runContinuationsAsynchronously, cancellationToken); + parent._blockedReaders.EnqueueTail(reader); + return reader.ValueTaskOfT; + } + } + public override bool TryRead(out T item) { UnboundedChannel parent = _parent; @@ -49,11 +111,7 @@ namespace System.Threading.Channels // Dequeue an item if we can if (parent._items.TryDequeue(out item)) { - if (parent._doneWriting != null && parent._items.IsEmpty) - { - // If we've now emptied the items queue and we're not getting any more, complete. - ChannelUtilities.Complete(parent._completion, parent._doneWriting); - } + CompleteIfDone(parent); return true; } @@ -61,43 +119,75 @@ namespace System.Threading.Channels return false; } - public override Task WaitToReadAsync(CancellationToken cancellationToken) + private void CompleteIfDone(UnboundedChannel parent) { - // If there are any items, readers can try to get them. - return !_parent._items.IsEmpty ? - ChannelUtilities.s_trueTask : - WaitToReadAsyncCore(cancellationToken); - - Task WaitToReadAsyncCore(CancellationToken ct) + if (parent._doneWriting != null && parent._items.IsEmpty) { - UnboundedChannel parent = _parent; - - lock (parent.SyncObj) - { - parent.AssertInvariants(); - - // Try again to read now that we're synchronized with writers. - if (!parent._items.IsEmpty) - { - return ChannelUtilities.s_trueTask; - } - - // There are no items, so if we're done writing, there's never going to be data available. - if (parent._doneWriting != null) - { - return parent._doneWriting != ChannelUtilities.s_doneWritingSentinel ? - Task.FromException(parent._doneWriting) : - ChannelUtilities.s_falseTask; - } - - // Queue the waiter - return ChannelUtilities.GetOrCreateWaiter(ref parent._waitingReaders, parent._runContinuationsAsynchronously, ct); - } + // If we've now emptied the items queue and we're not getting any more, complete. + ChannelUtilities.Complete(parent._completion, parent._doneWriting); } } + + public override ValueTask WaitToReadAsync(CancellationToken cancellationToken) + { + if (cancellationToken.IsCancellationRequested) + { + return new ValueTask(Task.FromCanceled(cancellationToken)); + } + + if (!_parent._items.IsEmpty) + { + return new ValueTask(true); + } + + UnboundedChannel parent = _parent; + + lock (parent.SyncObj) + { + parent.AssertInvariants(); + + // Try again to read now that we're synchronized with writers. + if (!parent._items.IsEmpty) + { + return new ValueTask(true); + } + + // There are no items, so if we're done writing, there's never going to be data available. + if (parent._doneWriting != null) + { + return parent._doneWriting != ChannelUtilities.s_doneWritingSentinel ? + new ValueTask(Task.FromException(parent._doneWriting)) : + default; + } + + // If we're able to use the singleton waiter, do so. + if (!cancellationToken.CanBeCanceled) + { + AsyncOperation singleton = _waiterSingleton; + if (singleton.TryOwnAndReset()) + { + ChannelUtilities.QueueWaiter(ref parent._waitingReadersTail, singleton); + return singleton.ValueTaskOfT; + } + } + + // Otherwise, create and queue a waiter. + var waiter = new AsyncOperation(parent._runContinuationsAsynchronously, cancellationToken); + ChannelUtilities.QueueWaiter(ref parent._waitingReadersTail, waiter); + return waiter.ValueTaskOfT; + } + } + + /// Gets the number of items in the channel. This should only be used by the debugger. + private int ItemsCountForDebugger => _parent._items.Count; + + /// Gets an enumerator the debugger can use to show the contents of the channel. + IEnumerator IDebugEnumerable.GetEnumerator() => _parent._items.GetEnumerator(); } - private sealed class UnboundedChannelWriter : ChannelWriter + [DebuggerDisplay("Items={ItemsCountForDebugger}")] + [DebuggerTypeProxy(typeof(DebugEnumeratorDebugView<>))] + private sealed class UnboundedChannelWriter : ChannelWriter, IDebugEnumerable { internal readonly UnboundedChannel _parent; internal UnboundedChannelWriter(UnboundedChannel parent) => _parent = parent; @@ -132,12 +222,11 @@ namespace System.Threading.Channels ChannelUtilities.Complete(parent._completion, error); } - // At this point, _waitingReaders will not be mutated: - // it's only mutated by readers while holding the lock, and only if _doneWriting is null. - // We also know that only one thread (this one) will ever get here, as only that thread - // will be the one to transition from _doneWriting false to true. As such, we can - // freely manipulate _waitingReaders without any concurrency concerns. - ChannelUtilities.WakeUpWaiters(ref parent._waitingReaders, result: false, error: error); + // At this point, _blockedReaders and _waitingReaders will not be mutated: + // they're only mutated by readers while holding the lock, and only if _doneWriting is null. + // freely manipulate _blockedReaders and _waitingReaders without any concurrency concerns. + ChannelUtilities.FailOperations, T>(parent._blockedReaders, ChannelUtilities.CreateInvalidCompletionException(error)); + ChannelUtilities.WakeUpWaiters(ref parent._waitingReadersTail, result: false, error: error); // Successfully transitioned to completed. return true; @@ -148,7 +237,8 @@ namespace System.Threading.Channels UnboundedChannel parent = _parent; while (true) { - ReaderInteractor waitingReaders = null; + AsyncOperation blockedReader = null; + AsyncOperation waitingReadersTail = null; lock (parent.SyncObj) { // If writing has already been marked as done, fail the write. @@ -158,42 +248,70 @@ namespace System.Threading.Channels return false; } - // Add the data to the queue, and let any waiting readers know that they should try to read it. - // We can only complete such waiters here under the lock if they run continuations asynchronously - // (otherwise the synchronous continuations could be invoked under the lock). If we don't complete - // them here, we need to do so outside of the lock. - parent._items.Enqueue(item); - waitingReaders = parent._waitingReaders; - if (waitingReaders == null) + // If there aren't any blocked readers, just add the data to the queue, + // and let any waiting readers know that they should try to read it. + // We can only complete such waiters here under the lock if they run + // continuations asynchronously (otherwise the synchronous continuations + // could be invoked under the lock). If we don't complete them here, we + // need to do so outside of the lock. + if (parent._blockedReaders.IsEmpty) + { + parent._items.Enqueue(item); + waitingReadersTail = parent._waitingReadersTail; + if (waitingReadersTail == null) + { + return true; + } + parent._waitingReadersTail = null; + } + else + { + // There were blocked readers. Grab one, and then complete it outside of the lock. + blockedReader = parent._blockedReaders.DequeueHead(); + } + } + + if (blockedReader != null) + { + // Complete the reader. It's possible the reader was canceled, in which + // case we loop around to try everything again. + if (blockedReader.TrySetResult(item)) { return true; } - parent._waitingReaders = null; } - - // Wake up all of the waiters. Since we've released the lock, it's possible - // we could cause some spurious wake-ups here, if we tell a waiter there's - // something available but all data has already been removed. It's a benign - // race condition, though, as consumers already need to account for such things. - waitingReaders.Success(item: true); - return true; + else + { + // Wake up all of the waiters. Since we've released the lock, it's possible + // we could cause some spurious wake-ups here, if we tell a waiter there's + // something available but all data has already been removed. It's a benign + // race condition, though, as consumers already need to account for such things. + ChannelUtilities.WakeUpWaiters(ref waitingReadersTail, result: true); + return true; + } } } - public override Task WaitToWriteAsync(CancellationToken cancellationToken) + public override ValueTask WaitToWriteAsync(CancellationToken cancellationToken) { Exception doneWriting = _parent._doneWriting; return - cancellationToken.IsCancellationRequested ? Task.FromCanceled(cancellationToken) : - doneWriting == null ? ChannelUtilities.s_trueTask : // unbounded writing can always be done if we haven't completed - doneWriting != ChannelUtilities.s_doneWritingSentinel ? Task.FromException(doneWriting) : - ChannelUtilities.s_falseTask; + cancellationToken.IsCancellationRequested ? new ValueTask(Task.FromCanceled(cancellationToken)) : + doneWriting == null ? new ValueTask(true) : // unbounded writing can always be done if we haven't completed + doneWriting != ChannelUtilities.s_doneWritingSentinel ? new ValueTask(Task.FromException(doneWriting)) : + default; } - public override Task WriteAsync(T item, CancellationToken cancellationToken) => - cancellationToken.IsCancellationRequested ? Task.FromCanceled(cancellationToken) : - TryWrite(item) ? ChannelUtilities.s_trueTask : - Task.FromException(ChannelUtilities.CreateInvalidCompletionException(_parent._doneWriting)); + public override ValueTask WriteAsync(T item, CancellationToken cancellationToken) => + cancellationToken.IsCancellationRequested ? new ValueTask(Task.FromCanceled(cancellationToken)) : + TryWrite(item) ? default : + new ValueTask(Task.FromException(ChannelUtilities.CreateInvalidCompletionException(_parent._doneWriting))); + + /// Gets the number of items in the channel. This should only be used by the debugger. + private int ItemsCountForDebugger => _parent._items.Count; + + /// Gets an enumerator the debugger can use to show the contents of the channel. + IEnumerator IDebugEnumerable.GetEnumerator() => _parent._items.GetEnumerator(); } /// Gets the object used to synchronize access to all state on this instance. @@ -209,11 +327,12 @@ namespace System.Threading.Channels { if (_runContinuationsAsynchronously) { - Debug.Assert(_waitingReaders == null, "There's data available, so there shouldn't be any waiting readers."); + Debug.Assert(_blockedReaders.IsEmpty, "There's data available, so there shouldn't be any blocked readers."); + Debug.Assert(_waitingReadersTail == null, "There's data available, so there shouldn't be any waiting readers."); } Debug.Assert(!_completion.Task.IsCompleted, "We still have data available, so shouldn't be completed."); } - if (_waitingReaders != null && _runContinuationsAsynchronously) + if ((!_blockedReaders.IsEmpty || _waitingReadersTail != null) && _runContinuationsAsynchronously) { Debug.Assert(_items.IsEmpty, "There are blocked/waiting readers, so there shouldn't be any data available."); } @@ -221,11 +340,14 @@ namespace System.Threading.Channels { Debug.Assert(_doneWriting != null, "We're completed, so we must be done writing."); } - } + } /// Gets the number of items in the channel. This should only be used by the debugger. private int ItemsCountForDebugger => _items.Count; + /// Report if the channel is closed or not. This should only be used by the debugger. + private bool ChannelIsClosedForDebugger => _doneWriting != null; + /// Gets an enumerator the debugger can use to show the contents of the channel. IEnumerator IDebugEnumerable.GetEnumerator() => _items.GetEnumerator(); } diff --git a/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/UnbufferedChannel.cs b/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/UnbufferedChannel.cs deleted file mode 100644 index 0cb75b67a5..0000000000 --- a/external/corefx/src/System.Threading.Channels/src/System/Threading/Channels/UnbufferedChannel.cs +++ /dev/null @@ -1,324 +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.Collections.Generic; -using System.Diagnostics; -using System.Threading.Tasks; - -namespace System.Threading.Channels -{ - /// Provides an unbuffered channel, such that a reader and a writer must rendezvous to succeed. - [DebuggerDisplay("Writers Waiting/Blocked: {WaitingWritersForDebugger}/{BlockedWritersCountForDebugger}, Readers Waiting/Blocked: {WaitingReadersForDebugger}/{BlockedReadersCountForDebugger}")] - [DebuggerTypeProxy(typeof(UnbufferedChannel<>.DebugView))] - internal sealed class UnbufferedChannel : Channel - { - /// Task that represents the completion of the channel. - private readonly TaskCompletionSource _completion = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - /// A queue of readers blocked waiting to be matched with a writer. - private readonly Dequeue> _blockedReaders = new Dequeue>(); - /// A queue of writers blocked waiting to be matched with a reader. - private readonly Dequeue> _blockedWriters = new Dequeue>(); - - /// Task signaled when any WaitToReadAsync waiters should be woken up. - private ReaderInteractor _waitingReaders; - /// Task signaled when any WaitToReadAsync waiters should be woken up. - private ReaderInteractor _waitingWriters; - - private sealed class UnbufferedChannelReader : ChannelReader - { - internal readonly UnbufferedChannel _parent; - internal UnbufferedChannelReader(UnbufferedChannel parent) => _parent = parent; - - public override Task Completion => _parent._completion.Task; - - public override bool TryRead(out T item) - { - UnbufferedChannel parent = _parent; - lock (parent.SyncObj) - { - parent.AssertInvariants(); - - // Try to find a writer to pair with - while (!parent._blockedWriters.IsEmpty) - { - WriterInteractor w = parent._blockedWriters.DequeueHead(); - if (w.Success(default)) - { - item = w.Item; - return true; - } - } - } - - // None found - item = default; - return false; - } - - public override ValueTask ReadAsync(CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return new ValueTask(Task.FromCanceled(cancellationToken)); - } - - UnbufferedChannel parent = _parent; - lock (parent.SyncObj) - { - parent.AssertInvariants(); - - // If we're already completed, nothing to read. - if (parent._completion.Task.IsCompleted) - { - return new ValueTask( - parent._completion.Task.IsCanceled ? Task.FromCanceled(new CancellationToken(true)) : - Task.FromException( - parent._completion.Task.IsFaulted ? - ChannelUtilities.CreateInvalidCompletionException(parent._completion.Task.Exception.InnerException) : - ChannelUtilities.CreateInvalidCompletionException())); - } - - // If there are any blocked writers, find one to pair up with - // and get its data. Writers that got canceled will remain in the queue, - // so we need to loop to skip past them. - while (!parent._blockedWriters.IsEmpty) - { - WriterInteractor w = parent._blockedWriters.DequeueHead(); - if (w.Success(default(VoidResult))) - { - return new ValueTask(w.Item); - } - } - - // No writer found to pair with. Queue the reader. - var r = ReaderInteractor.Create(true, cancellationToken); - parent._blockedReaders.EnqueueTail(r); - - // And let any waiting writers know it's their lucky day. - ChannelUtilities.WakeUpWaiters(ref parent._waitingWriters, result: true); - - return new ValueTask(r.Task); - } - } - - public override Task WaitToReadAsync(CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - - UnbufferedChannel parent = _parent; - lock (parent.SyncObj) - { - // If we're done writing, fail. - if (parent._completion.Task.IsCompleted) - { - return parent._completion.Task.IsFaulted ? - Task.FromException(parent._completion.Task.Exception.InnerException) : - ChannelUtilities.s_falseTask; - } - - // If there's a blocked writer, we can read. - if (!parent._blockedWriters.IsEmpty) - { - return ChannelUtilities.s_trueTask; - } - - // Otherwise, queue the waiter. - return ChannelUtilities.GetOrCreateWaiter(ref parent._waitingReaders, runContinuationsAsynchronously: true, cancellationToken); - } - } - } - - private sealed class UnbufferedChannelWriter : ChannelWriter - { - internal readonly UnbufferedChannel _parent; - internal UnbufferedChannelWriter(UnbufferedChannel parent) => _parent = parent; - - public override bool TryComplete(Exception error) - { - UnbufferedChannel parent = _parent; - lock (parent.SyncObj) - { - parent.AssertInvariants(); - - // Mark the channel as being done. Since there's no buffered data, we can complete immediately. - if (parent._completion.Task.IsCompleted) - { - return false; - } - ChannelUtilities.Complete(parent._completion, error); - - // Fail any blocked readers/writers, as there will be no writers/readers to pair them with. - ChannelUtilities.FailInteractors, T>(parent._blockedReaders, ChannelUtilities.CreateInvalidCompletionException(error)); - ChannelUtilities.FailInteractors, VoidResult>(parent._blockedWriters, ChannelUtilities.CreateInvalidCompletionException(error)); - - // Let any waiting readers and writers know there won't be any more data - ChannelUtilities.WakeUpWaiters(ref parent._waitingReaders, result: false, error: error); - ChannelUtilities.WakeUpWaiters(ref parent._waitingWriters, result: false, error: error); - } - - return true; - } - - public override bool TryWrite(T item) - { - UnbufferedChannel parent = _parent; - lock (parent.SyncObj) - { - parent.AssertInvariants(); - - // Try to find a reader to pair with - while (!parent._blockedReaders.IsEmpty) - { - ReaderInteractor r = parent._blockedReaders.DequeueHead(); - if (r.Success(item)) - { - return true; - } - } - } - - // None found - return false; - } - - public override Task WaitToWriteAsync(CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - - UnbufferedChannel parent = _parent; - lock (parent.SyncObj) - { - // If we're done writing, fail. - if (parent._completion.Task.IsCompleted) - { - return parent._completion.Task.IsFaulted ? - Task.FromException(parent._completion.Task.Exception.InnerException) : - ChannelUtilities.s_falseTask; - } - - // If there's a blocked reader, we can write - if (!parent._blockedReaders.IsEmpty) - { - return ChannelUtilities.s_trueTask; - } - - // Otherwise, queue the writer - return ChannelUtilities.GetOrCreateWaiter(ref parent._waitingWriters, true, cancellationToken); - } - } - - public override Task WriteAsync(T item, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - - UnbufferedChannel parent = _parent; - lock (parent.SyncObj) - { - // Fail if we've already completed - if (parent._completion.Task.IsCompleted) - { - return - parent._completion.Task.IsCanceled ? Task.FromCanceled(new CancellationToken(true)) : - Task.FromException( - parent._completion.Task.IsFaulted ? - ChannelUtilities.CreateInvalidCompletionException(parent._completion.Task.Exception.InnerException) : - ChannelUtilities.CreateInvalidCompletionException()); - } - - // Try to find a reader to pair with. Canceled readers remain in the queue, - // so we need to loop until we find one. - while (!parent._blockedReaders.IsEmpty) - { - ReaderInteractor r = parent._blockedReaders.DequeueHead(); - if (r.Success(item)) - { - return Task.CompletedTask; - } - } - - // No reader was available. Queue the writer. - var w = WriterInteractor.Create(true, item, cancellationToken); - parent._blockedWriters.EnqueueTail(w); - - // And let any waiting readers know it's their lucky day. - ChannelUtilities.WakeUpWaiters(ref parent._waitingReaders, result: true); - - return w.Task; - } - } - } - - /// Initialize the channel. - internal UnbufferedChannel() - { - base.Reader = new UnbufferedChannelReader(this); - Writer = new UnbufferedChannelWriter(this); - } - - /// Gets an object used to synchronize all state on the instance. - private object SyncObj => _completion; - - [Conditional("DEBUG")] - private void AssertInvariants() - { - Debug.Assert(SyncObj != null, "The sync obj must not be null."); - Debug.Assert(Monitor.IsEntered(SyncObj), "Invariants can only be validated while holding the lock."); - - if (!_blockedReaders.IsEmpty) - { - Debug.Assert(_blockedWriters.IsEmpty, "If there are blocked readers, there can't be blocked writers."); - } - if (!_blockedWriters.IsEmpty) - { - Debug.Assert(_blockedReaders.IsEmpty, "If there are blocked writers, there can't be blocked readers."); - } - if (_completion.Task.IsCompleted) - { - Debug.Assert(_blockedReaders.IsEmpty, "No readers can be blocked after we've completed."); - Debug.Assert(_blockedWriters.IsEmpty, "No writers can be blocked after we've completed."); - } - } - - /// Gets whether there are any waiting writers. This should only be used by the debugger. - private bool WaitingWritersForDebugger => _waitingWriters != null; - /// Gets whether there are any waiting readers. This should only be used by the debugger. - private bool WaitingReadersForDebugger => _waitingReaders != null; - /// Gets the number of blocked writers. This should only be used by the debugger. - private int BlockedWritersCountForDebugger => _blockedWriters.Count; - /// Gets the number of blocked readers. This should only be used by the debugger. - private int BlockedReadersCountForDebugger => _blockedReaders.Count; - - private sealed class DebugView - { - private readonly UnbufferedChannel _channel; - - public DebugView(UnbufferedChannel channel) => _channel = channel; - - public bool WaitingReaders => _channel._waitingReaders != null; - public bool WaitingWriters => _channel._waitingWriters != null; - public int BlockedReaders => _channel._blockedReaders.Count; - public T[] BlockedWriters - { - get - { - var items = new List(); - foreach (WriterInteractor blockedWriter in _channel._blockedWriters) - { - items.Add(blockedWriter.Item); - } - return items.ToArray(); - } - } - } - } -} diff --git a/external/corefx/src/System.Threading.Channels/tests/BoundedChannelTests.cs b/external/corefx/src/System.Threading.Channels/tests/BoundedChannelTests.cs index b19bc8605a..903d85c2a0 100644 --- a/external/corefx/src/System.Threading.Channels/tests/BoundedChannelTests.cs +++ b/external/corefx/src/System.Threading.Channels/tests/BoundedChannelTests.cs @@ -1,5 +1,6 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// 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.Threading.Tasks; using Xunit; @@ -8,11 +9,11 @@ namespace System.Threading.Channels.Tests { public class BoundedChannelTests : ChannelTestBase { - protected override Channel CreateChannel() => Channel.CreateBounded(1); - protected override Channel CreateFullChannel() + protected override Channel CreateChannel() => Channel.CreateBounded(new BoundedChannelOptions(1) { AllowSynchronousContinuations = AllowSynchronousContinuations }); + protected override Channel CreateFullChannel() { - var c = Channel.CreateBounded(1); - c.Writer.WriteAsync(42).Wait(); + var c = Channel.CreateBounded(new BoundedChannelOptions(1) { AllowSynchronousContinuations = AllowSynchronousContinuations }); + c.Writer.WriteAsync(default).AsTask().Wait(); return c; } @@ -217,16 +218,16 @@ namespace System.Threading.Channels.Tests public async Task CancelPendingWrite_Reading_DataTransferredFromCorrectWriter() { var c = Channel.CreateBounded(1); - Assert.Equal(TaskStatus.RanToCompletion, c.Writer.WriteAsync(42).Status); + Assert.True(c.Writer.WriteAsync(42).IsCompletedSuccessfully); var cts = new CancellationTokenSource(); - Task write1 = c.Writer.WriteAsync(43, cts.Token); + Task write1 = c.Writer.WriteAsync(43, cts.Token).AsTask(); Assert.Equal(TaskStatus.WaitingForActivation, write1.Status); cts.Cancel(); - Task write2 = c.Writer.WriteAsync(44); + Task write2 = c.Writer.WriteAsync(44).AsTask(); Assert.Equal(42, await c.Reader.ReadAsync()); Assert.Equal(44, await c.Reader.ReadAsync()); @@ -341,10 +342,10 @@ namespace System.Threading.Channels.Tests var c = Channel.CreateBounded(1); Assert.True(c.Writer.TryWrite(1)); - Task write1 = c.Writer.WaitToWriteAsync(); + Task write1 = c.Writer.WaitToWriteAsync().AsTask(); Assert.False(write1.IsCompleted); - Task write2 = c.Writer.WaitToWriteAsync(); + Task write2 = c.Writer.WaitToWriteAsync().AsTask(); Assert.False(write2.IsCompleted); Assert.Equal(1, await c.Reader.ReadAsync()); @@ -361,12 +362,12 @@ namespace System.Threading.Channels.Tests var c = Channel.CreateBounded(new BoundedChannelOptions(1) { AllowSynchronousContinuations = allowSynchronousContinuations }); int expectedId = Environment.CurrentManagedThreadId; - Task r = c.Reader.WaitToReadAsync().ContinueWith(_ => + Task r = c.Reader.WaitToReadAsync().AsTask().ContinueWith(_ => { Assert.Equal(allowSynchronousContinuations, expectedId == Environment.CurrentManagedThreadId); }, CancellationToken.None, TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default); - Assert.Equal(TaskStatus.RanToCompletion, c.Writer.WriteAsync(42).Status); + Assert.True(c.Writer.WriteAsync(42).IsCompletedSuccessfully); ((IAsyncResult)r).AsyncWaitHandle.WaitOne(); // avoid inlining the continuation r.GetAwaiter().GetResult(); } @@ -390,13 +391,13 @@ namespace System.Threading.Channels.Tests } [Fact] - public void TryWrite_NoBlockedReaders_WaitingReader_WaiterNotifified() + public async Task TryWrite_NoBlockedReaders_WaitingReader_WaiterNotified() { Channel c = CreateChannel(); - Task r = c.Reader.WaitToReadAsync(); + Task r = c.Reader.WaitToReadAsync().AsTask(); Assert.True(c.Writer.TryWrite(42)); - AssertSynchronousTrue(r); + Assert.True(await r); } } } diff --git a/external/corefx/src/System.Threading.Channels/tests/ChannelClosedExceptionTests.cs b/external/corefx/src/System.Threading.Channels/tests/ChannelClosedExceptionTests.cs index 38a1e9bb50..01a3b34ee5 100644 --- a/external/corefx/src/System.Threading.Channels/tests/ChannelClosedExceptionTests.cs +++ b/external/corefx/src/System.Threading.Channels/tests/ChannelClosedExceptionTests.cs @@ -1,5 +1,6 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// 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 Xunit; diff --git a/external/corefx/src/System.Threading.Channels/tests/ChannelTestBase.cs b/external/corefx/src/System.Threading.Channels/tests/ChannelTestBase.cs index 3260dbf2f9..1572c655cf 100644 --- a/external/corefx/src/System.Threading.Channels/tests/ChannelTestBase.cs +++ b/external/corefx/src/System.Threading.Channels/tests/ChannelTestBase.cs @@ -1,9 +1,11 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// 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.Collections.Generic; using System.Diagnostics; using System.Linq; +using System.Runtime.CompilerServices; using System.Threading.Tasks; using Xunit; @@ -11,9 +13,13 @@ namespace System.Threading.Channels.Tests { public abstract class ChannelTestBase : TestBase { - protected abstract Channel CreateChannel(); - protected abstract Channel CreateFullChannel(); + protected Channel CreateChannel() => CreateChannel(); + protected abstract Channel CreateChannel(); + protected Channel CreateFullChannel() => CreateFullChannel(); + protected abstract Channel CreateFullChannel(); + + protected virtual bool AllowSynchronousContinuations => false; protected virtual bool RequiresSingleReader => false; protected virtual bool RequiresSingleWriter => false; protected virtual bool BuffersItems => true; @@ -78,10 +84,10 @@ namespace System.Threading.Channels.Tests public async Task Complete_BeforeEmpty_WaitingReaders_TriggersCompletion() { Channel c = CreateChannel(); - Task read = c.Reader.ReadAsync().AsTask(); + ValueTask read = c.Reader.ReadAsync(); c.Writer.Complete(); await c.Reader.Completion; - await Assert.ThrowsAnyAsync(() => read); + await Assert.ThrowsAnyAsync(async () => await read); } [Fact] @@ -246,18 +252,18 @@ namespace System.Threading.Channels.Tests public void WaitToReadAsync_DataAvailableBefore_CompletesSynchronously() { Channel c = CreateChannel(); - Task write = c.Writer.WriteAsync(42); - Task read = c.Reader.WaitToReadAsync(); - Assert.Equal(TaskStatus.RanToCompletion, read.Status); + ValueTask write = c.Writer.WriteAsync(42); + ValueTask read = c.Reader.WaitToReadAsync(); + Assert.True(read.IsCompletedSuccessfully); } [Fact] public void WaitToReadAsync_DataAvailableAfter_CompletesAsynchronously() { Channel c = CreateChannel(); - Task read = c.Reader.WaitToReadAsync(); + ValueTask read = c.Reader.WaitToReadAsync(); Assert.False(read.IsCompleted); - Task write = c.Writer.WriteAsync(42); + ValueTask write = c.Writer.WriteAsync(42); Assert.True(read.Result); } @@ -266,8 +272,8 @@ namespace System.Threading.Channels.Tests { Channel c = CreateChannel(); c.Writer.Complete(); - Task read = c.Reader.WaitToReadAsync(); - Assert.Equal(TaskStatus.RanToCompletion, read.Status); + ValueTask read = c.Reader.WaitToReadAsync(); + Assert.True(read.IsCompletedSuccessfully); Assert.False(read.Result); } @@ -275,7 +281,7 @@ namespace System.Threading.Channels.Tests public void WaitToReadAsync_BeforeComplete_AsynchronouslyCompletes() { Channel c = CreateChannel(); - Task read = c.Reader.WaitToReadAsync(); + ValueTask read = c.Reader.WaitToReadAsync(); Assert.False(read.IsCompleted); c.Writer.Complete(); Assert.False(read.Result); @@ -286,8 +292,8 @@ namespace System.Threading.Channels.Tests { Channel c = CreateChannel(); c.Writer.Complete(); - Task write = c.Writer.WaitToWriteAsync(); - Assert.Equal(TaskStatus.RanToCompletion, write.Status); + ValueTask write = c.Writer.WaitToWriteAsync(); + Assert.True(write.IsCompletedSuccessfully); Assert.False(write.Result); } @@ -300,8 +306,8 @@ namespace System.Threading.Channels.Tests } Channel c = CreateChannel(); - Task write = c.Writer.WaitToWriteAsync(); - Assert.Equal(TaskStatus.RanToCompletion, write.Status); + ValueTask write = c.Writer.WaitToWriteAsync(); + Assert.True(write.IsCompletedSuccessfully); Assert.True(write.Result); } @@ -315,7 +321,7 @@ namespace System.Threading.Channels.Tests Channel c = CreateChannel(); - Task[] writers = Enumerable.Range(0, 100).Select(_ => c.Writer.WaitToWriteAsync()).ToArray(); + Task[] writers = Enumerable.Range(0, 100).Select(_ => c.Writer.WaitToWriteAsync().AsTask()).ToArray(); Task[] readers = Enumerable.Range(0, 100).Select(_ => c.Reader.ReadAsync().AsTask()).ToArray(); await Task.WhenAll(writers); @@ -333,7 +339,7 @@ namespace System.Threading.Channels.Tests public void TryRead_DataAvailable_Success() { Channel c = CreateChannel(); - Task write = c.Writer.WriteAsync(42); + ValueTask write = c.Writer.WriteAsync(42); Assert.True(c.Reader.TryRead(out int result)); Assert.Equal(42, result); } @@ -359,7 +365,7 @@ namespace System.Threading.Channels.Tests { Channel c = CreateChannel(); c.Writer.Complete(); - await Assert.ThrowsAnyAsync(() => c.Writer.WriteAsync(42)); + await Assert.ThrowsAnyAsync(async () => await c.Writer.WriteAsync(42)); } [Fact] @@ -392,10 +398,10 @@ namespace System.Threading.Channels.Tests Channel c = CreateFullChannel(); if (c != null) { - Task write = c.Writer.WriteAsync(42); + ValueTask write = c.Writer.WriteAsync(42); var exc = new FormatException(); c.Writer.Complete(exc); - Assert.Same(exc, (await Assert.ThrowsAsync(() => write)).InnerException); + Assert.Same(exc, (await Assert.ThrowsAsync(async () => await write)).InnerException); } } @@ -405,18 +411,18 @@ namespace System.Threading.Channels.Tests Channel c = CreateChannel(); var exc = new FormatException(); c.Writer.Complete(exc); - Task write = c.Writer.WriteAsync(42); - Assert.Same(exc, (await Assert.ThrowsAsync(() => write)).InnerException); + ValueTask write = c.Writer.WriteAsync(42); + Assert.Same(exc, (await Assert.ThrowsAsync(async () => await write)).InnerException); } [Fact] public async Task Complete_WithException_PropagatesToExistingWaitingReader() { Channel c = CreateChannel(); - Task read = c.Reader.WaitToReadAsync(); + ValueTask read = c.Reader.WaitToReadAsync(); var exc = new FormatException(); c.Writer.Complete(exc); - await Assert.ThrowsAsync(() => read); + await Assert.ThrowsAsync(async () => await read); } [Fact] @@ -425,8 +431,8 @@ namespace System.Threading.Channels.Tests Channel c = CreateChannel(); var exc = new FormatException(); c.Writer.Complete(exc); - Task read = c.Reader.WaitToReadAsync(); - await Assert.ThrowsAsync(() => read); + ValueTask read = c.Reader.WaitToReadAsync(); + await Assert.ThrowsAsync(async () => await read); } [Fact] @@ -435,8 +441,8 @@ namespace System.Threading.Channels.Tests Channel c = CreateChannel(); var exc = new FormatException(); c.Writer.Complete(exc); - Task write = c.Writer.WaitToWriteAsync(); - await Assert.ThrowsAsync(() => write); + ValueTask write = c.Writer.WaitToWriteAsync(); + await Assert.ThrowsAsync(async () => await write); } [Theory] @@ -453,7 +459,7 @@ namespace System.Threading.Channels.Tests const int NumItems = 2000; - Task[] writers = new Task[NumItems]; + ValueTask[] writers = new ValueTask[NumItems]; for (int i = 0; i < writers.Length; i++) { writers[i] = c.Writer.WriteAsync(i); @@ -475,11 +481,11 @@ namespace System.Threading.Channels.Tests { Channel c = CreateChannel(); - Task writeTask = c.Writer.WriteAsync(42, new CancellationToken(true)); - Assert.Equal(TaskStatus.Canceled, writeTask.Status); + ValueTask writeTask = c.Writer.WriteAsync(42, new CancellationToken(true)); + Assert.True(writeTask.IsCanceled); - Task waitTask = c.Writer.WaitToWriteAsync(new CancellationToken(true)); - Assert.Equal(TaskStatus.Canceled, waitTask.Status); + ValueTask waitTask = c.Writer.WaitToWriteAsync(new CancellationToken(true)); + Assert.True(writeTask.IsCanceled); } [Fact] @@ -490,13 +496,19 @@ namespace System.Threading.Channels.Tests AssertSynchronousTrue(c.Reader.WaitToReadAsync()); } - [Fact] - public void Precancellation_WaitToReadAsync_ReturnsImmediately() + [Theory] + [InlineData(false)] + [InlineData(true)] + public void Precancellation_WaitToReadAsync_ReturnsImmediately(bool dataAvailable) { Channel c = CreateChannel(); + if (dataAvailable) + { + Assert.True(c.Writer.TryWrite(42)); + } - Task writeTask = c.Reader.WaitToReadAsync(new CancellationToken(true)); - Assert.Equal(TaskStatus.Canceled, writeTask.Status); + ValueTask waitTask = c.Reader.WaitToReadAsync(new CancellationToken(true)); + Assert.True(waitTask.IsCanceled); } [Theory] @@ -507,10 +519,10 @@ namespace System.Threading.Channels.Tests Channel c = CreateChannel(); CancellationToken token = cancelable ? new CancellationTokenSource().Token : default; - Task read = c.Reader.WaitToReadAsync(token); + ValueTask read = c.Reader.WaitToReadAsync(token); Assert.False(read.IsCompleted); - Task write = c.Writer.WriteAsync(42, token); + ValueTask write = c.Writer.WriteAsync(42, token); Assert.True(await read); } @@ -521,10 +533,10 @@ namespace System.Threading.Channels.Tests Channel c = CreateChannel(); var cts = new CancellationTokenSource(); - Task read = c.Reader.WaitToReadAsync(cts.Token); + ValueTask read = c.Reader.WaitToReadAsync(cts.Token); Assert.False(read.IsCompleted); cts.Cancel(); - await Assert.ThrowsAnyAsync(() => read); + await Assert.ThrowsAnyAsync(async () => await read); } [Fact] @@ -535,7 +547,7 @@ namespace System.Threading.Channels.Tests ValueTask r = c.Reader.ReadAsync(); Assert.False(r.IsCompleted); - Task w = c.Writer.WriteAsync(42); + ValueTask w = c.Writer.WriteAsync(42); AssertSynchronousSuccess(w); Assert.Equal(42, await r); @@ -546,21 +558,27 @@ namespace System.Threading.Channels.Tests { Channel c = CreateChannel(); - Task w = c.Writer.WriteAsync(42); + ValueTask w = c.Writer.WriteAsync(42); ValueTask r = c.Reader.ReadAsync(); - await Task.WhenAll(w, r.AsTask()); + await Task.WhenAll(w.AsTask(), r.AsTask()); Assert.Equal(42, await r); } - [Fact] - public void ReadAsync_Precanceled_CanceledSynchronously() + [Theory] + [InlineData(false)] + [InlineData(true)] + public void Precancellation_ReadAsync_ReturnsImmediately(bool dataAvailable) { Channel c = CreateChannel(); - var cts = new CancellationTokenSource(); - cts.Cancel(); - AssertSynchronouslyCanceled(c.Reader.ReadAsync(cts.Token).AsTask(), cts.Token); + if (dataAvailable) + { + Assert.True(c.Writer.TryWrite(42)); + } + + ValueTask readTask = c.Reader.ReadAsync(new CancellationToken(true)); + Assert.True(readTask.IsCanceled); } [Fact] @@ -613,8 +631,8 @@ namespace System.Threading.Channels.Tests Channel c = CreateChannel(); const int Items = 100; - ValueTask[] readers = (from i in Enumerable.Range(0, Items) select c.Reader.ReadAsync()).ToArray(); - var remainingReaders = new List>(readers.Select(r => r.AsTask())); + Task[] readers = (from i in Enumerable.Range(0, Items) select c.Reader.ReadAsync().AsTask()).ToArray(); + var remainingReaders = new List>(readers); for (int i = 0; i < Items; i++) { @@ -624,7 +642,7 @@ namespace System.Threading.Channels.Tests remainingReaders.Remove(r); } - Assert.Equal((Items * (Items - 1)) / 2, Enumerable.Sum(await Task.WhenAll(readers.Select(r => r.AsTask())))); + Assert.Equal((Items * (Items - 1)) / 2, Enumerable.Sum(await Task.WhenAll(readers))); } [Fact] @@ -690,5 +708,520 @@ namespace System.Threading.Channels.Tests Assert.Equal(i, await r); } } + + [Fact] + public async Task ReadAsync_ConsecutiveReadsSucceed() + { + Channel c = CreateChannel(); + for (int i = 0; i < 5; i++) + { + ValueTask r = c.Reader.ReadAsync(); + await c.Writer.WriteAsync(i); + Assert.Equal(i, await r); + } + } + + [Fact] + public async Task WaitToReadAsync_ConsecutiveReadsSucceed() + { + Channel c = CreateChannel(); + for (int i = 0; i < 5; i++) + { + ValueTask r = c.Reader.WaitToReadAsync(); + await c.Writer.WriteAsync(i); + Assert.True(await r); + Assert.True(c.Reader.TryRead(out int item)); + Assert.Equal(i, item); + } + } + + [Theory] + [InlineData(false, null)] + [InlineData(false, false)] + [InlineData(false, true)] + [InlineData(true, null)] + [InlineData(true, false)] + [InlineData(true, true)] + public void WaitToReadAsync_MultipleContinuations_Throws(bool onCompleted, bool? continueOnCapturedContext) + { + Channel c = CreateChannel(); + + ValueTask read = c.Reader.WaitToReadAsync(); + switch (continueOnCapturedContext) + { + case null: + if (onCompleted) + { + read.GetAwaiter().OnCompleted(() => { }); + Assert.Throws(() => read.GetAwaiter().OnCompleted(() => { })); + } + else + { + read.GetAwaiter().UnsafeOnCompleted(() => { }); + Assert.Throws(() => read.GetAwaiter().UnsafeOnCompleted(() => { })); + } + break; + + default: + if (onCompleted) + { + read.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().OnCompleted(() => { }); + Assert.Throws(() => read.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().OnCompleted(() => { })); + } + else + { + read.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().UnsafeOnCompleted(() => { }); + Assert.Throws(() => read.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().UnsafeOnCompleted(() => { })); + } + break; + } + } + + [Theory] + [InlineData(false, null)] + [InlineData(false, false)] + [InlineData(false, true)] + [InlineData(true, null)] + [InlineData(true, false)] + [InlineData(true, true)] + public void ReadAsync_MultipleContinuations_Throws(bool onCompleted, bool? continueOnCapturedContext) + { + Channel c = CreateChannel(); + + ValueTask read = c.Reader.ReadAsync(); + switch (continueOnCapturedContext) + { + case null: + if (onCompleted) + { + read.GetAwaiter().OnCompleted(() => { }); + Assert.Throws(() => read.GetAwaiter().OnCompleted(() => { })); + } + else + { + read.GetAwaiter().UnsafeOnCompleted(() => { }); + Assert.Throws(() => read.GetAwaiter().UnsafeOnCompleted(() => { })); + } + break; + + default: + if (onCompleted) + { + read.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().OnCompleted(() => { }); + Assert.Throws(() => read.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().OnCompleted(() => { })); + } + else + { + read.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().UnsafeOnCompleted(() => { }); + Assert.Throws(() => read.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().UnsafeOnCompleted(() => { })); + } + break; + } + } + + [Fact] + public async Task WaitToReadAsync_AwaitThenGetResult_Throws() + { + Channel c = CreateChannel(); + + ValueTask read = c.Reader.WaitToReadAsync(); + Assert.True(c.Writer.TryWrite(42)); + Assert.True(await read); + Assert.Throws(() => read.GetAwaiter().IsCompleted); + Assert.Throws(() => read.GetAwaiter().OnCompleted(() => { })); + Assert.Throws(() => read.GetAwaiter().GetResult()); + } + + [Fact] + public async Task ReadAsync_AwaitThenGetResult_Throws() + { + Channel c = CreateChannel(); + + ValueTask read = c.Reader.ReadAsync(); + Assert.True(c.Writer.TryWrite(42)); + Assert.Equal(42, await read); + Assert.Throws(() => read.GetAwaiter().IsCompleted); + Assert.Throws(() => read.GetAwaiter().OnCompleted(() => { })); + Assert.Throws(() => read.GetAwaiter().GetResult()); + } + + [Fact] + public async Task WaitToWriteAsync_AwaitThenGetResult_Throws() + { + Channel c = CreateFullChannel(); + if (c == null) + { + return; + } + + ValueTask write = c.Writer.WaitToWriteAsync(); + await c.Reader.ReadAsync(); + Assert.True(await write); + Assert.Throws(() => write.GetAwaiter().IsCompleted); + Assert.Throws(() => write.GetAwaiter().OnCompleted(() => { })); + Assert.Throws(() => write.GetAwaiter().GetResult()); + } + + [Fact] + public async Task WriteAsync_AwaitThenGetResult_Throws() + { + Channel c = CreateFullChannel(); + if (c == null) + { + return; + } + + ValueTask write = c.Writer.WriteAsync(42); + await c.Reader.ReadAsync(); + await write; + Assert.Throws(() => write.GetAwaiter().IsCompleted); + Assert.Throws(() => write.GetAwaiter().OnCompleted(() => { })); + Assert.Throws(() => write.GetAwaiter().GetResult()); + } + + [Theory] + [InlineData(false, null)] + [InlineData(false, false)] + [InlineData(false, true)] + [InlineData(true, null)] + [InlineData(true, false)] + [InlineData(true, true)] + public void WaitToWriteAsync_MultipleContinuations_Throws(bool onCompleted, bool? continueOnCapturedContext) + { + Channel c = CreateFullChannel(); + if (c == null) + { + return; + } + + ValueTask write = c.Writer.WaitToWriteAsync(); + switch (continueOnCapturedContext) + { + case null: + if (onCompleted) + { + write.GetAwaiter().OnCompleted(() => { }); + Assert.Throws(() => write.GetAwaiter().OnCompleted(() => { })); + } + else + { + write.GetAwaiter().UnsafeOnCompleted(() => { }); + Assert.Throws(() => write.GetAwaiter().UnsafeOnCompleted(() => { })); + } + break; + + default: + if (onCompleted) + { + write.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().OnCompleted(() => { }); + Assert.Throws(() => write.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().OnCompleted(() => { })); + } + else + { + write.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().UnsafeOnCompleted(() => { }); + Assert.Throws(() => write.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().UnsafeOnCompleted(() => { })); + } + break; + } + } + + [Theory] + [InlineData(false, null)] + [InlineData(false, false)] + [InlineData(false, true)] + [InlineData(true, null)] + [InlineData(true, false)] + [InlineData(true, true)] + public void WriteAsync_MultipleContinuations_Throws(bool onCompleted, bool? continueOnCapturedContext) + { + Channel c = CreateFullChannel(); + if (c == null) + { + return; + } + + ValueTask write = c.Writer.WriteAsync(42); + switch (continueOnCapturedContext) + { + case null: + if (onCompleted) + { + write.GetAwaiter().OnCompleted(() => { }); + Assert.Throws(() => write.GetAwaiter().OnCompleted(() => { })); + } + else + { + write.GetAwaiter().UnsafeOnCompleted(() => { }); + Assert.Throws(() => write.GetAwaiter().UnsafeOnCompleted(() => { })); + } + break; + + default: + if (onCompleted) + { + write.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().OnCompleted(() => { }); + Assert.Throws(() => write.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().OnCompleted(() => { })); + } + else + { + write.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().UnsafeOnCompleted(() => { }); + Assert.Throws(() => write.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().UnsafeOnCompleted(() => { })); + } + break; + } + } + + public static IEnumerable Reader_ContinuesOnCurrentContextIfDesired_MemberData() => + from readOrWait in new[] { true, false } + from completeBeforeOnCompleted in new[] { true, false } + from flowExecutionContext in new[] { true, false } + from continueOnCapturedContext in new bool?[] { null, false, true } + select new object[] { readOrWait, completeBeforeOnCompleted, flowExecutionContext, continueOnCapturedContext }; + + [Theory] + [MemberData(nameof(Reader_ContinuesOnCurrentContextIfDesired_MemberData))] + public async Task Reader_ContinuesOnCurrentSynchronizationContextIfDesired( + bool readOrWait, bool completeBeforeOnCompleted, bool flowExecutionContext, bool? continueOnCapturedContext) + { + if (AllowSynchronousContinuations) + { + return; + } + + await Task.Run(async () => + { + Assert.Null(SynchronizationContext.Current); + + Channel c = CreateChannel(); + ValueTask vt = readOrWait ? + c.Reader.ReadAsync() : + c.Reader.WaitToReadAsync(); + + var continuationRan = new TaskCompletionSource(); + var asyncLocal = new AsyncLocal(); + bool schedulerWasFlowed = false; + bool executionContextWasFlowed = false; + Action continuation = () => + { + schedulerWasFlowed = SynchronizationContext.Current is CustomSynchronizationContext; + executionContextWasFlowed = 42 == asyncLocal.Value; + continuationRan.SetResult(true); + }; + + if (completeBeforeOnCompleted) + { + Assert.False(vt.IsCompleted); + Assert.False(vt.IsCompletedSuccessfully); + c.Writer.TryWrite(true); + } + + SynchronizationContext.SetSynchronizationContext(new CustomSynchronizationContext()); + asyncLocal.Value = 42; + switch (continueOnCapturedContext) + { + case null: + if (flowExecutionContext) + { + vt.GetAwaiter().OnCompleted(continuation); + } + else + { + vt.GetAwaiter().UnsafeOnCompleted(continuation); + } + break; + default: + if (flowExecutionContext) + { + vt.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().OnCompleted(continuation); + } + else + { + vt.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().UnsafeOnCompleted(continuation); + } + break; + } + asyncLocal.Value = 0; + SynchronizationContext.SetSynchronizationContext(null); + + if (!completeBeforeOnCompleted) + { + Assert.False(vt.IsCompleted); + Assert.False(vt.IsCompletedSuccessfully); + c.Writer.TryWrite(true); + } + + await continuationRan.Task; + Assert.True(vt.IsCompleted); + Assert.True(vt.IsCompletedSuccessfully); + + Assert.Equal(continueOnCapturedContext != false, schedulerWasFlowed); + if (completeBeforeOnCompleted) // OnCompleted will simply queue using a mechanism that happens to flow + { + Assert.True(executionContextWasFlowed); + } + else + { + Assert.Equal(flowExecutionContext, executionContextWasFlowed); + } + }); + } + + [Theory] + [MemberData(nameof(Reader_ContinuesOnCurrentContextIfDesired_MemberData))] + public async Task Reader_ContinuesOnCurrentTaskSchedulerIfDesired( + bool readOrWait, bool completeBeforeOnCompleted, bool flowExecutionContext, bool? continueOnCapturedContext) + { + if (AllowSynchronousContinuations) + { + return; + } + + await Task.Run(async () => + { + Assert.Null(SynchronizationContext.Current); + + Channel c = CreateChannel(); + ValueTask vt = readOrWait ? + c.Reader.ReadAsync() : + c.Reader.WaitToReadAsync(); + + var continuationRan = new TaskCompletionSource(); + var asyncLocal = new AsyncLocal(); + bool schedulerWasFlowed = false; + bool executionContextWasFlowed = false; + Action continuation = () => + { + schedulerWasFlowed = TaskScheduler.Current is CustomTaskScheduler; + executionContextWasFlowed = 42 == asyncLocal.Value; + continuationRan.SetResult(true); + }; + + if (completeBeforeOnCompleted) + { + Assert.False(vt.IsCompleted); + Assert.False(vt.IsCompletedSuccessfully); + c.Writer.TryWrite(true); + } + + await Task.Factory.StartNew(() => + { + Assert.IsType(TaskScheduler.Current); + asyncLocal.Value = 42; + switch (continueOnCapturedContext) + { + case null: + if (flowExecutionContext) + { + vt.GetAwaiter().OnCompleted(continuation); + } + else + { + vt.GetAwaiter().UnsafeOnCompleted(continuation); + } + break; + default: + if (flowExecutionContext) + { + vt.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().OnCompleted(continuation); + } + else + { + vt.ConfigureAwait(continueOnCapturedContext.Value).GetAwaiter().UnsafeOnCompleted(continuation); + } + break; + } + asyncLocal.Value = 0; + }, CancellationToken.None, TaskCreationOptions.None, new CustomTaskScheduler()); + + if (!completeBeforeOnCompleted) + { + Assert.False(vt.IsCompleted); + Assert.False(vt.IsCompletedSuccessfully); + c.Writer.TryWrite(true); + } + + await continuationRan.Task; + Assert.True(vt.IsCompleted); + Assert.True(vt.IsCompletedSuccessfully); + + Assert.Equal(continueOnCapturedContext != false, schedulerWasFlowed); + if (completeBeforeOnCompleted) // OnCompleted will simply queue using a mechanism that happens to flow + { + Assert.True(executionContextWasFlowed); + } + else + { + Assert.Equal(flowExecutionContext, executionContextWasFlowed); + } + }); + } + + [Fact] + public void ValueTask_GetResultWhenNotCompleted_Throws() + { + ValueTaskAwaiter readVt = CreateChannel().Reader.ReadAsync().GetAwaiter(); + Assert.Throws(() => readVt.GetResult()); + + ValueTaskAwaiter waitReadVt = CreateChannel().Reader.WaitToReadAsync().GetAwaiter(); + Assert.Throws(() => waitReadVt.GetResult()); + + if (CreateFullChannel() != null) + { + ValueTaskAwaiter writeVt = CreateFullChannel().Writer.WriteAsync(42).GetAwaiter(); + Assert.Throws(() => writeVt.GetResult()); + + ValueTaskAwaiter waitWriteVt = CreateFullChannel().Writer.WaitToWriteAsync().GetAwaiter(); + Assert.Throws(() => waitWriteVt.GetResult()); + } + } + + [Fact] + public void ValueTask_MultipleContinuations_Throws() + { + ValueTaskAwaiter readVt = CreateChannel().Reader.ReadAsync().GetAwaiter(); + readVt.OnCompleted(() => { }); + Assert.Throws(() => readVt.OnCompleted(() => { })); + + ValueTaskAwaiter waitReadVt = CreateChannel().Reader.WaitToReadAsync().GetAwaiter(); + waitReadVt.OnCompleted(() => { }); + Assert.Throws(() => waitReadVt.OnCompleted(() => { })); + + if (CreateFullChannel() != null) + { + ValueTaskAwaiter writeVt = CreateFullChannel().Writer.WriteAsync(42).GetAwaiter(); + writeVt.OnCompleted(() => { }); + Assert.Throws(() => writeVt.OnCompleted(() => { })); + + ValueTaskAwaiter waitWriteVt = CreateFullChannel().Writer.WaitToWriteAsync().GetAwaiter(); + waitWriteVt.OnCompleted(() => { }); + Assert.Throws(() => waitWriteVt.OnCompleted(() => { })); + } + } + + private sealed class CustomSynchronizationContext : SynchronizationContext + { + public override void Post(SendOrPostCallback d, object state) + { + ThreadPool.QueueUserWorkItem(delegate + { + SetSynchronizationContext(this); + try + { + d(state); + } + finally + { + SetSynchronizationContext(null); + } + }, null); + } + } + + private sealed class CustomTaskScheduler : TaskScheduler + { + protected override void QueueTask(Task task) => ThreadPool.QueueUserWorkItem(_ => TryExecuteTask(task)); + protected override bool TryExecuteTaskInline(Task task, bool taskWasPreviouslyQueued) => false; + protected override IEnumerable GetScheduledTasks() => null; + } } } diff --git a/external/corefx/src/System.Threading.Channels/tests/ChannelTests.cs b/external/corefx/src/System.Threading.Channels/tests/ChannelTests.cs index 26cf71448d..c9147750fc 100644 --- a/external/corefx/src/System.Threading.Channels/tests/ChannelTests.cs +++ b/external/corefx/src/System.Threading.Channels/tests/ChannelTests.cs @@ -50,9 +50,6 @@ namespace System.Threading.Channels.Tests Assert.NotNull(Channel.CreateBounded(1)); Assert.NotNull(Channel.CreateBounded(new BoundedChannelOptions(1))); - Assert.NotNull(Channel.CreateUnbuffered()); - Assert.NotNull(Channel.CreateUnbuffered(new UnbufferedChannelOptions())); - Assert.NotNull(Channel.CreateUnbounded()); Assert.NotNull(Channel.CreateUnbounded(new UnboundedChannelOptions())); } @@ -61,7 +58,6 @@ namespace System.Threading.Channels.Tests public void Create_NullOptions_ThrowsArgumentException() { AssertExtensions.Throws("options", () => Channel.CreateUnbounded(null)); - AssertExtensions.Throws("options", () => Channel.CreateUnbuffered(null)); AssertExtensions.Throws("options", () => Channel.CreateBounded(null)); } @@ -96,7 +92,7 @@ namespace System.Threading.Channels.Tests { var c = new TestChannelWriter(10); Assert.False(c.TryComplete()); - Assert.Equal(TaskStatus.Canceled, c.WriteAsync(42, new CancellationToken(true)).Status); + Assert.Equal(TaskStatus.Canceled, c.WriteAsync(42, new CancellationToken(true)).AsTask().Status); int count = 0; try @@ -121,9 +117,9 @@ namespace System.Threading.Channels.Tests public async Task DefaultWriteAsync_CatchesTryWriteExceptions() { var w = new TryWriteThrowingWriter(); - Task t = w.WriteAsync(42); - Assert.Equal(TaskStatus.Faulted, t.Status); - await Assert.ThrowsAsync(() => t); + ValueTask t = w.WriteAsync(42); + Assert.True(t.IsFaulted); + await Assert.ThrowsAsync(async () => await t); } [Fact] @@ -135,6 +131,72 @@ namespace System.Threading.Channels.Tests await Assert.ThrowsAsync(() => t); } + [Fact] + public async void TestBaseClassReadAsync() + { + WrapperChannel channel = new WrapperChannel(10); + ChannelReader reader = channel.Reader; + ChannelWriter writer = channel.Writer; + + // 1- do it through synchronous TryRead() + writer.TryWrite(50); + Assert.Equal(50, await reader.ReadAsync()); + + // 2- do it through async + ValueTask readTask = reader.ReadAsync(); + writer.TryWrite(100); + Assert.Equal(100, await readTask); + + // 3- use cancellation token + CancellationToken ct = new CancellationToken(true); // cancelled token + await Assert.ThrowsAsync(() => reader.ReadAsync(ct).AsTask()); + + // 4- throw during reading + readTask = reader.ReadAsync(); + ((WrapperChannelReader)reader).ForceThrowing = true; + writer.TryWrite(200); + await Assert.ThrowsAsync(() => readTask.AsTask()); + + // 5- close the channel while waiting reading + ((WrapperChannelReader)reader).ForceThrowing = false; + Assert.Equal(200, await reader.ReadAsync()); + readTask = reader.ReadAsync(); + channel.Writer.TryComplete(); + await Assert.ThrowsAsync(() => readTask.AsTask()); + } + + // This reader doesn't override ReadAsync to force using the base class ReadAsync method + private sealed class WrapperChannelReader : ChannelReader + { + private ChannelReader _reader; + internal bool ForceThrowing { get; set; } + + public WrapperChannelReader(Channel channel) {_reader = channel.Reader; } + + public override bool TryRead(out T item) + { + if (ForceThrowing) + throw new InvalidOperationException(); + + return _reader.TryRead(out item); + } + + public override ValueTask WaitToReadAsync(CancellationToken cancellationToken) + { + return _reader.WaitToReadAsync(cancellationToken); + } + } + + public class WrapperChannel : Channel + { + public WrapperChannel(int capacity) + { + Channel channel = Channel.CreateBounded(capacity); + Writer = channel.Writer; + Reader = new WrapperChannelReader(channel); + } + } + private sealed class TestChannelWriter : ChannelWriter { private readonly Random _rand = new Random(42); @@ -145,10 +207,10 @@ namespace System.Threading.Channels.Tests public override bool TryWrite(T item) => _rand.Next(0, 2) == 0 && _count++ < _max; // succeed if we're under our limit, and add random failures - public override Task WaitToWriteAsync(CancellationToken cancellationToken) => - _count >= _max ? Task.FromResult(false) : - _rand.Next(0, 2) == 0 ? Task.Delay(1).ContinueWith(_ => true) : // randomly introduce delays - Task.FromResult(true); + public override ValueTask WaitToWriteAsync(CancellationToken cancellationToken) => + _count >= _max ? new ValueTask(Task.FromResult(false)) : + _rand.Next(0, 2) == 0 ? new ValueTask(Task.Delay(1).ContinueWith(_ => true)) : // randomly introduce delays + new ValueTask(Task.FromResult(true)); } private sealed class TestChannelReader : ChannelReader @@ -184,22 +246,22 @@ namespace System.Threading.Channels.Tests return true; } - public override Task WaitToReadAsync(CancellationToken cancellationToken) => + public override ValueTask WaitToReadAsync(CancellationToken cancellationToken) => new ValueTask( _closed ? Task.FromResult(false) : _rand.Next(0, 2) == 0 ? Task.Delay(1).ContinueWith(_ => true) : // randomly introduce delays - Task.FromResult(true); + Task.FromResult(true)); } private sealed class TryWriteThrowingWriter : ChannelWriter { public override bool TryWrite(T item) => throw new FormatException(); - public override Task WaitToWriteAsync(CancellationToken cancellationToken = default) => throw new InvalidDataException(); + public override ValueTask WaitToWriteAsync(CancellationToken cancellationToken = default) => throw new InvalidDataException(); } private sealed class TryReadThrowingReader : ChannelReader { public override bool TryRead(out T item) => throw new FieldAccessException(); - public override Task WaitToReadAsync(CancellationToken cancellationToken = default) => throw new DriveNotFoundException(); + public override ValueTask WaitToReadAsync(CancellationToken cancellationToken = default) => throw new DriveNotFoundException(); } private sealed class CanReadFalseStream : MemoryStream diff --git a/external/corefx/src/System.Threading.Channels/tests/DebugAttributeTests.cs b/external/corefx/src/System.Threading.Channels/tests/DebugAttributeTests.cs new file mode 100644 index 0000000000..34197aa1e3 --- /dev/null +++ b/external/corefx/src/System.Threading.Channels/tests/DebugAttributeTests.cs @@ -0,0 +1,50 @@ +// 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.Threading.Channels; +using System.Collections.Generic; +using Xunit; + +namespace System.Threading.Channels.Tests +{ + public class DebugAttributeTests + { + public static IEnumerable TestData() + { + var c1 = Channel.CreateUnbounded(); + yield return new object[] { c1 }; + yield return new object[] { c1.Reader }; + yield return new object[] { c1.Writer }; + + var c2 = Channel.CreateUnbounded(new UnboundedChannelOptions() { SingleReader = true }); + yield return new object[] { c2 }; + yield return new object[] { c2.Reader }; + yield return new object[] { c2.Writer }; + + var c3 = Channel.CreateBounded(10); + yield return new object[] { c3 }; + yield return new object[] { c3.Reader }; + yield return new object[] { c3.Writer }; + } + + [Theory] + [MemberData(nameof(TestData))] + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Cannot do DebuggerAttribute testing on UapAot: requires internal Reflection on framework types.")] + public void TestDebuggerDisplaysAndTypeProxies(object obj) + { + DebuggerAttributes.ValidateDebuggerDisplayReferences(obj); + DebuggerAttributes.ValidateDebuggerTypeProxyProperties(obj); + } + + [Fact] + [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Cannot do DebuggerAttribute testing on UapAot: requires internal Reflection on framework types.")] + public void TestDequeueClass() + { + var c = Channel.CreateBounded(10); + DebuggerAttributes.ValidateDebuggerDisplayReferences(DebuggerAttributes.GetFieldValue(c, "_items")); + } + + } +} diff --git a/external/corefx/src/System.Threading.Channels/tests/Performance/Perf.Channel.cs b/external/corefx/src/System.Threading.Channels/tests/Performance/Perf.Channel.cs index 913054a244..78b7ab1f6c 100644 --- a/external/corefx/src/System.Threading.Channels/tests/Performance/Perf.Channel.cs +++ b/external/corefx/src/System.Threading.Channels/tests/Performance/Perf.Channel.cs @@ -7,28 +7,25 @@ using Microsoft.Xunit.Performance; namespace System.Threading.Channels.Tests { - public sealed class Perf_UnboundedChannelTests : Perf_BufferingTests + public sealed class UnboundedChannelPerfTests : PerfTests { public override Channel CreateChannel() => Channel.CreateUnbounded(); } - public sealed class Perf_UnboundedSpscChannelTests : Perf_BufferingTests + public sealed class SpscUnboundedChannelPerfTests : PerfTests { public override Channel CreateChannel() => Channel.CreateUnbounded(new UnboundedChannelOptions { SingleReader = true, SingleWriter = true }); } - public sealed class Perf_BoundedChannelTests : Perf_BufferingTests + public sealed class BoundedChannelPerfTests : PerfTests { public override Channel CreateChannel() => Channel.CreateBounded(10); } - public sealed class Perf_UnbufferedChannelTests : Perf_Tests + public abstract class PerfTests { - public override Channel CreateChannel() => Channel.CreateUnbuffered(); - } + public abstract Channel CreateChannel(); - public abstract class Perf_BufferingTests : Perf_Tests - { [Benchmark(InnerIterationCount = 1_000_000), MeasureGCAllocations] public void TryWriteThenTryRead() { @@ -92,16 +89,12 @@ namespace System.Threading.Channels.Tests } } } - } - - public abstract class Perf_Tests - { - public abstract Channel CreateChannel(); [Benchmark(InnerIterationCount = 1_000_000), MeasureGCAllocations] - public async Task ConcurrentReadAsyncWriteAsync() + public async Task PingPong() { - Channel channel = CreateChannel(); + Channel channel1 = CreateChannel(); + Channel channel2 = CreateChannel(); foreach (BenchmarkIteration iteration in Benchmark.Iterations) { @@ -111,17 +104,21 @@ namespace System.Threading.Channels.Tests await Task.WhenAll( Task.Run(async () => { - ChannelReader reader = channel.Reader; + ChannelReader reader = channel1.Reader; + ChannelWriter writer = channel2.Writer; for (int i = 0; i < iters; i++) { + await writer.WriteAsync(i); await reader.ReadAsync(); } }), Task.Run(async () => { - ChannelWriter writer = channel.Writer; + ChannelWriter writer = channel1.Writer; + ChannelReader reader = channel2.Reader; for (int i = 0; i < iters; i++) { + await reader.ReadAsync(); await writer.WriteAsync(i); } })); diff --git a/external/corefx/src/System.Threading.Channels/tests/Stress.cs b/external/corefx/src/System.Threading.Channels/tests/Stress.cs new file mode 100644 index 0000000000..d2d80e5c2d --- /dev/null +++ b/external/corefx/src/System.Threading.Channels/tests/Stress.cs @@ -0,0 +1,212 @@ +// 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.Threading.Tasks; +using System.Collections.Generic; +using System; +using Xunit; + +namespace System.Threading.Channels.Tests +{ + public class StressTests + { + public static IEnumerable TestData() + { + foreach (var readDelegate in new Func, Task>[] { ReadSynchronous, ReadAsynchronous, ReadSyncAndAsync} ) + foreach (var writeDelegate in new Func, int, Task>[] { WriteSynchronous, WriteAsynchronous, WriteSyncAndAsync} ) + foreach (bool singleReader in new [] {false, true}) + foreach (bool singleWriter in new [] {false, true}) + foreach (bool allowSynchronousContinuations in new [] {false, true}) + { + Func> unbounded = o => Channel.CreateUnbounded((UnboundedChannelOptions)o); + yield return new object[] { unbounded, new UnboundedChannelOptions + { + SingleReader = singleReader, + SingleWriter = singleWriter, + AllowSynchronousContinuations = allowSynchronousContinuations + }, readDelegate, writeDelegate + }; + } + + foreach (var readDelegate in new Func, Task>[] { ReadSynchronous, ReadAsynchronous, ReadSyncAndAsync} ) + foreach (var writeDelegate in new Func, int, Task>[] { WriteSynchronous, WriteAsynchronous, WriteSyncAndAsync} ) + foreach (BoundedChannelFullMode bco in Enum.GetValues(typeof(BoundedChannelFullMode))) + foreach (int capacity in new [] { 1, 1000 }) + foreach (bool singleReader in new [] {false, true}) + foreach (bool singleWriter in new [] {false, true}) + foreach (bool allowSynchronousContinuations in new [] {false, true}) + { + Func> bounded = o => Channel.CreateBounded((BoundedChannelOptions)o); + yield return new object[] { bounded, new BoundedChannelOptions(capacity) + { + SingleReader = singleReader, + SingleWriter = singleWriter, + AllowSynchronousContinuations = allowSynchronousContinuations, + FullMode = bco + }, readDelegate, writeDelegate + }; + } + } + + private static async Task ReadSynchronous(ChannelReader reader) + { + while (!reader.TryRead(out int value)) + { + if (!await reader.WaitToReadAsync()) + { + return false; + } + } + + return true; + } + + private static async Task ReadAsynchronous(ChannelReader reader) + { + if (await reader.WaitToReadAsync()) + { + await reader.ReadAsync(); + return true; + } + + return false; + } + + private static async Task ReadSyncAndAsync(ChannelReader reader) + { + if (!reader.TryRead(out int value)) + { + if (await reader.WaitToReadAsync()) + { + await reader.ReadAsync(); + return true; + } + return false; + } + + return true; + } + + private static async Task WriteSynchronous(ChannelWriter writer, int value) + { + while (!writer.TryWrite(value)) + { + if (!await writer.WaitToWriteAsync()) + { + break; + } + } + } + + private static async Task WriteAsynchronous(ChannelWriter writer, int value) + { + if (await writer.WaitToWriteAsync()) + { + await writer.WriteAsync(value); + } + } + + private static async Task WriteSyncAndAsync(ChannelWriter writer, int value) + { + if (!writer.TryWrite(value)) + { + if (await writer.WaitToWriteAsync()) + { + await writer.WriteAsync(value); + } + } + } + + const int MaxNumberToWriteToChannel = 400_000; + private static readonly int MaxTaskCounts = Math.Max(2, Environment.ProcessorCount); + + [ConditionalTheory(typeof(TestEnvironment), nameof(TestEnvironment.IsStressModeEnabled))] + [MemberData(nameof(TestData))] + public void RunInStressMode( + Func> channelCreator, + ChannelOptions options, + Func, Task> readDelegate, + Func, int, Task> writeDelegate) + { + Channel channel = channelCreator(options); + ChannelReader reader = channel.Reader; + ChannelWriter writer = channel.Writer; + BoundedChannelOptions boundedOptions = options as BoundedChannelOptions; + bool shouldReadAllWrittenValues = boundedOptions == null || boundedOptions.FullMode == BoundedChannelFullMode.Wait; + + List taskList = new List(); + + int readerTasksCount; + int writerTasksCount; + + if (options.SingleReader) + { + readerTasksCount = 1; + writerTasksCount = options.SingleWriter ? 1 : MaxTaskCounts - 1; + } + else if (options.SingleWriter) + { + writerTasksCount = 1; + readerTasksCount = MaxTaskCounts - 1; + } + else + { + readerTasksCount = MaxTaskCounts / 2; + writerTasksCount = MaxTaskCounts - readerTasksCount; + } + + int readCount = 0; + + for (int i=0; i < readerTasksCount; i++) + { + taskList.Add(Task.Run(async delegate + { + try + { + while (true) + { + if (!await readDelegate(reader)) + break; + Interlocked.Increment(ref readCount); + } + } + catch (ChannelClosedException) + { + } + })); + } + + int numberToWriteToQueue = -1; + int remainingWriters = writerTasksCount; + + for (int i=0; i < writerTasksCount; i++) + { + taskList.Add(Task.Run(async delegate + { + int num = Interlocked.Increment(ref numberToWriteToQueue); + while (num < MaxNumberToWriteToChannel) + { + await writeDelegate(writer, num); + num = Interlocked.Increment(ref numberToWriteToQueue); + } + + if (Interlocked.Decrement(ref remainingWriters) == 0) + writer.Complete(); + })); + } + + Task.WaitAll(taskList.ToArray()); + + if (shouldReadAllWrittenValues) + { + Assert.Equal(MaxNumberToWriteToChannel, readCount); + } + else + { + Assert.InRange(readCount, 0, MaxNumberToWriteToChannel); + } + + } + } +} diff --git a/external/corefx/src/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj b/external/corefx/src/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj index 33068d1346..20f56b57fa 100644 --- a/external/corefx/src/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj +++ b/external/corefx/src/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj @@ -2,7 +2,7 @@ - {9E984EB2-827E-4029-9647-FB5F8B67C553} + {1AF01469-DBFC-4BA1-9331-8E39AA639FEE} @@ -13,7 +13,8 @@ - + + Common\System\Diagnostics\DebuggerAttributes.cs diff --git a/external/corefx/src/System.Threading.Channels/tests/TestBase.cs b/external/corefx/src/System.Threading.Channels/tests/TestBase.cs index d3af1ba7eb..e41a613952 100644 --- a/external/corefx/src/System.Threading.Channels/tests/TestBase.cs +++ b/external/corefx/src/System.Threading.Channels/tests/TestBase.cs @@ -15,7 +15,11 @@ namespace System.Threading.Channels.Tests { Assert.Equal(TaskStatus.Canceled, task.Status); OperationCanceledException oce = Assert.ThrowsAny(() => task.GetAwaiter().GetResult()); - Assert.Equal(token, oce.CancellationToken); + if (PlatformDetection.IsNetCore) + { + // Earlier netstandard versions didn't have the APIs to always make this possible. + Assert.Equal(token, oce.CancellationToken); + } } protected async Task AssertCanceled(Task task, CancellationToken token) @@ -24,6 +28,8 @@ namespace System.Threading.Channels.Tests AssertSynchronouslyCanceled(task, token); } + protected void AssertSynchronousSuccess(ValueTask task) => Assert.True(task.IsCompletedSuccessfully); + protected void AssertSynchronousSuccess(ValueTask task) => Assert.True(task.IsCompletedSuccessfully); protected void AssertSynchronousSuccess(Task task) => Assert.Equal(TaskStatus.RanToCompletion, task.Status); protected void AssertSynchronousTrue(Task task) @@ -32,6 +38,12 @@ namespace System.Threading.Channels.Tests Assert.True(task.Result); } + protected void AssertSynchronousTrue(ValueTask task) + { + AssertSynchronousSuccess(task); + Assert.True(task.Result); + } + internal sealed class DelegateObserver : IObserver { public Action OnNextDelegate = null; diff --git a/external/corefx/src/System.Threading.Channels/tests/UnboundedChannelTests.cs b/external/corefx/src/System.Threading.Channels/tests/UnboundedChannelTests.cs index 71d8e91f43..dec1e50f3e 100644 --- a/external/corefx/src/System.Threading.Channels/tests/UnboundedChannelTests.cs +++ b/external/corefx/src/System.Threading.Channels/tests/UnboundedChannelTests.cs @@ -10,14 +10,13 @@ namespace System.Threading.Channels.Tests { public abstract class UnboundedChannelTests : ChannelTestBase { - protected abstract bool AllowSynchronousContinuations { get; } - protected override Channel CreateChannel() => Channel.CreateUnbounded( + protected override Channel CreateChannel() => Channel.CreateUnbounded( new UnboundedChannelOptions { SingleReader = RequiresSingleReader, AllowSynchronousContinuations = AllowSynchronousContinuations }); - protected override Channel CreateFullChannel() => null; + protected override Channel CreateFullChannel() => null; [Fact] public async Task Complete_BeforeEmpty_NoWaiters_TriggersCompletion() @@ -107,12 +106,12 @@ namespace System.Threading.Channels.Tests Channel c = CreateChannel(); int expectedId = Environment.CurrentManagedThreadId; - Task r = c.Reader.WaitToReadAsync().ContinueWith(_ => + Task r = c.Reader.WaitToReadAsync().AsTask().ContinueWith(_ => { Assert.Equal(AllowSynchronousContinuations, expectedId == Environment.CurrentManagedThreadId); }, CancellationToken.None, TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default); - Assert.Equal(TaskStatus.RanToCompletion, c.Writer.WriteAsync(42).Status); + Assert.True(c.Writer.WriteAsync(42).IsCompletedSuccessfully); ((IAsyncResult)r).AsyncWaitHandle.WaitOne(); // avoid inlining the continuation r.GetAwaiter().GetResult(); } @@ -155,13 +154,24 @@ namespace System.Threading.Channels.Tests public async Task MultipleWaiters_CancelsPreviousWaiter() { Channel c = CreateChannel(); - Task t1 = c.Reader.WaitToReadAsync(); - Task t2 = c.Reader.WaitToReadAsync(); - await Assert.ThrowsAnyAsync(() => t1); + ValueTask t1 = c.Reader.WaitToReadAsync(); + ValueTask t2 = c.Reader.WaitToReadAsync(); + await Assert.ThrowsAnyAsync(async () => await t1); Assert.True(c.Writer.TryWrite(42)); Assert.True(await t2); } + [Fact] + public async Task MultipleReaders_CancelsPreviousReader() + { + Channel c = CreateChannel(); + ValueTask t1 = c.Reader.ReadAsync(); + ValueTask t2 = c.Reader.ReadAsync(); + await Assert.ThrowsAnyAsync(async () => await t1); + Assert.True(c.Writer.TryWrite(42)); + Assert.Equal(42, await t2); + } + [Fact] public void Stress_TryWrite_TryRead() { diff --git a/external/corefx/src/System.Threading.Channels/tests/UnbufferedChannelTests.cs b/external/corefx/src/System.Threading.Channels/tests/UnbufferedChannelTests.cs deleted file mode 100644 index 7ef42056ac..0000000000 --- a/external/corefx/src/System.Threading.Channels/tests/UnbufferedChannelTests.cs +++ /dev/null @@ -1,95 +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.Linq; -using System.Threading.Tasks; -using Xunit; - -namespace System.Threading.Channels.Tests -{ - public class UnbufferedChannelTests : ChannelTestBase - { - protected override Channel CreateChannel() => Channel.CreateUnbuffered(); - protected override Channel CreateFullChannel() => CreateChannel(); - protected override bool BuffersItems => false; - - [Fact] - public async Task Complete_BeforeEmpty_WaitingWriters_TriggersCompletion() - { - Channel c = CreateChannel(); - Task write1 = c.Writer.WriteAsync(42); - Task write2 = c.Writer.WriteAsync(43); - c.Writer.Complete(); - await c.Reader.Completion; - await Assert.ThrowsAnyAsync(() => write1); - await Assert.ThrowsAnyAsync(() => write2); - } - - [Fact] - public void TryReadWrite_NoPartner_Fail() - { - Channel c = CreateChannel(); - Assert.False(c.Writer.TryWrite(42)); - Assert.False(c.Reader.TryRead(out int result)); - Assert.Equal(result, 0); - } - - [Fact] - public void TryRead_WriteAsync_Success() - { - Channel c = CreateChannel(); - Task w = c.Writer.WriteAsync(42); - Assert.False(w.IsCompleted); - Assert.True(c.Reader.TryRead(out int result)); - Assert.Equal(42, result); - } - - [Theory] - [InlineData(false)] - [InlineData(true)] - public async Task Read_MultipleUnpartneredWrites_CancelSome_ReadSucceeds(bool useReadAsync) - { - Channel c = CreateChannel(); - var cts = new CancellationTokenSource(); - - Task[] cancelableWrites = (from i in Enumerable.Range(0, 10) select c.Writer.WriteAsync(42, cts.Token)).ToArray(); - Assert.All(cancelableWrites, cw => Assert.Equal(TaskStatus.WaitingForActivation, cw.Status)); - - Task w = c.Writer.WriteAsync(84); - - cts.Cancel(); - foreach (Task t in cancelableWrites) - { - await AssertCanceled(t, cts.Token); - } - - if (useReadAsync) - { - Assert.True(c.Reader.TryRead(out int result)); - Assert.Equal(84, result); - } - else - { - Assert.Equal(84, await c.Reader.ReadAsync()); - } - } - - [Fact] - public async Task Cancel_PartneredWrite_Success() - { - Channel c = CreateChannel(); - var cts = new CancellationTokenSource(); - - Task w = c.Writer.WriteAsync(42, cts.Token); - Assert.False(w.IsCompleted); - - ValueTask r = c.Reader.ReadAsync(); - Assert.True(r.IsCompletedSuccessfully); - - cts.Cancel(); - await w; // no throw - } - - } -} diff --git a/external/corefx/src/System.Threading.Overlapped/tests/ThreadPoolBoundHandle_AllocateNativeOverlappedTests.cs b/external/corefx/src/System.Threading.Overlapped/tests/ThreadPoolBoundHandle_AllocateNativeOverlappedTests.cs index e969d45fcc..3f9ce32207 100644 --- a/external/corefx/src/System.Threading.Overlapped/tests/ThreadPoolBoundHandle_AllocateNativeOverlappedTests.cs +++ b/external/corefx/src/System.Threading.Overlapped/tests/ThreadPoolBoundHandle_AllocateNativeOverlappedTests.cs @@ -200,7 +200,6 @@ public partial class ThreadPoolBoundHandleTests [Fact] [PlatformSpecific(TestPlatforms.Windows)] // ThreadPoolBoundHandle.BindHandle is not supported on Unix - [ActiveIssue("https://github.com/dotnet/corefx/issues/18058", TargetFrameworkMonikers.Uap)] public unsafe void AllocateNativeOverlapped_PreAllocated_ReusedReturnedNativeOverlapped_OffsetLowAndOffsetHighSetToZero() { // The CLR reuses NativeOverlapped underneath, check to make sure that they reset fields back to zero diff --git a/external/corefx/src/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.pkgproj b/external/corefx/src/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.pkgproj index e62f1b9c18..cd56866eec 100644 --- a/external/corefx/src/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.pkgproj +++ b/external/corefx/src/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.pkgproj @@ -1,10 +1,6 @@  - - - 2.8.6 - net45;netcore45;wp8;wpa81;netcoreapp1.0;$(AllXamarinFrameworks) @@ -12,20 +8,12 @@ .NETCoreApp;UAP - - - - net45 - \ No newline at end of file diff --git a/external/corefx/src/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln b/external/corefx/src/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln index a16e156cad..913593de27 100644 --- a/external/corefx/src/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln +++ b/external/corefx/src/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln @@ -7,6 +7,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Exte {DE90AD0B-649D-4062-B8D9-9658DE140532} = {DE90AD0B-649D-4062-B8D9-9658DE140532} EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Extensions.Performance.Tests", "tests\Performance\System.Threading.Tasks.Extensions.Performance.Tests.csproj", "{77E38A48-61ED-4D79-9136-D88617EE3558}" + ProjectSection(ProjectDependencies) = postProject + {DE90AD0B-649D-4062-B8D9-9658DE140532} = {DE90AD0B-649D-4062-B8D9-9658DE140532} + EndProjectSection +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Extensions", "src\System.Threading.Tasks.Extensions.csproj", "{DE90AD0B-649D-4062-B8D9-9658DE140532}" ProjectSection(ProjectDependencies) = postProject {0DF7FA9A-E7D3-4CEF-862B-A37F5BBBB54C} = {0DF7FA9A-E7D3-4CEF-862B-A37F5BBBB54C} @@ -30,6 +35,10 @@ Global {275B161B-D525-48A0-B1DE-344273AB9A99}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {275B161B-D525-48A0-B1DE-344273AB9A99}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU {275B161B-D525-48A0-B1DE-344273AB9A99}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU + {77E38A48-61ED-4D79-9136-D88617EE3558}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {77E38A48-61ED-4D79-9136-D88617EE3558}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {77E38A48-61ED-4D79-9136-D88617EE3558}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {77E38A48-61ED-4D79-9136-D88617EE3558}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {DE90AD0B-649D-4062-B8D9-9658DE140532}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU {DE90AD0B-649D-4062-B8D9-9658DE140532}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU {DE90AD0B-649D-4062-B8D9-9658DE140532}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU @@ -44,6 +53,7 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {275B161B-D525-48A0-B1DE-344273AB9A99} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} + {77E38A48-61ED-4D79-9136-D88617EE3558} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} {DE90AD0B-649D-4062-B8D9-9658DE140532} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD} {0DF7FA9A-E7D3-4CEF-862B-A37F5BBBB54C} = {2E666815-2EDB-464B-9DF6-380BF4789AD4} EndGlobalSection diff --git a/external/corefx/src/System.Threading.Tasks.Extensions/dir.props b/external/corefx/src/System.Threading.Tasks.Extensions/dir.props index 69547aae1d..81cb605d78 100644 --- a/external/corefx/src/System.Threading.Tasks.Extensions/dir.props +++ b/external/corefx/src/System.Threading.Tasks.Extensions/dir.props @@ -2,7 +2,10 @@ - 4.1.2.0 + 4.2.0.0 + + 4.3.0.0 Open true true diff --git a/external/corefx/src/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj b/external/corefx/src/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj index be069b8134..1a84c5f2a8 100644 --- a/external/corefx/src/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj +++ b/external/corefx/src/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj @@ -11,7 +11,7 @@ - + - 4.1.1.0 diff --git a/external/corefx/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj b/external/corefx/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj index 0bc93927d5..d6986d894c 100644 --- a/external/corefx/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj +++ b/external/corefx/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj @@ -6,8 +6,8 @@ $(OutputPath)$(MSBuildProjectName).xml netstandard1.0;portable-net45+win8+wp8+wpa81 true + $(DefineConstants);netstandard true - 4.1.1.0 @@ -23,15 +23,34 @@ - - - - - + + + Common\CoreLib\System\Diagnostics\StackTraceHiddenAttribute.cs + + + Common\CoreLib\System\Runtime\CompilerServices\AsyncMethodBuilderAttribute.cs + + + Common\CoreLib\System\Runtime\CompilerServices\AsyncValueTaskMethodBuilder.cs + + + Common\CoreLib\System\Runtime\CompilerServices\ConfiguredValueTaskAwaitable.cs + + + Common\CoreLib\System\Runtime\CompilerServices\ValueTaskAwaiter.cs + + + Common\CoreLib\System\Threading\Tasks\ValueTask.cs + + + Common\CoreLib\System\Threading\Tasks\Sources\IValueTaskSource.cs + + + - \ No newline at end of file + diff --git a/external/corefx/src/System.Threading.Tasks.Extensions/src/System/Runtime/CompilerServices/AsyncMethodBuilderAttribute.cs b/external/corefx/src/System.Threading.Tasks.Extensions/src/System/Runtime/CompilerServices/AsyncMethodBuilderAttribute.cs deleted file mode 100644 index 688a3a01ba..0000000000 --- a/external/corefx/src/System.Threading.Tasks.Extensions/src/System/Runtime/CompilerServices/AsyncMethodBuilderAttribute.cs +++ /dev/null @@ -1,21 +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.Runtime.CompilerServices -{ - /// - /// Indicates the type of the async method builder that should be used by a language compiler to - /// build the attributed type when used as the return type of an async method. - /// - [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Interface | AttributeTargets.Delegate | AttributeTargets.Enum, Inherited = false, AllowMultiple = false)] - public sealed class AsyncMethodBuilderAttribute : Attribute - { - /// Initializes the . - /// The of the associated builder. - public AsyncMethodBuilderAttribute(Type builderType) => BuilderType = builderType; - - /// Gets the of the associated builder. - public Type BuilderType { get; } - } -} diff --git a/external/corefx/src/System.Threading.Tasks.Extensions/src/System/Runtime/CompilerServices/AsyncValueTaskMethodBuilder.cs b/external/corefx/src/System.Threading.Tasks.Extensions/src/System/Runtime/CompilerServices/AsyncValueTaskMethodBuilder.cs deleted file mode 100644 index 8cbcdc562f..0000000000 --- a/external/corefx/src/System.Threading.Tasks.Extensions/src/System/Runtime/CompilerServices/AsyncValueTaskMethodBuilder.cs +++ /dev/null @@ -1,102 +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.Runtime.InteropServices; -using System.Security; -using System.Threading.Tasks; - -namespace System.Runtime.CompilerServices -{ - /// Represents a builder for asynchronous methods that returns a . - /// The type of the result. - [StructLayout(LayoutKind.Auto)] - public struct AsyncValueTaskMethodBuilder - { - /// The to which most operations are delegated. - private AsyncTaskMethodBuilder _methodBuilder; - /// The result for this builder, if it's completed before any awaits occur. - private TResult _result; - /// true if contains the synchronous result for the async method; otherwise, false. - private bool _haveResult; - /// true if the builder should be used for setting/getting the result; otherwise, false. - private bool _useBuilder; - - /// Creates an instance of the struct. - /// The initialized instance. - public static AsyncValueTaskMethodBuilder Create() => - new AsyncValueTaskMethodBuilder() { _methodBuilder = AsyncTaskMethodBuilder.Create() }; - - /// Begins running the builder with the associated state machine. - /// The type of the state machine. - /// The state machine instance, passed by reference. - public void Start(ref TStateMachine stateMachine) where TStateMachine : IAsyncStateMachine => - _methodBuilder.Start(ref stateMachine); // will provide the right ExecutionContext semantics - - /// Associates the builder with the specified state machine. - /// The state machine instance to associate with the builder. - public void SetStateMachine(IAsyncStateMachine stateMachine) => _methodBuilder.SetStateMachine(stateMachine); - - /// Marks the task as successfully completed. - /// The result to use to complete the task. - public void SetResult(TResult result) - { - if (_useBuilder) - { - _methodBuilder.SetResult(result); - } - else - { - _result = result; - _haveResult = true; - } - } - - /// Marks the task as failed and binds the specified exception to the task. - /// The exception to bind to the task. - public void SetException(Exception exception) => _methodBuilder.SetException(exception); - - /// Gets the task for this builder. - public ValueTask Task - { - get - { - if (_haveResult) - { - return new ValueTask(_result); - } - else - { - _useBuilder = true; - return new ValueTask(_methodBuilder.Task); - } - } - } - - /// Schedules the state machine to proceed to the next action when the specified awaiter completes. - /// The type of the awaiter. - /// The type of the state machine. - /// the awaiter - /// The state machine. - public void AwaitOnCompleted(ref TAwaiter awaiter, ref TStateMachine stateMachine) - where TAwaiter : INotifyCompletion - where TStateMachine : IAsyncStateMachine - { - _useBuilder = true; - _methodBuilder.AwaitOnCompleted(ref awaiter, ref stateMachine); - } - - /// Schedules the state machine to proceed to the next action when the specified awaiter completes. - /// The type of the awaiter. - /// The type of the state machine. - /// the awaiter - /// The state machine. - public void AwaitUnsafeOnCompleted(ref TAwaiter awaiter, ref TStateMachine stateMachine) - where TAwaiter : ICriticalNotifyCompletion - where TStateMachine : IAsyncStateMachine - { - _useBuilder = true; - _methodBuilder.AwaitUnsafeOnCompleted(ref awaiter, ref stateMachine); - } - } -} diff --git a/external/corefx/src/System.Threading.Tasks.Extensions/src/System/Runtime/CompilerServices/ConfiguredValueTaskAwaitable.cs b/external/corefx/src/System.Threading.Tasks.Extensions/src/System/Runtime/CompilerServices/ConfiguredValueTaskAwaitable.cs deleted file mode 100644 index e0b92e5de1..0000000000 --- a/external/corefx/src/System.Threading.Tasks.Extensions/src/System/Runtime/CompilerServices/ConfiguredValueTaskAwaitable.cs +++ /dev/null @@ -1,71 +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.Runtime.InteropServices; -using System.Threading.Tasks; - -namespace System.Runtime.CompilerServices -{ - /// Provides an awaitable type that enables configured awaits on a . - /// The type of the result produced. - [StructLayout(LayoutKind.Auto)] - public readonly struct ConfiguredValueTaskAwaitable - { - /// The wrapped . - private readonly ValueTask _value; - /// true to attempt to marshal the continuation back to the original context captured; otherwise, false. - private readonly bool _continueOnCapturedContext; - - /// Initializes the awaitable. - /// The wrapped . - /// - /// true to attempt to marshal the continuation back to the original synchronization context captured; otherwise, false. - /// - internal ConfiguredValueTaskAwaitable(ValueTask value, bool continueOnCapturedContext) - { - _value = value; - _continueOnCapturedContext = continueOnCapturedContext; - } - - /// Returns an awaiter for this instance. - public ConfiguredValueTaskAwaiter GetAwaiter() => - new ConfiguredValueTaskAwaiter(_value, _continueOnCapturedContext); - - /// Provides an awaiter for a . - [StructLayout(LayoutKind.Auto)] - public readonly struct ConfiguredValueTaskAwaiter : ICriticalNotifyCompletion - { - /// The value being awaited. - private readonly ValueTask _value; - /// The value to pass to ConfigureAwait. - private readonly bool _continueOnCapturedContext; - - /// Initializes the awaiter. - /// The value to be awaited. - /// The value to pass to ConfigureAwait. - internal ConfiguredValueTaskAwaiter(ValueTask value, bool continueOnCapturedContext) - { - _value = value; - _continueOnCapturedContext = continueOnCapturedContext; - } - - /// Gets whether the has completed. - public bool IsCompleted => _value.IsCompleted; - - /// Gets the result of the ValueTask. - public TResult GetResult() => - _value._task == null ? - _value._result : - _value._task.GetAwaiter().GetResult(); - - /// Schedules the continuation action for the . - public void OnCompleted(Action continuation) => - _value.AsTask().ConfigureAwait(_continueOnCapturedContext).GetAwaiter().OnCompleted(continuation); - - /// Schedules the continuation action for the . - public void UnsafeOnCompleted(Action continuation) => - _value.AsTask().ConfigureAwait(_continueOnCapturedContext).GetAwaiter().UnsafeOnCompleted(continuation); - } - } -} diff --git a/external/corefx/src/System.Threading.Tasks.Extensions/src/System/Runtime/CompilerServices/ValueTaskAwaiter.cs b/external/corefx/src/System.Threading.Tasks.Extensions/src/System/Runtime/CompilerServices/ValueTaskAwaiter.cs deleted file mode 100644 index 2774ba6ad3..0000000000 --- a/external/corefx/src/System.Threading.Tasks.Extensions/src/System/Runtime/CompilerServices/ValueTaskAwaiter.cs +++ /dev/null @@ -1,37 +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.Runtime.InteropServices; -using System.Threading.Tasks; - -namespace System.Runtime.CompilerServices -{ - /// Provides an awaiter for a . - public readonly struct ValueTaskAwaiter : ICriticalNotifyCompletion - { - /// The value being awaited. - private readonly ValueTask _value; - - /// Initializes the awaiter. - /// The value to be awaited. - internal ValueTaskAwaiter(ValueTask value) => _value = value; - - /// Gets whether the has completed. - public bool IsCompleted => _value.IsCompleted; - - /// Gets the result of the ValueTask. - public TResult GetResult() => - _value._task == null ? - _value._result : - _value._task.GetAwaiter().GetResult(); - - /// Schedules the continuation action for this ValueTask. - public void OnCompleted(Action continuation) => - _value.AsTask().ConfigureAwait(continueOnCapturedContext: true).GetAwaiter().OnCompleted(continuation); - - /// Schedules the continuation action for this ValueTask. - public void UnsafeOnCompleted(Action continuation) => - _value.AsTask().ConfigureAwait(continueOnCapturedContext: true).GetAwaiter().UnsafeOnCompleted(continuation); - } -} diff --git a/external/corefx/src/System.Threading.Tasks.Extensions/src/System/Threading/Tasks/ValueTask.cs b/external/corefx/src/System.Threading.Tasks.Extensions/src/System/Threading/Tasks/ValueTask.cs deleted file mode 100644 index f91e6da4cb..0000000000 --- a/external/corefx/src/System.Threading.Tasks.Extensions/src/System/Threading/Tasks/ValueTask.cs +++ /dev/null @@ -1,167 +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.Collections.Generic; -#if !MONO -using System.ComponentModel; -#endif -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -namespace System.Threading.Tasks -{ - /// - /// Provides a value type that wraps a and a , - /// only one of which is used. - /// - /// The type of the result. - /// - /// - /// Methods may return an instance of this value type when it's likely that the result of their - /// operations will be available synchronously and when the method is expected to be invoked so - /// frequently that the cost of allocating a new for each call will - /// be prohibitive. - /// - /// - /// There are tradeoffs to using a instead of a . - /// For example, while a can help avoid an allocation in the case where the - /// successful result is available synchronously, it also contains two fields whereas a - /// as a reference type is a single field. This means that a method call ends up returning two fields worth of - /// data instead of one, which is more data to copy. It also means that if a method that returns one of these - /// is awaited within an async method, the state machine for that async method will be larger due to needing - /// to store the struct that's two fields instead of a single reference. - /// - /// - /// Further, for uses other than consuming the result of an asynchronous operation via await, - /// can lead to a more convoluted programming model, which can in turn actually - /// lead to more allocations. For example, consider a method that could return either a - /// with a cached task as a common result or a . If the consumer of the result - /// wants to use it as a , such as to use with in methods like Task.WhenAll and Task.WhenAny, - /// the would first need to be converted into a using - /// , which leads to an allocation that would have been avoided if a cached - /// had been used in the first place. - /// - /// - /// As such, the default choice for any asynchronous method should be to return a or - /// . Only if performance analysis proves it worthwhile should a - /// be used instead of . There is no non-generic version of - /// as the Task.CompletedTask property may be used to hand back a successfully completed singleton in the case where - /// a -returning method completes synchronously and successfully. - /// - /// - [AsyncMethodBuilder(typeof(AsyncValueTaskMethodBuilder<>))] - [StructLayout(LayoutKind.Auto)] - public readonly struct ValueTask : IEquatable> - { - /// The task to be used if the operation completed asynchronously or if it completed synchronously but non-successfully. - internal readonly Task _task; - /// The result to be used if the operation completed successfully synchronously. - internal readonly TResult _result; - - /// Initialize the with the result of the successful operation. - /// The result. - public ValueTask(TResult result) - { - _task = null; - _result = result; - } - - /// - /// Initialize the with a that represents the operation. - /// - /// The task. - public ValueTask(Task task) - { - _task = task ?? throw new ArgumentNullException(nameof(task)); - _result = default(TResult); - } - - /// Returns the hash code for this instance. - public override int GetHashCode() => - _task != null ? _task.GetHashCode() : - _result != null ? _result.GetHashCode() : - 0; - - /// Returns a value indicating whether this value is equal to a specified . - public override bool Equals(object obj) => - obj is ValueTask && - Equals((ValueTask)obj); - - /// Returns a value indicating whether this value is equal to a specified value. - public bool Equals(ValueTask other) => - _task != null || other._task != null ? - _task == other._task : - EqualityComparer.Default.Equals(_result, other._result); - - /// Returns a value indicating whether two values are equal. - public static bool operator==(ValueTask left, ValueTask right) => - left.Equals(right); - - /// Returns a value indicating whether two values are not equal. - public static bool operator!=(ValueTask left, ValueTask right) => - !left.Equals(right); - - /// - /// Gets a object to represent this ValueTask. It will - /// either return the wrapped task object if one exists, or it'll manufacture a new - /// task object to represent the result. - /// - public Task AsTask() => - // Return the task if we were constructed from one, otherwise manufacture one. We don't - // cache the generated task into _task as it would end up changing both equality comparison - // and the hash code we generate in GetHashCode. - _task ?? Task.FromResult(_result); - - /// Gets whether the represents a completed operation. - public bool IsCompleted => _task == null || _task.IsCompleted; - - /// Gets whether the represents a successfully completed operation. - public bool IsCompletedSuccessfully => _task == null || _task.Status == TaskStatus.RanToCompletion; - - /// Gets whether the represents a failed operation. - public bool IsFaulted => _task != null && _task.IsFaulted; - - /// Gets whether the represents a canceled operation. - public bool IsCanceled => _task != null && _task.IsCanceled; - - /// Gets the result. - public TResult Result => _task == null ? _result : _task.GetAwaiter().GetResult(); - - /// Gets an awaiter for this value. - public ValueTaskAwaiter GetAwaiter() => new ValueTaskAwaiter(this); - - /// Configures an awaiter for this value. - /// - /// true to attempt to marshal the continuation back to the captured context; otherwise, false. - /// - public ConfiguredValueTaskAwaitable ConfigureAwait(bool continueOnCapturedContext) => - new ConfiguredValueTaskAwaitable(this, continueOnCapturedContext: continueOnCapturedContext); - - /// Gets a string-representation of this . - public override string ToString() - { - if (_task != null) - { - return _task.Status == TaskStatus.RanToCompletion && _task.Result != null ? - _task.Result.ToString() : - string.Empty; - } - else - { - return _result != null ? - _result.ToString() : - string.Empty; - } - } - - // TODO: Remove CreateAsyncMethodBuilder once the C# compiler relies on the AsyncBuilder attribute. - - /// Creates a method builder for use with an async method. - /// The created builder. -#if !MONO - [EditorBrowsable(EditorBrowsableState.Never)] // intended only for compiler consumption -#endif - public static AsyncValueTaskMethodBuilder CreateAsyncMethodBuilder() => AsyncValueTaskMethodBuilder.Create(); - } -} diff --git a/external/corefx/src/System.Threading.Tasks.Extensions/src/System/ThrowHelper.cs b/external/corefx/src/System.Threading.Tasks.Extensions/src/System/ThrowHelper.cs new file mode 100644 index 0000000000..5824a165ec --- /dev/null +++ b/external/corefx/src/System.Threading.Tasks.Extensions/src/System/ThrowHelper.cs @@ -0,0 +1,40 @@ +// 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 +{ + internal static class ThrowHelper + { + internal static void ThrowArgumentNullException(ExceptionArgument argument) => + throw GetArgumentNullException(argument); + + internal static void ThrowArgumentOutOfRangeException(ExceptionArgument argument) => + throw GetArgumentOutOfRangeException(argument); + + private static ArgumentNullException GetArgumentNullException(ExceptionArgument argument) => + new ArgumentNullException(GetArgumentName(argument)); + + private static ArgumentOutOfRangeException GetArgumentOutOfRangeException(ExceptionArgument argument) => + new ArgumentOutOfRangeException(GetArgumentName(argument)); + + [MethodImpl(MethodImplOptions.NoInlining)] + private static string GetArgumentName(ExceptionArgument argument) + { + Debug.Assert(Enum.IsDefined(typeof(ExceptionArgument), argument), + $"The enum value is not defined, please check the {nameof(ExceptionArgument)} enum."); + + return argument.ToString(); + } + } + + internal enum ExceptionArgument + { + task, + source, + state + } +} diff --git a/external/corefx/src/System.Threading.Tasks.Extensions/tests/AsyncMethodBuilderAttributeTests.cs b/external/corefx/src/System.Threading.Tasks.Extensions/tests/AsyncMethodBuilderAttributeTests.cs index 29dfa236f4..02f1d8b4cd 100644 --- a/external/corefx/src/System.Threading.Tasks.Extensions/tests/AsyncMethodBuilderAttributeTests.cs +++ b/external/corefx/src/System.Threading.Tasks.Extensions/tests/AsyncMethodBuilderAttributeTests.cs @@ -11,6 +11,7 @@ namespace System.Runtime.CompilerServices.Tests [Theory] [InlineData(typeof(string))] [InlineData(typeof(int))] + [InlineData(typeof(AsyncValueTaskMethodBuilder))] [InlineData(typeof(AsyncValueTaskMethodBuilder<>))] [InlineData(typeof(AsyncValueTaskMethodBuilder))] [InlineData(typeof(AsyncValueTaskMethodBuilder))] diff --git a/external/corefx/src/System.Threading.Tasks.Extensions/tests/AsyncValueTaskMethodBuilderTests.cs b/external/corefx/src/System.Threading.Tasks.Extensions/tests/AsyncValueTaskMethodBuilderTests.cs index 94827c91b5..258404f925 100644 --- a/external/corefx/src/System.Threading.Tasks.Extensions/tests/AsyncValueTaskMethodBuilderTests.cs +++ b/external/corefx/src/System.Threading.Tasks.Extensions/tests/AsyncValueTaskMethodBuilderTests.cs @@ -2,7 +2,6 @@ // 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; using System.Runtime.CompilerServices; using Xunit; @@ -11,16 +10,32 @@ namespace System.Threading.Tasks.Tests public class AsyncValueTaskMethodBuilderTests { [Fact] - public void Create_ReturnsDefaultInstance() + public void NonGeneric_Create_ReturnsDefaultInstance() { - AsyncValueTaskMethodBuilder b = ValueTask.CreateAsyncMethodBuilder(); - Assert.Equal(default(AsyncValueTaskMethodBuilder), b); // implementation detail being verified + AsyncValueTaskMethodBuilder b = default; + Assert.Equal(default, b); // implementation detail being verified } [Fact] - public void SetResult_BeforeAccessTask_ValueTaskContainsValue() + public void Generic_Create_ReturnsDefaultInstance() { - AsyncValueTaskMethodBuilder b = ValueTask.CreateAsyncMethodBuilder(); + AsyncValueTaskMethodBuilder b = default; + Assert.Equal(default, b); // implementation detail being verified + } + + [Fact] + public void NonGeneric_SetResult_BeforeAccessTask_ValueTaskIsDefault() + { + AsyncValueTaskMethodBuilder b = default; + b.SetResult(); + ValueTask vt = b.Task; + Assert.True(vt == default); + } + + [Fact] + public void Generic_SetResult_BeforeAccessTask_ValueTaskContainsValue() + { + AsyncValueTaskMethodBuilder b = default; b.SetResult(42); ValueTask vt = b.Task; Assert.True(vt.IsCompletedSuccessfully); @@ -29,9 +44,20 @@ namespace System.Threading.Tasks.Tests } [Fact] - public void SetResult_AfterAccessTask_ValueTaskContainsValue() + public void NonGeneric_SetResult_AfterAccessTask_ValueTaskContainsValue() { - AsyncValueTaskMethodBuilder b = ValueTask.CreateAsyncMethodBuilder(); + AsyncValueTaskMethodBuilder b = default; + ValueTask vt = b.Task; + b.SetResult(); + Assert.False(vt == default); + Assert.True(vt.IsCompletedSuccessfully); + Assert.True(WrapsTask(vt)); + } + + [Fact] + public void Generic_SetResult_AfterAccessTask_ValueTaskContainsValue() + { + AsyncValueTaskMethodBuilder b = default; ValueTask vt = b.Task; b.SetResult(42); Assert.True(vt.IsCompletedSuccessfully); @@ -40,9 +66,20 @@ namespace System.Threading.Tasks.Tests } [Fact] - public void SetException_BeforeAccessTask_FaultsTask() + public void NonGeneric_SetException_BeforeAccessTask_FaultsTask() { - AsyncValueTaskMethodBuilder b = ValueTask.CreateAsyncMethodBuilder(); + AsyncValueTaskMethodBuilder b = default; + var e = new FormatException(); + b.SetException(e); + ValueTask vt = b.Task; + Assert.True(vt.IsFaulted); + Assert.Same(e, Assert.Throws(() => vt.GetAwaiter().GetResult())); + } + + [Fact] + public void Generic_SetException_BeforeAccessTask_FaultsTask() + { + AsyncValueTaskMethodBuilder b = default; var e = new FormatException(); b.SetException(e); ValueTask vt = b.Task; @@ -51,9 +88,20 @@ namespace System.Threading.Tasks.Tests } [Fact] - public void SetException_AfterAccessTask_FaultsTask() + public void NonGeneric_SetException_AfterAccessTask_FaultsTask() { - AsyncValueTaskMethodBuilder b = ValueTask.CreateAsyncMethodBuilder(); + AsyncValueTaskMethodBuilder b = default; + var e = new FormatException(); + ValueTask vt = b.Task; + b.SetException(e); + Assert.True(vt.IsFaulted); + Assert.Same(e, Assert.Throws(() => vt.GetAwaiter().GetResult())); + } + + [Fact] + public void Generic_SetException_AfterAccessTask_FaultsTask() + { + AsyncValueTaskMethodBuilder b = default; var e = new FormatException(); ValueTask vt = b.Task; b.SetException(e); @@ -62,9 +110,20 @@ namespace System.Threading.Tasks.Tests } [Fact] - public void SetException_OperationCanceledException_CancelsTask() + public void NonGeneric_SetException_OperationCanceledException_CancelsTask() { - AsyncValueTaskMethodBuilder b = ValueTask.CreateAsyncMethodBuilder(); + AsyncValueTaskMethodBuilder b = default; + var e = new OperationCanceledException(); + ValueTask vt = b.Task; + b.SetException(e); + Assert.True(vt.IsCanceled); + Assert.Same(e, Assert.Throws(() => vt.GetAwaiter().GetResult())); + } + + [Fact] + public void Generic_SetException_OperationCanceledException_CancelsTask() + { + AsyncValueTaskMethodBuilder b = default; var e = new OperationCanceledException(); ValueTask vt = b.Task; b.SetException(e); @@ -73,9 +132,19 @@ namespace System.Threading.Tasks.Tests } [Fact] - public void Start_InvokesMoveNext() + public void NonGeneric_Start_InvokesMoveNext() { - AsyncValueTaskMethodBuilder b = ValueTask.CreateAsyncMethodBuilder(); + AsyncValueTaskMethodBuilder b = default; + int invokes = 0; + var dsm = new DelegateStateMachine { MoveNextDelegate = () => invokes++ }; + b.Start(ref dsm); + Assert.Equal(1, invokes); + } + + [Fact] + public void Generic_Start_InvokesMoveNext() + { + AsyncValueTaskMethodBuilder b = default; int invokes = 0; var dsm = new DelegateStateMachine { MoveNextDelegate = () => invokes++ }; b.Start(ref dsm); @@ -87,9 +156,40 @@ namespace System.Threading.Tasks.Tests [InlineData(2, false)] [InlineData(1, true)] [InlineData(2, true)] - public void AwaitOnCompleted_ForcesTaskCreation(int numAwaits, bool awaitUnsafe) + public void NonGeneric_AwaitOnCompleted_ForcesTaskCreation(int numAwaits, bool awaitUnsafe) { - AsyncValueTaskMethodBuilder b = ValueTask.CreateAsyncMethodBuilder(); + AsyncValueTaskMethodBuilder b = default; + + var dsm = new DelegateStateMachine(); + TaskAwaiter t = new TaskCompletionSource().Task.GetAwaiter(); + + Assert.InRange(numAwaits, 1, int.MaxValue); + for (int i = 1; i <= numAwaits; i++) + { + if (awaitUnsafe) + { + b.AwaitUnsafeOnCompleted(ref t, ref dsm); + } + else + { + b.AwaitOnCompleted(ref t, ref dsm); + } + } + + b.SetResult(); + + Assert.True(WrapsTask(b.Task)); + Assert.True(b.Task.IsCompletedSuccessfully); + } + + [Theory] + [InlineData(1, false)] + [InlineData(2, false)] + [InlineData(1, true)] + [InlineData(2, true)] + public void Generic_AwaitOnCompleted_ForcesTaskCreation(int numAwaits, bool awaitUnsafe) + { + AsyncValueTaskMethodBuilder b = default; var dsm = new DelegateStateMachine(); TaskAwaiter t = new TaskCompletionSource().Task.GetAwaiter(); @@ -115,14 +215,22 @@ namespace System.Threading.Tasks.Tests [Fact] [ActiveIssue("https://github.com/dotnet/corefx/issues/22506", TargetFrameworkMonikers.UapAot)] - public void SetStateMachine_InvalidArgument_ThrowsException() + public void NonGeneric_SetStateMachine_InvalidArgument_ThrowsException() { - AsyncValueTaskMethodBuilder b = ValueTask.CreateAsyncMethodBuilder(); + AsyncValueTaskMethodBuilder b = default; AssertExtensions.Throws("stateMachine", () => b.SetStateMachine(null)); } [Fact] - public void Start_ExecutionContextChangesInMoveNextDontFlowOut() + [ActiveIssue("https://github.com/dotnet/corefx/issues/22506", TargetFrameworkMonikers.UapAot)] + public void Generic_SetStateMachine_InvalidArgument_ThrowsException() + { + AsyncValueTaskMethodBuilder b = default; + AssertExtensions.Throws("stateMachine", () => b.SetStateMachine(null)); + } + + [Fact] + public void NonGeneric_Start_ExecutionContextChangesInMoveNextDontFlowOut() { var al = new AsyncLocal { Value = 0 }; int calls = 0; @@ -144,7 +252,41 @@ namespace System.Threading.Tasks.Tests Assert.Equal(2, al.Value); Assert.Equal(2, calls); - AsyncValueTaskMethodBuilder b = ValueTask.CreateAsyncMethodBuilder(); + AsyncValueTaskMethodBuilder b = default; + b.Start(ref dsm); + Assert.Equal(2, al.Value); // change should not be visible + Assert.Equal(3, calls); + + // Make sure we've not caused the Task to be allocated + b.SetResult(); + ValueTask vt = b.Task; + Assert.False(WrapsTask(vt)); + } + + [Fact] + public void Generic_Start_ExecutionContextChangesInMoveNextDontFlowOut() + { + var al = new AsyncLocal { Value = 0 }; + int calls = 0; + + var dsm = new DelegateStateMachine + { + MoveNextDelegate = () => + { + al.Value++; + calls++; + } + }; + + dsm.MoveNext(); + Assert.Equal(1, al.Value); + Assert.Equal(1, calls); + + dsm.MoveNext(); + Assert.Equal(2, al.Value); + Assert.Equal(2, calls); + + AsyncValueTaskMethodBuilder b = default; b.Start(ref dsm); Assert.Equal(2, al.Value); // change should not be visible Assert.Equal(3, calls); @@ -160,7 +302,25 @@ namespace System.Threading.Tasks.Tests [InlineData(1)] [InlineData(2)] [InlineData(10)] - public static async Task UsedWithAsyncMethod_CompletesSuccessfully(int yields) + public static async Task NonGeneric_UsedWithAsyncMethod_CompletesSuccessfully(int yields) + { + await ValueTaskReturningAsyncMethod(42); + + ValueTask vt = ValueTaskReturningAsyncMethod(84); + Assert.Equal(yields > 0, WrapsTask(vt)); + + async ValueTask ValueTaskReturningAsyncMethod(int result) + { + for (int i = 0; i < yields; i++) await Task.Yield(); + } + } + + [Theory] + [InlineData(0)] + [InlineData(1)] + [InlineData(2)] + [InlineData(10)] + public static async Task Generic_UsedWithAsyncMethod_CompletesSuccessfully(int yields) { Assert.Equal(42, await ValueTaskReturningAsyncMethod(42)); @@ -175,7 +335,129 @@ namespace System.Threading.Tasks.Tests } } - /// Gets whether the ValueTask has a non-null Task. + [Fact] + public static async Task AwaitTasksAndValueTasks_InTaskAndValueTaskMethods() + { + for (int i = 0; i < 2; i++) + { + await TaskReturningMethod(); + Assert.Equal(17, await TaskInt32ReturningMethod()); + await ValueTaskReturningMethod(); + Assert.Equal(18, await ValueTaskInt32ReturningMethod()); + } + + async Task TaskReturningMethod() + { + for (int i = 0; i < 3; i++) + { + // Complete + await Task.CompletedTask; + await Task.FromResult(42); + await new ValueTask(); + await Assert.ThrowsAsync(async () => await new ValueTask(Task.FromException(new FormatException()))); + await Assert.ThrowsAsync(async () => await new ValueTask(ManualResetValueTaskSource.Completed(0, new FormatException()), 0)); + Assert.Equal(42, await new ValueTask(42)); + Assert.Equal(42, await new ValueTask(Task.FromResult(42))); + Assert.Equal(42, await new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0)); + await Assert.ThrowsAsync(async () => await new ValueTask(Task.FromException(new FormatException()))); + await Assert.ThrowsAsync(async () => await new ValueTask(ManualResetValueTaskSource.Completed(0, new FormatException()), 0)); + + // Incomplete + await Assert.ThrowsAsync(async () => await new ValueTask(Task.Delay(1).ContinueWith(_ => throw new FormatException()))); + await Assert.ThrowsAsync(async () => await new ValueTask(ManualResetValueTaskSource.Delay(1, 0, new FormatException()), 0)); + Assert.Equal(42, await new ValueTask(Task.Delay(1).ContinueWith(_ => 42))); + Assert.Equal(42, await new ValueTask(ManualResetValueTaskSource.Delay(1, 42, null), 0)); + await Assert.ThrowsAsync(async () => await new ValueTask(Task.Delay(1).ContinueWith(_ => throw new FormatException()))); + await Assert.ThrowsAsync(async () => await new ValueTask(ManualResetValueTaskSource.Delay(1, 0, new FormatException()), 0)); + await Task.Yield(); + } + } + + async Task TaskInt32ReturningMethod() + { + for (int i = 0; i < 3; i++) + { + // Complete + await Task.CompletedTask; + await Task.FromResult(42); + await new ValueTask(); + await Assert.ThrowsAsync(async () => await new ValueTask(Task.FromException(new FormatException()))); + await Assert.ThrowsAsync(async () => await new ValueTask(ManualResetValueTaskSource.Completed(0, new FormatException()), 0)); + Assert.Equal(42, await new ValueTask(42)); + Assert.Equal(42, await new ValueTask(Task.FromResult(42))); + Assert.Equal(42, await new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0)); + await Assert.ThrowsAsync(async () => await new ValueTask(Task.FromException(new FormatException()))); + await Assert.ThrowsAsync(async () => await new ValueTask(ManualResetValueTaskSource.Completed(0, new FormatException()), 0)); + + // Incomplete + await Assert.ThrowsAsync(async () => await new ValueTask(Task.Delay(1).ContinueWith(_ => throw new FormatException()))); + await Assert.ThrowsAsync(async () => await new ValueTask(ManualResetValueTaskSource.Delay(1, 0, new FormatException()), 0)); + Assert.Equal(42, await new ValueTask(Task.Delay(1).ContinueWith(_ => 42))); + Assert.Equal(42, await new ValueTask(ManualResetValueTaskSource.Delay(1, 42, null), 0)); + await Assert.ThrowsAsync(async () => await new ValueTask(Task.Delay(1).ContinueWith(_ => throw new FormatException()))); + await Assert.ThrowsAsync(async () => await new ValueTask(ManualResetValueTaskSource.Delay(1, 0, new FormatException()), 0)); + await Task.Yield(); + } + return 17; + } + + async ValueTask ValueTaskReturningMethod() + { + for (int i = 0; i < 3; i++) + { + // Complete + await Task.CompletedTask; + await Task.FromResult(42); + await new ValueTask(); + await Assert.ThrowsAsync(async () => await new ValueTask(Task.FromException(new FormatException()))); + await Assert.ThrowsAsync(async () => await new ValueTask(ManualResetValueTaskSource.Completed(0, new FormatException()), 0)); + Assert.Equal(42, await new ValueTask(42)); + Assert.Equal(42, await new ValueTask(Task.FromResult(42))); + Assert.Equal(42, await new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0)); + await Assert.ThrowsAsync(async () => await new ValueTask(Task.FromException(new FormatException()))); + await Assert.ThrowsAsync(async () => await new ValueTask(ManualResetValueTaskSource.Completed(0, new FormatException()), 0)); + + // Incomplete + await Assert.ThrowsAsync(async () => await new ValueTask(Task.Delay(1).ContinueWith(_ => throw new FormatException()))); + await Assert.ThrowsAsync(async () => await new ValueTask(ManualResetValueTaskSource.Delay(1, 0, new FormatException()), 0)); + Assert.Equal(42, await new ValueTask(Task.Delay(1).ContinueWith(_ => 42))); + Assert.Equal(42, await new ValueTask(ManualResetValueTaskSource.Delay(1, 42, null), 0)); + await Assert.ThrowsAsync(async () => await new ValueTask(Task.Delay(1).ContinueWith(_ => throw new FormatException()))); + await Assert.ThrowsAsync(async () => await new ValueTask(ManualResetValueTaskSource.Delay(1, 0, new FormatException()), 0)); + await Task.Yield(); + } + } + + async ValueTask ValueTaskInt32ReturningMethod() + { + for (int i = 0; i < 3; i++) + { + // Complete + await Task.CompletedTask; + await Task.FromResult(42); + await new ValueTask(); + await Assert.ThrowsAsync(async () => await new ValueTask(Task.FromException(new FormatException()))); + await Assert.ThrowsAsync(async () => await new ValueTask(ManualResetValueTaskSource.Completed(0, new FormatException()), 0)); + Assert.Equal(42, await new ValueTask(42)); + Assert.Equal(42, await new ValueTask(Task.FromResult(42))); + Assert.Equal(42, await new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0)); + await Assert.ThrowsAsync(async () => await new ValueTask(Task.FromException(new FormatException()))); + await Assert.ThrowsAsync(async () => await new ValueTask(ManualResetValueTaskSource.Completed(0, new FormatException()), 0)); + + // Incomplete + await Assert.ThrowsAsync(async () => await new ValueTask(Task.Delay(1).ContinueWith(_ => throw new FormatException()))); + await Assert.ThrowsAsync(async () => await new ValueTask(ManualResetValueTaskSource.Delay(1, 0, new FormatException()), 0)); + Assert.Equal(42, await new ValueTask(Task.Delay(1).ContinueWith(_ => 42))); + Assert.Equal(42, await new ValueTask(ManualResetValueTaskSource.Delay(1, 42, null), 0)); + await Assert.ThrowsAsync(async () => await new ValueTask(Task.Delay(1).ContinueWith(_ => throw new FormatException()))); + await Assert.ThrowsAsync(async () => await new ValueTask(ManualResetValueTaskSource.Delay(1, 0, new FormatException()), 0)); + await Task.Yield(); + } + return 18; + } + } + + private static bool WrapsTask(ValueTask vt) => vt != default; private static bool WrapsTask(ValueTask vt) => ReferenceEquals(vt.AsTask(), vt.AsTask()); private struct DelegateStateMachine : IAsyncStateMachine diff --git a/external/corefx/src/System.Threading.Tasks.Extensions/tests/Configurations.props b/external/corefx/src/System.Threading.Tasks.Extensions/tests/Configurations.props index c701755863..7de0087598 100644 --- a/external/corefx/src/System.Threading.Tasks.Extensions/tests/Configurations.props +++ b/external/corefx/src/System.Threading.Tasks.Extensions/tests/Configurations.props @@ -4,6 +4,7 @@ netcoreapp; uap; + netfx; \ No newline at end of file diff --git a/external/corefx/src/System.Threading.Tasks.Extensions/tests/Performance/Configurations.props b/external/corefx/src/System.Threading.Tasks.Extensions/tests/Performance/Configurations.props new file mode 100644 index 0000000000..d3ac8a63c7 --- /dev/null +++ b/external/corefx/src/System.Threading.Tasks.Extensions/tests/Performance/Configurations.props @@ -0,0 +1,8 @@ + + + + + netcoreapp; + + + diff --git a/external/corefx/src/System.Threading.Tasks.Extensions/tests/Performance/Perf.ValueTask.cs b/external/corefx/src/System.Threading.Tasks.Extensions/tests/Performance/Perf.ValueTask.cs new file mode 100644 index 0000000000..0124d3a3a3 --- /dev/null +++ b/external/corefx/src/System.Threading.Tasks.Extensions/tests/Performance/Perf.ValueTask.cs @@ -0,0 +1,259 @@ +// 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.Runtime.CompilerServices; +using System.Threading.Tasks.Sources; +using System.Threading.Tasks.Tests; +using Microsoft.Xunit.Performance; +using Xunit; + +namespace System.Threading.Tasks +{ + public class ValueTaskPerfTest + { + [Benchmark(InnerIterationCount = 10_000_000), MeasureGCAllocations] + public async Task Await_FromResult() + { + ValueTask vt = new ValueTask(42); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + long iters = Benchmark.InnerIterationCount; + using (iteration.StartMeasurement()) + { + for (long i = 0; i < iters; i++) + { + await vt; + } + } + } + } + + [Benchmark(InnerIterationCount = 10_000_000), MeasureGCAllocations] + public async Task Await_FromCompletedTask() + { + ValueTask vt = new ValueTask(Task.FromResult(42)); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + long iters = Benchmark.InnerIterationCount; + using (iteration.StartMeasurement()) + { + for (long i = 0; i < iters; i++) + { + await vt; + } + } + } + } + + [Benchmark(InnerIterationCount = 10_000_000), MeasureGCAllocations] + public async Task Await_FromCompletedValueTaskSource() + { + ValueTask vt = new ValueTask(ManualResetValueTaskSource.Completed(42), 0); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + long iters = Benchmark.InnerIterationCount; + using (iteration.StartMeasurement()) + { + for (long i = 0; i < iters; i++) + { + await vt; + } + } + } + } + + [Benchmark(InnerIterationCount = 10_000_000), MeasureGCAllocations] + public async Task CreateAndAwait_FromResult() + { + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + long iters = Benchmark.InnerIterationCount; + using (iteration.StartMeasurement()) + { + for (long i = 0; i < iters; i++) + { + await new ValueTask((int)i); + } + } + } + } + + [Benchmark(InnerIterationCount = 10_000_000), MeasureGCAllocations] + public async Task CreateAndAwait_FromResult_ConfigureAwait() + { + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + long iters = Benchmark.InnerIterationCount; + using (iteration.StartMeasurement()) + { + for (long i = 0; i < iters; i++) + { + await new ValueTask((int)i).ConfigureAwait(false); + } + } + } + } + + [Benchmark(InnerIterationCount = 10_000_000), MeasureGCAllocations] + public async Task CreateAndAwait_FromCompletedTask() + { + Task t = Task.FromResult(42); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + long iters = Benchmark.InnerIterationCount; + using (iteration.StartMeasurement()) + { + for (long i = 0; i < iters; i++) + { + await new ValueTask(t); + } + } + } + } + + [Benchmark(InnerIterationCount = 10_000_000), MeasureGCAllocations] + public async Task CreateAndAwait_FromCompletedTask_ConfigureAwait() + { + Task t = Task.FromResult(42); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + long iters = Benchmark.InnerIterationCount; + using (iteration.StartMeasurement()) + { + for (long i = 0; i < iters; i++) + { + await new ValueTask(t).ConfigureAwait(false); + } + } + } + } + + [Benchmark(InnerIterationCount = 10_000_000), MeasureGCAllocations] + public async Task CreateAndAwait_FromCompletedValueTaskSource() + { + IValueTaskSource vts = ManualResetValueTaskSource.Completed(42); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + long iters = Benchmark.InnerIterationCount; + using (iteration.StartMeasurement()) + { + for (long i = 0; i < iters; i++) + { + await new ValueTask(vts, 0); + } + } + } + } + + [Benchmark(InnerIterationCount = 10_000_000), MeasureGCAllocations] + public async Task CreateAndAwait_FromCompletedValueTaskSource_ConfigureAwait() + { + IValueTaskSource vts = ManualResetValueTaskSource.Completed(42); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + long iters = Benchmark.InnerIterationCount; + using (iteration.StartMeasurement()) + { + for (long i = 0; i < iters; i++) + { + await new ValueTask(vts, 0).ConfigureAwait(false); + } + } + } + } + + [Benchmark(InnerIterationCount = 1_000_000), MeasureGCAllocations] + public async Task CreateAndAwait_FromYieldingAsyncMethod() + { + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + long iters = Benchmark.InnerIterationCount; + using (iteration.StartMeasurement()) + { + for (long i = 0; i < iters; i++) + { + await new ValueTask(YieldOnce()); + } + } + } + } + + [Benchmark(InnerIterationCount = 1_000_000), MeasureGCAllocations] + public async Task CreateAndAwait_FromDelayedTCS() + { + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + long iters = Benchmark.InnerIterationCount; + using (iteration.StartMeasurement()) + { + for (long i = 0; i < iters; i++) + { + var tcs = new TaskCompletionSource(); + ValueTask vt = AwaitTcsAsValueTask(tcs); + tcs.SetResult(42); + await vt; + } + } + } + } + + [Benchmark(InnerIterationCount = 10_000_000), MeasureGCAllocations] + public void Copy_PassAsArgumentAndReturn_FromResult() + { + ValueTask vt = new ValueTask(42); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + long iters = Benchmark.InnerIterationCount; + using (iteration.StartMeasurement()) + { + for (long i = 0; i < iters; i++) + { + vt = ReturnValueTask(vt); + } + } + } + } + + [Benchmark(InnerIterationCount = 10_000_000), MeasureGCAllocations] + public void Copy_PassAsArgumentAndReturn_FromTask() + { + ValueTask vt = new ValueTask(Task.FromResult(42)); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + long iters = Benchmark.InnerIterationCount; + using (iteration.StartMeasurement()) + { + for (long i = 0; i < iters; i++) + { + vt = ReturnValueTask(vt); + } + } + } + } + + [Benchmark(InnerIterationCount = 10_000_000), MeasureGCAllocations] + public void Copy_PassAsArgumentAndReturn_FromValueTaskSource() + { + ValueTask vt = new ValueTask(ManualResetValueTaskSource.Completed(42), 0); + foreach (BenchmarkIteration iteration in Benchmark.Iterations) + { + long iters = Benchmark.InnerIterationCount; + using (iteration.StartMeasurement()) + { + for (long i = 0; i < iters; i++) + { + vt = ReturnValueTask(vt); + } + } + } + } + + [MethodImpl(MethodImplOptions.NoInlining)] + private static ValueTask ReturnValueTask(ValueTask vt) => vt; + + private async ValueTask AwaitTcsAsValueTask(TaskCompletionSource tcs) => await new ValueTask(tcs.Task).ConfigureAwait(false); + + private async Task YieldOnce() { await Task.Yield(); return 42; } + } +} diff --git a/external/corefx/src/System.Threading.Tasks.Extensions/tests/Performance/System.Threading.Tasks.Extensions.Performance.Tests.csproj b/external/corefx/src/System.Threading.Tasks.Extensions/tests/Performance/System.Threading.Tasks.Extensions.Performance.Tests.csproj new file mode 100644 index 0000000000..d7137b792f --- /dev/null +++ b/external/corefx/src/System.Threading.Tasks.Extensions/tests/Performance/System.Threading.Tasks.Extensions.Performance.Tests.csproj @@ -0,0 +1,27 @@ + + + + + true + {77E38A48-61ED-4D79-9136-D88617EE3558} + + + + + + + + Common\System\PerfUtils.cs + + + Common\System\Threading\Tasks\Sources\ManualResetValueTaskSource.cs + + + + + {69e46a6f-9966-45a5-8945-2559fe337827} + PerfRunner + + + + \ No newline at end of file diff --git a/external/corefx/src/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj b/external/corefx/src/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj index ab5b04af66..163a74c9fe 100644 --- a/external/corefx/src/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj +++ b/external/corefx/src/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj @@ -6,12 +6,20 @@ + + + + Common\System\Threading\Tasks\Sources\ManualResetValueTaskSource.cs + + + + \ No newline at end of file diff --git a/external/corefx/src/System.Threading.Tasks.Extensions/tests/ValueTaskTests.cs b/external/corefx/src/System.Threading.Tasks.Extensions/tests/ValueTaskTests.cs index af9ef3be4b..0987439c0c 100644 --- a/external/corefx/src/System.Threading.Tasks.Extensions/tests/ValueTaskTests.cs +++ b/external/corefx/src/System.Threading.Tasks.Extensions/tests/ValueTaskTests.cs @@ -5,14 +5,31 @@ using System.Linq; using System.Reflection; using System.Runtime.CompilerServices; +using System.Threading.Tasks.Sources; using Xunit; namespace System.Threading.Tasks.Tests { public class ValueTaskTests { + public enum CtorMode + { + Result, + Task, + ValueTaskSource + } + [Fact] - public void DefaultValueTask_ValueType_DefaultValue() + public void NonGeneric_DefaultValueTask_DefaultValue() + { + Assert.True(default(ValueTask).IsCompleted); + Assert.True(default(ValueTask).IsCompletedSuccessfully); + Assert.False(default(ValueTask).IsFaulted); + Assert.False(default(ValueTask).IsCanceled); + } + + [Fact] + public void Generic_DefaultValueTask_DefaultValue() { Assert.True(default(ValueTask).IsCompleted); Assert.True(default(ValueTask).IsCompletedSuccessfully); @@ -27,10 +44,32 @@ namespace System.Threading.Tasks.Tests Assert.Equal(null, default(ValueTask).Result); } - [Fact] - public void CreateFromValue_IsRanToCompletion() + [Theory] + [InlineData(CtorMode.Result)] + [InlineData(CtorMode.Task)] + [InlineData(CtorMode.ValueTaskSource)] + public void NonGeneric_CreateFromSuccessfullyCompleted_IsCompletedSuccessfully(CtorMode mode) { - ValueTask t = new ValueTask(42); + ValueTask t = + mode == CtorMode.Result ? default : + mode == CtorMode.Task ? new ValueTask(Task.CompletedTask) : + new ValueTask(ManualResetValueTaskSource.Completed(0, null), 0); + Assert.True(t.IsCompleted); + Assert.True(t.IsCompletedSuccessfully); + Assert.False(t.IsFaulted); + Assert.False(t.IsCanceled); + } + + [Theory] + [InlineData(CtorMode.Result)] + [InlineData(CtorMode.Task)] + [InlineData(CtorMode.ValueTaskSource)] + public void Generic_CreateFromSuccessfullyCompleted_IsCompletedSuccessfully(CtorMode mode) + { + ValueTask t = + mode == CtorMode.Result ? new ValueTask(42) : + mode == CtorMode.Task ? new ValueTask(Task.FromResult(42)) : + new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0); Assert.True(t.IsCompleted); Assert.True(t.IsCompletedSuccessfully); Assert.False(t.IsFaulted); @@ -38,29 +77,87 @@ namespace System.Threading.Tasks.Tests Assert.Equal(42, t.Result); } - [Fact] - public void CreateFromCompletedTask_IsRanToCompletion() + [Theory] + [InlineData(CtorMode.Task)] + [InlineData(CtorMode.ValueTaskSource)] + public void NonGeneric_CreateFromNotCompleted_ThenCompleteSuccessfully(CtorMode mode) { - ValueTask t = new ValueTask(Task.FromResult(42)); - Assert.True(t.IsCompleted); - Assert.True(t.IsCompletedSuccessfully); - Assert.False(t.IsFaulted); - Assert.False(t.IsCanceled); - Assert.Equal(42, t.Result); - } + object completer = null; + ValueTask t = default; + switch (mode) + { + case CtorMode.Task: + var tcs = new TaskCompletionSource(); + t = new ValueTask(tcs.Task); + completer = tcs; + break; - [Fact] - public void CreateFromNotCompletedTask_IsNotRanToCompletion() - { - var tcs = new TaskCompletionSource(); - ValueTask t = new ValueTask(tcs.Task); + case CtorMode.ValueTaskSource: + var mre = new ManualResetValueTaskSource(); + t = new ValueTask(mre, 0); + completer = mre; + break; + } Assert.False(t.IsCompleted); Assert.False(t.IsCompletedSuccessfully); Assert.False(t.IsFaulted); Assert.False(t.IsCanceled); - tcs.SetResult(42); + switch (mode) + { + case CtorMode.Task: + ((TaskCompletionSource)completer).SetResult(42); + break; + + case CtorMode.ValueTaskSource: + ((ManualResetValueTaskSource)completer).SetResult(42); + break; + } + + Assert.True(t.IsCompleted); + Assert.True(t.IsCompletedSuccessfully); + Assert.False(t.IsFaulted); + Assert.False(t.IsCanceled); + } + + [Theory] + [InlineData(CtorMode.Task)] + [InlineData(CtorMode.ValueTaskSource)] + public void Generic_CreateFromNotCompleted_ThenCompleteSuccessfully(CtorMode mode) + { + object completer = null; + ValueTask t = default; + switch (mode) + { + case CtorMode.Task: + var tcs = new TaskCompletionSource(); + t = new ValueTask(tcs.Task); + completer = tcs; + break; + + case CtorMode.ValueTaskSource: + var mre = new ManualResetValueTaskSource(); + t = new ValueTask(mre, 0); + completer = mre; + break; + } + + Assert.False(t.IsCompleted); + Assert.False(t.IsCompletedSuccessfully); + Assert.False(t.IsFaulted); + Assert.False(t.IsCanceled); + + switch (mode) + { + case CtorMode.Task: + ((TaskCompletionSource)completer).SetResult(42); + break; + + case CtorMode.ValueTaskSource: + ((ManualResetValueTaskSource)completer).SetResult(42); + break; + } Assert.Equal(42, t.Result); Assert.True(t.IsCompleted); @@ -69,93 +166,609 @@ namespace System.Threading.Tasks.Tests Assert.False(t.IsCanceled); } - [Fact] - public void CreateFromNullTask_Throws() + [Theory] + [InlineData(CtorMode.Task)] + [InlineData(CtorMode.ValueTaskSource)] + public void NonGeneric_CreateFromNotCompleted_ThenFault(CtorMode mode) { - Assert.Throws(() => new ValueTask((Task)null)); - Assert.Throws(() => new ValueTask((Task)null)); + object completer = null; + ValueTask t = default; + switch (mode) + { + case CtorMode.Task: + var tcs = new TaskCompletionSource(); + t = new ValueTask(tcs.Task); + completer = tcs; + break; + + case CtorMode.ValueTaskSource: + var mre = new ManualResetValueTaskSource(); + t = new ValueTask(mre, 0); + completer = mre; + break; + } + + Assert.False(t.IsCompleted); + Assert.False(t.IsCompletedSuccessfully); + Assert.False(t.IsFaulted); + Assert.False(t.IsCanceled); + + Exception e = new InvalidOperationException(); + + switch (mode) + { + case CtorMode.Task: + ((TaskCompletionSource)completer).SetException(e); + break; + + case CtorMode.ValueTaskSource: + ((ManualResetValueTaskSource)completer).SetException(e); + break; + } + + Assert.True(t.IsCompleted); + Assert.False(t.IsCompletedSuccessfully); + Assert.True(t.IsFaulted); + Assert.False(t.IsCanceled); + + Assert.Same(e, Assert.Throws(() => t.GetAwaiter().GetResult())); + } + + [Theory] + [InlineData(CtorMode.Task)] + [InlineData(CtorMode.ValueTaskSource)] + public void Generic_CreateFromNotCompleted_ThenFault(CtorMode mode) + { + object completer = null; + ValueTask t = default; + switch (mode) + { + case CtorMode.Task: + var tcs = new TaskCompletionSource(); + t = new ValueTask(tcs.Task); + completer = tcs; + break; + + case CtorMode.ValueTaskSource: + var mre = new ManualResetValueTaskSource(); + t = new ValueTask(mre, 0); + completer = mre; + break; + } + + Assert.False(t.IsCompleted); + Assert.False(t.IsCompletedSuccessfully); + Assert.False(t.IsFaulted); + Assert.False(t.IsCanceled); + + Exception e = new InvalidOperationException(); + + switch (mode) + { + case CtorMode.Task: + ((TaskCompletionSource)completer).SetException(e); + break; + + case CtorMode.ValueTaskSource: + ((ManualResetValueTaskSource)completer).SetException(e); + break; + } + + Assert.True(t.IsCompleted); + Assert.False(t.IsCompletedSuccessfully); + Assert.True(t.IsFaulted); + Assert.False(t.IsCanceled); + + Assert.Same(e, Assert.Throws(() => t.Result)); + Assert.Same(e, Assert.Throws(() => t.GetAwaiter().GetResult())); + } + + [Theory] + [InlineData(CtorMode.Task)] + [InlineData(CtorMode.ValueTaskSource)] + public void NonGeneric_CreateFromFaulted_IsFaulted(CtorMode mode) + { + InvalidOperationException e = new InvalidOperationException(); + ValueTask t = mode == CtorMode.Task ? new ValueTask(Task.FromException(e)) : new ValueTask(ManualResetValueTaskSource.Completed(0, e), 0); + + Assert.True(t.IsCompleted); + Assert.False(t.IsCompletedSuccessfully); + Assert.True(t.IsFaulted); + Assert.False(t.IsCanceled); + + Assert.Same(e, Assert.Throws(() => t.GetAwaiter().GetResult())); + } + + [Theory] + [InlineData(CtorMode.Task)] + [InlineData(CtorMode.ValueTaskSource)] + public void Generic_CreateFromFaulted_IsFaulted(CtorMode mode) + { + InvalidOperationException e = new InvalidOperationException(); + ValueTask t = mode == CtorMode.Task ? new ValueTask(Task.FromException(e)) : new ValueTask(ManualResetValueTaskSource.Completed(0, e), 0); + + Assert.True(t.IsCompleted); + Assert.False(t.IsCompletedSuccessfully); + Assert.True(t.IsFaulted); + Assert.False(t.IsCanceled); + + Assert.Same(e, Assert.Throws(() => t.Result)); + Assert.Same(e, Assert.Throws(() => t.GetAwaiter().GetResult())); } [Fact] - public void CreateFromTask_AsTaskIdempotent() + public void NonGeneric_CreateFromNullTask_Throws() { - Task source = Task.FromResult(42); - ValueTask t = new ValueTask(source); + AssertExtensions.Throws("task", () => new ValueTask((Task)null)); + AssertExtensions.Throws("source", () => new ValueTask((IValueTaskSource)null, 0)); + } + + [Fact] + public void Generic_CreateFromNullTask_Throws() + { + AssertExtensions.Throws("task", () => new ValueTask((Task)null)); + AssertExtensions.Throws("task", () => new ValueTask((Task)null)); + + AssertExtensions.Throws("source", () => new ValueTask((IValueTaskSource)null, 0)); + AssertExtensions.Throws("source", () => new ValueTask((IValueTaskSource)null, 0)); + } + + [Fact] + public void NonGeneric_CreateFromTask_AsTaskIdempotent() + { + Task source = Task.FromResult(42); + var t = new ValueTask(source); Assert.Same(source, t.AsTask()); Assert.Same(t.AsTask(), t.AsTask()); } [Fact] - public void CreateFromValue_AsTaskNotIdempotent() + public void Generic_CreateFromTask_AsTaskIdempotent() { - ValueTask t = new ValueTask(42); + Task source = Task.FromResult(42); + var t = new ValueTask(source); + Assert.Same(source, t.AsTask()); + Assert.Same(t.AsTask(), t.AsTask()); + } + + [Fact] + public void NonGeneric_CreateFromDefault_AsTaskIdempotent() + { + var t = new ValueTask(); + Assert.Same(t.AsTask(), t.AsTask()); + } + + [Fact] + public void Generic_CreateFromValue_AsTaskNotIdempotent() + { + var t = new ValueTask(42); Assert.NotSame(Task.FromResult(42), t.AsTask()); Assert.NotSame(t.AsTask(), t.AsTask()); } [Fact] - public async Task CreateFromValue_Await() + public void NonGeneric_CreateFromValueTaskSource_AsTaskIdempotent() // validates unsupported behavior specific to the backing IValueTaskSource { - ValueTask t = new ValueTask(42); - Assert.Equal(42, await t); - Assert.Equal(42, await t.ConfigureAwait(false)); - Assert.Equal(42, await t.ConfigureAwait(true)); + var vt = new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0); + Task t = vt.AsTask(); + Assert.NotNull(t); + Assert.Same(t, vt.AsTask()); + Assert.Same(Task.CompletedTask, vt.AsTask()); } [Fact] - public async Task CreateFromTask_Await_Normal() + public void Generic_CreateFromValueTaskSource_AsTaskNotIdempotent() // validates unsupported behavior specific to the backing IValueTaskSource { - Task source = Task.Delay(1).ContinueWith(_ => 42); - ValueTask t = new ValueTask(source); + var t = new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0); + Assert.NotSame(Task.FromResult(42), t.AsTask()); + Assert.NotSame(t.AsTask(), t.AsTask()); + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task NonGeneric_CreateFromValueTaskSource_Success(bool sync) + { + var vt = new ValueTask(sync ? ManualResetValueTaskSource.Completed(0) : ManualResetValueTaskSource.Delay(1, 0), 0); + Task t = vt.AsTask(); + if (sync) + { + Assert.True(t.Status == TaskStatus.RanToCompletion); + } + await t; + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task Generic_CreateFromValueTaskSource_Success(bool sync) + { + var vt = new ValueTask(sync ? ManualResetValueTaskSource.Completed(42) : ManualResetValueTaskSource.Delay(1, 42), 0); + Task t = vt.AsTask(); + if (sync) + { + Assert.True(t.Status == TaskStatus.RanToCompletion); + } Assert.Equal(42, await t); } - [Fact] - public async Task CreateFromTask_Await_ConfigureAwaitFalse() + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task NonGeneric_CreateFromValueTaskSource_Faulted(bool sync) { - Task source = Task.Delay(1).ContinueWith(_ => 42); - ValueTask t = new ValueTask(source); - Assert.Equal(42, await t.ConfigureAwait(false)); + var vt = new ValueTask(sync ? ManualResetValueTaskSource.Completed(0, new FormatException()) : ManualResetValueTaskSource.Delay(1, 0, new FormatException()), 0); + Task t = vt.AsTask(); + if (sync) + { + Assert.True(t.IsFaulted); + Assert.IsType(t.Exception.InnerException); + } + else + { + await Assert.ThrowsAsync(() => t); + } + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task Generic_CreateFromValueTaskSource_Faulted(bool sync) + { + var vt = new ValueTask(sync ? ManualResetValueTaskSource.Completed(0, new FormatException()) : ManualResetValueTaskSource.Delay(1, 0, new FormatException()), 0); + Task t = vt.AsTask(); + if (sync) + { + Assert.True(t.IsFaulted); + Assert.IsType(t.Exception.InnerException); + } + else + { + await Assert.ThrowsAsync(() => t); + } + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task NonGeneric_CreateFromValueTaskSource_Canceled(bool sync) + { + var vt = new ValueTask(sync ? ManualResetValueTaskSource.Completed(0, new OperationCanceledException()) : ManualResetValueTaskSource.Delay(1, 0, new OperationCanceledException()), 0); + Task t = vt.AsTask(); + if (sync) + { + Assert.True(t.IsCanceled); + } + else + { + await Assert.ThrowsAnyAsync(() => t); + Assert.True(t.IsCanceled); + } + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task Generic_CreateFromValueTaskSource_Canceled(bool sync) + { + var vt = new ValueTask(sync ? ManualResetValueTaskSource.Completed(0, new OperationCanceledException()) : ManualResetValueTaskSource.Delay(1, 0, new OperationCanceledException()), 0); + Task t = vt.AsTask(); + if (sync) + { + Assert.True(t.IsCanceled); + } + else + { + await Assert.ThrowsAnyAsync(() => t); + Assert.True(t.IsCanceled); + } } [Fact] - public async Task CreateFromTask_Await_ConfigureAwaitTrue() + public void NonGeneric_Preserve_FromResult_NoChanges() { - Task source = Task.Delay(1).ContinueWith(_ => 42); - ValueTask t = new ValueTask(source); - Assert.Equal(42, await t.ConfigureAwait(true)); + ValueTask vt1 = default; + ValueTask vt2 = vt1.Preserve(); + Assert.True(vt1 == vt2); } [Fact] - public async Task Awaiter_OnCompleted() + public void NonGeneric_Preserve_FromTask_EqualityMaintained() { - // Since ValueTask implements both OnCompleted and UnsafeOnCompleted, - // OnCompleted typically won't be used by await, so we add an explicit test - // for it here. + ValueTask vt1 = new ValueTask(Task.FromResult(42)); + ValueTask vt2 = vt1.Preserve(); + Assert.True(vt1 == vt2); + } + + [Fact] + public void NonGeneric_Preserve_FromValueTaskSource_TransitionedToTask() + { + ValueTask vt1 = new ValueTask(ManualResetValueTaskSource.Completed(42), 0); + ValueTask vt2 = vt1.Preserve(); + ValueTask vt3 = vt2.Preserve(); + Assert.True(vt1 != vt2); + Assert.True(vt2 == vt3); + Assert.Same(vt2.AsTask(), vt2.AsTask()); + } + + [Fact] + public void Generic_Preserve_FromResult_EqualityMaintained() + { + ValueTask vt1 = new ValueTask(42); + ValueTask vt2 = vt1.Preserve(); + Assert.True(vt1 == vt2); + } + + [Fact] + public void Generic_Preserve_FromTask_EqualityMaintained() + { + ValueTask vt1 = new ValueTask(Task.FromResult(42)); + ValueTask vt2 = vt1.Preserve(); + Assert.True(vt1 == vt2); + } + + [Fact] + public void Generic_Preserve_FromValueTaskSource_TransitionedToTask() + { + ValueTask vt1 = new ValueTask(ManualResetValueTaskSource.Completed(42), 0); + ValueTask vt2 = vt1.Preserve(); + ValueTask vt3 = vt2.Preserve(); + Assert.True(vt1 != vt2); + Assert.True(vt2 == vt3); + Assert.Same(vt2.AsTask(), vt2.AsTask()); + } + + [Theory] + [InlineData(CtorMode.Result)] + [InlineData(CtorMode.Task)] + [InlineData(CtorMode.ValueTaskSource)] + public async Task NonGeneric_CreateFromCompleted_Await(CtorMode mode) + { + ValueTask Create() => + mode == CtorMode.Result ? new ValueTask() : + mode == CtorMode.Task ? new ValueTask(Task.FromResult(42)) : + new ValueTask(ManualResetValueTaskSource.Completed(0, null), 0); + + int thread = Environment.CurrentManagedThreadId; + + await Create(); + Assert.Equal(thread, Environment.CurrentManagedThreadId); + + await Create().ConfigureAwait(false); + Assert.Equal(thread, Environment.CurrentManagedThreadId); + + await Create().ConfigureAwait(true); + Assert.Equal(thread, Environment.CurrentManagedThreadId); + } + + [Theory] + [InlineData(CtorMode.Result)] + [InlineData(CtorMode.Task)] + [InlineData(CtorMode.ValueTaskSource)] + public async Task Generic_CreateFromCompleted_Await(CtorMode mode) + { + ValueTask Create() => + mode == CtorMode.Result ? new ValueTask(42) : + mode == CtorMode.Task ? new ValueTask(Task.FromResult(42)) : + new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0); + + int thread = Environment.CurrentManagedThreadId; + + Assert.Equal(42, await Create()); + Assert.Equal(thread, Environment.CurrentManagedThreadId); + + Assert.Equal(42, await Create().ConfigureAwait(false)); + Assert.Equal(thread, Environment.CurrentManagedThreadId); + + Assert.Equal(42, await Create().ConfigureAwait(true)); + Assert.Equal(thread, Environment.CurrentManagedThreadId); + } + + [Theory] + [InlineData(null)] + [InlineData(false)] + [InlineData(true)] + public async Task NonGeneric_CreateFromTask_Await_Normal(bool? continueOnCapturedContext) + { + var t = new ValueTask(Task.Delay(1)); + switch (continueOnCapturedContext) + { + case null: await t; break; + default: await t.ConfigureAwait(continueOnCapturedContext.Value); break; + } + } + + [Theory] + [InlineData(null)] + [InlineData(false)] + [InlineData(true)] + public async Task Generic_CreateFromTask_Await_Normal(bool? continueOnCapturedContext) + { + var t = new ValueTask(Task.Delay(1).ContinueWith(_ => 42)); + switch (continueOnCapturedContext) + { + case null: Assert.Equal(42, await t); break; + default: Assert.Equal(42, await t.ConfigureAwait(continueOnCapturedContext.Value)); break; + } + } + + [Theory] + [InlineData(null)] + [InlineData(false)] + [InlineData(true)] + public async Task CreateFromValueTaskSource_Await_Normal(bool? continueOnCapturedContext) + { + var mre = new ManualResetValueTaskSource(); + var t = new ValueTask(mre, 0); + var ignored = Task.Delay(1).ContinueWith(_ => mre.SetResult(42)); + switch (continueOnCapturedContext) + { + case null: await t; break; + default: await t.ConfigureAwait(continueOnCapturedContext.Value); break; + } + } + + [Theory] + [InlineData(null)] + [InlineData(false)] + [InlineData(true)] + public async Task Generic_CreateFromValueTaskSource_Await_Normal(bool? continueOnCapturedContext) + { + var mre = new ManualResetValueTaskSource(); + var t = new ValueTask(mre, 0); + var ignored = Task.Delay(1).ContinueWith(_ => mre.SetResult(42)); + switch (continueOnCapturedContext) + { + case null: Assert.Equal(42, await t); break; + default: Assert.Equal(42, await t.ConfigureAwait(continueOnCapturedContext.Value)); break; + } + } + + [Theory] + [InlineData(CtorMode.Result)] + [InlineData(CtorMode.Task)] + [InlineData(CtorMode.ValueTaskSource)] + public async Task NonGeneric_Awaiter_OnCompleted(CtorMode mode) + { + ValueTask t = + mode == CtorMode.Result ? new ValueTask() : + mode == CtorMode.Task ? new ValueTask(Task.CompletedTask) : + new ValueTask(ManualResetValueTaskSource.Completed(0, null), 0); - ValueTask t = new ValueTask(42); var tcs = new TaskCompletionSource(); t.GetAwaiter().OnCompleted(() => tcs.SetResult(true)); await tcs.Task; } [Theory] - [InlineData(true)] - [InlineData(false)] - public async Task ConfiguredAwaiter_OnCompleted(bool continueOnCapturedContext) + [InlineData(CtorMode.Result)] + [InlineData(CtorMode.Task)] + [InlineData(CtorMode.ValueTaskSource)] + public async Task NonGeneric_Awaiter_UnsafeOnCompleted(CtorMode mode) { - // Since ValueTask implements both OnCompleted and UnsafeOnCompleted, - // OnCompleted typically won't be used by await, so we add an explicit test - // for it here. + ValueTask t = + mode == CtorMode.Result ? new ValueTask() : + mode == CtorMode.Task ? new ValueTask(Task.CompletedTask) : + new ValueTask(ManualResetValueTaskSource.Completed(0, null), 0); + + var tcs = new TaskCompletionSource(); + t.GetAwaiter().UnsafeOnCompleted(() => tcs.SetResult(true)); + await tcs.Task; + } + + [Theory] + [InlineData(CtorMode.Result)] + [InlineData(CtorMode.Task)] + [InlineData(CtorMode.ValueTaskSource)] + public async Task Generic_Awaiter_OnCompleted(CtorMode mode) + { + ValueTask t = + mode == CtorMode.Result ? new ValueTask(42) : + mode == CtorMode.Task ? new ValueTask(Task.FromResult(42)) : + new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0); + + var tcs = new TaskCompletionSource(); + t.GetAwaiter().OnCompleted(() => tcs.SetResult(true)); + await tcs.Task; + } + + [Theory] + [InlineData(CtorMode.Result)] + [InlineData(CtorMode.Task)] + [InlineData(CtorMode.ValueTaskSource)] + public async Task Generic_Awaiter_UnsafeOnCompleted(CtorMode mode) + { + ValueTask t = + mode == CtorMode.Result ? new ValueTask(42) : + mode == CtorMode.Task ? new ValueTask(Task.FromResult(42)) : + new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0); + + var tcs = new TaskCompletionSource(); + t.GetAwaiter().UnsafeOnCompleted(() => tcs.SetResult(true)); + await tcs.Task; + } + + [Theory] + [InlineData(CtorMode.Result, true)] + [InlineData(CtorMode.Task, true)] + [InlineData(CtorMode.ValueTaskSource, true)] + [InlineData(CtorMode.Result, false)] + [InlineData(CtorMode.Task, false)] + [InlineData(CtorMode.ValueTaskSource, false)] + public async Task NonGeneric_ConfiguredAwaiter_OnCompleted(CtorMode mode, bool continueOnCapturedContext) + { + ValueTask t = + mode == CtorMode.Result ? new ValueTask() : + mode == CtorMode.Task ? new ValueTask(Task.CompletedTask) : + new ValueTask(ManualResetValueTaskSource.Completed(0, null), 0); - ValueTask t = new ValueTask(42); var tcs = new TaskCompletionSource(); t.ConfigureAwait(continueOnCapturedContext).GetAwaiter().OnCompleted(() => tcs.SetResult(true)); await tcs.Task; } - [Fact] - public async Task Awaiter_ContinuesOnCapturedContext() + [Theory] + [InlineData(CtorMode.Result, true)] + [InlineData(CtorMode.Task, true)] + [InlineData(CtorMode.ValueTaskSource, true)] + [InlineData(CtorMode.Result, false)] + [InlineData(CtorMode.Task, false)] + [InlineData(CtorMode.ValueTaskSource, false)] + public async Task NonGeneric_ConfiguredAwaiter_UnsafeOnCompleted(CtorMode mode, bool continueOnCapturedContext) + { + ValueTask t = + mode == CtorMode.Result ? new ValueTask() : + mode == CtorMode.Task ? new ValueTask(Task.CompletedTask) : + new ValueTask(ManualResetValueTaskSource.Completed(0, null), 0); + + var tcs = new TaskCompletionSource(); + t.ConfigureAwait(continueOnCapturedContext).GetAwaiter().UnsafeOnCompleted(() => tcs.SetResult(true)); + await tcs.Task; + } + + [Theory] + [InlineData(CtorMode.Result, true)] + [InlineData(CtorMode.Task, true)] + [InlineData(CtorMode.ValueTaskSource, true)] + [InlineData(CtorMode.Result, false)] + [InlineData(CtorMode.Task, false)] + [InlineData(CtorMode.ValueTaskSource, false)] + public async Task Generic_ConfiguredAwaiter_OnCompleted(CtorMode mode, bool continueOnCapturedContext) + { + ValueTask t = + mode == CtorMode.Result ? new ValueTask(42) : + mode == CtorMode.Task ? new ValueTask(Task.FromResult(42)) : + new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0); + + var tcs = new TaskCompletionSource(); + t.ConfigureAwait(continueOnCapturedContext).GetAwaiter().OnCompleted(() => tcs.SetResult(true)); + await tcs.Task; + } + + [Theory] + [InlineData(CtorMode.Result, true)] + [InlineData(CtorMode.Task, true)] + [InlineData(CtorMode.ValueTaskSource, true)] + [InlineData(CtorMode.Result, false)] + [InlineData(CtorMode.Task, false)] + [InlineData(CtorMode.ValueTaskSource, false)] + public async Task Generic_ConfiguredAwaiter_UnsafeOnCompleted(CtorMode mode, bool continueOnCapturedContext) + { + ValueTask t = + mode == CtorMode.Result ? new ValueTask(42) : + mode == CtorMode.Task ? new ValueTask(Task.FromResult(42)) : + new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0); + + var tcs = new TaskCompletionSource(); + t.ConfigureAwait(continueOnCapturedContext).GetAwaiter().UnsafeOnCompleted(() => tcs.SetResult(true)); + await tcs.Task; + } + + [Theory] + [InlineData(CtorMode.Result)] + [InlineData(CtorMode.Task)] + [InlineData(CtorMode.ValueTaskSource)] + public async Task NonGeneric_Awaiter_ContinuesOnCapturedContext(CtorMode mode) { await Task.Run(() => { @@ -163,7 +776,11 @@ namespace System.Threading.Tasks.Tests SynchronizationContext.SetSynchronizationContext(tsc); try { - ValueTask t = new ValueTask(42); + ValueTask t = + mode == CtorMode.Result ? new ValueTask() : + mode == CtorMode.Task ? new ValueTask(Task.CompletedTask) : + new ValueTask(ManualResetValueTaskSource.Completed(0, null), 0); + var mres = new ManualResetEventSlim(); t.GetAwaiter().OnCompleted(() => mres.Set()); Assert.True(mres.Wait(10000)); @@ -177,9 +794,12 @@ namespace System.Threading.Tasks.Tests } [Theory] - [InlineData(true)] - [InlineData(false)] - public async Task ConfiguredAwaiter_ContinuesOnCapturedContext(bool continueOnCapturedContext) + [InlineData(CtorMode.Task, false)] + [InlineData(CtorMode.ValueTaskSource, false)] + [InlineData(CtorMode.Result, true)] + [InlineData(CtorMode.Task, true)] + [InlineData(CtorMode.ValueTaskSource, true)] + public async Task Generic_Awaiter_ContinuesOnCapturedContext(CtorMode mode, bool sync) { await Task.Run(() => { @@ -187,7 +807,83 @@ namespace System.Threading.Tasks.Tests SynchronizationContext.SetSynchronizationContext(tsc); try { - ValueTask t = new ValueTask(42); + ValueTask t = + mode == CtorMode.Result ? new ValueTask(42) : + mode == CtorMode.Task ? new ValueTask(sync ? Task.FromResult(42) : Task.Delay(1).ContinueWith(_ => 42)) : + new ValueTask(sync ? ManualResetValueTaskSource.Completed(42, null) : ManualResetValueTaskSource.Delay(1, 42, null), 0); + + var mres = new ManualResetEventSlim(); + t.GetAwaiter().OnCompleted(() => mres.Set()); + Assert.True(mres.Wait(10000)); + Assert.Equal(1, tsc.Posts); + } + finally + { + SynchronizationContext.SetSynchronizationContext(null); + } + }); + } + + [Theory] + [InlineData(CtorMode.Task, true, false)] + [InlineData(CtorMode.ValueTaskSource, true, false)] + [InlineData(CtorMode.Task, false, false)] + [InlineData(CtorMode.ValueTaskSource, false, false)] + [InlineData(CtorMode.Result, true, true)] + [InlineData(CtorMode.Task, true, true)] + [InlineData(CtorMode.ValueTaskSource, true, true)] + [InlineData(CtorMode.Result, false, true)] + [InlineData(CtorMode.Task, false, true)] + [InlineData(CtorMode.ValueTaskSource, false, true)] + public async Task NonGeneric_ConfiguredAwaiter_ContinuesOnCapturedContext(CtorMode mode, bool continueOnCapturedContext, bool sync) + { + await Task.Run(() => + { + var tsc = new TrackingSynchronizationContext(); + SynchronizationContext.SetSynchronizationContext(tsc); + try + { + ValueTask t = + mode == CtorMode.Result ? new ValueTask() : + mode == CtorMode.Task ? new ValueTask(sync ? Task.CompletedTask : Task.Delay(1)) : + new ValueTask(sync ? ManualResetValueTaskSource.Completed(0, null) : ManualResetValueTaskSource.Delay(42, 0, null), 0); + + var mres = new ManualResetEventSlim(); + t.ConfigureAwait(continueOnCapturedContext).GetAwaiter().OnCompleted(() => mres.Set()); + Assert.True(mres.Wait(10000)); + Assert.Equal(continueOnCapturedContext ? 1 : 0, tsc.Posts); + } + finally + { + SynchronizationContext.SetSynchronizationContext(null); + } + }); + } + + [Theory] + [InlineData(CtorMode.Task, true, false)] + [InlineData(CtorMode.ValueTaskSource, true, false)] + [InlineData(CtorMode.Task, false, false)] + [InlineData(CtorMode.ValueTaskSource, false, false)] + [InlineData(CtorMode.Result, true, true)] + [InlineData(CtorMode.Task, true, true)] + [InlineData(CtorMode.ValueTaskSource, true, true)] + [InlineData(CtorMode.Result, false, true)] + [InlineData(CtorMode.Task, false, true)] + [InlineData(CtorMode.ValueTaskSource, false, true)] + public async Task Generic_ConfiguredAwaiter_ContinuesOnCapturedContext(CtorMode mode, bool continueOnCapturedContext, bool sync) + { + await Task.Run(() => + { + var tsc = new TrackingSynchronizationContext(); + SynchronizationContext.SetSynchronizationContext(tsc); + try + { + ValueTask t = + mode == CtorMode.Result ? new ValueTask(42) : + mode == CtorMode.Task ? new ValueTask(sync ? Task.FromResult(42) : Task.Delay(1).ContinueWith(_ => 42)) : + new ValueTask(sync ? ManualResetValueTaskSource.Completed(42, null) : ManualResetValueTaskSource.Delay(1, 42, null), 0); + var mres = new ManualResetEventSlim(); t.ConfigureAwait(continueOnCapturedContext).GetAwaiter().OnCompleted(() => mres.Set()); Assert.True(mres.Wait(10000)); @@ -201,60 +897,170 @@ namespace System.Threading.Tasks.Tests } [Fact] - public void GetHashCode_ContainsResult() + public void NonGeneric_GetHashCode_FromDefault_0() { - ValueTask t = new ValueTask(42); - Assert.Equal(t.Result.GetHashCode(), t.GetHashCode()); + Assert.Equal(0, new ValueTask().GetHashCode()); } [Fact] - public void GetHashCode_ContainsTask() + public void Generic_GetHashCode_FromResult_ContainsResult() { - ValueTask t = new ValueTask(Task.FromResult("42")); - Assert.Equal(t.AsTask().GetHashCode(), t.GetHashCode()); + var vt = new ValueTask(42); + Assert.Equal(vt.Result.GetHashCode(), vt.GetHashCode()); + + var rt = new ValueTask((string)null); + Assert.Equal(0, rt.GetHashCode()); + rt = new ValueTask("12345"); + Assert.Equal(rt.Result.GetHashCode(), rt.GetHashCode()); + } + + [Theory] + [InlineData(CtorMode.Task)] + [InlineData(CtorMode.ValueTaskSource)] + public void NonGeneric_GetHashCode_FromObject_MatchesObjectHashCode(CtorMode mode) + { + object obj; + ValueTask vt; + if (mode == CtorMode.Task) + { + Task t = Task.CompletedTask; + vt = new ValueTask(t); + obj = t; + } + else + { + var t = ManualResetValueTaskSource.Completed(42, null); + vt = new ValueTask(t, 0); + obj = t; + } + + Assert.Equal(obj.GetHashCode(), vt.GetHashCode()); + } + + [Theory] + [InlineData(CtorMode.Task)] + [InlineData(CtorMode.ValueTaskSource)] + public void Generic_GetHashCode_FromObject_MatchesObjectHashCode(CtorMode mode) + { + object obj; + ValueTask vt; + if (mode == CtorMode.Task) + { + Task t = Task.FromResult(42); + vt = new ValueTask(t); + obj = t; + } + else + { + ManualResetValueTaskSource t = ManualResetValueTaskSource.Completed(42, null); + vt = new ValueTask(t, 0); + obj = t; + } + + Assert.Equal(obj.GetHashCode(), vt.GetHashCode()); } [Fact] - public void GetHashCode_ContainsNull() + public void NonGeneric_OperatorEquals() { - ValueTask t = new ValueTask((string)null); - Assert.Equal(0, t.GetHashCode()); + var completedTcs = new TaskCompletionSource(); + completedTcs.SetResult(42); + + var completedVts = ManualResetValueTaskSource.Completed(42, null); + + Assert.True(new ValueTask() == new ValueTask()); + Assert.True(new ValueTask(Task.CompletedTask) == new ValueTask(Task.CompletedTask)); + Assert.True(new ValueTask(completedTcs.Task) == new ValueTask(completedTcs.Task)); + Assert.True(new ValueTask(completedVts, 0) == new ValueTask(completedVts, 0)); + + Assert.False(new ValueTask(Task.CompletedTask) == new ValueTask(completedTcs.Task)); + Assert.False(new ValueTask(Task.CompletedTask) == new ValueTask(completedVts, 0)); + Assert.False(new ValueTask(completedTcs.Task) == new ValueTask(completedVts, 0)); + Assert.False(new ValueTask(completedVts, 17) == new ValueTask(completedVts, 18)); } [Fact] - public void OperatorEquals() + public void Generic_OperatorEquals() { + var completedTask = Task.FromResult(42); + var completedVts = ManualResetValueTaskSource.Completed(42, null); + Assert.True(new ValueTask(42) == new ValueTask(42)); - Assert.False(new ValueTask(42) == new ValueTask(43)); + Assert.True(new ValueTask(completedTask) == new ValueTask(completedTask)); + Assert.True(new ValueTask(completedVts, 17) == new ValueTask(completedVts, 17)); Assert.True(new ValueTask("42") == new ValueTask("42")); Assert.True(new ValueTask((string)null) == new ValueTask((string)null)); + Assert.False(new ValueTask(42) == new ValueTask(43)); Assert.False(new ValueTask("42") == new ValueTask((string)null)); Assert.False(new ValueTask((string)null) == new ValueTask("42")); Assert.False(new ValueTask(42) == new ValueTask(Task.FromResult(42))); Assert.False(new ValueTask(Task.FromResult(42)) == new ValueTask(42)); + Assert.False(new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0) == new ValueTask(42)); + Assert.False(new ValueTask(completedTask) == new ValueTask(completedVts, 0)); + Assert.False(new ValueTask(completedVts, 17) == new ValueTask(completedVts, 18)); } [Fact] - public void OperatorNotEquals() + public void NonGeneric_OperatorNotEquals() { + var completedTcs = new TaskCompletionSource(); + completedTcs.SetResult(42); + + var completedVts = ManualResetValueTaskSource.Completed(42, null); + + Assert.False(new ValueTask() != new ValueTask()); + Assert.False(new ValueTask(Task.CompletedTask) != new ValueTask(Task.CompletedTask)); + Assert.False(new ValueTask(completedTcs.Task) != new ValueTask(completedTcs.Task)); + Assert.False(new ValueTask(completedVts, 0) != new ValueTask(completedVts, 0)); + + Assert.True(new ValueTask(Task.CompletedTask) != new ValueTask(completedTcs.Task)); + Assert.True(new ValueTask(Task.CompletedTask) != new ValueTask(completedVts, 0)); + Assert.True(new ValueTask(completedTcs.Task) != new ValueTask(completedVts, 0)); + Assert.True(new ValueTask(completedVts, 17) != new ValueTask(completedVts, 18)); + } + + [Fact] + public void Generic_OperatorNotEquals() + { + var completedTask = Task.FromResult(42); + var completedVts = ManualResetValueTaskSource.Completed(42, null); + Assert.False(new ValueTask(42) != new ValueTask(42)); - Assert.True(new ValueTask(42) != new ValueTask(43)); + Assert.False(new ValueTask(completedTask) != new ValueTask(completedTask)); + Assert.False(new ValueTask(completedVts, 0) != new ValueTask(completedVts, 0)); Assert.False(new ValueTask("42") != new ValueTask("42")); Assert.False(new ValueTask((string)null) != new ValueTask((string)null)); + Assert.True(new ValueTask(42) != new ValueTask(43)); Assert.True(new ValueTask("42") != new ValueTask((string)null)); Assert.True(new ValueTask((string)null) != new ValueTask("42")); Assert.True(new ValueTask(42) != new ValueTask(Task.FromResult(42))); Assert.True(new ValueTask(Task.FromResult(42)) != new ValueTask(42)); + Assert.True(new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0) != new ValueTask(42)); + Assert.True(new ValueTask(completedTask) != new ValueTask(completedVts, 0)); + Assert.True(new ValueTask(completedVts, 17) != new ValueTask(completedVts, 18)); } [Fact] - public void Equals_ValueTask() + public void NonGeneric_Equals_ValueTask() + { + Assert.True(new ValueTask().Equals(new ValueTask())); + + Assert.False(new ValueTask().Equals(new ValueTask(Task.CompletedTask))); + Assert.False(new ValueTask(Task.CompletedTask).Equals(new ValueTask())); + Assert.False(new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0).Equals(new ValueTask())); + Assert.False(new ValueTask().Equals(new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0))); + Assert.False(new ValueTask(Task.CompletedTask).Equals(new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0))); + Assert.False(new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0).Equals(new ValueTask(Task.CompletedTask))); + } + + [Fact] + public void Generic_Equals_ValueTask() { Assert.True(new ValueTask(42).Equals(new ValueTask(42))); Assert.False(new ValueTask(42).Equals(new ValueTask(43))); @@ -267,10 +1073,29 @@ namespace System.Threading.Tasks.Tests Assert.False(new ValueTask(42).Equals(new ValueTask(Task.FromResult(42)))); Assert.False(new ValueTask(Task.FromResult(42)).Equals(new ValueTask(42))); + Assert.False(new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0).Equals(new ValueTask(42))); } [Fact] - public void Equals_Object() + public void NonGeneric_Equals_Object() + { + Assert.True(new ValueTask().Equals((object)new ValueTask())); + + Assert.False(new ValueTask().Equals((object)new ValueTask(Task.CompletedTask))); + Assert.False(new ValueTask(Task.CompletedTask).Equals((object)new ValueTask())); + Assert.False(new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0).Equals((object)new ValueTask())); + Assert.False(new ValueTask().Equals((object)new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0))); + Assert.False(new ValueTask(Task.CompletedTask).Equals((object)new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0))); + Assert.False(new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0).Equals((object)new ValueTask(Task.CompletedTask))); + + Assert.False(new ValueTask().Equals(null)); + Assert.False(new ValueTask().Equals("12345")); + Assert.False(new ValueTask(Task.CompletedTask).Equals("12345")); + Assert.False(new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0).Equals("12345")); + } + + [Fact] + public void Generic_Equals_Object() { Assert.True(new ValueTask(42).Equals((object)new ValueTask(42))); Assert.False(new ValueTask(42).Equals((object)new ValueTask(43))); @@ -283,6 +1108,7 @@ namespace System.Threading.Tasks.Tests Assert.False(new ValueTask(42).Equals((object)new ValueTask(Task.FromResult(42)))); Assert.False(new ValueTask(Task.FromResult(42)).Equals((object)new ValueTask(42))); + Assert.False(new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0).Equals((object)new ValueTask(42))); Assert.False(new ValueTask(42).Equals((object)null)); Assert.False(new ValueTask(42).Equals(new object())); @@ -290,19 +1116,31 @@ namespace System.Threading.Tasks.Tests } [Fact] - public void ToString_Success() + public void NonGeneric_ToString_Success() + { + Assert.Equal("System.Threading.Tasks.ValueTask", new ValueTask().ToString()); + Assert.Equal("System.Threading.Tasks.ValueTask", new ValueTask(Task.CompletedTask).ToString()); + Assert.Equal("System.Threading.Tasks.ValueTask", new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0).ToString()); + } + + [Fact] + public void Generic_ToString_Success() { Assert.Equal("Hello", new ValueTask("Hello").ToString()); Assert.Equal("Hello", new ValueTask(Task.FromResult("Hello")).ToString()); + Assert.Equal("Hello", new ValueTask(ManualResetValueTaskSource.Completed("Hello", null), 0).ToString()); Assert.Equal("42", new ValueTask(42).ToString()); Assert.Equal("42", new ValueTask(Task.FromResult(42)).ToString()); + Assert.Equal("42", new ValueTask(ManualResetValueTaskSource.Completed(42, null), 0).ToString()); Assert.Same(string.Empty, new ValueTask(string.Empty).ToString()); Assert.Same(string.Empty, new ValueTask(Task.FromResult(string.Empty)).ToString()); + Assert.Same(string.Empty, new ValueTask(ManualResetValueTaskSource.Completed(string.Empty, null), 0).ToString()); Assert.Same(string.Empty, new ValueTask(Task.FromException(new InvalidOperationException())).ToString()); Assert.Same(string.Empty, new ValueTask(Task.FromException(new OperationCanceledException())).ToString()); + Assert.Same(string.Empty, new ValueTask(ManualResetValueTaskSource.Completed(null, new InvalidOperationException()), 0).ToString()); Assert.Same(string.Empty, new ValueTask(Task.FromCanceled(new CancellationToken(true))).ToString()); @@ -310,15 +1148,28 @@ namespace System.Threading.Tasks.Tests Assert.Same(string.Empty, default(ValueTask).ToString()); Assert.Same(string.Empty, new ValueTask((string)null).ToString()); Assert.Same(string.Empty, new ValueTask(Task.FromResult(null)).ToString()); + Assert.Same(string.Empty, new ValueTask(ManualResetValueTaskSource.Completed(null, null), 0).ToString()); Assert.Same(string.Empty, new ValueTask(new TaskCompletionSource().Task).ToString()); } + [Theory] + [InlineData(typeof(ValueTask))] + public void NonGeneric_AsyncMethodBuilderAttribute_ValueTaskAttributed(Type valueTaskType) + { + CustomAttributeData cad = valueTaskType.GetTypeInfo().CustomAttributes.Single(attr => attr.AttributeType == typeof(AsyncMethodBuilderAttribute)); + Type builderTypeCtorArg = (Type)cad.ConstructorArguments[0].Value; + Assert.Equal(typeof(AsyncValueTaskMethodBuilder), builderTypeCtorArg); + + AsyncMethodBuilderAttribute amba = valueTaskType.GetTypeInfo().GetCustomAttribute(); + Assert.Equal(builderTypeCtorArg, amba.BuilderType); + } + [Theory] [InlineData(typeof(ValueTask<>))] [InlineData(typeof(ValueTask))] [InlineData(typeof(ValueTask))] - public void AsyncMethodBuilderAttribute_ValueTaskAttributed(Type valueTaskType) + public void Generic_AsyncMethodBuilderAttribute_ValueTaskAttributed(Type valueTaskType) { CustomAttributeData cad = valueTaskType.GetTypeInfo().CustomAttributes.Single(attr => attr.AttributeType == typeof(AsyncMethodBuilderAttribute)); Type builderTypeCtorArg = (Type)cad.ConstructorArguments[0].Value; @@ -328,6 +1179,158 @@ namespace System.Threading.Tasks.Tests Assert.Equal(builderTypeCtorArg, amba.BuilderType); } + [Fact] + public void NonGeneric_AsTask_ValueTaskSourcePassesInvalidStateToOnCompleted_Throws() + { + void Validate(IValueTaskSource vts) + { + var vt = new ValueTask(vts, 0); + Assert.Throws(() => { vt.AsTask(); }); + } + + Validate(new DelegateValueTaskSource { OnCompletedFunc = (continuation, state, token, flags) => continuation(null) }); + Validate(new DelegateValueTaskSource { OnCompletedFunc = (continuation, state, token, flags) => continuation(new object()) }); + Validate(new DelegateValueTaskSource { OnCompletedFunc = (continuation, state, token, flags) => { continuation(state); continuation(state); } }); + } + + [Fact] + public void Generic_AsTask_ValueTaskSourcePassesInvalidStateToOnCompleted_Throws() + { + void Validate(IValueTaskSource vts) + { + var vt = new ValueTask(vts, 0); + Assert.Throws(() => { vt.AsTask(); }); + } + + Validate(new DelegateValueTaskSource { OnCompletedFunc = (continuation, state, token, flags) => continuation(null) }); + Validate(new DelegateValueTaskSource { OnCompletedFunc = (continuation, state, token, flags) => continuation(new object()) }); + Validate(new DelegateValueTaskSource { OnCompletedFunc = (continuation, state, token, flags) => { continuation(state); continuation(state); } }); + } + + [Fact] + public void NonGeneric_OnCompleted_ValueTaskSourcePassesInvalidStateToOnCompleted_Throws() + { + void Validate(IValueTaskSource vts) + { + var vt = new ValueTask(vts, 0); + Assert.Throws(() => vt.GetAwaiter().OnCompleted(() => { })); + Assert.Throws(() => vt.GetAwaiter().UnsafeOnCompleted(() => { })); + foreach (bool continueOnCapturedContext in new[] { true, false }) + { + Assert.Throws(() => vt.ConfigureAwait(false).GetAwaiter().OnCompleted(() => { })); + Assert.Throws(() => vt.ConfigureAwait(false).GetAwaiter().UnsafeOnCompleted(() => { })); + } + } + + Validate(new DelegateValueTaskSource { OnCompletedFunc = (continuation, state, token, flags) => continuation(null) }); + Validate(new DelegateValueTaskSource { OnCompletedFunc = (continuation, state, token, flags) => continuation(new object()) }); + } + + [Fact] + public void Generic_OnCompleted_ValueTaskSourcePassesInvalidStateToOnCompleted_Throws() + { + void Validate(IValueTaskSource vts) + { + var vt = new ValueTask(vts, 0); + Assert.Throws(() => vt.GetAwaiter().OnCompleted(() => { })); + Assert.Throws(() => vt.GetAwaiter().UnsafeOnCompleted(() => { })); + foreach (bool continueOnCapturedContext in new[] { true, false }) + { + Assert.Throws(() => vt.ConfigureAwait(false).GetAwaiter().OnCompleted(() => { })); + Assert.Throws(() => vt.ConfigureAwait(false).GetAwaiter().UnsafeOnCompleted(() => { })); + } + } + + Validate(new DelegateValueTaskSource { OnCompletedFunc = (continuation, state, token, flags) => continuation(null) }); + Validate(new DelegateValueTaskSource { OnCompletedFunc = (continuation, state, token, flags) => continuation(new object()) }); + } + + [Fact] + public void NonGeneric_TornRead_DoesNotCrashOrHang() + { + // Validate that if we incur a torn read, we may get an exception, but we won't crash or hang. + + object vtBoxed; + + // _obj is null but other fields are from Task construction + vtBoxed = new ValueTask(Task.CompletedTask); + vtBoxed.GetType().GetField("_obj", BindingFlags.NonPublic | BindingFlags.Instance).SetValue(vtBoxed, null); + Record.Exception(() => + { + bool completed = ((ValueTask)vtBoxed).IsCompleted; + ((ValueTask)vtBoxed).GetAwaiter().GetResult(); + }); + + // _obj is a Task but other fields are from result construction + vtBoxed = new ValueTask(); + vtBoxed.GetType().GetField("_obj", BindingFlags.NonPublic | BindingFlags.Instance).SetValue(vtBoxed, Task.CompletedTask); + Record.Exception(() => + { + bool completed = ((ValueTask)vtBoxed).IsCompleted; + ((ValueTask)vtBoxed).GetAwaiter().GetResult(); + }); + + // _obj is an IValueTaskSource but other fields are from Task construction + vtBoxed = new ValueTask(Task.CompletedTask); + vtBoxed.GetType().GetField("_obj", BindingFlags.NonPublic | BindingFlags.Instance).SetValue(vtBoxed, ManualResetValueTaskSource.Completed(42)); + Record.Exception(() => + { + bool completed = ((ValueTask)vtBoxed).IsCompleted; + ((ValueTask)vtBoxed).GetAwaiter().GetResult(); + }); + } + + [Fact] + public void Generic_TornRead_DoesNotCrashOrHang() + { + // Validate that if we incur a torn read, we may get an exception, but we won't crash or hang. + + object vtBoxed; + + // _obj is null but other fields are from Task construction + vtBoxed = new ValueTask(Task.FromResult(42)); + vtBoxed.GetType().GetField("_obj", BindingFlags.NonPublic | BindingFlags.Instance).SetValue(vtBoxed, null); + Record.Exception(() => + { + bool completed = ((ValueTask)vtBoxed).IsCompleted; + ((ValueTask)vtBoxed).GetAwaiter().GetResult(); + }); + + // _obj is a Task but other fields are from result construction + vtBoxed = new ValueTask(42); + vtBoxed.GetType().GetField("_obj", BindingFlags.NonPublic | BindingFlags.Instance).SetValue(vtBoxed, Task.FromResult(42)); + Record.Exception(() => + { + bool completed = ((ValueTask)vtBoxed).IsCompleted; + ((ValueTask)vtBoxed).GetAwaiter().GetResult(); + }); + + // _obj is an IValueTaskSource but other fields are from Task construction + vtBoxed = new ValueTask(Task.FromResult(42)); + vtBoxed.GetType().GetField("_obj", BindingFlags.NonPublic | BindingFlags.Instance).SetValue(vtBoxed, ManualResetValueTaskSource.Completed(42)); + Record.Exception(() => + { + bool completed = ((ValueTask)vtBoxed).IsCompleted; + ((ValueTask)vtBoxed).GetAwaiter().GetResult(); + }); + } + + private sealed class DelegateValueTaskSource : IValueTaskSource, IValueTaskSource + { + public Func GetStatusFunc = null; + public Action GetResultAction = null; + public Func GetResultFunc = null; + public Action, object, short, ValueTaskSourceOnCompletedFlags> OnCompletedFunc; + + public ValueTaskSourceStatus GetStatus(short token) => GetStatusFunc?.Invoke(token) ?? ValueTaskSourceStatus.Pending; + + public void GetResult(short token) => GetResultAction?.Invoke(token); + T IValueTaskSource.GetResult(short token) => GetResultFunc != null ? GetResultFunc(token) : default; + + public void OnCompleted(Action continuation, object state, short token, ValueTaskSourceOnCompletedFlags flags) => + OnCompletedFunc?.Invoke(continuation, state, token, flags); + } + private sealed class TrackingSynchronizationContext : SynchronizationContext { internal int Posts { get; set; } diff --git a/external/corefx/src/System.Threading.Tasks.Parallel/src/System/Threading/Tasks/ParallelETWProvider.cs b/external/corefx/src/System.Threading.Tasks.Parallel/src/System/Threading/Tasks/ParallelETWProvider.cs index 66869e80e4..3f3f6ecd46 100644 --- a/external/corefx/src/System.Threading.Tasks.Parallel/src/System/Threading/Tasks/ParallelETWProvider.cs +++ b/external/corefx/src/System.Threading.Tasks.Parallel/src/System/Threading/Tasks/ParallelETWProvider.cs @@ -113,18 +113,36 @@ namespace System.Threading.Tasks { EventData* eventPayload = stackalloc EventData[6]; - eventPayload[0].Size = sizeof(Int32); - eventPayload[0].DataPointer = ((IntPtr)(&OriginatingTaskSchedulerID)); - eventPayload[1].Size = sizeof(Int32); - eventPayload[1].DataPointer = ((IntPtr)(&OriginatingTaskID)); - eventPayload[2].Size = sizeof(Int32); - eventPayload[2].DataPointer = ((IntPtr)(&ForkJoinContextID)); - eventPayload[3].Size = sizeof(Int32); - eventPayload[3].DataPointer = ((IntPtr)(&OperationType)); - eventPayload[4].Size = sizeof(Int64); - eventPayload[4].DataPointer = ((IntPtr)(&InclusiveFrom)); - eventPayload[5].Size = sizeof(Int64); - eventPayload[5].DataPointer = ((IntPtr)(&ExclusiveTo)); + eventPayload[0] = new EventData + { + Size = sizeof(Int32), + DataPointer = ((IntPtr)(&OriginatingTaskSchedulerID)) + }; + eventPayload[1] = new EventData + { + Size = sizeof(Int32), + DataPointer = ((IntPtr)(&OriginatingTaskID)) + }; + eventPayload[2] = new EventData + { + Size = sizeof(Int32), + DataPointer = ((IntPtr)(&ForkJoinContextID)) + }; + eventPayload[3] = new EventData + { + Size = sizeof(Int32), + DataPointer = ((IntPtr)(&OperationType)) + }; + eventPayload[4] = new EventData + { + Size = sizeof(Int64), + DataPointer = ((IntPtr)(&InclusiveFrom)) + }; + eventPayload[5] = new EventData + { + Size = sizeof(Int64), + DataPointer = ((IntPtr)(&ExclusiveTo)) + }; WriteEventCore(PARALLELLOOPBEGIN_ID, 6, eventPayload); } @@ -153,14 +171,26 @@ namespace System.Threading.Tasks { EventData* eventPayload = stackalloc EventData[4]; - eventPayload[0].Size = sizeof(Int32); - eventPayload[0].DataPointer = ((IntPtr)(&OriginatingTaskSchedulerID)); - eventPayload[1].Size = sizeof(Int32); - eventPayload[1].DataPointer = ((IntPtr)(&OriginatingTaskID)); - eventPayload[2].Size = sizeof(Int32); - eventPayload[2].DataPointer = ((IntPtr)(&ForkJoinContextID)); - eventPayload[3].Size = sizeof(Int64); - eventPayload[3].DataPointer = ((IntPtr)(&TotalIterations)); + eventPayload[0] = new EventData + { + Size = sizeof(Int32), + DataPointer = ((IntPtr)(&OriginatingTaskSchedulerID)) + }; + eventPayload[1] = new EventData + { + Size = sizeof(Int32), + DataPointer = ((IntPtr)(&OriginatingTaskID)) + }; + eventPayload[2] = new EventData + { + Size = sizeof(Int32), + DataPointer = ((IntPtr)(&ForkJoinContextID)) + }; + eventPayload[3] = new EventData + { + Size = sizeof(Int64), + DataPointer = ((IntPtr)(&TotalIterations)) + }; WriteEventCore(PARALLELLOOPEND_ID, 4, eventPayload); } @@ -189,16 +219,31 @@ namespace System.Threading.Tasks { EventData* eventPayload = stackalloc EventData[5]; - eventPayload[0].Size = sizeof(Int32); - eventPayload[0].DataPointer = ((IntPtr)(&OriginatingTaskSchedulerID)); - eventPayload[1].Size = sizeof(Int32); - eventPayload[1].DataPointer = ((IntPtr)(&OriginatingTaskID)); - eventPayload[2].Size = sizeof(Int32); - eventPayload[2].DataPointer = ((IntPtr)(&ForkJoinContextID)); - eventPayload[3].Size = sizeof(Int32); - eventPayload[3].DataPointer = ((IntPtr)(&OperationType)); - eventPayload[4].Size = sizeof(Int32); - eventPayload[4].DataPointer = ((IntPtr)(&ActionCount)); + eventPayload[0] = new EventData + { + Size = sizeof(Int32), + DataPointer = ((IntPtr)(&OriginatingTaskSchedulerID)) + }; + eventPayload[1] = new EventData + { + Size = sizeof(Int32), + DataPointer = ((IntPtr)(&OriginatingTaskID)) + }; + eventPayload[2] = new EventData + { + Size = sizeof(Int32), + DataPointer = ((IntPtr)(&ForkJoinContextID)) + }; + eventPayload[3] = new EventData + { + Size = sizeof(Int32), + DataPointer = ((IntPtr)(&OperationType)) + }; + eventPayload[4] = new EventData + { + Size = sizeof(Int32), + DataPointer = ((IntPtr)(&ActionCount)) + }; WriteEventCore(PARALLELINVOKEBEGIN_ID, 5, eventPayload); } diff --git a/external/corefx/src/System.Threading.Tasks/ref/System.Threading.Tasks.cs b/external/corefx/src/System.Threading.Tasks/ref/System.Threading.Tasks.cs index 91dda148e3..3049cab881 100644 --- a/external/corefx/src/System.Threading.Tasks/ref/System.Threading.Tasks.cs +++ b/external/corefx/src/System.Threading.Tasks/ref/System.Threading.Tasks.cs @@ -116,6 +116,7 @@ namespace System.Threading.Tasks public TaskCanceledException() { } public TaskCanceledException(string message) { } public TaskCanceledException(string message, System.Exception innerException) { } + public TaskCanceledException(string message, System.Exception innerException, System.Threading.CancellationToken token) : base(message, innerException, token) { } public TaskCanceledException(System.Threading.Tasks.Task task) { } protected TaskCanceledException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } public System.Threading.Tasks.Task Task { get { throw null; } } diff --git a/external/corefx/src/System.Threading.Tasks/tests/System.Runtime.CompilerServices/AsyncTaskMethodBuilderTests.cs b/external/corefx/src/System.Threading.Tasks/tests/System.Runtime.CompilerServices/AsyncTaskMethodBuilderTests.cs index c61e8f5e75..79f4c34171 100644 --- a/external/corefx/src/System.Threading.Tasks/tests/System.Runtime.CompilerServices/AsyncTaskMethodBuilderTests.cs +++ b/external/corefx/src/System.Threading.Tasks/tests/System.Runtime.CompilerServices/AsyncTaskMethodBuilderTests.cs @@ -375,6 +375,16 @@ namespace System.Threading.Tasks.Tests TaskMethodBuilderT_UsesCompletedCache(result, shouldBeCached); } + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "https://github.com/dotnet/coreclr/pull/16588")] + [Fact] + [ActiveIssue("TFS 450361 - Codegen optimization issue", TargetFrameworkMonikers.UapAot)] + public static void TaskMethodBuilderDecimal_DoesntUseCompletedCache() + { + TaskMethodBuilderT_UsesCompletedCache(0m, shouldBeCached: false); + TaskMethodBuilderT_UsesCompletedCache(0.0m, shouldBeCached: false); + TaskMethodBuilderT_UsesCompletedCache(42m, shouldBeCached: false); + } + [Theory] [InlineData((string)null, true)] [InlineData("test", false)] @@ -393,6 +403,11 @@ namespace System.Threading.Tasks.Tests atmb2.SetResult(result); Assert.Equal(shouldBeCached, object.ReferenceEquals(atmb1.Task, atmb2.Task)); + if (result != null) + { + Assert.Equal(result.ToString(), atmb1.Task.Result.ToString()); + Assert.Equal(result.ToString(), atmb2.Task.Result.ToString()); + } } [Fact] @@ -529,7 +544,7 @@ namespace System.Threading.Tasks.Tests { Assert.NotNull(e); Assert.NotNull(e.StackTrace); - Assert.Contains("End of stack trace", e.StackTrace); + Assert.Matches(@"---.+---", e.StackTrace); } private class TrackOperationsSynchronizationContext : SynchronizationContext diff --git a/external/corefx/src/System.Threading.Tasks/tests/System.Runtime.CompilerServices/TaskAwaiterTests.cs b/external/corefx/src/System.Threading.Tasks/tests/System.Runtime.CompilerServices/TaskAwaiterTests.cs index e4b12e36c8..06da40cc18 100644 --- a/external/corefx/src/System.Threading.Tasks/tests/System.Runtime.CompilerServices/TaskAwaiterTests.cs +++ b/external/corefx/src/System.Threading.Tasks/tests/System.Runtime.CompilerServices/TaskAwaiterTests.cs @@ -123,6 +123,53 @@ namespace System.Threading.Tasks.Tests } } + [Fact] + public async Task Await_TaskCompletesOnNonDefaultSyncCtx_ContinuesOnDefaultSyncCtx() + { + await Task.Run(async delegate // escape xunit's sync context + { + Assert.Null(SynchronizationContext.Current); + Assert.Same(TaskScheduler.Default, TaskScheduler.Current); + + var ctx = new ValidateCorrectContextSynchronizationContext(); + var tcs = new TaskCompletionSource(); + var ignored = Task.Delay(1).ContinueWith(_ => + { + SynchronizationContext orig = SynchronizationContext.Current; + SynchronizationContext.SetSynchronizationContext(ctx); + try + { + tcs.SetResult(true); + } + finally + { + SynchronizationContext.SetSynchronizationContext(orig); + } + }, TaskScheduler.Default); + await tcs.Task; + + Assert.Null(SynchronizationContext.Current); + Assert.Same(TaskScheduler.Default, TaskScheduler.Current); + }); + } + + [Fact] + public async Task Await_TaskCompletesOnNonDefaultScheduler_ContinuesOnDefaultScheduler() + { + await Task.Run(async delegate // escape xunit's sync context + { + Assert.Null(SynchronizationContext.Current); + Assert.Same(TaskScheduler.Default, TaskScheduler.Current); + + var tcs = new TaskCompletionSource(); + var ignored = Task.Delay(1).ContinueWith(_ => tcs.SetResult(true), new QUWITaskScheduler()); + await tcs.Task; + + Assert.Null(SynchronizationContext.Current); + Assert.Same(TaskScheduler.Default, TaskScheduler.Current); + }); + } + [Fact] public static void GetResult_Completed_Success() { diff --git a/external/corefx/src/System.Threading.Tasks/tests/System.Runtime.CompilerServices/YieldAwaitableTests.cs b/external/corefx/src/System.Threading.Tasks/tests/System.Runtime.CompilerServices/YieldAwaitableTests.cs index 852de99779..92ffdc4ab9 100644 --- a/external/corefx/src/System.Threading.Tasks/tests/System.Runtime.CompilerServices/YieldAwaitableTests.cs +++ b/external/corefx/src/System.Threading.Tasks/tests/System.Runtime.CompilerServices/YieldAwaitableTests.cs @@ -143,8 +143,38 @@ namespace System.Threading.Tasks.Tests SynchronizationContext.SetSynchronizationContext(new ValidateCorrectContextSynchronizationContext()); var ya = Task.Yield().GetAwaiter(); Assert.Throws(() => { ya.OnCompleted(null); }); + SynchronizationContext.SetSynchronizationContext(null); } + [Fact] + public static async Task AsyncMethod_Yields_ReturnsToDefaultTaskScheduler() + { + await Task.Yield(); + Assert.Same(TaskScheduler.Default, TaskScheduler.Current); + } + + [Fact] + public static async Task AsyncMethod_Yields_ReturnsToCorrectTaskScheduler() + { + QUWITaskScheduler ts = new QUWITaskScheduler(); + Assert.NotSame(ts, TaskScheduler.Current); + await Task.Factory.StartNew(async delegate + { + Assert.Same(ts, TaskScheduler.Current); + await Task.Yield(); + Assert.Same(ts, TaskScheduler.Current); + }, CancellationToken.None, TaskCreationOptions.None, ts).Unwrap(); + Assert.NotSame(ts, TaskScheduler.Current); + } + + [Fact] + public static async Task AsyncMethod_Yields_ReturnsToCorrectSynchronizationContext() + { + var sc = new ValidateCorrectContextSynchronizationContext (); + SynchronizationContext.SetSynchronizationContext(sc); + await Task.Yield(); + Assert.Equal(1, sc.PostCount); + } #region Helper Methods / Classes private class ValidateCorrectContextSynchronizationContext : SynchronizationContext diff --git a/external/corefx/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj b/external/corefx/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj index b0745a5e54..43e077a3f8 100644 --- a/external/corefx/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj +++ b/external/corefx/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj @@ -17,6 +17,7 @@ + @@ -54,6 +55,7 @@ + diff --git a/external/corefx/src/System.Threading.Tasks/tests/Task/ExecutionContextFlowTest.cs b/external/corefx/src/System.Threading.Tasks/tests/Task/ExecutionContextFlowTest.cs new file mode 100644 index 0000000000..f19e31c6be --- /dev/null +++ b/external/corefx/src/System.Threading.Tasks/tests/Task/ExecutionContextFlowTest.cs @@ -0,0 +1,40 @@ +// 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.Collections.Generic; +using System.Reflection; +using System.Runtime.CompilerServices; +using Xunit; + +namespace System.Threading.Tasks.Tests +{ + public class ExecutionContextFlowTest + { + [Theory] + [InlineData(false)] + [InlineData(true)] + public void SuppressFlow_TaskCapturesContextAccordingly(bool suppressFlow) + { + Assert.False(ExecutionContext.IsFlowSuppressed()); + if (suppressFlow) ExecutionContext.SuppressFlow(); + try + { + var asyncLocal = new AsyncLocal(); + Task.Factory.StartNew(() => asyncLocal.Value = 42, CancellationToken.None, TaskCreationOptions.None, new InlineTaskScheduler()).Wait(); + Assert.Equal(suppressFlow ? 42 : 0, asyncLocal.Value); + } + finally + { + if (suppressFlow) ExecutionContext.RestoreFlow(); + } + } + + private sealed class InlineTaskScheduler : TaskScheduler + { + protected override void QueueTask(Task task) => TryExecuteTask(task); + protected override bool TryExecuteTaskInline(Task task, bool taskWasPreviouslyQueued) => TryExecuteTask(task); + protected override IEnumerable GetScheduledTasks() => null; + } + } +} diff --git a/external/corefx/src/System.Threading.Tasks/tests/Task/TaskCancelWaitTest.cs b/external/corefx/src/System.Threading.Tasks/tests/Task/TaskCancelWaitTest.cs index 5d178dc3c5..5abffea66f 100644 --- a/external/corefx/src/System.Threading.Tasks/tests/Task/TaskCancelWaitTest.cs +++ b/external/corefx/src/System.Threading.Tasks/tests/Task/TaskCancelWaitTest.cs @@ -70,6 +70,7 @@ namespace System.Threading.Tasks.Tests.CancelWait { case API.Cancel: _taskTree.CancellationTokenSource.Cancel(); + _taskTree.Task.Wait(); break; case API.Wait: @@ -131,8 +132,11 @@ namespace System.Threading.Tasks.Tests.CancelWait if (current.IsLeaf) { - if (!_countdownEvent.IsSet) - _countdownEvent.Signal(); + lock (_countdownEvent) + { + if (!_countdownEvent.IsSet) + _countdownEvent.Signal(); + } } else { @@ -162,10 +166,13 @@ namespace System.Threading.Tasks.Tests.CancelWait } finally { - // stop the tree creation and let the main thread proceed - if (!_countdownEvent.IsSet) + lock (_countdownEvent) { - _countdownEvent.Signal(_countdownEvent.CurrentCount); + // stop the tree creation and let the main thread proceed + if (!_countdownEvent.IsSet) + { + _countdownEvent.Signal(_countdownEvent.CurrentCount); + } } } } @@ -208,6 +215,7 @@ namespace System.Threading.Tasks.Tests.CancelWait VerifyCancel(current); VerifyResult(current); }); + Assert.Null(_caughtException); break; //root task was calling wait diff --git a/external/corefx/src/System.Threading.Tasks/tests/Task/TaskCancelWaitTests.cs.REMOVED.git-id b/external/corefx/src/System.Threading.Tasks/tests/Task/TaskCancelWaitTests.cs.REMOVED.git-id index 9ed9f1f229..ad0352f4d8 100644 --- a/external/corefx/src/System.Threading.Tasks/tests/Task/TaskCancelWaitTests.cs.REMOVED.git-id +++ b/external/corefx/src/System.Threading.Tasks/tests/Task/TaskCancelWaitTests.cs.REMOVED.git-id @@ -1 +1 @@ -f103178e31df172d54c81614cbd615b07eff7f74 \ No newline at end of file +d0848664b34f24dceeff57468988e52aa486b0a1 \ No newline at end of file diff --git a/external/corefx/src/System.Threading.Tasks/tests/Task/TaskCanceledExceptionTests.netcoreapp.cs b/external/corefx/src/System.Threading.Tasks/tests/Task/TaskCanceledExceptionTests.netcoreapp.cs new file mode 100644 index 0000000000..a315e04097 --- /dev/null +++ b/external/corefx/src/System.Threading.Tasks/tests/Task/TaskCanceledExceptionTests.netcoreapp.cs @@ -0,0 +1,27 @@ +// 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; +using Xunit; + +namespace System.Threading.Tasks.Tests +{ + public class TaskCanceledExceptionTests + { + [Fact] + public void TaskCanceledException_Ctor_StringExceptionToken() + { + string message = "my exception message"; + var ioe = new InvalidOperationException(); + var cts = new CancellationTokenSource(); + cts.Cancel(); + + var tce = new TaskCanceledException(message, ioe, cts.Token); + Assert.Equal(message, tce.Message); + Assert.Null(tce.Task); + Assert.Same(ioe, tce.InnerException); + Assert.Equal(cts.Token, tce.CancellationToken); + } + } +} diff --git a/external/corefx/src/System.Threading.Tasks/tests/TaskScheduler/TaskSchedulerTests.cs b/external/corefx/src/System.Threading.Tasks/tests/TaskScheduler/TaskSchedulerTests.cs index aebd9305f2..7974edad8b 100644 --- a/external/corefx/src/System.Threading.Tasks/tests/TaskScheduler/TaskSchedulerTests.cs +++ b/external/corefx/src/System.Threading.Tasks/tests/TaskScheduler/TaskSchedulerTests.cs @@ -292,6 +292,7 @@ namespace System.Threading.Tasks.Tests [Fact] [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Uses reflection to access an internal method of the TaskScheduler class.")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "Needs ConditionalFact in which we can customize linker debug mode")] public static void GetTaskSchedulersForDebugger_ReturnsDefaultScheduler() { MethodInfo getTaskSchedulersForDebuggerMethod = typeof(TaskScheduler).GetTypeInfo().GetDeclaredMethod("GetTaskSchedulersForDebugger"); diff --git a/external/corefx/src/System.Threading.Thread/System.Threading.Thread.sln b/external/corefx/src/System.Threading.Thread/System.Threading.Thread.sln index c69c4d62bb..587b253d3b 100644 --- a/external/corefx/src/System.Threading.Thread/System.Threading.Thread.sln +++ b/external/corefx/src/System.Threading.Thread/System.Threading.Thread.sln @@ -7,6 +7,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Thread.Tes {06197EED-FF48-43F3-976D-463839D43E8C} = {06197EED-FF48-43F3-976D-463839D43E8C} EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MTAMain", "tests\MTAMain\MTAMain.csproj", "{06B19C7D-9EBE-420F-BD33-137DB18A1FEB}" + ProjectSection(ProjectDependencies) = postProject + {06197EED-FF48-43F3-976D-463839D43E8C} = {06197EED-FF48-43F3-976D-463839D43E8C} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "STAMain", "tests\STAMain\STAMain.csproj", "{8045E634-C181-4C6C-AE48-71AC18D1C637}" + ProjectSection(ProjectDependencies) = postProject + {06197EED-FF48-43F3-976D-463839D43E8C} = {06197EED-FF48-43F3-976D-463839D43E8C} + EndProjectSection +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Thread", "src\System.Threading.Thread.csproj", "{06197EED-FF48-43F3-976D-463839D43E8C}" ProjectSection(ProjectDependencies) = postProject {82D06A2D-008D-4A4A-A83D-FB7F04721C87} = {82D06A2D-008D-4A4A-A83D-FB7F04721C87} @@ -26,10 +36,18 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {33F5A50E-B823-4FDD-8571-365C909ACEAE}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {33F5A50E-B823-4FDD-8571-365C909ACEAE}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {33F5A50E-B823-4FDD-8571-365C909ACEAE}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {33F5A50E-B823-4FDD-8571-365C909ACEAE}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU + {33F5A50E-B823-4FDD-8571-365C909ACEAE}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {33F5A50E-B823-4FDD-8571-365C909ACEAE}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {33F5A50E-B823-4FDD-8571-365C909ACEAE}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {33F5A50E-B823-4FDD-8571-365C909ACEAE}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU + {06B19C7D-9EBE-420F-BD33-137DB18A1FEB}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {06B19C7D-9EBE-420F-BD33-137DB18A1FEB}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {06B19C7D-9EBE-420F-BD33-137DB18A1FEB}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {06B19C7D-9EBE-420F-BD33-137DB18A1FEB}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU + {8045E634-C181-4C6C-AE48-71AC18D1C637}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {8045E634-C181-4C6C-AE48-71AC18D1C637}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {8045E634-C181-4C6C-AE48-71AC18D1C637}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {8045E634-C181-4C6C-AE48-71AC18D1C637}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU {06197EED-FF48-43F3-976D-463839D43E8C}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU {06197EED-FF48-43F3-976D-463839D43E8C}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU {06197EED-FF48-43F3-976D-463839D43E8C}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU @@ -44,6 +62,8 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {33F5A50E-B823-4FDD-8571-365C909ACEAE} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} + {06B19C7D-9EBE-420F-BD33-137DB18A1FEB} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} + {8045E634-C181-4C6C-AE48-71AC18D1C637} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} {06197EED-FF48-43F3-976D-463839D43E8C} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD} {82D06A2D-008D-4A4A-A83D-FB7F04721C87} = {2E666815-2EDB-464B-9DF6-380BF4789AD4} EndGlobalSection diff --git a/external/corefx/src/System.Threading.Thread/ref/System.Threading.Thread.cs b/external/corefx/src/System.Threading.Thread/ref/System.Threading.Thread.cs index 561a4695ef..a7364a6def 100644 --- a/external/corefx/src/System.Threading.Thread/ref/System.Threading.Thread.cs +++ b/external/corefx/src/System.Threading.Thread/ref/System.Threading.Thread.cs @@ -65,6 +65,7 @@ namespace System.Threading public System.Threading.ApartmentState GetApartmentState() { throw null; } [System.ObsoleteAttribute("Thread.GetCompressedStack is no longer supported. Please use the System.Threading.CompressedStack class")] public System.Threading.CompressedStack GetCompressedStack() { throw null; } + public static int GetCurrentProcessorId() { throw null; } public static object GetData(System.LocalDataStoreSlot slot) { throw null; } public static System.AppDomain GetDomain() { throw null; } public static int GetDomainID() { throw null; } diff --git a/external/corefx/src/System.Threading.Thread/src/System/Threading/Thread.cs b/external/corefx/src/System.Threading.Thread/src/System/Threading/Thread.cs index f53dc42bda..c504b7c7d6 100644 --- a/external/corefx/src/System.Threading.Thread/src/System/Threading/Thread.cs +++ b/external/corefx/src/System.Threading.Thread/src/System/Threading/Thread.cs @@ -272,6 +272,7 @@ namespace System.Threading throw new InvalidOperationException(SR.Thread_GetSetCompressedStack_NotSupported); } + public static int GetCurrentProcessorId() => RuntimeThread.GetCurrentProcessorId(); public static AppDomain GetDomain() => AppDomain.CurrentDomain; public static int GetDomainID() => GetDomain().Id; public override int GetHashCode() => ManagedThreadId; diff --git a/external/corefx/src/System.Threading.Thread/tests/Configurations.props b/external/corefx/src/System.Threading.Thread/tests/Configurations.props index c398e42e89..f2e3342d5b 100644 --- a/external/corefx/src/System.Threading.Thread/tests/Configurations.props +++ b/external/corefx/src/System.Threading.Thread/tests/Configurations.props @@ -3,6 +3,8 @@ netstandard; + netcoreapp; + uap; \ No newline at end of file diff --git a/external/corefx/src/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj b/external/corefx/src/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj index 2402a73d29..4531542b7f 100644 --- a/external/corefx/src/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj +++ b/external/corefx/src/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj @@ -7,12 +7,19 @@ + + + + + + + CommonTest\System\Threading\ThreadPoolHelpers.cs diff --git a/external/corefx/src/System.Threading.Thread/tests/ThreadTests.cs b/external/corefx/src/System.Threading.Thread/tests/ThreadTests.cs index 22f0f88e50..78ab0bbe3d 100644 --- a/external/corefx/src/System.Threading.Thread/tests/ThreadTests.cs +++ b/external/corefx/src/System.Threading.Thread/tests/ThreadTests.cs @@ -18,7 +18,7 @@ namespace System.Threading.Threads.Tests public static string HostRunnerTest = HostRunner; } - public static class ThreadTests + public static partial class ThreadTests { private const int UnexpectedTimeoutMilliseconds = ThreadTestHelpers.UnexpectedTimeoutMilliseconds; private const int ExpectedTimeoutMilliseconds = ThreadTestHelpers.ExpectedTimeoutMilliseconds; @@ -26,6 +26,11 @@ namespace System.Threading.Threads.Tests [Fact] public static void ConstructorTest() { + const int SmallStackSize = 64 << 10; // 64 KB, currently accepted in all supported platforms, and is the PAL minimum + const int LargeStackSize = 2 << 20; // 2 MB, see https://github.com/dotnet/coreclr/issues/17170 + + int pageSizeBytes = Environment.SystemPageSize; + Action startThreadAndJoin = t => { @@ -38,22 +43,25 @@ namespace System.Threading.Threads.Tests { // Try to stack-allocate an array to verify that close to the expected amount of stack space is actually // available - int bufferSizeBytes = Math.Max(16 << 10, stackSizeBytes - (64 << 10)); + int bufferSizeBytes = Math.Max(16 << 10, stackSizeBytes - SmallStackSize); unsafe { byte* buffer = stackalloc byte[bufferSizeBytes]; - Volatile.Write(ref buffer[0], 0xff); + for (int i = 0; i < bufferSizeBytes; i += pageSizeBytes) + { + Volatile.Write(ref buffer[i], 0xff); + } Volatile.Write(ref buffer[bufferSizeBytes - 1], 0xff); } }; startThreadAndJoin(new Thread(() => verifyStackSize(0))); startThreadAndJoin(new Thread(() => verifyStackSize(0), 0)); - startThreadAndJoin(new Thread(() => verifyStackSize(64 << 10), 64 << 10)); // 64 KB - startThreadAndJoin(new Thread(() => verifyStackSize(16 << 20), 16 << 20)); // 16 MB + startThreadAndJoin(new Thread(() => verifyStackSize(SmallStackSize), SmallStackSize)); + startThreadAndJoin(new Thread(() => verifyStackSize(LargeStackSize), LargeStackSize)); startThreadAndJoin(new Thread(state => verifyStackSize(0))); startThreadAndJoin(new Thread(state => verifyStackSize(0), 0)); - startThreadAndJoin(new Thread(state => verifyStackSize(64 << 10), 64 << 10)); // 64 KB - startThreadAndJoin(new Thread(state => verifyStackSize(16 << 20), 16 << 20)); // 16 MB + startThreadAndJoin(new Thread(state => verifyStackSize(SmallStackSize), SmallStackSize)); + startThreadAndJoin(new Thread(state => verifyStackSize(LargeStackSize), LargeStackSize)); Assert.Throws(() => new Thread((ThreadStart)null)); Assert.Throws(() => new Thread((ThreadStart)null, 0)); @@ -506,12 +514,43 @@ namespace System.Threading.Threads.Tests [Fact] public static void NameTest() { - var t = new Thread(() => { }); + string name = Guid.NewGuid().ToString("N"); + Action waitForThread; + var t = + ThreadTestHelpers.CreateGuardedThread(out waitForThread, () => + { + var ct = Thread.CurrentThread; + Assert.Equal(name, ct.Name); + Assert.Throws(() => ct.Name = null); + Assert.Throws(() => ct.Name = name + "b"); + Assert.Equal(name, ct.Name); + }); + t.IsBackground = true; Assert.Null(t.Name); - t.Name = "a"; - Assert.Equal("a", t.Name); - Assert.Throws(() => t.Name = "b"); - Assert.Equal("a", t.Name); + t.Name = null; + t.Name = null; + Assert.Null(t.Name); + t.Name = name; + Assert.Equal(name, t.Name); + Assert.Throws(() => t.Name = null); + Assert.Throws(() => t.Name = name + "b"); + Assert.Equal(name, t.Name); + t.Start(); + waitForThread(); + + ThreadTestHelpers.RunTestInBackgroundThread(() => + { + var ct = Thread.CurrentThread; + Assert.Null(ct.Name); + ct.Name = null; + ct.Name = null; + Assert.Null(ct.Name); + ct.Name = name; + Assert.Equal(name, ct.Name); + Assert.Throws(() => ct.Name = null); + Assert.Throws(() => ct.Name = name + "b"); + Assert.Equal(name, ct.Name); + }); } [Fact] @@ -893,7 +932,12 @@ namespace System.Threading.Threads.Tests { var e = new AutoResetEvent(false); Action waitForThread; - var t = ThreadTestHelpers.CreateGuardedThread(out waitForThread, e.CheckedWait); + Thread t = null; + t = ThreadTestHelpers.CreateGuardedThread(out waitForThread, () => + { + e.CheckedWait(); + Assert.Same(t, Thread.CurrentThread); + }); t.IsBackground = true; Assert.Throws(() => t.Start(null)); Assert.Throws(() => t.Start(t)); @@ -915,17 +959,29 @@ namespace System.Threading.Threads.Tests Assert.Throws(() => t.Start(null)); Assert.Throws(() => t.Start(t)); - t = ThreadTestHelpers.CreateGuardedThread(out waitForThread, parameter => Assert.Null(parameter)); + t = ThreadTestHelpers.CreateGuardedThread(out waitForThread, parameter => + { + Assert.Null(parameter); + Assert.Same(t, Thread.CurrentThread); + }); t.IsBackground = true; t.Start(); waitForThread(); - t = ThreadTestHelpers.CreateGuardedThread(out waitForThread, parameter => Assert.Null(parameter)); + t = ThreadTestHelpers.CreateGuardedThread(out waitForThread, parameter => + { + Assert.Null(parameter); + Assert.Same(t, Thread.CurrentThread); + }); t.IsBackground = true; t.Start(null); waitForThread(); - t = ThreadTestHelpers.CreateGuardedThread(out waitForThread, parameter => Assert.Equal(t, parameter)); + t = ThreadTestHelpers.CreateGuardedThread(out waitForThread, parameter => + { + Assert.Same(t, parameter); + Assert.Same(t, Thread.CurrentThread); + }); t.IsBackground = true; t.Start(t); waitForThread(); diff --git a/external/corefx/src/System.Threading.Thread/tests/ThreadTests.netcoreapp.cs b/external/corefx/src/System.Threading.Thread/tests/ThreadTests.netcoreapp.cs new file mode 100644 index 0000000000..79e306397a --- /dev/null +++ b/external/corefx/src/System.Threading.Thread/tests/ThreadTests.netcoreapp.cs @@ -0,0 +1,16 @@ +// 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 Xunit; + +namespace System.Threading.Threads.Tests +{ + public static partial class ThreadTests + { + public static void GetCurrentProcessorId() + { + Assert.True(Thread.GetCurrentProcessorId() >= 0); + } + } +} diff --git a/external/corefx/src/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.cs b/external/corefx/src/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.cs index bb4b87c06c..7d1911d50a 100644 --- a/external/corefx/src/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.cs +++ b/external/corefx/src/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.cs @@ -23,7 +23,7 @@ namespace System.Threading public static void GetMinThreads(out int workerThreads, out int completionPortThreads) { throw null; } public static bool QueueUserWorkItem(System.Threading.WaitCallback callBack) { throw null; } public static bool QueueUserWorkItem(System.Threading.WaitCallback callBack, object state) { throw null; } - public static bool QueueUserWorkItem(System.Threading.WaitCallback callBack, object state, bool preferLocal) { throw null; } + public static bool QueueUserWorkItem(System.Action callBack, TState state, bool preferLocal) { throw null; } public static System.Threading.RegisteredWaitHandle RegisterWaitForSingleObject(System.Threading.WaitHandle waitObject, System.Threading.WaitOrTimerCallback callBack, object state, int millisecondsTimeOutInterval, bool executeOnlyOnce) { throw null; } public static System.Threading.RegisteredWaitHandle RegisterWaitForSingleObject(System.Threading.WaitHandle waitObject, System.Threading.WaitOrTimerCallback callBack, object state, long millisecondsTimeOutInterval, bool executeOnlyOnce) { throw null; } public static System.Threading.RegisteredWaitHandle RegisterWaitForSingleObject(System.Threading.WaitHandle waitObject, System.Threading.WaitOrTimerCallback callBack, object state, System.TimeSpan timeout, bool executeOnlyOnce) { throw null; } diff --git a/external/corefx/src/System.Threading.ThreadPool/src/ApiCompatBaseline.uapaot.txt b/external/corefx/src/System.Threading.ThreadPool/src/ApiCompatBaseline.uapaot.txt new file mode 100644 index 0000000000..7070e8721b --- /dev/null +++ b/external/corefx/src/System.Threading.ThreadPool/src/ApiCompatBaseline.uapaot.txt @@ -0,0 +1 @@ +MembersMustExist : Member 'System.Threading.ThreadPool.QueueUserWorkItem(System.Action, TState, System.Boolean)' does not exist in the implementation but it does exist in the contract. \ No newline at end of file diff --git a/external/corefx/src/System.Threading.ThreadPool/tests/ThreadPoolTests.netcoreapp.cs b/external/corefx/src/System.Threading.ThreadPool/tests/ThreadPoolTests.netcoreapp.cs index c3b9a92c3a..4aac66daed 100644 --- a/external/corefx/src/System.Threading.ThreadPool/tests/ThreadPoolTests.netcoreapp.cs +++ b/external/corefx/src/System.Threading.ThreadPool/tests/ThreadPoolTests.netcoreapp.cs @@ -14,7 +14,7 @@ namespace System.Threading.ThreadPools.Tests [InlineData(true)] public void QueueUserWorkItem_PreferLocal_InvalidArguments_Throws(bool preferLocal) { - Assert.Throws(() => ThreadPool.QueueUserWorkItem(null, new object(), preferLocal)); + AssertExtensions.Throws("callBack", () => ThreadPool.QueueUserWorkItem(null, new object(), preferLocal)); } [Theory] @@ -23,24 +23,54 @@ namespace System.Threading.ThreadPools.Tests public async Task QueueUserWorkItem_PreferLocal_NullValidForState(bool preferLocal) { var tcs = new TaskCompletionSource(); - ThreadPool.QueueUserWorkItem(s => - { - tcs.SetResult(84); - }, null, preferLocal); + ThreadPool.QueueUserWorkItem(s => tcs.SetResult(84), (object)null, preferLocal); Assert.Equal(84, await tcs.Task); } [Theory] [InlineData(false)] [InlineData(true)] - public async Task QueueUserWorkItem_PreferLocal_StateObjectPassedThrough(bool preferLocal) + public async Task QueueUserWorkItem_PreferLocal_ReferenceTypeStateObjectPassedThrough(bool preferLocal) { var tcs = new TaskCompletionSource(); - ThreadPool.QueueUserWorkItem(s => - { - ((TaskCompletionSource)s).SetResult(84); - }, tcs, preferLocal); + ThreadPool.QueueUserWorkItem(s => s.SetResult(84), tcs, preferLocal); Assert.Equal(84, await tcs.Task); } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task QueueUserWorkItem_PreferLocal_ValueTypeStateObjectPassedThrough(bool preferLocal) + { + var tcs = new TaskCompletionSource(); + ThreadPool.QueueUserWorkItem(s => s.tcs.SetResult(s.value), (tcs, value: 42), preferLocal); + Assert.Equal(42, await tcs.Task); + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task QueueUserWorkItem_PreferLocal_RunsAsynchronously(bool preferLocal) + { + await Task.Factory.StartNew(() => + { + int origThread = Environment.CurrentManagedThreadId; + var tcs = new TaskCompletionSource(); + ThreadPool.QueueUserWorkItem(s => s.SetResult(Environment.CurrentManagedThreadId), tcs, preferLocal); + Assert.NotEqual(origThread, tcs.Task.GetAwaiter().GetResult()); + }, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default); + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task QueueUserWorkItem_PreferLocal_ExecutionContextFlowed(bool preferLocal) + { + var tcs = new TaskCompletionSource(); + var asyncLocal = new AsyncLocal() { Value = 42 }; + ThreadPool.QueueUserWorkItem(s => s.SetResult(asyncLocal.Value), tcs, preferLocal); + asyncLocal.Value = 0; + Assert.Equal(42, await tcs.Task); + } } } diff --git a/external/corefx/src/System.Threading/ref/System.Threading.cs b/external/corefx/src/System.Threading/ref/System.Threading.cs index 0a9263b007..86e007e429 100644 --- a/external/corefx/src/System.Threading/ref/System.Threading.cs +++ b/external/corefx/src/System.Threading/ref/System.Threading.cs @@ -5,18 +5,17 @@ // Changes to this file must follow the http://aka.ms/api-review process. // ------------------------------------------------------------------------------ - namespace System.Threading { public partial class AbandonedMutexException : System.SystemException { public AbandonedMutexException() { } public AbandonedMutexException(int location, System.Threading.WaitHandle handle) { } + protected AbandonedMutexException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } public AbandonedMutexException(string message) { } public AbandonedMutexException(string message, System.Exception inner) { } public AbandonedMutexException(string message, System.Exception inner, int location, System.Threading.WaitHandle handle) { } public AbandonedMutexException(string message, int location, System.Threading.WaitHandle handle) { } - protected AbandonedMutexException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } public System.Threading.Mutex Mutex { get { throw null; } } public int MutexIndex { get { throw null; } } } @@ -31,22 +30,23 @@ namespace System.Threading public static bool operator !=(System.Threading.AsyncFlowControl a, System.Threading.AsyncFlowControl b) { throw null; } public void Undo() { } } + public partial struct AsyncLocalValueChangedArgs + { + private T _dummy; + private int _dummyPrimitive; + public T CurrentValue { get { throw null; } } + public T PreviousValue { get { throw null; } } + public bool ThreadContextChanged { get { throw null; } } + } public sealed partial class AsyncLocal { public AsyncLocal() { } public AsyncLocal(System.Action> valueChangedHandler) { } public T Value { get { throw null; } set { } } } - public partial struct AsyncLocalValueChangedArgs - { - private T _dummy; - public T CurrentValue { get { throw null; } } - public T PreviousValue { get { throw null; } } - public bool ThreadContextChanged { get { throw null; } } - } public sealed partial class AutoResetEvent : System.Threading.EventWaitHandle { - public AutoResetEvent(bool initialState) : base(default(bool), default(System.Threading.EventResetMode)) { } + public AutoResetEvent(bool initialState) : base (default(bool), default(System.Threading.EventResetMode)) { } } public partial class Barrier : System.IDisposable { @@ -72,9 +72,9 @@ namespace System.Threading { public BarrierPostPhaseException() { } public BarrierPostPhaseException(System.Exception innerException) { } + protected BarrierPostPhaseException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } public BarrierPostPhaseException(string message) { } public BarrierPostPhaseException(string message, System.Exception innerException) { } - protected BarrierPostPhaseException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } } public delegate void ContextCallback(object state); public partial class CountdownEvent : System.IDisposable @@ -118,7 +118,7 @@ namespace System.Threading } public sealed partial class ExecutionContext : System.IDisposable, System.Runtime.Serialization.ISerializable { - private ExecutionContext() { } + internal ExecutionContext() { } public static System.Threading.ExecutionContext Capture() { throw null; } public System.Threading.ExecutionContext CreateCopy() { throw null; } public void Dispose() { } @@ -180,7 +180,7 @@ namespace System.Threading } public partial struct LockCookie { - private int _dummy; + private int _dummyPrimitive; public override bool Equals(object obj) { throw null; } public bool Equals(System.Threading.LockCookie obj) { throw null; } public override int GetHashCode() { throw null; } @@ -190,9 +190,9 @@ namespace System.Threading public partial class LockRecursionException : System.Exception { public LockRecursionException() { } + protected LockRecursionException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } public LockRecursionException(string message) { } public LockRecursionException(string message, System.Exception innerException) { } - protected LockRecursionException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } } public enum LockRecursionPolicy { @@ -201,7 +201,7 @@ namespace System.Threading } public sealed partial class ManualResetEvent : System.Threading.EventWaitHandle { - public ManualResetEvent(bool initialState) : base(default(bool), default(System.Threading.EventResetMode)) { } + public ManualResetEvent(bool initialState) : base (default(bool), default(System.Threading.EventResetMode)) { } } public partial class ManualResetEventSlim : System.IDisposable { @@ -314,9 +314,9 @@ namespace System.Threading public partial class SemaphoreFullException : System.SystemException { public SemaphoreFullException() { } + protected SemaphoreFullException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } public SemaphoreFullException(string message) { } public SemaphoreFullException(string message, System.Exception innerException) { } - protected SemaphoreFullException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } } public partial class SemaphoreSlim : System.IDisposable { @@ -344,7 +344,7 @@ namespace System.Threading public delegate void SendOrPostCallback(object state); public partial struct SpinLock { - private int _dummy; + private int _dummyPrimitive; public SpinLock(bool enableThreadOwnerTracking) { throw null; } public bool IsHeld { get { throw null; } } public bool IsHeldByCurrentThread { get { throw null; } } @@ -358,7 +358,7 @@ namespace System.Threading } public partial struct SpinWait { - private int _dummy; + private int _dummyPrimitive; public int Count { get { throw null; } } public bool NextSpinWillYield { get { throw null; } } public void Reset() { } @@ -389,9 +389,9 @@ namespace System.Threading public partial class SynchronizationLockException : System.SystemException { public SynchronizationLockException() { } + protected SynchronizationLockException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } public SynchronizationLockException(string message) { } public SynchronizationLockException(string message, System.Exception innerException) { } - protected SynchronizationLockException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } } public partial class ThreadLocal : System.IDisposable { @@ -451,8 +451,8 @@ namespace System.Threading public partial class WaitHandleCannotBeOpenedException : System.ApplicationException { public WaitHandleCannotBeOpenedException() { } + protected WaitHandleCannotBeOpenedException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } public WaitHandleCannotBeOpenedException(string message) { } public WaitHandleCannotBeOpenedException(string message, System.Exception innerException) { } - protected WaitHandleCannotBeOpenedException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } } } diff --git a/external/corefx/src/System.Threading/src/System/Threading/CDSsyncETWBCLProvider.cs b/external/corefx/src/System.Threading/src/System/Threading/CDSsyncETWBCLProvider.cs index 53600ee0ab..8541f941c4 100644 --- a/external/corefx/src/System.Threading/src/System/Threading/CDSsyncETWBCLProvider.cs +++ b/external/corefx/src/System.Threading/src/System/Threading/CDSsyncETWBCLProvider.cs @@ -76,10 +76,16 @@ namespace System.Threading EventData* eventPayload = stackalloc EventData[2]; Int32 senseAsInt32 = currentSense ? 1 : 0; // write out Boolean as Int32 - eventPayload[0].Size = sizeof(int); - eventPayload[0].DataPointer = ((IntPtr)(&senseAsInt32)); - eventPayload[1].Size = sizeof(long); - eventPayload[1].DataPointer = ((IntPtr)(&phaseNum)); + eventPayload[0] = new EventData + { + Size = sizeof(int), + DataPointer = ((IntPtr)(&senseAsInt32)) + }; + eventPayload[1] = new EventData + { + Size = sizeof(long), + DataPointer = ((IntPtr)(&phaseNum)) + }; WriteEventCore(BARRIER_PHASEFINISHED_ID, 2, eventPayload); } diff --git a/external/corefx/src/System.Threading/src/System/Threading/CountdownEvent.cs b/external/corefx/src/System.Threading/src/System/Threading/CountdownEvent.cs index 6259d05353..ce14e204ac 100644 --- a/external/corefx/src/System.Threading/src/System/Threading/CountdownEvent.cs +++ b/external/corefx/src/System.Threading/src/System/Threading/CountdownEvent.cs @@ -9,6 +9,7 @@ // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- using System.Diagnostics; +using System.Diagnostics.Private; namespace System.Threading { diff --git a/external/corefx/src/System.Threading/tests/AsyncLocalTests.cs b/external/corefx/src/System.Threading/tests/AsyncLocalTests.cs index b2624ae5e3..39085759ff 100644 --- a/external/corefx/src/System.Threading/tests/AsyncLocalTests.cs +++ b/external/corefx/src/System.Threading/tests/AsyncLocalTests.cs @@ -2,6 +2,8 @@ // 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.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using Xunit; @@ -68,6 +70,55 @@ namespace System.Threading.Tests Assert.Equal(local.Value, 12); } + [Theory] + [MemberData(nameof(GetCounts))] + public static async Task CaptureAndRestoreNullAsyncLocals(int count) + { + AsyncLocal[] locals = new AsyncLocal[count]; + for (var i = 0; i < locals.Length; i++) + { + locals[i] = new AsyncLocal(); + } + + ExecutionContext ec = ExecutionContext.Capture(); + + ExecutionContext.Run( + ec, + _ => + { + for (var i = 0; i < locals.Length; i++) + { + AsyncLocal local = locals[i]; + + Assert.Null(local.Value); + local.Value = 56; + Assert.IsType(local.Value); + Assert.Equal(56, (int)local.Value); + } + }, + null); + + for (var i = 0; i < locals.Length; i++) + { + Assert.Null(locals[i].Value); + } + } + + [Fact] + public static async Task CaptureAndRunOnFlowSupressedContext() + { + ExecutionContext.SuppressFlow(); + try + { + ExecutionContext ec = ExecutionContext.Capture(); + Assert.Throws(() => ExecutionContext.Run(ec, _ => { }, null)); + } + finally + { + ExecutionContext.RestoreFlow(); + } + } + [Fact] public static async Task NotifyOnValuePropertyChange() { @@ -365,10 +416,11 @@ namespace System.Threading.Tests Assert.Equal(local.Value, 42); } - [Fact] - public static async Task AddAndUpdateManyLocals_ValueType() + [Theory] + [MemberData(nameof(GetCounts))] + public static async Task AddAndUpdateManyLocals_ValueType(int count) { - var locals = new AsyncLocal[40]; + var locals = new AsyncLocal[count]; for (int i = 0; i < locals.Length; i++) { locals[i] = new AsyncLocal(); @@ -387,10 +439,11 @@ namespace System.Threading.Tests } } - [Fact] - public static async Task AddUpdateAndRemoveManyLocals_ReferenceType() + [Theory] + [MemberData(nameof(GetCounts))] + public static async Task AddUpdateAndRemoveManyLocals_ReferenceType(int count) { - var locals = new AsyncLocal[40]; + var locals = new AsyncLocal[count]; for (int i = 0; i < locals.Length; i++) { @@ -419,5 +472,180 @@ namespace System.Threading.Tests } } } + + [Theory] + [MemberData(nameof(GetCounts))] + public static async Task AsyncLocalsUnwind(int count) + { + AsyncLocal[] asyncLocals = new AsyncLocal[count]; + + ExecutionContext Default = ExecutionContext.Capture(); + int[] manuallySetCounts = new int[count]; + int[] automaticallyUnsetCounts = new int[count]; + int[] automaticallySetCounts = new int[count]; + ExecutionContext[] capturedContexts = new ExecutionContext[count]; + + // Setup the AsyncLocals; capturing ExecutionContext for each level + await SetLocalsRecursivelyAsync(count - 1); + + ValidateCounts(thresholdIndex: 0, maunalSets: 1, automaticUnsets: 1, automaticSets: 0); + ValidateAsyncLocalsValuesNull(); + + // Check Running with the contexts captured when setting the locals + TestCapturedExecutionContexts(); + + ExecutionContext.SuppressFlow(); + try + { + // Re-check restoring, but starting with a suppressed flow + TestCapturedExecutionContexts(); + } + finally + { + ExecutionContext.RestoreFlow(); + } + + // -- Local functions -- + void ValidateAsyncLocalsValuesNull() + { + // Check AsyncLocals haven't leaked + for (int i = 0; i < asyncLocals.Length; i++) + { + Assert.Null(asyncLocals[i].Value); + } + } + + void ValidateAsyncLocalsValues(int thresholdIndex) + { + for (int localsIndex = 0; localsIndex < asyncLocals.Length; localsIndex++) + { + if (localsIndex >= thresholdIndex) + { + Assert.Equal(localsIndex, (int)asyncLocals[localsIndex].Value); + } + else + { + Assert.Null(asyncLocals[localsIndex].Value); + } + } + } + + void TestCapturedExecutionContexts() + { + for (int contextIndex = 0; contextIndex < asyncLocals.Length; contextIndex++) + { + ClearCounts(); + + ExecutionContext.Run( + capturedContexts[contextIndex].CreateCopy(), + (o) => TestCapturedExecutionContext((int)o), + contextIndex); + + // Validate locals have been restored to the Default context's values + ValidateAsyncLocalsValuesNull(); + } + } + + void TestCapturedExecutionContext(int contextIndex) + { + ValidateCounts(thresholdIndex: contextIndex, maunalSets: 0, automaticUnsets: 0, automaticSets: 1); + // Validate locals have been restored to the outer context's values + ValidateAsyncLocalsValues(thresholdIndex: contextIndex); + + // Validate locals are correctly reset Running with a Default context from a non-Default context + ExecutionContext.Run( + Default.CreateCopy(), + _ => ValidateAsyncLocalsValuesNull(), + null); + + ValidateCounts(thresholdIndex: contextIndex, maunalSets: 0, automaticUnsets: 1, automaticSets: 2); + // Validate locals have been restored to the outer context's values + ValidateAsyncLocalsValues(thresholdIndex: contextIndex); + + for (int innerContextIndex = 0; innerContextIndex < asyncLocals.Length; innerContextIndex++) + { + // Validate locals are correctly restored Running with another non-Default context from a non-Default context + ExecutionContext.Run( + capturedContexts[innerContextIndex].CreateCopy(), + o => ValidateAsyncLocalsValues(thresholdIndex: (int)o), + innerContextIndex); + + // Validate locals have been restored to the outer context's values + ValidateAsyncLocalsValues(thresholdIndex: contextIndex); + } + } + + void ValidateCounts(int thresholdIndex, int maunalSets, int automaticUnsets, int automaticSets) + { + for (int localsIndex = 0; localsIndex < asyncLocals.Length; localsIndex++) + { + Assert.Equal(localsIndex < thresholdIndex ? 0 : maunalSets, manuallySetCounts[localsIndex]); + Assert.Equal(localsIndex < thresholdIndex ? 0 : automaticUnsets, automaticallyUnsetCounts[localsIndex]); + Assert.Equal(localsIndex < thresholdIndex ? 0 : automaticSets, automaticallySetCounts[localsIndex]); + } + } + + // Synchronous function is async to create different ExectutionContexts for each set, and check async unwinding + async Task SetLocalsRecursivelyAsync(int index) + { + // Set AsyncLocal + asyncLocals[index] = new AsyncLocal(CountValueChanges) + { + Value = index + }; + + // Capture context with AsyncLocal set + capturedContexts[index] = ExecutionContext.Capture(); + + if (index > 0) + { + // Go deeper into async stack + int nextIndex = index - 1; + await SetLocalsRecursivelyAsync(index - 1); + // Set is undone by the await + Assert.Null(asyncLocals[nextIndex].Value); + } + } + + void CountValueChanges(AsyncLocalValueChangedArgs args) + { + if (!args.ThreadContextChanged) + { + // Manual create, previous should be null + Assert.Null(args.PreviousValue); + Assert.IsType(args.CurrentValue); + manuallySetCounts[(int)args.CurrentValue]++; + } + else + { + // Automatic change, only one value should be not null + if (args.CurrentValue != null) + { + Assert.Null(args.PreviousValue); + Assert.IsType(args.CurrentValue); + automaticallySetCounts[(int)args.CurrentValue]++; + } + else + { + Assert.Null(args.CurrentValue); + Assert.NotNull(args.PreviousValue); + Assert.IsType(args.PreviousValue); + automaticallyUnsetCounts[(int)args.PreviousValue]++; + } + } + } + + void ClearCounts() + { + Array.Clear(manuallySetCounts, 0, count); + Array.Clear(automaticallyUnsetCounts, 0, count); + Array.Clear(automaticallySetCounts, 0, count); + } + } + + // The data structure that holds AsyncLocals changes based on size; + // so it needs to be tested at a variety of sizes + public static IEnumerable GetCounts() + => Enumerable.Range(1, 40).Select(i => new object[] { i }); } } diff --git a/external/corefx/src/System.Threading/tests/MonitorTests.cs b/external/corefx/src/System.Threading/tests/MonitorTests.cs index 55dd51c976..2d37c4b8c1 100644 --- a/external/corefx/src/System.Threading/tests/MonitorTests.cs +++ b/external/corefx/src/System.Threading/tests/MonitorTests.cs @@ -3,19 +3,20 @@ // See the LICENSE file in the project root for more information. using System; +using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; using Xunit; namespace System.Threading.Tests { - static partial class MonitorTests + public static class MonitorTests { private const int FailTimeoutMilliseconds = 30000; // Attempts a single recursive acquisition/release cycle of a newly-created lock. [Fact] - public static void BasicRecursion(ref string message) + public static void BasicRecursion() { var obj = new object(); Assert.True(Monitor.TryEnter(obj)); @@ -32,7 +33,7 @@ namespace System.Threading.Tests // Attempts to overflow the recursion count of a newly-created lock. [Fact] - public static void DeepRecursion(ref string message) + public static void DeepRecursion() { var obj = new object(); var hc = obj.GetHashCode(); @@ -51,7 +52,7 @@ namespace System.Threading.Tests } Monitor.Exit(obj); - Assert.True(Monitor.IsEntered(obj)); + Assert.False(Monitor.IsEntered(obj)); } [Fact] @@ -98,7 +99,7 @@ namespace System.Threading.Tests Monitor.Enter(obj, ref lockTaken); Assert.True(lockTaken); Monitor.Exit(obj); - Assert.False(lockTaken); + Assert.True(lockTaken); } [Fact] @@ -107,13 +108,13 @@ namespace System.Threading.Tests bool lockTaken = false; var obj = new object(); - AssertExtensions.Throws("obj", () => Monitor.Enter(null)); - AssertExtensions.Throws("obj", () => Monitor.Enter(null, ref lockTaken)); + Assert.Throws(() => Monitor.Enter(null)); + Assert.Throws(() => Monitor.Enter(null, ref lockTaken)); Assert.False(lockTaken); lockTaken = true; AssertExtensions.Throws("lockTaken", () => Monitor.Enter(obj, ref lockTaken)); - Assert.False(lockTaken); + Assert.True(lockTaken); } [Fact] @@ -121,7 +122,7 @@ namespace System.Threading.Tests { var obj = new object(); int valueType = 1; - AssertExtensions.Throws("obj", () => Monitor.Exit(null)); + Assert.Throws(() => Monitor.Exit(null)); Assert.Throws(() => Monitor.Exit(obj)); Assert.Throws(() => Monitor.Exit(new object())); @@ -180,7 +181,7 @@ namespace System.Threading.Tests Monitor.TryEnter(obj, ref lockTaken); Assert.True(lockTaken); Monitor.Exit(obj); - Assert.False(lockTaken); + Assert.True(lockTaken); } [Fact] @@ -189,35 +190,217 @@ namespace System.Threading.Tests bool lockTaken = false; var obj = new object(); - AssertExtensions.Throws("obj", () => Monitor.TryEnter(null)); - AssertExtensions.Throws("obj", () => Monitor.TryEnter(null, ref lockTaken)); - AssertExtensions.Throws("obj", () => Monitor.TryEnter(null, 1)); - AssertExtensions.Throws("obj", () => Monitor.TryEnter(null, 1, ref lockTaken)); - AssertExtensions.Throws("obj", () => Monitor.TryEnter(null, TimeSpan.Zero)); - AssertExtensions.Throws("obj", () => Monitor.TryEnter(null, TimeSpan.Zero, ref lockTaken)); + Assert.Throws(() => Monitor.TryEnter(null)); + Assert.Throws(() => Monitor.TryEnter(null, ref lockTaken)); + Assert.Throws(() => Monitor.TryEnter(null, 1)); + Assert.Throws(() => Monitor.TryEnter(null, 1, ref lockTaken)); + Assert.Throws(() => Monitor.TryEnter(null, TimeSpan.Zero)); + Assert.Throws(() => Monitor.TryEnter(null, TimeSpan.Zero, ref lockTaken)); - AssertExtensions.Throws("millisecondsTimeout", () => Monitor.TryEnter(null, -1)); - AssertExtensions.Throws("millisecondsTimeout", () => Monitor.TryEnter(null, -1, ref lockTaken)); - AssertExtensions.Throws("timeout", () => Monitor.TryEnter(null, TimeSpan.FromMilliseconds(-1))); - AssertExtensions.Throws("timeout", () => Monitor.TryEnter(null, TimeSpan.FromMilliseconds(-1), ref lockTaken)); + Assert.Throws(() => Monitor.TryEnter(obj, -2)); + Assert.Throws(() => Monitor.TryEnter(obj, -2, ref lockTaken)); + AssertExtensions.Throws("timeout", () => Monitor.TryEnter(obj, TimeSpan.FromMilliseconds(-2))); + AssertExtensions.Throws("timeout", () => Monitor.TryEnter(obj, TimeSpan.FromMilliseconds(-2), ref lockTaken)); lockTaken = true; AssertExtensions.Throws("lockTaken", () => Monitor.TryEnter(obj, ref lockTaken)); - lockTaken = true; + Assert.True(lockTaken); AssertExtensions.Throws("lockTaken", () => Monitor.TryEnter(obj, 0, ref lockTaken)); - lockTaken = true; + Assert.True(lockTaken); AssertExtensions.Throws("lockTaken", () => Monitor.TryEnter(obj, TimeSpan.Zero, ref lockTaken)); } + [Fact] + public static void Enter_HasToWait() + { + var thinLock = new object(); + var awareLock = new object(); + + // Actually transition the aware lock to an aware lock by having a background thread wait for a lock + { + Action waitForThread; + Thread t = + ThreadTestHelpers.CreateGuardedThread(out waitForThread, () => + Assert.False(Monitor.TryEnter(awareLock, ThreadTestHelpers.ExpectedTimeoutMilliseconds))); + t.IsBackground = true; + lock (awareLock) + { + t.Start(); + waitForThread(); + } + } + + // When the current thread has the lock, have background threads wait for the lock in various ways. After a short + // duration, release the lock and allow the background threads to acquire the lock. + { + var backgroundTestDelegates = new List>(); + Barrier readyBarrier = null; + + backgroundTestDelegates.Add(lockObj => + { + readyBarrier.SignalAndWait(); + Monitor.Enter(lockObj); + Monitor.Exit(lockObj); + }); + + backgroundTestDelegates.Add(lockObj => + { + readyBarrier.SignalAndWait(); + bool lockTaken = false; + Monitor.Enter(lockObj, ref lockTaken); + Assert.True(lockTaken); + Monitor.Exit(lockObj); + }); + + backgroundTestDelegates.Add(lockObj => + { + readyBarrier.SignalAndWait(); + lock (lockObj) + { + } + }); + + backgroundTestDelegates.Add(lockObj => + { + readyBarrier.SignalAndWait(); + Assert.True(Monitor.TryEnter(lockObj, ThreadTestHelpers.UnexpectedTimeoutMilliseconds)); + Monitor.Exit(lockObj); + }); + + backgroundTestDelegates.Add(lockObj => + { + readyBarrier.SignalAndWait(); + Assert.True( + Monitor.TryEnter(lockObj, TimeSpan.FromMilliseconds(ThreadTestHelpers.UnexpectedTimeoutMilliseconds))); + Monitor.Exit(lockObj); + }); + + backgroundTestDelegates.Add(lockObj => + { + readyBarrier.SignalAndWait(); + bool lockTaken = false; + Monitor.TryEnter(lockObj, ThreadTestHelpers.UnexpectedTimeoutMilliseconds, ref lockTaken); + Assert.True(lockTaken); + Monitor.Exit(lockObj); + }); + + backgroundTestDelegates.Add(lockObj => + { + readyBarrier.SignalAndWait(); + bool lockTaken = false; + Monitor.TryEnter( + lockObj, + TimeSpan.FromMilliseconds(ThreadTestHelpers.UnexpectedTimeoutMilliseconds), + ref lockTaken); + Assert.True(lockTaken); + Monitor.Exit(lockObj); + }); + + int testCount = backgroundTestDelegates.Count * 2; // two iterations each, one for thin lock and one for aware lock + readyBarrier = new Barrier(testCount + 1); // plus main thread + var waitForThreadArray = new Action[testCount]; + for (int i = 0; i < backgroundTestDelegates.Count; ++i) + { + int icopy = i; // for use in delegates + Thread t = + ThreadTestHelpers.CreateGuardedThread(out waitForThreadArray[i * 2], + () => backgroundTestDelegates[icopy](thinLock)); + t.IsBackground = true; + t.Start(); + t = ThreadTestHelpers.CreateGuardedThread(out waitForThreadArray[i * 2 + 1], + () => backgroundTestDelegates[icopy](awareLock)); + t.IsBackground = true; + t.Start(); + } + + lock (thinLock) + { + lock (awareLock) + { + readyBarrier.SignalAndWait(ThreadTestHelpers.UnexpectedTimeoutMilliseconds); + Thread.Sleep(ThreadTestHelpers.ExpectedTimeoutMilliseconds); + } + } + foreach (Action waitForThread in waitForThreadArray) + waitForThread(); + } + + // When the current thread has the lock, have background threads wait for the lock in various ways and time out + // after a short duration + { + var backgroundTestDelegates = new List>(); + Barrier readyBarrier = null; + + backgroundTestDelegates.Add(lockObj => + { + readyBarrier.SignalAndWait(); + Assert.False(Monitor.TryEnter(lockObj, ThreadTestHelpers.ExpectedTimeoutMilliseconds)); + }); + + backgroundTestDelegates.Add(lockObj => + { + readyBarrier.SignalAndWait(); + Assert.False( + Monitor.TryEnter(lockObj, TimeSpan.FromMilliseconds(ThreadTestHelpers.ExpectedTimeoutMilliseconds))); + }); + + backgroundTestDelegates.Add(lockObj => + { + readyBarrier.SignalAndWait(); + bool lockTaken = false; + Monitor.TryEnter(lockObj, ThreadTestHelpers.ExpectedTimeoutMilliseconds, ref lockTaken); + Assert.False(lockTaken); + }); + + backgroundTestDelegates.Add(lockObj => + { + readyBarrier.SignalAndWait(); + bool lockTaken = false; + Monitor.TryEnter( + lockObj, + TimeSpan.FromMilliseconds(ThreadTestHelpers.ExpectedTimeoutMilliseconds), + ref lockTaken); + Assert.False(lockTaken); + }); + + int testCount = backgroundTestDelegates.Count * 2; // two iterations each, one for thin lock and one for aware lock + readyBarrier = new Barrier(testCount + 1); // plus main thread + var waitForThreadArray = new Action[testCount]; + for (int i = 0; i < backgroundTestDelegates.Count; ++i) + { + int icopy = i; // for use in delegates + Thread t = + ThreadTestHelpers.CreateGuardedThread(out waitForThreadArray[i * 2], + () => backgroundTestDelegates[icopy](thinLock)); + t.IsBackground = true; + t.Start(); + t = ThreadTestHelpers.CreateGuardedThread(out waitForThreadArray[i * 2 + 1], + () => backgroundTestDelegates[icopy](awareLock)); + t.IsBackground = true; + t.Start(); + } + + lock (thinLock) + { + lock (awareLock) + { + readyBarrier.SignalAndWait(ThreadTestHelpers.UnexpectedTimeoutMilliseconds); + foreach (Action waitForThread in waitForThreadArray) + waitForThread(); + } + } + } + } + [Fact] public static void Wait_Invalid() { var obj = new object(); - AssertExtensions.Throws("obj", () => Monitor.Wait(null)); - AssertExtensions.Throws("obj", () => Monitor.Wait(null, 1)); - AssertExtensions.Throws("obj", () => Monitor.Wait(null, TimeSpan.Zero)); - AssertExtensions.Throws("millisecondsTimeout", () => Monitor.Wait(null, -1)); - AssertExtensions.Throws("timeout", () => Monitor.Wait(null, TimeSpan.FromMilliseconds(-1))); + Assert.Throws(() => Monitor.Wait(null)); + Assert.Throws(() => Monitor.Wait(null, 1)); + Assert.Throws(() => Monitor.Wait(null, TimeSpan.Zero)); + Assert.Throws(() => Monitor.Wait(obj, -2)); + AssertExtensions.Throws("timeout", () => Monitor.Wait(obj, TimeSpan.FromMilliseconds(-2))); } [Fact] diff --git a/external/corefx/src/System.Threading/tests/Performance/Perf.EventWaitHandle.cs b/external/corefx/src/System.Threading/tests/Performance/Perf.EventWaitHandle.cs index 16352a5d30..448c978bb1 100644 --- a/external/corefx/src/System.Threading/tests/Performance/Perf.EventWaitHandle.cs +++ b/external/corefx/src/System.Threading/tests/Performance/Perf.EventWaitHandle.cs @@ -9,18 +9,23 @@ namespace System.Threading.Tests { public class Perf_EventWaitHandle { - [Benchmark] + private const int IterationCount = 100_000; + + [Benchmark(InnerIterationCount = IterationCount)] public void Set_Reset() { - foreach (var iteration in Benchmark.Iterations) + using (EventWaitHandle are = new EventWaitHandle(false, EventResetMode.AutoReset)) { - using (EventWaitHandle are = new EventWaitHandle(false, EventResetMode.AutoReset)) - using (iteration.StartMeasurement()) + foreach (var iteration in Benchmark.Iterations) { - are.Set(); are.Reset(); are.Set(); are.Reset(); - are.Set(); are.Reset(); are.Set(); are.Reset(); - are.Set(); are.Reset(); are.Set(); are.Reset(); - are.Set(); are.Reset(); are.Set(); are.Reset(); + using (iteration.StartMeasurement()) + { + for (int i = 0; i < IterationCount; i++) + { + are.Set(); + are.Reset(); + } + } } } } diff --git a/external/corefx/src/System.Threading/tests/Performance/Perf.Interlocked.cs b/external/corefx/src/System.Threading/tests/Performance/Perf.Interlocked.cs index 3639b2023e..e66deb3fed 100644 --- a/external/corefx/src/System.Threading/tests/Performance/Perf.Interlocked.cs +++ b/external/corefx/src/System.Threading/tests/Performance/Perf.Interlocked.cs @@ -8,7 +8,9 @@ namespace System.Threading.Tests { public class Perf_Interlocked { - [Benchmark(InnerIterationCount = 1000)] + private const int IterationCount = 10_000_000; + + [Benchmark(InnerIterationCount = IterationCount)] public static void Increment_int() { int location = 0; @@ -17,7 +19,7 @@ namespace System.Threading.Tests { using (iteration.StartMeasurement()) { - for (int i = 0; i < Benchmark.InnerIterationCount; i++) + for (int i = 0; i < IterationCount; i++) { Interlocked.Increment(ref location); } @@ -25,7 +27,7 @@ namespace System.Threading.Tests } } - [Benchmark(InnerIterationCount = 1000)] + [Benchmark(InnerIterationCount = IterationCount)] public static void Decrement_int() { int location = 0; @@ -34,7 +36,7 @@ namespace System.Threading.Tests { using (iteration.StartMeasurement()) { - for (int i = 0; i < Benchmark.InnerIterationCount; i++) + for (int i = 0; i < IterationCount; i++) { Interlocked.Decrement(ref location); } @@ -42,7 +44,7 @@ namespace System.Threading.Tests } } - [Benchmark(InnerIterationCount = 1000)] + [Benchmark(InnerIterationCount = IterationCount)] public void Increment_long() { long location = 0; @@ -51,7 +53,7 @@ namespace System.Threading.Tests { using (iteration.StartMeasurement()) { - for (int i = 0; i < Benchmark.InnerIterationCount; i++) + for (int i = 0; i < IterationCount; i++) { Interlocked.Increment(ref location); } @@ -59,7 +61,7 @@ namespace System.Threading.Tests } } - [Benchmark(InnerIterationCount = 1000)] + [Benchmark(InnerIterationCount = IterationCount)] public void Decrement_long() { long location = 0; @@ -68,7 +70,7 @@ namespace System.Threading.Tests { using (iteration.StartMeasurement()) { - for (int i = 0; i < Benchmark.InnerIterationCount; i++) + for (int i = 0; i < IterationCount; i++) { Interlocked.Decrement(ref location); } @@ -76,7 +78,7 @@ namespace System.Threading.Tests } } - [Benchmark(InnerIterationCount = 1000)] + [Benchmark(InnerIterationCount = IterationCount)] public void Add_int() { int location = 0; @@ -85,7 +87,7 @@ namespace System.Threading.Tests { using (iteration.StartMeasurement()) { - for (int i = 0; i < Benchmark.InnerIterationCount; i++) + for (int i = 0; i < IterationCount; i++) { Interlocked.Add(ref location, 2); } @@ -93,7 +95,7 @@ namespace System.Threading.Tests } } - [Benchmark(InnerIterationCount = 1000)] + [Benchmark(InnerIterationCount = IterationCount)] public void Add_long() { long location = 0; @@ -102,7 +104,7 @@ namespace System.Threading.Tests { using (iteration.StartMeasurement()) { - for (int i = 0; i < Benchmark.InnerIterationCount; i++) + for (int i = 0; i < IterationCount; i++) { Interlocked.Add(ref location, 2); } @@ -110,7 +112,7 @@ namespace System.Threading.Tests } } - [Benchmark(InnerIterationCount = 1000)] + [Benchmark(InnerIterationCount = IterationCount)] public static void Exchange_int() { int location = 0; @@ -120,7 +122,7 @@ namespace System.Threading.Tests { using (iteration.StartMeasurement()) { - for (int i = 0; i < Benchmark.InnerIterationCount; i++) + for (int i = 0; i < IterationCount; i++) { Interlocked.Exchange(ref location, newValue); } @@ -128,7 +130,7 @@ namespace System.Threading.Tests } } - [Benchmark(InnerIterationCount = 1000)] + [Benchmark(InnerIterationCount = IterationCount)] public static void Exchange_long() { long location = 0; @@ -138,7 +140,7 @@ namespace System.Threading.Tests { using (iteration.StartMeasurement()) { - for (int i = 0; i < Benchmark.InnerIterationCount; i++) + for (int i = 0; i < IterationCount; i++) { Interlocked.Exchange(ref location, newValue); } @@ -146,7 +148,7 @@ namespace System.Threading.Tests } } - [Benchmark(InnerIterationCount = 500)] + [Benchmark(InnerIterationCount = IterationCount)] public static void CompareExchange_int() { int location = 0; @@ -157,7 +159,7 @@ namespace System.Threading.Tests { using (iteration.StartMeasurement()) { - for (int i = 0; i < Benchmark.InnerIterationCount; i++) + for (int i = 0; i < IterationCount; i++) { Interlocked.CompareExchange(ref location, newValue, comparand); } @@ -165,7 +167,7 @@ namespace System.Threading.Tests } } - [Benchmark(InnerIterationCount = 500)] + [Benchmark(InnerIterationCount = IterationCount)] public static void CompareExchange_long() { long location = 0; @@ -176,7 +178,7 @@ namespace System.Threading.Tests { using (iteration.StartMeasurement()) { - for (int i = 0; i < Benchmark.InnerIterationCount; i++) + for (int i = 0; i < IterationCount; i++) { Interlocked.CompareExchange(ref location, newValue, comparand); } diff --git a/external/corefx/src/System.Threading/tests/Performance/Perf.Lock.cs b/external/corefx/src/System.Threading/tests/Performance/Perf.Lock.cs index cd969f8a2c..8f7d19efa2 100644 --- a/external/corefx/src/System.Threading/tests/Performance/Perf.Lock.cs +++ b/external/corefx/src/System.Threading/tests/Performance/Perf.Lock.cs @@ -9,7 +9,9 @@ namespace System.Threading.Tests { public class Perf_Lock { - [Benchmark(InnerIterationCount = 100)] + private const int IterationCount = 2_000_000; + + [Benchmark(InnerIterationCount = IterationCount)] public static void ReaderWriterLockSlimPerf() { ReaderWriterLockSlim rwLock = new ReaderWriterLockSlim(); @@ -17,7 +19,7 @@ namespace System.Threading.Tests { using (iteration.StartMeasurement()) { - for (int i = 0; i < Benchmark.InnerIterationCount; i++) + for (int i = 0; i < IterationCount; i++) { rwLock.EnterReadLock(); rwLock.ExitReadLock(); diff --git a/external/corefx/src/System.Threading/tests/Performance/Perf.Monitor.cs b/external/corefx/src/System.Threading/tests/Performance/Perf.Monitor.cs index 33159ec365..1037b63bcf 100644 --- a/external/corefx/src/System.Threading/tests/Performance/Perf.Monitor.cs +++ b/external/corefx/src/System.Threading/tests/Performance/Perf.Monitor.cs @@ -8,7 +8,9 @@ namespace System.Threading.Tests { public class Perf_Monitor { - [Benchmark(InnerIterationCount = 250)] + private const int IterationCount = 4_000_000; + + [Benchmark(InnerIterationCount = IterationCount)] public static void EnterExit() { object sync = new object(); @@ -17,7 +19,7 @@ namespace System.Threading.Tests { using (iteration.StartMeasurement()) { - for (int i = 0; i < Benchmark.InnerIterationCount; i++) + for (int i = 0; i < IterationCount; i++) { Monitor.Enter(sync); Monitor.Exit(sync); @@ -26,7 +28,7 @@ namespace System.Threading.Tests } } - [Benchmark(InnerIterationCount = 100)] + [Benchmark(InnerIterationCount = IterationCount)] public static void TryEnterExit() { object sync = new object(); @@ -35,7 +37,7 @@ namespace System.Threading.Tests { using (iteration.StartMeasurement()) { - for (int i = 0; i < Benchmark.InnerIterationCount; i++) + for (int i = 0; i < IterationCount; i++) { Monitor.TryEnter(sync, 0); Monitor.Exit(sync); diff --git a/external/corefx/src/System.Threading/tests/Performance/Perf.SpinLock.cs b/external/corefx/src/System.Threading/tests/Performance/Perf.SpinLock.cs index f47408e11f..e84b5f6254 100644 --- a/external/corefx/src/System.Threading/tests/Performance/Perf.SpinLock.cs +++ b/external/corefx/src/System.Threading/tests/Performance/Perf.SpinLock.cs @@ -8,7 +8,9 @@ namespace System.Threading.Tests { public class Perf_SpinLock { - [Benchmark(InnerIterationCount = 100)] + private const int IterationCount = 1_000_000; + + [Benchmark(InnerIterationCount = IterationCount)] public void EnterExit() { SpinLock spinLock = new SpinLock(); @@ -17,7 +19,7 @@ namespace System.Threading.Tests { using (iteration.StartMeasurement()) { - for (int i = 0; i < Benchmark.InnerIterationCount; i++) + for (int i = 0; i < IterationCount; i++) { bool lockTaken = false; @@ -28,7 +30,7 @@ namespace System.Threading.Tests } } - [Benchmark(InnerIterationCount = 100)] + [Benchmark(InnerIterationCount = IterationCount)] public void TryEnterExit() { SpinLock spinLock = new SpinLock(); @@ -37,7 +39,7 @@ namespace System.Threading.Tests { using (iteration.StartMeasurement()) { - for (int i = 0; i < Benchmark.InnerIterationCount; i++) + for (int i = 0; i < IterationCount; i++) { bool lockTaken = false; diff --git a/external/corefx/src/System.Threading/tests/Performance/Perf.Volatile.cs b/external/corefx/src/System.Threading/tests/Performance/Perf.Volatile.cs index 2256e8be65..8c07b058bf 100644 --- a/external/corefx/src/System.Threading/tests/Performance/Perf.Volatile.cs +++ b/external/corefx/src/System.Threading/tests/Performance/Perf.Volatile.cs @@ -8,7 +8,9 @@ namespace System.Threading.Tests { public class Perf_Volatile { - [Benchmark(InnerIterationCount = 2000)] + private const int IterationCount = 100_000_000; + + [Benchmark(InnerIterationCount = IterationCount)] public void Read_double() { double location = 0; @@ -17,7 +19,7 @@ namespace System.Threading.Tests { using (iteration.StartMeasurement()) { - for (int i = 0; i < Benchmark.InnerIterationCount; i++) + for (int i = 0; i < IterationCount; i++) { Volatile.Read(ref location); } @@ -25,7 +27,7 @@ namespace System.Threading.Tests } } - [Benchmark(InnerIterationCount = 2000)] + [Benchmark(InnerIterationCount = IterationCount)] public void Write_double() { double location = 0; @@ -35,7 +37,7 @@ namespace System.Threading.Tests { using (iteration.StartMeasurement()) { - for (int i = 0; i < Benchmark.InnerIterationCount; i++) + for (int i = 0; i < IterationCount; i++) { Volatile.Write(ref location, newValue); } diff --git a/external/corefx/src/System.Threading/tests/SemaphoreTests.cs b/external/corefx/src/System.Threading/tests/SemaphoreTests.cs index 7d88d42892..6ef952e4b6 100644 --- a/external/corefx/src/System.Threading/tests/SemaphoreTests.cs +++ b/external/corefx/src/System.Threading/tests/SemaphoreTests.cs @@ -290,7 +290,7 @@ namespace System.Threading.Tests // Create the two semaphores and the other process with which to synchronize using (var inbound = new Semaphore(1, 1, inboundName)) using (var outbound = new Semaphore(0, 1, outboundName)) - using (var remote = RemoteInvoke(PingPong_OtherProcess, outboundName, inboundName)) + using (var remote = RemoteInvoke(new Func(PingPong_OtherProcess), outboundName, inboundName)) { // Repeatedly wait for count in one semaphore and then release count into the other for (int i = 0; i < 10; i++) diff --git a/external/corefx/src/System.ValueTuple/pkg/System.ValueTuple.pkgproj b/external/corefx/src/System.ValueTuple/pkg/System.ValueTuple.pkgproj index 9965ac4782..405cb51526 100644 --- a/external/corefx/src/System.ValueTuple/pkg/System.ValueTuple.pkgproj +++ b/external/corefx/src/System.ValueTuple/pkg/System.ValueTuple.pkgproj @@ -8,7 +8,7 @@ - + diff --git a/external/corefx/src/System.Xml.XDocument/src/MatchingRefApiCompatBaseline.uap.txt b/external/corefx/src/System.Xml.XDocument/src/MatchingRefApiCompatBaseline.uap.txt new file mode 100644 index 0000000000..330c6c9add --- /dev/null +++ b/external/corefx/src/System.Xml.XDocument/src/MatchingRefApiCompatBaseline.uap.txt @@ -0,0 +1,2 @@ +# Exposed publicly only in implementation for serialization compat +MembersMustExist : Member 'System.Xml.Linq.XElement..ctor()' does not exist in the implementation but it does exist in the contract. diff --git a/external/corefx/src/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.cs b/external/corefx/src/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.cs index 104b78a53d..ae074fa0ef 100644 --- a/external/corefx/src/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.cs +++ b/external/corefx/src/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.cs @@ -382,8 +382,8 @@ namespace System.Xml.Serialization public System.Xml.XmlQualifiedName ExportTypeMapping(System.Xml.Serialization.XmlMembersMapping xmlMembersMapping) { throw null; } public void ExportTypeMapping(System.Xml.Serialization.XmlTypeMapping xmlTypeMapping) { } } - public partial class XmlSchemaImporter -//CodeDOM : System.Xml.Serialization.SchemaImporter + public partial class XmlSchemaImporter : SchemaImporter + //CodeDOM : System.Xml.Serialization.SchemaImporter { public XmlSchemaImporter(System.Xml.Serialization.XmlSchemas schemas) { } //CODEDOM public XmlSchemaImporter(System.Xml.Serialization.XmlSchemas schemas, System.Xml.Serialization.CodeGenerationOptions options, System.CodeDom.Compiler.CodeDomProvider codeProvider, System.Xml.Serialization.ImportContext context) { } @@ -402,6 +402,10 @@ namespace System.Xml.Serialization public System.Xml.Serialization.XmlTypeMapping ImportSchemaType(System.Xml.XmlQualifiedName typeName, System.Type baseType, bool baseTypeCanBeIndirect) { throw null; } public System.Xml.Serialization.XmlTypeMapping ImportTypeMapping(System.Xml.XmlQualifiedName name) { throw null; } } + public abstract class SchemaImporter + { + internal SchemaImporter() { } + } public partial class XmlSchemas : System.Collections.CollectionBase, System.Collections.Generic.IEnumerable, System.Collections.IEnumerable { public XmlSchemas() { } diff --git a/external/corefx/src/System.Xml.XmlSerializer/src/MatchingRefApiCompatBaseline.uapaot.txt b/external/corefx/src/System.Xml.XmlSerializer/src/MatchingRefApiCompatBaseline.uapaot.txt new file mode 100644 index 0000000000..34bf6b242e --- /dev/null +++ b/external/corefx/src/System.Xml.XmlSerializer/src/MatchingRefApiCompatBaseline.uapaot.txt @@ -0,0 +1,7 @@ +Compat issues with assembly System.Xml.XmlSerializer: +# Used by uap tooling for serializer generation +MembersMustExist : Member 'System.String System.Xml.Serialization.XmlSerializer.DefaultNamespace' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Xml.Serialization.XmlSerializer.Mode.get()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Xml.Serialization.XmlSerializer.Mode.set(System.Xml.Serialization.SerializationMode)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Xml.Serialization.XmlSerializer.SetXmlSerializerContract(System.Xml.Serialization.XmlSerializerImplementation)' does not exist in the implementation but it does exist in the contract. + diff --git a/external/corefx/src/packages.builds b/external/corefx/src/packages.builds index 7a64b5729a..41d3c937b7 100644 --- a/external/corefx/src/packages.builds +++ b/external/corefx/src/packages.builds @@ -15,6 +15,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + - + $(PackageOutputRoot)\**\*.nupkg @@ -12,7 +13,7 @@ <_PackagesToPublish Include="$(PublishPattern)" /> - + @@ -25,14 +26,30 @@ - + $(PackagesDir)AzureTransfer\$(ConfigurationGroup) $(PackageDownloadDirectory)\**\*.nupkg $(PackageDownloadDirectory)\**\*Private*.nupkg $(PackageDownloadDirectory)\**\*.symbols.nupkg + + $(PackageDownloadDirectory) - + + + + + NuGet + + + + + + + + @@ -50,7 +67,7 @@ ManifestBranch="$(ManifestBranch)" ManifestCommit="$(ManifestCommit)" /> - + @@ -65,4 +82,21 @@ ManifestBranch="$(ManifestBranch)" ManifestCommit="$(ManifestCommit)" /> - \ No newline at end of file + + + + + + + true + true + + + + + + + + + diff --git a/external/corefx/src/shims/ApiCompat.proj b/external/corefx/src/shims/ApiCompat.proj index 2a5e4ad105..f55eb98bb9 100644 --- a/external/corefx/src/shims/ApiCompat.proj +++ b/external/corefx/src/shims/ApiCompat.proj @@ -59,6 +59,8 @@ + + $(NetStandardRefPath)/netstandard.dll @@ -73,6 +75,8 @@ + + + + diff --git a/external/corefx/src/shims/ApiCompatBaseline.netcoreapp.netstandard20.txt b/external/corefx/src/shims/ApiCompatBaseline.netcoreapp.netstandard20.txt index b68ab3b6eb..449b28d590 100644 --- a/external/corefx/src/shims/ApiCompatBaseline.netcoreapp.netstandard20.txt +++ b/external/corefx/src/shims/ApiCompatBaseline.netcoreapp.netstandard20.txt @@ -1,6 +1,18 @@ Compat issues with assembly mscorlib: -TypeCannotChangeClassification : Type 'System.RuntimeArgumentHandle' is a 'ref struct' in the implementation but is a 'struct' in the contract. TypesMustExist : Type 'System.TupleExtensions' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.Runtime.CompilerServices.TupleElementNamesAttribute' does not exist in the implementation but it does exist in the contract. +Compat issues with assembly netstandard: +TypeCannotChangeClassification : Type 'System.RuntimeArgumentHandle' is a 'ref struct' in the implementation but is a 'struct' in the contract. +TypeCannotChangeClassification : Type 'System.TypedReference' is a 'ref struct' in the implementation but is a 'struct' in the contract. +Compat issues with assembly System.Core: +TypesMustExist : Type 'System.Security.Cryptography.ECCurve' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.Security.Cryptography.ECParameters' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.Security.Cryptography.ECPoint' does not exist in the implementation but it does exist in the contract. + +# Compat issues complaining about class vs delegate and class vs struct are because of a bug in APICompat tool where the implementation is picking +# the wrong core assembly. It is picking System.Runtime instead of System.Private.CoreLib, there isn't any straight forward way to fix so baselining. + +TypeCannotChangeClassification : Type 'System.RuntimeArgumentHandle' is a 'ref struct' in the implementation but is a 'struct' in the contract. TypeCannotChangeClassification : Type 'System.TypedReference' is a 'ref struct' in the implementation but is a 'struct' in the contract. TypesMustExist : Type 'System.ValueTuple' does not exist in the implementation but it does exist in the contract. TypesMustExist : Type 'System.ValueTuple' does not exist in the implementation but it does exist in the contract. @@ -11,12 +23,4 @@ TypesMustExist : Type 'System.ValueTuple' does not exist in TypesMustExist : Type 'System.ValueTuple' does not exist in the implementation but it does exist in the contract. TypesMustExist : Type 'System.ValueTuple' does not exist in the implementation but it does exist in the contract. TypesMustExist : Type 'System.ValueTuple' does not exist in the implementation but it does exist in the contract. -TypesMustExist : Type 'System.Runtime.CompilerServices.TupleElementNamesAttribute' does not exist in the implementation but it does exist in the contract. -Compat issues with assembly netstandard: -TypeCannotChangeClassification : Type 'System.RuntimeArgumentHandle' is a 'ref struct' in the implementation but is a 'struct' in the contract. -TypeCannotChangeClassification : Type 'System.TypedReference' is a 'ref struct' in the implementation but is a 'struct' in the contract. -Compat issues with assembly System.Core: -TypesMustExist : Type 'System.Security.Cryptography.ECCurve' does not exist in the implementation but it does exist in the contract. -TypesMustExist : Type 'System.Security.Cryptography.ECParameters' does not exist in the implementation but it does exist in the contract. -TypesMustExist : Type 'System.Security.Cryptography.ECPoint' does not exist in the implementation but it does exist in the contract. -Total Issues: 18 + diff --git a/external/corefx/src/shims/ApiCompatBaseline.uap.netstandard20.txt b/external/corefx/src/shims/ApiCompatBaseline.uap.netstandard20.txt index b6d9449567..c89c017dc8 100644 --- a/external/corefx/src/shims/ApiCompatBaseline.uap.netstandard20.txt +++ b/external/corefx/src/shims/ApiCompatBaseline.uap.netstandard20.txt @@ -1,7 +1,5 @@ Compat issues with assembly mscorlib: -TypeCannotChangeClassification : Type 'System.RuntimeArgumentHandle' is a 'ref struct' in the implementation but is a 'struct' in the contract. TypesMustExist : Type 'System.TupleExtensions' does not exist in the implementation but it does exist in the contract. -TypeCannotChangeClassification : Type 'System.TypedReference' is a 'ref struct' in the implementation but is a 'struct' in the contract. TypesMustExist : Type 'System.Runtime.CompilerServices.TupleElementNamesAttribute' does not exist in the implementation but it does exist in the contract. Compat issues with assembly netstandard: TypeCannotChangeClassification : Type 'System.RuntimeArgumentHandle' is a 'ref struct' in the implementation but is a 'struct' in the contract. @@ -10,4 +8,25 @@ Compat issues with assembly System.Core: TypesMustExist : Type 'System.Security.Cryptography.ECCurve' does not exist in the implementation but it does exist in the contract. TypesMustExist : Type 'System.Security.Cryptography.ECParameters' does not exist in the implementation but it does exist in the contract. TypesMustExist : Type 'System.Security.Cryptography.ECPoint' does not exist in the implementation but it does exist in the contract. -Total Issues: 9 + +# Compat issues complaining about class vs delegate and class vs struct are because of a bug in APICompat tool where the implementation is picking +# the wrong core assembly. It is picking System.Runtime instead of System.Private.CoreLib, there isn't any straight forward way to fix so baselining. +TypeCannotChangeClassification : Type 'System.Action' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Action' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Action' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Action' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Action' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Action' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Action' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Action' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Func' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Func' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Func' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Func' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Func' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Func' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Func' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Func' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.IO.HandleInheritability' is a 'class' in the implementation but is a 'struct' in the contract. +TypeCannotChangeClassification : Type 'System.IO.FileAttributes' is a 'class' in the implementation but is a 'struct' in the contract. + diff --git a/external/corefx/src/shims/ApiCompatBaseline.uapaot.netstandard20.txt b/external/corefx/src/shims/ApiCompatBaseline.uapaot.netstandard20.txt index b6d9449567..732e3b3828 100644 --- a/external/corefx/src/shims/ApiCompatBaseline.uapaot.netstandard20.txt +++ b/external/corefx/src/shims/ApiCompatBaseline.uapaot.netstandard20.txt @@ -1,7 +1,5 @@ Compat issues with assembly mscorlib: -TypeCannotChangeClassification : Type 'System.RuntimeArgumentHandle' is a 'ref struct' in the implementation but is a 'struct' in the contract. TypesMustExist : Type 'System.TupleExtensions' does not exist in the implementation but it does exist in the contract. -TypeCannotChangeClassification : Type 'System.TypedReference' is a 'ref struct' in the implementation but is a 'struct' in the contract. TypesMustExist : Type 'System.Runtime.CompilerServices.TupleElementNamesAttribute' does not exist in the implementation but it does exist in the contract. Compat issues with assembly netstandard: TypeCannotChangeClassification : Type 'System.RuntimeArgumentHandle' is a 'ref struct' in the implementation but is a 'struct' in the contract. @@ -10,4 +8,42 @@ Compat issues with assembly System.Core: TypesMustExist : Type 'System.Security.Cryptography.ECCurve' does not exist in the implementation but it does exist in the contract. TypesMustExist : Type 'System.Security.Cryptography.ECParameters' does not exist in the implementation but it does exist in the contract. TypesMustExist : Type 'System.Security.Cryptography.ECPoint' does not exist in the implementation but it does exist in the contract. -Total Issues: 9 + +Compat issues with assembly System.Runtime: +MembersMustExist : Member 'System.Memory.Pin()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.ReadOnlyMemory.Pin()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Memory..ctor(System.Buffers.MemoryManager, System.Int32, System.Int32)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Memory.CreateFromPinnedArray(T[], System.Int32, System.Int32)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Buffers.MemoryHandle..ctor(System.Void*, System.Runtime.InteropServices.GCHandle, System.Buffers.IPinnable)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Runtime.InteropServices.MemoryMarshal.TryGetMemoryManager(System.ReadOnlyMemory, TManager)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Runtime.InteropServices.MemoryMarshal.TryGetMemoryManager(System.ReadOnlyMemory, TManager, System.Int32, System.Int32)' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.Buffers.IMemoryOwner' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.Buffers.IPinnable' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.Buffers.MemoryManager' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Runtime.InteropServices.MemoryMarshal.CreateFromPinnedArray(T[], System.Int32, System.Int32)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Buffers.MemoryManager.CreateMemory(System.Int32)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Buffers.MemoryManager.CreateMemory(System.Int32, System.Int32)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.ReadOnlySpan.GetPinnableReference()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'System.Span.GetPinnableReference()' does not exist in the implementation but it does exist in the contract. + +# Compat issues complaining about class vs delegate and class vs struct are because of a bug in APICompat tool where the implementation is picking +# the wrong core assembly. It is picking System.Runtime instead of System.Private.CoreLib, there isn't any straight forward way to fix so baselining. +TypeCannotChangeClassification : Type 'System.Action' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Action' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Action' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Action' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Action' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Action' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Action' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Action' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Func' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Func' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Func' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Func' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Func' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Func' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Func' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.Func' is a 'class' in the implementation but is a 'delegate' in the contract. +TypeCannotChangeClassification : Type 'System.IO.HandleInheritability' is a 'class' in the implementation but is a 'struct' in the contract. +TypeCannotChangeClassification : Type 'System.IO.FileAttributes' is a 'class' in the implementation but is a 'struct' in the contract. + diff --git a/external/corefx/src/shims/manual/System.Data.csproj b/external/corefx/src/shims/manual/System.Data.csproj index 3807fda917..445f060ba7 100644 --- a/external/corefx/src/shims/manual/System.Data.csproj +++ b/external/corefx/src/shims/manual/System.Data.csproj @@ -1,24 +1,7 @@  + - - netcoreapp; - uap; - - true - true - - - - - 4.0.0.0 - ECMA - true - true - $(NetFxRefPath)System.Data.dll - true - true - $(DefineConstants);netcoreapp {5E51460E-C9DC-4B6B-B87E-0ED742FC6733} diff --git a/external/corefx/src/shims/manual/System.csproj b/external/corefx/src/shims/manual/System.csproj index 84ff025bf7..09bc263d27 100644 --- a/external/corefx/src/shims/manual/System.csproj +++ b/external/corefx/src/shims/manual/System.csproj @@ -1,24 +1,7 @@  + - - netcoreapp; - uap; - - true - true - - - - - 4.0.0.0 - ECMA - true - true - $(NetFxRefPath)System.dll - true - true - $(DefineConstants);netcoreapp {1FB7650D-7165-49B9-98B0-E345D56983DB} diff --git a/external/corefx/src/shims/manual/dir.props b/external/corefx/src/shims/manual/dir.props new file mode 100644 index 0000000000..03a82d2305 --- /dev/null +++ b/external/corefx/src/shims/manual/dir.props @@ -0,0 +1,24 @@ + + + + + netcoreapp; + uap; + + true + true + + + + + 4.0.0.0 + ECMA + true + true + true + true + true + $(NetFxRefPath)$(MSBuildProjectName).dll + $(DefineConstants);netcoreapp + + \ No newline at end of file diff --git a/external/corefx/src/shims/manual/mscorlib.csproj b/external/corefx/src/shims/manual/mscorlib.csproj index a522c16713..040aaffc68 100644 --- a/external/corefx/src/shims/manual/mscorlib.csproj +++ b/external/corefx/src/shims/manual/mscorlib.csproj @@ -1,24 +1,7 @@  + - - netcoreapp; - uap; - - true - true - - - - - 4.0.0.0 - ECMA - true - true - $(NetFxRefPath)mscorlib.dll - true - true - $(DefineConstants);netcoreapp {CEAE2042-461E-490A-974C-AD7FBD4E294E} diff --git a/external/corefx/src/syncAzure.proj b/external/corefx/src/syncAzure.proj index 7d34e17d27..80f1278fcd 100644 --- a/external/corefx/src/syncAzure.proj +++ b/external/corefx/src/syncAzure.proj @@ -3,9 +3,8 @@ - corefx-$(PreReleaseLabel) - $(ContainerNamePrefix)-$(BuildNumberMajor)-$(BuildNumberMinor) - $(PackagesDir)AzureTransfer + $(ContainerName.Replace(".","-")) + $(PackagesDir)AzureTransfer diff --git a/external/corefx/src/tests.builds b/external/corefx/src/tests.builds index b84f74928e..833ac384c1 100644 --- a/external/corefx/src/tests.builds +++ b/external/corefx/src/tests.builds @@ -30,10 +30,14 @@ <_ProjectPattern Condition="'$(Performance)'=='true'">.Performance.Tests - + + + + + diff --git a/external/corefx/src/upload-tests.proj b/external/corefx/src/upload-tests.proj index 9b12dea43c..6616318fef 100644 --- a/external/corefx/src/upload-tests.proj +++ b/external/corefx/src/upload-tests.proj @@ -61,6 +61,8 @@ test/functional/cli/ + + prodcon/$(TestProduct)/$(Branch)/ official/$(TestProduct)/$(Branch)/ pr/$(TestProduct)/$(Branch)/ pr/unknown/ @@ -70,7 +72,8 @@ $(CurrentDate) - $(OfficialBuildId) + $(OfficialBuildId) + $(ProductBuildId) $(ArchGroup) $(ConfigurationGroup) @@ -161,4 +164,4 @@ - \ No newline at end of file + diff --git a/external/corefx/tools-local/ILAsmVersion.txt b/external/corefx/tools-local/ILAsmVersion.txt index bab4a159d0..0717f3165e 100644 --- a/external/corefx/tools-local/ILAsmVersion.txt +++ b/external/corefx/tools-local/ILAsmVersion.txt @@ -1 +1 @@ -2.1.0-preview1-26122-04 \ No newline at end of file +2.1.0-rtm-26508-04 \ No newline at end of file diff --git a/external/corefx/tools-local/targetgroups.props b/external/corefx/tools-local/targetgroups.props index cf998c3dbc..312c1d2644 100644 --- a/external/corefx/tools-local/targetgroups.props +++ b/external/corefx/tools-local/targetgroups.props @@ -17,19 +17,34 @@ netcore50 netstandard1.4 + + aot + UAP,Version=v10.0.16299 + uap10.0.16299 + true + netcore50aot + uap10.0.16299;netstandard + + + UAP,Version=v10.0.16299 + uap10.0.16299 + true + netcore50 + netstandard + aot $(UAPvNextTFMFull) $(UAPvNextTFM) true - netcore50aot + uap10.0.16299aot uapvnext;netstandard2.0 $(UAPvNextTFMFull) $(UAPvNextTFM) true - netcore50 + uap10.0.16299 netstandard2.0 diff --git a/external/corert/src/Common/src/Interop/Unix/System.Private.CoreLib.Native/Interop.Number.cs b/external/corert/src/Common/src/Interop/Unix/System.Private.CoreLib.Native/Interop.Number.cs index 4fba126b23..e9066eb64d 100644 --- a/external/corert/src/Common/src/Interop/Unix/System.Private.CoreLib.Native/Interop.Number.cs +++ b/external/corert/src/Common/src/Interop/Unix/System.Private.CoreLib.Native/Interop.Number.cs @@ -10,7 +10,11 @@ internal static partial class Interop { internal unsafe partial class Sys { +#if !MONO [DllImport(Interop.Libraries.CoreLibNative, EntryPoint = "CoreLibNative_DoubleToString")] +#else + [MethodImplAttribute(MethodImplOptions.InternalCall)] +#endif internal static extern unsafe int DoubleToString(double value, byte* format, byte* buffer, int bufferLength); } } diff --git a/external/corert/src/System.Private.CoreLib/shared/System/StringSpanHelpers.cs b/external/corert/src/System.Private.CoreLib/shared/System/StringSpanHelpers.cs index 2d6152de56..9ddcc94503 100644 --- a/external/corert/src/System.Private.CoreLib/shared/System/StringSpanHelpers.cs +++ b/external/corert/src/System.Private.CoreLib/shared/System/StringSpanHelpers.cs @@ -37,7 +37,10 @@ namespace System return true; } - private static bool EqualsOrdinalIgnoreCase(this ReadOnlySpan left, ReadOnlySpan right) +#if MONO + internal +#endif + static bool EqualsOrdinalIgnoreCase(this ReadOnlySpan left, ReadOnlySpan right) { if (left.Length != right.Length) { diff --git a/external/corert/src/System.Private.CoreLib/src/System/Array.cs b/external/corert/src/System.Private.CoreLib/src/System/Array.cs index 2822401ff6..12412a28f1 100644 --- a/external/corert/src/System.Private.CoreLib/src/System/Array.cs +++ b/external/corert/src/System.Private.CoreLib/src/System/Array.cs @@ -910,22 +910,14 @@ namespace System if (array.Length - index < length) throw new ArgumentException(SR.Argument_InvalidOffLen); -#if !MONO ref T p = ref Unsafe.As(ref array.GetRawSzArrayData()); -#endif int i = index; int j = index + length - 1; while (i < j) { -#if MONO - T temp = array[i]; - array[i] = array[j]; - array[j] = temp; -#else T temp = Unsafe.Add(ref p, i); Unsafe.Add(ref p, i) = Unsafe.Add(ref p, j); Unsafe.Add(ref p, j) = temp; -#endif i++; j--; } diff --git a/external/corert/src/System.Private.CoreLib/src/System/Decimal.DecCalc.cs.REMOVED.git-id b/external/corert/src/System.Private.CoreLib/src/System/Decimal.DecCalc.cs.REMOVED.git-id index 5de76f9948..f3afc65a7c 100644 --- a/external/corert/src/System.Private.CoreLib/src/System/Decimal.DecCalc.cs.REMOVED.git-id +++ b/external/corert/src/System.Private.CoreLib/src/System/Decimal.DecCalc.cs.REMOVED.git-id @@ -1 +1 @@ -05afe6b7e296d261b03eff87b6fb61e1db537d32 \ No newline at end of file +c14603d45ef7ad7f0c541d64df6fd49fc47b9879 \ No newline at end of file diff --git a/external/corert/src/System.Private.CoreLib/src/System/Decimal.cs b/external/corert/src/System.Private.CoreLib/src/System/Decimal.cs index 244ef6223d..8bf8094f30 100644 --- a/external/corert/src/System.Private.CoreLib/src/System/Decimal.cs +++ b/external/corert/src/System.Private.CoreLib/src/System/Decimal.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; using System.Globalization; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -54,7 +55,9 @@ namespace System // the range of the Decimal type. [Serializable] [StructLayout(LayoutKind.Explicit)] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public partial struct Decimal : IFormattable, IComparable, IConvertible, IComparable, IEquatable, IDeserializationCallback, ISpanFormattable { // Sign mask for the flags field. A value of zero in this bit indicates a diff --git a/external/corert/src/System.Private.CoreLib/src/System/InsufficientMemoryException.cs b/external/corert/src/System.Private.CoreLib/src/System/InsufficientMemoryException.cs index fbde8ce1f6..4c510c4d7e 100644 --- a/external/corert/src/System.Private.CoreLib/src/System/InsufficientMemoryException.cs +++ b/external/corert/src/System.Private.CoreLib/src/System/InsufficientMemoryException.cs @@ -22,7 +22,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public sealed class InsufficientMemoryException : OutOfMemoryException { // There may be a problem here interacting with the ResourceManager in out of memory conditions, diff --git a/external/corert/src/System.Private.CoreLib/src/System/MissingFieldException.cs b/external/corert/src/System.Private.CoreLib/src/System/MissingFieldException.cs index 88cd41c6ad..edac0614d2 100644 --- a/external/corert/src/System.Private.CoreLib/src/System/MissingFieldException.cs +++ b/external/corert/src/System.Private.CoreLib/src/System/MissingFieldException.cs @@ -14,7 +14,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class MissingFieldException : MissingMemberException { public MissingFieldException() diff --git a/external/corert/src/System.Private.CoreLib/src/System/MissingMemberException.cs b/external/corert/src/System.Private.CoreLib/src/System/MissingMemberException.cs index 3d2fedc5de..3be1cfe6a1 100644 --- a/external/corert/src/System.Private.CoreLib/src/System/MissingMemberException.cs +++ b/external/corert/src/System.Private.CoreLib/src/System/MissingMemberException.cs @@ -16,7 +16,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class MissingMemberException : MemberAccessException { public MissingMemberException() diff --git a/external/corert/src/System.Private.CoreLib/src/System/Number.Unix.cs b/external/corert/src/System.Private.CoreLib/src/System/Number.Unix.cs index 113eda5671..72f53f2c07 100644 --- a/external/corert/src/System.Private.CoreLib/src/System/Number.Unix.cs +++ b/external/corert/src/System.Private.CoreLib/src/System/Number.Unix.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime; using System.Globalization; diff --git a/external/corert/src/System.Private.CoreLib/src/System/OutOfMemoryException.cs b/external/corert/src/System.Private.CoreLib/src/System/OutOfMemoryException.cs index ef42ba7524..5bd4f21e81 100644 --- a/external/corert/src/System.Private.CoreLib/src/System/OutOfMemoryException.cs +++ b/external/corert/src/System.Private.CoreLib/src/System/OutOfMemoryException.cs @@ -16,7 +16,9 @@ using System.Runtime.Serialization; namespace System { [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class OutOfMemoryException : SystemException { public OutOfMemoryException() diff --git a/external/corert/src/System.Private.CoreLib/src/System/String.cs b/external/corert/src/System.Private.CoreLib/src/System/String.cs index a10d212c00..9846b15f29 100644 --- a/external/corert/src/System.Private.CoreLib/src/System/String.cs +++ b/external/corert/src/System.Private.CoreLib/src/System/String.cs @@ -82,6 +82,7 @@ namespace System // declared constructors. [MethodImplAttribute(MethodImplOptions.InternalCall)] + [PreserveDependency("System.String.CreateString(System.Char[])")] public extern String(char[] value); [System.Runtime.CompilerServices.DependencyReductionRoot] @@ -105,6 +106,7 @@ namespace System } [MethodImplAttribute(MethodImplOptions.InternalCall)] + [PreserveDependency("System.String.CreateString(System.Char[], System.Int32, System.Int32)")] public extern String(char[] value, int startIndex, int length); [System.Runtime.CompilerServices.DependencyReductionRoot] @@ -141,6 +143,7 @@ namespace System [CLSCompliant(false)] [MethodImplAttribute(MethodImplOptions.InternalCall)] + [PreserveDependency("System.String.CreateString(System.Char*)")] unsafe public extern String(char* value); [System.Runtime.CompilerServices.DependencyReductionRoot] @@ -173,6 +176,7 @@ namespace System [CLSCompliant(false)] [MethodImplAttribute(MethodImplOptions.InternalCall)] + [PreserveDependency("System.String.CreateString(System.Char*, System.Int32, System.Int32)")] unsafe public extern String(char* value, int startIndex, int length); [System.Runtime.CompilerServices.DependencyReductionRoot] @@ -214,6 +218,7 @@ namespace System [CLSCompliant(false)] [MethodImpl(MethodImplOptions.InternalCall)] + [PreserveDependency("System.String.CreateString(System.SByte*)")] public extern unsafe String(sbyte* value); [DependencyReductionRoot] @@ -232,6 +237,7 @@ namespace System [CLSCompliant(false)] [MethodImpl(MethodImplOptions.InternalCall)] + [PreserveDependency("System.String.CreateString(System.SByte*, System.Int32, System.Int32)")] public extern unsafe String(sbyte* value, int startIndex, int length); [DependencyReductionRoot] @@ -284,6 +290,7 @@ namespace System [CLSCompliant(false)] [MethodImpl(MethodImplOptions.InternalCall)] + [PreserveDependency("System.String.CreateString(System.SByte*, System.Int32, System.Int32, System.Text.Encoding)")] public extern unsafe String(sbyte* value, int startIndex, int length, Encoding enc); [DependencyReductionRoot] @@ -329,6 +336,7 @@ namespace System } [MethodImplAttribute(MethodImplOptions.InternalCall)] + [PreserveDependency("System.String.CreateString(System.Char, System.Int32)")] public extern String(char c, int count); [System.Runtime.CompilerServices.DependencyReductionRoot] @@ -376,6 +384,7 @@ namespace System } [MethodImplAttribute(MethodImplOptions.InternalCall)] + [PreserveDependency("System.String.CreateString(System.ReadOnlySpan`1)")] public extern String(ReadOnlySpan value); [DependencyReductionRoot] @@ -394,7 +403,6 @@ namespace System return result; } -#if !MONO // TODO: Undo public static string Create(int length, TState state, SpanAction action) { if (action == null) @@ -419,7 +427,6 @@ namespace System public static implicit operator ReadOnlySpan(string value) => value != null ? new ReadOnlySpan(ref value.GetRawStringData(), value.Length) : default; -#endif public object Clone() { @@ -818,3 +825,13 @@ namespace System } } } + +#if MONO + +namespace System.Buffers +{ + public delegate void SpanAction(Span span, TArg arg); + public delegate void ReadOnlySpanAction(ReadOnlySpan span, TArg arg); +} + +#endif diff --git a/external/corert/src/System.Private.CoreLib/src/System/Threading/CancellationToken.cs b/external/corert/src/System.Private.CoreLib/src/System/Threading/CancellationToken.cs index e3495aeb4f..fdca71f462 100644 --- a/external/corert/src/System.Private.CoreLib/src/System/Threading/CancellationToken.cs +++ b/external/corert/src/System.Private.CoreLib/src/System/Threading/CancellationToken.cs @@ -10,6 +10,7 @@ using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.InteropServices; using System.Runtime.CompilerServices; diff --git a/external/corert/src/System.Private.CoreLib/src/System/Threading/CancellationTokenSource.cs b/external/corert/src/System.Private.CoreLib/src/System/Threading/CancellationTokenSource.cs index 30302b9368..8e66d5b8b8 100644 --- a/external/corert/src/System.Private.CoreLib/src/System/Threading/CancellationTokenSource.cs +++ b/external/corert/src/System.Private.CoreLib/src/System/Threading/CancellationTokenSource.cs @@ -9,6 +9,7 @@ using System.Collections.Generic; using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.InteropServices; namespace System.Threading diff --git a/external/corert/src/System.Private.CoreLib/src/System/Threading/Tasks/ConcurrentExclusiveSchedulerPair.cs b/external/corert/src/System.Private.CoreLib/src/System/Threading/Tasks/ConcurrentExclusiveSchedulerPair.cs index f7fbbac7b3..7c155523e9 100644 --- a/external/corert/src/System.Private.CoreLib/src/System/Threading/Tasks/ConcurrentExclusiveSchedulerPair.cs +++ b/external/corert/src/System.Private.CoreLib/src/System/Threading/Tasks/ConcurrentExclusiveSchedulerPair.cs @@ -17,6 +17,7 @@ using System.Collections.Generic; using System.Diagnostics; +using System.Diagnostics.Private; using System.Diagnostics.CodeAnalysis; namespace System.Threading.Tasks @@ -712,7 +713,9 @@ namespace System.Threading.Tasks private static void ContractAssertMonitorStatus(Lock syncObj, bool held) { Debug.Assert(syncObj != null, "The Lock object to check must be provided."); +#if !MONO Debug.Assert(syncObj.IsAcquired == held, "The locking scheme was not correctly followed."); +#endif } /// Gets the options to use for tasks. diff --git a/external/corert/src/System.Private.CoreLib/src/System/Threading/Tasks/ProducerConsumerQueues.cs b/external/corert/src/System.Private.CoreLib/src/System/Threading/Tasks/ProducerConsumerQueues.cs index b19990f674..33bad7e920 100644 --- a/external/corert/src/System.Private.CoreLib/src/System/Threading/Tasks/ProducerConsumerQueues.cs +++ b/external/corert/src/System.Private.CoreLib/src/System/Threading/Tasks/ProducerConsumerQueues.cs @@ -26,6 +26,7 @@ using System.Collections; using System.Collections.Concurrent; using System.Collections.Generic; using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.InteropServices; namespace System.Threading.Tasks @@ -64,7 +65,13 @@ namespace System.Threading.Tasks /// /// Specifies the type of data contained in the queue. [DebuggerDisplay("Count = {Count}")] - internal sealed class MultiProducerMultiConsumerQueue : LowLevelConcurrentQueue, IProducerConsumerQueue + internal sealed class MultiProducerMultiConsumerQueue : +#if MONO + ConcurrentQueue, +#else + LowLevelConcurrentQueue, +#endif + IProducerConsumerQueue { /// Enqueues an item into the queue. /// The item to enqueue. diff --git a/external/corert/src/System.Private.CoreLib/src/System/Threading/Tasks/TaskExceptionHolder.cs b/external/corert/src/System.Private.CoreLib/src/System/Threading/Tasks/TaskExceptionHolder.cs index f06b0750cf..e915f35950 100644 --- a/external/corert/src/System.Private.CoreLib/src/System/Threading/Tasks/TaskExceptionHolder.cs +++ b/external/corert/src/System.Private.CoreLib/src/System/Threading/Tasks/TaskExceptionHolder.cs @@ -18,6 +18,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.ExceptionServices; namespace System.Threading.Tasks diff --git a/external/corert/src/System.Private.CoreLib/src/System/Threading/ThreadLocal.cs b/external/corert/src/System.Private.CoreLib/src/System/Threading/ThreadLocal.cs index ad6da89a9b..0a8c845acf 100644 --- a/external/corert/src/System.Private.CoreLib/src/System/Threading/ThreadLocal.cs +++ b/external/corert/src/System.Private.CoreLib/src/System/Threading/ThreadLocal.cs @@ -17,6 +17,7 @@ // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- using System.Diagnostics; +using System.Diagnostics.Private; using System.Collections.Generic; namespace System.Threading diff --git a/external/corert/src/System.Private.Interop/src/InteropExtensions/Lock.cs b/external/corert/src/System.Private.Interop/src/InteropExtensions/Lock.cs index d86c28f126..e252ea985e 100644 --- a/external/corert/src/System.Private.Interop/src/InteropExtensions/Lock.cs +++ b/external/corert/src/System.Private.Interop/src/InteropExtensions/Lock.cs @@ -10,7 +10,7 @@ namespace System.Threading /// Simple wrapper around Monitor.Enter and Exit exposing interface as expected by /// System.Private.InteropServices.__ComObject /// - public class Lock + public partial class Lock { private object _lock = new object(); public void Acquire() diff --git a/external/ikdasm/Disassembler.cs.REMOVED.git-id b/external/ikdasm/Disassembler.cs.REMOVED.git-id index bdc5a8f79f..07d47b530c 100644 --- a/external/ikdasm/Disassembler.cs.REMOVED.git-id +++ b/external/ikdasm/Disassembler.cs.REMOVED.git-id @@ -1 +1 @@ -78ba95ec89a68e6196dc126e4be4b998303d98d0 \ No newline at end of file +6f1e2a4d3642aac6735074943b864bd5cddec62d \ No newline at end of file diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/Microsoft.Net.Compilers.nuspec b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/Microsoft.Net.Compilers.nuspec new file mode 100755 index 0000000000..1eda0cf6b2 --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/Microsoft.Net.Compilers.nuspec @@ -0,0 +1,25 @@ + + + + Microsoft.Net.Compilers + 2.8.0 + Microsoft + Microsoft + true + true + http://go.microsoft.com/fwlink/?LinkId=529444 + https://github.com/dotnet/roslyn + .NET Compilers package. + Referencing this package will cause the project to be built using the specific version of the C# and Visual Basic compilers contained in the package, as opposed to any system installed version. + + This package can be used to compile code targeting any platform, but can only be run using the desktop .NET 4.6+ Full Framework. + + More details at https://aka.ms/roslyn-packages + + This package was built from the source at https://github.com/dotnet/roslyn/commit/e595ee276d14e14bfb3eb323fb57f2aa668bddea + .NET Compilers package. + + en-US + Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics + + \ No newline at end of file diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/build/Microsoft.Net.Compilers.props b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/build/Microsoft.Net.Compilers.props new file mode 100755 index 0000000000..829cbfffa2 --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/build/Microsoft.Net.Compilers.props @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + false + $(MSBuildThisFileDirectory)..\tools\Microsoft.CSharp.Core.targets + $(MSBuildThisFileDirectory)..\tools\Microsoft.VisualBasic.Core.targets + + + + + $(MSBuildThisFileDirectory)..\tools + csc.exe + $(MSBuildThisFileDirectory)..\tools + vbc.exe + + diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/Microsoft.Build.Tasks.CodeAnalysis.dll.REMOVED.git-id b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/Microsoft.Build.Tasks.CodeAnalysis.dll.REMOVED.git-id new file mode 100644 index 0000000000..e99530730d --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/Microsoft.Build.Tasks.CodeAnalysis.dll.REMOVED.git-id @@ -0,0 +1 @@ +65a66ca8e50c6e5b35244473521867b1060f97ec \ No newline at end of file diff --git a/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/Microsoft.CSharp.Core.targets b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/Microsoft.CSharp.Core.targets similarity index 78% rename from mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/Microsoft.CSharp.Core.targets rename to external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/Microsoft.CSharp.Core.targets index 8c535b2e29..d11c09506b 100755 --- a/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/Microsoft.CSharp.Core.targets +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/Microsoft.CSharp.Core.targets @@ -1,17 +1,7 @@  - - - - - - + + DependsOnTargets="$(CoreCompileDependsOn);_BeforeVBCSCoreCompile"> @@ -49,12 +39,6 @@ $(NoWarn);2008 - - - - - - @@ -64,22 +48,6 @@ $(IntermediateOutputPath)$(TargetName).compile.pdb - - - false - - - - - - - - - - true - - + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + true + + + + + + true + + + + + + + + <_MappedSourceRoot Remove="@(_MappedSourceRoot)" /> + + + + + + + + + + + + + + + true + + + + + + + + + + + <_TopLevelSourceRoot Include="@(SourceRoot)" Condition="'%(SourceRoot.NestedRoot)' == ''"/> + + + + + + + ,$(PathMap) + + + @(_TopLevelSourceRoot->'%(Identity)=%(MappedPath)', ',')$(PathMap) + + + + \ No newline at end of file diff --git a/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/Microsoft.VisualBasic.Core.targets b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/Microsoft.VisualBasic.Core.targets similarity index 77% rename from mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/Microsoft.VisualBasic.Core.targets rename to external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/Microsoft.VisualBasic.Core.targets index 21099278f4..66be66388c 100755 --- a/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/Microsoft.VisualBasic.Core.targets +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/Microsoft.VisualBasic.Core.targets @@ -1,17 +1,7 @@  - - - - - - + + DependsOnTargets="$(CoreCompileDependsOn);_BeforeVBCSCoreCompile"> <_NoWarnings Condition="'$(WarningLevel)' == '0'">true <_NoWarnings Condition="'$(WarningLevel)' == '1'">false @@ -47,28 +37,6 @@ $(IntermediateOutputPath)$(TargetName).compile.pdb - - - - - - - - - false - - - - - - - - - - true - - - + - + - + diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/csc.exe b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/csc.exe new file mode 100755 index 0000000000..0f71f08120 Binary files /dev/null and b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/csc.exe differ diff --git a/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/csc.exe.config b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/csc.exe.config similarity index 95% rename from mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/csc.exe.config rename to external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/csc.exe.config index ce5472c93a..d37e826204 100755 --- a/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/csc.exe.config +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/csc.exe.config @@ -10,19 +10,19 @@ - + - + - + diff --git a/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/csc.rsp b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/csc.rsp similarity index 100% rename from mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/csc.rsp rename to external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/csc.rsp diff --git a/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/csi.exe b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/csi.exe similarity index 65% rename from mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/csi.exe rename to external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/csi.exe index 5fcd12bc1c..7b69315ec9 100755 Binary files a/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/csi.exe and b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/csi.exe differ diff --git a/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/csi.exe.config b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/csi.exe.config similarity index 95% rename from mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/csi.exe.config rename to external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/csi.exe.config index 937789ca32..124eff3dd7 100755 --- a/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/csi.exe.config +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/csi.exe.config @@ -8,19 +8,19 @@ - + - + - + diff --git a/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/csi.rsp b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/csi.rsp similarity index 100% rename from mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/csi.rsp rename to external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/csi.rsp diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/vbc.exe b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/vbc.exe new file mode 100755 index 0000000000..7d3147804e Binary files /dev/null and b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/vbc.exe differ diff --git a/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/vbc.exe.config b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/vbc.exe.config similarity index 95% rename from mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/vbc.exe.config rename to external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/vbc.exe.config index ce5472c93a..d37e826204 100755 --- a/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/vbc.exe.config +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/vbc.exe.config @@ -10,19 +10,19 @@ - + - + - + diff --git a/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/vbc.rsp b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/vbc.rsp similarity index 100% rename from mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/vbc.rsp rename to external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.0/tools/vbc.rsp diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/Microsoft.Net.Compilers.nuspec b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/Microsoft.Net.Compilers.nuspec new file mode 100755 index 0000000000..84d2982fd6 --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/Microsoft.Net.Compilers.nuspec @@ -0,0 +1,25 @@ + + + + Microsoft.Net.Compilers + 2.8.2 + Microsoft + Microsoft + true + true + http://go.microsoft.com/fwlink/?LinkId=529444 + https://github.com/dotnet/roslyn + .NET Compilers package. + Referencing this package will cause the project to be built using the specific version of the C# and Visual Basic compilers contained in the package, as opposed to any system installed version. + + This package can be used to compile code targeting any platform, but can only be run using the desktop .NET 4.6+ Full Framework. + + More details at https://aka.ms/roslyn-packages + + This package was built from the source at https://github.com/dotnet/roslyn/commit/2ad4aabc7a9dada097e54e544ebba48ab1c05074 + .NET Compilers package. + + en-US + Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics + + \ No newline at end of file diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/build/Microsoft.Net.Compilers.props b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/build/Microsoft.Net.Compilers.props new file mode 100755 index 0000000000..829cbfffa2 --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/build/Microsoft.Net.Compilers.props @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + false + $(MSBuildThisFileDirectory)..\tools\Microsoft.CSharp.Core.targets + $(MSBuildThisFileDirectory)..\tools\Microsoft.VisualBasic.Core.targets + + + + + $(MSBuildThisFileDirectory)..\tools + csc.exe + $(MSBuildThisFileDirectory)..\tools + vbc.exe + + diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.Build.Tasks.CodeAnalysis.dll.REMOVED.git-id b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.Build.Tasks.CodeAnalysis.dll.REMOVED.git-id new file mode 100644 index 0000000000..4538658982 --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.Build.Tasks.CodeAnalysis.dll.REMOVED.git-id @@ -0,0 +1 @@ +3bf3618690e6ca33330d856383b96b29eb508c97 \ No newline at end of file diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.CSharp.Core.targets b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.CSharp.Core.targets new file mode 100755 index 0000000000..d11c09506b --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.CSharp.Core.targets @@ -0,0 +1,135 @@ + + + + + + + + + $(NoWarn);1701;1702 + + + + + $(NoWarn);2008 + + + + + $(AppConfig) + + + $(IntermediateOutputPath)$(TargetName).compile.pdb + + + + + + + + + <_CoreCompileResourceInputs Remove="@(_CoreCompileResourceInputs)" /> + + + + + \ No newline at end of file diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.CodeAnalysis.CSharp.Scripting.dll b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.CodeAnalysis.CSharp.Scripting.dll new file mode 100755 index 0000000000..64dccd9819 Binary files /dev/null and b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.CodeAnalysis.CSharp.Scripting.dll differ diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.CodeAnalysis.CSharp.dll.REMOVED.git-id b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.CodeAnalysis.CSharp.dll.REMOVED.git-id new file mode 100644 index 0000000000..d1052e178c --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.CodeAnalysis.CSharp.dll.REMOVED.git-id @@ -0,0 +1 @@ +5bc2c361c871cbbf70f443ff21bfd2baa9bacfe2 \ No newline at end of file diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.CodeAnalysis.Scripting.dll.REMOVED.git-id b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.CodeAnalysis.Scripting.dll.REMOVED.git-id new file mode 100644 index 0000000000..e790c4f195 --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.CodeAnalysis.Scripting.dll.REMOVED.git-id @@ -0,0 +1 @@ +9532a7fe99f81bf979e696480c8b23c3c33a9856 \ No newline at end of file diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.CodeAnalysis.VisualBasic.dll.REMOVED.git-id b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.CodeAnalysis.VisualBasic.dll.REMOVED.git-id new file mode 100644 index 0000000000..e19b5c4674 --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.CodeAnalysis.VisualBasic.dll.REMOVED.git-id @@ -0,0 +1 @@ +95276b83555d48139fbe45e62e101feddee50f19 \ No newline at end of file diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.CodeAnalysis.dll.REMOVED.git-id b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.CodeAnalysis.dll.REMOVED.git-id new file mode 100644 index 0000000000..b26272ef69 --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.CodeAnalysis.dll.REMOVED.git-id @@ -0,0 +1 @@ +24009d33c4582463dc2903aa4e8985a0ebbec416 \ No newline at end of file diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.Managed.Core.targets b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.Managed.Core.targets new file mode 100755 index 0000000000..8428ed2a33 --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.Managed.Core.targets @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + true + + + + + + true + + + + + + + + <_MappedSourceRoot Remove="@(_MappedSourceRoot)" /> + + + + + + + + + + + + + + + true + + + + + + + + + + + <_TopLevelSourceRoot Include="@(SourceRoot)" Condition="'%(SourceRoot.NestedRoot)' == ''"/> + + + + + + + ,$(PathMap) + + + @(_TopLevelSourceRoot->'%(Identity)=%(MappedPath)', ',')$(PathMap) + + + + \ No newline at end of file diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.VisualBasic.Core.targets b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.VisualBasic.Core.targets new file mode 100755 index 0000000000..66be66388c --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/Microsoft.VisualBasic.Core.targets @@ -0,0 +1,132 @@ + + + + + + + + <_NoWarnings Condition="'$(WarningLevel)' == '0'">true + <_NoWarnings Condition="'$(WarningLevel)' == '1'">false + + + + + $(IntermediateOutputPath)$(TargetName).compile.pdb + + + + + + + + <_CoreCompileResourceInputs Remove="@(_CoreCompileResourceInputs)" /> + + + + + \ No newline at end of file diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/System.Collections.Immutable.dll.REMOVED.git-id b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/System.Collections.Immutable.dll.REMOVED.git-id new file mode 100644 index 0000000000..f621878df3 --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/System.Collections.Immutable.dll.REMOVED.git-id @@ -0,0 +1 @@ +ce6fc0e8d0d43a3e824b4a844fe5eae4667dd428 \ No newline at end of file diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/System.Reflection.Metadata.dll.REMOVED.git-id b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/System.Reflection.Metadata.dll.REMOVED.git-id new file mode 100644 index 0000000000..469c933c5d --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/System.Reflection.Metadata.dll.REMOVED.git-id @@ -0,0 +1 @@ +ee68731c052c101cd85d9f4ec976628cf1e224b4 \ No newline at end of file diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/VBCSCompiler.exe b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/VBCSCompiler.exe new file mode 100755 index 0000000000..65c3f58a98 Binary files /dev/null and b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/VBCSCompiler.exe differ diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/VBCSCompiler.exe.config b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/VBCSCompiler.exe.config new file mode 100755 index 0000000000..7a1d4f9a6e --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/VBCSCompiler.exe.config @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/csc.exe b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/csc.exe new file mode 100755 index 0000000000..f5b0be99a7 Binary files /dev/null and b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/csc.exe differ diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/csc.exe.config b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/csc.exe.config new file mode 100755 index 0000000000..d37e826204 --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/csc.exe.config @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/csc.rsp b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/csc.rsp new file mode 100755 index 0000000000..be7661d074 --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/csc.rsp @@ -0,0 +1,46 @@ +# Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +# This file contains command-line options that the C# +# command line compiler (CSC) will process as part +# of every compilation, unless the "/noconfig" option +# is specified. + +# Reference the common Framework libraries +/r:Accessibility.dll +/r:Microsoft.CSharp.dll +/r:System.Configuration.dll +/r:System.Configuration.Install.dll +/r:System.Core.dll +/r:System.Data.dll +/r:System.Data.DataSetExtensions.dll +/r:System.Data.Linq.dll +/r:System.Data.OracleClient.dll +/r:System.Deployment.dll +/r:System.Design.dll +/r:System.DirectoryServices.dll +/r:System.dll +/r:System.Drawing.Design.dll +/r:System.Drawing.dll +/r:System.EnterpriseServices.dll +/r:System.Management.dll +/r:System.Messaging.dll +/r:System.Runtime.Remoting.dll +/r:System.Runtime.Serialization.dll +/r:System.Runtime.Serialization.Formatters.Soap.dll +/r:System.Security.dll +/r:System.ServiceModel.dll +/r:System.ServiceModel.Web.dll +/r:System.ServiceProcess.dll +/r:System.Transactions.dll +/r:System.Web.dll +/r:System.Web.Extensions.Design.dll +/r:System.Web.Extensions.dll +/r:System.Web.Mobile.dll +/r:System.Web.RegularExpressions.dll +/r:System.Web.Services.dll +/r:System.Windows.Forms.dll +/r:System.Workflow.Activities.dll +/r:System.Workflow.ComponentModel.dll +/r:System.Workflow.Runtime.dll +/r:System.Xml.dll +/r:System.Xml.Linq.dll diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/csi.exe b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/csi.exe new file mode 100755 index 0000000000..76d5a823d8 Binary files /dev/null and b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/csi.exe differ diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/csi.exe.config b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/csi.exe.config new file mode 100755 index 0000000000..124eff3dd7 --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/csi.exe.config @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/csi.rsp b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/csi.rsp new file mode 100755 index 0000000000..492f239de8 --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/csi.rsp @@ -0,0 +1,14 @@ +/r:System.dll +/r:System.Core.dll +/r:Microsoft.CSharp.dll +/r:Facades/System.Runtime.dll +/u:System +/u:System.IO +/u:System.Collections.Generic +/u:System.Console +/u:System.Diagnostics +/u:System.Dynamic +/u:System.Linq +/u:System.Linq.Expressions +/u:System.Text +/u:System.Threading.Tasks \ No newline at end of file diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/vbc.exe b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/vbc.exe new file mode 100755 index 0000000000..a14b0387d8 Binary files /dev/null and b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/vbc.exe differ diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/vbc.exe.config b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/vbc.exe.config new file mode 100755 index 0000000000..d37e826204 --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/vbc.exe.config @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/vbc.rsp b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/vbc.rsp new file mode 100755 index 0000000000..52b4caceb9 --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/vbc.rsp @@ -0,0 +1,55 @@ +# Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +# This file contains command-line options that the VB +# command line compiler (VBC) will process as part +# of every compilation, unless the "/noconfig" option +# is specified. + +# Reference the common Framework libraries +/r:Accessibility.dll +/r:System.Configuration.dll +/r:System.Configuration.Install.dll +/r:System.Data.dll +/r:System.Data.OracleClient.dll +/r:System.Deployment.dll +/r:System.Design.dll +/r:System.DirectoryServices.dll +/r:System.dll +/r:System.Drawing.Design.dll +/r:System.Drawing.dll +/r:System.EnterpriseServices.dll +/r:System.Management.dll +/r:System.Messaging.dll +/r:System.Runtime.Remoting.dll +/r:System.Runtime.Serialization.Formatters.Soap.dll +/r:System.Security.dll +/r:System.ServiceProcess.dll +/r:System.Transactions.dll +/r:System.Web.dll +/r:System.Web.Mobile.dll +/r:System.Web.RegularExpressions.dll +/r:System.Web.Services.dll +/r:System.Windows.Forms.dll +/r:System.XML.dll + +/r:System.Workflow.Activities.dll +/r:System.Workflow.ComponentModel.dll +/r:System.Workflow.Runtime.dll +/r:System.Runtime.Serialization.dll +/r:System.ServiceModel.dll + +/r:System.Core.dll +/r:System.Xml.Linq.dll +/r:System.Data.Linq.dll +/r:System.Data.DataSetExtensions.dll +/r:System.Web.Extensions.dll +/r:System.Web.Extensions.Design.dll +/r:System.ServiceModel.Web.dll + +# Import System and Microsoft.VisualBasic +/imports:System +/imports:Microsoft.VisualBasic +/imports:System.Linq +/imports:System.Xml.Linq + +/optioninfer+ diff --git a/ikvm-native/Makefile.am b/ikvm-native/Makefile.am index 4f391fe60c..47b13aa3fc 100644 --- a/ikvm-native/Makefile.am +++ b/ikvm-native/Makefile.am @@ -1,9 +1,11 @@ AM_CPPFLAGS = $(GLIB_CFLAGS) +glib_libs = $(top_builddir)/mono/eglib/libeglib.la + lib_LTLIBRARIES = libikvm-native.la libikvm_native_la_SOURCES = jni.c os.c jni.h libikvm_native_la_LDFLAGS = -avoid-version -libikvm_native_la_LIBADD = $(GLIB_LIBS) +libikvm_native_la_LIBADD = $(glib_libs) diff --git a/ikvm-native/Makefile.in b/ikvm-native/Makefile.in index 0cadf0d4f4..cf1f25ec8d 100644 --- a/ikvm-native/Makefile.in +++ b/ikvm-native/Makefile.in @@ -124,8 +124,7 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) -am__DEPENDENCIES_1 = -libikvm_native_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +libikvm_native_la_DEPENDENCIES = $(glib_libs) am_libikvm_native_la_OBJECTS = jni.lo os.lo libikvm_native_la_OBJECTS = $(am_libikvm_native_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) @@ -247,26 +246,17 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDKX11 = @GDKX11@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GINT_TO_POINTER = @GINT_TO_POINTER@ GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUC_NORETURN = @GNUC_NORETURN@ GNUC_PRETTY = @GNUC_PRETTY@ GNUC_UNUSED = @GNUC_UNUSED@ -GPOINTER_TO_INT = @GPOINTER_TO_INT@ -GPOINTER_TO_UINT = @GPOINTER_TO_UINT@ GREP = @GREP@ GSIZE = @GSIZE@ GSIZE_FORMAT = @GSIZE_FORMAT@ +GSSIZE = @GSSIZE@ GTKX11 = @GTKX11@ -GUINT_TO_POINTER = @GUINT_TO_POINTER@ -G_GINT32_FORMAT = @G_GINT32_FORMAT@ -G_GINT64_FORMAT = @G_GINT64_FORMAT@ -G_GUINT32_FORMAT = @G_GUINT32_FORMAT@ -G_GUINT64_FORMAT = @G_GUINT64_FORMAT@ -G_HAVE_ISO_VARARGS = @G_HAVE_ISO_VARARGS@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_NINJA = @HAVE_NINJA@ @@ -434,10 +424,11 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = $(GLIB_CFLAGS) +glib_libs = $(top_builddir)/mono/eglib/libeglib.la lib_LTLIBRARIES = libikvm-native.la libikvm_native_la_SOURCES = jni.c os.c jni.h libikvm_native_la_LDFLAGS = -avoid-version -libikvm_native_la_LIBADD = $(GLIB_LIBS) +libikvm_native_la_LIBADD = $(glib_libs) all: all-am .SUFFIXES: diff --git a/llvm/Makefile.in b/llvm/Makefile.in index 185aa414f1..cad4522341 100644 --- a/llvm/Makefile.in +++ b/llvm/Makefile.in @@ -182,26 +182,17 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDKX11 = @GDKX11@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GINT_TO_POINTER = @GINT_TO_POINTER@ GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUC_NORETURN = @GNUC_NORETURN@ GNUC_PRETTY = @GNUC_PRETTY@ GNUC_UNUSED = @GNUC_UNUSED@ -GPOINTER_TO_INT = @GPOINTER_TO_INT@ -GPOINTER_TO_UINT = @GPOINTER_TO_UINT@ GREP = @GREP@ GSIZE = @GSIZE@ GSIZE_FORMAT = @GSIZE_FORMAT@ +GSSIZE = @GSSIZE@ GTKX11 = @GTKX11@ -GUINT_TO_POINTER = @GUINT_TO_POINTER@ -G_GINT32_FORMAT = @G_GINT32_FORMAT@ -G_GINT64_FORMAT = @G_GINT64_FORMAT@ -G_GUINT32_FORMAT = @G_GUINT32_FORMAT@ -G_GUINT64_FORMAT = @G_GUINT64_FORMAT@ -G_HAVE_ISO_VARARGS = @G_HAVE_ISO_VARARGS@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_NINJA = @HAVE_NINJA@ diff --git a/m4/Makefile.in b/m4/Makefile.in index 3b62446462..a460a53b83 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -169,26 +169,17 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDKX11 = @GDKX11@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GINT_TO_POINTER = @GINT_TO_POINTER@ GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUC_NORETURN = @GNUC_NORETURN@ GNUC_PRETTY = @GNUC_PRETTY@ GNUC_UNUSED = @GNUC_UNUSED@ -GPOINTER_TO_INT = @GPOINTER_TO_INT@ -GPOINTER_TO_UINT = @GPOINTER_TO_UINT@ GREP = @GREP@ GSIZE = @GSIZE@ GSIZE_FORMAT = @GSIZE_FORMAT@ +GSSIZE = @GSSIZE@ GTKX11 = @GTKX11@ -GUINT_TO_POINTER = @GUINT_TO_POINTER@ -G_GINT32_FORMAT = @G_GINT32_FORMAT@ -G_GINT64_FORMAT = @G_GINT64_FORMAT@ -G_GUINT32_FORMAT = @G_GUINT32_FORMAT@ -G_GUINT64_FORMAT = @G_GUINT64_FORMAT@ -G_HAVE_ISO_VARARGS = @G_HAVE_ISO_VARARGS@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_NINJA = @HAVE_NINJA@ diff --git a/man/Makefile.in b/man/Makefile.in index abd833a332..64adb3f79c 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -201,26 +201,17 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDKX11 = @GDKX11@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GINT_TO_POINTER = @GINT_TO_POINTER@ GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUC_NORETURN = @GNUC_NORETURN@ GNUC_PRETTY = @GNUC_PRETTY@ GNUC_UNUSED = @GNUC_UNUSED@ -GPOINTER_TO_INT = @GPOINTER_TO_INT@ -GPOINTER_TO_UINT = @GPOINTER_TO_UINT@ GREP = @GREP@ GSIZE = @GSIZE@ GSIZE_FORMAT = @GSIZE_FORMAT@ +GSSIZE = @GSSIZE@ GTKX11 = @GTKX11@ -GUINT_TO_POINTER = @GUINT_TO_POINTER@ -G_GINT32_FORMAT = @G_GINT32_FORMAT@ -G_GINT64_FORMAT = @G_GINT64_FORMAT@ -G_GUINT32_FORMAT = @G_GUINT32_FORMAT@ -G_GUINT64_FORMAT = @G_GUINT64_FORMAT@ -G_HAVE_ISO_VARARGS = @G_HAVE_ISO_VARARGS@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_MSGFMT = @HAVE_MSGFMT@ HAVE_NINJA = @HAVE_NINJA@ diff --git a/man/mono.1 b/man/mono.1 index fbcf76080f..ec8c9c0762 100644 --- a/man/mono.1 +++ b/man/mono.1 @@ -214,6 +214,13 @@ and .I llvm options. This feature is experimental. .TP +.I llvmopts=[options] +Use this option to override the built-in set of flags passed to the +LLVM optimizer. The list of possible flags that can be passed can be +obtained by calling the bundled +.I opt +program that comes with Mono. +.TP .I llvm-outfile=[filename] Gives the path for the temporary LLVM bitcode file created during AOT. .I dedup @@ -584,6 +591,11 @@ Controls whether the runtime should attempt to inline (the default), or not inline methods invocations .ne .RE +\fB--response=FILE\fR +Provides a response file, this instructs the Mono command to read +other command line options from the specified file, as if the +options had been specified on the command line. Useful when you have +very long command lines. .TP \fB--runtime=VERSION\fR Mono supports different runtime versions. The version used depends on the program @@ -1166,7 +1178,7 @@ If set, tells mono to attempt using native asynchronous I/O services. If not set, a default select/poll implementation is used. Currently epoll and kqueue are supported. .TP -\fBMONO_ENABLE_COOP\fR +\fBMONO_ENABLE_COOP_SUSPEND\fR This makes the Mono runtime and the SGen garbage collector run in cooperative mode as opposed to run on preemptive mode. Preemptive mode is the mode that Mono has used historically, going back to the Boehm days, where the @@ -1177,7 +1189,7 @@ safe point. This makes for an easier to debug garbage collector. As of Mono 4.3.0 it is a work in progress, and while it works, it has not been used extensively. This option enabled the feature and allows us to find spots that need to be tuned for this mode of operation. Alternatively, -this mode can be enabled at compile time by using the --with-cooperative-gc +this mode can be enabled at compile time by using the --enable-cooperative-suspend flag when calling configure. .TP \fBMONO_ENV_OPTIONS\fR @@ -1654,8 +1666,8 @@ Currently, the following options are supported: Enables small structs alignment to 4/8 bytes. .TP \fBarm-use-fallback-tls\fR -When this option is set on ARM, a fallback TLS will be used instead -of the default fast TLS. +When this option is set on ARM, a fallback thread local store will be used instead +of the default fast thread local storage primitives. .TP \fBbreak-on-unverified\fR If this variable is set, when the Mono VM runs into a verification @@ -1784,6 +1796,12 @@ This option will suspend the program when an exception occurs. .TP \fBsuspend-on-unhandled\fR This option will suspend the program when an unhandled exception occurs. +.TP +\fBthread-dump-dir=DIR\fR +Use DIR for storage thread dumps created by SIGQUIT. +.TP +\fBverbose-gdb\fR +Make gdb output on native crashes more verbose. .ne .RE .TP diff --git a/mcs/Makefile b/mcs/Makefile index f4de700d6a..555a85e826 100644 --- a/mcs/Makefile +++ b/mcs/Makefile @@ -152,9 +152,13 @@ MONO_API_ASSEMBLIES_IGNORED := $(addprefix $(topdir)class/lib/$(PROFILE)/, Mono. MONO_API_ASSEMBLIES := $(filter-out $(MONO_API_ASSEMBLIES_IGNORED), $(wildcard $(topdir)class/lib/$(PROFILE)/*.dll)) $(wildcard $(topdir)class/lib/$(PROFILE)/Facades/*.dll) MONO_API_ASSEMBLIES_CS := $(MONO_API_ASSEMBLIES:$(topdir)class/lib/$(PROFILE)/%.dll=$(MONO_API_SNAPSHOT_PROFILE_PATH)%.cs) -$(MONO_API_SNAPSHOT_PROFILE_PATH)%.cs: $(topdir)class/lib/$(PROFILE)/%.dll $(GENAPI) $(MONO_API_SNAPSHOT_PATH)profiles/license-header.txt +apidiff/ignored-attr.txt: @mkdir -p $(dir $@) - $(Q) MONO_PATH=$(topdir)class/lib/$(BUILD_TOOLS_PROFILE) $(RUNTIME) $(GENAPI) -libPath:$(topdir)class/lib/$(PROFILE),$(topdir)class/lib/$(PROFILE)/Facades -out:$(dir $@) -headerFile:$(MONO_API_SNAPSHOT_PATH)profiles/license-header.txt -assemblyAttributes -typeForwardedTo -assemblyVersion -assembly:$< || echo "Couldn't process assembly." > $@ + @echo "T:System.Runtime.CompilerServices.CompilerGeneratedAttribute" > $@ + +$(MONO_API_SNAPSHOT_PROFILE_PATH)%.cs: $(topdir)class/lib/$(PROFILE)/%.dll $(GENAPI) $(MONO_API_SNAPSHOT_PATH)profiles/license-header.txt apidiff/ignored-attr.txt + @mkdir -p $(dir $@) + $(Q) MONO_PATH=$(topdir)class/lib/$(BUILD_TOOLS_PROFILE) $(RUNTIME) $(GENAPI) -libPath:$(topdir)class/lib/$(PROFILE),$(topdir)class/lib/$(PROFILE)/Facades -out:$(dir $@) -headerFile:$(MONO_API_SNAPSHOT_PATH)profiles/license-header.txt -assemblyAttributes -typeForwardedTo -assemblyVersion -excludeAttributesList:apidiff/ignored-attr.txt -assembly:$< || echo "Couldn't process assembly." > $@ mono-api-current: $(MONO_API_ASSEMBLIES_CS) @@ -175,3 +179,11 @@ mono-api-diff: @mkdir -p apidiff $(Q) sed -e "/@diffdata@/r temp.patch" -e "/@diffdata@/d" -e "s/@title@/Public API Diff/g" -e "s/@description@/If the changes are intentional, run make -C mcs mono-api-diff<\/code> locally and commit changes in external\/api-snapshot./g" diff.html.in > apidiff/index.html $(Q) if [ -s temp.patch ]; then echo "Error: Found public API differences, see mcs/apidiff/index.html. If the changes are intentional, please go to external/api-snapshot and commit them."; rm -f temp.patch; exit 1; else echo "No differences found."; rm -f temp.patch; fi + +mono-csproj-diff: + @echo "Generating csproj diff..." + $(Q) git add -A "*.csproj" $(topdir)../bcl.sln + $(Q) git diff --no-renames HEAD "*.csproj" $(topdir)../bcl.sln > $(abspath $(topdir))/temp.patch + @mkdir -p csprojdiff + $(Q) sed -e "/@diffdata@/r temp.patch" -e "/@diffdata@/d" -e "s/@title@/Project Files Diff/g" -e "s/@description@/Use @monojenkins commit csproj<\/code> to commit them./g" diff.html.in > csprojdiff/index.html + $(Q) if [ -s temp.patch ]; then echo "Error: Found csproj differences, see mcs/csprojdiff/index.html. If the changes are intentional, please commit them."; rm -f temp.patch; exit 1; else echo "No differences found."; rm -f temp.patch; fi diff --git a/mcs/build/Makefile b/mcs/build/Makefile index 5af3d04498..1dfe0e7795 100644 --- a/mcs/build/Makefile +++ b/mcs/build/Makefile @@ -33,7 +33,7 @@ COMMON_SRCS = \ AssemblyRef.cs DISTFILES = \ - README.makefiles \ + README.makefiles.md \ README.platforms \ README.configury \ config-default.make \ @@ -41,6 +41,7 @@ DISTFILES = \ corcompare-api.xsl \ executable.make \ gensources.sh \ + gensources.cs \ library.make \ rules.make \ tests.make \ diff --git a/mcs/build/README.makefiles b/mcs/build/README.makefiles.md similarity index 62% rename from mcs/build/README.makefiles rename to mcs/build/README.makefiles.md index 9453d4e0b9..974a6472bb 100644 --- a/mcs/build/README.makefiles +++ b/mcs/build/README.makefiles.md @@ -1,25 +1,25 @@ -The MCS makefiles (-*- outline -*-) -Peter Williams +# The MCS makefiles + +Author: Peter Williams The new makefiles try to abstract building on Windows and Linux. They try to provide a consistent set of ways to express the things that our build system needs to let us do, specifically: - * Build recursively - * Build libraries and executables easily - * Let developers use different runtimes and class libaries - * Make distributions easily - * Provide a framework for testing - * Build platform-independently whenever possible - * Generate, update, and build monodoc documentation. +* Build recursively +* Build libraries and executables easily +* Let developers use different runtimes and class libaries +* Make distributions easily +* Provide a framework for testing +* Build platform-independently whenever possible +* Generate, update, and build monodoc documentation. - - -** Makefile structure +Makefile structure +================== A general makefile looks like this: -======================================== +``` thisdir = class/Mono.My.Library SUBDIRS = include ../../build/rules.make @@ -50,59 +50,60 @@ doc-update-local: my_test_program.exe: my_test_source.cs $(CSCOMPILE) /target:exe /out:$@ $< -======================================== +``` Each makefile follows the same pattern: it does some setup, includes the standard make rules, and provides rules for eight standard targets: -all, install, test, run-test, clean, dist, and doc-update. +`all`, `install`, `test`, `run-test`, `clean`, `dist`, and `doc-update`. -"Some setup" is defining two variables: $(thisdir) and -$(SUBDIRS). $(thisdir) is the directory that the makefile lives in, -relative to the top directory (ie, class/corlib) and $(SUBDIRS) +"Some setup" is defining two variables: `$(thisdir)` and +`$(SUBDIRS)`. `$(thisdir)` is the directory that the makefile lives in, +relative to the top directory (ie, `class/corlib`) and `$(SUBDIRS)` defines the subdirectories that should be built in. The eight targets do the following: - * all-local builds whatever someone would expect to be built -when they just type 'make'. Most likely Foo.dll or Foo.exe +* `all-local` builds whatever someone would expect to be built + when they just type `make'` Most likely `Foo.dll` or `Foo.exe` - * install-local installs whatever got built by all-local. +* `install-local` installs whatever got built by `all-local`. - * test-local _builds_ the test programs or libraries but does -_not_ run them. +* `test-local` _builds_ the test programs or libraries but does + _not_ run them. - * run-test-local actually runs the tests. It shouldn't -necessarily exit in an error if the test fails, but should make that -situation obvious. It should only run tests that take care of -themselves automatically; interactive tests should have an individual -target. The idea is that 'make run-test' from the toplevel should be -able to proceed unsupervised and test everything that can be tested in -such a manner. +* `run-test-local` actually runs the tests. It shouldn't + necessarily exit in an error if the test fails, but should make that + situation obvious. It should only run tests that take care of + themselves automatically; interactive tests should have an individual + target. The idea is that `make run-test` from the toplevel should be + able to proceed unsupervised and test everything that can be tested in + such a manner. - * run-test-ondotnet-local is a variant of run-test-local. It is used only to validate if our tests themselves works fine under Microsoft runtime (on Windows). Basically, in this target, we should not use $(TEST_RUNTIME) to test our libraries. +* `run-xunit-test-local` this is a variation of the above, but it runs the + tests that were built with Xunit instead of NUnit. - * clean-local removes built files; 'make clean' should leave -only files that go into a distribution tarball. (But it is not necessarily -true that all files that go into a tarball need to be left after a make clean.) +* `run-test-ondotnet-local` is a variant of `run-test-local`. It is used only to validate if our tests themselves works fine under Microsoft runtime (on Windows). Basically, in this target, we should not use $(TEST_RUNTIME) to test our libraries. - * dist-local copies files into the distribution tree, which is -given by the variable $(distdir). dist-local always depends on the -target 'dist-default'. See ** 'make dist' below. +* `clean-local` removes built files; `make clean` should leave + only files that go into a distribution tarball. (But it is not + necessarily true that all files that go into a tarball need to be left + after a make clean.) - * doc-update-local should generate or update monodoc documentation, -if appropriate. This is usually only appropriate for libraries. It's -defined as a standard target so that it can easily be run recursively -across all libraries within the module. +* `dist-local` copies files into the distribution tree, which is + given by the variable `$(distdir)`. `dist-local` always depends on the + target `dist-default`. See ** `make dist` below. +* `doc-update-local` should generate or update monodoc documentation, + if appropriate. This is usually only appropriate for libraries. It's + defined as a standard target so that it can easily be run recursively + across all libraries within the module. - - - -** Build configuration +Build configuration +=================== In general, MCS needs to be able to build relying only on the -existence of a runtime and core libraries (corlib, System, -System.Xml). So there shouldn't be any checking for libraries or +existence of a runtime and core libraries (`mscorlib`, `System`, +`System.Xml`). So there shouldn't be any checking for libraries or whatnot; MCS should be able to build out of the box. We try to keep platform detection and feature testing (ie, for HP/UX echo) inside the makefiles; right now, there's no configuration script, and it'd @@ -115,41 +116,37 @@ customize their builds to suit their needs. To allow this, the Makefile rules are set up to allow people to override pretty much any important variable. -Configuration variables are given defaults in `config-default.make'; -`rules.make' optionally includes `$(topdir)/build/config.make', so you +Configuration variables are given defaults in `config-default.make`; +`rules.make` optionally includes `$(topdir)/build/config.make`, so you can customize your build without CVS trying to commit your modified -`config-default.make' all the time. Platform-specific variables are -defined in `$(topdir)/build/platforms/$(BUILD_PLATFORM).make', where -$(BUILD_PLATFORM) is detected in config-default.make. (Currently, the only -choices are linux.make and win32.make.) +`config-default.make` all the time. Platform-specific variables are +defined in `$(topdir)/build/platforms/$(BUILD_PLATFORM).make`, where +`$(BUILD_PLATFORM)` is detected in `config-default.make`. (Currently, the only +choices are `linux.make` and `win32.make`) The best way to learn what the configuration variables are is to read -`config.make' and `platform.make'. There aren't too many and hopefully +`config.make` and `platform.make`. There aren't too many and hopefully they should be self-explanatory; see the numerous examples below for more information if you're confused. - - - - - -** Recommendations for platform specifics +Recommendations for platform specifics +-------------------------------------- If you find yourself needing a platform-specific customization, try and express it in terms of a feature, rather than a platform test. In other words, this is good: -======================================== +``` run-test-local: my-test.exe ifdef PLATFORM_NEEDS_CRAZY_CRAP crazy-crap endif $(RUNTIME) my-test.exe -======================================== +``` and this is bad: -======================================== +``` run-test-local: my-test.exe ifdef WINDOWS crazy-crap @@ -159,7 +156,7 @@ ifdef AMIGA endif endif $(RUNTIME) my-test.exe -======================================== +``` The latter accumulates and gets unpleasant and it sucks. Granted, right now we only have two platforms, so it's not a big deal, but it's @@ -168,88 +165,79 @@ do the various corlib building hacks for examples of how we've done platform-specificity. It certainly isn't pretty, but at least it's a little structured. +Saving effort +============= - - - - -** Saving effort - - The point of the build system is to abstract things and take +The point of the build system is to abstract things and take care of all the easy stuff. So if you find yourself writing a Makefile, know that there's probably already infrastructure to do what -you want. Here are all the common cases I can think of ... +you want. Here are all the common cases I can think of. +Compiling C# code? use: +----------------------- - - - - -* Compiling C# code? use: - -======================================== +``` my-program.exe: my-source.cs $(CSCOMPILE) /target:exe /out:$@ $^ -======================================== +``` - or +or -======================================== +``` my-lib.dll: my-source.cs $(CSCOMPILE) /target:library /out:$@ $^ -======================================== +``` -Note the '$@' and '$^' variables. The former means "the name of the +Note the `$@` and `$^` variables. The former means "the name of the file that I am trying to make" and the latter means "all the dependencies of the file I am trying to make." USE THESE VARIABLES AGGRESSIVELY. Say that you add a new source to your program: -======================================== +``` my-program.exe: my-source.cs my-new-source.cs $(CSCOMPILE) /target:exe /out:$@ $^ -======================================== +``` Because of the $^ variable, you don't need to remember to add another file to the command line. Similarly, if you rename your program, you won't need to remember to change the rule: -======================================== +``` MonoVaporizer.exe: my-source.cs my-new-source.cs $(CSCOMPILE) /target:exe /out:$@ $^ -======================================== +``` will still work. Another useful variable is $<, which means "the first dependency of whatever I'm building." If you order your dependencies carefully it can be extremely useful. +Just building an executable? +---------------------------- +Then use: - - -* Just building an executable? use: - -======================================== +``` PROGRAM = myprogram.exe LOCAL_MCS_FLAGS = /r:System.Xml.dll include ../build/executable.make -======================================== +``` executable.make builds a program in the current directory. Its name is -held in $(PROGRAM), and its sources are listed in the file -$(PROGRAM).sources. It might seem to make more sense to just list the +held in `$(PROGRAM)`, and its sources are listed in the file +`$(PROGRAM).sources`. It might seem to make more sense to just list the program's sources in the Makefile, but when we build on Windows we need to change slashes around, which is much easier to do if the -sources are listed in a file. The variable $(LOCAL_MCS_FLAGS) changes -the flags given to the compiler; it is included in $(CSCOMPILE) so you +sources are listed in a file. The variable `$(LOCAL_MCS_FLAGS)` changes +the flags given to the compiler; it is included in `$(CSCOMPILE)` so you don't need to worry about it. -executable.make does a lot for you: it builds the program in 'make -all-local', installs the program in $(prefix)/bin, distributes the +`executable.make` does a lot for you: it builds the program in 'make +all-local', installs the program in `$(prefix)/bin`, distributes the sources, and defines empty test targets. Now, if your program has a -test, set the variable HAS_TEST: +test, set the variable `HAS_TEST`: -======================================== +``` PROGRAM = myprogram.exe LOCAL_MCS_FLAGS = /r:System.Xml.dll HAS_TEST = yes @@ -262,30 +250,30 @@ run-test-local: mytester.exe mytester.exe: mytester.cs $(CSCOMPILE) /target:exe /out:$@ mytester.cs -======================================== +``` -If your program has NUnit tests, set the variable HAS_NUNIT_TEST: +If your program has NUnit tests, set the variable `HAS_NUNIT_TEST`: -======================================== +``` PROGRAM = myprogram.exe LOCAL_MCS_FLAGS = /r:System.Xml.dll HAS_NUNIT_TEST = yes include ../build/executable.make -======================================== +``` -HAS_NUNIT_TEST tests follow library.make NUnit test conventions: -the files should be in a subdirectory called Test/, and if -your program is called myprogram.exe, they should be listed in -myprogram_test.dll.sources. The names in that files should *not* have -the Test/ prefix. 'make test' will build myprogram_test_$(PROFILE).dll +`HAS_NUNIT_TEST` tests follow `library.make` NUnit test conventions: +the files should be in a subdirectory called `Test/`, and if +your program is called `myprogram.exe`, they should be listed in +`myprogram_test.dll.sources`. The names in that files should *not* have +the `Test/` prefix. `make test'`will build `myprogram_test_$(PROFILE).dll` in the current directory, automatically supplying the flags to -reference the original program and NUnit.Framework.dll. +reference the original program and `NUnit.Framework.dll`. If your program has 'built sources', that is, source files generated from other files (say, generated by jay), define a variable called -BUILT_SOURCES and do *not* list the sources in $(PROGRAM).sources: +`BUILT_SOURCES` and do *not* list the sources in `$(PROGRAM).sources`: -======================================== +``` PROGRAM = myprogram.exe LOCAL_MCS_FLAGS = /r:System.Xml.dll BUILT_SOURCES = parser.cs @@ -295,100 +283,96 @@ include ../build/executable.make parser.cs: parser.jay $(topdir)/jay/jay $< > $@ -======================================== +``` -executable.make will automatically delete the $(BUILT_SOURCES) files -on 'make clean'. Since this situation is a common occurrence and jay +`executable.make` will automatically delete the `$(BUILT_SOURCES)` files +on `make clean`. Since this situation is a common occurrence and jay happens to leave behind y.output files, you can also define a variable -called $(CLEAN_FILES) that lists extra files to be deleted when 'make clean' is -called. (That's in addition to your executable and the built sources). +called `$(CLEAN_FILES)` that lists extra files to be deleted when +`make clean` is called. (That's in addition to your executable and the built sources). +Buildling a library? Use +------------------------ - - - - -* Buildling a library? Use - -======================================== +``` LIBRARY = Mono.MyLib.dll LIB_MCS_FLAGS = /unsafe TEST_MCS_FLAGS = /r:System.Xml.dll include ../../build/library.make -======================================== +``` -Where you library is called $(LIBRARY); it will be put into -$(topdir)/class/lib. LIB_MCS_FLAGS is the set of MCS flags to use when +Where you library is called `$(LIBRARY)`; it will be put into +`$(topdir)/class/lib`. `LIB_MCS_FLAGS` is the set of MCS flags to use when compiling the library; in addition, a global set of flags called -$(LIBRARY_FLAGS) is added (that variable is defined in -config-defaults.make), as well as the usual $(LOCAL_MCS_FLAGS). +`$(LIBRARY_FLAGS)` is added (that variable is defined in +`config-defaults.make`), as well as the usual `$(LOCAL_MCS_FLAGS)`. -As in executable.make, the sources for your library are listed in -$(LIBRARY).sources. Note: these source lists should have Unix forward +As in `executable.make`, the sources for your library are listed in +`$(LIBRARY).sources`. Note: these source lists should have Unix forward slashes and Unix newlines (\n, not \r\n.) If you get an error about "touch: need a filename", that means your .sources file doesn't end in a newline. It should. -Now library.make also assumes that your library has an NUnit2 test -harness. The files should be in a subdirectory called Test/, and if -your library is called Mono.Foo.dll, they should be listed in -Mono.Foo_test.dll.sources. The names in that files should *not* have -the Test/ prefix. 'make test' will build Mono.Foo_test.dll in the +Now `library.make` also assumes that your library has an NUnit2 test +harness. The files should be in a subdirectory called `Test/`, and if +your library is called `Mono.Foo.dll`, they should be listed in +`Mono.Foo_test.dll.sources`. The names in that files should *not* have +the `Test/` prefix. `make test` will build `Mono.Foo_test.dll` in the current directory, automatically supplying the flags to reference the -original library and NUnit.Framework.dll. +original library and `NUnit.Framework.dll`. If you don't have a test, just do this: -======================================== +``` LIBRARY = Mono.MyLib.dll LIB_MCS_FLAGS = /unsafe NO_TEST = yes include ../../build/library.make -======================================== +``` and feel ashamed. Every good library has a test suite! Extra flags needed to compile the test library should be listed in $(TEST_MCS_FLAGS); often you will have a line like this: -======================================== +``` TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -======================================== +``` -Again, library.make does a lot for you: it builds the dll, it +Again, `library.make` does a lot for you: it builds the dll, it generates makefile fragments to track the dependencies, it installs -the library, it builds the test dll on 'make test', it runs -$(TEST_HARNESS) on it on 'make run-test', it removes the appropriate +the library, it builds the test dll on `make test`, it runs +`$(TEST_HARNESS)` on it on `make run-test`, it removes the appropriate files on 'make clean', and it distributes all the source files on -'make dist'. (TEST_HARNESS defaults to be nunit-console.exe but it may -be overridden to, say, nunit-gtk). If you have extra files to -distribute when using either library.make or executable.make, use the -variable $(EXTRA_DISTFILES): +`make dist`. (`TEST_HARNESS` defaults to be `nunit-console.exe` but it may +be overridden to, say, `nunit-gtk`). If you have extra files to +distribute when using either `library.make` or `executable.make`, use the +variable `$(EXTRA_DISTFILES)`: -======================================== +``` EXTRA_DISTFILES = \ Test/testcase1.in \ Test/testcase1.out \ README -======================================== +``` -Again, library.make and executable.make do the right things so that we +Again, `library.make` and `executable.make` do the right things so that we can build on Windows, doing some trickery to invert slashes and overcome command-line length limitations. Use them unless you have a really good reason not to. If you're building a bunch of small -executables, check out tools/Makefile or tools/security/Makefile; if +executables, check out `tools/Makefile` or `tools/security/Makefile`; if all the files are in the current directory, changing slashes isn't a big deal, and command-line lengths won't be a problem, so executable.make isn't necessary (and indeed it won't work, since it can only build one .exe in a directory). -If you're building a library, library.make is highly recommended; the +If you're building a library, `library.make` is highly recommended; the only DLL that doesn't use it is corlib, because building corlib is a fair bit more complicated than it should be. Oh well. -library.make also automatically supports generating and updating +`library.make` also automatically supports generating and updating monodoc documentation. Documentation is stored within the Documentation directory (a sibling to the Test directory), and is generated/updated whenever the doc-update target is executed. @@ -396,19 +380,15 @@ Assembling of the documentation so that the monodoc browser can display the documentation is handled separately within the mcs/docs all-local target; see mcs/docs/Makefile for details. +Running a C# program? Use $(RUNTIME) +------------------------------------ - - - - -* Running a C# program? Use $(RUNTIME) - -======================================== +``` run-test-local: myprog.exe $(RUNTIME) myprog.exe -======================================== +``` -$(RUNTIME) might be empty (if you're on windows), so don't expect to +`$(RUNTIME)` might be empty (if you're on windows), so don't expect to be able to give it any arguments. If you're on a platform which has an interpreter or jitter, $(RUNTIME_FLAGS) is included in $(RUNTIME), so set that variable. @@ -418,7 +398,8 @@ just "mono --debug". -* Calling the compiler directly? Use $(MCS). +Calling the compiler directly? Use $(MCS). +------------------------------------------ Really, you should use $(CSCOMPILE) whenever possible, but $(MCS) is out there. $(BOOTSTRAP_MCS) is the C# compiler that we use to build @@ -426,17 +407,15 @@ mcs.exe; on Linux, we then use mcs.exe to build everything else, but on Windows, we use csc.exe to build everything. Only use $(BOOTSTRAP_MCS) if you know what you're doing. - - - - -* Compiling C code? Use $(CCOMPILE) +Compiling C code? Use $(CCOMPILE) +--------------------------------- To give it flags, set $(LOCAL_CFLAGS). As with compiling C#, the variable $(CFLAGS) will automatically be included on the command line. -* Compiling resources with resgen +Compiling resources with resgen +------------------------------- If you have a resource that should be compiled with resgen and included in your assembly, you can use the RESOURCES_DEFS variable. @@ -447,7 +426,8 @@ the file name, like this: RESOURCE_DEFS = Messages,TextResources.resx Errors,ErrorList.txt -* Documentation-related needs? Use $(MDOC) +Documentation-related needs? Use $(MDOC) +---------------------------------------- $(MDOC) is a front-end to the monodoc documentation system, supporting documentation generation, updating, importing from Microsoft XML @@ -458,20 +438,16 @@ documentation to various other output formats such as static HTML. It is currently only used for library.make's doc-update-local target and for assembling documentation within $topdir/docs. - - - - -* Installing files? Use $(MKINSTALLDIRS), $(INSTALL_DATA) or -$(INSTALL_BIN), $(prefix), and $(DESTDIR). +Installing files? Use $(MKINSTALLDIRS), $(INSTALL_DATA) or $(INSTALL_BIN), $(prefix), and $(DESTDIR). +----------------------------------------------------------------------------------------------------- Every time a file is installed the commands should look like this: -======================================== +``` install-local: $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/my/dir $(INSTALL_DATA) myfile $(DESTDIR)$(prefix)/my/dir -======================================== +``` This way the directory is created recursively if needed (admittedly, we could probably rely on mkdir -p), the file is given the correct permissions, @@ -480,22 +456,19 @@ and we can support $(DESTDIR) installs. We use $(DESTDIR) to make monocharge tarballs, and it's useful otherwise, so try and use it consistently. - - - - -* 'make dist'? Use $(DISTFILES) +'make dist'? Use $(DISTFILES) +----------------------------- The 'dist-default' target will copy the files listed in $(DISTFILES) into the distribution directory, as well as Makefile and ChangeLog if they exist. This is almost always all that you need, so ideally your make dist support should only be: -======================================== +``` DISTFILES = README Test/thoughts.txt dist-local: dist-default -======================================== +``` DISTFILES will cope correctly with files in subdirectories, by the way. Note that if you put a nonexistant file or a directory in @@ -503,10 +476,10 @@ DISTFILES it will *not* complain; it will just ignore it. If you want to test your 'make dist' code, you can try -======================================== +``` $ cd class/Mono.MyClass $ make dist-local distdir=TEST -======================================== +``` And your files should be copied into TEST/ in the current directory. There is a toplevel 'make distcheck' target, which will build a dist @@ -516,28 +489,21 @@ files originally in the tarball: they should be the same. But this takes about 15 minutes to run on my 1.1 Ghz computer, so it's not for the faint of heart. - - - - -* Lots of files? Use $(wildcard *.foo) +Lots of files? Use $(wildcard *.foo) +------------------------------------ When specifying the sources to a library or executable, wildcards are not encouraged; in fact they're not allowed if you use library.make or executable.make. But there are times when they're useful, eg: -======================================== +``` DISTFILES = $(wildcard Test/*.in) $(wildcard Test/*.out) -======================================== +``` -Just so you know that 'make' has this feature. +Just so you know that `make` has this feature. - - - - - -* Referencing files in other directories? Use $(topdir). +Referencing files in other directories? Use $(topdir). +------------------------------------------------------ $(topdir) is the path to the top directory from the current build directory. Basically it's a sequence of ../.. computed from the value @@ -545,19 +511,15 @@ that you give $(thisdir) at the top of your Makefile. Try to reference things from $(topdir), so your code can be moved or cut-and-pasted around with a minimum of fuss. - - - - - -* Conditional building? Use ifdef/ifndef/endif +Conditional building? Use ifdef/ifndef/endif +-------------------------------------------- Now in general we want to avoid conditional building, but sometimes something doesn't work on Linux or already exists on Windows or whatnot. (See below on recommended form for how to build platform-specifically.) GNU Make supports the following construction: -======================================== +``` BUILD_EXPERIMENTAL = yes ifdef BUILD_EXPERIMENTAL @@ -567,13 +529,13 @@ experimental_stuff = endif all-local: my-sane.exe $(experimental_stuff) -======================================== +``` 'ifdef' means 'if the variable is set to nonempty', so you could have -======================================== +``` BUILD_EXPERIMENTAL = colorless green ideas sleep furiously -======================================== +``` and Make would be happy. I hope that the meaning of 'ifndef' should be obvious. If you want to only sometimes build a target, the above @@ -584,10 +546,8 @@ If you want to see why conditionals aren't nice, take a look at library.make or class/corlib/Makefile. - - - -* 'Private' directories that shouldn't be built by default? Use DIST_ONLY_SUBDIRS +'Private' directories that shouldn't be built by default? Use DIST_ONLY_SUBDIRS +-------------------------------------------------------------------------------- Several of the MCS class libraries have demo or experimental implementations that depend on things not included with MCS (say, @@ -613,7 +573,7 @@ a demo app using Gtk# called MyFancyDemo. The Makefile rules might look like this: class/Mono.MyFancyLib/Makefile -======================================== +``` thisdir = class/Mono.MyFancyLib SUBDIRS = DIST_ONLY_SUBDIRS = MyFancyDemo @@ -624,10 +584,10 @@ LIB_MCS_FLAGS = /r:System.dll TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) include ../../build/library.make -======================================== +``` class/Mono.MyFancyLib/MyFancyDemo/Makefile -======================================== +``` thisdir = class/Mono.MyFancyLib/MyFancyDemo SUBDIRS = include ../../../build/rules.make @@ -636,36 +596,41 @@ PROGRAM = FancyDemo.exe LOCAL_MCS_FLAGS = /r:gtk-sharp.dll include ../../../build/executable.make -======================================== +``` -* Special recursion needs? +Special recursion needs? +------------------------ By default, rules.make defines the all, install, clean, etc. targets to look something like this: +``` all: all-recursive $(MAKE) all-local +``` Sometimes that doesn't cut it; say for example you want to check for something before doing a lengthy recursive build (see $(topdir)/Makefile) or you have a something like this +``` class/MyLibrary: Build MyLibrary.dll class/MyLibrary/Test: Build TestMyLibrary.exe +``` -'make clean test' will fail here, because the build will happen in -the Test subdirectory first, so there will be no MyLibrary.dll to link +`make clean test` will fail here, because the build will happen in +the Test subdirectory first, so there will be no `MyLibrary.dll` to link against. (Unless you write a nasty evil relative path rule which is strongly discouraged.) Anyway, to solve this problem you can do -======================================== +``` thisdir = class/MyLibrary SUBDIRS = Test include ../../build/rules.make @@ -676,17 +641,15 @@ all-recursive: all-local test-recursive: test-local ... -======================================== +``` - - - -** A few implementation details +A few implementation details +---------------------------- The way rules.make does its recursion is very standard; it maps -{all,install,clean, dist,test} to $@-recursive, which executes that rule -in each directory in $(SUBDIRS), and then calls $@-local in the current +`{all,install,clean,dist,test}` to `$@-recursive`, which executes that rule +in each directory in `$(SUBDIRS)`, and then calls `$@-local` bin the current directory. So something that gets built in a subdirectory cannot rely on something that gets built in its parent directory. If this is a problem, see the previous section. Note that the recursive rule for 'dist' is @@ -697,61 +660,53 @@ Note that even a directory that doesn't, for example, have any tests must still define test-local; otherwise 'make test' run from the toplevel directory will break. - - - - - -** Flags for Tools +Flags for Tools +--------------- We want to make it so that the user can specify certain flags to always be given to a tool, so there's a general way of implementing FLAGS variables: - * $(foo_FLAGS) remains unset or defaulted to something - sensible; the user can provide overrides this way. +* `$(foo_FLAGS)` remains unset or defaulted to something + sensible; the user can provide overrides this way. - * $(LOCAL_foo_FLAGS) is set in a specific Makefile to - provide necessary values. +* `$(LOCAL_foo_FLAGS)` is set in a specific Makefile to + provide necessary values. - * $(PLATFORM_foo_FLAGS) is set in the platform configuration - to provide platform-specific values. +* `$(PLATFORM_foo_FLAGS)` is set in the platform configuration + to provide platform-specific values. - * $(PROFILE_foo_FLAGS) is set in the profile configuration - to provide profile-specific values. +* `$(PROFILE_foo_FLAGS)` is set in the profile configuration + to provide profile-specific values. - * $(USE_foo_FLAGS) is defined to be the combination of all of - the above, and it's what is actually passed to $(foo). +* `$(USE_foo_FLAGS)` is defined to be the combination of all of + the above, and it's what is actually passed to $(foo). -$(MCS_FLAGS) and $(CFLAGS) follow this model. If you end up finding +`$(MCS_FLAGS)` and `$(CFLAGS)` follow this model. If you end up finding that another tool is used commonly (hm, jay...), please follow this form. - - - - - -** Portability tips +Portability tips +---------------- Always use the icky Windows /argument way of passing parameters to the C# compiler so that csc can be used. -Always use /r:foo.dll, not /r:foo. Windows requires the former. +Always use `/r:foo.dll`, not `/r:foo`. Windows requires the former. -Use /r:$(corlib), not /r:corlib. +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 -======================================== +``` mytool $(all_the_sources_to_corlib) -======================================== +``` Is probably going to cause problems. As I understand it, -======================================== +``` for f in $(all_the_sources_to_corlib) ; do ... -======================================== +``` is ok, since the shell itself doesn't have those limitations. Other than that, you should still try to write fairly portable shell @@ -764,9 +719,10 @@ will be ports to more Unices as time goes on. -** Misc +Misc +---- -We still don't use /d:NET_1_1 ; it causes some build problems right +We still don't use `/d:NET_1_1`; it causes some build problems right now. There's a hack in class/System.Data/Makefile to work around a very diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 500ac875ea..70738de0a6 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -34,11 +34,11 @@ static class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "5.14.0.177"; + public const string MonoVersion = "5.16.0.100"; public const string MonoCompany = "Mono development team"; public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoCopyright = "(c) Various Mono authors"; - public const int MonoCorlibVersion = 1051400005; + public const int MonoCorlibVersion = 1051600010; #if MOBILE // Versions of .NET Framework for Silverlight 4.0 diff --git a/mcs/build/common/basic-profile-check.cs b/mcs/build/common/basic-profile-check.cs index 45050af7b2..48f88f7615 100644 --- a/mcs/build/common/basic-profile-check.cs +++ b/mcs/build/common/basic-profile-check.cs @@ -1,14 +1,13 @@ using System; -class X { - // Check installed compiler - static void Generic () - { - // we use 'var' all around in the compiler sources - var x = new X (); - } - - void DefaultParametersAvailable (int i = 3) +interface II +{ + +} + +class X +{ + static void Foo (II a = default (II), II b = default, II c = (II) null) { } diff --git a/mcs/build/gensources.cs b/mcs/build/gensources.cs new file mode 100644 index 0000000000..8a1d388bad --- /dev/null +++ b/mcs/build/gensources.cs @@ -0,0 +1,420 @@ +using System; +using System.Text; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Reflection; + +public static class Program { + public static int Main (string[] _args) { + var args = new List (_args); + bool useStdout = false, showHelp = false, strictMode = false; + + for (int i = 0; i < args.Count; i++) { + var arg = args[i]; + if (!arg.StartsWith ("-")) + continue; + + switch (arg) { + case "-?": + case "--help": + case "-h": + showHelp = true; + break; + case "--trace": + case "--trace1": + SourcesParser.TraceLevel = 1; + break; + case "--trace2": + SourcesParser.TraceLevel = 2; + break; + case "--trace3": + SourcesParser.TraceLevel = 3; + break; + case "--trace4": + SourcesParser.TraceLevel = 4; + break; + case "--stdout": + useStdout = true; + break; + case "--strict": + strictMode = true; + break; + default: + Console.Error.WriteLine ("Unrecognized switch " + arg); + break; + } + + args.RemoveAt (i); + i--; + } + + if (args.Count != 4) + showHelp = true; + + if (showHelp) { + Console.Error.WriteLine ("Usage: mcs/build/gensources.exe [options] (outputFileName|--stdout) libraryDirectoryAndName platformName profileName"); + Console.Error.WriteLine ("You can specify * for platformName and profileName to read all sources files"); + Console.Error.WriteLine ("Available options:"); + Console.Error.WriteLine ("--help -h -?"); + Console.Error.WriteLine (" Show command line info"); + Console.Error.WriteLine ("--trace1 --trace2 --trace3 --trace4"); + Console.Error.WriteLine (" Enable diagnostic output"); + Console.Error.WriteLine ("--stdout"); + Console.Error.WriteLine (" Writes results to standard output (omit outputFileName if you use this)"); + Console.Error.WriteLine ("--strict"); + Console.Error.WriteLine (" Produces an error exit code if files or directories are invalid/missing"); + return 1; + } + + var myAssembly = Assembly.GetExecutingAssembly (); + var codeBase = new Uri (myAssembly.CodeBase); + var executablePath = Path.GetFullPath (codeBase.LocalPath); + var executableDirectory = Path.GetDirectoryName (executablePath); + + var outFile = Path.GetFullPath (args[0]); + var libraryFullName = Path.GetFullPath (args[1]); + var platformName = args[2]; + var profileName = args[3]; + var platformsFolder = Path.Combine (executableDirectory, "platforms"); + var profilesFolder = Path.Combine (executableDirectory, "profiles"); + + var libraryDirectory = Path.GetDirectoryName (libraryFullName); + var libraryName = Path.GetFileName (libraryFullName); + + var parser = new SourcesParser (platformsFolder, profilesFolder); + var result = parser.Parse (libraryDirectory, libraryName, platformName, profileName); + + if (SourcesParser.TraceLevel > 0) + Console.Error.WriteLine ($"// Writing sources for platform {platformName} and profile {profileName}, relative to {libraryDirectory}, to {outFile}."); + + TextWriter output; + if (useStdout) + output = Console.Out; + else + output = new StreamWriter (outFile); + + using (output) { + foreach (var fileName in result.GetFileNames ().OrderBy (s => s, StringComparer.Ordinal)) + output.WriteLine (fileName); + } + + if (strictMode) + return result.ErrorCount; + else + return 0; + } +} + +public struct ParseEntry { + public string SourcesFileName; + public string Directory; + public string Pattern; + public string HostPlatform; + public string ProfileName; +} + +public struct Source { + public string FileName; +} + +public class ParseResult { + public readonly string LibraryDirectory, LibraryName; + + public readonly List Sources = new List (); + public readonly List Exclusions = new List (); + + // FIXME: This is a bad spot for this value but enumerators don't have outparam support + public int ErrorCount = 0; + + public ParseResult (string libraryDirectory, string libraryName) { + LibraryDirectory = libraryDirectory; + LibraryName = libraryName; + } + + private static string GetRelativePath (string fullPath, string relativeToDirectory) { + fullPath = fullPath.Replace (SourcesParser.DirectorySeparator, "/"); + relativeToDirectory = relativeToDirectory.Replace (SourcesParser.DirectorySeparator, "/"); + + if (!relativeToDirectory.EndsWith (SourcesParser.DirectorySeparator)) + relativeToDirectory += SourcesParser.DirectorySeparator; + var dirUri = new Uri (relativeToDirectory); + var pathUri = new Uri (fullPath); + + var relativeUri = Uri.UnescapeDataString ( + dirUri.MakeRelativeUri (pathUri).OriginalString + ).Replace ("/", SourcesParser.DirectorySeparator); + + if (SourcesParser.TraceLevel >= 4) + Console.Error.WriteLine ($"// {fullPath} -> {relativeUri}"); + + return relativeUri; + } + + private IEnumerable EnumerateMatches ( + IEnumerable entries, + string hostPlatformName, string profileName + ) { + foreach (var entry in entries) { + if ( + (hostPlatformName != null) && + (entry.HostPlatform ?? hostPlatformName) != hostPlatformName + ) + continue; + if ( + (profileName != null) && + (entry.ProfileName ?? profileName) != profileName + ) + continue; + + var absolutePath = Path.Combine (entry.Directory, entry.Pattern); + var absoluteDirectory = Path.GetDirectoryName (absolutePath); + var absolutePattern = Path.GetFileName (absolutePath); + + if (SourcesParser.TraceLevel >= 3) { + if ((absolutePattern != entry.Pattern) || (absoluteDirectory != entry.Directory)) + Console.Error.WriteLine ($"// {entry.Directory} / {entry.Pattern} -> {absoluteDirectory} / {absolutePattern}"); + } + + if (!Directory.Exists (absoluteDirectory)) { + Console.Error.WriteLine ($"Directory does not exist: {Path.GetFullPath (absoluteDirectory)}"); + ErrorCount += 1; + continue; + } + + var matchingFiles = Directory.GetFiles (absoluteDirectory, absolutePattern); + foreach (var fileName in matchingFiles) { + var relativePath = GetRelativePath (fileName, LibraryDirectory); + yield return relativePath; + } + } + } + + // If you loaded sources files for multiple profiles, you can use the arguments here + // to filter the results + public IEnumerable GetFileNames ( + string hostPlatformName = null, string profileName = null + ) { + var encounteredFileNames = new HashSet (StringComparer.Ordinal); + + var excludedFiles = new HashSet ( + EnumerateMatches (Exclusions, hostPlatformName, profileName), + StringComparer.Ordinal + ); + + foreach (var fileName in EnumerateMatches (Sources, hostPlatformName, profileName)) { + if (excludedFiles.Contains (fileName)) { + if (SourcesParser.TraceLevel >= 3) + Console.Error.WriteLine ($"// Excluding {fileName}"); + continue; + } + + // Skip duplicates + if (encounteredFileNames.Contains (fileName)) + continue; + + encounteredFileNames.Add (fileName); + yield return fileName; + } + } +} + +public class SourcesParser { + public static readonly string DirectorySeparator = new String (Path.DirectorySeparatorChar, 1); + public static int TraceLevel = 0; + + private class State { + public ParseResult Result; + public string HostPlatform; + public string ProfileName; + + public int SourcesFilesParsed, ExclusionsFilesParsed; + + public List ParsedSources { + get { + return Result.Sources; + } + } + + public List ParsedExclusions { + get { + return Result.Exclusions; + } + } + } + + public readonly string[] AllHostPlatformNames; + public readonly string[] AllProfileNames; + + private int ParseDepth = 0; + + public SourcesParser ( + string platformsFolder, string profilesFolder + ) { + AllHostPlatformNames = Directory.GetFiles (platformsFolder, "*.make") + .Select (Path.GetFileNameWithoutExtension) + .ToArray (); + AllProfileNames = Directory.GetFiles (profilesFolder, "*.make") + .Select (Path.GetFileNameWithoutExtension) + .ToArray (); + } + + public ParseResult Parse (string libraryDirectory, string libraryName, string hostPlatform, string profile) { + var state = new State { + Result = new ParseResult (libraryDirectory, libraryName), + ProfileName = profile, + HostPlatform = hostPlatform + }; + + var testPath = Path.Combine (libraryDirectory, $"{hostPlatform}_{profile}_{libraryName}"); + var ok = TryParseSingleFile (state, testPath + ".sources", false); + TryParseSingleFile (state, testPath + ".exclude.sources", true); + + if (ok) { + PrintSummary (state); + return state.Result; + } + + state.HostPlatform = null; + + testPath = Path.Combine (libraryDirectory, $"{profile}_{libraryName}"); + ok = TryParseSingleFile (state, testPath + ".sources", false); + TryParseSingleFile (state, testPath + ".exclude.sources", true); + + if (ok) { + PrintSummary (state); + return state.Result; + } + + testPath = Path.Combine (libraryDirectory, $"{hostPlatform}_{libraryName}"); + ok = TryParseSingleFile (state, testPath + ".sources", false); + TryParseSingleFile (state, testPath + ".exclude.sources", true); + + if (ok) { + PrintSummary (state); + return state.Result; + } + + state.ProfileName = null; + + testPath = Path.Combine (libraryDirectory, libraryName); + TryParseSingleFile (state, testPath + ".sources", false); + TryParseSingleFile (state, testPath + ".exclude.sources", true); + + PrintSummary (state); + + return state.Result; + } + + public ParseResult Parse (string libraryDirectory, string libraryName) { + var state = new State { + Result = new ParseResult (libraryDirectory, libraryName) + }; + + string testPath = Path.Combine (libraryDirectory, libraryName); + TryParseSingleFile (state, testPath + ".sources", false); + TryParseSingleFile (state, testPath + ".exclude.sources", true); + + foreach (var profile in AllProfileNames) { + state.ProfileName = profile; + + foreach (var hostPlatform in AllHostPlatformNames) { + state.HostPlatform = hostPlatform; + + testPath = Path.Combine (libraryDirectory, $"{hostPlatform}_{profile}_{libraryName}"); + TryParseSingleFile (state, testPath + ".sources", false); + TryParseSingleFile (state, testPath + ".exclude.sources", true); + } + + state.HostPlatform = null; + + testPath = Path.Combine (libraryDirectory, $"{profile}_{libraryName}"); + TryParseSingleFile (state, testPath + ".sources", false); + TryParseSingleFile (state, testPath + ".exclude.sources", true); + } + + PrintSummary (state); + + return state.Result; + } + + private void PrintSummary (State state) { + if (TraceLevel > 0) + Console.Error.WriteLine ($"// Parsed {state.SourcesFilesParsed} sources file(s) and {state.ExclusionsFilesParsed} exclusions file(s)."); + } + + private void HandleMetaDirective (State state, string directory, bool asExclusionsList, string directive) { + var include = "#include "; + if (directive.StartsWith (include)) + ParseSingleFile (state, Path.Combine (directory, directive.Substring (include.Length)), asExclusionsList); + } + + private bool TryParseSingleFile (State state, string fileName, bool asExclusionsList) { + if (!File.Exists (fileName)) + return false; + + ParseSingleFile (state, fileName, asExclusionsList); + return true; + } + + private void ParseSingleFile (State state, string fileName, bool asExclusionsList) { + var nullStr = ""; + if (TraceLevel >= 1) + Console.Error.WriteLine ($"// {new String (' ', ParseDepth * 2)}{fileName} [{state.HostPlatform ?? nullStr}] [{state.ProfileName ?? nullStr}]"); + ParseDepth += 1; + + var directory = Path.GetDirectoryName (fileName); + + using (var sr = new StreamReader (fileName)) { + if (asExclusionsList) + state.ExclusionsFilesParsed++; + else + state.SourcesFilesParsed++; + + string line; + while ((line = sr.ReadLine ()) != null) { + if (String.IsNullOrWhiteSpace (line)) + continue; + + if (line.StartsWith ("#")) { + HandleMetaDirective (state, directory, asExclusionsList, line); + continue; + } + + var parts = line.Split (':'); + + if (parts.Length > 1) { + var explicitExclusions = parts[1].Split (','); + + // gensources.sh implemented these explicit exclusions like so: + // ../foo/bar/*.cs:A.cs,B.cs + // This would generate exclusions for ../foo/bar/A.cs and ../foo/bar/B.cs, + // not ./A.cs and ./B.cs as you might expect + + var mainPatternDirectory = Path.GetDirectoryName (parts[0]); + + foreach (var pattern in explicitExclusions) { + state.ParsedExclusions.Add (new ParseEntry { + SourcesFileName = fileName, + Directory = directory, + Pattern = Path.Combine (mainPatternDirectory, pattern), + HostPlatform = state.HostPlatform, + ProfileName = state.ProfileName + }); + } + } + + (asExclusionsList ? state.ParsedExclusions : state.ParsedSources) + .Add (new ParseEntry { + SourcesFileName = fileName, + Directory = directory, + Pattern = parts[0], + HostPlatform = state.HostPlatform, + ProfileName = state.ProfileName + }); + } + } + + ParseDepth -= 1; + } +} \ No newline at end of file diff --git a/mcs/build/library.make b/mcs/build/library.make index 5accc87be0..120b09b771 100644 --- a/mcs/build/library.make +++ b/mcs/build/library.make @@ -224,7 +224,7 @@ test-local run-test-local run-test-ondotnet-local: ccomma = , define RESOURCE_template $(1).resources: $(2) - $(RESGEN) "$$<" "$$@" + $$(RESGEN) "$$<" "$$@" GEN_RESOURCE_DEPS += $(1).resources GEN_RESOURCE_FLAGS += -resource:$(1).resources @@ -298,11 +298,19 @@ endif PROFILE_sources := $(firstword $(if $(PROFILE_PLATFORM),$(wildcard $(PROFILE_PLATFORM)_$(PROFILE)_$(LIBRARY).sources)) $(wildcard $(PROFILE)_$(LIBRARY).sources) $(wildcard $(LIBRARY).sources)) PROFILE_excludes = $(firstword $(if $(PROFILE_PLATFORM),$(wildcard $(PROFILE_PLATFORM)_$(PROFILE)_$(LIBRARY).exclude.sources)) $(wildcard $(PROFILE)_$(LIBRARY).exclude.sources)) -# Note, gensources.sh can create a $(sourcefile).makefrag if it sees any '#include's -# We don't include it in the dependencies since it isn't always created +gensources = $(topdir)/build/gensources.exe +$(gensources): $(topdir)/build/gensources.cs + $(BOOTSTRAP_MCS) -noconfig -debug:portable -r:mscorlib.dll -r:System.dll -r:System.Core.dll -out:$(gensources) $(topdir)/build/gensources.cs + +ifdef PROFILE_RUNTIME +GENSOURCES_RUNTIME = $(PROFILE_RUNTIME) +else +GENSOURCES_RUNTIME = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) +endif + sourcefile = $(depsdir)/$(PROFILE_PLATFORM)_$(PROFILE)_$(LIBRARY_SUBDIR)_$(LIBRARY).sources -$(sourcefile): $(PROFILE_sources) $(PROFILE_excludes) $(topdir)/build/gensources.sh $(depsdir)/.stamp - $(SHELL) $(topdir)/build/gensources.sh $@ '$(PROFILE_sources)' '$(PROFILE_excludes)' +$(sourcefile): $(PROFILE_sources) $(PROFILE_excludes) $(depsdir)/.stamp $(gensources) + $(GENSOURCES_RUNTIME) --debug $(gensources) "$@" "$(LIBRARY)" "$(PROFILE_PLATFORM)" "$(PROFILE)" library_CLEAN_FILES += $(sourcefile) @@ -390,9 +398,9 @@ gen-deps: update-corefx-sr-generic: ifneq ($(RESX_STRINGS),) - MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/resx2sr.exe $(RESX_STRINGS) >$(SR_OUTPUT) + MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/resx2sr.exe $(RESX_EXTRA_ARGUMENTS) $(RESX_STRINGS) >$(SR_OUTPUT) endif update-corefx-sr: $(RESX_RESOURCE_STRING) $(XTEST_RESX_RESOURCE_STRING) - make SR_OUTPUT=corefx/SR.cs RESX_STRINGS="$(RESX_RESOURCE_STRING)" update-corefx-sr-generic \ - && make SR_OUTPUT=corefx/SR.tests.cs RESX_STRINGS=$(XTEST_RESX_RESOURCE_STRING) update-corefx-sr-generic \ No newline at end of file + make SR_OUTPUT=corefx/SR.cs RESX_STRINGS="$(RESX_RESOURCE_STRING)" RESX_EXTRA_ARGUMENTS="$(RESX_EXTRA_ARGUMENTS)" update-corefx-sr-generic \ + && make SR_OUTPUT=corefx/SR.tests.cs RESX_STRINGS=$(XTEST_RESX_RESOURCE_STRING) update-corefx-sr-generic diff --git a/mcs/build/profiles/basic.make b/mcs/build/profiles/basic.make index 3f85a63d0e..a1b9bf35bb 100644 --- a/mcs/build/profiles/basic.make +++ b/mcs/build/profiles/basic.make @@ -115,7 +115,7 @@ endif $(PROFILE_EXE): $(topdir)/build/common/basic-profile-check.cs $(MAKE) $(MAKE_Q) -C $(topdir)/packages - $(BOOTSTRAP_MCS) /warn:0 /noconfig /r:System.dll /r:mscorlib.dll /out:$@ $< + $(BOOTSTRAP_MCS) /warn:0 /noconfig /langversion:latest /r:System.dll /r:mscorlib.dll /out:$@ $< $(PROFILE_OUT): $(PROFILE_EXE) $(PROFILE_RUNTIME) $< > $@ 2>&1 diff --git a/mcs/build/profiles/net_4_x.make b/mcs/build/profiles/net_4_x.make index c9f491ed1d..0045b72a7e 100644 --- a/mcs/build/profiles/net_4_x.make +++ b/mcs/build/profiles/net_4_x.make @@ -13,7 +13,7 @@ profile-check: @: DEFAULT_REFERENCES = mscorlib -PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -d:MULTIPLEX_OS -nowarn:1699 -nostdlib $(PLATFORM_DEBUG_FLAGS) +PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib $(PLATFORM_DEBUG_FLAGS) API_BIN_PROFILE = v4.7.1 FRAMEWORK_VERSION = 4.5 diff --git a/mcs/build/rules.make b/mcs/build/rules.make index 4e5b41f350..3f1d684bbe 100644 --- a/mcs/build/rules.make +++ b/mcs/build/rules.make @@ -161,7 +161,7 @@ gacutil = $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/gacutil.exe GACUTIL = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(gacutil) endif -STD_TARGETS = test run-test run-xunit-test run-test-ondotnet clean install uninstall doc-update +STD_TARGETS = test xunit-test run-test run-xunit-test run-test-ondotnet clean install uninstall doc-update $(STD_TARGETS): %: do-% diff --git a/mcs/build/tests.make b/mcs/build/tests.make index 2ed5f0ce5b..ada45b1a6c 100644 --- a/mcs/build/tests.make +++ b/mcs/build/tests.make @@ -29,7 +29,8 @@ XTEST_REMOTE_EXECUTOR = $(topdir)/class/lib/$(PROFILE)/RemoteExecutorConsoleApp. xunit_src += $(topdir)/../mcs/class/test-helpers/AdminHelper.cs \ $(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/IO/FileCleanupTestBase.cs \ $(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.cs \ -$(topdir)/../external/corefx/src/Common/src/System/PasteArguments.cs +$(topdir)/../external/corefx/src/Common/src/System/PasteArguments.cs \ +$(topdir)/../external/corefx/src/Common/src/System/PasteArguments.Unix.cs ifeq ($(PROFILE),monodroid) xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mobile.cs @@ -216,8 +217,8 @@ endif ## FIXME: i18n problem in the 'sed' command below run-test-lib: test-local test-local-aot-compile patch-nunitlite-appconfig ok=:; \ - PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" MONO_REGISTRY_PATH="$(HOME)/.mono/registry" MONO_TESTS_IN_PROGRESS="yes" $(TEST_HARNESS_EXEC) $(test_assemblies) $(NOSHADOW_FLAG) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) $(TEST_HARNESS_EXCLUDES) $(LABELS_ARG) -format:nunit2 -result:TestResult-$(PROFILE).xml $(FIXTURE_ARG) $(TESTNAME_ARG)|| ok=false; \ - if [ ! -f "TestResult-$(PROFILE).xml" ]; then echo "The test runner didn't produce a test result XML, probably due to a crash of the runtime. Check the log for more details." > TestResult-$(PROFILE).xml; fi; \ + PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" MONO_REGISTRY_PATH="$(HOME)/.mono/registry" MONO_TESTS_IN_PROGRESS="yes" DBG_RUNTIME_ARGS="$(TEST_RUNTIME_FLAGS)" $(TEST_HARNESS_EXEC) $(test_assemblies) $(NOSHADOW_FLAG) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) $(TEST_HARNESS_EXCLUDES) $(LABELS_ARG) -format:nunit2 -result:TestResult-$(PROFILE).xml $(FIXTURE_ARG) $(TESTNAME_ARG)|| ok=false; \ + if [ ! -f "TestResult-$(PROFILE).xml" ]; then echo "The test runner didn't produce a test result XML, probably due to a crash of the runtime. Check the log for more details." > TestResult-$(PROFILE).xml; fi; \ $$ok ## Instructs compiler to compile to target .net execution, it can be usefull in rare cases when runtime detection is not possible @@ -273,6 +274,11 @@ XTEST_HARNESS_PATH := $(topdir)/../external/xunit-binaries XTEST_HARNESS = $(XTEST_HARNESS_PATH)/xunit.console.exe XTEST_HARNESS_FLAGS := -noappdomain -noshadow -parallel none -nunit TestResult-$(PROFILE)-xunit.xml XTEST_TRAIT := -notrait category=failing -notrait category=nonmonotests -notrait Benchmark=true -notrait category=outerloop +# The logic is double inverted so this actually excludes tests not intented for current platform +# best to search for `property name="category"` in the xml output to see what's going on +# https://github.com/dotnet/buildtools/blob/master/src/xunit.netcore.extensions/Discoverers/PlatformSpecificDiscoverer.cs +XTEST_TRAIT_PLATFORM := -notrait category=non$(XTEST_PLATFORM)tests + TEST_MONO_PATH := $(TEST_MONO_PATH)$(PLATFORM_PATH_SEPARATOR)$(XTEST_HARNESS_PATH) ifdef FIXTURE @@ -295,7 +301,7 @@ run-xunit-test-local: run-xunit-test-lib run-xunit-test-lib: xunit-test-local $(XTEST_REMOTE_EXECUTOR) @cp -rf $(XTEST_HARNESS_PATH)/xunit.execution.desktop.dll xunit.execution.desktop.dll ok=:; \ - PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" REMOTE_EXECUTOR=$(XTEST_REMOTE_EXECUTOR) $(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(XTEST_COVERAGE_FLAGS) $(AOT_RUN_FLAGS) $(XTEST_HARNESS) $(xunit_test_lib) $(XTEST_HARNESS_FLAGS) $(XTEST_TRAIT) || ok=false; \ + PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" REMOTE_EXECUTOR=$(XTEST_REMOTE_EXECUTOR) $(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(XTEST_COVERAGE_FLAGS) $(AOT_RUN_FLAGS) $(XTEST_HARNESS) $(xunit_test_lib) $(XTEST_HARNESS_FLAGS) $(XTEST_TRAIT) $(XTEST_TRAIT_PLATFORM) || ok=false; \ $$ok @rm -f xunit.execution.desktop.dll diff --git a/mcs/class/Facades/System.Memory/TypeForwarders.cs b/mcs/class/Facades/System.Memory/TypeForwarders.cs index 60edc2eec4..d7d2b797ac 100644 --- a/mcs/class/Facades/System.Memory/TypeForwarders.cs +++ b/mcs/class/Facades/System.Memory/TypeForwarders.cs @@ -24,24 +24,20 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Memory<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ReadOnlyMemory<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ReadOnlySpan<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.SequencePosition))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Span<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.BuffersExtensions))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IBufferWriter<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IMemoryOwner<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IPinnable))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryManager<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryHandle))] -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.OperationStatus))] -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.StandardFormat))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryPool<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySequenceSegment<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySequence<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Binary.BinaryPrimitives))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Base64))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Utf8Formatter))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Utf8Parser))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.MemoryMarshal))] - -// TODO: we don't have these types yet -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.SequencePosition))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.BuffersExtensions))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IBufferWriter<>))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IMemoryOwner<>))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IPinnable))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryManager<>))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryPool<>))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySequenceSegment<>))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySequence<>))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Base64))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Utf8Formatter))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Utf8Parser))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.SequenceMarshal))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.SequenceMarshal))] diff --git a/mcs/class/Facades/System.Runtime.Extensions/Makefile b/mcs/class/Facades/System.Runtime.Extensions/Makefile index 3331d195d5..e72cce1401 100644 --- a/mcs/class/Facades/System.Runtime.Extensions/Makefile +++ b/mcs/class/Facades/System.Runtime.Extensions/Makefile @@ -10,7 +10,7 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades LIBRARY = System.Runtime.Extensions.dll KEYFILE = ../../msfinal.pub -SIGN_FLAGS = /delaysign /nowarn:1616,1699 +SIGN_FLAGS = /delaysign /nowarn:1616,1699,618 LIB_REFS = System LIB_MCS_FLAGS = $(SIGN_FLAGS) diff --git a/mcs/class/Facades/System.Runtime.Extensions/TypeForwarders.cs b/mcs/class/Facades/System.Runtime.Extensions/TypeForwarders.cs index eff0fd568d..75bc36e227 100644 --- a/mcs/class/Facades/System.Runtime.Extensions/TypeForwarders.cs +++ b/mcs/class/Facades/System.Runtime.Extensions/TypeForwarders.cs @@ -26,6 +26,7 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Environment))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.Path))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Math))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MathF))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MidpointRounding))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.WebUtility))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Progress<>))] diff --git a/mcs/class/Facades/System.Runtime.Extensions/TypeForwarders.netcore.cs b/mcs/class/Facades/System.Runtime.Extensions/TypeForwarders.netcore.cs new file mode 100644 index 0000000000..31ca77df78 --- /dev/null +++ b/mcs/class/Facades/System.Runtime.Extensions/TypeForwarders.netcore.cs @@ -0,0 +1,78 @@ +// +// TypeForwarders.netcore.cs: .NET Core specific extensions +// +// Authors: +// Marek Safar +// +// Copyright (C) 2018 Microsoft Corporation +// +// 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. +// + +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.AssemblyLoadEventArgs))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.AssemblyLoadEventHandler))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Base64FormattingOptions))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Collections.Comparer))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.EnvironmentVariableTarget))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.GlobalizationExtensions))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.BinaryReader))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.BinaryWriter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.EndOfStreamException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.MemoryStream))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.StreamReader))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.StreamWriter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.TextReader))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.TextWriter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ResolveEventHandler))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.AppDomain))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.AppDomainUnloadedException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ApplicationId))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.CannotUnloadAppDomainException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ContextBoundObject))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ContextMarshalException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ContextStaticAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.LoaderOptimization))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.LoaderOptimizationAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.OperatingSystem))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.PlatformID))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.StringNormalizationExtensions))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.IPermission))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.ISecurityEncodable))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.SecurityElement))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.Permissions.CodeAccessSecurityAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.Permissions.SecurityAction))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.Permissions.SecurityAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.Permissions.SecurityPermissionAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.Permissions.SecurityPermissionFlag))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Collections.ArrayList))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Collections.Hashtable))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Collections.IHashCodeProvider))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Versioning.ComponentGuaranteesAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Versioning.ResourceConsumptionAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Versioning.ComponentGuaranteesOptions))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Versioning.ResourceExposureAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Versioning.ResourceScope))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Versioning.VersioningHelper))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.AssemblyNameProxy))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.StringReader))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.StringWriter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.BufferedStream))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.InvalidDataException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.CodeDom.Compiler.IndentedTextWriter))] \ No newline at end of file diff --git a/mcs/class/Facades/System.Runtime.Extensions/net_4_x_System.Runtime.Extensions.dll.sources b/mcs/class/Facades/System.Runtime.Extensions/net_4_x_System.Runtime.Extensions.dll.sources new file mode 100644 index 0000000000..e64e8b9857 --- /dev/null +++ b/mcs/class/Facades/System.Runtime.Extensions/net_4_x_System.Runtime.Extensions.dll.sources @@ -0,0 +1,2 @@ +#include System.Runtime.Extensions.dll.sources +TypeForwarders.netcore.cs \ No newline at end of file diff --git a/mcs/class/Facades/System.Runtime/Makefile b/mcs/class/Facades/System.Runtime/Makefile index 4add1cf8a8..297dde573f 100644 --- a/mcs/class/Facades/System.Runtime/Makefile +++ b/mcs/class/Facades/System.Runtime/Makefile @@ -10,7 +10,7 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades LIBRARY = System.Runtime.dll KEYFILE = ../../msfinal.pub -SIGN_FLAGS = /delaysign /nowarn:1616,1699 +SIGN_FLAGS = /delaysign /nowarn:1616,1699,618 LIB_REFS = System System.ComponentModel.Composition System.Core LIB_MCS_FLAGS = $(SIGN_FLAGS) diff --git a/mcs/class/Facades/System.Runtime/TypeForwarders.netcore.cs b/mcs/class/Facades/System.Runtime/TypeForwarders.netcore.cs new file mode 100644 index 0000000000..097a82f912 --- /dev/null +++ b/mcs/class/Facades/System.Runtime/TypeForwarders.netcore.cs @@ -0,0 +1,311 @@ +// +// TypeForwarders.netcore.cs: .NET Core specific extensions +// +// Authors: +// Marek Safar +// +// Copyright (C) 2018 Microsoft Corporation +// +// 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. +// + +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (Microsoft.Win32.SafeHandles.CriticalHandleMinusOneIsInvalid))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (Microsoft.Win32.SafeHandles.CriticalHandleZeroOrMinusOneIsInvalid))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (Microsoft.Win32.SafeHandles.SafeFileHandle))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (Microsoft.Win32.SafeHandles.SafeHandleMinusOneIsInvalid))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (Microsoft.Win32.SafeHandles.SafeHandleZeroOrMinusOneIsInvalid))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (Microsoft.Win32.SafeHandles.SafeWaitHandle))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.AccessViolationException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.AggregateException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.AppContext))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ApplicationException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Buffers.IMemoryOwner<>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Buffers.IPinnable))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Buffers.MemoryHandle))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Buffers.MemoryManager<>))] +//[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Buffers.ReadOnlySpanAction<,>))] +//[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Buffers.SpanAction<,>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.CharEnumerator))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Collections.Generic.KeyValuePair))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Configuration.Assemblies.AssemblyHashAlgorithm))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Configuration.Assemblies.AssemblyVersionCompatibility))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Converter<,>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.DBNull))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.DuplicateWaitObjectException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.EntryPointNotFoundException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ExecutionEngineException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.FileStyleUriParser))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.FtpStyleUriParser))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.GCNotificationStatus))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.GenericUriParser))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.GenericUriParserOptions))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.Calendar))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.CalendarAlgorithmType))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.CalendarWeekRule))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.CharUnicodeInfo))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.ChineseLunisolarCalendar))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.CompareInfo))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.CompareOptions))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.CultureInfo))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.CultureNotFoundException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.CultureTypes))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.DateTimeFormatInfo))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.DaylightTime))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.DigitShapes))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.EastAsianLunisolarCalendar))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.GregorianCalendar))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.GregorianCalendarTypes))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.HebrewCalendar))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.HijriCalendar))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.IdnMapping))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.JapaneseCalendar))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.JapaneseLunisolarCalendar))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.JulianCalendar))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.KoreanCalendar))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.KoreanLunisolarCalendar))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.NumberFormatInfo))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.PersianCalendar))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.RegionInfo))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.SortKey))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.SortVersion))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.StringInfo))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.TaiwanCalendar))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.TaiwanLunisolarCalendar))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.TextElementEnumerator))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.TextInfo))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.ThaiBuddhistCalendar))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.UmAlQuraCalendar))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.UnicodeCategory))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.GopherStyleUriParser))] +//[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.HashCode))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.HttpStyleUriParser))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ICloneable))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.InsufficientMemoryException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.FileAccess))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.FileMode))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.FileOptions))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.FileShare))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.FileStream))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.SeekOrigin))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.Stream))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.LdapStyleUriParser))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.MarshalByRefObject))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Memory<>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.MidpointRounding))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ModuleHandle))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.MulticastNotSupportedException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.NetPipeStyleUriParser))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.NetTcpStyleUriParser))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.NewsStyleUriParser))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.NonSerializedAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.NotFiniteNumberException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ReadOnlyMemory<>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ReadOnlySpan<>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.AmbiguousMatchException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.Assembly))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.AssemblyAlgorithmIdAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.AssemblyContentType))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.AssemblyName))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.Binder))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.BindingFlags))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.CallingConventions))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ConstructorInfo))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.CustomAttributeData))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.CustomAttributeExtensions))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.CustomAttributeFormatException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.CustomAttributeNamedArgument))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.CustomAttributeTypedArgument))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.EventAttributes))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.EventInfo))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ExceptionHandlingClause))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ExceptionHandlingClauseOptions))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.FieldAttributes))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.FieldInfo))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.GenericParameterAttributes))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ICustomAttributeProvider))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ImageFileMachine))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.InterfaceMapping))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.IntrospectionExtensions))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.InvalidFilterCriteriaException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.IReflect))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.IReflectableType))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.LocalVariableInfo))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ManifestResourceInfo))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.MemberFilter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.MemberInfo))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.MemberTypes))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.MethodAttributes))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.MethodBase))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.MethodBody))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.MethodImplAttributes))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.MethodInfo))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.Missing))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.Module))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ModuleResolveEventHandler))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ObfuscateAssemblyAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ObfuscationAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ParameterAttributes))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ParameterInfo))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ParameterModifier))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.Pointer))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.PortableExecutableKinds))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.PropertyAttributes))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.PropertyInfo))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ReflectionContext))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ReflectionTypeLoadException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ResourceAttributes))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ResourceLocation))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.StrongNameKeyPair))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.TargetException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.TargetInvocationException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.TargetParameterCountException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.TypeAttributes))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.TypeDelegator))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.TypeFilter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.TypeInfo))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ResolveEventArgs))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.AsyncMethodBuilderAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder<>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.CompilationRelaxations))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.CompilerGlobalScopeAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.ConfiguredTaskAwaitable))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.ConfiguredTaskAwaitable<>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable<>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.DefaultDependencyAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.DependencyAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.DiscardableAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.FixedAddressValueTypeAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.IAsyncStateMachine))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.ICriticalNotifyCompletion))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.INotifyCompletion))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.IsByRefLikeAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.IsReadOnlyAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.ITuple))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.LoadHint))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.MethodCodeType))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.RuntimeFeature))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.RuntimeWrappedException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.SpecialNameAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.StringFreezingAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.SuppressIldasmAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.TaskAwaiter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.TaskAwaiter<>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.TupleElementNamesAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.ValueTaskAwaiter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.ValueTaskAwaiter<>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.YieldAwaitable))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.ConstrainedExecution.Cer))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.ConstrainedExecution.Consistency))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.ConstrainedExecution.CriticalFinalizerObject))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.ConstrainedExecution.ReliabilityContractAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.ExceptionServices.FirstChanceExceptionEventArgs))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.ExceptionServices.HandleProcessCorruptedStateExceptionsAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.InteropServices.CriticalHandle))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.InteropServices.ExternalException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.InteropServices.InAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.InteropServices.SafeHandle))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.MemoryFailPoint))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.IDeserializationCallback))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.IFormatterConverter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.IObjectReference))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.ISafeSerializationData))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.ISerializable))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.OnDeserializedAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.OnDeserializingAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.OnSerializedAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.OnSerializingAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.OptionalFieldAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.SafeSerializationEventArgs))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.SerializationEntry))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.SerializationException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.SerializationInfo))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.SerializationInfoEnumerator))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.StreamingContext))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.StreamingContextStates))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.RuntimeArgumentHandle))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.Cryptography.CryptographicException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.PartialTrustVisibilityLevel))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.SecurityCriticalScope))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.SecurityRulesAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.SecurityRuleSet))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.SecurityTreatAsSafeAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.SuppressUnmanagedCodeSecurityAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.UnverifiableCodeAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.SerializableAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Span<>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.StackOverflowException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.SystemException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.Decoder))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.DecoderExceptionFallback))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.DecoderExceptionFallbackBuffer))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.DecoderFallback))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.DecoderFallbackBuffer))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.DecoderFallbackException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.DecoderReplacementFallback))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.DecoderReplacementFallbackBuffer))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.Encoder))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.EncoderExceptionFallback))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.EncoderExceptionFallbackBuffer))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.EncoderFallback))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.EncoderFallbackBuffer))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.EncoderFallbackException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.EncoderReplacementFallback))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.EncoderReplacementFallbackBuffer))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.Encoding))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.EncodingInfo))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.EncodingProvider))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.NormalizationForm))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.CancellationToken))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.CancellationTokenRegistration))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.Sources.IValueTaskSource))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.Sources.IValueTaskSource<>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.Sources.ValueTaskSourceStatus))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.Task))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.TaskContinuationOptions))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.TaskCreationOptions))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.TaskFactory))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.TaskFactory<>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.TaskScheduler))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.TaskStatus))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.Task<>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.UnobservedTaskExceptionEventArgs))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.ValueTask))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.ValueTask<>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.TimeZone))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.TimeZoneNotFoundException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.TupleExtensions))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.TypedReference))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.TypeUnloadedException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.UnhandledExceptionEventArgs))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.UnhandledExceptionEventHandler))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.UriParser))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.UriPartial))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ValueTuple))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ValueTuple<>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ValueTuple<,>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ValueTuple<,,>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ValueTuple<,,,>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ValueTuple<,,,,>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ValueTuple<,,,,,>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ValueTuple<,,,,,,>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ValueTuple<,,,,,,,>))] diff --git a/mcs/class/Facades/System.Runtime/net_4_x_System.Runtime.dll.sources b/mcs/class/Facades/System.Runtime/net_4_x_System.Runtime.dll.sources new file mode 100644 index 0000000000..e28ef9aadb --- /dev/null +++ b/mcs/class/Facades/System.Runtime/net_4_x_System.Runtime.dll.sources @@ -0,0 +1,2 @@ +#include System.Runtime.dll.sources +TypeForwarders.netcore.cs \ No newline at end of file diff --git a/mcs/class/Makefile b/mcs/class/Makefile index 8345de4ee1..6fc8002ce3 100644 --- a/mcs/class/Makefile +++ b/mcs/class/Makefile @@ -424,7 +424,7 @@ monolite_dir = monolite-$(HOST_PLATFORM)/$(MONO_CORLIB_VERSION) # Files needed to bootstrap C# compiler and cil-stringreplacer build_files := mscorlib.dll System.dll System.Xml.dll Mono.Security.dll System.Core.dll System.Security.dll System.Configuration.dll \ - System.Numerics.dll System.Xml.Linq.dll \ + System.Numerics.dll System.Xml.Linq.dll System.IO.Compression.dll \ Facades/System.Collections.Concurrent.dll Facades/System.Linq.dll Facades/System.Runtime.dll Facades/System.Collections.dll \ Facades/System.Reflection.Extensions.dll Facades/System.Text.Encoding.Extensions.dll Facades/System.Diagnostics.Debug.dll \ Facades/System.Reflection.Primitives.dll Facades/System.Text.Encoding.dll Facades/System.Diagnostics.Tools.dll Facades/System.Reflection.dll \ diff --git a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildSubmissionTest.cs b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildSubmissionTest.cs index 1e1760d7c7..6b68470840 100644 --- a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildSubmissionTest.cs +++ b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildSubmissionTest.cs @@ -102,8 +102,8 @@ namespace MonoTests.Microsoft.Build.Execution AssertHelper.GreaterOrEqual (endBuildDone, TimeSpan.FromSeconds (1), "#2"); AssertHelper.GreaterOrEqual (waitDone, TimeSpan.FromSeconds (1), "#3"); AssertHelper.GreaterOrEqual (endBuildDone, waitDone, "#4"); - AssertHelper.LessOrEqual (endBuildDone, TimeSpan.FromSeconds (2.5), "#5"); - AssertHelper.LessOrEqual (waitDone, TimeSpan.FromSeconds (2.5), "#6"); + AssertHelper.LessOrEqual (endBuildDone, TimeSpan.FromSeconds (10.0), "#5"); + AssertHelper.LessOrEqual (waitDone, TimeSpan.FromSeconds (10.0), "#6"); } [Test] diff --git a/mcs/class/Mono.Cairo/Mono.Cairo.dll.sources b/mcs/class/Mono.Cairo/Mono.Cairo.dll.sources index 880cdf2adc..f5129cd9dd 100644 --- a/mcs/class/Mono.Cairo/Mono.Cairo.dll.sources +++ b/mcs/class/Mono.Cairo/Mono.Cairo.dll.sources @@ -54,4 +54,8 @@ ./Mono.Cairo/Win32Surface.cs ./Mono.Cairo/XcbSurface.cs ./Mono.Cairo/XlibSurface.cs - +./Mono.Cairo/GLSurface.cs +./Mono.Cairo/Device.cs +./Mono.Cairo/GLXDevice.cs +./Mono.Cairo/EGLDevice.cs +./Mono.Cairo/WGLDevice.cs diff --git a/mcs/class/Mono.Cairo/Mono.Cairo/Device.cs b/mcs/class/Mono.Cairo/Mono.Cairo/Device.cs new file mode 100644 index 0000000000..06715bc9e9 --- /dev/null +++ b/mcs/class/Mono.Cairo/Mono.Cairo/Device.cs @@ -0,0 +1,101 @@ +// +// Mono.Cairo.Device.cs +// +// Authors: +// JP Bruyère (jp_bruyere@hotmail.com) +// +// This is an OO wrapper API for the Cairo API +// +// Copyright (C) 2016 JP Bruyère +// +// 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 Cairo +{ + public class Device : IDisposable + { + IntPtr handle = IntPtr.Zero; + + protected Device() + { + } + + protected Device (IntPtr ptr) : this (ptr, true) + { + } + + protected Device (IntPtr handle, bool owner) + { + this.handle = handle; + if (!owner) + NativeMethods.cairo_device_reference (handle); + if (CairoDebug.Enabled) + CairoDebug.OnAllocated (handle); + } + + ~Device () + { + Dispose (false); + } + + public IntPtr Handle { + get { + return handle; + } + } + public string Status { + get { + return System.Runtime.InteropServices.Marshal.PtrToStringAuto(NativeMethods.cairo_status_to_string (NativeMethods.cairo_device_status (handle))); + } + } + public void SetThreadAware (bool value){ + NativeMethods.cairo_gl_device_set_thread_aware (handle, value ? 1 : 0); + } + public Status Acquire() + { + return NativeMethods.cairo_device_acquire (handle); + } + public void Release() + { + NativeMethods.cairo_device_release (handle); + } + + public void Dispose () + { + Dispose (true); + GC.SuppressFinalize (this); + } + + protected virtual void Dispose (bool disposing) + { + if (!disposing || CairoDebug.Enabled) + CairoDebug.OnDisposed (handle, disposing); + + if (!disposing || handle == IntPtr.Zero) + return; + + NativeMethods.cairo_device_destroy (handle); + handle = IntPtr.Zero; + } + } +} + diff --git a/mcs/class/corlib/System.Text/NormalizationForm.cs b/mcs/class/Mono.Cairo/Mono.Cairo/EGLDevice.cs similarity index 75% rename from mcs/class/corlib/System.Text/NormalizationForm.cs rename to mcs/class/Mono.Cairo/Mono.Cairo/EGLDevice.cs index 67b49d58d0..45c988a384 100644 --- a/mcs/class/corlib/System.Text/NormalizationForm.cs +++ b/mcs/class/Mono.Cairo/Mono.Cairo/EGLDevice.cs @@ -1,12 +1,12 @@ +// +// Mono.Cairo.Device.cs // -// System.Text.NormalizationForm.cs +// Authors: +// JP Bruyère (jp_bruyere@hotmail.com) // -// Author: -// Atsushi Enomoto +// This is an OO wrapper API for the Cairo API // - -// -// Copyright (C) 2005 Novell, Inc (http://www.novell.com) +// Copyright (C) 2016 JP Bruyère // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -27,16 +27,15 @@ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System; -using System.Runtime.InteropServices; - -namespace System.Text +namespace Cairo { - [ComVisible (true)] - public enum NormalizationForm { - FormC = 1, - FormD = 2, - FormKC = 5, - FormKD = 6 + public class EGLDevice : Device + { + public EGLDevice (IntPtr dpy, IntPtr gl_ctx) : base (NativeMethods.cairo_egl_device_create (dpy, gl_ctx), true) + { + } } } + diff --git a/mcs/class/Mono.Cairo/Mono.Cairo/GLSurface.cs b/mcs/class/Mono.Cairo/Mono.Cairo/GLSurface.cs new file mode 100644 index 0000000000..9486c9cd13 --- /dev/null +++ b/mcs/class/Mono.Cairo/Mono.Cairo/GLSurface.cs @@ -0,0 +1,61 @@ +// +// Mono.Cairo.GLSurface.cs +// +// Authors: +// JP Bruyère (jp_bruyere@hotmail.com) +// +// This is an OO wrapper API for the Cairo API +// +// Copyright (C) 2016 JP Bruyère +// +// 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 Cairo { + + public class GLSurface : Surface + { + + public GLSurface (IntPtr ptr, bool own) : base (ptr, own) + {} + + public GLSurface (Device device, Cairo.Content content, uint tex, int width, int height) + : base (NativeMethods.cairo_gl_surface_create_for_texture (device.Handle, (uint)content, tex, width, height), true) + {} + + public GLSurface (EGLDevice device, IntPtr eglSurf, int width, int height) + : base (NativeMethods.cairo_gl_surface_create_for_egl (device.Handle, eglSurf, width, height), true) + {} + + public GLSurface (GLXDevice device, IntPtr window, int width, int height) + : base (NativeMethods.cairo_gl_surface_create_for_window (device.Handle, window, width, height),true) + {} + + public GLSurface (WGLDevice device, IntPtr hdc, int width, int height) + : base (NativeMethods.cairo_gl_surface_create_for_dc (device.Handle, hdc, width, height), true) + {} + + public void SwapBuffers(){ + NativeMethods.cairo_gl_surface_swapbuffers (this.Handle); + } + } +} diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/ReferencedCategoriesDocument.cs b/mcs/class/Mono.Cairo/Mono.Cairo/GLXDevice.cs similarity index 68% rename from mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/ReferencedCategoriesDocument.cs rename to mcs/class/Mono.Cairo/Mono.Cairo/GLXDevice.cs index 5043606d24..189872a26b 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/ReferencedCategoriesDocument.cs +++ b/mcs/class/Mono.Cairo/Mono.Cairo/GLXDevice.cs @@ -1,10 +1,12 @@ +// +// Mono.Cairo.Device.cs // -// ReferencedCategoriesDocument.cs +// Authors: +// JP Bruyère (jp_bruyere@hotmail.com) // -// Author: -// Atsushi Enomoto +// This is an OO wrapper API for the Cairo API // -// Copyright (C) 2009 Novell, Inc. http://www.novell.com +// Copyright (C) 2016 JP Bruyère // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -26,24 +28,22 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // using System; -using System.Collections.Generic; -using System.IO; -using System.ServiceModel; -using System.ServiceModel.Channels; -namespace System.ServiceModel.Syndication +namespace Cairo { - public class ReferencedCategoriesDocument : CategoriesDocument + public class GLXDevice : Device { - public ReferencedCategoriesDocument () + public GLXDevice (IntPtr dpy, IntPtr gl_ctx) : base (NativeMethods.cairo_glx_device_create (dpy, gl_ctx), true) { } - public ReferencedCategoriesDocument (Uri link) - { - Link = link; + public IntPtr Display { + get { return NativeMethods.cairo_glx_device_get_display (Handle); } } - public Uri Link { get; set; } + public IntPtr Context { + get { return NativeMethods.cairo_glx_device_get_context (Handle); } + } } } + diff --git a/mcs/class/Mono.Cairo/Mono.Cairo/NativeMethods.cs b/mcs/class/Mono.Cairo/Mono.Cairo/NativeMethods.cs index 8509c6db25..9726cb8c4e 100644 --- a/mcs/class/Mono.Cairo/Mono.Cairo/NativeMethods.cs +++ b/mcs/class/Mono.Cairo/Mono.Cairo/NativeMethods.cs @@ -871,5 +871,78 @@ namespace Cairo [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] internal static extern void cairo_xlib_surface_set_size (IntPtr surface, int width, int height); + + #region GLSurface + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern IntPtr cairo_gl_surface_create (IntPtr device, uint content, int width, int height); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern IntPtr cairo_gl_surface_create_for_texture (IntPtr device, uint content, uint tex, int width, int height); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern void cairo_gl_surface_set_size (IntPtr surface, int width, int height); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern int cairo_gl_surface_get_width (IntPtr surface); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern int cairo_gl_surface_get_height (IntPtr surface); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern void cairo_gl_surface_swapbuffers (IntPtr surf); + #endregion + + #region GLX Functions + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern IntPtr cairo_glx_device_create (IntPtr dpy, IntPtr gl_ctx); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern IntPtr cairo_glx_device_get_display (IntPtr device); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern IntPtr cairo_glx_device_get_context (IntPtr device); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern IntPtr cairo_gl_surface_create_for_window (IntPtr device, IntPtr window, int width, int height); + #endregion + + #region WGL Fucntions + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern IntPtr cairo_wgl_device_create (IntPtr hglrc); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern IntPtr cairo_wgl_device_get_context (IntPtr device); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern IntPtr cairo_gl_surface_create_for_dc (IntPtr device, IntPtr hdc, int width, int height); + #endregion + + #region EGL Functions + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern IntPtr cairo_egl_device_create (IntPtr dpy, IntPtr gl_ctx); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern IntPtr cairo_gl_surface_create_for_egl (IntPtr device, IntPtr eglSurface, int width, int height); + #endregion + + #region Device + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern IntPtr cairo_device_reference (IntPtr device); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern Status cairo_device_status(IntPtr device); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern void cairo_device_destroy (IntPtr device); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern Status cairo_device_acquire(IntPtr device); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern void cairo_device_release(IntPtr device); + + [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] + internal static extern void cairo_gl_device_set_thread_aware(IntPtr device, int value); + #endregion } } \ No newline at end of file diff --git a/mcs/class/Mono.Cairo/Mono.Cairo/Surface.cs b/mcs/class/Mono.Cairo/Mono.Cairo/Surface.cs index 07e0d4d997..d38b75556e 100644 --- a/mcs/class/Mono.Cairo/Mono.Cairo/Surface.cs +++ b/mcs/class/Mono.Cairo/Mono.Cairo/Surface.cs @@ -86,6 +86,8 @@ namespace Cairo { return new DirectFBSurface (surface, owned); case SurfaceType.Svg: return new SvgSurface (surface, owned); + case SurfaceType.GL: + return new GLSurface (surface, owned); default: return new Surface (surface, owned); } diff --git a/mcs/class/Mono.Cairo/Mono.Cairo/SurfaceType.cs b/mcs/class/Mono.Cairo/Mono.Cairo/SurfaceType.cs index 83dd4b684a..9272fed17b 100644 --- a/mcs/class/Mono.Cairo/Mono.Cairo/SurfaceType.cs +++ b/mcs/class/Mono.Cairo/Mono.Cairo/SurfaceType.cs @@ -3,6 +3,7 @@ // // Authors: // John Luke +// JP Bruyère // // (C) John Luke, 2006. // @@ -44,5 +45,18 @@ namespace Cairo { BeOS, DirectFB, Svg, + OS2, + Win32Printing, + QuartzImage, + Script, + Qt, + Recording, + VG, + GL, + Drm, + Tee, + Xml, + Skia, + SubSurface } } diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/TextSyndicationContentKind.cs b/mcs/class/Mono.Cairo/Mono.Cairo/WGLDevice.cs similarity index 72% rename from mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/TextSyndicationContentKind.cs rename to mcs/class/Mono.Cairo/Mono.Cairo/WGLDevice.cs index d94d437d5d..03f7e3a498 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/TextSyndicationContentKind.cs +++ b/mcs/class/Mono.Cairo/Mono.Cairo/WGLDevice.cs @@ -1,10 +1,12 @@ +// +// Mono.Cairo.Device.cs // -// SyndicationContent.cs +// Authors: +// JP Bruyère (jp_bruyere@hotmail.com) // -// Author: -// Atsushi Enomoto +// This is an OO wrapper API for the Cairo API // -// Copyright (C) 2007 Novell, Inc (http://www.novell.com) +// Copyright (C) 2016 JP Bruyère // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -26,19 +28,18 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.IO; -using System.Runtime.Serialization; -using System.Text; -using System.Xml; -namespace System.ServiceModel.Syndication +namespace Cairo { - public enum TextSyndicationContentKind + public class WGLDevice : Device { - Plaintext, - Html, - XHtml + public WGLDevice (IntPtr hglrc) : base (NativeMethods.cairo_wgl_device_create (hglrc), true) + { + } + + public IntPtr Context { + get { return NativeMethods.cairo_wgl_device_get_context (Handle); } + } } } + diff --git a/mcs/class/Mono.Debugger.Soft/Makefile b/mcs/class/Mono.Debugger.Soft/Makefile index 5b002b86ee..a3afe51be8 100644 --- a/mcs/class/Mono.Debugger.Soft/Makefile +++ b/mcs/class/Mono.Debugger.Soft/Makefile @@ -16,15 +16,8 @@ VALID_TEST_PROFILE := $(filter net_4_x, $(PROFILE)) # The test exe is not profile specific, and compiling a 2.0 will make the 4.5 tests fail ifdef VALID_TEST_PROFILE -TEST_HELPERS_SOURCES = \ - ../test-helpers/NetworkHelpers.cs \ - Test/TypeLoadClass.cs - test-local: dtest-app.exe dtest-excfilter.exe -dtest-app.exe: Test/dtest-app.cs $(TEST_HELPERS_SOURCES) - $(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Core.dll -r:$(topdir)/class/lib/$(PROFILE)/System.dll -out:$@ -unsafe $(PLATFORM_DEBUG_FLAGS) -optimize- Test/dtest-app.cs $(TEST_HELPERS_SOURCES) - dtest-excfilter.exe: Test/dtest-excfilter.il $(ILASM) -out:$@ /exe /debug Test/dtest-excfilter.il @@ -35,6 +28,13 @@ check: endif +TEST_HELPERS_SOURCES = \ + ../test-helpers/NetworkHelpers.cs \ + Test/TypeLoadClass.cs + +dtest-app.exe: Test/dtest-app.cs $(TEST_HELPERS_SOURCES) + $(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Core.dll -r:$(topdir)/class/lib/$(PROFILE)/System.dll -out:$@ -unsafe $(PLATFORM_DEBUG_FLAGS) -optimize- Test/dtest-app.cs $(TEST_HELPERS_SOURCES) + CLEAN_FILES = dtest-app.exe dtest-app.exe.mdb dtest-app.pdb dtest-excfilter.exe dtest-excfilter.exe.mdb dtest-excfilter.pdb EXTRA_DISTFILES = \ diff --git a/mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs b/mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs index 33ef36b6d5..f0a9ce8dbe 100644 --- a/mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs +++ b/mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs @@ -13,7 +13,9 @@ using System.Threading.Tasks; using System.Collections.Generic; using System.Linq; using System.Net.Sockets; +#if !MOBILE using MonoTests.Helpers; +#endif public class TestsBase { @@ -266,6 +268,8 @@ public class Tests : TestsBase, ITest2 public static bool is_attached = Debugger.IsAttached; public NestedStruct nested_struct; + static string arg; + #pragma warning restore 0414 public class NestedClass { @@ -299,6 +303,9 @@ public class Tests : TestsBase, ITest2 } public static int Main (String[] args) { + if (args.Length == 0) + args = new String [] { Tests.arg }; + tls_i = 42; if (args.Length > 0 && args [0] == "suspend-test") @@ -321,7 +328,11 @@ public class Tests : TestsBase, ITest2 return 0; } if (args.Length >0 && args [0] == "threadpool-io") { +#if !MOBILE threadpool_io (); +#else + throw new Exception ("Can't run threadpool-io test on mobile"); +#endif return 0; } if (args.Length > 0 && args [0] == "attach") { @@ -350,7 +361,9 @@ public class Tests : TestsBase, ITest2 threads (); dynamic_methods (); user (); +#if !MOBILE type_load (); +#endif regress (); gc_suspend (); set_ip (); @@ -1561,6 +1574,7 @@ public class Tests : TestsBase, ITest2 Debugger.Log (5, Debugger.IsLogging () ? "A" : "", "B"); } +#if !MOBILE [MethodImplAttribute (MethodImplOptions.NoInlining)] public static void type_load () { type_load_2 (); @@ -1575,6 +1589,7 @@ public class Tests : TestsBase, ITest2 var c2 = new TypeLoadClass2 (); c2.ToString (); } +#endif [MethodImplAttribute (MethodImplOptions.NoInlining)] public static void regress () { @@ -1691,6 +1706,7 @@ public class Tests : TestsBase, ITest2 [MethodImplAttribute (MethodImplOptions.NoInlining)] public static void threadpool_bp () { } +#if !MOBILE [MethodImplAttribute (MethodImplOptions.NoInlining)] public static void threadpool_io () { // Start a threadpool task that blocks on I/O. @@ -1730,6 +1746,7 @@ public class Tests : TestsBase, ITest2 streamOut.Close (); var bsIn = t.Result; } +#endif [MethodImplAttribute (MethodImplOptions.NoInlining)] public void attach_break () { diff --git a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs.REMOVED.git-id b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs.REMOVED.git-id index aeb3f2a004..e72a5b9208 100644 --- a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs.REMOVED.git-id +++ b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs.REMOVED.git-id @@ -1 +1 @@ -8fb43da5d617155a9e7868c8c32d0ea4cad9047c \ No newline at end of file +de430ae354a18c8538fb43b6356a1a9c91226072 \ No newline at end of file diff --git a/mcs/class/Mono.Options/Documentation/en/Mono.Options/CommandSet.xml b/mcs/class/Mono.Options/Documentation/en/Mono.Options/CommandSet.xml index 9122d7f719..fe913f1b7e 100644 --- a/mcs/class/Mono.Options/Documentation/en/Mono.Options/CommandSet.xml +++ b/mcs/class/Mono.Options/Documentation/en/Mono.Options/CommandSet.xml @@ -1,4 +1,3 @@ - @@ -90,17 +89,28 @@ class CommandDemo { new Command ("echo", "Echo arguments to the screen") { Run = ca => Console.WriteLine ("{0}", string.Join (" ", ca)), }, - new RequiresArgs (), + new RequiresArgsCommand (), + "Commands with spaces are supported:", + new Command ("has spaces", "spaces?!") { + Run = ca => Console.WriteLine ("spaces, yo! {0}", string.Join (" ", ca)), + }, + "Nested CommandSets are also supported. They're invoked similarly to commands with spaces.", + new CommandSet ("set") { + new Command ("file type", "Does something or other.") { + Run = ca => Console.WriteLine ("File type set to: {0}", string.Join (" ", ca)), + }, + }, }; + commands.Add (commands); return commands.Run (args); } public static int Verbosity; } -class RequiresArgs : Command { +class RequiresArgsCommand : Command { - public RequiresArgs () + public RequiresArgsCommand () : base ("requires-args", "Class-based Command subclass") { Options = new OptionSet () { @@ -149,6 +159,7 @@ class RequiresArgs : Command { Use `commands help` for usage. $ mono commands.exe --help +# HelpCommand.Invoke: arguments= usage: commands COMMAND [OPTIONS] Mono.Options.CommandSet sample app. @@ -159,8 +170,14 @@ Global options: Available commands: echo Echo arguments to the screen requires-args Class-based Command subclass +Commands with spaces are supported: + has spaces spaces?! +Nested CommandSets are also supported. They're invoked similarly to commands +with spaces. + set file type Does something or other. $ mono commands.exe help +# HelpCommand.Invoke: arguments= usage: commands COMMAND [OPTIONS] Mono.Options.CommandSet sample app. @@ -171,18 +188,27 @@ Global options: Available commands: echo Echo arguments to the screen requires-args Class-based Command subclass +Commands with spaces are supported: + has spaces spaces?! +Nested CommandSets are also supported. They're invoked similarly to commands +with spaces. + set file type Does something or other. $ mono commands.exe help --help +# HelpCommand.Invoke: arguments=--help Usage: commands COMMAND [OPTIONS] Use `commands help COMMAND` for help on a specific command. Available commands: echo Echo arguments to the screen + has spaces spaces?! requires-args Class-based Command subclass + set file type Does something or other. help Show this message and exit $ mono commands.exe help echo +# HelpCommand.Invoke: arguments=echo --help $ mono commands.exe echo --help @@ -196,6 +222,7 @@ commands: Missing required argument `--name=NAME`. commands: Use `commands help requires-args` for details. $ mono commands.exe help requires-args +# HelpCommand.Invoke: arguments=requires-args usage: commands requires-args [OPTIONS] Class-based Command subclass example. @@ -217,8 +244,15 @@ commands: Unknown command: invalid-command commands: Use `commands help` for usage. $ mono commands.exe help invalid-command +# HelpCommand.Invoke: arguments=invalid-command commands: Unknown command: invalid-command commands: Use `commands help` for usage. + +$ mono commands.exe has spaces +spaces, yo! + +$ mono commands.exe set file type whatever +File type set to: whatever The commands.exe output is short, informing the user that @@ -426,6 +460,40 @@ commands: Use `commands help` for usage. + + + + Method + + 0.2.3.0 + + + Mono.Options.CommandSet + + + + + + + The to register. + + Adds as a suite of sub-commands. + + The current instance. + This is to permit method chaining. + + + + When a CommandSet is a child of a CommandSet, the nested + CommandSet commands can be invoked by prefixing the command name + with the CommandSet suite name within the arguments array. + + + + is . + + + @@ -1392,4 +1460,4 @@ commands: Use `commands help` for usage. - \ No newline at end of file + diff --git a/mcs/class/Mono.Options/Documentation/en/examples/commands.cs b/mcs/class/Mono.Options/Documentation/en/examples/commands.cs index d8c48e4838..619a856a18 100644 --- a/mcs/class/Mono.Options/Documentation/en/examples/commands.cs +++ b/mcs/class/Mono.Options/Documentation/en/examples/commands.cs @@ -25,17 +25,28 @@ class CommandDemo { new Command ("echo", "Echo arguments to the screen") { Run = ca => Console.WriteLine ("{0}", string.Join (" ", ca)), }, - new RequiresArgs (), + new RequiresArgsCommand (), + "Commands with spaces are supported:", + new Command ("has spaces", "spaces?!") { + Run = ca => Console.WriteLine ("spaces, yo! {0}", string.Join (" ", ca)), + }, + "Nested CommandSets are also supported. They're invoked similarly to commands with spaces.", + new CommandSet ("set") { + new Command ("file type", "Does something or other.") { + Run = ca => Console.WriteLine ("File type set to: {0}", string.Join (" ", ca)), + }, + }, }; + commands.Add (commands); return commands.Run (args); } public static int Verbosity; } -class RequiresArgs : Command { +class RequiresArgsCommand : Command { - public RequiresArgs () + public RequiresArgsCommand () : base ("requires-args", "Class-based Command subclass") { Options = new OptionSet () { diff --git a/mcs/class/Mono.Options/Documentation/en/examples/commands.in b/mcs/class/Mono.Options/Documentation/en/examples/commands.in index 96855a870e..8c2e1a1cbd 100644 --- a/mcs/class/Mono.Options/Documentation/en/examples/commands.in +++ b/mcs/class/Mono.Options/Documentation/en/examples/commands.in @@ -23,3 +23,7 @@ mono Documentation/en/examples/commands.exe requires-args -n World mono Documentation/en/examples/commands.exe invalid-command mono Documentation/en/examples/commands.exe help invalid-command + +mono Documentation/en/examples/commands.exe has spaces + +mono Documentation/en/examples/commands.exe set file type whatever diff --git a/mcs/class/Mono.Options/Documentation/en/examples/commands.txt b/mcs/class/Mono.Options/Documentation/en/examples/commands.txt index 1930680114..0bfa31d9dc 100644 --- a/mcs/class/Mono.Options/Documentation/en/examples/commands.txt +++ b/mcs/class/Mono.Options/Documentation/en/examples/commands.txt @@ -2,6 +2,7 @@ $ mono commands.exe Use `commands help` for usage. $ mono commands.exe --help +# HelpCommand.Invoke: arguments= usage: commands COMMAND [OPTIONS] Mono.Options.CommandSet sample app. @@ -12,8 +13,14 @@ Global options: Available commands: echo Echo arguments to the screen requires-args Class-based Command subclass +Commands with spaces are supported: + has spaces spaces?! +Nested CommandSets are also supported. They're invoked similarly to commands +with spaces. + set file type Does something or other. $ mono commands.exe help +# HelpCommand.Invoke: arguments= usage: commands COMMAND [OPTIONS] Mono.Options.CommandSet sample app. @@ -24,18 +31,27 @@ Global options: Available commands: echo Echo arguments to the screen requires-args Class-based Command subclass +Commands with spaces are supported: + has spaces spaces?! +Nested CommandSets are also supported. They're invoked similarly to commands +with spaces. + set file type Does something or other. $ mono commands.exe help --help +# HelpCommand.Invoke: arguments=--help Usage: commands COMMAND [OPTIONS] Use `commands help COMMAND` for help on a specific command. Available commands: echo Echo arguments to the screen + has spaces spaces?! requires-args Class-based Command subclass + set file type Does something or other. help Show this message and exit $ mono commands.exe help echo +# HelpCommand.Invoke: arguments=echo --help $ mono commands.exe echo --help @@ -49,6 +65,7 @@ commands: Missing required argument `--name=NAME`. commands: Use `commands help requires-args` for details. $ mono commands.exe help requires-args +# HelpCommand.Invoke: arguments=requires-args usage: commands requires-args [OPTIONS] Class-based Command subclass example. @@ -70,5 +87,12 @@ commands: Unknown command: invalid-command commands: Use `commands help` for usage. $ mono commands.exe help invalid-command +# HelpCommand.Invoke: arguments=invalid-command commands: Unknown command: invalid-command commands: Use `commands help` for usage. + +$ mono commands.exe has spaces +spaces, yo! + +$ mono commands.exe set file type whatever +File type set to: whatever diff --git a/mcs/class/Mono.Options/Mono.Options/Options.cs b/mcs/class/Mono.Options/Mono.Options/Options.cs index af7eea850c..780530a8da 100644 --- a/mcs/class/Mono.Options/Mono.Options/Options.cs +++ b/mcs/class/Mono.Options/Mono.Options/Options.cs @@ -1267,7 +1267,7 @@ namespace Mono.Options } CommandOption co = p as CommandOption; if (co != null) { - WriteCommandDescription (o, co.Command); + WriteCommandDescription (o, co.Command, co.CommandName); continue; } @@ -1311,9 +1311,9 @@ namespace Mono.Options } } - internal void WriteCommandDescription (TextWriter o, Command c) + internal void WriteCommandDescription (TextWriter o, Command c, string commandName) { - var name = new string (' ', 8) + c.Name; + var name = new string (' ', 8) + (commandName ?? c.Name); if (name.Length < OptionWidth - 1) { WriteDescription (o, name + new string (' ', OptionWidth - name.Length) + c.Help, CommandHelpIndentRemaining, 80, Description_RemWidth); } else { @@ -1476,10 +1476,27 @@ namespace Mono.Options if (string.IsNullOrEmpty (name)) throw new ArgumentNullException (nameof (name)); - Name = name; + Name = NormalizeCommandName (name); Help = help; } + static string NormalizeCommandName (string name) + { + var value = new StringBuilder (name.Length); + var space = false; + for (int i = 0; i < name.Length; ++i) { + if (!char.IsWhiteSpace (name, i)) { + space = false; + value.Append (name [i]); + } + else if (!space) { + space = true; + value.Append (' '); + } + } + return value.ToString (); + } + public virtual int Invoke (IEnumerable arguments) { var rest = Options?.Parse (arguments) ?? arguments; @@ -1491,16 +1508,18 @@ namespace Mono.Options class CommandOption : Option { public Command Command {get;} + public string CommandName {get;} // Prototype starts with '=' because this is an invalid prototype // (see Option.ParsePrototype(), and thus it'll prevent Category // instances from being accidentally used as normal options. - public CommandOption (Command command, bool hidden = false) - : base ("=:Command:= " + command?.Name, command?.Name, maxValueCount: 0, hidden: hidden) + public CommandOption (Command command, string commandName = null, bool hidden = false) + : base ("=:Command:= " + (commandName ?? command?.Name), (commandName ?? command?.Name), maxValueCount: 0, hidden: hidden) { if (command == null) throw new ArgumentNullException (nameof (command)); Command = command; + CommandName = commandName ?? command.Name; } protected override void OnParseComplete (OptionContext c) @@ -1574,12 +1593,15 @@ namespace Mono.Options public class CommandSet : KeyedCollection { - readonly OptionSet options; - readonly TextWriter outWriter; - readonly TextWriter errorWriter; readonly string suite; - HelpCommand help; + OptionSet options; + TextWriter outWriter; + TextWriter errorWriter; + + internal List NestedCommandSets; + + internal HelpCommand help; internal bool showHelp; @@ -1719,6 +1741,47 @@ namespace Mono.Options return this; } + public CommandSet Add (CommandSet nestedCommands) + { + if (nestedCommands == null) + throw new ArgumentNullException (nameof (nestedCommands)); + + if (NestedCommandSets == null) { + NestedCommandSets = new List (); + } + + if (!AlreadyAdded (nestedCommands)) { + NestedCommandSets.Add (nestedCommands); + foreach (var o in nestedCommands.options) { + if (o is CommandOption c) { + options.Add (new CommandOption (c.Command, $"{nestedCommands.Suite} {c.CommandName}")); + } + else { + options.Add (o); + } + } + } + + nestedCommands.options = this.options; + nestedCommands.outWriter = this.outWriter; + nestedCommands.errorWriter = this.errorWriter; + + return this; + } + + bool AlreadyAdded (CommandSet value) + { + if (value == this) + return true; + if (NestedCommandSets == null) + return false; + foreach (var nc in NestedCommandSets) { + if (nc.AlreadyAdded (value)) + return true; + } + return false; + } + public int Run (IEnumerable arguments) { if (arguments == null) @@ -1744,12 +1807,11 @@ namespace Mono.Options Out.WriteLine (options.MessageLocalizer ($"Use `{Suite} help` for usage.")); return 1; } - var command = Contains (extra [0]) ? this [extra [0]] : null; + var command = GetCommand (extra); if (command == null) { help.WriteUnknownCommand (extra [0]); return 1; } - extra.RemoveAt (0); if (showHelp) { if (command.Options?.Contains ("help") ?? true) { extra.Add ("--help"); @@ -1760,6 +1822,51 @@ namespace Mono.Options } return command.Invoke (extra); } + + internal Command GetCommand (List extra) + { + return TryGetLocalCommand (extra) ?? TryGetNestedCommand (extra); + } + + Command TryGetLocalCommand (List extra) + { + var name = extra [0]; + if (Contains (name)) { + extra.RemoveAt (0); + return this [name]; + } + for (int i = 1; i < extra.Count; ++i) { + name = name + " " + extra [i]; + if (!Contains (name)) + continue; + extra.RemoveRange (0, i+1); + return this [name]; + } + return null; + } + + Command TryGetNestedCommand (List extra) + { + if (NestedCommandSets == null) + return null; + + var nestedCommands = NestedCommandSets.Find (c => c.Suite == extra [0]); + if (nestedCommands == null) + return null; + + var extraCopy = new List (extra); + extraCopy.RemoveAt (0); + if (extraCopy.Count == 0) + return null; + + var command = nestedCommands.GetCommand (extraCopy); + if (command != null) { + extra.Clear (); + extra.AddRange (extraCopy); + return command; + } + return null; + } } public class HelpCommand : Command @@ -1772,23 +1879,28 @@ namespace Mono.Options public override int Invoke (IEnumerable arguments) { var extra = new List (arguments ?? new string [0]); + Console.WriteLine ($"# HelpCommand.Invoke: arguments={string.Join (" ", arguments)}"); var _ = CommandSet.Options.MessageLocalizer; if (extra.Count == 0) { CommandSet.Options.WriteOptionDescriptions (CommandSet.Out); return 0; } - var command = CommandSet.Contains (extra [0]) - ? CommandSet [extra [0]] - : null; - if (command == this || extra [0] == "--help") { + var command = CommandSet.GetCommand (extra); + if (command == this || extra.Contains ("--help")) { CommandSet.Out.WriteLine (_ ($"Usage: {CommandSet.Suite} COMMAND [OPTIONS]")); CommandSet.Out.WriteLine (_ ($"Use `{CommandSet.Suite} help COMMAND` for help on a specific command.")); CommandSet.Out.WriteLine (); CommandSet.Out.WriteLine (_ ($"Available commands:")); CommandSet.Out.WriteLine (); - foreach (var c in CommandSet) { - CommandSet.Options.WriteCommandDescription (CommandSet.Out, c); + var commands = GetCommands (); + commands.Sort ((x, y) => string.Compare (x.Key, y.Key, StringComparison.OrdinalIgnoreCase)); + foreach (var c in commands) { + if (c.Key == "help") { + continue; + } + CommandSet.Options.WriteCommandDescription (CommandSet.Out, c.Value, c.Key); } + CommandSet.Options.WriteCommandDescription (CommandSet.Out, CommandSet.help, "help"); return 0; } if (command == null) { @@ -1802,6 +1914,36 @@ namespace Mono.Options return command.Invoke (new [] { "--help" }); } + List> GetCommands () + { + var commands = new List> (); + + foreach (var c in CommandSet) { + commands.Add (new KeyValuePair(c.Name, c)); + } + + if (CommandSet.NestedCommandSets == null) + return commands; + + foreach (var nc in CommandSet.NestedCommandSets) { + AddNestedCommands (commands, "", nc); + } + + return commands; + } + + void AddNestedCommands (List> commands, string outer, CommandSet value) + { + foreach (var v in value) { + commands.Add (new KeyValuePair($"{outer}{value.Suite} {v.Name}", v)); + } + if (value.NestedCommandSets == null) + return; + foreach (var nc in value.NestedCommandSets) { + AddNestedCommands (commands, $"{outer}{value.Suite} ", nc); + } + } + internal void WriteUnknownCommand (string unknownCommand) { CommandSet.Error.WriteLine (CommandSet.Options.MessageLocalizer ($"{CommandSet.Suite}: Unknown command: {unknownCommand}")); diff --git a/mcs/class/Mono.Options/Test/Mono.Options/CommandSetTest.cs b/mcs/class/Mono.Options/Test/Mono.Options/CommandSetTest.cs index d5a8661551..89ee149474 100644 --- a/mcs/class/Mono.Options/Test/Mono.Options/CommandSetTest.cs +++ b/mcs/class/Mono.Options/Test/Mono.Options/CommandSetTest.cs @@ -98,6 +98,7 @@ namespace MonoTests.Mono.Options { var c = new CommandSet ("cs"); Assert.Throws (() => c.Add ((Command)null)); + Assert.Throws (() => c.Add ((CommandSet)null)); } [Test] @@ -153,7 +154,22 @@ namespace MonoTests.Mono.Options "start a working area (see also: git help tutorial)", new Command ("clone", "Clone a repository into a new directory"), new Command ("init", "Create an empty Git repository or reinitialize an existing one"), + new Command ("this\thas spaces", "Spaces in command names?!"), new Command ("thisIsAVeryLongCommandNameInOrderToInduceWrapping", "Create an empty Git repository or reinitialize an existing one. Let's make this really long to cause a line wrap, shall we?"), + new CommandSet ("nested") { + "Surely nested commands need flavor text?", + new Command ("foo", "nested foo help"), + "And more text?", + new Command ("bar", "nested bar help"), + new CommandSet ("again") { + "Yet more text!", + new Command ("and again", "Wee! Nesting!"), + } + }, + new CommandSet ("another") { + new Command ("foo", "another foo help"), + new Command ("bar", "another bar help"), + }, }; var expectedHelp = new StringWriter (); @@ -170,10 +186,20 @@ namespace MonoTests.Mono.Options expectedHelp.WriteLine (" clone Clone a repository into a new directory"); expectedHelp.WriteLine (" init Create an empty Git repository or reinitialize an"); expectedHelp.WriteLine (" existing one"); + expectedHelp.WriteLine (" this has spaces Spaces in command names?!"); expectedHelp.WriteLine (" thisIsAVeryLongCommandNameInOrderToInduceWrapping"); expectedHelp.WriteLine (" Create an empty Git repository or reinitialize an"); expectedHelp.WriteLine (" existing one. Let's make this really long to"); expectedHelp.WriteLine (" cause a line wrap, shall we?"); + expectedHelp.WriteLine ("Surely nested commands need flavor text?"); + expectedHelp.WriteLine (" nested foo nested foo help"); + expectedHelp.WriteLine ("And more text?"); + expectedHelp.WriteLine (" nested bar nested bar help"); + expectedHelp.WriteLine ("Yet more text!"); + expectedHelp.WriteLine (" nested again and again"); + expectedHelp.WriteLine (" Wee! Nesting!"); + expectedHelp.WriteLine (" another foo another foo help"); + expectedHelp.WriteLine (" another bar another bar help"); Assert.AreEqual (0, git.Run (new [] { "help" })); Assert.AreEqual (expectedHelp.ToString (), o.ToString ()); @@ -184,9 +210,16 @@ namespace MonoTests.Mono.Options expectedHelpHelp.WriteLine (); expectedHelpHelp.WriteLine ("Available commands:"); expectedHelpHelp.WriteLine (); + expectedHelpHelp.WriteLine (" another bar another bar help"); + expectedHelpHelp.WriteLine (" another foo another foo help"); expectedHelpHelp.WriteLine (" clone Clone a repository into a new directory"); expectedHelpHelp.WriteLine (" init Create an empty Git repository or reinitialize an"); expectedHelpHelp.WriteLine (" existing one"); + expectedHelpHelp.WriteLine (" nested again and again"); + expectedHelpHelp.WriteLine (" Wee! Nesting!"); + expectedHelpHelp.WriteLine (" nested bar nested bar help"); + expectedHelpHelp.WriteLine (" nested foo nested foo help"); + expectedHelpHelp.WriteLine (" this has spaces Spaces in command names?!"); expectedHelpHelp.WriteLine (" thisIsAVeryLongCommandNameInOrderToInduceWrapping"); expectedHelpHelp.WriteLine (" Create an empty Git repository or reinitialize an"); expectedHelpHelp.WriteLine (" existing one. Let's make this really long to"); @@ -203,9 +236,13 @@ namespace MonoTests.Mono.Options { var a = 0; var b = 0; + var d = 0; + var g = 0; var c = new CommandSet ("set") { new Command ("a") { Run = v => a = v.Count () }, new Command ("b") { Run = v => b = v.Count () }, + new Command ("c d") { Run = v => d = v.Count () }, + new Command ("e\t f\ng") { Run = v => g = v.Count () }, }; Assert.AreEqual (0, c.Run (new [] { "a", "extra" })); Assert.AreEqual (1, a); @@ -219,6 +256,54 @@ namespace MonoTests.Mono.Options Assert.AreEqual (0, c.Run (new [] { "b", "one", "two" })); Assert.AreEqual (0, a); Assert.AreEqual (2, b); + + Assert.AreEqual (1, c.Run (new [] { "c"})); + + Assert.AreEqual (0, c.Run (new [] { "c d", "one"})); + Assert.AreEqual (1, d); + + Assert.AreEqual (0, c.Run (new [] { "c", "d", "one", "two"})); + Assert.AreEqual (2, d); + + Assert.AreEqual (1, c.Run (new [] { "e" })); + Assert.AreEqual (1, c.Run (new [] { "e f" })); + Assert.AreEqual (1, c.Run (new [] { "e", "f" })); + + Assert.AreEqual (0, c.Run (new [] { "e f g"})); + Assert.AreEqual (0, g); + + Assert.AreEqual (0, c.Run (new [] { "e f g", "one"})); + Assert.AreEqual (1, g); + + Assert.AreEqual (0, c.Run (new [] { "e", "f", "g", "one", "two", "three"})); + Assert.AreEqual (3, g); + } + + [Test] + public void Run_Command_NestedCommandSets () + { + var a = 0; + var i_b = 0; + var i_i_c = 0; + var outer = new CommandSet ("outer") { + new Command ("a") { Run = v => a = v.Count () }, + new CommandSet ("intermediate") { + new Command ("b") { Run = v => i_b = v.Count () }, + new CommandSet ("inner") { + new Command ("c") { Run = v => i_i_c = v.Count () }, + } + }, + }; + Assert.AreEqual (0, outer.Run (new[]{"a", "1"})); + Assert.AreEqual (1, a); + + Assert.AreEqual (1, outer.Run (new[]{"intermediate"})); + Assert.AreEqual (0, outer.Run (new[]{"intermediate", "b", "1", "2"})); + Assert.AreEqual (2, i_b); + + Assert.AreEqual (1, outer.Run (new[]{"intermediate inner"})); + Assert.AreEqual (0, outer.Run (new[]{"intermediate", "inner", "c", "1", "2", "3"})); + Assert.AreEqual (3, i_i_c); } [Test] diff --git a/mcs/class/Mono.Profiler.Log/Makefile b/mcs/class/Mono.Profiler.Log/Makefile index 84d4ed93a8..15aefd3f21 100644 --- a/mcs/class/Mono.Profiler.Log/Makefile +++ b/mcs/class/Mono.Profiler.Log/Makefile @@ -2,14 +2,26 @@ thisdir = class/Mono.Profiler.Log include ../../build/rules.make LIBRARY = Mono.Profiler.Log.dll -LIBRARY_SNK = ../mono.snk - -LIB_REFS = System System.Core -KEYFILE = $(LIBRARY_SNK) -LIB_MCS_FLAGS = /unsafe /publicsign /nowarn:0618 - LIBRARY_WARN_AS_ERROR = yes -NO_TEST = yes +KEYFILE = $(LIBRARY_SNK) + +LIB_REFS = System System.Core +LIB_MCS_FLAGS = /unsafe /publicsign /nowarn:0618 + +XTEST_LIB_REFS = System System.Core Facades/System.Threading.Tasks + +xunit-test-local: log-profiler-test.exe + +log-profiler-test.exe: Test/log-profiler-test.cs + $(CSCOMPILE) $(PLATFORM_DEBUG_FLAGS) /unsafe $(if $(MCS_MODE),,/warnaserror) /r:$(build_libdir)/mscorlib.dll /r:$(build_lib) /out:$@ $< + +EXTRA_DISTFILES = \ + Test/log-profiler-test.cs + +CLEAN_FILES = \ + log-profiler-test.exe \ + log-profiler-test.exe.mdb \ + log-profiler-test.pdb include ../../build/library.make diff --git a/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log/LogEnums.cs b/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log/LogEnums.cs index e79a9e5263..e5535f9fb8 100644 --- a/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log/LogEnums.cs +++ b/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log/LogEnums.cs @@ -124,12 +124,14 @@ namespace Mono.Profiler.Log { // mono/metadata/profiler.h : MonoProfilerCodeBufferType public enum LogJitHelper { Method = 0, + [Obsolete ("This value is no longer produced.")] MethodTrampoline = 1, UnboxTrampoline = 2, ImtTrampoline = 3, GenericsTrampoline = 4, SpecificTrampoline = 5, Helper = 6, + [Obsolete ("This value is no longer produced.")] Monitor = 7, DelegateInvoke = 8, ExceptionHandling = 9, diff --git a/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log/LogEvents.cs b/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log/LogEvents.cs index 19d179015f..16a216a44f 100644 --- a/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log/LogEvents.cs +++ b/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log/LogEvents.cs @@ -276,7 +276,7 @@ namespace Mono.Profiler.Log { public struct HeapRoot { - public long AddressPointer { get; internal set; } + public long SlotPointer { get; internal set; } public long ObjectPointer { get; internal set; } diff --git a/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log/LogProcessor.cs b/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log/LogProcessor.cs index 62f9574295..e792b1dfb3 100644 --- a/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log/LogProcessor.cs +++ b/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log/LogProcessor.cs @@ -443,7 +443,7 @@ namespace Mono.Profiler.Log { for (var i = 0; i < list.Length; i++) { list [i] = new HeapRootsEvent.HeapRoot { - AddressPointer = StreamHeader.FormatVersion >= 15 ? ReadPointer () : 0, + SlotPointer = StreamHeader.FormatVersion >= 15 ? ReadPointer () : 0, ObjectPointer = ReadObject (), Attributes = StreamHeader.FormatVersion < 15 ? (StreamHeader.FormatVersion == 13 ? diff --git a/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log/LogStreamHeader.cs b/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log/LogStreamHeader.cs index 37128fc98c..e00030c493 100644 --- a/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log/LogStreamHeader.cs +++ b/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log/LogStreamHeader.cs @@ -10,7 +10,7 @@ namespace Mono.Profiler.Log { const int MinVersion = 13; - const int MaxVersion = 16; + const int MaxVersion = 17; const int Id = 0x4d505a01; diff --git a/mcs/class/Mono.Profiler.Log/Test/log-profiler-test.cs b/mcs/class/Mono.Profiler.Log/Test/log-profiler-test.cs new file mode 100644 index 0000000000..890e94886b --- /dev/null +++ b/mcs/class/Mono.Profiler.Log/Test/log-profiler-test.cs @@ -0,0 +1,325 @@ +// 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; +using System.Collections.Generic; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Threading; +using Mono.Profiler.Log; + +namespace Mono.Profiling.Tests { + + static class Program { + + static int Main (string[] args) + { + if (args.Length != 1) { + Console.WriteLine ("Usage: log-profiler-test "); + return 1; + } + + if (!_tests.TryGetValue (args [0], out var test)) { + Console.WriteLine ("Unknown test name: '{0}'", args [0]); + return 1; + } + + test.Run (); + return 0; + } + + static readonly IReadOnlyDictionary _tests = new Dictionary { + ["do-nothing"] = new DoNothingTest (), + ["busy-work"] = new BusyWorkTest (), + ["idle-sleep"] = new IdleSleepTest (), + ["simple-allocation"] = new SimpleAllocationTest (), + ["wasteful-allocation"] = new WastefulAllocationTest (), + ["runtime-api"] = new RuntimeApiTest (), + ["exception-clause"] = new ExceptionClauseTest (), + ["monitor-lock"] = new MonitorLockTest (), + ["backtrace"] = new BacktraceTest (), + ["gc-handle"] = new GCHandleTest (), + ["finalization"] = new FinalizationTest (), + ["pinvoke"] = new PInvokeTest (), + }; + } + + abstract class ProfilerTest { + + public abstract void Run (); + } + + sealed class DoNothingTest : ProfilerTest { + + public override void Run () + { + } + } + + sealed class BusyWorkTest : ProfilerTest { + + int _value; + + public override void Run () + { + var threads = new Thread [4]; + + for (var i = 0; i < threads.Length; i++) { + threads [i] = new Thread (Work) { + Name = "BusyWork" + i, + }; + } + + foreach (var thread in threads) + thread.Start (); + + foreach (var thread in threads) + thread.Join (); + } + + void Work () + { + for (var i = 0; i < 500000000; i++) + _value /= (i + 100) * 1000; + } + } + + sealed class IdleSleepTest : ProfilerTest { + + public override void Run () + { + var threads = new Thread [4]; + + for (var i = 0; i < threads.Length; i++) { + threads [i] = new Thread (Sleep) { + Name = "IdleSleep" + i, + }; + } + + foreach (var thread in threads) + thread.Start (); + + foreach (var thread in threads) + thread.Join (); + } + + static void Sleep () + { + Thread.Sleep (5000); + } + } + + sealed class SimpleAllocationTest : ProfilerTest { + + readonly (object, int[], Exception)[] _objects = new (object, int[], Exception) [10000]; + + public override void Run () + { + for (var i = 0; i < _objects.Length; i++) + _objects [i] = (new object (), new int [i], new Exception ()); + } + } + + sealed class WastefulAllocationTest : ProfilerTest { + + public override void Run () + { + for (var i = 0; i < 100000; i++) { + var dummy = new int [i]; + } + } + } + + sealed class RuntimeApiTest : ProfilerTest { + + readonly object[] _array = new object [1000]; + + public override void Run () + { + if (!LogProfiler.IsAttached) + throw new Exception ("Where's the log profiler?"); + + for (var i = 0; i < _array.Length; i++) + _array [i] = new object (); + + LogProfiler.TriggerHeapshot (); + + Thread.Sleep (5000); + } + } + + sealed class ExceptionClauseTest : ProfilerTest { + + sealed class CustomException : Exception { + } + + public override void Run () + { + var ex = new CustomException (); + + try { + throw ex; + } catch (Exception e) when (e is CustomException) { + } + + try { + throw ex; + } catch (Exception) { + } finally { + Dummy (); + } + } + + [MethodImpl (MethodImplOptions.NoInlining)] + static void Dummy () + { + } + } + + sealed class MonitorLockTest : ProfilerTest { + + readonly object _lock = new object (); + + public override void Run () + { + var thread = new Thread (TryLock) { + Name = "MonitorLock1", + }; + + Monitor.Enter (_lock); + thread.Start (); + Thread.Sleep (10000); + Monitor.Exit (_lock); + thread.Join (); + + thread = new Thread (Lock) { + Name = "MonitorLock2", + }; + + thread.Start (); + Lock (); + thread.Join (); + } + + void TryLock () + { + while (!Monitor.TryEnter (_lock, 1)); + + Monitor.Exit (_lock); + } + + void Lock () + { + for (var i = 0; i < 1000000; i++) { + lock (_lock) { + } + } + } + } + + sealed class BacktraceTest : ProfilerTest { + + sealed class CustomException : Exception { + } + + public override void Run () + { + try { + One (); + } catch (CustomException) { + } + } + + [MethodImpl (MethodImplOptions.NoInlining)] + static void One () + { + Two (); + } + + [MethodImpl (MethodImplOptions.NoInlining)] + static void Two () + { + Three (); + } + + [MethodImpl (MethodImplOptions.NoInlining)] + static void Three () + { + Four (); + } + + [MethodImpl (MethodImplOptions.NoInlining)] + static void Four () + { + throw new CustomException (); + } + } + + sealed class GCHandleTest : ProfilerTest { + + sealed class NormalClass { + } + + sealed class PinnedClass { + } + + sealed class WeakClass { + } + + sealed class WeakTrackResurrectionClass { + } + + public override void Run () + { + var normal = GCHandle.Alloc (new NormalClass (), GCHandleType.Normal); + normal.Free (); + + var pinned = GCHandle.Alloc (new PinnedClass (), GCHandleType.Pinned); + pinned.Free (); + + var weak = GCHandle.Alloc (new WeakClass (), GCHandleType.Weak); + weak.Free (); + + var weakTrack = GCHandle.Alloc (new WeakTrackResurrectionClass (), GCHandleType.WeakTrackResurrection); + weakTrack.Free (); + } + } + + sealed class FinalizationTest : ProfilerTest { + + sealed class FinalizableClass { + + static int _finalized; + + ~FinalizableClass () + { + _finalized++; + } + } + + public override void Run () + { + for (var i = 0; i < 10000; i++) { + new FinalizableClass (); + + if (i % 1000 == 0) { + GC.Collect (); + GC.WaitForPendingFinalizers (); + } + } + } + } + + sealed class PInvokeTest : ProfilerTest { + + [DllImport ("libc", EntryPoint = "uname")] + static extern int KernelName (IntPtr buf); + + public override void Run () + { + for (var i = 0; i < 10000000; i++) + KernelName (IntPtr.Zero); + } + } +} diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/CertificateValidationHelper.cs b/mcs/class/Mono.Security/Mono.Security.Interface/CertificateValidationHelper.cs index 98805605c0..957c657f23 100644 --- a/mcs/class/Mono.Security/Mono.Security.Interface/CertificateValidationHelper.cs +++ b/mcs/class/Mono.Security/Mono.Security.Interface/CertificateValidationHelper.cs @@ -138,20 +138,6 @@ namespace Mono.Security.Interface get { return supportsTrustAnchors; } } - /* - * Internal API, intended to be used by MonoTlsProvider implementations. - */ - internal static ICertificateValidator2 GetInternalValidator (MonoTlsSettings settings, MonoTlsProvider provider) - { - return (ICertificateValidator2)NoReflectionHelper.GetInternalValidator (provider, settings); - } - - [Obsolete ("Use GetInternalValidator")] - internal static ICertificateValidator2 GetDefaultValidator (MonoTlsSettings settings, MonoTlsProvider provider) - { - return GetInternalValidator (settings, provider); - } - /* * Use this overloaded version in user code. */ diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/IMonoAuthenticationOptions.cs b/mcs/class/Mono.Security/Mono.Security.Interface/IMonoAuthenticationOptions.cs new file mode 100644 index 0000000000..49d208a62b --- /dev/null +++ b/mcs/class/Mono.Security/Mono.Security.Interface/IMonoAuthenticationOptions.cs @@ -0,0 +1,77 @@ +// +// IMonoAuthenticationOptions.cs +// +// Author: +// Martin Baulig +// +// Copyright (c) 2018 Xamarin Inc. (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using System; +using System.IO; +using System.Net; +using System.Net.Security; +using System.Security.Authentication; +using System.Security.Cryptography.X509Certificates; +using System.Security.Principal; +using System.Security.Cryptography; + +namespace Mono.Security.Interface +{ + delegate X509Certificate MonoServerCertificateSelectionCallback (object sender, string hostName); + + interface IMonoAuthenticationOptions + { + bool AllowRenegotiation { + get; set; + } + + RemoteCertificateValidationCallback RemoteCertificateValidationCallback { get; set; } + + SslProtocols EnabledSslProtocols { + get; set; + } + + EncryptionPolicy EncryptionPolicy { + get; set; + } + + X509RevocationMode CertificateRevocationCheckMode { + get; set; + } + } + + interface IMonoSslClientAuthenticationOptions : IMonoAuthenticationOptions + { + LocalCertificateSelectionCallback LocalCertificateSelectionCallback { get; set; } + + string TargetHost { get; set; } + + X509CertificateCollection ClientCertificates { get; set; } + } + + interface IMonoSslServerAuthenticationOptions : IMonoAuthenticationOptions + { + bool ClientCertificateRequired { get; set; } + + MonoServerCertificateSelectionCallback ServerCertificateSelectionCallback { get; set; } + + X509Certificate ServerCertificate { get; set; } + } +} diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/IMonoSslStream.cs b/mcs/class/Mono.Security/Mono.Security.Interface/IMonoSslStream.cs index ac03e7daa7..fd8b7da41b 100644 --- a/mcs/class/Mono.Security/Mono.Security.Interface/IMonoSslStream.cs +++ b/mcs/class/Mono.Security/Mono.Security.Interface/IMonoSslStream.cs @@ -44,30 +44,42 @@ namespace Mono.Security.Interface void AuthenticateAsClient (string targetHost); + void AuthenticateAsClient (string targetHost, X509CertificateCollection clientCertificates, bool checkCertificateRevocation); + void AuthenticateAsClient (string targetHost, X509CertificateCollection clientCertificates, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation); IAsyncResult BeginAuthenticateAsClient (string targetHost, AsyncCallback asyncCallback, object asyncState); + IAsyncResult BeginAuthenticateAsClient (string targetHost, X509CertificateCollection clientCertificates, bool checkCertificateRevocation, AsyncCallback asyncCallback, object asyncState); + IAsyncResult BeginAuthenticateAsClient (string targetHost, X509CertificateCollection clientCertificates, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation, AsyncCallback asyncCallback, object asyncState); void EndAuthenticateAsClient (IAsyncResult asyncResult); void AuthenticateAsServer (X509Certificate serverCertificate); + void AuthenticateAsServer (X509Certificate serverCertificate, bool clientCertificateRequired, bool checkCertificateRevocation); + void AuthenticateAsServer (X509Certificate serverCertificate, bool clientCertificateRequired, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation); IAsyncResult BeginAuthenticateAsServer (X509Certificate serverCertificate, AsyncCallback asyncCallback, object asyncState); + IAsyncResult BeginAuthenticateAsServer (X509Certificate serverCertificate, bool clientCertificateRequired, bool checkCertificateRevocation, AsyncCallback asyncCallback, object asyncState); + IAsyncResult BeginAuthenticateAsServer (X509Certificate serverCertificate, bool clientCertificateRequired, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation, AsyncCallback asyncCallback, object asyncState); void EndAuthenticateAsServer (IAsyncResult asyncResult); Task AuthenticateAsClientAsync (string targetHost); + Task AuthenticateAsClientAsync (string targetHost, X509CertificateCollection clientCertificates, bool checkCertificateRevocation); + Task AuthenticateAsClientAsync (string targetHost, X509CertificateCollection clientCertificates, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation); Task AuthenticateAsServerAsync (X509Certificate serverCertificate); + Task AuthenticateAsServerAsync (X509Certificate serverCertificate, bool clientCertificateRequired, bool checkCertificateRevocation); + Task AuthenticateAsServerAsync (X509Certificate serverCertificate, bool clientCertificateRequired, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation); int Read (byte[] buffer, int offset, int count); @@ -196,6 +208,19 @@ namespace Mono.Security.Interface MonoTlsConnectionInfo GetConnectionInfo (); + + bool CanRenegotiate { + get; + } + + Task RenegotiateAsync (CancellationToken cancellationToken); + } + + interface IMonoSslStream2 : IMonoSslStream + { + Task AuthenticateAsClientAsync (IMonoSslClientAuthenticationOptions sslClientAuthenticationOptions, CancellationToken cancellationToken); + + Task AuthenticateAsServerAsync (IMonoSslServerAuthenticationOptions sslServerAuthenticationOptions, CancellationToken cancellationToken); } } diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsProviderFactory.cs b/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsProviderFactory.cs index 977d433fc6..5df54ac6ee 100644 --- a/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsProviderFactory.cs +++ b/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsProviderFactory.cs @@ -178,8 +178,14 @@ namespace Mono.Security.Interface * * Negative version numbers are reserved for martin work branches. * + * Version History: + * + * - 1: everything up until May 2018 + * - 2: the new ServicePointScheduler changes have landed + * - 3: full support for Client Certificates + * */ - internal const int InternalVersion = 1; + internal const int InternalVersion = 3; #endregion } diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs b/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs index ee7e216cc2..b019580315 100644 --- a/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs +++ b/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs @@ -93,6 +93,17 @@ namespace Mono.Security.Interface get; set; } + /* + * Client Certificate Support. + */ + public string[] ClientCertificateIssuers { + get; set; + } + + public bool DisallowUnauthenticatedCertificateRequest { + get; set; + } + /* * If you set this here, then it will override 'ServicePointManager.SecurityProtocol'. */ @@ -181,6 +192,8 @@ namespace Mono.Security.Interface EnabledCiphers = other.EnabledCiphers; CertificateValidationTime = other.CertificateValidationTime; SendCloseNotify = other.SendCloseNotify; + ClientCertificateIssuers = other.ClientCertificateIssuers; + DisallowUnauthenticatedCertificateRequest = other.DisallowUnauthenticatedCertificateRequest; if (other.TrustAnchors != null) TrustAnchors = new X509CertificateCollection (other.TrustAnchors); if (other.CertificateSearchPaths != null) { diff --git a/mcs/class/Mono.Security/Mono.Security.dll.sources b/mcs/class/Mono.Security/Mono.Security.dll.sources index a3572f4947..76f5e4a442 100644 --- a/mcs/class/Mono.Security/Mono.Security.dll.sources +++ b/mcs/class/Mono.Security/Mono.Security.dll.sources @@ -142,6 +142,7 @@ ./Mono.Security.Interface/CipherSuiteCode.cs ./Mono.Security.Interface/ExchangeAlgorithmType.cs ./Mono.Security.Interface/HashAlgorithmType.cs +./Mono.Security.Interface/IMonoAuthenticationOptions.cs ./Mono.Security.Interface/IMonoSslStream.cs ./Mono.Security.Interface/MonoTlsConnectionInfo.cs ./Mono.Security.Interface/MonoTlsProvider.cs diff --git a/mcs/class/Mono.Security/Mono.Security/StrongName.cs b/mcs/class/Mono.Security/Mono.Security/StrongName.cs index 3f37b750eb..b7c1f0483e 100644 --- a/mcs/class/Mono.Security/Mono.Security/StrongName.cs +++ b/mcs/class/Mono.Security/Mono.Security/StrongName.cs @@ -278,132 +278,238 @@ namespace Mono.Security { UInt32 p = BitConverterLE.ToUInt32 (headers, i * 40 + 20); UInt32 s = BitConverterLE.ToUInt32 (headers, i * 40 + 12); int l = (int) BitConverterLE.ToUInt32 (headers, i * 40 + 8); - if ((s <= r) && (r < s + l)) { + if ((s <= r) && (r < s + l)) return p + r - s; - } } return 0; } + private static StrongNameSignature Error (string a) + { + //Console.WriteLine (a); + return null; + } + + private static byte[] ReadMore (Stream stream, byte[] a, int newSize) + { + int oldSize = a.Length; + Array.Resize (ref a, newSize); + if (newSize <= oldSize) + return a; + int diff = newSize - oldSize; + return (stream.Read (a, oldSize, diff) == diff) ? a : null; + } + internal StrongNameSignature StrongHash (Stream stream, StrongNameOptions options) { - StrongNameSignature info = new StrongNameSignature (); - - HashAlgorithm hash = HashAlgorithm.Create (TokenAlgorithm); - CryptoStream cs = new CryptoStream (Stream.Null, hash, CryptoStreamMode.Write); - - // MS-DOS Header - always 128 bytes + // Bing "msdn pecoff". + // https://msdn.microsoft.com/en-us/library/windows/desktop/ms680547(v=vs.85).aspx + // Very many of the magic constants and names, funny or otherwise, come from this. // ref: Section 24.2.1, Partition II Metadata - byte[] mz = new byte [128]; - stream.Read (mz, 0, 128); - if (BitConverterLE.ToUInt16 (mz, 0) != 0x5a4d) - return null; - UInt32 peHeader = BitConverterLE.ToUInt32 (mz, 60); - cs.Write (mz, 0, 128); - if (peHeader != 128) { - byte[] mzextra = new byte [peHeader - 128]; - stream.Read (mzextra, 0, mzextra.Length); - cs.Write (mzextra, 0, mzextra.Length); - } - - // PE File Header - always 248 bytes // ref: Section 24.2.2, Partition II Metadata - byte[] pe = new byte [248]; - stream.Read (pe, 0, 248); - if (BitConverterLE.ToUInt32 (pe, 0) != 0x4550) - return null; - if (BitConverterLE.ToUInt16 (pe, 4) != 0x14c) - return null; - // MUST zeroize both CheckSum and Security Directory - byte[] v = new byte [8]; - Buffer.BlockCopy (v, 0, pe, 88, 4); - Buffer.BlockCopy (v, 0, pe, 152, 8); - cs.Write (pe, 0, 248); - - UInt16 numSection = BitConverterLE.ToUInt16 (pe, 6); - int sectionLength = (numSection * 40); - byte[] sectionHeaders = new byte [sectionLength]; - stream.Read (sectionHeaders, 0, sectionLength); - cs.Write (sectionHeaders, 0, sectionLength); - - UInt32 cliHeaderRVA = BitConverterLE.ToUInt32 (pe, 232); - UInt32 cliHeaderPos = RVAtoPosition (cliHeaderRVA, numSection, sectionHeaders); - int cliHeaderSiz = (int) BitConverterLE.ToUInt32 (pe, 236); - - // CLI Header // ref: Section 24.3.3, Partition II Metadata - byte[] cli = new byte [cliHeaderSiz]; - stream.Position = cliHeaderPos; - stream.Read (cli, 0, cliHeaderSiz); - UInt32 strongNameSignatureRVA = BitConverterLE.ToUInt32 (cli, 32); - info.SignaturePosition = RVAtoPosition (strongNameSignatureRVA, numSection, sectionHeaders); - info.SignatureLength = BitConverterLE.ToUInt32 (cli, 36); + // Read MS-DOS header. - UInt32 metadataRVA = BitConverterLE.ToUInt32 (cli, 8); - info.MetadataPosition = RVAtoPosition (metadataRVA, numSection, sectionHeaders); - info.MetadataLength = BitConverterLE.ToUInt32 (cli, 12); + const int mzSize = 64; + byte[] mz = new byte [mzSize]; - if (options == StrongNameOptions.Metadata) { - cs.Close (); - hash.Initialize (); - byte[] metadata = new byte [info.MetadataLength]; - stream.Position = info.MetadataPosition; - stream.Read (metadata, 0, metadata.Length); - info.Hash = hash.ComputeHash (metadata); - return info; + int peHeader = 0; + int mzRead = stream.Read (mz, 0, mzSize); + + if (mzRead == mzSize && mz [0] == (byte)'M' && mz [1] == (byte)'Z') { // 0x5a4d + peHeader = BitConverterLE.ToInt32 (mz, 60); + if (peHeader < mzSize) + return Error ("peHeader_lt_64"); + + // Read MS-DOS stub. + + mz = ReadMore (stream, mz, peHeader); + if (mz == null) + return Error ("read_mz2_failed"); + } else if (mzRead >= 4 && mz [0] == (byte)'P' && mz [1] == (byte)'E' && mz [2] == 0 && mz [3] == 0) { // 0x4550 + // MS-DOS header/stub can be omitted and just start with PE, though it is rare. + stream.Position = 0; + mz = new byte [0]; + } else + return Error ("read_mz_or_mzsig_failed"); + + // PE File Header + // PE signature 4 bytes + // file header 20 bytes (really, at this point) + // optional header varies in size and its size is in the file header + // "optional" means "not in .obj files", but always in .dll/.exes + + const int sizeOfPeSignature = 4; + const int sizeOfFileHeader = 20; + const int sizeOfOptionalHeaderMagic = 2; + const int offsetOfFileHeader = sizeOfPeSignature; + const int offsetOfOptionalHeader = sizeOfPeSignature + sizeOfFileHeader; + int sizeOfOptionalHeader = sizeOfOptionalHeaderMagic; // initial minimum + int minimumHeadersSize = offsetOfOptionalHeader + sizeOfOptionalHeader; + byte[] pe = new byte [minimumHeadersSize]; + if (stream.Read (pe, 0, minimumHeadersSize) != minimumHeadersSize + || pe [0] != (byte)'P' || pe [1] != (byte)'E' || pe [2] != 0 || pe [3] != 0) // 0x4550 + return Error ("read_minimumHeadersSize_or_pesig_failed"); + + sizeOfOptionalHeader = BitConverterLE.ToUInt16 (pe, offsetOfFileHeader + 16); + if (sizeOfOptionalHeader < sizeOfOptionalHeaderMagic) + return Error ($"sizeOfOptionalHeader_lt_2 ${sizeOfOptionalHeader}"); + + int headersSize = offsetOfOptionalHeader + sizeOfOptionalHeader; + if (headersSize < offsetOfOptionalHeader) // check overflow + return Error ("headers_overflow"); + + // Read the rest of the NT headers (i.e. the rest of the optional header). + + pe = ReadMore (stream, pe, headersSize); + if (pe == null) + return Error ("read_pe2_failed"); + + uint magic = BitConverterLE.ToUInt16 (pe, offsetOfOptionalHeader); + + // Refer to PE32+ as PE64 for brevity. + // PE64 proposal that widened more fields was rejected. + // Between PE32 and PE32+: + // Some fields are the same size and offset. For example the entire + // MS-DOS header, FileHeader, and section headers, and some of the optional header. + // Some fields are PE32-only (BaseOfData). + // Some fields are constant size, some are pointer size. + // Relative virtual addresses and file offsets are always 4 bytes. + // Some fields offsets are offset by 4, 8, or 12, but mostly 0 or 16, + // and it so happens that the 4/8/12-offset fields are less interesting. + int pe64 = 0; + bool rom = false; + if (magic == 0x10B) { + // nothing + } else if (magic == 0x20B) + pe64 = 16; + else if (magic == 0x107) + rom = true; + else + return Error ("bad_magic_value"); + + uint numberOfRvaAndSizes = 0; + + if (!rom) { // ROM images have no data directories or checksum. + if (sizeOfOptionalHeader >= offsetOfOptionalHeader + 92 + pe64 + 4) + numberOfRvaAndSizes = BitConverterLE.ToUInt32 (pe, offsetOfOptionalHeader + 92 + pe64); + + // Clear CheckSum and Security Directory if present. + // CheckSum is located the same for PE32+, all data directories are not. + + for (int i = 64; i < sizeOfOptionalHeader && i < 68; ++i) + pe [offsetOfOptionalHeader + i] = 0; + + for (int i = 128 + pe64; i < sizeOfOptionalHeader && i < 128 + 8 + pe64; ++i) + pe [offsetOfOptionalHeader + i] = 0; } - // now we hash every section EXCEPT the signature block - for (int i=0; i < numSection; i++) { - UInt32 start = BitConverterLE.ToUInt32 (sectionHeaders, i * 40 + 20); - int length = (int) BitConverterLE.ToUInt32 (sectionHeaders, i * 40 + 16); - byte[] section = new byte [length]; - stream.Position = start; - stream.Read (section, 0, length); - if ((start <= info.SignaturePosition) && (info.SignaturePosition < start + length)) { - // hash before the signature - int before = (int)(info.SignaturePosition - start); - if (before > 0) { - cs.Write (section, 0, before); - } - // copy signature - info.Signature = new byte [info.SignatureLength]; - Buffer.BlockCopy (section, before, info.Signature, 0, (int)info.SignatureLength); - Array.Reverse (info.Signature); - // hash after the signature - int s = (int)(before + info.SignatureLength); - int after = (int)(length - s); - if (after > 0) { - cs.Write (section, s, after); + // Read the section headers if present (an image can have no sections, just headers). + + const int sizeOfSectionHeader = 40; + int numberOfSections = BitConverterLE.ToUInt16 (pe, offsetOfFileHeader + 2); + byte[] sectionHeaders = new byte [numberOfSections * sizeOfSectionHeader]; + if (stream.Read (sectionHeaders, 0, sectionHeaders.Length) != sectionHeaders.Length) + return Error ("read_section_headers_failed"); + + // Read the CLR header if present. + + uint SignaturePosition = 0; + uint SignatureLength = 0; + uint MetadataPosition = 0; + uint MetadataLength = 0; + + if (15 < numberOfRvaAndSizes && sizeOfOptionalHeader >= 216 + pe64) { + uint cliHeaderRVA = BitConverterLE.ToUInt32 (pe, offsetOfOptionalHeader + 208 + pe64); + uint cliHeaderPos = RVAtoPosition (cliHeaderRVA, numberOfSections, sectionHeaders); + int cliHeaderSiz = BitConverterLE.ToInt32 (pe, offsetOfOptionalHeader + 208 + 4 + pe64); + + // CLI Header + // ref: Section 24.3.3, Partition II Metadata + var cli = new byte [cliHeaderSiz]; + stream.Position = cliHeaderPos; + if (stream.Read (cli, 0, cliHeaderSiz) != cliHeaderSiz) + return Error ("read_cli_header_failed"); + + uint strongNameSignatureRVA = BitConverterLE.ToUInt32 (cli, 32); + SignaturePosition = RVAtoPosition (strongNameSignatureRVA, numberOfSections, sectionHeaders); + SignatureLength = BitConverterLE.ToUInt32 (cli, 36); + + uint metadataRVA = BitConverterLE.ToUInt32 (cli, 8); + MetadataPosition = RVAtoPosition (metadataRVA, numberOfSections, sectionHeaders); + MetadataLength = BitConverterLE.ToUInt32 (cli, 12); + } + + StrongNameSignature info = new StrongNameSignature (); + info.SignaturePosition = SignaturePosition; + info.SignatureLength = SignatureLength; + info.MetadataPosition = MetadataPosition; + info.MetadataLength = MetadataLength; + + using (HashAlgorithm hash = HashAlgorithm.Create (TokenAlgorithm)) { + if (options == StrongNameOptions.Metadata) { + hash.Initialize (); + byte[] metadata = new byte [MetadataLength]; + stream.Position = MetadataPosition; + if (stream.Read (metadata, 0, (int)MetadataLength) != (int)MetadataLength) + return Error ("read_cli_metadata_failed"); + info.Hash = hash.ComputeHash (metadata); + return info; + } + + using (CryptoStream cs = new CryptoStream (Stream.Null, hash, CryptoStreamMode.Write)) { + cs.Write (mz, 0, mz.Length); // Hash MS-DOS header/stub despite that stub is not run. + cs.Write (pe, 0, pe.Length); + cs.Write (sectionHeaders, 0, sectionHeaders.Length); + + // now we hash every section EXCEPT the signature block + for (int i=0; i < numberOfSections; i++) { + UInt32 start = BitConverterLE.ToUInt32 (sectionHeaders, i * sizeOfSectionHeader + 20); + int length = BitConverterLE.ToInt32 (sectionHeaders, i * sizeOfSectionHeader + 16); + byte[] section = new byte [length]; + stream.Position = start; + if (stream.Read (section, 0, length) != length) + return Error ("read_section_failed"); + // The signature is assumed not to straddle sections. + if ((start <= SignaturePosition) && (SignaturePosition < start + (uint)length)) { + // hash before the signature + int before = (int)(SignaturePosition - start); + if (before > 0) + cs.Write (section, 0, before); + + // copy signature + info.Signature = new byte [SignatureLength]; + Buffer.BlockCopy (section, before, info.Signature, 0, (int)SignatureLength); + Array.Reverse (info.Signature); + // hash after the signature + int s = (int)(before + SignatureLength); + int after = (int)(length - s); + if (after > 0) + cs.Write (section, s, after); + } + else + cs.Write (section, 0, length); } } - else - cs.Write (section, 0, length); + info.Hash = hash.Hash; } - - cs.Close (); - info.Hash = hash.Hash; return info; } // return the same result as the undocumented and unmanaged GetHashFromAssemblyFile public byte[] Hash (string fileName) { - FileStream fs = File.OpenRead (fileName); - StrongNameSignature sn = StrongHash (fs, StrongNameOptions.Metadata); - fs.Close (); - - return sn.Hash; + using (FileStream fs = File.OpenRead (fileName)) { + return StrongHash (fs, StrongNameOptions.Metadata).Hash; + } } public bool Sign (string fileName) { - bool result = false; StrongNameSignature sn; using (FileStream fs = File.OpenRead (fileName)) { sn = StrongHash (fs, StrongNameOptions.Signature); - fs.Close (); } if (sn.Hash == null) return false; @@ -422,28 +528,22 @@ namespace Mono.Security { using (FileStream fs = File.OpenWrite (fileName)) { fs.Position = sn.SignaturePosition; fs.Write (signature, 0, signature.Length); - fs.Close (); - result = true; } - return result; + return true; } public bool Verify (string fileName) { - bool result = false; using (FileStream fs = File.OpenRead (fileName)) { - result = Verify (fs); - fs.Close (); + return Verify (fs); } - return result; } public bool Verify (Stream stream) { StrongNameSignature sn = StrongHash (stream, StrongNameOptions.Signature); - if (sn.Hash == null) { + if (sn.Hash == null) return false; - } try { AssemblyHashAlgorithm algorithm = AssemblyHashAlgorithm.SHA1; @@ -482,23 +582,20 @@ namespace Mono.Security { return false; byte[] publicKey = StrongNameManager.GetMappedPublicKey (an.GetPublicKeyToken ()); - if ((publicKey == null) || (publicKey.Length < 12)) { + if (publicKey == null || publicKey.Length < 12) { // no mapping publicKey = an.GetPublicKey (); - if ((publicKey == null) || (publicKey.Length < 12)) + if (publicKey == null || publicKey.Length < 12) return false; } // Note: MustVerify is based on the original token (by design). Public key // remapping won't affect if the assembly is verified or not. - if (!StrongNameManager.MustVerify (an)) { + if (!StrongNameManager.MustVerify (an)) return true; - } RSA rsa = CryptoConvert.FromCapiPublicKeyBlob (publicKey, 12); - StrongName sn = new StrongName (rsa); - bool result = sn.Verify (assemblyName); - return result; + return new StrongName (rsa).Verify (assemblyName); } catch { // no exception allowed diff --git a/mcs/class/System.ComponentModel.Composition.4.5/Makefile b/mcs/class/System.ComponentModel.Composition.4.5/Makefile index 2ced9882da..669d96cb24 100644 --- a/mcs/class/System.ComponentModel.Composition.4.5/Makefile +++ b/mcs/class/System.ComponentModel.Composition.4.5/Makefile @@ -13,6 +13,11 @@ endif KEYFILE = ../ecma.pub LIB_MCS_FLAGS = -d:CLR40 -d:USE_ECMA_KEY,FEATURE_REFLECTIONCONTEXT,FEATURE_REFLECTIONFILEIO,FEATURE_SERIALIZATION,FEATURE_SLIMLOCK -nowarn:219,414 -nowarn:436 +XTEST_LIB_REFS = System System.Core System.Xml Facades/System.Threading.Tasks +XTEST_LIB_FLAGS := /keyfile:../mono.snk + +RESX_RESOURCE_STRING = \ + ../../../external/corefx/src/System.ComponentModel.Composition/src/Resources/Strings.resx CLEAN_FILES += $(STRING_MESSAGES) diff --git a/mcs/class/System.ComponentModel.Composition.4.5/src/Assembly/AssemblyInfo.cs b/mcs/class/System.ComponentModel.Composition.4.5/src/Assembly/AssemblyInfo.cs index 85e91c4f56..73dede5ffb 100644 --- a/mcs/class/System.ComponentModel.Composition.4.5/src/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.ComponentModel.Composition.4.5/src/Assembly/AssemblyInfo.cs @@ -54,6 +54,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyDelaySign (true)] +[assembly: InternalsVisibleTo ("net_4_x_System.ComponentModel.Composition_xunit-test, PublicKey=002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df")] [assembly: SecurityCritical] [assembly: AllowPartiallyTrustedCallers] [assembly: ComVisible (false)] diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/RangeAttributeTest.cs b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/RangeAttributeTest.cs index d16174fd89..7d2d057752 100644 --- a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/RangeAttributeTest.cs +++ b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/RangeAttributeTest.cs @@ -129,18 +129,18 @@ namespace MonoTests.System.ComponentModel.DataAnnotations Assert.IsFalse (attr.IsValid ("12"), "#A1-2"); Assert.IsTrue (attr.IsValid (null), "#A1-3"); Assert.IsTrue (attr.IsValid (String.Empty), "#A1-4"); - Assert.Throws (() => { + Assert.Throws (() => { attr.IsValid ("zero"); }, "#A1-5"); Assert.IsTrue (attr.IsValid (null), "#A1-6"); attr = new DA.RangeAttribute (typeof (int), "minus ten", "ten"); - Assert.Throws (() => { + Assert.Throws (() => { attr.IsValid ("0"); }, "#A2-1"); - Assert.Throws (() => { + Assert.Throws (() => { attr.IsValid ("12"); }, "#A2-2"); - Assert.Throws (() => { + Assert.Throws (() => { attr.IsValid ("zero"); }, "#A2-3"); diff --git a/mcs/class/System.Core/System.Core_test.dll.sources b/mcs/class/System.Core/System.Core_test.dll.sources index 2ecd0f1123..31d7818d0e 100644 --- a/mcs/class/System.Core/System.Core_test.dll.sources +++ b/mcs/class/System.Core/System.Core_test.dll.sources @@ -1,3 +1,4 @@ +../../test-helpers/NunitHelpers.cs System.Collections.Generic/HashSetTest.cs System.IO.MemoryMappedFiles/MemoryMappedFileTest.cs System.IO.Pipes/PipeSecurityTest.cs @@ -66,6 +67,7 @@ System.Threading/ReaderWriterLockSlimTest.cs ../../corlib/Test/System.Security.Cryptography/SHA256TestBase.cs ../../corlib/Test/System.Security.Cryptography/SHA384TestBase.cs ../../corlib/Test/System.Security.Cryptography/SHA512TestBase.cs +System.Security.Cryptography/X509Certificate2ExtensionsTests.cs System.Security.Cryptography/AesCryptoServiceProviderTest.cs System.Security.Cryptography/AesManagedTest.cs System.Security.Cryptography/CngAlgorithmTest.cs diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Coalesce.cs b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Coalesce.cs index 2ab978d518..452b7c58d6 100644 --- a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Coalesce.cs +++ b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Coalesce.cs @@ -133,6 +133,7 @@ namespace MonoTests.System.Linq.Expressions [Test] [Category ("NotDotNet")] // https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=349822 + [Category ("NotWorkingRuntimeInterpreter")] public void CoalesceUserDefinedConversion () { var s = Expression.Parameter (typeof (string), "s"); diff --git a/mcs/class/System.Core/Test/System.Linq/EnumerableAsQueryableTest.cs b/mcs/class/System.Core/Test/System.Linq/EnumerableAsQueryableTest.cs index aee3bff9ee..9b24f2a9fd 100644 --- a/mcs/class/System.Core/Test/System.Linq/EnumerableAsQueryableTest.cs +++ b/mcs/class/System.Core/Test/System.Linq/EnumerableAsQueryableTest.cs @@ -239,6 +239,7 @@ namespace MonoTests.System.Linq { } [Test] + [Category ("NotWorkingRuntimeInterpreter")] public void SelectMany () { int [] arr1 = _array.SelectMany ((n) => new int [] { n, n, n }).ToArray (); diff --git a/mcs/class/System.Core/Test/System.Linq/ParallelEnumerableTests.cs b/mcs/class/System.Core/Test/System.Linq/ParallelEnumerableTests.cs index 5d76629eda..e3dab3c50d 100644 --- a/mcs/class/System.Core/Test/System.Linq/ParallelEnumerableTests.cs +++ b/mcs/class/System.Core/Test/System.Linq/ParallelEnumerableTests.cs @@ -364,6 +364,7 @@ namespace MonoTests.System.Linq } [Test] + [Category ("NotWorkingRuntimeInterpreter")] public void SelectManyOrderedTest () { IEnumerable initial = Enumerable.Range (1, 50); diff --git a/mcs/class/System.Core/Test/System.Security.Cryptography/X509Certificate2ExtensionsTests.cs b/mcs/class/System.Core/Test/System.Security.Cryptography/X509Certificate2ExtensionsTests.cs new file mode 100644 index 0000000000..55f6a4836f --- /dev/null +++ b/mcs/class/System.Core/Test/System.Security.Cryptography/X509Certificate2ExtensionsTests.cs @@ -0,0 +1,44 @@ +using System; +using System.Linq; +using System.Security.Cryptography; +using System.Security.Cryptography.X509Certificates; + +using NUnit.Framework; + +namespace MonoTests.System.Security.Cryptography +{ + [TestFixture] + public class X509Certificate2ExtensionsTests + { + static byte[] selfSignedCertData = { 48,130,10,73,2,1,3,48,130,10,5,6,9,42,134,72,134,247,13,1,7,1,160,130,9,246,4,130,9,242,48,130,9,238,48,130,6,7,6,9,42,134,72,134,247,13,1,7,1,160,130,5,248,4,130,5,244,48,130,5,240,48,130,5,236,6,11,42,134,72,134,247,13,1,12,10,1,2,160,130,4,246,48,130,4,242,48,28,6,10,42,134,72,134,247,13,1,12,1,3,48,14,4,8,183,24,178,64,55,187,89,192,2,2,7,208,4,130,4,208,85,96,57,23,163,136,131,116,70,109,5,14,149,108,104,0,10,33,156,192,186,217,74,35,181,5,143,106,201,127,16,78,231,237,3,15,217,6,92,63,162,172,254,45,66,23,162,53,227,223,129,181,51,204,237,16,236,138,241,198,11,33,88,119,177,201,149,114,170,37,23,194,221,85,102,157,172,211,78,4,217,88,120,213,140,142,202,233,8,48,48,46,173,29,23,194,39,143,114,66,29,17,210,0,138,20,236,35,125,110,38,190,22,249,147,196,245,117,10,141,122,98,35,93,35,28,128,39,52,45,38,116,176,160,91,247,142,54,5,178,106,154,35,5,69,84,99,13,190,58,208,194,128,176,20,14,43,113,165,110,88,189,240,164,7,77,95,8,20,165,59,159,48,31,159,237,177,194,12,69,7,222,149,191,59,16,184,227,76,16,225,147,236,129,240,144,252,163,222,226,133,243,8,97,201,79,149,119,181,22,71,233,55,224,2,116,63,126,50,58,224,83,46,216,64,34,2,64,215,20,198,253,83,66,59,224,169,231,95,117,56,134,152,147,147,62,244,39,96,245,131,122,199,167,222,59,218,225,176,78,115,235,127,44,162,188,207,57,152,226,134,218,36,34,66,30,18,217,50,118,129,13,94,85,202,123,181,66,60,124,89,115,249,133,42,82,200,61,48,248,194,140,195,113,72,15,211,1,230,31,24,106,126,157,193,114,244,28,177,100,199,58,194,15,225,206,216,121,108,95,166,106,232,216,157,238,206,211,66,200,117,180,113,118,180,63,133,172,151,84,143,97,28,105,46,226,75,194,180,193,194,78,201,211,9,79,212,226,212,200,102,76,128,215,209,146,73,47,175,250,139,20,98,64,220,164,180,117,26,141,45,169,98,200,223,78,11,38,8,105,192,110,190,183,40,65,184,194,24,12,9,233,36,115,107,71,175,110,77,126,230,19,101,136,180,145,58,126,231,154,91,201,83,155,194,215,12,188,97,35,134,169,91,220,9,80,156,157,62,230,246,214,216,242,49,227,14,24,67,68,179,80,125,52,153,236,40,196,10,217,181,188,247,118,150,196,181,111,215,128,87,91,7,202,22,37,172,103,217,255,37,117,208,9,246,174,204,105,176,1,9,42,191,204,183,101,5,90,155,230,188,227,226,250,65,186,119,5,5,23,153,242,0,99,234,51,61,31,14,58,151,175,86,44,247,40,231,226,92,43,59,69,66,207,167,37,106,32,181,150,54,107,168,55,121,164,41,195,74,43,220,173,218,180,7,38,250,237,200,135,51,249,231,201,208,179,12,151,127,23,228,218,89,19,132,154,173,71,72,34,174,19,139,231,2,207,202,32,171,152,27,3,207,218,72,200,102,135,86,178,80,6,187,56,156,57,213,160,33,205,209,81,199,89,79,168,254,139,72,202,9,91,132,216,89,29,152,113,145,230,129,3,211,145,130,164,112,229,103,36,112,71,67,241,8,96,170,30,0,198,68,130,101,20,2,227,55,206,127,138,42,36,87,66,117,175,21,16,234,121,64,169,236,199,61,63,16,184,202,190,189,124,6,127,228,215,167,127,240,111,29,58,105,42,56,244,206,169,0,73,110,143,109,182,200,248,199,86,243,158,237,92,139,126,196,14,0,162,82,46,157,12,120,135,25,28,116,233,162,250,24,173,164,86,15,172,138,13,67,209,243,35,126,117,136,229,181,37,99,78,8,224,253,57,102,169,77,174,69,46,253,70,248,190,196,248,113,222,240,82,71,60,155,86,64,127,61,28,90,87,173,247,199,67,16,200,155,23,81,40,87,157,76,72,117,159,163,35,218,117,19,76,55,153,179,164,158,204,170,103,41,148,126,190,210,229,162,240,50,101,192,201,109,157,255,65,4,173,50,181,157,178,241,245,85,41,223,84,146,133,184,201,14,155,175,40,123,136,253,10,197,153,183,161,28,74,36,91,223,8,206,95,147,53,187,84,73,151,66,66,24,11,224,23,171,12,190,165,205,183,228,197,131,170,153,43,39,123,18,164,182,108,12,11,36,49,216,86,110,202,173,188,19,26,211,172,119,151,246,76,121,52,168,214,24,70,249,239,184,93,128,135,7,243,97,216,7,168,159,103,3,82,100,120,26,91,144,154,213,234,234,199,142,134,82,108,25,161,149,56,128,65,136,9,136,35,20,15,254,228,210,207,104,152,78,245,97,75,167,187,52,243,77,104,242,89,117,145,153,206,148,167,72,254,154,86,132,164,231,178,35,149,122,186,40,223,144,134,39,231,35,205,133,15,67,90,58,31,163,189,8,132,97,55,215,62,225,205,207,211,141,221,146,247,19,118,52,85,124,80,208,61,72,115,243,185,123,179,97,151,172,146,65,149,208,46,13,187,211,21,172,82,232,221,200,129,15,160,157,189,59,215,4,70,159,203,162,228,37,213,47,126,163,137,91,107,253,242,247,169,121,16,55,182,32,197,3,155,185,253,87,97,166,151,77,161,71,238,50,252,182,186,62,4,101,213,153,209,124,237,34,101,117,247,46,140,30,3,195,227,187,63,32,20,224,85,224,6,140,31,14,173,228,131,161,92,47,64,7,250,181,149,90,93,55,186,227,159,222,188,2,87,49,230,2,136,208,239,182,66,148,255,231,77,52,19,173,180,134,3,143,142,172,140,243,59,39,238,34,111,18,110,234,185,102,222,2,170,225,129,86,24,159,79,229,203,53,86,243,59,130,253,187,151,0,61,159,153,72,192,149,58,174,116,109,157,188,247,142,213,222,98,49,129,226,48,13,6,9,43,6,1,4,1,130,55,17,2,49,0,48,19,6,9,42,134,72,134,247,13,1,9,21,49,6,4,4,1,0,0,0,48,93,6,9,42,134,72,134,247,13,1,9,20,49,80,30,78,0,116,0,101,0,45,0,53,0,57,0,50,0,48,0,56,0,51,0,50,0,100,0,45,0,50,0,50,0,98,0,57,0,45,0,52,0,98,0,48,0,54,0,45,0,56,0,57,0,50,0,54,0,45,0,102,0,97,0,98,0,56,0,51,0,52,0,99,0,49,0,55,0,51,0,57,0,55,48,93,6,9,43,6,1,4,1,130,55,17,1,49,80,30,78,0,77,0,105,0,99,0,114,0,111,0,115,0,111,0,102,0,116,0,32,0,83,0,111,0,102,0,116,0,119,0,97,0,114,0,101,0,32,0,75,0,101,0,121,0,32,0,83,0,116,0,111,0,114,0,97,0,103,0,101,0,32,0,80,0,114,0,111,0,118,0,105,0,100,0,101,0,114,48,130,3,223,6,9,42,134,72,134,247,13,1,7,6,160,130,3,208,48,130,3,204,2,1,0,48,130,3,197,6,9,42,134,72,134,247,13,1,7,1,48,28,6,10,42,134,72,134,247,13,1,12,1,3,48,14,4,8,214,81,167,28,241,31,30,206,2,2,7,208,128,130,3,152,253,185,228,156,166,74,70,154,36,22,89,54,196,161,168,68,62,230,221,254,51,153,72,247,108,10,115,58,196,238,45,66,44,45,40,231,102,43,166,8,67,139,141,126,30,106,239,246,16,31,10,95,21,162,226,130,141,183,224,79,232,249,115,88,154,165,44,116,237,236,112,184,134,137,140,228,119,11,5,69,53,203,227,94,60,164,75,192,47,177,1,175,223,49,141,203,255,34,109,231,136,14,241,52,130,179,15,226,243,210,16,204,253,193,131,220,164,93,134,100,129,5,191,250,1,161,25,9,200,128,20,130,145,53,23,140,107,86,58,129,223,173,156,72,78,113,160,146,65,177,224,12,186,209,181,198,56,63,72,38,81,217,194,45,135,4,84,182,137,117,118,133,241,84,253,253,33,53,175,3,60,174,47,36,145,43,91,101,43,168,132,237,126,202,200,116,3,106,77,21,77,60,17,45,240,207,102,25,24,210,74,79,171,203,89,99,171,46,7,133,91,16,182,238,3,93,224,65,24,226,17,151,152,94,98,125,148,5,220,104,9,100,134,230,99,77,29,210,223,221,59,10,19,103,249,19,163,83,89,111,132,98,80,15,44,244,97,211,151,87,68,22,113,244,121,74,50,26,208,227,234,58,182,238,178,114,196,232,151,232,84,162,130,246,33,213,85,21,122,233,68,173,20,33,95,135,159,211,172,50,45,198,42,170,223,202,45,155,169,120,205,151,190,150,74,121,32,242,73,31,111,46,98,199,23,159,169,58,69,57,222,149,242,95,181,232,24,135,47,7,220,147,52,61,56,116,169,204,169,240,230,145,6,17,23,88,119,245,184,206,27,28,139,84,157,93,100,222,235,1,19,82,13,144,73,127,217,22,217,183,79,28,249,144,63,4,198,177,219,204,5,52,118,158,73,32,53,187,2,138,255,64,74,19,44,226,9,7,123,9,145,34,210,0,22,57,230,96,172,81,206,131,32,45,153,69,192,25,75,157,38,18,205,119,99,163,196,216,142,105,192,121,28,23,161,198,83,5,178,65,168,213,138,197,166,89,124,88,110,90,213,73,123,19,52,67,70,25,180,191,164,120,248,103,116,99,106,34,78,228,55,99,96,47,56,76,239,47,170,103,30,16,118,86,194,73,213,229,164,112,168,248,153,164,187,102,185,251,221,167,139,231,198,119,223,251,47,82,197,23,52,11,42,245,167,223,100,26,95,223,140,131,37,108,4,6,37,54,194,202,54,89,200,36,31,81,9,157,62,112,215,229,244,105,114,121,27,89,35,16,101,242,68,124,244,149,42,202,61,193,7,52,67,134,239,74,59,130,223,88,42,254,187,86,247,206,1,217,26,223,202,167,199,31,77,23,143,99,139,68,142,161,233,30,123,212,73,17,212,62,42,215,144,174,167,242,235,159,83,243,205,24,103,237,210,198,96,151,249,19,162,102,100,3,110,157,63,113,220,3,118,174,130,212,71,108,165,34,170,206,31,240,211,56,243,103,88,109,50,233,71,46,110,232,208,140,210,30,173,148,115,168,125,74,203,28,140,73,69,186,79,181,234,236,74,55,133,118,246,58,21,246,89,120,212,166,129,182,228,193,78,230,114,168,181,63,164,85,68,86,92,154,244,103,240,244,126,115,134,194,78,211,162,149,74,248,225,182,210,21,15,11,20,37,101,107,96,65,190,194,18,56,42,171,50,191,189,75,175,40,92,154,114,161,177,252,114,89,180,119,143,70,125,187,54,4,30,121,179,67,136,197,14,219,172,185,68,226,167,2,221,10,16,44,0,234,116,70,146,117,132,165,113,146,249,221,126,56,111,168,137,136,54,9,30,86,140,180,150,103,232,208,125,153,192,152,59,173,107,30,122,39,117,217,85,81,62,152,16,63,129,45,96,16,213,137,213,199,37,124,197,199,102,66,188,92,232,142,170,52,61,82,224,227,162,41,252,156,116,196,161,113,126,64,234,207,89,5,146,21,18,147,234,22,244,66,242,131,23,3,105,44,43,178,47,242,110,19,242,101,6,91,121,157,9,59,245,12,234,65,125,103,244,213,114,131,177,18,76,188,48,59,48,31,48,7,6,5,43,14,3,2,26,4,20,47,103,153,234,19,89,118,152,198,100,80,184,21,42,139,82,249,121,221,73,4,20,197,190,54,187,203,64,251,171,142,28,173,106,125,51,50,31,184,10,167,38,2,2,7,208 }; + + [Test] + public void PublicKeyIsReusable() + { + var cert = new X509Certificate2 (selfSignedCertData, "MonoTemp123"); + var src = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 }; + var padding = RSAEncryptionPadding.Pkcs1; + byte[] encrypted1 = EncryptData (cert, src, padding); + byte[] encrypted2 = EncryptData (cert, src, padding); + + RSA privateKey = cert.GetRSAPrivateKey (); + byte[] decrypted1 = DecryptData (cert, encrypted1, padding); + byte[] decrypted2 = DecryptData (cert, encrypted2, padding); + + CollectionAssert.AreEqual (src, decrypted1); + CollectionAssert.AreEqual (src, decrypted2); + } + + static byte[] EncryptData(X509Certificate2 cert, byte[] data, RSAEncryptionPadding padding) + { + using (RSA rsa = cert.GetRSAPublicKey ()) + return rsa.Encrypt (data, padding); + } + + static byte[] DecryptData(X509Certificate2 cert, byte[] data, RSAEncryptionPadding padding) + { + using (RSA rsa = cert.GetRSAPrivateKey ()) + return rsa.Decrypt (data, padding); + } + } +} \ No newline at end of file diff --git a/mcs/class/System.Core/corefx/SR.missing.cs b/mcs/class/System.Core/corefx/SR.missing.cs index f8f2e491a8..24480c6eca 100644 --- a/mcs/class/System.Core/corefx/SR.missing.cs +++ b/mcs/class/System.Core/corefx/SR.missing.cs @@ -1,4 +1,5 @@ partial class SR { public const string MethodBuilderDoesNotHaveTypeBuilder = "MethodBuilder does not have a valid TypeBuilder"; + public const string InvalidOperation_ConcurrentOperationsNotSupported = "Operations that change non-concurrent collections must have exclusive access. A concurrent update was performed on this collection and corrupted its state. The collection's state is no longer correct."; } \ No newline at end of file diff --git a/mcs/class/System.Data.Services/System.Data.Services.dll.sources b/mcs/class/System.Data.Services/System.Data.Services.dll.sources index 8d9d167814..4ac60877e5 100644 --- a/mcs/class/System.Data.Services/System.Data.Services.dll.sources +++ b/mcs/class/System.Data.Services/System.Data.Services.dll.sources @@ -3,29 +3,29 @@ ../../build/common/Locale.cs ../../build/common/MonoTODOAttribute.cs -./System.Data.Services/ChangeInterceptorAttribute.cs -./System.Data.Services/DataService.cs -./System.Data.Services/DataServiceException.cs -./System.Data.Services/DataServiceHost.cs -./System.Data.Services/DataServiceHostFactory.cs -./System.Data.Services/EntitySetRights.cs -./System.Data.Services/ETagAttribute.cs -./System.Data.Services/ExpandSegmentCollection.cs -./System.Data.Services/ExpandSegment.cs -./System.Data.Services/HandleExceptionArgs.cs -./System.Data.Services/IDataServiceConfiguration.cs -./System.Data.Services/IDataServiceHost.cs -./System.Data.Services/IExpandedResult.cs -./System.Data.Services/IExpandProvider.cs -./System.Data.Services/IgnorePropertiesAttribute.cs -./System.Data.Services/IRequestHandler.cs -./System.Data.Services/IUpdatable.cs -./System.Data.Services/MimeTypeAttribute.cs -./System.Data.Services/ProcessRequestArgs.cs -./System.Data.Services/QueryInterceptorAttribute.cs -./System.Data.Services/ServiceOperationRights.cs -./System.Data.Services/SingleResultAttribute.cs -./System.Data.Services/UpdateOperations.cs +System.Data.Services/ChangeInterceptorAttribute.cs +System.Data.Services/DataService.cs +System.Data.Services/DataServiceException.cs +System.Data.Services/DataServiceHost.cs +System.Data.Services/DataServiceHostFactory.cs +System.Data.Services/EntitySetRights.cs +System.Data.Services/ETagAttribute.cs +System.Data.Services/ExpandSegmentCollection.cs +System.Data.Services/ExpandSegment.cs +System.Data.Services/HandleExceptionArgs.cs +System.Data.Services/IDataServiceConfiguration.cs +System.Data.Services/IDataServiceHost.cs +System.Data.Services/IExpandedResult.cs +System.Data.Services/IExpandProvider.cs +System.Data.Services/IgnorePropertiesAttribute.cs +System.Data.Services/IRequestHandler.cs +System.Data.Services/IUpdatable.cs +System.Data.Services/MimeTypeAttribute.cs +System.Data.Services/ProcessRequestArgs.cs +System.Data.Services/QueryInterceptorAttribute.cs +System.Data.Services/ServiceOperationRights.cs +System.Data.Services/SingleResultAttribute.cs +System.Data.Services/UpdateOperations.cs System.Data.Services/DataServiceBehavior.cs System.Data.Services/DataServiceConfiguration.cs diff --git a/mcs/class/System.Data/Makefile b/mcs/class/System.Data/Makefile index d777e8b430..0b04288a42 100644 --- a/mcs/class/System.Data/Makefile +++ b/mcs/class/System.Data/Makefile @@ -43,7 +43,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:618,169,612,219,168 TEST_NUNITLITE_APP_CONFIG_GLOBAL=Test/test-config-file USE_XTEST_REMOTE_EXECUTOR = YES -XTEST_LIB_REFS = System System.Core System.Xml Facades/System.Text.Encoding.CodePages Facades/System.Threading.Tasks Facades/System.Runtime.InteropServices.RuntimeInformation +XTEST_LIB_REFS = System System.Core System.Xml Facades/System.Text.Encoding.CodePages Facades/System.Threading.Tasks Facades/System.Runtime.InteropServices.RuntimeInformation Facades/System.Text.RegularExpressions EXTRA_DISTFILES = \ $(wildcard Test/System.Data/*.xml) \ diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.platformnotsupported.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.platformnotsupported.cs index a437f464ca..532e22db77 100644 --- a/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.platformnotsupported.cs +++ b/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.platformnotsupported.cs @@ -14,6 +14,7 @@ using Microsoft.SqlServer.Server; using System.Reflection; using System.IO; using System.Globalization; +using System.Security; namespace System.Data.SqlClient { @@ -123,6 +124,12 @@ namespace System.Data.SqlClient public override void ChangeDatabase(string database) => throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); + public static void ChangePassword(string connectionString, string newPassword) + => throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); + + public static void ChangePassword(string connectionString, SqlCredential credential, SecureString newSecurePassword) + => throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); + public static void ClearAllPools() => throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); diff --git a/mcs/class/System.Data/Test/System.Data/BinarySerializationTest.cs b/mcs/class/System.Data/Test/System.Data/BinarySerializationTest.cs index e8757625b9..1fa1edbf73 100644 --- a/mcs/class/System.Data/Test/System.Data/BinarySerializationTest.cs +++ b/mcs/class/System.Data/Test/System.Data/BinarySerializationTest.cs @@ -144,7 +144,7 @@ public class BinarySerializationTest //Add Constraint UniqueConstraint uniqueConstraint = new UniqueConstraint (tb1.Columns ["id"]); tb1.Constraints.Add (uniqueConstraint); - tb1.RemotingFormat = SerializationFormat.Binary; + tb1.RemotingFormat = SerializationFormat.Xml; tb1.AcceptChanges(); tb1.Rows[0][0] = 1; @@ -284,7 +284,7 @@ public class BinarySerializationTest tb1.Rows.Add (new object[] {null, null}); BinaryFormatter bf = new BinaryFormatter (); - tb1.RemotingFormat = SerializationFormat.Binary; + tb1.RemotingFormat = SerializationFormat.Xml; FileStream fs = new FileStream ("Test/System.Data/binserialize/BS-tb2.bin", FileMode.Open, FileAccess.Read); BinaryReader r = new BinaryReader (fs); byte [] serializedStream = r.ReadBytes ((int)fs.Length); @@ -449,6 +449,7 @@ public class BinarySerializationTest } [Test] + [Category("NotWorking")] // Ordering issue public void DataSetSerializationTest2 () { DataSet ds = new DataSet (); @@ -475,7 +476,7 @@ public class BinarySerializationTest ds.Relations.Add (rel); //SerializeDataSet BinaryFormatter bf = new BinaryFormatter (); - ds.RemotingFormat = SerializationFormat.Binary; + ds.RemotingFormat = SerializationFormat.Xml; FileStream fs = new FileStream ("Test/System.Data/binserialize/BS-tb4.bin", FileMode.Open, FileAccess.Read); BinaryReader r = new BinaryReader (fs); byte [] serializedStream = r.ReadBytes ((int) fs.Length); @@ -645,6 +646,7 @@ public class BinarySerializationTest Assert.AreEqual (ds.Relations [i].RelationName, ds.Relations [i].RelationName, "#9 Relation : {0} differs", ds.Relations [i]); } [Test] + [Category("NotWorking")] // Ordering issue public void Constraint_Relations_Test2 () { //Serialize DataSet @@ -708,7 +710,7 @@ public class BinarySerializationTest //SerializeDataSet BinaryFormatter bf = new BinaryFormatter (); - ds.RemotingFormat = SerializationFormat.Binary; + ds.RemotingFormat = SerializationFormat.Xml; FileStream fs = new FileStream ("Test/System.Data/binserialize/BS-tb5.bin", FileMode.Open, FileAccess.Read); BinaryReader r = new BinaryReader (fs); byte [] serializedStream = r.ReadBytes ((int)fs.Length); diff --git a/mcs/class/System.Data/Test/System.Data/binserialize/BS-tb1.bin b/mcs/class/System.Data/Test/System.Data/binserialize/BS-tb1.bin index 0565e57adc..7ab43cd606 100644 Binary files a/mcs/class/System.Data/Test/System.Data/binserialize/BS-tb1.bin and b/mcs/class/System.Data/Test/System.Data/binserialize/BS-tb1.bin differ diff --git a/mcs/class/System.Data/Test/System.Data/binserialize/BS-tb2.bin b/mcs/class/System.Data/Test/System.Data/binserialize/BS-tb2.bin index 0a93c6732b..40c47bd6e8 100644 Binary files a/mcs/class/System.Data/Test/System.Data/binserialize/BS-tb2.bin and b/mcs/class/System.Data/Test/System.Data/binserialize/BS-tb2.bin differ diff --git a/mcs/class/System.Data/Test/System.Data/binserialize/BS-tb4.bin b/mcs/class/System.Data/Test/System.Data/binserialize/BS-tb4.bin index 4f0fbbb8c9..ab7d798b28 100644 Binary files a/mcs/class/System.Data/Test/System.Data/binserialize/BS-tb4.bin and b/mcs/class/System.Data/Test/System.Data/binserialize/BS-tb4.bin differ diff --git a/mcs/class/System.Data/Test/System.Data/binserialize/BS-tb5.bin b/mcs/class/System.Data/Test/System.Data/binserialize/BS-tb5.bin index 11ea4e6e3c..29b5bd1f0e 100644 Binary files a/mcs/class/System.Data/Test/System.Data/binserialize/BS-tb5.bin and b/mcs/class/System.Data/Test/System.Data/binserialize/BS-tb5.bin differ diff --git a/mcs/class/System.Data/corefx.common.sources b/mcs/class/System.Data/corefx.common.sources index b249f0d81a..5d92f3093a 100644 --- a/mcs/class/System.Data/corefx.common.sources +++ b/mcs/class/System.Data/corefx.common.sources @@ -60,6 +60,23 @@ corefx/SqlDependencyUtils.cs #../../../external/corefx/src/System.Data.Common/src/System/Data/Common/FieldNameLookup.cs #../../../external/corefx/src/System.Data.SqlClient/src/System/Data/DataException.cs +../../../external/corefx/src/Common/src/System/Data/Common/AdapterUtil.cs +../../../external/corefx/src/Common/src/System/Data/Common/AdapterUtil.Drivers.cs +../../../external/corefx/src/Common/src/System/Data/Common/BasicFieldNameLookup.cs +../../../external/corefx/src/Common/src/System/Data/Common/DbConnectionOptions.Common.cs +../../../external/corefx/src/Common/src/System/Data/Common/DbConnectionPoolKey.cs +../../../external/corefx/src/Common/src/System/Data/Common/FieldNameLookup.cs +../../../external/corefx/src/Common/src/System/Data/Common/NameValuePair.cs +../../../external/corefx/src/Common/src/System/Data/Common/MultipartIdentifier.cs + + +../../../external/corefx/src/Common/src/System/Data/ProviderBase/DbConnectionClosed.cs +../../../external/corefx/src/Common/src/System/Data/ProviderBase/DbConnectionFactory.cs +../../../external/corefx/src/Common/src/System/Data/ProviderBase/DbConnectionPoolGroup.cs +../../../external/corefx/src/Common/src/System/Data/ProviderBase/DbConnectionInternal.cs +../../../external/corefx/src/Common/src/System/Data/ProviderBase/DbReferenceCollection.cs +../../../external/corefx/src/Common/src/System/Data/ProviderBase/DbMetaDataFactory.cs +../../../external/corefx/src/Common/src/System/Data/ProviderBase/TimeoutTimer.cs # # System.Data.Common # @@ -197,7 +214,6 @@ corefx/SqlDependencyUtils.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/UInt64Storage.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/AdapterSwitches.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/AdapterUtil.Common.cs -../../../external/corefx/src/Common/src/System/Data/Common/AdapterUtil.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/BigIntegerStorage.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/BooleanStorage.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/ByteStorage.cs @@ -215,7 +231,6 @@ corefx/SqlDependencyUtils.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbCommand.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DBCommandBuilder.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbConnection.cs -../../../external/corefx/src/Common/src/System/Data/Common/DbConnectionPoolKey.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbConnectionStringBuilder.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbConnectionStringBuilderDescriptor.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbDataAdapter.cs @@ -242,9 +257,6 @@ corefx/SqlDependencyUtils.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/Int16Storage.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/Int32Storage.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/Int64Storage.cs -../../../external/corefx/src/Common/src/System/Data/Common/MultipartIdentifier.cs -../../../external/corefx/src/Common/src/System/Data/Common/NameValuePair.cs -../../../external/corefx/src/Common/src/System/Data/Common/DbConnectionOptions.Common.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/ObjectStorage.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/RowUpdatedEventArgs.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/RowUpdatingEventArgs.cs @@ -342,22 +354,14 @@ corefx/SqlDependencyUtils.cs ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/Common/DbConnectionStringCommon.cs ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/Common/AdapterUtil.SqlClient.cs ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/Common/DbConnectionOptions.cs -../../../external/corefx/src/Common/src/System/Data/Common/FieldNameLookup.cs -../../../external/corefx/src/Common/src/System/Data/Common/BasicFieldNameLookup.cs -../../../external/corefx/src/Common/src/System/Data/Common/MultipartIdentifier.cs -../../../external/corefx/src/Common/src/System/Data/Common/NameValuePair.cs ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionClosed.cs ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionFactory.cs ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionInternal.cs ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPool.cs -../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPoolGroup.cs ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPoolGroupProviderInfo.cs ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPoolIdentity.cs ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPoolOptions.cs ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPoolProviderInfo.cs -../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbReferenceCollection.cs -../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbMetaDataFactory.cs -../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/TimeoutTimer.cs ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/Sql/SqlNorm.cs ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/Sql/SqlMetaData.cs ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/Sql/SqlNotificationRequest.cs diff --git a/mcs/class/System.Data/corefx/SR.cs b/mcs/class/System.Data/corefx/SR.cs index cdf509de4f..7019175054 100644 --- a/mcs/class/System.Data/corefx/SR.cs +++ b/mcs/class/System.Data/corefx/SR.cs @@ -786,13 +786,21 @@ partial class SR public const string MDF_TooManyRestrictions = "More restrictions were provided than the requested schema ('{0}') supports."; public const string MDF_DataTableDoesNotExist = "The collection '{0}' is missing from the metadata XML."; public const string MDF_UndefinedCollection = "The requested collection ({0}) is not defined."; - public const string MDF_UnsupportedVersion = " requested collection ({0}) is not supported by this version of the provider."; + public const string MDF_UnsupportedVersion = "The requested collection ({0}) is not supported by this version of the provider."; public const string MDF_MissingRestrictionColumn = "One or more of the required columns of the restrictions collection is missing."; public const string MDF_MissingRestrictionRow = "A restriction exists for which there is no matching row in the restrictions collection."; public const string MDF_IncorrectNumberOfDataSourceInformationRows = "The DataSourceInformation table must contain exactly one row."; public const string MDF_MissingDataSourceInformationColumn = "One of the required DataSourceInformation tables columns is missing."; public const string MDF_AmbigousCollectionName = "The collection name '{0}' matches at least two collections with the same name but with different case, but does not match any of them exactly."; public const string MDF_UnableToBuildCollection = "Unable to build schema collection '{0}';"; + public const string ADP_InvalidArgumentLength = "The length of argument '{0}' exceeds its limit of '{1}'."; + public const string ADP_MustBeReadOnly = "{0} must be marked as read only."; + public const string ADP_InvalidMixedUsageOfSecureAndClearCredential = "Cannot use Credential with UserID, UID, Password, or PWD connection string keywords."; + public const string ADP_InvalidMixedUsageOfSecureCredentialAndIntegratedSecurity = "Cannot use Credential with Integrated Security connection string keyword."; + public const string SQL_ChangePasswordArgumentMissing = "The '{0}' argument must not be null or empty."; + public const string SQL_ChangePasswordConflictsWithSSPI = "ChangePassword can only be used with SQL authentication, not with integrated security."; + public const string SQL_ChangePasswordRequiresYukon = "ChangePassword requires SQL Server 9.0 or later."; + public const string SQL_ChangePasswordUseOfUnallowedKey = "The keyword '{0}' must not be specified in the connectionString argument to ChangePassword."; public const string ADP_CollectionIsParent = "The {0} with is already contained by this {1}."; public const string ADP_InvalidDataDirectory = "The DataDirectory substitute is not a string."; public const string ADP_QuotePrefixNotSet = "{0} requires an open connection when the quote prefix has not been set."; diff --git a/mcs/class/System.Data/corefx/SqlCommand.cs b/mcs/class/System.Data/corefx/SqlCommand.cs index ea1606bddd..c25a808255 100644 --- a/mcs/class/System.Data/corefx/SqlCommand.cs +++ b/mcs/class/System.Data/corefx/SqlCommand.cs @@ -18,9 +18,6 @@ namespace System.Data.SqlClient set => throw new NotImplementedException(); } - [System.Security.Permissions.HostProtectionAttribute(ExternalThreading=true)] - public IAsyncResult BeginExecuteXmlReader() => BeginExecuteXmlReader(null, null); - [System.Security.Permissions.HostProtectionAttribute(ExternalThreading=true)] public IAsyncResult BeginExecuteReader() => BeginExecuteReader(CommandBehavior.Default, null, null); diff --git a/mcs/class/System.Data/corefx/SqlConnection.cs b/mcs/class/System.Data/corefx/SqlConnection.cs index 20638a4e97..639084626e 100644 --- a/mcs/class/System.Data/corefx/SqlConnection.cs +++ b/mcs/class/System.Data/corefx/SqlConnection.cs @@ -11,18 +11,6 @@ namespace System.Data.SqlClient { partial class SqlConnection : IDbConnection, ICloneable, IDisposable { - public SqlConnection(string connectionString, SqlCredential credential) - { - ConnectionString = connectionString; - Credentials = credential; - } - - [MonoTODO] //https://github.com/dotnet/corefx/issues/11958 - public static void ChangePassword (string connectionString, string newPassword) - { - throw new NotImplementedException(); - } - [MonoTODO] //https://github.com/dotnet/corefx/issues/11542 public SqlCredential Credentials { get => throw new NotImplementedException(); diff --git a/mcs/class/System.Data/win32_net_4_x_System.Data.dll.sources b/mcs/class/System.Data/win32_net_4_x_System.Data.dll.sources index cdc6bae93d..33e4ee8cd4 100644 --- a/mcs/class/System.Data/win32_net_4_x_System.Data.dll.sources +++ b/mcs/class/System.Data/win32_net_4_x_System.Data.dll.sources @@ -30,7 +30,6 @@ ../../../external/corefx/src/Common/src/Interop/Windows/sspicli/SSPIInterface.cs ../../../external/corefx/src/Common/src/Interop/Windows/sspicli/SecurityPackageInfoClass.cs ../../../external/corefx/src/Common/src/Interop/Windows/sspicli/SecurityPackageInfo.cs -../../../external/corefx/src/Common/src/System/Net/IntPtrHelper.cs ../../../external/corefx/src/Common/src/Interop/Windows/sspicli/SSPIAuthType.cs ../../../external/corefx/src/Common/src/Interop/Windows/sspicli/SSPISecureChannelType.cs ../../../external/corefx/src/Common/src/Interop/Windows/sspicli/SSPIWrapper.cs diff --git a/mcs/class/System.Design/System.Web.UI.Design.WebControls/CompositeControlDesigner.cs b/mcs/class/System.Design/System.Web.UI.Design.WebControls/CompositeControlDesigner.cs index 1799721253..8a13185c5a 100644 --- a/mcs/class/System.Design/System.Web.UI.Design.WebControls/CompositeControlDesigner.cs +++ b/mcs/class/System.Design/System.Web.UI.Design.WebControls/CompositeControlDesigner.cs @@ -35,7 +35,7 @@ using System.ComponentModel; namespace System.Web.UI.Design.WebControls { - class CompositeControlDesigner : ControlDesigner + public class CompositeControlDesigner : ControlDesigner { public CompositeControlDesigner () { throw new NotImplementedException (); diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/LinearGradientBrush.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/LinearGradientBrush.cs index 2490309a27..9d12843d84 100644 --- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/LinearGradientBrush.cs +++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/LinearGradientBrush.cs @@ -36,6 +36,7 @@ namespace System.Drawing.Drawing2D { public sealed class LinearGradientBrush : Brush { RectangleF rectangle; + private bool _interpolationColorsWasSet; internal LinearGradientBrush (IntPtr native) { @@ -142,6 +143,14 @@ namespace System.Drawing.Drawing2D { public Blend Blend { get { + // Interpolation colors and blends don't work together very well. Getting the Blend when InterpolationColors + // is set set puts the Brush into an unusable state afterwards. + // Bail out here to avoid that. + if (_interpolationColorsWasSet) + { + return null; + } + int count; Status status = GDIPlus.GdipGetLineBlendCount (NativeBrush, out count); GDIPlus.CheckStatus (status); @@ -196,6 +205,11 @@ namespace System.Drawing.Drawing2D { public ColorBlend InterpolationColors { get { + if (!_interpolationColorsWasSet) + { + throw new ArgumentException("Property must be set to a valid ColorBlend object to use interpolation colors."); + } + int count; Status status = GDIPlus.GdipGetLinePresetBlendCount (NativeBrush, out count); GDIPlus.CheckStatus (status); @@ -239,6 +253,8 @@ namespace System.Drawing.Drawing2D { Status status = GDIPlus.GdipSetLinePresetBlend (NativeBrush, blend, positions, count); GDIPlus.CheckStatus (status); + + _interpolationColorsWasSet = true; } } @@ -357,6 +373,8 @@ namespace System.Drawing.Drawing2D { Status status = GDIPlus.GdipSetLineLinearBlend (NativeBrush, focus, scale); GDIPlus.CheckStatus (status); + + _interpolationColorsWasSet = false; } public void SetSigmaBellShape (float focus) @@ -371,6 +389,8 @@ namespace System.Drawing.Drawing2D { Status status = GDIPlus.GdipSetLineSigmaBlend (NativeBrush, focus, scale); GDIPlus.CheckStatus (status); + + _interpolationColorsWasSet = false; } public void TranslateTransform (float dx, float dy) diff --git a/mcs/class/System.Drawing/System.Drawing.dll.sources b/mcs/class/System.Drawing/System.Drawing.dll.sources index 93cfada694..07208a0075 100755 --- a/mcs/class/System.Drawing/System.Drawing.dll.sources +++ b/mcs/class/System.Drawing/System.Drawing.dll.sources @@ -207,9 +207,6 @@ System.Drawing.Printing/PrinterSettings.cs ../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrinterUnitConvert.cs System.Drawing.Printing/PrintEventArgs.cs ../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrintEventHandler.cs -../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrintingPermission.cs -../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrintingPermissionAttribute.cs -../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrintingPermissionLevel.cs ../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrintAction.cs System.Drawing.Printing/PrintPageEventArgs.cs ../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrintPageEventHandler.cs @@ -228,3 +225,8 @@ System.Drawing.Text/PrivateFontCollection.cs ../../../external/corefx/src/Common/src/System/Drawing/ColorUtil.netcoreapp21.cs ../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Drawing2D/CustomLineCap.Unix.cs + +../../../external/corefx/src/System.Security.Permissions/src/System/Drawing/Printing/PrintingPermission.cs +../../../external/corefx/src/System.Security.Permissions/src/System/Drawing/Printing/PrintingPermissionAttribute.cs +../../../external/corefx/src/System.Security.Permissions/src/System/Drawing/Printing/PrintingPermissionLevel.cs + diff --git a/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs b/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs index 4865269b83..fe5a455f79 100644 --- a/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs +++ b/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs @@ -253,7 +253,7 @@ namespace System.Drawing throw new NotImplementedException (msg); case Status.WrongState: msg = Locale.GetText ("Object is not in a state that can allow this operation [GDI+ status: {0}]", status); - throw new ArgumentException (msg); + throw new InvalidOperationException (msg); case Status.FontFamilyNotFound: msg = Locale.GetText ("The requested FontFamily could not be found [GDI+ status: {0}]", status); throw new ArgumentException (msg); diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Printing/PrintingPermissionAttributeTest.cs b/mcs/class/System.Drawing/Test/System.Drawing.Printing/PrintingPermissionAttributeTest.cs index 91575d2d3e..c204b3eda6 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Printing/PrintingPermissionAttributeTest.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing.Printing/PrintingPermissionAttributeTest.cs @@ -27,6 +27,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if MONO_FEATURE_CAS + using NUnit.Framework; using System; using System.Drawing.Printing; @@ -132,3 +134,5 @@ namespace MonoTests.System.Drawing.Printing { } } } + +#endif \ No newline at end of file diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Printing/PrintingPermissionTest.cs b/mcs/class/System.Drawing/Test/System.Drawing.Printing/PrintingPermissionTest.cs index 908b1140ca..472714d7da 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Printing/PrintingPermissionTest.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing.Printing/PrintingPermissionTest.cs @@ -25,6 +25,7 @@ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if MONO_FEATURE_CAS using NUnit.Framework; using System; @@ -466,3 +467,4 @@ namespace MonoTests.System.Drawing.Printing { } } } +#endif \ No newline at end of file diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Printing/PrintingServicesUnixTest.cs b/mcs/class/System.Drawing/Test/System.Drawing.Printing/PrintingServicesUnixTest.cs index e569716599..a1edba6495 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Printing/PrintingServicesUnixTest.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing.Printing/PrintingServicesUnixTest.cs @@ -104,6 +104,7 @@ namespace MonoTests.System.Drawing.Printing { [Test] [Platform (Exclude = "Win", Reason = "Depends on CUPS which is usually not installed on Windows")] + [Ignore] public void Bug602934_PrinterSettingsReturnActualValues () { if (PrinterSettings.InstalledPrinters.Count < 1) diff --git a/mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs index b73ed00255..9050e814f6 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs @@ -187,7 +187,7 @@ namespace MonoTests.System.Drawing { [Test] public void ConvertFrom_x4 () { - Assert.Throws (() => colconv.ConvertFrom (null, CultureInfo.InvariantCulture, + Assert.Throws (() => colconv.ConvertFrom (null, CultureInfo.InvariantCulture, "*1, 1")); } diff --git a/mcs/class/System.Drawing/Test/System.Drawing/GDIPlusTest.cs b/mcs/class/System.Drawing/Test/System.Drawing/GDIPlusTest.cs index 673fd3fa20..9d3ea165f7 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/GDIPlusTest.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/GDIPlusTest.cs @@ -236,7 +236,6 @@ namespace MonoTests.System.Drawing { Rectangle rect = new Rectangle (2, 2, 5, 5); Assert.AreEqual (Status.Ok, GDIPlus.GdipBitmapLockBits (bmp, ref rect, ImageLockMode.ReadOnly, PixelFormat.Format24bppRgb, bd), "locked"); - Assert.AreEqual (Status.Win32Error, GDIPlus.GdipBitmapLockBits (bmp, ref rect, ImageLockMode.ReadOnly, PixelFormat.Format24bppRgb, bd), "second lock"); Assert.AreEqual (rect.Width, bd.Width, "Width"); Assert.AreEqual (rect.Height, bd.Height, "Height"); diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestPointConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestPointConverter.cs index a45a24942c..b7c0ce48a2 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestPointConverter.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestPointConverter.cs @@ -125,7 +125,7 @@ namespace MonoTests.System.Drawing ptconv.ConvertFrom (null, CultureInfo.InvariantCulture, "*1, 1"); Assert.Fail ("CF#5-1"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "CF#5-2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "CF#5-2"); Assert.IsNotNull (ex.InnerException, "CF#5-3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "CF#5-4"); } @@ -315,7 +315,7 @@ namespace MonoTests.System.Drawing ptconv.ConvertFromInvariantString ("hello"); Assert.Fail ("#1"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "#2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2"); Assert.IsNotNull (ex.InnerException, "#3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3"); } @@ -350,7 +350,7 @@ namespace MonoTests.System.Drawing ptconv.ConvertFromString ("hello"); Assert.Fail ("#1"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "#2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2"); Assert.IsNotNull (ex.InnerException, "#3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3"); } diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestRectangleConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestRectangleConverter.cs index bc05d22453..c7b85ff7cf 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestRectangleConverter.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestRectangleConverter.cs @@ -134,7 +134,7 @@ namespace MonoTests.System.Drawing "*1, 1, 1, 1"); Assert.Fail ("CF#5: must throw Exception"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "CF#5-2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "CF#5-2"); Assert.IsNotNull (ex.InnerException, "CF#5-3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "CF#5-4"); } @@ -384,7 +384,7 @@ namespace MonoTests.System.Drawing rconv.ConvertFromInvariantString ("hello"); Assert.Fail ("#1"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "#2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2"); Assert.IsNotNull (ex.InnerException, "#3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3"); } @@ -421,7 +421,7 @@ namespace MonoTests.System.Drawing rconv.ConvertFromString ("hello"); Assert.Fail ("#1"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "#2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2"); Assert.IsNotNull (ex.InnerException, "#3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3"); } diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestSizeConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestSizeConverter.cs index d6cc2e1159..657d8d5585 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestSizeConverter.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestSizeConverter.cs @@ -128,7 +128,7 @@ namespace MonoTests.System.Drawing "*1, 1"); Assert.Fail ("CF#5-1: must throw Exception"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "CF#5-2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "CF#5-2"); Assert.IsNotNull (ex.InnerException, "CF#5-3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "CF#5-4"); } @@ -320,7 +320,7 @@ namespace MonoTests.System.Drawing szconv.ConvertFromInvariantString ("hello"); Assert.Fail ("#1"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "#2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2"); Assert.IsNotNull (ex.InnerException, "#3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3"); } @@ -357,7 +357,7 @@ namespace MonoTests.System.Drawing szconv.ConvertFromString ("hello"); Assert.Fail ("#1"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "#2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2"); Assert.IsNotNull (ex.InnerException, "#3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3"); } diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestSizeFConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestSizeFConverter.cs index 95b4483f83..b286967b06 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestSizeFConverter.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestSizeFConverter.cs @@ -129,7 +129,7 @@ namespace MonoTests.System.Drawing "*1, 1"); Assert.Fail ("CF#5-1: must throw Exception"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "CF#5-2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "CF#5-2"); Assert.IsNotNull (ex.InnerException, "CF#5-3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "CF#5-4"); } @@ -323,7 +323,7 @@ namespace MonoTests.System.Drawing szconv.ConvertFromInvariantString ("hello"); Assert.Fail ("#1"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "#2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2"); Assert.IsNotNull (ex.InnerException, "#3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3"); } @@ -360,7 +360,7 @@ namespace MonoTests.System.Drawing szconv.ConvertFromString ("hello"); Assert.Fail ("#1"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "#2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2"); Assert.IsNotNull (ex.InnerException, "#3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3"); } diff --git a/mcs/class/System.IO.Compression.FileSystem/Makefile b/mcs/class/System.IO.Compression.FileSystem/Makefile index 6c5cb1f6ed..c66c602fd9 100644 --- a/mcs/class/System.IO.Compression.FileSystem/Makefile +++ b/mcs/class/System.IO.Compression.FileSystem/Makefile @@ -5,13 +5,12 @@ include ../../build/rules.make LIBRARY = System.IO.Compression.FileSystem.dll LIB_REFS = System System.IO.Compression KEYFILE = ../ecma.pub -LIB_MCS_FLAGS = -unsafe +LIB_MCS_FLAGS = -unsafe -nowarn:436 TEST_MCS_FLAGS = TEST_LIB_REFS = System System.Core System.IO.Compression LIBRARY_WARN_AS_ERROR = yes RESX_RESOURCE_STRING = \ - ../../../external/corefx/src/System.IO.Compression.FileSystem/src/Resources/Strings.resx \ - ../../../external/corefx/src/System.Buffers/src/Resources/Strings.resx + ../../../external/corefx/src/System.IO.Compression.ZipFile/src/Resources/Strings.resx include ../../build/library.make diff --git a/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.dll.sources b/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.dll.sources index 30a80ab5f2..a6a54759b7 100644 --- a/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.dll.sources +++ b/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.dll.sources @@ -6,9 +6,3 @@ corefx/SR.cs ../../../external/corefx/src/Common/src/System/IO/PathInternal.CaseSensitivity.cs ../../../external/corefx/src/System.IO.Compression.ZipFile/src/System/IO/Compression/ZipFile.cs ../../../external/corefx/src/System.IO.Compression.ZipFile/src/System/IO/Compression/ZipFileExtensions.cs - -../../../external/corefx/src/System.Buffers/src/System/Buffers/ArrayPool.cs -../../../external/corefx/src/System.Buffers/src/System/Buffers/ArrayPoolEventSource.cs -../../../external/corefx/src/System.Buffers/src/System/Buffers/DefaultArrayPool.cs -../../../external/corefx/src/System.Buffers/src/System/Buffers/DefaultArrayPoolBucket.cs -../../../external/corefx/src/System.Buffers/src/System/Buffers/Utilities.cs diff --git a/mcs/class/System.IO.Compression.FileSystem/corefx/SR.cs b/mcs/class/System.IO.Compression.FileSystem/corefx/SR.cs index 0a253cb891..e188b2ef02 100644 --- a/mcs/class/System.IO.Compression.FileSystem/corefx/SR.cs +++ b/mcs/class/System.IO.Compression.FileSystem/corefx/SR.cs @@ -6,5 +6,4 @@ partial class SR { public const string IO_DirectoryNameWithData = "Zip entry name ends in directory separator character but contains data."; public const string IO_ExtractingResultsInOutside = "Extracting Zip entry would have resulted in a file outside the specified destination directory."; - public const string ArgumentException_BufferNotFromPool = "The buffer is not associated with this pool and may not be returned to it."; } diff --git a/mcs/class/System.Json/Makefile b/mcs/class/System.Json/Makefile index b515027edc..01343f223f 100644 --- a/mcs/class/System.Json/Makefile +++ b/mcs/class/System.Json/Makefile @@ -5,7 +5,13 @@ include ../../build/rules.make LIBRARY = System.Json.dll LIB_REFS = System System.Xml System.Core KEYFILE = ../winfx.pub -LIB_MCS_FLAGS = +LIB_MCS_FLAGS = \ + -nowarn:3021 + +XTEST_LIB_REFS = System System.Core System.Xml Facades/System.Threading.Tasks + +RESX_RESOURCE_STRING = \ + ../../../external/corefx/src/System.Json/src/Resources/Strings.resx TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.Json/System.Json.dll.sources b/mcs/class/System.Json/System.Json.dll.sources index 6076fc0555..4b2dcf8c14 100644 --- a/mcs/class/System.Json/System.Json.dll.sources +++ b/mcs/class/System.Json/System.Json.dll.sources @@ -1,8 +1,5 @@ ../../build/common/Consts.cs +../../build/common/SR.cs Assembly/AssemblyInfo.cs -System.Json/JsonArray.cs -System.Json/JsonObject.cs -System.Json/JsonPrimitive.cs -System.Json/JsonType.cs -System.Json/JsonValue.cs -System.Json/JavaScriptReader.cs +corefx/SR.cs +../../../external/corefx/src/System.Json/src/System/Json/*.cs diff --git a/mcs/class/System.Json/System.Json/JavaScriptReader.cs b/mcs/class/System.Json/System.Json/JavaScriptReader.cs deleted file mode 100644 index 3e97c0bc8e..0000000000 --- a/mcs/class/System.Json/System.Json/JavaScriptReader.cs +++ /dev/null @@ -1,333 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Linq; -using System.Text; - -namespace System.Runtime.Serialization.Json -{ - internal class JavaScriptReader - { - TextReader r; - int line = 1, column = 0; -// bool raise_on_number_error; // FIXME: use it - - public JavaScriptReader (TextReader reader, bool raiseOnNumberError) - { - if (reader == null) - throw new ArgumentNullException ("reader"); - this.r = reader; -// raise_on_number_error = raiseOnNumberError; - } - - public object Read () - { - object v = ReadCore (); - SkipSpaces (); - if (ReadChar () >= 0) - throw JsonError (String.Format ("extra characters in JSON input")); - return v; - } - - object ReadCore () - { - SkipSpaces (); - int c = PeekChar (); - if (c < 0) - throw JsonError ("Incomplete JSON input"); - switch (c) { - case '[': - ReadChar (); - var list = new List (); - SkipSpaces (); - if (PeekChar () == ']') { - ReadChar (); - return list; - } - while (true) { - list.Add (ReadCore ()); - SkipSpaces (); - c = PeekChar (); - if (c != ',') - break; - ReadChar (); - continue; - } - if (ReadChar () != ']') - throw JsonError ("JSON array must end with ']'"); - return list.ToArray (); - case '{': - ReadChar (); - var obj = new Dictionary (); - SkipSpaces (); - if (PeekChar () == '}') { - ReadChar (); - return obj; - } - while (true) { - SkipSpaces (); - if (PeekChar () == '}') { - ReadChar (); - break; - } - string name = ReadStringLiteral (); - SkipSpaces (); - Expect (':'); - SkipSpaces (); - obj [name] = ReadCore (); // it does not reject duplicate names. - SkipSpaces (); - c = ReadChar (); - if (c == ',') - continue; - if (c == '}') - break; - } -#if MONOTOUCH - int idx = 0; - KeyValuePair [] ret = new KeyValuePair[obj.Count]; - foreach (KeyValuePair kvp in obj) - ret [idx++] = kvp; - - return ret; -#else - return obj.ToArray (); -#endif - case 't': - Expect ("true"); - return true; - case 'f': - Expect ("false"); - return false; - case 'n': - Expect ("null"); - // FIXME: what should we return? - return (string) null; - case '"': - return ReadStringLiteral (); - default: - if ('0' <= c && c <= '9' || c == '-') - return ReadNumericLiteral (); - else - throw JsonError (String.Format ("Unexpected character '{0}'", (char) c)); - } - } - - int peek; - bool has_peek; - bool prev_lf; - - int PeekChar () - { - if (!has_peek) { - peek = r.Read (); - has_peek = true; - } - return peek; - } - - int ReadChar () - { - int v = has_peek ? peek : r.Read (); - - has_peek = false; - - if (prev_lf) { - line++; - column = 0; - prev_lf = false; - } - - if (v == '\n') - prev_lf = true; - column++; - - return v; - } - - void SkipSpaces () - { - while (true) { - switch (PeekChar ()) { - case ' ': case '\t': case '\r': case '\n': - ReadChar (); - continue; - default: - return; - } - } - } - - // It could return either int, long or decimal, depending on the parsed value. - object ReadNumericLiteral () - { - var sb = new StringBuilder (); - - if (PeekChar () == '-') { - sb.Append ((char) ReadChar ()); - } - - int c; - int x = 0; - bool zeroStart = PeekChar () == '0'; - for (; ; x++) { - c = PeekChar (); - if (c < '0' || '9' < c) - break; - sb.Append ((char) ReadChar ()); - if (zeroStart && x == 1) - throw JsonError ("leading zeros are not allowed"); - } - if (x == 0) // Reached e.g. for "- " - throw JsonError ("Invalid JSON numeric literal; no digit found"); - - // fraction - bool hasFrac = false; - int fdigits = 0; - if (PeekChar () == '.') { - hasFrac = true; - sb.Append ((char) ReadChar ()); - if (PeekChar () < 0) - throw JsonError ("Invalid JSON numeric literal; extra dot"); - while (true) { - c = PeekChar (); - if (c < '0' || '9' < c) - break; - sb.Append ((char) ReadChar ()); - fdigits++; - } - if (fdigits == 0) - throw JsonError ("Invalid JSON numeric literal; extra dot"); - } - - c = PeekChar (); - if (c != 'e' && c != 'E') { - if (!hasFrac) { - int valueInt; - if (int.TryParse (sb.ToString (), NumberStyles.Float, CultureInfo.InvariantCulture, out valueInt)) - return valueInt; - - long valueLong; - if (long.TryParse (sb.ToString (), NumberStyles.Float, CultureInfo.InvariantCulture, out valueLong)) - return valueLong; - - ulong valueUlong; - if (ulong.TryParse (sb.ToString (), NumberStyles.Float, CultureInfo.InvariantCulture, out valueUlong)) - return valueUlong; - } - decimal valueDecimal; - if (decimal.TryParse (sb.ToString (), NumberStyles.Float, CultureInfo.InvariantCulture, out valueDecimal) && valueDecimal != 0) - return valueDecimal; - } else { - // exponent - sb.Append ((char) ReadChar ()); - if (PeekChar () < 0) - throw new ArgumentException ("Invalid JSON numeric literal; incomplete exponent"); - - c = PeekChar (); - if (c == '-') { - sb.Append ((char) ReadChar ()); - } - else if (c == '+') - sb.Append ((char) ReadChar ()); - - if (PeekChar () < 0) - throw JsonError ("Invalid JSON numeric literal; incomplete exponent"); - while (true) { - c = PeekChar (); - if (c < '0' || '9' < c) - break; - sb.Append ((char) ReadChar ()); - } - } - - return double.Parse (sb.ToString (), NumberStyles.Float, CultureInfo.InvariantCulture); - } - - StringBuilder vb = new StringBuilder (); - - string ReadStringLiteral () - { - if (PeekChar () != '"') - throw JsonError ("Invalid JSON string literal format"); - - ReadChar (); - vb.Length = 0; - while (true) { - int c = ReadChar (); - if (c < 0) - throw JsonError ("JSON string is not closed"); - if (c == '"') - return vb.ToString (); - else if (c != '\\') { - vb.Append ((char) c); - continue; - } - - // escaped expression - c = ReadChar (); - if (c < 0) - throw JsonError ("Invalid JSON string literal; incomplete escape sequence"); - switch (c) { - case '"': - case '\\': - case '/': - vb.Append ((char) c); - break; - case 'b': - vb.Append ('\x8'); - break; - case 'f': - vb.Append ('\f'); - break; - case 'n': - vb.Append ('\n'); - break; - case 'r': - vb.Append ('\r'); - break; - case 't': - vb.Append ('\t'); - break; - case 'u': - ushort cp = 0; - for (int i = 0; i < 4; i++) { - cp <<= 4; - if ((c = ReadChar ()) < 0) - throw JsonError ("Incomplete unicode character escape literal"); - if ('0' <= c && c <= '9') - cp += (ushort) (c - '0'); - if ('A' <= c && c <= 'F') - cp += (ushort) (c - 'A' + 10); - if ('a' <= c && c <= 'f') - cp += (ushort) (c - 'a' + 10); - } - vb.Append ((char) cp); - break; - default: - throw JsonError ("Invalid JSON string literal; unexpected escape character"); - } - } - } - - void Expect (char expected) - { - int c; - if ((c = ReadChar ()) != expected) - throw JsonError (String.Format ("Expected '{0}', got '{1}'", expected, (char) c)); - } - - void Expect (string expected) - { - for (int i = 0; i < expected.Length; i++) - if (ReadChar () != expected [i]) - throw JsonError (String.Format ("Expected '{0}', differed at {1}", expected, i)); - } - - Exception JsonError (string msg) - { - return new ArgumentException (String.Format ("{0}. At line {1}, column {2}", msg, line, column)); - } - } -} diff --git a/mcs/class/System.Json/System.Json/JsonArray.cs b/mcs/class/System.Json/System.Json/JsonArray.cs deleted file mode 100644 index 524e3e8b75..0000000000 --- a/mcs/class/System.Json/System.Json/JsonArray.cs +++ /dev/null @@ -1,136 +0,0 @@ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; - -namespace System.Json -{ - public class JsonArray : JsonValue, IList - { - List list; - - public JsonArray (params JsonValue [] items) - { - list = new List (); - AddRange (items); - } - - public JsonArray (IEnumerable items) - { - if (items == null) - throw new ArgumentNullException ("items"); - - list = new List (items); - } - - public override int Count { - get { return list.Count; } - } - - public bool IsReadOnly { - get { return false; } - } - - public override sealed JsonValue this [int index] { - get { return list [index]; } - set { list [index] = value; } - } - - public override JsonType JsonType { - get { return JsonType.Array; } - } - - public void Add (JsonValue item) - { - list.Add (item); - } - - public void AddRange (IEnumerable items) - { - if (items == null) - throw new ArgumentNullException ("items"); - - list.AddRange (items); - } - - public void AddRange (params JsonValue [] items) - { - if (items == null) - return; - - list.AddRange (items); - } - - public void Clear () - { - list.Clear (); - } - - public bool Contains (JsonValue item) - { - return list.Contains (item); - } - - public void CopyTo (JsonValue [] array, int arrayIndex) - { - list.CopyTo (array, arrayIndex); - } - - public int IndexOf (JsonValue item) - { - return list.IndexOf (item); - } - - public void Insert (int index, JsonValue item) - { - list.Insert (index, item); - } - - public bool Remove (JsonValue item) - { - return list.Remove (item); - } - - public void RemoveAt (int index) - { - list.RemoveAt (index); - } - - public override void Save (Stream stream) - { - if (stream == null) - throw new ArgumentNullException ("stream"); - stream.WriteByte ((byte) '['); - for (int i = 0; i < list.Count; i++) { - JsonValue v = list [i]; - if (v != null) - v.Save (stream); - else { - stream.WriteByte ((byte) 'n'); - stream.WriteByte ((byte) 'u'); - stream.WriteByte ((byte) 'l'); - stream.WriteByte ((byte) 'l'); - } - - if (i < Count - 1) { - stream.WriteByte ((byte) ','); - stream.WriteByte ((byte) ' '); - } - } - stream.WriteByte ((byte) ']'); - } - - IEnumerator IEnumerable.GetEnumerator () - { - return list.GetEnumerator (); - } - - IEnumerator IEnumerable.GetEnumerator () - { - return list.GetEnumerator (); - } - } -} diff --git a/mcs/class/System.Json/System.Json/JsonObject.cs b/mcs/class/System.Json/System.Json/JsonObject.cs deleted file mode 100644 index 91366a2243..0000000000 --- a/mcs/class/System.Json/System.Json/JsonObject.cs +++ /dev/null @@ -1,161 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; - -using JsonPair = System.Collections.Generic.KeyValuePair; -using JsonPairEnumerable = System.Collections.Generic.IEnumerable>; - -namespace System.Json -{ - public class JsonObject : JsonValue, IDictionary, ICollection - { - // Use SortedDictionary to make result of ToString() deterministic - SortedDictionary map; - - public JsonObject (params JsonPair [] items) - { - map = new SortedDictionary (StringComparer.Ordinal); - - if (items != null) - AddRange (items); - } - - public JsonObject (JsonPairEnumerable items) - { - if (items == null) - throw new ArgumentNullException ("items"); - - map = new SortedDictionary (StringComparer.Ordinal); - AddRange (items); - } - - public override int Count { - get { return map.Count; } - } - - public IEnumerator GetEnumerator () - { - return map.GetEnumerator (); - } - - IEnumerator IEnumerable.GetEnumerator () - { - return map.GetEnumerator (); - } - - public override sealed JsonValue this [string key] { - get { return map [key]; } - set { map [key] = value; } - } - - public override JsonType JsonType { - get { return JsonType.Object; } - } - - public ICollection Keys { - get { return map.Keys; } - } - - public ICollection Values { - get { return map.Values; } - } - - public void Add (string key, JsonValue value) - { - if (key == null) - throw new ArgumentNullException ("key"); - - map.Add (key, value); - } - - public void Add (JsonPair pair) - { - Add (pair.Key, pair.Value); - } - - public void AddRange (JsonPairEnumerable items) - { - if (items == null) - throw new ArgumentNullException ("items"); - - foreach (var pair in items) - map.Add (pair.Key, pair.Value); - } - - public void AddRange (params JsonPair [] items) - { - AddRange ((JsonPairEnumerable) items); - } - - public void Clear () - { - map.Clear (); - } - - bool ICollection.Contains (JsonPair item) - { - return (map as ICollection).Contains (item); - } - - bool ICollection.Remove (JsonPair item) - { - return (map as ICollection).Remove (item); - } - - public override bool ContainsKey (string key) - { - if (key == null) - throw new ArgumentNullException ("key"); - - return map.ContainsKey (key); - } - - public void CopyTo (JsonPair [] array, int arrayIndex) - { - (map as ICollection).CopyTo (array, arrayIndex); - } - - public bool Remove (string key) - { - if (key == null) - throw new ArgumentNullException ("key"); - - return map.Remove (key); - } - - bool ICollection.IsReadOnly { - get { return false; } - } - - public override void Save (Stream stream) - { - if (stream == null) - throw new ArgumentNullException ("stream"); - stream.WriteByte ((byte) '{'); - foreach (JsonPair pair in map) { - stream.WriteByte ((byte) '"'); - byte [] bytes = Encoding.UTF8.GetBytes (EscapeString (pair.Key)); - stream.Write (bytes, 0, bytes.Length); - stream.WriteByte ((byte) '"'); - stream.WriteByte ((byte) ','); - stream.WriteByte ((byte) ' '); - if (pair.Value == null) { - stream.WriteByte ((byte) 'n'); - stream.WriteByte ((byte) 'u'); - stream.WriteByte ((byte) 'l'); - stream.WriteByte ((byte) 'l'); - } else - pair.Value.Save (stream); - } - stream.WriteByte ((byte) '}'); - } - - public bool TryGetValue (string key, out JsonValue value) - { - return map.TryGetValue (key, out value); - } - } -} diff --git a/mcs/class/System.Json/System.Json/JsonPrimitive.cs b/mcs/class/System.Json/System.Json/JsonPrimitive.cs deleted file mode 100644 index 24f51ed560..0000000000 --- a/mcs/class/System.Json/System.Json/JsonPrimitive.cs +++ /dev/null @@ -1,183 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; - -namespace System.Json -{ - public class JsonPrimitive : JsonValue - { - object value; - - public JsonPrimitive (bool value) - { - this.value = value; - } - - public JsonPrimitive (byte value) - { - this.value = value; - } - - public JsonPrimitive (char value) - { - this.value = value; - } - - public JsonPrimitive (decimal value) - { - this.value = value; - } - - public JsonPrimitive (double value) - { - this.value = value; - } - - public JsonPrimitive (float value) - { - this.value = value; - } - - public JsonPrimitive (int value) - { - this.value = value; - } - - public JsonPrimitive (long value) - { - this.value = value; - } - - public JsonPrimitive (sbyte value) - { - this.value = value; - } - - public JsonPrimitive (short value) - { - this.value = value; - } - - public JsonPrimitive (string value) - { - this.value = value; - } - - public JsonPrimitive (DateTime value) - { - this.value = value; - } - - public JsonPrimitive (uint value) - { - this.value = value; - } - - public JsonPrimitive (ulong value) - { - this.value = value; - } - - public JsonPrimitive (ushort value) - { - this.value = value; - } - - public JsonPrimitive (DateTimeOffset value) - { - this.value = value; - } - - public JsonPrimitive (Guid value) - { - this.value = value; - } - - public JsonPrimitive (TimeSpan value) - { - this.value = value; - } - - public JsonPrimitive (Uri value) - { - this.value = value; - } - - internal object Value { - get { return value; } - } - - public override JsonType JsonType { - get { - // FIXME: what should we do for null? Handle it as null so far. - if (value == null) - return JsonType.String; - - switch (Type.GetTypeCode (value.GetType ())) { - case TypeCode.Boolean: - return JsonType.Boolean; - case TypeCode.Char: - case TypeCode.String: - case TypeCode.DateTime: - case TypeCode.Object: // DateTimeOffset || Guid || TimeSpan || Uri - return JsonType.String; - default: - return JsonType.Number; - } - } - } - - static readonly byte [] true_bytes = Encoding.UTF8.GetBytes ("true"); - static readonly byte [] false_bytes = Encoding.UTF8.GetBytes ("false"); - - public override void Save (Stream stream) - { - switch (JsonType) { - case JsonType.Boolean: - if ((bool) value) - stream.Write (true_bytes, 0, 4); - else - stream.Write (false_bytes, 0, 5); - break; - case JsonType.String: - stream.WriteByte ((byte) '\"'); - byte [] bytes = Encoding.UTF8.GetBytes (EscapeString (value.ToString ())); - stream.Write (bytes, 0, bytes.Length); - stream.WriteByte ((byte) '\"'); - break; - default: - bytes = Encoding.UTF8.GetBytes (GetFormattedString ()); - stream.Write (bytes, 0, bytes.Length); - break; - } - } - - internal string GetFormattedString () - { - switch (JsonType) { - case JsonType.String: - if (value is string || value == null) - return (string) value; - if (value is char) - return value.ToString (); - throw new NotImplementedException ("GetFormattedString from value type " + value.GetType ()); - case JsonType.Number: - string s; - if (value is float || value is double) - // Use "round-trip" format - s = ((IFormattable) value).ToString ("R", NumberFormatInfo.InvariantInfo); - else - s = ((IFormattable) value).ToString ("G", NumberFormatInfo.InvariantInfo); - if (s == "NaN" || s == "Infinity" || s == "-Infinity") - return "\"" + s + "\""; - else - return s; - default: - throw new InvalidOperationException (); - } - } - } -} diff --git a/mcs/class/System.Json/System.Json/JsonType.cs b/mcs/class/System.Json/System.Json/JsonType.cs deleted file mode 100644 index c04f5746c1..0000000000 --- a/mcs/class/System.Json/System.Json/JsonType.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace System.Json -{ - public enum JsonType - { - String, - Number, - Object, - Array, - Boolean, - } -} diff --git a/mcs/class/System.Json/System.Json/JsonValue.cs b/mcs/class/System.Json/System.Json/JsonValue.cs deleted file mode 100644 index 450d3bc58b..0000000000 --- a/mcs/class/System.Json/System.Json/JsonValue.cs +++ /dev/null @@ -1,497 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Linq; -using System.Runtime.Serialization.Json; -using System.Text; - -using JsonPair = System.Collections.Generic.KeyValuePair; - - -namespace System.Json -{ - public abstract class JsonValue : IEnumerable - { - public static JsonValue Load (Stream stream) - { - if (stream == null) - throw new ArgumentNullException ("stream"); - return Load (new StreamReader (stream, true)); - } - - public static JsonValue Load (TextReader textReader) - { - if (textReader == null) - throw new ArgumentNullException ("textReader"); - - var ret = new JavaScriptReader (textReader, true).Read (); - - return ToJsonValue (ret); - } - - static IEnumerable> ToJsonPairEnumerable (IEnumerable> kvpc) - { - foreach (var kvp in kvpc) - yield return new KeyValuePair (kvp.Key, ToJsonValue (kvp.Value)); - } - - static IEnumerable ToJsonValueEnumerable (IEnumerable arr) - { - foreach (var obj in arr) - yield return ToJsonValue (obj); - } - - static JsonValue ToJsonValue (object ret) - { - if (ret == null) - return null; - var kvpc = ret as IEnumerable>; - if (kvpc != null) - return new JsonObject (ToJsonPairEnumerable (kvpc)); - var arr = ret as IEnumerable; - if (arr != null) - return new JsonArray (ToJsonValueEnumerable (arr)); - - if (ret is bool) - return new JsonPrimitive ((bool) ret); - if (ret is byte) - return new JsonPrimitive ((byte) ret); - if (ret is char) - return new JsonPrimitive ((char) ret); - if (ret is decimal) - return new JsonPrimitive ((decimal) ret); - if (ret is double) - return new JsonPrimitive ((double) ret); - if (ret is float) - return new JsonPrimitive ((float) ret); - if (ret is int) - return new JsonPrimitive ((int) ret); - if (ret is long) - return new JsonPrimitive ((long) ret); - if (ret is sbyte) - return new JsonPrimitive ((sbyte) ret); - if (ret is short) - return new JsonPrimitive ((short) ret); - if (ret is string) - return new JsonPrimitive ((string) ret); - if (ret is uint) - return new JsonPrimitive ((uint) ret); - if (ret is ulong) - return new JsonPrimitive ((ulong) ret); - if (ret is ushort) - return new JsonPrimitive ((ushort) ret); - if (ret is DateTime) - return new JsonPrimitive ((DateTime) ret); - if (ret is DateTimeOffset) - return new JsonPrimitive ((DateTimeOffset) ret); - if (ret is Guid) - return new JsonPrimitive ((Guid) ret); - if (ret is TimeSpan) - return new JsonPrimitive ((TimeSpan) ret); - if (ret is Uri) - return new JsonPrimitive ((Uri) ret); - throw new NotSupportedException (String.Format ("Unexpected parser return type: {0}", ret.GetType ())); - } - - public static JsonValue Parse (string jsonString) - { - if (jsonString == null) - throw new ArgumentNullException ("jsonString"); - return Load (new StringReader (jsonString)); - } - - public virtual int Count { - get { throw new InvalidOperationException (); } - } - - public abstract JsonType JsonType { get; } - - public virtual JsonValue this [int index] { - get { throw new InvalidOperationException (); } - set { throw new InvalidOperationException (); } - } - - public virtual JsonValue this [string key] { - get { throw new InvalidOperationException (); } - set { throw new InvalidOperationException (); } - } - - public virtual bool ContainsKey (string key) - { - throw new InvalidOperationException (); - } - - public virtual void Save (Stream stream) - { - if (stream == null) - throw new ArgumentNullException ("stream"); - Save (new StreamWriter (stream)); - } - - public virtual void Save (TextWriter textWriter) - { - if (textWriter == null) - throw new ArgumentNullException ("textWriter"); - SaveInternal (textWriter); - } - - void SaveInternal (TextWriter w) - { - switch (JsonType) { - case JsonType.Object: - w.Write ('{'); - bool following = false; - foreach (JsonPair pair in ((JsonObject) this)) { - if (following) - w.Write (", "); - w.Write ('\"'); - w.Write (EscapeString (pair.Key)); - w.Write ("\": "); - if (pair.Value == null) - w.Write ("null"); - else - pair.Value.SaveInternal (w); - following = true; - } - w.Write ('}'); - break; - case JsonType.Array: - w.Write ('['); - following = false; - foreach (JsonValue v in ((JsonArray) this)) { - if (following) - w.Write (", "); - if (v != null) - v.SaveInternal (w); - else - w.Write ("null"); - following = true; - } - w.Write (']'); - break; - case JsonType.Boolean: - w.Write ((bool) this ? "true" : "false"); - break; - case JsonType.String: - w.Write ('"'); - w.Write (EscapeString (((JsonPrimitive) this).GetFormattedString ())); - w.Write ('"'); - break; - default: - w.Write (((JsonPrimitive) this).GetFormattedString ()); - break; - } - } - - public override string ToString () - { - StringWriter sw = new StringWriter (); - Save (sw); - return sw.ToString (); - } - - IEnumerator IEnumerable.GetEnumerator () - { - throw new InvalidOperationException (); - } - - // Characters which have to be escaped: - // - Required by JSON Spec: Control characters, '"' and '\\' - // - Broken surrogates to make sure the JSON string is valid Unicode - // (and can be encoded as UTF8) - // - JSON does not require U+2028 and U+2029 to be escaped, but - // JavaScript does require this: - // http://stackoverflow.com/questions/2965293/javascript-parse-error-on-u2028-unicode-character/9168133#9168133 - // - '/' also does not have to be escaped, but escaping it when - // preceeded by a '<' avoids problems with JSON in HTML